diff --git a/.appveyor.yml b/.appveyor.yml
index 0e8e0a553fd4..df7536f16c7e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -18,18 +18,15 @@ environment:
     PYTHONIOENCODING: UTF-8
     PYTEST_ARGS: -raR --numprocesses=auto --timeout=300 --durations=25
                  --cov-report= --cov=lib --log-level=DEBUG
-    PINNEDVERS: "pyzmq!=21.0.0 pyzmq!=22.0.0"
+    PINNEDVERS: "pyzmq!=21.0.0,!=22.0.0"
 
   matrix:
-    # In theory we could use a single CONDA_INSTALL_LOCN because we construct
-    # the envs anyway. But using one for the right python version hopefully
-    # making things faster due to package caching.
-    - PYTHON_VERSION: "3.7"
-      CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
+    - PYTHON_VERSION: "3.8"
+      CONDA_INSTALL_LOCN: "C:\\Miniconda3-x64"
       TEST_ALL: "no"
       EXTRAREQS: "-r requirements/testing/extra.txt"
-    - PYTHON_VERSION: "3.8"
-      CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
+    - PYTHON_VERSION: "3.9"
+      CONDA_INSTALL_LOCN: "C:\\Miniconda3-x64"
       TEST_ALL: "no"
       EXTRAREQS: "-r requirements/testing/extra.txt"
 
@@ -55,11 +52,13 @@ install:
   - conda config --prepend channels conda-forge
 
   # For building, use a new environment
-  - conda create -q -n test-environment python=%PYTHON_VERSION% tk
+  - conda create -q -n test-environment python=%PYTHON_VERSION% tk "pip<22.0"
   - activate test-environment
   # pull pywin32 from conda because on py38 there is something wrong with finding
-  # the dlls when insalled from pip
+  # the dlls when installed from pip
   - conda install -c conda-forge pywin32
+  # install pyqt from conda-forge
+  - conda install -c conda-forge pyqt
   - echo %PYTHON_VERSION% %TARGET_ARCH%
   # Install dependencies from PyPI.
   - python -m pip install --upgrade -r requirements/testing/all.txt %EXTRAREQS% %PINNEDVERS%
diff --git a/.circleci/config.yml b/.circleci/config.yml
index e70b1befe053..2b6ef7c642f4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,6 +9,34 @@ version: 2.1
 #
 
 commands:
+  check-skip:
+    steps:
+      - run:
+          name: Check-skip
+          command: |
+            export git_log=$(git log --max-count=1 --pretty=format:"%B" | tr "\n" " ")
+            echo "Got commit message:"
+            echo "${git_log}"
+            if [[ -v CIRCLE_PULL_REQUEST ]] && ([[ "$git_log" == *"[skip circle]"* ]] || [[ "$git_log" == *"[circle skip]"* ]]); then
+              echo "Skip detected, exiting job ${CIRCLE_JOB} for PR ${CIRCLE_PULL_REQUEST}."
+              circleci-agent step halt;
+            fi
+
+  merge:
+    steps:
+      - run:
+          name: Merge with upstream
+          command: |
+            if ! git remote -v | grep upstream; then
+              git remote add upstream https://github.com/matplotlib/matplotlib.git
+            fi
+            git fetch upstream
+            if [[ "$CIRCLE_BRANCH" != "main" ]] && \
+               [[ "$CIRCLE_PR_NUMBER" != "" ]]; then
+              echo "Merging ${CIRCLE_PR_NUMBER}"
+              git pull --ff-only upstream "refs/pull/${CIRCLE_PR_NUMBER}/merge"
+            fi
+
   apt-install:
     steps:
       - run:
@@ -27,10 +55,12 @@ commands:
               texlive-latex-recommended \
               texlive-pictures \
               texlive-xetex \
+              ttf-wqy-zenhei \
               graphviz \
               fonts-crosextra-carlito \
               fonts-freefont-otf \
               fonts-humor-sans \
+              fonts-noto-cjk \
               optipng
 
   fonts-install:
@@ -56,9 +86,9 @@ commands:
           command: |
             python -m pip install --upgrade --user pip
             python -m pip install --upgrade --user wheel
-            python -m pip install --upgrade --user setuptools
+            python -m pip install --upgrade --user 'setuptools!=60.6.0'
 
-  deps-install:
+  doc-deps-install:
     parameters:
       numpy_version:
         type: string
@@ -67,6 +97,8 @@ commands:
       - run:
           name: Install Python dependencies
           command: |
+            python -m pip install --no-deps --user \
+                git+https://github.com/matplotlib/mpl-sphinx-theme.git
             python -m pip install --user \
                 numpy<< parameters.numpy_version >> codecov coverage \
                 -r requirements/doc/doc-requirements.txt
@@ -75,7 +107,22 @@ commands:
     steps:
       - run:
           name: Install Matplotlib
-          command: python -m pip install --user -ve .
+          command: |
+            if [[ "$CIRCLE_BRANCH" == v*-doc ]]; then
+              # The v*-doc branches must build against the specified release.
+              version=${CIRCLE_BRANCH%-doc}
+              version=${version#v}
+              python -m pip install matplotlib==${version}
+            else
+              python -m pip install --user -ve .
+            fi
+      - save_cache:
+          key: build-deps-1
+          paths:
+            # FreeType 2.6.1 tarball.
+            - ~/.cache/matplotlib/0a3c7dfbda6da1e8fce29232e8e96d987ababbbf71ebc8c75659e4132c367014
+            # Qhull 2020.2 tarball.
+            - ~/.cache/matplotlib/b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e
 
   doc-build:
     steps:
@@ -88,15 +135,13 @@ commands:
           command: |
             # Set epoch to date of latest tag.
             export SOURCE_DATE_EPOCH="$(git log -1 --format=%at $(git describe --abbrev=0))"
-            # Include analytics only when deploying to devdocs.
-            if [ "$CIRCLE_PROJECT_USERNAME" != "matplotlib" ] || \
-               [ "$CIRCLE_BRANCH" != "master" ] || \
-               [[ "$CIRCLE_PULL_REQUEST" == https://github.com/matplotlib/matplotlib/pull/* ]]; then
-              export ANALYTICS=False
-            else
-              export ANALYTICS=True
+            # Set release mode only when deploying to devdocs.
+            if [ "$CIRCLE_PROJECT_USERNAME" = "matplotlib" ] && \
+               [ "$CIRCLE_BRANCH" = "main" ] && \
+               [ "$CIRCLE_PR_NUMBER" = "" ]; then
+              export RELEASE_TAG='-t release'
             fi
-            make html O="-T -Ainclude_analytics=$ANALYTICS"
+            make html O="-T $RELEASE_TAG -j4"
             rm -r build/html/_sources
           working_directory: doc
       - save_cache:
@@ -108,7 +153,12 @@ commands:
     steps:
       - run:
           name: Bundle sphinx-gallery documentation artifacts
-          command: tar cf doc/build/sphinx-gallery-files.tar.gz doc/api/_as_gen doc/gallery doc/tutorials
+          command: >
+            tar cf doc/build/sphinx-gallery-files.tar.gz
+            doc/api/_as_gen
+            doc/gallery
+            doc/plot_types
+            doc/tutorials
           when: always
       - store_artifacts:
           path: doc/build/sphinx-gallery-files.tar.gz
@@ -119,59 +169,21 @@ commands:
 #
 
 jobs:
-  docs-python37:
-    docker:
-      - image: circleci/python:3.7
-    steps:
-      - checkout
-
-      - apt-install
-      - fonts-install
-      - pip-install
-
-      - deps-install
-      - mpl-install
-
-      - doc-build
-
-      - doc-bundle
-
-      - store_artifacts:
-          path: doc/build/html
-
-  docs-python38-min:
-    docker:
-      - image: circleci/python:3.8
-    steps:
-      - checkout
-
-      - apt-install
-      - fonts-install
-      - pip-install
-
-      - deps-install:
-          numpy_version: "==1.16.0"
-      - mpl-install
-
-      - doc-build
-
-      - doc-bundle
-
-      - store_artifacts:
-          path: doc/build/html
-
   docs-python38:
     docker:
-      - image: circleci/python:3.8
+      - image: cimg/python:3.8
+    resource_class: large
     steps:
       - checkout
+      - check-skip
+      - merge
 
       - apt-install
       - fonts-install
       - pip-install
 
-      - deps-install
       - mpl-install
+      - doc-deps-install
 
       - doc-build
 
@@ -179,10 +191,12 @@ jobs:
 
       - store_artifacts:
           path: doc/build/html
+      - store_test_results:
+          path: doc/build/test-results
 
       - add_ssh_keys:
           fingerprints:
-            - "78:13:59:08:61:a9:e5:09:af:df:3a:d8:89:c2:84:c0"
+            - "6b:83:76:a5:7d:bd:ce:19:a4:e3:81:e0:80:16:a4:fe"
       - deploy:
           name: "Deploy new docs"
           command: ./.circleci/deploy-docs.sh
@@ -195,6 +209,4 @@ workflows:
   version: 2
   build:
     jobs:
-      - docs-python37
       - docs-python38
-      - docs-python38-min
diff --git a/.circleci/deploy-docs.sh b/.circleci/deploy-docs.sh
index 83037d2561a4..8801d5fd073e 100755
--- a/.circleci/deploy-docs.sh
+++ b/.circleci/deploy-docs.sh
@@ -3,10 +3,10 @@
 set -e
 
 if [ "$CIRCLE_PROJECT_USERNAME" != "matplotlib" ] || \
-        [ "$CIRCLE_BRANCH" != "master" ] || \
+        [ "$CIRCLE_BRANCH" != "main" ] || \
         [[ "$CIRCLE_PULL_REQUEST" == https://github.com/matplotlib/matplotlib/pull/* ]]; then
     echo "Not uploading docs for ${CIRCLE_SHA1}"\
-         "from non-master branch (${CIRCLE_BRANCH})"\
+         "from non-main branch (${CIRCLE_BRANCH})"\
          "or pull request (${CIRCLE_PULL_REQUEST})"\
          "or non-Matplotlib org (${CIRCLE_PROJECT_USERNAME})."
     exit
diff --git a/.flake8 b/.flake8
index f9f41e9a9fab..4cbcd7e2881f 100644
--- a/.flake8
+++ b/.flake8
@@ -16,8 +16,8 @@ ignore =
     # flake8 default
     E121,E123,E126,E226,E24,E704,W503,W504,
     # Additional ignores:
-    E122, E127, E131,
-    E265, E266,
+    E127, E131,
+    E266,
     E305, E306,
     E722, E741,
     F841,
@@ -35,7 +35,6 @@ exclude =
     doc/gallery
     doc/tutorials
     # External files.
-    versioneer.py
     tools/gh_api.py
     tools/github_stats.py
     .tox
@@ -43,52 +42,31 @@ exclude =
 
 per-file-ignores =
     setup.py: E402
-    setupext.py: E501
     tests.py: F401
 
-    tools/subset.py: E221, E251, E261, E302, E501
-
-    lib/matplotlib/__init__.py: F401
+    lib/matplotlib/__init__.py: E402, F401
     lib/matplotlib/_api/__init__.py: F401
-    lib/matplotlib/_cm.py: E202, E203, E302
+    lib/matplotlib/_cm.py: E122, E202, E203, E302
     lib/matplotlib/_mathtext.py: E221, E251
-    lib/matplotlib/_mathtext_data.py: E203, E261
-    lib/matplotlib/animation.py: F401
+    lib/matplotlib/_mathtext_data.py: E122, E203, E261
     lib/matplotlib/_animation_data.py: E501
     lib/matplotlib/axes/__init__.py: F401, F403
-    lib/matplotlib/axes/_axes.py: F401
-    lib/matplotlib/backends/backend_*.py: F401
+    lib/matplotlib/backends/backend_template.py: F401
     lib/matplotlib/backends/qt_editor/formlayout.py: F401, F403
-    lib/matplotlib/cbook/__init__.py: F401
-    lib/matplotlib/cbook/deprecation.py: F401
-    lib/matplotlib/font_manager.py: E221, E251, E501
+    lib/matplotlib/font_manager.py: E501
     lib/matplotlib/image.py: F401, F403
-    lib/matplotlib/lines.py: F401
     lib/matplotlib/mathtext.py: E221, E251
     lib/matplotlib/pylab.py: F401, F403
     lib/matplotlib/pyplot.py: F401, F811
-    lib/matplotlib/style/__init__.py: F401
-    lib/matplotlib/testing/conftest.py: F401
-    lib/matplotlib/tests/conftest.py: F401
-    lib/matplotlib/tests/test_backend_qt.py: F401
     lib/matplotlib/tests/test_mathtext.py: E501
-    lib/matplotlib/text.py: F401
     lib/matplotlib/transforms.py: E201, E202, E203
-    lib/matplotlib/tri/__init__.py: F401, F403
     lib/matplotlib/tri/triinterpolate.py: E201, E221
-    lib/mpl_toolkits/axes_grid/*: F401, F403
-    lib/mpl_toolkits/axes_grid1/__init__.py: F401
     lib/mpl_toolkits/axes_grid1/axes_size.py: E272
     lib/mpl_toolkits/axisartist/__init__.py: F401
     lib/mpl_toolkits/axisartist/angle_helper.py: E221
-    lib/mpl_toolkits/axisartist/axes_divider.py: F401
-    lib/mpl_toolkits/axisartist/axes_rgb.py: F401
-    lib/mpl_toolkits/axisartist/axislines.py: F401
-    lib/mpl_toolkits/mplot3d/__init__.py: F401
-    lib/mpl_toolkits/tests/conftest.py: F401
     lib/pylab.py: F401, F403
 
-    doc/conf.py: E402, E501
+    doc/conf.py: E402
     tutorials/advanced/path_tutorial.py: E402
     tutorials/advanced/patheffects_guide.py: E402
     tutorials/advanced/transforms_tutorial.py: E402, E501
@@ -97,15 +75,14 @@ per-file-ignores =
     tutorials/colors/colormap-manipulation.py: E402
     tutorials/intermediate/artists.py: E402
     tutorials/intermediate/constrainedlayout_guide.py: E402
-    tutorials/intermediate/gridspec.py: E402
     tutorials/intermediate/legend_guide.py: E402
     tutorials/intermediate/tight_layout_guide.py: E402
     tutorials/introductory/customizing.py: E501
     tutorials/introductory/images.py: E402, E501
     tutorials/introductory/pyplot.py: E402, E501
     tutorials/introductory/sample_plots.py: E501
-    tutorials/introductory/usage.py: E501
-    tutorials/text/annotations.py: E501
+    tutorials/introductory/quick_start.py: E703
+    tutorials/text/annotations.py: E402, E501
     tutorials/text/text_intro.py: E402
     tutorials/text/text_props.py: E501
     tutorials/text/usetex.py: E501
@@ -113,179 +90,26 @@ per-file-ignores =
     tutorials/toolkits/axisartist.py: E501
 
     examples/animation/frame_grabbing_sgskip.py: E402
-    examples/axes_grid1/inset_locator_demo.py: E402
-    examples/axes_grid1/scatter_hist_locatable_axes.py: E402
-    examples/axisartist/demo_curvelinear_grid.py: E402
-    examples/color/color_by_yvalue.py: E402
-    examples/color/color_cycle_default.py: E402
-    examples/color/color_cycler.py: E402
-    examples/color/color_demo.py: E402
-    examples/color/colorbar_basics.py: E402
-    examples/color/colormap_reference.py: E402
-    examples/color/custom_cmap.py: E402
-    examples/color/named_colors.py: E402
-    examples/images_contours_and_fields/affine_image.py: E402
-    examples/images_contours_and_fields/barb_demo.py: E402
-    examples/images_contours_and_fields/barcode_demo.py: E402
-    examples/images_contours_and_fields/contour_corner_mask.py: E402
-    examples/images_contours_and_fields/contour_demo.py: E402
-    examples/images_contours_and_fields/contour_image.py: E402
-    examples/images_contours_and_fields/contourf_demo.py: E402
-    examples/images_contours_and_fields/contourf_hatching.py: E402
-    examples/images_contours_and_fields/contourf_log.py: E402
-    examples/images_contours_and_fields/demo_bboximage.py: E402
-    examples/images_contours_and_fields/image_antialiasing.py: E402
-    examples/images_contours_and_fields/image_clip_path.py: E402
-    examples/images_contours_and_fields/image_demo.py: E402
-    examples/images_contours_and_fields/image_masked.py: E402
-    examples/images_contours_and_fields/image_transparency_blend.py: E402
-    examples/images_contours_and_fields/image_zcoord.py: E402
-    examples/images_contours_and_fields/interpolation_methods.py: E402
-    examples/images_contours_and_fields/irregulardatagrid.py: E402
-    examples/images_contours_and_fields/layer_images.py: E402
-    examples/images_contours_and_fields/matshow.py: E402
-    examples/images_contours_and_fields/multi_image.py: E402
-    examples/images_contours_and_fields/pcolor_demo.py: E402
-    examples/images_contours_and_fields/plot_streamplot.py: E402
-    examples/images_contours_and_fields/quadmesh_demo.py: E402
-    examples/images_contours_and_fields/quiver_demo.py: E402
-    examples/images_contours_and_fields/quiver_simple_demo.py: E402
-    examples/images_contours_and_fields/shading_example.py: E402
-    examples/images_contours_and_fields/specgram_demo.py: E402
-    examples/images_contours_and_fields/spy_demos.py: E402
-    examples/images_contours_and_fields/tricontour_demo.py: E201, E402
-    examples/images_contours_and_fields/tricontour_smooth_delaunay.py: E402
-    examples/images_contours_and_fields/tricontour_smooth_user.py: E402
-    examples/images_contours_and_fields/trigradient_demo.py: E402
-    examples/images_contours_and_fields/triinterp_demo.py: E402
-    examples/images_contours_and_fields/tripcolor_demo.py: E201, E402
-    examples/images_contours_and_fields/triplot_demo.py: E201, E402
-    examples/images_contours_and_fields/watermark_image.py: E402
-    examples/lines_bars_and_markers/curve_error_band.py: E402
-    examples/lines_bars_and_markers/errorbar_limits_simple.py: E402
-    examples/lines_bars_and_markers/fill.py: E402
-    examples/lines_bars_and_markers/fill_between_demo.py: E402
-    examples/lines_bars_and_markers/filled_step.py: E402
-    examples/lines_bars_and_markers/stairs_demo.py: E402
-    examples/lines_bars_and_markers/horizontal_barchart_distribution.py: E402
-    examples/lines_bars_and_markers/joinstyle.py: E402
-    examples/lines_bars_and_markers/scatter_hist.py: E402
-    examples/lines_bars_and_markers/scatter_piecharts.py: E402
-    examples/lines_bars_and_markers/scatter_with_legend.py: E402
-    examples/lines_bars_and_markers/span_regions.py: E402
-    examples/lines_bars_and_markers/stem_plot.py: E402
-    examples/lines_bars_and_markers/step_demo.py: E402
-    examples/lines_bars_and_markers/timeline.py: E402
-    examples/lines_bars_and_markers/xcorr_acorr_demo.py: E402
-    examples/misc/agg_buffer.py: E402
-    examples/misc/histogram_path.py: E402
+    examples/lines_bars_and_markers/marker_reference.py: E402
+    examples/images_contours_and_fields/tricontour_demo.py: E201
+    examples/images_contours_and_fields/tripcolor_demo.py: E201
+    examples/images_contours_and_fields/triplot_demo.py: E201
     examples/misc/print_stdout_sgskip.py: E402
-    examples/misc/rasterization_demo.py: E402
-    examples/misc/svg_filter_line.py: E402
-    examples/misc/svg_filter_pie.py: E402
     examples/misc/table_demo.py: E201
-    examples/mplot3d/surface3d.py: E402
-    examples/pie_and_polar_charts/bar_of_pie.py: E402
-    examples/pie_and_polar_charts/nested_pie.py: E402
-    examples/pie_and_polar_charts/pie_and_donut_labels.py: E402
-    examples/pie_and_polar_charts/pie_demo2.py: E402
-    examples/pie_and_polar_charts/pie_features.py: E402
-    examples/pie_and_polar_charts/polar_bar.py: E402
-    examples/pie_and_polar_charts/polar_demo.py: E402
-    examples/pie_and_polar_charts/polar_legend.py: E402
-    examples/pie_and_polar_charts/polar_scatter.py: E402
-    examples/pyplots/align_ylabels.py: E402
-    examples/pyplots/annotate_transform.py: E251, E402
-    examples/pyplots/annotation_basic.py: E402
-    examples/pyplots/annotation_polar.py: E402
-    examples/pyplots/auto_subplots_adjust.py: E302, E402
-    examples/pyplots/axline.py: E402
-    examples/pyplots/boxplot_demo_pyplot.py: E402
-    examples/pyplots/dollar_ticks.py: E402
-    examples/pyplots/fig_axes_customize_simple.py: E402
-    examples/pyplots/fig_axes_labels_simple.py: E402
-    examples/pyplots/fig_x.py: E402
-    examples/pyplots/pyplot_formatstr.py: E402
-    examples/pyplots/pyplot_mathtext.py: E402
-    examples/pyplots/pyplot_scales.py: E402
-    examples/pyplots/pyplot_simple.py: E402
-    examples/pyplots/pyplot_text.py: E402
-    examples/pyplots/pyplot_three.py: E402
-    examples/pyplots/pyplot_two_subplots.py: E402
-    examples/pyplots/text_commands.py: E402
-    examples/pyplots/text_layout.py: E402
-    examples/pyplots/whats_new_1_subplot3d.py: E402
-    examples/pyplots/whats_new_98_4_fill_between.py: E402
-    examples/pyplots/whats_new_98_4_legend.py: E402
-    examples/pyplots/whats_new_99_axes_grid.py: E402
-    examples/pyplots/whats_new_99_mplot3d.py: E402
-    examples/pyplots/whats_new_99_spines.py: E402
-    examples/scales/power_norm.py: E402
-    examples/scales/scales.py: E402
-    examples/shapes_and_collections/artist_reference.py: E402
-    examples/shapes_and_collections/collections.py: E402
-    examples/shapes_and_collections/compound_path.py: E402
-    examples/shapes_and_collections/dolphin.py: E402
-    examples/shapes_and_collections/donut.py: E402
-    examples/shapes_and_collections/ellipse_collection.py: E402
-    examples/shapes_and_collections/ellipse_demo.py: E402
-    examples/shapes_and_collections/fancybox_demo.py: E402
-    examples/shapes_and_collections/hatch_demo.py: E402
-    examples/shapes_and_collections/hatch_style_reference.py: E402
-    examples/shapes_and_collections/line_collection.py: E402
-    examples/shapes_and_collections/marker_path.py: E402
-    examples/shapes_and_collections/patch_collection.py: E402
-    examples/shapes_and_collections/path_patch.py: E402
-    examples/shapes_and_collections/quad_bezier.py: E402
-    examples/shapes_and_collections/scatter.py: E402
-    examples/showcase/anatomy.py: E402
-    examples/showcase/bachelors_degrees_by_gender.py: E402
-    examples/showcase/firefox.py: E501
-    examples/specialty_plots/anscombe.py: E402
-    examples/specialty_plots/radar_chart.py: E402
-    examples/specialty_plots/sankey_basics.py: E402
-    examples/specialty_plots/sankey_links.py: E402
-    examples/specialty_plots/sankey_rankine.py: E402
-    examples/specialty_plots/skewt.py: E402
     examples/style_sheets/bmh.py: E501
-    examples/style_sheets/ggplot.py: E501
     examples/style_sheets/plot_solarizedlight2.py: E501
-    examples/subplots_axes_and_figures/axes_margins.py: E402
-    examples/subplots_axes_and_figures/axes_zoom_effect.py: E402
-    examples/subplots_axes_and_figures/custom_figure_class.py: E402
     examples/subplots_axes_and_figures/demo_constrained_layout.py: E402
-    examples/subplots_axes_and_figures/demo_tight_layout.py: E402
-    examples/subplots_axes_and_figures/figure_size_units.py: E402
-    examples/subplots_axes_and_figures/secondary_axis.py: E402
-    examples/subplots_axes_and_figures/two_scales.py: E402
-    examples/subplots_axes_and_figures/zoom_inset_axes.py: E402
-    examples/text_labels_and_annotations/date_index_formatter.py: E402
-    examples/text_labels_and_annotations/demo_text_rotation_mode.py: E402
     examples/text_labels_and_annotations/custom_legends.py: E402
-    examples/text_labels_and_annotations/fancyarrow_demo.py: E402
-    examples/text_labels_and_annotations/font_family_rc_sgskip.py: E402
-    examples/text_labels_and_annotations/font_file.py: E402
-    examples/text_labels_and_annotations/legend.py: E402
-    examples/text_labels_and_annotations/line_with_text.py: E402
-    examples/text_labels_and_annotations/mathtext_asarray.py: E402
-    examples/text_labels_and_annotations/tex_demo.py: E402
-    examples/text_labels_and_annotations/watermark_text.py: E402
-    examples/ticks_and_spines/custom_ticker1.py: E402
-    examples/ticks_and_spines/date_concise_formatter.py: E402
-    examples/ticks_and_spines/major_minor_demo.py: E402
-    examples/ticks_and_spines/tick-formatters.py: E402
-    examples/ticks_and_spines/tick_labels_from_values.py: E402
-    examples/user_interfaces/canvasagg.py: E402
+    examples/ticks/date_concise_formatter.py: E402
+    examples/ticks/date_formatters_locators.py: F401
     examples/user_interfaces/embedding_in_gtk3_panzoom_sgskip.py: E402
     examples/user_interfaces/embedding_in_gtk3_sgskip.py: E402
-    examples/user_interfaces/embedding_in_qt_sgskip.py: E402
-    examples/user_interfaces/gtk_spreadsheet_sgskip.py: E402
-    examples/user_interfaces/mathtext_wx_sgskip.py: E402
+    examples/user_interfaces/embedding_in_gtk4_panzoom_sgskip.py: E402
+    examples/user_interfaces/embedding_in_gtk4_sgskip.py: E402
+    examples/user_interfaces/gtk3_spreadsheet_sgskip.py: E402
+    examples/user_interfaces/gtk4_spreadsheet_sgskip.py: E402
     examples/user_interfaces/mpl_with_glade3_sgskip.py: E402
-    examples/user_interfaces/pylab_with_gtk_sgskip.py: E302, E402
+    examples/user_interfaces/pylab_with_gtk3_sgskip.py: E402
+    examples/user_interfaces/pylab_with_gtk4_sgskip.py: E402
     examples/user_interfaces/toolmanager_sgskip.py: E402
-    examples/userdemo/connectionstyle_demo.py: E402
-    examples/userdemo/custom_boxstyle01.py: E402
     examples/userdemo/pgf_preamble_sgskip.py: E402
-    examples/widgets/*.py: E402
-    examples/statistics/*.py: E402
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 000000000000..33ff9446d8a6
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,11 @@
+# style: end-of-file-fixer pre-commit hook
+c1a33a481b9c2df605bcb9bef9c19fe65c3dac21
+
+# style: trailing-whitespace pre-commit hook
+213061c0804530d04bbbd5c259f10dc8504e5b2b
+
+# style: check-docstring-first pre-commit hook
+046533797725293dfc2a6edb9f536b25f08aa636
+
+# chore: fix spelling errors
+686c9e5a413e31c46bb049407d5eca285bcab76d
diff --git a/.git_archival.txt b/.git_archival.txt
new file mode 100644
index 000000000000..3994ec0a83ea
--- /dev/null
+++ b/.git_archival.txt
@@ -0,0 +1,4 @@
+node: $Format:%H$
+node-date: $Format:%cI$
+describe-name: $Format:%(describe:tags=true)$
+ref-names: $Format:%D$
diff --git a/.gitattributes b/.gitattributes
index 8a1657abfab3..a0c2c8627af7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,6 @@
 * text=auto
+*.m diff=objc
 *.ppm binary
 *.svg binary
 *.svg linguist-language=true
-lib/matplotlib/_version.py export-subst
+.git_archival.txt export-subst
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 2bef7ab95a56..5c9afed3c02b 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,3 +1,3 @@
 # These are supported funding model platforms
-github: [numfocus]
+github: [matplotlib, numfocus]
 custom: https://numfocus.org/donate-to-matplotlib
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 35a1beb9b2a6..000000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,54 +0,0 @@
----
-name: Bug Report
-about: Report a bug or issue with Matplotlib
----
-
-<!--To help us understand and resolve your issue, please fill out the form to the best of your ability.-->
-<!--You can feel free to delete the sections that do not apply.-->
-
-### Bug report
-
-**Bug summary**
-
-<!--A short 1-2 sentences that succinctly describes the bug-->
-
-**Code for reproduction**
-
-<!--A minimum code snippet required to reproduce the bug.
-Please make sure to minimize the number of dependencies required, and provide
-any necessary plotted data.
-Avoid using threads, as Matplotlib is (explicitly) not thread-safe.-->
-
-```python
-# Paste your code here
-#
-#
-```
-
-**Actual outcome**
-
-<!--The output produced by the above code, which may be a screenshot, console output, etc.-->
-
-```
-# If applicable, paste the console output here
-#
-#
-```
-
-**Expected outcome**
-
-<!--A description of the expected outcome from the code snippet-->
-<!--If this used to work in an earlier version of Matplotlib, please note the version it used to work on-->
-
-**Matplotlib version**
-<!--Please specify your platform and versions of the relevant libraries you are using:-->
-  * Operating system: 
-  * Matplotlib version (`import matplotlib; print(matplotlib.__version__)`): 
-  * Matplotlib backend (`print(matplotlib.get_backend())`): 
-  * Python version: 
-  * Jupyter version (if applicable): 
-  * Other libraries: 
-
-<!--Please tell us how you installed matplotlib and python e.g., from source, pip, conda-->
-<!--If you installed from conda, please specify which channel you used if not the default-->
-
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000000..985762649b67
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,86 @@
+name: Bug Report
+description: Report a bug or issue with Matplotlib.
+title: "[Bug]: "
+body:
+  - type: textarea
+    id: summary
+    attributes:
+      label: Bug summary
+      description:  Describe the bug in 1-2 short sentences
+      placeholder:
+      value:
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Code for reproduction
+      description: |
+        If possible, please provide a minimum self-contained example.
+      placeholder: Paste your code here. This field is automatically formatted as Python code.
+      render: python
+    validations:
+      required: true
+  - type: textarea
+    id: actual
+    attributes:
+      label: Actual outcome
+      description: |
+        Paste the output produced by the code provided above, e.g.
+        console output, images/videos produced by the code, any relevant screenshots/screencasts, etc.
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected outcome
+      description: Describe (or provide a visual example of) the expected outcome from the code snippet.
+    validations:
+      required: true
+  - type: textarea
+    id: details
+    attributes:
+      label: Additional information
+      description: |
+        - What are the conditions under which this bug happens? input parameters, edge cases, etc?
+        - Has this worked in earlier versions?
+        - Do you know why this bug is happening?
+        - Do you maybe even know a fix?
+  - type: input
+    id: operating-system
+    attributes:
+      label: Operating system
+      description: Windows, OS/X, Arch, Debian, Ubuntu, etc.
+  - type: input
+    id: matplotlib-version
+    attributes:
+      label: Matplotlib Version
+      description: "From Python prompt: `import matplotlib; print(matplotlib.__version__)`"
+    validations:
+      required: true
+  - type: input
+    id: matplotlib-backend
+    attributes:
+      label: Matplotlib Backend
+      description: "From Python prompt: `import matplotlib; print(matplotlib.get_backend())`"
+  - type: input
+    id: python-version
+    attributes:
+      label: Python version
+      description: "In console: `python --version`"
+  - type: input
+    id: jupyter-version
+    attributes:
+      label: Jupyter version
+      description: "In console: `jupyter notebook --version` or `jupyter lab --version`"
+  - type: dropdown
+    id: install
+    attributes:
+      label: Installation
+      description: How did you install matplotlib?
+      options:
+        - pip
+        - conda
+        - Linux package manager
+        - from source (.tar.gz)
+        - git checkout
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
deleted file mode 100644
index c0857f636db6..000000000000
--- a/.github/ISSUE_TEMPLATE/documentation.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: Documentation improvement
-about: Create a report to help us improve the documentation
-labels: Documentation
----
-
-<!--To help us understand and resolve your issue, please fill out the form to the best of your ability.-->
-<!--You can feel free to delete the sections that do not apply.-->
-
-### Problem
-
-<!--
-If you are referencing an existing piece of documentation or example please provide a link.
-
-* I found [...] to be unclear because [...]
-* [...] made me think that [...] when really it should be [...]
-* There is no example showing how to do [...]
--->
-
-
-### Suggested Improvement
-
-<!--
-If you have an idea to improve the documentation please suggest it here
-
-* This line should be be changed to say [...]
-* Include a paragraph explaining [...]
-* Add a figure showing [...]
--->
-
-**Matplotlib version**
-<!--Please specify the version of matplotlib and the version of the documentation that you are using:-->
-  * Operating system:
-  * Matplotlib version: (`import matplotlib; print(matplotlib.__version__)`)
-  * Matplotlib documentation version: (is listed under the logo)
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/documentation.yml b/.github/ISSUE_TEMPLATE/documentation.yml
new file mode 100644
index 000000000000..ea0eb385baaf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation.yml
@@ -0,0 +1,32 @@
+name: Documentation
+description: Create a report to help us improve the documentation
+title: "[Doc]: "
+labels: [Documentation]
+body:
+  - type: input
+    id: link
+    attributes:
+      label: Documentation Link
+      description: |
+        Link to any documentation or examples that you are referencing.
+        Suggested improvements should be based on the development version of the docs: https://matplotlib.org/devdocs/
+      placeholder: https://matplotlib.org/devdocs/...
+  - type: textarea
+    id: problem
+    attributes:
+      label: Problem
+      description: What is missing, unclear, or wrong in the documentation?
+      placeholder: |
+        * I found [...] to be unclear because [...]
+        * [...] made me think that [...] when really it should be [...]
+        * There is no example showing how to do [...]
+    validations:
+      required: true
+  - type: textarea
+    id: improvement
+    attributes:
+      label: Suggested improvement
+      placeholder: |
+        * This line should be be changed to say [...]
+        * Include a paragraph explaining [...]
+        * Add a figure showing [...]
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 6ca57f1ce8fa..000000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-name: Feature Request
-about: Suggest something to add to Matplotlib
-labels: New feature
----
-
-<!--
-Welcome! Thanks for thinking of a way to improve Matplotlib.
-
-
-Before creating a new feature request please search the issues for relevant feature requests.
--->
-
-### Problem
-
-<!--
-Provide a clear and concise description of the problem this feature will solve. 
-
-For example:
-* I'm always frustrated when [...] because [...]
-* I would like it if [...] happened when I [...] because [...]
-* Here is a sample image of what I am asking for [...]
--->
-
-### Proposed Solution
-
-<!-- Provide a clear and concise description of a way to accomplish what you want. For example:
-
-* Add an option so that when [...]  [...] will happen
- -->
-
-### Additional context and prior art
-
-<!-- Add any other context or screenshots about the feature request here. You can also include links to examples of other programs that have something similar to your request. For example:
-
-* Another project [...] solved this by [...]
--->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 000000000000..5274c287569c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,25 @@
+name: Feature Request
+description: Suggest something to add to Matplotlib!
+title: "[ENH]: "
+labels: [New feature]
+body:
+  - type: markdown
+    attributes:
+      value: |
+         Please search the [issues](https://github.com/matplotlib/matplotlib/issues) for relevant feature requests before creating a new feature request.
+  - type: textarea
+    id: problem
+    attributes:
+      label: Problem
+      description: Briefly describe the problem this feature will solve. (2-4 sentences)
+      placeholder: |
+        * I'm always frustrated when [...] because [...]
+        * I would like it if [...] happened when I [...] because [...]
+        * Here is a sample image of what I am asking for [...]
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Proposed solution
+      description: Describe a way to accomplish the goals of this feature request.
diff --git a/.github/ISSUE_TEMPLATE/maintenance.md b/.github/ISSUE_TEMPLATE/maintenance.md
deleted file mode 100644
index a72282892d85..000000000000
--- a/.github/ISSUE_TEMPLATE/maintenance.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Maintenance
-about: Help improve performance, usability and/or consistency.
-labels: Maintenance
----
-
-### Describe the issue
-
-**Summary**
-
-<!-- A short 1-2 sentences that succinctly describe what could be improved -->
-
-### Proposed fix
-
diff --git a/.github/ISSUE_TEMPLATE/maintenance.yml b/.github/ISSUE_TEMPLATE/maintenance.yml
new file mode 100644
index 000000000000..746ab55ef0e3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/maintenance.yml
@@ -0,0 +1,17 @@
+name: Maintenance
+description: Help improve performance, usability and/or consistency.
+title: "[MNT]: "
+labels: [Maintenance]
+body:
+  - type: textarea
+    id: summary
+    attributes:
+      label: Summary
+      description:  Please provide 1-2 short sentences that succinctly describes what could be improved.
+    validations:
+      required: true
+  - type: textarea
+    id: fix
+    attributes:
+      label: Proposed fix
+      description: Please describe how you think this could be improved.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 6c3479d74741..6ebdb4532dde 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,14 +3,15 @@
 ## PR Checklist
 
 <!-- Please mark any checkboxes that do not apply to this PR as [N/A]. -->
-
+**Tests and Styling**
 - [ ] Has pytest style unit tests (and `pytest` passes).
-- [ ] Is [Flake 8](https://flake8.pycqa.org/en/latest/) compliant (run `flake8` on changed files to check).
+- [ ] Is [Flake 8](https://flake8.pycqa.org/en/latest/) compliant (install `flake8-docstrings` and run `flake8 --docstring-convention=all`).
+
+**Documentation**
 - [ ] New features are documented, with examples if plot related.
-- [ ] Documentation is sphinx and numpydoc compliant (the docs should [build](https://matplotlib.org/devel/documenting_mpl.html#building-the-docs) without error).
-- [ ] Conforms to Matplotlib style conventions (install `flake8-docstrings` and run `flake8 --docstring-convention=all`).
 - [ ] New features have an entry in `doc/users/next_whats_new/` (follow instructions in README.rst there).
 - [ ] API changes documented in `doc/api/next_api_changes/` (follow instructions in README.rst there).
+- [ ] Documentation is sphinx and numpydoc compliant (the docs should [build](https://matplotlib.org/devel/documenting_mpl.html#building-the-docs) without error).
 
 <!--
 Thank you so much for your PR!  To help us review your contribution, please
@@ -21,7 +22,7 @@ consider the following points:
 - Help with git and github is available at
   https://matplotlib.org/devel/gitwash/development_workflow.html.
 
-- Do not create the PR out of master, but out of a separate branch.
+- Do not create the PR out of main, but out of a separate branch.
 
 - The PR title should summarize the changes, for example "Raise ValueError on
   non-numeric input to set_xlim".  Avoid non-descriptive titles such as
diff --git a/.github/workflows/cibuildsdist.yml b/.github/workflows/cibuildsdist.yml
new file mode 100644
index 000000000000..4e1d9085f5be
--- /dev/null
+++ b/.github/workflows/cibuildsdist.yml
@@ -0,0 +1,64 @@
+name: Build CI sdist and wheel
+
+on:
+  # Save CI by only running this on release branches or tags.
+  push:
+    branches:
+      - main
+      - v[0-9]+.[0-9]+.x
+    tags:
+      - v*
+  # Also allow running this action on PRs if requested by applying the
+  # "Run cibuildwheel" label.
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - labeled
+
+jobs:
+  build_sdist:
+    if: |
+      github.event_name == 'push' ||
+      github.event_name == 'pull_request' && (
+        (
+          github.event.action == 'labeled' &&
+          github.event.label.name == 'Run cibuildwheel'
+        ) ||
+        contains(github.event.pull_request.labels.*.name, 'Run cibuildwheel')
+      )
+    name: Build sdist and wheel on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-20.04]
+        python-version: ['3.8', '3.9', '3.10', '3.11.0-alpha - 3.11']
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-python@v4
+        name: Install Python
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install build
+        run: pip install build
+
+      - name: Build sdist and wheel
+        run: python -m build .
+
+      - name: Install built matplotlib sdist
+        run: pip install dist/matplotlib*.tar.gz
+
+      - name: Check version number is not 0
+        run: python ./ci/check_version_number.py
+
+      - name: Install built matplotlib wheel
+        run: pip install dist/matplotlib*.whl --force-reinstall
+
+      - name: Check version number is not 0
+        run: python ./ci/check_version_number.py
diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
index 2100d15fe000..8cf83738a32c 100644
--- a/.github/workflows/cibuildwheel.yml
+++ b/.github/workflows/cibuildwheel.yml
@@ -1,122 +1,126 @@
 name: Build CI wheels
 
 on:
+  # Save CI by only running this on release branches or tags.
   push:
     branches:
-      - master
+      - main
       - v[0-9]+.[0-9]+.x
     tags:
       - v*
+  # Also allow running this action on PRs if requested by applying the
+  # "Run cibuildwheel" label.
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - labeled
 
 jobs:
   build_wheels:
+    if: |
+      github.event_name == 'push' ||
+      github.event_name == 'pull_request' && (
+        (
+          github.event.action == 'labeled' &&
+          github.event.label.name == 'Run cibuildwheel'
+        ) ||
+        contains(github.event.pull_request.labels.*.name, 'Run cibuildwheel')
+      )
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     env:
-      min-numpy-version: "1.16.0"
-      min-numpy-hash: "04/b6/d7faa70a3e3eac39f943cc6a6a64ce378259677de516bd899dd9eb8f9b32"
+      CIBW_ARCHS_MACOS: "x86_64 universal2 arm64"
+      MACOSX_DEPLOYMENT_TARGET: "10.12"
     strategy:
       matrix:
-        os: [ubuntu-18.04, windows-latest, macos-latest]
+        os: [ubuntu-20.04, windows-latest, macos-11]
         cibw_archs: ["auto"]
         include:
-          - os: ubuntu-18.04
+          - os: ubuntu-20.04
             cibw_archs: "aarch64"
 
     steps:
       - name: Set up QEMU
         if: matrix.cibw_archs == 'aarch64'
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
         with:
           platforms: arm64
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-python@v2
-        name: Install Python
-        with:
-          python-version: '3.7'
-
-      - uses: actions/cache@v2
-        id: numpy-cache
-        with:
-          path: numpy-aarch64-cache/
-          key: numpy-${{ matrix.cibw_archs }}-cache-${{ env.min-numpy-version }}
-
-      - name: Install cibuildwheel
-        run: |
-          python -m pip install cibuildwheel==1.9.0
-
-      - name: Build minimum NumPy for aarch64
-        if: matrix.cibw_archs == 'aarch64' && steps.numpy-cache.outputs.cache-hit != 'true'
-        run: |
-          wget https://files.pythonhosted.org/packages/${{ env.min-numpy-hash }}/numpy-${{ env.min-numpy-version }}.zip
-          unzip numpy-${{ env.min-numpy-version }}.zip
-          cd numpy-${{ env.min-numpy-version }}
-          python -m cibuildwheel --output-dir ../numpy-aarch64-cache
+      - name: Build wheels for CPython 3.11
+        uses: pypa/cibuildwheel@v2.11.2
         env:
-          CIBW_BUILD: "cp36-* cp37-* cp38-*"
-          CIBW_ARCHS: aarch64
-
-      - name: Copy setup.cfg to configure wheel
-        run: |
-          cp setup.cfg.template setup.cfg
+          CIBW_BUILD: "cp311-*"
+          CIBW_SKIP: "*-musllinux*"
+          CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
+          CIBW_MANYLINUX_I686_IMAGE: manylinux2014
+          CIBW_BEFORE_BUILD: >-
+            pip install certifi oldest-supported-numpy &&
+            git clean -fxd build
+          MPL_DISABLE_FH4: "yes"
+          CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
-      - name: Build wheels for CPython 3.9
-        run: |
-          python -m cibuildwheel --output-dir dist
+      - name: Build wheels for CPython 3.10
+        uses: pypa/cibuildwheel@v2.11.2
         env:
-          CIBW_BUILD: "cp39-*"
-          CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
-          CIBW_MANYLINUX_I686_IMAGE: manylinux1
-          CIBW_BEFORE_BUILD: pip install certifi numpy==1.19.3
+          CIBW_BUILD: "cp310-*"
+          CIBW_SKIP: "*-musllinux*"
+          CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
+          CIBW_MANYLINUX_I686_IMAGE: manylinux2014
+          CIBW_BEFORE_BUILD: >-
+            pip install certifi oldest-supported-numpy &&
+            git clean -fxd build
           MPL_DISABLE_FH4: "yes"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
-      - name: Build wheels for CPython
-        run: |
-          python -m cibuildwheel --output-dir dist
+      - name: Build wheels for CPython 3.9
+        uses: pypa/cibuildwheel@v2.11.2
         env:
-          CIBW_BUILD: "cp37-* cp38-*"
-          CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
-          CIBW_MANYLINUX_I686_IMAGE: manylinux1
-          CIBW_BEFORE_BUILD: pip install certifi; pip install --find-links=numpy-aarch64-cache/ numpy==${{ env.min-numpy-version }}
+          CIBW_BUILD: "cp39-*"
+          CIBW_SKIP: "*-musllinux*"
+          CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
+          CIBW_MANYLINUX_I686_IMAGE: manylinux2014
+          CIBW_BEFORE_BUILD: >-
+            pip install certifi oldest-supported-numpy &&
+            git clean -fxd build
           MPL_DISABLE_FH4: "yes"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
-      - name: Build wheels for CPython 3.6
-        run: |
-          python -m cibuildwheel --output-dir dist
+      - name: Build wheels for CPython 3.8
+        uses: pypa/cibuildwheel@v2.11.2
         env:
-          CIBW_BUILD: "cp36-*"
-          CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
-          CIBW_MANYLINUX_I686_IMAGE: manylinux1
-          CIBW_BEFORE_BUILD: pip install certifi; pip install --find-links=numpy-aarch64-cache/ numpy==${{ env.min-numpy-version }}
+          CIBW_BUILD: "cp38-*"
+          CIBW_SKIP: "*-musllinux*"
+          CIBW_MANYLINUX_X86_64_IMAGE: manylinux2010
+          CIBW_MANYLINUX_I686_IMAGE: manylinux2010
+          CIBW_BEFORE_BUILD: >-
+            pip install certifi numpy==1.19.2 &&
+            git clean -fxd build
           MPL_DISABLE_FH4: "yes"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
-        if: >
-          startsWith(github.ref, 'refs/heads/v3.3') ||
-          startsWith(github.ref, 'refs/tags/v3.3')
 
       - name: Build wheels for PyPy
-        run: |
-          python -m cibuildwheel --output-dir dist
+        uses: pypa/cibuildwheel@v2.11.2
         env:
-          CIBW_BUILD: "pp3?-*"
-          CIBW_BEFORE_BUILD: pip install certifi numpy==${{ env.min-numpy-version }}
+          CIBW_BUILD: "pp38-* pp39-*"
+          CIBW_SKIP: "*-musllinux*"
+          CIBW_BEFORE_BUILD: >-
+            pip install certifi oldest-supported-numpy &&
+            git clean -fxd build
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
-        if: >
-          runner.os != 'Windows' && (
-          startsWith(github.ref, 'refs/heads/v3.3') ||
-          startsWith(github.ref, 'refs/tags/v3.3') )
+        if: matrix.cibw_archs != 'aarch64'
 
       - name: Validate that LICENSE files are included in wheels
         run: |
-          python ./ci/check_wheel_licenses.py
+          python3 ./ci/check_wheel_licenses.py
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: wheels
-          path: ./dist/*.whl
+          path: ./wheelhouse/*.whl
+          if-no-files-found: error
diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml
index f11792486640..5c1c2c60331f 100644
--- a/.github/workflows/circleci.yml
+++ b/.github/workflows/circleci.yml
@@ -9,4 +9,5 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           artifact-path: 0/doc/build/html/index.html
-          circleci-jobs: docs-python36,docs-python37,docs-python38
+          circleci-jobs: docs-python38
+          job-title: View the built docs
diff --git a/.github/workflows/clean_pr.yml b/.github/workflows/clean_pr.yml
new file mode 100644
index 000000000000..f807ccf8506c
--- /dev/null
+++ b/.github/workflows/clean_pr.yml
@@ -0,0 +1,43 @@
+name: PR cleanliness
+on: [pull_request]
+
+jobs:
+  pr_clean:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: '0'
+      - name: Check for added-and-deleted files
+        run: |
+          git fetch --quiet origin "$GITHUB_BASE_REF"
+          base="$(git merge-base "origin/$GITHUB_BASE_REF" 'HEAD^2')"
+          ad="$(git log "$base..HEAD^2" --pretty=tformat: --name-status --diff-filter=AD |
+                cut --fields 2 | sort | uniq --repeated)"
+          if [[ -n "$ad" ]]; then
+            printf 'The following files were both added and deleted in this PR:\n%s\n' "$ad"
+            exit 1
+          fi
+      - name: Check for added-and-modified images
+        run: |
+          git fetch --quiet origin "$GITHUB_BASE_REF"
+          base="$(git merge-base "origin/$GITHUB_BASE_REF" 'HEAD^2')"
+          am="$(git log "$base..HEAD^2" --pretty=tformat: --name-status --diff-filter=AM |
+                cut --fields 2 | sort | uniq --repeated |
+                grep -E '\.(png|pdf|ps|eps|svg)' || true)"
+          if [[ -n "$am" ]]; then
+            printf 'The following images were both added and modified in this PR:\n%s\n' "$am"
+            exit 1
+          fi
+      - name: Check for invalid backports to -doc branches
+        if: endsWith(github.base_ref, '-doc')
+        run: |
+          git fetch --quiet origin "$GITHUB_BASE_REF"
+          base="$(git merge-base "origin/$GITHUB_BASE_REF" 'HEAD^2')"
+          lib="$(git log "$base..HEAD^2" --pretty=tformat: --name-status -- lib src |
+                 cut --fields 2 | sort || true)"
+          if [[ -n "$lib" ]]; then
+            printf 'Changes to the following files have no effect and should not be backported:\n%s\n' "$lib"
+            exit 1
+          fi
diff --git a/.github/workflows/nightlies.yml b/.github/workflows/nightlies.yml
new file mode 100644
index 000000000000..48c6e9713a8d
--- /dev/null
+++ b/.github/workflows/nightlies.yml
@@ -0,0 +1,84 @@
+name: Upload nightly wheels to Anaconda Cloud
+
+on:
+  # Run daily at 1:23 UTC to upload nightly wheels to Anaconda Cloud
+  schedule:
+    - cron: '23 1 * * *'
+  # Run on demand with workflow dispatch
+  workflow_dispatch:
+
+jobs:
+  upload_nightly_wheels:
+    name: Upload nightly wheels to Anaconda Cloud
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash -l {0}
+    if: github.repository_owner == 'matplotlib'
+
+    steps:
+      # c.f. https://github.com/actions/download-artifact/issues/3#issuecomment-1017141067
+      - name: Download wheel artifacts from last build on 'main'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          PROJECT_REPO="matplotlib/matplotlib"
+          BRANCH="main"
+          WORKFLOW_NAME="cibuildwheel.yml"
+          ARTIFACT_NAME="wheels"
+
+          gh run --repo "${PROJECT_REPO}" \
+             list --branch "${BRANCH}" \
+                  --workflow "${WORKFLOW_NAME}" \
+                  --json event,status,databaseId > runs.json
+          # Filter on 'push' events to main (merged PRs) that have completed
+          jq --compact-output \
+            '[ .[] | select(.event == "push") | select(.status == "completed") ]' \
+            runs.json > pushes.json
+          # Get id of latest build of wheels
+          RUN_ID=$(
+            jq --compact-output \
+              'sort_by(.databaseId) | reverse | .[0].databaseId' pushes.json
+          )
+          gh run --repo "${PROJECT_REPO}" \
+             download "${RUN_ID}" --name "${ARTIFACT_NAME}"
+
+          mkdir dist
+          mv *.whl dist/
+          ls -l dist/
+
+        # N.B. anaconda-client is only maintained on the main channel
+      - name: Install anaconda-client
+        uses: mamba-org/provision-with-micromamba@v12
+        with:
+          environment-file: false
+          environment-name: nightlies
+          extra-specs: anaconda-client=1.10.0
+          channels: main
+
+      - name: Upload wheels to Anaconda Cloud as nightlies
+        run: |
+          anaconda --token ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }} upload \
+            --user scipy-wheels-nightly \
+            --skip-existing \
+            dist/matplotlib-*.whl
+
+      - name: Remove old uploads to save space
+        run: |
+          N_LATEST_UPLOADS=5
+
+          # Remove all _but_ the last "${N_LATEST_UPLOADS}" package versions
+          # N.B.: `anaconda show` places the newest packages at the bottom of the output
+          # of the 'Versions' section and package versions are preceded with a '   + '.
+          anaconda show scipy-wheels-nightly/matplotlib &> >(grep '+') | \
+              sed 's/.* + //' | \
+              head --lines "-${N_LATEST_UPLOADS}" > remove-package-versions.txt
+
+          if [ -s remove-package-versions.txt ]; then
+              while LANG=C IFS= read -r package_version ; do
+                  echo "# Removing scipy-wheels-nightly/matplotlib/${package_version}"
+                  anaconda --token ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }} remove \
+                    --force \
+                    "scipy-wheels-nightly/matplotlib/${package_version}"
+              done <remove-package-versions.txt
+          fi
diff --git a/.github/workflows/pr_welcome.yml b/.github/workflows/pr_welcome.yml
index 95a3976cd443..1e2627c911af 100644
--- a/.github/workflows/pr_welcome.yml
+++ b/.github/workflows/pr_welcome.yml
@@ -7,29 +7,29 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/first-interaction@v1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        pr-message: >+
-          Thank you for opening your first PR into Matplotlib!
+      - uses: actions/first-interaction@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          pr-message: >+
+            Thank you for opening your first PR into Matplotlib!
 
 
-          If you have not heard from us in a while, please feel free to
-          ping `@matplotlib/developers` or anyone who has commented on the
-          PR.  Most of our reviewers are volunteers and sometimes
-          things fall through the cracks.
+            If you have not heard from us in a while, please feel free to ping
+            `@matplotlib/developers` or anyone who has commented on the PR.
+            Most of our reviewers are volunteers and sometimes things fall
+            through the cracks.
 
 
-          You can also join us [on
-          gitter](https://gitter.im/matplotlib/matplotlib) for real-time
-          discussion.
+            You can also join us [on
+            gitter](https://gitter.im/matplotlib/matplotlib) for real-time
+            discussion.
 
 
-          For details on testing, writing docs, and our review process,
-          please see [the developer
-          guide](https://matplotlib.org/devdocs/devel/index.html)
+            For details on testing, writing docs, and our review process,
+            please see [the developer
+            guide](https://matplotlib.org/devdocs/devel/index.html)
 
 
-          We strive to be a welcoming and open project. Please follow our
-          [Code of
-          Conduct](https://github.com/matplotlib/matplotlib/blob/master/CODE_OF_CONDUCT.md).
+            We strive to be a welcoming and open project. Please follow our
+            [Code of
+            Conduct](https://github.com/matplotlib/matplotlib/blob/main/CODE_OF_CONDUCT.md).
diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml
index 9ec0abf942ba..4528c39234c9 100644
--- a/.github/workflows/reviewdog.yml
+++ b/.github/workflows/reviewdog.yml
@@ -6,10 +6,10 @@ jobs:
     name: flake8
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python 3
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
 
@@ -37,7 +37,7 @@ jobs:
     name: eslint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: eslint
         uses: reviewdog/action-eslint@v1
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e5d7e064f55e..08766f006f5b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,4 +1,7 @@
 name: Tests
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.number }}-${{ github.event.ref }}
+  cancel-in-progress: true
 
 on:
   push:
@@ -6,6 +9,13 @@ on:
       - auto-backport-of-pr-[0-9]+
       - v[0-9]+.[0-9]+.[0-9x]+-doc
   pull_request:
+    branches-ignore:
+      - v[0-9]+.[0-9]+.[0-9x]+-doc
+  schedule:
+    # 3:47 UTC on Saturdays
+    - cron: "47 3 * * 6"
+  workflow_dispatch:
+    workflow: "*"
 
 env:
   NO_AT_BRIDGE: 1  # Necessary for GTK3 interactive test.
@@ -14,6 +24,7 @@ env:
 
 jobs:
   test:
+    if: "github.event_name == 'workflow_dispatch' || github.repository == 'matplotlib/matplotlib' && !contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[skip github]')"
     name: "Python ${{ matrix.python-version }} on ${{ matrix.os }} ${{ matrix.name-suffix }}"
     runs-on: ${{ matrix.os }}
 
@@ -22,32 +33,36 @@ jobs:
       matrix:
         include:
           - name-suffix: "(Minimum Versions)"
-            os: ubuntu-16.04
-            python-version: 3.7
+            os: ubuntu-20.04
+            python-version: 3.8
             extra-requirements: '-c requirements/testing/minver.txt'
-            pyqt5-ver: '==5.8 sip==4.19.7'  # oldest versions with a Py3.7 wheel.
+            pyqt5-ver: '==5.11.2 sip==5.0.0'  # oldest versions with a Py3.8 wheel.
+            pyqt6-ver: '==6.1.0 PyQt6-Qt6==6.1.0'
+            pyside2-ver: '==5.14.0'  # oldest version with working Py3.8 wheel.
+            pyside6-ver: '==6.0.0'
             delete-font-cache: true
-            XVFB_RUN: xvfb-run -a
-          - os: ubuntu-16.04
-            python-version: 3.7
+          - os: ubuntu-20.04
+            python-version: 3.8
             extra-requirements: '-r requirements/testing/extra.txt'
-            XVFB_RUN: xvfb-run -a
             CFLAGS: "-fno-lto"  # Ensure that disabling LTO works.
-          - os: ubuntu-16.04
-            python-version: 3.8
+          - os: ubuntu-20.04
+            python-version: 3.9
             extra-requirements: '-r requirements/testing/extra.txt'
-            XVFB_RUN: xvfb-run -a
+          - os: ubuntu-20.04
+            python-version: '3.10'
+            extra-requirements: '-r requirements/testing/extra.txt'
+          - os: ubuntu-20.04
+            python-version: '3.11.0-rc.1'
           - os: macos-latest
             python-version: 3.8
-            XVFB_RUN: ""
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -61,6 +76,7 @@ jobs:
               cm-super \
               dvipng \
               ffmpeg \
+              fonts-noto-cjk \
               gdb \
               gir1.2-gtk-3.0 \
               graphviz \
@@ -91,47 +107,52 @@ jobs:
               texlive-luatex \
               texlive-xetex \
               ttf-wqy-zenhei
+            if [[ "${{ matrix.os }}" = ubuntu-20.04 ]]; then
+              sudo apt install -yy libopengl0
+            fi
             ;;
           macOS)
             brew install ccache
+            brew tap homebrew/cask-fonts
+            brew install font-noto-sans-cjk
             ;;
           esac
 
       - name: Cache pip
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         if: startsWith(runner.os, 'Linux')
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('requirements/*/*.txt') }}
+          key: ${{ matrix.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('requirements/*/*.txt') }}
           restore-keys: |
-            ${{ runner.os }}-py${{ matrix.python-version }}-pip-
+            ${{ matrix.os }}-py${{ matrix.python-version }}-pip-
       - name: Cache pip
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         if: startsWith(runner.os, 'macOS')
         with:
           path: ~/Library/Caches/pip
-          key: ${{ runner.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('requirements/*/*.txt') }}
+          key: ${{ matrix.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('requirements/*/*.txt') }}
           restore-keys: |
-            ${{ runner.os }}-py${{ matrix.python-version }}-pip-
+            ${{ matrix.os }}-py${{ matrix.python-version }}-pip-
       - name: Cache ccache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.ccache
-          key: ${{ runner.os }}-py${{ matrix.python-version }}-ccache-${{ hashFiles('src/*') }}
+          key: ${{ matrix.os }}-py${{ matrix.python-version }}-ccache-${{ hashFiles('src/*') }}
           restore-keys: |
-            ${{ runner.os }}-py${{ matrix.python-version }}-ccache-
+            ${{ matrix.os }}-py${{ matrix.python-version }}-ccache-
       - name: Cache Matplotlib
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.cache/matplotlib
             !~/.cache/matplotlib/tex.cache
             !~/.cache/matplotlib/test_cache
-          key: ${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-${{ github.sha }}
+          key: 2-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-
-            ${{ runner.os }}-py${{ matrix.python-version }}-mpl-
+            2-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-
+            2-${{ runner.os }}-py${{ matrix.python-version }}-mpl-
 
       - name: Install Python dependencies
         run: |
@@ -141,7 +162,8 @@ jobs:
 
           # Install dependencies from PyPI.
           python -m pip install --upgrade $PRE \
-            cycler kiwisolver numpy pillow pyparsing python-dateutil \
+            'contourpy>=1.0.1' cycler fonttools kiwisolver numpy packaging \
+            pillow pyparsing python-dateutil setuptools-scm \
             -r requirements/testing/all.txt \
             ${{ matrix.extra-requirements }}
 
@@ -155,37 +177,50 @@ jobs:
           # (sometimes, the install appears to be successful but shared
           # libraries cannot be loaded at runtime, so an actual import is a
           # better check).
+          # PyGObject, pycairo, and cariocffi do not install on OSX 10.12.
+           python -m pip install --upgrade pycairo 'cairocffi>=0.8' PyGObject &&
+             python -c 'import gi; gi.require_version("Gtk", "3.0"); from gi.repository import Gtk' &&
+             echo 'PyGObject is available' ||
+             echo 'PyGObject is not available'
+
+          # There are no functioning wheels available for OSX 10.12 (as of
+          # Sept 2020) for either pyqt5 (there are only wheels for 10.13+) or
+          # pyside2 (the latest version (5.13.2) with 10.12 wheels has a
+          # fatal to us bug, it was fixed in 5.14.0 which has 10.13 wheels)
+          python -mpip install --upgrade pyqt5${{ matrix.pyqt5-ver }} &&
+            python -c 'import PyQt5.QtCore' &&
+            echo 'PyQt5 is available' ||
+            echo 'PyQt5 is not available'
           if [[ "${{ runner.os }}" != 'macOS' ]]; then
-            # PyGObject, pycairo, and cariocffi do not install on OSX 10.12;
-            # pycairo 1.20+ requires a new version of Cairo, unavailable on
-            # Ubuntu 16.04, so PyGObject must be installed without build
-            # isolation in order to pick up the lower pre-installed version.
-             python -m pip install --upgrade 'pycairo<1.20.0' 'cairocffi>=0.8' &&
-             python -m pip install --upgrade --no-build-isolation PyGObject &&
-               python -c 'import gi; gi.require_version("Gtk", "3.0"); from gi.repository import Gtk' &&
-               echo 'PyGObject is available' ||
-               echo 'PyGObject is not available'
-
-            # There are no functioning wheels available for OSX 10.12 (as of
-            # Sept 2020) for either pyqt5 (there are only wheels for 10.13+) or
-            # pyside2 (the latest version (5.13.2) with 10.12 wheels has a
-            # fatal to us bug, it was fixed in 5.14.0 which has 10.13 wheels)
-             python -m pip install --upgrade pyqt5${{ matrix.pyqt5-ver }} &&
-               python -c 'import PyQt5.QtCore' &&
-               echo 'PyQt5 is available' ||
-               echo 'PyQt5 is not available'
-             python -m pip install --upgrade pyside2 &&
-               python -c 'import PySide2.QtCore' &&
-               echo 'PySide2 is available' ||
-               echo 'PySide2 is not available'
+            python -mpip install --upgrade pyside2${{ matrix.pyside2-ver }} &&
+              python -c 'import PySide2.QtCore' &&
+              echo 'PySide2 is available' ||
+              echo 'PySide2 is not available'
+          fi
+          if [[ "${{ matrix.os }}" = ubuntu-20.04 ]]; then
+            python -mpip install --upgrade pyqt6${{ matrix.pyqt6-ver }} &&
+              python -c 'import PyQt6.QtCore' &&
+              echo 'PyQt6 is available' ||
+              echo 'PyQt6 is not available'
+            python -mpip install --upgrade pyside6${{ matrix.pyside6-ver }} &&
+              python -c 'import PySide6.QtCore' &&
+              echo 'PySide6 is available' ||
+              echo 'PySide6 is not available'
           fi
-          python -m pip install --upgrade \
-            -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-16.04 \
+
+          python -mpip install --upgrade \
+            -f "https://extras.wxpython.org/wxPython4/extras/linux/gtk3/${{ matrix.os }}" \
             wxPython &&
             python -c 'import wx' &&
             echo 'wxPython is available' ||
             echo 'wxPython is not available'
 
+      - name: Install the nightly dependencies
+        # Only install the nightly dependencies during the scheduled event
+        if: ${{ github.event_name == 'schedule' && matrix.name-suffix != '(Minimum Versions)' }}
+        run: |
+          python -m pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple --upgrade numpy pandas
+
       - name: Install Matplotlib
         run: |
           ccache -s
@@ -194,12 +229,23 @@ jobs:
           # Set flag in a delayed manner to avoid issues with installing other
           # packages
           if [[ "${{ runner.os }}" != 'macOS' ]]; then
-            export CPPFLAGS=--coverage
+            if [[ "$(lsb_release -r -s)" == "20.04" ]]; then
+              export CPPFLAGS='--coverage -fprofile-abs-path'
+            else
+              export CPPFLAGS='--coverage'
+            fi
           fi
 
+          cat <<EOT >> mplsetup.cfg
+          [rc_options]
+          backend=Agg
+          EOT
+
+          cat mplsetup.cfg
+
           # All dependencies must have been pre-installed, so that the minver
           # constraints are held.
-          python -m pip install --no-deps -e .
+          python -m pip install --no-deps -ve .
 
           if [[ "${{ runner.os }}" != 'macOS' ]]; then
             unset CPPFLAGS
@@ -212,9 +258,9 @@ jobs:
 
       - name: Run pytest
         run: |
-          ${{ matrix.XVFB_RUN }} python -mpytest -raR -n auto \
+          python -mpytest -raR -n auto \
             --maxfail=50 --timeout=300 --durations=25 \
-            --cov-report= --cov=lib --log-level=DEBUG
+            --cov-report=xml --cov=lib --log-level=DEBUG --color=yes
 
       - name: Filter C coverage
         run: |
@@ -225,4 +271,33 @@ jobs:
           find . -name '*.gc*' -delete
         if: ${{ runner.os != 'macOS' }}
       - name: Upload code coverage
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
+
+      - uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: "${{ matrix.python-version }} ${{ matrix.os }} ${{ matrix.name-suffix }} result images"
+          path: ./result_images
+
+  # Separate dependent job to only upload one issue from the matrix of jobs
+  create-issue:
+    runs-on: ubuntu-latest
+    needs: [test]
+    if: ${{ failure() && github.event_name == 'schedule' }}
+    name: "Create issue on failure"
+
+    steps:
+      - name: Create issue on failure
+        uses: imjohnbo/issue-bot@v3
+        with:
+          title: "[TST] Upcoming dependency test failures"
+          body: |
+            The weekly build with nightly wheels from numpy and pandas
+            has failed. Check the logs for any updates that need to be
+            made in matplotlib.
+            https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
+
+          pinned: false
+          close-previous: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
deleted file mode 100644
index c8c280e92029..000000000000
--- a/.github/workflows/wheels.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-on: 
-  push:
-    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+*'
-jobs:
-  trigger_wheel_builds:
-    runs-on: ubuntu-latest
-    name: Trigger macOS and manylinux wheel builds
-    if: github.repository == 'matplotlib/matplotlib'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          repository: MacPython/matplotlib-wheels
-          ssh-key: ${{ secrets.WHEEL_DEPLOY_KEY }}
-          fetch-depth: 0
-      - name: Prepare build commit
-        id: commit
-        shell: bash
-        run: |
-          TAG="${GITHUB_REF#refs/tags/}"
-          BRANCH="$(echo ${TAG} | sed 's/^v\([0-9]\+\.[0-9]\+\)\.[0-9]\+.*$/build-\1.x/')"
-          echo "${BRANCH}"
-          echo "##[set-output name=branch;]${BRANCH}"
-          git branch ${BRANCH} master || true
-          git checkout ${BRANCH}
-          sed -i -e "s/\(- BUILD_COMMIT=\).\+/\1${TAG}/g" .travis.yml
-          git add .travis.yml
-          git config --global user.name 'Matplotlib Actions Bot'
-          git config --global user.email 'matplotlib@users.noreply.github.com'
-          git commit -m "REL: $TAG"
-      - name: Push to matplotlib-wheels
-        run: |
-          git push origin ${{ steps.commit.outputs.branch }}
diff --git a/.gitignore b/.gitignore
index c7938f61703a..7d0e549e0125 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,9 @@ dist
 pip-wheel-metadata/*
 # tox testing tool
 .tox
-setup.cfg
+mplsetup.cfg
+# generated by setuptools_scm
+lib/matplotlib/_version.py
 
 # OS generated files #
 ######################
@@ -54,8 +56,6 @@ Thumbs.db
 
 # Things specific to this project #
 ###################################
-lib/matplotlib/mpl-data/matplotlib.conf
-lib/matplotlib/mpl-data/matplotlibrc
 tutorials/intermediate/CL01.png
 tutorials/intermediate/CL02.png
 
@@ -67,10 +67,12 @@ doc/api/_as_gen
 # autogenerated by sphinx-gallery
 doc/examples
 doc/gallery
-doc/tutorials
 doc/modules
+doc/plot_types
 doc/pyplots/tex_demo.png
+doc/tutorials
 lib/dateutil
+examples/*/*.bmp
 examples/*/*.eps
 examples/*/*.pdf
 examples/*/*.png
diff --git a/.lgtm.yml b/.lgtm.yml
index b48a4f003db0..26ba8816b3f5 100644
--- a/.lgtm.yml
+++ b/.lgtm.yml
@@ -1,14 +1,18 @@
+extraction:
+  python:
+    python_setup:
+      version: 3
 path_classifiers:
-    examples:
-        # Exclude example files from analysis by tagging them.
-        # We intentionally use multiple imports and unused variables in the
-        # examples to make them more explicit. These generate a lot of alerts.
-        # Since lgtm does not yet support suppressing selected alerts per
-        # file, we currently deactivate analysis completely here. May be
-        # reactivated when we can selectively suppress
-        # - py/import-and-import-from
-        # - py/repeated-import
-        # - py/unused-local-variable
-        # - py/multiple-definition
-        - examples
-        - tutorials
+  examples:
+    # Exclude example files from analysis by tagging them.
+    # We intentionally use multiple imports and unused variables in the
+    # examples to make them more explicit. These generate a lot of alerts.
+    # Since lgtm does not yet support suppressing selected alerts per
+    # file, we currently deactivate analysis completely here. May be
+    # reactivated when we can selectively suppress
+    # - py/import-and-import-from
+    # - py/repeated-import
+    # - py/unused-local-variable
+    # - py/multiple-definition
+    - examples
+    - tutorials
diff --git a/.matplotlib-repo b/.matplotlib-repo
new file mode 100644
index 000000000000..0b1d699bcdb1
--- /dev/null
+++ b/.matplotlib-repo
@@ -0,0 +1,3 @@
+The existence of this file signals that the code is a matplotlib source repo
+and not an installed version. We use this in __init__.py for gating version
+detection.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 000000000000..86ceee894c64
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,43 @@
+ci:
+  autofix_prs: false
+  autoupdate_schedule: 'quarterly'
+exclude: |
+  (?x)^(
+    extern|
+    LICENSE|
+    lib/matplotlib/mpl-data|
+    doc/devel/gitwash|
+    doc/users/prev|
+    doc/api/prev|
+    lib/matplotlib/tests/tinypages
+    )
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-docstring-first
+      - id: end-of-file-fixer
+        exclude_types: [svg]
+      - id: mixed-line-ending
+      - id: name-tests-test
+        args: ["--pytest-test-first"]
+      - id: trailing-whitespace
+        exclude_types: [svg]
+  - repo: https://github.com/pycqa/flake8
+    rev: 4.0.1
+    hooks:
+      - id: flake8
+        additional_dependencies: [pydocstyle>5.1.0, flake8-docstrings>1.4.0]
+        args: ["--docstring-convention=all"]
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.1.0
+    hooks:
+      - id: codespell
+        files: ^.*\.(py|c|cpp|h|m|md|rst|yml)$
+        args: [
+          "--ignore-words",
+          "ci/codespell-ignore-words.txt",
+          "--skip",
+          "doc/users/project/credits.rst"
+          ]
diff --git a/doc/MCSE.2007.55.bib b/CITATION.bib
similarity index 100%
rename from doc/MCSE.2007.55.bib
rename to CITATION.bib
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index f049ad177251..1e35beeaf357 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -61,10 +61,13 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-matplotlib@numfocus.org (monitored by Thomas Caswell (\@tacaswell) and Hannah
-Aizenman (\@story645)) or a report can be made using the [NumFOCUS Code of Conduct report form][numfocus form]. 
-If community leaders cannot come to a resolution about enforcement, reports will be escalated to the NumFocus Code of Conduct committee (conduct@numfocus.org).
-All complaints will be reviewed and investigated promptly and fairly.
+[matplotlib-coc@numfocus.org](mailto:matplotlib-coc@numfocus.org)
+(monitored by the [CoC subcommittee](https://matplotlib.org/governance/people.html#coc-subcommittee)) or a
+report can be made using the [NumFOCUS Code of Conduct report form][numfocus
+form].  If community leaders cannot come to a resolution about enforcement,
+reports will be escalated to the NumFocus Code of Conduct committee
+(conduct@numfocus.org).  All complaints will be reviewed and investigated
+promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the
 reporter of any incident.
diff --git a/INSTALL.rst b/INSTALL.rst
index fea85b3e8af6..ac24c70ac518 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -1,147 +1 @@
-==================
-Installation Guide
-==================
-
-.. note::
-
-    If you wish to contribute to the project, it's recommended you
-    :ref:`install the latest development version<install_from_source>`.
-
-.. contents::
-
-Installing an official release
-==============================
-
-Matplotlib and its dependencies are available as wheel packages for macOS,
-Windows and Linux distributions::
-
-  python -m pip install -U pip
-  python -m pip install -U matplotlib
-
-If this command results in Matplotlib being compiled from source and
-there's trouble with the compilation, you can add ``--prefer-binary`` to
-select the newest version of Matplotlib for which there is a
-precompiled wheel for your OS and Python.
-
-.. note::
-
-   The following backends work out of the box: Agg, ps, pdf, svg
-
-   Python is typically shipped with tk bindings which are used by
-   TkAgg.
-
-   For support of other GUI frameworks, LaTeX rendering, saving
-   animations and a larger selection of file formats, you can
-   install :ref:`optional_dependencies`.
-
-Although not required, we suggest also installing ``IPython`` for
-interactive use.  To easily install a complete Scientific Python
-stack, see :ref:`install_scipy_dists` below.
-
-Third-party distributions of Matplotlib
-=======================================
-
-.. _install_scipy_dists:
-
-Scientific Python Distributions
--------------------------------
-
-`Anaconda <https://www.anaconda.com/>`_ and `ActiveState
-<https://www.activestate.com/activepython/downloads>`_ are excellent
-choices that "just work" out of the box for Windows, macOS and common
-Linux platforms. `WinPython <https://winpython.github.io/>`_ is an
-option for Windows users.  All of these distributions include
-Matplotlib and *lots* of other useful (data) science tools.
-
-Linux: using your package manager
----------------------------------
-
-If you are on Linux, you might prefer to use your package manager.  Matplotlib
-is packaged for almost every major Linux distribution.
-
-* Debian / Ubuntu: ``sudo apt-get install python3-matplotlib``
-* Fedora: ``sudo dnf install python3-matplotlib``
-* Red Hat: ``sudo yum install python3-matplotlib``
-* Arch: ``sudo pacman -S python-matplotlib``
-
-.. _install_from_source:
-
-Installing from source
-======================
-
-If you are interested in contributing to Matplotlib development,
-running the latest source code, or just like to build everything
-yourself, it is not difficult to build Matplotlib from source.
-
-First you need to install the :ref:`dependencies`.
-
-A C compiler is required.  Typically, on Linux, you will need ``gcc``, which
-should be installed using your distribution's package manager; on macOS, you
-will need xcode_; on Windows, you will need Visual Studio 2015 or later.
-
-.. _xcode: https://guide.macports.org/chunked/installing.html#installing.xcode
-
-The easiest way to get the latest development version to start contributing
-is to go to the git `repository <https://github.com/matplotlib/matplotlib>`_
-and run::
-
-  git clone https://github.com/matplotlib/matplotlib.git
-  
-or::
-
-  git clone git@github.com:matplotlib/matplotlib.git
-
-If you're developing, it's better to do it in editable mode. The reason why
-is that pytest's test discovery only works for Matplotlib
-if installation is done this way. Also, editable mode allows your code changes
-to be instantly propagated to your library code without reinstalling (though
-you will have to restart your python process / kernel)::
-
-  cd matplotlib
-  python -m pip install -e .
-
-If you're not developing, it can be installed from the source directory with
-a simple (just replace the last step)::
-
-  python -m pip install .
-
-To run the tests you will need to install some additional dependencies::
-
-  python -m pip install -r requirements/dev/dev-requirements.txt
-  
-Then, if you want to update your Matplotlib at any time, just do::
-
-  git pull
-
-When you run ``git pull``, if the output shows that only Python files have
-been updated, you are all set. If C files have changed, you need to run ``pip
-install -e .`` again to compile them.
-
-There is more information on :ref:`using git <using-git>` in the developer
-docs.
-
-.. warning::
-
-  The following instructions in this section are for very custom
-  installations of Matplotlib. Proceed with caution because these instructions
-  may result in your build producing unexpected behavior and/or causing
-  local testing to fail.
-
-If you would like to build from a tarball, grab the latest *tar.gz* release
-file from `the PyPI files page <https://pypi.org/project/matplotlib/>`_.
-
-We provide a `setup.cfg`_ file which you can use to customize the build
-process. For example, which default backend to use, whether some of the
-optional libraries that Matplotlib ships with are installed, and so on.  This
-file will be particularly useful to those packaging Matplotlib.
-
-.. _setup.cfg: https://raw.githubusercontent.com/matplotlib/matplotlib/master/setup.cfg.template
-
-Building on Windows
--------------------
-
-Compiling Matplotlib (or any other extension module, for that matter) requires
-Visual Studio 2015 or later.
-
-If you are building your own Matplotlib wheels (or sdists), note that any DLLs
-that you copy into the source tree will be packaged too.
+See doc/users/installing/index.rst
diff --git a/LICENSE/LICENSE_COURIERTEN b/LICENSE/LICENSE_COURIERTEN
new file mode 100644
index 000000000000..c6d3fd7410a2
--- /dev/null
+++ b/LICENSE/LICENSE_COURIERTEN
@@ -0,0 +1,18 @@
+The Courier10PitchBT-Bold.pfb file is a Type-1 version of
+Courier 10 Pitch BT Bold by Bitstream, obtained from
+<https://ctan.org/tex-archive/fonts/courierten>. It is included
+here as test data only, but the following license applies.
+
+
+(c) Copyright 1989-1992, Bitstream Inc., Cambridge, MA.
+
+You are hereby granted permission under all Bitstream propriety rights
+to use, copy, modify, sublicense, sell, and redistribute the 4 Bitstream
+Charter (r) Type 1 outline fonts and the 4 Courier Type 1 outline fonts
+for any purpose and without restriction; provided, that this notice is
+left intact on all copies of such fonts and that Bitstream's trademark
+is acknowledged as shown below on all unmodified copies of the 4 Charter
+Type 1 fonts.
+
+BITSTREAM CHARTER is a registered trademark of Bitstream Inc.
+
diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index 35f058f9aaa9..000000000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,18 +0,0 @@
-include INSTALL.rst README.rst
-include pytest.ini
-include MANIFEST.in
-include matplotlibrc.template setup.cfg.template
-include setupext.py setup.py
-recursive-include LICENSE *
-recursive-include doc *
-recursive-include examples *
-recursive-include extern *
-recursive-include lib *
-recursive-include lib/matplotlib/mpl-data *
-recursive-include src  *.cpp *.c *.h *.m
-recursive-include tools *
-recursive-include tutorials *
-include versioneer.py
-include lib/matplotlib/_version.py
-include tests.py
-recursive-exclude lib/matplotlib/backends/web_backend/node_modules *
diff --git a/README.rst b/README.rst
index 1142327a30e8..c07329b14e14 100644
--- a/README.rst
+++ b/README.rst
@@ -7,16 +7,16 @@
 .. |GitHubActions| image:: https://github.com/matplotlib/matplotlib/workflows/Tests/badge.svg
 .. _GitHubActions: https://github.com/matplotlib/matplotlib/actions?query=workflow%3ATests
 
-.. |AzurePipelines| image:: https://dev.azure.com/matplotlib/matplotlib/_apis/build/status/matplotlib.matplotlib?branchName=master
-.. _AzurePipelines: https://dev.azure.com/matplotlib/matplotlib/_build/latest?definitionId=1&branchName=master
+.. |AzurePipelines| image:: https://dev.azure.com/matplotlib/matplotlib/_apis/build/status/matplotlib.matplotlib?branchName=main
+.. _AzurePipelines: https://dev.azure.com/matplotlib/matplotlib/_build/latest?definitionId=1&branchName=main
 
-.. |AppVeyor| image:: https://ci.appveyor.com/api/projects/status/github/matplotlib/matplotlib?branch=master&svg=true
+.. |AppVeyor| image:: https://ci.appveyor.com/api/projects/status/github/matplotlib/matplotlib?branch=main&svg=true
 .. _AppVeyor: https://ci.appveyor.com/project/matplotlib/matplotlib
 
-.. |Codecov| image:: https://codecov.io/github/matplotlib/matplotlib/badge.svg?branch=master&service=github
-.. _Codecov: https://codecov.io/github/matplotlib/matplotlib?branch=master
+.. |Codecov| image:: https://codecov.io/github/matplotlib/matplotlib/badge.svg?branch=main&service=github
+.. _Codecov: https://codecov.io/github/matplotlib/matplotlib?branch=main
 
-.. |LGTM| image:: https://img.shields.io/lgtm/grade/python/g/matplotlib/matplotlib.svg?logo=lgtm&logoWidth=18
+.. |LGTM| image:: https://img.shields.io/lgtm/grade/python/github/matplotlib/matplotlib.svg?logo=lgtm&logoWidth=18
 .. _LGTM: https://lgtm.com/projects/g/matplotlib/matplotlib
 
 .. |DiscourseBadge| image:: https://img.shields.io/badge/help_forum-discourse-blue.svg
@@ -42,53 +42,53 @@
 
 .. image:: https://matplotlib.org/_static/logo2.svg
 
-Matplotlib is a comprehensive library for creating static, animated, and interactive visualizations in Python.
+Matplotlib is a comprehensive library for creating static, animated, and
+interactive visualizations in Python.
 
 Check out our `home page <https://matplotlib.org/>`_ for more information.
 
 .. image:: https://matplotlib.org/_static/readme_preview.png
 
-Matplotlib produces publication-quality figures in a variety of hardcopy formats
-and interactive environments across platforms. Matplotlib can be used in Python scripts,
-the Python and IPython shell, web application servers, and various
-graphical user interface toolkits.
+Matplotlib produces publication-quality figures in a variety of hardcopy
+formats and interactive environments across platforms. Matplotlib can be used
+in Python scripts, Python/IPython shells, web application servers, and
+various graphical user interface toolkits.
 
 
 Install
 =======
 
-For installation instructions and requirements, see `INSTALL.rst <INSTALL.rst>`_  or the
-`install <https://matplotlib.org/users/installing.html>`_ documentation.
-
-Test
-====
-
-After installation, launch the test suite::
-
-  python -m pytest
-
-Read the `testing guide <https://matplotlib.org/devel/testing.html>`_ for more information and alternatives.
+For installation instructions and requirements, see the `install documentation
+<https://matplotlib.org/stable/users/installing/index.html>`_ or
+`installing.rst <doc/users/installing/index.rst>`_ in the source.
 
 Contribute
 ==========
+
 You've discovered a bug or something else you want to change - excellent!
 
 You've worked out a way to fix it – even better!
 
 You want to tell us about it – best of all!
 
-Start at the `contributing guide <https://matplotlib.org/devdocs/devel/contributing.html>`_!
+Start at the `contributing guide
+<https://matplotlib.org/devdocs/devel/contributing.html>`_!
 
 Contact
 =======
 
-`Discourse <https://discourse.matplotlib.org/>`_ is the discussion forum for general questions and discussions and our recommended starting point.
+`Discourse <https://discourse.matplotlib.org/>`_ is the discussion forum for
+general questions and discussions and our recommended starting point.
 
 Our active mailing lists (which are mirrored on Discourse) are:
 
-* `Users <https://mail.python.org/mailman/listinfo/matplotlib-users>`_ mailing list: matplotlib-users@python.org
-* `Announcement  <https://mail.python.org/mailman/listinfo/matplotlib-announce>`_ mailing list: matplotlib-announce@python.org
-* `Development <https://mail.python.org/mailman/listinfo/matplotlib-devel>`_ mailing list: matplotlib-devel@python.org
+* `Users <https://mail.python.org/mailman/listinfo/matplotlib-users>`_ mailing
+  list: matplotlib-users@python.org
+* `Announcement
+  <https://mail.python.org/mailman/listinfo/matplotlib-announce>`_ mailing
+  list: matplotlib-announce@python.org
+* `Development <https://mail.python.org/mailman/listinfo/matplotlib-devel>`_
+  mailing list: matplotlib-devel@python.org
 
 Gitter_ is for coordinating development and asking questions directly related
 to contributing to matplotlib.
@@ -99,4 +99,20 @@ Citing Matplotlib
 If Matplotlib contributes to a project that leads to publication, please
 acknowledge this by citing Matplotlib.
 
-`A ready-made citation entry <https://matplotlib.org/citing.html>`_ is available.
+`A ready-made citation entry <https://matplotlib.org/stable/users/project/citing.html>`_ is
+available.
+
+Research notice
+~~~~~~~~~~~~~~~
+
+Please note that this repository is participating in a study into
+sustainability of open source projects. Data will be gathered about this
+repository for approximately the next 12 months, starting from June 2021.
+
+Data collected will include number of contributors, number of PRs, time taken
+to close/merge these PRs, and issues closed.
+
+For more information, please visit `the informational page
+<https://sustainable-open-science-and-software.github.io/>`__ or download the
+`participant information sheet
+<https://sustainable-open-science-and-software.github.io/assets/PIS_sustainable_software.pdf>`__.
diff --git a/SECURITY.md b/SECURITY.md
index ced456a1f29a..8cac0a77d53e 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -8,24 +8,24 @@ versions.
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 3.3.x   | :white_check_mark: |
-| 3.2.x   | :white_check_mark: |
-| 3.1.x   | :x:                |
-| 3.0.x   | :x:                |
-| 2.2.x   | :white_check_mark: |
-| < 2.2   | :x:                |
+| 3.6.x   | :white_check_mark: |
+| 3.5.x   | :white_check_mark: |
+| 3.4.x   | :x:                |
+| 3.3.x   | :x:                |
+| < 3.3   | :x:                |
+
 
 ## Reporting a Vulnerability
 
-If you have found a security vulnerability, in order to keep it confidential, 
+If you have found a security vulnerability, in order to keep it confidential,
 please do not report an issue on GitHub.
 
-Please email us details of the vulnerability at matplotlib@numfocus.org; 
+Please email us details of the vulnerability at matplotlib-steering-council@numfocus.org;
 include a description and proof-of-concept that is [short and
 self-contained](http://www.sscce.org/).
 
-You should expect a response within a week of your email. Depending on the 
+You should expect a response within a week of your email. Depending on the
 severity of the issue, this may require some time to draft an immediate bugfix
 release. Less severe issues may be held until the next release.
 
-We do not award bounties for security vulnerabilities. 
+We do not award bounties for security vulnerabilities.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2ff87d0c71da..640136a00e9b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,124 +1,161 @@
 # Python package
 # Create and test a Python package on multiple Python versions.
 # Add steps that analyze code, save the dist with the build record, publish to a PyPI-compatible index, and more:
-# https://docs.microsoft.com/azure/devops/pipelines/languages/python
+# https://docs.microsoft.com/en-us/azure/devops/pipelines/ecosystems/python?view=azure-devops
 
-strategy:
-  matrix:
-    Linux_py37:
-      vmImage: 'ubuntu-16.04'
-      python.version: '3.7'
-    Linux_py38:
-      vmImage: 'ubuntu-16.04'
-      python.version: '3.8'
-    Linux_py39:
-      vmImage: 'ubuntu-16.04'
-      python.version: '3.9'
-    macOS_py37:
-      vmImage: 'macOS-10.15'
-      python.version: '3.7'
-    macOS_py38:
-      vmImage: 'macOS-latest'
-      python.version: '3.8'
-    macOS_py39:
-      vmImage: 'macOS-latest'
-      python.version: '3.9'
-    Windows_py37:
-      vmImage: 'vs2017-win2016'
-      python.version: '3.7'
-    Windows_py38:
-      vmImage: 'windows-latest'
-      python.version: '3.8'
-    Windows_py39:
-      vmImage: 'windows-latest'
-      python.version: '3.9'
-  maxParallel: 4
+trigger:
+  branches:
+    exclude:
+      - v*-doc
+pr:
+  branches:
+    exclude:
+      - v*-doc
 
-pool:
-  vmImage: '$(vmImage)'
+stages:
 
-steps:
+- stage: Check
+  jobs:
+  - job: Skip
+    pool:
+      vmImage: 'ubuntu-latest'
+    variables:
+      DECODE_PERCENTS: 'false'
+      RET: 'true'
+    steps:
+    - bash: |
+        git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "`
+        echo "##vso[task.setvariable variable=log]$git_log"
+    - bash: echo "##vso[task.setvariable variable=RET]false"
+      condition: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'))
+    - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET"
+      name: result
 
-- task: UsePythonVersion@0
-  inputs:
-    versionSpec: '$(python.version)'
-    architecture: 'x64'
-  displayName: 'Use Python $(python.version)'
-  condition: and(succeeded(), ne(variables['python.version'], 'Pre'))
+- stage: Main
+  condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true'))
+  dependsOn: Check
+  jobs:
+    - job: Pytest
+      strategy:
+        matrix:
+          Linux_py38:
+            vmImage: 'ubuntu-20.04'  # keep one job pinned to the oldest image
+            python.version: '3.8'
+          Linux_py39:
+            vmImage: 'ubuntu-latest'
+            python.version: '3.9'
+          Linux_py310:
+            vmImage: 'ubuntu-latest'
+            python.version: '3.10'
+          macOS_py38:
+            vmImage: 'macOS-latest'
+            python.version: '3.8'
+          macOS_py39:
+            vmImage: 'macOS-latest'
+            python.version: '3.9'
+          macOS_py310:
+            vmImage: 'macOS-latest'
+            python.version: '3.10'
+          Windows_py38:
+            vmImage: 'windows-2019'  # keep one job pinned to the oldest image
+            python.version: '3.8'
+          Windows_py39:
+            vmImage: 'windows-latest'
+            python.version: '3.9'
+          Windows_py310:
+            vmImage: 'windows-latest'
+            python.version: '3.10'
+        maxParallel: 4
+      pool:
+        vmImage: '$(vmImage)'
+      steps:
+      - task: UsePythonVersion@0
+        inputs:
+          versionSpec: '$(python.version)'
+          architecture: 'x64'
+        displayName: 'Use Python $(python.version)'
+        condition: and(succeeded(), ne(variables['python.version'], 'Pre'))
 
-- task: stevedower.python.InstallPython.InstallPython@1
-  displayName: 'Use prerelease Python'
-  inputs:
-    prerelease: true
-  condition: and(succeeded(), eq(variables['python.version'], 'Pre'))
+      - task: stevedower.python.InstallPython.InstallPython@1
+        displayName: 'Use prerelease Python'
+        inputs:
+          prerelease: true
+        condition: and(succeeded(), eq(variables['python.version'], 'Pre'))
 
-- bash: |
-    set -e
-    case "$(python -c 'import sys; print(sys.platform)')" in
-    linux)
-      sudo apt update
-      sudo apt install \
-        cm-super \
-        dvipng \
-        ffmpeg \
-        gdb \
-        gir1.2-gtk-3.0 \
-        graphviz \
-        inkscape \
-        libcairo2 \
-        libgirepository-1.0.1 \
-        lmodern \
-        fonts-freefont-otf \
-        poppler-utils \
-        texlive-pictures \
-        texlive-fonts-recommended \
-        texlive-latex-base \
-        texlive-latex-extra \
-        texlive-latex-recommended \
-        texlive-xetex texlive-luatex \
-        ttf-wqy-zenhei
-      ;;
-    darwin)
-      brew install --cask xquartz
-      brew install pkg-config ffmpeg imagemagick mplayer ccache
-      ;;
-    win32)
-      ;;
-    *)
-      exit 1
-      ;;
-    esac
-  displayName: 'Install dependencies'
+      - bash: |
+          set -e
+          case "$(python -c 'import sys; print(sys.platform)')" in
+          linux)
+            sudo apt update
+            sudo apt install \
+              cm-super \
+              dvipng \
+              ffmpeg \
+              fonts-noto-cjk \
+              gdb \
+              gir1.2-gtk-3.0 \
+              graphviz \
+              inkscape \
+              libcairo2 \
+              libgirepository-1.0-1 \
+              lmodern \
+              fonts-freefont-otf \
+              poppler-utils \
+              texlive-pictures \
+              texlive-fonts-recommended \
+              texlive-latex-base \
+              texlive-latex-extra \
+              texlive-latex-recommended \
+              texlive-xetex texlive-luatex \
+              ttf-wqy-zenhei
+            ;;
+          darwin)
+            brew install --cask xquartz
+            brew install pkg-config ffmpeg imagemagick mplayer ccache
+            brew tap homebrew/cask-fonts
+            brew install font-noto-sans-cjk-sc
+            ;;
+          win32)
+            ;;
+          *)
+            exit 1
+            ;;
+          esac
+        displayName: 'Install dependencies'
 
-- bash: |
-    python -m pip install --upgrade pip
-    python -m pip install -r requirements/testing/all.txt -r requirements/testing/extra.txt ||
-      [[ "$PYTHON_VERSION" = 'Pre' ]]
-  displayName: 'Install dependencies with pip'
+      - bash: |
+          python -m pip install --upgrade pip
+          python -m pip install -r requirements/testing/all.txt -r requirements/testing/extra.txt ||
+            [[ "$PYTHON_VERSION" = 'Pre' ]]
+        displayName: 'Install dependencies with pip'
 
-- bash: |
-    python -m pip install -ve . ||
-      [[ "$PYTHON_VERSION" = 'Pre' ]]
-  displayName: "Install self"
+      - bash: |
+          # Due to https://github.com/pypa/setuptools/pull/2896
+          SETUPTOOLS_USE_DISTUTILS=stdlib python -m pip install -ve . ||
+            [[ "$PYTHON_VERSION" = 'Pre' ]]
+        displayName: "Install self"
 
-- script: env
-  displayName: 'print env'
+      - script: env
+        displayName: 'print env'
 
-- bash: |
-    PYTHONFAULTHANDLER=1 python -m pytest --junitxml=junit/test-results.xml -raR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n 2 ||
-      [[ "$PYTHON_VERSION" = 'Pre' ]]
-  displayName: 'pytest'
+      - script: pip list
+        displayName: 'print pip'
 
-- bash: |
-    bash <(curl -s https://codecov.io/bash)  -f "!*.gcov" -X gcov
-  displayName: 'Upload to codecov.io'
+      - bash: |
+          PYTHONFAULTHANDLER=1 python -m pytest --junitxml=junit/test-results.xml -raR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n 2 ||
+            [[ "$PYTHON_VERSION" = 'Pre' ]]
+        displayName: 'pytest'
 
-- task: PublishTestResults@2
-  inputs:
-    testResultsFiles: '**/test-results.xml'
-    testRunTitle: 'Python $(python.version)'
-  condition: succeededOrFailed()
+      - bash: |
+          bash <(curl -s https://codecov.io/bash)  -f "!*.gcov" -X gcov
+        displayName: 'Upload to codecov.io'
 
-- publish: $(System.DefaultWorkingDirectory)/result_images
-  artifact: $(Agent.JobName)-result_images
-  condition: and(failed(), ne(variables['python.version'], 'Pre'))
+      - task: PublishTestResults@2
+        inputs:
+          testResultsFiles: '**/test-results.xml'
+          testRunTitle: 'Python $(python.version)'
+        condition: succeededOrFailed()
+
+      - publish: $(System.DefaultWorkingDirectory)/result_images
+        artifact: $(Agent.JobName)-result_images
+        condition: and(failed(), ne(variables['python.version'], 'Pre'))
diff --git a/ci/check_version_number.py b/ci/check_version_number.py
new file mode 100644
index 000000000000..123eb721fb59
--- /dev/null
+++ b/ci/check_version_number.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env python3
+
+"""
+Check that the version number of the install Matplotlib does not start with 0
+
+To run:
+    $ python3 -m build .
+    $ pip install dist/matplotlib*.tar.gz for sdist
+    $ pip install dist/matplotlib*.whl for wheel
+    $ ./ci/check_version_number.py
+"""
+import matplotlib
+
+import sys
+
+EXIT_SUCCESS = 0
+EXIT_FAILURE = 1
+
+
+print(f"Version {matplotlib.__version__} installed")
+if matplotlib.__version__[0] == "0":
+    sys.exit(EXIT_FAILURE)
+sys.exit(EXIT_SUCCESS)
diff --git a/ci/check_wheel_licenses.py b/ci/check_wheel_licenses.py
index a29092752463..1b77108c83e1 100644
--- a/ci/check_wheel_licenses.py
+++ b/ci/check_wheel_licenses.py
@@ -5,7 +5,6 @@
 included.
 
 To run:
-    $ cp setup.cfg.template setup.cfg
     $ python3 setup.py bdist_wheel
     $ ./ci/check_wheel_licenses.py
 """
diff --git a/ci/codespell-ignore-words.txt b/ci/codespell-ignore-words.txt
new file mode 100644
index 000000000000..70366f6b3552
--- /dev/null
+++ b/ci/codespell-ignore-words.txt
@@ -0,0 +1,17 @@
+ans
+axises
+ba
+cannotation
+coo
+curvelinear
+flate
+hist
+inout
+ment
+nd
+oly
+sur
+te
+thisy
+whis
+wit
diff --git a/doc/Makefile b/doc/Makefile
index bc0c99e417ad..8a9dc61c7a3d 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -20,6 +20,7 @@ clean:
 	rm -rf "$(SOURCEDIR)/build"
 	rm -rf "$(SOURCEDIR)/api/_as_gen"
 	rm -rf "$(SOURCEDIR)/gallery"
+	rm -rf "$(SOURCEDIR)/plot_types"
 	rm -rf "$(SOURCEDIR)/tutorials"
 	rm -rf "$(SOURCEDIR)/savefig"
 	rm -rf "$(SOURCEDIR)/sphinxext/__pycache__"
diff --git a/doc/README.txt b/doc/README.txt
index bb8b809cea3b..0caf5e013c9b 100644
--- a/doc/README.txt
+++ b/doc/README.txt
@@ -13,15 +13,20 @@ This is the top level build directory for the Matplotlib
 documentation.  All of the documentation is written using sphinx, a
 python documentation system built on top of ReST.  This directory contains
 
-* users - the user documentation, e.g., plotting tutorials, configuration
-  tips, etc.
+* users - the user documentation, e.g., installation, plotting tutorials,
+configuration tips, faq, explanations, etc.
 
 * devel - documentation for Matplotlib developers
 
-* faq - frequently asked questions
-
 * api - placeholders to automatically generate the api documentation
 
+* tutorials, plot_types, and gallery - automatically
+generated by sphinx-gallery from ``../tutorials``, ``../plot_types``, and
+``../examples`` respectively (these are only present if docs have been
+built locally).
+
+* thirdpartypackages - redirect to <https://matplotlib.org/mpl-third-party/>
+
 * mpl_toolkits - documentation of individual toolkits that ship with
   Matplotlib
 
diff --git a/doc/_static/.gitignore b/doc/_static/.gitignore
deleted file mode 100644
index bbdc34458abc..000000000000
--- a/doc/_static/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-contour_frontpage.png
-histogram_frontpage.png
-membrane_frontpage.png
-surface3d_frontpage.png
-
diff --git a/doc/_static/anatomy.png b/doc/_static/anatomy.png
index d3054395b06e..0809d43f7a56 100644
Binary files a/doc/_static/anatomy.png and b/doc/_static/anatomy.png differ
diff --git a/doc/_static/boxplot_explanation.png b/doc/_static/boxplot_explanation.png
deleted file mode 100644
index d057496e4e44..000000000000
Binary files a/doc/_static/boxplot_explanation.png and /dev/null differ
diff --git a/doc/_static/fonts/Carlogo-bold.ttf b/doc/_static/fonts/Carlogo-bold.ttf
deleted file mode 100644
index c16254f57a89..000000000000
Binary files a/doc/_static/fonts/Carlogo-bold.ttf and /dev/null differ
diff --git a/doc/_static/fonts/Carlogo-bolditalic.ttf b/doc/_static/fonts/Carlogo-bolditalic.ttf
deleted file mode 100644
index d7d2507a4e6d..000000000000
Binary files a/doc/_static/fonts/Carlogo-bolditalic.ttf and /dev/null differ
diff --git a/doc/_static/fonts/Carlogo-italic.ttf b/doc/_static/fonts/Carlogo-italic.ttf
deleted file mode 100644
index de7824c6bd35..000000000000
Binary files a/doc/_static/fonts/Carlogo-italic.ttf and /dev/null differ
diff --git a/doc/_static/fonts/Carlogo-regular.ttf b/doc/_static/fonts/Carlogo-regular.ttf
deleted file mode 100644
index 6911c4ddf752..000000000000
Binary files a/doc/_static/fonts/Carlogo-regular.ttf and /dev/null differ
diff --git a/doc/_static/fonts/carlogo-bold.woff b/doc/_static/fonts/carlogo-bold.woff
deleted file mode 100755
index 00c68a81d84e..000000000000
Binary files a/doc/_static/fonts/carlogo-bold.woff and /dev/null differ
diff --git a/doc/_static/fonts/carlogo-bold.woff2 b/doc/_static/fonts/carlogo-bold.woff2
deleted file mode 100755
index cff2d45c9000..000000000000
Binary files a/doc/_static/fonts/carlogo-bold.woff2 and /dev/null differ
diff --git a/doc/_static/fonts/carlogo-bolditalic.woff b/doc/_static/fonts/carlogo-bolditalic.woff
deleted file mode 100755
index 88be19f89771..000000000000
Binary files a/doc/_static/fonts/carlogo-bolditalic.woff and /dev/null differ
diff --git a/doc/_static/fonts/carlogo-bolditalic.woff2 b/doc/_static/fonts/carlogo-bolditalic.woff2
deleted file mode 100755
index 3ceb3a396837..000000000000
Binary files a/doc/_static/fonts/carlogo-bolditalic.woff2 and /dev/null differ
diff --git a/doc/_static/fonts/carlogo-italic.woff b/doc/_static/fonts/carlogo-italic.woff
deleted file mode 100755
index 806f239385a8..000000000000
Binary files a/doc/_static/fonts/carlogo-italic.woff and /dev/null differ
diff --git a/doc/_static/fonts/carlogo-italic.woff2 b/doc/_static/fonts/carlogo-italic.woff2
deleted file mode 100755
index a70e881db731..000000000000
Binary files a/doc/_static/fonts/carlogo-italic.woff2 and /dev/null differ
diff --git a/doc/_static/fonts/carlogo-regular.woff b/doc/_static/fonts/carlogo-regular.woff
deleted file mode 100755
index 7a8ab29f96bb..000000000000
Binary files a/doc/_static/fonts/carlogo-regular.woff and /dev/null differ
diff --git a/doc/_static/fonts/carlogo-regular.woff2 b/doc/_static/fonts/carlogo-regular.woff2
deleted file mode 100755
index 272988a2bc01..000000000000
Binary files a/doc/_static/fonts/carlogo-regular.woff2 and /dev/null differ
diff --git a/doc/_static/highlight_text_examples.png b/doc/_static/highlight_text_examples.png
new file mode 100644
index 000000000000..dd5528576eba
Binary files /dev/null and b/doc/_static/highlight_text_examples.png differ
diff --git a/doc/_static/matplotlib-icon.svg b/doc/_static/matplotlib-icon.svg
new file mode 100644
index 000000000000..0d761ef717ff
--- /dev/null
+++ b/doc/_static/matplotlib-icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="345.60001" viewBox="0 0 259.2 259.2" width="345.60001" stroke-linecap="butt" stroke-linejoin="round"><style><![CDATA[.B{clip-path:url(#A)}.C{fill-opacity:.6}.D{stroke-linecap:square}]]></style><g fill="#fff"><path d="M251.424 129.6a121.8268 121.8268 0 0 0-9.2733-46.62003c-6.1221-14.78002-15.09598-28.2104-26.40812-39.52255S191.00005 23.1714 176.22003 17.0493a121.8268 121.8268 0 0 0-93.24005 0c-14.78002 6.1221-28.2104 15.09598-39.52255 26.40812S23.1714 68.19995 17.0493 82.97997a121.8268 121.8268 0 0 0 0 93.24005c6.1221 14.78002 15.09598 28.2104 26.40812 39.52255s24.74253 20.28604 39.52255 26.40812a121.8268 121.8268 0 0 0 93.24005 0c14.78002-6.1221 28.2104-15.09598 39.52255-26.40812s20.28604-24.74253 26.40812-39.52255A121.8268 121.8268 0 0 0 251.424 129.6m0 0z"/><path d="M129.6 129.6h129.67488l-.25588 8.14235-.76664 8.11022-1.27437 8.04608-1.77708 7.95018-2.27276 7.8229-2.7595 7.66477-3.23532 7.47637-3.69837 7.25847-4.14684 7.01192-4.57894 6.7377-4.99297 6.437-5.3873 6.11068-5.76036 5.76036-6.11068 5.3873-6.437 4.99297-6.7377 4.57894-7.01192 4.14684-7.25847 3.69837-7.47637 3.23532-7.66477 2.7595-7.8229 2.27276-7.95018 1.77708-8.04608 1.27437-8.11022.76664-8.14235.25588-8.14235-.25588-8.11022-.76664-8.04608-1.27437-7.95018-1.77708-7.8229-2.27276-7.66476-2.7595-7.47637-3.23532-7.25847-3.69837-7.01192-4.14684-6.7377-4.57894-6.437-4.99297-6.1107-5.3873-5.76035-5.76036-5.3873-6.11068-4.99297-6.437-4.57894-6.7377-4.14684-7.01192-3.69838-7.25847-3.2353-7.47637-2.7595-7.66477-2.27277-7.8229-1.77708-7.95018-1.27437-8.04608L.18 137.74235-.07488 129.6.18 121.45765l.76664-8.11022 1.27437-8.04608L3.999 97.35117l2.27277-7.8229 2.7595-7.66476 3.23532-7.47637 3.69838-7.25847 4.14684-7.01192 4.57894-6.7377 4.99297-6.437 5.3873-6.1107 5.76035-5.76035 6.1107-5.3873 6.437-4.99297 6.7377-4.57894 7.01192-4.14684 7.25847-3.69838 7.47637-3.2353 7.66476-2.7595 7.8229-2.27277 7.95018-1.77708 8.04608-1.27437L121.45765.18 129.6-.07488 137.74235.18l8.11022.76664 8.04608 1.27437 7.95018 1.77708 7.8229 2.27277 7.66477 2.7595 7.47637 3.23532 7.25847 3.69838 7.01192 4.14684 6.7377 4.57894 6.437 4.99297 6.11068 5.3873 5.76036 5.76035 5.3873 6.1107 4.99297 6.437 4.57894 6.7377 4.14684 7.01192 3.69837 7.25847 3.23532 7.47637 2.7595 7.66476 2.27276 7.8229 1.77708 7.95018 1.27437 8.04608.76664 8.11022.25588 8.14235H130.89675z"/></g><g fill="none" stroke="#e6e6e6" class="D"><path d="M129.6 129.6h121.824m-121.824 0l86.14258-86.14258M129.6 129.6V7.776m0 121.824L43.45742 43.45742M129.6 129.6H7.776" class="B"/><path d="M129.6 129.6l-86.14258 86.14258M129.6 129.6v121.824m0-121.824l86.14258 86.14258" class="B"/><path d="M143.136 129.6l-.13173-1.88385-.39263-1.84718-.6459-1.77456-.88657-1.6674-1.1-1.5278-1.31183-1.35843-1.48812-1.16264-1.63544-.94422-1.75094-.70743-1.83235-.45686-1.878-.1974-1.8873.0659-1.85976.32792-1.79602.58356-1.69733.82784-1.5656 1.056-1.4034 1.26362-1.21387 1.44664-1.00073 1.6015-.768 1.72518-.52053 1.8153-.26282 1.87007v1.88845l.26282 1.87007.52053 1.8153.768 1.72518 1.00073 1.6015 1.21387 1.44663 1.4034 1.26362 1.5656 1.056 1.69733.82784 1.79602.58356 1.85976.32792 1.8873.0659 1.878-.1974 1.83235-.45686 1.75094-.70743 1.63544-.94422 1.48812-1.16264 1.31183-1.35844 1.1-1.5278.88657-1.6674.6459-1.77456.39263-1.84718.13173-1.88385" class="B"/><path d="M170.208 129.6l-.09892-2.83267-.29628-2.81887-.4922-2.79134-.6857-2.7502-.87588-2.69567-1.06178-2.628-1.24252-2.54754-1.4172-2.45466-1.58497-2.34982-1.74503-2.23354-1.89658-2.10637-2.0389-1.96894-2.17127-1.82192-2.29308-1.66602-2.4037-1.502-2.50262-1.33067-2.58935-1.15285-2.66346-.96942-2.7246-.78127-2.77246-.5893-2.8068-.39447-2.8275-.19772h-2.8344l-2.8275.19772-2.8068.39447-2.77246.5893-2.7246.78127-2.66346.96942-2.58935 1.15285-2.50262 1.33067-2.4037 1.502-2.29308 1.66602-2.17128 1.82192-2.0389 1.96894-1.89658 2.10637-1.74503 2.23354-1.58497 2.34982-1.4172 2.45466-1.24252 2.54754-1.06178 2.628-.87588 2.69567-.6857 2.7502-.4922 2.79134-.29627 2.81887L88.992 129.6l.09892 2.83267.29627 2.81887.4922 2.79134.6857 2.7502.87588 2.69567 1.06178 2.628 1.24252 2.54754 1.4172 2.45466 1.58498 2.34982 1.74503 2.23353 1.89658 2.10637 2.0389 1.96894 2.17128 1.82192 2.29308 1.66602 2.4037 1.502 2.50262 1.33067 2.58935 1.15285 2.66346.96942 2.7246.78127 2.77246.5893 2.8068.39447 2.8275.19772h2.8344l2.8275-.19772 2.8068-.39447 2.77246-.5893 2.7246-.78127 2.66346-.96942 2.58935-1.15285 2.50262-1.33067 2.4037-1.502 2.29308-1.66602 2.17127-1.82192 2.0389-1.96894 1.89658-2.10637 1.74503-2.23353 1.58497-2.34982 1.4172-2.45466 1.24252-2.54754 1.06178-2.628.87588-2.69567.6857-2.7502.4922-2.79134.29628-2.81887.09892-2.83267" class="B"/><path d="M197.28 129.6l-.16486-4.72112-.4938-4.69812-.8203-4.65223-1.14284-4.58367-1.4598-4.4928-1.76964-4.38-2.07086-4.246-2.362-4.091-2.64162-3.91637-2.90838-3.72256-3.16097-3.5106-3.39816-3.28156-3.6188-3.03653-3.8218-2.7767L163.44 70.9874l-4.17104-2.21778-4.31558-1.92142-4.439-1.6157-4.54-1.3021-4.62077-.98217-4.67802-.65745-4.7125-.32953h-4.724l-4.7125.32953-4.67802.65745-4.62077.98217-4.54 1.3021-4.439 1.6157-4.3156 1.92142L95.76 70.9874l-4.00618 2.50334-3.8218 2.7767-3.6188 3.03653-3.39816 3.28156-3.16097 3.5106-2.90838 3.72256-2.64163 3.91637-2.362 4.091-2.07086 4.246-1.76964 4.38-1.4598 4.4928-1.14284 4.58367-.8203 4.65223-.4938 4.69812L61.92 129.6l.16486 4.72112.4938 4.69812.8203 4.65223 1.14284 4.58367 1.4598 4.4928 1.76964 4.38 2.07086 4.246 2.362 4.091 2.64163 3.91637 2.90838 3.72256 3.16097 3.5106 3.39816 3.28156 3.6188 3.03653 3.8218 2.7767L95.76 188.2126l4.17104 2.21778 4.3156 1.92142 4.439 1.6157 4.54 1.3021 4.62077.98217 4.67802.65745 4.7125.32953h4.724l4.7125-.32953 4.67802-.65745 4.62077-.98217 4.54-1.3021 4.439-1.6157 4.31558-1.92142 4.17104-2.21778 4.00618-2.50334 3.8218-2.7767 3.6188-3.03653 3.39816-3.28156 3.16097-3.5106 2.90838-3.72256 2.64162-3.91637 2.362-4.091 2.07086-4.246 1.76964-4.38 1.4598-4.4928 1.14284-4.58367.8203-4.65223.4938-4.69812L197.28 129.6" class="B"/><path d="M224.352 129.6l-.05772-3.3068-.1731-3.30277-.28825-3.29472-.40306-3.28265-.51738-3.26658-.63106-3.24654-.74398-3.22253-.856-3.1946-.96696-3.1628-1.07675-3.1271-1.18523-3.08763-1.29227-3.0444-1.39773-2.99743-1.50148-2.94683-1.6034-2.89263-1.7034-2.8349-1.8013-2.77374-1.897-2.70918-1.99038-2.64133-2.08135-2.57026-2.16978-2.49605-2.25557-2.4188-2.33862-2.3386-2.4188-2.25557-2.49605-2.16978-2.57026-2.08135-2.64133-1.99038-2.70918-1.897-2.77374-1.80128-2.8349-1.7034-2.89263-1.6034-2.94683-1.50148-2.99743-1.39773-3.0444-1.29227-3.08763-1.18523-3.12712-1.07675-3.1628-.96696-3.1946-.856-3.22253-.74398-3.24654-.63106-3.26658-.51738-3.28265-.40306-3.29472-.28825-3.30277-.1731L129.6 34.848l-3.3068.05772-3.30277.1731-3.29472.28825-3.28265.40306-3.26658.51738-3.24654.63106-3.22253.74398-3.1946.856-3.1628.96696-3.1271 1.07675-3.08763 1.18523-3.0444 1.29227-2.99743 1.39773-2.94683 1.50148-2.89263 1.6034-2.8349 1.7034-2.77374 1.8013-2.70918 1.897-2.64133 1.99038-2.57026 2.08135-2.49605 2.16978-2.4188 2.25557-2.3386 2.3386-2.25557 2.4188-2.16978 2.49605-2.08135 2.57026-1.99038 2.64133-1.897 2.70918-1.80128 2.77374-1.7034 2.8349-1.6034 2.89263-1.50148 2.94683-1.39773 2.99743-1.29227 3.0444-1.18523 3.08763-1.07675 3.1271-.96696 3.1628-.856 3.1946-.74398 3.22253-.63106 3.24654-.51738 3.26658-.40306 3.28265-.28825 3.29472-.1731 3.30277L34.848 129.6l.05772 3.3068.1731 3.30277.28825 3.29472.40306 3.28265.51738 3.26658.63106 3.24654.74398 3.22253.856 3.1946.96696 3.1628 1.07675 3.12712 1.18523 3.08763 1.29227 3.0444 1.39773 2.99743 1.50148 2.94683 1.6034 2.89263 1.7034 2.8349 1.8013 2.77374 1.897 2.70918 1.99038 2.64133 2.08135 2.57026 2.16978 2.49605 2.25557 2.4188 2.3386 2.33862 2.4188 2.25557 2.49605 2.16978 2.57026 2.08135 2.64133 1.99038 2.70918 1.897 2.77374 1.8013 2.8349 1.7034 2.89263 1.6034 2.94683 1.50148 2.99743 1.39773 3.0444 1.29227 3.08763 1.18523 3.1271 1.07675 3.1628.96696 3.1946.856 3.22253.74398 3.24654.63106 3.26658.51738 3.28265.40306 3.29472.28825 3.30277.1731 3.3068.05772 3.3068-.05772 3.30277-.1731 3.29472-.28825 3.28265-.40306 3.26658-.51738 3.24654-.63106 3.22253-.74398 3.1946-.856 3.1628-.96696 3.12712-1.07675 3.08763-1.18523 3.0444-1.29227 2.99743-1.39773 2.94683-1.50148 2.89263-1.6034 2.8349-1.7034 2.77374-1.8013 2.70918-1.897 2.64133-1.99038 2.57026-2.08135 2.49605-2.16978 2.4188-2.25557 2.33862-2.33862 2.25557-2.4188 2.16978-2.49605 2.08135-2.57026 1.99038-2.64133 1.897-2.70918 1.8013-2.77374 1.7034-2.8349 1.6034-2.89263 1.50148-2.94683 1.39773-2.99743 1.29227-3.0444 1.18523-3.08763 1.07675-3.12712.96696-3.1628.856-3.1946.74398-3.22253.63106-3.24654.51738-3.26658.40306-3.28265.28825-3.29472.1731-3.30277.05772-3.3068" class="B"/></g><g stroke-linejoin="miter"><g stroke="#4c4c4c" stroke-width="1.5" class="C"><path d="M129.6 129.6l25.747-8.3657.02615.08093.026.081.02564.0811.0254.08117.02513.08125.02488.08133.02462.0814.02437.08148.0241.08156.02386.08163.0236.0817.02334.08178.0231.08186.02283.08193.02257.082.0223.08207.02205.08214.0218.0822.02154.08228.02128.08234.02102.0824.02076.08248.0205.08254.02024.0826.01998.08267.01972.08273.01946.0828.0192.08285.01894.0829.01868.08297.01842.08303.01816.0831.018.08314.01764.0832.01738.08325.01712.0833.01685.08336.0166.08342.01633.08347.01607.08352.0158.08357.01554.08362.01528.08366.01502.0837.01475.08376.0145.0838.01423.08385.01396.0839.0137.08394.01344.08398.01317.08402.0129.08406.01264.084.01238.08414.0121.08418.01185.08422.0116.08426.01132.0843.01106.08433.0108.08436.01053.0844.01026.08443.01.08446.00973.0845.00947.08452.0092.08455.00893.08458.00867.0846.0084.08463.00814.08466.00787.08468.0076.0847.00734.08473.00707.08475.0068.08478.00654.0848.00627.08482.006.08484.00574.08486.00547.08487.0052.0849.00494.0849.00467.08492.0044.08494.00414.08495.00387.08496.0036.08497.00334.08498.00307.085.0028.085.00254.085.00227.08502.002.08503.00174.08503.00147.08504.0012.08504.00093.08504.00067.08505.0004.08505.00013.08505h-26.80128z" fill="#004cff" class="B"/><path d="M129.6 129.6l28.53726-76.03725.23874.09003.23845.09078.23817.09153.23788.09227.2376.09302.2373.09377.237.0945.2367.09525.2364.096.236.09674.2358.09748.23548.09822.23517.09896.23486.0997.23455.10044.23423.10117.2339.1019.2336.10264.23327.10338.23294.1041.2326.10484.23228.10557.23195.1063.23162.10703.23128.10776.23094.10848.2306.1092.23025.10993.2299.11065.22956.11137.2292.112.22885.1128.2285.11353.22814.11425.22778.11497.22742.11568.22705.1164.22668.1171.22632.11782.22594.11853.22557.11924.2252.11995.22482.12065.22444.12136.22405.12206.22367.12277.22328.12347.2229.12417.2225.12487.2221.12557.2217.12627.22132.12696.22092.12766.2205.12835.2201.12904.2197.12973.2193.13042.21888.1311.21847.1318.21806.13248.21764.13317.21722.13385.2168.13453.21637.1352.21595.1359.21552.13657.2151.13725.21466.13792.21422.1386.2138.13927.21335.13994.2129.1406.21247.14128.21202.14194.21157.1426.21112.14327.21067.14393.21022.1446.20976.14525.2093.1459.20885.14657.2084.14723.20792.14788.20746.14853.207.14918.20652.14983.20605.15048.20557.15113.205.15177.20462.15242.20414.15306.20366.1537.20317.15434.2027.15498.2022.1556.2017.15625.20122.15688.20073.1575.20023.15814.19973.15877-50.13098 62.86225z" fill="#ceff29" class="B"/><path d="M129.6 129.6L60.20086 46.4733l.3925-.3261.39403-.32426.39555-.3224L61.78 45.18l.39857-.31866.40007-.31677.40156-.3149.40304-.313.4045-.3111.40597-.30918.40742-.30726.40886-.30534.4103-.3034.41172-.30147.41314-.29953.41455-.29758.41595-.29562.41733-.29366.4187-.2917.42008-.2897.42144-.28773.4228-.28574.42414-.28374.42547-.28174.4268-.27973.428-.27772.4294-.2757.4307-.27367.432-.27164.43326-.2696.43453-.26756.43578-.2655.43703-.26345.43827-.2614.4395-.25932.4407-.25724.44192-.25516.44312-.25308.4443-.251.44548-.2489.44665-.2468.4478-.24468.44896-.24257.4501-.24045.45122-.23833.45234-.2362.45345-.23406.45455-.23192.45563-.22978.4567-.22763.45778-.22548.45884-.2233.45988-.22115.46092-.21898.46195-.2168.46296-.21463.46397-.21244.46497-.21026.46595-.20806.46693-.20586.4679-.20366.46885-.20145.4698-.19924.47072-.19702.47165-.1948.47256-.19258.47346-.19035.47435-.18812.47524-.18588.4761-.18364.47697-.1814.47782-.17914.47866-.1769.47948-.17463.4803-.17237.4811-.1701.482-.16784.4827-.16556.48346-.1633.48423-.161.48498-.15872.48572-.15644.48646-.15415.48718-.15185.4879-.14955.4886-.14725.48928-.14495.48995-.14264.49062-.14033.49127-.13802.49192-.1357.49255-.13338.49318-.13106.4938-.12874.4944-.1264.49498-.12407.49556-.12174.49613-.1194.49668-.11707.49723-.11472 23.85538 104.51726z" fill="#ff6800" class="B"/><path d="M129.6 129.6l-93.2293 16.91862-.10446-.5861-.10078-.58675-.0971-.58737-.0934-.58797-.0897-.58855-.086-.589-.0823-.58963-.0786-.59013-.07488-.59062-.07117-.59107-.06745-.5915-.06374-.59192-.06002-.5923-.0563-.59268-.05257-.59302-.04884-.59334-.0451-.59363-.04138-.594-.03765-.59415-.0339-.59438-.03018-.59458-.02644-.59475-.0227-.5949-.01897-.59504-.01523-.59515-.0115-.59523-.00775-.5953-.004-.59533-.00027-.59534.00347-.59533.0072-.5953.01095-.59524.0147-.59516.01843-.59506.02217-.59493.0259-.59478.02965-.5946.03338-.5944.03712-.5942.04085-.59394.04458-.59367.0483-.59338.05203-.59306.05576-.59273.05948-.59236.0632-.59198.06692-.59157.07064-.59114.07435-.59068.07806-.5902.08177-.5897.08547-.58918.08917-.58863.09287-.58806.09656-.58746.10025-.58684.10394-.5862.10762-.58554.1113-.58485.11497-.58414.11863-.5834.1223-.58265.12596-.58187.1296-.58106.13326-.58024.137-.5794.14054-.57852.14417-.57762.1478-.5767.15142-.57577.15503-.5748.15864-.57382.16224-.5728.16584-.57178.16943-.57072.173-.56965.1766-.56855.18015-.56743.18372-.5663.18727-.56512.19082-.56393.19436-.56273.1979-.5615.2014-.56024.20493-.55896.20844-.55766.21194-.55634.21543-.555.2189-.55363.2224-.55225.22585-.55084.2293-.5494.23276-.54796.2362-.5465.23962-.545.24304-.54348.24645-.54194.24985-.54038.25324-.5388.25662-.5372 84.51492 40.70024z" fill="#ffc400" class="B"/><path d="M129.6 129.6l-44.50648 30.83417-.04838-.06995-.04827-.07002-.04816-.07-.04805-.07018-.04794-.07025-.04783-.07033-.04772-.0704-.0476-.07048-.0475-.07055-.0474-.07063-.04727-.0707-.04716-.07077-.04705-.07085-.04694-.07092-.04683-.07-.04672-.07107-.0466-.07114-.0465-.0712-.04638-.0713-.04627-.07136-.04616-.07143-.04605-.0715-.04593-.07158-.04582-.07165-.0457-.07172-.0456-.0718-.04548-.07187-.04537-.07194-.04526-.072-.04514-.07208-.04503-.07215-.04492-.07222-.0448-.0723-.0447-.07236-.04458-.07243-.04446-.0725-.04435-.07257-.04423-.07264-.04412-.0727-.044-.07278-.0439-.07285-.04378-.07292-.04366-.073-.04355-.07305-.04343-.07312-.04332-.0732-.0432-.07326-.0431-.07333-.04297-.0734-.04286-.07346-.04274-.07353-.04263-.0736-.0425-.07366-.0424-.07373-.04228-.0738-.04216-.07386-.04205-.07393-.04193-.074-.0418-.07406-.0417-.07413-.04158-.0742-.04147-.07426-.04135-.07432-.04123-.0744-.04112-.07445-.04-.07452-.04088-.07458-.04076-.07464-.04065-.0747-.04053-.07477-.0404-.07484-.0403-.075-.04018-.07496-.04006-.07502-.03994-.0751-.03982-.07515-.0397-.0752-.0396-.07527-.03947-.07534-.03935-.0754-.03923-.07546-.0391-.07552-.039-.07558-.03888-.07564-.03876-.0757-.03864-.07577-.03852-.07583-.0384-.0759-.03828-.07595-.03816-.076-.03804-.07607-.03792-.07613-.0378-.0762-.03768-.07625-.03756-.0763-.03744-.07636-.03732-.07642-.0372-.07648-.03708-.07654-.03696-.0766 48.29424-23.25728z" fill="#29ffce" class="B"/><path d="M129.6 129.6l11.33682 66.72375-.2621.044-.26228.04297-.26245.04194-.2626.0409-.26277.03988-.26292.03885-.26308.03782-.26322.0368-.26336.03575-.2635.03472-.26364.03368-.26377.03265-.2639.0316-.26402.03057-.26413.02953-.26425.0285-.26436.02746-.26446.02642-.26456.02538-.26466.02434-.26475.0233-.26484.02226-.26493.02122-.265.02018-.2651.01914-.26516.018-.26523.01706-.2653.01602-.26536.01498-.2654.01393-.26547.0129-.2655.01185-.26556.0108-.2656.00976-.26564.00872-.26567.00768-.2657.00663-.26572.0056-.26574.00455-.26576.0035-.26577.00246-.26577.00142-.26578.00037-.26578-.00067-.26577-.0017-.26576-.00276-.26575-.0038-.26573-.00484-.2657-.0059-.2657-.00693-.26566-.00798-.26563-.00902-.2656-.01006-.26555-.011-.2655-.01215-.26545-.0132-.2654-.01423-.26534-.01527-.26528-.01632-.2652-.01736-.26514-.0184-.26507-.01944-.265-.02048-.2649-.02152-.26482-.02256-.26473-.0236-.26463-.02464-.26453-.02568-.26443-.02672-.26432-.02776-.2642-.0288-.264-.02983-.26398-.03087-.26386-.032-.26373-.03294-.2636-.03398-.26346-.035-.26332-.03605-.26318-.03708-.26303-.0381-.26288-.03914-.26272-.04018-.26257-.0412-.2624-.04224-.26223-.04327-.26206-.0443-.26188-.04533-.2617-.04636-.26152-.04738-.26133-.0484-.26114-.04944-.26095-.05046-.26074-.0515-.26054-.0525-.26033-.05353-.26012-.05455-.26-.05557-.25968-.0566-.25946-.0576-.25923-.05863 14.90962-65.3233z" fill="#7dff7a" class="B"/><path d="M129.6 129.6l85.41516 66.56232-.15707.20107-.15754.2007-.15802.20033-.1585.19995-.15896.19958-.15943.1992-.16.19883-.16037.19845-.16083.19807-.1613.1977-.16176.1973-.16223.19693-.1627.19655-.16315.19617-.16362.19578-.16408.1954-.16454.195-.165.19462-.16546.19423-.1659.19384-.16637.19345-.16682.19306-.16728.19266-.16773.19227-.16818.19187-.16863.19147-.1691.19108-.16954.19068-.16998.19028-.17043.18988-.17088.18947-.17132.18907-.17177.18867-.1722.18826-.17266.18785-.173.18745-.17354.18704-.17398.18663-.17442.18622-.17486.1858-.1753.1854-.17573.18498-.17617.18457-.1766.18415-.17704.18374-.17747.18332-.178.183-.17833.18248-.17876.18206-.1792.18164-.17962.18122-.18004.1808-.18047.18037-.1809.17994-.18132.1795-.18174.1791-.18216.17866-.18258.17823-.183.1778-.18342.17736-.18383.17693-.18425.1765-.18467.17606-.18508.17563-.1855.1752-.1859.17476-.18632.17432-.18673.17388-.18714.17344-.18755.173-.18795.17255-.18836.1721-.18876.17166-.18917.17122-.18957.17077-.18997.17032-.19037.16988-.19077.16943-.19117.16898-.19157.16853-.19197.16808-.19236.16762-.19275.16717-.19315.16672-.19354.16626-.19393.1658-.19432.16534-.1947.1649-.195.16443-.1955.16397-.19587.1635-.19626.16304-.19664.16258-.19702.16212-.1974.16165-.19778.1612-.19816.16072-.19854.16025-.19892.1598-.1993.15932-66.8413-83.81634z" fill="#ff6800" class="B"/></g><path d="M251.424 129.6a121.8268 121.8268 0 0 0-9.2733-46.62003c-6.1221-14.78002-15.09598-28.2104-26.40812-39.52255S191.00005 23.1714 176.22003 17.0493a121.8268 121.8268 0 0 0-93.24005 0c-14.78002 6.1221-28.2104 15.09598-39.52255 26.40812S23.1714 68.19995 17.0493 82.97997a121.8268 121.8268 0 0 0 0 93.24005c6.1221 14.78002 15.09598 28.2104 26.40812 39.52255s24.74253 20.28604 39.52255 26.40812a121.8268 121.8268 0 0 0 93.24005 0c14.78002-6.1221 28.2104-15.09598 39.52255-26.40812s20.28604-24.74253 26.40812-39.52255A121.8268 121.8268 0 0 0 251.424 129.6" fill="none" stroke="#11557c" stroke-width="3" class="D"/></g><defs><clipPath id="A"><path d="M251.424 129.6a121.8268 121.8268 0 0 0-9.2733-46.62003c-6.1221-14.78002-15.09598-28.2104-26.40812-39.52255S191.00005 23.1714 176.22003 17.0493a121.8268 121.8268 0 0 0-93.24005 0c-14.78002 6.1221-28.2104 15.09598-39.52255 26.40812S23.1714 68.19995 17.0493 82.97997a121.8268 121.8268 0 0 0 0 93.24005c6.1221 14.78002 15.09598 28.2104 26.40812 39.52255s24.74253 20.28604 39.52255 26.40812a121.8268 121.8268 0 0 0 93.24005 0c14.78002-6.1221 28.2104-15.09598 39.52255-26.40812s20.28604-24.74253 26.40812-39.52255A121.8268 121.8268 0 0 0 251.424 129.6m0 0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css
index 63e99e52fa26..7cf24a748b0a 100644
--- a/doc/_static/mpl.css
+++ b/doc/_static/mpl.css
@@ -1,516 +1,20 @@
-/*
- * Alternate Sphinx design
- * Originally created by Armin Ronacher for Werkzeug, adapted by Georg Brandl.
- */
-
-/* Carlogo font (similar to Calibri in the MPL logo) */
-@font-face {
-    font-family: 'Carlogo';
-    font-style: normal;
-    font-weight: normal;
-    src:    local('Carlito'),
-            url('fonts/carlogo-regular.woff2') format('woff2'),
-            url('fonts/carlogo-regular.woff') format('woff'),
-            url('fonts/carlogo-regular.ttf') format('truetype')
-}
-
-@font-face {
-    font-family: 'Carlogo';
-    font-style: normal;
-    font-weight: bold;
-    src:    local('Carlito Bold'),
-            url('fonts/carlogo-bold.woff2') format('woff2'),
-            url('fonts/carlogo-bold.woff') format('woff'),
-            url('fonts/carlogo-bold.ttf') format('truetype')
-}
-
-@font-face {
-    font-family: 'Carlogo';
-    font-style: italic;
-    font-weight: normal;
-    src:    local('Carlito Italic'),
-            url('fonts/carlogo-italic.woff2') format('woff2'),
-            url('fonts/carlogo-italic.woff') format('woff'),
-            url('fonts/carlogo-italic.ttf') format('truetype')
-}
-
-@font-face {
-    font-family: 'Carlogo';
-    font-style: italic;
-    font-weight: bold;
-    src:    local('Carlito Bold Italic'),
-            url('fonts/carlogo-bolditalic.woff2') format('woff2'),
-            url('fonts/carlogo-bolditalic.woff') format('woff'),
-            url('fonts/carlogo-bolditalic.ttf') format('truetype')
-}
-
-
-body {
-    font-family: 'Helvetica Neue', Helvetica, 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva', 'Verdana', sans-serif;
-    font-size: 14px;
-    line-height: 150%;
-    text-align: center;
-    background-color: #BFD1D4;
-    color: black;
-    padding: 0;
-    border: 1px solid #aaa;
-    color: #333;
-    margin: auto;
-    min-width: 740px;
-    max-width: 1200px;
-}
-
-a {
-    color: #CA7900;
-    text-decoration: none;
-}
-
-a:hover {
-    color: #2491CF;
-}
-
-div.highlight-python a {
-    color: #CA7900;
-}
-
-div.highlight-python a:hover {
-    color: #2491CF;
-}
-
-strong {
-  font-weight: strong;
-}
-
-pre {
-    font-family:  Monaco, Menlo, Consolas, 'Courier New', monospace;
-    font-size: 0.90em;
-    border-bottom-left-radius: 4px;
-    border-bottom-right-radius: 4px;
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
-    letter-spacing: 0.015em;
-    padding: 1em;
-    border: 1px solid #ccc;
-    background-color: #f8f8f8;
-    line-height: 140%;
-    overflow-x: auto;
-}
-
-td.linenos pre {
-    padding: 0.5em 0;
-    border: 0;
-    background-color: transparent;
-    color: #aaa;
-}
-
-table.highlighttable {
-    margin-left: 0.5em;
-}
-
-table.highlighttable td {
-    padding: 0 0.5em 0 0.5em;
-}
-
-cite, code, tt, dl.value-list dt {
-    font-family: 'Consolas', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
-    font-size: 0.95em;
-    letter-spacing: 0.01em;
-}
-
-hr {
-    border: 1px solid #abc;
-    margin: 2em;
-}
-
-tt {
-    background-color: #f2f2f2;
-    border-bottom: 1px solid #ddd;
-    color: #333;
-}
-
-tt.descname {
-    background-color: transparent;
-    font-weight: bold;
-    font-size: 1.2em;
-    border: 0;
-}
-
-tt.descclassname {
-    background-color: transparent;
-    border: 0;
-}
-
-tt.xref {
-    background-color: transparent;
-    font-weight: bold;
-    border: 0;
-}
-
-a tt {
-    background-color: transparent;
-    font-weight: bold;
-    border: 0;
-    color: #CA7900;
-}
-
-a tt:hover {
-    color: #2491CF;
-}
-
-dl {
-    margin-bottom: 15px;
-}
-
-dd p {
-    margin-top: 1px;
+:root {
+    --pst-color-link: var(--pst-color-primary);
+    --pst-color-link-hover: var(--pst-color-secondary);
+    --sd-color-primary: var(--pst-color-primary);
+    --sd-color-primary-text: var(--pst-color-text-base);
 }
 
-dd ul, dd table {
-    margin-bottom: 10px;
-}
-
-dd {
-    margin-top: 3px;
-    margin-bottom: 10px;
-    margin-left: 30px;
-}
-
-.refcount {
-    color: #060;
-}
-
-dt:target,
-.highlight {
-    background-color: #ffffee;
-}
-
-pre a {
-    color: inherit;
-    text-decoration: none;
-}
-
-.first {
-    margin-top: 0 !important;
-}
-
-div.document {
-    background-color: white;
-    text-align: left;
-    background-image: url(contents.png);
-    background-repeat: repeat-x;
-}
-
-/*
-div.documentwrapper {
-    width: 100%;
-}
-*/
-
-div.related h3 {
-    display: none;
-}
-
-div.related ul {
-    background-image: url(navigation.png);
-    height: 2em;
-    list-style: none;
-    border-top: 1px solid #ddd;
-    border-bottom: 1px solid #ddd;
-    margin: 0;
-    padding-left: 10px;
-}
-
-div.related ul li {
-    margin: 0;
-    padding: 0;
-    height: 2em;
-    float: left;
-}
-
-div.related ul li.right {
-    float: right;
-    margin-right: 5px;
-}
-
-div.related ul li a {
-    margin: 0;
-    padding: 0 5px 0 5px;
-    line-height: 1.75em;
-    color: #EE9816;
-}
-
-div.related ul li a:hover {
-    color: #3CA8E7;
-}
-
-div.body {
-    margin: 0;
-    padding: 0.5em 20px 20px 20px;
-}
-
-div.bodywrapper {
-    margin: 0 240px 0 0;
-    border-right: 1px solid #ccc;
-}
-
-div.sphinxsidebar {
+.simple li>p {
     margin: 0;
-    padding: 0.5em 15px 15px 0;
-    width: 210px;
-    float: right;
-    text-align: left;
-/*    margin-left: -100%; */
-}
-
-div.sphinxsidebar ul {
-    padding-left: 1.5em;
-    margin-top: 10px;
-    margin-bottom: 10px;
-    list-style: none;
-    padding: 0;
-    line-height: 130%;
-}
-
-div.sphinxsidebar ul ul {
-    list-style: square;
-    margin-top: 6px;
-    margin-bottom: 6px;
-    margin-left: 16px;
-}
-
-div.sphinxsidebar #searchbox input {
-    border: 1px solid #aaa;
-    padding: 0.25em;
-    box-sizing: border-box;
-}
-
-div.sphinxsidebar #searchbox form {
-    display: inline-block;
-    width: 100%
-}
-
-div.sphinxsidebar #searchbox input[type="text"] {
-    float: left;
-    width: 80%;
-}
-
-div.sphinxsidebar #searchbox input[type="submit"] {
-    float: left;
-    width: 20%;
-    border-left: none;
-}
-
-div.sphinxsidebar #searchbox input[type="submit"]:hover {
-    background: #ddd;
-}
-
-div.sphinxsidebar .searchformwrapper {
-    display: block;
-}
-
-p {
-    margin: 0.8em 0 0.8em 0;
-}
-
-h1 {
-    margin: 0.5em 0em;
-    padding-top: 0.5em;
-    font-size: 32px;
-    color: #11557C;
-}
-
-h2 {
-    margin: 0.5em 0 0.2em 0;
-    padding-top: 0.5em;
-    font-size: 24px;
-}
-
-h3 {
-    margin: 0.2em 0 0.1em 0;
-    padding-top: 0.5em;
-    font-size: 18.72px;
-}
-
-h4 {
-    font-size: 16px;
-}
-
-h5 {
-    font-size: 13.28px;
-}
-
-h6 {
-    font-size: 12px;
-}
-
-h1, h2, h3, h4, h5, h6{
-    font-family: 'Carlogo', 'Carlito', sans-serif;
-    font-weight: bold;
-}
-
-h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
-    color: black!important;
-}
-
-h1 a.anchor, h2 a.anchor, h3 a.anchor, h4 a.anchor, h5 a.anchor, h6 a.anchor {
-    display: none;
-    margin: 0 0 0 0.3em;
-    padding: 0 0.2em 0 0.2em;
-    color: #aaa!important;
-}
-
-h1:hover a.anchor, h2:hover a.anchor, h3:hover a.anchor, h4:hover a.anchor,
-h5:hover a.anchor, h6:hover a.anchor {
-    display: inline;
-}
-
-h1 a.anchor:hover, h2 a.anchor:hover, h3 a.anchor:hover, h4 a.anchor:hover,
-h5 a.anchor:hover, h6 a.anchor:hover {
-    color: #777;
-    background-color: #eee;
-}
-
-table {
-    border-collapse: collapse;
-    margin: 0 -0.5em 0 -0.5em;
-}
-
-table td, table th {
-    padding: 0.2em 0.5em 0.2em 0.5em;
-}
-
-div.footer {
-    background-color: #E3EFF1;
-    color: #86989B;
-    padding: 3px 8px 3px 0;
-    clear: both;
-    font-size: 0.8em;
-    text-align: center;
-}
-
-div.footer a {
-    color: #86989B;
-    text-decoration: underline;
-}
-
-div.pagination {
-    margin-top: 2em;
-    padding-top: 0.5em;
-    border-top: 1px solid black;
-    text-align: center;
-}
-
-div.sphinxsidebar ul.toc {
-    margin: 1em 0 1em 0;
-    padding: 0 0 0 0.5em;
-    list-style: none;
-}
-
-div.sphinxsidebar ul.toc li {
-    margin: 0.5em 0 0.5em 0;
-    font-size: 0.9em;
-    line-height: 130%;
-}
-
-div.sphinxsidebar ul.toc li p {
-    margin: 0;
-    padding: 0;
-}
-
-div.sphinxsidebar ul.toc ul {
-    margin: 0.2em 0 0.2em 0;
-    padding: 0 0 0 1.8em;
-}
-
-div.sphinxsidebar ul.toc ul li {
-    padding: 0;
-}
-
-/* admonitions */
-
-div.admonition, div.deprecated {
-    margin: 10px 0px;
-    padding: 0.7em 1.4em;
-    border-left: 5px solid;
-  }
-
-div.note {
-    background-color: #eee;
-    border-color: #ccc;
-}
-
-div.seealso {
-    background-color: #EAF1F7;
-    border-color: #8EADCC;
-    color: #3F5E7F;
-  }
-
-div.warning, div.important {
-    background-color: #F3E5E5;
-    border-color: #CC8E8E;
-    color: #7F1919;
-}
-
-div.deprecated {
-    background-color: #f0f0f0;
-    border-color: #404040;
-    color: #606060;
-}
-
-span.versionmodified {
-    font-style: italic;
-}
-
-div.deprecated span.versionmodified {
-    font-weight: bold;
-    font-style: normal;
-}
-
-div.green, div.hint {
-    background-color: #E1F2DA;
-    border-color: #A1CC8E;
-    color: #3F7F3F;
-}
-
-div.admonition p.admonition-title {
-    font-size: 1.2em;
-    font-weight: bold;
-}
-
-div.admonition p, div.deprecated p {
-    margin: 0.6em 0;
-    padding: 0;
-}
-
-div.admonition pre {
-    margin: 0.6em 0;
-}
-
-div.admonition ul, div.admonition ol {
-    margin: 0.1em 0.5em 0.5em 2em;
-    padding: 0;
-}
-
-div.topic {
-    background-color: #f4f4f4;
-    border: 2px solid #ccc;
-    border-left: 0px;
-    border-right: 0px;
-    margin: 10px 0px;
-    padding-left: 1em;
-}
-
-p.topic-title {
-    font-size: 1.2em;
-    font-weight: bold;
 }
 
+/* multi column TOC */
 .contents ul {
     list-style-type: none;
     padding-left: 2em;
 }
 
-/* first level */
 .contents > ul {
     padding-left: 0;
 }
@@ -530,782 +34,68 @@ p.topic-title {
     -webkit-break-inside: avoid-column;
 }
 
-.contents > ul > li {
-    padding-top: 0.3em;
-    padding-bottom: 0.3em;
-}
-
-.contents ul > li::before {
-    content: "\25FE";
-    color: #bbb;
-    padding-right: .3em;
-}
-
 .contents > ul > li > a {
     font-size: 1.0em;
 }
 
+/* Hide red ¶ between the thumbnail and caption in gallery
 
-
-div.versioninfo {
-    margin: 1em 0 0 0;
-    border: 1px solid #ccc;
-    background-color: #DDEAF0;
-    padding: 8px;
-    line-height: 1.3em;
-    font-size: 0.9em;
-}
-
-a.headerlink {
-    color: #c60f0f!important;
-    font-size: 1em;
-    margin-left: 6px;
-    padding: 0 4px 0 4px;
-    text-decoration: none!important;
+Due the way that sphinx-gallery floats its captions the perma-link
+does not float with it.
+*/
+.sphx-glr-thumbcontainer p.caption:hover > a.headerlink{
     visibility: hidden;
 }
 
-h1:hover > a.headerlink,
-h2:hover > a.headerlink,
-h3:hover > a.headerlink,
-h4:hover > a.headerlink,
-h5:hover > a.headerlink,
-h6:hover > a.headerlink,
-dt:hover > a.headerlink {
-    visibility: visible;
-}
-
-a.headerlink:hover {
-    background-color: #ccc;
-    color: white!important;
-}
-
-table.indextable td {
-    text-align: left;
-    vertical-align: top;
-}
-
-table.indextable dl, table.indextable dd {
-    margin-top: 0;
-    margin-bottom: 0;
-}
-
-table.indextable tr.pcap {
-    height: 10px;
-}
-
-table.indextable tr.cap {
-    margin-top: 10px;
-    background-color: #f2f2f2;
-}
-
-img.toggler {
-    margin-right: 3px;
-    margin-top: 3px;
-    cursor: pointer;
-}
-
-img.inheritance {
-    border: 0px
-}
-
-form.pfform {
-    margin: 10px 0 20px 0;
-}
-
-table.contentstable {
-    width: 90%;
-}
-
-table.contentstable p.biglink {
-    line-height: 150%;
-}
-
-a.biglink {
-    font-size: 1.3em;
-}
-
-span.linkdescr {
-    font-style: italic;
-    padding-top: 5px;
-    font-size: 90%;
-}
-
-.highlight span.c1 span.highlighted {
-    background-color: #fce5a6;
-}
-
-ul.search {
-    margin: 10px 0 0 20px;
-    padding: 0;
-}
-
-ul.search li {
-    padding: 5px 0 5px 20px;
-    background-image: url(file.png);
-    background-repeat: no-repeat;
-    background-position: 0 7px;
-}
-
-ul.search li a {
-    font-weight: bold;
-}
-
-ul.search li div.context {
-    color: #888;
-    margin: 2px 0 0 30px;
-    text-align: left;
-}
-
-ul.keywordmatches li.goodmatch a {
-    font-weight: bold;
-}
-
-table.docutils {
-    border-spacing: 2px;
-    border-collapse: collapse;
-    border: 0px;
-}
-
-table.docutils th {
-    border-width: 1px 0px;
-    border-color: #888;
-    background-color: #f0f0f0;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-}
-
-table.docutils td {
-    border-width: 1px 0px;
-    border-color: #ccc;
-}
-
-table.docutils tr:last-of-type td {
-    border-bottom-color: #888;
-}
-
-table.docutils tr:first-of-type td {
-    border-top-color: #888;
-}
-
-/* Section titles within classes */
-dl.class p.rubric {
-    font-size: 16px;
-}
-
-/* Attribute tables */
-dl.class p.rubric + table.docutils {
-    margin-left: 0px;
-    margin-right: 0px;
-    margin-bottom: 1.5em;
-    border-top: 1px solid #888;
-    border-bottom: 1px solid #888;
-}
-
-dl.class p.rubric + table.docutils td {
-    padding-left: 0px;
-    border-color: #ccc;
-}
-
-dl.class p.rubric + table.docutils td:first-of-type > strong {
-    font-family: monospace;
-    font-size: 14px;
-    font-weight: normal;
-}
-
-.classifier:before {
-    font-style: normal;
-    margin: 0.2em;
-    content: ":";
-}
-
-/* module summary table */
-.longtable.docutils {
-    font-size: 12px;
-    margin-bottom: 30px;
-}
-.longtable.docutils, .longtable.docutils td {
-    border-color: #ccc;
-}
-
-.longtable.docutils tr.row-even{
-    background-color: #eff3f4;
-}
-
-/* tables inside class descriptions */
-dl.class table.property-table {
-    width: 85%;
-    border-spacing: 2px;
-    border-collapse: collapse;
-    border: 0px;
-}
-
-/* tables inside parameter descriptions */
-td.field-body table.property-table {
-    width: 100%;
-    border-spacing: 2px;
-    border-collapse: collapse;
-    border: 0px;
-}
-
-td.field-body table.property-table th {
-    padding: 2px 10px;
-    border-width: 1px 0px;
-    border-color: #888;
-    background-color: #f0f0f0;
-}
-
-td.field-body table.property-table td {
-    padding: 2px 10px;
-    border-width: 1px 0px;
-    border-color: #ccc;
-}
-
-td.field-body table.property-table tr:last-of-type td {
-    border-bottom-color: #888;
-}
-
-/* function and class description */
-.descclassname {
-    color: #aaa;
-    font-weight: normal;
-    font-family: monospace;
-}
-.descname {
-    font-family: monospace;
-}
-
-/*** function and class description ***/
-/* top-level definitions */
-dl.class, dl.function, dl.data, dl.exception {
-    border-top: 1px solid #888;
-    padding-top: 0px;
-    margin-top: 20px;
-}
-
-dl.method, dl.classmethod, dl.staticmethod, dl.attribute {
-    border-top: 1px solid #ccc;
-    padding-top: 0px;
-}
-
-
-dl.class > dt, dl.classmethod > dt, dl.method > dt, dl.function > dt,
-dl.attribute > dt, dl.staticmethod > dt, dl.data > dt, dl.exception > dt {
-    background-color: #eff3f4;
-    padding-left: 6px;
-    padding-right: 6px;
-    padding-top: 2px;
-    padding-bottom: 1px;
-}
-
-em.property {
-    margin-right: 4px;
-}
-
-.sig-paren {
-    font-size: 14px;
-}
-
-.sig-paren ~ em {
-    font-weight: normal;
-    font-family: monospace;
-    font-size: 14px;
-}
-
-dl.class big, dl.function big {
-    font-weight: normal;
-    font-family: monospace;
-}
-
-dl.class dd, dl.function dd, dl.data dd {
-    padding: 10px;
-}
-
-dl.class > dd {
-    padding: 10px;
-    padding-left: 35px;
-    margin-left: 0px;
-    border-left: 5px solid #f8f8f8;
-}
-
-.descclassname {
-    color: #aaa;
-    font-weight: normal;
-    font-family: monospace;
-    font-size: 14px;
-}
-
-.descname {
-    font-family: monospace;
-    font-size: 14px;
-}
-
-/* custom tables for lists of allowed values in "mpl._types" */
-dl.value-list {
-    display: grid;
-}
-
-dl.value-list dt {
-    grid-column: 1;
-    margin: 4px 0;
-}
-
-dl.value-list dd {
-    grid-column: 2;
-    margin: 4px 0 4px 20px;
-    padding: 0;
-}
-
-/* parameter section table */
-table.docutils.field-list {
-    width: 100%;
-}
-.docutils.field-list th.field-name {
-    background-color: #eee;
-    padding: 10px;
-    text-align: left;
-    vertical-align: top;
-    width: 125px;
-}
-.docutils.field-list td.field-body {
-    padding: 10px 10px 10px 20px;
-    text-align: left;
-    vertical-align: top;
-}
-.docutils.field-list td.field-body blockquote p {
-    font-size: 13px;
-    line-height: 18px;
-}
-.docutils.field-list td.field-body blockquote p ul li{
-    font-size: 13px;
-}
-
-p.rubric {
-    font-weight: bold;
-    font-size: 19px;
-    margin: 15px 0 10px 0;
-}
-
-#matplotlib-examples ul li{
-  font-size: large;
-}
-
-#matplotlib-examples ul li ul{
-  margin-bottom:20px;
-  overflow:hidden;
-  border-top:1px solid #ccc;
-}
-
-#matplotlib-examples ul li ul li {
-  font-size: small;
-  line-height:1.75em;
-  display:inline;
-  float: left;
-  width: 22em;
-}
-
-#overview ul li ul{
-  margin-bottom:20px;
-  overflow:hidden;
-  border-top:1px solid #ccc;
-}
-
-#overview ul li ul li {
-  display:inline;
-  float: left;
-  width: 30em;
-}
-
-figure {
-  margin: 1em;
-  display: inline-block;
-}
-
-figure img {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-figcaption {
-  text-align: center;
-}
-
-
-/* "Go to released version" message. */
-#unreleased-message {
-  background: #d62728;
-  box-sizing: border-box;
-  color: #fff;
-  font-weight: bold;
-  left: 0;
-  min-height: 3em;
-  padding: 0.7em;
-  position: fixed;
-  top: 0;
-  width: 100%;
-  z-index: 10000;
-}
-
-#unreleased-message + div {
-  margin-top: 3em;
-}
-
-#unreleased-message a {
-  color: #fff;
-  text-decoration:underline;
-
-}
-
-/* top-banner style message. */
-#annc-banner {
-  box-sizing: border-box;
-  left: 0;
-  min-height: 3em;
-  padding: 0.7em;
-  top: 0;
-  width: 100%;
-  z-index: 10000;
-  background-image: linear-gradient(90deg, #440154, #482475, #414487, #355f8d, #2a788e, #21908d, #22a884, #42be71, #7ad151, #bddf26, #bddf26);
-  padding: 5px
-}
-
-#annc-banner a {
-    font-weight: bold;
-}
-
-#annc-banner p{
-    background-color: rgba(255, 255, 255, .8);
-    padding: 13px;
-    margin:0;
-}
-
-/* Fork me on GitHub "button" */
-#forkongithub a{
-  background:#FF7F0E;
-  color:#fff !important;
-  text-decoration:none;
-  text-align:center;
-  font-weight:bold;
-  padding:5px 40px;
-  line-height:1.5rem;
-  position:relative;
-  transition:background .25s ease;
-}
-#forkongithub a:hover{
-  background:#CA7900;
-}
-#forkongithub a::before,#forkongithub a::after{
-  content:"";
-  width:100%;
-  display:block;
-  position:absolute;
-  top:1px;
-  left:0;
-  height:1px;
-  background:#fff;
-}
-#forkongithub a::after{
-  bottom:1px;
-  top:auto;
-}
-@media screen and (min-width:700px){
-  #forkongithub{
-    position:absolute;
-    top:0;
-    right:0;
-    width:150px;
-    overflow:hidden;
-    height:150px;
-    z-index:9999;
-  }
-  #forkongithub a{
-    width:150px;
-    position:absolute;
-    top:40px;
-    right:-60px;
-    transform:rotate(45deg);
-    -webkit-transform:rotate(45deg);
-    -ms-transform:rotate(45deg);
-    -moz-transform:rotate(45deg);
-    -o-transform:rotate(45deg);
-    box-shadow:4px 4px 10px rgba(0,0,0,0.8);
-  }
-}
-
-.mpl-button {
-    background: #11557C;
-    font-weight: normal;
-    display: inline-block;
-    padding: 0 1em;
-    line-height: 2.8;
-    font-size: 16px;
-    text-align: center;
-    cursor: pointer;
-    color: #fff;
-    text-decoration: none;
-    border-radius: 6px;
-    z-index: 1;
-    transition: background .25s ease;
-}
-
-.mpl-button:hover, .mpl-button:active, .mpl-button:focus {
-    background: #003c63;
-    outline-color: #003c63;
-}
-
-#sidebar-donations {
-    margin-top: 40px;
-}
-
-.donate_button {
-    clear: both;
-    display: block;
-    margin: 30px auto 0;
-}
-
-.donate_button:last-of-type {
-    margin: 15px auto 30px;
-
-
-}
-
-div.responsive_screenshots {
-    /* Horizontally centered */
-    display: block;
-    margin: auto;
-
-    /* Do not go beyond 1:1 scale (and ensure a 1x4 tight layout) */
-    max-width: 640px;  /* at most 4 x 1:1 subfig width  */
-    max-height: 120px; /* at most 1 x 1:1 subfig height */
-}
-
-/* To avoid subfigure parts outside of the responsive_screenshots  */
-/* element (see: https://stackoverflow.com/questions/2062258/      */
-/* floating-stuff-within-a-div-floats-outside-of-div-why)          */
-span.clear_screenshots { clear: left; display: block; }
-
-div.responsive_subfig{
-    float: left;
-    width: 25%;  /* we want 4 subfigs in a row */
-
-    /* Include content, padding and border in width. This should */
-    /* avoid having to use tricks like "width: 24.9999%"         */
-    box-sizing: border-box;
-}
-
-div.responsive_subfig img {
-    /* Horizontally centered */
-    display: block;
-    margin: auto;
-
-    /* Possible downscaling */
-    max-width: 162px;  /* at most 1 x 1:1 subfig width  */
-    max-height: 139px; /* at most 1 x 1:1 subfig height */
-
-    width: 100%;
-}
-
-@media only screen and (max-width: 930px){
-    /* The value of 1000px was handcrafted to provide a more or less */
-    /* smooth transition between the 1x4 and the 2x2 layouts. It is  */
-    /* NB: it is slightly below 1024px: so one should still have a   */
-    /* row in a 1024x768 window                                      */
-
-    div.responsive_screenshots {
-        /* Do not go beyond 1:1 scale (and ensure a 2x2 tight layout) */
-        max-width: 324px;  /* at most 2 x 1:1 subfig width  */
-        max-height: 278px; /* at most 2 x 1:1 subfig height */
-    }
-
-    div.responsive_subfig {
-        width: 50%;  /* we want 2 subfigs in a row */
-    }
-}
-
-/* Sphinx gallery display */
-
-div.align-center {
-    margin: auto;
-    text-align: center;
-}
-
-p.caption {
-    font-weight: bold;
-}
-
-.sphx-glr-multi-img{
-    max-width: 99% !important;
-}
-
+/* slightly reduce horizontal margin compared to gallery.css to
+ * get four columns of thumbnails in the pydata-sphinx-theme. */
 .sphx-glr-thumbcontainer {
-    border: solid #d6d6d6 1px !important;
-    text-align: center !important;
-    font-size: 1.2em !important;
+    margin: 5px 2px;
 }
 
-div.sphx-glr-download {
-    width: auto !important;
+html[data-theme="dark"] .sphx-glr-thumbcontainer {
+    background-color: rgb(63, 63, 63);
 }
 
-div.sphx-glr-download a {
-   background-color: #d9edf7 !important;
-   border: 1px solid #bce8f1 !important;
-   background-image: none !important;
-}
-
-p.sphx-glr-signature {
-   display: none !important;
+/* workaround: the default padding decenters the image inside the frame */
+.sphx-glr-thumbcontainer .figure {
+    padding: 0;
 }
 
+/* hide note linking to the download section at the bottom of galleries
+ * as suggested in https://github.com/sphinx-gallery/sphinx-gallery/issues/760
+ */
 div.sphx-glr-download-link-note {
-   display: none !important;
-}
-
-.sphx-glr-thumbcontainer a.internal {
-    font-weight: 400;
-}
-
-.viewcode-link {
-    float: right;
-}
-
-.viewcode-back {
-    float: right;
-    font-family: "Helvetica Neue", Helvetica, 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva', 'Verdana', sans-serif;
-}
-
-div.viewcode-block:target {
-    margin: -1px -13px;
-    padding: 0 10px;
-    border-top: 1px solid #ccc;
-    border-bottom: 1px solid #ccc;
-    background-color: #f4debf;
-
-}
-
-.sidebar-announcement,
-.sidebar-versions {
-    border: 1px solid #11557C;
-    background: #eff9ff;
-    padding: 0.2em 0.5em;
-    margin-top: 1em;
-}
-
-.sidebar-announcement p {
-    margin: 0.4em 0 0.6em 0;
+    height: 0px;
+    visibility: hidden;
 }
 
-/* new main nav */
-nav.main-nav{
-    background-color: #002b47;
-    font-family: 'Carlogo', 'Carlito', sans-serif;
-    font-size: 16px;
-  }
-
-  nav.main-nav ul{
-    margin: 0;
-    padding: 0;
-    display: flex;
-    flex-direction: row;
-  }
-
-  nav.main-nav li{
-    margin: 8px 15px;
-    list-style-type: none;
-  }
-
-  nav.main-nav a{
-    color: white;
-  }
-
-  nav.main-nav a:hover{
-    text-decoration: underline;
-  }
-
-  nav.main-nav li.nav-right{
-    margin: 6px 15px 0 auto;
-  }
-
-  nav.main-nav input {
+/* re-style the download button */
+div.sphx-glr-download a {
+    background-color: #E3F0F6;
+    background-image: none;
+    color: #11557c;
     border: 0;
-    padding: 3px 6px;
-    width: 198px;
-  }
-
-/* community items on main page */
-div.box {
-    display: flex;
-    flex-flow: row wrap;
-}
-
-div.box-item {
-    flex: 0 0 45%;
-    padding: 4px;
-    margin: 8px 12px;
-}
-
-div.box-item img {
-    float: left;
-    width: 30px;
-    height: 30px;
-    fill: #888;
-
-}
-div.box-item p {
-    margin: 0 0 0 50px;
-}
-
-div.box-item ul {
-    margin: 0 0 0 50px;
-    padding-left: 20px;
 }
 
-hr.box-sep {
-    margin: 1em 2em;
+div.sphx-glr-download a:hover {
+    background-color: #BCD4DF;
 }
 
-@media only screen and (max-width: 930px){
-    div.box-item {
-        flex: 0 0 90%;
-    }
+/* Do not fold multiple figures in examples into two column layout. */
+img.sphx-glr-multi-img {
+    max-width: 100%;
 }
 
-/* bullet boxes on main page */
-div.bullet-box-container {
-    display: flex;
-    flex-wrap: wrap;
-    margin: 1em 0;
+table.property-table th,
+table.property-table td {
+    padding: 4px 10px;
 }
 
-div.bullet-box {
-    flex-grow: 1;
-    width: 28%;
-    margin: 0.4em;
-    padding: 0 1em;
-    background: #eff9ff;
-}
-
-div.bullet-box p:first-of-type {
-    font-size: 1.4em;
-    text-align: center;
-}
-
-div.bullet-box ul {
-    padding-left: 1.2em;
-}
-
-div.bullet-box li {
-    padding-left: 0.3em;
-    margin-bottom: 0.3em;
-}
-
-@media only screen and (max-width: 930px){
-    div.bullet-box {
-        flex: 0 0 90%;
-    }
-}
-
-div#gallery.section .sphx-glr-clear:first-of-type, div#tutorials.section .sphx-glr-clear:first-of-type{
-    display: none;
+/* Fix selection of parameter names; remove when fixed in the theme
+ * https://github.com/sphinx-doc/sphinx/pull/9763
+ */
+.classifier:before {
+    display: inline-block;
+    margin: 0 0.5em;
 }
diff --git a/doc/_static/mplot3d_view_angles.png b/doc/_static/mplot3d_view_angles.png
new file mode 100644
index 000000000000..16d3c2f0d699
Binary files /dev/null and b/doc/_static/mplot3d_view_angles.png differ
diff --git a/doc/_static/quiver_sizes.svg b/doc/_static/quiver_sizes.svg
new file mode 100644
index 000000000000..afba2c601d09
--- /dev/null
+++ b/doc/_static/quiver_sizes.svg
@@ -0,0 +1,429 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="124.60983mm"
+   height="66.649742mm"
+   viewBox="0 0 124.60984 66.649742"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="quiver_sizes.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="206.62198"
+     inkscape:cy="182.53482"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="4"
+     fit-margin-bottom="4"
+     fit-margin-right="1"
+     fit-margin-left="1"
+     inkscape:window-width="2842"
+     inkscape:window-height="1307"
+     inkscape:window-x="326"
+     inkscape:window-y="88"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-26.4895,-15.100043)">
+    <path
+       style="fill:#a9a9a9;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 49.247769,29.898067 h 55.000001 l -5.000002,-10 50.000002,15 -50.000002,15 5.000002,-10 H 49.247769 Z"
+       id="path830"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:5.64444447px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       x="27.497768"
+       y="36.763393"
+       id="text834"><tspan
+         sodipodi:role="line"
+         id="tspan832"
+         x="27.497768"
+         y="36.763393"
+         style="font-size:5.64444447px;stroke-width:0.26458332">width</tspan></text>
+    <g
+       id="g1157"
+       transform="translate(-0.7868293,0.13449068)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path836"
+         d="M 43.396392,38.016767 V 31.378894"
+         style="fill:none;stroke:#000000;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         transform="matrix(1,0,0,1.4788731,-0.33072881,-55.515077)"
+         inkscape:transform-center-y="-0.2290986"
+         d="m 44.520736,59.09203 -0.793617,0 -0.793616,0 0.396808,-0.687293 0.396808,-0.687292 0.396809,0.687292 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.5707963"
+         sodipodi:arg1="0.52359878"
+         sodipodi:r2="0.45819476"
+         sodipodi:r1="0.91638952"
+         sodipodi:cy="58.633835"
+         sodipodi:cx="43.727119"
+         sodipodi:sides="3"
+         id="path838"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47877455;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.58582093"
+         sodipodi:type="star" />
+      <path
+         inkscape:transform-center-x="1.187699e-06"
+         transform="matrix(0.5,-1.2807417,0.8660254,0.73943655,-29.848984,51.629479)"
+         inkscape:transform-center-y="0.22909693"
+         d="m 45.158573,59.420551 -0.793617,0 -0.793617,0 0.396809,-0.687292 0.396808,-0.687292 0.396808,0.687292 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.5707963"
+         sodipodi:arg1="0.52359878"
+         sodipodi:r2="0.45819479"
+         sodipodi:r1="0.91638952"
+         sodipodi:cy="58.962357"
+         sodipodi:cx="44.364956"
+         sodipodi:sides="3"
+         id="path838-3"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47877455;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.58582093"
+         sodipodi:type="star" />
+    </g>
+    <g
+       id="g860-8"
+       transform="matrix(0,1,-1.4788731,0,234.60455,11.935081)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path836-7"
+         d="M 43.727121,86.959033 V 58.756883"
+         style="fill:none;stroke:#000000;stroke-width:0.49338484;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:transform-center-y="-0.2290986"
+         d="m 44.520736,59.09203 -0.793617,0 -0.793616,0 0.396808,-0.687293 0.396808,-0.687292 0.396809,0.687292 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.5707963"
+         sodipodi:arg1="0.52359878"
+         sodipodi:r2="0.45819476"
+         sodipodi:r1="0.91638952"
+         sodipodi:cy="58.633835"
+         sodipodi:cx="43.727119"
+         sodipodi:sides="3"
+         id="path838-9"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47877455;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.58582093"
+         sodipodi:type="star" />
+      <path
+         inkscape:transform-center-x="1.187699e-06"
+         transform="rotate(-60,68.458681,73.609381)"
+         inkscape:transform-center-y="0.22909693"
+         d="m 45.158573,59.420551 -0.793617,0 -0.793617,0 0.396809,-0.687292 0.396808,-0.687292 0.396808,0.687292 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.5707963"
+         sodipodi:arg1="0.52359878"
+         sodipodi:r2="0.45819479"
+         sodipodi:r1="0.91638952"
+         sodipodi:cy="58.962357"
+         sodipodi:cx="44.364956"
+         sodipodi:sides="3"
+         id="path838-3-2"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47877455;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.58582093"
+         sodipodi:type="star" />
+    </g>
+    <g
+       id="g860-8-0"
+       transform="matrix(0,1,-1.4677328,0,233.77815,16.281808)"
+       style="stroke-width:1.00378788">
+      <path
+         inkscape:connector-curvature="0"
+         id="path836-7-2"
+         d="M 43.727121,90.688182 V 58.756881"
+         style="fill:none;stroke:#000000;stroke-width:0.49525371;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:transform-center-y="-0.2290986"
+         d="m 44.520736,59.09203 -0.793617,0 -0.793616,0 0.396808,-0.687293 0.396808,-0.687292 0.396809,0.687292 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.5707963"
+         sodipodi:arg1="0.52359878"
+         sodipodi:r2="0.45819476"
+         sodipodi:r1="0.91638952"
+         sodipodi:cy="58.633835"
+         sodipodi:cx="43.727119"
+         sodipodi:sides="3"
+         id="path838-9-3"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.48058811;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.58582093"
+         sodipodi:type="star" />
+      <path
+         inkscape:transform-center-x="1.187699e-06"
+         transform="rotate(-60,71.557471,75.398471)"
+         inkscape:transform-center-y="0.22909693"
+         d="m 45.158573,59.420551 -0.793617,0 -0.793617,0 0.396809,-0.687292 0.396808,-0.687292 0.396808,0.687292 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.5707963"
+         sodipodi:arg1="0.52359878"
+         sodipodi:r2="0.45819479"
+         sodipodi:r1="0.91638952"
+         sodipodi:cy="58.962357"
+         sodipodi:cx="44.364956"
+         sodipodi:sides="3"
+         id="path838-3-2-7"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.48058811;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.58582093"
+         sodipodi:type="star" />
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.05833327, 0.52916663;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 99.247766,49.898067 V 61.804314"
+       id="path1041"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.05833327, 0.52916662;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 104.24777,39.898066 V 56.718003"
+       id="path1041-5"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.05833326, 0.52916662;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 149.24777,34.898065 V 71.905982"
+       id="path1041-5-9"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:7.05555534px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       x="108.03401"
+       y="52.986835"
+       id="text834-2"><tspan
+         sodipodi:role="line"
+         id="tspan832-2"
+         x="108.03401"
+         y="52.986835"
+         style="font-size:5.64444447px;stroke-width:0.26458332">headaxislength</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:7.05555534px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       x="111.39037"
+       y="65.815002"
+       id="text834-2-8"><tspan
+         sodipodi:role="line"
+         id="tspan832-2-9"
+         x="111.39037"
+         y="65.815002"
+         style="font-size:5.64444447px;stroke-width:0.26458332">headlength</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.05833323, 0.52916662;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 49.247767,39.898066 h -7.01618"
+       id="path1041-7"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.05833324, 0.52916663;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 49.247769,29.898067 h -7.01618"
+       id="path1041-7-6"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g1157-1"
+       transform="translate(49.213172,10.134491)">
+      <g
+         id="g1192">
+        <path
+           style="fill:none;stroke:#000000;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 43.396393,38.016771 V 11.500726"
+           id="path836-2"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:type="star"
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47877455;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.58582093"
+           id="path838-93"
+           sodipodi:sides="3"
+           sodipodi:cx="43.727119"
+           sodipodi:cy="58.633835"
+           sodipodi:r1="0.91638952"
+           sodipodi:r2="0.45819476"
+           sodipodi:arg1="0.52359878"
+           sodipodi:arg2="1.5707963"
+           inkscape:flatsided="false"
+           inkscape:rounded="0"
+           inkscape:randomized="0"
+           d="m 44.520736,59.09203 -0.793617,0 -0.793616,0 0.396808,-0.687293 0.396808,-0.687292 0.396809,0.687292 z"
+           inkscape:transform-center-y="-0.2290986"
+           transform="matrix(1,0,0,1.4788731,-0.33072881,-75.547815)" />
+        <path
+           sodipodi:type="star"
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47877455;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.58582093"
+           id="path838-3-1"
+           sodipodi:sides="3"
+           sodipodi:cx="44.364956"
+           sodipodi:cy="58.962357"
+           sodipodi:r1="0.91638952"
+           sodipodi:r2="0.45819479"
+           sodipodi:arg1="0.52359878"
+           sodipodi:arg2="1.5707963"
+           inkscape:flatsided="false"
+           inkscape:rounded="0"
+           inkscape:randomized="0"
+           d="m 45.158573,59.420551 -0.793617,0 -0.793617,0 0.396809,-0.687292 0.396808,-0.687292 0.396808,0.687292 z"
+           inkscape:transform-center-y="0.22909693"
+           transform="matrix(0.5,-1.2807417,0.8660254,0.73943655,-29.848984,51.629479)"
+           inkscape:transform-center-x="1.187699e-06" />
+      </g>
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.05833324, 0.52916663;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 99.247768,49.898067 H 92.231589"
+       id="path1041-7-9"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.05833325, 0.52916663;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 99.247768,19.898067 h -7.01618"
+       id="path1041-7-6-4"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:5.64444447px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       x="63.899822"
+       y="26.6856"
+       id="text834-7"><tspan
+         sodipodi:role="line"
+         id="tspan832-8"
+         x="63.899822"
+         y="26.6856"
+         style="font-size:5.64444447px;stroke-width:0.26458332">headwidth</tspan></text>
+    <g
+       id="g860-8-0-4"
+       transform="matrix(0,1,-1.4677328,0,233.77815,27.021704)"
+       style="stroke-width:1.00378788">
+      <g
+         id="g1254">
+        <path
+           style="fill:none;stroke:#000000;stroke-width:0.49525371;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 43.727121,124.57775 V 58.756879"
+           id="path836-7-2-5"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:type="star"
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.48058811;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.58582093"
+           id="path838-9-3-0"
+           sodipodi:sides="3"
+           sodipodi:cx="43.727119"
+           sodipodi:cy="58.633835"
+           sodipodi:r1="0.91638952"
+           sodipodi:r2="0.45819476"
+           sodipodi:arg1="0.52359878"
+           sodipodi:arg2="1.5707963"
+           inkscape:flatsided="false"
+           inkscape:rounded="0"
+           inkscape:randomized="0"
+           d="m 44.520736,59.09203 -0.793617,0 -0.793616,0 0.396808,-0.687293 0.396808,-0.687292 0.396809,0.687292 z"
+           inkscape:transform-center-y="-0.2290986" />
+        <path
+           sodipodi:type="star"
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.48058811;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.58582093"
+           id="path838-3-2-7-3"
+           sodipodi:sides="3"
+           sodipodi:cx="44.364956"
+           sodipodi:cy="58.962357"
+           sodipodi:r1="0.91638952"
+           sodipodi:r2="0.45819479"
+           sodipodi:arg1="0.52359878"
+           sodipodi:arg2="1.5707963"
+           inkscape:flatsided="false"
+           inkscape:rounded="0"
+           inkscape:randomized="0"
+           d="m 45.158573,59.420551 -0.793617,0 -0.793617,0 0.396809,-0.687292 0.396808,-0.687292 0.396808,0.687292 z"
+           inkscape:transform-center-y="0.22909693"
+           transform="rotate(-60,100.9964,92.395045)"
+           inkscape:transform-center-x="1.187699e-06" />
+      </g>
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.26458335;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.05833329, 0.52916663;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 49.247764,39.898067 V 72.309523"
+       id="path1041-6"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:5.64444447px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       x="93.229408"
+       y="76.578453"
+       id="text834-7-1"><tspan
+         sodipodi:role="line"
+         id="tspan832-8-0"
+         x="93.229408"
+         y="76.578453"
+         style="font-size:5.64444447px;stroke-width:0.26458332">length</tspan></text>
+    <circle
+       style="fill:#11557c;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:1.05833326, 0.52916663;stroke-dashoffset:0;stroke-opacity:0.58582093"
+       id="path1274"
+       cx="49.262566"
+       cy="29.89636"
+       r="0.8504464" />
+    <circle
+       style="fill:#11557c;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:1.05833327, 0.52916663;stroke-dashoffset:0;stroke-opacity:0.58582093"
+       id="path1274-6"
+       cx="49.262566"
+       cy="39.747364"
+       r="0.8504464" />
+    <circle
+       style="fill:#11557c;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:1.05833327, 0.52916663;stroke-dashoffset:0;stroke-opacity:0.58582093"
+       id="path1274-3"
+       cx="99.253616"
+       cy="19.950489"
+       r="0.8504464" />
+    <circle
+       style="fill:#11557c;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:1.05833328, 0.52916663;stroke-dashoffset:0;stroke-opacity:0.58582093"
+       id="path1274-3-2"
+       cx="99.253632"
+       cy="49.880951"
+       r="0.8504464" />
+    <circle
+       style="fill:#11557c;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:1.05833327, 0.52916663;stroke-dashoffset:0;stroke-opacity:0.58582093"
+       id="path1274-0"
+       cx="104.19811"
+       cy="29.791626"
+       r="0.8504464" />
+    <circle
+       style="fill:#11557c;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:1.05833328, 0.52916663;stroke-dashoffset:0;stroke-opacity:0.58582093"
+       id="path1274-6-6"
+       cx="104.19811"
+       cy="39.642632"
+       r="0.8504464" />
+    <circle
+       style="fill:#11557c;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:1.05833328, 0.52916663;stroke-dashoffset:0;stroke-opacity:0.58582093"
+       id="path1274-3-1"
+       cx="149.24889"
+       cy="34.878429"
+       r="0.8504464" />
+  </g>
+</svg>
diff --git a/doc/_static/switcher.json b/doc/_static/switcher.json
new file mode 100644
index 000000000000..00dd1ffa6c68
--- /dev/null
+++ b/doc/_static/switcher.json
@@ -0,0 +1,32 @@
+[
+    {
+        "name": "3.6.1 (stable)",
+        "version": "stable",
+        "url": "https://matplotlib.org/stable/"
+    },
+    {
+        "name": "3.7 (dev)",
+        "version": "dev",
+        "url": "https://matplotlib.org/devdocs/"
+    },
+    {
+        "name": "3.5",
+        "version": "3.5.3",
+        "url": "https://matplotlib.org/3.5.3/"
+    },
+    {
+        "name": "3.4",
+        "version": "3.4.3",
+        "url": "https://matplotlib.org/3.4.3/"
+    },
+    {
+        "name": "3.3",
+        "version": "3.3.4",
+        "url": "https://matplotlib.org/3.3.4/"
+    },
+    {
+        "name": "2.2",
+        "version": "2.2.4",
+        "url": "https://matplotlib.org/2.2.4/"
+    }
+]
diff --git a/doc/_static/zenodo_cache/4638398.svg b/doc/_static/zenodo_cache/4638398.svg
new file mode 100644
index 000000000000..8b50f14790dd
--- /dev/null
+++ b/doc/_static/zenodo_cache/4638398.svg
@@ -0,0 +1,35 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="186" height="20">
+        <linearGradient id="b" x2="0" y2="100%">
+            <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+            <stop offset="1" stop-opacity=".1"/>
+        </linearGradient>
+        <mask id="a" width="186" height="20">
+            <rect width="186" height="20" rx="3"
+            fill="#fff"/>
+        </mask>
+        <g mask="url(#a)">
+            <path fill="#555" d="M0 0h31v20H0z" />
+            <path fill="#007ec6"
+            d="M31 0h155v20H31z"
+            />
+            <path fill="url(#b)" d="M0 0h186v20H0z" />
+        </g>
+        <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,
+        Verdana,Geneva,sans-serif" font-size="11">
+            <text x="16" y="15" fill="#010101"
+            fill-opacity=".3">
+                DOI
+            </text>
+            <text x="16" y="14">
+                DOI
+            </text>
+            <text x="108"
+            y="15" fill="#010101" fill-opacity=".3">
+                10.5281/zenodo.4638398
+            </text>
+            <text x="108" y="14">
+                10.5281/zenodo.4638398
+            </text>
+        </g>
+    </svg>
\ No newline at end of file
diff --git a/doc/_static/zenodo_cache/4649959.svg b/doc/_static/zenodo_cache/4649959.svg
new file mode 100644
index 000000000000..a604de20cdd5
--- /dev/null
+++ b/doc/_static/zenodo_cache/4649959.svg
@@ -0,0 +1,35 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="186" height="20">
+        <linearGradient id="b" x2="0" y2="100%">
+            <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+            <stop offset="1" stop-opacity=".1"/>
+        </linearGradient>
+        <mask id="a" width="186" height="20">
+            <rect width="186" height="20" rx="3"
+            fill="#fff"/>
+        </mask>
+        <g mask="url(#a)">
+            <path fill="#555" d="M0 0h31v20H0z" />
+            <path fill="#007ec6"
+            d="M31 0h155v20H31z"
+            />
+            <path fill="url(#b)" d="M0 0h186v20H0z" />
+        </g>
+        <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,
+        Verdana,Geneva,sans-serif" font-size="11">
+            <text x="16" y="15" fill="#010101"
+            fill-opacity=".3">
+                DOI
+            </text>
+            <text x="16" y="14">
+                DOI
+            </text>
+            <text x="108"
+            y="15" fill="#010101" fill-opacity=".3">
+                10.5281/zenodo.4649959
+            </text>
+            <text x="108" y="14">
+                10.5281/zenodo.4649959
+            </text>
+        </g>
+    </svg>
\ No newline at end of file
diff --git a/doc/_static/zenodo_cache/4743323.svg b/doc/_static/zenodo_cache/4743323.svg
new file mode 100644
index 000000000000..204cf037ad27
--- /dev/null
+++ b/doc/_static/zenodo_cache/4743323.svg
@@ -0,0 +1,35 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="186" height="20">
+        <linearGradient id="b" x2="0" y2="100%">
+            <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+            <stop offset="1" stop-opacity=".1"/>
+        </linearGradient>
+        <mask id="a" width="186" height="20">
+            <rect width="186" height="20" rx="3"
+            fill="#fff"/>
+        </mask>
+        <g mask="url(#a)">
+            <path fill="#555" d="M0 0h31v20H0z" />
+            <path fill="#007ec6"
+            d="M31 0h155v20H31z"
+            />
+            <path fill="url(#b)" d="M0 0h186v20H0z" />
+        </g>
+        <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,
+        Verdana,Geneva,sans-serif" font-size="11">
+            <text x="16" y="15" fill="#010101"
+            fill-opacity=".3">
+                DOI
+            </text>
+            <text x="16" y="14">
+                DOI
+            </text>
+            <text x="108"
+            y="15" fill="#010101" fill-opacity=".3">
+                10.5281/zenodo.4743323
+            </text>
+            <text x="108" y="14">
+                10.5281/zenodo.4743323
+            </text>
+        </g>
+    </svg>
\ No newline at end of file
diff --git a/doc/_static/zenodo_cache/5194481.svg b/doc/_static/zenodo_cache/5194481.svg
new file mode 100644
index 000000000000..728ae0c15a6a
--- /dev/null
+++ b/doc/_static/zenodo_cache/5194481.svg
@@ -0,0 +1,35 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="186" height="20">
+        <linearGradient id="b" x2="0" y2="100%">
+            <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+            <stop offset="1" stop-opacity=".1"/>
+        </linearGradient>
+        <mask id="a" width="186" height="20">
+            <rect width="186" height="20" rx="3"
+            fill="#fff"/>
+        </mask>
+        <g mask="url(#a)">
+            <path fill="#555" d="M0 0h31v20H0z" />
+            <path fill="#007ec6"
+            d="M31 0h155v20H31z"
+            />
+            <path fill="url(#b)" d="M0 0h186v20H0z" />
+        </g>
+        <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,
+        Verdana,Geneva,sans-serif" font-size="11">
+            <text x="16" y="15" fill="#010101"
+            fill-opacity=".3">
+                DOI
+            </text>
+            <text x="16" y="14">
+                DOI
+            </text>
+            <text x="108"
+            y="15" fill="#010101" fill-opacity=".3">
+                10.5281/zenodo.5194481
+            </text>
+            <text x="108" y="14">
+                10.5281/zenodo.5194481
+            </text>
+        </g>
+    </svg>
\ No newline at end of file
diff --git a/doc/_static/zenodo_cache/5706396.svg b/doc/_static/zenodo_cache/5706396.svg
new file mode 100644
index 000000000000..54718543c9c8
--- /dev/null
+++ b/doc/_static/zenodo_cache/5706396.svg
@@ -0,0 +1,35 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="186" height="20">
+        <linearGradient id="b" x2="0" y2="100%">
+            <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+            <stop offset="1" stop-opacity=".1"/>
+        </linearGradient>
+        <mask id="a" width="186" height="20">
+            <rect width="186" height="20" rx="3"
+            fill="#fff"/>
+        </mask>
+        <g mask="url(#a)">
+            <path fill="#555" d="M0 0h31v20H0z" />
+            <path fill="#007ec6"
+            d="M31 0h155v20H31z"
+            />
+            <path fill="url(#b)" d="M0 0h186v20H0z" />
+        </g>
+        <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,
+        Verdana,Geneva,sans-serif" font-size="11">
+            <text x="16" y="15" fill="#010101"
+            fill-opacity=".3">
+                DOI
+            </text>
+            <text x="16" y="14">
+                DOI
+            </text>
+            <text x="108"
+            y="15" fill="#010101" fill-opacity=".3">
+                10.5281/zenodo.5706396
+            </text>
+            <text x="108" y="14">
+                10.5281/zenodo.5706396
+            </text>
+        </g>
+    </svg>
\ No newline at end of file
diff --git a/doc/_static/zenodo_cache/5773480.svg b/doc/_static/zenodo_cache/5773480.svg
new file mode 100644
index 000000000000..431dbd803973
--- /dev/null
+++ b/doc/_static/zenodo_cache/5773480.svg
@@ -0,0 +1,35 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="186" height="20">
+        <linearGradient id="b" x2="0" y2="100%">
+            <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+            <stop offset="1" stop-opacity=".1"/>
+        </linearGradient>
+        <mask id="a" width="186" height="20">
+            <rect width="186" height="20" rx="3"
+            fill="#fff"/>
+        </mask>
+        <g mask="url(#a)">
+            <path fill="#555" d="M0 0h31v20H0z" />
+            <path fill="#007ec6"
+            d="M31 0h155v20H31z"
+            />
+            <path fill="url(#b)" d="M0 0h186v20H0z" />
+        </g>
+        <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,
+        Verdana,Geneva,sans-serif" font-size="11">
+            <text x="16" y="15" fill="#010101"
+            fill-opacity=".3">
+                DOI
+            </text>
+            <text x="16" y="14">
+                DOI
+            </text>
+            <text x="108"
+            y="15" fill="#010101" fill-opacity=".3">
+                10.5281/zenodo.5773480
+            </text>
+            <text x="108" y="14">
+                10.5281/zenodo.5773480
+            </text>
+        </g>
+    </svg>
\ No newline at end of file
diff --git a/doc/_static/zenodo_cache/6513224.svg b/doc/_static/zenodo_cache/6513224.svg
new file mode 100644
index 000000000000..fd54dfcb9abb
--- /dev/null
+++ b/doc/_static/zenodo_cache/6513224.svg
@@ -0,0 +1,35 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="186" height="20">
+        <linearGradient id="b" x2="0" y2="100%">
+            <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+            <stop offset="1" stop-opacity=".1"/>
+        </linearGradient>
+        <mask id="a" width="186" height="20">
+            <rect width="186" height="20" rx="3"
+            fill="#fff"/>
+        </mask>
+        <g mask="url(#a)">
+            <path fill="#555" d="M0 0h31v20H0z" />
+            <path fill="#007ec6"
+            d="M31 0h155v20H31z"
+            />
+            <path fill="url(#b)" d="M0 0h186v20H0z" />
+        </g>
+        <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,
+        Verdana,Geneva,sans-serif" font-size="11">
+            <text x="16" y="15" fill="#010101"
+            fill-opacity=".3">
+                DOI
+            </text>
+            <text x="16" y="14">
+                DOI
+            </text>
+            <text x="108"
+            y="15" fill="#010101" fill-opacity=".3">
+                10.5281/zenodo.6513224
+            </text>
+            <text x="108" y="14">
+                10.5281/zenodo.6513224
+            </text>
+        </g>
+    </svg>
\ No newline at end of file
diff --git a/doc/_static/zenodo_cache/6982547.svg b/doc/_static/zenodo_cache/6982547.svg
new file mode 100644
index 000000000000..6eb000d892da
--- /dev/null
+++ b/doc/_static/zenodo_cache/6982547.svg
@@ -0,0 +1,35 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="186" height="20">
+        <linearGradient id="b" x2="0" y2="100%">
+            <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+            <stop offset="1" stop-opacity=".1"/>
+        </linearGradient>
+        <mask id="a" width="186" height="20">
+            <rect width="186" height="20" rx="3"
+            fill="#fff"/>
+        </mask>
+        <g mask="url(#a)">
+            <path fill="#555" d="M0 0h31v20H0z" />
+            <path fill="#007ec6"
+            d="M31 0h155v20H31z"
+            />
+            <path fill="url(#b)" d="M0 0h186v20H0z" />
+        </g>
+        <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,
+        Verdana,Geneva,sans-serif" font-size="11">
+            <text x="16" y="15" fill="#010101"
+            fill-opacity=".3">
+                DOI
+            </text>
+            <text x="16" y="14">
+                DOI
+            </text>
+            <text x="108"
+            y="15" fill="#010101" fill-opacity=".3">
+                10.5281/zenodo.6982547
+            </text>
+            <text x="108" y="14">
+                10.5281/zenodo.6982547
+            </text>
+        </g>
+    </svg>
\ No newline at end of file
diff --git a/doc/_static/zenodo_cache/7084615.svg b/doc/_static/zenodo_cache/7084615.svg
new file mode 100644
index 000000000000..9bb362063414
--- /dev/null
+++ b/doc/_static/zenodo_cache/7084615.svg
@@ -0,0 +1,35 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="186" height="20">
+        <linearGradient id="b" x2="0" y2="100%">
+            <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+            <stop offset="1" stop-opacity=".1"/>
+        </linearGradient>
+        <mask id="a" width="186" height="20">
+            <rect width="186" height="20" rx="3"
+            fill="#fff"/>
+        </mask>
+        <g mask="url(#a)">
+            <path fill="#555" d="M0 0h31v20H0z" />
+            <path fill="#007ec6"
+            d="M31 0h155v20H31z"
+            />
+            <path fill="url(#b)" d="M0 0h186v20H0z" />
+        </g>
+        <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,
+        Verdana,Geneva,sans-serif" font-size="11">
+            <text x="16" y="15" fill="#010101"
+            fill-opacity=".3">
+                DOI
+            </text>
+            <text x="16" y="14">
+                DOI
+            </text>
+            <text x="108"
+            y="15" fill="#010101" fill-opacity=".3">
+                10.5281/zenodo.7084615
+            </text>
+            <text x="108" y="14">
+                10.5281/zenodo.7084615
+            </text>
+        </g>
+    </svg>
\ No newline at end of file
diff --git a/doc/_static/zenodo_cache/7162185.svg b/doc/_static/zenodo_cache/7162185.svg
new file mode 100644
index 000000000000..ea0966377194
--- /dev/null
+++ b/doc/_static/zenodo_cache/7162185.svg
@@ -0,0 +1,35 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="186" height="20">
+        <linearGradient id="b" x2="0" y2="100%">
+            <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+            <stop offset="1" stop-opacity=".1"/>
+        </linearGradient>
+        <mask id="a" width="186" height="20">
+            <rect width="186" height="20" rx="3"
+            fill="#fff"/>
+        </mask>
+        <g mask="url(#a)">
+            <path fill="#555" d="M0 0h31v20H0z" />
+            <path fill="#007ec6"
+            d="M31 0h155v20H31z"
+            />
+            <path fill="url(#b)" d="M0 0h186v20H0z" />
+        </g>
+        <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,
+        Verdana,Geneva,sans-serif" font-size="11">
+            <text x="16" y="15" fill="#010101"
+            fill-opacity=".3">
+                DOI
+            </text>
+            <text x="16" y="14">
+                DOI
+            </text>
+            <text x="108"
+            y="15" fill="#010101" fill-opacity=".3">
+                10.5281/zenodo.7162185
+            </text>
+            <text x="108" y="14">
+                10.5281/zenodo.7162185
+            </text>
+        </g>
+    </svg>
\ No newline at end of file
diff --git a/doc/_templates/automodule.rst b/doc/_templates/automodule.rst
index e9f2a755d413..984c12e00d03 100644
--- a/doc/_templates/automodule.rst
+++ b/doc/_templates/automodule.rst
@@ -5,7 +5,7 @@
    treat this separately (sphinx-doc/sphinx/issues/4874)
 .. automodule:: {{ fullname }}
    :members:
-   
+
 {% else %}
 
 .. automodule:: {{ fullname }}
@@ -18,7 +18,7 @@
 Classes
 -------
 
-.. autosummary:: 
+.. autosummary::
    :template: autosummary.rst
    :toctree:
 {% for item in classes %}{% if item not in ['zip', 'map', 'reduce'] %}
@@ -32,7 +32,7 @@ Classes
 Functions
 ---------
 
-.. autosummary:: 
+.. autosummary::
    :template: autosummary.rst
    :toctree:
 
diff --git a/doc/_templates/autosummary.rst b/doc/_templates/autosummary.rst
index bf318f1d9aff..c5f90e87f016 100644
--- a/doc/_templates/autosummary.rst
+++ b/doc/_templates/autosummary.rst
@@ -7,7 +7,7 @@
 {% if objtype in ['class'] %}
 .. auto{{ objtype }}:: {{ objname }}
     :show-inheritance:
-    :special-members:
+    :special-members: __call__
 
 {% else %}
 .. auto{{ objtype }}:: {{ objname }}
diff --git a/doc/_templates/cheatsheet_sidebar.html b/doc/_templates/cheatsheet_sidebar.html
new file mode 100644
index 000000000000..3f2b7c4f4db1
--- /dev/null
+++ b/doc/_templates/cheatsheet_sidebar.html
@@ -0,0 +1,9 @@
+
+<div class="sidebar-cheatsheets">
+  <h3>Matplotlib cheatsheets</h3>
+  <a href="https://matplotlib.org/cheatsheets/">
+    <img src="_static/mpl_cheatsheet1.png"
+         alt="Matplotlib cheatsheets"
+         srcset="_static/mpl_cheatsheet1.png 1x, _static/mpl_cheatsheet1_2x.png 2x"/>
+  </a>
+</div>
diff --git a/doc/_templates/donate_sidebar.html b/doc/_templates/donate_sidebar.html
index fc7310b70088..071c92888c3c 100644
--- a/doc/_templates/donate_sidebar.html
+++ b/doc/_templates/donate_sidebar.html
@@ -1,6 +1,5 @@
-
-
-
-<div id="sidebar-donations">
-  <a href="https://numfocus.org/donate-to-matplotlib" target="_blank"> <span class="mpl-button donate_button" >Support Matplotlib</span></a>
+<div class="sidebar-donate">
+  <a class="sd-btn sd-btn-primary sd-fs-5 sd-px-5 sd-py-2" href="https://numfocus.org/donate-to-matplotlib" target="_blank">
+    Support Matplotlib
+  </a>
 </div>
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
deleted file mode 100644
index e7a540e74967..000000000000
--- a/doc/_templates/layout.html
+++ /dev/null
@@ -1,111 +0,0 @@
-{% extends "!layout.html" %}
-
-{%- block rootrellink %}
-        <li><a href="{{ pathto('index') }}">home</a>|&nbsp;</li>
-        <li><a href="{{ pathto('contents') }}">contents</a> &raquo;</li>
-{%- endblock %}
-
-
-{%- block relbar1 %}{{ relbar() }}{% endblock %}
-{%- block relbar2 %}{% endblock %}
-
-{%- block linktags %}
-{{ super() }}
-<link rel="top" title="{{ docstitle }}" href="#" />
-{%- if '+' in release %}
-    <link rel="canonical" href="https://matplotlib.org/devdocs/{{pagename}}.html" />
-{%- else %}
-    <link rel="canonical" href="https://matplotlib.org/stable/{{pagename}}.html" />
-{%- endif %}
-{%- endblock %}
-
-{%- block header %}
-{{super()}}
-{%- if '+' in release %}
-<div id="unreleased-message">
-    You are reading documentation for the unreleased version of Matplotlib.
-    <a href="https://matplotlib.org/search.html?q={{ title | striptags | urlencode }}&amp;check_keywords=yes&amp;area=default">
-        Try searching for the released version of this page instead?
-    </a>
-</div>
-
-{%- endif %}
-
-<!--
-<div id="annc-banner">
-
-</div>
--->
-
-<div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px; position: relative;">
-    {%- if builder in ('htmlhelp', 'devhelp', 'latex') %}
-    <a href="{{ pathto('index') }}">
-        <div style="float: left; position: absolute; width: 496px; bottom: 0; padding-bottom: 24px"><span style="float: right; color: #789; background: white">Version {{ version|e }}</span></div>
-        <img src="{{pathto("_static/logo2.png", 1) }}" height="125px" border="0" alt="matplotlib"/></a>
-    {%- else %}
-    <a href="{{ pathto('index') }}">
-        <div style="float: left; position: absolute; width: 496px; bottom: 0; padding-bottom: 24px"><span style="float: right; color: #789; background: white">Version {{ version|e }}</span></div>
-        <img src="{{pathto("_static/logo2_compressed.svg", 1) }}" height="125px" border="0" alt="matplotlib"/></a>
-    {%- endif %}
-
-    <!-- The "Fork me on github" ribbon -->
-    <div id="forkongithub"><a href="https://github.com/matplotlib/matplotlib">Fork me on GitHub</a></div>
-    </div>
-
-    <nav class="main-nav">
-        <ul>
-            <li><a href="{{ pathto('users/installing') }}">Installation</a></li>
-            <li><a href="{{ pathto('contents') }}">Documentation</a></li>
-            <li><a href="{{ pathto('gallery/index') }}">Examples</a></li>
-            <li><a href="{{ pathto('tutorials/index') }}">Tutorials</a></li>
-            <li><a href="{{ pathto('devel/index') }}">Contributing</a></li>
-            <li class="nav-right">
-                <form class="search" action="{{ pathto('search') }}" method="get">
-                <input type="text" name="q" aria-labelledby="searchlabel" placeholder="Search"/>
-                </form>
-            </li>
-        </ul>
-     </nav>
-{%- endblock %}
-
-{%- block sidebar1 %}{{ sidebar() }}{% endblock %}
-{%- block sidebar2 %}{% endblock %}
-
-{%- block footer %}
-<footer>
-    <div class="footer">
-{%- if show_copyright %}
-{%- if hasdoc('copyright') %}
-    {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a
-href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
-{%- else %}
-    {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{%
-endtrans %}
-{%- endif %}
-{%- endif %}
-<br />
-{%- if last_updated %}
-    {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
-{%- endif %}
-{%- if show_sphinx %}
-{% trans sphinx_version=sphinx_version|e %}Created using
-<a href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
-{%- endif %}
-{%- if sha %}
-Doc version {{ sha }}.
-{%- endif %}
-    </div>
-</footer>
-{%- if include_analytics %}
-<script>
-        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-        ga('create', 'UA-55954603-1', 'auto');
-        ga('send', 'pageview');
-
-</script>
-{%- endif %}
-{%- endblock %}
diff --git a/doc/_templates/search.html b/doc/_templates/search.html
index 6e285090cc40..aacae3dac7c2 100644
--- a/doc/_templates/search.html
+++ b/doc/_templates/search.html
@@ -17,7 +17,7 @@ <h1 id="search-documentation">{{ _('Search') }}</h1>
     "codex ellipse".
   </p>
   <form action="" method="get">
-    <input type="text" name="q" value="" />
+    <input type="text" name="q" value="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"/>
     <input type="submit" value="{{ _('search') }}" />
     <span id="search-progress" style="padding-left: 10px"></span>
   </form>
diff --git a/doc/_templates/sidebar_versions.html b/doc/_templates/sidebar_versions.html
index ffc104573363..35a965661d90 100644
--- a/doc/_templates/sidebar_versions.html
+++ b/doc/_templates/sidebar_versions.html
@@ -36,12 +36,3 @@
 getSnippet('other_versions', '/versions.html');
 </script>
 </div>
-
-<div class="sphinxsidebarwrapper">
-  <h3>Matplotlib cheatsheets</h3>
-  <a href="https://github.com/matplotlib/cheatsheets#cheatsheets">
-    <img src="_static/mpl_cheatsheet1.png"
-         alt="Matplotlib cheatsheets"
-         srcset="_static/mpl_cheatsheet1.png 1x, _static/mpl_cheatsheet1_2x.png 2x"/>
-  </a>
-</div>
diff --git a/doc/api/_enums_api.rst b/doc/api/_enums_api.rst
index c9e283305967..c38d535f3573 100644
--- a/doc/api/_enums_api.rst
+++ b/doc/api/_enums_api.rst
@@ -12,4 +12,3 @@
    .. autoclass:: CapStyle
       :members: demo
       :exclude-members: butt, round, projecting, input_description
-
diff --git a/doc/api/afm_api.rst b/doc/api/afm_api.rst
index 7e6d307cca33..bcae04150909 100644
--- a/doc/api/afm_api.rst
+++ b/doc/api/afm_api.rst
@@ -2,7 +2,12 @@
 ``matplotlib.afm``
 ******************
 
-.. automodule:: matplotlib.afm
+.. attention::
+    This module is considered internal.
+
+    Its use is deprecated and it will be removed in a future version.
+
+.. automodule:: matplotlib._afm
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/doc/api/animation_api.rst b/doc/api/animation_api.rst
index c8edde884046..d1b81e20b5c8 100644
--- a/doc/api/animation_api.rst
+++ b/doc/api/animation_api.rst
@@ -11,12 +11,16 @@
    :local:
    :backlinks: entry
 
+
 Animation
 =========
 
-The easiest way to make a live animation in matplotlib is to use one of the
+The easiest way to make a live animation in Matplotlib is to use one of the
 `Animation` classes.
 
+.. inheritance-diagram:: matplotlib.animation.FuncAnimation matplotlib.animation.ArtistAnimation
+   :parts: 1
+
 .. autosummary::
    :toctree: _as_gen
    :nosignatures:
@@ -29,10 +33,11 @@ In both cases it is critical to keep a reference to the instance
 object.  The animation is advanced by a timer (typically from the host
 GUI framework) which the `Animation` object holds the only reference
 to.  If you do not hold a reference to the `Animation` object, it (and
-hence the timers), will be garbage collected which will stop the
+hence the timers) will be garbage collected which will stop the
 animation.
 
-To save an animation to disk use `Animation.save` or `Animation.to_html5_video`
+To save an animation use `Animation.save`, `Animation.to_html5_video`,
+or `Animation.to_jshtml`.
 
 See :ref:`ani_writer_classes` below for details about what movie formats are
 supported.
@@ -46,9 +51,9 @@ supported.
 The inner workings of `FuncAnimation` is more-or-less::
 
   for d in frames:
-     artists = func(d, *fargs)
-     fig.canvas.draw_idle()
-     fig.canvas.start_event_loop(interval)
+      artists = func(d, *fargs)
+      fig.canvas.draw_idle()
+      fig.canvas.start_event_loop(interval)
 
 with details to handle 'blitting' (to dramatically improve the live
 performance), to be non-blocking, not repeatedly start/stop the GUI
@@ -92,13 +97,18 @@ this hopefully minimalist example gives a sense of how ``init_func``
 and ``func`` are used inside of `FuncAnimation` and the theory of how
 'blitting' works.
 
+.. note::
+
+    The zorder of artists is not taken into account when 'blitting'
+    because the 'blitted' artists are always drawn on top.
+
 The expected signature on ``func`` and ``init_func`` is very simple to
 keep `FuncAnimation` out of your book keeping and plotting logic, but
 this means that the callable objects you pass in must know what
 artists they should be working on.  There are several approaches to
 handling this, of varying complexity and encapsulation.  The simplest
 approach, which works quite well in the case of a script, is to define the
-artist at a global scope and let Python sort things out.  For example ::
+artist at a global scope and let Python sort things out.  For example::
 
    import numpy as np
    import matplotlib.pyplot as plt
@@ -106,7 +116,7 @@ artist at a global scope and let Python sort things out.  For example ::
 
    fig, ax = plt.subplots()
    xdata, ydata = [], []
-   ln, = plt.plot([], [], 'ro')
+   ln, = ax.plot([], [], 'ro')
 
    def init():
        ax.set_xlim(0, 2*np.pi)
@@ -123,8 +133,36 @@ artist at a global scope and let Python sort things out.  For example ::
                        init_func=init, blit=True)
    plt.show()
 
-The second method is to use `functools.partial` to 'bind' artists to
-function.  A third method is to use closures to build up the required
+The second method is to use `functools.partial` to pass arguments to the
+function::
+
+   import numpy as np
+   import matplotlib.pyplot as plt
+   from matplotlib.animation import FuncAnimation
+   from functools import partial
+
+   fig, ax = plt.subplots()
+   line1, = ax.plot([], [], 'ro')
+
+   def init():
+       ax.set_xlim(0, 2*np.pi)
+       ax.set_ylim(-1, 1)
+       return line1,
+
+   def update(frame, ln, x, y):
+       x.append(frame)
+       y.append(np.sin(frame))
+       ln.set_data(x, y)
+       return ln,
+
+   ani = FuncAnimation(
+       fig, partial(update, ln=line1, x=[], y=[]),
+       frames=np.linspace(0, 2*np.pi, 128),
+       init_func=init, blit=True)
+
+   plt.show()
+
+A third method is to use closures to build up the required
 artists and functions.  A fourth method is to create a class.
 
 Examples
@@ -157,6 +195,10 @@ Examples
 Writer Classes
 ==============
 
+.. inheritance-diagram:: matplotlib.animation.FFMpegFileWriter matplotlib.animation.FFMpegWriter matplotlib.animation.ImageMagickFileWriter matplotlib.animation.ImageMagickWriter matplotlib.animation.PillowWriter matplotlib.animation.HTMLWriter
+   :top-classes: matplotlib.animation.AbstractMovieWriter
+   :parts: 1
+
 The provided writers fall into a few broad categories.
 
 The Pillow writer relies on the Pillow library to write the animation, keeping
@@ -186,7 +228,6 @@ on all systems.
 
    FFMpegWriter
    ImageMagickWriter
-   AVConvWriter
 
 The file-based writers save temporary files for each frame which are stitched
 into a single file at the end.  Although slower, these writers can be easier to
@@ -198,18 +239,19 @@ debug.
 
    FFMpegFileWriter
    ImageMagickFileWriter
-   AVConvFileWriter
 
-Fundamentally, a `MovieWriter` provides a way to grab sequential frames
-from the same underlying `~matplotlib.figure.Figure` object.  The base
-class `MovieWriter` implements 3 methods and a context manager.  The
-only difference between the pipe-based and file-based writers is in the
-arguments to their respective ``setup`` methods.
+The writer classes provide a way to grab sequential frames from the same
+underlying `~matplotlib.figure.Figure`.  They all provide three methods that
+must be called in sequence:
 
-The ``setup()`` method is used to prepare the writer (possibly opening
-a pipe), successive calls to ``grab_frame()`` capture a single frame
-at a time and ``finish()`` finalizes the movie and writes the output
-file to disk.  For example ::
+- `~.AbstractMovieWriter.setup` prepares the writer (e.g. opening a pipe).
+  Pipe-based and file-based writers take different arguments to ``setup()``.
+- `~.AbstractMovieWriter.grab_frame` can then be called as often as
+  needed to capture a single frame at a time
+- `~.AbstractMovieWriter.finish` finalizes the movie and writes the output
+  file to disk.
+
+Example::
 
    moviewriter = MovieWriter(...)
    moviewriter.setup(fig, 'my_movie.ext', dpi=100)
@@ -219,14 +261,14 @@ file to disk.  For example ::
    moviewriter.finish()
 
 If using the writer classes directly (not through `Animation.save`), it is
-strongly encouraged to use the `~MovieWriter.saving` context manager ::
+strongly encouraged to use the `~.AbstractMovieWriter.saving` context manager::
 
   with moviewriter.saving(fig, 'myfile.mp4', dpi=100):
       for j in range(n):
           update_figure(j)
           moviewriter.grab_frame()
 
-to ensures that setup and cleanup are performed as necessary.
+to ensure that setup and cleanup are performed as necessary.
 
 Examples
 --------
@@ -283,21 +325,9 @@ and mixins
    :toctree: _as_gen
    :nosignatures:
 
-   AVConvBase
    FFMpegBase
    ImageMagickBase
 
 are provided.
 
 See the source code for how to easily implement new `MovieWriter` classes.
-
-Inheritance Diagrams
-====================
-
-.. inheritance-diagram:: matplotlib.animation.FuncAnimation matplotlib.animation.ArtistAnimation
-   :private-bases:
-   :parts: 1
-
-.. inheritance-diagram:: matplotlib.animation.AVConvFileWriter matplotlib.animation.AVConvWriter matplotlib.animation.FFMpegFileWriter matplotlib.animation.FFMpegWriter matplotlib.animation.ImageMagickFileWriter matplotlib.animation.ImageMagickWriter
-   :private-bases:
-   :parts: 1
diff --git a/doc/api/api_changes.rst b/doc/api/api_changes.rst
deleted file mode 100644
index b861326911a9..000000000000
--- a/doc/api/api_changes.rst
+++ /dev/null
@@ -1,41 +0,0 @@
-
-===========
-API Changes
-===========
-
-If updating Matplotlib breaks your scripts, this list may help you figure out
-what caused the breakage and how to fix it by updating your code.
-
-For API changes in older versions see
-
-.. toctree::
-   :maxdepth: 1
-
-   api_changes_old
-
-Changes for the latest version are listed below. For new features that were
-added to Matplotlib, see :ref:`whats-new`
-
-.. ifconfig:: releaselevel == 'dev'
-
-   .. note::
-
-      The list below is a table of contents of individual files from the
-      most recent :file:`api_changes_X.Y` folder.
-
-      When a release is made
-
-       - The include directive below should be changed to point to the new file
-         created in the previous step.
-
-
-   .. toctree::
-      :glob:
-      :maxdepth: 1
-
-      next_api_changes/behavior/*
-      next_api_changes/deprecations/*
-      next_api_changes/development/*
-      next_api_changes/removals/*
-
-.. include:: prev_api_changes/api_changes_3.4.0.rst
diff --git a/doc/api/api_changes_old.rst b/doc/api/api_changes_old.rst
deleted file mode 100644
index ab9381680498..000000000000
--- a/doc/api/api_changes_old.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-
-================
- Old API Changes
-================
-
-.. toctree::
-   :glob:
-   :reversed:
-   :maxdepth: 1
-
-   prev_api_changes/*
diff --git a/doc/api/artist_api.rst b/doc/api/artist_api.rst
index d77f27f0960f..b99842372bbe 100644
--- a/doc/api/artist_api.rst
+++ b/doc/api/artist_api.rst
@@ -4,16 +4,17 @@
 ``matplotlib.artist``
 *********************
 
-.. inheritance-diagram:: matplotlib.axes._axes.Axes matplotlib.axes._base._AxesBase matplotlib.axis.Axis matplotlib.axis.Tick matplotlib.axis.XAxis matplotlib.axis.XTick matplotlib.axis.YAxis matplotlib.axis.YTick matplotlib.collections.AsteriskPolygonCollection matplotlib.collections.BrokenBarHCollection matplotlib.collections.CircleCollection matplotlib.collections.Collection matplotlib.collections.EllipseCollection matplotlib.collections.EventCollection matplotlib.collections.LineCollection matplotlib.collections.PatchCollection matplotlib.collections.PathCollection matplotlib.collections.PolyCollection matplotlib.collections.QuadMesh matplotlib.collections.RegularPolyCollection matplotlib.collections.StarPolygonCollection matplotlib.collections.TriMesh matplotlib.collections._CollectionWithSizes matplotlib.contour.ClabelText matplotlib.figure.Figure matplotlib.image.AxesImage matplotlib.image.BboxImage matplotlib.image.FigureImage matplotlib.image.NonUniformImage matplotlib.image.PcolorImage matplotlib.image._ImageBase matplotlib.legend.Legend matplotlib.lines.Line2D matplotlib.offsetbox.AnchoredOffsetbox matplotlib.offsetbox.AnchoredText matplotlib.offsetbox.AnnotationBbox matplotlib.offsetbox.AuxTransformBox matplotlib.offsetbox.DrawingArea matplotlib.offsetbox.HPacker matplotlib.offsetbox.OffsetBox matplotlib.offsetbox.OffsetImage matplotlib.offsetbox.PackerBase matplotlib.offsetbox.PaddedBox matplotlib.offsetbox.TextArea matplotlib.offsetbox.VPacker matplotlib.patches.Arc matplotlib.patches.Arrow matplotlib.patches.Circle matplotlib.patches.CirclePolygon matplotlib.patches.ConnectionPatch matplotlib.patches.Ellipse matplotlib.patches.FancyArrow matplotlib.patches.FancyArrowPatch matplotlib.patches.FancyBboxPatch matplotlib.patches.Patch matplotlib.patches.PathPatch matplotlib.patches.StepPatch matplotlib.patches.Polygon matplotlib.patches.Rectangle matplotlib.patches.RegularPolygon matplotlib.patches.Shadow matplotlib.patches.Wedge matplotlib.projections.geo.AitoffAxes matplotlib.projections.geo.GeoAxes matplotlib.projections.geo.HammerAxes matplotlib.projections.geo.LambertAxes matplotlib.projections.geo.MollweideAxes matplotlib.projections.polar.PolarAxes matplotlib.quiver.Barbs matplotlib.quiver.Quiver matplotlib.quiver.QuiverKey matplotlib.spines.Spine matplotlib.table.Cell matplotlib.table.CustomCell matplotlib.table.Table matplotlib.text.Annotation matplotlib.text.Text
-   :parts: 1
-   :private-bases:
-
-
-
 .. automodule:: matplotlib.artist
    :no-members:
    :no-undoc-members:
 
+Inheritance Diagrams
+====================
+
+.. inheritance-diagram:: matplotlib.axes._axes.Axes matplotlib.axes._base._AxesBase matplotlib.axis.Axis matplotlib.axis.Tick matplotlib.axis.XAxis matplotlib.axis.XTick matplotlib.axis.YAxis matplotlib.axis.YTick matplotlib.collections.AsteriskPolygonCollection matplotlib.collections.BrokenBarHCollection matplotlib.collections.CircleCollection matplotlib.collections.Collection matplotlib.collections.EllipseCollection matplotlib.collections.EventCollection matplotlib.collections.LineCollection matplotlib.collections.PatchCollection matplotlib.collections.PathCollection matplotlib.collections.PolyCollection matplotlib.collections.QuadMesh matplotlib.collections.RegularPolyCollection matplotlib.collections.StarPolygonCollection matplotlib.collections.TriMesh matplotlib.collections._CollectionWithSizes matplotlib.contour.ClabelText matplotlib.figure.Figure matplotlib.image.AxesImage matplotlib.image.BboxImage matplotlib.image.FigureImage matplotlib.image.NonUniformImage matplotlib.image.PcolorImage matplotlib.image._ImageBase matplotlib.legend.Legend matplotlib.lines.Line2D matplotlib.offsetbox.AnchoredOffsetbox matplotlib.offsetbox.AnchoredText matplotlib.offsetbox.AnnotationBbox matplotlib.offsetbox.AuxTransformBox matplotlib.offsetbox.DrawingArea matplotlib.offsetbox.HPacker matplotlib.offsetbox.OffsetBox matplotlib.offsetbox.OffsetImage matplotlib.offsetbox.PackerBase matplotlib.offsetbox.PaddedBox matplotlib.offsetbox.TextArea matplotlib.offsetbox.VPacker matplotlib.patches.Arc matplotlib.patches.Arrow matplotlib.patches.Circle matplotlib.patches.CirclePolygon matplotlib.patches.ConnectionPatch matplotlib.patches.Ellipse matplotlib.patches.FancyArrow matplotlib.patches.FancyArrowPatch matplotlib.patches.FancyBboxPatch matplotlib.patches.Patch matplotlib.patches.PathPatch matplotlib.patches.StepPatch matplotlib.patches.Polygon matplotlib.patches.Rectangle matplotlib.patches.RegularPolygon matplotlib.patches.Shadow matplotlib.patches.Wedge matplotlib.projections.geo.AitoffAxes matplotlib.projections.geo.GeoAxes matplotlib.projections.geo.HammerAxes matplotlib.projections.geo.LambertAxes matplotlib.projections.geo.MollweideAxes matplotlib.projections.polar.PolarAxes matplotlib.quiver.Barbs matplotlib.quiver.Quiver matplotlib.quiver.QuiverKey matplotlib.spines.Spine matplotlib.table.Cell matplotlib.table.CustomCell matplotlib.table.Table matplotlib.text.Annotation matplotlib.text.Text
+   :parts: 1
+   :private-bases:
+
 
 ``Artist`` class
 ================
@@ -26,6 +27,7 @@ Interactive
 -----------
 
 .. autosummary::
+   :template: autosummary.rst
    :toctree: _as_gen
    :nosignatures:
 
@@ -34,10 +36,10 @@ Interactive
    Artist.pchanged
    Artist.get_cursor_data
    Artist.format_cursor_data
+   Artist.set_mouseover
+   Artist.get_mouseover
    Artist.mouseover
    Artist.contains
-   Artist.set_contains
-   Artist.get_contains
    Artist.pick
    Artist.pickable
    Artist.set_picker
@@ -47,6 +49,7 @@ Clipping
 --------
 
 .. autosummary::
+   :template: autosummary.rst
    :toctree: _as_gen
    :nosignatures:
 
@@ -61,6 +64,7 @@ Bulk Properties
 ---------------
 
 .. autosummary::
+   :template: autosummary.rst
    :toctree: _as_gen
    :nosignatures:
 
@@ -73,6 +77,7 @@ Drawing
 -------
 
 .. autosummary::
+   :template: autosummary.rst
    :toctree: _as_gen
    :nosignatures:
 
@@ -100,12 +105,14 @@ Drawing
 
    Artist.get_agg_filter
    Artist.get_window_extent
+   Artist.get_tightbbox
    Artist.get_transformed_clip_path_and_affine
 
 Figure and Axes
 ---------------
 
 .. autosummary::
+   :template: autosummary.rst
    :toctree: _as_gen
    :nosignatures:
 
@@ -120,6 +127,7 @@ Children
 --------
 
 .. autosummary::
+   :template: autosummary.rst
    :toctree: _as_gen
    :nosignatures:
 
@@ -130,6 +138,7 @@ Transform
 ---------
 
 .. autosummary::
+   :template: autosummary.rst
    :toctree: _as_gen
    :nosignatures:
 
@@ -141,6 +150,7 @@ Units
 -----
 
 .. autosummary::
+   :template: autosummary.rst
    :toctree: _as_gen
    :nosignatures:
 
@@ -152,6 +162,7 @@ Metadata
 --------
 
 .. autosummary::
+   :template: autosummary.rst
    :toctree: _as_gen
    :nosignatures:
 
@@ -166,6 +177,7 @@ Miscellaneous
 -------------
 
 .. autosummary::
+   :template: autosummary.rst
    :toctree: _as_gen
    :nosignatures:
 
@@ -178,6 +190,7 @@ Functions
 =========
 
 .. autosummary::
+   :template: autosummary.rst
    :toctree: _as_gen
    :nosignatures:
 
diff --git a/doc/api/axes_api.rst b/doc/api/axes_api.rst
index 6024a79bd81c..231e5be98ddf 100644
--- a/doc/api/axes_api.rst
+++ b/doc/api/axes_api.rst
@@ -295,7 +295,6 @@ Axis limits and direction
    Axes.get_ylim
 
    Axes.update_datalim
-   Axes.update_datalim_bounds
 
    Axes.set_xbound
    Axes.get_xbound
@@ -607,3 +606,6 @@ Other
    Axes.get_default_bbox_extra_artists
    Axes.get_transformed_clip_path_and_affine
    Axes.has_data
+   Axes.set
+
+.. autoclass:: matplotlib.axes.Axes.ArtistList
diff --git a/doc/api/axis_api.rst b/doc/api/axis_api.rst
index 4bc9ad0c6e89..d950d1e253a4 100644
--- a/doc/api/axis_api.rst
+++ b/doc/api/axis_api.rst
@@ -41,7 +41,6 @@ Inheritance
    :nosignatures:
 
    Axis.clear
-   Axis.cla
    Axis.get_scale
 
 
@@ -151,6 +150,7 @@ Interactive
    :nosignatures:
 
    Axis.contains
+   Axis.pickradius
    Axis.get_pickradius
    Axis.set_pickradius
 
@@ -169,17 +169,6 @@ Units
    Axis.update_units
 
 
-Incremental navigation
-----------------------
-
-.. autosummary::
-   :toctree: _as_gen
-   :template: autosummary.rst
-   :nosignatures:
-
-   Axis.pan
-   Axis.zoom
-
 XAxis Specific
 --------------
 
@@ -192,6 +181,7 @@ XAxis Specific
    XAxis.get_text_heights
    XAxis.get_ticks_position
    XAxis.set_ticks_position
+   XAxis.set_label_position
    XAxis.tick_bottom
    XAxis.tick_top
 
@@ -208,6 +198,7 @@ YAxis Specific
    YAxis.get_ticks_position
    YAxis.set_offset_position
    YAxis.set_ticks_position
+   YAxis.set_label_position
    YAxis.tick_left
    YAxis.tick_right
 
@@ -266,8 +257,6 @@ specify a matching series of labels.  Calling ``set_ticks`` makes a
    :template: autosummary.rst
    :nosignatures:
 
-
-   Tick.apply_tickdir
    Tick.get_loc
    Tick.get_pad
    Tick.get_pad_pixels
@@ -277,4 +266,5 @@ specify a matching series of labels.  Calling ``set_ticks`` makes a
    Tick.set_label1
    Tick.set_label2
    Tick.set_pad
+   Tick.set_url
    Tick.update_position
diff --git a/doc/api/backend_agg_api.rst b/doc/api/backend_agg_api.rst
index 40c8cd4bce6a..134a0d83cde0 100644
--- a/doc/api/backend_agg_api.rst
+++ b/doc/api/backend_agg_api.rst
@@ -1,6 +1,5 @@
-
-:mod:`matplotlib.backends.backend_agg`
-======================================
+:mod:`.backend_agg`
+===================
 
 .. automodule:: matplotlib.backends.backend_agg
    :members:
diff --git a/doc/api/backend_cairo_api.rst b/doc/api/backend_cairo_api.rst
index 2623270c6781..0ef9d6903007 100644
--- a/doc/api/backend_cairo_api.rst
+++ b/doc/api/backend_cairo_api.rst
@@ -1,6 +1,5 @@
-
-:mod:`matplotlib.backends.backend_cairo`
-========================================
+:mod:`.backend_cairo`
+=====================
 
 .. automodule:: matplotlib.backends.backend_cairo
    :members:
diff --git a/doc/api/backend_gtk3_api.rst b/doc/api/backend_gtk3_api.rst
index 5e17df66d602..7340ba003ee7 100644
--- a/doc/api/backend_gtk3_api.rst
+++ b/doc/api/backend_gtk3_api.rst
@@ -1,16 +1,11 @@
+:mod:`.backend_gtk3agg`, :mod:`.backend_gtk3cairo`
+==================================================
+
 **NOTE** These backends are not documented here, to avoid adding a dependency
 to building the docs.
 
 .. redirect-from:: /api/backend_gtk3agg_api
 .. redirect-from:: /api/backend_gtk3cairo_api
 
-
-:mod:`matplotlib.backends.backend_gtk3agg`
-==========================================
-
 .. module:: matplotlib.backends.backend_gtk3agg
-
-:mod:`matplotlib.backends.backend_gtk3cairo`
-============================================
-
 .. module:: matplotlib.backends.backend_gtk3cairo
diff --git a/doc/api/backend_gtk4_api.rst b/doc/api/backend_gtk4_api.rst
new file mode 100644
index 000000000000..81c33c9a6ffd
--- /dev/null
+++ b/doc/api/backend_gtk4_api.rst
@@ -0,0 +1,11 @@
+:mod:`.backend_gtk4agg`, :mod:`.backend_gtk4cairo`
+==================================================
+
+**NOTE** These backends are not documented here, to avoid adding a dependency
+to building the docs.
+
+.. redirect-from:: /api/backend_gtk4agg_api
+.. redirect-from:: /api/backend_gtk4cairo_api
+
+.. module:: matplotlib.backends.backend_gtk4agg
+.. module:: matplotlib.backends.backend_gtk4cairo
diff --git a/doc/api/backend_mixed_api.rst b/doc/api/backend_mixed_api.rst
index 7457f6684f94..35f7a49a08c4 100644
--- a/doc/api/backend_mixed_api.rst
+++ b/doc/api/backend_mixed_api.rst
@@ -1,6 +1,5 @@
-
-:mod:`matplotlib.backends.backend_mixed`
-========================================
+:mod:`.backend_mixed`
+=====================
 
 .. automodule:: matplotlib.backends.backend_mixed
    :members:
diff --git a/doc/api/backend_nbagg_api.rst b/doc/api/backend_nbagg_api.rst
index 977eabce8db0..dddeb7ac3c74 100644
--- a/doc/api/backend_nbagg_api.rst
+++ b/doc/api/backend_nbagg_api.rst
@@ -1,6 +1,5 @@
-
-:mod:`matplotlib.backends.backend_nbagg`
-========================================
+:mod:`.backend_nbagg`
+=====================
 
 .. automodule:: matplotlib.backends.backend_nbagg
    :members:
diff --git a/doc/api/backend_pdf_api.rst b/doc/api/backend_pdf_api.rst
index ded143ddcf8d..1743083b4de8 100644
--- a/doc/api/backend_pdf_api.rst
+++ b/doc/api/backend_pdf_api.rst
@@ -1,6 +1,5 @@
-
-:mod:`matplotlib.backends.backend_pdf`
-======================================
+:mod:`.backend_pdf`
+===================
 
 .. automodule:: matplotlib.backends.backend_pdf
    :members:
diff --git a/doc/api/backend_pgf_api.rst b/doc/api/backend_pgf_api.rst
index ec7440080eb0..2902742c744b 100644
--- a/doc/api/backend_pgf_api.rst
+++ b/doc/api/backend_pgf_api.rst
@@ -1,6 +1,5 @@
-
-:mod:`matplotlib.backends.backend_pgf`
-======================================
+:mod:`.backend_pgf`
+===================
 
 .. automodule:: matplotlib.backends.backend_pgf
    :members:
diff --git a/doc/api/backend_ps_api.rst b/doc/api/backend_ps_api.rst
index 9d585be7a0ad..d97e024b9d5c 100644
--- a/doc/api/backend_ps_api.rst
+++ b/doc/api/backend_ps_api.rst
@@ -1,6 +1,5 @@
-
-:mod:`matplotlib.backends.backend_ps`
-=====================================
+:mod:`.backend_ps`
+==================
 
 .. automodule:: matplotlib.backends.backend_ps
    :members:
diff --git a/doc/api/backend_qt_api.rst b/doc/api/backend_qt_api.rst
index 90fe9bb95539..622889c10e5c 100644
--- a/doc/api/backend_qt_api.rst
+++ b/doc/api/backend_qt_api.rst
@@ -1,27 +1,70 @@
-**NOTE** These backends are not documented here, to avoid adding a dependency
-to building the docs.
+:mod:`.backend_qtagg`, :mod:`.backend_qtcairo`
+==============================================
+
+**NOTE** These backends are not (auto) documented here, to avoid adding a
+dependency to building the docs.
 
 .. redirect-from:: /api/backend_qt4agg_api
 .. redirect-from:: /api/backend_qt4cairo_api
 .. redirect-from:: /api/backend_qt5agg_api
 .. redirect-from:: /api/backend_qt5cairo_api
 
-:mod:`matplotlib.backends.backend_qt4agg`
-=========================================
+.. module:: matplotlib.backends.qt_compat
+.. module:: matplotlib.backends.backend_qt
+.. module:: matplotlib.backends.backend_qtagg
+.. module:: matplotlib.backends.backend_qtcairo
+.. module:: matplotlib.backends.backend_qt5agg
+.. module:: matplotlib.backends.backend_qt5cairo
 
-.. module:: matplotlib.backends.backend_qt4agg
+.. _QT_bindings:
 
-:mod:`matplotlib.backends.backend_qt4cairo`
-===========================================
+Qt Bindings
+-----------
 
-.. module:: matplotlib.backends.backend_qt4cairo
+There are currently 2 actively supported Qt versions, Qt5 and Qt6, and two
+supported Python bindings per version -- `PyQt5
+<https://www.riverbankcomputing.com/static/Docs/PyQt5/>`_ and `PySide2
+<https://doc.qt.io/qtforpython-5/contents.html>`_ for Qt5 and `PyQt6
+<https://www.riverbankcomputing.com/static/Docs/PyQt6/>`_ and `PySide6
+<https://doc.qt.io/qtforpython/contents.html>`_ for Qt6 [#]_.  While both PyQt
+and Qt for Python (aka PySide) closely mirror the underlying C++ API they are
+wrapping, they are not drop-in replacements for each other [#]_.  To account
+for this, Matplotlib has an internal API compatibility layer in
+`matplotlib.backends.qt_compat` which covers our needs.  Despite being a public
+module, we do not consider this to be a stable user-facing API and it may
+change without warning [#]_.
 
-:mod:`matplotlib.backends.backend_qt5agg`
-=========================================
+Previously Matplotlib's Qt backends had the Qt version number in the name, both
+in the module and the :rc:`backend` value
+(e.g. ``matplotlib.backends.backend_qt4agg`` and
+``matplotlib.backends.backend_qt5agg``). However as part of adding support for
+Qt6 we were able to support both Qt5 and Qt6 with a single implementation with
+all of the Qt version and binding support handled in
+`~matplotlib.backends.qt_compat`.  A majority of the renderer agnostic Qt code
+is now in `matplotlib.backends.backend_qt` with specialization for AGG in
+``backend_qtagg`` and cairo in ``backend_qtcairo``.
 
-.. module:: matplotlib.backends.backend_qt5agg
+The binding is selected at run time based on what bindings are already imported
+(by checking for the ``QtCore`` sub-package), then by the :envvar:`QT_API`
+environment variable, and finally by the :rc:`backend`.  In all cases when we
+need to search, the order is ``PyQt6``, ``PySide6``, ``PyQt5``, ``PySide2``.
+See :ref:`QT_API-usage` for usage instructions.
 
-:mod:`matplotlib.backends.backend_qt5cairo`
-===========================================
+The ``backend_qt5``, ``backend_qt5agg``, and ``backend_qt5cairo`` are provided
+and force the use of a Qt5 binding for backwards compatibility.  Their use is
+discouraged (but not deprecated) and ``backend_qt``, ``backend_qtagg``, or
+``backend_qtcairo`` should be preferred instead.  However, these modules will
+not be deprecated until we drop support for Qt5.
 
-.. module:: matplotlib.backends.backend_qt5cairo
+
+
+
+.. [#] There is also `PyQt4
+       <https://www.riverbankcomputing.com/static/Docs/PyQt4/>`_ and `PySide
+       <https://srinikom.github.io/pyside-docs/>`_ for Qt4 but these are no
+       longer supported by Matplotlib and upstream support for Qt4 ended
+       in 2015.
+.. [#] Despite the slight API differences, the more important distinction
+       between the PyQt and Qt for Python series of bindings is licensing.
+.. [#] If you are looking for a general purpose compatibility library please
+       see `qtpy <https://github.com/spyder-ide/qtpy>`_.
diff --git a/doc/api/backend_svg_api.rst b/doc/api/backend_svg_api.rst
index 0b26d11e8818..a6208a897431 100644
--- a/doc/api/backend_svg_api.rst
+++ b/doc/api/backend_svg_api.rst
@@ -1,6 +1,5 @@
-
-:mod:`matplotlib.backends.backend_svg`
-======================================
+:mod:`.backend_svg`
+===================
 
 .. automodule:: matplotlib.backends.backend_svg
    :members:
diff --git a/doc/api/backend_template_api.rst b/doc/api/backend_template_api.rst
index 892f5b696d93..0f7bffee4b74 100644
--- a/doc/api/backend_template_api.rst
+++ b/doc/api/backend_template_api.rst
@@ -1,6 +1,5 @@
-
-:mod:`matplotlib.backends.backend_template`
-===========================================
+:mod:`.backend_template`
+========================
 
 .. automodule:: matplotlib.backends.backend_template
    :members:
diff --git a/doc/api/backend_tk_api.rst b/doc/api/backend_tk_api.rst
index 48131a48ce46..5eaa1873cebe 100644
--- a/doc/api/backend_tk_api.rst
+++ b/doc/api/backend_tk_api.rst
@@ -1,15 +1,11 @@
-
-:mod:`matplotlib.backends.backend_tkagg`
-========================================
+:mod:`.backend_tkagg`, :mod:`.backend_tkcairo`
+==============================================
 
 .. automodule:: matplotlib.backends.backend_tkagg
    :members:
    :undoc-members:
    :show-inheritance:
 
-:mod:`matplotlib.backends.backend_tkcairo`
-==========================================
-
 .. automodule:: matplotlib.backends.backend_tkcairo
    :members:
    :undoc-members:
diff --git a/doc/api/backend_webagg_api.rst b/doc/api/backend_webagg_api.rst
index c71f84e31606..a4089473c903 100644
--- a/doc/api/backend_webagg_api.rst
+++ b/doc/api/backend_webagg_api.rst
@@ -1,9 +1,7 @@
+:mod:`.backend_webagg`
+======================
 
-:mod:`matplotlib.backends.backend_webagg`
-=========================================
-
-.. note::
-   The WebAgg backend is not documented here, in order to avoid adding Tornado
-   to the doc build requirements.
-
-.. module:: matplotlib.backends.backend_webagg
+.. automodule:: matplotlib.backends.backend_webagg
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/doc/api/backend_wx_api.rst b/doc/api/backend_wx_api.rst
index 3ae3bc502e69..a3b6d4155c11 100644
--- a/doc/api/backend_wx_api.rst
+++ b/doc/api/backend_wx_api.rst
@@ -1,14 +1,10 @@
+:mod:`.backend_wxagg`, :mod:`.backend_wxcairo`
+==============================================
+
 **NOTE** These backends are not documented here, to avoid adding a dependency
 to building the docs.
 
 .. redirect-from:: /api/backend_wxagg_api
 
-:mod:`matplotlib.backends.backend_wxagg`
-========================================
-
 .. module:: matplotlib.backends.backend_wxagg
-
-:mod:`matplotlib.backends.backend_wxcairo`
-==========================================
-
 .. module:: matplotlib.backends.backend_wxcairo
diff --git a/doc/api/colors_api.rst b/doc/api/colors_api.rst
index 4302e289530c..970986ff4438 100644
--- a/doc/api/colors_api.rst
+++ b/doc/api/colors_api.rst
@@ -2,8 +2,11 @@
 ``matplotlib.colors``
 *********************
 
-The Color :ref:`tutorials <tutorials-colors>` and :ref:`examples
-<color_examples>` demonstrate how to set colors and colormaps.
+.. note::
+
+   The Color :ref:`tutorials <tutorials-colors>` and :ref:`examples
+   <color_examples>` demonstrate how to set colors and colormaps. You may want
+   to read those instead.
 
 .. currentmodule:: matplotlib.colors
 
@@ -11,26 +14,44 @@ The Color :ref:`tutorials <tutorials-colors>` and :ref:`examples
    :no-members:
    :no-inherited-members:
 
-Classes
--------
+Color norms
+-----------
 
 .. autosummary::
    :toctree: _as_gen/
    :template: autosummary.rst
 
+   Normalize
+   NoNorm
+   AsinhNorm
    BoundaryNorm
-   Colormap
    CenteredNorm
-   LightSource
-   LinearSegmentedColormap
-   ListedColormap
+   FuncNorm
    LogNorm
-   NoNorm
-   Normalize
    PowerNorm
    SymLogNorm
    TwoSlopeNorm
-   FuncNorm
+
+Colormaps
+---------
+
+.. autosummary::
+   :toctree: _as_gen/
+   :template: autosummary.rst
+
+   Colormap
+   LinearSegmentedColormap
+   ListedColormap
+
+Other classes
+-------------
+
+.. autosummary::
+   :toctree: _as_gen/
+   :template: autosummary.rst
+
+   ColorSequenceRegistry
+   LightSource
 
 Functions
 ---------
@@ -49,3 +70,4 @@ Functions
    is_color_like
    same_color
    get_named_colors_mapping
+   make_norm_from_scale
diff --git a/doc/api/dates_api.rst b/doc/api/dates_api.rst
index 1afeaaeac3cd..7a3e3bcf4a95 100644
--- a/doc/api/dates_api.rst
+++ b/doc/api/dates_api.rst
@@ -4,8 +4,10 @@
 
 .. inheritance-diagram:: matplotlib.dates
    :parts: 1
+   :top-classes: matplotlib.ticker.Formatter, matplotlib.ticker.Locator
 
 .. automodule:: matplotlib.dates
    :members:
    :undoc-members:
+   :exclude-members: rrule
    :show-inheritance:
diff --git a/doc/api/docstring_api.rst b/doc/api/docstring_api.rst
index 853ff93494cf..38a73a2e83d1 100644
--- a/doc/api/docstring_api.rst
+++ b/doc/api/docstring_api.rst
@@ -2,7 +2,12 @@
 ``matplotlib.docstring``
 ************************
 
-.. automodule:: matplotlib.docstring
+.. attention::
+    This module is considered internal.
+
+    Its use is deprecated and it will be removed in a future version.
+
+.. automodule:: matplotlib._docstring
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/doc/api/font_manager_api.rst b/doc/api/font_manager_api.rst
index 24bfefe00d32..3e043112380b 100644
--- a/doc/api/font_manager_api.rst
+++ b/doc/api/font_manager_api.rst
@@ -7,5 +7,9 @@
    :undoc-members:
    :show-inheritance:
 
+    .. data:: fontManager
 
+        The global instance of `FontManager`.
 
+.. autoclass:: FontEntry
+   :no-undoc-members:
diff --git a/doc/api/ft2font.rst b/doc/api/ft2font.rst
new file mode 100644
index 000000000000..a1f984abdda5
--- /dev/null
+++ b/doc/api/ft2font.rst
@@ -0,0 +1,8 @@
+**********************
+``matplotlib.ft2font``
+**********************
+
+.. automodule:: matplotlib.ft2font
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/doc/api/hatch_api.rst b/doc/api/hatch_api.rst
new file mode 100644
index 000000000000..b706be379a15
--- /dev/null
+++ b/doc/api/hatch_api.rst
@@ -0,0 +1,8 @@
+********************
+``matplotlib.hatch``
+********************
+
+.. automodule:: matplotlib.hatch
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/doc/api/index.rst b/doc/api/index.rst
index c247a169e304..c92d22240ff0 100644
--- a/doc/api/index.rst
+++ b/doc/api/index.rst
@@ -1,44 +1,52 @@
-API Overview
-============
+API Reference
+=============
 
-.. toctree::
-   :hidden:
+When using the library you will typically create
+:doc:`Figure <figure_api>` and :doc:`Axes <axes_api>` objects and
+call their methods to add content and modify the appearance.
 
-   api_changes
+- :mod:`matplotlib.figure`: axes creation, figure-level content
+- :mod:`matplotlib.axes`: most plotting methods, Axes labels, access to axis
+  styling, etc.
 
-.. contents:: :local:
+Example: We create a Figure ``fig`` and Axes ``ax``. Then we call
+methods on them to plot data, add axis labels and a figure title.
 
-See also the :doc:`api_changes`.
+.. plot::
+   :include-source:
+   :align: center
 
-Usage patterns
---------------
+   import matplotlib.pyplot as plt
+   import numpy as np
 
-Below we describe several common approaches to plotting with Matplotlib.
+   x = np.arange(0, 4, 0.05)
+   y = np.sin(x*np.pi)
 
-The pyplot API
-^^^^^^^^^^^^^^
+   fig, ax = plt.subplots(figsize=(3,2), constrained_layout=True)
+   ax.plot(x, y)
+   ax.set_xlabel('t [s]')
+   ax.set_ylabel('S [V]')
+   ax.set_title('Sine wave')
+   fig.set_facecolor('lightsteelblue')
 
-`matplotlib.pyplot` is a collection of command style functions that make
-Matplotlib work like MATLAB. Each pyplot function makes some change to a
-figure: e.g., creates a figure, creates a plotting area in a figure, plots
-some lines in a plotting area, decorates the plot with labels, etc.
 
-`.pyplot` is mainly intended for interactive plots and simple cases of
-programmatic plot generation.
 
-Further reading:
+.. _usage_patterns:
 
-- The `matplotlib.pyplot` function reference
-- :doc:`/tutorials/introductory/pyplot`
-- :ref:`Pyplot examples <pyplots_examples>`
+Usage patterns
+--------------
+
+Below we describe several common approaches to plotting with Matplotlib.  See
+:ref:`api_interfaces` for an explanation of the trade-offs between the supported user
+APIs.
 
-.. _api-index:
 
-The object-oriented API
-^^^^^^^^^^^^^^^^^^^^^^^
+The explicit API
+^^^^^^^^^^^^^^^^
 
-At its core, Matplotlib is object-oriented. We recommend directly working
-with the objects, if you need more control and customization of your plots.
+At its core, Matplotlib is an object-oriented library. We recommend directly
+working with the objects if you need more control and customization of your
+plots.
 
 In many cases you will create a `.Figure` and one or more
 `~matplotlib.axes.Axes` using `.pyplot.subplots` and from then on only work
@@ -52,7 +60,27 @@ Further reading:
 - Most of the :ref:`examples <examples-index>` use the object-oriented approach
   (except for the pyplot section)
 
-The pylab API (disapproved)
+
+The implicit API
+^^^^^^^^^^^^^^^^
+
+`matplotlib.pyplot` is a collection of functions that make
+Matplotlib work like MATLAB. Each pyplot function makes some change to a
+figure: e.g., creates a figure, creates a plotting area in a figure, plots
+some lines in a plotting area, decorates the plot with labels, etc.
+
+`.pyplot` is mainly intended for interactive plots and simple cases of
+programmatic plot generation.
+
+Further reading:
+
+- The `matplotlib.pyplot` function reference
+- :doc:`/tutorials/introductory/pyplot`
+- :ref:`Pyplot examples <pyplots_examples>`
+
+.. _api-index:
+
+The pylab API (discouraged)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. automodule:: pylab
@@ -61,7 +89,7 @@ The pylab API (disapproved)
 Modules
 -------
 
-Matplotlib consists of the following submodules:
+Alphabetical list of modules:
 
 .. toctree::
    :maxdepth: 1
@@ -92,8 +120,11 @@ Matplotlib consists of the following submodules:
    figure_api.rst
    font_manager_api.rst
    fontconfig_pattern_api.rst
+   ft2font.rst
    gridspec_api.rst
+   hatch_api.rst
    image_api.rst
+   layout_engine_api.rst
    legend_api.rst
    legend_handler_api.rst
    lines_api.rst
@@ -110,6 +141,7 @@ Matplotlib consists of the following submodules:
    rcsetup_api.rst
    sankey_api.rst
    scale_api.rst
+   sphinxext_mathmpl_api.rst
    sphinxext_plot_directive_api.rst
    spines_api.rst
    style_api.rst
@@ -128,22 +160,6 @@ Matplotlib consists of the following submodules:
    widgets_api.rst
    _api_api.rst
    _enums_api.rst
-
-Toolkits
---------
-
-:ref:`toolkits-index` are collections of application-specific functions that extend
-Matplotlib. The following toolkits are included:
-
-.. toctree::
-   :hidden:
-
-   toolkits/index.rst
-
-.. toctree::
-   :maxdepth: 1
-
    toolkits/mplot3d.rst
    toolkits/axes_grid1.rst
    toolkits/axisartist.rst
-   toolkits/axes_grid.rst
diff --git a/doc/api/index_backend_api.rst b/doc/api/index_backend_api.rst
index ad2febf8dc38..639d96a9a0dd 100644
--- a/doc/api/index_backend_api.rst
+++ b/doc/api/index_backend_api.rst
@@ -2,6 +2,8 @@
 ``matplotlib.backends``
 ***********************
 
+.. module:: matplotlib.backends
+
 .. toctree::
    :maxdepth: 1
 
@@ -10,6 +12,7 @@
    backend_agg_api.rst
    backend_cairo_api.rst
    backend_gtk3_api.rst
+   backend_gtk4_api.rst
    backend_nbagg_api.rst
    backend_pdf_api.rst
    backend_pgf_api.rst
diff --git a/doc/api/layout_engine_api.rst b/doc/api/layout_engine_api.rst
new file mode 100644
index 000000000000..8890061e0979
--- /dev/null
+++ b/doc/api/layout_engine_api.rst
@@ -0,0 +1,9 @@
+****************************
+``matplotlib.layout_engine``
+****************************
+
+.. currentmodule:: matplotlib.layout_engine
+
+.. automodule:: matplotlib.layout_engine
+   :members:
+   :inherited-members:
diff --git a/doc/api/lines_api.rst b/doc/api/lines_api.rst
index 808df726d118..4cde67c7e656 100644
--- a/doc/api/lines_api.rst
+++ b/doc/api/lines_api.rst
@@ -26,4 +26,3 @@ Functions
    :template: autosummary.rst
 
    segment_hits
-   
\ No newline at end of file
diff --git a/doc/api/mathtext_api.rst b/doc/api/mathtext_api.rst
index c0f4941414ed..295ed0382c61 100644
--- a/doc/api/mathtext_api.rst
+++ b/doc/api/mathtext_api.rst
@@ -9,4 +9,3 @@
    :members:
    :undoc-members:
    :show-inheritance:
-   :exclude-members: Box, Char, ComputerModernFontConstants, DejaVuSansFontConstants, DejaVuSerifFontConstants, FontConstantsBase, Fonts, Glue, Kern, Node, Parser, STIXFontConstants, STIXSansFontConstants, Ship, StandardPsFonts, TruetypeFonts
diff --git a/doc/api/matplotlib_configuration_api.rst b/doc/api/matplotlib_configuration_api.rst
index 5fa27bbc6723..d5dc60c80613 100644
--- a/doc/api/matplotlib_configuration_api.rst
+++ b/doc/api/matplotlib_configuration_api.rst
@@ -4,6 +4,11 @@
 
 .. py:currentmodule:: matplotlib
 
+.. automodule:: matplotlib
+   :no-members:
+   :no-undoc-members:
+   :noindex:
+
 Backend management
 ==================
 
@@ -26,6 +31,7 @@ Default values and styling
    :no-members:
 
    .. automethod:: find_all
+   .. automethod:: copy
 
 .. autofunction:: rc_context
 
@@ -52,7 +58,18 @@ Logging
 
 .. autofunction:: set_loglevel
 
+Colormaps and color sequences
+=============================
+
+.. autodata:: colormaps
+   :no-value:
+
+.. autodata:: color_sequences
+   :no-value:
+
 Miscellaneous
 =============
 
+.. autoclass:: MatplotlibDeprecationWarning
+
 .. autofunction:: get_cachedir
diff --git a/doc/api/next_api_changes.rst b/doc/api/next_api_changes.rst
new file mode 100644
index 000000000000..d33c8014f735
--- /dev/null
+++ b/doc/api/next_api_changes.rst
@@ -0,0 +1,15 @@
+
+================
+Next API changes
+================
+
+.. ifconfig:: releaselevel == 'dev'
+
+   .. toctree::
+      :glob:
+      :maxdepth: 1
+
+      next_api_changes/behavior/*
+      next_api_changes/deprecations/*
+      next_api_changes/development/*
+      next_api_changes/removals/*
diff --git a/doc/api/next_api_changes/behavior/00001-ABC.rst b/doc/api/next_api_changes/behavior/00001-ABC.rst
index 236f672c1123..f6d8c1d8b351 100644
--- a/doc/api/next_api_changes/behavior/00001-ABC.rst
+++ b/doc/api/next_api_changes/behavior/00001-ABC.rst
@@ -1,7 +1,7 @@
-Behavior Change template
+Behavior change template
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 Enter description here....
 
 Please rename file with PR number and your initials i.e. "99999-ABC.rst"
-and ``git add`` the new file.  
+and ``git add`` the new file.
diff --git a/doc/api/next_api_changes/development/00001-ABC.rst b/doc/api/next_api_changes/development/00001-ABC.rst
index 4c60d3db185b..6db90a13e44c 100644
--- a/doc/api/next_api_changes/development/00001-ABC.rst
+++ b/doc/api/next_api_changes/development/00001-ABC.rst
@@ -1,7 +1,7 @@
-Development Change template
+Development change template
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Enter description here....
 
 Please rename file with PR number and your initials i.e. "99999-ABC.rst"
-and ``git add`` the new file.  
+and ``git add`` the new file.
diff --git a/doc/api/next_api_changes/removals/00001-ABC.rst b/doc/api/next_api_changes/removals/00001-ABC.rst
index 5c68eda9698a..3cc5b6344f7f 100644
--- a/doc/api/next_api_changes/removals/00001-ABC.rst
+++ b/doc/api/next_api_changes/removals/00001-ABC.rst
@@ -1,7 +1,7 @@
-Removal Change template
+Removal change template
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 Enter description of methods/classes removed here....
 
 Please rename file with PR number and your initials i.e. "99999-ABC.rst"
-and ``git add`` the new file.  
+and ``git add`` the new file.
diff --git a/doc/api/patches_api.rst b/doc/api/patches_api.rst
index ac21a644ccab..5b1eefa91971 100644
--- a/doc/api/patches_api.rst
+++ b/doc/api/patches_api.rst
@@ -2,7 +2,9 @@
 ``matplotlib.patches``
 **********************
 
-.. currentmodule:: matplotlib.patches
+
+.. inheritance-diagram:: matplotlib.patches
+   :parts: 1
 
 .. automodule:: matplotlib.patches
    :no-members:
@@ -15,6 +17,7 @@ Classes
    :toctree: _as_gen/
    :template: autosummary.rst
 
+   Annulus
    Arc
    Arrow
    ArrowStyle
@@ -45,4 +48,3 @@ Functions
 
    bbox_artist
    draw_bbox
-   
diff --git a/doc/api/prev_api_changes/api_changes_0.65.rst b/doc/api/prev_api_changes/api_changes_0.65.rst
index 43fffb1bcf4e..f9b9af732010 100644
--- a/doc/api/prev_api_changes/api_changes_0.65.rst
+++ b/doc/api/prev_api_changes/api_changes_0.65.rst
@@ -8,5 +8,5 @@ Changes for 0.65
   connect and disconnect
 
   Did away with the text methods for angle since they were ambiguous.
-  fontangle could mean fontstyle (obligue, etc) or the rotation of the
+  fontangle could mean fontstyle (oblique, etc) or the rotation of the
   text.  Use style and rotation instead.
diff --git a/doc/api/prev_api_changes/api_changes_0.70.rst b/doc/api/prev_api_changes/api_changes_0.70.rst
index b8094658b249..e30dfbb64954 100644
--- a/doc/api/prev_api_changes/api_changes_0.70.rst
+++ b/doc/api/prev_api_changes/api_changes_0.70.rst
@@ -6,4 +6,4 @@ Changes for 0.70
    MplEvent factored into a base class Event and derived classes
    MouseEvent and KeyEvent
 
-   Removed definct set_measurement in wx toolbar
+   Removed defunct set_measurement in wx toolbar
diff --git a/doc/api/prev_api_changes/api_changes_0.72.rst b/doc/api/prev_api_changes/api_changes_0.72.rst
index 9529e396f356..bfb6fc124658 100644
--- a/doc/api/prev_api_changes/api_changes_0.72.rst
+++ b/doc/api/prev_api_changes/api_changes_0.72.rst
@@ -6,7 +6,7 @@ Changes for 0.72
   - Line2D, Text, and Patch copy_properties renamed update_from and
     moved into artist base class
 
-  - LineCollecitons.color renamed to LineCollections.set_color for
+  - LineCollections.color renamed to LineCollections.set_color for
     consistency with set/get introspection mechanism,
 
   - pylab figure now defaults to num=None, which creates a new figure
diff --git a/doc/api/prev_api_changes/api_changes_0.91.0.rst b/doc/api/prev_api_changes/api_changes_0.91.0.rst
index b33fcb50f0ad..32760554522a 100644
--- a/doc/api/prev_api_changes/api_changes_0.91.0.rst
+++ b/doc/api/prev_api_changes/api_changes_0.91.0.rst
@@ -25,18 +25,18 @@ Changes for 0.91.0
 * The :mod:`matplotlib.dviread` file now has a parser for files like
   psfonts.map and pdftex.map, to map TeX font names to external files.
 
-* The file :mod:`matplotlib.type1font` contains a new class for Type 1
+* The file ``matplotlib.type1font`` contains a new class for Type 1
   fonts.  Currently it simply reads pfa and pfb format files and
   stores the data in a way that is suitable for embedding in pdf
   files. In the future the class might actually parse the font to
   allow e.g.,  subsetting.
 
-* :mod:`matplotlib.ft2font` now supports ``FT_Attach_File``. In
+* ``matplotlib.ft2font`` now supports ``FT_Attach_File``. In
   practice this can be used to read an afm file in addition to a
   pfa/pfb file, to get metrics and kerning information for a Type 1
   font.
 
-* The :class:`.AFM` class now supports querying CapHeight and stem
+* The ``AFM`` class now supports querying CapHeight and stem
   widths. The get_name_char method now has an isord kwarg like
   get_width_char.
 
diff --git a/doc/api/prev_api_changes/api_changes_0.98.0.rst b/doc/api/prev_api_changes/api_changes_0.98.0.rst
index 0c73628e1651..ba22e5f4fb0a 100644
--- a/doc/api/prev_api_changes/api_changes_0.98.0.rst
+++ b/doc/api/prev_api_changes/api_changes_0.98.0.rst
@@ -126,8 +126,8 @@ with a verb in the present tense.
 | ``lbwh_to_bbox(l, b, w, h)``               | `Bbox.from_bounds(x0, y0, w, h) <.Bbox.from_bounds>` |
 |                                            | [It is a staticmethod.]                              |
 +--------------------------------------------+------------------------------------------------------+
-| ``inverse_transform_bbox(trans, bbox)``    | `Bbox.inverse_transformed(trans)                     |
-|                                            | <.BboxBase.inverse_transformed>`                     |
+| ``inverse_transform_bbox(trans, bbox)``    | ``bbox.inverse_transformed(trans)``                  |
+|                                            |                                                      |
 +--------------------------------------------+------------------------------------------------------+
 | ``Interval.contains_open(v)``              | `interval_contains_open(tuple, v)                    |
 |                                            | <.interval_contains_open>`                           |
@@ -181,7 +181,7 @@ The ``Polar`` class has moved to :mod:`matplotlib.projections.polar`.
 .. [3] :meth:`matplotlib.axes.Axes.set_position` now accepts either
    four scalars or a :class:`matplotlib.transforms.Bbox` instance.
 
-.. [4] Since the recfactoring allows for more than two scale types
+.. [4] Since the refactoring allows for more than two scale types
    ('log' or 'linear'), it no longer makes sense to have a toggle.
    ``Axes.toggle_log_lineary()`` has been removed.
 
diff --git a/doc/api/prev_api_changes/api_changes_0.98.x.rst b/doc/api/prev_api_changes/api_changes_0.98.x.rst
index 41ee63502254..053fd908a03e 100644
--- a/doc/api/prev_api_changes/api_changes_0.98.x.rst
+++ b/doc/api/prev_api_changes/api_changes_0.98.x.rst
@@ -63,8 +63,8 @@ Changes for 0.98.x
   :meth:`matplotlib.axes.Axes.set_ylim` now return a copy of the
   ``viewlim`` array to avoid modify-in-place surprises.
 
-* :meth:`matplotlib.afm.AFM.get_fullname` and
-  :meth:`matplotlib.afm.AFM.get_familyname` no longer raise an
+* ``matplotlib.afm.AFM.get_fullname`` and
+  ``matplotlib.afm.AFM.get_familyname`` no longer raise an
   exception if the AFM file does not specify these optional
   attributes, but returns a guess based on the required FontName
   attribute.
@@ -87,13 +87,13 @@ Changes for 0.98.x
   :class:`~matplotlib.collections.Collection` base class.
 
 * ``matplotlib.figure.Figure.figurePatch`` renamed
-  :attr:`matplotlib.figure.Figure.patch`;
+  ``matplotlib.figure.Figure.patch``;
   ``matplotlib.axes.Axes.axesPatch`` renamed
-  :attr:`matplotlib.axes.Axes.patch`;
+  ``matplotlib.axes.Axes.patch``;
   ``matplotlib.axes.Axes.axesFrame`` renamed
-  :attr:`matplotlib.axes.Axes.frame`.
+  ``matplotlib.axes.Axes.frame``.
   ``matplotlib.axes.Axes.get_frame``, which returns
-  :attr:`matplotlib.axes.Axes.patch`, is deprecated.
+  ``matplotlib.axes.Axes.patch``, is deprecated.
 
 * Changes in the :class:`matplotlib.contour.ContourLabeler` attributes
   (:func:`matplotlib.pyplot.clabel` function) so that they all have a
diff --git a/doc/api/prev_api_changes/api_changes_0.99.x.rst b/doc/api/prev_api_changes/api_changes_0.99.x.rst
index 03596e93dac3..4736d066d43e 100644
--- a/doc/api/prev_api_changes/api_changes_0.99.x.rst
+++ b/doc/api/prev_api_changes/api_changes_0.99.x.rst
@@ -21,8 +21,8 @@ Changes beyond 0.99.x
     on or off, and applies it.
 
   + :meth:`matplotlib.axes.Axes.margins` sets margins used to
-    autoscale the :attr:`matplotlib.axes.Axes.viewLim` based on
-    the :attr:`matplotlib.axes.Axes.dataLim`.
+    autoscale the ``matplotlib.axes.Axes.viewLim`` based on
+    the ``matplotlib.axes.Axes.dataLim``.
 
   + :meth:`matplotlib.axes.Axes.locator_params` allows one to
     adjust axes locator parameters such as *nbins*.
diff --git a/doc/api/prev_api_changes/api_changes_1.1.x.rst b/doc/api/prev_api_changes/api_changes_1.1.x.rst
index 8320e2c4fc09..790b669081b7 100644
--- a/doc/api/prev_api_changes/api_changes_1.1.x.rst
+++ b/doc/api/prev_api_changes/api_changes_1.1.x.rst
@@ -1,6 +1,6 @@
 
-Changes in 1.1.x
-================
+API Changes in 1.1.x
+====================
 
 * Added new :class:`matplotlib.sankey.Sankey` for generating Sankey diagrams.
 
diff --git a/doc/api/prev_api_changes/api_changes_1.2.x.rst b/doc/api/prev_api_changes/api_changes_1.2.x.rst
index cb6b2071f79b..45a2f35cf29e 100644
--- a/doc/api/prev_api_changes/api_changes_1.2.x.rst
+++ b/doc/api/prev_api_changes/api_changes_1.2.x.rst
@@ -1,5 +1,5 @@
-Changes in 1.2.x
-================
+API Changes in 1.2.x
+====================
 
 * The ``classic`` option of the rc parameter ``toolbar`` is deprecated
   and will be removed in the next release.
@@ -66,7 +66,7 @@ Changes in 1.2.x
 
   This change means that third party objects can expose themselves as
   Matplotlib axes by providing a ``_as_mpl_axes`` method. See
-  :ref:`adding-new-scales` for more detail.
+  :mod:`matplotlib.projections` for more detail.
 
 * A new keyword *extendfrac* in :meth:`~matplotlib.pyplot.colorbar` and
   :class:`~matplotlib.colorbar.ColorbarBase` allows one to control the size of
diff --git a/doc/api/prev_api_changes/api_changes_1.3.x.rst b/doc/api/prev_api_changes/api_changes_1.3.x.rst
index 5b596d83b5e2..edf4106fc564 100644
--- a/doc/api/prev_api_changes/api_changes_1.3.x.rst
+++ b/doc/api/prev_api_changes/api_changes_1.3.x.rst
@@ -1,8 +1,8 @@
 .. _changes_in_1_3:
 
 
-Changes in 1.3.x
-================
+API Changes in 1.3.x
+====================
 
 Changes in 1.3.1
 ----------------
@@ -33,7 +33,7 @@ Code removal
       functionality on `matplotlib.path.Path.contains_point` and
       friends instead.
 
-    - Instead of ``axes.Axes.get_frame``, use `.axes.Axes.patch`.
+    - Instead of ``axes.Axes.get_frame``, use ``axes.Axes.patch``.
 
     - The following keyword arguments to the `~.axes.Axes.legend` function have
       been renamed:
@@ -102,7 +102,7 @@ Code deprecation
   be used.  In previous Matplotlib versions this attribute was an undocumented
   tuple of ``(colorbar_instance, colorbar_axes)`` but is now just
   ``colorbar_instance``.  To get the colorbar axes it is possible to just use
-  the :attr:`~matplotlib.colorbar.ColorbarBase.ax` attribute on a colorbar
+  the ``matplotlib.colorbar.ColorbarBase.ax`` attribute on a colorbar
   instance.
 
 * The ``matplotlib.mpl`` module is now deprecated.  Those who relied on this
diff --git a/doc/api/prev_api_changes/api_changes_1.4.x.rst b/doc/api/prev_api_changes/api_changes_1.4.x.rst
index 2d49b4b6651a..c12d40a67991 100644
--- a/doc/api/prev_api_changes/api_changes_1.4.x.rst
+++ b/doc/api/prev_api_changes/api_changes_1.4.x.rst
@@ -1,5 +1,5 @@
-Changes in 1.4.x
-================
+API Changes in 1.4.x
+====================
 
 Code changes
 ------------
@@ -82,7 +82,7 @@ original location:
 
 * The artist used to draw the outline of a `.Figure.colorbar` has been changed
   from a `matplotlib.lines.Line2D` to `matplotlib.patches.Polygon`, thus
-  `.colorbar.ColorbarBase.outline` is now a `matplotlib.patches.Polygon`
+  ``colorbar.ColorbarBase.outline`` is now a `matplotlib.patches.Polygon`
   object.
 
 * The legend handler interface has changed from a callable, to any object
@@ -149,9 +149,9 @@ original location:
   ``drawRect`` from ``FigureCanvasQTAgg``; they were always an
   implementation detail of the (preserved) ``drawRectangle()`` function.
 
-* The function signatures of `.tight_bbox.adjust_bbox` and
-  `.tight_bbox.process_figure_for_rasterizing` have been changed. A new
-  *fixed_dpi* parameter allows for overriding the ``figure.dpi`` setting
+* The function signatures of ``matplotlib.tight_bbox.adjust_bbox`` and
+  ``matplotlib.tight_bbox.process_figure_for_rasterizing`` have been changed.
+  A new *fixed_dpi* parameter allows for overriding the ``figure.dpi`` setting
   instead of trying to deduce the intended behaviour from the file format.
 
 * Added support for horizontal/vertical axes padding to
diff --git a/doc/api/prev_api_changes/api_changes_1.5.0.rst b/doc/api/prev_api_changes/api_changes_1.5.0.rst
index 4ebb5c182c4b..1248b1dfd394 100644
--- a/doc/api/prev_api_changes/api_changes_1.5.0.rst
+++ b/doc/api/prev_api_changes/api_changes_1.5.0.rst
@@ -1,6 +1,6 @@
 
-Changes in 1.5.0
-================
+API Changes in 1.5.0
+====================
 
 Code Changes
 ------------
@@ -41,7 +41,7 @@ fully delegate to `.Quiver`).  Previously any input matching 'mid.*' would be
 interpreted as 'middle', 'tip.*' as 'tip' and any string not matching one of
 those patterns as 'tail'.
 
-The value of `.Quiver.pivot` is normalized to be in the set {'tip', 'tail',
+The value of ``Quiver.pivot`` is normalized to be in the set {'tip', 'tail',
 'middle'} in `.Quiver`.
 
 Reordered ``Axes.get_children``
@@ -60,7 +60,7 @@ by the new keyword argument *corner_mask*, or if this is not specified then
 the new :rc:`contour.corner_mask` instead.  The new default behaviour is
 equivalent to using ``corner_mask=True``; the previous behaviour can be obtained
 using ``corner_mask=False`` or by changing the rcParam.  The example
-http://matplotlib.org/examples/pylab_examples/contour_corner_mask.html
+https://matplotlib.org/examples/pylab_examples/contour_corner_mask.html
 demonstrates the difference.  Use of the old contouring algorithm, which is
 obtained with ``corner_mask='legacy'``, is now deprecated.
 
@@ -116,10 +116,10 @@ In either case to update the data in the `.Line2D` object you must update
 both the ``x`` and ``y`` data.
 
 
-Removed *args* and *kwargs* from `.MicrosecondLocator.__call__`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Removed *args* and *kwargs* from ``MicrosecondLocator.__call__``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The call signature of :meth:`~matplotlib.dates.MicrosecondLocator.__call__`
+The call signature of ``matplotlib.dates.MicrosecondLocator.__call__``
 has changed from ``__call__(self, *args, **kwargs)`` to ``__call__(self)``.
 This is consistent with the superclass :class:`~matplotlib.ticker.Locator`
 and also all the other Locators derived from this superclass.
@@ -374,7 +374,7 @@ directly.
 patheffects.svg
 ~~~~~~~~~~~~~~~
 
- - remove ``get_proxy_renderer`` method from ``AbstarctPathEffect`` class
+ - remove ``get_proxy_renderer`` method from ``AbstractPathEffect`` class
  - remove ``patch_alpha`` and ``offset_xy`` from ``SimplePatchShadow``
 
 
diff --git a/doc/api/prev_api_changes/api_changes_1.5.2.rst b/doc/api/prev_api_changes/api_changes_1.5.2.rst
index d2ee33546314..85c504fa6f12 100644
--- a/doc/api/prev_api_changes/api_changes_1.5.2.rst
+++ b/doc/api/prev_api_changes/api_changes_1.5.2.rst
@@ -1,5 +1,5 @@
-Changes in 1.5.2
-================
+API Changes in 1.5.2
+====================
 
 
 Default Behavior Changes
diff --git a/doc/api/prev_api_changes/api_changes_1.5.3.rst b/doc/api/prev_api_changes/api_changes_1.5.3.rst
index 0dc025111eae..ff5d6a9cf996 100644
--- a/doc/api/prev_api_changes/api_changes_1.5.3.rst
+++ b/doc/api/prev_api_changes/api_changes_1.5.3.rst
@@ -1,5 +1,5 @@
-Changes in 1.5.3
-================
+API Changes in 1.5.3
+====================
 
 ``ax.plot(..., marker=None)`` gives default marker
 --------------------------------------------------
diff --git a/doc/api/prev_api_changes/api_changes_2.1.0.rst b/doc/api/prev_api_changes/api_changes_2.1.0.rst
index 90f9e00eecd1..9673d24c719f 100644
--- a/doc/api/prev_api_changes/api_changes_2.1.0.rst
+++ b/doc/api/prev_api_changes/api_changes_2.1.0.rst
@@ -20,7 +20,7 @@ Previously they were clipped to a very small number and shown.
 Matplotlib uses instances of :obj:`~matplotlib.cbook.CallbackRegistry`
 as a bridge between user input event from the GUI and user callbacks.
 Previously, any exceptions raised in a user call back would bubble out
-of of the ``process`` method, which is typically in the GUI event
+of the ``process`` method, which is typically in the GUI event
 loop.  Most GUI frameworks simple print the traceback to the screen
 and continue as there is not always a clear method of getting the
 exception back to the user.  However PyQt5 now exits the process when
diff --git a/doc/api/prev_api_changes/api_changes_2.2.0.rst b/doc/api/prev_api_changes/api_changes_2.2.0.rst
index 29ed03649fd8..f13fe2a246f0 100644
--- a/doc/api/prev_api_changes/api_changes_2.2.0.rst
+++ b/doc/api/prev_api_changes/api_changes_2.2.0.rst
@@ -74,7 +74,7 @@ rcParam.
 Deprecated ``Axis.unit_data``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Use `.Axis.units` (which has long existed) instead.
+Use ``Axis.units`` (which has long existed) instead.
 
 
 Removals
@@ -159,7 +159,7 @@ If `.MovieWriterRegistry` can't find the requested `.MovieWriter`, a
 more helpful `RuntimeError` message is now raised instead of the
 previously raised `KeyError`.
 
-`~.tight_layout.auto_adjust_subplotpars` now raises `ValueError`
+``matplotlib.tight_layout.auto_adjust_subplotpars`` now raises `ValueError`
 instead of `RuntimeError` when sizes of input lists don't match
 
 
@@ -169,7 +169,7 @@ instead of `RuntimeError` when sizes of input lists don't match
 `matplotlib.figure.Figure.set_figwidth` and
 `matplotlib.figure.Figure.set_figheight` had the keyword argument
 ``forward=False`` by default, but `.figure.Figure.set_size_inches` now defaults
-to ``forward=True``.  This makes these functions conistent.
+to ``forward=True``.  This makes these functions consistent.
 
 
 Do not truncate svg sizes to nearest point
@@ -198,11 +198,11 @@ Changes to Qt backend class MRO
 
 To support both Agg and cairo rendering for Qt backends all of the non-Agg
 specific code previously in ``backend_qt5agg.FigureCanvasQTAggBase`` has been
-moved to :class:`.backend_qt5.FigureCanvasQT` so it can be shared with the
+moved to ``backend_qt5.FigureCanvasQT`` so it can be shared with the
 cairo implementation.  The ``FigureCanvasQTAggBase.paintEvent``,
 ``FigureCanvasQTAggBase.blit``, and ``FigureCanvasQTAggBase.print_figure``
-methods have moved to :meth:`.FigureCanvasQTAgg.paintEvent`,
-:meth:`.FigureCanvasQTAgg.blit`, and :meth:`.FigureCanvasQTAgg.print_figure`.
+methods have moved to ``FigureCanvasQTAgg.paintEvent``,
+``FigureCanvasQTAgg.blit``, and ``FigureCanvasQTAgg.print_figure``.
 The first two methods assume that the instance is also a ``QWidget`` so to use
 ``FigureCanvasQTAggBase`` it was required to multiple inherit from a
 ``QWidget`` sub-class.
@@ -210,9 +210,9 @@ The first two methods assume that the instance is also a ``QWidget`` so to use
 Having moved all of its methods either up or down the class hierarchy
 ``FigureCanvasQTAggBase`` has been deprecated.  To do this without warning and
 to preserve as much API as possible, ``.backend_qt5agg.FigureCanvasQTAggBase``
-now inherits from :class:`.backend_qt5.FigureCanvasQTAgg`.
+now inherits from ``backend_qt5.FigureCanvasQTAgg``.
 
-The MRO for :class:`.FigureCanvasQTAgg` and ``FigureCanvasQTAggBase`` used to
+The MRO for ``FigureCanvasQTAgg`` and ``FigureCanvasQTAggBase`` used to
 be ::
 
 
diff --git a/doc/api/prev_api_changes/api_changes_3.0.0.rst b/doc/api/prev_api_changes/api_changes_3.0.0.rst
index a6224c352179..47d6f413367d 100644
--- a/doc/api/prev_api_changes/api_changes_3.0.0.rst
+++ b/doc/api/prev_api_changes/api_changes_3.0.0.rst
@@ -197,7 +197,7 @@ Contour color autoscaling improvements
 Selection of contour levels is now the same for contour and
 contourf; previously, for contour, levels outside the data range were
 deleted.  (Exception: if no contour levels are found within the
-data range, the `levels` attribute is replaced with a list holding
+data range, the ``levels`` attribute is replaced with a list holding
 only the minimum of the data range.)
 
 When contour is called with levels specified as a target number rather
@@ -297,7 +297,7 @@ Blacklisted rcparams no longer updated by `~matplotlib.rcdefaults`, `~matplotlib
 
 The rc modifier functions `~matplotlib.rcdefaults`,
 `~matplotlib.rc_file_defaults` and `~matplotlib.rc_file`
-now ignore rcParams in the `matplotlib.style.core.STYLE_BLACKLIST` set.  In
+now ignore rcParams in the ``matplotlib.style.core.STYLE_BLACKLIST`` set.  In
 particular, this prevents the ``backend`` and ``interactive`` rcParams from
 being incorrectly modified by these functions.
 
@@ -324,12 +324,12 @@ instead of ``\usepackage{ucs}\usepackage[utf8x]{inputenc}``.
 Return type of ArtistInspector.get_aliases changed
 --------------------------------------------------
 
-`ArtistInspector.get_aliases` previously returned the set of aliases as
+``ArtistInspector.get_aliases`` previously returned the set of aliases as
 ``{fullname: {alias1: None, alias2: None, ...}}``.  The dict-to-None mapping
 was used to simulate a set in earlier versions of Python.  It has now been
 replaced by a set, i.e. ``{fullname: {alias1, alias2, ...}}``.
 
-This value is also stored in `.ArtistInspector.aliasd`, which has likewise
+This value is also stored in ``ArtistInspector.aliasd``, which has likewise
 changed.
 
 
@@ -471,7 +471,7 @@ Hold machinery
 Setting or unsetting ``hold`` (:ref:`deprecated in version 2.0<v200_deprecate_hold>`) has now
 been completely removed. Matplotlib now always behaves as if ``hold=True``.
 To clear an axes you can manually use :meth:`~.axes.Axes.cla()`,
-or to clear an entire figure use :meth:`~.figure.Figure.clf()`.
+or to clear an entire figure use :meth:`~.figure.Figure.clear()`.
 
 
 Removal of deprecated backends
diff --git a/doc/api/prev_api_changes/api_changes_3.0.1.rst b/doc/api/prev_api_changes/api_changes_3.0.1.rst
index d214ae9e6652..4b203cd04596 100644
--- a/doc/api/prev_api_changes/api_changes_3.0.1.rst
+++ b/doc/api/prev_api_changes/api_changes_3.0.1.rst
@@ -1,10 +1,10 @@
 API Changes for 3.0.1
 =====================
 
-`.tight_layout.auto_adjust_subplotpars` can return ``None`` now if the new
-subplotparams will collapse axes to zero width or height.  This prevents
-``tight_layout`` from being executed.  Similarly
-`.tight_layout.get_tight_layout_figure` will return None.
+``matplotlib.tight_layout.auto_adjust_subplotpars`` can return ``None`` now if
+the new subplotparams will collapse axes to zero width or height.
+This prevents ``tight_layout`` from being executed.  Similarly
+``matplotlib.tight_layout.get_tight_layout_figure`` will return None.
 
 To improve import (startup) time, private modules are now imported lazily.
 These modules are no longer available at these locations:
diff --git a/doc/api/prev_api_changes/api_changes_3.1.0.rst b/doc/api/prev_api_changes/api_changes_3.1.0.rst
index f3737889841f..3f41900abb53 100644
--- a/doc/api/prev_api_changes/api_changes_3.1.0.rst
+++ b/doc/api/prev_api_changes/api_changes_3.1.0.rst
@@ -293,9 +293,9 @@ where the `.cm.ScalarMappable` passed to `matplotlib.colorbar.Colorbar`
 (`~.Figure.colorbar`) had a ``set_norm`` method, as did the colorbar.
 The colorbar is now purely a follower to the `.ScalarMappable` norm and
 colormap, and the old inherited methods
-`~matplotlib.colorbar.ColorbarBase.set_norm`,
-`~matplotlib.colorbar.ColorbarBase.set_cmap`,
-`~matplotlib.colorbar.ColorbarBase.set_clim` are deprecated, as are
+``matplotlib.colorbar.ColorbarBase.set_norm``,
+``matplotlib.colorbar.ColorbarBase.set_cmap``,
+``matplotlib.colorbar.ColorbarBase.set_clim`` are deprecated, as are
 the getter versions of those calls.  To set the norm associated with a
 colorbar do ``colorbar.mappable.set_norm()`` etc.
 
@@ -308,7 +308,7 @@ FreeType or libpng are not in the compiler or linker's default path, set the
 standard environment variables ``CFLAGS``/``LDFLAGS`` on Linux or OSX, or
 ``CL``/``LINK`` on Windows, to indicate the relevant paths.
 
-See details in :doc:`/users/installing`.
+See details in :doc:`/users/installing/index`.
 
 Setting artist properties twice or more in the same call
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -337,7 +337,7 @@ match the array value type of the ``Path.codes`` array.
 LaTeX code in matplotlibrc file
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Previously, the rc file keys ``pgf.preamble`` and ``text.latex.preamble`` were
-parsed using commmas as separators. This would break valid LaTeX code, such as::
+parsed using commas as separators. This would break valid LaTeX code, such as::
 
   \usepackage[protrusion=true, expansion=false]{microtype}
 
@@ -394,11 +394,11 @@ returned.
 `matplotlib.font_manager.win32InstalledFonts` returns an empty list instead
 of None if no fonts are found.
 
-`.Axes.fmt_xdata` and `.Axes.fmt_ydata` error handling
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+``Axes.fmt_xdata`` and ``Axes.fmt_ydata`` error handling
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Previously, if the user provided a `.Axes.fmt_xdata` or
-`.Axes.fmt_ydata` function that raised a `TypeError` (or set them to a
+Previously, if the user provided a ``Axes.fmt_xdata`` or
+``Axes.fmt_ydata`` function that raised a `TypeError` (or set them to a
 non-callable), the exception would be silently ignored and the default
 formatter be used instead.  This is no longer the case; the exception
 is now propagated out.
@@ -476,7 +476,7 @@ Exception changes
 - `.Axes.streamplot` does not support irregularly gridded ``x`` and ``y`` values.
   So far, it used to silently plot an incorrect result.  This has been changed to
   raise a `ValueError` instead.
-- The `.streamplot.Grid` class, which is internally used by streamplot
+- The ``streamplot.Grid`` class, which is internally used by streamplot
   code, also throws a `ValueError` when irregularly gridded values are
   passed in.
 
@@ -496,7 +496,7 @@ Classes and methods
 - ``backend_wx.Toolbar`` (use ``backend_wx.NavigationToolbar2Wx`` instead)
 - ``cbook.align_iterators`` (no replacement)
 - ``contour.ContourLabeler.get_real_label_width`` (no replacement)
-- ``legend.Legend.draggable`` (use `legend.Legend.set_draggable()` instead)
+- ``legend.Legend.draggable`` (use `.legend.Legend.set_draggable()` instead)
 - ``texmanager.TexManager.postscriptd``, ``texmanager.TexManager.pscnt``,
   ``texmanager.TexManager.make_ps``, ``texmanager.TexManager.get_ps_bbox``
   (no replacements)
@@ -566,7 +566,7 @@ in Matplotlib 2.2 has been removed. See below for a list:
 - ``mlab.safe_isnan`` (use `numpy.isnan` instead)
 - ``mlab.cohere_pairs`` (use `scipy.signal.coherence` instead)
 - ``mlab.entropy`` (use `scipy.stats.entropy` instead)
-- ``mlab.normpdf`` (use `scipy.stats.norm.pdf` instead)
+- ``mlab.normpdf`` (use ``scipy.stats.norm.pdf`` instead)
 - ``mlab.find`` (use ``np.nonzero(np.ravel(condition))`` instead)
 - ``mlab.longest_contiguous_ones``
 - ``mlab.longest_ones``
@@ -652,7 +652,7 @@ no longer available in the `pylab` module:
 - ``longest_ones``
 - ``movavg``
 - ``norm_flat`` (use ``numpy.linalg.norm(a.flat, ord=2)`` instead)
-- ``normpdf`` (use `scipy.stats.norm.pdf` instead)
+- ``normpdf`` (use ``scipy.stats.norm.pdf`` instead)
 - ``path_length``
 - ``poly_below``
 - ``poly_between``
@@ -705,7 +705,7 @@ now a no-op).
 
 The image comparison test decorators now skip (rather than xfail) the test for
 uncomparable formats. The affected decorators are `~.image_comparison` and
-`~.check_figures_equal`. The deprecated `~.ImageComparisonTest` class is
+`~.check_figures_equal`. The deprecated ``ImageComparisonTest`` class is
 likewise changed.
 
 Dependency changes
@@ -825,7 +825,7 @@ This has not been used in the codebase since its addition in 2009.
 
   This has never been used internally, there is no equivalent method exists on
   the 2D Axis classes, and despite the similar name, it has a completely
-  different behavior from the 2D Axis' `axis.Axis.get_ticks_position` method.
+  different behavior from the 2D Axis' ``axis.Axis.get_ticks_position`` method.
 - ``.backend_pgf.LatexManagerFactory``
 
 - ``mpl_toolkits.axisartist.axislines.SimpleChainedObjects``
@@ -936,8 +936,8 @@ Axes3D
 - `.axes3d.Axes3D.w_yaxis`
 - `.axes3d.Axes3D.w_zaxis`
 
-Use `.axes3d.Axes3D.xaxis`, `.axes3d.Axes3D.yaxis` and `.axes3d.Axes3D.zaxis`
-instead.
+Use ``axes3d.Axes3D.xaxis``, ``axes3d.Axes3D.yaxis`` and
+``axes3d.Axes3D.zaxis`` instead.
 
 Testing
 ~~~~~~~
@@ -945,7 +945,7 @@ Testing
 - ``matplotlib.testing.decorators.switch_backend`` decorator
 
 Test functions should use ``pytest.mark.backend``, and the mark will be
-picked up by the `matplotlib.testing.conftest.mpl_test_settings` fixture.
+picked up by the ``matplotlib.testing.conftest.mpl_test_settings`` fixture.
 
 Quiver
 ~~~~~~
@@ -1069,7 +1069,7 @@ Axis
 
 - ``Axis.iter_ticks``
 
-This only served as a helper to the private `.Axis._update_ticks`
+This only served as a helper to the private ``Axis._update_ticks``
 
 
 Undeprecations
@@ -1123,10 +1123,10 @@ The `.Formatter` class gained a new `~.Formatter.format_ticks` method, which
 takes the list of all tick locations as a single argument and returns the list
 of all formatted values.  It is called by the axis tick handling code and, by
 default, first calls `~.Formatter.set_locs` with all locations, then repeatedly
-calls `~.Formatter.__call__` for each location.
+calls ``Formatter.__call__`` for each location.
 
 Tick-handling code in the codebase that previously performed this sequence
-(`~.Formatter.set_locs` followed by repeated `~.Formatter.__call__`) have been
+(`~.Formatter.set_locs` followed by repeated ``Formatter.__call__``) have been
 updated to use `~.Formatter.format_ticks`.
 
 `~.Formatter.format_ticks` is intended to be overridden by `.Formatter`
diff --git a/doc/api/prev_api_changes/api_changes_3.2.0/behavior.rst b/doc/api/prev_api_changes/api_changes_3.2.0/behavior.rst
index 8e76a047e348..dc47740890be 100644
--- a/doc/api/prev_api_changes/api_changes_3.2.0/behavior.rst
+++ b/doc/api/prev_api_changes/api_changes_3.2.0/behavior.rst
@@ -46,9 +46,9 @@ highest.
 Code that worked around the normalization between 0 and 1 will need to be
 modified.
 
-`MovieWriterRegistry`
-~~~~~~~~~~~~~~~~~~~~~
-`MovieWriterRegistry` now always checks the availability of the writer classes
+``MovieWriterRegistry``
+~~~~~~~~~~~~~~~~~~~~~~~
+`.MovieWriterRegistry` now always checks the availability of the writer classes
 before returning them.  If one wishes, for example, to get the first available
 writer, without performing the availability check on subsequent writers, it is
 now possible to iterate over the registry, which will yield the names of the
@@ -88,13 +88,13 @@ enough to be accommodated by the default data limit margins.
 While the new behavior is algorithmically simpler, it is conditional on
 properties of the `.Collection` object:
 
-  1. ``offsets = None``, ``transform`` is a child of `.Axes.transData`: use the paths
+  1. ``offsets = None``, ``transform`` is a child of ``Axes.transData``: use the paths
      for the automatic limits (i.e. for `.LineCollection` in `.Axes.streamplot`).
-  2.  ``offsets != None``, and ``offset_transform`` is child of `.Axes.transData`:
+  2.  ``offsets != None``, and ``offset_transform`` is child of ``Axes.transData``:
 
-    a) ``transform`` is child of `.Axes.transData`: use the ``path + offset`` for
+    a) ``transform`` is child of ``Axes.transData``: use the ``path + offset`` for
         limits (i.e., for `.Axes.bar`).
-    b) ``transform`` is not a child of `.Axes.transData`: just use the offsets
+    b) ``transform`` is not a child of ``Axes.transData``: just use the offsets
         for the limits (i.e. for scatter)
 
   3. otherwise return a null `.Bbox`.
@@ -294,7 +294,7 @@ Exception changes
 ~~~~~~~~~~~~~~~~~
 Various APIs that raised a `ValueError` for incorrectly typed inputs now raise
 `TypeError` instead: `.backend_bases.GraphicsContextBase.set_clip_path`,
-`.blocking_input.BlockingInput.__call__`, `.cm.register_cmap`, `.dviread.DviFont`,
+``blocking_input.BlockingInput.__call__``, `.cm.register_cmap`, `.dviread.DviFont`,
 `.rcsetup.validate_hatch`, ``.rcsetup.validate_animation_writer_path``, `.spines.Spine`,
 many classes in the :mod:`matplotlib.transforms` module and :mod:`matplotlib.tri`
 package, and Axes methods that take a ``norm`` parameter.
diff --git a/doc/api/prev_api_changes/api_changes_3.2.0/deprecations.rst b/doc/api/prev_api_changes/api_changes_3.2.0/deprecations.rst
index 42de9ffccd77..65b72c7e0558 100644
--- a/doc/api/prev_api_changes/api_changes_3.2.0/deprecations.rst
+++ b/doc/api/prev_api_changes/api_changes_3.2.0/deprecations.rst
@@ -118,7 +118,7 @@ The unused ``Locator.autoscale`` method is deprecated (pass the axis limits to
 
 Animation
 ~~~~~~~~~
-The following methods and attributes of the `MovieWriterRegistry` class are
+The following methods and attributes of the `.MovieWriterRegistry` class are
 deprecated: ``set_dirty``, ``ensure_not_dirty``, ``reset_available_writers``,
 ``avail``.
 
diff --git a/doc/api/prev_api_changes/api_changes_3.2.0/development.rst b/doc/api/prev_api_changes/api_changes_3.2.0/development.rst
index 470b594d522c..9af7fb8fb561 100644
--- a/doc/api/prev_api_changes/api_changes_3.2.0/development.rst
+++ b/doc/api/prev_api_changes/api_changes_3.2.0/development.rst
@@ -22,7 +22,7 @@ is desired.
 
 Packaging DLLs
 ~~~~~~~~~~~~~~
-Previously, it was possible to package Windows DLLs into the Maptlotlib
+Previously, it was possible to package Windows DLLs into the Matplotlib
 wheel (or sdist) by copying them into the source tree and setting the
 ``package_data.dlls`` entry in ``setup.cfg``.
 
diff --git a/doc/api/prev_api_changes/api_changes_3.3.0/behaviour.rst b/doc/api/prev_api_changes/api_changes_3.3.0/behaviour.rst
index 2b21794ede6b..65807a184fbc 100644
--- a/doc/api/prev_api_changes/api_changes_3.3.0/behaviour.rst
+++ b/doc/api/prev_api_changes/api_changes_3.3.0/behaviour.rst
@@ -262,7 +262,7 @@ most common operations remain available), and the list-of-one `.Polygon` is
 returned as is.  This makes the `repr` of the returned artist more accurate: it
 is now ::
 
-    <BarContainer object of of 10 artists>  # "bar", "barstacked"
+    <BarContainer object of 10 artists>  # "bar", "barstacked"
     [<matplotlib.patches.Polygon object at 0xdeadbeef>]  # "step", "stepfilled"
 
 instead of ::
diff --git a/doc/api/prev_api_changes/api_changes_3.3.0/deprecations.rst b/doc/api/prev_api_changes/api_changes_3.3.0/deprecations.rst
index 4eb73b16dd54..22aa93f89931 100644
--- a/doc/api/prev_api_changes/api_changes_3.3.0/deprecations.rst
+++ b/doc/api/prev_api_changes/api_changes_3.3.0/deprecations.rst
@@ -72,7 +72,7 @@ Revert deprecation \*min, \*max keyword arguments to ``set_x/y/zlim_3d()``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 These keyword arguments  were deprecated in 3.0, alongside with the respective
 parameters in ``set_xlim()`` / ``set_ylim()``. The deprecations of the 2D
-versions were already reverted in in 3.1.
+versions were already reverted in 3.1.
 
 ``cbook.local_over_kwdict``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -93,7 +93,7 @@ Parameters *norm* and *vmin*/*vmax* should not be used simultaneously
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Passing parameters *norm* and *vmin*/*vmax* simultaneously to functions using
 colormapping such as ``scatter()`` and ``imshow()`` is deprecated.
-Inestead of ``norm=LogNorm(), vmin=min_val, vmax=max_val`` pass
+Instead of ``norm=LogNorm(), vmin=min_val, vmax=max_val`` pass
 ``norm=LogNorm(min_val, max_val)``. *vmin* and *vmax* should only be used
 without setting *norm*.
 
@@ -162,7 +162,7 @@ The ``on_mappable_changed`` and ``update_bruteforce`` methods of
 `~matplotlib.colorbar.Colorbar` are deprecated; both can be replaced by calls
 to `~matplotlib.colorbar.Colorbar.update_normal`.
 
-``OldScalarFormatter``, ``IndexFormatter`` and ``DateIndexFormatter``
+``OldScalarFormatter``, ``IndexFormatter`` and ``IndexDateFormatter``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 These formatters are deprecated.  Their functionality can be implemented using
 e.g. `.FuncFormatter`.
@@ -238,7 +238,7 @@ The following validators, defined in `.rcsetup`, are deprecated:
 ``validate_axes_titlelocation``, ``validate_toolbar``,
 ``validate_ps_papersize``, ``validate_legend_loc``,
 ``validate_bool_maybe_none``, ``validate_hinting``,
-``validate_movie_writers``, ``validate_webagg_address``,
+``validate_movie_writer``, ``validate_webagg_address``,
 ``validate_nseq_float``, ``validate_nseq_int``.
 To test whether an rcParam value would be acceptable, one can test e.g. ``rc =
 RcParams(); rc[k] = v`` raises an exception.
@@ -351,7 +351,7 @@ PGF backend cleanups
 ~~~~~~~~~~~~~~~~~~~~
 The *dummy* parameter of `.RendererPgf` is deprecated.
 
-`.GraphicsContextPgf` is deprecated (use `.GraphicsContextBase` instead).
+``GraphicsContextPgf`` is deprecated (use `.GraphicsContextBase` instead).
 
 ``set_factor`` method of :mod:`mpl_toolkits.axisartist` locators
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -575,7 +575,7 @@ This is deprecated; pass keys as a list of strings instead.
 
 Statusbar classes and attributes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The ``statusbar`` attribute of `.FigureManagerBase`, `.StatusbarBase` and all
+The ``statusbar`` attribute of `.FigureManagerBase`, ``StatusbarBase`` and all
 its subclasses, and ``StatusBarWx``, are deprecated, as messages are now
 displayed in the toolbar instead.
 
@@ -609,8 +609,8 @@ accepted.
 Qt modifier keys
 ~~~~~~~~~~~~~~~~
 The ``MODIFIER_KEYS``, ``SUPER``, ``ALT``, ``CTRL``, and ``SHIFT``
-global variables of the :mod:`matplotlib.backends.backend_qt4agg`,
-:mod:`matplotlib.backends.backend_qt4cairo`,
+global variables of the ``matplotlib.backends.backend_qt4agg``,
+``matplotlib.backends.backend_qt4cairo``,
 :mod:`matplotlib.backends.backend_qt5agg` and
 :mod:`matplotlib.backends.backend_qt5cairo` modules are deprecated.
 
diff --git a/doc/api/prev_api_changes/api_changes_3.3.0/removals.rst b/doc/api/prev_api_changes/api_changes_3.3.0/removals.rst
index 3f7c232e9800..36b63c6dcfc8 100644
--- a/doc/api/prev_api_changes/api_changes_3.3.0/removals.rst
+++ b/doc/api/prev_api_changes/api_changes_3.3.0/removals.rst
@@ -202,7 +202,7 @@ Arguments
   renamed to ``manage_ticks``.
 - The ``normed`` parameter of `~.Axes.hist2d` has been renamed to ``density``.
 - The ``s`` parameter of `.Annotation` has been renamed to ``text``.
-- For all functions in `.bezier` that supported a ``tolerence`` parameter, this
+- For all functions in `.bezier` that supported a ``tolerance`` parameter, this
   parameter has been renamed to ``tolerance``.
 - ``axis("normal")`` is not supported anymore. Use the equivalent
   ``axis("auto")`` instead.
diff --git a/doc/api/prev_api_changes/api_changes_3.4.0/deprecations.rst b/doc/api/prev_api_changes/api_changes_3.4.0/deprecations.rst
index 120797270954..3de8959bb3ef 100644
--- a/doc/api/prev_api_changes/api_changes_3.4.0/deprecations.rst
+++ b/doc/api/prev_api_changes/api_changes_3.4.0/deprecations.rst
@@ -63,12 +63,6 @@ similar replacements.
 ``STYLE_FILE_PATTERN``, ``load_base_library``, and ``iter_user_libraries`` are
 deprecated.
 
-``Tick.apply_tickdir`` is deprecated
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-``apply_tickdir`` didn't actually update the tick markers on the existing
-Line2D objects used to draw the ticks; use `.Axis.set_tick_params` instead.
-
 ``dpi_cor`` property of `.FancyArrowPatch`
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/doc/api/prev_api_changes/api_changes_3.4.0/development.rst b/doc/api/prev_api_changes/api_changes_3.4.0/development.rst
index ab5e118de9e8..982046c3869e 100644
--- a/doc/api/prev_api_changes/api_changes_3.4.0/development.rst
+++ b/doc/api/prev_api_changes/api_changes_3.4.0/development.rst
@@ -4,7 +4,7 @@ Development changes
 Increase to minimum supported versions of Python and dependencies
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-For Maptlotlib 3.4, the :ref:`minimum supported versions <dependencies>` are
+For Matplotlib 3.4, the :ref:`minimum supported versions <dependencies>` are
 being bumped:
 
 +------------+-----------------+---------------+
diff --git a/doc/api/prev_api_changes/api_changes_3.4.2.rst b/doc/api/prev_api_changes/api_changes_3.4.2.rst
new file mode 100644
index 000000000000..2de543be37d6
--- /dev/null
+++ b/doc/api/prev_api_changes/api_changes_3.4.2.rst
@@ -0,0 +1,16 @@
+API Changes for 3.4.2
+=====================
+
+Behaviour changes
+-----------------
+
+Rename first argument to ``subplot_mosaic``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Both `.FigureBase.subplot_mosaic`, and `.pyplot.subplot_mosaic` have had the
+first position argument renamed from *layout* to *mosaic*.  This is because we
+are considering to consolidate *constrained_layout* and *tight_layout* keyword
+arguments in the Figure creation functions of `.pyplot` into a single *layout*
+keyword argument which would collide.
+
+As this API is provisional, we are changing this with no deprecation period.
diff --git a/doc/api/prev_api_changes/api_changes_3.5.0.rst b/doc/api/prev_api_changes/api_changes_3.5.0.rst
new file mode 100644
index 000000000000..890484bcd19a
--- /dev/null
+++ b/doc/api/prev_api_changes/api_changes_3.5.0.rst
@@ -0,0 +1,14 @@
+API Changes for 3.5.0
+=====================
+
+.. contents::
+   :local:
+   :depth: 1
+
+.. include:: /api/prev_api_changes/api_changes_3.5.0/behaviour.rst
+
+.. include:: /api/prev_api_changes/api_changes_3.5.0/deprecations.rst
+
+.. include:: /api/prev_api_changes/api_changes_3.5.0/removals.rst
+
+.. include:: /api/prev_api_changes/api_changes_3.5.0/development.rst
diff --git a/doc/api/prev_api_changes/api_changes_3.5.0/behaviour.rst b/doc/api/prev_api_changes/api_changes_3.5.0/behaviour.rst
new file mode 100644
index 000000000000..69e38270ca76
--- /dev/null
+++ b/doc/api/prev_api_changes/api_changes_3.5.0/behaviour.rst
@@ -0,0 +1,247 @@
+Behaviour changes
+-----------------
+
+First argument to ``subplot_mosaic`` renamed
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Both `.FigureBase.subplot_mosaic`, and `.pyplot.subplot_mosaic` have had the
+first positional argument renamed from *layout* to *mosaic*. As we have
+consolidated the *constrained_layout* and *tight_layout* keyword arguments in
+the Figure creation functions of `.pyplot` into a single *layout* keyword
+argument, the original ``subplot_mosaic`` argument name would collide.
+
+As this API is provisional, we are changing this argument name with no
+deprecation period.
+
+.. _Behavioural API Changes 3.5 - Axes children combined:
+
+``Axes`` children are no longer separated by type
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Formerly, `.axes.Axes` children were separated by `.Artist` type, into sublists
+such as ``Axes.lines``. For methods that produced multiple elements (such as
+`.Axes.errorbar`), though individual parts would have similar *zorder*, this
+separation might cause them to be drawn at different times, causing
+inconsistent results when overlapping other Artists.
+
+Now, the children are no longer separated by type, and the sublist properties
+are generated dynamically when accessed. Consequently, Artists will now always
+appear in the correct sublist; e.g., if `.axes.Axes.add_line` is called on a
+`.Patch`, it will appear in the ``Axes.patches`` sublist, *not* ``Axes.lines``.
+The ``Axes.add_*`` methods will now warn if passed an unexpected type.
+
+Modification of the following sublists is still accepted, but deprecated:
+
+* ``Axes.artists``
+* ``Axes.collections``
+* ``Axes.images``
+* ``Axes.lines``
+* ``Axes.patches``
+* ``Axes.tables``
+* ``Axes.texts``
+
+To remove an Artist, use its `.Artist.remove` method. To add an Artist, use the
+corresponding ``Axes.add_*`` method.
+
+``MatplotlibDeprecationWarning`` now subclasses ``DeprecationWarning``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Historically, it has not been possible to filter
+`~matplotlib.MatplotlibDeprecationWarning`\s by checking for
+`DeprecationWarning`, since we subclass `UserWarning` directly.
+
+The decision to not subclass `DeprecationWarning` has to do with a decision
+from core Python in the 2.x days to not show `DeprecationWarning`\s to users.
+However, there is now a more sophisticated filter in place (see
+https://www.python.org/dev/peps/pep-0565/).
+
+Users will now see `~matplotlib.MatplotlibDeprecationWarning` only during
+interactive sessions, and these can be silenced by the standard mechanism:
+
+.. code:: python
+
+	warnings.filterwarnings("ignore", category=DeprecationWarning)
+
+Library authors must now enable `DeprecationWarning`\s explicitly in order for
+(non-interactive) CI/CD pipelines to report back these warnings, as is standard
+for the rest of the Python ecosystem:
+
+.. code:: python
+
+	warnings.filterwarnings("always", DeprecationWarning)
+
+``Artist.set`` applies artist properties in the order in which they are given
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The change only affects the interaction between the *color*, *edgecolor*,
+*facecolor*, and (for `.Collection`\s) *alpha* properties: the *color* property
+now needs to be passed first in order not to override the other properties.
+This is consistent with e.g. `.Artist.update`, which did not reorder the
+properties passed to it.
+
+``pcolor(mesh)`` shading defaults to auto
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The *shading* keyword argument for `.Axes.pcolormesh` and `.Axes.pcolor`
+default has been changed to 'auto'.
+
+Passing ``Z(M, N)``, ``x(N)``, ``y(M)`` to ``pcolormesh`` with
+``shading='flat'`` will now raise a `TypeError`. Use ``shading='auto'`` or
+``shading='nearest'`` for ``x`` and ``y`` to be treated as cell centers, or
+drop the last column and row of ``Z`` to get the old behaviour with
+``shading='flat'``.
+
+Colorbars now have pan and zoom functionality
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Interactive plots with colorbars can now be zoomed and panned on the colorbar
+axis. This adjusts the *vmin* and *vmax* of the `.ScalarMappable` associated
+with the colorbar. This is currently only enabled for continuous norms. Norms
+used with ``contourf`` and categoricals, such as `.BoundaryNorm` and `.NoNorm`,
+have the interactive capability disabled by default. `cb.ax.set_navigate()
+<.Axes.set_navigate>` can be used to set whether a colorbar axes is interactive
+or not.
+
+Colorbar lines no longer clipped
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If a colorbar has lines added to it (e.g. for contour lines), these will no
+longer be clipped. This is an improvement for lines on the edge of the
+colorbar, but could lead to lines off the colorbar if the limits of the
+colorbar are changed.
+
+``Figure.suppressComposite`` now also controls compositing of Axes images
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The output of ``NonUniformImage`` and ``PcolorImage`` has changed
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Pixel-level differences may be observed in images generated using
+`.NonUniformImage` or `.PcolorImage`, typically for pixels exactly at the
+boundary between two data cells (no user-facing axes method currently generates
+`.NonUniformImage`\s, and only `.pcolorfast` can generate `.PcolorImage`\s).
+These artists are also now slower, normally by ~1.5x but sometimes more (in
+particular for ``NonUniformImage(interpolation="bilinear")``. This slowdown
+arises from fixing occasional floating point inaccuracies.
+
+Change of the (default) legend handler for ``Line2D`` instances
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The default legend handler for Line2D instances (`.HandlerLine2D`) now
+consistently exposes all the attributes and methods related to the line marker
+(:ghissue:`11358`). This makes it easy to change the marker features after
+instantiating a legend.
+
+.. code::
+
+    import matplotlib.pyplot as plt
+
+    fig, ax = plt.subplots()
+
+    ax.plot([1, 3, 2], marker="s", label="Line", color="pink", mec="red", ms=8)
+    leg = ax.legend()
+
+    leg.legendHandles[0].set_color("lightgray")
+    leg.legendHandles[0].set_mec("black")  # marker edge color
+
+The former legend handler for Line2D objects has been renamed
+`.HandlerLine2DCompound`. To revert to the previous behaviour, one can use
+
+.. code::
+
+    import matplotlib.legend as mlegend
+    from matplotlib.legend_handler import HandlerLine2DCompound
+    from matplotlib.lines import Line2D
+
+    mlegend.Legend.update_default_handler_map({Line2D: HandlerLine2DCompound()})
+
+Setting ``Line2D`` marker edge/face color to *None* use rcParams
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``Line2D.set_markeredgecolor(None)`` and ``Line2D.set_markerfacecolor(None)``
+now set the line property using the corresponding rcParam
+(:rc:`lines.markeredgecolor` and :rc:`lines.markerfacecolor`). This is
+consistent with other `.Line2D` property setters.
+
+Default theta tick locations for wedge polar plots have changed
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For polar plots that don't cover a full circle, the default theta tick
+locations are now at multiples of 10°, 15°, 30°, 45°, 90°, rather than using
+values that mostly make sense for linear plots (20°, 25°, etc.).
+
+``axvspan`` now plots full wedges in polar plots
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+... rather than triangles.
+
+Convenience converter from ``Scale`` to ``Normalize`` now public
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Downstream libraries can take advantage of `.colors.make_norm_from_scale` to
+create a `~.colors.Normalize` subclass directly from an existing scale.
+Usually norms have a scale, and the advantage of having a  `~.scale.ScaleBase`
+attached to a norm is to provide a scale, and associated tick locators and
+formatters, for the colorbar.
+
+``ContourSet`` always use ``PathCollection``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In order to correct rendering issues with closed loops, the `.ContourSet` now
+creates a `.PathCollection` instead of a `.LineCollection` for line contours.
+This type matches the artist used for filled contours.
+
+This affects `.ContourSet` itself and its subclasses, `.QuadContourSet`
+(returned by `.Axes.contour`), and `.TriContourSet` (returned by
+`.Axes.tricontour`).
+
+``hatch.SmallFilledCircles`` inherits from ``hatch.Circles``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The `.hatch.SmallFilledCircles` class now inherits from `.hatch.Circles` rather
+than from `.hatch.SmallCircles`.
+
+hexbin with a log norm
+~~~~~~~~~~~~~~~~~~~~~~
+
+`~.axes.Axes.hexbin` no longer (incorrectly) adds 1 to every bin value if a log
+norm is being used.
+
+Setting invalid ``rcParams["date.converter"]`` now raises ValueError
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Previously, invalid values passed to :rc:`date.converter` would be ignored with
+a `UserWarning`, but now raise `ValueError`.
+
+``Text`` and ``TextBox`` added *parse_math* option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`.Text` and `.TextBox` objects now allow a *parse_math* keyword-only argument
+which controls whether math should be parsed from the displayed string. If
+*True*, the string will be parsed as a math text object. If *False*, the string
+will be considered a literal and no parsing will occur.
+
+For `.Text`, this argument defaults to *True*. For `.TextBox` this argument
+defaults to *False*.
+
+``Type1Font`` objects now decrypt the encrypted part
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Type 1 fonts have a large part of their code encrypted as an obsolete
+copy-protection measure. This part is now available decrypted as the
+``decrypted`` attribute of ``matplotlib.type1font.Type1Font``. This decrypted
+data is not yet parsed, but this is a prerequisite for implementing subsetting.
+
+3D contourf polygons placed between levels
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The polygons used in a 3D `~.Axes3D.contourf` plot are now
+placed halfway between the contour levels, as each polygon represents the
+location of values that lie between two levels.
+
+``AxesDivider`` now defaults to rcParams-specified pads
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`.AxesDivider.append_axes`, ``AxesDivider.new_horizontal``, and
+``AxesDivider.new_vertical`` now default to paddings specified by
+:rc:`figure.subplot.wspace` and :rc:`figure.subplot.hspace` rather than zero.
diff --git a/doc/api/prev_api_changes/api_changes_3.5.0/deprecations.rst b/doc/api/prev_api_changes/api_changes_3.5.0/deprecations.rst
new file mode 100644
index 000000000000..7ce5132bc7fa
--- /dev/null
+++ b/doc/api/prev_api_changes/api_changes_3.5.0/deprecations.rst
@@ -0,0 +1,379 @@
+Deprecations
+------------
+
+Discouraged: ``Figure`` parameters *tight_layout* and *constrained_layout*
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The ``Figure`` parameters *tight_layout* and *constrained_layout* are
+triggering competing layout mechanisms and thus should not be used together.
+
+To make the API clearer, we've merged them under the new parameter *layout*
+with values 'constrained' (equal to ``constrained_layout=True``), 'tight'
+(equal to ``tight_layout=True``). If given, *layout* takes precedence.
+
+The use of *tight_layout* and *constrained_layout* is discouraged in favor of
+*layout*. However, these parameters will stay available for backward
+compatibility.
+
+Modification of ``Axes`` children sublists
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+See :ref:`Behavioural API Changes 3.5 - Axes children combined` for more
+information; modification of the following sublists is deprecated:
+
+* ``Axes.artists``
+* ``Axes.collections``
+* ``Axes.images``
+* ``Axes.lines``
+* ``Axes.patches``
+* ``Axes.tables``
+* ``Axes.texts``
+
+To remove an Artist, use its `.Artist.remove` method. To add an Artist, use the
+corresponding ``Axes.add_*`` method.
+
+Passing incorrect types to ``Axes.add_*`` methods
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The following ``Axes.add_*`` methods will now warn if passed an unexpected
+type. See their documentation for the types they expect.
+
+- `.Axes.add_collection`
+- `.Axes.add_image`
+- `.Axes.add_line`
+- `.Axes.add_patch`
+- `.Axes.add_table`
+
+Discouraged: ``plot_date``
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The use of `~.Axes.plot_date` is discouraged. This method exists for historic
+reasons and may be deprecated in the future.
+
+- ``datetime``-like data should directly be plotted using `~.Axes.plot`.
+- If you need to plot plain numeric data as :ref:`date-format` or
+  need to set a timezone, call ``ax.xaxis.axis_date`` / ``ax.yaxis.axis_date``
+  before `~.Axes.plot`. See `.Axis.axis_date`.
+
+``epoch2num`` and ``num2epoch`` are deprecated
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+These methods convert from unix timestamps to matplotlib floats, but are not
+used internally to matplotlib, and should not be needed by end users. To
+convert a unix timestamp to datetime, simply use
+`datetime.datetime.utcfromtimestamp`, or to use NumPy `~numpy.datetime64`
+``dt = np.datetime64(e*1e6, 'us')``.
+
+Auto-removal of grids by `~.Axes.pcolor` and `~.Axes.pcolormesh`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`~.Axes.pcolor` and `~.Axes.pcolormesh` currently remove any visible axes major
+grid. This behavior is deprecated; please explicitly call ``ax.grid(False)`` to
+remove the grid.
+
+The first parameter of ``Axes.grid`` and ``Axis.grid`` has been renamed to *visible*
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The parameter was previously named *b*. This deprecation only matters if that
+parameter was passed using a keyword argument, e.g. ``grid(b=False)``.
+
+Unification and cleanup of Selector widget API
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The API for Selector widgets has been unified to use:
+
+- *props* for the properties of the Artist representing the selection.
+- *handle_props* for the Artists representing handles for modifying the
+  selection.
+- *grab_range* for the maximal tolerance to grab a handle with the mouse.
+
+Additionally, several internal parameters and attribute have been deprecated
+with the intention of keeping them private.
+
+RectangleSelector and EllipseSelector
+.....................................
+
+The *drawtype* keyword argument to `~matplotlib.widgets.RectangleSelector` is
+deprecated. In the future the only behaviour will be the default behaviour of
+``drawtype='box'``.
+
+Support for ``drawtype=line`` will be removed altogether as it is not clear
+which points are within and outside a selector that is just a line. As a
+result, the *lineprops* keyword argument to
+`~matplotlib.widgets.RectangleSelector` is also deprecated.
+
+To retain the behaviour of ``drawtype='none'``, use ``rectprops={'visible':
+False}`` to make the drawn `~matplotlib.patches.Rectangle` invisible.
+
+Cleaned up attributes and arguments are:
+
+- The ``active_handle`` attribute has been privatized and deprecated.
+- The ``drawtype`` attribute has been privatized and deprecated.
+- The ``eventpress`` attribute has been privatized and deprecated.
+- The ``eventrelease`` attribute has been privatized and deprecated.
+- The ``interactive`` attribute has been privatized and deprecated.
+- The *marker_props* argument is deprecated, use *handle_props* instead.
+- The *maxdist* argument is deprecated, use *grab_range* instead.
+- The *rectprops* argument is deprecated, use *props* instead.
+- The ``rectprops`` attribute has been privatized and deprecated.
+- The ``state`` attribute has been privatized and deprecated.
+- The ``to_draw`` attribute has been privatized and deprecated.
+
+PolygonSelector
+...............
+
+- The *line* attribute is deprecated. If you want to change the selector artist
+  properties, use the ``set_props`` or ``set_handle_props`` methods.
+- The *lineprops* argument is deprecated, use *props* instead.
+- The *markerprops* argument is deprecated, use *handle_props* instead.
+- The *maxdist* argument and attribute is deprecated, use *grab_range* instead.
+- The *vertex_select_radius* argument and attribute is deprecated, use
+  *grab_range* instead.
+
+SpanSelector
+............
+
+- The ``active_handle`` attribute has been privatized and deprecated.
+- The ``eventpress`` attribute has been privatized and deprecated.
+- The ``eventrelease`` attribute has been privatized and deprecated.
+- The *maxdist* argument and attribute is deprecated, use *grab_range* instead.
+- The ``pressv`` attribute has been privatized and deprecated.
+- The ``prev`` attribute has been privatized and deprecated.
+- The ``rect`` attribute has been privatized and deprecated.
+- The *rectprops* argument is deprecated, use *props* instead.
+- The ``rectprops`` attribute has been privatized and deprecated.
+- The *span_stays* argument is deprecated, use the *interactive* argument
+  instead.
+- The ``span_stays`` attribute has been privatized and deprecated.
+- The ``state`` attribute has been privatized and deprecated.
+
+LassoSelector
+.............
+
+- The *lineprops* argument is deprecated, use *props* instead.
+- The ``onpress`` and ``onrelease`` methods are deprecated. They are straight
+  aliases for ``press`` and ``release``.
+
+``ConversionInterface.convert`` no longer needs to accept unitless values
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Previously, custom subclasses of `.units.ConversionInterface` needed to
+implement a ``convert`` method that not only accepted instances of the unit,
+but also unitless values (which are passed through as is). This is no longer
+the case (``convert`` is never called with a unitless value), and such support
+in `.StrCategoryConverter` is deprecated. Likewise, the
+`.ConversionInterface.is_numlike` helper is deprecated.
+
+Consider calling `.Axis.convert_units` instead, which still supports unitless
+values.
+
+Locator and Formatter wrapper methods
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The ``set_view_interval``, ``set_data_interval`` and ``set_bounds`` methods of
+`.Locator`\s and `.Formatter`\s (and their common base class, TickHelper) are
+deprecated. Directly manipulate the view and data intervals on the underlying
+axis instead.
+
+Unused positional parameters to ``print_<fmt>`` methods
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+None of the ``print_<fmt>`` methods implemented by canvas subclasses used
+positional arguments other that the first (the output filename or file-like),
+so these extra parameters are deprecated.
+
+``QuadMesh`` signature
+~~~~~~~~~~~~~~~~~~~~~~
+
+The `.QuadMesh` signature ::
+
+    def __init__(meshWidth, meshHeight, coordinates,
+                 antialiased=True, shading='flat', **kwargs)
+
+is deprecated and replaced by the new signature ::
+
+    def __init__(coordinates, *, antialiased=True, shading='flat', **kwargs)
+
+In particular:
+
+- The *coordinates* argument must now be a (M, N, 2) array-like. Previously,
+  the grid shape was separately specified as (*meshHeight* + 1, *meshWidth* +
+  1) and *coordinates* could be an array-like of any shape with M * N * 2
+  elements.
+- All parameters except *coordinates* are keyword-only now.
+
+rcParams will no longer cast inputs to str
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+After a deprecation period, rcParams that expect a (non-pathlike) str will no
+longer cast non-str inputs using `str`. This will avoid confusing errors in
+subsequent code if e.g. a list input gets implicitly cast to a str.
+
+Case-insensitive scales
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Previously, scales could be set case-insensitively (e.g.,
+``set_xscale("LoG")``). This is deprecated; all builtin scales use lowercase
+names.
+
+Interactive cursor details
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Setting a mouse cursor on a window has been moved from the toolbar to the
+canvas. Consequently, several implementation details on toolbars and within
+backends have been deprecated.
+
+``NavigationToolbar2.set_cursor`` and ``backend_tools.SetCursorBase.set_cursor``
+................................................................................
+
+Instead, use the `.FigureCanvasBase.set_cursor` method on the canvas (available
+as the ``canvas`` attribute on the toolbar or the Figure.)
+
+``backend_tools.SetCursorBase`` and subclasses
+..............................................
+
+``backend_tools.SetCursorBase`` was subclassed to provide backend-specific
+implementations of ``set_cursor``. As that is now deprecated, the subclassing
+is no longer necessary. Consequently, the following subclasses are also
+deprecated:
+
+- ``matplotlib.backends.backend_gtk3.SetCursorGTK3``
+- ``matplotlib.backends.backend_qt5.SetCursorQt``
+- ``matplotlib.backends._backend_tk.SetCursorTk``
+- ``matplotlib.backends.backend_wx.SetCursorWx``
+
+Instead, use the `.backend_tools.ToolSetCursor` class.
+
+``cursord`` in GTK, Qt, and wx backends
+.......................................
+
+The ``backend_gtk3.cursord``, ``backend_qt.cursord``, and
+``backend_wx.cursord`` dictionaries are deprecated. This makes the GTK module
+importable on headless environments.
+
+Miscellaneous deprecations
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- ``is_url`` and ``URL_REGEX`` are deprecated. (They were previously defined in
+  the toplevel :mod:`matplotlib` module.)
+- The ``ArrowStyle.beginarrow`` and ``ArrowStyle.endarrow`` attributes are
+  deprecated; use the ``arrow`` attribute to define the desired heads and tails
+  of the arrow.
+- ``backend_pgf.LatexManager.str_cache`` is deprecated.
+- ``backends.qt_compat.ETS`` and ``backends.qt_compat.QT_RC_MAJOR_VERSION`` are
+  deprecated, with no replacement.
+- The ``blocking_input`` module has been deprecated. Instead, use
+  ``canvas.start_event_loop()`` and ``canvas.stop_event_loop()`` while
+  connecting event callbacks as needed.
+- ``cbook.report_memory`` is deprecated; use ``psutil.virtual_memory`` instead.
+- ``cm.LUTSIZE`` is deprecated. Use :rc:`image.lut` instead. This value only
+  affects colormap quantization levels for default colormaps generated at
+  module import time.
+- ``Collection.__init__`` previously ignored *transOffset* without *offsets* also
+  being specified. In the future, *transOffset* will begin having an effect
+  regardless of *offsets*. In the meantime, if you wish to set *transOffset*,
+  call `.Collection.set_offset_transform` explicitly.
+- ``Colorbar.patch`` is deprecated; this attribute is not correctly updated
+  anymore.
+- ``ContourLabeler.get_label_width`` is deprecated.
+- ``dviread.PsfontsMap`` now raises LookupError instead of KeyError for missing
+  fonts.
+- ``Dvi.baseline`` is deprecated (with no replacement).
+- The *format* parameter of ``dviread.find_tex_file`` is deprecated (with no
+  replacement).
+- ``FancyArrowPatch.get_path_in_displaycoord`` and
+  ``ConnectionPath.get_path_in_displaycoord`` are deprecated. The path in
+  display coordinates can still be obtained, as for other patches, using
+  ``patch.get_transform().transform_path(patch.get_path())``.
+- The ``font_manager.win32InstalledFonts`` and
+  ``font_manager.get_fontconfig_fonts`` helper functions have been deprecated.
+- All parameters of ``imshow`` starting from *aspect* will become keyword-only.
+- ``QuadMesh.convert_mesh_to_paths`` and ``QuadMesh.convert_mesh_to_triangles``
+  are deprecated. ``QuadMesh.get_paths()`` can be used as an alternative for
+  the former; there is no replacement for the latter.
+- ``ScalarMappable.callbacksSM`` is deprecated. Use
+  ``ScalarMappable.callbacks`` instead.
+- ``streamplot.get_integrator`` is deprecated.
+- ``style.core.STYLE_FILE_PATTERN``, ``style.core.load_base_library``, and
+  ``style.core.iter_user_libraries`` are deprecated.
+- ``SubplotParams.validate`` is deprecated. Use `.SubplotParams.update` to
+  change `.SubplotParams` while always keeping it in a valid state.
+- The ``grey_arrayd``, ``font_family``, ``font_families``, and ``font_info``
+  attributes of `.TexManager` are deprecated.
+- ``Text.get_prop_tup`` is deprecated with no replacements (because the `.Text`
+  class cannot know whether a backend needs to update cache e.g. when the
+  text's color changes).
+- ``Tick.apply_tickdir`` didn't actually update the tick markers on the
+  existing Line2D objects used to draw the ticks and is deprecated; use
+  `.Axis.set_tick_params` instead.
+- ``tight_layout.auto_adjust_subplotpars`` is deprecated.
+
+- The ``grid_info`` attribute of ``axisartist`` classes has been deprecated.
+- ``axisartist.clip_path`` is deprecated with no replacement.
+- ``axes_grid1.axes_grid.CbarAxes`` and ``axes_grid1.axisartist.CbarAxes`` are
+  deprecated (they are now dynamically generated based on the owning axes
+  class).
+- The ``axes_grid1.Divider.get_vsize_hsize`` and
+  ``axes_grid1.Grid.get_vsize_hsize`` methods are deprecated. Copy their
+  implementations if needed.
+- ``AxesDivider.append_axes(..., add_to_figure=False)`` is deprecated. Use
+  ``ax.remove()`` to remove the Axes from the figure if needed.
+- ``FixedAxisArtistHelper.change_tick_coord`` is deprecated with no
+  replacement.
+- ``floating_axes.GridHelperCurveLinear.get_boundary`` is deprecated, with no
+  replacement.
+- ``ParasiteAxesBase.get_images_artists`` has been deprecated.
+
+- The "units finalize" signal (previously emitted by Axis instances) is
+  deprecated. Connect to "units" instead.
+- Passing formatting parameters positionally to ``stem()`` is deprecated
+
+``plot_directive`` deprecations
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The ``:encoding:`` option to ``.. plot`` directive has had no effect since
+Matplotlib 1.3.1, and is now deprecated.
+
+The following helpers in `matplotlib.sphinxext.plot_directive` are deprecated:
+
+- ``unescape_doctest`` (use `doctest.script_from_examples` instead),
+- ``split_code_at_show``, 
+- ``run_code``.
+
+Testing support
+~~~~~~~~~~~~~~~
+
+``matplotlib.test()`` is deprecated
+...................................
+
+Run tests using ``pytest`` from the commandline instead. The variable
+``matplotlib.default_test_modules`` is only used for ``matplotlib.test()`` and
+is thus deprecated as well.
+
+To test an installed copy, be sure to specify both ``matplotlib`` and
+``mpl_toolkits`` with ``--pyargs``::
+
+    python -m pytest --pyargs matplotlib.tests mpl_toolkits.tests
+
+See :ref:`testing` for more details.
+
+Unused pytest fixtures and markers
+..................................
+
+The fixture ``matplotlib.testing.conftest.mpl_image_comparison_parameters`` is
+not used internally by Matplotlib. If you use this please copy it into your
+code base.
+
+The ``@pytest.mark.style`` marker is deprecated; use ``@mpl.style.context``,
+which has the same effect.
+
+Support for ``nx1 = None`` or ``ny1 = None`` in ``AxesLocator`` and ``Divider.locate``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In `.axes_grid1.axes_divider`, various internal APIs will stop supporting
+passing ``nx1 = None`` or ``ny1 = None`` to mean ``nx + 1`` or ``ny + 1``, in
+preparation for a possible future API which allows indexing and slicing of
+dividers (possibly ``divider[a:b] == divider.new_locator(a, b)``, but also
+``divider[a:] == divider.new_locator(a, <end>)``). The user-facing
+`.Divider.new_locator` API is unaffected -- it correctly normalizes ``nx1 =
+None`` and ``ny1 = None`` as needed.
diff --git a/doc/api/prev_api_changes/api_changes_3.5.0/development.rst b/doc/api/prev_api_changes/api_changes_3.5.0/development.rst
new file mode 100644
index 000000000000..2db21237a699
--- /dev/null
+++ b/doc/api/prev_api_changes/api_changes_3.5.0/development.rst
@@ -0,0 +1,82 @@
+Development changes
+-------------------
+
+Increase to minimum supported versions of dependencies
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For Matplotlib 3.5, the :ref:`minimum supported versions <dependencies>` and
+some :ref:`optional dependencies <optional_dependencies>` are being bumped:
+
++---------------+---------------+---------------+
+| Dependency    | min in mpl3.4 | min in mpl3.5 |
++===============+===============+===============+
+| NumPy         |     1.16      |     1.17      |
++---------------+---------------+---------------+
+| Tk (optional) |     8.3       |     8.4       |
++---------------+---------------+---------------+
+
+This is consistent with our :ref:`min_deps_policy` and `NEP29
+<https://numpy.org/neps/nep-0029-deprecation_policy.html>`__
+
+New wheel architectures
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Wheels have been added for:
+
+- Python 3.10
+- PyPy 3.7
+- macOS on Apple Silicon (both arm64 and universal2)
+
+New build dependencies
+~~~~~~~~~~~~~~~~~~~~~~
+
+Versioning has been switched from bundled versioneer to `setuptools-scm
+<https://github.com/pypa/setuptools_scm/>`__ using the
+``release-branch-semver`` version scheme. The latter is well-maintained, but
+may require slight modification to packaging scripts.
+
+The `setuptools-scm-git-archive
+<https://pypi.org/project/setuptools-scm-git-archive/>`__ plugin is also used
+for consistent version export.
+
+Data directory is no longer optional
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Historically, the ``mpl-data`` directory has been optional (example files were
+unnecessary, and fonts could be deleted if a suitable dependency on a system
+font were provided). Though example files are still optional, they have been
+substantially pared down, and we now consider the directory to be required.
+
+Specifically, the ``matplotlibrc`` file found there is used for runtime
+verifications and must exist. Packagers may still symlink fonts to system
+versions if needed.
+
+New runtime dependencies
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+fontTools for type 42 subsetting
+................................
+
+A new dependency `fontTools <https://fonttools.readthedocs.io/>`_ is integrated
+into Matplotlib 3.5. It is designed to be used with PS/EPS and PDF documents;
+and handles Type 42 font subsetting.
+
+Underscore support in LaTeX
+...........................
+
+The `underscore <https://ctan.org/pkg/underscore>`_ package is now a
+requirement to improve support for underscores in LaTeX.
+
+This is consistent with our :ref:`min_deps_policy`.
+
+Matplotlib-specific build options moved from ``setup.cfg`` to ``mplsetup.cfg``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In order to avoid conflicting with the use of :file:`setup.cfg` by
+``setuptools``, the Matplotlib-specific build options have moved from
+``setup.cfg`` to ``mplsetup.cfg``.  The :file:`setup.cfg.template` has been
+correspondingly been renamed to :file:`mplsetup.cfg.template`.
+
+Note that the path to this configuration file can still be set via the
+:envvar:`MPLSETUPCFG` environment variable, which allows one to keep using the
+same file before and after this change.
diff --git a/doc/api/prev_api_changes/api_changes_3.5.0/removals.rst b/doc/api/prev_api_changes/api_changes_3.5.0/removals.rst
new file mode 100644
index 000000000000..3ea9b338026d
--- /dev/null
+++ b/doc/api/prev_api_changes/api_changes_3.5.0/removals.rst
@@ -0,0 +1,365 @@
+Removals
+--------
+
+The following deprecated APIs have been removed:
+
+Removed behaviour
+~~~~~~~~~~~~~~~~~
+
+Stricter validation of function parameters
+..........................................
+
+- Calling `.Figure.add_axes` with no arguments will raise an error. Adding a
+  free-floating axes needs a position rectangle. If you want a figure-filling
+  single axes, use `.Figure.add_subplot` instead.
+- `.Figure.add_subplot` validates its inputs; in particular, for
+  ``add_subplot(rows, cols, index)``, all parameters must be integral.
+  Previously strings and floats were accepted and converted to int.
+- Passing *None* as the *which* argument to ``autofmt_xdate`` is no longer
+  supported; use its more explicit synonym, ``which="major"``, instead.
+- Setting the *orientation* of an ``eventplot()`` or `.EventCollection` to
+  "none" or *None* is no longer supported; set it to "horizontal" instead.
+  Moreover, the two orientations ("horizontal" and "vertical") are now
+  case-sensitive.
+- Passing parameters *norm* and *vmin*/*vmax* simultaneously to functions using
+  colormapping such as ``scatter()`` and ``imshow()`` is no longer supported.
+  Instead of ``norm=LogNorm(), vmin=min_val, vmax=max_val`` pass
+  ``norm=LogNorm(min_val, max_val)``. *vmin* and *vmax* should only be used
+  without setting *norm*.
+- Passing *None* as either the *radius* or *startangle* arguments of an
+  `.Axes.pie` is no longer accepted; use the explicit defaults of 1 and 0,
+  respectively, instead.
+- Passing *None* as the *normalize* argument of `.Axes.pie` (the former
+  default) is no longer accepted, and the pie will always be normalized by
+  default. If you wish to plot an incomplete pie, explicitly pass
+  ``normalize=False``.
+- Support for passing *None* to ``subplot_class_factory`` has been removed.
+  Explicitly pass in the base `~matplotlib.axes.Axes` class instead.
+- Passing multiple keys as a single comma-separated string or multiple
+  arguments to `.ToolManager.update_keymap` is no longer supported; pass keys
+  as a list of strings instead.
+- Passing the dash offset as *None* is no longer accepted, as this was never
+  universally implemented, e.g. for vector output. Set the offset to 0 instead.
+- Setting a custom method overriding `.Artist.contains` using
+  ``Artist.set_contains`` has been removed, as has ``Artist.get_contains``.
+  There is no replacement, but you may still customize pick events using
+  `.Artist.set_picker`.
+- `~.Axes.semilogx`, `~.Axes.semilogy`, `~.Axes.loglog`, `.LogScale`, and
+  `.SymmetricalLogScale` used to take keyword arguments that depends on the
+  axis orientation ("basex" vs "basey", "subsx" vs "subsy", "nonposx" vs
+  "nonposy"); these parameter names have been removed in favor of "base",
+  "subs", "nonpositive". This removal also affects e.g. ``ax.set_yscale("log",
+  basey=...)`` which must now be spelled ``ax.set_yscale("log", base=...)``.
+
+  The change from "nonpos" to "nonpositive" also affects
+  `~.scale.LogTransform`, `~.scale.InvertedLogTransform`,
+  `~.scale.SymmetricalLogTransform`, etc.
+
+  To use *different* bases for the x-axis and y-axis of a `~.Axes.loglog` plot,
+  use e.g. ``ax.set_xscale("log", base=10); ax.set_yscale("log", base=2)``.
+- Passing *None*, or no argument, to ``parasite_axes_class_factory``,
+  ``parasite_axes_auxtrans_class_factory``, ``host_axes_class_factory`` is no
+  longer accepted; pass an explicit base class instead.
+
+Case-sensitivity is now enforced more
+......................................
+
+- Upper or mixed-case property names are no longer normalized to lowercase in
+  `.Artist.set` and `.Artist.update`. This allows one to pass names such as
+  *patchA* or *UVC*.
+- Case-insensitive capstyles and joinstyles are no longer lower-cased; please
+  pass capstyles ("miter", "round", "bevel") and joinstyles ("butt", "round",
+  "projecting") as lowercase.
+- Saving metadata in PDF with the PGF backend no longer changes keys to
+  lowercase. Only the canonically cased keys listed in the PDF specification
+  (and the `~.backend_pgf.PdfPages` documentation) are accepted.
+
+No implicit initialization of ``Tick`` attributes
+.................................................
+
+The `.Tick` constructor no longer initializes the attributes ``tick1line``,
+``tick2line``, ``gridline``, ``label1``, and ``label2`` via ``_get_tick1line``,
+``_get_tick2line``, ``_get_gridline``, ``_get_text1``, and ``_get_text2``.
+Please directly set the attribute in the subclass' ``__init__`` instead.
+
+``NavigationToolbar2`` subclass changes
+.......................................
+
+Overriding the ``_init_toolbar`` method of `.NavigationToolbar2` to initialize
+third-party toolbars is no longer supported. Instead, the toolbar should be
+initialized in the ``__init__`` method of the subclass (which should call the
+base-class' ``__init__`` as appropriate).
+
+The ``press`` and ``release`` methods of `.NavigationToolbar2` were called when
+pressing or releasing a mouse button, but *only* when an interactive pan or
+zoom was occurring (contrary to what the docs stated). They are no longer
+called; if you write a backend which needs to customize such events, please
+directly override ``press_pan``/``press_zoom``/``release_pan``/``release_zoom``
+instead.
+
+Removal of old file mode flag
+.............................
+
+Flags containing "U" passed to `.cbook.to_filehandle` and `.cbook.open_file_cm`
+are no longer accepted. This is consistent with their removal from `open` in
+Python 3.9.
+
+Keymaps toggling ``Axes.get_navigate`` have been removed
+........................................................
+
+This includes numeric key events and rcParams.
+
+The ``TTFPATH`` and ``AFMPATH`` environment variables
+.....................................................
+
+Support for the (undocumented) ``TTFPATH`` and ``AFMPATH`` environment
+variables has been removed. Register additional fonts using
+``matplotlib.font_manager.fontManager.addfont()``.
+
+Modules
+~~~~~~~
+
+- ``matplotlib.backends.qt_editor.formsubplottool``; use
+  ``matplotlib.backends.backend_qt.SubplotToolQt`` instead.
+- ``matplotlib.compat``
+- ``matplotlib.ttconv``
+- The Qt4-based backends, ``qt4agg`` and ``qt4cairo``, have been removed. Qt4
+  has reached its end-of-life in 2015 and there are no releases of either PyQt4
+  or PySide for recent versions of Python. Please use one of the Qt5 or Qt6
+  backends.
+
+Classes, methods and attributes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The following module-level classes/variables have been removed:
+
+- ``backend_bases.StatusbarBase`` and all its subclasses, and ``StatusBarWx``;
+  messages are displayed in the toolbar
+- ``backend_pgf.GraphicsContextPgf``
+- ``MODIFIER_KEYS``, ``SUPER``, ``ALT``, ``CTRL``, and ``SHIFT`` of
+  `matplotlib.backends.backend_qt5agg` and
+  `matplotlib.backends.backend_qt5cairo`
+- ``backend_wx.DEBUG_MSG``
+- ``dviread.Encoding``
+- ``Fil``, ``Fill``, ``Filll``, ``NegFil``, ``NegFill``, ``NegFilll``, and
+  ``SsGlue`` from `.mathtext`; directly construct glue instances with
+  ``Glue("fil")``, etc.
+- ``mathtext.GlueSpec``
+- ``OldScalarFormatter``, ``IndexFormatter`` and ``IndexDateFormatter``; use
+  `.FuncFormatter` instead
+- ``OldAutoLocator``
+- ``AVConvBase``, ``AVConvWriter`` and ``AVConvFileWriter``. Debian 8 (2015,
+  EOL 06/2020) and Ubuntu 14.04 (EOL 04/2019) were the last versions of Debian
+  and Ubuntu to ship avconv. It remains possible to force the use of avconv by
+  using the FFmpeg-based writers with :rc:`animation.ffmpeg_path` set to
+  "avconv".
+- ``matplotlib.axes._subplots._subplot_classes``
+- ``axes_grid1.axes_rgb.RGBAxesBase``; use ``RGBAxes`` instead
+
+The following class attributes have been removed:
+
+- ``backend_pgf.LatexManager.latex_stdin_utf8``
+- ``backend_pgf.PdfPages.metadata``
+- ``ContourSet.ax`` and ``Quiver.ax``; use ``ContourSet.axes`` or
+  ``Quiver.axes`` as with other artists
+- ``DateFormatter.illegal_s``
+- ``dates.YearLocator.replaced``; `.YearLocator` is now a subclass of
+  `.RRuleLocator`, and the attribute ``YearLocator.replaced`` has been removed.
+  For tick locations that required modifying this, a custom rrule and
+  `.RRuleLocator` can be used instead.
+- ``FigureManagerBase.statusbar``; messages are displayed in the toolbar
+- ``FileMovieWriter.clear_temp``
+- ``mathtext.Glue.glue_subtype``
+- ``MovieWriter.args_key``, ``MovieWriter.exec_key``, and
+  ``HTMLWriter.args_key``
+- ``NavigationToolbar2QT.basedir``; the base directory to the icons is
+  ``os.path.join(mpl.get_data_path(), "images")``
+- ``NavigationToolbar2QT.ctx``
+- ``NavigationToolbar2QT.parent``; to access the parent window, use
+  ``toolbar.canvas.parent()`` or ``toolbar.parent()``
+- ``prevZoomRect``, ``retinaFix``, ``savedRetinaImage``, ``wxoverlay``,
+  ``zoomAxes``, ``zoomStartX``, and ``zoomStartY`` attributes of
+  ``NavigationToolbar2Wx``
+- ``NonUniformImage.is_grayscale``, ``PcolorImage.is_grayscale``, for
+  consistency with ``AxesImage.is_grayscale``. (Note that previously, these
+  attributes were only available *after rendering the image*).
+- ``RendererCairo.fontweights``, ``RendererCairo.fontangles``
+- ``used_characters`` of `.RendererPdf`, `.PdfFile`, and `.RendererPS`
+- ``LogScale.LogTransform``, ``LogScale.InvertedLogTransform``,
+  ``SymmetricalScale.SymmetricalTransform``, and
+  ``SymmetricalScale.InvertedSymmetricalTransform``; directly access the
+  transform classes from `matplotlib.scale`
+- ``cachedir``, ``rgba_arrayd``, ``serif``, ``sans_serif``, ``cursive``, and
+  ``monospace`` attributes of `.TexManager`
+- ``axleft``, ``axright``, ``axbottom``, ``axtop``, ``axwspace``, and
+  ``axhspace`` attributes of `.widgets.SubplotTool`; access the ``ax``
+  attribute of the corresponding slider
+- ``widgets.TextBox.params_to_disable``
+- ``angle_helper.LocatorBase.den``; it has been renamed to *nbins*
+- ``axes_grid.CbarAxesBase.cbid`` and ``axes_grid.CbarAxesBase.locator``; use
+  ``mappable.colorbar_cid`` or ``colorbar.locator`` instead
+
+The following class methods have been removed:
+
+- ``Axes.update_datalim_bounds``; use ``ax.dataLim.set(Bbox.union([ax.dataLim,
+  bounds]))``
+- ``pan`` and ``zoom`` methods of `~.axis.Axis` and `~.ticker.Locator` have
+  been removed; panning and zooming are now implemented using the
+  ``start_pan``, ``drag_pan``, and ``end_pan`` methods of `~.axes.Axes`
+- ``.BboxBase.inverse_transformed``; call `.BboxBase.transformed` on the
+  `~.Transform.inverted()` transform
+- ``Collection.set_offset_position`` and ``Collection.get_offset_position``
+  have been removed; the ``offset_position`` of the `.Collection` class is now
+  "screen"
+- ``Colorbar.on_mappable_changed`` and ``Colorbar.update_bruteforce``; use
+  ``Colorbar.update_normal()`` instead
+- ``docstring.Substitution.from_params`` has been removed; directly assign to
+  ``params`` of ``docstring.Substitution`` instead
+- ``DraggableBase.artist_picker``; set the artist's picker instead
+- ``DraggableBase.on_motion_blit``; use `.DraggableBase.on_motion` instead
+- ``FigureCanvasGTK3._renderer_init``
+- ``Locator.refresh()`` and the associated helper methods
+  ``NavigationToolbar2.draw()`` and ``ToolViewsPositions.refresh_locators()``
+- ``track_characters`` and ``merge_used_characters`` of `.RendererPdf`,
+  `.PdfFile`, and `.RendererPS`
+- ``RendererWx.get_gc``
+- ``SubplotSpec.get_rows_columns``; use the ``GridSpec.nrows``,
+  ``GridSpec.ncols``, ``SubplotSpec.rowspan``, and ``SubplotSpec.colspan``
+  properties instead.
+- ``ScalarMappable.update_dict``, ``ScalarMappable.add_checker()``, and
+  ``ScalarMappable.check_update()``; register a callback in
+  ``ScalarMappable.callbacks`` to be notified of updates
+- ``TexManager.make_tex_preview`` and ``TexManager.make_dvi_preview``
+- ``funcleft``, ``funcright``, ``funcbottom``, ``functop``, ``funcwspace``, and
+  ``funchspace`` methods of `.widgets.SubplotTool`
+
+- ``axes_grid1.axes_rgb.RGBAxes.add_RGB_to_figure``
+- ``axisartist.axis_artist.AxisArtist.dpi_transform``
+- ``axisartist.grid_finder.MaxNLocator.set_factor`` and
+  ``axisartist.grid_finder.FixedLocator.set_factor``; the factor is always 1
+  now
+
+Functions
+~~~~~~~~~
+
+- ``bezier.make_path_regular`` has been removed; use ``Path.cleaned()`` (or
+  ``Path.cleaned(curves=True)``, etc.) instead, but note that these methods add
+  a ``STOP`` code at the end of the path.
+- ``bezier.concatenate_paths`` has been removed; use
+  ``Path.make_compound_path()`` instead.
+- ``cbook.local_over_kwdict`` has been removed; use `.cbook.normalize_kwargs`
+  instead.
+- ``qt_compat.is_pyqt5`` has been removed due to the release of PyQt6. The Qt
+  version can be checked using ``QtCore.qVersion()``.
+- ``testing.compare.make_external_conversion_command`` has been removed.
+- ``axes_grid1.axes_rgb.imshow_rgb`` has been removed; use
+  ``imshow(np.dstack([r, g, b]))`` instead.
+
+Arguments
+~~~~~~~~~
+
+- The *s* parameter to `.Axes.annotate` and  `.pyplot.annotate` is no longer
+  supported; use the new name *text*.
+- The *inframe* parameter to `.Axes.draw` has been removed; use
+  `.Axes.redraw_in_frame` instead.
+- The *required*, *forbidden* and *allowed* parameters of
+  `.cbook.normalize_kwargs` have been removed.
+- The *ismath* parameter of the ``draw_tex`` method of all renderer classes has
+  been removed (as a call to ``draw_tex`` — not to be confused with
+  ``draw_text``! — means that the entire string should be passed to the
+  ``usetex`` machinery anyways). Likewise, the text machinery will no longer
+  pass the *ismath* parameter when calling ``draw_tex`` (this should only
+  matter for backend implementers).
+- The *quality*, *optimize*, and *progressive* parameters of `.Figure.savefig`
+  (which only affected JPEG output) have been removed, as well as from the
+  corresponding ``print_jpg`` methods. JPEG output options can be set by
+  directly passing the relevant parameters in *pil_kwargs*.
+- The *clear_temp* parameter of `.FileMovieWriter` has been removed; files
+  placed in a temporary directory (using ``frame_prefix=None``, the default)
+  will be cleared; files placed elsewhere will not.
+- The *copy* parameter of ``mathtext.Glue`` has been removed.
+- The *quantize* parameter of `.Path.cleaned()` has been removed.
+- The *dummy* parameter of `.RendererPgf` has been removed.
+- The *props* parameter of `.Shadow` has been removed; use keyword arguments
+  instead.
+- The *recursionlimit* parameter of `matplotlib.test` has been removed.
+- The *label* parameter of `.Tick` has no effect and has been removed.
+- `~.ticker.MaxNLocator` no longer accepts a positional parameter and the
+  keyword argument *nbins* simultaneously because they specify the same
+  quantity.
+- The *add_all* parameter to ``axes_grid.Grid``, ``axes_grid.ImageGrid``,
+  ``axes_rgb.make_rgb_axes``, and ``axes_rgb.RGBAxes`` have been removed; the
+  APIs always behave as if ``add_all=True``.
+- The *den* parameter of ``axisartist.angle_helper.LocatorBase`` has been
+  removed; use *nbins* instead.
+
+- The *s* keyword argument to `.AnnotationBbox.get_fontsize` has no effect and
+  has been removed.
+- The *offset_position* keyword argument of the `.Collection` class has been
+  removed; the ``offset_position`` now "screen".
+- Arbitrary keyword arguments to ``StreamplotSet`` have no effect and have been
+  removed.
+
+- The *fontdict* and *minor* parameters of `.Axes.set_xticklabels` /
+  `.Axes.set_yticklabels` are now keyword-only.
+- All parameters of `.Figure.subplots` except *nrows* and *ncols* are now
+  keyword-only; this avoids typing e.g. ``subplots(1, 1, 1)`` when meaning
+  ``subplot(1, 1, 1)``, but actually getting ``subplots(1, 1, sharex=1)``.
+- All parameters of `.pyplot.tight_layout` are now keyword-only, to be
+  consistent with `.Figure.tight_layout`.
+- ``ColorbarBase`` only takes a single positional argument now, the ``Axes`` to
+  create it in, with all other options required to be keyword arguments. The
+  warning for keyword arguments that were overridden by the mappable is now
+  removed.
+
+- Omitting the *renderer* parameter to `.Axes.draw` is no longer supported; use
+  ``axes.draw_artist(axes)`` instead.
+- Passing ``ismath="TeX!"`` to `.RendererAgg.get_text_width_height_descent` is
+  no longer supported; pass ``ismath="TeX"`` instead,
+- Changes to the signature of the `.Axes.draw` method make it consistent with
+  all other artists; thus additional parameters to `.Artist.draw` have also
+  been removed.
+
+rcParams
+~~~~~~~~
+
+- The ``animation.avconv_path`` and ``animation.avconv_args`` rcParams have
+  been removed.
+- The ``animation.html_args`` rcParam has been removed.
+- The ``keymap.all_axes`` rcParam has been removed.
+- The ``mathtext.fallback_to_cm`` rcParam has been removed. Use
+  :rc:`mathtext.fallback` instead.
+- The ``savefig.jpeg_quality`` rcParam has been removed.
+- The ``text.latex.preview`` rcParam has been removed.
+- The following deprecated rcParams validators, defined in `.rcsetup`, have
+  been removed:
+
+  - ``validate_alignment``
+  - ``validate_axes_titlelocation``
+  - ``validate_axis_locator``
+  - ``validate_bool_maybe_none``
+  - ``validate_fontset``
+  - ``validate_grid_axis``
+  - ``validate_hinting``
+  - ``validate_legend_loc``
+  - ``validate_mathtext_default``
+  - ``validate_movie_frame_fmt``
+  - ``validate_movie_html_fmt``
+  - ``validate_movie_writer``
+  - ``validate_nseq_float``
+  - ``validate_nseq_int``
+  - ``validate_orientation``
+  - ``validate_pgf_texsystem``
+  - ``validate_ps_papersize``
+  - ``validate_svg_fontset``
+  - ``validate_toolbar``
+  - ``validate_webagg_address``
+
+- Some rcParam validation has become stricter:
+
+  - :rc:`axes.axisbelow` no longer accepts strings starting with "line"
+    (case-insensitive) as "line"; use "line" (case-sensitive) instead.
+  - :rc:`text.latex.preamble` and :rc:`pdf.preamble` no longer accept
+    non-string values.
+  - All ``*.linestyle`` rcParams no longer accept ``offset = None``; set the
+    offset to 0 instead.
diff --git a/doc/api/prev_api_changes/api_changes_3.5.2.rst b/doc/api/prev_api_changes/api_changes_3.5.2.rst
new file mode 100644
index 000000000000..47b000de0350
--- /dev/null
+++ b/doc/api/prev_api_changes/api_changes_3.5.2.rst
@@ -0,0 +1,13 @@
+API Changes for 3.5.2
+=====================
+
+.. contents::
+   :local:
+   :depth: 1
+
+QuadMesh mouseover defaults to False
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New in 3.5, `.QuadMesh.get_cursor_data` allows display of data values
+under the cursor.  However, this can be very slow for large meshes, so
+by ``.QuadMesh.set_mouseover`` defaults to *False*.
diff --git a/doc/api/prev_api_changes/api_changes_3.5.3.rst b/doc/api/prev_api_changes/api_changes_3.5.3.rst
new file mode 100644
index 000000000000..03d1f476513e
--- /dev/null
+++ b/doc/api/prev_api_changes/api_changes_3.5.3.rst
@@ -0,0 +1,13 @@
+API Changes for 3.5.3
+=====================
+
+.. contents::
+   :local:
+   :depth: 1
+
+Passing *linefmt* positionally is undeprecated
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Positional use of all formatting parameters in `~.Axes.stem` has been
+deprecated since Matplotlib 3.5. This deprecation is relaxed so that one can
+still pass *linefmt* positionally, i.e. ``stem(x, y, 'r')``.
diff --git a/doc/api/prev_api_changes/api_changes_3.6.0.rst b/doc/api/prev_api_changes/api_changes_3.6.0.rst
new file mode 100644
index 000000000000..1bba4506fd7d
--- /dev/null
+++ b/doc/api/prev_api_changes/api_changes_3.6.0.rst
@@ -0,0 +1,14 @@
+API Changes for 3.6.0
+=====================
+
+.. contents::
+   :local:
+   :depth: 1
+
+.. include:: /api/prev_api_changes/api_changes_3.6.0/behaviour.rst
+
+.. include:: /api/prev_api_changes/api_changes_3.6.0/deprecations.rst
+
+.. include:: /api/prev_api_changes/api_changes_3.6.0/removals.rst
+
+.. include:: /api/prev_api_changes/api_changes_3.6.0/development.rst
diff --git a/doc/api/prev_api_changes/api_changes_3.6.0/behaviour.rst b/doc/api/prev_api_changes/api_changes_3.6.0/behaviour.rst
new file mode 100644
index 000000000000..a35584b04961
--- /dev/null
+++ b/doc/api/prev_api_changes/api_changes_3.6.0/behaviour.rst
@@ -0,0 +1,248 @@
+Behaviour changes
+-----------------
+
+``plt.get_cmap`` and ``matplotlib.cm.get_cmap`` return a copy
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Formerly, `~.pyplot.get_cmap` and `.cm.get_cmap` returned a global version of a
+`.Colormap`. This was prone to errors as modification of the colormap would
+propagate from one location to another without warning. Now, a new copy of the
+colormap is returned.
+
+Large ``imshow`` images are now downsampled
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When showing an image using `~matplotlib.axes.Axes.imshow` that has more than
+:math:`2^{24}` columns or :math:`2^{23}` rows, the image will now be
+downsampled to below this resolution before being resampled for display by the
+AGG renderer. Previously such a large image would be shown incorrectly. To
+prevent this downsampling and the warning it raises, manually downsample your
+data before handing it to `~matplotlib.axes.Axes.imshow`.
+
+Default date limits changed to 1970-01-01 – 1970-01-02
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Previously the default limits for an empty axis set up for dates
+(`.Axis.axis_date`) was 2000-01-01 to 2010-01-01. This has been changed to
+1970-01-01 to 1970-01-02. With the default epoch, this makes the numeric limit
+for date axes the same as for other axes (0.0-1.0), and users are less likely
+to set a locator with far too many ticks.
+
+*markerfmt* argument to ``stem``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The behavior of the *markerfmt* parameter of `~.Axes.stem` has changed:
+
+- If *markerfmt* does not contain a color, the color is taken from *linefmt*.
+- If *markerfmt* does not contain a marker, the default is 'o'.
+
+Before, *markerfmt* was passed unmodified to ``plot(..., fmt)``, which had a
+number of unintended side-effects; e.g. only giving a color switched to a solid
+line without markers.
+
+For a simple call ``stem(x, y)`` without parameters, the new rules still
+reproduce the old behavior.
+
+``get_ticklabels`` now always populates labels
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Previously `.Axis.get_ticklabels` (and `.Axes.get_xticklabels`,
+`.Axes.get_yticklabels`) would only return empty strings unless a draw had
+already been performed. Now the ticks and their labels are updated when the
+labels are requested.
+
+Warning when scatter plot color settings discarded
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When making an animation of a scatter plot, if you don't set *c* (the color
+value parameter) when initializing the artist, the color settings are ignored.
+`.Axes.scatter` now raises a warning if color-related settings are changed
+without setting *c*.
+
+3D ``contourf`` polygons placed between levels
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The polygons used in a 3D `~.Axes3D.contourf` plot are now placed halfway
+between the contour levels, as each polygon represents the location of values
+that lie between two levels.
+
+Axes title now avoids y-axis offset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Previously, Axes titles could overlap the y-axis offset text, which is often in
+the upper left corner of the axes. Now titles are moved above the offset text
+if overlapping when automatic title positioning is in effect (i.e. if *y* in
+`.Axes.set_title` is *None* and :rc:`axes.titley` is also *None*).
+
+Dotted operators gain extra space in mathtext
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In mathtext, ``\doteq \doteqdot \dotminus \dotplus \dots`` are now surrounded
+by extra space because they are correctly treated as relational or binary
+operators.
+
+*math* parameter of ``mathtext.get_unicode_index`` defaults to False
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In math mode, ASCII hyphens (U+002D) are now replaced by Unicode minus signs
+(U+2212) at the parsing stage.
+
+``ArtistList`` proxies copy contents on iteration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When iterating over the contents of the dynamically generated proxy lists for
+the Artist-type accessors (see :ref:`Behavioural API Changes 3.5 - Axes
+children combined`), a copy of the contents is made. This ensure that artists
+can safely be added or removed from the Axes while iterating over their
+children.
+
+This is a departure from the expected behavior of mutable iterable data types
+in Python — iterating over a list while mutating it has surprising consequences
+and dictionaries will error if they change size during iteration. Because all
+of the accessors are filtered views of the same underlying list, it is possible
+for seemingly unrelated changes, such as removing a Line, to affect the
+iteration over any of the other accessors. In this case, we have opted to make
+a copy of the relevant children before yielding them to the user.
+
+This change is also consistent with our plan to make these accessors immutable
+in Matplotlib 3.7.
+
+``AxesImage`` string representation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The string representation of `.AxesImage` changes from stating the position in
+the figure ``"AxesImage(80,52.8;496x369.6)"`` to giving the number of pixels
+``"AxesImage(size=(300, 200))"``.
+
+Improved autoscaling for Bézier curves
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Bézier curves are now autoscaled to their extents - previously they were
+autoscaled to their ends and control points, which in some cases led to
+unnecessarily large limits.
+
+``QuadMesh`` mouseover defaults to False
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New in 3.5, `.QuadMesh.get_cursor_data` allows display of data values under the
+cursor. However, this can be very slow for large meshes, so mouseover now
+defaults to *False*.
+
+Changed pgf backend document class
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The pgf backend now uses the ``article`` document class as basis for
+compilation.
+
+``MathtextBackendAgg.get_results`` no longer returns ``used_characters``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The last item (``used_characters``) in the tuple returned by
+``MathtextBackendAgg.get_results`` has been removed. In order to unpack this
+tuple in a backward and forward-compatible way, use e.g. ``ox, oy, width,
+height, descent, image, *_ = parse(...)``, which will ignore
+``used_characters`` if it was present.
+
+``Type1Font`` objects include more properties
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The ``matplotlib._type1font.Type1Font.prop`` dictionary now includes more keys,
+such as ``CharStrings`` and ``Subrs``. The value of the ``Encoding`` key is now
+a dictionary mapping codes to glyph names. The
+``matplotlib._type1font.Type1Font.transform`` method now correctly removes
+``UniqueID`` properties from the font.
+
+``rcParams.copy()`` returns ``RcParams`` rather than ``dict``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Returning an `.RcParams` instance from `.RcParams.copy` makes the copy still
+validate inputs, and additionally avoids emitting deprecation warnings when
+using a previously copied instance to update the global instance (even if some
+entries are deprecated).
+
+``rc_context`` no longer resets the value of ``'backend'``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`matplotlib.rc_context` incorrectly reset the value of :rc:`backend` if backend
+resolution was triggered in the context. This affected only the value. The
+actual backend was not changed. Now, `matplotlib.rc_context` does not reset
+:rc:`backend` anymore.
+
+Default ``rcParams["animation.convert_args"]`` changed
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+It now defaults to ``["-layers", "OptimizePlus"]`` to try to generate smaller
+GIFs. Set it back to an empty list to recover the previous behavior.
+
+Style file encoding now specified to be UTF-8
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+It has been impossible to import Matplotlib with a non UTF-8 compatible locale
+encoding because we read the style library at import time. This change is
+formalizing and documenting the status quo so there is no deprecation period.
+
+MacOSX backend uses sRGB instead of GenericRGB color space
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+MacOSX backend now display sRGB tagged image instead of GenericRGB which is an
+older (now deprecated) Apple color space. This is the source color space used
+by ColorSync to convert to the current display profile.
+
+Renderer optional for ``get_tightbbox`` and ``get_window_extent``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The `.Artist.get_tightbbox` and `.Artist.get_window_extent` methods no longer
+require the *renderer* keyword argument, saving users from having to query it
+from ``fig.canvas.get_renderer``. If the *renderer* keyword argument is not
+supplied, these methods first check if there is a cached renderer from a
+previous draw and use that. If there is no cached renderer, then the methods
+will use ``fig.canvas.get_renderer()`` as a fallback.
+
+``FigureFrameWx`` constructor, subclasses, and ``get_canvas``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The ``FigureCanvasWx`` constructor gained a *canvas_class* keyword-only
+parameter which specifies the canvas class that should be used. This parameter
+will become required in the future. The ``get_canvas`` method, which was
+previously used to customize canvas creation, is deprecated. The
+``FigureFrameWxAgg`` and ``FigureFrameWxCairo`` subclasses, which overrode
+``get_canvas``, are deprecated.
+
+``FigureFrameWx.sizer``
+~~~~~~~~~~~~~~~~~~~~~~~
+
+... has been removed. The frame layout is no longer based on a sizer, as the
+canvas is now the sole child widget; the toolbar is now a regular toolbar added
+using ``SetToolBar``.
+
+Incompatible layout engines raise
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You cannot switch between ``tight_layout`` and ``constrained_layout`` if a
+colorbar has already been added to a figure. Invoking the incompatible layout
+engine used to warn, but now raises with a `RuntimeError`.
+
+``CallbackRegistry`` raises on unknown signals
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When Matplotlib instantiates a `.CallbackRegistry`, it now limits callbacks to
+the signals that the registry knows about. In practice, this means that calling
+`~.FigureCanvasBase.mpl_connect` with an invalid signal name now raises a
+`ValueError`.
+
+Changed exception type for incorrect SVG date metadata
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Providing date metadata with incorrect type to the SVG backend earlier resulted
+in a `ValueError`. Now, a `TypeError` is raised instead.
+
+Specified exception types in ``Grid``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In a few cases an `Exception` was thrown when an incorrect argument value was
+set in the `mpl_toolkits.axes_grid1.axes_grid.Grid` (=
+`mpl_toolkits.axisartist.axes_grid.Grid`) constructor. These are replaced as
+follows:
+
+* Providing an incorrect value for *ngrids* now raises a `ValueError`
+* Providing an incorrect type for *rect* now raises a `TypeError`
diff --git a/doc/api/prev_api_changes/api_changes_3.6.0/deprecations.rst b/doc/api/prev_api_changes/api_changes_3.6.0/deprecations.rst
new file mode 100644
index 000000000000..3a9e91e12289
--- /dev/null
+++ b/doc/api/prev_api_changes/api_changes_3.6.0/deprecations.rst
@@ -0,0 +1,414 @@
+Deprecations
+------------
+
+Parameters to ``plt.figure()`` and the ``Figure`` constructor
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+All parameters to `.pyplot.figure` and the `.Figure` constructor, other than
+*num*, *figsize*, and *dpi*, will become keyword-only after a deprecation
+period.
+
+Deprecation aliases in cbook
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The module ``matplotlib.cbook.deprecation`` was previously deprecated in
+Matplotlib 3.4, along with deprecation-related API in ``matplotlib.cbook``. Due
+to technical issues, ``matplotlib.cbook.MatplotlibDeprecationWarning`` and
+``matplotlib.cbook.mplDeprecation`` did not raise deprecation warnings on use.
+Changes in Python have now made it possible to warn when these aliases are
+being used.
+
+In order to avoid downstream breakage, these aliases will now warn, and their
+removal has been pushed from 3.6 to 3.8 to give time to notice said warnings.
+As replacement, please use `matplotlib.MatplotlibDeprecationWarning`.
+
+``Axes`` subclasses should override ``clear`` instead of ``cla``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For clarity, `.axes.Axes.clear` is now preferred over `.Axes.cla`. However, for
+backwards compatibility, the latter will remain as an alias for the former.
+
+For additional compatibility with third-party libraries, Matplotlib will
+continue to call the ``cla`` method of any `~.axes.Axes` subclasses if they
+define it. In the future, this will no longer occur, and Matplotlib will only
+call the ``clear`` method in `~.axes.Axes` subclasses.
+
+It is recommended to define only the ``clear`` method when on Matplotlib 3.6,
+and only ``cla`` for older versions.
+
+Pending deprecation top-level cmap registration and access functions in ``mpl.cm``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+As part of a `multi-step process
+<https://github.com/matplotlib/matplotlib/issues/20853>`_ we are refactoring
+the global state for managing the registered colormaps.
+
+In Matplotlib 3.5 we added a `.ColormapRegistry` class and exposed an instance
+at the top level as ``matplotlib.colormaps``. The existing top level functions
+in `matplotlib.cm` (``get_cmap``, ``register_cmap``, ``unregister_cmap``) were
+changed to be aliases around the same instance.
+
+In Matplotlib 3.6 we have marked those top level functions as pending
+deprecation with the intention of deprecation in Matplotlib 3.7. The following
+functions have been marked for pending deprecation:
+
+- ``matplotlib.cm.get_cmap``; use ``matplotlib.colormaps[name]`` instead if you
+  have a `str`.
+
+  **Added 3.6.1** Use `matplotlib.cm.ColormapRegistry.get_cmap` if you
+  have a string, `None` or a `matplotlib.colors.Colormap` object that you want
+  to convert to a `matplotlib.colors.Colormap` instance.
+- ``matplotlib.cm.register_cmap``; use `matplotlib.colormaps.register
+  <.ColormapRegistry.register>` instead
+- ``matplotlib.cm.unregister_cmap``; use `matplotlib.colormaps.unregister
+  <.ColormapRegistry.unregister>` instead
+- ``matplotlib.pyplot.register_cmap``; use `matplotlib.colormaps.register
+  <.ColormapRegistry.register>` instead
+
+The `matplotlib.pyplot.get_cmap` function will stay available for backward
+compatibility.
+
+Pending deprecation of layout methods
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The methods `~.Figure.set_tight_layout`, `~.Figure.set_constrained_layout`, are
+discouraged, and now emit a `PendingDeprecationWarning` in favor of explicitly
+referencing the layout engine via ``figure.set_layout_engine('tight')`` and
+``figure.set_layout_engine('constrained')``. End users should not see the
+warning, but library authors should adjust.
+
+The methods `~.Figure.set_constrained_layout_pads` and
+`~.Figure.get_constrained_layout_pads` are will be deprecated in favor of
+``figure.get_layout_engine().set()`` and ``figure.get_layout_engine().get()``,
+and currently emit a `PendingDeprecationWarning`.
+
+seaborn styles renamed
+~~~~~~~~~~~~~~~~~~~~~~
+
+Matplotlib currently ships many style files inspired from the seaborn library
+("seaborn", "seaborn-bright", "seaborn-colorblind", etc.) but they have gone
+out of sync with the library itself since the release of seaborn 0.9. To
+prevent confusion, the style files have been renamed "seaborn-v0_8",
+"seaborn-v0_8-bright", "seaborn-v0_8-colorblind", etc. Users are encouraged to
+directly use seaborn to access the up-to-date styles.
+
+Auto-removal of overlapping Axes by ``plt.subplot`` and ``plt.subplot2grid``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Previously, `.pyplot.subplot` and `.pyplot.subplot2grid` would automatically
+remove preexisting Axes that overlap with the newly added Axes. This behavior
+was deemed confusing, and is now deprecated. Explicitly call ``ax.remove()`` on
+Axes that need to be removed.
+
+Passing *linefmt* positionally to ``stem`` is undeprecated
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Positional use of all formatting parameters in `~.Axes.stem` has been
+deprecated since Matplotlib 3.5. This deprecation is relaxed so that one can
+still pass *linefmt* positionally, i.e. ``stem(x, y, 'r')``.
+
+``stem(..., use_line_collection=False)``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+... is deprecated with no replacement. This was a compatibility fallback to a
+former more inefficient representation of the stem lines.
+
+Positional / keyword arguments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Passing all but the very few first arguments positionally in the constructors
+of Artists is deprecated. Most arguments will become keyword-only in a future
+version.
+
+Passing too many positional arguments to ``tripcolor`` is now deprecated (extra
+arguments were previously silently ignored).
+
+Passing *emit* and *auto* parameters of ``set_xlim``, ``set_ylim``,
+``set_zlim``, ``set_rlim`` positionally is deprecated; they will become
+keyword-only in a future release.
+
+The *transOffset* parameter of `.Collection.set_offset_transform` and the
+various ``create_collection`` methods of legend handlers has been renamed to
+*offset_transform* (consistently with the property name).
+
+Calling ``MarkerStyle()`` with no arguments or ``MarkerStyle(None)`` is
+deprecated; use ``MarkerStyle("")`` to construct an empty marker style.
+
+``Axes.get_window_extent`` / ``Figure.get_window_extent`` accept only
+*renderer*. This aligns the API with the general `.Artist.get_window_extent`
+API. All other parameters were ignored anyway.
+
+The *cleared* parameter of ``get_renderer``, which only existed for AGG-based
+backends, has been deprecated. Use ``renderer.clear()`` instead to explicitly
+clear the renderer buffer.
+
+Methods to set parameters in ``LogLocator`` and ``LogFormatter*``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In `~.LogFormatter` and derived subclasses, the methods ``base`` and
+``label_minor`` for setting the respective parameter are deprecated and
+replaced by ``set_base`` and ``set_label_minor``, respectively.
+
+In `~.LogLocator`, the methods ``base`` and ``subs`` for setting the respective
+parameter are deprecated. Instead, use ``set_params(base=..., subs=...)``.
+
+``Axes.get_renderer_cache``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The canvas now takes care of the renderer and whether to cache it or not. The
+alternative is to call ``axes.figure.canvas.get_renderer()``.
+
+Groupers from ``get_shared_x_axes`` / ``get_shared_y_axes`` will be immutable
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Modifications to the Groupers returned by ``get_shared_x_axes`` and
+``get_shared_y_axes`` are deprecated. In the future, these methods will return
+immutable views on the grouper structures. Note that previously, calling e.g.
+``join()`` would already fail to set up the correct structures for sharing
+axes; use `.Axes.sharex` or `.Axes.sharey` instead.
+
+Unused methods in ``Axis``, ``Tick``, ``XAxis``, and ``YAxis``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``Tick.label`` has been pending deprecation since 3.1 and is now deprecated.
+Use ``Tick.label1`` instead.
+
+The following methods are no longer used and deprecated without a replacement:
+
+- ``Axis.get_ticklabel_extents``
+- ``Tick.get_pad_pixels``
+- ``XAxis.get_text_heights``
+- ``YAxis.get_text_widths``
+
+``mlab.stride_windows``
+~~~~~~~~~~~~~~~~~~~~~~~
+
+... is deprecated. Use ``np.lib.stride_tricks.sliding_window_view`` instead (or
+``np.lib.stride_tricks.as_strided`` on NumPy < 1.20).
+
+Event handlers
+~~~~~~~~~~~~~~
+
+The ``draw_event``, ``resize_event``, ``close_event``, ``key_press_event``,
+``key_release_event``, ``pick_event``, ``scroll_event``,
+``button_press_event``, ``button_release_event``, ``motion_notify_event``,
+``enter_notify_event`` and ``leave_notify_event`` methods of
+`.FigureCanvasBase` are deprecated. They had inconsistent signatures across
+backends, and made it difficult to improve event metadata.
+
+In order to trigger an event on a canvas, directly construct an `.Event` object
+of the correct class and call ``canvas.callbacks.process(event.name, event)``.
+
+Widgets
+~~~~~~~
+
+All parameters to ``MultiCursor`` starting from *useblit* are becoming
+keyword-only (passing them positionally is deprecated).
+
+The ``canvas`` and ``background`` attributes of ``MultiCursor`` are deprecated
+with no replacement.
+
+The *visible* attribute of Selector widgets has been deprecated; use
+``set_visible`` or ``get_visible`` instead.
+
+The *state_modifier_keys* attribute of Selector widgets has been privatized and
+the modifier keys must be set when creating the widget.
+
+``Axes3D.dist``
+~~~~~~~~~~~~~~~
+
+... has been privatized. Use the *zoom* keyword argument in
+`.Axes3D.set_box_aspect` instead.
+
+3D Axis
+~~~~~~~
+
+The previous constructor of `.axis3d.Axis`, with signature ``(self, adir,
+v_intervalx, d_intervalx, axes, *args, rotate_label=None, **kwargs)`` is
+deprecated in favor of a new signature closer to the one of 2D Axis; it is now
+``(self, axes, *, rotate_label=None, **kwargs)`` where ``kwargs`` are forwarded
+to the 2D Axis constructor. The axis direction is now inferred from the axis
+class' ``axis_name`` attribute (as in the 2D case); the ``adir`` attribute is
+deprecated.
+
+The ``init3d`` method of 3D Axis is also deprecated; all the relevant
+initialization is done as part of the constructor.
+
+The ``d_interval`` and ``v_interval`` attributes of 3D Axis are deprecated; use
+``get_data_interval`` and ``get_view_interval`` instead.
+
+The ``w_xaxis``, ``w_yaxis``, and ``w_zaxis`` attributes of ``Axis3D`` have
+been pending deprecation since 3.1. They are now deprecated. Instead use
+``xaxis``, ``yaxis``, and ``zaxis``.
+
+``mplot3d.axis3d.Axis.set_pane_pos`` is deprecated. This is an internal method
+where the provided values are overwritten during drawing. Hence, it does not
+serve any purpose to be directly accessible.
+
+The two helper functions ``mplot3d.axis3d.move_from_center`` and
+``mplot3d.axis3d.tick_update_position`` are considered internal and deprecated.
+If these are required, please vendor the code from the corresponding private
+methods ``_move_from_center`` and ``_tick_update_position``.
+
+``Figure.callbacks`` is deprecated
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The Figure ``callbacks`` property is deprecated. The only signal was
+"dpi_changed", which can be replaced by connecting to the "resize_event" on the
+canvas ``figure.canvas.mpl_connect("resize_event", func)`` instead.
+
+``FigureCanvas`` without a ``required_interactive_framework`` attribute
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Support for such canvas classes is deprecated. Note that canvas classes which
+inherit from ``FigureCanvasBase`` always have such an attribute.
+
+Backend-specific deprecations
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- ``backend_gtk3.FigureManagerGTK3Agg`` and
+  ``backend_gtk4.FigureManagerGTK4Agg``; directly use
+  ``backend_gtk3.FigureManagerGTK3`` and ``backend_gtk4.FigureManagerGTK4``
+  instead.
+- The *window* parameter to ``backend_gtk3.NavigationToolbar2GTK3`` had no
+  effect, and is now deprecated.
+- ``backend_gtk3.NavigationToolbar2GTK3.win``
+- ``backend_gtk3.RendererGTK3Cairo`` and ``backend_gtk4.RendererGTK4Cairo``;
+  use `.RendererCairo` instead, which has gained the ``set_context`` method,
+  which also auto-infers the size of the underlying surface.
+- ``backend_cairo.RendererCairo.set_ctx_from_surface`` and
+  ``backend_cairo.RendererCairo.set_width_height`` in favor of
+  `.RendererCairo.set_context`.
+- ``backend_gtk3.error_msg_gtk``
+- ``backend_gtk3.icon_filename`` and ``backend_gtk3.window_icon``
+- ``backend_macosx.NavigationToolbar2Mac.prepare_configure_subplots`` has been
+  replaced by ``configure_subplots()``.
+- ``backend_pdf.Name.hexify``
+- ``backend_pdf.Operator`` and ``backend_pdf.Op.op`` are deprecated in favor of
+  a single standard `enum.Enum` interface on `.backend_pdf.Op`.
+- ``backend_pdf.fill``; vendor the code of the similarly named private
+  functions if you rely on these functions.
+- ``backend_pgf.LatexManager.texcommand`` and
+  ``backend_pgf.LatexManager.latex_header``
+- ``backend_pgf.NO_ESCAPE``
+- ``backend_pgf.common_texification``
+- ``backend_pgf.get_fontspec``
+- ``backend_pgf.get_preamble``
+- ``backend_pgf.re_mathsep``
+- ``backend_pgf.writeln``
+- ``backend_ps.convert_psfrags``
+- ``backend_ps.quote_ps_string``; vendor the code of the similarly named
+  private functions if you rely on it.
+- ``backend_qt.qApp``; use ``QtWidgets.QApplication.instance()`` instead.
+- ``backend_svg.escape_attrib``; vendor the code of the similarly named private
+  functions if you rely on it.
+- ``backend_svg.escape_cdata``; vendor the code of the similarly named private
+  functions if you rely on it.
+- ``backend_svg.escape_comment``; vendor the code of the similarly named
+  private functions if you rely on it.
+- ``backend_svg.short_float_fmt``; vendor the code of the similarly named
+  private functions if you rely on it.
+- ``backend_svg.generate_transform`` and ``backend_svg.generate_css``
+- ``backend_tk.NavigationToolbar2Tk.lastrect`` and
+  ``backend_tk.RubberbandTk.lastrect``
+- ``backend_tk.NavigationToolbar2Tk.window``; use ``toolbar.master`` instead.
+- ``backend_tools.ToolBase.destroy``; To run code upon tool removal, connect to
+  the ``tool_removed_event`` event.
+- ``backend_wx.RendererWx.offset_text_height``
+- ``backend_wx.error_msg_wx``
+
+- ``FigureCanvasBase.pick``; directly call `.Figure.pick`, which has taken over
+  the responsibility of checking the canvas widget lock as well.
+- ``FigureCanvasBase.resize``, which has no effect; use
+  ``FigureManagerBase.resize`` instead.
+
+- ``FigureManagerMac.close``
+
+- ``FigureFrameWx.sizer``; use ``frame.GetSizer()`` instead.
+- ``FigureFrameWx.figmgr`` and ``FigureFrameWx.get_figure_manager``; use
+  ``frame.canvas.manager`` instead.
+- ``FigureFrameWx.num``; use ``frame.canvas.manager.num`` instead.
+- ``FigureFrameWx.toolbar``; use ``frame.GetToolBar()`` instead.
+- ``FigureFrameWx.toolmanager``; use ``frame.canvas.manager.toolmanager``
+  instead.
+
+Modules
+~~~~~~~
+
+The modules ``matplotlib.afm``, ``matplotlib.docstring``,
+``matplotlib.fontconfig_pattern``, ``matplotlib.tight_bbox``,
+``matplotlib.tight_layout``, and ``matplotlib.type1font`` are considered
+internal and public access is deprecated.
+
+``checkdep_usetex`` deprecated
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This method was only intended to disable tests in case no latex install was
+found. As such, it is considered to be private and for internal use only.
+
+Please vendor the code if you need this.
+
+``date_ticker_factory`` deprecated
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The ``date_ticker_factory`` method in the `matplotlib.dates` module is
+deprecated. Instead use `~.AutoDateLocator` and `~.AutoDateFormatter` for a
+more flexible and scalable locator and formatter.
+
+If you need the exact ``date_ticker_factory`` behavior, please copy the code.
+
+``dviread.find_tex_file`` will raise ``FileNotFoundError``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In the future, ``dviread.find_tex_file`` will raise a `FileNotFoundError` for
+missing files. Previously, it would return an empty string in such cases.
+Raising an exception allows attaching a user-friendly message instead. During
+the transition period, a warning is raised.
+
+``transforms.Affine2D.identity()``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+... is deprecated in favor of directly calling the `.Affine2D` constructor with
+no arguments.
+
+Deprecations in ``testing.decorators``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The unused class ``CleanupTestCase`` and decorator ``cleanup`` are deprecated
+and will be removed. Vendor the code, including the private function
+``_cleanup_cm``.
+
+The function ``check_freetype_version`` is considered internal and deprecated.
+Vendor the code of the private function ``_check_freetype_version``.
+
+``text.get_rotation()``
+~~~~~~~~~~~~~~~~~~~~~~~
+
+... is deprecated with no replacement. Copy the original implementation if
+needed.
+
+Miscellaneous internals
+~~~~~~~~~~~~~~~~~~~~~~~
+
+- ``axes_grid1.axes_size.AddList``; use ``sum(sizes, start=Fixed(0))`` (for
+  example) to sum multiple size objects.
+- ``axes_size.Padded``; use ``size + pad`` instead
+- ``axes_size.SizeFromFunc``, ``axes_size.GetExtentHelper``
+- ``AxisArtistHelper.delta1`` and ``AxisArtistHelper.delta2``
+- ``axislines.GridHelperBase.new_gridlines`` and
+  ``axislines.Axes.new_gridlines``
+- ``cbook.maxdict``; use the standard library ``functools.lru_cache`` instead.
+- ``_DummyAxis.dataLim`` and ``_DummyAxis.viewLim``; use
+  ``get_data_interval()``, ``set_data_interval()``, ``get_view_interval()``,
+  and ``set_view_interval()`` instead.
+- ``GridSpecBase.get_grid_positions(..., raw=True)``
+- ``ImageMagickBase.delay`` and ``ImageMagickBase.output_args``
+- ``MathtextBackend``, ``MathtextBackendAgg``, ``MathtextBackendPath``,
+  ``MathTextWarning``
+- ``TexManager.get_font_config``; it previously returned an internal hashed key
+  for used for caching purposes.
+- ``TextToPath.get_texmanager``; directly construct a `.texmanager.TexManager`
+  instead.
+- ``ticker.is_close_to_int``; use ``math.isclose(x, round(x))`` instead.
+- ``ticker.is_decade``; use ``y = numpy.log(x)/numpy.log(base);
+  numpy.isclose(y, numpy.round(y))`` instead.
diff --git a/doc/api/prev_api_changes/api_changes_3.6.0/development.rst b/doc/api/prev_api_changes/api_changes_3.6.0/development.rst
new file mode 100644
index 000000000000..fb9f1f3e21c5
--- /dev/null
+++ b/doc/api/prev_api_changes/api_changes_3.6.0/development.rst
@@ -0,0 +1,42 @@
+Development changes
+-------------------
+
+Increase to minimum supported versions of dependencies
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For Matplotlib 3.6, the :ref:`minimum supported versions <dependencies>` are
+being bumped:
+
++------------+-----------------+---------------+
+| Dependency |  min in mpl3.5  | min in mpl3.6 |
++============+=================+===============+
+|   Python   |       3.7       |      3.8      |
++------------+-----------------+---------------+
+|   NumPy    |       1.17      |      1.19     |
++------------+-----------------+---------------+
+
+This is consistent with our :ref:`min_deps_policy` and `NEP29
+<https://numpy.org/neps/nep-0029-deprecation_policy.html>`__
+
+Build setup options changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The ``gui_support.macosx`` setup option has been renamed to
+``packages.macosx``.
+
+New wheel architectures
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Wheels have been added for:
+
+- Python 3.11
+- PyPy 3.8 and 3.9
+
+Increase to required versions of documentation dependencies
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`sphinx`_ >= 3.0 and `numpydoc`_ >= 1.0 are now required for building the
+documentation.
+
+.. _numpydoc: https://pypi.org/project/numpydoc/
+.. _sphinx: https://pypi.org/project/Sphinx/
diff --git a/doc/api/prev_api_changes/api_changes_3.6.0/removals.rst b/doc/api/prev_api_changes/api_changes_3.6.0/removals.rst
new file mode 100644
index 000000000000..60b1771eea09
--- /dev/null
+++ b/doc/api/prev_api_changes/api_changes_3.6.0/removals.rst
@@ -0,0 +1,222 @@
+Removals
+--------
+
+The following deprecated APIs have been removed:
+
+Removed behaviour
+~~~~~~~~~~~~~~~~~
+
+Stricter validation of function parameters
+..........................................
+
+- Unknown keyword arguments to `.Figure.savefig`, `.pyplot.savefig`, and the
+  ``FigureCanvas.print_*`` methods now raise a `TypeError`, instead of being
+  ignored.
+- Extra parameters to the `~.axes.Axes` constructor, i.e., those other than
+  *fig* and *rect*, are now keyword only.
+- Passing arguments not specifically listed in the signatures of
+  `.Axes3D.plot_surface` and `.Axes3D.plot_wireframe` is no longer supported;
+  pass any extra arguments as keyword arguments instead.
+- Passing positional arguments to `.LineCollection` has been removed; use
+  specific keyword argument names now.
+
+``imread`` no longer accepts URLs
+.................................
+
+Passing a URL to `~.pyplot.imread()` has been removed. Please open the URL for
+reading and directly use the Pillow API (e.g.,
+``PIL.Image.open(urllib.request.urlopen(url))``, or
+``PIL.Image.open(io.BytesIO(requests.get(url).content))``) instead.
+
+MarkerStyle is immutable
+........................
+
+The methods ``MarkerStyle.set_fillstyle`` and ``MarkerStyle.set_marker`` have
+been removed. Create a new `.MarkerStyle` with the respective parameters
+instead.
+
+Passing bytes to ``FT2Font.set_text``
+.....................................
+
+... is no longer supported. Pass `str` instead.
+
+Support for passing tool names to ``ToolManager.add_tool``
+..........................................................
+
+... has been removed.  The second parameter to `.ToolManager.add_tool` must now
+always be a tool class.
+
+``backend_tools.ToolFullScreen`` now inherits from ``ToolBase``, not from ``ToolToggleBase``
+............................................................................................
+
+`.ToolFullScreen` can only switch between the non-fullscreen and fullscreen
+states, but not unconditionally put the window in a given state; hence the
+``enable`` and ``disable`` methods were misleadingly named.  Thus, the
+`.ToolToggleBase`-related API (``enable``, ``disable``, etc.) was removed.
+
+``BoxStyle._Base`` and ``transmute`` method of box styles
+.........................................................
+
+... have been removed.  Box styles implemented as classes no longer need to
+inherit from a base class.
+
+Loaded modules logging
+......................
+
+The list of currently loaded modules is no longer logged at the DEBUG level at
+Matplotlib import time, because it can produce extensive output and make other
+valuable DEBUG statements difficult to find. If you were relying on this
+output, please arrange for your own logging (the built-in `sys.modules` can be
+used to get the currently loaded modules).
+
+Modules
+~~~~~~~
+
+- The ``cbook.deprecation`` module has been removed from the public API as it
+  is considered internal.
+- The ``mpl_toolkits.axes_grid`` module has been removed. All functionality from
+  ``mpl_toolkits.axes_grid`` can be found in either `mpl_toolkits.axes_grid1`
+  or `mpl_toolkits.axisartist`. Axes classes from ``mpl_toolkits.axes_grid``
+  based on ``Axis`` from `mpl_toolkits.axisartist` can be found in
+  `mpl_toolkits.axisartist`.
+
+Classes, methods and attributes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The following module-level classes/variables have been removed:
+
+- ``cm.cmap_d``
+- ``colorbar.colorbar_doc``, ``colorbar.colorbar_kw_doc``
+- ``ColorbarPatch``
+- ``mathtext.Fonts`` and all its subclasses
+- ``mathtext.FontConstantsBase`` and all its subclasses
+- ``mathtext.latex_to_bakoma``, ``mathtext.latex_to_cmex``,
+  ``mathtext.latex_to_standard``
+- ``mathtext.MathtextBackendPdf``, ``mathtext.MathtextBackendPs``,
+  ``mathtext.MathtextBackendSvg``, ``mathtext.MathtextBackendCairo``; use
+  `.MathtextBackendPath` instead.
+- ``mathtext.Node`` and all its subclasses
+- ``mathtext.NUM_SIZE_LEVELS``
+- ``mathtext.Parser``
+- ``mathtext.Ship``
+- ``mathtext.SHRINK_FACTOR`` and ``mathtext.GROW_FACTOR``
+- ``mathtext.stix_virtual_fonts``,
+- ``mathtext.tex2uni``
+- ``backend_pgf.TmpDirCleaner``
+- ``backend_ps.GraphicsContextPS``; use ``GraphicsContextBase`` instead.
+- ``backend_wx.IDLE_DELAY``
+- ``axes_grid1.parasite_axes.ParasiteAxesAuxTransBase``; use
+  `.ParasiteAxesBase` instead.
+- ``axes_grid1.parasite_axes.ParasiteAxesAuxTrans``; use `.ParasiteAxes`
+  instead.
+
+The following class attributes have been removed:
+
+- ``Line2D.validCap`` and ``Line2D.validJoin``; validation is centralized in
+  ``rcsetup``.
+- ``Patch.validCap`` and ``Patch.validJoin``; validation is centralized in
+  ``rcsetup``.
+- ``renderer.M``, ``renderer.eye``, ``renderer.vvec``,
+  ``renderer.get_axis_position`` placed on the Renderer during 3D Axes draw;
+  these attributes are all available via `.Axes3D`, which can be accessed via
+  ``self.axes`` on all `.Artist`\s.
+- ``RendererPdf.mathtext_parser``, ``RendererPS.mathtext_parser``,
+  ``RendererSVG.mathtext_parser``, ``RendererCairo.mathtext_parser``
+- ``StandardPsFonts.pswriter``
+- ``Subplot.figbox``; use `.Axes.get_position` instead.
+- ``Subplot.numRows``; ``ax.get_gridspec().nrows`` instead.
+- ``Subplot.numCols``; ``ax.get_gridspec().ncols`` instead.
+- ``SubplotDivider.figbox``
+- ``cids``, ``cnt``, ``observers``, ``change_observers``, and
+  ``submit_observers`` on all `.Widget`\s
+
+The following class methods have been removed:
+
+- ``Axis.cla()``; use `.Axis.clear` instead.
+- ``RadialAxis.cla()`` and ``ThetaAxis.cla()``; use `.RadialAxis.clear` or
+  `.ThetaAxis.clear` instead.
+- ``Spine.cla()``; use `.Spine.clear` instead.
+- ``ContourLabeler.get_label_coords()``; there is no replacement as it was
+  considered an internal helper.
+- ``FancyArrowPatch.get_dpi_cor`` and ``FancyArrowPatch.set_dpi_cor``
+
+- ``FigureCanvas.get_window_title()`` and ``FigureCanvas.set_window_title()``;
+  use `.FigureManagerBase.get_window_title` or
+  `.FigureManagerBase.set_window_title` if using pyplot, or use GUI-specific
+  methods if embedding.
+- ``FigureManager.key_press()`` and ``FigureManager.button_press()``; trigger
+  the events directly on the canvas using
+  ``canvas.callbacks.process(event.name, event)`` for key and button events.
+
+- ``RendererAgg.get_content_extents()`` and
+  ``RendererAgg.tostring_rgba_minimized()``
+- ``NavigationToolbar2Wx.get_canvas()``
+
+- ``ParasiteAxesBase.update_viewlim()``; use `.ParasiteAxesBase.apply_aspect`
+  instead.
+- ``Subplot.get_geometry()``; use `.SubplotBase.get_subplotspec` instead.
+- ``Subplot.change_geometry()``; use `.SubplotBase.set_subplotspec` instead.
+- ``Subplot.update_params()``; this method did nothing.
+- ``Subplot.is_first_row()``; use ``ax.get_subplotspec().is_first_row``
+  instead.
+- ``Subplot.is_first_col()``; use ``ax.get_subplotspec().is_first_col``
+  instead.
+- ``Subplot.is_last_row()``; use ``ax.get_subplotspec().is_last_row`` instead.
+- ``Subplot.is_last_col()``; use ``ax.get_subplotspec().is_last_col`` instead.
+- ``SubplotDivider.change_geometry()``; use `.SubplotDivider.set_subplotspec`
+  instead.
+- ``SubplotDivider.get_geometry()``; use `.SubplotDivider.get_subplotspec`
+  instead.
+- ``SubplotDivider.update_params()``
+- ``get_depth``, ``parse``, ``to_mask``, ``to_rgba``, and ``to_png`` of
+  `.MathTextParser`; use `.mathtext.math_to_image` instead.
+
+- ``MovieWriter.cleanup()``; the cleanup logic is instead fully implemented in
+  `.MovieWriter.finish` and ``cleanup`` is no longer called.
+
+Functions
+~~~~~~~~~
+
+The following functions have been removed;
+
+- ``backend_template.new_figure_manager()``,
+  ``backend_template.new_figure_manager_given_figure()``, and
+  ``backend_template.draw_if_interactive()`` have been removed, as part of the
+  introduction of the simplified backend API.
+- Deprecation-related re-imports ``cbook.deprecated()``, and
+  ``cbook.warn_deprecated()``.
+- ``colorbar.colorbar_factory()``; use `.Colorbar` instead.
+  ``colorbar.make_axes_kw_doc()``
+- ``mathtext.Error()``
+- ``mathtext.ship()``
+- ``mathtext.tex2uni()``
+- ``axes_grid1.parasite_axes.parasite_axes_auxtrans_class_factory()``; use
+  `.parasite_axes_class_factory` instead.
+- ``sphinext.plot_directive.align()``; use
+  ``docutils.parsers.rst.directives.images.Image.align`` instead.
+
+Arguments
+~~~~~~~~~
+
+The following arguments have been removed:
+
+- *dpi* from ``print_ps()`` in the PS backend and ``print_pdf()`` in the PDF
+  backend. Instead, the methods will obtain the DPI from the ``savefig``
+  machinery.
+- *dpi_cor* from `~.FancyArrowPatch`
+- *minimum_descent* from ``TextArea``; it is now effectively always True
+- *origin* from ``FigureCanvasWx.gui_repaint()``
+- *project* from ``Line3DCollection.draw()``
+- *renderer* from `.Line3DCollection.do_3d_projection`,
+  `.Patch3D.do_3d_projection`, `.PathPatch3D.do_3d_projection`,
+  `.Path3DCollection.do_3d_projection`, `.Patch3DCollection.do_3d_projection`,
+  `.Poly3DCollection.do_3d_projection`
+- *resize_callback* from the Tk backend; use
+  ``get_tk_widget().bind('<Configure>', ..., True)`` instead.
+- *return_all* from ``gridspec.get_position()``
+- Keyword arguments to ``gca()``; there is no replacement.
+
+rcParams
+~~~~~~~~
+
+The setting :rc:`ps.useafm` no longer has any effect on `matplotlib.mathtext`.
diff --git a/doc/api/prev_api_changes/api_changes_3.6.1.rst b/doc/api/prev_api_changes/api_changes_3.6.1.rst
new file mode 100644
index 000000000000..ad929d426885
--- /dev/null
+++ b/doc/api/prev_api_changes/api_changes_3.6.1.rst
@@ -0,0 +1,15 @@
+API Changes for 3.6.1
+=====================
+
+Deprecations
+------------
+
+Colorbars for orphaned mappables are deprecated, but no longer raise
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Before 3.6.0, Colorbars for mappables that do not have a parent Axes would
+steal space from the current Axes. 3.6.0 raised an error on this, but without a
+deprecation cycle. For 3.6.1 this is reverted; the current Axes is used, but a
+deprecation warning is shown instead. In this undetermined case, users and
+libraries should explicitly specify what Axes they want space to be stolen
+from: ``fig.colorbar(mappable, ax=plt.gca())``.
diff --git a/doc/api/projections_api.rst b/doc/api/projections_api.rst
index e7c807957925..ff12a2be8623 100644
--- a/doc/api/projections_api.rst
+++ b/doc/api/projections_api.rst
@@ -6,11 +6,16 @@
    :members:
    :show-inheritance:
 
-
-********************************
 ``matplotlib.projections.polar``
-********************************
+================================
 
 .. automodule:: matplotlib.projections.polar
    :members:
    :show-inheritance:
+
+``matplotlib.projections.geo``
+==============================
+
+.. automodule:: matplotlib.projections.geo
+   :members:
+   :show-inheritance:
diff --git a/doc/api/pyplot_summary.rst b/doc/api/pyplot_summary.rst
index f3f4c88b78e8..d329d495709c 100644
--- a/doc/api/pyplot_summary.rst
+++ b/doc/api/pyplot_summary.rst
@@ -2,31 +2,185 @@
 ``matplotlib.pyplot``
 *********************
 
-Pyplot function overview
-------------------------
+.. currentmodule:: matplotlib.pyplot
+
+.. automodule:: matplotlib.pyplot
+   :no-members:
+   :no-undoc-members:
 
-.. currentmodule:: matplotlib
+
+Plotting commands
+-----------------
 
 .. autosummary::
    :toctree: _as_gen
-   :template: autofunctions.rst
+   :template: autosummary.rst
+   :nosignatures:
 
-   pyplot
+   acorr
+   angle_spectrum
+   annotate
+   arrow
+   autoscale
+   axes
+   axhline
+   axhspan
+   axis
+   axline
+   axvline
+   axvspan
+   bar
+   bar_label
+   barbs
+   barh
+   box
+   boxplot
+   broken_barh
+   cla
+   clabel
+   clf
+   clim
+   close
+   cohere
+   colorbar
+   contour
+   contourf
+   csd
+   delaxes
+   draw
+   draw_if_interactive
+   errorbar
+   eventplot
+   figimage
+   figlegend
+   fignum_exists
+   figtext
+   figure
+   fill
+   fill_between
+   fill_betweenx
+   findobj
+   gca
+   gcf
+   gci
+   get
+   get_cmap
+   get_figlabels
+   get_fignums
+   getp
+   grid
+   hexbin
+   hist
+   hist2d
+   hlines
+   imread
+   imsave
+   imshow
+   install_repl_displayhook
+   ioff
+   ion
+   isinteractive
+   legend
+   locator_params
+   loglog
+   magnitude_spectrum
+   margins
+   matshow
+   minorticks_off
+   minorticks_on
+   pause
+   pcolor
+   pcolormesh
+   phase_spectrum
+   pie
+   plot
+   plot_date
+   polar
+   psd
+   quiver
+   quiverkey
+   rc
+   rc_context
+   rcdefaults
+   rgrids
+   savefig
+   sca
+   scatter
+   sci
+   semilogx
+   semilogy
+   set_cmap
+   set_loglevel
+   setp
+   show
+   specgram
+   spy
+   stackplot
+   stairs
+   stem
+   step
+   streamplot
+   subplot
+   subplot2grid
+   subplot_mosaic
+   subplot_tool
+   subplots
+   subplots_adjust
+   suptitle
+   switch_backend
+   table
+   text
+   thetagrids
+   tick_params
+   ticklabel_format
+   tight_layout
+   title
+   tricontour
+   tricontourf
+   tripcolor
+   triplot
+   twinx
+   twiny
+   uninstall_repl_displayhook
+   violinplot
+   vlines
+   xcorr
+   xkcd
+   xlabel
+   xlim
+   xscale
+   xticks
+   ylabel
+   ylim
+   yscale
+   yticks
 
-.. currentmodule:: matplotlib.pyplot
 
-.. autofunction:: plotting
+Other commands
+--------------
+.. autosummary::
+   :toctree: _as_gen
+   :template: autosummary.rst
+   :nosignatures:
 
+   connect
+   disconnect
+   get_current_fig_manager
+   ginput
+   new_figure_manager
+   waitforbuttonpress
 
-Colors in Matplotlib
---------------------
 
-There are many colormaps you can use to map data onto color values.
-Below we list several ways in which color can be utilized in Matplotlib.
+Colormaps
+---------
+Colormaps are available via the colormap registry `matplotlib.colormaps`. For
+convenience this registry is available in ``pyplot`` as
 
-For a more in-depth look at colormaps, see the
-:doc:`/tutorials/colors/colormaps` tutorial.
+.. autodata:: colormaps
+   :no-value:
 
-.. currentmodule:: matplotlib.pyplot
+Additionally, there are shortcut functions to set builtin colormaps; e.g.
+``plt.viridis()`` is equivalent to ``plt.set_cmap('viridis')``.
 
-.. autofunction:: colormaps
+.. autodata:: color_sequences
+   :no-value:
diff --git a/doc/api/sphinxext_mathmpl_api.rst b/doc/api/sphinxext_mathmpl_api.rst
new file mode 100644
index 000000000000..839334ca39fe
--- /dev/null
+++ b/doc/api/sphinxext_mathmpl_api.rst
@@ -0,0 +1,7 @@
+================================
+``matplotlib.sphinxext.mathmpl``
+================================
+
+.. automodule:: matplotlib.sphinxext.mathmpl
+   :exclude-members: latex_math
+   :no-undoc-members:
diff --git a/doc/api/text_api.rst b/doc/api/text_api.rst
index c88d45f2832b..8bed3173ebdb 100644
--- a/doc/api/text_api.rst
+++ b/doc/api/text_api.rst
@@ -3,6 +3,19 @@
 *******************
 
 .. automodule:: matplotlib.text
+   :no-members:
+
+.. autoclass:: matplotlib.text.Text
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+.. autoclass:: matplotlib.text.Annotation
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+.. autoclass:: matplotlib.text.OffsetFrom
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/doc/api/tight_bbox_api.rst b/doc/api/tight_bbox_api.rst
index 3a96b5b6d027..9e8dd2fa66f9 100644
--- a/doc/api/tight_bbox_api.rst
+++ b/doc/api/tight_bbox_api.rst
@@ -2,7 +2,12 @@
 ``matplotlib.tight_bbox``
 *************************
 
-.. automodule:: matplotlib.tight_bbox
+.. attention::
+    This module is considered internal.
+
+    Its use is deprecated and it will be removed in a future version.
+
+.. automodule:: matplotlib._tight_bbox
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/doc/api/tight_layout_api.rst b/doc/api/tight_layout_api.rst
index 1f1a32281aa0..35f92e3ddced 100644
--- a/doc/api/tight_layout_api.rst
+++ b/doc/api/tight_layout_api.rst
@@ -2,7 +2,12 @@
 ``matplotlib.tight_layout``
 ***************************
 
-.. automodule:: matplotlib.tight_layout
+.. attention::
+    This module is considered internal.
+
+    Its use is deprecated and it will be removed in a future version.
+
+.. automodule:: matplotlib._tight_layout
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/doc/api/toolkits/axes_grid.rst b/doc/api/toolkits/axes_grid.rst
deleted file mode 100644
index 991b0ff6813a..000000000000
--- a/doc/api/toolkits/axes_grid.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-.. _axes_grid-api-index:
-
-Matplotlib axes_grid Toolkit
-============================
-
-.. currentmodule:: mpl_toolkits
-
-
-.. note::
-   AxesGrid toolkit has been a part of matplotlib since v
-   0.99. Originally, the toolkit had a single namespace of
-   *axes_grid*. In more recent version, the toolkit
-   has divided into two separate namespace (*axes_grid1* and *axisartist*).
-   While *axes_grid* namespace is maintained for the backward compatibility,
-   use of *axes_grid1* and *axisartist* is recommended. 
-   For the documentation on ``axes_grid``,
-   see the `previous version of the docs 
-   <https://matplotlib.org/2.0.1/mpl_toolkits/axes_grid/index.html#toolkit-axesgrid-index>`_.
-
-.. toctree::
-    :maxdepth: 1
-    
-    axes_grid1
-    axisartist
-
-
diff --git a/doc/api/toolkits/axes_grid1.rst b/doc/api/toolkits/axes_grid1.rst
index 3abbaf8f22c0..c48a6a31af90 100644
--- a/doc/api/toolkits/axes_grid1.rst
+++ b/doc/api/toolkits/axes_grid1.rst
@@ -1,13 +1,14 @@
 .. module:: mpl_toolkits.axes_grid1
 
-Matplotlib axes_grid1 Toolkit
-=============================
+.. redirect-from:: /api/toolkits/axes_grid
 
-The matplotlib :mod:`mpl_toolkits.axes_grid1` toolkit is a collection of
-helper classes to ease displaying multiple images in matplotlib.  While the
-aspect parameter in matplotlib adjust the position of the single axes,
-axes_grid1 toolkit provides a framework to adjust the position of
-multiple axes according to their aspects.
+``mpl_toolkits.axes_grid1``
+===========================
+
+:mod:`mpl_toolkits.axes_grid1` provides a framework of helper classes to adjust
+the positioning of multiple fixed-aspect Axes (e.g., displaying images).  It
+can be contrasted with the ``aspect`` property of Matplotlib Axes, which
+adjusts the position of a single Axes.
 
 See :ref:`axes_grid1_users-guide-index` for a guide on the usage of axes_grid1.
 
@@ -16,6 +17,13 @@ See :ref:`axes_grid1_users-guide-index` for a guide on the usage of axes_grid1.
    :align: center
    :scale: 50
 
+.. note::
+
+   This module contains classes and function that were formerly part of the
+   ``mpl_toolkits.axes_grid`` module that was removed in 3.6. Additional
+   classes from that older module may also be found in
+   `mpl_toolkits.axisartist`.
+
 .. currentmodule:: mpl_toolkits
 
 **The submodules of the axes_grid1 API are:**
@@ -32,5 +40,3 @@ See :ref:`axes_grid1_users-guide-index` for a guide on the usage of axes_grid1.
    axes_grid1.inset_locator
    axes_grid1.mpl_axes
    axes_grid1.parasite_axes
-
-
diff --git a/doc/api/toolkits/axisartist.rst b/doc/api/toolkits/axisartist.rst
index f18246fef128..8b7db9b7a9fe 100644
--- a/doc/api/toolkits/axisartist.rst
+++ b/doc/api/toolkits/axisartist.rst
@@ -1,15 +1,15 @@
 .. module:: mpl_toolkits.axisartist
 
-Matplotlib axisartist Toolkit
-=============================
+``mpl_toolkits.axisartist``
+===========================
 
-The *axisartist* namespace includes a derived Axes implementation (
-:class:`mpl_toolkits.axisartist.Axes`). The
-biggest difference is that the artists that are responsible for drawing
-axis lines, ticks, ticklabels, and axis labels are separated out from the
-mpl's Axis class. This change was strongly motivated to support curvilinear grid.
+The *axisartist* namespace provides a derived Axes implementation
+(:class:`mpl_toolkits.axisartist.Axes`), designed to support curvilinear
+grids.  The biggest difference is that the artists that are responsible for
+drawing axis lines, ticks, ticklabels, and axis labels are separated out from
+Matplotlib's Axis class.
 
-You can find a tutorial describing usage of axisartist at the 
+You can find a tutorial describing usage of axisartist at the
 :ref:`axisartist_users-guide-index` user guide.
 
 .. figure:: ../../gallery/axisartist/images/sphx_glr_demo_curvelinear_grid_001.png
@@ -17,6 +17,13 @@ You can find a tutorial describing usage of axisartist at the
    :align: center
    :scale: 50
 
+.. note::
+
+   This module contains classes and function that were formerly part of the
+   ``mpl_toolkits.axes_grid`` module that was removed in 3.6. Additional
+   classes from that older module may also be found in
+   `mpl_toolkits.axes_grid1`.
+
 .. currentmodule:: mpl_toolkits
 
 **The submodules of the axisartist API are:**
@@ -37,4 +44,3 @@ You can find a tutorial describing usage of axisartist at the
    axisartist.grid_finder
    axisartist.grid_helper_curvelinear
    axisartist.parasite_axes
-
diff --git a/doc/api/toolkits/index.rst b/doc/api/toolkits/index.rst
deleted file mode 100644
index 59c01ab21a69..000000000000
--- a/doc/api/toolkits/index.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-.. _toolkits-index:
-
-.. _toolkits:
-
-########
-Toolkits
-########
-
-Toolkits are collections of application-specific functions that extend
-Matplotlib.
-
-.. _toolkit_mplot3d:
-
-mplot3d
-=======
-
-:mod:`mpl_toolkits.mplot3d` provides some basic 3D
-plotting (scatter, surf, line, mesh) tools.  Not the fastest or most feature
-complete 3D library out there, but it ships with Matplotlib and thus may be a
-lighter weight solution for some use cases. Check out the
-:doc:`mplot3d tutorial </tutorials/toolkits/mplot3d>` for more
-information.
-
-.. figure:: ../../gallery/mplot3d/images/sphx_glr_contourf3d_2_001.png
-   :target: ../../gallery/mplot3d/contourf3d_2.html
-   :align: center
-   :scale: 50
-
-.. toctree::
-    :maxdepth: 2
-
-    mplot3d/index.rst
-    mplot3d/faq.rst
-
-Links
------
-* mpl3d API: :ref:`toolkit_mplot3d-api`
-
-.. include:: axes_grid1.rst
-   :start-line: 1
-
-.. include:: axisartist.rst
-   :start-line: 1
-
-.. include:: axes_grid.rst
-   :start-line: 1
diff --git a/doc/api/toolkits/mplot3d.rst b/doc/api/toolkits/mplot3d.rst
index 97d3bf13246f..19005ddd383d 100644
--- a/doc/api/toolkits/mplot3d.rst
+++ b/doc/api/toolkits/mplot3d.rst
@@ -1,8 +1,34 @@
-.. _toolkit_mplot3d-api:
+.. _toolkit_mplot3d-index:
+.. currentmodule:: mpl_toolkits.mplot3d
+
+************************
+``mpl_toolkits.mplot3d``
+************************
+
+The mplot3d toolkit adds simple 3D plotting capabilities (scatter, surface,
+line, mesh, etc.) to Matplotlib by supplying an Axes object that can create
+a 2D projection of a 3D scene.  The resulting graph will have the same look
+and feel as regular 2D plots.  Not the fastest or most feature complete 3D
+library out there, but it ships with Matplotlib and thus may be a lighter
+weight solution for some use cases.
+
+See the :doc:`mplot3d tutorial </tutorials/toolkits/mplot3d>` for
+more information.
+
+.. image:: /_static/demo_mplot3d.png
+   :align: center
+
+The interactive backends also provide the ability to rotate and zoom the 3D
+scene.  One can rotate the 3D scene by simply clicking-and-dragging the scene.
+Panning is done by clicking the middle mouse button, and zooming is done by
+right-clicking the scene and dragging the mouse up and down. Unlike 2D plots,
+the toolbar pan and zoom buttons are not used.
+
+.. toctree::
+   :maxdepth: 2
 
-***********
-mplot3d API
-***********
+   mplot3d/faq.rst
+   mplot3d/view_angles.rst
 
 .. note::
    `.pyplot` cannot be used to add content to 3D plots, because its function
diff --git a/doc/api/toolkits/mplot3d/faq.rst b/doc/api/toolkits/mplot3d/faq.rst
index dfc23b55e069..7e53cabc6e9a 100644
--- a/doc/api/toolkits/mplot3d/faq.rst
+++ b/doc/api/toolkits/mplot3d/faq.rst
@@ -49,4 +49,3 @@ Work is being done to eliminate this issue. For matplotlib v1.1.0, there is
 a semi-official manner to modify these parameters. See the note in the
 :mod:`.mplot3d.axis3d` section of the mplot3d API documentation for
 more information.
-
diff --git a/doc/api/toolkits/mplot3d/index.rst b/doc/api/toolkits/mplot3d/index.rst
deleted file mode 100644
index 8b153c06903f..000000000000
--- a/doc/api/toolkits/mplot3d/index.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-.. _toolkit_mplot3d-index:
-.. currentmodule:: mpl_toolkits.mplot3d
-
-*******
-mplot3d
-*******
-
-Matplotlib mplot3d toolkit
-==========================
-The mplot3d toolkit adds simple 3D plotting capabilities to matplotlib by
-supplying an axes object that can create a 2D projection of a 3D scene.
-The resulting graph will have the same look and feel as regular 2D plots.
-
-See the :doc:`mplot3d tutorial </tutorials/toolkits/mplot3d>` for
-more information on how to use this toolkit.
-
-.. image:: /_static/demo_mplot3d.png
-
-The interactive backends also provide the ability to rotate and zoom
-the 3D scene. One can rotate the 3D scene by simply clicking-and-dragging
-the scene. Zooming is done by right-clicking the scene and dragging the
-mouse up and down. Note that one does not use the zoom button like one
-would use for regular 2D plots.
-
-.. toctree::
-    :maxdepth: 2
-
-    faq.rst
diff --git a/doc/api/toolkits/mplot3d/view_angles.rst b/doc/api/toolkits/mplot3d/view_angles.rst
new file mode 100644
index 000000000000..10d4fac39e8c
--- /dev/null
+++ b/doc/api/toolkits/mplot3d/view_angles.rst
@@ -0,0 +1,40 @@
+.. _toolkit_mplot3d-view-angles:
+
+*******************
+mplot3d View Angles
+*******************
+
+How to define the view angle
+============================
+
+The position of the viewport "camera" in a 3D plot is defined by three angles:
+*elevation*, *azimuth*, and *roll*. From the resulting position, it always
+points towards the center of the plot box volume. The angle direction is a
+common convention, and is shared with
+`PyVista <https://docs.pyvista.org/api/core/camera.html>`_ and
+`MATLAB <https://www.mathworks.com/help/matlab/ref/view.html>`_
+(though MATLAB lacks a roll angle). Note that a positive roll angle rotates the
+viewing plane clockwise, so the 3d axes will appear to rotate
+counter-clockwise.
+
+.. image:: /_static/mplot3d_view_angles.png
+   :align: center
+   :scale: 50
+
+Rotating the plot using the mouse will control only the azimuth and elevation,
+but all three angles can be set programmatically::
+
+    import matplotlib.pyplot as plt
+    ax = plt.figure().add_subplot(projection='3d')
+    ax.view_init(elev=30, azim=45, roll=15)
+
+
+Primary view planes
+===================
+
+To look directly at the primary view planes, the required elevation, azimuth,
+and roll angles are shown in the diagram of an "unfolded" plot below. These are
+further documented in the `.mplot3d.axes3d.Axes3D.view_init` API.
+
+.. plot:: gallery/mplot3d/view_planes_3d.py
+   :align: center
diff --git a/doc/api/transformations.rst b/doc/api/transformations.rst
index 58c29598704c..186db9aea728 100644
--- a/doc/api/transformations.rst
+++ b/doc/api/transformations.rst
@@ -2,7 +2,7 @@
 ``matplotlib.transforms``
 *************************
 
-.. inheritance-diagram:: matplotlib.transforms matplotlib.path
+.. inheritance-diagram:: matplotlib.transforms
    :parts: 1
 
 .. automodule:: matplotlib.transforms
@@ -15,4 +15,3 @@
        interval_contains, interval_contains_open
    :show-inheritance:
    :special-members:
-
diff --git a/doc/api/tri_api.rst b/doc/api/tri_api.rst
index 9205e34ff93b..0b4e046eec08 100644
--- a/doc/api/tri_api.rst
+++ b/doc/api/tri_api.rst
@@ -2,7 +2,9 @@
 ``matplotlib.tri``
 ******************
 
-.. automodule:: matplotlib.tri
+Unstructured triangular grid functions.
+
+.. py:module:: matplotlib.tri
 
 .. autoclass:: matplotlib.tri.Triangulation
     :members:
@@ -17,7 +19,7 @@
     :show-inheritance:
 
 .. autoclass:: matplotlib.tri.TriInterpolator
-   
+
 .. autoclass:: matplotlib.tri.LinearTriInterpolator
     :members: __call__, gradient
     :show-inheritance:
@@ -30,7 +32,7 @@
 
 .. autoclass:: matplotlib.tri.UniformTriRefiner
     :show-inheritance:
-    :members: 
+    :members:
 
 .. autoclass:: matplotlib.tri.TriAnalyzer
-    :members: 
+    :members:
diff --git a/doc/api/type1font.rst b/doc/api/type1font.rst
index 2cb2a68eb5d5..00ef38f4d447 100644
--- a/doc/api/type1font.rst
+++ b/doc/api/type1font.rst
@@ -2,7 +2,12 @@
 ``matplotlib.type1font``
 ************************
 
-.. automodule:: matplotlib.type1font
+.. attention::
+    This module is considered internal.
+
+    Its use is deprecated and it will be removed in a future version.
+
+.. automodule:: matplotlib._type1font
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/doc/citing.rst b/doc/citing.rst
deleted file mode 100644
index 7d5840925276..000000000000
--- a/doc/citing.rst
+++ /dev/null
@@ -1,141 +0,0 @@
-:orphan:
-
-Citing Matplotlib
-=================
-
-If Matplotlib contributes to a project that leads to a scientific publication,
-please acknowledge this fact by citing `J. D. Hunter, "Matplotlib: A 2D
-Graphics Environment", Computing in Science & Engineering, vol. 9, no. 3,
-pp. 90-95, 2007 <https://doi.org/10.1109/MCSE.2007.55>`_.
-
-.. literalinclude:: MCSE.2007.55.bib
-   :language: bibtex
-   
-.. container:: sphx-glr-download
-
-   :download:`Download BibTeX bibliography file: MCSE.2007.55.bib <MCSE.2007.55.bib>`
-
-DOIs
-----
-
-The following DOI represents *all* Matplotlib versions. Please select a more
-specific DOI from the list below, referring to the version used for your publication.
-
-   .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.592536.svg
-      :target: https://doi.org/10.5281/zenodo.592536
-
-By version
-~~~~~~~~~~
-.. START OF AUTOGENERATED
-
-
-v3.3.4
-   .. image:: _static/zenodo_cache/4475376.svg
-      :target:  https://doi.org/10.5281/zenodo.4475376
-v3.3.3
-   .. image:: _static/zenodo_cache/4268928.svg
-      :target:  https://doi.org/10.5281/zenodo.4268928
-v3.3.2
-   .. image:: _static/zenodo_cache/4030140.svg
-      :target:  https://doi.org/10.5281/zenodo.4030140
-v3.3.1
-   .. image:: _static/zenodo_cache/3984190.svg
-      :target:  https://doi.org/10.5281/zenodo.3984190
-v3.3.0
-   .. image:: _static/zenodo_cache/3948793.svg
-      :target:  https://doi.org/10.5281/zenodo.3948793
-v3.2.2
-   .. image:: _static/zenodo_cache/3898017.svg
-      :target:  https://doi.org/10.5281/zenodo.3898017
-v3.2.1
-   .. image:: _static/zenodo_cache/3714460.svg
-      :target:  https://doi.org/10.5281/zenodo.3714460
-v3.2.0
-   .. image:: _static/zenodo_cache/3695547.svg
-      :target:  https://doi.org/10.5281/zenodo.3695547
-v3.1.3
-   .. image:: _static/zenodo_cache/3633844.svg
-      :target:  https://doi.org/10.5281/zenodo.3633844
-v3.1.2
-   .. image:: _static/zenodo_cache/3563226.svg
-      :target:  https://doi.org/10.5281/zenodo.3563226
-v3.1.1
-   .. image:: _static/zenodo_cache/3264781.svg
-      :target:  https://doi.org/10.5281/zenodo.3264781
-v3.1.0
-   .. image:: _static/zenodo_cache/2893252.svg
-      :target:  https://doi.org/10.5281/zenodo.2893252
-v3.0.3
-   .. image:: _static/zenodo_cache/2577644.svg
-      :target:  https://doi.org/10.5281/zenodo.2577644
-v3.0.2
-   .. image:: _static/zenodo_cache/1482099.svg
-      :target:  https://doi.org/10.5281/zenodo.1482099
-v3.0.1
-   .. image:: _static/zenodo_cache/1482098.svg
-      :target:  https://doi.org/10.5281/zenodo.1482098
-v2.2.5
-   .. image:: _static/zenodo_cache/3633833.svg
-      :target:  https://doi.org/10.5281/zenodo.3633833
-v3.0.0
-   .. image:: _static/zenodo_cache/1420605.svg
-      :target:  https://doi.org/10.5281/zenodo.1420605
-v2.2.4
-   .. image:: _static/zenodo_cache/2669103.svg
-      :target:  https://doi.org/10.5281/zenodo.2669103
-v2.2.3
-   .. image:: _static/zenodo_cache/1343133.svg
-      :target:  https://doi.org/10.5281/zenodo.1343133
-v2.2.2
-   .. image:: _static/zenodo_cache/1202077.svg
-      :target:  https://doi.org/10.5281/zenodo.1202077
-v2.2.1
-   .. image:: _static/zenodo_cache/1202050.svg
-      :target:  https://doi.org/10.5281/zenodo.1202050
-v2.2.0
-   .. image:: _static/zenodo_cache/1189358.svg
-      :target:  https://doi.org/10.5281/zenodo.1189358
-v2.1.2
-   .. image:: _static/zenodo_cache/1154287.svg
-      :target:  https://doi.org/10.5281/zenodo.1154287
-v2.1.1
-   .. image:: _static/zenodo_cache/1098480.svg
-      :target:  https://doi.org/10.5281/zenodo.1098480
-v2.1.0
-   .. image:: _static/zenodo_cache/1004650.svg
-      :target:  https://doi.org/10.5281/zenodo.1004650
-v2.0.2
-   .. image:: _static/zenodo_cache/573577.svg
-      :target:  https://doi.org/10.5281/zenodo.573577
-v2.0.1
-   .. image:: _static/zenodo_cache/570311.svg
-      :target:  https://doi.org/10.5281/zenodo.570311
-v2.0.0
-   .. image:: _static/zenodo_cache/248351.svg
-      :target:  https://doi.org/10.5281/zenodo.248351
-v1.5.3
-   .. image:: _static/zenodo_cache/61948.svg
-      :target:  https://doi.org/10.5281/zenodo.61948
-v1.5.2
-   .. image:: _static/zenodo_cache/56926.svg
-      :target:  https://doi.org/10.5281/zenodo.56926
-v1.5.1
-   .. image:: _static/zenodo_cache/44579.svg
-      :target:  https://doi.org/10.5281/zenodo.44579
-v1.5.0
-   .. image:: _static/zenodo_cache/32914.svg
-      :target:  https://doi.org/10.5281/zenodo.32914
-v1.4.3
-   .. image:: _static/zenodo_cache/15423.svg
-      :target:  https://doi.org/10.5281/zenodo.15423
-v1.4.2
-   .. image:: _static/zenodo_cache/12400.svg
-      :target:  https://doi.org/10.5281/zenodo.12400
-v1.4.1
-   .. image:: _static/zenodo_cache/12287.svg
-      :target:  https://doi.org/10.5281/zenodo.12287
-v1.4.0
-   .. image:: _static/zenodo_cache/11451.svg
-      :target:  https://doi.org/10.5281/zenodo.11451
-
-.. END OF AUTOGENERATED
diff --git a/doc/conf.py b/doc/conf.py
index a0f8891de6ac..5aa58a3aca5a 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -1,10 +1,12 @@
 # Matplotlib documentation build configuration file, created by
 # sphinx-quickstart on Fri May  2 12:33:25 2008.
 #
-# This file is execfile()d with the current directory set to its containing dir.
+# This file is execfile()d with the current directory set to its containing
+# dir.
 #
 # The contents of this file are pickled, so don't put values in the namespace
-# that aren't pickleable (module imports are okay, they're removed automatically).
+# that aren't picklable (module imports are okay, they're removed
+# automatically).
 #
 # All configuration values have a default value; values that are commented out
 # serve to show the default value.
@@ -14,13 +16,27 @@
 import shutil
 import subprocess
 import sys
+from urllib.parse import urlsplit, urlunsplit
 import warnings
 
 import matplotlib
-from matplotlib._api import MatplotlibDeprecationWarning
-import sphinx
 
 from datetime import datetime
+import time
+
+# debug that building expected version
+print(f"Building Documentation for Matplotlib: {matplotlib.__version__}")
+
+# Release mode enables optimizations and other related options.
+is_release_build = tags.has('release')  # noqa
+
+# are we running circle CI?
+CIRCLECI = 'CIRCLECI' in os.environ
+
+# Parse year using SOURCE_DATE_EPOCH, falling back to current time.
+# https://reproducible-builds.org/specs/source-date-epoch/
+sourceyear = datetime.utcfromtimestamp(
+    int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))).year
 
 # If your extensions are in another directory, add it here. If the directory
 # is relative to the documentation root, use os.path.abspath to make it
@@ -36,10 +52,6 @@
 # usage in the gallery.
 warnings.filterwarnings('error', append=True)
 
-# Strip backslashes in function's signature
-# To be removed when numpydoc > 0.9.x
-strip_signature_backslash = True
-
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
@@ -49,7 +61,6 @@
     'sphinx.ext.inheritance_diagram',
     'sphinx.ext.intersphinx',
     'sphinx.ext.ifconfig',
-    'sphinx.ext.viewcode',
     'IPython.sphinxext.ipython_console_highlighting',
     'IPython.sphinxext.ipython_directive',
     'numpydoc',  # Needs to be loaded *after* autodoc.
@@ -65,24 +76,21 @@
     'sphinxext.skip_deprecated',
     'sphinxext.redirect_from',
     'sphinx_copybutton',
+    'sphinx_design',
 ]
 
 exclude_patterns = [
     'api/prev_api_changes/api_changes_*/*',
-    # Be sure to update users/whats_new.rst:
-    'users/prev_whats_new/whats_new_3.4.0.rst',
 ]
 
 
 def _check_dependencies():
     names = {
+        **{ext: ext.split(".")[0] for ext in extensions},
+        # Explicitly list deps that are not extensions, or whose PyPI package
+        # name does not match the (toplevel) module name.
         "colorspacious": 'colorspacious',
-        "IPython.sphinxext.ipython_console_highlighting": 'ipython',
-        "matplotlib": 'matplotlib',
-        "numpydoc": 'numpydoc',
-        "PIL.Image": 'pillow',
-        "sphinx_copybutton": 'sphinx_copybutton',
-        "sphinx_gallery": 'sphinx_gallery',
+        "mpl_sphinx_theme": 'mpl_sphinx_theme',
         "sphinxcontrib.inkscapeconverter": 'sphinxcontrib-svg2pdfconverter',
     }
     missing = []
@@ -107,6 +115,7 @@ def _check_dependencies():
 # gallery_order.py from the sphinxext folder provides the classes that
 # allow custom ordering of sections and subsections of the gallery
 import sphinxext.gallery_order as gallery_order
+
 # The following import is only necessary to monkey patch the signature later on
 from sphinx_gallery import gen_rst
 
@@ -117,7 +126,7 @@ def _check_dependencies():
 
 # we should ignore warnings coming from importing deprecated modules for
 # autodoc purposes, as this will disappear automatically when they are removed
-warnings.filterwarnings('ignore', category=MatplotlibDeprecationWarning,
+warnings.filterwarnings('ignore', category=DeprecationWarning,
                         module='importlib',  # used by sphinx.autodoc.importer
                         message=r'(\n|.)*module was deprecated.*')
 
@@ -126,12 +135,10 @@ def _check_dependencies():
 
 # make sure to ignore warnings that stem from simply inspecting deprecated
 # class-level attributes
-warnings.filterwarnings('ignore', category=MatplotlibDeprecationWarning,
+warnings.filterwarnings('ignore', category=DeprecationWarning,
                         module='sphinx.util.inspect')
 
-# missing-references names matches sphinx>=3 behavior, so we can't be nitpicky
-# for older sphinxes.
-nitpicky = sphinx.version_info >= (3,)
+nitpicky = True
 # change this to True to update the allowed failures
 missing_references_write_json = False
 missing_references_warn_unused_ignores = False
@@ -143,44 +150,84 @@ def _check_dependencies():
     'ipykernel': ('https://ipykernel.readthedocs.io/en/latest/', None),
     'numpy': ('https://numpy.org/doc/stable/', None),
     'pandas': ('https://pandas.pydata.org/pandas-docs/stable/', None),
-    'pytest': ('https://pytest.org/en/latest/', None),
+    'pytest': ('https://pytest.org/en/stable/', None),
     'python': ('https://docs.python.org/3/', None),
-    'scipy': ('https://docs.scipy.org/doc/scipy/reference/', None),
+    'scipy': ('https://docs.scipy.org/doc/scipy/', None),
+    'tornado': ('https://www.tornadoweb.org/en/stable/', None),
+    'xarray': ('https://docs.xarray.dev/en/stable/', None),
 }
 
 
 # Sphinx gallery configuration
+
+def matplotlib_reduced_latex_scraper(block, block_vars, gallery_conf,
+                                     **kwargs):
+    """
+    Reduce srcset when creating a PDF.
+
+    Because sphinx-gallery runs *very* early, we cannot modify this even in the
+    earliest builder-inited signal. Thus we do it at scraping time.
+    """
+    from sphinx_gallery.scrapers import matplotlib_scraper
+
+    if gallery_conf['builder_name'] == 'latex':
+        gallery_conf['image_srcset'] = []
+    return matplotlib_scraper(block, block_vars, gallery_conf, **kwargs)
+
+
 sphinx_gallery_conf = {
-    'examples_dirs': ['../examples', '../tutorials'],
-    'filename_pattern': '^((?!sgskip).)*$',
-    'gallery_dirs': ['gallery', 'tutorials'],
-    'doc_module': ('matplotlib', 'mpl_toolkits'),
-    'reference_url': {
-        'matplotlib': None,
-        'numpy': 'https://docs.scipy.org/doc/numpy/',
-        'scipy': 'https://docs.scipy.org/doc/scipy/reference/',
-    },
     'backreferences_dir': Path('api') / Path('_as_gen'),
-    'subsection_order': gallery_order.sectionorder,
-    'within_subsection_order': gallery_order.subsectionorder,
-    'remove_config_comments': True,
+    # Compression is a significant effort that we skip for local and CI builds.
+    'compress_images': ('thumbnails', 'images') if is_release_build else (),
+    'doc_module': ('matplotlib', 'mpl_toolkits'),
+    'examples_dirs': ['../examples', '../tutorials', '../plot_types'],
+    'filename_pattern': '^((?!sgskip).)*$',
+    'gallery_dirs': ['gallery', 'tutorials', 'plot_types'],
+    'image_scrapers': (matplotlib_reduced_latex_scraper, ),
+    'image_srcset': ["2x"],
+    'junit': '../test-results/sphinx-gallery/junit.xml' if CIRCLECI else '',
+    'matplotlib_animations': True,
     'min_reported_time': 1,
+    'reference_url': {'matplotlib': None},
+    'remove_config_comments': True,
+    'reset_modules': (
+        'matplotlib',
+        # clear basic_units module to re-register with unit registry on import
+        lambda gallery_conf, fname: sys.modules.pop('basic_units', None)
+    ),
+    'subsection_order': gallery_order.sectionorder,
     'thumbnail_size': (320, 224),
-    'compress_images': ('thumbnails', 'images'),
-    'matplotlib_animations': True,
+    'within_subsection_order': gallery_order.subsectionorder,
+    'capture_repr': (),
 }
 
-plot_gallery = 'True'
+mathmpl_fontsize = 11.0
+mathmpl_srcset = ['2x']
+
+# Monkey-patching gallery header to include search keywords
+gen_rst.EXAMPLE_HEADER = """
+.. DO NOT EDIT.
+.. THIS FILE WAS AUTOMATICALLY GENERATED BY SPHINX-GALLERY.
+.. TO MAKE CHANGES, EDIT THE SOURCE PYTHON FILE:
+.. "{0}"
+.. LINE NUMBERS ARE GIVEN BELOW.
 
-# Monkey-patching gallery signature to include search keywords
-gen_rst.SPHX_GLR_SIG = """\n
 .. only:: html
 
- .. rst-class:: sphx-glr-signature
+    .. meta::
+        :keywords: codex
+
+    .. note::
+        :class: sphx-glr-download-link-note
+
+        Click :ref:`here <sphx_glr_download_{1}>`
+        to download the full example code{2}
 
-    Keywords: matplotlib code example, codex, python plot, pyplot
-    `Gallery generated by Sphinx-Gallery
-    <https://sphinx-gallery.readthedocs.io>`_\n"""
+.. rst-class:: sphx-glr-example-title
+
+.. _sphx_glr_{1}:
+
+"""
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -191,29 +238,24 @@ def _check_dependencies():
 # This is the default encoding, but it doesn't hurt to be explicit
 source_encoding = "utf-8"
 
-# The master toctree document.
-master_doc = 'contents'
+# The toplevel toctree document (renamed to root_doc in Sphinx 4.0)
+root_doc = master_doc = 'users/index'
 
 # General substitutions.
 try:
     SHA = subprocess.check_output(
         ['git', 'describe', '--dirty']).decode('utf-8').strip()
-# Catch the case where git is not installed locally, and use the versioneer
+# Catch the case where git is not installed locally, and use the setuptools_scm
 # version number instead
 except (subprocess.CalledProcessError, FileNotFoundError):
     SHA = matplotlib.__version__
 
-html_context = {
-    'sha': SHA,
-    # This will disable any analytics in the HTML templates (currently Google
-    # Analytics.)
-    'include_analytics': False,
-}
-
 project = 'Matplotlib'
-copyright = ('2002 - 2012 John Hunter, Darren Dale, Eric Firing, '
-             'Michael Droettboom and the Matplotlib development '
-             f'team; 2012 - {datetime.now().year} The Matplotlib development team')
+copyright = (
+    '2002–2012 John Hunter, Darren Dale, Eric Firing, Michael Droettboom '
+    'and the Matplotlib development team; '
+    f'2012–{sourceyear} The Matplotlib development team'
+)
 
 
 # The default replacements for |version| and |release|, also used in various
@@ -227,7 +269,7 @@ def _check_dependencies():
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-#today = ''
+# today = ''
 # Else, today_fmt is used as the format for a strftime call.
 today_fmt = '%B %d, %Y'
 
@@ -235,15 +277,15 @@ def _check_dependencies():
 unused_docs = []
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
+# add_function_parentheses = True
 
 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-#add_module_names = True
+# add_module_names = True
 
 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-#show_authors = False
+# show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
@@ -253,28 +295,99 @@ def _check_dependencies():
 # Plot directive configuration
 # ----------------------------
 
-plot_formats = [('png', 100), ('pdf', 100)]
+# For speedup, decide which plot_formats to build based on build targets:
+#     html only -> png
+#     latex only -> pdf
+#     all other cases, including html + latex -> png, pdf
+# For simplicity, we assume that the build targets appear in the command line.
+# We're falling back on using all formats in case that assumption fails.
+formats = {'html': ('png', 100), 'latex': ('pdf', 100)}
+plot_formats = [formats[target] for target in ['html', 'latex']
+                if target in sys.argv] or list(formats.values())
+
 
 # GitHub extension
 
 github_project_url = "https://github.com/matplotlib/matplotlib/"
 
+
 # Options for HTML output
 # -----------------------
 
+def add_html_cache_busting(app, pagename, templatename, context, doctree):
+    """
+    Add cache busting query on CSS and JavaScript assets.
+
+    This adds the Matplotlib version as a query to the link reference in the
+    HTML, if the path is not absolute (i.e., it comes from the `_static`
+    directory) and doesn't already have a query.
+    """
+    from sphinx.builders.html import Stylesheet, JavaScript
+
+    css_tag = context['css_tag']
+    js_tag = context['js_tag']
+
+    def css_tag_with_cache_busting(css):
+        if isinstance(css, Stylesheet) and css.filename is not None:
+            url = urlsplit(css.filename)
+            if not url.netloc and not url.query:
+                url = url._replace(query=SHA)
+                css = Stylesheet(urlunsplit(url), priority=css.priority,
+                                 **css.attributes)
+        return css_tag(css)
+
+    def js_tag_with_cache_busting(js):
+        if isinstance(js, JavaScript) and js.filename is not None:
+            url = urlsplit(js.filename)
+            if not url.netloc and not url.query:
+                url = url._replace(query=SHA)
+                js = JavaScript(urlunsplit(url), priority=js.priority,
+                                **js.attributes)
+        return js_tag(js)
+
+    context['css_tag'] = css_tag_with_cache_busting
+    context['js_tag'] = js_tag_with_cache_busting
+
+
 # The style sheet to use for HTML and HTML Help pages. A file of that name
 # must exist either in Sphinx' static/ path, or in one of the custom paths
 # given in html_static_path.
-#html_style = 'matplotlib.css'
-html_style = f'mpl.css?{SHA}'
+html_css_files = [
+    "mpl.css",
+]
+
+html_theme = "mpl_sphinx_theme"
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-#html_title = None
+# html_title = None
 
 # The name of an image file (within the static path) to place at the top of
 # the sidebar.
-#html_logo = 'logo.png'
+html_logo = "_static/logo2.svg"
+html_theme_options = {
+    "navbar_links": "internal",
+    # collapse_navigation in pydata-sphinx-theme is slow, so skipped for local
+    # and CI builds https://github.com/pydata/pydata-sphinx-theme/pull/386
+    "collapse_navigation": not is_release_build,
+    "show_prev_next": False,
+    "switcher": {
+        "json_url": "https://matplotlib.org/devdocs/_static/switcher.json",
+        "version_match": (
+            # The start version to show. This must be in switcher.json.
+            # We either go to 'stable' or to 'devdocs'
+            'stable' if matplotlib.__version_info__.releaselevel == 'final'
+            else 'devdocs')
+    },
+    "logo": {"link": "index",
+             "image_light": "images/logo2.svg",
+             "image_dark": "images/logo_dark.svg"},
+    "navbar_end": ["theme-switcher", "version-switcher", "mpl_icon_links"],
+    "page_sidebar_items": "page-toc.html",
+}
+include_analytics = is_release_build
+if include_analytics:
+    html_theme_options["google_analytics_id"] = "UA-55954603-1"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
@@ -285,6 +398,9 @@ def _check_dependencies():
 # default is ``".html"``.
 html_file_suffix = '.html'
 
+# this makes this the canonical link for all the pages on the site...
+html_baseurl = 'https://matplotlib.org/stable/'
+
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
 html_last_updated_fmt = '%b %d, %Y'
@@ -293,23 +409,32 @@ def _check_dependencies():
 html_index = 'index.html'
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+# html_sidebars = {}
 
 # Custom sidebar templates, maps page names to templates.
 html_sidebars = {
-    'index': [
+    "index": [
         # 'sidebar_announcement.html',
-        'sidebar_versions.html',
-        'donate_sidebar.html'],
-    '**': ['localtoc.html', 'pagesource.html']
+        "sidebar_versions.html",
+        "cheatsheet_sidebar.html",
+        "donate_sidebar.html",
+    ],
+    # '**': ['localtoc.html', 'pagesource.html']
 }
 
-# If false, no module index is generated.
-#html_use_modindex = True
-html_domain_indices = ["py-modindex"]
+# Copies only relevant code, not the '>>>' prompt
+copybutton_prompt_text = r'>>> |\.\.\. '
+copybutton_prompt_is_regexp = True
+
+# If true, add an index to the HTML documents.
+html_use_index = False
+
+# If true, generate domain-specific indices in addition to the general index.
+# For e.g. the Python domain, this is the global module index.
+html_domain_index = False
 
 # If true, the reST sources are included in the HTML build as _sources/<name>.
-#html_copy_source = True
+# html_copy_source = True
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.
@@ -330,11 +455,13 @@ def _check_dependencies():
 # The paper size ('letter' or 'a4').
 latex_paper_size = 'letter'
 
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, document class [howto/manual]).
+# Grouping the document tree into LaTeX files.
+# List of tuples:
+#   (source start file, target name, title, author,
+#    document class [howto/manual])
 
 latex_documents = [
-    ('contents', 'Matplotlib.tex', 'Matplotlib',
+    (root_doc, 'Matplotlib.tex', 'Matplotlib',
      'John Hunter\\and Darren Dale\\and Eric Firing\\and Michael Droettboom'
      '\\and and the matplotlib development team', 'manual'),
 ]
@@ -364,7 +491,7 @@ def _check_dependencies():
 # Sphinx 2.0 adopts GNU FreeFont by default, but it does not have all
 # the Unicode codepoints needed for the section about Mathtext
 # "Writing mathematical expressions"
-fontpkg = r"""
+latex_elements['fontpkg'] = r"""
 \IfFontExistsTF{XITS}{
  \setmainfont{XITS}
 }{
@@ -404,12 +531,7 @@ def _check_dependencies():
   Extension      = .otf,
 ]}
 """
-latex_elements['fontpkg'] = fontpkg
 
-# Sphinx <1.8.0 or >=2.0.0 does this by default, but the 1.8.x series
-# did not for latex_engine = 'xelatex' (as it used Latin Modern font).
-# We need this for code-blocks as FreeMono has wide glyphs.
-latex_elements['fvset'] = r'\fvset{fontsize=\small}'
 # Fix fancyhdr complaining about \headheight being too small
 latex_elements['passoptionstopackages'] = r"""
     \PassOptionsToPackage{headheight=14pt}{geometry}
@@ -417,6 +539,8 @@ def _check_dependencies():
 
 # Additional stuff for the LaTeX preamble.
 latex_elements['preamble'] = r"""
+   % Show Parts and Chapters in Table of Contents
+   \setcounter{tocdepth}{0}
    % One line per author on title page
    \DeclareRobustCommand{\and}%
      {\end{tabular}\kern-\tabcolsep\\\begin{tabular}[t]{c}}%
@@ -464,7 +588,7 @@ def _check_dependencies():
 autoclass_content = 'both'
 
 texinfo_documents = [
-    ("contents", 'matplotlib', 'Matplotlib Documentation',
+    (root_doc, 'matplotlib', 'Matplotlib Documentation',
      'John Hunter@*Darren Dale@*Eric Firing@*Michael Droettboom@*'
      'The matplotlib development team',
      'Matplotlib', "Python plotting package", 'Programming',
@@ -475,8 +599,6 @@ def _check_dependencies():
 
 numpydoc_show_class_members = False
 
-html4_writer = True
-
 inheritance_node_attrs = dict(fontsize=16)
 
 graphviz_dot = shutil.which('dot')
@@ -484,10 +606,82 @@ def _check_dependencies():
 # https://github.com/sphinx-doc/sphinx/issues/3176
 # graphviz_output_format = 'svg'
 
+# -----------------------------------------------------------------------------
+# Source code links
+# -----------------------------------------------------------------------------
+link_github = True
+# You can add build old with link_github = False
+
+if link_github:
+    import inspect
+    from packaging.version import parse
+
+    extensions.append('sphinx.ext.linkcode')
+
+    def linkcode_resolve(domain, info):
+        """
+        Determine the URL corresponding to Python object
+        """
+        if domain != 'py':
+            return None
+
+        modname = info['module']
+        fullname = info['fullname']
+
+        submod = sys.modules.get(modname)
+        if submod is None:
+            return None
+
+        obj = submod
+        for part in fullname.split('.'):
+            try:
+                obj = getattr(obj, part)
+            except AttributeError:
+                return None
+
+        if inspect.isfunction(obj):
+            obj = inspect.unwrap(obj)
+        try:
+            fn = inspect.getsourcefile(obj)
+        except TypeError:
+            fn = None
+        if not fn or fn.endswith('__init__.py'):
+            try:
+                fn = inspect.getsourcefile(sys.modules[obj.__module__])
+            except (TypeError, AttributeError, KeyError):
+                fn = None
+        if not fn:
+            return None
+
+        try:
+            source, lineno = inspect.getsourcelines(obj)
+        except (OSError, TypeError):
+            lineno = None
+
+        linespec = (f"#L{lineno:d}-L{lineno + len(source) - 1:d}"
+                    if lineno else "")
+
+        startdir = Path(matplotlib.__file__).parent.parent
+        fn = os.path.relpath(fn, start=startdir).replace(os.path.sep, '/')
+
+        if not fn.startswith(('matplotlib/', 'mpl_toolkits/')):
+            return None
+
+        version = parse(matplotlib.__version__)
+        tag = 'main' if version.is_devrelease else f'v{version.public}'
+        return ("https://github.com/matplotlib/matplotlib/blob"
+                f"/{tag}/lib/{fn}{linespec}")
+else:
+    extensions.append('sphinx.ext.viewcode')
+
 
+# -----------------------------------------------------------------------------
+# Sphinx setup
+# -----------------------------------------------------------------------------
 def setup(app):
-    if any(st in version for st in ('post', 'alpha', 'beta')):
+    if any(st in version for st in ('post', 'dev', 'alpha', 'beta')):
         bld_type = 'dev'
     else:
         bld_type = 'rel'
     app.add_config_value('releaselevel', bld_type, 'env')
+    app.connect('html-page-context', add_html_cache_busting, priority=1000)
diff --git a/doc/contents.rst b/doc/contents.rst
deleted file mode 100644
index 407f81e53b9d..000000000000
--- a/doc/contents.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-Overview
-========
-
-.. only:: html
-
-    :Release: |version|
-    :Date: |today|
-
-    Download `PDF <Matplotlib.pdf>`_
-
-
-.. toctree::
-   :maxdepth: 2
-
-   users/index.rst
-   faq/index.rst
-   api/index.rst
-   resources/index.rst
-   thirdpartypackages/index.rst
-   devel/index.rst
-
-.. only:: html
-
-  * :ref:`genindex`
-  * :ref:`modindex`
-  * :ref:`search`
diff --git a/doc/devel/MEP/MEP11.rst b/doc/devel/MEP/MEP11.rst
index 9ddd0109c06b..659b7e101480 100644
--- a/doc/devel/MEP/MEP11.rst
+++ b/doc/devel/MEP/MEP11.rst
@@ -117,7 +117,7 @@ Implementation
 For installing from source, and assuming the user has all of the
 C-level compilers and dependencies, this can be accomplished fairly
 easily using distribute_ and following the instructions `here
-<https://pypi.org/project/distribute>`_.  The only anticipated
+<https://pypi.org/project/distribute/>`_.  The only anticipated
 change to the matplotlib library code will be to import pyparsing_
 from the top-level namespace rather than from within matplotlib.  Note
 that distribute_ will also allow us to remove the direct dependency
diff --git a/doc/devel/MEP/MEP12.rst b/doc/devel/MEP/MEP12.rst
index 87489393b2f5..009f013e0be9 100644
--- a/doc/devel/MEP/MEP12.rst
+++ b/doc/devel/MEP/MEP12.rst
@@ -106,7 +106,7 @@ sections described above. "Clean-up" should involve:
 
 
 * PEP8_ clean-ups (running `flake8
-  <https://pypi.org/project/flake8>`_, or a similar checker, is
+  <https://pypi.org/project/flake8/>`_, or a similar checker, is
   highly recommended)
 * Commented-out code should be removed.
 * Replace uses of `pylab` interface with `.pyplot` (+ `numpy`,
@@ -142,8 +142,8 @@ page instead of the gallery examples.
 references to that example.  For example, the API documentation for
 :file:`axes.py` and :file:`pyplot.py` may use these examples to generate
 plots. Use your favorite search tool (e.g., grep, ack, `grin
-<https://pypi.org/project/grin>`_, `pss
-<https://pypi.org/project/pss>`_) to search the matplotlib
+<https://pypi.org/project/grin/>`_, `pss
+<https://pypi.org/project/pss/>`_) to search the matplotlib
 package. See `2dc9a46
 <https://github.com/tonysyu/matplotlib/commit/2dc9a4651e5e566afc0866c603aa8d06aaf32b71>`_
 and `aa6b410
diff --git a/doc/devel/MEP/MEP14.rst b/doc/devel/MEP/MEP14.rst
index e3e7127abda9..574c733e10bf 100644
--- a/doc/devel/MEP/MEP14.rst
+++ b/doc/devel/MEP/MEP14.rst
@@ -78,11 +78,11 @@ number of other projects:
 - `Microsoft DirectWrite`_
 - `Apple Core Text`_
 
-.. _pango: https://www.pango.org/
-.. _harfbuzz: https://www.freedesktop.org/wiki/Software/HarfBuzz/
+.. _pango: https://pango.gnome.org
+.. _harfbuzz: https://github.com/harfbuzz/harfbuzz
 .. _QtTextLayout: https://doc.qt.io/archives/qt-4.8/qtextlayout.html
 .. _Microsoft DirectWrite: https://docs.microsoft.com/en-ca/windows/win32/directwrite/introducing-directwrite
-.. _Apple Core Text: https://developer.apple.com/library/content/documentation/StringsTextFonts/Conceptual/CoreText_Programming/Overview/Overview.html
+.. _Apple Core Text: https://developer.apple.com/library/archive/documentation/StringsTextFonts/Conceptual/CoreText_Programming/Overview/Overview.html
 
 Of the above options, it should be noted that harfbuzz_ is designed
 from the start as a cross platform option with minimal dependencies,
diff --git a/doc/devel/MEP/MEP15.rst b/doc/devel/MEP/MEP15.rst
index dc1802e33b8c..8e2f80707429 100644
--- a/doc/devel/MEP/MEP15.rst
+++ b/doc/devel/MEP/MEP15.rst
@@ -1,6 +1,6 @@
-==========================================================================
- MEP15 - Fix axis autoscaling when limits are specified for one axis only
-==========================================================================
+=========================================================================
+ MEP15: Fix axis autoscaling when limits are specified for one axis only
+=========================================================================
 
 .. contents::
    :local:
diff --git a/doc/devel/MEP/MEP19.rst b/doc/devel/MEP/MEP19.rst
index 3fc276a238ee..fd93ba619aed 100644
--- a/doc/devel/MEP/MEP19.rst
+++ b/doc/devel/MEP/MEP19.rst
@@ -67,7 +67,7 @@ great!]:
 
 **Documentation**
 
-Documentation of master is now built by travis and uploaded to http://matplotlib.org/devdocs/index.html
+Documentation of main is now built by travis and uploaded to https://matplotlib.org/devdocs/index.html
 
 @NelleV, I believe, generates the docs automatically and posts them on
 the web to chart MEP10 progress.
@@ -122,7 +122,7 @@ This section outlines the requirements that we would like to have.
 #. Make it easy to test a large but sparse matrix of different
    versions of matplotlib's dependencies.  The matplotlib user survey
    provides some good data as to where to focus our efforts:
-   https://docs.google.com/spreadsheet/ccc?key=0AjrPjlTMRTwTdHpQS25pcTZIRWdqX0pNckNSU01sMHc
+   https://docs.google.com/spreadsheets/d/1jbK0J4cIkyBNncnS-gP7pINSliNy9lI-N4JHwxlNSXE/edit
 
 #. Nice to have: A decentralized design so that those with more
    obscure platforms can publish build results to a central dashboard.
diff --git a/doc/devel/MEP/MEP22.rst b/doc/devel/MEP/MEP22.rst
index d7e93bb5744d..8f8fe69b41a6 100644
--- a/doc/devel/MEP/MEP22.rst
+++ b/doc/devel/MEP/MEP22.rst
@@ -13,16 +13,18 @@ Status
 Branches and Pull requests
 ==========================
 
-Previous work
- * https://github.com/matplotlib/matplotlib/pull/1849
- * https://github.com/matplotlib/matplotlib/pull/2557
- * https://github.com/matplotlib/matplotlib/pull/2465
+Previous work:
+
+* https://github.com/matplotlib/matplotlib/pull/1849
+* https://github.com/matplotlib/matplotlib/pull/2557
+* https://github.com/matplotlib/matplotlib/pull/2465
 
 Pull Requests:
- * Removing the NavigationToolbar classes
-   https://github.com/matplotlib/matplotlib/pull/2740 **CLOSED**
- * Keeping the NavigationToolbar classes https://github.com/matplotlib/matplotlib/pull/2759 **CLOSED**
- * Navigation by events: https://github.com/matplotlib/matplotlib/pull/3652
+
+* Removing the NavigationToolbar classes
+  https://github.com/matplotlib/matplotlib/pull/2740 **CLOSED**
+* Keeping the NavigationToolbar classes https://github.com/matplotlib/matplotlib/pull/2759 **CLOSED**
+* Navigation by events: https://github.com/matplotlib/matplotlib/pull/3652
 
 Abstract
 ========
@@ -39,7 +41,7 @@ reconfiguration.
 
 This approach will make easier to create and share tools among
 users. In the far future, we can even foresee a kind of Marketplace
-for ``Tool``\ s where the most popular can be added into the main
+for ``Tool``\s where the most popular can be added into the main
 distribution.
 
 Detailed description
@@ -55,18 +57,18 @@ https://github.com/matplotlib/matplotlib/issues/2699
 
 The proposed solution is to take the actions out of the ``Toolbar`` and the
 shortcuts out of the ``Canvas``. The actions and shortcuts will be in the form
-of ``Tool``\ s.
+of ``Tool``\s.
 
 A new class ``Navigation`` will be the bridge between the events from the
 ``Canvas`` and ``Toolbar`` and redirect them to the appropriate ``Tool``.
 
 At the end the user interaction will be divided into three classes:
 
- * NavigationBase: This class is instantiated for each FigureManager
-   and connect the all user interactions with the Tools
- * ToolbarBase: This existing class is relegated only as a GUI access
-   to Tools.
- * ToolBase: Is the basic definition of Tools.
+* NavigationBase: This class is instantiated for each FigureManager
+  and connect the all user interactions with the Tools
+* ToolbarBase: This existing class is relegated only as a GUI access
+  to Tools.
+* ToolBase: Is the basic definition of Tools.
 
 
 Implementation
@@ -80,37 +82,44 @@ present in the Toolbar as ``Quit``.
 
 The `.ToolBase` has the following class attributes for configuration at definition time
 
- * keymap = None: Key(s) to be used to trigger the tool
- * description = '': Small description of the tool
- * image = None: Image that is used in the toolbar
+* keymap = None: Key(s) to be used to trigger the tool
+* description = '': Small description of the tool
+* image = None: Image that is used in the toolbar
 
 The following instance attributes are set at instantiation:
- * name
- * navigation
-
-**Methods**
- * trigger(self, event): This is the main method of the Tool, it is called when the Tool is triggered by:
-   * Toolbar button click
-   * keypress associated with the Tool Keymap
-   * Call to navigation.trigger_tool(name)
- * set_figure(self, figure): Set the figure and navigation attributes
- * ``destroy(self, *args)``: Destroy the ``Tool`` graphical interface (if
-   exists)
-
-**Available Tools**
- * ToolQuit
- * ToolEnableAllNavigation
- * ToolEnableNavigation
- * ToolToggleGrid
- * ToolToggleFullScreen
- * ToolToggleYScale
- * ToolToggleXScale
- * ToolHome
- * ToolBack
- * ToolForward
- * SaveFigureBase
- * ConfigureSubplotsBase
 
+* name
+* navigation
+
+Methods
+~~~~~~~
+
+* ``trigger(self, event)``: This is the main method of the Tool, it is called
+  when the Tool is triggered by:
+
+  * Toolbar button click
+  * keypress associated with the Tool Keymap
+  * Call to navigation.trigger_tool(name)
+
+* ``set_figure(self, figure)``: Set the figure and navigation attributes
+* ``destroy(self, *args)``: Destroy the ``Tool`` graphical interface (if
+  exists)
+
+Available Tools
+~~~~~~~~~~~~~~~
+
+* ToolQuit
+* ToolEnableAllNavigation
+* ToolEnableNavigation
+* ToolToggleGrid
+* ToolToggleFullScreen
+* ToolToggleYScale
+* ToolToggleXScale
+* ToolHome
+* ToolBack
+* ToolForward
+* SaveFigureBase
+* ConfigureSubplotsBase
 
 ToolToggleBase(ToolBase)
 ------------------------
@@ -118,58 +127,63 @@ ToolToggleBase(ToolBase)
 The `.ToolToggleBase` has the following class attributes for
 configuration at definition time
 
- * radio_group = None: Attribute to group 'radio' like tools (mutually
-   exclusive)
- * cursor = None: Cursor to use when the tool is active
+* radio_group = None: Attribute to group 'radio' like tools (mutually
+  exclusive)
+* cursor = None: Cursor to use when the tool is active
 
 The **Toggleable** Tools, can capture keypress, mouse moves, and mouse
 button press
 
-It defines the following methods
- * enable(self, event): Called by `.ToolToggleBase.trigger` method
- * disable(self, event): Called when the tool is untoggled
- * toggled : **Property** True or False
+Methods
+~~~~~~~
 
-**Available Tools**
- * ToolZoom
- * ToolPan
+* ``enable(self, event)``: Called by `.ToolToggleBase.trigger` method
+* ``disable(self, event)``: Called when the tool is untoggled
+* ``toggled``: **Property** True or False
 
-NavigationBase
---------------
+Available Tools
+~~~~~~~~~~~~~~~
 
-Defines the following attributes
- * canvas:
- * keypresslock: Lock to know if the ``canvas`` ``key_press_event`` is
-        available and process it
- * messagelock: Lock to know if the message is available to write
-
-Public methods for **User use**:
- * nav_connect(self, s, func): Connect to to navigation for events
- * nav_disconnect(self, cid): Disconnect from navigation event
- * message_event(self, message, sender=None): Emit a
-   tool_message_event event
- * active_toggle(self): **Property** The currently toggled tools or
-   None
- * get_tool_keymap(self, name): Return a list of keys that are
-   associated with the tool
- * set_tool_keymap(self, name, ``*keys``): Set the keys for the given tool
- * remove_tool(self, name): Removes tool from the navigation control.
- * add_tools(self, tools): Add multiple tools to ``Navigation``
- * add_tool(self, name, tool, group=None, position=None): Add a tool
-   to the ``Navigation``
- * tool_trigger_event(self, name, sender=None, canvasevent=None,
-   data=None): Trigger a tool and fire the event
-
- * tools(self) **Property**: Return a dict with available tools with
-   corresponding keymaps, descriptions and objects
- * get_tool(self, name): Return the tool object
+* ToolZoom
+* ToolPan
 
+NavigationBase
+--------------
 
+Defines the following attributes:
+
+* canvas:
+* keypresslock: Lock to know if the ``canvas`` ``key_press_event`` is
+  available and process it
+* messagelock: Lock to know if the message is available to write
+
+Methods (intended for the end user)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* ``nav_connect(self, s, func)``: Connect to navigation for events
+* ``nav_disconnect(self, cid)``: Disconnect from navigation event
+* ``message_event(self, message, sender=None)``: Emit a
+  tool_message_event event
+* ``active_toggle(self)``: **Property** The currently toggled tools or
+  None
+* ``get_tool_keymap(self, name)``: Return a list of keys that are
+  associated with the tool
+* ``set_tool_keymap(self, name, ``*keys``)``: Set the keys for the given tool
+* ``remove_tool(self, name)``: Removes tool from the navigation control.
+* ``add_tools(self, tools)``: Add multiple tools to ``Navigation``
+* ``add_tool(self, name, tool, group=None, position=None)``: Add a tool
+  to the ``Navigation``
+* ``tool_trigger_event(self, name, sender=None, canvasevent=None,
+  data=None)``: Trigger a tool and fire the event
+* ``tools``:  **Property** A dict with available tools with
+  corresponding keymaps, descriptions and objects
+* ``get_tool(self, name)``: Return the tool object
 
 ToolbarBase
 -----------
 
-Methods for **Backend implementation**
+Methods (for backend implementation)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 * ``add_toolitem(self, name, group, position, image, description, toggle)``:
   Add a toolitem to the toolbar. This method is a callback from
diff --git a/doc/devel/MEP/MEP24.rst b/doc/devel/MEP/MEP24.rst
index 53f0609f3e9b..b0620ce3dc8f 100644
--- a/doc/devel/MEP/MEP24.rst
+++ b/doc/devel/MEP/MEP24.rst
@@ -1,5 +1,5 @@
 =======================================
- MEP24: negative radius in polar plots
+ MEP24: Negative radius in polar plots
 =======================================
 
 .. contents::
diff --git a/doc/devel/MEP/MEP26.rst b/doc/devel/MEP/MEP26.rst
index 929393a683d2..9d3af8f8c703 100644
--- a/doc/devel/MEP/MEP26.rst
+++ b/doc/devel/MEP/MEP26.rst
@@ -34,7 +34,7 @@ Detailed description
 ====================
 
 Currently, the look and appearance of existing artist objects (figure,
-axes, Line2D etc...) can only be updated via ``set_`` and ``get_`` methods
+axes, Line2D, etc.) can only be updated via ``set_`` and ``get_`` methods
 on the artist object, which is quite laborious, especially if no
 reference to the artist(s) has been stored.  The new style sheets
 introduced in 1.4 allow styling before a plot is created, but do not
@@ -51,7 +51,7 @@ of primitives.
 The new methodology would require development of a number of steps:
 
 - A new stylesheet syntax (likely based on CSS) to allow selection of
-  artists by type, class, id etc...
+  artists by type, class, id, etc.
 - A mechanism by which to parse a stylesheet into a tree
 - A mechanism by which to translate the parse-tree into something
   which can be used to update the properties of relevant
diff --git a/doc/devel/MEP/MEP27.rst b/doc/devel/MEP/MEP27.rst
index 13ed37cb73cb..81eca8f9c53d 100644
--- a/doc/devel/MEP/MEP27.rst
+++ b/doc/devel/MEP/MEP27.rst
@@ -1,5 +1,5 @@
 ======================================
- MEP27: decouple pyplot from backends
+ MEP27: Decouple pyplot from backends
 ======================================
 
 .. contents::
@@ -13,9 +13,11 @@ Status
 Branches and Pull requests
 ==========================
 Main PR (including GTK3):
+
 + https://github.com/matplotlib/matplotlib/pull/4143
 
 Backend specific branch diffs:
+
 + https://github.com/OceanWolf/matplotlib/compare/backend-refactor...OceanWolf:backend-refactor-tkagg
 + https://github.com/OceanWolf/matplotlib/compare/backend-refactor...OceanWolf:backend-refactor-qt
 + https://github.com/OceanWolf/matplotlib/compare/backend-refactor...backend-refactor-wx
@@ -49,15 +51,14 @@ Two main places for generic code appear in the classes derived from
 
 1. ``FigureManagerBase`` has **three** jobs at the moment:
 
-    1. The documentation describes it as a *``Helper class for pyplot
-       mode, wraps everything up into a neat bundle''*
+    1. The documentation describes it as a *Helper class for pyplot
+       mode, wraps everything up into a neat bundle*
     2. But it doesn't just wrap the canvas and toolbar, it also does
        all of the windowing tasks itself.  The conflation of these two
-       tasks gets seen the best in the following line: ```python
-       self.set_window_title("Figure %d" % num) ``` This combines
+       tasks gets seen the best in the following line:
+       ``self.set_window_title("Figure %d" % num)`` This combines
        backend specific code ``self.set_window_title(title)`` with
        matplotlib generic code ``title = "Figure %d" % num``.
-
     3. Currently the backend specific subclass of ``FigureManager``
        decides when to end the mainloop.  This also seems very wrong
        as the figure should have no control over the other figures.
@@ -95,7 +96,7 @@ The description of this MEP gives us most of the solution:
    1. This allows us to break up the conversion of backends into
       separate PRs as we can keep the existing ``FigureManagerBase``
       class and its dependencies intact.
-   2. and this also anticipates MEP22 where the new
+   2. And this also anticipates MEP22 where the new
       ``NavigationBase`` has morphed into a backend independent
       ``ToolManager``.
 
diff --git a/doc/devel/MEP/MEP28.rst b/doc/devel/MEP/MEP28.rst
index 631be1e2b548..07b83c17800e 100644
--- a/doc/devel/MEP/MEP28.rst
+++ b/doc/devel/MEP/MEP28.rst
@@ -46,7 +46,7 @@ Detailed description
 
 Currently, the ``Axes.boxplot`` method accepts parameters that allow the
 users to specify medians and confidence intervals for each box that
-will be drawn in the plot. These were provided so that avdanced users
+will be drawn in the plot. These were provided so that advanced users
 could provide statistics computed in a different fashion that the simple
 method provided by matplotlib. However, handling this input requires
 complex logic to make sure that the forms of the data structure match what
diff --git a/doc/devel/MEP/MEP29.rst b/doc/devel/MEP/MEP29.rst
index ae7eae9fe43e..d937889d55de 100644
--- a/doc/devel/MEP/MEP29.rst
+++ b/doc/devel/MEP/MEP29.rst
@@ -34,7 +34,7 @@ one has to look at the gallery where one such example is provided:
 This example takes a list of strings as well as a list of colors which makes it
 cumbersome to use. An alternative would be to use a restricted set of pango_-like markup and to interpret this markup.
 
-.. _pango: https://developer.gnome.org/pygtk/stable/pango-markup-language.html
+.. _pango: https://docs.gtk.org/Pango/pango_markup.html#pango-markup
 
 Some markup examples::
 
@@ -54,7 +54,7 @@ Improvements
   to use the html.parser from the standard library.
 
 * Computation of text fragment positions could benefit from the OffsetFrom
-  class. See for example item 5 in `Using Complex Coordinates with Annotations <http://matplotlib.org/devdocs/tutorials/text/annotations.html#using-complex-coordinates-with-annotations>`_
+  class. See for example item 5 in `Using Complex Coordinates with Annotations <https://matplotlib.org/devdocs/tutorials/text/annotations.html#using-complex-coordinates-with-annotations>`_
 
 Problems
 --------
diff --git a/doc/devel/MEP/template.rst b/doc/devel/MEP/template.rst
index 81191fc44eeb..00bdbc87a95e 100644
--- a/doc/devel/MEP/template.rst
+++ b/doc/devel/MEP/template.rst
@@ -24,7 +24,7 @@ MEPs go through a number of phases in their lifetime:
 
 - **Progress**: Consensus was reached and implementation work has begun.
 
-- **Completed**: The implementation has been merged into master.
+- **Completed**: The implementation has been merged into main.
 
 - **Superseded**: This MEP has been abandoned in favor of another
   approach.
diff --git a/doc/devel/README.txt b/doc/devel/README.txt
index 3fc074035aff..d7636cd4c37c 100644
--- a/doc/devel/README.txt
+++ b/doc/devel/README.txt
@@ -2,8 +2,8 @@ All documentation in the gitwash directory are automatically generated by runnin
 script in the project's root directory using the following parameters:
 
 python gitwash_dumper.py doc/devel Matplotlib --repo-name=matplotlib --github-user=matplotlib \
-   --project-url=http://matplotlib.org \
+   --project-url=https://matplotlib.org \
    --project-ml-url=https://mail.python.org/mailman/listinfo/matplotlib-devel
 
 The script is hosted at https://raw.githubusercontent.com/matthew-brett/gitwash/master/gitwash_dumper.py.
-For more information please visit https://github.com/matthew-brett/gitwash
\ No newline at end of file
+For more information please visit https://github.com/matthew-brett/gitwash
diff --git a/doc/devel/add_new_projection.rst b/doc/devel/add_new_projection.rst
deleted file mode 100644
index 4eb2f80be490..000000000000
--- a/doc/devel/add_new_projection.rst
+++ /dev/null
@@ -1,129 +0,0 @@
-.. _adding-new-scales:
-
-=========================================================
-Developer's guide for creating scales and transformations
-=========================================================
-
-.. ::author Michael Droettboom
-
-Matplotlib supports the addition of custom procedures that transform
-the data before it is displayed.
-
-There is an important distinction between two kinds of
-transformations.  Separable transformations, working on a single
-dimension, are called "scales", and non-separable transformations,
-that handle data in two or more dimensions at a time, are called
-"projections".
-
-From the user's perspective, the scale of a plot can be set with
-`.Axes.set_xscale` and `.Axes.set_yscale`.  Projections can be chosen using the
-*projection* keyword argument of functions that create Axes, such as
-`.pyplot.subplot` or `.pyplot.axes`, e.g. ::
-
-    plt.subplot(projection="custom")
-
-This document is intended for developers and advanced users who need
-to create new scales and projections for Matplotlib.  The necessary
-code for scales and projections can be included anywhere: directly
-within a plot script, in third-party code, or in the Matplotlib source
-tree itself.
-
-.. _creating-new-scale:
-
-Creating a new scale
-====================
-
-Adding a new scale consists of defining a subclass of
-:class:`matplotlib.scale.ScaleBase`, that includes the following
-elements:
-
-- A transformation from data coordinates into display coordinates.
-
-- An inverse of that transformation.  This is used, for example, to
-  convert mouse positions from screen space back into data space.
-
-- A function to limit the range of the axis to acceptable values
-  (``limit_range_for_scale()``).  A log scale, for instance, would
-  prevent the range from including values less than or equal to zero.
-
-- Locators (major and minor) that determine where to place ticks in
-  the plot, and optionally, how to adjust the limits of the plot to
-  some "good" values.  Unlike ``limit_range_for_scale()``, which is
-  always enforced, the range setting here is only used when
-  automatically setting the range of the plot.
-
-- Formatters (major and minor) that specify how the tick labels
-  should be drawn.
-
-Once the class is defined, it must be registered with Matplotlib so
-that the user can select it.
-
-A full-fledged and heavily annotated example is in
-:doc:`/gallery/scales/custom_scale`.  There are also some classes
-in :mod:`matplotlib.scale` that may be used as starting points.
-
-
-.. _creating-new-projection:
-
-Creating a new projection
-=========================
-
-Adding a new projection consists of defining a projection axes which
-subclasses :class:`matplotlib.axes.Axes` and includes the following
-elements:
-
-- A transformation from data coordinates into display coordinates.
-
-- An inverse of that transformation.  This is used, for example, to
-  convert mouse positions from screen space back into data space.
-
-- Transformations for the gridlines, ticks and ticklabels.  Custom
-  projections will often need to place these elements in special
-  locations, and Matplotlib has a facility to help with doing so.
-
-- Setting up default values (overriding :meth:`~matplotlib.axes.Axes.cla`),
-  since the defaults for a rectilinear axes may not be appropriate.
-
-- Defining the shape of the axes, for example, an elliptical axes, that will be
-  used to draw the background of the plot and for clipping any data elements.
-
-- Defining custom locators and formatters for the projection.  For
-  example, in a geographic projection, it may be more convenient to
-  display the grid in degrees, even if the data is in radians.
-
-- Set up interactive panning and zooming.  This is left as an
-  "advanced" feature left to the reader, but there is an example of
-  this for polar plots in :mod:`matplotlib.projections.polar`.
-
-- Any additional methods for additional convenience or features.
-
-Once the projection axes is defined, it can be used in one of two ways:
-
-- By defining the class attribute ``name``, the projection axes can be
-  registered with :func:`matplotlib.projections.register_projection`
-  and subsequently simply invoked by name::
-
-      plt.axes(projection='my_proj_name')
-
-- For more complex, parameterisable projections, a generic "projection" object
-  may be defined which includes the method ``_as_mpl_axes``. ``_as_mpl_axes``
-  should take no arguments and return the projection's axes subclass and a
-  dictionary of additional arguments to pass to the subclass' ``__init__``
-  method.  Subsequently a parameterised projection can be initialised with::
-
-      plt.axes(projection=MyProjection(param1=param1_value))
-
-  where MyProjection is an object which implements a ``_as_mpl_axes`` method.
-
-
-A full-fledged and heavily annotated example is in
-:doc:`/gallery/misc/custom_projection`.  The polar plot
-functionality in :mod:`matplotlib.projections.polar` may also be of
-interest.
-
-API documentation
-=================
-
-* :mod:`matplotlib.scale`
-* :mod:`matplotlib.projections`
-* :mod:`matplotlib.projections.polar`
diff --git a/doc/devel/coding_guide.rst b/doc/devel/coding_guide.rst
index 053527477cf9..33062aa445f5 100644
--- a/doc/devel/coding_guide.rst
+++ b/doc/devel/coding_guide.rst
@@ -16,15 +16,15 @@ Pull request guidelines
 Pull requests (PRs) are the mechanism for contributing to Matplotlibs code and
 documentation.
 
-Summary for PR authors
-======================
+Summary for pull request authors
+================================
 
 .. note::
 
    * We value contributions from people with all levels of experience. In
      particular if this is your first PR not everything has to be perfect.
      We'll guide you through the PR process.
-   * Nevertheless, try to follow the guidelines below as well as you can to
+   * Nevertheless, please try to follow the guidelines below as well as you can to
      help make the PR process quick and smooth.
    * Be patient with reviewers. We try our best to respond quickly, but we
      have limited bandwidth. If there is no feedback within a couple of days,
@@ -34,26 +34,28 @@ When making a PR, pay attention to:
 
 .. rst-class:: checklist
 
-* :ref:`Target the master branch <pr-branch-selection>`.
+* :ref:`Target the main branch <pr-branch-selection>`.
 * Adhere to the :ref:`coding_guidelines`.
 * Update the :ref:`documentation <pr-documentation>` if necessary.
 * Aim at making the PR as "ready-to-go" as you can. This helps to speed up
   the review process.
 * It is ok to open incomplete or work-in-progress PRs if you need help or
   feedback from the developers. You may mark these as
-  `draft pull requests <https://help.github.com/en/articles/about-pull-requests#draft-pull-requests>`_
+  `draft pull requests <https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests#draft-pull-requests>`_
   on GitHub.
 * When updating your PR, instead of adding new commits to fix something, please
   consider amending your initial commit(s) to keep the history clean.
-  You can achieve this using::
+  You can achieve this using
+
+  .. code-block:: bash
 
-      git commit --amend --no-edit
-      git push [your-remote-repo] [your-branch] --force-with-lease
+     git commit --amend --no-edit
+     git push [your-remote-repo] [your-branch] --force-with-lease
 
 See also :ref:`contributing` for how to make a PR.
 
-Summary for PR reviewers
-========================
+Summary for pull request reviewers
+==================================
 
 .. note::
 
@@ -76,16 +78,16 @@ Organizational topics:
 .. rst-class:: checklist
 
 * Make sure all :ref:`automated tests <pr-automated-tests>` pass.
-* The PR should :ref:`target the master branch <pr-branch-selection>`.
+* The PR should :ref:`target the main branch <pr-branch-selection>`.
 * Tag with descriptive :ref:`labels <pr-labels>`.
 * Set the :ref:`milestone <pr-milestones>`.
 * Keep an eye on the :ref:`number of commits <pr-squashing>`.
-* Approve if all of the above topics handled.
+* Approve if all of the above topics are handled.
 * :ref:`Merge  <pr-merging>` if a sufficient number of approvals is reached.
 
 .. _pr-guidelines-details:
 
-Detailed Guidelines
+Detailed guidelines
 ===================
 
 .. _pr-documentation:
@@ -121,6 +123,8 @@ Labels
 
 * If you have the rights to set labels, tag the PR with descriptive labels.
   See the `list of labels <https://github.com/matplotlib/matplotlib/labels>`__.
+* If the PR makes changes to the wheel building Action, add the
+  "Run cibuildwheel" label to enable testing wheels.
 
 .. _pr-milestones:
 
@@ -130,20 +134,20 @@ Milestones
 * Set the milestone according to these rules:
 
   * *New features and API changes* are milestoned for the next minor release
-    ``v3.X.0``.
+    ``v3.N.0``.
 
-  * *Bugfixes and docstring changes* are milestoned for the next patch
-    release ``v3.X.Y``
+  * *Bugfixes, tests for released code, and docstring changes* are milestoned
+    for the next patch release ``v3.N.M``.
 
   * *Documentation changes* (all .rst files and examples) are milestoned
-    ``v3.X-doc``
+    ``v3.N-doc``.
 
   If multiple rules apply, choose the first matching from the above list.
 
   Setting a milestone does not imply or guarantee that a PR will be merged for that
   release, but if it were to be merged what release it would be in.
 
-  All of these PRs should target the master branch. The milestone tag triggers
+  All of these PRs should target the main branch. The milestone tag triggers
   an :ref:`automatic backport <automated-backports>` for milestones which have
   a corresponding branch.
 
@@ -159,7 +163,7 @@ Merging
   core developers (those with commit rights) should review all pull
   requests.  If you are the first to review a PR and approve of the
   changes use the GitHub `'approve review'
-  <https://help.github.com/articles/reviewing-changes-in-pull-requests/>`__
+  <https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests>`__
   tool to mark it as such.  If you are a subsequent reviewer please
   approve the review and if you think no more review is needed, merge
   the PR.
@@ -219,6 +223,18 @@ will run on all supported platforms and versions of Python.
 
   .. _tox: https://tox.readthedocs.io/
 
+* If you know your changes do not need to be tested (this is very rare!), all
+  CIs can be skipped for a given commit by including ``[ci skip]`` or
+  ``[skip ci]`` in the commit message. If you know only a subset of CIs need
+  to be run (e.g., if you are changing some block of plain reStructuredText and
+  want only CircleCI to run to render the result), individual CIs can be
+  skipped on individual commits as well by using the following substrings
+  in commit messages:
+
+  - GitHub Actions: ``[skip actions]``
+  - AppVeyor: ``[skip appveyor]`` (must be in the first line of the commit)
+  - Azure Pipelines: ``[skip azp]``
+  - CircleCI: ``[skip circle]``
 
 .. _pr-squashing:
 
@@ -246,20 +262,20 @@ Number of commits and squashing
 
 .. _branches_and_backports:
 
-Branches and Backports
+Branches and backports
 ======================
 
 Current branches
 ----------------
 The current active branches are
 
-*master*
+*main*
   The current development version. Future minor releases (*v3.N.0*) will be
-  branched from this. Supports Python 3.7+.
+  branched from this.
 
 *v3.N.x*
   Maintenance branch for Matplotlib 3.N. Future patch releases will be
-  branched from this.  Supports Python 3.6+.
+  branched from this.
 
 *v3.N.M-doc*
   Documentation for the current release.  On a patch release, this will be
@@ -271,7 +287,7 @@ The current active branches are
 Branch selection for pull requests
 ----------------------------------
 
-Generally, all pull requests should target the master branch.
+Generally, all pull requests should target the main branch.
 
 Other branches are fed through :ref:`automatic <automated-backports>` or
 :ref:`manual <manual-backports>`. Directly
@@ -330,7 +346,7 @@ When doing backports please copy the form used by meeseekdev,
 conflicts make note of them and how you resolved them in the commit
 message.
 
-We do a backport from master to v2.2.x assuming:
+We do a backport from main to v2.2.x assuming:
 
 * ``matplotlib`` is a read-only remote branch of the matplotlib/matplotlib repo
 
@@ -340,22 +356,26 @@ the merge notification) or through the git CLI tools.
 
 Assuming that you already have a local branch ``v2.2.x`` (if not, then
 ``git checkout -b v2.2.x``), and that your remote pointing to
-``https://github.com/matplotlib/matplotlib`` is called ``upstream``::
+``https://github.com/matplotlib/matplotlib`` is called ``upstream``:
 
-  git fetch upstream
-  git checkout v2.2.x  # or include -b if you don't already have this.
-  git reset --hard upstream/v2.2.x
-  git cherry-pick -m 1 TARGET_SHA
-  # resolve conflicts and commit if required
+.. code-block:: bash
+
+   git fetch upstream
+   git checkout v2.2.x  # or include -b if you don't already have this.
+   git reset --hard upstream/v2.2.x
+   git cherry-pick -m 1 TARGET_SHA
+   # resolve conflicts and commit if required
 
 Files with conflicts can be listed by ``git status``,
 and will have to be fixed by hand (search on ``>>>>>``).  Once
 the conflict is resolved, you will have to re-add the file(s) to the branch
-and then continue the cherry pick::
+and then continue the cherry pick:
+
+.. code-block:: bash
 
-  git add lib/matplotlib/conflicted_file.py
-  git add lib/matplotlib/conflicted_file2.py
-  git cherry-pick --continue
+   git add lib/matplotlib/conflicted_file.py
+   git add lib/matplotlib/conflicted_file2.py
+   git cherry-pick --continue
 
 Use your discretion to push directly to upstream or to open a PR; be
-sure to push or PR against the ``v2.2.x`` upstream branch, not ``master``!
+sure to push or PR against the ``v2.2.x`` upstream branch, not ``main``!
diff --git a/doc/devel/color_changes.rst b/doc/devel/color_changes.rst
index d36a873c7225..f7646ded7c14 100644
--- a/doc/devel/color_changes.rst
+++ b/doc/devel/color_changes.rst
@@ -1,10 +1,11 @@
 .. _color_changes:
 
 *********************
-Default Color changes
+Default color changes
 *********************
 
-As discussed at length elsewhere [insert links], ``jet`` is an
+As discussed at length `elsewhere <https://bids.github.io/colormap/>`__ ,
+``jet`` is an
 empirically bad colormap and should not be the default colormap.
 Due to the position that changing the appearance of the plot breaks
 backward compatibility, this change has been put off for far longer
@@ -14,7 +15,7 @@ plots and to adopt a different colormap for filled plots (``imshow``,
 ``pcolor``, ``contourf``, etc) and for scatter like plots.
 
 
-Default Heat Map Colormap
+Default heat map colormap
 -------------------------
 
 The choice of a new colormap is fertile ground to bike-shedding ("No,
@@ -57,10 +58,10 @@ Nathaniel Smith) to evaluate proposed colormaps.
 Example script
 ++++++++++++++
 
-Proposed Colormaps
+Proposed colormaps
 ++++++++++++++++++
 
-Default Scatter Colormap
+Default scatter colormap
 ------------------------
 
 For heat-map like applications it can be desirable to cover as much of
@@ -99,10 +100,10 @@ Example script
    qd = np.random.rand(np.prod(X.shape))
    Q.set_array(qd)
 
-Proposed Colormaps
+Proposed colormaps
 ++++++++++++++++++
 
-Color Cycle / Qualitative colormap
+Color cycle / qualitative colormap
 -----------------------------------
 
 When plotting lines it is frequently desirable to plot multiple lines
@@ -131,5 +132,5 @@ Example script
 
    ax2.set_xlim(0, 2*np.pi)
 
-Proposed Color cycle
+Proposed color cycle
 ++++++++++++++++++++
diff --git a/doc/devel/contributing.rst b/doc/devel/contributing.rst
index 236782ae95c8..362cf09c5f7e 100644
--- a/doc/devel/contributing.rst
+++ b/doc/devel/contributing.rst
@@ -7,38 +7,90 @@ Contributing
 This project is a community effort, and everyone is welcome to
 contribute. Everyone within the community
 is expected to abide by our
-`code of conduct <https://github.com/matplotlib/matplotlib/blob/master/CODE_OF_CONDUCT.md>`_.
+`code of conduct <https://github.com/matplotlib/matplotlib/blob/main/CODE_OF_CONDUCT.md>`_.
 
 The project is hosted on
 https://github.com/matplotlib/matplotlib
 
-Contributor Incubator
-=====================
-
-If you are interested in becoming a regular contributor to Matplotlib, but
-don't know where to start or feel insecure about it, you can join our non-public
-communication channel for new contributors. To do so, please go to `gitter
-<https://gitter.im/matplotlib/matplotlib>`_ and ask to be added to '#incubator'.
-This is a private gitter room moderated by core Matplotlib developers where you can
-get guidance and support for your first few PRs.  This is a place you can ask questions
-about anything: how to use git, github, how our PR review process works, technical questions
-about the code, what makes for good documentation or a blog post, how to get involved involved
-in community work, or get "pre-review" on your PR.
-
+Get Connected
+=============
+
+Do I really have something to contribute to Matplotlib?
+-------------------------------------------------------
+
+100% yes. There are so many ways to contribute to our community.
+
+When in doubt, we recommend going together! Get connected with our community of
+active contributors, many of whom felt just like you when they started out and
+are happy to welcome you and support you as you get to know how we work, and
+where things are. Take a look at the next sections to learn more.
+
+Contributor incubator
+---------------------
+
+The incubator is our non-public communication channel for new contributors. It
+is a private gitter room moderated by core Matplotlib developers where you can
+get guidance and support for your first few PRs. It's a place you can ask
+questions about anything: how to use git, github, how our PR review process
+works, technical questions about the code, what makes for good documentation
+or a blog post, how to get involved in community work, or get
+"pre-review" on your PR.
+
+To join, please go to our public `gitter
+<https://gitter.im/matplotlib/matplotlib>`_ community channel, and ask to be
+added to '#incubator'. One of our core developers will see your message and will
+add you.
+
+New Contributors meeting
+------------------------
+
+Once a month, we host a meeting to discuss topics that interest new
+contributors. Anyone can attend, present, or sit in and listen to the call.
+Among our attendees are fellow new contributors, as well as maintainers, and
+veteran contributors, who are keen to support onboarding of new folks and
+share their experience. You can find our community calendar link at the
+`Scientific Python website <https://scientific-python.org/calendars/>`_, and
+you can browse previous meeting notes on `github
+<https://github.com/matplotlib/ProjectManagement/tree/master/
+new_contributor_meeting>`_.
+We recommend joining the meeting to clarify any doubts, or lingering
+questions you might have, and to get to know a few of the people behind the
+GitHub handles 😉. You can reach out to @noatamir on `gitter
+<https://gitter.im/matplotlib/matplotlib>`_ for any clarifications or
+suggestions. We <3 feedback!
 
 .. _new_contributors:
 
-Issues for New Contributors
+Issues for new contributors
 ---------------------------
 
 While any contributions are welcome, we have marked some issues as
-particularly suited for new contributors by the label
-`good first issue <https://github.com/matplotlib/matplotlib/labels/good%20first%20issue>`_
-These are well documented issues, that do not require a deep understanding of
-the internals of Matplotlib. The issues may additionally be tagged with a
-difficulty. ``Difficulty: Easy`` is suited for people with little Python experience.
-``Difficulty: Medium`` and ``Difficulty: Hard`` are not trivial to solve and
-require more thought and programming experience.
+particularly suited for new contributors by the label `good first issue
+<https://github.com/matplotlib/matplotlib/labels/good%20first%20issue>`_. These
+are well documented issues, that do not require a deep understanding of the
+internals of Matplotlib. The issues may additionally be tagged with a
+difficulty. ``Difficulty: Easy`` is suited for people with little Python
+experience. ``Difficulty: Medium`` and ``Difficulty: Hard`` require more
+programming experience. This could be for a variety of reasons, among them,
+though not necessarily all at the same time:
+
+- The issue is in areas of the code base which have more interdependencies,
+  or legacy code.
+- It has less clearly defined tasks, which require some independent
+  exploration, making suggestions, or follow-up discussions to clarify a good
+  path to resolve the issue.
+- It involves Python features such as decorators and context managers, which
+  have subtleties due to our implementation decisions.
+
+In general, the Matplotlib project does not assign issues. Issues are
+"assigned" or "claimed" by opening a PR; there is no other assignment
+mechanism. If you have opened such a PR, please comment on the issue thread to
+avoid duplication of work. Please check if there is an existing PR for the
+issue you are addressing. If there is, try to work with the author by
+submitting reviews of their code or commenting on the PR rather than opening
+a new PR; duplicate PRs are subject to being closed.  However, if the existing
+PR is an outline, unlikely to work, or stalled, and the original author is
+unresponsive, feel free to open a new PR referencing the old one.
 
 .. _submitting-a-bug-report:
 
@@ -73,11 +125,13 @@ If you are reporting a bug, please do your best to include the following:
       >>> platform.python_version()
       '3.9.2'
 
-We have preloaded the issue creation page with a Markdown template that you can
+We have preloaded the issue creation page with a Markdown form that you can
 use to organize this information.
 
 Thank you for your help in keeping bug reports complete, targeted and descriptive.
 
+.. _request-a-new-feature:
+
 Requesting a new feature
 ========================
 
@@ -117,13 +171,13 @@ A brief overview is:
       git clone https://github.com/<YOUR GITHUB USERNAME>/matplotlib.git
 
 4. Enter the directory and install the local version of Matplotlib.
-   See ref`<installing_for_devs>` for instructions
+   See :ref:`installing_for_devs` for instructions
 
 5. Create a branch to hold your changes::
 
-      git checkout -b my-feature origin/master
+      git checkout -b my-feature origin/main
 
-   and start making changes. Never work in the ``master`` branch!
+   and start making changes. Never work in the ``main`` branch!
 
 6. Work on this copy, on your computer, using Git to do the version control.
    When you're done editing e.g., ``lib/matplotlib/collections.py``, do::
@@ -140,7 +194,7 @@ Finally, go to the web page of your fork of the Matplotlib repo, and click
 
 .. seealso::
 
-  * `Git documentation <https://git-scm.com/documentation>`_
+  * `Git documentation <https://git-scm.com/doc>`_
   * `Git-Contributing to a Project <https://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project>`_
   * `Introduction to GitHub  <https://lab.github.com/githubtraining/introduction-to-github>`_
   * :ref:`development-workflow` for best practices for Matplotlib
@@ -160,19 +214,31 @@ rules before submitting a pull request:
   appropriate. Use the `numpy docstring standard
   <https://numpydoc.readthedocs.io/en/latest/format.html>`_.
 
-* Formatting should follow the recommendations of `PEP8
-  <https://www.python.org/dev/peps/pep-0008/>`__. You should consider
-  installing/enabling automatic PEP8 checking in your editor.  Part of the test
-  suite is checking PEP8 compliance, things go smoother if the code is mostly
-  PEP8 compliant to begin with.
+* Formatting should follow the recommendations of PEP8_, as enforced by
+  flake8_.  You can check flake8 compliance from the command line with ::
+
+    python -m pip install flake8
+    flake8 /path/to/module.py
+
+  or your editor may provide integration with it.  Note that Matplotlib
+  intentionally does not use the black_ auto-formatter (1__), in particular due
+  to its unability to understand the semantics of mathematical expressions
+  (2__, 3__).
+
+  .. _PEP8: https://www.python.org/dev/peps/pep-0008/
+  .. _flake8: https://flake8.pycqa.org/
+  .. _black: https://black.readthedocs.io/
+  .. __: https://github.com/matplotlib/matplotlib/issues/18796
+  .. __: https://github.com/psf/black/issues/148
+  .. __: https://github.com/psf/black/issues/1984
 
 * Each high-level plotting function should have a simple example in the
   ``Example`` section of the docstring.  This should be as simple as possible
   to demonstrate the method.  More complex examples should go in the
   ``examples`` tree.
 
-* Changes (both new features and bugfixes) should be tested. See :ref:`testing`
-  for more details.
+* Changes (both new features and bugfixes) should have good test coverage. See
+  :ref:`testing` for more details.
 
 * Import the following modules using the standard scipy conventions::
 
@@ -201,19 +267,6 @@ rules before submitting a pull request:
 * See below for additional points about :ref:`keyword-argument-processing`, if
   applicable for your pull request.
 
-In addition, you can check for common programming errors with the following
-tools:
-
-* Code with a good unittest coverage (at least 70%, better 100%), check with::
-
-   python -m pip install coverage
-   python -m pytest --cov=matplotlib --showlocals -v
-
-* No pyflakes warnings, check with::
-
-   python -m pip install pyflakes
-   pyflakes path/to/module.py
-
 .. note::
 
     The current state of the Matplotlib code base is not compliant with all
@@ -264,7 +317,7 @@ Other ways to contribute
 It also helps us if you spread the word: reference the project from your blog
 and articles or link to it from your website!  If Matplotlib contributes to a
 project that leads to a scientific publication, please follow the
-:doc:`/citing` guidelines.
+:doc:`/users/project/citing` guidelines.
 
 .. _coding_guidelines:
 
@@ -274,30 +327,66 @@ Coding guidelines
 API changes
 -----------
 
-Changes to the public API must follow a standard deprecation procedure to
-prevent unexpected breaking of code that uses Matplotlib.
-
-- Deprecations must be announced via a new file in
-  a new file in :file:`doc/api/next_api_changes/deprecations/` with
-  naming convention ``99999-ABC.rst`` where ``99999`` is the pull request
-  number and ``ABC`` are the contributor's initials.
-- Deprecations are targeted at the next point-release (i.e. 3.x.0).
-- The deprecated API should, to the maximum extent possible, remain fully
-  functional during the deprecation period. In cases where this is not
-  possible, the deprecation must never make a given piece of code do something
-  different than it was before; at least an exception should be raised.
-- If possible, usage of an deprecated API should emit a
-  `.MatplotlibDeprecationWarning`. There are a number of helper tools for this:
-
-  - Use ``cbook.warn_deprecated()`` for general deprecation warnings.
-  - Use the decorator ``@cbook.deprecated`` to deprecate classes, functions,
-    methods, or properties.
-  - To warn on changes of the function signature, use the decorators
-    ``@cbook._delete_parameter``, ``@cbook._rename_parameter``, and
-    ``@cbook._make_keyword_only``.
-
-- Deprecated API may be removed two point-releases after they were deprecated.
-
+API consistency and stability are of great value. Therefore, API changes
+(e.g. signature changes, behavior changes, removals) will only be conducted
+if the added benefit is worth the user effort for adapting.
+
+Because we are a visualization library our primary output is the final
+visualization the user sees.  Thus it is our :ref:`long standing
+<color_changes>` policy that the appearance of the figure is part of the API
+and any changes, either semantic or esthetic, will be treated as a
+backwards-incompatible API change.
+
+API changes in Matplotlib have to be performed following the deprecation process
+below, except in very rare circumstances as deemed necessary by the development team.
+This ensures that users are notified before the change will take effect and thus
+prevents unexpected breaking of code.
+
+Rules
+~~~~~
+
+- Deprecations are targeted at the next point.release (e.g. 3.x)
+- Deprecated API is generally removed two point-releases after introduction
+  of the deprecation. Longer deprecations can be imposed by core developers on
+  a case-by-case basis to give more time for the transition
+- The old API must remain fully functional during the deprecation period
+- If alternatives to the deprecated API exist, they should be available
+  during the deprecation period
+- If in doubt, decisions about API changes are finally made by the
+  API consistency lead developer
+
+Introducing
+~~~~~~~~~~~
+
+1. Announce the deprecation in a new file
+   :file:`doc/api/next_api_changes/deprecations/99999-ABC.rst` where ``99999``
+   is the pull request number and ``ABC`` are the contributor's initials.
+2. If possible, issue a `~matplotlib.MatplotlibDeprecationWarning` when the
+   deprecated API is used. There are a number of helper tools for this:
+
+   - Use ``_api.warn_deprecated()`` for general deprecation warnings
+   - Use the decorator ``@_api.deprecated`` to deprecate classes, functions,
+     methods, or properties
+   - To warn on changes of the function signature, use the decorators
+     ``@_api.delete_parameter``, ``@_api.rename_parameter``, and
+     ``@_api.make_keyword_only``
+
+   All these helpers take a first parameter *since*, which should be set to
+   the next point release, e.g. "3.x".
+
+   You can use standard rst cross references in *alternative*.
+
+Expiring
+~~~~~~~~
+
+1. Announce the API changes in a new file
+   :file:`doc/api/next_api_changes/[kind]/99999-ABC.rst` where ``99999``
+   is the pull request number and ``ABC`` are the contributor's initials, and
+   ``[kind]`` is one of the folders :file:`behavior`, :file:`development`,
+   :file:`removals`. See :file:`doc/api/next_api_changes/README.rst` for more
+   information. For the content, you can usually copy the deprecation notice
+   and adapt it slightly.
+2. Change the code functionality and remove any related deprecation warnings.
 
 Adding new API
 --------------
@@ -323,7 +412,7 @@ New modules and files: installation
 
 * If you have added new files or directories, or reorganized existing
   ones, make sure the new files are included in the match patterns in
-  :file:`MANIFEST.in`, and/or in *package_data* in :file:`setup.py`.
+  in *package_data* in :file:`setupext.py`.
 
 C/C++ extensions
 ----------------
@@ -342,30 +431,33 @@ C/C++ extensions
   docstrings, and the Numpydoc format is well understood in the
   scientific Python community.
 
+* C/C++ code in the :file:`extern/` directory is vendored, and should be kept
+  close to upstream whenever possible.  It can be modified to fix bugs or
+  implement new features only if the required changes cannot be made elsewhere
+  in the codebase.  In particular, avoid making style fixes to it.
+
 .. _keyword-argument-processing:
 
 Keyword argument processing
 ---------------------------
 
 Matplotlib makes extensive use of ``**kwargs`` for pass-through customizations
-from one function to another. A typical example is in `matplotlib.pyplot.text`.
-The definition of the pylab text function is a simple pass-through to
-`matplotlib.axes.Axes.text`::
+from one function to another.  A typical example is
+`~matplotlib.axes.Axes.text`.  The definition of `matplotlib.pyplot.text` is a
+simple pass-through to `matplotlib.axes.Axes.text`::
 
-  # in pylab.py
-  def text(*args, **kwargs):
-      ret = gca().text(*args, **kwargs)
-      draw_if_interactive()
-      return ret
+  # in pyplot.py
+  def text(x, y, s, fontdict=None, **kwargs):
+      return gca().text(x, y, s, fontdict=fontdict, **kwargs)
 
-`~matplotlib.axes.Axes.text` in simplified form looks like this, i.e., it just
+`matplotlib.axes.Axes.text` (simplified for illustration) just
 passes all ``args`` and ``kwargs`` on to ``matplotlib.text.Text.__init__``::
 
   # in axes/_axes.py
-  def text(self, x, y, s, fontdict=None, withdash=False, **kwargs):
+  def text(self, x, y, s, fontdict=None, **kwargs):
       t = Text(x=x, y=y, text=s, **kwargs)
 
-and ``matplotlib.text.Text.__init__`` (again with liberties for illustration)
+and ``matplotlib.text.Text.__init__`` (again, simplified)
 just passes them on to the `matplotlib.artist.Artist.update` method::
 
   # in text.py
@@ -436,11 +528,13 @@ or manually with ::
   logging.basicConfig(level=logging.DEBUG)
   import matplotlib.pyplot as plt
 
-Then they will receive messages like::
+Then they will receive messages like
+
+.. code-block:: none
 
-  DEBUG:matplotlib.backends:backend MacOSX version unknown
-  DEBUG:matplotlib.yourmodulename:Here is some information
-  DEBUG:matplotlib.yourmodulename:Here is some more detailed information
+   DEBUG:matplotlib.backends:backend MacOSX version unknown
+   DEBUG:matplotlib.yourmodulename:Here is some information
+   DEBUG:matplotlib.yourmodulename:Here is some more detailed information
 
 Which logging level to use?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -485,14 +579,14 @@ Matplotlib. For example, for the module::
         if bottom == top:
             warnings.warn('Attempting to set identical bottom==top')
 
-
 running the script::
 
     from matplotlib import my_matplotlib_module
-    my_matplotlib_module.set_range(0, 0)  #set range
+    my_matplotlib_module.set_range(0, 0)  # set range
 
+will display
 
-will display::
+.. code-block:: none
 
     UserWarning: Attempting to set identical bottom==top
     warnings.warn('Attempting to set identical bottom==top')
@@ -505,10 +599,12 @@ Modifying the module to use `._api.warn_external`::
         if bottom == top:
             _api.warn_external('Attempting to set identical bottom==top')
 
-and running the same script will display::
+and running the same script will display
+
+.. code-block:: none
 
-  UserWarning: Attempting to set identical bottom==top
-  my_matplotlib_module.set_range(0, 0)  #set range
+   UserWarning: Attempting to set identical bottom==top
+   my_matplotlib_module.set_range(0, 0)  # set range
 
 .. _logging tutorial: https://docs.python.org/3/howto/logging.html#logging-basic-tutorial
 
diff --git a/doc/devel/dependencies.rst b/doc/devel/dependencies.rst
index c28283517005..1bef37f86690 100644
--- a/doc/devel/dependencies.rst
+++ b/doc/devel/dependencies.rst
@@ -4,84 +4,92 @@
 Dependencies
 ============
 
+Runtime dependencies
+====================
+
+
 Mandatory dependencies
-======================
+----------------------
 
 When installing through a package manager like ``pip`` or ``conda``, the
 mandatory dependencies are automatically installed. This list is mainly for
 reference.
 
-* `Python <https://www.python.org/downloads/>`_ (>= 3.7)
-* `NumPy <https://numpy.org>`_ (>= 1.16)
-* `setuptools <https://setuptools.readthedocs.io/en/latest/>`_
+* `Python <https://www.python.org/downloads/>`_ (>= 3.8)
+* `contourpy <https://pypi.org/project/contourpy/>`_ (>= 1.0.1)
 * `cycler <https://matplotlib.org/cycler/>`_ (>= 0.10.0)
-* `dateutil <https://pypi.org/project/python-dateutil>`_ (>= 2.7)
+* `dateutil <https://pypi.org/project/python-dateutil/>`_ (>= 2.7)
+* `fontTools <https://fonttools.readthedocs.io/en/latest/>`_ (>= 4.22.0)
 * `kiwisolver <https://github.com/nucleic/kiwi>`_ (>= 1.0.1)
+* `NumPy <https://numpy.org>`_ (>= 1.19)
+* `packaging <https://pypi.org/project/packaging/>`_ (>= 20.0)
 * `Pillow <https://pillow.readthedocs.io/en/latest/>`_ (>= 6.2)
-* `pyparsing <https://pypi.org/project/pyparsing/>`_ (>=2.2.1)
+* `pyparsing <https://pypi.org/project/pyparsing/>`_ (>= 2.2.1)
+* `setuptools <https://setuptools.readthedocs.io/en/latest/>`_
 
 
 .. _optional_dependencies:
 
 Optional dependencies
-=====================
+---------------------
 
 The following packages and tools are not required but extend the capabilities
 of Matplotlib.
 
 Backends
---------
+~~~~~~~~
 
 Matplotlib figures can be rendered to various user interfaces. See
 :ref:`what-is-a-backend` for more details on the optional Matplotlib backends
 and the capabilities they provide.
 
-* Tk_ (>= 8.3, != 8.6.0 or 8.6.1) [#]_: for the Tk-based backends.
-* PyQt4_ (>= 4.6) or PySide_ (>= 1.0.3) [#]_: for the Qt4-based backends.
-* PyQt5_ or PySide2_: for the Qt5-based backends.
-* PyGObject_: for the GTK3-based backends [#]_.
-* wxPython_ (>= 4) [#]_: for the wx-based backends.
-* pycairo_ (>= 1.11.0) or cairocffi_ (>= 0.8): for the GTK3 and/or cairo-based
-  backends.
-* Tornado_: for the WebAgg backend.
+* Tk_ (>= 8.4, != 8.6.0 or 8.6.1): for the Tk-based backends. Tk is part of
+  most standard Python installations, but it's not part of Python itself and
+  thus may not be present in rare cases.
+* PyQt6_ (>= 6.1), PySide6_, PyQt5_, or PySide2_: for the Qt-based backends.
+* PyGObject_ and pycairo_ (>= 1.14.0): for the GTK-based backends. If using pip
+  (but not conda or system package manager) PyGObject must be built from
+  source; see `pygobject documentation
+  <https://pygobject.readthedocs.io/en/latest/devguide/dev_environ.html>`_.
+* pycairo_ (>= 1.14.0) or cairocffi_ (>= 0.8): for cairo-based backends.
+* wxPython_ (>= 4): for the wx-based backends.  If using pip (but not conda or
+  system package manager) on Linux wxPython wheels must be manually downloaded
+  from https://wxpython.org/pages/downloads/.
+* Tornado_ (>= 5): for the WebAgg backend.
+* ipykernel_: for the nbagg backend.
+* macOS (>= 10.12): for the macosx backend.
 
 .. _Tk: https://docs.python.org/3/library/tk.html
-.. _PyQt4: https://pypi.org/project/PyQt4
-.. _PySide: https://pypi.org/project/PySide
-.. _PyQt5: https://pypi.org/project/PyQt5
-.. _PySide2: https://pypi.org/project/PySide2
+.. _PyQt5: https://pypi.org/project/PyQt5/
+.. _PySide2: https://pypi.org/project/PySide2/
+.. _PyQt6: https://pypi.org/project/PyQt6/
+.. _PySide6: https://pypi.org/project/PySide6/
 .. _PyGObject: https://pygobject.readthedocs.io/en/latest/
 .. _wxPython: https://www.wxpython.org/
 .. _pycairo: https://pycairo.readthedocs.io/en/latest/
 .. _cairocffi: https://cairocffi.readthedocs.io/en/latest/
-.. _Tornado: https://pypi.org/project/tornado
-
-.. [#] Tk is part of most standard Python installations, but it's not part of
-       Python itself and thus may not be present in rare cases.
-.. [#] PySide cannot be pip-installed on Linux (but can be conda-installed).
-.. [#] If using pip (and not conda), PyGObject must be built from source; see
-       https://pygobject.readthedocs.io/en/latest/devguide/dev_environ.html.
-.. [#] If using pip (and not conda) on Linux, wxPython wheels must be manually
-       downloaded from https://wxpython.org/pages/downloads/.
+.. _Tornado: https://pypi.org/project/tornado/
+.. _ipykernel: https://pypi.org/project/ipykernel/
 
 Animations
-----------
+~~~~~~~~~~
 
 * `ffmpeg <https://www.ffmpeg.org/>`_: for saving movies.
 * `ImageMagick <https://www.imagemagick.org/script/index.php>`_: for saving
   animated gifs.
 
 Font handling and rendering
----------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 * `LaTeX <https://www.latex-project.org/>`_ (with `cm-super
-  <https://ctan.org/pkg/cm-super>`__ ) and `GhostScript (>=9.0)
-  <https://ghostscript.com/download/>`_ : for rendering text with LaTeX.
+  <https://ctan.org/pkg/cm-super>`__ and `underscore
+  <https://ctan.org/pkg/underscore>`__) and `GhostScript (>= 9.0)
+  <https://ghostscript.com/releases/>`_: for rendering text with LaTeX.
 * `fontconfig <https://www.fontconfig.org>`_ (>= 2.7): for detection of system
   fonts on Linux.
 
 C libraries
-===========
+-----------
 
 Matplotlib brings its own copies of the following libraries:
 
@@ -102,7 +110,7 @@ rasterize characters differently) and of Qhull.  As an exception, Matplotlib
 defaults to the system version of FreeType on AIX.
 
 To force Matplotlib to use a copy of FreeType or Qhull already installed in
-your system, create a :file:`setup.cfg` file with the following contents:
+your system, create a :file:`mplsetup.cfg` file with the following contents:
 
 .. code-block:: cfg
 
@@ -161,3 +169,159 @@ If you go this route but need to reset and rebuild to change your settings,
 remember to clear your artifacts before re-building::
 
   git clean -xfd
+
+
+Minimum pip / manylinux support (linux)
+---------------------------------------
+
+Matplotlib publishes `manylinux wheels <https://github.com/pypa/manylinux>`_
+which have a minimum version of pip which will recognize the wheels
+
+- Python 3.8: ``manylinx2010`` / pip >= 19.0
+- Python 3.9+: ``manylinx2014`` / pip >= 19.3
+
+In all cases the required version of pip is embedded in the CPython source.
+
+
+
+.. _development-dependencies:
+
+Dependencies for building Matplotlib
+====================================
+
+.. _setup-dependencies:
+
+Setup dependencies
+------------------
+
+- `certifi <https://pypi.org/project/certifi/>`_ (>= 2020.06.20).  Used while
+  downloading the freetype and QHull source during build.  This is not a
+  runtime dependency.
+- `setuptools_scm <https://pypi.org/project/setuptools-scm/>`_ (>= 7).  Used to
+  update the reported ``mpl.__version__`` based on the current git commit.
+  Also a runtime dependency for editable installs.
+- `NumPy <https://numpy.org>`_ (>= 1.19).  Also a runtime dependency.
+
+
+.. _compile-dependencies:
+
+C++ compiler
+------------
+
+Matplotlib requires a C++ compiler that supports C++11.
+
+- `gcc 4.8.1 <https://gcc.gnu.org/projects/cxx-status.html#cxx11>`_ or higher
+- `clang 3.3 <https://clang.llvm.org/cxx_status.html>`_ or higher
+- `Visual Studio 2015
+  <https://docs.microsoft.com/en-us/cpp/overview/visual-cpp-language-conformance?view=msvc-140>`_
+  (aka VS 14.0) or higher
+
+
+.. _test-dependencies:
+
+Dependencies for testing Matplotlib
+===================================
+This section lists the additional software required for
+:ref:`running the tests <testing>`.
+
+Required:
+
+- pytest_ (>= 3.6)
+
+Optional:
+
+In addition to all of the optional dependencies on the main library, for
+testing the following will be used if they are installed.
+
+- Ghostscript_ (>= 9.0, to render PDF files)
+- Inkscape_ (to render SVG files)
+- nbformat_ and nbconvert_ used to test the notebook backend
+- pandas_ used to test compatibility with Pandas
+- pikepdf_ used in some tests for the pgf and pdf backends
+- psutil_ used in testing the interactive backends
+- pytest-cov_ (>= 2.3.1) to collect coverage information
+- pytest-flake8_ to test coding standards using flake8_
+- pytest-timeout_ to limit runtime in case of stuck tests
+- pytest-xdist_ to run tests in parallel
+- pytest-xvfb_ to run tests without windows popping up (Linux)
+- pytz_ used to test pytz int
+- sphinx_ used to test our sphinx extensions
+- WenQuanYi Zen Hei and `Noto Sans CJK <https://fonts.google.com/noto/use>`_
+  fonts for testing font fallback and non-western fonts
+- xarray_ used to test compatibility with xarray
+
+If any of these dependencies are not discovered the tests that rely on them
+will be skipped by pytest.
+
+.. note::
+
+  When installing Inkscape on Windows, make sure that you select “Add
+  Inkscape to system PATH�, either for all users or current user, or the
+  tests will not find it.
+
+.. _Ghostscript: https://ghostscript.com/
+.. _Inkscape: https://inkscape.org
+.. _flake8: https://pypi.org/project/flake8/
+.. _nbconvert: https://pypi.org/project/nbconvert/
+.. _nbformat: https://pypi.org/project/nbformat/
+.. _pandas: https://pypi.org/project/pandas/
+.. _pikepdf: https://pypi.org/project/pikepdf/
+.. _psutil: https://pypi.org/project/psuitl/
+.. _pytz: https://fonts.google.com/noto/use#faq
+.. _pytest-cov: https://pytest-cov.readthedocs.io/en/latest/
+.. _pytest-flake8: https://pypi.org/project/pytest-flake8/
+.. _pytest-timeout: https://pypi.org/project/pytest-timeout/
+.. _pytest-xdist: https://pypi.org/project/pytest-xdist/
+.. _pytest-xvfb: https://pypi.org/project/pytest-xvfb/
+.. _pytest: http://doc.pytest.org/en/latest/
+.. _sphinx: https://pypi.org/project/Sphinx/
+.. _xarray: https://pypi.org/project/xarray/
+
+
+.. _doc-dependencies:
+
+Dependencies for building Matplotlib's documentation
+====================================================
+
+Python packages
+---------------
+The additional Python packages required to build the
+:ref:`documentation <documenting-matplotlib>` are listed in
+:file:`doc-requirements.txt` and can be installed using ::
+
+    pip install -r requirements/doc/doc-requirements.txt
+
+The content of :file:`doc-requirements.txt` is also shown below:
+
+   .. include:: ../../requirements/doc/doc-requirements.txt
+      :literal:
+
+Additional external dependencies
+--------------------------------
+Required:
+
+* a minimal working LaTeX distribution
+* `Graphviz <http://www.graphviz.org/download>`_
+* the following LaTeX packages (if your OS bundles TeXLive, the
+  "complete" version of the installer, e.g. "texlive-full" or "texlive-all",
+  will often automatically include these packages):
+
+  * `cm-super <https://ctan.org/pkg/cm-super>`_
+  * `dvipng <https://ctan.org/pkg/dvipng>`_
+  * `underscore <https://ctan.org/pkg/underscore>`_
+
+Optional, but recommended:
+
+* `Inkscape <https://inkscape.org>`_
+* `optipng <http://optipng.sourceforge.net>`_
+* the font "Humor Sans" (aka the "XKCD" font), or the free alternative
+  `Comic Neue <http://comicneue.com/>`_
+* the font "Times New Roman"
+
+.. note::
+
+  The documentation will not build without LaTeX and Graphviz.  These are not
+  Python packages and must be installed separately. The documentation can be
+  built without Inkscape and optipng, but the build process will raise various
+  warnings. If the build process warns that you are missing fonts, make sure
+  your LaTeX distribution bundles cm-super or install it separately.
diff --git a/doc/devel/development_setup.rst b/doc/devel/development_setup.rst
index d926f401c757..d69ca18f7c37 100644
--- a/doc/devel/development_setup.rst
+++ b/doc/devel/development_setup.rst
@@ -4,49 +4,90 @@
 Setting up Matplotlib for development
 =====================================
 
+To set up Matplotlib for development follow these steps:
+
+.. contents::
+   :local:
+
+Retrieve the latest version of the code
+=======================================
+
+Matplotlib is hosted at https://github.com/matplotlib/matplotlib.git.
+
+You can retrieve the latest sources with the command (see
+:ref:`set-up-fork` for more details)
+
+.. tab-set::
+
+   .. tab-item:: https
+
+      .. code-block:: bash
+
+         git clone https://github.com/matplotlib/matplotlib.git
+
+   .. tab-item:: ssh
+
+      .. code-block:: bash
+
+         git clone git@github.com:matplotlib/matplotlib.git
+
+      This requires you to setup an `SSH key`_ in advance, but saves you from
+      typing your password at every connection.
+
+      .. _SSH key: https://docs.github.com/en/authentication/connecting-to-github-with-ssh
+
+This will place the sources in a directory :file:`matplotlib` below your
+current working directory. Change into this directory::
+
+    cd matplotlib
+
+
 .. _dev-environment:
 
-Creating a dedicated environment
-================================
+Create a dedicated environment
+==============================
 You should set up a dedicated environment to decouple your Matplotlib
 development from other Python and Matplotlib installations on your system.
-Here we use python's virtual environment `venv`_, but you may also use others
-such as conda.
+
+The simplest way to do this is to use either Python's virtual environment
+`venv`_ or `conda`_.
 
 .. _venv: https://docs.python.org/3/library/venv.html
+.. _conda: https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html
 
-A new environment can be set up with ::
+.. tab-set::
 
-   python -m venv <file folder location>
+   .. tab-item:: venv environment
 
-and activated with one of the following::
+      Create a new `venv`_ environment with ::
 
-   source <file folder location>/bin/activate  # Linux/macOS
-   <file folder location>\Scripts\activate.bat  # Windows cmd.exe
-   <file folder location>\Scripts\Activate.ps1  # Windows PowerShell
+        python -m venv <file folder location>
 
-Whenever you plan to work on Matplotlib, remember to activate the development
-environment in your shell.
+      and activate it with one of the following ::
 
-Retrieving the latest version of the code
-=========================================
+        source <file folder location>/bin/activate  # Linux/macOS
+        <file folder location>\Scripts\activate.bat  # Windows cmd.exe
+        <file folder location>\Scripts\Activate.ps1  # Windows PowerShell
 
-Matplotlib is hosted at https://github.com/matplotlib/matplotlib.git.
+   .. tab-item:: conda environment
 
-You can retrieve the latest sources with the command (see
-:ref:`set-up-fork` for more details)::
+      Create a new `conda`_ environment with ::
 
-    git clone https://github.com/matplotlib/matplotlib.git
+        conda env create -f environment.yml
 
-This will place the sources in a directory :file:`matplotlib` below your
-current working directory.
+      You can use ``mamba`` instead of ``conda`` in the above command if
+      you have `mamba`_ installed.
+
+      .. _mamba: https://mamba.readthedocs.io/en/latest/
+
+      Activate the environment using ::
 
-If you have the proper privileges, you can use ``git@`` instead of
-``https://``, which works through the ssh protocol and might be easier to use
-if you are using 2-factor authentication.
+        conda activate mpl-dev
 
-Installing Matplotlib in editable mode
-======================================
+Remember to activate the environment whenever you start working on Matplotlib.
+
+Install Matplotlib in editable mode
+===================================
 Install Matplotlib in editable mode from the :file:`matplotlib` directory
 using the command ::
 
@@ -60,76 +101,24 @@ true for ``*.py`` files.  If you change the C-extension source (which might
 also happen if you change branches) you will have to re-run
 ``python -m pip install -ve .``
 
-.. _test-dependencies:
+Install additional development dependencies
+===========================================
+See :ref:`development-dependencies`.
 
-Additional dependencies for testing
+Install pre-commit hooks (optional)
 ===================================
-This section lists the additional software required for
-:ref:`running the tests <testing>`.
-
-Required:
-
-- pytest_ (>=3.6)
-- Ghostscript_ (>= 9.0, to render PDF files)
-- Inkscape_ (to render SVG files)
-
-Optional:
-
-- pytest-cov_ (>=2.3.1) to collect coverage information
-- pytest-flake8_ to test coding standards using flake8_
-- pytest-timeout_ to limit runtime in case of stuck tests
-- pytest-xdist_ to run tests in parallel
-
-.. _pytest: http://doc.pytest.org/en/latest/
-.. _Ghostscript: https://www.ghostscript.com/
-.. _Inkscape: https://inkscape.org
-.. _pytest-cov: https://pytest-cov.readthedocs.io/en/latest/
-.. _pytest-flake8: https://pypi.org/project/pytest-flake8/
-.. _pytest-xdist: https://pypi.org/project/pytest-xdist/
-.. _pytest-timeout: https://pypi.org/project/pytest-timeout/
-.. _flake8: https://pypi.org/project/flake8/
-
-
-.. _doc-dependencies:
-
-Additional dependencies for building documentation
-==================================================
-
-Python packages
----------------
-The additional Python packages required to build the
-:ref:`documentation <documenting-matplotlib>` are listed in
-:file:`doc-requirements.txt` and can be installed using ::
-
-    pip install -r requirements/doc/doc-requirements.txt
-
-The content of :file:`doc-requirements.txt` is also shown below:
-
-   .. include:: ../../requirements/doc/doc-requirements.txt
-      :literal:
-
-Additional external dependencies
---------------------------------
-Required:
+`pre-commit <https://pre-commit.com/>`_ hooks automatically check flake8 and
+other style issues when you run ``git commit``. The hooks are defined in the
+top level ``.pre-commit-config.yaml`` file. To install the hooks ::
 
-*  a minimal working LaTeX distribution
-*  `Graphviz <http://www.graphviz.org/download>`_
-*  the LaTeX packages *cm-super* and *dvipng*. If your OS bundles ``TexLive``,
-   then often the "complete" version of the installer will automatically include
-   these packages (e.g. "texlive-full" or "texlive-all").
+    python -m pip install pre-commit
+    pre-commit install
 
-Optional, but recommended:
+The hooks can also be run manually. All the hooks can be run, in order as
+listed in ``.pre-commit-config.yaml``, against the full codebase with ::
 
-*  `Inkscape <https://inkscape.org>`_
-*  `optipng <http://optipng.sourceforge.net>`_
-*  the font "Humor Sans" (aka the "XKCD" font), or the free alternative
-   `Comic Neue <http://comicneue.com/>`_.
-*  the font "Times New Roman"
+    pre-commit run --all-files
 
-.. note::
+To run a particular hook manually, run ``pre-commit run`` with the hook id ::
 
-  The documentation will not build without LaTeX and Graphviz.  These are not
-  Python packages and must be installed separately. The documentation can be
-  built without Inkscape and optipng, but the build process will raise various
-  warnings. If the build process warns that you are missing fonts, make sure
-  your LaTeX distribution bundles cm-super or install it separately.
+    pre-commit run <hook id> --all-files
diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst
index 01985f700a4e..a9305d31a078 100644
--- a/doc/devel/documenting_mpl.rst
+++ b/doc/devel/documenting_mpl.rst
@@ -4,47 +4,41 @@
 Writing documentation
 =====================
 
-.. contents:: Contents
-   :depth: 3
-   :local:
-   :backlinks: top
-   :class: multicol-toc
-
-
 Getting started
 ===============
 
 General file structure
 ----------------------
 
-All documentation is built from the :file:`doc/`, :file:`tutorials/`, and
-:file:`examples/` directories.  The :file:`doc/` directory contains
-configuration files for Sphinx and  reStructuredText (ReST_; ``.rst``) files
-that are rendered to documentation pages.
-
-
-The main entry point is :file:`doc/index.rst`, which pulls in the
-:file:`index.rst` file for the users guide (:file:`doc/users`), developers
-guide (:file:`doc/devel`), api reference (:file:`doc/api`), and FAQs
-(:file:`doc/faq`). The documentation suite is built as a single document in
-order to make the most effective use of cross referencing.
+All documentation is built from the :file:`doc/`.  The :file:`doc/`
+directory contains configuration files for Sphinx and reStructuredText
+(ReST_; ``.rst``) files that are rendered to documentation pages.
 
-Sphinx_ also creates ``.rst`` files that are staged in :file:`doc/api` from
+Documentation is created in three ways.  First, API documentation
+(:file:`doc/api`) is created by Sphinx_ from
 the docstrings of the classes in the Matplotlib library.  Except for
-:file:`doc/api/api_changes/`, these ``.rst`` files are created when the
-documentation is built.
-
-Similarly, the contents of :file:`doc/gallery` and :file:`doc/tutorials` are
-generated by the `Sphinx Gallery`_ from the sources in :file:`examples/` and
-:file:`tutorials/`.  These sources consist of python scripts that have ReST_
-documentation built into their comments.
+:file:`doc/api/api_changes/`,  ``.rst`` files in :file:`doc/api` are created
+when the documentation is built.  See :ref:`writing-docstrings` below.
+
+Second, the contents of :file:`doc/plot_types`, :file:`doc/gallery` and
+:file:`doc/tutorials` are generated by the `Sphinx Gallery`_ from python
+files in :file:`plot_types/`, :file:`examples/` and :file:`tutorials/`.
+These sources consist of python scripts that have ReST_ documentation built
+into their comments.  See :ref:`writing-examples-and-tutorials` below.
+
+Third, Matplotlib has narrative docs written in ReST_ in subdirectories of
+:file:`doc/users/`.  If you would like to add new documentation that is suited
+to an ``.rst`` file rather than a gallery or tutorial example, choose an
+appropriate subdirectory to put it in, and add the file to the table of
+contents of :file:`index.rst` of the subdirectory.  See
+:ref:`writing-rest-pages` below.
 
 .. note::
 
-  Don't directly edit the ``.rst`` files in :file:`doc/gallery`,
-  :file:`doc/tutorials`, and :file:`doc/api` (excepting
-  :file:`doc/api/api_changes/`).  Sphinx_ regenerates files in these
-  directories when building documentation.
+  Don't directly edit the ``.rst`` files in :file:`doc/plot_types`,
+  :file:`doc/gallery`,  :file:`doc/tutorials`, and :file:`doc/api`
+  (excepting :file:`doc/api/api_changes/`).  Sphinx_ regenerates
+  files in these directories when building documentation.
 
 Setting up the doc build
 ------------------------
@@ -88,38 +82,48 @@ it, use
 
    make SPHINXOPTS= html
 
-On Windows the arguments must be at the end of the statement:
-
-.. code-block:: bat
-
-   make html SPHINXOPTS=
-
 You can use the ``O`` variable to set additional options:
 
 * ``make O=-j4 html`` runs a parallel build with 4 processes.
 * ``make O=-Dplot_formats=png:100 html`` saves figures in low resolution.
 * ``make O=-Dplot_gallery=0 html`` skips the gallery build.
 
-Multiple options can be combined using e.g. ``make O='-j4 -Dplot_gallery=0'
+Multiple options can be combined, e.g. ``make O='-j4 -Dplot_gallery=0'
 html``.
 
-On Windows, either use the format shown above or set options as environment variables, e.g.:
+On Windows, set the options as environment variables, e.g.:
 
 .. code-block:: bat
 
-   set O=-W --keep-going -j4
-   make html
+   set SPHINXOPTS= & set O=-j4 -Dplot_gallery=0 & make html
+
+Showing locally built docs
+--------------------------
+
+The built docs are available in the folder :file:`build/html`. A shortcut
+for opening them in your default browser is:
+
+.. code-block:: sh
+
+   make show
 
 .. _writing-rest-pages:
 
 Writing ReST pages
 ==================
 
-Most documentation is either in the docstring of individual
+Most documentation is either in the docstrings of individual
 classes and methods, in explicit ``.rst`` files, or in examples and tutorials.
-All of these use the ReST_ syntax. Users should look at the ReST_ documentation
-for a full description. But some specific hints and conventions Matplotlib
-uses are useful for creating documentation.
+All of these use the ReST_ syntax and are processed by Sphinx_.
+
+The `Sphinx reStructuredText Primer
+<https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html>`_ is
+a good introduction into using ReST. More complete information is available in
+the `reStructuredText reference documentation
+<https://docutils.sourceforge.io/rst.html#reference-documentation>`_.
+
+This section contains additional information and conventions how ReST is used
+in the Matplotlib documentation.
 
 Formatting and style conventions
 --------------------------------
@@ -127,13 +131,28 @@ Formatting and style conventions
 It is useful to strive for consistency in the Matplotlib documentation.  Here
 are some formatting and style conventions that are used.
 
-Section name formatting
-~~~~~~~~~~~~~~~~~~~~~~~
+Section formatting
+~~~~~~~~~~~~~~~~~~
 
 For everything but top-level chapters,  use ``Upper lower`` for
 section titles, e.g., ``Possible hangups`` rather than ``Possible
 Hangups``
 
+We aim to follow the recommendations from the
+`Python documentation <https://devguide.python.org/documenting/#sections>`_
+and the `Sphinx reStructuredText documentation <https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html#sections>`_
+for section markup characters, i.e.:
+
+- ``#`` with overline, for parts. This is reserved for the main title in
+  ``index.rst``. All other pages should start with "chapter" or lower.
+- ``*`` with overline, for chapters
+- ``=``, for sections
+- ``-``, for subsections
+- ``^``, for subsubsections
+- ``"``, for paragraphs
+
+This may not yet be applied consistently in existing docs.
+
 Function arguments
 ~~~~~~~~~~~~~~~~~~
 
@@ -171,22 +190,22 @@ Documents can be linked with the ``:doc:`` directive:
 
 .. code-block:: rst
 
-   See the :doc:`/faq/installing_faq`
+   See the :doc:`/users/installing/index`
 
-   See the tutorial :doc:`/tutorials/introductory/sample_plots`
+   See the tutorial :doc:`/tutorials/introductory/quick_start`
 
    See the example :doc:`/gallery/lines_bars_and_markers/simple_plot`
 
 will render as:
 
-  See the :doc:`/faq/installing_faq`
+  See the :doc:`/users/installing/index`
 
-  See the tutorial :doc:`/tutorials/introductory/sample_plots`
+  See the tutorial :doc:`/tutorials/introductory/quick_start`
 
   See the example :doc:`/gallery/lines_bars_and_markers/simple_plot`
 
 Sections can also be given reference names.  For instance from the
-:doc:`/faq/installing_faq` link:
+:doc:`/users/installing/index` link:
 
 .. code-block:: rst
 
@@ -243,7 +262,7 @@ generates a link like this: `matplotlib.collections.LineCollection`.
 have to use qualifiers like ``:class:``, ``:func:``, ``:meth:`` and the likes.
 
 Often, you don't want to show the full package and module name. As long as the
-target is unanbigous you can simply leave them out:
+target is unambiguous you can simply leave them out:
 
 .. code-block:: rst
 
@@ -280,8 +299,8 @@ you can check the full list of referenceable objects with the following
 commands::
 
   python -m sphinx.ext.intersphinx 'https://docs.python.org/3/objects.inv'
-  python -m sphinx.ext.intersphinx 'https://docs.scipy.org/doc/numpy/objects.inv'
-  python -m sphinx.ext.intersphinx 'https://docs.scipy.org/doc/scipy/reference/objects.inv'
+  python -m sphinx.ext.intersphinx 'https://numpy.org/doc/stable/objects.inv'
+  python -m sphinx.ext.intersphinx 'https://docs.scipy.org/doc/scipy/objects.inv'
   python -m sphinx.ext.intersphinx 'https://pandas.pydata.org/pandas-docs/stable/objects.inv'
 
 .. _rst-figures-and-includes:
@@ -290,24 +309,19 @@ Including figures and files
 ---------------------------
 
 Image files can directly included in pages with the ``image::`` directive.
-e.g., :file:`thirdpartypackages/index.rst` displays the images for the third-party
-packages as static images::
-
-    .. image:: /_static/toolbar.png
+e.g., :file:`tutorials/intermediate/constrainedlayout_guide.py` displays
+a couple of static images::
 
-as rendered on the page: :ref:`thirdparty-index`.
+  # .. image:: /_static/constrained_layout_1b.png
+  #    :align: center
 
-Files can be included verbatim.  For instance the ``matplotlibrc`` file
-is important for customizing Matplotlib, and is included verbatim in the
-tutorial in :doc:`/tutorials/introductory/customizing`::
 
-    .. literalinclude:: ../../_static/matplotlibrc
+Files can be included verbatim.  For instance the ``LICENSE`` file is included
+at :ref:`license-agreement` using ::
 
-This is rendered at the bottom of :doc:`/tutorials/introductory/customizing`.
-Note that this is in a tutorial; see :ref:`writing-examples-and-tutorials`
-below.
+    .. literalinclude:: ../../LICENSE/LICENSE
 
-The examples directory is also copied to :file:`doc/gallery` by sphinx-gallery,
+The examples directory is copied to :file:`doc/gallery` by sphinx-gallery,
 so plots from the examples directory can be included using
 
 .. code-block:: rst
@@ -347,7 +361,7 @@ An example docstring looks like:
 
 .. code-block:: python
 
-    def hlines(self, y, xmin, xmax, colors='k', linestyles='solid',
+    def hlines(self, y, xmin, xmax, colors=None, linestyles='solid',
                label='', **kwargs):
         """
         Plot horizontal lines at each *y* from *xmin* to *xmax*.
@@ -361,24 +375,26 @@ An example docstring looks like:
             Respective beginning and end of each line. If scalars are
             provided, all lines will have the same length.
 
-        colors : array-like of colors, default: 'k'
+        colors : list of colors, default: :rc:`lines.color`
 
-        linestyles : {'solid', 'dashed', 'dashdot', 'dotted'}, default: 'solid'
+        linestyles : {'solid', 'dashed', 'dashdot', 'dotted'}, optional
 
         label : str, default: ''
 
         Returns
         -------
-        lines : `~matplotlib.collections.LineCollection`
+        `~matplotlib.collections.LineCollection`
 
         Other Parameters
         ----------------
-        **kwargs : `~matplotlib.collections.LineCollection` properties
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+        **kwargs :  `~matplotlib.collections.LineCollection` properties.
 
-        See also
+        See Also
         --------
         vlines : vertical lines
-        axhline: horizontal line across the axes
+        axhline : horizontal line across the Axes
         """
 
 See the `~.Axes.hlines` documentation for how this renders.
@@ -545,10 +561,10 @@ effect.
 Sphinx automatically links code elements in the definition blocks of ``See
 also`` sections. No need to use backticks there::
 
-   See also
+   See Also
    --------
    vlines : vertical lines
-   axhline: horizontal line across the axes
+   axhline : horizontal line across the Axes
 
 Wrapping parameter lists
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -585,7 +601,7 @@ Setters and getters
 -------------------
 
 Artist properties are implemented using setter and getter methods (because
-Matplotlib predates the introductions of the `property` decorator in Python).
+Matplotlib predates the Python `property` decorator).
 By convention, these setters and getters are named ``set_PROPERTYNAME`` and
 ``get_PROPERTYNAME``; the list of properties thusly defined on an artist and
 their values can be listed by the `~.pyplot.setp` and `~.pyplot.getp` functions.
@@ -652,7 +668,7 @@ Keyword arguments
 
 Since Matplotlib uses a lot of pass-through ``kwargs``, e.g., in every function
 that creates a line (`~.pyplot.plot`, `~.pyplot.semilogx`, `~.pyplot.semilogy`,
-etc...), it can be difficult for the new user to know which ``kwargs`` are
+etc.), it can be difficult for the new user to know which ``kwargs`` are
 supported.  Matplotlib uses a docstring interpolation scheme to support
 documentation of every function that takes a ``**kwargs``.  The requirements
 are:
@@ -663,26 +679,14 @@ are:
 2. as automated as possible so that as properties change, the docs
    are updated automatically.
 
-The function `matplotlib.artist.kwdoc` and the decorator
-``matplotlib.docstring.dedent_interpd`` facilitate this.  They combine Python
-string interpolation in the docstring with the Matplotlib artist introspection
-facility that underlies ``setp`` and ``getp``.  The ``kwdoc`` function gives
-the list of properties as a docstring. In order to use this in another
-docstring, first update the ``matplotlib.docstring.interpd`` object, as seen in
-this example from `matplotlib.lines`:
-
-.. code-block:: python
-
-  # in lines.py
-  docstring.interpd.update(Line2D_kwdoc=artist.kwdoc(Line2D))
-
-Then in any function accepting `~.Line2D` pass-through ``kwargs``, e.g.,
-`matplotlib.axes.Axes.plot`:
+The ``@_docstring.interpd`` decorator implements this.  Any function accepting
+`.Line2D` pass-through ``kwargs``, e.g., `matplotlib.axes.Axes.plot`, can list
+a summary of the `.Line2D` properties, as follows:
 
 .. code-block:: python
 
   # in axes.py
-  @docstring.dedent_interpd
+  @_docstring.interpd
   def plot(self, *args, **kwargs):
       """
       Some stuff omitted
@@ -707,17 +711,19 @@ Then in any function accepting `~.Line2D` pass-through ``kwargs``, e.g.,
 
           Here is a list of available `.Line2D` properties:
 
-          %(Line2D_kwdoc)s
-
+          %(Line2D:kwdoc)s
       """
 
-Note there is a problem for `~matplotlib.artist.Artist` ``__init__`` methods,
-e.g., `matplotlib.patches.Patch.__init__`, which supports ``Patch`` ``kwargs``,
-since the artist inspector cannot work until the class is fully defined and
-we can't modify the ``Patch.__init__.__doc__`` docstring outside the class
-definition.  There are some some manual hacks in this case, violating the
-"single entry point" requirement above -- see the ``docstring.interpd.update``
-calls in `matplotlib.patches`.
+The ``%(Line2D:kwdoc)`` syntax makes ``interpd`` lookup an `.Artist` subclass
+named ``Line2D``, and call `.artist.kwdoc` on that class.  `.artist.kwdoc`
+introspects the subclass and summarizes its properties as a substring, which
+gets interpolated into the docstring.
+
+Note that this scheme does not work for decorating an Artist's ``__init__``, as
+the subclass and its properties are not defined yet at that point.  Instead,
+``@_docstring.interpd`` can be used to decorate the class itself -- at that
+point, `.kwdoc` can list the properties and interpolate them into
+``__init__.__doc__``.
 
 
 Inheriting docstrings
@@ -748,7 +754,7 @@ Adding figures
 --------------
 
 As above (see :ref:`rst-figures-and-includes`), figures in the examples gallery
-can be referenced with a ``:plot:`` directive pointing to the python script
+can be referenced with a ``.. plot::`` directive pointing to the python script
 that created the figure.  For instance the `~.Axes.legend` docstring references
 the file :file:`examples/text_labels_and_annotations/legend.py`:
 
@@ -836,7 +842,7 @@ render as comments in :doc:`/gallery/lines_bars_and_markers/simple_plot`.
 
 Tutorials are made with the exact same mechanism, except they are longer, and
 typically have more than one comment block (i.e.
-:doc:`/tutorials/introductory/usage`).  The first comment block
+:doc:`/tutorials/introductory/quick_start`).  The first comment block
 can be the same as the example above.  Subsequent blocks of ReST text
 are delimited by a line of ``###`` characters:
 
@@ -864,6 +870,35 @@ are delimited by a line of ``###`` characters:
 
 In this way text, code, and figures are output in a "notebook" style.
 
+References for sphinx-gallery
+-----------------------------
+
+The showcased Matplotlib functions should be listed in an admonition at the
+bottom as follows
+
+.. code-block:: python
+
+    ###############################################################################
+    #
+    # .. admonition:: References
+    #
+    #    The use of the following functions, methods, classes and modules is shown
+    #    in this example:
+    #
+    #    - `matplotlib.axes.Axes.fill` / `matplotlib.pyplot.fill`
+    #    - `matplotlib.axes.Axes.axis` / `matplotlib.pyplot.axis`
+
+This allows sphinx-gallery to place an entry to the example in the
+mini-gallery of the mentioned functions. Whether or not a function is mentioned
+here should be decided depending on if a mini-gallery link prominently helps
+to illustrate that function; e.g. mention ``matplotlib.pyplot.subplots`` only
+in examples that are about laying out subplots, not in every example that uses
+it.
+
+Functions that exist in ``pyplot`` as well as in Axes or Figure should mention
+both references no matter which one is used in the example code. The ``pyplot``
+reference should always be the second to mention; see the example above.
+
 Order of examples in the gallery
 --------------------------------
 
@@ -918,63 +953,20 @@ will yield an html file ``/build/html/old_topic/old_info2.html`` that has a
 (relative) refresh to ``../topic/new_info.html``.
 
 Use the full path for this directive, relative to the doc root at
-``http://matplotlib.org/stable/``.  So ``/old_topic/old_info2`` would be
+``https://matplotlib.org/stable/``.  So ``/old_topic/old_info2`` would be
 found by users at ``http://matplotlib.org/stable/old_topic/old_info2``.
 For clarity, do not use relative links.
 
 
-Adding animations
------------------
-
-Animations are scraped automatically by Sphinx-gallery. If this is not
-desired,
-there is also a Matplotlib Google/Gmail account with username ``mplgithub``
-which was used to setup the github account but can be used for other
-purposes, like hosting Google docs or Youtube videos.  You can embed a
-Matplotlib animation in the docs by first saving the animation as a
-movie using :meth:`matplotlib.animation.Animation.save`, and then
-uploading to `Matplotlib's Youtube
-channel <https://www.youtube.com/user/matplotlib>`_ and inserting the
-embedding string youtube provides like:
-
-.. code-block:: rst
-
-  .. raw:: html
-
-     <iframe width="420" height="315"
-       src="http://www.youtube.com/embed/32cjc6V0OZY"
-       frameborder="0" allowfullscreen>
-     </iframe>
-
-An example save command to generate a movie looks like this
-
-.. code-block:: python
-
-    ani = animation.FuncAnimation(fig, animate, np.arange(1, len(y)),
-        interval=25, blit=True, init_func=init)
-
-    ani.save('double_pendulum.mp4', fps=15)
-
-Contact Michael Droettboom for the login password to upload youtube videos of
-google docs to the mplgithub account.
-
 .. _inheritance-diagrams:
 
 Generating inheritance diagrams
 -------------------------------
 
-Class inheritance diagrams can be generated with the
-``inheritance-diagram`` directive.  To use it, provide the
-directive with a number of class or module names (separated by
-whitespace).  If a module name is provided, all classes in that module
-will be used.  All of the ancestors of these classes will be included
-in the inheritance diagram.
+Class inheritance diagrams can be generated with the Sphinx
+`inheritance-diagram`_ directive.
 
-A single option is available: *parts* controls how many of parts in
-the path to the class are shown.  For example, if *parts* == 1, the
-class ``matplotlib.patches.Patch`` is shown as ``Patch``.  If *parts*
-== 2, it is shown as ``patches.Patch``.  If *parts* == 0, the full
-path is shown.
+.. _inheritance-diagram: https://www.sphinx-doc.org/en/master/usage/extensions/inheritance.html
 
 Example:
 
@@ -986,46 +978,18 @@ Example:
 .. inheritance-diagram:: matplotlib.patches matplotlib.lines matplotlib.text
    :parts: 2
 
-.. _emacs-helpers:
-
-Emacs helpers
--------------
-
-There is an emacs mode `rst.el
-<http://docutils.sourceforge.net/tools/editors/emacs/rst.el>`_ which
-automates many important ReST tasks like building and updating
-table-of-contents, and promoting or demoting section headings.  Here
-is the basic ``.emacs`` configuration:
-
-.. code-block:: lisp
-
-    (require 'rst)
-    (setq auto-mode-alist
-          (append '(("\\.txt$" . rst-mode)
-                    ("\\.rst$" . rst-mode)
-                    ("\\.rest$" . rst-mode)) auto-mode-alist))
-
-Some helpful functions::
-
-    C-c TAB - rst-toc-insert
-
-      Insert table of contents at point
-
-    C-c C-u - rst-toc-update
-
-        Update the table of contents at point
-
-    C-c C-l rst-shift-region-left
-
-        Shift region to the left
 
-    C-c C-r rst-shift-region-right
+Navbar and style
+----------------
 
-        Shift region to the right
+Matplotlib has a few subprojects that share the same navbar and style, so these
+are centralized as a sphinx theme at
+`mpl_sphinx_theme <https://github.com/matplotlib/mpl-sphinx-theme>`_.  Changes to the
+style or topbar should be made there to propagate across all subprojects.
 
 .. TODO: Add section about uploading docs
 
-.. _ReST: http://docutils.sourceforge.net/rst.html
+.. _ReST: https://docutils.sourceforge.io/rst.html
 .. _Sphinx: http://www.sphinx-doc.org
 .. _documentation: https://www.sphinx-doc.org/en/master/contents.html
 .. _index: http://www.sphinx-doc.org/markup/para.html#index-generating-markup
diff --git a/doc/devel/gitwash/development_workflow.rst b/doc/devel/gitwash/development_workflow.rst
index 7d6b6f0e70c3..d2917230d3ad 100644
--- a/doc/devel/gitwash/development_workflow.rst
+++ b/doc/devel/gitwash/development_workflow.rst
@@ -13,10 +13,10 @@ git by following :ref:`configure-git`.  Now you are ready for some real work.
 Workflow summary
 ================
 
-In what follows we'll refer to the upstream Matplotlib ``master`` branch, as
+In what follows we'll refer to the upstream Matplotlib ``main`` branch, as
 "trunk".
 
-* Don't use your ``master`` branch for anything.  Consider deleting it.
+* Don't use your ``main`` branch for anything.  Consider deleting it.
 * When you are starting a new set of changes, fetch any changes from trunk,
   and start a new *feature branch* from that.
 * Make a new branch for each separable set of changes |emdash| "one task, one
@@ -24,7 +24,7 @@ In what follows we'll refer to the upstream Matplotlib ``master`` branch, as
 * Name your branch for the purpose of the changes - e.g.
   ``bugfix-for-issue-14`` or ``refactor-database-code``.
 * If you can possibly avoid it, avoid merging trunk or any other branches into
-  your feature branch while you are working.  
+  your feature branch while you are working.
 * If you do find yourself merging from trunk, consider :ref:`rebase-on-trunk`
 * Ask on the `Matplotlib mailing list`_ if you get stuck.
 * Ask for code review!
@@ -35,11 +35,11 @@ what you've done, and why you did it.
 
 See `linux git workflow`_ and `ipython git workflow`_ for some explanation.
 
-Consider deleting your master branch
-====================================
+Consider deleting your main branch
+==================================
 
-It may sound strange, but deleting your own ``master`` branch can help reduce
-confusion about which branch you are on.  See `deleting master on github`_ for
+It may sound strange, but deleting your own ``main`` branch can help reduce
+confusion about which branch you are on.  See `deleting main on github`_ for
 details.
 
 .. _update-mirror-trunk:
@@ -55,8 +55,8 @@ From time to time you should fetch the upstream (trunk) changes from github::
 
 This will pull down any commits you don't have, and set the remote branches to
 point to the right commit.  For example, 'trunk' is the branch referred to by
-(remote/branchname) ``upstream/master`` - and if there have been commits since
-you last checked, ``upstream/master`` will change after you do the fetch.
+(remote/branchname) ``upstream/main`` - and if there have been commits since
+you last checked, ``upstream/main`` will change after you do the fetch.
 
 .. _make-feature-branch:
 
@@ -72,14 +72,14 @@ someone reviewing your branch to see what you are doing.
 
 Choose an informative name for the branch to remind yourself and the rest of us
 what the changes in the branch are for.  For example ``add-ability-to-fly``, or
-``buxfix-for-issue-42``.
+``bugfix-for-issue-42``.
 
 ::
 
     # Update the mirror of trunk
     git fetch upstream
     # Make new feature branch starting at current trunk
-    git branch my-new-feature upstream/master
+    git branch my-new-feature upstream/main
     git checkout my-new-feature
 
 Generally, you will want to keep your feature branches on your public github_
@@ -180,7 +180,7 @@ Delete a branch on github
 
 ::
 
-   git checkout master
+   git checkout main
    # delete branch locally
    git branch -D my-unwanted-branch
    # delete branch on github
@@ -210,14 +210,14 @@ Now all those people can do::
 
     git clone https://github.com/your-user-name/matplotlib.git
 
-Remember that links starting with ``https`` or ``git@`` are read-write, and that 
-``git@`` uses the ssh protocol; links starting with ``git://`` are read-only.
+Remember that links starting with ``https`` or ``git@`` are read-write, and that
+``git@`` uses the ssh protocol.
 
 Your collaborators can then commit directly into that repo with the
 usual::
 
      git commit -am 'ENH - much better code'
-     git push origin master # pushes directly into your repo
+     git push origin main # pushes directly into your repo
 
 Explore your repository
 -----------------------
@@ -284,12 +284,12 @@ To do a rebase on trunk::
     # make a backup in case you mess up
     git branch tmp cool-feature
     # rebase cool-feature onto trunk
-    git rebase --onto upstream/master upstream/master cool-feature
+    git rebase --onto upstream/main upstream/main cool-feature
 
 In this situation, where you are already on branch ``cool-feature``, the last
 command can be written more succinctly as::
 
-    git rebase upstream/master
+    git rebase upstream/main
 
 When all looks good you can delete your backup branch::
 
diff --git a/doc/devel/gitwash/dot2_dot3.rst b/doc/devel/gitwash/dot2_dot3.rst
index 7759e2e60d68..30852b5ad387 100644
--- a/doc/devel/gitwash/dot2_dot3.rst
+++ b/doc/devel/gitwash/dot2_dot3.rst
@@ -7,22 +7,22 @@
 Thanks to Yarik Halchenko for this explanation.
 
 Imagine a series of commits A, B, C, D...  Imagine that there are two
-branches, *topic* and *master*.  You branched *topic* off *master* when
-*master* was at commit 'E'.  The graph of the commits looks like this::
+branches, *topic* and *main*.  You branched *topic* off *main* when
+*main* was at commit 'E'.  The graph of the commits looks like this::
 
 
         A---B---C topic
         /
-   D---E---F---G master
+   D---E---F---G main
 
 Then::
 
-   git diff master..topic
+   git diff main..topic
 
 will output the difference from G to C (i.e. with effects of F and G),
 while::
 
-   git diff master...topic
+   git diff main...topic
 
 would output just differences in the topic branch (i.e. only A, B, and
 C).
diff --git a/doc/devel/gitwash/following_latest.rst b/doc/devel/gitwash/following_latest.rst
index 03518ea52f44..5c90f5b84446 100644
--- a/doc/devel/gitwash/following_latest.rst
+++ b/doc/devel/gitwash/following_latest.rst
@@ -20,7 +20,7 @@ Get the local copy of the code
 
 From the command line::
 
-   git clone git://github.com/matplotlib/matplotlib.git
+   git clone https://github.com/matplotlib/matplotlib.git
 
 You now have a copy of the code tree in the new ``matplotlib`` directory.
 
diff --git a/doc/devel/gitwash/git_links.inc b/doc/devel/gitwash/git_links.inc
index c26173367c9b..67ddc4dcb5a6 100644
--- a/doc/devel/gitwash/git_links.inc
+++ b/doc/devel/gitwash/git_links.inc
@@ -46,7 +46,7 @@
 .. _linux git workflow: https://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html
 .. _git parable: http://tom.preston-werner.com/2009/05/19/the-git-parable.html
 .. _git foundation: https://matthew-brett.github.io/pydagogue/foundation.html
-.. _deleting master on github: https://matthew-brett.github.io/pydagogue/gh_delete_master.html
+.. _deleting main on github: https://matthew-brett.github.io/pydagogue/gh_delete_master.html
 .. _rebase without tears: https://matthew-brett.github.io/pydagogue/rebase_without_tears.html
 .. _resolving a merge: https://schacon.github.io/git/user-manual.html#resolving-a-merge
 .. _ipython git workflow: https://mail.python.org/pipermail/ipython-dev/2010-October/005632.html
diff --git a/doc/devel/gitwash/maintainer_workflow.rst b/doc/devel/gitwash/maintainer_workflow.rst
index 302f75241399..9a572e311168 100644
--- a/doc/devel/gitwash/maintainer_workflow.rst
+++ b/doc/devel/gitwash/maintainer_workflow.rst
@@ -26,12 +26,12 @@ Integrating changes
 *******************
 
 Let's say you have some changes that need to go into trunk
-(``upstream-rw/master``).
+(``upstream-rw/main``).
 
 The changes are in some branch that you are currently on.  For example, you are
 looking at someone's changes like this::
 
-    git remote add someone git://github.com/someone/matplotlib.git
+    git remote add someone https://github.com/someone/matplotlib.git
     git fetch someone
     git branch cool-feature --track someone/cool-feature
     git checkout cool-feature
@@ -47,7 +47,7 @@ If there are only a few commits, consider rebasing to upstream::
     # Fetch upstream changes
     git fetch upstream-rw
     # rebase
-    git rebase upstream-rw/master
+    git rebase upstream-rw/main
 
 Remember that, if you do a rebase, and push that, you'll have to close any
 github pull requests manually, because github will not be able to detect the
@@ -59,7 +59,7 @@ A long series of commits
 If there are a longer series of related commits, consider a merge instead::
 
     git fetch upstream-rw
-    git merge --no-ff upstream-rw/master
+    git merge --no-ff upstream-rw/main
 
 The merge will be detected by github, and should close any related pull requests
 automatically.
@@ -76,11 +76,11 @@ Now, in either case, you should check that the history is sensible and you have
 the right commits::
 
     git log --oneline --graph
-    git log -p upstream-rw/master..
+    git log -p upstream-rw/main..
 
 The first line above just shows the history in a compact way, with a text
 representation of the history graph. The second line shows the log of commits
-excluding those that can be reached from trunk (``upstream-rw/master``), and
+excluding those that can be reached from trunk (``upstream-rw/main``), and
 including those that can be reached from current HEAD (implied with the ``..``
 at the end). So, it shows the commits unique to this branch compared to trunk.
 The ``-p`` option shows the diff for these commits in patch form.
@@ -90,9 +90,9 @@ Push to trunk
 
 ::
 
-    git push upstream-rw my-new-feature:master
+    git push upstream-rw my-new-feature:main
 
-This pushes the ``my-new-feature`` branch in this repository to the ``master``
+This pushes the ``my-new-feature`` branch in this repository to the ``main``
 branch in the ``upstream-rw`` repository.
 
 .. include:: links.inc
diff --git a/doc/devel/gitwash/patching.rst b/doc/devel/gitwash/patching.rst
index e7f852758477..aeea8c5394ac 100644
--- a/doc/devel/gitwash/patching.rst
+++ b/doc/devel/gitwash/patching.rst
@@ -31,7 +31,7 @@ Overview
    git config --global user.email you@yourdomain.example.com
    git config --global user.name "Your Name Comes Here"
    # get the repository if you don't have it
-   git clone git://github.com/matplotlib/matplotlib.git
+   git clone https://github.com/matplotlib/matplotlib.git
    # make a branch for your patching
    cd matplotlib
    git branch the-fix-im-thinking-of
@@ -44,7 +44,7 @@ Overview
    # hack hack, hack
    git commit -am 'BF - added fix for Funny bug'
    # make the patch files
-   git format-patch -M -C master
+   git format-patch -M -C main
 
 Then, send the generated patch files to the `Matplotlib
 mailing list`_ |emdash| where we will thank you warmly.
@@ -61,7 +61,7 @@ In detail
 #. If you don't already have one, clone a copy of the
    `Matplotlib`_ repository::
 
-      git clone git://github.com/matplotlib/matplotlib.git
+      git clone https://github.com/matplotlib/matplotlib.git
       cd matplotlib
 
 #. Make a 'feature branch'.  This will be where you work on
@@ -93,9 +93,9 @@ In detail
       git status
 
 #. Finally, make your commits into patches.  You want all the
-   commits since you branched from the ``master`` branch::
+   commits since you branched from the ``main`` branch::
 
-      git format-patch -M -C master
+      git format-patch -M -C main
 
    You will now have several files named for the commits:
 
@@ -107,9 +107,9 @@ In detail
    Send these files to the `Matplotlib mailing list`_.
 
 When you are done, to switch back to the main copy of the
-code, just return to the ``master`` branch::
+code, just return to the ``main`` branch::
 
-   git checkout master
+   git checkout main
 
 Moving from patching to development
 ===================================
@@ -122,9 +122,9 @@ have.
 Fork the `Matplotlib`_ repository on github |emdash| :ref:`forking`.
 Then::
 
-   # checkout and refresh master branch from main repo
-   git checkout master
-   git pull origin master
+   # checkout and refresh main branch from main repo
+   git checkout main
+   git pull origin main
    # rename pointer to main repository to 'upstream'
    git remote rename origin upstream
    # point your repo to default read / write to your fork on github
diff --git a/doc/devel/gitwash/set_up_fork.rst b/doc/devel/gitwash/set_up_fork.rst
index 6b7e0271c45b..cfbd00dca63f 100644
--- a/doc/devel/gitwash/set_up_fork.rst
+++ b/doc/devel/gitwash/set_up_fork.rst
@@ -15,7 +15,7 @@ Overview
 
    git clone https://github.com/your-user-name/matplotlib.git
    cd matplotlib
-   git remote add upstream git://github.com/matplotlib/matplotlib.git
+   git remote add upstream https://github.com/matplotlib/matplotlib.git
 
 In detail
 =========
@@ -31,11 +31,11 @@ Clone your fork
 
    .. code-block:: none
 
-      * master
-      remotes/origin/master
+      * main
+      remotes/origin/main
 
-   This tells you that you are currently on the ``master`` branch, and
-   that you also have a ``remote`` connection to ``origin/master``.
+   This tells you that you are currently on the ``main`` branch, and
+   that you also have a ``remote`` connection to ``origin/main``.
    What remote repository is ``remote/origin``? Try ``git remote -v`` to
    see the URLs for the remote.  They will point to your github fork.
 
@@ -50,23 +50,18 @@ Linking your repository to the upstream repo
 ::
 
    cd matplotlib
-   git remote add upstream git://github.com/matplotlib/matplotlib.git
+   git remote add upstream https://github.com/matplotlib/matplotlib.git
 
 ``upstream`` here is just the arbitrary name we're using to refer to the
 main `Matplotlib`_ repository at `Matplotlib github`_.
 
-Note that we've used ``git://`` for the URL rather than ``https://`` or ``git@``.  The
-``git://`` URL is read only.  This means that we can't accidentally
-(or deliberately) write to the upstream repo, and we are only going to
-use it to merge into our own code.
-
 Just for your own satisfaction, show yourself that you now have a new
 'remote', with ``git remote -v show``, giving you something like:
 
 .. code-block:: none
 
-   upstream	git://github.com/matplotlib/matplotlib.git (fetch)
-   upstream	git://github.com/matplotlib/matplotlib.git (push)
+   upstream	https://github.com/matplotlib/matplotlib.git (fetch)
+   upstream	https://github.com/matplotlib/matplotlib.git (push)
    origin	https://github.com/your-user-name/matplotlib.git (fetch)
    origin	https://github.com/your-user-name/matplotlib.git (push)
 
diff --git a/doc/devel/index.rst b/doc/devel/index.rst
index c2c140173227..462205ee2271 100644
--- a/doc/devel/index.rst
+++ b/doc/devel/index.rst
@@ -1,8 +1,8 @@
 .. _developers-guide-index:
 
-################################
-The Matplotlib Developers' Guide
-################################
+############
+Contributing
+############
 
 Thank you for your interest in helping to improve Matplotlib! There are various
 ways to contribute to Matplotlib. All of them are super valuable but don't necessarily
@@ -19,14 +19,37 @@ process or how to fix something feel free to ask on `gitter
 <https://gitter.im/matplotlib/matplotlib>`_ for short questions and on
 `discourse <https://discourse.matplotlib.org>`_ for longer questions.
 
-.. raw:: html
+.. rst-class:: sd-d-inline-block
 
-   <div style="margin: 2em 0;">
-     <a href="contributing.html#submitting-a-bug-report"><span class="mpl-button">Report a bug</span></a>
-     <a href="contributing.html#request-a-new-feature"><span class="mpl-button">Request a feature</span></a>
-     <a href="contributing.html#contributing-code"><span class="mpl-button">Contribute code</span></a>
-     <a href="contributing.html#contributing-documentation"><span class="mpl-button">Write documentation</span></a>
-   </div>
+    .. button-ref:: submitting-a-bug-report
+        :class: sd-fs-6
+        :color: primary
+
+        Report a bug
+
+.. rst-class:: sd-d-inline-block
+
+    .. button-ref:: request-a-new-feature
+        :class: sd-fs-6
+        :color: primary
+
+        Request a feature
+
+.. rst-class:: sd-d-inline-block
+
+    .. button-ref:: contributing-code
+        :class: sd-fs-6
+        :color: primary
+
+        Contribute code
+
+.. rst-class:: sd-d-inline-block
+
+    .. button-ref:: contributing_documentation
+        :class: sd-fs-6
+        :color: primary
+
+        Write documentation
 
 .. toctree::
    :maxdepth: 2
@@ -36,7 +59,7 @@ process or how to fix something feel free to ask on `gitter
    development_setup.rst
    testing.rst
    documenting_mpl.rst
-   add_new_projection.rst
+   style_guide.rst
    gitwash/index.rst
    coding_guide.rst
    release_guide.rst
diff --git a/doc/devel/min_dep_policy.rst b/doc/devel/min_dep_policy.rst
index 45cee59e34a3..6f0ec95c7969 100644
--- a/doc/devel/min_dep_policy.rst
+++ b/doc/devel/min_dep_policy.rst
@@ -1,7 +1,7 @@
 .. _min_deps_policy:
 
 ======================================
-Minimum Version of Dependencies Policy
+Minimum version of dependencies policy
 ======================================
 
 For the purpose of this document, 'minor version' is in the sense of
@@ -32,7 +32,7 @@ on every major and minor release, but never on a patch release.
 
 See also the :ref:`list-of-dependency-min-versions`.
 
-Python Dependencies
+Python dependencies
 ===================
 
 For Python dependencies we should support at least:
@@ -41,14 +41,14 @@ with compiled extensions
   minor versions initially released in the 24 months prior to our planned
   release date or the oldest that support our minimum Python + NumPy
 
-without complied extensions
+without compiled extensions
   minor versions initially released in the 12 months prior to our planned
   release date or the oldest that supports our minimum Python.
 
 We will only bump these dependencies as we need new features or the old
 versions no longer support our minimum NumPy or Python.
 
-Test and Documentation Dependencies
+Test and documentation dependencies
 ===================================
 
 As these packages are only needed for testing or building the docs and
@@ -61,7 +61,7 @@ We will support at least minor versions of the development
 dependencies released in the 12 months prior to our planned release.
 
 We will only bump these as needed or versions no longer support our
-minimum Python and numpy.
+minimum Python and NumPy.
 
 System and C-dependencies
 =========================
@@ -83,7 +83,9 @@ specification of the dependencies.
 ==========  ========  ======
 Matplotlib  Python    NumPy
 ==========  ========  ======
-3.4         3.7       1.16.0
+`3.6`_      3.8       1.19.0
+`3.5`_      3.7       1.17.0
+`3.4`_      3.7       1.16.0
 `3.3`_      3.6       1.15.0
 `3.2`_      3.6       1.11.0
 `3.1`_      3.6       1.11.0
@@ -99,6 +101,9 @@ Matplotlib  Python    NumPy
 1.0         2.4       1.1
 ==========  ========  ======
 
+.. _`3.6`: https://matplotlib.org/3.6.0/devel/dependencies.html
+.. _`3.5`: https://matplotlib.org/3.5.0/devel/dependencies.html
+.. _`3.4`: https://matplotlib.org/3.4.0/devel/dependencies.html
 .. _`3.3`: https://matplotlib.org/3.3.0/users/installing.html#dependencies
 .. _`3.2`: https://matplotlib.org/3.2.0/users/installing.html#dependencies
 .. _`3.1`: https://matplotlib.org/3.1.0/users/installing.html#dependencies
diff --git a/doc/devel/release_guide.rst b/doc/devel/release_guide.rst
index 451d482bc819..3f49631d00d8 100644
--- a/doc/devel/release_guide.rst
+++ b/doc/devel/release_guide.rst
@@ -3,7 +3,7 @@
 .. _release-guide:
 
 =============
-Release Guide
+Release guide
 =============
 
 
@@ -45,8 +45,8 @@ is currently broken::
 
 .. _release_ghstats:
 
-GitHub Stats
-============
+GitHub statistics
+=================
 
 
 We automatically extract GitHub issue, PRs, and authors from GitHub via the
@@ -85,7 +85,7 @@ most common issue is ``*`` which is interpreted as unclosed markup).
 
 .. _release_chkdocs:
 
-Update and Validate the Docs
+Update and validate the docs
 ============================
 
 Merge ``*-doc`` branch
@@ -101,27 +101,62 @@ When making major or minor releases, update the supported versions in the
 Security Policy in :file:`SECURITY.md`.  Commonly, this may be one or two
 previous minor releases, but is dependent on release managers.
 
-Update "What's New" and "API changes"
--------------------------------------
+Update release notes
+--------------------
+
+What's new
+~~~~~~~~~~
+
+*Only needed for major and minor releases. Bugfix releases should not have new
+features.*
+
+Merge the contents of all the files in :file:`doc/users/next_whats_new/`
+into a single file :file:`doc/users/prev_whats_new/whats_new_X.Y.0.rst`
+and delete the individual files.
+
+API changes
+~~~~~~~~~~~
+
+*Primarily needed for major and minor releases. We may sometimes have API
+changes in bugfix releases.*
+
+Merge the contents of all the files in :file:`doc/api/next_api_changes/`
+into a single file :file:`doc/api/prev_api_changes/api_changes_X.Y.Z.rst`
+and delete the individual files.
+
+Release notes TOC
+~~~~~~~~~~~~~~~~~
 
-Before tagging major and minor releases, the "what's new" and "API changes"
-listings should be updated.  This is not needed for micro releases.
+Update :file:`doc/users/release_notes.rst`:
 
-For the "what's new",
+- For major and minor releases add a new section
 
- 1. copy the current content to a file in :file:`doc/users/prev_whats_new`
- 2. merge all of the files in :file:`doc/users/next_whats_new/` into
-    :file:`doc/users/whats_new.rst` and delete the individual files
- 3. comment out the next what's new glob at the top
+  .. code:: rst
 
-Similarly for the "API changes",
+     X.Y
+     ===
+     .. toctree::
+         :maxdepth: 1
 
- 1. copy the current api changes to a file is :file:`doc/api/prev_api_changes`
- 2. merge all of the files in the most recent :file:`doc/api/next_api_changes`
-    into :file:`doc/api/api_changes.rst`
- 3. comment out the most recent API changes at the top.
+         prev_whats_new/whats_new_X.Y.0.rst
+         ../api/prev_api_changes/api_changes_X.Y.0.rst
+         prev_whats_new/github_stats_X.Y.0.rst
+- For bugfix releases add the GitHub stats and (if present) the API changes to
+  the existing X.Y section
 
-In both cases step 3 will have to be un-done right after the release.
+  .. code:: rst
+
+     ../api/prev_api_changes/api_changes_X.Y.Z.rst
+     prev_whats_new/github_stats_X.Y.Z.rst
+
+Update version switcher
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Update ``doc/_static/switcher.json``.  If a minor release, ``X.Y.Z``, create
+a new entry ``version: X.Y.(Z-1)``, and change the name of stable
+``name: stable/X.Y.Z``.  If a major release, ``X.Y.0``, change the name
+of ``name: devel/X.(Y+1)`` and ``name: stable/X.Y.0`` as well as adding
+a new version for the previous stable.
 
 Verify that docs build
 ----------------------
@@ -145,6 +180,19 @@ Python3 yet.  You will need to create a Python2 environment with
 Address any issues which may arise.  The internal links are checked on Circle
 CI, this should only flag failed external links.
 
+
+Update supported versions in SECURITY.md
+----------------------------------------
+
+For minor version release update the table in :file:`SECURITY.md` to specify
+that the 2 most recent minor releases in the current major version series are
+supported.
+
+For a major version release update the table in :file:`SECURITY.md` to specify
+that the last minor version in the previous major version series is still
+supported.  Dropping support for the last version of a major version series
+will be handled on an ad-hoc basis.
+
 .. _release_tag:
 
 Create release commit and tag
@@ -172,18 +220,16 @@ with the tag [#]_::
 
 Finally, push the tag to GitHub::
 
-  git push DANGER master v2.0.0
+  git push DANGER main v2.0.0
 
 Congratulations, the scariest part is done!
 
-.. [#] The tarball that is provided by GitHub is produced using `git
-       archive <https://git-scm.com/docs/git-archive>`__.  We use
-       `versioneer <https://github.com/warner/python-versioneer>`__
-       which uses a format string in
+.. [#] The tarball that is provided by GitHub is produced using `git archive`_.
+       We use setuptools_scm_ which uses a format string in
        :file:`lib/matplotlib/_version.py` to have ``git`` insert a
        list of references to exported commit (see
        :file:`.gitattributes` for the configuration).  This string is
-       then used by ``versioneer`` to produce the correct version,
+       then used by ``setuptools_scm`` to produce the correct version,
        based on the git tag, when users install from the tarball.
        However, if there is a branch pointed at the tagged commit,
        then the branch name will also be included in the tarball.
@@ -195,6 +241,8 @@ Congratulations, the scariest part is done!
 
           git archive v2.0.0 -o matplotlib-2.0.0.tar.gz --prefix=matplotlib-2.0.0/
 
+.. _git archive: https://git-scm.com/docs/git-archive
+.. _setuptools_scm: https://github.com/pypa/setuptools_scm
 
 If this is a final release, also create a 'doc' branch (this is not
 done for pre-releases)::
@@ -216,7 +264,7 @@ On this branch un-comment the globs from :ref:`release_chkdocs`.  And then ::
 
 .. _release_DOI:
 
-Release Management / DOI
+Release management / DOI
 ========================
 
 Via the `GitHub UI
@@ -308,7 +356,7 @@ Congratulations, you have now done the second scariest part!
 
 .. _release_docs:
 
-Build and Deploy Documentation
+Build and deploy documentation
 ==============================
 
 To build the documentation you must have the tagged version installed, but
@@ -318,21 +366,21 @@ build the docs from the ``ver-doc`` branch.  An easy way to arrange this is::
   pip install -r requirements/doc/doc-requirements.txt
   git checkout v2.0.0-doc
   git clean -xfd
-  make -Cdoc O="-Ainclude_analytics=True -j$(nproc)" html latexpdf LATEXMKOPTS="-silent -f"
+  make -Cdoc O="-t release -j$(nproc)" html latexpdf LATEXMKOPTS="-silent -f"
 
 which will build both the html and pdf version of the documentation.
 
 
 The built documentation exists in the `matplotlib.github.com
 <https://github.com/matplotlib/matplotlib.github.com/>`__ repository.
-Pushing changes to master automatically updates the website.
+Pushing changes to main automatically updates the website.
 
 The documentation is organized by version.  At the root of the tree is always
 the documentation for the latest stable release.  Under that, there are
 directories containing the documentation for older versions.  The documentation
-for current master is built on Circle CI and pushed to the `devdocs
+for current main is built on Circle CI and pushed to the `devdocs
 <https://github.com/matplotlib/devdocs/>`__ repository.  These are available at
-`matplotlib.org/devdocs <https://matplotlib.org/devdocs>`__.
+`matplotlib.org/devdocs <https://matplotlib.org/devdocs/>`__.
 
 Assuming you have this repository checked out in the same directory as
 matplotlib ::
@@ -355,7 +403,7 @@ the newly released version.  Now commit and push everything to GitHub ::
 
   git add *
   git commit -a -m 'Updating docs for v2.0.0'
-  git push DANGER master
+  git push DANGER main
 
 Congratulations you have now done the third scariest part!
 
diff --git a/doc/devel/style_guide.rst b/doc/devel/style_guide.rst
new file mode 100644
index 000000000000..9dab7a6d99d2
--- /dev/null
+++ b/doc/devel/style_guide.rst
@@ -0,0 +1,411 @@
+
+=========================
+Documentation style guide
+=========================
+
+This guide contains best practices for the language and formatting of Matplotlib
+documentation.
+
+.. seealso::
+
+    For more information about contributing, see the :ref:`documenting-matplotlib`
+    section.
+
+Expository language
+===================
+
+For explanatory writing, the following guidelines are for clear and concise
+language use.
+
+Terminology
+-----------
+
+There are several key terms in Matplotlib that are standards for
+reliability and consistency in documentation. They are not interchangeable.
+
+.. table::
+  :widths: 15, 15, 35, 35
+
+  +------------------+--------------------------+--------------+--------------+
+  | Term             | Description              | Correct      | Incorrect    |
+  +==================+==========================+==============+==============+
+  | |Figure|         | Matplotlib working space | - *For       | - "The figure|
+  |                  | for programming.         |   Matplotlib |   is the     |
+  |                  |                          |   objects*:  |   working    |
+  |                  |                          |   Figure,    |   space for  |
+  |                  |                          |   "The Figure|   visuals."  |
+  |                  |                          |   is the     | - "Methods in|
+  |                  |                          |   working    |   the figure |
+  |                  |                          |   space for  |   provide the|
+  |                  |                          |   the visual.|   visuals."  |
+  |                  |                          | - *Referring | - "The       |
+  |                  |                          |   to class*: |   |Figure|   |
+  |                  |                          |   |Figure|,  |   Four       |
+  |                  |                          |   "Methods   |   leglock is |
+  |                  |                          |   within the |   a wrestling|
+  |                  |                          |   |Figure|   |   move."     |
+  |                  |                          |   provide the|              |
+  |                  |                          |   visuals."  |              |
+  |                  |                          | - *General   |              |
+  |                  |                          |   language*: |              |
+  |                  |                          |   figure,    |              |
+  |                  |                          |   "Michelle  |              |
+  |                  |                          |   Kwan is a  |              |
+  |                  |                          |   famous     |              |
+  |                  |                          |   figure     |              |
+  |                  |                          |   skater."   |              |
+  +------------------+--------------------------+--------------+--------------+
+  | |Axes|           | Subplots within Figure.  | - *For       | - "The axes  |
+  |                  | Contains plot elements   |   Matplotlib |   methods    |
+  |                  | and is responsible for   |   objects*:  |   transform  |
+  |                  | plotting and configuring |   Axes, "An  |   the data." |
+  |                  | additional details.      |   Axes is a  | - "Each      |
+  |                  |                          |   subplot    |   |Axes| is  |
+  |                  |                          |   within the |   specific to|
+  |                  |                          |   Figure."   |   a Figure." |
+  |                  |                          | - *Referring | - "The       |
+  |                  |                          |   to class*: |   musicians  |
+  |                  |                          |   |Axes|,    |   on stage   |
+  |                  |                          |   "Each      |   call their |
+  |                  |                          |   |Axes| is  |   guitars    |
+  |                  |                          |   specific to|   Axes."     |
+  |                  |                          |   one        | - "The point |
+  |                  |                          |   Figure."   |   where the  |
+  |                  |                          | - *General   |   Axes meet  |
+  |                  |                          |   language*: |   is the     |
+  |                  |                          |   axes, "Both|   origin of  |
+  |                  |                          |   loggers and|   the        |
+  |                  |                          |   lumberjacks|   coordinate |
+  |                  |                          |   use axes to|   system."   |
+  |                  |                          |   chop wood."|              |
+  |                  |                          |   OR "There  |              |
+  |                  |                          |   are no     |              |
+  |                  |                          |   standard   |              |
+  |                  |                          |   names for  |              |
+  |                  |                          |   the        |              |
+  |                  |                          |   coordinates|              |
+  |                  |                          |   in the     |              |
+  |                  |                          |   three      |              |
+  |                  |                          |   axes."     |              |
+  |                  |                          |   (Plural of |              |
+  |                  |                          |   axis)      |              |
+  +------------------+--------------------------+--------------+--------------+
+  | |Artist|         | Broad variety of         | - *For       | - "Configure |
+  |                  | Matplotlib objects that  |   Matplotlib |   the legend |
+  |                  | display visuals.         |   objects*:  |   artist with|
+  |                  |                          |   Artist,    |   its        |
+  |                  |                          |   "Artists   |   respective |
+  |                  |                          |   display    |   method."   |
+  |                  |                          |   visuals and| - "There is  |
+  |                  |                          |   are the    |   an         |
+  |                  |                          |   visible    |   |Artist|   |
+  |                  |                          |   elements   |   for that   |
+  |                  |                          |   when       |   visual in  |
+  |                  |                          |   rendering a|   the graph."|
+  |                  |                          |   Figure."   | - "Some      |
+  |                  |                          | - *Referring |   Artists    |
+  |                  |                          |   to class*: |   became     |
+  |                  |                          |   |Artist| , |   famous only|
+  |                  |                          |   "Each      |   by         |
+  |                  |                          |   |Artist|   |   accident." |
+  |                  |                          |   has        |              |
+  |                  |                          |   respective |              |
+  |                  |                          |   methods and|              |
+  |                  |                          |   functions."|              |
+  |                  |                          | - *General   |              |
+  |                  |                          |   language*: |              |
+  |                  |                          |   artist,    |              |
+  |                  |                          |   "The       |              |
+  |                  |                          |   artist in  |              |
+  |                  |                          |   the museum |              |
+  |                  |                          |   is from    |              |
+  |                  |                          |   France."   |              |
+  +------------------+--------------------------+--------------+--------------+
+  | |Axis|           | Human-readable single    | - *For       | - "Plot the  |
+  |                  | dimensional object       |   Matplotlib |   graph onto |
+  |                  | of reference marks       |   objects*:  |   the axis." |
+  |                  | containing ticks, tick   |   Axis, "The | - "Each Axis |
+  |                  | labels, spines, and      |   Axis for   |   is usually |
+  |                  | edges.                   |   the bar    |   named after|
+  |                  |                          |   chart is a |   the        |
+  |                  |                          |   separate   |   coordinate |
+  |                  |                          |   Artist."   |   which is   |
+  |                  |                          |   (plural,   |   measured   |
+  |                  |                          |   Axis       |   along it." |
+  |                  |                          |   objects)   | - "In some   |
+  |                  |                          | - *Referring |   computer   |
+  |                  |                          |   to class*: |   graphics   |
+  |                  |                          |   |Axis|,    |   contexts,  |
+  |                  |                          |   "The       |   the        |
+  |                  |                          |   |Axis|     |   ordinate   |
+  |                  |                          |   contains   |   |Axis| may |
+  |                  |                          |   respective |   be oriented|
+  |                  |                          |   XAxis and  |   downwards."|
+  |                  |                          |   YAxis      |              |
+  |                  |                          |   objects."  |              |
+  |                  |                          | - *General   |              |
+  |                  |                          |   language*: |              |
+  |                  |                          |   axis,      |              |
+  |                  |                          |   "Rotation  |              |
+  |                  |                          |   around a   |              |
+  |                  |                          |   fixed axis |              |
+  |                  |                          |   is a       |              |
+  |                  |                          |   special    |              |
+  |                  |                          |   case of    |              |
+  |                  |                          |   rotational |              |
+  |                  |                          |   motion."   |              |
+  +------------------+--------------------------+--------------+--------------+
+  | Explicit,        | Explicit approach of     | - Explicit   | - object     |
+  | Object Oriented  | programming in           | - explicit   |   oriented   |
+  | Programming (OOP)| Matplotlib.              | - OOP        | - OO-style   |
+  +------------------+--------------------------+--------------+--------------+
+  | Implicit,        | Implicit approach of     | - Implicit   | - MATLAB like|
+  | ``pyplot``       | programming in Matplotlib| - implicit   | - Pyplot     |
+  |                  | with ``pyplot`` module.  | - ``pyplot`` | - pyplot     |
+  |                  |                          |              |   interface  |
+  +------------------+--------------------------+--------------+--------------+
+
+.. |Figure| replace:: :class:`~matplotlib.figure.Figure`
+.. |Axes| replace:: :class:`~matplotlib.axes.Axes`
+.. |Artist| replace:: :class:`~matplotlib.artist.Artist`
+.. |Axis| replace:: :class:`~matplotlib.axis.Axis`
+
+
+Grammar
+-------
+
+Subject
+^^^^^^^
+Use second-person imperative sentences for directed instructions specifying an
+action. Second-person pronouns are for individual-specific contexts and
+possessive reference.
+
+.. table::
+   :width: 100%
+   :widths: 50, 50
+
+   +------------------------------------+------------------------------------+
+   | Correct                            | Incorrect                          |
+   +====================================+====================================+
+   | Install Matplotlib from the source | You can install Matplotlib from the|
+   | directory using the Python ``pip`` | source directory. You can find     |
+   | installer program. Depending on    | additional support if you are      |
+   | your operating system, you may need| having trouble with your           |
+   | additional support.                | installation.                      |
+   +------------------------------------+------------------------------------+
+
+Tense
+^^^^^
+Use present simple tense for explanations. Avoid future tense and other modal
+or auxiliary verbs when possible.
+
+.. table::
+   :width: 100%
+   :widths: 50, 50
+
+   +------------------------------------+------------------------------------+
+   | Correct                            | Incorrect                          |
+   +====================================+====================================+
+   | The fundamental ideas behind       | Matplotlib will take data and      |
+   | Matplotlib for visualization       | transform it through functions and |
+   | involve taking data and            | methods. They can generate many    |
+   | transforming it through functions  | kinds of visuals. These will be the|
+   | and methods.                       | fundamentals for using Matplotlib. |
+   +------------------------------------+------------------------------------+
+
+Voice
+^^^^^
+Write in active sentences. Passive voice is best for situations or conditions
+related to warning prompts.
+
+.. table::
+   :width: 100%
+   :widths: 50, 50
+
+   +------------------------------------+------------------------------------+
+   | Correct                            | Incorrect                          |
+   +====================================+====================================+
+   | The function ``plot`` generates the| The graph is generated by the      |
+   | graph.                             | ``plot`` function.                 |
+   +------------------------------------+------------------------------------+
+   | An error message is returned by the| You will see an error message from |
+   | function if there are no arguments.| the function if there are no       |
+   |                                    | arguments.                         |
+   +------------------------------------+------------------------------------+
+
+Sentence structure
+^^^^^^^^^^^^^^^^^^
+Write with short sentences using Subject-Verb-Object order regularly. Limit
+coordinating conjunctions in sentences. Avoid pronoun references and
+subordinating conjunctive phrases.
+
+.. table::
+   :width: 100%
+   :widths: 50, 50
+
+   +------------------------------------+------------------------------------+
+   | Correct                            | Incorrect                          |
+   +====================================+====================================+
+   | The ``pyplot`` module in Matplotlib| The ``pyplot`` module in Matplotlib|
+   | is a collection of functions. These| is a collection of functions which |
+   | functions create, manage, and      | create, manage, and manipulate the |
+   | manipulate the current Figure and  | current Figure and plotting area.  |
+   | plotting area.                     |                                    |
+   +------------------------------------+------------------------------------+
+   | The ``plot`` function plots data   | The ``plot`` function plots data   |
+   | to the respective Axes. The Axes   | within its respective Axes for its |
+   | corresponds to the respective      | respective Figure.                 |
+   | Figure.                            |                                    |
+   +------------------------------------+------------------------------------+
+   | The implicit approach is a         | Users that wish to have convenient |
+   | convenient shortcut for            | shortcuts for generating plots use |
+   | generating simple plots.           | the implicit approach.             |
+   +------------------------------------+------------------------------------+
+
+
+Formatting
+==========
+
+The following guidelines specify how to incorporate code and use appropriate
+formatting for Matplotlib documentation.
+
+Code
+----
+
+Matplotlib is a Python library and follows the same standards for
+documentation.
+
+Comments
+^^^^^^^^
+Examples of Python code have comments before or on the same line.
+
+.. table::
+   :width: 100%
+   :widths: 50, 50
+
+   +---------------------------------------+---------------------------------+
+   | Correct                               | Incorrect                       |
+   +=======================================+=================================+
+   | ::                                    | ::                              |
+   |                                       |                                 |
+   |    # Data                             |    years = [2006, 2007, 2008]   |
+   |    years = [2006, 2007, 2008]         |    # Data                       |
+   +---------------------------------------+                                 |
+   | ::                                    |                                 |
+   |                                       |                                 |
+   |    years = [2006, 2007, 2008]  # Data |                                 |
+   +---------------------------------------+---------------------------------+
+
+Outputs
+^^^^^^^
+When generating visuals with Matplotlib using ``.py`` files in examples,
+display the visual with `matplotlib.pyplot.show` to display the visual.
+Keep the documentation clear of Python output lines.
+
+.. table::
+   :width: 100%
+   :widths: 50, 50
+
+   +------------------------------------+------------------------------------+
+   | Correct                            | Incorrect                          |
+   +====================================+====================================+
+   | ::                                 | ::                                 |
+   |                                    |                                    |
+   |    plt.plot([1, 2, 3], [1, 2, 3])  |    plt.plot([1, 2, 3], [1, 2, 3])  |
+   |    plt.show()                      |                                    |
+   +------------------------------------+------------------------------------+
+   | ::                                 | ::                                 |
+   |                                    |                                    |
+   |    fig, ax = plt.subplots()        |    fig, ax = plt.subplots()        |
+   |    ax.plot([1, 2, 3], [1, 2, 3])   |    ax.plot([1, 2, 3], [1, 2, 3])   |
+   |    fig.show()                      |                                    |
+   +------------------------------------+------------------------------------+
+
+reStructuredText
+----------------
+
+Matplotlib uses reStructuredText Markup for documentation. Sphinx helps to
+transform these documents into appropriate formats for accessibility and
+visibility.
+
+- `reStructuredText Specifications <https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html>`_
+- `Quick Reference Document <https://docutils.sourceforge.io/docs/user/rst/quickref.html>`_
+
+
+Lists
+^^^^^
+Bulleted lists are for items that do not require sequencing. Numbered lists are
+exclusively for performing actions in a determined order.
+
+.. table::
+   :width: 100%
+   :widths: 50, 50
+
+   +------------------------------------+------------------------------------+
+   | Correct                            | Incorrect                          |
+   +====================================+====================================+
+   | The example uses three graphs.     | The example uses three graphs.     |
+   +------------------------------------+------------------------------------+
+   | - Bar                              | 1. Bar                             |
+   | - Line                             | 2. Line                            |
+   | - Pie                              | 3. Pie                             |
+   +------------------------------------+------------------------------------+
+   | These four steps help to get       | The following steps are important  |
+   | started using Matplotlib.          | to get started using Matplotlib.   |
+   +------------------------------------+------------------------------------+
+   |  1. Import the Matplotlib library. |  - Import the Matplotlib library.  |
+   |  2. Import the necessary modules.  |  - Import the necessary modules.   |
+   |  3. Set and assign data to work on.|  - Set and assign data to work on. |
+   |  4. Transform data with methods and|  - Transform data with methods and |
+   |     functions.                     |    functions.                      |
+   +------------------------------------+------------------------------------+
+
+Tables
+^^^^^^
+Use ASCII tables with reStructuredText standards in organizing content.
+Markdown tables and the csv-table directive are not accepted.
+
+.. table::
+   :width: 100%
+   :widths: 50, 50
+
+   +--------------------------------+----------------------------------------+
+   | Correct                        | Incorrect                              |
+   +================================+========================================+
+   | +----------+----------+        | ::                                     |
+   | | Correct  | Incorrect|        |                                        |
+   | +==========+==========+        |     | Correct | Incorrect |            |
+   | | OK       | Not OK   |        |     | ------- | --------- |            |
+   | +----------+----------+        |     | OK      | Not OK    |            |
+   |                                |                                        |
+   +--------------------------------+----------------------------------------+
+   | ::                             | ::                                     |
+   |                                |                                        |
+   |     +----------+----------+    |     .. csv-table::                     |
+   |     | Correct  | Incorrect|    |        :header: "correct", "incorrect" |
+   |     +==========+==========+    |        :widths: 10, 10                 |
+   |     | OK       | Not OK   |    |                                        |
+   |     +----------+----------+    |        "OK   ", "Not OK"               |
+   |                                |                                        |
+   +--------------------------------+                                        |
+   | ::                             |                                        |
+   |                                |                                        |
+   |     ===========  ===========   |                                        |
+   |       Correct     Incorrect    |                                        |
+   |     ===========  ===========   |                                        |
+   |     OK           Not OK        |                                        |
+   |     ===========  ===========   |                                        |
+   |                                |                                        |
+   +--------------------------------+----------------------------------------+
+
+
+Additional resources
+====================
+This style guide is not a comprehensive standard. For a more thorough
+reference of how to contribute to documentation, see the links below. These
+resources contain common best practices for writing documentation.
+
+* `Python Developer's Guide <https://devguide.python.org/documenting/#documenting-python>`_
+* `Google Developer Style Guide <https://developers.google.com/style>`_
+* `IBM Style Guide <https://www.oreilly.com/library/view/the-ibm-style/9780132118989/>`_
+* `Red Hat Style Guide <https://stylepedia.net/style/#grammar>`_
diff --git a/doc/devel/testing.rst b/doc/devel/testing.rst
index 49c27002b058..945569310b48 100644
--- a/doc/devel/testing.rst
+++ b/doc/devel/testing.rst
@@ -37,7 +37,7 @@ Running the tests
 
 In the root directory of your development repository run::
 
-   pytest
+   python -m pytest
 
 
 pytest can be configured via a lot of `command-line parameters`_. Some
@@ -57,14 +57,6 @@ not need to be installed, but Matplotlib should be)::
   pytest lib/matplotlib/tests/test_simplification.py::test_clipping
 
 
-An alternative implementation that does not look at command line arguments
-and works from within Python is to run the tests from the Matplotlib library
-function :func:`matplotlib.test`::
-
-  import matplotlib
-  matplotlib.test()
-
-
 .. _command-line parameters: http://doc.pytest.org/en/latest/usage.html
 
 
@@ -95,10 +87,12 @@ Random data in tests
 Random data is a very convenient way to generate data for examples,
 however the randomness is problematic for testing (as the tests
 must be deterministic!).  To work around this set the seed in each test.
-For numpy use::
+For numpy's default random number generator use::
 
   import numpy as np
-  np.random.seed(19680801)
+  rng = np.random.default_rng(19680801)
+
+and then use ``rng`` when generating the random numbers.
 
 The seed is John Hunter's birthday.
 
@@ -165,7 +159,9 @@ workflows
 GitHub Actions should be automatically enabled for your personal Matplotlib
 fork once the YAML workflow files are in it. It generally isn't necessary to
 look at these workflows, since any pull request submitted against the main
-Matplotlib repository will be tested.
+Matplotlib repository will be tested. The Tests workflow is skipped in forked
+repositories but you can trigger a run manually from the `GitHub web interface
+<https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow>`_.
 
 You can see the GitHub Actions results at
 https://github.com/your_GitHub_user_name/matplotlib/actions -- here's `an
@@ -177,7 +173,7 @@ Using tox
 
 `Tox <https://tox.readthedocs.io/en/latest/>`_ is a tool for running tests
 against multiple Python environments, including multiple versions of Python
-(e.g., 3.6, 3.7) and even different Python implementations altogether
+(e.g., 3.7, 3.8) and even different Python implementations altogether
 (e.g., CPython, PyPy, Jython, etc.), as long as all these versions are
 available on your system's $PATH (consider using your system package manager,
 e.g. apt-get, yum, or Homebrew, to install them).
@@ -194,7 +190,7 @@ You can also run tox on a subset of environments:
 
 .. code-block:: bash
 
-    $ tox -e py37,py38
+    $ tox -e py38,py39
 
 Tox processes everything serially so it can take a long time to test
 several environments. To speed it up, you might try using a new,
@@ -252,16 +248,15 @@ The correct target folder can be found using::
     python -c "import matplotlib.tests; print(matplotlib.tests.__file__.rsplit('/', 1)[0])"
 
 An analogous copying of :file:`lib/mpl_toolkits/tests/baseline_images`
-is necessary for testing the :ref:`toolkits`.
+is necessary for testing ``mpl_toolkits``.
 
 Run the tests
 ^^^^^^^^^^^^^
 To run the all the tests on your installed version of Matplotlib::
 
-    pytest --pyargs matplotlib.tests
+    python -m pytest --pyargs matplotlib.tests
 
 The test discovery scope can be narrowed to single test modules or even single
 functions::
 
-    pytest --pyargs matplotlib.tests.test_simplification.py::test_clipping
-
+    python -m pytest --pyargs matplotlib.tests.test_simplification.py::test_clipping
diff --git a/doc/devel/triage.rst b/doc/devel/triage.rst
old mode 100644
new mode 100755
index b57947b049b7..7b09da2488f7
--- a/doc/devel/triage.rst
+++ b/doc/devel/triage.rst
@@ -16,7 +16,7 @@ internals of Matplotlib, is extremely valuable to the project, and we
 welcome anyone to participate in issue triage!  However, people who
 are not part of the Matplotlib organization do not have `permissions
 to change milestones, add labels, or close issue
-<https://docs.github.com/en/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization>`_.
+<https://docs.github.com/en/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization>`_.
 If you do not have enough GitHub permissions do something (e.g. add a
 label, close an issue), please leave a comment tagging
 ``@matplotlib/triageteam`` with your recommendations!
@@ -62,7 +62,7 @@ The following actions are typically useful:
    explores how to lead online discussions in the context of open source.
 
 
-Triage Team
+Triage team
 -----------
 
 
@@ -208,7 +208,7 @@ The following workflow [1]_ is a good way to approach issue triaging:
 
 
 .. [1] Adapted from the pandas project `maintainers guide
-       <https://dev.pandas.io/docs/development/maintaining.html>`_ and
+       <https://pandas.pydata.org/docs/development/maintaining.html>`_ and
        `the scikit-learn project
        <https://scikit-learn.org/dev/developers/bug_triaging.html>`_ .
 
@@ -223,5 +223,5 @@ participate to the review process following our :ref:`review guidelines
 Acknowledgments
 ---------------
 
-This page is lightly adapted from `the sckit-learn project
+This page is lightly adapted from `the scikit-learn project
 <https://scikit-learn.org/dev/developers/bug_triaging.html>`_ .
diff --git a/doc/faq/howto_faq.rst b/doc/faq/howto_faq.rst
deleted file mode 100644
index 62ca027d399c..000000000000
--- a/doc/faq/howto_faq.rst
+++ /dev/null
@@ -1,528 +0,0 @@
-.. _howto-faq:
-
-******
-How-to
-******
-
-.. contents::
-   :backlinks: none
-
-
-.. _howto-plotting:
-
-How-to: Plotting
-================
-
-.. _howto-datetime64:
-
-Plot `numpy.datetime64` values
-------------------------------
-
-As of Matplotlib 2.2, `numpy.datetime64` objects are handled the same way
-as `datetime.datetime` objects.
-
-If you prefer the pandas converters and locators, you can register them.  This
-is done automatically when calling a pandas plot function and may be
-unnecessary when using pandas instead of Matplotlib directly. ::
-
-  from pandas.plotting import register_matplotlib_converters
-  register_matplotlib_converters()
-
-
-.. _howto-figure-empty:
-
-Check whether a figure is empty
--------------------------------
-Empty can actually mean different things. Does the figure contain any artists?
-Does a figure with an empty `~.axes.Axes` still count as empty? Is the figure
-empty if it was rendered pure white (there may be artists present, but they
-could be outside the drawing area or transparent)?
-
-For the purpose here, we define empty as: "The figure does not contain any
-artists except it's background patch." The exception for the background is
-necessary, because by default every figure contains a `.Rectangle` as it's
-background patch. This definition could be checked via::
-
-    def is_empty(figure):
-        """
-        Return whether the figure contains no Artists (other than the default
-        background patch).
-        """
-        contained_artists = figure.get_children()
-        return len(contained_artists) <= 1
-
-We've decided not to include this as a figure method because this is only one
-way of defining empty, and checking the above is only rarely necessary.
-Usually the user or program handling the figure know if they have added
-something to the figure.
-
-Checking whether a figure would render empty cannot be reliably checked except
-by actually rendering the figure and investigating the rendered result.
-
-.. _howto-findobj:
-
-Find all objects in a figure of a certain type
-----------------------------------------------
-
-Every Matplotlib artist (see :doc:`/tutorials/intermediate/artists`) has a method
-called :meth:`~matplotlib.artist.Artist.findobj` that can be used to
-recursively search the artist for any artists it may contain that meet
-some criteria (e.g., match all :class:`~matplotlib.lines.Line2D`
-instances or match some arbitrary filter function).  For example, the
-following snippet finds every object in the figure which has a
-``set_color`` property and makes the object blue::
-
-    def myfunc(x):
-        return hasattr(x, 'set_color')
-
-    for o in fig.findobj(myfunc):
-        o.set_color('blue')
-
-You can also filter on class instances::
-
-    import matplotlib.text as text
-    for o in fig.findobj(text.Text):
-        o.set_fontstyle('italic')
-
-
-.. _howto-supress_offset:
-
-How to prevent ticklabels from having an offset
------------------------------------------------
-The default formatter will use an offset to reduce
-the length of the ticklabels.  To turn this feature
-off on a per-axis basis::
-
-   ax.get_xaxis().get_major_formatter().set_useOffset(False)
-
-set :rc:`axes.formatter.useoffset`, or use a different
-formatter.  See :mod:`~matplotlib.ticker` for details.
-
-.. _howto-transparent:
-
-Save transparent figures
-------------------------
-
-The :meth:`~matplotlib.pyplot.savefig` command has a keyword argument
-*transparent* which, if 'True', will make the figure and axes
-backgrounds transparent when saving, but will not affect the displayed
-image on the screen.
-
-If you need finer grained control, e.g., you do not want full transparency
-or you want to affect the screen displayed version as well, you can set
-the alpha properties directly.  The figure has a
-:class:`~matplotlib.patches.Rectangle` instance called *patch*
-and the axes has a Rectangle instance called *patch*.  You can set
-any property on them directly (*facecolor*, *edgecolor*, *linewidth*,
-*linestyle*, *alpha*).  e.g.::
-
-    fig = plt.figure()
-    fig.patch.set_alpha(0.5)
-    ax = fig.add_subplot(111)
-    ax.patch.set_alpha(0.5)
-
-If you need *all* the figure elements to be transparent, there is
-currently no global alpha setting, but you can set the alpha channel
-on individual elements, e.g.::
-
-   ax.plot(x, y, alpha=0.5)
-   ax.set_xlabel('volts', alpha=0.5)
-
-
-.. _howto-multipage:
-
-Save multiple plots to one pdf file
------------------------------------
-
-Many image file formats can only have one image per file, but some
-formats support multi-page files. Currently only the pdf backend has
-support for this. To make a multi-page pdf file, first initialize the
-file::
-
-    from matplotlib.backends.backend_pdf import PdfPages
-    pp = PdfPages('multipage.pdf')
-
-You can give the :class:`~matplotlib.backends.backend_pdf.PdfPages`
-object to :func:`~matplotlib.pyplot.savefig`, but you have to specify
-the format::
-
-    plt.savefig(pp, format='pdf')
-
-An easier way is to call
-:meth:`PdfPages.savefig <matplotlib.backends.backend_pdf.PdfPages.savefig>`::
-
-    pp.savefig()
-
-Finally, the multipage pdf object has to be closed::
-
-    pp.close()
-
-The same can be done using the pgf backend::
-
-    from matplotlib.backends.backend_pgf import PdfPages
-
-
-.. _howto-subplots-adjust:
-
-Move the edge of an axes to make room for tick labels
------------------------------------------------------
-
-For subplots, you can control the default spacing on the left, right,
-bottom, and top as well as the horizontal and vertical spacing between
-multiple rows and columns using the
-:meth:`matplotlib.figure.Figure.subplots_adjust` method (in pyplot it
-is :func:`~matplotlib.pyplot.subplots_adjust`).  For example, to move
-the bottom of the subplots up to make room for some rotated x tick
-labels::
-
-    fig = plt.figure()
-    fig.subplots_adjust(bottom=0.2)
-    ax = fig.add_subplot(111)
-
-You can control the defaults for these parameters in your
-:file:`matplotlibrc` file; see :doc:`/tutorials/introductory/customizing`.  For
-example, to make the above setting permanent, you would set::
-
-    figure.subplot.bottom : 0.2   # the bottom of the subplots of the figure
-
-The other parameters you can configure are, with their defaults
-
-*left*  = 0.125
-    the left side of the subplots of the figure
-*right* = 0.9
-    the right side of the subplots of the figure
-*bottom* = 0.1
-    the bottom of the subplots of the figure
-*top* = 0.9
-    the top of the subplots of the figure
-*wspace* = 0.2
-    the amount of width reserved for space between subplots,
-    expressed as a fraction of the average axis width
-*hspace* = 0.2
-    the amount of height reserved for space between subplots,
-    expressed as a fraction of the average axis height
-
-If you want additional control, you can create an
-:class:`~matplotlib.axes.Axes` using the
-:func:`~matplotlib.pyplot.axes` command (or equivalently the figure
-:meth:`~matplotlib.figure.Figure.add_axes` method), which allows you to
-specify the location explicitly::
-
-    ax = fig.add_axes([left, bottom, width, height])
-
-where all values are in fractional (0 to 1) coordinates.  See
-:doc:`/gallery/subplots_axes_and_figures/axes_demo` for an example of
-placing axes manually.
-
-.. _howto-auto-adjust:
-
-Automatically make room for tick labels
----------------------------------------
-
-.. note::
-   This is now easier to handle than ever before.
-   Calling :func:`~matplotlib.pyplot.tight_layout` or alternatively using
-   ``constrained_layout=True`` argument in :func:`~matplotlib.pyplot.subplots`
-   can fix many common layout issues.  See the
-   :doc:`/tutorials/intermediate/tight_layout_guide` and
-   :doc:`/tutorials/intermediate/constrainedlayout_guide` for more details.
-
-   The information below is kept here in case it is useful for other
-   purposes.
-
-In most use cases, it is enough to simply change the subplots adjust
-parameters as described in :ref:`howto-subplots-adjust`.  But in some
-cases, you don't know ahead of time what your tick labels will be, or
-how large they will be (data and labels outside your control may be
-being fed into your graphing application), and you may need to
-automatically adjust your subplot parameters based on the size of the
-tick labels.  Any :class:`~matplotlib.text.Text` instance can report
-its extent in window coordinates (a negative x coordinate is outside
-the window), but there is a rub.
-
-The :class:`~matplotlib.backend_bases.RendererBase` instance, which is
-used to calculate the text size, is not known until the figure is
-drawn (:meth:`~matplotlib.figure.Figure.draw`).  After the window is
-drawn and the text instance knows its renderer, you can call
-:meth:`~matplotlib.text.Text.get_window_extent`.  One way to solve
-this chicken and egg problem is to wait until the figure is draw by
-connecting
-(:meth:`~matplotlib.backend_bases.FigureCanvasBase.mpl_connect`) to the
-"on_draw" signal (:class:`~matplotlib.backend_bases.DrawEvent`) and
-get the window extent there, and then do something with it, e.g., move
-the left of the canvas over; see :ref:`event-handling-tutorial`.
-
-Here is an example that gets a bounding box in relative figure coordinates
-(0..1) of each of the labels and uses it to move the left of the subplots
-over so that the tick labels fit in the figure:
-
-.. figure:: ../gallery/pyplots/images/sphx_glr_auto_subplots_adjust_001.png
-    :target: ../gallery/pyplots/auto_subplots_adjust.html
-    :align: center
-    :scale: 50
-
-    Auto Subplots Adjust
-
-.. _howto-ticks:
-
-Configure the tick widths
--------------------------
-
-Wherever possible, it is recommended to use the :meth:`~.axes.Axes.tick_params`
-or :meth:`~.axis.Axis.set_tick_params` methods to modify tick properties::
-
-    import matplotlib.pyplot as plt
-
-    fig, ax = plt.subplots()
-    ax.plot(range(10))
-
-    ax.tick_params(width=10)
-
-    plt.show()
-
-For more control of tick properties that are not provided by the above methods,
-it is important to know that in Matplotlib, the ticks are *markers*.  All
-:class:`~matplotlib.lines.Line2D` objects support a line (solid, dashed, etc)
-and a marker (circle, square, tick).  The tick width is controlled by the
-``"markeredgewidth"`` property, so the above effect can also be achieved by::
-
-    import matplotlib.pyplot as plt
-
-    fig, ax = plt.subplots()
-    ax.plot(range(10))
-
-    for line in ax.get_xticklines() + ax.get_yticklines():
-        line.set_markeredgewidth(10)
-
-    plt.show()
-
-The other properties that control the tick marker, and all markers,
-are ``markerfacecolor``, ``markeredgecolor``, ``markeredgewidth``,
-``markersize``.  For more information on configuring ticks, see
-:ref:`axis-container` and :ref:`tick-container`.
-
-
-.. _howto-align-label:
-
-Align my ylabels across multiple subplots
------------------------------------------
-
-If you have multiple subplots over one another, and the y data have
-different scales, you can often get ylabels that do not align
-vertically across the multiple subplots, which can be unattractive.
-By default, Matplotlib positions the x location of the ylabel so that
-it does not overlap any of the y ticks.  You can override this default
-behavior by specifying the coordinates of the label.  The example
-below shows the default behavior in the left subplots, and the manual
-setting in the right subplots.
-
-.. figure:: ../gallery/pyplots/images/sphx_glr_align_ylabels_001.png
-   :target: ../gallery/pyplots/align_ylabels.html
-   :align: center
-   :scale: 50
-
-   Align Ylabels
-
-.. _date-index-plots:
-
-Skip dates where there is no data
----------------------------------
-
-When plotting time series, e.g., financial time series, one often wants to
-leave out days on which there is no data, e.g., weekends.  By passing in
-dates on the x-xaxis, you get large horizontal gaps on periods when there
-is not data. The solution is to pass in some proxy x-data, e.g., evenly
-sampled indices, and then use a custom formatter to format these as dates.
-:doc:`/gallery/text_labels_and_annotations/date_index_formatter` demonstrates
-how to use an 'index formatter' to achieve the desired plot.
-
-.. _howto-set-zorder:
-
-Control the depth of plot elements
-----------------------------------
-
-
-Within an axes, the order that the various lines, markers, text,
-collections, etc appear is determined by the
-:meth:`~matplotlib.artist.Artist.set_zorder` property.  The default
-order is patches, lines, text, with collections of lines and
-collections of patches appearing at the same level as regular lines
-and patches, respectively::
-
-    line, = ax.plot(x, y, zorder=10)
-
-.. only:: html
-
-    See :doc:`/gallery/misc/zorder_demo` for a complete example.
-
-You can also use the Axes property
-:meth:`~matplotlib.axes.Axes.set_axisbelow` to control whether the grid
-lines are placed above or below your other plot elements.
-
-.. _howto-axis-equal:
-
-Make the aspect ratio for plots equal
--------------------------------------
-
-The Axes property :meth:`~matplotlib.axes.Axes.set_aspect` controls the
-aspect ratio of the axes.  You can set it to be 'auto', 'equal', or
-some ratio which controls the ratio::
-
-  ax = fig.add_subplot(111, aspect='equal')
-
-.. only:: html
-
-    See :doc:`/gallery/subplots_axes_and_figures/axis_equal_demo` for a
-    complete example.
-
-.. _howto-twoscale:
-
-Multiple y-axis scales
-----------------------
-
-A frequent request is to have two scales for the left and right
-y-axis, which is possible using :func:`~matplotlib.pyplot.twinx` (more
-than two scales are not currently supported, though it is on the wish
-list).  This works pretty well, though there are some quirks when you
-are trying to interactively pan and zoom, because both scales do not get
-the signals.
-
-The approach uses :func:`~matplotlib.pyplot.twinx` (and its sister
-:func:`~matplotlib.pyplot.twiny`) to use *2 different axes*,
-turning the axes rectangular frame off on the 2nd axes to keep it from
-obscuring the first, and manually setting the tick locs and labels as
-desired.  You can use separate ``matplotlib.ticker`` formatters and
-locators as desired because the two axes are independent.
-
-.. plot::
-
-    import numpy as np
-    import matplotlib.pyplot as plt
-
-    fig = plt.figure()
-    ax1 = fig.add_subplot(111)
-    t = np.arange(0.01, 10.0, 0.01)
-    s1 = np.exp(t)
-    ax1.plot(t, s1, 'b-')
-    ax1.set_xlabel('time (s)')
-    ax1.set_ylabel('exp')
-
-    ax2 = ax1.twinx()
-    s2 = np.sin(2*np.pi*t)
-    ax2.plot(t, s2, 'r.')
-    ax2.set_ylabel('sin')
-    plt.show()
-
-
-.. only:: html
-
-    See :doc:`/gallery/subplots_axes_and_figures/two_scales` for a
-    complete example.
-
-.. _howto-batch:
-
-Generate images without having a window appear
-----------------------------------------------
-
-Simply do not call `~matplotlib.pyplot.show`, and directly save the figure to
-the desired format::
-
-    import matplotlib.pyplot as plt
-    plt.plot([1, 2, 3])
-    plt.savefig('myfig.png')
-
-.. seealso::
-
-    :doc:`/gallery/user_interfaces/web_application_server_sgskip` for
-    information about running matplotlib inside of a web application.
-
-.. _howto-show:
-
-Use :func:`~matplotlib.pyplot.show`
------------------------------------
-
-When you want to view your plots on your display,
-the user interface backend will need to start the GUI mainloop.
-This is what :func:`~matplotlib.pyplot.show` does.  It tells
-Matplotlib to raise all of the figure windows created so far and start
-the mainloop. Because this mainloop is blocking by default (i.e., script
-execution is paused), you should only call this once per script, at the end.
-Script execution is resumed after the last window is closed. Therefore, if
-you are using Matplotlib to generate only images and do not want a user
-interface window, you do not need to call ``show`` (see :ref:`howto-batch`
-and :ref:`what-is-a-backend`).
-
-.. note::
-   Because closing a figure window unregisters it from pyplot, you must call
-   `~matplotlib.pyplot.savefig` *before* calling ``show`` if you wish to save
-   the figure as well as view it.
-
-Whether ``show`` blocks further execution of the script or the python
-interpreter depends on whether Matplotlib is set to use interactive mode.
-In non-interactive mode (the default setting), execution is paused
-until the last figure window is closed.  In interactive mode, the execution
-is not paused, which allows you to create additional figures (but the script
-won't finish until the last figure window is closed).
-
-Because it is expensive to draw, you typically will not want Matplotlib
-to redraw a figure many times in a script such as the following::
-
-    plot([1, 2, 3])          # draw here?
-    xlabel('time')           # and here?
-    ylabel('volts')          # and here?
-    title('a simple plot')   # and here?
-    show()
-
-However, it is *possible* to force Matplotlib to draw after every command,
-which might be what you want when working interactively at the
-python console (see :ref:`mpl-shell`), but in a script you want to
-defer all drawing until the call to ``show``.  This is especially
-important for complex figures that take some time to draw.
-:func:`~matplotlib.pyplot.show` is designed to tell Matplotlib that
-you're all done issuing commands and you want to draw the figure now.
-
-.. note::
-
-    :func:`~matplotlib.pyplot.show` should typically only be called at
-    most once per script and it should be the last line of your
-    script.  At that point, the GUI takes control of the interpreter.
-    If you want to force a figure draw, use
-    :func:`~matplotlib.pyplot.draw` instead.
-
-.. versionadded:: v1.0.0
-   Matplotlib 1.0.0 and 1.0.1 added support for calling ``show`` multiple times
-   per script, and harmonized the behavior of interactive mode, across most
-   backends.
-
-.. _howto-boxplot_violinplot:
-
-Interpreting box plots and violin plots
----------------------------------------
-
-Tukey's :doc:`box plots </gallery/statistics/boxplot_demo>` (Robert McGill,
-John W. Tukey and Wayne A. Larsen: "The American Statistician" Vol. 32, No. 1,
-Feb., 1978, pp. 12-16) are statistical plots that provide useful information
-about the data distribution such as skewness. However, bar plots with error
-bars are still the common standard in most scientific literature, and thus, the
-interpretation of box plots can be challenging for the unfamiliar reader. The
-figure below illustrates the different visual features of a box plot.
-
-.. figure:: ../_static/boxplot_explanation.png
-
-:doc:`Violin plots </gallery/statistics/violinplot>` are closely related to box
-plots but add useful information such as the distribution of the sample data
-(density trace).  Violin plots were added in Matplotlib 1.4.
-
-.. _how-to-threads:
-
-Working with threads
---------------------
-
-Matplotlib is not thread-safe: in fact, there are known race conditions
-that affect certain artists.  Hence, if you work with threads, it is your
-responsibility to set up the proper locks to serialize access to Matplotlib
-artists.
-
-You may be able to work on separate figures from separate threads.  However,
-you must in that case use a *non-interactive backend* (typically Agg), because
-most GUI backends *require* being run from the main thread as well.
diff --git a/doc/faq/installing_faq.rst b/doc/faq/installing_faq.rst
deleted file mode 100644
index e1b97a505840..000000000000
--- a/doc/faq/installing_faq.rst
+++ /dev/null
@@ -1,158 +0,0 @@
-.. _installing-faq:
-
-*************
- Installation
-*************
-
-.. contents::
-   :backlinks: none
-
-Report a compilation problem
-============================
-
-See :ref:`reporting-problems`.
-
-Matplotlib compiled fine, but nothing shows up when I use it
-============================================================
-
-The first thing to try is a :ref:`clean install <clean-install>` and see if
-that helps.  If not, the best way to test your install is by running a script,
-rather than working interactively from a python shell or an integrated
-development environment such as :program:`IDLE` which add additional
-complexities. Open up a UNIX shell or a DOS command prompt and run, for
-example::
-
-   python -c "from pylab import *; set_loglevel('debug'); plot(); show()"
-
-This will give you additional information about which backends Matplotlib is
-loading, version information, and more. At this point you might want to make
-sure you understand Matplotlib's :doc:`configuration </tutorials/introductory/customizing>`
-process, governed by the :file:`matplotlibrc` configuration file which contains
-instructions within and the concept of the Matplotlib backend.
-
-If you are still having trouble, see :ref:`reporting-problems`.
-
-.. _clean-install:
-
-How to completely remove Matplotlib
-===================================
-
-Occasionally, problems with Matplotlib can be solved with a clean
-installation of the package.  In order to fully remove an installed Matplotlib:
-
-1. Delete the caches from your :ref:`Matplotlib configuration directory
-   <locating-matplotlib-config-dir>`.
-
-2. Delete any Matplotlib directories or eggs from your :ref:`installation
-   directory <locating-matplotlib-install>`.
-
-Linux Notes
-===========
-
-To install Matplotlib at the system-level, we recommend that you use your
-distribution's package manager.  This will guarantee that Matplotlib's
-dependencies will be installed as well.
-
-If, for some reason, you cannot use the package manager, you may use the wheels
-available on PyPI::
-
-   python -m pip install matplotlib
-
-or :ref:`build Matplotlib from source <install-from-git>`.
-
-OSX Notes
-=========
-
-.. _which-python-for-osx:
-
-Which python for OSX?
----------------------
-
-Apple ships OSX with its own Python, in ``/usr/bin/python``, and its own copy
-of Matplotlib. Unfortunately, the way Apple currently installs its own copies
-of NumPy, Scipy and Matplotlib means that these packages are difficult to
-upgrade (see `system python packages`_).  For that reason we strongly suggest
-that you install a fresh version of Python and use that as the basis for
-installing libraries such as NumPy and Matplotlib.  One convenient way to
-install Matplotlib with other useful Python software is to use the Anaconda_
-Python scientific software collection, which includes Python itself and a
-wide range of libraries; if you need a library that is not available from the
-collection, you can install it yourself using standard methods such as *pip*.
-See the Ananconda web page for installation support.
-
-.. _system python packages:
-    https://github.com/MacPython/wiki/wiki/Which-Python#system-python-and-extra-python-packages
-.. _Anaconda: https://www.anaconda.com/
-
-Other options for a fresh Python install are the standard installer from
-`python.org <https://www.python.org/downloads/mac-osx/>`_, or installing
-Python using a general OSX package management system such as `homebrew
-<http://brew.sh>`_ or `macports <https://www.macports.org>`_.  Power users on
-OSX will likely want one of homebrew or macports on their system to install
-open source software packages, but it is perfectly possible to use these
-systems with another source for your Python binary, such as Anaconda
-or Python.org Python.
-
-.. _install_osx_binaries:
-
-Installing OSX binary wheels
-----------------------------
-
-If you are using Python from https://www.python.org, Homebrew, or Macports,
-then you can use the standard pip installer to install Matplotlib binaries in
-the form of wheels.
-
-pip is installed by default with python.org and Homebrew Python, but needs to
-be manually installed on Macports with ::
-
-   sudo port install py38-pip
-
-Once pip is installed, you can install Matplotlib and all its dependencies with
-from the Terminal.app command line::
-
-   python3 -mpip install matplotlib
-
-(``sudo python3.6 ...`` on Macports).
-
-You might also want to install IPython or the Jupyter notebook (``python3 -mpip
-install ipython notebook``).
-
-Checking your installation
---------------------------
-
-The new version of Matplotlib should now be on your Python "path".  Check this
-at the Terminal.app command line::
-
-  python3 -c 'import matplotlib; print(matplotlib.__version__, matplotlib.__file__)'
-
-You should see something like ::
-
-  3.0.0 /Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/site-packages/matplotlib/__init__.py
-
-where ``3.0.0`` is the Matplotlib version you just installed, and the path
-following depends on whether you are using Python.org Python, Homebrew or
-Macports.  If you see another version, or you get an error like ::
-
-    Traceback (most recent call last):
-      File "<string>", line 1, in <module>
-    ImportError: No module named matplotlib
-
-then check that the Python binary is the one you expected by running ::
-
-  which python3
-
-If you get a result like ``/usr/bin/python...``, then you are getting the
-Python installed with OSX, which is probably not what you want.  Try closing
-and restarting Terminal.app before running the check again. If that doesn't fix
-the problem, depending on which Python you wanted to use, consider reinstalling
-Python.org Python, or check your homebrew or macports setup.  Remember that
-the disk image installer only works for Python.org Python, and will not get
-picked up by other Pythons.  If all these fail, please :ref:`let us know
-<reporting-problems>`.
-
-.. _install-from-git:
-
-Install from source
-===================
-
-See :ref:`install_from_source`.
\ No newline at end of file
diff --git a/doc/index.rst b/doc/index.rst
index 2d08c108a161..d83f09de6b08 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -1,220 +1,111 @@
 :orphan:
 
-.. title:: Matplotlib: Python plotting
+.. title:: Matplotlib documentation
 
-Matplotlib: Visualization with Python
--------------------------------------
+.. module:: matplotlib
+
+
+##################################
+Matplotlib |release| documentation
+##################################
 
 Matplotlib is a comprehensive library for creating static, animated,
 and interactive visualizations in Python.
 
-.. raw:: html
-
-   <div class="responsive_screenshots">
-      <a href="tutorials/introductory/sample_plots.html">
-         <div class="responsive_subfig">
-         <img align="middle" src="_images/sphx_glr_membrane_thumb.png"
-          border="0" alt="screenshots"/>
-         </div>
-         <div class="responsive_subfig">
-         <img align="middle" src="_images/sphx_glr_histogram_thumb.png"
-          border="0" alt="screenshots"/>
-         </div>
-         <div class="responsive_subfig">
-         <img align="middle" src="_images/sphx_glr_contour_thumb.png"
-          border="0" alt="screenshots"/>
-         </div>
-         <div class="responsive_subfig">
-         <img align="middle" src="_images/sphx_glr_3D_thumb.png"
-          border="0" alt="screenshots"/>
-         </div>
-      </a>
-   </div>
-   <span class="clear_screenshots"></span>
-
-Matplotlib makes easy things easy and hard things possible.
-
-.. container:: bullet-box-container
-
-   .. container:: bullet-box
-
-      Create
-
-      - Develop `publication quality plots`_ with just a few lines of code
-      - Use `interactive figures`_ that can zoom, pan, update...
-
-      .. _publication quality plots: https://matplotlib.org/gallery/index.html
-      .. _interactive figures: https://matplotlib.org/gallery/index.html#event-handling
-
-   .. container:: bullet-box
-
-      Customize
-
-      - `Take full control`_ of line styles, font properties, axes properties...
-      - `Export and embed`_ to a number of file formats and interactive environments
-
-      .. _Take full control: https://matplotlib.org/tutorials/index.html#tutorials
-      .. _Export and embed: https://matplotlib.org/api/index_backend_api.html
-
-   .. container:: bullet-box
-
-      Extend
-
-      - Explore tailored functionality provided by
-        :doc:`third party packages <thirdpartypackages/index>`
-      - Learn more about Matplotlib through the many
-        :doc:`external learning resources <resources/index>`
-
-Documentation
-~~~~~~~~~~~~~
-
-To get started, read the :doc:`User's Guide <users/index>`.
-
-Trying to learn how to do a particular kind of plot?  Check out the
-:doc:`examples gallery <gallery/index>` or the :doc:`list of plotting commands
-<api/pyplot_summary>`.
-
-Join our community!
-~~~~~~~~~~~~~~~~~~~
-
-Matplotlib is a welcoming, inclusive project, and everyone within the community
-is expected to abide by our `code of conduct <../CODE_OF_CONDUCT.md>`_.
-
-
-.. raw:: html
-
-    <h3>Get help</h3>
-    <div class="box">
-      <div class="box-item">
-        <img src="_static/fa/discourse-brands.svg" alt="Discourse">
-        <p>Join our community at <a href="https://discourse.matplotlib.org">discourse.matplotlib.org</a>
-        to get help, discuss contributing &amp; development, and share your work.</p>
-      </div>
-      <div class="box-item">
-        <img src="_static/fa/question-circle-regular.svg" alt="Questions">
-        <p>If you have questions, be sure to check the <a href="faq/index.html">FAQ</a>,
-        the <a href="api/index.html">API</a> docs. The full text
-        <a href="search.html">search</a> is a good way to discover the docs including the many examples.</p>
-      </div>
-      <div class="box-item">
-        <img src="_static/fa/stack-overflow-brands.svg" alt="Stackoverflow">
-        <p>Check out the Matplotlib tag on <a href="https://stackoverflow.com/questions/tagged/matplotlib">stackoverflow</a>.</p>
-      </div>
-      <div class="box-item">
-        <img src="_static/fa/gitter-brands.svg" alt="Gitter">
-        <p>Short questions may be posted on the <a href="https://gitter.im/matplotlib/matplotlib">gitter channel</a>.</p>
-      </div>
-    </div>
-    <hr class='box-sep'>
-    <h3>News</h3>
-    <div class="box">
-      <div class="box-item">
-        <img src="_static/fa/plus-square-regular.svg" alt="News">
-        <p>To keep up to date with what's going on in Matplotlib, see the
-        <a href="users/whats_new.html">what's new</a> page or browse the
-        <a href="https://github.com/matplotlib/matplotlib">source code</a>.  Anything that could
-        require changes to your existing code is logged in the
-        <a href="api/api_changes.html">API changes</a> file.</p>
-      </div>
-      <div class="box-item">
-        <img src="_static/fa/hashtag-solid.svg" alt="Social media">
-        <ul>
-        <li>Tweet us at <a href="https://twitter.com/matplotlib">@matplotlib</a>!</li>
-        <li>See cool plots on <a href="https://www.instagram.com/matplotart/">@matplotart</a> Instagram!</li>
-        <li>Check out our <a href="https://matplotlib.org/matplotblog/">Blog</a>!</li>
-        </ul>
-      </div>
-    </div>
-    <hr class='box-sep'>
-    <h3>Development</h3>
-    <div class="box">
-      <div class="box-item">
-        <img src="_static/fa/github-brands.svg" alt="Github">
-        <p>Matplotlib is hosted on <a href="https://github.com/matplotlib/matplotlib">GitHub</a>.</p>
-        <ul>
-        <li>File bugs and feature requests on the <a href="https://github.com/matplotlib/matplotlib/issues">issue tracker</a>.</li>
-        <li><a href="https://github.com/matplotlib/matplotlib/pulls">Pull requests</a> are always welcome.</li>
-        </ul>
-        <p>It is a good idea to ping us on <a href="https://discourse.matplotlib.org">Discourse</a> as well.</p>
-      </div>
-      <div class="box-item">
-        <img src="_static/fa/envelope-regular.svg" alt="Mailing lists">
-        <p>Mailing lists</p>
-        <ul>
-        <li><a href="https://mail.python.org/mailman/listinfo/matplotlib-users">matplotlib-users</a> for usage questions</li>
-        <li><a href="https://mail.python.org/mailman/listinfo/matplotlib-devel">matplotlib-devel</a> for development</li>
-        <li><a href="https://mail.python.org/mailman/listinfo/matplotlib-announce">matplotlib-announce</a> for project announcements</li>
-        </ul>
-      </div>
-    </div>
-
-
-Toolkits
-========
-
-Matplotlib ships with several add-on :doc:`toolkits <api/toolkits/index>`,
-including 3D plotting with `.mplot3d`, axes helpers in `.axes_grid1` and axis
-helpers in `.axisartist`.
-
-Third party packages
-====================
-
-A large number of :doc:`third party packages <thirdpartypackages/index>`
-extend and build on Matplotlib functionality, including several higher-level
-plotting interfaces (seaborn_, HoloViews_, ggplot_, ...), and a projection
-and mapping toolkit (Cartopy_).
-
-.. _seaborn: https://seaborn.pydata.org
-.. _HoloViews: https://holoviews.org
-.. _ggplot: http://ggplot.yhathq.com
-.. _Cartopy: https://scitools.org.uk/cartopy/docs/latest
-
-Citing Matplotlib
-=================
-
-Matplotlib is the brainchild of John Hunter (1968-2012), who, along with its
-many contributors, have put an immeasurable amount of time and effort into
-producing a piece of software utilized by thousands of scientists worldwide.
-
-If Matplotlib contributes to a project that leads to a scientific publication,
-please acknowledge this work by citing the project. A :doc:`ready-made citation
-entry <citing>` is available.
-
-Open source
-===========
-
-.. raw:: html
-
-   <a href="https://numfocus.org/">
-   <img src="_static/numfocus_badge.png"
-    alt="A Fiscally Sponsored Project of NUMFocus"
-    style="float:right; margin-left:20px" />
-   </a>
-
-
-Matplotlib is a Sponsored Project of NumFOCUS, a 501(c)(3) nonprofit
-charity in the United States. NumFOCUS provides Matplotlib with
-fiscal, legal, and administrative support to help ensure the health
-and sustainability of the project. Visit `numfocus.org <nf_>`_ for more
-information.
-
-Donations to Matplotlib are managed by NumFOCUS. For donors in the
-United States, your gift is tax-deductible to the extent provided by
-law. As with any donation, you should consult with your tax adviser
-about your particular tax situation.
-
-Please consider `donating to the Matplotlib project <donating_>`_ through
-the NumFOCUS organization or to the `John Hunter Technology Fellowship
-<jdh-fellowship_>`_.
-
-.. _donating: https://numfocus.org/donate-to-matplotlib
-.. _jdh-fellowship: https://numfocus.org/programs/john-hunter-technology-fellowship/
-.. _nf: https://numfocus.org
-
-The :doc:`Matplotlib license <users/license>` is based on the `Python Software
-Foundation (PSF) license <psf-license_>`_.
-
-.. _psf-license: https://www.python.org/psf/license
-
-There is an active developer community and a long list of people who have made
-significant :doc:`contributions <users/credits>`.
+************
+Installation
+************
+
+.. grid:: 1 1 2 2
+
+    .. grid-item::
+
+        Install using `pip <https://pypi.org/project/matplotlib>`__:
+
+        .. code-block:: bash
+
+            pip install matplotlib
+
+    .. grid-item::
+
+        Install using `conda <https://docs.continuum.io/anaconda/>`__:
+
+        .. code-block:: bash
+
+            conda install matplotlib
+
+Further details are available in the :doc:`Installation Guide <users/installing/index>`.
+
+
+******************
+Learning resources
+******************
+
+.. grid:: 1 1 2 2
+
+    .. grid-item-card::
+        :padding: 2
+
+        Tutorials
+        ^^^
+
+        - :doc:`Quick-start guide <tutorials/introductory/quick_start>`
+        - :doc:`Plot types <plot_types/index>`
+        - `Introductory tutorials <../tutorials/index.html#introductory>`_
+        - :doc:`External learning resources <users/resources/index>`
+
+    .. grid-item-card::
+        :padding: 2
+
+        How-tos
+        ^^^
+
+        - :doc:`Example gallery <gallery/index>`
+        - :doc:`Matplotlib FAQ <users/faq/index>`
+
+    .. grid-item-card::
+        :padding: 2
+
+        Understand how Matplotlib works
+        ^^^
+
+        - The :ref:`users-guide-explain` in the :doc:`Users guide
+          <users/index>`
+        - Many of the :ref:`Intermediate <tutorials-intermediate>` and
+          :ref:`Advanced <tutorials-advanced>` tutorials have explanatory
+          material
+
+    .. grid-item-card::
+        :padding: 2
+
+        Reference
+        ^^^
+
+        - :doc:`API Reference <api/index>`
+        - :doc:`Axes API <api/axes_api>` for most plotting methods
+        - :doc:`Figure API <api/figure_api>` for figure-level methods
+        - Top-level interfaces to create:
+
+          - Figures (`.pyplot.figure`)
+          - Subplots (`.pyplot.subplots`, `.pyplot.subplot_mosaic`)
+
+
+********************
+Third-party packages
+********************
+
+There are many `Third-party packages
+<https://matplotlib.org/mpl-third-party/>`_ built on top of and extending
+Matplotlib.
+
+
+************
+Contributing
+************
+
+Matplotlib is a community project maintained for and by its users.  There are many ways
+you can help!
+
+- Help other users `on discourse <https://discourse.matplotlib.org>`__
+- report a bug or request a feature `on GitHub <https://github.com/matplotlib/matplotlib/issues>`__
+- or improve the :ref:`documentation and code <developers-guide-index>`
diff --git a/doc/make.bat b/doc/make.bat
index 042c9ef3543b..578f111789c8 100644
--- a/doc/make.bat
+++ b/doc/make.bat
@@ -10,8 +10,9 @@ if "%SPHINXBUILD%" == "" (
 set SOURCEDIR=.
 set BUILDDIR=build
 set SPHINXPROJ=matplotlib
-set SPHINXOPTS=-W
-set O=
+if defined SPHINXOPTS goto skipopts
+set SPHINXOPTS=-W --keep-going
+:skipopts
 
 %SPHINXBUILD% >NUL 2>NUL
 if errorlevel 9009 (
diff --git a/doc/missing-references.json b/doc/missing-references.json
index 054a201acca3..52ffa65805b1 100644
--- a/doc/missing-references.json
+++ b/doc/missing-references.json
@@ -5,7 +5,6 @@
       "lib/matplotlib/dates.py:docstring of matplotlib.dates.AutoDateLocator.tick_values:5",
       "lib/matplotlib/dates.py:docstring of matplotlib.dates.MicrosecondLocator.tick_values:5",
       "lib/matplotlib/dates.py:docstring of matplotlib.dates.RRuleLocator.tick_values:5",
-      "lib/matplotlib/dates.py:docstring of matplotlib.dates.YearLocator.tick_values:5",
       "lib/matplotlib/ticker.py:docstring of matplotlib.ticker.AutoMinorLocator.tick_values:5",
       "lib/matplotlib/ticker.py:docstring of matplotlib.ticker.IndexLocator.tick_values:5",
       "lib/matplotlib/ticker.py:docstring of matplotlib.ticker.LinearLocator.tick_values:5",
@@ -14,16 +13,11 @@
       "lib/matplotlib/ticker.py:docstring of matplotlib.ticker.LogitLocator.tick_values:5",
       "lib/matplotlib/ticker.py:docstring of matplotlib.ticker.MaxNLocator.tick_values:5",
       "lib/matplotlib/ticker.py:docstring of matplotlib.ticker.MultipleLocator.tick_values:5",
-      "lib/matplotlib/ticker.py:docstring of matplotlib.ticker.OldAutoLocator.tick_values:5",
       "lib/matplotlib/ticker.py:docstring of matplotlib.ticker.SymmetricalLogLocator.tick_values:5"
     ],
-    "button": [
-      "doc/users/prev_whats_new/whats_new_3.1.0.rst:335"
-    ],
     "cbar_axes": [
-      "lib/mpl_toolkits/axes_grid1/axes_grid.py:docstring of mpl_toolkits.axes_grid1.axes_grid.ImageGrid.__init__:49",
-      "lib/mpl_toolkits/axes_grid1/axes_grid.py:docstring of mpl_toolkits.axes_grid1.axes_grid.ImageGrid:49",
-      "lib/mpl_toolkits/axisartist/axes_grid.py:docstring of mpl_toolkits.axisartist.axes_grid.ImageGrid:49"
+      "lib/mpl_toolkits/axes_grid1/axes_grid.py:docstring of mpl_toolkits.axes_grid1.axes_grid.ImageGrid:45",
+      "lib/mpl_toolkits/axisartist/axes_grid.py:docstring of mpl_toolkits.axisartist.axes_grid.ImageGrid:45"
     ],
     "eventson": [
       "lib/matplotlib/widgets.py:docstring of matplotlib.widgets.CheckButtons.set_active:4",
@@ -36,6 +30,22 @@
       "lib/matplotlib/transforms.py:docstring of matplotlib.transforms.Bbox.bounds:2"
     ],
     "input_dims": [
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.AitoffAxes.AitoffTransform.transform_non_affine:14",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.AitoffAxes.AitoffTransform.transform_non_affine:20",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.AitoffAxes.InvertedAitoffTransform.transform_non_affine:14",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.AitoffAxes.InvertedAitoffTransform.transform_non_affine:20",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.HammerAxes.HammerTransform.transform_non_affine:14",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.HammerAxes.HammerTransform.transform_non_affine:20",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.HammerAxes.InvertedHammerTransform.transform_non_affine:14",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.HammerAxes.InvertedHammerTransform.transform_non_affine:20",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.LambertAxes.InvertedLambertTransform.transform_non_affine:14",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.LambertAxes.InvertedLambertTransform.transform_non_affine:20",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.LambertAxes.LambertTransform.transform_non_affine:14",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.LambertAxes.LambertTransform.transform_non_affine:20",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.MollweideAxes.InvertedMollweideTransform.transform_non_affine:14",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.MollweideAxes.InvertedMollweideTransform.transform_non_affine:20",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.MollweideAxes.MollweideTransform.transform_non_affine:14",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.MollweideAxes.MollweideTransform.transform_non_affine:20",
       "lib/matplotlib/transforms.py:docstring of matplotlib.transforms.AffineBase.transform:14",
       "lib/matplotlib/transforms.py:docstring of matplotlib.transforms.AffineBase.transform:8",
       "lib/matplotlib/transforms.py:docstring of matplotlib.transforms.AffineBase.transform_affine:15",
@@ -54,7 +64,7 @@
       "lib/matplotlib/transforms.py:docstring of matplotlib.transforms.IdentityTransform.transform_non_affine:20"
     ],
     "lines": [
-      "lib/matplotlib/colorbar.py:docstring of matplotlib.colorbar.ColorbarBase.add_lines:4"
+      "lib/matplotlib/colorbar.py:docstring of matplotlib.colorbar.Colorbar.add_lines:4"
     ],
     "matplotlib.axes.Axes.dataLim": [
       "doc/api/prev_api_changes/api_changes_0.99.x.rst:23"
@@ -63,43 +73,36 @@
       "doc/api/prev_api_changes/api_changes_0.98.x.rst:89"
     ],
     "matplotlib.axes.Axes.lines": [
-      "doc/tutorials/intermediate/artists.rst:425",
-      "doc/tutorials/intermediate/artists.rst:91"
+      "doc/tutorials/intermediate/artists.rst:100",
+      "doc/tutorials/intermediate/artists.rst:442"
     ],
     "matplotlib.axes.Axes.patch": [
       "doc/api/prev_api_changes/api_changes_0.98.x.rst:89",
-      "doc/tutorials/intermediate/artists.rst:174",
-      "doc/tutorials/intermediate/artists.rst:409"
+      "doc/tutorials/intermediate/artists.rst:187",
+      "doc/tutorials/intermediate/artists.rst:426"
     ],
     "matplotlib.axes.Axes.patches": [
-      "doc/tutorials/intermediate/artists.rst:448"
+      "doc/tutorials/intermediate/artists.rst:465"
     ],
     "matplotlib.axes.Axes.transAxes": [
-      "lib/mpl_toolkits/axes_grid1/anchored_artists.py:docstring of mpl_toolkits.axes_grid1.anchored_artists.AnchoredDirectionArrows.__init__:8",
       "lib/mpl_toolkits/axes_grid1/anchored_artists.py:docstring of mpl_toolkits.axes_grid1.anchored_artists.AnchoredDirectionArrows:8"
     ],
     "matplotlib.axes.Axes.transData": [
-      "lib/mpl_toolkits/axes_grid1/anchored_artists.py:docstring of mpl_toolkits.axes_grid1.anchored_artists.AnchoredAuxTransformBox.__init__:11",
       "lib/mpl_toolkits/axes_grid1/anchored_artists.py:docstring of mpl_toolkits.axes_grid1.anchored_artists.AnchoredAuxTransformBox:11",
-      "lib/mpl_toolkits/axes_grid1/anchored_artists.py:docstring of mpl_toolkits.axes_grid1.anchored_artists.AnchoredEllipse.__init__:8",
       "lib/mpl_toolkits/axes_grid1/anchored_artists.py:docstring of mpl_toolkits.axes_grid1.anchored_artists.AnchoredEllipse:8",
-      "lib/mpl_toolkits/axes_grid1/anchored_artists.py:docstring of mpl_toolkits.axes_grid1.anchored_artists.AnchoredSizeBar.__init__:8",
       "lib/mpl_toolkits/axes_grid1/anchored_artists.py:docstring of mpl_toolkits.axes_grid1.anchored_artists.AnchoredSizeBar:8"
     ],
     "matplotlib.axes.Axes.viewLim": [
       "doc/api/prev_api_changes/api_changes_0.99.x.rst:23"
     ],
     "matplotlib.axes.Axes.xaxis": [
-      "doc/tutorials/intermediate/artists.rst:593"
+      "doc/tutorials/intermediate/artists.rst:610"
     ],
     "matplotlib.axes.Axes.yaxis": [
-      "doc/tutorials/intermediate/artists.rst:593"
+      "doc/tutorials/intermediate/artists.rst:610"
     ],
     "matplotlib.axis.Axis.label": [
-      "doc/tutorials/intermediate/artists.rst:640"
-    ],
-    "matplotlib.cm.ScalarMappable.callbacksSM": [
-      "doc/api/prev_api_changes/api_changes_0.98.0.rst:10"
+      "doc/tutorials/intermediate/artists.rst:657"
     ],
     "matplotlib.colorbar.ColorbarBase.ax": [
       "doc/api/prev_api_changes/api_changes_1.3.x.rst:100"
@@ -109,11 +112,11 @@
     ],
     "matplotlib.figure.Figure.patch": [
       "doc/api/prev_api_changes/api_changes_0.98.x.rst:89",
-      "doc/tutorials/intermediate/artists.rst:174",
-      "doc/tutorials/intermediate/artists.rst:307"
+      "doc/tutorials/intermediate/artists.rst:187",
+      "doc/tutorials/intermediate/artists.rst:320"
     ],
     "matplotlib.figure.Figure.transFigure": [
-      "doc/tutorials/intermediate/artists.rst:356"
+      "doc/tutorials/intermediate/artists.rst:369"
     ],
     "max": [
       "lib/matplotlib/transforms.py:docstring of matplotlib.transforms.Bbox.p1:4"
@@ -122,12 +125,20 @@
       "lib/matplotlib/transforms.py:docstring of matplotlib.transforms.Bbox.p0:4"
     ],
     "mpl_toolkits.mplot3d.axis3d._axinfo": [
-      "doc/api/toolkits/mplot3d.rst:40"
+      "doc/api/toolkits/mplot3d.rst:66"
     ],
     "name": [
       "lib/matplotlib/scale.py:docstring of matplotlib.scale.ScaleBase:8"
     ],
     "output_dims": [
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.AitoffAxes.AitoffTransform.transform_non_affine:20",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.AitoffAxes.InvertedAitoffTransform.transform_non_affine:20",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.HammerAxes.HammerTransform.transform_non_affine:20",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.HammerAxes.InvertedHammerTransform.transform_non_affine:20",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.LambertAxes.InvertedLambertTransform.transform_non_affine:20",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.LambertAxes.LambertTransform.transform_non_affine:20",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.MollweideAxes.InvertedMollweideTransform.transform_non_affine:20",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.MollweideAxes.MollweideTransform.transform_non_affine:20",
       "lib/matplotlib/transforms.py:docstring of matplotlib.transforms.AffineBase.transform:14",
       "lib/matplotlib/transforms.py:docstring of matplotlib.transforms.AffineBase.transform_affine:21",
       "lib/matplotlib/transforms.py:docstring of matplotlib.transforms.AffineBase.transform_non_affine:20",
@@ -167,10 +178,10 @@
       "doc/api/prev_api_changes/api_changes_2.2.0.rst:215"
     ],
     "Patch3DCollection": [
-      "doc/api/toolkits/mplot3d.rst:83:<autosummary>:1"
+      "doc/api/toolkits/mplot3d.rst:109:<autosummary>:1"
     ],
     "Path3DCollection": [
-      "doc/api/toolkits/mplot3d.rst:83:<autosummary>:1"
+      "doc/api/toolkits/mplot3d.rst:109:<autosummary>:1"
     ],
     "backend_qt5.FigureCanvasQT": [
       "doc/api/prev_api_changes/api_changes_2.2.0.rst:199"
@@ -230,40 +241,26 @@
       "doc/api/mathtext_api.rst:12"
     ],
     "matplotlib.axes.Subplot": [
-      "doc/tutorials/intermediate/artists.rst:35",
-      "doc/tutorials/intermediate/artists.rst:58"
-    ],
-    "matplotlib.axes._axes.Axes": [
-      "doc/api/artist_api.rst:189",
-      "doc/api/axes_api.rst:609",
-      "lib/matplotlib/projections/polar.py:docstring of matplotlib.projections.polar.PolarAxes:1",
-      "lib/mpl_toolkits/axes_grid1/mpl_axes.py:docstring of mpl_toolkits.axes_grid1.mpl_axes.Axes:1",
-      "lib/mpl_toolkits/axisartist/axislines.py:docstring of mpl_toolkits.axisartist.axislines.Axes:1",
-      "lib/mpl_toolkits/mplot3d/axes3d.py:docstring of mpl_toolkits.mplot3d.axes3d.Axes3D:1"
+      "doc/tutorials/intermediate/artists.rst:44",
+      "doc/tutorials/intermediate/artists.rst:67"
     ],
     "matplotlib.axes._base._AxesBase": [
-      "doc/api/artist_api.rst:189",
+      "doc/api/artist_api.rst:190",
       "doc/api/axes_api.rst:609",
       "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes._axes.Axes:1"
     ],
     "matplotlib.backend_bases.FigureCanvas": [
-      "doc/tutorials/intermediate/artists.rst:20",
-      "doc/tutorials/intermediate/artists.rst:22",
-      "doc/tutorials/intermediate/artists.rst:27"
+      "doc/tutorials/intermediate/artists.rst:29",
+      "doc/tutorials/intermediate/artists.rst:31",
+      "doc/tutorials/intermediate/artists.rst:36"
     ],
     "matplotlib.backend_bases.Renderer": [
-      "doc/tutorials/intermediate/artists.rst:22",
-      "doc/tutorials/intermediate/artists.rst:27"
+      "doc/tutorials/intermediate/artists.rst:31",
+      "doc/tutorials/intermediate/artists.rst:36"
     ],
     "matplotlib.backend_bases._Backend": [
       "lib/matplotlib/backend_bases.py:docstring of matplotlib.backend_bases.ShowBase:1"
     ],
-    "matplotlib.backend_tools._ToolEnableAllNavigation": [
-      "lib/matplotlib/backend_tools.py:docstring of matplotlib.backend_tools.ToolEnableAllNavigation:1"
-    ],
-    "matplotlib.backend_tools._ToolEnableNavigation": [
-      "lib/matplotlib/backend_tools.py:docstring of matplotlib.backend_tools.ToolEnableNavigation:1"
-    ],
     "matplotlib.backends._backend_pdf_ps.RendererPDFPSBase": [
       "lib/matplotlib/backends/backend_pdf.py:docstring of matplotlib.backends.backend_pdf.RendererPdf:1",
       "lib/matplotlib/backends/backend_ps.py:docstring of matplotlib.backends.backend_ps.RendererPS:1"
@@ -273,7 +270,8 @@
       "lib/matplotlib/backends/backend_tkcairo.py:docstring of matplotlib.backends.backend_tkcairo.FigureCanvasTkCairo:1"
     ],
     "matplotlib.backends.backend_webagg_core.FigureCanvasWebAggCore": [
-      "lib/matplotlib/backends/backend_nbagg.py:docstring of matplotlib.backends.backend_nbagg.FigureCanvasNbAgg:1"
+      "lib/matplotlib/backends/backend_nbagg.py:docstring of matplotlib.backends.backend_nbagg.FigureCanvasNbAgg:1",
+      "lib/matplotlib/backends/backend_webagg.py:docstring of matplotlib.backends.backend_webagg.FigureCanvasWebAgg:1"
     ],
     "matplotlib.backends.backend_webagg_core.FigureManagerWebAgg": [
       "lib/matplotlib/backends/backend_nbagg.py:docstring of matplotlib.backends.backend_nbagg.FigureManagerNbAgg:1"
@@ -281,11 +279,8 @@
     "matplotlib.backends.backend_webagg_core.NavigationToolbar2WebAgg": [
       "lib/matplotlib/backends/backend_nbagg.py:docstring of matplotlib.backends.backend_nbagg.NavigationIPy:1"
     ],
-    "matplotlib.cm.Wistia": [
-      "doc/users/prev_whats_new/whats_new_1.4.rst:21"
-    ],
     "matplotlib.collections._CollectionWithSizes": [
-      "doc/api/artist_api.rst:189",
+      "doc/api/artist_api.rst:190",
       "doc/api/collections_api.rst:13",
       "lib/matplotlib/collections.py:docstring of matplotlib.collections.CircleCollection:1",
       "lib/matplotlib/collections.py:docstring of matplotlib.collections.PathCollection:1",
@@ -293,10 +288,10 @@
       "lib/matplotlib/collections.py:docstring of matplotlib.collections.RegularPolyCollection:1"
     ],
     "matplotlib.dates.rrulewrapper": [
-      "doc/api/dates_api.rst:11"
+      "doc/api/dates_api.rst:12"
     ],
     "matplotlib.image._ImageBase": [
-      "doc/api/artist_api.rst:189",
+      "doc/api/artist_api.rst:190",
       "lib/matplotlib/image.py:docstring of matplotlib.image.AxesImage:1",
       "lib/matplotlib/image.py:docstring of matplotlib.image.BboxImage:1",
       "lib/matplotlib/image.py:docstring of matplotlib.image.FigureImage:1"
@@ -354,17 +349,17 @@
       "lib/matplotlib/patches.py:docstring of matplotlib.patches.ArrowStyle.Simple:1",
       "lib/matplotlib/patches.py:docstring of matplotlib.patches.ArrowStyle.Wedge:1"
     ],
-    "matplotlib.patches.ArrowStyle._Bracket": [
+    "matplotlib.patches.ArrowStyle._Curve": [
       "lib/matplotlib/patches.py:docstring of matplotlib.patches.ArrowStyle.BarAB:1",
       "lib/matplotlib/patches.py:docstring of matplotlib.patches.ArrowStyle.BracketA:1",
       "lib/matplotlib/patches.py:docstring of matplotlib.patches.ArrowStyle.BracketAB:1",
-      "lib/matplotlib/patches.py:docstring of matplotlib.patches.ArrowStyle.BracketB:1"
-    ],
-    "matplotlib.patches.ArrowStyle._Curve": [
+      "lib/matplotlib/patches.py:docstring of matplotlib.patches.ArrowStyle.BracketB:1",
+      "lib/matplotlib/patches.py:docstring of matplotlib.patches.ArrowStyle.BracketCurve:1",
       "lib/matplotlib/patches.py:docstring of matplotlib.patches.ArrowStyle.Curve:1",
       "lib/matplotlib/patches.py:docstring of matplotlib.patches.ArrowStyle.CurveA:1",
       "lib/matplotlib/patches.py:docstring of matplotlib.patches.ArrowStyle.CurveAB:1",
       "lib/matplotlib/patches.py:docstring of matplotlib.patches.ArrowStyle.CurveB:1",
+      "lib/matplotlib/patches.py:docstring of matplotlib.patches.ArrowStyle.CurveBracket:1",
       "lib/matplotlib/patches.py:docstring of matplotlib.patches.ArrowStyle.CurveFilledA:1",
       "lib/matplotlib/patches.py:docstring of matplotlib.patches.ArrowStyle.CurveFilledAB:1",
       "lib/matplotlib/patches.py:docstring of matplotlib.patches.ArrowStyle.CurveFilledB:1"
@@ -391,23 +386,18 @@
       "lib/matplotlib/patches.py:docstring of matplotlib.patches.ConnectionStyle:1",
       "lib/mpl_toolkits/axisartist/axisline_style.py:docstring of mpl_toolkits.axisartist.axisline_style.AxislineStyle:1"
     ],
-    "matplotlib.projections.geo.AitoffAxes": [
-      "doc/api/artist_api.rst:189"
-    ],
-    "matplotlib.projections.geo.GeoAxes": [
-      "doc/api/artist_api.rst:189"
-    ],
-    "matplotlib.projections.geo.HammerAxes": [
-      "doc/api/artist_api.rst:189"
-    ],
-    "matplotlib.projections.geo.LambertAxes": [
-      "doc/api/artist_api.rst:189"
-    ],
-    "matplotlib.projections.geo.MollweideAxes": [
-      "doc/api/artist_api.rst:189"
+    "matplotlib.projections.geo._GeoTransform": [
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.AitoffAxes.AitoffTransform:1",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.AitoffAxes.InvertedAitoffTransform:1",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.HammerAxes.HammerTransform:1",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.HammerAxes.InvertedHammerTransform:1",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.LambertAxes.InvertedLambertTransform:1",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.LambertAxes.LambertTransform:1",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.MollweideAxes.InvertedMollweideTransform:1",
+      "lib/matplotlib/projections/geo.py:docstring of matplotlib.projections.geo.MollweideAxes.MollweideTransform:1"
     ],
     "matplotlib.text._AnnotationBase": [
-      "doc/api/artist_api.rst:189",
+      "doc/api/artist_api.rst:190",
       "lib/matplotlib/offsetbox.py:docstring of matplotlib.offsetbox.AnnotationBbox:1",
       "lib/matplotlib/text.py:docstring of matplotlib.text.Annotation:1"
     ],
@@ -415,16 +405,6 @@
       "lib/matplotlib/transforms.py:docstring of matplotlib.transforms.BlendedAffine2D:1",
       "lib/matplotlib/transforms.py:docstring of matplotlib.transforms.BlendedGenericTransform:1"
     ],
-    "matplotlib.tri.trifinder.TriFinder": [
-      "lib/matplotlib/tri/trifinder.py:docstring of matplotlib.tri.trifinder.TrapezoidMapTriFinder:1"
-    ],
-    "matplotlib.tri.triinterpolate.TriInterpolator": [
-      "lib/matplotlib/tri/triinterpolate.py:docstring of matplotlib.tri.triinterpolate.CubicTriInterpolator:1",
-      "lib/matplotlib/tri/triinterpolate.py:docstring of matplotlib.tri.triinterpolate.LinearTriInterpolator:1"
-    ],
-    "matplotlib.tri.trirefine.TriRefiner": [
-      "lib/matplotlib/tri/trirefine.py:docstring of matplotlib.tri.trirefine.UniformTriRefiner:1"
-    ],
     "matplotlib.widgets._SelectorWidget": [
       "lib/matplotlib/widgets.py:docstring of matplotlib.widgets.LassoSelector:1",
       "lib/matplotlib/widgets.py:docstring of matplotlib.widgets.PolygonSelector:1",
@@ -456,7 +436,6 @@
       "doc/api/_as_gen/mpl_toolkits.axes_grid1.parasite_axes.rst:31:<autosummary>:1"
     ],
     "mpl_toolkits.axisartist.Axes": [
-      "doc/api/toolkits/axisartist.rst:5",
       "doc/api/toolkits/axisartist.rst:6"
     ],
     "mpl_toolkits.axisartist.axisline_style.AxislineStyle._Base": [
@@ -472,7 +451,7 @@
       "lib/mpl_toolkits/axisartist/axislines.py:docstring of mpl_toolkits.axisartist.axislines.AxisArtistHelper.Fixed:1",
       "lib/mpl_toolkits/axisartist/axislines.py:docstring of mpl_toolkits.axisartist.axislines.AxisArtistHelper.Floating:1"
     ],
-    "mpl_toolkits.axisartist.floating_axes.Floating AxesHostAxes": [
+    "mpl_toolkits.axisartist.floating_axes.FloatingAxesHostAxes": [
       "<unknown>:1",
       "doc/api/_as_gen/mpl_toolkits.axisartist.floating_axes.rst:31:<autosummary>:1"
     ],
@@ -485,22 +464,11 @@
   },
   "py:data": {
     "matplotlib.axes.Axes.transAxes": [
-      "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes._axes.Axes.legend:219",
-      "lib/matplotlib/figure.py:docstring of matplotlib.figure.FigureBase.legend:220",
-      "lib/matplotlib/legend.py:docstring of matplotlib.legend.Legend:179",
-      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.figlegend:220",
-      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.legend:219"
-    ]
-  },
-  "py:func": {
-    "matplotlib.Axis.set_ticks_position": [
-      "doc/users/prev_whats_new/whats_new_1.4.rst:141"
-    ],
-    "matplotlib.InvertedPolarTransform.transform_non_affine": [
-      "doc/users/prev_whats_new/whats_new_1.4.rst:236"
-    ],
-    "matplotlib.axis.Tick.label1On": [
-      "doc/users/prev_whats_new/whats_new_2.1.0.rst:409"
+      "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes._axes.Axes.legend:234",
+      "lib/matplotlib/figure.py:docstring of matplotlib.figure.FigureBase.legend:235",
+      "lib/matplotlib/legend.py:docstring of matplotlib.legend.Legend:182",
+      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.figlegend:235",
+      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.legend:234"
     ]
   },
   "py:meth": {
@@ -521,96 +489,83 @@
       "doc/api/prev_api_changes/api_changes_2.2.0.rst:199"
     ],
     "IPython.terminal.interactiveshell.TerminalInteractiveShell.inputhook": [
-      "doc/users/interactive_guide.rst:421"
+      "doc/users/explain/interactive_guide.rst:422"
     ],
     "_find_tails": [
       "lib/matplotlib/quiver.py:docstring of matplotlib.quiver.Barbs:9"
     ],
-    "_iter_collection": [
-      "lib/matplotlib/backend_bases.py:docstring of matplotlib.backend_bases.RendererBase.draw_path_collection:12",
-      "lib/matplotlib/backends/backend_agg.py:docstring of matplotlib.backends.backend_agg.RendererAgg.draw_path_collection:12",
-      "lib/matplotlib/backends/backend_pdf.py:docstring of matplotlib.backends.backend_pdf.RendererPdf.draw_path_collection:12",
-      "lib/matplotlib/backends/backend_ps.py:docstring of matplotlib.backends.backend_ps.RendererPS.draw_path_collection:12",
-      "lib/matplotlib/backends/backend_svg.py:docstring of matplotlib.backends.backend_svg.RendererSVG.draw_path_collection:12",
-      "lib/matplotlib/patheffects.py:docstring of matplotlib.patheffects.PathEffectRenderer.draw_path_collection:12"
-    ],
-    "_iter_collection_raw_paths": [
-      "lib/matplotlib/backend_bases.py:docstring of matplotlib.backend_bases.RendererBase.draw_path_collection:12",
-      "lib/matplotlib/backends/backend_agg.py:docstring of matplotlib.backends.backend_agg.RendererAgg.draw_path_collection:12",
-      "lib/matplotlib/backends/backend_pdf.py:docstring of matplotlib.backends.backend_pdf.RendererPdf.draw_path_collection:12",
-      "lib/matplotlib/backends/backend_ps.py:docstring of matplotlib.backends.backend_ps.RendererPS.draw_path_collection:12",
-      "lib/matplotlib/backends/backend_svg.py:docstring of matplotlib.backends.backend_svg.RendererSVG.draw_path_collection:12",
-      "lib/matplotlib/patheffects.py:docstring of matplotlib.patheffects.PathEffectRenderer.draw_path_collection:12"
-    ],
     "_make_barbs": [
       "lib/matplotlib/quiver.py:docstring of matplotlib.quiver.Barbs:9"
     ],
     "autoscale_view": [
       "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.margins:32"
     ],
-    "colorbar.Colobar.minorticks_off": [
-      "doc/users/prev_whats_new/whats_new_3.0.rst:63"
-    ],
-    "colorbar.Colobar.minorticks_on": [
-      "doc/users/prev_whats_new/whats_new_3.0.rst:63"
-    ],
-    "draw_image": [
-      "lib/matplotlib/backends/backend_agg.py:docstring of matplotlib.backends.backend_agg.RendererAgg.option_scale_image:2"
-    ],
     "get_matrix": [
       "lib/matplotlib/transforms.py:docstring of matplotlib.transforms.Affine2DBase:13"
     ],
-    "matplotlib.dates.DateFormatter.__call__": [
-      "doc/users/prev_whats_new/whats_new_1.5.rst:497"
+    "matplotlib.collections._CollectionWithSizes.set_sizes": [
+      "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes._axes.Axes.barbs:176",
+      "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes._axes.Axes.broken_barh:86",
+      "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes._axes.Axes.fill_between:118",
+      "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes._axes.Axes.fill_betweenx:118",
+      "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes._axes.Axes.hexbin:173",
+      "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes._axes.Axes.pcolor:168",
+      "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes._axes.Axes.quiver:211",
+      "lib/matplotlib/collections.py:docstring of matplotlib.artist.AsteriskPolygonCollection.set:43",
+      "lib/matplotlib/collections.py:docstring of matplotlib.artist.BrokenBarHCollection.set:44",
+      "lib/matplotlib/collections.py:docstring of matplotlib.artist.CircleCollection.set:43",
+      "lib/matplotlib/collections.py:docstring of matplotlib.artist.PathCollection.set:44",
+      "lib/matplotlib/collections.py:docstring of matplotlib.artist.PolyCollection.set:44",
+      "lib/matplotlib/collections.py:docstring of matplotlib.artist.RegularPolyCollection.set:43",
+      "lib/matplotlib/collections.py:docstring of matplotlib.artist.StarPolygonCollection.set:43",
+      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.barbs:176",
+      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.broken_barh:86",
+      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.fill_between:118",
+      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.fill_betweenx:118",
+      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.hexbin:173",
+      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.pcolor:168",
+      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.quiver:211",
+      "lib/matplotlib/quiver.py:docstring of matplotlib.artist.Barbs.set:45",
+      "lib/matplotlib/quiver.py:docstring of matplotlib.artist.Quiver.set:45",
+      "lib/matplotlib/quiver.py:docstring of matplotlib.quiver.Barbs:209",
+      "lib/matplotlib/quiver.py:docstring of matplotlib.quiver.Quiver:247",
+      "lib/mpl_toolkits/mplot3d/art3d.py:docstring of matplotlib.artist.Path3DCollection.set:46",
+      "lib/mpl_toolkits/mplot3d/art3d.py:docstring of matplotlib.artist.Poly3DCollection.set:44"
     ],
     "matplotlib.dates.MicrosecondLocator.__call__": [
       "doc/api/prev_api_changes/api_changes_1.5.0.rst:122"
-    ],
-    "option_scale_image": [
-      "lib/matplotlib/backends/backend_cairo.py:docstring of matplotlib.backends.backend_cairo.RendererCairo.draw_image:22",
-      "lib/matplotlib/backends/backend_pdf.py:docstring of matplotlib.backends.backend_pdf.RendererPdf.draw_image:22",
-      "lib/matplotlib/backends/backend_ps.py:docstring of matplotlib.backends.backend_ps.RendererPS.draw_image:22",
-      "lib/matplotlib/backends/backend_template.py:docstring of matplotlib.backends.backend_template.RendererTemplate.draw_image:22"
     ]
   },
   "py:mod": {
     "IPython.terminal.pt_inputhooks": [
-      "doc/users/interactive_guide.rst:421"
+      "doc/users/explain/interactive_guide.rst:422"
     ],
     "dateutil": [
       "lib/matplotlib/dates.py:docstring of matplotlib.dates:1"
     ],
-    "matplotlib": [
-      "doc/api/prev_api_changes/api_changes_0.91.2.rst:15"
-    ],
     "matplotlib.ft2font": [
       "doc/api/prev_api_changes/api_changes_0.91.0.rst:34"
     ]
   },
   "py:obj": {
     "Artist.stale_callback": [
-      "doc/users/interactive_guide.rst:323"
+      "doc/users/explain/interactive_guide.rst:325"
     ],
     "Artist.sticky_edges": [
-      "doc/api/axes_api.rst:364:<autosummary>:1",
+      "doc/api/axes_api.rst:363:<autosummary>:1",
       "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes.Axes.use_sticky_edges:2"
     ],
     "ArtistInspector.aliasd": [
-      "doc/api/prev_api_changes/api_changes_3.0.0.rst:332",
-      "doc/users/prev_whats_new/whats_new_3.1.0.rst:171"
+      "doc/api/prev_api_changes/api_changes_3.0.0.rst:332"
     ],
     "ArtistInspector.get_aliases": [
       "doc/api/prev_api_changes/api_changes_3.0.0.rst:327"
     ],
     "Axes.dataLim": [
-      "doc/api/axes_api.rst:304:<autosummary>:1",
+      "doc/api/axes_api.rst:303:<autosummary>:1",
       "lib/matplotlib/axes/_base.py:docstring of matplotlib.axes._base._AxesBase.update_datalim:2",
       "lib/mpl_toolkits/mplot3d/axes3d.py:docstring of mpl_toolkits.mplot3d.axes3d.Axes3D.update_datalim:2"
     ],
-    "Axes.datalim": [
-      "doc/api/axes_api.rst:304:<autosummary>:1",
-      "lib/matplotlib/axes/_base.py:docstring of matplotlib.axes._base._AxesBase.update_datalim_bounds:2"
-    ],
     "Axes.fmt_xdata": [
       "doc/api/prev_api_changes/api_changes_3.1.0.rst:397",
       "doc/api/prev_api_changes/api_changes_3.1.0.rst:400"
@@ -623,30 +578,25 @@
       "doc/api/prev_api_changes/api_changes_3.2.0/behavior.rst:91",
       "doc/api/prev_api_changes/api_changes_3.2.0/behavior.rst:93",
       "doc/api/prev_api_changes/api_changes_3.2.0/behavior.rst:95",
-      "doc/api/prev_api_changes/api_changes_3.2.0/behavior.rst:98"
+      "doc/api/prev_api_changes/api_changes_3.2.0/behavior.rst:98",
+      "doc/users/prev_whats_new/whats_new_3.5.0.rst:126"
     ],
     "AxesBase": [
-      "doc/api/axes_api.rst:456:<autosummary>:1",
+      "doc/api/axes_api.rst:455:<autosummary>:1",
       "lib/matplotlib/axes/_base.py:docstring of matplotlib.axes._base._AxesBase.add_child_axes:2"
     ],
     "Axis._update_ticks": [
       "doc/api/prev_api_changes/api_changes_3.1.0.rst:1072"
     ],
-    "Axis.set_tick_params": [
-      "doc/users/prev_whats_new/whats_new_2.1.0.rst:394"
-    ],
     "Axis.units": [
       "doc/api/prev_api_changes/api_changes_2.2.0.rst:77"
     ],
     "FT2Font": [
-      "doc/gallery/misc/ftface_props.rst:16",
+      "doc/gallery/misc/ftface_props.rst:25",
       "lib/matplotlib/font_manager.py:docstring of matplotlib.font_manager.ttfFontProperty:8"
     ],
     "Figure.stale_callback": [
-      "doc/users/interactive_guide.rst:333"
-    ],
-    "FigureCanvas": [
-      "lib/matplotlib/backend_tools.py:docstring of matplotlib.backend_tools.ToolBase:25"
+      "doc/users/explain/interactive_guide.rst:335"
     ],
     "Formatter.__call__": [
       "doc/api/prev_api_changes/api_changes_3.1.0.rst:1122",
@@ -656,11 +606,8 @@
       "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes._axes.Axes.violinplot:46",
       "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.violinplot:46"
     ],
-    "Glue": [
-      "lib/matplotlib/mathtext.py:docstring of matplotlib.mathtext.GlueSpec:2"
-    ],
     "Glyph": [
-      "doc/gallery/misc/ftface_props.rst:16"
+      "doc/gallery/misc/ftface_props.rst:25"
     ],
     "Image": [
       "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.gci:4"
@@ -672,58 +619,55 @@
       "doc/api/prev_api_changes/api_changes_3.1.0.rst:706"
     ],
     "Line2D.pick": [
-      "doc/users/event_handling.rst:438"
+      "doc/users/explain/event_handling.rst:468"
     ],
     "MicrosecondLocator.__call__": [
       "doc/api/prev_api_changes/api_changes_1.5.0.rst:119"
     ],
     "MovieWriter.saving": [
-      "doc/api/animation_api.rst:221"
+      "doc/api/animation_api.rst:232"
     ],
     "MovieWriterBase": [
-      "lib/matplotlib/animation.py:docstring of matplotlib.animation.AVConvBase:4",
       "lib/matplotlib/animation.py:docstring of matplotlib.animation.FFMpegBase:4",
       "lib/matplotlib/animation.py:docstring of matplotlib.animation.ImageMagickBase:4"
     ],
-    "MovieWriterRegistry": [
-      "doc/api/prev_api_changes/api_changes_3.2.0/behavior.rst:49",
-      "doc/api/prev_api_changes/api_changes_3.2.0/behavior.rst:51",
-      "doc/api/prev_api_changes/api_changes_3.2.0/deprecations.rst:121"
-    ],
     "QuadContourSet.changed()": [
-      "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes._axes.Axes.contour:131",
-      "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes._axes.Axes.contourf:131",
-      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.contour:131",
-      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.contourf:131"
+      "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes._axes.Axes.contour:133",
+      "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes._axes.Axes.contourf:133",
+      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.contour:133",
+      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.contourf:133"
     ],
     "Quiver.pivot": [
       "doc/api/prev_api_changes/api_changes_1.5.0.rst:44"
     ],
     "Rectangle.contains": [
-      "doc/users/event_handling.rst:150"
+      "doc/users/explain/event_handling.rst:180"
     ],
     "Size.from_any": [
-      "lib/mpl_toolkits/axes_grid1/axes_grid.py:docstring of mpl_toolkits.axes_grid1.axes_grid.ImageGrid.__init__:61",
-      "lib/mpl_toolkits/axes_grid1/axes_grid.py:docstring of mpl_toolkits.axes_grid1.axes_grid.ImageGrid:61",
-      "lib/mpl_toolkits/axisartist/axes_grid.py:docstring of mpl_toolkits.axisartist.axes_grid.ImageGrid:61"
+      "lib/mpl_toolkits/axes_grid1/axes_grid.py:docstring of mpl_toolkits.axes_grid1.axes_grid.ImageGrid:57",
+      "lib/mpl_toolkits/axisartist/axes_grid.py:docstring of mpl_toolkits.axisartist.axes_grid.ImageGrid:57"
     ],
     "Timer": [
       "lib/matplotlib/backend_bases.py:docstring of matplotlib.backend_bases.FigureCanvasBase.new_timer:2",
       "lib/matplotlib/backend_bases.py:docstring of matplotlib.backend_bases.TimerBase:14"
     ],
     "ToolContainer": [
-      "doc/users/prev_whats_new/whats_new_1.5.rst:615",
       "lib/matplotlib/backend_bases.py:docstring of matplotlib.backend_bases.ToolContainerBase.remove_toolitem:2",
       "lib/matplotlib/backend_bases.py:docstring of matplotlib.backend_bases.ToolContainerBase:20"
     ],
-    "ToolContainers": [
-      "doc/users/prev_whats_new/whats_new_1.5.rst:615"
-    ],
-    "Toolbars": [
-      "doc/users/prev_whats_new/whats_new_1.5.rst:615"
+    "_iter_collection": [
+      "lib/matplotlib/backend_bases.py:docstring of matplotlib.backend_bases.RendererBase.draw_path_collection:12",
+      "lib/matplotlib/backends/backend_pdf.py:docstring of matplotlib.backends.backend_pdf.RendererPdf.draw_path_collection:12",
+      "lib/matplotlib/backends/backend_ps.py:docstring of matplotlib.backends.backend_ps.RendererPS.draw_path_collection:12",
+      "lib/matplotlib/backends/backend_svg.py:docstring of matplotlib.backends.backend_svg.RendererSVG.draw_path_collection:12",
+      "lib/matplotlib/patheffects.py:docstring of matplotlib.patheffects.PathEffectRenderer.draw_path_collection:12"
     ],
-    "Tools": [
-      "doc/users/prev_whats_new/whats_new_1.5.rst:608"
+    "_iter_collection_raw_paths": [
+      "lib/matplotlib/backend_bases.py:docstring of matplotlib.backend_bases.RendererBase.draw_path_collection:12",
+      "lib/matplotlib/backends/backend_pdf.py:docstring of matplotlib.backends.backend_pdf.RendererPdf.draw_path_collection:12",
+      "lib/matplotlib/backends/backend_ps.py:docstring of matplotlib.backends.backend_ps.RendererPS.draw_path_collection:12",
+      "lib/matplotlib/backends/backend_svg.py:docstring of matplotlib.backends.backend_svg.RendererSVG.draw_path_collection:12",
+      "lib/matplotlib/patheffects.py:docstring of matplotlib.patheffects.PathEffectRenderer.draw_path_collection:12"
     ],
     "_read": [
       "lib/matplotlib/dviread.py:docstring of matplotlib.dviread.Vf:20"
@@ -750,11 +694,11 @@
       "doc/api/prev_api_changes/api_changes_1.3.x.rst:36"
     ],
     "axes.bbox": [
-      "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes._axes.Axes.legend:128",
-      "lib/matplotlib/figure.py:docstring of matplotlib.figure.FigureBase.legend:129",
+      "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes._axes.Axes.legend:140",
+      "lib/matplotlib/figure.py:docstring of matplotlib.figure.FigureBase.legend:141",
       "lib/matplotlib/legend.py:docstring of matplotlib.legend.Legend:88",
-      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.figlegend:129",
-      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.legend:128"
+      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.figlegend:141",
+      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.legend:140"
     ],
     "axes3d.Axes3D.xaxis": [
       "doc/api/prev_api_changes/api_changes_3.1.0.rst:939"
@@ -768,9 +712,6 @@
     "axis.Axis.get_ticks_position": [
       "doc/api/prev_api_changes/api_changes_3.1.0.rst:826"
     ],
-    "backend_bases.RendererBase": [
-      "lib/matplotlib/backends/backend_template.py:docstring of matplotlib.backends.backend_template.RendererTemplate:4"
-    ],
     "backend_bases.ToolContainerBase": [
       "lib/matplotlib/backend_tools.py:docstring of matplotlib.backend_tools.add_tools_to_container:8"
     ],
@@ -790,21 +731,18 @@
     "converter": [
       "lib/matplotlib/testing/compare.py:docstring of matplotlib.testing.compare.compare_images:4"
     ],
-    "fc-list": [
-      "lib/matplotlib/font_manager.py:docstring of matplotlib.font_manager.get_fontconfig_fonts:2"
-    ],
-    "figure.Figure.canvas.set_window_title()": [
-      "doc/users/prev_whats_new/whats_new_3.0.rst:84"
+    "draw_image": [
+      "lib/matplotlib/backends/backend_agg.py:docstring of matplotlib.backends.backend_agg.RendererAgg.option_scale_image:2"
     ],
     "figure.bbox": [
-      "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes._axes.Axes.legend:128",
-      "lib/matplotlib/figure.py:docstring of matplotlib.figure.FigureBase.legend:129",
+      "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes._axes.Axes.legend:140",
+      "lib/matplotlib/figure.py:docstring of matplotlib.figure.FigureBase.legend:141",
       "lib/matplotlib/legend.py:docstring of matplotlib.legend.Legend:88",
-      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.figlegend:129",
-      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.legend:128"
+      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.figlegend:141",
+      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.legend:140"
     ],
     "floating_axes.FloatingSubplot": [
-      "doc/gallery/axisartist/demo_floating_axes.rst:22"
+      "doc/gallery/axisartist/demo_floating_axes.rst:31"
     ],
     "fmt_xdata": [
       "lib/matplotlib/axes/_base.py:docstring of matplotlib.axes._base._AxesBase.format_xdata:4"
@@ -812,14 +750,7 @@
     "fmt_ydata": [
       "lib/matplotlib/axes/_base.py:docstring of matplotlib.axes._base._AxesBase.format_ydata:4"
     ],
-    "font.*": [
-      "doc/users/prev_whats_new/whats_new_1.3.rst:302"
-    ],
-    "gaussian_kde": [
-      "lib/matplotlib/mlab.py:docstring of matplotlib.mlab.GaussianKDE:32"
-    ],
     "get_size": [
-      "doc/users/prev_whats_new/whats_new_1.4.rst:223",
       "lib/mpl_toolkits/axes_grid1/axes_size.py:docstring of mpl_toolkits.axes_grid1.axes_size:1"
     ],
     "get_xbound": [
@@ -828,14 +759,12 @@
     "get_ybound": [
       "lib/mpl_toolkits/mplot3d/axes3d.py:docstring of mpl_toolkits.mplot3d.axes3d.Axes3D.get_ylim3d:22"
     ],
-    "h_pad": [
-      "lib/matplotlib/figure.py:docstring of matplotlib.figure.Figure.set_constrained_layout:5"
-    ],
     "image": [
-      "lib/matplotlib/sphinxext/plot_directive.py:docstring of matplotlib.sphinxext.plot_directive:78"
+      "lib/matplotlib/sphinxext/plot_directive.py:docstring of matplotlib.sphinxext.plot_directive:79"
     ],
     "interactive": [
-      "lib/matplotlib/backends/backend_nbagg.py:docstring of matplotlib.backends.backend_nbagg._BackendNbAgg.show:4"
+      "lib/matplotlib/backends/backend_nbagg.py:docstring of matplotlib.backends.backend_nbagg._BackendNbAgg.show:4",
+      "lib/matplotlib/backends/backend_webagg.py:docstring of matplotlib.backends.backend_webagg._BackendWebAgg.show:4"
     ],
     "invert_xaxis": [
       "lib/mpl_toolkits/mplot3d/axes3d.py:docstring of mpl_toolkits.mplot3d.axes3d.Axes3D.get_xlim3d:24"
@@ -844,7 +773,7 @@
       "lib/mpl_toolkits/mplot3d/axes3d.py:docstring of mpl_toolkits.mplot3d.axes3d.Axes3D.get_ylim3d:24"
     ],
     "ipykernel.pylab.backend_inline": [
-      "doc/users/interactive.rst:257"
+      "doc/users/explain/interactive.rst:261"
     ],
     "kde.covariance_factor": [
       "lib/matplotlib/mlab.py:docstring of matplotlib.mlab.GaussianKDE:41"
@@ -855,111 +784,16 @@
       "lib/matplotlib/mlab.py:docstring of matplotlib.mlab.GaussianKDE:45",
       "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.violinplot:46"
     ],
-    "labelcolor": [
-      "doc/users/prev_whats_new/whats_new_2.0.0.rst:120",
-      "doc/users/prev_whats_new/whats_new_2.0.0.rst:123"
-    ],
-    "legend.Legend.set_draggable()": [
-      "doc/api/prev_api_changes/api_changes_3.1.0.rst:499"
-    ],
-    "levels": [
-      "doc/api/prev_api_changes/api_changes_3.0.0.rst:197"
-    ],
     "load_char": [
-      "doc/gallery/misc/ftface_props.rst:16"
+      "doc/gallery/misc/ftface_props.rst:25"
     ],
     "mainloop": [
-      "lib/matplotlib/backends/backend_nbagg.py:docstring of matplotlib.backends.backend_nbagg._BackendNbAgg.show:4"
+      "lib/matplotlib/backends/backend_nbagg.py:docstring of matplotlib.backends.backend_nbagg._BackendNbAgg.show:4",
+      "lib/matplotlib/backends/backend_webagg.py:docstring of matplotlib.backends.backend_webagg._BackendWebAgg.show:4"
     ],
     "make_image": [
       "lib/matplotlib/image.py:docstring of matplotlib.image.composite_images:9"
     ],
-    "markevery": [
-      "doc/users/prev_whats_new/whats_new_1.4.rst:212",
-      "doc/users/prev_whats_new/whats_new_1.4.rst:214",
-      "doc/users/prev_whats_new/whats_new_3.0.rst:110"
-    ],
-    "matplotlib.animation.AVConvBase.output_args": [
-      "lib/matplotlib/animation.py:docstring of matplotlib.animation.MovieWriter.isAvailable:1:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvFileWriter.args_key": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvFileWriter.rst:39:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvFileWriter.bin_path": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvFileWriter.rst:28:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvFileWriter.cleanup": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvFileWriter.rst:28:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvFileWriter.clear_temp": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvFileWriter.rst:39:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvFileWriter.exec_key": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvFileWriter.rst:39:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvFileWriter.finish": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvFileWriter.rst:28:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvFileWriter.frame_format": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvFileWriter.rst:39:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvFileWriter.frame_size": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvFileWriter.rst:39:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvFileWriter.grab_frame": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvFileWriter.rst:28:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvFileWriter.isAvailable": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvFileWriter.rst:28:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvFileWriter.output_args": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvFileWriter.rst:39:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvFileWriter.saving": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvFileWriter.rst:28:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvFileWriter.setup": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvFileWriter.rst:28:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvFileWriter.supported_formats": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvFileWriter.rst:39:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvWriter.args_key": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvWriter.rst:37:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvWriter.bin_path": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvWriter.rst:28:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvWriter.cleanup": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvWriter.rst:28:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvWriter.exec_key": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvWriter.rst:37:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvWriter.finish": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvWriter.rst:28:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvWriter.frame_size": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvWriter.rst:37:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvWriter.grab_frame": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvWriter.rst:28:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvWriter.isAvailable": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvWriter.rst:28:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvWriter.output_args": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvWriter.rst:37:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvWriter.saving": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvWriter.rst:28:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvWriter.setup": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvWriter.rst:28:<autosummary>:1"
-    ],
-    "matplotlib.animation.AVConvWriter.supported_formats": [
-      "doc/api/_as_gen/matplotlib.animation.AVConvWriter.rst:37:<autosummary>:1"
-    ],
     "matplotlib.animation.ArtistAnimation.new_frame_seq": [
       "doc/api/_as_gen/matplotlib.animation.ArtistAnimation.rst:23:<autosummary>:1"
     ],
@@ -981,21 +815,12 @@
     "matplotlib.animation.ArtistAnimation.to_jshtml": [
       "doc/api/_as_gen/matplotlib.animation.ArtistAnimation.rst:23:<autosummary>:1"
     ],
-    "matplotlib.animation.FFMpegFileWriter.args_key": [
-      "lib/matplotlib/animation.py:docstring of matplotlib.animation.FFMpegFileWriter.supported_formats:1:<autosummary>:1"
-    ],
     "matplotlib.animation.FFMpegFileWriter.bin_path": [
       "doc/api/_as_gen/matplotlib.animation.FFMpegFileWriter.rst:28:<autosummary>:1"
     ],
     "matplotlib.animation.FFMpegFileWriter.cleanup": [
       "doc/api/_as_gen/matplotlib.animation.FFMpegFileWriter.rst:28:<autosummary>:1"
     ],
-    "matplotlib.animation.FFMpegFileWriter.clear_temp": [
-      "lib/matplotlib/animation.py:docstring of matplotlib.animation.FFMpegFileWriter.supported_formats:1:<autosummary>:1"
-    ],
-    "matplotlib.animation.FFMpegFileWriter.exec_key": [
-      "lib/matplotlib/animation.py:docstring of matplotlib.animation.FFMpegFileWriter.supported_formats:1:<autosummary>:1"
-    ],
     "matplotlib.animation.FFMpegFileWriter.finish": [
       "doc/api/_as_gen/matplotlib.animation.FFMpegFileWriter.rst:28:<autosummary>:1"
     ],
@@ -1020,23 +845,17 @@
     "matplotlib.animation.FFMpegFileWriter.setup": [
       "doc/api/_as_gen/matplotlib.animation.FFMpegFileWriter.rst:28:<autosummary>:1"
     ],
-    "matplotlib.animation.FFMpegWriter.args_key": [
-      "doc/api/_as_gen/matplotlib.animation.FFMpegWriter.rst:37:<autosummary>:1"
-    ],
     "matplotlib.animation.FFMpegWriter.bin_path": [
       "doc/api/_as_gen/matplotlib.animation.FFMpegWriter.rst:28:<autosummary>:1"
     ],
     "matplotlib.animation.FFMpegWriter.cleanup": [
       "doc/api/_as_gen/matplotlib.animation.FFMpegWriter.rst:28:<autosummary>:1"
     ],
-    "matplotlib.animation.FFMpegWriter.exec_key": [
-      "doc/api/_as_gen/matplotlib.animation.FFMpegWriter.rst:37:<autosummary>:1"
-    ],
     "matplotlib.animation.FFMpegWriter.finish": [
       "doc/api/_as_gen/matplotlib.animation.FFMpegWriter.rst:28:<autosummary>:1"
     ],
     "matplotlib.animation.FFMpegWriter.frame_size": [
-      "doc/api/_as_gen/matplotlib.animation.FFMpegWriter.rst:37:<autosummary>:1"
+      "doc/api/_as_gen/matplotlib.animation.FFMpegWriter.rst:35:<autosummary>:1"
     ],
     "matplotlib.animation.FFMpegWriter.grab_frame": [
       "doc/api/_as_gen/matplotlib.animation.FFMpegWriter.rst:28:<autosummary>:1"
@@ -1045,7 +864,7 @@
       "doc/api/_as_gen/matplotlib.animation.FFMpegWriter.rst:28:<autosummary>:1"
     ],
     "matplotlib.animation.FFMpegWriter.output_args": [
-      "doc/api/_as_gen/matplotlib.animation.FFMpegWriter.rst:37:<autosummary>:1"
+      "doc/api/_as_gen/matplotlib.animation.FFMpegWriter.rst:35:<autosummary>:1"
     ],
     "matplotlib.animation.FFMpegWriter.saving": [
       "doc/api/_as_gen/matplotlib.animation.FFMpegWriter.rst:28:<autosummary>:1"
@@ -1054,10 +873,7 @@
       "doc/api/_as_gen/matplotlib.animation.FFMpegWriter.rst:28:<autosummary>:1"
     ],
     "matplotlib.animation.FFMpegWriter.supported_formats": [
-      "doc/api/_as_gen/matplotlib.animation.FFMpegWriter.rst:37:<autosummary>:1"
-    ],
-    "matplotlib.animation.FileMovieWriter.args_key": [
-      "lib/matplotlib/animation.py:docstring of matplotlib.animation.FileMovieWriter.clear_temp:1:<autosummary>:1"
+      "doc/api/_as_gen/matplotlib.animation.FFMpegWriter.rst:35:<autosummary>:1"
     ],
     "matplotlib.animation.FileMovieWriter.bin_path": [
       "doc/api/_as_gen/matplotlib.animation.FileMovieWriter.rst:28:<autosummary>:1"
@@ -1065,11 +881,8 @@
     "matplotlib.animation.FileMovieWriter.cleanup": [
       "doc/api/_as_gen/matplotlib.animation.FileMovieWriter.rst:28:<autosummary>:1"
     ],
-    "matplotlib.animation.FileMovieWriter.exec_key": [
-      "lib/matplotlib/animation.py:docstring of matplotlib.animation.FileMovieWriter.clear_temp:1:<autosummary>:1"
-    ],
     "matplotlib.animation.FileMovieWriter.frame_size": [
-      "lib/matplotlib/animation.py:docstring of matplotlib.animation.FileMovieWriter.clear_temp:1:<autosummary>:1"
+      "lib/matplotlib/animation.py:docstring of matplotlib.animation.FileMovieWriter.finish:1:<autosummary>:1"
     ],
     "matplotlib.animation.FileMovieWriter.isAvailable": [
       "doc/api/_as_gen/matplotlib.animation.FileMovieWriter.rst:28:<autosummary>:1"
@@ -1078,7 +891,7 @@
       "doc/api/_as_gen/matplotlib.animation.FileMovieWriter.rst:28:<autosummary>:1"
     ],
     "matplotlib.animation.FileMovieWriter.supported_formats": [
-      "lib/matplotlib/animation.py:docstring of matplotlib.animation.FileMovieWriter.clear_temp:1:<autosummary>:1"
+      "lib/matplotlib/animation.py:docstring of matplotlib.animation.FileMovieWriter.finish:1:<autosummary>:1"
     ],
     "matplotlib.animation.FuncAnimation.pause": [
       "lib/matplotlib/animation.py:docstring of matplotlib.animation.FuncAnimation.new_frame_seq:1:<autosummary>:1"
@@ -1101,39 +914,24 @@
     "matplotlib.animation.HTMLWriter.cleanup": [
       "doc/api/_as_gen/matplotlib.animation.HTMLWriter.rst:28:<autosummary>:1"
     ],
-    "matplotlib.animation.HTMLWriter.clear_temp": [
-      "lib/matplotlib/animation.py:docstring of matplotlib.animation.HTMLWriter.args_key:1:<autosummary>:1"
-    ],
-    "matplotlib.animation.HTMLWriter.exec_key": [
-      "lib/matplotlib/animation.py:docstring of matplotlib.animation.HTMLWriter.args_key:1:<autosummary>:1"
-    ],
     "matplotlib.animation.HTMLWriter.frame_format": [
-      "lib/matplotlib/animation.py:docstring of matplotlib.animation.HTMLWriter.args_key:1:<autosummary>:1"
+      "lib/matplotlib/animation.py:docstring of matplotlib.animation.HTMLWriter.finish:1:<autosummary>:1"
     ],
     "matplotlib.animation.HTMLWriter.frame_size": [
-      "lib/matplotlib/animation.py:docstring of matplotlib.animation.HTMLWriter.args_key:1:<autosummary>:1"
+      "lib/matplotlib/animation.py:docstring of matplotlib.animation.HTMLWriter.finish:1:<autosummary>:1"
     ],
     "matplotlib.animation.HTMLWriter.saving": [
       "doc/api/_as_gen/matplotlib.animation.HTMLWriter.rst:28:<autosummary>:1"
     ],
-    "matplotlib.animation.ImageMagickFileWriter.args_key": [
-      "lib/matplotlib/animation.py:docstring of matplotlib.animation.ImageMagickFileWriter.supported_formats:1:<autosummary>:1"
-    ],
     "matplotlib.animation.ImageMagickFileWriter.bin_path": [
       "doc/api/_as_gen/matplotlib.animation.ImageMagickFileWriter.rst:28:<autosummary>:1"
     ],
     "matplotlib.animation.ImageMagickFileWriter.cleanup": [
       "doc/api/_as_gen/matplotlib.animation.ImageMagickFileWriter.rst:28:<autosummary>:1"
     ],
-    "matplotlib.animation.ImageMagickFileWriter.clear_temp": [
-      "lib/matplotlib/animation.py:docstring of matplotlib.animation.ImageMagickFileWriter.supported_formats:1:<autosummary>:1"
-    ],
     "matplotlib.animation.ImageMagickFileWriter.delay": [
       "lib/matplotlib/animation.py:docstring of matplotlib.animation.ImageMagickFileWriter.supported_formats:1:<autosummary>:1"
     ],
-    "matplotlib.animation.ImageMagickFileWriter.exec_key": [
-      "lib/matplotlib/animation.py:docstring of matplotlib.animation.ImageMagickFileWriter.supported_formats:1:<autosummary>:1"
-    ],
     "matplotlib.animation.ImageMagickFileWriter.finish": [
       "doc/api/_as_gen/matplotlib.animation.ImageMagickFileWriter.rst:28:<autosummary>:1"
     ],
@@ -1158,9 +956,6 @@
     "matplotlib.animation.ImageMagickFileWriter.setup": [
       "doc/api/_as_gen/matplotlib.animation.ImageMagickFileWriter.rst:28:<autosummary>:1"
     ],
-    "matplotlib.animation.ImageMagickWriter.args_key": [
-      "doc/api/_as_gen/matplotlib.animation.ImageMagickWriter.rst:38:<autosummary>:1"
-    ],
     "matplotlib.animation.ImageMagickWriter.bin_path": [
       "doc/api/_as_gen/matplotlib.animation.ImageMagickWriter.rst:28:<autosummary>:1"
     ],
@@ -1168,16 +963,13 @@
       "doc/api/_as_gen/matplotlib.animation.ImageMagickWriter.rst:28:<autosummary>:1"
     ],
     "matplotlib.animation.ImageMagickWriter.delay": [
-      "doc/api/_as_gen/matplotlib.animation.ImageMagickWriter.rst:38:<autosummary>:1"
-    ],
-    "matplotlib.animation.ImageMagickWriter.exec_key": [
-      "doc/api/_as_gen/matplotlib.animation.ImageMagickWriter.rst:38:<autosummary>:1"
+      "doc/api/_as_gen/matplotlib.animation.ImageMagickWriter.rst:36:<autosummary>:1"
     ],
     "matplotlib.animation.ImageMagickWriter.finish": [
       "doc/api/_as_gen/matplotlib.animation.ImageMagickWriter.rst:28:<autosummary>:1"
     ],
     "matplotlib.animation.ImageMagickWriter.frame_size": [
-      "doc/api/_as_gen/matplotlib.animation.ImageMagickWriter.rst:38:<autosummary>:1"
+      "doc/api/_as_gen/matplotlib.animation.ImageMagickWriter.rst:36:<autosummary>:1"
     ],
     "matplotlib.animation.ImageMagickWriter.grab_frame": [
       "doc/api/_as_gen/matplotlib.animation.ImageMagickWriter.rst:28:<autosummary>:1"
@@ -1186,7 +978,7 @@
       "doc/api/_as_gen/matplotlib.animation.ImageMagickWriter.rst:28:<autosummary>:1"
     ],
     "matplotlib.animation.ImageMagickWriter.output_args": [
-      "doc/api/_as_gen/matplotlib.animation.ImageMagickWriter.rst:38:<autosummary>:1"
+      "doc/api/_as_gen/matplotlib.animation.ImageMagickWriter.rst:36:<autosummary>:1"
     ],
     "matplotlib.animation.ImageMagickWriter.saving": [
       "doc/api/_as_gen/matplotlib.animation.ImageMagickWriter.rst:28:<autosummary>:1"
@@ -1195,10 +987,10 @@
       "doc/api/_as_gen/matplotlib.animation.ImageMagickWriter.rst:28:<autosummary>:1"
     ],
     "matplotlib.animation.ImageMagickWriter.supported_formats": [
-      "doc/api/_as_gen/matplotlib.animation.ImageMagickWriter.rst:38:<autosummary>:1"
+      "doc/api/_as_gen/matplotlib.animation.ImageMagickWriter.rst:36:<autosummary>:1"
     ],
     "matplotlib.animation.MovieWriter.frame_size": [
-      "lib/matplotlib/animation.py:docstring of matplotlib.animation.MovieWriter.args_key:1:<autosummary>:1"
+      "lib/matplotlib/animation.py:docstring of matplotlib.animation.MovieWriter.bin_path:1:<autosummary>:1"
     ],
     "matplotlib.animation.MovieWriter.saving": [
       "doc/api/_as_gen/matplotlib.animation.MovieWriter.rst:28:<autosummary>:1"
@@ -1240,10 +1032,8 @@
       "doc/api/prev_api_changes/api_changes_3.1.0.rst:290"
     ],
     "matplotlib.dates.rrulewrapper": [
-      "lib/matplotlib/dates.py:docstring of matplotlib.dates:121"
-    ],
-    "matplotlib.sphinxext.mathmpl": [
-      "doc/users/prev_whats_new/whats_new_3.0.rst:224"
+      "doc/gallery/ticks/date_formatters_locators.rst:136",
+      "lib/matplotlib/dates.py:docstring of matplotlib.dates:143"
     ],
     "matplotlib.style.core.STYLE_BLACKLIST": [
       "doc/api/prev_api_changes/api_changes_3.0.0.rst:298",
@@ -1256,11 +1046,17 @@
       "doc/api/prev_api_changes/api_changes_3.1.0.rst:947"
     ],
     "mpl_toolkits.axislines.Axes": [
-      "lib/mpl_toolkits/axisartist/axis_artist.py:docstring of mpl_toolkits.axisartist.axis_artist:26"
+      "lib/mpl_toolkits/axisartist/axis_artist.py:docstring of mpl_toolkits.axisartist.axis_artist:7"
     ],
     "next_whats_new": [
       "doc/users/next_whats_new/README.rst:6"
     ],
+    "option_scale_image": [
+      "lib/matplotlib/backends/backend_cairo.py:docstring of matplotlib.backends.backend_cairo.RendererCairo.draw_image:22",
+      "lib/matplotlib/backends/backend_pdf.py:docstring of matplotlib.backends.backend_pdf.RendererPdf.draw_image:22",
+      "lib/matplotlib/backends/backend_ps.py:docstring of matplotlib.backends.backend_ps.RendererPS.draw_image:22",
+      "lib/matplotlib/backends/backend_template.py:docstring of matplotlib.backends.backend_template.RendererTemplate.draw_image:22"
+    ],
     "plot": [
       "lib/matplotlib/sphinxext/plot_directive.py:docstring of matplotlib.sphinxext.plot_directive:4"
     ],
@@ -1270,11 +1066,8 @@
     "print_xyz": [
       "lib/matplotlib/backends/backend_template.py:docstring of matplotlib.backends.backend_template:22"
     ],
-    "pyplot.set_loglevel": [
-      "doc/users/prev_whats_new/whats_new_3.1.0.rst:374"
-    ],
     "rrulewrapper": [
-      "lib/matplotlib/dates.py:docstring of matplotlib.dates:121"
+      "lib/matplotlib/dates.py:docstring of matplotlib.dates:143"
     ],
     "scipy.stats.norm.pdf": [
       "doc/api/prev_api_changes/api_changes_3.1.0.rst:569",
@@ -1286,9 +1079,6 @@
     "self.vertices": [
       "lib/matplotlib/path.py:docstring of matplotlib.path.Path.codes:2"
     ],
-    "set_size": [
-      "doc/users/prev_whats_new/whats_new_1.4.rst:223"
-    ],
     "set_xbound": [
       "lib/mpl_toolkits/mplot3d/axes3d.py:docstring of mpl_toolkits.mplot3d.axes3d.Axes3D.get_xlim3d:22"
     ],
@@ -1298,35 +1088,15 @@
     "streamplot.Grid": [
       "doc/api/prev_api_changes/api_changes_3.1.0.rst:479"
     ],
-    "style.available": [
-      "lib/matplotlib/style/__init__.py:docstring of matplotlib.style.core.context:12",
-      "lib/matplotlib/style/__init__.py:docstring of matplotlib.style.core.use:19"
-    ],
-    "to_html5_video": [
-      "doc/users/prev_whats_new/whats_new_1.5.rst:728"
-    ],
     "toggled": [
       "lib/matplotlib/backend_tools.py:docstring of matplotlib.backend_tools.AxisScaleBase.disable:4",
       "lib/matplotlib/backend_tools.py:docstring of matplotlib.backend_tools.AxisScaleBase.enable:4",
       "lib/matplotlib/backend_tools.py:docstring of matplotlib.backend_tools.AxisScaleBase.trigger:2",
-      "lib/matplotlib/backend_tools.py:docstring of matplotlib.backend_tools.ToolFullScreen.disable:4",
-      "lib/matplotlib/backend_tools.py:docstring of matplotlib.backend_tools.ToolFullScreen.enable:4",
       "lib/matplotlib/backend_tools.py:docstring of matplotlib.backend_tools.ZoomPanBase.trigger:2"
     ],
     "tool_removed_event": [
       "lib/matplotlib/backend_bases.py:docstring of matplotlib.backend_bases.ToolContainerBase.remove_toolitem:6"
     ],
-    "toolbar": [
-      "doc/users/prev_whats_new/whats_new_1.5.rst:615"
-    ],
-    "trigger": [
-      "doc/users/prev_whats_new/whats_new_1.5.rst:615",
-      "lib/matplotlib/backend_tools.py:docstring of matplotlib.backend_tools.ToolFullScreen.disable:4",
-      "lib/matplotlib/backend_tools.py:docstring of matplotlib.backend_tools.ToolFullScreen.enable:4"
-    ],
-    "w_pad": [
-      "lib/matplotlib/figure.py:docstring of matplotlib.figure.Figure.set_constrained_layout:5"
-    ],
     "whats_new.rst": [
       "doc/users/next_whats_new/README.rst:6"
     ],
@@ -1337,4 +1107,4 @@
       "lib/mpl_toolkits/mplot3d/axes3d.py:docstring of mpl_toolkits.mplot3d.axes3d.Axes3D.get_ylim3d:24"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/doc/resources/index.rst b/doc/resources/index.rst
deleted file mode 100644
index 3dd15348f091..000000000000
--- a/doc/resources/index.rst
+++ /dev/null
@@ -1,63 +0,0 @@
-.. _resources-index:
-
-*******************
- External Resources
-*******************
-
-
-=============================
- Books, Chapters and Articles
-=============================
-
-* `Mastering matplotlib
-  <https://www.packtpub.com/big-data-and-business-intelligence/mastering-matplotlib>`_
-  by Duncan M. McGreggor
-
-* `Interactive Applications Using Matplotlib
-  <https://www.packtpub.com/application-development/interactive-applications-using-matplotlib>`_
-  by Benjamin Root
-
-* `Matplotlib for Python Developers
-  <https://www.packtpub.com/application-development/matplotlib-python-developers>`_
-  by Sandro Tosi
-
-* `Matplotlib chapter <http://www.aosabook.org/en/matplotlib.html>`_
-  by John Hunter and Michael Droettboom in The Architecture of Open Source
-  Applications
-
-* `Ten Simple Rules for Better Figures
-  <https://journals.plos.org/ploscompbiol/article?id=10.1371/journal.pcbi.1003833>`_
-  by Nicolas P. Rougier, Michael Droettboom and Philip E. Bourne
-
-* `Learning Scientific Programming with Python chapter 7
-  <http://scipython.com/book/chapter-7-matplotlib/>`_
-  by Christian Hill
-
-=======
- Videos
-=======
-
-* `Plotting with matplotlib <https://www.youtube.com/watch?v=P7SVi0YTIuE>`_
-  by Mike Müller
-
-* `Introduction to NumPy and Matplotlib
-  <https://www.youtube.com/watch?v=3Fp1zn5ao2M&feature=plcp>`_ by Eric Jones
-
-* `Anatomy of Matplotlib
-  <https://conference.scipy.org/scipy2013/tutorial_detail.php?id=103>`_
-  by Benjamin Root
-
-* `Data Visualization Basics with Python (O'Reilly)
-  <http://shop.oreilly.com/product/0636920046592.do>`_
-  by Randal S. Olson
-
-==========
- Tutorials
-==========
-
-* `Matplotlib tutorial <http://www.labri.fr/perso/nrougier/teaching/matplotlib/>`_
-  by Nicolas P. Rougier
-
-* `Anatomy of Matplotlib - IPython Notebooks
-  <https://github.com/WeatherGod/AnatomyOfMatplotlib>`_
-  by Benjamin Root
diff --git a/doc/sphinxext/custom_roles.py b/doc/sphinxext/custom_roles.py
index 5faa42172a64..3dcecc3df733 100644
--- a/doc/sphinxext/custom_roles.py
+++ b/doc/sphinxext/custom_roles.py
@@ -1,30 +1,75 @@
+from urllib.parse import urlsplit, urlunsplit
+
 from docutils import nodes
-from os.path import sep
+
 from matplotlib import rcParamsDefault
 
 
-def rcparam_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
-    rendered = nodes.Text(f'rcParams["{text}"]')
+class QueryReference(nodes.Inline, nodes.TextElement):
+    """
+    Wraps a reference or pending reference to add a query string.
+
+    The query string is generated from the attributes added to this node.
+
+    Also equivalent to a `~docutils.nodes.literal` node.
+    """
+
+    def to_query_string(self):
+        """Generate query string from node attributes."""
+        return '&'.join(f'{name}={value}' for name, value in self.attlist())
+
+
+def visit_query_reference_node(self, node):
+    """
+    Resolve *node* into query strings on its ``reference`` children.
 
-    source = inliner.document.attributes['source'].replace(sep, '/')
-    rel_source = source.split('/doc/', 1)[1]
+    Then act as if this is a `~docutils.nodes.literal`.
+    """
+    query = node.to_query_string()
+    for refnode in node.findall(nodes.reference):
+        uri = urlsplit(refnode['refuri'])._replace(query=query)
+        refnode['refuri'] = urlunsplit(uri)
 
-    levels = rel_source.count('/')
-    refuri = ('../' * levels +
-              'tutorials/introductory/customizing.html' +
-              f"?highlight={text}#a-sample-matplotlibrc-file")
+    self.visit_literal(node)
 
-    ref = nodes.reference(rawtext, rendered, refuri=refuri)
-    node_list = [nodes.literal('', '', ref)]
-    if text in rcParamsDefault:
+
+def depart_query_reference_node(self, node):
+    """
+    Act as if this is a `~docutils.nodes.literal`.
+    """
+    self.depart_literal(node)
+
+
+def rcparam_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
+    # Generate a pending cross-reference so that Sphinx will ensure this link
+    # isn't broken at some point in the future.
+    title = f'rcParams["{text}"]'
+    target = 'matplotlibrc-sample'
+    ref_nodes, messages = inliner.interpreted(title, f'{title} <{target}>',
+                                              'ref', lineno)
+
+    qr = QueryReference(rawtext, highlight=text)
+    qr += ref_nodes
+    node_list = [qr]
+
+    # The default backend would be printed as "agg", but that's not correct (as
+    # the default is actually determined by fallback).
+    if text in rcParamsDefault and text != "backend":
         node_list.extend([
             nodes.Text(' (default: '),
             nodes.literal('', repr(rcParamsDefault[text])),
             nodes.Text(')'),
             ])
-    return node_list, []
+
+    return node_list, messages
 
 
 def setup(app):
     app.add_role("rc", rcparam_role)
+    app.add_node(
+        QueryReference,
+        html=(visit_query_reference_node, depart_query_reference_node),
+        latex=(visit_query_reference_node, depart_query_reference_node),
+        text=(visit_query_reference_node, depart_query_reference_node),
+    )
     return {"parallel_read_safe": True, "parallel_write_safe": True}
diff --git a/doc/sphinxext/gallery_order.py b/doc/sphinxext/gallery_order.py
index 1c1034ec5819..3632666d336e 100644
--- a/doc/sphinxext/gallery_order.py
+++ b/doc/sphinxext/gallery_order.py
@@ -23,7 +23,13 @@
                           '../examples/showcase',
                           '../tutorials/introductory',
                           '../tutorials/intermediate',
-                          '../tutorials/advanced']
+                          '../tutorials/advanced',
+                          '../plot_types/basic',
+                          '../plot_types/arrays',
+                          '../plot_types/stats',
+                          '../plot_types/unstructured',
+                          '../plot_types/3D',
+                          ]
 
 
 class MplExplicitOrder(ExplicitOrder):
@@ -45,9 +51,9 @@ def __call__(self, item):
 list_all = [
     #  **Tutorials**
     #  introductory
-    "usage", "pyplot", "sample_plots", "images", "lifecycle", "customizing",
+    "quick_start", "pyplot", "images", "lifecycle", "customizing",
     #  intermediate
-    "artists", "legend_guide", "color_cycle", "gridspec",
+    "artists", "legend_guide", "color_cycle",
     "constrainedlayout_guide", "tight_layout_guide",
     #  advanced
     #  text
@@ -60,6 +66,18 @@ def __call__(self, item):
     "color_demo",
     #  pies
     "pie_features", "pie_demo2",
+
+    # **Plot Types
+    # Basic
+    "plot", "scatter_plot", "bar", "stem", "step", "fill_between",
+    # Arrays
+    "imshow", "pcolormesh", "contour", "contourf",
+    "barbs", "quiver", "streamplot",
+    # Stats
+    "hist_plot", "boxplot_plot", "errorbar_plot", "violin",
+    "eventplot", "hist2d", "hexbin", "pie",
+    # Unstructured
+    "tricontour", "tricontourf", "tripcolor", "triplot",
     ]
 explicit_subsection_order = [item + ".py" for item in list_all]
 
diff --git a/doc/sphinxext/math_symbol_table.py b/doc/sphinxext/math_symbol_table.py
index 3041b15b36a8..6609f91bbd10 100644
--- a/doc/sphinxext/math_symbol_table.py
+++ b/doc/sphinxext/math_symbol_table.py
@@ -1,6 +1,6 @@
 from docutils.parsers.rst import Directive
 
-from matplotlib import mathtext
+from matplotlib import _mathtext, _mathtext_data
 
 
 symbols = [
@@ -103,9 +103,9 @@ def run(state_machine):
     def render_symbol(sym):
         if sym.startswith("\\"):
             sym = sym[1:]
-            if sym not in {*mathtext.Parser._overunder_functions,
-                           *mathtext.Parser._function_names}:
-                sym = chr(mathtext.tex2uni[sym])
+            if sym not in (_mathtext.Parser._overunder_functions |
+                           _mathtext.Parser._function_names):
+                sym = chr(_mathtext_data.tex2uni[sym])
         return f'\\{sym}' if sym in ('\\', '|') else sym
 
     lines = []
@@ -149,7 +149,6 @@ def setup(app):
 
 if __name__ == "__main__":
     # Do some verification of the tables
-    from matplotlib import _mathtext_data
 
     print("SYMBOLS NOT IN STIX:")
     all_symbols = {}
diff --git a/doc/sphinxext/missing_references.py b/doc/sphinxext/missing_references.py
index 6aa82a4dd17d..12d836f296f1 100644
--- a/doc/sphinxext/missing_references.py
+++ b/doc/sphinxext/missing_references.py
@@ -90,7 +90,7 @@ def get_location(node, app):
     Usually, this will be of the form "path/to/file:linenumber". Two
     special values can be emitted, "<external>" for paths which are
     not contained in this source tree (e.g. docstrings included from
-    other modules) or "<unknown>", inidcating that the sphinx application
+    other modules) or "<unknown>", indicating that the sphinx application
     cannot locate the original source file (usually because an extension
     has injected text into the sphinx parsing engine).
     """
diff --git a/doc/sphinxext/redirect_from.py b/doc/sphinxext/redirect_from.py
index ff38260569f5..09e3af4493de 100644
--- a/doc/sphinxext/redirect_from.py
+++ b/doc/sphinxext/redirect_from.py
@@ -3,7 +3,7 @@
 ====================================
 
 If an rst file is moved or its content subsumed in a different file, it
-is desireable to redirect the old file to the new or existing file. This
+is desirable to redirect the old file to the new or existing file. This
 extension enables this with a simple html refresh.
 
 For example suppose ``doc/topic/old-page.rst`` is removed and its content
@@ -15,8 +15,10 @@
 This creates in the build directory a file ``build/html/topic/old-page.html``
 that contains a relative refresh::
 
+    <!DOCTYPE html>
     <html>
       <head>
+        <meta charset="utf-8">
         <meta http-equiv="refresh" content="0; url=new-page.html">
       </head>
     </html>
@@ -32,13 +34,16 @@
 
 from pathlib import Path
 from docutils.parsers.rst import Directive
+from sphinx.domains import Domain
 from sphinx.util import logging
 
 logger = logging.getLogger(__name__)
 
 
-HTML_TEMPLATE = """<html>
+HTML_TEMPLATE = """<!DOCTYPE html>
+<html>
   <head>
+    <meta charset="utf-8">
     <meta http-equiv="refresh" content="0; url={v}">
   </head>
 </html>
@@ -48,25 +53,53 @@
 def setup(app):
     RedirectFrom.app = app
     app.add_directive("redirect-from", RedirectFrom)
+    app.add_domain(RedirectFromDomain)
     app.connect("build-finished", _generate_redirects)
 
+    metadata = {'parallel_read_safe': True}
+    return metadata
+
+
+class RedirectFromDomain(Domain):
+    """
+    The sole purpose of this domain is a parallel_read_safe data store for the
+    redirects mapping.
+    """
+    name = 'redirect_from'
+    label = 'redirect_from'
+
+    @property
+    def redirects(self):
+        """The mapping of the redirects."""
+        return self.data.setdefault('redirects', {})
+
+    def clear_doc(self, docnames):
+        self.redirects.clear()
+
+    def merge_domaindata(self, docnames, otherdata):
+        for src, dst in otherdata['redirects'].items():
+            if src not in self.redirects:
+                self.redirects[src] = dst
+            elif self.redirects[src] != dst:
+                raise ValueError(
+                    f"Inconsistent redirections from {src} to "
+                    F"{self.redirects[src]} and {otherdata.redirects[src]}")
+
 
 class RedirectFrom(Directive):
     required_arguments = 1
-    redirects = {}
 
     def run(self):
         redirected_doc, = self.arguments
         env = self.app.env
-        builder = self.app.builder
+        domain = env.get_domain('redirect_from')
         current_doc = env.path2doc(self.state.document.current_source)
         redirected_reldoc, _ = env.relfn2path(redirected_doc, current_doc)
-        if redirected_reldoc in self.redirects:
+        if redirected_reldoc in domain.redirects:
             raise ValueError(
                 f"{redirected_reldoc} is already noted as redirecting to "
-                f"{self.redirects[redirected_reldoc]}")
-        self.redirects[redirected_reldoc] = builder.get_relative_uri(
-            redirected_reldoc, current_doc)
+                f"{domain.redirects[redirected_reldoc]}")
+        domain.redirects[redirected_reldoc] = current_doc
         return []
 
 
@@ -74,9 +107,9 @@ def _generate_redirects(app, exception):
     builder = app.builder
     if builder.name != "html" or exception:
         return
-    for k, v in RedirectFrom.redirects.items():
+    for k, v in app.env.get_domain('redirect_from').redirects.items():
         p = Path(app.outdir, k + builder.out_suffix)
-        html = HTML_TEMPLATE.format(v=v)
+        html = HTML_TEMPLATE.format(v=builder.get_relative_uri(k, v))
         if p.is_file():
             if p.read_text() != html:
                 logger.warning(f'A redirect-from directive is trying to '
@@ -85,4 +118,4 @@ def _generate_redirects(app, exception):
         else:
             logger.info(f'making refresh html file: {k} redirect to {v}')
             p.parent.mkdir(parents=True, exist_ok=True)
-            p.write_text(html)
+            p.write_text(html, encoding='utf-8')
diff --git a/doc/thirdpartypackages/index.rst b/doc/thirdpartypackages/index.rst
index 6667e6c23dbc..81dc4d710a52 100644
--- a/doc/thirdpartypackages/index.rst
+++ b/doc/thirdpartypackages/index.rst
@@ -1,347 +1,5 @@
-.. _thirdparty-index:
+:orphan:
 
-********************
-Third party packages
-********************
+.. raw:: html
 
-Several external packages that extend or build on Matplotlib functionality are
-listed below.  They are maintained and distributed separately from Matplotlib
-and thus need to be installed individually.
-
-Please submit an issue or pull request on GitHub if you have created
-a package that you would like to have included.  We are also happy to
-host third party packages within the `Matplotlib GitHub Organization
-<https://github.com/matplotlib>`_.
-
-Mapping toolkits
-****************
-
-Basemap
-=======
-`Basemap <https://matplotlib.org/basemap/>`_ plots data on map projections,
-with continental and political boundaries.
-
-.. image:: /_static/basemap_contour1.png
-    :height: 400px
-
-Cartopy
-=======
-`Cartopy <https://scitools.org.uk/cartopy/docs/latest/>`_ builds on top
-of Matplotlib to provide object oriented map projection definitions
-and close integration with Shapely for powerful yet easy-to-use vector
-data processing tools. An example plot from the `Cartopy gallery
-<https://scitools.org.uk/cartopy/docs/latest/gallery/index.html>`_:
-
-.. image:: /_static/cartopy_hurricane_katrina_01_00.png
-    :height: 400px
-
-Geoplot
-=======
-`Geoplot <https://residentmario.github.io/geoplot/index.html>`_ builds on top
-of Matplotlib and Cartopy to provide a "standard library" of simple, powerful,
-and customizable plot types. An example plot from the `Geoplot gallery
-<https://residentmario.github.io/geoplot/index.html>`_:
-
-.. image:: /_static/geoplot_nyc_traffic_tickets.png
-    :height: 400px
-
-Ridge Map
-=========
-`ridge_map <https://github.com/ColCarroll/ridge_map>`_ uses Matplotlib,
-SRTM.py, NumPy, and scikit-image to make ridge plots of your favorite
-ridges.
-
-.. image:: /_static/ridge_map_white_mountains.png
-    :height: 364px
-
-Declarative libraries
-*********************
-
-ggplot
-======
-`ggplot <https://github.com/yhat/ggplot>`_ is a port of the R ggplot2 package
-to python based on Matplotlib.
-
-.. image:: /_static/ggplot.png
-    :height: 195px
-
-holoviews
-=========
-`holoviews <http://holoviews.org>`_ makes it easier to visualize data
-interactively, especially in a `Jupyter notebook <https://jupyter.org>`_, by
-providing a set of declarative plotting objects that store your data and
-associated metadata.  Your data is then immediately visualizable alongside or
-overlaid with other data, either statically or with automatically provided
-widgets for parameter exploration.
-
-.. image:: /_static/holoviews.png
-    :height: 354px
-
-plotnine
-========
-
-`plotnine <https://plotnine.readthedocs.io/en/stable/>`_ implements a grammar
-of graphics, similar to R's `ggplot2 <https://ggplot2.tidyverse.org/>`_.
-The grammar allows users to compose plots by explicitly mapping data to the
-visual objects that make up the plot.
-
-.. image:: /_static/plotnine.png
-
-Specialty plots
-***************
-
-Broken Axes
-===========
-`brokenaxes <https://github.com/bendichter/brokenaxes>`_ supplies an axes
-class that can have a visual break to indicate a discontinuous range.
-
-.. image:: /_static/brokenaxes.png
-
-DeCiDa
-======
-
-`DeCiDa <https://pypi.org/project/DeCiDa/>`_ is a library of functions
-and classes for electron device characterization, electronic circuit design and
-general data visualization and analysis.
-
-matplotlib-scalebar
-===================
-
-`matplotlib-scalebar <https://github.com/ppinard/matplotlib-scalebar>`_ provides a new artist to display a scale bar, aka micron bar.
-It is particularly useful when displaying calibrated images plotted using ``plt.imshow(...)``.
-
-.. image:: /_static/gold_on_carbon.jpg
-
-Matplotlib-Venn
-===============
-`Matplotlib-Venn <https://github.com/konstantint/matplotlib-venn>`_ provides a
-set of functions for plotting 2- and 3-set area-weighted (or unweighted) Venn
-diagrams.
-
-mpl-probscale
-=============
-`mpl-probscale <https://matplotlib.org/mpl-probscale/>`_ is a small extension
-that allows Matplotlib users to specify probability scales. Simply importing the
-``probscale`` module registers the scale with Matplotlib, making it accessible
-via e.g., ``ax.set_xscale('prob')`` or ``plt.yscale('prob')``.
-
-.. image:: /_static/probscale_demo.png
-
-mpl-scatter-density
-===================
-
-`mpl-scatter-density <https://github.com/astrofrog/mpl-scatter-density>`_ is a
-small package that makes it easy to make scatter plots of large numbers
-of points using a density map. The following example contains around 13 million
-points and the plotting (excluding reading in the data) took less than a
-second on an average laptop:
-
-.. image:: /_static/mpl-scatter-density.png
-    :height: 400px
-
-When used in interactive mode, the density map is downsampled on-the-fly while
-panning/zooming in order to provide a smooth interactive experience.
-
-mplstereonet
-============
-`mplstereonet <https://github.com/joferkington/mplstereonet>`_ provides
-stereonets for plotting and analyzing orientation data in Matplotlib.
-
-Natgrid
-=======
-`mpl_toolkits.natgrid <https://github.com/matplotlib/natgrid>`_ is an interface
-to the natgrid C library for gridding irregularly spaced data.
-
-pyUpSet
-=======
-`pyUpSet <https://github.com/ImSoErgodic/py-upset>`_ is a
-static Python implementation of the `UpSet suite by Lex et al.
-<http://www.caleydo.org/tools/upset/>`_ to explore complex intersections of
-sets and data frames.
-
-seaborn
-=======
-`seaborn <http://seaborn.pydata.org/>`_ is a high level interface for drawing
-statistical graphics with Matplotlib. It aims to make visualization a central
-part of exploring and understanding complex datasets.
-
-.. image:: /_static/seaborn.png
-    :height: 157px
-
-WCSAxes
-=======
-
-The `Astropy <http://www.astropy.org>`_ core package includes a submodule
-called WCSAxes (available at `astropy.visualization.wcsaxes
-<http://docs.astropy.org/en/stable/visualization/wcsaxes/index.html>`_) which
-adds Matplotlib projections for Astronomical image data. The following is an
-example of a plot made with WCSAxes which includes the original coordinate
-system of the image and an overlay of a different coordinate system:
-
-.. image:: /_static/wcsaxes.jpg
-    :height: 400px
-
-Windrose
-========
-`Windrose <https://github.com/scls19fr/windrose>`_ is a Python Matplotlib,
-Numpy library to manage wind data, draw windroses (also known as polar rose
-plots), draw probability density functions and fit Weibull distributions.
-
-Yellowbrick
-===========
-`Yellowbrick <https://www.scikit-yb.org/>`_ is a suite of visual diagnostic tools for machine learning that enables human steering of the model selection process. Yellowbrick combines scikit-learn with matplotlib using an estimator-based API called the ``Visualizer``, which wraps both sklearn models and matplotlib Axes. ``Visualizer`` objects fit neatly into the machine learning workflow allowing data scientists to integrate visual diagnostic and model interpretation tools into experimentation without extra steps.
-
-.. image:: /_static/yellowbrick.png
-    :height: 400px
-
-Animations
-**********
-
-animatplot
-==========
-`animatplot <https://animatplot.readthedocs.io/>`_ is a library for
-producing interactive animated plots with the goal of making production of
-animated plots almost as easy as static ones.
-
-.. image:: /_static/animatplot.png
-
-For an animated version of the above picture and more examples, see the
-`animatplot gallery. <https://animatplot.readthedocs.io/en/stable/gallery.html>`_
-
-gif
-===
-`gif <https://github.com/maxhumber/gif/>`_ is an ultra lightweight animated gif API.
-
-.. image:: /_static/gif_attachment_example.png
-
-numpngw
-=======
-
-`numpngw <https://pypi.org/project/numpngw/>`_  provides functions for writing
-NumPy arrays to PNG and animated PNG files.  It also includes the class
-``AnimatedPNGWriter`` that can be used to save a Matplotlib animation as an
-animated PNG file.  See the example on the PyPI page or at the ``numpngw``
-`github repository <https://github.com/WarrenWeckesser/numpngw>`_.
-
-.. image:: /_static/numpngw_animated_example.png
-
-Interactivity
-*************
-
-mplcursors
-==========
-`mplcursors <https://mplcursors.readthedocs.io>`_ provides interactive data
-cursors for Matplotlib.
-
-MplDataCursor
-=============
-`MplDataCursor <https://github.com/joferkington/mpldatacursor>`_ is a toolkit
-written by Joe Kington to provide interactive "data cursors" (clickable
-annotation boxes) for Matplotlib.
-
-mpl_interactions
-================
-`mpl_interactions <https://mpl-interactions.readthedocs.io/en/latest/>`_
-makes it easy to create interactive plots controlled by sliders and other
-widgets. It also provides several handy capabilities such as manual
-image segmentation, comparing cross-sections of arrays, and using the
-scroll wheel to zoom.
-
-.. image:: /_static/mpl-interactions-slider-animated.png
-
-Rendering backends
-******************
-
-mplcairo
-========
-`mplcairo <https://github.com/anntzer/mplcairo>`_ is a cairo backend for
-Matplotlib, with faster and more accurate marker drawing, support for a wider
-selection of font formats and complex text layout, and various other features.
-
-gr
-==
-`gr <http://gr-framework.org/>`_ is a framework for cross-platform
-visualisation applications, which can be used as a high-performance Matplotlib
-backend.
-
-GUI integration
-***************
-
-wxmplot
-=======
-`WXMPlot <https://pypi.org/project/wxmplot/>`_ provides advanced wxPython
-widgets for plotting and image display of numerical data based on Matplotlib.
-
-Miscellaneous
-*************
-
-adjustText
-==========
-`adjustText <https://github.com/Phlya/adjustText>`_ is a small library for
-automatically adjusting text position in Matplotlib plots to minimize overlaps
-between them, specified points and other objects.
-
-.. image:: /_static/adjustText.png
-
-iTerm2 terminal backend
-=======================
-`matplotlib_iterm2 <https://github.com/oselivanov/matplotlib_iterm2>`_ is an
-external Matplotlib backend using the iTerm2 nightly build inline image display
-feature.
-
-.. image:: /_static/matplotlib_iterm2_demo.png
-
-mpl-template
-============
-`mpl-template <https://austinorr.github.io/mpl-template/index.html>`_ provides
-a customizable way to add engineering figure elements such as a title block,
-border, and logo.
-
-.. image:: /_static/mpl_template_example.png
-    :height: 330px
-
-figpager
-========
-`figpager <https://pypi.org/project/figpager/>`_ provides customizable figure
-elements such as text, lines and images and subplot layout control for single
-or multi page output.
-
- .. image:: /_static/figpager.png
-
-blume
-=====
-
-`blume <https://pypi.org/project/blume/>`_ provides a replacement for
-the Matplotlib ``table`` module.  It fixes a number of issues with the
-existing table. See the `blume github repository
-<https://github.com/swfiua/blume>`_ for more details.
-
-.. image:: /_static/blume_table_example.png
-
-
-DNA Features Viewer
-===================
-
-`DNA Features Viewer <https://github.com/Edinburgh-Genome-Foundry/DnaFeaturesViewer>`_
-provides methods to plot annotated DNA sequence maps (possibly along other Matplotlib
-plots) for Bioinformatics and Synthetic Biology applications.
-
-.. image:: /_static/dna_features_viewer_screenshot.png
-
-GUI applications
-****************
-
-sviewgui
-========
-
-`sviewgui <https://pypi.org/project/sviewgui/>`_ is a PyQt-based GUI for
-visualisation of data from csv files or `pandas.DataFrame`\s. Main features:
-
-- Scatter, line, density, histogram, and box plot types
-- Settings for the marker size, line width, number of bins of histogram,
-  colormap (from cmocean)
-- Save figure as editable PDF
-- Code of the plotted graph is available so that it can be reused and modified
-  outside of sviewgui
-
-.. image:: /_static/sviewgui_sample.png
+  <meta http-equiv="refresh" content="0; url=https://matplotlib.org/mpl-third-party/">
diff --git a/doc/users/explain/api_interfaces.rst b/doc/users/explain/api_interfaces.rst
new file mode 100644
index 000000000000..9a4976c14ff0
--- /dev/null
+++ b/doc/users/explain/api_interfaces.rst
@@ -0,0 +1,288 @@
+.. _api_interfaces:
+
+========================================
+Matplotlib Application Interfaces (APIs)
+========================================
+
+Matplotlib has two major application interfaces, or styles of using the library:
+
+- An explicit "Axes" interface that uses methods on a Figure or Axes object to
+  create other Artists, and build a visualization step by step.  This has also
+  been called an "object-oriented" interface.
+- An implicit "pyplot" interface that keeps track of the last Figure and Axes
+  created, and adds Artists to the object it thinks the user wants.
+
+In addition, a number of downstream libraries (like `pandas` and xarray_) offer
+a ``plot`` method implemented directly on their data classes so that users can
+call ``data.plot()``.
+
+.. _xarray: https://xarray.pydata.org
+
+The difference between these interfaces can be a bit confusing, particularly
+given snippets on the web that use one or the other, or sometimes multiple
+interfaces in the same example.  Here we attempt to point out how the "pyplot"
+and downstream interfaces relate to the explicit "Axes" interface to help users
+better navigate the library.
+
+
+Native Matplotlib interfaces
+----------------------------
+
+The explicit "Axes" interface
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The "Axes" interface is how Matplotlib is implemented, and many customizations
+and fine-tuning end up being done at this level.
+
+This interface works by instantiating an instance of a
+`~.matplotlib.figure.Figure` class (``fig`` below), using a method
+`~.Figure.subplots` method (or similar) on that object to create one or more
+`~.matplotlib.axes.Axes` objects (``ax`` below), and then calling drawing
+methods on the Axes (``plot`` in this example):
+
+.. plot::
+   :include-source:
+   :align: center
+
+    import matplotlib.pyplot as plt
+
+    fig = plt.figure()
+    ax = fig.subplots()
+    ax.plot([1, 2, 3, 4], [0, 0.5, 1, 0.2])
+
+We call this an "explicit" interface because each object is explicitly
+referenced, and used to make the next object.  Keeping references to the objects
+is very flexible, and allows us to customize the objects after they are created,
+but before they are displayed.
+
+
+The implicit "pyplot" interface
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The `~.matplotlib.pyplot` module shadows most of the
+`~.matplotlib.axes.Axes` plotting methods to give the equivalent of
+the above, where the creation of the Figure and Axes is done for the user:
+
+.. plot::
+   :include-source:
+   :align: center
+
+    import matplotlib.pyplot as plt
+
+    plt.plot([1, 2, 3, 4], [0, 0.5, 1, 0.2])
+
+This can be convenient, particularly when doing interactive work or simple
+scripts.  A reference to the current Figure can be retrieved using
+`~.pyplot.gcf` and to the current Axes by `~.pyplot.gca`.  The `~.pyplot` module
+retains a list of Figures, and each Figure retains a list of Axes on the figure
+for the user so that the following:
+
+.. plot::
+    :include-source:
+    :align: center
+
+    import matplotlib.pyplot as plt
+
+    plt.subplot(1, 2, 1)
+    plt.plot([1, 2, 3], [0, 0.5, 0.2])
+
+    plt.subplot(1, 2, 2)
+    plt.plot([3, 2, 1], [0, 0.5, 0.2])
+
+is equivalent to:
+
+.. plot::
+    :include-source:
+    :align: center
+
+    import matplotlib.pyplot as plt
+
+    plt.subplot(1, 2, 1)
+    ax = plt.gca()
+    ax.plot([1, 2, 3], [0, 0.5, 0.2])
+
+    plt.subplot(1, 2, 2)
+    ax = plt.gca()
+    ax.plot([3, 2, 1], [0, 0.5, 0.2])
+
+In the explicit interface, this would be:
+
+.. plot::
+    :include-source:
+    :align: center
+
+    import matplotlib.pyplot as plt
+
+    fig, axs = plt.subplots(1, 2)
+    axs[0].plot([1, 2, 3], [0, 0.5, 0.2])
+    axs[1].plot([3, 2, 1], [0, 0.5, 0.2])
+
+Why be explicit?
+^^^^^^^^^^^^^^^^
+
+What happens if you have to backtrack, and operate on an old axes that is not
+referenced by ``plt.gca()``?  One simple way is to call ``subplot`` again with
+the same arguments.  However, that quickly becomes inelegant.  You can also
+inspect the Figure object and get its list of Axes objects, however, that can be
+misleading (colorbars are Axes too!). The best solution is probably to save a
+handle to every Axes you create, but if you do that, why not simply create the
+all the Axes objects at the start?
+
+The first approach is to call ``plt.subplot`` again:
+
+.. plot::
+    :include-source:
+    :align: center
+
+    import matplotlib.pyplot as plt
+
+    plt.subplot(1, 2, 1)
+    plt.plot([1, 2, 3], [0, 0.5, 0.2])
+
+    plt.subplot(1, 2, 2)
+    plt.plot([3, 2, 1], [0, 0.5, 0.2])
+
+    plt.suptitle('Implicit Interface: re-call subplot')
+
+    for i in range(1, 3):
+        plt.subplot(1, 2, i)
+        plt.xlabel('Boo')
+
+The second is to save a handle:
+
+.. plot::
+    :include-source:
+    :align: center
+
+    import matplotlib.pyplot as plt
+
+    axs = []
+    ax = plt.subplot(1, 2, 1)
+    axs += [ax]
+    plt.plot([1, 2, 3], [0, 0.5, 0.2])
+
+    ax = plt.subplot(1, 2, 2)
+    axs += [ax]
+    plt.plot([3, 2, 1], [0, 0.5, 0.2])
+
+    plt.suptitle('Implicit Interface: save handles')
+
+    for i in range(2):
+        plt.sca(axs[i])
+        plt.xlabel('Boo')
+
+However, the recommended way would be to be explicit from the outset:
+
+.. plot::
+    :include-source:
+    :align: center
+
+    import matplotlib.pyplot as plt
+
+    fig, axs = plt.subplots(1, 2)
+    axs[0].plot([1, 2, 3], [0, 0.5, 0.2])
+    axs[1].plot([3, 2, 1], [0, 0.5, 0.2])
+    fig.suptitle('Explicit Interface')
+    for i in range(2):
+        axs[i].set_xlabel('Boo')
+
+
+Third-party library "Data-object" interfaces
+--------------------------------------------
+
+Some third party libraries have chosen to implement plotting for their data
+objects, e.g. ``data.plot()``, is seen in `pandas`, xarray_, and other
+third-party libraries.  For illustrative purposes, a downstream library may
+implement a simple data container that has ``x`` and ``y`` data stored together,
+and then implements a ``plot`` method:
+
+.. plot::
+    :include-source:
+    :align: center
+
+    import matplotlib.pyplot as plt
+
+    # supplied by downstream library:
+    class DataContainer:
+
+        def __init__(self, x, y):
+            """
+            Proper docstring here!
+            """
+            self._x = x
+            self._y = y
+
+        def plot(self, ax=None, **kwargs):
+            if ax is None:
+                ax = plt.gca()
+            ax.plot(self._x, self._y, **kwargs)
+            ax.set_title('Plotted from DataClass!')
+            return ax
+
+
+    # what the user usually calls:
+    data = DataContainer([0, 1, 2, 3], [0, 0.2, 0.5, 0.3])
+    data.plot()
+
+So the library can hide all the nitty-gritty from the user, and can make a
+visualization appropriate to the data type, often with good labels, choices of
+colormaps, and other convenient features.
+
+In the above, however, we may not have liked the title the library provided.
+Thankfully, they pass us back the Axes from the ``plot()`` method, and
+understanding the explicit Axes interface, we could call:
+``ax.set_title('My preferred title')`` to customize the title.
+
+Many libraries also allow their ``plot`` methods to accept an optional *ax*
+argument. This allows us to place the visualization in an Axes that we have
+placed and perhaps customized.
+
+Summary
+-------
+
+Overall, it is useful to understand the explicit "Axes" interface since it is
+the most flexible and underlies the other interfaces.  A user can usually
+figure out how to drop down to the explicit interface and operate on the
+underlying objects.  While the explicit interface can be a bit more verbose
+to setup, complicated plots will often end up simpler than trying to use
+the implicit "pyplot" interface.
+
+.. note::
+
+    It is sometimes confusing to people that we import ``pyplot`` for both
+    interfaces.  Currently, the ``pyplot`` module implements the "pyplot"
+    interface, but it also provides top-level Figure and Axes creation
+    methods, and ultimately spins up the graphical user interface, if one
+    is being used.  So ``pyplot`` is still needed regardless of the
+    interface chosen.
+
+Similarly, the declarative interfaces provided by partner libraries use the
+objects accessible by the "Axes" interface, and often accept these as arguments
+or pass them back from methods.  It is usually essential to use the explicit
+"Axes" interface to perform any customization of the default visualization, or
+to unpack the data into NumPy arrays and pass directly to Matplotlib.
+
+Appendix: "Axes" interface with data structures
+-----------------------------------------------
+
+Most `~.axes.Axes` methods allow yet another API addressing by passing a
+*data* object to the method and specifying the arguments as strings:
+
+.. plot::
+    :include-source:
+    :align: center
+
+    import matplotlib.pyplot as plt
+
+    data = {'xdat': [0, 1, 2, 3], 'ydat': [0, 0.2, 0.4, 0.1]}
+    fig, ax = plt.subplots(figsize=(2, 2))
+    ax.plot('xdat', 'ydat', data=data)
+
+
+Appendix: "pylab" interface
+---------------------------
+
+There is one further interface that is highly discouraged, and that is to
+basically do ``from matplotlib.pyplot import *``.  This allows users to simply
+call ``plot(x, y)``.  While convenient, this can lead to obvious problems if the
+user unwittingly names a variable the same name as a pyplot method.
diff --git a/doc/users/explain/backends.rst b/doc/users/explain/backends.rst
new file mode 100644
index 000000000000..88c3a927fd57
--- /dev/null
+++ b/doc/users/explain/backends.rst
@@ -0,0 +1,254 @@
+.. _backends:
+
+========
+Backends
+========
+
+.. _what-is-a-backend:
+
+What is a backend?
+------------------
+
+A lot of documentation on the website and in the mailing lists refers
+to the "backend" and many new users are confused by this term.
+Matplotlib targets many different use cases and output formats.  Some
+people use Matplotlib interactively from the Python shell and have
+plotting windows pop up when they type commands.  Some people run
+`Jupyter <https://jupyter.org>`_ notebooks and draw inline plots for
+quick data analysis. Others embed Matplotlib into graphical user
+interfaces like PyQt or PyGObject to build rich applications.  Some
+people use Matplotlib in batch scripts to generate postscript images
+from numerical simulations, and still others run web application
+servers to dynamically serve up graphs.
+
+To support all of these use cases, Matplotlib can target different
+outputs, and each of these capabilities is called a backend; the
+"frontend" is the user facing code, i.e., the plotting code, whereas the
+"backend" does all the hard work behind-the-scenes to make the figure.
+There are two types of backends: user interface backends (for use in
+PyQt/PySide, PyGObject, Tkinter, wxPython, or macOS/Cocoa); also referred to
+as "interactive backends") and hardcopy backends to make image files
+(PNG, SVG, PDF, PS; also referred to as "non-interactive backends").
+
+Selecting a backend
+-------------------
+
+There are three ways to configure your backend:
+
+- The :rc:`backend` parameter in your :file:`matplotlibrc` file
+- The :envvar:`MPLBACKEND` environment variable
+- The function :func:`matplotlib.use`
+
+Below is a more detailed description.
+
+If there is more than one configuration present, the last one from the
+list takes precedence; e.g. calling :func:`matplotlib.use()` will override
+the setting in your :file:`matplotlibrc`.
+
+Without a backend explicitly set, Matplotlib automatically detects a usable
+backend based on what is available on your system and on whether a GUI event
+loop is already running.  The first usable backend in the following list is
+selected: MacOSX, QtAgg, GTK4Agg, Gtk3Agg, TkAgg, WxAgg, Agg.  The last, Agg,
+is a non-interactive backend that can only write to files.  It is used on
+Linux, if Matplotlib cannot connect to either an X display or a Wayland
+display.
+
+Here is a detailed description of the configuration methods:
+
+#. Setting :rc:`backend` in your :file:`matplotlibrc` file::
+
+       backend : qtagg   # use pyqt with antigrain (agg) rendering
+
+   See also :doc:`/tutorials/introductory/customizing`.
+
+#. Setting the :envvar:`MPLBACKEND` environment variable:
+
+   You can set the environment variable either for your current shell or for
+   a single script.
+
+   On Unix::
+
+        > export MPLBACKEND=qtagg
+        > python simple_plot.py
+
+        > MPLBACKEND=qtagg python simple_plot.py
+
+   On Windows, only the former is possible::
+
+        > set MPLBACKEND=qtagg
+        > python simple_plot.py
+
+   Setting this environment variable will override the ``backend`` parameter
+   in *any* :file:`matplotlibrc`, even if there is a :file:`matplotlibrc` in
+   your current working directory. Therefore, setting :envvar:`MPLBACKEND`
+   globally, e.g. in your :file:`.bashrc` or :file:`.profile`, is discouraged
+   as it might lead to counter-intuitive behavior.
+
+#. If your script depends on a specific backend you can use the function
+   :func:`matplotlib.use`::
+
+      import matplotlib
+      matplotlib.use('qtagg')
+
+   This should be done before any figure is created, otherwise Matplotlib may
+   fail to switch the backend and raise an ImportError.
+
+   Using `~matplotlib.use` will require changes in your code if users want to
+   use a different backend.  Therefore, you should avoid explicitly calling
+   `~matplotlib.use` unless absolutely necessary.
+
+.. _the-builtin-backends:
+
+The builtin backends
+--------------------
+
+By default, Matplotlib should automatically select a default backend which
+allows both interactive work and plotting from scripts, with output to the
+screen and/or to a file, so at least initially, you will not need to worry
+about the backend.  The most common exception is if your Python distribution
+comes without :mod:`tkinter` and you have no other GUI toolkit installed.
+This happens on certain Linux distributions, where you need to install a
+Linux package named ``python-tk`` (or similar).
+
+If, however, you want to write graphical user interfaces, or a web
+application server
+(:doc:`/gallery/user_interfaces/web_application_server_sgskip`), or need a
+better understanding of what is going on, read on. To make things easily
+more customizable for graphical user interfaces, Matplotlib separates
+the concept of the renderer (the thing that actually does the drawing)
+from the canvas (the place where the drawing goes).  The canonical
+renderer for user interfaces is ``Agg`` which uses the `Anti-Grain
+Geometry`_ C++ library to make a raster (pixel) image of the figure; it
+is used by the ``QtAgg``, ``GTK4Agg``, ``GTK3Agg``, ``wxAgg``, ``TkAgg``, and
+``macosx`` backends.  An alternative renderer is based on the Cairo library,
+used by ``QtCairo``, etc.
+
+For the rendering engines, users can also distinguish between `vector
+<https://en.wikipedia.org/wiki/Vector_graphics>`_ or `raster
+<https://en.wikipedia.org/wiki/Raster_graphics>`_ renderers.  Vector
+graphics languages issue drawing commands like "draw a line from this
+point to this point" and hence are scale free. Raster backends
+generate a pixel representation of the line whose accuracy depends on a
+DPI setting.
+
+Here is a summary of the Matplotlib renderers (there is an eponymous
+backend for each; these are *non-interactive backends*, capable of
+writing to a file):
+
+========  =========  =======================================================
+Renderer  Filetypes  Description
+========  =========  =======================================================
+AGG       png        raster_ graphics -- high quality images using the
+                     `Anti-Grain Geometry`_ engine.
+PDF       pdf        vector_ graphics -- `Portable Document Format`_ output.
+PS        ps, eps    vector_ graphics -- PostScript_ output.
+SVG       svg        vector_ graphics -- `Scalable Vector Graphics`_ output.
+PGF       pgf, pdf   vector_ graphics -- using the pgf_ package.
+Cairo     png, ps,   raster_ or vector_ graphics -- using the Cairo_ library
+          pdf, svg   (requires pycairo_ or cairocffi_).
+========  =========  =======================================================
+
+To save plots using the non-interactive backends, use the
+``matplotlib.pyplot.savefig('filename')`` method.
+
+These are the user interfaces and renderer combinations supported;
+these are *interactive backends*, capable of displaying to the screen
+and using appropriate renderers from the table above to write to
+a file:
+
+========= ================================================================
+Backend   Description
+========= ================================================================
+QtAgg     Agg rendering in a Qt_ canvas (requires PyQt_ or `Qt for Python`_,
+          a.k.a. PySide).  This backend can be activated in IPython with
+          ``%matplotlib qt``.
+ipympl    Agg rendering embedded in a Jupyter widget (requires ipympl_).
+          This backend can be enabled in a Jupyter notebook with
+          ``%matplotlib ipympl``.
+GTK3Agg   Agg rendering to a GTK_ 3.x canvas (requires PyGObject_ and
+          pycairo_).  This backend can be activated in IPython with
+          ``%matplotlib gtk3``.
+GTK4Agg   Agg rendering to a GTK_ 4.x canvas (requires PyGObject_ and
+          pycairo_).  This backend can be activated in IPython with
+          ``%matplotlib gtk4``.
+macosx    Agg rendering into a Cocoa canvas in OSX.  This backend can be
+          activated in IPython with ``%matplotlib osx``.
+TkAgg     Agg rendering to a Tk_ canvas (requires TkInter_). This
+          backend can be activated in IPython with ``%matplotlib tk``.
+nbAgg     Embed an interactive figure in a Jupyter classic notebook.  This
+          backend can be enabled in Jupyter notebooks via
+          ``%matplotlib notebook``.
+WebAgg    On ``show()`` will start a tornado server with an interactive
+          figure.
+GTK3Cairo Cairo rendering to a GTK_ 3.x canvas (requires PyGObject_ and
+          pycairo_).
+GTK4Cairo Cairo rendering to a GTK_ 4.x canvas (requires PyGObject_ and
+          pycairo_).
+wxAgg     Agg rendering to a wxWidgets_ canvas (requires wxPython_ 4).
+          This backend can be activated in IPython with ``%matplotlib wx``.
+========= ================================================================
+
+.. note::
+   The names of builtin backends case-insensitive; e.g., 'QtAgg' and
+   'qtagg' are equivalent.
+
+.. _`Anti-Grain Geometry`: http://agg.sourceforge.net/antigrain.com/
+.. _`Portable Document Format`: https://en.wikipedia.org/wiki/Portable_Document_Format
+.. _Postscript: https://en.wikipedia.org/wiki/PostScript
+.. _`Scalable Vector Graphics`: https://en.wikipedia.org/wiki/Scalable_Vector_Graphics
+.. _pgf: https://ctan.org/pkg/pgf
+.. _Cairo: https://www.cairographics.org
+.. _PyGObject: https://wiki.gnome.org/action/show/Projects/PyGObject
+.. _pycairo: https://www.cairographics.org/pycairo/
+.. _cairocffi: https://pythonhosted.org/cairocffi/
+.. _wxPython: https://www.wxpython.org/
+.. _TkInter: https://docs.python.org/3/library/tk.html
+.. _PyQt: https://riverbankcomputing.com/software/pyqt/intro
+.. _`Qt for Python`: https://doc.qt.io/qtforpython/
+.. _Qt: https://qt.io/
+.. _GTK: https://www.gtk.org/
+.. _Tk: https://www.tcl.tk/
+.. _wxWidgets: https://www.wxwidgets.org/
+.. _ipympl: https://www.matplotlib.org/ipympl
+
+ipympl
+^^^^^^
+
+The Jupyter widget ecosystem is moving too fast to support directly in
+Matplotlib.  To install ipympl:
+
+.. code-block:: bash
+
+   pip install ipympl
+
+or
+
+.. code-block:: bash
+
+   conda install ipympl -c conda-forge
+
+See `installing ipympl <https://matplotlib.org/ipympl/installing.html>`__ for more details.
+
+.. _QT_API-usage:
+
+How do I select the Qt implementation?
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The QtAgg and QtCairo backends support both Qt 5 and 6, as well as both Python
+bindings (`PyQt`_ or `Qt for Python`_, a.k.a. PySide). If any binding has
+already been loaded, then it will be used for the Qt backend. Otherwise, the
+first available binding is used, in the order: PyQt6, PySide6, PyQt5, PySide2.
+
+The :envvar:`QT_API` environment variable can be set to override the search
+when nothing has already been loaded. It may be set to (case-insensitively)
+PyQt6, PySide6, PyQt5, or PySide2 to pick the version and binding to use. If
+the chosen implementation is unavailable, the Qt backend will fail to load
+without attempting any other Qt implementations.  See :ref:`QT_bindings` for
+more details.
+
+Using non-builtin backends
+--------------------------
+More generally, any importable backend can be selected by using any of the
+methods above. If ``name.of.the.backend`` is the module containing the
+backend, use ``module://name.of.the.backend`` as the backend name, e.g.
+``matplotlib.use('module://name.of.the.backend')``.
diff --git a/doc/users/event_handling.rst b/doc/users/explain/event_handling.rst
similarity index 83%
rename from doc/users/event_handling.rst
rename to doc/users/explain/event_handling.rst
index 3a368d3b5312..909e9f4b9ff8 100644
--- a/doc/users/event_handling.rst
+++ b/doc/users/explain/event_handling.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/event_handling
+
 .. _event-handling-tutorial:
 
 **************************
@@ -80,29 +82,28 @@ Event name             Class            Description
    you may encounter inconsistencies between the different user interface
    toolkits that Matplotlib works with. This is due to inconsistencies/limitations
    of the user interface toolkit. The following table shows some basic examples of
-   what you may expect to receive as key(s) from the different user interface toolkits,
-   where a comma separates different keys:
-
-   ============== ============================= ============================== ============================= ============================== ==============================
-   Key(s) Pressed WxPython                      Qt                             WebAgg                        Gtk                            Tkinter
-   ============== ============================= ============================== ============================= ============================== ==============================
-   Shift+2        shift, shift+2                shift, "                       shift, "                      shift, "                       shift, "
-   Shift+F1       shift, shift+f1               shift, shift+f1                shift, shift+f1               shift, shift+f1                shift, shift+f1
-   Shift          shift                         shift                          shift                         shift                          shift
-   Control        control                       control                        control                       control                        control
-   Alt            alt                           alt                            alt                           alt                            alt
-   AltGr          Nothing                       Nothing                        alt                           iso_level3_shift               iso_level3_shift
-   CapsLock       caps_lock                     caps_lock                      caps_lock                     caps_lock                      caps_lock
-   A              a                             a                              A                             A                              A
-   a              a                             a                              a                             a                              a
-   Shift+a        shift, A                      shift, A                       shift, A                      shift, A                       shift, A
-   Shift+A        shift, A                      shift, A                       shift, a                      shift, a                       shift, a
-   Ctrl+Shift+Alt control, ctrl+shift, ctrl+alt control, ctrl+shift, ctrl+meta control, ctrl+shit, ctrl+meta control, ctrl+shift, ctrl+meta control, ctrl+shift, ctrl+meta
-   Ctrl+Shift+a   control, ctrl+shift, ctrl+A   control, ctrl+shift, ctrl+A    control, ctrl+shit, ctrl+A    control, ctrl+shift, ctrl+A    control, ctrl+shift, ctrl+a
-   Ctrl+Shift+A   control, ctrl+shift, ctrl+A   control, ctrl+shift, ctrl+A    control, ctrl+shit, ctrl+a    control, ctrl+shift, ctrl+a    control, ctrl+shift, ctrl+a
-   F1             f1                            f1                             f1                            f1                             f1
-   Ctrl+F1        control, ctrl+f1              control, ctrl+f1               control, ctrl+f1              control, ctrl+f1               control, ctrl+f1
-   ============== ============================= ============================== ============================= ============================== ==============================
+   what you may expect to receive as key(s) (using a QWERTY keyboard layout)
+   from the different user interface toolkits, where a comma separates different keys:
+
+   ================ ============================= ============================== ============================== ============================== ============================== ===================================
+   Key(s) Pressed   WxPython                      Qt                             WebAgg                         Gtk                            Tkinter                        macosx
+   ================ ============================= ============================== ============================== ============================== ============================== ===================================
+   Shift+2          shift, shift+2                shift, @                       shift, @                       shift, @                       shift, @                       shift, @
+   Shift+F1         shift, shift+f1               shift, shift+f1                shift, shift+f1                shift, shift+f1                shift, shift+f1                shift, shift+f1
+   Shift            shift                         shift                          shift                          shift                          shift                          shift
+   Control          control                       control                        control                        control                        control                        control
+   Alt              alt                           alt                            alt                            alt                            alt                            alt
+   AltGr            Nothing                       Nothing                        alt                            iso_level3_shift               iso_level3_shift
+   CapsLock         caps_lock                     caps_lock                      caps_lock                      caps_lock                      caps_lock                      caps_lock
+   CapsLock+a       caps_lock, a                  caps_lock, a                   caps_lock, A                   caps_lock, A                   caps_lock, A                   caps_lock, a
+   a                a                             a                              a                              a                              a                              a
+   Shift+a          shift, A                      shift, A                       shift, A                       shift, A                       shift, A                       shift, A
+   CapsLock+Shift+a caps_lock, shift, A           caps_lock, shift, A            caps_lock, shift, a            caps_lock, shift, a            caps_lock, shift, a            caps_lock, shift, A
+   Ctrl+Shift+Alt   control, ctrl+shift, ctrl+alt control, ctrl+shift, ctrl+meta control, ctrl+shift, ctrl+meta control, ctrl+shift, ctrl+meta control, ctrl+shift, ctrl+meta control, ctrl+shift, ctrl+alt+shift
+   Ctrl+Shift+a     control, ctrl+shift, ctrl+A   control, ctrl+shift, ctrl+A    control, ctrl+shift, ctrl+A    control, ctrl+shift, ctrl+A    control, ctrl+shift, ctrl+a    control, ctrl+shift, ctrl+A
+   F1               f1                            f1                             f1                             f1                             f1                             f1
+   Ctrl+F1          control, ctrl+f1              control, ctrl+f1               control, ctrl+f1               control, ctrl+f1               control, ctrl+f1               control, Nothing
+   ================ ============================= ============================== ============================== ============================== ============================== ===================================
 
 Matplotlib attaches some keypress callbacks by default for interactivity; they
 are documented in the :ref:`key-event-handling` section.
diff --git a/doc/users/explain/fonts.rst b/doc/users/explain/fonts.rst
new file mode 100644
index 000000000000..b6a7baec2e52
--- /dev/null
+++ b/doc/users/explain/fonts.rst
@@ -0,0 +1,197 @@
+.. redirect-from:: /users/fonts
+
+Fonts in Matplotlib
+===================
+
+Matplotlib needs fonts to work with its text engine, some of which are shipped
+alongside the installation.  The default font is `DejaVu Sans
+<https://dejavu-fonts.github.io>`_ which covers most European writing systems.
+However, users can configure the default fonts, and provide their own custom
+fonts.  See :doc:`Customizing text properties </tutorials/text/text_props>` for
+details and :ref:`font-nonlatin` in particular for glyphs not supported by
+DejaVu Sans.
+
+Matplotlib also provides an option to offload text rendering to a TeX engine
+(``usetex=True``), see :doc:`Text rendering with LaTeX
+</tutorials/text/usetex>`.
+
+Fonts in PDF and PostScript
+---------------------------
+
+Fonts have a long (and sometimes incompatible) history in computing, leading to
+different platforms supporting different types of fonts.  In practice, there
+are 3 types of font specifications Matplotlib supports (in addition to 'core
+fonts' in pdf which is explained later in the guide):
+
+.. list-table:: Type of Fonts
+   :header-rows: 1
+
+   * - Type 1 (PDF)
+     - Type 3 (PDF/PS)
+     - TrueType (PDF)
+   * - One of the oldest types, introduced by Adobe
+     - Similar to Type 1 in terms of introduction
+     - Newer than previous types, used commonly today, introduced by Apple
+   * - Restricted subset of PostScript, charstrings are in bytecode
+     - Full PostScript language, allows embedding arbitrary code
+       (in theory, even render fractals when rasterizing!)
+     - Include a virtual machine that can execute code!
+   * - These fonts support font hinting
+     - Do not support font hinting
+     - Hinting supported (virtual machine processes the "hints")
+   * - Non-subsetted through Matplotlib
+     - Subsetted via external module `ttconv <https://github.com/sandflow/ttconv>`_
+     - Subsetted via external module `fonttools <https://github.com/fonttools/fonttools>`__
+
+NOTE: Adobe will disable support for authoring with Type 1 fonts in
+January 2023. `Read more here. <https://helpx.adobe.com/fonts/kb/postscript-type-1-fonts-end-of-support.html>`_
+
+
+Other font specifications which Matplotlib supports:
+
+- Type 42 fonts (PS):
+
+  - PostScript wrapper around TrueType fonts
+  - 42 is the `Answer to Life, the Universe, and Everything! <https://en.wikipedia.org/wiki/Answer_to_Life,_the_Universe,_and_Everything>`_
+  - Matplotlib uses an external library called `fonttools <https://github.com/fonttools/fonttools>`__
+    to subset these types of fonts
+
+- OpenType fonts:
+
+  - OpenType is a new standard for digital type fonts, developed jointly by
+    Adobe and Microsoft
+  - Generally contain a much larger character set!
+  - Limited Support with Matplotlib
+
+Font Subsetting
+~~~~~~~~~~~~~~~
+
+The PDF and PostScript formats support embedding fonts in files allowing the
+display program to correctly render the text, independent of what fonts are
+installed on the viewer's computer and without the need to pre-rasterize the text.
+This ensures that if the output is zoomed or resized the text does not become
+pixelated.  However, embedding full fonts in the file can lead to large output
+files, particularly with fonts with many glyphs such as those that support CJK
+(Chinese/Japanese/Korean).
+
+The solution to this problem is to subset the fonts used in the document and
+only embed the glyphs actually used.  This gets both vector text and small
+files sizes.  Computing the subset of the font required and writing the new
+(reduced) font are both complex problem and thus Matplotlib relies on
+`fontTools <https://fonttools.readthedocs.io/en/latest/>`__ and a vendored fork
+of `ttconv <https://github.com/sandflow/ttconv>`_.
+
+Currently Type 3, Type 42, and TrueType fonts are subseted.  Type 1 fonts are not.
+
+
+Core Fonts
+~~~~~~~~~~
+
+In addition to the ability to embed fonts, as part of the `PostScript
+<https://en.wikipedia.org/wiki/PostScript_fonts#Core_Font_Set>`_ and `PDF
+specification
+<https://docs.oracle.com/cd/E96927_01/TSG/FAQ/What%20are%20the%2014%20base%20fonts%20distributed%20with%20Acroba.html>`_
+there are 14 Core Font that compliant viewers must ensure are available.  If
+you restrict your document to only these fonts you do not have to embed any
+font information in the document but still get vector text.
+
+This is especially helpful to generate *really lightweight* documents.::
+
+    # trigger core fonts for PDF backend
+    plt.rcParams["pdf.use14corefonts"] = True
+    # trigger core fonts for PS backend
+    plt.rcParams["ps.useafm"] = True
+
+    chars = "AFM ftw!"
+    fig, ax = plt.subplots()
+    ax.text(0.5, 0.5, chars)
+
+    fig.savefig("AFM_PDF.pdf", format="pdf")
+    fig.savefig("AFM_PS.ps", format="ps)
+
+
+Fonts in SVG
+------------
+
+Text can output to SVG in two ways controlled by :rc:`svg.fonttype`:
+
+- as a path (``'path'``) in the SVG
+- as string in the SVG with font styling on the element (``'none'``)
+
+
+When saving via ``'path'`` Matplotlib will compute the path of the glyphs used
+as vector paths and write those to the output.  The advantage of this is that
+the SVG will look the same on all computers independent of what fonts are
+installed.  However the text will not be editable after the fact.
+In contrast saving with ``'none'`` will result in smaller files and the
+text will appear directly in the markup.  However, the appearance may vary
+based on the SVG viewer and what fonts are available.
+
+Fonts in Agg
+------------
+
+To output text to raster formats via Agg, Matplotlib relies on `FreeType
+<https://www.freetype.org/>`_.  Because the exact rendering of the glyphs
+changes between FreeType versions we pin to a specific version for our image
+comparison tests.
+
+
+How Matplotlib selects fonts
+----------------------------
+
+Internally using a Font in Matplotlib is a three step process:
+
+1. a `.FontProperties` object is created (explicitly or implicitly)
+2. based on the `.FontProperties` object the methods on `.FontManager` are used
+   to select the closest "best" font Matplotlib is aware of (except for
+   ``'none'`` mode of SVG).
+3. the Python proxy for the font object is used by the backend code to render
+   the text -- the exact details depend on the backend via `.font_manager.get_font`.
+
+The algorithm to select the "best" font is a modified version of the algorithm
+specified by the `CSS1 Specifications
+<http://www.w3.org/TR/1998/REC-CSS2-19980512/>`_ which is used by web browsers.
+This algorithm takes into account the font family name (e.g. "Arial", "Noto
+Sans CJK", "Hack", ...), the size, style, and weight.  In addition to family
+names that map directly to fonts there are five "generic font family names" (
+serif, monospace, fantasy, cursive, and sans-serif) that will internally be
+mapped to any one of a set of fonts.
+
+Currently the public API for doing step 2 is `.FontManager.findfont` (and that
+method on the global `.FontManager` instance is aliased at the module level as
+`.font_manager.findfont`), which will only find a single font and return the absolute
+path to the font on the filesystem.
+
+Font Fallback
+-------------
+
+There is no font that covers the entire Unicode space thus it is possible for the
+users to require a mix of glyphs that can not be satisfied from a single font.
+While it has been possible to use multiple fonts within a Figure, on distinct
+`.Text` instances, it was not previous possible to use multiple fonts in the
+same `.Text` instance (as a web browser does).  As of Matplotlib 3.6 the Agg,
+SVG, PDF, and PS backends will "fallback" through multiple fonts in a single
+`.Text` instance:
+
+
+.. plot::
+   :include-source:
+   :caption: The string "There are 几个汉字 in between!" rendered with 2 fonts.
+
+   fig, ax = plt.subplots()
+   ax.text(
+       .5, .5, "There are 几个汉字 in between!",
+       family=['DejaVu Sans', 'WenQuanYi Zen Hei'],
+       ha='center'
+   )
+
+
+Internally this is implemented by setting The "font family" on
+`.FontProperties` objects to a list of font families.  A (currently)
+private API extracts a list of paths to all of the fonts found and then
+constructs a single `.ft2font.FT2Font` object that is aware of all of the fonts.
+Each glyph of the string is rendered using the first font in the list that
+contains that glyph.
+
+A majority of this work was done by Aitik Gupta supported by Google Summer of
+Code 2021.
diff --git a/doc/users/explain/index.rst b/doc/users/explain/index.rst
new file mode 100644
index 000000000000..c2121667da4b
--- /dev/null
+++ b/doc/users/explain/index.rst
@@ -0,0 +1,17 @@
+.. _users-guide-explain:
+
+.. redirect-from:: /users/explain
+
+Explanations
+------------
+
+.. toctree::
+    :maxdepth: 2
+
+    api_interfaces.rst
+    backends.rst
+    interactive.rst
+    fonts.rst
+    event_handling.rst
+    performance.rst
+    interactive_guide.rst
diff --git a/doc/users/interactive.rst b/doc/users/explain/interactive.rst
similarity index 91%
rename from doc/users/interactive.rst
rename to doc/users/explain/interactive.rst
index b4b51ff591ac..3488580a75a6 100644
--- a/doc/users/interactive.rst
+++ b/doc/users/explain/interactive.rst
@@ -1,13 +1,12 @@
+.. redirect-from:: /users/interactive
+
 .. currentmodule:: matplotlib
 
 .. _mpl-shell:
 
-=====================
- Interactive Figures
-=====================
-
-.. toctree::
-
+===================
+Interactive figures
+===================
 
 When working with data, interactivity can be invaluable. The pan/zoom and
 mouse-location tools built into the Matplotlib GUI windows are often sufficient, but
@@ -17,7 +16,7 @@ Matplotlib ships with :ref:`backends <what-is-a-backend>` binding to
 several GUI toolkits (Qt, Tk, Wx, GTK, macOS, JavaScript) and third party
 packages provide bindings to `kivy
 <https://github.com/kivy-garden/garden.matplotlib>`__ and `Jupyter Lab
-<https://github.com/matplotlib/ipympl>`__.  For the figures to be responsive to
+<https://matplotlib.org/ipympl>`__.  For the figures to be responsive to
 mouse, keyboard, and paint events, the GUI event loop needs to be integrated
 with an interactive prompt. We recommend using IPython (see :ref:`below <ipython-pylab>`).
 
@@ -26,15 +25,15 @@ that include interactive tools, a toolbar, a tool-tip, and
 :ref:`key bindings <key-event-handling>`:
 
 `.pyplot.figure`
-    Creates a new empty `.figure.Figure` or selects an existing figure
+    Creates a new empty `.Figure` or selects an existing figure
 
 `.pyplot.subplots`
-    Creates a new `.figure.Figure` and fills it with a grid of `.axes.Axes`
+    Creates a new `.Figure` and fills it with a grid of `~.axes.Axes`
 
 `.pyplot` has a notion of "The Current Figure" which can be accessed
 through `.pyplot.gcf` and a notion of "The Current Axes" accessed
 through `.pyplot.gca`.  Almost all of the functions in `.pyplot` pass
-through the current `.Figure` / `.axes.Axes` (or create one) as
+through the current `.Figure` / `~.axes.Axes` (or create one) as
 appropriate.
 
 Matplotlib keeps a reference to all of the open figures
@@ -45,11 +44,8 @@ collected. `.Figure`\s can be closed and deregistered from `.pyplot` individuall
 
 For more discussion of Matplotlib's event system and integrated event loops, please read:
 
-.. toctree::
-    :maxdepth: 1
-
-    interactive_guide.rst
-    event_handling.rst
+   - :ref:`interactive_figures_and_eventloops`
+   - :ref:`event-handling-tutorial`
 
 
 .. _ipython-pylab:
@@ -63,7 +59,7 @@ it also ensures that the GUI toolkit event loop is properly integrated
 with the command line (see :ref:`cp_integration`).
 
 In this example, we create and modify a figure via an IPython prompt.
-The figure displays in a Qt5Agg GUI window. To configure the integration
+The figure displays in a QtAgg GUI window. To configure the integration
 and enable :ref:`interactive mode <controlling-interactive>` use the
 ``%matplotlib`` magic:
 
@@ -72,7 +68,7 @@ and enable :ref:`interactive mode <controlling-interactive>` use the
 ::
 
    In [1]: %matplotlib
-   Using matplotlib backend: Qt5Agg
+   Using matplotlib backend: QtAgg
 
    In [2]: import matplotlib.pyplot as plt
 
@@ -153,9 +149,11 @@ If in interactive mode:
 If not in interactive mode:
 
 - newly created figures and changes to figures are not displayed until
-   * `.pyplot.show()` is called
-   * `.pyplot.pause()` is called
-   * `.FigureCanvasBase.flush_events()` is called
+
+  * `.pyplot.show()` is called
+  * `.pyplot.pause()` is called
+  * `.FigureCanvasBase.flush_events()` is called
+
 - `pyplot.show()` runs the GUI event loop and does not return until all the plot windows are closed
 
 If you are in non-interactive mode (or created figures while in
@@ -183,7 +181,7 @@ the GUI main loop in some other way.
 
 .. warning::
 
-   Using `.figure.Figure.show` it is possible to display a figure on
+   Using `.Figure.show` it is possible to display a figure on
    the screen without starting the event loop and without being in
    interactive mode.  This may work (depending on the GUI toolkit) but
    will likely result in a non-responsive figure.
@@ -201,7 +199,7 @@ helpful keybindings are registered by default.
 
 .. _key-event-handling:
 
-Navigation Keyboard Shortcuts
+Navigation keyboard shortcuts
 -----------------------------
 
 The following table holds all the default keys, which can be
@@ -249,8 +247,8 @@ documentation of your GUI toolkit for details.
 
 
 
-Jupyter Notebooks / Lab
------------------------
+Jupyter Notebooks / JupyterLab
+------------------------------
 
 .. note::
 
diff --git a/doc/users/interactive_guide.rst b/doc/users/explain/interactive_guide.rst
similarity index 92%
rename from doc/users/interactive_guide.rst
rename to doc/users/explain/interactive_guide.rst
index 645384c217e3..377487df1545 100644
--- a/doc/users/interactive_guide.rst
+++ b/doc/users/explain/interactive_guide.rst
@@ -1,11 +1,13 @@
 .. _interactive_figures_and_eventloops:
 
+.. redirect-from:: /users/interactive_guide
+
 .. currentmodule:: matplotlib
 
 
-==================================================
- Interactive Figures and Asynchronous Programming
-==================================================
+================================================
+Interactive figures and asynchronous programming
+================================================
 
 Matplotlib supports rich interactive figures by embedding figures into
 a GUI window.  The basic interactions of panning and zooming in an
@@ -21,7 +23,7 @@ handling system <event-handling-tutorial>`, `Interactive Tutorial
 `Interactive Applications using Matplotlib
 <http://www.amazon.com/Interactive-Applications-using-Matplotlib-Benjamin/dp/1783988843>`__.
 
-Event Loops
+Event loops
 ===========
 
 Fundamentally, all user interaction (and networking) is implemented as
@@ -71,7 +73,7 @@ interfaces.
 
 .. _cp_integration:
 
-Command Prompt Integration
+Command prompt integration
 ==========================
 
 So far, so good.  We have the REPL (like the IPython terminal) that
@@ -92,7 +94,7 @@ responsive we need a method to allow the loops to 'timeshare' :
 
 .. _cp_block_the_prompt:
 
-Blocking the Prompt
+Blocking the prompt
 -------------------
 
 .. autosummary::
@@ -117,7 +119,7 @@ non-responsive) you will be able to use the prompt again.  Re-starting
 the event loop will make any open figure responsive again (and will
 process any queued up user interaction).
 
-To start the event loop until all open figures are closed use
+To start the event loop until all open figures are closed, use
 `.pyplot.show` as ::
 
   pyplot.show(block=True)
@@ -138,7 +140,7 @@ between polling for additional data.  See :ref:`interactive_scripts`
 for more details.
 
 
-Input Hook integration
+Input hook integration
 ----------------------
 
 While running the GUI event loop in a blocking mode or explicitly
@@ -211,7 +213,7 @@ Blocking functions
 ------------------
 
 If you only need to collect points in an Axes you can use
-`.figure.Figure.ginput` or more generally the tools from
+`.Figure.ginput` or more generally the tools from
 `.blocking_input` the tools will take care of starting and stopping
 the event loop for you.  However if you have written some custom event
 handling or are using `.widgets` you will need to manually run the GUI
@@ -236,7 +238,7 @@ which would poll for new data and update the figure at 1Hz.
 
 .. _spin_event_loop:
 
-Explicitly spinning the Event Loop
+Explicitly spinning the event Loop
 ----------------------------------
 
 .. autosummary::
@@ -285,7 +287,7 @@ to call `~.FigureCanvasBase.draw_idle` to request that the canvas be
 re-drawn.  This method can be thought of *draw_soon* in analogy to
 `asyncio.loop.call_soon`.
 
-We can add this our example above as ::
+We can add this to our example above as ::
 
    def slow_loop(N, ln):
        for j in range(N):
@@ -306,14 +308,14 @@ resources on the visualization and less on your computation.
 
 .. _stale_artists:
 
-Stale Artists
+Stale artists
 =============
 
 Artists (as of Matplotlib 1.5) have a **stale** attribute which is
 `True` if the internal state of the artist has changed since the last
 time it was rendered. By default the stale state is propagated up to
 the Artists parents in the draw tree, e.g., if the color of a `.Line2D`
-instance is changed, the `.axes.Axes` and `.figure.Figure` that
+instance is changed, the `~.axes.Axes` and `.Figure` that
 contain it will also be marked as "stale".  Thus, ``fig.stale`` will
 report if any artist in the figure has been modified and is out of sync
 with what is displayed on the screen.  This is intended to be used to
@@ -330,11 +332,11 @@ which by default is set to a function that forwards the stale state to
 the artist's parent.   If you wish to suppress a given artist from propagating
 set this attribute to None.
 
-`.figure.Figure` instances do not have a containing artist and their
+`.Figure` instances do not have a containing artist and their
 default callback is `None`.  If you call `.pyplot.ion` and are not in
 ``IPython`` we will install a callback to invoke
 `~.backend_bases.FigureCanvasBase.draw_idle` whenever the
-`.figure.Figure` becomes stale.  In ``IPython`` we use the
+`.Figure` becomes stale.  In ``IPython`` we use the
 ``'post_execute'`` hook to invoke
 `~.backend_bases.FigureCanvasBase.draw_idle` on any stale figures
 after having executed the user's input, but before returning the prompt
@@ -345,7 +347,7 @@ become stale.
 
 .. _draw_idle:
 
-Draw Idle
+Idle draw
 =========
 
 .. autosummary::
@@ -393,19 +395,18 @@ CPython / readline
 ------------------
 
 The Python C API provides a hook, :c:data:`PyOS_InputHook`, to register a
-function to be run "The function will be called when Python's
+function to be run ("The function will be called when Python's
 interpreter prompt is about to become idle and wait for user input
-from the terminal.".  This hook can be used to integrate a second
+from the terminal.").  This hook can be used to integrate a second
 event loop (the GUI event loop) with the python input prompt loop.
 The hook functions typically exhaust all pending events on the GUI
 event queue, run the main loop for a short fixed amount of time, or
 run the event loop until a key is pressed on stdin.
 
-
 Matplotlib does not currently do any management of :c:data:`PyOS_InputHook` due
 to the wide range of ways that Matplotlib is used.  This management is left to
 downstream libraries -- either user code or the shell.  Interactive figures,
-even with matplotlib in 'interactive mode', may not work in the vanilla python
+even with Matplotlib in 'interactive mode', may not work in the vanilla python
 repl if an appropriate :c:data:`PyOS_InputHook` is not registered.
 
 Input hooks, and helpers to install them, are usually included with
@@ -415,25 +416,25 @@ Matplotlib supports which can be installed via ``%matplotlib``.  This
 is the recommended method of integrating Matplotlib and a prompt.
 
 
-IPython / prompt toolkit
+IPython / prompt_toolkit
 ------------------------
 
-With IPython >= 5.0 IPython has changed from using cpython's readline
+With IPython >= 5.0 IPython has changed from using CPython's readline
 based prompt to a ``prompt_toolkit`` based prompt.  ``prompt_toolkit``
 has the same conceptual input hook, which is fed into ``prompt_toolkit`` via the
 :meth:`IPython.terminal.interactiveshell.TerminalInteractiveShell.inputhook`
 method.  The source for the ``prompt_toolkit`` input hooks lives at
-:mod:`IPython.terminal.pt_inputhooks`
+``IPython.terminal.pt_inputhooks``.
 
 
 
 .. rubric:: Footnotes
 
 .. [#f1] A limitation of this design is that you can only wait for one
-	 input, if there is a need to multiplex between multiple sources
-	 then the loop would look something like ::
+     input, if there is a need to multiplex between multiple sources
+     then the loop would look something like ::
 
-	   fds = [...]
+       fds = [...]
            while True:                    # Loop
                inp = select(fds).read()   # Read
                eval(inp)                  # Evaluate / Print
@@ -442,6 +443,6 @@ method.  The source for the ``prompt_toolkit`` input hooks lives at
          <https://www.youtube.com/watch?v=ZzfHjytDceU>`__ if you must.
 
 .. [#f3] These examples are aggressively dropping many of the
-	 complexities that must be dealt with in the real world such as
-	 keyboard interrupts, timeouts, bad input, resource
-	 allocation and cleanup, etc.
+     complexities that must be dealt with in the real world such as
+     keyboard interrupts, timeouts, bad input, resource
+     allocation and cleanup, etc.
diff --git a/doc/users/explain/performance.rst b/doc/users/explain/performance.rst
new file mode 100644
index 000000000000..03bff404b7ab
--- /dev/null
+++ b/doc/users/explain/performance.rst
@@ -0,0 +1,146 @@
+.. _performance:
+
+Performance
+===========
+
+Whether exploring data in interactive mode or programmatically
+saving lots of plots, rendering performance can be a challenging
+bottleneck in your pipeline. Matplotlib provides multiple
+ways to greatly reduce rendering time at the cost of a slight
+change (to a settable tolerance) in your plot's appearance.
+The methods available to reduce rendering time depend on the
+type of plot that is being created.
+
+Line segment simplification
+---------------------------
+
+For plots that have line segments (e.g. typical line plots, outlines
+of polygons, etc.), rendering performance can be controlled by
+:rc:`path.simplify` and :rc:`path.simplify_threshold`, which
+can be defined e.g. in the :file:`matplotlibrc` file (see
+:doc:`/tutorials/introductory/customizing` for more information about
+the :file:`matplotlibrc` file). :rc:`path.simplify` is a Boolean
+indicating whether or not line segments are simplified at all.
+:rc:`path.simplify_threshold` controls how much line segments are simplified;
+higher thresholds result in quicker rendering.
+
+The following script will first display the data without any
+simplification, and then display the same data with simplification.
+Try interacting with both of them::
+
+  import numpy as np
+  import matplotlib.pyplot as plt
+  import matplotlib as mpl
+
+  # Setup, and create the data to plot
+  y = np.random.rand(100000)
+  y[50000:] *= 2
+  y[np.geomspace(10, 50000, 400).astype(int)] = -1
+  mpl.rcParams['path.simplify'] = True
+
+  mpl.rcParams['path.simplify_threshold'] = 0.0
+  plt.plot(y)
+  plt.show()
+
+  mpl.rcParams['path.simplify_threshold'] = 1.0
+  plt.plot(y)
+  plt.show()
+
+Matplotlib currently defaults to a conservative simplification
+threshold of ``1/9``. To change default settings to use a different
+value, change the :file:`matplotlibrc` file. Alternatively, users
+can create a new style for interactive plotting (with maximal
+simplification) and another style for publication quality plotting
+(with minimal simplification) and activate them as necessary. See
+:doc:`/tutorials/introductory/customizing` for instructions on
+how to perform these actions.
+
+The simplification works by iteratively merging line segments
+into a single vector until the next line segment's perpendicular
+distance to the vector (measured in display-coordinate space)
+is greater than the ``path.simplify_threshold`` parameter.
+
+.. note::
+  Changes related to how line segments are simplified were made
+  in version 2.1. Rendering time will still be improved by these
+  parameters prior to 2.1, but rendering time for some kinds of
+  data will be vastly improved in versions 2.1 and greater.
+
+Marker subsampling
+------------------
+
+Markers can also be simplified, albeit less robustly than line
+segments. Marker subsampling is only available to `.Line2D` objects
+(through the ``markevery`` property). Wherever `.Line2D` construction
+parameters are passed through, such as `.pyplot.plot` and `.Axes.plot`,
+the ``markevery`` parameter can be used::
+
+  plt.plot(x, y, markevery=10)
+
+The ``markevery`` argument allows for naive subsampling, or an
+attempt at evenly spaced (along the *x* axis) sampling. See the
+:doc:`/gallery/lines_bars_and_markers/markevery_demo`
+for more information.
+
+Splitting lines into smaller chunks
+-----------------------------------
+
+If you are using the Agg backend (see :ref:`what-is-a-backend`),
+then you can make use of :rc:`agg.path.chunksize`
+This allows users to specify a chunk size, and any lines with
+greater than that many vertices will be split into multiple
+lines, each of which has no more than ``agg.path.chunksize``
+many vertices. (Unless ``agg.path.chunksize`` is zero, in
+which case there is no chunking.) For some kind of data,
+chunking the line up into reasonable sizes can greatly
+decrease rendering time.
+
+The following script will first display the data without any
+chunk size restriction, and then display the same data with
+a chunk size of 10,000. The difference can best be seen when
+the figures are large, try maximizing the GUI and then
+interacting with them::
+
+  import numpy as np
+  import matplotlib.pyplot as plt
+  import matplotlib as mpl
+  mpl.rcParams['path.simplify_threshold'] = 1.0
+
+  # Setup, and create the data to plot
+  y = np.random.rand(100000)
+  y[50000:] *= 2
+  y[np.geomspace(10, 50000, 400).astype(int)] = -1
+  mpl.rcParams['path.simplify'] = True
+
+  mpl.rcParams['agg.path.chunksize'] = 0
+  plt.plot(y)
+  plt.show()
+
+  mpl.rcParams['agg.path.chunksize'] = 10000
+  plt.plot(y)
+  plt.show()
+
+Legends
+-------
+
+The default legend behavior for axes attempts to find the location
+that covers the fewest data points (``loc='best'``). This can be a
+very expensive computation if there are lots of data points. In
+this case, you may want to provide a specific location.
+
+Using the *fast* style
+----------------------
+
+The *fast* style can be used to automatically set
+simplification and chunking parameters to reasonable
+settings to speed up plotting large amounts of data.
+The following code runs it::
+
+  import matplotlib.style as mplstyle
+  mplstyle.use('fast')
+
+It is very lightweight, so it works well with other
+styles. Be sure the fast style is applied last
+so that other styles do not overwrite the settings::
+
+  mplstyle.use(['dark_background', 'ggplot', 'fast'])
diff --git a/doc/faq/environment_variables_faq.rst b/doc/users/faq/environment_variables_faq.rst
similarity index 85%
rename from doc/faq/environment_variables_faq.rst
rename to doc/users/faq/environment_variables_faq.rst
index 76dd3696a3e6..36460ae1b0cd 100644
--- a/doc/faq/environment_variables_faq.rst
+++ b/doc/users/faq/environment_variables_faq.rst
@@ -1,20 +1,14 @@
 .. _environment-variables:
 
+.. redirect-from:: /faq/environment_variables_faq
+
 *********************
-Environment Variables
+Environment variables
 *********************
 
 .. contents::
    :backlinks: none
 
-
-.. envvar:: DISPLAY
-
-  The server and screen on which to place windows. This is interpreted by GUI
-  toolkits in a backend-specific manner, but generally refers to an `X.org
-  display name
-  <https://www.x.org/releases/X11R7.7/doc/man/man7/X.7.xhtml#heading5>`_.
-
 .. envvar:: HOME
 
   The user's home directory. On Linux, :envvar:`~ <HOME>` is shorthand for :envvar:`HOME`.
@@ -35,6 +29,13 @@ Environment Variables
   used to find a base directory in which the :file:`matplotlib` subdirectory is
   created.
 
+.. envvar:: MPLSETUPCFG
+
+   This optional variable can be set to the full path of a :file:`mplsetup.cfg`
+   configuration file used to customize the Matplotlib build.  By default, a
+   :file:`mplsetup.cfg` file in the root of the Matplotlib source tree will be
+   read.  Supported build options are listed in :file:`mplsetup.cfg.template`.
+
 .. envvar:: PATH
 
   The list of directories searched to find executable programs.
@@ -81,7 +82,7 @@ searched first or last?  To append to an existing environment variable::
   setenv PATH ${PATH}:~/bin  # csh/tcsh
 
 To make your changes available in the future, add the commands to your
-:file:`~/.bashrc`/:file:`.cshrc` file.
+:file:`~/.bashrc` or :file:`~/.cshrc` file.
 
 .. _setting-windows-environment-variables:
 
diff --git a/doc/users/faq/howto_faq.rst b/doc/users/faq/howto_faq.rst
new file mode 100644
index 000000000000..4ea220d969b0
--- /dev/null
+++ b/doc/users/faq/howto_faq.rst
@@ -0,0 +1,309 @@
+.. _howto-faq:
+
+.. redirect-from:: /faq/howto_faq
+
+******
+How-to
+******
+
+.. contents::
+   :backlinks: none
+
+
+.. _how-to-too-many-ticks:
+
+Why do I have so many ticks, and/or why are they out of order?
+--------------------------------------------------------------
+
+One common cause for unexpected tick behavior is passing a *list of strings
+instead of numbers or datetime objects*. This can easily happen without notice
+when reading in a comma-delimited text file. Matplotlib treats lists of strings
+as *categorical* variables
+(:doc:`/gallery/lines_bars_and_markers/categorical_variables`), and by default
+puts one tick per category, and plots them in the order in which they are
+supplied.
+
+.. plot::
+    :include-source:
+    :align: center
+
+    import matplotlib.pyplot as plt
+    import numpy as np
+
+    fig, ax = plt.subplots(1, 2, constrained_layout=True, figsize=(6, 2))
+
+    ax[0].set_title('Ticks seem out of order / misplaced')
+    x = ['5', '20', '1', '9']  # strings
+    y = [5, 20, 1, 9]
+    ax[0].plot(x, y, 'd')
+    ax[0].tick_params(axis='x', labelcolor='red', labelsize=14)
+
+    ax[1].set_title('Many ticks')
+    x = [str(xx) for xx in np.arange(100)]  # strings
+    y = np.arange(100)
+    ax[1].plot(x, y)
+    ax[1].tick_params(axis='x', labelcolor='red', labelsize=14)
+
+The solution is to convert the list of strings to numbers or
+datetime objects (often ``np.asarray(numeric_strings, dtype='float')`` or
+``np.asarray(datetime_strings, dtype='datetime64[s]')``).
+
+For more information see :doc:`/gallery/ticks/ticks_too_many`.
+
+.. _howto-determine-artist-extent:
+
+Determine the extent of Artists in the Figure
+---------------------------------------------
+
+Sometimes we want to know the extent of an Artist.  Matplotlib `.Artist` objects
+have a method `.Artist.get_window_extent` that will usually return the extent of
+the artist in pixels.  However, some artists, in particular text, must be
+rendered at least once before their extent is known.  Matplotlib supplies
+`.Figure.draw_without_rendering`, which should be called before calling
+``get_window_extent``.
+
+.. _howto-figure-empty:
+
+Check whether a figure is empty
+-------------------------------
+Empty can actually mean different things. Does the figure contain any artists?
+Does a figure with an empty `~.axes.Axes` still count as empty? Is the figure
+empty if it was rendered pure white (there may be artists present, but they
+could be outside the drawing area or transparent)?
+
+For the purpose here, we define empty as: "The figure does not contain any
+artists except it's background patch." The exception for the background is
+necessary, because by default every figure contains a `.Rectangle` as it's
+background patch. This definition could be checked via::
+
+    def is_empty(figure):
+        """
+        Return whether the figure contains no Artists (other than the default
+        background patch).
+        """
+        contained_artists = figure.get_children()
+        return len(contained_artists) <= 1
+
+We've decided not to include this as a figure method because this is only one
+way of defining empty, and checking the above is only rarely necessary.
+Usually the user or program handling the figure know if they have added
+something to the figure.
+
+Checking whether a figure would render empty cannot be reliably checked except
+by actually rendering the figure and investigating the rendered result.
+
+.. _howto-findobj:
+
+Find all objects in a figure of a certain type
+----------------------------------------------
+
+Every Matplotlib artist (see :doc:`/tutorials/intermediate/artists`) has a method
+called :meth:`~matplotlib.artist.Artist.findobj` that can be used to
+recursively search the artist for any artists it may contain that meet
+some criteria (e.g., match all :class:`~matplotlib.lines.Line2D`
+instances or match some arbitrary filter function).  For example, the
+following snippet finds every object in the figure which has a
+``set_color`` property and makes the object blue::
+
+    def myfunc(x):
+        return hasattr(x, 'set_color')
+
+    for o in fig.findobj(myfunc):
+        o.set_color('blue')
+
+You can also filter on class instances::
+
+    import matplotlib.text as text
+    for o in fig.findobj(text.Text):
+        o.set_fontstyle('italic')
+
+.. _howto-suppress_offset:
+
+Prevent ticklabels from having an offset
+----------------------------------------
+The default formatter will use an offset to reduce
+the length of the ticklabels.  To turn this feature
+off on a per-axis basis::
+
+   ax.get_xaxis().get_major_formatter().set_useOffset(False)
+
+set :rc:`axes.formatter.useoffset`, or use a different
+formatter.  See :mod:`~matplotlib.ticker` for details.
+
+.. _howto-transparent:
+
+Save transparent figures
+------------------------
+
+The :meth:`~matplotlib.pyplot.savefig` command has a keyword argument
+*transparent* which, if 'True', will make the figure and axes
+backgrounds transparent when saving, but will not affect the displayed
+image on the screen.
+
+If you need finer grained control, e.g., you do not want full transparency
+or you want to affect the screen displayed version as well, you can set
+the alpha properties directly.  The figure has a
+:class:`~matplotlib.patches.Rectangle` instance called *patch*
+and the axes has a Rectangle instance called *patch*.  You can set
+any property on them directly (*facecolor*, *edgecolor*, *linewidth*,
+*linestyle*, *alpha*).  e.g.::
+
+    fig = plt.figure()
+    fig.patch.set_alpha(0.5)
+    ax = fig.add_subplot(111)
+    ax.patch.set_alpha(0.5)
+
+If you need *all* the figure elements to be transparent, there is
+currently no global alpha setting, but you can set the alpha channel
+on individual elements, e.g.::
+
+   ax.plot(x, y, alpha=0.5)
+   ax.set_xlabel('volts', alpha=0.5)
+
+.. _howto-multipage:
+
+Save multiple plots to one pdf file
+-----------------------------------
+
+Many image file formats can only have one image per file, but some formats
+support multi-page files.  Currently, Matplotlib only provides multi-page
+output to pdf files, using either the pdf or pgf backends, via the
+`.backend_pdf.PdfPages` and `.backend_pgf.PdfPages` classes.
+
+.. _howto-auto-adjust:
+
+Make room for tick labels
+-------------------------
+
+By default, Matplotlib uses fixed percentage margins around subplots. This can
+lead to labels overlapping or being cut off at the figure boundary. There are
+multiple ways to fix this:
+
+- Manually adapt the subplot parameters using `.Figure.subplots_adjust` /
+  `.pyplot.subplots_adjust`.
+- Use one of the automatic layout mechanisms:
+
+  - constrained layout (:doc:`/tutorials/intermediate/constrainedlayout_guide`)
+  - tight layout (:doc:`/tutorials/intermediate/tight_layout_guide`)
+
+- Calculate good values from the size of the plot elements yourself
+  (:doc:`/gallery/subplots_axes_and_figures/auto_subplots_adjust`)
+
+.. _howto-align-label:
+
+Align my ylabels across multiple subplots
+-----------------------------------------
+
+If you have multiple subplots over one another, and the y data have
+different scales, you can often get ylabels that do not align
+vertically across the multiple subplots, which can be unattractive.
+By default, Matplotlib positions the x location of the ylabel so that
+it does not overlap any of the y ticks.  You can override this default
+behavior by specifying the coordinates of the label.  The example
+below shows the default behavior in the left subplots, and the manual
+setting in the right subplots.
+
+.. figure:: ../../gallery/text_labels_and_annotations/images/sphx_glr_align_ylabels_001.png
+   :target: ../../gallery/text_labels_and_annotations/align_ylabels.html
+   :align: center
+   :scale: 50
+
+.. _howto-set-zorder:
+
+Control the draw order of plot elements
+---------------------------------------
+
+The draw order of plot elements, and thus which elements will be on top, is
+determined by the `~.Artist.set_zorder` property.
+See :doc:`/gallery/misc/zorder_demo` for a detailed description.
+
+.. _howto-axis-equal:
+
+Make the aspect ratio for plots equal
+-------------------------------------
+
+The Axes property :meth:`~matplotlib.axes.Axes.set_aspect` controls the
+aspect ratio of the axes.  You can set it to be 'auto', 'equal', or
+some ratio which controls the ratio::
+
+  ax = fig.add_subplot(111, aspect='equal')
+
+.. only:: html
+
+    See :doc:`/gallery/subplots_axes_and_figures/axis_equal_demo` for a
+    complete example.
+
+.. _howto-twoscale:
+
+Draw multiple y-axis scales
+---------------------------
+
+A frequent request is to have two scales for the left and right
+y-axis, which is possible using :func:`~matplotlib.pyplot.twinx` (more
+than two scales are not currently supported, though it is on the wish
+list).  This works pretty well, though there are some quirks when you
+are trying to interactively pan and zoom, because both scales do not get
+the signals.
+
+The approach uses :func:`~matplotlib.pyplot.twinx` (and its sister
+:func:`~matplotlib.pyplot.twiny`) to use *2 different axes*,
+turning the axes rectangular frame off on the 2nd axes to keep it from
+obscuring the first, and manually setting the tick locs and labels as
+desired.  You can use separate ``matplotlib.ticker`` formatters and
+locators as desired because the two axes are independent.
+
+.. plot::
+
+    import numpy as np
+    import matplotlib.pyplot as plt
+
+    fig = plt.figure()
+    ax1 = fig.add_subplot(111)
+    t = np.arange(0.01, 10.0, 0.01)
+    s1 = np.exp(t)
+    ax1.plot(t, s1, 'b-')
+    ax1.set_xlabel('time (s)')
+    ax1.set_ylabel('exp')
+
+    ax2 = ax1.twinx()
+    s2 = np.sin(2*np.pi*t)
+    ax2.plot(t, s2, 'r.')
+    ax2.set_ylabel('sin')
+    plt.show()
+
+
+.. only:: html
+
+    See :doc:`/gallery/subplots_axes_and_figures/two_scales` for a
+    complete example.
+
+.. _howto-batch:
+
+Generate images without having a window appear
+----------------------------------------------
+
+Simply do not call `~matplotlib.pyplot.show`, and directly save the figure to
+the desired format::
+
+    import matplotlib.pyplot as plt
+    plt.plot([1, 2, 3])
+    plt.savefig('myfig.png')
+
+.. seealso::
+
+    :doc:`/gallery/user_interfaces/web_application_server_sgskip` for
+    information about running matplotlib inside of a web application.
+
+.. _how-to-threads:
+
+Work with threads
+-----------------
+
+Matplotlib is not thread-safe: in fact, there are known race conditions
+that affect certain artists.  Hence, if you work with threads, it is your
+responsibility to set up the proper locks to serialize access to Matplotlib
+artists.
+
+You may be able to work on separate figures from separate threads.  However,
+you must in that case use a *non-interactive backend* (typically Agg), because
+most GUI backends *require* being run from the main thread as well.
diff --git a/doc/faq/index.rst b/doc/users/faq/index.rst
similarity index 53%
rename from doc/faq/index.rst
rename to doc/users/faq/index.rst
index bf71718e622b..636c90904aba 100644
--- a/doc/faq/index.rst
+++ b/doc/users/faq/index.rst
@@ -1,20 +1,21 @@
 .. _faq-index:
 
-##################
-The Matplotlib FAQ
-##################
+.. redirect-from:: /faq/index
+
+##########################
+How-to and troubleshooting
+##########################
 
 .. only:: html
 
    :Release: |version|
    :Date: |today|
 
-   Frequently asked questions about matplotlib
+   Frequently asked questions about Matplotlib:
 
 .. toctree::
    :maxdepth: 2
 
-   installing_faq.rst
    howto_faq.rst
    troubleshooting_faq.rst
    environment_variables_faq.rst
diff --git a/doc/faq/troubleshooting_faq.rst b/doc/users/faq/troubleshooting_faq.rst
similarity index 92%
rename from doc/faq/troubleshooting_faq.rst
rename to doc/users/faq/troubleshooting_faq.rst
index f0644003201b..db1c39319933 100644
--- a/doc/faq/troubleshooting_faq.rst
+++ b/doc/users/faq/troubleshooting_faq.rst
@@ -1,5 +1,7 @@
 .. _troubleshooting-faq:
 
+.. redirect-from:: /faq/troubleshooting_faq
+
 ***************
 Troubleshooting
 ***************
@@ -46,10 +48,10 @@ locate your :file:`matplotlib/` configuration directory, use
     >>> mpl.get_configdir()
     '/home/darren/.config/matplotlib'
 
-On unix-like systems, this directory is generally located in your
+On Unix-like systems, this directory is generally located in your
 :envvar:`HOME` directory under the :file:`.config/` directory.
 
-In addition, users have a cache directory. On unix-like systems, this is
+In addition, users have a cache directory. On Unix-like systems, this is
 separate from the configuration directory by default. To locate your
 :file:`.cache/` directory, use :func:`matplotlib.get_cachedir`::
 
@@ -57,7 +59,7 @@ separate from the configuration directory by default. To locate your
     >>> mpl.get_cachedir()
     '/home/darren/.cache/matplotlib'
 
-On windows, both the config directory and the cache directory are
+On Windows, both the config directory and the cache directory are
 the same and are in your :file:`Documents and Settings` or :file:`Users`
 directory by default::
 
@@ -82,18 +84,19 @@ Getting help
 There are a number of good resources for getting help with Matplotlib.
 There is a good chance your question has already been asked:
 
-- The `mailing list archive <http://matplotlib.1069221.n5.nabble.com/>`_.
+- The `mailing list archive
+  <https://discourse.matplotlib.org/c/community/matplotlib-users/6>`_.
 
 - `GitHub issues <https://github.com/matplotlib/matplotlib/issues>`_.
 
 - Stackoverflow questions tagged `matplotlib
-  <http://stackoverflow.com/questions/tagged/matplotlib>`_.
+  <https://stackoverflow.com/questions/tagged/matplotlib>`_.
 
 If you are unable to find an answer to your question through search, please
 provide the following information in your e-mail to the `mailing list
 <https://mail.python.org/mailman/listinfo/matplotlib-users>`_:
 
-* Your operating system (Linux/UNIX users: post the output of ``uname -a``).
+* Your operating system (Linux/Unix users: post the output of ``uname -a``).
 
 * Matplotlib version::
 
diff --git a/doc/users/getting_started/index.rst b/doc/users/getting_started/index.rst
new file mode 100644
index 000000000000..4b90ab09b860
--- /dev/null
+++ b/doc/users/getting_started/index.rst
@@ -0,0 +1,55 @@
+Getting started
+===============
+
+Installation quick-start
+------------------------
+
+.. grid:: 1 1 2 2
+
+    .. grid-item::
+
+        Install using `pip <https://pypi.org/project/matplotlib>`__:
+
+        .. code-block:: bash
+
+            pip install matplotlib
+
+    .. grid-item::
+
+        Install using `conda <https://docs.continuum.io/anaconda/>`__:
+
+        .. code-block:: bash
+
+            conda install matplotlib
+
+Further details are available in the :doc:`Installation Guide </users/installing/index>`.
+
+
+Draw a first plot
+-----------------
+
+Here is a minimal example plot:
+
+.. plot::
+   :include-source:
+   :align: center
+
+   import matplotlib.pyplot as plt
+   import numpy as np
+
+   x = np.linspace(0, 2 * np.pi, 200)
+   y = np.sin(x)
+
+   fig, ax = plt.subplots()
+   ax.plot(x, y)
+   plt.show()
+
+If a plot does not show up please check :ref:`troubleshooting-faq`.
+
+Where to go next
+----------------
+
+- Check out :doc:`Plot types </plot_types/index>` to get an overview of the
+  types of plots you can create with Matplotlib.
+- Learn Matplotlib from the ground up in the
+  :doc:`Quick-start guide </tutorials/introductory/quick_start>`.
diff --git a/doc/users/github_stats.rst b/doc/users/github_stats.rst
index d67ec55f2bde..3aa48834b0f3 100644
--- a/doc/users/github_stats.rst
+++ b/doc/users/github_stats.rst
@@ -1,1181 +1,158 @@
 .. _github-stats:
 
-GitHub Stats
-============
+GitHub statistics for 3.6.2 (Nov 02, 2022)
+==========================================
 
-GitHub stats for 2020/07/16 - 2021/03/25 (tag: v3.3.0)
+GitHub statistics for 2022/10/08 (tag: v3.6.1) - 2022/11/02
 
 These lists are automatically generated, and may be incomplete or contain duplicates.
 
-We closed 204 issues and merged 772 pull requests.
-The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/53?closed=1>`__
+We closed 21 issues and merged 86 pull requests.
+The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/75?closed=1>`__
 
-The following 177 authors contributed 3852 commits.
+The following 22 authors contributed 27 commits.
 
-* A N U S H
-* Adam Brown
-* Aditya Malhotra
-* aflah02
-* Aitik Gupta
-* Alejandro García
-* Alex Henrie
-* Alexander Schlüter
-* Alexis de Almeida Coutinho
-* Andreas C Mueller
-* andrzejnovak
 * Antony Lee
-* Arthur Milchior
-* bakes
-* BAKEZQ
-* BaoGiang HoangVu
-* Ben Root
-* BH4
-* Bradley Dice
-* Braxton Lamey
-* Brian McFee
-* Bruno Beltran
-* Bryan Kok
-* Byron Boulton
-* Carsten Schelp
-* ceelo777
-* Charles
-* CharlesHe16
-* Christian Baumann
-* Contextualist
-* DangoMelon
-* Daniel
-* Daniel Ingram
-* David Meyer
-* David Stansby
-* David Young
-* deep-jkl
-* Diego Leal
-* Dr. Thomas A Caswell
-* Dylan Cutler
-* Eben Pendleton
-* EBenkler
-* ebenp
-* ecotner
+* Carsten Schnober
+* dependabot[bot]
 * Elliott Sales de Andrade
-* Emily FY
-* Eric Firing
-* Eric Larson
-* Eric Prestat
-* Erik Benkler
-* Evan Berkowitz
-* Ewan Sutherland
-* Federico Ariza
-* Forrest
-* Frank Sauerburger
-* FrankTheCodeMonkey
-* Greg Lucas
 * hannah
-* Harry Knight
-* Harsh Sharma
-* Hassan Kibirige
-* Hugo van Kemenade
-* Iain-S
-* Ian Hunt-Isaak
-* Ian Thomas
-* ianhi
-* Ilya V. Schurov
-* ImportanceOfBeingErnest
-* Isuru Fernando
-* ItsRLuo
-* J. Scott Berg
+* j1642
+* Jaco Verster
+* jacoverster
 * Jae-Joon Lee
-* Jakub Klus
-* Janakarajan Natarajan
-* Jann Paul Mattern
-* jbhopkins
-* jeetvora331
-* Jerome F. Villegas
-* Jerome Villegas
-* jfbu
-* Jirka Hladky
+* Jeffrey Aaron Paul
+* jeffreypaul15
 * Jody Klymak
-* Johan von Forstner
-* johan12345
-* john imperial
-* John Losito
-* John Peloquin
-* johnthagen
-* Jouni K. Seppänen
-* Kate Perkins
-* kate-perkins
-* katrielester
-* kolibril13
-* kwgchi
-* Lee Johnston
-* Leo Singer
-* linchiwei123
-* Lucy Liu
-* luz paz
-* luzpaz
-* Léonard Gérard
-* majorwitty
-* mansoor96g
-* Maria Ilie
-* Maria-Alexandra Ilie
-* Marianne Corvellec
-* Mark Harfouche
-* Martin Spacek
-* Mary Chris Go
-* Matthew Petroff
-* Matthias Bussonnier
-* Matthias Geier
-* Max Chen
-* McToel
-* Michael Grupp
-* Michaël Defferrard
-* Mihai Anton
-* Mohammad Aflah Khan
-* Neilzon Viloria
-* neok-m4700
-* Nora Moseman
-* Pamela Wu
-* pankajchetry1168
-* Petar Mlinarić
-* Peter Williams
-* Phil Nagel
-* philip-sparks
-* Philipp Arras
-* Philipp Nagel
-* Pratyush Raj
-* Péter Leéh
-* rajpratyush
-* Randall Ung
-* reshamas
-* Rezangyal
-* Richard Sheridan
-* richardsheridan
-* Rob McDonald
-* Rohit Rawat
-* Ruben Verweij
+* Kostya Farber
+* Kyle Sunden
+* Martok
+* Muhammad Abdur Rakib
+* Oscar Gustafsson
+* Pavel Grunt
 * Ruth Comer
-* Ryan May
-* Sam Tygier
-* shawnchen
-* shawnchen1996
-* ShawnChen1996
-* Sidharth Bansal
-* Srihitha Maryada
-* Stephen Sinclair
-* Struan Murray
-* Theodor Athanasiadis
 * Thomas A Caswell
-* Thorvald Johannessen
-* Tim Gates
+* Tiger Nie
 * Tim Hoffmann
-* Tobias Hangleiter
-* tohc1
-* Tom Charrett
-* Tom Neep
-* Tomas Fiers
-* ulijh
-* Ulrich J. Herter
-* Utkarshp1
-* Uwe F. Mayer
-* Valentin Valls
-* Vincent Cuenca
-* Vineyard
-* Vlas Sokolov
-* Xianxiang Li
-* xlilos
-* Ye Chang
-* Yichao Yu
-* yozhikoff
-* Yun Liu
-* z0rgy
-* zitorelova
 
 GitHub issues and pull requests:
 
-Pull Requests (772):
-
-* :ghpull:`19775`: Fix deprecation for imread on URLs.
-* :ghpull:`19772`: Backport PR #19535 on branch v3.4.x (Fix example's BasicUnit array conversion.)
-* :ghpull:`19771`: Backport PR #19757 on branch v3.4.x (Fixed python -mpip typo)
-* :ghpull:`19770`: Backport PR #19739 on branch v3.4.x (Changed 'python -mpip' to 'python -m pip' for consistency)
-* :ghpull:`19535`: Fix example's BasicUnit array conversion.
-* :ghpull:`19767`: Backport PR #19766 on branch v3.4.x (Set colormap modification removal to 3.6.)
-* :ghpull:`19766`: Set colormap modification removal to 3.6.
-* :ghpull:`19764`: Backport PR #19762 on branch v3.4.x (FIX: do not report that webagg supports blitting)
-* :ghpull:`19762`: FIX: do not report that webagg supports blitting
-* :ghpull:`19689`: Prepare API docs for v3.4.0
-* :ghpull:`19761`: Backport PR #19746 on branch v3.4.x (Fix resizing in nbAgg.)
-* :ghpull:`19746`: Fix resizing in nbAgg.
-* :ghpull:`19757`: Fixed python -mpip typo
-* :ghpull:`19739`: Changed 'python -mpip' to 'python -m pip' for consistency
-* :ghpull:`19713`: DOC: Prepare What's new page for 3.4.0.
-* :ghpull:`19742`: Backport PR #19741 on branch v3.4.x (Only override pickradius when picker is not a bool.)
-* :ghpull:`19741`: Only override pickradius when picker is not a bool.
-* :ghpull:`19726`: Backport PR #19505 on branch v3.4.x (Move some advanced documentation away from Installation Guide)
-* :ghpull:`19505`: Move some advanced documentation away from Installation Guide
-* :ghpull:`19712`: Backport PR #19707 on branch v3.4.x (DOC: fix dx in Arrow guide)
-* :ghpull:`19711`: Backport PR #19709 on branch v3.4.x (Fix arrow_guide.py typo)
-* :ghpull:`19709`: Fix arrow_guide.py typo
-* :ghpull:`19707`: DOC: fix dx in Arrow guide
-* :ghpull:`19699`: Backport PR #19695 on branch v3.4.x (DOC: Increase size of headings)
-* :ghpull:`19695`: DOC: Increase size of headings
-* :ghpull:`19697`: Backport PR #19690 on branch v3.4.x (Only warn about existing redirects if content differs.)
-* :ghpull:`19690`: Only warn about existing redirects if content differs.
-* :ghpull:`19696`: Backport PR #19665 on branch v3.4.x (Changed FormatStrFormatter documentation to include how to get unicode minus)
-* :ghpull:`19680`: Backport PR #19402 on branch v3.4.x (Build aarch64 wheels)
-* :ghpull:`19678`: Backport PR #19671 on branch v3.4.x (Fix crash in early window raise in gtk3.)
-* :ghpull:`19671`: Fix crash in early window raise in gtk3.
-* :ghpull:`19665`: Changed FormatStrFormatter documentation to include how to get unicode minus
-* :ghpull:`19402`: Build aarch64 wheels
-* :ghpull:`19669`: Backport PR #19661 on branch v3.4.x (Fix CoC link)
-* :ghpull:`19668`: Backport PR #19663 on branch v3.4.x (ENH: add a copy method to colormaps)
-* :ghpull:`19663`: ENH: add a copy method to colormaps
-* :ghpull:`19661`: Fix CoC link
-* :ghpull:`19652`: Backport PR #19649 on branch v3.4.x (Use globals() instead of locals() for adding colormaps as names to cm module)
-* :ghpull:`19649`: Use globals() instead of locals() for adding colormaps as names to cm module
-* :ghpull:`19651`: Backport PR #19618 on branch v3.4.x (FIX: make the cache in font_manager._get_font keyed by thread id)
-* :ghpull:`19650`: Backport PR #19625 on branch v3.4.x (Restore _AxesStack to track a Figure's Axes order.)
-* :ghpull:`19647`: Backport PR #19645 on branch v3.4.x (Fix comment in RectangleSelector)
-* :ghpull:`19618`: FIX: make the cache in font_manager._get_font keyed by thread id
-* :ghpull:`19648`: Backport PR #19643 on branch v3.4.x (Don't turn check_for_pgf into public API.)
-* :ghpull:`19625`: Restore _AxesStack to track a Figure's Axes order.
-* :ghpull:`19643`: Don't turn check_for_pgf into public API.
-* :ghpull:`19645`: Fix comment in RectangleSelector
-* :ghpull:`19644`: Backport PR #19611 on branch v3.4.x (Fix double picks.)
-* :ghpull:`19611`: Fix double picks.
-* :ghpull:`19640`: Backport PR #19639 on branch v3.4.x (FIX: do not allow single element list of str in subplot_mosaic)
-* :ghpull:`19639`: FIX: do not allow single element list of str in subplot_mosaic
-* :ghpull:`19638`: Backport PR #19632 on branch v3.4.x (Fix handling of warn keyword in in Figure.show.)
-* :ghpull:`19637`: Backport PR #19582 on branch v3.4.x (Add kerning to single-byte strings in PDFs)
-* :ghpull:`19632`: Fix handling of warn keyword in in Figure.show.
-* :ghpull:`19582`: Add kerning to single-byte strings in PDFs
-* :ghpull:`19629`: Backport PR #19548 on branch v3.4.x (Increase tolerances for other arches.)
-* :ghpull:`19630`: Backport PR #19596 on branch v3.4.x (Fix for issue 17769: wx interactive figure close cause crash)
-* :ghpull:`19596`: Fix for issue 17769: wx interactive figure close cause crash
-* :ghpull:`19548`: Increase tolerances for other arches.
-* :ghpull:`19616`: Backport PR #19577 on branch v3.4.x (Fix "return"->"enter" mapping in key names.)
-* :ghpull:`19617`: Backport PR #19571 on branch v3.4.x (Fail early when setting Text color to a non-colorlike.)
-* :ghpull:`19615`: Backport PR #19583 on branch v3.4.x (FIX: check for a set during color conversion)
-* :ghpull:`19614`: Backport PR #19597 on branch v3.4.x (Fix IPython import issue)
-* :ghpull:`19613`: Backport PR #19546 on branch v3.4.x (Move unrendered README.wx to thirdpartypackages/index.rst.)
-* :ghpull:`19583`: FIX: check for a set during color conversion
-* :ghpull:`19597`: Fix IPython import issue
-* :ghpull:`19571`: Fail early when setting Text color to a non-colorlike.
-* :ghpull:`19595`: Backport PR #19589 on branch v3.4.x (Changes linestyle parameter of flierprops)
-* :ghpull:`19577`: Fix "return"->"enter" mapping in key names.
-* :ghpull:`19589`: Changes linestyle parameter of flierprops
-* :ghpull:`19592`: Backport PR #19587 on branch v3.4.x (DOC: fix plot_date doc)
-* :ghpull:`19587`: DOC: fix plot_date doc
-* :ghpull:`19580`: Backport PR #19456 on branch v3.4.x (Doc implement reredirects)
-* :ghpull:`19579`: Backport PR #19567 on branch v3.4.x (DOC: fix typos)
-* :ghpull:`19456`: Doc implement reredirects
-* :ghpull:`19567`: DOC: fix typos
-* :ghpull:`19542`: Backport PR #19532 on branch v3.4.x (Add note on interaction between text wrapping and bbox_inches='tight')
-* :ghpull:`19549`: Backport PR #19545 on branch v3.4.x (Replace references to pygtk by pygobject in docs.)
-* :ghpull:`19546`: Move unrendered README.wx to thirdpartypackages/index.rst.
-* :ghpull:`19545`: Replace references to pygtk by pygobject in docs.
-* :ghpull:`19532`: Add note on interaction between text wrapping and bbox_inches='tight'
-* :ghpull:`19541`: MAINT: fix typo from #19438
-* :ghpull:`19480`: Fix CallbackRegistry memory leak
-* :ghpull:`19539`: In scatter, fix single rgb edgecolors handling
-* :ghpull:`19438`: FIX: restore creating new axes via plt.subplot with different kwargs
-* :ghpull:`18436`: Sync 3D errorbar with 2D
-* :ghpull:`19472`: Fix default label visibility for top-or-left-labeled shared subplots().
-* :ghpull:`19496`: MNT: Restore auto-adding Axes3D to their parent figure on init
-* :ghpull:`19533`: Clarify the animated property and reword blitting tutorial a bit
-* :ghpull:`19146`: Fix #19128: webagg reports incorrect values for non-alphanumeric key events on non-qwerty keyboards
-* :ghpull:`18068`: Add note on writing binary formats to stdout using savefig()
-* :ghpull:`19507`: FIX: ensure we import when the user cwd does not exist
-* :ghpull:`19413`: FIX: allow add option for Axes3D(fig)
-* :ghpull:`19498`: Dedupe implementations of {XAxis,YAxis}._get_tick_boxes_siblings.
-* :ghpull:`19502`: Prefer projection="polar" over polar=True.
-* :ghpull:`18480`: Clarify color priorities in collections
-* :ghpull:`19501`: Fix text position with usetex and xcolor
-* :ghpull:`19460`: Implement angles for bracket arrow styles.
-* :ghpull:`18408`: FIX/API: ``fig.canvas.draw`` always updates internal state
-* :ghpull:`19504`: Remove remaining references to Travis CI
-* :ghpull:`13358`: 3D margins consistency  for mplot3d (isometric projection)
-* :ghpull:`19529`: Simplify checking for tex packages.
-* :ghpull:`19516`: Ignore files from annotate coverage reports
-* :ghpull:`19500`: Remove workaround for numpy<1.16, and update version check.
-* :ghpull:`19518`: Skip setting up a tmpdir in tests that don't need one.
-* :ghpull:`19514`: DOC: add fixed-aspect colorbar examples
-* :ghpull:`19511`: Clarify axes.autolimit_mode rcParam.
-* :ghpull:`19503`: Fix tight_layout() on "canvasless" figures.
-* :ghpull:`19410`: Set the GTK background color to white.
-* :ghpull:`19497`: Add overset/underset whatsnew entry
-* :ghpull:`19490`: Fix error message in plt.close().
-* :ghpull:`19461`: Move ToolManager warnings to rcParam validator
-* :ghpull:`19488`: Prefer ``tr1-tr2`` to ``tr1+tr2.inverted()``.
-* :ghpull:`19485`: fix regression of axline behavior with non-linear scales
-* :ghpull:`19314`: Fix over/under mathtext symbols
-* :ghpull:`19468`: Include tex output in pdf LatexError.
-* :ghpull:`19478`: Fix trivial typo in error message.
-* :ghpull:`19449`: Switch array-like (M, N) to (M, N) array-like.
-* :ghpull:`19459`: Merge v3.3.4 into master
-* :ghpull:`18746`: Make figure parameter optional when constructing canvases.
-* :ghpull:`19455`: Add note that pyplot cannot be used for 3D.
-* :ghpull:`19457`: Use absolute link for discourse
-* :ghpull:`19440`: Slightly reorganize api docs.
-* :ghpull:`19344`: Improvements to Docs for new contributors
-* :ghpull:`19435`: Replace gtk3 deprecated APIs that have simple replacements.
-* :ghpull:`19452`: Fix the docstring of draw_markers to match the actual behavior.
-* :ghpull:`19448`: Remove unnecessary facecolor cache in Patch3D.
-* :ghpull:`19396`: CI: remove win prerelease azure + add py39
-* :ghpull:`19426`: Support empty stairs.
-* :ghpull:`19399`: Fix empty Poly3DCollections
-* :ghpull:`19416`: fixes TypeError constructor returned NULL in wayland session
-* :ghpull:`19439`: Move cheatsheet focus to the cheatsheets away
-* :ghpull:`19425`: Add units to bar_label padding documentation.
-* :ghpull:`19422`: Style fixes to triintepolate docs.
-* :ghpull:`19421`: Switch to documenting generic collections in lowercase.
-* :ghpull:`19411`: DOC: fix incorrect parameter names
-* :ghpull:`19387`: Fix CSS table header layout
-* :ghpull:`18683`: Better document font.<generic-family> rcParams entries.
-* :ghpull:`19418`: BF: DOCS: fix slash for windows in conf.py
-* :ghpull:`18544`: REORG: JoinStyle and CapStyle classes
-* :ghpull:`19415`: Make TaggedValue in basic_units a sequence
-* :ghpull:`19412`: DOC: correct off by one indentation.
-* :ghpull:`19407`: Improve doc of default labelpad.
-* :ghpull:`19373`: test for align_ylabel bug with constrained_layout
-* :ghpull:`19347`: os.environ-related cleanups.
-* :ghpull:`19319`: DOC: make canonical version stable
-* :ghpull:`19395`: wx: Use integers in more places
-* :ghpull:`17850`: MNT: set the facecolor of nofill markers
-* :ghpull:`19334`: Fix qt backend on mac big sur
-* :ghpull:`19394`: Don't allow pyzmq 22.0.0 on AppVeyor.
-* :ghpull:`19367`: Deprecate imread() reading from URLs
-* :ghpull:`19341`: MarkerStyle is considered immutable
-* :ghpull:`19337`: Move sphinx extension files into mpl-data.
-* :ghpull:`19389`: Temporarily switch intersphinx to latest pytest.
-* :ghpull:`19390`: Doc: Minor formatting
-* :ghpull:`19383`: Always include sample_data in installs.
-* :ghpull:`19378`: Modify indicate_inset default label value
-* :ghpull:`19357`: Shorten/make more consistent the half-filled marker definitions.
-* :ghpull:`18649`: Deprecate imread() reading from URLs
-* :ghpull:`19370`: Force classic ("auto") date converter in classic style.
-* :ghpull:`19364`: Fix trivial doc typos.
-* :ghpull:`19359`: Replace use of pyplot with OO api in some examples
-* :ghpull:`19342`: FIX: fix bbox_inches=tight and constrained layout bad interaction
-* :ghpull:`19350`: Describe how to test regular installations of Matplotlib
-* :ghpull:`19332`: Prefer concatenate to h/vstack in simple cases.
-* :ghpull:`19340`: Remove the deprecated rcParams["datapath"].
-* :ghpull:`19326`: Whitespace in Choosing Colormaps tutorial plots
-* :ghpull:`16417`: Deprecate rcParams["datapath"] in favor of mpl.get_data_path().
-* :ghpull:`19336`: Revert "Deprecate setting Line2D's pickradius via set_picker."
-* :ghpull:`19153`: MNT: Remove deprecated axes kwargs collision detection (version 2)
-* :ghpull:`19330`: Remove register storage class from Agg files.
-* :ghpull:`19324`: Improve FT2Font docstrings.
-* :ghpull:`19328`: Explain annotation behavior when used in conjunction with arrows
-* :ghpull:`19329`: Fix building against system qhull
-* :ghpull:`19331`: Skip an ImageMagick test if ffmpeg is unavailable.
-* :ghpull:`19333`: Fix PGF with special character paths.
-* :ghpull:`19322`: Improve docs of _path C-extension.
-* :ghpull:`19317`: Pin to oldest supported PyQt on minver CI instance.
-* :ghpull:`19315`: Update the markers part of matplotlib.pyplot.plot document (fix issue #19274)
-* :ghpull:`18978`: API: Remove deprecated axes kwargs collision detection
-* :ghpull:`19306`: Fix some packaging issues
-* :ghpull:`19291`: Cleanup code for format processing
-* :ghpull:`19316`: Simplify X11 checking for Qt.
-* :ghpull:`19287`: Speedup LinearSegmentedColormap.from_list.
-* :ghpull:`19293`: Fix some docstring interpolations
-* :ghpull:`19313`: Add missing possible return value to docs of get_verticalalignment()
-* :ghpull:`18916`: Add overset and underset support for mathtext
-* :ghpull:`18126`: FIX: Allow deepcopy on norms and scales
-* :ghpull:`19281`: Make all transforms copiable (and thus scales, too).
-* :ghpull:`19294`: Deprecate project argument to Line3DCollection.draw.
-* :ghpull:`19307`: DOC: remove stray assignment in "multiple legends" example
-* :ghpull:`19303`: Extended the convolution filter for correct dilation
-* :ghpull:`19261`: Add machinery for png-only, single-font mathtext tests.
-* :ghpull:`16571`: Update Qhull to 2019.1 reentrant version
-* :ghpull:`16720`: Download qhull at build-or-sdist time.
-* :ghpull:`18653`: ENH: Add func norm
-* :ghpull:`19272`: Strip irrelevant information from testing docs
-* :ghpull:`19298`: Fix misplaced colon in bug report template.
-* :ghpull:`19297`: Clarify return format of Line2D.get_data.
-* :ghpull:`19277`: Warn on redundant definition of plot properties
-* :ghpull:`19278`: Cleanup and document _plot_args()
-* :ghpull:`19282`: Remove the unused TransformNode._gid.
-* :ghpull:`19264`: Expand on slider_demo example
-* :ghpull:`19244`: Move cbook._check_isinstance() to _api.check_isinstance()
-* :ghpull:`19273`: Use proper pytest functionality for warnings and exceptions
-* :ghpull:`19262`: more robust check for enter key in TextBox
-* :ghpull:`19249`: Clarify Doc for Secondary axis, ad-hoc example
-* :ghpull:`19248`: Make return value of _get_patch_verts always an array.
-* :ghpull:`19247`: Fix markup for mplot3d example.
-* :ghpull:`19216`: Ignore non-draw codes when calculating path extent
-* :ghpull:`19215`: Collect information for setting up a development environment
-* :ghpull:`19210`: Fix creation of AGG images bigger than 1024**3 pixels
-* :ghpull:`18933`: Set clip path for PostScript texts.
-* :ghpull:`19162`: Deprecate cbook.warn_deprecated and move internal calls to _api.warn_deprecated
-* :ghpull:`16391`: Re-write sym-log-norm
-* :ghpull:`19240`: FIX: process lists for inverse norms
-* :ghpull:`18737`: Fix data cursor for images with additional transform
-* :ghpull:`18642`: Propagate minpos from Collections to Axes.datalim
-* :ghpull:`19242`: Update first occurrence of QT to show both 4 and 5
-* :ghpull:`19231`: Add reference section to all statistics examples
-* :ghpull:`19217`: Request an autoscale at the end of ax.pie()
-* :ghpull:`19176`: Deprecate additional positional args to plot_{surface,wireframe}.
-* :ghpull:`19063`: Give plot_directive output a ``max-width: 100%``
-* :ghpull:`19187`: Support callable for formatting of Sankey labels
-* :ghpull:`19220`: Remove one TOC level from the release guide
-* :ghpull:`19212`: MNT: try to put more whitespace in welcome message
-* :ghpull:`19155`: Consolidated the Install from Source docs
-* :ghpull:`19208`: added version ask/hint to issue templates, grammar on pr bot
-* :ghpull:`19185`: Document Triangulation.triangles
-* :ghpull:`19181`: Remove unused imports
-* :ghpull:`19207`: Fix Grouper example code
-* :ghpull:`19204`: Clarify Date Format Example
-* :ghpull:`19200`: Fix incorrect statement regarding test images cache size.
-* :ghpull:`19198`: Fix link in contrbuting docs
-* :ghpull:`19196`: Fix PR welcome action
-* :ghpull:`19188`: Cleanup comparision between X11/CSS4 and xkcd colors
-* :ghpull:`19194`: Fix trivial quiver doc typo.
-* :ghpull:`19180`: Fix Artist.remove_callback()
-* :ghpull:`19192`: Fixed part of Issue - #19100, changed documentation for axisartist
-* :ghpull:`19179`: Check that no new figures are created in image comparison tests
-* :ghpull:`19184`: Minor doc cleanup
-* :ghpull:`19093`: DOCS: Specifying Colors tutorial format & arrange
-* :ghpull:`17107`: Add Spines class as a container for all Axes spines
-* :ghpull:`18829`: Create a RangeSlider widget
-* :ghpull:`18873`: Getting Started GSoD
-* :ghpull:`19175`: Fix axes direction for a floating axisartist
-* :ghpull:`19130`: DOC: remove reference to 2.2.x branches from list of active branches
-* :ghpull:`15212`: Dedupe window-title setting by moving it to FigureManagerBase.
-* :ghpull:`19172`: Fix 3D surface example bug for non-square grid
-* :ghpull:`19173`: Ensure backend tests are skipped if unavailable
-* :ghpull:`19170`: Clarify meaning of facecolors for LineCollection
-* :ghpull:`18310`: Add 3D stem plot
-* :ghpull:`18127`: Implement lazy autoscaling in mplot3d.
-* :ghpull:`16178`: Add multiple label support for Axes.plot()
-* :ghpull:`19151`: Deprecate @cbook.deprecated and move internal calls to @_api.deprecated
-* :ghpull:`19088`: Ignore CLOSEPOLY vertices when computing dataLim from patches
-* :ghpull:`19166`: CI: add github action to post to first-time PRs openers
-* :ghpull:`19124`: GOV/DOC: add section to docs on triaging and triage team
-* :ghpull:`15602`: Add an auto-labeling helper function for bar charts
-* :ghpull:`19164`: docs: fix simple typo, backslahes -> backslashes
-* :ghpull:`19161`: Simplify test_backend_pdf::test_multipage_properfinalize.
-* :ghpull:`19141`: FIX: suppress offset text in ConciseDateFormatter when largest scale is in years
-* :ghpull:`19150`: Move from @cbook._classproperty to @_api.classproperty
-* :ghpull:`19144`: Move from cbook._warn_external() to _api.warn_external()
-* :ghpull:`19119`: Don't lose unit change handlers when pickling/unpickling.
-* :ghpull:`19145`: Move from cbook._deprecate_*() to _api.deprecate_*()
-* :ghpull:`19123`: Use Qt events to refresh pixel ratio.
-* :ghpull:`19056`: Support raw/rgba frame format in FFMpegFileWriter
-* :ghpull:`19140`: Fix the docstring of suptitle/subxlabel/supylabel.
-* :ghpull:`19132`: Normalize docstring interpolation label for kwdoc() property lists
-* :ghpull:`19134`: Switch internal API function calls from cbook to _api
-* :ghpull:`19138`: Added non-code contributions to incubator docs 
-* :ghpull:`19125`: DOC: contributor incubator
-* :ghpull:`18948`: DOC: Fix latexpdf build
-* :ghpull:`18753`: Remove several more deprecations
-* :ghpull:`19083`: Fix headless tests on Wayland.
-* :ghpull:`19127`: Cleanups to webagg & friends.
-* :ghpull:`19122`: FIX/DOC - make Text doscstring interp more easily searchable
-* :ghpull:`19106`: Support setting rcParams["image.cmap"] to Colormap instances.
-* :ghpull:`19085`: FIX: update a transfrom from transFigure to transSubfigure
-* :ghpull:`19117`: Rename a confusing variable.
-* :ghpull:`18647`: Axes.axline: implement support transform argument (for points but not slope)
-* :ghpull:`16220`: Fix interaction with unpickled 3d plots.
-* :ghpull:`19059`: Support blitting in webagg backend
-* :ghpull:`19107`: Update pyplot.py
-* :ghpull:`19044`: Cleanup Animation frame_formats.
-* :ghpull:`19087`: FIX/TST: recursively remove ticks
-* :ghpull:`19094`: Suppress -Wunused-function about _import_array when compiling tkagg.cpp.
-* :ghpull:`19092`: Fix use transform mplot3d
-* :ghpull:`19097`: DOC: add FuncScale to set_x/yscale
-* :ghpull:`19089`: ENH: allow passing a scale instance to set_scale
-* :ghpull:`19086`: FIX: add a default scale to Normalize
-* :ghpull:`19073`: Mention in a few more places that artists default to not-pickable.
-* :ghpull:`19079`: Remove incorrect statement about ``hist(..., log=True)``.
-* :ghpull:`19076`: Small improvements to aitoff projection.
-* :ghpull:`19071`: DOC: Add 'blackman' to list of imshow interpolations
-* :ghpull:`17524`: ENH: add supxlabel and supylabel
-* :ghpull:`18840`: Add tutorial about autoscaling
-* :ghpull:`19042`: Simplify GridHelper invalidation.
-* :ghpull:`19048`: Remove _draw_{ticks2,label2}; skip extents computation in _update_ticks.
-* :ghpull:`18983`: Pass norm argument to spy
-* :ghpull:`18802`: Add code of conduct
-* :ghpull:`19060`: Fix broken link in Readme
-* :ghpull:`18569`: More generic value snapping for Slider widgets
-* :ghpull:`19055`: Fix kwargs handling in AnnotationBbox
-* :ghpull:`19041`: Reword docs for exception_handler in CallbackRegistry.
-* :ghpull:`19046`: Prepare inlining MovieWriter.cleanup() into MovieWriter.finish().
-* :ghpull:`19050`: Better validate tick direction.
-* :ghpull:`19038`: Fix markup in interactive figures doc.
-* :ghpull:`19035`: grid_helper_curvelinear cleanups.
-* :ghpull:`19022`: Update event handling docs.
-* :ghpull:`19025`: Remove individual doc entries for some methods Axes inherits from Artist
-* :ghpull:`19018`: Inline and optimize ContourLabeler.get_label_coords.
-* :ghpull:`19019`: Deprecate never used ``resize_callback`` param to FigureCanvasTk.
-* :ghpull:`19023`: Cleanup comments/docs in backend_macosx, backend_pdf.
-* :ghpull:`19020`: Replace mathtext assertions by unpacking.
-* :ghpull:`19024`: Dedupe docs of GridSpec.subplots.
-* :ghpull:`19013`: Improve docs of _get_packed_offsets, _get_aligned_offsets.
-* :ghpull:`19009`: Compactify the implementation of ContourLabeler.add_label_near.
-* :ghpull:`19008`: Deprecate event processing wrapper methods on FigureManagerBase.
-* :ghpull:`19015`: Better document multilinebaseline (and other small TextArea fixes)
-* :ghpull:`19012`: Common ``__init__`` for VPacker and HPacker.
-* :ghpull:`19014`: Support normalize_kwargs(None) (== {}).
-* :ghpull:`19010`: Inline _print_pdf_to_fh, _print_png_to_fh.
-* :ghpull:`19003`: Remove reference to unicode-math in pgf preamble.
-* :ghpull:`18847`: Cleanup interactive pan/zoom.
-* :ghpull:`18868`: Expire _make_keyword_only deprecations from 3.2
-* :ghpull:`18903`: Move cbook._suppress_matplotlib_deprecation_warning() from cbook to _api
-* :ghpull:`18997`: Micro-optimize check_isinstance.
-* :ghpull:`18995`: Fix the doc of GraphicsContextBase.set_clip_rectangle.
-* :ghpull:`18996`: Fix API change message from #18989
-* :ghpull:`18993`: Don't access private renderer attributes in tkagg blit.
-* :ghpull:`18980`: DOC: fix typos
-* :ghpull:`18989`: The Artist property rasterized cannot be None anymore
-* :ghpull:`18987`: Fix punctuation in doc.
-* :ghpull:`18894`: Use selectfont instead of findfont + scalefont + setfont in PostScript.
-* :ghpull:`18990`: Minor cleanup of categorical example
-* :ghpull:`18947`: Strictly increasing check with test coverage for streamplot grid
-* :ghpull:`18981`: Cleanup Firefox SVG example.
-* :ghpull:`18969`: Improve documentation on rasterization
-* :ghpull:`18876`: Support fully-fractional HiDPI added in Qt 5.14.
-* :ghpull:`18976`: Simplify contour_label_demo.
-* :ghpull:`18975`: Fix typing error in pyplot's docs
-* :ghpull:`18956`: Document rasterized parameter in pcolormesh() explicitly
-* :ghpull:`18968`: Fix clabel() for backends without canvas.get_renderer()
-* :ghpull:`18949`: Deprecate AxisArtist.ZORDER
-* :ghpull:`18830`: Pgf plotting
-* :ghpull:`18967`: Remove unnecessary calls to lower().
-* :ghpull:`18910`: Remove Artist.eventson and Container.eventson
-* :ghpull:`18964`: Remove special-casing for PostScript dpi in pyplot.py.
-* :ghpull:`18961`: Replace sphinx-gallery-specific references by standard :doc: refs.
-* :ghpull:`18955`: added needs_ghostscript; skip test
-* :ghpull:`18857`: Improve hat graph example
-* :ghpull:`18943`: Small cleanup to StepPatch._update_path.
-* :ghpull:`18937`: Cleanup stem docs and simplify implementation.
-* :ghpull:`18895`: Introduce variable since which mpl version the minimal python version
-* :ghpull:`18927`: Improve warning message for missing font family specified via alias.
-* :ghpull:`18930`: Document limitations of Path.contains_point() and clarify its semantics
-* :ghpull:`18892`: Fixes MIME type for svg frame_format in HTMLWriter.
-* :ghpull:`18938`: Edit usetex docs.
-* :ghpull:`18923`: Use lambdas to prevent gc'ing and deduplication of widget callbacks.
-* :ghpull:`16171`: Contour fixes/improvements
-* :ghpull:`18901`: Simplify repeat_delay and fix support for it when using iterable frames.
-* :ghpull:`18911`: Added Aria-Labels to all inputs with tooltips for generated HTML animations: issue #17910
-* :ghpull:`18912`: Use CallbackRegistry for {Artist,Collection}.add_callback.
-* :ghpull:`18919`: DOCS: fix contourf hatch demo legend
-* :ghpull:`18905`: Make docs fail on Warning (and fix all existing warnings)
-* :ghpull:`18763`: Single-line string notation for subplot_mosaic
-* :ghpull:`18902`: Move ImageMagick version exclusion to _get_executable_info.
-* :ghpull:`18915`: Remove hard-coded API removal version mapping.
-* :ghpull:`18914`: Fix typo in error message: interable -> iterable.
-* :ghpull:`15065`: step-between as drawstyle [Alternative approach to #15019]
-* :ghpull:`18532`: Consistent behavior of draw_if_interactive across interactive backends.
-* :ghpull:`18908`: Rework interactive backends tests.
-* :ghpull:`18817`: MAINT: deprecate validCap, validJoin
-* :ghpull:`18907`: Unmark wx-threading-test-failure as strict xfail.
-* :ghpull:`18896`: Add note on keeping a reference to animation docstrings
-* :ghpull:`18862`: Resolve mathtext.fontset at FontProperties creation time.
-* :ghpull:`18877`: Remove fallback to nonexistent setDevicePixelRatioF.
-* :ghpull:`18823`: Move from @cbook.deprecated to @_api.deprecated
-* :ghpull:`18889`: Switch Tk to using PNG files for buttons
-* :ghpull:`18888`: Update version of Matplotlib that needs Python 3.7
-* :ghpull:`18867`: Remove "Demo" from example titles (part 2)
-* :ghpull:`18863`: Reword FontProperties docstring.
-* :ghpull:`18866`: Fix RGBAxes docs markup.
-* :ghpull:`18874`: Slightly compress down the pgf tests.
-* :ghpull:`18565`: Make Tkagg blit thread safe
-* :ghpull:`18858`: Remove "Demo" from example titles
-* :ghpull:`15177`: Bind WX_CHAR_HOOK instead of WX_KEY_DOWN for wx key_press_event.
-* :ghpull:`18821`: Simplification of animated histogram example
-* :ghpull:`18844`: Fix sphinx formatting issues
-* :ghpull:`18834`: Add cross-references to Artist tutorial
-* :ghpull:`18827`: Update Qt version in event handling docs.
-* :ghpull:`18825`: Warn in pgf backend when unknown font is requested.
-* :ghpull:`18822`: Remove deprecate
-* :ghpull:`18733`: Time series histogram plot example
-* :ghpull:`18812`: Change LogFormatter coeff computation
-* :ghpull:`18820`: Fix axes -> Axes changes in figure.py
-* :ghpull:`18657`: Move cbook.deprecation to _api.deprecation
-* :ghpull:`18818`: Clarify behavior of CallbackRegistry.disconnect with nonexistent cids.
-* :ghpull:`18811`: DOC Use 'Axes' instead of 'axes' in figure.py
-* :ghpull:`18814`: [Example] update Anscombe's Quartet
-* :ghpull:`18806`: DOC Use 'Axes' in _axes.py docstrings
-* :ghpull:`18799`: Remove unused wx private attribute.
-* :ghpull:`18772`: BF: text not drawn shouldn't count for tightbbox
-* :ghpull:`18793`: Consistently use axs to refer to a set of Axes (v2)
-* :ghpull:`18792`: Cmap cleanup
-* :ghpull:`18798`: Deprecate ps.useafm for mathtext
-* :ghpull:`18302`: Remove 3D attributes from renderer
-* :ghpull:`18795`: Make inset indicator more visible in the example
-* :ghpull:`18781`: Update description of web application server example.
-* :ghpull:`18791`: Fix documentation of edgecolors precedence for scatter()
-* :ghpull:`14645`: Add a helper to copy a colormap and set its extreme colors.
-* :ghpull:`17709`: Enh: SymNorm for normalizing symmetrical data around a center
-* :ghpull:`18780`: CI: pydocstyle>=5.1.0, flake8-docstrings>=1.4.0 verified to work
-* :ghpull:`18200`: Unpin pydocstyle
-* :ghpull:`18767`: Turn "How to use Matplotlib in a web application server" into a sphinx-gallery example
-* :ghpull:`18765`: Remove some unused tick private attributes.
-* :ghpull:`18688`: Shorter property deprecation.
-* :ghpull:`18748`: Allow dependabot to check GitHub actions daily
-* :ghpull:`18529`: Synchronize view limits of shared axes after setting ticks
-* :ghpull:`18575`: Colorbar grid position
-* :ghpull:`18744`: DOCS: document log locator's ``numticks``
-* :ghpull:`18687`: Deprecate GraphicsContextPS.
-* :ghpull:`18706`: Consistently use 3D, 2D, 1D for dimensionality
-* :ghpull:`18702`: _make_norm_from_scale fixes.
-* :ghpull:`18558`: Support usetex in date Formatters
-* :ghpull:`18493`: MEP22 toolmanager set axes navigate_mode
-* :ghpull:`18730`: TST: skip if known-bad version of imagemagick
-* :ghpull:`18583`: Support binary comms in nbagg.
-* :ghpull:`18728`: Disable mouseover info for NonUniformImage.
-* :ghpull:`18710`: Deprecate cla() methods of Axis and Spines in favor of clear()
-* :ghpull:`18719`: Added the trace plot of the end point
-* :ghpull:`18729`: Use ax.add_image rather than ax.images.append in NonUniformImage example
-* :ghpull:`18707`: Use "Return whether ..." docstring for functions returning bool
-* :ghpull:`18724`: Remove extra newlines in contour(f) docs.
-* :ghpull:`18696`: removed glossary
-* :ghpull:`18721`: Remove the use_cmex font fallback mechanism.
-* :ghpull:`18680`: wx backend API cleanups.
-* :ghpull:`18709`: Use attributes Axes.x/yaxis instead of Axes.get_x/yaxis()
-* :ghpull:`18712`: Shorten GraphicsContextWx.get_wxcolour.
-* :ghpull:`18708`: Individualize contour and contourf docstrings
-* :ghpull:`18663`: fix: keep baseline scale to baseline 0 even if set to None
-* :ghpull:`18704`: Fix docstring of Axes.cla()
-* :ghpull:`18675`: Merge ParasiteAxesAuxTransBase into ParasiteAxesBase.
-* :ghpull:`18651`: Allow Type3 subsetting of otf fonts in pdf backend.
-* :ghpull:`17396`: Improve headlessness detection for backend selection.
-* :ghpull:`17737`: Deprecate BoxStyle._Base.
-* :ghpull:`18655`: Sync SubplotDivider API with SubplotBase API changes.
-* :ghpull:`18582`: Shorten mlab tests.
-* :ghpull:`18599`: Simplify wx rubberband drawing.
-* :ghpull:`18671`: DOC: fix autoscale docstring
-* :ghpull:`18637`: BLD: sync build and run time numpy pinning
-* :ghpull:`18693`: Also fix tk key mapping, following the same strategy as for gtk.
-* :ghpull:`18691`: Cleanup sample_data.
-* :ghpull:`18697`: Catch TypeError when validating rcParams types.
-* :ghpull:`18537`: Create security policy
-* :ghpull:`18356`: ENH: Subfigures
-* :ghpull:`18694`: Document limitations on ``@deprecated`` with multiple-inheritance.
-* :ghpull:`18669`: Rework checks for old macosx
-* :ghpull:`17791`: More accurate handling of unicode/numpad input in gtk3 backends.
-* :ghpull:`18679`: Further simplify pgf tmpdir cleanup.
-* :ghpull:`18685`: Cleanup pgf examples
-* :ghpull:`18682`: Small API cleanups to plot_directive.
-* :ghpull:`18686`: Numpydocify setp.
-* :ghpull:`18684`: Small simplification to triage_tests.py.
-* :ghpull:`17832`: pdf: Support setting URLs on Text objects
-* :ghpull:`18674`: Remove accidentally added swapfile.
-* :ghpull:`18673`: Small cleanups to parasite axes.
-* :ghpull:`18536`: axes3d panning
-* :ghpull:`18667`: TST: Lock cache directory during cleanup. 
-* :ghpull:`18672`: Created Border for color examples
-* :ghpull:`18661`: Define GridFinder.{,inv\_}transform_xy as normal methods.
-* :ghpull:`18656`: Fix some missing references.
-* :ghpull:`18659`: Small simplifications to BboxImage.
-* :ghpull:`18511`: feat: StepPatch to take array as baseline
-* :ghpull:`18646`: Support activating figures with plt.figure(figure_instance).
-* :ghpull:`18370`: Move PostScript Type3 subsetting to pure python.
-* :ghpull:`18645`: Simplify Colorbar.set_label, inline Colorbar._edges.
-* :ghpull:`18633`: Support linestyle='none' in Patch
-* :ghpull:`18527`: Fold ColorbarPatch into Colorbar, deprecate colorbar_factory.
-* :ghpull:`17480`: Regenerate background when RectangleSelector active-flag is set back on.
-* :ghpull:`18626`: Specify case when parameter is ignored.
-* :ghpull:`18634`: Fix typo in warning message.
-* :ghpull:`18603`: bugfix #18600 by using the MarkerStyle copy constructor
-* :ghpull:`18628`: Remove outdate comment about canvases with no manager attribute.
-* :ghpull:`18591`: Deprecate MathTextParser("bitmap") and associated APIs.
-* :ghpull:`18617`: Remove special styling of sidebar heading
-* :ghpull:`18616`: Improve instructions for building the docs
-* :ghpull:`18623`: Provide a 'cursive' font present in Windows' default font set.
-* :ghpull:`18579`: Fix stairs() tests
-* :ghpull:`18618`: Correctly separate two fantasy font names.
-* :ghpull:`18610`: DOCS: optional doc building dependencies
-* :ghpull:`18601`: Simplify Rectangle and RegularPolygon.
-* :ghpull:`18573`: add_subplot(..., axes_class=...) for more idiomatic mpl_toolkits usage.
-* :ghpull:`18605`: Correctly sync state of wx toolbar buttons when triggered by keyboard.
-* :ghpull:`18606`: Revert "FIX: pin pytest"
-* :ghpull:`18587`: Fix docstring of zaxis_date.
-* :ghpull:`18589`: Factor out pdf Type3 glyph drawing.
-* :ghpull:`18586`: Text cleanups.
-* :ghpull:`18594`: FIX: pin pytest
-* :ghpull:`18577`: Random test cleanups
-* :ghpull:`18578`: Merge all axisartist axis_direction demos together.
-* :ghpull:`18588`: Use get_x/yaxis_transform more.
-* :ghpull:`18585`: FIx precision in pie and donut example 
-* :ghpull:`18564`: Prepare for merging SubplotBase into AxesBase.
-* :ghpull:`15127`: ENH/API: improvements to register_cmap
-* :ghpull:`18576`: DOC: prefer colormap over color map
-* :ghpull:`18340`: Colorbar grid postion
-* :ghpull:`18568`: Added Reporting to code_of_conduct.md
-* :ghpull:`18555`: Convert _math_style_dict into an Enum.
-* :ghpull:`18567`: Replace subplot(ijk) calls by subplots(i, j)
-* :ghpull:`18554`: Replace some usages of plt.subplot() by plt.subplots() in tests
-* :ghpull:`18556`: Accept same types to errorevery as markevery
-* :ghpull:`15932`: Use test cache for test result images too.
-* :ghpull:`18557`: DOC: Add an option to disable Google Analytics.
-* :ghpull:`18560`: Remove incorrect override of pcolor/contour in parasite axes.
-* :ghpull:`18566`: Use fig, ax = plt.subplots() in tests (part 2)
-* :ghpull:`18553`: Use fig, ax = plt.subplots() in tests
-* :ghpull:`11748`: get_clip_path checks for nan
-* :ghpull:`8987`: Tick formatter does not support grouping with locale
-* :ghpull:`18552`: Change \*subplot(111, ...) to \*subplot(...) as 111 is the default.
-* :ghpull:`18189`: FIX: Add get/set methods for 3D collections
-* :ghpull:`18430`: FIX: do not reset ylabel ha when changing position
-* :ghpull:`18515`: Remove deprecated backend code.
-* :ghpull:`17935`: MNT: improve error messages on bad pdf metadata input
-* :ghpull:`18525`: Add Text3D position getter/setter
-* :ghpull:`18542`: CLEANUP: validate join/cap style centrally
-* :ghpull:`18501`: TST: Add test for _repr_html_
-* :ghpull:`18528`: Deprecate TextArea minimumdescent.
-* :ghpull:`18543`: Documentation improvements for stairs()
-* :ghpull:`18531`: Unit handling improvements
-* :ghpull:`18523`: Don't leak file paths into PostScript metadata
-* :ghpull:`18526`: Templatize _image.resample to deduplicate it.
-* :ghpull:`18522`: Remove mlab, toolkits, and misc deprecations
-* :ghpull:`18516`: Remove deprecated font-related things.
-* :ghpull:`18535`: Add a code of conduct link to github
-* :ghpull:`17521`: Remove font warning when legend is added while using Tex
-* :ghpull:`18517`: Include kerning when outputting pdf strings.
-* :ghpull:`18521`: Inline some helpers in ColorbarBase.
-* :ghpull:`18512`: Private api2
-* :ghpull:`18519`: Correctly position text with nonzero descent with afm fonts / ps output.
-* :ghpull:`18513`: Remove Locator.autoscale.
-* :ghpull:`18497`: Merge v3.3.x into master
-* :ghpull:`18502`: Remove the deprecated matplotlib.cm.revcmap()
-* :ghpull:`18506`: Inline ScalarFormatter._formatSciNotation.
-* :ghpull:`18455`: Fix BoundingBox in EPS files.
-* :ghpull:`18275`: feat: StepPatch
-* :ghpull:`18507`: Fewer "soft" dependencies on LaTeX packages.
-* :ghpull:`18378`: Deprecate public access to many mathtext internals.
-* :ghpull:`18494`: Move cbook._check_in_list() to _api.check_in_list()
-* :ghpull:`18423`: 2-D array RGB and RGBA values not understood in plt.plot()
-* :ghpull:`18492`: Fix doc build failure due to #18440
-* :ghpull:`18435`: New environment terminal language
-* :ghpull:`18456`: Reuse InsetLocator to make twinned axes follow their parents.
-* :ghpull:`18440`: List existing rcParams in rcParams docstring.
-* :ghpull:`18453`: FIX: allow manually placed axes in constrained_layout
-* :ghpull:`18473`: Correct link to widgets examples
-* :ghpull:`18466`: Remove unnecessary autoscale handling in hist().
-* :ghpull:`18465`: Don't modify bottom argument in place in stacked histograms.
-* :ghpull:`18468`: Cleanup multiple_yaxis_with_spines example.
-* :ghpull:`18463`: Improve formatting of defaults in docstrings.
-* :ghpull:`6268`: ENH: support alpha arrays in collections
-* :ghpull:`18449`: Remove the private Axes._set_position.
-* :ghpull:`18460`: DOC: example gray level in 'Specifying Colors' tutorial
-* :ghpull:`18426`: plot directive: caption-option
-* :ghpull:`18444`: Support doubleclick in webagg/nbagg
-* :ghpull:`12518`: Example showing scale-invariant angle arc
-* :ghpull:`18446`: Normalize properties passed to ToolHandles.
-* :ghpull:`18445`: Warn if an animation is gc'd before doing anything.
-* :ghpull:`18452`: Move Axes ``__repr__`` from Subplot to AxesBase.
-* :ghpull:`15374`: Replace _prod_vectorized by @-multiplication.
-* :ghpull:`13643`: RecangleSelector constructor does not handle marker_props
-* :ghpull:`18403`: DOC: Remove related topics entries from the sidebar
-* :ghpull:`18421`: Move {get,set}_{x,y}label to _AxesBase.
-* :ghpull:`18429`: DOC: fix date example
-* :ghpull:`18353`: DOCS: describe shared axes behavior with units
-* :ghpull:`18420`: Always strip out date in postscript's test_savefig_to_stringio.
-* :ghpull:`18422`: Decrease output when running ``pytest -s``.
-* :ghpull:`18418`: Cleanup menu example
-* :ghpull:`18419`: Avoid demo'ing passing kwargs to gca().
-* :ghpull:`18372`: DOC: Fix various missing references and typos
-* :ghpull:`18400`: Clarify argument name in constrained_layout error message
-* :ghpull:`18384`: Clarification in ArtistAnimation docstring
-* :ghpull:`17892`: Add earlier color validation
-* :ghpull:`18367`: Support horizontalalignment in TextArea/AnchoredText.
-* :ghpull:`18362`: DOC: Add some types to Returns entries.
-* :ghpull:`18365`: move canvas focus after toomanager initialization
-* :ghpull:`18360`: Add example for specifying figure size in different units
-* :ghpull:`18341`: DOCS: add action items to PR template
-* :ghpull:`18349`: Remove redundant angles in ellipse demo.
-* :ghpull:`18145`: Created a parameter fontset that can be used in each Text element
-* :ghpull:`18344`: More nouns/imperative forms in docs.
-* :ghpull:`18308`: Synchronize units change in Axis.set_units for shared axis
-* :ghpull:`17494`: Rewrite of constrained_layout....
-* :ghpull:`16646`: update colorbar.py make_axes_gridspec
-* :ghpull:`18306`: Fix configure subplots
-* :ghpull:`17509`: Fix ``swap_if_landscape`` call in backend_ps
-* :ghpull:`18323`: Deleted "Our Favorite Recipes" section and moved the examples.
-* :ghpull:`18128`: Change several deprecated symbols in _macosx.m
-* :ghpull:`18251`: Merge v3.3.x into master
-* :ghpull:`18329`: Change default keymap in toolmanager example.
-* :ghpull:`18330`: Dedent rst list.
-* :ghpull:`18286`: Fix imshow to work with subclasses of ndarray. 
-* :ghpull:`18320`: Make Colorbar outline into a Spine.
-* :ghpull:`18316`: Safely import pyplot if a GUI framework is already running.
-* :ghpull:`18321`: Capture output of CallbackRegistry exception test.
-* :ghpull:`17900`: Add getters and _repr_html_ for over/under/bad values of Colormap objects.
-* :ghpull:`17930`: Fix errorbar property cycling to match plot.
-* :ghpull:`18290`: Remove unused import to fix flake8.
-* :ghpull:`16818`: Dedupe implementations of configure_subplots().
-* :ghpull:`18284`: TkTimer interval=0 workaround
-* :ghpull:`17901`: DOC: Autoreformating of backend/\*.py
-* :ghpull:`17291`: Normalize gridspec ratios to lists in the setter.
-* :ghpull:`18226`: Use CallbackRegistry in Widgets and some related cleanup
-* :ghpull:`18203`: Force locator and formatter inheritence
-* :ghpull:`18279`: boxplot: Add conf_intervals reference to notch docs.
-* :ghpull:`18276`: Fix autoscaling to exclude inifinite data limits when possible. 
-* :ghpull:`18261`: Migrate tk backend tests into subprocesses
-* :ghpull:`17961`: DOCS: Remove How-to: Contributing
-* :ghpull:`18201`: Remove mpl.colors deprecations for 3.4
-* :ghpull:`18223`: Added example on how to make packed bubble charts
-* :ghpull:`18264`: Fix broken links in doc build.
-* :ghpull:`8031`: Add errorbars to mplot3d
-* :ghpull:`18187`: Add option to create horizontally-oriented stem plots
-* :ghpull:`18250`: correctly autolabel Documentation and Maintenance issues
-* :ghpull:`18161`: Add more specific GitHub issue templates
-* :ghpull:`18181`: Replace ttconv by plain python for pdf subsetting
-* :ghpull:`17371`: add context manager functionality to ion and ioff
-* :ghpull:`17789`: Tk backend improvements
-* :ghpull:`15532`: Resolve 'text ignores rotational part of transformation' (#698)
-* :ghpull:`17851`: Fix Axes3D.add_collection3d issues
-* :ghpull:`18205`: Hat graph example
-* :ghpull:`6168`: #5856: added option to create vertically-oriented stem plots
-* :ghpull:`18202`: Remove mpl.testing deprecations for 3.4
-* :ghpull:`18081`: Support scale in ttf composite glyphs
-* :ghpull:`18199`: Some cleanup on TickedStroke
-* :ghpull:`18190`: Use ``super()`` more in  backends
-* :ghpull:`18193`: Allow savefig to save SVGs on FIPS enabled systems #18192
-* :ghpull:`17802`: fix FigureManagerTk close behavior if embedded in Tk App
-* :ghpull:`15458`: TickedStroke, a stroke style with ticks useful for depicting constraints
-* :ghpull:`18178`: DOC: clarify that display space coordinates are not stable
-* :ghpull:`18172`: allow webAgg to report middle click events
-* :ghpull:`17578`: Search for minus of any font size to get height of tex result
-* :ghpull:`17546`: ``func`` argument in ``legend_elements`` with non-monotonically increasing functions
-* :ghpull:`17684`: Deprecate passing bytes to FT2Font.set_text.
-* :ghpull:`17500`: Tst improve memleak
-* :ghpull:`17669`: Small changes to svg font embedding details
-* :ghpull:`18095`: Error on unexpected kwargs in scale classes
-* :ghpull:`18106`: Copy docstring description from Axes.legend() to Figure.legend()
-* :ghpull:`18002`: Deprecate various vector-backend-specific mathtext helpers.
-* :ghpull:`18006`: Fix ToolManager inconsistencies with regular toolbar
-* :ghpull:`18004`: Typos and docs for mathtext fonts.
-* :ghpull:`18133`: DOC: Update paths for moved API/what's new fragments
-* :ghpull:`18122`: Document and test legend argument parsing
-* :ghpull:`18124`: Fix FuncAnimation._draw_frame exception and testing
-* :ghpull:`18125`: pdf: Convert operator list to an Enum.
-* :ghpull:`18123`: Cleanup figure title example
-* :ghpull:`18121`: Improve rasterization demo
-* :ghpull:`18012`: Add explanatory text for rasterization demo
-* :ghpull:`18103`: Support data reference for hexbin() parameter C
-* :ghpull:`17826`: Add pause() and resume() methods to the base Animation class
-* :ghpull:`18090`: Privatize cbook.format_approx.
-* :ghpull:`18080`: Reduce numerical precision in Type 1 fonts
-* :ghpull:`18044`: Super-ify parts of the code base, part 3
-* :ghpull:`18087`: Add a note on working around limit expansion of set_ticks()
-* :ghpull:`18071`: Remove deprecated animation code
-* :ghpull:`17822`: Check for float values for min/max values to ax{v,h}line
-* :ghpull:`18069`: Remove support for multiple-color strings in to_rgba_array
-* :ghpull:`18070`: Remove rcsetup deprecations
-* :ghpull:`18073`: Remove disable_internet.py
-* :ghpull:`18075`: typo in usetex.py example
-* :ghpull:`18043`:  Super-ify parts of the code base, part 2
-* :ghpull:`18062`: Bump matplotlib.patches coverage
-* :ghpull:`17269`: Fix ConciseDateFormatter when plotting a range included in a second
-* :ghpull:`18063`: Remove un-used trivial setters and getters
-* :ghpull:`18025`: add figpager as a third party package 
-* :ghpull:`18046`: Discourage references in section headings.
-* :ghpull:`18042`: scatter: Raise if unexpected type of ``s`` argument.
-* :ghpull:`18028`: Super-ify parts of the code base, part 1
-* :ghpull:`18029`: Remove some unused imports.
-* :ghpull:`18018`: Cache realpath resolution in font_manager.
-* :ghpull:`18013`: Use argumentless ``super()`` more.
-* :ghpull:`17988`: add test with -OO
-* :ghpull:`17993`: Make inset_axes and secondary_axis picklable.
-* :ghpull:`17992`: Shorten tight_bbox.
-* :ghpull:`18003`: Deprecate the unneeded Fonts.destroy.
-* :ghpull:`16457`: Build lognorm/symlognorm from corresponding scales.
-* :ghpull:`17966`: Fix some words
-* :ghpull:`17803`: Simplify projection-of-point-on-polyline in contour.py.
-* :ghpull:`17699`: raise RuntimeError appropriately for animation update func
-* :ghpull:`17954`: Remove another overspecified latex geometry.
-* :ghpull:`17948`: Sync Cairo's usetex measurement with base class.
-* :ghpull:`17788`: Tighten a bit the RendererAgg API.
-* :ghpull:`12443`: Warn in colorbar() when mappable.axes != figure.gca().
-* :ghpull:`17926`: Deprecate hatch patterns with invalid values
-* :ghpull:`17922`: Rewrite the barcode example
-* :ghpull:`17890`: Properly use thin space after math text operator
-* :ghpull:`16090`: Change pcolormesh snapping (fixes alpha colorbar/grid issues) [AGG]
-* :ghpull:`17842`: Move "Request a new feature" from How-to to Contributing
-* :ghpull:`17897`: Force origin='upper' in pyplot.specgram
-* :ghpull:`17929`: Improve hatch demo
-* :ghpull:`17927`: Remove unnecessary file save during test
-* :ghpull:`14896`: Updated doc in images.py by adding direct link to 24-bit stink bug png
-* :ghpull:`17909`: frame_format to support all listed by animation writers
-* :ghpull:`13569`: Style cleanup to pyplot.
-* :ghpull:`17924`: Remove the example "Easily creating subplots"
-* :ghpull:`17869`: FIX: new date rcParams weren't being evaluated
-* :ghpull:`17921`: Added density and combination hatching examples
-* :ghpull:`17159`: Merge consecutive rasterizations
-* :ghpull:`17895`: Use indexed color for PNG images in PDF files when possible
-* :ghpull:`17894`: DOC: Numpydoc format.
-* :ghpull:`17884`: Created Hatch marker styles Demo for Example Gallery
-* :ghpull:`17347`: ENH: reuse oldgridspec is possible...
-* :ghpull:`17915`: Document that set_ticks() increases view limits if necessary
-* :ghpull:`17902`: Fix figure size in path effects guide
-* :ghpull:`17899`: Add missing space in cairo error
-* :ghpull:`17888`: Add _repr_png_ and _repr_html_ to Colormap objects.
-* :ghpull:`17830`: Fix BoundaryNorm for multiple colors and one region 
-* :ghpull:`17883`: Remove Python 3.6 compatibility shims
-* :ghpull:`17889`: Minor doc fixes
-* :ghpull:`17879`: Link to style-file example page in style tutorial
-* :ghpull:`17876`: Fix description of subplot2grid arguments
-* :ghpull:`17856`: Clarify plotnonfinite parameter docs of scatter()
-* :ghpull:`17843`: Add fullscreen toggle support to WxAgg backend
-* :ghpull:`17022`: ENH: add rcParam for ConciseDate and interval_multiples
-* :ghpull:`17799`: Deduplicate attribute docs of ContourSet and its derived classes
-* :ghpull:`17847`: Remove overspecified latex geometry.
-* :ghpull:`17662`: Mnt drop py36
-* :ghpull:`17845`: Fix size of donate button
-* :ghpull:`17825`: Add quick-link buttons for contributing
-* :ghpull:`17837`: Remove "Reporting a bug or submitting a patch" from How-to
-* :ghpull:`17828`: API: treat xunits=None and yunits=None as "default"
-* :ghpull:`17839`: Avoid need to lock in dvi generation, to avoid deadlocks.
-* :ghpull:`17824`: Improve categorical converter error message
-* :ghpull:`17834`: Keep using a single dividers LineCollection instance in colorbar.
-* :ghpull:`17838`: Prefer colorbar(ScalarMappable(...)) to ColorbarBase in tutorial.
-* :ghpull:`17836`: More precise axes section names in docs
-* :ghpull:`17835`: Colorbar cleanups.
-* :ghpull:`17727`: FIX: properly handle dates when intmult is true
-* :ghpull:`15617`: Dev docs update
-* :ghpull:`17819`: Fix typos in tight layout guide
-* :ghpull:`17806`: Set colorbar label only in set_label.
-* :ghpull:`17265`: Mnt rearrange next api again
-* :ghpull:`17808`: Improve docstring of ColorbarBase.set_label()
-* :ghpull:`17723`: Deprecate FigureCanvas.{get,set}_window_title.
-* :ghpull:`17798`: Fix overindented bullet/enumerated lists.
-* :ghpull:`17767`: Allow list of hatches to {bar, barh}
-* :ghpull:`17749`: Deprecate ``FancyBboxPatch(..., boxstyle="custom", bbox_transmuter=...)``
-* :ghpull:`17783`: DOC: point to bbox static "constructor" functions in set_position
-* :ghpull:`17782`: MNT: update mailmap
-* :ghpull:`17776`: Changes in the image for test_load_from_url
-* :ghpull:`17750`: Soft-deprecate mutation_aspect=None.
-* :ghpull:`17780`: Reorganize colorbar docstrings.
-* :ghpull:`17778`: Fix whatsnew confusing typo.
-* :ghpull:`17748`: Don't use bezier helpers in axisartist.
-* :ghpull:`17700`: Remove remnants of macosx old-style toolbar.
-* :ghpull:`17753`: Support location="left"/"top" for gridspec-based colorbars.
-* :ghpull:`17761`: Update hard-coded results in artist tutorial
-* :ghpull:`17728`: Move Win32_{Get,Set}ForegroundWindow to c_internal_utils.
-* :ghpull:`17754`: Small cleanups to contour() code.
-* :ghpull:`17751`: Deprecate dpi_cor property of FancyArrowPatch.
-* :ghpull:`15941`: FontManager fixes.
-* :ghpull:`17661`: Issue #17659: set tick color and tick labelcolor independently from rcParams
-* :ghpull:`17389`: Don't duplicate docstrings of pyplot-level cmap setters.
-* :ghpull:`17555`: Set Win32 AppUserModelId to fix taskbar icons.
-* :ghpull:`17726`: Clarify docs of box_aspect()
-* :ghpull:`17704`: Remove "created-by-matplotlib" comment in svg output.
-* :ghpull:`17697`: Add description examples/pyplots/pyplot simple.py
-* :ghpull:`17694`: CI: Only skip devdocs deploy if PR is to this repo.
-* :ghpull:`17691`: ci: Print out reasons for not deploying docs.
-* :ghpull:`17099`: Make Spines accessable by the attributes.
-
-Issues (204):
-
-* :ghissue:`19701`: Notebook plotting regression in 3.4.0rc*
-* :ghissue:`19754`: add space in python -mpip
-* :ghissue:`18364`: ``Axes3d`` attaches itself to a figure, where as ``Axes`` does not
-* :ghissue:`19700`: Setting pickradius regression in 3.4.0rc
-* :ghissue:`19594`: code of conduct link 404s
-* :ghissue:`19576`: duplicate pick events firing
-* :ghissue:`19560`: segfault due to font objects when multi-threading
-* :ghissue:`19598`: Axes order changed in 3.4.0rc1
-* :ghissue:`19631`: subplot mosaic 1 element list
-* :ghissue:`19581`: Missing kerning for single-byte strings in PDF
-* :ghissue:`17769`: interactive figure close with wxpython 4.1 causes freeze / crash (segfault?)
-* :ghissue:`19427`: Fix mistake in documentation
-* :ghissue:`19624`: Cannot add colorbar to figure after pickle
-* :ghissue:`19544`: Regression in 3.4.0rc1 in creating ListedColormap from a set
-* :ghissue:`5855`: plt.step(..., where="auto")
-* :ghissue:`19474`: Memory leak with CallbackRegistry
-* :ghissue:`19345`: legend is eating up huge amounts of memory
-* :ghissue:`19066`: plt.scatter, error with NaN values and edge color
-* :ghissue:`19432`: Unexpected change in behavior in plt.subplot
-* :ghissue:`18020`: Scatter3D: facecolor or color to "none" leads to an error
-* :ghissue:`18939`: Warn re: Axes3D constructor behavior change in mpl3.4
-* :ghissue:`19128`: webagg reports incorrect values for non-alphanumeric key events on non-qwerty keyboards
-* :ghissue:`16558`: Request: for non-interactive backends make fig.canvas.draw() force the render
-* :ghissue:`19234`: tick labels displaced vertically with text.usetex and xcolor
-* :ghissue:`18407`: pgf backend no longer supports fig.draw
-* :ghissue:`2298`: axes.xmargin/ymargin rcParam behaves differently than pyplot.margins()
-* :ghissue:`19473`: Animations in Tkinter window advance non-uniformly
-* :ghissue:`8688`: document moved examples
-* :ghissue:`9553`: Display warning on out-of-date documentation websites
-* :ghissue:`9556`: Examples page version is out of date
-* :ghissue:`12374`: Examples in docs should be redirected to latest version number
-* :ghissue:`19486`: Figure.tight_layout() raises MatplotlibDeprecationWarning
-* :ghissue:`19445`: axline transform support broke axline in loglog scale
-* :ghissue:`19178`: mathtext \lim is vertically misaligned
-* :ghissue:`19446`: Better document and error handle third dimension in pyplot.text() positional argument
-* :ghissue:`8790`: Inconsistent doc vs behavior for RendererXXX.draw_markers
-* :ghissue:`18815`: Patch3D object does not return correct face color with get_facecolor
-* :ghissue:`19152`: Automatically Aligned Labels outside Figure with Constrained Layout in Exported File
-* :ghissue:`18934`: stairs() crashes with no values and one edge
-* :ghissue:`11296`: Image in github repo does not match matplotlib.org (breaks image tutorial)
-* :ghissue:`18699`: Issue with downloading stinkbug for "Image Tutorial"
-* :ghissue:`19405`: TypeError constructor returned NULL in wayland session
-* :ghissue:`18962`: Table CSS needs cleanup
-* :ghissue:`19417`: CI failing on numpy...
-* :ghissue:`17849`: Problems caused by changes to logic of scatter coloring in matplotlib 3.3.0.rc1
-* :ghissue:`18648`: Drop support for directly imread()ing urls.
-* :ghissue:`19366`: Current CI doc builds fail
-* :ghissue:`19372`: matplotlib.axes.Axes.indicate_inset default label value is incompatible with LaTeX
-* :ghissue:`17100`: Is it a better solution to acess one of the spines by class atrribute?
-* :ghissue:`17375`: Proposal: add_subfigs....
-* :ghissue:`19339`: constrained_layout + fixed-aspect axes + bbox_inches="tight"
-* :ghissue:`19308`: Reduce whitespace in Choosing Colormaps tutorial plots
-* :ghissue:`18832`: MNT: Remove AxesStack and deprecated behavior of reuse of existing axes with same arguments
-* :ghissue:`19084`: Arrow coordinates slightly off when used with annotation text
-* :ghissue:`17765`: PGF xelatex can't find fonts in special-character paths
-* :ghissue:`19274`: Missing marker in documentation of plot
-* :ghissue:`18241`: LaTeX overset: unknown symbol
-* :ghissue:`19292`: Non interpolated placeholder value in docstring.
-* :ghissue:`18119`: Can no longer deepcopy LogNorm objects on master
-* :ghissue:`8665`: Noninteger Bases in mathtext sqrt
-* :ghissue:`19243`: matplotlib doesn't build with qhull-2020.2
-* :ghissue:`19275`: Double specifications of plot attributes
-* :ghissue:`15066`: Feature request: stem3
-* :ghissue:`19209`: Segfault when trying to create gigapixel image with agg backend
-* :ghissue:`4321`: clabel ticks and axes limits with eps zoom output 
-* :ghissue:`16376`: ``SymLogNorm`` and ``SymLogScale`` give inconsistent results....
-* :ghissue:`19239`: _make_norm_from_scale needs to process values
-* :ghissue:`16552`: Scatter autoscaling still has issues with log scaling and zero values
-* :ghissue:`18417`: Documentation issue template should ask for matplotlib version 
-* :ghissue:`19206`: matplotlib.cbook.Grouper: Example raise exception:
-* :ghissue:`19203`: Date Tick Labels example
-* :ghissue:`18581`: Add a check in check_figures_equal that the test did not accidentally plot on non-fixture figures
-* :ghissue:`18563`: Create a RangeSlider widget
-* :ghissue:`19099`: axisartist axis_direction bug
-* :ghissue:`19171`: 3D surface example bug for non-square grid
-* :ghissue:`18112`: set_{x,y,z}bound 3d limits are not persistent upon interactive rotation
-* :ghissue:`19078`: _update_patch_limits should not use CLOSEPOLY verticies for updating 
-* :ghissue:`16123`: test_dpi_ratio_change fails on Windows/Qt5Agg
-* :ghissue:`15796`: [DOC] PDF build of matplotlib own documentation crashes with LaTeX error "too deeply nested"
-* :ghissue:`19091`: 3D Axes don't work in SubFigures
-* :ghissue:`7238`: better document how to configure artists for picking
-* :ghissue:`11147`: FR: add a supxlabel and supylabel as the suptitle function which are already exist
-* :ghissue:`17417`: tutorial on how autoscaling works
-* :ghissue:`18917`: Spy displays nothing for full arrays
-* :ghissue:`18562`: Allow slider valstep to be arraylike
-* :ghissue:`18942`: AnnotationBbox errors with kwargs
-* :ghissue:`11472`: Mention predefined keyboard shortcuts in the docs on event-handling
-* :ghissue:`18898`: wrong bounds checking in streamplot start_points
-* :ghissue:`18974`: Contour label demo would benefit from some more info and/or references.
-* :ghissue:`17708`: Mention rasterized option in more methods
-* :ghissue:`18826`: Pgf plots with pdflatex broken
-* :ghissue:`18959`: Add sphinx-gallery cross ref instructions to documenting guide
-* :ghissue:`18926`: Font not installed, unclear warning
-* :ghissue:`18891`: SVG animation doesn't work in HTMLWriter due to wrong type
-* :ghissue:`18222`: It is painful as a new user, to figure out what AxesSubplot is
-* :ghissue:`16153`: gap size for contour labels is poorly estimated
-* :ghissue:`17910`: Improve accessibility of form controls in HTML widgets
-* :ghissue:`18273`: Surprising behavior of shared axes with categorical units
-* :ghissue:`18731`: Compact string notation for subplot_mosaic
-* :ghissue:`18221`: Add example of keys to explore 3D data
-* :ghissue:`18882`: Incorrect version requirement message from setup.py
-* :ghissue:`18491`: Mostly unused glossary still exists in our docs
-* :ghissue:`18548`: add_subplot(..., axes_cls=...)
-* :ghissue:`8249`: Bug in mpl_connect(): On Windows, with the wx backend, arrow keys are not reported
-* :ghissue:`15609`: [SPRINT] Update Named Colors Example
-* :ghissue:`18800`: Log-scale ticker fails at 1e-323
-* :ghissue:`18392`: ``scatter()``: ``edgecolor`` takes precedence over ``edgecolors``
-* :ghissue:`18301`: "How to use Matplotlib in a web application server" should be made an example
-* :ghissue:`18386`: Path3DCollection.set_color(self, c) does not change the color of scatter points.
-* :ghissue:`8946`: Axes with sharex can have divergent axes after setting tick markers
-* :ghissue:`2294`: tex option not respected by date x-axis
-* :ghissue:`4382`: use new binary comm in nbagg 
-* :ghissue:`17088`: ``projection`` kwarg could be better documented.  
-* :ghissue:`18717`: Tick formatting issues on horizontal histogram with datetime on 3.3.2
-* :ghissue:`12636`: Characters doesn't display correctly when figure saved as pdf with a custom font
-* :ghissue:`18377`: Matplotlib picks a headless backend on Linux if Wayland is available but X11 isn't
-* :ghissue:`13199`: Examples that use private APIs
-* :ghissue:`18662`: Inconsistent setting of axis limits with autoscale=False
-* :ghissue:`18690`: Class deprecation machinery and mixins
-* :ghissue:`18510`: Build fails on OS X: wrong minimum version
-* :ghissue:`18641`: Conversion cache cleaning is broken with xdist
-* :ghissue:`15614`: named color examples need borders
-* :ghissue:`5519`: The linestyle 'None',  ' ' and '' not supported by PathPatch.
-* :ghissue:`17487`: Polygon selector with useblit=True - polygon dissapears
-* :ghissue:`17476`: RectangleSelector fails to clear itself after being toggled inactive and then back to active.
-* :ghissue:`18600`: plt.errorbar raises error when given marker=<matplotlib.markers.MarkerStyle object>
-* :ghissue:`18355`: Optional components required to build docs aren't documented
-* :ghissue:`18428`: small bug in the mtplotlib gallery
-* :ghissue:`4438`: inconsistent behaviour of the errorevery option in pyplot.errorbar() to the markevery keyword
-* :ghissue:`5823`: pleas dont include the Google Analytics tracking in the off-line doc
-* :ghissue:`13035`: Path3DCollection from 3D scatter cannot set_color
-* :ghissue:`9725`: scatter - set_facecolors is not working on Axes3D
-* :ghissue:`3370`: Patch3DCollection doesn't update color after calling set_color
-* :ghissue:`18427`: yaxis.set_label_position("right") resets "horizontalalignment"
-* :ghissue:`3129`: super-ify the code base
-* :ghissue:`17518`: Plotting legend throws error "font family ['serif'] not found. Falling back to DejaVu Sans"
-* :ghissue:`18282`: Bad interaction between kerning and non-latin1 characters in pdf output
-* :ghissue:`6669`: [Feature request] Functions for "manually" plotting histograms
-* :ghissue:`18411`: 2-D array RGB and RGBA values not understood in plt.plot()
-* :ghissue:`18404`: Double-click events are not recognised in Jupyter notebook
-* :ghissue:`12027`: marker_props is never used in the constructor of RectangleSelector
-* :ghissue:`18438`: Warn when a non-started animation is gc'ed.
-* :ghissue:`11259`: Symbols appear as streaks with usetex=True, times font and PDF backend
-* :ghissue:`18345`: Specify what sharex and sharey do...
-* :ghissue:`18082`: Feature Request: Non overlapping Bubble Plots
-* :ghissue:`568`: Support error bars on 3D plots
-* :ghissue:`17865`: Earlier validation of color inputs
-* :ghissue:`18363`: ha="right" breaks AnchoredText placement.
-* :ghissue:`11050`: keyboard shortcuts don't get registered using the experimental toolmanager with qt
-* :ghissue:`17906`: Set mathtext.fontset per element
-* :ghissue:`18311`: Subplot scatter plot with categorical data on y-axis with 'sharey=True' option overwrites the y-axis labels
-* :ghissue:`10304`: No link to shared axes for Axis.set_units
-* :ghissue:`17712`: constrained_layout fails on suptitle+colorbars+some figure sizes
-* :ghissue:`14638`: colorbar.make_axes doesn't anchor in constrained_layout
-* :ghissue:`18299`: New configure_subplots behaves badly on TkAgg backend
-* :ghissue:`18300`: Remove the examples category "Our Favorite Recipies"
-* :ghissue:`18077`: Imshow breaks if given a unyt_array input
-* :ghissue:`7074`: Using a linestyle cycler with plt.errorbar results in strange plots
-* :ghissue:`18236`: FuncAnimation fails to display with interval 0 on Tkagg backend
-* :ghissue:`8107`:  invalid command name "..._on_timer" in FuncAnimation for (too) small interval
-* :ghissue:`18272`: Add CI Intervall to boxplot notch documentation
-* :ghissue:`18137`: axhspan() in empty plots changes the xlimits of plots sharing the X axis
-* :ghissue:`18246`: test_never_update is flaky
-* :ghissue:`5856`: Horizontal stem plot
-* :ghissue:`18160`: Add feature request template
-* :ghissue:`17197`: Missing character upon savefig() with Free Serif font
-* :ghissue:`17013`: Request: provide a contextmanager for ioff or allow plt.figure(draw_on_create=False)
-* :ghissue:`17537`: hat graphs need an example...
-* :ghissue:`17755`: mplot3d: add_collection3d issues
-* :ghissue:`18192`: Cannot save SVG file with FIPS compliant Python
-* :ghissue:`17574`: Vertical alignment of tick labels containing minus in font size other than 10 with usetex=True
-* :ghissue:`18097`: Feature Request: Allow hexbin to use a string for parameter C to refer to column in data (DataFrame)
-* :ghissue:`17689`: Add pause/resume methods to Animation baseclass
-* :ghissue:`16087`: Error with greek letters in pdf export when using usetex=True and mathptmx
-* :ghissue:`17136`: set_ticks() changes view limits of the axis
-* :ghissue:`12198`: axvline incorrectly tries to handle unitized ymin, ymax
-* :ghissue:`9139`: Python3 matplotlib 2.0.2 with Times New Roman misses unicode minus sign in pdf
-* :ghissue:`5970`: pyplot.scatter raises obscure error when mistakenly passed a third string param
-* :ghissue:`17936`: documenattion and behavior do not match for suppressing (PDF) metadata
-* :ghissue:`17932`: latex textrm does not work in Cairo backend
-* :ghissue:`17714`: Universal fullscreen command 
-* :ghissue:`4584`: ColorbarBase draws edges in slightly wrong positions. 
-* :ghissue:`17878`: flipping of imshow in specgram
-* :ghissue:`6118`: consider using qtpy for qt abstraction layer
-* :ghissue:`17908`: rcParams restrictions on frame_formats are out of sync with supported values (HTMLWriter)
-* :ghissue:`17867`: datetime plotting broken on master
-* :ghissue:`16810`: Docs do not build in parallel
-* :ghissue:`17918`: Extend hatch reference
-* :ghissue:`17149`: Rasterization creates multiple bitmap elements and large file sizes
-* :ghissue:`17855`: Add Hatch Example to gallery
-* :ghissue:`15821`: Should constrained_layout work as plt.figure() argument?
-* :ghissue:`15616`: Colormaps should have a ``_repr_html_`` that is an image of the colormap
-* :ghissue:`17579`: ``BoundaryNorm`` yield a ``ZeroDivisionError: division by zero`` 
-* :ghissue:`17652`: NEP 29 : Stop support fro Python 3.6 soon ?
-* :ghissue:`11095`: Repeated plot calls with xunits=None throws exception
-* :ghissue:`17733`: Rename "array" (and perhaps "fields") section of Axes API
-* :ghissue:`15610`: Link to most recent DevDocs when installing from Master Source
-* :ghissue:`17817`: (documentation, possible first-timer bug) Typo and grammar on Legends and Annotations for tight layout guide page
-* :ghissue:`17804`: Setting the norm on imshow object removes colorbar ylabel
-* :ghissue:`17758`: bar, barh should take a list of hatches like it does of colors
-* :ghissue:`17746`: Antialiasing with colorbars?
-* :ghissue:`17659`: Enhancement: Set tick and ticklabel colors separately from matplotlib style file
-* :ghissue:`17144`: Wrong icon on windows task bar for figure windows
-* :ghissue:`2870`: Wrong symbols from a TrueType font
-
-
-Previous GitHub Stats
----------------------
+Pull Requests (86):
+
+* :ghpull:`24341`: Backport PR #24301 on branch v3.6.x (Restore get_renderer function in deprecated tight_layout)
+* :ghpull:`24301`: Restore get_renderer function in deprecated tight_layout
+* :ghpull:`24337`: Backport PR #24238 on branch v3.6.x (Update example and docstring to encourage the use of functools.partial in FuncAnimation)
+* :ghpull:`24336`: Backport PR #24335 on branch v3.6.x (Fix missing word in ImageMagickWriter docstring.)
+* :ghpull:`20358`: Updates example and docstring to encourage the use of functools.partial in FuncAnimation
+* :ghpull:`24238`: Update example and docstring to encourage the use of functools.partial in FuncAnimation
+* :ghpull:`24335`: Fix missing word in ImageMagickWriter docstring.
+* :ghpull:`24330`: Backport PR #24282 on branch v3.6.x (Fix some minor docstring typos)
+* :ghpull:`24323`: Backport PR #24320 on branch v3.6.x (DOC: add warning note to imsave)
+* :ghpull:`24282`: Fix some minor docstring typos
+* :ghpull:`24327`: Backport PR #24310 on branch v3.6.x (show axes changing in animate decay example)
+* :ghpull:`24310`: show axes changing in animate decay example
+* :ghpull:`24324`: Backport PR #24259 on branch v3.6.x (Move empty hexbin fix to make_norm_from_scale.)
+* :ghpull:`24325`: Backport PR #24095 on branch v3.6.x (nb/webagg: Move mouse events to outer canvas div)
+* :ghpull:`24326`: Backport PR #24318 on branch v3.6.x (Bump pypa/cibuildwheel from 2.11.1 to 2.11.2)
+* :ghpull:`24318`: Bump pypa/cibuildwheel from 2.11.1 to 2.11.2
+* :ghpull:`24095`: nb/webagg: Move mouse events to outer canvas div
+* :ghpull:`24259`: Move empty hexbin fix to make_norm_from_scale.
+* :ghpull:`24320`: DOC: add warning note to imsave
+* :ghpull:`24297`: Backport PR #24294 on branch v3.6.x (Run test if fontconfig is present)
+* :ghpull:`24294`: Run test if fontconfig is present
+* :ghpull:`24286`: Backport PR #24284 on branch v3.6.x (Remove comment about cmap from voxels docstring)
+* :ghpull:`24284`: Remove comment about cmap from voxels docstring
+* :ghpull:`24280`: Backport PR #24145 on branch v3.6.x (Updated Angles on Bracket arrow styles example to make angles clear #23176)
+* :ghpull:`24145`: Updated Angles on Bracket arrow styles example to make angles clear #23176
+* :ghpull:`24270`: Backport PR #24265 on branch v3.6.x (Restore (and warn on) seaborn styles in style.library)
+* :ghpull:`24271`: Backport PR #24266 on branch v3.6.x (TST: Increase fp tolerance on more tests for new NumPy)
+* :ghpull:`24266`: TST: Increase fp tolerance on more tests for new NumPy
+* :ghpull:`24265`: Restore (and warn on) seaborn styles in style.library
+* :ghpull:`24267`: Backport PR #24261 on branch v3.6.x (Fix pie chart in demo_agg_filter.py)
+* :ghpull:`24261`: Fix pie chart in demo_agg_filter.py
+* :ghpull:`24258`: Backport PR #24108 on branch v3.6.x (Add 3D plots to plot_types doc page)
+* :ghpull:`24108`: Add 3D plots to plot_types doc page
+* :ghpull:`24255`: Backport PR #24250 on branch v3.6.x (Fix key reporting in pick events)
+* :ghpull:`24250`: Fix key reporting in pick events
+* :ghpull:`24237`: Backport PR #24197 on branch v3.6.x (Properly set and inherit backend_version.)
+* :ghpull:`24197`: Properly set and inherit backend_version.
+* :ghpull:`24234`: Backport PR #23607 on branch v3.6.x (DOC: document that appearance is part of our stable API)
+* :ghpull:`24233`: Backport PR #23985 on branch v3.6.x (Improve rubberband rendering in wx and tk)
+* :ghpull:`24232`: Backport PR #24096 on branch v3.6.x ([DOC]: Add simple animation scatter plot to the example documentation)
+* :ghpull:`24231`: Backport PR #24009 on branch v3.6.x (Fix evaluating colormaps on non-numpy arrays)
+* :ghpull:`24230`: Backport PR #24229 on branch v3.6.x (FIX: do not mutate dictionaries passed in by user)
+* :ghpull:`23607`: DOC: document that appearance is part of our stable API
+* :ghpull:`23985`: Improve rubberband rendering in wx and tk
+* :ghpull:`24096`: [DOC]: Add simple animation scatter plot to the example documentation
+* :ghpull:`24009`: Fix evaluating colormaps on non-numpy arrays
+* :ghpull:`24229`: FIX: do not mutate dictionaries passed in by user
+* :ghpull:`24223`: Backport PR #24184 on branch v3.6.x (Add tests for ToolManager)
+* :ghpull:`24219`: Backport PR #23995 on branch v3.6.x (DOC: Lowercase some parameter names)
+* :ghpull:`23995`: DOC: Lowercase some parameter names
+* :ghpull:`24184`: Add tests for ToolManager
+* :ghpull:`24211`: Backport PR #24202 on branch v3.6.x (Bump pypa/cibuildwheel from 2.10.2 to 2.11.1)
+* :ghpull:`24214`: Backport PR #24169 on branch v3.6.x ([DOC]: added parent link for ``FuncAnimation`` and ``ArtistAnimation``)
+* :ghpull:`24169`: [DOC]: add parent link for ``FuncAnimation`` and ``ArtistAnimation``
+* :ghpull:`24202`: Bump pypa/cibuildwheel from 2.10.2 to 2.11.1
+* :ghpull:`24206`: Backport PR #24081 on branch v3.6.x (TST: force test with shared test image to run in serial)
+* :ghpull:`24181`: Backport PR #24177 on branch v3.6.x (Don't simplify paths used for autoscaling)
+* :ghpull:`24200`: Backport PR #24193 on branch v3.6.x (DOC: Explain gridsize in hexbin())
+* :ghpull:`24201`: Backport PR #24194 on branch v3.6.x (DOC: Improve plot_directive documentation)
+* :ghpull:`24194`: DOC: Improve plot_directive documentation
+* :ghpull:`24193`: DOC: Explain gridsize in hexbin()
+* :ghpull:`24192`: Backport PR #24187 on branch v3.6.x (DOC: Fix toc structure in explain/interactive)
+* :ghpull:`24186`: Backport PR #24157 on branch v3.6.x (test only PR milestoning guidance)
+* :ghpull:`24187`: DOC: Fix toc structure in explain/interactive
+* :ghpull:`24190`: DOC: fix markup
+* :ghpull:`24157`: test only PR milestoning guidance
+* :ghpull:`24183`: Backport PR #24178 on branch v3.6.x (Fall back to Python-level Thread for GUI warning)
+* :ghpull:`24180`: Backport PR #24173 on branch v3.6.x (TST: convert nose-style tests)
+* :ghpull:`24178`: Fall back to Python-level Thread for GUI warning
+* :ghpull:`24177`: Don't simplify paths used for autoscaling
+* :ghpull:`24173`: TST: convert nose-style tests
+* :ghpull:`24174`: Backport PR #24171 on branch v3.6.x (Fix example where wrong variable was used)
+* :ghpull:`24176`: Backport PR #24167 on branch v3.6.x (FIX: turn off layout engine tightbbox)
+* :ghpull:`24167`: FIX: turn off layout engine tightbbox
+* :ghpull:`24171`: Fix example where wrong variable was used
+* :ghpull:`24172`: Backport PR #24158 on branch v3.6.x (Fix Qt with PySide6 6.4.0)
+* :ghpull:`24158`: Fix Qt with PySide6 6.4.0
+* :ghpull:`24165`: Backport PR #24164 on branch v3.6.x (Fix argument order in hist() docstring.)
+* :ghpull:`24164`: Fix argument order in hist() docstring.
+* :ghpull:`24151`: Backport PR #24149 on branch v3.6.x (FIX: handle input to ax.bar that is all nan)
+* :ghpull:`24149`: FIX: handle input to ax.bar that is all nan
+* :ghpull:`24146`: Backport PR #24137 on branch v3.6.x (Add note about blitting and zorder in animations)
+* :ghpull:`24137`: Add note about blitting and zorder in animations
+* :ghpull:`24134`: Backport PR #24130 on branch v3.6.x (DOC: align contour parameter doc with implementation)
+* :ghpull:`24130`: DOC: align contour parameter doc with implementation
+* :ghpull:`24081`: TST: force test with shared test image to run in serial
+
+Issues (21):
+
+* :ghissue:`20326`: FuncAnimation Named Arguments
+* :ghissue:`24332`: [Bug]: backend bug in matplotlib==3.6.1 with python3.11 and PySide6==6.4.0.1
+* :ghissue:`24296`: [Doc]:  Axes limits not updated in animate decay
+* :ghissue:`24089`: [Bug]: Resizing does not work in WebAgg backend in Safari
+* :ghissue:`3657`: matplotlib.pyplot.imsave colormaps some grayscale images before saving them
+* :ghissue:`24060`: [TST] Upcoming dependency test failures
+* :ghissue:`24264`: [Bug]: Setting matplotlib.pyplot.style.library['seaborn-colorblind'] result in key error on matplotlib v3.6.1
+* :ghissue:`23900`: [Doc]: Adding some 3D plots to plot gallery
+* :ghissue:`24199`: [Bug]: pick events do not forward mouseevent-key on Linux
+* :ghissue:`23969`: [ENH]: Make rubber band more visible
+* :ghissue:`23132`: [Bug]: call cmap object on torch.tensor will output first element all 0
+* :ghissue:`21349`: [Bug]: Hexbin gridsize interpreted differently for x and y
+* :ghissue:`22905`: [Doc]: Duplicated toc entries
+* :ghissue:`24094`: [Bug]: macOS: PyPy 3.8 (v7.3.9) threading get_native_id Broken
+* :ghissue:`24097`: [Bug]: ax.hist density not auto-scaled when using histtype='step'
+* :ghissue:`24148`: remove nose-style test classes
+* :ghissue:`24133`: [Bug]: Incorrect crop after constrained layout with equal aspect ratio and bbox_inches = tight
+* :ghissue:`24155`: [Bug]: TypeError: int() argument must be a string, a bytes-like object or a number, not 'KeyboardModifier'
+* :ghissue:`24127`: [Bug]: ax.bar raises for all-nan data on matplotlib 3.6.1
+* :ghissue:`2959`: artists zorder is ignored during animations
+* :ghissue:`24121`: [Doc]: Contour functions: auto-generated levels
+
+
+Previous GitHub statistics
+--------------------------
 
 
 .. toctree::
diff --git a/doc/users/index.rst b/doc/users/index.rst
index 852ca4321e90..0ecff14c9a23 100644
--- a/doc/users/index.rst
+++ b/doc/users/index.rst
@@ -1,24 +1,41 @@
 .. _users-guide-index:
 
-############
-User's Guide
-############
+.. redirect-from:: /contents
 
-.. only:: html
 
-    :Release: |version|
-    :Date: |today|
+###########
+Users guide
+###########
+
+General
+#######
+
+.. toctree::
+   :maxdepth: 2
+
+   getting_started/index.rst
+   installing/index.rst
+   explain/index.rst
+   faq/index.rst
+   resources/index.rst
+
+Tutorials and examples
+######################
 
 .. toctree::
-    :maxdepth: 2
-
-    installing.rst
-    ../tutorials/index.rst
-    interactive.rst
-    whats_new.rst
-    history.rst
-    github_stats.rst
-    whats_new_old.rst
-    license.rst
-    ../citing.rst
-    credits.rst
+   :maxdepth: 1
+
+   ../plot_types/index.rst
+   ../tutorials/index.rst
+   ../gallery/index.rst
+
+Reference
+#########
+
+.. toctree::
+   :maxdepth: 2
+
+   ../api/index.rst
+   ../devel/index.rst
+   project/index.rst
+   release_notes.rst
diff --git a/doc/users/installing.rst b/doc/users/installing.rst
deleted file mode 100644
index 545ae4fa153e..000000000000
--- a/doc/users/installing.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../../INSTALL.rst
diff --git a/doc/users/installing/index.rst b/doc/users/installing/index.rst
new file mode 100644
index 000000000000..1b6fdf65055f
--- /dev/null
+++ b/doc/users/installing/index.rst
@@ -0,0 +1,328 @@
+.. redirect-from:: /users/installing
+
+############
+Installation
+############
+
+==============================
+Installing an official release
+==============================
+
+Matplotlib releases are available as wheel packages for macOS, Windows and
+Linux on `PyPI <https://pypi.org/project/matplotlib/>`_. Install it using
+``pip``:
+
+.. code-block:: sh
+
+  python -m pip install -U pip
+  python -m pip install -U matplotlib
+
+If this command results in Matplotlib being compiled from source and
+there's trouble with the compilation, you can add ``--prefer-binary`` to
+select the newest version of Matplotlib for which there is a
+precompiled wheel for your OS and Python.
+
+.. note::
+
+   The following backends work out of the box: Agg, ps, pdf, svg
+
+   Python is typically shipped with tk bindings which are used by
+   TkAgg.
+
+   For support of other GUI frameworks, LaTeX rendering, saving
+   animations and a larger selection of file formats, you can
+   install :ref:`optional_dependencies`.
+
+=========================
+Third-party distributions
+=========================
+
+Various third-parties provide Matplotlib for their environments.
+
+Conda packages
+==============
+Matplotlib is available both via the *anaconda main channel*
+
+.. code-block:: sh
+
+   conda install matplotlib
+
+as well as via the *conda-forge community channel*
+
+.. code-block:: sh
+
+   conda install -c conda-forge matplotlib
+
+Python distributions
+====================
+
+Matplotlib is part of major Python distributions:
+
+- `Anaconda <https://www.anaconda.com/>`_
+
+- `ActiveState ActivePython
+  <https://www.activestate.com/products/python/downloads/>`_
+
+- `WinPython <https://winpython.github.io/>`_
+
+Linux package manager
+=====================
+
+If you are using the Python version that comes with your Linux distribution,
+you can install Matplotlib via your package manager, e.g.:
+
+* Debian / Ubuntu: ``sudo apt-get install python3-matplotlib``
+* Fedora: ``sudo dnf install python3-matplotlib``
+* Red Hat: ``sudo yum install python3-matplotlib``
+* Arch: ``sudo pacman -S python-matplotlib``
+
+.. redirect-from:: /users/installing/installing_source
+
+.. _install_from_source:
+
+==========================
+Installing a nightly build
+==========================
+
+Matplotlib makes nightly development build wheels available on the
+`scipy-wheels-nightly Anaconda Cloud organization
+<https://anaconda.org/scipy-wheels-nightly>`_.
+These wheels can be installed with ``pip`` by specifying scipy-wheels-nightly
+as the package index to query:
+
+.. code-block:: sh
+
+  python -m pip install \
+    --upgrade \
+    --pre \
+    --index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple \
+    --extra-index-url https://pypi.org/simple \
+    matplotlib
+
+======================
+Installing from source
+======================
+
+If you are interested in contributing to Matplotlib development,
+running the latest source code, or just like to build everything
+yourself, it is not difficult to build Matplotlib from source.
+
+First you need to install the :ref:`dependencies`.
+
+A C compiler is required.  Typically, on Linux, you will need ``gcc``, which
+should be installed using your distribution's package manager; on macOS, you
+will need xcode_; on Windows, you will need `Visual Studio`_ 2015 or later.
+
+For those using Visual Studio, make sure "Desktop development with C++" is
+selected, and that the latest MSVC, "C++ CMake tools for Windows," and a
+Windows SDK compatible with your version of Windows are selected and installed.
+They should be selected by default under the "Optional" subheading, but are
+required to build matplotlib from source.
+
+.. _xcode: https://guide.macports.org/chunked/installing.html#installing.xcode
+
+.. _Visual Studio: https://visualstudio.microsoft.com/downloads/
+
+The easiest way to get the latest development version to start contributing
+is to go to the git `repository <https://github.com/matplotlib/matplotlib>`_
+and run::
+
+  git clone https://github.com/matplotlib/matplotlib.git
+
+or::
+
+  git clone git@github.com:matplotlib/matplotlib.git
+
+If you're developing, it's better to do it in editable mode. The reason why
+is that pytest's test discovery only works for Matplotlib
+if installation is done this way. Also, editable mode allows your code changes
+to be instantly propagated to your library code without reinstalling (though
+you will have to restart your python process / kernel)::
+
+  cd matplotlib
+  python -m pip install -e .
+
+If you're not developing, it can be installed from the source directory with
+a simple (just replace the last step)::
+
+  python -m pip install .
+
+To run the tests you will need to install some additional dependencies::
+
+  python -m pip install -r requirements/dev/dev-requirements.txt
+
+Then, if you want to update your Matplotlib at any time, just do::
+
+  git pull
+
+When you run ``git pull``, if the output shows that only Python files have
+been updated, you are all set. If C files have changed, you need to run ``pip
+install -e .`` again to compile them.
+
+There is more information on :ref:`using git <using-git>` in the developer
+docs.
+
+.. warning::
+
+  The following instructions in this section are for very custom
+  installations of Matplotlib. Proceed with caution because these instructions
+  may result in your build producing unexpected behavior and/or causing
+  local testing to fail.
+
+If you would like to build from a tarball, grab the latest *tar.gz* release
+file from `the PyPI files page <https://pypi.org/project/matplotlib/>`_.
+
+We provide a `mplsetup.cfg`_ file which you can use to customize the build
+process. For example, which default backend to use, whether some of the
+optional libraries that Matplotlib ships with are installed, and so on.  This
+file will be particularly useful to those packaging Matplotlib.
+
+.. _mplsetup.cfg: https://raw.githubusercontent.com/matplotlib/matplotlib/main/mplsetup.cfg.template
+
+If you are building your own Matplotlib wheels (or sdists) on Windows, note
+that any DLLs that you copy into the source tree will be packaged too.
+
+==========================
+Installing for development
+==========================
+See :ref:`installing_for_devs`.
+
+.. redirect-from:: /faq/installing_faq
+.. redirect-from:: /users/faq/installing_faq
+
+.. _installing-faq:
+
+==========================
+Frequently asked questions
+==========================
+
+.. contents::
+   :backlinks: none
+   :local:
+
+Report a compilation problem
+============================
+
+See :ref:`reporting-problems`.
+
+Matplotlib compiled fine, but nothing shows up when I use it
+============================================================
+
+The first thing to try is a :ref:`clean install <clean-install>` and see if
+that helps.  If not, the best way to test your install is by running a script,
+rather than working interactively from a python shell or an integrated
+development environment such as :program:`IDLE` which add additional
+complexities. Open up a UNIX shell or a DOS command prompt and run, for
+example::
+
+   python -c "from pylab import *; set_loglevel('debug'); plot(); show()"
+
+This will give you additional information about which backends Matplotlib is
+loading, version information, and more. At this point you might want to make
+sure you understand Matplotlib's :doc:`configuration </tutorials/introductory/customizing>`
+process, governed by the :file:`matplotlibrc` configuration file which contains
+instructions within and the concept of the Matplotlib backend.
+
+If you are still having trouble, see :ref:`reporting-problems`.
+
+.. _clean-install:
+
+How to completely remove Matplotlib
+===================================
+
+Occasionally, problems with Matplotlib can be solved with a clean
+installation of the package.  In order to fully remove an installed Matplotlib:
+
+1. Delete the caches from your :ref:`Matplotlib configuration directory
+   <locating-matplotlib-config-dir>`.
+
+2. Delete any Matplotlib directories or eggs from your :ref:`installation
+   directory <locating-matplotlib-install>`.
+
+OSX Notes
+=========
+
+.. _which-python-for-osx:
+
+Which python for OSX?
+---------------------
+
+Apple ships OSX with its own Python, in ``/usr/bin/python``, and its own copy
+of Matplotlib. Unfortunately, the way Apple currently installs its own copies
+of NumPy, Scipy and Matplotlib means that these packages are difficult to
+upgrade (see `system python packages`_).  For that reason we strongly suggest
+that you install a fresh version of Python and use that as the basis for
+installing libraries such as NumPy and Matplotlib.  One convenient way to
+install Matplotlib with other useful Python software is to use the Anaconda_
+Python scientific software collection, which includes Python itself and a
+wide range of libraries; if you need a library that is not available from the
+collection, you can install it yourself using standard methods such as *pip*.
+See the Anaconda web page for installation support.
+
+.. _system python packages:
+    https://github.com/MacPython/wiki/wiki/Which-Python#system-python-and-extra-python-packages
+.. _Anaconda: https://www.anaconda.com/
+
+Other options for a fresh Python install are the standard installer from
+`python.org <https://www.python.org/downloads/mac-osx/>`_, or installing
+Python using a general OSX package management system such as `homebrew
+<https://brew.sh/>`_ or `macports <https://www.macports.org>`_.  Power users on
+OSX will likely want one of homebrew or macports on their system to install
+open source software packages, but it is perfectly possible to use these
+systems with another source for your Python binary, such as Anaconda
+or Python.org Python.
+
+.. _install_osx_binaries:
+
+Installing OSX binary wheels
+----------------------------
+
+If you are using Python from https://www.python.org, Homebrew, or Macports,
+then you can use the standard pip installer to install Matplotlib binaries in
+the form of wheels.
+
+pip is installed by default with python.org and Homebrew Python, but needs to
+be manually installed on Macports with ::
+
+   sudo port install py38-pip
+
+Once pip is installed, you can install Matplotlib and all its dependencies with
+from the Terminal.app command line::
+
+   python3 -m pip install matplotlib
+
+You might also want to install IPython or the Jupyter notebook (``python3 -m pip
+install ipython notebook``).
+
+Checking your installation
+--------------------------
+
+The new version of Matplotlib should now be on your Python "path".  Check this
+at the Terminal.app command line::
+
+  python3 -c 'import matplotlib; print(matplotlib.__version__, matplotlib.__file__)'
+
+You should see something like ::
+
+  3.6.0 /Library/Frameworks/Python.framework/Versions/3.9/lib/python3.9/site-packages/matplotlib/__init__.py
+
+where ``3.6.0`` is the Matplotlib version you just installed, and the path
+following depends on whether you are using Python.org Python, Homebrew or
+Macports.  If you see another version, or you get an error like ::
+
+    Traceback (most recent call last):
+      File "<string>", line 1, in <module>
+    ImportError: No module named matplotlib
+
+then check that the Python binary is the one you expected by running ::
+
+  which python3
+
+If you get a result like ``/usr/bin/python...``, then you are getting the
+Python installed with OSX, which is probably not what you want.  Try closing
+and restarting Terminal.app before running the check again. If that doesn't fix
+the problem, depending on which Python you wanted to use, consider reinstalling
+Python.org Python, or check your homebrew or macports setup.  Remember that
+the disk image installer only works for Python.org Python, and will not get
+picked up by other Pythons.  If all these fail, please :ref:`let us know
+<reporting-problems>`.
diff --git a/doc/users/license.rst b/doc/users/license.rst
deleted file mode 100644
index 4dcb0798712f..000000000000
--- a/doc/users/license.rst
+++ /dev/null
@@ -1,141 +0,0 @@
-.. _license:
-
-***********************************************
-License
-***********************************************
-
-
-Matplotlib only uses BSD compatible code, and its license is based on
-the `PSF <https://python.org/psf/license>`_ license.  See the Open
-Source Initiative `licenses page
-<https://www.opensource.org/licenses>`_ for details on individual
-licenses. Non-BSD compatible licenses (e.g., LGPL) are acceptable in
-matplotlib toolkits.  For a discussion of the motivations behind the
-licencing choice, see :ref:`license-discussion`.
-
-Copyright Policy
-================
-
-John Hunter began matplotlib around 2003.  Since shortly before his
-passing in 2012, Michael Droettboom has been the lead maintainer of
-matplotlib, but, as has always been the case, matplotlib is the work
-of many.
-
-Prior to July of 2013, and the 1.3.0 release, the copyright of the
-source code was held by John Hunter.  As of July 2013, and the 1.3.0
-release, matplotlib has moved to a shared copyright model.
-
-matplotlib uses a shared copyright model. Each contributor maintains
-copyright over their contributions to matplotlib. But, it is important to
-note that these contributions are typically only changes to the
-repositories. Thus, the matplotlib source code, in its entirety, is not
-the copyright of any single person or institution.  Instead, it is the
-collective copyright of the entire matplotlib Development Team.  If
-individual contributors want to maintain a record of what
-changes/contributions they have specific copyright on, they should
-indicate their copyright in the commit message of the change, when
-they commit the change to one of the matplotlib repositories.
-
-The Matplotlib Development Team is the set of all contributors to the
-matplotlib project.  A full list can be obtained from the git version
-control logs.
-
-License agreement for matplotlib |version|
-==============================================
-
-1. This LICENSE AGREEMENT is between the Matplotlib Development Team
-("MDT"), and the Individual or Organization ("Licensee") accessing and
-otherwise using matplotlib software in source or binary form and its
-associated documentation.
-
-2. Subject to the terms and conditions of this License Agreement, MDT
-hereby grants Licensee a nonexclusive, royalty-free, world-wide license
-to reproduce, analyze, test, perform and/or display publicly, prepare
-derivative works, distribute, and otherwise use matplotlib |version|
-alone or in any derivative version, provided, however, that MDT's
-License Agreement and MDT's notice of copyright, i.e., "Copyright (c)
-2012-2013 Matplotlib Development Team; All Rights Reserved" are retained in
-matplotlib |version| alone or in any derivative version prepared by
-Licensee.
-
-3. In the event Licensee prepares a derivative work that is based on or
-incorporates matplotlib |version| or any part thereof, and wants to
-make the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to matplotlib |version|.
-
-4. MDT is making matplotlib |version| available to Licensee on an "AS
-IS" basis.  MDT MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, MDT MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB |version|
-WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. MDT SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
-|version| FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
-LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
-MATPLOTLIB |version|, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
-THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-7. Nothing in this License Agreement shall be deemed to create any
-relationship of agency, partnership, or joint venture between MDT and
-Licensee.  This License Agreement does not grant permission to use MDT
-trademarks or trade name in a trademark sense to endorse or promote
-products or services of Licensee, or any third party.
-
-8. By copying, installing or otherwise using matplotlib |version|,
-Licensee agrees to be bound by the terms and conditions of this License
-Agreement.
-
-License agreement for matplotlib versions prior to 1.3.0
-========================================================
-
-1. This LICENSE AGREEMENT is between John D. Hunter ("JDH"), and the
-Individual or Organization ("Licensee") accessing and otherwise using
-matplotlib software in source or binary form and its associated
-documentation.
-
-2. Subject to the terms and conditions of this License Agreement, JDH
-hereby grants Licensee a nonexclusive, royalty-free, world-wide license
-to reproduce, analyze, test, perform and/or display publicly, prepare
-derivative works, distribute, and otherwise use matplotlib |version|
-alone or in any derivative version, provided, however, that JDH's
-License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
-2002-2009 John D. Hunter; All Rights Reserved" are retained in
-matplotlib |version| alone or in any derivative version prepared by
-Licensee.
-
-3. In the event Licensee prepares a derivative work that is based on or
-incorporates matplotlib |version| or any part thereof, and wants to
-make the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to matplotlib |version|.
-
-4. JDH is making matplotlib |version| available to Licensee on an "AS
-IS" basis.  JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB |version|
-WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
-|version| FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
-LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
-MATPLOTLIB |version|, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
-THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-7. Nothing in this License Agreement shall be deemed to create any
-relationship of agency, partnership, or joint venture between JDH and
-Licensee.  This License Agreement does not grant permission to use JDH
-trademarks or trade name in a trademark sense to endorse or promote
-products or services of Licensee, or any third party.
-
-8. By copying, installing or otherwise using matplotlib |version|,
-Licensee agrees to be bound by the terms and conditions of this License
-Agreement.
diff --git a/doc/users/next_whats_new.rst b/doc/users/next_whats_new.rst
new file mode 100644
index 000000000000..ddd82faf6731
--- /dev/null
+++ b/doc/users/next_whats_new.rst
@@ -0,0 +1,13 @@
+.. _whats-new:
+
+================
+Next what's new?
+================
+
+.. ifconfig:: releaselevel == 'dev'
+
+   .. toctree::
+      :glob:
+      :maxdepth: 1
+
+      next_whats_new/*
diff --git a/doc/users/next_whats_new/README.rst b/doc/users/next_whats_new/README.rst
index 6555d229a1b5..e1b27ef97f1e 100644
--- a/doc/users/next_whats_new/README.rst
+++ b/doc/users/next_whats_new/README.rst
@@ -15,7 +15,7 @@ Please avoid using references in section titles, as it causes links to be
 confusing in the table of contents.  Instead, ensure that a reference is
 included in the descriptive text.  Include contents of the form: ::
 
-    Section Title for Feature
+    Section title for feature
     -------------------------
 
     A bunch of text about how awesome the new feature is and examples of how
diff --git a/doc/users/prev_whats_new/changelog.rst b/doc/users/prev_whats_new/changelog.rst
index e35878e9935e..f1f3cca3225e 100644
--- a/doc/users/prev_whats_new/changelog.rst
+++ b/doc/users/prev_whats_new/changelog.rst
@@ -4,4032 +4,4745 @@ List of changes to Matplotlib prior to 2015
 ===========================================
 
 This is a list of the changes made to Matplotlib from 2003 to 2015. For more
-recent changes, please refer to the `what's new <../whats_new.html>`_ or
-the `API changes <../../api/api_changes.html>`_.
+recent changes, please refer to the :doc:`/users/release_notes`.
 
-2015-11-16 Levels passed to contour(f) and tricontour(f) must be in increasing
-           order.
+2015-11-16
+    Levels passed to contour(f) and tricontour(f) must be in increasing order.
 
-2015-10-21 Added TextBox widget
+2015-10-21
+    Added TextBox widget
+
+2015-10-21
+    Added get_ticks_direction()
 
+2015-02-27
+    Added the rcParam 'image.composite_image' to permit users to decide whether
+    they want the vector graphics backends to combine all images within a set
+    of axes into a single composite image.  (If images do not get combined,
+    users can open vector graphics files in Adobe Illustrator or Inkscape and
+    edit each image individually.)
 
-2015-10-21 Added get_ticks_direction()
+2015-02-19
+    Rewrite of C++ code that calculates contours to add support for corner
+    masking.  This is controlled by the 'corner_mask' keyword in plotting
+    commands 'contour' and 'contourf'. - IMT
 
-2015-02-27 Added the rcParam 'image.composite_image' to permit users
-		   to decide whether they want the vector graphics backends to combine
-		   all images within a set of axes into a single composite image.
-		   (If images do not get combined, users can open vector graphics files
-		   in Adobe Illustrator or Inkscape and edit each image individually.)
+2015-01-23
+    Text bounding boxes are now computed with advance width rather than ink
+    area.  This may result in slightly different placement of text.
+
+2014-10-27
+    Allowed selection of the backend using the :envvar:`MPLBACKEND` environment
+    variable. Added documentation on backend selection methods.
+
+2014-09-27
+    Overhauled `.colors.LightSource`.  Added `.LightSource.hillshade` to allow
+    the independent generation of illumination maps. Added new types of
+    blending for creating more visually appealing shaded relief plots (e.g.
+    ``blend_mode="overlay"``, etc, in addition to the legacy "hsv" mode).
+
+2014-06-10
+    Added Colorbar.remove()
+
+2014-06-07
+    Fixed bug so radial plots can be saved as ps in py3k.
 
-2015-02-19 Rewrite of C++ code that calculates contours to add support for
-           corner masking.  This is controlled by the 'corner_mask' keyword
-           in plotting commands 'contour' and 'contourf'. - IMT
+2014-06-01
+    Changed the fmt kwarg of errorbar to support the mpl convention that
+    "none" means "don't draw it", and to default to the empty string, so that
+    plotting of data points is done with the plot() function defaults.
+    Deprecated use of the None object in place "none".
+
+2014-05-22
+    Allow the linscale keyword parameter of symlog scale to be smaller than
+    one.
+
+2014-05-20
+    Added logic to in FontManager to invalidate font-cache if if font-family
+    rcparams have changed.
+
+2014-05-16
+    Fixed the positioning of multi-line text in the PGF backend.
+
+2014-05-14
+    Added Axes.add_image() as the standard way to add AxesImage instances to
+    Axes. This improves the consistency with add_artist(), add_collection(),
+    add_container(), add_line(), add_patch(), and add_table().
+
+2014-05-02
+    Added colorblind-friendly colormap, named 'Wistia'.
+
+2014-04-27
+    Improved input clean up in Axes.{h|v}lines
+    Coerce input into a 1D ndarrays (after dealing with units).
+
+2014-04-27
+    removed un-needed cast to float in stem
+
+2014-04-23
+    Updated references to "ipython -pylab" The preferred method for invoking
+    pylab is now using the "%pylab" magic.
+    -Chris G.
+
+2014-04-22
+    Added (re-)generate a simple automatic legend to "Figure Options" dialog of
+    the Qt4Agg backend.
+
+2014-04-22
+    Added an example showing the difference between interpolation = 'none' and
+    interpolation = 'nearest' in `~.Axes.imshow` when saving vector graphics
+    files.
+
+2014-04-22
+    Added violin plotting functions. See `.Axes.violinplot`, `.Axes.violin`,
+    `.cbook.violin_stats` and `.mlab.GaussianKDE` for details.
+
+2014-04-10
+    Fixed the triangular marker rendering error. The "Up" triangle was rendered
+    instead of "Right" triangle and vice-versa.
+
+2014-04-08
+    Fixed a bug in parasite_axes.py by making a list out of a generator at line
+    263.
+
+2014-04-02
+    Added ``clipon=False`` to patch creation of wedges and shadows in
+    `~.Axes.pie`.
+
+2014-02-25
+    In backend_qt4agg changed from using update -> repaint under windows.  See
+    comment in source near ``self._priv_update`` for longer explanation.
+
+2014-03-27
+    Added tests for pie ccw parameter. Removed pdf and svg images from tests
+    for pie linewidth parameter.
+
+2014-03-24
+    Changed the behaviour of axes to not ignore leading or trailing patches of
+    height 0 (or width 0) while calculating the x and y axis limits. Patches
+    having both height == 0 and width == 0 are ignored.
+
+2014-03-24
+    Added bool kwarg (manage_xticks) to boxplot to enable/disable the
+    management of the xlimits and ticks when making a boxplot.  Default in True
+    which maintains current behavior by default.
+
+2014-03-23
+    Fixed a bug in projections/polar.py by making sure that the theta value
+    being calculated when given the mouse coordinates stays within the range of
+    0 and 2 * pi.
+
+2014-03-22
+    Added the keyword arguments wedgeprops and textprops to pie.  Users can
+    control the wedge and text properties of the pie in more detail, if they
+    choose.
+
+2014-03-17
+    Bug was fixed in append_axes from the AxesDivider class would not append
+    axes in the right location with respect to the reference locator axes
+
+2014-03-13
+    Add parameter 'clockwise' to function pie, True by default.
+
+2014-02-28
+    Added 'origin' kwarg to `~.Axes.spy`
+
+2014-02-27
+    Implemented separate horizontal/vertical axes padding to the ImageGrid in
+    the AxesGrid toolkit
+
+2014-02-27
+    Allowed markevery property of matplotlib.lines.Line2D to be, an int numpy
+    fancy index, slice object, or float.  The float behaviour turns on markers
+    at approximately equal display-coordinate-distances along the line.
+
+2014-02-25
+    In backend_qt4agg changed from using update -> repaint under windows.  See
+    comment in source near ``self._priv_update`` for longer explanation.
+
+2014-01-02
+    `~.Axes.triplot` now returns the artist it adds and support of line and
+    marker kwargs has been improved. GBY
+
+2013-12-30
+    Made streamplot grid size consistent for different types of density
+    argument. A 30x30 grid is now used for both density=1 and density=(1, 1).
+
+2013-12-03
+    Added a pure boxplot-drawing method that allow a more complete
+    customization of boxplots. It takes a list of dicts contains stats.  Also
+    created a function (`.cbook.boxplot_stats`) that generates the stats
+    needed.
+
+2013-11-28
+    Added qhull extension module to perform Delaunay triangulation more
+    robustly than before.  It is used by tri.Triangulation (and hence all
+    pyplot.tri* methods) and mlab.griddata.  Deprecated matplotlib.delaunay
+    module. - IMT
+
+2013-11-05
+    Add power-law normalization method. This is useful for, e.g., showing small
+    populations in a "hist2d" histogram.
+
+2013-10-27
+    Added get_rlabel_position and set_rlabel_position methods to PolarAxes to
+    control angular position of radial tick labels.
+
+2013-10-06
+    Add stride-based functions to mlab for easy creation of 2D arrays with less
+    memory.
+
+2013-10-06
+    Improve window and detrend functions in mlab, particular support for 2D
+    arrays.
+
+2013-10-06
+    Improve performance of all spectrum-related mlab functions and plots.
+
+2013-10-06
+    Added support for magnitude, phase, and angle spectrums to axes.specgram,
+    and support for magnitude, phase, angle, and complex spectrums to
+    mlab-specgram.
+
+2013-10-06
+    Added magnitude_spectrum, angle_spectrum, and phase_spectrum plots, as well
+    as magnitude_spectrum, angle_spectrum, phase_spectrum, and complex_spectrum
+    functions to mlab
+
+2013-07-12
+    Added support for datetime axes to 2d plots. Axis values are passed through
+    Axes.convert_xunits/Axes.convert_yunits before being used by
+    contour/contourf, pcolormesh and pcolor.
+
+2013-07-12
+    Allowed matplotlib.dates.date2num, matplotlib.dates.num2date, and
+    matplotlib.dates.datestr2num to accept n-d inputs. Also factored in support
+    for n-d arrays to matplotlib.dates.DateConverter and
+    matplotlib.units.Registry.
+
+2013-06-26
+    Refactored the axes module: the axes module is now a folder, containing the
+    following submodule:
+
+    - _subplots.py, containing all the subplots helper methods
+    - _base.py, containing several private methods and a new _AxesBase class.
+      This _AxesBase class contains all the methods that are not directly
+      linked to plots of the "old" Axes
+    - _axes.py contains the Axes class. This class now inherits from _AxesBase:
+      it contains all "plotting" methods and labelling methods.
+
+    This refactoring should not affect the API. Only private methods are not
+    importable from the axes module anymore.
+
+2013-05-18
+    Added support for arbitrary rasterization resolutions to the SVG backend.
+    Previously the resolution was hard coded to 72 dpi. Now the backend class
+    takes a image_dpi argument for its constructor, adjusts the image bounding
+    box accordingly and forwards a magnification factor to the image renderer.
+    The code and results now resemble those of the PDF backend.
+    - MW
+
+2013-05-08
+    Changed behavior of hist when given stacked=True and normed=True.
+    Histograms are now stacked first, then the sum is normalized.  Previously,
+    each histogram was normalized, then they were stacked.
+
+2013-04-25
+    Changed all instances of::
+
+        from matplotlib import MatplotlibDeprecationWarning as mplDeprecation
+
+    to::
+
+        from cbook import mplDeprecation
+
+    and removed the import into the matplotlib namespace in __init__.py
+    - Thomas Caswell
+
+2013-04-15
+    Added 'axes.xmargin' and 'axes.ymargin' to rpParams to set default margins
+    on auto-scaling. - TAC
+
+2013-04-16
+    Added patheffect support for Line2D objects.  -JJL
+
+2013-03-31
+    Added support for arbitrary unstructured user-specified triangulations to
+    Axes3D.tricontour[f] - Damon McDougall
+
+2013-03-19
+    Added support for passing *linestyle* kwarg to `~.Axes.step` so all
+    `~.Axes.plot` kwargs are passed to the underlying `~.Axes.plot` call.  -TAC
+
+2013-02-25
+    Added classes CubicTriInterpolator, UniformTriRefiner, TriAnalyzer to
+    matplotlib.tri module. - GBy
+
+2013-01-23
+    Add 'savefig.directory' to rcParams to remember and fill in the last
+    directory saved to for figure save dialogs - Martin Spacek
+
+2013-01-13
+    Add eventplot method to axes and pyplot and EventCollection class to
+    collections.
+
+2013-01-08
+    Added two extra titles to axes which are flush with the left and right
+    edges of the plot respectively.  Andrew Dawson
+
+2013-01-07
+    Add framealpha keyword argument to legend - PO
+
+2013-01-16
+    Till Stensitzki added a baseline feature to stackplot
+
+2012-12-22
+    Added classes for interpolation within triangular grids
+    (LinearTriInterpolator) and to find the triangles in which points lie
+    (TrapezoidMapTriFinder) to matplotlib.tri module. - IMT
+
+2012-12-05
+    Added MatplotlibDeprecationWarning class for signaling deprecation.
+    Matplotlib developers can use this class as follows::
+
+        from matplotlib import MatplotlibDeprecationWarning as mplDeprecation
+
+    In light of the fact that Python builtin DeprecationWarnings are ignored by
+    default as of Python 2.7, this class was put in to allow for the signaling
+    of deprecation, but via UserWarnings which are not ignored by default. - PI
+
+2012-11-27
+    Added the *mtext* parameter for supplying matplotlib.text.Text instances to
+    RendererBase.draw_tex and RendererBase.draw_text.  This allows backends to
+    utilize additional text attributes, like the alignment of text elements. -
+    pwuertz
+
+2012-11-26
+    deprecate matplotlib/mpl.py, which was used only in pylab.py and is now
+    replaced by the more suitable ``import matplotlib as mpl``. - PI
+
+2012-11-25
+    Make rc_context available via pyplot interface - PI
+
+2012-11-16
+    plt.set_cmap no longer throws errors if there is not already an active
+    colorable artist, such as an image, and just sets up the colormap to use
+    from that point forward. - PI
+
+2012-11-16
+    Added the function _get_rbga_face, which is identical to _get_rbg_face
+    except it return a (r,g,b,a) tuble, to line2D.  Modified Line2D.draw to use
+    _get_rbga_face to get the markerface color so that any alpha set by
+    markerfacecolor will respected.  - Thomas Caswell
+
+2012-11-13
+    Add a symmetric log normalization class to colors.py.  Also added some
+    tests for the normalization class.  Till Stensitzki
 
-2015-01-23 Text bounding boxes are now computed with advance width rather than
-           ink area.  This may result in slightly different placement of text.
+2012-11-12
+    Make axes.stem take at least one argument.  Uses a default range(n) when
+    the first arg not provided.  Damon McDougall
 
-2014-10-27 Allowed selection of the backend using the :envvar:`MPLBACKEND` environment
-           variable. Added documentation on backend selection methods.
+2012-11-09
+    Make plt.subplot() without arguments act as subplot(111) - PI
 
-2014-09-27 Overhauled `.colors.LightSource`.  Added `.LightSource.hillshade` to
-           allow the independent generation of illumination maps. Added new
-           types of blending for creating more visually appealing shaded relief
-           plots (e.g.  ``blend_mode="overlay"``, etc, in addition to the legacy
-           "hsv" mode).
+2012-11-08
+    Replaced plt.figure and plt.subplot calls by the newer, more convenient
+    single call to plt.subplots() in the documentation examples - PI
 
-2014-06-10 Added Colorbar.remove()
+2012-10-05
+    Add support for saving animations as animated GIFs. - JVDP
+
+2012-08-11
+    Fix path-closing bug in patches.Polygon, so that regardless of whether the
+    path is the initial one or was subsequently set by set_xy(), get_xy() will
+    return a closed path if and only if get_closed() is True.  Thanks to Jacob
+    Vanderplas. - EF
+
+2012-08-05
+    When a norm is passed to contourf, either or both of the vmin, vmax
+    attributes of that norm are now respected.  Formerly they were respected
+    only if both were specified. In addition, vmin and/or vmax can now be
+    passed to contourf directly as kwargs. - EF
+
+2012-07-24
+    Contourf handles the extend kwarg by mapping the extended ranges outside
+    the normed 0-1 range so that they are handled by colormap colors determined
+    by the set_under and set_over methods.  Previously the extended ranges were
+    mapped to 0 or 1 so that the "under" and "over" colormap colors were
+    ignored. This change also increases slightly the color contrast for a given
+    set of contour levels. - EF
+
+2012-06-24
+    Make use of mathtext in tick labels configurable - DSD
+
+2012-06-05
+    Images loaded through PIL are now ordered correctly - CG
+
+2012-06-02
+    Add new Axes method and pyplot function, hist2d. - PO
+
+2012-05-31
+    Remove support for 'cairo.<format>' style of backend specification.
+    Deprecate 'cairo.format' and 'savefig.extension' rcParams and replace with
+    'savefig.format'. - Martin Spacek
+
+2012-05-29
+    pcolormesh now obeys the passed in "edgecolor" kwarg.  To support this, the
+    "shading" argument to pcolormesh now only takes "flat" or "gouraud".  To
+    achieve the old "faceted" behavior, pass "edgecolors='k'". - MGD
+
+2012-05-22
+    Added radius kwarg to pie charts. - HH
+
+2012-05-22
+    Collections now have a setting "offset_position" to select whether the
+    offsets are given in "screen" coordinates (default, following the old
+    behavior) or "data" coordinates.  This is currently used internally to
+    improve the performance of hexbin.
+
+    As a result, the "draw_path_collection" backend methods have grown a new
+    argument "offset_position". - MGD
+
+2012-05-04
+    Add a new argument to pie charts - startingangle - that allows one to
+    specify the angle offset for the first wedge of the chart. - EP
+
+2012-05-03
+    symlog scale now obeys the logarithmic base.  Previously, it was completely
+    ignored and always treated as base e. - MGD
+
+2012-05-03
+    Allow linscalex/y keyword to symlog scale that allows the size of the
+    linear portion relative to the logarithmic portion to be adjusted. - MGD
+
+2012-04-14
+    Added new plot style: stackplot. This new feature supports stacked area
+    plots. - Damon McDougall
+
+2012-04-06
+    When path clipping changes a LINETO to a MOVETO, it also changes any
+    CLOSEPOLY command to a LINETO to the initial point. This fixes a problem
+    with pdf and svg where the CLOSEPOLY would then draw a line to the latest
+    MOVETO position instead of the intended initial position. - JKS
+
+2012-03-27
+    Add support to ImageGrid for placing colorbars only at one edge of each
+    column/row. - RMM
+
+2012-03-07
+    Refactor movie writing into useful classes that make use of pipes to write
+    image data to ffmpeg or mencoder. Also improve settings for these and the
+    ability to pass custom options. - RMM
+
+2012-02-29
+    errorevery keyword added to errorbar to enable errorbar subsampling. fixes
+    issue #600.
+
+2012-02-28
+    Added plot_trisurf to the mplot3d toolkit. This supports plotting three
+    dimensional surfaces on an irregular grid. - Damon McDougall
+
+2012-01-23
+    The radius labels in polar plots no longer use a fixed padding, but use a
+    different alignment depending on the quadrant they are in.  This fixes
+    numerical problems when (rmax - rmin) gets too small. - MGD
+
+2012-01-08
+    Add axes.streamplot to plot streamlines of a velocity field.  Adapted from
+    Tom Flannaghan streamplot implementation. -TSY
+
+2011-12-29
+    ps and pdf markers are now stroked only if the line width is nonzero for
+    consistency with agg, fixes issue #621. - JKS
+
+2011-12-27
+    Work around an EINTR bug in some versions of subprocess. - JKS
+
+2011-10-25
+    added support for \operatorname to mathtext, including the ability to
+    insert spaces, such as $\operatorname{arg\,max}$ - PI
+
+2011-08-18
+    Change api of Axes.get_tightbbox and add an optional keyword parameter
+    *call_axes_locator*. - JJL
+
+2011-07-29
+    A new rcParam "axes.formatter.use_locale" was added, that, when True, will
+    use the current locale to format tick labels.  This means that, for
+    example, in the fr_FR locale, ',' will be used as a decimal separator.  -
+    MGD
 
-2014-06-07 Fixed bug so radial plots can be saved as ps in py3k.
+2011-07-15
+    The set of markers available in the plot() and scatter() commands has been
+    unified.  In general, this gives more options to both than were previously
+    available, however, there is one backward-incompatible change to the
+    markers in scatter:
+
+        "d" used to mean "diamond", it now means "narrow diamond".  "D" can be
+        used for a "diamond".
+
+    -MGD
+
+2011-07-13
+    Fix numerical problems in symlog scale, particularly when linthresh <= 1.0.
+    Symlog plots may look different if one was depending on the old broken
+    behavior - MGD
+
+2011-07-10
+    Fixed argument handling error in tripcolor/triplot/tricontour, issue #203.
+    - IMT
+
+2011-07-08
+    Many functions added to mplot3d.axes3d to bring Axes3D objects more
+    feature-parity with regular Axes objects.  Significant revisions to the
+    documentation as well.  - BVR
+
+2011-07-07
+    Added compatibility with IPython strategy for picking a version of Qt4
+    support, and an rcParam for making the choice explicitly: backend.qt4. - EF
+
+2011-07-07
+    Modified AutoMinorLocator to improve automatic choice of the number of
+    minor intervals per major interval, and to allow one to specify this number
+    via a kwarg. - EF
 
-2014-06-01 Changed the fmt kwarg of errorbar to support the
-           the mpl convention that "none" means "don't draw it",
-           and to default to the empty string, so that plotting
-           of data points is done with the plot() function
-           defaults.  Deprecated use of the None object in place
-           "none".
+2011-06-28
+    3D versions of scatter, plot, plot_wireframe, plot_surface, bar3d, and some
+    other functions now support empty inputs. - BVR
 
-2014-05-22 Allow the linscale keyword parameter of symlog scale to be
-           smaller than one.
+2011-06-22
+    Add set_theta_offset, set_theta_direction and set_theta_zero_location to
+    polar axes to control the location of 0 and directionality of theta. - MGD
 
-2014-05-20 Added logic to in FontManager to invalidate font-cache if
-           if font-family rcparams have changed.
+2011-06-22
+    Add axes.labelweight parameter to set font weight to axis labels - MGD.
 
-2014-05-16 Fixed the positioning of multi-line text in the PGF backend.
+2011-06-20
+    Add pause function to pyplot. - EF
 
-2014-05-14 Added Axes.add_image() as the standard way to add AxesImage
-           instances to Axes. This improves the consistency with
-           add_artist(), add_collection(), add_container(), add_line(),
-           add_patch(), and add_table().
+2011-06-16
+    Added *bottom* keyword parameter for the stem command.  Also, implemented a
+    legend handler for the stem plot.  - JJL
 
-2014-05-02 Added colorblind-friendly colormap, named 'Wistia'.
+2011-06-16
+    Added legend.frameon rcParams. - Mike Kaufman
 
-2014-04-27 Improved input clean up in Axes.{h|v}lines
-           Coerce input into a 1D ndarrays (after dealing with units).
+2011-05-31
+    Made backend_qt4 compatible with PySide . - Gerald Storer
 
-2014-04-27 removed un-needed cast to float in stem
+2011-04-17
+    Disable keyboard auto-repeat in qt4 backend by ignoring key events
+    resulting from auto-repeat.  This makes constrained zoom/pan work. - EF
 
-2014-04-23 Updated references to "ipython -pylab"
-           The preferred method for invoking pylab is now using the
-           "%pylab" magic.
-           -Chris G.
+2011-04-14
+    interpolation="nearest" always interpolate images. A new mode "none" is
+    introduced for no interpolation - JJL
 
-2014-04-22 Added (re-)generate a simple automatic legend to "Figure Options"
-           dialog of the Qt4Agg backend.
+2011-04-03
+    Fixed broken pick interface to AsteriskCollection objects used by scatter.
+    - EF
 
-2014-04-22 Added an example showing the difference between
-           interpolation = 'none' and interpolation = 'nearest' in
-           `~.Axes.imshow` when saving vector graphics files.
+2011-04-01
+    The plot directive Sphinx extension now supports all of the features in the
+    Numpy fork of that extension.  These include doctest formatting, an
+    'include-source' option, and a number of new configuration options. - MGD
 
-2014-04-22 Added violin plotting functions. See `.Axes.violinplot`,
-           `.Axes.violin`, `.cbook.violin_stats` and `.mlab.GaussianKDE` for
-           details.
+2011-03-29
+    Wrapped ViewVCCachedServer definition in a factory function.  This class
+    now inherits from urllib2.HTTPSHandler in order to fetch data from github,
+    but HTTPSHandler is not defined if python was built without SSL support. -
+    DSD
 
-2014-04-10 Fixed the triangular marker rendering error. The "Up" triangle was
-           rendered instead of "Right" triangle and vice-versa.
+2011-03-10
+    Update pytz version to 2011c, thanks to Simon Cross. - JKS
 
-2014-04-08 Fixed a bug in parasite_axes.py by making a list out
-           of a generator at line 263.
+2011-03-06
+    Add standalone tests.py test runner script. - JKS
+
+2011-03-06
+    Set edgecolor to 'face' for scatter asterisk-type symbols; this fixes a bug
+    in which these symbols were not responding to the c kwarg.  The symbols
+    have no face area, so only the edgecolor is visible. - EF
 
-2014-04-02 Added ``clipon=False`` to patch creation of wedges and shadows
-           in `~.Axes.pie`.
+2011-02-27
+    Support libpng version 1.5.x; suggestion by Michael Albert. Changed
+    installation specification to a minimum of libpng version 1.2.  - EF
 
-2014-02-25 In backend_qt4agg changed from using update -> repaint under
-           windows.  See comment in source near ``self._priv_update`` for
-           longer explanation.
+2011-02-20
+    clabel accepts a callable as an fmt kwarg; modified patch by Daniel Hyams.
+    - EF
 
-2014-03-27 Added tests for pie ccw parameter. Removed pdf and svg images
-           from tests for pie linewidth parameter.
+2011-02-18
+    scatter([], []) is now valid.  Also fixed issues with empty collections -
+    BVR
 
-2014-03-24 Changed the behaviour of axes to not ignore leading or trailing
-           patches of height 0 (or width 0) while calculating the x and y
-           axis limits. Patches having both height == 0 and width == 0 are
-           ignored.
+2011-02-07
+    Quick workaround for dviread bug #3175113 - JKS
 
-2014-03-24 Added bool kwarg (manage_xticks) to boxplot to enable/disable
-           the managemnet of the xlimits and ticks when making a boxplot.
-           Default in True which maintains current behavior by default.
+2011-02-05
+    Add cbook memory monitoring for Windows, using tasklist. - EF
 
-2014-03-23 Fixed a bug in projections/polar.py by making sure that the theta
-           value being calculated when given the mouse coordinates stays within
-           the range of 0 and 2 * pi.
+2011-02-05
+    Speed up Normalize and LogNorm by using in-place operations and by using
+    float32 for float32 inputs and for ints of 2 bytes or shorter; based on
+    patch by Christoph Gohlke. - EF
 
-2014-03-22 Added the keyword arguments wedgeprops and textprops to pie.
-           Users can control the wedge and text properties of the pie
-           in more detail, if they choose.
+2011-02-04
+    Changed imshow to use rgba as uint8 from start to finish, instead of going
+    through an intermediate step as double precision; thanks to Christoph
+    Gohlke. - EF
 
-2014-03-17 Bug was fixed in append_axes from the AxesDivider class would not
-           append axes in the right location with respect to the reference
-           locator axes
+2011-01-13
+    Added zdir and offset arguments to contourf3d to bring contourf3d in
+    feature parity with contour3d. - BVR
 
-2014-03-13 Add parameter 'clockwise' to function pie, True by default.
+2011-01-04
+    Tag 1.0.1 for release at r8896
 
-2014-02-28 Added 'origin' kwarg to `~.Axes.spy`
+2011-01-03
+    Added display of ticker offset to 3d plots. - BVR
+
+2011-01-03
+    Turn off tick labeling on interior subplots for pyplots.subplots when
+    sharex/sharey is True. - JDH
 
-2014-02-27 Implemented separate horizontal/vertical axes padding to the
-           ImageGrid in the AxesGrid toolkit
+2010-12-29
+    Implement axes_divider.HBox and VBox. -JJL
 
-2014-02-27 Allowed markevery property of matplotlib.lines.Line2D to be, an int
-           numpy fancy index, slice object, or float.  The float behaviour
-           turns on markers at approximately equal display-coordinate-distances
-           along the line.
+2010-11-22
+    Fixed error with Hammer projection. - BVR
+
+2010-11-12
+    Fixed the placement and angle of axis labels in 3D plots. - BVR
+
+2010-11-07
+    New rc parameters examples.download and examples.directory allow bypassing
+    the download mechanism in get_sample_data.  - JKS
+
+2010-10-04
+    Fix JPEG saving bug: only accept the kwargs documented by PIL for JPEG
+    files. - JKS
+
+2010-09-15
+    Remove unused _wxagg extension and numerix.h. - EF
+
+2010-08-25
+    Add new framework for doing animations with examples.- RM
+
+2010-08-21
+    Remove unused and inappropriate methods from Tick classes:
+    set_view_interval, get_minpos, and get_data_interval are properly found in
+    the Axis class and don't need to be duplicated in XTick and YTick. - EF
+
+2010-08-21
+    Change Axis.set_view_interval() so that when updating an existing interval,
+    it respects the orientation of that interval, and can enlarge but not
+    reduce the interval.  This fixes a bug in which Axis.set_ticks would change
+    the view limits of an inverted axis. Whether set_ticks should be affecting
+    the viewLim at all remains an open question. - EF
+
+2010-08-16
+    Handle NaN's correctly in path analysis routines.  Fixes a bug where the
+    best location for a legend was not calculated correctly when the line
+    contains NaNs. - MGD
 
-2014-02-25 In backend_qt4agg changed from using update -> repaint under
-           windows.  See comment in source near ``self._priv_update`` for
-           longer explanation.
+2010-08-14
+    Fix bug in patch alpha handling, and in bar color kwarg - EF
+
+2010-08-12
+    Removed all traces of numerix module after 17 months of deprecation
+    warnings. - EF
 
-2014-01-02 `~.Axes.triplot` now returns the artist it adds and support of line and
-           marker kwargs has been improved. GBY
+2010-08-05
+    Added keyword arguments 'thetaunits' and 'runits' for polar plots.  Fixed
+    PolarAxes so that when it set default Formatters, it marked them as such.
+    Fixed semilogx and semilogy to no longer blindly reset the ticker
+    information on the non-log axis.  Axes.arrow can now accept unitized data.
+    - JRE
 
-2013-12-30 Made streamplot grid size consistent for different types of density
-           argument. A 30x30 grid is now used for both density=1 and
-           density=(1, 1).
+2010-08-03
+    Add support for MPLSETUPCFG variable for custom setup.cfg filename.  Used
+    by sage buildbot to build an mpl w/ no gui support - JDH
 
-2013-12-03 Added a pure boxplot-drawing method that allow a more complete
-           customization of boxplots. It takes a list of dicts contains stats.
-           Also created a function (`.cbook.boxplot_stats`) that generates the
-           stats needed.
+2010-08-01
+    Create directory specified by MPLCONFIGDIR if it does not exist. - ADS
 
-2013-11-28 Added qhull extension module to perform Delaunay triangulation more
-           robustly than before.  It is used by tri.Triangulation (and hence
-           all pyplot.tri* methods) and mlab.griddata.  Deprecated
-           matplotlib.delaunay module. - IMT
+2010-07-20
+    Return Qt4's default cursor when leaving the canvas - DSD
 
-2013-11-05 Add power-law normalization method. This is useful for,
-           e.g., showing small populations in a "hist2d" histogram.
+2010-07-06
+    Tagging for mpl 1.0 at r8502
 
-2013-10-27 Added get_rlabel_position and set_rlabel_position methods to
-           PolarAxes to control angular position of radial tick labels.
+2010-07-05
+    Added Ben Root's patch to put 3D plots in arbitrary axes, allowing you to
+    mix 3d and 2d in different axes/subplots or to have multiple 3D plots in
+    one figure.  See examples/mplot3d/subplot3d_demo.py - JDH
 
-2013-10-06 Add stride-based functions to mlab for easy creation of 2D arrays
-           with less memory.
+2010-07-05
+    Preferred kwarg names in set_xlim are now 'left' and 'right'; in set_ylim,
+    'bottom' and 'top'; original kwargs are still accepted without complaint. -
+    EF
 
-2013-10-06 Improve window and detrend functions in mlab, particulart support for
-           2D arrays.
+2010-07-05
+    TkAgg and FltkAgg backends are now consistent with other interactive
+    backends: when used in scripts from the command line (not from ipython
+    -pylab), show blocks, and can be called more than once. - EF
 
-2013-10-06 Improve performance of all spectrum-related mlab functions and plots.
+2010-07-02
+    Modified CXX/WrapPython.h to fix "swab bug" on solaris so mpl can compile
+    on Solaris with CXX6 in the trunk.  Closes tracker bug 3022815 - JDH
 
-2013-10-06 Added support for magnitude, phase, and angle spectrums to
-           axes.specgram, and support for magnitude, phase, angle, and complex
-           spectrums to mlab-specgram.
+2010-06-30
+    Added autoscale convenience method and corresponding pyplot function for
+    simplified control of autoscaling; and changed axis, set_xlim, and set_ylim
+    so that by default, they turn off the autoscaling on the relevant axis or
+    axes.  Therefore one can call set_xlim before plotting a line, for example,
+    and the limits will be retained. - EF
 
-2013-10-06 Added magnitude_spectrum, angle_spectrum, and phase_spectrum plots,
-           as well as magnitude_spectrum, angle_spectrum, phase_spectrum,
-           and complex_spectrum functions to mlab
+2010-06-20
+    Added Axes.tick_params and corresponding pyplot function to control tick
+    and tick label appearance after an Axes has been created. - EF
 
-2013-07-12 Added support for datetime axes to 2d plots. Axis values are passed
-           through Axes.convert_xunits/Axes.convert_yunits before being used by
-           contour/contourf, pcolormesh and pcolor.
+2010-06-09
+    Allow Axes.grid to control minor gridlines; allow Axes.grid and Axis.grid
+    to control major and minor gridlines in the same method call. - EF
 
-2013-07-12 Allowed matplotlib.dates.date2num, matplotlib.dates.num2date,
-           and matplotlib.dates.datestr2num to accept n-d inputs. Also
-           factored in support for n-d arrays to matplotlib.dates.DateConverter
-           and matplotlib.units.Registry.
+2010-06-06
+    Change the way we do split/dividend adjustments in finance.py to handle
+    dividends and fix the zero division bug reported in sf bug 2949906 and
+    2123566.  Note that volume is not adjusted because the Yahoo CSV does not
+    distinguish between share split and dividend adjustments making it near
+    impossible to get volume adjustment right (unless we want to guess based on
+    the size of the adjustment or scrape the html tables, which we don't) - JDH
 
-2013-06-26 Refactored the axes module: the axes module is now a folder,
-           containing the following submodule:
-              - _subplots.py, containing all the subplots helper methods
-              - _base.py, containing several private methods and a new
-                _AxesBase class. This _AxesBase class contains all the methods
-                that are not directly linked to plots of the "old" Axes
-              - _axes.py contains the Axes class. This class now inherits from
-                _AxesBase: it contains all "plotting" methods and labelling
-                methods.
+2010-06-06
+    Updated dateutil to 1.5 and pytz to 2010h.
 
-           This refactoring should not affect the API. Only private methods
-           are not importable from the axes module anymore.
+2010-06-02
+    Add error_kw kwarg to Axes.bar(). - EF
 
-2013-05-18 Added support for arbitrary rasterization resolutions to the
-           SVG backend. Previously the resolution was hard coded to 72
-           dpi. Now the backend class takes a image_dpi argument for
-           its constructor, adjusts the image bounding box accordingly
-           and forwards a magnification factor to the image renderer.
-           The code and results now resemble those of the PDF backend.
-           - MW
+2010-06-01
+    Fix pcolormesh() and QuadMesh to pass on kwargs as appropriate. - RM
 
-2013-05-08 Changed behavior of hist when given stacked=True and normed=True.
-           Histograms are now stacked first, then the sum is normalized.
-           Previously, each histogram was normalized, then they were stacked.
+2010-05-18
+    Merge mpl_toolkits.gridspec into the main tree. - JJL
+
+2010-05-04
+    Improve backend_qt4 so it displays figures with the correct size - DSD
+
+2010-04-20
+    Added generic support for connecting to a timer for events. This adds
+    TimerBase, TimerGTK, TimerQT, TimerWx, and TimerTk to the backends and a
+    new_timer() method to each backend's canvas to allow ease of creating a new
+    timer. - RM
+
+2010-04-20
+    Added margins() Axes method and pyplot function. - EF
 
-2013-04-25 Changed all instances of:
+2010-04-18
+    update the axes_grid documentation. -JJL
 
-           from matplotlib import MatplotlibDeprecationWarning as mplDeprecation
-           to:
+2010-04-18
+    Control MaxNLocator parameters after instantiation, and via
+    Axes.locator_params method, with corresponding pyplot function. -EF
 
-           from cbook import mplDeprecation
+2010-04-18
+    Control ScalarFormatter offsets directly and via the
+    Axes.ticklabel_format() method, and add that to pyplot. -EF
+
+2010-04-16
+    Add a close_event to the backends. -RM
 
-           and removed the import into the matplotlib namespace in __init__.py
-           Thomas Caswell
+2010-04-06
+    modify axes_grid examples to use axes_grid1 and axisartist. -JJL
 
-2013-04-15 Added 'axes.xmargin' and 'axes.ymargin' to rpParams to set default
-           margins on auto-scaleing. - TAC
+2010-04-06
+    rebase axes_grid using axes_grid1 and axisartist modules. -JJL
 
-2013-04-16 Added patheffect support for Line2D objects.  -JJL
+2010-04-06
+    axes_grid toolkit is split into two separate modules, axes_grid1 and
+    axisartist. -JJL
 
-2013-03-31 Added support for arbitrary unstructured user-specified
-           triangulations to Axes3D.tricontour[f] - Damon McDougall
+2010-04-05
+    Speed up import: import pytz only if and when it is needed.  It is not
+    needed if the rc timezone is UTC. - EF
 
-2013-03-19 Added support for passing *linestyle* kwarg to `~.Axes.step` so all `~.Axes.plot`
-           kwargs are passed to the underlying `~.Axes.plot` call.  -TAC
+2010-04-03
+    Added color kwarg to Axes.hist(), based on work by Jeff Klukas. - EF
 
-2013-02-25 Added classes CubicTriInterpolator, UniformTriRefiner, TriAnalyzer
-           to matplotlib.tri module. - GBy
+2010-03-24
+    refactor colorbar code so that no cla() is necessary when mappable is
+    changed. -JJL
+
+2010-03-22
+    fix incorrect rubber band during the zoom mode when mouse leaves the axes.
+    -JJL
 
-2013-01-23 Add 'savefig.directory' to rcParams to remember and fill in the last
-           directory saved to for figure save dialogs - Martin Spacek
+2010-03-21
+    x/y key during the zoom mode only changes the x/y limits. -JJL
 
-2013-01-13 Add eventplot method to axes and pyplot and EventCollection class
-           to collections.
+2010-03-20
+    Added pyplot.sca() function suggested by JJL. - EF
 
-2013-01-08 Added two extra titles to axes which are flush with the left and
-           right edges of the plot respectively.
-           Andrew Dawson
+2010-03-20
+    Added conditional support for new Tooltip API in gtk backend. - EF
 
-2013-01-07 Add framealpha keyword argument to legend - PO
+2010-03-20
+    Changed plt.fig_subplot() to plt.subplots() after discussion on list, and
+    changed its API to return axes as a numpy object array (with control of
+    dimensions via squeeze keyword). FP.
 
-2013-01-16 Till Stensitzki added a baseline feature to stackplot
+2010-03-13
+    Manually brought in commits from branch::
 
-2012-12-22 Added classes for interpolation within triangular grids
-           (LinearTriInterpolator) and to find the triangles in which points
-           lie (TrapezoidMapTriFinder) to matplotlib.tri module. - IMT
+        ------------------------------------------------------------------------
+        r8191 | leejjoon | 2010-03-13
+        17:27:57 -0500 (Sat, 13 Mar 2010) | 1 line
 
-2012-12-05 Added MatplotlibDeprecationWarning class for signaling deprecation.
-           Matplotlib developers can use this class as follows:
+    fix the bug that handles for scatter are incorrectly set when dpi!=72.
+    Thanks to Ray Speth for the bug report.
 
-           from matplotlib import MatplotlibDeprecationWarning as mplDeprecation
+2010-03-03
+    Manually brought in commits from branch via diff/patch (svnmerge is broken)::
 
-           In light of the fact that Python builtin DeprecationWarnings are
-           ignored by default as of Python 2.7, this class was put in to allow
-           for the signaling of deprecation, but via UserWarnings which are
-           not ignored by default. - PI
+        ------------------------------------------------------------------------
+        r8175 | leejjoon | 2010-03-03
+        10:03:30 -0800 (Wed, 03 Mar 2010) | 1 line
 
-2012-11-27 Added the *mtext* parameter for supplying matplotlib.text.Text
-           instances to RendererBase.draw_tex and RendererBase.draw_text.
-           This allows backends to utilize additional text attributes, like
-           the alignment of text elements. - pwuertz
+        fix arguments of allow_rasterization.draw_wrapper
+        ------------------------------------------------------------------------
+        r8174 | jdh2358 | 2010-03-03
+        09:15:58 -0800 (Wed, 03 Mar 2010) | 1 line
 
-2012-11-26 deprecate matplotlib/mpl.py, which was used only in pylab.py and is
-           now replaced by the more suitable ``import matplotlib as mpl``. - PI
+        added support for favicon in docs build
+        ------------------------------------------------------------------------
+        r8173 | jdh2358 | 2010-03-03
+        08:56:16 -0800 (Wed, 03 Mar 2010) | 1 line
 
-2012-11-25 Make rc_context available via pyplot interface - PI
+        applied Mattias get_bounds patch
+        ------------------------------------------------------------------------
+        r8172 | jdh2358 | 2010-03-03
+        08:31:42 -0800 (Wed, 03 Mar 2010) | 1 line
 
-2012-11-16 plt.set_cmap no longer throws errors if there is not already
-           an active colorable artist, such as an image, and just sets
-           up the colormap to use from that point forward. - PI
+        fix svnmerge download instructions
+        ------------------------------------------------------------------------
+        r8171 | jdh2358 | 2010-03-03
+        07:47:48 -0800 (Wed, 03 Mar 2010) | 1 line
 
-2012-11-16 Added the funcction _get_rbga_face, which is identical to
-           _get_rbg_face except it return a (r,g,b,a) tuble, to line2D.
-           Modified Line2D.draw to use _get_rbga_face to get the markerface
-           color so that any alpha set by  markerfacecolor will respected.
-           - Thomas Caswell
+2010-02-25
+    add annotation_demo3.py that demonstrates new functionality. -JJL
 
-2012-11-13 Add a symmetric log normalization class to colors.py.
-           Also added some tests for the normalization class.
-           Till Stensitzki
+2010-02-25
+    refactor Annotation to support arbitrary Transform as xycoords or
+    textcoords. Also, if a tuple of two coordinates is provided, they are
+    interpreted as coordinates for each x and y position.  -JJL
 
-2012-11-12 Make axes.stem take at least one argument.
-           Uses a default range(n) when the first arg not provided.
-           Damon McDougall
+2010-02-24
+    Added pyplot.fig_subplot(), to create a figure and a group of subplots in a
+    single call.  This offers an easier pattern than manually making figures
+    and calling add_subplot() multiple times. FP
 
-2012-11-09 Make plt.subplot() without arguments act as subplot(111) - PI
+2010-02-17
+    Added Gokhan's and Mattias' customizable keybindings patch for the toolbar.
+    You can now set the keymap.* properties in the matplotlibrc file.
+    Newbindings were added for toggling log scaling on the x-axis. JDH
 
-2012-11-08 Replaced plt.figure and plt.subplot calls by the newer, more
-           convenient single call to plt.subplots() in the documentation
-           examples - PI
+2010-02-16
+    Committed TJ's filled marker patch for left|right|bottom|top|full filled
+    markers.  See examples/pylab_examples/filledmarker_demo.py. JDH
 
-2012-10-05 Add support for saving animations as animated GIFs. - JVDP
+2010-02-11
+    Added 'bootstrap' option to boxplot. This allows bootstrap estimates of
+    median confidence intervals. Based on an initial patch by Paul Hobson. -
+    ADS
 
-2012-08-11 Fix path-closing bug in patches.Polygon, so that regardless
-           of whether the path is the initial one or was subsequently
-           set by set_xy(), get_xy() will return a closed path if and
-           only if get_closed() is True.  Thanks to Jacob Vanderplas. - EF
+2010-02-06
+    Added setup.cfg "basedirlist" option to override setting in setupext.py
+    "basedir" dictionary; added "gnu0" platform requested by Benjamin Drung. -
+    EF
 
-2012-08-05 When a norm is passed to contourf, either or both of the
-           vmin, vmax attributes of that norm are now respected.
-           Formerly they were respected only if both were
-           specified. In addition, vmin and/or vmax can now
-           be passed to contourf directly as kwargs. - EF
+2010-02-06
+    Added 'xy' scaling option to EllipseCollection. - EF
 
-2012-07-24 Contourf handles the extend kwarg by mapping the extended
-           ranges outside the normed 0-1 range so that they are
-           handled by colormap colors determined by the set_under
-           and set_over methods.  Previously the extended ranges
-           were mapped to 0 or 1 so that the "under" and "over"
-           colormap colors were ignored. This change also increases
-           slightly the color contrast for a given set of contour
-           levels. - EF
+2010-02-03
+    Made plot_directive use a custom PlotWarning category, so that warnings can
+    be turned into fatal errors easily if desired. - FP
 
-2012-06-24 Make use of mathtext in tick labels configurable - DSD
+2010-01-29
+    Added draggable method to Legend to allow mouse drag placement.  Thanks
+    Adam Fraser. JDH
 
-2012-06-05 Images loaded through PIL are now ordered correctly - CG
+2010-01-25
+    Fixed a bug reported by Olle Engdegard, when using histograms with
+    stepfilled and log=True - MM
 
-2012-06-02 Add new Axes method and pyplot function, hist2d. - PO
+2010-01-16
+    Upgraded CXX to 6.1.1 - JDH
 
-2012-05-31 Remove support for 'cairo.<format>' style of backend specification.
-           Deprecate 'cairo.format' and 'savefig.extension' rcParams and
-           replace with 'savefig.format'. - Martin Spacek
+2009-01-16
+    Don't create minor ticks on top of existing major ticks. Patch by Neil
+    Crighton. -ADS
 
-2012-05-29 pcolormesh now obeys the passed in "edgecolor" kwarg.
-           To support this, the "shading" argument to pcolormesh now only
-           takes "flat" or "gouraud".  To achieve the old "faceted" behavior,
-           pass "edgecolors='k'". - MGD
+2009-01-16
+    Ensure three minor ticks always drawn (SF# 2924245). Patch by Neil
+    Crighton. -ADS
 
-2012-05-22 Added radius kwarg to pie charts. - HH
+2010-01-16
+    Applied patch by Ian Thomas to fix two contouring problems: now contourf
+    handles interior masked regions, and the boundaries of line and filled
+    contours coincide. - EF
 
-2012-05-22 Collections now have a setting "offset_position" to select whether
-           the offsets are given in "screen" coordinates (default,
-           following the old behavior) or "data" coordinates.  This is currently
-           used internally to improve the performance of hexbin.
+2009-01-11
+    The color of legend patch follows the rc parameters axes.facecolor and
+    axes.edgecolor. -JJL
 
-           As a result, the "draw_path_collection" backend methods have grown
-           a new argument "offset_position". - MGD
+2009-01-11
+    adjustable of Axes can be "box-forced" which allow sharing axes. -JJL
 
-2012-05-04 Add a new argument to pie charts - startingangle - that
-           allows one to specify the angle offset for the first wedge
-           of the chart. - EP
+2009-01-11
+    Add add_click and pop_click methods in BlockingContourLabeler. -JJL
 
-2012-05-03 symlog scale now obeys the logarithmic base.  Previously, it was
-           completely ignored and always treated as base e. - MGD
+2010-01-03
+    Added rcParams['axes.color_cycle'] - EF
 
-2012-05-03 Allow linscalex/y keyword to symlog scale that allows the size of
-           the linear portion relative to the logarithmic portion to be
-           adjusted. - MGD
+2010-01-03
+    Added Pierre's qt4 formlayout editor and toolbar button - JDH
 
-2012-04-14 Added new plot style: stackplot. This new feature supports stacked
-           area plots. - Damon McDougall
+2009-12-31
+    Add support for using math text as marker symbols (Thanks to tcb) - MGD
+
+2009-12-31
+    Commit a workaround for a regression in PyQt4-4.6.{0,1} - DSD
 
-2012-04-06 When path clipping changes a LINETO to a MOVETO, it also
-           changes any CLOSEPOLY command to a LINETO to the initial
-           point. This fixes a problem with pdf and svg where the
-           CLOSEPOLY would then draw a line to the latest MOVETO
-           position instead of the intended initial position. - JKS
+2009-12-22
+    Fix cmap data for gist_earth_r, etc. -JJL
 
-2012-03-27 Add support to ImageGrid for placing colorbars only at
-           one edge of each column/row. - RMM
+2009-12-20
+    spines: put spines in data coordinates, add set_bounds() call. -ADS
 
-2012-03-07 Refactor movie writing into useful classes that make use
-           of pipes to write image data to ffmpeg or mencoder. Also
-           improve settings for these and the ability to pass custom
-           options. - RMM
+2009-12-18
+    Don't limit notch size in boxplot to q1-q3 range, as this is effectively
+    making the data look better than it is. - ADS
 
-2012-02-29 errorevery keyword added to errorbar to enable errorbar
-           subsampling. fixes issue #600.
+2009-12-18
+    mlab.prctile handles even-length data, such that the median is the mean of
+    the two middle values. - ADS
 
-2012-02-28 Added plot_trisurf to the mplot3d toolkit. This supports plotting
-           three dimensional surfaces on an irregular grid. - Damon McDougall
+2009-12-15
+    Add raw-image (unsampled) support for the ps backend. - JJL
 
-2012-01-23 The radius labels in polar plots no longer use a fixed
-           padding, but use a different alignment depending on the
-           quadrant they are in.  This fixes numerical problems when
-           (rmax - rmin) gets too small. - MGD
+2009-12-14
+    Add patch_artist kwarg to boxplot, but keep old default.  Convert
+    boxplot_demo2.py to use the new patch_artist. - ADS
 
-2012-01-08 Add axes.streamplot to plot streamlines of a velocity field.
-                   Adapted from Tom Flannaghan streamplot implementation. -TSY
+2009-12-06
+    axes_grid: reimplemented AxisArtist with FloatingAxes support.  Added new
+    examples. - JJL
 
-2011-12-29 ps and pdf markers are now stroked only if the line width
-           is nonzero for consistency with agg, fixes issue #621. - JKS
+2009-12-01
+    Applied Laurent Dufrechou's patch to improve blitting with the qt4 backend
+    - DSD
 
-2011-12-27 Work around an EINTR bug in some versions of subprocess. - JKS
+2009-11-13
+    The pdf backend now allows changing the contents of a pdf file's
+    information dictionary via PdfPages.infodict. - JKS
 
-2011-10-25 added support for \operatorname to mathtext,
-           including the ability to insert spaces, such as
-           $\operatorname{arg\,max}$ - PI
+2009-11-12
+    font_manager.py should no longer cause EINTR on Python 2.6 (but will on the
+    2.5 version of subprocess). Also the fc-list command in that file was fixed
+    so now it should actually find the list of fontconfig fonts. - JKS
 
-2011-08-18 Change api of Axes.get_tightbbox and add an optional
-           keyword parameter *call_axes_locator*. - JJL
+2009-11-10
+    Single images, and all images in renderers with option_image_nocomposite
+    (i.e. agg, macosx and the svg backend when rcParams['svg.image_noscale'] is
+    True), are now drawn respecting the zorder relative to other artists. (Note
+    that there may now be inconsistencies across backends when more than one
+    image is drawn at varying zorders, but this change introduces correct
+    behavior for the backends in which it's easy to do so.)
 
-2011-07-29 A new rcParam "axes.formatter.use_locale" was added, that,
-           when True, will use the current locale to format tick
-           labels.  This means that, for example, in the fr_FR locale,
-           ',' will be used as a decimal separator.  - MGD
+2009-10-21
+    Make AutoDateLocator more configurable by adding options to control the
+    maximum and minimum number of ticks. Also add control of the intervals to
+    be used for ticking. This does not change behavior but opens previously
+    hard-coded behavior to runtime modification`. - RMM
 
-2011-07-15 The set of markers available in the plot() and scatter()
-           commands has been unified.  In general, this gives more
-           options to both than were previously available, however,
-           there is one backward-incompatible change to the markers in
-           scatter:
+2009-10-19
+    Add "path_effects" support for Text and Patch. See
+    examples/pylab_examples/patheffect_demo.py -JJL
 
-              "d" used to mean "diamond", it now means "narrow
-              diamond".  "D" can be used for a "diamond".
+2009-10-19
+    Add "use_clabeltext" option to clabel. If True, clabels will be created
+    with ClabelText class, which recalculates rotation angle of the label
+    during the drawing time. -JJL
 
-           -MGD
+2009-10-16
+    Make AutoDateFormatter actually use any specified timezone setting.This was
+    only working correctly when no timezone was specified. - RMM
 
-2011-07-13 Fix numerical problems in symlog scale, particularly when
-           linthresh <= 1.0.  Symlog plots may look different if one
-           was depending on the old broken behavior - MGD
+2009-09-27
+    Beginnings of a capability to test the pdf backend. - JKS
 
-2011-07-10 Fixed argument handling error in tripcolor/triplot/tricontour,
-           issue #203. - IMT
-
-2011-07-08 Many functions added to mplot3d.axes3d to bring Axes3D
-           objects more feature-parity with regular Axes objects.
-           Significant revisions to the documentation as well.
-           - BVR
-
-2011-07-07 Added compatibility with IPython strategy for picking
-           a version of Qt4 support, and an rcParam for making
-           the choice explicitly: backend.qt4. - EF
-
-2011-07-07 Modified AutoMinorLocator to improve automatic choice of
-           the number of minor intervals per major interval, and
-           to allow one to specify this number via a kwarg. - EF
-
-2011-06-28 3D versions of scatter, plot, plot_wireframe, plot_surface,
-           bar3d, and some other functions now support empty inputs. - BVR
-
-2011-06-22 Add set_theta_offset, set_theta_direction and
-           set_theta_zero_location to polar axes to control the
-           location of 0 and directionality of theta. - MGD
-
-2011-06-22 Add axes.labelweight parameter to set font weight to axis
-           labels - MGD.
-
-2011-06-20 Add pause function to pyplot. - EF
-
-2011-06-16 Added *bottom* keyword parameter for the stem command.
-           Also, implemented a legend handler for the stem plot.
-           - JJL
-
-2011-06-16 Added legend.frameon rcParams. - Mike Kaufman
-
-2011-05-31 Made backend_qt4 compatible with PySide . - Gerald Storer
-
-2011-04-17 Disable keyboard auto-repeat in qt4 backend by ignoring
-           key events resulting from auto-repeat.  This makes
-           constrained zoom/pan work. - EF
-
-2011-04-14 interpolation="nearest" always interpolate images. A new
-           mode "none" is introduced for no interpolation - JJL
-
-2011-04-03 Fixed broken pick interface to AsteriskCollection objects
-           used by scatter. - EF
-
-2011-04-01 The plot directive Sphinx extension now supports all of the
-           features in the Numpy fork of that extension.  These
-           include doctest formatting, an 'include-source' option, and
-           a number of new configuration options. - MGD
-
-2011-03-29 Wrapped ViewVCCachedServer definition in a factory function.
-           This class now inherits from urllib2.HTTPSHandler in order
-           to fetch data from github, but HTTPSHandler is not defined
-           if python was built without SSL support. - DSD
-
-2011-03-10 Update pytz version to 2011c, thanks to Simon Cross. - JKS
-
-2011-03-06 Add standalone tests.py test runner script. - JKS
-
-2011-03-06 Set edgecolor to 'face' for scatter asterisk-type
-           symbols; this fixes a bug in which these symbols were
-           not responding to the c kwarg.  The symbols have no
-           face area, so only the edgecolor is visible. - EF
-
-2011-02-27 Support libpng version 1.5.x; suggestion by Michael
-           Albert. Changed installation specification to a
-           minimum of libpng version 1.2.  - EF
-
-2011-02-20 clabel accepts a callable as an fmt kwarg; modified
-           patch by Daniel Hyams. - EF
-
-2011-02-18 scatter([], []) is now valid.  Also fixed issues
-           with empty collections - BVR
-
-2011-02-07 Quick workaround for dviread bug #3175113 - JKS
-
-2011-02-05 Add cbook memory monitoring for Windows, using
-           tasklist. - EF
-
-2011-02-05 Speed up Normalize and LogNorm by using in-place
-           operations and by using float32 for float32 inputs
-           and for ints of 2 bytes or shorter; based on
-           patch by Christoph Gohlke. - EF
-
-2011-02-04 Changed imshow to use rgba as uint8 from start to
-           finish, instead of going through an intermediate
-           step as double precision; thanks to Christoph Gohlke. - EF
-
-2011-01-13 Added zdir and offset arguments to contourf3d to
-           bring contourf3d in feature parity with contour3d. - BVR
-
-2011-01-04 Tag 1.0.1 for release at r8896
-
-2011-01-03 Added display of ticker offset to 3d plots. - BVR
-
-2011-01-03 Turn off tick labeling on interior subplots for
-           pyplots.subplots when sharex/sharey is True. - JDH
-
-2010-12-29 Implement axes_divider.HBox and VBox. -JJL
-
-
-2010-11-22 Fixed error with Hammer projection. - BVR
-
-2010-11-12 Fixed the placement and angle of axis labels in 3D plots. - BVR
-
-2010-11-07 New rc parameters examples.download and examples.directory
-           allow bypassing the download mechanism in get_sample_data.
-           - JKS
-
-2010-10-04 Fix JPEG saving bug: only accept the kwargs documented
-           by PIL for JPEG files. - JKS
-
-2010-09-15 Remove unused _wxagg extension and numerix.h. - EF
-
-2010-08-25 Add new framework for doing animations with examples.- RM
-
-2010-08-21 Remove unused and inappropriate methods from Tick classes:
-           set_view_interval, get_minpos, and get_data_interval are
-           properly found in the Axis class and don't need to be
-           duplicated in XTick and YTick. - EF
-
-2010-08-21 Change Axis.set_view_interval() so that when updating an
-           existing interval, it respects the orientation of that
-           interval, and can enlarge but not reduce the interval.
-           This fixes a bug in which Axis.set_ticks would
-           change the view limits of an inverted axis. Whether
-           set_ticks should be affecting the viewLim at all remains
-           an open question. - EF
-
-2010-08-16 Handle NaN's correctly in path analysis routines.  Fixes a
-           bug where the best location for a legend was not calculated
-           correctly when the line contains NaNs. - MGD
-
-2010-08-14 Fix bug in patch alpha handling, and in bar color kwarg - EF
-
-2010-08-12 Removed all traces of numerix module after 17 months of
-           deprecation warnings. - EF
-
-2010-08-05 Added keyword arguments 'thetaunits' and 'runits' for polar
-           plots.  Fixed PolarAxes so that when it set default
-           Formatters, it marked them as such.  Fixed semilogx and
-           semilogy to no longer blindly reset the ticker information
-           on the non-log axis.  Axes.arrow can now accept unitized
-           data. - JRE
-
-2010-08-03 Add support for MPLSETUPCFG variable for custom setup.cfg
-           filename.  Used by sage buildbot to build an mpl w/ no gui
-           support - JDH
-
-2010-08-01 Create directory specified by MPLCONFIGDIR if it does
-           not exist. - ADS
-
-2010-07-20 Return Qt4's default cursor when leaving the canvas - DSD
-
-2010-07-06 Tagging for mpl 1.0 at r8502
-
-
-2010-07-05 Added Ben Root's patch to put 3D plots in arbitrary axes,
-           allowing you to mix 3d and 2d in different axes/subplots or
-           to have multiple 3D plots in one figure.  See
-           examples/mplot3d/subplot3d_demo.py - JDH
-
-2010-07-05 Preferred kwarg names in set_xlim are now 'left' and
-           'right'; in set_ylim, 'bottom' and 'top'; original
-           kwargs are still accepted without complaint. - EF
-
-2010-07-05 TkAgg and FltkAgg backends are now consistent with other
-           interactive backends: when used in scripts from the
-           command line (not from ipython -pylab), show blocks,
-           and can be called more than once. - EF
-
-2010-07-02 Modified CXX/WrapPython.h to fix "swab bug" on solaris so
-           mpl can compile on Solaris with CXX6 in the trunk.  Closes
-           tracker bug 3022815 - JDH
-
-2010-06-30 Added autoscale convenience method and corresponding
-           pyplot function for simplified control of autoscaling;
-           and changed axis, set_xlim, and set_ylim so that by
-           default, they turn off the autoscaling on the relevant
-           axis or axes.  Therefore one can call set_xlim before
-           plotting a line, for example, and the limits will be
-           retained. - EF
-
-2010-06-20 Added Axes.tick_params and corresponding pyplot function
-           to control tick and tick label appearance after an Axes
-           has been created. - EF
-
-2010-06-09 Allow Axes.grid to control minor gridlines; allow
-           Axes.grid and Axis.grid to control major and minor
-           gridlines in the same method call. - EF
-
-2010-06-06 Change the way we do split/dividend adjustments in
-           finance.py to handle dividends and fix the zero division bug reported
-           in sf bug 2949906 and 2123566.  Note that volume is not adjusted
-           because the Yahoo CSV does not distinguish between share
-           split and dividend adjustments making it near impossible to
-           get volume adjustment right (unless we want to guess based
-           on the size of the adjustment or scrape the html tables,
-           which we don't) - JDH
-
-2010-06-06 Updated dateutil to 1.5 and pytz to 2010h.
-
-2010-06-02 Add error_kw kwarg to Axes.bar(). - EF
-
-2010-06-01 Fix pcolormesh() and QuadMesh to pass on kwargs as
-           appropriate. - RM
-
-2010-05-18 Merge mpl_toolkits.gridspec into the main tree. - JJL
-
-2010-05-04 Improve backend_qt4 so it displays figures with the
-           correct size - DSD
-
-2010-04-20 Added generic support for connecting to a timer for events. This
-           adds TimerBase, TimerGTK, TimerQT, TimerWx, and TimerTk to
-           the backends and a new_timer() method to each backend's
-           canvas to allow ease of creating a new timer. - RM
-
-2010-04-20 Added margins() Axes method and pyplot function. - EF
-
-2010-04-18 update the axes_grid documentation. -JJL
-
-2010-04-18 Control MaxNLocator parameters after instantiation,
-           and via Axes.locator_params method, with corresponding
-           pyplot function. -EF
-
-2010-04-18 Control ScalarFormatter offsets directly and via the
-           Axes.ticklabel_format() method, and add that to pyplot. -EF
-
-2010-04-16 Add a close_event to the backends. -RM
-
-2010-04-06 modify axes_grid examples to use axes_grid1 and axisartist. -JJL
-
-2010-04-06 rebase axes_grid using axes_grid1 and axisartist modules. -JJL
-
-2010-04-06 axes_grid toolkit is split into two separate modules,
-           axes_grid1 and axisartist. -JJL
-
-2010-04-05 Speed up import: import pytz only if and when it is
-           needed.  It is not needed if the rc timezone is UTC. - EF
-
-2010-04-03 Added color kwarg to Axes.hist(), based on work by
-           Jeff Klukas. - EF
-
-2010-03-24 refactor colorbar code so that no cla() is necessary when
-           mappable is changed. -JJL
-
-2010-03-22 fix incorrect rubber band during the zoom mode when mouse
-           leaves the axes. -JJL
-
-2010-03-21 x/y key during the zoom mode only changes the x/y limits. -JJL
-
-2010-03-20 Added pyplot.sca() function suggested by JJL. - EF
-
-2010-03-20 Added conditional support for new Tooltip API in gtk backend. - EF
-
-2010-03-20 Changed plt.fig_subplot() to plt.subplots() after discussion on
-           list, and changed its API to return axes as a numpy object array
-           (with control of dimensions via squeeze keyword). FP.
-
-2010-03-13 Manually brought in commits from branch::
-
-    ------------------------------------------------------------------------
-    r8191 | leejjoon | 2010-03-13 17:27:57 -0500 (Sat, 13 Mar 2010) | 1 line
-
-  fix the bug that handles for scatter are incorrectly set when dpi!=72.
-  Thanks to Ray Speth for the bug report.
-
-
-2010-03-03 Manually brought in commits from branch via diff/patch (svnmerge is broken)::
-
-    ------------------------------------------------------------------------
-    r8175 | leejjoon | 2010-03-03 10:03:30 -0800 (Wed, 03 Mar 2010) | 1 line
-
-    fix arguments of allow_rasterization.draw_wrapper
-    ------------------------------------------------------------------------
-    r8174 | jdh2358 | 2010-03-03 09:15:58 -0800 (Wed, 03 Mar 2010) | 1 line
-
-    added support for favicon in docs build
-    ------------------------------------------------------------------------
-    r8173 | jdh2358 | 2010-03-03 08:56:16 -0800 (Wed, 03 Mar 2010) | 1 line
-
-    applied Mattias get_bounds patch
-    ------------------------------------------------------------------------
-    r8172 | jdh2358 | 2010-03-03 08:31:42 -0800 (Wed, 03 Mar 2010) | 1 line
-
-    fix svnmerge download instructions
-    ------------------------------------------------------------------------
-    r8171 | jdh2358 | 2010-03-03 07:47:48 -0800 (Wed, 03 Mar 2010) | 1 line
-
-
-
-2010-02-25 add annotation_demo3.py that demonstrates new functionality. -JJL
-
-2010-02-25 refactor Annotation to support arbitrary Transform as xycoords
-           or textcoords. Also, if a tuple of two coordinates is provided,
-           they are interpreted as coordinates for each x and y position.
-           -JJL
-
-2010-02-24 Added pyplot.fig_subplot(), to create a figure and a group of
-           subplots in a single call.  This offers an easier pattern than
-           manually making figures and calling add_subplot() multiple times. FP
-
-2010-02-17 Added Gokhan's and Mattias' customizable keybindings patch
-           for the toolbar.  You can now set the keymap.* properties
-           in the matplotlibrc file.  Newbindings were added for
-           toggling log scaling on the x-axis. JDH
-
-2010-02-16 Committed TJ's filled marker patch for
-           left|right|bottom|top|full filled markers.  See
-           examples/pylab_examples/filledmarker_demo.py. JDH
-
-2010-02-11 Added 'bootstrap' option to boxplot. This allows bootstrap
-           estimates of median confidence intervals. Based on an
-           initial patch by Paul Hobson. - ADS
-
-2010-02-06 Added setup.cfg "basedirlist" option to override setting
-           in setupext.py "basedir" dictionary; added "gnu0"
-           platform requested by Benjamin Drung. - EF
-
-2010-02-06 Added 'xy' scaling option to EllipseCollection. - EF
-
-2010-02-03 Made plot_directive use a custom PlotWarning category, so that
-           warnings can be turned into fatal errors easily if desired. - FP
-
-2010-01-29 Added draggable method to Legend to allow mouse drag
-           placement.  Thanks Adam Fraser. JDH
-
-2010-01-25 Fixed a bug reported by Olle Engdegard, when using
-           histograms with stepfilled and log=True - MM
-
-2010-01-16 Upgraded CXX to 6.1.1 - JDH
-
-2009-01-16 Don't create minor ticks on top of existing major
-           ticks. Patch by Neil Crighton. -ADS
-
-2009-01-16 Ensure three minor ticks always drawn (SF# 2924245). Patch
-           by Neil Crighton. -ADS
-
-2010-01-16 Applied patch by Ian Thomas to fix two contouring
-           problems: now contourf handles interior masked regions,
-           and the boundaries of line and filled contours coincide. - EF
-
-2009-01-11 The color of legend patch follows the rc parameters
-           axes.facecolor and axes.edgecolor. -JJL
-
-2009-01-11 adjustable of Axes can be "box-forced" which allow
-           sharing axes. -JJL
-
-2009-01-11 Add add_click and pop_click methods in
-           BlockingContourLabeler. -JJL
-
-
-2010-01-03 Added rcParams['axes.color_cycle'] - EF
-
-2010-01-03 Added Pierre's qt4 formlayout editor and toolbar button - JDH
-
-2009-12-31 Add support for using math text as marker symbols (Thanks to tcb)
-           - MGD
-
-2009-12-31 Commit a workaround for a regression in PyQt4-4.6.{0,1} - DSD
-
-2009-12-22 Fix cmap data for gist_earth_r, etc. -JJL
-
-2009-12-20 spines: put spines in data coordinates, add set_bounds()
-           call. -ADS
-
-2009-12-18 Don't limit notch size in boxplot to q1-q3 range, as this
-           is effectively making the data look better than it is. - ADS
-
-2009-12-18 mlab.prctile handles even-length data, such that the median
-           is the mean of the two middle values. - ADS
-
-2009-12-15 Add raw-image (unsampled) support for the ps backend. - JJL
-
-2009-12-14 Add patch_artist kwarg to boxplot, but keep old default.
-           Convert boxplot_demo2.py to use the new patch_artist. - ADS
-
-2009-12-06 axes_grid: reimplemented AxisArtist with FloatingAxes support.
-           Added new examples. - JJL
-
-2009-12-01 Applied Laurent Dufrechou's patch to improve blitting with
-           the qt4 backend - DSD
-
-2009-11-13 The pdf backend now allows changing the contents of
-           a pdf file's information dictionary via PdfPages.infodict. - JKS
-
-2009-11-12 font_manager.py should no longer cause EINTR on Python 2.6
-           (but will on the 2.5 version of subprocess). Also the
-           fc-list command in that file was fixed so now it should
-           actually find the list of fontconfig fonts. - JKS
-
-2009-11-10 Single images, and all images in renderers with
-           option_image_nocomposite (i.e. agg, macosx and the svg
-           backend when rcParams['svg.image_noscale'] is True), are
-           now drawn respecting the zorder relative to other
-           artists. (Note that there may now be inconsistencies across
-           backends when more than one image is drawn at varying
-           zorders, but this change introduces correct behavior for
-           the backends in which it's easy to do so.)
-
-2009-10-21 Make AutoDateLocator more configurable by adding options
-           to control the maximum and minimum number of ticks. Also
-           add control of the intervals to be used for ticking. This
-           does not change behavior but opens previously hard-coded
-           behavior to runtime modification`. - RMM
-
-2009-10-19 Add "path_effects" support for Text and Patch. See
-           examples/pylab_examples/patheffect_demo.py -JJL
-
-2009-10-19 Add "use_clabeltext" option to clabel. If True, clabels
-           will be created with ClabelText class, which recalculates
-           rotation angle of the label during the drawing time. -JJL
-
-2009-10-16 Make AutoDateFormatter actually use any specified
-           timezone setting.This was only working correctly
-           when no timezone was specified. - RMM
-
-2009-09-27 Beginnings of a capability to test the pdf backend. - JKS
-
-2009-09-27 Add a savefig.extension rcparam to control the default
-           filename extension used by savefig. - JKS
+2009-09-27
+    Add a savefig.extension rcparam to control the default filename extension
+    used by savefig. - JKS
 
 ===============================================
 
-2009-09-21 Tagged for release 0.99.1
-
-2009-09-20 Fix usetex spacing errors in pdf backend. - JKS
+2009-09-21
+    Tagged for release 0.99.1
 
-2009-09-20 Add Sphinx extension to highlight IPython console sessions,
-           originally authored (I think) by Michael Droetboom. - FP
+2009-09-20
+    Fix usetex spacing errors in pdf backend. - JKS
 
-2009-09-20 Fix off-by-one error in dviread.Tfm, and additionally protect
-           against exceptions in case a dvi font is missing some metrics. - JKS
+2009-09-20
+    Add Sphinx extension to highlight IPython console sessions, originally
+    authored (I think) by Michael Droetboom. - FP
 
-2009-09-15 Implement draw_text and draw_tex method of backend_base using
-           the textpath module. Implement draw_tex method of the svg
-           backend. - JJL
+2009-09-20
+    Fix off-by-one error in dviread.Tfm, and additionally protect against
+    exceptions in case a dvi font is missing some metrics. - JKS
 
-2009-09-15 Don't fail on AFM files containing floating-point bounding boxes - JKS
+2009-09-15
+    Implement draw_text and draw_tex method of backend_base using the textpath
+    module. Implement draw_tex method of the svg backend. - JJL
 
-2009-09-13 AxesGrid : add modified version of colorbar. Add colorbar
-           location howto. - JJL
+2009-09-15
+    Don't fail on AFM files containing floating-point bounding boxes - JKS
 
-2009-09-07 AxesGrid : implemented axisline style.
-           Added a demo examples/axes_grid/demo_axisline_style.py- JJL
+2009-09-13
+    AxesGrid : add modified version of colorbar. Add colorbar location howto. -
+    JJL
 
-2009-09-04 Make the textpath class as a separate module
-           (textpath.py). Add support for mathtext and tex.- JJL
+2009-09-07
+    AxesGrid : implemented axisline style.  Added a demo
+    examples/axes_grid/demo_axisline_style.py- JJL
 
-2009-09-01 Added support for Gouraud interpolated triangles.
-           pcolormesh now accepts shading='gouraud' as an option. - MGD
+2009-09-04
+    Make the textpath class as a separate module (textpath.py). Add support for
+    mathtext and tex.- JJL
 
-2009-08-29 Added matplotlib.testing package, which contains a Nose
-           plugin and a decorator that lets tests be marked as
-           KnownFailures - ADS
+2009-09-01
+    Added support for Gouraud interpolated triangles.  pcolormesh now accepts
+    shading='gouraud' as an option. - MGD
 
-2009-08-20 Added scaled dict to AutoDateFormatter for customized
-           scales - JDH
+2009-08-29
+    Added matplotlib.testing package, which contains a Nose plugin and a
+    decorator that lets tests be marked as KnownFailures - ADS
 
-2009-08-15 Pyplot interface: the current image is now tracked at the
-           figure and axes level, addressing tracker item 1656374. - EF
+2009-08-20
+    Added scaled dict to AutoDateFormatter for customized scales - JDH
 
-2009-08-15 Docstrings are now manipulated with decorators defined
-           in a new module, docstring.py, thanks to Jason Coombs. - EF
+2009-08-15
+    Pyplot interface: the current image is now tracked at the figure and axes
+    level, addressing tracker item 1656374. - EF
 
-2009-08-14 Add support for image filtering for agg back end. See the example
-           demo_agg_filter.py. -JJL
+2009-08-15
+    Docstrings are now manipulated with decorators defined in a new module,
+    docstring.py, thanks to Jason Coombs. - EF
 
-2009-08-09 AnnotationBbox added. Similar to Annotation, but works with
-           OffsetBox instead of Text. See the example
-           demo_annotation_box.py. -JJL
+2009-08-14
+    Add support for image filtering for agg back end. See the example
+    demo_agg_filter.py. -JJL
 
-2009-08-07 BboxImage implemented. Two examples, demo_bboximage.py and
-           demo_ribbon_box.py added. - JJL
+2009-08-09
+    AnnotationBbox added. Similar to Annotation, but works with OffsetBox
+    instead of Text. See the example demo_annotation_box.py. -JJL
 
-2009-08-07 In an effort to simplify the backend API, all clipping rectangles
-           and paths are now passed in using GraphicsContext objects, even
-           on collections and images.  Therefore:
+2009-08-07
+    BboxImage implemented. Two examples, demo_bboximage.py and
+    demo_ribbon_box.py added. - JJL
 
-             draw_path_collection(self, master_transform, cliprect, clippath,
-                                  clippath_trans, paths, all_transforms, offsets,
-                                  offsetTrans, facecolors, edgecolors, linewidths,
-                                  linestyles, antialiaseds, urls)
+2009-08-07
+    In an effort to simplify the backend API, all clipping rectangles and paths
+    are now passed in using GraphicsContext objects, even on collections and
+    images.  Therefore::
 
-                                             becomes:
+        draw_path_collection(self, master_transform, cliprect, clippath,
+                             clippath_trans, paths, all_transforms, offsets,
+                             offsetTrans, facecolors, edgecolors, linewidths,
+                             linestyles, antialiaseds, urls)
 
-             draw_path_collection(self, gc, master_transform, paths, all_transforms,
-                                  offsets, offsetTrans, facecolors, edgecolors,
-                                  linewidths, linestyles, antialiaseds, urls)
+    becomes::
 
+        draw_path_collection(self, gc, master_transform, paths, all_transforms,
+                             offsets, offsetTrans, facecolors, edgecolors,
+                             linewidths, linestyles, antialiaseds, urls)
 
+    ::
 
-             draw_quad_mesh(self, master_transform, cliprect, clippath,
-                            clippath_trans, meshWidth, meshHeight, coordinates,
-                            offsets, offsetTrans, facecolors, antialiased,
-                            showedges)
+        draw_quad_mesh(self, master_transform, cliprect, clippath,
+                       clippath_trans, meshWidth, meshHeight, coordinates,
+                       offsets, offsetTrans, facecolors, antialiased,
+                       showedges)
 
-                                             becomes:
+    becomes::
 
-             draw_quad_mesh(self, gc, master_transform, meshWidth, meshHeight,
-                            coordinates, offsets, offsetTrans, facecolors,
-                            antialiased, showedges)
+        draw_quad_mesh(self, gc, master_transform, meshWidth, meshHeight,
+                       coordinates, offsets, offsetTrans, facecolors,
+                       antialiased, showedges)
 
+    ::
 
+        draw_image(self, x, y, im, bbox, clippath=None, clippath_trans=None)
 
-             draw_image(self, x, y, im, bbox, clippath=None, clippath_trans=None)
+    becomes::
 
-                                             becomes:
+        draw_image(self, gc, x, y, im)
 
-             draw_image(self, gc, x, y, im)
+    - MGD
 
-           - MGD
+2009-08-06
+    Tagging the 0.99.0 release at svn r7397 - JDH
 
-2009-08-06 Tagging the 0.99.0 release at svn r7397 - JDH
+    * fixed an alpha colormapping bug posted on sf 2832575
 
-           * fixed an alpha colormapping bug posted on sf 2832575
+    * fix typo in axes_divider.py. use nanmin, nanmax in angle_helper.py (patch
+      by Christoph Gohlke)
 
-           * fix typo in axes_divider.py. use nanmin, nanmax in angle_helper.py
-             (patch by Christoph Gohlke)
+    * remove dup gui event in enter/leave events in gtk
 
-           * remove dup gui event in enter/leave events in gtk
+    * lots of fixes for os x binaries (Thanks Russell Owen)
 
-           * lots of fixes for os x binaries (Thanks Russell Owen)
+    * attach gtk events to mpl events -- fixes sf bug 2816580
 
-           * attach gtk events to mpl events -- fixes sf bug 2816580
+    * applied sf patch 2815064 (middle button events for wx) and patch  2818092
+      (resize events for wx)
 
-           * applied sf patch 2815064 (middle button events for wx) and
-             patch  2818092 (resize events for wx)
+    * fixed boilerplate.py so it doesn't break the ReST docs.
 
-           * fixed boilerplate.py so it doesn't break the ReST docs.
+    * removed a couple of cases of mlab.load
 
-           * removed a couple of cases of mlab.load
+    * fixed rec2csv win32 file handle bug from sf patch 2831018
 
-           * fixed rec2csv win32 file handle bug from sf patch 2831018
+    * added two examples from Josh Hemann:
+      examples/pylab_examples/barchart_demo2.py and
+      examples/pylab_examples/boxplot_demo2.py
 
-           * added two examples from Josh Hemann: examples/pylab_examples/barchart_demo2.py
-             and examples/pylab_examples/boxplot_demo2.py
+    * handled sf bugs 2831556 and 2830525; better bar error messages and
+      backend driver configs
 
-           * handled sf bugs 2831556 and 2830525; better bar error messages and
-             backend driver configs
+    * added miktex win32 patch from sf patch 2820194
 
-           * added miktex win32 patch from sf patch 2820194
+    * apply sf patches 2830233 and 2823885 for osx setup and 64 bit;  thanks
+      Michiel
 
-           * apply sf patches 2830233 and 2823885 for osx setup and 64 bit;  thanks Michiel
+2009-08-04
+    Made cbook.get_sample_data make use of the ETag and Last-Modified headers
+    of mod_dav_svn. - JKS
 
-2009-08-04 Made cbook.get_sample_data make use of the ETag and Last-Modified
-           headers of mod_dav_svn. - JKS
+2009-08-03
+    Add PathCollection; modify contourf to use complex paths instead of simple
+    paths with cuts. - EF
 
-2009-08-03 Add PathCollection; modify contourf to use complex
-           paths instead of simple paths with cuts. - EF
+2009-08-03
+    Fixed boilerplate.py so it doesn't break the ReST docs. - JKS
 
+2009-08-03
+    pylab no longer provides a load and save function.  These are available in
+    matplotlib.mlab, or you can use numpy.loadtxt and numpy.savetxt for text
+    files, or np.save and np.load for binary numpy arrays. - JDH
 
-2009-08-03 Fixed boilerplate.py so it doesn't break the ReST docs. - JKS
+2009-07-31
+    Added cbook.get_sample_data for urllib enabled fetching and caching of data
+    needed for examples.  See examples/misc/sample_data_demo.py - JDH
 
-2009-08-03 pylab no longer provides a load and save function.  These
-           are available in matplotlib.mlab, or you can use
-           numpy.loadtxt and numpy.savetxt for text files, or np.save
-           and np.load for binary numpy arrays. - JDH
+2009-07-31
+    Tagging 0.99.0.rc1 at 7314 - MGD
 
-2009-07-31 Added cbook.get_sample_data for urllib enabled fetching and
-           caching of data needed for examples.  See
-           examples/misc/sample_data_demo.py - JDH
+2009-07-30
+    Add set_cmap and register_cmap, and improve get_cmap, to provide convenient
+    handling of user-generated colormaps. Reorganized _cm and cm modules. - EF
 
-2009-07-31 Tagging 0.99.0.rc1 at 7314 - MGD
+2009-07-28
+    Quiver speed improved, thanks to tip by Ray Speth. -EF
 
-2009-07-30 Add set_cmap and register_cmap, and improve get_cmap,
-           to provide convenient handling of user-generated
-           colormaps. Reorganized _cm and cm modules. - EF
+2009-07-27
+    Simplify argument handling code for plot method. -EF
 
-2009-07-28 Quiver speed improved, thanks to tip by Ray Speth. -EF
+2009-07-25
+    Allow "plot(1, 2, 'r*')" to work. - EF
 
-2009-07-27 Simplify argument handling code for plot method. -EF
+2009-07-22
+    Added an 'interp' keyword to griddata so the faster linear interpolation
+    method can be chosen.  Default is 'nn', so default behavior (using natural
+    neighbor method) is unchanged (JSW)
 
-2009-07-25 Allow "plot(1, 2, 'r*')" to work. - EF
+2009-07-22
+    Improved boilerplate.py so that it generates the correct signatures for
+    pyplot functions. - JKS
 
-2009-07-22 Added an 'interp' keyword to griddata so the faster linear
-           interpolation method can be chosen.  Default is 'nn', so
-           default behavior (using natural neighbor method) is unchanged (JSW)
+2009-07-19
+    Fixed the docstring of Axes.step to reflect the correct meaning of the
+    kwargs "pre" and "post" - See SF bug
+    \https://sourceforge.net/tracker/index.php?func=detail&aid=2823304&group_id=80706&atid=560720
+    - JDH
 
-2009-07-22 Improved boilerplate.py so that it generates the correct
-           signatures for pyplot functions. - JKS
+2009-07-18
+    Fix support for hatches without color fills to pdf and svg backends. Add an
+    example of that to hatch_demo.py. - JKS
 
-2009-07-19 Fixed the docstring of Axes.step to reflect the correct
-           meaning of the kwargs "pre" and "post" - See SF bug
-           \https://sourceforge.net/tracker/index.php?func=detail&aid=2823304&group_id=80706&atid=560720
-           - JDH
+2009-07-17
+    Removed fossils from swig version of agg backend. - EF
 
-2009-07-18 Fix support for hatches without color fills to pdf and svg
-           backends. Add an example of that to hatch_demo.py. - JKS
+2009-07-14
+    initial submission of the annotation guide. -JJL
 
-2009-07-17 Removed fossils from swig version of agg backend. - EF
+2009-07-14
+    axes_grid : minor improvements in anchored_artists and inset_locator. -JJL
 
-2009-07-14 initial submission of the annotation guide. -JJL
+2009-07-14
+    Fix a few bugs in ConnectionStyle algorithms. Add ConnectionPatch class.
+    -JJL
 
-2009-07-14 axes_grid : minor improvements in anchored_artists and
-           inset_locator. -JJL
+2009-07-11
+    Added a fillstyle Line2D property for half filled markers -- see
+    examples/pylab_examples/fillstyle_demo.py JDH
 
-2009-07-14 Fix a few bugs in ConnectionStyle algorithms. Add
-           ConnectionPatch class. -JJL
+2009-07-08
+    Attempt to improve performance of qt4 backend, do not call
+    qApp.processEvents while processing an event. Thanks Ole Streicher for
+    tracking this down - DSD
 
-2009-07-11 Added a fillstyle Line2D property for half filled markers
-           -- see examples/pylab_examples/fillstyle_demo.py JDH
+2009-06-24
+    Add withheader option to mlab.rec2csv and changed use_mrecords default to
+    False in mlab.csv2rec since this is partially broken - JDH
 
-2009-07-08 Attempt to improve performance of qt4 backend, do not call
-           qApp.processEvents while processing an event. Thanks Ole
-           Streicher for tracking this down - DSD
+2009-06-24
+    backend_agg.draw_marker quantizes the main path (as in the draw_path). -
+    JJL
 
-2009-06-24 Add withheader option to mlab.rec2csv and changed
-  use_mrecords default to False in mlab.csv2rec since this is
-  partially broken - JDH
+2009-06-24
+    axes_grid: floating axis support added. - JJL
 
-2009-06-24 backend_agg.draw_marker quantizes the main path (as in the
-           draw_path). - JJL
+2009-06-14
+    Add new command line options to backend_driver.py to support running only
+    some directories of tests - JKS
 
-2009-06-24 axes_grid: floating axis support added. - JJL
+2009-06-13
+    partial cleanup of mlab and its importation in pylab - EF
 
-2009-06-14 Add new command line options to backend_driver.py to support
-           running only some directories of tests - JKS
+2009-06-13
+    Introduce a rotation_mode property for the Text artist. See
+    examples/pylab_examples/demo_text_rotation_mode.py -JJL
 
-2009-06-13 partial cleanup of mlab and its importation in pylab - EF
+2009-06-07
+    add support for bz2 files per sf support request 2794556 - JDH
 
-2009-06-13 Introduce a rotation_mode property for the Text artist. See
-           examples/pylab_examples/demo_text_rotation_mode.py -JJL
+2009-06-06
+    added a properties method to the artist and inspector to return a dict
+    mapping property name -> value; see sf feature request 2792183 - JDH
 
-2009-06-07 add support for bz2 files per sf support request 2794556 -
-           JDH
+2009-06-06
+    added Neil's auto minor tick patch; sf patch #2789713 - JDH
 
-2009-06-06 added a properties method to the artist and inspector to
-           return a dict mapping property name -> value; see sf
-           feature request 2792183 - JDH
+2009-06-06
+    do not apply alpha to rgba color conversion if input is already rgba - JDH
 
-2009-06-06 added Neil's auto minor tick patch; sf patch #2789713 - JDH
+2009-06-03
+    axes_grid : Initial check-in of curvelinear grid support. See
+    examples/axes_grid/demo_curvelinear_grid.py - JJL
 
-2009-06-06 do not apply alpha to rgba color conversion if input is
-           already rgba - JDH
+2009-06-01
+    Add set_color method to Patch - EF
 
-2009-06-03 axes_grid : Initial check-in of curvelinear grid support. See
-           examples/axes_grid/demo_curvelinear_grid.py - JJL
+2009-06-01
+    Spine is now derived from Patch - ADS
 
-2009-06-01 Add set_color method to Patch - EF
+2009-06-01
+    use cbook.is_string_like() instead of isinstance() for spines - ADS
 
-2009-06-01 Spine is now derived from Patch - ADS
+2009-06-01
+    cla() support for spines - ADS
 
-2009-06-01 use cbook.is_string_like() instead of isinstance() for spines - ADS
+2009-06-01
+    Removed support for gtk < 2.4. - EF
 
-2009-06-01 cla() support for spines - ADS
+2009-05-29
+    Improved the animation_blit_qt4 example, which was a mix of the
+    object-oriented and pylab interfaces. It is now strictly object-oriented -
+    DSD
 
-2009-06-01 Removed support for gtk < 2.4. - EF
+2009-05-28
+    Fix axes_grid toolkit to work with spine patch by ADS. - JJL
 
-2009-05-29 Improved the animation_blit_qt4 example, which was a mix
-           of the object-oriented and pylab interfaces. It is now
-           strictly object-oriented - DSD
+2009-05-28
+    Applied fbianco's patch to handle scroll wheel events in the qt4 backend -
+    DSD
 
-2009-05-28 Fix axes_grid toolkit to work with spine patch by ADS. - JJL
+2009-05-26
+    Add support for "axis spines" to have arbitrary location. -ADS
 
-2009-05-28 Applied fbianco's patch to handle scroll wheel events in
-           the qt4 backend - DSD
+2009-05-20
+    Add an empty matplotlibrc to the tests/ directory so that running tests
+    will use the default set of rcparams rather than the user's config. - RMM
 
-2009-05-26 Add support for "axis spines" to have arbitrary location. -ADS
+2009-05-19
+    Axis.grid(): allow use of which='major,minor' to have grid on major and
+    minor ticks. -ADS
 
-2009-05-20 Add an empty matplotlibrc to the tests/ directory so that running
-           tests will use the default set of rcparams rather than the user's
-           config. - RMM
+2009-05-18
+    Make psd(), csd(), and cohere() wrap properly for complex/two-sided
+    versions, like specgram() (SF #2791686) - RMM
 
-2009-05-19 Axis.grid(): allow use of which='major,minor' to have grid
-           on major and minor ticks. -ADS
+2009-05-18
+    Fix the linespacing bug of multiline text (#1239682). See
+    examples/pylab_examples/multiline.py -JJL
 
-2009-05-18 Make psd(), csd(), and cohere() wrap properly for complex/two-sided
-           versions, like specgram() (SF #2791686) - RMM
+2009-05-18
+    Add *annotation_clip* attr. for text.Annotation class.  If True, annotation
+    is only drawn when the annotated point is inside the axes area. -JJL
 
-2009-05-18 Fix the linespacing bug of multiline text (#1239682). See
-           examples/pylab_examples/multiline.py -JJL
+2009-05-17
+    Fix bug(#2749174) that some properties of minor ticks are not conserved
+    -JJL
 
-2009-05-18 Add *annotation_clip* attr. for text.Annotation class.
-           If True, annotation is only drawn when the annotated point is
-           inside the axes area. -JJL
+2009-05-17
+    applied Michiel's sf patch 2790638 to turn off gtk event loop in setupext
+    for pygtk>=2.15.10 - JDH
 
-2009-05-17 Fix bug(#2749174) that some properties of minor ticks are
-           not conserved -JJL
-
-2009-05-17 applied Michiel's sf patch 2790638 to turn off gtk event
-           loop in setupext for pygtk>=2.15.10 - JDH
-
-2009-05-17 applied Michiel's sf patch 2792742 to speed up Cairo and
-           macosx collections; speedups can be 20x.  Also fixes some
-           bugs in which gc got into inconsistent state
+2009-05-17
+    applied Michiel's sf patch 2792742 to speed up Cairo and macosx
+    collections; speedups can be 20x.  Also fixes some bugs in which gc got
+    into inconsistent state
 
 -----------------------
 
-2008-05-17 Release 0.98.5.3 at r7107 from the branch - JDH
-
-2009-05-13 An optional offset and bbox support in restore_bbox.
-           Add animation_blit_gtk2.py. -JJL
+2008-05-17
+    Release 0.98.5.3 at r7107 from the branch - JDH
 
-2009-05-13 psfrag in backend_ps now uses baseline-alignment
-           when preview.sty is used ((default is
-           bottom-alignment). Also, a small API improvement
-           in OffsetBox-JJL
+2009-05-13
+    An optional offset and bbox support in restore_bbox.  Add
+    animation_blit_gtk2.py. -JJL
 
-2009-05-13 When the x-coordinate of a line is monotonically
-           increasing, it is now automatically clipped at
-           the stage of generating the transformed path in
-           the draw method; this greatly speeds up zooming and
-           panning when one is looking at a short segment of
-           a long time series, for example. - EF
+2009-05-13
+    psfrag in backend_ps now uses baseline-alignment when preview.sty is used
+    ((default is bottom-alignment). Also, a small API improvement in
+    OffsetBox-JJL
 
-2009-05-11 aspect=1 in log-log plot gives square decades. -JJL
+2009-05-13
+    When the x-coordinate of a line is monotonically increasing, it is now
+    automatically clipped at the stage of generating the transformed path in
+    the draw method; this greatly speeds up zooming and panning when one is
+    looking at a short segment of a long time series, for example. - EF
 
-2009-05-08 clabel takes new kwarg, rightside_up; if False, labels
-           will not be flipped to keep them rightside-up.  This
-           allows the use of clabel to make streamfunction arrows,
-           as requested by Evan Mason. - EF
+2009-05-11
+    aspect=1 in log-log plot gives square decades. -JJL
 
-2009-05-07 'labelpad' can now be passed when setting x/y labels. This
-           allows controlling the spacing between the label and its
-           axis. - RMM
+2009-05-08
+    clabel takes new kwarg, rightside_up; if False, labels will not be flipped
+    to keep them rightside-up.  This allows the use of clabel to make
+    streamfunction arrows, as requested by Evan Mason. - EF
 
-2009-05-06 print_ps now uses mixed-mode renderer. Axes.draw rasterize
-           artists whose zorder smaller than rasterization_zorder.
-           -JJL
+2009-05-07
+    'labelpad' can now be passed when setting x/y labels. This allows
+    controlling the spacing between the label and its axis. - RMM
 
-2009-05-06 Per-artist Rasterization, originally by Eric Bruning. -JJ
+2009-05-06
+    print_ps now uses mixed-mode renderer. Axes.draw rasterize artists whose
+    zorder smaller than rasterization_zorder.  -JJL
 
-2009-05-05 Add an example that shows how to make a plot that updates
-           using data from another process.  Thanks to Robert
-           Cimrman - RMM
+2009-05-06
+    Per-artist Rasterization, originally by Eric Bruning. -JJ
 
-2009-05-05 Add Axes.get_legend_handles_labels method. - JJL
+2009-05-05
+    Add an example that shows how to make a plot that updates using data from
+    another process.  Thanks to Robert Cimrman - RMM
 
-2009-05-04 Fix bug that Text.Annotation is still drawn while set to
-           not visible. - JJL
+2009-05-05
+    Add Axes.get_legend_handles_labels method. - JJL
 
-2009-05-04 Added TJ's fill_betweenx patch - JDH
+2009-05-04
+    Fix bug that Text.Annotation is still drawn while set to not visible. - JJL
 
-2009-05-02 Added options to plotfile based on question from
-           Joseph Smidt and patch by Matthias Michler. - EF
+2009-05-04
+    Added TJ's fill_betweenx patch - JDH
 
+2009-05-02
+    Added options to plotfile based on question from Joseph Smidt and patch by
+    Matthias Michler. - EF
 
-2009-05-01 Changed add_artist and similar Axes methods to
-           return their argument. - EF
+2009-05-01
+    Changed add_artist and similar Axes methods to return their argument. - EF
 
-2009-04-30 Incorrect eps bbox for landscape mode fixed - JJL
+2009-04-30
+    Incorrect eps bbox for landscape mode fixed - JJL
 
-2009-04-28 Fixed incorrect bbox of eps output when usetex=True. - JJL
+2009-04-28
+    Fixed incorrect bbox of eps output when usetex=True. - JJL
 
-2009-04-24 Changed use of os.open* to instead use subprocess.Popen.
-           os.popen* are deprecated in 2.6 and are removed in 3.0. - RMM
+2009-04-24
+    Changed use of os.open* to instead use subprocess.Popen.  os.popen* are
+    deprecated in 2.6 and are removed in 3.0. - RMM
 
-2009-04-20 Worked on axes_grid documentation. Added
-           axes_grid.inset_locator. - JJL
+2009-04-20
+    Worked on axes_grid documentation. Added axes_grid.inset_locator. - JJL
 
-2009-04-17 Initial check-in of the axes_grid toolkit. - JJL
+2009-04-17
+    Initial check-in of the axes_grid toolkit. - JJL
 
-2009-04-17 Added a support for bbox_to_anchor in
-           offsetbox.AnchoredOffsetbox. Improved a documentation.
-           - JJL
+2009-04-17
+    Added a support for bbox_to_anchor in offsetbox.AnchoredOffsetbox. Improved
+    a documentation.  - JJL
 
-2009-04-16 Fixed a offsetbox bug that multiline texts are not
-           correctly aligned.  - JJL
+2009-04-16
+    Fixed a offsetbox bug that multiline texts are not correctly aligned.  -
+    JJL
 
-2009-04-16 Fixed a bug in mixed mode renderer that images produced by
-           an rasterizing backend are placed with incorrect size.
-           - JJL
+2009-04-16
+    Fixed a bug in mixed mode renderer that images produced by an rasterizing
+    backend are placed with incorrect size.  - JJL
 
-2009-04-14 Added Jonathan Taylor's Reinier Heeres' port of John
-           Porters' mplot3d to svn trunk.  Package in
-           mpl_toolkits.mplot3d and demo is examples/mplot3d/demo.py.
-           Thanks Reiner
+2009-04-14
+    Added Jonathan Taylor's Reinier Heeres' port of John Porters' mplot3d to
+    svn trunk.  Package in mpl_toolkits.mplot3d and demo is
+    examples/mplot3d/demo.py.  Thanks Reiner
 
-2009-04-06 The pdf backend now escapes newlines and linefeeds in strings.
-           Fixes sf bug #2708559; thanks to Tiago Pereira for the report.
+2009-04-06
+    The pdf backend now escapes newlines and linefeeds in strings.  Fixes sf
+    bug #2708559; thanks to Tiago Pereira for the report.
 
-2009-04-06 texmanager.make_dvi now raises an error if LaTeX failed to
-           create an output file. Thanks to Joao Luis Silva for reporting
-           this. - JKS
+2009-04-06
+    texmanager.make_dvi now raises an error if LaTeX failed to create an output
+    file. Thanks to Joao Luis Silva for reporting this. - JKS
 
-2009-04-05 _png.read_png() reads 12 bit PNGs (patch from
-           Tobias Wood) - ADS
+2009-04-05
+    _png.read_png() reads 12 bit PNGs (patch from Tobias Wood) - ADS
 
-2009-04-04 Allow log axis scale to clip non-positive values to
-           small positive value; this is useful for errorbars. - EF
+2009-04-04
+    Allow log axis scale to clip non-positive values to small positive value;
+    this is useful for errorbars. - EF
 
-2009-03-28 Make images handle nan in their array argument.
-           A helper, cbook.safe_masked_invalid() was added. - EF
+2009-03-28
+    Make images handle nan in their array argument.  A helper,
+    cbook.safe_masked_invalid() was added. - EF
 
-2009-03-25 Make contour and contourf handle nan in their Z argument. - EF
+2009-03-25
+    Make contour and contourf handle nan in their Z argument. - EF
 
-2009-03-20 Add AuxTransformBox in offsetbox.py to support some transformation.
-           anchored_text.py example is enhanced and renamed
-           (anchored_artists.py). - JJL
+2009-03-20
+    Add AuxTransformBox in offsetbox.py to support some transformation.
+    anchored_text.py example is enhanced and renamed (anchored_artists.py). -
+    JJL
 
-2009-03-20 Add "bar" connection style for annotation - JJL
+2009-03-20
+    Add "bar" connection style for annotation - JJL
 
-2009-03-17 Fix bugs in edge color handling by contourf, found
-           by Jae-Joon Lee. - EF
+2009-03-17
+    Fix bugs in edge color handling by contourf, found by Jae-Joon Lee. - EF
 
-2009-03-14 Added 'LightSource' class to colors module for
-           creating shaded relief maps.  shading_example.py
-           added to illustrate usage. - JSW
+2009-03-14
+    Added 'LightSource' class to colors module for creating shaded relief maps.
+    shading_example.py added to illustrate usage. - JSW
 
-2009-03-11 Ensure wx version >= 2.8; thanks to Sandro Tosi and
-           Chris Barker. - EF
+2009-03-11
+    Ensure wx version >= 2.8; thanks to Sandro Tosi and Chris Barker. - EF
 
-2009-03-10 Fix join style bug in pdf. - JKS
+2009-03-10
+    Fix join style bug in pdf. - JKS
 
-2009-03-07 Add pyplot access to figure number list - EF
+2009-03-07
+    Add pyplot access to figure number list - EF
 
-2009-02-28 hashing of FontProperties accounts current rcParams - JJL
+2009-02-28
+    hashing of FontProperties accounts current rcParams - JJL
 
-2009-02-28 Prevent double-rendering of shared axis in twinx, twiny - EF
+2009-02-28
+    Prevent double-rendering of shared axis in twinx, twiny - EF
 
-2009-02-26 Add optional bbox_to_anchor argument for legend class - JJL
+2009-02-26
+    Add optional bbox_to_anchor argument for legend class - JJL
 
-2009-02-26 Support image clipping in pdf backend. - JKS
+2009-02-26
+    Support image clipping in pdf backend. - JKS
 
-2009-02-25 Improve tick location subset choice in FixedLocator. - EF
+2009-02-25
+    Improve tick location subset choice in FixedLocator. - EF
 
-2009-02-24 Deprecate numerix, and strip out all but the numpy
-           part of the code. - EF
+2009-02-24
+    Deprecate numerix, and strip out all but the numpy part of the code. - EF
 
-2009-02-21 Improve scatter argument handling; add an early error
-           message, allow inputs to have more than one dimension. - EF
+2009-02-21
+    Improve scatter argument handling; add an early error message, allow inputs
+    to have more than one dimension. - EF
 
-2009-02-16 Move plot_directive.py to the installed source tree.  Add
-           support for inline code content - MGD
+2009-02-16
+    Move plot_directive.py to the installed source tree.  Add support for
+    inline code content - MGD
 
-2009-02-16 Move mathmpl.py to the installed source tree so it is
-           available to other projects. - MGD
+2009-02-16
+    Move mathmpl.py to the installed source tree so it is available to other
+    projects. - MGD
 
-2009-02-14 Added the legend title support - JJL
+2009-02-14
+    Added the legend title support - JJL
 
-2009-02-10 Fixed a bug in backend_pdf so it doesn't break when the setting
-           pdf.use14corefonts=True is used. Added test case in
-           unit/test_pdf_use14corefonts.py. - NGR
+2009-02-10
+    Fixed a bug in backend_pdf so it doesn't break when the setting
+    pdf.use14corefonts=True is used. Added test case in
+    unit/test_pdf_use14corefonts.py. - NGR
 
-2009-02-08 Added a new imsave function to image.py and exposed it in
-           the pyplot interface - GR
+2009-02-08
+    Added a new imsave function to image.py and exposed it in the pyplot
+    interface - GR
 
-2009-02-04 Some reorgnization of the legend code. anchored_text.py
-           added as an example. - JJL
+2009-02-04
+    Some reorganization of the legend code. anchored_text.py added as an
+    example. - JJL
 
-2009-02-04 Add extent keyword arg to hexbin - ADS
+2009-02-04
+    Add extent keyword arg to hexbin - ADS
 
-2009-02-04 Fix bug in mathtext related to \dots and \ldots - MGD
+2009-02-04
+    Fix bug in mathtext related to \dots and \ldots - MGD
 
-2009-02-03 Change default joinstyle to round - MGD
+2009-02-03
+    Change default joinstyle to round - MGD
 
-2009-02-02 Reduce number of marker XObjects in pdf output - JKS
+2009-02-02
+    Reduce number of marker XObjects in pdf output - JKS
 
-2009-02-02 Change default resolution on polar plot to 1 - MGD
+2009-02-02
+    Change default resolution on polar plot to 1 - MGD
 
-2009-02-02 Avoid malloc errors in ttconv for fonts that don't have
-           e.g., PostName (a version of Tahoma triggered this) - JKS
+2009-02-02
+    Avoid malloc errors in ttconv for fonts that don't have e.g., PostName (a
+    version of Tahoma triggered this) - JKS
 
-2009-01-30 Remove support for pyExcelerator in exceltools -- use xlwt
-           instead - JDH
+2009-01-30
+    Remove support for pyExcelerator in exceltools -- use xlwt instead - JDH
 
-2009-01-29 Document 'resolution' kwarg for polar plots.  Support it
-           when using pyplot.polar, not just Figure.add_axes. - MGD
+2009-01-29
+    Document 'resolution' kwarg for polar plots.  Support it when using
+    pyplot.polar, not just Figure.add_axes. - MGD
 
-2009-01-29 Rework the nan-handling/clipping/quantizing/simplification
-           framework so each is an independent part of a pipeline.
-           Expose the C++-implementation of all of this so it can be
-           used from all Python backends.  Add rcParam
-           "path.simplify_threshold" to control the threshold of
-           similarity below which vertices will be removed.
+2009-01-29
+    Rework the nan-handling/clipping/quantizing/simplification framework so
+    each is an independent part of a pipeline.  Expose the C++-implementation
+    of all of this so it can be used from all Python backends.  Add rcParam
+    "path.simplify_threshold" to control the threshold of similarity below
+    which vertices will be removed.
 
-2009-01-26 Improved tight bbox option of the savefig. - JJL
+2009-01-26
+    Improved tight bbox option of the savefig. - JJL
 
-2009-01-26 Make curves and NaNs play nice together - MGD
+2009-01-26
+    Make curves and NaNs play nice together - MGD
 
-2009-01-21 Changed the defaults of acorr and xcorr to use
-           usevlines=True, maxlags=10 and normed=True since these are
-           the best defaults
+2009-01-21
+    Changed the defaults of acorr and xcorr to use usevlines=True, maxlags=10
+    and normed=True since these are the best defaults
 
-2009-01-19 Fix bug in quiver argument handling. - EF
+2009-01-19
+    Fix bug in quiver argument handling. - EF
 
-2009-01-19 Fix bug in backend_gtk: don't delete nonexistent toolbar. - EF
+2009-01-19
+    Fix bug in backend_gtk: don't delete nonexistent toolbar. - EF
 
-2009-01-16 Implement bbox_inches option for savefig. If bbox_inches is
-           "tight", try to determine the tight bounding box. - JJL
+2009-01-16
+    Implement bbox_inches option for savefig. If bbox_inches is "tight", try to
+    determine the tight bounding box. - JJL
 
-2009-01-16 Fix bug in is_string_like so it doesn't raise an
-           unnecessary exception. - EF
+2009-01-16
+    Fix bug in is_string_like so it doesn't raise an unnecessary exception. -
+    EF
 
-2009-01-16 Fix an infinite recursion in the unit registry when searching
-           for a converter for a sequence of strings. Add a corresponding
-           test. - RM
+2009-01-16
+    Fix an infinite recursion in the unit registry when searching for a
+    converter for a sequence of strings. Add a corresponding test. - RM
 
-2009-01-16 Bugfix of C typedef of MPL_Int64 that was failing on
-           Windows XP 64 bit, as reported by George Goussard on numpy
-           mailing list. - ADS
+2009-01-16
+    Bugfix of C typedef of MPL_Int64 that was failing on Windows XP 64 bit, as
+    reported by George Goussard on numpy mailing list. - ADS
 
-2009-01-16 Added helper function LinearSegmentedColormap.from_list to
-           facilitate building simple custom colomaps.  See
-           examples/pylab_examples/custom_cmap_fromlist.py - JDH
+2009-01-16
+    Added helper function LinearSegmentedColormap.from_list to facilitate
+    building simple custom colomaps.  See
+    examples/pylab_examples/custom_cmap_fromlist.py - JDH
 
-2009-01-16 Applied Michiel's patch for macosx backend to fix rounding
-           bug. Closed sf bug 2508440 - JSW
+2009-01-16
+    Applied Michiel's patch for macosx backend to fix rounding bug. Closed sf
+    bug 2508440 - JSW
 
-2009-01-10 Applied Michiel's hatch patch for macosx backend and
-           draw_idle patch for qt.  Closes sf patched 2497785 and
-           2468809 - JDH
+2009-01-10
+    Applied Michiel's hatch patch for macosx backend and draw_idle patch for
+    qt.  Closes sf patched 2497785 and 2468809 - JDH
 
-2009-01-10 Fix bug in pan/zoom with log coordinates. - EF
+2009-01-10
+    Fix bug in pan/zoom with log coordinates. - EF
 
-2009-01-06 Fix bug in setting of dashed negative contours. - EF
+2009-01-06
+    Fix bug in setting of dashed negative contours. - EF
 
-2009-01-06 Be fault tolerant when len(linestyles)>NLev in contour. - MM
+2009-01-06
+    Be fault tolerant when len(linestyles)>NLev in contour. - MM
 
-2009-01-06 Added marginals kwarg to hexbin to plot marginal densities
-           JDH
+2009-01-06
+    Added marginals kwarg to hexbin to plot marginal densities JDH
 
-2009-01-06 Change user-visible multipage pdf object to PdfPages to
-           avoid accidents with the file-like PdfFile. - JKS
+2009-01-06
+    Change user-visible multipage pdf object to PdfPages to avoid accidents
+    with the file-like PdfFile. - JKS
 
-2009-01-05 Fix a bug in pdf usetex: allow using non-embedded fonts. - JKS
+2009-01-05
+    Fix a bug in pdf usetex: allow using non-embedded fonts. - JKS
 
-2009-01-05 optional use of preview.sty in usetex mode. - JJL
+2009-01-05
+    optional use of preview.sty in usetex mode. - JJL
 
-2009-01-02 Allow multipage pdf files. - JKS
+2009-01-02
+    Allow multipage pdf files. - JKS
 
-2008-12-31 Improve pdf usetex by adding support for font effects
-           (slanting and extending). - JKS
+2008-12-31
+    Improve pdf usetex by adding support for font effects (slanting and
+    extending). - JKS
 
-2008-12-29 Fix a bug in pdf usetex support, which occurred if the same
-           Type-1 font was used with different encodings, e.g., with
-           Minion Pro and MnSymbol. - JKS
+2008-12-29
+    Fix a bug in pdf usetex support, which occurred if the same Type-1 font was
+    used with different encodings, e.g., with Minion Pro and MnSymbol. - JKS
 
-2008-12-20 fix the dpi-dependent offset of Shadow. - JJL
+2008-12-20
+    fix the dpi-dependent offset of Shadow. - JJL
 
-2008-12-20 fix the hatch bug in the pdf backend. minor update
-           in docs and  example - JJL
+2008-12-20
+    fix the hatch bug in the pdf backend. minor update in docs and  example -
+    JJL
 
-2008-12-19 Add axes_locator attribute in Axes. Two examples are added.
-           - JJL
+2008-12-19
+    Add axes_locator attribute in Axes. Two examples are added.  - JJL
 
-2008-12-19 Update Axes.legend documentation. /api/api_changes.rst is also
-           updated to describe changes in keyword parameters.
-           Issue a warning if old keyword parameters are used. - JJL
+2008-12-19
+    Update Axes.legend documentation. /api/api_changes.rst is also updated to
+    describe changes in keyword parameters.  Issue a warning if old keyword
+    parameters are used. - JJL
 
-2008-12-18 add new arrow style, a line + filled triangles. -JJL
+2008-12-18
+    add new arrow style, a line + filled triangles. -JJL
 
 ----------------
 
-2008-12-18 Re-Released 0.98.5.2 from v0_98_5_maint at r6679
-           Released 0.98.5.2 from v0_98_5_maint at r6667
-
-2008-12-18 Removed configobj, experimental traits and doc/mpl_data link - JDH
-
-2008-12-18 Fix bug where a line with NULL data limits prevents
-           subsequent data limits from calculating correctly - MGD
+2008-12-18
+    Re-Released 0.98.5.2 from v0_98_5_maint at r6679 Released 0.98.5.2 from
+    v0_98_5_maint at r6667
 
-2008-12-17 Major documentation generator changes - MGD
+2008-12-18
+    Removed configobj, experimental traits and doc/mpl_data link - JDH
 
-2008-12-17 Applied macosx backend patch with support for path
-           collections, quadmesh, etc... - JDH
+2008-12-18
+    Fix bug where a line with NULL data limits prevents subsequent data limits
+    from calculating correctly - MGD
 
-2008-12-17 fix dpi-dependent behavior of text bbox and arrow in annotate
-            -JJL
+2008-12-17
+    Major documentation generator changes - MGD
 
-2008-12-17 Add group id support in artist. Two examples which
-           demonstrate svg filter are added. -JJL
+2008-12-17
+    Applied macosx backend patch with support for path collections, quadmesh,
+    etc... - JDH
 
-2008-12-16 Another attempt to fix dpi-dependent behavior of Legend. -JJL
+2008-12-17
+    fix dpi-dependent behavior of text bbox and arrow in annotate -JJL
 
-2008-12-16 Fixed dpi-dependent behavior of Legend and fancybox in Text.
+2008-12-17
+    Add group id support in artist. Two examples which demonstrate svg filter
+    are added. -JJL
 
-2008-12-16 Added markevery property to Line2D to support subsampling
-           of markers - JDH
-2008-12-15 Removed mpl_data symlink in docs.  On platforms that do not
-           support symlinks, these become copies, and the font files
-           are large, so the distro becomes unnecessarily bloated.
-           Keeping the mpl_examples dir because relative links are
-           harder for the plot directive and the \*.py files are not so
-           large. - JDH
+2008-12-16
+    Another attempt to fix dpi-dependent behavior of Legend. -JJL
 
-2008-12-15 Fix \$ in non-math text with usetex off.  Document
-           differences between usetex on/off - MGD
+2008-12-16
+    Fixed dpi-dependent behavior of Legend and fancybox in Text.
 
-2008-12-15 Fix anti-aliasing when auto-snapping - MGD
+2008-12-16
+    Added markevery property to Line2D to support subsampling of markers - JDH
 
-2008-12-15 Fix grid lines not moving correctly during pan and zoom - MGD
+2008-12-15
+    Removed mpl_data symlink in docs.  On platforms that do not support
+    symlinks, these become copies, and the font files are large, so the distro
+    becomes unnecessarily bloated.  Keeping the mpl_examples dir because
+    relative links are harder for the plot directive and the \*.py files are
+    not so large. - JDH
 
-2008-12-12 Preparations to eliminate maskedarray rcParams key: its
-           use will now generate a warning.  Similarly, importing
-           the obsolote numerix.npyma will generate a warning. - EF
+2008-12-15
+    Fix \$ in non-math text with usetex off.  Document differences between
+    usetex on/off - MGD
 
-2008-12-12 Added support for the numpy.histogram() weights parameter
-           to the axes hist() method. Docs taken from numpy - MM
+2008-12-15
+    Fix anti-aliasing when auto-snapping - MGD
 
-2008-12-12 Fixed warning in hist() with numpy 1.2 - MM
+2008-12-15
+    Fix grid lines not moving correctly during pan and zoom - MGD
 
-2008-12-12 Removed external packages: configobj and enthought.traits
-           which are only required by the experimental traited config
-           and are somewhat out of date. If needed, install them
-           independently, see:
+2008-12-12
+    Preparations to eliminate maskedarray rcParams key: its use will now
+    generate a warning.  Similarly, importing the obsolete numerix.npyma will
+    generate a warning. - EF
 
-           http://code.enthought.com/pages/traits.html
+2008-12-12
+    Added support for the numpy.histogram() weights parameter to the axes
+    hist() method. Docs taken from numpy - MM
 
-           and:
+2008-12-12
+    Fixed warning in hist() with numpy 1.2 - MM
 
-           http://www.voidspace.org.uk/python/configobj.html
+2008-12-12
+    Removed external packages: configobj and enthought.traits which are only
+    required by the experimental traited config and are somewhat out of date.
+    If needed, install them independently, see
+    http://code.enthought.com/pages/traits.html and
+    http://www.voidspace.org.uk/python/configobj.html
 
-2008-12-12 Added support to assign labels to histograms of multiple
-           data. - MM
+2008-12-12
+    Added support to assign labels to histograms of multiple data. - MM
 
 -------------------------
 
-2008-12-11 Released 0.98.5 at svn r6573
+2008-12-11
+    Released 0.98.5 at svn r6573
 
-2008-12-11 Use subprocess.Popen instead of os.popen in dviread
-           (Windows problem reported by Jorgen Stenarson) - JKS
+2008-12-11
+    Use subprocess.Popen instead of os.popen in dviread (Windows problem
+    reported by Jorgen Stenarson) - JKS
 
-2008-12-10 Added Michael's font_manager fix and Jae-Joon's
-           figure/subplot fix.  Bumped version number to 0.98.5 - JDH
+2008-12-10
+    Added Michael's font_manager fix and Jae-Joon's figure/subplot fix.  Bumped
+    version number to 0.98.5 - JDH
 
 ----------------------------
 
-2008-12-09 Released 0.98.4 at svn r6536
-
-2008-12-08 Added mdehoon's native macosx backend from sf patch 2179017 - JDH
-
-2008-12-08 Removed the prints in the set_*style commands.  Return the
-           list of pprinted strings instead - JDH
-
-2008-12-08 Some of the changes Michael made to improve the output of
-           the property tables in the rest docs broke of made
-           difficult to use some of the interactive doc helpers, e.g.,
-           setp and getp.  Having all the rest markup in the ipython
-           shell also confused the docstrings.  I added a new rc param
-           docstring.hardcopy, to format the docstrings differently for
-           hard copy and other use.  The ArtistInspector could use a
-           little refactoring now since there is duplication of effort
-           between the rest out put and the non-rest output - JDH
-
-2008-12-08 Updated spectral methods (psd, csd, etc.) to scale one-sided
-           densities by a factor of 2 and, optionally, scale all densities
-           by the sampling frequency.  This gives better MatLab
-           compatibility. -RM
-
-2008-12-08 Fixed alignment of ticks in colorbars. -MGD
-
-2008-12-07 drop the deprecated "new" keyword of np.histogram() for
-           numpy 1.2 or later.  -JJL
-
-2008-12-06 Fixed a bug in svg backend that new_figure_manager()
-           ignores keywords arguments such as figsize, etc. -JJL
-
-2008-12-05 Fixed a bug that the handlelength of the new legend class
-           set too short when numpoints=1 -JJL
-
-2008-12-04 Added support for data with units (e.g., dates) to
-           Axes.fill_between. -RM
-
-2008-12-04 Added fancybox keyword to legend. Also applied some changes
-           for better look, including baseline adjustment of the
-           multiline texts so that it is center aligned. -JJL
+2008-12-09
+    Released 0.98.4 at svn r6536
+
+2008-12-08
+    Added mdehoon's native macosx backend from sf patch 2179017 - JDH
+
+2008-12-08
+    Removed the prints in the set_*style commands.  Return the list of pprinted
+    strings instead - JDH
 
-2008-12-02 The transmuter classes in the patches.py are reorganized as
-           subclasses of the Style classes. A few more box and arrow
-           styles are added. -JJL
+2008-12-08
+    Some of the changes Michael made to improve the output of the property
+    tables in the rest docs broke of made difficult to use some of the
+    interactive doc helpers, e.g., setp and getp.  Having all the rest markup
+    in the ipython shell also confused the docstrings.  I added a new rc param
+    docstring.hardcopy, to format the docstrings differently for hard copy and
+    other use.  The ArtistInspector could use a little refactoring now since
+    there is duplication of effort between the rest out put and the non-rest
+    output - JDH
 
-2008-12-02 Fixed a bug in the new legend class that didn't allowed
-           a tuple of coordinate values as loc. -JJL
+2008-12-08
+    Updated spectral methods (psd, csd, etc.) to scale one-sided densities by a
+    factor of 2 and, optionally, scale all densities by the sampling frequency.
+    This gives better MatLab compatibility. -RM
 
-2008-12-02 Improve checks for external dependencies, using subprocess
-           (instead of deprecated popen*) and distutils (for version
-           checking) - DSD
+2008-12-08
+    Fixed alignment of ticks in colorbars. -MGD
 
-2008-11-30 Reimplementation of the legend which supports baseline alignment,
-           multi-column, and expand mode. - JJL
+2008-12-07
+    drop the deprecated "new" keyword of np.histogram() for numpy 1.2 or later.
+    -JJL
 
-2008-12-01 Fixed histogram autoscaling bug when bins or range are given
-           explicitly (fixes Debian bug 503148) - MM
+2008-12-06
+    Fixed a bug in svg backend that new_figure_manager() ignores keywords
+    arguments such as figsize, etc. -JJL
 
-2008-11-25 Added rcParam axes.unicode_minus which allows plain hyphen
-           for minus when False - JDH
+2008-12-05
+    Fixed a bug that the handlelength of the new legend class set too short
+    when numpoints=1 -JJL
 
-2008-11-25 Added scatterpoints support in Legend. patch by Erik
-           Tollerud - JJL
+2008-12-04
+    Added support for data with units (e.g., dates) to Axes.fill_between. -RM
 
-2008-11-24 Fix crash in log ticking. - MGD
+2008-12-04
+    Added fancybox keyword to legend. Also applied some changes for better
+    look, including baseline adjustment of the multiline texts so that it is
+    center aligned. -JJL
 
-2008-11-20 Added static helper method BrokenHBarCollection.span_where
-           and Axes/pyplot method fill_between.  See
-           examples/pylab/fill_between.py - JDH
+2008-12-02
+    The transmuter classes in the patches.py are reorganized as subclasses of
+    the Style classes. A few more box and arrow styles are added. -JJL
 
-2008-11-12 Add x_isdata and y_isdata attributes to Artist instances,
-           and use them to determine whether either or both
-           coordinates are used when updating dataLim.  This is
-           used to fix autoscaling problems that had been triggered
-           by axhline, axhspan, axvline, axvspan. - EF
+2008-12-02
+    Fixed a bug in the new legend class that didn't allowed a tuple of
+    coordinate values as loc. -JJL
 
-2008-11-11 Update the psd(), csd(), cohere(), and specgram() methods
-           of Axes and the csd() cohere(), and specgram() functions
-           in mlab to be in sync with the changes to psd().
-           In fact, under the hood, these all call the same core
-           to do computations. - RM
+2008-12-02
+    Improve checks for external dependencies, using subprocess (instead of
+    deprecated popen*) and distutils (for version checking) - DSD
+
+2008-11-30
+    Reimplementation of the legend which supports baseline alignment,
+    multi-column, and expand mode. - JJL
+
+2008-12-01
+    Fixed histogram autoscaling bug when bins or range are given explicitly
+    (fixes Debian bug 503148) - MM
 
-2008-11-11 Add 'pad_to' and 'sides' parameters to mlab.psd() to
-           allow controlling of zero padding and returning of
-           negative frequency components, respecitively.  These are
-           added in a way that does not change the API. - RM
+2008-11-25
+    Added rcParam axes.unicode_minus which allows plain hyphen for minus when
+    False - JDH
+
+2008-11-25
+    Added scatterpoints support in Legend. patch by Erik Tollerud - JJL
+
+2008-11-24
+    Fix crash in log ticking. - MGD
 
-2008-11-10 Fix handling of c kwarg by scatter; generalize
-           is_string_like to accept numpy and numpy.ma string
-           array scalars. - RM and EF
+2008-11-20
+    Added static helper method BrokenHBarCollection.span_where and Axes/pyplot
+    method fill_between.  See examples/pylab/fill_between.py - JDH
+
+2008-11-12
+    Add x_isdata and y_isdata attributes to Artist instances, and use them to
+    determine whether either or both coordinates are used when updating
+    dataLim.  This is used to fix autoscaling problems that had been triggered
+    by axhline, axhspan, axvline, axvspan. - EF
+
+2008-11-11
+    Update the psd(), csd(), cohere(), and specgram() methods of Axes and the
+    csd() cohere(), and specgram() functions in mlab to be in sync with the
+    changes to psd().  In fact, under the hood, these all call the same core to
+    do computations. - RM
+
+2008-11-11
+    Add 'pad_to' and 'sides' parameters to mlab.psd() to allow controlling of
+    zero padding and returning of negative frequency components, respectively.
+    These are added in a way that does not change the API. - RM
+
+2008-11-10
+    Fix handling of c kwarg by scatter; generalize is_string_like to accept
+    numpy and numpy.ma string array scalars. - RM and EF
+
+2008-11-09
+    Fix a possible EINTR problem in dviread, which might help when saving pdf
+    files from the qt backend. - JKS
+
+2008-11-05
+    Fix bug with zoom to rectangle and twin axes - MGD
+
+2008-10-24
+    Added Jae Joon's fancy arrow, box and annotation enhancements -- see
+    examples/pylab_examples/annotation_demo2.py
+
+2008-10-23
+    Autoscaling is now supported with shared axes - EF
 
-2008-11-09 Fix a possible EINTR problem in dviread, which might help
-           when saving pdf files from the qt backend. - JKS
+2008-10-23
+    Fixed exception in dviread that happened with Minion - JKS
 
-2008-11-05 Fix bug with zoom to rectangle and twin axes - MGD
+2008-10-21
+    set_xlim, ylim now return a copy of the viewlim array to avoid modify
+    inplace surprises
 
-2008-10-24 Added Jae Joon's fancy arrow, box and annotation
-           enhancements -- see
-           examples/pylab_examples/annotation_demo2.py
+2008-10-20
+    Added image thumbnail generating function matplotlib.image.thumbnail.  See
+    examples/misc/image_thumbnail.py - JDH
 
-2008-10-23 Autoscaling is now supported with shared axes - EF
+2008-10-20
+    Applied scatleg patch based on ideas and work by Erik Tollerud and Jae-Joon
+    Lee. - MM
 
-2008-10-23 Fixed exception in dviread that happened with Minion - JKS
+2008-10-11
+    Fixed bug in pdf backend: if you pass a file object for output instead of a
+    filename, e.g., in a wep app, we now flush the object at the end. - JKS
 
-2008-10-21 set_xlim, ylim now return a copy of the viewlim array to
-           avoid modify inplace surprises
+2008-10-08
+    Add path simplification support to paths with gaps. - EF
 
-2008-10-20 Added image thumbnail generating function
-           matplotlib.image.thumbnail.  See
-           examples/misc/image_thumbnail.py - JDH
+2008-10-05
+    Fix problem with AFM files that don't specify the font's full name or
+    family name. - JKS
 
-2008-10-20 Applied scatleg patch based on ideas and work by Erik
-           Tollerud and Jae-Joon Lee. - MM
+2008-10-04
+    Added 'scilimits' kwarg to Axes.ticklabel_format() method, for easy access
+    to the set_powerlimits method of the major ScalarFormatter. - EF
 
-2008-10-11 Fixed bug in pdf backend: if you pass a file object for
-           output instead of a filename, e.g., in a wep app, we now
-           flush the object at the end. - JKS
+2008-10-04
+    Experimental new kwarg borderpad to replace pad in legend, based on
+    suggestion by Jae-Joon Lee.  - EF
 
-2008-10-08 Add path simplification support to paths with gaps. - EF
+2008-09-27
+    Allow spy to ignore zero values in sparse arrays, based on patch by Tony
+    Yu.  Also fixed plot to handle empty data arrays, and fixed handling of
+    markers in figlegend. - EF
 
-2008-10-05 Fix problem with AFM files that don't specify the font's
-           full name or family name. - JKS
+2008-09-24
+    Introduce drawstyles for lines. Transparently split linestyles like
+    'steps--' into drawstyle 'steps' and linestyle '--'.  Legends always use
+    drawstyle 'default'. - MM
 
-2008-10-04 Added 'scilimits' kwarg to Axes.ticklabel_format() method,
-           for easy access to the set_powerlimits method of the
-           major ScalarFormatter. - EF
+2008-09-18
+    Fixed quiver and quiverkey bugs (failure to scale properly when resizing)
+    and added additional methods for determining the arrow angles - EF
 
-2008-10-04 Experimental new kwarg borderpad to replace pad in legend,
-           based on suggestion by Jae-Joon Lee.  - EF
+2008-09-18
+    Fix polar interpolation to handle negative values of theta - MGD
 
-2008-09-27 Allow spy to ignore zero values in sparse arrays, based
-           on patch by Tony Yu.  Also fixed plot to handle empty
-           data arrays, and fixed handling of markers in figlegend. - EF
+2008-09-14
+    Reorganized cbook and mlab methods related to numerical calculations that
+    have little to do with the goals of those two modules into a separate
+    module numerical_methods.py Also, added ability to select points and stop
+    point selection with keyboard in ginput and manual contour labeling code.
+    Finally, fixed contour labeling bug. - DMK
 
-2008-09-24 Introduce drawstyles for lines. Transparently split linestyles
-           like 'steps--' into drawstyle 'steps' and linestyle '--'.
-           Legends always use drawstyle 'default'. - MM
+2008-09-11
+    Fix backtick in Postscript output. - MGD
 
-2008-09-18 Fixed quiver and quiverkey bugs (failure to scale properly
-           when resizing) and added additional methods for determining
-           the arrow angles - EF
+2008-09-10
+    [ 2089958 ] Path simplification for vector output backends Leverage the
+    simplification code exposed through path_to_polygons to simplify certain
+    well-behaved paths in the vector backends (PDF, PS and SVG).
+    "path.simplify" must be set to True in matplotlibrc for this to work.
+    - MGD
 
-2008-09-18 Fix polar interpolation to handle negative values of theta - MGD
+2008-09-10
+    Add "filled" kwarg to Path.intersects_path and Path.intersects_bbox. - MGD
 
-2008-09-14 Reorganized cbook and mlab methods related to numerical
-           calculations that have little to do with the goals of those two
-           modules into a separate module numerical_methods.py
-           Also, added ability to select points and stop point selection
-           with keyboard in ginput and manual contour labeling code.
-           Finally, fixed contour labeling bug. - DMK
+2008-09-07
+    Changed full arrows slightly to avoid an xpdf rendering problem reported by
+    Friedrich Hagedorn. - JKS
 
-2008-09-11 Fix backtick in Postscript output. - MGD
+2008-09-07
+    Fix conversion of quadratic to cubic Bezier curves in PDF and PS backends.
+    Patch by Jae-Joon Lee. - JKS
 
-2008-09-10 [ 2089958 ] Path simplification for vector output backends
-           Leverage the simplification code exposed through
-           path_to_polygons to simplify certain well-behaved paths in
-           the vector backends (PDF, PS and SVG).  "path.simplify"
-           must be set to True in matplotlibrc for this to work.  -
-           MGD
+2008-09-06
+    Added 5-point star marker to plot command - EF
 
-2008-09-10 Add "filled" kwarg to Path.intersects_path and
-           Path.intersects_bbox. - MGD
+2008-09-05
+    Fix hatching in PS backend - MGD
 
-2008-09-07 Changed full arrows slightly to avoid an xpdf rendering
-           problem reported by Friedrich Hagedorn. - JKS
+2008-09-03
+    Fix log with base 2 - MGD
 
-2008-09-07 Fix conversion of quadratic to cubic Bezier curves in PDF
-           and PS backends. Patch by Jae-Joon Lee. - JKS
+2008-09-01
+    Added support for bilinear interpolation in NonUniformImage; patch by
+    Gregory Lielens. - EF
 
-2008-09-06 Added 5-point star marker to plot command - EF
+2008-08-28
+    Added support for multiple histograms with data of different length - MM
 
-2008-09-05 Fix hatching in PS backend - MGD
+2008-08-28
+    Fix step plots with log scale - MGD
 
-2008-09-03 Fix log with base 2 - MGD
+2008-08-28
+    Fix masked arrays with markers in non-Agg backends - MGD
 
-2008-09-01 Added support for bilinear interpolation in
-           NonUniformImage; patch by Gregory Lielens. - EF
+2008-08-28
+    Fix clip_on kwarg so it actually works correctly - MGD
 
-2008-08-28 Added support for multiple histograms with data of
-           different length - MM
+2008-08-25
+    Fix locale problems in SVG backend - MGD
 
-2008-08-28 Fix step plots with log scale - MGD
+2008-08-22
+    fix quiver so masked values are not plotted - JSW
 
-2008-08-28 Fix masked arrays with markers in non-Agg backends - MGD
+2008-08-18
+    improve interactive pan/zoom in qt4 backend on windows - DSD
 
-2008-08-28 Fix clip_on kwarg so it actually works correctly - MGD
-
-2008-08-25 Fix locale problems in SVG backend - MGD
-
-2008-08-22 fix quiver so masked values are not plotted - JSW
-
-2008-08-18 improve interactive pan/zoom in qt4 backend on windows - DSD
-
-2008-08-11 Fix more bugs in NaN/inf handling.  In particular, path simplification
-           (which does not handle NaNs or infs) will be turned off automatically
-           when infs or NaNs are present.  Also masked arrays are now converted
-           to arrays with NaNs for consistent handling of masks and NaNs
-           - MGD and EF
+2008-08-11
+    Fix more bugs in NaN/inf handling.  In particular, path simplification
+    (which does not handle NaNs or infs) will be turned off automatically when
+    infs or NaNs are present.  Also masked arrays are now converted to arrays
+    with NaNs for consistent handling of masks and NaNs - MGD and EF
 
 ------------------------
 
-2008-08-03 Released 0.98.3 at svn r5947
+2008-08-03
+    Released 0.98.3 at svn r5947
 
-2008-08-01 Backported memory leak fixes in _ttconv.cpp - MGD
+2008-08-01
+    Backported memory leak fixes in _ttconv.cpp - MGD
 
-2008-07-31 Added masked array support to griddata. - JSW
+2008-07-31
+    Added masked array support to griddata. - JSW
 
-2008-07-26 Added optional C and reduce_C_function arguments to
-           axes.hexbin().  This allows hexbin to accumulate the values
-           of C based on the x,y coordinates and display in hexagonal
-           bins. - ADS
+2008-07-26
+    Added optional C and reduce_C_function arguments to axes.hexbin().  This
+    allows hexbin to accumulate the values of C based on the x,y coordinates
+    and display in hexagonal bins. - ADS
 
-2008-07-24 Deprecated (raise NotImplementedError) all the mlab2
-           functions from matplotlib.mlab out of concern that some of
-           them were not clean room implementations. JDH
+2008-07-24
+    Deprecated (raise NotImplementedError) all the mlab2 functions from
+    matplotlib.mlab out of concern that some of them were not clean room
+    implementations. JDH
 
-2008-07-24 Rewrite of a significant portion of the clabel code (class
-           ContourLabeler) to improve inlining. - DMK
+2008-07-24
+    Rewrite of a significant portion of the clabel code (class ContourLabeler)
+    to improve inlining. - DMK
 
-2008-07-22 Added Barbs polygon collection (similar to Quiver) for plotting
-           wind barbs.  Added corresponding helpers to Axes and pyplot as
-           well. (examples/pylab_examples/barb_demo.py shows it off.) - RMM
+2008-07-22
+    Added Barbs polygon collection (similar to Quiver) for plotting wind barbs.
+    Added corresponding helpers to Axes and pyplot as well.
+    (examples/pylab_examples/barb_demo.py shows it off.) - RMM
 
-2008-07-21 Added scikits.delaunay as matplotlib.delaunay.  Added griddata
-           function in matplotlib.mlab, with example (griddata_demo.py) in
-           pylab_examples. griddata function will use mpl_toolkits._natgrid
-           if installed.  - JSW
+2008-07-21
+    Added scikits.delaunay as matplotlib.delaunay.  Added griddata function in
+    matplotlib.mlab, with example (griddata_demo.py) in pylab_examples.
+    griddata function will use mpl_toolkits._natgrid if installed.  - JSW
 
-2008-07-21 Re-introduced offset_copy that works in the context of the
-           new transforms. - MGD
+2008-07-21
+    Re-introduced offset_copy that works in the context of the new transforms.
+    - MGD
 
-2008-07-21 Committed patch by Ryan May to add get_offsets and
-           set_offsets to Collections base class - EF
+2008-07-21
+    Committed patch by Ryan May to add get_offsets and set_offsets to
+    Collections base class - EF
 
-2008-07-21 Changed the "asarray" strategy in image.py so that
-           colormapping of masked input should work for all
-           image types (thanks Klaus Zimmerman) - EF
+2008-07-21
+    Changed the "asarray" strategy in image.py so that colormapping of masked
+    input should work for all image types (thanks Klaus Zimmerman) - EF
 
-2008-07-20 Rewrote cbook.delete_masked_points and corresponding
-           unit test to support rgb color array inputs, datetime
-           inputs, etc. - EF
+2008-07-20
+    Rewrote cbook.delete_masked_points and corresponding unit test to support
+    rgb color array inputs, datetime inputs, etc. - EF
 
-2008-07-20 Renamed unit/axes_unit.py to cbook_unit.py and modified
-           in accord with Ryan's move of delete_masked_points from
-           axes to cbook. - EF
+2008-07-20
+    Renamed unit/axes_unit.py to cbook_unit.py and modified in accord with
+    Ryan's move of delete_masked_points from axes to cbook. - EF
 
-2008-07-18 Check for nan and inf in axes.delete_masked_points().
-           This should help hexbin and scatter deal with nans. - ADS
+2008-07-18
+    Check for nan and inf in axes.delete_masked_points().  This should help
+    hexbin and scatter deal with nans. - ADS
 
-2008-07-17 Added ability to manually select contour label locations.
-           Also added a waitforbuttonpress function. - DMK
+2008-07-17
+    Added ability to manually select contour label locations.  Also added a
+    waitforbuttonpress function. - DMK
 
-2008-07-17 Fix bug with NaNs at end of path (thanks, Andrew Straw for
-           the report) - MGD
+2008-07-17
+    Fix bug with NaNs at end of path (thanks, Andrew Straw for the report) -
+    MGD
 
-2008-07-16 Improve error handling in texmanager, thanks to Ian Henry
-           for reporting - DSD
+2008-07-16
+    Improve error handling in texmanager, thanks to Ian Henry for reporting -
+    DSD
 
-2008-07-12 Added support for external backends with the
-           "module://my_backend" syntax - JDH
+2008-07-12
+    Added support for external backends with the "module://my_backend" syntax -
+    JDH
 
-2008-07-11 Fix memory leak related to shared axes.  Grouper should
-           store weak references. - MGD
+2008-07-11
+    Fix memory leak related to shared axes.  Grouper should store weak
+    references. - MGD
 
-2008-07-10 Bugfix: crash displaying fontconfig pattern - MGD
+2008-07-10
+    Bugfix: crash displaying fontconfig pattern - MGD
 
-2008-07-10 Bugfix: [ 2013963 ] update_datalim_bounds in Axes not works - MGD
+2008-07-10
+    Bugfix: [ 2013963 ] update_datalim_bounds in Axes not works - MGD
 
-2008-07-10 Bugfix: [ 2014183 ] multiple imshow() causes gray edges - MGD
+2008-07-10
+    Bugfix: [ 2014183 ] multiple imshow() causes gray edges - MGD
 
-2008-07-09 Fix rectangular axes patch on polar plots bug - MGD
+2008-07-09
+    Fix rectangular axes patch on polar plots bug - MGD
 
-2008-07-09 Improve mathtext radical rendering - MGD
+2008-07-09
+    Improve mathtext radical rendering - MGD
 
-2008-07-08 Improve mathtext superscript placement - MGD
+2008-07-08
+    Improve mathtext superscript placement - MGD
 
-2008-07-07 Fix custom scales in pcolormesh (thanks Matthew Turk) - MGD
+2008-07-07
+    Fix custom scales in pcolormesh (thanks Matthew Turk) - MGD
 
-2008-07-03 Implemented findobj method for artist and pyplot - see
-           examples/pylab_examples/findobj_demo.py - JDH
+2008-07-03
+    Implemented findobj method for artist and pyplot - see
+    examples/pylab_examples/findobj_demo.py - JDH
 
-2008-06-30 Another attempt to fix TextWithDash - DSD
+2008-06-30
+    Another attempt to fix TextWithDash - DSD
 
-2008-06-30 Removed Qt4 NavigationToolbar2.destroy -- it appears to
-           have been unnecessary and caused a bug reported by P.
-           Raybaut - DSD
+2008-06-30
+    Removed Qt4 NavigationToolbar2.destroy -- it appears to have been
+    unnecessary and caused a bug reported by P.  Raybaut - DSD
 
-2008-06-27 Fixed tick positioning bug - MM
+2008-06-27
+    Fixed tick positioning bug - MM
 
-2008-06-27 Fix dashed text bug where text was at the wrong end of the
-           dash - MGD
+2008-06-27
+    Fix dashed text bug where text was at the wrong end of the dash - MGD
 
-2008-06-26 Fix mathtext bug for expressions like $x_{\leftarrow}$ - MGD
+2008-06-26
+    Fix mathtext bug for expressions like $x_{\leftarrow}$ - MGD
 
-2008-06-26 Fix direction of horizontal/vertical hatches - MGD
+2008-06-26
+    Fix direction of horizontal/vertical hatches - MGD
 
-2008-06-25 Figure.figurePatch renamed Figure.patch, Axes.axesPatch
-           renamed Axes.patch, Axes.axesFrame renamed Axes.frame,
-           Axes.get_frame, which returns Axes.patch, is deprecated.
-           Examples and users guide updated - JDH
+2008-06-25
+    Figure.figurePatch renamed Figure.patch, Axes.axesPatch renamed Axes.patch,
+    Axes.axesFrame renamed Axes.frame, Axes.get_frame, which returns
+    Axes.patch, is deprecated.  Examples and users guide updated - JDH
 
-2008-06-25 Fix rendering quality of pcolor - MGD
+2008-06-25
+    Fix rendering quality of pcolor - MGD
 
 ----------------------------
 
-2008-06-24 Released 0.98.2 at svn r5667 - (source only for debian) JDH
+2008-06-24
+    Released 0.98.2 at svn r5667 - (source only for debian) JDH
 
-2008-06-24 Added "transparent" kwarg to savefig. - MGD
+2008-06-24
+    Added "transparent" kwarg to savefig. - MGD
 
-2008-06-24 Applied Stefan's patch to draw a single centered marker over
-           a line with numpoints==1 - JDH
+2008-06-24
+    Applied Stefan's patch to draw a single centered marker over a line with
+    numpoints==1 - JDH
 
-2008-06-23 Use splines to render circles in scatter plots - MGD
+2008-06-23
+    Use splines to render circles in scatter plots - MGD
 
 ----------------------------
 
-2008-06-22 Released 0.98.1 at revision 5637
+2008-06-22
+    Released 0.98.1 at revision 5637
 
-2008-06-22 Removed axes3d support and replaced it with a
-           NotImplementedError for one release cycle
+2008-06-22
+    Removed axes3d support and replaced it with a NotImplementedError for one
+    release cycle
 
-2008-06-21 fix marker placement bug in backend_ps - DSD
+2008-06-21
+    fix marker placement bug in backend_ps - DSD
 
-2008-06-20 [ 1978629 ] scale documentation missing/incorrect for log - MGD
+2008-06-20
+    [ 1978629 ] scale documentation missing/incorrect for log - MGD
 
-2008-06-20 Added closed kwarg to PolyCollection.  Fixes bug [ 1994535
-           ] still missing lines on graph with svn (r 5548). - MGD
+2008-06-20
+    Added closed kwarg to PolyCollection.  Fixes bug [ 1994535 ] still missing
+    lines on graph with svn (r 5548). - MGD
 
-2008-06-20 Added set/get_closed method to Polygon; fixes error
-           in hist - MM
+2008-06-20
+    Added set/get_closed method to Polygon; fixes error in hist - MM
 
-2008-06-19 Use relative font sizes (e.g., 'medium' and 'large') in
-           rcsetup.py and matplotlibrc.template so that text will
-           be scaled by default when changing rcParams['font.size'] -
-           EF
+2008-06-19
+    Use relative font sizes (e.g., 'medium' and 'large') in rcsetup.py and
+    matplotlibrc.template so that text will be scaled by default when changing
+    rcParams['font.size'] - EF
 
-2008-06-17 Add a generic PatchCollection class that can contain any
-           kind of patch. - MGD
+2008-06-17
+    Add a generic PatchCollection class that can contain any kind of patch. -
+    MGD
 
-2008-06-13 Change pie chart label alignment to avoid having labels
-           overwrite the pie - MGD
+2008-06-13
+    Change pie chart label alignment to avoid having labels overwrite the pie -
+    MGD
 
-2008-06-12 Added some helper functions to the mathtext parser to
-           return bitmap arrays or write pngs to make it easier to use
-           mathtext outside the context of an mpl figure.  modified
-           the mathpng sphinxext to use the mathtext png save
-           functionality - see examples/api/mathtext_asarray.py - JDH
+2008-06-12
+    Added some helper functions to the mathtext parser to return bitmap arrays
+    or write pngs to make it easier to use mathtext outside the context of an
+    mpl figure.  modified the mathpng sphinxext to use the mathtext png save
+    functionality - see examples/api/mathtext_asarray.py - JDH
 
-2008-06-11 Use matplotlib.mathtext to render math expressions in
-           online docs - MGD
+2008-06-11
+    Use matplotlib.mathtext to render math expressions in online docs - MGD
 
-2008-06-11 Move PNG loading/saving to its own extension module, and
-           remove duplicate code in _backend_agg.cpp and _image.cpp
-           that does the same thing - MGD
+2008-06-11
+    Move PNG loading/saving to its own extension module, and remove duplicate
+    code in _backend_agg.cpp and _image.cpp that does the same thing - MGD
 
-2008-06-11 Numerous mathtext bugfixes, primarily related to
-           dpi-independence - MGD
+2008-06-11
+    Numerous mathtext bugfixes, primarily related to dpi-independence - MGD
 
-2008-06-10 Bar now applies the label only to the first patch only, and
-           sets '_nolegend_' for the other patch labels.  This lets
-           autolegend work as expected for hist and bar - see
-           \https://sourceforge.net/tracker/index.php?func=detail&aid=1986597&group_id=80706&atid=560720
-           JDH
+2008-06-10
+    Bar now applies the label only to the first patch only, and sets
+    '_nolegend_' for the other patch labels.  This lets autolegend work as
+    expected for hist and bar - see
+    \https://sourceforge.net/tracker/index.php?func=detail&aid=1986597&group_id=80706&atid=560720
+    JDH
 
-2008-06-10 Fix text baseline alignment bug.  [ 1985420 ] Repair of
-           baseline alignment in Text._get_layout.  Thanks Stan West -
-           MGD
+2008-06-10
+    Fix text baseline alignment bug.  [ 1985420 ] Repair of baseline alignment
+    in Text._get_layout.  Thanks Stan West - MGD
 
-2008-06-09 Committed Gregor's image resample patch to downsampling
-           images with new rcparam image.resample - JDH
+2008-06-09
+    Committed Gregor's image resample patch to downsampling images with new
+    rcparam image.resample - JDH
 
-2008-06-09 Don't install Enthought.Traits along with matplotlib. For
-           matplotlib developers convenience, it can still be
-           installed by setting an option in setup.cfg while we figure
-           decide if there is a future for the traited config - DSD
+2008-06-09
+    Don't install Enthought.Traits along with matplotlib. For matplotlib
+    developers convenience, it can still be installed by setting an option in
+    setup.cfg while we figure decide if there is a future for the traited
+    config - DSD
 
-2008-06-09 Added range keyword arg to hist() - MM
+2008-06-09
+    Added range keyword arg to hist() - MM
 
-2008-06-07 Moved list of backends to rcsetup.py; made use of lower
-           case for backend names consistent; use validate_backend
-           when importing backends subpackage - EF
+2008-06-07
+    Moved list of backends to rcsetup.py; made use of lower case for backend
+    names consistent; use validate_backend when importing backends subpackage -
+    EF
 
-2008-06-06 hist() revision, applied ideas proposed by Erik Tollerud and
-           Olle Engdegard: make histtype='step' unfilled by default
-           and introduce histtype='stepfilled'; use default color
-           cycle; introduce reverse cumulative histogram; new align
-           keyword - MM
+2008-06-06
+    hist() revision, applied ideas proposed by Erik Tollerud and Olle
+    Engdegard: make histtype='step' unfilled by default and introduce
+    histtype='stepfilled'; use default color cycle; introduce reverse
+    cumulative histogram; new align keyword - MM
 
-2008-06-06 Fix closed polygon patch and also provide the option to
-           not close the polygon - MGD
+2008-06-06
+    Fix closed polygon patch and also provide the option to not close the
+    polygon - MGD
 
-2008-06-05 Fix some dpi-changing-related problems with PolyCollection,
-           as called by Axes.scatter() - MGD
+2008-06-05
+    Fix some dpi-changing-related problems with PolyCollection, as called by
+    Axes.scatter() - MGD
 
-2008-06-05 Fix image drawing so there is no extra space to the right
-           or bottom - MGD
+2008-06-05
+    Fix image drawing so there is no extra space to the right or bottom - MGD
 
-2006-06-04 Added a figure title command suptitle as a Figure method
-           and pyplot command -- see examples/figure_title.py - JDH
+2006-06-04
+    Added a figure title command suptitle as a Figure method and pyplot command
+    -- see examples/figure_title.py - JDH
 
-2008-06-02 Added support for log to hist with histtype='step' and fixed
-           a bug for log-scale stacked histograms - MM
+2008-06-02
+    Added support for log to hist with histtype='step' and fixed a bug for
+    log-scale stacked histograms - MM
 
 -----------------------------
 
-2008-05-29 Released 0.98.0 at revision 5314
+2008-05-29
+    Released 0.98.0 at revision 5314
 
-2008-05-29 matplotlib.image.imread now no longer always returns RGBA
-           -- if the image is luminance or RGB, it will return a MxN
-           or MxNx3 array if possible.  Also uint8 is no longer always
-           forced to float.
+2008-05-29
+    matplotlib.image.imread now no longer always returns RGBA -- if the image
+    is luminance or RGB, it will return a MxN or MxNx3 array if possible.  Also
+    uint8 is no longer always forced to float.
 
-2008-05-29 Implement path clipping in PS backend - JDH
+2008-05-29
+    Implement path clipping in PS backend - JDH
 
-2008-05-29 Fixed two bugs in texmanager.py:
-           improved comparison of dvipng versions
-           fixed a bug introduced when get_grey method was added
-           - DSD
+2008-05-29
+    Fixed two bugs in texmanager.py: improved comparison of dvipng versions
+    fixed a bug introduced when get_grey method was added - DSD
 
-2008-05-28 Fix crashing of PDFs in xpdf and ghostscript when two-byte
-           characters are used with Type 3 fonts - MGD
+2008-05-28
+    Fix crashing of PDFs in xpdf and ghostscript when two-byte characters are
+    used with Type 3 fonts - MGD
 
-2008-05-28 Allow keyword args to configure widget properties as
-           requested in
-           \http://sourceforge.net/tracker/index.php?func=detail&aid=1866207&group_id=80706&atid=560722
-           - JDH
+2008-05-28
+    Allow keyword args to configure widget properties as requested in
+    \http://sourceforge.net/tracker/index.php?func=detail&aid=1866207&group_id=80706&atid=560722
+    - JDH
 
-2008-05-28 Replaced '-' with u'\u2212' for minus sign as requested in
-           \http://sourceforge.net/tracker/index.php?func=detail&aid=1962574&group_id=80706&atid=560720
+2008-05-28
+    Replaced '-' with u'\\u2212' for minus sign as requested in
+    \http://sourceforge.net/tracker/index.php?func=detail&aid=1962574&group_id=80706&atid=560720
 
-2008-05-28 zero width/height Rectangles no longer influence the
-           autoscaler.  Useful for log histograms with empty bins -
-           JDH
+2008-05-28
+    zero width/height Rectangles no longer influence the autoscaler.  Useful
+    for log histograms with empty bins - JDH
 
-2008-05-28 Fix rendering of composite glyphs in Type 3 conversion
-           (particularly as evidenced in the Eunjin.ttf Korean font)
-           Thanks Jae-Joon Lee for finding this!
+2008-05-28
+    Fix rendering of composite glyphs in Type 3 conversion (particularly as
+    evidenced in the Eunjin.ttf Korean font) Thanks Jae-Joon Lee for finding
+    this!
 
-2008-05-27 Rewrote the cm.ScalarMappable callback infrastructure to
-           use cbook.CallbackRegistry rather than custom callback
-           handling.  Amy users of add_observer/notify of the
-           cm.ScalarMappable should uae the
-           cm.ScalarMappable.callbacksSM CallbackRegistry instead. JDH
+2008-05-27
+    Rewrote the cm.ScalarMappable callback infrastructure to use
+    cbook.CallbackRegistry rather than custom callback handling.  Any users of
+    add_observer/notify of the cm.ScalarMappable should use the
+    cm.ScalarMappable.callbacksSM CallbackRegistry instead. JDH
 
-2008-05-27 Fix TkAgg build on Ubuntu 8.04 (and hopefully a more
-           general solution for other platforms, too.)
+2008-05-27
+    Fix TkAgg build on Ubuntu 8.04 (and hopefully a more general solution for
+    other platforms, too.)
 
-2008-05-24 Added PIL support for loading images to imread (if PIL is
-           available) - JDH
+2008-05-24
+    Added PIL support for loading images to imread (if PIL is available) - JDH
 
-2008-05-23 Provided a function and a method for controlling the
-           plot color cycle. - EF
+2008-05-23
+    Provided a function and a method for controlling the plot color cycle. - EF
 
-2008-05-23 Major revision of hist(). Can handle 2D arrays and create
-           stacked histogram plots; keyword 'width' deprecated and
-           rwidth (relative width) introduced; align='edge' changed
-           to center of bin - MM
+2008-05-23
+    Major revision of hist(). Can handle 2D arrays and create stacked histogram
+    plots; keyword 'width' deprecated and rwidth (relative width) introduced;
+    align='edge' changed to center of bin - MM
 
-2008-05-22 Added support for ReST-based doumentation using Sphinx.
-           Documents are located in doc/, and are broken up into
-           a users guide and an API reference. To build, run the
-           make.py files. Sphinx-0.4 is needed to build generate xml,
-           which will be useful for rendering equations with mathml,
-           use sphinx from svn until 0.4 is released - DSD
+2008-05-22
+    Added support for ReST-based documentation using Sphinx.  Documents are
+    located in doc/, and are broken up into a users guide and an API reference.
+    To build, run the make.py files. Sphinx-0.4 is needed to build generate
+    xml, which will be useful for rendering equations with mathml, use sphinx
+    from svn until 0.4 is released - DSD
 
-2008-05-21 Fix segfault in TkAgg backend - MGD
+2008-05-21
+    Fix segfault in TkAgg backend - MGD
 
-2008-05-21 Fix a "local variable unreferenced" bug in plotfile - MM
+2008-05-21
+    Fix a "local variable unreferenced" bug in plotfile - MM
 
-2008-05-19 Fix crash when Windows can not access the registry to
-           determine font path [Bug 1966974, thanks Patrik Simons] - MGD
+2008-05-19
+    Fix crash when Windows can not access the registry to determine font path
+    [Bug 1966974, thanks Patrik Simons] - MGD
 
-2008-05-16 removed some unneeded code w/ the python 2.4 requirement.
-           cbook no longer provides compatibility for reversed,
-           enumerate, set or izip.  removed lib/subprocess, mpl1,
-           sandbox/units, and the swig code.  This stuff should remain
-           on the maintenance branch for archival purposes. JDH
+2008-05-16
+    removed some unneeded code w/ the python 2.4 requirement.  cbook no longer
+    provides compatibility for reversed, enumerate, set or izip.  removed
+    lib/subprocess, mpl1, sandbox/units, and the swig code.  This stuff should
+    remain on the maintenance branch for archival purposes. JDH
 
-2008-05-16 Reorganized examples dir - JDH
+2008-05-16
+    Reorganized examples dir - JDH
 
-2008-05-16 Added 'elinewidth' keyword arg to errorbar, based on patch
-           by Christopher Brown - MM
+2008-05-16
+    Added 'elinewidth' keyword arg to errorbar, based on patch by Christopher
+    Brown - MM
 
-2008-05-16 Added 'cumulative' keyword arg to hist to plot cumulative
-           histograms. For normed hists, this is normalized to one - MM
+2008-05-16
+    Added 'cumulative' keyword arg to hist to plot cumulative histograms. For
+    normed hists, this is normalized to one - MM
 
-2008-05-15 Fix Tk backend segfault on some machines - MGD
+2008-05-15
+    Fix Tk backend segfault on some machines - MGD
 
-2008-05-14 Don't use stat on Windows (fixes font embedding problem) - MGD
+2008-05-14
+    Don't use stat on Windows (fixes font embedding problem) - MGD
 
-2008-05-09 Fix /singlequote (') in Postscript backend - MGD
+2008-05-09
+    Fix /singlequote (') in Postscript backend - MGD
 
-2008-05-08 Fix kerning in SVG when embedding character outlines - MGD
+2008-05-08
+    Fix kerning in SVG when embedding character outlines - MGD
 
-2008-05-07 Switched to future numpy histogram semantic in hist - MM
+2008-05-07
+    Switched to future numpy histogram semantic in hist - MM
 
-2008-05-06 Fix strange colors when blitting in QtAgg and Qt4Agg - MGD
+2008-05-06
+    Fix strange colors when blitting in QtAgg and Qt4Agg - MGD
 
-2008-05-05 pass notify_axes_change to the figure's add_axobserver
-           in the qt backends, like we do for the other backends.
-           Thanks Glenn Jones for the report - DSD
+2008-05-05
+    pass notify_axes_change to the figure's add_axobserver in the qt backends,
+    like we do for the other backends.  Thanks Glenn Jones for the report - DSD
 
-2008-05-02 Added step histograms, based on patch by Erik Tollerud. - MM
+2008-05-02
+    Added step histograms, based on patch by Erik Tollerud. - MM
 
-2008-05-02 On PyQt <= 3.14 there is no way to determine the underlying
-           Qt version. [1851364] - MGD
+2008-05-02
+    On PyQt <= 3.14 there is no way to determine the underlying Qt version.
+    [1851364] - MGD
 
-2008-05-02 Don't call sys.exit() when pyemf is not found [1924199] -
-           MGD
+2008-05-02
+    Don't call sys.exit() when pyemf is not found [1924199] - MGD
 
-2008-05-02 Update _subprocess.c from upstream Python 2.5.2 to get a
-           few memory and reference-counting-related bugfixes.  See
-           bug 1949978. - MGD
+2008-05-02
+    Update _subprocess.c from upstream Python 2.5.2 to get a few memory and
+    reference-counting-related bugfixes.  See bug 1949978. - MGD
 
-2008-04-30 Added some record array editing widgets for gtk -- see
-           examples/rec_edit*.py - JDH
+2008-04-30
+    Added some record array editing widgets for gtk -- see
+    examples/rec_edit*.py - JDH
 
-2008-04-29 Fix bug in mlab.sqrtm - MM
+2008-04-29
+    Fix bug in mlab.sqrtm - MM
 
-2008-04-28 Fix bug in SVG text with Mozilla-based viewers (the symbol
-           tag is not supported) - MGD
+2008-04-28
+    Fix bug in SVG text with Mozilla-based viewers (the symbol tag is not
+    supported) - MGD
 
-2008-04-27 Applied patch by Michiel de Hoon to add hexbin
-           axes method and pyplot function - EF
+2008-04-27
+    Applied patch by Michiel de Hoon to add hexbin axes method and pyplot
+    function - EF
 
-2008-04-25 Enforce python >= 2.4; remove subprocess build - EF
+2008-04-25
+    Enforce python >= 2.4; remove subprocess build - EF
 
-2008-04-25 Enforce the numpy requirement at build time - JDH
+2008-04-25
+    Enforce the numpy requirement at build time - JDH
 
-2008-04-24 Make numpy 1.1 and python 2.3 required when importing
-           matplotlib - EF
+2008-04-24
+    Make numpy 1.1 and python 2.3 required when importing matplotlib - EF
 
-2008-04-24 Fix compilation issues on VS2003 (Thanks Martin Spacek for
-           all the help) - MGD
+2008-04-24
+    Fix compilation issues on VS2003 (Thanks Martin Spacek for all the help) -
+    MGD
 
-2008-04-24 Fix sub/superscripts when the size of the font has been
-           changed - MGD
+2008-04-24
+    Fix sub/superscripts when the size of the font has been changed - MGD
 
-2008-04-22 Use "svg.embed_char_paths" consistently everywhere - MGD
+2008-04-22
+    Use "svg.embed_char_paths" consistently everywhere - MGD
 
-2008-04-20 Add support to MaxNLocator for symmetric axis autoscaling. - EF
+2008-04-20
+    Add support to MaxNLocator for symmetric axis autoscaling. - EF
 
-2008-04-20 Fix double-zoom bug. - MM
+2008-04-20
+    Fix double-zoom bug. - MM
 
-2008-04-15 Speed up colormapping. - EF
+2008-04-15
+    Speed up colormapping. - EF
 
-2008-04-12 Speed up zooming and panning of dense images. - EF
+2008-04-12
+    Speed up zooming and panning of dense images. - EF
 
-2008-04-11 Fix global font rcParam setting after initialization
-           time. - MGD
+2008-04-11
+    Fix global font rcParam setting after initialization time. - MGD
 
-2008-04-11 Revert commits 5002 and 5031, which were intended to
-           avoid an unnecessary call to draw(). 5002 broke saving
-           figures before show(). 5031 fixed the problem created in
-           5002, but broke interactive plotting. Unnecessary call to
-           draw still needs resolution - DSD
+2008-04-11
+    Revert commits 5002 and 5031, which were intended to avoid an unnecessary
+    call to draw(). 5002 broke saving figures before show(). 5031 fixed the
+    problem created in 5002, but broke interactive plotting. Unnecessary call
+    to draw still needs resolution - DSD
 
-2008-04-07 Improve color validation in rc handling, suggested
-           by Lev Givon - EF
+2008-04-07
+    Improve color validation in rc handling, suggested by Lev Givon - EF
 
-2008-04-02 Allow to use both linestyle definition arguments, '-' and
-           'solid' etc. in plots/collections - MM
+2008-04-02
+    Allow to use both linestyle definition arguments, '-' and 'solid' etc. in
+    plots/collections - MM
 
-2008-03-27 Fix saving to Unicode filenames with Agg backend
-           (other backends appear to already work...)
-           (Thanks, Christopher Barker) - MGD
+2008-03-27
+    Fix saving to Unicode filenames with Agg backend (other backends appear to
+    already work...) (Thanks, Christopher Barker) - MGD
 
-2008-03-26 Fix SVG backend bug that prevents copying and pasting in
-           Inkscape (thanks Kaushik Ghose) - MGD
+2008-03-26
+    Fix SVG backend bug that prevents copying and pasting in Inkscape (thanks
+    Kaushik Ghose) - MGD
 
-2008-03-24 Removed an unnecessary call to draw() in the backend_qt*
-           mouseReleaseEvent. Thanks to Ted Drain - DSD
+2008-03-24
+    Removed an unnecessary call to draw() in the backend_qt* mouseReleaseEvent.
+    Thanks to Ted Drain - DSD
 
-2008-03-23 Fix a pdf backend bug which sometimes caused the outermost
-           gsave to not be balanced with a grestore. - JKS
+2008-03-23
+    Fix a pdf backend bug which sometimes caused the outermost gsave to not be
+    balanced with a grestore. - JKS
 
-2008-03-20 Fixed a minor bug in ContourSet._process_linestyles when
-           len(linestyles)==Nlev - MM
+2008-03-20
+    Fixed a minor bug in ContourSet._process_linestyles when
+    len(linestyles)==Nlev - MM
 
-2008-03-19 Changed ma import statements to "from numpy import ma";
-           this should work with past and future versions of
-           numpy, whereas "import numpy.ma as ma" will work only
-           with numpy >= 1.05, and "import numerix.npyma as ma"
-           is obsolete now that maskedarray is replacing the
-           earlier implementation, as of numpy 1.05.
+2008-03-19
+    Changed ma import statements to "from numpy import ma"; this should work
+    with past and future versions of numpy, whereas "import numpy.ma as ma"
+    will work only with numpy >= 1.05, and "import numerix.npyma as ma" is
+    obsolete now that maskedarray is replacing the earlier implementation, as
+    of numpy 1.05.
 
-2008-03-14 Removed an apparently unnecessary call to
-           FigureCanvasAgg.draw in backend_qt*agg. Thanks to Ted
-           Drain - DSD
+2008-03-14
+    Removed an apparently unnecessary call to FigureCanvasAgg.draw in
+    backend_qt*agg. Thanks to Ted Drain - DSD
 
-2008-03-10 Workaround a bug in backend_qt4agg's blitting due to a
-           buffer width/bbox width mismatch in _backend_agg's
-           copy_from_bbox - DSD
+2008-03-10
+    Workaround a bug in backend_qt4agg's blitting due to a buffer width/bbox
+    width mismatch in _backend_agg's copy_from_bbox - DSD
 
-2008-02-29 Fix class Wx toolbar pan and zoom functions (Thanks Jeff
-           Peery) - MGD
+2008-02-29
+    Fix class Wx toolbar pan and zoom functions (Thanks Jeff Peery) - MGD
 
-2008-02-16 Added some new rec array functionality to mlab
-           (rec_summarize, rec2txt and rec_groupby).  See
-           examples/rec_groupby_demo.py.  Thanks to Tim M for rec2txt.
+2008-02-16
+    Added some new rec array functionality to mlab (rec_summarize, rec2txt and
+    rec_groupby).  See examples/rec_groupby_demo.py.  Thanks to Tim M for
+    rec2txt.
 
-2008-02-12 Applied Erik Tollerud's span selector patch - JDH
+2008-02-12
+    Applied Erik Tollerud's span selector patch - JDH
 
-2008-02-11 Update plotting() doc string to refer to getp/setp. - JKS
+2008-02-11
+    Update plotting() doc string to refer to getp/setp. - JKS
 
-2008-02-10 Fixed a problem with square roots in the pdf backend with
-           usetex. - JKS
+2008-02-10
+    Fixed a problem with square roots in the pdf backend with usetex. - JKS
 
-2008-02-08 Fixed minor __str__ bugs so getp(gca()) works. - JKS
+2008-02-08
+    Fixed minor __str__ bugs so getp(gca()) works. - JKS
 
-2008-02-05 Added getters for title, xlabel, ylabel, as requested
-           by Brandon Kieth - EF
+2008-02-05
+    Added getters for title, xlabel, ylabel, as requested by Brandon Kieth - EF
 
-2008-02-05 Applied Gael's ginput patch and created
-           examples/ginput_demo.py - JDH
+2008-02-05
+    Applied Gael's ginput patch and created examples/ginput_demo.py - JDH
 
-2008-02-03 Expose interpnames, a list of valid interpolation
-           methods, as an AxesImage class attribute. - EF
+2008-02-03
+    Expose interpnames, a list of valid interpolation methods, as an AxesImage
+    class attribute. - EF
 
-2008-02-03 Added BoundaryNorm, with examples in colorbar_only.py
-           and image_masked.py. - EF
+2008-02-03
+    Added BoundaryNorm, with examples in colorbar_only.py and image_masked.py.
+    - EF
 
-2008-02-03 Force dpi=72 in pdf backend to fix picture size bug. - JKS
+2008-02-03
+    Force dpi=72 in pdf backend to fix picture size bug. - JKS
 
-2008-02-01 Fix doubly-included font problem in Postscript backend - MGD
+2008-02-01
+    Fix doubly-included font problem in Postscript backend - MGD
 
-2008-02-01 Fix reference leak in ft2font Glyph objects. - MGD
+2008-02-01
+    Fix reference leak in ft2font Glyph objects. - MGD
 
-2008-01-31 Don't use unicode strings with usetex by default - DSD
+2008-01-31
+    Don't use unicode strings with usetex by default - DSD
 
-2008-01-31 Fix text spacing problems in PDF backend with *some* fonts,
-           such as STIXGeneral.
+2008-01-31
+    Fix text spacing problems in PDF backend with *some* fonts, such as
+    STIXGeneral.
 
-2008-01-31 Fix \sqrt with radical number (broken by making [ and ]
-           work below) - MGD
+2008-01-31
+    Fix \sqrt with radical number (broken by making [ and ] work below) - MGD
 
-2008-01-27 Applied  Martin Teichmann's patch to improve the Qt4
-           backend. Uses Qt's builtin toolbars and statusbars.
-           See bug 1828848 - DSD
+2008-01-27
+    Applied  Martin Teichmann's patch to improve the Qt4 backend. Uses Qt's
+    builtin toolbars and statusbars.  See bug 1828848 - DSD
 
-2008-01-10 Moved toolkits to mpl_toolkits, made mpl_toolkits
-           a namespace package - JSWHIT
+2008-01-10
+    Moved toolkits to mpl_toolkits, made mpl_toolkits a namespace package -
+    JSWHIT
 
-2008-01-10 Use setup.cfg to set the default parameters (tkagg,
-           numpy) when building windows installers - DSD
+2008-01-10
+    Use setup.cfg to set the default parameters (tkagg, numpy) when building
+    windows installers - DSD
 
-2008-01-10 Fix bug displaying [ and ] in mathtext - MGD
+2008-01-10
+    Fix bug displaying [ and ] in mathtext - MGD
 
-2008-01-10 Fix bug when displaying a tick value offset with scientific
-           notation. (Manifests itself as a warning that the \times
-           symbol can not be found). - MGD
+2008-01-10
+    Fix bug when displaying a tick value offset with scientific notation.
+    (Manifests itself as a warning that the \times symbol can not be found). -
+    MGD
 
-2008-01-10 Use setup.cfg to set the default parameters (tkagg,
-           numpy) when building windows installers - DSD
+2008-01-10
+    Use setup.cfg to set the default parameters (tkagg, numpy) when building
+    windows installers - DSD
 
 --------------------
 
-2008-01-06 Released 0.91.2 at revision 4802
+2008-01-06
+    Released 0.91.2 at revision 4802
 
-2007-12-26 Reduce too-late use of matplotlib.use() to a warning
-           instead of an exception, for backwards compatibility - EF
+2007-12-26
+    Reduce too-late use of matplotlib.use() to a warning instead of an
+    exception, for backwards compatibility - EF
 
-2007-12-25 Fix bug in errorbar, identified by Noriko Minakawa - EF
+2007-12-25
+    Fix bug in errorbar, identified by Noriko Minakawa - EF
 
-2007-12-25 Changed masked array importing to work with the upcoming
-           numpy 1.05 (now the maskedarray branch) as well as with
-           earlier versions. - EF
+2007-12-25
+    Changed masked array importing to work with the upcoming numpy 1.05 (now
+    the maskedarray branch) as well as with earlier versions. - EF
 
-2007-12-16 rec2csv saves doubles without losing precision. Also, it
-           does not close filehandles passed in open. - JDH,ADS
+2007-12-16
+    rec2csv saves doubles without losing precision. Also, it does not close
+    filehandles passed in open. - JDH,ADS
 
-2007-12-13 Moved rec2gtk to matplotlib.toolkits.gtktools and rec2excel
-           to matplotlib.toolkits.exceltools - JDH
+2007-12-13
+    Moved rec2gtk to matplotlib.toolkits.gtktools and rec2excel to
+    matplotlib.toolkits.exceltools - JDH
 
-2007-12-12 Support alpha-blended text in the Agg and Svg backends -
-           MGD
+2007-12-12
+    Support alpha-blended text in the Agg and Svg backends - MGD
 
-2007-12-10 Fix SVG text rendering bug. - MGD
+2007-12-10
+    Fix SVG text rendering bug. - MGD
 
-2007-12-10 Increase accuracy of circle and ellipse drawing by using an
-           8-piece bezier approximation, rather than a 4-piece one.
-           Fix PDF, SVG and Cairo backends so they can draw paths
-           (meaning ellipses as well). - MGD
+2007-12-10
+    Increase accuracy of circle and ellipse drawing by using an 8-piece bezier
+    approximation, rather than a 4-piece one.  Fix PDF, SVG and Cairo backends
+    so they can draw paths (meaning ellipses as well). - MGD
 
-2007-12-07 Issue a warning when drawing an image on a non-linear axis. - MGD
+2007-12-07
+    Issue a warning when drawing an image on a non-linear axis. - MGD
 
-2007-12-06 let widgets.Cursor initialize to the lower x and y bounds
-           rather than 0,0, which can cause havoc for dates and other
-           transforms - DSD
+2007-12-06
+    let widgets.Cursor initialize to the lower x and y bounds rather than 0,0,
+    which can cause havoc for dates and other transforms - DSD
 
-2007-12-06 updated references to mpl data directories for py2exe - DSD
+2007-12-06
+    updated references to mpl data directories for py2exe - DSD
 
-2007-12-06 fixed a bug in rcsetup, see bug 1845057 - DSD
+2007-12-06
+    fixed a bug in rcsetup, see bug 1845057 - DSD
 
-2007-12-05 Fix how fonts are cached to avoid loading the same one multiple times.
-           (This was a regression since 0.90 caused by the refactoring of
-           font_manager.py) - MGD
+2007-12-05
+    Fix how fonts are cached to avoid loading the same one multiple times.
+    (This was a regression since 0.90 caused by the refactoring of
+    font_manager.py) - MGD
 
-2007-12-05 Support arbitrary rotation of usetex text in Agg backend. - MGD
+2007-12-05
+    Support arbitrary rotation of usetex text in Agg backend. - MGD
 
-2007-12-04 Support '|' as a character in mathtext - MGD
+2007-12-04
+    Support '|' as a character in mathtext - MGD
 
 -----------------------------------------------------
 
-2007-11-27 Released 0.91.1 at revision 4517
+2007-11-27
+    Released 0.91.1 at revision 4517
 
 -----------------------------------------------------
 
-2007-11-27 Released 0.91.0 at revision 4478
-
-2007-11-13 All backends now support writing to a file-like object, not
-           just a regular file.  savefig() can be passed a file-like
-           object in place of a file path. - MGD
-
-2007-11-13 Improved the default backend selection at build time:
-           SVG -> Agg -> TkAgg -> WXAgg -> GTK -> GTKAgg. The last usable
-           backend in this progression will be chosen in the default
-           config file. If a backend is defined in setup.cfg, that will
-           be the default backend - DSD
-
-2007-11-13 Improved creation of default config files at build time for
-           traited config package - DSD
-
-2007-11-12 Exposed all the build options in setup.cfg. These options are
-           read into a dict called "options" by setupext.py. Also, added
-           "-mpl" tags to the version strings for packages provided by
-           matplotlib. Versions provided by mpl will be identified and
-           updated on subsequent installs - DSD
-
-2007-11-12 Added support for STIX fonts.  A new rcParam,
-           mathtext.fontset, can be used to choose between:
-
-           'cm':
-             The TeX/LaTeX Computer Modern fonts
-
-           'stix':
-             The STIX fonts (see stixfonts.org)
-
-           'stixsans':
-             The STIX fonts, using sans-serif glyphs by default
-
-           'custom':
-             A generic Unicode font, in which case the mathtext font
-             must be specified using mathtext.bf, mathtext.it,
-             mathtext.sf etc.
-
-           Added a new example, stix_fonts_demo.py to show how to access
-           different fonts and unusual symbols.
-
-           - MGD
-
-2007-11-12 Options to disable building backend extension modules moved
-           from setup.py to setup.cfg - DSD
-
-2007-11-09 Applied Martin Teichmann's patch 1828813: a QPainter is used in
-           paintEvent, which has to be destroyed using  the method end(). If
-           matplotlib raises an exception before the call to end - and it
-           does if you feed it with bad data - this method end() is never
-           called and Qt4 will start spitting error messages
-
-2007-11-09 Moved pyparsing back into matplotlib namespace. Don't use
-           system pyparsing, API is too variable from one release
-           to the next - DSD
-
-2007-11-08 Made pylab use straight numpy instead of oldnumeric
-           by default - EF
-
-2007-11-08 Added additional record array utilities to mlab (rec2excel,
-           rec2gtk, rec_join, rec_append_field, rec_drop_field) - JDH
+2007-11-27
+    Released 0.91.0 at revision 4478
+
+2007-11-13
+    All backends now support writing to a file-like object, not just a regular
+    file.  savefig() can be passed a file-like object in place of a file path.
+    - MGD
+
+2007-11-13
+    Improved the default backend selection at build time: SVG -> Agg -> TkAgg
+    -> WXAgg -> GTK -> GTKAgg. The last usable backend in this progression will
+    be chosen in the default config file. If a backend is defined in setup.cfg,
+    that will be the default backend - DSD
+
+2007-11-13
+    Improved creation of default config files at build time for traited config
+    package - DSD
+
+2007-11-12
+    Exposed all the build options in setup.cfg. These options are read into a
+    dict called "options" by setupext.py. Also, added "-mpl" tags to the
+    version strings for packages provided by matplotlib. Versions provided by
+    mpl will be identified and updated on subsequent installs - DSD
+
+2007-11-12
+    Added support for STIX fonts.  A new rcParam, mathtext.fontset, can be used
+    to choose between:
+
+    'cm'
+        The TeX/LaTeX Computer Modern fonts
+    'stix'
+        The STIX fonts (see stixfonts.org)
+    'stixsans'
+        The STIX fonts, using sans-serif glyphs by default
+    'custom'
+        A generic Unicode font, in which case the mathtext font must be
+        specified using mathtext.bf, mathtext.it, mathtext.sf etc.
+
+    Added a new example, stix_fonts_demo.py to show how to access different
+    fonts and unusual symbols.  - MGD
+
+2007-11-12
+    Options to disable building backend extension modules moved from setup.py
+    to setup.cfg - DSD
+
+2007-11-09
+    Applied Martin Teichmann's patch 1828813: a QPainter is used in paintEvent,
+    which has to be destroyed using  the method end(). If matplotlib raises an
+    exception before the call to end - and it does if you feed it with bad data
+    - this method end() is never called and Qt4 will start spitting error
+    messages
+
+2007-11-09
+    Moved pyparsing back into matplotlib namespace. Don't use system pyparsing,
+    API is too variable from one release to the next - DSD
+
+2007-11-08
+    Made pylab use straight numpy instead of oldnumeric by default - EF
+
+2007-11-08
+    Added additional record array utilities to mlab (rec2excel, rec2gtk,
+    rec_join, rec_append_field, rec_drop_field) - JDH
+
+2007-11-08
+    Updated pytz to version 2007g - DSD
 
-2007-11-08 Updated pytz to version 2007g - DSD
+2007-11-08
+    Updated pyparsing to version 1.4.8 - DSD
+
+2007-11-08
+    Moved csv2rec to recutils and added other record array utilities - JDH
+
+2007-11-08
+    If available, use existing pyparsing installation - DSD
+
+2007-11-07
+    Removed old enthought.traits from lib/matplotlib, added Gael Varoquaux's
+    enthought.traits-2.6b1, which is stripped of setuptools. The package is
+    installed to site-packages if not already available - DSD
+
+2007-11-05
+    Added easy access to minor tick properties; slight mod of patch by Pierre
+    G-M - EF
+
+2007-11-02
+    Committed Phil Thompson's patch 1599876, fixes to Qt4Agg backend and qt4
+    blitting demo - DSD
+
+2007-11-02
+    Committed Phil Thompson's patch 1599876, fixes to Qt4Agg backend and qt4
+    blitting demo - DSD
+
+2007-10-31
+    Made log color scale easier to use with contourf; automatic level
+    generation now works. - EF
+
+2007-10-29
+    TRANSFORMS REFACTORING
+
+    The primary goal of this refactoring was to make it easier to extend
+    matplotlib to support new kinds of projections.  This is primarily an
+    internal improvement, and the possible user-visible changes it allows are
+    yet to come.
+
+    The transformation framework was completely rewritten in Python (with
+    Numpy).  This will make it easier to add news kinds of transformations
+    without writing C/C++ code.
+
+    Transforms are composed into a 'transform tree', made of transforms whose
+    value depends on other transforms (their children).  When the contents of
+    children change, their parents are automatically updated to reflect those
+    changes.  To do this an "invalidation" method is used: when children
+    change, all of their ancestors are marked as "invalid".  When the value of
+    a transform is accessed at a later time, its value is recomputed only if it
+    is invalid, otherwise a cached value may be used.  This prevents
+    unnecessary recomputations of transforms, and contributes to better
+    interactive performance.
+
+    The framework can be used for both affine and non-affine transformations.
+    However, for speed, we want use the backend renderers to perform affine
+    transformations whenever possible.  Therefore, it is possible to perform
+    just the affine or non-affine part of a transformation on a set of data.
+    The affine is always assumed to occur after the non-affine.  For any
+    transform::
+
+        full transform == non-affine + affine
+
+    Much of the drawing has been refactored in terms of compound paths.
+    Therefore, many methods have been removed from the backend interface and
+    replaced with a handful to draw compound paths.  This will make updating
+    the backends easier, since there is less to update.  It also should make
+    the backends more consistent in terms of functionality.
+
+    User visible changes:
+
+    - POLAR PLOTS: Polar plots are now interactively zoomable, and the r-axis
+      labels can be interactively rotated.  Straight line segments are now
+      interpolated to follow the curve of the r-axis.
+
+    - Non-rectangular clipping works in more backends and with more types of
+      objects.
+
+    - Sharing an axis across figures is now done in exactly the same way as
+      sharing an axis between two axes in the same figure::
+
+        fig1 = figure()
+        fig2 = figure()
+
+        ax1 = fig1.add_subplot(111)
+        ax2 = fig2.add_subplot(111, sharex=ax1, sharey=ax1)
 
-2007-11-08 Updated pyparsing to version 1.4.8 - DSD
+    - linestyles now include steps-pre, steps-post and steps-mid.  The old step
+      still works and is equivalent to step-pre.
 
-2007-11-08 Moved csv2rec to recutils and added other record array
-           utilities - JDH
+    - Multiple line styles may be provided to a collection.
 
-2007-11-08 If available, use existing pyparsing installation - DSD
+    See API_CHANGES for more low-level information about this refactoring.
 
-2007-11-07 Removed old enthought.traits from lib/matplotlib, added
-           Gael Varoquaux's enthought.traits-2.6b1, which is stripped
-           of setuptools. The package is installed to site-packages
-           if not already available - DSD
+2007-10-24
+    Added ax kwarg to Figure.colorbar and pyplot.colorbar - EF
 
-2007-11-05 Added easy access to minor tick properties; slight mod
-           of patch by Pierre G-M - EF
+2007-10-19
+    Removed a gsave/grestore pair surrounding _draw_ps, which was causing a
+    loss graphics state info (see "EPS output problem - scatter & edgecolors"
+    on mpl-dev, 2007-10-29) - DSD
 
-2007-11-02 Committed Phil Thompson's patch 1599876, fixes to Qt4Agg
-           backend and qt4 blitting demo - DSD
+2007-10-15
+    Fixed a bug in patches.Ellipse that was broken for aspect='auto'.  Scale
+    free ellipses now work properly for equal and auto on Agg and PS, and they
+    fall back on a polygonal approximation for nonlinear transformations until
+    we convince ourselves that the spline approximation holds for nonlinear
+    transformations. Added unit/ellipse_compare.py to compare spline with
+    vertex approx for both aspects. JDH
+
+2007-10-05
+    remove generator expressions from texmanager and mpltraits.  generator
+    expressions are not supported by python-2.3 - DSD
+
+2007-10-01
+    Made matplotlib.use() raise an exception if called after backends has been
+    imported. - EF
+
+2007-09-30
+    Modified update* methods of Bbox and Interval so they work with reversed
+    axes.  Prior to this, trying to set the ticks on a reversed axis failed
+    with an uninformative error message. - EF
+
+2007-09-30
+    Applied patches to axes3d to fix index error problem - EF
+
+2007-09-24
+    Applied Eike Welk's patch reported on mpl-dev on 2007-09-22 Fixes a bug
+    with multiple plot windows in the qt backend, ported the changes to
+    backend_qt4 as well - DSD
+
+2007-09-21
+    Changed cbook.reversed to yield the same result as the python reversed
+    builtin - DSD
+
+2007-09-13
+    The usetex support in the pdf backend is more usable now, so I am enabling
+    it. - JKS
+
+2007-09-12
+    Fixed a Axes.bar unit bug - JDH
+
+2007-09-10
+    Made skiprows=1 the default on csv2rec - JDH
+
+2007-09-09
+    Split out the plotting part of pylab and put it in pyplot.py; removed
+    numerix from the remaining pylab.py, which imports everything from
+    pyplot.py.  The intention is that apart from cleanups, the result of
+    importing from pylab is nearly unchanged, but there is the new alternative
+    of importing from pyplot to get the state-engine graphics without all the
+    numeric functions.  Numpified examples; deleted two that were obsolete;
+    modified some to use pyplot. - EF
 
-2007-11-02 Committed Phil Thompson's patch 1599876, fixes to Qt4Agg
-           backend and qt4 blitting demo - DSD
+2007-09-08
+    Eliminated gd and paint backends - EF
 
-2007-10-31 Made log color scale easier to use with contourf;
-           automatic level generation now works. - EF
+2007-09-06
+    .bmp file format is now longer an alias for .raw
 
-2007-10-29 TRANSFORMS REFACTORING
+2007-09-07
+    Added clip path support to pdf backend. - JKS
 
-           The primary goal of this refactoring was to make it easier
-           to extend matplotlib to support new kinds of projections.
-           This is primarily an internal improvement, and the possible
-           user-visible changes it allows are yet to come.
+2007-09-06
+    Fixed a bug in the embedding of Type 1 fonts in PDF.  Now it doesn't crash
+    Preview.app. - JKS
 
-           The transformation framework was completely rewritten in
-           Python (with Numpy).  This will make it easier to add news
-           kinds of transformations without writing C/C++ code.
+2007-09-06
+    Refactored image saving code so that all GUI backends can save most image
+    types.  See FILETYPES for a matrix of backends and their supported file
+    types.  Backend canvases should no longer write their own print_figure()
+    method -- instead they should write a print_xxx method for each filetype
+    they can output and add an entry to their class-scoped filetypes
+    dictionary. - MGD
 
-           Transforms are composed into a 'transform tree', made of
-           transforms whose value depends on other transforms (their
-           children).  When the contents of children change, their
-           parents are automatically updated to reflect those changes.
-           To do this an "invalidation" method is used: when children
-           change, all of their ancestors are marked as "invalid".
-           When the value of a transform is accessed at a later time,
-           its value is recomputed only if it is invalid, otherwise a
-           cached value may be used.  This prevents unnecessary
-           recomputations of transforms, and contributes to better
-           interactive performance.
+2007-09-05
+    Fixed Qt version reporting in setupext.py - DSD
 
-           The framework can be used for both affine and non-affine
-           transformations.  However, for speed, we want use the
-           backend renderers to perform affine transformations
-           whenever possible.  Therefore, it is possible to perform
-           just the affine or non-affine part of a transformation on a
-           set of data.  The affine is always assumed to occur after
-           the non-affine.  For any transform:
+2007-09-04
+    Embedding Type 1 fonts in PDF, and thus usetex support via dviread, sort of
+    works. To test, enable it by renaming _draw_tex to draw_tex. - JKS
 
-                full transform == non-affine + affine
+2007-09-03
+    Added ability of errorbar show limits via caret or arrowhead ends on the
+    bars; patch by Manual Metz. - EF
 
-           Much of the drawing has been refactored in terms of
-           compound paths.  Therefore, many methods have been removed
-           from the backend interface and replaced with a a handful to
-           draw compound paths.  This will make updating the backends
-           easier, since there is less to update.  It also should make
-           the backends more consistent in terms of functionality.
+2007-09-03
+    Created type1font.py, added features to AFM and FT2Font (see API_CHANGES),
+    started work on embedding Type 1 fonts in pdf files. - JKS
 
-           User visible changes:
+2007-09-02
+    Continued work on dviread.py. - JKS
 
-           - POLAR PLOTS: Polar plots are now interactively zoomable,
-             and the r-axis labels can be interactively rotated.
-             Straight line segments are now interpolated to follow the
-             curve of the r-axis.
+2007-08-16
+    Added a set_extent method to AxesImage, allow data extent to be modified
+    after initial call to imshow - DSD
 
-           - Non-rectangular clipping works in more backends and with
-             more types of objects.
+2007-08-14
+    Fixed a bug in pyqt4 subplots-adjust. Thanks to Xavier Gnata for the report
+    and suggested fix - DSD
 
-           - Sharing an axis across figures is now done in exactly
-             the same way as sharing an axis between two axes in the
-             same figure::
+2007-08-13
+    Use pickle to cache entire fontManager; change to using font_manager
+    module-level function findfont wrapper for the fontManager.findfont method
+    - EF
 
-                  fig1 = figure()
-                  fig2 = figure()
+2007-08-11
+    Numpification and cleanup of mlab.py and some examples - EF
 
-                   ax1 = fig1.add_subplot(111)
-                   ax2 = fig2.add_subplot(111, sharex=ax1, sharey=ax1)
+2007-08-06
+    Removed mathtext2
 
-           - linestyles now include steps-pre, steps-post and
-             steps-mid.  The old step still works and is equivalent to
-             step-pre.
+2007-07-31
+    Refactoring of distutils scripts.
 
-           - Multiple line styles may be provided to a collection.
+    - Will not fail on the entire build if an optional Python package (e.g.,
+      Tkinter) is installed but its development headers are not (e.g.,
+      tk-devel).  Instead, it will continue to build all other extensions.
+    - Provide an overview at the top of the output to display what dependencies
+      and their versions were found, and (by extension) what will be built.
+    - Use pkg-config, when available, to find freetype2, since this was broken
+      on Mac OS-X when using MacPorts in a non- standard location.
 
-           See API_CHANGES for more low-level information about this
-           refactoring.
+2007-07-30
+    Reorganized configuration code to work with traited config objects. The new
+    config system is located in the matplotlib.config package, but it is
+    disabled by default.  To enable it, set NEWCONFIG=True in
+    matplotlib.__init__.py.  The new configuration system will still use the
+    old matplotlibrc files by default. To switch to the experimental, traited
+    configuration, set USE_TRAITED_CONFIG=True in config.__init__.py.
 
-2007-10-24 Added ax kwarg to Figure.colorbar and pyplot.colorbar - EF
+2007-07-29
+    Changed default pcolor shading to flat; added aliases to make collection
+    kwargs agree with setter names, so updating works; related minor cleanups.
+    Removed quiver_classic, scatter_classic, pcolor_classic. - EF
 
-2007-10-19 Removed a gsave/grestore pair surrounding _draw_ps, which
-           was causing a loss graphics state info (see "EPS output
-           problem - scatter & edgecolors" on mpl-dev, 2007-10-29)
-           - DSD
+2007-07-26
+    Major rewrite of mathtext.py, using the TeX box layout model.
 
-2007-10-15 Fixed a bug in patches.Ellipse that was broken for
-           aspect='auto'.  Scale free ellipses now work properly for
-           equal and auto on Agg and PS, and they fall back on a
-           polygonal approximation for nonlinear transformations until
-           we convince oursleves that the spline approximation holds
-           for nonlinear transformations. Added
-           unit/ellipse_compare.py to compare spline with vertex
-           approx for both aspects. JDH
+    There is one (known) backward incompatible change.  The font commands
+    (\cal, \rm, \it, \tt) now behave as TeX does: they are in effect until the
+    next font change command or the end of the grouping.  Therefore uses of
+    $\cal{R}$ should be changed to ${\cal R}$.  Alternatively, you may use the
+    new LaTeX-style font commands (\mathcal, \mathrm, \mathit, \mathtt) which
+    do affect the following group, e.g., $\mathcal{R}$.
 
-2007-10-05 remove generator expressions from texmanager and mpltraits.
-           generator expressions are not supported by python-2.3 - DSD
+    Other new features include:
 
-2007-10-01 Made matplotlib.use() raise an exception if called after
-           backends has been imported. - EF
+    - Math may be interspersed with non-math text.  Any text with an even
+      number of $'s (non-escaped) will be sent to the mathtext parser for
+      layout.
 
-2007-09-30 Modified update* methods of Bbox and Interval so they
-           work with reversed axes.  Prior to this, trying to
-           set the ticks on a reversed axis failed with an
-           uninformative error message. - EF
-
-2007-09-30 Applied patches to axes3d to fix index error problem - EF
-
-2007-09-24 Applied Eike Welk's patch reported on mpl-dev on 2007-09-22
-           Fixes a bug with multiple plot windows in the qt backend,
-           ported the changes to backend_qt4 as well - DSD
-
-2007-09-21 Changed cbook.reversed to yield the same result as the
-           python reversed builtin - DSD
-
-2007-09-13 The usetex support in the pdf backend is more usable now,
-           so I am enabling it. - JKS
-
-2007-09-12 Fixed a Axes.bar unit bug - JDH
-
-2007-09-10 Made skiprows=1 the default on csv2rec - JDH
-
-2007-09-09 Split out the plotting part of pylab and put it in
-           pyplot.py; removed numerix from the remaining pylab.py,
-           which imports everything from pyplot.py.  The intention
-           is that apart from cleanups, the result of importing
-           from pylab is nearly unchanged, but there is the
-           new alternative of importing from pyplot to get
-           the state-engine graphics without all the numeric
-           functions.
-           Numpified examples; deleted two that were obsolete;
-           modified some to use pyplot. - EF
+    - Sub/superscripts are less likely to accidentally overlap.
 
-2007-09-08 Eliminated gd and paint backends - EF
+    - Support for sub/superscripts in either order, e.g., $x^i_j$ and $x_j^i$
+      are equivalent.
 
-2007-09-06 .bmp file format is now longer an alias for .raw
+    - Double sub/superscripts (e.g., $x_i_j$) are considered ambiguous and
+      raise an exception.  Use braces to disambiguate.
 
-2007-09-07 Added clip path support to pdf backend. - JKS
+    - $\frac{x}{y}$ can be used for displaying fractions.
 
-2007-09-06 Fixed a bug in the embedding of Type 1 fonts in PDF.
-           Now it doesn't crash Preview.app. - JKS
+    - $\sqrt[3]{x}$ can be used to display the radical symbol with a root
+      number and body.
 
-2007-09-06 Refactored image saving code so that all GUI backends can
-           save most image types.  See FILETYPES for a matrix of
-           backends and their supported file types.
-           Backend canvases should no longer write their own print_figure()
-           method -- instead they should write a print_xxx method for
-           each filetype they can output and add an entry to their
-           class-scoped filetypes dictionary. - MGD
+    - $\left(\frac{x}{y}\right)$ may be used to create parentheses and other
+      delimiters that automatically resize to the height of their contents.
 
-2007-09-05 Fixed Qt version reporting in setupext.py - DSD
+    - Spacing around operators etc. is now generally more like TeX.
 
-2007-09-04 Embedding Type 1 fonts in PDF, and thus usetex support
-           via dviread, sort of works. To test, enable it by
-           renaming _draw_tex to draw_tex. - JKS
+    - Added support (and fonts) for boldface (\bf) and sans-serif (\sf)
+      symbols.
 
-2007-09-03 Added ability of errorbar show limits via caret or
-           arrowhead ends on the bars; patch by Manual Metz. - EF
+    - Log-like function name shortcuts are supported.  For example, $\sin(x)$
+      may be used instead of ${\rm sin}(x)$
 
-2007-09-03 Created type1font.py, added features to AFM and FT2Font
-           (see API_CHANGES), started work on embedding Type 1 fonts
-           in pdf files. - JKS
+    - Limited use of kerning for the easy case (same font)
 
-2007-09-02 Continued work on dviread.py. - JKS
+    Behind the scenes, the pyparsing.py module used for doing the math parsing
+    was updated to the latest stable version (1.4.6).  A lot of duplicate code
+    was refactored out of the Font classes.
 
-2007-08-16 Added a set_extent method to AxesImage, allow data extent
-           to be modified after initial call to imshow - DSD
+    - MGD
 
-2007-08-14 Fixed a bug in pyqt4 subplots-adjust. Thanks to
-           Xavier Gnata for the report and suggested fix - DSD
+2007-07-19
+    completed numpification of most trivial cases - NN
 
-2007-08-13 Use pickle to cache entire fontManager; change to using
-            font_manager module-level function findfont wrapper for
-            the fontManager.findfont method - EF
+2007-07-19
+    converted non-numpy relicts throughout the code - NN
 
-2007-08-11 Numpification and cleanup of mlab.py and some examples - EF
+2007-07-19
+    replaced the Python code in numerix/ by a minimal wrapper around numpy that
+    explicitly mentions all symbols that need to be addressed for further
+    numpification - NN
 
-2007-08-06 Removed mathtext2
+2007-07-18
+    make usetex respect changes to rcParams. texmanager used to only configure
+    itself when it was created, now it reconfigures when rcParams are changed.
+    Thank you Alexander Schmolck for contributing a patch - DSD
 
-2007-07-31 Refactoring of distutils scripts.
-           - Will not fail on the entire build if an optional Python
-             package (e.g., Tkinter) is installed but its development
-             headers are not (e.g., tk-devel).  Instead, it will
-             continue to build all other extensions.
-           - Provide an overview at the top of the output to display
-             what dependencies and their versions were found, and (by
-             extension) what will be built.
-           - Use pkg-config, when available, to find freetype2, since
-             this was broken on Mac OS-X when using MacPorts in a non-
-             standard location.
+2007-07-17
+    added validation to setting and changing rcParams - DSD
 
-2007-07-30 Reorganized configuration code to work with traited config
-           objects. The new config system is located in the
-           matplotlib.config package, but it is disabled by default.
-           To enable it, set NEWCONFIG=True in matplotlib.__init__.py.
-           The new configuration system will still use the old
-           matplotlibrc files by default. To switch to the experimental,
-           traited configuration, set USE_TRAITED_CONFIG=True in
-           config.__init__.py.
+2007-07-17
+    bugfix segfault in transforms module. Thanks Ben North for the patch. - ADS
 
-2007-07-29 Changed default pcolor shading to flat; added aliases
-           to make collection kwargs agree with setter names, so
-           updating works; related minor cleanups.
-           Removed quiver_classic, scatter_classic, pcolor_classic. - EF
+2007-07-16
+    clean up some code in ticker.ScalarFormatter, use unicode to render
+    multiplication sign in offset ticklabel - DSD
 
-2007-07-26 Major rewrite of mathtext.py, using the TeX box layout model.
+2007-07-16
+    fixed a formatting bug in ticker.ScalarFormatter's scientific notation
+    (10^0 was being rendered as 10 in some cases) - DSD
 
-           There is one (known) backward incompatible change.  The
-           font commands (\cal, \rm, \it, \tt) now behave as TeX does:
-           they are in effect until the next font change command or
-           the end of the grouping.  Therefore uses of $\cal{R}$
-           should be changed to ${\cal R}$.  Alternatively, you may
-           use the new LaTeX-style font commands (\mathcal, \mathrm,
-           \mathit, \mathtt) which do affect the following group,
-           e.g., $\mathcal{R}$.
+2007-07-13
+    Add MPL_isfinite64() and MPL_isinf64() for testing doubles in (the now
+    misnamed) MPL_isnan.h. - ADS
 
-           Other new features include:
+2007-07-13
+    The matplotlib._isnan module removed (use numpy.isnan) - ADS
 
-           - Math may be interspersed with non-math text.  Any text
-             with an even number of $'s (non-escaped) will be sent to
-             the mathtext parser for layout.
+2007-07-13
+    Some minor cleanups in _transforms.cpp - ADS
 
-           - Sub/superscripts are less likely to accidentally overlap.
+2007-07-13
+    Removed the rest of the numerix extension code detritus, numpified axes.py,
+    and cleaned up the imports in axes.py - JDH
 
-           - Support for sub/superscripts in either order, e.g., $x^i_j$
-             and $x_j^i$ are equivalent.
+2007-07-13
+    Added legend.loc as configurable option that could in future default to
+    'best'. - NN
 
-           - Double sub/superscripts (e.g., $x_i_j$) are considered
-             ambiguous and raise an exception.  Use braces to disambiguate.
+2007-07-12
+    Bugfixes in mlab.py to coerce inputs into numpy arrays. -ADS
 
-           - $\frac{x}{y}$ can be used for displaying fractions.
+2007-07-11
+    Added linespacing kwarg to text.Text - EF
 
-           - $\sqrt[3]{x}$ can be used to display the radical symbol
-             with a root number and body.
+2007-07-11
+    Added code to store font paths in SVG files. - MGD
 
-           - $\left(\frac{x}{y}\right)$ may be used to create
-             parentheses and other delimiters that automatically
-             resize to the height of their contents.
+2007-07-10
+    Store subset of TTF font as a Type 3 font in PDF files. - MGD
 
-           - Spacing around operators etc. is now generally more like
-             TeX.
+2007-07-09
+    Store subset of TTF font as a Type 3 font in PS files. - MGD
 
-           - Added support (and fonts) for boldface (\bf) and
-             sans-serif (\sf) symbols.
+2007-07-09
+    Applied Paul's pick restructure pick and add pickers, sourceforge patch
+    1749829 - JDH
 
-           - Log-like function name shortcuts are supported.  For
-             example, $\sin(x)$ may be used instead of ${\rm sin}(x)$
+2007-07-09
+    Applied Allan's draw_lines agg optimization. JDH
 
-           - Limited use of kerning for the easy case (same font)
+2007-07-08
+    Applied Carl Worth's patch to fix cairo draw_arc - SC
 
-           Behind the scenes, the pyparsing.py module used for doing
-           the math parsing was updated to the latest stable version
-           (1.4.6).  A lot of duplicate code was refactored out of the
-           Font classes.
+2007-07-07
+    fixed bug 1712099: xpdf distiller on windows - DSD
 
-           - MGD
+2007-06-30
+    Applied patches to tkagg, gtk, and wx backends to reduce memory leakage.
+    Patches supplied by Mike Droettboom; see tracker numbers 1745400, 1745406,
+    1745408.  Also made unit/memleak_gui.py more flexible with command-line
+    options. - EF
 
-2007-07-19 completed numpification of most trivial cases - NN
+2007-06-30
+    Split defaultParams into separate file rcdefaults (together with validation
+    code). Some heavy refactoring was necessary to do so, but the overall
+    behavior should be the same as before. - NN
 
-2007-07-19 converted non-numpy relicts throughout the code - NN
+2007-06-27
+    Added MPLCONFIGDIR for the default location for mpl data and configuration.
+    useful for some apache installs where HOME is not writable.  Tried to clean
+    up the logic in _get_config_dir to support non-writable HOME where are
+    writable HOME/.matplotlib already exists - JDH
 
-2007-07-19 replaced the Python code in numerix/ by a minimal wrapper around
-           numpy that explicitly mentions all symbols that need to be
-           addressed for further numpification - NN
+2007-06-27
+    Fixed locale bug reported at
+    \http://sourceforge.net/tracker/index.php?func=detail&aid=1744154&group_id=80706&atid=560720
+    by adding a cbook.unicode_safe function - JDH
 
-2007-07-18 make usetex respect changes to rcParams. texmanager used to
-           only configure itself when it was created, now it
-           reconfigures when rcParams are changed. Thank you Alexander
-           Schmolck for contributing a patch - DSD
+2007-06-27
+    Applied Micheal's tk savefig bugfix described at
+    \http://sourceforge.net/tracker/index.php?func=detail&aid=1716732&group_id=80706&atid=560720
+    Thanks Michael!
 
-2007-07-17 added validation to setting and changing rcParams - DSD
+2007-06-27
+    Patch for get_py2exe_datafiles() to work with new directory layout. (Thanks
+    Tocer and also Werner Bruhin.) -ADS
 
-2007-07-17 bugfix segfault in transforms module. Thanks Ben North for
-           the patch. - ADS
+2007-06-27
+    Added a scroll event to the mpl event handling system and implemented it
+    for backends GTK* -- other backend users/developers/maintainers, please add
+    support for your backend. - JDH
 
-2007-07-16 clean up some code in ticker.ScalarFormatter, use unicode to
-           render multiplication sign in offset ticklabel - DSD
+2007-06-25
+    Changed default to clip=False in colors.Normalize; modified ColorbarBase
+    for easier colormap display - EF
 
-2007-07-16 fixed a formatting bug in ticker.ScalarFormatter's scientific
-           notation (10^0 was being rendered as 10 in some cases) - DSD
+2007-06-13
+    Added maskedarray option to rc, numerix - EF
 
-2007-07-13 Add MPL_isfinite64() and MPL_isinf64() for testing
-           doubles in (the now misnamed) MPL_isnan.h. - ADS
+2007-06-11
+    Python 2.5 compatibility fix for mlab.py - EF
 
-2007-07-13 The matplotlib._isnan module removed (use numpy.isnan) - ADS
+2007-06-10
+    In matplotlibrc file, use 'dashed' | 'solid' instead of a pair of floats
+    for contour.negative_linestyle - EF
 
-2007-07-13 Some minor cleanups in _transforms.cpp - ADS
+2007-06-08
+    Allow plot and fill fmt string to be any mpl string colorspec - EF
 
-2007-07-13 Removed the rest of the numerix extension code detritus,
-           numpified axes.py, and cleaned up the imports in axes.py
-           - JDH
+2007-06-08
+    Added gnuplot file plotfile function to pylab -- see
+    examples/plotfile_demo.py - JDH
 
-2007-07-13 Added legend.loc as configurable option that could in
-           future default to 'best'. - NN
+2007-06-07
+    Disable build of numarray and Numeric extensions for internal MPL use and
+    the numerix layer. - ADS
 
-2007-07-12 Bugfixes in mlab.py to coerce inputs into numpy arrays. -ADS
+2007-06-07
+    Added csv2rec to matplotlib.mlab to support automatically converting csv
+    files to record arrays using type introspection, and turned on native
+    datetime support using the new units support in matplotlib.dates.  See
+    examples/loadrec.py !  JDH
 
-2007-07-11 Added linespacing kwarg to text.Text - EF
+2007-06-07
+    Simplified internal code of _auto_legend_data - NN
 
-2007-07-11 Added code to store font paths in SVG files. - MGD
+2007-06-04
+    Added labeldistance arg to Axes.pie to control the raidal distance of the
+    wedge labels - JDH
 
-2007-07-10 Store subset of TTF font as a Type 3 font in PDF files. - MGD
-
-2007-07-09 Store subset of TTF font as a Type 3 font in PS files. - MGD
-
-2007-07-09 Applied Paul's pick restructure pick and add pickers,
-           sourceforge patch 1749829 - JDH
-
-
-2007-07-09 Applied Allan's draw_lines agg optimization. JDH
-
-
-2007-07-08 Applied Carl Worth's patch to fix cairo draw_arc - SC
-
-2007-07-07 fixed bug 1712099: xpdf distiller on windows - DSD
-
-2007-06-30 Applied patches to tkagg, gtk, and wx backends to reduce
-           memory leakage.  Patches supplied by Mike Droettboom;
-           see tracker numbers 1745400, 1745406, 1745408.
-           Also made unit/memleak_gui.py more flexible with
-           command-line options. - EF
-
-2007-06-30 Split defaultParams into separate file rcdefaults (together with
-           validation code). Some heavy refactoring was necessary to do so,
-           but the overall behavior should be the same as before. - NN
-
-2007-06-27 Added MPLCONFIGDIR for the default location for mpl data
-           and configuration.  useful for some apache installs where
-           HOME is not writable.  Tried to clean up the logic in
-           _get_config_dir to support non-writable HOME where are
-           writable HOME/.matplotlib already exists - JDH
-
-2007-06-27 Fixed locale bug reported at
-           \http://sourceforge.net/tracker/index.php?func=detail&aid=1744154&group_id=80706&atid=560720
-           by adding a cbook.unicode_safe function - JDH
-
-2007-06-27 Applied Micheal's tk savefig bugfix described at
-           \http://sourceforge.net/tracker/index.php?func=detail&aid=1716732&group_id=80706&atid=560720
-           Thanks Michael!
-
-
-2007-06-27 Patch for get_py2exe_datafiles() to work with new directory
-           layout. (Thanks Tocer and also Werner Bruhin.) -ADS
-
-
-2007-06-27 Added a scroll event to the mpl event handling system and
-           implemented it for backends GTK* -- other backend
-           users/developers/maintainers, please add support for your
-           backend. - JDH
-
-2007-06-25 Changed default to clip=False in colors.Normalize;
-           modified ColorbarBase for easier colormap display - EF
-
-2007-06-13 Added maskedarray option to rc, numerix - EF
-
-2007-06-11 Python 2.5 compatibility fix for mlab.py - EF
-
-2007-06-10 In matplotlibrc file, use 'dashed' | 'solid' instead
-           of a pair of floats for contour.negative_linestyle - EF
-
-2007-06-08 Allow plot and fill fmt string to be any mpl string
-            colorspec - EF
-
-2007-06-08 Added gnuplot file plotfile function to pylab -- see
-           examples/plotfile_demo.py - JDH
-
-2007-06-07 Disable build of numarray and Numeric extensions for
-           internal MPL use and the numerix layer. - ADS
-
-2007-06-07 Added csv2rec to matplotlib.mlab to support automatically
-           converting csv files to record arrays using type
-           introspection, and turned on native datetime support using
-           the new units support in matplotlib.dates.  See
-           examples/loadrec.py !  JDH
-
-2007-06-07 Simplified internal code of _auto_legend_data - NN
-
-2007-06-04 Added labeldistance arg to Axes.pie to control the raidal
-           distance of the wedge labels - JDH
-
-2007-06-03 Turned mathtext in SVG into single <text> with multiple <tspan>
-           objects (easier to edit in inkscape). - NN
+2007-06-03
+    Turned mathtext in SVG into single <text> with multiple <tspan> objects
+    (easier to edit in inkscape). - NN
 
 ----------------------------
 
-2007-06-02 Released 0.90.1 at revision 3352
-
-2007-06-02 Display only meaningful labels when calling legend()
-           without args. - NN
-
-2007-06-02 Have errorbar follow the color cycle even if line is not plotted.
-           Suppress plotting of errorbar caps for capsize=0. - NN
-
-2007-06-02 Set markers to same alpha value as line. - NN
-
-2007-06-02 Fix mathtext position in svg backend. - NN
-
-2007-06-01 Deprecate Numeric and numarray for use as numerix. Props to
-           Travis -- job well done. - ADS
+2007-06-02
+    Released 0.90.1 at revision 3352
 
-2007-05-18 Added LaTeX unicode support. Enable with the
-           'text.latex.unicode' rcParam. This requires the ucs and
-           inputenc LaTeX packages. - ADS
+2007-06-02
+    Display only meaningful labels when calling legend() without args. - NN
 
-2007-04-23 Fixed some problems with polar -- added general polygon
-           clipping to clip the lines and grids to the polar axes.
-           Added support for set_rmax to easily change the maximum
-           radial grid.  Added support for polar legend - JDH
+2007-06-02
+    Have errorbar follow the color cycle even if line is not plotted.  Suppress
+    plotting of errorbar caps for capsize=0. - NN
 
-2007-04-16 Added Figure.autofmt_xdate to handle adjusting the bottom
-           and rotating the tick labels for date plots when the ticks
-           often overlap - JDH
+2007-06-02
+    Set markers to same alpha value as line. - NN
 
-2007-04-09 Beginnings of usetex support for pdf backend. -JKS
+2007-06-02
+    Fix mathtext position in svg backend. - NN
 
-2007-04-07 Fixed legend/LineCollection bug. Added label support
-           to collections. - EF
+2007-06-01
+    Deprecate Numeric and numarray for use as numerix. Props to Travis -- job
+    well done. - ADS
 
-2007-04-06 Removed deprecated support for a float value as a gray-scale;
-           now it must be a string, like '0.5'.  Added alpha kwarg to
-           ColorConverter.to_rgba_list. - EF
+2007-05-18
+    Added LaTeX unicode support. Enable with the 'text.latex.unicode' rcParam.
+    This requires the ucs and inputenc LaTeX packages. - ADS
 
-2007-04-06 Fixed rotation of ellipses in pdf backend
-           (sf bug #1690559) -JKS
+2007-04-23
+    Fixed some problems with polar -- added general polygon clipping to clip
+    the lines and grids to the polar axes.  Added support for set_rmax to
+    easily change the maximum radial grid.  Added support for polar legend -
+    JDH
 
-2007-04-04 More matshow tweaks; documentation updates; new method
-           set_bounds() for formatters and locators. - EF
+2007-04-16
+    Added Figure.autofmt_xdate to handle adjusting the bottom and rotating the
+    tick labels for date plots when the ticks often overlap - JDH
 
-2007-04-02 Fixed problem with imshow and matshow of integer arrays;
-           fixed problems with changes to color autoscaling. - EF
+2007-04-09
+    Beginnings of usetex support for pdf backend. -JKS
 
-2007-04-01 Made image color autoscaling work correctly with
-           a tracking colorbar; norm.autoscale now scales
-           unconditionally, while norm.autoscale_None changes
-           only None-valued vmin, vmax. - EF
+2007-04-07
+    Fixed legend/LineCollection bug. Added label support to collections. - EF
 
-2007-03-31 Added a qt-based subplot-adjustment dialog - DSD
+2007-04-06
+    Removed deprecated support for a float value as a gray-scale; now it must
+    be a string, like '0.5'.  Added alpha kwarg to ColorConverter.to_rgba_list.
+    - EF
 
-2007-03-30 Fixed a bug in backend_qt4, reported on mpl-dev - DSD
+2007-04-06
+    Fixed rotation of ellipses in pdf backend (sf bug #1690559) -JKS
 
-2007-03-26 Removed colorbar_classic from figure.py; fixed bug in
-           Figure.clf() in which _axobservers was not getting
-           cleared.  Modernization and cleanups. - EF
+2007-04-04
+    More matshow tweaks; documentation updates; new method set_bounds() for
+    formatters and locators. - EF
 
-2007-03-26 Refactored some of the units support -- units now live in
-           the respective x and y Axis instances.  See also
-           API_CHANGES for some alterations to the conversion
-           interface.  JDH
+2007-04-02
+    Fixed problem with imshow and matshow of integer arrays; fixed problems
+    with changes to color autoscaling. - EF
 
-2007-03-25 Fix masked array handling in quiver.py for numpy. (Numeric
-           and numarray support for masked arrays is broken in other
-           ways when using quiver. I didn't pursue that.) - ADS
+2007-04-01
+    Made image color autoscaling work correctly with a tracking colorbar;
+    norm.autoscale now scales unconditionally, while norm.autoscale_None
+    changes only None-valued vmin, vmax. - EF
 
-2007-03-23 Made font_manager.py close opened files. - JKS
+2007-03-31
+    Added a qt-based subplot-adjustment dialog - DSD
 
-2007-03-22 Made imshow default extent match matshow - EF
+2007-03-30
+    Fixed a bug in backend_qt4, reported on mpl-dev - DSD
 
-2007-03-22 Some more niceties for xcorr -- a maxlags option, normed
-           now works for xcorr as well as axorr, usevlines is
-           supported, and a zero correlation hline is added.  See
-           examples/xcorr_demo.py.  Thanks Sameer for the patch.  -
-           JDH
+2007-03-26
+    Removed colorbar_classic from figure.py; fixed bug in Figure.clear() in which
+    _axobservers was not getting cleared.  Modernization and cleanups. - EF
 
-2007-03-21 Axes.vlines and Axes.hlines now create and returns a
-           LineCollection, not a list of lines.  This is much faster.
-           The kwarg signature has changed, so consult the docs.
-           Modified Axes.errorbar which uses vlines and hlines.  See
-           API_CHANGES; the return signature for these three functions
-           is now different
+2007-03-26
+    Refactored some of the units support -- units now live in the respective x
+    and y Axis instances.  See also API_CHANGES for some alterations to the
+    conversion interface.  JDH
 
-2007-03-20 Refactored units support and added new examples - JDH
+2007-03-25
+    Fix masked array handling in quiver.py for numpy. (Numeric and numarray
+    support for masked arrays is broken in other ways when using quiver. I
+    didn't pursue that.) - ADS
 
-2007-03-19 Added Mike's units patch - JDH
+2007-03-23
+    Made font_manager.py close opened files. - JKS
 
-2007-03-18 Matshow as an Axes method; test version matshow1() in
-           pylab; added 'integer' Boolean kwarg to MaxNLocator
-           initializer to force ticks at integer locations. - EF
+2007-03-22
+    Made imshow default extent match matshow - EF
 
-2007-03-17 Preliminary support for clipping to paths agg - JDH
+2007-03-22
+    Some more niceties for xcorr -- a maxlags option, normed now works for
+    xcorr as well as axorr, usevlines is supported, and a zero correlation
+    hline is added.  See examples/xcorr_demo.py.  Thanks Sameer for the patch.
+    - JDH
 
-2007-03-17 Text.set_text() accepts anything convertible with '%s' - EF
+2007-03-21
+    Axes.vlines and Axes.hlines now create and returns a LineCollection, not a
+    list of lines.  This is much faster.  The kwarg signature has changed, so
+    consult the docs.  Modified Axes.errorbar which uses vlines and hlines.
+    See API_CHANGES; the return signature for these three functions is now
+    different
 
-2007-03-14 Add masked-array support to hist. - EF
+2007-03-20
+    Refactored units support and added new examples - JDH
 
-2007-03-03 Change barh to take a kwargs dict and pass it to bar.
-           Fixes sf bug #1669506.
+2007-03-19
+    Added Mike's units patch - JDH
 
-2007-03-02 Add rc parameter pdf.inheritcolor, which disables all
-           color-setting operations in the pdf backend. The idea is
-           that you include the resulting file in another program and
-           set the colors (both stroke and fill color) there, so you
-           can use the same pdf file for e.g., a paper and a
-           presentation and have them in the surrounding color. You
-           will probably not want to draw figure and axis frames in
-           that case, since they would be filled in the same color. - JKS
+2007-03-18
+    Matshow as an Axes method; test version matshow1() in pylab; added
+    'integer' Boolean kwarg to MaxNLocator initializer to force ticks at
+    integer locations. - EF
 
-2007-02-26 Prevent building _wxagg.so with broken Mac OS X wxPython. - ADS
+2007-03-17
+    Preliminary support for clipping to paths agg - JDH
 
-2007-02-23 Require setuptools for Python 2.3 - ADS
+2007-03-17
+    Text.set_text() accepts anything convertible with '%s' - EF
 
-2007-02-22 WXAgg accelerator updates - KM
-           WXAgg's C++ accelerator has been fixed to use the correct wxBitmap
-           constructor.
+2007-03-14
+    Add masked-array support to hist. - EF
 
-           The backend has been updated to use new wxPython functionality to
-           provide fast blit() animation without the C++ accelerator.  This
-           requires wxPython 2.8 or later.  Previous versions of wxPython can
-           use the C++ acclerator or the old pure Python routines.
+2007-03-03
+    Change barh to take a kwargs dict and pass it to bar.  Fixes sf bug
+    #1669506.
 
-           setup.py no longer builds the C++ accelerator when wxPython >= 2.8
-           is present.
+2007-03-02
+    Add rc parameter pdf.inheritcolor, which disables all color-setting
+    operations in the pdf backend. The idea is that you include the resulting
+    file in another program and set the colors (both stroke and fill color)
+    there, so you can use the same pdf file for e.g., a paper and a
+    presentation and have them in the surrounding color. You will probably not
+    want to draw figure and axis frames in that case, since they would be
+    filled in the same color. - JKS
 
-           The blit() method is now faster regardless of which agg/wxPython
-           conversion routines are used.
+2007-02-26
+    Prevent building _wxagg.so with broken Mac OS X wxPython. - ADS
 
-2007-02-21 Applied the PDF backend patch by Nicolas Grilly.
-           This impacts several files and directories in matplotlib:
+2007-02-23
+    Require setuptools for Python 2.3 - ADS
 
-           - Created the directory lib/matplotlib/mpl-data/fonts/pdfcorefonts,
-             holding AFM files for the 14 PDF core fonts. These fonts are
-             embedded in every PDF viewing application.
+2007-02-22
+    WXAgg accelerator updates - KM
 
-           - setup.py: Added the directory pdfcorefonts to package_data.
+    WXAgg's C++ accelerator has been fixed to use the correct wxBitmap
+    constructor.
 
-           - lib/matplotlib/__init__.py: Added the default parameter
-             'pdf.use14corefonts'. When True, the PDF backend uses
-             only the 14 PDF core fonts.
+    The backend has been updated to use new wxPython functionality to provide
+    fast blit() animation without the C++ accelerator.  This requires wxPython
+    2.8 or later.  Previous versions of wxPython can use the C++ accelerator or
+    the old pure Python routines.
 
-           - lib/matplotlib/afm.py: Added some keywords found in
-             recent AFM files. Added a little workaround to handle
-             Euro symbol.
+    setup.py no longer builds the C++ accelerator when wxPython >= 2.8 is
+    present.
 
-           - lib/matplotlib/fontmanager.py: Added support for the 14
-             PDF core fonts. These fonts have a dedicated cache (file
-             pdfcorefont.cache), not the same as for other AFM files
-             (file .afmfont.cache). Also cleaned comments to conform
-             to CODING_GUIDE.
-
-           - lib/matplotlib/backends/backend_pdf.py:
-             Added support for 14 PDF core fonts.
-             Fixed some issues with incorrect character widths and
-             encodings (works only for the most common encoding,
-             WinAnsiEncoding, defined by the official PDF Reference).
-             Removed parameter 'dpi' because it causes alignment issues.
-
-           -JKS (patch by Nicolas Grilly)
-
-2007-02-17 Changed ft2font.get_charmap, and updated all the files where
-           get_charmap is mentioned - ES
-
-2007-02-13 Added barcode demo- JDH
-
-2007-02-13 Added binary colormap to cm - JDH
-
-2007-02-13 Added twiny to pylab - JDH
-
-2007-02-12 Moved data files into lib/matplotlib so that setuptools'
-           develop mode works. Re-organized the mpl-data layout so
-           that this source structure is maintained in the
-           installation. (i.e., the 'fonts' and 'images'
-           sub-directories are maintained in site-packages.)  Suggest
-           removing site-packages/matplotlib/mpl-data and
-           ~/.matplotlib/ttffont.cache before installing - ADS
-
-2007-02-07 Committed Rob Hetland's patch for qt4: remove
-           references to text()/latin1(), plus some improvements
-           to the toolbar layout - DSD
-
----------------------------
+    The blit() method is now faster regardless of which agg/wxPython conversion
+    routines are used.
 
-2007-02-06 Released 0.90.0 at revision 3003
+2007-02-21
+    Applied the PDF backend patch by Nicolas Grilly.  This impacts several
+    files and directories in matplotlib:
 
-2007-01-22 Extended the new picker API to text, patches and patch
-           collections.  Added support for user customizable pick hit
-           testing and attribute tagging of the PickEvent - Details
-           and examples in examples/pick_event_demo.py - JDH
+    - Created the directory lib/matplotlib/mpl-data/fonts/pdfcorefonts, holding
+      AFM files for the 14 PDF core fonts. These fonts are embedded in every
+      PDF viewing application.
 
-2007-01-16 Begun work on a new pick API using the mpl event handling
-           frameowrk.  Artists will define their own pick method with
-           a configurable epsilon tolerance and return pick attrs.
-           All artists that meet the tolerance threshold will fire a
-           PickEvent with artist dependent attrs; e.g., a Line2D can set
-           the indices attribute that shows the indices into the line
-           that are within epsilon of the pick point.  See
-           examples/pick_event_demo.py.  The implementation of pick
-           for the remaining Artists remains to be done, but the core
-           infrastructure at the level of event handling is in place
-           with a proof-of-concept implementation for Line2D - JDH
+    - setup.py: Added the directory pdfcorefonts to package_data.
 
-2007-01-16 src/_image.cpp: update to use Py_ssize_t (for 64-bit systems).
-           Use return value of fread() to prevent warning messages - SC.
+    - lib/matplotlib/__init__.py: Added the default parameter
+      'pdf.use14corefonts'. When True, the PDF backend uses only the 14 PDF
+      core fonts.
 
-2007-01-15 src/_image.cpp: combine buffer_argb32() and buffer_bgra32() into
-           a new method color_conv(format) - SC
+    - lib/matplotlib/afm.py: Added some keywords found in recent AFM files.
+      Added a little workaround to handle Euro symbol.
 
-2007-01-14 backend_cairo.py: update draw_arc() so that
-           examples/arctest.py looks correct - SC
+    - lib/matplotlib/fontmanager.py: Added support for the 14 PDF core fonts.
+      These fonts have a dedicated cache (file pdfcorefont.cache), not the same
+      as for other AFM files (file .afmfont.cache). Also cleaned comments to
+      conform to CODING_GUIDE.
 
-2007-01-12 backend_cairo.py: enable clipping. Update draw_image() so that
-           examples/contour_demo.py looks correct - SC
+    - lib/matplotlib/backends/backend_pdf.py: Added support for 14 PDF core
+      fonts.  Fixed some issues with incorrect character widths and encodings
+      (works only for the most common encoding, WinAnsiEncoding, defined by the
+      official PDF Reference).  Removed parameter 'dpi' because it causes
+      alignment issues.
 
-2007-01-12 backend_cairo.py: fix draw_image() so that examples/image_demo.py
-           now looks correct - SC
+    -JKS (patch by Nicolas Grilly)
 
-2007-01-11 Added Axes.xcorr and Axes.acorr to plot the cross
-           correlation of x vs. y or the autocorrelation of x.  pylab
-           wrappers also provided.  See examples/xcorr_demo.py - JDH
+2007-02-17
+    Changed ft2font.get_charmap, and updated all the files where get_charmap is
+    mentioned - ES
 
-2007-01-10 Added "Subplot.label_outer" method.  It will set the
-           visibility of the ticklabels so that yticklabels are only
-           visible in the first column and xticklabels are only
-           visible in the last row - JDH
+2007-02-13
+    Added barcode demo- JDH
 
-2007-01-02 Added additional kwarg documentation - JDH
+2007-02-13
+    Added binary colormap to cm - JDH
 
-2006-12-28 Improved error message for nonpositive input to log
-           transform; added log kwarg to bar, barh, and hist,
-           and modified bar method to behave sensibly by default
-           when the ordinate has a log scale.  (This only works
-           if the log scale is set before or by the call to bar,
-           hence the utility of the log kwarg.) - EF
+2007-02-13
+    Added twiny to pylab - JDH
 
-2006-12-27 backend_cairo.py: update draw_image() and _draw_mathtext() to work
-           with numpy - SC
+2007-02-12
+    Moved data files into lib/matplotlib so that setuptools' develop mode
+    works. Re-organized the mpl-data layout so that this source structure is
+    maintained in the installation. (i.e., the 'fonts' and 'images'
+    sub-directories are maintained in site-packages.)  Suggest removing
+    site-packages/matplotlib/mpl-data and ~/.matplotlib/ttffont.cache before
+    installing - ADS
 
-2006-12-20 Fixed xpdf dependency check, which was failing on windows.
-           Removed ps2eps dependency check. - DSD
+2007-02-07
+    Committed Rob Hetland's patch for qt4: remove references to
+    text()/latin1(), plus some improvements to the toolbar layout - DSD
 
-2006-12-19 Added Tim Leslie's spectral patch - JDH
-
-2006-12-17 Added rc param 'axes.formatter.limits' to control
-           the default threshold for switching to scientific
-           notation. Added convenience method
-           Axes.ticklabel_format() for turning scientific notation
-           on or off on either or both axes. - EF
-
-2006-12-16 Added ability to turn control scientific notation
-           in ScalarFormatter - EF
-
-2006-12-16 Enhanced boxplot to handle more flexible inputs - EF
-
-2006-12-13 Replaced calls to where() in colors.py with much faster
-           clip() and putmask() calls; removed inappropriate
-           uses of getmaskorNone (which should be needed only
-           very rarely); all in response to profiling by
-           David Cournapeau.  Also fixed bugs in my 2-D
-           array support from 12-09. - EF
-
-2006-12-09 Replaced spy and spy2 with the new spy that combines
-           marker and image capabilities - EF
-
-2006-12-09 Added support for plotting 2-D arrays with plot:
-           columns are plotted as in Matlab - EF
-
-2006-12-09 Added linewidth kwarg to bar and barh; fixed arg
-           checking bugs - EF
-
-2006-12-07 Made pcolormesh argument handling match pcolor;
-           fixed kwarg handling problem noted by Pierre GM - EF
-
-2006-12-06 Made pcolor support vector X and/or Y instead of
-           requiring 2-D arrays - EF
-
-2006-12-05 Made the default Artist._transform None (rather than
-           invoking identity_transform for each artist only to have it
-           overridden later).  Use artist.get_transform() rather than
-           artist._transform, even in derived classes, so that the
-           default transform will be created lazily as needed - JDH
-
-2006-12-03 Added LogNorm to colors.py as illustrated by
-           examples/pcolor_log.py, based on suggestion by
-           Jim McDonald.  Colorbar modified to handle LogNorm.
-           Norms have additional "inverse" method. - EF
-
-2006-12-02 Changed class names in colors.py to match convention:
-           normalize -> Normalize, no_norm -> NoNorm.  Old names
-           are still available.
-           Changed __init__.py rc defaults to match those in
-           matplotlibrc - EF
-
-2006-11-22 Fixed bug in set_*lim that I had introduced on 11-15 - EF
-
-2006-11-22 Added examples/clippedline.py, which shows how to clip line
-           data based on view limits -- it also changes the marker
-           style when zoomed in - JDH
-
-2006-11-21 Some spy bug-fixes and added precision arg per Robert C's
-           suggestion  - JDH
-
-2006-11-19 Added semi-automatic docstring generation detailing all the
-           kwargs that functions take using the artist introspection
-           tools; e.g., 'help text now details the scatter kwargs
-           that control the Text properties  - JDH
-
-2006-11-17 Removed obsolete scatter_classic, leaving a stub to
-           raise NotImplementedError; same for pcolor_classic - EF
-
-2006-11-15 Removed obsolete pcolor_classic - EF
-
-2006-11-15 Fixed 1588908 reported by Russel Owen; factored
-           nonsingular method out of ticker.py, put it into
-           transforms.py as a function, and used it in
-           set_xlim and set_ylim. - EF
-
-2006-11-14 Applied patch 1591716 by Ulf Larssen to fix a bug in
-           apply_aspect.  Modified and applied patch
-           1594894 by mdehoon to fix bugs and improve
-           formatting in lines.py. Applied patch 1573008
-           by Greg Willden to make psd etc. plot full frequency
-           range for complex inputs. - EF
-
-2006-11-14 Improved the ability of the colorbar to track
-           changes in corresponding image, pcolor, or
-           contourf. - EF
-
-2006-11-11 Fixed bug that broke Numeric compatibility;
-           added support for alpha to colorbar.  The
-           alpha information is taken from the mappable
-           object, not specified as a kwarg. - EF
-
-2006-11-05 Added broken_barh function for makring a sequence of
-           horizontal bars broken by gaps -- see examples/broken_barh.py
-
-2006-11-05 Removed lineprops and markerprops from the Annotation code
-           and replaced them with an arrow configurable with kwarg
-           arrowprops.  See examples/annotation_demo.py - JDH
-
-2006-11-02 Fixed a pylab subplot bug that was causing axes to be
-           deleted with hspace or wspace equals zero in
-           subplots_adjust - JDH
+---------------------------
 
-2006-10-31 Applied axes3d patch 1587359
-           \http://sourceforge.net/tracker/index.php?func=detail&aid=1587359&group_id=80706&atid=560722
-           JDH
+2007-02-06
+    Released 0.90.0 at revision 3003
+
+2007-01-22
+    Extended the new picker API to text, patches and patch collections.  Added
+    support for user customizable pick hit testing and attribute tagging of the
+    PickEvent - Details and examples in examples/pick_event_demo.py - JDH
+
+2007-01-16
+    Begun work on a new pick API using the mpl event handling framework.
+    Artists will define their own pick method with a configurable epsilon
+    tolerance and return pick attrs.  All artists that meet the tolerance
+    threshold will fire a PickEvent with artist dependent attrs; e.g., a Line2D
+    can set the indices attribute that shows the indices into the line that are
+    within epsilon of the pick point.  See examples/pick_event_demo.py.  The
+    implementation of pick for the remaining Artists remains to be done, but
+    the core infrastructure at the level of event handling is in place with a
+    proof-of-concept implementation for Line2D - JDH
+
+2007-01-16
+    src/_image.cpp: update to use Py_ssize_t (for 64-bit systems).  Use return
+    value of fread() to prevent warning messages - SC.
+
+2007-01-15
+    src/_image.cpp: combine buffer_argb32() and buffer_bgra32() into a new
+    method color_conv(format) - SC
+
+2007-01-14
+    backend_cairo.py: update draw_arc() so that examples/arctest.py looks
+    correct - SC
+
+2007-01-12
+    backend_cairo.py: enable clipping. Update draw_image() so that
+    examples/contour_demo.py looks correct - SC
+
+2007-01-12
+    backend_cairo.py: fix draw_image() so that examples/image_demo.py now looks
+    correct - SC
+
+2007-01-11
+    Added Axes.xcorr and Axes.acorr to plot the cross correlation of x vs. y or
+    the autocorrelation of x.  pylab wrappers also provided.  See
+    examples/xcorr_demo.py - JDH
+
+2007-01-10
+    Added "Subplot.label_outer" method.  It will set the visibility of the
+    ticklabels so that yticklabels are only visible in the first column and
+    xticklabels are only visible in the last row - JDH
+
+2007-01-02
+    Added additional kwarg documentation - JDH
+
+2006-12-28
+    Improved error message for nonpositive input to log transform; added log
+    kwarg to bar, barh, and hist, and modified bar method to behave sensibly by
+    default when the ordinate has a log scale.  (This only works if the log
+    scale is set before or by the call to bar, hence the utility of the log
+    kwarg.) - EF
+
+2006-12-27
+    backend_cairo.py: update draw_image() and _draw_mathtext() to work with
+    numpy - SC
+
+2006-12-20
+    Fixed xpdf dependency check, which was failing on windows.  Removed ps2eps
+    dependency check. - DSD
+
+2006-12-19
+    Added Tim Leslie's spectral patch - JDH
+
+2006-12-17
+    Added rc param 'axes.formatter.limits' to control the default threshold for
+    switching to scientific notation. Added convenience method
+    Axes.ticklabel_format() for turning scientific notation on or off on either
+    or both axes. - EF
+
+2006-12-16
+    Added ability to turn control scientific notation in ScalarFormatter - EF
+
+2006-12-16
+    Enhanced boxplot to handle more flexible inputs - EF
+
+2006-12-13
+    Replaced calls to where() in colors.py with much faster clip() and
+    putmask() calls; removed inappropriate uses of getmaskorNone (which should
+    be needed only very rarely); all in response to profiling by David
+    Cournapeau.  Also fixed bugs in my 2-D array support from 12-09. - EF
+
+2006-12-09
+    Replaced spy and spy2 with the new spy that combines marker and image
+    capabilities - EF
+
+2006-12-09
+    Added support for plotting 2-D arrays with plot: columns are plotted as in
+    Matlab - EF
+
+2006-12-09
+    Added linewidth kwarg to bar and barh; fixed arg checking bugs - EF
+
+2006-12-07
+    Made pcolormesh argument handling match pcolor; fixed kwarg handling
+    problem noted by Pierre GM - EF
+
+2006-12-06
+    Made pcolor support vector X and/or Y instead of requiring 2-D arrays - EF
+
+2006-12-05
+    Made the default Artist._transform None (rather than invoking
+    identity_transform for each artist only to have it overridden later).  Use
+    artist.get_transform() rather than artist._transform, even in derived
+    classes, so that the default transform will be created lazily as needed -
+    JDH
+
+2006-12-03
+    Added LogNorm to colors.py as illustrated by examples/pcolor_log.py, based
+    on suggestion by Jim McDonald.  Colorbar modified to handle LogNorm.  Norms
+    have additional "inverse" method. - EF
+
+2006-12-02
+    Changed class names in colors.py to match convention: normalize ->
+    Normalize, no_norm -> NoNorm.  Old names are still available.  Changed
+    __init__.py rc defaults to match those in matplotlibrc - EF
+
+2006-11-22
+    Fixed bug in set_*lim that I had introduced on 11-15 - EF
+
+2006-11-22
+    Added examples/clippedline.py, which shows how to clip line data based on
+    view limits -- it also changes the marker style when zoomed in - JDH
+
+2006-11-21
+    Some spy bug-fixes and added precision arg per Robert C's suggestion  - JDH
+
+2006-11-19
+    Added semi-automatic docstring generation detailing all the kwargs that
+    functions take using the artist introspection tools; e.g., 'help text now
+    details the scatter kwargs that control the Text properties  - JDH
+
+2006-11-17
+    Removed obsolete scatter_classic, leaving a stub to raise
+    NotImplementedError; same for pcolor_classic - EF
+
+2006-11-15
+    Removed obsolete pcolor_classic - EF
+
+2006-11-15
+    Fixed 1588908 reported by Russel Owen; factored nonsingular method out of
+    ticker.py, put it into transforms.py as a function, and used it in set_xlim
+    and set_ylim. - EF
+
+2006-11-14
+    Applied patch 1591716 by Ulf Larssen to fix a bug in apply_aspect.
+    Modified and applied patch 1594894 by mdehoon to fix bugs and improve
+    formatting in lines.py. Applied patch 1573008 by Greg Willden to make psd
+    etc. plot full frequency range for complex inputs. - EF
+
+2006-11-14
+    Improved the ability of the colorbar to track changes in corresponding
+    image, pcolor, or contourf. - EF
+
+2006-11-11
+    Fixed bug that broke Numeric compatibility; added support for alpha to
+    colorbar.  The alpha information is taken from the mappable object, not
+    specified as a kwarg. - EF
+
+2006-11-05
+    Added broken_barh function for making a sequence of horizontal bars broken
+    by gaps -- see examples/broken_barh.py
+
+2006-11-05
+    Removed lineprops and markerprops from the Annotation code and replaced
+    them with an arrow configurable with kwarg arrowprops.  See
+    examples/annotation_demo.py - JDH
+
+2006-11-02
+    Fixed a pylab subplot bug that was causing axes to be deleted with hspace
+    or wspace equals zero in subplots_adjust - JDH
+
+2006-10-31
+    Applied axes3d patch 1587359
+    \http://sourceforge.net/tracker/index.php?func=detail&aid=1587359&group_id=80706&atid=560722
+    JDH
 
 -------------------------
 
-2006-10-26 Released 0.87.7 at revision 2835
+2006-10-26
+    Released 0.87.7 at revision 2835
 
-2006-10-25 Made "tiny" kwarg in Locator.nonsingular much smaller - EF
+2006-10-25
+    Made "tiny" kwarg in Locator.nonsingular much smaller - EF
 
-2006-10-17 Closed sf bug 1562496 update line props dash/solid/cap/join
-           styles - JDH
+2006-10-17
+    Closed sf bug 1562496 update line props dash/solid/cap/join styles - JDH
 
-2006-10-17 Complete overhaul of the annotations API and example code -
-           See matplotlib.text.Annotation and
-           examples/annotation_demo.py JDH
+2006-10-17
+    Complete overhaul of the annotations API and example code - See
+    matplotlib.text.Annotation and examples/annotation_demo.py JDH
 
-2006-10-12 Committed Manuel Metz's StarPolygon code and
-           examples/scatter_star_poly.py - JDH
+2006-10-12
+    Committed Manuel Metz's StarPolygon code and examples/scatter_star_poly.py
+    - JDH
 
+2006-10-11
+    commented out all default values in matplotlibrc.template Default values
+    should generally be taken from defaultParam in __init__.py - the file
+    matplotlib should only contain those values that the user wants to
+    explicitly change from the default.  (see thread "marker color handling" on
+    matplotlib-devel)
 
-2006-10-11 commented out all default values in matplotlibrc.template
-           Default values should generally be taken from defaultParam in
-           __init__.py - the file matplotlib should only contain those values
-           that the user wants to explicitly change from the default.
-           (see thread "marker color handling" on matplotlib-devel)
+2006-10-10
+    Changed default comment character for load to '#' - JDH
 
-2006-10-10 Changed default comment character for load to '#' - JDH
+2006-10-10
+    deactivated rcfile-configurability of markerfacecolor and markeredgecolor.
+    Both are now hardcoded to the special value 'auto' to follow the line
+    color. Configurability at run-time (using function arguments) remains
+    functional. - NN
 
-2006-10-10 deactivated rcfile-configurability of markerfacecolor
-           and markeredgecolor. Both are now hardcoded to the special value
-           'auto' to follow the line color. Configurability at run-time
-           (using function arguments) remains functional. - NN
+2006-10-07
+    introduced dummy argument magnification=1.0 to FigImage.make_image to
+    satisfy unit test figimage_demo.py The argument is not yet handled
+    correctly, which should only show up when using non-standard DPI settings
+    in PS backend, introduced by patch #1562394. - NN
 
-2006-10-07 introduced dummy argument magnification=1.0 to
-           FigImage.make_image to satisfy unit test figimage_demo.py
-           The argument is not yet handled correctly, which should only
-           show up when using non-standard DPI settings in PS backend,
-           introduced by patch #1562394. - NN
+2006-10-06
+    add backend-agnostic example: simple3d.py - NN
 
-2006-10-06 add backend-agnostic example: simple3d.py - NN
+2006-09-29
+    fix line-breaking for SVG-inline images (purely cosmetic) - NN
 
-2006-09-29 fix line-breaking for SVG-inline images (purely cosmetic) - NN
+2006-09-29
+    reworked set_linestyle and set_marker markeredgecolor and markerfacecolor
+    now default to a special value "auto" that keeps the color in sync with the
+    line color further, the intelligence of axes.plot is cleaned up, improved
+    and simplified. Complete compatibility cannot be guaranteed, but the new
+    behavior should be much more predictable (see patch #1104615 for details) -
+    NN
 
-2006-09-29 reworked set_linestyle and set_marker
-           markeredgecolor and markerfacecolor now default to
-           a special value "auto" that keeps the color in sync with
-           the line color
-           further, the intelligence of axes.plot is cleaned up,
-           improved and simplified. Complete compatibility cannot be
-           guaranteed, but the new behavior should be much more predictable
-           (see patch #1104615 for details) - NN
+2006-09-29
+    changed implementation of clip-path in SVG to work around a limitation in
+    inkscape - NN
 
-2006-09-29 changed implementation of clip-path in SVG to work around a
-           limitation in inkscape - NN
+2006-09-29
+    added two options to matplotlibrc:
 
-2006-09-29 added two options to matplotlibrc:
-           svg.image_inline
-           svg.image_noscale
-           see patch #1533010 for details - NN
+    - svg.image_inline
+    - svg.image_noscale
 
-2006-09-29 axes.py: cleaned up kwargs checking - NN
+    see patch #1533010 for details - NN
 
-2006-09-29 setup.py: cleaned up setup logic - NN
+2006-09-29
+    axes.py: cleaned up kwargs checking - NN
 
-2006-09-29 setup.py: check for required pygtk versions, fixes bug #1460783 - SC
+2006-09-29
+    setup.py: cleaned up setup logic - NN
+
+2006-09-29
+    setup.py: check for required pygtk versions, fixes bug #1460783 - SC
 
 ---------------------------------
 
-2006-09-27 Released 0.87.6 at revision 2783
+2006-09-27
+    Released 0.87.6 at revision 2783
 
-2006-09-24 Added line pointers to the Annotation code, and a pylab
-           interface.  See matplotlib.text.Annotation,
-           examples/annotation_demo.py and
-           examples/annotation_demo_pylab.py - JDH
+2006-09-24
+    Added line pointers to the Annotation code, and a pylab interface.  See
+    matplotlib.text.Annotation, examples/annotation_demo.py and
+    examples/annotation_demo_pylab.py - JDH
 
-2006-09-18 mathtext2.py: The SVG backend now supports the same things that
-           the AGG backend does. Fixed some bugs with rendering, and out of
-           bounds errors in the AGG backend - ES. Changed the return values
-           of math_parse_s_ft2font_svg to support lines (fractions etc.)
+2006-09-18
+    mathtext2.py: The SVG backend now supports the same things that the AGG
+    backend does. Fixed some bugs with rendering, and out of bounds errors in
+    the AGG backend - ES. Changed the return values of math_parse_s_ft2font_svg
+    to support lines (fractions etc.)
 
-2006-09-17 Added an Annotation class to facilitate annotating objects
-           and an examples file examples/annotation_demo.py.  I want
-           to add dash support as in TextWithDash, but haven't decided
-           yet whether inheriting from TextWithDash is the right base
-           class or if another approach is needed - JDH
+2006-09-17
+    Added an Annotation class to facilitate annotating objects and an examples
+    file examples/annotation_demo.py.  I want to add dash support as in
+    TextWithDash, but haven't decided yet whether inheriting from TextWithDash
+    is the right base class or if another approach is needed - JDH
 
 ------------------------------
 
-2006-09-05 Released 0.87.5 at revision 2761
+2006-09-05
+    Released 0.87.5 at revision 2761
 
-2006-09-04 Added nxutils for some numeric add-on extension code --
-                   specifically a better/more efficient inside polygon tester (see
-                   unit/inside_poly_*.py) - JDH
+2006-09-04
+    Added nxutils for some numeric add-on extension code -- specifically a
+    better/more efficient inside polygon tester (see unit/inside_poly_*.py) -
+    JDH
 
-2006-09-04 Made bitstream fonts the rc default - JDH
+2006-09-04
+    Made bitstream fonts the rc default - JDH
 
-2006-08-31 Fixed alpha-handling bug in ColorConverter, affecting
-           collections in general and contour/contourf in
-           particular. - EF
+2006-08-31
+    Fixed alpha-handling bug in ColorConverter, affecting collections in
+    general and contour/contourf in particular. - EF
 
-2006-08-30 ft2font.cpp: Added draw_rect_filled method (now used by mathtext2
-           to draw the fraction bar) to FT2Font - ES
+2006-08-30
+    ft2font.cpp: Added draw_rect_filled method (now used by mathtext2 to draw
+    the fraction bar) to FT2Font - ES
 
-2006-08-29 setupext.py: wrap calls to tk.getvar() with str(). On some
-           systems, getvar returns a Tcl_Obj instead of a string - DSD
+2006-08-29
+    setupext.py: wrap calls to tk.getvar() with str(). On some systems, getvar
+    returns a Tcl_Obj instead of a string - DSD
 
-2006-08-28 mathtext2.py: Sub/superscripts can now be complex (i.e.
-           fractions etc.). The demo is also updated - ES
+2006-08-28
+    mathtext2.py: Sub/superscripts can now be complex (i.e.  fractions etc.).
+    The demo is also updated - ES
 
-2006-08-28 font_manager.py: Added /usr/local/share/fonts to list of
-           X11 font directories - DSD
+2006-08-28
+    font_manager.py: Added /usr/local/share/fonts to list of X11 font
+    directories - DSD
 
-2006-08-28 mahtext2.py: Initial support for complex fractions. Also,
-           rendering is now completely separated from parsing. The
-           sub/superscripts now work better.
-           Updated the mathtext2_demo.py - ES
+2006-08-28
+    mathtext2.py: Initial support for complex fractions. Also, rendering is now
+    completely separated from parsing. The sub/superscripts now work better.
+    Updated the mathtext2_demo.py - ES
 
-2006-08-27 qt backends: don't create a QApplication when backend is
-           imported, do it when the FigureCanvasQt is created. Simplifies
-           applications where mpl is embedded in qt. Updated
-           embedding_in_qt* examples - DSD
+2006-08-27
+    qt backends: don't create a QApplication when backend is imported, do it
+    when the FigureCanvasQt is created. Simplifies applications where mpl is
+    embedded in qt. Updated embedding_in_qt* examples - DSD
 
-2006-08-27 mahtext2.py: Now the fonts are searched in the OS font dir and
-           in the mpl-data dir. Also env is not a dict anymore. - ES
+2006-08-27
+    mathtext2.py: Now the fonts are searched in the OS font dir and in the
+    mpl-data dir. Also env is not a dict anymore. - ES
 
-2006-08-26 minor changes to __init__.py, mathtex2_demo.py. Added matplotlibrc
-           key "mathtext.mathtext2" (removed the key "mathtext2") - ES
+2006-08-26
+    minor changes to __init__.py, mathtex2_demo.py. Added matplotlibrc key
+    "mathtext.mathtext2" (removed the key "mathtext2") - ES
 
-2006-08-21 mathtext2.py: Initial support for fractions
-           Updated the mathtext2_demo.py
-           _mathtext_data.py: removed "\" from the unicode dicts
-           mathtext.py: Minor modification (because of _mathtext_data.py)- ES
+2006-08-21
+    mathtext2.py: Initial support for fractions Updated the mathtext2_demo.py
+    _mathtext_data.py: removed "\" from the unicode dicts mathtext.py: Minor
+    modification (because of _mathtext_data.py)- ES
 
-2006-08-20 Added mathtext2.py: Replacement for mathtext.py. Supports _ ^,
-           \rm, \cal etc., \sin, \cos etc., unicode, recursive nestings,
-           inline math mode. The only backend currently supported is Agg
-           __init__.py: added new rc params for mathtext2
-           added mathtext2_demo.py example - ES
+2006-08-20
+    Added mathtext2.py: Replacement for mathtext.py. Supports _ ^, \rm, \cal
+    etc., \sin, \cos etc., unicode, recursive nestings, inline math mode. The
+    only backend currently supported is Agg __init__.py: added new rc params
+    for mathtext2 added mathtext2_demo.py example - ES
 
-2006-08-19 Added embedding_in_qt4.py example - DSD
+2006-08-19
+    Added embedding_in_qt4.py example - DSD
 
-2006-08-11 Added scale free Ellipse patch for Agg - CM
+2006-08-11
+    Added scale free Ellipse patch for Agg - CM
 
-2006-08-10 Added converters to and from julian dates to matplotlib.dates
-           (num2julian and julian2num) - JDH
+2006-08-10
+    Added converters to and from julian dates to matplotlib.dates (num2julian
+    and julian2num) - JDH
 
-2006-08-08 Fixed widget locking so multiple widgets could share the
-           event handling - JDH
+2006-08-08
+    Fixed widget locking so multiple widgets could share the event handling -
+    JDH
 
-2006-08-07 Added scale free Ellipse patch to SVG and PS - CM
+2006-08-07
+    Added scale free Ellipse patch to SVG and PS - CM
 
-2006-08-05 Re-organized imports in numerix for numpy 1.0b2 -- TEO
+2006-08-05
+    Re-organized imports in numerix for numpy 1.0b2 -- TEO
 
-2006-08-04 Added draw_markers to PDF backend. - JKS
+2006-08-04
+    Added draw_markers to PDF backend. - JKS
 
-2006-08-01 Fixed a bug in postscript's rendering of dashed lines - DSD
+2006-08-01
+    Fixed a bug in postscript's rendering of dashed lines - DSD
 
-2006-08-01 figure.py: savefig() update docstring to add support for 'format'
-           argument.
-           backend_cairo.py: print_figure() add support 'format' argument. - SC
+2006-08-01
+    figure.py: savefig() update docstring to add support for 'format' argument.
+    backend_cairo.py: print_figure() add support 'format' argument. - SC
 
-2006-07-31 Don't let postscript's xpdf distiller compress images - DSD
+2006-07-31
+    Don't let postscript's xpdf distiller compress images - DSD
 
-2006-07-31 Added shallowcopy() methods to all Transformations;
-           removed copy_bbox_transform and copy_bbox_transform_shallow
-           from transforms.py;
-           added offset_copy() function to transforms.py to
-           facilitate positioning artists with offsets.
-           See examples/transoffset.py. - EF
+2006-07-31
+    Added shallowcopy() methods to all Transformations; removed
+    copy_bbox_transform and copy_bbox_transform_shallow from transforms.py;
+    added offset_copy() function to transforms.py to facilitate positioning
+    artists with offsets.  See examples/transoffset.py. - EF
 
-2006-07-31 Don't let postscript's xpdf distiller compress images - DSD
+2006-07-31
+    Don't let postscript's xpdf distiller compress images - DSD
 
-2006-07-29 Fixed numerix polygon bug reported by Nick Fotopoulos.
-           Added inverse_numerix_xy() transform method.
-           Made autoscale_view() preserve axis direction
-           (e.g., increasing down).- EF
+2006-07-29
+    Fixed numerix polygon bug reported by Nick Fotopoulos.  Added
+    inverse_numerix_xy() transform method.  Made autoscale_view() preserve axis
+    direction (e.g., increasing down).- EF
 
-2006-07-28 Added shallow bbox copy routine for transforms -- mainly
-           useful for copying transforms to apply offset to. - JDH
+2006-07-28
+    Added shallow bbox copy routine for transforms -- mainly useful for copying
+    transforms to apply offset to. - JDH
 
-2006-07-28 Added resize method to FigureManager class
-           for Qt and Gtk backend - CM
+2006-07-28
+    Added resize method to FigureManager class for Qt and Gtk backend - CM
 
-2006-07-28 Added subplots_adjust button to Qt backend - CM
+2006-07-28
+    Added subplots_adjust button to Qt backend - CM
 
-2006-07-26 Use numerix more in collections.
-           Quiver now handles masked arrays. - EF
+2006-07-26
+    Use numerix more in collections.  Quiver now handles masked arrays. - EF
 
-2006-07-22 Fixed bug #1209354 - DSD
+2006-07-22
+    Fixed bug #1209354 - DSD
 
-2006-07-22 make scatter() work with the kwarg "color". Closes bug
-           1285750 - DSD
+2006-07-22
+    make scatter() work with the kwarg "color". Closes bug 1285750 - DSD
 
-2006-07-20 backend_cairo.py: require pycairo 1.2.0.
-           print_figure() update to output SVG using cairo.
+2006-07-20
+    backend_cairo.py: require pycairo 1.2.0.  print_figure() update to output
+    SVG using cairo.
 
-2006-07-19 Added blitting for Qt4Agg - CM
+2006-07-19
+    Added blitting for Qt4Agg - CM
 
-2006-07-19 Added lasso widget and example examples/lasso_demo.py - JDH
+2006-07-19
+    Added lasso widget and example examples/lasso_demo.py - JDH
 
-2006-07-18 Added blitting for QtAgg backend - CM
+2006-07-18
+    Added blitting for QtAgg backend - CM
 
-2006-07-17 Fixed bug #1523585: skip nans in semilog plots - DSD
+2006-07-17
+    Fixed bug #1523585: skip nans in semilog plots - DSD
 
-2006-07-12 Add support to render the scientific notation label
-           over the right-side y-axis - DSD
+2006-07-12
+    Add support to render the scientific notation label over the right-side
+    y-axis - DSD
 
 ------------------------------
 
-2006-07-11 Released 0.87.4 at revision 2558
-
-2006-07-07 Fixed a usetex bug with older versions of latex - DSD
-
-2006-07-07 Add compatibility for NumPy 1.0 - TEO
-
-2006-06-29 Added a Qt4Agg backend. Thank you James Amundson - DSD
-
-2006-06-26 Fixed a usetex bug. On Windows, usetex will process
-           postscript output in the current directory rather than
-           in a temp directory. This is due to the use of spaces
-           and tildes in windows paths, which cause problems with
-           latex. The subprocess module is no longer used. - DSD
-
-2006-06-22 Various changes to bar(), barh(), and hist().
-           Added 'edgecolor' keyword arg to bar() and barh().
-           The x and y args in barh() have been renamed to width
-           and bottom respectively, and their order has been swapped
-           to maintain a (position, value) order ala matlab. left,
-           height, width and bottom args can now all be scalars or
-           sequences. barh() now defaults to edge alignment instead
-           of center alignment. Added a keyword arg 'align' to bar(),
-           barh() and hist() that controls between edge or center bar
-           alignment. Fixed ignoring the rcParams['patch.facecolor']
-           for bar color in bar() and barh(). Fixed ignoring the
-           rcParams['lines.color'] for error bar color in bar()
-           and barh(). Fixed a bug where patches would be cleared
-           when error bars were plotted if rcParams['axes.hold']
-           was False. - MAS
-
-2006-06-22 Added support for numerix 2-D arrays as alternatives to
-           a sequence of (x,y) tuples for specifying paths in
-           collections, quiver, contour, pcolor, transforms.
-           Fixed contour bug involving setting limits for
-           colormapping.  Added numpy-style all() to numerix. - EF
-
-2006-06-20 Added custom FigureClass hook to pylab interface - see
-           examples/custom_figure_class.py
-
-2006-06-16 Added colormaps from gist (gist_earth, gist_stern,
-           gist_rainbow, gist_gray, gist_yarg, gist_heat, gist_ncar) - JW
-
-2006-06-16 Added a pointer to parent in figure canvas so you can
-           access the container with fig.canvas.manager.  Useful if
-           you want to set the window title, e.g., in gtk
-           fig.canvas.manager.window.set_title, though a GUI neutral
-           method would be preferable JDH
-
-2006-06-16 Fixed colorbar.py to handle indexed colors (i.e.,
-           norm = no_norm()) by centering each colored region
-           on its index. - EF
-
-2006-06-15 Added scalex and scaley to Axes.autoscale_view to support
-           selective autoscaling just the x or y axis, and supported
-           these command in plot so you can say plot(something,
-           scaley=False) and just the x axis will be autoscaled.
-           Modified axvline and axhline to support this, so for
-           example axvline will no longer autoscale the y axis. JDH
-
-2006-06-13 Fix so numpy updates are backward compatible - TEO
-
-2006-06-12 Updated numerix to handle numpy restructuring of
-           oldnumeric - TEO
-
-2006-06-12 Updated numerix.fft to handle numpy restructuring
-           Added ImportError to numerix.linear_algebra for numpy -TEO
-
-2006-06-11 Added quiverkey command to pylab and Axes, using
-           QuiverKey class in quiver.py.  Changed pylab and Axes
-           to use quiver2 if possible, but drop back to the
-           newly-renamed quiver_classic if necessary.  Modified
-           examples/quiver_demo.py to illustrate the new quiver
-           and quiverkey.  Changed LineCollection implementation
-           slightly to improve compatibility with PolyCollection. - EF
-
-2006-06-11 Fixed a usetex bug for windows, running latex on files
-           with spaces in their names or paths was failing - DSD
-
-2006-06-09 Made additions to numerix, changes to quiver to make it
-           work with all numeric flavors. - EF
-
-2006-06-09 Added quiver2 function to pylab and method to axes,
-           with implementation via a Quiver class in quiver.py.
-           quiver2 will replace quiver before the next release;
-           it is placed alongside it initially to facilitate
-           testing and transition. See also
-           examples/quiver2_demo.py. - EF
-
-2006-06-08 Minor bug fix to make ticker.py draw proper minus signs
-           with usetex - DSD
+2006-07-11
+    Released 0.87.4 at revision 2558
+
+2006-07-07
+    Fixed a usetex bug with older versions of latex - DSD
+
+2006-07-07
+    Add compatibility for NumPy 1.0 - TEO
+
+2006-06-29
+    Added a Qt4Agg backend. Thank you James Amundson - DSD
+
+2006-06-26
+    Fixed a usetex bug. On Windows, usetex will process postscript output in
+    the current directory rather than in a temp directory. This is due to the
+    use of spaces and tildes in windows paths, which cause problems with latex.
+    The subprocess module is no longer used. - DSD
+
+2006-06-22
+    Various changes to bar(), barh(), and hist().  Added 'edgecolor' keyword
+    arg to bar() and barh().  The x and y args in barh() have been renamed to
+    width and bottom respectively, and their order has been swapped to maintain
+    a (position, value) order ala matlab. left, height, width and bottom args
+    can now all be scalars or sequences. barh() now defaults to edge alignment
+    instead of center alignment. Added a keyword arg 'align' to bar(), barh()
+    and hist() that controls between edge or center bar alignment. Fixed
+    ignoring the rcParams['patch.facecolor'] for bar color in bar() and barh().
+    Fixed ignoring the rcParams['lines.color'] for error bar color in bar() and
+    barh(). Fixed a bug where patches would be cleared when error bars were
+    plotted if rcParams['axes.hold'] was False. - MAS
+
+2006-06-22
+    Added support for numerix 2-D arrays as alternatives to a sequence of (x,y)
+    tuples for specifying paths in collections, quiver, contour, pcolor,
+    transforms.  Fixed contour bug involving setting limits for colormapping.
+    Added numpy-style all() to numerix. - EF
+
+2006-06-20
+    Added custom FigureClass hook to pylab interface - see
+    examples/custom_figure_class.py
+
+2006-06-16
+    Added colormaps from gist (gist_earth, gist_stern, gist_rainbow, gist_gray,
+    gist_yarg, gist_heat, gist_ncar) - JW
+
+2006-06-16
+    Added a pointer to parent in figure canvas so you can access the container
+    with fig.canvas.manager.  Useful if you want to set the window title, e.g.,
+    in gtk fig.canvas.manager.window.set_title, though a GUI neutral method
+    would be preferable JDH
+
+2006-06-16
+    Fixed colorbar.py to handle indexed colors (i.e., norm = no_norm()) by
+    centering each colored region on its index. - EF
+
+2006-06-15
+    Added scalex and scaley to Axes.autoscale_view to support selective
+    autoscaling just the x or y axis, and supported these command in plot so
+    you can say plot(something, scaley=False) and just the x axis will be
+    autoscaled.  Modified axvline and axhline to support this, so for example
+    axvline will no longer autoscale the y axis. JDH
+
+2006-06-13
+    Fix so numpy updates are backward compatible - TEO
+
+2006-06-12
+    Updated numerix to handle numpy restructuring of oldnumeric - TEO
+
+2006-06-12
+    Updated numerix.fft to handle numpy restructuring Added ImportError to
+    numerix.linear_algebra for numpy -TEO
+
+2006-06-11
+    Added quiverkey command to pylab and Axes, using QuiverKey class in
+    quiver.py.  Changed pylab and Axes to use quiver2 if possible, but drop
+    back to the newly-renamed quiver_classic if necessary.  Modified
+    examples/quiver_demo.py to illustrate the new quiver and quiverkey.
+    Changed LineCollection implementation slightly to improve compatibility
+    with PolyCollection. - EF
+
+2006-06-11
+    Fixed a usetex bug for windows, running latex on files with spaces in their
+    names or paths was failing - DSD
+
+2006-06-09
+    Made additions to numerix, changes to quiver to make it work with all
+    numeric flavors. - EF
+
+2006-06-09
+    Added quiver2 function to pylab and method to axes, with implementation via
+    a Quiver class in quiver.py.  quiver2 will replace quiver before the next
+    release; it is placed alongside it initially to facilitate testing and
+    transition. See also examples/quiver2_demo.py. - EF
+
+2006-06-08
+    Minor bug fix to make ticker.py draw proper minus signs with usetex - DSD
 
 -----------------------
 
-2006-06-06 Released 0.87.3 at revision 2432
-
-2006-05-30 More partial support for polygons with outline or fill,
-           but not both.  Made LineCollection inherit from
-           ScalarMappable. - EF
+2006-06-06
+    Released 0.87.3 at revision 2432
 
-2006-05-29 Yet another revision of aspect-ratio handling. - EF
+2006-05-30
+    More partial support for polygons with outline or fill, but not both.  Made
+    LineCollection inherit from ScalarMappable. - EF
 
-2006-05-27 Committed a patch to prevent stroking zero-width lines in
-           the svg backend - DSD
+2006-05-29
+    Yet another revision of aspect-ratio handling. - EF
 
-2006-05-24 Fixed colorbar positioning bug identified by Helge
-           Avlesen, and improved the algorithm; added a 'pad'
-           kwarg to control the spacing between colorbar and
-           parent axes. - EF
+2006-05-27
+    Committed a patch to prevent stroking zero-width lines in the svg backend -
+    DSD
 
-2006-05-23 Changed color handling so that collection initializers
-           can take any mpl color arg or sequence of args; deprecated
-           float as grayscale, replaced by string representation of
-           float. - EF
+2006-05-24
+    Fixed colorbar positioning bug identified by Helge Avlesen, and improved
+    the algorithm; added a 'pad' kwarg to control the spacing between colorbar
+    and parent axes. - EF
 
-2006-05-19 Fixed bug: plot failed if all points were masked - EF
+2006-05-23
+    Changed color handling so that collection initializers can take any mpl
+    color arg or sequence of args; deprecated float as grayscale, replaced by
+    string representation of float. - EF
 
-2006-05-19 Added custom symbol option to scatter - JDH
+2006-05-19
+    Fixed bug: plot failed if all points were masked - EF
 
-2006-05-18 New example, multi_image.py; colorbar fixed to show
-           offset text when the ScalarFormatter is used; FixedFormatter
-           augmented to accept and display offset text. - EF
+2006-05-19
+    Added custom symbol option to scatter - JDH
 
-2006-05-14 New colorbar; old one is renamed to colorbar_classic.
-           New colorbar code is in colorbar.py, with wrappers in
-           figure.py and pylab.py.
-           Fixed aspect-handling bug reported by Michael Mossey.
-           Made backend_bases.draw_quad_mesh() run.- EF
+2006-05-18
+    New example, multi_image.py; colorbar fixed to show offset text when the
+    ScalarFormatter is used; FixedFormatter augmented to accept and display
+    offset text. - EF
 
-2006-05-08 Changed handling of end ranges in contourf: replaced
-           "clip-ends" kwarg with "extend".  See docstring for
-           details. -EF
+2006-05-14
+    New colorbar; old one is renamed to colorbar_classic.  New colorbar code is
+    in colorbar.py, with wrappers in figure.py and pylab.py.  Fixed
+    aspect-handling bug reported by Michael Mossey.  Made
+    backend_bases.draw_quad_mesh() run.- EF
 
-2006-05-08 Added axisbelow to rc - JDH
+2006-05-08
+    Changed handling of end ranges in contourf: replaced "clip-ends" kwarg with
+    "extend".  See docstring for details. -EF
 
-2006-05-08 If using PyGTK require version 2.2+ - SC
+2006-05-08
+    Added axisbelow to rc - JDH
 
-2006-04-19 Added compression support to PDF backend, controlled by
-           new pdf.compression rc setting. - JKS
+2006-05-08
+    If using PyGTK require version 2.2+ - SC
 
-2006-04-19 Added Jouni's PDF backend
+2006-04-19
+    Added compression support to PDF backend, controlled by new pdf.compression
+    rc setting. - JKS
 
-2006-04-18 Fixed a bug that caused agg to not render long lines
+2006-04-19
+    Added Jouni's PDF backend
 
-2006-04-16 Masked array support for pcolormesh; made pcolormesh support the
-           same combinations of X,Y,C dimensions as pcolor does;
-           improved (I hope) description of grid used in pcolor,
-           pcolormesh. - EF
+2006-04-18
+    Fixed a bug that caused agg to not render long lines
 
-2006-04-14 Reorganized axes.py - EF
+2006-04-16
+    Masked array support for pcolormesh; made pcolormesh support the same
+    combinations of X,Y,C dimensions as pcolor does; improved (I hope)
+    description of grid used in pcolor, pcolormesh. - EF
 
-2006-04-13 Fixed a bug Ryan found using usetex with sans-serif fonts and
-           exponential tick labels - DSD
+2006-04-14
+    Reorganized axes.py - EF
 
-2006-04-11 Refactored backend_ps and backend_agg to prevent module-level
-           texmanager imports. Now these imports only occur if text.usetex
-           rc setting is true - DSD
+2006-04-13
+    Fixed a bug Ryan found using usetex with sans-serif fonts and exponential
+    tick labels - DSD
 
-2006-04-10 Committed changes required for building mpl on win32
-           platforms with visual studio.  This allows wxpython
-           blitting for fast animations. - CM
+2006-04-11
+    Refactored backend_ps and backend_agg to prevent module-level texmanager
+    imports. Now these imports only occur if text.usetex rc setting is true -
+    DSD
 
-2006-04-10 Fixed an off-by-one bug in Axes.change_geometry.
+2006-04-10
+    Committed changes required for building mpl on win32 platforms with visual
+    studio.  This allows wxpython blitting for fast animations. - CM
 
-2006-04-10 Fixed bug in pie charts where wedge wouldn't have label in
-           legend. Submitted by Simon Hildebrandt. - ADS
+2006-04-10
+    Fixed an off-by-one bug in Axes.change_geometry.
 
-2006-05-06 Usetex makes temporary latex and dvi files in a temporary
-           directory, rather than in the user's current working
-           directory - DSD
+2006-04-10
+    Fixed bug in pie charts where wedge wouldn't have label in legend.
+    Submitted by Simon Hildebrandt. - ADS
 
-2006-04-05 Applied Ken's wx deprecation warning patch closing sf patch
-           #1465371 - JDH
+2006-05-06
+    Usetex makes temporary latex and dvi files in a temporary directory, rather
+    than in the user's current working directory - DSD
 
-2006-04-05 Added support for the new API in the postscript backend.
-           Allows values to be masked using nan's, and faster file
-           creation - DSD
+2006-04-05
+    Applied Ken's wx deprecation warning patch closing sf patch #1465371 - JDH
 
-2006-04-05 Use python's subprocess module for usetex calls to
-           external programs. subprocess catches when they exit
-           abnormally so an error can be raised. - DSD
+2006-04-05
+    Added support for the new API in the postscript backend.  Allows values to
+    be masked using nan's, and faster file creation - DSD
 
-2006-04-03 Fixed the bug in which widgets would not respond to
-           events.  This regressed the twinx functionality, so I
-           also updated subplots_adjust to update axes that share
-           an x or y with a subplot instance. - CM
+2006-04-05
+    Use python's subprocess module for usetex calls to external programs.
+    subprocess catches when they exit abnormally so an error can be raised. -
+    DSD
 
-2006-04-02 Moved PBox class to transforms and deleted pbox.py;
-           made pylab axis command a thin wrapper for Axes.axis;
-           more tweaks to aspect-ratio handling; fixed Axes.specgram
-           to account for the new imshow default of unit aspect
-           ratio; made contour set the Axes.dataLim. - EF
+2006-04-03
+    Fixed the bug in which widgets would not respond to events.  This regressed
+    the twinx functionality, so I also updated subplots_adjust to update axes
+    that share an x or y with a subplot instance. - CM
 
-2006-03-31 Fixed the Qt "Underlying C/C++ object deleted" bug. - JRE
+2006-04-02
+    Moved PBox class to transforms and deleted pbox.py; made pylab axis command
+    a thin wrapper for Axes.axis; more tweaks to aspect-ratio handling; fixed
+    Axes.specgram to account for the new imshow default of unit aspect ratio;
+    made contour set the Axes.dataLim. - EF
 
-2006-03-31 Applied Vasily Sulatskov's Qt Navigation Toolbar enhancement. - JRE
+2006-03-31
+    Fixed the Qt "Underlying C/C++ object deleted" bug. - JRE
 
-2006-03-31 Ported Norbert's rewriting of Halldor's stineman_interp
-           algorithm to make it numerix compatible and added code to
-           matplotlib.mlab.  See examples/interp_demo.py - JDH
+2006-03-31
+    Applied Vasily Sulatskov's Qt Navigation Toolbar enhancement. - JRE
 
-2006-03-30 Fixed a bug in aspect ratio handling; blocked potential
-           crashes when panning with button 3; added axis('image')
-           support. - EF
+2006-03-31
+    Ported Norbert's rewriting of Halldor's stineman_interp algorithm to make
+    it numerix compatible and added code to matplotlib.mlab.  See
+    examples/interp_demo.py - JDH
 
-2006-03-28 More changes to aspect ratio handling; new PBox class
-           in new file pbox.py to facilitate resizing and repositioning
-           axes; made PolarAxes maintain unit aspect ratio. - EF
+2006-03-30
+    Fixed a bug in aspect ratio handling; blocked potential crashes when
+    panning with button 3; added axis('image') support. - EF
 
-2006-03-23 Refactored TextWithDash class to inherit from, rather than
-           delegate to, the Text class. Improves object inspection
-           and closes bug # 1357969 - DSD
+2006-03-28
+    More changes to aspect ratio handling; new PBox class in new file pbox.py
+    to facilitate resizing and repositioning axes; made PolarAxes maintain unit
+    aspect ratio. - EF
 
-2006-03-22 Improved aspect ratio handling, including pylab interface.
-           Interactive resizing, pan, zoom of images and plots
-           (including panels with a shared axis) should work.
-           Additions and possible refactoring are still likely. - EF
+2006-03-23
+    Refactored TextWithDash class to inherit from, rather than delegate to, the
+    Text class. Improves object inspection and closes bug # 1357969 - DSD
 
-2006-03-21 Added another colorbrewer colormap (RdYlBu) - JSWHIT
+2006-03-22
+    Improved aspect ratio handling, including pylab interface.  Interactive
+    resizing, pan, zoom of images and plots (including panels with a shared
+    axis) should work.  Additions and possible refactoring are still likely. -
+    EF
 
-2006-03-21 Fixed tickmarks for logscale plots over very large ranges.
-           Closes bug # 1232920 - DSD
+2006-03-21
+    Added another colorbrewer colormap (RdYlBu) - JSWHIT
 
-2006-03-21 Added Rob Knight's arrow code; see examples/arrow_demo.py - JDH
+2006-03-21
+    Fixed tickmarks for logscale plots over very large ranges.  Closes bug #
+    1232920 - DSD
 
-2006-03-20 Added support for masking values with nan's, using ADS's
-           isnan module and the new API. Works for \*Agg backends - DSD
+2006-03-21
+    Added Rob Knight's arrow code; see examples/arrow_demo.py - JDH
 
-2006-03-20 Added contour.negative_linestyle rcParam - ADS
+2006-03-20
+    Added support for masking values with nan's, using ADS's isnan module and
+    the new API. Works for \*Agg backends - DSD
 
-2006-03-20 Added _isnan extension module to test for nan with Numeric
-           - ADS
+2006-03-20
+    Added contour.negative_linestyle rcParam - ADS
 
-2006-03-17 Added Paul and Alex's support for faceting with quadmesh
-           in sf patch 1411223 - JDH
+2006-03-20
+    Added _isnan extension module to test for nan with Numeric - ADS
 
-2006-03-17 Added Charle Twardy's pie patch to support colors=None.
-           Closes sf patch 1387861 - JDH
+2006-03-17
+    Added Paul and Alex's support for faceting with quadmesh in sf patch
+    1411223 - JDH
 
-2006-03-17 Applied sophana's patch to support overlapping axes with
-           toolbar navigation by toggling activation with the 'a' key.
-           Closes sf patch 1432252 - JDH
+2006-03-17
+    Added Charle Twardy's pie patch to support colors=None.  Closes sf patch
+    1387861 - JDH
 
-2006-03-17 Applied Aarre's linestyle patch for backend EMF; closes sf
-           patch 1449279 - JDH
+2006-03-17
+    Applied sophana's patch to support overlapping axes with toolbar navigation
+    by toggling activation with the 'a' key.  Closes sf patch 1432252 - JDH
 
-2006-03-17 Applied  Jordan Dawe's patch to support kwarg properties
-           for grid lines in the grid command.  Closes sf patch
-           1451661 - JDH
+2006-03-17
+    Applied Aarre's linestyle patch for backend EMF; closes sf patch 1449279 -
+    JDH
 
-2006-03-17 Center postscript output on page when using usetex - DSD
+2006-03-17
+    Applied  Jordan Dawe's patch to support kwarg properties for grid lines in
+    the grid command.  Closes sf patch 1451661 - JDH
 
-2006-03-17 subprocess module built if Python <2.4 even if subprocess
-           can be imported from an egg - ADS
+2006-03-17
+    Center postscript output on page when using usetex - DSD
 
-2006-03-17 Added _subprocess.c from Python upstream and hopefully
-           enabled building (without breaking) on Windows, although
-           not tested. - ADS
+2006-03-17
+    subprocess module built if Python <2.4 even if subprocess can be imported
+    from an egg - ADS
 
-2006-03-17 Updated subprocess.py to latest Python upstream and
-           reverted name back to subprocess.py - ADS
+2006-03-17
+    Added _subprocess.c from Python upstream and hopefully enabled building
+    (without breaking) on Windows, although not tested. - ADS
 
-2006-03-16 Added John Porter's 3D handling code
+2006-03-17
+    Updated subprocess.py to latest Python upstream and reverted name back to
+    subprocess.py - ADS
 
+2006-03-16
+    Added John Porter's 3D handling code
 
 ------------------------
 
-2006-03-16 Released 0.87.2 at revision 2150
+2006-03-16
+    Released 0.87.2 at revision 2150
 
-2006-03-15 Fixed bug in MaxNLocator revealed by daigos@infinito.it.
-           The main change is that Locator.nonsingular now adjusts
-           vmin and vmax if they are nearly the same, not just if
-           they are equal.  A new kwarg, "tiny", sets the threshold. -
-           EF
+2006-03-15
+    Fixed bug in MaxNLocator revealed by daigos@infinito.it.  The main change
+    is that Locator.nonsingular now adjusts vmin and vmax if they are nearly
+    the same, not just if they are equal.  A new kwarg, "tiny", sets the
+    threshold. - EF
 
-2006-03-14 Added import of compatibility library for newer numpy
-           linear_algebra - TEO
+2006-03-14
+    Added import of compatibility library for newer numpy linear_algebra - TEO
 
-2006-03-12 Extended "load" function to support individual columns and
-           moved "load" and "save" into matplotlib.mlab so they can be
-           used outside of pylab -- see examples/load_converter.py -
-           JDH
+2006-03-12
+    Extended "load" function to support individual columns and moved "load" and
+    "save" into matplotlib.mlab so they can be used outside of pylab -- see
+    examples/load_converter.py - JDH
 
-2006-03-12 Added AutoDateFormatter and AutoDateLocator submitted
-           by James Evans. Try the load_converter.py example for a
-           demo. - ADS
+2006-03-12
+    Added AutoDateFormatter and AutoDateLocator submitted by James Evans. Try
+    the load_converter.py example for a demo. - ADS
 
-2006-03-11 Added subprocess module from python-2.4 - DSD
+2006-03-11
+    Added subprocess module from python-2.4 - DSD
 
-2006-03-11 Fixed landscape orientation support with the usetex
-           option. The backend_ps print_figure method was
-           getting complicated, I added a _print_figure_tex
-           method to maintain some degree of sanity - DSD
+2006-03-11
+    Fixed landscape orientation support with the usetex option. The backend_ps
+    print_figure method was getting complicated, I added a _print_figure_tex
+    method to maintain some degree of sanity - DSD
 
-2006-03-11 Added "papertype" savefig kwarg for setting
-           postscript papersizes. papertype and ps.papersize
-           rc setting can also be set to "auto" to autoscale
-           pagesizes - DSD
+2006-03-11
+    Added "papertype" savefig kwarg for setting postscript papersizes.
+    papertype and ps.papersize rc setting can also be set to "auto" to
+    autoscale pagesizes - DSD
 
-2006-03-09 Apply P-J's patch to make pstoeps work on windows
-           patch report # 1445612 - DSD
+2006-03-09
+    Apply P-J's patch to make pstoeps work on windows patch report # 1445612 -
+    DSD
 
-2006-03-09 Make backend rc parameter case-insensitive - DSD
+2006-03-09
+    Make backend rc parameter case-insensitive - DSD
 
-2006-03-07 Fixed bug in backend_ps related to C0-C6 papersizes,
-           which were causing problems with postscript viewers.
-           Supported page sizes include letter, legal, ledger,
-           A0-A10, and B0-B10 - DSD
+2006-03-07
+    Fixed bug in backend_ps related to C0-C6 papersizes, which were causing
+    problems with postscript viewers.  Supported page sizes include letter,
+    legal, ledger, A0-A10, and B0-B10 - DSD
 
 ------------------------------------
 
-2006-03-07 Released 0.87.1
+2006-03-07
+    Released 0.87.1
 
-2006-03-04 backend_cairo.py:
-           fix get_rgb() bug reported by Keith Briggs.
-           Require pycairo 1.0.2.
-           Support saving png to file-like objects. - SC
+2006-03-04
+    backend_cairo.py: fix get_rgb() bug reported by Keith Briggs.  Require
+    pycairo 1.0.2.  Support saving png to file-like objects. - SC
 
-2006-03-03 Fixed pcolor handling of vmin, vmax - EF
+2006-03-03
+    Fixed pcolor handling of vmin, vmax - EF
 
-2006-03-02 improve page sizing with usetex with the latex
-           geometry package. Closes bug # 1441629 - DSD
+2006-03-02
+    improve page sizing with usetex with the latex geometry package. Closes bug
+    # 1441629 - DSD
 
-2006-03-02 Fixed dpi problem with usetex png output. Accepted a
-           modified version of patch # 1441809 - DSD
+2006-03-02
+    Fixed dpi problem with usetex png output. Accepted a modified version of
+    patch # 1441809 - DSD
 
-2006-03-01 Fixed axis('scaled') to deal with case xmax < xmin - JSWHIT
+2006-03-01
+    Fixed axis('scaled') to deal with case xmax < xmin - JSWHIT
 
-2006-03-01 Added reversed colormaps (with '_r' appended to name) - JSWHIT
+2006-03-01
+    Added reversed colormaps (with '_r' appended to name) - JSWHIT
 
-2006-02-27 Improved eps bounding boxes with usetex - DSD
+2006-02-27
+    Improved eps bounding boxes with usetex - DSD
 
-2006-02-27 Test svn commit, again!
+2006-02-27
+    Test svn commit, again!
 
-2006-02-27 Fixed two dependency checking bugs related to usetex
-           on Windows - DSD
+2006-02-27
+    Fixed two dependency checking bugs related to usetex on Windows - DSD
 
-2006-02-27 Made the rc deprecation warnings a little more human
-           readable.
+2006-02-27
+    Made the rc deprecation warnings a little more human readable.
 
-2006-02-26 Update the previous gtk.main_quit() bug fix to use gtk.main_level()
-           - SC
+2006-02-26
+    Update the previous gtk.main_quit() bug fix to use gtk.main_level() - SC
 
-2006-02-24 Implemented alpha support in contour and contourf - EF
+2006-02-24
+    Implemented alpha support in contour and contourf - EF
 
-2006-02-22 Fixed gtk main quit bug when quit was called before
-           mainloop. - JDH
+2006-02-22
+    Fixed gtk main quit bug when quit was called before mainloop. - JDH
 
-2006-02-22 Small change to colors.py to workaround apparent
-           bug in numpy masked array module - JSWHIT
+2006-02-22
+    Small change to colors.py to workaround apparent bug in numpy masked array
+    module - JSWHIT
 
-2006-02-22 Fixed bug in ScalarMappable.to_rgba() reported by
-           Ray Jones, and fixed incorrect fix found by Jeff
-           Whitaker - EF
+2006-02-22
+    Fixed bug in ScalarMappable.to_rgba() reported by Ray Jones, and fixed
+    incorrect fix found by Jeff Whitaker - EF
 
 --------------------------------
 
-2006-02-22 Released 0.87
+2006-02-22
+    Released 0.87
 
-2006-02-21 Fixed portrait/landscape orientation in postscript backend - DSD
+2006-02-21
+    Fixed portrait/landscape orientation in postscript backend - DSD
 
-2006-02-21 Fix bug introduced in yesterday's bug fix - SC
+2006-02-21
+    Fix bug introduced in yesterday's bug fix - SC
 
-2006-02-20 backend_gtk.py FigureCanvasGTK.draw(): fix bug reported by
-           David Tremouilles - SC
+2006-02-20
+    backend_gtk.py FigureCanvasGTK.draw(): fix bug reported by David
+    Tremouilles - SC
 
-2006-02-20 Remove the "pygtk.require('2.4')" error from
-           examples/embedding_in_gtk2.py - SC
+2006-02-20
+    Remove the "pygtk.require('2.4')" error from examples/embedding_in_gtk2.py
+    - SC
 
-2006-02-18 backend_gtk.py FigureCanvasGTK.draw(): simplify to use (rather than
-           duplicate) the expose_event() drawing code - SC
+2006-02-18
+    backend_gtk.py FigureCanvasGTK.draw(): simplify to use (rather than
+    duplicate) the expose_event() drawing code - SC
 
-2006-02-12 Added stagger or waterfall plot capability to LineCollection;
-           illustrated in examples/collections.py. - EF
+2006-02-12
+    Added stagger or waterfall plot capability to LineCollection; illustrated
+    in examples/collections.py. - EF
 
-2006-02-11 Massive cleanup of the usetex code in the postscript backend. Possibly
-           fixed the clipping issue users were reporting with older versions of
-           ghostscript - DSD
+2006-02-11
+    Massive cleanup of the usetex code in the postscript backend. Possibly
+    fixed the clipping issue users were reporting with older versions of
+    ghostscript - DSD
 
-2006-02-11 Added autolim kwarg to axes.add_collection.  Changed
-           collection get_verts() methods accordingly. - EF
+2006-02-11
+    Added autolim kwarg to axes.add_collection.  Changed collection get_verts()
+    methods accordingly. - EF
 
-2006-02-09 added a temporary rc parameter text.dvipnghack, to allow Mac users to get nice
-           results with the usetex option. - DSD
+2006-02-09
+    added a temporary rc parameter text.dvipnghack, to allow Mac users to get
+    nice results with the usetex option. - DSD
 
-2006-02-09 Fixed a bug related to setting font sizes with the usetex option. - DSD
+2006-02-09
+    Fixed a bug related to setting font sizes with the usetex option. - DSD
 
-2006-02-09 Fixed a bug related to usetex's latex code. - DSD
+2006-02-09
+    Fixed a bug related to usetex's latex code. - DSD
 
-2006-02-09 Modified behavior of font.size rc setting. You should define font.size in pts,
-           which will set the "medium" or default fontsize. Special text sizes like axis
-           labels or tick labels can be given relative font sizes like small, large,
-           x-large, etc. and will scale accordingly. - DSD
+2006-02-09
+    Modified behavior of font.size rc setting. You should define font.size in
+    pts, which will set the "medium" or default fontsize. Special text sizes
+    like axis labels or tick labels can be given relative font sizes like
+    small, large, x-large, etc. and will scale accordingly. - DSD
 
-2006-02-08 Added py2exe specific datapath check again.  Also added new
-           py2exe helper function get_py2exe_datafiles for use in py2exe
-           setup.py scripts. - CM
+2006-02-08
+    Added py2exe specific datapath check again.  Also added new py2exe helper
+    function get_py2exe_datafiles for use in py2exe setup.py scripts. - CM
 
-2006-02-02 Added box function to pylab
+2006-02-02
+    Added box function to pylab
 
-2006-02-02 Fixed a problem in setupext.py, tk library formatted in unicode
-           caused build problems - DSD
+2006-02-02
+    Fixed a problem in setupext.py, tk library formatted in unicode caused
+    build problems - DSD
 
-2006-02-01 Dropped TeX engine support in usetex to focus on LaTeX. - DSD
+2006-02-01
+    Dropped TeX engine support in usetex to focus on LaTeX. - DSD
 
-2006-01-29 Improved usetex option to respect the serif, sans-serif, monospace,
-           and cursive rc settings. Removed the font.latex.package rc setting,
-           it is no longer required - DSD
+2006-01-29
+    Improved usetex option to respect the serif, sans-serif, monospace, and
+    cursive rc settings. Removed the font.latex.package rc setting, it is no
+    longer required - DSD
 
-2006-01-29 Fixed tex's caching to include font.family rc information - DSD
+2006-01-29
+    Fixed tex's caching to include font.family rc information - DSD
 
-2006-01-29 Fixed subpixel rendering bug in \*Agg that was causing
-           uneven gridlines - JDH
+2006-01-29
+    Fixed subpixel rendering bug in \*Agg that was causing uneven gridlines -
+    JDH
 
-2006-01-28 Added fontcmd to backend_ps's RendererPS.draw_tex, to support other
-           font families in eps output - DSD
+2006-01-28
+    Added fontcmd to backend_ps's RendererPS.draw_tex, to support other font
+    families in eps output - DSD
 
-2006-01-28 Added MaxNLocator to ticker.py, and changed contour.py to
-           use it by default. - EF
+2006-01-28
+    Added MaxNLocator to ticker.py, and changed contour.py to use it by
+    default. - EF
 
-2006-01-28 Added fontcmd to backend_ps's RendererPS.draw_tex, to support other
-           font families in eps output - DSD
+2006-01-28
+    Added fontcmd to backend_ps's RendererPS.draw_tex, to support other font
+    families in eps output - DSD
 
-2006-01-27 Buffered reading of matplotlibrc parameters in order to allow
-           'verbose' settings to be processed first (allows verbose.report
-           during rc validation process) - DSD
+2006-01-27
+    Buffered reading of matplotlibrc parameters in order to allow 'verbose'
+    settings to be processed first (allows verbose.report during rc validation
+    process) - DSD
 
-2006-01-27 Removed setuptools support from setup.py and created a
-           separate setupegg.py file to replace it. - CM
+2006-01-27
+    Removed setuptools support from setup.py and created a separate setupegg.py
+    file to replace it. - CM
 
-2006-01-26 Replaced the ugly datapath logic with a cleaner approach from
-           http://wiki.python.org/moin/DistutilsInstallDataScattered.
-           Overrides the install_data command. - CM
+2006-01-26
+    Replaced the ugly datapath logic with a cleaner approach from
+    http://wiki.python.org/moin/DistutilsInstallDataScattered.  Overrides the
+    install_data command. - CM
 
-2006-01-24 Don't use character typecodes in cntr.c --- changed to use
-           defined typenumbers instead. - TEO
+2006-01-24
+    Don't use character typecodes in cntr.c --- changed to use defined
+    typenumbers instead. - TEO
 
-2006-01-24 Fixed some bugs in usetex's and ps.usedistiller's dependency
+2006-01-24
+    Fixed some bugs in usetex's and ps.usedistiller's dependency
 
-2006-01-24 Added masked array support to scatter - EF
+2006-01-24
+    Added masked array support to scatter - EF
 
-2006-01-24 Fixed some bugs in usetex's and ps.usedistiller's dependency
-           checking - DSD
+2006-01-24
+    Fixed some bugs in usetex's and ps.usedistiller's dependency checking - DSD
 
 -------------------------------
 
-2006-01-24 Released 0.86.2
-
-2006-01-20 Added a converters dict to pylab load to convert selected
-           columns to float -- especially useful for files with date
-           strings, uses a datestr2num converter - JDH
+2006-01-24
+    Released 0.86.2
 
-2006-01-20 Added datestr2num to matplotlib dates to convert a string
-           or sequence of strings to a matplotlib datenum
+2006-01-20
+    Added a converters dict to pylab load to convert selected columns to float
+    -- especially useful for files with date strings, uses a datestr2num
+    converter - JDH
 
-2006-01-18 Added quadrilateral pcolormesh patch 1409190 by Alex Mont
-           and Paul Kienzle -- this is \*Agg only for now.  See
-           examples/quadmesh_demo.py - JDH
+2006-01-20
+    Added datestr2num to matplotlib dates to convert a string or sequence of
+    strings to a matplotlib datenum
 
-2006-01-18 Added Jouni's boxplot patch - JDH
+2006-01-18
+    Added quadrilateral pcolormesh patch 1409190 by Alex Mont and Paul Kienzle
+    -- this is \*Agg only for now.  See examples/quadmesh_demo.py - JDH
 
-2006-01-18 Added comma delimiter for pylab save - JDH
+2006-01-18
+    Added Jouni's boxplot patch - JDH
 
-2006-01-12 Added Ryan's legend patch - JDH
+2006-01-18
+    Added comma delimiter for pylab save - JDH
 
+2006-01-12
+    Added Ryan's legend patch - JDH
 
-2006-1-12 Fixed numpy / numeric to use .dtype.char to keep in SYNC with numpy SVN
+2006-01-12
+    Fixed numpy / numeric to use .dtype.char to keep in SYNC with numpy SVN
 
 ---------------------------
 
-2006-1-11 Released 0.86.1
+2006-01-11
+    Released 0.86.1
 
-2006-1-11 Fixed setup.py for win32 build and added rc template to the MANIFEST.in
+2006-01-11 
+    Fixed setup.py for win32 build and added rc template to the MANIFEST.in
 
-2006-1-10 Added xpdf distiller option. matplotlibrc ps.usedistiller can now be
-            none, false, ghostscript, or xpdf. Validation checks for
-            dependencies. This needs testing, but the xpdf option should produce
-            the highest-quality output and small file sizes - DSD
+2006-01-10
+    Added xpdf distiller option. matplotlibrc ps.usedistiller can now be none,
+    false, ghostscript, or xpdf. Validation checks for dependencies. This needs
+    testing, but the xpdf option should produce the highest-quality output and
+    small file sizes - DSD
 
-2006-01-10 For the usetex option, backend_ps now does all the LaTeX work in the
-            os's temp directory - DSD
+2006-01-10
+    For the usetex option, backend_ps now does all the LaTeX work in the os's
+    temp directory - DSD
 
-2006-1-10 Added checks for usetex dependencies. - DSD
+2006-01-10
+    Added checks for usetex dependencies. - DSD
 
 ---------------------------------
 
-2006-1-9 Released 0.86
+2006-01-09
+    Released 0.86
 
-2006-1-4 Changed to support numpy (new name for scipy_core) - TEO
+2006-01-04
+    Changed to support numpy (new name for scipy_core) - TEO
 
-2006-1-4 Added Mark's scaled axes patch for shared axis
+2006-01-04
+    Added Mark's scaled axes patch for shared axis
 
-2005-12-28 Added Chris Barker's build_wxagg patch - JDH
+2005-12-28
+    Added Chris Barker's build_wxagg patch - JDH
 
-2005-12-27 Altered numerix/scipy to support new scipy package
-           structure - TEO
+2005-12-27
+    Altered numerix/scipy to support new scipy package structure - TEO
 
-2005-12-20 Fixed Jame's Boyles date tick reversal problem - JDH
+2005-12-20
+    Fixed Jame's Boyles date tick reversal problem - JDH
 
-2005-12-20 Added Jouni's rc patch to support lists of keys to set on -
-           JDH
+2005-12-20
+    Added Jouni's rc patch to support lists of keys to set on - JDH
 
-2005-12-12 Updated pyparsing and mathtext for some speed enhancements
-           (Thanks Paul McGuire) and minor fixes to scipy numerix and
-           setuptools
+2005-12-12
+    Updated pyparsing and mathtext for some speed enhancements (Thanks Paul
+    McGuire) and minor fixes to scipy numerix and setuptools
 
-2005-12-12 Matplotlib data is now installed as package_data in
-           the matplotlib module.  This gets rid of checking the
-           many possibilities in matplotlib._get_data_path() - CM
+2005-12-12
+    Matplotlib data is now installed as package_data in the matplotlib module.
+    This gets rid of checking the many possibilities in
+    matplotlib._get_data_path() - CM
 
-2005-12-11 Support for setuptools/pkg_resources to build and use
-           matplotlib as an egg. Still allows matplotlib to exist
-           using a traditional distutils install. - ADS
+2005-12-11
+    Support for setuptools/pkg_resources to build and use matplotlib as an egg.
+    Still allows matplotlib to exist using a traditional distutils install. -
+    ADS
 
-2005-12-03 Modified setup to build matplotlibrc based on compile time
-           findings.  It will set numerix in the order of scipy,
-           numarray, Numeric depending on which are founds, and
-           backend as in preference order GTKAgg, WXAgg, TkAgg, GTK,
-           Agg, PS
+2005-12-03
+    Modified setup to build matplotlibrc based on compile time findings.  It
+    will set numerix in the order of scipy, numarray, Numeric depending on
+    which are founds, and backend as in preference order GTKAgg, WXAgg, TkAgg,
+    GTK, Agg, PS
 
-2005-12-03 Modified scipy patch to support Numeric, scipy and numarray
-           Some work remains to be done because some of the scipy
-           imports are broken if only the core is installed.  e.g.,
-           apparently we need from scipy.basic.fftpack import * rather
-           than from scipy.fftpack import *
+2005-12-03
+    Modified scipy patch to support Numeric, scipy and numarray Some work
+    remains to be done because some of the scipy imports are broken if only the
+    core is installed.  e.g., apparently we need from scipy.basic.fftpack
+    import * rather than from scipy.fftpack import *
 
-2005-12-03 Applied some fixes to Nicholas Young's nonuniform image
-           patch
+2005-12-03
+    Applied some fixes to Nicholas Young's nonuniform image patch
 
-2005-12-01 Applied Alex Gontmakher hatch patch - PS only for now
+2005-12-01
+    Applied Alex Gontmakher hatch patch - PS only for now
 
-2005-11-30 Added Rob McMullen's EMF patch
+2005-11-30
+    Added Rob McMullen's EMF patch
 
-2005-11-30 Added Daishi's patch for scipy
+2005-11-30
+    Added Daishi's patch for scipy
 
-2005-11-30 Fixed out of bounds draw markers segfault in agg
+2005-11-30
+    Fixed out of bounds draw markers segfault in agg
 
-2005-11-28 Got TkAgg blitting working 100% (cross fingers) correctly. - CM
+2005-11-28
+    Got TkAgg blitting working 100% (cross fingers) correctly. - CM
 
-2005-11-27 Multiple changes in cm.py, colors.py, figure.py, image.py,
-           contour.py, contour_demo.py; new _cm.py, examples/image_masked.py.
-           1) Separated the color table data from cm.py out into
-           a new file, _cm.py, to make it easier to find the actual
-           code in cm.py and to add new colormaps.  Also added
-           some line breaks to the color data dictionaries. Everything
-           from _cm.py is imported by cm.py, so the split should be
-           transparent.
-           2) Enabled automatic generation of a colormap from
-           a list of colors in contour; see modified
-           examples/contour_demo.py.
-           3) Support for imshow of a masked array, with the
-           ability to specify colors (or no color at all) for
-           masked regions, and for regions that are above or
-           below the normally mapped region.  See
-           examples/image_masked.py.
-           4) In support of the above, added two new classes,
-           ListedColormap, and no_norm, to colors.py, and modified
-           the Colormap class to include common functionality. Added
-           a clip kwarg to the normalize class.  Reworked color
-           handling in contour.py, especially in the ContourLabeller
-           mixin.
-           - EF
+2005-11-27
+    Multiple changes in cm.py, colors.py, figure.py, image.py, contour.py,
+    contour_demo.py; new _cm.py, examples/image_masked.py.
 
-2005-11-25 Changed text.py to ensure color is hashable. EF
+    1. Separated the color table data from cm.py out into a new file, _cm.py,
+       to make it easier to find the actual code in cm.py and to add new
+       colormaps.  Also added some line breaks to the color data dictionaries.
+       Everything from _cm.py is imported by cm.py, so the split should be
+       transparent.
+    2. Enabled automatic generation of a colormap from a list of colors in
+       contour; see modified examples/contour_demo.py.
+    3. Support for imshow of a masked array, with the ability to specify colors
+       (or no color at all) for masked regions, and for regions that are above
+       or below the normally mapped region.  See examples/image_masked.py.
+    4. In support of the above, added two new classes, ListedColormap, and
+       no_norm, to colors.py, and modified the Colormap class to include common
+       functionality. Added a clip kwarg to the normalize class.  Reworked
+       color handling in contour.py, especially in the ContourLabeller mixin.
 
---------------------------------
+    - EF
 
-2005-11-16 Released 0.85
+2005-11-25
+    Changed text.py to ensure color is hashable. EF
 
-2005-11-16 Changed the default default linewidth in rc to 1.0
+--------------------------------
 
-2005-11-16 Replaced agg_to_gtk_drawable with pure pygtk pixbuf code in
-           backend_gtkagg.  When the equivalent is doe for blit, the
-           agg extension code will no longer be needed
+2005-11-16
+    Released 0.85
 
-2005-11-16 Added a maxdict item to cbook to prevent caches from
-           growing w/o bounds
+2005-11-16
+    Changed the default linewidth in rc to 1.0
 
-2005-11-15 Fixed a colorup/colordown reversal bug in finance.py --
-           Thanks Gilles
+2005-11-16
+    Replaced agg_to_gtk_drawable with pure pygtk pixbuf code in backend_gtkagg.
+    When the equivalent is doe for blit, the agg extension code will no longer
+    be needed
 
-2005-11-15 Applied Jouni K Steppanen's boxplot patch SF patch#1349997
-           - JDH
+2005-11-16
+    Added a maxdict item to cbook to prevent caches from growing w/o bounds
 
+2005-11-15
+    Fixed a colorup/colordown reversal bug in finance.py -- Thanks Gilles
 
-2005-11-09 added axisbelow attr for Axes to determine whether ticks and such
-             are above or below the actors
+2005-11-15
+    Applied Jouni K Steppanen's boxplot patch SF patch#1349997 - JDH
 
-2005-11-08 Added Nicolas' irregularly spaced image patch
+2005-11-09
+    added axisbelow attr for Axes to determine whether ticks and such are above
+    or below the actors
 
+2005-11-08
+    Added Nicolas' irregularly spaced image patch
 
-2005-11-08 Deprecated HorizontalSpanSelector and replaced with
-           SpanSelection that takes a third arg, direction.  The
-           new SpanSelector supports horizontal and vertical span
-           selection, and the appropriate min/max is returned. - CM
+2005-11-08
+    Deprecated HorizontalSpanSelector and replaced with SpanSelection that
+    takes a third arg, direction.  The new SpanSelector supports horizontal and
+    vertical span selection, and the appropriate min/max is returned. - CM
 
-2005-11-08 Added lineprops dialog for gtk
+2005-11-08
+    Added lineprops dialog for gtk
 
-2005-11-03 Added FIFOBuffer class to mlab to support real time feeds
-           and examples/fifo_buffer.py
+2005-11-03
+    Added FIFOBuffer class to mlab to support real time feeds and
+    examples/fifo_buffer.py
 
-2005-11-01 Contributed Nickolas Young's patch for afm mathtext to
-           support mathtext based upon the standard postscript Symbol
-           font when ps.usetex = True.
+2005-11-01
+    Contributed Nickolas Young's patch for afm mathtext to support mathtext
+    based upon the standard postscript Symbol font when ps.usetex = True.
 
-2005-10-26 Added support for scatter legends - thanks John Gill
+2005-10-26
+    Added support for scatter legends - thanks John Gill
 
-2005-10-20 Fixed image clipping bug that made some tex labels
-           disappear.   JDH
+2005-10-20
+    Fixed image clipping bug that made some tex labels disappear.   JDH
 
-2005-10-14 Removed sqrt from dvipng 1.6 alpha channel mask.
+2005-10-14
+    Removed sqrt from dvipng 1.6 alpha channel mask.
 
-2005-10-14 Added width kwarg to hist function
+2005-10-14
+    Added width kwarg to hist function
 
-2005-10-10 Replaced all instances of os.rename with shutil.move
+2005-10-10
+    Replaced all instances of os.rename with shutil.move
 
-2005-10-05 Added Michael Brady's ydate patch
+2005-10-05
+    Added Michael Brady's ydate patch
 
-2005-10-04 Added rkern's texmanager patch
+2005-10-04
+    Added rkern's texmanager patch
 
-2005-09-25 contour.py modified to use a single ContourSet class
-           that handles filled contours, line contours, and labels;
-           added keyword arg (clip_ends) to contourf.
-           Colorbar modified to work with new ContourSet object;
-           if the ContourSet has lines rather than polygons, the
-           colorbar will follow suit. Fixed a bug introduced in
-           0.84, in which contourf(...,colors=...) was broken - EF
+2005-09-25
+    contour.py modified to use a single ContourSet class that handles filled
+    contours, line contours, and labels; added keyword arg (clip_ends) to
+    contourf.  Colorbar modified to work with new ContourSet object; if the
+    ContourSet has lines rather than polygons, the colorbar will follow suit.
+    Fixed a bug introduced in 0.84, in which contourf(...,colors=...) was
+    broken - EF
 
 -------------------------------
 
-2005-09-19 Released 0.84
+2005-09-19
+    Released 0.84
 
-2005-09-14 Added a new 'resize_event' which triggers a callback with a
-           backend_bases.ResizeEvent object - JDH
+2005-09-14
+    Added a new 'resize_event' which triggers a callback with a
+    backend_bases.ResizeEvent object - JDH
 
-2005-09-14 font_manager.py: removed chkfontpath from x11FontDirectory() - SC
+2005-09-14
+    font_manager.py: removed chkfontpath from x11FontDirectory() - SC
 
-2005-09-14 Factored out auto date locator/formatter factory code into
-           matplotlib.date.date_ticker_factory; applies John Bryne's
-           quiver patch.
+2005-09-14
+    Factored out auto date locator/formatter factory code into
+    matplotlib.date.date_ticker_factory; applies John Bryne's quiver patch.
 
-2005-09-13 Added Mark's axes positions history patch #1286915
+2005-09-13
+    Added Mark's axes positions history patch #1286915
 
-2005-09-09 Added support for auto canvas resizing with
-           fig.set_figsize_inches(9,5,forward=True) # inches
-           OR
-           fig.resize(400,300)  # pixels
+2005-09-09
+    Added support for auto canvas resizing with::
 
-2005-09-07 figure.py: update Figure.draw() to use the updated
-           renderer.draw_image() so that examples/figimage_demo.py works again.
-           examples/stock_demo.py: remove data_clipping (which no longer
-           exists) - SC
+        fig.set_figsize_inches(9,5,forward=True) # inches
 
-2005-09-06 Added Eric's tick.direction patch: in or out in rc
+    OR::
 
-2005-09-06 Added Martin's rectangle selector widget
+        fig.resize(400,300)  # pixels
 
-2005-09-04 Fixed a logic err in text.py that was preventing rgxsuper
-           from matching - JDH
+2005-09-07
+    figure.py: update Figure.draw() to use the updated renderer.draw_image() so
+    that examples/figimage_demo.py works again.  examples/stock_demo.py: remove
+    data_clipping (which no longer exists) - SC
 
-2005-08-29 Committed Ken's wx blit patch #1275002
+2005-09-06
+    Added Eric's tick.direction patch: in or out in rc
 
-2005-08-26 colorbar modifications - now uses contourf instead of imshow
-           so that colors used by contourf are displayed correctly.
-           Added two new keyword args (cspacing and clabels) that are
-           only relevant for ContourMappable images - JSWHIT
+2005-09-06
+    Added Martin's rectangle selector widget
 
-2005-08-24 Fixed a PS image bug reported by Darren - JDH
+2005-09-04
+    Fixed a logic err in text.py that was preventing rgxsuper from matching -
+    JDH
 
-2005-08-23 colors.py: change hex2color() to accept unicode strings as well as
-           normal strings. Use isinstance() instead of types.IntType etc - SC
+2005-08-29
+    Committed Ken's wx blit patch #1275002
 
-2005-08-16 removed data_clipping line and rc property - JDH
+2005-08-26
+    colorbar modifications - now uses contourf instead of imshow so that colors
+    used by contourf are displayed correctly.  Added two new keyword args
+    (cspacing and clabels) that are only relevant for ContourMappable images -
+    JSWHIT
 
-2005-08-22 backend_svg.py: Remove redundant "x=0.0 y=0.0" from svg element.
-           Increase svg version from 1.0 to 1.1. Add viewBox attribute to svg
-           element to allow SVG documents to scale-to-fit into an arbitrary
-           viewport - SC
+2005-08-24
+    Fixed a PS image bug reported by Darren - JDH
 
-2005-08-16 Added Eric's dot marker patch - JDH
+2005-08-23
+    colors.py: change hex2color() to accept unicode strings as well as normal
+    strings. Use isinstance() instead of types.IntType etc - SC
 
-2005-08-08 Added blitting/animation for TkAgg - CM
+2005-08-16
+    removed data_clipping line and rc property - JDH
 
-2005-08-05 Fixed duplicate tickline bug - JDH
-
-2005-08-05 Fixed a GTK animation bug that cropped up when doing
-           animations in gtk//gtkagg canvases that had widgets packed
-           above them
-
-2005-08-05 Added Clovis Goldemberg patch to the tk save dialog
-
-2005-08-04 Removed origin kwarg from backend.draw_image.  origin is
-           handled entirely by the frontend now.
-
-2005-07-03 Fixed a bug related to TeX commands in backend_ps
-
-2005-08-03 Fixed SVG images to respect upper and lower origins.
-
-2005-08-03 Added flipud method to image and removed it from to_str.
-
-2005-07-29 Modified figure.figaspect to take an array or number;
-           modified backend_svg to write utf-8 - JDH
-
-2005-07-30 backend_svg.py: embed png image files in svg rather than linking
-           to a separate png file, fixes bug #1245306 (thanks to Norbert Nemec
-           for the patch) - SC
-
----------------------------
+2005-08-22
+    backend_svg.py: Remove redundant "x=0.0 y=0.0" from svg element.  Increase
+    svg version from 1.0 to 1.1. Add viewBox attribute to svg element to allow
+    SVG documents to scale-to-fit into an arbitrary viewport - SC
 
-2005-07-29 Released 0.83.2
+2005-08-16
+    Added Eric's dot marker patch - JDH
 
-2005-07-27 Applied SF patch 1242648: minor rounding error in
-           IndexDateFormatter in dates.py
+2005-08-08
+    Added blitting/animation for TkAgg - CM
 
-2005-07-27 Applied sf patch 1244732: Scale axis such that circle
-           looks like circle - JDH
+2005-08-05
+    Fixed duplicate tickline bug - JDH
 
-2005-07-29 Improved message reporting in texmanager and backend_ps - DSD
+2005-08-05
+    Fixed a GTK animation bug that cropped up when doing animations in
+    gtk//gtkagg canvases that had widgets packed above them
 
-2005-07-28 backend_gtk.py: update FigureCanvasGTK.draw() (needed due to the
-           recent expose_event() change) so that examples/anim.py works in the
-           usual way - SC
+2005-08-05
+    Added Clovis Goldemberg patch to the tk save dialog
 
-2005-07-26 Added new widgets Cursor and HorizontalSpanSelector to
-           matplotlib.widgets.  See examples/widgets/cursor.py and
-           examples/widgets/span_selector.py - JDH
+2005-08-04
+    Removed origin kwarg from backend.draw_image.  origin is handled entirely
+    by the frontend now.
 
-2005-07-26 added draw event to mpl event hierarchy -- triggered on
-           figure.draw
+2005-07-03
+    Fixed a bug related to TeX commands in backend_ps
 
-2005-07-26 backend_gtk.py: allow 'f' key to toggle window fullscreen mode
+2005-08-03
+    Fixed SVG images to respect upper and lower origins.
 
-2005-07-26 backend_svg.py: write "<.../>" elements all on one line and remove
-           surplus spaces - SC
+2005-08-03
+    Added flipud method to image and removed it from to_str.
 
-2005-07-25 backend_svg.py: simplify code by deleting GraphicsContextSVG and
-           RendererSVG.new_gc(), and moving the gc.get_capstyle() code into
-           RendererSVG._get_gc_props_svg() - SC
+2005-07-29
+    Modified figure.figaspect to take an array or number; modified backend_svg
+    to write utf-8 - JDH
 
-2005-07-24 backend_gtk.py: call FigureCanvasBase.motion_notify_event() on
-           all motion-notify-events, not just ones where a modifier key or
-           button has been pressed (fixes bug report from Niklas Volbers) - SC
+2005-07-30
+    backend_svg.py: embed png image files in svg rather than linking to a
+    separate png file, fixes bug #1245306 (thanks to Norbert Nemec for the
+    patch) - SC
 
-2005-07-24 backend_gtk.py: modify print_figure() use own pixmap, fixing
-           problems where print_figure() overwrites the display pixmap.
-           return False from all button/key etc events - to allow the event
-           to propagate further - SC
-
-2005-07-23 backend_gtk.py: change expose_event from using set_back_pixmap();
-           clear() to draw_drawable() - SC
-
-2005-07-23 backend_gtk.py: removed pygtk.require()
-           matplotlib/__init__.py: delete 'FROZEN' and 'McPLError' which are
-           no longer used - SC
-
-2005-07-22 backend_gdk.py: removed pygtk.require() - SC
-
-2005-07-21 backend_svg.py: Remove unused imports. Remove methods doc strings
-           which just duplicate the docs from backend_bases.py. Rename
-           draw_mathtext to _draw_mathtext. - SC
-
-2005-07-17 examples/embedding_in_gtk3.py: new example demonstrating placing
-           a FigureCanvas in a gtk.ScrolledWindow - SC
-
-2005-07-14 Fixed a Windows related bug (#1238412) in texmanager - DSD
-
-2005-07-11 Fixed color kwarg bug, setting color=1 or 0 caused an
-                   exception - DSD
-
-2005-07-07 Added Eric's MA set_xdata Line2D fix - JDH
-
-2005-07-06 Made HOME/.matplotlib the new config dir where the
-           matplotlibrc file, the ttf.cache, and the tex.cache live.
-           The new default filenames in .matplotlib have no leading
-           dot and are not hidden.  e.g., the new names are matplotlibrc
-           tex.cache ttffont.cache.  This is how ipython does it so it
-           must be right.  If old files are found, a warning is issued
-           and they are moved to the new location.  Also fixed
-           texmanager to put all files, including temp files in
-           ~/.matplotlib/tex.cache, which allows you to usetex in
-           non-writable dirs.
-
-2005-07-05 Fixed bug #1231611 in subplots adjust layout.  The problem
-           was that the text caching mechanism was not using the
-           transformation affine in the key. - JDH
-
-2005-07-05 Fixed default backend import problem when using API (SF bug
-           # 1209354 -  see API_CHANGES for more info - JDH
-
-2005-07-04 backend_gtk.py: require PyGTK version 2.0.0 or higher - SC
-
-2005-06-30 setupext.py: added numarray_inc_dirs for building against
-           numarray when not installed in standard location - ADS
-
-2005-06-27 backend_svg.py: write figure width, height as int, not float.
-           Update to fix some of the pychecker warnings - SC
-
-2005-06-23 Updated examples/agg_test.py to demonstrate curved paths
-           and fills - JDH
+---------------------------
 
-2005-06-21 Moved some texmanager and backend_agg tex caching to class
-           level rather than instance level - JDH
+2005-07-29
+    Released 0.83.2
 
-2005-06-20 setupext.py: fix problem where _nc_backend_gdk is installed to the
-           wrong directory - SC
+2005-07-27
+    Applied SF patch 1242648: minor rounding error in IndexDateFormatter in
+    dates.py
 
-2005-06-19 Added 10.4 support for CocoaAgg. - CM
+2005-07-27
+    Applied sf patch 1244732: Scale axis such that circle looks like circle -
+    JDH
 
-2005-06-18 Move Figure.get_width_height() to FigureCanvasBase and return
-           int instead of float. - SC
+2005-07-29
+    Improved message reporting in texmanager and backend_ps - DSD
 
-2005-06-18 Applied Ted Drain's QtAgg patch: 1) Changed the toolbar to
-           be a horizontal bar of push buttons instead of a QToolbar
-           and updated the layout algorithms in the main window
-           accordingly.  This eliminates the ability to drag and drop
-           the toolbar and detach it from the window.  2) Updated the
-           resize algorithm in the main window to show the correct
-           size for the plot widget as requested.  This works almost
-           correctly right now.  It looks to me like the final size of
-           the widget is off by the border of the main window but I
-           haven't figured out a way to get that information yet.  We
-           could just add a small margin to the new size but that
-           seems a little hacky.  3) Changed the x/y location label to
-           be in the toolbar like the Tk backend instead of as a
-           status line at the bottom of the widget.  4) Changed the
-           toolbar pixmaps to use the ppm files instead of the png
-           files.  I noticed that the Tk backend buttons looked much
-           nicer and it uses the ppm files so I switched them.
+2005-07-28
+    backend_gtk.py: update FigureCanvasGTK.draw() (needed due to the recent
+    expose_event() change) so that examples/anim.py works in the usual way - SC
 
-2005-06-17 Modified the gtk backend to not queue mouse motion events.
-           This allows for live updates when dragging a slider. - CM
+2005-07-26
+    Added new widgets Cursor and HorizontalSpanSelector to matplotlib.widgets.
+    See examples/widgets/cursor.py and examples/widgets/span_selector.py - JDH
 
-2005-06-17 Added starter CocoaAgg backend.  Only works on OS 10.3 for
-           now and requires PyObjC.  (10.4 is high priority) - CM
+2005-07-26
+    added draw event to mpl event hierarchy -- triggered on figure.draw
 
-2005-06-17 Upgraded pyparsing and applied Paul McGuire's suggestions
-           for speeding things up.  This more than doubles the speed
-           of mathtext in my simple tests. JDH
+2005-07-26
+    backend_gtk.py: allow 'f' key to toggle window fullscreen mode
 
-2005-06-16 Applied David Cooke's subplot make_key patch
+2005-07-26
+    backend_svg.py: write "<.../>" elements all on one line and remove surplus
+    spaces - SC
+
+2005-07-25
+    backend_svg.py: simplify code by deleting GraphicsContextSVG and
+    RendererSVG.new_gc(), and moving the gc.get_capstyle() code into
+    RendererSVG._get_gc_props_svg() - SC
+
+2005-07-24
+    backend_gtk.py: call FigureCanvasBase.motion_notify_event() on all
+    motion-notify-events, not just ones where a modifier key or button has been
+    pressed (fixes bug report from Niklas Volbers) - SC
+
+2005-07-24
+    backend_gtk.py: modify print_figure() use own pixmap, fixing problems where
+    print_figure() overwrites the display pixmap.  return False from all
+    button/key etc events - to allow the event to propagate further - SC
+
+2005-07-23
+    backend_gtk.py: change expose_event from using set_back_pixmap(); clear()
+    to draw_drawable() - SC
+
+2005-07-23
+    backend_gtk.py: removed pygtk.require() matplotlib/__init__.py: delete
+    'FROZEN' and 'McPLError' which are no longer used - SC
+
+2005-07-22
+    backend_gdk.py: removed pygtk.require() - SC
+
+2005-07-21
+    backend_svg.py: Remove unused imports. Remove methods doc strings which
+    just duplicate the docs from backend_bases.py. Rename draw_mathtext to
+    _draw_mathtext. - SC
+
+2005-07-17
+    examples/embedding_in_gtk3.py: new example demonstrating placing a
+    FigureCanvas in a gtk.ScrolledWindow - SC
+
+2005-07-14
+    Fixed a Windows related bug (#1238412) in texmanager - DSD
+
+2005-07-11
+    Fixed color kwarg bug, setting color=1 or 0 caused an exception - DSD
+
+2005-07-07
+    Added Eric's MA set_xdata Line2D fix - JDH
+
+2005-07-06
+    Made HOME/.matplotlib the new config dir where the matplotlibrc file, the
+    ttf.cache, and the tex.cache live.  The new default filenames in
+    .matplotlib have no leading dot and are not hidden.  e.g., the new names
+    are matplotlibrc tex.cache ttffont.cache.  This is how ipython does it so
+    it must be right.  If old files are found, a warning is issued and they are
+    moved to the new location.  Also fixed texmanager to put all files,
+    including temp files in ~/.matplotlib/tex.cache, which allows you to usetex
+    in non-writable dirs.
+
+2005-07-05
+    Fixed bug #1231611 in subplots adjust layout.  The problem was that the
+    text caching mechanism was not using the transformation affine in the key.
+    - JDH
+
+2005-07-05
+    Fixed default backend import problem when using API (SF bug # 1209354 -
+    see API_CHANGES for more info - JDH
+
+2005-07-04
+    backend_gtk.py: require PyGTK version 2.0.0 or higher - SC
+
+2005-06-30
+    setupext.py: added numarray_inc_dirs for building against numarray when not
+    installed in standard location - ADS
+
+2005-06-27
+    backend_svg.py: write figure width, height as int, not float.  Update to
+    fix some of the pychecker warnings - SC
+
+2005-06-23
+    Updated examples/agg_test.py to demonstrate curved paths and fills - JDH
+
+2005-06-21
+    Moved some texmanager and backend_agg tex caching to class level rather
+    than instance level - JDH
+
+2005-06-20
+    setupext.py: fix problem where _nc_backend_gdk is installed to the wrong
+    directory - SC
+
+2005-06-19
+    Added 10.4 support for CocoaAgg. - CM
+
+2005-06-18
+    Move Figure.get_width_height() to FigureCanvasBase and return int instead
+    of float. - SC
+
+2005-06-18
+    Applied Ted Drain's QtAgg patch: 1) Changed the toolbar to be a horizontal
+    bar of push buttons instead of a QToolbar and updated the layout algorithms
+    in the main window accordingly.  This eliminates the ability to drag and
+    drop the toolbar and detach it from the window.  2) Updated the resize
+    algorithm in the main window to show the correct size for the plot widget
+    as requested.  This works almost correctly right now.  It looks to me like
+    the final size of the widget is off by the border of the main window but I
+    haven't figured out a way to get that information yet.  We could just add a
+    small margin to the new size but that seems a little hacky.  3) Changed the
+    x/y location label to be in the toolbar like the Tk backend instead of as a
+    status line at the bottom of the widget.  4) Changed the toolbar pixmaps to
+    use the ppm files instead of the png files.  I noticed that the Tk backend
+    buttons looked much nicer and it uses the ppm files so I switched them.
+
+2005-06-17
+    Modified the gtk backend to not queue mouse motion events.  This allows for
+    live updates when dragging a slider. - CM
+
+2005-06-17
+    Added starter CocoaAgg backend.  Only works on OS 10.3 for now and requires
+    PyObjC.  (10.4 is high priority) - CM
+
+2005-06-17
+    Upgraded pyparsing and applied Paul McGuire's suggestions for speeding
+    things up.  This more than doubles the speed of mathtext in my simple
+    tests. JDH
+
+2005-06-16
+    Applied David Cooke's subplot make_key patch
 
 ----------------------------------
 
-2005-06-15 0.82 released
+0.82 (2005-06-15)
+-----------------
 
-2005-06-15 Added subplot config tool to GTK* backends -- note you must
-           now import the NavigationToolbar2 from your backend of
-           choice rather than from backend_gtk because it needs to
-           know about the backend specific canvas -- see
-           examples/embedding_in_gtk2.py.  Ditto for wx backend -- see
-           examples/embedding_in_wxagg.py
+2005-06-15
+    Added subplot config tool to GTK* backends -- note you must now import the
+    NavigationToolbar2 from your backend of choice rather than from backend_gtk
+    because it needs to know about the backend specific canvas -- see
+    examples/embedding_in_gtk2.py.  Ditto for wx backend -- see
+    examples/embedding_in_wxagg.py
 
-2005-06-15 backend_cairo.py: updated to use pycairo 0.5.0 - SC
+2005-06-15
+    backend_cairo.py: updated to use pycairo 0.5.0 - SC
 
-2005-06-14 Wrote some GUI neutral widgets (Button, Slider,
-           RadioButtons, CheckButtons) in matplotlib.widgets.  See
-           examples/widgets/\*.py - JDH
+2005-06-14
+    Wrote some GUI neutral widgets (Button, Slider, RadioButtons, CheckButtons)
+    in matplotlib.widgets.  See examples/widgets/\*.py - JDH
 
-2005-06-14 Exposed subplot parameters as rc vars and as the fig
-           SubplotParams instance subplotpars.  See
-           figure.SubplotParams, figure.Figure.subplots_adjust and the
-           pylab method subplots_adjust and
-           examples/subplots_adjust.py .  Also added a GUI neutral
-           widget for adjusting subplots, see
-           examples/subplot_toolbar.py - JDH
+2005-06-14
+    Exposed subplot parameters as rc vars and as the fig SubplotParams instance
+    subplotpars.  See figure.SubplotParams, figure.Figure.subplots_adjust and
+    the pylab method subplots_adjust and examples/subplots_adjust.py .  Also
+    added a GUI neutral widget for adjusting subplots, see
+    examples/subplot_toolbar.py - JDH
 
-2005-06-13 Exposed cap and join style for lines with new rc params and
-           line properties
+2005-06-13
+    Exposed cap and join style for lines with new rc params and line properties::
 
         lines.dash_joinstyle : miter        # miter|round|bevel
         lines.dash_capstyle : butt          # butt|round|projecting
@@ -4037,1405 +4750,1654 @@ the `API changes <../../api/api_changes.html>`_.
         lines.solid_capstyle : projecting   # butt|round|projecting
 
 
-2005-06-13 Added kwargs to Axes init
+2005-06-13
+    Added kwargs to Axes init
 
-2005-06-13 Applied Baptiste's tick patch - JDH
+2005-06-13
+    Applied Baptiste's tick patch - JDH
 
-2005-06-13 Fixed rc alias 'l' bug reported by Fernando by removing
-           aliases for mainlevel rc options. - JDH
+2005-06-13
+    Fixed rc alias 'l' bug reported by Fernando by removing aliases for
+    mainlevel rc options. - JDH
 
-2005-06-10 Fixed bug #1217637 in ticker.py - DSD
+2005-06-10
+    Fixed bug #1217637 in ticker.py - DSD
 
-2005-06-07 Fixed a bug in texmanager.py: .aux files not being removed - DSD
+2005-06-07
+    Fixed a bug in texmanager.py: .aux files not being removed - DSD
 
-2005-06-08 Added Sean Richard's hist binning fix -- see API_CHANGES - JDH
+2005-06-08
+    Added Sean Richard's hist binning fix -- see API_CHANGES - JDH
 
-2005-06-07 Fixed a bug in texmanager.py: .aux files not being removed
-           - DSD
+2005-06-07
+    Fixed a bug in texmanager.py: .aux files not being removed - DSD
 
 
 ----------------------
 
-2005-06-07 matplotlib-0.81 released
+0.81 (2005-06-07)
+-----------------
 
-2005-06-06 Added autoscale_on prop to axes
+2005-06-06
+    Added autoscale_on prop to axes
 
-2005-06-06 Added Nick's picker "among" patch - JDH
+2005-06-06
+    Added Nick's picker "among" patch - JDH
 
-2005-06-05 Fixed a TeX/LaTeX font discrepency in backend_ps. - DSD
+2005-06-05
+    Fixed a TeX/LaTeX font discrepancy in backend_ps. - DSD
 
-2005-06-05 Added a ps.distill option in rc settings. If True, postscript
-           output will be distilled using ghostscript, which should trim
-           the file size and allow it to load more quickly. Hopefully this
-           will address the issue of large ps files due to font
-           definitions. Tested with gnu-ghostscript-8.16. - DSD
+2005-06-05
+    Added a ps.distill option in rc settings. If True, postscript output will
+    be distilled using ghostscript, which should trim the file size and allow
+    it to load more quickly. Hopefully this will address the issue of large ps
+    files due to font definitions. Tested with gnu-ghostscript-8.16. - DSD
 
-2005-06-03 Improved support for tex handling of text in backend_ps. - DSD
+2005-06-03
+    Improved support for tex handling of text in backend_ps. - DSD
 
-2005-06-03 Added rc options to render text with tex or latex, and to select
-           the latex font package. - DSD
+2005-06-03
+    Added rc options to render text with tex or latex, and to select the latex
+    font package. - DSD
 
-2005-06-03 Fixed a bug in ticker.py causing a ZeroDivisionError
+2005-06-03
+    Fixed a bug in ticker.py causing a ZeroDivisionError
 
-2005-06-02 backend_gtk.py remove DBL_BUFFER, add line to expose_event to
-           try to fix pygtk 2.6 redraw problem - SC
+2005-06-02
+    backend_gtk.py remove DBL_BUFFER, add line to expose_event to try to fix
+    pygtk 2.6 redraw problem - SC
 
-2005-06-01 The default behavior of ScalarFormatter now renders scientific
-           notation and large numerical offsets in a label at the end of
-           the axis. - DSD
+2005-06-01
+    The default behavior of ScalarFormatter now renders scientific notation and
+    large numerical offsets in a label at the end of the axis. - DSD
 
-2005-06-01 Added Nicholas' frombyte image patch - JDH
+2005-06-01
+    Added Nicholas' frombyte image patch - JDH
 
-2005-05-31 Added vertical TeX support for agg - JDH
+2005-05-31
+    Added vertical TeX support for agg - JDH
 
-2005-05-31 Applied Eric's cntr patch - JDH
+2005-05-31
+    Applied Eric's cntr patch - JDH
 
-2005-05-27 Finally found the pesky agg bug (which Maxim was kind
-           enough to fix within hours) that was causing a segfault in
-           the win32 cached marker drawing.  Now windows users can get
-           the enormouse performance benefits of caced markers w/o
-           those occasional pesy screenshots. - JDH
+2005-05-27
+    Finally found the pesky agg bug (which Maxim was kind enough to fix within
+    hours) that was causing a segfault in the win32 cached marker drawing.  Now
+    windows users can get the enormous performance benefits of cached markers
+    w/o those occasional pesy screenshots. - JDH
 
-2005-05-27 Got win32 build system working again, using a more recent
-           version of gtk and pygtk in the win32 build, gtk 2.6 from
-           https://web.archive.org/web/20050527002647/https://www.gimp.org/~tml/gimp/win32/downloads.html (you
-           will also need libpng12.dll to use these).  I haven't
-           tested whether this binary build of mpl for win32 will work
-           with older gtk runtimes, so you may need to upgrade.
+2005-05-27
+    Got win32 build system working again, using a more recent version of gtk
+    and pygtk in the win32 build, gtk 2.6 from
+    https://web.archive.org/web/20050527002647/https://www.gimp.org/~tml/gimp/win32/downloads.html
+    (you will also need libpng12.dll to use these).  I haven't tested whether
+    this binary build of mpl for win32 will work with older gtk runtimes, so
+    you may need to upgrade.
 
-2005-05-27 Fixed bug where 2nd wxapp could be started if using wxagg
-           backend. - ADS
+2005-05-27
+    Fixed bug where 2nd wxapp could be started if using wxagg backend. - ADS
 
-2005-05-26 Added Daishi text with dash patch -- see examples/dashtick.py
+2005-05-26
+    Added Daishi text with dash patch -- see examples/dashtick.py
 
-2005-05-26 Moved backend_latex functionality into backend_ps. If
-           text.usetex=True, the PostScript backend will use LaTeX to
-           generate the .ps or .eps file. Ghostscript is required for
-           eps output. - DSD
+2005-05-26
+    Moved backend_latex functionality into backend_ps. If text.usetex=True, the
+    PostScript backend will use LaTeX to generate the .ps or .eps file.
+    Ghostscript is required for eps output. - DSD
 
-2005-05-24 Fixed alignment and color issues in latex backend. - DSD
+2005-05-24
+    Fixed alignment and color issues in latex backend. - DSD
 
-2005-05-21 Fixed raster problem for small rasters with dvipng -- looks
-           like it was a premultipled alpha problem - JDH
+2005-05-21
+    Fixed raster problem for small rasters with dvipng -- looks like it was a
+    premultiplied alpha problem - JDH
 
-2005-05-20 Added linewidth and faceted kwarg to scatter to control
-           edgewidth and color.  Also added autolegend patch to
-           inspect line segments.
+2005-05-20
+    Added linewidth and faceted kwarg to scatter to control edgewidth and
+    color.  Also added autolegend patch to inspect line segments.
 
-2005-05-18 Added Orsay and JPL qt fixes - JDH
+2005-05-18
+    Added Orsay and JPL qt fixes - JDH
 
-2005-05-17 Added a psfrag latex backend -- some alignment issues need
-           to be worked out. Run with -dLaTeX and a *.tex file and
-           *.eps file are generated.  latex and dvips the generated
-           latex file to get ps output.  Note xdvi *does* not work,
-           you must generate ps.- JDH
+2005-05-17
+    Added a psfrag latex backend -- some alignment issues need to be worked
+    out. Run with -dLaTeX and a *.tex file and *.eps file are generated.  latex
+    and dvips the generated latex file to get ps output.  Note xdvi *does* not
+    work, you must generate ps.- JDH
 
-2005-05-13 Added Florent Rougon's Axis set_label1
-           patch
+2005-05-13
+    Added Florent Rougon's Axis set_label1 patch
 
-2005-05-17 pcolor optimization, fixed bug in previous pcolor patch - JSWHIT
+2005-05-17
+    pcolor optimization, fixed bug in previous pcolor patch - JSWHIT
 
-2005-05-16 Added support for masked arrays in pcolor - JSWHIT
+2005-05-16
+    Added support for masked arrays in pcolor - JSWHIT
 
 
-2005-05-12 Started work on TeX text for antigrain using pngdvi -- see
-           examples/tex_demo.py and the new module
-           matplotlib.texmanager.  Rotated text not supported and
-           rendering small glyps is not working right yet.  BUt large
-           fontsizes and/or high dpi saved figs work great.
+2005-05-12
+    Started work on TeX text for antigrain using pngdvi -- see
+    examples/tex_demo.py and the new module matplotlib.texmanager.  Rotated
+    text not supported and rendering small glyphs is not working right yet.  But
+    large fontsizes and/or high dpi saved figs work great.
 
-2005-05-10 New image resize options interpolation options.  New values
-           for the interp kwarg are
+2005-05-10
+    New image resize options interpolation options.  New values for the interp
+    kwarg are
 
            'nearest', 'bilinear', 'bicubic', 'spline16', 'spline36',
            'hanning', 'hamming', 'hermite', 'kaiser', 'quadric',
            'catrom', 'gaussian', 'bessel', 'mitchell', 'sinc',
            'lanczos', 'blackman'
 
-           See help(imshow) for details, particularly the
-           interpolation, filternorm and filterrad kwargs
+    See help(imshow) for details, particularly the interpolation, filternorm
+    and filterrad kwargs
 
 
-2005-05-10 Applied Eric's contour mem leak fixes - JDH
+2005-05-10
+    Applied Eric's contour mem leak fixes - JDH
 
-2005-05-10 Extended python agg wrapper and started implementing
-           backend_agg2, an agg renderer based on the python wrapper.
-           This will be more flexible and easier to extend than the
-           current backend_agg.  See also examples/agg_test.py - JDH
+2005-05-10
+    Extended python agg wrapper and started implementing backend_agg2, an agg
+    renderer based on the python wrapper.  This will be more flexible and
+    easier to extend than the current backend_agg.  See also
+    examples/agg_test.py - JDH
 
-2005-05-09 Added Marcin's no legend patch to exclude lines from the
-           autolegend builder
+2005-05-09
+    Added Marcin's no legend patch to exclude lines from the autolegend builder::
 
            plot(x, y, label='nolegend')
 
-2005-05-05 Upgraded to agg23
+2005-05-05
+    Upgraded to agg23
 
-2005-05-05 Added newscalarformatter_demo.py to examples. -DSD
+2005-05-05
+    Added newscalarformatter_demo.py to examples. -DSD
 
-2005-05-04 Added NewScalarFormatter. Improved formatting of ticklabels,
-           scientific notation, and the ability to plot large large
-           numbers with small ranges, by determining a numerical offset.
-           See ticker.NewScalarFormatter for more details. -DSD
+2005-05-04
+    Added NewScalarFormatter. Improved formatting of ticklabels, scientific
+    notation, and the ability to plot large numbers with small ranges, by
+    determining a numerical offset.  See ticker.NewScalarFormatter for more
+    details. -DSD
 
-2005-05-03 Added the option to specify a delimiter in pylab.load -DSD
+2005-05-03
+    Added the option to specify a delimiter in pylab.load -DSD
 
-2005-04-28 Added Darren's line collection example
+2005-04-28
+    Added Darren's line collection example
 
-2005-04-28 Fixed aa property in agg - JDH
+2005-04-28
+    Fixed aa property in agg - JDH
 
-2005-04-27 Set postscript page size in .matplotlibrc - DSD
+2005-04-27
+    Set postscript page size in .matplotlibrc - DSD
 
-2005-04-26 Added embedding in qt example. - JDH
+2005-04-26
+    Added embedding in qt example. - JDH
 
-2005-04-14 Applied Michael Brady's qt backend patch: 1) fix a bug
-           where keyboard input was grabbed by the figure and not
-           released  2) turn on cursor changes  3) clean up a typo
-           and commented-out print statement. - JDH
+2005-04-14
+    Applied Michael Brady's qt backend patch: 1) fix a bug where keyboard input
+    was grabbed by the figure and not released  2) turn on cursor changes  3)
+    clean up a typo and commented-out print statement. - JDH
 
+2005-04-14
+    Applied Eric Firing's masked data lines patch and contour patch.  Support
+    for masked arrays has been added to the plot command and to the Line2D
+    object.  Only the valid points are plotted.  A "valid_only" kwarg was added
+    to the get_xdata() and get_ydata() methods of Line2D; by default it is
+    False, so that the original data arrays are returned. Setting it to True
+    returns the plottable points.  - see examples/masked_demo.py - JDH
 
-2005-04-14 Applied Eric Firing's masked data lines patch and contour
-           patch.  Support for masked arrays has been added to the
-           plot command and to the Line2D object.  Only the valid
-           points are plotted.  A "valid_only" kwarg was added to the
-           get_xdata() and get_ydata() methods of Line2D; by default
-           it is False, so that the original data arrays are
-           returned. Setting it to True returns the plottable points.
-           - see examples/masked_demo.py - JDH
-
-2005-04-13 Applied Tim Leslie's arrow key event handling patch - JDH
-
+2005-04-13
+    Applied Tim Leslie's arrow key event handling patch - JDH
 
 ---------------------------
 
-0.80 released
+0.80
+----
 
-2005-04-11 Applied a variant of rick's xlim/ylim/axis patch.  These
-           functions now take kwargs to let you selectively alter only
-           the min or max if desired.  e.g., xlim(xmin=2) or
-           axis(ymax=3).  They always return the new lim. - JDH
+2005-04-11
+    Applied a variant of rick's xlim/ylim/axis patch.  These functions now take
+    kwargs to let you selectively alter only the min or max if desired.  e.g.,
+    xlim(xmin=2) or axis(ymax=3).  They always return the new lim. - JDH
 
 
-2005-04-11 Incorporated Werner's wx patch -- wx backend should be
-           compatible with wxpython2.4 and recent versions of 2.5.
-           Some early versions of wxpython 2.5 will not work because
-           there was a temporary change in the dc API that was rolled
-           back to make it 2.4 compliant
+2005-04-11
+    Incorporated Werner's wx patch -- wx backend should be compatible with
+    wxpython2.4 and recent versions of 2.5.  Some early versions of wxpython
+    2.5 will not work because there was a temporary change in the dc API that
+    was rolled back to make it 2.4 compliant
 
-2005-04-11 modified tkagg show so that new figure window pops up on
-           call to figure
+2005-04-11
+    modified tkagg show so that new figure window pops up on call to figure
 
-2005-04-11 fixed wxapp init bug
+2005-04-11
+    fixed wxapp init bug
 
-2005-04-02 updated backend_ps.draw_lines, draw_markers for use with the
-           new API - DSD
+2005-04-02
+    updated backend_ps.draw_lines, draw_markers for use with the new API - DSD
 
-2005-04-01 Added editable polygon example
+2005-04-01
+    Added editable polygon example
 
 ------------------------------
 
-2005-03-31 0.74 released
+0.74 (2005-03-31)
+-----------------
 
-2005-03-30 Fixed and added checks for floating point inaccuracy in
-           ticker.Base - DSD
+2005-03-30
+    Fixed and added checks for floating point inaccuracy in ticker.Base - DSD
 
-2005-03-30 updated /ellipse definition in backend_ps.py to address bug
-           #1122041 - DSD
+2005-03-30
+    updated /ellipse definition in backend_ps.py to address bug #1122041 - DSD
 
-2005-03-29 Added unicode support for Agg and PS - JDH
+2005-03-29
+    Added unicode support for Agg and PS - JDH
 
-2005-03-28 Added Jarrod's svg patch for text - JDH
+2005-03-28
+    Added Jarrod's svg patch for text - JDH
 
-2005-03-28 Added Ludal's arrow and quiver patch - JDH
+2005-03-28
+    Added Ludal's arrow and quiver patch - JDH
 
-2005-03-28 Added label kwarg to Axes to facilitate forcing the
-           creation of new Axes with otherwise identical attributes
+2005-03-28
+    Added label kwarg to Axes to facilitate forcing the creation of new Axes
+    with otherwise identical attributes
 
-2005-03-28 Applied boxplot and OSX font search patches
+2005-03-28
+    Applied boxplot and OSX font search patches
 
-2005-03-27 Added ft2font NULL check to fix Japanase font bug - JDH
+2005-03-27
+    Added ft2font NULL check to fix Japanese font bug - JDH
 
-2005-03-27 Added sprint legend patch plus John Gill's tests and fix --
-           see examples/legend_auto.py  - JDH
+2005-03-27
+    Added sprint legend patch plus John Gill's tests and fix -- see
+    examples/legend_auto.py  - JDH
 
 ---------------------------
 
-2005-03-19 0.73.1 released
+0.73.1 (2005-03-19)
+-------------------
 
-2005-03-19 Reverted wxapp handling because it crashed win32 - JDH
+2005-03-19
+    Reverted wxapp handling because it crashed win32 - JDH
 
-2005-03-18 Add .number attribute to figure objects returned by figure() - FP
+2005-03-18
+    Add .number attribute to figure objects returned by figure() - FP
 
 ---------------------------
 
-2005-03-18 0.73 released
-
-2005-03-16 Fixed labelsep bug
-
-2005-03-16 Applied Darren's ticker fix for small ranges - JDH
-
-2005-03-16 Fixed tick on horiz colorbar - JDH
-
-2005-03-16 Added Japanese winreg patch - JDH
-
-2005-03-15 backend_gtkagg.py: changed to use double buffering, this fixes
-           the problem reported Joachim Berdal Haga - "Parts of plot lagging
-           from previous frame in animation". Tested with anim.py and it makes
-           no noticeable difference to performance (23.7 before, 23.6 after)
-           - SC
-
-2005-03-14 add src/_backend_gdk.c extension to provide a substitute function
-           for pixbuf.get_pixels_array(). Currently pixbuf.get_pixels_array()
-           only works with Numeric, and then only works if pygtk has been
-           compiled with Numeric support. The change provides a function
-           pixbuf_get_pixels_array() which works with Numeric and numarray and
-           is always available. It means that backend_gtk should be able to
-           display images and mathtext in all circumstances. - SC
-
-2005-03-11 Upgraded CXX to 5.3.1
-
-2005-03-10 remove GraphicsContextPS.set_linestyle()
-           and GraphicsContextSVG.set_linestyle() since they do no more than
-           the base class GraphicsContext.set_linestyle() - SC
-
-2005-03-09 Refactored contour functionality into dedicated module
-
-2005-03-09 Added Eric's contourf updates and Nadia's clabel functionality
-
-2005-03-09 Moved colorbar to figure.Figure to expose it for API developers
-          - JDH
-
-2005-03-09 backend_cairo.py: implemented draw_markers() - SC
-
-2005-03-09 cbook.py: only use enumerate() (the python version) if the builtin
-       version is not available.
-           Add new function 'izip' which is set to itertools.izip if available
-           and the python equivalent if not available. - SC
-
-2005-03-07 backend_gdk.py: remove PIXELS_PER_INCH from points_to_pixels(), but
-       still use it to adjust font sizes. This allows the GTK version of
-           line_styles.py to more closely match GTKAgg, previously the markers
-           were being drawn too large. - SC
-
-2005-03-01 Added Eric's contourf routines
-
-2005-03-01 Added start of proper agg SWIG wrapper.  I would like to
-           expose agg functionality directly a the user level and this
-           module will serve that purpose eventually, and will
-           hopefully take over most of the functionality of the
-           current _image and _backend_agg modules.  - JDH
-
-2005-02-28 Fixed polyfit / polyval to convert input args to float
-           arrays - JDH
-
-
-2005-02-25 Add experimental feature to backend_gtk.py to enable/disable
-           double buffering (DBL_BUFFER=True/False) - SC
-
-2005-02-24 colors.py change ColorConverter.to_rgb() so it always returns rgb
-           (and not rgba), allow cnames keys to be cached, change the exception
-           raised from RuntimeError to ValueError (like hex2color())
-           hex2color() use a regular expression to check the color string is
-           valid  - SC
-
-
-2005-02-23 Added rc param ps.useafm so backend ps can use native afm
-           fonts or truetype.  afme breaks mathtext but causes much
-           smaller font sizes and may result in images that display
-           better in some contexts (e.g., pdfs incorporated into latex
-           docs viewed in acrobat reader).  I would like to extend
-           this approach to allow the user to use truetype only for
-           mathtext, which should be easy.
-
-2005-02-23 Used sequence protocol rather than tuple in agg collection
-           drawing routines for greater flexibility - JDH
-
+0.73 (2005-03-18)
+-----------------
+
+2005-03-16
+    Fixed labelsep bug
+
+2005-03-16
+    Applied Darren's ticker fix for small ranges - JDH
+
+2005-03-16
+    Fixed tick on horiz colorbar - JDH
+
+2005-03-16
+    Added Japanese winreg patch - JDH
+
+2005-03-15
+    backend_gtkagg.py: changed to use double buffering, this fixes the problem
+    reported Joachim Berdal Haga - "Parts of plot lagging from previous frame
+    in animation". Tested with anim.py and it makes no noticeable difference to
+    performance (23.7 before, 23.6 after) - SC
+
+2005-03-14
+    add src/_backend_gdk.c extension to provide a substitute function for
+    pixbuf.get_pixels_array(). Currently pixbuf.get_pixels_array() only works
+    with Numeric, and then only works if pygtk has been compiled with Numeric
+    support. The change provides a function pixbuf_get_pixels_array() which
+    works with Numeric and numarray and is always available. It means that
+    backend_gtk should be able to display images and mathtext in all
+    circumstances. - SC
+
+2005-03-11
+    Upgraded CXX to 5.3.1
+
+2005-03-10
+    remove GraphicsContextPS.set_linestyle() and
+    GraphicsContextSVG.set_linestyle() since they do no more than the base
+    class GraphicsContext.set_linestyle() - SC
+
+2005-03-09
+    Refactored contour functionality into dedicated module
+
+2005-03-09
+    Added Eric's contourf updates and Nadia's clabel functionality
+
+2005-03-09
+    Moved colorbar to figure.Figure to expose it for API developers - JDH
+
+2005-03-09
+    backend_cairo.py: implemented draw_markers() - SC
+
+2005-03-09
+    cbook.py: only use enumerate() (the python version) if the builtin version
+    is not available.  Add new function 'izip' which is set to itertools.izip
+    if available and the python equivalent if not available. - SC
+
+2005-03-07
+    backend_gdk.py: remove PIXELS_PER_INCH from points_to_pixels(), but still
+    use it to adjust font sizes. This allows the GTK version of line_styles.py
+    to more closely match GTKAgg, previously the markers were being drawn too
+    large. - SC
+
+2005-03-01
+    Added Eric's contourf routines
+
+2005-03-01
+    Added start of proper agg SWIG wrapper.  I would like to expose agg
+    functionality directly a the user level and this module will serve that
+    purpose eventually, and will hopefully take over most of the functionality
+    of the current _image and _backend_agg modules.  - JDH
+
+2005-02-28
+    Fixed polyfit / polyval to convert input args to float arrays - JDH
+
+2005-02-25
+    Add experimental feature to backend_gtk.py to enable/disable double
+    buffering (DBL_BUFFER=True/False) - SC
+
+2005-02-24
+    colors.py change ColorConverter.to_rgb() so it always returns rgb (and not
+    rgba), allow cnames keys to be cached, change the exception raised from
+    RuntimeError to ValueError (like hex2color()) hex2color() use a regular
+    expression to check the color string is valid  - SC
+
+2005-02-23
+    Added rc param ps.useafm so backend ps can use native afm fonts or
+    truetype.  afme breaks mathtext but causes much smaller font sizes and may
+    result in images that display better in some contexts (e.g., pdfs
+    incorporated into latex docs viewed in acrobat reader).  I would like to
+    extend this approach to allow the user to use truetype only for mathtext,
+    which should be easy.
+
+2005-02-23
+    Used sequence protocol rather than tuple in agg collection drawing routines
+    for greater flexibility - JDH
 
 --------------------------------
 
-2005-02-22 0.72.1 released
-
-2005-02-21 fixed linestyles for collections -- contour now dashes for
-           levels <0
+0.72.1 (2005-02-22)
+-------------------
 
-2005-02-21 fixed ps color bug - JDH
+2005-02-21
+    fixed linestyles for collections -- contour now dashes for levels <0
 
-2005-02-15 fixed missing qt file
+2005-02-21
+    fixed ps color bug - JDH
 
-2005-02-15 banished error_msg and report_error.  Internal backend
-           methods like error_msg_gtk are preserved.  backend writers,
-           check your backends, and diff against 0.72 to make sure I
-           did the right thing! - JDH
+2005-02-15
+    fixed missing qt file
 
+2005-02-15
+    banished error_msg and report_error.  Internal backend methods like
+    error_msg_gtk are preserved.  backend writers, check your backends, and
+    diff against 0.72 to make sure I did the right thing! - JDH
 
-2005-02-14 Added enthought traits to matplotlib tree - JDH
+2005-02-14
+    Added enthought traits to matplotlib tree - JDH
 
 ------------------------
 
-2005-02-14 0.72 released
+0.72 (2005-02-14)
+-----------------
 
-2005-02-14 fix bug in cbook alltrue() and onetrue() - SC
+2005-02-14
+    fix bug in cbook alltrue() and onetrue() - SC
 
-2005-02-11 updated qtagg backend from Ted - JDH
+2005-02-11
+    updated qtagg backend from Ted - JDH
 
-2005-02-11 matshow fixes for figure numbering, return value and docs - FP
+2005-02-11
+    matshow fixes for figure numbering, return value and docs - FP
 
-2005-02-09 new zorder example for fine control in zorder_demo.py - FP
+2005-02-09
+    new zorder example for fine control in zorder_demo.py - FP
 
-2005-02-09 backend renderer draw_lines now has transform in backend,
-           as in draw_markers; use numerix in _backend_agg, aded small
-           line optimization to agg
+2005-02-09
+    backend renderer draw_lines now has transform in backend, as in
+    draw_markers; use numerix in _backend_agg, added small line optimization to
+    agg
 
-2005-02-09 subplot now deletes axes that it overlaps
+2005-02-09
+    subplot now deletes axes that it overlaps
 
-2005-02-08 Added transparent support for gzipped files in load/save - Fernando
-           Perez (FP from now on).
+2005-02-08
+    Added transparent support for gzipped files in load/save - Fernando Perez
+    (FP from now on).
 
-2005-02-08 Small optimizations in PS backend.  They may have a big impact for
-           large plots, otherwise they don't hurt  - FP
+2005-02-08
+    Small optimizations in PS backend.  They may have a big impact for large
+    plots, otherwise they don't hurt  - FP
 
-2005-02-08 Added transparent support for gzipped files in load/save - Fernando
-           Perez (FP from now on).
+2005-02-08
+    Added transparent support for gzipped files in load/save - Fernando Perez
+    (FP from now on).
 
-2005-02-07 Added newstyle path drawing for markers - only implemented
-           in agg currently - JDH
+2005-02-07
+    Added newstyle path drawing for markers - only implemented in agg currently
+    - JDH
 
-2005-02-05 Some superscript text optimizations for ticking log plots
+2005-02-05
+    Some superscript text optimizations for ticking log plots
 
-2005-02-05 Added some default key press events to pylab figures: 'g'
-           toggles grid - JDH
+2005-02-05
+    Added some default key press events to pylab figures: 'g' toggles grid -
+    JDH
 
-2005-02-05 Added some support for handling log switching for lines
-           that have nonpos data - JDH
+2005-02-05
+    Added some support for handling log switching for lines that have nonpos
+    data - JDH
 
-2005-02-04 Added Nadia's contour patch - contour now has matlab
-           compatible syntax; this also fixed an unequal sized contour
-           array bug- JDH
+2005-02-04
+    Added Nadia's contour patch - contour now has matlab compatible syntax;
+    this also fixed an unequal sized contour array bug- JDH
 
-2005-02-04 Modified GTK backends to allow the FigureCanvas to be resized
-       smaller than its original size - SC
+2005-02-04
+    Modified GTK backends to allow the FigureCanvas to be resized smaller than
+    its original size - SC
 
-2005-02-02 Fixed a bug in dates mx2num - JDH
+2005-02-02
+    Fixed a bug in dates mx2num - JDH
 
-2005-02-02 Incorporated Fernando's matshow - JDH
+2005-02-02
+    Incorporated Fernando's matshow - JDH
 
-2005-02-01 Added Fernando's figure num patch, including experimental
-           support for pylab backend switching, LineCOllection.color
-           warns, savefig now a figure method, fixed a close(fig) bug
-           - JDH
+2005-02-01
+    Added Fernando's figure num patch, including experimental support for pylab
+    backend switching, LineCOllection.color warns, savefig now a figure method,
+    fixed a close(fig) bug - JDH
 
-2005-01-31 updated datalim in contour - JDH
+2005-01-31
+    updated datalim in contour - JDH
 
-2005-01-30 Added backend_qtagg.py provided by Sigve Tjora - SC
+2005-01-30
+    Added backend_qtagg.py provided by Sigve Tjora - SC
 
-2005-01-28 Added tk.inspect rc param to .matplotlibrc.  IDLE users
-           should set tk.pythoninspect:True and interactive:True and
-           backend:TkAgg
+2005-01-28
+    Added tk.inspect rc param to .matplotlibrc.  IDLE users should set
+    tk.pythoninspect:True and interactive:True and backend:TkAgg
 
-2005-01-28 Replaced examples/interactive.py with an updated script from
-           Fernando Perez - SC
+2005-01-28
+    Replaced examples/interactive.py with an updated script from Fernando Perez
+    - SC
 
-2005-01-27 Added support for shared x or y axes.  See
-           examples/shared_axis_demo.py and examples/ganged_plots.py
+2005-01-27
+    Added support for shared x or y axes.  See examples/shared_axis_demo.py and
+    examples/ganged_plots.py
 
-2005-01-27 Added Lee's patch for missing symbols \leq and \LEFTbracket
-           to _mathtext_data - JDH
+2005-01-27
+    Added Lee's patch for missing symbols \leq and \LEFTbracket to
+    _mathtext_data - JDH
 
-2005-01-26 Added Baptiste's two scales patch -- see help(twinx) in the
-           pylab interface for more info.  See also
-           examples/two_scales.py
+2005-01-26
+    Added Baptiste's two scales patch -- see help(twinx) in the pylab interface
+    for more info.  See also examples/two_scales.py
 
-2005-01-24 Fixed a mathtext parser bug that prevented font changes in
-           sub/superscripts - JDH
+2005-01-24
+    Fixed a mathtext parser bug that prevented font changes in sub/superscripts
+    - JDH
 
-2005-01-24 Fixed contour to work w/ interactive changes in colormaps,
-           clim, etc - JDH
+2005-01-24
+    Fixed contour to work w/ interactive changes in colormaps, clim, etc - JDH
 
 -----------------------------
 
-2005-01-21 matplotlib-0.71 released
+0.71 (2005-01-21)
+-----------------
 
-2005-01-21 Refactored numerix to solve vexing namespace issues - JDH
+2005-01-21
+    Refactored numerix to solve vexing namespace issues - JDH
 
-2005-01-21 Applied Nadia's contour bug fix - JDH
+2005-01-21
+    Applied Nadia's contour bug fix - JDH
 
-2005-01-20 Made some changes to the contour routine - particularly
-           region=1 seems t fix a lot of the zigzag strangeness.
-           Added colormaps as default for contour - JDH
+2005-01-20
+    Made some changes to the contour routine - particularly region=1 seems t
+    fix a lot of the zigzag strangeness.  Added colormaps as default for
+    contour - JDH
 
-2005-01-19 Restored builtin names which were overridden (min, max,
-           abs, round, and sum) in pylab.  This is a potentially
-           significant change for those who were relying on an array
-           version of those functions that previously overrode builtin
-           function names. - ADS
+2005-01-19
+    Restored builtin names which were overridden (min, max, abs, round, and
+    sum) in pylab.  This is a potentially significant change for those who were
+    relying on an array version of those functions that previously overrode
+    builtin function names. - ADS
 
-2005-01-18 Added accents to mathtext: \hat, \breve, \grave, \bar,
-           \acute, \tilde, \vec, \dot, \ddot.  All of them have the
-           same syntax, e.g., to make an overbar you do \bar{o} or to
-           make an o umlaut you do \ddot{o}. The shortcuts are also
-           provided, e.g., \"o \'e \`e \~n \.x \^y - JDH
+2005-01-18
+    Added accents to mathtext: \hat, \breve, \grave, \bar, \acute, \tilde,
+    \vec, \dot, \ddot.  All of them have the same syntax, e.g., to make an
+    overbar you do \bar{o} or to make an o umlaut you do \ddot{o}. The
+    shortcuts are also provided, e.g., \"o \'e \`e \~n \.x \^y - JDH
 
-2005-01-18 Plugged image resize memory leaks - JDH
+2005-01-18
+    Plugged image resize memory leaks - JDH
 
-2005-01-18 Fixed some mathtext parser problems relating to superscripts
+2005-01-18
+    Fixed some mathtext parser problems relating to superscripts
 
-2005-01-17 Fixed a yticklabel problem for colorbars under change of
-           clim - JDH
+2005-01-17
+    Fixed a yticklabel problem for colorbars under change of clim - JDH
 
-2005-01-17 Cleaned up Destroy handling in wx reducing memleak/fig from
-           approx 800k to approx 6k- JDH
+2005-01-17
+    Cleaned up Destroy handling in wx reducing memleak/fig from approx 800k to
+    approx 6k- JDH
 
-2005-01-17 Added kappa to latex_to_bakoma - JDH
+2005-01-17
+    Added kappa to latex_to_bakoma - JDH
 
-2005-01-15 Support arbitrary colorbar axes and horizontal colorbars - JDH
+2005-01-15
+    Support arbitrary colorbar axes and horizontal colorbars - JDH
 
-2005-01-15 Fixed colormap number of colors bug so that the colorbar
-           has the same discretization as the image - JDH
+2005-01-15
+    Fixed colormap number of colors bug so that the colorbar has the same
+    discretization as the image - JDH
 
-2005-01-15 Added Nadia's x,y contour fix - JDH
+2005-01-15
+    Added Nadia's x,y contour fix - JDH
 
-2005-01-15 backend_cairo: added PDF support which requires pycairo 0.1.4.
-           Its not usable yet, but is ready for when the Cairo PDF backend
-           matures - SC
+2005-01-15
+    backend_cairo: added PDF support which requires pycairo 0.1.4.  Its not
+    usable yet, but is ready for when the Cairo PDF backend matures - SC
 
-2005-01-15 Added Nadia's x,y contour fix
+2005-01-15
+    Added Nadia's x,y contour fix
 
-2005-01-12 Fixed set clip_on bug in artist - JDH
+2005-01-12
+    Fixed set clip_on bug in artist - JDH
 
-2005-01-11 Reverted pythoninspect in tkagg - JDH
+2005-01-11
+    Reverted pythoninspect in tkagg - JDH
 
-2005-01-09 Fixed a backend_bases event bug caused when an event is
-           triggered when location is None - JDH
+2005-01-09
+    Fixed a backend_bases event bug caused when an event is triggered when
+    location is None - JDH
 
-2005-01-07 Add patch from Stephen Walton to fix bug in pylab.load()
-           when the % character is included in a comment. - ADS
+2005-01-07
+    Add patch from Stephen Walton to fix bug in pylab.load() when the %
+    character is included in a comment. - ADS
 
-2005-01-07 Added markerscale attribute to Legend class.  This allows
-           the marker size in the legend to be adjusted relative to
-           that in the plot. - ADS
+2005-01-07
+    Added markerscale attribute to Legend class.  This allows the marker size
+    in the legend to be adjusted relative to that in the plot. - ADS
 
-2005-01-06 Add patch from Ben Vanhaeren to make the FigureManagerGTK vbox a
-           public attribute - SC
+2005-01-06
+    Add patch from Ben Vanhaeren to make the FigureManagerGTK vbox a public
+    attribute - SC
 
 ----------------------------
 
-2004-12-30 Release 0.70
+2004-12-30
+    Release 0.70
 
-2004-12-28 Added coord location to key press and added a
-           examples/picker_demo.py
+2004-12-28
+    Added coord location to key press and added a examples/picker_demo.py
 
-2004-12-28 Fixed coords notification in wx toolbar - JDH
+2004-12-28
+    Fixed coords notification in wx toolbar - JDH
 
-2004-12-28 Moved connection and disconnection event handling to the
-           FigureCanvasBase.  Backends now only need to connect one
-           time for each of the button press, button release and key
-           press/release functions.  The base class deals with
-           callbacks and multiple connections.  This fixes flakiness
-           on some backends (tk, wx) in the presence of multiple
-           connections and/or disconnect - JDH
+2004-12-28
+    Moved connection and disconnection event handling to the FigureCanvasBase.
+    Backends now only need to connect one time for each of the button press,
+    button release and key press/release functions.  The base class deals with
+    callbacks and multiple connections.  This fixes flakiness on some backends
+    (tk, wx) in the presence of multiple connections and/or disconnect - JDH
 
-2004-12-27 Fixed PS mathtext bug where color was not set - Jochen
-           please verify correct - JDH
+2004-12-27
+    Fixed PS mathtext bug where color was not set - Jochen please verify
+    correct - JDH
 
-2004-12-27 Added Shadow class and added shadow kwarg to legend and pie
-           for shadow effect - JDH
+2004-12-27
+    Added Shadow class and added shadow kwarg to legend and pie for shadow
+    effect - JDH
 
-2004-12-27 Added pie charts and new example/pie_demo.py
+2004-12-27
+    Added pie charts and new example/pie_demo.py
 
-2004-12-23 Fixed an agg text rotation alignment bug, fixed some text
-           kwarg processing bugs, and added examples/text_rotation.py
-           to explain and demonstrate how text rotations and alignment
-           work in matplotlib. - JDH
+2004-12-23
+    Fixed an agg text rotation alignment bug, fixed some text kwarg processing
+    bugs, and added examples/text_rotation.py to explain and demonstrate how
+    text rotations and alignment work in matplotlib. - JDH
 
 -----------------------
 
-2004-12-22 0.65.1 released - JDH
+0.65.1 (2004-12-22)
+-------------------
 
-2004-12-22 Fixed colorbar bug which caused colorbar not to respond to
-           changes in colormap in some instances - JDH
+2004-12-22
+    Fixed colorbar bug which caused colorbar not to respond to changes in
+    colormap in some instances - JDH
 
-2004-12-22 Refactored NavigationToolbar in tkagg to support app
-           embedding , init now takes (canvas, window) rather than
-           (canvas, figman) - JDH
+2004-12-22
+    Refactored NavigationToolbar in tkagg to support app embedding , init now
+    takes (canvas, window) rather than (canvas, figman) - JDH
 
-2004-12-21 Refactored axes and subplot management - removed
-           add_subplot and add_axes from the FigureManager.  classic
-           toolbar updates are done via an observer pattern on the
-           figure using add_axobserver.  Figure now maintains the axes
-           stack (for gca) and supports axes deletion.  Ported changes
-           to GTK, Tk, Wx, and FLTK.  Please test!  Added delaxes - JDH
+2004-12-21
+    Refactored axes and subplot management - removed add_subplot and add_axes
+    from the FigureManager.  classic toolbar updates are done via an observer
+    pattern on the figure using add_axobserver.  Figure now maintains the axes
+    stack (for gca) and supports axes deletion.  Ported changes to GTK, Tk, Wx,
+    and FLTK.  Please test!  Added delaxes - JDH
 
-2004-12-21 Lots of image optimizations - 4x performance boost over
-           0.65 JDH
+2004-12-21
+    Lots of image optimizations - 4x performance boost over 0.65 JDH
 
-2004-12-20 Fixed a figimage bug where the axes is shown and modified
-           tkagg to move the destroy binding into the show method.
+2004-12-20
+    Fixed a figimage bug where the axes is shown and modified tkagg to move the
+    destroy binding into the show method.
 
-2004-12-18 Minor refactoring of NavigationToolbar2 to support
-           embedding in an application - JDH
+2004-12-18
+    Minor refactoring of NavigationToolbar2 to support embedding in an
+    application - JDH
 
-2004-12-14 Added linestyle to collections (currently broken) -  JDH
+2004-12-14
+    Added linestyle to collections (currently broken) -  JDH
 
-2004-12-14 Applied Nadia's setupext patch to fix libstdc++ link
-           problem with contour and solaris  -JDH
+2004-12-14
+    Applied Nadia's setupext patch to fix libstdc++ link problem with contour
+    and solaris  -JDH
 
-2004-12-14 A number of pychecker inspired fixes, including removal of
-           True and False from cbook which I erroneously thought was
-           needed for python2.2 - JDH
+2004-12-14
+    A number of pychecker inspired fixes, including removal of True and False
+    from cbook which I erroneously thought was needed for python2.2 - JDH
 
-2004-12-14 Finished porting doc strings for set introspection.
-           Used silent_list for many get funcs that return
-           lists. JDH
+2004-12-14
+    Finished porting doc strings for set introspection.  Used silent_list for
+    many get funcs that return lists. JDH
 
-2004-12-13 dates.py: removed all timezone() calls, except for UTC - SC
+2004-12-13
+    dates.py: removed all timezone() calls, except for UTC - SC
 
 ----------------------------
 
-2004-12-13 0.65 released - JDH
-
-2004-12-13 colors.py: rgb2hex(), hex2color() made simpler (and faster), also
-           rgb2hex() - added round() instead of integer truncation
-           hex2color() - changed 256.0 divisor to 255.0, so now
-           '#ffffff' becomes (1.0,1.0,1.0) not (0.996,0.996,0.996) - SC
+0.65 (2004-12-13)
+-----------------
 
-2004-12-11 Added ion and ioff to pylab interface - JDH
+2004-12-13
+    colors.py: rgb2hex(), hex2color() made simpler (and faster), also rgb2hex()
+    - added round() instead of integer truncation hex2color() - changed 256.0
+    divisor to 255.0, so now '#ffffff' becomes (1.0,1.0,1.0) not
+    (0.996,0.996,0.996) - SC
 
-2004-12-11 backend_template.py: delete FigureCanvasTemplate.realize() - most
-           backends don't use it and its no longer needed
+2004-12-11
+    Added ion and ioff to pylab interface - JDH
 
-           backend_ps.py, backend_svg.py: delete show() and
-           draw_if_interactive() - they are not needed for image backends
+2004-12-11
+    backend_template.py: delete FigureCanvasTemplate.realize() - most backends
+    don't use it and its no longer needed
 
-           backend_svg.py: write direct to file instead of StringIO
-           - SC
+    backend_ps.py, backend_svg.py: delete show() and draw_if_interactive() -
+    they are not needed for image backends
 
-2004-12-10 Added zorder to artists to control drawing order of lines,
-           patches and text in axes.  See examples/zoder_demo.py - JDH
+    backend_svg.py: write direct to file instead of StringIO
 
-2004-12-10 Fixed colorbar bug with scatter - JDH
+    - SC
 
-2004-12-10 Added Nadia Dencheva <dencheva@stsci.edu> contour code - JDH
+2004-12-10
+    Added zorder to artists to control drawing order of lines, patches and text
+    in axes.  See examples/zoder_demo.py - JDH
 
-2004-12-10 backend_cairo.py: got mathtext working - SC
+2004-12-10
+    Fixed colorbar bug with scatter - JDH
 
-2004-12-09 Added Norm Peterson's svg clipping patch
+2004-12-10
+    Added Nadia Dencheva <dencheva@stsci.edu> contour code - JDH
 
-2004-12-09 Added Matthew Newville's wx printing patch
+2004-12-10
+    backend_cairo.py: got mathtext working - SC
 
-2004-12-09 Migrated matlab to pylab - JDH
+2004-12-09
+    Added Norm Peterson's svg clipping patch
 
-2004-12-09 backend_gtk.py: split into two parts
-           - backend_gdk.py - an image backend
-           - backend_gtk.py - A GUI backend that uses GDK - SC
+2004-12-09
+    Added Matthew Newville's wx printing patch
 
-2004-12-08 backend_gtk.py: remove quit_after_print_xvfb(\*args), show_xvfb(),
-           Dialog_MeasureTool(gtk.Dialog) one month after sending mail to
-           matplotlib-users asking if anyone still uses these functions - SC
+2004-12-09
+    Migrated matlab to pylab - JDH
 
-2004-12-02 backend_bases.py, backend_template.py: updated some of the method
-           documentation to make them consistent with each other - SC
+2004-12-09
+    backend_gtk.py: split into two parts
 
-2004-12-04 Fixed multiple bindings per event for TkAgg mpl_connect and
-           mpl_disconnect.  Added a "test_disconnect" command line
-           parameter to coords_demo.py  JTM
+    - backend_gdk.py - an image backend
+    - backend_gtk.py - A GUI backend that uses GDK - SC
 
-2004-12-04 Fixed some legend bugs JDH
+2004-12-08
+    backend_gtk.py: remove quit_after_print_xvfb(\*args), show_xvfb(),
+    Dialog_MeasureTool(gtk.Dialog) one month after sending mail to
+    matplotlib-users asking if anyone still uses these functions - SC
 
-2004-11-30 Added over command for oneoff over plots.  e.g., over(plot, x,
-           y, lw=2).  Works with any plot function.
+2004-12-02
+    backend_bases.py, backend_template.py: updated some of the method
+    documentation to make them consistent with each other - SC
 
-2004-11-30 Added bbox property to text - JDH
+2004-12-04
+    Fixed multiple bindings per event for TkAgg mpl_connect and mpl_disconnect.
+    Added a "test_disconnect" command line parameter to coords_demo.py  JTM
 
-2004-11-29 Zoom to rect now respect reversed axes limits (for both
-           linear and log axes). - GL
+2004-12-04
+    Fixed some legend bugs JDH
 
-2004-11-29 Added the over command to the matlab interface.  over
-           allows you to add an overlay plot regardless of hold
-           state. - JDH
+2004-11-30
+    Added over command for oneoff over plots.  e.g., over(plot, x, y, lw=2).
+    Works with any plot function.
 
-2004-11-25 Added Printf to mplutils for printf style format string
-           formatting in C++ (should help write better exceptions)
+2004-11-30
+    Added bbox property to text - JDH
 
-2004-11-24 IMAGE_FORMAT: remove from agg and gtkagg backends as its no longer
-           used - SC
+2004-11-29
+    Zoom to rect now respect reversed axes limits (for both linear and log
+    axes). - GL
 
-2004-11-23 Added matplotlib compatible set and get introspection.  See
-           set_and_get.py
+2004-11-29
+    Added the over command to the matlab interface.  over allows you to add an
+    overlay plot regardless of hold state. - JDH
 
-2004-11-23 applied Norbert's patched and exposed legend configuration
-           to kwargs - JDH
+2004-11-25
+    Added Printf to mplutils for printf style format string formatting in C++
+    (should help write better exceptions)
 
-2004-11-23 backend_gtk.py: added a default exception handler - SC
+2004-11-24
+    IMAGE_FORMAT: remove from agg and gtkagg backends as its no longer used -
+    SC
 
-2004-11-18 backend_gtk.py: change so that the backend knows about all image
-           formats and does not need to use IMAGE_FORMAT in other backends - SC
+2004-11-23
+    Added matplotlib compatible set and get introspection.  See set_and_get.py
 
-2004-11-18 Fixed some report_error bugs in string interpolation as
-           reported on SF bug tracker- JDH
+2004-11-23
+    applied Norbert's patched and exposed legend configuration to kwargs - JDH
 
-2004-11-17 backend_gtkcairo.py: change so all print_figure() calls render using
-           Cairo and get saved using backend_gtk.print_figure() - SC
+2004-11-23
+    backend_gtk.py: added a default exception handler - SC
 
-2004-11-13 backend_cairo.py: Discovered the magic number (96) required for
-           Cairo PS plots to come out the right size. Restored Cairo PS output
-           and added support for landscape mode - SC
+2004-11-18
+    backend_gtk.py: change so that the backend knows about all image formats
+    and does not need to use IMAGE_FORMAT in other backends - SC
 
-2004-11-13 Added ishold - JDH
+2004-11-18
+    Fixed some report_error bugs in string interpolation as reported on SF bug
+    tracker- JDH
 
-2004-11-12 Added many new matlab colormaps - autumn bone cool copper
-           flag gray hot hsv jet pink prism spring summer winter - PG
+2004-11-17
+    backend_gtkcairo.py: change so all print_figure() calls render using Cairo
+    and get saved using backend_gtk.print_figure() - SC
 
-2004-11-11 greatly simplify the emitted postscript code - JV
+2004-11-13
+    backend_cairo.py: Discovered the magic number (96) required for Cairo PS
+    plots to come out the right size. Restored Cairo PS output and added
+    support for landscape mode - SC
 
-2004-11-12 Added new plotting functions spy, spy2 for sparse matrix
-           visualization - JDH
+2004-11-13
+    Added ishold - JDH
 
-2004-11-11 Added rgrids, thetragrids for customizing the grid
-           locations and labels for polar plots - JDH
+2004-11-12
+    Added many new matlab colormaps - autumn bone cool copper flag gray hot hsv
+    jet pink prism spring summer winter - PG
 
-2004-11-11 make the Gtk backends build without an X-server connection - JV
+2004-11-11
+    greatly simplify the emitted postscript code - JV
 
-2004-11-10 matplotlib/__init__.py: Added FROZEN to signal we are running under
-           py2exe (or similar) - is used by backend_gtk.py - SC
+2004-11-12
+    Added new plotting functions spy, spy2 for sparse matrix visualization -
+    JDH
 
-2004-11-09 backend_gtk.py: Made fix suggested by maffew@cat.org.au
-           to prevent problems when py2exe calls pygtk.require(). - SC
+2004-11-11
+    Added rgrids, thetragrids for customizing the grid locations and labels for
+    polar plots - JDH
 
-2004-11-09 backend_cairo.py: Added support for printing to a fileobject.
-           Disabled cairo PS output which is not working correctly. - SC
+2004-11-11
+    make the Gtk backends build without an X-server connection - JV
 
-----------------------------------
+2004-11-10
+    matplotlib/__init__.py: Added FROZEN to signal we are running under py2exe
+    (or similar) - is used by backend_gtk.py - SC
 
-2004-11-08 matplotlib-0.64 released
+2004-11-09
+    backend_gtk.py: Made fix suggested by maffew@cat.org.au to prevent problems
+    when py2exe calls pygtk.require(). - SC
 
-2004-11-04 Changed -dbackend processing to only use known backends, so
-           we don't clobber other non-matplotlib uses of -d, like -debug.
+2004-11-09
+    backend_cairo.py: Added support for printing to a fileobject.  Disabled
+    cairo PS output which is not working correctly. - SC
 
-2004-11-04 backend_agg.py: added IMAGE_FORMAT to list the formats that the
-           backend can save to.
-           backend_gtkagg.py: added support for saving JPG files by using the
-           GTK backend - SC
+----------------------------------
 
-2004-10-31 backend_cairo.py: now produces png and ps files (although the figure
-           sizing needs some work). pycairo did not wrap all the necessary
-           functions, so I wrapped them myself, they are included in the
-           backend_cairo.py doc string. - SC
+0.64 (2004-11-08)
+-----------------
+
+2004-11-04
+    Changed -dbackend processing to only use known backends, so we don't
+    clobber other non-matplotlib uses of -d, like -debug.
+
+2004-11-04
+    backend_agg.py: added IMAGE_FORMAT to list the formats that the backend can
+    save to.  backend_gtkagg.py: added support for saving JPG files by using
+    the GTK backend - SC
 
-2004-10-31 backend_ps.py: clean up the generated PostScript code, use
-           the PostScript stack to hold itermediate values instead of
-           storing them in the dictionary. - JV
+2004-10-31
+    backend_cairo.py: now produces png and ps files (although the figure sizing
+    needs some work). pycairo did not wrap all the necessary functions, so I
+    wrapped them myself, they are included in the backend_cairo.py doc string.
+    - SC
 
-2004-10-30 backend_ps.py, ft2font.cpp, ft2font.h: fix the position of
-           text in the PostScript output.  The new FT2Font method
-           get_descent gives the distance between the lower edge of
-           the bounding box and the baseline of a string.  In
-           backend_ps the text is shifted upwards by this amount. - JV
+2004-10-31
+    backend_ps.py: clean up the generated PostScript code, use the PostScript
+    stack to hold intermediate values instead of storing them in the dictionary.
+    - JV
 
-2004-10-30 backend_ps.py: clean up the code a lot.  Change the
-           PostScript output to be more DSC compliant.  All
-           definitions for the generated PostScript are now in a
-           PostScript dictionary 'mpldict'.  Moved the long comment
-           about drawing ellipses from the PostScript output into a
-           Python comment. - JV
+2004-10-30
+    backend_ps.py, ft2font.cpp, ft2font.h: fix the position of text in the
+    PostScript output.  The new FT2Font method get_descent gives the distance
+    between the lower edge of the bounding box and the baseline of a string.
+    In backend_ps the text is shifted upwards by this amount. - JV
 
-2004-10-30 backend_gtk.py: removed FigureCanvasGTK.realize() as its no longer
-           needed. Merged ColorManager into GraphicsContext
-           backend_bases.py: For set_capstyle/joinstyle() only set cap or
-           joinstyle if there is no error. - SC
+2004-10-30
+    backend_ps.py: clean up the code a lot.  Change the PostScript output to be
+    more DSC compliant.  All definitions for the generated PostScript are now
+    in a PostScript dictionary 'mpldict'.  Moved the long comment about drawing
+    ellipses from the PostScript output into a Python comment. - JV
 
-2004-10-30 backend_gtk.py: tidied up print_figure() and removed some of the
-           dependency on widget events - SC
+2004-10-30
+    backend_gtk.py: removed FigureCanvasGTK.realize() as its no longer needed.
+    Merged ColorManager into GraphicsContext backend_bases.py: For
+    set_capstyle/joinstyle() only set cap or joinstyle if there is no error. -
+    SC
 
-2004-10-28 backend_cairo.py: The renderer is complete except for mathtext,
-           draw_image() and clipping. gtkcairo works reasonably well. cairo
-           does not yet create any files since I can't figure how to set the
-           'target surface', I don't think pycairo wraps the required functions
-           - SC
+2004-10-30
+    backend_gtk.py: tidied up print_figure() and removed some of the dependency
+    on widget events - SC
 
-2004-10-28 backend_gtk.py: Improved the save dialog (GTK 2.4 only) so it
-           presents the user with a menu of supported image formats - SC
+2004-10-28
+    backend_cairo.py: The renderer is complete except for mathtext,
+    draw_image() and clipping. gtkcairo works reasonably well. cairo does not
+    yet create any files since I can't figure how to set the 'target surface',
+    I don't think pycairo wraps the required functions - SC
 
-2004-10-28 backend_svg.py: change print_figure() to restore original face/edge
-           color
-           backend_ps.py : change print_figure() to ensure original face/edge
-           colors are restored even if there's an IOError - SC
+2004-10-28
+    backend_gtk.py: Improved the save dialog (GTK 2.4 only) so it presents the
+    user with a menu of supported image formats - SC
 
-2004-10-27 Applied Norbert's errorbar patch to support barsabove kwarg
+2004-10-28
+    backend_svg.py: change print_figure() to restore original face/edge color
+    backend_ps.py : change print_figure() to ensure original face/edge colors
+    are restored even if there's an IOError - SC
 
-2004-10-27 Applied Norbert's legend patch to support None handles
+2004-10-27
+    Applied Norbert's errorbar patch to support barsabove kwarg
 
-2004-10-27 Added two more backends: backend_cairo.py, backend_gtkcairo.py
-           They are not complete yet, currently backend_gtkcairo just renders
-           polygons, rectangles and lines - SC
+2004-10-27
+    Applied Norbert's legend patch to support None handles
 
-2004-10-21 Added polar axes and plots - JDH
+2004-10-27
+    Added two more backends: backend_cairo.py, backend_gtkcairo.py They are not
+    complete yet, currently backend_gtkcairo just renders polygons, rectangles
+    and lines - SC
 
-2004-10-20 Fixed corrcoef bug exposed by corrcoef(X) where X is matrix
-           - JDH
+2004-10-21
+    Added polar axes and plots - JDH
 
-2004-10-19 Added kwarg support to xticks and yticks to set ticklabel
-           text properties -- thanks to T. Edward Whalen for the suggestion
+2004-10-20
+    Fixed corrcoef bug exposed by corrcoef(X) where X is matrix - JDH
 
-2004-10-19 Added support for PIL images in imshow(), image.py - ADS
+2004-10-19
+    Added kwarg support to xticks and yticks to set ticklabel text properties
+    -- thanks to T. Edward Whalen for the suggestion
 
-2004-10-19 Re-worked exception handling in _image.py and _transforms.py
-           to avoid masking problems with shared libraries.  - JTM
+2004-10-19
+    Added support for PIL images in imshow(), image.py - ADS
 
-2004-10-16 Streamlined the matlab interface wrapper, removed the
-           noplot option to hist - just use mlab.hist instead.
+2004-10-19
+    Re-worked exception handling in _image.py and _transforms.py to avoid
+    masking problems with shared libraries.  - JTM
 
-2004-09-30 Added Andrew Dalke's strftime code to extend the range of
-           dates supported by the DateFormatter - JDH
+2004-10-16
+    Streamlined the matlab interface wrapper, removed the noplot option to hist
+    - just use mlab.hist instead.
 
-2004-09-30 Added barh - JDH
+2004-09-30
+    Added Andrew Dalke's strftime code to extend the range of dates supported
+    by the DateFormatter - JDH
 
-2004-09-30 Removed fallback to alternate array package from numerix
-           so that ImportErrors are easier to debug.           JTM
+2004-09-30
+    Added barh - JDH
 
-2004-09-30 Add GTK+ 2.4 support for the message in the toolbar. SC
+2004-09-30
+    Removed fallback to alternate array package from numerix so that
+    ImportErrors are easier to debug.  - JTM
 
-2004-09-30 Made some changes to support python22 - lots of doc
-           fixes. - JDH
+2004-09-30
+    Add GTK+ 2.4 support for the message in the toolbar. SC
 
-2004-09-29 Added a Verbose class for reporting - JDH
+2004-09-30
+    Made some changes to support python22 - lots of doc fixes. - JDH
+
+2004-09-29
+    Added a Verbose class for reporting - JDH
 
 ------------------------------------
 
-2004-09-28 Released 0.63.0
-
-2004-09-28 Added save to file object for agg - see
-           examples/print_stdout.py
-
-2004-09-24 Reorganized all py code to lib subdir
-
-2004-09-24 Fixed axes resize image edge effects on interpolation -
-           required upgrade to agg22 which fixed an agg bug related to
-           this problem
-
-2004-09-20 Added toolbar2 message display for backend_tkagg.  JTM
-
-
-2004-09-17 Added coords formatter attributes.  These must be callable,
-           and return a string for the x or y data. These will be used
-           to format the x and y data for the coords box.  Default is
-           the axis major formatter.  e.g.:
-
-         # format the coords message box
-         def price(x): return '$%1.2f'%x
-         ax.format_xdata = DateFormatter('%Y-%m-%d')
-         ax.format_ydata = price
-
-
-2004-09-17 Total rewrite of dates handling to use python datetime with
-           num2date, date2num and drange.  pytz for timezone handling,
-           dateutils for spohisticated ticking.  date ranges from
-           0001-9999 are supported.  rrules allow arbitrary date
-           ticking.  examples/date_demo*.py converted to show new
-           usage.  new example examples/date_demo_rrule.py shows how
-           to use rrules in date plots.  The date locators are much
-           more general and almost all of them have different
-           constructors.  See matplotlib.dates for more info.
-
-2004-09-15 Applied Fernando's backend __init__ patch to support easier
-           backend maintenance.  Added his numutils to mlab.  JDH
-
-2004-09-16 Re-designated all files in matplotlib/images as binary and
-           w/o keyword substitution using "cvs admin -kb \*.svg ...".
-           See binary files in "info cvs" under Linux.  This was messing
-           up builds from CVS on windows since CVS was doing lf -> cr/lf
-           and keyword substitution on the bitmaps.  - JTM
-
-2004-09-15 Modified setup to build array-package-specific extensions
-           for those extensions which are array-aware.  Setup builds
-           extensions automatically for either Numeric, numarray, or
-           both, depending on what you have installed.  Python proxy
-           modules for the array-aware extensions import the version
-           optimized for numarray or Numeric determined by numerix.
-           - JTM
-
-2004-09-15 Moved definitions of infinity from mlab to numerix to avoid
-           divide by zero warnings for numarray - JTM
-
-2004-09-09 Added axhline, axvline, axhspan and axvspan
+2004-09-28
+    Released 0.63.0
+
+2004-09-28
+    Added save to file object for agg - see examples/print_stdout.py
+
+2004-09-24
+    Reorganized all py code to lib subdir
+
+2004-09-24
+    Fixed axes resize image edge effects on interpolation - required upgrade to
+    agg22 which fixed an agg bug related to this problem
+
+2004-09-20
+    Added toolbar2 message display for backend_tkagg.  JTM
+
+2004-09-17
+    Added coords formatter attributes.  These must be callable, and return a
+    string for the x or y data. These will be used to format the x and y data
+    for the coords box.  Default is the axis major formatter.  e.g.::
+
+        # format the coords message box
+        def price(x): return '$%1.2f'%x
+        ax.format_xdata = DateFormatter('%Y-%m-%d')
+        ax.format_ydata = price
+
+2004-09-17
+    Total rewrite of dates handling to use python datetime with num2date,
+    date2num and drange.  pytz for timezone handling, dateutils for
+    spohisticated ticking.  date ranges from 0001-9999 are supported.  rrules
+    allow arbitrary date ticking.  examples/date_demo*.py converted to show new
+    usage.  new example examples/date_demo_rrule.py shows how to use rrules in
+    date plots.  The date locators are much more general and almost all of them
+    have different constructors.  See matplotlib.dates for more info.
+
+2004-09-15
+    Applied Fernando's backend __init__ patch to support easier backend
+    maintenance.  Added his numutils to mlab.  JDH
+
+2004-09-16
+    Re-designated all files in matplotlib/images as binary and w/o keyword
+    substitution using "cvs admin -kb \*.svg ...".  See binary files in "info
+    cvs" under Linux.  This was messing up builds from CVS on windows since CVS
+    was doing lf -> cr/lf and keyword substitution on the bitmaps.  - JTM
+
+2004-09-15
+    Modified setup to build array-package-specific extensions for those
+    extensions which are array-aware.  Setup builds extensions automatically
+    for either Numeric, numarray, or both, depending on what you have
+    installed.  Python proxy modules for the array-aware extensions import the
+    version optimized for numarray or Numeric determined by numerix.  - JTM
+
+2004-09-15
+    Moved definitions of infinity from mlab to numerix to avoid divide by zero
+    warnings for numarray - JTM
+
+2004-09-09
+    Added axhline, axvline, axhspan and axvspan
 
 -------------------------------
 
-2004-08-30 matplotlib 0.62.4 released
+0.62.4 (2004-08-30)
+-------------------
 
-2004-08-30 Fixed a multiple images with different extent bug,
-           Fixed markerfacecolor as RGB tuple
+2004-08-30
+    Fixed a multiple images with different extent bug, Fixed markerfacecolor as
+    RGB tuple
 
-2004-08-27 Mathtext now more than 5x faster.  Thanks to Paul Mcguire
-           for fixes both to pyparsing and to the matplotlib grammar!
-           mathtext broken on python2.2
+2004-08-27
+    Mathtext now more than 5x faster.  Thanks to Paul Mcguire for fixes both to
+    pyparsing and to the matplotlib grammar!  mathtext broken on python2.2
 
-2004-08-25 Exposed Darren's and Greg's log ticking and formatting
-           options to semilogx and friends
+2004-08-25
+    Exposed Darren's and Greg's log ticking and formatting options to semilogx
+    and friends
 
-2004-08-23 Fixed grid w/o args to toggle grid state - JDH
+2004-08-23
+    Fixed grid w/o args to toggle grid state - JDH
 
-2004-08-11 Added Gregory's log patches for major and minor ticking
+2004-08-11
+    Added Gregory's log patches for major and minor ticking
 
-2004-08-18 Some pixel edge effects fixes for images
+2004-08-18
+    Some pixel edge effects fixes for images
 
-2004-08-18 Fixed TTF files reads in backend_ps on win32.
+2004-08-18
+    Fixed TTF files reads in backend_ps on win32.
 
-2004-08-18 Added base and subs properties for logscale plots, user
-           modifiable using
-           set_[x,y]scale('log',base=b,subs=[mt1,mt2,...]) - GL
+2004-08-18
+    Added base and subs properties for logscale plots, user modifiable using
+    set_[x,y]scale('log',base=b,subs=[mt1,mt2,...]) - GL
 
-2004-08-18 fixed a bug exposed by trying to find the HOME dir on win32
-           thanks to Alan Issac for pointing to the light - JDH
+2004-08-18
+    fixed a bug exposed by trying to find the HOME dir on win32 thanks to Alan
+    Issac for pointing to the light - JDH
 
-2004-08-18 fixed errorbar bug in setting ecolor - JDH
+2004-08-18
+    fixed errorbar bug in setting ecolor - JDH
 
-2004-08-12 Added Darren Dale's exponential ticking patch
+2004-08-12
+    Added Darren Dale's exponential ticking patch
 
-2004-08-11 Added Gregory's fltkagg backend
+2004-08-11
+    Added Gregory's fltkagg backend
 
 ------------------------------
 
-2004-08-09 matplotlib-0.61.0 released
+0.61.0 (2004-08-09)
+-------------------
 
-2004-08-08 backend_gtk.py: get rid of the final PyGTK deprecation warning by
-           replacing gtkOptionMenu with gtkMenu in the 2.4 version of the
-           classic toolbar.
+2004-08-08
+    backend_gtk.py: get rid of the final PyGTK deprecation warning by replacing
+    gtkOptionMenu with gtkMenu in the 2.4 version of the classic toolbar.
 
-2004-08-06 Added Tk zoom to rect rectangle, proper idle drawing, and
-           keybinding - JDH
+2004-08-06
+    Added Tk zoom to rect rectangle, proper idle drawing, and keybinding - JDH
 
-2004-08-05 Updated installing.html and INSTALL - JDH
+2004-08-05
+    Updated installing.html and INSTALL - JDH
 
-2004-08-01 backend_gtk.py: move all drawing code into the expose_event()
+2004-08-01
+    backend_gtk.py: move all drawing code into the expose_event()
 
-2004-07-28 Added Greg's toolbar2 and backend_*agg patches - JDH
+2004-07-28
+    Added Greg's toolbar2 and backend_*agg patches - JDH
 
-2004-07-28 Added image.imread with support for loading png into
-           numerix arrays
+2004-07-28
+    Added image.imread with support for loading png into numerix arrays
 
-2004-07-28 Added key modifiers to events - implemented dynamic updates
-           and rubber banding for interactive pan/zoom - JDH
+2004-07-28
+    Added key modifiers to events - implemented dynamic updates and rubber
+    banding for interactive pan/zoom - JDH
 
-2004-07-27 did a readthrough of SVG, replacing all the string
-           additions with string interps for efficiency, fixed some
-           layout problems, added font and image support (through
-           external pngs) - JDH
+2004-07-27
+    did a readthrough of SVG, replacing all the string additions with string
+    interps for efficiency, fixed some layout problems, added font and image
+    support (through external pngs) - JDH
 
-2004-07-25 backend_gtk.py: modify toolbar2 to make it easier to support GTK+
-           2.4. Add GTK+ 2.4 toolbar support. - SC
+2004-07-25
+    backend_gtk.py: modify toolbar2 to make it easier to support GTK+ 2.4. Add
+    GTK+ 2.4 toolbar support. - SC
 
-2004-07-24 backend_gtk.py: Simplified classic toolbar creation - SC
+2004-07-24
+    backend_gtk.py: Simplified classic toolbar creation - SC
 
-2004-07-24 Added images/matplotlib.svg to be used when GTK+ windows are
-           minimised - SC
+2004-07-24
+    Added images/matplotlib.svg to be used when GTK+ windows are minimised - SC
 
-2004-07-22 Added right mouse click zoom for NavigationToolbar2 panning
-       mode. - JTM
+2004-07-22
+    Added right mouse click zoom for NavigationToolbar2 panning mode. - JTM
 
-2004-07-22 Added NavigationToolbar2 support to backend_tkagg.
-       Minor tweak to backend_bases.  - JTM
+2004-07-22
+    Added NavigationToolbar2 support to backend_tkagg.  Minor tweak to
+    backend_bases.  - JTM
 
-2004-07-22 Incorporated Gergory's renderer cache and buffer object
-           cache - JDH
+2004-07-22
+    Incorporated Gergory's renderer cache and buffer object cache - JDH
 
-2004-07-22 Backend_gtk.py: Added support for GtkFileChooser, changed
-           FileSelection/FileChooser so that only one instance pops up,
-           and made them both modal. - SC
+2004-07-22
+    Backend_gtk.py: Added support for GtkFileChooser, changed
+    FileSelection/FileChooser so that only one instance pops up, and made them
+    both modal. - SC
 
-2004-07-21 Applied backend_agg memory leak patch from hayden -
-           jocallo@online.no.  Found and fixed a leak in binary
-           operations on transforms.  Moral of the story: never incref
-           where you meant to decref!  Fixed several leaks in ft2font:
-           moral of story: almost always return Py::asObject over
-           Py::Object - JDH
+2004-07-21
+    Applied backend_agg memory leak patch from hayden - jocallo@online.no.
+    Found and fixed a leak in binary operations on transforms.  Moral of the
+    story: never incref where you meant to decref!  Fixed several leaks in
+    ft2font: moral of story: almost always return Py::asObject over Py::Object
+    - JDH
 
-2004-07-21 Fixed a to string memory allocation bug in agg and image
-           modules - JDH
+2004-07-21
+    Fixed a to string memory allocation bug in agg and image modules - JDH
 
-2004-07-21 Added mpl_connect and mpl_disconnect to matlab interface -
-           JDH
+2004-07-21
+    Added mpl_connect and mpl_disconnect to matlab interface - JDH
 
-2004-07-21 Added beginnings of users_guide to CVS - JDH
+2004-07-21
+    Added beginnings of users_guide to CVS - JDH
 
-2004-07-20 ported toolbar2 to wx
+2004-07-20
+    ported toolbar2 to wx
 
-2004-07-20 upgraded to agg21 - JDH
+2004-07-20
+    upgraded to agg21 - JDH
 
-2004-07-20 Added new icons for toolbar2 - JDH
+2004-07-20
+    Added new icons for toolbar2 - JDH
 
-2004-07-19 Added vertical mathtext for \*Agg and GTK - thanks Jim
-           Benson! - JDH
+2004-07-19
+    Added vertical mathtext for \*Agg and GTK - thanks Jim Benson! - JDH
 
-2004-07-16 Added ps/eps/svg savefig options to wx and gtk JDH
+2004-07-16
+    Added ps/eps/svg savefig options to wx and gtk JDH
 
-2004-07-15 Fixed python framework tk finder in setupext.py - JDH
+2004-07-15
+    Fixed python framework tk finder in setupext.py - JDH
 
-2004-07-14 Fixed layer images demo which was broken by the 07/12 image
-           extent fixes - JDH
+2004-07-14
+    Fixed layer images demo which was broken by the 07/12 image extent fixes -
+    JDH
 
-2004-07-13 Modified line collections to handle arbitrary length
-           segments for each line segment. - JDH
+2004-07-13
+    Modified line collections to handle arbitrary length segments for each line
+    segment. - JDH
 
-2004-07-13 Fixed problems with image extent and origin -
-           set_image_extent deprecated.  Use imshow(blah, blah,
-           extent=(xmin, xmax, ymin, ymax) instead  - JDH
+2004-07-13
+    Fixed problems with image extent and origin - set_image_extent deprecated.
+    Use imshow(blah, blah, extent=(xmin, xmax, ymin, ymax) instead  - JDH
 
-2004-07-12 Added prototype for new nav bar with codifed event
-           handling.  Use mpl_connect rather than connect for
-           matplotlib event handling.  toolbar style determined by rc
-           toolbar param.  backend status: gtk: prototype, wx: in
-           progress, tk: not started - JDH
+2004-07-12
+    Added prototype for new nav bar with codified event handling.  Use
+    mpl_connect rather than connect for matplotlib event handling.  toolbar
+    style determined by rc toolbar param.  backend status: gtk: prototype, wx:
+    in progress, tk: not started - JDH
 
-2004-07-11 backend_gtk.py: use builtin round() instead of redefining it.
-           - SC
+2004-07-11
+    backend_gtk.py: use builtin round() instead of redefining it.  - SC
 
-2004-07-10 Added embedding_in_wx3 example - ADS
+2004-07-10
+    Added embedding_in_wx3 example - ADS
 
-2004-07-09 Added dynamic_image_wxagg to examples - ADS
+2004-07-09
+    Added dynamic_image_wxagg to examples - ADS
 
-2004-07-09 added support for embedding TrueType fonts in PS files - PEB
+2004-07-09
+    added support for embedding TrueType fonts in PS files - PEB
 
-2004-07-09 fixed a sfnt bug exposed if font cache is not built
+2004-07-09
+    fixed a sfnt bug exposed if font cache is not built
 
-2004-07-09 added default arg None to matplotlib.matlab grid command to
-           toggle current grid state
+2004-07-09
+    added default arg None to matplotlib.matlab grid command to toggle current
+    grid state
 
 ---------------------
 
-2004-07-08 0.60.2 released
+0.60.2 (2004-07-08)
+-------------------
 
-2004-07-08 fixed a mathtext bug for '6'
+2004-07-08
+    fixed a mathtext bug for '6'
 
-2004-07-08 added some numarray bug workarounds
+2004-07-08
+    added some numarray bug workarounds
 
 --------------------------
 
-2004-07-07 0.60 released
-
-2004-07-07 Fixed a bug in dynamic_demo_wx
-
+0.60 (2004-07-07)
+-----------------
 
-2004-07-07 backend_gtk.py: raise SystemExit immediately if
-       'import pygtk' fails - SC
+2004-07-07
+    Fixed a bug in dynamic_demo_wx
 
-2004-07-05 Added new mathtext commands \over{sym1}{sym2} and
-           \under{sym1}{sym2}
+2004-07-07
+    backend_gtk.py: raise SystemExit immediately if 'import pygtk' fails - SC
 
-2004-07-05 Unified image and patch collections colormapping and
-           scaling args.  Updated docstrings for all - JDH
+2004-07-05
+    Added new mathtext commands \over{sym1}{sym2} and \under{sym1}{sym2}
 
-2004-07-05 Fixed a figure legend bug and added
-           examples/figlegend_demo.py - JDH
+2004-07-05
+    Unified image and patch collections colormapping and scaling args.  Updated
+    docstrings for all - JDH
 
-2004-07-01 Fixed a memory leak in image and agg to string methods
+2004-07-05
+    Fixed a figure legend bug and added examples/figlegend_demo.py - JDH
 
-2004-06-25 Fixed fonts_demo spacing problems and added a kwargs
-           version of the fonts_demo fonts_demo_kw.py - JDH
+2004-07-01
+    Fixed a memory leak in image and agg to string methods
 
-2004-06-25 finance.py: handle case when urlopen() fails - SC
+2004-06-25
+    Fixed fonts_demo spacing problems and added a kwargs version of the
+    fonts_demo fonts_demo_kw.py - JDH
 
-2004-06-24 Support for multiple images on axes and figure, with
-           blending.  Support for upper and lower image origins.
-           clim, jet and gray functions in matlab interface operate on
-           current image - JDH
+2004-06-25
+    finance.py: handle case when urlopen() fails - SC
 
-2004-06-23 ported code to Perry's new colormap and norm scheme.  Added
-           new rc attributes image.aspect, image.interpolation,
-           image.cmap, image.lut, image.origin
+2004-06-24
+    Support for multiple images on axes and figure, with blending.  Support for
+    upper and lower image origins.  clim, jet and gray functions in matlab
+    interface operate on current image - JDH
 
-2004-06-20 backend_gtk.py: replace gtk.TRUE/FALSE with True/False.
-       simplified _make_axis_menu(). - SC
+2004-06-23
+    ported code to Perry's new colormap and norm scheme.  Added new rc
+    attributes image.aspect, image.interpolation, image.cmap, image.lut,
+    image.origin
 
-2004-06-19 anim_tk.py: Updated to use TkAgg by default (not GTK)
-           backend_gtk_py: Added '_' in front of private widget
-           creation functions - SC
+2004-06-20
+    backend_gtk.py: replace gtk.TRUE/FALSE with True/False.  simplified
+    _make_axis_menu(). - SC
 
-2004-06-17 backend_gtk.py: Create a GC once in realise(), not every
-           time draw() is called. - SC
+2004-06-19
+    anim_tk.py: Updated to use TkAgg by default (not GTK) backend_gtk_py: Added
+    '_' in front of private widget creation functions - SC
 
-2004-06-16 Added new py2exe FAQ entry and added frozen support in
-           get_data_path for py2exe - JDH
+2004-06-17
+    backend_gtk.py: Create a GC once in realise(), not every time draw() is
+    called. - SC
 
-2004-06-16 Removed GTKGD, which was always just a proof-of-concept
-           backend - JDH
+2004-06-16
+    Added new py2exe FAQ entry and added frozen support in get_data_path for
+    py2exe - JDH
 
-2004-06-16 backend_gtk.py updates to replace deprecated functions
-       gtk.mainquit(), gtk.mainloop().
-           Update NavigationToolbar to use the new GtkToolbar API - SC
+2004-06-16
+    Removed GTKGD, which was always just a proof-of-concept backend - JDH
 
-2004-06-15 removed set_default_font from font_manager to unify font
-           customization using the new function rc.  See API_CHANGES
-           for more info.  The examples fonts_demo.py and
-           fonts_demo_kw.py are ported to the new API - JDH
+2004-06-16
+    backend_gtk.py updates to replace deprecated functions gtk.mainquit(),
+    gtk.mainloop().  Update NavigationToolbar to use the new GtkToolbar API -
+    SC
 
-2004-06-15 Improved (yet again!) axis scaling to properly handle
-           singleton plots - JDH
+2004-06-15
+    removed set_default_font from font_manager to unify font customization
+    using the new function rc.  See API_CHANGES for more info.  The examples
+    fonts_demo.py and fonts_demo_kw.py are ported to the new API - JDH
 
-2004-06-15 Restored the old FigureCanvasGTK.draw() - SC
+2004-06-15
+    Improved (yet again!) axis scaling to properly handle singleton plots - JDH
 
-2004-06-11 More memory leak fixes in transforms and ft2font - JDH
+2004-06-15
+    Restored the old FigureCanvasGTK.draw() - SC
 
-2004-06-11 Eliminated numerix .numerix file and environment variable
-       NUMERIX.  Fixed bug which prevented command line overrides:
-       --numarray or --numeric. - JTM
+2004-06-11
+    More memory leak fixes in transforms and ft2font - JDH
 
-2004-06-10 Added rc configuration function rc; deferred all rc param
-           setting until object creation time; added new rc attrs:
-           lines.markerfacecolor, lines.markeredgecolor,
-           lines.markeredgewidth, patch.linewidth, patch.facecolor,
-           patch.edgecolor, patch.antialiased; see
-           examples/customize_rc.py for usage - JDH
+2004-06-11
+    Eliminated numerix .numerix file and environment variable NUMERIX.  Fixed
+    bug which prevented command line overrides: --numarray or --numeric. - JTM
 
+2004-06-10
+    Added rc configuration function rc; deferred all rc param setting until
+    object creation time; added new rc attrs: lines.markerfacecolor,
+    lines.markeredgecolor, lines.markeredgewidth, patch.linewidth,
+    patch.facecolor, patch.edgecolor, patch.antialiased; see
+    examples/customize_rc.py for usage - JDH
 
 ---------------------------------------------------------------
 
-2004-06-09 0.54.2 released
+0.54.2 (2004-06-09)
+-------------------
 
-2004-06-08 Rewrote ft2font using CXX as part of general memory leak
-           fixes; also fixed transform memory leaks  - JDH
+2004-06-08
+    Rewrote ft2font using CXX as part of general memory leak fixes; also fixed
+    transform memory leaks  - JDH
 
-2004-06-07 Fixed several problems with log ticks and scaling - JDH
+2004-06-07
+    Fixed several problems with log ticks and scaling - JDH
 
-2004-06-07 Fixed width/height issues for images - JDH
+2004-06-07
+    Fixed width/height issues for images - JDH
 
-2004-06-03 Fixed draw_if_interactive bug for semilogx;
+2004-06-03
+    Fixed draw_if_interactive bug for semilogx;
 
-2004-06-02 Fixed text clipping to clip to axes - JDH
+2004-06-02
+    Fixed text clipping to clip to axes - JDH
 
-2004-06-02 Fixed leading newline text and multiple newline text - JDH
+2004-06-02
+    Fixed leading newline text and multiple newline text - JDH
 
-2004-06-02 Fixed plot_date to return lines - JDH
+2004-06-02
+    Fixed plot_date to return lines - JDH
 
-2004-06-01 Fixed plot to work with x or y having shape N,1 or 1,N - JDH
+2004-06-01
+    Fixed plot to work with x or y having shape N,1 or 1,N - JDH
 
-2004-05-31 Added renderer markeredgewidth attribute of Line2D. - ADS
+2004-05-31
+    Added renderer markeredgewidth attribute of Line2D. - ADS
 
-2004-05-29 Fixed tick label clipping to work with navigation.
+2004-05-29
+    Fixed tick label clipping to work with navigation.
 
-2004-05-28 Added renderer grouping commands to support groups in
+2004-05-28
+    Added renderer grouping commands to support groups in
            SVG/PS. - JDH
 
-2004-05-28 Fixed, this time I really mean it, the singleton plot
-           plot([0]) scaling bug; Fixed Flavio's shape = N,1 bug - JDH
+2004-05-28
+    Fixed, this time I really mean it, the singleton plot plot([0]) scaling
+    bug; Fixed Flavio's shape = N,1 bug - JDH
 
-2004-05-28 added colorbar - JDH
+2004-05-28
+    added colorbar - JDH
 
-2004-05-28 Made some changes to the matplotlib.colors.Colormap to
-           properly support clim - JDH
+2004-05-28
+    Made some changes to the matplotlib.colors.Colormap to properly support
+    clim - JDH
 
 -----------------------------------------------------------------
 
-2004-05-27 0.54.1 released
+0.54.1 (2004-05-27)
+-------------------
 
-2004-05-27 Lots of small bug fixes: rotated text at negative angles,
-           errorbar capsize and autoscaling, right tick label
-           position, gtkagg on win98, alpha of figure background,
-           singleton plots - JDH
+2004-05-27
+    Lots of small bug fixes: rotated text at negative angles, errorbar capsize
+    and autoscaling, right tick label position, gtkagg on win98, alpha of
+    figure background, singleton plots - JDH
 
-2004-05-26 Added Gary's errorbar stuff and made some fixes for length
-           one plots and constant data plots - JDH
+2004-05-26
+    Added Gary's errorbar stuff and made some fixes for length one plots and
+    constant data plots - JDH
 
-2004-05-25 Tweaked TkAgg backend so that canvas.draw() works
-       more like the other backends.  Fixed a bug resulting
-       in 2 draws per figure manager show().      - JTM
+2004-05-25
+    Tweaked TkAgg backend so that canvas.draw() works more like the other
+    backends.  Fixed a bug resulting in 2 draws per figure manager show().
+    - JTM
 
 ------------------------------------------------------------
 
-2004-05-19 0.54 released
+0.54 (2004-05-19)
+-----------------
 
-2004-05-18 Added newline separated text with rotations to text.Text
-           layout - JDH
+2004-05-18
+    Added newline separated text with rotations to text.Text layout - JDH
 
-2004-05-16 Added fast pcolor using PolyCollections.  - JDH
+2004-05-16
+    Added fast pcolor using PolyCollections.  - JDH
 
-2004-05-14 Added fast polygon collections - changed scatter to use
-           them.  Added multiple symbols to scatter.  10x speedup on
-           large scatters using \*Agg and 5X speedup for ps. - JDH
+2004-05-14
+    Added fast polygon collections - changed scatter to use them.  Added
+    multiple symbols to scatter.  10x speedup on large scatters using \*Agg and
+    5X speedup for ps. - JDH
 
-2004-05-14 On second thought... created an "nx" namespace in
-           in numerix which maps type names onto typecodes
-           the same way for both numarray and Numeric.  This
-           undoes my previous change immediately below. To get a
-           typename for Int16 usable in a Numeric extension:
-           say nx.Int16. - JTM
+2004-05-14
+    On second thought... created an "nx" namespace in in numerix which maps
+    type names onto typecodes the same way for both numarray and Numeric.  This
+    undoes my previous change immediately below. To get a typename for Int16
+    usable in a Numeric extension: say nx.Int16. - JTM
 
-2004-05-15 Rewrote transformation class in extension code, simplified
-           all the artist constructors - JDH
+2004-05-15
+    Rewrote transformation class in extension code, simplified all the artist
+    constructors - JDH
 
-2004-05-14 Modified the type definitions in the numarray side of
-       numerix so that they are Numeric typecodes and can be
-       used with Numeric compilex extensions.  The original
-       numarray types were renamed to type<old_name>.    - JTM
+2004-05-14
+    Modified the type definitions in the numarray side of numerix so that they
+    are Numeric typecodes and can be used with Numeric compilex extensions.
+    The original numarray types were renamed to type<old_name>.    - JTM
 
-2004-05-06 Gary Ruben sent me a bevy of new plot symbols and markers.
-           See matplotlib.matlab.plot - JDH
+2004-05-06
+    Gary Ruben sent me a bevy of new plot symbols and markers.  See
+    matplotlib.matlab.plot - JDH
 
-2004-05-06 Total rewrite of mathtext - factored ft2font stuff out of
-           layout engine and defined abstract class for font handling
-           to lay groundwork for ps mathtext.  Rewrote parser and made
-           layout engine much more precise.  Fixed all the layout
-           hacks.  Added spacing commands \/ and \hspace.  Added
-           composite chars and defined angstrom. - JDH
+2004-05-06
+    Total rewrite of mathtext - factored ft2font stuff out of layout engine and
+    defined abstract class for font handling to lay groundwork for ps mathtext.
+    Rewrote parser and made layout engine much more precise.  Fixed all the
+    layout hacks.  Added spacing commands \/ and \hspace.  Added composite
+    chars and defined angstrom. - JDH
 
-2004-05-05 Refactored text instances out of backend; aligned
-           text with arbitrary rotations is now supported - JDH
+2004-05-05
+    Refactored text instances out of backend; aligned text with arbitrary
+    rotations is now supported - JDH
 
-2004-05-05 Added a Matrix capability for numarray to numerix.  JTM
+2004-05-05
+    Added a Matrix capability for numarray to numerix.  JTM
 
-2004-05-04 Updated whats_new.html.template to use dictionary and
-           template loop, added anchors for all versions and items;
-           updated goals.txt to use those for links. PG
+2004-05-04
+    Updated whats_new.html.template to use dictionary and template loop, added
+    anchors for all versions and items; updated goals.txt to use those for
+    links. PG
 
-2004-05-04 Added fonts_demo.py to backend_driver, and AFM and TTF font
-           caches to font_manager.py - PEB
+2004-05-04
+    Added fonts_demo.py to backend_driver, and AFM and TTF font caches to
+    font_manager.py - PEB
 
-2004-05-03 Redid goals.html.template to use a goals.txt file that
-           has a pseudo restructured text organization. PG
+2004-05-03
+    Redid goals.html.template to use a goals.txt file that has a pseudo
+    restructured text organization. PG
 
-2004-05-03 Removed the close buttons on all GUIs and added the python
-           #! bang line to the examples following Steve Chaplin's
-           advice on matplotlib dev
+2004-05-03
+    Removed the close buttons on all GUIs and added the python #! bang line to
+    the examples following Steve Chaplin's advice on matplotlib dev
 
-2004-04-29 Added CXX and rewrote backend_agg using it; tracked down
-           and fixed agg memory leak - JDH
+2004-04-29
+    Added CXX and rewrote backend_agg using it; tracked down and fixed agg
+    memory leak - JDH
 
-2004-04-29 Added stem plot command - JDH
+2004-04-29
+    Added stem plot command - JDH
 
-2004-04-28 Fixed PS scaling and centering bug - JDH
+2004-04-28
+    Fixed PS scaling and centering bug - JDH
 
-2004-04-26 Fixed errorbar autoscale problem - JDH
+2004-04-26
+    Fixed errorbar autoscale problem - JDH
 
-2004-04-22 Fixed copy tick attribute bug, fixed singular datalim
-           ticker bug; fixed mathtext fontsize interactive bug. - JDH
+2004-04-22
+    Fixed copy tick attribute bug, fixed singular datalim ticker bug; fixed
+    mathtext fontsize interactive bug. - JDH
 
-2004-04-21 Added calls to draw_if_interactive to axes(), legend(),
-           and pcolor().  Deleted duplicate pcolor(). - JTM
+2004-04-21
+    Added calls to draw_if_interactive to axes(), legend(), and pcolor().
+    Deleted duplicate pcolor(). - JTM
 
 ------------------------------------------------------------
 
-2004-04-21 matplotlib 0.53 release
+2004-04-21
+    matplotlib 0.53 release
 
-2004-04-19 Fixed vertical alignment bug in PS backend - JDH
+2004-04-19
+    Fixed vertical alignment bug in PS backend - JDH
 
-2004-04-17 Added support for two scales on the "same axes" with tick
-           different ticking and labeling left right or top bottom.
-           See examples/two_scales.py - JDH
+2004-04-17
+    Added support for two scales on the "same axes" with tick different ticking
+    and labeling left right or top bottom.  See examples/two_scales.py - JDH
 
-2004-04-17 Added default dirs as list rather than single dir in
-       setupext.py - JDH
+2004-04-17
+    Added default dirs as list rather than single dir in setupext.py - JDH
 
-2004-04-16 Fixed wx exception swallowing bug (and there was much
-           rejoicing!) - JDH
+2004-04-16
+    Fixed wx exception swallowing bug (and there was much rejoicing!) - JDH
 
-2004-04-16 Added new ticker locator a formatter, fixed default font
-           return - JDH
+2004-04-16
+    Added new ticker locator a formatter, fixed default font return - JDH
 
-2004-04-16 Added get_name method to FontProperties class. Fixed font lookup
-       in GTK and WX backends. - PEB
+2004-04-16
+    Added get_name method to FontProperties class. Fixed font lookup in GTK and
+    WX backends. - PEB
 
-2004-04-16 Added get- and set_fontstyle msethods. - PEB
+2004-04-16
+    Added get- and set_fontstyle methods. - PEB
 
-2004-04-10 Mathtext fixes: scaling with dpi,  - JDH
+2004-04-10
+    Mathtext fixes: scaling with dpi,  - JDH
 
-2004-04-09 Improved font detection algorithm. - PEB
+2004-04-09
+    Improved font detection algorithm. - PEB
 
-2004-04-09 Move deprecation warnings from text.py to __init__.py - PEB
+2004-04-09
+    Move deprecation warnings from text.py to __init__.py - PEB
 
-2004-04-09 Added default font customization - JDH
+2004-04-09
+    Added default font customization - JDH
 
-2004-04-08 Fixed viewlim set problem on axes and axis. - JDH
+2004-04-08
+    Fixed viewlim set problem on axes and axis. - JDH
 
-2004-04-07 Added validate_comma_sep_str and font properties parameters to
-           __init__.  Removed font families and added rcParams to
-           FontProperties __init__ arguments in font_manager.  Added
-           default font property parameters to .matplotlibrc file with
-           descriptions.  Added deprecation warnings to the get\_ - and
-           set_fontXXX methods of the Text object. - PEB
+2004-04-07
+    Added validate_comma_sep_str and font properties parameters to __init__.
+    Removed font families and added rcParams to FontProperties __init__
+    arguments in font_manager.  Added default font property parameters to
+    .matplotlibrc file with descriptions.  Added deprecation warnings to the
+    get\_ - and set_fontXXX methods of the Text object. - PEB
 
-2004-04-06 Added load and save commands for ASCII data - JDH
+2004-04-06
+    Added load and save commands for ASCII data - JDH
 
-2004-04-05 Improved font caching by not reading AFM fonts until needed.
-           Added better documentation.  Changed the behaviour of the
-           get_family, set_family, and set_name methods of FontProperties.
-           - PEB
+2004-04-05
+    Improved font caching by not reading AFM fonts until needed.  Added better
+    documentation.  Changed the behaviour of the get_family, set_family, and
+    set_name methods of FontProperties.  - PEB
 
-2004-04-05 Added WXAgg backend - JDH
+2004-04-05
+    Added WXAgg backend - JDH
 
-2004-04-04 Improved font caching in backend_agg with changes to
-           font_manager - JDH
+2004-04-04
+    Improved font caching in backend_agg with changes to font_manager - JDH
 
-2004-03-29 Fixed fontdicts and kwargs to work with new font manager -
-           JDH
+2004-03-29
+    Fixed fontdicts and kwargs to work with new font manager - JDH
 
 --------------------------------------------
 
 This is the Old, stale, never used changelog
 
-2002-12-10 - Added a TODO file and CHANGELOG.  Lots to do -- get
-             crackin'!
+2002-12-10
+    - Added a TODO file and CHANGELOG.  Lots to do -- get crackin'!
 
-           - Fixed y zoom tool bug
+    - Fixed y zoom tool bug
 
-           - Adopted a compromise fix for the y data clipping problem.
-             The problem was that for solid lines, the y data clipping
-             (as opposed to the gc clipping) caused artifactual
-             horizontal solid lines near the ylim boundaries.  I did a
-             5% offset hack in Axes set_ylim functions which helped,
-             but didn't cure the problem for very high gain y zooms.
-             So I disabled y data clipping for connected lines .  If
-             you need extensive y clipping, either plot(y,x) because x
-             data clipping is always enabled, or change the _set_clip
-             code to 'if 1' as indicated in the lines.py src.  See
-             _set_clip in lines.py and set_ylim in figure.py for more
-             information.
+    - Adopted a compromise fix for the y data clipping problem.  The problem
+      was that for solid lines, the y data clipping (as opposed to the gc
+      clipping) caused artifactual horizontal solid lines near the ylim
+      boundaries.  I did a 5% offset hack in Axes set_ylim functions which
+      helped, but didn't cure the problem for very high gain y zooms.  So I
+      disabled y data clipping for connected lines .  If you need extensive y
+      clipping, either plot(y,x) because x data clipping is always enabled, or
+      change the _set_clip code to 'if 1' as indicated in the lines.py src.
+      See _set_clip in lines.py and set_ylim in figure.py for more information.
 
+2002-12-11
+    - Added a measurement dialog to the figure window to measure axes position
+      and the delta x delta y with a left mouse drag.  These defaults can be
+      overridden by deriving from Figure and overriding button_press_event,
+      button_release_event, and motion_notify_event, and _dialog_measure_tool.
 
-2002-12-11 - Added a measurement dialog to the figure window to
-             measure axes position and the delta x delta y with a left
-             mouse drag.  These defaults can be overridden by deriving
-             from Figure and overriding button_press_event,
-             button_release_event, and motion_notify_event,
-             and _dialog_measure_tool.
+    - fixed the navigation dialog so you can check the axes the navigation
+      buttons apply to.
 
-           - fixed the navigation dialog so you can check the axes the
-             navigation buttons apply to.
+2003-04-23
+    Released matplotlib v0.1
 
+2003-04-24
+    Added a new line style PixelLine2D which is the plots the markers as pixels
+    (as small as possible) with format symbol ','
 
+    Added a new class Patch with derived classes Rectangle, RegularPolygon and
+    Circle
 
-2003-04-23 Released matplotlib v0.1
-
-2003-04-24 Added a new line style PixelLine2D which is the plots the
-           markers as pixels (as small as possible) with format
-           symbol ','
-
-           Added a new class Patch with derived classes Rectangle,
-           RegularPolygon and Circle
-
-2003-04-25 Implemented new functions errorbar, scatter and hist
-
-           Added a new line type '|' which is a vline.  syntax is
-           plot(x, Y, '|') where y.shape = len(x),2 and each row gives
-           the ymin,ymax for the respective values of x.  Previously I
-           had implemented vlines as a list of lines, but I needed the
-           efficientcy of the numeric clipping for large numbers of
-           vlines outside the viewport, so I wrote a dedicated class
-           Vline2D which derives from Line2D
+2003-04-25
+    Implemented new functions errorbar, scatter and hist
 
+    Added a new line type '|' which is a vline.  syntax is plot(x, Y, '|')
+    where y.shape = len(x),2 and each row gives the ymin,ymax for the
+    respective values of x.  Previously I had implemented vlines as a list of
+    lines, but I needed the efficiency of the numeric clipping for large
+    numbers of vlines outside the viewport, so I wrote a dedicated class
+    Vline2D which derives from Line2D
 
 2003-05-01
-
-   Fixed ytick bug where grid and tick show outside axis viewport with gc clip
+    Fixed ytick bug where grid and tick show outside axis viewport with gc clip
 
 2003-05-14
-
-   Added new ways to specify colors 1) matlab format string 2)
-   html-style hex string, 3) rgb tuple.  See examples/color_demo.py
+    Added new ways to specify colors 1) matlab format string 2) html-style hex
+    string, 3) rgb tuple.  See examples/color_demo.py
 
 2003-05-28
-
-    Changed figure rendering to draw form a pixmap to reduce flicker.
-    See examples/system_monitor.py for an example where the plot is
-    continusouly updated w/o flicker.  This example is meant to
-    simulate a system monitor that shows free CPU, RAM, etc...
+    Changed figure rendering to draw form a pixmap to reduce flicker.  See
+    examples/system_monitor.py for an example where the plot is continuously
+    updated w/o flicker.  This example is meant to simulate a system monitor
+    that shows free CPU, RAM, etc...
 
 2003-08-04
-
-    Added Jon Anderson's GTK shell, which doesn't require pygtk to
-    have threading built-in and looks nice!
+    Added Jon Anderson's GTK shell, which doesn't require pygtk to have
+    threading built-in and looks nice!
 
 2003-08-25
-
-   Fixed deprecation warnings for python2.3 and pygtk-1.99.18
+    Fixed deprecation warnings for python2.3 and pygtk-1.99.18
 
 2003-08-26
-
-   Added figure text with new example examples/figtext.py
-
+    Added figure text with new example examples/figtext.py
 
 2003-08-27
+    Fixed bugs in figure text with font override dictionaries and fig text that
+    was placed outside the window bounding box
 
-   Fixed bugs i figure text with font override dictionairies and fig
-   text that was placed outside the window bounding box
-
-2003-09-1 through 2003-09-15
-
-   Added a postscript and a GD module backend
+2003-09-01 through 2003-09-15
+    Added a postscript and a GD module backend
 
 2003-09-16
-
-   Fixed font scaling and point scaling so circles, squares, etc on
-   lines will scale with DPI as will fonts.  Font scaling is not fully
-   implemented on the gtk backend because I have not figured out how
-   to scale fonts to arbitrary sizes with GTK
+    Fixed font scaling and point scaling so circles, squares, etc on lines will
+    scale with DPI as will fonts.  Font scaling is not fully implemented on the
+    gtk backend because I have not figured out how to scale fonts to arbitrary
+    sizes with GTK
 
 2003-09-17
+    Fixed figure text bug which crashed X windows on long figure text extending
+    beyond display area.  This was, I believe, due to the vestigial erase
+    functionality that was no longer needed since I began rendering to a pixmap
 
-   Fixed figure text bug which crashed X windows on long figure text
-   extending beyond display area.  This was, I believe, due to the
-   vestigial erase functionality that was no longer needed since I
-   began rendering to a pixmap
-
-2003-09-30  Added legend
+2003-09-30
+    Added legend
 
-2003-10-01 Fixed bug when colors are specified with rgb tuple or hex
-   string.
+2003-10-01
+    Fixed bug when colors are specified with rgb tuple or hex string.
 
+2003-10-21
+    Andrew Straw provided some legend code which I modified and incorporated.
+    Thanks Andrew!
 
-2003-10-21  Andrew Straw provided some legend code which I modified
-      and incorporated.  Thanks Andrew!
+2003-10-27
+    Fixed a bug in axis.get_view_distance that affected zoom in versus out with
+    interactive scrolling, and a bug in the axis text reset system that
+    prevented the text from being redrawn on a interactive gtk view lim set
+    with the widget
 
-2003-10-27 Fixed a bug in axis.get_view_distance that affected zoom in
-  versus out with interactive scrolling, and a bug in the axis text
-  reset system that prevented the text from being redrawn on a
-  interactive gtk view lim set with the widget
+    Fixed a bug in that prevented the manual setting of ticklabel strings from
+    working properly
 
-  Fixed a bug in that prevented the manual setting of ticklabel
-  strings from working properly
-
-2003-11-02 - Do a nearest neighbor color pick on GD when
-             allocate fails
+2003-11-02
+    - Do a nearest neighbor color pick on GD when allocate fails
 
 2003-11-02
-   - Added pcolor plot
-   - Added MRI example
-   - Fixed bug that screwed up label position if xticks or yticks were
-     empty
-   - added nearest neighbor color picker when GD max colors exceeded
-   - fixed figure background color bug in GD backend
+    - Added pcolor plot
+    - Added MRI example
+    - Fixed bug that screwed up label position if xticks or yticks were empty
+    - added nearest neighbor color picker when GD max colors exceeded
+    - fixed figure background color bug in GD backend
 
 2003-11-10 - 2003-11-11
-   - major refactoring.
-
-     * Ticks (with labels, lines and grid) handled by dedicated class
-     * Artist now know bounding box and dpi
-     * Bounding boxes and transforms handled by dedicated classes
-     * legend in dedicated class.  Does a better job of alignment and
-       bordering.  Can be initialized with specific line instances.
-       See examples/legend_demo2.py
-
-
-2003-11-14 Fixed legend positioning bug and added new position args
+    major refactoring.
 
-2003-11-16 Finished porting GD to new axes API
+    * Ticks (with labels, lines and grid) handled by dedicated class
+    * Artist now know bounding box and dpi
+    * Bounding boxes and transforms handled by dedicated classes
+    * legend in dedicated class.  Does a better job of alignment and bordering.
+      Can be initialized with specific line instances.  See
+      examples/legend_demo2.py
 
+2003-11-14
+    Fixed legend positioning bug and added new position args
 
-2003-11-20 - add TM for matlab on website and in docs
+2003-11-16
+    Finished porting GD to new axes API
 
+2003-11-20
+    - add TM for matlab on website and in docs
 
-2003-11-20 - make a nice errorbar and scatter screenshot
+2003-11-20
+    - make a nice errorbar and scatter screenshot
 
-2003-11-20 - auto line style cycling for multiple line types
-   broken
+2003-11-20
+    - auto line style cycling for multiple line types broken
 
-2003-11-18 (using inkrect) :logical rect too big on gtk backend
+2003-11-18
+    (using inkrect) :logical rect too big on gtk backend
 
-2003-11-18 ticks don't reach edge of axes in gtk mode --
-   rounding error?
+2003-11-18
+    ticks don't reach edge of axes in gtk mode -- rounding error?
 
-2003-11-20 - port Gary's errorbar code to new API before 0.40
+2003-11-20
+    - port Gary's errorbar code to new API before 0.40
 
-2003-11-20 - problem with stale _set_font.  legend axes box
-   doesn't resize on save in GTK backend -- see htdocs legend_demo.py
+2003-11-20
+    - problem with stale _set_font.  legend axes box doesn't resize on save in
+      GTK backend -- see htdocs legend_demo.py
 
-2003-11-21 - make a dash-dot dict for the GC
+2003-11-21
+    - make a dash-dot dict for the GC
 
-2003-12-15 - fix install path bug
+2003-12-15
+    - fix install path bug
diff --git a/doc/users/dflt_style_changes.rst b/doc/users/prev_whats_new/dflt_style_changes.rst
similarity index 99%
rename from doc/users/dflt_style_changes.rst
rename to doc/users/prev_whats_new/dflt_style_changes.rst
index 5de399adb053..b36a1a343116 100644
--- a/doc/users/dflt_style_changes.rst
+++ b/doc/users/prev_whats_new/dflt_style_changes.rst
@@ -1,3 +1,5 @@
+.. redirect-from:: /users/dflt_style_changes
+
 ==============================
  Changes to the default style
 ==============================
diff --git a/doc/users/prev_whats_new/github_stats_3.0.0.rst b/doc/users/prev_whats_new/github_stats_3.0.0.rst
new file mode 100644
index 000000000000..ab90e5e79e4e
--- /dev/null
+++ b/doc/users/prev_whats_new/github_stats_3.0.0.rst
@@ -0,0 +1,1221 @@
+.. _github-stats-3-0-0:
+
+GitHub statistics for 3.0.0 (Sep 18, 2018)
+==========================================
+
+GitHub statistics for 2017/01/17 (tag: v2.0.0) - 2018/09/18
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 123 issues and merged 598 pull requests.
+The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/23?closed=1>`__
+
+The following 478 authors contributed 9809 commits.
+
+* 816-8055
+* Aashil Patel
+* AbdealiJK
+* Adam
+* Adam Williamson
+* Adrian Price-Whelan
+* Adrien Chardon
+* Adrien F. Vincent
+* ahed87
+* akrherz
+* Akshay Nair
+* Alan Bernstein
+* Alberto
+* alcinos
+* Aleksey Bilogur
+* Alex Rothberg
+* Alexander Buchkovsky
+* Alexander Harnisch
+* AlexCav
+* Alexis Bienvenüe
+* Ali Uneri
+* Allan Haldane
+* Allen Downey
+* Alvaro Sanchez
+* alvarosg
+* AndersonDaniel
+* Andras Deak
+* Andreas Gustafsson
+* Andreas Hilboll
+* Andreas Mayer
+* Andreas Mueller
+* Andrew Nelson
+* Andy Mastbaum
+* aneda
+* Anthony Scopatz
+* Anton Akhmerov
+* Antony Lee
+* aparamon
+* apodemus
+* Arthur Paulino
+* Arvind
+* as691454
+* ash13
+* Atharva Khare
+* Avinash Sharma
+* Bastian Bechtold
+* bduick
+* Ben
+* Ben Root
+* Benedikt Daurer
+* Benjamin Berg
+* Benjamin Congdon
+* Bernhard M. Wiedemann
+* BHT
+* Bianca Gibson
+* Björn Dahlgren
+* Blaise Thompson
+* Boaz Mohar
+* Brendan Zhang
+* Brennan Magee
+* Bruno Zohreh
+* BTWS
+* buefox
+* Cameron Davidson-Pilon
+* Cameron Fackler
+* cclauss
+* ch3rn0v
+* Charles Ruan
+* chelseatroy
+* Chen Karako
+* Chris Holdgraf
+* Christoph Deil
+* Christoph Gohlke
+* Cimarron Mittelsteadt
+* CJ Carey
+* cknd
+* cldssty
+* clintval
+* Cody Scot
+* Colin
+* Conner R. Phillips
+* Craig Citro
+* DaCoEx
+* dahlbaek
+* Dakota Blair
+* Damian
+* Dan Hickstein
+* Dana
+* Daniel C. Marcu
+* Daniel Laidig
+* danielballan
+* Danny Hermes
+* daronjp
+* DaveL17
+* David A
+* David Brooks
+* David Kent
+* David Stansby
+* deeenes
+* deepyaman
+* Derek Kim
+* Derek Tropf
+* Devashish Deshpande
+* Diego Mora Cespedes
+* Dietmar Schwertberger
+* Dietrich Brunn
+* Divyam Madaan
+* dlmccaffrey
+* Dmitry Shachnev
+* Dora Fraeman
+* DoriekeMG
+* Dorota Jarecka
+* Doug Blank
+* Drew J. Sonne
+* Duncan Macleod
+* Dylan Evans
+* E. G. Patrick Bos
+* Egor Panfilov
+* Elijah Schutz
+* Elizabeth Seiver
+* Elliott Sales de Andrade
+* Elvis Stansvik
+* Emlyn Price
+* endolith
+* Eric Dill
+* Eric Firing
+* Eric Galloway
+* Eric Larson
+* Eric Wang (Mac)
+* Eric Wieser
+* Erik M. Bray
+* Erin Pintozzi
+* et2010
+* Ethan Ligon
+* Eugene Yurtsev
+* Fabian Kloosterman
+* Fabian-Robert Stöter
+* FedeMiorelli
+* Federico Ariza
+* Felix
+* Felix Kohlgrüber
+* Felix Yan
+* Filip Dimitrovski
+* Florencia Noriega
+* Florian Le Bourdais
+* Franco Vaccari
+* Francoise Provencher
+* Frank Yu
+* fredrik-1
+* fuzzythecat
+* Gabe
+* Gabriel Munteanu
+* Gauravjeet
+* Gaute Hope
+* gcallah
+* Geoffrey Spear
+* gnaggnoyil
+* goldstarwebs
+* Graeme Smecher
+* greg-roper
+* gregorybchris
+* Grillard
+* Guillermo Breto
+* Gustavo Goretkin
+* Hajoon Choi
+* Hakan Kucukdereli
+* hannah
+* Hans Moritz Günther
+* Harnesser
+* Harshal Prakash Patankar
+* Harshit Patni
+* Hassan Kibirige
+* Hastings Greer
+* Heath Henley
+* Heiko Oberdiek
+* Helder
+* helmiriawan
+* Henning Pohl
+* Herbert Kruitbosch
+* HHest
+* Hubert Holin
+* Ian Thomas
+* Ida Hjorth
+* Ildar Akhmetgaleev
+* ilivni
+* Ilya Flyamer
+* ImportanceOfBeingErnest
+* ImSoErgodic
+* Isa Hassen
+* Isaac Schwabacher
+* Isaac Slavitt
+* Ismo Toijala
+* J Alammar
+* J. Goutin
+* Jaap Versteegh
+* Jacob McDonald
+* jacob-on-github
+* Jae-Joon Lee
+* Jake Vanderplas
+* James A. Bednar
+* Jamie Nunez
+* Jan Koehler
+* Jan Schlüter
+* Jan Schulz
+* Jarrod Millman
+* Jason King
+* Jason Neal
+* Jason Zheng
+* jbhopkins
+* jdollichon
+* Jeffrey Hokanson @ Loki
+* JelsB
+* Jens Hedegaard Nielsen
+* Jerry Lui
+* jerrylui803
+* jhelie
+* jli
+* Jody Klymak
+* joelostblom
+* Johannes Wienke
+* John Hoffman
+* John Vandenberg
+* Johnny Gill
+* JojoBoulix
+* jonchar
+* Joseph Albert
+* Joseph Fox-Rabinovitz
+* Joseph Jon Booker
+* Joseph Martinot-Lagarde
+* Jouni K. Seppänen
+* Juan Nunez-Iglesias
+* Julia Sprenger
+* Julian Mehne
+* Julian V. Modesto
+* Julien Lhermitte
+* Julien Schueller
+* Jun Tan
+* Justin Cai
+* Jörg Dietrich
+* Kacper Kowalik (Xarthisius)
+* Kanchana Ranasinghe
+* Katrin Leinweber
+* Keerysanth Sribaskaran
+* keithbriggs
+* Kenneth Ma
+* Kevin Davies
+* Kevin Ji
+* Kevin Keating
+* Kevin Rose
+* Kexuan Sun
+* khyox
+* Kieran Ramos
+* Kjartan Myrdal
+* Kjell Le
+* Klara Gerlei
+* klaus
+* klonuo
+* Kristen M. Thyng
+* kshramt
+* Kyle Bridgemohansingh
+* Kyle Sunden
+* Kyler Brown
+* Laptop11_ASPP2016
+* lboogaard
+* legitz7
+* Leo Singer
+* Leon Yin
+* Levi Kilcher
+* Liam Brannigan
+* Lionel Miller
+* lspvic
+* Luca Verginer
+* Luis Pedro Coelho
+* luz.paz
+* lzkelley
+* Maarten Baert
+* Magnus Nord
+* mamrehn
+* Manish Devgan
+* Manuel Jung
+* Mark Harfouche
+* Martin Fitzpatrick
+* Martin Spacek
+* Massimo Santini
+* Matt Hancock
+* Matt Newville
+* Matthew Bell
+* Matthew Brett
+* Matthias Bussonnier
+* Matthias Lüthi
+* Matti Picus
+* Maximilian Albert
+* Maximilian Maahn
+* Maximilian Nöthe
+* mcquin
+* Mher Kazandjian
+* Michael Droettboom
+* Michael Scott Cuthbert
+* Michael Seifert
+* Michiel de Hoon
+* Mike Henninger
+* Mike Jarvis
+* MinRK
+* Mitar
+* mitch
+* mlub
+* mobando
+* Molly Rossow
+* Moritz Boehle
+* muahah
+* Mudit Surana
+* myyc
+* Naoya Kanai
+* Nathan Goldbaum
+* Nathan Musoke
+* Nathaniel M. Beaver
+* navdeep rana
+* nbrunett
+* Nelle Varoquaux
+* nemanja
+* neok-m4700
+* nepix32
+* Nick Forrington
+* Nick Garvey
+* Nick Papior
+* Nico Schlömer
+* Nicolas P. Rougier
+* Nicolas Tessore
+* Nik Quibin
+* Nikita Kniazev
+* Nils Werner
+* Ninad Bhat
+* nmartensen
+* Norman Fomferra
+* ob
+* OceanWolf
+* Olivier
+* Orso Meneghini
+* Osarumwense
+* Pankaj Pandey
+* Paramonov Andrey
+* Pastafarianist
+* Paul Ganssle
+* Paul Hobson
+* Paul Ivanov
+* Paul Kirow
+* Paul Romano
+* Paul Seyfert
+* Pavol Juhas
+* pdubcali
+* Pete Huang
+* Pete Peterson
+* Peter Mackenzie-Helnwein
+* Peter Mortensen
+* Peter Würtz
+* Petr Danecek
+* pharshalp
+* Phil Elson
+* Phil Ruffwind
+* Pierre de Buyl
+* Pierre Haessig
+* Pranav Garg
+* productivememberofsociety666
+* Przemysław Dąbek
+* Qingpeng "Q.P." Zhang
+* RAKOTOARISON Herilalaina
+* Ramiro Gómez
+* Randy Olson
+* rebot
+* Richard Gowers
+* Rishikesh
+* Rob Harrigan
+* Robin Dunn
+* Robin Neatherway
+* Robin Wilson
+* Ronald Hartley-Davies
+* Roy Smith
+* Rui Lopes
+* ruin
+* rvhbooth
+* Ryan
+* Ryan May
+* Ryan Morshead
+* RyanPan
+* s0vereign
+* Saket Choudhary
+* Salganos
+* Salil Vanvari
+* Salinder Sidhu
+* Sam Vaughan
+* Samson
+* Samuel St-Jean
+* Sander
+* scls19fr
+* Scott Howard
+* Scott Lasley
+* scott-vsi
+* Sean Farley
+* Sebastian Raschka
+* Sebastián Vanrell
+* Seraphim Alvanides
+* Sergey B Kirpichev
+* serv-inc
+* settheory
+* shaunwbell
+* Simon Gibbons
+* simonpf
+* sindunuragarp
+* Sourav Singh
+* Stefan Pfenninger
+* Stephan Erb
+* Sterling Smith
+* Steven Silvester
+* Steven Tilley
+* stone
+* stonebig
+* Tadeo Corradi
+* Taehoon Lee
+* Tanuj
+* Taras
+* Taras Kuzyo
+* TD22057
+* Ted Petrou
+* terranjp
+* Terrence J. Katzenbaer
+* Terrence Katzenbaer
+* The Gitter Badger
+* Thomas A Caswell
+* Thomas Hisch
+* Thomas Levine
+* Thomas Mansencal
+* Thomas Robitaille
+* Thomas Spura
+* Thomas VINCENT
+* Thorsten Liebig
+* thuvejan
+* Tian Xia
+* Till Stensitzki
+* Tim Hoffmann
+* tmdavison
+* Tobias Froehlich
+* Tobias Megies
+* Tom
+* Tom Augspurger
+* Tom Dupré la Tour
+* tomoemon
+* tonyyli
+* Trish Gillett-Kawamoto
+* Truong Pham
+* Tuan Dung Tran
+* u55
+* ultra-andy
+* V. R
+* vab9
+* Valentin Schmidt
+* Vedant Nanda
+* Vidur Satija
+* vraelvrangr
+* Víctor Zabalza
+* WANG Aiyong
+* Warren Weckesser
+* watkinrt
+* Wieland Hoffmann
+* Will Silva
+* William Granados
+* William Mallard
+* Xufeng Wang
+* y1thof
+* Yao-Yuan Mao
+* Yuval Langer
+* Zac Hatfield-Dodds
+* Zbigniew Jędrzejewski-Szmek
+* zhangeugenia
+* ZhaoZhonglun1991
+* zhoubecky
+* ZWL
+* Élie Gouzien
+* �ндрей Парамонов
+
+GitHub issues and pull requests:
+
+Pull Requests (598):
+
+* :ghpull:`12145`: Doc final 3.0 docs
+* :ghpull:`12143`: Backport PR #12142 on branch v3.0.x (Unbreak formlayout for image edits.)
+* :ghpull:`12142`: Unbreak formlayout for image edits.
+* :ghpull:`12135`: Backport PR #12131 on branch v3.0.x (Fixes currently release version of cartopy)
+* :ghpull:`12131`: Fixes currently release version of cartopy
+* :ghpull:`12129`: Backports for 3.0
+* :ghpull:`12132`: Backport PR #12130 on branch v3.0.x (Mention colorbar.minorticks_on/off in references)
+* :ghpull:`12130`: Mention colorbar.minorticks_on/off in references
+* :ghpull:`12099`: FIX: make sure all ticks show up for colorbar minor tick
+* :ghpull:`11962`: Propagate changes to backend loading to setup/setupext.
+* :ghpull:`12128`: Unbreak the Sphinx 1.8 build by renaming :math: to :mathmpl:.
+* :ghpull:`12126`: Backport PR #12117 on branch v3.0.x (Fix Agg extent calculations for empty draws)
+* :ghpull:`12113`: Backport PR #12112 on branch v3.0.x (Reword the LockDraw docstring.)
+* :ghpull:`12112`: Reword the LockDraw docstring.
+* :ghpull:`12110`: Backport PR #12109 on branch v3.0.x (Pin to sphinx<1.8; unremove sphinxext.mathmpl.)
+* :ghpull:`12084`: DOC: link palettable
+* :ghpull:`12096`: Backport PR #12092 on branch v3.0.x (Update backend_qt5agg to fix PySide2 mem issues)
+* :ghpull:`12083`: Backport PR #12012 on branch v3.0.x (FIX: fallback text renderer to fig._cachedRenderer, if none found)
+* :ghpull:`12081`: Backport PR #12037 on branch v3.0.x (Fix ArtistInspector.get_aliases.)
+* :ghpull:`12080`: Backport PR #12053 on branch v3.0.x (Fix up some OSX backend issues)
+* :ghpull:`12037`: Fix ArtistInspector.get_aliases.
+* :ghpull:`12053`: Fix up some OSX backend issues
+* :ghpull:`12064`: Backport PR #11971 on branch v3.0.x (FIX: use cached renderer on Legend.get_window_extent)
+* :ghpull:`12063`: Backport PR #12036 on branch v3.0.x (Interactive tests update)
+* :ghpull:`11928`: Update doc/conf.py to avoid warnings with (future) sphinx 1.8.
+* :ghpull:`12048`: Backport PR #12047 on branch v3.0.x (Remove asserting about current backend at the end of mpl_test_settings.)
+* :ghpull:`11971`: FIX: use cached renderer on Legend.get_window_extent
+* :ghpull:`12036`: Interactive tests update
+* :ghpull:`12029`: Backport PR #12022 on branch v3.0.x (Remove intent to deprecate rcParams["backend_fallback"].)
+* :ghpull:`12047`: Remove asserting about current backend at the end of mpl_test_settings.
+* :ghpull:`12020`: Backport PR #12019 on branch v3.0.x (typo: s/unmultipled/unmultiplied)
+* :ghpull:`12022`: Remove intent to deprecate rcParams["backend_fallback"].
+* :ghpull:`12028`: Backport PR #12023 on branch v3.0.x (Fix deprecation check in wx Timer.)
+* :ghpull:`12023`: Fix deprecation check in wx Timer.
+* :ghpull:`12019`: typo: s/unmultipled/unmultiplied
+* :ghpull:`12017`: Backport PR #12016 on branch v3.0.x (Fix AttributeError in GTK3Agg backend)
+* :ghpull:`12016`: Fix AttributeError in GTK3Agg backend
+* :ghpull:`11991`: Backport PR #11988 on branch v3.0.x
+* :ghpull:`11978`: Backport PR #11973 on branch v3.0.x
+* :ghpull:`11968`: Backport PR #11963 on branch v3.0.x
+* :ghpull:`11967`: Backport PR #11961 on branch v3.0.x
+* :ghpull:`11969`: Fix an invalid escape sequence.
+* :ghpull:`11963`: Fix some lgtm convention alerts
+* :ghpull:`11961`: Downgrade backend_version log to DEBUG level.
+* :ghpull:`11953`: Backport PR #11896 on branch v3.0.x
+* :ghpull:`11896`: Resolve backend in rcParams.__getitem__("backend").
+* :ghpull:`11950`: Backport PR #11934 on branch v3.0.x
+* :ghpull:`11952`: Backport PR #11949 on branch v3.0.x
+* :ghpull:`11949`: Remove test2.png from examples.
+* :ghpull:`11934`: Suppress the "non-GUI backend" warning from the .. plot:: directive...
+* :ghpull:`11918`: Backport PR #11917 on branch v3.0.x
+* :ghpull:`11916`: Backport PR #11897 on branch v3.0.x
+* :ghpull:`11915`: Backport PR #11591 on branch v3.0.x
+* :ghpull:`11897`: HTMLWriter, put initialisation of frames in setup
+* :ghpull:`11591`: BUG: correct the scaling in the floating-point slop test.
+* :ghpull:`11910`: Backport PR #11907 on branch v3.0.x
+* :ghpull:`11907`: Move TOC back to top in axes documentation
+* :ghpull:`11904`: Backport PR #11900 on branch v3.0.x
+* :ghpull:`11900`: Allow args to pass through _allow_super_init
+* :ghpull:`11889`: Backport PR #11847 on branch v3.0.x
+* :ghpull:`11890`: Backport PR #11850 on branch v3.0.x
+* :ghpull:`11850`: FIX: macosx framework check
+* :ghpull:`11883`: Backport PR #11862 on branch v3.0.x
+* :ghpull:`11882`: Backport PR #11876 on branch v3.0.x
+* :ghpull:`11876`: MAINT Better error message for number of colors versus number of data…
+* :ghpull:`11862`: Fix NumPy FutureWarning for non-tuple indexing.
+* :ghpull:`11845`: Use Format_ARGB32_Premultiplied instead of RGBA8888 for Qt backends.
+* :ghpull:`11843`: Remove unnecessary use of nose.
+* :ghpull:`11600`: backend switching -- don't create a public fallback API
+* :ghpull:`11833`: adding show inheritance to autosummary template
+* :ghpull:`11828`: changed warning in animation
+* :ghpull:`11829`: func animation warning changes
+* :ghpull:`11826`: DOC documented more of the gridspec options
+* :ghpull:`11818`: Merge v2.2.x
+* :ghpull:`11821`: DOC: remove multicolumns from examples
+* :ghpull:`11819`: DOC: fix minor typo in figure example
+* :ghpull:`11722`: Remove unnecessary hacks from setup.py.
+* :ghpull:`11802`: gridspec tutorial edits
+* :ghpull:`11801`: update annotations
+* :ghpull:`11734`: Small cleanups to backend_agg.
+* :ghpull:`11785`: Add missing API changes
+* :ghpull:`11788`: Fix DeprecationWarning on LocatableAxes
+* :ghpull:`11558`: Added xkcd Style for Markers (plot only)
+* :ghpull:`11755`: Add description for metadata argument of savefig
+* :ghpull:`11703`: FIX: make update-from also set the original face/edgecolor
+* :ghpull:`11765`: DOC: reorder examples and fix top level heading
+* :ghpull:`11724`: Fix cairo's image inversion and alpha misapplication.
+* :ghpull:`11726`: Consolidate agg-buffer examples.
+* :ghpull:`11754`: FIX: update spine positions before get extents
+* :ghpull:`11779`: Remove unused attribute in tests.
+* :ghpull:`11770`: Correct errors in documentation
+* :ghpull:`11778`: Unpin pandas in the CI.
+* :ghpull:`11772`: Clarifying an error message
+* :ghpull:`11760`: Switch grid documentation to numpydoc style
+* :ghpull:`11705`: Suppress/fix some test warnings.
+* :ghpull:`11763`: Pin OSX CI to numpy<1.15 to unbreak the build.
+* :ghpull:`11767`: Add tolerance to csd frequency test
+* :ghpull:`11757`: PGF backend output text color even if black
+* :ghpull:`11751`: Remove the unused 'verbose' option from setupext.
+* :ghpull:`9084`: Require calling a _BoundMethodProxy to get the underlying callable.
+* :ghpull:`11752`: Fix section level of Previous Whats New
+* :ghpull:`10513`: Replace most uses of getfilesystemencoding by os.fs{en,de}code.
+* :ghpull:`11739`: fix tight_layout bug #11737
+* :ghpull:`11744`: minor doc update on axes_grid1's inset_axes
+* :ghpull:`11729`: Pass 'figure' as kwarg to FigureCanvasQt5Agg super __init__.
+* :ghpull:`11736`: Remove unused needs_sphinx marker; move importorskip to toplevel.
+* :ghpull:`11731`: Directly get the size of the renderer buffer from the renderer.
+* :ghpull:`11717`: DOC: fix broken link in inset-locator example
+* :ghpull:`11723`: Start work on making colormaps picklable.
+* :ghpull:`11721`: Remove some references to colorConverter.
+* :ghpull:`11713`: Don't assume cwd in test_ipynb.
+* :ghpull:`11026`: ENH add an inset_axes to the axes class
+* :ghpull:`11712`: Fix drawing on qt+retina.
+* :ghpull:`11714`: docstring for Figure.tight_layout don't include renderer parameter
+* :ghpull:`8951`: Let QPaintEvent tell us what region to repaint.
+* :ghpull:`11234`: Add fig.add_artist method
+* :ghpull:`11706`: Remove unused private method.
+* :ghpull:`11637`: Split API changes into individual pages
+* :ghpull:`10403`: Deprecate LocatableAxes from toolkits
+* :ghpull:`11699`: Dedent overindented rst bullet lists.
+* :ghpull:`11701`: Use skipif instead of xfail when test dependencies are missing.
+* :ghpull:`11700`: Don't use pytest -rw now that pytest-warnings is builtin.
+* :ghpull:`11696`: Don't force backend in toolmanager example.
+* :ghpull:`11690`: Avoid using private APIs in examples.
+* :ghpull:`11684`: Style
+* :ghpull:`11666`: TESTS: Increase tolerance for aarch64 tests
+* :ghpull:`11680`: Boring style fixes.
+* :ghpull:`11678`: Use super() instead of manually fetching supermethods for parasite axes.
+* :ghpull:`11679`: Remove pointless draw() at the end of static examples.
+* :ghpull:`11676`: Remove unused C++ code.
+* :ghpull:`11010`: ENH: Add gridspec method to figure, and subplotspecs
+* :ghpull:`11672`: Add comment re: use of lru_cache in PsfontsMap.
+* :ghpull:`11674`: Boring style fixes.
+* :ghpull:`10954`: Cache various dviread constructs globally.
+* :ghpull:`9150`: Don't update style-blacklisted rcparams in rc_* functions
+* :ghpull:`10936`: Simplify tkagg C extension.
+* :ghpull:`11378`: SVG Backend gouraud_triangle Correction
+* :ghpull:`11383`: FIX: Improve *c* (color) kwarg checking in scatter and the related exceptions
+* :ghpull:`11627`: FIX: CL avoid fully collapsed axes
+* :ghpull:`11504`: Bump pgi requirement to 0.0.11.2.
+* :ghpull:`11640`: Fix barplot color if none and alpha is set
+* :ghpull:`11443`: changed paths in kwdocs
+* :ghpull:`11626`: Minor docstring fixes
+* :ghpull:`11631`: DOC: better tight_layout error handling
+* :ghpull:`11651`: Remove unused imports in examples
+* :ghpull:`11633`: Clean up next api_changes
+* :ghpull:`11643`: Fix deprecation messages.
+* :ghpull:`9223`: Set norm to log if bins=='log' in hexbin
+* :ghpull:`11622`: FIX: be forgiving about the event for enterEvent not having a pos
+* :ghpull:`11581`: backend switching.
+* :ghpull:`11616`: Fix some doctest issues
+* :ghpull:`10872`: Cleanup _plot_args_replacer logic
+* :ghpull:`11617`: Clean up what's new
+* :ghpull:`11610`: FIX: let colorbar extends work for PowerNorm
+* :ghpull:`11615`: Revert glyph warnings
+* :ghpull:`11614`: CI: don't run tox to test pytz
+* :ghpull:`11603`: Doc merge up
+* :ghpull:`11613`: Make flake8 exceptions explicit
+* :ghpull:`11611`: Fix css for parameter types
+* :ghpull:`10001`: MAINT/BUG: Don't use 5-sided quadrilaterals in Axes3D.plot_surface
+* :ghpull:`10234`: PowerNorm: do not clip negative values
+* :ghpull:`11398`: Simplify retrieval of cache and config directories
+* :ghpull:`10682`: ENH have ax.get_tightbbox have a bbox around all artists attached to axes.
+* :ghpull:`11590`: Don't associate Wx timers with the parent frame.
+* :ghpull:`10245`: Cache paths of fonts shipped with mpl relative to the mpl data path.
+* :ghpull:`11381`: Deprecate text.latex.unicode.
+* :ghpull:`11601`: FIX: subplots don't mutate kwargs passed by user.
+* :ghpull:`11609`: Remove _macosx.NavigationToolbar.
+* :ghpull:`11608`: Remove some conditional branches in examples for wx<4.
+* :ghpull:`11604`: TST: Place animation files in a temp dir.
+* :ghpull:`11605`: Suppress a spurious missing-glyph warning with ft2font.
+* :ghpull:`11360`: Pytzectomy
+* :ghpull:`10885`: Move GTK3 setupext checks to within the process.
+* :ghpull:`11081`: Help tool for Wx backends
+* :ghpull:`10851`: Wx Toolbar for ToolManager
+* :ghpull:`11247`: Remove mplDeprecation
+* :ghpull:`9795`: Backend switching
+* :ghpull:`9426`: Don't mark a patch transform as set if the parent transform is not set.
+* :ghpull:`9175`: Warn on freetype missing glyphs.
+* :ghpull:`11412`: Make contour and contourf color assignments consistent.
+* :ghpull:`11477`: Enable flake8 and re-enable it everywhere
+* :ghpull:`11165`: Fix figure window icon
+* :ghpull:`11584`: ENH: fix colorbar bad minor ticks
+* :ghpull:`11438`: ENH: add get_gridspec convenience method to subplots
+* :ghpull:`11451`: Cleanup Matplotlib API docs
+* :ghpull:`11579`: DOC update some examples to use constrained_layout=True
+* :ghpull:`11594`: Some more docstring cleanups.
+* :ghpull:`11593`: Skip wx interactive tests on OSX.
+* :ghpull:`11592`: Remove some extra spaces in docstrings/comments.
+* :ghpull:`11585`: Some doc cleanup of Triangulation
+* :ghpull:`10474`: Use TemporaryDirectory instead of mkdtemp in a few places.
+* :ghpull:`11240`: Deprecate the examples.directory rcParam.
+* :ghpull:`11370`: Sorting drawn artists by their zorder when blitting using FuncAnimation
+* :ghpull:`11576`: Add parameter doc to save_diff_image
+* :ghpull:`11573`: Inline setup_external_compile into setupext.
+* :ghpull:`11571`: Cleanup stix_fonts_demo example.
+* :ghpull:`11563`: Use explicit signature in pyplot.close()
+* :ghpull:`9801`: ENH: Change default Autodatelocator *interval_multiples*
+* :ghpull:`11570`: More simplifications to FreeType setup on Windows.
+* :ghpull:`11401`: Some py3fications.
+* :ghpull:`11566`: Cleanups.
+* :ghpull:`11520`: Add private API retrieving the current event loop and backend GUI info.
+* :ghpull:`11544`: Restore axes sharedness when unpickling.
+* :ghpull:`11568`: Figure.text changes
+* :ghpull:`11248`: Simplify FreeType Windows build.
+* :ghpull:`11556`: Fix colorbar bad ticks
+* :ghpull:`11494`: Fix CI install of wxpython.
+* :ghpull:`11564`: triinterpolate cleanups.
+* :ghpull:`11548`: Use numpydoc-style parameter lists for choices
+* :ghpull:`9583`: Add edgecolors kwarg to contourf
+* :ghpull:`10275`: Update contour.py and widget.py
+* :ghpull:`11547`: Fix example links
+* :ghpull:`11555`: Fix spelling in title
+* :ghpull:`11404`: FIX: don't include text at -inf in bbox
+* :ghpull:`11455`: Fixing the issue where right column and top row generate wrong stream…
+* :ghpull:`11297`: Prefer warn_deprecated instead of warnings.warn.
+* :ghpull:`11495`: Update the documentation guidelines
+* :ghpull:`11545`: Doc: fix x(filled) marker image
+* :ghpull:`11287`: Maintain artist addition order in Axes.mouseover_set.
+* :ghpull:`11530`: FIX: Ensuring both x and y attrs of LocationEvent are int
+* :ghpull:`10336`: Use Integral and Real in typechecks rather than explicit types.
+* :ghpull:`10298`: Apply gtk3 background.
+* :ghpull:`10297`: Fix gtk3agg alpha channel.
+* :ghpull:`9094`: axisbelow should just set zorder.
+* :ghpull:`11542`: Documentation polar grids
+* :ghpull:`11459`: Doc changes in add_subplot and add_axes
+* :ghpull:`10908`: Make draggable callbacks check that artist has not been removed.
+* :ghpull:`11522`: Small cleanups.
+* :ghpull:`11539`: DOC: talk about sticky edges in Axes.margins
+* :ghpull:`11540`: adding axes to module list
+* :ghpull:`11537`: Fix invalid value warning when autoscaling with no data limits
+* :ghpull:`11512`: Skip 3D rotation example in sphinx gallery
+* :ghpull:`11538`: Re-enable pep8 on examples folder
+* :ghpull:`11136`: Move remaining examples from api/
+* :ghpull:`11519`: Raise ImportError on failure to import backends.
+* :ghpull:`11529`: add documentation for quality in savefig
+* :ghpull:`11528`: Replace an unnecessary zip() in mplot3d by numpy ops.
+* :ghpull:`11492`: add __repr__ to GridSpecBase
+* :ghpull:`11521`: Add missing ``.`` to rcParam
+* :ghpull:`11491`: Fixed the source path on windows in rcparam_role
+* :ghpull:`11514`: Remove embedding_in_tk_canvas, which demonstrated a private API.
+* :ghpull:`11507`: Fix embedding_in_tk_canvas example.
+* :ghpull:`11513`: Changed docstrings in Text
+* :ghpull:`11503`: Remove various mentions of the now removed GTK(2) backend.
+* :ghpull:`11493`: Update a test to a figure-equality test.
+* :ghpull:`11501`: Treat empty $MPLBACKEND as an unset value.
+* :ghpull:`11395`: Various fixes to deprecated and warn_deprecated.
+* :ghpull:`11408`: Figure equality-based tests.
+* :ghpull:`11461`: Fixed bug in rendering font property kwargs list
+* :ghpull:`11397`: Replace ACCEPTS by standard numpydoc params table.
+* :ghpull:`11483`: Use pip requirements files for travis build
+* :ghpull:`11481`: remove more pylab references
+* :ghpull:`10940`: Run flake8 instead of pep8 on Python 3.6
+* :ghpull:`11476`: Remove pylab references
+* :ghpull:`11448`: Link rcParams role to docs
+* :ghpull:`11424`: DOC: point align-ylabel demo to new align-label functions
+* :ghpull:`11454`: add subplots to axes documentation
+* :ghpull:`11470`: Hyperlink DOIs against preferred resolver
+* :ghpull:`11421`: DOC: make signature background grey
+* :ghpull:`11457`: Search $CPATH for include directories
+* :ghpull:`11456`: DOC: fix minor typo in figaspect
+* :ghpull:`11293`: Lim parameter naming
+* :ghpull:`11447`: Do not use class attributes as defaults for instance attributes
+* :ghpull:`11449`: Slightly improve doc sidebar layout
+* :ghpull:`11224`:  Add deprecation messages for unused kwargs in FancyArrowPatch
+* :ghpull:`11437`: Doc markersupdate
+* :ghpull:`11417`: FIX: better default spine path (for logit)
+* :ghpull:`11406`: Backport PR #11403 on branch v2.2.2-doc
+* :ghpull:`11427`: FIX: pathlib in nbagg
+* :ghpull:`11428`: Doc: Remove huge note box from examples.
+* :ghpull:`11392`: Deprecate the ``verts`` kwarg to ``scatter``.
+* :ghpull:`8834`: WIP: Contour log extension
+* :ghpull:`11402`: Remove unnecessary str calls.
+* :ghpull:`11399`: Autogenerate credits.rst
+* :ghpull:`11382`: plt.subplots and plt.figure docstring changes
+* :ghpull:`11388`: DOC: Constrained layout tutorial improvements
+* :ghpull:`11400`: Correct docstring for axvspan()
+* :ghpull:`11396`: Remove some (minor) comments regarding Py2.
+* :ghpull:`11210`: FIX: don't pad axes for ticks if they aren't visible or axis off
+* :ghpull:`11362`: Fix tox configuration
+* :ghpull:`11366`: Improve docstring of Axes.spy
+* :ghpull:`11289`: io.open and codecs.open are redundant with open on Py3.
+* :ghpull:`11213`: MNT: deprecate patches.YAArrow
+* :ghpull:`11352`: Catch a couple of test warnings
+* :ghpull:`11292`: Simplify cleanup decorator implementation.
+* :ghpull:`11349`: Remove non-existent files from MANIFEST.IN
+* :ghpull:`8774`: Git issue #7216 - Add a "ruler" tool to the plot UI
+* :ghpull:`11348`: Make OSX's blit() have a consistent signature with other backends.
+* :ghpull:`11345`: Revert "Deprecate text.latex.unicode."
+* :ghpull:`11250`: [WIP] Add tutorial for LogScale
+* :ghpull:`11223`: Add an arrow tutorial
+* :ghpull:`10212`: Categorical refactor
+* :ghpull:`11339`: Convert Ellipse docstring to numpydoc
+* :ghpull:`11255`: Deprecate text.latex.unicode.
+* :ghpull:`11338`: Fix typos
+* :ghpull:`11332`: Let plt.rc = matplotlib.rc, instead of being a trivial wrapper.
+* :ghpull:`11331`: multiprocessing.set_start_method() --> mp.set_start_method()
+* :ghpull:`9948`: Add ``ealpha`` option to ``errorbar``
+* :ghpull:`11329`: Minor docstring update of thumbnail
+* :ghpull:`9551`: Refactor backend loading
+* :ghpull:`11328`: Undeprecate Polygon.xy from #11299
+* :ghpull:`11318`: Improve docstring of imread() and imsave()
+* :ghpull:`11311`: Simplify image.thumbnail.
+* :ghpull:`11225`: Add stacklevel=2 to some more warnings.warn() calls
+* :ghpull:`11313`: Add changelog entry for removal of proprietary sphinx directives.
+* :ghpull:`11323`: Fix infinite loop for connectionstyle + add some tests
+* :ghpull:`11314`: API changes: use the heading format defined in README.txt
+* :ghpull:`11320`: Py3fy multiprocess example.
+* :ghpull:`6254`: adds two new cyclic color schemes
+* :ghpull:`11268`: DOC: Sanitize some internal documentation links
+* :ghpull:`11300`: Start replacing ACCEPTS table by parsing numpydoc.
+* :ghpull:`11298`: Automagically set the stacklevel on warnings.
+* :ghpull:`11277`: Avoid using MacRoman encoding.
+* :ghpull:`11295`: Use sphinx builtin only directive instead of custom one.
+* :ghpull:`11305`: Reuse the noninteractivity warning from Figure.show in _Backend.show.
+* :ghpull:`11307`: Avoid recursion for subclasses of str that are also "PathLike" in to_filehandle()
+* :ghpull:`11304`: Re-remove six from INSTALL.rst.
+* :ghpull:`11299`: Fix a bunch of doc/comment typos in patches.py.
+* :ghpull:`11301`: Undefined name: cbook --> matplotlib.cbook
+* :ghpull:`11254`: Update INSTALL.rst.
+* :ghpull:`11267`: FIX: allow nan values in data for plt.hist
+* :ghpull:`11271`: Better argspecs for Axes.stem
+* :ghpull:`11272`: Remove commented-out code, unused imports
+* :ghpull:`11280`: Trivial cleanups
+* :ghpull:`10514`: Cleanup/update cairo + gtk compatibility matrix.
+* :ghpull:`11282`: Reduce the use of C++ exceptions
+* :ghpull:`11263`: Fail gracefully if can't decode font names
+* :ghpull:`11278`: Remove conditional path for sphinx <1.3 in plot_directive.
+* :ghpull:`11273`: Include template matplotlibrc in package_data.
+* :ghpull:`11265`: Minor cleanups.
+* :ghpull:`11249`: Simplify FreeType build.
+* :ghpull:`11158`: Remove dependency on six - we're Py3 only now!
+* :ghpull:`10050`: Update Legend draggable API
+* :ghpull:`11206`: More cleanups
+* :ghpull:`11001`: DOC: improve legend bbox_to_anchor description
+* :ghpull:`11258`: Removed comment in AGG backend that is no longer applicable
+* :ghpull:`11062`: FIX: call constrained_layout twice
+* :ghpull:`11251`: Re-run boilerplate.py.
+* :ghpull:`11228`: Don't bother checking luatex's version.
+* :ghpull:`11207`: Update venv gui docs wrt availability of PySide2.
+* :ghpull:`11236`: Minor cleanups to setupext.
+* :ghpull:`11239`: Reword the timeout error message in cbook._lock_path.
+* :ghpull:`11204`: Test that boilerplate.py is correctly run.
+* :ghpull:`11172`: ENH add rcparam to legend_title
+* :ghpull:`11229`: Simplify lookup of animation external commands.
+* :ghpull:`9086`: Add SVG animation.
+* :ghpull:`11212`: Fix CirclePolygon __str__ + adding tests
+* :ghpull:`6737`: Ternary
+* :ghpull:`11216`: Yet another set of simplifications.
+* :ghpull:`11056`: Simplify travis setup a bit.
+* :ghpull:`11211`: Revert explicit linestyle kwarg on step()
+* :ghpull:`11205`: Minor cleanups to pyplot.
+* :ghpull:`11174`: Replace numeric loc by position string
+* :ghpull:`11208`: Don't crash qt figure options on unknown marker styles.
+* :ghpull:`11195`: Some unrelated cleanups.
+* :ghpull:`11192`: Don't use deprecated get_texcommand in backend_pgf.
+* :ghpull:`11197`: Simplify demo_ribbon_box.py.
+* :ghpull:`11137`: Convert ``**kwargs`` to named arguments for a clearer API
+* :ghpull:`10982`: Improve docstring of Axes.imshow
+* :ghpull:`11182`: Use GLib.MainLoop() instead of deprecated GObject.MainLoop()
+* :ghpull:`11185`: Fix undefined name error in backend_pgf.
+* :ghpull:`10321`: Ability to scale axis by a fixed factor
+* :ghpull:`8787`: Faster path drawing for the cairo backend (cairocffi only)
+* :ghpull:`4559`: tight_layout: Use a different default gridspec
+* :ghpull:`11179`: Convert internal tk focus helper to a context manager
+* :ghpull:`11176`: Allow creating empty closed paths
+* :ghpull:`10339`: Pass explicit font paths to fontspec in backend_pgf.
+* :ghpull:`9832`: Minor cleanup to Text class.
+* :ghpull:`11141`: Remove mpl_examples symlink.
+* :ghpull:`10715`: ENH: add title_fontsize to legend
+* :ghpull:`11166`: Set stacklevel to 2 for backend_wx
+* :ghpull:`10934`: Autogenerate (via boilerplate) more of pyplot.
+* :ghpull:`9298`: Cleanup blocking_input.
+* :ghpull:`6329`: Set _text to '' if Text.set_text argument is None
+* :ghpull:`11157`: Fix contour return link
+* :ghpull:`11146`: Explicit args and refactor Axes.margins
+* :ghpull:`11145`: Use kwonlyargs instead of popping from kwargs
+* :ghpull:`11119`: PGF: Get unitless positions from Text elements (fix #11116)
+* :ghpull:`9078`: New anchored direction arrows
+* :ghpull:`11144`: Remove toplevel unit/ directory.
+* :ghpull:`11148`: remove use of subprocess compatibility shim
+* :ghpull:`11143`: Use debug level for debugging messages
+* :ghpull:`11142`: Finish removing future imports.
+* :ghpull:`11130`: Don't include the postscript title if it is not latin-1 encodable.
+* :ghpull:`11093`: DOC: Fixup to AnchoredArtist examples in the gallery
+* :ghpull:`11132`: pillow-dependency update
+* :ghpull:`10446`: implementation of the copy canvas tool
+* :ghpull:`9131`: FIX: prevent the canvas from jump sizes due to DPI changes
+* :ghpull:`9454`: Batch ghostscript converter.
+* :ghpull:`10545`: Change manual kwargs popping to kwonly arguments.
+* :ghpull:`10950`: Actually ignore invalid log-axis limit setting
+* :ghpull:`11096`: Remove support for bar(left=...) (as opposed to bar(x=...)).
+* :ghpull:`11106`: py3fy art3d.
+* :ghpull:`11085`: Use GtkShortcutsWindow for Help tool.
+* :ghpull:`11099`: Deprecate certain marker styles that have simpler synonyms.
+* :ghpull:`11100`: Some more deprecations of old, old stuff.
+* :ghpull:`11098`: Make Marker.get_snap_threshold() always return a scalar.
+* :ghpull:`11097`: Schedule a removal date for passing normed (instead of density) to hist.
+* :ghpull:`9706`: Masking invalid x and/or weights in hist
+* :ghpull:`11080`: Py3fy backend_qt5 + other cleanups to the backend.
+* :ghpull:`10967`: updated the pyplot fill_between example to elucidate the premise;maki…
+* :ghpull:`11075`: Drop alpha channel when saving comparison failure diff image.
+* :ghpull:`9022`: Help tool
+* :ghpull:`11045`: Help tool.
+* :ghpull:`11076`: Don't create texput.{aux,log} in rootdir everytime tests are run.
+* :ghpull:`11073`: py3fication of some tests.
+* :ghpull:`11074`: bytes % args is back since py3.5
+* :ghpull:`11066`: Use chained comparisons where reasonable.
+* :ghpull:`11061`: Changed tight_layout doc strings
+* :ghpull:`11064`: Minor docstring format cleanup
+* :ghpull:`11055`: Remove setup_tests_only.py.
+* :ghpull:`11057`: Update Ellipse position with ellipse.center
+* :ghpull:`10435`: Pathlibify font_manager (only internally, doesn't change the API).
+* :ghpull:`10442`: Make the filternorm prop of Images a boolean rather than a {0,1} scalar.
+* :ghpull:`9855`: ENH: make ax.get_position apply aspect
+* :ghpull:`9987`: MNT: hist2d now uses pcolormesh instead of pcolorfast
+* :ghpull:`11014`: Merge v2.2.x into master
+* :ghpull:`11000`: FIX: improve Text repr to not error if non-float x and y.
+* :ghpull:`10910`: FIX: return proper legend window extent
+* :ghpull:`10915`: FIX: tight_layout having negative width axes
+* :ghpull:`10408`: Factor out common code in _process_unit_info
+* :ghpull:`10960`: Added share_tickers parameter to axes._AxesBase.twinx/y
+* :ghpull:`10971`: Skip pillow animation test if pillow not importable
+* :ghpull:`10970`: Simplify/fix some manual manipulation of len(args).
+* :ghpull:`10958`: Simplify the grouper implementation.
+* :ghpull:`10508`: Deprecate FigureCanvasQT.keyAutoRepeat.
+* :ghpull:`10607`: Move notify_axes_change to FigureManagerBase class.
+* :ghpull:`10215`: Test timers and (a bit) key_press_event for interactive backends.
+* :ghpull:`10955`: Py3fy cbook, compare_backend_driver_results
+* :ghpull:`10680`: Rewrite the tk C blitting code
+* :ghpull:`9498`: Move title up if x-axis is on the top of the figure
+* :ghpull:`10942`: Make active param in CheckBottons optional, default false
+* :ghpull:`10943`: Allow pie textprops to take alignment and rotation arguments
+* :ghpull:`10780`: Fix scaling of RadioButtons
+* :ghpull:`10938`: Fix two undefined names
+* :ghpull:`10685`: fix plt.show doesn't warn if a non-GUI backend
+* :ghpull:`10689`: Declare global variables that are created elsewhere
+* :ghpull:`10845`: WIP: first draft at replacing linkcheker
+* :ghpull:`10898`: Replace "matplotlibrc" by "rcParams" in the docs where applicable.
+* :ghpull:`10926`: Some more removals of deprecated APIs.
+* :ghpull:`9173`: dynamically generate pyplot functions
+* :ghpull:`10918`: Use function signatures in boilerplate.py.
+* :ghpull:`10914`: Changed pie charts default shape to circle and added tests
+* :ghpull:`10864`: ENH: Stop mangling default figure file name if file exists
+* :ghpull:`10562`: Remove deprecated code in image.py
+* :ghpull:`10798`: FIX: axes limits reverting to automatic when sharing
+* :ghpull:`10485`: Remove the 'hold' kwarg from codebase
+* :ghpull:`10571`: Use np.full{,_like} where appropriate. [requires numpy>=1.12]
+* :ghpull:`10913`: Rely a bit more on rc_context.
+* :ghpull:`10299`: Invalidate texmanager cache when any text.latex.* rc changes.
+* :ghpull:`10906`: Deprecate ImageComparisonTest.
+* :ghpull:`10904`: Improve docstring of clabel()
+* :ghpull:`10912`: remove unused matplotlib.testing import
+* :ghpull:`10876`: [wip] Replace _remove_method by _on_remove list of callbacks
+* :ghpull:`10692`: Update afm docs and internal data structures
+* :ghpull:`10896`: Update INSTALL.rst.
+* :ghpull:`10905`: Inline knownfailureif.
+* :ghpull:`10907`: No need to mark (unicode) strings as u"foo" anymore.
+* :ghpull:`10903`: Py3fy testing machinery.
+* :ghpull:`10901`: Remove Py2/3 portable code guide.
+* :ghpull:`10900`: Remove some APIs deprecated in mpl2.1.
+* :ghpull:`10902`: Kill some Py2 docs.
+* :ghpull:`10887`: Added feature (Make pie charts circular by default #10789)
+* :ghpull:`10884`: Style fixes to setupext.py.
+* :ghpull:`10879`: Deprecate two-args for cycler() and set_prop_cycle()
+* :ghpull:`10865`: DOC: use OO-ish interface in image, contour, field examples
+* :ghpull:`8479`: FIX markerfacecolor / mfc not in rcparams
+* :ghpull:`10314`: setattr context manager.
+* :ghpull:`10013`: Allow rasterization for 3D plots
+* :ghpull:`10158`: Allow mplot3d rasterization; adjacent cleanups.
+* :ghpull:`10871`: Rely on rglob support rather than os.walk.
+* :ghpull:`10878`:  Change hardcoded brackets for Toolbar message
+* :ghpull:`10708`: Py3fy webagg/nbagg.
+* :ghpull:`10862`: py3ify table.py and correct some docstrings
+* :ghpull:`10810`: Fix for plt.plot() does not support structured arrays as data= kwarg
+* :ghpull:`10861`: More python3 cleanup
+* :ghpull:`9903`: ENH: adjustable colorbar ticks
+* :ghpull:`10831`: Minor docstring updates on binning related plot functions
+* :ghpull:`9571`: Remove LaTeX checking in setup.py.
+* :ghpull:`10097`: Reset extents in RectangleSelector when not interactive on press.
+* :ghpull:`10686`: fix BboxConnectorPatch does not show facecolor
+* :ghpull:`10801`: Fix undefined name.  Add animation tests.
+* :ghpull:`10857`: FIX: ioerror font cache, second try
+* :ghpull:`10796`: Added descriptions for line bars and markers examples
+* :ghpull:`10846`: Unsixification
+* :ghpull:`10852`: Update docs re: pygobject in venv.
+* :ghpull:`10847`: Py3fy axis.py.
+* :ghpull:`10834`: Minor docstring updates on spectral plot functions
+* :ghpull:`10778`: wx_compat is no more.
+* :ghpull:`10609`: More wx cleanup.
+* :ghpull:`10826`: Py3fy dates.py.
+* :ghpull:`10837`: Correctly display error when running setup.py test.
+* :ghpull:`10838`: Don't use private attribute in tk example.  Fix Toolbar class rename.
+* :ghpull:`10835`: DOC: Make colorbar tutorial examples look like colorbars.
+* :ghpull:`10823`: Add some basic smoketesting for webagg (and wx).
+* :ghpull:`10828`: Add print_rgba to backend_cairo.
+* :ghpull:`10830`: Make function signatures more explicit
+* :ghpull:`10829`: Use long color names for default rcParams
+* :ghpull:`9776`: WIP: Lockout new converters Part 2
+* :ghpull:`10799`: DOC: make legend docstring interpolated
+* :ghpull:`10818`: Deprecate vestigial Annotation.arrow.
+* :ghpull:`10817`: Add test to imread from url.
+* :ghpull:`10696`: Simplify venv docs.
+* :ghpull:`10724`: Py3fication of unicode.
+* :ghpull:`10815`: API: shift deprecation of TempCache class to 3.0
+* :ghpull:`10725`: FIX/TST constrained_layout remove test8 duplication
+* :ghpull:`10705`: FIX: enable extend kwargs with log scale colorbar
+* :ghpull:`10400`: numpydoc-ify art3d docstrings
+* :ghpull:`10723`: repr style fixes.
+* :ghpull:`10592`: Rely on generalized * and ** unpackings where possible.
+* :ghpull:`9475`: Declare property aliases in a single place
+* :ghpull:`10793`: A hodgepodge of Py3 & style fixes.
+* :ghpull:`10794`: fixed comment typo
+* :ghpull:`10768`: Fix crash when imshow encounters longdouble data
+* :ghpull:`10774`: Remove dead wx testing code.
+* :ghpull:`10756`: Fixes png showing inconsistent inset_axes position
+* :ghpull:`10773`: Consider alpha channel from RGBA color of text for SVG backend text opacity rendering
+* :ghpull:`10772`: API: check locator and formatter args when passed
+* :ghpull:`10713`: Implemented support for 'markevery' in prop_cycle
+* :ghpull:`10751`: make centre_baseline legal for Text.set_verticalalignment
+* :ghpull:`10771`: FIX/TST OS X builds
+* :ghpull:`10742`: FIX: reorder linewidth setting before linestyle
+* :ghpull:`10714`: sys.platform is normalized to "linux" on Py3.
+* :ghpull:`10542`: Minor cleanup: PEP8, PEP257
+* :ghpull:`10636`: Remove some wx version checks.
+* :ghpull:`9731`: Make legend title fontsize obey fontsize kwarg by default
+* :ghpull:`10697`: Remove special-casing of _remove_method when pickling.
+* :ghpull:`10701`: Autoadd removal version to deprecation message.
+* :ghpull:`10699`: Remove incorrect warning in gca().
+* :ghpull:`10674`: Fix getting polar axes in plt.polar()
+* :ghpull:`10564`: Nested classes and instancemethods are directly picklable on Py3.5+.
+* :ghpull:`10107`: Fix stay_span to reset onclick in SpanSelector.
+* :ghpull:`10693`: Make markerfacecolor work for 3d scatterplots
+* :ghpull:`10596`: Switch to per-file locking.
+* :ghpull:`10532`: Py3fy backend_pgf.
+* :ghpull:`10618`: Fixes #10501.  python3 support and pep8 in jpl_units
+* :ghpull:`10652`: Some py3fication for matplotlib/__init__, setupext.
+* :ghpull:`10522`: Py3fy font_manager.
+* :ghpull:`10666`: More figure-related doc updates
+* :ghpull:`10507`: Remove Python 2 code from C extensions
+* :ghpull:`10679`: Small fixes to gtk3 examples.
+* :ghpull:`10426`: Delete deprecated backends
+* :ghpull:`10488`: Bug Fix - Polar plot rectangle patch not transformed correctly (#8521)
+* :ghpull:`9814`: figure_enter_event uses now LocationEvent instead of Event. Fix issue #9812.
+* :ghpull:`9918`: Remove old nose testing code
+* :ghpull:`10672`: Deprecation fixes.
+* :ghpull:`10608`: Remove most APIs deprecated in 2.1.
+* :ghpull:`10653`: Mock is in stdlib in Py3.
+* :ghpull:`10603`: Remove workarounds for numpy<1.10.
+* :ghpull:`10660`: Work towards removing reuse-of-axes-on-collision.
+* :ghpull:`10661`: Homebrew python is now python 3
+* :ghpull:`10656`: Minor fixes to event handling docs.
+* :ghpull:`10635`: Simplify setupext by using globs.
+* :ghpull:`10632`: Support markers from Paths that consist of one line segment
+* :ghpull:`10558`: Remove if six.PY2 code paths from boilerplate.py
+* :ghpull:`10640`: Fix extra and missing spaces in constrainedlayout warning.
+* :ghpull:`10624`: Some trivial py3fications.
+* :ghpull:`10548`: Implement PdfPages for backend pgf
+* :ghpull:`10614`: Use np.stack instead of list(zip()) in colorbar.py.
+* :ghpull:`10621`: Cleanup and py3fy backend_gtk3.
+* :ghpull:`10615`: More style fixes.
+* :ghpull:`10604`: Minor style fixes.
+* :ghpull:`10565`: Strip python 2 code from subprocess.py
+* :ghpull:`10605`: Bump a tolerance in test_axisartist_floating_axes.
+* :ghpull:`7853`: Use exact types for Py_BuildValue.
+* :ghpull:`10591`: Switch to @-matrix multiplication.
+* :ghpull:`10570`: Fix check_shared in test_subplots.
+* :ghpull:`10569`: Various style fixes.
+* :ghpull:`10593`: Use 'yield from' where appropriate.
+* :ghpull:`10577`: Minor simplification to Figure.__getstate__ logic.
+* :ghpull:`10549`: Source typos
+* :ghpull:`10525`: Convert six.moves.xrange() to range() for Python 3
+* :ghpull:`10541`: More argumentless (py3) super()
+* :ghpull:`10539`: TST: Replace assert_equal with plain asserts.
+* :ghpull:`10534`: Modernize cbook.get_realpath_and_stat.
+* :ghpull:`10524`: Remove unused private _StringFuncParser.
+* :ghpull:`10470`: Remove Python 2 code from setup
+* :ghpull:`10528`: py3fy examples
+* :ghpull:`10520`: Py3fy mathtext.py.
+* :ghpull:`10527`: Switch to argumentless (py3) super().
+* :ghpull:`10523`: The current master branch is now python 3 only.
+* :ghpull:`10515`: Use feature detection instead of version detection
+* :ghpull:`10432`: Use some new Python3 types
+* :ghpull:`10475`: Use HTTP Secure for matplotlib.org
+* :ghpull:`10383`: Fix some C++ warnings
+* :ghpull:`10498`: Tell the lgtm checker that the project is Python 3 only
+* :ghpull:`10505`: Remove backport of which()
+* :ghpull:`10483`: Remove backports.functools_lru_cache
+* :ghpull:`10492`: Avoid UnboundLocalError in drag_pan.
+* :ghpull:`10491`: Simplify Mac builds on Travis
+* :ghpull:`10481`: Remove python 2 compatibility code from dviread
+* :ghpull:`10447`: Remove Python 2 compatibility code from backend_pdf.py
+* :ghpull:`10468`: Replace is_numlike by isinstance(..., numbers.Number).
+* :ghpull:`10439`: mkdir is in the stdlib in Py3.
+* :ghpull:`10392`: FIX: make set_text(None) keep string empty instead of "None"
+* :ghpull:`10425`: API: only support python 3.5+
+* :ghpull:`10316`: TST FIX pyqt5 5.9
+* :ghpull:`4625`: hist2d() is now using pcolormesh instead of pcolorfast
+
+Issues (123):
+
+* :ghissue:`12133`: Streamplot does not work for 29x29 grid
+* :ghissue:`4429`: Error calculating scaling for radiobutton widget.
+* :ghissue:`3293`: markerfacecolor / mfc not in rcparams
+* :ghissue:`8109`: Cannot set the markeredgecolor by default
+* :ghissue:`7942`: Extend keyword doesn't work with log scale.
+* :ghissue:`5571`: Finish reorganizing examples
+* :ghissue:`8307`: Colorbar with imshow(logNorm) shows unexpected minor ticks
+* :ghissue:`6992`: plt.hist fails when data contains nan values
+* :ghissue:`6483`: Range determination for data with NaNs
+* :ghissue:`8059`: BboxConnectorPatch does not show facecolor
+* :ghissue:`12134`: tight_layout flips images when making plots without displaying them
+* :ghissue:`6739`: Make matplotlib fail more gracefully in headless environments
+* :ghissue:`3679`: Runtime detection for default backend
+* :ghissue:`11966`: CartoPy code gives attribute error
+* :ghissue:`11844`: Backend related issues with matplotlib 3.0.0rc1
+* :ghissue:`12095`: colorbar minorticks (possibly release critical for 3.0)
+* :ghissue:`12108`: Broken doc build with sphinx 1.8
+* :ghissue:`7366`: handle repaint requests better it qtAgg
+* :ghissue:`11985`: Single shot timer not working correctly with MacOSX backend
+* :ghissue:`10948`: OSX backend raises deprecation warning for enter_notify_event
+* :ghissue:`11970`: Legend.get_window_extent now requires a renderer
+* :ghissue:`8293`: investigate whether using a single instance of ghostscript for ps->png conversion can speed up the Windows build
+* :ghissue:`7707`: Replace pep8 by pycodestyle for style checking
+* :ghissue:`9135`: rcdefaults, rc_file_defaults, rc_file should not update backend if it has already been selected
+* :ghissue:`12015`: AttributeError with GTK3Agg backend
+* :ghissue:`11913`: plt.contour levels parameter don't work as intended if receive a single int
+* :ghissue:`11846`: macosx backend won't load
+* :ghissue:`11792`: Newer versions of ImageMagickWriter not found on windows
+* :ghissue:`11858`: Adding "pie of pie" and "bar of pie" functionality
+* :ghissue:`11852`: get_backend() backward compatibility
+* :ghissue:`11629`: Importing qt_compat when no Qt binding is installed fails with NameError instead of ImportError
+* :ghissue:`11842`: Failed nose import in test_annotation_update
+* :ghissue:`11252`: Some API removals not documented
+* :ghissue:`9404`: Drop support for python 2
+* :ghissue:`2625`: Markers in XKCD style
+* :ghissue:`11749`: metadata kwarg to savefig is not documented
+* :ghissue:`11702`: Setting alpha on legend handle changes patch color
+* :ghissue:`8798`: gtk3cairo draw_image does not respect origin and mishandles alpha
+* :ghissue:`11737`: Bug in tight_layout
+* :ghissue:`11373`: Passing an incorrectly sized colour list to scatter should raise a relevant error
+* :ghissue:`11756`: pgf backend doesn't set color of text when the color is black
+* :ghissue:`11766`: test_axes.py::test_csd_freqs failing with numpy 1.15.0 on macOS
+* :ghissue:`11750`: previous whats new is overindented on "what's new in mpl3.0 page"
+* :ghissue:`11728`: Qt5 Segfaults on window resize
+* :ghissue:`11709`: Repaint region is wrong on Retina display with Qt5
+* :ghissue:`11578`: wx segfaulting on OSX travis tests
+* :ghissue:`11628`: edgecolor argument not working in matplotlib.pyplot.bar
+* :ghissue:`11625`: plt.tight_layout() does not work with plt.subplot2grid
+* :ghissue:`4993`: Version ~/.cache/matplotlib
+* :ghissue:`7842`: If hexbin has logarithmic bins, use log formatter for colorbar
+* :ghissue:`11607`: AttributeError: 'QEvent' object has no attribute 'pos'
+* :ghissue:`11486`: Colorbar does not render with PowerNorm and min extend when using imshow
+* :ghissue:`11582`: wx segfault
+* :ghissue:`11515`: using 'sharex' once in 'subplots' function can affect subsequent calles to 'subplots'
+* :ghissue:`10269`: input() blocks any rendering and event handling
+* :ghissue:`10345`: Python 3.4 with Matplotlib 1.5 vs Python 3.6 with Matplotlib 2.1
+* :ghissue:`10443`: Drop use of pytz dependency in next major release
+* :ghissue:`10572`: contour and contourf treat levels differently
+* :ghissue:`11123`: Crash when interactively adding a number of subplots
+* :ghissue:`11550`: Undefined names: 'obj_type' and 'cbook'
+* :ghissue:`11138`: Only the first figure window has mpl icon, all other figures have default tk icon.
+* :ghissue:`11510`: extra minor-ticks on the colorbar when used with the extend option
+* :ghissue:`11369`: zorder of Artists not being respected when blitting with FuncAnimation
+* :ghissue:`11452`: Streamplot ignores rightmost column and topmost row of velocity data
+* :ghissue:`11284`: imshow of multiple images produces old pixel values printed in status bar
+* :ghissue:`11496`: MouseEvent.x and .y have different types
+* :ghissue:`11534`: Cross-reference margins and sticky edges
+* :ghissue:`8556`: Add images of markers to the list of markers
+* :ghissue:`11386`: Logit scale doesn't position x/ylabel correctly first draw
+* :ghissue:`11384`: Undefined name 'Path' in backend_nbagg.py
+* :ghissue:`11426`: nbagg broken on master.  'Path' is not defined...
+* :ghissue:`11390`: Internal use of deprecated code
+* :ghissue:`11203`: tight_layout reserves tick space even if disabled
+* :ghissue:`11361`: Tox.ini does not work out of the box
+* :ghissue:`11253`: Problem while changing current figure size in Jupyter notebook
+* :ghissue:`11219`: Write an arrow tutorial
+* :ghissue:`11322`: Really deprecate Patches.xy?
+* :ghissue:`11294`: ConnectionStyle Angle3 hangs with specific parameters
+* :ghissue:`9518`: Some ConnectionStyle not working
+* :ghissue:`11306`: savefig and path.py
+* :ghissue:`11077`: Font "DejaVu Sans" can only be used through fallback
+* :ghissue:`10717`: Failure to find matplotlibrc when testing installed distribution
+* :ghissue:`9912`: Cleaning up variable argument signatures
+* :ghissue:`3701`: unit tests should compare pyplot.py with output from boilerplate.py
+* :ghissue:`11183`: Undefined name 'system_fonts' in backend_pgf.py
+* :ghissue:`11101`: Crash on empty patches
+* :ghissue:`11124`: [Bug] savefig cannot save file with a Unicode name
+* :ghissue:`7733`: Trying to set_ylim(bottom=0) on a log scaled axis changes plot
+* :ghissue:`10319`: TST: pyqt 5.10 breaks pyqt5 interactive tests
+* :ghissue:`10676`: Add source code to documentation
+* :ghissue:`9207`: axes has no method to return new position after box is adjusted due to aspect ratio...
+* :ghissue:`4615`: hist2d with log xy axis
+* :ghissue:`10996`: Plotting text with datetime axis causes warning
+* :ghissue:`7582`: Report date and time of cursor position on a plot_date plot
+* :ghissue:`10114`: Remove mlab from examples
+* :ghissue:`10342`: imshow longdouble not truly supported
+* :ghissue:`8062`: tight_layout + lots of subplots + long ylabels inverts yaxis
+* :ghissue:`4413`: Long axis title alters xaxis length and direction with ``plt.tight_layout()``
+* :ghissue:`1415`: Plot title should be shifted up when xticks are set to the top of the plot
+* :ghissue:`10789`: Make pie charts circular by default
+* :ghissue:`10941`: Cannot set text alignment in pie chart
+* :ghissue:`7908`: plt.show doesn't warn if a non-GUI backend is being used
+* :ghissue:`10502`: 'FigureManager' is an undefined name in backend_wx.py
+* :ghissue:`10062`: axes limits revert to automatic on sharing axes?
+* :ghissue:`9246`: ENH: make default colorbar ticks adjust as nicely as axes ticks
+* :ghissue:`8818`: plt.plot() does not support structured arrays as data= kwarg
+* :ghissue:`10533`: Recognize pandas Timestamp objects for DateConverter?
+* :ghissue:`8358`: Minor ticks on log-scale colorbar are not cleared
+* :ghissue:`10075`: RectangleSelector does not work if start and end points are identical
+* :ghissue:`8576`: support 'markevery' in prop_cycle
+* :ghissue:`8874`: Crash in python setup.py test
+* :ghissue:`3871`: replace use of _tkcanvas with get_tk_widget()
+* :ghissue:`10550`: Use long color names for rc defaultParams
+* :ghissue:`10722`: Duplicated test name in test_constrainedlayout
+* :ghissue:`10419`: svg backend does not respect alpha channel of text *when passed as rgba*
+* :ghissue:`10769`: DOC: set_major_locator could check that its getting a Locator (was EngFormatter broken?)
+* :ghissue:`10719`: Need better type error checking for linewidth in ax.grid
+* :ghissue:`7776`: tex cache lockfile retries should be configurable
+* :ghissue:`10556`: Special conversions of xrange()
+* :ghissue:`10501`: cmp() is an undefined name in Python 3
+* :ghissue:`9812`: figure_enter_event generates base Event and not LocationEvent
+* :ghissue:`10602`: Random image failures with test_curvelinear4
+* :ghissue:`7795`: Incorrect uses of is_numlike
diff --git a/doc/users/prev_whats_new/github_stats_3.0.1.rst b/doc/users/prev_whats_new/github_stats_3.0.1.rst
new file mode 100644
index 000000000000..95e899d1a9de
--- /dev/null
+++ b/doc/users/prev_whats_new/github_stats_3.0.1.rst
@@ -0,0 +1,203 @@
+.. _github-stats-3-0-1:
+
+GitHub statistics for 3.0.1 (Oct 25, 2018)
+==========================================
+
+GitHub statistics for 2018/09/18 (tag: v3.0.0) - 2018/10/25
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 31 issues and merged 127 pull requests.
+The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/37?closed=1>`__
+
+The following 23 authors contributed 227 commits.
+
+* Abhinuv Nitin Pitale
+* Antony Lee
+* Anubhav Shrimal
+* Ben Root
+* Colin
+* Daniele Nicolodi
+* David Haberthür
+* David Stansby
+* Elan Ernest
+* Elliott Sales de Andrade
+* Eric Firing
+* ImportanceOfBeingErnest
+* Jody Klymak
+* Kai Muehlbauer
+* Kevin Rose
+* Marcel Martin
+* MeeseeksMachine
+* Nelle Varoquaux
+* Nikita Kniazev
+* Ryan May
+* teresy
+* Thomas A Caswell
+* Tim Hoffmann
+
+GitHub issues and pull requests:
+
+Pull Requests (127):
+
+* :ghpull:`12595`: Backport PR #12569 on branch v3.0.x (Don't confuse uintptr_t and Py_ssize_t.)
+* :ghpull:`12623`: Backport PR #12285 on branch v3.0.x (FIX: Don't apply tight_layout if axes collapse)
+* :ghpull:`12285`: FIX: Don't apply tight_layout if axes collapse
+* :ghpull:`12622`: FIX: flake8errors 3.0.x mergeup
+* :ghpull:`12619`: Backport PR #12548 on branch v3.0.x (undef _XOPEN_SOURCE breaks the build in AIX)
+* :ghpull:`12621`: Backport PR #12607 on branch v3.0.x (STY: fix whitespace and escaping)
+* :ghpull:`12616`: Backport PR #12615 on branch v3.0.x (Fix travis OSX build)
+* :ghpull:`12594`: Backport PR #12572 on branch v3.0.x (Fix singleton hist labels)
+* :ghpull:`12615`: Fix travis OSX build
+* :ghpull:`12607`: STY: fix whitespace and escaping
+* :ghpull:`12605`: Backport PR #12603 on branch v3.0.x (FIX: don't import macosx to check if eventloop running)
+* :ghpull:`12604`: FIX: over-ride 'copy' on RcParams
+* :ghpull:`12603`: FIX: don't import macosx to check if eventloop running
+* :ghpull:`12602`: Backport PR #12599 on branch v3.0.x (Fix formatting of docstring)
+* :ghpull:`12599`: Fix formatting of docstring
+* :ghpull:`12593`: Backport PR #12581 on branch v3.0.x (Fix hist() error message)
+* :ghpull:`12569`: Don't confuse uintptr_t and Py_ssize_t.
+* :ghpull:`12572`: Fix singleton hist labels
+* :ghpull:`12581`: Fix hist() error message
+* :ghpull:`12575`: Backport PR #12573 on branch v3.0.x (BUG: mplot3d: Don't crash if azim or elev are non-integral)
+* :ghpull:`12558`: Backport PR #12555 on branch v3.0.x (Clarify horizontalalignment and verticalalignment in suptitle)
+* :ghpull:`12544`: Backport PR #12159 on branch v3.0.x (FIX: colorbar re-check norm before draw for autolabels)
+* :ghpull:`12159`: FIX: colorbar re-check norm before draw for autolabels
+* :ghpull:`12540`: Backport PR #12501 on branch v3.0.x (Rectified plot error)
+* :ghpull:`12531`: Backport PR #12431 on branch v3.0.x (FIX: allow single-string color for scatter)
+* :ghpull:`12431`: FIX: allow single-string color for scatter
+* :ghpull:`12529`: Backport PR #12216 on branch v3.0.x (Doc: Fix search for sphinx >=1.8)
+* :ghpull:`12527`: Backport PR #12461 on branch v3.0.x (FIX: make add_lines work with new colorbar)
+* :ghpull:`12461`: FIX: make add_lines work with new colorbar
+* :ghpull:`12522`: Backport PR #12241 on branch v3.0.x (FIX: make unused spines invisible)
+* :ghpull:`12241`: FIX: make unused spines invisible
+* :ghpull:`12519`: Backport PR #12504 on branch v3.0.x (DOC: clarify min supported version wording)
+* :ghpull:`12517`: Backport PR #12507 on branch v3.0.x (FIX: make minor ticks formatted with science formatter as well)
+* :ghpull:`12507`: FIX: make minor ticks formatted with science formatter as well
+* :ghpull:`12512`: Backport PR #12363 on branch v3.0.x
+* :ghpull:`12511`: Backport PR #12366 on branch v2.2.x (TST: Update test images for new Ghostscript.)
+* :ghpull:`12509`: Backport PR #12478 on branch v3.0.x (MAINT: numpy deprecates asscalar in 1.16)
+* :ghpull:`12363`: FIX: errors in get_position changes
+* :ghpull:`12497`: Backport PR #12495 on branch v3.0.x (Fix duplicate condition in pathpatch3d example)
+* :ghpull:`12490`: Backport PR #12489 on branch v3.0.x (Fix typo in documentation of ylim)
+* :ghpull:`12485`: Fix font_manager.OSXInstalledFonts()
+* :ghpull:`12484`: Backport PR #12448 on branch v3.0.x (Don't error if some font directories are not readable.)
+* :ghpull:`12421`: Backport PR #12360 on branch v3.0.x (Replace axes_grid by axes_grid1 in test)
+* :ghpull:`12448`: Don't error if some font directories are not readable.
+* :ghpull:`12471`: Backport PR #12468 on branch v3.0.x (Fix ``set_ylim`` unit handling)
+* :ghpull:`12475`: Backport PR #12469 on branch v3.0.x (Clarify documentation of offsetbox.AnchoredText's prop kw argument)
+* :ghpull:`12468`: Fix ``set_ylim`` unit handling
+* :ghpull:`12464`: Backport PR #12457 on branch v3.0.x (Fix tutorial typos.)
+* :ghpull:`12432`: Backport PR #12277: FIX: datetime64 now recognized if in a list
+* :ghpull:`12277`: FIX: datetime64 now recognized if in a list
+* :ghpull:`12426`: Backport PR #12293 on branch v3.0.x (Make pyplot more tolerant wrt. 3rd-party subclasses.)
+* :ghpull:`12293`: Make pyplot more tolerant wrt. 3rd-party subclasses.
+* :ghpull:`12360`: Replace axes_grid by axes_grid1 in test
+* :ghpull:`12412`: Backport PR #12394 on branch v3.0.x (DOC: fix CL tutorial to give same output from saved file and example)
+* :ghpull:`12410`: Backport PR #12408 on branch v3.0.x (Don't crash on invalid registry font entries on Windows.)
+* :ghpull:`12411`: Backport PR #12366 on branch v3.0.0-doc (TST: Update test images for new Ghostscript.)
+* :ghpull:`12408`: Don't crash on invalid registry font entries on Windows.
+* :ghpull:`12403`: Backport PR #12149 on branch v3.0.x (Mathtext tutorial fixes)
+* :ghpull:`12400`: Backport PR #12257 on branch v3.0.x (Document standard backends in matplotlib.use())
+* :ghpull:`12257`: Document standard backends in matplotlib.use()
+* :ghpull:`12399`: Backport PR #12383 on branch v3.0.x (Revert change of parameter name in annotate())
+* :ghpull:`12383`: Revert change of parameter name in annotate()
+* :ghpull:`12390`: Backport PR #12385 on branch v3.0.x (CI: Added Appveyor Python 3.7 build)
+* :ghpull:`12385`: CI: Added Appveyor Python 3.7 build
+* :ghpull:`12381`: Backport PR #12353 on branch v3.0.x (Doc: clarify default parameters in scatter docs)
+* :ghpull:`12378`: Backport PR #12366 on branch v3.0.x (TST: Update test images for new Ghostscript.)
+* :ghpull:`12375`: Backport PR #11648 on branch v3.0.x (FIX: colorbar placement in constrained layout)
+* :ghpull:`11648`: FIX: colorbar placement in constrained layout
+* :ghpull:`12350`: Backport PR #12214 on branch v3.0.x
+* :ghpull:`12348`: Backport PR #12347 on branch v3.0.x (DOC: add_child_axes to axes_api.rst)
+* :ghpull:`12214`: Improve docstring of Annotation
+* :ghpull:`12344`: Backport PR #12321 on branch v3.0.x (maint: setupext.py for freetype had a Catch case for missing ft2build.h)
+* :ghpull:`12342`: Backport PR #12334 on branch v3.0.x (Improve selection of inset indicator connectors.)
+* :ghpull:`12334`: Improve selection of inset indicator connectors.
+* :ghpull:`12339`: Backport PR #12297 on branch v3.0.x (Remove some pytest parameterising warnings)
+* :ghpull:`12338`: Backport PR #12268 on branch v3.0.x (FIX: remove unnecessary ``self`` in ``super_``-calls, fixes #12265)
+* :ghpull:`12336`: Backport PR #12212 on branch v3.0.x (font_manager: Fixed problems with Path(...).suffix)
+* :ghpull:`12268`: FIX: remove unnecessary ``self`` in ``super_``-calls, fixes #12265
+* :ghpull:`12212`: font_manager: Fixed problems with Path(...).suffix
+* :ghpull:`12331`: Backport PR #12322 on branch v3.0.x (Fix the docs build.)
+* :ghpull:`12327`: Backport PR #12326 on branch v3.0.x (fixed minor spelling error in docstring)
+* :ghpull:`12320`: Backport PR #12319 on branch v3.0.x (Fix Travis 3.6 builds)
+* :ghpull:`12315`: Backport PR #12313 on branch v3.0.x (BUG: Fix typo in view_limits() for MultipleLocator)
+* :ghpull:`12313`: BUG: Fix typo in view_limits() for MultipleLocator
+* :ghpull:`12305`: Backport PR #12274 on branch v3.0.x (MNT: put back ``_hold`` as read-only attribute on AxesBase)
+* :ghpull:`12274`: MNT: put back ``_hold`` as read-only attribute on AxesBase
+* :ghpull:`12303`: Backport PR #12163 on branch v3.0.x (TST: Defer loading Qt framework until test is run.)
+* :ghpull:`12299`: Backport PR #12294 on branch v3.0.x (Fix expand_dims warnings in triinterpolate)
+* :ghpull:`12163`: TST: Defer loading Qt framework until test is run.
+* :ghpull:`12301`: Ghostscript 9.0 requirement revisited
+* :ghpull:`12294`: Fix expand_dims warnings in triinterpolate
+* :ghpull:`12297`: Remove some pytest parameterising warnings
+* :ghpull:`12295`: Backport PR #12261 on branch v3.0.x (FIX:  parasite axis2 demo)
+* :ghpull:`12289`: Backport PR #12278 on branch v3.0.x (Document inheriting docstrings)
+* :ghpull:`12287`: Backport PR #12262 on branch v3.0.x (Simplify empty-rasterized pdf test.)
+* :ghpull:`12280`: Backport PR #12269 on branch v3.0.x (Add some param docs to BlockingInput methods)
+* :ghpull:`12266`: Backport PR #12254 on branch v3.0.x (Improve docstrings of Animations)
+* :ghpull:`12262`: Simplify empty-rasterized pdf test.
+* :ghpull:`12254`: Improve docstrings of Animations
+* :ghpull:`12263`: Backport PR #12258 on branch v3.0.x (Fix CSS for module-level data)
+* :ghpull:`12250`: Backport PR #12209 on branch v3.0.x (Doc: Sort named colors example by palette)
+* :ghpull:`12248`: Backport PR #12237 on branch v3.0.x (Use (float, float) as parameter type for 2D positions in docstrings)
+* :ghpull:`12240`: Backport PR #12236 on branch v3.0.x
+* :ghpull:`12237`: Use (float, float) as parameter type for 2D positions in docstrings
+* :ghpull:`12242`: Backport PR #12238 on branch v3.0.x (Typo in docs)
+* :ghpull:`12236`: Make boilerplate-generated pyplot.py flake8 compliant
+* :ghpull:`12234`: Backport PR #12228 on branch v3.0.x (Fix trivial typo in docs.)
+* :ghpull:`12230`: Backport PR #12213 on branch v3.0.x (Change win32InstalledFonts return value)
+* :ghpull:`12213`: Change win32InstalledFonts return value
+* :ghpull:`12223`: Backport PR #11688 on branch v3.0.x (Don't draw axis (spines, ticks, labels) twice when using parasite axes.)
+* :ghpull:`12224`: Backport PR #12207 on branch v3.0.x (FIX: dont' check for interactive framework if none required)
+* :ghpull:`12207`: FIX: don't check for interactive framework if none required
+* :ghpull:`11688`: Don't draw axis (spines, ticks, labels) twice when using parasite axes.
+* :ghpull:`12205`: Backport PR #12186 on branch v3.0.x (DOC: fix API note about get_tightbbox)
+* :ghpull:`12204`: Backport PR #12203 on branch v3.0.x (Document legend best slowness)
+* :ghpull:`12203`: Document legend's slowness when "best" location is used
+* :ghpull:`12194`: Backport PR #12164 on branch v3.0.x (Fix Annotation.contains.)
+* :ghpull:`12193`: Backport PR #12177 on branch v3.0.x (FIX: remove cwd from mac font path search)
+* :ghpull:`12164`: Fix Annotation.contains.
+* :ghpull:`12177`: FIX: remove cwd from mac font path search
+* :ghpull:`12185`: Backport PR #12183 on branch v3.0.x (Doc: Don't use Sphinx 1.8)
+* :ghpull:`12183`: Doc: Don't use Sphinx 1.8
+* :ghpull:`12172`: Backport PR #12157 on branch v3.0.x (Properly declare the interactive framework for the qt4foo backends.)
+* :ghpull:`12167`: Backport PR #12166 on branch v3.0.x (Document preference order for backend auto selection)
+* :ghpull:`12166`: Document preference order for backend auto selection
+* :ghpull:`12157`: Properly declare the interactive framework for the qt4foo backends.
+* :ghpull:`12153`: Backport PR #12148 on branch v3.0.x (BLD: pragmatic fix for building basic_unit example on py37)
+
+Issues (31):
+
+* :ghissue:`12626`: AttributeError: module 'matplotlib' has no attribute 'artist'
+* :ghissue:`12613`: transiently linked interactivity of unshared pair of axes generated with make_axes_locatable
+* :ghissue:`12601`: Can't import matplotlib
+* :ghissue:`12580`: Incorrect hist error message with bad color size
+* :ghissue:`12567`: Calling pyplot.show() with TkAgg backend on x86 machine raises OverflowError.
+* :ghissue:`12556`: Matplotlib 3.0.0 import hangs in clean environment
+* :ghissue:`12550`: colorbar resizes in animation
+* :ghissue:`12155`: Incorrect placement of Colorbar ticks using LogNorm
+* :ghissue:`12438`: Scatter doesn't accept a list of strings as color spec.
+* :ghissue:`12429`: scatter() does not accept gray strings anymore
+* :ghissue:`12458`: add_lines misses lines for matplotlib.colorbar.ColorbarBase
+* :ghissue:`12239`: 3d axes are collapsed by tight_layout
+* :ghissue:`12488`: inconsistent colorbar tick labels for LogNorm
+* :ghissue:`12515`: pyplot.step broken in 3.0.0?
+* :ghissue:`12355`: Error for bbox_inches='tight' in savefig with make_axes_locatable
+* :ghissue:`12505`: ImageGrid in 3.0
+* :ghissue:`12291`: Importing pyplot crashes on macOS due to missing fontlist-v300.json and then Permission denied: '/opt/local/share/fonts'
+* :ghissue:`12288`: New function signatures in pyplot break Cartopy
+* :ghissue:`12445`: Error on colorbar
+* :ghissue:`12446`: Polar Contour - float() argument must be a string or a number, not 'AxesParasiteParasiteAuxTrans'
+* :ghissue:`12271`: error with errorbar with datetime64
+* :ghissue:`12405`: plt.stackplot() does not work with 3.0.0
+* :ghissue:`12406`: Bug with font finding, and here is my fix as well.
+* :ghissue:`12325`: Annotation change from "s" to "text" in 3.0- documentation
+* :ghissue:`11641`: constrained_layout and colorbar for a subset of axes
+* :ghissue:`12352`: TeX rendering broken on master with windows
+* :ghissue:`12354`: Too many levels of symbolic links
+* :ghissue:`12265`: ParasiteAxesAuxTrans  pcolor/pcolormesh and contour/contourf broken
+* :ghissue:`12173`: Cannot import pyplot
+* :ghissue:`12120`: Default legend behavior (loc='best') very slow for large amounts of data.
+* :ghissue:`12176`: import pyplot on MacOS without font cache will search entire subtree of current dir
diff --git a/doc/users/prev_whats_new/github_stats_3.0.2.rst b/doc/users/prev_whats_new/github_stats_3.0.2.rst
index edafac67e192..395f87acd534 100644
--- a/doc/users/prev_whats_new/github_stats_3.0.2.rst
+++ b/doc/users/prev_whats_new/github_stats_3.0.2.rst
@@ -1,13 +1,14 @@
 .. _github-stats-3-0-2:
 
-GitHub Stats for Matplotlib 3.0.2
-=================================
+GitHub statistics for 3.0.2 (Nov 10, 2018)
+==========================================
 
-GitHub stats for 2018/09/18 - 2018/11/09 (tag: v3.0.0)
+GitHub statistics for 2018/09/18 (tag: v3.0.0) - 2018/11/10
 
 These lists are automatically generated, and may be incomplete or contain duplicates.
 
 We closed 170 issues and merged 224 pull requests.
+The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/39?closed=1>`__
 
 The following 49 authors contributed 460 commits.
 
diff --git a/doc/users/prev_whats_new/github_stats_3.0.3.rst b/doc/users/prev_whats_new/github_stats_3.0.3.rst
new file mode 100644
index 000000000000..5c1271e52e4f
--- /dev/null
+++ b/doc/users/prev_whats_new/github_stats_3.0.3.rst
@@ -0,0 +1,147 @@
+.. _github-stats-3-0-3:
+
+GitHub statistics for 3.0.3 (Feb 28, 2019)
+==========================================
+
+GitHub statistics for 2018/11/10 (tag: v3.0.2) - 2019/02/28
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 14 issues and merged 92 pull requests.
+The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/40?closed=1>`__
+
+The following 19 authors contributed 157 commits.
+
+* Antony Lee
+* Christer Jensen
+* Christoph Gohlke
+* David Stansby
+* Elan Ernest
+* Elliott Sales de Andrade
+* ImportanceOfBeingErnest
+* James Adams
+* Jody Klymak
+* Johannes H. Jensen
+* Matthias Geier
+* MeeseeksMachine
+* Molly Rossow
+* Nelle Varoquaux
+* Paul Ivanov
+* Pierre Thibault
+* Thomas A Caswell
+* Tim Hoffmann
+* Tobia De Koninck
+
+GitHub issues and pull requests:
+
+Pull Requests (92):
+
+* :ghpull:`13493`: V3.0.3 prep
+* :ghpull:`13491`: V3.0.x pi
+* :ghpull:`13460`: Backport PR #13455 on branch v3.0.x (BLD: only try to get freetype src if src does not exist)
+* :ghpull:`13461`: Backport PR #13426 on branch v3.0.x (FIX: bbox_inches='tight' with only non-finite bounding boxes)
+* :ghpull:`13426`: FIX: bbox_inches='tight' with only non-finite bounding boxes
+* :ghpull:`13453`: Backport PR #13451 on branch v3.0.x (MNT: fix logic error where we never try the second freetype URL)
+* :ghpull:`13451`: MNT: fix logic error where we never try the second freetype URL
+* :ghpull:`13446`: Merge pull request #11246 from anntzer/download-jquery
+* :ghpull:`13437`: Backport PR #13436 on branch v3.0.x (Add get/set_in_layout to artist API docs.)
+* :ghpull:`13436`: Add get/set_in_layout to artist API docs.
+* :ghpull:`13432`: Really fix ArtistInspector.get_aliases
+* :ghpull:`13416`: Backport PR #13405 on branch v3.0.x (Fix imshow()ing PIL-opened images.)
+* :ghpull:`13418`: Backport PR #13412 and #13337 on branch v3.0.x
+* :ghpull:`13412`: CI: add additional qt5 deb package on travis
+* :ghpull:`13370`: Backport PR #13367 on branch v3.0.x (DOC: fix note of what version hold was deprecated in (2.0 not 2.1))
+* :ghpull:`13366`: Backport PR #13365 on branch v3.0.x (Fix gcc warning)
+* :ghpull:`13365`: Fix gcc warning
+* :ghpull:`13347`: Backport PR #13289 on branch v3.0.x (Fix unhandled C++ exception)
+* :ghpull:`13349`: Backport PR #13234 on branch v3.0.x
+* :ghpull:`13281`: MAINT install of pinned vers for travis
+* :ghpull:`13289`: Fix unhandled C++ exception
+* :ghpull:`13345`: Backport PR #13333 on branch v3.0.x (Fix possible leak of return of PySequence_GetItem.)
+* :ghpull:`13333`: Fix possible leak of return of PySequence_GetItem.
+* :ghpull:`13337`: Bump to flake8 3.7.
+* :ghpull:`13340`: Backport PR #12398 on branch v3.0.x (CI: Don't run AppVeyor/Travis for doc backport branches.)
+* :ghpull:`13317`: Backport PR #13316 on branch v3.0.x (Put correct version in constrained layout tutorial)
+* :ghpull:`13308`: Backport PR #12678 on branch v3.0.x
+* :ghpull:`12678`: FIX: properly set tz for YearLocator
+* :ghpull:`13291`: Backport PR #13287 on branch v3.0.x (Fix unsafe use of NULL pointer)
+* :ghpull:`13290`: Backport PR #13288 on branch v3.0.x (Fix potential memory leak)
+* :ghpull:`13287`: Fix unsafe use of NULL pointer
+* :ghpull:`13288`: Fix potential memory leak
+* :ghpull:`13273`: Backport PR #13272 on branch v3.0.x (DOC Better description of inset locator and colorbar)
+* :ghpull:`12812`: Backport PR #12809 on branch v3.0.x (Fix TypeError when calculating tick_values)
+* :ghpull:`13245`: Backport PR #13244 on branch v3.0.x (Fix typo)
+* :ghpull:`13176`: Backport PR #13047 on branch v3.0.x (Improve docs on contourf extend)
+* :ghpull:`13215`: Backport PR #13212 on branch v3.0.x (Updated the docstring for pyplot.figure to list floats as the type for figsize argument)
+* :ghpull:`13158`: Backport PR #13150 on branch v3.0.x (Remove unused add_dicts from example.)
+* :ghpull:`13157`: Backport PR #13152 on branch v3.0.x (DOC: Add explanatory comment for colorbar with axes divider example)
+* :ghpull:`13221`: Backport PR #13194 on branch v3.0.x (TST: Fix incorrect call to pytest.raises.)
+* :ghpull:`13230`: Backport PR #13226 on branch v3.0.x (Avoid triggering warnings in mandelbrot example.)
+* :ghpull:`13216`: Backport #13205 on branch v3.0.x (Add xvfb service to travis)
+* :ghpull:`13194`: TST: Fix incorrect call to pytest.raises.
+* :ghpull:`13212`: Updated the docstring for pyplot.figure to list floats as the type for figsize argument
+* :ghpull:`13205`: Add xvfb service to travis
+* :ghpull:`13204`: Add xvfb service to travis
+* :ghpull:`13175`: Backport PR #13015 on branch v3.0.x (Enable local doc building without git installation)
+* :ghpull:`13047`: Improve docs on contourf extend
+* :ghpull:`13015`: Enable local doc building without git installation
+* :ghpull:`13159`: Revert "Pin pytest to <3.8 (for 3.0.x)"
+* :ghpull:`13150`: Remove unused add_dicts from example.
+* :ghpull:`13152`: DOC: Add explanatory comment for colorbar with axes divider example
+* :ghpull:`13085`: Backport PR #13081 on branch v3.0.x (DOC: forbid a buggy version of pillow for building docs)
+* :ghpull:`13082`: Backport PR #13080 on branch v3.0.x (Pin pillow to < 5.4 to fix doc build)
+* :ghpull:`13054`: Backport PR #13052 on branch v3.0.x (Small bug fix in image_slices_viewer)
+* :ghpull:`13052`: Small bug fix in image_slices_viewer
+* :ghpull:`13036`: Backport PR #12949 on branch v3.0.x (Update docstring of Axes3d.scatter)
+* :ghpull:`12949`: Update docstring of Axes3d.scatter
+* :ghpull:`13004`: Backport PR #13001: Update windows build instructions
+* :ghpull:`13011`: Backport PR #13006 on branch v3.0.x (Add category module to docs)
+* :ghpull:`13009`: Fix dependencies for travis build with python 3.5
+* :ghpull:`13006`: Add category module to docs
+* :ghpull:`13001`: Update windows build instructions
+* :ghpull:`12996`: Fix return type in 3D scatter docs
+* :ghpull:`12972`: Backport PR #12929 on branch v3.0.x (FIX: skip gtk backend if gobject but not pygtk is installed)
+* :ghpull:`12596`: Use sudo:true for nightly builds.
+* :ghpull:`12929`: FIX: skip gtk backend if gobject but not pygtk is installed
+* :ghpull:`12965`: Backport PR #12960 on branch v3.0.x (Remove animated=True from animation docs)
+* :ghpull:`12964`: Backport PR #12938 on branch v3.0.x (Fix xtick.minor.visible only acting on the xaxis)
+* :ghpull:`12938`: Fix xtick.minor.visible only acting on the xaxis
+* :ghpull:`12937`: Backport PR #12914 on branch 3.0.x: Fix numpydoc formatting
+* :ghpull:`12914`: Fix numpydoc formatting
+* :ghpull:`12923`: Backport PR #12921 on branch v3.0.x (Fix documentation of vert parameter of Axes.bxp)
+* :ghpull:`12921`: Fix documentation of vert parameter of Axes.bxp
+* :ghpull:`12912`: Backport PR #12878 on branch v3.0.2-doc (Pin pytest to <3.8 (for 3.0.x))
+* :ghpull:`12906`: Backport PR #12774 on branch v3.0.x
+* :ghpull:`12774`: Cairo backend: Fix alpha render of collections
+* :ghpull:`12854`: Backport PR #12835 on branch v3.0.x (Don't fail tests if cairo dependency is not installed.)
+* :ghpull:`12896`: Backport PR #12848 on branch v3.0.x (Fix spelling of the name Randall Munroe)
+* :ghpull:`12894`: Backport PR #12890 on branch v3.0.x (Restrict postscript title to ascii.)
+* :ghpull:`12838`: Backport PR #12795 on branch v3.0.x (Fix Bezier degree elevation formula in backend_cairo.)
+* :ghpull:`12843`: Backport PR #12824 on branch v3.0.x
+* :ghpull:`12890`: Restrict postscript title to ascii.
+* :ghpull:`12878`: Pin pytest to <3.8 (for 3.0.x)
+* :ghpull:`12870`: Backport PR #12869 on branch v3.0.x (Fix latin-1-ization of Title in eps.)
+* :ghpull:`12869`: Fix latin-1-ization of Title in eps.
+* :ghpull:`12835`: Don't fail tests if cairo dependency is not installed.
+* :ghpull:`12848`: Fix spelling of the name Randall Munroe
+* :ghpull:`12795`: Fix Bezier degree elevation formula in backend_cairo.
+* :ghpull:`12824`: Add missing datestr2num to docs
+* :ghpull:`12791`: Backport PR #12790 on branch v3.0.x (Remove ticks and titles from tight bbox tests.)
+* :ghpull:`12790`: Remove ticks and titles from tight bbox tests.
+
+Issues (14):
+
+* :ghissue:`10360`: creating PathCollection proxy artist with %matplotlib inline raises ValueError: cannot convert float NaN to integer
+* :ghissue:`13276`: calling annotate with nan values for the position still gives error after 3.0.2
+* :ghissue:`13450`: Issues with jquery download caching
+* :ghissue:`13223`: label1On set to true when axis.tick_params(axis='both', which='major', length=5)
+* :ghissue:`13311`: docs unclear on status of constraint layout
+* :ghissue:`12675`: Off-by-one bug in annual axis labels when localized time crosses year boundary
+* :ghissue:`13208`: Wrong argument type for figsize in documentation for figure
+* :ghissue:`13201`: test_backend_qt tests failing
+* :ghissue:`13013`: v3.0.2 local html docs "git describe" error
+* :ghissue:`13051`: Missing self in image_slices_viewer
+* :ghissue:`12920`: Incorrect return type in mplot3d documentation
+* :ghissue:`12907`: Tiny typo in documentation of matplotlib.figure.Figure.colorbar
+* :ghissue:`12892`: GTK3Cairo Backend Legend TypeError
+* :ghissue:`12815`: DOC: matplotlib.dates datestr2num function documentation is missing
diff --git a/doc/users/prev_whats_new/github_stats_3.1.0.rst b/doc/users/prev_whats_new/github_stats_3.1.0.rst
index 704de6d09932..97bee1af56b8 100644
--- a/doc/users/prev_whats_new/github_stats_3.1.0.rst
+++ b/doc/users/prev_whats_new/github_stats_3.1.0.rst
@@ -1,14 +1,14 @@
 .. _github-stats-3-1-0:
 
-GitHub Stats for Matplotlib 3.1.0
-=================================
+GitHub statistics for 3.1.0 (May 18, 2019)
+==========================================
 
-GitHub stats for 2018/09/18 - 2019/05/13 (tag: v3.0.0)
+GitHub statistics for 2018/09/18 (tag: v3.0.0) - 2019/05/18
 
 These lists are automatically generated, and may be incomplete or contain duplicates.
 
 We closed 161 issues and merged 918 pull requests.
-The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestones/v3.1.0>`__
+The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/35?closed=1>`__
 
 The following 150 authors contributed 3426 commits.
 
diff --git a/doc/users/prev_whats_new/github_stats_3.1.1.rst b/doc/users/prev_whats_new/github_stats_3.1.1.rst
index 5de8ba84ade8..3e552c371c55 100644
--- a/doc/users/prev_whats_new/github_stats_3.1.1.rst
+++ b/doc/users/prev_whats_new/github_stats_3.1.1.rst
@@ -1,9 +1,9 @@
 .. _github-stats-3-1-1:
 
-GitHub Stats for Matplotlib 3.1.1
-=================================
+GitHub statistics for 3.1.1 (Jul 02, 2019)
+==========================================
 
-GitHub stats for 2019/05/18 - 2019/06/30 (tag: v3.1.0)
+GitHub statistics for 2019/05/18 (tag: v3.1.0) - 2019/07/02
 
 These lists are automatically generated, and may be incomplete or contain duplicates.
 
diff --git a/doc/users/prev_whats_new/github_stats_3.1.2.rst b/doc/users/prev_whats_new/github_stats_3.1.2.rst
index 9f11f34cb78a..e1ed84e26372 100644
--- a/doc/users/prev_whats_new/github_stats_3.1.2.rst
+++ b/doc/users/prev_whats_new/github_stats_3.1.2.rst
@@ -1,202 +1,186 @@
 .. _github-stats-3-1-2:
 
-GitHub Stats for Matplotlib 3.1.2
-=================================
+GitHub statistics for 3.1.2 (Nov 21, 2019)
+==========================================
 
-GitHub stats for 2019/05/18 - 2019/06/30 (tag: v3.1.0)
+GitHub statistics for 2019/07/01 (tag: v3.1.1) - 2019/11/21
 
 These lists are automatically generated, and may be incomplete or contain duplicates.
 
-We closed 30 issues and merged 120 pulnl requests.
-The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/46?closed=1>`__
+We closed 28 issues and merged 113 pull requests.
+The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/47?closed=1>`__
 
-The following 30 authors contributed 323 commits.
+The following 23 authors contributed 192 commits.
 
-* Adam Gomaa
+* Alex Rudy
 * Antony Lee
-* Ben Root
-* Christer Jensen
-* chuanzhu xu
+* Bingyao Liu
+* Cong Ma
 * David Stansby
-* Deng Tian
-* djdt
-* Dora Fraeman Caswell
-* Elan Ernest
 * Elliott Sales de Andrade
-* Eric Firing
-* Filipe Fernandes
-* Ian Thomas
+* hannah
+* Hanno Rein
 * ImportanceOfBeingErnest
+* joaonsg
 * Jody Klymak
-* Johannes H. Jensen
-* Jonas Camillus Jeppesen
-* LeiSurrre
-* Matt Adamson
+* Matthias Bussonnier
 * MeeseeksMachine
-* Molly Rossow
-* Nathan Goldbaum
+* miquelastein
 * Nelle Varoquaux
+* Patrick Shriwise
+* Paul Hoffman
 * Paul Ivanov
-* RoryIAngus
 * Ryan May
+* Samesh
 * Thomas A Caswell
-* Thomas Robitaille
 * Tim Hoffmann
+* Vincent L.M. Mazoyer
 
 GitHub issues and pull requests:
 
-Pull Requests (120):
+Pull Requests (113):
 
-* :ghpull:`14636`: Don't capture stderr in _check_and_log_subprocess.
-* :ghpull:`14655`: Backport PR #14649 on branch v3.1.x (Fix appveyor conda py37)
-* :ghpull:`14649`: Fix appveyor conda py37
-* :ghpull:`14646`: Backport PR #14640 on branch v3.1.x (FIX: allow secondary axes to be non-linear)
-* :ghpull:`14640`: FIX: allow secondary axes to be non-linear
-* :ghpull:`14643`: Second attempt at fixing axis inversion (for mpl3.1).
-* :ghpull:`14623`: Fix axis inversion with loglocator and logitlocator.
-* :ghpull:`14619`: Backport PR #14598 on branch v3.1.x (Fix inversion of shared axes.)
-* :ghpull:`14621`: Backport PR #14613 on branch v3.1.x (Cleanup DateFormatter docstring.)
-* :ghpull:`14622`: Backport PR #14611 on branch v3.1.x (Update some axis docstrings.)
-* :ghpull:`14611`: Update some axis docstrings.
-* :ghpull:`14613`: Cleanup DateFormatter docstring.
-* :ghpull:`14598`: Fix inversion of shared axes.
-* :ghpull:`14610`: Backport PR #14579 on branch v3.1.x (Fix inversion of 3d axis.)
-* :ghpull:`14579`: Fix inversion of 3d axis.
-* :ghpull:`14600`: Backport PR #14599 on branch v3.1.x (DOC: Add numpngw to third party packages.)
-* :ghpull:`14574`: Backport PR #14568 on branch v3.1.x (Don't assume tk canvas have a manager attached.)
-* :ghpull:`14568`: Don't assume tk canvas have a manager attached.
-* :ghpull:`14571`: Backport PR #14566 on branch v3.1.x (Move setting of AA_EnableHighDpiScaling before creating QApplication.)
-* :ghpull:`14566`: Move setting of AA_EnableHighDpiScaling before creating QApplication.
-* :ghpull:`14541`: Backport PR #14535 on branch v3.1.x (Invalidate FT2Font cache when fork()ing.)
-* :ghpull:`14535`: Invalidate FT2Font cache when fork()ing.
-* :ghpull:`14522`: Backport PR #14040 on branch v3.1.x (Gracefully handle non-finite z in tricontour (issue #10167))
-* :ghpull:`14434`: Backport PR #14296 on branch v3.1.x (Fix barbs to accept array of bool for ``flip_barb``)
-* :ghpull:`14518`: Backport PR #14509 on branch v3.1.x (Fix too large icon spacing in Qt5 on non-HiDPI screens)
-* :ghpull:`14509`: Fix too large icon spacing in Qt5 on non-HiDPI screens
-* :ghpull:`14514`: Backport PR #14256 on branch v3.1.x (Improve docstring of Axes.barbs)
-* :ghpull:`14256`: Improve docstring of Axes.barbs
-* :ghpull:`14505`: Backport PR #14395 on branch v3.1.x (MAINT: work around non-zero exit status of "pdftops -v" command.)
-* :ghpull:`14504`: Backport PR #14445 on branch v3.1.x (FIX: fastpath clipped artists)
-* :ghpull:`14502`: Backport PR #14451 on branch v3.1.x (FIX: return points rather than path to fix regression)
-* :ghpull:`14445`: FIX: fastpath clipped artists
-* :ghpull:`14497`: Backport PR #14491 on branch v3.1.x (Fix uses of PyObject_IsTrue.)
-* :ghpull:`14491`: Fix uses of PyObject_IsTrue.
-* :ghpull:`14492`: Backport PR #14490 on branch v3.1.x (Fix links of parameter types)
-* :ghpull:`14490`: Fix links of parameter types
-* :ghpull:`14489`: Backport PR #14459 on branch v3.1.x (Cleanup docstring of DraggableBase.)
-* :ghpull:`14459`: Cleanup docstring of DraggableBase.
-* :ghpull:`14485`: Backport #14429 on v3.1.x
-* :ghpull:`14486`: Backport #14403 on v3.1.
-* :ghpull:`14429`: FIX: if the first elements of an array are masked keep checking
-* :ghpull:`14481`: Backport PR #14475 on branch v3.1.x (change ginoput docstring to match behavior)
-* :ghpull:`14482`: Backport PR #14464 on branch v3.1.x (Mention origin and extent tutorial in API docs for origin kwarg)
-* :ghpull:`14464`: Mention origin and extent tutorial in API docs for origin kwarg
-* :ghpull:`14468`: Backport PR #14449: Improve docs on gridspec
-* :ghpull:`14475`: change ginoput docstring to match behavior
-* :ghpull:`14477`: Backport PR #14461 on branch v3.1.x (Fix out of bounds read in backend_tk.)
-* :ghpull:`14476`: Backport PR #14474 on branch v3.1.x (Fix default value in docstring of errorbar func)
-* :ghpull:`14461`: Fix out of bounds read in backend_tk.
-* :ghpull:`14474`: Fix default value in docstring of errorbar func
-* :ghpull:`14473`: Backport PR #14472 on branch v3.1.x (Fix NameError in example code for setting label via method)
-* :ghpull:`14472`: Fix NameError in example code for setting label via method
-* :ghpull:`14449`: Improve docs on gridspec
-* :ghpull:`14450`: Backport PR #14422 on branch v3.1.x (Fix ReST note in span selector example)
-* :ghpull:`14446`: Backport PR #14438 on branch v3.1.x (Issue #14372 - Add degrees to documentation)
-* :ghpull:`14438`: Issue #14372 - Add degrees to documentation
-* :ghpull:`14437`: Backport PR #14387 on branch v3.1.x (Fix clearing rubberband on nbagg)
-* :ghpull:`14387`: Fix clearing rubberband on nbagg
-* :ghpull:`14435`: Backport PR #14425 on branch v3.1.x (Lic restore license paint)
-* :ghpull:`14296`: Fix barbs to accept array of bool for ``flip_barb``
-* :ghpull:`14430`: Backport PR #14397 on branch v3.1.x (Correctly set clip_path on pcolorfast return artist.)
-* :ghpull:`14397`: Correctly set clip_path on pcolorfast return artist.
-* :ghpull:`14409`: Backport PR #14335 on branch v3.1.x (Add explanation of animation.embed_limit to matplotlibrc.template)
-* :ghpull:`14335`: Add explanation of animation.embed_limit to matplotlibrc.template
-* :ghpull:`14403`: Revert "Preserve whitespace in svg output."
-* :ghpull:`14407`: Backport PR #14406 on branch v3.1.x (Remove extra \iint in math_symbol_table for document)
-* :ghpull:`14398`: Backport PR #14394 on branch v3.1.x (Update link to "MathML torture test".)
-* :ghpull:`14394`: Update link to "MathML torture test".
-* :ghpull:`14389`: Backport PR #14388 on branch v3.1.x (Fixed one little spelling error)
-* :ghpull:`14385`: Backport PR #14316 on branch v3.1.x (Improve error message for kiwisolver import error (DLL load failed))
-* :ghpull:`14388`: Fixed one little spelling error
-* :ghpull:`14384`: Backport PR #14369 on branch v3.1.x (Don't use deprecated mathcircled in docs.)
-* :ghpull:`14316`: Improve error message for kiwisolver import error (DLL load failed)
-* :ghpull:`14369`: Don't use deprecated mathcircled in docs.
-* :ghpull:`14375`: Backport PR #14374 on branch v3.1.x (Check that the figure patch is in bbox_artists before trying to remove.)
-* :ghpull:`14374`: Check that the figure patch is in bbox_artists before trying to remove.
-* :ghpull:`14040`: Gracefully handle non-finite z in tricontour (issue #10167)
-* :ghpull:`14342`: Backport PR #14326 on branch v3.1.x (Correctly apply PNG palette when building ImageBase through Pillow.)
-* :ghpull:`14326`: Correctly apply PNG palette when building ImageBase through Pillow.
-* :ghpull:`14341`: Backport PR #14337 on branch v3.1.x (Docstring cleanup)
-* :ghpull:`14337`: Docstring cleanup
-* :ghpull:`14325`: Backport PR #14126 on branch v3.1.x (Simplify grouped bar chart example)
-* :ghpull:`14324`: Backport PR #14139 on branch v3.1.x (TST: be more explicit about identifying qt4/qt5 imports)
-* :ghpull:`14126`: Simplify grouped bar chart example
-* :ghpull:`14323`: Backport PR #14290 on branch v3.1.x (Convert SymmetricalLogScale to numpydoc)
-* :ghpull:`14139`: TST: be more explicit about identifying qt4/qt5 imports
-* :ghpull:`14290`: Convert SymmetricalLogScale to numpydoc
-* :ghpull:`14321`: Backport PR #14313 on branch v3.1.x
-* :ghpull:`14313`: Support masked array inputs for to_rgba and to_rgba_array.
-* :ghpull:`14320`: Backport PR #14319 on branch v3.1.x (Don't set missing history buttons.)
-* :ghpull:`14319`: Don't set missing history buttons.
-* :ghpull:`14317`: Backport PR #14295: Fix bug in SymmetricalLogTransform.
-* :ghpull:`14302`: Backport PR #14255 on branch v3.1.x (Improve docsstring of Axes.streamplot)
-* :ghpull:`14255`: Improve docsstring of Axes.streamplot
-* :ghpull:`14295`: Fix bug in SymmetricalLogTransform.
-* :ghpull:`14294`: Backport PR #14282 on branch v3.1.x (Fix toolmanager's destroy subplots in tk)
-* :ghpull:`14282`: Fix toolmanager's destroy subplots in tk
-* :ghpull:`14292`: Backport PR #14289 on branch v3.1.x (BUG: Fix performance regression when plotting values from Numpy array sub-classes)
-* :ghpull:`14289`: BUG: Fix performance regression when plotting values from Numpy array sub-classes
-* :ghpull:`14287`: Backport PR #14286 on branch v3.1.x (fix minor typo)
-* :ghpull:`14284`: Backport PR #14279 on branch v3.1.x (In case fallback to Agg fails, let the exception propagate out.)
-* :ghpull:`14254`: Merge up 30x
-* :ghpull:`14279`: In case fallback to Agg fails, let the exception propagate out.
-* :ghpull:`14268`: Backport PR #14261 on branch v3.1.x (Updated polar documentation)
-* :ghpull:`14261`: Updated polar documentation
-* :ghpull:`14264`: Backport PR #14260 on branch v3.1.x (Remove old OSX FAQ page)
-* :ghpull:`14260`: Remove old OSX FAQ page
-* :ghpull:`14249`: Backport PR #14243 on branch v3.1.x (Update docstring of makeMappingArray)
-* :ghpull:`14250`: Backport PR #14149 on branch v3.1.x
-* :ghpull:`14252`: Backport PR #14248 on branch v3.1.x (Fix TextBox not respecting eventson)
-* :ghpull:`14253`: Backport PR #13596 on branch v3.1.x (Normalize properties passed to bxp().)
-* :ghpull:`14251`: Backport PR #14241 on branch v3.1.x (Fix linear segmented colormap with one element)
-* :ghpull:`13596`: Normalize properties passed to bxp().
-* :ghpull:`14248`: Fix TextBox not respecting eventson
-* :ghpull:`14241`: Fix linear segmented colormap with one element
-* :ghpull:`14243`: Update docstring of makeMappingArray
-* :ghpull:`14238`: Backport PR #14164 on branch v3.1.x (Fix regexp for dvipng version detection)
-* :ghpull:`14149`: Avoid using ``axis([xlo, xhi, ylo, yhi])`` in examples.
-* :ghpull:`14164`: Fix regexp for dvipng version detection
-* :ghpull:`13739`: Fix pressing tab breaks keymap in CanvasTk
+* :ghpull:`15664`: Backport PR #15649 on branch v3.1.x (Fix searchindex.js loading when ajax fails (because e.g. CORS in embedded iframes))
+* :ghpull:`15722`: Backport PR #15718 on branch v3.1.x (Update donation link)
+* :ghpull:`15667`: Backport PR #15654 on branch v3.1.x (Fix some broken links.)
+* :ghpull:`15658`: Backport PR #15647 on branch v3.1.x (Update some links)
+* :ghpull:`15582`: Backport PR #15512 on branch v3.1.x
+* :ghpull:`15512`: FIX: do not consider webagg and nbagg "interactive" for fallback
+* :ghpull:`15558`: Backport PR #15553 on branch v3.1.x (DOC: add cache-buster query string to css path)
+* :ghpull:`15550`: Backport PR #15528 on branch v3.1.x (Declutter home page)
+* :ghpull:`15547`: Backport PR #15516 on branch v3.1.x (Add logo like font)
+* :ghpull:`15511`: DOC: fix nav location
+* :ghpull:`15508`: Backport PR #15489 on branch v3.1.x (DOC: adding main nav to site)
+* :ghpull:`15494`: Backport PR #15486 on branch v3.1.x (Fixes an error in the documentation of Ellipse)
+* :ghpull:`15486`: Fixes an error in the documentation of Ellipse
+* :ghpull:`15473`: Backport PR #15464 on branch v3.1.x (Remove unused code (remainder from #15453))
+* :ghpull:`15470`: Backport PR #15460 on branch v3.1.x (Fix incorrect value check in axes_grid.)
+* :ghpull:`15464`: Remove unused code (remainder from #15453)
+* :ghpull:`15455`: Backport PR #15453 on branch v3.1.x (Improve example for tick locators)
+* :ghpull:`15453`: Improve example for tick locators
+* :ghpull:`15443`: Backport PR #15439 on branch v3.1.x (DOC: mention discourse main page)
+* :ghpull:`15424`: Backport PR #15422 on branch v3.1.x (FIX: typo in attribute lookup)
+* :ghpull:`15322`: Backport PR #15297 on branch v3.1.x (Document How-to figure empty)
+* :ghpull:`15298`: Backport PR #15296 on branch v3.1.x (Fix typo/bug from 18cecf7)
+* :ghpull:`15296`: Fix typo/bug from 18cecf7
+* :ghpull:`15278`: Backport PR #15271 on branch v3.1.x (Fix font weight validation)
+* :ghpull:`15271`: Fix font weight validation
+* :ghpull:`15218`: Backport PR #15217 on branch v3.1.x (Doc: Add ``plt.show()`` to horizontal bar chart example)
+* :ghpull:`15207`: Backport PR #15206: FIX: be more forgiving about expecting internal s…
+* :ghpull:`15198`: Backport PR #15197 on branch v3.1.x (Remove mention of now-removed basedir setup option.)
+* :ghpull:`15197`: Remove mention of now-removed basedir setup option.
+* :ghpull:`15189`: Backport PR #14979: FIX: Don't enable IPython integration if not ente…
+* :ghpull:`15190`: Backport PR #14683: For non-html output, let sphinx pick the best format
+* :ghpull:`15187`: Backport PR #15140 on branch v3.1.x
+* :ghpull:`15185`: Backport PR #15168 on branch v3.1.x (MNT: explicitly cast ``np.bool_`` -> bool to prevent deprecation warning)
+* :ghpull:`15168`: MNT: explicitly cast ``np.bool_`` -> bool to prevent deprecation warning
+* :ghpull:`15183`: Backport PR #15181 on branch v3.1.x (FIX: proper call to zero_formats)
+* :ghpull:`15181`: FIX: proper call to zero_formats
+* :ghpull:`15172`: Backport PR #15166 on branch v3.1.x
+* :ghpull:`15166`: FIX: indexed pandas bar
+* :ghpull:`15153`: Backport PR #14456 on branch v3.1.x (PyQT5 Backend Partial Redraw Fix)
+* :ghpull:`14456`: PyQT5 Backend Partial Redraw Fix
+* :ghpull:`15140`: Fix ScalarFormatter formatting of masked values
+* :ghpull:`15135`: Backport PR #15132 on branch v3.1.x (Update documenting guide on rcParams)
+* :ghpull:`15128`: Backport PR #15115 on branch v3.1.x (Doc: highlight rcparams)
+* :ghpull:`15125`: Backport PR #15110 on branch v3.1.x (Add inheritance diagram to mpl.ticker docs)
+* :ghpull:`15116`: Backport PR #15114 on branch v3.1.x (DOC: update language around NF)
+* :ghpull:`15058`: Backport PR #15055 on branch v3.1.x (Remove mention of now-removed feature in docstring.)
+* :ghpull:`15055`: Remove mention of now-removed feature in docstring.
+* :ghpull:`15047`: Backport PR #14919 on branch v3.1.x (FIX constrained_layout w/ hidden axes)
+* :ghpull:`14919`: FIX constrained_layout w/ hidden axes
+* :ghpull:`15022`: Backport PR #15020 on branch v3.1.x (Let connectionpatch be drawn on figure level)
+* :ghpull:`15020`: Let connectionpatch be drawn on figure level
+* :ghpull:`15017`: Backport PR #15007 on branch v3.1.x (FIX: support pandas 0.25)
+* :ghpull:`14979`: FIX: Don't enable IPython integration if not entering REPL.
+* :ghpull:`14987`: Merge pull request #14915 from AWhetter/fix_14585
+* :ghpull:`14985`: Backport PR #14982 on branch v3.1.x (DOC: correct table docstring)
+* :ghpull:`14982`: DOC: correct table docstring
+* :ghpull:`14975`: Backport PR #14974 on branch v3.1.x (grammar)
+* :ghpull:`14972`: Backport PR #14971 on branch v3.1.x (typo)
+* :ghpull:`14965`: Fix typo in documentation of table
+* :ghpull:`14951`: Backport PR #14934 on branch v3.1.x (DOC: update axes_demo to directly manipulate fig, ax)
+* :ghpull:`14938`: Backport PR #14905 on branch v3.1.x (Gracefully handle encoding problems when querying external executables.)
+* :ghpull:`14935`: Backport PR #14933 on branch v3.1.x (DOC: typo x2 costum -> custom)
+* :ghpull:`14936`: Backport PR #14932 on branch v3.1.x (DOC: Update invert_example to directly manipulate axis.)
+* :ghpull:`14905`: Gracefully handle encoding problems when querying external executables.
+* :ghpull:`14933`: DOC: typo x2 costum -> custom
+* :ghpull:`14910`: Backport PR #14901 on branch v3.1.x (Fix GH14900: numpy 1.17.0 breaks test_colors.)
+* :ghpull:`14864`: Backport PR #14830 on branch v3.1.x (FIX: restore special casing of shift-enter in notebook)
+* :ghpull:`14861`: Don't use pandas 0.25.0 for testing
+* :ghpull:`14855`: Backport PR #14839 on branch v3.1.x
+* :ghpull:`14839`: Improve docstring of Axes.hexbin
+* :ghpull:`14837`: Backport PR #14757 on branch v3.1.x (Remove incorrect color/cmap docstring line in contour.py)
+* :ghpull:`14836`: Backport PR #14764 on branch v3.1.x (DOC: Fixes the links in the see-also section of Axes.get_tightbbox)
+* :ghpull:`14818`: Backport PR #14510 on branch v3.1.x (Improve example for fill_between)
+* :ghpull:`14819`: Backport PR #14704 on branch v3.1.x (Small patches on Docs (Tutorials and FAQ))
+* :ghpull:`14820`: Backport PR #14765 on branch v3.1.x (DOC: Fix documentation location for patheffects)
+* :ghpull:`14821`: Backport PR #14741 on branch v3.1.x (DOC: Update description of properties of Line2D in 'plot' documentation.)
+* :ghpull:`14822`: Backport PR #14714 on branch v3.1.x (Point towards how to save output of non-interactive backends)
+* :ghpull:`14823`: Backport PR #14784 on branch v3.1.x (Tiny docs/comments cleanups.)
+* :ghpull:`14824`: Backport PR #14798 on branch v3.1.x (Cleanup dates.py module docstrings.)
+* :ghpull:`14825`: Backport PR #14802 on branch v3.1.x (Fix some broken refs in the docs.)
+* :ghpull:`14826`: Backport PR #14806 on branch v3.1.x (Remove unnecessary uses of transFigure from examples.)
+* :ghpull:`14827`: Backport PR #14525 on branch v3.1.x (improve documentation of OffsetBox)
+* :ghpull:`14828`: Backport PR #14548: Link to matplotlibrc of used version
+* :ghpull:`14817`: Backport PR #14697 on branch v3.1.x (Fix NavigationToolbar2QT height)
+* :ghpull:`14692`: Backport PR #14688 on branch v3.1.x (Revise the misleading title for subplots demo)
+* :ghpull:`14816`: Backport PR #14677 on branch v3.1.x (Don't misclip axis when calling set_ticks on inverted axes.)
+* :ghpull:`14815`: Backport PR #14658 on branch v3.1.x (Fix numpydoc formatting)
+* :ghpull:`14813`: Backport PR #14488 on branch v3.1.x (Make sure EventCollection doesn't modify input in-place)
+* :ghpull:`14806`: Remove unnecessary uses of transFigure from examples.
+* :ghpull:`14802`: Fix some broken refs in the docs.
+* :ghpull:`14798`: Cleanup dates.py module docstrings.
+* :ghpull:`14784`: Tiny docs/comments cleanups.
+* :ghpull:`14764`: DOC: Fixes the links in the see-also section of Axes.get_tightbbox
+* :ghpull:`14777`: Backport PR #14775 on branch v3.1.x (DOC: Fix CircleCI builds)
+* :ghpull:`14769`: Backport PR #14759 on branch v3.1.x (DOC: note about having to rebuild after switching to local freetype)
+* :ghpull:`14714`: Point towards how to save output of non-interactive backends
+* :ghpull:`14741`: DOC: Update description of properties of Line2D in 'plot' documentation.
+* :ghpull:`14771`: Backport PR #14760 on branch v3.1.x (DOC: minor CoC wording change)
+* :ghpull:`14765`: DOC: Fix documentation location for patheffects
+* :ghpull:`14735`: Backport PR #14734 on branch v3.1.x (Add geoplot to third-party example libraries page.)
+* :ghpull:`14711`: Backport PR #14706 on branch v3.1.x (Mention gr backend in docs.)
+* :ghpull:`14704`: Small patches on Docs (Tutorials and FAQ)
+* :ghpull:`14700`: Backport PR #14698 on branch v3.1.x (Make property name be consistent with rc parameter.)
+* :ghpull:`14510`: Improve example for fill_between
+* :ghpull:`14683`: For non-html output, let sphinx pick the best format.
+* :ghpull:`14697`: Fix NavigationToolbar2QT height
+* :ghpull:`14677`: Don't misclip axis when calling set_ticks on inverted axes.
+* :ghpull:`14658`: Fix numpydoc formatting
+* :ghpull:`14488`: Make sure EventCollection doesn't modify input in-place
+* :ghpull:`14570`: Remove print statements
+* :ghpull:`14525`: improve documentation of OffsetBox
+* :ghpull:`14548`: Link to matplotlibrc of used version
+* :ghpull:`14395`: MAINT: work around non-zero exit status of "pdftops -v" command.
 
-Issues (30):
+Issues (28):
 
-* :ghissue:`14620`: Plotting on a log/logit scale overwrites axis inverting
-* :ghissue:`14615`: Inverting an axis using its limits does not work for log scale
-* :ghissue:`14577`: Calling invert_yaxis() on a 3D plot has either no effect or removes ticks
-* :ghissue:`14602`: NavigationToolbar2Tk save_figure function bug
-* :ghissue:`1219`: Show fails on figures created with the object-oriented system
-* :ghissue:`10167`: Segmentation fault with tricontour
-* :ghissue:`13723`: RuntimeError when saving PDFs via parallel processes (not threads!)
-* :ghissue:`14315`: Improvement: Better error message if kiwisolver fails to import
-* :ghissue:`14356`: matplotlib.units.ConversionError on scatter of dates with a NaN in the first position
-* :ghissue:`14467`: Docs for plt.ginput() have the wrong default value for show_clicks keyword argument.
-* :ghissue:`14225`: Matplotlib crashes on windows while maximizing plot window when using Multicursor
-* :ghissue:`14458`: DOC: small inconsistency in errobar docstring
-* :ghissue:`14372`: Document that view_init() arguments should be in degrees
-* :ghissue:`12201`: issues clearing rubberband on nbagg at non-default browser zoom
-* :ghissue:`13576`: pcolorfast misbehaves when changing axis limits
-* :ghissue:`14303`: Unable to import matplotlib on Windows 10 v1903
-* :ghissue:`14283`: RendererSVG CSS 'white-space' property conflicts with default HTML CSS
-* :ghissue:`14293`: imshow() producing "inverted" colors since 3.0.3
-* :ghissue:`14322`: Cannot import matplotlib with Python 3.7.x on Win10Pro
-* :ghissue:`14137`: Qt5 test auto-skip is not working correctly
-* :ghissue:`14301`: scatter() fails on nan-containing input when providing edgecolor
-* :ghissue:`14318`: Don't try to set missing history buttons.
-* :ghissue:`14265`: symlog looses some points since 3.1.0 (example given)
-* :ghissue:`14274`: BUG: plotting with Numpy array subclasses is slow with Matplotlib 3.1.0 (regression)
-* :ghissue:`14263`: import pyplot issue -
-* :ghissue:`14227`: Update "working with Mpl on OSX" docs
-* :ghissue:`13448`: boxplot doesn't normalize properties before applying them
-* :ghissue:`14226`: Modify matplotlib TextBox value without triggering callback
-* :ghissue:`14232`: LinearSegmentedColormap with N=1 gives confusing error message
-* :ghissue:`10365`: Scatter plot with non-sequence ´c´ color should give a better Error message.
+* :ghissue:`15295`: Can't install matplotlib with pip for Python 3.8b4
+* :ghissue:`15714`: Publish 3.8 wheels
+* :ghissue:`15706`: Python 3.8 - Installation error: TypeError: stat: path should be string, bytes, os.PathLike or integer, not NoneType
+* :ghissue:`15690`: Should xlim support single-entry arrays?
+* :ghissue:`15608`: imshow rendering changed from 3.1.0 to 3.1.1
+* :ghissue:`14903`: 'MPLBACKEND=webagg' is overwritten by agg when $DISPLAY is not set on Linux
+* :ghissue:`15351`: Bar width expands between subsequent bars
+* :ghissue:`15240`: Can't specify integer ``font.weight`` in custom style sheet any more
+* :ghissue:`15255`: ``imshow`` in ``v3.1.1``: y-axis chopped-off
+* :ghissue:`15186`: 3D quiver plot fails when pivot = "middle"
+* :ghissue:`14160`: PySide2/PyQt5: Graphics issues in QScrollArea for OSX
+* :ghissue:`15178`: mdates.ConciseDateFormatter() doesn't work with zero_formats parameter
+* :ghissue:`15179`: Patch 3.1.1 broke imshow() heatmaps: Tiles cut off on y-axis
+* :ghissue:`15162`: axes.bar fails when x is int-indexed pandas.Series
+* :ghissue:`15103`: Colorbar for imshow messes interactive cursor with masked data
+* :ghissue:`8744`: ConnectionPatch hidden by plots
+* :ghissue:`14950`: plt.ioff() not supressing figure generation
+* :ghissue:`14959`: Typo in Docs
+* :ghissue:`14902`: from matplotlib import animation UnicodeDecodeError
+* :ghissue:`14897`: New yticks behavior in 3.1.1 vs 3.1.0
+* :ghissue:`14811`: How to save hexbin binned data in a text file.
+* :ghissue:`14551`: Non functional API links break docs builds downstream
+* :ghissue:`14720`: Line2D properties should state units
+* :ghissue:`10891`: Toolbar icons too large in PyQt5 (Qt5Agg backend)
+* :ghissue:`14675`: Heatmaps are being truncated when using with seaborn
+* :ghissue:`14487`: eventplot sorts np.array positions, but not list positions
+* :ghissue:`14547`: Changing mplstyle: axes.titlelocation causes Bad Key error
+* :ghissue:`10410`: eventplot alters data in some cases
diff --git a/doc/users/prev_whats_new/github_stats_3.1.3.rst b/doc/users/prev_whats_new/github_stats_3.1.3.rst
new file mode 100644
index 000000000000..b4706569df02
--- /dev/null
+++ b/doc/users/prev_whats_new/github_stats_3.1.3.rst
@@ -0,0 +1,87 @@
+.. _github-stats-3-1-3:
+
+GitHub statistics for 3.1.3 (Feb 03, 2020)
+==========================================
+
+GitHub statistics for 2019/11/05 (tag: v3.1.2) - 2020/02/03
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 7 issues and merged 45 pull requests.
+The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/50?closed=1>`__
+
+The following 13 authors contributed 125 commits.
+
+* Antony Lee
+* David Stansby
+* Elliott Sales de Andrade
+* hannah
+* Jody Klymak
+* MeeseeksMachine
+* Nelle Varoquaux
+* Nikita Kniazev
+* Paul Ivanov
+* SamSchott
+* Steven G. Johnson
+* Thomas A Caswell
+* Tim Hoffmann
+
+GitHub issues and pull requests:
+
+Pull Requests (45):
+
+* :ghpull:`16382`: Backport PR #16379 on branch v3.1.x (FIX: catch on message content, not module)
+* :ghpull:`16362`: Backport PR #16347: FIX: catch warnings from pandas in cbook._check_1d
+* :ghpull:`16356`: Backport PR #16330 on branch v3.1.x (Clearer signal handling)
+* :ghpull:`16330`: Clearer signal handling
+* :ghpull:`16348`: Backport PR #16255 on branch v3.1.x (Move version info to sidebar)
+* :ghpull:`16345`: Backport PR #16298 on branch v3.1.x (Don't recursively call draw_idle when updating artists at draw time.)
+* :ghpull:`16298`: Don't recursively call draw_idle when updating artists at draw time.
+* :ghpull:`16322`: Backport PR #16250: Fix zerolen intersect
+* :ghpull:`16320`: Backport PR #16311 on branch v3.1.x (don't override non-Python signal handlers)
+* :ghpull:`16311`: don't override non-Python signal handlers
+* :ghpull:`16250`: Fix zerolen intersect
+* :ghpull:`16237`: Backport PR #16235 on branch v3.1.x (FIX: AttributeError in TimerBase.start)
+* :ghpull:`16235`: FIX: AttributeError in TimerBase.start
+* :ghpull:`16208`: Backport PR #15556 on branch v3.1.x (Fix test suite compat with ghostscript 9.50.)
+* :ghpull:`16213`: Backport PR #15763 on branch v3.1.x (Skip webagg test if tornado is not available.)
+* :ghpull:`16167`: Backport PR #16166 on branch v3.1.x (Add badge for citing 3.1.2)
+* :ghpull:`16166`: Add badge for citing 3.1.2
+* :ghpull:`16144`: Backport PR #16053 on branch v3.1.x (Fix v_interval setter)
+* :ghpull:`16053`: Fix v_interval setter
+* :ghpull:`16136`: Backport PR #16112 on branch v3.1.x (CI: Fail when failed to install dependencies)
+* :ghpull:`16131`: Backport PR #16126 on branch v3.1.x (TST: test_fork: Missing join)
+* :ghpull:`16126`: TST: test_fork: Missing join
+* :ghpull:`16091`: Backport PR #16086 on branch v3.1.x (FIX: use supported attribute to check pillow version)
+* :ghpull:`16040`: Backport PR #16031 on branch v3.1.x (Fix docstring of hillshade().)
+* :ghpull:`16032`: Backport PR #16028 on branch v3.1.x (Prevent FigureCanvasQT_draw_idle recursively calling itself.)
+* :ghpull:`16028`: Prevent FigureCanvasQT_draw_idle recursively calling itself.
+* :ghpull:`16020`: Backport PR #16007 on branch v3.1.x (Fix search on nested pages)
+* :ghpull:`16018`: Backport PR #15735 on branch v3.1.x (Cleanup some mplot3d docstrings.)
+* :ghpull:`16007`: Fix search on nested pages
+* :ghpull:`15957`: Backport PR #15953 on branch v3.1.x (Update donation link)
+* :ghpull:`15763`: Skip webagg test if tornado is not available.
+* :ghpull:`15881`: Backport PR #15859 on branch v3.1.x (Doc: Move search field into nav bar)
+* :ghpull:`15863`: Backport PR #15244 on branch v3.1.x: Change documentation format of rcParams defaults
+* :ghpull:`15859`: Doc: Move search field into nav bar
+* :ghpull:`15860`: Backport PR #15851 on branch v3.1.x (ffmpeg is available on default ubuntu packages now)
+* :ghpull:`15851`: ffmpeg is available on default ubuntu packages now.
+* :ghpull:`15843`: Backport PR #15737 on branch v3.1.x (Fix env override in WebAgg backend test.)
+* :ghpull:`15760`: Backport PR #15752 on branch v3.1.x (Update boxplot/violinplot faq.)
+* :ghpull:`15757`: Backport PR #15751 on branch v3.1.x (Modernize FAQ entry for plt.show().)
+* :ghpull:`15735`: Cleanup some mplot3d docstrings.
+* :ghpull:`15753`: Backport PR #15661 on branch v3.1.x (Document scope of 3D scatter depthshading.)
+* :ghpull:`15741`: Backport PR #15729 on branch v3.1.x (Catch correct parse errror type for dateutil >= 2.8.1)
+* :ghpull:`15729`: Catch correct parse errror type for dateutil >= 2.8.1
+* :ghpull:`15737`: Fix env override in WebAgg backend test.
+* :ghpull:`15244`: Change documentation format of rcParams defaults
+
+Issues (7):
+
+* :ghissue:`16294`: BUG: Interactive mode slow
+* :ghissue:`15842`: Path.intersects_path returns True when it shouldn't
+* :ghissue:`16163`: libpng error: Read Error when using matplotlib after setting usetex=True
+* :ghissue:`15960`: v3.1.2 - test suite "frozen" after it finishes
+* :ghissue:`16083`: Pillow 7.0.0 Support
+* :ghissue:`15481`: Recursion error
+* :ghissue:`15717`: Move search field into nav bar
diff --git a/doc/users/prev_whats_new/github_stats_3.2.0.rst b/doc/users/prev_whats_new/github_stats_3.2.0.rst
index f5cee3ad245c..5fd75f7c57d0 100644
--- a/doc/users/prev_whats_new/github_stats_3.2.0.rst
+++ b/doc/users/prev_whats_new/github_stats_3.2.0.rst
@@ -1,9 +1,9 @@
 .. _github-stats-3-2-0:
 
-GitHub Stats for Matplotlib 3.2.0
-=================================
+GitHub statistics for 3.2.0 (Mar 04, 2020)
+==========================================
 
-GitHub stats for 2019/05/18 - 2020/03/03 (tag: v3.1.0)
+GitHub statistics for 2019/05/18 (tag: v3.1.0) - 2020/03/04
 
 These lists are automatically generated, and may be incomplete or contain duplicates.
 
diff --git a/doc/users/prev_whats_new/github_stats_3.2.1.rst b/doc/users/prev_whats_new/github_stats_3.2.1.rst
index ec95cf4a7887..4f865dbb5429 100644
--- a/doc/users/prev_whats_new/github_stats_3.2.1.rst
+++ b/doc/users/prev_whats_new/github_stats_3.2.1.rst
@@ -1,9 +1,9 @@
 .. _github-stats-3-2-1:
 
-GitHub Stats for Matplotlib 3.2.1
-=================================
+GitHub statistics for 3.2.1 (Mar 18, 2020)
+==========================================
 
-GitHub stats for 2020/03/03 - 2020/03/17 (tag: v3.2.0)
+GitHub statistics for 2020/03/03 (tag: v3.2.0) - 2020/03/18
 
 These lists are automatically generated, and may be incomplete or contain duplicates.
 
diff --git a/doc/users/prev_whats_new/github_stats_3.2.2.rst b/doc/users/prev_whats_new/github_stats_3.2.2.rst
index 8cd4e4eef1d7..9026d518ce4d 100644
--- a/doc/users/prev_whats_new/github_stats_3.2.2.rst
+++ b/doc/users/prev_whats_new/github_stats_3.2.2.rst
@@ -1,9 +1,9 @@
 .. _github-stats-3-2-2:
 
-GitHub Stats for Matplotlib 3.2.2
-=================================
+GitHub statistics for 3.2.2 (Jun 17, 2020)
+==========================================
 
-GitHub stats for 2020/03/18 - 2020/06/17 (tag: v3.2.1)
+GitHub statistics for 2020/03/18 (tag: v3.2.1) - 2020/06/17
 
 These lists are automatically generated, and may be incomplete or contain duplicates.
 
diff --git a/doc/users/prev_whats_new/github_stats_3.3.0.rst b/doc/users/prev_whats_new/github_stats_3.3.0.rst
index c57d4cda8cba..c2e6cd132c2d 100644
--- a/doc/users/prev_whats_new/github_stats_3.3.0.rst
+++ b/doc/users/prev_whats_new/github_stats_3.3.0.rst
@@ -1,9 +1,9 @@
 .. _github-stats-3-3-0:
 
-GitHub Stats for Matplotlib 3.3.0
-=================================
+GitHub statistics for 3.3.0 (Jul 16, 2020)
+==========================================
 
-GitHub stats for 2020/03/03 - 2020/07/16 (tag: v3.2.0)
+GitHub statistics for 2020/03/03 (tag: v3.2.0) - 2020/07/16
 
 These lists are automatically generated, and may be incomplete or contain duplicates.
 
diff --git a/doc/users/prev_whats_new/github_stats_3.3.1.rst b/doc/users/prev_whats_new/github_stats_3.3.1.rst
index ed6638638959..49212587a17a 100644
--- a/doc/users/prev_whats_new/github_stats_3.3.1.rst
+++ b/doc/users/prev_whats_new/github_stats_3.3.1.rst
@@ -1,9 +1,9 @@
 .. _github-stats-3-3-1:
 
-GitHub Stats for Matplotlib 3.3.1
-=================================
+GitHub statistics for 3.3.1 (Aug 13, 2020)
+==========================================
 
-GitHub stats for 2020/07/16 - 2020/08/13 (tag: v3.3.0)
+GitHub statistics for 2020/07/16 (tag: v3.3.0) - 2020/08/13
 
 These lists are automatically generated, and may be incomplete or contain duplicates.
 
diff --git a/doc/users/prev_whats_new/github_stats_3.3.2.rst b/doc/users/prev_whats_new/github_stats_3.3.2.rst
index 8f9bb9a6eceb..0bc03cbc83ee 100644
--- a/doc/users/prev_whats_new/github_stats_3.3.2.rst
+++ b/doc/users/prev_whats_new/github_stats_3.3.2.rst
@@ -1,9 +1,9 @@
 .. _github-stats-3-3-2:
 
-GitHub Stats for Matplotlib 3.3.2
-=================================
+GitHub statistics for 3.3.2 (Sep 15, 2020)
+==========================================
 
-GitHub stats for 2020/08/14 - 2020/09/15 (tag: v3.3.1)
+GitHub statistics for 2020/08/14 - 2020/09/15 (tag: v3.3.1)
 
 These lists are automatically generated, and may be incomplete or contain duplicates.
 
diff --git a/doc/users/prev_whats_new/github_stats_3.3.3.rst b/doc/users/prev_whats_new/github_stats_3.3.3.rst
index d7ba592d7339..5475a5209eed 100644
--- a/doc/users/prev_whats_new/github_stats_3.3.3.rst
+++ b/doc/users/prev_whats_new/github_stats_3.3.3.rst
@@ -1,9 +1,9 @@
 .. _github-stats-3-3-3:
 
-GitHub Stats for Matplotlib 3.3.3
-=================================
+GitHub statistics for 3.3.3 (Nov 11, 2020)
+==========================================
 
-GitHub stats for 2020/09/15 - 2020/11/11 (tag: v3.3.2)
+GitHub statistics for 2020/09/15 (tag: v3.3.2) - 2020/11/11
 
 These lists are automatically generated, and may be incomplete or contain duplicates.
 
diff --git a/doc/users/prev_whats_new/github_stats_3.3.4.rst b/doc/users/prev_whats_new/github_stats_3.3.4.rst
index e61309836034..afff8b384b8e 100644
--- a/doc/users/prev_whats_new/github_stats_3.3.4.rst
+++ b/doc/users/prev_whats_new/github_stats_3.3.4.rst
@@ -1,9 +1,9 @@
 .. _github-stats-3-3-4:
 
-GitHub Stats for Matplotlib 3.3.4
-=================================
+GitHub statistics for 3.3.4 (Jan 28, 2021)
+==========================================
 
-GitHub stats for 2020/11/12 - 2021/01/28 (tag: v3.3.3)
+GitHub statistics for 2020/11/12 (tag: v3.3.3) - 2021/01/28
 
 These lists are automatically generated, and may be incomplete or contain duplicates.
 
diff --git a/doc/users/prev_whats_new/github_stats_3.4.0.rst b/doc/users/prev_whats_new/github_stats_3.4.0.rst
new file mode 100644
index 000000000000..fe49e673a660
--- /dev/null
+++ b/doc/users/prev_whats_new/github_stats_3.4.0.rst
@@ -0,0 +1,1174 @@
+.. _github-stats-3-4-0:
+
+GitHub statistics for 3.4.0 (Mar 26, 2021)
+==========================================
+
+GitHub statistics for 2020/07/16 (tag: v3.3.0) - 2021/03/26
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 204 issues and merged 772 pull requests.
+The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/53?closed=1>`__
+
+The following 177 authors contributed 3852 commits.
+
+* A N U S H
+* Adam Brown
+* Aditya Malhotra
+* aflah02
+* Aitik Gupta
+* Alejandro García
+* Alex Henrie
+* Alexander Schlüter
+* Alexis de Almeida Coutinho
+* Andreas C Mueller
+* andrzejnovak
+* Antony Lee
+* Arthur Milchior
+* bakes
+* BAKEZQ
+* BaoGiang HoangVu
+* Ben Root
+* BH4
+* Bradley Dice
+* Braxton Lamey
+* Brian McFee
+* Bruno Beltran
+* Bryan Kok
+* Byron Boulton
+* Carsten Schelp
+* ceelo777
+* Charles
+* CharlesHe16
+* Christian Baumann
+* Contextualist
+* DangoMelon
+* Daniel
+* Daniel Ingram
+* David Meyer
+* David Stansby
+* David Young
+* deep-jkl
+* Diego Leal
+* Dr. Thomas A Caswell
+* Dylan Cutler
+* Eben Pendleton
+* EBenkler
+* ebenp
+* ecotner
+* Elliott Sales de Andrade
+* Emily FY
+* Eric Firing
+* Eric Larson
+* Eric Prestat
+* Erik Benkler
+* Evan Berkowitz
+* Ewan Sutherland
+* Federico Ariza
+* Forrest
+* Frank Sauerburger
+* FrankTheCodeMonkey
+* Greg Lucas
+* hannah
+* Harry Knight
+* Harsh Sharma
+* Hassan Kibirige
+* Hugo van Kemenade
+* Iain-S
+* Ian Hunt-Isaak
+* Ian Thomas
+* ianhi
+* Ilya V. Schurov
+* ImportanceOfBeingErnest
+* Isuru Fernando
+* ItsRLuo
+* J. Scott Berg
+* Jae-Joon Lee
+* Jakub Klus
+* Janakarajan Natarajan
+* Jann Paul Mattern
+* jbhopkins
+* jeetvora331
+* Jerome F. Villegas
+* Jerome Villegas
+* jfbu
+* Jirka Hladky
+* Jody Klymak
+* Johan von Forstner
+* johan12345
+* john imperial
+* John Losito
+* John Peloquin
+* johnthagen
+* Jouni K. Seppänen
+* Kate Perkins
+* kate-perkins
+* katrielester
+* kolibril13
+* kwgchi
+* Lee Johnston
+* Leo Singer
+* linchiwei123
+* Lucy Liu
+* luz paz
+* luzpaz
+* Léonard Gérard
+* majorwitty
+* mansoor96g
+* Maria Ilie
+* Maria-Alexandra Ilie
+* Marianne Corvellec
+* Mark Harfouche
+* Martin Spacek
+* Mary Chris Go
+* Matthew Petroff
+* Matthias Bussonnier
+* Matthias Geier
+* Max Chen
+* McToel
+* Michael Grupp
+* Michaël Defferrard
+* Mihai Anton
+* Mohammad Aflah Khan
+* Neilzon Viloria
+* neok-m4700
+* Nora Moseman
+* Pamela Wu
+* pankajchetry1168
+* Petar Mlinarić
+* Peter Williams
+* Phil Nagel
+* philip-sparks
+* Philipp Arras
+* Philipp Nagel
+* Pratyush Raj
+* Péter Leéh
+* rajpratyush
+* Randall Ung
+* reshamas
+* Rezangyal
+* Richard Sheridan
+* richardsheridan
+* Rob McDonald
+* Rohit Rawat
+* Ruben Verweij
+* Ruth Comer
+* Ryan May
+* Sam Tygier
+* shawnchen
+* shawnchen1996
+* ShawnChen1996
+* Sidharth Bansal
+* Srihitha Maryada
+* Stephen Sinclair
+* Struan Murray
+* Theodor Athanasiadis
+* Thomas A Caswell
+* Thorvald Johannessen
+* Tim Gates
+* Tim Hoffmann
+* Tobias Hangleiter
+* tohc1
+* Tom Charrett
+* Tom Neep
+* Tomas Fiers
+* ulijh
+* Ulrich J. Herter
+* Utkarshp1
+* Uwe F. Mayer
+* Valentin Valls
+* Vincent Cuenca
+* Vineyard
+* Vlas Sokolov
+* Xianxiang Li
+* xlilos
+* Ye Chang
+* Yichao Yu
+* yozhikoff
+* Yun Liu
+* z0rgy
+* zitorelova
+
+GitHub issues and pull requests:
+
+Pull Requests (772):
+
+* :ghpull:`19775`: Fix deprecation for imread on URLs.
+* :ghpull:`19772`: Backport PR #19535 on branch v3.4.x (Fix example's BasicUnit array conversion.)
+* :ghpull:`19771`: Backport PR #19757 on branch v3.4.x (Fixed python -mpip typo)
+* :ghpull:`19770`: Backport PR #19739 on branch v3.4.x (Changed 'python -mpip' to 'python -m pip' for consistency)
+* :ghpull:`19535`: Fix example's BasicUnit array conversion.
+* :ghpull:`19767`: Backport PR #19766 on branch v3.4.x (Set colormap modification removal to 3.6.)
+* :ghpull:`19766`: Set colormap modification removal to 3.6.
+* :ghpull:`19764`: Backport PR #19762 on branch v3.4.x (FIX: do not report that webagg supports blitting)
+* :ghpull:`19762`: FIX: do not report that webagg supports blitting
+* :ghpull:`19689`: Prepare API docs for v3.4.0
+* :ghpull:`19761`: Backport PR #19746 on branch v3.4.x (Fix resizing in nbAgg.)
+* :ghpull:`19746`: Fix resizing in nbAgg.
+* :ghpull:`19757`: Fixed python -mpip typo
+* :ghpull:`19739`: Changed 'python -mpip' to 'python -m pip' for consistency
+* :ghpull:`19713`: DOC: Prepare What's new page for 3.4.0.
+* :ghpull:`19742`: Backport PR #19741 on branch v3.4.x (Only override pickradius when picker is not a bool.)
+* :ghpull:`19741`: Only override pickradius when picker is not a bool.
+* :ghpull:`19726`: Backport PR #19505 on branch v3.4.x (Move some advanced documentation away from Installation Guide)
+* :ghpull:`19505`: Move some advanced documentation away from Installation Guide
+* :ghpull:`19712`: Backport PR #19707 on branch v3.4.x (DOC: fix dx in Arrow guide)
+* :ghpull:`19711`: Backport PR #19709 on branch v3.4.x (Fix arrow_guide.py typo)
+* :ghpull:`19709`: Fix arrow_guide.py typo
+* :ghpull:`19707`: DOC: fix dx in Arrow guide
+* :ghpull:`19699`: Backport PR #19695 on branch v3.4.x (DOC: Increase size of headings)
+* :ghpull:`19695`: DOC: Increase size of headings
+* :ghpull:`19697`: Backport PR #19690 on branch v3.4.x (Only warn about existing redirects if content differs.)
+* :ghpull:`19690`: Only warn about existing redirects if content differs.
+* :ghpull:`19696`: Backport PR #19665 on branch v3.4.x (Changed FormatStrFormatter documentation to include how to get unicode minus)
+* :ghpull:`19680`: Backport PR #19402 on branch v3.4.x (Build aarch64 wheels)
+* :ghpull:`19678`: Backport PR #19671 on branch v3.4.x (Fix crash in early window raise in gtk3.)
+* :ghpull:`19671`: Fix crash in early window raise in gtk3.
+* :ghpull:`19665`: Changed FormatStrFormatter documentation to include how to get unicode minus
+* :ghpull:`19402`: Build aarch64 wheels
+* :ghpull:`19669`: Backport PR #19661 on branch v3.4.x (Fix CoC link)
+* :ghpull:`19668`: Backport PR #19663 on branch v3.4.x (ENH: add a copy method to colormaps)
+* :ghpull:`19663`: ENH: add a copy method to colormaps
+* :ghpull:`19661`: Fix CoC link
+* :ghpull:`19652`: Backport PR #19649 on branch v3.4.x (Use globals() instead of locals() for adding colormaps as names to cm module)
+* :ghpull:`19649`: Use globals() instead of locals() for adding colormaps as names to cm module
+* :ghpull:`19651`: Backport PR #19618 on branch v3.4.x (FIX: make the cache in font_manager._get_font keyed by thread id)
+* :ghpull:`19650`: Backport PR #19625 on branch v3.4.x (Restore _AxesStack to track a Figure's Axes order.)
+* :ghpull:`19647`: Backport PR #19645 on branch v3.4.x (Fix comment in RectangleSelector)
+* :ghpull:`19618`: FIX: make the cache in font_manager._get_font keyed by thread id
+* :ghpull:`19648`: Backport PR #19643 on branch v3.4.x (Don't turn check_for_pgf into public API.)
+* :ghpull:`19625`: Restore _AxesStack to track a Figure's Axes order.
+* :ghpull:`19643`: Don't turn check_for_pgf into public API.
+* :ghpull:`19645`: Fix comment in RectangleSelector
+* :ghpull:`19644`: Backport PR #19611 on branch v3.4.x (Fix double picks.)
+* :ghpull:`19611`: Fix double picks.
+* :ghpull:`19640`: Backport PR #19639 on branch v3.4.x (FIX: do not allow single element list of str in subplot_mosaic)
+* :ghpull:`19639`: FIX: do not allow single element list of str in subplot_mosaic
+* :ghpull:`19638`: Backport PR #19632 on branch v3.4.x (Fix handling of warn keyword in Figure.show.)
+* :ghpull:`19637`: Backport PR #19582 on branch v3.4.x (Add kerning to single-byte strings in PDFs)
+* :ghpull:`19632`: Fix handling of warn keyword in Figure.show.
+* :ghpull:`19582`: Add kerning to single-byte strings in PDFs
+* :ghpull:`19629`: Backport PR #19548 on branch v3.4.x (Increase tolerances for other arches.)
+* :ghpull:`19630`: Backport PR #19596 on branch v3.4.x (Fix for issue 17769: wx interactive figure close cause crash)
+* :ghpull:`19596`: Fix for issue 17769: wx interactive figure close cause crash
+* :ghpull:`19548`: Increase tolerances for other arches.
+* :ghpull:`19616`: Backport PR #19577 on branch v3.4.x (Fix "return"->"enter" mapping in key names.)
+* :ghpull:`19617`: Backport PR #19571 on branch v3.4.x (Fail early when setting Text color to a non-colorlike.)
+* :ghpull:`19615`: Backport PR #19583 on branch v3.4.x (FIX: check for a set during color conversion)
+* :ghpull:`19614`: Backport PR #19597 on branch v3.4.x (Fix IPython import issue)
+* :ghpull:`19613`: Backport PR #19546 on branch v3.4.x (Move unrendered README.wx to thirdpartypackages/index.rst.)
+* :ghpull:`19583`: FIX: check for a set during color conversion
+* :ghpull:`19597`: Fix IPython import issue
+* :ghpull:`19571`: Fail early when setting Text color to a non-colorlike.
+* :ghpull:`19595`: Backport PR #19589 on branch v3.4.x (Changes linestyle parameter of flierprops)
+* :ghpull:`19577`: Fix "return"->"enter" mapping in key names.
+* :ghpull:`19589`: Changes linestyle parameter of flierprops
+* :ghpull:`19592`: Backport PR #19587 on branch v3.4.x (DOC: fix plot_date doc)
+* :ghpull:`19587`: DOC: fix plot_date doc
+* :ghpull:`19580`: Backport PR #19456 on branch v3.4.x (Doc implement reredirects)
+* :ghpull:`19579`: Backport PR #19567 on branch v3.4.x (DOC: fix typos)
+* :ghpull:`19456`: Doc implement reredirects
+* :ghpull:`19567`: DOC: fix typos
+* :ghpull:`19542`: Backport PR #19532 on branch v3.4.x (Add note on interaction between text wrapping and bbox_inches='tight')
+* :ghpull:`19549`: Backport PR #19545 on branch v3.4.x (Replace references to pygtk by pygobject in docs.)
+* :ghpull:`19546`: Move unrendered README.wx to thirdpartypackages/index.rst.
+* :ghpull:`19545`: Replace references to pygtk by pygobject in docs.
+* :ghpull:`19532`: Add note on interaction between text wrapping and bbox_inches='tight'
+* :ghpull:`19541`: MAINT: fix typo from #19438
+* :ghpull:`19480`: Fix CallbackRegistry memory leak
+* :ghpull:`19539`: In scatter, fix single rgb edgecolors handling
+* :ghpull:`19438`: FIX: restore creating new axes via plt.subplot with different kwargs
+* :ghpull:`18436`: Sync 3D errorbar with 2D
+* :ghpull:`19472`: Fix default label visibility for top-or-left-labeled shared subplots().
+* :ghpull:`19496`: MNT: Restore auto-adding Axes3D to their parent figure on init
+* :ghpull:`19533`: Clarify the animated property and reword blitting tutorial a bit
+* :ghpull:`19146`: Fix #19128: webagg reports incorrect values for non-alphanumeric key events on non-qwerty keyboards
+* :ghpull:`18068`: Add note on writing binary formats to stdout using savefig()
+* :ghpull:`19507`: FIX: ensure we import when the user cwd does not exist
+* :ghpull:`19413`: FIX: allow add option for Axes3D(fig)
+* :ghpull:`19498`: Dedupe implementations of {XAxis,YAxis}._get_tick_boxes_siblings.
+* :ghpull:`19502`: Prefer projection="polar" over polar=True.
+* :ghpull:`18480`: Clarify color priorities in collections
+* :ghpull:`19501`: Fix text position with usetex and xcolor
+* :ghpull:`19460`: Implement angles for bracket arrow styles.
+* :ghpull:`18408`: FIX/API: ``fig.canvas.draw`` always updates internal state
+* :ghpull:`19504`: Remove remaining references to Travis CI
+* :ghpull:`13358`: 3D margins consistency  for mplot3d (isometric projection)
+* :ghpull:`19529`: Simplify checking for tex packages.
+* :ghpull:`19516`: Ignore files from annotate coverage reports
+* :ghpull:`19500`: Remove workaround for numpy<1.16, and update version check.
+* :ghpull:`19518`: Skip setting up a tmpdir in tests that don't need one.
+* :ghpull:`19514`: DOC: add fixed-aspect colorbar examples
+* :ghpull:`19511`: Clarify axes.autolimit_mode rcParam.
+* :ghpull:`19503`: Fix tight_layout() on "canvasless" figures.
+* :ghpull:`19410`: Set the GTK background color to white.
+* :ghpull:`19497`: Add overset/underset whatsnew entry
+* :ghpull:`19490`: Fix error message in plt.close().
+* :ghpull:`19461`: Move ToolManager warnings to rcParam validator
+* :ghpull:`19488`: Prefer ``tr1-tr2`` to ``tr1+tr2.inverted()``.
+* :ghpull:`19485`: fix regression of axline behavior with non-linear scales
+* :ghpull:`19314`: Fix over/under mathtext symbols
+* :ghpull:`19468`: Include tex output in pdf LatexError.
+* :ghpull:`19478`: Fix trivial typo in error message.
+* :ghpull:`19449`: Switch array-like (M, N) to (M, N) array-like.
+* :ghpull:`19459`: Merge v3.3.4 into master
+* :ghpull:`18746`: Make figure parameter optional when constructing canvases.
+* :ghpull:`19455`: Add note that pyplot cannot be used for 3D.
+* :ghpull:`19457`: Use absolute link for discourse
+* :ghpull:`19440`: Slightly reorganize api docs.
+* :ghpull:`19344`: Improvements to Docs for new contributors
+* :ghpull:`19435`: Replace gtk3 deprecated APIs that have simple replacements.
+* :ghpull:`19452`: Fix the docstring of draw_markers to match the actual behavior.
+* :ghpull:`19448`: Remove unnecessary facecolor cache in Patch3D.
+* :ghpull:`19396`: CI: remove win prerelease azure + add py39
+* :ghpull:`19426`: Support empty stairs.
+* :ghpull:`19399`: Fix empty Poly3DCollections
+* :ghpull:`19416`: fixes TypeError constructor returned NULL in wayland session
+* :ghpull:`19439`: Move cheatsheet focus to the cheatsheets away
+* :ghpull:`19425`: Add units to bar_label padding documentation.
+* :ghpull:`19422`: Style fixes to triintepolate docs.
+* :ghpull:`19421`: Switch to documenting generic collections in lowercase.
+* :ghpull:`19411`: DOC: fix incorrect parameter names
+* :ghpull:`19387`: Fix CSS table header layout
+* :ghpull:`18683`: Better document font.<generic-family> rcParams entries.
+* :ghpull:`19418`: BF: DOCS: fix slash for windows in conf.py
+* :ghpull:`18544`: REORG: JoinStyle and CapStyle classes
+* :ghpull:`19415`: Make TaggedValue in basic_units a sequence
+* :ghpull:`19412`: DOC: correct off by one indentation.
+* :ghpull:`19407`: Improve doc of default labelpad.
+* :ghpull:`19373`: test for align_ylabel bug with constrained_layout
+* :ghpull:`19347`: os.environ-related cleanups.
+* :ghpull:`19319`: DOC: make canonical version stable
+* :ghpull:`19395`: wx: Use integers in more places
+* :ghpull:`17850`: MNT: set the facecolor of nofill markers
+* :ghpull:`19334`: Fix qt backend on mac big sur
+* :ghpull:`19394`: Don't allow pyzmq 22.0.0 on AppVeyor.
+* :ghpull:`19367`: Deprecate imread() reading from URLs
+* :ghpull:`19341`: MarkerStyle is considered immutable
+* :ghpull:`19337`: Move sphinx extension files into mpl-data.
+* :ghpull:`19389`: Temporarily switch intersphinx to latest pytest.
+* :ghpull:`19390`: Doc: Minor formatting
+* :ghpull:`19383`: Always include sample_data in installs.
+* :ghpull:`19378`: Modify indicate_inset default label value
+* :ghpull:`19357`: Shorten/make more consistent the half-filled marker definitions.
+* :ghpull:`18649`: Deprecate imread() reading from URLs
+* :ghpull:`19370`: Force classic ("auto") date converter in classic style.
+* :ghpull:`19364`: Fix trivial doc typos.
+* :ghpull:`19359`: Replace use of pyplot with OO api in some examples
+* :ghpull:`19342`: FIX: fix bbox_inches=tight and constrained layout bad interaction
+* :ghpull:`19350`: Describe how to test regular installations of Matplotlib
+* :ghpull:`19332`: Prefer concatenate to h/vstack in simple cases.
+* :ghpull:`19340`: Remove the deprecated rcParams["datapath"].
+* :ghpull:`19326`: Whitespace in Choosing Colormaps tutorial plots
+* :ghpull:`16417`: Deprecate rcParams["datapath"] in favor of mpl.get_data_path().
+* :ghpull:`19336`: Revert "Deprecate setting Line2D's pickradius via set_picker."
+* :ghpull:`19153`: MNT: Remove deprecated axes kwargs collision detection (version 2)
+* :ghpull:`19330`: Remove register storage class from Agg files.
+* :ghpull:`19324`: Improve FT2Font docstrings.
+* :ghpull:`19328`: Explain annotation behavior when used in conjunction with arrows
+* :ghpull:`19329`: Fix building against system qhull
+* :ghpull:`19331`: Skip an ImageMagick test if ffmpeg is unavailable.
+* :ghpull:`19333`: Fix PGF with special character paths.
+* :ghpull:`19322`: Improve docs of _path C-extension.
+* :ghpull:`19317`: Pin to oldest supported PyQt on minver CI instance.
+* :ghpull:`19315`: Update the markers part of matplotlib.pyplot.plot document (fix issue #19274)
+* :ghpull:`18978`: API: Remove deprecated axes kwargs collision detection
+* :ghpull:`19306`: Fix some packaging issues
+* :ghpull:`19291`: Cleanup code for format processing
+* :ghpull:`19316`: Simplify X11 checking for Qt.
+* :ghpull:`19287`: Speedup LinearSegmentedColormap.from_list.
+* :ghpull:`19293`: Fix some docstring interpolations
+* :ghpull:`19313`: Add missing possible return value to docs of get_verticalalignment()
+* :ghpull:`18916`: Add overset and underset support for mathtext
+* :ghpull:`18126`: FIX: Allow deepcopy on norms and scales
+* :ghpull:`19281`: Make all transforms copiable (and thus scales, too).
+* :ghpull:`19294`: Deprecate project argument to Line3DCollection.draw.
+* :ghpull:`19307`: DOC: remove stray assignment in "multiple legends" example
+* :ghpull:`19303`: Extended the convolution filter for correct dilation
+* :ghpull:`19261`: Add machinery for png-only, single-font mathtext tests.
+* :ghpull:`16571`: Update Qhull to 2019.1 reentrant version
+* :ghpull:`16720`: Download qhull at build-or-sdist time.
+* :ghpull:`18653`: ENH: Add func norm
+* :ghpull:`19272`: Strip irrelevant information from testing docs
+* :ghpull:`19298`: Fix misplaced colon in bug report template.
+* :ghpull:`19297`: Clarify return format of Line2D.get_data.
+* :ghpull:`19277`: Warn on redundant definition of plot properties
+* :ghpull:`19278`: Cleanup and document _plot_args()
+* :ghpull:`19282`: Remove the unused TransformNode._gid.
+* :ghpull:`19264`: Expand on slider_demo example
+* :ghpull:`19244`: Move cbook._check_isinstance() to _api.check_isinstance()
+* :ghpull:`19273`: Use proper pytest functionality for warnings and exceptions
+* :ghpull:`19262`: more robust check for enter key in TextBox
+* :ghpull:`19249`: Clarify Doc for Secondary axis, ad-hoc example
+* :ghpull:`19248`: Make return value of _get_patch_verts always an array.
+* :ghpull:`19247`: Fix markup for mplot3d example.
+* :ghpull:`19216`: Ignore non-draw codes when calculating path extent
+* :ghpull:`19215`: Collect information for setting up a development environment
+* :ghpull:`19210`: Fix creation of AGG images bigger than 1024**3 pixels
+* :ghpull:`18933`: Set clip path for PostScript texts.
+* :ghpull:`19162`: Deprecate cbook.warn_deprecated and move internal calls to _api.warn_deprecated
+* :ghpull:`16391`: Re-write sym-log-norm
+* :ghpull:`19240`: FIX: process lists for inverse norms
+* :ghpull:`18737`: Fix data cursor for images with additional transform
+* :ghpull:`18642`: Propagate minpos from Collections to Axes.datalim
+* :ghpull:`19242`: Update first occurrence of QT to show both 4 and 5
+* :ghpull:`19231`: Add reference section to all statistics examples
+* :ghpull:`19217`: Request an autoscale at the end of ax.pie()
+* :ghpull:`19176`: Deprecate additional positional args to plot_{surface,wireframe}.
+* :ghpull:`19063`: Give plot_directive output a ``max-width: 100%``
+* :ghpull:`19187`: Support callable for formatting of Sankey labels
+* :ghpull:`19220`: Remove one TOC level from the release guide
+* :ghpull:`19212`: MNT: try to put more whitespace in welcome message
+* :ghpull:`19155`: Consolidated the Install from Source docs
+* :ghpull:`19208`: added version ask/hint to issue templates, grammar on pr bot
+* :ghpull:`19185`: Document Triangulation.triangles
+* :ghpull:`19181`: Remove unused imports
+* :ghpull:`19207`: Fix Grouper example code
+* :ghpull:`19204`: Clarify Date Format Example
+* :ghpull:`19200`: Fix incorrect statement regarding test images cache size.
+* :ghpull:`19198`: Fix link in contrbuting docs
+* :ghpull:`19196`: Fix PR welcome action
+* :ghpull:`19188`: Cleanup comparision between X11/CSS4 and xkcd colors
+* :ghpull:`19194`: Fix trivial quiver doc typo.
+* :ghpull:`19180`: Fix Artist.remove_callback()
+* :ghpull:`19192`: Fixed part of Issue - #19100, changed documentation for axisartist
+* :ghpull:`19179`: Check that no new figures are created in image comparison tests
+* :ghpull:`19184`: Minor doc cleanup
+* :ghpull:`19093`: DOCS: Specifying Colors tutorial format & arrange
+* :ghpull:`17107`: Add Spines class as a container for all Axes spines
+* :ghpull:`18829`: Create a RangeSlider widget
+* :ghpull:`18873`: Getting Started GSoD
+* :ghpull:`19175`: Fix axes direction for a floating axisartist
+* :ghpull:`19130`: DOC: remove reference to 2.2.x branches from list of active branches
+* :ghpull:`15212`: Dedupe window-title setting by moving it to FigureManagerBase.
+* :ghpull:`19172`: Fix 3D surface example bug for non-square grid
+* :ghpull:`19173`: Ensure backend tests are skipped if unavailable
+* :ghpull:`19170`: Clarify meaning of facecolors for LineCollection
+* :ghpull:`18310`: Add 3D stem plot
+* :ghpull:`18127`: Implement lazy autoscaling in mplot3d.
+* :ghpull:`16178`: Add multiple label support for Axes.plot()
+* :ghpull:`19151`: Deprecate @cbook.deprecated and move internal calls to @_api.deprecated
+* :ghpull:`19088`: Ignore CLOSEPOLY vertices when computing dataLim from patches
+* :ghpull:`19166`: CI: add github action to post to first-time PRs openers
+* :ghpull:`19124`: GOV/DOC: add section to docs on triaging and triage team
+* :ghpull:`15602`: Add an auto-labeling helper function for bar charts
+* :ghpull:`19164`: docs: fix simple typo, backslahes -> backslashes
+* :ghpull:`19161`: Simplify test_backend_pdf::test_multipage_properfinalize.
+* :ghpull:`19141`: FIX: suppress offset text in ConciseDateFormatter when largest scale is in years
+* :ghpull:`19150`: Move from @cbook._classproperty to @_api.classproperty
+* :ghpull:`19144`: Move from cbook._warn_external() to _api.warn_external()
+* :ghpull:`19119`: Don't lose unit change handlers when pickling/unpickling.
+* :ghpull:`19145`: Move from cbook._deprecate_*() to _api.deprecate_*()
+* :ghpull:`19123`: Use Qt events to refresh pixel ratio.
+* :ghpull:`19056`: Support raw/rgba frame format in FFMpegFileWriter
+* :ghpull:`19140`: Fix the docstring of suptitle/subxlabel/supylabel.
+* :ghpull:`19132`: Normalize docstring interpolation label for kwdoc() property lists
+* :ghpull:`19134`: Switch internal API function calls from cbook to _api
+* :ghpull:`19138`: Added non-code contributions to incubator docs
+* :ghpull:`19125`: DOC: contributor incubator
+* :ghpull:`18948`: DOC: Fix latexpdf build
+* :ghpull:`18753`: Remove several more deprecations
+* :ghpull:`19083`: Fix headless tests on Wayland.
+* :ghpull:`19127`: Cleanups to webagg & friends.
+* :ghpull:`19122`: FIX/DOC - make Text doscstring interp more easily searchable
+* :ghpull:`19106`: Support setting rcParams["image.cmap"] to Colormap instances.
+* :ghpull:`19085`: FIX: update a transfrom from transFigure to transSubfigure
+* :ghpull:`19117`: Rename a confusing variable.
+* :ghpull:`18647`: Axes.axline: implement support transform argument (for points but not slope)
+* :ghpull:`16220`: Fix interaction with unpickled 3d plots.
+* :ghpull:`19059`: Support blitting in webagg backend
+* :ghpull:`19107`: Update pyplot.py
+* :ghpull:`19044`: Cleanup Animation frame_formats.
+* :ghpull:`19087`: FIX/TST: recursively remove ticks
+* :ghpull:`19094`: Suppress -Wunused-function about _import_array when compiling tkagg.cpp.
+* :ghpull:`19092`: Fix use transform mplot3d
+* :ghpull:`19097`: DOC: add FuncScale to set_x/yscale
+* :ghpull:`19089`: ENH: allow passing a scale instance to set_scale
+* :ghpull:`19086`: FIX: add a default scale to Normalize
+* :ghpull:`19073`: Mention in a few more places that artists default to not-pickable.
+* :ghpull:`19079`: Remove incorrect statement about ``hist(..., log=True)``.
+* :ghpull:`19076`: Small improvements to aitoff projection.
+* :ghpull:`19071`: DOC: Add 'blackman' to list of imshow interpolations
+* :ghpull:`17524`: ENH: add supxlabel and supylabel
+* :ghpull:`18840`: Add tutorial about autoscaling
+* :ghpull:`19042`: Simplify GridHelper invalidation.
+* :ghpull:`19048`: Remove _draw_{ticks2,label2}; skip extents computation in _update_ticks.
+* :ghpull:`18983`: Pass norm argument to spy
+* :ghpull:`18802`: Add code of conduct
+* :ghpull:`19060`: Fix broken link in Readme
+* :ghpull:`18569`: More generic value snapping for Slider widgets
+* :ghpull:`19055`: Fix kwargs handling in AnnotationBbox
+* :ghpull:`19041`: Reword docs for exception_handler in CallbackRegistry.
+* :ghpull:`19046`: Prepare inlining MovieWriter.cleanup() into MovieWriter.finish().
+* :ghpull:`19050`: Better validate tick direction.
+* :ghpull:`19038`: Fix markup in interactive figures doc.
+* :ghpull:`19035`: grid_helper_curvelinear cleanups.
+* :ghpull:`19022`: Update event handling docs.
+* :ghpull:`19025`: Remove individual doc entries for some methods Axes inherits from Artist
+* :ghpull:`19018`: Inline and optimize ContourLabeler.get_label_coords.
+* :ghpull:`19019`: Deprecate never used ``resize_callback`` param to FigureCanvasTk.
+* :ghpull:`19023`: Cleanup comments/docs in backend_macosx, backend_pdf.
+* :ghpull:`19020`: Replace mathtext assertions by unpacking.
+* :ghpull:`19024`: Dedupe docs of GridSpec.subplots.
+* :ghpull:`19013`: Improve docs of _get_packed_offsets, _get_aligned_offsets.
+* :ghpull:`19009`: Compactify the implementation of ContourLabeler.add_label_near.
+* :ghpull:`19008`: Deprecate event processing wrapper methods on FigureManagerBase.
+* :ghpull:`19015`: Better document multilinebaseline (and other small TextArea fixes)
+* :ghpull:`19012`: Common ``__init__`` for VPacker and HPacker.
+* :ghpull:`19014`: Support normalize_kwargs(None) (== {}).
+* :ghpull:`19010`: Inline _print_pdf_to_fh, _print_png_to_fh.
+* :ghpull:`19003`: Remove reference to unicode-math in pgf preamble.
+* :ghpull:`18847`: Cleanup interactive pan/zoom.
+* :ghpull:`18868`: Expire _make_keyword_only deprecations from 3.2
+* :ghpull:`18903`: Move cbook._suppress_matplotlib_deprecation_warning() from cbook to _api
+* :ghpull:`18997`: Micro-optimize check_isinstance.
+* :ghpull:`18995`: Fix the doc of GraphicsContextBase.set_clip_rectangle.
+* :ghpull:`18996`: Fix API change message from #18989
+* :ghpull:`18993`: Don't access private renderer attributes in tkagg blit.
+* :ghpull:`18980`: DOC: fix typos
+* :ghpull:`18989`: The Artist property rasterized cannot be None anymore
+* :ghpull:`18987`: Fix punctuation in doc.
+* :ghpull:`18894`: Use selectfont instead of findfont + scalefont + setfont in PostScript.
+* :ghpull:`18990`: Minor cleanup of categorical example
+* :ghpull:`18947`: Strictly increasing check with test coverage for streamplot grid
+* :ghpull:`18981`: Cleanup Firefox SVG example.
+* :ghpull:`18969`: Improve documentation on rasterization
+* :ghpull:`18876`: Support fully-fractional HiDPI added in Qt 5.14.
+* :ghpull:`18976`: Simplify contour_label_demo.
+* :ghpull:`18975`: Fix typing error in pyplot's docs
+* :ghpull:`18956`: Document rasterized parameter in pcolormesh() explicitly
+* :ghpull:`18968`: Fix clabel() for backends without canvas.get_renderer()
+* :ghpull:`18949`: Deprecate AxisArtist.ZORDER
+* :ghpull:`18830`: Pgf plotting
+* :ghpull:`18967`: Remove unnecessary calls to lower().
+* :ghpull:`18910`: Remove Artist.eventson and Container.eventson
+* :ghpull:`18964`: Remove special-casing for PostScript dpi in pyplot.py.
+* :ghpull:`18961`: Replace sphinx-gallery-specific references by standard :doc: refs.
+* :ghpull:`18955`: added needs_ghostscript; skip test
+* :ghpull:`18857`: Improve hat graph example
+* :ghpull:`18943`: Small cleanup to StepPatch._update_path.
+* :ghpull:`18937`: Cleanup stem docs and simplify implementation.
+* :ghpull:`18895`: Introduce variable since which mpl version the minimal python version
+* :ghpull:`18927`: Improve warning message for missing font family specified via alias.
+* :ghpull:`18930`: Document limitations of Path.contains_point() and clarify its semantics
+* :ghpull:`18892`: Fixes MIME type for svg frame_format in HTMLWriter.
+* :ghpull:`18938`: Edit usetex docs.
+* :ghpull:`18923`: Use lambdas to prevent gc'ing and deduplication of widget callbacks.
+* :ghpull:`16171`: Contour fixes/improvements
+* :ghpull:`18901`: Simplify repeat_delay and fix support for it when using iterable frames.
+* :ghpull:`18911`: Added Aria-Labels to all inputs with tooltips for generated HTML animations: issue #17910
+* :ghpull:`18912`: Use CallbackRegistry for {Artist,Collection}.add_callback.
+* :ghpull:`18919`: DOCS: fix contourf hatch demo legend
+* :ghpull:`18905`: Make docs fail on Warning (and fix all existing warnings)
+* :ghpull:`18763`: Single-line string notation for subplot_mosaic
+* :ghpull:`18902`: Move ImageMagick version exclusion to _get_executable_info.
+* :ghpull:`18915`: Remove hard-coded API removal version mapping.
+* :ghpull:`18914`: Fix typo in error message: interable -> iterable.
+* :ghpull:`15065`: step-between as drawstyle [Alternative approach to #15019]
+* :ghpull:`18532`: Consistent behavior of draw_if_interactive across interactive backends.
+* :ghpull:`18908`: Rework interactive backends tests.
+* :ghpull:`18817`: MAINT: deprecate validCap, validJoin
+* :ghpull:`18907`: Unmark wx-threading-test-failure as strict xfail.
+* :ghpull:`18896`: Add note on keeping a reference to animation docstrings
+* :ghpull:`18862`: Resolve mathtext.fontset at FontProperties creation time.
+* :ghpull:`18877`: Remove fallback to nonexistent setDevicePixelRatioF.
+* :ghpull:`18823`: Move from @cbook.deprecated to @_api.deprecated
+* :ghpull:`18889`: Switch Tk to using PNG files for buttons
+* :ghpull:`18888`: Update version of Matplotlib that needs Python 3.7
+* :ghpull:`18867`: Remove "Demo" from example titles (part 2)
+* :ghpull:`18863`: Reword FontProperties docstring.
+* :ghpull:`18866`: Fix RGBAxes docs markup.
+* :ghpull:`18874`: Slightly compress down the pgf tests.
+* :ghpull:`18565`: Make Tkagg blit thread safe
+* :ghpull:`18858`: Remove "Demo" from example titles
+* :ghpull:`15177`: Bind WX_CHAR_HOOK instead of WX_KEY_DOWN for wx key_press_event.
+* :ghpull:`18821`: Simplification of animated histogram example
+* :ghpull:`18844`: Fix sphinx formatting issues
+* :ghpull:`18834`: Add cross-references to Artist tutorial
+* :ghpull:`18827`: Update Qt version in event handling docs.
+* :ghpull:`18825`: Warn in pgf backend when unknown font is requested.
+* :ghpull:`18822`: Remove deprecate
+* :ghpull:`18733`: Time series histogram plot example
+* :ghpull:`18812`: Change LogFormatter coeff computation
+* :ghpull:`18820`: Fix axes -> Axes changes in figure.py
+* :ghpull:`18657`: Move cbook.deprecation to _api.deprecation
+* :ghpull:`18818`: Clarify behavior of CallbackRegistry.disconnect with nonexistent cids.
+* :ghpull:`18811`: DOC Use 'Axes' instead of 'axes' in figure.py
+* :ghpull:`18814`: [Example] update Anscombe's Quartet
+* :ghpull:`18806`: DOC Use 'Axes' in _axes.py docstrings
+* :ghpull:`18799`: Remove unused wx private attribute.
+* :ghpull:`18772`: BF: text not drawn shouldn't count for tightbbox
+* :ghpull:`18793`: Consistently use axs to refer to a set of Axes (v2)
+* :ghpull:`18792`: Cmap cleanup
+* :ghpull:`18798`: Deprecate ps.useafm for mathtext
+* :ghpull:`18302`: Remove 3D attributes from renderer
+* :ghpull:`18795`: Make inset indicator more visible in the example
+* :ghpull:`18781`: Update description of web application server example.
+* :ghpull:`18791`: Fix documentation of edgecolors precedence for scatter()
+* :ghpull:`14645`: Add a helper to copy a colormap and set its extreme colors.
+* :ghpull:`17709`: Enh: SymNorm for normalizing symmetrical data around a center
+* :ghpull:`18780`: CI: pydocstyle>=5.1.0, flake8-docstrings>=1.4.0 verified to work
+* :ghpull:`18200`: Unpin pydocstyle
+* :ghpull:`18767`: Turn "How to use Matplotlib in a web application server" into a sphinx-gallery example
+* :ghpull:`18765`: Remove some unused tick private attributes.
+* :ghpull:`18688`: Shorter property deprecation.
+* :ghpull:`18748`: Allow dependabot to check GitHub actions daily
+* :ghpull:`18529`: Synchronize view limits of shared axes after setting ticks
+* :ghpull:`18575`: Colorbar grid position
+* :ghpull:`18744`: DOCS: document log locator's ``numticks``
+* :ghpull:`18687`: Deprecate GraphicsContextPS.
+* :ghpull:`18706`: Consistently use 3D, 2D, 1D for dimensionality
+* :ghpull:`18702`: _make_norm_from_scale fixes.
+* :ghpull:`18558`: Support usetex in date Formatters
+* :ghpull:`18493`: MEP22 toolmanager set axes navigate_mode
+* :ghpull:`18730`: TST: skip if known-bad version of imagemagick
+* :ghpull:`18583`: Support binary comms in nbagg.
+* :ghpull:`18728`: Disable mouseover info for NonUniformImage.
+* :ghpull:`18710`: Deprecate cla() methods of Axis and Spines in favor of clear()
+* :ghpull:`18719`: Added the trace plot of the end point
+* :ghpull:`18729`: Use ax.add_image rather than ax.images.append in NonUniformImage example
+* :ghpull:`18707`: Use "Return whether ..." docstring for functions returning bool
+* :ghpull:`18724`: Remove extra newlines in contour(f) docs.
+* :ghpull:`18696`: removed glossary
+* :ghpull:`18721`: Remove the use_cmex font fallback mechanism.
+* :ghpull:`18680`: wx backend API cleanups.
+* :ghpull:`18709`: Use attributes Axes.x/yaxis instead of Axes.get_x/yaxis()
+* :ghpull:`18712`: Shorten GraphicsContextWx.get_wxcolour.
+* :ghpull:`18708`: Individualize contour and contourf docstrings
+* :ghpull:`18663`: fix: keep baseline scale to baseline 0 even if set to None
+* :ghpull:`18704`: Fix docstring of Axes.cla()
+* :ghpull:`18675`: Merge ParasiteAxesAuxTransBase into ParasiteAxesBase.
+* :ghpull:`18651`: Allow Type3 subsetting of otf fonts in pdf backend.
+* :ghpull:`17396`: Improve headlessness detection for backend selection.
+* :ghpull:`17737`: Deprecate BoxStyle._Base.
+* :ghpull:`18655`: Sync SubplotDivider API with SubplotBase API changes.
+* :ghpull:`18582`: Shorten mlab tests.
+* :ghpull:`18599`: Simplify wx rubberband drawing.
+* :ghpull:`18671`: DOC: fix autoscale docstring
+* :ghpull:`18637`: BLD: sync build and run time numpy pinning
+* :ghpull:`18693`: Also fix tk key mapping, following the same strategy as for gtk.
+* :ghpull:`18691`: Cleanup sample_data.
+* :ghpull:`18697`: Catch TypeError when validating rcParams types.
+* :ghpull:`18537`: Create security policy
+* :ghpull:`18356`: ENH: Subfigures
+* :ghpull:`18694`: Document limitations on ``@deprecated`` with multiple-inheritance.
+* :ghpull:`18669`: Rework checks for old macosx
+* :ghpull:`17791`: More accurate handling of unicode/numpad input in gtk3 backends.
+* :ghpull:`18679`: Further simplify pgf tmpdir cleanup.
+* :ghpull:`18685`: Cleanup pgf examples
+* :ghpull:`18682`: Small API cleanups to plot_directive.
+* :ghpull:`18686`: Numpydocify setp.
+* :ghpull:`18684`: Small simplification to triage_tests.py.
+* :ghpull:`17832`: pdf: Support setting URLs on Text objects
+* :ghpull:`18674`: Remove accidentally added swapfile.
+* :ghpull:`18673`: Small cleanups to parasite axes.
+* :ghpull:`18536`: axes3d panning
+* :ghpull:`18667`: TST: Lock cache directory during cleanup.
+* :ghpull:`18672`: Created Border for color examples
+* :ghpull:`18661`: Define GridFinder.{,inv\_}transform_xy as normal methods.
+* :ghpull:`18656`: Fix some missing references.
+* :ghpull:`18659`: Small simplifications to BboxImage.
+* :ghpull:`18511`: feat: StepPatch to take array as baseline
+* :ghpull:`18646`: Support activating figures with plt.figure(figure_instance).
+* :ghpull:`18370`: Move PostScript Type3 subsetting to pure python.
+* :ghpull:`18645`: Simplify Colorbar.set_label, inline Colorbar._edges.
+* :ghpull:`18633`: Support linestyle='none' in Patch
+* :ghpull:`18527`: Fold ColorbarPatch into Colorbar, deprecate colorbar_factory.
+* :ghpull:`17480`: Regenerate background when RectangleSelector active-flag is set back on.
+* :ghpull:`18626`: Specify case when parameter is ignored.
+* :ghpull:`18634`: Fix typo in warning message.
+* :ghpull:`18603`: bugfix #18600 by using the MarkerStyle copy constructor
+* :ghpull:`18628`: Remove outdate comment about canvases with no manager attribute.
+* :ghpull:`18591`: Deprecate MathTextParser("bitmap") and associated APIs.
+* :ghpull:`18617`: Remove special styling of sidebar heading
+* :ghpull:`18616`: Improve instructions for building the docs
+* :ghpull:`18623`: Provide a 'cursive' font present in Windows' default font set.
+* :ghpull:`18579`: Fix stairs() tests
+* :ghpull:`18618`: Correctly separate two fantasy font names.
+* :ghpull:`18610`: DOCS: optional doc building dependencies
+* :ghpull:`18601`: Simplify Rectangle and RegularPolygon.
+* :ghpull:`18573`: add_subplot(..., axes_class=...) for more idiomatic mpl_toolkits usage.
+* :ghpull:`18605`: Correctly sync state of wx toolbar buttons when triggered by keyboard.
+* :ghpull:`18606`: Revert "FIX: pin pytest"
+* :ghpull:`18587`: Fix docstring of zaxis_date.
+* :ghpull:`18589`: Factor out pdf Type3 glyph drawing.
+* :ghpull:`18586`: Text cleanups.
+* :ghpull:`18594`: FIX: pin pytest
+* :ghpull:`18577`: Random test cleanups
+* :ghpull:`18578`: Merge all axisartist axis_direction demos together.
+* :ghpull:`18588`: Use get_x/yaxis_transform more.
+* :ghpull:`18585`: FIx precision in pie and donut example
+* :ghpull:`18564`: Prepare for merging SubplotBase into AxesBase.
+* :ghpull:`15127`: ENH/API: improvements to register_cmap
+* :ghpull:`18576`: DOC: prefer colormap over color map
+* :ghpull:`18340`: Colorbar grid postion
+* :ghpull:`18568`: Added Reporting to code_of_conduct.md
+* :ghpull:`18555`: Convert _math_style_dict into an Enum.
+* :ghpull:`18567`: Replace subplot(ijk) calls by subplots(i, j)
+* :ghpull:`18554`: Replace some usages of plt.subplot() by plt.subplots() in tests
+* :ghpull:`18556`: Accept same types to errorevery as markevery
+* :ghpull:`15932`: Use test cache for test result images too.
+* :ghpull:`18557`: DOC: Add an option to disable Google Analytics.
+* :ghpull:`18560`: Remove incorrect override of pcolor/contour in parasite axes.
+* :ghpull:`18566`: Use fig, ax = plt.subplots() in tests (part 2)
+* :ghpull:`18553`: Use fig, ax = plt.subplots() in tests
+* :ghpull:`11748`: get_clip_path checks for nan
+* :ghpull:`8987`: Tick formatter does not support grouping with locale
+* :ghpull:`18552`: Change \*subplot(111, ...) to \*subplot(...) as 111 is the default.
+* :ghpull:`18189`: FIX: Add get/set methods for 3D collections
+* :ghpull:`18430`: FIX: do not reset ylabel ha when changing position
+* :ghpull:`18515`: Remove deprecated backend code.
+* :ghpull:`17935`: MNT: improve error messages on bad pdf metadata input
+* :ghpull:`18525`: Add Text3D position getter/setter
+* :ghpull:`18542`: CLEANUP: validate join/cap style centrally
+* :ghpull:`18501`: TST: Add test for _repr_html_
+* :ghpull:`18528`: Deprecate TextArea minimumdescent.
+* :ghpull:`18543`: Documentation improvements for stairs()
+* :ghpull:`18531`: Unit handling improvements
+* :ghpull:`18523`: Don't leak file paths into PostScript metadata
+* :ghpull:`18526`: Templatize _image.resample to deduplicate it.
+* :ghpull:`18522`: Remove mlab, toolkits, and misc deprecations
+* :ghpull:`18516`: Remove deprecated font-related things.
+* :ghpull:`18535`: Add a code of conduct link to github
+* :ghpull:`17521`: Remove font warning when legend is added while using Tex
+* :ghpull:`18517`: Include kerning when outputting pdf strings.
+* :ghpull:`18521`: Inline some helpers in ColorbarBase.
+* :ghpull:`18512`: Private api2
+* :ghpull:`18519`: Correctly position text with nonzero descent with afm fonts / ps output.
+* :ghpull:`18513`: Remove Locator.autoscale.
+* :ghpull:`18497`: Merge v3.3.x into master
+* :ghpull:`18502`: Remove the deprecated matplotlib.cm.revcmap()
+* :ghpull:`18506`: Inline ScalarFormatter._formatSciNotation.
+* :ghpull:`18455`: Fix BoundingBox in EPS files.
+* :ghpull:`18275`: feat: StepPatch
+* :ghpull:`18507`: Fewer "soft" dependencies on LaTeX packages.
+* :ghpull:`18378`: Deprecate public access to many mathtext internals.
+* :ghpull:`18494`: Move cbook._check_in_list() to _api.check_in_list()
+* :ghpull:`18423`: 2-D array RGB and RGBA values not understood in plt.plot()
+* :ghpull:`18492`: Fix doc build failure due to #18440
+* :ghpull:`18435`: New environment terminal language
+* :ghpull:`18456`: Reuse InsetLocator to make twinned axes follow their parents.
+* :ghpull:`18440`: List existing rcParams in rcParams docstring.
+* :ghpull:`18453`: FIX: allow manually placed axes in constrained_layout
+* :ghpull:`18473`: Correct link to widgets examples
+* :ghpull:`18466`: Remove unnecessary autoscale handling in hist().
+* :ghpull:`18465`: Don't modify bottom argument in place in stacked histograms.
+* :ghpull:`18468`: Cleanup multiple_yaxis_with_spines example.
+* :ghpull:`18463`: Improve formatting of defaults in docstrings.
+* :ghpull:`6268`: ENH: support alpha arrays in collections
+* :ghpull:`18449`: Remove the private Axes._set_position.
+* :ghpull:`18460`: DOC: example gray level in 'Specifying Colors' tutorial
+* :ghpull:`18426`: plot directive: caption-option
+* :ghpull:`18444`: Support doubleclick in webagg/nbagg
+* :ghpull:`12518`: Example showing scale-invariant angle arc
+* :ghpull:`18446`: Normalize properties passed to ToolHandles.
+* :ghpull:`18445`: Warn if an animation is gc'd before doing anything.
+* :ghpull:`18452`: Move Axes ``__repr__`` from Subplot to AxesBase.
+* :ghpull:`15374`: Replace _prod_vectorized by @-multiplication.
+* :ghpull:`13643`: RecangleSelector constructor does not handle marker_props
+* :ghpull:`18403`: DOC: Remove related topics entries from the sidebar
+* :ghpull:`18421`: Move {get,set}_{x,y}label to _AxesBase.
+* :ghpull:`18429`: DOC: fix date example
+* :ghpull:`18353`: DOCS: describe shared axes behavior with units
+* :ghpull:`18420`: Always strip out date in postscript's test_savefig_to_stringio.
+* :ghpull:`18422`: Decrease output when running ``pytest -s``.
+* :ghpull:`18418`: Cleanup menu example
+* :ghpull:`18419`: Avoid demo'ing passing kwargs to gca().
+* :ghpull:`18372`: DOC: Fix various missing references and typos
+* :ghpull:`18400`: Clarify argument name in constrained_layout error message
+* :ghpull:`18384`: Clarification in ArtistAnimation docstring
+* :ghpull:`17892`: Add earlier color validation
+* :ghpull:`18367`: Support horizontalalignment in TextArea/AnchoredText.
+* :ghpull:`18362`: DOC: Add some types to Returns entries.
+* :ghpull:`18365`: move canvas focus after toomanager initialization
+* :ghpull:`18360`: Add example for specifying figure size in different units
+* :ghpull:`18341`: DOCS: add action items to PR template
+* :ghpull:`18349`: Remove redundant angles in ellipse demo.
+* :ghpull:`18145`: Created a parameter fontset that can be used in each Text element
+* :ghpull:`18344`: More nouns/imperative forms in docs.
+* :ghpull:`18308`: Synchronize units change in Axis.set_units for shared axis
+* :ghpull:`17494`: Rewrite of constrained_layout....
+* :ghpull:`16646`: update colorbar.py make_axes_gridspec
+* :ghpull:`18306`: Fix configure subplots
+* :ghpull:`17509`: Fix ``swap_if_landscape`` call in backend_ps
+* :ghpull:`18323`: Deleted "Our Favorite Recipes" section and moved the examples.
+* :ghpull:`18128`: Change several deprecated symbols in _macosx.m
+* :ghpull:`18251`: Merge v3.3.x into master
+* :ghpull:`18329`: Change default keymap in toolmanager example.
+* :ghpull:`18330`: Dedent rst list.
+* :ghpull:`18286`: Fix imshow to work with subclasses of ndarray.
+* :ghpull:`18320`: Make Colorbar outline into a Spine.
+* :ghpull:`18316`: Safely import pyplot if a GUI framework is already running.
+* :ghpull:`18321`: Capture output of CallbackRegistry exception test.
+* :ghpull:`17900`: Add getters and _repr_html_ for over/under/bad values of Colormap objects.
+* :ghpull:`17930`: Fix errorbar property cycling to match plot.
+* :ghpull:`18290`: Remove unused import to fix flake8.
+* :ghpull:`16818`: Dedupe implementations of configure_subplots().
+* :ghpull:`18284`: TkTimer interval=0 workaround
+* :ghpull:`17901`: DOC: Autoreformating of backend/\*.py
+* :ghpull:`17291`: Normalize gridspec ratios to lists in the setter.
+* :ghpull:`18226`: Use CallbackRegistry in Widgets and some related cleanup
+* :ghpull:`18203`: Force locator and formatter inheritence
+* :ghpull:`18279`: boxplot: Add conf_intervals reference to notch docs.
+* :ghpull:`18276`: Fix autoscaling to exclude inifinite data limits when possible.
+* :ghpull:`18261`: Migrate tk backend tests into subprocesses
+* :ghpull:`17961`: DOCS: Remove How-to: Contributing
+* :ghpull:`18201`: Remove mpl.colors deprecations for 3.4
+* :ghpull:`18223`: Added example on how to make packed bubble charts
+* :ghpull:`18264`: Fix broken links in doc build.
+* :ghpull:`8031`: Add errorbars to mplot3d
+* :ghpull:`18187`: Add option to create horizontally-oriented stem plots
+* :ghpull:`18250`: correctly autolabel Documentation and Maintenance issues
+* :ghpull:`18161`: Add more specific GitHub issue templates
+* :ghpull:`18181`: Replace ttconv by plain python for pdf subsetting
+* :ghpull:`17371`: add context manager functionality to ion and ioff
+* :ghpull:`17789`: Tk backend improvements
+* :ghpull:`15532`: Resolve 'text ignores rotational part of transformation' (#698)
+* :ghpull:`17851`: Fix Axes3D.add_collection3d issues
+* :ghpull:`18205`: Hat graph example
+* :ghpull:`6168`: #5856: added option to create vertically-oriented stem plots
+* :ghpull:`18202`: Remove mpl.testing deprecations for 3.4
+* :ghpull:`18081`: Support scale in ttf composite glyphs
+* :ghpull:`18199`: Some cleanup on TickedStroke
+* :ghpull:`18190`: Use ``super()`` more in  backends
+* :ghpull:`18193`: Allow savefig to save SVGs on FIPS enabled systems #18192
+* :ghpull:`17802`: fix FigureManagerTk close behavior if embedded in Tk App
+* :ghpull:`15458`: TickedStroke, a stroke style with ticks useful for depicting constraints
+* :ghpull:`18178`: DOC: clarify that display space coordinates are not stable
+* :ghpull:`18172`: allow webAgg to report middle click events
+* :ghpull:`17578`: Search for minus of any font size to get height of tex result
+* :ghpull:`17546`: ``func`` argument in ``legend_elements`` with non-monotonically increasing functions
+* :ghpull:`17684`: Deprecate passing bytes to FT2Font.set_text.
+* :ghpull:`17500`: Tst improve memleak
+* :ghpull:`17669`: Small changes to svg font embedding details
+* :ghpull:`18095`: Error on unexpected kwargs in scale classes
+* :ghpull:`18106`: Copy docstring description from Axes.legend() to Figure.legend()
+* :ghpull:`18002`: Deprecate various vector-backend-specific mathtext helpers.
+* :ghpull:`18006`: Fix ToolManager inconsistencies with regular toolbar
+* :ghpull:`18004`: Typos and docs for mathtext fonts.
+* :ghpull:`18133`: DOC: Update paths for moved API/what's new fragments
+* :ghpull:`18122`: Document and test legend argument parsing
+* :ghpull:`18124`: Fix FuncAnimation._draw_frame exception and testing
+* :ghpull:`18125`: pdf: Convert operator list to an Enum.
+* :ghpull:`18123`: Cleanup figure title example
+* :ghpull:`18121`: Improve rasterization demo
+* :ghpull:`18012`: Add explanatory text for rasterization demo
+* :ghpull:`18103`: Support data reference for hexbin() parameter C
+* :ghpull:`17826`: Add pause() and resume() methods to the base Animation class
+* :ghpull:`18090`: Privatize cbook.format_approx.
+* :ghpull:`18080`: Reduce numerical precision in Type 1 fonts
+* :ghpull:`18044`: Super-ify parts of the code base, part 3
+* :ghpull:`18087`: Add a note on working around limit expansion of set_ticks()
+* :ghpull:`18071`: Remove deprecated animation code
+* :ghpull:`17822`: Check for float values for min/max values to ax{v,h}line
+* :ghpull:`18069`: Remove support for multiple-color strings in to_rgba_array
+* :ghpull:`18070`: Remove rcsetup deprecations
+* :ghpull:`18073`: Remove disable_internet.py
+* :ghpull:`18075`: typo in usetex.py example
+* :ghpull:`18043`:  Super-ify parts of the code base, part 2
+* :ghpull:`18062`: Bump matplotlib.patches coverage
+* :ghpull:`17269`: Fix ConciseDateFormatter when plotting a range included in a second
+* :ghpull:`18063`: Remove un-used trivial setters and getters
+* :ghpull:`18025`: add figpager as a third party package
+* :ghpull:`18046`: Discourage references in section headings.
+* :ghpull:`18042`: scatter: Raise if unexpected type of ``s`` argument.
+* :ghpull:`18028`: Super-ify parts of the code base, part 1
+* :ghpull:`18029`: Remove some unused imports.
+* :ghpull:`18018`: Cache realpath resolution in font_manager.
+* :ghpull:`18013`: Use argumentless ``super()`` more.
+* :ghpull:`17988`: add test with -OO
+* :ghpull:`17993`: Make inset_axes and secondary_axis picklable.
+* :ghpull:`17992`: Shorten tight_bbox.
+* :ghpull:`18003`: Deprecate the unneeded Fonts.destroy.
+* :ghpull:`16457`: Build lognorm/symlognorm from corresponding scales.
+* :ghpull:`17966`: Fix some words
+* :ghpull:`17803`: Simplify projection-of-point-on-polyline in contour.py.
+* :ghpull:`17699`: raise RuntimeError appropriately for animation update func
+* :ghpull:`17954`: Remove another overspecified latex geometry.
+* :ghpull:`17948`: Sync Cairo's usetex measurement with base class.
+* :ghpull:`17788`: Tighten a bit the RendererAgg API.
+* :ghpull:`12443`: Warn in colorbar() when mappable.axes != figure.gca().
+* :ghpull:`17926`: Deprecate hatch patterns with invalid values
+* :ghpull:`17922`: Rewrite the barcode example
+* :ghpull:`17890`: Properly use thin space after math text operator
+* :ghpull:`16090`: Change pcolormesh snapping (fixes alpha colorbar/grid issues) [AGG]
+* :ghpull:`17842`: Move "Request a new feature" from How-to to Contributing
+* :ghpull:`17897`: Force origin='upper' in pyplot.specgram
+* :ghpull:`17929`: Improve hatch demo
+* :ghpull:`17927`: Remove unnecessary file save during test
+* :ghpull:`14896`: Updated doc in images.py by adding direct link to 24-bit stink bug png
+* :ghpull:`17909`: frame_format to support all listed by animation writers
+* :ghpull:`13569`: Style cleanup to pyplot.
+* :ghpull:`17924`: Remove the example "Easily creating subplots"
+* :ghpull:`17869`: FIX: new date rcParams weren't being evaluated
+* :ghpull:`17921`: Added density and combination hatching examples
+* :ghpull:`17159`: Merge consecutive rasterizations
+* :ghpull:`17895`: Use indexed color for PNG images in PDF files when possible
+* :ghpull:`17894`: DOC: Numpydoc format.
+* :ghpull:`17884`: Created Hatch marker styles Demo for Example Gallery
+* :ghpull:`17347`: ENH: reuse oldgridspec is possible...
+* :ghpull:`17915`: Document that set_ticks() increases view limits if necessary
+* :ghpull:`17902`: Fix figure size in path effects guide
+* :ghpull:`17899`: Add missing space in cairo error
+* :ghpull:`17888`: Add _repr_png_ and _repr_html_ to Colormap objects.
+* :ghpull:`17830`: Fix BoundaryNorm for multiple colors and one region
+* :ghpull:`17883`: Remove Python 3.6 compatibility shims
+* :ghpull:`17889`: Minor doc fixes
+* :ghpull:`17879`: Link to style-file example page in style tutorial
+* :ghpull:`17876`: Fix description of subplot2grid arguments
+* :ghpull:`17856`: Clarify plotnonfinite parameter docs of scatter()
+* :ghpull:`17843`: Add fullscreen toggle support to WxAgg backend
+* :ghpull:`17022`: ENH: add rcParam for ConciseDate and interval_multiples
+* :ghpull:`17799`: Deduplicate attribute docs of ContourSet and its derived classes
+* :ghpull:`17847`: Remove overspecified latex geometry.
+* :ghpull:`17662`: Mnt drop py36
+* :ghpull:`17845`: Fix size of donate button
+* :ghpull:`17825`: Add quick-link buttons for contributing
+* :ghpull:`17837`: Remove "Reporting a bug or submitting a patch" from How-to
+* :ghpull:`17828`: API: treat xunits=None and yunits=None as "default"
+* :ghpull:`17839`: Avoid need to lock in dvi generation, to avoid deadlocks.
+* :ghpull:`17824`: Improve categorical converter error message
+* :ghpull:`17834`: Keep using a single dividers LineCollection instance in colorbar.
+* :ghpull:`17838`: Prefer colorbar(ScalarMappable(...)) to ColorbarBase in tutorial.
+* :ghpull:`17836`: More precise axes section names in docs
+* :ghpull:`17835`: Colorbar cleanups.
+* :ghpull:`17727`: FIX: properly handle dates when intmult is true
+* :ghpull:`15617`: Dev docs update
+* :ghpull:`17819`: Fix typos in tight layout guide
+* :ghpull:`17806`: Set colorbar label only in set_label.
+* :ghpull:`17265`: Mnt rearrange next api again
+* :ghpull:`17808`: Improve docstring of ColorbarBase.set_label()
+* :ghpull:`17723`: Deprecate FigureCanvas.{get,set}_window_title.
+* :ghpull:`17798`: Fix overindented bullet/enumerated lists.
+* :ghpull:`17767`: Allow list of hatches to {bar, barh}
+* :ghpull:`17749`: Deprecate ``FancyBboxPatch(..., boxstyle="custom", bbox_transmuter=...)``
+* :ghpull:`17783`: DOC: point to bbox static "constructor" functions in set_position
+* :ghpull:`17782`: MNT: update mailmap
+* :ghpull:`17776`: Changes in the image for test_load_from_url
+* :ghpull:`17750`: Soft-deprecate mutation_aspect=None.
+* :ghpull:`17780`: Reorganize colorbar docstrings.
+* :ghpull:`17778`: Fix whatsnew confusing typo.
+* :ghpull:`17748`: Don't use bezier helpers in axisartist.
+* :ghpull:`17700`: Remove remnants of macosx old-style toolbar.
+* :ghpull:`17753`: Support location="left"/"top" for gridspec-based colorbars.
+* :ghpull:`17761`: Update hard-coded results in artist tutorial
+* :ghpull:`17728`: Move Win32_{Get,Set}ForegroundWindow to c_internal_utils.
+* :ghpull:`17754`: Small cleanups to contour() code.
+* :ghpull:`17751`: Deprecate dpi_cor property of FancyArrowPatch.
+* :ghpull:`15941`: FontManager fixes.
+* :ghpull:`17661`: Issue #17659: set tick color and tick labelcolor independently from rcParams
+* :ghpull:`17389`: Don't duplicate docstrings of pyplot-level cmap setters.
+* :ghpull:`17555`: Set Win32 AppUserModelId to fix taskbar icons.
+* :ghpull:`17726`: Clarify docs of box_aspect()
+* :ghpull:`17704`: Remove "created-by-matplotlib" comment in svg output.
+* :ghpull:`17697`: Add description examples/pyplots/pyplot simple.py
+* :ghpull:`17694`: CI: Only skip devdocs deploy if PR is to this repo.
+* :ghpull:`17691`: ci: Print out reasons for not deploying docs.
+* :ghpull:`17099`: Make Spines accessable by the attributes.
+
+Issues (204):
+
+* :ghissue:`19701`: Notebook plotting regression in 3.4.0rc*
+* :ghissue:`19754`: add space in python -mpip
+* :ghissue:`18364`: ``Axes3d`` attaches itself to a figure, where as ``Axes`` does not
+* :ghissue:`19700`: Setting pickradius regression in 3.4.0rc
+* :ghissue:`19594`: code of conduct link 404s
+* :ghissue:`19576`: duplicate pick events firing
+* :ghissue:`19560`: segfault due to font objects when multi-threading
+* :ghissue:`19598`: Axes order changed in 3.4.0rc1
+* :ghissue:`19631`: subplot mosaic 1 element list
+* :ghissue:`19581`: Missing kerning for single-byte strings in PDF
+* :ghissue:`17769`: interactive figure close with wxpython 4.1 causes freeze / crash (segfault?)
+* :ghissue:`19427`: Fix mistake in documentation
+* :ghissue:`19624`: Cannot add colorbar to figure after pickle
+* :ghissue:`19544`: Regression in 3.4.0rc1 in creating ListedColormap from a set
+* :ghissue:`5855`: plt.step(..., where="auto")
+* :ghissue:`19474`: Memory leak with CallbackRegistry
+* :ghissue:`19345`: legend is eating up huge amounts of memory
+* :ghissue:`19066`: plt.scatter, error with NaN values and edge color
+* :ghissue:`19432`: Unexpected change in behavior in plt.subplot
+* :ghissue:`18020`: Scatter3D: facecolor or color to "none" leads to an error
+* :ghissue:`18939`: Warn re: Axes3D constructor behavior change in mpl3.4
+* :ghissue:`19128`: webagg reports incorrect values for non-alphanumeric key events on non-qwerty keyboards
+* :ghissue:`16558`: Request: for non-interactive backends make fig.canvas.draw() force the render
+* :ghissue:`19234`: tick labels displaced vertically with text.usetex and xcolor
+* :ghissue:`18407`: pgf backend no longer supports fig.draw
+* :ghissue:`2298`: axes.xmargin/ymargin rcParam behaves differently than pyplot.margins()
+* :ghissue:`19473`: Animations in Tkinter window advance non-uniformly
+* :ghissue:`8688`: document moved examples
+* :ghissue:`9553`: Display warning on out-of-date documentation websites
+* :ghissue:`9556`: Examples page version is out of date
+* :ghissue:`12374`: Examples in docs should be redirected to latest version number
+* :ghissue:`19486`: Figure.tight_layout() raises MatplotlibDeprecationWarning
+* :ghissue:`19445`: axline transform support broke axline in loglog scale
+* :ghissue:`19178`: mathtext \lim is vertically misaligned
+* :ghissue:`19446`: Better document and error handle third dimension in pyplot.text() positional argument
+* :ghissue:`8790`: Inconsistent doc vs behavior for RendererXXX.draw_markers
+* :ghissue:`18815`: Patch3D object does not return correct face color with get_facecolor
+* :ghissue:`19152`: Automatically Aligned Labels outside Figure with Constrained Layout in Exported File
+* :ghissue:`18934`: stairs() crashes with no values and one edge
+* :ghissue:`11296`: Image in github repo does not match matplotlib.org (breaks image tutorial)
+* :ghissue:`18699`: Issue with downloading stinkbug for "Image Tutorial"
+* :ghissue:`19405`: TypeError constructor returned NULL in wayland session
+* :ghissue:`18962`: Table CSS needs cleanup
+* :ghissue:`19417`: CI failing on numpy...
+* :ghissue:`17849`: Problems caused by changes to logic of scatter coloring in matplotlib 3.3.0.rc1
+* :ghissue:`18648`: Drop support for directly imread()ing urls.
+* :ghissue:`19366`: Current CI doc builds fail
+* :ghissue:`19372`: matplotlib.axes.Axes.indicate_inset default label value is incompatible with LaTeX
+* :ghissue:`17100`: Is it a better solution to access one of the spines by class attribute?
+* :ghissue:`17375`: Proposal: add_subfigs....
+* :ghissue:`19339`: constrained_layout + fixed-aspect axes + bbox_inches="tight"
+* :ghissue:`19308`: Reduce whitespace in Choosing Colormaps tutorial plots
+* :ghissue:`18832`: MNT: Remove AxesStack and deprecated behavior of reuse of existing axes with same arguments
+* :ghissue:`19084`: Arrow coordinates slightly off when used with annotation text
+* :ghissue:`17765`: PGF xelatex can't find fonts in special-character paths
+* :ghissue:`19274`: Missing marker in documentation of plot
+* :ghissue:`18241`: LaTeX overset: unknown symbol
+* :ghissue:`19292`: Non interpolated placeholder value in docstring.
+* :ghissue:`18119`: Can no longer deepcopy LogNorm objects on master
+* :ghissue:`8665`: Noninteger Bases in mathtext sqrt
+* :ghissue:`19243`: matplotlib doesn't build with qhull-2020.2
+* :ghissue:`19275`: Double specifications of plot attributes
+* :ghissue:`15066`: Feature request: stem3
+* :ghissue:`19209`: Segfault when trying to create gigapixel image with agg backend
+* :ghissue:`4321`: clabel ticks and axes limits with eps zoom output
+* :ghissue:`16376`: ``SymLogNorm`` and ``SymLogScale`` give inconsistent results....
+* :ghissue:`19239`: _make_norm_from_scale needs to process values
+* :ghissue:`16552`: Scatter autoscaling still has issues with log scaling and zero values
+* :ghissue:`18417`: Documentation issue template should ask for matplotlib version
+* :ghissue:`19206`: matplotlib.cbook.Grouper: Example raise exception:
+* :ghissue:`19203`: Date Tick Labels example
+* :ghissue:`18581`: Add a check in check_figures_equal that the test did not accidentally plot on non-fixture figures
+* :ghissue:`18563`: Create a RangeSlider widget
+* :ghissue:`19099`: axisartist axis_direction bug
+* :ghissue:`19171`: 3D surface example bug for non-square grid
+* :ghissue:`18112`: set_{x,y,z}bound 3d limits are not persistent upon interactive rotation
+* :ghissue:`19078`: _update_patch_limits should not use CLOSEPOLY verticies for updating
+* :ghissue:`16123`: test_dpi_ratio_change fails on Windows/Qt5Agg
+* :ghissue:`15796`: [DOC] PDF build of matplotlib own documentation crashes with LaTeX error "too deeply nested"
+* :ghissue:`19091`: 3D Axes don't work in SubFigures
+* :ghissue:`7238`: better document how to configure artists for picking
+* :ghissue:`11147`: FR: add a supxlabel and supylabel as the suptitle function which are already exist
+* :ghissue:`17417`: tutorial on how autoscaling works
+* :ghissue:`18917`: Spy displays nothing for full arrays
+* :ghissue:`18562`: Allow slider valstep to be arraylike
+* :ghissue:`18942`: AnnotationBbox errors with kwargs
+* :ghissue:`11472`: Mention predefined keyboard shortcuts in the docs on event-handling
+* :ghissue:`18898`: wrong bounds checking in streamplot start_points
+* :ghissue:`18974`: Contour label demo would benefit from some more info and/or references.
+* :ghissue:`17708`: Mention rasterized option in more methods
+* :ghissue:`18826`: Pgf plots with pdflatex broken
+* :ghissue:`18959`: Add sphinx-gallery cross ref instructions to documenting guide
+* :ghissue:`18926`: Font not installed, unclear warning
+* :ghissue:`18891`: SVG animation doesn't work in HTMLWriter due to wrong type
+* :ghissue:`18222`: It is painful as a new user, to figure out what AxesSubplot is
+* :ghissue:`16153`: gap size for contour labels is poorly estimated
+* :ghissue:`17910`: Improve accessibility of form controls in HTML widgets
+* :ghissue:`18273`: Surprising behavior of shared axes with categorical units
+* :ghissue:`18731`: Compact string notation for subplot_mosaic
+* :ghissue:`18221`: Add example of keys to explore 3D data
+* :ghissue:`18882`: Incorrect version requirement message from setup.py
+* :ghissue:`18491`: Mostly unused glossary still exists in our docs
+* :ghissue:`18548`: add_subplot(..., axes_cls=...)
+* :ghissue:`8249`: Bug in mpl_connect(): On Windows, with the wx backend, arrow keys are not reported
+* :ghissue:`15609`: [SPRINT] Update Named Colors Example
+* :ghissue:`18800`: Log-scale ticker fails at 1e-323
+* :ghissue:`18392`: ``scatter()``: ``edgecolor`` takes precedence over ``edgecolors``
+* :ghissue:`18301`: "How to use Matplotlib in a web application server" should be made an example
+* :ghissue:`18386`: Path3DCollection.set_color(self, c) does not change the color of scatter points.
+* :ghissue:`8946`: Axes with sharex can have divergent axes after setting tick markers
+* :ghissue:`2294`: tex option not respected by date x-axis
+* :ghissue:`4382`: use new binary comm in nbagg
+* :ghissue:`17088`: ``projection`` kwarg could be better documented.
+* :ghissue:`18717`: Tick formatting issues on horizontal histogram with datetime on 3.3.2
+* :ghissue:`12636`: Characters doesn't display correctly when figure saved as pdf with a custom font
+* :ghissue:`18377`: Matplotlib picks a headless backend on Linux if Wayland is available but X11 isn't
+* :ghissue:`13199`: Examples that use private APIs
+* :ghissue:`18662`: Inconsistent setting of axis limits with autoscale=False
+* :ghissue:`18690`: Class deprecation machinery and mixins
+* :ghissue:`18510`: Build fails on OS X: wrong minimum version
+* :ghissue:`18641`: Conversion cache cleaning is broken with xdist
+* :ghissue:`15614`: named color examples need borders
+* :ghissue:`5519`: The linestyle 'None',  ' ' and '' not supported by PathPatch.
+* :ghissue:`17487`: Polygon selector with useblit=True - polygon dissapears
+* :ghissue:`17476`: RectangleSelector fails to clear itself after being toggled inactive and then back to active.
+* :ghissue:`18600`: plt.errorbar raises error when given marker=<matplotlib.markers.MarkerStyle object>
+* :ghissue:`18355`: Optional components required to build docs aren't documented
+* :ghissue:`18428`: small bug in the mtplotlib gallery
+* :ghissue:`4438`: inconsistent behaviour of the errorevery option in pyplot.errorbar() to the markevery keyword
+* :ghissue:`5823`: pleas dont include the Google Analytics tracking in the off-line doc
+* :ghissue:`13035`: Path3DCollection from 3D scatter cannot set_color
+* :ghissue:`9725`: scatter - set_facecolors is not working on Axes3D
+* :ghissue:`3370`: Patch3DCollection doesn't update color after calling set_color
+* :ghissue:`18427`: yaxis.set_label_position("right") resets "horizontalalignment"
+* :ghissue:`3129`: super-ify the code base
+* :ghissue:`17518`: Plotting legend throws error "font family ['serif'] not found. Falling back to DejaVu Sans"
+* :ghissue:`18282`: Bad interaction between kerning and non-latin1 characters in pdf output
+* :ghissue:`6669`: [Feature request] Functions for "manually" plotting histograms
+* :ghissue:`18411`: 2-D array RGB and RGBA values not understood in plt.plot()
+* :ghissue:`18404`: Double-click events are not recognised in Jupyter notebook
+* :ghissue:`12027`: marker_props is never used in the constructor of RectangleSelector
+* :ghissue:`18438`: Warn when a non-started animation is gc'ed.
+* :ghissue:`11259`: Symbols appear as streaks with usetex=True, times font and PDF backend
+* :ghissue:`18345`: Specify what sharex and sharey do...
+* :ghissue:`18082`: Feature Request: Non overlapping Bubble Plots
+* :ghissue:`568`: Support error bars on 3D plots
+* :ghissue:`17865`: Earlier validation of color inputs
+* :ghissue:`18363`: ha="right" breaks AnchoredText placement.
+* :ghissue:`11050`: keyboard shortcuts don't get registered using the experimental toolmanager with qt
+* :ghissue:`17906`: Set mathtext.fontset per element
+* :ghissue:`18311`: Subplot scatter plot with categorical data on y-axis with 'sharey=True' option overwrites the y-axis labels
+* :ghissue:`10304`: No link to shared axes for Axis.set_units
+* :ghissue:`17712`: constrained_layout fails on suptitle+colorbars+some figure sizes
+* :ghissue:`14638`: colorbar.make_axes doesn't anchor in constrained_layout
+* :ghissue:`18299`: New configure_subplots behaves badly on TkAgg backend
+* :ghissue:`18300`: Remove the examples category "Our Favorite Recipies"
+* :ghissue:`18077`: Imshow breaks if given a unyt_array input
+* :ghissue:`7074`: Using a linestyle cycler with plt.errorbar results in strange plots
+* :ghissue:`18236`: FuncAnimation fails to display with interval 0 on Tkagg backend
+* :ghissue:`8107`:  invalid command name "..._on_timer" in FuncAnimation for (too) small interval
+* :ghissue:`18272`: Add CI Intervall to boxplot notch documentation
+* :ghissue:`18137`: axhspan() in empty plots changes the xlimits of plots sharing the X axis
+* :ghissue:`18246`: test_never_update is flaky
+* :ghissue:`5856`: Horizontal stem plot
+* :ghissue:`18160`: Add feature request template
+* :ghissue:`17197`: Missing character upon savefig() with Free Serif font
+* :ghissue:`17013`: Request: provide a contextmanager for ioff or allow plt.figure(draw_on_create=False)
+* :ghissue:`17537`: hat graphs need an example...
+* :ghissue:`17755`: mplot3d: add_collection3d issues
+* :ghissue:`18192`: Cannot save SVG file with FIPS compliant Python
+* :ghissue:`17574`: Vertical alignment of tick labels containing minus in font size other than 10 with usetex=True
+* :ghissue:`18097`: Feature Request: Allow hexbin to use a string for parameter C to refer to column in data (DataFrame)
+* :ghissue:`17689`: Add pause/resume methods to Animation baseclass
+* :ghissue:`16087`: Error with greek letters in pdf export when using usetex=True and mathptmx
+* :ghissue:`17136`: set_ticks() changes view limits of the axis
+* :ghissue:`12198`: axvline incorrectly tries to handle unitized ymin, ymax
+* :ghissue:`9139`: Python3 matplotlib 2.0.2 with Times New Roman misses unicode minus sign in pdf
+* :ghissue:`5970`: pyplot.scatter raises obscure error when mistakenly passed a third string param
+* :ghissue:`17936`: documenattion and behavior do not match for suppressing (PDF) metadata
+* :ghissue:`17932`: latex textrm does not work in Cairo backend
+* :ghissue:`17714`: Universal fullscreen command
+* :ghissue:`4584`: ColorbarBase draws edges in slightly wrong positions.
+* :ghissue:`17878`: flipping of imshow in specgram
+* :ghissue:`6118`: consider using qtpy for qt abstraction layer
+* :ghissue:`17908`: rcParams restrictions on frame_formats are out of sync with supported values (HTMLWriter)
+* :ghissue:`17867`: datetime plotting broken on master
+* :ghissue:`16810`: Docs do not build in parallel
+* :ghissue:`17918`: Extend hatch reference
+* :ghissue:`17149`: Rasterization creates multiple bitmap elements and large file sizes
+* :ghissue:`17855`: Add Hatch Example to gallery
+* :ghissue:`15821`: Should constrained_layout work as plt.figure() argument?
+* :ghissue:`15616`: Colormaps should have a ``_repr_html_`` that is an image of the colormap
+* :ghissue:`17579`: ``BoundaryNorm`` yield a ``ZeroDivisionError: division by zero``
+* :ghissue:`17652`: NEP 29 : Stop support fro Python 3.6 soon ?
+* :ghissue:`11095`: Repeated plot calls with xunits=None throws exception
+* :ghissue:`17733`: Rename "array" (and perhaps "fields") section of Axes API
+* :ghissue:`15610`: Link to most recent DevDocs when installing from Master Source
+* :ghissue:`17817`: (documentation, possible first-timer bug) Typo and grammar on Legends and Annotations for tight layout guide page
+* :ghissue:`17804`: Setting the norm on imshow object removes colorbar ylabel
+* :ghissue:`17758`: bar, barh should take a list of hatches like it does of colors
+* :ghissue:`17746`: Antialiasing with colorbars?
+* :ghissue:`17659`: Enhancement: Set tick and ticklabel colors separately from matplotlib style file
+* :ghissue:`17144`: Wrong icon on windows task bar for figure windows
+* :ghissue:`2870`: Wrong symbols from a TrueType font
diff --git a/doc/users/prev_whats_new/github_stats_3.4.1.rst b/doc/users/prev_whats_new/github_stats_3.4.1.rst
new file mode 100644
index 000000000000..0819a6850a3e
--- /dev/null
+++ b/doc/users/prev_whats_new/github_stats_3.4.1.rst
@@ -0,0 +1,55 @@
+.. _github-stats-3-4-1:
+
+GitHub statistics for 3.4.1 (Mar 31, 2021)
+==========================================
+
+GitHub statistics for 2021/03/26 (tag: v3.4.0) - 2021/03/31
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 7 issues and merged 20 pull requests.
+The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/61?closed=1>`__
+
+The following 6 authors contributed 43 commits.
+
+* Antony Lee
+* Elliott Sales de Andrade
+* Jody Klymak
+* Thomas A Caswell
+* Tim Hoffmann
+* Xianxiang Li
+
+GitHub issues and pull requests:
+
+Pull Requests (20):
+
+* :ghpull:`19834`: Backport PR #19812: FIX: size and color rendering for Path3DCollection
+* :ghpull:`19833`: Backport PR #19811 on branch v3.4.x (Fix Inkscape cleanup at exit on Windows.)
+* :ghpull:`19812`: FIX: size and color rendering for Path3DCollection
+* :ghpull:`19811`: Fix Inkscape cleanup at exit on Windows.
+* :ghpull:`19816`: Fix legend of colour-mapped scatter plots.
+* :ghpull:`19830`: Backport PR #19824 on branch v3.4.x (Access pdf annotations while inside pikepdf.Pdf context manager.)
+* :ghpull:`19829`: Backport PR #19822 on branch v3.4.x (Clarify default backend selection doc.)
+* :ghpull:`19827`: Backport PR #19805 on branch v3.4.x (Fix suptitle out of layout)
+* :ghpull:`19824`: Access pdf annotations while inside pikepdf.Pdf context manager.
+* :ghpull:`19805`: Fix suptitle out of layout
+* :ghpull:`19823`: Backport PR #19814 on branch v3.4.x (Fix positioning of annotation arrow.)
+* :ghpull:`19820`: Backport PR #19817 on branch v3.4.x (Fix antialiasing with old pycairo/cairocffi.)
+* :ghpull:`19814`: Fix positioning of annotation arrow.
+* :ghpull:`19817`: Fix antialiasing with old pycairo/cairocffi.
+* :ghpull:`19818`: Backport PR #19784 on branch v3.4.x (FIX errorbar problem with fillstyle)
+* :ghpull:`19784`: FIX errorbar problem with fillstyle
+* :ghpull:`19815`: Backport PR #19793 on branch v3.4.x (Fix non existent URIs)
+* :ghpull:`19793`: Fix non existent URIs
+* :ghpull:`19783`: Backport PR #19719 on branch v3.4.x (Respect antialiasing settings in cairo backends as well.)
+* :ghpull:`19719`: Respect antialiasing settings in cairo backends as well.
+
+Issues (7):
+
+* :ghissue:`19779`: BUG: matplotlib 3.4.0 -- Scatter with colormap and legend gives TypeError: object of type 'NoneType' has no len()
+* :ghissue:`19787`: Marker sizes in Axes3D scatter plot are changing all the time
+* :ghissue:`19809`: Tests that use "image_comparison" fail to cleanup on Windows
+* :ghissue:`19803`: Suptitle positioning messed up in 3.4.0
+* :ghissue:`19785`: Starting point of annotation arrows has changed in 3.4.0
+* :ghissue:`19776`: Errorbars with yerr fail when fillstyle is specified
+* :ghissue:`19780`: redirect_from extension breaks latex build
diff --git a/doc/users/prev_whats_new/github_stats_3.4.2.rst b/doc/users/prev_whats_new/github_stats_3.4.2.rst
new file mode 100644
index 000000000000..22b4797c2fc2
--- /dev/null
+++ b/doc/users/prev_whats_new/github_stats_3.4.2.rst
@@ -0,0 +1,153 @@
+.. _github-stats-3-4-2:
+
+GitHub statistics for 3.4.2 (May 08, 2021)
+==========================================
+
+GitHub statistics for 2021/03/31 (tag: v3.4.1) - 2021/05/08
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 21 issues and merged 97 pull requests.
+The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/63?closed=1>`__
+
+The following 13 authors contributed 138 commits.
+
+* AkM-2018
+* Antony Lee
+* David Stansby
+* Elliott Sales de Andrade
+* hannah
+* Ian Thomas
+* Jann Paul Mattern
+* Jody Klymak
+* pwohlhart
+* richardsheridan
+* Thomas A Caswell
+* Tim Hoffmann
+* Xianxiang Li
+
+GitHub issues and pull requests:
+
+Pull Requests (97):
+
+* :ghpull:`20184`: Backport PR #20147 on branch v3.4.x (DOC: add example of labelling axes)
+* :ghpull:`20181`: Backport PR #20171 on branch v3.4.x (Remove unsupported arguments from tricontourf documentation)
+* :ghpull:`20180`: Backport PR #19876 on branch v3.4.x (FIX: re-order unit conversion and mask array coercion)
+* :ghpull:`20171`: Remove unsupported arguments from tricontourf documentation
+* :ghpull:`19876`: FIX: re-order unit conversion and mask array coercion
+* :ghpull:`20178`: Backport PR #20150 on branch v3.4.x
+* :ghpull:`20172`: Backport PR #20161 on branch v3.4.x (Fix resetting grid visibility)
+* :ghpull:`20161`: Fix resetting grid visibility
+* :ghpull:`20167`: Backport PR #20146 on branch v3.4.x (Don't clip clip paths to Figure bbox.)
+* :ghpull:`20166`: Backport PR #19978 on branch v3.4.x (fixed bug in CenteredNorm, issue #19972)
+* :ghpull:`20146`: Don't clip clip paths to Figure bbox.
+* :ghpull:`19978`: fixed bug in CenteredNorm, issue #19972
+* :ghpull:`20160`: Backport PR #20148 on branch v3.4.x (FIX: MouseButton representation in boilerplate generated signatures)
+* :ghpull:`20148`: FIX: MouseButton representation in boilerplate generated signatures
+* :ghpull:`20152`: Backport PR #20145 on branch v3.4.x (Fix broken link to ggplot in docs)
+* :ghpull:`20139`: Backport PR #20135 on branch v3.4.x (Add tricontour/tricontourf arguments(corner_mask, vmin vmax, antialiased, nchunk, hatches) documentation)
+* :ghpull:`20135`: Add tricontour/tricontourf arguments(corner_mask, vmin vmax, antialiased, nchunk, hatches) documentation
+* :ghpull:`20136`: Backport PR #19959 on branch v3.4.x (Bugfix Tk start_event_loop)
+* :ghpull:`19959`: Bugfix Tk start_event_loop
+* :ghpull:`20128`: Backport PR #20123 on branch v3.4.x (Ensure that Matplotlib is importable even if there's no HOME.)
+* :ghpull:`20123`: Ensure that Matplotlib is importable even if there's no HOME.
+* :ghpull:`20009`: Fix removal of shared polar axes.
+* :ghpull:`20104`: Backport PR #19686 on branch v3.4.x (Declare sphinxext.redirect_from parallel_read_safe)
+* :ghpull:`19686`: Declare sphinxext.redirect_from parallel_read_safe
+* :ghpull:`20098`: Backport PR #20096 on branch v3.4.x (Ignore errors for sip with no setapi.)
+* :ghpull:`20096`: Ignore errors for sip with no setapi.
+* :ghpull:`20087`: Backport PR #20083 on branch v3.4.x (Revert "Temporarily switch intersphinx to latest pytest.")
+* :ghpull:`20085`: Backport PR #20082 on branch v3.4.x (Fix bar_label for bars with nan values)
+* :ghpull:`20082`: Fix bar_label for bars with nan values
+* :ghpull:`20076`: Backport PR #20062 on branch v3.4.x ([DOC] Add top-level .. module:: definition for matplotlib)
+* :ghpull:`20043`: Backport PR #20041 on branch v3.4.x (Clarify docs for stackplot.)
+* :ghpull:`20041`: Clarify docs for stackplot.
+* :ghpull:`20039`: Backport PR #20037 on branch v3.4.x (Don't generate wheels unusable on PyPy7.3.{0,1}.)
+* :ghpull:`20037`: Don't generate wheels unusable on PyPy7.3.{0,1}.
+* :ghpull:`20033`: Backport PR #20031 on branch v3.4.x (Cleanup widget examples)
+* :ghpull:`20031`: Cleanup widget examples
+* :ghpull:`20022`: Backport PR #19949 on branch v3.4.x (FIX: subfigure indexing error)
+* :ghpull:`19949`: FIX: subfigure indexing error
+* :ghpull:`20018`: Backport PR #20017 on branch v3.4.x (FIX typos in imshow_extent.py)
+* :ghpull:`20017`: FIX typos in imshow_extent.py
+* :ghpull:`20015`: Backport PR #19962 on branch v3.4.x (Dev install troubleshooting)
+* :ghpull:`19962`: Dev install troubleshooting
+* :ghpull:`20002`: Backport PR #19995 on branch v3.4.x (Fix valinit argument to RangeSlider)
+* :ghpull:`20004`: Backport PR #19999 on branch v3.4.x (DOC: add note about axes order to docstring)
+* :ghpull:`19998`: Backport PR #19964 on branch v3.4.x (FIX: add subplot_mosaic axes in the order the user gave them to us)
+* :ghpull:`19999`: DOC: add note about axes order to docstring
+* :ghpull:`19997`: Backport PR #19992 on branch v3.4.x (Minor fixes to polar locator docstrings.)
+* :ghpull:`19995`: Fix valinit argument to RangeSlider
+* :ghpull:`19964`: FIX: add subplot_mosaic axes in the order the user gave them to us
+* :ghpull:`19993`: Backport PR #19983 on branch v3.4.x (Fix handling of "d" glyph in backend_ps.)
+* :ghpull:`19992`: Minor fixes to polar locator docstrings.
+* :ghpull:`19991`: Backport PR #19987 on branch v3.4.x (Fix set_thetalim((min, max)).)
+* :ghpull:`19976`: Backport PR #19970 on branch v3.4.x (Initialize members of PathClipper and check for m_has_init)
+* :ghpull:`19983`: Fix handling of "d" glyph in backend_ps.
+* :ghpull:`19987`: Fix set_thetalim((min, max)).
+* :ghpull:`19970`: Initialize members of PathClipper and check for m_has_init
+* :ghpull:`19973`: Backport PR #19971 on branch v3.4.x (Fix missing closing bracket in docs)
+* :ghpull:`19971`: Fix missing closing bracket in docs
+* :ghpull:`19966`: Backport PR #19963 on branch v3.4.x (test_StrCategoryLocator using parameterized plotter)
+* :ghpull:`19965`: Backport PR #19961 on branch v3.4.x (FIX: subfigure tightbbox)
+* :ghpull:`19963`: test_StrCategoryLocator using parameterized plotter
+* :ghpull:`19961`: FIX: subfigure tightbbox
+* :ghpull:`19953`: Backport PR #19919 on branch v3.4.x (Copy errorbar style normalization to 3D)
+* :ghpull:`19919`: Copy errorbar style normalization to 3D
+* :ghpull:`19950`: Backport PR #19948 on branch v3.4.x (Allow numpy arrays to be used as elinewidth)
+* :ghpull:`19948`: Allow numpy arrays to be used as elinewidth
+* :ghpull:`19944`: Backport PR #19939 on branch v3.4.x (add highlight-text to the third party packages list)
+* :ghpull:`19921`: Backport PR #19913 on branch v3.4.x (Minor docstring improvement for set_aspect())
+* :ghpull:`19920`: Backport PR #19903 on branch v3.4.x (Fix textbox cursor color, set its linewidth.)
+* :ghpull:`19913`: Minor docstring improvement for set_aspect()
+* :ghpull:`19903`: Fix textbox cursor color, set its linewidth.
+* :ghpull:`19917`: Backport PR #19911 on branch v3.4.x (Shorten "how-to draw order")
+* :ghpull:`19916`: Backport PR #19888 on branch v3.4.x (Fix errorbar drawstyle)
+* :ghpull:`19911`: Shorten "how-to draw order"
+* :ghpull:`19888`: Fix errorbar drawstyle
+* :ghpull:`19910`: Backport PR #19895 on branch v3.4.x (Added PyPI info to third party page)
+* :ghpull:`19895`: Added PyPI info to third party page
+* :ghpull:`19896`: Backport PR #19893 on branch v3.4.x (Remove Howto: Plot numpy.datetime64 values)
+* :ghpull:`19893`: Remove Howto: Plot numpy.datetime64 values
+* :ghpull:`19886`: Backport PR #19881 on branch v3.4.x (Remove two sections from Plotting FAQ)
+* :ghpull:`19877`: Backport PR #19863 on branch v3.4.x (Cleanup docstrings related to interactive mode)
+* :ghpull:`19881`: Remove two sections from Plotting FAQ
+* :ghpull:`19885`: Backport PR #19883 on branch v3.4.x (Small cleanups to FAQ.)
+* :ghpull:`19883`: Small cleanups to FAQ.
+* :ghpull:`19878`: Backport PR #19867 on branch v3.4.x (Remove "Use show()" from how-to )
+* :ghpull:`19875`: Backport PR #19868 on branch v3.4.x (Remove "Install from source" from Installing FAQ)
+* :ghpull:`19867`: Remove "Use show()" from how-to
+* :ghpull:`19863`: Cleanup docstrings related to interactive mode
+* :ghpull:`19868`: Remove "Install from source" from Installing FAQ
+* :ghpull:`19874`: Backport PR #19847 on branch v3.4.x (Reformat references (part 2))
+* :ghpull:`19847`: Reformat references (part 2)
+* :ghpull:`19865`: Backport PR #19860 on branch v3.4.x (Move "howto interpreting box plots" to boxplot docstring)
+* :ghpull:`19860`: Move "howto interpreting box plots" to boxplot docstring
+* :ghpull:`19862`: Backport PR #19861 on branch v3.4.x (Remove FAQ Installing - Linux notes)
+* :ghpull:`19861`: Remove FAQ Installing - Linux notes
+* :ghpull:`18060`: Correctly handle 'none' facecolors in do_3d_projection
+* :ghpull:`19846`: Backport PR #19788 on branch v3.4.x (Reformat references)
+
+Issues (21):
+
+* :ghissue:`19871`: Matplotlib >= v3.3.3 breaks with pandas.plotting.register_matplotlib_converters(), ax.pcolormesh(), and datetime objects
+* :ghissue:`20149`: KeyError: 'gridOn' in axis.py when axis.tick_params() is used with reset = True
+* :ghissue:`20127`: Zooming on a contour plot with clipping results in bad clipping
+* :ghissue:`19972`: CenteredNorm with halfrange raises exception when passed to imshow
+* :ghissue:`19940`: Tkagg event loop throws error on window close
+* :ghissue:`20122`: Run in a system service / without configuration
+* :ghissue:`19989`: Removal of y-shared polar axes causes crash at draw time
+* :ghissue:`19988`: Removal of x-shared polar axes causes crash
+* :ghissue:`20040`: AttributeError: module 'sip' has no attribute 'setapi'
+* :ghissue:`20058`: bar_label fails with nan data values
+* :ghissue:`20036`: Minor changes about stackplot documentation
+* :ghissue:`20014`: undefined symbol: PyPyUnicode_ReadChar
+* :ghissue:`19947`: Figure.subfigures dont show/update correctly
+* :ghissue:`19960`: Failed to init RangeSlider with valinit attribute
+* :ghissue:`19736`: subplot_mosaic axes are not added in consistent order
+* :ghissue:`19979`: Blank EPS figures if plot contains 'd'
+* :ghissue:`19938`: unuseful deprecation warning figbox
+* :ghissue:`19958`: subfigures missing bbox_inches attribute in inline backend
+* :ghissue:`19936`: Errorbars elinewidth raise error when numpy array
+* :ghissue:`19879`: Using "drawstyle" raises AttributeError in errorbar, when yerr is specified.
+* :ghissue:`19454`: I cannot import matplotlib.pyplot as plt
diff --git a/doc/users/prev_whats_new/github_stats_3.4.3.rst b/doc/users/prev_whats_new/github_stats_3.4.3.rst
new file mode 100644
index 000000000000..b248bf69b6ef
--- /dev/null
+++ b/doc/users/prev_whats_new/github_stats_3.4.3.rst
@@ -0,0 +1,133 @@
+.. _github-stats-3-4-3:
+
+GitHub statistics for 3.4.3 (August 21, 2021)
+=============================================
+
+GitHub statistics for 2021/05/08 - 2021/08/12 (tag: v3.4.2)
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 22 issues and merged 69 pull requests.
+The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/64?closed=1>`__
+
+The following 20 authors contributed 95 commits.
+
+* Antony Lee
+* David Stansby
+* Diego
+* Diego Leal Petrola
+* Diego Petrola
+* Elliott Sales de Andrade
+* Eric Firing
+* Frank Sauerburger
+* Greg Lucas
+* Ian Hunt-Isaak
+* Jash Shah
+* Jody Klymak
+* Jouni K. Seppänen
+* Michał Górny
+* sandipanpanda
+* Slava Ostroukh
+* Thomas A Caswell
+* Tim Hoffmann
+* Viacheslav Ostroukh
+* Xianxiang Li
+
+GitHub issues and pull requests:
+
+Pull Requests (69):
+
+* :ghpull:`20830`: Backport PR #20826 on branch v3.4.x (Fix clear of Axes that are shared.)
+* :ghpull:`20826`: Fix clear of Axes that are shared.
+* :ghpull:`20823`: Backport PR #20817 on branch v3.4.x (Make test_change_epoch more robust.)
+* :ghpull:`20817`: Make test_change_epoch more robust.
+* :ghpull:`20820`: Backport PR #20771 on branch v3.4.x (FIX: tickspacing for subfigures)
+* :ghpull:`20771`: FIX: tickspacing for subfigures
+* :ghpull:`20777`: FIX: dpi and scatter for subfigures now correct
+* :ghpull:`20787`: Backport PR #20786 on branch v3.4.x (Fixed typo in _constrained_layout.py (#20782))
+* :ghpull:`20786`: Fixed typo in _constrained_layout.py (#20782)
+* :ghpull:`20763`: Backport PR #20761 on branch v3.4.x (Fix suplabel autopos)
+* :ghpull:`20761`: Fix suplabel autopos
+* :ghpull:`20751`: Backport PR #20748 on branch v3.4.x (Ensure _static directory exists before copying CSS.)
+* :ghpull:`20748`: Ensure _static directory exists before copying CSS.
+* :ghpull:`20713`: Backport PR #20710 on branch v3.4.x (Fix tests with Inkscape 1.1.)
+* :ghpull:`20687`: Enable PyPy wheels for v3.4.x
+* :ghpull:`20710`: Fix tests with Inkscape 1.1.
+* :ghpull:`20696`: Backport PR #20662 on branch v3.4.x (Don't forget to disable autoscaling after interactive zoom.)
+* :ghpull:`20662`: Don't forget to disable autoscaling after interactive zoom.
+* :ghpull:`20683`: Backport PR #20645 on branch v3.4.x (Fix leak if affine_transform is passed invalid vertices.)
+* :ghpull:`20645`: Fix leak if affine_transform is passed invalid vertices.
+* :ghpull:`20642`: Backport PR #20629 on branch v3.4.x (Add protection against out-of-bounds read in ttconv)
+* :ghpull:`20643`: Backport PR #20597 on branch v3.4.x
+* :ghpull:`20629`: Add protection against out-of-bounds read in ttconv
+* :ghpull:`20597`: Fix TTF headers for type 42 stix font
+* :ghpull:`20624`: Backport PR #20609 on branch v3.4.x (FIX: fix figbox deprecation)
+* :ghpull:`20609`: FIX: fix figbox deprecation
+* :ghpull:`20594`: Backport PR #20590 on branch v3.4.x (Fix class docstrings for Norms created from Scales.)
+* :ghpull:`20590`: Fix class docstrings for Norms created from Scales.
+* :ghpull:`20587`: Backport PR #20584: FIX: do not simplify path in LineCollection.get_s…
+* :ghpull:`20584`: FIX: do not simplify path in LineCollection.get_segments
+* :ghpull:`20578`: Backport PR #20511 on branch v3.4.x (Fix calls to np.ma.masked_where)
+* :ghpull:`20511`: Fix calls to np.ma.masked_where
+* :ghpull:`20568`: Backport PR #20565 on branch v3.4.x (FIX: PILLOW asarray bug)
+* :ghpull:`20566`: Backout pillow=8.3.0 due to a crash
+* :ghpull:`20565`: FIX: PILLOW asarray bug
+* :ghpull:`20503`: Backport PR #20488 on branch v3.4.x (FIX: Include 0 when checking lognorm vmin)
+* :ghpull:`20488`: FIX: Include 0 when checking lognorm vmin
+* :ghpull:`20483`: Backport PR #20480 on branch v3.4.x (Fix str of empty polygon.)
+* :ghpull:`20480`: Fix str of empty polygon.
+* :ghpull:`20478`: Backport PR #20473 on branch v3.4.x (_GSConverter: handle stray 'GS' in output gracefully)
+* :ghpull:`20473`: _GSConverter: handle stray 'GS' in output gracefully
+* :ghpull:`20456`: Backport PR #20453 on branch v3.4.x (Remove ``Tick.apply_tickdir`` from 3.4 deprecations.)
+* :ghpull:`20441`: Backport PR #20416 on branch v3.4.x (Fix missing Patch3DCollection._z_markers_idx)
+* :ghpull:`20416`: Fix missing Patch3DCollection._z_markers_idx
+* :ghpull:`20417`: Backport PR #20395 on branch v3.4.x (Pathing issue)
+* :ghpull:`20395`: Pathing issue
+* :ghpull:`20404`: Backport PR #20403: FIX: if we have already subclassed mixin class ju…
+* :ghpull:`20403`: FIX: if we have already subclassed mixin class just return
+* :ghpull:`20383`: Backport PR #20381 on branch v3.4.x (Prevent corrections and completions in search field)
+* :ghpull:`20307`: Backport PR #20154 on branch v3.4.x (ci: Bump Ubuntu to 18.04 LTS.)
+* :ghpull:`20285`: Backport PR #20275 on branch v3.4.x (Fix some examples that are skipped in docs build)
+* :ghpull:`20275`: Fix some examples that are skipped in docs build
+* :ghpull:`20267`: Backport PR #20265 on branch v3.4.x (Legend edgecolor face)
+* :ghpull:`20265`: Legend edgecolor face
+* :ghpull:`20260`: Fix legend edgecolor face
+* :ghpull:`20259`: Backport PR #20248 on branch v3.4.x (Replace pgf image-streaming warning by error.)
+* :ghpull:`20248`: Replace pgf image-streaming warning by error.
+* :ghpull:`20241`: Backport PR #20212 on branch v3.4.x (Update span_selector.py)
+* :ghpull:`20212`: Update span_selector.py
+* :ghpull:`19980`: Tidy up deprecation messages in ``_subplots.py``
+* :ghpull:`20234`: Backport PR #20225 on branch v3.4.x (FIX: correctly handle ax.legend(..., legendcolor='none'))
+* :ghpull:`20225`: FIX: correctly handle ax.legend(..., legendcolor='none')
+* :ghpull:`20232`: Backport PR #19636 on branch v3.4.x (Correctly check inaxes for multicursor)
+* :ghpull:`20228`: Backport PR #19849 on branch v3.4.x (FIX DateFormatter for month names when usetex=True)
+* :ghpull:`19849`: FIX DateFormatter for month names when usetex=True
+* :ghpull:`20154`: ci: Bump Ubuntu to 18.04 LTS.
+* :ghpull:`20186`: Backport PR #19975 on branch v3.4.x (CI: remove workflow to push commits to macpython/matplotlib-wheels)
+* :ghpull:`19975`: CI: remove workflow to push commits to macpython/matplotlib-wheels
+* :ghpull:`19636`: Correctly check inaxes for multicursor
+
+Issues (22):
+
+* :ghissue:`20219`: Regression: undocumented change of behaviour in mpl 3.4.2 with axis ticks direction
+* :ghissue:`20721`: ax.clear() adds extra ticks, un-hides shared-axis tick labels
+* :ghissue:`20765`: savefig re-scales xticks and labels of some (but not all) subplots
+* :ghissue:`20782`: [Bug]: _supylabel get_in_layout() typo?
+* :ghissue:`20747`: [Bug]: _copy_css_file assumes that the _static directory already exists
+* :ghissue:`20617`: tests fail with new inkscape
+* :ghissue:`20519`: Toolbar zoom doesn't change autoscale status for versions 3.2.0 and above
+* :ghissue:`20628`: Out-of-bounds read leads to crash or broken TrueType fonts
+* :ghissue:`20612`: Broken EPS for Type 42 STIX
+* :ghissue:`19982`: regression for 3.4.x - ax.figbox replacement incompatible to all version including 3.3.4
+* :ghissue:`19938`: unuseful deprecation warning figbox
+* :ghissue:`16400`: Inconsistent behavior between Normalizers when input is Dataframe
+* :ghissue:`20583`: Lost class descriptions since 3.4 docs
+* :ghissue:`20551`: set_segments(get_segments()) makes lines coarse
+* :ghissue:`20560`: test_png is failing
+* :ghissue:`20487`: test_huge_range_log is failing...
+* :ghissue:`20472`: test_backend_pgf.py::test_xelatex[pdf] - ValueError: invalid literal for int() with base 10: b'ate missing from Resources. [...]
+* :ghissue:`20328`: Path.intersects_path sometimes returns incorrect values
+* :ghissue:`20258`: Using edgecolors='face' with stackplot causes value error when using plt.legend()
+* :ghissue:`20200`: examples/widgets/span_selector.py is brittle
+* :ghissue:`20231`: MultiCursor bug
+* :ghissue:`19836`: Month names not set as text when using usetex
diff --git a/doc/users/prev_whats_new/github_stats_3.5.0.rst b/doc/users/prev_whats_new/github_stats_3.5.0.rst
new file mode 100644
index 000000000000..70d599f10c5d
--- /dev/null
+++ b/doc/users/prev_whats_new/github_stats_3.5.0.rst
@@ -0,0 +1,1292 @@
+.. _github-stats-3-5-0:
+
+GitHub statistics for 3.5.0 (Nov 15, 2021)
+==========================================
+
+GitHub statistics for 2021/03/26 (tag: v3.4.0) - 2021/11/15
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 187 issues and merged 939 pull requests.
+The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/59?closed=1>`__
+
+The following 144 authors contributed 3406 commits.
+
+* Aaron Rogers
+* Abhinav Sagar
+* Adrian Price-Whelan
+* Adrien F. Vincent
+* ain-soph
+* Aitik Gupta
+* Akiomi Kamakura
+* AkM-2018
+* Andrea PIERRÉ
+* andthum
+* Antony Lee
+* Antti Soininen
+* apodemus
+* astromancer
+* Bruno Beltran
+* Carlos Cerqueira
+* Casper da Costa-Luis
+* ceelo777
+* Christian Baumann
+* dan
+* Dan Zimmerman
+* David Matos
+* David Poznik
+* David Stansby
+* dependabot[bot]
+* Diego Leal Petrola
+* Dmitriy Fishman
+* Ellert van der Velden
+* Elliott Sales de Andrade
+* Engjell Avdiu
+* Eric Firing
+* Eric Larson
+* Eric Prestat
+* Ewan Sutherland
+* Felix Nößler
+* Fernando
+* fourpoints
+* Frank Sauerburger
+* Gleb Fedorov
+* Greg Lucas
+* hannah
+* Hannes Breytenbach
+* Hans Meine
+* Harshal Prakash Patankar
+* harupy
+* Harutaka Kawamura
+* Hildo Guillardi Júnior
+* Holtz Yan
+* Hood
+* Ian Hunt-Isaak
+* Ian Thomas
+* ianhi
+* Illviljan
+* ImportanceOfBeingErnest
+* Isha Mehta
+* iury simoes-sousa
+* Jake Bowhay
+* Jakub Klus
+* Jan-Hendrik Müller
+* Janakarajan Natarajan
+* Jann Paul Mattern
+* Jash Shah
+* Jay Joshi
+* jayjoshi112711
+* jeffreypaul15
+* Jerome F. Villegas
+* Jerome Villegas
+* Jesus Briales
+* Jody Klymak
+* Jonathan Yong
+* Joschua Conrad
+* Joschua-Conrad
+* Jouni K. Seppänen
+* K-Monty
+* katrielester
+* kdpenner
+* Kent
+* Kent Gauen
+* kentcr
+* kir0ul
+* kislovskiy
+* KIU Shueng Chuan
+* KM Goh
+* Konstantin Popov
+* kyrogon
+* Leeh Peter
+* Leo Singer
+* lgfunderburk
+* Liam Toney
+* luz paz
+* luzpaz
+* Madhav Humagain
+* MalikIdreesHasa
+* Marat Kopytjuk
+* Marco Rigobello
+* Marco Salathe
+* Markus Wesslén
+* martinRenou
+* Matthias Bussonnier
+* MeeseeksMachine
+* Michał Górny
+* Mihai Anton
+* Navid C. Constantinou
+* Nico Schlömer
+* Phil Nagel
+* Philip Schiff
+* Philipp Nagel
+* pwohlhart
+* Péter Leéh
+* Quentin Peter
+* Ren Pang
+* rgbmrc
+* Richard Barnes
+* richardsheridan
+* Rike-Benjamin Schuppner
+* Roberto Toro
+* Ruth Comer
+* ryahern
+* Ryan May
+* Sam Van Kooten
+* sandipanpanda
+* Simon Hoxbro
+* Slava Ostroukh
+* Stefan Appelhoff
+* Stefanie Molin
+* takimata
+* tdpetrou
+* theOehrly
+* Thomas A Caswell
+* Tim Hoffmann
+* tohc1
+* Tom Charrett
+* Tom Neep
+* Tomas Hrnciar
+* Tortar
+* Tranquilled
+* Vagrant Cascadian
+* Viacheslav Ostroukh
+* Vishnu V K
+* Xianxiang Li
+* Yannic Schroeder
+* Yo Yehudi
+* Zexi
+* znstrider
+
+GitHub issues and pull requests:
+
+Pull Requests (939):
+
+* :ghpull:`21645`: Backport PR #21628 on branch v3.5.x (Fix METH_VARARGS method signatures )
+* :ghpull:`21644`: Backport PR #21640 on branch v3.5.x (DOC: remove sample_plots from tutorials)
+* :ghpull:`21628`: Fix METH_VARARGS method signatures
+* :ghpull:`21640`: DOC: remove sample_plots from tutorials
+* :ghpull:`21636`: Backport PR #21604 on branch v3.5.x (Fix centre square rectangle selector part 1)
+* :ghpull:`21604`: Fix centre square rectangle selector part 1
+* :ghpull:`21633`: Backport PR #21501 on branch v3.5.x (Refix for pyparsing compat.)
+* :ghpull:`21606`: BLD: limit support of pyparsing to <3
+* :ghpull:`21501`: Refix for pyparsing compat.
+* :ghpull:`21624`: Backport PR #21621 on branch v3.5.x (Fix GhostScript error handling types)
+* :ghpull:`21625`: Backport PR #21568 on branch v3.5.x (Enhancing support for tex and datetimes)
+* :ghpull:`21568`: Enhancing support for tex and datetimes
+* :ghpull:`21621`: Fix GhostScript error handling types
+* :ghpull:`21623`: Backport PR #21619 on branch v3.5.x (Revert "Pin sphinx to fix sphinx-gallery")
+* :ghpull:`21619`: Revert "Pin sphinx to fix sphinx-gallery"
+* :ghpull:`21618`: Backport PR #21617 on branch v3.5.x (FIX: Make sure we do not over-write eps short cuts)
+* :ghpull:`21622`: Backport PR #21350 on branch v3.5.x (Remove plot_gallery setting from conf.py)
+* :ghpull:`21617`: FIX: Make sure we do not over-write eps short cuts
+* :ghpull:`21616`: Backport PR #21613 on branch v3.5.x (SEC/DOC update supported versions)
+* :ghpull:`21615`: Backport PR #21607 on branch v3.5.x (DOC: link to cheatsheets site, not github repo)
+* :ghpull:`21614`: Backport PR #21609 on branch v3.5.x (Fix documentation link with renaming ``voxels`` to ``voxelarray``)
+* :ghpull:`21613`: SEC/DOC update supported versions
+* :ghpull:`21607`: DOC: link to cheatsheets site, not github repo
+* :ghpull:`21609`: Fix documentation link with renaming ``voxels`` to ``voxelarray``
+* :ghpull:`21605`: Backport PR #21317 on branch v3.5.x (Move label hiding rectilinear-only check into _label_outer_{x,y}axis.)
+* :ghpull:`21317`: Move label hiding rectilinear-only check into _label_outer_{x,y}axis.
+* :ghpull:`21602`: Backport PR #21586 on branch v3.5.x (Defer enforcement of hatch validation)
+* :ghpull:`21601`: Backport PR #21530 on branch v3.5.x (Fix interrupting GTK on plain Python)
+* :ghpull:`21603`: Backport PR #21596 on branch v3.5.x (Pin sphinx to fix sphinx-gallery)
+* :ghpull:`21586`: Defer enforcement of hatch validation
+* :ghpull:`21530`: Fix interrupting GTK on plain Python
+* :ghpull:`21397`: Support for pre 2.7.1 freetype savannah versions
+* :ghpull:`21599`: Backport PR #21592 on branch v3.5.x ([BUG in 3.5.0rc1] - Anatomy of a Figure has the legend in the wrong spot)
+* :ghpull:`21587`: Backport PR #21581 on branch v3.5.x (Fix RangeSlider.reset)
+* :ghpull:`21592`: [BUG in 3.5.0rc1] - Anatomy of a Figure has the legend in the wrong spot
+* :ghpull:`21596`: Pin sphinx to fix sphinx-gallery
+* :ghpull:`21577`: Backport PR #21527 on branch v3.5.x (Add more 3.5 release notes)
+* :ghpull:`21527`: Add more 3.5 release notes
+* :ghpull:`21573`: Backport PR #21570 on branch v3.5.x (Raise correct exception out of Spines.__getattr__)
+* :ghpull:`21563`: Backport PR #21559 on branch v3.5.x (Fix eventplot units)
+* :ghpull:`21560`: Backport PR #21553 on branch v3.5.x (Fix check for manager presence in blocking_input.)
+* :ghpull:`21561`: Backport PR #21555 on branch v3.5.x (MNT: reject more possibly unsafe strings in validate_cycler)
+* :ghpull:`21555`: MNT: reject more possibly unsafe strings in validate_cycler
+* :ghpull:`21553`: Fix check for manager presence in blocking_input.
+* :ghpull:`21559`: Fix eventplot units
+* :ghpull:`21543`: Backport PR #21443 on branch v3.5.x (FIX: re-instate ability to have position in axes)
+* :ghpull:`21550`: Ignore transOffset if no offsets passed to Collection
+* :ghpull:`21443`: FIX: re-instate ability to have position in axes
+* :ghpull:`21531`: Backport PR #21491 on branch v3.5.x (Relocate inheritance diagram to the top of the document)
+* :ghpull:`21491`: Relocate inheritance diagram to the top of the document
+* :ghpull:`21504`: Backport PR #21481 on branch v3.5.x (FIX: spanning subfigures)
+* :ghpull:`21481`: FIX: spanning subfigures
+* :ghpull:`21483`: Backport PR #21387 on branch v3.5.x (Fix path simplification of closed loops)
+* :ghpull:`21486`: Backport PR #21478 on branch v3.5.x (Fix GTK4 embedding example)
+* :ghpull:`21497`: Backport PR #21484 on branch v3.5.x (Replacement for imread should return an array)
+* :ghpull:`21484`: Replacement for imread should return an array
+* :ghpull:`21495`: Backport PR #21492 on branch v3.5.x (added parameter documentation for MultiCursor)
+* :ghpull:`21493`: Backport PR #21488 on branch v3.5.x (Added to contour docs)
+* :ghpull:`21492`: added parameter documentation for MultiCursor
+* :ghpull:`21488`: Added to contour docs
+* :ghpull:`21478`: Fix GTK4 embedding example
+* :ghpull:`21387`: Fix path simplification of closed loops
+* :ghpull:`21479`: Backport PR #21472 on branch v3.5.x (Clarify set_parse_math documentation.)
+* :ghpull:`21472`: Clarify set_parse_math documentation.
+* :ghpull:`21471`: Backport PR #21470 on branch v3.5.x (Hide fully transparent latex text in PS output)
+* :ghpull:`21470`: Hide fully transparent latex text in PS output
+* :ghpull:`21469`: Backport PR #21468 on branch v3.5.x (Fix some typos in examples)
+* :ghpull:`21468`: Fix some typos in examples
+* :ghpull:`21461`: Backport #21429 from jklymak/doc-use-mpl-sphinx
+* :ghpull:`21464`: Backport PR #21460 on branch v3.5.x (Clip slider init marker to slider track.)
+* :ghpull:`21460`: Clip slider init marker to slider track.
+* :ghpull:`21458`: Backport:  #21429 from jklymak/doc-use-mpl-sphinx
+* :ghpull:`21454`: Fix error with pyparsing 3 for 3.5.x
+* :ghpull:`21459`: Backport PR #21423 on branch v3.5.x (Change CircleCI job title to "Rendered docs")
+* :ghpull:`21423`: Change CircleCI job title to "Rendered docs"
+* :ghpull:`21457`: Backport PR #21455 on branch v3.5.x (Hide note linking to the download section at the bottom of galleries)
+* :ghpull:`21456`: Backport PR #21453 on branch v3.5.x (Cleanup index.rst sectioning)
+* :ghpull:`21455`: Hide note linking to the download section at the bottom of galleries
+* :ghpull:`21453`: Cleanup index.rst sectioning
+* :ghpull:`21224`: DOC: Nav-bar: Add icon linking to contents
+* :ghpull:`21451`: Backport PR #21445 on branch v3.5.x (Mnt pin pyparsing)
+* :ghpull:`21429`: DOC: use mpl-sphinx-theme for navbar, social, logo
+* :ghpull:`21450`: Backport PR #21449 on branch v3.5.x (Less verbose install info on index page)
+* :ghpull:`21449`: Less verbose install info on index page
+* :ghpull:`21446`: Also exclude pyparsing 3.0.0 in setup.py.
+* :ghpull:`21445`: Mnt pin pyparsing
+* :ghpull:`21439`: Backport PR #21420 on branch v3.5.x (Enable Python 3.10 wheel building on all systems)
+* :ghpull:`21438`: Backport PR #21427 on branch v3.5.x (Update docstrings of get_{view,data}_interval.)
+* :ghpull:`21437`: Backport PR #21435 on branch v3.5.x (DOC: Fix selection of parameter names in HTML theme)
+* :ghpull:`21420`: Enable Python 3.10 wheel building on all systems
+* :ghpull:`21427`: Update docstrings of get_{view,data}_interval.
+* :ghpull:`21435`: DOC: Fix selection of parameter names in HTML theme
+* :ghpull:`21428`: Backport PR #21422 on branch v3.5.x (More doc reorganization)
+* :ghpull:`21422`: More doc reorganization
+* :ghpull:`21421`: Backport PR #21411 on branch v3.5.x (Document webagg in docs.)
+* :ghpull:`21419`: Backport PR #21251 on branch v3.5.x (DOC: more site re-org)
+* :ghpull:`21411`: Document webagg in docs.
+* :ghpull:`21251`: DOC: more site re-org
+* :ghpull:`21416`: Backport PR #21326 on branch v3.5.x (Add ability to scale BBox with just x or y values)
+* :ghpull:`21418`: Backport PR #21414 on branch v3.5.x (Support pathological tmpdirs in TexManager.)
+* :ghpull:`21410`: Backport PR #20591 on branch v3.5.x (Webagg backend: get rid of tornado)
+* :ghpull:`21414`: Support pathological tmpdirs in TexManager.
+* :ghpull:`21326`: Add ability to scale BBox with just x or y values
+* :ghpull:`20591`: Webagg backend: get rid of tornado
+* :ghpull:`21406`: Backport PR #21212 on branch v3.5.x (Fix set_size_inches on HiDPI and also GTK4)
+* :ghpull:`21405`: Backport PR #21365 on branch v3.5.x (Convert macosx backend to use device_pixel_ratio)
+* :ghpull:`18274`: Improve initial macosx device scale
+* :ghpull:`21212`: Fix set_size_inches on HiDPI and also GTK4
+* :ghpull:`21365`: Convert macosx backend to use device_pixel_ratio
+* :ghpull:`21372`: Backport PR #20708 on branch v3.5.x (Describe possible need for loading the 'lmodern' package when using PGF files)
+* :ghpull:`20708`: Describe possible need for loading the 'lmodern' package when using PGF files
+* :ghpull:`21359`: Add GHA testing whether files were added and deleted in the same PR.
+* :ghpull:`21360`: Backport PR #21335 on branch v3.5.x (DOC: move usage tutorial info to Users guide rst)
+* :ghpull:`21363`: Backport PR #21287 on branch v3.5.x (Inherit more docstrings.)
+* :ghpull:`21361`: Fix flake8 from #21335
+* :ghpull:`21287`: Inherit more docstrings.
+* :ghpull:`21335`: DOC: move usage tutorial info to Users guide rst
+* :ghpull:`21358`: Backport PR #21357 on branch v3.5.x (DOC: remove test from README.rst)
+* :ghpull:`21357`: DOC: remove test from README.rst
+* :ghpull:`21350`: Remove plot_gallery setting from conf.py
+* :ghpull:`21340`: Backport PR #21332 on branch v3.5.x (Fix default value for ``shading`` in``pyplot.pcolormesh`` docstring)
+* :ghpull:`21332`: Fix default value for ``shading`` in``pyplot.pcolormesh`` docstring
+* :ghpull:`21334`: Backport PR #21330 on branch v3.5.x (Fix medical image caption in tutorial)
+* :ghpull:`21329`: Backport PR #21321 on branch v3.5.x (DOC Update description of ax.contour method, resolves #21310)
+* :ghpull:`21330`: Fix medical image caption in tutorial
+* :ghpull:`21321`: DOC Update description of ax.contour method, resolves #21310
+* :ghpull:`21327`: Backport PR #21313 on branch v3.5.x (DOC: Minimal getting started page)
+* :ghpull:`21313`: DOC: Minimal getting started page
+* :ghpull:`21316`: Backport PR #21312 on branch v3.5.x (Update link to Agg website)
+* :ghpull:`21312`: Update link to Agg website
+* :ghpull:`21308`: Backport PR #21307 on branch v3.5.x (Use in-tree builds for PyPy wheels)
+* :ghpull:`21307`: Use in-tree builds for PyPy wheels
+* :ghpull:`21306`: Backport PR #21303 on branch v3.5.x (Pin macOS to 10.15 for wheels)
+* :ghpull:`21305`: Backport PR #21286 on branch v3.5.x (Clarify FigureBase.tight_bbox as different from all other artists.)
+* :ghpull:`21286`: Clarify FigureBase.tight_bbox as different from all other artists.
+* :ghpull:`21302`: Backport PR #21291 on branch v3.5.x (DOC: Bump to the sphinx-gallery release)
+* :ghpull:`21304`: Backport PR #21294 on branch v3.5.x (Disable blitting on GTK4 backends)
+* :ghpull:`21294`: Disable blitting on GTK4 backends
+* :ghpull:`21277`: Backport PR #21263 on branch v3.5.x (Ensure internal FreeType matches Python compile)
+* :ghpull:`21291`: DOC: Bump to the sphinx-gallery release
+* :ghpull:`21296`: Backport PR #21288 on branch v3.5.x (Allow macosx thread safety test on macOS11)
+* :ghpull:`21297`: Backport PR #21293 on branch v3.5.x (Fix snap argument to pcolormesh)
+* :ghpull:`21293`: Fix snap argument to pcolormesh
+* :ghpull:`21288`: Allow macosx thread safety test on macOS11
+* :ghpull:`21279`: Fix freetype wheel building
+* :ghpull:`21292`: Backport PR #21290 on branch v3.5.x (DOC: Fix some lists in animation examples)
+* :ghpull:`21290`: DOC: Fix some lists in animation examples
+* :ghpull:`21284`: Backport PR #21282 on branch v3.5.x (Fix incorrect markup in example.)
+* :ghpull:`21282`: Fix incorrect markup in example.
+* :ghpull:`21281`: Backport PR #21275 on branch v3.5.x (Fix format_cursor_data for values close to float resolution.)
+* :ghpull:`21275`: Fix format_cursor_data for values close to float resolution.
+* :ghpull:`21263`: Ensure internal FreeType matches Python compile
+* :ghpull:`21273`: Backport PR #21269 on branch v3.5.x (Don't use pixelDelta() on X11.)
+* :ghpull:`21269`: Don't use pixelDelta() on X11.
+* :ghpull:`21268`: Backport PR #21236: DOC: Update interactive colormap example
+* :ghpull:`21265`: Backport PR #21264 on branch v3.5.x (DOC: Fix footnote that breaks PDF builds)
+* :ghpull:`21264`: DOC: Fix footnote that breaks PDF builds
+* :ghpull:`21236`: DOC: Update interactive colormap example
+* :ghpull:`21262`: Backport PR #21250 on branch v3.5.x (DOC: Remove examples/README)
+* :ghpull:`21260`: DOC: Fix source links to prereleases
+* :ghpull:`21261`: Backport PR #21240: DOC: Fix source links and flake8 cleanup
+* :ghpull:`21248`: Backport PR #21247 on branch v3.5.x (Fix release notes typos.)
+* :ghpull:`21254`: Backport PR #21249 on branch v3.5.x (Fix some syntax highlights in coding and contributing guide.)
+* :ghpull:`21250`: DOC: Remove examples/README
+* :ghpull:`21249`: Fix some syntax highlights in coding and contributing guide.
+* :ghpull:`20652`: Fixed Comments and Clarification
+* :ghpull:`21240`: DOC: Fix source links and flake8 cleanup
+* :ghpull:`21247`: Fix release notes typos.
+* :ghpull:`21244`: Backport PR #20907 on branch v3.5.x (Move sigint tests into subprocesses)
+* :ghpull:`21245`: Backport PR #21226 on branch v3.5.x (DOC: Adapt some colors in examples)
+* :ghpull:`21226`: DOC: Adapt some colors in examples
+* :ghpull:`20907`: Move sigint tests into subprocesses
+* :ghpull:`21241`: Backport PR #21237 on branch v3.5.x (DOC: Add fill_between to plot_types)
+* :ghpull:`21237`: DOC: Add fill_between to plot_types
+* :ghpull:`21235`: Backport PR #20852 on branch v3.5.x (Prepare docs for 3.5)
+* :ghpull:`20852`: Prepare docs for 3.5
+* :ghpull:`21234`: Backport PR #21221 on branch v3.5.x (Updates to plot types)
+* :ghpull:`21232`: Backport PR #21228 on branch v3.5.x (Small doc nits.)
+* :ghpull:`21233`: Backport PR #21229 on branch v3.5.x (Shorten PdfPages FAQ entry.)
+* :ghpull:`21221`: Updates to plot types
+* :ghpull:`21229`: Shorten PdfPages FAQ entry.
+* :ghpull:`21228`: Small doc nits.
+* :ghpull:`21227`: Backport PR #20730 on branch v3.5.x (DOC: Add a release mode tag)
+* :ghpull:`20730`: DOC: Add a release mode tag
+* :ghpull:`21225`: Backport PR #21223 on branch v3.5.x (Fix nav link for "Usage guide" and remove release/date info from that page)
+* :ghpull:`21223`: Fix nav link for "Usage guide" and remove release/date info from that page
+* :ghpull:`21222`: Backport PR #21211 on branch v3.5.x (updated resources)
+* :ghpull:`21211`: updated resources
+* :ghpull:`21219`: Backport PR #21216 on branch v3.5.x (Use correct confidence interval)
+* :ghpull:`21216`: Use correct confidence interval
+* :ghpull:`21217`: Backport PR #21215 on branch v3.5.x (Fix more edge cases in psd, csd.)
+* :ghpull:`21215`: Fix more edge cases in psd, csd.
+* :ghpull:`21210`: Backport PR #21191 on branch v3.5.x (Fix very-edge case in csd(), plus small additional cleanups.)
+* :ghpull:`21209`: Backport PR #21188 on branch v3.5.x (Rework headers for individual backend docs.)
+* :ghpull:`21191`: Fix very-edge case in csd(), plus small additional cleanups.
+* :ghpull:`21188`: Rework headers for individual backend docs.
+* :ghpull:`21208`: Backport PR #21203 on branch v3.5.x (Rework plot types quiver)
+* :ghpull:`21203`: Rework plot types quiver
+* :ghpull:`21207`: Backport PR #21198 on branch v3.5.x (Update coding_guide.rst)
+* :ghpull:`21206`: Backport PR #21201 on branch v3.5.x (Fix signature of barh() in plot types)
+* :ghpull:`21204`: Backport PR #21193 on branch v3.5.x (Update contributing guide.)
+* :ghpull:`21198`: Update coding_guide.rst
+* :ghpull:`21201`: Fix signature of barh() in plot types
+* :ghpull:`21200`: Backport PR #21196 on branch v3.5.x (Update fonts.rst)
+* :ghpull:`21199`: Backport PR #21026 on branch v3.5.x (Place 3D contourf patches between levels)
+* :ghpull:`21197`: Backport PR #21186 on branch v3.5.x (Fixed typos using codespell. (previous pull request was told not to change the agg files) )
+* :ghpull:`21196`: Update fonts.rst
+* :ghpull:`21026`: Place 3D contourf patches between levels
+* :ghpull:`21186`: Fixed typos using codespell. (previous pull request was told not to change the agg files)
+* :ghpull:`21195`: Backport PR #21189 on branch v3.5.x (Small doc fixes.)
+* :ghpull:`21194`: Backport PR #21192 on branch v3.5.x (Discourage making style changes to extern/.)
+* :ghpull:`21189`: Small doc fixes.
+* :ghpull:`21192`: Discourage making style changes to extern/.
+* :ghpull:`21193`: Update contributing guide.
+* :ghpull:`21184`: Backport PR #21172 on branch v3.5.x (skip QImage leak workaround for PySide2 >= 5.12)
+* :ghpull:`21183`: Backport PR #21081 on branch v3.5.x (Improve docs for to_jshtml())
+* :ghpull:`21172`: skip QImage leak workaround for PySide2 >= 5.12
+* :ghpull:`21181`: Backport PR #21166 on branch v3.5.x (Cleanup contour(f)3d examples.)
+* :ghpull:`21182`: Backport PR #21180 on branch v3.5.x (Remove uninformative ``.. figure::`` titles in docs.)
+* :ghpull:`21081`: Improve docs for to_jshtml()
+* :ghpull:`21180`: Remove uninformative ``.. figure::`` titles in docs.
+* :ghpull:`21166`: Cleanup contour(f)3d examples.
+* :ghpull:`21174`: Backport PR #19343 on branch v3.5.x (Enh improve agg chunks error)
+* :ghpull:`19343`: Enh improve agg chunks error
+* :ghpull:`21171`: Backport PR #20951 on branch v3.5.x ([ENH]: data kwarg support for mplot3d #20912)
+* :ghpull:`21169`: Backport PR #21126 on branch v3.5.x (Deprecate passing formatting parameters positionally to stem())
+* :ghpull:`21126`: Deprecate passing formatting parameters positionally to stem()
+* :ghpull:`21164`: Backport PR #21039 on branch v3.5.x (Fix ``hexbin`` marginals and log scaling)
+* :ghpull:`21039`: Fix ``hexbin`` marginals and log scaling
+* :ghpull:`21160`: Backport PR #21136 on branch v3.5.x (More (minor) plot types gallery fixes.)
+* :ghpull:`21136`: More (minor) plot types gallery fixes.
+* :ghpull:`21158`: Backport PR #21140 on branch v3.5.x (Docstring cleanups around DATA_PARAMETER_PLACEHOLDER.)
+* :ghpull:`21159`: Backport PR #21127 on branch v3.5.x (Simplify argument parsing in stem().)
+* :ghpull:`21157`: Backport PR #21153 on branch v3.5.x (Improve curve_error_band example.)
+* :ghpull:`21156`: Backport PR #21154 on branch v3.5.x (Increase marker size in double_pendulum example.)
+* :ghpull:`21127`: Simplify argument parsing in stem().
+* :ghpull:`21140`: Docstring cleanups around DATA_PARAMETER_PLACEHOLDER.
+* :ghpull:`21153`: Improve curve_error_band example.
+* :ghpull:`21154`: Increase marker size in double_pendulum example.
+* :ghpull:`21149`: Backport PR #21146 on branch v3.5.x (Fix clim handling for pcolor{,mesh}.)
+* :ghpull:`21151`: Backport PR #21141 on branch v3.5.x (Fix DATA_PARAMETER_PLACEHOLDER interpolation for quiver&contour{,f}.)
+* :ghpull:`21150`: Backport PR #21145 on branch v3.5.x (Fix format_cursor_data with nans.)
+* :ghpull:`21141`: Fix DATA_PARAMETER_PLACEHOLDER interpolation for quiver&contour{,f}.
+* :ghpull:`21145`: Fix format_cursor_data with nans.
+* :ghpull:`21146`: Fix clim handling for pcolor{,mesh}.
+* :ghpull:`21148`: Backport PR #21142 on branch v3.5.x (Mac qt ctrl)
+* :ghpull:`21142`: Mac qt ctrl
+* :ghpull:`21144`: Backport PR #21122 on branch v3.5.x (CTRL does not fix aspect in zoom-to-rect mode.)
+* :ghpull:`21143`: Backport PR #19515 on branch v3.5.x (Colorbar axis zoom and pan)
+* :ghpull:`21122`: CTRL does not fix aspect in zoom-to-rect mode.
+* :ghpull:`19515`: Colorbar axis zoom and pan
+* :ghpull:`21138`: Backport PR #21131 on branch v3.5.x (Fix polar() regression on second call failure)
+* :ghpull:`21134`: Backport PR #21124 on branch v3.5.x (Tweak streamplot plot_types example.)
+* :ghpull:`21133`: Backport PR #21114 on branch v3.5.x (Add contour and tricontour plots to plot types)
+* :ghpull:`21132`: Backport PR #21093 on branch v3.5.x (DOC: clarify what we mean by object oriented in pyplot api)
+* :ghpull:`21124`: Tweak streamplot plot_types example.
+* :ghpull:`21114`: Add contour and tricontour plots to plot types
+* :ghpull:`21130`: Backport PR #21129 on branch v3.5.x (Fix decenter of image in gallery thumbnails)
+* :ghpull:`21093`: DOC: clarify what we mean by object oriented in pyplot api
+* :ghpull:`21129`: Fix decenter of image in gallery thumbnails
+* :ghpull:`21125`: Backport PR #21086 on branch v3.5.x (Capitalization fixes in example section titles.)
+* :ghpull:`21128`: Backport PR #21123 on branch v3.5.x (Simplify/uniformize sample data setup in plot_types examples.)
+* :ghpull:`21123`: Simplify/uniformize sample data setup in plot_types examples.
+* :ghpull:`21121`: Backport PR #21111 on branch v3.5.x (Rename section title Gallery -> Examples)
+* :ghpull:`21086`: Capitalization fixes in example section titles.
+* :ghpull:`21120`: Backport PR #21115 on branch v3.5.x (Improve errorbar plot types example)
+* :ghpull:`21119`: Backport PR #21116 on branch v3.5.x (Adapt css so that galleries have four columns)
+* :ghpull:`21116`: Adapt css so that galleries have four columns
+* :ghpull:`21118`: Backport PR #21112 on branch v3.5.x (Fix make_norm_from_scale ``__name__`` when used inline.)
+* :ghpull:`21111`: Rename section title Gallery -> Examples
+* :ghpull:`21112`: Fix make_norm_from_scale ``__name__`` when used inline.
+* :ghpull:`20951`: [ENH]: data kwarg support for mplot3d #20912
+* :ghpull:`21115`: Improve errorbar plot types example
+* :ghpull:`21109`: Backport PR #21104 on branch v3.5.x (Remove the index and module index pages)
+* :ghpull:`21104`: Remove the index and module index pages
+* :ghpull:`21102`: Backport PR #21100 on branch v3.5.x (Cleanup demo_tight_layout.)
+* :ghpull:`21106`: Backport PR #21034 on branch v3.5.x (Make rcParams["backend"] backend fallback check rcParams identity first.)
+* :ghpull:`21105`: Backport PR #21083 on branch v3.5.x (Fix capitalizations)
+* :ghpull:`21103`: Backport PR #21089 on branch v3.5.x (Update sticky_edges docstring to new behavior.)
+* :ghpull:`21034`: Make rcParams["backend"] backend fallback check rcParams identity first.
+* :ghpull:`21083`: Fix capitalizations
+* :ghpull:`21099`: Backport PR #20935 on branch v3.5.x (Add ColormapsRegistry as experimental and add it to pyplot)
+* :ghpull:`21100`: Cleanup demo_tight_layout.
+* :ghpull:`21098`: Backport PR #20903 on branch v3.5.x (Use release-branch version scheme )
+* :ghpull:`20935`: Add ColormapsRegistry as experimental and add it to pyplot
+* :ghpull:`20903`: Use release-branch version scheme
+* :ghpull:`21089`: Update sticky_edges docstring to new behavior.
+* :ghpull:`21084`: Backport PR #20988 on branch v3.5.x (Add HiDPI support in GTK.)
+* :ghpull:`21085`: Backport PR #21082 on branch v3.5.x (Fix layout of sidebar entries)
+* :ghpull:`20345`: ENH: call update_ticks before we return them to the user
+* :ghpull:`21082`: Fix layout of sidebar entries
+* :ghpull:`20988`: Add HiDPI support in GTK.
+* :ghpull:`21080`: Backport PR #19619 on branch v3.5.x (Fix bug in shape assignment)
+* :ghpull:`19619`: Fix bug in shape assignment
+* :ghpull:`21079`: Backport PR #21078 on branch v3.5.x (Cache build dependencies on Circle)
+* :ghpull:`21078`: Cache build dependencies on Circle
+* :ghpull:`21077`: Backport PR #21076 on branch v3.5.x (Break links between twinned axes when removing)
+* :ghpull:`21076`: Break links between twinned axes when removing
+* :ghpull:`21073`: Backport PR #21072 on branch v3.5.x (Use sysconfig directly instead of through distutils)
+* :ghpull:`21072`: Use sysconfig directly instead of through distutils
+* :ghpull:`21071`: Backport PR #21061 on branch v3.5.x (Remove most visible dependencies on distutils.)
+* :ghpull:`21061`: Remove most visible dependencies on distutils.
+* :ghpull:`21070`: Backport PR #21025 on branch v3.5.x (Fix Cairo backends on HiDPI screens)
+* :ghpull:`21065`: Backport PR #20819 on branch v3.5.x (Add CPython 3.10 wheels)
+* :ghpull:`21069`: Backport PR #21051 on branch v3.5.x (set_dashes does not support offset=None anymore.)
+* :ghpull:`21068`: Backport PR #21067 on branch v3.5.x (Remove generated file accidentally added in #20867)
+* :ghpull:`21025`: Fix Cairo backends on HiDPI screens
+* :ghpull:`21051`: set_dashes does not support offset=None anymore.
+* :ghpull:`21067`: Remove generated file accidentally added in #20867
+* :ghpull:`21066`: Backport PR #21060 on branch v3.5.x (Correct the default for fillstyle parameter in MarkerStyle())
+* :ghpull:`20819`: Add CPython 3.10 wheels
+* :ghpull:`21064`: Backport PR #20913 on branch v3.5.x ([Doc] colors.to_hex input & output)
+* :ghpull:`20913`: [Doc] colors.to_hex input & output
+* :ghpull:`21063`: Backport PR #21062 on branch v3.5.x (Fix typo in template of current dev-docs)
+* :ghpull:`21062`: Fix typo in template of current dev-docs
+* :ghpull:`21060`: Correct the default for fillstyle parameter in MarkerStyle()
+* :ghpull:`21058`: Backport PR #21053 on branch v3.5.x (Fix validate_markevery docstring markup.)
+* :ghpull:`21053`: Fix validate_markevery docstring markup.
+* :ghpull:`21052`: Backport PR #20867 on branch v3.5.x ("inner" index reorganization)
+* :ghpull:`21047`: Backport PR #21040 on branch v3.5.x (Document ``handleheight`` parameter of ``Legend`` constructor)
+* :ghpull:`21048`: Backport PR #21044 on branch v3.5.x (Support for forward/back mousebuttons on WX backend)
+* :ghpull:`20867`: "inner" index reorganization
+* :ghpull:`21044`: Support for forward/back mousebuttons on WX backend
+* :ghpull:`21040`: Document ``handleheight`` parameter of ``Legend`` constructor
+* :ghpull:`21045`: Backport PR #21041 on branch v3.5.x (Prefer "none" to "None" in docs, examples and comments.)
+* :ghpull:`21041`: Prefer "none" to "None" in docs, examples and comments.
+* :ghpull:`21037`: Backport PR #20949 on branch v3.5.x (Improve formatting of imshow() cursor data independently of colorbar.)
+* :ghpull:`21035`: Backport PR #21031 on branch v3.5.x (Make date.{converter,interval_multiples} rcvalidators side-effect free.)
+* :ghpull:`20949`: Improve formatting of imshow() cursor data independently of colorbar.
+* :ghpull:`21031`: Make date.{converter,interval_multiples} rcvalidators side-effect free.
+* :ghpull:`21032`: Backport PR #21017 on branch v3.5.x (FIX: Don't subslice lines if non-standard transform)
+* :ghpull:`21030`: Backport PR #20980 on branch v3.5.x (FIX: remove colorbar from list of colorbars on axes)
+* :ghpull:`21029`: Backport PR #21028 on branch v3.5.x (Minor homogeneization of markup for MEP titles.)
+* :ghpull:`21028`: Minor homogeneization of markup for MEP titles.
+* :ghpull:`21022`: Backport PR #20518 on branch v3.5.x ( Support sketch_params in pgf backend)
+* :ghpull:`20518`:  Support sketch_params in pgf backend
+* :ghpull:`21018`: Backport PR #20976 on branch v3.5.x (Separate tick and spine examples)
+* :ghpull:`20976`: Separate tick and spine examples
+* :ghpull:`21014`: Backport PR #20994 on branch v3.5.x (Remove unused icon_filename, window_icon globals.)
+* :ghpull:`21013`: Backport PR #21012 on branch v3.5.x (Use numpydoc for GridSpecFromSubplotSpec.__init__)
+* :ghpull:`20994`: Remove unused icon_filename, window_icon globals.
+* :ghpull:`21012`: Use numpydoc for GridSpecFromSubplotSpec.__init__
+* :ghpull:`21011`: Backport PR #21003 on branch v3.5.x (Deemphasize mpl_toolkits in API docs.)
+* :ghpull:`21003`: Deemphasize mpl_toolkits in API docs.
+* :ghpull:`21002`: Backport PR #20987 on branch v3.5.x (FIX: colorbar with boundary norm, proportional, extend)
+* :ghpull:`20987`: FIX: colorbar with boundary norm, proportional, extend
+* :ghpull:`21000`: Backport PR #20997 on branch v3.5.x (Fix ToolManager + TextBox support.)
+* :ghpull:`20997`: Fix ToolManager + TextBox support.
+* :ghpull:`20985`: Backport PR #20942 on branch v3.5.x (DOC Use 'Axes' instead of 'axes' in axes._base.py)
+* :ghpull:`20983`: Backport PR #20973 on branch v3.5.x (Docstring cleanups.)
+* :ghpull:`20982`: Backport PR #20972 on branch v3.5.x (Cleanup some dviread docstrings.)
+* :ghpull:`20942`: DOC Use 'Axes' instead of 'axes' in axes._base.py
+* :ghpull:`20981`: Backport PR #20975 on branch v3.5.x (Clarify support for 2D coordinate inputs to streamplot.)
+* :ghpull:`20972`: Cleanup some dviread docstrings.
+* :ghpull:`20975`: Clarify support for 2D coordinate inputs to streamplot.
+* :ghpull:`20973`: Docstring cleanups.
+* :ghpull:`20971`: Backport PR #20970 on branch v3.5.x (Build wheels for Apple Silicon.)
+* :ghpull:`20970`: Build wheels for Apple Silicon.
+* :ghpull:`20969`: Backport PR #20321 on branch v3.5.x (Add a GTK4 backend.)
+* :ghpull:`20321`: Add a GTK4 backend.
+* :ghpull:`20966`: Backport PR #19553 on branch v3.5.x (ENH: Adding callbacks to Norms for update signals)
+* :ghpull:`20967`: Backport PR #20965 on branch v3.5.x (BUG: Fix f_back is None handling)
+* :ghpull:`20965`: BUG: Fix f_back is None handling
+* :ghpull:`19553`: ENH: Adding callbacks to Norms for update signals
+* :ghpull:`20960`: Backport PR #20745 on branch v3.5.x (Clean up some Event class docs.)
+* :ghpull:`20745`: Clean up some Event class docs.
+* :ghpull:`20959`: Backport PR #20952 on branch v3.5.x (Redirect to new 3rd party packages page)
+* :ghpull:`20952`: Redirect to new 3rd party packages page
+* :ghpull:`20958`: Backport PR #20956 on branch v3.5.x (Make warning for no-handles legend more explicit.)
+* :ghpull:`20956`: Make warning for no-handles legend more explicit.
+* :ghpull:`20954`: Backport PR #20931 on branch v3.5.x (API: rename draw_no_output to draw_without_rendering)
+* :ghpull:`20931`: API: rename draw_no_output to draw_without_rendering
+* :ghpull:`20934`: Backport PR #20919 on branch v3.5.x (Improve various release notes)"
+* :ghpull:`20948`: Backport PR #20944 on branch v3.5.x (Switch documented deprecations in mathtext by ``__getattr__`` deprecations)
+* :ghpull:`20944`: Switch documented deprecations in mathtext by ``__getattr__`` deprecations
+* :ghpull:`20947`: Backport PR #20941 on branch v3.5.x (Fix variable capitalization in plot types headings)
+* :ghpull:`20941`: Fix variable capitalization in plot types headings
+* :ghpull:`20939`: Backport PR #20937 on branch v3.5.x (Fix documented allowed values for Patch.set_edgecolor.)
+* :ghpull:`20940`: Backport PR #20938 on branch v3.5.x (Fix missorted changelog entry.)
+* :ghpull:`20938`: Fix missorted changelog entry.
+* :ghpull:`20937`: Fix documented allowed values for Patch.set_edgecolor.
+* :ghpull:`20933`: Backport PR #20916 on branch v3.5.x (Improve deleted Animation warning)
+* :ghpull:`20916`: Improve deleted Animation warning
+* :ghpull:`20919`: Improve various release notes
+* :ghpull:`20928`: Backport PR #20889 on branch v3.5.x (Fix clearing selector)
+* :ghpull:`20927`: Backport PR #20924 on branch v3.5.x (Improve ``path.py`` docstrings a bit)
+* :ghpull:`20889`: Fix clearing selector
+* :ghpull:`20922`: Backport PR #20920 on branch v3.5.x (Fix cubic curve code in ``Path.__doc__``)
+* :ghpull:`20925`: Backport PR #20917 on branch v3.5.x (Move installing FAQ to installing page.)
+* :ghpull:`20924`: Improve ``path.py`` docstrings a bit
+* :ghpull:`20917`: Move installing FAQ to installing page.
+* :ghpull:`20920`: Fix cubic curve code in ``Path.__doc__``
+* :ghpull:`20918`: Backport PR #20915 on branch v3.5.x ([Doc] boxplot typo)
+* :ghpull:`20915`: [Doc] boxplot typo
+* :ghpull:`20908`: [Doc] FigureCanvasBase draw
+* :ghpull:`20899`: Backport PR #20885 on branch v3.5.x (Fix broken QApplication init in a test.)
+* :ghpull:`20885`: Fix broken QApplication init in a test.
+* :ghpull:`20894`: Backport PR #20891 on branch v3.5.x (Add dependency link for 3.5)
+* :ghpull:`20893`: Backport PR #20892 on branch v3.5.x (Label pylab as "discouraged" instead of "disapproved")
+* :ghpull:`20891`: Add dependency link for 3.5
+* :ghpull:`20888`: Backport PR #20864 on branch v3.5.x (Add Python 3.10 testing.)
+* :ghpull:`20890`: Backport PR #20693 on branch v3.5.x (Fix setting artists properties of selectors)
+* :ghpull:`20892`: Label pylab as "discouraged" instead of "disapproved"
+* :ghpull:`20693`: Fix setting artists properties of selectors
+* :ghpull:`20864`: Add Python 3.10 testing.
+* :ghpull:`20886`: Backport PR #20884 on branch v3.5.x (Ensure full environment is passed to headless test.)
+* :ghpull:`20884`: Ensure full environment is passed to headless test.
+* :ghpull:`20883`: Make pywin32 optional in Ctrl+C Qt test.
+* :ghpull:`20874`: Add additional external resource.
+* :ghpull:`20875`: Use mpl.colormaps in examples
+* :ghpull:`20586`: Deprecate matplotlib.test()
+* :ghpull:`19892`: Add Figure parameter layout and discourage tight_layout / constrained_layout
+* :ghpull:`20882`: Don't add QtNetwork to the API exported by qt_compat.
+* :ghpull:`20881`: Deprecate some old globals in qt_compat.
+* :ghpull:`13306`: Qt5: SIGINT kills just the mpl window and not the process itself
+* :ghpull:`20876`: DOC: Fix dependency link.
+* :ghpull:`20878`: Use tables for Locator and Formatter docs
+* :ghpull:`20873`: Remove mplutils.cpp; shorten mplutils.h.
+* :ghpull:`20872`: Remove some boilerplate from C extension inits.
+* :ghpull:`20871`: Move setup.cfg to mplsetup.cfg.
+* :ghpull:`20869`: Ignore errors trying to delete make_release_tree.
+* :ghpull:`20868`: Fix qt key mods
+* :ghpull:`20856`: TST: Add unit test to catch recurrences of #20822, #20855
+* :ghpull:`20857`: Propose a less error-prone helper for module-level getattrs.
+* :ghpull:`20840`: Speed up Tkagg blit with Tk_PhotoPutBlock
+* :ghpull:`20805`: Ensure all params are restored after ``reset_ticks``.
+* :ghpull:`20863`: new github citation format
+* :ghpull:`20859`: Allow SubFigure legends
+* :ghpull:`20848`: Fix PyPy wheels and tests
+* :ghpull:`20862`: Fix minor typo in setupext.py
+* :ghpull:`20814`: FIX: Avoid copying source script when ``plot_html_show_source_link`` is False in plot directive
+* :ghpull:`20855`: BUG: __getattr__ must raise AttributeError if name not found (again)
+* :ghpull:`20079`: Prepare axes_divider for simpler(?) indexing-based API.
+* :ghpull:`20444`: Delete _Bracket and update the _Curve to be able to ']->' and '<-['
+* :ghpull:`20812`: Clarify tutorial "Customizing Matplotlib with style sheets and rcParams"
+* :ghpull:`20806`: Deprecate matplotlib.cm.LUTSIZE
+* :ghpull:`20818`: Swap Cap/Cup glyphs when using STIX font.
+* :ghpull:`20849`: Add external resources to devdoc landing page
+* :ghpull:`20846`: Re-re-remove deprecated Qt globals.
+* :ghpull:`18503`: Add a dedicated ColormapRegistry class
+* :ghpull:`20603`: Deprecate unused LassoSelector event handlers.
+* :ghpull:`20679`: Fix selector onselect call when the selector is removed by an "empty" click and add ``ignore_event_outside`` argument
+* :ghpull:`11358`: FIX/ENH: Introduce a monolithic legend handler for Line2D
+* :ghpull:`20699`: FIX/ENH: Introduce a monolithic legend handler for Line2D
+* :ghpull:`20837`: Merge branch v3.4.x
+* :ghpull:`18782`: ENH: allow image to interpolate post RGBA
+* :ghpull:`20829`: TST: neither warned and pytest upstream deprecated this usage
+* :ghpull:`20828`: Increase test timeouts to 60 s to aid slower architectures
+* :ghpull:`20816`: ENH: Add the ability to block callback signals
+* :ghpull:`20646`: Handle NaN values in ``plot_surface`` zsort
+* :ghpull:`20725`: ``Axes3D.plot_surface``: Allow masked arrays and ``NaN`` values
+* :ghpull:`20825`: Fix image triage tool with Qt6
+* :ghpull:`20229`: ENH: Only do constrained layout at draw...
+* :ghpull:`20822`: BUG: __getattr__ must raise AttributeError if name not found
+* :ghpull:`20815`: circle: Switch to next-gen image.
+* :ghpull:`20813`: add doc-link to dufte
+* :ghpull:`20799`: MNT: Rename callbacksSM to callbacks
+* :ghpull:`20803`: Re-remove deprecated Qt globals.
+* :ghpull:`17810`: FIX: don't fail on first show if animation already exhausted
+* :ghpull:`20733`: Deprecate globals using module-level ``__getattr__``.
+* :ghpull:`20788`: FIX: Check for colorbar creation with multi-dimensional alpha
+* :ghpull:`20115`: ENH: pass extra kwargs in FigureBase, SubFigure, Figure to set
+* :ghpull:`20795`: TST/MNT: deprecate unused fixture
+* :ghpull:`20792`: Change legend guide to object oriented approach
+* :ghpull:`20717`: Fix collection offsets
+* :ghpull:`20673`: Point [SOURCE] documents to github
+* :ghpull:`19255`: Support for PyQt6/PySide6.
+* :ghpull:`20772`: Implement remove_rubberband rather than release_zoom.
+* :ghpull:`20783`: Document how to check for the existence of current figure/axes.
+* :ghpull:`20778`: Dedupe handling of mouse buttons in macos backend.
+* :ghpull:`20749`: Cleanup font subsetting code
+* :ghpull:`20775`: Remove some remnants of qt4 support.
+* :ghpull:`20659`: Add HiDPI-related config for mathmpl
+* :ghpull:`20767`: Factor out latex ifpackageloaded pattern.
+* :ghpull:`20769`: Simplify backend_ps._nums_to_str.
+* :ghpull:`20768`: Avoid using gca() in examples.
+* :ghpull:`20766`: Fix line dash offset format in PS output
+* :ghpull:`20706`: Include ``underscore.sty``
+* :ghpull:`20729`: Support vmin/vmax with bins='log' in hexbin
+* :ghpull:`20753`: Deprecate support for case-insensitive scales.
+* :ghpull:`20602`: Merge EllipseSelector example together with RectangleSelector.
+* :ghpull:`20744`: Add an example showing alternate mouse cursors.
+* :ghpull:`20758`: FIX: pass colorbar.set_ticklabels down to long_axis
+* :ghpull:`20759`: Modernize mathtext examples
+* :ghpull:`20739`: Small simplifications to streamplot.
+* :ghpull:`20756`: Add new external resource: Python Graph Gallery
+* :ghpull:`20330`: Fix cla colorbar
+* :ghpull:`20688`: issue form files
+* :ghpull:`20743`: Set the canvas cursor when using a SpanSelector
+* :ghpull:`20391`: Type42 subsetting in PS/PDF
+* :ghpull:`20737`: DOC: new index page
+* :ghpull:`20686`: Fix interaction between make_keyword_only and pyplot generation.
+* :ghpull:`20731`: Improved implementation of Path.copy and deepcopy
+* :ghpull:`20732`: Fix style in ``assert(x)``.
+* :ghpull:`20620`: Move set_cursor from the toolbar to FigureCanvas.
+* :ghpull:`20728`: Fix broken link in 'Contributing' docs
+* :ghpull:`20727`: DOC/TST make circle faster
+* :ghpull:`20726`: DOC: Provide alternative to cbar.patch
+* :ghpull:`20719`: Fix color normalization in plot types scatter
+* :ghpull:`20634`: Implement Type-1 decryption
+* :ghpull:`20633`: Emit non BMP chars as XObjects in PDF
+* :ghpull:`20709`: Fix Circle merge on master branch.
+* :ghpull:`20701`: Small cleanup to GTK backend
+* :ghpull:`20670`: Support markevery on figure-level lines.
+* :ghpull:`20707`: Rename a confusingly named variable in backend_pdf.
+* :ghpull:`20680`: CI: Build merged version on CircleCI
+* :ghpull:`20471`: add interactive colorbar example to gallery
+* :ghpull:`20692`: Small cleanups to hatch.py.
+* :ghpull:`20702`: DOC: add note about contouring algorithm
+* :ghpull:`18869`: Add __version_info__ as a tuple-based version identifier
+* :ghpull:`20689`: Fix some very unlikely leaks in extensions.
+* :ghpull:`20254`: Define FloatingAxes boundary patch in data coordinates.
+* :ghpull:`20682`: Bump codecov/codecov-action from 1 to 2
+* :ghpull:`20544`: Support of different locations for the text fixing cursor of TextBox
+* :ghpull:`20648`: Simplify barchart_demo
+* :ghpull:`20606`: Dynamically generate CbarAxes.
+* :ghpull:`20405`: ENH: expose make_norm_from_scale
+* :ghpull:`20555`: Fix the way to get xs length in set_3d_properties()
+* :ghpull:`20546`: Improve tutorial figures in the new theme
+* :ghpull:`20676`: Fix bounds when initialising ``SpanSelector``
+* :ghpull:`20678`: Clarify comment about backend_pgf.writeln.
+* :ghpull:`20675`: Shorten the ``@deprecated`` docs.
+* :ghpull:`20585`: Rename parameter selectors
+* :ghpull:`20672`: Remove outdated parts of MatplotlibDeprecationWarning docs.
+* :ghpull:`20671`: Standardize description of kwargs in legend_handler.
+* :ghpull:`20669`: Cleanup related to usage of axs
+* :ghpull:`20664`: Reword docs about fallbacks on headless linux.
+* :ghpull:`20663`: Document $MPLSETUPCFG.
+* :ghpull:`20638`: Small simplifications to FixedAxisArtistHelper.
+* :ghpull:`20626`: Simplify curvilinear grid examples.
+* :ghpull:`20088`: fix some http: -> https: URLs
+* :ghpull:`20654`: Remove some usages of plt.setp()
+* :ghpull:`20615`: Font 42 kerning
+* :ghpull:`20636`: Use set_xticks(ticks, labels) instead of a separate set_xticklabels()
+* :ghpull:`20450`: [Doc] Font Types and Font Subsetting
+* :ghpull:`20582`: Fix twoslopenorm colorbar
+* :ghpull:`20632`: Use ticklabels([]) instead of ticklabels('')
+* :ghpull:`20608`: doc/conf.py: if set, use SOURCE_DATE_EPOCH to set copyright year.
+* :ghpull:`20605`: Add \dddot and \ddddot as accents in mathtext
+* :ghpull:`20621`: TST/DOC: just run circle once...
+* :ghpull:`20498`: Adapt the release guide to the new release notes structure
+* :ghpull:`20601`: Hide some ``_SelectorWidget`` state internals.
+* :ghpull:`20600`: Inline _print_svg into its only call site (print_svg).
+* :ghpull:`20589`: Add directional sizing cursors
+* :ghpull:`20481`: Deprecate Colorbar.patch.
+* :ghpull:`20598`: Don't forget to propagate kwargs from print_svgz to print_svg.
+* :ghpull:`19495`: Move svg basename detection down to RendererSVG.
+* :ghpull:`20501`: Colorbar redo again!
+* :ghpull:`20407`: Turn shared_axes, stale_viewlims into {axis_name: value} dicts.
+* :ghpull:`18966`: PR: Remove modality of figure options
+* :ghpull:`19265`: Change styling of slider widgets
+* :ghpull:`20593`: DOC: fix various typos
+* :ghpull:`20374`: Check modification times of included RST files
+* :ghpull:`20569`: Better signature and docstring for Artist.set
+* :ghpull:`20574`: Add tricontourf hatching example
+* :ghpull:`18666`: Remove unused/deprecated ``AVConv`` classes
+* :ghpull:`20514`: Fix example for rcParams['autolimit_mode']
+* :ghpull:`20571`: Switch default ArrowStyle angle values from None to zero.
+* :ghpull:`20510`: Consistent capitalization of section headers
+* :ghpull:`20573`: Move the marker path example into the marker reference
+* :ghpull:`20572`: Clarify allowable backend switches in matplotlib.use().
+* :ghpull:`20538`: Show box/arrowstyle parameters in reference examples.
+* :ghpull:`20515`: Shorten the implementation of bxp().
+* :ghpull:`20562`: More concise how to for subplot adjustment
+* :ghpull:`20570`: Reduce vertical margins in property tables
+* :ghpull:`20563`: Expire deprecation of passing nbins to MaxNLocator in two ways
+* :ghpull:`20561`: Fix limits in plot types example hist(x)
+* :ghpull:`20559`: Fix deprecation of encoding in plot_directive.
+* :ghpull:`20547`: Raise if passed invalid kwargs to set_constrained_layout_pads.
+* :ghpull:`20527`: Factor out DEBUG_TRUETYPE checks in ttconv, & removals of unused defs.
+* :ghpull:`20465`: Remove remaining 3.3 deprecations
+* :ghpull:`20558`: Rename recently introduced parameters in SpanSelector
+* :ghpull:`20535`: Improve the documentation guide
+* :ghpull:`20113`: Interactive span selector improvement
+* :ghpull:`20524`: Dedupe some box anchoring code between legend.py and offsetbox.py.
+* :ghpull:`20451`: Add initial TextBox widget testing
+* :ghpull:`20543`: Deprecate ``@pytest.mark.style(...)``.
+* :ghpull:`20530`: Plot nothing for incompatible 0 shape in x,y data
+* :ghpull:`20367`: Add parse_math in Text and default it False for TextBox
+* :ghpull:`20509`: Cleanup plot types
+* :ghpull:`20537`: Don't sort boxstyles/arrowstyles/etc. alphabetically.
+* :ghpull:`20542`: Fix ScalarFormatter.format_ticks for non-ordered tick locations.
+* :ghpull:`20533`: Rename (N, M) -> (M, N) array-like
+* :ghpull:`20540`: Deprecate :encoding: option to .. plot::, which has no effect since 2011
+* :ghpull:`20541`: Minor fix
+* :ghpull:`20539`: Document defaults in plot_directive.
+* :ghpull:`20536`: Make most of annotation tutorial a comment, and remove figure titles.
+* :ghpull:`20439`: Remove dead code from LGTM alerts.
+* :ghpull:`20528`: Merge subplot_demo into subplot example.
+* :ghpull:`20493`: Cleanup AnchoredOffsetbox-related demos.
+* :ghpull:`20513`: Shorten the bxp docstring.
+* :ghpull:`20507`: Merge subplot_toolbar example into subplots_adjust.
+* :ghpull:`20505`: Add rc_context to customizing tutorial
+* :ghpull:`20449`: Suppress repeated logwarns in postscript output.
+* :ghpull:`20500`: DOC: Add twitter icon and fix logo link
+* :ghpull:`20499`: Simplify plot types pie()
+* :ghpull:`20495`: Fix shape of Z in contour docs
+* :ghpull:`20497`: Remove obsolete footnote on pyside
+* :ghpull:`20485`: DOC: hexbin 'extent' must be 4-tuple of float, not float
+* :ghpull:`20466`: Various cleanups to pgf backend.
+* :ghpull:`20474`: Make lack of support more explicit for non-postscript fonts + usetex.
+* :ghpull:`20476`: give Font a root widget
+* :ghpull:`20477`: remove _master attribute from FigureCanvasTk
+* :ghpull:`19731`: DOC: first pass at switching to pydata theme
+* :ghpull:`20475`: Less pyplot, more OO in docs.
+* :ghpull:`20467`: Small cleanups to sphinxext.plot_directive.
+* :ghpull:`20437`: Use packaging to do version comparisons.
+* :ghpull:`20354`: Merge Colorbar and ColorbarBase.
+* :ghpull:`20464`: tinypages/conf.py doesn't need to manipulate sys.path.
+* :ghpull:`20420`: Add a select_overload helper for signature-overloaded functions.
+* :ghpull:`20460`: Shorten the AnchoredOffsetbox docstring.
+* :ghpull:`20458`: Set the axes of legend text
+* :ghpull:`20438`: Fix deprecation of ``Tick.apply_tickdir``.
+* :ghpull:`20457`: Rename data variables in histogram example.
+* :ghpull:`20442`: Fix dvi baseline detector when ``\usepackage{chemformula}`` is used.
+* :ghpull:`20454`: Tell LGTM to use Python 3 explicitly.
+* :ghpull:`20446`: Make used tex packages consistent between ps and other backends.
+* :ghpull:`20447`: Remove Figure/Axes/Axis deprecations from 3.3
+* :ghpull:`20414`: ENH: add colorbar info to gridspec cbar
+* :ghpull:`20436`: Add missing super __init__ in subclasses
+* :ghpull:`20284`: Use a GtkApplication in GTK backend.
+* :ghpull:`20400`: Make pdftex.map parsing stricter
+* :ghpull:`20292`: Cleanup plot types docs
+* :ghpull:`20445`: Small cleanups to backend_ps.
+* :ghpull:`20399`: Improve example for 3D polygons
+* :ghpull:`20432`: Small doc cleanups.
+* :ghpull:`20398`: Document Axes.get_aspect()
+* :ghpull:`20428`: Deprecate public use of get_path_in_displaycoord.
+* :ghpull:`20397`: Improve hexbin() documentation
+* :ghpull:`20430`: Improve fancyarrow_demo.
+* :ghpull:`20431`: Fix indentation of Arrow/Box/Connection styles tables.
+* :ghpull:`20427`: Fix references in ArrowStyle docstring.
+* :ghpull:`20346`: Clarify/Improve docs on family-names vs generic-families
+* :ghpull:`20410`: PGF: Clip lines/markers to maximum LaTeX dimensions.
+* :ghpull:`20363`: Don't disable path clipping on paths with codes.
+* :ghpull:`20244`: Inline and simplify SubplotToolQt.
+* :ghpull:`20165`: Slightly improve output of dvi debug utilities, and tiny cleanups.
+* :ghpull:`20390`: Cleanup arrow_demo.
+* :ghpull:`20408`: Remove mention of now-removed Encoding class.
+* :ghpull:`20327`: FIX: fix colorbars with no scales
+* :ghpull:`20215`: Quadmesh.set_array validates dimensions
+* :ghpull:`20293`: Simplify font setting in usetex mode
+* :ghpull:`20386`: Merge arrow_simple_demo into arrow_guide.
+* :ghpull:`20348`: codecs.getwriter has simpler lifetime semantics than TextIOWrapper.
+* :ghpull:`20132`: Create release notes page
+* :ghpull:`20331`: Remove Axis, Tick, and Axes deprecations from 3.3
+* :ghpull:`20373`: Handle direction="column" in axes_grid.Grid
+* :ghpull:`20394`: Remove separate section for support of 3d subplots.
+* :ghpull:`20393`: Remove non-informative figure captions.
+* :ghpull:`17453`: Displaying colorbars with specified boundaries correctly
+* :ghpull:`20369`: Switch version scheme to release-branch-semver.
+* :ghpull:`20377`: Cleanup some examples titles & texts.
+* :ghpull:`20378`: Redirect agg_buffer{,_to_array} examples to canvasagg.
+* :ghpull:`20376`: Small improvements to canvasagg example.
+* :ghpull:`20365`: Reorganize a bit text-related rcs in matplotlibrc.
+* :ghpull:`20362`: Add research notice
+* :ghpull:`20353`: Remove incorrect statement about data-kwarg interface.
+* :ghpull:`20343`: Fix exception handling when constructing C-level PathGenerator.
+* :ghpull:`20349`: Fix missing write in TTStreamWriter::printf.
+* :ghpull:`20347`: Fix possible refleak in PathGenerator.
+* :ghpull:`20339`: Cleanup autoscale-related docstrings.
+* :ghpull:`20338`: Fix some indent-related style lints.
+* :ghpull:`20337`: Small unit-related cleanups.
+* :ghpull:`20168`: FIX: clean up re-limiting hysteresis
+* :ghpull:`20336`: Deduplicate color format specification
+* :ghpull:`20334`: Remove need for ConversionInterface to support unitless values.
+* :ghpull:`20020`: For polar plots, report cursor position with correct precision.
+* :ghpull:`20319`: DOC: Tweaks to module API pages
+* :ghpull:`20332`: Quadmesh's default value of shading is now set to 'flat' instead of False
+* :ghpull:`20333`: Better align param comments in ``Legend.__init__`` signature.
+* :ghpull:`20323`: Adding cla and remove to ColorbarAxes
+* :ghpull:`20320`: Fix remaining E265 exceptions.
+* :ghpull:`20318`: DOC: Fix missing refs in what's new pages
+* :ghpull:`20315`: Fix spelling.
+* :ghpull:`20291`: Write data parameter docs as regular parameter not as note (v2)
+* :ghpull:`19908`: Implement get_cursor_data for QuadMesh.
+* :ghpull:`20314`: MAINT: Removing deprecated colorbar functions.
+* :ghpull:`20310`: Add test for font selection by texmanager.
+* :ghpull:`19348`: Make YearLocator a subclass of RRuleLocator
+* :ghpull:`20208`: Rewrite blocking_input to something much simpler.
+* :ghpull:`19033`: Templatize class factories.
+* :ghpull:`20309`: DOC: Spell out args/kwargs in examples/tutorials
+* :ghpull:`20305`: Merge two axisartist examples and point to standard methods.
+* :ghpull:`20306`: Document legend(handles=handles) signature
+* :ghpull:`20311`: Warn if a non-str is passed to an rcParam requiring a str.
+* :ghpull:`18472`: Adding a get_coordinates() method to Quadmesh collections
+* :ghpull:`20032`: axvline()/axvspan() should not update r limits in polar plots.
+* :ghpull:`20304`: Don't mention dviread in the PsfontsMap "missing entry" error message.
+* :ghpull:`20308`: Remove outdated comment re: pgf/windows.
+* :ghpull:`20302`: Further remove use of meshWidth, meshHeight in QuadMesh.
+* :ghpull:`20101`: Fix ``Text`` class bug when ``font`` argument is provided without ``math_fontfamily``
+* :ghpull:`15436`: Allow imshow from float16 data
+* :ghpull:`20299`: Simplify tfm parsing.
+* :ghpull:`20290`: Support imshow(<float16 array>).
+* :ghpull:`20303`: Remove tilde in code links where not necessary
+* :ghpull:`19873`: Allow changing the vertical axis in 3d plots
+* :ghpull:`19558`: Use luatex in --luaonly mode to query kpsewhich.
+* :ghpull:`20301`: Clarify the effect of PolygonCollection properties on Quiver
+* :ghpull:`20235`: Warn user when mathtext font is used for ticks
+* :ghpull:`20237`: Make QuadMesh arguments with defaults keyword_only
+* :ghpull:`20054`: Enh better colorbar axes
+* :ghpull:`20164`: Auto-generate required kwdoc entries into docstring.interpd.
+* :ghpull:`19677`: Convert axis limit units in Qt plot options widget
+* :ghpull:`14913`: Reimplement NonUniformImage, PcolorImage in Python, not C.
+* :ghpull:`20295`: Replace text._wrap_text by _cm_set().
+* :ghpull:`19859`: Write data parameter docs as regular parameter not as note
+* :ghpull:`20273`: Fix cursor with toolmanager on GTK3.
+* :ghpull:`20288`: Small markup fixes in api docs.
+* :ghpull:`20276`: Tiny fixes to mathtext/usetex tutorials.
+* :ghpull:`20084`: Add legend.labelcolor in rcParams
+* :ghpull:`19253`: Improve font spec for SVG font referencing.
+* :ghpull:`20278`: Deprecate public access to certain texmanager attributes.
+* :ghpull:`19375`: Don't composite path-clipped image; forward suppressComposite as needed.
+* :ghpull:`20190`: Simplify handling of uncomparable formats in tests.
+* :ghpull:`20277`: Fix ordering of tex font usepackages.
+* :ghpull:`20279`: Slightly reword intros of mpl_toolkits API docs.
+* :ghpull:`20272`: De-duplicate fonts in LaTeX preamble.
+* :ghpull:`15604`: Deprecate auto-removal of grid by pcolor/pcolormesh.
+* :ghpull:`20193`: Simplify HostAxes.draw and its interaction with ParasiteAxes.
+* :ghpull:`19441`: Make backend_gtk3foo importable on headless environments.
+* :ghpull:`20126`: Simplify font_manager font enumeration logic.
+* :ghpull:`19869`: Factor out x/y lo/hi handling in errorbar.
+* :ghpull:`20173`: Rename (with deprecation) first parameter of grid() from b to visible.
+* :ghpull:`19499`: Fully fold overset/underset into _genset.
+* :ghpull:`20268`: Api pcolorargs deprecation
+* :ghpull:`20264`: Fix blitting selector
+* :ghpull:`20081`: Limit documenting special members to __call__
+* :ghpull:`20245`: MAINT: Removing deprecated ``offset_position`` from Collection
+* :ghpull:`20218`: Update Axes showcase in "Embedding in Tk" example
+* :ghpull:`20019`: Example: Cursor widget with text
+* :ghpull:`20242`: Add comments and format Axis._get_coord_info
+* :ghpull:`20207`: Move axisartist towards using standard Transforms.
+* :ghpull:`20247`: Explicitly reject black autoformatting.
+* :ghpull:`20217`: ci: Export sphinx-gallery run results to CircleCI.
+* :ghpull:`20238`: Clarify docstring of ScalarMappable.set/get_array()
+* :ghpull:`20239`: Style tables in style guide
+* :ghpull:`19894`: Remove deprecated Qt4 backends
+* :ghpull:`19937`: Add washing machine to Axes3D
+* :ghpull:`20233`: Add a Ubuntu 20.04 / Python 3.9 CI run
+* :ghpull:`20227`: Adding an equals method to colormaps
+* :ghpull:`20216`: Documentation Style Guide for contributors
+* :ghpull:`20222`: Fix C coverage
+* :ghpull:`20221`: DOC: clarify that savefig(..., transparent=False) has no effect
+* :ghpull:`20047`: Add labels parameter to set_ticks()
+* :ghpull:`20118`: Convert FontEntry to a data class
+* :ghpull:`19167`: Add support for HiDPI in TkAgg on Windows
+* :ghpull:`18397`: fix cmr10 negative sign in cmsy10 (RuntimeWarning: Glyph 8722 missing)
+* :ghpull:`20170`: SubplotParams.validate-associated fixes.
+* :ghpull:`19467`: Shorten the implementation of violin().
+* :ghpull:`12226`: FIX: pcolor/pcolormesh honour edgecolors kwarg when facecolors is set 'none'
+* :ghpull:`18870`: Expand ScalarMappable.set_array to accept array-like inputs
+* :ghpull:`20073`: Support SubFigures in AxesDivider.
+* :ghpull:`20209`: Deprecate cbook.report_memory.
+* :ghpull:`20211`: Use check_getitem in legend location resolution.
+* :ghpull:`20206`: Cleanup axisartist in preparation for future changes.
+* :ghpull:`20191`: Small simplifications to FloatingAxesBase.
+* :ghpull:`20189`: Add tests for ginput and waitforbuttonpress.
+* :ghpull:`20199`: Make set_marker{edge,face}color(None) more consistent.
+* :ghpull:`16943`: Changing get_cmap to return copies of the registered colormaps.
+* :ghpull:`19483`: MNT: deprecate epoch2num/num2epoch
+* :ghpull:`20201`: Simplify _process_plot_var_args.set_prop_cycle.
+* :ghpull:`20197`: Speedup Line2D marker color setting.
+* :ghpull:`20194`: Fix markup on MEP22.
+* :ghpull:`20198`: Fix validation of Line2D color.
+* :ghpull:`20046`: Deprecation warning
+* :ghpull:`20144`: More tight_layout cleanups
+* :ghpull:`20105`: Shorten Curve arrowstyle implementations.
+* :ghpull:`19401`: Simplify axisartist line clipping.
+* :ghpull:`19260`: Update round fix
+* :ghpull:`20196`: Replaced links to colormap packages with link to third-party packages list in MPL docs
+* :ghpull:`18819`: Usage guide edit
+* :ghpull:`18346`: Soft-deprecate Axes.plot_date()
+* :ghpull:`20187`: Merge v3.4.x up into master
+* :ghpull:`15333`: Enh: DivergingNorm Fair
+* :ghpull:`20188`: Remove 3.3 deprecations in cbook.
+* :ghpull:`20177`: Fix broken test re: polar tick visibility.
+* :ghpull:`20026`: DOC: move third-party packages to new page
+* :ghpull:`19994`: Don't hide shared "x/y"ticklabels for grids of non-rectilinear axes.
+* :ghpull:`20150`: Rename mosaic layout
+* :ghpull:`19369`: Add Artist._cm_set for temporarily setting an Artist property.
+* :ghpull:`15889`: Add svg logo icon
+* :ghpull:`20140`: DOC: make 2x versions of all gallery figures
+* :ghpull:`20155`: Fix wheel builds on CI
+* :ghpull:`19951`: Convert Qhull wrapper to C++ and array_view
+* :ghpull:`19918`: Cleanup some consistency in contour extensions
+* :ghpull:`20153`: Fix wheel builds on CI
+* :ghpull:`19363`: Create box3d example
+* :ghpull:`20129`: Cleanup some "variable assigned but not used" lints.
+* :ghpull:`20107`: Support full-sharex/y in subplot_mosaic.
+* :ghpull:`20094`: Switch _auto_adjust_subplotpars to take rowspan/colspan as input.
+* :ghpull:`16368`: Improve warning for unsupported scripts.
+* :ghpull:`19660`: Allow PolygonSelector points to be removed
+* :ghpull:`16291`: Split Norm and LinearNorm up
+* :ghpull:`20119`: Cleanup flake8 exceptions for examples
+* :ghpull:`20109`: Fix trailing text in doctest-syntax plot_directive.
+* :ghpull:`19538`: Speedup pdftex.map parsing.
+* :ghpull:`20003`: Bump minimum NumPy to 1.17
+* :ghpull:`20074`: Copy-edit axes_grid tutorial.
+* :ghpull:`20124`: Remove workaround unneeded on Py3.7+, which we require now.
+* :ghpull:`20120`: Cleanup subsetting tool.
+* :ghpull:`20108`: Skip back-and-forth between pixels and points in contour code.
+* :ghpull:`20106`: Shorten bracket arrowstyle docs.
+* :ghpull:`20090`: Cleanup anchored_artists, inset_locator docstrings.
+* :ghpull:`20097`: Use nullcontext more as do-nothing context manager.
+* :ghpull:`20095`: Remove 3.3 ticker deprecations
+* :ghpull:`20064`: Expire deprecation of AxesDivider defaulting to zero pads.
+* :ghpull:`20091`: Cleanup tight_layout.
+* :ghpull:`20069`: Don't make VBoxDivider inherit from HBoxDivider.
+* :ghpull:`20078`: Remove some usages of OrderedDict
+* :ghpull:`20077`: Expire Artist.set() property reordering
+* :ghpull:`20070`: Harmonize descriptions of the 'anchor' parameter.
+* :ghpull:`20011`: Move development dependencies to dependencies page
+* :ghpull:`20072`: Improve labeling in simple_axes_divider1 example.
+* :ghpull:`20063`: Deprecate some untested, never used axes_grid1 methods.
+* :ghpull:`20065`: Deprecate AxesDivider.append_axes(..., add_to_figure=True).
+* :ghpull:`20066`: Cleanup axes_divider docstrings, and detail calculations.
+* :ghpull:`20059`: Include left and right titles for labeling axes in qt axes selector.
+* :ghpull:`20052`: Remove axes_grid/axisartist APIs deprecated in Matplotlib 3.3.
+* :ghpull:`18807`: make FancyArrow animatable
+* :ghpull:`15281`: Don't use ImageGrid in demo_text_rotation_mode.
+* :ghpull:`20051`: Remove offsetbox APIs deprecated in Matplotlib 3.3.
+* :ghpull:`14854`: Improved dev installation documentation
+* :ghpull:`18900`: Enh better colorbar axes
+* :ghpull:`20042`: DOC: fix typos
+* :ghpull:`13860`: Deprecate {Locator,Formatter}.set_{{view,data}_interval,bounds}.
+* :ghpull:`20028`: Shorten the repr of scaling transforms.
+* :ghpull:`20027`: Fix axvspan for drawing slices on polar plots.
+* :ghpull:`20024`: Small fixes to latex-related docs.
+* :ghpull:`20023`: Simplify _redo_transform_rel_fig.
+* :ghpull:`20012`: Fix default theta tick locations for non-full-circle polar plots.
+* :ghpull:`20021`: DOC: fix typos
+* :ghpull:`20013`: Move restriction of polar theta scales to ThetaAxis._set_scale.
+* :ghpull:`20010`: DOC: fix heading level for plot_types/stats
+* :ghpull:`20000`: Remove ax fixture from category tests.
+* :ghpull:`20007`: Correct minor typos in legend.py and autoscale.py
+* :ghpull:`20005`: DOC: Fix numpydoc syntax, and parameters names.
+* :ghpull:`19996`: Small simplification to RadialLocator.
+* :ghpull:`19968`: ENH: draw no output
+* :ghpull:`19657`: Allow Selectors to be dragged from anywhere within their patch
+* :ghpull:`19304`: Add legend title font properties
+* :ghpull:`19977`: Fix doc build
+* :ghpull:`19974`: CI: update the ssh key used to push the devdocs
+* :ghpull:`9888`: Add an Annulus patch class
+* :ghpull:`13680`: Update seaborn style
+* :ghpull:`19967`: ENH: add user-facing no-output draw
+* :ghpull:`19765`: ENH: use canvas renderer in draw
+* :ghpull:`19525`: Don't create page transparency group in pdf output (for pdftex compat).
+* :ghpull:`19952`: avoid implicit np.array -> float conversion
+* :ghpull:`19931`: Remove now unused patches to ttconv.
+* :ghpull:`19934`: Deprecate drawtype to RectangleSelector
+* :ghpull:`19941`: Simplify 3D random walk example
+* :ghpull:`19926`: Move custom scales/custom projections docs to module docstrings.
+* :ghpull:`19898`: Remove 3.3 backend deprecations
+* :ghpull:`19901`: Remove 3.3 rcParam deprecations
+* :ghpull:`19900`: Remove 3.3 text deprecations
+* :ghpull:`19922`: Remove 3.3 deprecated modules
+* :ghpull:`19925`: Include projections.geo in api docs.
+* :ghpull:`19924`: Discourage use of imread & improve its docs.
+* :ghpull:`19866`: Switch to asciiart for boxplot illustration.
+* :ghpull:`19912`: Add symlog to figureoptions scalings
+* :ghpull:`19564`: Micro-optimize type1font loading
+* :ghpull:`19623`: FIX: Contour lines rendered incorrectly when closed loops
+* :ghpull:`19902`: Implement ``ArtistList.__[r]add__``.
+* :ghpull:`19904`: Don't set zoom/pan cursor for non-navigatable axes.
+* :ghpull:`19909`: Use unicode when interactively displaying 3d azim/elev.
+* :ghpull:`19905`: pyplot: do not apply kwargs twice in to x/yticklabels
+* :ghpull:`19126`: Move pixel ratio handling into FigureCanvasBase
+* :ghpull:`19897`: DOC/MNT fix make clean for plot_types
+* :ghpull:`19858`: Move Line2D units handling to Axes & deprecate "units finalize" signal.
+* :ghpull:`19889`: Include length in ArtistList repr.
+* :ghpull:`19887`: Fix E265 in test files.
+* :ghpull:`19882`: Use ax.set() for a more compact notation of styling in plot types docs
+* :ghpull:`17231`: Fix errobar order
+* :ghpull:`19703`: DOC:  new plot gallery
+* :ghpull:`19825`: Factor out machinery for running subprocess tk tests.
+* :ghpull:`19872`: Fix unit handling in errorbar for astropy.
+* :ghpull:`19526`: Apply unit conversion early in errorbar().
+* :ghpull:`19855`: Correct handle default backend.
+* :ghpull:`18216`: Combine Axes.{lines,images,collections,patches,text,tables} into single list
+* :ghpull:`19853`: Consistent corner variables names in widgets.py
+* :ghpull:`19575`: Deprecate Text.get_prop_tup.
+* :ghpull:`19810`: Remove JPEG-specific parameters and rcParams.
+* :ghpull:`19666`: Change dictionary to list of tuples to permit duplicate keys
+* :ghpull:`19400`: Fix tk event coordinates in the presence of scrollbars.
+* :ghpull:`19603`: Remove matplotlibrc.template.
+* :ghpull:`19835`: Merge v3.4.x into master
+* :ghpull:`19821`: Hide stderr output from subprocess call in test suite.
+* :ghpull:`19819`: Correct small typos in _axes.py and legend.py
+* :ghpull:`19795`: Remove usetex-related APIs deprecated in Matplotlib 3.3.
+* :ghpull:`19789`: Fix zorder handling for OffsetBoxes and subclasses.
+* :ghpull:`19796`: Expire ````keymap.all_axes````-related deprecations.
+* :ghpull:`19806`: Remove outdated api changes notes.
+* :ghpull:`19801`: Expire deprecation of mathtext.fallback_to_cm.
+* :ghpull:`12744`: Explicit plotorder
+* :ghpull:`19681`: Merge branch 'v3.4.x' into master
+* :ghpull:`18971`: Switch to setuptools_scm.
+* :ghpull:`19727`: DOC: simplify API index
+* :ghpull:`19760`: Speed up _delete_parameter.
+* :ghpull:`19756`: Minor cleanup of documentation guide
+* :ghpull:`19752`: Cleanup backend_tools docstrings, and minor refactorings.
+* :ghpull:`19552`: Remove scalarmappable private update attributes
+* :ghpull:`19728`: Factor out clip-path attr handling in backend_svg.
+* :ghpull:`19540`: Share subplots() label visibility handling with label_outer().
+* :ghpull:`19753`: Cleanup string formatting in backend_pgf.
+* :ghpull:`19750`: Simplify maxdict implementation.
+* :ghpull:`19749`: Remove unused _find_dedent_regex & _dedent_regex.
+* :ghpull:`19751`: Update some matplotlib.lines docstrings.
+* :ghpull:`13072`: ENH: add figure.legend; outside kwarg for better layout outside subplots
+* :ghpull:`19740`: Minor backend docstring fixes.
+* :ghpull:`19734`: Remove unused _fonts attribute in RendererSVG.
+* :ghpull:`19733`: Reword AutoDateFormatter docs.
+* :ghpull:`19718`: Small style fixes to matplotlibrc.template.
+* :ghpull:`19679`: Add inheritance diagram to patches docs
+* :ghpull:`19717`: Don't sort lexicographially entries in SVG output.
+* :ghpull:`19716`: Fix colon placement in issue template.
+* :ghpull:`19704`: Cleanup license page in docs
+* :ghpull:`19487`: Deprecate unused \*args to print_<foo>.
+* :ghpull:`19654`: Dedupe various method implementations using functools.partialmethod.
+* :ghpull:`19655`: Deprecate Tick.apply_tickdir.
+* :ghpull:`19653`: deprecate_privatize_attribute also works for privatizing methods.
+* :ghpull:`19646`: Add angle setter/getter to Rectangle
+* :ghpull:`19659`: Improve docs for rgba conversion
+* :ghpull:`19641`: Fix Bbox.frozen() not copying minposx/minposy
+* :ghpull:`19626`: Clean up E265 in examples.
+* :ghpull:`19622`: Prefer Axes.remove() over Figure.delaxes() in docs.
+* :ghpull:`19621`: Dedupe docstrings of Figure.{get_axes,axes}.
+* :ghpull:`19600`: DOC: better intro for dates.py
+* :ghpull:`19606`: Remove versionadded notes; correct doc link
+* :ghpull:`19620`: Remove suggestion to remove rk4/rk45 integrators from streamplot.
+* :ghpull:`19586`: DOC: more improve date example
+* :ghpull:`19566`: add docstring to ax.quiver
+* :ghpull:`19601`: Handle None entries in sys.modules.
+* :ghpull:`19517`: Deprecate toplevel is_url, URL_REGEX helpers.
+* :ghpull:`19570`: Dedupe part of error message in check_in_list.
+* :ghpull:`14508`: Add force_zorder parameter
+* :ghpull:`19585`: Deprecate trivial helpers in style.core.
+* :ghpull:`19534`: BUG: fill_between with interpolate=True and NaN.
+* :ghpull:`18887`: FIX: Generalize Colorbar Scale Handling
+* :ghpull:`16788`: Adding png image return for inline backend figures with _repr_html_
+
+Issues (187):
+
+* :ghissue:`21518`: [Bug]: Datetime axis with usetex is unclear
+* :ghissue:`21509`: [Bug]: Text sometimes is missing when figure saved to EPS
+* :ghissue:`21569`: [Bug]: AttributeError: 'NoneType' object has no attribute 'dpi' after drawing and removing contours inside artist
+* :ghissue:`21612`: [Bug]: Security.md out of date
+* :ghissue:`21608`: [Doc]: ``ax.voxels`` links to wrong method.
+* :ghissue:`21528`: [Doc]: Outdated QT_API docs
+* :ghissue:`21517`: [Bug]: this example shows ok on matplotlib-3.4.3, but not in matplotlib-3.5.0 master of october 30th
+* :ghissue:`21548`: [Bug]: blocking_input
+* :ghissue:`21552`: [Bug]: eventplot cannot handle multiple datetime-based series
+* :ghissue:`21441`: [Bug]: axes(position = [...]) behavior
+* :ghissue:`10346`: Passing clim as keyword argument to pcolormesh does not change limits.
+* :ghissue:`21480`: [Bug]: Subfigure breaks for some ``Gridspec`` slices when using ``constrained_layout``
+* :ghissue:`20989`: [Bug]: regression with setting ticklabels for colorbars in matplotlib 3.5.0b1
+* :ghissue:`21474`: [Doc]: Suggestion to use PIL.image.open is not a 1:1 replacement for imread
+* :ghissue:`19634`: Multicursor docstring missing a Parameters Section
+* :ghissue:`20847`: [Bug]: Contourf not filling contours.
+* :ghissue:`21300`: [Bug]: zooming in on contour plot gives false extra contour lines
+* :ghissue:`21466`: [Bug]: EPS export shows hidden tick labels when using tex for text rendering
+* :ghissue:`21463`: [Bug]: Plotting lables with Greek latters in math mode produces Parsing error when plt.show() runs
+* :ghissue:`20534`: Document formatting for for sections
+* :ghissue:`21246`: [Doc]: Install info takes up too much room on new front page
+* :ghissue:`21432`: [Doc]: Double clicking parameter name also highlights next item of text
+* :ghissue:`21310`: [Bug]: contour on 3d plot fails if x and y are 1d and different lengths
+* :ghissue:`18213`: Figure out why test_interactive_backend fails on Travis macOS
+* :ghissue:`21090`: [MNT]: Should set_size_inches be updated to use device_pixel_ratio?
+* :ghissue:`13948`: Allow colorbar.ax.set_ylim to set the colorbar limits?
+* :ghissue:`21314`: Inconsistensy in ``pyplot.pcolormesh`` docstring regarding default value for ``shading``
+* :ghissue:`21320`: [Doc]: Incorrect image caption in imshow() example
+* :ghissue:`21311`: [Doc]: dead link for agg
+* :ghissue:`20929`: [Bug]: PyPy Win64 wheels use incorrect version
+* :ghissue:`21202`: [Bug]: python3.7/site-packages/matplotlib/ft2font.so: Undefined symbol "FT_Done_Glyph"
+* :ghissue:`20932`: Qt Ctrl-C broken on windows
+* :ghissue:`21230`: [Doc]: [source] links is devdocs are broken
+* :ghissue:`20906`: 3.5.0b1: ax.contour generates different artists
+* :ghissue:`21161`: [Doc]: In new docs, "Usage guide" entry in the top menu does not link to the "Usage guide"
+* :ghissue:`21016`: [Bug] Error: 'PathCollection' object has no attribute 'do_3d_projection' when doing contourf in 3d with extend = 'both'
+* :ghissue:`21135`: [Doc]: Data parameter description is not always replaced
+* :ghissue:`4132`: Support clim kwarg in pcolor-type plots
+* :ghissue:`21110`: Qt swapping ctrl and cmd on OSX
+* :ghissue:`20912`: [ENH]: data kwarg support for mplot3d
+* :ghissue:`15005`: Cleanup API for setting ticks
+* :ghissue:`21095`: [ENH]: A data-type check is missed in cm.ScalarMappable.set_array()
+* :ghissue:`7711`: Colorbar: changing the norm does not update the Formatter
+* :ghissue:`18925`: Removing axes created by twiny() leads to an error
+* :ghissue:`21057`: [Bug]: distutils deprecation
+* :ghissue:`21024`: [ENH]: Cairo backends do not fully support HiDPI
+* :ghissue:`20811`: Python 3.10 manylinux wheels
+* :ghissue:`11509`: On making the rc-validators function know the rcParam affected instance
+* :ghissue:`20516`: Sketch params ignored when using PGF backend
+* :ghissue:`20963`: [Bug]: broken 'proportional' colorbar when using contourf+cmap+norm+extend
+* :ghissue:`13974`: [DOC] Undocumented behavior in streamplot
+* :ghissue:`16251`: API changes are too hard to find in the rendered docs
+* :ghissue:`20770`: [Doc]: How to replicate behaviour of ``plt.gca(projection=...)``?
+* :ghissue:`17052`: Colorbar update error with clim change in multi_image.py example
+* :ghissue:`4387`: make ``Normalize`` objects notifiy scalar-mappables on changes
+* :ghissue:`20001`: rename fig.draw_no_output
+* :ghissue:`20936`: [Bug]: edgecolor 'auto' doesn't work properly
+* :ghissue:`20909`: [Bug]: Animation error message
+* :ghissue:`6864`: Add release dates to what's new page
+* :ghissue:`20905`: [Bug]: error plotting z-axis array with np.nan -- does not plot with cmap option (surface plot)
+* :ghissue:`20618`: BUG: Lost functionality of interactive selector update
+* :ghissue:`20791`: [Bug]: spines and ticklabels
+* :ghissue:`20723`: Adding a legend to a ``SubFigure`` doesn't work
+* :ghissue:`20637`: PyPy wheels are pinned to v3.3, so pypy-based wheels for latest versions are not available
+* :ghissue:`19160`: pypy failures
+* :ghissue:`20385`: Add ']->' , '<-[' arrowstyles
+* :ghissue:`19016`: Move away from set_ticklabels()
+* :ghissue:`20800`: [Bug]: Setting backend in custom style sheet raises UserWarning
+* :ghissue:`20809`: [Bug]: \Cap and \Cup in mathtext are inconsistent
+* :ghissue:`20762`: [Doc]: Add external resources to devdoc landing page
+* :ghissue:`18490`: Add a method to access the list of registered colormaps
+* :ghissue:`20666`: Interactive SpanSelector no longer notifies when the selector is removed by an "empty" click
+* :ghissue:`20552`: Expose legend's line: ``legline._legmarker`` as public
+* :ghissue:`18391`: Bug? Legend Picking Not Working on Marker
+* :ghissue:`11357`: Unable to retrieve marker from legend handle
+* :ghissue:`2035`: legend marker update bug
+* :ghissue:`19748`: Incorrect & inconsistent coloring in .imshow() with LogNorm
+* :ghissue:`18735`: imshow padding around NaN values
+* :ghissue:`7928`: [Bug] backend_bases.key_press_handler sneakily uses digit keys
+* :ghissue:`20802`: Add ability to disable callbacks temporarily
+* :ghissue:`16470`: Inconsistent Corner Masking w/ plot_surface
+* :ghissue:`12395`: Rendering issue occurs when plotting 3D surfaces at a discontinuity
+* :ghissue:`8222`: matplotlib 3D surface - gaps / holes in surface
+* :ghissue:`4941`: Axes3d plot_surface not supporting masked arrays?
+* :ghissue:`487`: Plotting masked arrays with plot_surface()
+* :ghissue:`20794`: [Doc]: "Bachelor's degrees by gender" example is more or less dufte
+* :ghissue:`20557`: Have ``[Source]`` in api docs link to github
+* :ghissue:`20754`: [Doc]: legend guide should be OO
+* :ghissue:`17770`: animation.save and fig.savefig interfere with each other and raise StopIteration
+* :ghissue:`20785`: [Bug]: Colorbar creation from pcolormesh with cell specific alpha values
+* :ghissue:`19843`: collection with alpha + colorer
+* :ghissue:`20698`: collections.Collections offset improvements
+* :ghissue:`17774`: Cannot make Latex plots when Pandas dataframe has underscore in variable name
+* :ghissue:`19884`: Better document Axes.set()
+* :ghissue:`20760`: [Bug]: subfigure position shifts on y-axis when x kwarg added to supxlabel
+* :ghissue:`20296`: colorbar set_ticklabels - text properties not working
+* :ghissue:`18191`: PostScript Type42 embedding is broken in various ways
+* :ghissue:`11303`: Using fonttype 42 will make the produced PDF size considerably larger when the image has Chinese characters
+* :ghissue:`20735`: The top level of the docs needs modification
+* :ghissue:`20684`: make_keyword_only doesn't work for pyplot-wrapped methods
+* :ghissue:`20635`: DOC: Document patch deprecation
+* :ghissue:`17473`: Issue with appearance of RectangleSelector
+* :ghissue:`20616`: Type 42 chars beyond BMP not displayed in PDF
+* :ghissue:`20658`: MAINT: CircleCI build merged PRs
+* :ghissue:`18312`: Add easily comparable version info to toplevel
+* :ghissue:`20665`: interactive SpanSelector incorrectly forces axes limits to include 0
+* :ghissue:`20614`: Missing kerning in PDFs with Type 42 font
+* :ghissue:`20640`: Column direction breaks label mode L for AxesGrid.
+* :ghissue:`20581`: Change in custom norm colour map display
+* :ghissue:`20595`: Triple and quadruple dot Mathtext accents don't stack or align.
+* :ghissue:`19755`: Avoid showing a black background before the plot is ready with Qt5agg backend
+* :ghissue:`10235`: Why not get the same clear image on a high-resolution screen?
+* :ghissue:`20479`: ColorbarAxes is an imperfect proxy for the Axes passed to Colorbar
+* :ghissue:`18965`: Figure options with qt backend breaks
+* :ghissue:`19256`: New Styling for Sliders
+* :ghissue:`14148`: zorder ignored in mplot3d
+* :ghissue:`20523`: plot_directive is confused by include directives, part 2 (context option)
+* :ghissue:`17860`: Plot directive may be confused by ``..include::``
+* :ghissue:`19431`: Tricontour documentation and examples should be updated in line with contour
+* :ghissue:`20508`: rcParams['axes.autolimit_mode'] = 'round_numbers' is broken
+* :ghissue:`20289`: Simplify font setting in usetex mode
+* :ghissue:`20370`: Test Coverage for TextBox
+* :ghissue:`20522`: Improve 'Writing ReST Pages' section on docs
+* :ghissue:`19259`: Set legend title font properties
+* :ghissue:`20049`: add legend.labelcolor "argument" to mplstyle stylesheet
+* :ghissue:`20452`: Wrong/not useful error message when plotting incompatible x and y
+* :ghissue:`20266`: "$$" can not be displayed by ax.text()
+* :ghissue:`20517`: Wrong shape of Z in documentation of contour
+* :ghissue:`19423`: Switch to pydata-sphinx-theme
+* :ghissue:`20435`: Legend Text's ``axes`` attribute is ``None``
+* :ghissue:`20379`: Change name of variables in histogram example
+* :ghissue:`20440`: Wrong text vertical position with LaTeX enabled
+* :ghissue:`10042`: Inconsistent use of graphicx and color packages in LaTeX preambles
+* :ghissue:`4482`: PGF Backend: "Dimension too large" error while processing log-scale plot
+* :ghissue:`20324`: New colorbar doesn't handle norms without a scale properly...
+* :ghissue:`17508`: Quadmesh.set_array should validate dimensions
+* :ghissue:`20372`: Incorrect axes positioning in axes_grid.Grid with direction='column'
+* :ghissue:`19419`: Dev version hard to check
+* :ghissue:`17310`: Matplotlib git master version fails to pass serveral pytest's tests.
+* :ghissue:`7742`: plot_date() after axhline() doesn't rescale axes
+* :ghissue:`20322`: QuadMesh default for shading inadvertently changed.
+* :ghissue:`9653`: SVG savefig + LaTeX extremely slow on macOS
+* :ghissue:`20099`: ``fontset`` from ``mathtext`` throwing error after setting Text ``font=``
+* :ghissue:`18399`: How to get Quadmesh coordinates
+* :ghissue:`15432`: Add support in matplotlib.pyplot.imshow for float16
+* :ghissue:`20298`: plt.quiver linestyle option doesn't work?.....
+* :ghissue:`19075`: Qt backend's Figure options to support axis units
+* :ghissue:`15039`: NonUniformImage wrong image when using large values for axis
+* :ghissue:`18499`: Saving as a pdf ignores ``set_clip_path`` when there is more than one of them.
+* :ghissue:`15600`: Grid disappear after pcolormesh apply
+* :ghissue:`20080`: API docs currently include entries for class ``__dict__``, ``__module__``, ``__weakref__``
+* :ghissue:`20159`: Zoom in NavigationToolbar2Tk stops working after updating the canvas figure.
+* :ghissue:`17007`: Computer Modern Glyph Error
+* :ghissue:`19494`: Update azure ubuntu images to 18.04, or update texlive in CI
+* :ghissue:`18841`: ScalarMappable should copy its input and allow non-arrays
+* :ghissue:`20121`: Adding cmocean and CMasher to the colormaps tutorial
+* :ghissue:`18154`: Deprecate plot_date()
+* :ghissue:`7413`: Autoscaling has fundamental problems
+* :ghissue:`19627`: Replace use of Python/C API with numpy::array_view in _tri.cpp and qhull_wrap.c
+* :ghissue:`19111`: plot_directive errantly tries to run code
+* :ghissue:`11007`: BUG: Plot directive fails if its content ends with a normal text line (sphinxext)
+* :ghissue:`19929`: Selecting axes when customizing gives <anonymous AxesSubplot>
+* :ghissue:`19578`: bisect very hard with rcParam changes
+* :ghissue:`19506`: Allow saving PDF files without a page group
+* :ghissue:`19906`: symlog is not in scale setting
+* :ghissue:`19568`: Contour lines are rendered incorrectly when closed loops
+* :ghissue:`19890`: Should ArtistList implement ``__add__``?
+* :ghissue:`14405`: ENH: Add HiDPI physical to logical pixel ratio property
+* :ghissue:`17139`: errorbar doesn't follow plot order
+* :ghissue:`18277`: Create new sphinx gallery page for "Chart Types"
+* :ghissue:`15446`: the python script in Catalina dock icon display wrong
+* :ghissue:`19848`: ValueError: Key backend: '' is not a valid value for backend
+* :ghissue:`1622`: zorder is not respected by all parts of ``errorbar``
+* :ghissue:`17247`: Move towards making Axes.lines, Axes.patches, ... read-only views of a single child list.
+* :ghissue:`19842`: UserWarning: "Trying to register the cmap '...' which already exists" is not very helpful.
+* :ghissue:`7962`: pip interprets Matplotlib dev version as stable
+* :ghissue:`19607`: Curves with same label not appearing in Figure options (only the last one)
+* :ghissue:`17584`: NavigationToolbar2Tk behave unexpected when using it in with Tkinter Canvas
+* :ghissue:`19838`: Unexpected behaviour of imshow default interpolation
+* :ghissue:`7650`: anchored_artists don't support zorder argument
+* :ghissue:`19687`: License doc cleanup
+* :ghissue:`19635`: Multicursor updates to events for any axis
+* :ghissue:`17967`: Document how to use mathtext to obtain unicode minus instead of dashes for negative numbers
+* :ghissue:`8519`: Closed figures linger in memory
+* :ghissue:`14175`: RFC: Allow users to force zorder in 3D plots
+* :ghissue:`19464`: Quiver docs don't have a return section
+* :ghissue:`18986`: fill_between issue with interpolation & NaN
diff --git a/doc/users/prev_whats_new/github_stats_3.5.1.rst b/doc/users/prev_whats_new/github_stats_3.5.1.rst
new file mode 100644
index 000000000000..7eb37b769d6c
--- /dev/null
+++ b/doc/users/prev_whats_new/github_stats_3.5.1.rst
@@ -0,0 +1,151 @@
+.. _github-stats-3-5-1:
+
+GitHub statistics for 3.5.1 (Dec 11, 2021)
+==========================================
+
+GitHub statistics for 2021/11/16 (tag: v3.5.0) - 2021/12/11
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 29 issues and merged 84 pull requests.
+The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/67?closed=1>`__
+
+The following 17 authors contributed 123 commits.
+
+* Antony Lee
+* Constantine Evans
+* David Stansby
+* Elliott Sales de Andrade
+* franzhaas
+* Greg Lucas
+* Hansin Ahuja
+* Hood Chatham
+* Jake Lishman
+* Jody Klymak
+* Matthias Bussonnier
+* Ryan May
+* Steffen Rehberg
+* Sven Eschlbeck
+* sveneschlbeck
+* Thomas A Caswell
+* Tim Hoffmann
+
+GitHub issues and pull requests:
+
+Pull Requests (84):
+
+* :ghpull:`21926`: Backport PR #21913 on branch v3.5.x (Make colorbar boundaries work again)
+* :ghpull:`21924`: Backport PR #21861 on branch v3.5.x (DOC: Small formatting improvement to set_markevery)
+* :ghpull:`21913`: Make colorbar boundaries work again
+* :ghpull:`21922`: Backport PR #21753 on branch v3.5.x (DOC: update anatomy of figure)
+* :ghpull:`21861`: DOC: Small formatting improvement to set_markevery
+* :ghpull:`21919`: Fix use_data_coordinates docstring
+* :ghpull:`21912`: Backport PR #21900 on branch v3.5.x (Include test notebooks in test package)
+* :ghpull:`21900`: Include test notebooks in test package
+* :ghpull:`21908`: Backport PR #21834 on branch v3.5.x (MAINT Fix signature qhull version function )
+* :ghpull:`21907`: Backport PR #21905 on branch v3.5.x (Fix image testing decorator in pytest importlib mode)
+* :ghpull:`21906`: Backport PR #21773 on branch v3.5.x (FIX: Reset label of axis to center)
+* :ghpull:`21834`: MAINT Fix signature qhull version function
+* :ghpull:`21905`: Fix image testing decorator in pytest importlib mode
+* :ghpull:`21773`: FIX: Reset label of axis to center
+* :ghpull:`21902`: Backport PR #21884 on branch v3.5.x (FIX: be more careful about coercing unit-full containers to ndarray)
+* :ghpull:`21884`: FIX: be more careful about coercing unit-full containers to ndarray
+* :ghpull:`21899`: Backport PR #21859 on branch v3.5.x (Fix streamline plotting from upper edges of grid)
+* :ghpull:`21859`: Fix streamline plotting from upper edges of grid
+* :ghpull:`21896`: Backport PR #21890 on branch v3.5.x (Drop retina images when building PDF docs)
+* :ghpull:`21891`: Backport PR #21887 on branch v3.5.x (Make figure target links relative)
+* :ghpull:`21883`: Backport PR #21872 on branch v3.5.x (FIX: colorbars with NoNorm)
+* :ghpull:`21872`: FIX: colorbars with NoNorm
+* :ghpull:`21869`: Backport PR #21866 on branch v3.5.x (Shorten some inset_locator docstrings.)
+* :ghpull:`21866`: Shorten some inset_locator docstrings.
+* :ghpull:`21865`: Backport PR #21864 on branch v3.5.x (Delete "Load converter" example)
+* :ghpull:`21864`: Delete "Load converter" example
+* :ghpull:`21857`: Backport PR #21837 on branch v3.5.x (Display example figures in a single column)
+* :ghpull:`21856`: Backport PR #21853 on branch v3.5.x (DOC: Fix Annotation arrow style reference example)
+* :ghpull:`21853`: DOC: Fix Annotation arrow style reference example
+* :ghpull:`21852`: Backport PR #21818 on branch v3.5.x (Fix collections coerce float)
+* :ghpull:`21818`: Fix collections coerce float
+* :ghpull:`21849`: Backport PR #21845 on branch v3.5.x (FIX: bbox subfigures)
+* :ghpull:`21845`: FIX: bbox subfigures
+* :ghpull:`21832`: Backport PR #21820 on branch v3.5.x (Drop setuptools-scm requirement in wheels)
+* :ghpull:`21820`: Drop setuptools-scm requirement in wheels
+* :ghpull:`21829`: Backport PR #21823 on branch v3.5.x (DOC: Misc rst syntax fixes)
+* :ghpull:`21823`: DOC: Misc rst syntax fixes
+* :ghpull:`21826`: Backport PR #21800 on branch v3.5.x (DOC: Update Basic Usage tutorial)
+* :ghpull:`21814`: Manual backport of #21794
+* :ghpull:`21812`: Backport #21641
+* :ghpull:`21810`: Backport PR #21743 on branch v3.5.x (Clarify Annotation arrowprops docs)
+* :ghpull:`21808`: Backport PR #21785 on branch v3.5.x (Fix ConciseDateFormatter offset during zoom)
+* :ghpull:`21807`: Backport PR #21791 on branch v3.5.x (Refix check for manager presence in deprecated blocking_input.)
+* :ghpull:`21806`: Backport PR #21663 on branch v3.5.x (Use standard subplot window in macosx backend)
+* :ghpull:`21785`: Fix ConciseDateFormatter offset during zoom
+* :ghpull:`21804`: Backport PR #21659 on branch v3.5.x (Fix PDF contents)
+* :ghpull:`21791`: Refix check for manager presence in deprecated blocking_input.
+* :ghpull:`21793`: Backport PR #21787 on branch v3.5.x (Fixes row/column mixup in GridSpec height_ratios documentation.)
+* :ghpull:`21787`: Fixes row/column mixup in GridSpec height_ratios documentation.
+* :ghpull:`21778`: Backport PR #21705 on branch v3.5.x (MNT: make print_figure kwarg wrapper support py311)
+* :ghpull:`21779`: Backport PR #21751 on branch v3.5.x (FIX: manual colorbars and tight layout)
+* :ghpull:`21777`: Backport PR #21758 on branch v3.5.x (FIX: Make sure a renderer gets attached to figure after draw)
+* :ghpull:`21751`: FIX: manual colorbars and tight layout
+* :ghpull:`21705`: MNT: make print_figure kwarg wrapper support py311
+* :ghpull:`21758`: FIX: Make sure a renderer gets attached to figure after draw
+* :ghpull:`21775`: Backport PR #21771 on branch v3.5.x (DOC: fix missing ref)
+* :ghpull:`21770`: Backport of PR #21631 on v3.5.x
+* :ghpull:`21765`: Backport PR #21741 on branch v3.5.x (Reduce do_3d_projection deprecation warnings in external artists)
+* :ghpull:`21764`: Backport PR #21762 on branch v3.5.x (FIX: align_x/ylabels)
+* :ghpull:`21741`: Reduce do_3d_projection deprecation warnings in external artists
+* :ghpull:`21762`: FIX: align_x/ylabels
+* :ghpull:`21759`: Backport PR #21757 on branch v3.5.x (Fix doc typo.)
+* :ghpull:`21704`: FIX: deprecation of render keyword to do_3d_projection
+* :ghpull:`21730`: Backport PR #21727 on branch v3.5.x (Doc fix colormap inaccuracy)
+* :ghpull:`21663`: Use standard subplot window in macosx backend
+* :ghpull:`21725`: Backport PR #21681 on branch v3.5.x (Bind subplot_tool more closely to target figure.)
+* :ghpull:`21665`: Include test notebooks in test package
+* :ghpull:`21721`: Backport PR #21720 on branch v3.5.x (Fix compiler configuration priority for FreeType build)
+* :ghpull:`21720`: Fix compiler configuration priority for FreeType build
+* :ghpull:`21715`: Backport PR #21714 on branch v3.5.x (DOC: note renaming of config.cfg.template to mplconfig.cfg.template)
+* :ghpull:`21706`: Backport PR #21703 on branch v3.5.x (Changed the link to the correct citing example)
+* :ghpull:`21691`: Backport PR #21686 on branch v3.5.x (FIX: colorbar for horizontal contours)
+* :ghpull:`21689`: Backport PR #21676 on branch v3.5.x (Fix boundary norm negative)
+* :ghpull:`21686`: FIX: colorbar for horizontal contours
+* :ghpull:`21681`: Bind subplot_tool more closely to target figure.
+* :ghpull:`21676`: Fix boundary norm negative
+* :ghpull:`21685`: Backport PR #21658 on branch v3.5.x (Validate that input to Poly3DCollection is a list of 2D array-like)
+* :ghpull:`21684`: Backport PR #21662 on branch v3.5.x (FIX: put newline in matplotlibrc when setting default backend)
+* :ghpull:`21658`: Validate that input to Poly3DCollection is a list of 2D array-like
+* :ghpull:`21662`: FIX: put newline in matplotlibrc when setting default backend
+* :ghpull:`21651`: Backport PR #21626 on branch v3.5.x (Added the definition of Deprecation and made Deprecation Process clearer)
+* :ghpull:`21626`: Added the definition of Deprecation and made Deprecation Process clearer
+* :ghpull:`21137`: Small cleanups to colorbar.
+
+Issues (29):
+
+* :ghissue:`21909`: [Bug]: Matplotlib is unable to apply the boundaries in the colorbar after updating to 3.5.0
+* :ghissue:`21654`: [Bug]: test_nbagg_01.ipynb not installed
+* :ghissue:`21885`: [Bug]: test decorator breaks with new pytest importlib mode
+* :ghissue:`21772`: [Bug]: cannot reset label of axis to center
+* :ghissue:`21669`: [Bug]: Matplotlib 3.5 breaks unyt integration of error bars
+* :ghissue:`21649`: [Bug]: Startpoints in streamplot fail on right and upper edges
+* :ghissue:`21870`: [Bug]: Colormap + NoNorm only plots one color under ``matplotlib`` 3.5.0
+* :ghissue:`21882`: [Bug]: Colorbar does not work for negative values with contour/contourf
+* :ghissue:`21803`: [Bug]: using ``set_offsets`` on scatter object raises TypeError
+* :ghissue:`21839`: [Bug]: Top of plot clipped when using Subfigures without suptitle
+* :ghissue:`21841`: [Bug]: Wrong tick labels and colorbar of discrete normalizer
+* :ghissue:`21783`: [MNT]: wheel of 3.5.0 apears to depend on setuptools-scm which apears to be unintentional
+* :ghissue:`21733`: [Bug]: Possible bug on arrows in annotation
+* :ghissue:`21749`: [Bug]: Regression on ``tight_layout`` when manually adding axes for colorbars
+* :ghissue:`19197`: Unexpected error after using Figure.canvas.draw on macosx backend
+* :ghissue:`13968`: ``ax.get_xaxis().get_minorticklabels()`` always returns list of empty strings
+* :ghissue:`7550`: Draw not caching with macosx backend
+* :ghissue:`21740`: [Bug]: unavoidable ``DeprecationWarning`` when using ``Patch3D``
+* :ghissue:`15884`: DOC: Error in colormap manipulation tutorial
+* :ghissue:`21648`: [Bug]: subplot parameter window appearing 1/4 size on macosx
+* :ghissue:`21702`: [Doc]: Wrong link to the ready-made citation entry
+* :ghissue:`21683`: [Bug]: add_lines broken for horizontal colorbars
+* :ghissue:`21680`: [MNT]: macosx subplot parameters multiple windows
+* :ghissue:`21679`: [MNT]: Close subplot_parameters window when main figure closes
+* :ghissue:`21671`: [Bug]: 3.5.0 colorbar ValueError: minvalue must be less than or equal to maxvalue
+* :ghissue:`21652`: [Bug]: ax.add_collection3d throws warning Mean of empty slice
+* :ghissue:`21660`: [Bug]: mplsetup.cfg parsing issue
+* :ghissue:`21668`: [Bug]: New plot directive error in 3.5.0
+* :ghissue:`21393`: [Doc]: describe deprecation process more explicitly
diff --git a/doc/users/prev_whats_new/github_stats_3.5.2.rst b/doc/users/prev_whats_new/github_stats_3.5.2.rst
new file mode 100644
index 000000000000..66f53d8e3672
--- /dev/null
+++ b/doc/users/prev_whats_new/github_stats_3.5.2.rst
@@ -0,0 +1,335 @@
+.. _github-stats-3-5-2:
+
+GitHub statistics for 3.5.2 (May 02, 2022)
+==========================================
+
+GitHub statistics for 2021/12/11 (tag: v3.5.1) - 2022/05/02
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 61 issues and merged 222 pull requests.
+The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/69?closed=1>`__
+
+The following 30 authors contributed 319 commits.
+
+* Adeel Hassan
+* Aitik Gupta
+* Andrew Fennell
+* andrzejnovak
+* Antony Lee
+* Clément Phan
+* daniilS
+* David Poznik
+* David Stansby
+* dependabot[bot]
+* Edouard Berthe
+* Elliott Sales de Andrade
+* Greg Lucas
+* Hassan Kibirige
+* Jake VanderPlas
+* Jay Stanley
+* Jody Klymak
+* MAKOMO
+* Matthias Bussonnier
+* Niyas Sait
+* Oscar Gustafsson
+* Pieter P
+* Qijia Liu
+* Quentin Peter
+* Raphael Quast
+* richardsheridan
+* root
+* Steffen Rehberg
+* Thomas A Caswell
+* Tim Hoffmann
+
+GitHub issues and pull requests:
+
+Pull Requests (222):
+
+* :ghpull:`22963`: Backport PR #22957 on branch v3.5.x (fix "is" comparison for np.array)
+* :ghpull:`22951`: Backport PR #22946: FIX: Handle no-offsets in collection datalim
+* :ghpull:`22957`: fix "is" comparison for np.array
+* :ghpull:`22962`: Backport PR #22961 on branch v3.5.x (Raised macosx memory leak threshold)
+* :ghpull:`22961`: Raised macosx memory leak threshold
+* :ghpull:`22945`: FIX: Handle no-offsets in collection datalim
+* :ghpull:`22946`: FIX: Handle no-offsets in collection datalim (alternative)
+* :ghpull:`22944`: Backport PR #22907 on branch v3.5.x (Fix quad mesh cursor data)
+* :ghpull:`22943`: Backport PR #22923 on branch v3.5.x (Fixed _upcast_err docstring and comments in _axes.py)
+* :ghpull:`22907`: Fix quad mesh cursor data
+* :ghpull:`22923`: Fixed _upcast_err docstring and comments in _axes.py
+* :ghpull:`22876`: Backport PR #22560 on branch v3.5.x (Improve pandas/xarray/... conversion)
+* :ghpull:`22942`: Backport PR #22933 on branch v3.5.x (Adjusted wording in pull request guidelines)
+* :ghpull:`22941`: Backport PR #22898 on branch v3.5.x (Only set Tk scaling-on-map for Windows systems)
+* :ghpull:`22935`: Backport PR #22002: Fix TkAgg memory leaks and test for memory growth regressions
+* :ghpull:`22898`: Only set Tk scaling-on-map for Windows systems
+* :ghpull:`22933`: Adjusted wording in pull request guidelines
+* :ghpull:`22002`: Fix TkAgg memory leaks and test for memory growth regressions
+* :ghpull:`22924`: Fix gtk4 incorrect import.
+* :ghpull:`22922`: Backport PR #22904 on branch v3.5.x (Fixed typo in triage acknowledgment)
+* :ghpull:`22904`: Fixed typo in triage acknowledgment
+* :ghpull:`22890`: DOC: add ipykernel to list of optional dependencies
+* :ghpull:`22878`: Backport PR #22871 on branch v3.5.x (Fix year offset not always being added)
+* :ghpull:`22871`: Fix year offset not always being added
+* :ghpull:`22844`: Backport PR #22313 on branch v3.5.x (Fix colorbar exponents)
+* :ghpull:`22560`: Improve pandas/xarray/... conversion
+* :ghpull:`22846`: Backport PR #22284 on branch v3.5.x (Specify font number for TTC font subsetting)
+* :ghpull:`22284`: Specify font number for TTC font subsetting
+* :ghpull:`22845`: Backport PR #22199 on branch v3.5.x (DOC: git:// is deprecated.)
+* :ghpull:`22837`: Backport PR #22807 on branch v3.5.x (Replace quiver dpi callback with reinit-on-dpi-changed.)
+* :ghpull:`22838`: Backport PR #22806 on branch v3.5.x (FIX: callback for subfigure uses parent)
+* :ghpull:`22832`: Backport PR #22767 on branch v3.5.x (Fixed bug in find_nearest_contour)
+* :ghpull:`22767`: Fixed bug in find_nearest_contour
+* :ghpull:`22807`: Replace quiver dpi callback with reinit-on-dpi-changed.
+* :ghpull:`22806`: FIX: callback for subfigure uses parent
+* :ghpull:`22737`: Backport PR #22138: Fix clearing subfigures
+* :ghpull:`22735`: MNT: prefer Figure.clear() as canonical over Figure.clf()
+* :ghpull:`22783`: Backport PR #22732: FIX: maybe improve renderer dance
+* :ghpull:`22748`: Backport PR #22628 on branch v3.5.x (Add RuntimeWarning guard around division-by-zero)
+* :ghpull:`22732`: FIX: maybe improve renderer dance
+* :ghpull:`22764`: Backport PR #22756 on branch v3.5.x (Use system distutils instead of the setuptools copy)
+* :ghpull:`22780`: Backport PR #22766 on branch v3.5.x (FIX: account for constant deprecations in Pillow 9.1)
+* :ghpull:`22781`: Backport PR #22776 on branch v3.5.x (Fix colorbar stealing from a single axes and with panchor=False.)
+* :ghpull:`22782`: Backport PR #22774 on branch v3.5.x (Remove outdated doc for pie chart)
+* :ghpull:`22774`: Remove outdated doc for pie chart
+* :ghpull:`22776`: Fix colorbar stealing from a single axes and with panchor=False.
+* :ghpull:`22766`: FIX: account for deprecations of constant in Pillow 9.1
+* :ghpull:`22756`: Use system distutils instead of the setuptools copy
+* :ghpull:`22750`: Backport PR #22743: Fix configure_subplots with tool manager
+* :ghpull:`22743`: Fix configure_subplots with tool manager
+* :ghpull:`22628`: Add RuntimeWarning guard around division-by-zero
+* :ghpull:`22736`: Backport PR #22719 on branch v3.5.x (Fix incorrect deprecation warning)
+* :ghpull:`22719`: Fix incorrect deprecation warning
+* :ghpull:`22138`: Fix clearing subfigures
+* :ghpull:`22729`: Backport PR #22711 on branch v3.5.x (RangeSlider handle set_val bugfix)
+* :ghpull:`22711`: RangeSlider handle set_val bugfix
+* :ghpull:`22701`: Backport PR #22691 on branch v3.5.x (FIX: remove toggle on QuadMesh cursor data)
+* :ghpull:`22723`: Backport PR #22716 on branch v3.5.x (DOC: set canonical)
+* :ghpull:`22703`: Backport PR #22689 on branch v3.5.x (Fix path_effects to work on text with spaces only)
+* :ghpull:`22689`: Fix path_effects to work on text with spaces only
+* :ghpull:`22691`: FIX: remove toggle on QuadMesh cursor data
+* :ghpull:`22696`: Backport PR #22693 on branch v3.5.x (Remove QuadMesh from mouseover set.)
+* :ghpull:`22693`: Remove QuadMesh from mouseover set.
+* :ghpull:`22647`: Backport PR #22429 on branch v3.5.x (Enable windows/arm64 platform)
+* :ghpull:`22653`: Simplify FreeType version check to avoid packaging
+* :ghpull:`22646`: Manual backport of pr 22635 on v3.5.x
+* :ghpull:`22429`: Enable windows/arm64 platform
+* :ghpull:`22635`: FIX: Handle inverted colorbar axes with extensions
+* :ghpull:`22313`: Fix colorbar exponents
+* :ghpull:`22619`: Backport PR #22611 on branch v3.5.x (FIX: Colorbars check for subplotspec attribute before using)
+* :ghpull:`22618`: Backport PR #22617 on branch v3.5.x (Bump actions/checkout from 2 to 3)
+* :ghpull:`22611`: FIX: Colorbars check for subplotspec attribute before using
+* :ghpull:`22617`: Bump actions/checkout from 2 to 3
+* :ghpull:`22595`: Backport PR #22005: Further defer backend selection
+* :ghpull:`22602`: Backport PR #22596 on branch v3.5.x (Fix backend in matplotlibrc if unset in mplsetup.cfg)
+* :ghpull:`22596`: Fix backend in matplotlibrc if unset in mplsetup.cfg
+* :ghpull:`22597`: Backport PR #22594 on branch v3.5.x (FIX: do not pass dashes to collections in errorbar)
+* :ghpull:`22594`: FIX: do not pass dashes to collections in errorbar
+* :ghpull:`22593`: Backport PR #22559 on branch v3.5.x (fix: fill stairs should have lw=0 instead of edgecolor="none")
+* :ghpull:`22005`: Further defer backend selection
+* :ghpull:`22559`: fix: fill stairs should have lw=0 instead of edgecolor="none"
+* :ghpull:`22592`: Backport PR #22141 on branch v3.5.x (Fix check 1d)
+* :ghpull:`22141`: Fix check 1d
+* :ghpull:`22588`: Backport PR #22445 on branch v3.5.x (Fix loading tk on windows when current process has >1024 modules.)
+* :ghpull:`22445`: Fix loading tk on windows when current process has >1024 modules.
+* :ghpull:`22575`: Backport PR #22572 on branch v3.5.x (Fix issue with unhandled Done exception)
+* :ghpull:`22578`: Backport PR #22038 on branch v3.5.x (DOC: Include alternatives to deprecations in the documentation)
+* :ghpull:`22572`: Fix issue with unhandled Done exception
+* :ghpull:`22557`: Backport PR #22549 on branch v3.5.x (Really fix wheel building on CI)
+* :ghpull:`22549`: Really fix wheel building on CI
+* :ghpull:`22548`: Backport PR #22540 on branch v3.5.x (Reorder text api docs.)
+* :ghpull:`22540`: Reorder text api docs.
+* :ghpull:`22542`: Backport PR #22534 on branch v3.5.x (Fix issue with manual clabel)
+* :ghpull:`22534`: Fix issue with manual clabel
+* :ghpull:`22501`: Backport PR #22499 on branch v3.5.x (FIX: make the show API on webagg consistent with others)
+* :ghpull:`22499`: FIX: make the show API on webagg consistent with others
+* :ghpull:`22500`: Backport PR #22496 on branch v3.5.x (Fix units in quick start example)
+* :ghpull:`22496`: Fix units in quick start example
+* :ghpull:`22493`: Backport PR #22483 on branch v3.5.x (Tweak arrow demo size.)
+* :ghpull:`22492`: Backport PR #22476: FIX: Include (0, 0) offsets in scatter autoscaling
+* :ghpull:`22483`: Tweak arrow demo size.
+* :ghpull:`22476`: FIX: Include (0, 0) offsets in scatter autoscaling
+* :ghpull:`22481`: Backport PR #22479 on branch v3.5.x (adds _enum qualifier for QColorDialog.ShowAlphaChannel. Closes #22471.)
+* :ghpull:`22479`: adds _enum qualifier for QColorDialog.ShowAlphaChannel. Closes #22471.
+* :ghpull:`22475`: Backport PR #22474 on branch v3.5.x (Clarify secondary_axis documentation)
+* :ghpull:`22474`: Clarify secondary_axis documentation
+* :ghpull:`22462`: Backport PR #22458 on branch v3.5.x (Fix Radar Chart Gridlines for Non-Circular Charts)
+* :ghpull:`22456`: Backport PR #22375 on branch v3.5.x (Re-enable cibuildwheel on push)
+* :ghpull:`22375`: Re-enable cibuildwheel on push
+* :ghpull:`22443`: Backport PR #22442 on branch v3.5.x (CI: skip test to work around gs bug)
+* :ghpull:`22442`: CI: skip test to work around gs bug
+* :ghpull:`22441`: Backport PR #22434 on branch v3.5.x (DOC: imbalanced backticks.)
+* :ghpull:`22436`: Backport PR #22431 on branch v3.5.x (Update Scipy intersphinx inventory link)
+* :ghpull:`22438`: Backport PR #22430 on branch v3.5.x (fix method name in doc)
+* :ghpull:`22434`: DOC: imbalanced backticks.
+* :ghpull:`22426`: Backport PR #22398 on branch v3.5.x (Pin coverage to fix CI)
+* :ghpull:`22428`: Backport PR #22368 on branch v3.5.x (Pin dependencies to fix CI)
+* :ghpull:`22427`: Backport PR #22396 on branch v3.5.x (Clarify note in get_cmap())
+* :ghpull:`22396`: Clarify note in get_cmap()
+* :ghpull:`22398`: Pin coverage to fix CI
+* :ghpull:`22368`: Pin dependencies to fix CI
+* :ghpull:`22358`: Backport PR #22349 on branch v3.5.x (Use latex as the program name for kpsewhich)
+* :ghpull:`22349`: Use latex as the program name for kpsewhich
+* :ghpull:`22348`: Backport PR #22346 on branch v3.5.x (Remove invalid ``</input>`` tag in ``animation.HTMLWriter``)
+* :ghpull:`22346`: Remove invalid ``</input>`` tag in ``animation.HTMLWriter``
+* :ghpull:`22328`: Backport PR #22288 on branch v3.5.x (update documentation after #18966)
+* :ghpull:`22288`: update documentation after #18966
+* :ghpull:`22325`: Backport PR #22283: Fixed ``repr`` for ``SecondaryAxis``
+* :ghpull:`22322`: Backport PR #22077 on branch v3.5.x (Fix keyboard event routing in Tk backend (fixes #13484, #14081, and #22028))
+* :ghpull:`22321`: Backport PR #22290 on branch v3.5.x (Respect ``position`` and ``group`` argument in Tk toolmanager add_toolitem)
+* :ghpull:`22318`: Backport PR #22293 on branch v3.5.x (Modify example for x-axis tick labels at the top)
+* :ghpull:`22319`: Backport PR #22279 on branch v3.5.x (Remove Axes sublists from docs)
+* :ghpull:`22327`: Backport PR #22326 on branch v3.5.x (CI: ban coverage 6.3 that may be causing random hangs in fork test)
+* :ghpull:`22326`: CI: ban coverage 6.3 that may be causing random hangs in fork test
+* :ghpull:`22077`: Fix keyboard event routing in Tk backend (fixes #13484, #14081, and #22028)
+* :ghpull:`22290`: Respect ``position`` and ``group`` argument in Tk toolmanager add_toolitem
+* :ghpull:`22293`: Modify example for x-axis tick labels at the top
+* :ghpull:`22311`: Backport PR #22285 on branch v3.5.x (Don't warn on grid removal deprecation if grid is hidden)
+* :ghpull:`22310`: Backport PR #22294 on branch v3.5.x (Add set_cursor method to FigureCanvasTk)
+* :ghpull:`22285`: Don't warn on grid removal deprecation if grid is hidden
+* :ghpull:`22294`: Add set_cursor method to FigureCanvasTk
+* :ghpull:`22309`: Backport PR #22301 on branch v3.5.x (FIX: repositioning axes labels: use get_window_extent instead for spines.)
+* :ghpull:`22301`: FIX: repositioning axes labels: use get_window_extent instead for spines.
+* :ghpull:`22307`: Backport PR #22306 on branch v3.5.x (FIX: ensure that used sub-packages are actually imported)
+* :ghpull:`22306`: FIX: ensure that used sub-packages are actually imported
+* :ghpull:`22283`: Fixed ``repr`` for ``SecondaryAxis``
+* :ghpull:`22275`: Backport PR #22254 on branch v3.5.x (Disable QuadMesh cursor data by default)
+* :ghpull:`22254`: Disable QuadMesh cursor data by default
+* :ghpull:`22269`: Backport PR #22265 on branch v3.5.x (Fix Qt enum access.)
+* :ghpull:`22265`: Fix Qt enum access.
+* :ghpull:`22259`: Backport PR #22256 on branch v3.5.x (Skip tests on the -doc branches)
+* :ghpull:`22238`: Backport PR #22235 on branch v3.5.x (Run wheel builds on PRs when requested by a label)
+* :ghpull:`22241`: Revert "Backport PR #22179 on branch v3.5.x (FIX: macosx check case-insensitive app name)"
+* :ghpull:`22248`: Backport PR #22206 on branch v3.5.x (Improve formatting of "Anatomy of a figure")
+* :ghpull:`22235`: Run wheel builds on PRs when requested by a label
+* :ghpull:`22206`: Improve formatting of "Anatomy of a figure"
+* :ghpull:`22220`: Backport PR #21833: Enforce backport conditions on v*-doc branches
+* :ghpull:`22219`: Backport PR #22218 on branch v3.5.x (Fix typo in ``tutorials/intermediate/arranging_axes.py``)
+* :ghpull:`22218`: Fix typo in ``tutorials/intermediate/arranging_axes.py``
+* :ghpull:`22217`: Backport PR #22209 on branch v3.5.x (DOC: Document default join style)
+* :ghpull:`22209`: DOC: Document default join style
+* :ghpull:`22214`: Backport PR #22208 on branch v3.5.x (Stop sorting artists in Figure Options dialog)
+* :ghpull:`22215`: Backport PR #22177 on branch v3.5.x (Document ArtistList)
+* :ghpull:`22177`: Document ArtistList
+* :ghpull:`22208`: Stop sorting artists in Figure Options dialog
+* :ghpull:`22199`: DOC: git:// is deprecated.
+* :ghpull:`22210`: Backport PR #22202 on branch v3.5.x (PR: Fix merge of 18966)
+* :ghpull:`22202`: PR: Fix merge of 18966
+* :ghpull:`22201`: Backport PR #22053 on branch v3.5.x (DOC: Document default cap styles)
+* :ghpull:`22053`: DOC: Document default cap styles
+* :ghpull:`22195`: Backport PR #22179 on branch v3.5.x (FIX: macosx check case-insensitive app name)
+* :ghpull:`22192`: Backport PR #22190 on branch v3.5.x (DOC: Fix upstream URL for merge in CircleCI)
+* :ghpull:`22188`: Backport PR #22187 on branch v3.5.x (Fix typo in ``axhline`` docstring)
+* :ghpull:`22187`: Fix typo in ``axhline`` docstring
+* :ghpull:`22185`: Backport PR #22184 on branch v3.5.x (Removed dev from 3.10-version)
+* :ghpull:`22186`: Backport PR #21943 on branch v3.5.x (DOC: explain too many ticks)
+* :ghpull:`21943`: DOC: explain too many ticks
+* :ghpull:`22184`: Removed dev from 3.10-version
+* :ghpull:`22168`: Backport PR #22144 on branch v3.5.x (Fix cl subgridspec)
+* :ghpull:`22144`: Fix cl subgridspec
+* :ghpull:`22155`: Backport PR #22082 on branch v3.5.x (Update both zoom/pan states on wx when triggering from keyboard.)
+* :ghpull:`22082`: Update both zoom/pan states on wx when triggering from keyboard.
+* :ghpull:`22153`: Backport PR #22147 on branch v3.5.x (Fix loading user-defined icons for Tk toolbar)
+* :ghpull:`22152`: Backport PR #22135 on branch v3.5.x (Fix loading user-defined icons for Qt plot window)
+* :ghpull:`22151`: Backport PR #22078 on branch v3.5.x (Prevent tooltips from overlapping buttons in NavigationToolbar2Tk (fixes issue mentioned in #22028))
+* :ghpull:`22135`: Fix loading user-defined icons for Qt plot window
+* :ghpull:`22078`: Prevent tooltips from overlapping buttons in NavigationToolbar2Tk (fixes issue mentioned in #22028)
+* :ghpull:`22147`: Fix loading user-defined icons for Tk toolbar
+* :ghpull:`22136`: Backport PR #22132 on branch v3.5.x (TST: Increase fp tolerances for some images)
+* :ghpull:`22132`: TST: Increase fp tolerances for some images
+* :ghpull:`22121`: Backport PR #22116 on branch v3.5.x (FIX: there is no add_text method, fallback to add_artist)
+* :ghpull:`22117`: Backport PR #21860 on branch v3.5.x (DOC: Update style sheet reference)
+* :ghpull:`22116`: FIX: there is no add_text method, fallback to add_artist
+* :ghpull:`22038`: DOC: Include alternatives to deprecations in the documentation
+* :ghpull:`22074`: Backport PR #22066 on branch v3.5.x (FIX: Remove trailing zeros from offset significand)
+* :ghpull:`22106`: Backport PR #22089: FIX: squash memory leak in colorbar
+* :ghpull:`22089`: FIX: squash memory leak in colorbar
+* :ghpull:`22101`: Backport PR #22099 on branch v3.5.x (CI: Disable numpy avx512 instructions)
+* :ghpull:`22099`: CI: Disable numpy avx512 instructions
+* :ghpull:`22095`: Backport PR #22083 on branch v3.5.x (Fix reference to Matplotlib FAQ in doc/index.rst)
+* :ghpull:`22066`: FIX: Remove trailing zeros from offset significand
+* :ghpull:`22072`: Backport PR #22071 on branch v3.5.x (Fix a small typo in docstring ("loation" --> "location"))
+* :ghpull:`22071`: Fix a small typo in docstring ("loation" --> "location")
+* :ghpull:`22070`: Backport PR #22069 on branch v3.5.x ([Doc] Fix typo in ``units.py`` documentation example)
+* :ghpull:`22069`: [Doc] Fix typo in ``units.py`` documentation example
+* :ghpull:`22067`: Backport PR #22064 on branch v3.5.x (DOC: Clarify y parameter in Axes.set_title)
+* :ghpull:`22064`: DOC: Clarify y parameter in Axes.set_title
+* :ghpull:`22049`: Backport PR #22048 on branch v3.5.x (Document how to prevent TeX from treating ``&``, ``#`` as special.)
+* :ghpull:`22048`: Document how to prevent TeX from treating ``&``, ``#`` as special.
+* :ghpull:`22047`: Backport PR #22044 on branch v3.5.x (Get correct source code link for decorated functions)
+* :ghpull:`22044`: Get correct source code link for decorated functions
+* :ghpull:`22024`: Backport PR #22009 on branch v3.5.x (FIX: Prevent set_alpha from changing color of legend patch)
+* :ghpull:`22009`: FIX: Prevent set_alpha from changing color of legend patch
+* :ghpull:`22019`: Backport PR #22018 on branch v3.5.x (BUG: fix handling of zero-dimensional arrays in cbook._reshape_2D)
+* :ghpull:`22018`: BUG: fix handling of zero-dimensional arrays in cbook._reshape_2D
+* :ghpull:`21996`: Backport PR #21990 on branch v3.5.x (Fix rubberbanding on wx+py3.10.)
+* :ghpull:`21990`: Fix rubberbanding on wx+py3.10.
+* :ghpull:`21987`: Backport PR #21862 on branch v3.5.x (DOC: Simplify markevery demo)
+* :ghpull:`21969`: Backport PR #21948 on branch v3.5.x (Distinguish AbstractMovieWriter and MovieWriter in docs.)
+* :ghpull:`21948`: Distinguish AbstractMovieWriter and MovieWriter in docs.
+* :ghpull:`21953`: Backport PR #21946 on branch v3.5.x (DOC: fix interactive to not put Event Handling and Interactive Guide …)
+* :ghpull:`21946`: DOC: fix interactive to not put Event Handling and Interactive Guide …
+
+Issues (61):
+
+* :ghissue:`22954`: [Doc]: v3.5.1 github stats are missing
+* :ghissue:`22959`: [MNT]: macos-latest memory leak over threshold
+* :ghissue:`22921`: [Bug]: Regression in animation from #22175
+* :ghissue:`22908`: [Bug]: QuadMesh get_cursor_data errors if no array is set
+* :ghissue:`21901`: Suggested clarification of comments in errorbar helpers
+* :ghissue:`22932`: [Doc]: small edits to the Pull request guidelines
+* :ghissue:`22858`: [Bug]: FigureCanvasTkAgg call creates memory leak
+* :ghissue:`20490`: Memory leaks on matplotlib 3.4.2 (and 3.4.0)
+* :ghissue:`22900`: [Doc]:  Typo in triage acknowledgment
+* :ghissue:`22341`: [Bug]: GridSpec or related change between 3.4.3 and 3.5.1
+* :ghissue:`22472`: [Bug]: ConciseDateFormatter not showing year anywhere when plotting <12 months
+* :ghissue:`22874`: [Bug]: Textbox doesn't accept input
+* :ghissue:`21893`: [Bug]: ``backend_pdf`` gives ``TTLibError`` with ``pdf.fonttype : 42``
+* :ghissue:`22840`: [Bug]: Blank output EPS file when using latex and figure.autolayout = True
+* :ghissue:`22762`: [Bug]: Issue with find_nearest_contour in contour.py
+* :ghissue:`22823`: [Bug]: Changing Linestyle in plot window swaps some plotted lines
+* :ghissue:`22804`: [Bug]: Quiver not working with subfigure?
+* :ghissue:`22673`: [Bug]: tight_layout (version 3.5+)
+* :ghissue:`21930`: [Bug]: EPS savefig messed up by 'figure.autolayout' rcParam on 3.5.0
+* :ghissue:`22753`: windows CI broken on azure
+* :ghissue:`22088`: [Bug]: Tool Manager example broken
+* :ghissue:`22624`: [Bug]: invalid value encountered with 'ortho' projection mode
+* :ghissue:`22640`: [Bug]: Confusing deprecation warning when empty data passed to axis with category units
+* :ghissue:`22137`: [Bug]: Cannot clear figure of subfigures
+* :ghissue:`22706`: [Bug]: RangeSlider.set_val does not move the slider (only poly and value)
+* :ghissue:`22727`: MAtplolib pan and zoom dead slow on new PC
+* :ghissue:`22687`: [Bug]: Empty text or text with a newline at either end + path_effects crashes
+* :ghissue:`22694`: Revert set_show_cursor_data
+* :ghissue:`22520`: [Bug]: Slow lasso selector over QuadMesh collection
+* :ghissue:`22648`: Add packaging to setup_requires?
+* :ghissue:`22052`: [Bug]: invert_yaxis function cannot invert the "over value" in colorbar axes
+* :ghissue:`22576`: [Bug]: ``inset_axes`` colorbar + ``tight_layout`` raises ``AttributeError``
+* :ghissue:`22590`: [Bug]: ValueError: Do not know how to convert "list" to dashes; when using axes errorbar.
+* :ghissue:`21998`: [Bug]: Working with PyQt5, the different import order will make different result.
+* :ghissue:`22330`: [Bug]: possible regression with pandas 1.4 with plt.plot when using a single column dataframe as the x argument
+* :ghissue:`22125`: [Bug]: ``plt.plot`` thinks ``pandas.Series`` is 2-dimensional when nullable data type is used
+* :ghissue:`22378`: [Bug]: TkAgg fails to find Tcl/Tk libraries in Windows for processes with a large number of modules loaded
+* :ghissue:`22577`: [Bug]: Erroneous deprecation warning help message
+* :ghissue:`21798`: [Bug]: Unhandled _get_renderer.Done exception in wxagg backend
+* :ghissue:`22532`: [Issue]: Manually placing contour labels using ``clabel`` not working
+* :ghissue:`22470`: [Bug]: Subsequent scatter plots work incorrectly
+* :ghissue:`22471`: [Bug]: formlayout fails on PyQt6 due to the unqualified enum ShowAlphaChannel in class ColorButton
+* :ghissue:`22473`: [Bug]: Secondary axis does not accept python builtins for transform
+* :ghissue:`22384`: [Bug]: Curve styles gets mixed up when edited in the Curves Tab of Figure Options (Edit Axis)
+* :ghissue:`22028`: [Bug]: mpl with py3.10.1 - Interactive figures - Constrain pan/zoom to x/y axis not work
+* :ghissue:`13484`: Matplotlib keymap stop working after pressing tab
+* :ghissue:`20130`: tk toolmanager add_toolitem fails to add tool to group other than the last one
+* :ghissue:`21723`: [Bug]: Some styles trigger pcolormesh grid deprecation
+* :ghissue:`22300`: [Bug]: Saving a fig with a colorbar using a ``TwoSlopeNorm`` sometimes results in 'posx and posy should be finite values'
+* :ghissue:`22305`: [Bug]: Import Error in Matplotlib 3.5.1
+* :ghissue:`21917`: [Bug]: pcolormesh is not responsive in Matplotlib 3.5
+* :ghissue:`22094`: [Doc]: No documentation on ArtistList
+* :ghissue:`21979`: [Doc]: Clarify default capstyle
+* :ghissue:`22143`: [Bug]: ``constrained_layout`` merging similar subgrids
+* :ghissue:`22131`: [Bug]: png icon image fails to load for manually defined tool buttons
+* :ghissue:`22093`: [Bug]: AttributeError: 'AxesSubplot' object has no attribute 'add_text'
+* :ghissue:`22085`: [Bug]: Memory leak with colorbar.make_axes
+* :ghissue:`22065`: [Bug]: Additive offset with trailing zeros
+* :ghissue:`15493`: common_texification misses & (ampersand)
+* :ghissue:`22039`: [Doc]: [source] link for deprecated functions leads to _api/deprecation.py
+* :ghissue:`22016`: [Bug]: matplotlib 3.3 changed how plt.hist handles iterables of zero-dimensional arrays.
diff --git a/doc/users/prev_whats_new/github_stats_3.5.3.rst b/doc/users/prev_whats_new/github_stats_3.5.3.rst
new file mode 100644
index 000000000000..bafd6d5c27eb
--- /dev/null
+++ b/doc/users/prev_whats_new/github_stats_3.5.3.rst
@@ -0,0 +1,127 @@
+.. _github-stats-3-5-3:
+
+GitHub statistics for 3.5.3 (Aug 10, 2022)
+==========================================
+
+GitHub statistics for 2022/05/03 (tag: v3.5.2) - 2022/08/10
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 19 issues and merged 66 pull requests.
+The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/71?closed=1>`__
+
+The following 20 authors contributed 99 commits.
+
+* Antony Lee
+* Biswapriyo Nath
+* David Gilbertson
+* DWesl
+* Elliott Sales de Andrade
+* GavinZhang
+* Greg Lucas
+* Jody Klymak
+* Kayran Schmidt
+* Matthew Feickert
+* Nickolaos Giannatos
+* Oscar Gustafsson
+* Ruth Comer
+* SaumyaBhushan
+* Scott Jones
+* Scott Shambaugh
+* tfpf
+* Thomas A Caswell
+* Tim Hoffmann
+* wsykala
+
+GitHub issues and pull requests:
+
+Pull Requests (66):
+
+* :ghpull:`23591`: Backport PR #23549 on branch v3.5.x (Don't clip colorbar dividers)
+* :ghpull:`23593`: STY: Fix whitespace error from new flake8
+* :ghpull:`23549`: Don't clip colorbar dividers
+* :ghpull:`23528`: Backport PR #23523 on branch v3.5.x (TST: Update Quantity test class)
+* :ghpull:`23523`: TST: Update Quantity test class
+* :ghpull:`23508`: Add explicit registration of units in examples
+* :ghpull:`23515`: Backport PR #23462: Fix AttributeError for pickle load of Figure class
+* :ghpull:`23518`: Backport PR #23514 on branch v3.5.x (Fix doc build)
+* :ghpull:`23517`: Backport PR #23511 on branch v3.5.x (supporting IBM i OS)
+* :ghpull:`23511`: supporting IBM i OS
+* :ghpull:`23462`: Fix AttributeError for pickle load of Figure class
+* :ghpull:`23488`: Backport PR #23066 on branch v3.5.x (BLD: Define PyErr_SetFromWindowsErr on Cygwin.)
+* :ghpull:`23066`: BLD: Define PyErr_SetFromWindowsErr on Cygwin.
+* :ghpull:`23479`: Pin setuptools_scm on v3.5.x
+* :ghpull:`22998`: Backport PR #22987 on branch v3.5.x (CI: bump test limit from tkagg on osx)
+* :ghpull:`23478`: Backport PR #23476: FIX: reset to original DPI in getstate
+* :ghpull:`23476`: FIX: reset to original DPI in getstate
+* :ghpull:`23458`: Backport PR #23445 on branch v3.5.x (Compare thread native ids when checking whether running on main thread.)
+* :ghpull:`23440`: Backport PR #23430 on branch v3.5.x (Fix divide by 0 runtime warning)
+* :ghpull:`23430`: Fix divide by 0 runtime warning
+* :ghpull:`23344`: Backport PR #23333: Fix errorbar handling of nan.
+* :ghpull:`23333`: Fix errorbar handling of nan.
+* :ghpull:`23338`: Backport PR #23278: Remove internal use of get/set dpi
+* :ghpull:`23331`: Backport PR #22835 on branch v3.5.x (Fix BoundaryNorm cursor data output)
+* :ghpull:`22835`: Fix BoundaryNorm cursor data output
+* :ghpull:`23292`: Backport PR #23232 on branch v3.5.x (Fix passing stem markerfmt positionally when locs are not given)
+* :ghpull:`23275`: Backport PR #23260 on branch v3.5.x (Fix Colorbar extend patches to have correct alpha)
+* :ghpull:`23312`: Pin to an older pydata-sphinx-theme for v3.5.x
+* :ghpull:`23278`: Remove internal use of get/set dpi
+* :ghpull:`23232`: Fix passing stem markerfmt positionally when locs are not given
+* :ghpull:`22865`: Fix issue with colorbar extend and drawedges
+* :ghpull:`23260`: Fix Colorbar extend patches to have correct alpha
+* :ghpull:`23245`: Backport PR #23144 on branch v3.5.x (Only import setuptools_scm when we are in a matplotlib git repo)
+* :ghpull:`23144`: Only import setuptools_scm when we are in a matplotlib git repo
+* :ghpull:`23242`: Backport PR #23203 on branch v3.5.x (Honour ``panchor`` keyword for colorbar on subplot)
+* :ghpull:`23203`: Honour ``panchor`` keyword for colorbar on subplot
+* :ghpull:`23228`: Backport PR #23209 on branch v3.5.x (Fix the vertical alignment of overunder symbols.)
+* :ghpull:`23209`: Fix the vertical alignment of overunder symbols.
+* :ghpull:`23184`: Backport PR #23174: Make sure SubFigure has _cachedRenderer
+* :ghpull:`23194`: Backport PR #23095: Try to unbreak CI by xfailing OSX Tk tests
+* :ghpull:`23113`: Backport PR #23057 and #23106
+* :ghpull:`23185`: Backport PR #23168 on branch v3.5.x (Corrected docstring for artist.Artist.set_agg_filter)
+* :ghpull:`23168`: Corrected docstring for artist.Artist.set_agg_filter
+* :ghpull:`23174`: Make sure SubFigure has _cachedRenderer
+* :ghpull:`23110`: Tweak subprocess_run_helper.
+* :ghpull:`23138`: Backport PR #23137 on branch v3.5.x (DOC fix typo)
+* :ghpull:`23137`: DOC fix typo
+* :ghpull:`23125`: Backport PR #23122 on branch v3.5.x (Remove redundant rcparam default)
+* :ghpull:`23120`: Backport PR #23115 on branch v3.5.x (DOC fixed duplicate/wrong default)
+* :ghpull:`23095`: Try to unbreak CI by xfailing OSX Tk tests
+* :ghpull:`23106`: Reuse subprocess_run_helper in test_pylab_integration.
+* :ghpull:`23112`: Backport PR #23111 on branch v3.5.x (Fix _g_sig_digits for value<0 and delta=0.)
+* :ghpull:`23111`: Fix _g_sig_digits for value<0 and delta=0.
+* :ghpull:`23057`: FIX: ensure switching the backend installs repl hook
+* :ghpull:`23075`: Backport PR #23069 on branch v3.5.x (TST: forgive more failures on pyside2 / pyside6 cross imports)
+* :ghpull:`23069`: TST: forgive more failures on pyside2 / pyside6 cross imports
+* :ghpull:`22981`: Backport PR #22979 on branch v3.5.x (Skip additional backend tests on import error)
+* :ghpull:`23064`: Backport PR #22975 on branch v3.5.x (MNT: fix __array__ to numpy)
+* :ghpull:`22975`: MNT: fix __array__ to numpy
+* :ghpull:`23058`: Backport PR #23051 on branch v3.5.x (Fix variable initialization due to jump bypassing it)
+* :ghpull:`23051`: Fix variable initialization due to jump bypassing it
+* :ghpull:`23010`: Backport PR #23000 on branch v3.5.x (Additional details on VS install on installation page)
+* :ghpull:`22995`: Backport PR #22994 on branch v3.5.x (Docs: ignore >>> on code prompts on documentation prompts)
+* :ghpull:`23001`: CI: Add trivial pre-commit.ci config to avoid CI failure
+* :ghpull:`22987`: CI: bump test limit from tkagg on osx
+* :ghpull:`22979`: Skip additional backend tests on import error
+
+Issues (19):
+
+* :ghissue:`22864`: [Bug]: Colorbar with drawedges=True and extend='both' does not draw edges at extremities
+* :ghissue:`23382`: [TST] Upcoming dependency test failures
+* :ghissue:`23470`: [Bug]: fig.canvas.mpl_connect in 3.5.2 not registering events in jupyter lab unless using widget pan or zoom controls
+* :ghissue:`22997`: [Bug]: Cygwin build fails due to use of Windows-only functions in _tkagg.cpp
+* :ghissue:`23471`: [Bug]: DPI of a figure is doubled after unpickling on M1 Mac
+* :ghissue:`23050`: [Doc]: Docstring for artist.Artist.set_agg_filter is incorrect
+* :ghissue:`23307`: [Bug]: PEX warns about missing ``setuptools`` from ``install_requires`` in matplotlib
+* :ghissue:`23330`: [Bug]: Missing values cause exception in errorbar plot
+* :ghissue:`21915`: [Bug]: scalar mappable format_cursor_data crashes on BoundarNorm
+* :ghissue:`22970`: [Bug]: Colorbar extend patches do not have correct alpha
+* :ghissue:`23114`: [Bug]: matplotlib __init__.py checks for .git folder 2 levels up, then errors due to setup tools_scm
+* :ghissue:`23157`: [Bug]: colorbar ignores keyword panchor=False
+* :ghissue:`23229`: [Bug]: matplotlib==3.5.2 breaks ipywidgets
+* :ghissue:`18085`: vertical alignment of \sum depends on the presence of subscripts and superscripts
+* :ghissue:`23173`: [Bug]: Crash when adding clabels to subfigures
+* :ghissue:`23108`: [Bug]: Imshow with all negative values leads to math domain errors.
+* :ghissue:`23042`: [Bug]: Figures fail to redraw with IPython
+* :ghissue:`23004`: [Bug]: test failure of test_cross_Qt_imports in 3.5.2
+* :ghissue:`22973`: [Bug]: v3.5.2 causing plot to crash when plotting object with ``__array__`` method
diff --git a/doc/users/prev_whats_new/github_stats_3.6.0.rst b/doc/users/prev_whats_new/github_stats_3.6.0.rst
new file mode 100644
index 000000000000..aac0c0445fd3
--- /dev/null
+++ b/doc/users/prev_whats_new/github_stats_3.6.0.rst
@@ -0,0 +1,1292 @@
+.. _github-stats-3-6-0:
+
+GitHub statistics for 3.6.0 (Sep 15, 2022)
+==========================================
+
+GitHub statistics for 2021/11/16 (tag: v3.5.0) - 2022/09/15
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 202 issues and merged 894 pull requests.
+The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/65?closed=1>`__
+
+The following 174 authors contributed 4425 commits.
+
+* Abhishek K M
+* Adeel Hassan
+* agra
+* Aitik Gupta
+* ambi7
+* Andras Deak
+* Andres Martinez
+* Andrew Fennell
+* andrzejnovak
+* Andrés Martínez
+* Anna Mastori
+* AnnaMastori
+* Ante Sikic
+* Antony Lee
+* arndRemy
+* Ben Root
+* Biswapriyo Nath
+* cavesdev
+* Clément Phan
+* Clément Walter
+* code-review-doctor
+* Connor Cozad
+* Constantine Evans
+* Croadden
+* daniilS
+* Danilo Palumbo
+* David Gilbertson
+* David Ketcheson
+* David Matos
+* David Poznik
+* David Stansby
+* Davide Sandonà
+* dependabot[bot]
+* dermasugita
+* Diego Solano
+* Dimitri Papadopoulos
+* dj4t9n
+* Dmitriy Fishman
+* DWesl
+* Edouard Berthe
+* eindH
+* Elliott Sales de Andrade
+* Eric Firing
+* Eric Larson
+* Eric Prestat
+* Federico Ariza
+* Felix Nößler
+* Fernando
+* Gajendra Pal
+* gajendra0180
+* GavinZhang
+* Greg Lucas
+* hannah
+* Hansin Ahuja
+* Harshal Prakash Patankar
+* Hassan Kibirige
+* Haziq Khurshid
+* Henry
+* henrybeUM
+* Hood
+* Hood Chatham
+* Ian Hunt-Isaak
+* Ian Thomas
+* igurin-invn
+* ikhebgeenaccount
+* Isha Mehta
+* Jake Bowhay
+* Jake Li
+* Jake Lishman
+* Jake VanderPlas
+* Jakub Klus
+* James Tocknell
+* Jan-Hendrik Müller
+* Jay Joshi
+* Jay Stanley
+* jayjoshi112711
+* Jeff Beck
+* Jody Klymak
+* Joel Frederico
+* Joseph Fox-Rabinovitz
+* Josh Soref
+* Jouni K. Seppänen
+* Kayran Schmidt
+* kdpenner
+* Kian Eliasi
+* Kinshuk Dua
+* kislovskiy
+* KIU Shueng Chuan
+* kjain
+* kolibril13
+* krassowski
+* Krish-sysadmin
+* Leeh Peter
+* lgfunderburk
+* Liam Toney
+* Lucas Ricci
+* Luke Davis
+* luz paz
+* mackopes
+* MAKOMO
+* MalikIdreesHasa
+* Marcin Swaltek
+* Mario
+* Mario Sergio Valdés Tresanco
+* martinRenou
+* Matthew Feickert
+* Matthias Bussonnier
+* Mauricio Collares
+* MeeseeksMachine
+* melissawm
+* Mr-Milk
+* Navid C. Constantinou
+* Nickolaos Giannatos
+* Nicolas P. Rougier
+* Niyas Sait
+* noatamir
+* ojeda-e
+* Olivier Gauthé
+* Oscar Gustafsson
+* patquem
+* Philipp Rohde
+* Pieter Eendebak
+* Pieter P
+* Péter Leéh
+* Qijia Liu
+* Quentin Peter
+* Raphael Quast
+* rditlar9
+* Richard Penney
+* richardsheridan
+* Rike-Benjamin Schuppner
+* Robert Cimrman
+* Roberto Toro
+* root
+* Ruth Comer
+* Ruth G. N
+* Ruth Nainggolan
+* Ryan May
+* Rémi Achard
+* SaumyaBhushan
+* Scott Jones
+* Scott Shambaugh
+* selormtamakloe
+* Simon Hoxbro
+* skywateryang
+* Stefanie Molin
+* Steffen Rehberg
+* stone
+* Sven Eschlbeck
+* sveneschlbeck
+* takimata
+* tfpf
+* Thomas A Caswell
+* Tim Hoffmann
+* Tobias Megies
+* Tomas Hrnciar
+* Tomasz Kuliński
+* trichter
+* unknown
+* Uwe Hubert
+* vfdev-5
+* Vishal Chandratreya
+* Vishal Pankaj Chandratreya
+* Vishnu V K
+* vk0812
+* Vlad Korolev
+* Will Qian
+* William Qian
+* wqh17101
+* wsykala
+* yaaun
+* Yannic Schroeder
+* yuanx749
+* 渡邉 美希
+
+GitHub issues and pull requests:
+
+Pull Requests (894):
+
+* :ghpull:`23814`: Consolidate release notes for 3.6
+* :ghpull:`23899`: Backport PR #23885 on branch v3.6.x (DOC: Rearrange navbar-end elements)
+* :ghpull:`23898`: Backport PR #23892 on branch v3.6.x (DOC: Fix docs for linestyles in contour)
+* :ghpull:`23885`: DOC: Rearrange navbar-end elements
+* :ghpull:`23894`: Backport PR #23881 on branch v3.6.x (Fix Pillow compatibility in example)
+* :ghpull:`23897`: Backport PR #23887 on branch v3.6.x (Add missing label argument to barh docs)
+* :ghpull:`23892`: DOC: Fix docs for linestyles in contour
+* :ghpull:`23887`: Add missing label argument to barh docs
+* :ghpull:`23893`: Backport PR #23886 on branch v3.6.x (CI: prefer (older) binaries over (newer) sdists)
+* :ghpull:`23881`: Fix Pillow compatibility in example
+* :ghpull:`23886`: CI: prefer (older) binaries over (newer) sdists
+* :ghpull:`23880`: Backport PR #23862 on branch v3.6.x (Remove triggering of deprecation warning in AnchoredEllipse)
+* :ghpull:`23862`: Remove triggering of deprecation warning in AnchoredEllipse
+* :ghpull:`23879`: Backport PR #23864 on branch v3.6.x (Correct and improve documentation for anchored artists)
+* :ghpull:`23877`: Backport PR #23841 on branch v3.6.x (clarified that hist computes histogram on unbinned data)
+* :ghpull:`23872`: Backport PR #23871 on branch v3.6.x (DOC: Fix formatting of pick event demo example)
+* :ghpull:`23841`: clarified that hist computes histogram on unbinned data
+* :ghpull:`23864`: Correct and improve documentation for anchored artists
+* :ghpull:`23871`: DOC: Fix formatting of pick event demo example
+* :ghpull:`23869`: Backport PR #23867 on branch v3.6.x (DOC: fix deprecation warnings in examples)
+* :ghpull:`23867`: DOC: fix deprecation warnings in examples
+* :ghpull:`23858`: Backport PR #23855 on branch v3.6.x (DOC: fix deprecation warnings)
+* :ghpull:`23859`: Backport PR #23844 on branch v3.6.x (Further improve dev setup instructions)
+* :ghpull:`23844`: Further improve dev setup instructions
+* :ghpull:`23855`: DOC: fix deprecation warnings
+* :ghpull:`23854`: Backport PR #23852 on branch v3.6.x (Fix cross-compiling internal freetype)
+* :ghpull:`23852`: Fix cross-compiling internal freetype
+* :ghpull:`23853`: Backport PR #23830 on branch v3.6.x (Start testing on Python 3.11)
+* :ghpull:`23830`: Start testing on Python 3.11
+* :ghpull:`23851`: Backport PR #23850 on branch v3.6.x (removed single word in documenting doc)
+* :ghpull:`23850`: removed single word in documenting doc
+* :ghpull:`23848`: Backport PR #23843 on branch v3.6.x (Clarify that pycairo>=1.14.0 is needed.)
+* :ghpull:`23843`: Clarify that pycairo>=1.14.0 is needed.
+* :ghpull:`23842`: Backport PR #23840 on branch v3.6.x (Remove documentation for axes_grid)
+* :ghpull:`23838`: Backport PR #23834 on branch v3.6.x (Revert "Refactor handling of tick and ticklabel visibility in Axis.clear")
+* :ghpull:`23840`: Remove documentation for axes_grid
+* :ghpull:`23837`: Backport PR #23833 on branch v3.6.x (Remove search field from sidebar)
+* :ghpull:`23836`: Backport PR #23823 on branch v3.6.x ([DOC] Improve dev setup description)
+* :ghpull:`23834`: Revert "Refactor handling of tick and ticklabel visibility in Axis.clear"
+* :ghpull:`23833`: Remove search field from sidebar
+* :ghpull:`23823`: [DOC] Improve dev setup description
+* :ghpull:`23822`: Backport PR #23813 on branch v3.6.x (Triplot duplicated label)
+* :ghpull:`23813`: Triplot duplicated label
+* :ghpull:`23811`: Backport PR #23805 on branch v3.6.x (sphinxext: Do not copy plot_directive.css's metadata)
+* :ghpull:`23805`: sphinxext: Do not copy plot_directive.css's metadata
+* :ghpull:`23800`: Backport PR #23785 on branch v3.6.x (FIX: ensure type stability for missing cmaps in ``set_cmap``)
+* :ghpull:`23799`: Backport PR #23790 on branch v3.6.x (DOC: Add cache busting to all static assets)
+* :ghpull:`23785`: FIX: ensure type stability for missing cmaps in ``set_cmap``
+* :ghpull:`23790`: DOC: Add cache busting to all static assets
+* :ghpull:`23791`: Backport PR #23774 on branch v3.6.x (Correct rcParams-name in AutoDateFormatter doc-string)
+* :ghpull:`23792`: Backport PR #23781 on branch v3.6.x (ci: Add plot types to sphinx-gallery artifacts)
+* :ghpull:`23789`: Backport PR #23786 on branch v3.6.x (DOC: fontfallback works for most of the backends)
+* :ghpull:`23788`: Backport PR #23784 on branch v3.6.x (DOC: Fix num2date docstring)
+* :ghpull:`23786`: DOC: fontfallback works for most of the backends
+* :ghpull:`23784`: DOC: Fix num2date docstring
+* :ghpull:`23781`: ci: Add plot types to sphinx-gallery artifacts
+* :ghpull:`23783`: Backport PR #23782 on branch v3.6.x (Remove ``Axes.cla`` from examples)
+* :ghpull:`23782`: Remove ``Axes.cla`` from examples
+* :ghpull:`23774`: Correct rcParams-name in AutoDateFormatter doc-string
+* :ghpull:`23773`: Backport PR #23772 on branch v3.6.x (3d plots what's new cleanups)
+* :ghpull:`23772`: 3d plots what's new cleanups
+* :ghpull:`23765`: Backport PR #23762 on branch v3.6.x (FIX: legend handler warning too liberal)
+* :ghpull:`23762`: FIX: legend handler warning too liberal
+* :ghpull:`23759`: Backport PR #23686 on branch v3.6.x (Improve matplotlib.pyplot importtime by caching ArtistInspector)
+* :ghpull:`23686`: Improve matplotlib.pyplot importtime by caching ArtistInspector
+* :ghpull:`23756`: Backport PR #23569 on branch v3.6.x (Fix hidden xlabel bug in colorbar)
+* :ghpull:`23755`: Backport PR #23742 on branch v3.6.x (FIX: unbreak ipympl)
+* :ghpull:`23569`: Fix hidden xlabel bug in colorbar
+* :ghpull:`23742`: FIX: unbreak ipympl
+* :ghpull:`23752`: Backport PR #23750 on branch v3.6.x (Fix rcParams documentation)
+* :ghpull:`23749`: Backport PR #23735 on branch v3.6.x (Correctly handle Axes subclasses that override cla)
+* :ghpull:`23735`: Correctly handle Axes subclasses that override cla
+* :ghpull:`23748`: Backport PR #23746 on branch v3.6.x (DOC: add numpydoc docstring + commentary to Axis.get_ticklocs)
+* :ghpull:`23747`: Backport PR #23721 on branch v3.6.x (3d plot view angle documentation)
+* :ghpull:`23746`: DOC: add numpydoc docstring + commentary to Axis.get_ticklocs
+* :ghpull:`23721`: 3d plot view angle documentation
+* :ghpull:`23744`: Backport PR #23740 on branch v3.6.x (Clarify error for colorbar with unparented mappable)
+* :ghpull:`23741`: Backport PR #23674 on branch v3.6.x (Re-rename builtin seaborn styles to not include a dot.)
+* :ghpull:`23740`: Clarify error for colorbar with unparented mappable
+* :ghpull:`23674`: Re-rename builtin seaborn styles to not include a dot.
+* :ghpull:`23738`: Backport PR #23639 on branch v3.6.x (Adding the new contributor meeting)
+* :ghpull:`23739`: Backport PR #23712 on branch v3.6.x (FIX: do not try to help CPython with garbage collection)
+* :ghpull:`23712`: FIX: do not try to help CPython with garbage collection
+* :ghpull:`23639`: Adding the new contributor meeting
+* :ghpull:`23732`: Backport PR #23729 on branch v3.6.x (Use cleaner recursion check in PyQt FigureCanvas' resizeEvent.)
+* :ghpull:`23734`: Backport PR #23733 on branch v3.6.x (DOC: Update theme configuration for upcoming changes)
+* :ghpull:`23733`: DOC: Update theme configuration for upcoming changes
+* :ghpull:`23728`: Backport PR #23722 on branch v3.6.x (Restore deprecation class aliases in cbook)
+* :ghpull:`23729`: Use cleaner recursion check in PyQt FigureCanvas' resizeEvent.
+* :ghpull:`23726`: Backport PR #23711 on branch v3.6.x (Fix deprecation messages for vendoring unused things)
+* :ghpull:`23722`: Restore deprecation class aliases in cbook
+* :ghpull:`23727`: Backport PR #23724 on branch v3.6.x (Fix/harmonize spacing in dependencies.rst.)
+* :ghpull:`23724`: Fix/harmonize spacing in dependencies.rst.
+* :ghpull:`23711`: Fix deprecation messages for vendoring unused things
+* :ghpull:`23715`: Backport PR #23708 on branch v3.6.x (Loosen up test_Normalize test)
+* :ghpull:`23713`: Backport PR #23710 on branch v3.6.x (Fix cmap deprecations)
+* :ghpull:`23708`: Loosen up test_Normalize test
+* :ghpull:`23710`: Fix cmap deprecations
+* :ghpull:`23696`: Backport PR #23695 on branch v3.6.x (Document polar handling of _interpolation_steps.)
+* :ghpull:`23706`: Backport PR #23705 on branch v3.6.x (DOC: Added link to class under discussion)
+* :ghpull:`23705`: DOC: Added link to class under discussion
+* :ghpull:`23695`: Document polar handling of _interpolation_steps.
+* :ghpull:`23668`: Api deprecate cmap functions
+* :ghpull:`23049`: Add ``minor`` keyword argument to ``plt.x/yticks``
+* :ghpull:`23665`: Harmonize docstrings for boxstyle/connectionstyle/arrowstyle.
+* :ghpull:`23636`: FIX: macosx flush_events should process all events
+* :ghpull:`23555`: Uncamelcase offsetTrans in draw_path_collection.
+* :ghpull:`23682`: Fix generated documentation for deprecated modules
+* :ghpull:`23678`: Get rcParams from mpl
+* :ghpull:`23571`: Simplify _bind_draw_path_function.
+* :ghpull:`23673`: DOC: Highlight information about avoiding labels in legend
+* :ghpull:`22506`: Replace MathtextBackend mechanism.
+* :ghpull:`23340`: Set correct path for Arc
+* :ghpull:`23562`: Fix issue with get_edgecolor and get_facecolor in 3D plots
+* :ghpull:`23634`: make.bat: Don't override SPHINXOPTS/O from the environment
+* :ghpull:`23675`: Deprecate helper functions in axis3d
+* :ghpull:`23676`: MNT: Get rcParams from mpl
+* :ghpull:`23677`: TST: Use article class when checking for pgf
+* :ghpull:`23669`: CI: Azure update from ubuntu-18.04 to ubuntu-latest and ubuntu-20.04
+* :ghpull:`23670`: Add bar color demo.
+* :ghpull:`23644`: Standardize edge-on axis locations when viewing primary 3d axis planes
+* :ghpull:`23563`: Fix issue with drawing 3D lines where points are from nparray
+* :ghpull:`23666`: MNT: Deprecate macosx prepare subplots tool
+* :ghpull:`23572`: Deprecate ``get_grid_positions(..., raw=True)``.
+* :ghpull:`23525`: Add functionality to label individual bars with Axes.bar()
+* :ghpull:`23667`: Fix flake8 errors introduced by crossed PRs
+* :ghpull:`23554`: MNT: Remove unused imports
+* :ghpull:`23659`: Simplify/fix save_diff_image.
+* :ghpull:`23663`: Small cleanups to _find_fonts_by_props.
+* :ghpull:`23662`: Add tolerance to test failing on ppc64le
+* :ghpull:`23623`: MNT: remove _gridspecs attribute on Figure classes
+* :ghpull:`23654`: Reverts macosx change to ARC
+* :ghpull:`23661`: Remove unused fontsize argument from private mathtext _get_info.
+* :ghpull:`23655`: Merge branch v3.5.x into main
+* :ghpull:`23658`: Increase tolerance on multi-font tests
+* :ghpull:`23657`: Add eps to extension list in image triager
+* :ghpull:`23656`: Fix broken link to MathML torture tests.
+* :ghpull:`23649`: CI: Use anaconda-client v1.10.0 for upload of nightlies
+* :ghpull:`23647`: Allow any color format to be used for axis3d.Axis.set_pane_color
+* :ghpull:`23643`: Enable wheels for PyPy 3.8+
+* :ghpull:`23621`: DOC: update and extend fonts explanation
+* :ghpull:`23612`: CI: try installing a different version of noto on OSX
+* :ghpull:`23619`: add pikepdf  and visual c++ dependency
+* :ghpull:`23631`: Leave out ``barh`` from the basic plot types.
+* :ghpull:`23637`: BLD: Add Python 3.11 builds to CI
+* :ghpull:`23632`: Add discouraged admonitions
+* :ghpull:`23620`: Doc update deps
+* :ghpull:`23627`: Bump pypa/cibuildwheel from 2.8.1 to 2.9.0
+* :ghpull:`23628`: Change Title Case to Upper lower in templates
+* :ghpull:`23206`: Change exception type for incorrect SVG date metadata
+* :ghpull:`23387`: Remove setuptools_scm_git_archive dependency and add sdist test
+* :ghpull:`23605`: Fix issues in examples, docs, and tutorials
+* :ghpull:`23618`: [Doc]: Document the position parameter in apply_aspect()
+* :ghpull:`23355`: Revert "Try to unbreak CI by xfailing OSX Tk tests"
+* :ghpull:`23610`: TST: be more forgiving about IDing Noto
+* :ghpull:`23609`: print version number when building docs
+* :ghpull:`20832`: Implement multi-font embedding for PS Backend
+* :ghpull:`20804`: Implement multi-font embedding for PDF Backend
+* :ghpull:`23202`: MNT: Remove cached renderer from figure
+* :ghpull:`23497`: Avoid gridspec in more examples
+* :ghpull:`23602`: Editing "issues for new contributors"
+* :ghpull:`23600`: DOC: view_init docstring for 3d axes primary view angles
+* :ghpull:`23587`: BUG:datetime list starting with none
+* :ghpull:`23559`: re-base of font fallback for pdf and eps output + SVG support
+* :ghpull:`23557`: BLD: update the manylinux versions used
+* :ghpull:`23596`: Minor cleanup of axes_grid1
+* :ghpull:`23594`: Expire deprecation on passing bytes to FT2Font.set_text
+* :ghpull:`23435`: Add conda env to setup instructions
+* :ghpull:`23574`: Move colorbar() doc to method itself.
+* :ghpull:`23584`: Bump Ubuntu to 20.04 on GitHub Actions
+* :ghpull:`23561`: Clean up code in tri
+* :ghpull:`23582`: Cleanup axis3d.Axis.draw
+* :ghpull:`23510`: Refactor Widget tests
+* :ghpull:`20718`: Circle: Build docs in parallel.
+* :ghpull:`22452`: ENH: add ability to remove layout engine
+* :ghpull:`23516`: warning when scatter plot color settings discarded
+* :ghpull:`23577`: apply_aspect cleanups
+* :ghpull:`23575`: Cleanup parasite_simple example.
+* :ghpull:`23567`: Remove noop setattr_cm.
+* :ghpull:`23412`: Fix dash offset bug in Patch
+* :ghpull:`21756`: MNT: Clean up some UTF strings and memory autorelease
+* :ghpull:`23558`: MNT: Use UTF-8 string in macosx backend
+* :ghpull:`23550`: Change exception types, improve argument checking, and cleanups in mpl_toolkits
+* :ghpull:`23196`: Unify set_pickradius argument
+* :ghpull:`20740`: Implement Font-Fallback in Matplotlib
+* :ghpull:`22566`: Add rcparam for figure label size and weight
+* :ghpull:`23551`: Remove transform arguments from _iter_collection
+* :ghpull:`23444`: Deduplicate common parts in LatexManager.{__init__,_setup_latex_process}
+* :ghpull:`23017`: [ENH] : Provide axis('equal') for Axes3D (replace PR #22705)
+* :ghpull:`22950`: Simplify definition of mathtext symbols & correctly end tokens in mathtext parsing
+* :ghpull:`23409`: Provide axis('equal') for Axes3D (replaces PR #23017)
+* :ghpull:`23434`: Fix array-like linewidth for 3d scatter
+* :ghpull:`23500`: Move the common implementation of Axes.set_x/y/zscale to Axis.
+* :ghpull:`23533`: Add tests for sankey and minor fixes
+* :ghpull:`23535`: Make margins error as claimed in doc-string
+* :ghpull:`23546`: Simplify impl. of functions optionally used as context managers.
+* :ghpull:`23494`: Fix various issues from SonarQube
+* :ghpull:`23529`: Add workflow dispatch GitHub CI
+* :ghpull:`23539`: Small improvements to WebAgg example
+* :ghpull:`23541`: Change doc-build CI install order
+* :ghpull:`23526`: DOC: make "family" less ambiguous in FontProperties docs
+* :ghpull:`23537`: Move the deprecated RendererGTK{3,4}Cairo to a single place.
+* :ghpull:`23140`: [Features] Allow setting legend title alignment
+* :ghpull:`23538`: Fix imprecise docs re: backend dependencies.
+* :ghpull:`23532`: Add test for RGBAxes
+* :ghpull:`23453`: Add more tests for mplot3d
+* :ghpull:`23501`: Let Axes.clear iterate over Axises.
+* :ghpull:`23469`: Inline _init_axis_artists & _init_gridlines into clear.
+* :ghpull:`23475`: Add markerfacealt to pass-through arguments for error bar lines
+* :ghpull:`23527`: STY: fix whitespace on an assert
+* :ghpull:`23495`: Fix sgskip'd examples
+* :ghpull:`23404`: Restore matplotlib.__doc__ in Sphinx docs
+* :ghpull:`23507`: Add hint when More than {max_open_warning} figures have been opened
+* :ghpull:`23499`: Fix outdated comment re: event handlers in test_backends_interactive.
+* :ghpull:`23498`: Fix direct instantiation of webagg_core managers.
+* :ghpull:`23504`: Clarify formatting of the code-for-reproduction field in bug reports.
+* :ghpull:`23489`: Add missing test data to install
+* :ghpull:`23482`: Mathtext spaces must be independent of font style.
+* :ghpull:`23486`: Bump pypa/cibuildwheel from 2.8.0 to 2.8.1
+* :ghpull:`23461`: Tweak Axes repr.
+* :ghpull:`16931`: Make it easier to improve UI event metadata.
+* :ghpull:`23468`: Display grid in floating axes example.
+* :ghpull:`23467`: Remove old handling for factor=None in axisartist.
+* :ghpull:`23443`: Try running the pgf backend off the article class.
+* :ghpull:`23373`: Fix pan/zoom crashing when widget lock is unavailable
+* :ghpull:`23466`: Update filename in example.
+* :ghpull:`23464`: Deprecate macos close handler.
+* :ghpull:`23463`: Deprecate Tick.label
+* :ghpull:`23455`: Deprecate properties w_xaxis, w_yaxis, and w_zaxis
+* :ghpull:`23448`: Tweak callbacks to generate pick events.
+* :ghpull:`23233`: Default stem marker color follows the linecolor
+* :ghpull:`23452`: Generalize Axes __repr__ to 3D
+* :ghpull:`23445`: Compare thread native ids when checking whether running on main thread.
+* :ghpull:`20752`: Set norms using scale names.
+* :ghpull:`23438`: DOC: numpydoc-ify date Locator classes
+* :ghpull:`23427`: Tweak pgf escapes.
+* :ghpull:`23432`: Fixed typo in docs animation api
+* :ghpull:`23420`: Clean up test_chunksize_fails()
+* :ghpull:`23415`: Minor improvements to units_sample example
+* :ghpull:`21339`: Added linear scaling test to Hexbin marginals
+* :ghpull:`23414`: Bump pypa/cibuildwheel from 2.7.0 to 2.8.0
+* :ghpull:`23413`: Combine chunk size tests into one
+* :ghpull:`23403`: Small cleanup to VertexSelector.
+* :ghpull:`23291`: In the new/simplified backend API, don't customize draw_if_interactive.
+* :ghpull:`23350`: Fixed SVG-as-text image comparison tests.
+* :ghpull:`23406`: DOC: Fix calculation of bin centers in multi-histogram
+* :ghpull:`23407`: TST: Add missing warning type to pytest.warns
+* :ghpull:`23402`: Link 3D animation examples to one another.
+* :ghpull:`23401`: Upload wheel artifacts from the correct directory
+* :ghpull:`23374`: GOV: point CoC reports at CoC steering council subcomittee mailing list
+* :ghpull:`23393`: Clean up formatting of custom cmap example
+* :ghpull:`23146`: Update cibuildwheel
+* :ghpull:`23368`: Add a helper to generate closed paths.
+* :ghpull:`20220`: DOC: add mission statement
+* :ghpull:`22364`: Tweak mathtext/tex docs.
+* :ghpull:`23377`: Use tick_params more often over tick iteration
+* :ghpull:`22820`: [Doc] consolidate ``rect`` documentation
+* :ghpull:`23371`: Default animation.convert_args to ["-layers", "OptimizePlus"].
+* :ghpull:`23148`: DOC: change address to send security issues to
+* :ghpull:`23365`: DOC: add new showcase example, replace gendered one
+* :ghpull:`23033`: Fix issue with tex-encoding on non-Unicode platforms
+* :ghpull:`23358`: Shorten/clarify definition of extension types.
+* :ghpull:`23370`: Small cleanups to animation.
+* :ghpull:`23364`: Rename/change signature of PyGlyph_new.
+* :ghpull:`23363`: Simplify FigureCanvas multiple inheritance init by swapping bases order.
+* :ghpull:`23366`: MNT: use devel version of theme
+* :ghpull:`23357`: Fixed decimal points not appearing at end of Mathtext string.
+* :ghpull:`23351`: DOC/MNT install docs with dev version of sphinx theme
+* :ghpull:`23349`: CI: Remove old scipy-wheels-nightly uploads to ensure space
+* :ghpull:`23348`: Support multi-figure MultiCursor; prepare improving its signature.
+* :ghpull:`23360`: embedding_in_tk_sgskip.py: use root.destroy
+* :ghpull:`23354`: MNT: Use list comprehension
+* :ghpull:`23299`: FIX/API: do not reset backend key in rc_context
+* :ghpull:`23191`: ENH: add width_ratios and height_ratios to subplots
+* :ghpull:`23060`: MNT: Change objective C code to Automatic Reference Counting (ARC)
+* :ghpull:`23347`: Simplify/improve check for pycairo in Gtk-based backends.
+* :ghpull:`23316`: DOC: improve spines crosslinking
+* :ghpull:`23100`: Remove custom backend_nbagg.show(), putting logic in manager show.
+* :ghpull:`23342`: FIX: make sure addFont test removes the test font
+* :ghpull:`23266`: negative_linestyles kwarg in contour.py
+* :ghpull:`23332`: Validate Text linespacing on input.
+* :ghpull:`23336`: Remove ineffective exclusion of Arcs without parent Axes.
+* :ghpull:`23341`: MNT: Use '--pytest-test-first' option for naming clarity
+* :ghpull:`23337`: Remove now inexistent "datapath" rcParam from style blacklist.
+* :ghpull:`22004`: Make RendererCairo auto-infer surface size.
+* :ghpull:`23208`: ENH: enable stripey lines
+* :ghpull:`23288`: Correct URL area with rotated texts in PDFs
+* :ghpull:`23197`: Add tests for pan
+* :ghpull:`22167`: Deprecate selector ``visible`` attribute
+* :ghpull:`23322`: Cleanup FontProperties examples.
+* :ghpull:`23321`: Tweak examples capitalization/punctuation.
+* :ghpull:`23270`: Fix handling of nonmath hyphens in mathtext.
+* :ghpull:`23310`: Move Cursor demo from examples/misc to examples/event_handling
+* :ghpull:`23313`: Drop CSS styles that are in mpl-sphinx-theme
+* :ghpull:`23314`: Don't draw invisible 3D Axes
+* :ghpull:`23302`: Deprecate stem(..., use_line_collection=False)
+* :ghpull:`23309`: Remove front page examples
+* :ghpull:`23282`: Backport PR #22865 on branch v3.5.x (Fix issue with colorbar extend and drawedges)
+* :ghpull:`23231`: Add pytest-xvfb as test dependency
+* :ghpull:`23318`: No need to return OrderedDict from _gen_axes_spines.
+* :ghpull:`23295`: Replace re.sub by the faster str.translate.
+* :ghpull:`23300`: Modify example of "Fig Axes Customize Simple"
+* :ghpull:`23014`: Improve consistency in LogLocator and LogFormatter API
+* :ghpull:`23286`: Refactor URL handling in PDF backend
+* :ghpull:`23065`: Fix test_image_comparison_expect_rms
+* :ghpull:`23294`: Simplify binary data handling in ps backend.
+* :ghpull:`23284`: DOC: Switch to HTML5 and cleanup CSS
+* :ghpull:`23276`: Add get/set methods for DPI in SubFigure
+* :ghpull:`23207`: Update build environment and improve test
+* :ghpull:`23213`: DEV: Add name-tests-test to pre-commit hooks
+* :ghpull:`23289`: Properly make Name.hexify go through a deprecation cycle.
+* :ghpull:`23177`: Deprecate positional passing of most Artist constructor parameters
+* :ghpull:`23287`: Minor tweaks to pdf Name.
+* :ghpull:`23285`: In mathtext, replace manual caching (via ``glyphd``) by lru_cache.
+* :ghpull:`23034`: Correctly read the 'style' argument while processing 'genfrac'.
+* :ghpull:`23247`: Support inverted parentheses in mathtext.
+* :ghpull:`23190`: Deprecate unused methods in axis.py
+* :ghpull:`23219`: MNT: Rename example files with 'test' in name
+* :ghpull:`23277`: MNT: Remove dead code in SVG backend
+* :ghpull:`23261`: Bump actions/setup-python from 3 to 4
+* :ghpull:`23264`: Changing environment.yml for it to work on Windows
+* :ghpull:`23269`: MNT: Remove dead code in Colorbar
+* :ghpull:`23262`: Simplify qt_compat, in particular post-removal of qt4 support.
+* :ghpull:`23263`: Private helper to get requested backend without triggering resolution.
+* :ghpull:`23243`: Fix spacing after mathtext operators with sub/superscripts
+* :ghpull:`22839`: Fix spacing after mathtext operators with sub/superscripts
+* :ghpull:`23256`: DOC: Add note about Inkscape install on Windows
+* :ghpull:`23258`: DOC: remove Blue Book url
+* :ghpull:`23255`: Add a helper to generate mathtext error strings.
+* :ghpull:`23246`: Fix argument checking for set_interpolation_stage
+* :ghpull:`22881`: Support not embedding glyphs in svg mathtests.
+* :ghpull:`23198`: Rename ncol parameter in legend to ncols
+* :ghpull:`23251`: Small simplifications to mathtext tests.
+* :ghpull:`23249`: Don't allow ``r"$\left\\|\right.$"``, as in TeX.
+* :ghpull:`23248`: Rename test markers
+* :ghpull:`22507`: Remove *math* parameter of various mathtext internal APIs.
+* :ghpull:`23192`: Add tests, improve error messages in axis/_base, and code cleanup
+* :ghpull:`23241`: Fix invalid value in radio buttons example
+* :ghpull:`23187`: Correct docs and use keyword arguments in _mathtext.py
+* :ghpull:`23045`: MNT: Merge locally defined test marks
+* :ghpull:`22289`: ENH: compressed layout
+* :ghpull:`23237`: Expire BoxStyle._Base deprecation.
+* :ghpull:`23225`: DOC: Fix version switcher links to documentation
+* :ghpull:`23221`: DOC: recommend numpy random number generator class
+* :ghpull:`23223`: Changed offset reference, add small doc
+* :ghpull:`23215`: DOC: link the transforms tutorial from the module
+* :ghpull:`23201`: Rework tricontour and tricontourf documentation
+* :ghpull:`23013`: Add tests for date module
+* :ghpull:`23188`: Mnt new default dates
+* :ghpull:`22745`: MNT: Don't require renderer for window_extent and tightbbox
+* :ghpull:`23077`: MNT: Remove keyword arguments to gca()
+* :ghpull:`23182`: Simplify webagg blitting.
+* :ghpull:`23181`: Init FigureCanvasAgg._lastKey in ``__init__``.
+* :ghpull:`23175`: Point the version switcher to a name listed in switcher.json
+* :ghpull:`22669`: Cleanup documentation generation for pyplot
+* :ghpull:`22519`: fix markevery plot option with nans in data
+* :ghpull:`21584`: Move towards having get_shared_{x,y}_axes return immutable views.
+* :ghpull:`23170`: ENH: update ticks when requesting labels
+* :ghpull:`23169`: DOC: Migrate to sphinx-design
+* :ghpull:`23180`: Improve docstring of triplot() and PatchCollection
+* :ghpull:`23153`: Restore accidentally removed pytest.ini and tests.py.
+* :ghpull:`23166`: Deprecate passing most Legend arguments positionally
+* :ghpull:`23165`: DOCS Fix a few typos
+* :ghpull:`23167`: DOCS fix typo
+* :ghpull:`23062`: Add stackplot to plot types listing
+* :ghpull:`23161`: Added my (open access) book
+* :ghpull:`23141`: Minor fix for astropy units support broken in earlier PR
+* :ghpull:`23156`: No longer call draw_if_interactive in parasite_axes.
+* :ghpull:`23150`: DOC fix typo
+* :ghpull:`23149`: DOCS remove duplicate text
+* :ghpull:`23145`: Fix format error in switcher.json
+* :ghpull:`21755`: MNT: Clean up macosx backend set_message
+* :ghpull:`23128`: DOCS Fix typos
+* :ghpull:`23130`: Drop pytest warning config in nightly tests
+* :ghpull:`23135`: Unpin coverage again
+* :ghpull:`23133`: Make module deprecation messages consistent
+* :ghpull:`23134`: Remove newline from start of deprecation warnings
+* :ghpull:`22964`: Fix spelling errors
+* :ghpull:`22929`: Handle NaN in bar labels and error bars
+* :ghpull:`23093`: MNT: Removing 3.4 deprecations
+* :ghpull:`23090`: Derive new_figure_manager from FigureCanvas.new_manager.
+* :ghpull:`23099`: Remove unneeded cutout for webagg in show().
+* :ghpull:`23097`: Tweak check for IPython pylab mode.
+* :ghpull:`23088`: Improve error for invalid format strings / misspelled data keys.
+* :ghpull:`23092`: Ensure updated monkey-patching of sphinx-gallery EXAMPLE_HEADER
+* :ghpull:`23087`: Fix width/height inversion in dviread debug helper.
+* :ghpull:`23089`: Normalize tk load failures to ImportErrors.
+* :ghpull:`23091`: Move test that fig.add_axes() needs parameters
+* :ghpull:`23067`: more explicit in windows doc build instructions
+* :ghpull:`23081`: MNT: Deprecate date_ticker_factory
+* :ghpull:`23079`: MNT: Remove key_press and button_press from FigureManager
+* :ghpull:`23076`: MNT: Remove positional argument handling in LineCollection
+* :ghpull:`23078`: MNT: Remove deprecated axis.cla()
+* :ghpull:`23054`: Slightly simplify tcl/tk load in extension.
+* :ghpull:`23073`: MNT: Remove dummy_threading because threading is always available
+* :ghpull:`22405`: DOC: put the gallery keywords in the meta tag
+* :ghpull:`23071`: Fix installing contourpy on CI
+* :ghpull:`23068`: Slight refactor of _c_internal_utils to linewrap it better.
+* :ghpull:`23070`: Pathlibify autotools invocation in build.
+* :ghpull:`22755`: Maybe run autogen as part of freetype install
+* :ghpull:`23063`: doc: mathtext example: use axhspan() instead of fill_between() for backdrop rectangle shading
+* :ghpull:`23055`: Cleanup Annotation.update_position.
+* :ghpull:`22567`: Use contourpy for quad contour calculations
+* :ghpull:`22801`: TST: fully parameterize test_lazy_linux_headless
+* :ghpull:`22180`: ENH: Use rcParams savefig.directory on macosx backend
+* :ghpull:`23048`: Add rrulewrapper to docs
+* :ghpull:`23047`: Fix issue with hist and float16 data
+* :ghpull:`23044`: Fix missing section header for nightly builds
+* :ghpull:`23029`: Demonstrate both usetex and non-usetex in demo_text_path.py.
+* :ghpull:`23038`: Factor out errorevery parsing for 2D and 3D errorbars.
+* :ghpull:`23036`: Suppress traceback chaining for tex subprocess failures.
+* :ghpull:`23037`: Suppress exception chaining in FontProperties.
+* :ghpull:`23020`: Add test to close legend issue
+* :ghpull:`23031`: Specify that style files are utf-8.
+* :ghpull:`22991`: Enable ``plt.sca`` on subfigure's axes
+* :ghpull:`23030`: DOC: Fix charset declaration in redirects
+* :ghpull:`23022`: Fix some possible encoding issues for non-utf8 systems.
+* :ghpull:`23023`: Bump docker/setup-qemu-action from 1 to 2
+* :ghpull:`23024`: DOC: do not suggest to sudo pip install Matplotlib
+* :ghpull:`23018`: Fix typo in font family
+* :ghpull:`22627`: ENH: rect for constrained_layout
+* :ghpull:`22891`: Font example monospace
+* :ghpull:`23006`: docs: add subplot-mosaic string compact notation
+* :ghpull:`23009`: Fixed installation guide command typo
+* :ghpull:`22926`: Fix RangeSlider for same init values #22686
+* :ghpull:`22989`: Merge v3.5.x back into main
+* :ghpull:`22993`: STY: Fix typos in colormap
+* :ghpull:`22777`: DEV: Add codespell to pre-commit hooks
+* :ghpull:`22940`: Fixed dpi bug in rainbow text example
+* :ghpull:`22298`: MNT: Remove cmap_d colormap access
+* :ghpull:`22387`: Add a registry for color sequences
+* :ghpull:`21594`: Document text alignment
+* :ghpull:`22967`: TST: Add some tests for QuadMesh contains function
+* :ghpull:`22936`: ENH: Add full-screen toggle to the macosx backend
+* :ghpull:`22886`: MNT: remove mpl_toolkits.axes_grid
+* :ghpull:`22952`: Make MarkerStyle immutable
+* :ghpull:`22953`: MNT: Move set_cursor to the FigureCanvas
+* :ghpull:`18854`: Standardize creation of FigureManager from a given FigureCanvas class.
+* :ghpull:`22925`: Standardize creation of FigureManager from a given FigureCanvas class.
+* :ghpull:`22875`: Remove Forward definitions where possible.
+* :ghpull:`22928`: ENH: Add option to disable raising the window for macosx
+* :ghpull:`22912`: DOC: Better doc of colors
+* :ghpull:`22931`: BUG: Fix regression with ls=(0, ())
+* :ghpull:`22909`: FIX: skip sub directories when finding fonts on windows
+* :ghpull:`22911`: Clarify docstring of [un]install_repl_displayhook()
+* :ghpull:`22919`: CI: Add concurrency skips for GH Actions
+* :ghpull:`22899`: Fix documentation markup issues
+* :ghpull:`22906`: Clarify logic for repl displayhook.
+* :ghpull:`22892`: Remove support for IPython<4.
+* :ghpull:`22896`: Remove python-dateutil as test requirement
+* :ghpull:`22885`: Deprecate two-layered backend_pdf.Op enum.
+* :ghpull:`22883`: Tweak argument checking in tripcolor().
+* :ghpull:`22884`: Missing ``f`` prefix on f-strings fix
+* :ghpull:`22877`: Small cleanups to mathtext.
+* :ghpull:`21374`: Snap selectors
+* :ghpull:`22824`: Remove some unnecessary extra boundaries for colorbars with extensions.
+* :ghpull:`21448`: Use named groups in mathtext parser.
+* :ghpull:`22609`: Improve usability of dviread.Text by third parties.
+* :ghpull:`22809`: STY: Apply pre-commit hooks to codebase
+* :ghpull:`22730`: Fix removed cross-references
+* :ghpull:`22857`: Slightly simplify twin axes detection in MEP22 zoom.
+* :ghpull:`22813`: MNT: Deprecate figure callbacks
+* :ghpull:`22802`: MNT: make Axes.cla an alias for Axes.clear in all cases
+* :ghpull:`22855`: Remove non-needed remove_text=False.
+* :ghpull:`22854`: TST: Avoid floating point errors in asinh ticker
+* :ghpull:`22850`: Simplify tick creation
+* :ghpull:`22841`: Fix Tk error when updating toolbar checkbutton images
+* :ghpull:`22707`: Proposed ENH: Allow user to turn off breaking of streamlines in streamplot (rebased)
+* :ghpull:`22826`: Bump actions/upload-artifact from 2 to 3
+* :ghpull:`22825`: Bump codecov/codecov-action from 2 to 3
+* :ghpull:`22821`: Use bool for bool keyword arguments
+* :ghpull:`22815`: Fix pickling of globally available, dynamically generated norm classes.
+* :ghpull:`22702`: Doc tweak transform tutorial
+* :ghpull:`22613`: DOC: Add links to explicit vs implicit API everywhere "OO" is used
+* :ghpull:`22712`: Use repr in error messages
+* :ghpull:`22794`: Fix ps export of colored hatches with no linewidth
+* :ghpull:`22797`: Deprecate functions in backends
+* :ghpull:`22608`: Axes.inset_axes: enable Axes subclass creation
+* :ghpull:`22795`: Replace "marker simplification" by "marker subsampling" in docs.
+* :ghpull:`22768`: Fix inkscape tests
+* :ghpull:`22791`: Tweak _ConverterError reporting.
+* :ghpull:`22447`: Improve bar_label annotation
+* :ghpull:`22710`: Fix the error- TypeError: 'float' object is not iterable
+* :ghpull:`22444`: Revert "CI: skip test to work around gs bug"
+* :ghpull:`22785`: CI: Update weekly dependency test job
+* :ghpull:`22784`: Fix 'misspelled' transform variable
+* :ghpull:`22778`: Fix LaTeX formatting in examples
+* :ghpull:`22779`: Improve mlab documentation (and example)
+* :ghpull:`22759`: MNT: Skip existing wheels during nightly wheel upload
+* :ghpull:`22751`: BLD: do not put an upper bound on pyparsing
+* :ghpull:`22752`: DOC: Correct nightly wheels pip install command
+* :ghpull:`22742`: Fix deprecation of backend_tools.ToolBase.destroy
+* :ghpull:`22725`: Move towards making texmanager stateless.
+* :ghpull:`22734`: Added clim support to tripcolor
+* :ghpull:`22733`: CI: Add GHA workflow to upload nightly wheels
+* :ghpull:`21637`: Also upload a subset of nightly wheels
+* :ghpull:`22698`: Correct cross-references in documentation
+* :ghpull:`22263`: DOC: condense version switcher
+* :ghpull:`22361`: Revert datetime usetex ticklabels to use default tex font.
+* :ghpull:`22721`: Small style fixes.
+* :ghpull:`22356`: Cleanup tripcolor()
+* :ghpull:`22360`: Let TeX handle multiline strings itself.
+* :ghpull:`22418`: Deprecate auto-removal of overlapping Axes by plt.subplot{,2grid}.
+* :ghpull:`22722`: Rename confusingly-named cm_fallback.
+* :ghpull:`22697`: Deprecate in testing.decorators
+* :ghpull:`22556`: Add text.parse_math rcParams
+* :ghpull:`22163`: Change colour of Tk toolbar icons on dark backgrounds
+* :ghpull:`22704`: Small simplification to textpath.
+* :ghpull:`22498`: TST: increase coverage on tk tests
+* :ghpull:`21425`: Make Axis3D constructor signature closer to the one of 2D axis.
+* :ghpull:`22665`: Improve error message for incorrect color string
+* :ghpull:`22685`: Rewrite plot format detection from sphinx build target
+* :ghpull:`22670`: Update deprecated vmImage 'vs2017-win2016' in azure pipelines
+* :ghpull:`22503`: Deprecate backend_qt.qApp.
+* :ghpull:`22683`: Add missing space before : for parameters
+* :ghpull:`22591`: Fix Path/str-discrepancy in FontManager.addpath and improve documentation
+* :ghpull:`22680`: Bump actions/cache from 2 to 3
+* :ghpull:`22659`: Add description on quiver head parameters
+* :ghpull:`22668`: Raise on missing closing quotes in matplotlibrc
+* :ghpull:`22675`: Tweak colorbar_placement example.
+* :ghpull:`22276`: Merge "Scatter Symbol" and "Scatter Custom Symbol" examples
+* :ghpull:`22658`: Remove reference to now-deleted reminder note.
+* :ghpull:`22652`: Update documentation example and fix See also
+* :ghpull:`22587`: Refactor handling of tick and ticklabel visibility in Axis.clear()
+* :ghpull:`22148`: MNT: Deprecate ``docstring``
+* :ghpull:`22170`: Add example to polygon selector docstring showing how to set vertices programmatically
+* :ghpull:`22650`: Fix new leak in ft2font introduced in #22604
+* :ghpull:`22644`: FIX: Flush events after closing figures in macosx backend
+* :ghpull:`22643`: Suppress exception chaining in colormap lookup.
+* :ghpull:`22639`: ENH: MacOSX backend to use sRGB instead of GenericRGB colorspace
+* :ghpull:`22509`: Simplifications to ToolManager.{add,remove}_tool.
+* :ghpull:`22633`: DOC: remove space in directive.
+* :ghpull:`22631`: Add space between individual transform components in svg output.
+* :ghpull:`22523`: MNT: Use a context manager to change the norm in colorbar code
+* :ghpull:`22615`: FIX: Change get_axis_map to axis_map now
+* :ghpull:`22508`: Move tracking of autoscale status to Axis.
+* :ghpull:`22547`: Small cleanups around TexManager usage.
+* :ghpull:`22511`: Remove redundant rcParam-lookup in patches
+* :ghpull:`22516`: Expire deprecations in backends
+* :ghpull:`22612`: Updated grammar to reflect more common usage of output vs outputted in animation.py
+* :ghpull:`22589`: Support quoted strings in matplotlibrc
+* :ghpull:`22604`: MNT: Fix types in C-code to reduce warnings
+* :ghpull:`22610`: Fix alternative suggestion in epoch2num() deprecation
+* :ghpull:`22554`: Prepare for making create_dummy_axis not necessary.
+* :ghpull:`22607`: ENH: Add dark/light mode theme to the buttons
+* :ghpull:`21790`: FIX: Update blitting and drawing on the macosx backend
+* :ghpull:`22175`: FIX: Update macosx animation handling
+* :ghpull:`22569`: Require non-zero dash value
+* :ghpull:`22544`: Correct paper sizes
+* :ghpull:`20470`: Issues warnings for legend handles without handlers
+* :ghpull:`22558`: MNT: Simplify imports
+* :ghpull:`22580`: fix doc for annotation_clip parameter
+* :ghpull:`22581`: DOC: fix various typos
+* :ghpull:`22573`: Bump actions/setup-python from 2 to 3
+* :ghpull:`22568`: Rename qhull source to _qhull_wrapper.cpp.
+* :ghpull:`22561`: FIX: Handle stopped animation figure resize
+* :ghpull:`22562`: TST: Add a frame test for animations
+* :ghpull:`22514`: Expire deprecations in cbook.deprecation
+* :ghpull:`22555`: Use picklable callbacks for DraggableBase.
+* :ghpull:`22552`: Tweak dependency checking in doc/conf.py.
+* :ghpull:`22550`: Require sphinx>=3 & numpydoc>=1.0 for building docs.
+* :ghpull:`22539`: Deprecate toplevel mpl.text.get_rotation; normalize rotations early.
+* :ghpull:`22502`: Cleanup unused imports and variables in backends
+* :ghpull:`20071`: Document, test, and simplify impl. of auto_adjustable_area.
+* :ghpull:`22366`: Deprecation removal/updates in axes3d
+* :ghpull:`22484`: Simplify the internal API to connect picklable callbacks.
+* :ghpull:`22417`: Support passing rgbaFace as an array to agg's draw_path.
+* :ghpull:`22412`: Turn _get_axis_map() into a property and remove _get_axis_list()
+* :ghpull:`22486`: Expire deprecations in lines and patches
+* :ghpull:`22512`: Increase coverage
+* :ghpull:`22504`: Simplify FontProperties init.
+* :ghpull:`22497`: Remove entries of MathTextParser._backend_mapping deprecated in 3.4.
+* :ghpull:`22487`: Don't key MathTextParser cache off a mutable FontProperties.
+* :ghpull:`22468`: Turn _mathtext.ship into a plain function.
+* :ghpull:`22490`: Deprecate unused, untested Affine2D.identity().
+* :ghpull:`22491`: Linewrap setupext to 79 character lines.
+* :ghpull:`22488`: Some more maintenance for mathtext internal implementation.
+* :ghpull:`22485`: Change string representation of AxesImage
+* :ghpull:`22240`: Add minimum macosx version
+* :ghpull:`22480`: Remove _point_size_reduction.
+* :ghpull:`22204`: Cleanup _mathtext internal API
+* :ghpull:`22469`: Improve readability of mathtext internal structures.
+* :ghpull:`22477`: Un-pyplot some examples which were already explicitly referencing axes.
+* :ghpull:`22467`: Small cleanup to font handling in agg.
+* :ghpull:`21178`: Add asinh axis scaling (*smooth* symmetric logscale)
+* :ghpull:`22411`: Move cbook._define_aliases() to _api.define_aliases()
+* :ghpull:`22465`: Deprecate unused AddList.
+* :ghpull:`22451`: Clarify error message for bad keyword arguments.
+* :ghpull:`21267`: Cleanup AnnotationBbox.
+* :ghpull:`22464`: Small improvements related to radar_chart example.
+* :ghpull:`22421`: Make most params to figure()/Figure() kwonly.
+* :ghpull:`22457`: Copy arrowprops argument to FancyAnnotationBbox.
+* :ghpull:`22454`: move ``_toolbar_2`` from webagg_core to webagg
+* :ghpull:`22413`: Remove some trivial private getters/setters in axisartist
+* :ghpull:`21634`: TST: Add future dependency tests as a weekly CI job
+* :ghpull:`22079`: Share FigureManager class between gtk3 and gtk4.
+* :ghpull:`22440`: Clarify warning about labels with leading underscores.
+* :ghpull:`17488`: Make error message explicit in legend.py
+* :ghpull:`22453`: Simplify impl. of polar limits setting API.
+* :ghpull:`22449`: Small cleanup to quiver.
+* :ghpull:`22415`: Make emit and auto args of set_{x,y,z}lim keyword only.
+* :ghpull:`22422`: Deprecate backend_ps.convert_psfrags.
+* :ghpull:`22194`: Drop support for Python 3.7
+* :ghpull:`22234`: Partial fix for grid alpha
+* :ghpull:`22433`: Fix ambiguous link targets in docs.
+* :ghpull:`22420`: Update plt.figure() docstring.
+* :ghpull:`22388`: Make signature of Axes.annotate() more explicit.
+* :ghpull:`22419`: Remove "Matplotlib version" from docs issue template
+* :ghpull:`22423`: Avoid indiscriminate glob-remove in xpdf_distill.
+* :ghpull:`22406`: [DOC]: Removed a redundant 'The'
+* :ghpull:`21442`: Factor out common limits handling for x/y/z axes.
+* :ghpull:`22397`: Axes capitalization in widgets and axes3d
+* :ghpull:`22394`: Tweak Axes3D docstrings that refer to 2D plotting methods.
+* :ghpull:`22383`: TST: fix doc build
+* :ghpull:`21877`: DOC: attempt to explain the main different APIs
+* :ghpull:`21238`: Raise when unknown signals are connected to CallbackRegistries.
+* :ghpull:`22345`: MNT: make layout deprecations pending
+* :ghpull:`21597`: FIX: Remove the deepcopy override from transforms
+* :ghpull:`22370`: Replace tabs with spaces in C code.
+* :ghpull:`22371`: Corrected a mistake in comments (Issue #22369)
+* :ghpull:`21352`: Refactor hexbin().
+* :ghpull:`19214`: Improve autoscaling for high order Bezier curves
+* :ghpull:`22268`: Deprecated is_decade and is_close_to_int
+* :ghpull:`22359`: Slightly refactor TeX source generation.
+* :ghpull:`22365`: Remove deprecated ``MovieWriter.cleanup``
+* :ghpull:`22363`: Properly capitalize "Unicode".
+* :ghpull:`22025`: Deprecate various custom FigureFrameWx attributes/methods.
+* :ghpull:`21391`: Reuse imsave()'s background-blending code in FigureCanvasAgg.print_jpeg.
+* :ghpull:`22026`: Simplify wxframe deletion.
+* :ghpull:`22351`: Fix "trailing" whitespace in C docstrings.
+* :ghpull:`22342`: Docstrings for _qhull.
+* :ghpull:`21836`: Slightly shorten ft2font init.
+* :ghpull:`21962`: Privatize various internal APIs of backend_pgf.
+* :ghpull:`22114`: Rewrite AxesStack independently of cbook.Stack.
+* :ghpull:`22332`: Let TransformedPatchPath inherit most functionality from TransformedPath.
+* :ghpull:`22292`: Cleanup Axis._translate_tick_kw
+* :ghpull:`22339`: wx.App() should be init'ed in new_figure_manager_given_figure
+* :ghpull:`22315`: More standardization of floating point slop in mpl_toolkits.
+* :ghpull:`22337`: DOC: More cleanup axes -> Axes
+* :ghpull:`22323`: Replace sole use of maxdict by lru_cache.
+* :ghpull:`22229`: FIX: make safe to add / remove artists during ArtistList iteration
+* :ghpull:`22196`: ``dates`` classes and functions support ``tz`` both as string and ``tzinfo``
+* :ghpull:`22161`: Add box when setting ``PolygonSelector.verts``
+* :ghpull:`19368`: Raise warning and downsample if data given to _image.resample is too large
+* :ghpull:`22250`: Unify toolbar init across backends.
+* :ghpull:`22304`: Added tests for ContourSet.legend_elements
+* :ghpull:`21583`: Add pre-commit config and dev instructions
+* :ghpull:`21547`: Custom cap widths in box and whisker plots in bxp() and boxplot()
+* :ghpull:`20887`: Implement a consistent behavior in TkAgg backend for bad blit bbox
+* :ghpull:`22317`: Rename outdated seaborn styles.
+* :ghpull:`22271`: Rework/fix Text layout cache.
+* :ghpull:`22097`: In mpl_toolkits, use the same floating point slop as for standard ticks.
+* :ghpull:`22295`: Display bad format string in error message.
+* :ghpull:`22287`: Removed unused code and variables
+* :ghpull:`22244`: MNT: colorbar locators properties
+* :ghpull:`22270`: Expanded documentation of Axis.set_ticks as per discussion in issue #22262
+* :ghpull:`22280`: Simplify FontProperties.copy().
+* :ghpull:`22174`: Give the Tk toolbar buttons a flat look
+* :ghpull:`22046`: Add the ability to change the focal length of the camera for 3D plots
+* :ghpull:`22251`: Colorbar docstring reorg
+* :ghpull:`21933`: MNT: privatize colorbar attr
+* :ghpull:`22258`: DOC: fix version switcher
+* :ghpull:`22261`: DOC: fix switcher json
+* :ghpull:`22154`: Add some tests for minspan{x,y} in RectangleSelector
+* :ghpull:`22246`: DOC: add dropdown
+* :ghpull:`22133`: Deprecated ``afm``, ``fontconfig_pattern``, and ``type1font``
+* :ghpull:`22249`: DOC: More capitalization of Axes
+* :ghpull:`22021`: Ensure that all toolbar (old/new) subclasses can be init'ed consistently
+* :ghpull:`22213`: Improve ft2font error reporting.
+* :ghpull:`22245`: Deprecate cleared kwarg to get_renderer.
+* :ghpull:`22239`: Fix typos
+* :ghpull:`22216`: turn off the grid after creating colorbar axes
+* :ghpull:`22055`: FIX: Return value instead of enum in get_capstyle/_joinstyle
+* :ghpull:`22228`: Remove some unnecessary getattrs.
+* :ghpull:`20426`: ENH: Layout engine
+* :ghpull:`22224`: Trivial doc fix to annotations tutorial.
+* :ghpull:`21894`: Jointly track x and y in PolygonSelector.
+* :ghpull:`22205`: Bump minimum NumPy to 1.19
+* :ghpull:`22203`: Factor out underline-thickness lookups in mathtext.
+* :ghpull:`22189`: DOC: Add hatch API to reference
+* :ghpull:`22084`: Clean up 3d plot box_aspect zooming
+* :ghpull:`22098`: Expire axes_grid1/axisartist deprecations.
+* :ghpull:`22013`: Use standard toolbar in wx.
+* :ghpull:`22160`: Removed unused variables etc.
+* :ghpull:`22179`: FIX: macosx check case-insensitive app name
+* :ghpull:`22157`: Improved coverage of mathtext and removed unused code
+* :ghpull:`21781`: Use a fixture to get widget testing axes
+* :ghpull:`22140`: Ensure log formatters use Unicode minus
+* :ghpull:`21342`: Fix drawing animated artists changed in selector callback
+* :ghpull:`22134`: Deprecated ``tight_bbox`` and ``tight_layout`` modules
+* :ghpull:`21965`: Switch transOffset to offset_transform.
+* :ghpull:`22145`: Make Tk windows use the same icon as other backends
+* :ghpull:`22107`: Expire mathttext-related deprecations
+* :ghpull:`22139`: FIX: width/height were reversed in macosx rectangle creation
+* :ghpull:`22123`: Deprecate accepting arbitrary parameters in some get_window_extent() methods
+* :ghpull:`22122`: Hint at draw_without_rendering() in Text.get_window_extent
+* :ghpull:`22120`: Drop dependency on scipy in the docs.
+* :ghpull:`22063`: FIX: Autoposition title when yaxis has offset
+* :ghpull:`22119`: Micro-optimize skew().
+* :ghpull:`22109`: Remove unnecessary null checks in macosx.m, and some more maintenance
+* :ghpull:`21977`: Add corner coordinate helper methods to Ellipse/Rectangle
+* :ghpull:`21830`: Add option of bounding box for PolygonSelector
+* :ghpull:`22115`: Turn _localaxes into a plain list.
+* :ghpull:`22108`: Micro-optimize rotation transform.
+* :ghpull:`22043`: Cleanup differential equations examples.
+* :ghpull:`22080`: Simple style(ish) fixes.
+* :ghpull:`22110`: Right-aligned status text in backends
+* :ghpull:`21873`: DOC: Update and consolidate Custom Tick Formatter for Time Series example
+* :ghpull:`22112`: Fix a small typo
+* :ghpull:`20117`: Very soft-deprecate AxesDivider.new_{horizontal,vertical}.
+* :ghpull:`22034`: Update lines_with_ticks_demo.py
+* :ghpull:`22102`: DOC: rename usage tutorial to quick_start
+* :ghpull:`19228`: Validate text rotation in setter
+* :ghpull:`22081`: Expire colorbar-related deprecations.
+* :ghpull:`22008`: Added color keyword argument to math_to_image
+* :ghpull:`22058`: Remove exprired mplot3d deprecations for 3.6
+* :ghpull:`22073`: DOC: Add new tutorial to external resources.
+* :ghpull:`22054`: MNT: Set CapStyle member names automatically
+* :ghpull:`22061`: De-duplicate mplot3D API docs
+* :ghpull:`22075`: Remove unnecessary ``.figure`` qualifier in docs.
+* :ghpull:`22051`: Make required_interactive_framework required on FigureCanvas.
+* :ghpull:`22050`: Deprecate the noop, unused FigureCanvasBase.resize.
+* :ghpull:`22030`: Add explanatory comments to "broken" horizontal bar plot example
+* :ghpull:`22001`: Fix:    [Bug]: triplot with 'ls' argument yields TypeError #21995
+* :ghpull:`22045`: Fill in missing Axes3D box_aspect argument docstring
+* :ghpull:`22042`: Keep FontEntry helpers private.
+* :ghpull:`21042`: Make rcParams.copy() return a new RcParams instance.
+* :ghpull:`22032`: flipy only affects the drawing of texts, not of images.
+* :ghpull:`21993`: Added docstring to rrulewrapper class
+* :ghpull:`21935`: Significantly improve tight layout performance for cartopy axes
+* :ghpull:`22000`: Some gtk cleanups.
+* :ghpull:`21983`: Simplify canvas class control in FigureFrameWx.
+* :ghpull:`21985`: Slightly tighten the _get_layout_cache_key API.
+* :ghpull:`22020`: Simplify wx _print_image.
+* :ghpull:`22010`: Fix syntax highlighting in contrib guide.
+* :ghpull:`22003`: Initialize RendererCairo.{width,height} in constructor.
+* :ghpull:`21992`: Use _make_classic_style_pseudo_toolbar more.
+* :ghpull:`21916`: Fix picklability of make_norm_from_scale norms.
+* :ghpull:`21981`: FigureCanvasCairo can init RendererCairo; kill RendererCairo subclasses.
+* :ghpull:`21986`: InvLogTransform should only return masked arrays for masked inputs.
+* :ghpull:`21991`: PEP8ify wx callback names.
+* :ghpull:`21975`: DOC: remove experimental tag from CL
+* :ghpull:`21989`: Autoinfer norm bounds.
+* :ghpull:`21980`: Removed loaded modules logging
+* :ghpull:`21982`: Deprecate duplicated FigureManagerGTK{3,4}Agg classes.
+* :ghpull:`21963`: Clarify current behavior of draw_path_collection.
+* :ghpull:`21974`: Reword inset axes example.
+* :ghpull:`21835`: Small improvements to interactive examples
+* :ghpull:`21050`: Store dash_pattern as single attribute, not two.
+* :ghpull:`21557`: Fix transparency when exporting to png via pgf backend.
+* :ghpull:`21904`: Added _repr_html_ for fonts
+* :ghpull:`21696`: Use cycling iterators in RendererBase.
+* :ghpull:`21955`: Refactor common parts of ImageMagick{,File}Writer.
+* :ghpull:`21952`: Clarify coordinates for RectangleSelector properties
+* :ghpull:`21964`: Fix some more missing references.
+* :ghpull:`21516`: Make _request_autoscale_view more generalizable to 3D.
+* :ghpull:`21947`: Slightly cleanup RendererBase docs.
+* :ghpull:`21961`: Privatize various internal APIs of backend_pgf.
+* :ghpull:`21956`: Remove tests for avconv animation writers.
+* :ghpull:`21954`: DOC: Move Animation and MovieWriter inheritance diagrams ...
+* :ghpull:`21780`: Add a click_and_move widget test helper
+* :ghpull:`21941`: Merge branch v3.5.x into main
+* :ghpull:`21936`: Small ``__getstate__`` cleanups.
+* :ghpull:`21939`: Update comment re: register_at_fork.
+* :ghpull:`21910`: Fold _rgbacache into _imcache.
+* :ghpull:`21921`: Clean up RectangleSelector move code
+* :ghpull:`21925`: Drop labelling from PR welcome action
+* :ghpull:`14930`: Set Dock icon on the macosx backend
+* :ghpull:`21920`: Improve square state calculation in RectangleSelector
+* :ghpull:`21919`: Fix use_data_coordinates docstring
+* :ghpull:`21881`: Add a PolygonSelector.verts setter
+* :ghpull:`20839`: Fix centre and square state and add rotation for rectangle selector
+* :ghpull:`21874`: DOC: Add Date Tick Locators and Formatters example
+* :ghpull:`21799`: Added get_font_names() to fontManager
+* :ghpull:`21871`: DOC: Code from markevery_prop_cycle moved to test.
+* :ghpull:`21395`: Expire _check_savefig_extra_args-related deprecations.
+* :ghpull:`21867`: Remove unused bbox arg to _convert_agg_to_wx_bitmap.
+* :ghpull:`21868`: Use partialmethod for better signatures in backend_ps.
+* :ghpull:`21520`: Shorten some inset_locator docstrings.
+* :ghpull:`21737`: Update the "Rotating a 3D plot" gallery example to show all 3 rotation axes
+* :ghpull:`21851`: Re-order a widget test function
+* :ghpull:`10762`: Normalization of elevation and azimuth angles for surface plots
+* :ghpull:`21426`: Add ability to roll the camera in 3D plots
+* :ghpull:`21822`: Replace NSDictionary by switch-case.
+* :ghpull:`21512`: MNT: Add modifier key press handling to macosx backend
+* :ghpull:`21784`: Set macOS icon when using Qt backend
+* :ghpull:`21748`: Shorten PyObjectType defs in macosx.m.
+* :ghpull:`21809`: MNT: Turn all macosx warnings into errors while building
+* :ghpull:`21792`: Fix missing return value in closeButtonPressed.
+* :ghpull:`21767`: Inherit many macos backend docstrings.
+* :ghpull:`21766`: Don't hide build log on GHA.
+* :ghpull:`21728`: Factor out some macosx gil handling for py-method calls from callbacks.
+* :ghpull:`21754`: Update gitattributes so that objc diffs are correctly contextualized.
+* :ghpull:`21752`: Add a helper for directly output pdf streams.
+* :ghpull:`21750`: Don't sort pdf dicts.
+* :ghpull:`21745`: DOC: Clarify Coords Report Example
+* :ghpull:`21746`: Fix/add docstring signatures to many C++ methods.
+* :ghpull:`21631`: DOC: change gridspec tutorial to arranging_axes tutorial
+* :ghpull:`21318`: FIX: better error message for shared axes and axis('equal')
+* :ghpull:`21519`: mark_inset should manually unstale axes limits before drawing itself.
+* :ghpull:`21724`: Fix copyright date with SOURCE_DATE_EPOCH set
+* :ghpull:`21398`: FIX: logic of title repositioning
+* :ghpull:`21717`: Simplify macosx toolbar init.
+* :ghpull:`21690`: Whitespace/braces/#defines cleanup to macosx.
+* :ghpull:`21695`: Use _api.check_shape more.
+* :ghpull:`21698`: Small code cleanups and style fixes.
+* :ghpull:`21529`: Delay-load keymaps in toolmanager.
+* :ghpull:`21525`: Fix support for clim in scatter.
+* :ghpull:`21697`: Drop non-significant zeros from ps output.
+* :ghpull:`21692`: CI: Remove CI test runs from forks of matplotlib
+* :ghpull:`21591`: Make ToolFullScreen a Tool, not a ToolToggle.
+* :ghpull:`21677`: Simplify test for negative xerr/yerr.
+* :ghpull:`21657`: Replace some image_comparisons by return-value-tests/check_figures_e…
+* :ghpull:`21664`: Merge 3.5.x into main
+* :ghpull:`21490`: Make Line2D copy its inputs
+* :ghpull:`21639`: Skip some uses of packaging's PEP440 version for non-Python versions.
+* :ghpull:`21604`: Fix centre square rectangle selector part 1
+* :ghpull:`21593`: Check for images added-and-modified in a same PR
+* :ghpull:`20750`: Shorten issue templates
+* :ghpull:`21590`: Make gtk3 full_screen_toggle more robust against external changes.
+* :ghpull:`21582`: Organize checklist in PR template
+* :ghpull:`21580`: Rename/remove _lastCursor, as needed.
+* :ghpull:`21567`: Removed the range parameter from the validate_whiskers function's err…
+* :ghpull:`21565`: Further remove remnants of offset_position.
+* :ghpull:`21542`: [ENH]: Use new style format strings for colorbar ticks
+* :ghpull:`21564`: Skip invisible artists when doing 3d projection.
+* :ghpull:`21558`: Various small fixes for streamplot().
+* :ghpull:`21544`: Return minorticks as array, not as list.
+* :ghpull:`21546`: Added links to the mosaic docs in figure and pyplot module docstrings
+* :ghpull:`21545`: Turn mouseover into a mpl-style getset_property.
+* :ghpull:`21537`: Remove unnecessary False arg when constructing wx.App.
+* :ghpull:`21536`: Reword margins docstrings, and fix bounds on zmargin values.
+* :ghpull:`21535`: typo-correction-on-line-185
+* :ghpull:`21534`: Do not use space in directive calling.
+* :ghpull:`21494`: Adding tutorial links for blitting in widgets.py
+* :ghpull:`21407`: Stash exceptions when FT2Font closes the underlying stream.
+* :ghpull:`21431`: set_ticks([single_tick]) should also expand view limits.
+* :ghpull:`21444`: Make pipong example self-contained.
+* :ghpull:`21392`: Add label about workflow to new contributor PRs
+* :ghpull:`21440`: Install sphinx-panels along with development setup
+* :ghpull:`21434`: Remove coords_flat variable
+* :ghpull:`21415`: Move gui_support.macosx option to packages section.
+* :ghpull:`21412`: Privatize some SVG internal APIs.
+* :ghpull:`21401`: Uncamelcase some internal variables in axis.py; rename _get_tick_bboxes.
+* :ghpull:`21417`: Use Bbox.unit() more.
+* :ghpull:`20253`: Simplify parameter handling in FloatingAxesBase.
+* :ghpull:`21379`: Simplify filename tracking in FT2Font.
+* :ghpull:`21278`: Clear findfont cache when calling addfont().
+* :ghpull:`21400`: Use bbox.{size,bounds,width,height,p0,...} where appropriate.
+* :ghpull:`21408`: Reword annotations tutorial section titles.
+* :ghpull:`21371`: Rename default branch
+* :ghpull:`21389`: Log pixel coordinates in event_handling coords_demo example on terminal/console
+* :ghpull:`21376`: Factor common parts of saving to different formats using pillow.
+* :ghpull:`21377`: Enable tests for text path based markers
+* :ghpull:`21283`: Demonstrate inset_axes in scatter_hist example.
+* :ghpull:`21356`: Raise an exception when find_tex_file fails to find a file.
+* :ghpull:`21362`: Simplify wording of allowed errorbar() error values
+* :ghpull:`21274`: ENH: Add support to save images in WebP format
+* :ghpull:`21289`: Simplify _init_legend_box.
+* :ghpull:`21256`: Make image_comparison work even without the autoclose fixture.
+* :ghpull:`21343`: Fix type1font docstring markup/punctuation.
+* :ghpull:`21341`: Fix trivial docstring typo.
+* :ghpull:`21301`: Simplify ``Colormap.__call__`` a bit.
+* :ghpull:`21280`: Make ``Path.__deepcopy__`` interact better with subclasses, e.g. TextPath.
+* :ghpull:`21266`: Fix #21101 Add validator to errorbar method
+* :ghpull:`20921`: Fix problem with (deep)copy of TextPath
+* :ghpull:`20914`: 19195 rotated markers
+* :ghpull:`21276`: Add language about not assigning issues
+* :ghpull:`20715`: Improve Type-1 font parsing
+* :ghpull:`21218`: Parametrize/simplify test_missing_psfont.
+* :ghpull:`21213`: Compress comments in make_image.
+* :ghpull:`21187`: Deprecate error_msg_foo helpers.
+* :ghpull:`21190`: Deprecate mlab.stride_windows.
+* :ghpull:`21152`: Rename ``**kw`` to ``**kwargs``.
+* :ghpull:`21087`: Move colormap examples from userdemo to images_contours_and_fields.
+* :ghpull:`21074`: Deprecate MarkerStyle(None).
+* :ghpull:`20990`: Explicit registration of canvas-specific tool subclasses.
+* :ghpull:`21049`: Simplify setting Legend attributes
+* :ghpull:`21056`: Deprecate support for no-args MarkerStyle().
+* :ghpull:`21059`: Remove dummy test command from setup.py
+* :ghpull:`21015`: Prepare for rcParams.copy() returning a new RcParams instance in the future
+* :ghpull:`21021`: Factor out for_layout_only backcompat support in get_tightlayout.
+* :ghpull:`21023`: Inline ToolManager._trigger_tool to its sole call site.
+* :ghpull:`21005`: Test the rcParams deprecation machinery.
+* :ghpull:`21010`: Avoid TransformedBbox where unneeded.
+* :ghpull:`21019`: Reword custom_ticker1 example.
+* :ghpull:`20995`: Deprecate some backend_gtk3 helper globals.
+* :ghpull:`21004`: Remove now-unused rcParams _deprecated entries.
+* :ghpull:`20986`: Make HandlerLine2D{,Compound} inherit constructors from HandlerNpoints.
+* :ghpull:`20974`: Rename symbol_name to glyph_name where appropriate.
+* :ghpull:`20961`: Small cleanups to math_to_image.
+* :ghpull:`20957`: legend_handler_map cleanups.
+* :ghpull:`20955`: Remove unused HostAxes._get_legend_handles.
+* :ghpull:`20851`: Try to install the Noto Sans CJK font
+
+Issues (202):
+
+* :ghissue:`23827`: backend_gtk3agg.py calls set_device_scale
+* :ghissue:`23560`: [Doc]: mpl_toolkits.axes_grid still mentioned as maintained
+* :ghissue:`23794`: [Doc]: Version switcher broken in devdocs
+* :ghissue:`23806`: [Bug]: possible regression in axis ticks handling in matplotlib 3.6.0rc2
+* :ghissue:`22965`: [Bug]: triplot duplicates label legend
+* :ghissue:`23807`: streamplot raises ValueError when the input is zeros
+* :ghissue:`23761`: [Bug]: False positive legend handler warnings in 3.6.0.rc1
+* :ghissue:`23398`: [Bug]: Newer versions of matplotlib ignore xlabel on colorbar axis
+* :ghissue:`23699`: [Bug]: Bug with toolbar instantiation in notebook
+* :ghissue:`23745`: [Doc]: Minor rcParams/matplotlibrc doc issues
+* :ghissue:`23717`: [Bug]: AxesSubplot.get_yticks not returning the actual printed ticks
+* :ghissue:`21508`: [Doc]: Create diagram to show rotation directions for 3D plots
+* :ghissue:`23709`: [Bug]: colorbar with unattached mappables can't steal space
+* :ghissue:`23701`: [Bug]: plt.figure(), plt.close() leaks memory
+* :ghissue:`22409`: [Bug]: AttributeError: 'QResizeEvent' object has no attribute 'pos'
+* :ghissue:`19609`: DeprecationWarning when changing color maps
+* :ghissue:`23716`: MatplotlibDeprecationWarning removal hard-breaks seaborn in 3.6rc1
+* :ghissue:`23719`: [Bug]: register_cmap deprecation message seems wrong
+* :ghissue:`23707`: test_Normalize fails on aarch64/ppc64le/s390x
+* :ghissue:`21107`: [MNT]: Should plt.xticks() get a minor keyword argument
+* :ghissue:`23679`: [Doc]: Deprecated modules not in docs
+* :ghissue:`19550`: Arc and pathpatch_2d_to_3d plots full ellipse
+* :ghissue:`23329`: [Bug]: ``plt.autoscale()`` fails for partial ``Arc``
+* :ghissue:`11266`: Arc patch ignoring theta1/theta2 when added to Axes via PatchCollection
+* :ghissue:`4067`: 'Poly3DCollection' object has no attribute '_facecolors2d'
+* :ghissue:`23622`: [MNT]: make.bat not parsing sphinxopt
+* :ghissue:`23459`: [Bug]: 'Line3D' object has no attribute '_verts3d'
+* :ghissue:`23653`: [Bug]: macosx subplot tool causes segfault when window closed
+* :ghissue:`23660`: [Bug]: Test test_figure.py::test_subfigure_ss[png] FAILED on ppc64le
+* :ghissue:`23645`: [MNT]: Python 3.11 manylinux wheels
+* :ghissue:`23650`: TTF fonts loaded from file are not embedded/displayed properly when saved to pdf
+* :ghissue:`23583`: [Doc]: Document the position parameter in apply_aspect()
+* :ghissue:`23386`: setuptools_scm-git-archive is obsolete
+* :ghissue:`23220`: [Doc]: Clarify ``offset`` parameter in linestyle
+* :ghissue:`22746`: [Doc]: Document that rcParams['font.family'] can be a list
+* :ghissue:`8187`: Axes doesn't have ````legends```` attribute?
+* :ghissue:`23580`: [Bug]: TypeError when plotting against list of datetime.date where 0th element of list is None
+* :ghissue:`15514`: Relevant methods are only documented in base classes and thus not easily discoverable
+* :ghissue:`21611`: DOC: Add conda environment instructions to developers guide
+* :ghissue:`23487`: [Bug]: scatter plot color settings discarded unless c given
+* :ghissue:`22977`: [Bug]: offset dash linestyle has no effect in patch objects
+* :ghissue:`18883`: Matplotlib would not try to apply all the font in font list to draw all characters in the given string.
+* :ghissue:`22570`: [ENH]: Provide ``axis('equal')`` for ``Axes3D``.
+* :ghissue:`23433`: [Bug]: array-like linewidth raises an error for scatter3D
+* :ghissue:`12388`: Legend Title Left Alignment
+* :ghissue:`23375`: [Bug]: markerfacecoloralt not supported when drawing errorbars
+* :ghissue:`17973`: DOC: matplotlib.__doc__ not included in online docs ?
+* :ghissue:`23474`: [Bug]: ``\,`` and ``\mathrm{\,}`` are not identical in Mathtext when using CM and STIX
+* :ghissue:`8715`: event handlers have different signatures across backends
+* :ghissue:`18271`: PGF uses the minimal document class
+* :ghissue:`23324`: [Bug]: Exception not handled in widgetlock()
+* :ghissue:`15710`: doc for type of tz parameter is inconsistent throughout dates.py
+* :ghissue:`21165`: Hexbin marginals need a test for linear scaling
+* :ghissue:`23105`: [MNT]: Deprecate per-backend customization of draw_if_interactive
+* :ghissue:`23147`: [Bug]: with setuptools>=60, cannot find msbuild
+* :ghissue:`23379`: [Bug]: Offset notation on y-axis can overlap with a long title
+* :ghissue:`22819`: [Doc]: Make rect argument consistent in the docstrings
+* :ghissue:`23172`: [Bug]: Calling matplotlib.pyplot.show() outside of matplotlib.pyplot.rc_context no longer works
+* :ghissue:`23019`: [Bug]: ``UnicodeDecodeError`` when using some special and accented characters in TeX
+* :ghissue:`23334`: [Doc]: Tk embedding example crashes Spyder
+* :ghissue:`23298`: [Bug]: get_backend() clears figures from Gcf.figs if they were created under rc_context
+* :ghissue:`21942`: [ENH]: add width/height_ratios to subplots and friends
+* :ghissue:`23028`: [ENH]: contour kwarg for negative_linestyle
+* :ghissue:`19223`: Certain non-hashable parameters to text() give cryptic error messages
+* :ghissue:`18351`: Add the ability to plot striped lines
+* :ghissue:`23205`: [Bug]: URL-area not rotated in PDFs
+* :ghissue:`23268`: [Bug]: hyphen renders different length depending on presence of MathText
+* :ghissue:`23308`: [Bug]: set_visible() not working for 3d projection
+* :ghissue:`23296`: Set_color method for line2d object in latest document not work
+* :ghissue:`22992`: [Bug]: test_image_comparison_expect_rms nondeterministic failure
+* :ghissue:`23008`: [ENH]: Use ``\genfrac`` in display style?
+* :ghissue:`23214`: [MNT]: Rename examples with "test" in the name
+* :ghissue:`17852`: Thin space missing after mathtext operators
+* :ghissue:`12078`: Inconsistency in keyword-arguments ncol/ncols, nrow/nrows
+* :ghissue:`23239`: [Doc]: steps is not implemented in line styles.
+* :ghissue:`23151`: [MNT]: default date limits...
+* :ghissue:`9462`: Misaligned bottoms of subplots for png output with bbox_inches='tight'
+* :ghissue:`21369`: [Bug]: ax.invert_xaxis() and ax.invert_yaxis() both flip the X axis
+* :ghissue:`20797`: ``macosx`` cursors break with images
+* :ghissue:`23084`: [TST] Upcoming dependency test failures
+* :ghissue:`22910`: [Bug]: bar_label fails with nan errorbar values
+* :ghissue:`23074`: [Bug]: matplotlib crashes if ``_tkinter`` doesn't have ``__file__``
+* :ghissue:`23083`: [Bug]: Confusing error messages
+* :ghissue:`22391`: [Doc]: Remove "keywords" line at the bottom of all examples
+* :ghissue:`20202`: Daylocator causes frozen computer when used with FuncAnimation
+* :ghissue:`22529`: Replace C++ quad contouring code with use of ContourPy
+* :ghissue:`21710`: [ENH]: macosx backend does not respect rcParams["savefig.directory"]
+* :ghissue:`21880`: [Doc]: rrulewrapper not included in API docs
+* :ghissue:`22622`: [Bug]: Gaps and overlapping areas between bins when using float16
+* :ghissue:`23043`: [TST] Upcoming dependency test failures
+* :ghissue:`17960`: Line2D object markers are lost when retrieved from legend.get_lines() when linestyle='None'
+* :ghissue:`23026`: [MNT]: Require that matplotlibrc/style files use utf-8 (or have an encoding cookie)
+* :ghissue:`22947`: [Bug]: Can't use ``plt.sca()`` on axes created using subfigures
+* :ghissue:`22623`: [ENH]: support rect with constrained_layout ("layout only to part of the figure")
+* :ghissue:`22917`: "ab;cd" missing in subplot_mosaic tutorial
+* :ghissue:`22686`: [Bug]: can not give init value for RangeSlider widget
+* :ghissue:`22740`: [MNT]: Add codespell to pre-commit hooks
+* :ghissue:`22893`: rainbow text example is broken
+* :ghissue:`21571`: [Doc]: Clarify text positioning
+* :ghissue:`22092`: [Bug]: Configure subplots dialog freezes for TkAgg with toolmanager
+* :ghissue:`22760`: [Bug]: Macosx legend picker doesn't work anymore
+* :ghissue:`16369`: Call to input blocks slider input on osx with the default agg 'MacOSX'. It works fine on when TkAgg is used.
+* :ghissue:`22915`: [Bug]: figure.raise_window rcParam does not work on MacOSX backend
+* :ghissue:`22930`: [Bug]: Regression in dashes due to #22569
+* :ghissue:`22859`: [Bug]: findSystemFonts should not look in subdirectories of C:\Windows\Fonts\
+* :ghissue:`22882`: Missing ``f`` prefix on f-strings
+* :ghissue:`22738`: [MNT]: make Axes.cla an alias for Axes.clear in all cases
+* :ghissue:`22708`: [TST] Upcoming dependency test failures
+* :ghissue:`8388`: Proposed ENH: Allow user to turn off breaking of streamlines in streamplot
+* :ghissue:`20755`: [Bug]: make_norm_from_scale should create picklable classes even when used in-line.
+* :ghissue:`18249`: Expand the explanation of the Object-Oriented interface
+* :ghissue:`22792`: [Bug]: .eps greyscale hatching of patches when lw=0
+* :ghissue:`22630`: [ENH]: enable passing of projection keyword to Axes.inset_axes
+* :ghissue:`22414`: [Bug]: bar_label overlaps bars when y-axis is inverted
+* :ghissue:`22726`: [Bug]: tripcolor ignores clim
+* :ghissue:`21635`: [ENH]: Add a nightly wheel build
+* :ghissue:`9994`: document where nightly wheels are published
+* :ghissue:`22350`: [Bug]: text.usetex Vs. DateFormatter
+* :ghissue:`4976`: missing imshow() subplots when using tight_layout()
+* :ghissue:`22150`: [ENH]: Tool icons are hardly visible in Tk when using a dark theme
+* :ghissue:`22662`: Leave color parameter empty should be fine[ENH]:
+* :ghissue:`22671`: [Doc]: plot_format adaption invalidates sphinx cache
+* :ghissue:`22582`: [Bug]: FontManager.addfont doesn't accept pathlib.Path of TTF font
+* :ghissue:`22657`: [ENH]: vector map
+* :ghissue:`16181`: The great API cleanup
+* :ghissue:`22636`: [Bug]: Infinite loop when there is single double quote in matplotlibrc
+* :ghissue:`22266`: [Doc]: Improve examples in documentation
+* :ghissue:`11861`: Figure does not close until script finishes execution
+* :ghissue:`19288`: Escape # character in matplotlibrc
+* :ghissue:`22579`: [Bug]: Replacement for epoch2num behaves differently (does not accept arrays)
+* :ghissue:`22605`: [Bug]: Tool contrast low with dark theme on macosx backend
+* :ghissue:`17642`: bring osx backend flush_events to feature parity with other backend
+* :ghissue:`19268`: Drawing the canvas does not populate ticklabels on MacOSX backend
+* :ghissue:`17445`: MacOSX does not render frames in which new artists are added when blitting
+* :ghissue:`10980`: Current versions cannot reproduce rotate_axes_3d_demo.py
+* :ghissue:`18451`: MacOSX backend fails with animation in certain scripts
+* :ghissue:`22603`: [MNT]: Replace str(n)cpy etc with safe versions (C++)
+* :ghissue:`19121`: Handle and label not created for Text with label
+* :ghissue:`22563`: [Doc]: annotation_clip=None not correctly documented
+* :ghissue:`12528`: Empty axes on draw after blitted animation finishes
+* :ghissue:`20991`: [Bug]: Error when using path effect with a PolyCollection
+* :ghissue:`19563`: path_effects kwarg triggers exception on 3D scatterplot
+* :ghissue:`8650`: System Error in backend_agg. (with a fix!)
+* :ghissue:`20294`: ``AxesImage.__str__`` is wrong if the image does not span the full Axes.
+* :ghissue:`18066`: Document minimum supported OSX version for macos backend
+* :ghissue:`17018`: Add documentation about transparency of frame
+* :ghissue:`22403`: [MNT]: Confusing prompt in docs issue template
+* :ghissue:`8839`: mpl_connect silently does nothing when passed an invalid event type string
+* :ghissue:`22343`: [MNT]: Delay (or make pending) the deprecation of set_constrained_layout/set_tight_layout
+* :ghissue:`21554`: [Bug]: ``ValueError`` upon deepcopy of a ``Figure`` object
+* :ghissue:`22369`: [Doc]: Incorrect comment in example code for creating adjacent subplots
+* :ghissue:`19174`: connectionstyle arc3 with high rad value pushes up data interval of x-axis and y-axis.
+* :ghissue:`8351`: seaborn styles make "+", "x" markers invisible; proposed workaround for shipped styles
+* :ghissue:`22278`: Deprecate/remove maxdict
+* :ghissue:`19276`: imshow with very large arrays not working as expected
+* :ghissue:`22035`: [ENH]: Specify a custom focal length / FOV for the 3d camera
+* :ghissue:`22264`: [Bug]: new constrained_layout causes axes to go invisible(?)
+* :ghissue:`21774`: [MNT]: Improvements to widget tests
+* :ghissue:`18722`: Consider removing AFM+mathtext support
+* :ghissue:`21540`: [Bug]: cm fontset in log scale does not use Unicode minus
+* :ghissue:`22062`: [Bug]: Autopositioned title overlaps with offset text
+* :ghissue:`22093`: [Bug]: AttributeError: 'AxesSubplot' object has no attribute 'add_text'
+* :ghissue:`22012`: [Bug]: Mouseover coordinate/value text should be right aligned
+* :ghissue:`21995`: [Bug]: triplot with 'ls' argument yields TypeError
+* :ghissue:`20249`: MatplotlibDeprecationWarning when updating rcparams
+* :ghissue:`15781`: MatplotlibDeprecationWarning examples.directory is deprecated
+* :ghissue:`13118`: No MatplotlibDeprecationWarning for default rcParams
+* :ghissue:`21978`: Remove logging debug of loaded modules
+* :ghissue:`11738`: pgf backend doesn't make background transparent
+* :ghissue:`18039`: Add ``_repr_html_`` for fonts
+* :ghissue:`21970`: [Bug]: tight layout breaks with toolbar.push_current()
+* :ghissue:`14850`: No icon showing up with macosx backend
+* :ghissue:`17283`: Create Date Formatter/Locator Reference
+* :ghissue:`21761`: [Doc]: add how to know available fonts...
+* :ghissue:`21863`: [Doc]: Remove example "prop_cycle property markevery in rcParams"
+* :ghissue:`10241`: Axes3D.view_init elevation issue between 270 and 360 degrees
+* :ghissue:`14453`: add third angle to view_init()
+* :ghissue:`20486`: Modifier key press events not recognized on MacOSX backend
+* :ghissue:`9837`: MacOS: Key modifiers deprecated
+* :ghissue:`11416`: RuntimeError: adjustable='datalim' is not allowed when both axes are shared.
+* :ghissue:`17711`: inset_locator.mark_inset() misplaces box connectors
+* :ghissue:`20854`: [Doc]: Incorrect copyright start year at the bottom of devdocs page
+* :ghissue:`21394`: [Bug]: Subplot title does not obey padding
+* :ghissue:`20998`: [Bug]: ToolManager does not respect rcParams["keymap.<any>"] set after import time
+* :ghissue:`7075`: Superscripts in axis label cut when saving .eps with bbox_inches="tight"
+* :ghissue:`21514`: [Doc]: Error message of validate_whiskers is not updated
+* :ghissue:`21532`: [Doc]: subplot_mosaic docstring should link to the tutorial
+* :ghissue:`16550`: Docs: performance discussion of tight_layout
+* :ghissue:`21378`: [ENH]: use new style format strings for colorbar ticks
+* :ghissue:`19323`: Streamplot color mapping fails on (near-)empty array.
+* :ghissue:`19559`: Axes.get_xticks() returns a numpy array but Axes.get_xticks(minor=True) returns a plain list
+* :ghissue:`21526`: [Doc]: Little Typo on Introductory Tutorial
+* :ghissue:`19195`: Rotate Markers in functions like plot, scatter, etcetera
+* :ghissue:`21364`: [Bug]: double free when FT2Font constructor is interrupted by KeyboardInterrupt
+* :ghissue:`16581`: Can't not refresh new font in running interpreter
+* :ghissue:`21162`: [ENH]: saving images in webp format
+* :ghissue:`18168`: The example of the testing decorator does not work.
+* :ghissue:`20943`: [Bug]: Deepcopy of TextPath fails
+* :ghissue:`21101`: [Bug]: Errorbars separated from markers with negative errors
+* :ghissue:`17986`: MEP22 per-backend tool registration
+* :ghissue:`4938`: Feature request: add option to disable mathtext parsing
+* :ghissue:`11435`: plt.subplot eats my subplots
diff --git a/doc/users/prev_whats_new/github_stats_3.6.1.rst b/doc/users/prev_whats_new/github_stats_3.6.1.rst
new file mode 100644
index 000000000000..d47dc28fa076
--- /dev/null
+++ b/doc/users/prev_whats_new/github_stats_3.6.1.rst
@@ -0,0 +1,143 @@
+.. _github-stats-3-6-1:
+
+GitHub statistics for 3.6.1 (Oct 08, 2022)
+==========================================
+
+GitHub statistics for 2022/09/16 (tag: v3.6.0) - 2022/10/08
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 22 issues and merged 80 pull requests.
+The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/73?closed=1>`__
+
+The following 19 authors contributed 129 commits.
+
+* Antony Lee
+* baharev
+* David Stansby
+* dependabot[bot]
+* Eli Rykoff
+* Elliott Sales de Andrade
+* erykoff
+* Greg Lucas
+* hannah
+* Ian Hunt-Isaak
+* Jody Klymak
+* melissawm
+* Oscar Gustafsson
+* Ruth Comer
+* slackline
+* Steffen Rehberg
+* Thomas A Caswell
+* Tim Hoffmann
+* مهدي شينون (Mehdi Chinoune)
+
+GitHub issues and pull requests:
+
+Pull Requests (80):
+
+* :ghpull:`24124`: Backport PR #24111 on branch v3.6.x (FIX: add missing method to ColormapRegistry)
+* :ghpull:`24111`: FIX: add missing method to ColormapRegistry
+* :ghpull:`24117`: Backport PR #24113 on branch v3.6.x (Add exception class to pytest.warns calls)
+* :ghpull:`24116`: Backport PR #24115 on branch v3.6.x (Fix mask lookup in fill_between for NumPy 1.24+)
+* :ghpull:`24113`: Add exception class to pytest.warns calls
+* :ghpull:`24115`: Fix mask lookup in fill_between for NumPy 1.24+
+* :ghpull:`24112`: Backport PR #24109 on branch v3.6.x (DOC: add API change note for colorbar deprecation)
+* :ghpull:`24109`: DOC: add API change note for colorbar deprecation
+* :ghpull:`24107`: Backport PR #24088 on branch v3.6.x (MNT: make orphaned colorbar deprecate versus raise)
+* :ghpull:`24088`: MNT: make orphaned colorbar deprecate versus raise
+* :ghpull:`24103`: Backport PR #23684 on branch v3.6.x (Fix rectangle and hatches for colorbar)
+* :ghpull:`23684`: Fix rectangle and hatches for colorbar
+* :ghpull:`24087`: Backport PR #24084 on branch v3.6.x (Revert argument checking for label_mode)
+* :ghpull:`24084`: Revert argument checking for label_mode
+* :ghpull:`24078`: Backport PR #24047 on branch v3.6.x (Revert #22360: Let TeX handle multiline strings itself)
+* :ghpull:`24047`: Revert #22360: Let TeX handle multiline strings itself
+* :ghpull:`24077`: Backport PR #24054 on branch v3.6.x ( DOC: Move OO-examples from pyplot section)
+* :ghpull:`24054`:  DOC: Move OO-examples from pyplot section
+* :ghpull:`24072`: Backport PR #24069 on branch v3.6.x (Clarification of marker size in scatter)
+* :ghpull:`24073`: Backport PR #24070 on branch v3.6.x (DOC: colorbar may steal from array of axes)
+* :ghpull:`24070`: DOC: colorbar may steal from array of axes
+* :ghpull:`24069`: Clarification of marker size in scatter
+* :ghpull:`24059`: Backport PR #23638 on branch v3.6.x (FIX: correctly handle generic font families in svg text-as-text mode)
+* :ghpull:`23638`: FIX: correctly handle generic font families in svg text-as-text mode
+* :ghpull:`24048`: Backport PR #24045 on branch v3.6.x (Fix _FigureManagerGTK.resize on GTK4)
+* :ghpull:`24055`: Backport PR #24046 on branch v3.6.x (Ignore 'CFMessagePort: bootstrap_register' messages)
+* :ghpull:`24046`: Ignore 'CFMessagePort: bootstrap_register' messages
+* :ghpull:`24051`: Backport PR #24037 on branch v3.6.x ([DOC]: make spanselector example codeblock continuous)
+* :ghpull:`24037`: [DOC]: make spanselector example codeblock continuous
+* :ghpull:`24045`: Fix _FigureManagerGTK.resize on GTK4
+* :ghpull:`24043`: Backport PR #24041 on branch v3.6.x (DOC: Fix incorrect redirect)
+* :ghpull:`24030`: Backport PR #24019 on branch v3.6.x (Don't require FigureCanvas on backend module more)
+* :ghpull:`24040`: Backport PR #24018 on branch v3.6.x (When comparing eps images, run ghostscript with -dEPSCrop.)
+* :ghpull:`24018`: When comparing eps images, run ghostscript with -dEPSCrop.
+* :ghpull:`24033`: Backport PR #24032 on branch v3.6.x (Reword SpanSelector example.)
+* :ghpull:`24029`: Backport PR #24026 on branch v3.6.x (Don't modify Axes property cycle in stackplot)
+* :ghpull:`23994`: Backport PR #23964 on branch v3.6.x (Fix issue with empty line in ps backend)
+* :ghpull:`24019`: Don't require FigureCanvas on backend module more
+* :ghpull:`24026`: Don't modify Axes property cycle in stackplot
+* :ghpull:`24027`: Backport PR #23904 on branch v3.6.x (added a reversing section to colormap reference)
+* :ghpull:`24017`: Backport PR #24014 on branch v3.6.x (Bump pypa/cibuildwheel from 2.10.1 to 2.10.2)
+* :ghpull:`24014`: Bump pypa/cibuildwheel from 2.10.1 to 2.10.2
+* :ghpull:`24007`: Backport PR #24004 on branch v3.6.x (Increase consistency in tutorials and examples)
+* :ghpull:`23964`: Fix issue with empty line in ps backend
+* :ghpull:`23904`: added a reversing section to colormap reference
+* :ghpull:`23990`: Backport PR #23978 on branch v3.6.x (DOC: Suppress IPython output in examples and tutorials where not needed)
+* :ghpull:`23978`: DOC: Suppress IPython output in examples and tutorials where not needed
+* :ghpull:`23916`: Backport PR #23912 on branch v3.6.x (FIX: only expect FigureCanvas on backend module if using new style)
+* :ghpull:`23989`: Backport PR #23944 on branch v3.6.x (FIX: ValueError when hexbin is run with empty arrays and log scaling.)
+* :ghpull:`23944`: FIX: ValueError when hexbin is run with empty arrays and log scaling.
+* :ghpull:`23988`: Backport PR #23987 on branch v3.6.x (FIX: do not set constrained layout on false-y values)
+* :ghpull:`23987`: FIX: do not set constrained layout on false-y values
+* :ghpull:`23982`: Backport PR #23980 on branch v3.6.x (DOC: Move Quick Start Tutorial to first position)
+* :ghpull:`23979`: Backport PR #23975 on branch v3.6.x (Reword docstring of reset_position.)
+* :ghpull:`23975`: Reword docstring of reset_position.
+* :ghpull:`23966`: Backport PR #23930 on branch v3.6.x (Fix edge color, links, wording; closes matplotlib/matplotlib#23895)
+* :ghpull:`23971`: Backport PR #23906 on branch v3.6.x (Edit mplot3d examples for correctness and consistency)
+* :ghpull:`23906`: Edit mplot3d examples for correctness and consistency
+* :ghpull:`23963`: Backport PR #23957 on branch v3.6.x (Bump pypa/cibuildwheel from 2.9.0 to 2.10.1)
+* :ghpull:`23930`: Fix edge color, links, wording; closes matplotlib/matplotlib#23895
+* :ghpull:`23910`: FIX: do not append None to stream in ps
+* :ghpull:`23957`: Bump pypa/cibuildwheel from 2.9.0 to 2.10.1
+* :ghpull:`23960`: Backport PR #23947 on branch v3.6.x (Fix building on MINGW)
+* :ghpull:`23942`: DOC: fix versions in v3.6.x doc switcher
+* :ghpull:`23961`: Backport PR #23958 on branch v3.6.x (DOC: Remove Adding Animations section)
+* :ghpull:`23958`: DOC: Remove Adding Animations section
+* :ghpull:`23947`: Fix building on MINGW
+* :ghpull:`23945`: Backport PR #23941 on branch v3.6.x (consistent notation for minor/patch branches)
+* :ghpull:`23956`: Backport PR #23751 on branch v3.6.x (FIX: show bars when the first location is nan)
+* :ghpull:`23751`: FIX: show bars when the first location is nan
+* :ghpull:`23938`: Backport PR #23919 on branch v3.6.x (DOC: remove dead "Show Source" links)
+* :ghpull:`23952`: Backport PR #23951 on branch v3.6.x (DOC: Make animation continuous)
+* :ghpull:`23949`: DOC: Display "dev" instead of "devdocs" in the version switcher
+* :ghpull:`23940`: Fix typos in github_stats.rst
+* :ghpull:`23936`: Backport PR #23935 on branch v3.6.x (DOC: fix versions is doc switcher)
+* :ghpull:`23933`: Backport PR #23932 on branch v3.6.x (DOC: Fix formatting in image tutorial)
+* :ghpull:`23932`: DOC: Fix formatting in image tutorial
+* :ghpull:`23926`: Backport PR #23925 on branch v3.6.x (FIX: use process_event in dpi changes on macosx backend)
+* :ghpull:`23925`: FIX: use process_event in dpi changes on macosx backend
+* :ghpull:`23912`: FIX: only expect FigureCanvas on backend module if using new style
+
+Issues (22):
+
+* :ghissue:`23981`: [ENH]: Default ``matplotlib.colormaps[None]`` to call ``matplotlib.colormaps[matplotlib.rcParams['image.cmap']]``?
+* :ghissue:`24106`: [Bug]: fill_between gives IndexError with numpy 1.24.0.dev
+* :ghissue:`24053`: Cartopy axes_grid_basic example broken by Matplotlib 3.6
+* :ghissue:`23977`: [Bug]: Eqnarray in AnchoredText results in misplaced text (new in v3.6.0)
+* :ghissue:`23973`: [Bug]: ValueError: Unable to determine Axes to steal space for Colorbar.
+* :ghissue:`23456`: [Bug]: Horizontal colorbars drawn incorrectly with hatches
+* :ghissue:`15922`: Pyplot gallery section is mostly OO examples
+* :ghissue:`23700`: [Doc]: scatter points
+* :ghissue:`23492`: [Bug]: svg backend does not use configured generic family lists
+* :ghissue:`22528`: [Bug]: problem with font property in text elements of svg figures
+* :ghissue:`23911`: [Bug]: 3.6.0 doesn't interact well with pycharm throwing "backend_interagg" exception
+* :ghissue:`24024`: stackplot should not change Axes cycler
+* :ghissue:`23954`: [Bug]: Text label with empty line causes a "TypeError: cannot unpack non-iterable NoneType object" in PostScript backend
+* :ghissue:`23922`: [Bug]: Refactor of hexbin for 3.6.0 crashes with empty arrays and log scaling
+* :ghissue:`23986`: [Bug]: Constrained layout UserWarning even when False
+* :ghissue:`23895`: [Bug]: 3D surface is not plotted for the contour3d_3 example in the gallery
+* :ghissue:`23955`: [Doc]: Adding animations to Youtube channel
+* :ghissue:`23943`: [Bug]: Couldn't build matplotlib 3.6.0 with both Clang-15 and GCC-12
+* :ghissue:`23687`: [Bug]: barplot does not show anything when x or bottom start and end with NaN
+* :ghissue:`23876`: [Doc]: Missing source files
+* :ghissue:`23909`: [Doc]: add animation examples to show animated subplots
+* :ghissue:`23921`: [Bug]: resize_event deprecation warnings when creating figure on macOS with version 3.6.0
diff --git a/doc/users/prev_whats_new/whats_new_0.98.4.rst b/doc/users/prev_whats_new/whats_new_0.98.4.rst
index 96f8768a99d8..88d376cf79bf 100644
--- a/doc/users/prev_whats_new/whats_new_0.98.4.rst
+++ b/doc/users/prev_whats_new/whats_new_0.98.4.rst
@@ -1,7 +1,7 @@
 .. _whats-new-0-98-4:
 
-New in matplotlib 0.98.4
-========================
+What's new in Matplotlib 0.98.4
+===============================
 
 .. contents:: Table of Contents
    :depth: 2
@@ -30,12 +30,18 @@ multiple columns and rows, as well as fancy box drawing.  See
 :func:`~matplotlib.pyplot.legend` and
 :class:`matplotlib.legend.Legend`.
 
-.. figure:: ../../gallery/pyplots/images/sphx_glr_whats_new_98_4_legend_001.png
-   :target: ../../gallery/pyplots/whats_new_98_4_legend.html
-   :align: center
-   :scale: 50
+.. plot::
+
+    ax = plt.subplot()
+    t1 = np.arange(0.0, 1.0, 0.01)
+    for n in [1, 2, 3, 4]:
+        plt.plot(t1, t1**n, label=f"n={n}")
+
+    leg = plt.legend(loc='best', ncol=2, mode="expand", shadow=True, fancybox=True)
+    leg.get_frame().set_alpha(0.5)
+
+    plt.show()
 
-   What's New 98 4 Legend
 
 .. _fancy-annotations:
 
@@ -145,12 +151,20 @@ can pass an *x* array and a *ylower* and *yupper* array to fill
 between, and an optional *where* argument which is a logical mask
 where you want to do the filling.
 
-.. figure:: ../../gallery/pyplots/images/sphx_glr_whats_new_98_4_fill_between_001.png
-   :target: ../../gallery/pyplots/whats_new_98_4_fill_between.html
-   :align: center
-   :scale: 50
+.. plot::
+
+    x = np.arange(-5, 5, 0.01)
+    y1 = -5*x*x + x + 10
+    y2 = 5*x*x + x
+
+    fig, ax = plt.subplots()
+    ax.plot(x, y1, x, y2, color='black')
+    ax.fill_between(x, y1, y2, where=(y2 > y1), facecolor='yellow', alpha=0.5)
+    ax.fill_between(x, y1, y2, where=(y2 <= y1), facecolor='red', alpha=0.5)
+    ax.set_title('Fill Between')
+
+    plt.show()
 
-   What's New 98 4 Fill Between
 
 Lots more
 ---------
diff --git a/doc/users/prev_whats_new/whats_new_0.99.rst b/doc/users/prev_whats_new/whats_new_0.99.rst
index 2a74e39e6b55..c2d761a25031 100644
--- a/doc/users/prev_whats_new/whats_new_0.99.rst
+++ b/doc/users/prev_whats_new/whats_new_0.99.rst
@@ -1,7 +1,7 @@
 .. _whats-new-0-99:
 
-New in matplotlib 0.99
-======================
+What's new in Matplotlib 0.99 (Aug 29, 2009)
+============================================
 
 .. contents:: Table of Contents
    :depth: 2
@@ -22,19 +22,29 @@ working with paths and transformations: :doc:`/tutorials/advanced/path_tutorial`
 mplot3d
 --------
 
-
 Reinier Heeres has ported John Porter's mplot3d over to the new
 matplotlib transformations framework, and it is now available as a
 toolkit mpl_toolkits.mplot3d (which now comes standard with all mpl
 installs).  See :ref:`mplot3d-examples-index` and
-:ref:`toolkit_mplot3d-tutorial`
+:doc:`/tutorials/toolkits/mplot3d`.
+
+.. plot::
+
+    from matplotlib import cm
+    from mpl_toolkits.mplot3d import Axes3D
+
+    X = np.arange(-5, 5, 0.25)
+    Y = np.arange(-5, 5, 0.25)
+    X, Y = np.meshgrid(X, Y)
+    R = np.sqrt(X**2 + Y**2)
+    Z = np.sin(R)
 
-.. figure:: ../../gallery/pyplots/images/sphx_glr_whats_new_99_mplot3d_001.png
-   :target: ../../gallery/pyplots/whats_new_99_mplot3d.html
-   :align: center
-   :scale: 50
+    fig = plt.figure()
+    ax = Axes3D(fig, auto_add_to_figure=False)
+    fig.add_axes(ax)
+    ax.plot_surface(X, Y, Z, rstride=1, cstride=1, cmap=cm.viridis)
 
-   What's New 99 Mplot3d
+    plt.show()
 
 .. _whats-new-axes-grid:
 
@@ -48,12 +58,49 @@ new mpl installs.   See :ref:`axes_grid1-examples-index`,
 :ref:`axisartist-examples-index`, :ref:`axes_grid1_users-guide-index` and
 :ref:`axisartist_users-guide-index`
 
-.. figure:: ../../gallery/pyplots/images/sphx_glr_whats_new_99_axes_grid_001.png
-   :target: ../../gallery/pyplots/whats_new_99_axes_grid.html
-   :align: center
-   :scale: 50
+.. plot::
+
+    from mpl_toolkits.axes_grid1.axes_rgb import RGBAxes
+
+
+    def get_demo_image():
+        # prepare image
+        delta = 0.5
+
+        extent = (-3, 4, -4, 3)
+        x = np.arange(-3.0, 4.001, delta)
+        y = np.arange(-4.0, 3.001, delta)
+        X, Y = np.meshgrid(x, y)
+        Z1 = np.exp(-X**2 - Y**2)
+        Z2 = np.exp(-(X - 1)**2 - (Y - 1)**2)
+        Z = (Z1 - Z2) * 2
+
+        return Z, extent
+
+
+    def get_rgb():
+        Z, extent = get_demo_image()
+
+        Z[Z < 0] = 0.
+        Z = Z / Z.max()
+
+        R = Z[:13, :13]
+        G = Z[2:, 2:]
+        B = Z[:13, 2:]
+
+        return R, G, B
 
-   What's New 99 Axes Grid
+
+    fig = plt.figure()
+    ax = RGBAxes(fig, [0.1, 0.1, 0.8, 0.8])
+
+    r, g, b = get_rgb()
+    ax.imshow_rgb(r, g, b, origin="lower")
+
+    ax.RGB.set_xlim(0., 9.5)
+    ax.RGB.set_ylim(0.9, 10.6)
+
+    plt.show()
 
 .. _whats-new-spine:
 
@@ -65,12 +112,50 @@ that denote the data limits -- in various arbitrary locations.  No
 longer are your axis lines constrained to be a simple rectangle around
 the figure -- you can turn on or off left, bottom, right and top, as
 well as "detach" the spine to offset it away from the data.  See
-:doc:`/gallery/ticks_and_spines/spine_placement_demo` and
+:doc:`/gallery/spines/spine_placement_demo` and
 :class:`matplotlib.spines.Spine`.
 
-.. figure:: ../../gallery/pyplots/images/sphx_glr_whats_new_99_spines_001.png
-   :target: ../../gallery/pyplots/whats_new_99_spines.html
-   :align: center
-   :scale: 50
+.. plot::
+
+    def adjust_spines(ax, spines):
+        for loc, spine in ax.spines.items():
+            if loc in spines:
+                spine.set_position(('outward', 10))  # outward by 10 points
+            else:
+                spine.set_color('none')  # don't draw spine
+
+        # turn off ticks where there is no spine
+        if 'left' in spines:
+            ax.yaxis.set_ticks_position('left')
+        else:
+            # no yaxis ticks
+            ax.yaxis.set_ticks([])
+
+        if 'bottom' in spines:
+            ax.xaxis.set_ticks_position('bottom')
+        else:
+            # no xaxis ticks
+            ax.xaxis.set_ticks([])
+
+    fig = plt.figure()
+
+    x = np.linspace(0, 2*np.pi, 100)
+    y = 2*np.sin(x)
+
+    ax = fig.add_subplot(2, 2, 1)
+    ax.plot(x, y)
+    adjust_spines(ax, ['left'])
+
+    ax = fig.add_subplot(2, 2, 2)
+    ax.plot(x, y)
+    adjust_spines(ax, [])
+
+    ax = fig.add_subplot(2, 2, 3)
+    ax.plot(x, y)
+    adjust_spines(ax, ['left', 'bottom'])
+
+    ax = fig.add_subplot(2, 2, 4)
+    ax.plot(x, y)
+    adjust_spines(ax, ['bottom'])
 
-   What's New 99 Spines
+    plt.show()
diff --git a/doc/users/prev_whats_new/whats_new_1.0.rst b/doc/users/prev_whats_new/whats_new_1.0.rst
index cafa8917d518..ab902977cb1e 100644
--- a/doc/users/prev_whats_new/whats_new_1.0.rst
+++ b/doc/users/prev_whats_new/whats_new_1.0.rst
@@ -1,7 +1,7 @@
 .. _whats-new-1-0:
 
-New in matplotlib 1.0
-=====================
+What's new in Matplotlib 1.0 (Jul 06, 2010)
+===========================================
 
 .. contents:: Table of Contents
    :depth: 2
@@ -12,7 +12,7 @@ HTML5/Canvas backend
 --------------------
 
 Simon Ratcliffe and Ludwig Schwardt have released an `HTML5/Canvas
-<http://code.google.com/p/mplh5canvas/>`__ backend for matplotlib.  The
+<https://code.google.com/archive/p/mplh5canvas>`__ backend for matplotlib.  The
 backend is almost feature complete, and they have done a lot of work
 comparing their html5 rendered images with our core renderer Agg.  The
 backend features client/server interactive navigation of matplotlib
@@ -23,15 +23,14 @@ Sophisticated subplot grid layout
 
 Jae-Joon Lee has written :mod:`~matplotlib.gridspec`, a new module for
 doing complex subplot layouts, featuring row and column spans and
-more.  See :doc:`/tutorials/intermediate/gridspec` for a tutorial overview.
+more.  See :doc:`/tutorials/intermediate/arranging_axes` for a tutorial
+overview.
 
 .. figure:: ../../gallery/userdemo/images/sphx_glr_demo_gridspec01_001.png
    :target: ../../gallery/userdemo/demo_gridspec01.html
    :align: center
    :scale: 50
 
-   Demo Gridspec01
-
 Easy pythonic subplots
 -----------------------
 
@@ -44,9 +43,9 @@ indexing (starts with 0).  e.g.::
   fig, axarr = plt.subplots(2, 2)
   axarr[0,0].plot([1,2,3])   # upper, left
 
-See :doc:`/gallery/subplots_axes_and_figures/subplot_demo` for several code examples.
+See :doc:`/gallery/subplots_axes_and_figures/subplot` for several code examples.
 
-Contour fixes and and triplot
+Contour fixes and triplot
 -----------------------------
 
 Ian Thomas has fixed a long-standing bug that has vexed our most
@@ -63,8 +62,6 @@ plotting unstructured triangular grids.
    :align: center
    :scale: 50
 
-   Triplot Demo
-
 multiple calls to show supported
 --------------------------------
 
@@ -92,12 +89,29 @@ supporting mixing of 2D and 3D graphs in the same figure, and/or
 multiple 3D graphs in a single figure, using the "projection" keyword
 argument to add_axes or add_subplot.  Thanks Ben Root.
 
-.. figure:: ../../gallery/pyplots/images/sphx_glr_whats_new_1_subplot3d_001.png
-   :target: ../../gallery/pyplots/whats_new_1_subplot3d.html
-   :align: center
-   :scale: 50
+.. plot::
+
+    from mpl_toolkits.mplot3d.axes3d import get_test_data
+
+    fig = plt.figure()
+
+    X = np.arange(-5, 5, 0.25)
+    Y = np.arange(-5, 5, 0.25)
+    X, Y = np.meshgrid(X, Y)
+    R = np.sqrt(X**2 + Y**2)
+    Z = np.sin(R)
+    ax = fig.add_subplot(1, 2, 1, projection='3d')
+    surf = ax.plot_surface(X, Y, Z, rstride=1, cstride=1, cmap='viridis',
+                           linewidth=0, antialiased=False)
+    ax.set_zlim3d(-1.01, 1.01)
+
+    fig.colorbar(surf, shrink=0.5, aspect=5)
+
+    X, Y, Z = get_test_data(0.05)
+    ax = fig.add_subplot(1, 2, 2, projection='3d')
+    ax.plot_wireframe(X, Y, Z, rstride=10, cstride=10)
 
-   What's New 1 Subplot3d
+    plt.show()
 
 tick_params
 -----------
diff --git a/doc/users/prev_whats_new/whats_new_1.1.rst b/doc/users/prev_whats_new/whats_new_1.1.rst
index f4c9cd42d31d..901351466fac 100644
--- a/doc/users/prev_whats_new/whats_new_1.1.rst
+++ b/doc/users/prev_whats_new/whats_new_1.1.rst
@@ -1,7 +1,7 @@
 .. _whats-new-1-1:
 
-New in matplotlib 1.1
-=====================
+What's new in Matplotlib 1.1 (Nov 02, 2011)
+===========================================
 
 .. contents:: Table of Contents
    :depth: 2
@@ -26,9 +26,6 @@ Kevin Davies has extended Yannick Copin's original Sankey example into a module
    :align: center
    :scale: 50
 
-   Sankey Rankine
-
-
 Animation
 ---------
 
@@ -42,7 +39,7 @@ pendulum <gallery/animation/double_pendulum_sgskip.py>` which uses
 
 .. raw:: html
 
-    <iframe width="420" height="315" src="http://www.youtube.com/embed/32cjc6V0OZY" frameborder="0" allowfullscreen></iframe>
+    <iframe width="420" height="315" src="https://www.youtube.com/embed/32cjc6V0OZY" frameborder="0" allowfullscreen></iframe>
 
 This should be considered as a beta release of the framework;
 please try it and provide feedback.
@@ -54,7 +51,7 @@ Tight Layout
 A frequent issue raised by users of matplotlib is the lack of a layout
 engine to nicely space out elements of the plots. While matplotlib still
 adheres to the philosophy of giving users complete control over the placement
-of plot elements, Jae-Joon Lee created the :mod:`~matplotlib.tight_layout`
+of plot elements, Jae-Joon Lee created the ``matplotlib.tight_layout``
 module and introduced a new
 command :func:`~matplotlib.pyplot.tight_layout`
 to address the most common layout issues.
@@ -125,8 +122,6 @@ examples.
    :align: center
    :scale: 50
 
-   Legend Demo4
-
 mplot3d
 -------
 
@@ -138,7 +133,7 @@ as 2D plotting, Ben Root has made several improvements to the
   improved to bring the class towards feature-parity with regular
   Axes objects
 
-* Documentation for :ref:`toolkit_mplot3d-tutorial` was significantly expanded
+* Documentation for :doc:`/tutorials/toolkits/mplot3d` was significantly expanded
 
 * Axis labels and orientation improved
 
@@ -151,8 +146,6 @@ as 2D plotting, Ben Root has made several improvements to the
    :align: center
    :scale: 50
 
-   Offset
-
 * :meth:`~mpl_toolkits.mplot3d.axes3d.Axes3D.contourf`
   gains *zdir* and *offset* kwargs. You can now do this:
 
@@ -161,8 +154,6 @@ as 2D plotting, Ben Root has made several improvements to the
    :align: center
    :scale: 50
 
-   Contourf3d 2
-
 Numerix support removed
 -----------------------
 
diff --git a/doc/users/prev_whats_new/whats_new_1.2.2.rst b/doc/users/prev_whats_new/whats_new_1.2.2.rst
index 51c43403d22c..ab81018925cd 100644
--- a/doc/users/prev_whats_new/whats_new_1.2.2.rst
+++ b/doc/users/prev_whats_new/whats_new_1.2.2.rst
@@ -1,7 +1,7 @@
 .. _whats-new-1-2-2:
 
-New in matplotlib 1.2.2
-=======================
+What's new in Matplotlib 1.2.2
+==============================
 
 .. contents:: Table of Contents
    :depth: 2
diff --git a/doc/users/prev_whats_new/whats_new_1.2.rst b/doc/users/prev_whats_new/whats_new_1.2.rst
index fc6039314b9f..3bfa20e671be 100644
--- a/doc/users/prev_whats_new/whats_new_1.2.rst
+++ b/doc/users/prev_whats_new/whats_new_1.2.rst
@@ -1,8 +1,8 @@
 .. _whats-new-1-2:
 
 
-New in matplotlib 1.2
-=====================
+What's new in Matplotlib 1.2 (Nov 9, 2012)
+==========================================
 
 .. contents:: Table of Contents
    :depth: 2
@@ -67,8 +67,6 @@ Damon McDougall added a new plotting method for the
    :align: center
    :scale: 50
 
-   Trisurf3d
-
 Control the lengths of colorbar extensions
 ------------------------------------------
 
@@ -133,9 +131,6 @@ median and confidence interval.
    :align: center
    :scale: 50
 
-   Boxplot Demo3
-
-
 New RC parameter functionality
 ------------------------------
 
@@ -168,9 +163,6 @@ local intensity of the vector field.
    :align: center
    :scale: 50
 
-   Plot Streamplot
-
-
 New hist functionality
 ----------------------
 
@@ -187,7 +179,7 @@ Updated shipped dependencies
 The following dependencies that ship with matplotlib and are
 optionally installed alongside it have been updated:
 
-- `pytz <http://pytz.sf.net/>`_ 2012d
+- `pytz <http://pytz.sourceforge.net/>`_ 2012d
 - `dateutil <http://labix.org/python-dateutil>`_ 1.5 on Python 2.x,
    and 2.1 on Python 3.x
 
@@ -204,8 +196,6 @@ a triangulation.
    :align: center
    :scale: 50
 
-   Tripcolor Demo
-
 Hatching patterns in filled contour plots, with legends
 -------------------------------------------------------
 
@@ -218,8 +208,6 @@ to use a legend to identify contoured ranges.
    :align: center
    :scale: 50
 
-   Contourf Hatching
-
 Known issues in the matplotlib 1.2 release
 ------------------------------------------
 
diff --git a/doc/users/prev_whats_new/whats_new_1.3.rst b/doc/users/prev_whats_new/whats_new_1.3.rst
index ddc35661dc74..855235069917 100644
--- a/doc/users/prev_whats_new/whats_new_1.3.rst
+++ b/doc/users/prev_whats_new/whats_new_1.3.rst
@@ -1,7 +1,7 @@
 .. _whats-new-1-3:
 
-New in matplotlib 1.3
-=====================
+What's new in Matplotlib 1.3 (Aug 01, 2013)
+===========================================
 
 .. contents:: Table of Contents
    :depth: 2
@@ -96,22 +96,18 @@ to modify each artist's sketch parameters individually with
    :align: center
    :scale: 50
 
-   xkcd
-
 Updated Axes3D.contour methods
 ------------------------------
 Damon McDougall updated the
 :meth:`~mpl_toolkits.mplot3d.axes3d.Axes3D.tricontour` and
 :meth:`~mpl_toolkits.mplot3d.axes3d.Axes3D.tricontourf` methods to allow 3D
-contour plots on abitrary unstructured user-specified triangulations.
+contour plots on arbitrary unstructured user-specified triangulations.
 
 .. figure:: ../../gallery/mplot3d/images/sphx_glr_tricontour3d_001.png
    :target: ../../gallery/mplot3d/tricontour3d.html
    :align: center
    :scale: 50
 
-   Tricontour3d
-
 New eventplot plot type
 ```````````````````````
 Todd Jennings added a :func:`~matplotlib.pyplot.eventplot` function to
@@ -122,8 +118,6 @@ create multiple rows or columns of identical line segments
    :align: center
    :scale: 50
 
-   Eventplot Demo
-
 As part of this feature, there is a new
 :class:`~matplotlib.collections.EventCollection` class that allows for
 plotting and manipulating rows or columns of identical line segments.
@@ -146,8 +140,6 @@ added (:class:`~matplotlib.tri.TriAnalyzer`).
    :align: center
    :scale: 50
 
-   Tricontour Smooth User
-
 Baselines for stackplot
 ```````````````````````
 Till Stensitzki added non-zero baselines to
@@ -159,8 +151,6 @@ weighted.
    :align: center
    :scale: 50
 
-   Stackplot Demo2
-
 Rectangular colorbar extensions
 ```````````````````````````````
 Andrew Dawson added a new keyword argument *extendrect* to
@@ -204,8 +194,6 @@ Thanks to Jae-Joon Lee, path effects now also work on plot lines.
    :align: center
    :scale: 50
 
-   Patheffect Demo
-
 Easier creation of colormap and normalizer for levels with colors
 `````````````````````````````````````````````````````````````````
 Phil Elson added the :func:`matplotlib.colors.from_levels_and_colors`
@@ -299,7 +287,7 @@ hard-coded to default to 0, default value of both rcParam values is 0.
 
 Changes to font rcParams
 ````````````````````````
-The `font.*` rcParams now affect only text objects created after the
+The ``font.*`` rcParams now affect only text objects created after the
 rcParam has been set, and will not retroactively affect already
 existing text objects.  This brings their behavior in line with most
 other rcParams.
@@ -389,7 +377,7 @@ information.
 XDG base directory support
 ``````````````````````````
 On Linux, matplotlib now uses the `XDG base directory specification
-<http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html>`_ to
+<https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html>`_ to
 find the :file:`matplotlibrc` configuration file. :file:`matplotlibrc` should
 now be kept in :file:`~/.config/matplotlib`, rather than :file:`~/.matplotlib`.
 If your configuration is found in the old location, it will still be used, but
diff --git a/doc/users/prev_whats_new/whats_new_1.4.rst b/doc/users/prev_whats_new/whats_new_1.4.rst
index e9df55993cc2..febcb93047b9 100644
--- a/doc/users/prev_whats_new/whats_new_1.4.rst
+++ b/doc/users/prev_whats_new/whats_new_1.4.rst
@@ -1,8 +1,8 @@
 .. _whats-new-1-4:
 
 
-New in matplotlib 1.4
-=====================
+What's new in Matplotlib 1.4 (Aug 25, 2014)
+===========================================
 
 Thomas A. Caswell served as the release manager for the 1.4 release.
 
@@ -20,7 +20,7 @@ New colormap
 ------------
 In heatmaps, a green-to-red spectrum is often used to indicate intensity of
 activity, but this can be problematic for the red/green colorblind. A new,
-colorblind-friendly colormap is now available at :class:`matplotlib.cm.Wistia`.
+colorblind-friendly colormap is now available at ``matplotlib.cm.Wistia``.
 This colormap maintains the red/green symbolism while achieving deuteranopic
 legibility through brightness variations. See
 `here <https://github.com/wistia/heatmap-palette>`__
@@ -142,7 +142,7 @@ Added the kwarg 'which' to `.Axes.get_xticklabels`,
 `.Axes.get_yticklabels` and
 `.Axis.get_ticklabels`.  'which' can be 'major', 'minor', or
 'both' select which ticks to return, like
-:func:`~matplotlib.Axis.set_ticks_position`.  If 'which' is `None` then the old
+`~.XAxis.set_ticks_position`.  If 'which' is `None` then the old
 behaviour (controlled by the bool *minor*).
 
 Separate horizontal/vertical axes padding support in ImageGrid
@@ -165,8 +165,6 @@ specifically the Skew-T used in meteorology.
    :align: center
    :scale: 50
 
-   Skewt
-
 Support for specifying properties of wedge and text in pie charts.
 ``````````````````````````````````````````````````````````````````
 Added the kwargs 'wedgeprops' and 'textprops' to `~.Axes.pie`
@@ -209,9 +207,9 @@ to their liking.
 This feature was implemented for a software engineering course at the
 University of Toronto, Scarborough, run in Winter 2014 by Anya Tafliovich.
 
-More `markevery` options to show only a subset of markers
+More *markevery* options to show only a subset of markers
 `````````````````````````````````````````````````````````
-Rohan Walker extended the `markevery` property in
+Rohan Walker extended the *markevery* property in
 :class:`~matplotlib.lines.Line2D`.  You can now specify a subset of markers to
 show with an int, slice object, numpy fancy indexing, or float. Using a float
 shows markers at approximately equal display-coordinate-distances along the
@@ -220,7 +218,7 @@ line.
 Added size related functions to specialized `.Collection`\s
 ```````````````````````````````````````````````````````````
 
-Added the `get_size` and `set_size` functions to control the size of
+Added the ``get_size`` and ``set_size`` functions to control the size of
 elements of specialized collections (
 :class:`~matplotlib.collections.AsteriskPolygonCollection`
 :class:`~matplotlib.collections.BrokenBarHCollection`
@@ -234,7 +232,7 @@ elements of specialized collections (
 Fixed the mouse coordinates giving the wrong theta value in Polar graph
 ```````````````````````````````````````````````````````````````````````
 Added code to
-:func:`~matplotlib.InvertedPolarTransform.transform_non_affine`
+`~.polar.InvertedPolarTransform.transform_non_affine`
 to ensure that the calculated theta value was between the range of 0 and 2 * pi
 since the problem was that the value can become negative after applying the
 direction and rotation to the theta calculation.
@@ -244,7 +242,7 @@ Simple quiver plot for mplot3d toolkit
 A team of students in an *Engineering Large Software Systems* course, taught
 by Prof. Anya Tafliovich at the University of Toronto, implemented a simple
 version of a quiver plot in 3D space for the mplot3d toolkit as one of their
-term project. This feature is documented in :func:`~mpl_toolkits.mplot3d.Axes3D.quiver`.
+term project. This feature is documented in `~.Axes3D.quiver`.
 The team members are: Ryan Steve D'Souza, Victor B, xbtsw, Yang Wang, David,
 Caradec Bisesar and Vlad Vassilovski.
 
@@ -253,8 +251,6 @@ Caradec Bisesar and Vlad Vassilovski.
    :align: center
    :scale: 50
 
-   Quiver3d
-
 polar-plot r-tick locations
 ```````````````````````````
 Added the ability to control the angular position of the r-tick labels
diff --git a/doc/users/prev_whats_new/whats_new_1.5.rst b/doc/users/prev_whats_new/whats_new_1.5.rst
index 97e4f81fd306..b94355b97b93 100644
--- a/doc/users/prev_whats_new/whats_new_1.5.rst
+++ b/doc/users/prev_whats_new/whats_new_1.5.rst
@@ -1,7 +1,7 @@
 .. _whats-new-1-5:
 
-New in matplotlib 1.5
-=====================
+What's new in Matplotlib 1.5 (Oct 29, 2015)
+===========================================
 
 .. contents:: Table of Contents
    :depth: 2
@@ -36,7 +36,7 @@ that the draw command is deferred and only called once.
 The upshot of this is that for interactive backends (including
 ``%matplotlib notebook``) in interactive mode (with ``plt.ion()``)
 
-.. code-block :: python
+.. code-block:: python
 
    import matplotlib.pyplot as plt
    fig, ax = plt.subplots()
@@ -109,9 +109,6 @@ on two or more property cycles.
    :align: center
    :scale: 50
 
-   Color Cycle
-
-
 New Colormaps
 -------------
 
@@ -316,9 +313,6 @@ specified, the default value is taken from rcParams.
    :align: center
    :scale: 50
 
-   Contour Corner Mask
-
-
 Mostly unified linestyles for `.Line2D`, `.Patch` and `.Collection`
 ```````````````````````````````````````````````````````````````````
 
@@ -346,7 +340,7 @@ Added a :mod:`.legend_handler` for :class:`~matplotlib.collections.PolyCollectio
 Support for alternate pivots in mplot3d quiver plot
 ```````````````````````````````````````````````````
 
-Added a :code:`pivot` kwarg to :func:`~mpl_toolkits.mplot3d.Axes3D.quiver`
+Added a :code:`pivot` kwarg to `~.Axes3D.quiver`
 that controls the pivot point around which the quiver line rotates. This also
 determines the placement of the arrow head along the quiver line.
 
@@ -368,7 +362,7 @@ Add step kwargs to fill_between
 
 Added ``step`` kwarg to `.Axes.fill_between` to allow to fill between
 lines drawn using the 'step' draw style.  The values of ``step`` match
-those of the ``where`` kwarg of `.Axes.step`.  The asymmetry of of the
+those of the ``where`` kwarg of `.Axes.step`.  The asymmetry of the
 kwargs names is not ideal, but `.Axes.fill_between` already has a
 ``where`` kwarg.
 
@@ -379,9 +373,6 @@ This is particularly useful for plotting pre-binned histograms.
    :align: center
    :scale: 50
 
-   Filled Step
-
-
 Square Plot
 ```````````
 
@@ -494,8 +485,7 @@ backends.
 
 DateFormatter strftime
 ``````````````````````
-:class:`~matplotlib.dates.DateFormatter`\ 's
-:meth:`~matplotlib.dates.DateFormatter.__call__` method will format
+:class:`~matplotlib.dates.DateFormatter`\ 's ``__call__`` method will format
 a :class:`datetime.datetime` object with the format string passed to
 the formatter's constructor. This method accepts datetimes with years
 before 1900, unlike :meth:`datetime.datetime.strftime`.
@@ -609,12 +599,12 @@ that comes as replacement for `.NavigationToolbar2`
 with the figures.  Before we had the `.NavigationToolbar2` with its own
 tools like ``zoom/pan/home/save/...`` and also we had the shortcuts like
 ``yscale/grid/quit/....``. `.ToolManager` relocate all those actions as
-`Tools` (located in `~matplotlib.backend_tools`), and defines a way to
+Tools (located in `~matplotlib.backend_tools`), and defines a way to
 access/trigger/reconfigure them.
 
-The `Toolbars` are replaced for `ToolContainers` that are just GUI
-interfaces to `trigger` the tools. But don't worry the default
-backends include a `ToolContainer` called `toolbar`
+The Toolbars are replaced by `.ToolContainerBase`\s that are just GUI
+interfaces to trigger the tools. But don't worry the default
+backends include a `.ToolContainerBase` called ``toolbar``
 
 
 .. note::
@@ -726,7 +716,7 @@ default, performing no display. ``html5`` converts the animation to an
 h264 encoded video, which is embedded directly in the notebook.
 
 Users not wishing to use the ``_repr_html_`` display hook can also manually
-call the `to_html5_video` method to get the HTML and display using
+call the `.to_html5_video` method to get the HTML and display using
 IPython's ``HTML`` display class::
 
     from IPython.display import HTML
diff --git a/doc/users/prev_whats_new/whats_new_2.0.0.rst b/doc/users/prev_whats_new/whats_new_2.0.0.rst
index 7a6bac78e97a..0f5edb7c0e3f 100644
--- a/doc/users/prev_whats_new/whats_new_2.0.0.rst
+++ b/doc/users/prev_whats_new/whats_new_2.0.0.rst
@@ -1,11 +1,11 @@
 .. _whats-new-2-0-0:
 
-New in matplotlib 2.0
-=====================
+What's new in Matplotlib 2.0 (Jan 17, 2017)
+===========================================
 
 .. note::
 
-   matplotlib 2.0 supports Python 2.7, and 3.4+
+   Matplotlib 2.0 supports Python 2.7, and 3.4+
 
 
 
@@ -17,7 +17,7 @@ The major changes in v2.0 are related to overhauling the default styles.
 .. toctree::
    :maxdepth: 2
 
-   ../dflt_style_changes
+   dflt_style_changes
 
 
 Improved color conversion API and RGBA support
@@ -117,10 +117,11 @@ choropleths, labeled image features, etc.
 
 
 
-Axis offset label now responds to `labelcolor`
+Axis offset label now responds to *labelcolor*
 ----------------------------------------------
 
-Axis offset labels are now colored the same as axis tick markers when `labelcolor` is altered.
+Axis offset labels are now colored the same as axis tick markers when
+*labelcolor* is altered.
 
 Improved offset text choice
 ---------------------------
diff --git a/doc/users/prev_whats_new/whats_new_2.1.0.rst b/doc/users/prev_whats_new/whats_new_2.1.0.rst
index d426be2834cf..a66e2e10f3a2 100644
--- a/doc/users/prev_whats_new/whats_new_2.1.0.rst
+++ b/doc/users/prev_whats_new/whats_new_2.1.0.rst
@@ -1,7 +1,7 @@
 .. _whats-new-2-1-0:
 
-New in Matplotlib 2.1.0
-=======================
+What's new in Matplotlib 2.1.0 (Oct 7, 2017)
+============================================
 
 Documentation
 +++++++++++++
@@ -391,11 +391,11 @@ time and can enhance the visibility of the flow pattern in some use
 cases.
 
 
-`Axis.set_tick_params` now responds to ``rotation``
+``Axis.set_tick_params`` now responds to *rotation*
 ---------------------------------------------------
 
 Bulk setting of tick label rotation is now possible via
-:func:`~matplotlib.axes.Axes.tick_params` using the ``rotation``
+:func:`~matplotlib.axes.Axes.tick_params` using the *rotation*
 keyword.
 
 ::
@@ -406,7 +406,7 @@ keyword.
 Ticklabels are turned off instead of being invisible
 ----------------------------------------------------
 
-Internally, the `.Tick`'s :func:`~matplotlib.axis.Tick.label1On` attribute
+Internally, the `.Tick`'s ``matplotlib.axis.Tick.label1On`` attribute
 is now used to hide tick labels instead of setting the visibility on the tick
 label objects.
 This improves overall performance and fixes some issues.
diff --git a/doc/users/prev_whats_new/whats_new_2.2.rst b/doc/users/prev_whats_new/whats_new_2.2.rst
index 05affccc7a6f..77b9056048f4 100644
--- a/doc/users/prev_whats_new/whats_new_2.2.rst
+++ b/doc/users/prev_whats_new/whats_new_2.2.rst
@@ -1,7 +1,7 @@
 .. _whats-new-2-2-0:
 
-New in Matplotlib 2.2
-=====================
+What's new in Matplotlib 2.2 (Mar 06, 2018)
+===========================================
 
 Constrained Layout Manager
 --------------------------
@@ -60,7 +60,7 @@ New ``figure`` kwarg for ``GridSpec``
 In order to facilitate ``constrained_layout``, ``GridSpec`` now accepts a
 ``figure`` keyword.  This is backwards compatible, in that not supplying this
 will simply cause ``constrained_layout`` to not operate on the subplots
-orgainzed by this ``GridSpec`` instance.  Routines that use ``GridSpec`` (e.g.
+organized by this ``GridSpec`` instance.  Routines that use ``GridSpec`` (e.g.
 ``fig.subplots``) have been modified to pass the figure to ``GridSpec``.
 
 
diff --git a/doc/users/prev_whats_new/whats_new_3.0.rst b/doc/users/prev_whats_new/whats_new_3.0.rst
index 38247aee606b..c7da414a062a 100644
--- a/doc/users/prev_whats_new/whats_new_3.0.rst
+++ b/doc/users/prev_whats_new/whats_new_3.0.rst
@@ -1,7 +1,7 @@
 .. _whats-new-3-0-0:
 
-New in Matplotlib 3.0
-=====================
+What's new in Matplotlib 3.0 (Sep 18, 2018)
+===========================================
 
 Improved default backend selection
 ----------------------------------
@@ -60,11 +60,11 @@ frame. Padding and separation parameters can be adjusted.
 Add ``minorticks_on()/off()`` methods for colorbar
 --------------------------------------------------
 
-A new method :meth:`.colorbar.Colobar.minorticks_on` has been added to
+A new method ``ColorbarBase.minorticks_on`` has been added to
 correctly display minor ticks on a colorbar. This method doesn't allow the
 minor ticks to extend into the regions beyond vmin and vmax when the *extend*
 keyword argument (used while creating the colorbar) is set to 'both', 'max' or
-'min'. A complementary method :meth:`.colorbar.Colobar.minorticks_off` has
+'min'. A complementary method ``ColorbarBase.minorticks_off`` has
 also been added to remove the minor ticks on the colorbar.
 
 
@@ -90,7 +90,7 @@ behaviour has been removed. Now if the file name exists on
 disk, the user is prompted whether or not to overwrite it.
 This eliminates guesswork, and allows intentional
 overwriting, especially when the figure name has been
-manually set using `.figure.Figure.canvas.set_window_title()`.
+manually set using ``figure.canvas.set_window_title()``.
 
 
 Legend now has a *title_fontsize* keyword argument (and rcParam)
@@ -108,9 +108,8 @@ Support for axes.prop_cycle property *markevery* in rcParams
 ------------------------------------------------------------
 
 The Matplotlib ``rcParams`` settings object now supports configuration
-of the attribute :rc:`axes.prop_cycle` with cyclers using the `markevery`
-Line2D object property. An example of this feature is provided at
-:doc:`/gallery/lines_bars_and_markers/markevery_prop_cycle`.
+of the attribute :rc:`axes.prop_cycle` with cyclers using the *markevery*
+Line2D object property. 
 
 Multi-page PDF support for pgf backend
 --------------------------------------
diff --git a/doc/users/prev_whats_new/whats_new_3.1.0.rst b/doc/users/prev_whats_new/whats_new_3.1.0.rst
index 4501243fee8a..8821f8e59257 100644
--- a/doc/users/prev_whats_new/whats_new_3.1.0.rst
+++ b/doc/users/prev_whats_new/whats_new_3.1.0.rst
@@ -1,6 +1,7 @@
+.. _whats-new-3-1-0:
 
-What's new in Matplotlib 3.1
-============================
+What's new in Matplotlib 3.1 (May 18, 2019)
+===========================================
 
 For a list of all of the issues and pull requests since the last
 revision, see the :ref:`github-stats`.
@@ -168,7 +169,7 @@ Return type of ArtistInspector.get_aliases changed
 was used to simulate a set in earlier versions of Python.  It has now been
 replaced by a set, i.e. ``{fullname: {alias1, alias2, ...}}``.
 
-This value is also stored in `.ArtistInspector.aliasd`, which has likewise
+This value is also stored in ``ArtistInspector.aliasd``, which has likewise
 changed.
 
 
@@ -332,7 +333,7 @@ were previously displayed as ``1e+04``.
 MouseEvent button attribute is now an IntEnum
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The :attr:`button` attribute of `~.MouseEvent` instances can take the values
+The ``button`` attribute of `~.MouseEvent` instances can take the values
 None, 1 (left button), 2 (middle button), 3 (right button), "up" (scroll), and
 "down" (scroll).  For better legibility, the 1, 2, and 3 values are now
 represented using the `enum.IntEnum` class `matplotlib.backend_bases.MouseButton`,
diff --git a/doc/users/prev_whats_new/whats_new_3.2.0.rst b/doc/users/prev_whats_new/whats_new_3.2.0.rst
index efa099d01a23..12d7fab3af90 100644
--- a/doc/users/prev_whats_new/whats_new_3.2.0.rst
+++ b/doc/users/prev_whats_new/whats_new_3.2.0.rst
@@ -1,6 +1,7 @@
+.. _whats-new-3-2-0:
 
-What's new in Matplotlib 3.2
-============================
+What's new in Matplotlib 3.2 (Mar 04, 2020)
+===========================================
 
 For a list of all of the issues and pull requests since the last
 revision, see the :ref:`github-stats`.
diff --git a/doc/users/prev_whats_new/whats_new_3.3.0.rst b/doc/users/prev_whats_new/whats_new_3.3.0.rst
index 04ca9d923f76..f9c9fdcd3713 100644
--- a/doc/users/prev_whats_new/whats_new_3.3.0.rst
+++ b/doc/users/prev_whats_new/whats_new_3.3.0.rst
@@ -1,6 +1,8 @@
-==============================
-What's new in Matplotlib 3.3.0
-==============================
+.. _whats-new-3-3-0:
+
+=============================================
+What's new in Matplotlib 3.3.0 (Jul 16, 2020)
+=============================================
 
 For a list of all of the issues and pull requests since the last
 revision, see the :ref:`github-stats`.
@@ -285,7 +287,7 @@ Align labels to Axes edges
 --------------------------
 
 `~.axes.Axes.set_xlabel`, `~.axes.Axes.set_ylabel` and
-`.ColorbarBase.set_label` support a parameter ``loc`` for simplified
+``ColorbarBase.set_label`` support a parameter ``loc`` for simplified
 positioning. For the xlabel, the supported values are 'left', 'center', or
 'right'. For the ylabel, the supported values are 'bottom', 'center', or
 'top'.
diff --git a/doc/users/prev_whats_new/whats_new_3.4.0.rst b/doc/users/prev_whats_new/whats_new_3.4.0.rst
index 15f0c76b19d7..1f4c139db816 100644
--- a/doc/users/prev_whats_new/whats_new_3.4.0.rst
+++ b/doc/users/prev_whats_new/whats_new_3.4.0.rst
@@ -1,6 +1,8 @@
-==============================
-What's new in Matplotlib 3.4.0
-==============================
+.. _whats-new-3-4-0:
+
+=============================================
+What's new in Matplotlib 3.4.0 (Mar 26, 2021)
+=============================================
 
 For a list of all of the issues and pull requests since the last revision, see
 the :ref:`github-stats`.
@@ -164,7 +166,7 @@ New automatic labeling for bar charts
 A new `.Axes.bar_label` method has been added for auto-labeling bar charts.
 
 .. figure:: /gallery/lines_bars_and_markers/images/sphx_glr_bar_label_demo_001.png
-   :target: /gallery/lines_bars_and_markers/bar_label_demo.html
+   :target: ../../gallery/lines_bars_and_markers/bar_label_demo.html
 
    Example of the new automatic labeling.
 
@@ -394,7 +396,7 @@ style. This can be used to, e.g., distinguish the valid and invalid sides of
 the constraint boundaries in the solution space of optimizations.
 
 .. figure:: /gallery/misc/images/sphx_glr_tickedstroke_demo_002.png
-   :target: /gallery/misc/tickedstroke_demo.html
+   :target: ../../gallery/misc/tickedstroke_demo.html
 
 
 Colors and colormaps
@@ -700,7 +702,7 @@ The new `.Text` parameter ``transform_rotates_text`` now sets whether rotations
 of the transform affect the text direction.
 
 .. figure:: /gallery/text_labels_and_annotations/images/sphx_glr_text_rotation_relative_to_line_001.png
-   :target: /gallery/text_labels_and_annotations/text_rotation_relative_to_line.html
+   :target: ../../gallery/text_labels_and_annotations/text_rotation_relative_to_line.html
 
    Example of the new *transform_rotates_text* parameter
 
@@ -724,7 +726,7 @@ for each individual text element in a plot. If no parameter is set, the global
 value :rc:`mathtext.fontset` will be used.
 
 .. figure:: /gallery/text_labels_and_annotations/images/sphx_glr_mathtext_fontfamily_example_001.png
-   :target: /gallery/text_labels_and_annotations/mathtext_fontfamily_example.html
+   :target: ../../gallery/text_labels_and_annotations/mathtext_fontfamily_example.html
 
 ``TextArea``/``AnchoredText`` support *horizontalalignment*
 -----------------------------------------------------------
@@ -858,7 +860,7 @@ its entirety, supporting features such as custom styling for error lines and
 cap marks, control over errorbar spacing, upper and lower limit marks.
 
 .. figure:: /gallery/mplot3d/images/sphx_glr_errorbar3d_001.png
-   :target: /gallery/mplot3d/errorbar3d.html
+   :target: ../../gallery/mplot3d/errorbar3d.html
 
 Stem plots in 3D Axes
 ---------------------
@@ -1021,7 +1023,7 @@ Kerning added to strings in PDFs
 
 As with text produced in the Agg backend (see :ref:`the previous what's new
 entry <whats-new-3-2-0-kerning>` for examples), PDFs now include kerning in
-text strings. 
+text strings.
 
 Fully-fractional HiDPI in QtAgg
 -------------------------------
diff --git a/doc/users/prev_whats_new/whats_new_3.5.0.rst b/doc/users/prev_whats_new/whats_new_3.5.0.rst
new file mode 100644
index 000000000000..69f4814123ba
--- /dev/null
+++ b/doc/users/prev_whats_new/whats_new_3.5.0.rst
@@ -0,0 +1,681 @@
+=============================================
+What's new in Matplotlib 3.5.0 (Nov 15, 2021)
+=============================================
+
+For a list of all of the issues and pull requests since the last revision, see
+the :ref:`github-stats`.
+
+.. contents:: Table of Contents
+   :depth: 4
+
+.. toctree::
+   :maxdepth: 4
+
+Figure and Axes creation / management
+=====================================
+
+``subplot_mosaic`` supports simple Axes sharing
+-----------------------------------------------
+
+`.Figure.subplot_mosaic`, `.pyplot.subplot_mosaic` support *simple* Axes
+sharing (i.e., only `True`/`False` may be passed to *sharex*/*sharey*). When
+`True`, tick label visibility and Axis units will be shared.
+
+.. plot::
+    :include-source:
+
+    mosaic = [
+        ['A', [['B', 'C'],
+               ['D', 'E']]],
+        ['F', 'G'],
+    ]
+    fig = plt.figure(constrained_layout=True)
+    ax_dict = fig.subplot_mosaic(mosaic, sharex=True, sharey=True)
+    # All Axes use these scales after this call.
+    ax_dict['A'].set(xscale='log', yscale='logit')
+
+Figure now has ``draw_without_rendering`` method
+------------------------------------------------
+
+Some aspects of a figure are only determined at draw-time, such as the exact
+position of text artists or deferred computation like automatic data limits.
+If you need these values, you can use ``figure.canvas.draw()`` to force a full
+draw. However, this has side effects, sometimes requires an open file, and is
+doing more work than is needed.
+
+The new `.Figure.draw_without_rendering` method runs all the updates that
+``draw()`` does, but skips rendering the figure. It's thus more efficient if
+you need the updated values to configure further aspects of the figure.
+
+Figure ``__init__`` passes keyword arguments through to set
+-----------------------------------------------------------
+
+Similar to many other sub-classes of `~.Artist`, the `~.FigureBase`,
+`~.SubFigure`, and `~.Figure` classes will now pass any additional keyword
+arguments to `~.Artist.set` to allow properties of the newly created object to
+be set at initialization time. For example::
+
+    from matplotlib.figure import Figure
+    fig = Figure(label='my figure')
+
+Plotting methods
+================
+
+Add ``Annulus`` patch
+---------------------
+
+`.Annulus` is a new class for drawing elliptical annuli.
+
+.. plot::
+
+    import matplotlib.pyplot as plt
+    from matplotlib.patches import Annulus
+
+    fig, ax = plt.subplots()
+    cir = Annulus((0.5, 0.5), 0.2, 0.05, fc='g')        # circular annulus
+    ell = Annulus((0.5, 0.5), (0.5, 0.3), 0.1, 45,      # elliptical
+                  fc='m', ec='b', alpha=0.5, hatch='xxx')
+    ax.add_patch(cir)
+    ax.add_patch(ell)
+    ax.set_aspect('equal')
+
+``set_data`` method for ``FancyArrow`` patch
+--------------------------------------------
+
+`.FancyArrow`, the patch returned by ``ax.arrow``, now has a ``set_data``
+method that allows modifying the arrow after creation, e.g., for animation.
+
+New arrow styles in ``ArrowStyle`` and ``ConnectionPatch``
+----------------------------------------------------------
+
+The new *arrow* parameter to `.ArrowStyle` substitutes the use of the
+*beginarrow* and *endarrow* parameters in the creation of arrows. It receives
+arrows strings like ``'<-'``, ``']-[``' and ``']->``' instead of individual
+booleans.
+
+Two new styles ``']->'`` and ``'<-['`` are also added via this mechanism.
+`.ConnectionPatch`, which accepts arrow styles though its *arrowstyle*
+parameter, also accepts these new styles.
+
+.. plot::
+
+    import matplotlib.patches as mpatches
+
+    fig, ax = plt.subplots(figsize=(4, 4))
+
+    ax.plot([0.75, 0.75], [0.25, 0.75], 'ok')
+    ax.set(xlim=(0, 1), ylim=(0, 1), title='New ArrowStyle options')
+
+    ax.annotate(']->', (0.75, 0.25), (0.25, 0.25),
+                arrowprops=dict(
+                    arrowstyle=']->', connectionstyle="arc3,rad=-0.05",
+                    shrinkA=5, shrinkB=5,
+                ),
+                bbox=dict(boxstyle='square', fc='w'), size='large')
+
+    ax.annotate('<-[', (0.75, 0.75), (0.25, 0.75),
+                arrowprops=dict(
+                    arrowstyle='<-[', connectionstyle="arc3,rad=-0.05",
+                    shrinkA=5, shrinkB=5,
+                ),
+                bbox=dict(boxstyle='square', fc='w'), size='large')
+
+Setting collection offset transform after initialization
+--------------------------------------------------------
+
+The added `.collections.Collection.set_offset_transform` may be used to set the
+offset transform after initialization. This can be helpful when creating a
+`.collections.Collection` outside an Axes object, and later adding it with
+`.Axes.add_collection()` and setting the offset transform to ``Axes.transData``.
+
+Colors and colormaps
+====================
+
+Colormap registry (experimental)
+--------------------------------
+
+Colormaps are now managed via `matplotlib.colormaps` (or `.pyplot.colormaps`),
+which is a `.ColormapRegistry`. While we are confident that the API is final,
+we formally mark it as experimental for 3.5 because we want to keep the option
+to still modify the API for 3.6 should the need arise.
+
+Colormaps can be obtained using item access::
+
+    import matplotlib.pyplot as plt
+    cmap = plt.colormaps['viridis']
+
+To register new colormaps use::
+
+    plt.colormaps.register(my_colormap)
+
+We recommend to use the new API instead of the `~.cm.get_cmap` and
+`~.cm.register_cmap` functions for new code. `matplotlib.cm.get_cmap` and
+`matplotlib.cm.register_cmap` will eventually be deprecated and removed.
+Within `.pyplot`, ``plt.get_cmap()`` and ``plt.register_cmap()`` will continue
+to be supported for backward compatibility.
+
+Image interpolation now possible at RGBA stage
+----------------------------------------------
+
+Images in Matplotlib created via `~.axes.Axes.imshow` are resampled to match
+the resolution of the current canvas. It is useful to apply an auto-aliasing
+filter when downsampling to reduce Moiré effects. By default, interpolation is
+done on the data, a norm applied, and then the colormapping performed.
+
+However, it is often desirable for the anti-aliasing interpolation to happen
+in RGBA space, where the colors are interpolated rather than the data. This
+usually leads to colors outside the colormap, but visually blends adjacent
+colors, and is what browsers and other image processing software do.
+
+A new keyword argument *interpolation_stage* is provided for
+`~.axes.Axes.imshow` to set the stage at which the anti-aliasing interpolation
+happens. The default is the current behaviour of "data", with the alternative
+being "rgba" for the newly-available behavior.
+
+.. figure:: /gallery/images_contours_and_fields/images/sphx_glr_image_antialiasing_001.png
+   :target: ../../gallery/images_contours_and_fields/image_antialiasing.html
+
+   Example of the interpolation stage options.
+
+For more details see the discussion of the new keyword argument in
+:doc:`/gallery/images_contours_and_fields/image_antialiasing`.
+
+``imshow`` supports half-float arrays
+-------------------------------------
+
+The `~.axes.Axes.imshow` method now supports half-float arrays, i.e., NumPy
+arrays with dtype ``np.float16``.
+
+A callback registry has been added to Normalize objects
+-------------------------------------------------------
+
+`.colors.Normalize` objects now have a callback registry, ``callbacks``, that
+can be connected to by other objects to be notified when the norm is updated.
+The callback emits the key ``changed`` when the norm is modified.
+`.cm.ScalarMappable` is now a listener and will register a change when the
+norm's vmin, vmax or other attributes are changed.
+
+Titles, ticks, and labels
+=========================
+
+Settings tick positions and labels simultaneously in ``set_ticks``
+------------------------------------------------------------------
+
+`.Axis.set_ticks` (and the corresponding `.Axes.set_xticks` /
+`.Axes.set_yticks`) has a new parameter *labels* allowing to set tick positions
+and labels simultaneously.
+
+Previously, setting tick labels was done using `.Axis.set_ticklabels` (or
+the corresponding `.Axes.set_xticklabels` / `.Axes.set_yticklabels`); this
+usually only makes sense if tick positions were previously fixed with
+`~.Axis.set_ticks`::
+
+    ax.set_xticks([1, 2, 3])
+    ax.set_xticklabels(['a', 'b', 'c'])
+
+The combined functionality is now available in `~.Axis.set_ticks`::
+
+    ax.set_xticks([1, 2, 3], ['a', 'b', 'c'])
+
+The use of `.Axis.set_ticklabels` is discouraged, but it will stay available
+for backward compatibility.
+
+Note: This addition makes the API of `~.Axis.set_ticks` also more similar to
+`.pyplot.xticks` / `.pyplot.yticks`, which already had the additional *labels*
+parameter.
+
+Fonts and Text
+==============
+
+Triple and quadruple dot mathtext accents
+-----------------------------------------
+
+In addition to single and double dot accents, mathtext now supports triple and
+quadruple dot accents.
+
+.. plot::
+    :include-source:
+
+    fig = plt.figure(figsize=(3, 1))
+    fig.text(0.5, 0.5, r'$\dot{a} \ddot{b} \dddot{c} \ddddot{d}$', fontsize=40,
+             horizontalalignment='center', verticalalignment='center')
+
+Font properties of legend title are configurable
+------------------------------------------------
+
+Title's font properties can be set via the *title_fontproperties* keyword
+argument, for example:
+
+.. plot::
+
+    fig, ax = plt.subplots(figsize=(4, 3))
+    ax.plot(range(10), label='point')
+    ax.legend(title='Points',
+              title_fontproperties={'family': 'serif', 'size': 20})
+
+``Text`` and ``TextBox`` added *parse_math* option
+--------------------------------------------------
+
+`.Text` and `.TextBox` objects now allow a *parse_math* keyword-only argument
+which controls whether math should be parsed from the displayed string. If
+*True*, the string will be parsed as a math text object. If *False*, the string
+will be considered a literal and no parsing will occur.
+
+Text can be positioned inside TextBox widget
+--------------------------------------------
+
+A new parameter called *textalignment* can be used to control for the position
+of the text inside the Axes of the `.TextBox` widget.
+
+.. plot::
+
+    from matplotlib import pyplot as plt
+    from matplotlib.widgets import TextBox
+
+    fig = plt.figure(figsize=(4, 3))
+    for i, alignment in enumerate(['left', 'center', 'right']):
+            box_input = fig.add_axes([0.1, 0.7 - i*0.3, 0.8, 0.2])
+            text_box = TextBox(ax=box_input, initial=f'{alignment} alignment',
+                               label='', textalignment=alignment)
+
+Simplifying the font setting for usetex mode
+--------------------------------------------
+
+Now the :rc:`font.family` accepts some font names as value for a more
+user-friendly setup.
+
+.. code-block::
+
+    plt.rcParams.update({
+        "text.usetex": True,
+        "font.family": "Helvetica"
+    })
+
+Type 42 subsetting is now enabled for PDF/PS backends
+-----------------------------------------------------
+
+`~matplotlib.backends.backend_pdf` and `~matplotlib.backends.backend_ps` now
+use a unified Type 42 font subsetting interface, with the help of `fontTools
+<https://fonttools.readthedocs.io/en/latest/>`_
+
+Set :rc:`pdf.fonttype` or :rc:`ps.fonttype` to ``42`` to trigger this
+workflow::
+
+    # for PDF backend
+    plt.rcParams['pdf.fonttype'] = 42
+
+    # for PS backend
+    plt.rcParams['ps.fonttype'] = 42
+
+    fig, ax = plt.subplots()
+    ax.text(0.4, 0.5, 'subsetted document is smaller in size!')
+
+    fig.savefig("document.pdf")
+    fig.savefig("document.ps")
+
+rcParams improvements
+=====================
+
+Allow setting default legend labelcolor globally
+------------------------------------------------
+
+A new :rc:`legend.labelcolor` sets the default *labelcolor* argument for
+`.Figure.legend`.  The special values  'linecolor', 'markerfacecolor' (or
+'mfc'), or 'markeredgecolor' (or 'mec') will cause the legend text to match the
+corresponding color of marker.
+
+.. plot::
+
+    plt.rcParams['legend.labelcolor'] = 'linecolor'
+
+    # Make some fake data.
+    a = np.arange(0, 3, .02)
+    c = np.exp(a)
+    d = c[::-1]
+
+    fig, ax = plt.subplots()
+    ax.plot(a, c, 'g--', label='Model length')
+    ax.plot(a, d, 'r:', label='Data length')
+
+    ax.legend()
+
+    plt.show()
+
+3D Axes improvements
+====================
+
+Axes3D now allows manual control of draw order
+----------------------------------------------
+
+The `~mpl_toolkits.mplot3d.axes3d.Axes3D` class now has *computed_zorder*
+parameter. When set to False, Artists are drawn using their ``zorder``
+attribute.
+
+.. plot::
+
+    import matplotlib.patches as mpatches
+    from mpl_toolkits.mplot3d import art3d
+
+    fig, (ax1, ax2) = plt.subplots(1, 2, figsize=(6.4, 3),
+                                   subplot_kw=dict(projection='3d'))
+
+    ax1.set_title('computed_zorder = True (default)')
+    ax2.set_title('computed_zorder = False')
+    ax2.computed_zorder = False
+
+    corners = ((0, 0, 0), (0, 5, 0), (5, 5, 0), (5, 0, 0))
+    for ax in (ax1, ax2):
+        tri = art3d.Poly3DCollection([corners],
+                                     facecolors='white',
+                                     edgecolors='black',
+                                     zorder=1)
+        ax.add_collection3d(tri)
+        line, = ax.plot((2, 2), (2, 2), (0, 4), c='red', zorder=2,
+                        label='zorder=2')
+        points = ax.scatter((3, 3), (1, 3), (1, 3), c='red', zorder=10,
+                            label='zorder=10')
+
+        ax.set_xlim((0, 5))
+        ax.set_ylim((0, 5))
+        ax.set_zlim((0, 2.5))
+
+    plane = mpatches.Patch(facecolor='white', edgecolor='black',
+                           label='zorder=1')
+    fig.legend(handles=[plane, line, points], loc='lower center')
+
+Allow changing the vertical axis in 3d plots
+----------------------------------------------
+
+`~mpl_toolkits.mplot3d.axes3d.Axes3D.view_init` now has the parameter
+*vertical_axis* which allows switching which axis is aligned vertically.
+
+.. plot::
+
+    Nphi, Nr = 18, 8
+    phi = np.linspace(0, np.pi, Nphi)
+    r = np.arange(Nr)
+    phi = np.tile(phi, Nr).flatten()
+    r = np.repeat(r, Nphi).flatten()
+
+    x = r * np.sin(phi)
+    y = r * np.cos(phi)
+    z = Nr - r
+
+    fig, axs = plt.subplots(1, 3, figsize=(7, 3),
+                            subplot_kw=dict(projection='3d'),
+                            gridspec_kw=dict(wspace=0.4, left=0.08, right=0.98,
+                                             bottom=0, top=1))
+    for vert_a, ax in zip(['z', 'y', 'x'], axs):
+        pc = ax.scatter(x, y, z, c=z)
+        ax.view_init(azim=30, elev=30, vertical_axis=vert_a)
+        ax.set(xlabel='x', ylabel='y', zlabel='z',
+               title=f'vertical_axis={vert_a!r}')
+
+``plot_surface`` supports masked arrays and NaNs
+------------------------------------------------
+
+`.axes3d.Axes3D.plot_surface` supports masked arrays and NaNs, and will now
+hide quads that contain masked or NaN points. The behaviour is similar to
+`.Axes.contour` with ``corner_mask=True``.
+
+.. plot::
+
+    import matplotlib
+    import matplotlib.pyplot as plt
+    import numpy as np
+
+    fig, ax = plt.subplots(figsize=(6, 6), subplot_kw={'projection': '3d'},
+                           constrained_layout=True)
+
+    x, y = np.mgrid[1:10:1, 1:10:1]
+    z = x ** 3 + y ** 3 - 500
+    z = np.ma.masked_array(z, z < 0)
+
+    ax.plot_surface(x, y, z, rstride=1, cstride=1, linewidth=0, cmap='inferno')
+    ax.view_init(35, -90)
+
+3D plotting methods support *data* keyword argument
+---------------------------------------------------
+
+To match all 2D plotting methods, the 3D Axes now support the *data* keyword
+argument. This allows passing arguments indirectly from a DataFrame-like
+structure. ::
+
+    data = {  # A labelled data set, or e.g., Pandas DataFrame.
+        'x': ...,
+        'y': ...,
+        'z': ...,
+        'width': ...,
+        'depth': ...,
+        'top': ...,
+    }
+
+    fig, ax = plt.subplots(subplot_kw={'projection': '3d')
+    ax.bar3d('x', 'y', 'z', 'width', 'depth', 'top', data=data)
+
+Interactive tool improvements
+=============================
+
+Colorbars now have pan and zoom functionality
+---------------------------------------------
+
+Interactive plots with colorbars can now be zoomed and panned on the colorbar
+axis. This adjusts the *vmin* and *vmax* of the ``ScalarMappable`` associated
+with the colorbar. This is currently only enabled for continuous norms. Norms
+used with contourf and categoricals, such as ``BoundaryNorm`` and ``NoNorm``,
+have the interactive capability disabled by default. ``cb.ax.set_navigate()``
+can be used to set whether a colorbar axes is interactive or not.
+
+Updated the appearance of Slider widgets
+----------------------------------------
+
+The appearance of `~.Slider` and `~.RangeSlider` widgets were updated and given
+new styling parameters for the added handles.
+
+.. plot::
+
+    import matplotlib.pyplot as plt
+    from matplotlib.widgets import Slider
+
+    plt.figure(figsize=(4, 2))
+    ax_old = plt.axes([0.2, 0.65, 0.65, 0.1])
+    ax_new = plt.axes([0.2, 0.25, 0.65, 0.1])
+    Slider(ax_new, "New", 0, 1)
+
+    ax = ax_old
+    valmin = 0
+    valinit = 0.5
+    ax.set_xlim([0, 1])
+    ax_old.axvspan(valmin, valinit, 0, 1)
+    ax.axvline(valinit, 0, 1, color="r", lw=1)
+    ax.set_xticks([])
+    ax.set_yticks([])
+    ax.text(
+        -0.02,
+        0.5,
+        "Old",
+        transform=ax.transAxes,
+        verticalalignment="center",
+        horizontalalignment="right",
+    )
+
+    ax.text(
+        1.02,
+        0.5,
+        "0.5",
+        transform=ax.transAxes,
+        verticalalignment="center",
+        horizontalalignment="left",
+    )
+
+Removing points on a PolygonSelector
+------------------------------------
+
+After completing a `~matplotlib.widgets.PolygonSelector`, individual points can
+now be removed by right-clicking on them.
+
+Dragging selectors
+------------------
+
+The `~matplotlib.widgets.SpanSelector`, `~matplotlib.widgets.RectangleSelector`
+and `~matplotlib.widgets.EllipseSelector` have a new keyword argument,
+*drag_from_anywhere*, which when set to `True` allows you to click and drag
+from anywhere inside the selector to move it. Previously it was only possible
+to move it by either activating the move modifier button, or clicking on the
+central handle.
+
+The size of the `~matplotlib.widgets.SpanSelector` can now be changed using the
+edge handles.
+
+Clearing selectors
+------------------
+
+The selectors (`~.widgets.EllipseSelector`, `~.widgets.LassoSelector`,
+`~.widgets.PolygonSelector`, `~.widgets.RectangleSelector`, and
+`~.widgets.SpanSelector`) have a new method *clear*, which will clear the
+current selection and get the selector ready to make a new selection. This is
+equivalent to pressing the *escape* key.
+
+Setting artist properties of selectors
+--------------------------------------
+
+The artist properties of the `~.widgets.EllipseSelector`,
+`~.widgets.LassoSelector`, `~.widgets.PolygonSelector`,
+`~.widgets.RectangleSelector` and `~.widgets.SpanSelector` selectors can be
+changed using the ``set_props`` and ``set_handle_props`` methods.
+
+Ignore events outside selection
+-------------------------------
+
+The `~.widgets.EllipseSelector`, `~.widgets.RectangleSelector` and
+`~.widgets.SpanSelector` selectors have a new keyword argument,
+*ignore_event_outside*, which when set to `True` will ignore events outside of
+the current selection. The handles or the new dragging functionality can instead
+be used to change the selection.
+
+``CallbackRegistry`` objects gain a method to temporarily block signals
+-----------------------------------------------------------------------
+
+The context manager `~matplotlib.cbook.CallbackRegistry.blocked` can be used
+to block callback signals from being processed by the ``CallbackRegistry``.
+The optional keyword, *signal*, can be used to block a specific signal
+from being processed and let all other signals pass.
+
+.. code-block::
+
+    import matplotlib.pyplot as plt
+
+    fig, ax = plt.subplots()
+    ax.imshow([[0, 1], [2, 3]])
+
+    # Block all interactivity through the canvas callbacks
+    with fig.canvas.callbacks.blocked():
+        plt.show()
+
+    fig, ax = plt.subplots()
+    ax.imshow([[0, 1], [2, 3]])
+
+    # Only block key press events
+    with fig.canvas.callbacks.blocked(signal="key_press_event"):
+        plt.show()
+
+Directional sizing cursors
+--------------------------
+
+Canvases now support setting directional sizing cursors, i.e., horizontal and
+vertical double arrows. These are used in e.g., selector widgets. Try the
+:doc:`/gallery/widgets/mouse_cursor` example to see the cursor in your desired
+backend.
+
+Sphinx extensions
+=================
+
+More configuration of ``mathmpl`` sphinx extension
+--------------------------------------------------
+
+The `matplotlib.sphinxext.mathmpl` sphinx extension supports two new
+configuration options that may be specified in your ``conf.py``:
+
+- ``mathmpl_fontsize`` (float), which sets the font size of the math text in
+  points;
+- ``mathmpl_srcset`` (list of str), which provides a list of sizes to support
+  `responsive resolution images
+  <https://developer.mozilla.org/en-US/docs/Learn/HTML/Multimedia_and_embedding/Responsive_images>`__
+  The list should contain additional x-descriptors (``'1.5x'``, ``'2x'``, etc.)
+  to generate (1x is the default and always included.)
+
+Backend-specific improvements
+=============================
+
+GTK backend
+-----------
+
+A backend supporting GTK4_ has been added. Both Agg and Cairo renderers are
+supported. The GTK4 backends may be selected as GTK4Agg or GTK4Cairo.
+
+.. _GTK4: https://www.gtk.org/
+
+Qt backends
+-----------
+
+Support for Qt6 (using either PyQt6_ or PySide6_) has been added, with either
+the Agg or Cairo renderers. Simultaneously, support for Qt4 has been dropped.
+Both Qt6 and Qt5 are supported by a combined backend (QtAgg or QtCairo), and
+the loaded version is determined by modules already imported, the
+:envvar:`QT_API` environment variable, and available packages. See
+:ref:`QT_API-usage` for details. The versioned Qt5 backend names (Qt5Agg or
+Qt5Cairo) remain supported for backwards compatibility.
+
+.. _PyQt6: https://www.riverbankcomputing.com/static/Docs/PyQt6/
+.. _PySide6: https://doc.qt.io/qtforpython/
+
+HiDPI support in Cairo-based, GTK, and Tk backends
+--------------------------------------------------
+
+The GTK3 backends now support HiDPI fully, including mixed monitor cases (on
+Wayland only). The newly added GTK4 backends also support HiDPI.
+
+The TkAgg backend now supports HiDPI **on Windows only**, including mixed
+monitor cases.
+
+All Cairo-based backends correctly support HiDPI as well as their Agg
+counterparts did (i.e., if the toolkit supports HiDPI, then the \*Cairo backend
+will now support it, but not otherwise.)
+
+Qt figure options editor improvements
+-------------------------------------
+
+The figure options editor in the Qt backend now also supports editing the left
+and right titles (plus the existing centre title). Editing Axis limits is
+better supported when using a date converter. The ``symlog`` option is now
+available in Axis scaling options. All entries with the same label are now
+shown in the Curves tab.
+
+WX backends support mouse navigation buttons
+--------------------------------------------
+
+The WX backends now support navigating through view states using the mouse
+forward/backward buttons, as in other backends.
+
+WebAgg uses asyncio instead of Tornado
+--------------------------------------
+
+The WebAgg backend defaults to using `asyncio` over Tornado for timer support.
+This allows using the WebAgg backend in JupyterLite.
+
+Version information
+===================
+
+We switched to the `release-branch-semver`_ version scheme of setuptools-scm.
+This only affects the version information for development builds. Their version
+number now describes the targeted release, i.e. 3.5.0.dev820+g6768ef8c4c is 820
+commits after the previous release and is scheduled to be officially released
+as 3.5.0 later.
+
+In addition to the string ``__version__``, there is now a namedtuple
+``__version_info__`` as well, which is modelled after `sys.version_info`_. Its
+primary use is safely comparing version information, e.g.  ``if
+__version_info__ >= (3, 4, 2)``.
+
+.. _release-branch-semver: https://github.com/pypa/setuptools_scm#version-number-construction
+.. _sys.version_info: https://docs.python.org/3/library/sys.html#sys.version_info
diff --git a/doc/users/prev_whats_new/whats_new_3.5.2.rst b/doc/users/prev_whats_new/whats_new_3.5.2.rst
new file mode 100644
index 000000000000..85b1c38862eb
--- /dev/null
+++ b/doc/users/prev_whats_new/whats_new_3.5.2.rst
@@ -0,0 +1,20 @@
+=============================================
+What's new in Matplotlib 3.5.2 (May 02, 2022)
+=============================================
+
+For a list of all of the issues and pull requests since the last revision, see
+the :ref:`github-stats`.
+
+.. contents:: Table of Contents
+   :depth: 4
+
+.. toctree::
+   :maxdepth: 4
+
+Windows on ARM support
+----------------------
+
+Preliminary support for Windows on arm64 target has been added; this requires
+FreeType 2.11 or above.
+
+No binary wheels are available yet but it may be built from source.
diff --git a/doc/users/prev_whats_new/whats_new_3.6.0.rst b/doc/users/prev_whats_new/whats_new_3.6.0.rst
new file mode 100644
index 000000000000..b7bb958d67ad
--- /dev/null
+++ b/doc/users/prev_whats_new/whats_new_3.6.0.rst
@@ -0,0 +1,872 @@
+=============================================
+What's new in Matplotlib 3.6.0 (Sep 15, 2022)
+=============================================
+
+For a list of all of the issues and pull requests since the last revision, see
+the :ref:`github-stats`.
+
+.. contents:: Table of Contents
+   :depth: 4
+
+.. toctree::
+   :maxdepth: 4
+
+Figure and Axes creation / management
+=====================================
+
+``subplots``, ``subplot_mosaic`` accept *height_ratios* and *width_ratios* arguments
+------------------------------------------------------------------------------------
+
+The relative width and height of columns and rows in `~.Figure.subplots` and
+`~.Figure.subplot_mosaic` can be controlled by passing *height_ratios* and
+*width_ratios* keyword arguments to the methods:
+
+.. plot::
+    :include-source: true
+
+    fig = plt.figure()
+    axs = fig.subplots(3, 1, sharex=True, height_ratios=[3, 1, 1])
+
+Previously, this required passing the ratios in *gridspec_kw* arguments::
+
+    fig = plt.figure()
+    axs = fig.subplots(3, 1, sharex=True,
+                       gridspec_kw=dict(height_ratios=[3, 1, 1]))
+
+Constrained layout is no longer considered experimental
+-------------------------------------------------------
+
+The constrained layout engine and API is no longer considered experimental.
+Arbitrary changes to behaviour and API are no longer permitted without a
+deprecation period.
+
+New ``layout_engine`` module
+----------------------------
+
+Matplotlib ships with ``tight_layout`` and ``constrained_layout`` layout
+engines.  A new `.layout_engine` module is provided to allow downstream
+libraries to write their own layout engines and `~.figure.Figure` objects can
+now take a `.LayoutEngine` subclass as an argument to the *layout* parameter.
+
+Compressed layout for fixed-aspect ratio Axes
+---------------------------------------------
+
+Simple arrangements of Axes with fixed aspect ratios can now be packed together
+with ``fig, axs = plt.subplots(2, 3, layout='compressed')``.
+
+With ``layout='tight'`` or ``'constrained'``, Axes with a fixed aspect ratio
+can leave large gaps between each other:
+
+.. plot::
+
+    fig, axs = plt.subplots(2, 2, figsize=(5, 3),
+                            sharex=True, sharey=True, layout="constrained")
+    for ax in axs.flat:
+        ax.imshow([[0, 1], [2, 3]])
+    fig.suptitle("fixed-aspect plots, layout='constrained'")
+
+Using the ``layout='compressed'`` layout reduces the space between the Axes,
+and adds the extra space to the outer margins:
+
+.. plot::
+
+    fig, axs = plt.subplots(2, 2, figsize=(5, 3),
+                            sharex=True, sharey=True, layout='compressed')
+    for ax in axs.flat:
+        ax.imshow([[0, 1], [2, 3]])
+    fig.suptitle("fixed-aspect plots, layout='compressed'")
+
+See :ref:`compressed_layout` for further details.
+
+Layout engines may now be removed
+---------------------------------
+
+The layout engine on a Figure may now be removed by calling
+`.Figure.set_layout_engine` with ``'none'``. This may be useful after computing
+layout in order to reduce computations, e.g., for subsequent animation loops.
+
+A different layout engine may be set afterwards, so long as it is compatible
+with the previous layout engine.
+
+``Axes.inset_axes`` flexibility
+-------------------------------
+
+`matplotlib.axes.Axes.inset_axes` now accepts the *projection*, *polar* and
+*axes_class* keyword arguments, so that subclasses of `matplotlib.axes.Axes`
+may be returned.
+
+.. plot::
+    :include-source: true
+
+    fig, ax = plt.subplots()
+
+    ax.plot([0, 2], [1, 2])
+
+    polar_ax = ax.inset_axes([0.75, 0.25, 0.2, 0.2], projection='polar')
+    polar_ax.plot([0, 2], [1, 2])
+
+WebP is now a supported output format
+-------------------------------------
+
+Figures may now be saved in WebP format by using the ``.webp`` file extension,
+or passing ``format='webp'`` to `~.Figure.savefig`. This relies on `Pillow
+<https://pillow.readthedocs.io/en/latest/>`_ support for WebP.
+
+Garbage collection is no longer run on figure close
+---------------------------------------------------
+
+Matplotlib has a large number of circular references (between Figure and
+Manager, between Axes and Figure, Axes and Artist, Figure and Canvas, etc.) so
+when the user drops their last reference to a Figure (and clears it from
+pyplot's state), the objects will not immediately be deleted.
+
+To account for this we have long (since before 2004) had a `gc.collect` (of the
+lowest two generations only) in the closing code in order to promptly clean up
+after ourselves. However this is both not doing what we want (as most of our
+objects will actually survive) and due to clearing out the first generation
+opened us up to having unbounded memory usage.
+
+In cases with a very tight loop between creating the figure and destroying it
+(e.g. ``plt.figure(); plt.close()``) the first generation will never grow large
+enough for Python to consider running the collection on the higher generations.
+This will lead to unbounded memory usage as the long-lived objects are never
+re-considered to look for reference cycles and hence are never deleted.
+
+We now no longer do any garbage collection when a figure is closed, and rely on
+Python automatically deciding to run garbage collection periodically. If you
+have strict memory requirements, you can call `gc.collect` yourself but this
+may have performance impacts in a tight computation loop.
+
+Plotting methods
+================
+
+Striped lines (experimental)
+----------------------------
+
+The new *gapcolor* parameter to `~.Axes.plot` enables the creation of striped
+lines.
+
+.. plot::
+    :include-source: true
+
+    x = np.linspace(1., 3., 10)
+    y = x**3
+
+    fig, ax = plt.subplots()
+    ax.plot(x, y, linestyle='--', color='orange', gapcolor='blue',
+            linewidth=3, label='a striped line')
+    ax.legend()
+
+Custom cap widths in box and whisker plots in ``bxp`` and ``boxplot``
+---------------------------------------------------------------------
+
+The new *capwidths* parameter to `~.Axes.bxp` and `~.Axes.boxplot` allows
+controlling the widths of the caps in box and whisker plots.
+
+.. plot::
+    :include-source: true
+
+    x = np.linspace(-7, 7, 140)
+    x = np.hstack([-25, x, 25])
+    capwidths = [0.01, 0.2]
+
+    fig, ax = plt.subplots()
+    ax.boxplot([x, x], notch=True, capwidths=capwidths)
+    ax.set_title(f'{capwidths=}')
+
+Easier labelling of bars in bar plot
+------------------------------------
+
+The *label* argument of `~.Axes.bar` and `~.Axes.barh` can now be passed a list
+of labels for the bars. The list must be the same length as *x* and labels the
+individual bars. Repeated labels are not de-duplicated and will cause repeated
+label entries, so this is best used when bars also differ in style (e.g., by
+passing a list to *color*, as below.)
+
+.. plot::
+    :include-source: true
+
+    x = ["a", "b", "c"]
+    y = [10, 20, 15]
+    color = ['C0', 'C1', 'C2']
+
+    fig, ax = plt.subplots()
+    ax.bar(x, y, color=color, label=x)
+    ax.legend()
+
+New style format string for colorbar ticks
+------------------------------------------
+
+The *format* argument of `~.Figure.colorbar` (and other colorbar methods) now
+accepts ``{}``-style format strings.
+
+.. code-block:: python
+
+    fig, ax = plt.subplots()
+    im = ax.imshow(z)
+    fig.colorbar(im, format='{x:.2e}')  # Instead of '%.2e'
+
+Linestyles for negative contours may be set individually
+--------------------------------------------------------
+
+The line style of negative contours may be set by passing the
+*negative_linestyles* argument to `.Axes.contour`. Previously, this style could
+only be set globally via :rc:`contour.negative_linestyles`.
+
+.. plot::
+    :include-source: true
+
+    delta = 0.025
+    x = np.arange(-3.0, 3.0, delta)
+    y = np.arange(-2.0, 2.0, delta)
+    X, Y = np.meshgrid(x, y)
+    Z1 = np.exp(-X**2 - Y**2)
+    Z2 = np.exp(-(X - 1)**2 - (Y - 1)**2)
+    Z = (Z1 - Z2) * 2
+
+    fig, axs = plt.subplots(1, 2)
+
+    CS = axs[0].contour(X, Y, Z, 6, colors='k')
+    axs[0].clabel(CS, fontsize=9, inline=True)
+    axs[0].set_title('Default negative contours')
+
+    CS = axs[1].contour(X, Y, Z, 6, colors='k', negative_linestyles='dotted')
+    axs[1].clabel(CS, fontsize=9, inline=True)
+    axs[1].set_title('Dotted negative contours')
+
+Improved quad contour calculations via ContourPy
+------------------------------------------------
+
+The contouring functions `~.axes.Axes.contour` and `~.axes.Axes.contourf` have
+a new keyword argument *algorithm* to control which algorithm is used to
+calculate the contours. There is a choice of four algorithms to use, and the
+default is to use ``algorithm='mpl2014'`` which is the same algorithm that
+Matplotlib has been using since 2014.
+
+Previously Matplotlib shipped its own C++ code for calculating the contours of
+quad grids. Now the external library `ContourPy
+<https://github.com/contourpy/contourpy>`_ is used instead.
+
+Other possible values of the *algorithm* keyword argument at this time are
+``'mpl2005'``, ``'serial'`` and ``'threaded'``; see the `ContourPy
+documentation <https://contourpy.readthedocs.io>`_ for further details.
+
+.. note::
+
+   Contour lines and polygons produced by ``algorithm='mpl2014'`` will be the
+   same as those produced before this change to within floating-point
+   tolerance. The exception is for duplicate points, i.e. contours containing
+   adjacent (x, y) points that are identical; previously the duplicate points
+   were removed, now they are kept. Contours affected by this will produce the
+   same visual output, but there will be a greater number of points in the
+   contours.
+
+   The locations of contour labels obtained by using `~.axes.Axes.clabel` may
+   also be different.
+
+``errorbar`` supports *markerfacecoloralt*
+------------------------------------------
+
+The *markerfacecoloralt* parameter is now passed to the line plotter from
+`.Axes.errorbar`. The documentation now accurately lists which properties are
+passed to `.Line2D`, rather than claiming that all keyword arguments are passed
+on.
+
+.. plot::
+    :include-source: true
+
+    x = np.arange(0.1, 4, 0.5)
+    y = np.exp(-x)
+
+    fig, ax = plt.subplots()
+    ax.errorbar(x, y, xerr=0.2, yerr=0.4,
+                linestyle=':', color='darkgrey',
+                marker='o', markersize=20, fillstyle='left',
+                markerfacecolor='tab:blue', markerfacecoloralt='tab:orange',
+                markeredgecolor='tab:brown', markeredgewidth=2)
+
+``streamplot`` can disable streamline breaks
+--------------------------------------------
+
+It is now possible to specify that streamplots have continuous, unbroken
+streamlines. Previously streamlines would end to limit the number of lines
+within a single grid cell. See the difference between the plots below:
+
+.. plot::
+
+    w = 3
+    Y, X = np.mgrid[-w:w:100j, -w:w:100j]
+    U = -1 - X**2 + Y
+    V = 1 + X - Y**2
+    speed = np.sqrt(U**2 + V**2)
+
+    fig, (ax0, ax1) = plt.subplots(1, 2, sharex=True)
+
+    ax0.streamplot(X, Y, U, V, broken_streamlines=True)
+    ax0.set_title('broken_streamlines=True')
+
+    ax1.streamplot(X, Y, U, V, broken_streamlines=False)
+    ax1.set_title('broken_streamlines=False')
+
+New axis scale ``asinh`` (experimental)
+---------------------------------------
+
+The new ``asinh`` axis scale offers an alternative to ``symlog`` that smoothly
+transitions between the quasi-linear and asymptotically logarithmic regions of
+the scale. This is based on an arcsinh transformation that allows plotting both
+positive and negative values that span many orders of magnitude.
+
+.. plot::
+
+    fig, (ax0, ax1) = plt.subplots(1, 2, sharex=True)
+    x = np.linspace(-3, 6, 100)
+
+    ax0.plot(x, x)
+    ax0.set_yscale('symlog')
+    ax0.grid()
+    ax0.set_title('symlog')
+
+    ax1.plot(x, x)
+    ax1.set_yscale('asinh')
+    ax1.grid()
+    ax1.set_title(r'$sinh^{-1}$')
+
+    for p in (-2, 2):
+        for ax in (ax0, ax1):
+            c = plt.Circle((p, p), radius=0.5, fill=False,
+                           color='red', alpha=0.8, lw=3)
+            ax.add_patch(c)
+
+``stairs(..., fill=True)`` hides patch edge by setting linewidth
+----------------------------------------------------------------
+
+``stairs(..., fill=True)`` would previously hide Patch edges by setting
+``edgecolor="none"``. Consequently, calling ``set_color()`` on the Patch later
+would make the Patch appear larger.
+
+Now, by using ``linewidth=0``, this apparent size change is prevented. Likewise
+calling ``stairs(..., fill=True, linewidth=3)`` will behave more transparently.
+
+Fix the dash offset of the Patch class
+--------------------------------------
+
+Formerly, when setting the line style on a `.Patch` object using a dash tuple,
+the offset was ignored. Now the offset is applied to the Patch as expected and
+it can be used as it is used with `.Line2D` objects.
+
+Rectangle patch rotation point
+------------------------------
+
+The rotation point of the `~matplotlib.patches.Rectangle` can now be set to
+'xy', 'center' or a 2-tuple of numbers using the *rotation_point* argument.
+
+.. plot::
+
+    fig, ax = plt.subplots()
+
+    rect = plt.Rectangle((0, 0), 1, 1, facecolor='none', edgecolor='C0')
+    ax.add_patch(rect)
+    ax.annotate('Unrotated', (1, 0), color='C0',
+                horizontalalignment='right', verticalalignment='top',
+                xytext=(0, -3), textcoords='offset points')
+
+    for rotation_point, color in zip(['xy', 'center', (0.75, 0.25)],
+                                     ['C1', 'C2', 'C3']):
+        ax.add_patch(
+            plt.Rectangle((0, 0), 1, 1, facecolor='none', edgecolor=color,
+                          angle=45, rotation_point=rotation_point))
+
+        if rotation_point == 'center':
+            point = 0.5, 0.5
+        elif rotation_point == 'xy':
+            point = 0, 0
+        else:
+            point = rotation_point
+        ax.plot(point[:1], point[1:], color=color, marker='o')
+
+        label = f'{rotation_point}'
+        if label == 'xy':
+            label += ' (default)'
+        ax.annotate(label, point, color=color,
+                    xytext=(3, 3), textcoords='offset points')
+
+    ax.set_aspect(1)
+    ax.set_title('rotation_point options')
+
+Colors and colormaps
+====================
+
+Color sequence registry
+-----------------------
+
+The color sequence registry, `.ColorSequenceRegistry`, contains sequences
+(i.e., simple lists) of colors that are known to Matplotlib by name. This will
+not normally be used directly, but through the universal instance at
+`matplotlib.color_sequences`.
+
+Colormap method for creating a different lookup table size
+----------------------------------------------------------
+
+The new method `.Colormap.resampled` creates a new `.Colormap` instance
+with the specified lookup table size. This is a replacement for manipulating
+the lookup table size via ``get_cmap``.
+
+Use::
+
+    get_cmap(name).resampled(N)
+
+instead of::
+
+    get_cmap(name, lut=N)
+
+Setting norms with strings
+--------------------------
+
+Norms can now be set (e.g. on images) using the string name of the
+corresponding scale, e.g. ``imshow(array, norm="log")``.  Note that in that
+case, it is permissible to also pass *vmin* and *vmax*, as a new Norm instance
+will be created under the hood.
+
+Titles, ticks, and labels
+=========================
+
+``plt.xticks`` and ``plt.yticks`` support *minor* keyword argument
+------------------------------------------------------------------
+
+It is now possible to set or get minor ticks using `.pyplot.xticks` and
+`.pyplot.yticks` by setting ``minor=True``.
+
+.. plot::
+    :include-source: true
+
+    plt.figure()
+    plt.plot([1, 2, 3, 3.5], [2, 1, 0, -0.5])
+    plt.xticks([1, 2, 3], ["One", "Zwei", "Trois"])
+    plt.xticks([np.sqrt(2), 2.5, np.pi],
+               [r"$\sqrt{2}$", r"$\frac{5}{2}$", r"$\pi$"], minor=True)
+
+Legends
+=======
+
+Legend can control alignment of title and handles
+-------------------------------------------------
+
+`.Legend` now supports controlling the alignment of the title and handles via
+the keyword argument *alignment*. You can also use `.Legend.set_alignment` to
+control the alignment on existing Legends.
+
+.. plot::
+    :include-source: true
+
+    fig, axs = plt.subplots(3, 1)
+    for i, alignment in enumerate(['left', 'center', 'right']):
+        axs[i].plot(range(10), label='test')
+        axs[i].legend(title=f'{alignment=}', alignment=alignment)
+
+*ncol* keyword argument to ``legend`` renamed to *ncols*
+--------------------------------------------------------
+
+The *ncol* keyword argument to `~.Axes.legend` for controlling the number of
+columns is renamed to *ncols* for consistency with the *ncols* and *nrows*
+keywords of `~.Figure.subplots` and `~.GridSpec`. *ncol* remains supported for
+backwards compatibility, but is discouraged.
+
+Markers
+=======
+
+``marker`` can now be set to the string "none"
+----------------------------------------------
+
+The string "none" means *no-marker*, consistent with other APIs which support
+the lowercase version.  Using "none" is recommended over using "None", to avoid
+confusion with the None object.
+
+Customization of ``MarkerStyle`` join and cap style
+---------------------------------------------------
+
+New `.MarkerStyle` parameters allow control of join style and cap style, and
+for the user to supply a transformation to be applied to the marker (e.g. a
+rotation).
+
+.. plot::
+    :include-source: true
+
+    from matplotlib.markers import CapStyle, JoinStyle, MarkerStyle
+    from matplotlib.transforms import Affine2D
+
+    fig, axs = plt.subplots(3, 1, layout='constrained')
+    for ax in axs:
+        ax.axis('off')
+        ax.set_xlim(-0.5, 2.5)
+
+    axs[0].set_title('Cap styles', fontsize=14)
+    for col, cap in enumerate(CapStyle):
+        axs[0].plot(col, 0, markersize=32, markeredgewidth=8,
+                    marker=MarkerStyle('1', capstyle=cap))
+        # Show the marker edge for comparison with the cap.
+        axs[0].plot(col, 0, markersize=32, markeredgewidth=1,
+                    markerfacecolor='none', markeredgecolor='lightgrey',
+                    marker=MarkerStyle('1'))
+        axs[0].annotate(cap.name, (col, 0),
+                        xytext=(20, -5), textcoords='offset points')
+
+    axs[1].set_title('Join styles', fontsize=14)
+    for col, join in enumerate(JoinStyle):
+        axs[1].plot(col, 0, markersize=32, markeredgewidth=8,
+                    marker=MarkerStyle('*', joinstyle=join))
+        # Show the marker edge for comparison with the join.
+        axs[1].plot(col, 0, markersize=32, markeredgewidth=1,
+                    markerfacecolor='none', markeredgecolor='lightgrey',
+                    marker=MarkerStyle('*'))
+        axs[1].annotate(join.name, (col, 0),
+                        xytext=(20, -5), textcoords='offset points')
+
+    axs[2].set_title('Arbitrary transforms', fontsize=14)
+    for col, (size, rot) in enumerate(zip([2, 5, 7], [0, 45, 90])):
+        t = Affine2D().rotate_deg(rot).scale(size)
+        axs[2].plot(col, 0, marker=MarkerStyle('*', transform=t))
+
+Fonts and Text
+==============
+
+Font fallback
+-------------
+
+It is now possible to specify a list of fonts families and Matplotlib will try
+them in order to locate a required glyph.
+
+.. plot::
+   :caption: Demonstration of mixed English and Chinese text with font fallback.
+   :alt: The phrase "There are 几个汉字 in between!" rendered in various fonts.
+   :include-source: True
+
+   plt.rcParams["font.size"] = 20
+   fig = plt.figure(figsize=(4.75, 1.85))
+
+   text = "There are 几个汉字 in between!"
+   fig.text(0.05, 0.85, text, family=["WenQuanYi Zen Hei"])
+   fig.text(0.05, 0.65, text, family=["Noto Sans CJK JP"])
+   fig.text(0.05, 0.45, text, family=["DejaVu Sans", "Noto Sans CJK JP"])
+   fig.text(0.05, 0.25, text, family=["DejaVu Sans", "WenQuanYi Zen Hei"])
+
+This currently works with the Agg (and all of the GUI embeddings), svg, pdf,
+ps, and inline backends.
+
+List of available font names
+----------------------------
+
+The list of available fonts are now easily accessible. To get a list of the
+available font names in Matplotlib use:
+
+.. code-block:: python
+
+    from matplotlib import font_manager
+    font_manager.get_font_names()
+
+``math_to_image`` now has a *color* keyword argument
+----------------------------------------------------
+
+To easily support external libraries that rely on the MathText rendering of
+Matplotlib to generate equation images, a *color* keyword argument was added to
+`~matplotlib.mathtext.math_to_image`.
+
+.. code-block:: python
+
+    from matplotlib import mathtext
+    mathtext.math_to_image('$x^2$', 'filename.png', color='Maroon')
+
+Active URL area rotates with link text
+--------------------------------------
+
+When link text is rotated in a figure, the active URL area will now include the
+rotated link area. Previously, the active area remained in the original,
+non-rotated, position.
+
+rcParams improvements
+=====================
+
+Allow setting figure label size and weight globally and separately from title
+-----------------------------------------------------------------------------
+
+For figure labels, ``Figure.supxlabel`` and ``Figure.supylabel``, the size and
+weight can be set separately from the figure title using :rc:`figure.labelsize`
+and :rc:`figure.labelweight`.
+
+.. plot::
+    :include-source: true
+
+    # Original (previously combined with below) rcParams:
+    plt.rcParams['figure.titlesize'] = 64
+    plt.rcParams['figure.titleweight'] = 'bold'
+
+    # New rcParams:
+    plt.rcParams['figure.labelsize'] = 32
+    plt.rcParams['figure.labelweight'] = 'bold'
+
+    fig, axs = plt.subplots(2, 2, layout='constrained')
+    for ax in axs.flat:
+        ax.set(xlabel='xlabel', ylabel='ylabel')
+
+    fig.suptitle('suptitle')
+    fig.supxlabel('supxlabel')
+    fig.supylabel('supylabel')
+
+Note that if you have changed :rc:`figure.titlesize` or
+:rc:`figure.titleweight`, you must now also change the introduced parameters
+for a result consistent with past behaviour.
+
+Mathtext parsing can be disabled globally
+-----------------------------------------
+
+The :rc:`text.parse_math` setting may be used to disable parsing of mathtext in
+all `.Text` objects (most notably from the `.Axes.text` method).
+
+Double-quoted strings in matplotlibrc
+-------------------------------------
+
+You can now use double-quotes around strings. This allows using the '#'
+character in strings. Without quotes, '#' is interpreted as start of a comment.
+In particular, you can now define hex-colors:
+
+.. code-block:: none
+
+   grid.color: "#b0b0b0"
+
+3D Axes improvements
+====================
+
+Standardized views for primary plane viewing angles
+---------------------------------------------------
+
+When viewing a 3D plot in one of the primary view planes (i.e., perpendicular
+to the XY, XZ, or YZ planes), the Axis will be displayed in a standard
+location. For further information on 3D views, see
+:ref:`toolkit_mplot3d-view-angles` and :doc:`/gallery/mplot3d/view_planes_3d`.
+
+Custom focal length for 3D camera
+---------------------------------
+
+The 3D Axes can now better mimic real-world cameras by specifying the focal
+length of the virtual camera. The default focal length of 1 corresponds to a
+Field of View (FOV) of 90°, and is backwards-compatible with existing 3D plots.
+An increased focal length between 1 and infinity "flattens" the image, while a
+decreased focal length between 1 and 0 exaggerates the perspective and gives
+the image more apparent depth.
+
+The focal length can be calculated from a desired FOV via the equation:
+
+.. mathmpl::
+
+    focal\_length = 1/\tan(FOV/2)
+
+.. plot::
+    :include-source: true
+
+    from mpl_toolkits.mplot3d import axes3d
+
+    X, Y, Z = axes3d.get_test_data(0.05)
+
+    fig, axs = plt.subplots(1, 3, figsize=(7, 4),
+                            subplot_kw={'projection': '3d'})
+
+    for ax, focal_length in zip(axs, [0.2, 1, np.inf]):
+        ax.plot_wireframe(X, Y, Z, rstride=10, cstride=10)
+        ax.set_proj_type('persp', focal_length=focal_length)
+        ax.set_title(f"{focal_length=}")
+
+3D plots gained a 3rd "roll" viewing angle
+------------------------------------------
+
+3D plots can now be viewed from any orientation with the addition of a 3rd roll
+angle, which rotates the plot about the viewing axis. Interactive rotation
+using the mouse still only controls elevation and azimuth, meaning that this
+feature is relevant to users who create more complex camera angles
+programmatically. The default roll angle of 0 is backwards-compatible with
+existing 3D plots.
+
+.. plot::
+    :include-source: true
+
+    from mpl_toolkits.mplot3d import axes3d
+
+    X, Y, Z = axes3d.get_test_data(0.05)
+
+    fig, ax = plt.subplots(subplot_kw={'projection': '3d'})
+
+    ax.plot_wireframe(X, Y, Z, rstride=10, cstride=10)
+    ax.view_init(elev=0, azim=0, roll=30)
+    ax.set_title('elev=0, azim=0, roll=30')
+
+Equal aspect ratio for 3D plots
+-------------------------------
+
+Users can set the aspect ratio for the X, Y, Z axes of a 3D plot to be 'equal',
+'equalxy', 'equalxz', or 'equalyz' rather than the default of 'auto'.
+
+.. plot::
+    :include-source: true
+
+    from itertools import combinations, product
+
+    aspects = [
+        ['auto', 'equal', '.'],
+        ['equalxy', 'equalyz', 'equalxz'],
+    ]
+    fig, axs = plt.subplot_mosaic(aspects, figsize=(7, 6),
+                                  subplot_kw={'projection': '3d'})
+
+    # Draw rectangular cuboid with side lengths [1, 1, 5]
+    r = [0, 1]
+    scale = np.array([1, 1, 5])
+    pts = combinations(np.array(list(product(r, r, r))), 2)
+    for start, end in pts:
+        if np.sum(np.abs(start - end)) == r[1] - r[0]:
+            for ax in axs.values():
+                ax.plot3D(*zip(start*scale, end*scale), color='C0')
+
+    # Set the aspect ratios
+    for aspect, ax in axs.items():
+        ax.set_box_aspect((3, 4, 5))
+        ax.set_aspect(aspect)
+        ax.set_title(f'set_aspect({aspect!r})')
+
+Interactive tool improvements
+=============================
+
+Rotation, aspect ratio correction and add/remove state
+------------------------------------------------------
+
+The `.RectangleSelector` and `.EllipseSelector` can now be rotated
+interactively between -45° and 45°. The range limits are currently dictated by
+the implementation. The rotation is enabled or disabled by striking the *r* key
+('r' is the default key mapped to 'rotate' in *state_modifier_keys*) or by
+calling ``selector.add_state('rotate')``.
+
+The aspect ratio of the axes can now be taken into account when using the
+"square" state. This is enabled by specifying ``use_data_coordinates='True'``
+when the selector is initialized.
+
+In addition to changing selector state interactively using the modifier keys
+defined in *state_modifier_keys*, the selector state can now be changed
+programmatically using the *add_state* and *remove_state* methods.
+
+.. code-block:: python
+
+    from matplotlib.widgets import RectangleSelector
+
+    values = np.arange(0, 100)
+
+    fig = plt.figure()
+    ax = fig.add_subplot()
+    ax.plot(values, values)
+
+    selector = RectangleSelector(ax, print, interactive=True,
+                                 drag_from_anywhere=True,
+                                 use_data_coordinates=True)
+    selector.add_state('rotate')  # alternatively press 'r' key
+    # rotate the selector interactively
+
+    selector.remove_state('rotate')  # alternatively press 'r' key
+
+    selector.add_state('square')
+
+``MultiCursor`` now supports Axes split over multiple figures
+-------------------------------------------------------------
+
+Previously, `.MultiCursor` only worked if all target Axes belonged to the same
+figure.
+
+As a consequence of this change, the first argument to the `.MultiCursor`
+constructor has become unused (it was previously the joint canvas of all Axes,
+but the canvases are now directly inferred from the list of Axes).
+
+``PolygonSelector`` bounding boxes
+----------------------------------
+
+`.PolygonSelector` now has a *draw_bounding_box* argument, which when set to
+`True` will draw a bounding box around the polygon once it is complete. The
+bounding box can be resized and moved, allowing the points of the polygon to be
+easily resized.
+
+Setting ``PolygonSelector`` vertices
+------------------------------------
+
+The vertices of `.PolygonSelector` can now be set programmatically by using the
+`.PolygonSelector.verts` property. Setting the vertices this way will reset the
+selector, and create a new complete selector with the supplied vertices.
+
+``SpanSelector`` widget can now be snapped to specified values
+--------------------------------------------------------------
+
+The `.SpanSelector` widget can now be snapped to values specified by the
+*snap_values* argument.
+
+More toolbar icons are styled for dark themes
+---------------------------------------------
+
+On the macOS and Tk backends, toolbar icons will now be inverted when using a
+dark theme.
+
+Platform-specific changes
+=========================
+
+Wx backend uses standard toolbar
+--------------------------------
+
+Instead of a custom sizer, the toolbar is set on Wx windows as a standard
+toolbar.
+
+Improvements to macosx backend
+------------------------------
+
+Modifier keys handled more consistently
+.......................................
+
+The macosx backend now handles modifier keys in a manner more consistent with
+other backends. See the table in :ref:`event-connections` for further
+information.
+
+``savefig.directory`` rcParam support
+.....................................
+
+The macosx backend will now obey the :rc:`savefig.directory` setting. If set to
+a non-empty string, then the save dialog will default to this directory, and
+preserve subsequent save directories as they are changed.
+
+``figure.raise_window`` rcParam support
+.......................................
+
+The macosx backend will now obey the :rc:`figure.raise_window` setting. If set
+to False, figure windows will not be raised to the top on update.
+
+Full-screen toggle support
+..........................
+
+As supported on other backends, the macosx backend now supports toggling
+fullscreen view. By default, this view can be toggled by pressing the :kbd:`f`
+key.
+
+Improved animation and blitting support
+.......................................
+
+The macosx backend has been improved to fix blitting, animation frames with new
+artists, and to reduce unnecessary draw calls.
+
+macOS application icon applied on Qt backend
+--------------------------------------------
+
+When using the Qt-based backends on macOS, the application icon will now be
+set, as is done on other backends/platforms.
+
+New minimum macOS version
+-------------------------
+
+The macosx backend now requires macOS >= 10.12.
+
+Windows on ARM support
+----------------------
+
+Preliminary support for Windows on arm64 target has been added. This support
+requires FreeType 2.11 or above.
+
+No binary wheels are available yet but it may be built from source.
diff --git a/doc/users/project/citing.rst b/doc/users/project/citing.rst
new file mode 100644
index 000000000000..5dd7488e50b6
--- /dev/null
+++ b/doc/users/project/citing.rst
@@ -0,0 +1,171 @@
+.. redirect-from:: /citing
+
+Citing Matplotlib
+=================
+
+If Matplotlib contributes to a project that leads to a scientific publication,
+please acknowledge this fact by citing `J. D. Hunter, "Matplotlib: A 2D
+Graphics Environment", Computing in Science & Engineering, vol. 9, no. 3,
+pp. 90-95, 2007 <https://doi.org/10.1109/MCSE.2007.55>`_.
+
+.. literalinclude:: ../../../CITATION.bib
+   :language: bibtex
+
+.. container:: sphx-glr-download
+
+   :download:`Download BibTeX bibliography file: CITATION.bib <../../../CITATION.bib>`
+
+DOIs
+----
+
+The following DOI represents *all* Matplotlib versions. Please select a more
+specific DOI from the list below, referring to the version used for your publication.
+
+   .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.592536.svg
+      :target: https://doi.org/10.5281/zenodo.592536
+
+By version
+~~~~~~~~~~
+.. START OF AUTOGENERATED
+
+
+v3.6.1
+   .. image:: ../../_static/zenodo_cache/7162185.svg
+      :target:  https://doi.org/10.5281/zenodo.7162185
+v3.6.0
+   .. image:: ../../_static/zenodo_cache/7084615.svg
+      :target:  https://doi.org/10.5281/zenodo.7084615
+v3.5.3
+   .. image:: ../../_static/zenodo_cache/6982547.svg
+      :target:  https://doi.org/10.5281/zenodo.6982547
+v3.5.2
+   .. image:: ../../_static/zenodo_cache/6513224.svg
+      :target:  https://doi.org/10.5281/zenodo.6513224
+v3.5.1
+   .. image:: ../../_static/zenodo_cache/5773480.svg
+      :target:  https://doi.org/10.5281/zenodo.5773480
+v3.5.0
+   .. image:: ../../_static/zenodo_cache/5706396.svg
+      :target:  https://doi.org/10.5281/zenodo.5706396
+v3.4.3
+   .. image:: ../../_static/zenodo_cache/5194481.svg
+      :target:  https://doi.org/10.5281/zenodo.5194481
+v3.4.2
+   .. image:: ../../_static/zenodo_cache/4743323.svg
+      :target:  https://doi.org/10.5281/zenodo.4743323
+v3.4.1
+   .. image:: ../../_static/zenodo_cache/4649959.svg
+      :target:  https://doi.org/10.5281/zenodo.4649959
+v3.4.0
+   .. image:: ../../_static/zenodo_cache/4638398.svg
+      :target:  https://doi.org/10.5281/zenodo.4638398
+v3.3.4
+   .. image:: ../../_static/zenodo_cache/4475376.svg
+      :target:  https://doi.org/10.5281/zenodo.4475376
+v3.3.3
+   .. image:: ../../_static/zenodo_cache/4268928.svg
+      :target:  https://doi.org/10.5281/zenodo.4268928
+v3.3.2
+   .. image:: ../../_static/zenodo_cache/4030140.svg
+      :target:  https://doi.org/10.5281/zenodo.4030140
+v3.3.1
+   .. image:: ../../_static/zenodo_cache/3984190.svg
+      :target:  https://doi.org/10.5281/zenodo.3984190
+v3.3.0
+   .. image:: ../../_static/zenodo_cache/3948793.svg
+      :target:  https://doi.org/10.5281/zenodo.3948793
+v3.2.2
+   .. image:: ../../_static/zenodo_cache/3898017.svg
+      :target:  https://doi.org/10.5281/zenodo.3898017
+v3.2.1
+   .. image:: ../../_static/zenodo_cache/3714460.svg
+      :target:  https://doi.org/10.5281/zenodo.3714460
+v3.2.0
+   .. image:: ../../_static/zenodo_cache/3695547.svg
+      :target:  https://doi.org/10.5281/zenodo.3695547
+v3.1.3
+   .. image:: ../../_static/zenodo_cache/3633844.svg
+      :target:  https://doi.org/10.5281/zenodo.3633844
+v3.1.2
+   .. image:: ../../_static/zenodo_cache/3563226.svg
+      :target:  https://doi.org/10.5281/zenodo.3563226
+v3.1.1
+   .. image:: ../../_static/zenodo_cache/3264781.svg
+      :target:  https://doi.org/10.5281/zenodo.3264781
+v3.1.0
+   .. image:: ../../_static/zenodo_cache/2893252.svg
+      :target:  https://doi.org/10.5281/zenodo.2893252
+v3.0.3
+   .. image:: ../../_static/zenodo_cache/2577644.svg
+      :target:  https://doi.org/10.5281/zenodo.2577644
+v3.0.2
+   .. image:: ../../_static/zenodo_cache/1482099.svg
+      :target:  https://doi.org/10.5281/zenodo.1482099
+v3.0.1
+   .. image:: ../../_static/zenodo_cache/1482098.svg
+      :target:  https://doi.org/10.5281/zenodo.1482098
+v2.2.5
+   .. image:: ../../_static/zenodo_cache/3633833.svg
+      :target:  https://doi.org/10.5281/zenodo.3633833
+v3.0.0
+   .. image:: ../../_static/zenodo_cache/1420605.svg
+      :target:  https://doi.org/10.5281/zenodo.1420605
+v2.2.4
+   .. image:: ../../_static/zenodo_cache/2669103.svg
+      :target:  https://doi.org/10.5281/zenodo.2669103
+v2.2.3
+   .. image:: ../../_static/zenodo_cache/1343133.svg
+      :target:  https://doi.org/10.5281/zenodo.1343133
+v2.2.2
+   .. image:: ../../_static/zenodo_cache/1202077.svg
+      :target:  https://doi.org/10.5281/zenodo.1202077
+v2.2.1
+   .. image:: ../../_static/zenodo_cache/1202050.svg
+      :target:  https://doi.org/10.5281/zenodo.1202050
+v2.2.0
+   .. image:: ../../_static/zenodo_cache/1189358.svg
+      :target:  https://doi.org/10.5281/zenodo.1189358
+v2.1.2
+   .. image:: ../../_static/zenodo_cache/1154287.svg
+      :target:  https://doi.org/10.5281/zenodo.1154287
+v2.1.1
+   .. image:: ../../_static/zenodo_cache/1098480.svg
+      :target:  https://doi.org/10.5281/zenodo.1098480
+v2.1.0
+   .. image:: ../../_static/zenodo_cache/1004650.svg
+      :target:  https://doi.org/10.5281/zenodo.1004650
+v2.0.2
+   .. image:: ../../_static/zenodo_cache/573577.svg
+      :target:  https://doi.org/10.5281/zenodo.573577
+v2.0.1
+   .. image:: ../../_static/zenodo_cache/570311.svg
+      :target:  https://doi.org/10.5281/zenodo.570311
+v2.0.0
+   .. image:: ../../_static/zenodo_cache/248351.svg
+      :target:  https://doi.org/10.5281/zenodo.248351
+v1.5.3
+   .. image:: ../../_static/zenodo_cache/61948.svg
+      :target:  https://doi.org/10.5281/zenodo.61948
+v1.5.2
+   .. image:: ../../_static/zenodo_cache/56926.svg
+      :target:  https://doi.org/10.5281/zenodo.56926
+v1.5.1
+   .. image:: ../../_static/zenodo_cache/44579.svg
+      :target:  https://doi.org/10.5281/zenodo.44579
+v1.5.0
+   .. image:: ../../_static/zenodo_cache/32914.svg
+      :target:  https://doi.org/10.5281/zenodo.32914
+v1.4.3
+   .. image:: ../../_static/zenodo_cache/15423.svg
+      :target:  https://doi.org/10.5281/zenodo.15423
+v1.4.2
+   .. image:: ../../_static/zenodo_cache/12400.svg
+      :target:  https://doi.org/10.5281/zenodo.12400
+v1.4.1
+   .. image:: ../../_static/zenodo_cache/12287.svg
+      :target:  https://doi.org/10.5281/zenodo.12287
+v1.4.0
+   .. image:: ../../_static/zenodo_cache/11451.svg
+      :target:  https://doi.org/10.5281/zenodo.11451
+
+.. END OF AUTOGENERATED
diff --git a/doc/users/credits.rst b/doc/users/project/credits.rst
similarity index 99%
rename from doc/users/credits.rst
rename to doc/users/project/credits.rst
index 0c0feed44218..c23d6ac11298 100644
--- a/doc/users/credits.rst
+++ b/doc/users/project/credits.rst
@@ -1,5 +1,7 @@
 .. Note: This file is auto-generated using generate_credits.py
 
+.. redirect-from:: /users/credits
+
 .. _credits:
 
 *******
@@ -11,7 +13,7 @@ Matplotlib was written by John D. Hunter, with contributions from an
 ever-increasing number of users and developers.  The current lead developer is
 Thomas A. Caswell, who is assisted by many `active developers
 <https://www.openhub.net/p/matplotlib/contributors>`_.
-Please also see our instructions on :doc:`/citing`.
+Please also see our instructions on :doc:`/users/project/citing`.
 
 The following is a list of contributors extracted from the
 git revision control history of the project:
diff --git a/doc/users/history.rst b/doc/users/project/history.rst
similarity index 95%
rename from doc/users/history.rst
rename to doc/users/project/history.rst
index 5294382b951e..3291d7e43f8b 100644
--- a/doc/users/history.rst
+++ b/doc/users/project/history.rst
@@ -1,3 +1,7 @@
+.. redirect-from:: /users/history
+
+.. _project_history:
+
 History
 =======
 
@@ -9,7 +13,7 @@ History
 Matplotlib is a library for making 2D plots of arrays in `Python
 <https://www.python.org>`_.  Although it has its origins in emulating
 the MATLAB graphics commands, it is
-independent of MATLAB, and can be used in a Pythonic, object oriented
+independent of MATLAB, and can be used in a Pythonic, object-oriented
 way.  Although Matplotlib is written primarily in pure Python, it
 makes heavy use of `NumPy <https://numpy.org>`_ and other extension
 code to provide good performance even for large arrays.
@@ -72,17 +76,17 @@ nothing about output.  The *backends* are device-dependent drawing
 devices, aka renderers, that transform the frontend representation to
 hardcopy or a display device (:ref:`what-is-a-backend`).  Example
 backends: PS creates `PostScript®
-<http://www.adobe.com/products/postscript/>`_ hardcopy, SVG
+<https://www.adobe.com/products/postscript.html>`_ hardcopy, SVG
 creates `Scalable Vector Graphics <https://www.w3.org/Graphics/SVG/>`_
 hardcopy, Agg creates PNG output using the high quality `Anti-Grain
-Geometry <http://antigrain.com/>`_
+Geometry <http://agg.sourceforge.net/antigrain.com/>`_
 library that ships with Matplotlib, GTK embeds Matplotlib in a
 `Gtk+ <https://www.gtk.org/>`_
 application, GTKAgg uses the Anti-Grain renderer to create a figure
 and embed it in a Gtk+ application, and so on for `PDF
-<https://acrobat.adobe.com/us/en/why-adobe/about-adobe-pdf.html>`_, `WxWidgets
+<https://acrobat.adobe.com/us/en/acrobat/about-adobe-pdf.html>`_, `WxWidgets
 <https://www.wxpython.org/>`_, `Tkinter
-<https://docs.python.org/library/tkinter.html>`_, etc.
+<https://docs.python.org/3/library/tkinter.html>`_, etc.
 
 Matplotlib is used by many people in many different contexts.  Some
 people want to automatically generate PostScript files to send
diff --git a/doc/users/project/index.rst b/doc/users/project/index.rst
new file mode 100644
index 000000000000..27f60d166abb
--- /dev/null
+++ b/doc/users/project/index.rst
@@ -0,0 +1,13 @@
+.. redirect-from:: /users/backmatter
+
+Project information
+-------------------
+
+.. toctree::
+    :maxdepth: 2
+
+    mission.rst
+    history.rst
+    citing.rst
+    license.rst
+    credits.rst
diff --git a/doc/users/project/license.rst b/doc/users/project/license.rst
new file mode 100644
index 000000000000..a55927d9f2c5
--- /dev/null
+++ b/doc/users/project/license.rst
@@ -0,0 +1,50 @@
+.. _license:
+
+.. redirect-from:: /users/license
+
+*******
+License
+*******
+
+Matplotlib only uses BSD compatible code, and its license is based on
+the `PSF <https://docs.python.org/3/license.html>`_ license.  See the Open
+Source Initiative `licenses page
+<https://opensource.org/licenses>`_ for details on individual
+licenses. Non-BSD compatible licenses (e.g., LGPL) are acceptable in
+matplotlib toolkits.  For a discussion of the motivations behind the
+licencing choice, see :ref:`license-discussion`.
+
+Copyright policy
+================
+
+John Hunter began Matplotlib around 2003.  Since shortly before his
+passing in 2012, Michael Droettboom has been the lead maintainer of
+Matplotlib, but, as has always been the case, Matplotlib is the work
+of many.
+
+Prior to July of 2013, and the 1.3.0 release, the copyright of the
+source code was held by John Hunter.  As of July 2013, and the 1.3.0
+release, matplotlib has moved to a shared copyright model.
+
+Matplotlib uses a shared copyright model. Each contributor maintains
+copyright over their contributions to Matplotlib. But, it is important to
+note that these contributions are typically only changes to the
+repositories. Thus, the Matplotlib source code, in its entirety, is not
+the copyright of any single person or institution.  Instead, it is the
+collective copyright of the entire Matplotlib Development Team.  If
+individual contributors want to maintain a record of what
+changes/contributions they have specific copyright on, they should
+indicate their copyright in the commit message of the change, when
+they commit the change to one of the matplotlib repositories.
+
+The Matplotlib Development Team is the set of all contributors to the
+matplotlib project.  A full list can be obtained from the git version
+control logs.
+
+.. _license-agreement:
+
+License agreement
+=================
+
+.. literalinclude:: ../../../LICENSE/LICENSE
+   :language: none
diff --git a/doc/users/project/mission.rst b/doc/users/project/mission.rst
new file mode 100644
index 000000000000..cf5eae92906f
--- /dev/null
+++ b/doc/users/project/mission.rst
@@ -0,0 +1,21 @@
+Matplotlib Mission Statement
+============================
+
+The Matplotlib developer community develops, maintains, and supports Matplotlib
+and its extensions to provide data visualization tools for the Scientific
+Python Ecosystem.
+
+Adapting the requirements :ref:`laid out by John Hunter <project_history>`
+Matplotlib should:
+
+* Support users of the Scientific Python ecosystem;
+* Facilitate interactive data exploration;
+* Produce high-quality raster and vector format outputs suitable for publication;
+* Provide a simple graphical user interface and support embedding in applications;
+* Be understandable and extensible by people familiar with data processing in Python;
+* Make common plots easy, and novel or complex visualizations possible.
+
+We believe that a diverse developer community creates the best software, and we
+welcome anyone who shares our mission, and our values described in the `code of
+conduct
+<https://github.com/matplotlib/matplotlib/blob/main/CODE_OF_CONDUCT.md>`__.
diff --git a/doc/users/release_notes.rst b/doc/users/release_notes.rst
new file mode 100644
index 000000000000..5ec5d471142f
--- /dev/null
+++ b/doc/users/release_notes.rst
@@ -0,0 +1,222 @@
+.. redirect-from:: /api/api_changes_old
+.. redirect-from:: /users/whats_new_old
+
+
+=============
+Release notes
+=============
+
+.. include from another document so that it's easy to exclude this for releases
+.. include: release_notes_next.rst
+
+Version 3.6
+===========
+.. toctree::
+    :maxdepth: 1
+
+    prev_whats_new/whats_new_3.6.0.rst
+    ../api/prev_api_changes/api_changes_3.6.1.rst
+    ../api/prev_api_changes/api_changes_3.6.0.rst
+    github_stats.rst
+    prev_whats_new/github_stats_3.6.0.rst
+
+Version 3.5
+===========
+.. toctree::
+    :maxdepth: 1
+
+    prev_whats_new/whats_new_3.5.2.rst
+    prev_whats_new/whats_new_3.5.0.rst
+    ../api/prev_api_changes/api_changes_3.5.3.rst
+    ../api/prev_api_changes/api_changes_3.5.2.rst
+    ../api/prev_api_changes/api_changes_3.5.0.rst
+    prev_whats_new/github_stats_3.5.3.rst
+    prev_whats_new/github_stats_3.5.2.rst
+    prev_whats_new/github_stats_3.5.1.rst
+    prev_whats_new/github_stats_3.5.0.rst
+
+Version 3.4
+===========
+.. toctree::
+    :maxdepth: 1
+
+    prev_whats_new/whats_new_3.4.0.rst
+    ../api/prev_api_changes/api_changes_3.4.2.rst
+    ../api/prev_api_changes/api_changes_3.4.0.rst
+    prev_whats_new/github_stats_3.4.1.rst
+    prev_whats_new/github_stats_3.4.0.rst
+
+Past versions
+=============
+
+Version 3.3
+~~~~~~~~~~~
+.. toctree::
+    :maxdepth: 1
+
+    prev_whats_new/whats_new_3.3.0.rst
+    ../api/prev_api_changes/api_changes_3.3.1.rst
+    ../api/prev_api_changes/api_changes_3.3.0.rst
+    prev_whats_new/github_stats_3.3.4.rst
+    prev_whats_new/github_stats_3.3.3.rst
+    prev_whats_new/github_stats_3.3.2.rst
+    prev_whats_new/github_stats_3.3.1.rst
+    prev_whats_new/github_stats_3.3.0.rst
+
+Version 3.2
+~~~~~~~~~~~
+.. toctree::
+    :maxdepth: 1
+
+    prev_whats_new/whats_new_3.2.0.rst
+    ../api/prev_api_changes/api_changes_3.2.0.rst
+    prev_whats_new/github_stats_3.2.2.rst
+    prev_whats_new/github_stats_3.2.1.rst
+    prev_whats_new/github_stats_3.2.0.rst
+
+Version 3.1
+~~~~~~~~~~~
+.. toctree::
+    :maxdepth: 1
+
+    prev_whats_new/whats_new_3.1.0.rst
+    ../api/prev_api_changes/api_changes_3.1.1.rst
+    ../api/prev_api_changes/api_changes_3.1.0.rst
+    prev_whats_new/github_stats_3.1.3.rst
+    prev_whats_new/github_stats_3.1.2.rst
+    prev_whats_new/github_stats_3.1.1.rst
+    prev_whats_new/github_stats_3.1.0.rst
+
+Version 3.0
+~~~~~~~~~~~
+.. toctree::
+    :maxdepth: 1
+
+    prev_whats_new/whats_new_3.0.rst
+    ../api/prev_api_changes/api_changes_3.0.1.rst
+    ../api/prev_api_changes/api_changes_3.0.0.rst
+    prev_whats_new/github_stats_3.0.3.rst
+    prev_whats_new/github_stats_3.0.2.rst
+    prev_whats_new/github_stats_3.0.1.rst
+    prev_whats_new/github_stats_3.0.0.rst
+
+Version 2.2
+~~~~~~~~~~~
+.. toctree::
+    :maxdepth: 1
+
+    prev_whats_new/whats_new_2.2.rst
+    ../api/prev_api_changes/api_changes_2.2.0.rst
+
+Version 2.1
+~~~~~~~~~~~
+.. toctree::
+    :maxdepth: 1
+
+    prev_whats_new/whats_new_2.1.0.rst
+    ../api/prev_api_changes/api_changes_2.1.2.rst
+    ../api/prev_api_changes/api_changes_2.1.1.rst
+    ../api/prev_api_changes/api_changes_2.1.0.rst
+
+Version 2.0
+~~~~~~~~~~~
+.. toctree::
+    :maxdepth: 1
+
+    prev_whats_new/whats_new_2.0.0.rst
+    ../api/prev_api_changes/api_changes_2.0.1.rst
+    ../api/prev_api_changes/api_changes_2.0.0.rst
+
+Version 1.5
+~~~~~~~~~~~
+.. toctree::
+    :maxdepth: 1
+
+    prev_whats_new/whats_new_1.5.rst
+    ../api/prev_api_changes/api_changes_1.5.3.rst
+    ../api/prev_api_changes/api_changes_1.5.2.rst
+    ../api/prev_api_changes/api_changes_1.5.0.rst
+
+Version 1.4
+~~~~~~~~~~~
+.. toctree::
+    :maxdepth: 1
+
+    prev_whats_new/whats_new_1.4.rst
+    ../api/prev_api_changes/api_changes_1.4.x.rst
+
+Version 1.3
+~~~~~~~~~~~
+.. toctree::
+    :maxdepth: 1
+
+    prev_whats_new/whats_new_1.3.rst
+    ../api/prev_api_changes/api_changes_1.3.x.rst
+
+Version 1.2
+~~~~~~~~~~~
+.. toctree::
+    :maxdepth: 1
+
+    prev_whats_new/whats_new_1.2.2.rst
+    prev_whats_new/whats_new_1.2.rst
+    ../api/prev_api_changes/api_changes_1.2.x.rst
+
+Version 1.1
+~~~~~~~~~~~
+.. toctree::
+    :maxdepth: 1
+
+    prev_whats_new/whats_new_1.1.rst
+    ../api/prev_api_changes/api_changes_1.1.x.rst
+
+Version 1.0
+~~~~~~~~~~~
+.. toctree::
+    :maxdepth: 1
+
+    prev_whats_new/whats_new_1.0.rst
+
+Version 0.x
+~~~~~~~~~~~
+.. toctree::
+    :maxdepth: 1
+
+    prev_whats_new/changelog.rst
+    prev_whats_new/whats_new_0.99.rst
+    ../api/prev_api_changes/api_changes_0.99.x.rst
+    ../api/prev_api_changes/api_changes_0.99.rst
+    prev_whats_new/whats_new_0.98.4.rst
+    ../api/prev_api_changes/api_changes_0.98.x.rst
+    ../api/prev_api_changes/api_changes_0.98.1.rst
+    ../api/prev_api_changes/api_changes_0.98.0.rst
+    ../api/prev_api_changes/api_changes_0.91.2.rst
+    ../api/prev_api_changes/api_changes_0.91.0.rst
+    ../api/prev_api_changes/api_changes_0.90.1.rst
+    ../api/prev_api_changes/api_changes_0.90.0.rst
+
+    ../api/prev_api_changes/api_changes_0.87.7.rst
+    ../api/prev_api_changes/api_changes_0.86.rst
+    ../api/prev_api_changes/api_changes_0.85.rst
+    ../api/prev_api_changes/api_changes_0.84.rst
+    ../api/prev_api_changes/api_changes_0.83.rst
+    ../api/prev_api_changes/api_changes_0.82.rst
+    ../api/prev_api_changes/api_changes_0.81.rst
+    ../api/prev_api_changes/api_changes_0.80.rst
+
+    ../api/prev_api_changes/api_changes_0.73.rst
+    ../api/prev_api_changes/api_changes_0.72.rst
+    ../api/prev_api_changes/api_changes_0.71.rst
+    ../api/prev_api_changes/api_changes_0.70.rst
+
+    ../api/prev_api_changes/api_changes_0.65.1.rst
+    ../api/prev_api_changes/api_changes_0.65.rst
+    ../api/prev_api_changes/api_changes_0.63.rst
+    ../api/prev_api_changes/api_changes_0.61.rst
+    ../api/prev_api_changes/api_changes_0.60.rst
+
+    ../api/prev_api_changes/api_changes_0.54.3.rst
+    ../api/prev_api_changes/api_changes_0.54.rst
+    ../api/prev_api_changes/api_changes_0.50.rst
+    ../api/prev_api_changes/api_changes_0.42.rst
+    ../api/prev_api_changes/api_changes_0.40.rst
diff --git a/doc/users/release_notes_next.rst b/doc/users/release_notes_next.rst
new file mode 100644
index 000000000000..6813f61c5f90
--- /dev/null
+++ b/doc/users/release_notes_next.rst
@@ -0,0 +1,10 @@
+:orphan:
+
+Next version
+============
+.. toctree::
+   :maxdepth: 1
+
+   next_whats_new
+   ../api/next_api_changes
+   github_stats
diff --git a/doc/users/resources/index.rst b/doc/users/resources/index.rst
new file mode 100644
index 000000000000..a2c4ccd4a7fc
--- /dev/null
+++ b/doc/users/resources/index.rst
@@ -0,0 +1,87 @@
+.. _resources-index:
+
+.. redirect-from:: /resources/index
+
+******************
+External resources
+******************
+
+
+============================
+Books, chapters and articles
+============================
+
+* `Scientific Visualization: Python + Matplotlib (2021)
+  <https://hal.inria.fr/hal-03427242/>`_
+  by Nicolas P. Rougier
+
+* `Mastering matplotlib
+  <https://www.packtpub.com/product/mastering-matplotlib/9781783987542>`_
+  by Duncan M. McGreggor
+
+* `Interactive Applications Using Matplotlib
+  <https://www.packtpub.com/product/interactive-applications-using-matplotlib/9781783988846>`_
+  by Benjamin Root
+
+* `Matplotlib for Python Developers
+  <https://www.packtpub.com/product/matplotlib-for-python-developers/9781847197900>`_
+  by Sandro Tosi
+
+* `Matplotlib chapter <http://www.aosabook.org/en/matplotlib.html>`_
+  by John Hunter and Michael Droettboom in The Architecture of Open Source
+  Applications
+
+* `Ten Simple Rules for Better Figures
+  <https://journals.plos.org/ploscompbiol/article?id=10.1371/journal.pcbi.1003833>`_
+  by Nicolas P. Rougier, Michael Droettboom and Philip E. Bourne
+
+* `Learning Scientific Programming with Python chapter 7
+  <https://scipython.com/book/chapter-7-matplotlib/>`_
+  by Christian Hill
+
+* `Hands-On Data Analysis with Pandas, chapters 5 and 6
+  <https://www.packtpub.com/product/hands-on-data-analysis-with-pandas-second-edition/9781800563452>`_
+  by Stefanie Molin
+
+======
+Videos
+======
+
+* `Plotting with matplotlib <https://www.youtube.com/watch?v=P7SVi0YTIuE>`_
+  by Mike Müller
+
+* `Introduction to NumPy and Matplotlib
+  <https://www.youtube.com/watch?v=3Fp1zn5ao2M&feature=plcp>`_ by Eric Jones
+
+* `Anatomy of Matplotlib
+  <https://conference.scipy.org/scipy2013/tutorial_detail.php?id=103>`_
+  by Benjamin Root
+
+* `Data Visualization Basics with Python (O'Reilly)
+  <https://www.oreilly.com/library/view/data-visualization-basics/9781771375573/>`_
+  by Randal S. Olson
+* `Matplotlib Introduction
+  <https://www.youtube.com/playlist?list=PLeo1K3hjS3uu4Lr8_kro2AqaO6CFYgKOl>`_
+  by codebasics
+* `Matplotlib
+  <https://www.youtube.com/watch?v=wB9C0Mz9gSo>`_
+  by Derek Banas
+
+=========
+Tutorials
+=========
+
+
+* `The Python Graph Gallery <https://www.python-graph-gallery.com>`_
+  by Yan Holtz
+
+* `Matplotlib tutorial <https://www.labri.fr/perso/nrougier/teaching/matplotlib/>`_
+  by Nicolas P. Rougier
+
+* `Anatomy of Matplotlib - IPython Notebooks
+  <https://github.com/WeatherGod/AnatomyOfMatplotlib>`_
+  by Benjamin Root
+
+* `Beyond the Basics: Data Visualization in Python
+  <https://github.com/stefmolin/python-data-viz-workshop>`_
+  by Stefanie Molin
diff --git a/doc/users/whats_new.rst b/doc/users/whats_new.rst
deleted file mode 100644
index 776f477ce4d4..000000000000
--- a/doc/users/whats_new.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-.. _whats-new:
-
-===========
-What's new?
-===========
-
-.. ifconfig:: releaselevel == 'dev'
-
-   .. note::
-
-      The list below is a table of contents of individual files from the
-      'next_whats_new' folder.
-
-      When a release is made
-
-       - All the files in 'next_whats_new/' should be moved to a single file in
-         'prev_whats_new/'.
-       - The include directive below should be changed to point to the new file
-         created in the previous step.
-
-
-   .. toctree::
-      :glob:
-      :maxdepth: 1
-
-      next_whats_new/*
-
-.. Be sure to update the version in `exclude_patterns` in conf.py.
-.. include:: prev_whats_new/whats_new_3.4.0.rst
diff --git a/doc/users/whats_new_old.rst b/doc/users/whats_new_old.rst
deleted file mode 100644
index d24992a1b242..000000000000
--- a/doc/users/whats_new_old.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-
-===================
-Previous What's New
-===================
-
-.. toctree::
-   :glob:
-   :maxdepth: 1
-   :reversed:
-
-   prev_whats_new/changelog
-   prev_whats_new/whats_new_*
diff --git a/environment.yml b/environment.yml
new file mode 100644
index 000000000000..28ff3a1b2c34
--- /dev/null
+++ b/environment.yml
@@ -0,0 +1,60 @@
+# To set up a development environment using conda run:
+#
+#   conda env create -f environment.yml
+#   conda activate mpl-dev
+#   pip install -e .
+#
+name: mpl-dev
+channels:
+  - conda-forge
+dependencies:
+  - cairocffi
+  - contourpy>=1.0.1
+  - cycler>=0.10.0
+  - fonttools>=4.22.0
+  - kiwisolver>=1.0.1
+  - numpy>=1.19
+  - pillow>=6.2
+  - pygobject
+  - pyparsing
+  - pyqt
+  - python-dateutil>=2.1
+  - setuptools
+  - setuptools_scm
+  - wxpython
+  # building documentation
+  - colorspacious
+  - graphviz
+  - ipython
+  - ipywidgets
+  - numpydoc>=0.8
+  - packaging
+  - pydata-sphinx-theme
+  - sphinx>=1.8.1,!=2.0.0
+  - sphinx-copybutton
+  - sphinx-gallery>=0.10
+  - sphinx-design
+  - pip
+  - pip:
+      - mpl-sphinx-theme
+      - sphinxcontrib-svg2pdfconverter
+      - pikepdf
+  # testing
+  - coverage
+  - flake8>=3.8
+  - flake8-docstrings>=1.4.0
+  - gtk3
+  - ipykernel
+  - nbconvert[execute]!=6.0.0,!=6.0.1
+  - nbformat!=5.0.0,!=5.0.1
+  - pandas!=0.25.0
+  - psutil
+  - pre-commit
+  - pydocstyle>=5.1.0
+  - pytest!=4.6.0,!=5.4.0
+  - pytest-cov
+  - pytest-rerunfailures
+  - pytest-timeout
+  - pytest-xdist
+  - tornado
+  - pytz
diff --git a/examples/README b/examples/README
deleted file mode 100644
index 746f2e334664..000000000000
--- a/examples/README
+++ /dev/null
@@ -1,42 +0,0 @@
-Matplotlib examples
-===================
-
-There are a variety of ways to use Matplotlib, and most of them are
-illustrated in the examples in this directory.
-
-Probably the most common way people use Matplotlib is with the
-procedural interface, which follows the MATLAB/IDL/Mathematica approach
-of using simple procedures like "plot" or "title" to modify the current
-figure.  These examples are included in the "pylab_examples" directory.
-If you want to write more robust scripts, e.g., for production use or in
-a web application server, you will probably want to use the Matplotlib
-API for full control.  These examples are found in the "api" directory.
-Below is a brief description of the different directories found here:
-
-  * animation - Dynamic plots, see the documentation at
-    http://matplotlib.org/api/animation_api.html
-
-  * axes_grid1 - Examples related to the axes_grid1 toolkit.
-
-  * axisartist - Examples related to the axisartist toolkit.
-
-  * event_handling - How to interact with your figure, mouse presses,
-    key presses, object picking, etc.
-
-  * misc - Miscellaneous examples.  Some demos for loading and working
-    with record arrays.
-
-  * mplot3d - 3D examples.
-
-  * pylab_examples - The interface to Matplotlib similar to MATLAB.
-
-  * tests - Tests used by Matplotlib developers to check functionality.
-    (These tests are still sometimes useful, but mostly developers should
-    use the pytest tests which perform automatic image comparison.)
-
-  * units - Working with unit data and custom types in Matplotlib.
-
-  * user_interfaces - Using Matplotlib in a GUI application, e.g.,
-    Tkinter, wxPython, PyGObject, PyQt widgets.
-
-  * widgets - Examples using interactive widgets.
diff --git a/examples/README.txt b/examples/README.txt
index f2331df7246a..87098fb881ce 100644
--- a/examples/README.txt
+++ b/examples/README.txt
@@ -2,13 +2,13 @@
 
 .. _gallery:
 
-=======
-Gallery
-=======
+========
+Examples
+========
 
-This gallery contains examples of the many things you can do with
-Matplotlib. Click on any image to see the full image and source code.
+This page contains example plots. Click on any image to see the full image
+and source code.
 
 For longer tutorials, see our `tutorials page <../tutorials/index.html>`_.
-You can also find `external resources <../resources/index.html>`_ and
-a `FAQ <../faq/index.html>`_ in our `user guide <../contents.html>`_.
+You can also find `external resources <../users/resources/index.html>`_ and
+a `FAQ <../users/faq/index.html>`_ in our `user guide <../users/index.html>`_.
diff --git a/examples/animation/animate_decay.py b/examples/animation/animate_decay.py
index 88f25e2d6aaa..0c056bc2f8a8 100644
--- a/examples/animation/animate_decay.py
+++ b/examples/animation/animate_decay.py
@@ -4,6 +4,7 @@
 =====
 
 This example showcases:
+
 - using a generator to drive an animation,
 - changing axes limits during an animation.
 """
@@ -23,7 +24,7 @@ def data_gen():
 
 def init():
     ax.set_ylim(-1.1, 1.1)
-    ax.set_xlim(0, 10)
+    ax.set_xlim(0, 1)
     del xdata[:]
     del ydata[:]
     line.set_data(xdata, ydata)
@@ -49,5 +50,5 @@ def run(data):
 
     return line,
 
-ani = animation.FuncAnimation(fig, run, data_gen, interval=10, init_func=init)
+ani = animation.FuncAnimation(fig, run, data_gen, interval=100, init_func=init)
 plt.show()
diff --git a/examples/animation/animation_demo.py b/examples/animation/animation_demo.py
index beab2801d731..ed88e2d9a418 100644
--- a/examples/animation/animation_demo.py
+++ b/examples/animation/animation_demo.py
@@ -20,9 +20,9 @@
 
 fig, ax = plt.subplots()
 
-for i in range(len(data)):
-    ax.cla()
-    ax.imshow(data[i])
-    ax.set_title("frame {}".format(i))
+for i, img in enumerate(data):
+    ax.clear()
+    ax.imshow(img)
+    ax.set_title(f"frame {i}")
     # Note that using time.sleep does *not* work here!
     plt.pause(0.1)
diff --git a/examples/animation/double_pendulum.py b/examples/animation/double_pendulum.py
index d497c1e24d83..fba7ea4ec9e2 100644
--- a/examples/animation/double_pendulum.py
+++ b/examples/animation/double_pendulum.py
@@ -12,7 +12,6 @@
 from numpy import sin, cos
 import numpy as np
 import matplotlib.pyplot as plt
-import scipy.integrate as integrate
 import matplotlib.animation as animation
 from collections import deque
 
@@ -22,13 +21,13 @@
 L = L1 + L2  # maximal length of the combined pendulum
 M1 = 1.0  # mass of pendulum 1 in kg
 M2 = 1.0  # mass of pendulum 2 in kg
-t_stop = 5  # how many seconds to simulate
+t_stop = 2.5  # how many seconds to simulate
 history_len = 500  # how many trajectory points to display
 
 
-def derivs(state, t):
-
+def derivs(t, state):
     dydx = np.zeros_like(state)
+
     dydx[0] = state[1]
 
     delta = state[2] - state[0]
@@ -51,7 +50,7 @@ def derivs(state, t):
     return dydx
 
 # create a time array from 0..t_stop sampled at 0.02 second steps
-dt = 0.02
+dt = 0.01
 t = np.arange(0, t_stop, dt)
 
 # th1 and th2 are the initial angles (degrees)
@@ -64,8 +63,15 @@ def derivs(state, t):
 # initial state
 state = np.radians([th1, w1, th2, w2])
 
-# integrate your ODE using scipy.integrate.
-y = integrate.odeint(derivs, state, t)
+# integrate the ODE using Euler's method
+y = np.empty((len(t), 4))
+y[0] = state
+for i in range(1, len(t)):
+    y[i] = y[i - 1] + derivs(t[i - 1], y[i - 1]) * dt
+
+# A more accurate estimate could be obtained e.g. using scipy:
+#
+#   y = scipy.integrate.solve_ivp(derivs, t[[0, -1]], state, t_eval=t).y.T
 
 x1 = L1*sin(y[:, 0])
 y1 = -L1*cos(y[:, 0])
@@ -79,7 +85,7 @@ def derivs(state, t):
 ax.grid()
 
 line, = ax.plot([], [], 'o-', lw=2)
-trace, = ax.plot([], [], ',-', lw=1)
+trace, = ax.plot([], [], '.-', lw=1, ms=2)
 time_template = 'time = %.1fs'
 time_text = ax.text(0.05, 0.9, '', transform=ax.transAxes)
 history_x, history_y = deque(maxlen=history_len), deque(maxlen=history_len)
diff --git a/examples/animation/dynamic_image.py b/examples/animation/dynamic_image.py
index 5543da039639..cbec62607b2c 100644
--- a/examples/animation/dynamic_image.py
+++ b/examples/animation/dynamic_image.py
@@ -23,8 +23,8 @@ def f(x, y):
 # each frame
 ims = []
 for i in range(60):
-    x += np.pi / 15.
-    y += np.pi / 20.
+    x += np.pi / 15
+    y += np.pi / 30
     im = ax.imshow(f(x, y), animated=True)
     if i == 0:
         ax.imshow(f(x, y))  # show an initial one first
diff --git a/examples/animation/multiple_axes.py b/examples/animation/multiple_axes.py
new file mode 100644
index 000000000000..1fdc545d480d
--- /dev/null
+++ b/examples/animation/multiple_axes.py
@@ -0,0 +1,79 @@
+"""
+=======================
+Multiple axes animation
+=======================
+
+This example showcases:
+
+- how animation across multiple subplots works,
+- using a figure artist in the animation.
+"""
+
+import numpy as np
+import matplotlib.pyplot as plt
+import matplotlib.animation as animation
+from matplotlib.patches import ConnectionPatch
+
+fig, (axl, axr) = plt.subplots(
+    ncols=2,
+    sharey=True,
+    figsize=(6, 2),
+    gridspec_kw=dict(width_ratios=[1, 3], wspace=0),
+)
+axl.set_aspect(1)
+axr.set_box_aspect(1 / 3)
+axr.yaxis.set_visible(False)
+axr.xaxis.set_ticks([0, np.pi, 2 * np.pi], ["0", r"$\pi$", r"$2\pi$"])
+
+# draw circle with initial point in left Axes
+x = np.linspace(0, 2 * np.pi, 50)
+axl.plot(np.cos(x), np.sin(x), "k", lw=0.3)
+point, = axl.plot(0, 0, "o")
+
+# draw full curve to set view limits in right Axes
+sine, = axr.plot(x, np.sin(x))
+
+# draw connecting line between both graphs
+con = ConnectionPatch(
+    (1, 0),
+    (0, 0),
+    "data",
+    "data",
+    axesA=axl,
+    axesB=axr,
+    color="C0",
+    ls="dotted",
+)
+fig.add_artist(con)
+
+
+def animate(i):
+    pos = np.cos(i), np.sin(i)
+    point.set_data(*pos)
+    x = np.linspace(0, i, int(i * 25 / np.pi))
+    sine.set_data(x, np.sin(x))
+    con.xy1 = pos
+    con.xy2 = i, pos[1]
+    return point, sine, con
+
+
+ani = animation.FuncAnimation(
+    fig,
+    animate,
+    interval=50,
+    blit=False,  # blitting can't be used with Figure artists
+    frames=x,
+    repeat_delay=100,
+)
+
+plt.show()
+
+#############################################################################
+#
+# .. admonition:: References
+#
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
+#
+#    - `matplotlib.patches.ConnectionPatch`
+#    - `matplotlib.animation.FuncAnimation`
diff --git a/examples/animation/pause_resume.py b/examples/animation/pause_resume.py
index ed20197f6167..7bed65140263 100644
--- a/examples/animation/pause_resume.py
+++ b/examples/animation/pause_resume.py
@@ -4,8 +4,17 @@
 =================================
 
 This example showcases:
+
 - using the Animation.pause() method to pause an animation.
 - using the Animation.resume() method to resume an animation.
+
+.. note::
+    This example exercises the interactive capabilities of Matplotlib, and this
+    will not appear in the static documentation. Please run this code on your
+    machine to see the interactivity.
+
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
 
 import matplotlib.pyplot as plt
diff --git a/examples/animation/random_walk.py b/examples/animation/random_walk.py
index 2488f98b144c..f49c099a5c2d 100644
--- a/examples/animation/random_walk.py
+++ b/examples/animation/random_walk.py
@@ -13,62 +13,40 @@
 np.random.seed(19680801)
 
 
-def gen_rand_line(length, dims=2):
-    """
-    Create a line using a random walk algorithm.
+def random_walk(num_steps, max_step=0.05):
+    """Return a 3D random walk as (num_steps, 3) array."""
+    start_pos = np.random.random(3)
+    steps = np.random.uniform(-max_step, max_step, size=(num_steps, 3))
+    walk = start_pos + np.cumsum(steps, axis=0)
+    return walk
 
-    Parameters
-    ----------
-    length : int
-        The number of points of the line.
-    dims : int
-        The number of dimensions of the line.
-    """
-    line_data = np.empty((dims, length))
-    line_data[:, 0] = np.random.rand(dims)
-    for index in range(1, length):
-        # scaling the random numbers by 0.1 so
-        # movement is small compared to position.
-        # subtraction by 0.5 is to change the range to [-0.5, 0.5]
-        # to allow a line to move backwards.
-        step = (np.random.rand(dims) - 0.5) * 0.1
-        line_data[:, index] = line_data[:, index - 1] + step
-    return line_data
 
-
-def update_lines(num, data_lines, lines):
-    for line, data in zip(lines, data_lines):
+def update_lines(num, walks, lines):
+    for line, walk in zip(lines, walks):
         # NOTE: there is no .set_data() for 3 dim data...
-        line.set_data(data[0:2, :num])
-        line.set_3d_properties(data[2, :num])
+        line.set_data(walk[:num, :2].T)
+        line.set_3d_properties(walk[:num, 2])
     return lines
 
 
+# Data: 40 random walks as (num_steps, 3) arrays
+num_steps = 30
+walks = [random_walk(num_steps) for index in range(40)]
+
 # Attaching 3D axis to the figure
 fig = plt.figure()
 ax = fig.add_subplot(projection="3d")
 
-# Fifty lines of random 3-D lines
-data = [gen_rand_line(25, 3) for index in range(50)]
-
-# Creating fifty line objects.
-# NOTE: Can't pass empty arrays into 3d version of plot()
-lines = [ax.plot(dat[0, 0:1], dat[1, 0:1], dat[2, 0:1])[0] for dat in data]
+# Create lines initially without data
+lines = [ax.plot([], [], [])[0] for _ in walks]
 
 # Setting the axes properties
-ax.set_xlim3d([0.0, 1.0])
-ax.set_xlabel('X')
-
-ax.set_ylim3d([0.0, 1.0])
-ax.set_ylabel('Y')
-
-ax.set_zlim3d([0.0, 1.0])
-ax.set_zlabel('Z')
-
-ax.set_title('3D Test')
+ax.set(xlim3d=(0, 1), xlabel='X')
+ax.set(ylim3d=(0, 1), ylabel='Y')
+ax.set(zlim3d=(0, 1), zlabel='Z')
 
 # Creating the Animation object
-line_ani = animation.FuncAnimation(
-    fig, update_lines, 50, fargs=(data, lines), interval=50)
+ani = animation.FuncAnimation(
+    fig, update_lines, num_steps, fargs=(walks, lines), interval=100)
 
 plt.show()
diff --git a/examples/animation/simple_scatter.py b/examples/animation/simple_scatter.py
new file mode 100644
index 000000000000..1d18039dcf11
--- /dev/null
+++ b/examples/animation/simple_scatter.py
@@ -0,0 +1,31 @@
+"""
+=============================
+Animated scatter saved as GIF
+=============================
+
+"""
+import numpy as np
+import matplotlib.pyplot as plt
+import matplotlib.animation as animation
+
+fig, ax = plt.subplots()
+ax.set_xlim([0, 10])
+
+scat = ax.scatter(1, 0)
+x = np.linspace(0, 10)
+
+
+def animate(i):
+    scat.set_offsets((x[i], 0))
+    return scat,
+
+ani = animation.FuncAnimation(fig, animate, repeat=True,
+                                    frames=len(x) - 1, interval=50)
+
+# To save the animation using Pillow as a gif
+# writer = animation.PillowWriter(fps=15,
+#                                 metadata=dict(artist='Me'),
+#                                 bitrate=1800)
+# ani.save('scatter.gif', writer=writer)
+
+plt.show()
diff --git a/examples/axes_grid1/README.txt b/examples/axes_grid1/README.txt
index 5c3c5d14ec96..e9afa00b9a72 100644
--- a/examples/axes_grid1/README.txt
+++ b/examples/axes_grid1/README.txt
@@ -2,5 +2,5 @@
 
 .. _axes_grid1-examples-index:
 
-Axes Grid
-=========
+axes_grid1
+==========
diff --git a/examples/axes_grid1/demo_anchored_direction_arrows.py b/examples/axes_grid1/demo_anchored_direction_arrows.py
index cdf16dc05754..24d3ddfcc4ad 100644
--- a/examples/axes_grid1/demo_anchored_direction_arrows.py
+++ b/examples/axes_grid1/demo_anchored_direction_arrows.py
@@ -42,7 +42,7 @@
 # Rotated arrow
 fontprops = fm.FontProperties(family='serif')
 
-roatated_arrow = AnchoredDirectionArrows(
+rotated_arrow = AnchoredDirectionArrows(
                     ax.transAxes,
                     '30', '120',
                     loc='center',
@@ -50,7 +50,7 @@
                     angle=30,
                     fontproperties=fontprops
                     )
-ax.add_artist(roatated_arrow)
+ax.add_artist(rotated_arrow)
 
 # Altering arrow directions
 a1 = AnchoredDirectionArrows(
diff --git a/examples/axes_grid1/demo_axes_divider.py b/examples/axes_grid1/demo_axes_divider.py
index dddc2ed4760c..c800c263a453 100644
--- a/examples/axes_grid1/demo_axes_divider.py
+++ b/examples/axes_grid1/demo_axes_divider.py
@@ -22,7 +22,7 @@ def demo_simple_image(ax):
 
     im = ax.imshow(Z, extent=extent)
     cb = plt.colorbar(im)
-    plt.setp(cb.ax.get_yticklabels(), visible=False)
+    cb.ax.yaxis.set_tick_params(labelright=False)
 
 
 def demo_locatable_axes_hard(fig):
@@ -60,7 +60,7 @@ def demo_locatable_axes_hard(fig):
 
     im = ax.imshow(Z, extent=extent)
     plt.colorbar(im, cax=ax_cb)
-    plt.setp(ax_cb.get_yticklabels(), visible=False)
+    ax_cb.yaxis.set_tick_params(labelright=False)
 
 
 def demo_locatable_axes_easy(ax):
@@ -68,7 +68,7 @@ def demo_locatable_axes_easy(ax):
 
     divider = make_axes_locatable(ax)
 
-    ax_cb = divider.new_horizontal(size="5%", pad=0.05)
+    ax_cb = divider.append_axes("right", size="5%", pad=0.05)
     fig = ax.get_figure()
     fig.add_axes(ax_cb)
 
@@ -86,7 +86,7 @@ def demo_images_side_by_side(ax):
     divider = make_axes_locatable(ax)
 
     Z, extent = get_demo_image()
-    ax2 = divider.new_horizontal(size="100%", pad=0.05)
+    ax2 = divider.append_axes("right", size="100%", pad=0.05)
     fig1 = ax.get_figure()
     fig1.add_axes(ax2)
 
diff --git a/examples/axes_grid1/demo_axes_grid2.py b/examples/axes_grid1/demo_axes_grid2.py
index b18648186c5d..488460921471 100644
--- a/examples/axes_grid1/demo_axes_grid2.py
+++ b/examples/axes_grid1/demo_axes_grid2.py
@@ -58,10 +58,6 @@ def add_inner_title(ax, title, loc, **kwargs):
 
 for ax, z in zip(grid, ZS):
     ax.cax.toggle_label(True)
-    #axis = ax.cax.axis[ax.cax.orientation]
-    #axis.label.set_text("counts s$^{-1}$")
-    #axis.label.set_size(10)
-    #axis.major_ticklabels.set_size(6)
 
 grid[0].set_xticks([-2, 0])
 grid[0].set_yticks([-2, 0, 2])
diff --git a/examples/axes_grid1/demo_axes_rgb.py b/examples/axes_grid1/demo_axes_rgb.py
index 9b1ccb431d77..fa6ffdb5df3e 100644
--- a/examples/axes_grid1/demo_axes_rgb.py
+++ b/examples/axes_grid1/demo_axes_rgb.py
@@ -59,11 +59,8 @@ def demo_rgb2():
     ax_b.imshow(im_b)
 
     for ax in fig.axes:
-        ax.tick_params(axis='both', direction='in')
+        ax.tick_params(direction='in', color='w')
         ax.spines[:].set_color("w")
-        for tick in ax.xaxis.get_major_ticks() + ax.yaxis.get_major_ticks():
-            tick.tick1line.set_markeredgecolor("w")
-            tick.tick2line.set_markeredgecolor("w")
 
 
 demo_rgb1()
diff --git a/examples/axes_grid1/demo_colorbar_of_inset_axes.py b/examples/axes_grid1/demo_colorbar_of_inset_axes.py
index e0f31221949e..bb0023adac3f 100644
--- a/examples/axes_grid1/demo_colorbar_of_inset_axes.py
+++ b/examples/axes_grid1/demo_colorbar_of_inset_axes.py
@@ -1,8 +1,7 @@
 """
-===========================
-Demo Colorbar of Inset Axes
-===========================
-
+===============================
+Adding a colorbar to inset axes
+===============================
 """
 
 from matplotlib import cbook
@@ -11,18 +10,15 @@
 
 
 fig, ax = plt.subplots(figsize=[5, 4])
+ax.set(aspect=1, xlim=(-15, 15), ylim=(-20, 5))
 
 Z = cbook.get_sample_data("axes_grid/bivariate_normal.npy", np_load=True)
 extent = (-3, 4, -4, 3)
 
-ax.set(aspect=1, xlim=(-15, 15), ylim=(-20, 5))
-
 axins = zoomed_inset_axes(ax, zoom=2, loc='upper left')
+axins.set(xticks=[], yticks=[])
 im = axins.imshow(Z, extent=extent, origin="lower")
 
-plt.xticks(visible=False)
-plt.yticks(visible=False)
-
 # colorbar
 cax = inset_axes(axins,
                  width="5%",  # width = 10% of parent_bbox width
diff --git a/examples/axes_grid1/demo_colorbar_with_axes_divider.py b/examples/axes_grid1/demo_colorbar_with_axes_divider.py
index 9ab4640ee8b0..920db5703b98 100644
--- a/examples/axes_grid1/demo_colorbar_with_axes_divider.py
+++ b/examples/axes_grid1/demo_colorbar_with_axes_divider.py
@@ -18,13 +18,13 @@
 
 im1 = ax1.imshow([[1, 2], [3, 4]])
 ax1_divider = make_axes_locatable(ax1)
-# Add an axes to the right of the main axes.
+# Add an Axes to the right of the main Axes.
 cax1 = ax1_divider.append_axes("right", size="7%", pad="2%")
 cb1 = fig.colorbar(im1, cax=cax1)
 
 im2 = ax2.imshow([[1, 2], [3, 4]])
 ax2_divider = make_axes_locatable(ax2)
-# Add an axes above the main axes.
+# Add an Axes above the main Axes.
 cax2 = ax2_divider.append_axes("top", size="7%", pad="2%")
 cb2 = fig.colorbar(im2, cax=cax2, orientation="horizontal")
 # Change tick position to top (with the default tick position "bottom", ticks
diff --git a/examples/axes_grid1/demo_colorbar_with_inset_locator.py b/examples/axes_grid1/demo_colorbar_with_inset_locator.py
index 94d435d6b288..87939800021d 100644
--- a/examples/axes_grid1/demo_colorbar_with_inset_locator.py
+++ b/examples/axes_grid1/demo_colorbar_with_inset_locator.py
@@ -6,40 +6,37 @@
 This example shows how to control the position, height, and width of
 colorbars using `~mpl_toolkits.axes_grid1.inset_locator.inset_axes`.
 
-Controlling the placement of the inset axes is done similarly as that of the
-legend: either by providing a location option ("upper right", "best", ...), or
-by providing a locator with respect to the parent bbox.
-
+Inset axes placement is controlled as for legends: either by providing a *loc*
+option ("upper right", "best", ...), or by providing a locator with respect to
+the parent bbox.  Parameters such as *bbox_to_anchor* and *borderpad* likewise
+work in the same way, and are also demonstrated here.
 """
-import matplotlib.pyplot as plt
 
+import matplotlib.pyplot as plt
 from mpl_toolkits.axes_grid1.inset_locator import inset_axes
 
 fig, (ax1, ax2) = plt.subplots(1, 2, figsize=[6, 3])
 
-axins1 = inset_axes(ax1,
-                    width="50%",  # width = 50% of parent_bbox width
-                    height="5%",  # height : 5%
-                    loc='upper right')
-
 im1 = ax1.imshow([[1, 2], [2, 3]])
-fig.colorbar(im1, cax=axins1, orientation="horizontal", ticks=[1, 2, 3])
+axins1 = inset_axes(
+    ax1,
+    width="50%",  # width: 50% of parent_bbox width
+    height="5%",  # height: 5%
+    loc="upper right",
+)
 axins1.xaxis.set_ticks_position("bottom")
-
-axins = inset_axes(ax2,
-                   width="5%",  # width = 5% of parent_bbox width
-                   height="50%",  # height : 50%
-                   loc='lower left',
-                   bbox_to_anchor=(1.05, 0., 1, 1),
-                   bbox_transform=ax2.transAxes,
-                   borderpad=0,
-                   )
-
-# Controlling the placement of the inset axes is basically same as that
-# of the legend.  you may want to play with the borderpad value and
-# the bbox_to_anchor coordinate.
+fig.colorbar(im1, cax=axins1, orientation="horizontal", ticks=[1, 2, 3])
 
 im = ax2.imshow([[1, 2], [2, 3]])
+axins = inset_axes(
+    ax2,
+    width="5%",  # width: 5% of parent_bbox width
+    height="50%",  # height: 50%
+    loc="lower left",
+    bbox_to_anchor=(1.05, 0., 1, 1),
+    bbox_transform=ax2.transAxes,
+    borderpad=0,
+)
 fig.colorbar(im, cax=axins, ticks=[1, 2, 3])
 
 plt.show()
diff --git a/examples/axes_grid1/demo_edge_colorbar.py b/examples/axes_grid1/demo_edge_colorbar.py
index 74dc74c56965..17dfd952992c 100644
--- a/examples/axes_grid1/demo_edge_colorbar.py
+++ b/examples/axes_grid1/demo_edge_colorbar.py
@@ -1,7 +1,7 @@
 """
-==================
-Demo Edge Colorbar
-==================
+===============================
+Per-row or per-column colorbars
+===============================
 
 This example shows how to use one common colorbar for each row or column
 of an image grid.
@@ -35,7 +35,7 @@ def demo_bottom_cbar(fig):
                     )
 
     Z, extent = get_demo_image()
-    cmaps = [plt.get_cmap("autumn"), plt.get_cmap("summer")]
+    cmaps = ["autumn", "summer"]
     for i in range(4):
         im = grid[i].imshow(Z, extent=extent, cmap=cmaps[i//2])
         if i % 2:
@@ -65,7 +65,7 @@ def demo_right_cbar(fig):
                     cbar_pad="2%",
                     )
     Z, extent = get_demo_image()
-    cmaps = [plt.get_cmap("spring"), plt.get_cmap("winter")]
+    cmaps = ["spring", "winter"]
     for i in range(4):
         im = grid[i].imshow(Z, extent=extent, cmap=cmaps[i//2])
         if i % 2:
diff --git a/examples/axes_grid1/demo_fixed_size_axes.py b/examples/axes_grid1/demo_fixed_size_axes.py
index 41d138b1f453..85ab092982e4 100644
--- a/examples/axes_grid1/demo_fixed_size_axes.py
+++ b/examples/axes_grid1/demo_fixed_size_axes.py
@@ -1,7 +1,7 @@
 """
-====================
-Demo Fixed Size Axes
-====================
+===============================
+Axes with a fixed physical size
+===============================
 """
 
 import matplotlib.pyplot as plt
diff --git a/examples/axes_grid1/demo_imagegrid_aspect.py b/examples/axes_grid1/demo_imagegrid_aspect.py
index 3369777460a5..5c29b802f1a0 100644
--- a/examples/axes_grid1/demo_imagegrid_aspect.py
+++ b/examples/axes_grid1/demo_imagegrid_aspect.py
@@ -1,25 +1,21 @@
 """
-=====================
-Demo Imagegrid Aspect
-=====================
-
+=========================================
+Setting a fixed aspect on ImageGrid cells
+=========================================
 """
-import matplotlib.pyplot as plt
 
+import matplotlib.pyplot as plt
 from mpl_toolkits.axes_grid1 import ImageGrid
+
 fig = plt.figure()
 
 grid1 = ImageGrid(fig, 121, (2, 2), axes_pad=0.1,
                   aspect=True, share_all=True)
-
 for i in [0, 1]:
     grid1[i].set_aspect(2)
 
-
 grid2 = ImageGrid(fig, 122, (2, 2), axes_pad=0.1,
                   aspect=True, share_all=True)
-
-
 for i in [1, 3]:
     grid2[i].set_aspect(2)
 
diff --git a/examples/axes_grid1/inset_locator_demo.py b/examples/axes_grid1/inset_locator_demo.py
index 56b5a8357e10..974783c04309 100644
--- a/examples/axes_grid1/inset_locator_demo.py
+++ b/examples/axes_grid1/inset_locator_demo.py
@@ -69,7 +69,7 @@
                    bbox_transform=ax.transAxes, loc=3)
 
 # For visualization purposes we mark the bounding box by a rectangle
-ax.add_patch(plt.Rectangle((.2, .4), .6, .5, ls="--", ec="c", fc="None",
+ax.add_patch(plt.Rectangle((.2, .4), .6, .5, ls="--", ec="c", fc="none",
                            transform=ax.transAxes))
 
 # We set the axis limits to something other than the default, in order to not
@@ -89,9 +89,9 @@
                     bbox_transform=ax3.transAxes)
 
 # For visualization purposes we mark the bounding box by a rectangle
-ax2.add_patch(plt.Rectangle((0, 0), 1, 1, ls="--", lw=2, ec="c", fc="None"))
+ax2.add_patch(plt.Rectangle((0, 0), 1, 1, ls="--", lw=2, ec="c", fc="none"))
 ax3.add_patch(plt.Rectangle((.7, .5), .3, .5, ls="--", lw=2,
-                            ec="c", fc="None"))
+                            ec="c", fc="none"))
 
 # Turn ticklabels off
 for axi in [axins2, axins3, ax2, ax3]:
@@ -135,7 +135,7 @@
 
 # Create an inset horizontally centered in figure coordinates and vertically
 # bound to line up with the axes.
-from matplotlib.transforms import blended_transform_factory
+from matplotlib.transforms import blended_transform_factory  # noqa
 transform = blended_transform_factory(fig.transFigure, ax2.transAxes)
 axins4 = inset_axes(ax2, width="16%", height="34%",
                     bbox_to_anchor=(0, 0, 1, 1),
diff --git a/examples/axes_grid1/inset_locator_demo2.py b/examples/axes_grid1/inset_locator_demo2.py
index 509f65510438..795cb9471bdb 100644
--- a/examples/axes_grid1/inset_locator_demo2.py
+++ b/examples/axes_grid1/inset_locator_demo2.py
@@ -3,10 +3,10 @@
 Inset Locator Demo2
 ===================
 
-This Demo shows how to create a zoomed inset via `~.zoomed_inset_axes`.
-In the first subplot an `~.AnchoredSizeBar` shows the zoom effect.
+This Demo shows how to create a zoomed inset via `.zoomed_inset_axes`.
+In the first subplot an `.AnchoredSizeBar` shows the zoom effect.
 In the second subplot a connection to the region of interest is
-created via `~.mark_inset`.
+created via `.mark_inset`.
 """
 
 from matplotlib import cbook
@@ -32,9 +32,7 @@ def get_demo_image():
 # fix the number of ticks on the inset axes
 axins.yaxis.get_major_locator().set_params(nbins=7)
 axins.xaxis.get_major_locator().set_params(nbins=7)
-
-plt.setp(axins.get_xticklabels(), visible=False)
-plt.setp(axins.get_yticklabels(), visible=False)
+axins.tick_params(labelleft=False, labelbottom=False)
 
 
 def add_sizebar(ax, size):
@@ -69,9 +67,7 @@ def add_sizebar(ax, size):
 # fix the number of ticks on the inset axes
 axins2.yaxis.get_major_locator().set_params(nbins=7)
 axins2.xaxis.get_major_locator().set_params(nbins=7)
-
-plt.setp(axins2.get_xticklabels(), visible=False)
-plt.setp(axins2.get_yticklabels(), visible=False)
+axins2.tick_params(labelleft=False, labelbottom=False)
 
 # draw a bbox of the region of the inset axes in the parent axes and
 # connecting lines between the bbox and the inset axes area
diff --git a/examples/axes_grid1/make_room_for_ylabel_using_axesgrid.py b/examples/axes_grid1/make_room_for_ylabel_using_axesgrid.py
index af5946535cfb..802af8739b97 100644
--- a/examples/axes_grid1/make_room_for_ylabel_using_axesgrid.py
+++ b/examples/axes_grid1/make_room_for_ylabel_using_axesgrid.py
@@ -1,8 +1,7 @@
 """
-===================================
-Make Room For Ylabel Using Axesgrid
-===================================
-
+====================================
+Make room for ylabel using axes_grid
+====================================
 """
 
 import matplotlib.pyplot as plt
@@ -11,23 +10,20 @@
 from mpl_toolkits.axes_grid1.axes_divider import make_axes_area_auto_adjustable
 
 
-plt.figure()
-ax = plt.axes([0, 0, 1, 1])
+fig = plt.figure()
+ax = fig.add_axes([0, 0, 1, 1])
 
-ax.set_yticks([0.5])
-ax.set_yticklabels(["very long label"])
+ax.set_yticks([0.5], labels=["very long label"])
 
 make_axes_area_auto_adjustable(ax)
 
 ###############################################################################
 
+fig = plt.figure()
+ax1 = fig.add_axes([0, 0, 1, 0.5])
+ax2 = fig.add_axes([0, 0.5, 1, 0.5])
 
-plt.figure()
-ax1 = plt.axes([0, 0, 1, 0.5])
-ax2 = plt.axes([0, 0.5, 1, 0.5])
-
-ax1.set_yticks([0.5])
-ax1.set_yticklabels(["very long label"])
+ax1.set_yticks([0.5], labels=["very long label"])
 ax1.set_ylabel("Y label")
 
 ax2.set_title("Title")
@@ -37,12 +33,11 @@
 
 ###############################################################################
 
-
 fig = plt.figure()
-ax1 = plt.axes([0, 0, 1, 1])
+ax1 = fig.add_axes([0, 0, 1, 1])
 divider = make_axes_locatable(ax1)
 
-ax2 = divider.new_horizontal("100%", pad=0.3, sharey=ax1)
+ax2 = divider.append_axes("right", "100%", pad=0.3, sharey=ax1)
 ax2.tick_params(labelleft=False)
 fig.add_axes(ax2)
 
@@ -53,8 +48,7 @@
 divider.add_auto_adjustable_area(use_axes=[ax1, ax2], pad=0.1,
                                  adjust_dirs=["top", "bottom"])
 
-ax1.set_yticks([0.5])
-ax1.set_yticklabels(["very long label"])
+ax1.set_yticks([0.5], labels=["very long label"])
 
 ax2.set_title("Title")
 ax2.set_xlabel("X - Label")
diff --git a/examples/axes_grid1/parasite_simple.py b/examples/axes_grid1/parasite_simple.py
index c76f70ee9d74..36f36f9c997e 100644
--- a/examples/axes_grid1/parasite_simple.py
+++ b/examples/axes_grid1/parasite_simple.py
@@ -2,13 +2,12 @@
 ===============
 Parasite Simple
 ===============
-
 """
-from mpl_toolkits.axes_grid1 import host_subplot
+
 import matplotlib.pyplot as plt
+from mpl_toolkits.axes_grid1 import host_subplot
 
 host = host_subplot(111)
-
 par = host.twinx()
 
 host.set_xlabel("Distance")
@@ -18,12 +17,9 @@
 p1, = host.plot([0, 1, 2], [0, 1, 2], label="Density")
 p2, = par.plot([0, 1, 2], [0, 3, 2], label="Temperature")
 
-leg = plt.legend()
+host.legend(labelcolor="linecolor")
 
 host.yaxis.get_label().set_color(p1.get_color())
-leg.texts[0].set_color(p1.get_color())
-
 par.yaxis.get_label().set_color(p2.get_color())
-leg.texts[1].set_color(p2.get_color())
 
 plt.show()
diff --git a/examples/axes_grid1/scatter_hist_locatable_axes.py b/examples/axes_grid1/scatter_hist_locatable_axes.py
index 60dec95d71b9..c605e9e81258 100644
--- a/examples/axes_grid1/scatter_hist_locatable_axes.py
+++ b/examples/axes_grid1/scatter_hist_locatable_axes.py
@@ -3,16 +3,16 @@
 Scatter Histogram (Locatable Axes)
 ==================================
 
-Show the marginal distributions of a scatter as histograms at the sides of
+Show the marginal distributions of a scatter plot as histograms at the sides of
 the plot.
 
 For a nice alignment of the main axes with the marginals, the axes positions
-are defined by a ``Divider``, produced via `.make_axes_locatable`.
+are defined by a ``Divider``, produced via `.make_axes_locatable`.  Note that
+the ``Divider`` API allows setting axes sizes and pads in inches, which is its
+main feature.
 
-An alternative method to produce a similar figure is shown in the
-:doc:`/gallery/lines_bars_and_markers/scatter_hist` example. The advantage of
-the locatable axes method shown below is that the marginal axes follow the
-fixed aspect ratio of the main axes.
+If one wants to set axes sizes and pads relative to the main Figure, see the
+:doc:`/gallery/lines_bars_and_markers/scatter_hist` example.
 """
 
 import numpy as np
@@ -65,17 +65,12 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-import matplotlib
-import mpl_toolkits
-mpl_toolkits.axes_grid1.axes_divider.make_axes_locatable
-matplotlib.axes.Axes.set_aspect
-matplotlib.axes.Axes.scatter
-matplotlib.axes.Axes.hist
+#    - `mpl_toolkits.axes_grid1.axes_divider.make_axes_locatable`
+#    - `matplotlib.axes.Axes.set_aspect`
+#    - `matplotlib.axes.Axes.scatter`
+#    - `matplotlib.axes.Axes.hist`
diff --git a/examples/axes_grid1/simple_anchored_artists.py b/examples/axes_grid1/simple_anchored_artists.py
index 343d8d3aaa13..212f9797a7f7 100644
--- a/examples/axes_grid1/simple_anchored_artists.py
+++ b/examples/axes_grid1/simple_anchored_artists.py
@@ -73,7 +73,7 @@ def draw_sizebar(ax):
     ax.add_artist(asb)
 
 
-ax = plt.gca()
+fig, ax = plt.subplots()
 ax.set_aspect(1.)
 
 draw_text(ax)
diff --git a/examples/axes_grid1/simple_axes_divider1.py b/examples/axes_grid1/simple_axes_divider1.py
index 1ca9fd463d81..0ead9c27ae9f 100644
--- a/examples/axes_grid1/simple_axes_divider1.py
+++ b/examples/axes_grid1/simple_axes_divider1.py
@@ -3,16 +3,26 @@
 Simple Axes Divider 1
 =====================
 
+See also :doc:`/tutorials/toolkits/axes_grid`.
 """
 
 from mpl_toolkits.axes_grid1 import Size, Divider
 import matplotlib.pyplot as plt
 
 
+def label_axes(ax, text):
+    """Place a label at the center of an Axes, and remove the axis ticks."""
+    ax.text(.5, .5, text, transform=ax.transAxes,
+            horizontalalignment="center", verticalalignment="center")
+    ax.tick_params(bottom=False, labelbottom=False,
+                   left=False, labelleft=False)
+
+
 ##############################################################################
 # Fixed axes sizes; fixed paddings.
 
 fig = plt.figure(figsize=(6, 6))
+fig.suptitle("Fixed axes sizes, fixed paddings")
 
 # Sizes are in inches.
 horiz = [Size.Fixed(1.), Size.Fixed(.5), Size.Fixed(1.5), Size.Fixed(.5)]
@@ -20,36 +30,39 @@
 
 rect = (0.1, 0.1, 0.8, 0.8)
 # Divide the axes rectangle into a grid with sizes specified by horiz * vert.
-divider = Divider(fig, rect, horiz, vert, aspect=False)
+div = Divider(fig, rect, horiz, vert, aspect=False)
 
 # The rect parameter will actually be ignored and overridden by axes_locator.
-ax1 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=0, ny=0))
-ax2 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=0, ny=2))
-ax3 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=2, ny=2))
-ax4 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=2, nx1=4, ny=0))
-
-for ax in fig.axes:
-    ax.tick_params(labelbottom=False, labelleft=False)
+ax1 = fig.add_axes(rect, axes_locator=div.new_locator(nx=0, ny=0))
+label_axes(ax1, "nx=0, ny=0")
+ax2 = fig.add_axes(rect, axes_locator=div.new_locator(nx=0, ny=2))
+label_axes(ax2, "nx=0, ny=2")
+ax3 = fig.add_axes(rect, axes_locator=div.new_locator(nx=2, ny=2))
+label_axes(ax3, "nx=2, ny=2")
+ax4 = fig.add_axes(rect, axes_locator=div.new_locator(nx=2, nx1=4, ny=0))
+label_axes(ax4, "nx=2, nx1=4, ny=0")
 
 ##############################################################################
 # Axes sizes that scale with the figure size; fixed paddings.
 
 fig = plt.figure(figsize=(6, 6))
+fig.suptitle("Scalable axes sizes, fixed paddings")
 
 horiz = [Size.Scaled(1.5), Size.Fixed(.5), Size.Scaled(1.), Size.Scaled(.5)]
 vert = [Size.Scaled(1.), Size.Fixed(.5), Size.Scaled(1.5)]
 
 rect = (0.1, 0.1, 0.8, 0.8)
 # Divide the axes rectangle into a grid with sizes specified by horiz * vert.
-divider = Divider(fig, rect, horiz, vert, aspect=False)
+div = Divider(fig, rect, horiz, vert, aspect=False)
 
 # The rect parameter will actually be ignored and overridden by axes_locator.
-ax1 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=0, ny=0))
-ax2 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=0, ny=2))
-ax3 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=2, ny=2))
-ax4 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=2, nx1=4, ny=0))
-
-for ax in fig.axes:
-    ax.tick_params(labelbottom=False, labelleft=False)
+ax1 = fig.add_axes(rect, axes_locator=div.new_locator(nx=0, ny=0))
+label_axes(ax1, "nx=0, ny=0")
+ax2 = fig.add_axes(rect, axes_locator=div.new_locator(nx=0, ny=2))
+label_axes(ax2, "nx=0, ny=2")
+ax3 = fig.add_axes(rect, axes_locator=div.new_locator(nx=2, ny=2))
+label_axes(ax3, "nx=2, ny=2")
+ax4 = fig.add_axes(rect, axes_locator=div.new_locator(nx=2, nx1=4, ny=0))
+label_axes(ax4, "nx=2, nx1=4, ny=0")
 
 plt.show()
diff --git a/examples/axes_grid1/simple_axes_divider3.py b/examples/axes_grid1/simple_axes_divider3.py
index 6b7d9b4dd096..624a3be359f8 100644
--- a/examples/axes_grid1/simple_axes_divider3.py
+++ b/examples/axes_grid1/simple_axes_divider3.py
@@ -3,7 +3,9 @@
 Simple Axes Divider 3
 =====================
 
+See also :doc:`/tutorials/toolkits/axes_grid`.
 """
+
 import mpl_toolkits.axes_grid1.axes_size as Size
 from mpl_toolkits.axes_grid1 import Divider
 import matplotlib.pyplot as plt
diff --git a/examples/axes_grid1/simple_axisline4.py b/examples/axes_grid1/simple_axisline4.py
index 91b76cf3e956..4d93beb2b0d0 100644
--- a/examples/axes_grid1/simple_axisline4.py
+++ b/examples/axes_grid1/simple_axisline4.py
@@ -13,9 +13,9 @@
 ax.plot(xx, np.sin(xx))
 
 ax2 = ax.twin()  # ax2 is responsible for "top" axis and "right" axis
-ax2.set_xticks([0., .5*np.pi, np.pi, 1.5*np.pi, 2*np.pi])
-ax2.set_xticklabels(["$0$", r"$\frac{1}{2}\pi$",
-                     r"$\pi$", r"$\frac{3}{2}\pi$", r"$2\pi$"])
+ax2.set_xticks([0., .5*np.pi, np.pi, 1.5*np.pi, 2*np.pi],
+               labels=["$0$", r"$\frac{1}{2}\pi$",
+                       r"$\pi$", r"$\frac{3}{2}\pi$", r"$2\pi$"])
 
 ax2.axis["right"].major_ticklabels.set_visible(False)
 ax2.axis["top"].major_ticklabels.set_visible(True)
diff --git a/examples/axes_grid1/simple_colorbar.py b/examples/axes_grid1/simple_colorbar.py
index d7ca58046a53..41a34eefcab1 100644
--- a/examples/axes_grid1/simple_colorbar.py
+++ b/examples/axes_grid1/simple_colorbar.py
@@ -11,7 +11,7 @@
 ax = plt.subplot()
 im = ax.imshow(np.arange(100).reshape((10, 10)))
 
-# create an axes on the right side of ax. The width of cax will be 5%
+# create an Axes on the right side of ax. The width of cax will be 5%
 # of ax and the padding between cax and ax will be fixed at 0.05 inch.
 divider = make_axes_locatable(ax)
 cax = divider.append_axes("right", size="5%", pad=0.05)
diff --git a/examples/axisartist/README.txt b/examples/axisartist/README.txt
index d6b190aedaf0..dc7c87d3a608 100644
--- a/examples/axisartist/README.txt
+++ b/examples/axisartist/README.txt
@@ -2,5 +2,5 @@
 
 .. _axisartist-examples-index:
 
-Axis Artist
-===========
+axisartist
+==========
diff --git a/examples/axisartist/demo_axis_direction.py b/examples/axisartist/demo_axis_direction.py
index 81fd7a6126bf..f8c03205e732 100644
--- a/examples/axisartist/demo_axis_direction.py
+++ b/examples/axisartist/demo_axis_direction.py
@@ -1,8 +1,7 @@
 """
 ===================
-Demo Axis Direction
+axis_direction demo
 ===================
-
 """
 
 import numpy as np
diff --git a/examples/axisartist/demo_axisline_style.py b/examples/axisartist/demo_axisline_style.py
index 1427a90952a1..c7270941dadf 100644
--- a/examples/axisartist/demo_axisline_style.py
+++ b/examples/axisartist/demo_axisline_style.py
@@ -7,8 +7,8 @@
 
 Note: The `mpl_toolkits.axisartist` axes classes may be confusing for new
 users. If the only aim is to obtain arrow heads at the ends of the axes,
-rather check out the
-:doc:`/gallery/ticks_and_spines/centered_spines_with_arrows` example.
+rather check out the :doc:`/gallery/spines/centered_spines_with_arrows`
+example.
 """
 
 from mpl_toolkits.axisartist.axislines import AxesZero
diff --git a/examples/axisartist/demo_curvelinear_grid.py b/examples/axisartist/demo_curvelinear_grid.py
index 91045ee786ab..31f6f514a623 100644
--- a/examples/axisartist/demo_curvelinear_grid.py
+++ b/examples/axisartist/demo_curvelinear_grid.py
@@ -27,24 +27,17 @@ def curvelinear_test1(fig):
     Grid for custom transform.
     """
 
-    def tr(x, y):
-        x, y = np.asarray(x), np.asarray(y)
-        return x, y - x
-
-    def inv_tr(x, y):
-        x, y = np.asarray(x), np.asarray(y)
-        return x, y + x
+    def tr(x, y): return x, y - x
+    def inv_tr(x, y): return x, y + x
 
     grid_helper = GridHelperCurveLinear((tr, inv_tr))
 
     ax1 = fig.add_subplot(1, 2, 1, axes_class=Axes, grid_helper=grid_helper)
-    # ax1 will have a ticks and gridlines defined by the given
-    # transform (+ transData of the Axes). Note that the transform of
-    # the Axes itself (i.e., transData) is not affected by the given
-    # transform.
-
-    xx, yy = tr([3, 6], [5, 10])
-    ax1.plot(xx, yy, linewidth=2.0)
+    # ax1 will have ticks and gridlines defined by the given transform (+
+    # transData of the Axes).  Note that the transform of the Axes itself
+    # (i.e., transData) is not affected by the given transform.
+    xx, yy = tr(np.array([3, 6]), np.array([5, 10]))
+    ax1.plot(xx, yy)
 
     ax1.set_aspect(1)
     ax1.set_xlim(0, 10)
diff --git a/examples/axisartist/demo_curvelinear_grid2.py b/examples/axisartist/demo_curvelinear_grid2.py
index cc07a32d1805..82944ef92575 100644
--- a/examples/axisartist/demo_curvelinear_grid2.py
+++ b/examples/axisartist/demo_curvelinear_grid2.py
@@ -24,14 +24,10 @@ def curvelinear_test1(fig):
     """Grid for custom transform."""
 
     def tr(x, y):
-        sgn = np.sign(x)
-        x, y = np.abs(np.asarray(x)), np.asarray(y)
-        return sgn*x**.5, y
+        return np.sign(x)*abs(x)**.5, y
 
     def inv_tr(x, y):
-        sgn = np.sign(x)
-        x, y = np.asarray(x), np.asarray(y)
-        return sgn*x**2, y
+        return np.sign(x)*x**2, y
 
     grid_helper = GridHelperCurveLinear(
         (tr, inv_tr),
diff --git a/examples/axisartist/demo_floating_axes.py b/examples/axisartist/demo_floating_axes.py
index 6920ddca5233..06ec6934366c 100644
--- a/examples/axisartist/demo_floating_axes.py
+++ b/examples/axisartist/demo_floating_axes.py
@@ -41,6 +41,7 @@ def setup_axes1(fig, rect):
 
     ax1 = fig.add_subplot(
         rect, axes_class=floating_axes.FloatingAxes, grid_helper=grid_helper)
+    ax1.grid()
 
     aux_ax = ax1.get_aux_axes(tr)
 
@@ -72,6 +73,7 @@ def setup_axes2(fig, rect):
 
     ax1 = fig.add_subplot(
         rect, axes_class=floating_axes.FloatingAxes, grid_helper=grid_helper)
+    ax1.grid()
 
     # create a parasite axes whose transData in RA, cz
     aux_ax = ax1.get_aux_axes(tr)
@@ -129,6 +131,7 @@ def setup_axes3(fig, rect):
 
     ax1.axis["left"].label.set_text(r"cz [km$^{-1}$]")
     ax1.axis["top"].label.set_text(r"$\alpha_{1950}$")
+    ax1.grid()
 
     # create a parasite axes whose transData in RA, cz
     aux_ax = ax1.get_aux_axes(tr)
diff --git a/examples/axisartist/demo_floating_axis.py b/examples/axisartist/demo_floating_axis.py
index 36de8ce87dae..f607907c2654 100644
--- a/examples/axisartist/demo_floating_axis.py
+++ b/examples/axisartist/demo_floating_axis.py
@@ -1,14 +1,15 @@
 """
 ==================
-Demo Floating Axis
+floating_axis demo
 ==================
 
-Axis within rectangular frame
+Axis within rectangular frame.
 
 The following code demonstrates how to put a floating polar curve within a
 rectangular box. In order to get a better sense of polar curves, please look at
 :doc:`/gallery/axisartist/demo_curvelinear_grid`.
 """
+
 import numpy as np
 import matplotlib.pyplot as plt
 import mpl_toolkits.axisartist.angle_helper as angle_helper
@@ -28,8 +29,7 @@ def curvelinear_test2(fig):
                                                      lon_cycle=360,
                                                      lat_cycle=None,
                                                      lon_minmax=None,
-                                                     lat_minmax=(0,
-                                                                 np.inf),
+                                                     lat_minmax=(0, np.inf),
                                                      )
 
     grid_locator1 = angle_helper.LocatorDMS(12)
diff --git a/examples/axisartist/demo_parasite_axes.py b/examples/axisartist/demo_parasite_axes.py
index ef7d5ca5268d..0b7858f645f3 100644
--- a/examples/axisartist/demo_parasite_axes.py
+++ b/examples/axisartist/demo_parasite_axes.py
@@ -10,7 +10,7 @@
 `mpl_toolkits.axes_grid1.parasite_axes.ParasiteAxes`.
 
 An alternative approach using standard Matplotlib subplots is shown in the
-:doc:`/gallery/ticks_and_spines/multiple_yaxis_with_spines` example.
+:doc:`/gallery/spines/multiple_yaxis_with_spines` example.
 
 An alternative approach using :mod:`mpl_toolkits.axes_grid1`
 and :mod:`mpl_toolkits.axisartist` is found in the
diff --git a/examples/axisartist/demo_parasite_axes2.py b/examples/axisartist/demo_parasite_axes2.py
index 3c23e37b7ae7..651cdd032ae5 100644
--- a/examples/axisartist/demo_parasite_axes2.py
+++ b/examples/axisartist/demo_parasite_axes2.py
@@ -19,7 +19,7 @@
 `~.mpl_toolkits.axes_grid1.parasite_axes.ParasiteAxes` is the
 :doc:`/gallery/axisartist/demo_parasite_axes` example.
 An alternative approach using the usual Matplotlib subplots is shown in
-the :doc:`/gallery/ticks_and_spines/multiple_yaxis_with_spines` example.
+the :doc:`/gallery/spines/multiple_yaxis_with_spines` example.
 """
 
 from mpl_toolkits.axes_grid1 import host_subplot
diff --git a/examples/axisartist/demo_ticklabel_alignment.py b/examples/axisartist/demo_ticklabel_alignment.py
index 928b3c71a64d..e6d2d0c6ae59 100644
--- a/examples/axisartist/demo_ticklabel_alignment.py
+++ b/examples/axisartist/demo_ticklabel_alignment.py
@@ -12,10 +12,8 @@
 
 def setup_axes(fig, pos):
     ax = fig.add_subplot(pos, axes_class=axisartist.Axes)
-    ax.set_yticks([0.2, 0.8])
-    ax.set_yticklabels(["short", "loooong"])
-    ax.set_xticks([0.2, 0.8])
-    ax.set_xticklabels([r"$\frac{1}{2}\pi$", r"$\pi$"])
+    ax.set_yticks([0.2, 0.8], labels=["short", "loooong"])
+    ax.set_xticks([0.2, 0.8], labels=[r"$\frac{1}{2}\pi$", r"$\pi$"])
     return ax
 
 
diff --git a/examples/axisartist/simple_axisartist1.py b/examples/axisartist/simple_axisartist1.py
index 9e49a3b12a71..95d710cbe0b1 100644
--- a/examples/axisartist/simple_axisartist1.py
+++ b/examples/axisartist/simple_axisartist1.py
@@ -1,26 +1,52 @@
 """
-==================
-Simple Axisartist1
-==================
+=============================
+Custom spines with axisartist
+=============================
 
+This example showcases the use of :mod:`.axisartist` to draw spines at custom
+positions (here, at ``y = 0``).
+
+Note, however, that it is simpler to achieve this effect using standard
+`.Spine` methods, as demonstrated in
+:doc:`/gallery/spines/centered_spines_with_arrows`.
+
+.. redirect-from:: /gallery/axisartist/simple_axisline2
 """
+
 import matplotlib.pyplot as plt
 from mpl_toolkits import axisartist
+import numpy as np
+
+
+fig = plt.figure(figsize=(6, 3), constrained_layout=True)
+# To construct axes of two different classes, we need to use gridspec (or
+# MATLAB-style add_subplot calls).
+gs = fig.add_gridspec(1, 2)
+
+
+ax0 = fig.add_subplot(gs[0, 0], axes_class=axisartist.Axes)
+# Make a new axis along the first (x) axis which passes through y=0.
+ax0.axis["y=0"] = ax0.new_floating_axis(nth_coord=0, value=0,
+                                        axis_direction="bottom")
+ax0.axis["y=0"].toggle(all=True)
+ax0.axis["y=0"].label.set_text("y = 0")
+# Make other axis invisible.
+ax0.axis["bottom", "top", "right"].set_visible(False)
 
-fig = plt.figure()
-fig.subplots_adjust(right=0.85)
-ax = fig.add_subplot(axes_class=axisartist.Axes)
 
-# make some axis invisible
-ax.axis["bottom", "top", "right"].set_visible(False)
+# Alternatively, one can use AxesZero, which automatically sets up two
+# additional axis, named "xzero" (the y=0 axis) and "yzero" (the x=0 axis).
+ax1 = fig.add_subplot(gs[0, 1], axes_class=axisartist.axislines.AxesZero)
+# "xzero" and "yzero" default to invisible; make xzero axis visible.
+ax1.axis["xzero"].set_visible(True)
+ax1.axis["xzero"].label.set_text("Axis Zero")
+# Make other axis invisible.
+ax1.axis["bottom", "top", "right"].set_visible(False)
 
-# make an new axis along the first axis axis (x-axis) which pass
-# through y=0.
-ax.axis["y=0"] = ax.new_floating_axis(nth_coord=0, value=0,
-                                      axis_direction="bottom")
-ax.axis["y=0"].toggle(all=True)
-ax.axis["y=0"].label.set_text("y = 0")
 
-ax.set_ylim(-2, 4)
+# Draw some sample data.
+x = np.arange(0, 2*np.pi, 0.01)
+ax0.plot(x, np.sin(x))
+ax1.plot(x, np.sin(x))
 
 plt.show()
diff --git a/examples/axisartist/simple_axisline.py b/examples/axisartist/simple_axisline.py
index 7623763f1ea7..da0aad34a28a 100644
--- a/examples/axisartist/simple_axisline.py
+++ b/examples/axisartist/simple_axisline.py
@@ -24,9 +24,9 @@
 ax.set_ylim(-2, 4)
 ax.set_xlabel("Label X")
 ax.set_ylabel("Label Y")
-# or
-#ax.axis["bottom"].label.set_text("Label X")
-#ax.axis["left"].label.set_text("Label Y")
+# Or:
+# ax.axis["bottom"].label.set_text("Label X")
+# ax.axis["left"].label.set_text("Label Y")
 
 # make new (right-side) yaxis, but with some offset
 ax.axis["right2"] = ax.new_fixed_axis(loc="right", offset=(20, 0))
diff --git a/examples/axisartist/simple_axisline2.py b/examples/axisartist/simple_axisline2.py
deleted file mode 100644
index ecd49a16de77..000000000000
--- a/examples/axisartist/simple_axisline2.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""
-================
-Simple Axisline2
-================
-
-"""
-import matplotlib.pyplot as plt
-from mpl_toolkits.axisartist.axislines import AxesZero
-import numpy as np
-
-fig = plt.figure(figsize=(4, 3))
-
-# a subplot with two additional axis, "xzero" and "yzero". "xzero" is
-# y=0 line, and "yzero" is x=0 line.
-ax = fig.add_subplot(axes_class=AxesZero)
-
-# make xzero axis (horizontal axis line through y=0) visible.
-ax.axis["xzero"].set_visible(True)
-ax.axis["xzero"].label.set_text("Axis Zero")
-
-# make other axis (bottom, top, right) invisible.
-for n in ["bottom", "top", "right"]:
-    ax.axis[n].set_visible(False)
-
-xx = np.arange(0, 2*np.pi, 0.01)
-ax.plot(xx, np.sin(xx))
-
-plt.show()
diff --git a/examples/color/color_by_yvalue.py b/examples/color/color_by_yvalue.py
index 79d18ab0919b..585fe4dc86f8 100644
--- a/examples/color/color_by_yvalue.py
+++ b/examples/color/color_by_yvalue.py
@@ -24,14 +24,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.plot
-matplotlib.pyplot.plot
+#    - `matplotlib.axes.Axes.plot` / `matplotlib.pyplot.plot`
diff --git a/examples/color/color_cycle_default.py b/examples/color/color_cycle_default.py
index 8de0048b54a9..d098821d3306 100644
--- a/examples/color/color_cycle_default.py
+++ b/examples/color/color_cycle_default.py
@@ -42,18 +42,12 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.axhline
-matplotlib.axes.Axes.axvline
-matplotlib.pyplot.axhline
-matplotlib.pyplot.axvline
-matplotlib.axes.Axes.set_facecolor
-matplotlib.figure.Figure.suptitle
+#    - `matplotlib.axes.Axes.axhline` / `matplotlib.pyplot.axhline`
+#    - `matplotlib.axes.Axes.axvline` / `matplotlib.pyplot.axvline`
+#    - `matplotlib.axes.Axes.set_facecolor`
+#    - `matplotlib.figure.Figure.suptitle`
diff --git a/examples/color/color_demo.py b/examples/color/color_demo.py
index 0ad1c11edfa9..8a161442184b 100644
--- a/examples/color/color_demo.py
+++ b/examples/color/color_demo.py
@@ -48,9 +48,9 @@
 # 3) gray level string:
 ax.set_title('Voltage vs. time chart', color='0.7')
 # 4) single letter color string
-ax.set_xlabel('time (s)', color='c')
+ax.set_xlabel('Time [s]', color='c')
 # 5) a named color:
-ax.set_ylabel('voltage (mV)', color='peachpuff')
+ax.set_ylabel('Voltage [mV]', color='peachpuff')
 # 6) a named xkcd color:
 ax.plot(t, s, 'xkcd:crimson')
 # 7) Cn notation:
@@ -63,19 +63,15 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.colors
-matplotlib.axes.Axes.plot
-matplotlib.axes.Axes.set_facecolor
-matplotlib.axes.Axes.set_title
-matplotlib.axes.Axes.set_xlabel
-matplotlib.axes.Axes.set_ylabel
-matplotlib.axes.Axes.tick_params
+#    - `matplotlib.colors`
+#    - `matplotlib.axes.Axes.plot`
+#    - `matplotlib.axes.Axes.set_facecolor`
+#    - `matplotlib.axes.Axes.set_title`
+#    - `matplotlib.axes.Axes.set_xlabel`
+#    - `matplotlib.axes.Axes.set_ylabel`
+#    - `matplotlib.axes.Axes.tick_params`
diff --git a/examples/color/colorbar_basics.py b/examples/color/colorbar_basics.py
index e1815b1da6f3..f31ded0100c7 100644
--- a/examples/color/colorbar_basics.py
+++ b/examples/color/colorbar_basics.py
@@ -3,8 +3,8 @@
 Colorbar
 ========
 
-Use `~.figure.Figure.colorbar` by specifying the mappable object (here
-the `~.matplotlib.image.AxesImage` returned by `~.axes.Axes.imshow`)
+Use `~.Figure.colorbar` by specifying the mappable object (here
+the `.AxesImage` returned by `~.axes.Axes.imshow`)
 and the axes to attach the colorbar to.
 """
 
@@ -47,19 +47,12 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-import matplotlib.colorbar
-matplotlib.axes.Axes.imshow
-matplotlib.pyplot.imshow
-matplotlib.figure.Figure.colorbar
-matplotlib.pyplot.colorbar
-matplotlib.colorbar.Colorbar.minorticks_on
-matplotlib.colorbar.Colorbar.minorticks_off
+#    - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow`
+#    - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar`
+#    - `matplotlib.colorbar.Colorbar.minorticks_on`
+#    - `matplotlib.colorbar.Colorbar.minorticks_off`
diff --git a/examples/color/colormap_reference.py b/examples/color/colormap_reference.py
index d294e653fabb..549345edffab 100644
--- a/examples/color/colormap_reference.py
+++ b/examples/color/colormap_reference.py
@@ -6,16 +6,17 @@
 Reference for colormaps included with Matplotlib.
 
 A reversed version of each of these colormaps is available by appending
-``_r`` to the name, e.g., ``viridis_r``.
+``_r`` to the name, as shown in :ref:`reverse-cmap`.
 
 See :doc:`/tutorials/colors/colormaps` for an in-depth discussion about
-colormaps, including colorblind-friendliness.
+colormaps, including colorblind-friendliness, and
+:doc:`/tutorials/colors/colormap-manipulation` for a guide to creating
+colormaps.
 """
 
 import numpy as np
 import matplotlib.pyplot as plt
 
-
 cmaps = [('Perceptually Uniform Sequential', [
             'viridis', 'plasma', 'inferno', 'magma', 'cividis']),
          ('Sequential', [
@@ -40,7 +41,6 @@
             'gist_rainbow', 'rainbow', 'jet', 'turbo', 'nipy_spectral',
             'gist_ncar'])]
 
-
 gradient = np.linspace(0, 1, 256)
 gradient = np.vstack((gradient, gradient))
 
@@ -52,11 +52,11 @@ def plot_color_gradients(cmap_category, cmap_list):
     fig, axs = plt.subplots(nrows=nrows, figsize=(6.4, figh))
     fig.subplots_adjust(top=1-.35/figh, bottom=.15/figh, left=0.2, right=0.99)
 
-    axs[0].set_title(cmap_category + ' colormaps', fontsize=14)
+    axs[0].set_title(f"{cmap_category} colormaps", fontsize=14)
 
-    for ax, name in zip(axs, cmap_list):
-        ax.imshow(gradient, aspect='auto', cmap=plt.get_cmap(name))
-        ax.text(-.01, .5, name, va='center', ha='right', fontsize=10,
+    for ax, cmap_name in zip(axs, cmap_list):
+        ax.imshow(gradient, aspect='auto', cmap=cmap_name)
+        ax.text(-.01, .5, cmap_name, va='center', ha='right', fontsize=10,
                 transform=ax.transAxes)
 
     # Turn off *all* ticks & spines, not just the ones with colormaps.
@@ -67,20 +67,30 @@ def plot_color_gradients(cmap_category, cmap_list):
 for cmap_category, cmap_list in cmaps:
     plot_color_gradients(cmap_category, cmap_list)
 
-plt.show()
+
+###############################################################################
+# .. _reverse-cmap:
+#
+# Reversed colormaps
+# ------------------
+#
+# Append ``_r`` to the name of any built-in colormap to get the reversed
+# version:
+
+plot_color_gradients("Original and reversed ", ['viridis', 'viridis_r'])
+
+# %%
+# The built-in reversed colormaps are generated using `.Colormap.reversed`.
+# For an example, see :ref:`reversing-colormap`
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.colors
-matplotlib.axes.Axes.imshow
-matplotlib.figure.Figure.text
-matplotlib.axes.Axes.set_axis_off
+#    - `matplotlib.colors`
+#    - `matplotlib.axes.Axes.imshow`
+#    - `matplotlib.figure.Figure.text`
+#    - `matplotlib.axes.Axes.set_axis_off`
diff --git a/examples/color/custom_cmap.py b/examples/color/custom_cmap.py
index 441cce6484f9..a99127d972e6 100644
--- a/examples/color/custom_cmap.py
+++ b/examples/color/custom_cmap.py
@@ -12,7 +12,7 @@
 
 
 Creating custom colormaps
--------------------------
+=========================
 It is also possible to create a custom mapping for a colormap. This is
 accomplished by creating dictionary that specifies how the RGB channels
 change from one end of the cmap to the other.
@@ -21,54 +21,82 @@
 half, green to do the same over the middle half, and blue over the top
 half.  Then you would use::
 
-  cdict = {'red':   ((0.0,  0.0, 0.0),
-                     (0.5,  1.0, 1.0),
-                     (1.0,  1.0, 1.0)),
-
-           'green': ((0.0,  0.0, 0.0),
-                     (0.25, 0.0, 0.0),
-                     (0.75, 1.0, 1.0),
-                     (1.0,  1.0, 1.0)),
-
-           'blue':  ((0.0,  0.0, 0.0),
-                     (0.5,  0.0, 0.0),
-                     (1.0,  1.0, 1.0))}
+    cdict = {
+        'red': (
+            (0.0,  0.0, 0.0),
+            (0.5,  1.0, 1.0),
+            (1.0,  1.0, 1.0),
+        ),
+        'green': (
+            (0.0,  0.0, 0.0),
+            (0.25, 0.0, 0.0),
+            (0.75, 1.0, 1.0),
+            (1.0,  1.0, 1.0),
+        ),
+        'blue': (
+            (0.0,  0.0, 0.0),
+            (0.5,  0.0, 0.0),
+            (1.0,  1.0, 1.0),
+        )
+    }
 
 If, as in this example, there are no discontinuities in the r, g, and b
 components, then it is quite simple: the second and third element of
-each tuple, above, is the same--call it "y".  The first element ("x")
+each tuple, above, is the same -- call it "``y``".  The first element ("``x``")
 defines interpolation intervals over the full range of 0 to 1, and it
-must span that whole range.  In other words, the values of x divide the
-0-to-1 range into a set of segments, and y gives the end-point color
+must span that whole range.  In other words, the values of ``x`` divide the
+0-to-1 range into a set of segments, and ``y`` gives the end-point color
 values for each segment.
 
-Now consider the green. cdict['green'] is saying that for
-0 <= x <= 0.25, y is zero; no green.
-0.25 < x <= 0.75, y varies linearly from 0 to 1.
-x > 0.75, y remains at 1, full green.
-
-If there are discontinuities, then it is a little more complicated.
-Label the 3 elements in each row in the cdict entry for a given color as
-(x, y0, y1).  Then for values of x between x[i] and x[i+1] the color
-value is interpolated between y1[i] and y0[i+1].
-
-Going back to the cookbook example, look at cdict['red']; because y0 !=
-y1, it is saying that for x from 0 to 0.5, red increases from 0 to 1,
-but then it jumps down, so that for x from 0.5 to 1, red increases from
-0.7 to 1.  Green ramps from 0 to 1 as x goes from 0 to 0.5, then jumps
-back to 0, and ramps back to 1 as x goes from 0.5 to 1.::
+Now consider the green, ``cdict['green']`` is saying that for:
+
+- 0 <= ``x`` <= 0.25, ``y`` is zero; no green.
+- 0.25 < ``x`` <= 0.75, ``y`` varies linearly from 0 to 1.
+- 0.75 < ``x`` <= 1, ``y`` remains at 1, full green.
+
+If there are discontinuities, then it is a little more complicated. Label the 3
+elements in each row in the ``cdict`` entry for a given color as ``(x, y0,
+y1)``. Then for values of ``x`` between ``x[i]`` and ``x[i+1]`` the color value
+is interpolated between ``y1[i]`` and ``y0[i+1]``.
+
+Going back to a cookbook example::
+
+    cdict = {
+        'red': (
+            (0.0,  0.0, 0.0),
+            (0.5,  1.0, 0.7),
+            (1.0,  1.0, 1.0),
+        ),
+        'green': (
+            (0.0,  0.0, 0.0),
+            (0.5,  1.0, 0.0),
+            (1.0,  1.0, 1.0),
+        ),
+        'blue': (
+            (0.0,  0.0, 0.0),
+            (0.5,  0.0, 0.0),
+            (1.0,  1.0, 1.0),
+        )
+    }
+
+and look at ``cdict['red'][1]``; because ``y0 != y1``, it is saying that for
+``x`` from 0 to 0.5, red increases from 0 to 1, but then it jumps down, so that
+for ``x`` from 0.5 to 1, red increases from 0.7 to 1.  Green ramps from 0 to 1
+as ``x`` goes from 0 to 0.5, then jumps back to 0, and ramps back to 1 as ``x``
+goes from 0.5 to 1. ::
 
   row i:   x  y0  y1
-                  /
                  /
+                /
   row i+1: x  y0  y1
 
-Above is an attempt to show that for x in the range x[i] to x[i+1], the
-interpolation is between y1[i] and y0[i+1].  So, y0[0] and y1[-1] are
-never used.
+Above is an attempt to show that for ``x`` in the range ``x[i]`` to ``x[i+1]``,
+the interpolation is between ``y1[i]`` and ``y0[i+1]``.  So, ``y0[0]`` and
+``y1[-1]`` are never used.
 
 """
 import numpy as np
+import matplotlib as mpl
 import matplotlib.pyplot as plt
 from matplotlib.colors import LinearSegmentedColormap
 
@@ -81,14 +109,15 @@
 
 
 ###############################################################################
-# --- Colormaps from a list ---
+# Colormaps from a list
+# ---------------------
 
 colors = [(1, 0, 0), (0, 1, 0), (0, 0, 1)]  # R -> G -> B
 n_bins = [3, 6, 10, 100]  # Discretizes the interpolation into bins
 cmap_name = 'my_list'
 fig, axs = plt.subplots(2, 2, figsize=(6, 9))
 fig.subplots_adjust(left=0.02, bottom=0.06, right=0.95, top=0.94, wspace=0.05)
-for n_bin, ax in zip(n_bins, axs.ravel()):
+for n_bin, ax in zip(n_bins, axs.flat):
     # Create the colormap
     cmap = LinearSegmentedColormap.from_list(cmap_name, colors, N=n_bin)
     # Fewer bins will result in "coarser" colomap interpolation
@@ -98,60 +127,79 @@
 
 
 ###############################################################################
-# --- Custom colormaps ---
-
-cdict1 = {'red':   ((0.0, 0.0, 0.0),
-                    (0.5, 0.0, 0.1),
-                    (1.0, 1.0, 1.0)),
-
-          'green': ((0.0, 0.0, 0.0),
-                    (1.0, 0.0, 0.0)),
-
-          'blue':  ((0.0, 0.0, 1.0),
-                    (0.5, 0.1, 0.0),
-                    (1.0, 0.0, 0.0))
-          }
-
-cdict2 = {'red':   ((0.0, 0.0, 0.0),
-                    (0.5, 0.0, 1.0),
-                    (1.0, 0.1, 1.0)),
-
-          'green': ((0.0, 0.0, 0.0),
-                    (1.0, 0.0, 0.0)),
-
-          'blue':  ((0.0, 0.0, 0.1),
-                    (0.5, 1.0, 0.0),
-                    (1.0, 0.0, 0.0))
-          }
-
-cdict3 = {'red':  ((0.0, 0.0, 0.0),
-                   (0.25, 0.0, 0.0),
-                   (0.5, 0.8, 1.0),
-                   (0.75, 1.0, 1.0),
-                   (1.0, 0.4, 1.0)),
-
-          'green': ((0.0, 0.0, 0.0),
-                    (0.25, 0.0, 0.0),
-                    (0.5, 0.9, 0.9),
-                    (0.75, 0.0, 0.0),
-                    (1.0, 0.0, 0.0)),
-
-          'blue':  ((0.0, 0.0, 0.4),
-                    (0.25, 1.0, 1.0),
-                    (0.5, 1.0, 0.8),
-                    (0.75, 0.0, 0.0),
-                    (1.0, 0.0, 0.0))
-          }
+# Custom colormaps
+# ----------------
+
+cdict1 = {
+    'red': (
+        (0.0, 0.0, 0.0),
+        (0.5, 0.0, 0.1),
+        (1.0, 1.0, 1.0),
+    ),
+    'green': (
+        (0.0, 0.0, 0.0),
+        (1.0, 0.0, 0.0),
+    ),
+    'blue': (
+        (0.0, 0.0, 1.0),
+        (0.5, 0.1, 0.0),
+        (1.0, 0.0, 0.0),
+    )
+}
+
+cdict2 = {
+    'red': (
+        (0.0, 0.0, 0.0),
+        (0.5, 0.0, 1.0),
+        (1.0, 0.1, 1.0),
+    ),
+    'green': (
+        (0.0, 0.0, 0.0),
+        (1.0, 0.0, 0.0),
+    ),
+    'blue': (
+        (0.0, 0.0, 0.1),
+        (0.5, 1.0, 0.0),
+        (1.0, 0.0, 0.0),
+    )
+}
+
+cdict3 = {
+    'red': (
+        (0.0, 0.0, 0.0),
+        (0.25, 0.0, 0.0),
+        (0.5, 0.8, 1.0),
+        (0.75, 1.0, 1.0),
+        (1.0, 0.4, 1.0),
+    ),
+    'green': (
+        (0.0, 0.0, 0.0),
+        (0.25, 0.0, 0.0),
+        (0.5, 0.9, 0.9),
+        (0.75, 0.0, 0.0),
+        (1.0, 0.0, 0.0),
+    ),
+    'blue': (
+        (0.0, 0.0, 0.4),
+        (0.25, 1.0, 1.0),
+        (0.5, 1.0, 0.8),
+        (0.75, 0.0, 0.0),
+        (1.0, 0.0, 0.0),
+    )
+}
 
 # Make a modified version of cdict3 with some transparency
 # in the middle of the range.
-cdict4 = {**cdict3,
-          'alpha': ((0.0, 1.0, 1.0),
-                    # (0.25, 1.0, 1.0),
-                    (0.5, 0.3, 0.3),
-                    # (0.75, 1.0, 1.0),
-                    (1.0, 1.0, 1.0)),
-          }
+cdict4 = {
+    **cdict3,
+    'alpha': (
+        (0.0, 1.0, 1.0),
+        # (0.25, 1.0, 1.0),
+        (0.5, 0.3, 0.3),
+        # (0.75, 1.0, 1.0),
+        (1.0, 1.0, 1.0),
+    ),
+}
 
 
 ###############################################################################
@@ -167,25 +215,20 @@
 # of Colormap, not just
 # a LinearSegmentedColormap:
 
-blue_red2 = LinearSegmentedColormap('BlueRed2', cdict2)
-plt.register_cmap(cmap=blue_red2)
-
-plt.register_cmap(cmap=LinearSegmentedColormap('BlueRed3', cdict3))
-plt.register_cmap(cmap=LinearSegmentedColormap('BlueRedAlpha', cdict4))
+mpl.colormaps.register(LinearSegmentedColormap('BlueRed2', cdict2))
+mpl.colormaps.register(LinearSegmentedColormap('BlueRed3', cdict3))
+mpl.colormaps.register(LinearSegmentedColormap('BlueRedAlpha', cdict4))
 
 ###############################################################################
-# Make the figure:
+# Make the figure, with 4 subplots:
 
 fig, axs = plt.subplots(2, 2, figsize=(6, 9))
 fig.subplots_adjust(left=0.02, bottom=0.06, right=0.95, top=0.94, wspace=0.05)
 
-# Make 4 subplots:
-
 im1 = axs[0, 0].imshow(Z, cmap=blue_red1)
 fig.colorbar(im1, ax=axs[0, 0])
 
-cmap = plt.get_cmap('BlueRed2')
-im2 = axs[1, 0].imshow(Z, cmap=cmap)
+im2 = axs[1, 0].imshow(Z, cmap='BlueRed2')
 fig.colorbar(im2, ax=axs[1, 0])
 
 # Now we will set the third cmap as the default.  One would
@@ -215,7 +258,6 @@
 # colorbar after they have been plotted.
 im4.set_cmap('BlueRedAlpha')
 axs[1, 1].set_title("Varying alpha")
-#
 
 fig.suptitle('Custom Blue-Red colormaps', fontsize=16)
 fig.subplots_adjust(top=0.9)
@@ -224,23 +266,16 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.imshow
-matplotlib.pyplot.imshow
-matplotlib.figure.Figure.colorbar
-matplotlib.pyplot.colorbar
-matplotlib.colors
-matplotlib.colors.LinearSegmentedColormap
-matplotlib.colors.LinearSegmentedColormap.from_list
-matplotlib.cm
-matplotlib.cm.ScalarMappable.set_cmap
-matplotlib.pyplot.register_cmap
-matplotlib.cm.register_cmap
+#    - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow`
+#    - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar`
+#    - `matplotlib.colors`
+#    - `matplotlib.colors.LinearSegmentedColormap`
+#    - `matplotlib.colors.LinearSegmentedColormap.from_list`
+#    - `matplotlib.cm`
+#    - `matplotlib.cm.ScalarMappable.set_cmap`
+#    - `matplotlib.cm.register_cmap`
diff --git a/examples/color/named_colors.py b/examples/color/named_colors.py
index a1cbf1a92eca..59f15e307bd5 100644
--- a/examples/color/named_colors.py
+++ b/examples/color/named_colors.py
@@ -3,15 +3,18 @@
 List of named colors
 ====================
 
-This plots a list of the named colors supported in matplotlib. Note that
-:ref:`xkcd colors <xkcd-colors>` are supported as well, but are not listed here
-for brevity.
-
+This plots a list of the named colors supported in matplotlib.
 For more information on colors in matplotlib see
 
 * the :doc:`/tutorials/colors/colors` tutorial;
 * the `matplotlib.colors` API;
 * the :doc:`/gallery/color/color_demo`.
+
+----------------------------
+Helper Function for Plotting
+----------------------------
+First we define a helper function for making a table of colors, then we use it
+on some common color categories.
 """
 
 from matplotlib.patches import Rectangle
@@ -19,13 +22,12 @@
 import matplotlib.colors as mcolors
 
 
-def plot_colortable(colors, title, sort_colors=True, emptycols=0):
+def plot_colortable(colors, sort_colors=True, emptycols=0):
 
     cell_width = 212
     cell_height = 22
     swatch_width = 48
     margin = 12
-    topmargin = 40
 
     # Sort colors by hue, saturation, value and name.
     if sort_colors is True:
@@ -41,18 +43,17 @@ def plot_colortable(colors, title, sort_colors=True, emptycols=0):
     nrows = n // ncols + int(n % ncols > 0)
 
     width = cell_width * 4 + 2 * margin
-    height = cell_height * nrows + margin + topmargin
+    height = cell_height * nrows + 2 * margin
     dpi = 72
 
     fig, ax = plt.subplots(figsize=(width / dpi, height / dpi), dpi=dpi)
     fig.subplots_adjust(margin/width, margin/height,
-                        (width-margin)/width, (height-topmargin)/height)
+                        (width-margin)/width, (height-margin)/height)
     ax.set_xlim(0, cell_width * 4)
     ax.set_ylim(cell_height * (nrows-0.5), -cell_height/2.)
     ax.yaxis.set_visible(False)
     ax.xaxis.set_visible(False)
     ax.set_axis_off()
-    ax.set_title(title, fontsize=24, loc="left", pad=10)
 
     for i, name in enumerate(names):
         row = i % nrows
@@ -73,36 +74,48 @@ def plot_colortable(colors, title, sort_colors=True, emptycols=0):
 
     return fig
 
-plot_colortable(mcolors.BASE_COLORS, "Base Colors",
-                sort_colors=False, emptycols=1)
-plot_colortable(mcolors.TABLEAU_COLORS, "Tableau Palette",
-                sort_colors=False, emptycols=2)
+#############################################################################
+# -----------
+# Base colors
+# -----------
 
-#sphinx_gallery_thumbnail_number = 3
-plot_colortable(mcolors.CSS4_COLORS, "CSS Colors")
+plot_colortable(mcolors.BASE_COLORS, sort_colors=False, emptycols=1)
 
-# Optionally plot the XKCD colors (Caution: will produce large figure)
-#xkcd_fig = plot_colortable(mcolors.XKCD_COLORS, "XKCD Colors")
-#xkcd_fig.savefig("XKCD_Colors.png")
+#############################################################################
+# ---------------
+# Tableau Palette
+# ---------------
 
-plt.show()
+plot_colortable(mcolors.TABLEAU_COLORS, sort_colors=False, emptycols=2)
 
+#############################################################################
+# ----------
+# CSS Colors
+# ----------
+
+# sphinx_gallery_thumbnail_number = 3
+plot_colortable(mcolors.CSS4_COLORS)
+plt.show()
 
 #############################################################################
+# -----------
+# XKCD Colors
+# -----------
+# XKCD colors are supported, but they produce a large figure, so we skip them
+# for now. You can use the following code if desired::
+#
+#     xkcd_fig = plot_colortable(mcolors.XKCD_COLORS, "XKCD Colors")
+#     xkcd_fig.savefig("XKCD_Colors.png")
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.colors
-matplotlib.colors.rgb_to_hsv
-matplotlib.colors.to_rgba
-matplotlib.figure.Figure.get_size_inches
-matplotlib.figure.Figure.subplots_adjust
-matplotlib.axes.Axes.text
-matplotlib.patches.Rectangle
+#    - `matplotlib.colors`
+#    - `matplotlib.colors.rgb_to_hsv`
+#    - `matplotlib.colors.to_rgba`
+#    - `matplotlib.figure.Figure.get_size_inches`
+#    - `matplotlib.figure.Figure.subplots_adjust`
+#    - `matplotlib.axes.Axes.text`
+#    - `matplotlib.patches.Rectangle`
diff --git a/examples/event_handling/README.txt b/examples/event_handling/README.txt
index 165cb66cb15a..46aed29b56bc 100644
--- a/examples/event_handling/README.txt
+++ b/examples/event_handling/README.txt
@@ -3,10 +3,11 @@
 Event handling
 ==============
 
-Matplotlib supports :doc:`event handling</users/event_handling>` with a GUI
-neutral event model, so you can connect to Matplotlib events without knowledge
-of what user interface Matplotlib will ultimately be plugged in to.  This has
-two advantages: the code you write will be more portable, and Matplotlib events
-are aware of things like data coordinate space and which axes the event occurs
-in so you don't have to mess with low level transformation details to go from
-canvas space to data space.  Object picking examples are also included.
+Matplotlib supports :doc:`event handling</users/explain/event_handling>` with
+a GUI neutral event model, so you can connect to Matplotlib events without
+knowledge of what user interface Matplotlib will ultimately be plugged in to.
+This has two advantages: the code you write will be more portable, and
+Matplotlib events are aware of things like data coordinate space and which
+axes the event occurs in so you don't have to mess with low level
+transformation details to go from canvas space to data space.  Object picking
+examples are also included.
diff --git a/examples/event_handling/close_event.py b/examples/event_handling/close_event.py
index 9566167bdc6c..24b45b74ea48 100644
--- a/examples/event_handling/close_event.py
+++ b/examples/event_handling/close_event.py
@@ -4,6 +4,14 @@
 ===========
 
 Example to show connecting events that occur when the figure closes.
+
+.. note::
+    This example exercises the interactive capabilities of Matplotlib, and this
+    will not appear in the static documentation. Please run this code on your
+    machine to see the interactivity.
+
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
 import matplotlib.pyplot as plt
 
diff --git a/examples/event_handling/coords_demo.py b/examples/event_handling/coords_demo.py
index 4bfb49518ef5..38a5b77f68e4 100644
--- a/examples/event_handling/coords_demo.py
+++ b/examples/event_handling/coords_demo.py
@@ -5,6 +5,14 @@
 
 An example of how to interact with the plotting canvas by connecting to move
 and click events.
+
+.. note::
+    This example exercises the interactive capabilities of Matplotlib, and this
+    will not appear in the static documentation. Please run this code on your
+    machine to see the interactivity.
+
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
 
 from matplotlib.backend_bases import MouseButton
@@ -18,11 +26,9 @@
 
 
 def on_move(event):
-    # get the x and y pixel coords
-    x, y = event.x, event.y
     if event.inaxes:
-        ax = event.inaxes  # the axes instance
-        print('data coords %f %f' % (event.xdata, event.ydata))
+        print(f'data coords {event.xdata} {event.ydata},',
+              f'pixel coords {event.x} {event.y}')
 
 
 def on_click(event):
diff --git a/examples/misc/cursor_demo.py b/examples/event_handling/cursor_demo.py
similarity index 99%
rename from examples/misc/cursor_demo.py
rename to examples/event_handling/cursor_demo.py
index 5cbdecda82cc..ac09c08f1059 100644
--- a/examples/misc/cursor_demo.py
+++ b/examples/event_handling/cursor_demo.py
@@ -21,6 +21,8 @@
 
 __ https://github.com/joferkington/mpldatacursor
 __ https://github.com/anntzer/mplcursors
+
+.. redirect-from:: /gallery/misc/cursor_demo
 """
 
 import matplotlib.pyplot as plt
diff --git a/examples/event_handling/data_browser.py b/examples/event_handling/data_browser.py
index 6d2c68a3741d..42fee3b483c5 100644
--- a/examples/event_handling/data_browser.py
+++ b/examples/event_handling/data_browser.py
@@ -8,6 +8,14 @@
 This example covers how to interact data with multiple canvases. This
 let's you select and highlight a point on one axis, and generating the
 data of that point on the other axis.
+
+.. note::
+    This example exercises the interactive capabilities of Matplotlib, and this
+    will not appear in the static documentation. Please run this code on your
+    machine to see the interactivity.
+
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
 import numpy as np
 
@@ -67,7 +75,7 @@ def update(self):
 
         dataind = self.lastind
 
-        ax2.cla()
+        ax2.clear()
         ax2.plot(X[dataind])
 
         ax2.text(0.05, 0.9, f'mu={xs[dataind]:1.3f}\nsigma={ys[dataind]:1.3f}',
diff --git a/examples/event_handling/figure_axes_enter_leave.py b/examples/event_handling/figure_axes_enter_leave.py
index 8526346610f8..d55fb6e69d6a 100644
--- a/examples/event_handling/figure_axes_enter_leave.py
+++ b/examples/event_handling/figure_axes_enter_leave.py
@@ -5,6 +5,14 @@
 
 Illustrate the figure and Axes enter and leave events by changing the
 frame colors on enter and leave.
+
+.. note::
+    This example exercises the interactive capabilities of Matplotlib, and this
+    will not appear in the static documentation. Please run this code on your
+    machine to see the interactivity.
+
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
 import matplotlib.pyplot as plt
 
diff --git a/examples/event_handling/ginput_manual_clabel_sgskip.py b/examples/event_handling/ginput_manual_clabel_sgskip.py
index 0dc41b05230f..00e548bfccb4 100644
--- a/examples/event_handling/ginput_manual_clabel_sgskip.py
+++ b/examples/event_handling/ginput_manual_clabel_sgskip.py
@@ -6,10 +6,13 @@
 This provides examples of uses of interactive functions, such as ginput,
 waitforbuttonpress and manual clabel placement.
 
-This script must be run interactively using a backend that has a
-graphical user interface (for example, using GTK3Agg backend, but not
-PS backend).
+.. note::
+    This example exercises the interactive capabilities of Matplotlib, and this
+    will not appear in the static documentation. Please run this code on your
+    machine to see the interactivity.
 
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
 
 import time
@@ -27,8 +30,9 @@ def tellme(s):
 # Define a triangle by clicking three points
 
 
-plt.clf()
-plt.setp(plt.gca(), autoscale_on=False)
+plt.figure()
+plt.xlim(0, 1)
+plt.ylim(0, 1)
 
 tellme('You will define a triangle, click to begin')
 
diff --git a/examples/event_handling/image_slices_viewer.py b/examples/event_handling/image_slices_viewer.py
index 96cf8f64a3a0..6431d38ac541 100644
--- a/examples/event_handling/image_slices_viewer.py
+++ b/examples/event_handling/image_slices_viewer.py
@@ -4,6 +4,14 @@
 ===================
 
 Scroll through 2D image slices of a 3D array.
+
+.. note::
+    This example exercises the interactive capabilities of Matplotlib, and this
+    will not appear in the static documentation. Please run this code on your
+    machine to see the interactivity.
+
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
 
 import numpy as np
diff --git a/examples/event_handling/keypress_demo.py b/examples/event_handling/keypress_demo.py
index 6aff3b617ca3..e71e7ad3dfc4 100644
--- a/examples/event_handling/keypress_demo.py
+++ b/examples/event_handling/keypress_demo.py
@@ -4,6 +4,14 @@
 ==============
 
 Show how to connect to keypress events.
+
+.. note::
+    This example exercises the interactive capabilities of Matplotlib, and this
+    will not appear in the static documentation. Please run this code on your
+    machine to see the interactivity.
+
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
 import sys
 import numpy as np
diff --git a/examples/event_handling/lasso_demo.py b/examples/event_handling/lasso_demo.py
index b5f29b2fe3a6..cb9412079330 100644
--- a/examples/event_handling/lasso_demo.py
+++ b/examples/event_handling/lasso_demo.py
@@ -9,6 +9,14 @@
 
 This is currently a proof-of-concept implementation (though it is
 usable as is).  There will be some refinement of the API.
+
+.. note::
+    This example exercises the interactive capabilities of Matplotlib, and this
+    will not appear in the static documentation. Please run this code on your
+    machine to see the interactivity.
+
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
 
 from matplotlib import colors as mcolors, path
@@ -45,7 +53,7 @@ def __init__(self, ax, data):
             6, sizes=(100,),
             facecolors=facecolors,
             offsets=self.xys,
-            transOffset=ax.transData)
+            offset_transform=ax.transData)
 
         ax.add_collection(self.collection)
 
diff --git a/examples/event_handling/legend_picking.py b/examples/event_handling/legend_picking.py
index 5f8a3d1bb779..8c050d472d7a 100644
--- a/examples/event_handling/legend_picking.py
+++ b/examples/event_handling/legend_picking.py
@@ -4,6 +4,14 @@
 ==============
 
 Enable picking on the legend to toggle the original line on and off
+
+.. note::
+    This example exercises the interactive capabilities of Matplotlib, and this
+    will not appear in the static documentation. Please run this code on your
+    machine to see the interactivity.
+
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
 
 import numpy as np
diff --git a/examples/event_handling/looking_glass.py b/examples/event_handling/looking_glass.py
index 139afab106f3..70fe4651f79d 100644
--- a/examples/event_handling/looking_glass.py
+++ b/examples/event_handling/looking_glass.py
@@ -4,6 +4,14 @@
 =============
 
 Example using mouse events to simulate a looking glass for inspecting data.
+
+.. note::
+    This example exercises the interactive capabilities of Matplotlib, and this
+    will not appear in the static documentation. Please run this code on your
+    machine to see the interactivity.
+
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/examples/event_handling/path_editor.py b/examples/event_handling/path_editor.py
index 9fe1a1470e64..be8d79935db9 100644
--- a/examples/event_handling/path_editor.py
+++ b/examples/event_handling/path_editor.py
@@ -7,6 +7,14 @@
 
 This example demonstrates a cross-GUI application using Matplotlib event
 handling to interact with and modify objects on the canvas.
+
+.. note::
+    This example exercises the interactive capabilities of Matplotlib, and this
+    will not appear in the static documentation. Please run this code on your
+    machine to see the interactivity.
+
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
 
 import numpy as np
diff --git a/examples/event_handling/pick_event_demo.py b/examples/event_handling/pick_event_demo.py
index 84c635c27ca8..b61b18c0fe31 100644
--- a/examples/event_handling/pick_event_demo.py
+++ b/examples/event_handling/pick_event_demo.py
@@ -3,10 +3,9 @@
 Pick Event Demo
 ===============
 
-
 You can enable picking by setting the "picker" property of an artist
-(for example, a matplotlib Line2D, Text, Patch, Polygon, AxesImage,
-etc...)
+(for example, a Matplotlib Line2D, Text, Patch, Polygon, AxesImage,
+etc.)
 
 There are a variety of meanings of the picker property:
 
@@ -22,7 +21,7 @@
   of the data within epsilon of the pick event
 
 * function - if picker is callable, it is a user supplied function which
-  determines whether the artist is hit by the mouse event.
+  determines whether the artist is hit by the mouse event. ::
 
      hit, props = picker(artist, mouseevent)
 
@@ -32,7 +31,7 @@
 
 After you have enabled an artist for picking by setting the "picker"
 property, you need to connect to the figure canvas pick_event to get
-pick callbacks on mouse press events.  For example,
+pick callbacks on mouse press events.  For example, ::
 
   def pick_handler(event):
       mouseevent = event.mouseevent
@@ -43,15 +42,18 @@ def pick_handler(event):
 The pick event (matplotlib.backend_bases.PickEvent) which is passed to
 your callback is always fired with two attributes:
 
-  mouseevent - the mouse event that generate the pick event.  The
-    mouse event in turn has attributes like x and y (the coordinates in
-    display space, such as pixels from left, bottom) and xdata, ydata (the
-    coords in data space).  Additionally, you can get information about
-    which buttons were pressed, which keys were pressed, which Axes
-    the mouse is over, etc.  See matplotlib.backend_bases.MouseEvent
-    for details.
+mouseevent
+  the mouse event that generate the pick event.
+
+  The mouse event in turn has attributes like x and y (the coordinates in
+  display space, such as pixels from left, bottom) and xdata, ydata (the
+  coords in data space).  Additionally, you can get information about
+  which buttons were pressed, which keys were pressed, which Axes
+  the mouse is over, etc.  See matplotlib.backend_bases.MouseEvent
+  for details.
 
-  artist - the matplotlib.artist that generated the pick event.
+artist
+  the matplotlib.artist that generated the pick event.
 
 Additionally, certain artists like Line2D and PatchCollection may
 attach additional meta data like the indices into the data that meet
@@ -59,6 +61,14 @@ def pick_handler(event):
 the specified epsilon tolerance)
 
 The examples below illustrate each of these methods.
+
+.. note::
+    These examples exercises the interactive capabilities of Matplotlib, and
+    this will not appear in the static documentation. Please run this code on
+    your machine to see the interactivity.
+
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
 
 import matplotlib.pyplot as plt
@@ -74,114 +84,125 @@ def pick_handler(event):
 np.random.seed(19680801)
 
 
-def pick_simple():
-    # simple picking, lines, rectangles and text
-    fig, (ax1, ax2) = plt.subplots(2, 1)
-    ax1.set_title('click on points, rectangles or text', picker=True)
-    ax1.set_ylabel('ylabel', picker=True, bbox=dict(facecolor='red'))
-    line, = ax1.plot(rand(100), 'o', picker=True, pickradius=5)
-
-    # pick the rectangle
-    ax2.bar(range(10), rand(10), picker=True)
-    for label in ax2.get_xticklabels():  # make the xtick labels pickable
-        label.set_picker(True)
-
-    def onpick1(event):
-        if isinstance(event.artist, Line2D):
-            thisline = event.artist
-            xdata = thisline.get_xdata()
-            ydata = thisline.get_ydata()
-            ind = event.ind
-            print('onpick1 line:', np.column_stack([xdata[ind], ydata[ind]]))
-        elif isinstance(event.artist, Rectangle):
-            patch = event.artist
-            print('onpick1 patch:', patch.get_path())
-        elif isinstance(event.artist, Text):
-            text = event.artist
-            print('onpick1 text:', text.get_text())
-
-    fig.canvas.mpl_connect('pick_event', onpick1)
-
-
-def pick_custom_hit():
-    # picking with a custom hit test function
-    # you can define custom pickers by setting picker to a callable
-    # function.  The function has the signature
-    #
-    #  hit, props = func(artist, mouseevent)
-    #
-    # to determine the hit test.  if the mouse event is over the artist,
-    # return hit=True and props is a dictionary of
-    # properties you want added to the PickEvent attributes
-
-    def line_picker(line, mouseevent):
-        """
-        Find the points within a certain distance from the mouseclick in
-        data coords and attach some extra attributes, pickx and picky
-        which are the data points that were picked.
-        """
-        if mouseevent.xdata is None:
-            return False, dict()
-        xdata = line.get_xdata()
-        ydata = line.get_ydata()
-        maxd = 0.05
-        d = np.sqrt(
-            (xdata - mouseevent.xdata)**2 + (ydata - mouseevent.ydata)**2)
-
-        ind, = np.nonzero(d <= maxd)
-        if len(ind):
-            pickx = xdata[ind]
-            picky = ydata[ind]
-            props = dict(ind=ind, pickx=pickx, picky=picky)
-            return True, props
-        else:
-            return False, dict()
-
-    def onpick2(event):
-        print('onpick2 line:', event.pickx, event.picky)
-
-    fig, ax = plt.subplots()
-    ax.set_title('custom picker for line data')
-    line, = ax.plot(rand(100), rand(100), 'o', picker=line_picker)
-    fig.canvas.mpl_connect('pick_event', onpick2)
-
-
-def pick_scatter_plot():
-    # picking on a scatter plot (matplotlib.collections.RegularPolyCollection)
-
-    x, y, c, s = rand(4, 100)
-
-    def onpick3(event):
+#############################################################################
+# Simple picking, lines, rectangles and text
+# ------------------------------------------
+
+fig, (ax1, ax2) = plt.subplots(2, 1)
+ax1.set_title('click on points, rectangles or text', picker=True)
+ax1.set_ylabel('ylabel', picker=True, bbox=dict(facecolor='red'))
+line, = ax1.plot(rand(100), 'o', picker=True, pickradius=5)
+
+# Pick the rectangle.
+ax2.bar(range(10), rand(10), picker=True)
+for label in ax2.get_xticklabels():  # Make the xtick labels pickable.
+    label.set_picker(True)
+
+
+def onpick1(event):
+    if isinstance(event.artist, Line2D):
+        thisline = event.artist
+        xdata = thisline.get_xdata()
+        ydata = thisline.get_ydata()
         ind = event.ind
-        print('onpick3 scatter:', ind, x[ind], y[ind])
-
-    fig, ax = plt.subplots()
-    ax.scatter(x, y, 100*s, c, picker=True)
-    fig.canvas.mpl_connect('pick_event', onpick3)
-
-
-def pick_image():
-    # picking images (matplotlib.image.AxesImage)
-    fig, ax = plt.subplots()
-    ax.imshow(rand(10, 5), extent=(1, 2, 1, 2), picker=True)
-    ax.imshow(rand(5, 10), extent=(3, 4, 1, 2), picker=True)
-    ax.imshow(rand(20, 25), extent=(1, 2, 3, 4), picker=True)
-    ax.imshow(rand(30, 12), extent=(3, 4, 3, 4), picker=True)
-    ax.set(xlim=(0, 5), ylim=(0, 5))
-
-    def onpick4(event):
-        artist = event.artist
-        if isinstance(artist, AxesImage):
-            im = artist
-            A = im.get_array()
-            print('onpick4 image', A.shape)
-
-    fig.canvas.mpl_connect('pick_event', onpick4)
-
-
-if __name__ == '__main__':
-    pick_simple()
-    pick_custom_hit()
-    pick_scatter_plot()
-    pick_image()
-    plt.show()
+        print('onpick1 line:', np.column_stack([xdata[ind], ydata[ind]]))
+    elif isinstance(event.artist, Rectangle):
+        patch = event.artist
+        print('onpick1 patch:', patch.get_path())
+    elif isinstance(event.artist, Text):
+        text = event.artist
+        print('onpick1 text:', text.get_text())
+
+
+fig.canvas.mpl_connect('pick_event', onpick1)
+
+
+#############################################################################
+# Picking with a custom hit test function
+# ---------------------------------------
+# You can define custom pickers by setting picker to a callable function. The
+# function has the signature::
+#
+#  hit, props = func(artist, mouseevent)
+#
+# to determine the hit test. If the mouse event is over the artist, return
+# ``hit=True`` and ``props`` is a dictionary of properties you want added to
+# the `.PickEvent` attributes.
+
+def line_picker(line, mouseevent):
+    """
+    Find the points within a certain distance from the mouseclick in
+    data coords and attach some extra attributes, pickx and picky
+    which are the data points that were picked.
+    """
+    if mouseevent.xdata is None:
+        return False, dict()
+    xdata = line.get_xdata()
+    ydata = line.get_ydata()
+    maxd = 0.05
+    d = np.sqrt(
+        (xdata - mouseevent.xdata)**2 + (ydata - mouseevent.ydata)**2)
+
+    ind, = np.nonzero(d <= maxd)
+    if len(ind):
+        pickx = xdata[ind]
+        picky = ydata[ind]
+        props = dict(ind=ind, pickx=pickx, picky=picky)
+        return True, props
+    else:
+        return False, dict()
+
+
+def onpick2(event):
+    print('onpick2 line:', event.pickx, event.picky)
+
+
+fig, ax = plt.subplots()
+ax.set_title('custom picker for line data')
+line, = ax.plot(rand(100), rand(100), 'o', picker=line_picker)
+fig.canvas.mpl_connect('pick_event', onpick2)
+
+
+#############################################################################
+# Picking on a scatter plot
+# -------------------------
+# A scatter plot is backed by a `~matplotlib.collections.PathCollection`.
+
+x, y, c, s = rand(4, 100)
+
+
+def onpick3(event):
+    ind = event.ind
+    print('onpick3 scatter:', ind, x[ind], y[ind])
+
+
+fig, ax = plt.subplots()
+ax.scatter(x, y, 100*s, c, picker=True)
+fig.canvas.mpl_connect('pick_event', onpick3)
+
+
+#############################################################################
+# Picking images
+# --------------
+# Images plotted using `.Axes.imshow` are `~matplotlib.image.AxesImage`
+# objects.
+
+fig, ax = plt.subplots()
+ax.imshow(rand(10, 5), extent=(1, 2, 1, 2), picker=True)
+ax.imshow(rand(5, 10), extent=(3, 4, 1, 2), picker=True)
+ax.imshow(rand(20, 25), extent=(1, 2, 3, 4), picker=True)
+ax.imshow(rand(30, 12), extent=(3, 4, 3, 4), picker=True)
+ax.set(xlim=(0, 5), ylim=(0, 5))
+
+
+def onpick4(event):
+    artist = event.artist
+    if isinstance(artist, AxesImage):
+        im = artist
+        A = im.get_array()
+        print('onpick4 image', A.shape)
+
+
+fig.canvas.mpl_connect('pick_event', onpick4)
+
+plt.show()
diff --git a/examples/event_handling/pick_event_demo2.py b/examples/event_handling/pick_event_demo2.py
index 162fbdf65ade..8ffb5361a9e3 100644
--- a/examples/event_handling/pick_event_demo2.py
+++ b/examples/event_handling/pick_event_demo2.py
@@ -6,6 +6,14 @@
 Compute the mean (mu) and standard deviation (sigma) of 100 data sets and plot
 mu vs. sigma.  When you click on one of the (mu, sigma) points, plot the raw
 data from the dataset that generated this point.
+
+.. note::
+    This example exercises the interactive capabilities of Matplotlib, and this
+    will not appear in the static documentation. Please run this code on your
+    machine to see the interactivity.
+
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
 import numpy as np
 import matplotlib.pyplot as plt
@@ -26,11 +34,11 @@
 def onpick(event):
 
     if event.artist != line:
-        return True
+        return
 
     N = len(event.ind)
     if not N:
-        return True
+        return
 
     figi, axs = plt.subplots(N, squeeze=False)
     for ax, dataind in zip(axs.flat, event.ind):
@@ -39,7 +47,7 @@ def onpick(event):
                 transform=ax.transAxes, va='top')
         ax.set_ylim(-0.5, 1.5)
     figi.show()
-    return True
+
 
 fig.canvas.mpl_connect('pick_event', onpick)
 
diff --git a/examples/event_handling/pipong.py b/examples/event_handling/pipong.py
deleted file mode 100644
index 7d0acab617fa..000000000000
--- a/examples/event_handling/pipong.py
+++ /dev/null
@@ -1,290 +0,0 @@
-"""
-======
-Pipong
-======
-
-A Matplotlib based game of Pong illustrating one way to write interactive
-animation which are easily ported to multiple backends
-pipong.py was written by Paul Ivanov <http://pirsquared.org>
-"""
-
-
-import numpy as np
-import matplotlib.pyplot as plt
-from numpy.random import randn, randint
-from matplotlib.font_manager import FontProperties
-
-instructions = """
-Player A:       Player B:
-  'e'      up     'i'
-  'd'     down    'k'
-
-press 't' -- close these instructions
-            (animation will be much faster)
-press 'a' -- add a puck
-press 'A' -- remove a puck
-press '1' -- slow down all pucks
-press '2' -- speed up all pucks
-press '3' -- slow down distractors
-press '4' -- speed up distractors
-press ' ' -- reset the first puck
-press 'n' -- toggle distractors on/off
-press 'g' -- toggle the game on/off
-
-  """
-
-
-class Pad:
-    def __init__(self, disp, x, y, type='l'):
-        self.disp = disp
-        self.x = x
-        self.y = y
-        self.w = .3
-        self.score = 0
-        self.xoffset = 0.3
-        self.yoffset = 0.1
-        if type == 'r':
-            self.xoffset *= -1.0
-
-        if type == 'l' or type == 'r':
-            self.signx = -1.0
-            self.signy = 1.0
-        else:
-            self.signx = 1.0
-            self.signy = -1.0
-
-    def contains(self, loc):
-        return self.disp.get_bbox().contains(loc.x, loc.y)
-
-
-class Puck:
-    def __init__(self, disp, pad, field):
-        self.vmax = .2
-        self.disp = disp
-        self.field = field
-        self._reset(pad)
-
-    def _reset(self, pad):
-        self.x = pad.x + pad.xoffset
-        if pad.y < 0:
-            self.y = pad.y + pad.yoffset
-        else:
-            self.y = pad.y - pad.yoffset
-        self.vx = pad.x - self.x
-        self.vy = pad.y + pad.w/2 - self.y
-        self._speedlimit()
-        self._slower()
-        self._slower()
-
-    def update(self, pads):
-        self.x += self.vx
-        self.y += self.vy
-        for pad in pads:
-            if pad.contains(self):
-                self.vx *= 1.2 * pad.signx
-                self.vy *= 1.2 * pad.signy
-        fudge = .001
-        # probably cleaner with something like...
-        if self.x < fudge:
-            pads[1].score += 1
-            self._reset(pads[0])
-            return True
-        if self.x > 7 - fudge:
-            pads[0].score += 1
-            self._reset(pads[1])
-            return True
-        if self.y < -1 + fudge or self.y > 1 - fudge:
-            self.vy *= -1.0
-            # add some randomness, just to make it interesting
-            self.vy -= (randn()/300.0 + 1/300.0) * np.sign(self.vy)
-        self._speedlimit()
-        return False
-
-    def _slower(self):
-        self.vx /= 5.0
-        self.vy /= 5.0
-
-    def _faster(self):
-        self.vx *= 5.0
-        self.vy *= 5.0
-
-    def _speedlimit(self):
-        if self.vx > self.vmax:
-            self.vx = self.vmax
-        if self.vx < -self.vmax:
-            self.vx = -self.vmax
-
-        if self.vy > self.vmax:
-            self.vy = self.vmax
-        if self.vy < -self.vmax:
-            self.vy = -self.vmax
-
-
-class Game:
-    def __init__(self, ax):
-        # create the initial line
-        self.ax = ax
-        ax.set_ylim([-1, 1])
-        ax.set_xlim([0, 7])
-        pad_a_x = 0
-        pad_b_x = .50
-        pad_a_y = pad_b_y = .30
-        pad_b_x += 6.3
-
-        # pads
-        pA, = self.ax.barh(pad_a_y, .2,
-                           height=.3, color='k', alpha=.5, edgecolor='b',
-                           lw=2, label="Player B",
-                           animated=True)
-        pB, = self.ax.barh(pad_b_y, .2,
-                           height=.3, left=pad_b_x, color='k', alpha=.5,
-                           edgecolor='r', lw=2, label="Player A",
-                           animated=True)
-
-        # distractors
-        self.x = np.arange(0, 2.22*np.pi, 0.01)
-        self.line, = self.ax.plot(self.x, np.sin(self.x), "r",
-                                  animated=True, lw=4)
-        self.line2, = self.ax.plot(self.x, np.cos(self.x), "g",
-                                   animated=True, lw=4)
-        self.line3, = self.ax.plot(self.x, np.cos(self.x), "g",
-                                   animated=True, lw=4)
-        self.line4, = self.ax.plot(self.x, np.cos(self.x), "r",
-                                   animated=True, lw=4)
-
-        # center line
-        self.centerline, = self.ax.plot([3.5, 3.5], [1, -1], 'k',
-                                        alpha=.5, animated=True, lw=8)
-
-        # puck (s)
-        self.puckdisp = self.ax.scatter([1], [1], label='_nolegend_',
-                                        s=200, c='g',
-                                        alpha=.9, animated=True)
-
-        self.canvas = self.ax.figure.canvas
-        self.background = None
-        self.cnt = 0
-        self.distract = True
-        self.res = 100.0
-        self.on = False
-        self.inst = True    # show instructions from the beginning
-        self.background = None
-        self.pads = [Pad(pA, pad_a_x, pad_a_y),
-                     Pad(pB, pad_b_x, pad_b_y, 'r')]
-        self.pucks = []
-        self.i = self.ax.annotate(instructions, (.5, 0.5),
-                                  name='monospace',
-                                  verticalalignment='center',
-                                  horizontalalignment='center',
-                                  multialignment='left',
-                                  textcoords='axes fraction',
-                                  animated=False)
-        self.canvas.mpl_connect('key_press_event', self.on_key_press)
-
-    def draw(self, event):
-        draw_artist = self.ax.draw_artist
-        if self.background is None:
-            self.background = self.canvas.copy_from_bbox(self.ax.bbox)
-
-        # restore the clean slate background
-        self.canvas.restore_region(self.background)
-
-        # show the distractors
-        if self.distract:
-            self.line.set_ydata(np.sin(self.x + self.cnt/self.res))
-            self.line2.set_ydata(np.cos(self.x - self.cnt/self.res))
-            self.line3.set_ydata(np.tan(self.x + self.cnt/self.res))
-            self.line4.set_ydata(np.tan(self.x - self.cnt/self.res))
-            draw_artist(self.line)
-            draw_artist(self.line2)
-            draw_artist(self.line3)
-            draw_artist(self.line4)
-
-        # pucks and pads
-        if self.on:
-            self.ax.draw_artist(self.centerline)
-            for pad in self.pads:
-                pad.disp.set_y(pad.y)
-                pad.disp.set_x(pad.x)
-                self.ax.draw_artist(pad.disp)
-
-            for puck in self.pucks:
-                if puck.update(self.pads):
-                    # we only get here if someone scored
-                    self.pads[0].disp.set_label(
-                        "   " + str(self.pads[0].score))
-                    self.pads[1].disp.set_label(
-                        "   " + str(self.pads[1].score))
-                    self.ax.legend(loc='center', framealpha=.2,
-                                   facecolor='0.5',
-                                   prop=FontProperties(size='xx-large',
-                                                       weight='bold'))
-
-                    self.background = None
-                    self.ax.figure.canvas.draw_idle()
-                    return True
-                puck.disp.set_offsets([[puck.x, puck.y]])
-                self.ax.draw_artist(puck.disp)
-
-        # just redraw the axes rectangle
-        self.canvas.blit(self.ax.bbox)
-        self.canvas.flush_events()
-        if self.cnt == 50000:
-            # just so we don't get carried away
-            print("...and you've been playing for too long!!!")
-            plt.close()
-
-        self.cnt += 1
-        return True
-
-    def on_key_press(self, event):
-        if event.key == '3':
-            self.res *= 5.0
-        if event.key == '4':
-            self.res /= 5.0
-
-        if event.key == 'e':
-            self.pads[0].y += .1
-            if self.pads[0].y > 1 - .3:
-                self.pads[0].y = 1 - .3
-        if event.key == 'd':
-            self.pads[0].y -= .1
-            if self.pads[0].y < -1:
-                self.pads[0].y = -1
-
-        if event.key == 'i':
-            self.pads[1].y += .1
-            if self.pads[1].y > 1 - .3:
-                self.pads[1].y = 1 - .3
-        if event.key == 'k':
-            self.pads[1].y -= .1
-            if self.pads[1].y < -1:
-                self.pads[1].y = -1
-
-        if event.key == 'a':
-            self.pucks.append(Puck(self.puckdisp,
-                                   self.pads[randint(2)],
-                                   self.ax.bbox))
-        if event.key == 'A' and len(self.pucks):
-            self.pucks.pop()
-        if event.key == ' ' and len(self.pucks):
-            self.pucks[0]._reset(self.pads[randint(2)])
-        if event.key == '1':
-            for p in self.pucks:
-                p._slower()
-        if event.key == '2':
-            for p in self.pucks:
-                p._faster()
-
-        if event.key == 'n':
-            self.distract = not self.distract
-
-        if event.key == 'g':
-            self.on = not self.on
-        if event.key == 't':
-            self.inst = not self.inst
-            self.i.set_visible(not self.i.get_visible())
-            self.background = None
-            self.canvas.draw_idle()
-        if event.key == 'q':
-            plt.close()
diff --git a/examples/event_handling/poly_editor.py b/examples/event_handling/poly_editor.py
index 938c7b8b7b28..b156b9c662bd 100644
--- a/examples/event_handling/poly_editor.py
+++ b/examples/event_handling/poly_editor.py
@@ -5,6 +5,14 @@
 
 This is an example to show how to build cross-GUI applications using
 Matplotlib event handling to interact with objects on the canvas.
+
+.. note::
+    This example exercises the interactive capabilities of Matplotlib, and this
+    will not appear in the static documentation. Please run this code on your
+    machine to see the interactivity.
+
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
 import numpy as np
 from matplotlib.lines import Line2D
@@ -24,7 +32,7 @@ def dist_point_to_segment(p, s0, s1):
     Get the distance of a point to a segment.
       *p*, *s0*, *s1* are *xy* sequences
     This algorithm from
-    http://geomalgorithms.com/a02-_lines.html
+    http://www.geomalgorithms.com/algorithms.html
     """
     v = s1 - s0
     w = p - s0
diff --git a/examples/event_handling/pong_sgskip.py b/examples/event_handling/pong_sgskip.py
index 416bdf048dbe..e629d888cd77 100644
--- a/examples/event_handling/pong_sgskip.py
+++ b/examples/event_handling/pong_sgskip.py
@@ -3,23 +3,304 @@
 Pong
 ====
 
-A small game demo using Matplotlib.
+A Matplotlib based game of Pong illustrating one way to write interactive
+animations that are easily ported to multiple backends.
 
-.. only:: builder_html
-
-   This example requires :download:`pipong.py <pipong.py>`
+.. note::
+    This example exercises the interactive capabilities of Matplotlib, and this
+    will not appear in the static documentation. Please run this code on your
+    machine to see the interactivity.
 
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
-import time
 
+import time
 
+import numpy as np
 import matplotlib.pyplot as plt
-import pipong
+from numpy.random import randn, randint
+from matplotlib.font_manager import FontProperties
+
+instructions = """
+Player A:       Player B:
+  'e'      up     'i'
+  'd'     down    'k'
+
+press 't' -- close these instructions
+            (animation will be much faster)
+press 'a' -- add a puck
+press 'A' -- remove a puck
+press '1' -- slow down all pucks
+press '2' -- speed up all pucks
+press '3' -- slow down distractors
+press '4' -- speed up distractors
+press ' ' -- reset the first puck
+press 'n' -- toggle distractors on/off
+press 'g' -- toggle the game on/off
+
+  """
+
+
+class Pad:
+    def __init__(self, disp, x, y, type='l'):
+        self.disp = disp
+        self.x = x
+        self.y = y
+        self.w = .3
+        self.score = 0
+        self.xoffset = 0.3
+        self.yoffset = 0.1
+        if type == 'r':
+            self.xoffset *= -1.0
+
+        if type == 'l' or type == 'r':
+            self.signx = -1.0
+            self.signy = 1.0
+        else:
+            self.signx = 1.0
+            self.signy = -1.0
+
+    def contains(self, loc):
+        return self.disp.get_bbox().contains(loc.x, loc.y)
+
+
+class Puck:
+    def __init__(self, disp, pad, field):
+        self.vmax = .2
+        self.disp = disp
+        self.field = field
+        self._reset(pad)
+
+    def _reset(self, pad):
+        self.x = pad.x + pad.xoffset
+        if pad.y < 0:
+            self.y = pad.y + pad.yoffset
+        else:
+            self.y = pad.y - pad.yoffset
+        self.vx = pad.x - self.x
+        self.vy = pad.y + pad.w/2 - self.y
+        self._speedlimit()
+        self._slower()
+        self._slower()
+
+    def update(self, pads):
+        self.x += self.vx
+        self.y += self.vy
+        for pad in pads:
+            if pad.contains(self):
+                self.vx *= 1.2 * pad.signx
+                self.vy *= 1.2 * pad.signy
+        fudge = .001
+        # probably cleaner with something like...
+        if self.x < fudge:
+            pads[1].score += 1
+            self._reset(pads[0])
+            return True
+        if self.x > 7 - fudge:
+            pads[0].score += 1
+            self._reset(pads[1])
+            return True
+        if self.y < -1 + fudge or self.y > 1 - fudge:
+            self.vy *= -1.0
+            # add some randomness, just to make it interesting
+            self.vy -= (randn()/300.0 + 1/300.0) * np.sign(self.vy)
+        self._speedlimit()
+        return False
+
+    def _slower(self):
+        self.vx /= 5.0
+        self.vy /= 5.0
+
+    def _faster(self):
+        self.vx *= 5.0
+        self.vy *= 5.0
+
+    def _speedlimit(self):
+        if self.vx > self.vmax:
+            self.vx = self.vmax
+        if self.vx < -self.vmax:
+            self.vx = -self.vmax
+
+        if self.vy > self.vmax:
+            self.vy = self.vmax
+        if self.vy < -self.vmax:
+            self.vy = -self.vmax
+
+
+class Game:
+    def __init__(self, ax):
+        # create the initial line
+        self.ax = ax
+        ax.xaxis.set_visible(False)
+        ax.set_xlim([0, 7])
+        ax.yaxis.set_visible(False)
+        ax.set_ylim([-1, 1])
+        pad_a_x = 0
+        pad_b_x = .50
+        pad_a_y = pad_b_y = .30
+        pad_b_x += 6.3
+
+        # pads
+        pA, = self.ax.barh(pad_a_y, .2,
+                           height=.3, color='k', alpha=.5, edgecolor='b',
+                           lw=2, label="Player B",
+                           animated=True)
+        pB, = self.ax.barh(pad_b_y, .2,
+                           height=.3, left=pad_b_x, color='k', alpha=.5,
+                           edgecolor='r', lw=2, label="Player A",
+                           animated=True)
+
+        # distractors
+        self.x = np.arange(0, 2.22*np.pi, 0.01)
+        self.line, = self.ax.plot(self.x, np.sin(self.x), "r",
+                                  animated=True, lw=4)
+        self.line2, = self.ax.plot(self.x, np.cos(self.x), "g",
+                                   animated=True, lw=4)
+        self.line3, = self.ax.plot(self.x, np.cos(self.x), "g",
+                                   animated=True, lw=4)
+        self.line4, = self.ax.plot(self.x, np.cos(self.x), "r",
+                                   animated=True, lw=4)
+
+        # center line
+        self.centerline, = self.ax.plot([3.5, 3.5], [1, -1], 'k',
+                                        alpha=.5, animated=True, lw=8)
+
+        # puck (s)
+        self.puckdisp = self.ax.scatter([1], [1], label='_nolegend_',
+                                        s=200, c='g',
+                                        alpha=.9, animated=True)
+
+        self.canvas = self.ax.figure.canvas
+        self.background = None
+        self.cnt = 0
+        self.distract = True
+        self.res = 100.0
+        self.on = False
+        self.inst = True    # show instructions from the beginning
+        self.pads = [Pad(pA, pad_a_x, pad_a_y),
+                     Pad(pB, pad_b_x, pad_b_y, 'r')]
+        self.pucks = []
+        self.i = self.ax.annotate(instructions, (.5, 0.5),
+                                  name='monospace',
+                                  verticalalignment='center',
+                                  horizontalalignment='center',
+                                  multialignment='left',
+                                  xycoords='axes fraction',
+                                  animated=False)
+        self.canvas.mpl_connect('key_press_event', self.on_key_press)
+
+    def draw(self):
+        draw_artist = self.ax.draw_artist
+        if self.background is None:
+            self.background = self.canvas.copy_from_bbox(self.ax.bbox)
+
+        # restore the clean slate background
+        self.canvas.restore_region(self.background)
+
+        # show the distractors
+        if self.distract:
+            self.line.set_ydata(np.sin(self.x + self.cnt/self.res))
+            self.line2.set_ydata(np.cos(self.x - self.cnt/self.res))
+            self.line3.set_ydata(np.tan(self.x + self.cnt/self.res))
+            self.line4.set_ydata(np.tan(self.x - self.cnt/self.res))
+            draw_artist(self.line)
+            draw_artist(self.line2)
+            draw_artist(self.line3)
+            draw_artist(self.line4)
+
+        # pucks and pads
+        if self.on:
+            self.ax.draw_artist(self.centerline)
+            for pad in self.pads:
+                pad.disp.set_y(pad.y)
+                pad.disp.set_x(pad.x)
+                self.ax.draw_artist(pad.disp)
+
+            for puck in self.pucks:
+                if puck.update(self.pads):
+                    # we only get here if someone scored
+                    self.pads[0].disp.set_label(
+                        "   " + str(self.pads[0].score))
+                    self.pads[1].disp.set_label(
+                        "   " + str(self.pads[1].score))
+                    self.ax.legend(loc='center', framealpha=.2,
+                                   facecolor='0.5',
+                                   prop=FontProperties(size='xx-large',
+                                                       weight='bold'))
+
+                    self.background = None
+                    self.ax.figure.canvas.draw_idle()
+                    return
+                puck.disp.set_offsets([[puck.x, puck.y]])
+                self.ax.draw_artist(puck.disp)
+
+        # just redraw the axes rectangle
+        self.canvas.blit(self.ax.bbox)
+        self.canvas.flush_events()
+        if self.cnt == 50000:
+            # just so we don't get carried away
+            print("...and you've been playing for too long!!!")
+            plt.close()
+
+        self.cnt += 1
+
+    def on_key_press(self, event):
+        if event.key == '3':
+            self.res *= 5.0
+        if event.key == '4':
+            self.res /= 5.0
+
+        if event.key == 'e':
+            self.pads[0].y += .1
+            if self.pads[0].y > 1 - .3:
+                self.pads[0].y = 1 - .3
+        if event.key == 'd':
+            self.pads[0].y -= .1
+            if self.pads[0].y < -1:
+                self.pads[0].y = -1
+
+        if event.key == 'i':
+            self.pads[1].y += .1
+            if self.pads[1].y > 1 - .3:
+                self.pads[1].y = 1 - .3
+        if event.key == 'k':
+            self.pads[1].y -= .1
+            if self.pads[1].y < -1:
+                self.pads[1].y = -1
+
+        if event.key == 'a':
+            self.pucks.append(Puck(self.puckdisp,
+                                   self.pads[randint(2)],
+                                   self.ax.bbox))
+        if event.key == 'A' and len(self.pucks):
+            self.pucks.pop()
+        if event.key == ' ' and len(self.pucks):
+            self.pucks[0]._reset(self.pads[randint(2)])
+        if event.key == '1':
+            for p in self.pucks:
+                p._slower()
+        if event.key == '2':
+            for p in self.pucks:
+                p._faster()
+
+        if event.key == 'n':
+            self.distract = not self.distract
+
+        if event.key == 'g':
+            self.on = not self.on
+        if event.key == 't':
+            self.inst = not self.inst
+            self.i.set_visible(not self.i.get_visible())
+            self.background = None
+            self.canvas.draw_idle()
+        if event.key == 'q':
+            plt.close()
 
 
 fig, ax = plt.subplots()
 canvas = ax.figure.canvas
-animation = pipong.Game(ax)
+animation = Game(ax)
 
 # disable the default key bindings
 if fig.canvas.manager.key_press_handler_id is not None:
@@ -35,10 +316,7 @@ def on_redraw(event):
 def start_anim(event):
     canvas.mpl_disconnect(start_anim.cid)
 
-    def local_draw():
-        if animation.ax.get_renderer_cache():
-            animation.draw(None)
-    start_anim.timer.add_callback(local_draw)
+    start_anim.timer.add_callback(animation.draw)
     start_anim.timer.start()
     canvas.mpl_connect('draw_event', on_redraw)
 
diff --git a/examples/event_handling/resample.py b/examples/event_handling/resample.py
index 542e84f13c71..30d61debbbf9 100644
--- a/examples/event_handling/resample.py
+++ b/examples/event_handling/resample.py
@@ -6,6 +6,14 @@
 Downsampling lowers the sample rate or sample size of a signal. In
 this tutorial, the signal is downsampled when the plot is adjusted
 through dragging and zooming.
+
+.. note::
+    This example exercises the interactive capabilities of Matplotlib, and this
+    will not appear in the static documentation. Please run this code on your
+    machine to see the interactivity.
+
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
 
 import numpy as np
diff --git a/examples/event_handling/timers.py b/examples/event_handling/timers.py
index 4db7fe40bdc3..43330097cf87 100644
--- a/examples/event_handling/timers.py
+++ b/examples/event_handling/timers.py
@@ -5,6 +5,14 @@
 
 Simple example of using general timer objects. This is used to update
 the time placed in the title of the figure.
+
+.. note::
+    This example exercises the interactive capabilities of Matplotlib, and this
+    will not appear in the static documentation. Please run this code on your
+    machine to see the interactivity.
+
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
 import matplotlib.pyplot as plt
 import numpy as np
@@ -26,10 +34,10 @@ def update_title(axes):
 timer.add_callback(update_title, ax)
 timer.start()
 
-# Or could start the timer on first figure draw
-#def start_timer(event):
-#    timer.start()
-#    fig.canvas.mpl_disconnect(drawid)
-#drawid = fig.canvas.mpl_connect('draw_event', start_timer)
+# Or could start the timer on first figure draw:
+# def start_timer(event):
+#     timer.start()
+#     fig.canvas.mpl_disconnect(drawid)
+# drawid = fig.canvas.mpl_connect('draw_event', start_timer)
 
 plt.show()
diff --git a/examples/event_handling/trifinder_event_demo.py b/examples/event_handling/trifinder_event_demo.py
index 6678003ab189..991c5c9a3a82 100644
--- a/examples/event_handling/trifinder_event_demo.py
+++ b/examples/event_handling/trifinder_event_demo.py
@@ -6,6 +6,14 @@
 Example showing the use of a TriFinder object.  As the mouse is moved over the
 triangulation, the triangle under the cursor is highlighted and the index of
 the triangle is displayed in the plot title.
+
+.. note::
+    This example exercises the interactive capabilities of Matplotlib, and this
+    will not appear in the static documentation. Please run this code on your
+    machine to see the interactivity.
+
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
 import matplotlib.pyplot as plt
 from matplotlib.tri import Triangulation
diff --git a/examples/event_handling/viewlims.py b/examples/event_handling/viewlims.py
index d6bdf99787d3..134419300a68 100644
--- a/examples/event_handling/viewlims.py
+++ b/examples/event_handling/viewlims.py
@@ -5,6 +5,14 @@
 
 Creates two identical panels.  Zooming in on the right panel will show
 a rectangle in the first panel, denoting the zoomed region.
+
+.. note::
+    This example exercises the interactive capabilities of Matplotlib, and this
+    will not appear in the static documentation. Please run this code on your
+    machine to see the interactivity.
+
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/examples/event_handling/zoom_window.py b/examples/event_handling/zoom_window.py
index 9afe60ce935c..c10cd820aa47 100644
--- a/examples/event_handling/zoom_window.py
+++ b/examples/event_handling/zoom_window.py
@@ -12,6 +12,14 @@
 
 Note the diameter of the circles in the scatter are defined in points**2, so
 their size is independent of the zoom.
+
+.. note::
+    This example exercises the interactive capabilities of Matplotlib, and this
+    will not appear in the static documentation. Please run this code on your
+    machine to see the interactivity.
+
+    You can copy and paste individual parts, or download the entire example
+    using the link at the bottom of the page.
 """
 
 import matplotlib.pyplot as plt
@@ -21,8 +29,8 @@
 # Fixing random state for reproducibility
 np.random.seed(19680801)
 
-figsrc, axsrc = plt.subplots()
-figzoom, axzoom = plt.subplots()
+figsrc, axsrc = plt.subplots(figsize=(3.7, 3.7))
+figzoom, axzoom = plt.subplots(figsize=(3.7, 3.7))
 axsrc.set(xlim=(0, 1), ylim=(0, 1), autoscale_on=False,
           title='Click to zoom')
 axzoom.set(xlim=(0.45, 0.55), ylim=(0.4, 0.6), autoscale_on=False,
diff --git a/examples/frontpage/3D.py b/examples/frontpage/3D.py
deleted file mode 100644
index 49ebcc008923..000000000000
--- a/examples/frontpage/3D.py
+++ /dev/null
@@ -1,36 +0,0 @@
-"""
-====================
-Frontpage 3D example
-====================
-
-This example reproduces the frontpage 3D example.
-"""
-
-from matplotlib import cbook
-from matplotlib import cm
-from matplotlib.colors import LightSource
-import matplotlib.pyplot as plt
-import numpy as np
-
-dem = cbook.get_sample_data('jacksboro_fault_dem.npz', np_load=True)
-z = dem['elevation']
-nrows, ncols = z.shape
-x = np.linspace(dem['xmin'], dem['xmax'], ncols)
-y = np.linspace(dem['ymin'], dem['ymax'], nrows)
-x, y = np.meshgrid(x, y)
-
-region = np.s_[5:50, 5:50]
-x, y, z = x[region], y[region], z[region]
-
-fig, ax = plt.subplots(subplot_kw=dict(projection='3d'))
-
-ls = LightSource(270, 45)
-# To use a custom hillshading mode, override the built-in shading and pass
-# in the rgb colors of the shaded surface calculated from "shade".
-rgb = ls.shade(z, cmap=cm.gist_earth, vert_exag=0.1, blend_mode='soft')
-surf = ax.plot_surface(x, y, z, rstride=1, cstride=1, facecolors=rgb,
-                       linewidth=0, antialiased=False, shade=False)
-ax.set_xticks([])
-ax.set_yticks([])
-ax.set_zticks([])
-fig.savefig("surface3d_frontpage.png", dpi=25)  # results in 160x120 px image
diff --git a/examples/frontpage/README.txt b/examples/frontpage/README.txt
deleted file mode 100644
index 1f70a8a9fda2..000000000000
--- a/examples/frontpage/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-.. _front_page_examples:
-
-Front Page
-==========
diff --git a/examples/frontpage/contour.py b/examples/frontpage/contour.py
deleted file mode 100644
index ddb0721c1203..000000000000
--- a/examples/frontpage/contour.py
+++ /dev/null
@@ -1,34 +0,0 @@
-"""
-=========================
-Frontpage contour example
-=========================
-
-This example reproduces the frontpage contour example.
-"""
-
-import matplotlib.pyplot as plt
-import numpy as np
-from matplotlib import cm
-
-extent = (-3, 3, -3, 3)
-
-delta = 0.5
-x = np.arange(-3.0, 4.001, delta)
-y = np.arange(-4.0, 3.001, delta)
-X, Y = np.meshgrid(x, y)
-Z1 = np.exp(-X**2 - Y**2)
-Z2 = np.exp(-(X - 1)**2 - (Y - 1)**2)
-Z = Z1 - Z2
-
-norm = cm.colors.Normalize(vmax=abs(Z).max(), vmin=-abs(Z).max())
-
-fig, ax = plt.subplots()
-cset1 = ax.contourf(
-    X, Y, Z, 40,
-    norm=norm)
-ax.set_xlim(-2, 2)
-ax.set_ylim(-2, 2)
-ax.set_xticks([])
-ax.set_yticks([])
-fig.savefig("contour_frontpage.png", dpi=25)  # results in 160x120 px image
-plt.show()
diff --git a/examples/frontpage/histogram.py b/examples/frontpage/histogram.py
deleted file mode 100644
index a0938bdb8916..000000000000
--- a/examples/frontpage/histogram.py
+++ /dev/null
@@ -1,22 +0,0 @@
-"""
-===========================
-Frontpage histogram example
-===========================
-
-This example reproduces the frontpage histogram example.
-"""
-
-import matplotlib.pyplot as plt
-import numpy as np
-
-
-random_state = np.random.RandomState(19680801)
-X = random_state.randn(10000)
-
-fig, ax = plt.subplots()
-ax.hist(X, bins=25, density=True)
-x = np.linspace(-5, 5, 1000)
-ax.plot(x, 1 / np.sqrt(2*np.pi) * np.exp(-(x**2)/2), linewidth=4)
-ax.set_xticks([])
-ax.set_yticks([])
-fig.savefig("histogram_frontpage.png", dpi=25)  # results in 160x120 px image
diff --git a/examples/frontpage/membrane.py b/examples/frontpage/membrane.py
deleted file mode 100644
index 4e126eceda5f..000000000000
--- a/examples/frontpage/membrane.py
+++ /dev/null
@@ -1,24 +0,0 @@
-"""
-======================
-Frontpage plot example
-======================
-
-This example reproduces the frontpage simple plot example.
-"""
-
-import matplotlib.pyplot as plt
-import matplotlib.cbook as cbook
-import numpy as np
-
-
-with cbook.get_sample_data('membrane.dat') as datafile:
-    x = np.fromfile(datafile, np.float32)
-# 0.0005 is the sample interval
-
-fig, ax = plt.subplots()
-ax.plot(x, linewidth=4)
-ax.set_xlim(5000, 6000)
-ax.set_ylim(-0.6, 0.1)
-ax.set_xticks([])
-ax.set_yticks([])
-fig.savefig("membrane_frontpage.png", dpi=25)  # results in 160x120 px image
diff --git a/examples/images_contours_and_fields/affine_image.py b/examples/images_contours_and_fields/affine_image.py
index 8a3a78e2fee6..4b131d95588e 100644
--- a/examples/images_contours_and_fields/affine_image.py
+++ b/examples/images_contours_and_fields/affine_image.py
@@ -66,15 +66,10 @@ def do_plot(ax, Z, transform):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.imshow
-matplotlib.pyplot.imshow
-matplotlib.transforms.Affine2D
+#    - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow`
+#    - `matplotlib.transforms.Affine2D`
diff --git a/examples/images_contours_and_fields/barb_demo.py b/examples/images_contours_and_fields/barb_demo.py
index 04bf151e6814..4530dc813b3d 100644
--- a/examples/images_contours_and_fields/barb_demo.py
+++ b/examples/images_contours_and_fields/barb_demo.py
@@ -47,6 +47,7 @@
 masked_u[4] = 1000  # Bad value that should not be plotted when masked
 masked_u[4] = np.ma.masked
 
+#############################################################################
 # Identical plot to panel 2 in the first figure, but with the point at
 # (0.5, 0.25) missing (masked)
 fig2, ax2 = plt.subplots()
@@ -56,14 +57,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.barbs
-matplotlib.pyplot.barbs
+#    - `matplotlib.axes.Axes.barbs` / `matplotlib.pyplot.barbs`
diff --git a/examples/images_contours_and_fields/barcode_demo.py b/examples/images_contours_and_fields/barcode_demo.py
index de00656cf67e..20fec531c097 100644
--- a/examples/images_contours_and_fields/barcode_demo.py
+++ b/examples/images_contours_and_fields/barcode_demo.py
@@ -39,15 +39,10 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.imshow
-matplotlib.pyplot.imshow
-matplotlib.figure.Figure.add_axes
+#    - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow`
+#    - `matplotlib.figure.Figure.add_axes`
diff --git a/examples/images_contours_and_fields/colormap_interactive_adjustment.py b/examples/images_contours_and_fields/colormap_interactive_adjustment.py
new file mode 100644
index 000000000000..3ab9074fd1b6
--- /dev/null
+++ b/examples/images_contours_and_fields/colormap_interactive_adjustment.py
@@ -0,0 +1,33 @@
+"""
+========================================
+Interactive Adjustment of Colormap Range
+========================================
+
+Demonstration of how a colorbar can be used to interactively adjust the
+range of colormapping on an image. To use the interactive feature, you must
+be in either zoom mode (magnifying glass toolbar button) or
+pan mode (4-way arrow toolbar button) and click inside the colorbar.
+
+When zooming, the bounding box of the zoom region defines the new vmin and
+vmax of the norm. Zooming using the right mouse button will expand the
+vmin and vmax proportionally to the selected region, in the same manner that
+one can zoom out on an axis. When panning, the vmin and vmax of the norm are
+both shifted according to the direction of movement. The
+Home/Back/Forward buttons can also be used to get back to a previous state.
+
+.. redirect-from:: /gallery/userdemo/colormap_interactive_adjustment
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+t = np.linspace(0, 2 * np.pi, 1024)
+data2d = np.sin(t)[:, np.newaxis] * np.cos(t)[np.newaxis, :]
+
+fig, ax = plt.subplots()
+im = ax.imshow(data2d)
+ax.set_title('Pan on the colorbar to shift the color mapping\n'
+             'Zoom on the colorbar to scale the color mapping')
+
+fig.colorbar(im, ax=ax, label='Interactive colorbar')
+
+plt.show()
diff --git a/examples/userdemo/colormap_normalizations.py b/examples/images_contours_and_fields/colormap_normalizations.py
similarity index 98%
rename from examples/userdemo/colormap_normalizations.py
rename to examples/images_contours_and_fields/colormap_normalizations.py
index febccf35a449..ecb15d842a10 100644
--- a/examples/userdemo/colormap_normalizations.py
+++ b/examples/images_contours_and_fields/colormap_normalizations.py
@@ -4,6 +4,8 @@
 =======================
 
 Demonstration of using norm to map colormaps onto data in non-linear ways.
+
+.. redirect-from:: /gallery/userdemo/colormap_normalizations
 """
 
 import numpy as np
diff --git a/examples/images_contours_and_fields/colormap_normalizations_symlognorm.py b/examples/images_contours_and_fields/colormap_normalizations_symlognorm.py
new file mode 100644
index 000000000000..42a3878143d3
--- /dev/null
+++ b/examples/images_contours_and_fields/colormap_normalizations_symlognorm.py
@@ -0,0 +1,84 @@
+"""
+==================================
+Colormap Normalizations SymLogNorm
+==================================
+
+Demonstration of using norm to map colormaps onto data in non-linear ways.
+
+.. redirect-from:: /gallery/userdemo/colormap_normalization_symlognorm
+"""
+
+###############################################################################
+# Synthetic dataset consisting of two humps, one negative and one positive,
+# the positive with 8-times the amplitude.
+# Linearly, the negative hump is almost invisible,
+# and it is very difficult to see any detail of its profile.
+# With the logarithmic scaling applied to both positive and negative values,
+# it is much easier to see the shape of each hump.
+#
+# See `~.colors.SymLogNorm`.
+
+import numpy as np
+import matplotlib.pyplot as plt
+import matplotlib.colors as colors
+
+
+def rbf(x, y):
+    return 1.0 / (1 + 5 * ((x ** 2) + (y ** 2)))
+
+N = 200
+gain = 8
+X, Y = np.mgrid[-3:3:complex(0, N), -2:2:complex(0, N)]
+Z1 = rbf(X + 0.5, Y + 0.5)
+Z2 = rbf(X - 0.5, Y - 0.5)
+Z = gain * Z1 - Z2
+
+shadeopts = {'cmap': 'PRGn', 'shading': 'gouraud'}
+colormap = 'PRGn'
+lnrwidth = 0.5
+
+fig, ax = plt.subplots(2, 1, sharex=True, sharey=True)
+
+pcm = ax[0].pcolormesh(X, Y, Z,
+                       norm=colors.SymLogNorm(linthresh=lnrwidth, linscale=1,
+                                              vmin=-gain, vmax=gain, base=10),
+                       **shadeopts)
+fig.colorbar(pcm, ax=ax[0], extend='both')
+ax[0].text(-2.5, 1.5, 'symlog')
+
+pcm = ax[1].pcolormesh(X, Y, Z, vmin=-gain, vmax=gain,
+                       **shadeopts)
+fig.colorbar(pcm, ax=ax[1], extend='both')
+ax[1].text(-2.5, 1.5, 'linear')
+
+
+###############################################################################
+# In order to find the best visualization for any particular dataset,
+# it may be necessary to experiment with multiple different color scales.
+# As well as the `~.colors.SymLogNorm` scaling, there is also
+# the option of using `~.colors.AsinhNorm` (experimental), which has a smoother
+# transition between the linear and logarithmic regions of the transformation
+# applied to the data values, "Z".
+# In the plots below, it may be possible to see contour-like artifacts
+# around each hump despite there being no sharp features
+# in the dataset itself. The ``asinh`` scaling shows a smoother shading
+# of each hump.
+
+fig, ax = plt.subplots(2, 1, sharex=True, sharey=True)
+
+pcm = ax[0].pcolormesh(X, Y, Z,
+                       norm=colors.SymLogNorm(linthresh=lnrwidth, linscale=1,
+                                              vmin=-gain, vmax=gain, base=10),
+                       **shadeopts)
+fig.colorbar(pcm, ax=ax[0], extend='both')
+ax[0].text(-2.5, 1.5, 'symlog')
+
+pcm = ax[1].pcolormesh(X, Y, Z,
+                       norm=colors.AsinhNorm(linear_width=lnrwidth,
+                                             vmin=-gain, vmax=gain),
+                       **shadeopts)
+fig.colorbar(pcm, ax=ax[1], extend='both')
+ax[1].text(-2.5, 1.5, 'asinh')
+
+
+plt.show()
diff --git a/examples/images_contours_and_fields/contour_corner_mask.py b/examples/images_contours_and_fields/contour_corner_mask.py
index 0482945d552b..280231acb950 100644
--- a/examples/images_contours_and_fields/contour_corner_mask.py
+++ b/examples/images_contours_and_fields/contour_corner_mask.py
@@ -39,16 +39,10 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.contour
-matplotlib.pyplot.contour
-matplotlib.axes.Axes.contourf
-matplotlib.pyplot.contourf
+#    - `matplotlib.axes.Axes.contour` / `matplotlib.pyplot.contour`
+#    - `matplotlib.axes.Axes.contourf` / `matplotlib.pyplot.contourf`
diff --git a/examples/images_contours_and_fields/contour_demo.py b/examples/images_contours_and_fields/contour_demo.py
index 2c9881c83fe1..266acccf2409 100644
--- a/examples/images_contours_and_fields/contour_demo.py
+++ b/examples/images_contours_and_fields/contour_demo.py
@@ -10,7 +10,6 @@
 </gallery/images_contours_and_fields/contour_image>`.
 """
 
-import matplotlib
 import numpy as np
 import matplotlib.cm as cm
 import matplotlib.pyplot as plt
@@ -57,7 +56,7 @@
 ###############################################################################
 # You can set negative contours to be solid instead of dashed:
 
-matplotlib.rcParams['contour.negative_linestyle'] = 'solid'
+plt.rcParams['contour.negative_linestyle'] = 'solid'
 fig, ax = plt.subplots()
 CS = ax.contour(X, Y, Z, 6, colors='k')  # Negative contours default to dashed.
 ax.clabel(CS, fontsize=9, inline=True)
@@ -86,8 +85,7 @@
                 linewidths=2, extent=(-3, 3, -2, 2))
 
 # Thicken the zero contour.
-zc = CS.collections[6]
-plt.setp(zc, linewidth=4)
+CS.collections[6].set_linewidth(4)
 
 ax.clabel(CS, levels[1::2],  # label every second level
           inline=True, fmt='%1.1f', fontsize=14)
@@ -111,20 +109,13 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.contour
-matplotlib.pyplot.contour
-matplotlib.figure.Figure.colorbar
-matplotlib.pyplot.colorbar
-matplotlib.axes.Axes.clabel
-matplotlib.pyplot.clabel
-matplotlib.axes.Axes.set_position
-matplotlib.axes.Axes.get_position
+#    - `matplotlib.axes.Axes.contour` / `matplotlib.pyplot.contour`
+#    - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar`
+#    - `matplotlib.axes.Axes.clabel` / `matplotlib.pyplot.clabel`
+#    - `matplotlib.axes.Axes.get_position`
+#    - `matplotlib.axes.Axes.set_position`
diff --git a/examples/images_contours_and_fields/contour_image.py b/examples/images_contours_and_fields/contour_image.py
index cca7ea6da6a4..a2a07f20f273 100644
--- a/examples/images_contours_and_fields/contour_image.py
+++ b/examples/images_contours_and_fields/contour_image.py
@@ -41,7 +41,7 @@
 axs = _axs.flatten()
 
 cset1 = axs[0].contourf(X, Y, Z, levels, norm=norm,
-                        cmap=cm.get_cmap(cmap, len(levels) - 1))
+                        cmap=cmap.resampled(len(levels) - 1))
 # It is not necessary, but for the colormap, we need only the
 # number of levels minus 1.  To avoid discretization error, use
 # either this number or a large number such as the default (256).
@@ -97,19 +97,12 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.contour
-matplotlib.pyplot.contour
-matplotlib.axes.Axes.imshow
-matplotlib.pyplot.imshow
-matplotlib.figure.Figure.colorbar
-matplotlib.pyplot.colorbar
-matplotlib.colors.Normalize
+#    - `matplotlib.axes.Axes.contour` / `matplotlib.pyplot.contour`
+#    - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow`
+#    - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar`
+#    - `matplotlib.colors.Normalize`
diff --git a/examples/images_contours_and_fields/contour_label_demo.py b/examples/images_contours_and_fields/contour_label_demo.py
index 733a17be48b9..0ea3d3694ca1 100644
--- a/examples/images_contours_and_fields/contour_label_demo.py
+++ b/examples/images_contours_and_fields/contour_label_demo.py
@@ -10,7 +10,6 @@
 </gallery/images_contours_and_fields/contour_demo>`.
 """
 
-import matplotlib
 import numpy as np
 import matplotlib.ticker as ticker
 import matplotlib.pyplot as plt
@@ -76,17 +75,12 @@ def fmt(x):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-matplotlib.axes.Axes.contour
-matplotlib.pyplot.contour
-matplotlib.axes.Axes.clabel
-matplotlib.pyplot.clabel
-matplotlib.ticker.LogFormatterMathtext
-matplotlib.ticker.TickHelper.create_dummy_axis
+#    - `matplotlib.axes.Axes.contour` / `matplotlib.pyplot.contour`
+#    - `matplotlib.axes.Axes.clabel` / `matplotlib.pyplot.clabel`
+#    - `matplotlib.ticker.LogFormatterMathtext`
+#    - `matplotlib.ticker.TickHelper.create_dummy_axis`
diff --git a/examples/images_contours_and_fields/contourf_demo.py b/examples/images_contours_and_fields/contourf_demo.py
index 68e540e34e9b..e51e2e6001dd 100644
--- a/examples/images_contours_and_fields/contourf_demo.py
+++ b/examples/images_contours_and_fields/contourf_demo.py
@@ -33,18 +33,20 @@
 interior = np.sqrt(X**2 + Y**2) < 0.5
 Z[interior] = np.ma.masked
 
-# We are using automatic selection of contour levels;
-# this is usually not such a good idea, because they don't
-# occur on nice boundaries, but we do it here for purposes
-# of illustration.
+#############################################################################
+# Automatic contour levels
+# ------------------------
+# We are using automatic selection of contour levels; this is usually not such
+# a good idea, because they don't occur on nice boundaries, but we do it here
+# for purposes of illustration.
 
 fig1, ax2 = plt.subplots(constrained_layout=True)
 CS = ax2.contourf(X, Y, Z, 10, cmap=plt.cm.bone, origin=origin)
 
-# Note that in the following, we explicitly pass in a subset of
-# the contour levels used for the filled contours.  Alternatively,
-# We could pass in additional levels to provide extra resolution,
-# or leave out the levels kwarg to use all of the original levels.
+# Note that in the following, we explicitly pass in a subset of the contour
+# levels used for the filled contours.  Alternatively, we could pass in
+# additional levels to provide extra resolution, or leave out the *levels*
+# keyword argument to use all of the original levels.
 
 CS2 = ax2.contour(CS, levels=CS.levels[::2], colors='r', origin=origin)
 
@@ -58,10 +60,13 @@
 # Add the contour line levels to the colorbar
 cbar.add_lines(CS2)
 
+#############################################################################
+# Explicit contour levels
+# -----------------------
+# Now make a contour plot with the levels specified, and with the colormap
+# generated automatically from a list of colors.
+
 fig2, ax2 = plt.subplots(constrained_layout=True)
-# Now make a contour plot with the levels specified,
-# and with the colormap generated automatically from a list
-# of colors.
 levels = [-1.5, -1, -0.5, 0, 0.5, 1]
 CS3 = ax2.contourf(X, Y, Z, levels,
                    colors=('r', 'g', 'b'),
@@ -84,10 +89,12 @@
 # needs from the ContourSet object, CS3.
 fig2.colorbar(CS3)
 
+#############################################################################
+# Extension settings
+# ------------------
 # Illustrate all 4 possible "extend" settings:
 extends = ["neither", "both", "min", "max"]
-cmap = plt.cm.get_cmap("winter")
-cmap = cmap.with_extremes(under="magenta", over="yellow")
+cmap = plt.colormaps["winter"].with_extremes(under="magenta", over="yellow")
 # Note: contouring simply excludes masked or nan regions, so
 # instead of using the "bad" colormap value for them, it draws
 # nothing at all in them.  Therefore the following would have
@@ -96,7 +103,7 @@
 
 fig, axs = plt.subplots(2, 2, constrained_layout=True)
 
-for ax, extend in zip(axs.ravel(), extends):
+for ax, extend in zip(axs.flat, extends):
     cs = ax.contourf(X, Y, Z, levels, cmap=cmap, extend=extend, origin=origin)
     fig.colorbar(cs, ax=ax, shrink=0.9)
     ax.set_title("extend = %s" % extend)
@@ -106,24 +113,16 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.contour
-matplotlib.pyplot.contour
-matplotlib.axes.Axes.contourf
-matplotlib.pyplot.contourf
-matplotlib.axes.Axes.clabel
-matplotlib.pyplot.clabel
-matplotlib.figure.Figure.colorbar
-matplotlib.pyplot.colorbar
-matplotlib.colors.Colormap
-matplotlib.colors.Colormap.set_bad
-matplotlib.colors.Colormap.set_under
-matplotlib.colors.Colormap.set_over
+#    - `matplotlib.axes.Axes.contour` / `matplotlib.pyplot.contour`
+#    - `matplotlib.axes.Axes.contourf` / `matplotlib.pyplot.contourf`
+#    - `matplotlib.axes.Axes.clabel` / `matplotlib.pyplot.clabel`
+#    - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar`
+#    - `matplotlib.colors.Colormap`
+#    - `matplotlib.colors.Colormap.set_bad`
+#    - `matplotlib.colors.Colormap.set_under`
+#    - `matplotlib.colors.Colormap.set_over`
diff --git a/examples/images_contours_and_fields/contourf_hatching.py b/examples/images_contours_and_fields/contourf_hatching.py
index 1711556db70a..10b4698eadc9 100644
--- a/examples/images_contours_and_fields/contourf_hatching.py
+++ b/examples/images_contours_and_fields/contourf_hatching.py
@@ -42,22 +42,14 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.contour
-matplotlib.pyplot.contour
-matplotlib.axes.Axes.contourf
-matplotlib.pyplot.contourf
-matplotlib.figure.Figure.colorbar
-matplotlib.pyplot.colorbar
-matplotlib.axes.Axes.legend
-matplotlib.pyplot.legend
-matplotlib.contour.ContourSet
-matplotlib.contour.ContourSet.legend_elements
+#    - `matplotlib.axes.Axes.contour` / `matplotlib.pyplot.contour`
+#    - `matplotlib.axes.Axes.contourf` / `matplotlib.pyplot.contourf`
+#    - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar`
+#    - `matplotlib.axes.Axes.legend` / `matplotlib.pyplot.legend`
+#    - `matplotlib.contour.ContourSet`
+#    - `matplotlib.contour.ContourSet.legend_elements`
diff --git a/examples/images_contours_and_fields/contourf_log.py b/examples/images_contours_and_fields/contourf_log.py
index 813282249cd9..2f3976207b72 100644
--- a/examples/images_contours_and_fields/contourf_log.py
+++ b/examples/images_contours_and_fields/contourf_log.py
@@ -50,19 +50,12 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.contourf
-matplotlib.pyplot.contourf
-matplotlib.figure.Figure.colorbar
-matplotlib.pyplot.colorbar
-matplotlib.axes.Axes.legend
-matplotlib.pyplot.legend
-matplotlib.ticker.LogLocator
+#    - `matplotlib.axes.Axes.contourf` / `matplotlib.pyplot.contourf`
+#    - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar`
+#    - `matplotlib.axes.Axes.legend` / `matplotlib.pyplot.legend`
+#    - `matplotlib.ticker.LogLocator`
diff --git a/examples/images_contours_and_fields/demo_bboximage.py b/examples/images_contours_and_fields/demo_bboximage.py
index 15f38f7bcd95..0d43e328cb38 100644
--- a/examples/images_contours_and_fields/demo_bboximage.py
+++ b/examples/images_contours_and_fields/demo_bboximage.py
@@ -38,18 +38,18 @@
 a = np.vstack((a, a))
 
 # List of all colormaps; skip reversed colormaps.
-maps = sorted(m for m in plt.colormaps() if not m.endswith("_r"))
+cmap_names = sorted(m for m in plt.colormaps if not m.endswith("_r"))
 
 ncol = 2
-nrow = len(maps)//ncol + 1
+nrow = len(cmap_names) // ncol + 1
 
 xpad_fraction = 0.3
-dx = 1./(ncol + xpad_fraction*(ncol - 1))
+dx = 1 / (ncol + xpad_fraction * (ncol - 1))
 
 ypad_fraction = 0.3
-dy = 1./(nrow + ypad_fraction*(nrow - 1))
+dy = 1 / (nrow + ypad_fraction * (nrow - 1))
 
-for i, m in enumerate(maps):
+for i, cmap_name in enumerate(cmap_names):
     ix, iy = divmod(i, nrow)
 
     bbox0 = Bbox.from_bounds(ix*dx*(1 + xpad_fraction),
@@ -58,7 +58,7 @@
     bbox = TransformedBbox(bbox0, ax2.transAxes)
 
     bbox_image = BboxImage(bbox,
-                           cmap=plt.get_cmap(m),
+                           cmap=cmap_name,
                            norm=None,
                            origin=None,
                            **kwargs
@@ -71,16 +71,12 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.image.BboxImage
-matplotlib.transforms.Bbox
-matplotlib.transforms.TransformedBbox
-matplotlib.text.Text
+#    - `matplotlib.image.BboxImage`
+#    - `matplotlib.transforms.Bbox`
+#    - `matplotlib.transforms.TransformedBbox`
+#    - `matplotlib.text.Text`
diff --git a/examples/images_contours_and_fields/figimage_demo.py b/examples/images_contours_and_fields/figimage_demo.py
index ef805576cae0..1b1f1b19d694 100644
--- a/examples/images_contours_and_fields/figimage_demo.py
+++ b/examples/images_contours_and_fields/figimage_demo.py
@@ -7,7 +7,6 @@
 
 """
 import numpy as np
-import matplotlib
 import matplotlib.pyplot as plt
 
 
@@ -22,14 +21,10 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-matplotlib.figure.Figure
-matplotlib.figure.Figure.figimage
-matplotlib.pyplot.figimage
+#    - `matplotlib.figure.Figure`
+#    - `matplotlib.figure.Figure.figimage` / `matplotlib.pyplot.figimage`
diff --git a/examples/images_contours_and_fields/image_annotated_heatmap.py b/examples/images_contours_and_fields/image_annotated_heatmap.py
index 76e6f60a51e0..16054d145ea5 100644
--- a/examples/images_contours_and_fields/image_annotated_heatmap.py
+++ b/examples/images_contours_and_fields/image_annotated_heatmap.py
@@ -39,6 +39,7 @@
 
 import numpy as np
 import matplotlib
+import matplotlib as mpl
 import matplotlib.pyplot as plt
 # sphinx_gallery_thumbnail_number = 2
 
@@ -59,12 +60,9 @@
 fig, ax = plt.subplots()
 im = ax.imshow(harvest)
 
-# We want to show all ticks...
-ax.set_xticks(np.arange(len(farmers)))
-ax.set_yticks(np.arange(len(vegetables)))
-# ... and label them with the respective list entries
-ax.set_xticklabels(farmers)
-ax.set_yticklabels(vegetables)
+# Show all ticks and label them with the respective list entries
+ax.set_xticks(np.arange(len(farmers)), labels=farmers)
+ax.set_yticks(np.arange(len(vegetables)), labels=vegetables)
 
 # Rotate the tick labels and set their alignment.
 plt.setp(ax.get_xticklabels(), rotation=45, ha="right",
@@ -100,18 +98,18 @@
 
 
 def heatmap(data, row_labels, col_labels, ax=None,
-            cbar_kw={}, cbarlabel="", **kwargs):
+            cbar_kw=None, cbarlabel="", **kwargs):
     """
     Create a heatmap from a numpy array and two lists of labels.
 
     Parameters
     ----------
     data
-        A 2D numpy array of shape (N, M).
+        A 2D numpy array of shape (M, N).
     row_labels
-        A list or array of length N with the labels for the rows.
+        A list or array of length M with the labels for the rows.
     col_labels
-        A list or array of length M with the labels for the columns.
+        A list or array of length N with the labels for the columns.
     ax
         A `matplotlib.axes.Axes` instance to which the heatmap is plotted.  If
         not provided, use current axes or create a new one.  Optional.
@@ -123,9 +121,12 @@ def heatmap(data, row_labels, col_labels, ax=None,
         All other arguments are forwarded to `imshow`.
     """
 
-    if not ax:
+    if ax is None:
         ax = plt.gca()
 
+    if cbar_kw is None:
+        cbar_kw = {}
+
     # Plot the heatmap
     im = ax.imshow(data, **kwargs)
 
@@ -133,12 +134,9 @@ def heatmap(data, row_labels, col_labels, ax=None,
     cbar = ax.figure.colorbar(im, ax=ax, **cbar_kw)
     cbar.ax.set_ylabel(cbarlabel, rotation=-90, va="bottom")
 
-    # We want to show all ticks...
-    ax.set_xticks(np.arange(data.shape[1]))
-    ax.set_yticks(np.arange(data.shape[0]))
-    # ... and label them with the respective list entries.
-    ax.set_xticklabels(col_labels)
-    ax.set_yticklabels(row_labels)
+    # Show all ticks and label them with the respective list entries.
+    ax.set_xticks(np.arange(data.shape[1]), labels=col_labels)
+    ax.set_yticks(np.arange(data.shape[0]), labels=row_labels)
 
     # Let the horizontal axes labeling appear on top.
     ax.tick_params(top=True, bottom=False,
@@ -275,7 +273,7 @@ def annotate_heatmap(im, data=None, valfmt="{x:.2f}",
 fmt = matplotlib.ticker.FuncFormatter(lambda x, pos: qrates[::-1][norm(x)])
 
 im, _ = heatmap(data, y, x, ax=ax3,
-                cmap=plt.get_cmap("PiYG", 7), norm=norm,
+                cmap=mpl.colormaps["PiYG"].resampled(7), norm=norm,
                 cbar_kw=dict(ticks=np.arange(-3, 4), format=fmt),
                 cbarlabel="Quality Rating")
 
@@ -305,15 +303,10 @@ def func(x, pos):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The usage of the following functions and methods is shown in this example:
-
-
-matplotlib.axes.Axes.imshow
-matplotlib.pyplot.imshow
-matplotlib.figure.Figure.colorbar
-matplotlib.pyplot.colorbar
+#    - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow`
+#    - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar`
diff --git a/examples/images_contours_and_fields/image_antialiasing.py b/examples/images_contours_and_fields/image_antialiasing.py
index 9fd2e3954e31..cb12bc3d9319 100644
--- a/examples/images_contours_and_fields/image_antialiasing.py
+++ b/examples/images_contours_and_fields/image_antialiasing.py
@@ -5,12 +5,21 @@
 
 Images are represented by discrete pixels, either on the screen or in an
 image file.  When data that makes up the image has a different resolution
-than its representation on the screen we will see aliasing effects.
+than its representation on the screen we will see aliasing effects.  How
+noticeable these are depends on how much down-sampling takes place in
+the change of resolution (if any).
 
-The default image interpolation in Matplotlib is 'antialiased'.  This uses a
-hanning interpolation for reduced aliasing in most situations. Only when there
-is upsampling by a factor of 1, 2 or >=3 is 'nearest' neighbor interpolation
-used.
+When subsampling data, aliasing is reduced by smoothing first and then
+subsampling the smoothed data.  In Matplotlib, we can do that
+smoothing before mapping the data to colors, or we can do the smoothing
+on the RGB(A) data in the final image.  The difference between these is
+shown below, and controlled with the *interpolation_stage* keyword argument.
+
+The default image interpolation in Matplotlib is 'antialiased', and
+it is applied to the data.  This uses a
+hanning interpolation on the data provided by the user for reduced aliasing
+in most situations. Only when there is upsampling by a factor of 1, 2 or
+>=3 is 'nearest' neighbor interpolation used.
 
 Other anti-aliasing filters can be specified in `.Axes.imshow` using the
 *interpolation* keyword argument.
@@ -20,26 +29,55 @@
 import matplotlib.pyplot as plt
 
 ###############################################################################
-# First we generate a 500x500 px image with varying frequency content:
-x = np.arange(500) / 500 - 0.5
-y = np.arange(500) / 500 - 0.5
+# First we generate a 450x450 pixel image with varying frequency content:
+N = 450
+x = np.arange(N) / N - 0.5
+y = np.arange(N) / N - 0.5
+aa = np.ones((N, N))
+aa[::2, :] = -1
 
 X, Y = np.meshgrid(x, y)
 R = np.sqrt(X**2 + Y**2)
-f0 = 10
-k = 250
+f0 = 5
+k = 100
 a = np.sin(np.pi * 2 * (f0 * R + k * R**2 / 2))
-
-
+# make the left hand side of this
+a[:int(N / 2), :][R[:int(N / 2), :] < 0.4] = -1
+a[:int(N / 2), :][R[:int(N / 2), :] < 0.3] = 1
+aa[:, int(N / 3):] = a[:, int(N / 3):]
+a = aa
 ###############################################################################
-# The following images are subsampled from 500 data pixels to 303 rendered
-# pixels. The Moire patterns in the 'nearest' interpolation are caused by the
-# high-frequency data being subsampled.  The 'antialiased' image
+# The following images are subsampled from 450 data pixels to either
+# 125 pixels or 250 pixels (depending on your display).
+# The Moire patterns in the 'nearest' interpolation are caused by the
+# high-frequency data being subsampled.  The 'antialiased' imaged
 # still has some Moire patterns as well, but they are greatly reduced.
-fig, axs = plt.subplots(1, 2, figsize=(7, 4), constrained_layout=True)
-for ax, interp in zip(axs, ['nearest', 'antialiased']):
-    ax.imshow(a, interpolation=interp, cmap='gray')
-    ax.set_title(f"interpolation='{interp}'")
+#
+# There are substantial differences between the 'data' interpolation and
+# the 'rgba' interpolation.  The alternating bands of red and blue on the
+# left third of the image are subsampled.  By interpolating in 'data' space
+# (the default) the antialiasing filter makes the stripes close to white,
+# because the average of -1 and +1 is zero, and zero is white in this
+# colormap.
+#
+# Conversely, when the anti-aliasing occurs in 'rgba' space, the red and
+# blue are combined visually to make purple.  This behaviour is more like a
+# typical image processing package, but note that purple is not in the
+# original colormap, so it is no longer possible to invert individual
+# pixels back to their data value.
+
+fig, axs = plt.subplots(2, 2, figsize=(5, 6), constrained_layout=True)
+axs[0, 0].imshow(a, interpolation='nearest', cmap='RdBu_r')
+axs[0, 0].set_xlim(100, 200)
+axs[0, 0].set_ylim(275, 175)
+axs[0, 0].set_title('Zoom')
+
+for ax, interp, space in zip(axs.flat[1:],
+                             ['nearest', 'antialiased', 'antialiased'],
+                             ['data', 'data', 'rgba']):
+    ax.imshow(a, interpolation=interp, interpolation_stage=space,
+              cmap='RdBu_r')
+    ax.set_title(f"interpolation='{interp}'\nspace='{space}'")
 plt.show()
 
 ###############################################################################
@@ -63,7 +101,7 @@
 plt.show()
 
 ###############################################################################
-# Apart from the default 'hanning' antialiasing  `~.Axes.imshow` supports a
+# Apart from the default 'hanning' antialiasing, `~.Axes.imshow` supports a
 # number of different interpolation algorithms, which may work better or
 # worse depending on the pattern.
 fig, axs = plt.subplots(1, 2, figsize=(7, 4), constrained_layout=True)
@@ -72,16 +110,11 @@
     ax.set_title(f"interpolation='{interp}'")
 plt.show()
 
-
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.imshow
+#    - `matplotlib.axes.Axes.imshow`
diff --git a/examples/images_contours_and_fields/image_clip_path.py b/examples/images_contours_and_fields/image_clip_path.py
index 3123be4138e0..f51dacb2a09e 100644
--- a/examples/images_contours_and_fields/image_clip_path.py
+++ b/examples/images_contours_and_fields/image_clip_path.py
@@ -23,15 +23,10 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.imshow
-matplotlib.pyplot.imshow
-matplotlib.artist.Artist.set_clip_path
+#    - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow`
+#    - `matplotlib.artist.Artist.set_clip_path`
diff --git a/examples/images_contours_and_fields/image_demo.py b/examples/images_contours_and_fields/image_demo.py
index d24169518ea1..c929d7869950 100644
--- a/examples/images_contours_and_fields/image_demo.py
+++ b/examples/images_contours_and_fields/image_demo.py
@@ -46,28 +46,27 @@
 with cbook.get_sample_data('grace_hopper.jpg') as image_file:
     image = plt.imread(image_file)
 
-fig, ax = plt.subplots()
-ax.imshow(image)
-ax.axis('off')  # clear x-axis and y-axis
-
-
-# And another image
-
-# Data are 256x256 16-bit integers.
+# And another image, using 256x256 16-bit integers.
 w, h = 256, 256
 with cbook.get_sample_data('s1045.ima.gz') as datafile:
     s = datafile.read()
 A = np.frombuffer(s, np.uint16).astype(float).reshape((w, h))
-
-fig, ax = plt.subplots()
 extent = (0, 25, 0, 25)
-im = ax.imshow(A, cmap=plt.cm.hot, origin='upper', extent=extent)
+
+fig, ax = plt.subplot_mosaic([
+    ['hopper', 'mri']
+], figsize=(7, 3.5))
+
+ax['hopper'].imshow(image)
+ax['hopper'].axis('off')  # clear x-axis and y-axis
+
+im = ax['mri'].imshow(A, cmap=plt.cm.hot, origin='upper', extent=extent)
 
 markers = [(15.9, 14.5), (16.8, 15)]
 x, y = zip(*markers)
-ax.plot(x, y, 'o')
+ax['mri'].plot(x, y, 'o')
 
-ax.set_title('MRI')
+ax['mri'].set_title('MRI')
 
 plt.show()
 
@@ -175,16 +174,11 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.imshow
-matplotlib.pyplot.imshow
-matplotlib.artist.Artist.set_clip_path
-matplotlib.patches.PathPatch
+#    - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow`
+#    - `matplotlib.artist.Artist.set_clip_path`
+#    - `matplotlib.patches.PathPatch`
diff --git a/examples/images_contours_and_fields/image_masked.py b/examples/images_contours_and_fields/image_masked.py
index fff125abda63..fa5f8047a8ff 100644
--- a/examples/images_contours_and_fields/image_masked.py
+++ b/examples/images_contours_and_fields/image_masked.py
@@ -50,8 +50,7 @@
 ax1.set_title('Green=low, Red=high, Blue=masked')
 cbar = fig.colorbar(im, extend='both', shrink=0.9, ax=ax1)
 cbar.set_label('uniform')
-for ticklabel in ax1.xaxis.get_ticklabels():
-    ticklabel.set_visible(False)
+ax1.tick_params(axis='x', labelbottom=False)
 
 # Plot using a small number of colors, with unevenly spaced boundaries.
 im = ax2.imshow(Zm, interpolation='nearest',
@@ -71,18 +70,12 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.imshow
-matplotlib.pyplot.imshow
-matplotlib.figure.Figure.colorbar
-matplotlib.pyplot.colorbar
-matplotlib.colors.BoundaryNorm
-matplotlib.colorbar.ColorbarBase.set_label
+#    - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow`
+#    - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar`
+#    - `matplotlib.colors.BoundaryNorm`
+#    - `matplotlib.colorbar.Colorbar.set_label`
diff --git a/examples/images_contours_and_fields/image_transparency_blend.py b/examples/images_contours_and_fields/image_transparency_blend.py
index 7de2b42fedde..48e0a28c89b1 100644
--- a/examples/images_contours_and_fields/image_transparency_blend.py
+++ b/examples/images_contours_and_fields/image_transparency_blend.py
@@ -113,18 +113,12 @@ def normal_pdf(x, mean, var):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.imshow
-matplotlib.pyplot.imshow
-matplotlib.axes.Axes.contour
-matplotlib.pyplot.contour
-matplotlib.colors.Normalize
-matplotlib.axes.Axes.set_axis_off
+#    - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow`
+#    - `matplotlib.axes.Axes.contour` / `matplotlib.pyplot.contour`
+#    - `matplotlib.colors.Normalize`
+#    - `matplotlib.axes.Axes.set_axis_off`
diff --git a/examples/images_contours_and_fields/image_zcoord.py b/examples/images_contours_and_fields/image_zcoord.py
index a97bff8a1583..7fc57ca10710 100644
--- a/examples/images_contours_and_fields/image_zcoord.py
+++ b/examples/images_contours_and_fields/image_zcoord.py
@@ -38,14 +38,10 @@ def format_coord(x, y):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.format_coord
-matplotlib.axes.Axes.imshow
+#    - `matplotlib.axes.Axes.format_coord`
+#    - `matplotlib.axes.Axes.imshow`
diff --git a/examples/images_contours_and_fields/interpolation_methods.py b/examples/images_contours_and_fields/interpolation_methods.py
index e392c476d098..4d3151696dcd 100644
--- a/examples/images_contours_and_fields/interpolation_methods.py
+++ b/examples/images_contours_and_fields/interpolation_methods.py
@@ -10,12 +10,12 @@
 If the interpolation is ``'none'``, then no interpolation is performed for the
 Agg, ps and pdf backends. Other backends will default to ``'antialiased'``.
 
-For the Agg, ps and pdf backends, ``interpolation = 'none'`` works well when a
-big image is scaled down, while ``interpolation = 'nearest'`` works well when
+For the Agg, ps and pdf backends, ``interpolation='none'`` works well when a
+big image is scaled down, while ``interpolation='nearest'`` works well when
 a small image is scaled up.
 
 See :doc:`/gallery/images_contours_and_fields/image_antialiasing` for a
-discussion on the default ``interpolation="antialiased"`` option.
+discussion on the default ``interpolation='antialiased'`` option.
 """
 
 import matplotlib.pyplot as plt
@@ -42,14 +42,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.imshow
-matplotlib.pyplot.imshow
+#    - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow`
diff --git a/examples/images_contours_and_fields/irregulardatagrid.py b/examples/images_contours_and_fields/irregulardatagrid.py
index d49a47ee06d9..aedf8033c9b4 100644
--- a/examples/images_contours_and_fields/irregulardatagrid.py
+++ b/examples/images_contours_and_fields/irregulardatagrid.py
@@ -52,8 +52,8 @@
 
 # Note that scipy.interpolate provides means to interpolate data on a grid
 # as well. The following would be an alternative to the four lines above:
-#from scipy.interpolate import griddata
-#zi = griddata((x, y), z, (xi[None, :], yi[:, None]), method='linear')
+# from scipy.interpolate import griddata
+# zi = griddata((x, y), z, (xi[None, :], yi[:, None]), method='linear')
 
 ax1.contour(xi, yi, zi, levels=14, linewidths=0.5, colors='k')
 cntr1 = ax1.contourf(xi, yi, zi, levels=14, cmap="RdBu_r")
@@ -83,19 +83,12 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.contour
-matplotlib.pyplot.contour
-matplotlib.axes.Axes.contourf
-matplotlib.pyplot.contourf
-matplotlib.axes.Axes.tricontour
-matplotlib.pyplot.tricontour
-matplotlib.axes.Axes.tricontourf
-matplotlib.pyplot.tricontourf
+#    - `matplotlib.axes.Axes.contour` / `matplotlib.pyplot.contour`
+#    - `matplotlib.axes.Axes.contourf` / `matplotlib.pyplot.contourf`
+#    - `matplotlib.axes.Axes.tricontour` / `matplotlib.pyplot.tricontour`
+#    - `matplotlib.axes.Axes.tricontourf` / `matplotlib.pyplot.tricontourf`
diff --git a/examples/images_contours_and_fields/layer_images.py b/examples/images_contours_and_fields/layer_images.py
index 5b2ba0738a68..abd8b2a9008e 100644
--- a/examples/images_contours_and_fields/layer_images.py
+++ b/examples/images_contours_and_fields/layer_images.py
@@ -43,14 +43,9 @@ def func3(x, y):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.imshow
-matplotlib.pyplot.imshow
+#    - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow`
diff --git a/examples/images_contours_and_fields/matshow.py b/examples/images_contours_and_fields/matshow.py
index fbe93921c670..43a06bda9353 100644
--- a/examples/images_contours_and_fields/matshow.py
+++ b/examples/images_contours_and_fields/matshow.py
@@ -17,14 +17,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.matshow
-matplotlib.pyplot.matshow
+#    - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow`
diff --git a/examples/images_contours_and_fields/multi_image.py b/examples/images_contours_and_fields/multi_image.py
index aa9067e55d06..e517e3f326ca 100644
--- a/examples/images_contours_and_fields/multi_image.py
+++ b/examples/images_contours_and_fields/multi_image.py
@@ -47,27 +47,21 @@ def update(changed_image):
 
 
 for im in images:
-    im.callbacksSM.connect('changed', update)
+    im.callbacks.connect('changed', update)
 
 plt.show()
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.imshow
-matplotlib.pyplot.imshow
-matplotlib.figure.Figure.colorbar
-matplotlib.pyplot.colorbar
-matplotlib.colors.Normalize
-matplotlib.cm.ScalarMappable.set_cmap
-matplotlib.cm.ScalarMappable.set_norm
-matplotlib.cm.ScalarMappable.set_clim
-matplotlib.cbook.CallbackRegistry.connect
+#    - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow`
+#    - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar`
+#    - `matplotlib.colors.Normalize`
+#    - `matplotlib.cm.ScalarMappable.set_cmap`
+#    - `matplotlib.cm.ScalarMappable.set_norm`
+#    - `matplotlib.cm.ScalarMappable.set_clim`
+#    - `matplotlib.cbook.CallbackRegistry.connect`
diff --git a/examples/images_contours_and_fields/pcolor_demo.py b/examples/images_contours_and_fields/pcolor_demo.py
index 4862bb583288..bc578f25cf09 100644
--- a/examples/images_contours_and_fields/pcolor_demo.py
+++ b/examples/images_contours_and_fields/pcolor_demo.py
@@ -111,22 +111,14 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.pcolor
-matplotlib.pyplot.pcolor
-matplotlib.axes.Axes.pcolormesh
-matplotlib.pyplot.pcolormesh
-matplotlib.axes.Axes.pcolorfast
-matplotlib.axes.Axes.imshow
-matplotlib.pyplot.imshow
-matplotlib.figure.Figure.colorbar
-matplotlib.pyplot.colorbar
-matplotlib.colors.LogNorm
+#    - `matplotlib.axes.Axes.pcolor` / `matplotlib.pyplot.pcolor`
+#    - `matplotlib.axes.Axes.pcolormesh` / `matplotlib.pyplot.pcolormesh`
+#    - `matplotlib.axes.Axes.pcolorfast`
+#    - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow`
+#    - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar`
+#    - `matplotlib.colors.LogNorm`
diff --git a/examples/images_contours_and_fields/pcolormesh_grids.py b/examples/images_contours_and_fields/pcolormesh_grids.py
index 202a9d167616..3b628efe58bd 100644
--- a/examples/images_contours_and_fields/pcolormesh_grids.py
+++ b/examples/images_contours_and_fields/pcolormesh_grids.py
@@ -15,7 +15,6 @@
 
 """
 
-import matplotlib
 import matplotlib.pyplot as plt
 import numpy as np
 
@@ -121,12 +120,9 @@ def _annotate(ax, x, y, title):
 plt.show()
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-matplotlib.axes.Axes.pcolormesh
-matplotlib.pyplot.pcolormesh
+#    - `matplotlib.axes.Axes.pcolormesh` / `matplotlib.pyplot.pcolormesh`
diff --git a/examples/images_contours_and_fields/pcolormesh_levels.py b/examples/images_contours_and_fields/pcolormesh_levels.py
index 7f1073295709..d42643f15574 100644
--- a/examples/images_contours_and_fields/pcolormesh_levels.py
+++ b/examples/images_contours_and_fields/pcolormesh_levels.py
@@ -8,7 +8,6 @@
 
 """
 
-import matplotlib
 import matplotlib.pyplot as plt
 from matplotlib.colors import BoundaryNorm
 from matplotlib.ticker import MaxNLocator
@@ -95,7 +94,7 @@
 
 # pick the desired colormap, sensible levels, and define a normalization
 # instance which takes data values and translates those into levels.
-cmap = plt.get_cmap('PiYG')
+cmap = plt.colormaps['PiYG']
 norm = BoundaryNorm(levels, ncolors=cmap.N, clip=True)
 
 fig, (ax0, ax1) = plt.subplots(nrows=2)
@@ -121,18 +120,13 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-matplotlib.axes.Axes.pcolormesh
-matplotlib.pyplot.pcolormesh
-matplotlib.axes.Axes.contourf
-matplotlib.pyplot.contourf
-matplotlib.figure.Figure.colorbar
-matplotlib.pyplot.colorbar
-matplotlib.colors.BoundaryNorm
-matplotlib.ticker.MaxNLocator
+#    - `matplotlib.axes.Axes.pcolormesh` / `matplotlib.pyplot.pcolormesh`
+#    - `matplotlib.axes.Axes.contourf` / `matplotlib.pyplot.contourf`
+#    - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar`
+#    - `matplotlib.colors.BoundaryNorm`
+#    - `matplotlib.ticker.MaxNLocator`
diff --git a/examples/images_contours_and_fields/plot_streamplot.py b/examples/images_contours_and_fields/plot_streamplot.py
index 2051764bb383..fd587527fbc5 100644
--- a/examples/images_contours_and_fields/plot_streamplot.py
+++ b/examples/images_contours_and_fields/plot_streamplot.py
@@ -11,10 +11,12 @@
 * Varying the line width along a streamline.
 * Controlling the starting points of streamlines.
 * Streamlines skipping masked regions and NaN values.
+* Unbroken streamlines even when exceeding the limit of lines within a single
+  grid cell.
 """
 import numpy as np
 import matplotlib.pyplot as plt
-import matplotlib.gridspec as gridspec
+
 
 w = 3
 Y, X = np.mgrid[-w:w:100j, -w:w:100j]
@@ -22,38 +24,34 @@
 V = 1 + X - Y**2
 speed = np.sqrt(U**2 + V**2)
 
-fig = plt.figure(figsize=(7, 9))
-gs = gridspec.GridSpec(nrows=3, ncols=2, height_ratios=[1, 1, 2])
+fig, axs = plt.subplots(3, 2, figsize=(7, 9), height_ratios=[1, 1, 2])
+axs = axs.flat
 
 #  Varying density along a streamline
-ax0 = fig.add_subplot(gs[0, 0])
-ax0.streamplot(X, Y, U, V, density=[0.5, 1])
-ax0.set_title('Varying Density')
+axs[0].streamplot(X, Y, U, V, density=[0.5, 1])
+axs[0].set_title('Varying Density')
 
 # Varying color along a streamline
-ax1 = fig.add_subplot(gs[0, 1])
-strm = ax1.streamplot(X, Y, U, V, color=U, linewidth=2, cmap='autumn')
+strm = axs[1].streamplot(X, Y, U, V, color=U, linewidth=2, cmap='autumn')
 fig.colorbar(strm.lines)
-ax1.set_title('Varying Color')
+axs[1].set_title('Varying Color')
 
 #  Varying line width along a streamline
-ax2 = fig.add_subplot(gs[1, 0])
 lw = 5*speed / speed.max()
-ax2.streamplot(X, Y, U, V, density=0.6, color='k', linewidth=lw)
-ax2.set_title('Varying Line Width')
+axs[2].streamplot(X, Y, U, V, density=0.6, color='k', linewidth=lw)
+axs[2].set_title('Varying Line Width')
 
 # Controlling the starting points of the streamlines
 seed_points = np.array([[-2, -1, 0, 1, 2, -1], [-2, -1,  0, 1, 2, 2]])
 
-ax3 = fig.add_subplot(gs[1, 1])
-strm = ax3.streamplot(X, Y, U, V, color=U, linewidth=2,
-                      cmap='autumn', start_points=seed_points.T)
+strm = axs[3].streamplot(X, Y, U, V, color=U, linewidth=2,
+                         cmap='autumn', start_points=seed_points.T)
 fig.colorbar(strm.lines)
-ax3.set_title('Controlling Starting Points')
+axs[3].set_title('Controlling Starting Points')
 
 # Displaying the starting points with blue symbols.
-ax3.plot(seed_points[0], seed_points[1], 'bo')
-ax3.set(xlim=(-w, w), ylim=(-w, w))
+axs[3].plot(seed_points[0], seed_points[1], 'bo')
+axs[3].set(xlim=(-w, w), ylim=(-w, w))
 
 # Create a mask
 mask = np.zeros(U.shape, dtype=bool)
@@ -61,26 +59,24 @@
 U[:20, :20] = np.nan
 U = np.ma.array(U, mask=mask)
 
-ax4 = fig.add_subplot(gs[2:, :])
-ax4.streamplot(X, Y, U, V, color='r')
-ax4.set_title('Streamplot with Masking')
+axs[4].streamplot(X, Y, U, V, color='r')
+axs[4].set_title('Streamplot with Masking')
+
+axs[4].imshow(~mask, extent=(-w, w, -w, w), alpha=0.5, cmap='gray',
+              aspect='auto')
+axs[4].set_aspect('equal')
 
-ax4.imshow(~mask, extent=(-w, w, -w, w), alpha=0.5, cmap='gray', aspect='auto')
-ax4.set_aspect('equal')
+axs[5].streamplot(X, Y, U, V, broken_streamlines=False)
+axs[5].set_title('Streamplot with unbroken streamlines')
 
 plt.tight_layout()
 plt.show()
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.streamplot
-matplotlib.pyplot.streamplot
-matplotlib.gridspec
-matplotlib.gridspec.GridSpec
+#    - `matplotlib.axes.Axes.streamplot` / `matplotlib.pyplot.streamplot`
+#    - `matplotlib.gridspec.GridSpec`
diff --git a/examples/images_contours_and_fields/quadmesh_demo.py b/examples/images_contours_and_fields/quadmesh_demo.py
index 005d693f7aa0..430c428f5170 100644
--- a/examples/images_contours_and_fields/quadmesh_demo.py
+++ b/examples/images_contours_and_fields/quadmesh_demo.py
@@ -9,7 +9,7 @@
 This demo illustrates a bug in quadmesh with masked data.
 """
 
-from matplotlib import cm, pyplot as plt
+from matplotlib import pyplot as plt
 import numpy as np
 
 n = 12
@@ -29,7 +29,7 @@
 axs[0].set_title('Without masked values')
 
 # You can control the color of the masked region.
-cmap = cm.get_cmap(plt.rcParams['image.cmap']).with_extremes(bad='y')
+cmap = plt.colormaps[plt.rcParams['image.cmap']].with_extremes(bad='y')
 axs[1].pcolormesh(Qx, Qz, Zm, shading='gouraud', cmap=cmap)
 axs[1].set_title('With masked values')
 
@@ -42,13 +42,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.pcolormesh
-matplotlib.pyplot.pcolormesh
+#    - `matplotlib.axes.Axes.pcolormesh` / `matplotlib.pyplot.pcolormesh`
diff --git a/examples/images_contours_and_fields/quiver_demo.py b/examples/images_contours_and_fields/quiver_demo.py
index f06f4e17198a..396e1c047e1b 100644
--- a/examples/images_contours_and_fields/quiver_demo.py
+++ b/examples/images_contours_and_fields/quiver_demo.py
@@ -54,15 +54,10 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.quiver
-matplotlib.pyplot.quiver
-matplotlib.axes.Axes.quiverkey
-matplotlib.pyplot.quiverkey
+#    - `matplotlib.axes.Axes.quiver` / `matplotlib.pyplot.quiver`
+#    - `matplotlib.axes.Axes.quiverkey` / `matplotlib.pyplot.quiverkey`
diff --git a/examples/images_contours_and_fields/quiver_simple_demo.py b/examples/images_contours_and_fields/quiver_simple_demo.py
index 0393a4857cbd..1437d6f138c2 100644
--- a/examples/images_contours_and_fields/quiver_simple_demo.py
+++ b/examples/images_contours_and_fields/quiver_simple_demo.py
@@ -24,15 +24,10 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.quiver
-matplotlib.pyplot.quiver
-matplotlib.axes.Axes.quiverkey
-matplotlib.pyplot.quiverkey
+#    - `matplotlib.axes.Axes.quiver` / `matplotlib.pyplot.quiver`
+#    - `matplotlib.axes.Axes.quiverkey` / `matplotlib.pyplot.quiverkey`
diff --git a/examples/images_contours_and_fields/shading_example.py b/examples/images_contours_and_fields/shading_example.py
index e1357f26070f..c3b969dcff8b 100644
--- a/examples/images_contours_and_fields/shading_example.py
+++ b/examples/images_contours_and_fields/shading_example.py
@@ -7,7 +7,7 @@
 `Generic Mapping Tools`_.
 
 .. _Mathematica: http://reference.wolfram.com/mathematica/ref/ReliefPlot.html
-.. _Generic Mapping Tools: https://gmt.soest.hawaii.edu/
+.. _Generic Mapping Tools: https://www.generic-mapping-tools.org/
 """
 
 import numpy as np
@@ -64,15 +64,10 @@ def compare(z, cmap, ve=1):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown in this
-# example:
-
-import matplotlib
-matplotlib.colors.LightSource
-matplotlib.axes.Axes.imshow
-matplotlib.pyplot.imshow
+#    - `matplotlib.colors.LightSource`
+#    - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow`
diff --git a/examples/images_contours_and_fields/specgram_demo.py b/examples/images_contours_and_fields/specgram_demo.py
index 6a7eb8d696f8..43ee7b3c1af8 100644
--- a/examples/images_contours_and_fields/specgram_demo.py
+++ b/examples/images_contours_and_fields/specgram_demo.py
@@ -38,14 +38,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.specgram
-matplotlib.pyplot.specgram
+#    - `matplotlib.axes.Axes.specgram` / `matplotlib.pyplot.specgram`
diff --git a/examples/images_contours_and_fields/spy_demos.py b/examples/images_contours_and_fields/spy_demos.py
index af70f48cd4c8..a61a3ffefcad 100644
--- a/examples/images_contours_and_fields/spy_demos.py
+++ b/examples/images_contours_and_fields/spy_demos.py
@@ -33,14 +33,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.spy
-matplotlib.pyplot.spy
+#    - `matplotlib.axes.Axes.spy` / `matplotlib.pyplot.spy`
diff --git a/examples/images_contours_and_fields/tricontour_demo.py b/examples/images_contours_and_fields/tricontour_demo.py
index d657aef01af7..a5d4651b7818 100644
--- a/examples/images_contours_and_fields/tricontour_demo.py
+++ b/examples/images_contours_and_fields/tricontour_demo.py
@@ -45,6 +45,41 @@
 ax1.tricontour(triang, z, colors='k')
 ax1.set_title('Contour plot of Delaunay triangulation')
 
+
+###############################################################################
+# You could also specify hatching patterns along with different cmaps.
+
+fig2, ax2 = plt.subplots()
+ax2.set_aspect("equal")
+tcf = ax2.tricontourf(
+    triang,
+    z,
+    hatches=["*", "-", "/", "//", "\\", None],
+    cmap="cividis"
+)
+fig2.colorbar(tcf)
+ax2.tricontour(triang, z, linestyles="solid", colors="k", linewidths=2.0)
+ax2.set_title("Hatched Contour plot of Delaunay triangulation")
+
+###############################################################################
+# You could also generate hatching patterns labeled with no color.
+
+fig3, ax3 = plt.subplots()
+n_levels = 7
+tcf = ax3.tricontourf(
+    triang,
+    z,
+    n_levels,
+    colors="none",
+    hatches=[".", "/", "\\", None, "\\\\", "*"],
+)
+ax3.tricontour(triang, z, n_levels, colors="black", linestyles="-")
+
+
+# create a legend for the contour set
+artists, labels = tcf.legend_elements(str_format="{:2.1f}".format)
+ax3.legend(artists, labels, handleheight=2, framealpha=1)
+
 ###############################################################################
 # You can specify your own triangulation rather than perform a Delaunay
 # triangulation of the points, where each triangle is given by the indices of
@@ -101,27 +136,25 @@
 # object if the same triangulation was to be used more than once to save
 # duplicated calculations.
 
-fig2, ax2 = plt.subplots()
-ax2.set_aspect('equal')
-tcf = ax2.tricontourf(x, y, triangles, z)
-fig2.colorbar(tcf)
-ax2.set_title('Contour plot of user-specified triangulation')
-ax2.set_xlabel('Longitude (degrees)')
-ax2.set_ylabel('Latitude (degrees)')
+fig4, ax4 = plt.subplots()
+ax4.set_aspect('equal')
+tcf = ax4.tricontourf(x, y, triangles, z)
+fig4.colorbar(tcf)
+ax4.set_title('Contour plot of user-specified triangulation')
+ax4.set_xlabel('Longitude (degrees)')
+ax4.set_ylabel('Latitude (degrees)')
 
 plt.show()
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.tricontourf
-matplotlib.pyplot.tricontourf
-matplotlib.tri.Triangulation
+#    - `matplotlib.axes.Axes.tricontourf` / `matplotlib.pyplot.tricontourf`
+#    - `matplotlib.tri.Triangulation`
+#    - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar`
+#    - `matplotlib.axes.Axes.legend` / `matplotlib.pyplot.legend`
+#    - `matplotlib.contour.ContourSet.legend_elements`
diff --git a/examples/images_contours_and_fields/tricontour_smooth_delaunay.py b/examples/images_contours_and_fields/tricontour_smooth_delaunay.py
index ab187ef8eac4..0815e78fb32d 100644
--- a/examples/images_contours_and_fields/tricontour_smooth_delaunay.py
+++ b/examples/images_contours_and_fields/tricontour_smooth_delaunay.py
@@ -25,13 +25,12 @@
 """
 from matplotlib.tri import Triangulation, TriAnalyzer, UniformTriRefiner
 import matplotlib.pyplot as plt
-import matplotlib.cm as cm
 import numpy as np
 
 
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # Analytical test function
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 def experiment_res(x, y):
     """An analytic function representing experiment results."""
     x = 2 * x
@@ -44,9 +43,9 @@ def experiment_res(x, y):
          2 * (x**2 + y**2))
     return (np.max(z) - z) / (np.max(z) - np.min(z))
 
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # Generating the initial data test points and triangulation for the demo
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # User parameters for data test points
 
 # Number of test data points, tested from 3 to 5000 for subdiv=3
@@ -83,9 +82,9 @@ def experiment_res(x, y):
 tri.set_mask(mask_init)
 
 
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # Improving the triangulation before high-res plots: removing flat triangles
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # masking badly shaped triangles at the border of the triangular mesh.
 mask = TriAnalyzer(tri).get_flat_tri_mask(min_circle_ratio)
 tri.set_mask(mask)
@@ -102,9 +101,9 @@ def experiment_res(x, y):
 flat_tri.set_mask(~mask)
 
 
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # Now the plots
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # User options for plots
 plot_tri = True          # plot of base triangulation
 plot_masked_tri = True   # plot of excessively flat excluded triangles
@@ -114,7 +113,6 @@ def experiment_res(x, y):
 
 # Graphical options for tricontouring
 levels = np.arange(0., 1., 0.025)
-cmap = cm.get_cmap(name='Blues', lut=None)
 
 fig, ax = plt.subplots()
 ax.set_aspect('equal')
@@ -122,11 +120,11 @@ def experiment_res(x, y):
              "(application to high-resolution tricontouring)")
 
 # 1) plot of the refined (computed) data contours:
-ax.tricontour(tri_refi, z_test_refi, levels=levels, cmap=cmap,
+ax.tricontour(tri_refi, z_test_refi, levels=levels, cmap='Blues',
               linewidths=[2.0, 0.5, 1.0, 0.5])
 # 2) plot of the expected (analytical) data contours (dashed):
 if plot_expected:
-    ax.tricontour(tri_refi, z_expected, levels=levels, cmap=cmap,
+    ax.tricontour(tri_refi, z_expected, levels=levels, cmap='Blues',
                   linestyles='--')
 # 3) plot of the fine mesh on which interpolation was done:
 if plot_refi_tri:
@@ -142,22 +140,15 @@ def experiment_res(x, y):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.tricontour
-matplotlib.pyplot.tricontour
-matplotlib.axes.Axes.tricontourf
-matplotlib.pyplot.tricontourf
-matplotlib.axes.Axes.triplot
-matplotlib.pyplot.triplot
-matplotlib.tri
-matplotlib.tri.Triangulation
-matplotlib.tri.TriAnalyzer
-matplotlib.tri.UniformTriRefiner
+#    - `matplotlib.axes.Axes.tricontour` / `matplotlib.pyplot.tricontour`
+#    - `matplotlib.axes.Axes.tricontourf` / `matplotlib.pyplot.tricontourf`
+#    - `matplotlib.axes.Axes.triplot` / `matplotlib.pyplot.triplot`
+#    - `matplotlib.tri`
+#    - `matplotlib.tri.Triangulation`
+#    - `matplotlib.tri.TriAnalyzer`
+#    - `matplotlib.tri.UniformTriRefiner`
diff --git a/examples/images_contours_and_fields/tricontour_smooth_user.py b/examples/images_contours_and_fields/tricontour_smooth_user.py
index ef82ff8ff4b2..c5a0a408f8e5 100644
--- a/examples/images_contours_and_fields/tricontour_smooth_user.py
+++ b/examples/images_contours_and_fields/tricontour_smooth_user.py
@@ -8,13 +8,12 @@
 """
 import matplotlib.tri as tri
 import matplotlib.pyplot as plt
-import matplotlib.cm as cm
 import numpy as np
 
 
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # Analytical test function
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 def function_z(x, y):
     r1 = np.sqrt((0.5 - x)**2 + (0.5 - y)**2)
     theta1 = np.arctan2(0.5 - x, 0.5 - y)
@@ -25,9 +24,9 @@ def function_z(x, y):
           0.7 * (x**2 + y**2))
     return (np.max(z) - z) / (np.max(z) - np.min(z))
 
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # Creating a Triangulation
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # First create the x and y coordinates of the points.
 n_angles = 20
 n_radii = 10
@@ -52,22 +51,21 @@ def function_z(x, y):
                          y[triang.triangles].mean(axis=1))
                 < min_radius)
 
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # Refine data
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 refiner = tri.UniformTriRefiner(triang)
 tri_refi, z_test_refi = refiner.refine_field(z, subdiv=3)
 
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # Plot the triangulation and the high-res iso-contours
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 fig, ax = plt.subplots()
 ax.set_aspect('equal')
 ax.triplot(triang, lw=0.5, color='white')
 
 levels = np.arange(0., 1., 0.025)
-cmap = cm.get_cmap(name='terrain', lut=None)
-ax.tricontourf(tri_refi, z_test_refi, levels=levels, cmap=cmap)
+ax.tricontourf(tri_refi, z_test_refi, levels=levels, cmap='terrain')
 ax.tricontour(tri_refi, z_test_refi, levels=levels,
               colors=['0.25', '0.5', '0.5', '0.5', '0.5'],
               linewidths=[1.0, 0.5, 0.5, 0.5, 0.5])
@@ -78,19 +76,13 @@ def function_z(x, y):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.tricontour
-matplotlib.pyplot.tricontour
-matplotlib.axes.Axes.tricontourf
-matplotlib.pyplot.tricontourf
-matplotlib.tri
-matplotlib.tri.Triangulation
-matplotlib.tri.UniformTriRefiner
+#    - `matplotlib.axes.Axes.tricontour` / `matplotlib.pyplot.tricontour`
+#    - `matplotlib.axes.Axes.tricontourf` / `matplotlib.pyplot.tricontourf`
+#    - `matplotlib.tri`
+#    - `matplotlib.tri.Triangulation`
+#    - `matplotlib.tri.UniformTriRefiner`
diff --git a/examples/images_contours_and_fields/trigradient_demo.py b/examples/images_contours_and_fields/trigradient_demo.py
index d1120ebf59b5..5abda65f5307 100644
--- a/examples/images_contours_and_fields/trigradient_demo.py
+++ b/examples/images_contours_and_fields/trigradient_demo.py
@@ -9,13 +9,12 @@
 from matplotlib.tri import (
     Triangulation, UniformTriRefiner, CubicTriInterpolator)
 import matplotlib.pyplot as plt
-import matplotlib.cm as cm
 import numpy as np
 
 
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # Electrical potential of a dipole
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 def dipole_potential(x, y):
     """The electric dipole potential V, at position *x*, *y*."""
     r_sq = x**2 + y**2
@@ -24,9 +23,9 @@ def dipole_potential(x, y):
     return (np.max(z) - z) / (np.max(z) - np.min(z))
 
 
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # Creating a Triangulation
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # First create the x and y coordinates of the points.
 n_angles = 30
 n_radii = 10
@@ -50,23 +49,23 @@ def dipole_potential(x, y):
                          y[triang.triangles].mean(axis=1))
                 < min_radius)
 
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # Refine data - interpolates the electrical potential V
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 refiner = UniformTriRefiner(triang)
 tri_refi, z_test_refi = refiner.refine_field(V, subdiv=3)
 
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # Computes the electrical field (Ex, Ey) as gradient of electrical potential
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 tci = CubicTriInterpolator(triang, -V)
 # Gradient requested here at the mesh nodes but could be anywhere else:
 (Ex, Ey) = tci.gradient(triang.x, triang.y)
 E_norm = np.sqrt(Ex**2 + Ey**2)
 
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # Plot the triangulation, the potential iso-contours and the vector field
-#-----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 fig, ax = plt.subplots()
 ax.set_aspect('equal')
 # Enforce the margins, and enlarge them to give room for the vectors.
@@ -76,8 +75,7 @@ def dipole_potential(x, y):
 ax.triplot(triang, color='0.8')
 
 levels = np.arange(0., 1., 0.01)
-cmap = cm.get_cmap(name='hot', lut=None)
-ax.tricontour(tri_refi, z_test_refi, levels=levels, cmap=cmap,
+ax.tricontour(tri_refi, z_test_refi, levels=levels, cmap='hot',
               linewidths=[2.0, 1.0, 1.0, 1.0])
 # Plots direction of the electrical vector field
 ax.quiver(triang.x, triang.y, Ex/E_norm, Ey/E_norm,
@@ -89,23 +87,16 @@ def dipole_potential(x, y):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.tricontour
-matplotlib.pyplot.tricontour
-matplotlib.axes.Axes.triplot
-matplotlib.pyplot.triplot
-matplotlib.tri
-matplotlib.tri.Triangulation
-matplotlib.tri.CubicTriInterpolator
-matplotlib.tri.CubicTriInterpolator.gradient
-matplotlib.tri.UniformTriRefiner
-matplotlib.axes.Axes.quiver
-matplotlib.pyplot.quiver
+#    - `matplotlib.axes.Axes.tricontour` / `matplotlib.pyplot.tricontour`
+#    - `matplotlib.axes.Axes.triplot` / `matplotlib.pyplot.triplot`
+#    - `matplotlib.tri`
+#    - `matplotlib.tri.Triangulation`
+#    - `matplotlib.tri.CubicTriInterpolator`
+#    - `matplotlib.tri.CubicTriInterpolator.gradient`
+#    - `matplotlib.tri.UniformTriRefiner`
+#    - `matplotlib.axes.Axes.quiver` / `matplotlib.pyplot.quiver`
diff --git a/examples/images_contours_and_fields/triinterp_demo.py b/examples/images_contours_and_fields/triinterp_demo.py
index 087a2839ac11..b06d0086d248 100644
--- a/examples/images_contours_and_fields/triinterp_demo.py
+++ b/examples/images_contours_and_fields/triinterp_demo.py
@@ -61,24 +61,16 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.tricontourf
-matplotlib.pyplot.tricontourf
-matplotlib.axes.Axes.triplot
-matplotlib.pyplot.triplot
-matplotlib.axes.Axes.contourf
-matplotlib.pyplot.contourf
-matplotlib.axes.Axes.plot
-matplotlib.pyplot.plot
-matplotlib.tri
-matplotlib.tri.LinearTriInterpolator
-matplotlib.tri.CubicTriInterpolator
-matplotlib.tri.Triangulation
+#    - `matplotlib.axes.Axes.tricontourf` / `matplotlib.pyplot.tricontourf`
+#    - `matplotlib.axes.Axes.triplot` / `matplotlib.pyplot.triplot`
+#    - `matplotlib.axes.Axes.contourf` / `matplotlib.pyplot.contourf`
+#    - `matplotlib.axes.Axes.plot` / `matplotlib.pyplot.plot`
+#    - `matplotlib.tri`
+#    - `matplotlib.tri.LinearTriInterpolator`
+#    - `matplotlib.tri.CubicTriInterpolator`
+#    - `matplotlib.tri.Triangulation`
diff --git a/examples/images_contours_and_fields/tripcolor_demo.py b/examples/images_contours_and_fields/tripcolor_demo.py
index 67f638ad4364..f78d275df2fc 100644
--- a/examples/images_contours_and_fields/tripcolor_demo.py
+++ b/examples/images_contours_and_fields/tripcolor_demo.py
@@ -113,7 +113,7 @@
 # object if the same triangulation was to be used more than once to save
 # duplicated calculations.
 # Can specify one color value per face rather than one per point by using the
-# facecolors kwarg.
+# *facecolors* keyword argument.
 
 fig3, ax3 = plt.subplots()
 ax3.set_aspect('equal')
@@ -127,16 +127,11 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.tripcolor
-matplotlib.pyplot.tripcolor
-matplotlib.tri
-matplotlib.tri.Triangulation
+#    - `matplotlib.axes.Axes.tripcolor` / `matplotlib.pyplot.tripcolor`
+#    - `matplotlib.tri`
+#    - `matplotlib.tri.Triangulation`
diff --git a/examples/images_contours_and_fields/triplot_demo.py b/examples/images_contours_and_fields/triplot_demo.py
index 836848205e35..b25ca4a575c8 100644
--- a/examples/images_contours_and_fields/triplot_demo.py
+++ b/examples/images_contours_and_fields/triplot_demo.py
@@ -107,16 +107,11 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.triplot
-matplotlib.pyplot.triplot
-matplotlib.tri
-matplotlib.tri.Triangulation
+#    - `matplotlib.axes.Axes.triplot` / `matplotlib.pyplot.triplot`
+#    - `matplotlib.tri`
+#    - `matplotlib.tri.Triangulation`
diff --git a/examples/images_contours_and_fields/watermark_image.py b/examples/images_contours_and_fields/watermark_image.py
index 38a3aa0d9656..a8f0b0d90b04 100644
--- a/examples/images_contours_and_fields/watermark_image.py
+++ b/examples/images_contours_and_fields/watermark_image.py
@@ -25,16 +25,11 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.image
-matplotlib.image.imread
-matplotlib.pyplot.imread
-matplotlib.figure.Figure.figimage
+#    - `matplotlib.image`
+#    - `matplotlib.image.imread` / `matplotlib.pyplot.imread`
+#    - `matplotlib.figure.Figure.figimage`
diff --git a/examples/lines_bars_and_markers/bar_colors.py b/examples/lines_bars_and_markers/bar_colors.py
new file mode 100644
index 000000000000..35e7a64ef605
--- /dev/null
+++ b/examples/lines_bars_and_markers/bar_colors.py
@@ -0,0 +1,26 @@
+"""
+==============
+Bar color demo
+==============
+
+This is an example showing how to control bar color and legend entries
+using the *color* and *label* parameters of `~matplotlib.pyplot.bar`.
+Note that labels with a preceding underscore won't show up in the legend.
+"""
+
+import matplotlib.pyplot as plt
+
+fig, ax = plt.subplots()
+
+fruits = ['apple', 'blueberry', 'cherry', 'orange']
+counts = [40, 100, 30, 55]
+bar_labels = ['red', 'blue', '_red', 'orange']
+bar_colors = ['tab:red', 'tab:blue', 'tab:red', 'tab:orange']
+
+ax.bar(fruits, counts, label=bar_labels, color=bar_colors)
+
+ax.set_ylabel('fruit supply')
+ax.set_title('Fruit supply by kind and color')
+ax.legend(title='Fruit color')
+
+plt.show()
diff --git a/examples/lines_bars_and_markers/bar_label_demo.py b/examples/lines_bars_and_markers/bar_label_demo.py
index 3b5db07d71dd..3ed3f79018cc 100644
--- a/examples/lines_bars_and_markers/bar_label_demo.py
+++ b/examples/lines_bars_and_markers/bar_label_demo.py
@@ -14,7 +14,6 @@
 </gallery/lines_bars_and_markers/barh>` examples.
 """
 
-import matplotlib
 import matplotlib.pyplot as plt
 import numpy as np
 
@@ -41,8 +40,7 @@
 ax.axhline(0, color='grey', linewidth=0.8)
 ax.set_ylabel('Scores')
 ax.set_title('Scores by group and gender')
-ax.set_xticks(ind)
-ax.set_xticklabels(('G1', 'G2', 'G3', 'G4', 'G5'))
+ax.set_xticks(ind, labels=['G1', 'G2', 'G3', 'G4', 'G5'])
 ax.legend()
 
 # Label with label_type 'center' instead of the default 'edge'
@@ -67,8 +65,7 @@
 fig, ax = plt.subplots()
 
 hbars = ax.barh(y_pos, performance, xerr=error, align='center')
-ax.set_yticks(y_pos)
-ax.set_yticklabels(people)
+ax.set_yticks(y_pos, labels=people)
 ax.invert_yaxis()  # labels read top-to-bottom
 ax.set_xlabel('Performance')
 ax.set_title('How fast do you want to go today?')
@@ -85,8 +82,7 @@
 fig, ax = plt.subplots()
 
 hbars = ax.barh(y_pos, performance, xerr=error, align='center')
-ax.set_yticks(y_pos)
-ax.set_yticklabels(people)
+ax.set_yticks(y_pos, labels=people)
 ax.invert_yaxis()  # labels read top-to-bottom
 ax.set_xlabel('Performance')
 ax.set_title('How fast do you want to go today?')
@@ -100,17 +96,11 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-matplotlib.axes.Axes.bar
-matplotlib.pyplot.bar
-matplotlib.axes.Axes.barh
-matplotlib.pyplot.barh
-matplotlib.axes.Axes.bar_label
-matplotlib.pyplot.bar_label
+#    - `matplotlib.axes.Axes.bar` / `matplotlib.pyplot.bar`
+#    - `matplotlib.axes.Axes.barh` / `matplotlib.pyplot.barh`
+#    - `matplotlib.axes.Axes.bar_label` / `matplotlib.pyplot.bar_label`
diff --git a/examples/lines_bars_and_markers/barchart.py b/examples/lines_bars_and_markers/barchart.py
index 1140381870aa..8e2dc9f1ed44 100644
--- a/examples/lines_bars_and_markers/barchart.py
+++ b/examples/lines_bars_and_markers/barchart.py
@@ -7,7 +7,6 @@
 bars with labels.
 """
 
-import matplotlib
 import matplotlib.pyplot as plt
 import numpy as np
 
@@ -26,8 +25,7 @@
 # Add some text for labels, title and custom x-axis tick labels, etc.
 ax.set_ylabel('Scores')
 ax.set_title('Scores by group and gender')
-ax.set_xticks(x)
-ax.set_xticklabels(labels)
+ax.set_xticks(x, labels)
 ax.legend()
 
 ax.bar_label(rects1, padding=3)
@@ -39,15 +37,10 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-matplotlib.axes.Axes.bar
-matplotlib.pyplot.bar
-matplotlib.axes.Axes.bar_label
-matplotlib.pyplot.bar_label
+#    - `matplotlib.axes.Axes.bar` / `matplotlib.pyplot.bar`
+#    - `matplotlib.axes.Axes.bar_label` / `matplotlib.pyplot.bar_label`
diff --git a/examples/lines_bars_and_markers/barh.py b/examples/lines_bars_and_markers/barh.py
index c537c0d9b215..64d5a5137906 100644
--- a/examples/lines_bars_and_markers/barh.py
+++ b/examples/lines_bars_and_markers/barh.py
@@ -22,8 +22,7 @@
 error = np.random.rand(len(people))
 
 ax.barh(y_pos, performance, xerr=error, align='center')
-ax.set_yticks(y_pos)
-ax.set_yticklabels(people)
+ax.set_yticks(y_pos, labels=people)
 ax.invert_yaxis()  # labels read top-to-bottom
 ax.set_xlabel('Performance')
 ax.set_title('How fast do you want to go today?')
diff --git a/examples/lines_bars_and_markers/broken_barh.py b/examples/lines_bars_and_markers/broken_barh.py
index c0691beaf255..6da38f1e465f 100644
--- a/examples/lines_bars_and_markers/broken_barh.py
+++ b/examples/lines_bars_and_markers/broken_barh.py
@@ -7,6 +7,7 @@
 """
 import matplotlib.pyplot as plt
 
+# Horizontal bar plot with gaps
 fig, ax = plt.subplots()
 ax.broken_barh([(110, 30), (150, 10)], (10, 9), facecolors='tab:blue')
 ax.broken_barh([(10, 50), (100, 20), (130, 10)], (20, 9),
@@ -14,9 +15,8 @@
 ax.set_ylim(5, 35)
 ax.set_xlim(0, 200)
 ax.set_xlabel('seconds since start')
-ax.set_yticks([15, 25])
-ax.set_yticklabels(['Bill', 'Jim'])
-ax.grid(True)
+ax.set_yticks([15, 25], labels=['Bill', 'Jim'])     # Modify y-axis tick labels
+ax.grid(True)                                       # Make grid lines visible
 ax.annotate('race interrupted', (61, 25),
             xytext=(0.8, 0.9), textcoords='axes fraction',
             arrowprops=dict(facecolor='black', shrink=0.05),
diff --git a/examples/lines_bars_and_markers/cohere.py b/examples/lines_bars_and_markers/cohere.py
index 370149695398..7881a0a31b1e 100644
--- a/examples/lines_bars_and_markers/cohere.py
+++ b/examples/lines_bars_and_markers/cohere.py
@@ -16,19 +16,19 @@
 nse1 = np.random.randn(len(t))                 # white noise 1
 nse2 = np.random.randn(len(t))                 # white noise 2
 
-# Two signals with a coherent part at 10Hz and a random part
+# Two signals with a coherent part at 10 Hz and a random part
 s1 = np.sin(2 * np.pi * 10 * t) + nse1
 s2 = np.sin(2 * np.pi * 10 * t) + nse2
 
 fig, axs = plt.subplots(2, 1)
 axs[0].plot(t, s1, t, s2)
 axs[0].set_xlim(0, 2)
-axs[0].set_xlabel('time')
+axs[0].set_xlabel('Time')
 axs[0].set_ylabel('s1 and s2')
 axs[0].grid(True)
 
 cxy, f = axs[1].cohere(s1, s2, 256, 1. / dt)
-axs[1].set_ylabel('coherence')
+axs[1].set_ylabel('Coherence')
 
 fig.tight_layout()
 plt.show()
diff --git a/examples/lines_bars_and_markers/csd_demo.py b/examples/lines_bars_and_markers/csd_demo.py
index 1eacc649b204..8894333f94d0 100644
--- a/examples/lines_bars_and_markers/csd_demo.py
+++ b/examples/lines_bars_and_markers/csd_demo.py
@@ -33,10 +33,10 @@
 
 ax1.plot(t, s1, t, s2)
 ax1.set_xlim(0, 5)
-ax1.set_xlabel('time')
+ax1.set_xlabel('Time')
 ax1.set_ylabel('s1 and s2')
 ax1.grid(True)
 
 cxy, f = ax2.csd(s1, s2, 256, 1. / dt)
-ax2.set_ylabel('CSD (db)')
+ax2.set_ylabel('CSD (dB)')
 plt.show()
diff --git a/examples/lines_bars_and_markers/curve_error_band.py b/examples/lines_bars_and_markers/curve_error_band.py
index 3d1675570b24..e55b467849a8 100644
--- a/examples/lines_bars_and_markers/curve_error_band.py
+++ b/examples/lines_bars_and_markers/curve_error_band.py
@@ -10,7 +10,6 @@
 # sphinx_gallery_thumbnail_number = 2
 
 import numpy as np
-from scipy.interpolate import splprep, splev
 
 import matplotlib.pyplot as plt
 from matplotlib.path import Path
@@ -22,8 +21,8 @@
 x, y = r * np.cos(t), r * np.sin(t)
 
 fig, ax = plt.subplots()
-ax.plot(x, y)
-plt.show()
+ax.plot(x, y, "k")
+ax.set(aspect=1)
 
 #############################################################################
 # An error band can be used to indicate the uncertainty of the curve.
@@ -39,46 +38,51 @@
 # `~.Axes.fill_between` method (see also
 # :doc:`/gallery/lines_bars_and_markers/fill_between_demo`).
 
-# Error amplitudes depending on the curve parameter *t*
-# (actual values are arbitrary and only for illustrative purposes):
-err = 0.05 * np.sin(2 * t) ** 2 + 0.04 + 0.02 * np.cos(9 * t + 2)
 
-# calculate normals via derivatives of splines
-tck, u = splprep([x, y], s=0)
-dx, dy = splev(u, tck, der=1)
-l = np.hypot(dx, dy)
-nx = dy / l
-ny = -dx / l
+def draw_error_band(ax, x, y, err, **kwargs):
+    # Calculate normals via centered finite differences (except the first point
+    # which uses a forward difference and the last point which uses a backward
+    # difference).
+    dx = np.concatenate([[x[1] - x[0]], x[2:] - x[:-2], [x[-1] - x[-2]]])
+    dy = np.concatenate([[y[1] - y[0]], y[2:] - y[:-2], [y[-1] - y[-2]]])
+    l = np.hypot(dx, dy)
+    nx = dy / l
+    ny = -dx / l
 
-# end points of errors
-xp = x + nx * err
-yp = y + ny * err
-xn = x - nx * err
-yn = y - ny * err
+    # end points of errors
+    xp = x + nx * err
+    yp = y + ny * err
+    xn = x - nx * err
+    yn = y - ny * err
 
-vertices = np.block([[xp, xn[::-1]],
-                     [yp, yn[::-1]]]).T
-codes = Path.LINETO * np.ones(len(vertices), dtype=Path.code_type)
-codes[0] = codes[len(xp)] = Path.MOVETO
-path = Path(vertices, codes)
+    vertices = np.block([[xp, xn[::-1]],
+                         [yp, yn[::-1]]]).T
+    codes = np.full(len(vertices), Path.LINETO)
+    codes[0] = codes[len(xp)] = Path.MOVETO
+    path = Path(vertices, codes)
+    ax.add_patch(PathPatch(path, **kwargs))
 
-patch = PathPatch(path, facecolor='C0', edgecolor='none', alpha=0.3)
 
-fig, ax = plt.subplots()
-ax.plot(x, y)
-ax.add_patch(patch)
+axs = (plt.figure(constrained_layout=True)
+       .subplots(1, 2, sharex=True, sharey=True))
+errs = [
+    (axs[0], "constant error", 0.05),
+    (axs[1], "variable error", 0.05 * np.sin(2 * t) ** 2 + 0.04),
+]
+for i, (ax, title, err) in enumerate(errs):
+    ax.set(title=title, aspect=1, xticks=[], yticks=[])
+    ax.plot(x, y, "k")
+    draw_error_band(ax, x, y, err=err,
+                    facecolor=f"C{i}", edgecolor="none", alpha=.3)
+
 plt.show()
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-import matplotlib
-matplotlib.patches.PathPatch
-matplotlib.path.Path
+#    - `matplotlib.patches.PathPatch`
+#    - `matplotlib.path.Path`
diff --git a/examples/lines_bars_and_markers/errorbar_limits_simple.py b/examples/lines_bars_and_markers/errorbar_limits_simple.py
index 2a69b205b3ce..42d0daf6f281 100644
--- a/examples/lines_bars_and_markers/errorbar_limits_simple.py
+++ b/examples/lines_bars_and_markers/errorbar_limits_simple.py
@@ -55,14 +55,9 @@
 
 ##############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.errorbar
-matplotlib.pyplot.errorbar
+#    - `matplotlib.axes.Axes.errorbar` / `matplotlib.pyplot.errorbar`
diff --git a/examples/lines_bars_and_markers/eventcollection_demo.py b/examples/lines_bars_and_markers/eventcollection_demo.py
index abdb6e6c05f5..e4fe6f61bdab 100644
--- a/examples/lines_bars_and_markers/eventcollection_demo.py
+++ b/examples/lines_bars_and_markers/eventcollection_demo.py
@@ -1,10 +1,10 @@
-"""
+r"""
 ====================
 EventCollection Demo
 ====================
 
-Plot two curves, then use EventCollections to mark the locations of the x
-and y data points on the respective axes for each curve
+Plot two curves, then use `.EventCollection`\s to mark the locations of the x
+and y data points on the respective axes for each curve.
 """
 
 import matplotlib.pyplot as plt
diff --git a/examples/lines_bars_and_markers/fill.py b/examples/lines_bars_and_markers/fill.py
index e6d2e4293f35..79642a9e5ed5 100644
--- a/examples/lines_bars_and_markers/fill.py
+++ b/examples/lines_bars_and_markers/fill.py
@@ -3,7 +3,7 @@
 Filled polygon
 ==============
 
-`~.Axes.fill()` draws a filled polygon based based on lists of point
+`~.Axes.fill()` draws a filled polygon based on lists of point
 coordinates *x*, *y*.
 
 This example uses the `Koch snowflake`_ as an example polygon.
@@ -62,7 +62,7 @@ def _koch_snowflake_complex(order):
 plt.show()
 
 ###############################################################################
-# Use keyword arguments *facecolor* and *edgecolor* to modify the the colors
+# Use keyword arguments *facecolor* and *edgecolor* to modify the colors
 # of the polygon. Since the *linewidth* of the edge is 0 in the default
 # Matplotlib style, we have to set it as well for the edge to become visible.
 
@@ -76,18 +76,12 @@ def _koch_snowflake_complex(order):
 
 plt.show()
 
-#############################################################################
+###############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.fill
-matplotlib.pyplot.fill
-matplotlib.axes.Axes.axis
-matplotlib.pyplot.axis
+#    - `matplotlib.axes.Axes.fill` / `matplotlib.pyplot.fill`
+#    - `matplotlib.axes.Axes.axis` / `matplotlib.pyplot.axis`
diff --git a/examples/lines_bars_and_markers/fill_between_alpha.py b/examples/lines_bars_and_markers/fill_between_alpha.py
index acd6cebbbd7f..9f4351b0006f 100644
--- a/examples/lines_bars_and_markers/fill_between_alpha.py
+++ b/examples/lines_bars_and_markers/fill_between_alpha.py
@@ -7,9 +7,9 @@
 It has a very handy ``where`` argument to combine filling with logical ranges,
 e.g., to just fill in a curve over some threshold value.
 
-At its most basic level, ``fill_between`` can be use to enhance a graphs visual
-appearance. Let's compare two graphs of a financial times with a simple line
-plot on the left and a filled line on the right.
+At its most basic level, ``fill_between`` can be used to enhance a graph's
+visual appearance. Let's compare two graphs of financial data with a simple
+line plot on the left and a filled line on the right.
 """
 
 import matplotlib.pyplot as plt
@@ -17,9 +17,6 @@
 import matplotlib.cbook as cbook
 
 
-# Fixing random state for reproducibility
-np.random.seed(19680801)
-
 # load up some sample financial data
 r = (cbook.get_sample_data('goog.npz', np_load=True)['price_data']
      .view(np.recarray))
@@ -29,14 +26,13 @@
 pricemin = r.close.min()
 
 ax1.plot(r.date, r.close, lw=2)
-ax2.fill_between(r.date, pricemin, r.close, facecolor='blue', alpha=0.5)
+ax2.fill_between(r.date, pricemin, r.close, alpha=0.7)
 
 for ax in ax1, ax2:
     ax.grid(True)
+    ax.label_outer()
 
 ax1.set_ylabel('price')
-for label in ax2.get_yticklabels():
-    label.set_visible(False)
 
 fig.suptitle('Google (GOOG) daily closing price')
 fig.autofmt_xdate()
@@ -52,16 +48,19 @@
 #
 # Our next example computes two populations of random walkers with a
 # different mean and standard deviation of the normal distributions from
-# which the steps are drawn.  We use shared regions to plot +/- one
+# which the steps are drawn.  We use filled regions to plot +/- one
 # standard deviation of the mean position of the population.  Here the
 # alpha channel is useful, not just aesthetic.
 
+# Fixing random state for reproducibility
+np.random.seed(19680801)
+
 Nsteps, Nwalkers = 100, 250
 t = np.arange(Nsteps)
 
 # an (Nsteps x Nwalkers) array of random walk steps
-S1 = 0.002 + 0.01*np.random.randn(Nsteps, Nwalkers)
-S2 = 0.004 + 0.02*np.random.randn(Nsteps, Nwalkers)
+S1 = 0.004 + 0.02*np.random.randn(Nsteps, Nwalkers)
+S2 = 0.002 + 0.01*np.random.randn(Nsteps, Nwalkers)
 
 # an (Nsteps x Nwalkers) array of random walker positions
 X1 = S1.cumsum(axis=0)
@@ -77,10 +76,10 @@
 
 # plot it!
 fig, ax = plt.subplots(1)
-ax.plot(t, mu1, lw=2, label='mean population 1', color='blue')
-ax.plot(t, mu2, lw=2, label='mean population 2', color='yellow')
-ax.fill_between(t, mu1+sigma1, mu1-sigma1, facecolor='blue', alpha=0.5)
-ax.fill_between(t, mu2+sigma2, mu2-sigma2, facecolor='yellow', alpha=0.5)
+ax.plot(t, mu1, lw=2, label='mean population 1')
+ax.plot(t, mu2, lw=2, label='mean population 2')
+ax.fill_between(t, mu1+sigma1, mu1-sigma1, facecolor='C0', alpha=0.4)
+ax.fill_between(t, mu2+sigma2, mu2-sigma2, facecolor='C1', alpha=0.4)
 ax.set_title(r'random walkers empirical $\mu$ and $\pm \sigma$ interval')
 ax.legend(loc='upper left')
 ax.set_xlabel('num steps')
@@ -93,11 +92,14 @@
 # as the x, ymin and ymax arguments, and only fills in the region where
 # the boolean mask is True.  In the example below, we simulate a single
 # random walker and compute the analytic mean and standard deviation of
-# the population positions.  The population mean is shown as the black
-# dashed line, and the plus/minus one sigma deviation from the mean is
-# shown as the yellow filled region.  We use the where mask
-# ``X > upper_bound`` to find the region where the walker is above the one
-# sigma boundary, and shade that region blue.
+# the population positions.  The population mean is shown as the dashed
+# line, and the plus/minus one sigma deviation from the mean is shown
+# as the filled region.  We use the where mask ``X > upper_bound`` to
+# find the region where the walker is outside the one sigma boundary,
+# and shade that region red.
+
+# Fixing random state for reproducibility
+np.random.seed(1)
 
 Nsteps = 500
 t = np.arange(Nsteps)
@@ -114,23 +116,23 @@
 upper_bound = mu*t + sigma*np.sqrt(t)
 
 fig, ax = plt.subplots(1)
-ax.plot(t, X, lw=2, label='walker position', color='blue')
-ax.plot(t, mu*t, lw=1, label='population mean', color='black', ls='--')
-ax.fill_between(t, lower_bound, upper_bound, facecolor='yellow', alpha=0.5,
+ax.plot(t, X, lw=2, label='walker position')
+ax.plot(t, mu*t, lw=1, label='population mean', color='C0', ls='--')
+ax.fill_between(t, lower_bound, upper_bound, facecolor='C0', alpha=0.4,
                 label='1 sigma range')
 ax.legend(loc='upper left')
 
 # here we use the where argument to only fill the region where the
 # walker is above the population 1 sigma boundary
-ax.fill_between(t, upper_bound, X, where=X > upper_bound, facecolor='blue',
-                alpha=0.5)
+ax.fill_between(t, upper_bound, X, where=X > upper_bound, fc='red', alpha=0.4)
+ax.fill_between(t, lower_bound, X, where=X < lower_bound, fc='red', alpha=0.4)
 ax.set_xlabel('num steps')
 ax.set_ylabel('position')
 ax.grid()
 
 ###############################################################################
 # Another handy use of filled regions is to highlight horizontal or vertical
-# spans of an axes -- for that Matplotlib has the helper functions
+# spans of an Axes -- for that Matplotlib has the helper functions
 # `~matplotlib.axes.Axes.axhspan` and `~matplotlib.axes.Axes.axvspan`.  See
 # :doc:`/gallery/subplots_axes_and_figures/axhspan_demo`.
 
diff --git a/examples/lines_bars_and_markers/fill_between_demo.py b/examples/lines_bars_and_markers/fill_between_demo.py
index 8f7e7c11d024..79aef67ab4d9 100644
--- a/examples/lines_bars_and_markers/fill_between_demo.py
+++ b/examples/lines_bars_and_markers/fill_between_demo.py
@@ -114,7 +114,7 @@
 # ------------------------------------------------------------
 # The same selection mechanism can be applied to fill the full vertical height
 # of the axes. To be independent of y-limits, we add a transform that
-# interprets the x-values in data coorindates and the y-values in axes
+# interprets the x-values in data coordinates and the y-values in axes
 # coordinates.
 #
 # The following example marks the regions in which the y-data are above a
@@ -132,15 +132,10 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.fill_between
-matplotlib.pyplot.fill_between
-matplotlib.axes.Axes.get_xaxis_transform
+#    - `matplotlib.axes.Axes.fill_between` / `matplotlib.pyplot.fill_between`
+#    - `matplotlib.axes.Axes.get_xaxis_transform`
diff --git a/examples/lines_bars_and_markers/fill_betweenx_demo.py b/examples/lines_bars_and_markers/fill_betweenx_demo.py
index 1f449c372348..06f219d9fb31 100644
--- a/examples/lines_bars_and_markers/fill_betweenx_demo.py
+++ b/examples/lines_bars_and_markers/fill_betweenx_demo.py
@@ -26,9 +26,12 @@
 ax3.fill_betweenx(y, x1, x2)
 ax3.set_title('between (x1, x2)')
 
-# now fill between x1 and x2 where a logical condition is met.  Note
-# this is different than calling
+#############################################################################
+# Now fill between x1 and x2 where a logical condition is met. Note this is
+# different than calling::
+#
 #   fill_between(y[where], x1[where], x2[where])
+#
 # because of edge effects over multiple contiguous regions.
 
 fig, [ax, ax1] = plt.subplots(1, 2, sharey=True, figsize=(6, 6))
@@ -44,9 +47,9 @@
 ax1.fill_betweenx(y, x1, x2, where=x2 <= x1, facecolor='red')
 ax1.set_title('regions with x2 > 1 are masked')
 
-# This example illustrates a problem; because of the data
-# gridding, there are undesired unfilled triangles at the crossover
-# points.  A brute-force solution would be to interpolate all
-# arrays to a very fine grid before plotting.
+#############################################################################
+# This example illustrates a problem; because of the data gridding, there are
+# undesired unfilled triangles at the crossover points. A brute-force solution
+# would be to interpolate all arrays to a very fine grid before plotting.
 
 plt.show()
diff --git a/examples/lines_bars_and_markers/filled_step.py b/examples/lines_bars_and_markers/filled_step.py
index 66a60ebe55ec..a4185366b7a2 100644
--- a/examples/lines_bars_and_markers/filled_step.py
+++ b/examples/lines_bars_and_markers/filled_step.py
@@ -7,7 +7,6 @@
 """
 
 import itertools
-from collections import OrderedDict
 from functools import partial
 
 import numpy as np
@@ -21,8 +20,6 @@ def filled_hist(ax, edges, values, bottoms=None, orientation='v',
     """
     Draw a histogram as a stepped patch.
 
-    Extra kwargs are passed through to `fill_between`
-
     Parameters
     ----------
     ax : Axes
@@ -42,6 +39,9 @@ def filled_hist(ax, edges, values, bottoms=None, orientation='v',
        Orientation of the histogram.  'v' (default) has
        the bars increasing in the positive y-direction.
 
+    **kwargs
+        Extra keyword arguments are passed through to `.fill_between`.
+
     Returns
     -------
     ret : PolyCollection
@@ -53,6 +53,7 @@ def filled_hist(ax, edges, values, bottoms=None, orientation='v',
                          "not {o}".format(o=orientation))
 
     kwargs.setdefault('step', 'post')
+    kwargs.setdefault('alpha', 0.7)
     edges = np.asarray(edges)
     values = np.asarray(values)
     if len(edges) - 1 != len(values):
@@ -86,7 +87,7 @@ def stack_hist(ax, stacked_data, sty_cycle, bottoms=None,
         The axes to add artists too
 
     stacked_data : array or Mapping
-        A (N, M) shaped array.  The first dimension will be iterated over to
+        A (M, N) shaped array.  The first dimension will be iterated over to
         compute histograms row-wise
 
     sty_cycle : Cycler or operable of dict
@@ -104,11 +105,11 @@ def stack_hist(ax, stacked_data, sty_cycle, bottoms=None,
 
         If not given and stacked data is an array defaults to 'default set {n}'
 
-        If stacked_data is a mapping, and labels is None, default to the keys
-        (which may come out in a random order).
+        If *stacked_data* is a mapping, and *labels* is None, default to the
+        keys.
 
-        If stacked_data is a mapping and labels is given then only
-        the columns listed by be plotted.
+        If *stacked_data* is a mapping and *labels* is given then only the
+        columns listed will be plotted.
 
     plot_func : callable, optional
         Function to call to draw the histogram must have signature:
@@ -117,9 +118,9 @@ def stack_hist(ax, stacked_data, sty_cycle, bottoms=None,
                           label=label, **kwargs)
 
     plot_kwargs : dict, optional
-        Any extra kwargs to pass through to the plotting function.  This
-        will be the same for all calls to the plotting function and will
-        over-ride the values in cycle.
+        Any extra keyword arguments to pass through to the plotting function.
+        This will be the same for all calls to the plotting function and will
+        override the values in *sty_cycle*.
 
     Returns
     -------
@@ -188,7 +189,7 @@ def stack_hist(ax, stacked_data, sty_cycle, bottoms=None,
 np.random.seed(19680801)
 
 stack_data = np.random.randn(4, 12250)
-dict_data = OrderedDict(zip((c['label'] for c in label_cycle), stack_data))
+dict_data = dict(zip((c['label'] for c in label_cycle), stack_data))
 
 ###############################################################################
 # Work with plain arrays
@@ -225,15 +226,11 @@ def stack_hist(ax, stacked_data, sty_cycle, bottoms=None,
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.fill_betweenx
-matplotlib.axes.Axes.fill_between
-matplotlib.axis.Axis.set_major_locator
+#    - `matplotlib.axes.Axes.fill_betweenx` / `matplotlib.pyplot.fill_betweenx`
+#    - `matplotlib.axes.Axes.fill_between` / `matplotlib.pyplot.fill_between`
+#    - `matplotlib.axis.Axis.set_major_locator`
diff --git a/examples/lines_bars_and_markers/gradient_bar.py b/examples/lines_bars_and_markers/gradient_bar.py
index 7f39267ddf86..93d346941f31 100644
--- a/examples/lines_bars_and_markers/gradient_bar.py
+++ b/examples/lines_bars_and_markers/gradient_bar.py
@@ -12,8 +12,8 @@
 by a unit vector *v*. The values at the corners are then obtained by the
 lengths of the projections of the corner vectors on *v*.
 
-A similar approach can be used to create a gradient background for an axes.
-In that case, it is helpful to uses Axes coordinates (``extent=(0, 1, 0, 1),
+A similar approach can be used to create a gradient background for an Axes.
+In that case, it is helpful to use Axes coordinates (``extent=(0, 1, 0, 1),
 transform=ax.transAxes``) to be independent of the data coordinates.
 
 """
@@ -34,7 +34,7 @@ def gradient_image(ax, extent, direction=0.3, cmap_range=(0, 1), **kwargs):
     extent
         The extent of the image as (xmin, xmax, ymin, ymax).
         By default, this is in Axes coordinates but may be
-        changed using the *transform* kwarg.
+        changed using the *transform* keyword argument.
     direction : float
         The direction of the gradient. This is a number in
         range 0 (=vertical) to 1 (=horizontal).
@@ -70,8 +70,8 @@ def gradient_bar(ax, x, y, width=0.5, bottom=0):
 ax.set(xlim=xlim, ylim=ylim, autoscale_on=False)
 
 # background image
-gradient_image(ax, direction=0, extent=(0, 1, 0, 1), transform=ax.transAxes,
-               cmap=plt.cm.Oranges, cmap_range=(0.1, 0.6))
+gradient_image(ax, direction=1, extent=(0, 1, 0, 1), transform=ax.transAxes,
+               cmap=plt.cm.RdYlGn, cmap_range=(0.2, 0.8), alpha=0.5)
 
 N = 10
 x = np.arange(N) + 0.15
diff --git a/examples/lines_bars_and_markers/hat_graph.py b/examples/lines_bars_and_markers/hat_graph.py
index 4c29f6f85625..6c939167b536 100644
--- a/examples/lines_bars_and_markers/hat_graph.py
+++ b/examples/lines_bars_and_markers/hat_graph.py
@@ -7,7 +7,6 @@
 
 .. _hat graph: https://doi.org/10.1186/s41235-019-0182-3
 """
-import matplotlib
 import numpy as np
 import matplotlib.pyplot as plt
 
@@ -41,8 +40,7 @@ def label_bars(heights, rects):
 
     values = np.asarray(values)
     x = np.arange(values.shape[1])
-    ax.set_xticks(x)
-    ax.set_xticklabels(xlabels)
+    ax.set_xticks(x, labels=xlabels)
     spacing = 0.3  # spacing between hat groups
     width = (1 - spacing) / values.shape[0]
     heights0 = values[0]
@@ -73,14 +71,10 @@ def label_bars(heights, rects):
 plt.show()
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-matplotlib.axes.Axes.bar
-matplotlib.pyplot.bar
-matplotlib.axes.Axes.annotate
-matplotlib.pyplot.annotate
+#    - `matplotlib.axes.Axes.bar` / `matplotlib.pyplot.bar`
+#    - `matplotlib.axes.Axes.annotate` / `matplotlib.pyplot.annotate`
diff --git a/examples/lines_bars_and_markers/horizontal_barchart_distribution.py b/examples/lines_bars_and_markers/horizontal_barchart_distribution.py
index 9b269db2b547..3a22ce3ed4ae 100644
--- a/examples/lines_bars_and_markers/horizontal_barchart_distribution.py
+++ b/examples/lines_bars_and_markers/horizontal_barchart_distribution.py
@@ -43,7 +43,7 @@ def survey(results, category_names):
     labels = list(results.keys())
     data = np.array(list(results.values()))
     data_cum = data.cumsum(axis=1)
-    category_colors = plt.get_cmap('RdYlGn')(
+    category_colors = plt.colormaps['RdYlGn'](
         np.linspace(0.15, 0.85, data.shape[1]))
 
     fig, ax = plt.subplots(figsize=(9.2, 5))
@@ -71,18 +71,11 @@ def survey(results, category_names):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.barh
-matplotlib.pyplot.barh
-matplotlib.axes.Axes.bar_label
-matplotlib.pyplot.bar_label
-matplotlib.axes.Axes.legend
-matplotlib.pyplot.legend
+#    - `matplotlib.axes.Axes.barh` / `matplotlib.pyplot.barh`
+#    - `matplotlib.axes.Axes.bar_label` / `matplotlib.pyplot.bar_label`
+#    - `matplotlib.axes.Axes.legend` / `matplotlib.pyplot.legend`
diff --git a/examples/lines_bars_and_markers/line_demo_dash_control.py b/examples/lines_bars_and_markers/line_demo_dash_control.py
index 78043dfed2ff..9d02981597c0 100644
--- a/examples/lines_bars_and_markers/line_demo_dash_control.py
+++ b/examples/lines_bars_and_markers/line_demo_dash_control.py
@@ -17,6 +17,11 @@
 :doc:`property_cycle </tutorials/intermediate/color_cycle>`
 by passing a list of dash sequences using the keyword *dashes* to the
 cycler. This is not shown within this example.
+
+Other attributes of the dash may also be set either with the relevant method
+(`~.Line2D.set_dash_capstyle`, `~.Line2D.set_dash_joinstyle`,
+`~.Line2D.set_gapcolor`) or by passing the property through a plotting
+function.
 """
 import numpy as np
 import matplotlib.pyplot as plt
@@ -24,14 +29,21 @@
 x = np.linspace(0, 10, 500)
 y = np.sin(x)
 
+plt.rc('lines', linewidth=2.5)
 fig, ax = plt.subplots()
 
-# Using set_dashes() to modify dashing of an existing line
-line1, = ax.plot(x, y, label='Using set_dashes()')
-line1.set_dashes([2, 2, 10, 2])  # 2pt line, 2pt break, 10pt line, 2pt break
+# Using set_dashes() and set_capstyle() to modify dashing of an existing line.
+line1, = ax.plot(x, y, label='Using set_dashes() and set_dash_capstyle()')
+line1.set_dashes([2, 2, 10, 2])  # 2pt line, 2pt break, 10pt line, 2pt break.
+line1.set_dash_capstyle('round')
 
-# Using plot(..., dashes=...) to set the dashing when creating a line
+# Using plot(..., dashes=...) to set the dashing when creating a line.
 line2, = ax.plot(x, y - 0.2, dashes=[6, 2], label='Using the dashes parameter')
 
-ax.legend()
+# Using plot(..., dashes=..., gapcolor=...) to set the dashing and
+# alternating color when creating a line.
+line3, = ax.plot(x, y - 0.4, dashes=[4, 4], gapcolor='tab:pink',
+                 label='Using the dashes and gapcolor parameters')
+
+ax.legend(handlelength=4)
 plt.show()
diff --git a/examples/lines_bars_and_markers/lines_with_ticks_demo.py b/examples/lines_bars_and_markers/lines_with_ticks_demo.py
index c7b902f09ddf..f7ef646c647f 100644
--- a/examples/lines_bars_and_markers/lines_with_ticks_demo.py
+++ b/examples/lines_bars_and_markers/lines_with_ticks_demo.py
@@ -15,10 +15,12 @@
 import matplotlib.pyplot as plt
 from matplotlib import patheffects
 
+# Plot a straight diagonal line with ticked style path
 fig, ax = plt.subplots(figsize=(6, 6))
 ax.plot([0, 1], [0, 1], label="Line",
         path_effects=[patheffects.withTickedStroke(spacing=7, angle=135)])
 
+# Plot a curved line with ticked style path
 nx = 101
 x = np.linspace(0.0, 1.0, nx)
 y = 0.3*np.sin(x*8) + 0.4
diff --git a/examples/lines_bars_and_markers/linestyles.py b/examples/lines_bars_and_markers/linestyles.py
index 35920617c90c..96c9113ee4cc 100644
--- a/examples/lines_bars_and_markers/linestyles.py
+++ b/examples/lines_bars_and_markers/linestyles.py
@@ -6,8 +6,9 @@
 Simple linestyles can be defined using the strings "solid", "dotted", "dashed"
 or "dashdot". More refined control can be achieved by providing a dash tuple
 ``(offset, (on_off_seq))``. For example, ``(0, (3, 10, 1, 15))`` means
-(3pt line, 10pt space, 1pt line, 15pt space) with no offset. See also
-`.Line2D.set_linestyle`.
+(3pt line, 10pt space, 1pt line, 15pt space) with no offset, while
+``(5, (10, 3))``, means (10pt line, 3pt space), but skip the first 5pt line.
+See also `.Line2D.set_linestyle`.
 
 *Note*: The dash style can also be configured via `.Line2D.set_dashes`
 as shown in :doc:`/gallery/lines_bars_and_markers/line_demo_dash_control`
@@ -19,7 +20,7 @@
 
 linestyle_str = [
      ('solid', 'solid'),      # Same as (0, ()) or '-'
-     ('dotted', 'dotted'),    # Same as (0, (1, 1)) or '.'
+     ('dotted', 'dotted'),    # Same as (0, (1, 1)) or ':'
      ('dashed', 'dashed'),    # Same as '--'
      ('dashdot', 'dashdot')]  # Same as '-.'
 
@@ -27,7 +28,7 @@
      ('loosely dotted',        (0, (1, 10))),
      ('dotted',                (0, (1, 1))),
      ('densely dotted',        (0, (1, 1))),
-
+     ('long dash with offset', (5, (10, 3))),
      ('loosely dashed',        (0, (5, 10))),
      ('dashed',                (0, (5, 5))),
      ('densely dashed',        (0, (5, 1))),
@@ -65,9 +66,7 @@ def plot_linestyles(ax, linestyles, title):
                     color="blue", fontsize=8, ha="right", family="monospace")
 
 
-ax0, ax1 = (plt.figure(figsize=(10, 8))
-            .add_gridspec(2, 1, height_ratios=[1, 3])
-            .subplots())
+fig, (ax0, ax1) = plt.subplots(2, 1, figsize=(10, 8), height_ratios=[1, 3])
 
 plot_linestyles(ax0, linestyle_str[::-1], title='Named linestyles')
 plot_linestyles(ax1, linestyle_tuple[::-1], title='Parametrized linestyles')
diff --git a/examples/lines_bars_and_markers/marker_reference.py b/examples/lines_bars_and_markers/marker_reference.py
index 3d73ddee94ab..c4564d2b027d 100644
--- a/examples/lines_bars_and_markers/marker_reference.py
+++ b/examples/lines_bars_and_markers/marker_reference.py
@@ -9,17 +9,20 @@
 - `Unfilled markers`_
 - `Filled markers`_
 - `Markers created from TeX symbols`_
-- Custom markers can be created from paths. See
-  :doc:`/gallery/shapes_and_collections/marker_path`.
+- `Markers created from Paths`_
 
 For a list of all markers see also the `matplotlib.markers` documentation.
 
 For example usages see
 :doc:`/gallery/lines_bars_and_markers/scatter_star_poly`.
+
+.. redirect-from:: /gallery/shapes_and_collections/marker_path
 """
 
+from matplotlib.markers import MarkerStyle
 import matplotlib.pyplot as plt
 from matplotlib.lines import Line2D
+from matplotlib.transforms import Affine2D
 
 
 text_style = dict(horizontalalignment='right', verticalalignment='center',
@@ -116,7 +119,7 @@ def split_list(a_list):
 fig.suptitle('Mathtext markers', fontsize=14)
 fig.subplots_adjust(left=0.4)
 
-marker_style.update(markeredgecolor="None", markersize=15)
+marker_style.update(markeredgecolor="none", markersize=15)
 markers = ["$1$", r"$\frac{1}{2}$", "$f$", "$\u266B$", r"$\mathcal{A}$"]
 
 for y, marker in enumerate(markers):
@@ -126,3 +129,128 @@ def split_list(a_list):
 format_axes(ax)
 
 plt.show()
+
+
+###############################################################################
+# Markers created from Paths
+# ==========================
+#
+# Any `~.path.Path` can be used as a marker. The following example shows two
+# simple paths *star* and *circle*, and a more elaborate path of a circle with
+# a cut-out star.
+
+import matplotlib.path as mpath
+import numpy as np
+
+star = mpath.Path.unit_regular_star(6)
+circle = mpath.Path.unit_circle()
+# concatenate the circle with an internal cutout of the star
+cut_star = mpath.Path(
+    vertices=np.concatenate([circle.vertices, star.vertices[::-1, ...]]),
+    codes=np.concatenate([circle.codes, star.codes]))
+
+fig, ax = plt.subplots()
+fig.suptitle('Path markers', fontsize=14)
+fig.subplots_adjust(left=0.4)
+
+markers = {'star': star, 'circle': circle, 'cut_star': cut_star}
+
+for y, (name, marker) in enumerate(markers.items()):
+    ax.text(-0.5, y, name, **text_style)
+    ax.plot([y] * 3, marker=marker, **marker_style)
+format_axes(ax)
+
+plt.show()
+
+###############################################################################
+# Advanced marker modifications with transform
+# ============================================
+#
+# Markers can be modified by passing a transform to the MarkerStyle
+# constructor. Following example shows how a supplied rotation is applied to
+# several marker shapes.
+
+common_style = {k: v for k, v in filled_marker_style.items() if k != 'marker'}
+angles = [0, 10, 20, 30, 45, 60, 90]
+
+fig, ax = plt.subplots()
+fig.suptitle('Rotated markers', fontsize=14)
+
+ax.text(-0.5, 0, 'Filled marker', **text_style)
+for x, theta in enumerate(angles):
+    t = Affine2D().rotate_deg(theta)
+    ax.plot(x, 0, marker=MarkerStyle('o', 'left', t), **common_style)
+
+ax.text(-0.5, 1, 'Un-filled marker', **text_style)
+for x, theta in enumerate(angles):
+    t = Affine2D().rotate_deg(theta)
+    ax.plot(x, 1, marker=MarkerStyle('1', 'left', t), **common_style)
+
+ax.text(-0.5, 2, 'Equation marker', **text_style)
+for x, theta in enumerate(angles):
+    t = Affine2D().rotate_deg(theta)
+    eq = r'$\frac{1}{x}$'
+    ax.plot(x, 2, marker=MarkerStyle(eq, 'left', t), **common_style)
+
+for x, theta in enumerate(angles):
+    ax.text(x, 2.5, f"{theta}°", horizontalalignment="center")
+format_axes(ax)
+
+fig.tight_layout()
+plt.show()
+
+###############################################################################
+# Setting marker cap style and join style
+# =======================================
+#
+# Markers have default cap and join styles, but these can be
+# customized when creating a MarkerStyle.
+
+from matplotlib.markers import JoinStyle, CapStyle
+
+marker_inner = dict(markersize=35,
+                    markerfacecolor='tab:blue',
+                    markerfacecoloralt='lightsteelblue',
+                    markeredgecolor='brown',
+                    markeredgewidth=8,
+                    )
+
+marker_outer = dict(markersize=35,
+                    markerfacecolor='tab:blue',
+                    markerfacecoloralt='lightsteelblue',
+                    markeredgecolor='white',
+                    markeredgewidth=1,
+                    )
+
+fig, ax = plt.subplots()
+fig.suptitle('Marker CapStyle', fontsize=14)
+fig.subplots_adjust(left=0.1)
+
+for y, cap_style in enumerate(CapStyle):
+    ax.text(-0.5, y, cap_style.name, **text_style)
+    for x, theta in enumerate(angles):
+        t = Affine2D().rotate_deg(theta)
+        m = MarkerStyle('1', transform=t, capstyle=cap_style)
+        ax.plot(x, y, marker=m, **marker_inner)
+        ax.plot(x, y, marker=m, **marker_outer)
+        ax.text(x, len(CapStyle) - .5, f'{theta}°', ha='center')
+format_axes(ax)
+plt.show()
+
+###############################################################################
+# Modifying the join style:
+
+fig, ax = plt.subplots()
+fig.suptitle('Marker JoinStyle', fontsize=14)
+fig.subplots_adjust(left=0.05)
+
+for y, join_style in enumerate(JoinStyle):
+    ax.text(-0.5, y, join_style.name, **text_style)
+    for x, theta in enumerate(angles):
+        t = Affine2D().rotate_deg(theta)
+        m = MarkerStyle('*', transform=t, joinstyle=join_style)
+        ax.plot(x, y, marker=m, **marker_inner)
+        ax.text(x, len(JoinStyle) - .5, f'{theta}°', ha='center')
+format_axes(ax)
+
+plt.show()
diff --git a/examples/lines_bars_and_markers/markevery_demo.py b/examples/lines_bars_and_markers/markevery_demo.py
index caf12c9563c7..8dc02f52e28a 100644
--- a/examples/lines_bars_and_markers/markevery_demo.py
+++ b/examples/lines_bars_and_markers/markevery_demo.py
@@ -3,99 +3,96 @@
 Markevery Demo
 ==============
 
-This example demonstrates the various options for showing a marker at a
-subset of data points using the ``markevery`` property of a Line2D object.
-
-Integer arguments are fairly intuitive.  e.g. ``markevery=5`` will plot every
-5th marker starting from the first data point.
-
-Float arguments allow markers to be spaced at approximately equal distances
-along the line.  The theoretical distance along the line between markers is
-determined by multiplying the display-coordinate distance of the axes
-bounding-box diagonal by the value of ``markevery``.  The data points closest
-to the theoretical distances will be shown.
-
-A slice or list/array can also be used with ``markevery`` to specify the
-markers to show.
+The ``markevery`` property of `.Line2D` allows drawing markers at a subset of
+data points.
+
+The list of possible parameters is specified at `.Line2D.set_markevery`.
+In short:
+
+- A single integer N draws every N-th marker.
+- A tuple of integers (start, N) draws every N-th marker, starting at data
+  index *start*.
+- A list of integers draws the markers at the specified indices.
+- A slice draws the markers at the sliced indices.
+- A float specifies the distance between markers as a fraction of the Axes
+  diagonal in screen space. This will lead to a visually uniform distribution
+  of the points along the line, irrespective of scales and zooming.
 """
 
 import numpy as np
 import matplotlib.pyplot as plt
 
 # define a list of markevery cases to plot
-cases = [None,
-         8,
-         (30, 8),
-         [16, 24, 30], [0, -1],
-         slice(100, 200, 3),
-         0.1, 0.3, 1.5,
-         (0.0, 0.1), (0.45, 0.1)]
-
-# define the figure size and grid layout properties
-figsize = (10, 8)
-cols = 3
-rows = len(cases) // cols + 1
-# define the data for cartesian plots
+cases = [
+    None,
+    8,
+    (30, 8),
+    [16, 24, 32],
+    [0, -1],
+    slice(100, 200, 3),
+    0.1,
+    0.4,
+    (0.2, 0.4)
+]
+
+# data points
 delta = 0.11
 x = np.linspace(0, 10 - 2 * delta, 200) + delta
 y = np.sin(x) + 1.0 + delta
 
-
-def trim_axs(axs, N):
-    """
-    Reduce *axs* to *N* Axes. All further Axes are removed from the figure.
-    """
-    axs = axs.flat
-    for ax in axs[N:]:
-        ax.remove()
-    return axs[:N]
-
 ###############################################################################
-# Plot each markevery case for linear x and y scales
+# markevery with linear scales
+# ----------------------------
 
-axs = plt.figure(figsize=figsize, constrained_layout=True).subplots(rows, cols)
-axs = trim_axs(axs, len(cases))
-for ax, case in zip(axs, cases):
-    ax.set_title('markevery=%s' % str(case))
-    ax.plot(x, y, 'o', ls='-', ms=4, markevery=case)
+fig, axs = plt.subplots(3, 3, figsize=(10, 6), constrained_layout=True)
+for ax, markevery in zip(axs.flat, cases):
+    ax.set_title(f'markevery={markevery}')
+    ax.plot(x, y, 'o', ls='-', ms=4, markevery=markevery)
 
 ###############################################################################
-# Plot each markevery case for log x and y scales
-
-axs = plt.figure(figsize=figsize, constrained_layout=True).subplots(rows, cols)
-axs = trim_axs(axs, len(cases))
-for ax, case in zip(axs, cases):
-    ax.set_title('markevery=%s' % str(case))
+# markevery with log scales
+# -------------------------
+#
+# Note that the log scale causes a visual asymmetry in the marker distance for
+# when subsampling the data using an integer. In contrast, subsampling on
+# fraction of figure size creates even distributions, because it's based on
+# fractions of the Axes diagonal, not on data coordinates or data indices.
+
+fig, axs = plt.subplots(3, 3, figsize=(10, 6), constrained_layout=True)
+for ax, markevery in zip(axs.flat, cases):
+    ax.set_title(f'markevery={markevery}')
     ax.set_xscale('log')
     ax.set_yscale('log')
-    ax.plot(x, y, 'o', ls='-', ms=4, markevery=case)
+    ax.plot(x, y, 'o', ls='-', ms=4, markevery=markevery)
 
 ###############################################################################
-# Plot each markevery case for linear x and y scales but zoomed in
-# note the behaviour when zoomed in.  When a start marker offset is specified
-# it is always interpreted with respect to the first data point which might be
-# different to the first visible data point.
-
-axs = plt.figure(figsize=figsize, constrained_layout=True).subplots(rows, cols)
-axs = trim_axs(axs, len(cases))
-for ax, case in zip(axs, cases):
-    ax.set_title('markevery=%s' % str(case))
-    ax.plot(x, y, 'o', ls='-', ms=4, markevery=case)
+# markevery on zoomed plots
+# -------------------------
+#
+# Integer-based *markevery* specifications select points from the underlying
+# data and are independent on the view. In contrast, float-based specifications
+# are related to the Axes diagonal. While zooming does not change the Axes
+# diagonal, it changes the displayed data range, and more points will be
+# displayed when zooming.
+
+fig, axs = plt.subplots(3, 3, figsize=(10, 6), constrained_layout=True)
+for ax, markevery in zip(axs.flat, cases):
+    ax.set_title(f'markevery={markevery}')
+    ax.plot(x, y, 'o', ls='-', ms=4, markevery=markevery)
     ax.set_xlim((6, 6.7))
     ax.set_ylim((1.1, 1.7))
 
-# define data for polar plots
+###############################################################################
+# markevery on polar plots
+# ------------------------
+
 r = np.linspace(0, 3.0, 200)
 theta = 2 * np.pi * r
 
-###############################################################################
-# Plot each markevery case for polar plots
-
-axs = plt.figure(figsize=figsize, constrained_layout=True).subplots(
-    rows, cols, subplot_kw={'projection': 'polar'})
-axs = trim_axs(axs, len(cases))
-for ax, case in zip(axs, cases):
-    ax.set_title('markevery=%s' % str(case))
-    ax.plot(theta, r, 'o', ls='-', ms=4, markevery=case)
+fig, axs = plt.subplots(3, 3, figsize=(10, 6), constrained_layout=True,
+                        subplot_kw={'projection': 'polar'})
+for ax, markevery in zip(axs.flat, cases):
+    ax.set_title(f'markevery={markevery}')
+    ax.plot(theta, r, 'o', ls='-', ms=4, markevery=markevery)
 
 plt.show()
diff --git a/examples/lines_bars_and_markers/markevery_prop_cycle.py b/examples/lines_bars_and_markers/markevery_prop_cycle.py
deleted file mode 100644
index 295de4756736..000000000000
--- a/examples/lines_bars_and_markers/markevery_prop_cycle.py
+++ /dev/null
@@ -1,63 +0,0 @@
-"""
-=========================================
-prop_cycle property markevery in rcParams
-=========================================
-
-This example demonstrates a working solution to issue #8576, providing full
-support of the markevery property for axes.prop_cycle assignments through
-rcParams. Makes use of the same list of markevery cases from the
-:doc:`markevery demo
-</gallery/lines_bars_and_markers/markevery_demo>`.
-
-Renders a plot with shifted-sine curves along each column with
-a unique markevery value for each sine curve.
-"""
-from cycler import cycler
-import numpy as np
-import matplotlib as mpl
-import matplotlib.pyplot as plt
-
-# Define a list of markevery cases and color cases to plot
-cases = [None,
-         8,
-         (30, 8),
-         [16, 24, 30],
-         [0, -1],
-         slice(100, 200, 3),
-         0.1,
-         0.3,
-         1.5,
-         (0.0, 0.1),
-         (0.45, 0.1)]
-
-colors = ['#1f77b4',
-          '#ff7f0e',
-          '#2ca02c',
-          '#d62728',
-          '#9467bd',
-          '#8c564b',
-          '#e377c2',
-          '#7f7f7f',
-          '#bcbd22',
-          '#17becf',
-          '#1a55FF']
-
-# Configure rcParams axes.prop_cycle to simultaneously cycle cases and colors.
-mpl.rcParams['axes.prop_cycle'] = cycler(markevery=cases, color=colors)
-
-# Create data points and offsets
-x = np.linspace(0, 2 * np.pi)
-offsets = np.linspace(0, 2 * np.pi, 11, endpoint=False)
-yy = np.transpose([np.sin(x + phi) for phi in offsets])
-
-# Set the plot curve with markers and a title
-fig = plt.figure()
-ax = fig.add_axes([0.1, 0.1, 0.6, 0.75])
-
-for i in range(len(cases)):
-    ax.plot(yy[:, i], marker='o', label=str(cases[i]))
-    ax.legend(bbox_to_anchor=(1.05, 1), loc='upper left', borderaxespad=0.)
-
-plt.title('Support for axes.prop_cycle cycler with markevery')
-
-plt.show()
diff --git a/examples/lines_bars_and_markers/masked_demo.py b/examples/lines_bars_and_markers/masked_demo.py
index 52ea1a68b772..1f94a4f61891 100644
--- a/examples/lines_bars_and_markers/masked_demo.py
+++ b/examples/lines_bars_and_markers/masked_demo.py
@@ -15,7 +15,7 @@
 plotting with a line, it will be broken there.
 
 .. _masked array:
-   https://docs.scipy.org/doc/numpy/reference/maskedarray.generic.html
+   https://numpy.org/doc/stable/reference/maskedarray.generic.html
 
 The following example illustrates the three cases:
 
diff --git a/examples/lines_bars_and_markers/multivariate_marker_plot.py b/examples/lines_bars_and_markers/multivariate_marker_plot.py
new file mode 100644
index 000000000000..89670b5a223f
--- /dev/null
+++ b/examples/lines_bars_and_markers/multivariate_marker_plot.py
@@ -0,0 +1,46 @@
+"""
+==============================================
+Mapping marker properties to multivariate data
+==============================================
+
+This example shows how to use different properties of markers to plot
+multivariate datasets. Here we represent a successful baseball throw as a
+smiley face with marker size mapped to the skill of thrower, marker rotation to
+the take-off angle, and thrust to the marker color.
+"""
+
+import numpy as np
+import matplotlib.pyplot as plt
+from matplotlib.markers import MarkerStyle
+from matplotlib.transforms import Affine2D
+from matplotlib.textpath import TextPath
+from matplotlib.colors import Normalize
+
+SUCCESS_SYMBOLS = [
+    TextPath((0, 0), "☹"),
+    TextPath((0, 0), "😒"),
+    TextPath((0, 0), "☺"),
+]
+
+N = 25
+np.random.seed(42)
+skills = np.random.uniform(5, 80, size=N) * 0.1 + 5
+takeoff_angles = np.random.normal(0, 90, N)
+thrusts = np.random.uniform(size=N)
+successful = np.random.randint(0, 3, size=N)
+positions = np.random.normal(size=(N, 2)) * 5
+data = zip(skills, takeoff_angles, thrusts, successful, positions)
+
+cmap = plt.colormaps["plasma"]
+fig, ax = plt.subplots()
+fig.suptitle("Throwing success", size=14)
+for skill, takeoff, thrust, mood, pos in data:
+    t = Affine2D().scale(skill).rotate_deg(takeoff)
+    m = MarkerStyle(SUCCESS_SYMBOLS[mood], transform=t)
+    ax.plot(pos[0], pos[1], marker=m, color=cmap(thrust))
+fig.colorbar(plt.cm.ScalarMappable(norm=Normalize(0, 1), cmap=cmap),
+             ax=ax, label="Normalized Thrust [a.u.]")
+ax.set_xlabel("X position [m]")
+ax.set_ylabel("Y position [m]")
+
+plt.show()
diff --git a/examples/lines_bars_and_markers/psd_demo.py b/examples/lines_bars_and_markers/psd_demo.py
index 43fcc9bd47b4..0ab038c2991b 100644
--- a/examples/lines_bars_and_markers/psd_demo.py
+++ b/examples/lines_bars_and_markers/psd_demo.py
@@ -12,7 +12,6 @@
 import matplotlib.pyplot as plt
 import numpy as np
 import matplotlib.mlab as mlab
-import matplotlib.gridspec as gridspec
 
 # Fixing random state for reproducibility
 np.random.seed(19680801)
@@ -58,39 +57,44 @@
 y = y + np.random.randn(*t.shape)
 
 # Plot the raw time series
-fig = plt.figure(constrained_layout=True)
-gs = gridspec.GridSpec(2, 3, figure=fig)
-ax = fig.add_subplot(gs[0, :])
-ax.plot(t, y)
-ax.set_xlabel('time [s]')
-ax.set_ylabel('signal')
+fig, axs = plt.subplot_mosaic([
+    ['signal', 'signal', 'signal'],
+    ['zero padding', 'block size', 'overlap'],
+], layout='constrained')
+
+axs['signal'].plot(t, y)
+axs['signal'].set_xlabel('time [s]')
+axs['signal'].set_ylabel('signal')
 
 # Plot the PSD with different amounts of zero padding. This uses the entire
 # time series at once
-ax2 = fig.add_subplot(gs[1, 0])
-ax2.psd(y, NFFT=len(t), pad_to=len(t), Fs=fs)
-ax2.psd(y, NFFT=len(t), pad_to=len(t) * 2, Fs=fs)
-ax2.psd(y, NFFT=len(t), pad_to=len(t) * 4, Fs=fs)
-ax2.set_title('zero padding')
+axs['zero padding'].psd(y, NFFT=len(t), pad_to=len(t), Fs=fs)
+axs['zero padding'].psd(y, NFFT=len(t), pad_to=len(t) * 2, Fs=fs)
+axs['zero padding'].psd(y, NFFT=len(t), pad_to=len(t) * 4, Fs=fs)
 
 # Plot the PSD with different block sizes, Zero pad to the length of the
 # original data sequence.
-ax3 = fig.add_subplot(gs[1, 1], sharex=ax2, sharey=ax2)
-ax3.psd(y, NFFT=len(t), pad_to=len(t), Fs=fs)
-ax3.psd(y, NFFT=len(t) // 2, pad_to=len(t), Fs=fs)
-ax3.psd(y, NFFT=len(t) // 4, pad_to=len(t), Fs=fs)
-ax3.set_ylabel('')
-ax3.set_title('block size')
+axs['block size'].psd(y, NFFT=len(t), pad_to=len(t), Fs=fs)
+axs['block size'].psd(y, NFFT=len(t) // 2, pad_to=len(t), Fs=fs)
+axs['block size'].psd(y, NFFT=len(t) // 4, pad_to=len(t), Fs=fs)
+axs['block size'].set_ylabel('')
 
 # Plot the PSD with different amounts of overlap between blocks
-ax4 = fig.add_subplot(gs[1, 2], sharex=ax2, sharey=ax2)
-ax4.psd(y, NFFT=len(t) // 2, pad_to=len(t), noverlap=0, Fs=fs)
-ax4.psd(y, NFFT=len(t) // 2, pad_to=len(t),
-        noverlap=int(0.05 * len(t) / 2.), Fs=fs)
-ax4.psd(y, NFFT=len(t) // 2, pad_to=len(t),
-        noverlap=int(0.2 * len(t) / 2.), Fs=fs)
-ax4.set_ylabel('')
-ax4.set_title('overlap')
+axs['overlap'].psd(y, NFFT=len(t) // 2, pad_to=len(t), noverlap=0, Fs=fs)
+axs['overlap'].psd(y, NFFT=len(t) // 2, pad_to=len(t),
+                   noverlap=int(0.025 * len(t)), Fs=fs)
+axs['overlap'].psd(y, NFFT=len(t) // 2, pad_to=len(t),
+                   noverlap=int(0.1 * len(t)), Fs=fs)
+axs['overlap'].set_ylabel('')
+axs['overlap'].set_title('overlap')
+
+for title, ax in axs.items():
+    if title == 'signal':
+        continue
+
+    ax.set_title(title)
+    ax.sharex(axs['zero padding'])
+    ax.sharey(axs['zero padding'])
 
 plt.show()
 
diff --git a/examples/lines_bars_and_markers/scatter_custom_symbol.py b/examples/lines_bars_and_markers/scatter_custom_symbol.py
index 428a68318671..b8e57b0e5e1f 100644
--- a/examples/lines_bars_and_markers/scatter_custom_symbol.py
+++ b/examples/lines_bars_and_markers/scatter_custom_symbol.py
@@ -1,18 +1,43 @@
 """
-=====================
-Scatter Custom Symbol
-=====================
-
-Creating a custom ellipse symbol in scatter plot.
+=================================
+Scatter plots with custom symbols
+=================================
 
+.. redirect-from:: /gallery/lines_bars_and_markers/scatter_symbol
+.. redirect-from:: /gallery/lines_bars_and_markers/scatter_piecharts
 """
+
+##############################################################################
+# Using TeX symbols
+# -----------------
+# An easy way to customize scatter symbols is passing a TeX symbol name
+# enclosed in $-signs as a marker. Below we use ``marker=r'$\clubsuit$'``.
+
 import matplotlib.pyplot as plt
 import numpy as np
 
-
 # Fixing random state for reproducibility
 np.random.seed(19680801)
 
+
+x = np.arange(0.0, 50.0, 2.0)
+y = x ** 1.3 + np.random.rand(*x.shape) * 30.0
+sizes = np.random.rand(*x.shape) * 800 + 500
+
+fig, ax = plt.subplots()
+ax.scatter(x, y, sizes, c="green", alpha=0.5, marker=r'$\clubsuit$',
+           label="Luck")
+ax.set_xlabel("Leprechauns")
+ax.set_ylabel("Gold")
+ax.legend()
+plt.show()
+
+##############################################################################
+# Using a custom path
+# -------------------
+# Alternatively, one can also pass a custom path of N vertices as a Nx2 array
+# of x, y values as *marker*.
+
 # unit area ellipse
 rx, ry = 3., 1.
 area = rx * ry * np.pi
diff --git a/examples/lines_bars_and_markers/scatter_demo2.py b/examples/lines_bars_and_markers/scatter_demo2.py
index 7a669ff05d11..ec7e8183f8c4 100644
--- a/examples/lines_bars_and_markers/scatter_demo2.py
+++ b/examples/lines_bars_and_markers/scatter_demo2.py
@@ -9,9 +9,10 @@
 import matplotlib.pyplot as plt
 import matplotlib.cbook as cbook
 
-# Load a numpy record array from yahoo csv data with fields date, open, close,
-# volume, adj_close from the mpl-data/example directory. The record array
-# stores the date as an np.datetime64 with a day unit ('D') in the date column.
+# Load a numpy record array from yahoo csv data with fields date, open, high,
+# low, close, volume, adj_close from the mpl-data/sample_data directory. The
+# record array stores the date as an np.datetime64 with a day unit ('D') in
+# the date column.
 price_data = (cbook.get_sample_data('goog.npz', np_load=True)['price_data']
               .view(np.recarray))
 price_data = price_data[-250:]  # get the most recent 250 trading days
diff --git a/examples/lines_bars_and_markers/scatter_hist.py b/examples/lines_bars_and_markers/scatter_hist.py
index 73fbee3dc6a2..29b2f96947a4 100644
--- a/examples/lines_bars_and_markers/scatter_hist.py
+++ b/examples/lines_bars_and_markers/scatter_hist.py
@@ -3,18 +3,22 @@
 Scatter plot with histograms
 ============================
 
-Show the marginal distributions of a scatter as histograms at the sides of
+Show the marginal distributions of a scatter plot as histograms at the sides of
 the plot.
 
 For a nice alignment of the main axes with the marginals, two options are shown
-below.
+below:
 
-* the axes positions are defined in terms of rectangles in figure coordinates
-* the axes positions are defined via a gridspec
+.. contents::
+   :local:
+
+While `.Axes.inset_axes` may be a bit more complex, it allows correct handling
+of main axes with a fixed aspect ratio.
 
 An alternative method to produce a similar figure using the ``axes_grid1``
-toolkit is shown in the
-:doc:`/gallery/axes_grid1/scatter_hist_locatable_axes` example.
+toolkit is shown in the :doc:`/gallery/axes_grid1/scatter_hist_locatable_axes`
+example.  Finally, it is also possible to position all axes in absolute
+coordinates using `.Figure.add_axes` (not shown here).
 
 Let us first define a function that takes x and y data as input, as well
 as three axes, the main axes for the scatter, and two marginal axes. It will
@@ -52,60 +56,53 @@ def scatter_hist(x, y, ax, ax_histx, ax_histy):
 
 #############################################################################
 #
-# Axes in figure coordinates
-# --------------------------
-#
-# To define the axes positions, `.Figure.add_axes` is provided with a rectangle
-# ``[left, bottom, width, height]`` in figure coordinates. The marginal axes
-# share one dimension with the main axes.
-
-# definitions for the axes
-left, width = 0.1, 0.65
-bottom, height = 0.1, 0.65
-spacing = 0.005
-
-
-rect_scatter = [left, bottom, width, height]
-rect_histx = [left, bottom + height + spacing, width, 0.2]
-rect_histy = [left + width + spacing, bottom, 0.2, height]
-
-# start with a square Figure
-fig = plt.figure(figsize=(8, 8))
-
-ax = fig.add_axes(rect_scatter)
-ax_histx = fig.add_axes(rect_histx, sharex=ax)
-ax_histy = fig.add_axes(rect_histy, sharey=ax)
-
-# use the previously defined function
-scatter_hist(x, y, ax, ax_histx, ax_histy)
-
-plt.show()
-
-
-#############################################################################
-#
-# Using a gridspec
-# ----------------
+# Defining the axes positions using a gridspec
+# --------------------------------------------
 #
-# We may equally define a gridspec with unequal width- and height-ratios to
-# achieve desired layout. Also see the :doc:`/tutorials/intermediate/gridspec`
-# tutorial.
-
-# start with a square Figure
-fig = plt.figure(figsize=(8, 8))
+# We define a gridspec with unequal width- and height-ratios to achieve desired
+# layout.  Also see the :doc:`/tutorials/intermediate/arranging_axes` tutorial.
 
-# Add a gridspec with two rows and two columns and a ratio of 2 to 7 between
+# Start with a square Figure.
+fig = plt.figure(figsize=(6, 6))
+# Add a gridspec with two rows and two columns and a ratio of 1 to 4 between
 # the size of the marginal axes and the main axes in both directions.
 # Also adjust the subplot parameters for a square plot.
-gs = fig.add_gridspec(2, 2,  width_ratios=(7, 2), height_ratios=(2, 7),
+gs = fig.add_gridspec(2, 2,  width_ratios=(4, 1), height_ratios=(1, 4),
                       left=0.1, right=0.9, bottom=0.1, top=0.9,
                       wspace=0.05, hspace=0.05)
-
+# Create the Axes.
 ax = fig.add_subplot(gs[1, 0])
 ax_histx = fig.add_subplot(gs[0, 0], sharex=ax)
 ax_histy = fig.add_subplot(gs[1, 1], sharey=ax)
+# Draw the scatter plot and marginals.
+scatter_hist(x, y, ax, ax_histx, ax_histy)
+
 
-# use the previously defined function
+#############################################################################
+#
+# Defining the axes positions using inset_axes
+# --------------------------------------------
+#
+# `~.Axes.inset_axes` can be used to position marginals *outside* the main
+# axes.  The advantage of doing so is that the aspect ratio of the main axes
+# can be fixed, and the marginals will always be drawn relative to the position
+# of the axes.
+
+# Create a Figure, which doesn't have to be square.
+fig = plt.figure(constrained_layout=True)
+# Create the main axes, leaving 25% of the figure space at the top and on the
+# right to position marginals.
+ax = fig.add_gridspec(top=0.75, right=0.75).subplots()
+# The main axes' aspect can be fixed.
+ax.set(aspect=1)
+# Create marginal axes, which have 25% of the size of the main axes.  Note that
+# the inset axes are positioned *outside* (on the right and the top) of the
+# main axes, by specifying axes coordinates greater than 1.  Axes coordinates
+# less than 0 would likewise specify positions on the left and the bottom of
+# the main axes.
+ax_histx = ax.inset_axes([0, 1.05, 1, 0.25], sharex=ax)
+ax_histy = ax.inset_axes([1.05, 0, 0.25, 1], sharey=ax)
+# Draw the scatter plot and marginals.
 scatter_hist(x, y, ax, ax_histx, ax_histy)
 
 plt.show()
@@ -113,17 +110,13 @@ def scatter_hist(x, y, ax, ax_histx, ax_histy):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-import matplotlib
-matplotlib.figure.Figure.add_axes
-matplotlib.figure.Figure.add_subplot
-matplotlib.figure.Figure.add_gridspec
-matplotlib.axes.Axes.scatter
-matplotlib.axes.Axes.hist
+#    - `matplotlib.figure.Figure.add_subplot`
+#    - `matplotlib.figure.Figure.add_gridspec`
+#    - `matplotlib.axes.Axes.inset_axes`
+#    - `matplotlib.axes.Axes.scatter`
+#    - `matplotlib.axes.Axes.hist`
diff --git a/examples/lines_bars_and_markers/scatter_piecharts.py b/examples/lines_bars_and_markers/scatter_piecharts.py
deleted file mode 100644
index 6b2b4aa88824..000000000000
--- a/examples/lines_bars_and_markers/scatter_piecharts.py
+++ /dev/null
@@ -1,57 +0,0 @@
-"""
-===================================
-Scatter plot with pie chart markers
-===================================
-
-This example makes custom 'pie charts' as the markers for a scatter plot.
-
-Thanks to Manuel Metz for the example.
-"""
-
-import numpy as np
-import matplotlib.pyplot as plt
-
-# first define the ratios
-r1 = 0.2       # 20%
-r2 = r1 + 0.4  # 40%
-
-# define some sizes of the scatter marker
-sizes = np.array([60, 80, 120])
-
-# calculate the points of the first pie marker
-# these are just the origin (0, 0) + some (cos, sin) points on a circle
-x1 = np.cos(2 * np.pi * np.linspace(0, r1))
-y1 = np.sin(2 * np.pi * np.linspace(0, r1))
-xy1 = np.row_stack([[0, 0], np.column_stack([x1, y1])])
-s1 = np.abs(xy1).max()
-
-x2 = np.cos(2 * np.pi * np.linspace(r1, r2))
-y2 = np.sin(2 * np.pi * np.linspace(r1, r2))
-xy2 = np.row_stack([[0, 0], np.column_stack([x2, y2])])
-s2 = np.abs(xy2).max()
-
-x3 = np.cos(2 * np.pi * np.linspace(r2, 1))
-y3 = np.sin(2 * np.pi * np.linspace(r2, 1))
-xy3 = np.row_stack([[0, 0], np.column_stack([x3, y3])])
-s3 = np.abs(xy3).max()
-
-fig, ax = plt.subplots()
-ax.scatter(range(3), range(3), marker=xy1, s=s1**2 * sizes, facecolor='blue')
-ax.scatter(range(3), range(3), marker=xy2, s=s2**2 * sizes, facecolor='green')
-ax.scatter(range(3), range(3), marker=xy3, s=s3**2 * sizes, facecolor='red')
-
-plt.show()
-
-#############################################################################
-#
-# ------------
-#
-# References
-# """"""""""
-#
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.scatter
-matplotlib.pyplot.scatter
diff --git a/examples/lines_bars_and_markers/scatter_symbol.py b/examples/lines_bars_and_markers/scatter_symbol.py
deleted file mode 100644
index d99b6a80a740..000000000000
--- a/examples/lines_bars_and_markers/scatter_symbol.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""
-==============
-Scatter Symbol
-==============
-
-Scatter plot with clover symbols.
-
-"""
-import matplotlib.pyplot as plt
-import numpy as np
-
-# Fixing random state for reproducibility
-np.random.seed(19680801)
-
-
-x = np.arange(0.0, 50.0, 2.0)
-y = x ** 1.3 + np.random.rand(*x.shape) * 30.0
-s = np.random.rand(*x.shape) * 800 + 500
-
-plt.scatter(x, y, s, c="g", alpha=0.5, marker=r'$\clubsuit$',
-            label="Luck")
-plt.xlabel("Leprechauns")
-plt.ylabel("Gold")
-plt.legend(loc='upper left')
-plt.show()
diff --git a/examples/lines_bars_and_markers/scatter_with_legend.py b/examples/lines_bars_and_markers/scatter_with_legend.py
index 6ff312711aa5..56e539644bf9 100644
--- a/examples/lines_bars_and_markers/scatter_with_legend.py
+++ b/examples/lines_bars_and_markers/scatter_with_legend.py
@@ -12,9 +12,10 @@
 """
 
 import numpy as np
-np.random.seed(19680801)
 import matplotlib.pyplot as plt
 
+np.random.seed(19680801)
+
 
 fig, ax = plt.subplots()
 for color in ['tab:blue', 'tab:orange', 'tab:green']:
@@ -100,16 +101,11 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The usage of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.scatter
-matplotlib.pyplot.scatter
-matplotlib.axes.Axes.legend
-matplotlib.pyplot.legend
-matplotlib.collections.PathCollection.legend_elements
+#    - `matplotlib.axes.Axes.scatter` / `matplotlib.pyplot.scatter`
+#    - `matplotlib.axes.Axes.legend` / `matplotlib.pyplot.legend`
+#    - `matplotlib.collections.PathCollection.legend_elements`
diff --git a/examples/lines_bars_and_markers/simple_plot.py b/examples/lines_bars_and_markers/simple_plot.py
index f51e16015b2e..86b51db41259 100644
--- a/examples/lines_bars_and_markers/simple_plot.py
+++ b/examples/lines_bars_and_markers/simple_plot.py
@@ -6,7 +6,6 @@
 Create a simple plot.
 """
 
-import matplotlib
 import matplotlib.pyplot as plt
 import numpy as np
 
@@ -26,14 +25,11 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-matplotlib.axes.Axes.plot
-matplotlib.pyplot.plot
-matplotlib.pyplot.subplots
-matplotlib.figure.Figure.savefig
+#    - `matplotlib.axes.Axes.plot` / `matplotlib.pyplot.plot`
+#    - `matplotlib.pyplot.subplots`
+#    - `matplotlib.figure.Figure.savefig`
diff --git a/examples/lines_bars_and_markers/span_regions.py b/examples/lines_bars_and_markers/span_regions.py
index 54aae613de77..79ebfcd008f2 100644
--- a/examples/lines_bars_and_markers/span_regions.py
+++ b/examples/lines_bars_and_markers/span_regions.py
@@ -38,16 +38,12 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.collections.BrokenBarHCollection
-matplotlib.collections.BrokenBarHCollection.span_where
-matplotlib.axes.Axes.add_collection
-matplotlib.axes.Axes.axhline
+#    - `matplotlib.collections.BrokenBarHCollection`
+#    - `matplotlib.collections.BrokenBarHCollection.span_where`
+#    - `matplotlib.axes.Axes.add_collection`
+#    - `matplotlib.axes.Axes.axhline`
diff --git a/examples/lines_bars_and_markers/stackplot_demo.py b/examples/lines_bars_and_markers/stackplot_demo.py
index 6c9acfcacc34..142b3d2a0ce0 100644
--- a/examples/lines_bars_and_markers/stackplot_demo.py
+++ b/examples/lines_bars_and_markers/stackplot_demo.py
@@ -29,7 +29,7 @@
 
 fig, ax = plt.subplots()
 ax.stackplot(year, population_by_continent.values(),
-             labels=population_by_continent.keys())
+             labels=population_by_continent.keys(), alpha=0.8)
 ax.legend(loc='upper left')
 ax.set_title('World population')
 ax.set_xlabel('Year')
diff --git a/examples/lines_bars_and_markers/stairs_demo.py b/examples/lines_bars_and_markers/stairs_demo.py
index d1f02d37ff34..79f63975b32b 100644
--- a/examples/lines_bars_and_markers/stairs_demo.py
+++ b/examples/lines_bars_and_markers/stairs_demo.py
@@ -82,15 +82,10 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.stairs
-matplotlib.pyplot.stairs
-matplotlib.patches.StepPatch
+#    - `matplotlib.axes.Axes.stairs` / `matplotlib.pyplot.stairs`
+#    - `matplotlib.patches.StepPatch`
diff --git a/examples/lines_bars_and_markers/stem_plot.py b/examples/lines_bars_and_markers/stem_plot.py
index 57476ab5729f..4f74d50bde16 100644
--- a/examples/lines_bars_and_markers/stem_plot.py
+++ b/examples/lines_bars_and_markers/stem_plot.py
@@ -21,7 +21,7 @@
 # The parameters *linefmt*, *markerfmt*, and *basefmt* control basic format
 # properties of the plot. However, in contrast to `~.pyplot.plot` not all
 # properties are configurable via keyword arguments. For more advanced
-# control adapt the line objects returned by `~.pyplot`.
+# control adapt the line objects returned by `.pyplot`.
 
 markerline, stemlines, baseline = plt.stem(
     x, y, linefmt='grey', markerfmt='D', bottom=1.1)
@@ -30,14 +30,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.pyplot.stem
-matplotlib.axes.Axes.stem
+#    - `matplotlib.axes.Axes.stem` / `matplotlib.pyplot.stem`
diff --git a/examples/lines_bars_and_markers/step_demo.py b/examples/lines_bars_and_markers/step_demo.py
index c079ef05daad..f1016ead5283 100644
--- a/examples/lines_bars_and_markers/step_demo.py
+++ b/examples/lines_bars_and_markers/step_demo.py
@@ -56,16 +56,10 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.step
-matplotlib.pyplot.step
-matplotlib.axes.Axes.plot
-matplotlib.pyplot.plot
+#    - `matplotlib.axes.Axes.step` / `matplotlib.pyplot.step`
+#    - `matplotlib.axes.Axes.plot` / `matplotlib.pyplot.plot`
diff --git a/examples/lines_bars_and_markers/timeline.py b/examples/lines_bars_and_markers/timeline.py
index ee1d016f8f95..087e7320f6b8 100644
--- a/examples/lines_bars_and_markers/timeline.py
+++ b/examples/lines_bars_and_markers/timeline.py
@@ -97,18 +97,14 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.annotate
-matplotlib.axes.Axes.vlines
-matplotlib.axis.Axis.set_major_locator
-matplotlib.axis.Axis.set_major_formatter
-matplotlib.dates.MonthLocator
-matplotlib.dates.DateFormatter
+#    - `matplotlib.axes.Axes.annotate`
+#    - `matplotlib.axes.Axes.vlines`
+#    - `matplotlib.axis.Axis.set_major_locator`
+#    - `matplotlib.axis.Axis.set_major_formatter`
+#    - `matplotlib.dates.MonthLocator`
+#    - `matplotlib.dates.DateFormatter`
diff --git a/examples/lines_bars_and_markers/xcorr_acorr_demo.py b/examples/lines_bars_and_markers/xcorr_acorr_demo.py
index e78eefa84493..493cad034de8 100644
--- a/examples/lines_bars_and_markers/xcorr_acorr_demo.py
+++ b/examples/lines_bars_and_markers/xcorr_acorr_demo.py
@@ -26,16 +26,10 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.acorr
-matplotlib.axes.Axes.xcorr
-matplotlib.pyplot.acorr
-matplotlib.pyplot.xcorr
+#    - `matplotlib.axes.Axes.acorr` / `matplotlib.pyplot.acorr`
+#    - `matplotlib.axes.Axes.xcorr` / `matplotlib.pyplot.xcorr`
diff --git a/examples/misc/agg_buffer.py b/examples/misc/agg_buffer.py
deleted file mode 100644
index e63dcbfda1f6..000000000000
--- a/examples/misc/agg_buffer.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""
-==========
-Agg Buffer
-==========
-
-Use backend agg to access the figure canvas as an RGBA buffer, convert it to an
-array, and pass it to Pillow for rendering.
-"""
-
-import numpy as np
-
-from matplotlib.backends.backend_agg import FigureCanvasAgg
-import matplotlib.pyplot as plt
-
-plt.plot([1, 2, 3])
-
-canvas = plt.gcf().canvas
-
-agg = canvas.switch_backends(FigureCanvasAgg)
-agg.draw()
-X = np.asarray(agg.buffer_rgba())
-
-# Pass off to PIL.
-from PIL import Image
-im = Image.fromarray(X)
-
-# Uncomment this line to display the image using ImageMagick's `display` tool.
-# im.show()
diff --git a/examples/misc/agg_buffer_to_array.py b/examples/misc/agg_buffer_to_array.py
deleted file mode 100644
index 1202702367ae..000000000000
--- a/examples/misc/agg_buffer_to_array.py
+++ /dev/null
@@ -1,30 +0,0 @@
-"""
-===================
-Agg Buffer To Array
-===================
-
-Convert a rendered figure to its image (NumPy array) representation.
-"""
-import matplotlib.pyplot as plt
-import numpy as np
-from matplotlib.figure import Figure
-from matplotlib.backends.backend_agg import FigureCanvas
-
-# Create a figure that pyplot does not know about.
-fig = Figure()
-# attach a non-interactive Agg canvas to the figure
-# (as a side-effect of the ``__init__``)
-canvas = FigureCanvas(fig)
-ax = fig.subplots()
-ax.plot([1, 2, 3])
-ax.set_title('a simple figure')
-# Force a draw so we can grab the pixel buffer
-canvas.draw()
-# grab the pixel buffer and dump it into a numpy array
-X = np.array(canvas.renderer.buffer_rgba())
-
-# now display the array X as an Axes in a new figure
-fig2 = plt.figure()
-ax2 = fig2.add_subplot(frameon=False)
-ax2.imshow(X)
-plt.show()
diff --git a/examples/misc/anchored_artists.py b/examples/misc/anchored_artists.py
index 80176e40f3ec..101c692ced3a 100644
--- a/examples/misc/anchored_artists.py
+++ b/examples/misc/anchored_artists.py
@@ -9,76 +9,43 @@
 :doc:`/gallery/axes_grid1/simple_anchored_artists`, but it is
 implemented using only the matplotlib namespace, without the help
 of additional toolkits.
+
+.. redirect-from:: /gallery/userdemo/anchored_box01
+.. redirect-from:: /gallery/userdemo/anchored_box02
+.. redirect-from:: /gallery/userdemo/anchored_box03
 """
 
 from matplotlib import pyplot as plt
 from matplotlib.lines import Line2D
-from matplotlib.patches import Ellipse
+from matplotlib.patches import Circle, Ellipse
 from matplotlib.offsetbox import (
     AnchoredOffsetbox, AuxTransformBox, DrawingArea, TextArea, VPacker)
 
 
-class AnchoredText(AnchoredOffsetbox):
-    def __init__(self, s, loc, pad=0.4, borderpad=0.5,
-                 prop=None, frameon=True):
-        self.txt = TextArea(s)
-        super().__init__(loc, pad=pad, borderpad=borderpad,
-                         child=self.txt, prop=prop, frameon=frameon)
-
-
 def draw_text(ax):
-    """
-    Draw a text-box anchored to the upper-left corner of the figure.
-    """
-    at = AnchoredText("Figure 1a", loc='upper left', frameon=True)
-    at.patch.set_boxstyle("round,pad=0.,rounding_size=0.2")
-    ax.add_artist(at)
-
-
-class AnchoredDrawingArea(AnchoredOffsetbox):
-    def __init__(self, width, height, xdescent, ydescent,
-                 loc, pad=0.4, borderpad=0.5, prop=None, frameon=True):
-        self.da = DrawingArea(width, height, xdescent, ydescent)
-        super().__init__(loc, pad=pad, borderpad=borderpad,
-                         child=self.da, prop=None, frameon=frameon)
-
-
-def draw_circle(ax):
-    """
-    Draw a circle in axis coordinates
-    """
-    from matplotlib.patches import Circle
-    ada = AnchoredDrawingArea(20, 20, 0, 0,
-                              loc='upper right', pad=0., frameon=False)
-    p = Circle((10, 10), 10)
-    ada.da.add_artist(p)
-    ax.add_artist(ada)
+    """Draw a text-box anchored to the upper-left corner of the figure."""
+    box = AnchoredOffsetbox(child=TextArea("Figure 1a"),
+                            loc="upper left", frameon=True)
+    box.patch.set_boxstyle("round,pad=0.,rounding_size=0.2")
+    ax.add_artist(box)
 
 
-class AnchoredEllipse(AnchoredOffsetbox):
-    def __init__(self, transform, width, height, angle, loc,
-                 pad=0.1, borderpad=0.1, prop=None, frameon=True):
-        """
-        Draw an ellipse the size in data coordinate of the give axes.
-
-        pad, borderpad in fraction of the legend font size (or prop)
-        """
-        self._box = AuxTransformBox(transform)
-        self.ellipse = Ellipse((0, 0), width, height, angle)
-        self._box.add_artist(self.ellipse)
-        super().__init__(loc, pad=pad, borderpad=borderpad,
-                         child=self._box, prop=prop, frameon=frameon)
+def draw_circles(ax):
+    """Draw circles in axes coordinates."""
+    area = DrawingArea(40, 20, 0, 0)
+    area.add_artist(Circle((10, 10), 10, fc="tab:blue"))
+    area.add_artist(Circle((30, 10), 5, fc="tab:red"))
+    box = AnchoredOffsetbox(
+        child=area, loc="upper right", pad=0, frameon=False)
+    ax.add_artist(box)
 
 
 def draw_ellipse(ax):
-    """
-    Draw an ellipse of width=0.1, height=0.15 in data coordinates
-    """
-    ae = AnchoredEllipse(ax.transData, width=0.1, height=0.15, angle=0.,
-                         loc='lower left', pad=0.5, borderpad=0.4,
-                         frameon=True)
-
-    ax.add_artist(ae)
+    """Draw an ellipse of width=0.1, height=0.15 in data coordinates."""
+    aux_tr_box = AuxTransformBox(ax.transData)
+    aux_tr_box.add_artist(Ellipse((0, 0), width=0.1, height=0.15))
+    box = AnchoredOffsetbox(child=aux_tr_box, loc="lower left", frameon=True)
+    ax.add_artist(box)
 
 
 class AnchoredSizeBar(AnchoredOffsetbox):
@@ -115,11 +82,11 @@ def draw_sizebar(ax):
     ax.add_artist(asb)
 
 
-ax = plt.gca()
-ax.set_aspect(1.)
+fig, ax = plt.subplots()
+ax.set_aspect(1)
 
 draw_text(ax)
-draw_circle(ax)
+draw_circles(ax)
 draw_ellipse(ax)
 draw_sizebar(ax)
 
diff --git a/examples/misc/coords_report.py b/examples/misc/coords_report.py
index 84ce03e09a7f..127ce712fc1e 100644
--- a/examples/misc/coords_report.py
+++ b/examples/misc/coords_report.py
@@ -3,7 +3,8 @@
 Coords Report
 =============
 
-Override the default reporting of coords.
+Override the default reporting of coords as the mouse moves over the axes
+in an interactive backend.
 """
 
 import matplotlib.pyplot as plt
@@ -11,14 +12,14 @@
 
 
 def millions(x):
-    return '$%1.1fM' % (x*1e-6)
+    return '$%1.1fM' % (x * 1e-6)
 
 
 # Fixing random state for reproducibility
 np.random.seed(19680801)
 
 x = np.random.rand(20)
-y = 1e7*np.random.rand(20)
+y = 1e7 * np.random.rand(20)
 
 fig, ax = plt.subplots()
 ax.fmt_ydata = millions
diff --git a/examples/misc/custom_projection.py b/examples/misc/custom_projection.py
index 7e5a4b0d405c..4f6e85fc30fd 100644
--- a/examples/misc/custom_projection.py
+++ b/examples/misc/custom_projection.py
@@ -52,8 +52,9 @@ def _init_axis(self):
         # self.spines['geo'].register_axis(self.yaxis)
         self._update_transScale()
 
-    def cla(self):
-        super().cla()
+    def clear(self):
+        # docstring inherited
+        super().clear()
 
         self.set_longitude_grid(30)
         self.set_latitude_grid(15)
@@ -270,14 +271,8 @@ def format_coord(self, lon, lat):
         In this case, we want them to be displayed in degrees N/S/E/W.
         """
         lon, lat = np.rad2deg([lon, lat])
-        if lat >= 0.0:
-            ns = 'N'
-        else:
-            ns = 'S'
-        if lon >= 0.0:
-            ew = 'E'
-        else:
-            ew = 'W'
+        ns = 'N' if lat >= 0.0 else 'S'
+        ew = 'E' if lon >= 0.0 else 'W'
         return ('%f\N{DEGREE SIGN}%s, %f\N{DEGREE SIGN}%s'
                 % (abs(lat), ns, abs(lon), ew))
 
@@ -430,7 +425,7 @@ def __init__(self, *args, **kwargs):
         self._longitude_cap = np.pi / 2.0
         super().__init__(*args, **kwargs)
         self.set_aspect(0.5, adjustable='box', anchor='C')
-        self.cla()
+        self.clear()
 
     def _get_core_transform(self, resolution):
         return self.HammerTransform(resolution)
diff --git a/examples/misc/demo_agg_filter.py b/examples/misc/demo_agg_filter.py
index 16f1221563d2..0cdbf81f50b5 100644
--- a/examples/misc/demo_agg_filter.py
+++ b/examples/misc/demo_agg_filter.py
@@ -7,7 +7,7 @@
 rendering. You can modify the rendering of Artists by applying a filter via
 `.Artist.set_agg_filter`.
 
-.. _Anti-Grain Geometry (AGG): http://antigrain.com
+.. _Anti-Grain Geometry (AGG): http://agg.sourceforge.net/antigrain.com
 """
 
 import matplotlib.cm as cm
@@ -19,7 +19,7 @@
 
 
 def smooth1d(x, window_len):
-    # copied from http://www.scipy.org/Cookbook/SignalSmooth
+    # copied from https://scipy-cookbook.readthedocs.io/items/SignalSmooth.html
     s = np.r_[2*x[0] - x[window_len:1:-1], x, 2*x[-1] - x[-1:-window_len:-1]]
     w = np.hanning(window_len)
     y = np.convolve(w/w.sum(), s, mode='same')
@@ -38,7 +38,7 @@ class BaseFilter:
     def get_pad(self, dpi):
         return 0
 
-    def process_image(padded_src, dpi):
+    def process_image(self, padded_src, dpi):
         raise NotImplementedError("Should be overridden by subclasses")
 
     def __call__(self, im, dpi):
@@ -99,8 +99,19 @@ def process_image(self, padded_src, dpi):
 
 
 class LightFilter(BaseFilter):
-
-    def __init__(self, sigma, fraction=0.5):
+    """Apply LightSource filter"""
+
+    def __init__(self, sigma, fraction=1):
+        """
+        Parameters
+        ----------
+        sigma : float
+            sigma for gaussian filter
+        fraction: number, default: 1
+            Increases or decreases the contrast of the hillshade.
+            See `matplotlib.colors.LightSource`
+
+        """
         self.gauss_filter = GaussianFilter(sigma, alpha=1)
         self.light_source = LightSource()
         self.fraction = fraction
@@ -114,7 +125,8 @@ def process_image(self, padded_src, dpi):
         rgb = padded_src[:, :, :3]
         alpha = padded_src[:, :, 3:]
         rgb2 = self.light_source.shade_rgb(rgb, elevation,
-                                           fraction=self.fraction)
+                                           fraction=self.fraction,
+                                           blend_mode="overlay")
         return np.concatenate([rgb2, alpha], -1)
 
 
@@ -213,10 +225,9 @@ def drop_shadow_line(ax):
         shadow.update_from(l)
 
         # offset transform
-        ot = mtransforms.offset_copy(l.get_transform(), ax.figure,
-                                     x=4.0, y=-6.0, units='points')
-
-        shadow.set_transform(ot)
+        transform = mtransforms.offset_copy(l.get_transform(), ax.figure,
+                                            x=4.0, y=-6.0, units='points')
+        shadow.set_transform(transform)
 
         # adjust zorder of the shadow lines so that it is drawn below the
         # original lines
@@ -234,20 +245,19 @@ def drop_shadow_line(ax):
 def drop_shadow_patches(ax):
     # Copied from barchart_demo.py
     N = 5
-    men_means = [20, 35, 30, 35, 27]
+    group1_means = [20, 35, 30, 35, 27]
 
     ind = np.arange(N)  # the x locations for the groups
     width = 0.35  # the width of the bars
 
-    rects1 = ax.bar(ind, men_means, width, color='r', ec="w", lw=2)
+    rects1 = ax.bar(ind, group1_means, width, color='r', ec="w", lw=2)
 
-    women_means = [25, 32, 34, 20, 25]
-    rects2 = ax.bar(ind + width + 0.1, women_means, width,
+    group2_means = [25, 32, 34, 20, 25]
+    rects2 = ax.bar(ind + width + 0.1, group2_means, width,
                     color='y', ec="w", lw=2)
 
-    # gauss = GaussianFilter(1.5, offsets=(1, 1))
-    gauss = DropShadowFilter(5, offsets=(1, 1))
-    shadow = FilteredArtistList(rects1 + rects2, gauss)
+    drop = DropShadowFilter(5, offsets=(1, 1))
+    shadow = FilteredArtistList(rects1 + rects2, drop)
     ax.add_artist(shadow)
     shadow.set_zorder(rects1[0].get_zorder() - 0.1)
 
@@ -259,7 +269,7 @@ def drop_shadow_patches(ax):
 
 def light_filter_pie(ax):
     fracs = [15, 30, 45, 10]
-    explode = (0, 0.05, 0, 0)
+    explode = (0.1, 0.2, 0.1, 0.1)
     pies = ax.pie(fracs, explode=explode)
 
     light_filter = LightFilter(9)
@@ -269,7 +279,7 @@ def light_filter_pie(ax):
         p.set(ec="none",
               lw=2)
 
-    gauss = DropShadowFilter(9, offsets=(3, 4), alpha=0.7)
+    gauss = DropShadowFilter(9, offsets=(3, -4), alpha=0.7)
     shadow = FilteredArtistList(pies[0], gauss)
     ax.add_artist(shadow)
     shadow.set_zorder(pies[0][0].get_zorder() - 0.1)
diff --git a/examples/pyplots/fig_x.py b/examples/misc/fig_x.py
similarity index 60%
rename from examples/pyplots/fig_x.py
rename to examples/misc/fig_x.py
index 52a8840892cc..eaa16d80fa35 100644
--- a/examples/pyplots/fig_x.py
+++ b/examples/misc/fig_x.py
@@ -4,6 +4,8 @@
 =======================
 
 Adding lines to a figure without any axes.
+
+.. redirect-from:: /gallery/pyplots/fig_x
 """
 
 import matplotlib.pyplot as plt
@@ -17,15 +19,11 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.pyplot.figure
-matplotlib.lines
-matplotlib.lines.Line2D
+#    - `matplotlib.pyplot.figure`
+#    - `matplotlib.lines`
+#    - `matplotlib.lines.Line2D`
diff --git a/examples/misc/histogram_path.py b/examples/misc/histogram_path.py
index d93df6b2c863..8cbb64977623 100644
--- a/examples/misc/histogram_path.py
+++ b/examples/misc/histogram_path.py
@@ -78,23 +78,20 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.patches
-matplotlib.patches.PathPatch
-matplotlib.path
-matplotlib.path.Path
-matplotlib.path.Path.make_compound_path_from_polys
-matplotlib.axes.Axes.add_patch
-matplotlib.collections.PathCollection
-
-# This example shows an alternative to
-matplotlib.collections.PolyCollection
-matplotlib.axes.Axes.hist
+#    - `matplotlib.patches`
+#    - `matplotlib.patches.PathPatch`
+#    - `matplotlib.path`
+#    - `matplotlib.path.Path`
+#    - `matplotlib.path.Path.make_compound_path_from_polys`
+#    - `matplotlib.axes.Axes.add_patch`
+#    - `matplotlib.collections.PathCollection`
+#
+#    This example shows an alternative to
+#
+#    - `matplotlib.collections.PolyCollection`
+#    - `matplotlib.axes.Axes.hist`
diff --git a/examples/misc/hyperlinks_sgskip.py b/examples/misc/hyperlinks_sgskip.py
index 7f9cade91a29..2d0f6819cfb8 100644
--- a/examples/misc/hyperlinks_sgskip.py
+++ b/examples/misc/hyperlinks_sgskip.py
@@ -18,7 +18,7 @@
 
 fig = plt.figure()
 s = plt.scatter([1, 2, 3], [4, 5, 6])
-s.set_urls(['http://www.bbc.co.uk/news', 'http://www.google.com', None])
+s.set_urls(['https://www.bbc.com/news', 'https://www.google.com/', None])
 fig.savefig('scatter.svg')
 
 ###############################################################################
@@ -34,5 +34,5 @@
 im = plt.imshow(Z, interpolation='bilinear', cmap=cm.gray,
                 origin='lower', extent=[-3, 3, -3, 3])
 
-im.set_url('http://www.google.com')
+im.set_url('https://www.google.com/')
 fig.savefig('image.svg')
diff --git a/examples/misc/image_thumbnail_sgskip.py b/examples/misc/image_thumbnail_sgskip.py
index 97a9e9a627ea..68e3ba85ed38 100644
--- a/examples/misc/image_thumbnail_sgskip.py
+++ b/examples/misc/image_thumbnail_sgskip.py
@@ -20,7 +20,7 @@
     description="Build thumbnails of all images in a directory.")
 parser.add_argument("imagedir", type=Path)
 args = parser.parse_args()
-if not args.imagedir.isdir():
+if not args.imagedir.is_dir():
     sys.exit(f"Could not find input directory {args.imagedir}")
 
 outdir = Path("thumbs")
diff --git a/examples/misc/load_converter.py b/examples/misc/load_converter.py
deleted file mode 100644
index 793de7dc9264..000000000000
--- a/examples/misc/load_converter.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""
-==============
-Load converter
-==============
-
-This example demonstrates passing a custom converter to `numpy.genfromtxt` to
-extract dates from a CSV file.
-"""
-
-import dateutil.parser
-from matplotlib import cbook
-import matplotlib.pyplot as plt
-import numpy as np
-
-
-datafile = cbook.get_sample_data('msft.csv', asfileobj=False)
-print('loading', datafile)
-
-data = np.genfromtxt(
-    datafile, delimiter=',', names=True,
-    dtype=None, converters={0: dateutil.parser.parse})
-
-fig, ax = plt.subplots()
-ax.plot(data['Date'], data['High'], '-')
-fig.autofmt_xdate()
-plt.show()
diff --git a/examples/misc/logos2.py b/examples/misc/logos2.py
index 528f09e92c18..06e3b5d65e7a 100644
--- a/examples/misc/logos2.py
+++ b/examples/misc/logos2.py
@@ -89,7 +89,7 @@ def create_icon_axes(fig, ax_position, lw_bars, lw_grid, lw_border, rgrid):
 
 
 def create_text_axes(fig, height_px):
-    """Create an axes in *fig* that contains 'matplotlib' as Text."""
+    """Create an Axes in *fig* that contains 'matplotlib' as Text."""
     ax = fig.add_axes((0, 0, 1, 1))
     ax.set_aspect("equal")
     ax.set_axis_off()
diff --git a/examples/misc/pythonic_matplotlib.py b/examples/misc/pythonic_matplotlib.py
index b04d931264f0..1d9f2b5bcf9f 100644
--- a/examples/misc/pythonic_matplotlib.py
+++ b/examples/misc/pythonic_matplotlib.py
@@ -3,9 +3,9 @@
 Pythonic Matplotlib
 ===================
 
-Some people prefer to write more pythonic, object-oriented code
-rather than use the pyplot interface to matplotlib.  This example shows
-you how.
+Some people prefer to write more "Pythonic", explicit object-oriented code,
+rather than use the implicit pyplot interface to Matplotlib. This example
+shows you how to take advantage of the explicit Matplotlib interface.
 
 Unless you are an application developer, I recommend using part of the
 pyplot interface, particularly the figure, close, subplot, axes, and
@@ -14,7 +14,7 @@
 instances, managing the bounding boxes of the figure elements,
 creating and realizing GUI windows and embedding figures in them.
 
-If you are an application developer and want to embed matplotlib in
+If you are an application developer and want to embed Matplotlib in
 your application, follow the lead of examples/embedding_in_wx.py,
 examples/embedding_in_gtk.py or examples/embedding_in_tk.py.  In this
 case you will want to control the creation of all your figures,
@@ -28,7 +28,7 @@
 application developers, however.
 
 If you see an example in the examples dir written in pyplot interface,
-and you want to emulate that using the true python method calls, there
+and you want to emulate that using the true Python method calls, there
 is an easy mapping.  Many of those examples use 'set' to control
 figure properties.  Here's how to map those commands onto instance
 methods
@@ -52,6 +52,7 @@
     a.set_yticklabels([])
     a.set_xticks([])
     a.set_yticks([])
+
 """
 
 import matplotlib.pyplot as plt
diff --git a/examples/misc/rasterization_demo.py b/examples/misc/rasterization_demo.py
index 6df264d7dac7..824b6ffb3c97 100644
--- a/examples/misc/rasterization_demo.py
+++ b/examples/misc/rasterization_demo.py
@@ -84,16 +84,11 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.artist.Artist.set_rasterized
-matplotlib.axes.Axes.set_rasterization_zorder
-matplotlib.axes.Axes.pcolormesh
-matplotlib.pyplot.pcolormesh
+#    - `matplotlib.artist.Artist.set_rasterized`
+#    - `matplotlib.axes.Axes.set_rasterization_zorder`
+#    - `matplotlib.axes.Axes.pcolormesh` / `matplotlib.pyplot.pcolormesh`
diff --git a/examples/misc/svg_filter_line.py b/examples/misc/svg_filter_line.py
index d329e6f243b1..da67250890df 100644
--- a/examples/misc/svg_filter_line.py
+++ b/examples/misc/svg_filter_line.py
@@ -3,12 +3,14 @@
 SVG Filter Line
 ===============
 
-Demonstrate SVG filtering effects which might be used with mpl.
+Demonstrate SVG filtering effects which might be used with Matplotlib.
 
-Note that the filtering effects are only effective if your svg renderer
+Note that the filtering effects are only effective if your SVG renderer
 support it.
 """
 
+import io
+import xml.etree.ElementTree as ET
 
 import matplotlib.pyplot as plt
 import matplotlib.transforms as mtransforms
@@ -39,10 +41,9 @@
     shadow.set_zorder(l.get_zorder() - 0.5)
 
     # offset transform
-    ot = mtransforms.offset_copy(l.get_transform(), fig1,
-                                 x=4.0, y=-6.0, units='points')
-
-    shadow.set_transform(ot)
+    transform = mtransforms.offset_copy(l.get_transform(), fig1,
+                                        x=4.0, y=-6.0, units='points')
+    shadow.set_transform(transform)
 
     # set the id for a later use
     shadow.set_gid(l.get_label() + "_shadow")
@@ -52,13 +53,10 @@
 ax.set_ylim(0., 1.)
 
 # save the figure as a bytes string in the svg format.
-from io import BytesIO
-f = BytesIO()
+f = io.BytesIO()
 plt.savefig(f, format="svg")
 
 
-import xml.etree.ElementTree as ET
-
 # filter definition for a gaussian blur
 filter_def = """
   <defs xmlns='http://www.w3.org/2000/svg'
@@ -83,5 +81,5 @@
     shadow.set("filter", 'url(#dropshadow)')
 
 fn = "svg_filter_line.svg"
-print("Saving '%s'" % fn)
+print(f"Saving '{fn}'")
 ET.ElementTree(tree).write(fn)
diff --git a/examples/misc/svg_filter_pie.py b/examples/misc/svg_filter_pie.py
index 2ab269ddf609..65aca9a1a73a 100644
--- a/examples/misc/svg_filter_pie.py
+++ b/examples/misc/svg_filter_pie.py
@@ -3,13 +3,16 @@
 SVG Filter Pie
 ==============
 
-Demonstrate SVG filtering effects which might be used with mpl.
+Demonstrate SVG filtering effects which might be used with Matplotlib.
 The pie chart drawing code is borrowed from pie_demo.py
 
-Note that the filtering effects are only effective if your svg renderer
+Note that the filtering effects are only effective if your SVG renderer
 support it.
 """
 
+import io
+import xml.etree.ElementTree as ET
+
 import matplotlib.pyplot as plt
 from matplotlib.patches import Shadow
 
@@ -23,7 +26,7 @@
 explode = (0, 0.05, 0, 0)
 
 # We want to draw the shadow for each pie but we will not use "shadow"
-# option as it does'n save the references to the shadow patches.
+# option as it doesn't save the references to the shadow patches.
 pies = ax.pie(fracs, explode=explode, labels=labels, autopct='%1.1f%%')
 
 for w in pies[0]:
@@ -42,19 +45,15 @@
 
 
 # save
-from io import BytesIO
-f = BytesIO()
+f = io.BytesIO()
 plt.savefig(f, format="svg")
 
-import xml.etree.ElementTree as ET
-
 
-# filter definition for shadow using a gaussian blur
-# and lightening effect.
-# The lightening filter is copied from http://www.w3.org/TR/SVG/filters.html
+# Filter definition for shadow using a gaussian blur and lighting effect.
+# The lighting filter is copied from http://www.w3.org/TR/SVG/filters.html
 
 # I tested it with Inkscape and Firefox3. "Gaussian blur" is supported
-# in both, but the lightening effect only in the Inkscape. Also note
+# in both, but the lighting effect only in Inkscape. Also note
 # that, Inkscape's exporting also may not support it.
 
 filter_def = """
@@ -94,5 +93,5 @@
     shadow.set("filter", 'url(#dropshadow)')
 
 fn = "svg_filter_pie.svg"
-print("Saving '%s'" % fn)
+print(f"Saving '{fn}'")
 ET.ElementTree(tree).write(fn)
diff --git a/examples/misc/zorder_demo.py b/examples/misc/zorder_demo.py
index 17fae956173a..1eb769c307a6 100644
--- a/examples/misc/zorder_demo.py
+++ b/examples/misc/zorder_demo.py
@@ -24,8 +24,12 @@
 
 .. note::
 
-   `~.axes.Axes.set_axisbelow` and :rc:`axes.axisbelow` can further modify the
-   zorder of ticks and grid lines.
+   `~.axes.Axes.set_axisbelow` and :rc:`axes.axisbelow` are convenient helpers
+   for setting the zorder of ticks and grid lines.
+
+Drawing is done per `~.axes.Axes` at a time. If you have overlapping Axes, all
+elements of the second Axes are drawn on top of the first Axes, irrespective of
+their relative zorder.
 """
 
 import matplotlib.pyplot as plt
@@ -57,7 +61,7 @@
 
 ###############################################################################
 # Many functions that create a visible object accepts a ``zorder`` parameter.
-# Alternatively, you can call ``set_order()`` on the created object later.
+# Alternatively, you can call ``set_zorder()`` on the created object later.
 
 x = np.linspace(0, 7.5, 100)
 plt.rcParams['lines.linewidth'] = 5
diff --git a/examples/mplot3d/2dcollections3d.py b/examples/mplot3d/2dcollections3d.py
index f4d57416355d..96183ddb9912 100644
--- a/examples/mplot3d/2dcollections3d.py
+++ b/examples/mplot3d/2dcollections3d.py
@@ -3,7 +3,7 @@
 Plot 2D data on 3D plot
 =======================
 
-Demonstrates using ax.plot's zdir keyword to plot 2D data on
+Demonstrates using ax.plot's *zdir* keyword to plot 2D data on
 selective axes of a 3D plot.
 """
 
@@ -43,6 +43,6 @@
 
 # Customize the view angle so it's easier to see that the scatter points lie
 # on the plane y=0
-ax.view_init(elev=20., azim=-35)
+ax.view_init(elev=20., azim=-35, roll=0)
 
 plt.show()
diff --git a/examples/mplot3d/box3d.py b/examples/mplot3d/box3d.py
new file mode 100644
index 000000000000..bbe4accec183
--- /dev/null
+++ b/examples/mplot3d/box3d.py
@@ -0,0 +1,78 @@
+"""
+===================
+3D box surface plot
+===================
+
+Given data on a gridded volume ``X``, ``Y``, ``Z``, this example plots the
+data values on the volume surfaces.
+
+The strategy is to select the data from each surface and plot
+contours separately using `.axes3d.Axes3D.contourf` with appropriate
+parameters *zdir* and *offset*.
+"""
+
+import matplotlib.pyplot as plt
+import numpy as np
+
+# Define dimensions
+Nx, Ny, Nz = 100, 300, 500
+X, Y, Z = np.meshgrid(np.arange(Nx), np.arange(Ny), -np.arange(Nz))
+
+# Create fake data
+data = (((X+100)**2 + (Y-20)**2 + 2*Z)/1000+1)
+
+kw = {
+    'vmin': data.min(),
+    'vmax': data.max(),
+    'levels': np.linspace(data.min(), data.max(), 10),
+}
+
+# Create a figure with 3D ax
+fig = plt.figure(figsize=(5, 4))
+ax = fig.add_subplot(111, projection='3d')
+
+# Plot contour surfaces
+_ = ax.contourf(
+    X[:, :, 0], Y[:, :, 0], data[:, :, 0],
+    zdir='z', offset=0, **kw
+)
+_ = ax.contourf(
+    X[0, :, :], data[0, :, :], Z[0, :, :],
+    zdir='y', offset=0, **kw
+)
+C = ax.contourf(
+    data[:, -1, :], Y[:, -1, :], Z[:, -1, :],
+    zdir='x', offset=X.max(), **kw
+)
+# --
+
+
+# Set limits of the plot from coord limits
+xmin, xmax = X.min(), X.max()
+ymin, ymax = Y.min(), Y.max()
+zmin, zmax = Z.min(), Z.max()
+ax.set(xlim=[xmin, xmax], ylim=[ymin, ymax], zlim=[zmin, zmax])
+
+# Plot edges
+edges_kw = dict(color='0.4', linewidth=1, zorder=1e3)
+ax.plot([xmax, xmax], [ymin, ymax], 0, **edges_kw)
+ax.plot([xmin, xmax], [ymin, ymin], 0, **edges_kw)
+ax.plot([xmax, xmax], [ymin, ymin], [zmin, zmax], **edges_kw)
+
+# Set labels and zticks
+ax.set(
+    xlabel='X [km]',
+    ylabel='Y [km]',
+    zlabel='Z [m]',
+    zticks=[0, -150, -300, -450],
+)
+
+# Set zoom and angle view
+ax.view_init(40, -30, 0)
+ax.set_box_aspect(None, zoom=0.9)
+
+# Colorbar
+fig.colorbar(C, ax=ax, fraction=0.02, pad=0.1, label='Name [units]')
+
+# Show Figure
+plt.show()
diff --git a/examples/mplot3d/contour3d.py b/examples/mplot3d/contour3d.py
index 7c4f5dcbc6d5..7b96980e3a73 100644
--- a/examples/mplot3d/contour3d.py
+++ b/examples/mplot3d/contour3d.py
@@ -1,7 +1,7 @@
 """
-==================================================
-Demonstrates plotting contour (level) curves in 3D
-==================================================
+=================================
+Plot contour (level) curves in 3D
+=================================
 
 This is like a contour plot in 2D except that the ``f(x, y)=c`` curve is
 plotted on the plane ``z=c``.
@@ -14,7 +14,6 @@
 ax = plt.figure().add_subplot(projection='3d')
 X, Y, Z = axes3d.get_test_data(0.05)
 
-cset = ax.contour(X, Y, Z, cmap=cm.coolwarm)  # Plot contour curves
-ax.clabel(cset, fontsize=9, inline=True)
+ax.contour(X, Y, Z, cmap=cm.coolwarm)  # Plot contour curves
 
 plt.show()
diff --git a/examples/mplot3d/contour3d_2.py b/examples/mplot3d/contour3d_2.py
index ed9c27f0b5ab..6dbc62eb9427 100644
--- a/examples/mplot3d/contour3d_2.py
+++ b/examples/mplot3d/contour3d_2.py
@@ -1,9 +1,9 @@
 """
-============================================================================
-Demonstrates plotting contour (level) curves in 3D using the extend3d option
-============================================================================
+===========================================================
+Plot contour (level) curves in 3D using the extend3d option
+===========================================================
 
-This modification of the contour3d_demo example uses extend3d=True to
+This modification of the :doc:`contour3d` example uses ``extend3d=True`` to
 extend the curves vertically into 'ribbons'.
 """
 
@@ -13,9 +13,6 @@
 
 ax = plt.figure().add_subplot(projection='3d')
 X, Y, Z = axes3d.get_test_data(0.05)
-
-cset = ax.contour(X, Y, Z, extend3d=True, cmap=cm.coolwarm)
-
-ax.clabel(cset, fontsize=9, inline=True)
+ax.contour(X, Y, Z, extend3d=True, cmap=cm.coolwarm)
 
 plt.show()
diff --git a/examples/mplot3d/contour3d_3.py b/examples/mplot3d/contour3d_3.py
index db620e426a68..c6a599328697 100644
--- a/examples/mplot3d/contour3d_3.py
+++ b/examples/mplot3d/contour3d_3.py
@@ -1,37 +1,30 @@
 """
-========================================
-Projecting contour profiles onto a graph
-========================================
-
+=====================================
+Project contour profiles onto a graph
+=====================================
 Demonstrates displaying a 3D surface while also projecting contour 'profiles'
 onto the 'walls' of the graph.
-
-See contourf3d_demo2 for the filled version.
+See :doc:`contourf3d_2` for the filled version.
 """
 
 from mpl_toolkits.mplot3d import axes3d
 import matplotlib.pyplot as plt
-from matplotlib import cm
 
 ax = plt.figure().add_subplot(projection='3d')
 X, Y, Z = axes3d.get_test_data(0.05)
 
 # Plot the 3D surface
-ax.plot_surface(X, Y, Z, rstride=8, cstride=8, alpha=0.3)
+ax.plot_surface(X, Y, Z, edgecolor='royalblue', lw=0.5, rstride=8, cstride=8,
+                alpha=0.3)
 
 # Plot projections of the contours for each dimension.  By choosing offsets
 # that match the appropriate axes limits, the projected contours will sit on
-# the 'walls' of the graph
-cset = ax.contour(X, Y, Z, zdir='z', offset=-100, cmap=cm.coolwarm)
-cset = ax.contour(X, Y, Z, zdir='x', offset=-40, cmap=cm.coolwarm)
-cset = ax.contour(X, Y, Z, zdir='y', offset=40, cmap=cm.coolwarm)
-
-ax.set_xlim(-40, 40)
-ax.set_ylim(-40, 40)
-ax.set_zlim(-100, 100)
+# the 'walls' of the graph.
+ax.contour(X, Y, Z, zdir='z', offset=-100, cmap='coolwarm')
+ax.contour(X, Y, Z, zdir='x', offset=-40, cmap='coolwarm')
+ax.contour(X, Y, Z, zdir='y', offset=40, cmap='coolwarm')
 
-ax.set_xlabel('X')
-ax.set_ylabel('Y')
-ax.set_zlabel('Z')
+ax.set(xlim=(-40, 40), ylim=(-40, 40), zlim=(-100, 100),
+       xlabel='X', ylabel='Y', zlabel='Z')
 
 plt.show()
diff --git a/examples/mplot3d/contourf3d.py b/examples/mplot3d/contourf3d.py
index 7cb78e8f1b52..6f0261ad0908 100644
--- a/examples/mplot3d/contourf3d.py
+++ b/examples/mplot3d/contourf3d.py
@@ -3,11 +3,11 @@
 Filled contours
 ===============
 
-contourf differs from contour in that it creates filled contours, ie.
-a discrete number of colours are used to shade the domain.
+`.Axes3D.contourf` differs from `.Axes3D.contour` in that it creates filled
+contours, i.e. a discrete number of colours are used to shade the domain.
 
-This is like a contourf plot in 2D except that the shaded region corresponding
-to the level c is graphed on the plane z=c.
+This is like a `.Axes.contourf` plot in 2D except that the shaded region
+corresponding to the level c is graphed on the plane ``z=c``.
 """
 
 from mpl_toolkits.mplot3d import axes3d
@@ -16,9 +16,6 @@
 
 ax = plt.figure().add_subplot(projection='3d')
 X, Y, Z = axes3d.get_test_data(0.05)
-
-cset = ax.contourf(X, Y, Z, cmap=cm.coolwarm)
-
-ax.clabel(cset, fontsize=9, inline=True)
+ax.contourf(X, Y, Z, cmap=cm.coolwarm)
 
 plt.show()
diff --git a/examples/mplot3d/contourf3d_2.py b/examples/mplot3d/contourf3d_2.py
index 5ef9dc8761c7..d0cb6d4ab79c 100644
--- a/examples/mplot3d/contourf3d_2.py
+++ b/examples/mplot3d/contourf3d_2.py
@@ -1,37 +1,30 @@
 """
-======================================
-Projecting filled contour onto a graph
-======================================
-
+===================================
+Project filled contour onto a graph
+===================================
 Demonstrates displaying a 3D surface while also projecting filled contour
 'profiles' onto the 'walls' of the graph.
-
-See contour3d_demo2 for the unfilled version.
+See :doc:`contour3d_3` for the unfilled version.
 """
 
 from mpl_toolkits.mplot3d import axes3d
 import matplotlib.pyplot as plt
-from matplotlib import cm
 
 ax = plt.figure().add_subplot(projection='3d')
 X, Y, Z = axes3d.get_test_data(0.05)
 
 # Plot the 3D surface
-ax.plot_surface(X, Y, Z, rstride=8, cstride=8, alpha=0.3)
+ax.plot_surface(X, Y, Z, edgecolor='royalblue', lw=0.5, rstride=8, cstride=8,
+                alpha=0.3)
 
 # Plot projections of the contours for each dimension.  By choosing offsets
 # that match the appropriate axes limits, the projected contours will sit on
 # the 'walls' of the graph
-cset = ax.contourf(X, Y, Z, zdir='z', offset=-100, cmap=cm.coolwarm)
-cset = ax.contourf(X, Y, Z, zdir='x', offset=-40, cmap=cm.coolwarm)
-cset = ax.contourf(X, Y, Z, zdir='y', offset=40, cmap=cm.coolwarm)
-
-ax.set_xlim(-40, 40)
-ax.set_ylim(-40, 40)
-ax.set_zlim(-100, 100)
+ax.contourf(X, Y, Z, zdir='z', offset=-100, cmap='coolwarm')
+ax.contourf(X, Y, Z, zdir='x', offset=-40, cmap='coolwarm')
+ax.contourf(X, Y, Z, zdir='y', offset=40, cmap='coolwarm')
 
-ax.set_xlabel('X')
-ax.set_ylabel('Y')
-ax.set_zlabel('Z')
+ax.set(xlim=(-40, 40), ylim=(-40, 40), zlim=(-100, 100),
+       xlabel='X', ylabel='Y', zlabel='Z')
 
 plt.show()
diff --git a/examples/mplot3d/hist3d.py b/examples/mplot3d/hist3d.py
index 6577a010c14a..e602f7f1e6c5 100644
--- a/examples/mplot3d/hist3d.py
+++ b/examples/mplot3d/hist3d.py
@@ -3,7 +3,7 @@
 Create 3D histogram of 2D data
 ==============================
 
-Demo of a histogram for 2 dimensional data as a bar graph in 3D.
+Demo of a histogram for 2D data as a bar graph in 3D.
 """
 
 import matplotlib.pyplot as plt
diff --git a/examples/mplot3d/lines3d.py b/examples/mplot3d/lines3d.py
index f7578d8657b4..c974bcbdff8d 100644
--- a/examples/mplot3d/lines3d.py
+++ b/examples/mplot3d/lines3d.py
@@ -1,6 +1,6 @@
 """
 ================
-Parametric Curve
+Parametric curve
 ================
 
 This example demonstrates plotting a parametric curve in 3D.
diff --git a/examples/mplot3d/lorenz_attractor.py b/examples/mplot3d/lorenz_attractor.py
index 778f4f849e3c..aad08a16439e 100644
--- a/examples/mplot3d/lorenz_attractor.py
+++ b/examples/mplot3d/lorenz_attractor.py
@@ -1,13 +1,13 @@
 """
 ================
-Lorenz Attractor
+Lorenz attractor
 ================
 
 This is an example of plotting Edward Lorenz's 1963 `"Deterministic Nonperiodic
 Flow"`_ in a 3-dimensional space using mplot3d.
 
 .. _"Deterministic Nonperiodic Flow":
-   https://journals.ametsoc.org/jas/article/20/2/130/16956/Deterministic-Nonperiodic-Flow
+   https://journals.ametsoc.org/view/journals/atsc/20/2/1520-0469_1963_020_0130_dnf_2_0_co_2.xml
 
 .. note::
    Because this is a simple non-linear ODE, it would be more easily done using
@@ -18,45 +18,41 @@
 import matplotlib.pyplot as plt
 
 
-def lorenz(x, y, z, s=10, r=28, b=2.667):
+def lorenz(xyz, *, s=10, r=28, b=2.667):
     """
-    Given:
-       x, y, z: a point of interest in three dimensional space
-       s, r, b: parameters defining the lorenz attractor
-    Returns:
-       x_dot, y_dot, z_dot: values of the lorenz attractor's partial
-           derivatives at the point x, y, z
+    Parameters
+    ----------
+    xyz : array-like, shape (3,)
+       Point of interest in three dimensional space.
+    s, r, b : float
+       Parameters defining the Lorenz attractor.
+
+    Returns
+    -------
+    xyz_dot : array, shape (3,)
+       Values of the Lorenz attractor's partial derivatives at *xyz*.
     """
+    x, y, z = xyz
     x_dot = s*(y - x)
     y_dot = r*x - y - x*z
     z_dot = x*y - b*z
-    return x_dot, y_dot, z_dot
+    return np.array([x_dot, y_dot, z_dot])
 
 
 dt = 0.01
 num_steps = 10000
 
-# Need one more for the initial values
-xs = np.empty(num_steps + 1)
-ys = np.empty(num_steps + 1)
-zs = np.empty(num_steps + 1)
-
-# Set initial values
-xs[0], ys[0], zs[0] = (0., 1., 1.05)
-
+xyzs = np.empty((num_steps + 1, 3))  # Need one more for the initial values
+xyzs[0] = (0., 1., 1.05)  # Set initial values
 # Step through "time", calculating the partial derivatives at the current point
 # and using them to estimate the next point
 for i in range(num_steps):
-    x_dot, y_dot, z_dot = lorenz(xs[i], ys[i], zs[i])
-    xs[i + 1] = xs[i] + (x_dot * dt)
-    ys[i + 1] = ys[i] + (y_dot * dt)
-    zs[i + 1] = zs[i] + (z_dot * dt)
-
+    xyzs[i + 1] = xyzs[i] + lorenz(xyzs[i]) * dt
 
 # Plot
 ax = plt.figure().add_subplot(projection='3d')
 
-ax.plot(xs, ys, zs, lw=0.5)
+ax.plot(*xyzs.T, lw=0.5)
 ax.set_xlabel("X Axis")
 ax.set_ylabel("Y Axis")
 ax.set_zlabel("Z Axis")
diff --git a/examples/mplot3d/mixed_subplots.py b/examples/mplot3d/mixed_subplots.py
index df981ceee4ea..1ab91278a1d9 100644
--- a/examples/mplot3d/mixed_subplots.py
+++ b/examples/mplot3d/mixed_subplots.py
@@ -1,7 +1,7 @@
 """
-=================================
-2D and 3D *Axes* in same *Figure*
-=================================
+=============================
+2D and 3D axes in same figure
+=============================
 
 This example shows a how to plot a 2D and 3D plot on the same figure.
 """
diff --git a/examples/mplot3d/offset.py b/examples/mplot3d/offset.py
index 56a14d69fa98..00adcc2f236d 100644
--- a/examples/mplot3d/offset.py
+++ b/examples/mplot3d/offset.py
@@ -1,6 +1,6 @@
 """
 =========================
-Automatic Text Offsetting
+Automatic text offsetting
 =========================
 
 This example demonstrates mplot3d's offset text display.
diff --git a/examples/mplot3d/polys3d.py b/examples/mplot3d/polys3d.py
index 9a2ee1ad3155..393f5dcf6544 100644
--- a/examples/mplot3d/polys3d.py
+++ b/examples/mplot3d/polys3d.py
@@ -10,44 +10,36 @@
 
 from matplotlib.collections import PolyCollection
 import matplotlib.pyplot as plt
+import math
 import numpy as np
 
 # Fixing random state for reproducibility
 np.random.seed(19680801)
 
 
-def polygon_under_graph(xlist, ylist):
+def polygon_under_graph(x, y):
     """
     Construct the vertex list which defines the polygon filling the space under
-    the (xlist, ylist) line graph.  Assumes the xs are in ascending order.
+    the (x, y) line graph. This assumes x is in ascending order.
     """
-    return [(xlist[0], 0.), *zip(xlist, ylist), (xlist[-1], 0.)]
+    return [(x[0], 0.), *zip(x, y), (x[-1], 0.)]
 
 
 ax = plt.figure().add_subplot(projection='3d')
 
-# Make verts a list such that verts[i] is a list of (x, y) pairs defining
-# polygon i.
-verts = []
+x = np.linspace(0., 10., 31)
+lambdas = range(1, 9)
 
-# Set up the x sequence
-xs = np.linspace(0., 10., 26)
+# verts[i] is a list of (x, y) pairs defining polygon i.
+gamma = np.vectorize(math.gamma)
+verts = [polygon_under_graph(x, l**x * np.exp(-l) / gamma(x + 1))
+         for l in lambdas]
+facecolors = plt.colormaps['viridis_r'](np.linspace(0, 1, len(verts)))
 
-# The ith polygon will appear on the plane y = zs[i]
-zs = range(4)
+poly = PolyCollection(verts, facecolors=facecolors, alpha=.7)
+ax.add_collection3d(poly, zs=lambdas, zdir='y')
 
-for i in zs:
-    ys = np.random.rand(len(xs))
-    verts.append(polygon_under_graph(xs, ys))
-
-poly = PolyCollection(verts, facecolors=['r', 'g', 'b', 'y'], alpha=.6)
-ax.add_collection3d(poly, zs=zs, zdir='y')
-
-ax.set_xlabel('X')
-ax.set_ylabel('Y')
-ax.set_zlabel('Z')
-ax.set_xlim(0, 10)
-ax.set_ylim(-1, 4)
-ax.set_zlim(0, 1)
+ax.set(xlim=(0, 10), ylim=(1, 9), zlim=(0, 0.35),
+       xlabel='x', ylabel=r'$\lambda$', zlabel='probability')
 
 plt.show()
diff --git a/examples/mplot3d/projections.py b/examples/mplot3d/projections.py
new file mode 100644
index 000000000000..2a1c2c15be15
--- /dev/null
+++ b/examples/mplot3d/projections.py
@@ -0,0 +1,55 @@
+"""
+========================
+3D plot projection types
+========================
+
+Demonstrates the different camera projections for 3D plots, and the effects of
+changing the focal length for a perspective projection. Note that Matplotlib
+corrects for the 'zoom' effect of changing the focal length.
+
+The default focal length of 1 corresponds to a Field of View (FOV) of 90 deg.
+An increased focal length between 1 and infinity "flattens" the image, while a
+decreased focal length between 1 and 0 exaggerates the perspective and gives
+the image more apparent depth. In the limiting case, a focal length of
+infinity corresponds to an orthographic projection after correction of the
+zoom effect.
+
+You can calculate focal length from a FOV via the equation:
+
+.. math::
+
+    1 / \\tan (\\mathrm{FOV} / 2)
+
+Or vice versa:
+
+.. math::
+
+    \\mathrm{FOV} = 2 \\arctan (1 / \\mathrm{focal length})
+
+"""
+
+from mpl_toolkits.mplot3d import axes3d
+import matplotlib.pyplot as plt
+
+
+fig, axs = plt.subplots(1, 3, subplot_kw={'projection': '3d'})
+
+# Get the test data
+X, Y, Z = axes3d.get_test_data(0.05)
+
+# Plot the data
+for ax in axs:
+    ax.plot_wireframe(X, Y, Z, rstride=10, cstride=10)
+
+# Set the orthographic projection.
+axs[0].set_proj_type('ortho')  # FOV = 0 deg
+axs[0].set_title("'ortho'\nfocal_length = ∞", fontsize=10)
+
+# Set the perspective projections
+axs[1].set_proj_type('persp')  # FOV = 90 deg
+axs[1].set_title("'persp'\nfocal_length = 1 (default)", fontsize=10)
+
+axs[2].set_proj_type('persp', focal_length=0.2)  # FOV = 157.4 deg
+axs[2].set_title("'persp'\nfocal_length = 0.2", fontsize=10)
+
+plt.show()
diff --git a/examples/mplot3d/rotate_axes3d_sgskip.py b/examples/mplot3d/rotate_axes3d_sgskip.py
index be8adf3c29a0..8967277ea5d7 100644
--- a/examples/mplot3d/rotate_axes3d_sgskip.py
+++ b/examples/mplot3d/rotate_axes3d_sgskip.py
@@ -3,9 +3,9 @@
 Rotating a 3D plot
 ==================
 
-A very simple animation of a rotating 3D plot.
+A very simple animation of a rotating 3D plot about all three axes.
 
-See wire3d_animation_demo for another simple example of animating a 3D plot.
+See :doc:`wire3d_animation_sgskip` for another example of animating a 3D plot.
 
 (This example is skipped when building the documentation gallery because it
 intentionally takes a long time to run)
@@ -17,12 +17,34 @@
 fig = plt.figure()
 ax = fig.add_subplot(projection='3d')
 
-# load some test data for demonstration and plot a wireframe
-X, Y, Z = axes3d.get_test_data(0.1)
-ax.plot_wireframe(X, Y, Z, rstride=5, cstride=5)
+# Grab some example data and plot a basic wireframe.
+X, Y, Z = axes3d.get_test_data(0.05)
+ax.plot_wireframe(X, Y, Z, rstride=10, cstride=10)
+
+# Set the axis labels
+ax.set_xlabel('x')
+ax.set_ylabel('y')
+ax.set_zlabel('z')
+
+# Rotate the axes and update
+for angle in range(0, 360*4 + 1):
+    # Normalize the angle to the range [-180, 180] for display
+    angle_norm = (angle + 180) % 360 - 180
+
+    # Cycle through a full rotation of elevation, then azimuth, roll, and all
+    elev = azim = roll = 0
+    if angle <= 360:
+        elev = angle_norm
+    elif angle <= 360*2:
+        azim = angle_norm
+    elif angle <= 360*3:
+        roll = angle_norm
+    else:
+        elev = azim = roll = angle_norm
+
+    # Update the axis view and title
+    ax.view_init(elev, azim, roll)
+    plt.title('Elevation: %d°, Azimuth: %d°, Roll: %d°' % (elev, azim, roll))
 
-# rotate the axes and update
-for angle in range(0, 360):
-    ax.view_init(30, angle)
     plt.draw()
     plt.pause(.001)
diff --git a/examples/mplot3d/stem3d_demo.py b/examples/mplot3d/stem3d_demo.py
index 712f93227ae2..fad155cf4081 100644
--- a/examples/mplot3d/stem3d_demo.py
+++ b/examples/mplot3d/stem3d_demo.py
@@ -26,7 +26,7 @@
 # *linefmt*, *markerfmt*, and *basefmt* control basic format properties of the
 # plot. However, in contrast to `~.axes3d.Axes3D.plot` not all properties are
 # configurable via keyword arguments. For more advanced control adapt the line
-# objects returned by `~.stem3D`.
+# objects returned by `.stem3D`.
 
 fig, ax = plt.subplots(subplot_kw=dict(projection='3d'))
 markerline, stemlines, baseline = ax.stem(
diff --git a/examples/mplot3d/subplot3d.py b/examples/mplot3d/subplot3d.py
index 633817601c1b..782b22164c3d 100644
--- a/examples/mplot3d/subplot3d.py
+++ b/examples/mplot3d/subplot3d.py
@@ -16,9 +16,9 @@
 # set up a figure twice as wide as it is tall
 fig = plt.figure(figsize=plt.figaspect(0.5))
 
-#===============
-#  First subplot
-#===============
+# =============
+# First subplot
+# =============
 # set up the axes for the first plot
 ax = fig.add_subplot(1, 2, 1, projection='3d')
 
@@ -33,9 +33,9 @@
 ax.set_zlim(-1.01, 1.01)
 fig.colorbar(surf, shrink=0.5, aspect=10)
 
-#===============
+# ==============
 # Second subplot
-#===============
+# ==============
 # set up the axes for the second plot
 ax = fig.add_subplot(1, 2, 2, projection='3d')
 
diff --git a/examples/mplot3d/surface3d.py b/examples/mplot3d/surface3d.py
index d8b2f598a1d9..07019cb15e31 100644
--- a/examples/mplot3d/surface3d.py
+++ b/examples/mplot3d/surface3d.py
@@ -4,9 +4,9 @@
 =====================
 
 Demonstrates plotting a 3D surface colored with the coolwarm colormap.
-The surface is made opaque by using antialiased=False.
+The surface is made opaque by using ``antialiased=False``.
 
-Also demonstrates using the LinearLocator and custom formatting for the
+Also demonstrates using the `.LinearLocator` and custom formatting for the
 z axis tick labels.
 """
 
@@ -42,17 +42,13 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.pyplot.subplots
-matplotlib.axis.Axis.set_major_formatter
-matplotlib.axis.Axis.set_major_locator
-matplotlib.ticker.LinearLocator
-matplotlib.ticker.StrMethodFormatter
+#    - `matplotlib.pyplot.subplots`
+#    - `matplotlib.axis.Axis.set_major_formatter`
+#    - `matplotlib.axis.Axis.set_major_locator`
+#    - `matplotlib.ticker.LinearLocator`
+#    - `matplotlib.ticker.StrMethodFormatter`
diff --git a/examples/mplot3d/surface3d_2.py b/examples/mplot3d/surface3d_2.py
index d5cfca1905a3..bca9f1ca62e8 100644
--- a/examples/mplot3d/surface3d_2.py
+++ b/examples/mplot3d/surface3d_2.py
@@ -23,4 +23,7 @@
 # Plot the surface
 ax.plot_surface(x, y, z)
 
+# Set an equal aspect ratio
+ax.set_aspect('equal')
+
 plt.show()
diff --git a/examples/mplot3d/text3d.py b/examples/mplot3d/text3d.py
index 7f6a2858eb1f..922d161a9f89 100644
--- a/examples/mplot3d/text3d.py
+++ b/examples/mplot3d/text3d.py
@@ -7,10 +7,10 @@
 
 Functionality shown:
 
-- Using the text function with three types of 'zdir' values: None, an axis
-  name (ex. 'x'), or a direction tuple (ex. (1, 1, 0)).
-- Using the text function with the color keyword.
-- Using the text2D function to place text on a fixed position on the ax
+- Using the `~.Axes3D.text` function with three types of *zdir* values: None,
+  an axis name (ex. 'x'), or a direction tuple (ex. (1, 1, 0)).
+- Using the `~.Axes3D.text` function with the color keyword.
+- Using the `.text2D` function to place text on a fixed position on the ax
   object.
 """
 
diff --git a/examples/mplot3d/trisurf3d_2.py b/examples/mplot3d/trisurf3d_2.py
index 88011e1148d4..8ed354d5e5e6 100644
--- a/examples/mplot3d/trisurf3d_2.py
+++ b/examples/mplot3d/trisurf3d_2.py
@@ -6,7 +6,7 @@
 Two additional examples of plotting surfaces with triangular mesh.
 
 The first demonstrates use of plot_trisurf's triangles argument, and the
-second sets a Triangulation object's mask and passes the object directly
+second sets a `.Triangulation` object's mask and passes the object directly
 to plot_trisurf.
 """
 
@@ -17,9 +17,9 @@
 
 fig = plt.figure(figsize=plt.figaspect(0.5))
 
-#============
+# ==========
 # First plot
-#============
+# ==========
 
 # Make a mesh in the space of parameterisation variables u and v
 u = np.linspace(0, 2.0 * np.pi, endpoint=True, num=50)
@@ -43,9 +43,9 @@
 ax.set_zlim(-1, 1)
 
 
-#============
+# ===========
 # Second plot
-#============
+# ===========
 
 # Make parameter spaces radii and angles.
 n_angles = 36
diff --git a/examples/mplot3d/view_planes_3d.py b/examples/mplot3d/view_planes_3d.py
new file mode 100644
index 000000000000..c4322d60fe93
--- /dev/null
+++ b/examples/mplot3d/view_planes_3d.py
@@ -0,0 +1,57 @@
+"""
+======================
+Primary 3D view planes
+======================
+
+This example generates an "unfolded" 3D plot that shows each of the primary 3D
+view planes. The elevation, azimuth, and roll angles required for each view are
+labeled. You could print out this image and fold it into a box where each plane
+forms a side of the box.
+"""
+
+import matplotlib.pyplot as plt
+
+
+def annotate_axes(ax, text, fontsize=18):
+    ax.text(x=0.5, y=0.5, z=0.5, s=text,
+            va="center", ha="center", fontsize=fontsize, color="black")
+
+# (plane, (elev, azim, roll))
+views = [('XY',   (90, -90, 0)),
+         ('XZ',    (0, -90, 0)),
+         ('YZ',    (0,   0, 0)),
+         ('-XY', (-90,  90, 0)),
+         ('-XZ',   (0,  90, 0)),
+         ('-YZ',   (0, 180, 0))]
+
+layout = [['XY',  '.',   'L',   '.'],
+          ['XZ', 'YZ', '-XZ', '-YZ'],
+          ['.',   '.', '-XY',   '.']]
+fig, axd = plt.subplot_mosaic(layout, subplot_kw={'projection': '3d'},
+                              figsize=(12, 8.5))
+for plane, angles in views:
+    axd[plane].set_xlabel('x')
+    axd[plane].set_ylabel('y')
+    axd[plane].set_zlabel('z')
+    axd[plane].set_proj_type('ortho')
+    axd[plane].view_init(elev=angles[0], azim=angles[1], roll=angles[2])
+    axd[plane].set_box_aspect(None, zoom=1.25)
+
+    label = f'{plane}\n{angles}'
+    annotate_axes(axd[plane], label, fontsize=14)
+
+for plane in ('XY', '-XY'):
+    axd[plane].set_zticklabels([])
+    axd[plane].set_zlabel('')
+for plane in ('XZ', '-XZ'):
+    axd[plane].set_yticklabels([])
+    axd[plane].set_ylabel('')
+for plane in ('YZ', '-YZ'):
+    axd[plane].set_xticklabels([])
+    axd[plane].set_xlabel('')
+
+label = 'mplot3d primary view planes\n' + 'ax.view_init(elev, azim, roll)'
+annotate_axes(axd['L'], label, fontsize=18)
+axd['L'].set_axis_off()
+
+plt.show()
diff --git a/examples/mplot3d/voxels.py b/examples/mplot3d/voxels.py
index c6a35d7bcf5b..5b74914fa271 100644
--- a/examples/mplot3d/voxels.py
+++ b/examples/mplot3d/voxels.py
@@ -20,16 +20,16 @@
 link = abs(x - y) + abs(y - z) + abs(z - x) <= 2
 
 # combine the objects into a single boolean array
-voxels = cube1 | cube2 | link
+voxelarray = cube1 | cube2 | link
 
 # set the colors of each object
-colors = np.empty(voxels.shape, dtype=object)
+colors = np.empty(voxelarray.shape, dtype=object)
 colors[link] = 'red'
 colors[cube1] = 'blue'
 colors[cube2] = 'green'
 
 # and plot everything
 ax = plt.figure().add_subplot(projection='3d')
-ax.voxels(voxels, facecolors=colors, edgecolor='k')
+ax.voxels(voxelarray, facecolors=colors, edgecolor='k')
 
 plt.show()
diff --git a/examples/mplot3d/voxels_numpy_logo.py b/examples/mplot3d/voxels_numpy_logo.py
index 9aa72b31e290..34eb48dcbe8a 100644
--- a/examples/mplot3d/voxels_numpy_logo.py
+++ b/examples/mplot3d/voxels_numpy_logo.py
@@ -1,6 +1,6 @@
 """
 ===============================
-3D voxel plot of the numpy logo
+3D voxel plot of the NumPy logo
 ===============================
 
 Demonstrates using `.Axes3D.voxels` with uneven coordinates.
@@ -42,5 +42,6 @@ def explode(data):
 
 ax = plt.figure().add_subplot(projection='3d')
 ax.voxels(x, y, z, filled_2, facecolors=fcolors_2, edgecolors=ecolors_2)
+ax.set_aspect('equal')
 
 plt.show()
diff --git a/examples/mplot3d/voxels_rgb.py b/examples/mplot3d/voxels_rgb.py
index a06cc10a5cc1..da27ad11f752 100644
--- a/examples/mplot3d/voxels_rgb.py
+++ b/examples/mplot3d/voxels_rgb.py
@@ -1,6 +1,6 @@
 """
 ==========================================
-3D voxel / volumetric plot with rgb colors
+3D voxel / volumetric plot with RGB colors
 ==========================================
 
 Demonstrates using `.Axes3D.voxels` to visualize parts of a color space.
@@ -39,5 +39,6 @@ def midpoints(x):
           edgecolors=np.clip(2*colors - 0.5, 0, 1),  # brighter
           linewidth=0.5)
 ax.set(xlabel='r', ylabel='g', zlabel='b')
+ax.set_aspect('equal')
 
 plt.show()
diff --git a/examples/mplot3d/wire3d_animation_sgskip.py b/examples/mplot3d/wire3d_animation_sgskip.py
index bc4cccf20a2c..bfc76661ffd0 100644
--- a/examples/mplot3d/wire3d_animation_sgskip.py
+++ b/examples/mplot3d/wire3d_animation_sgskip.py
@@ -1,9 +1,9 @@
 """
-==========================
-Rotating 3D wireframe plot
-==========================
+===========================
+Animate a 3D wireframe plot
+===========================
 
-A very simple 'animation' of a 3D plot.  See also rotate_axes3d_demo.
+A very simple "animation" of a 3D plot.  See also :doc:`rotate_axes3d_sgskip`.
 
 (This example is skipped when building the documentation gallery because it
 intentionally takes a long time to run)
@@ -14,14 +14,6 @@
 import time
 
 
-def generate(X, Y, phi):
-    """
-    Generates Z data for the points in the X, Y meshgrid and parameter phi.
-    """
-    R = 1 - np.sqrt(X**2 + Y**2)
-    return np.cos(2 * np.pi * X + phi) * R
-
-
 fig = plt.figure()
 ax = fig.add_subplot(projection='3d')
 
@@ -39,10 +31,10 @@ def generate(X, Y, phi):
 for phi in np.linspace(0, 180. / np.pi, 100):
     # If a line collection is already remove it before drawing.
     if wframe:
-        ax.collections.remove(wframe)
-
+        wframe.remove()
+    # Generate data.
+    Z = np.cos(2 * np.pi * X + phi) * (1 - np.hypot(X, Y))
     # Plot the new wireframe and pause briefly before continuing.
-    Z = generate(X, Y, phi)
     wframe = ax.plot_wireframe(X, Y, Z, rstride=2, cstride=2)
     plt.pause(.001)
 
diff --git a/examples/mplot3d/wire3d_zero_stride.py b/examples/mplot3d/wire3d_zero_stride.py
index 1ba406b753f4..f4c679300820 100644
--- a/examples/mplot3d/wire3d_zero_stride.py
+++ b/examples/mplot3d/wire3d_zero_stride.py
@@ -3,7 +3,7 @@
 3D wireframe plots in one direction
 ===================================
 
-Demonstrates that setting rstride or cstride to 0 causes wires to not be
+Demonstrates that setting *rstride* or *cstride* to 0 causes wires to not be
 generated in the corresponding direction.
 """
 
diff --git a/examples/pie_and_polar_charts/bar_of_pie.py b/examples/pie_and_polar_charts/bar_of_pie.py
index 92f54ea63bf0..eaacb5053cdb 100644
--- a/examples/pie_and_polar_charts/bar_of_pie.py
+++ b/examples/pie_and_polar_charts/bar_of_pie.py
@@ -19,40 +19,36 @@
 fig.subplots_adjust(wspace=0)
 
 # pie chart parameters
-ratios = [.27, .56, .17]
+overall_ratios = [.27, .56, .17]
 labels = ['Approve', 'Disapprove', 'Undecided']
 explode = [0.1, 0, 0]
 # rotate so that first wedge is split by the x-axis
-angle = -180 * ratios[0]
-ax1.pie(ratios, autopct='%1.1f%%', startangle=angle,
-        labels=labels, explode=explode)
+angle = -180 * overall_ratios[0]
+wedges, *_ = ax1.pie(overall_ratios, autopct='%1.1f%%', startangle=angle,
+                     labels=labels, explode=explode)
 
 # bar chart parameters
-
-xpos = 0
-bottom = 0
-ratios = [.33, .54, .07, .06]
+age_ratios = [.33, .54, .07, .06]
+age_labels = ['Under 35', '35-49', '50-65', 'Over 65']
+bottom = 1
 width = .2
-colors = [[.1, .3, .5], [.1, .3, .3], [.1, .3, .7], [.1, .3, .9]]
 
-for j in range(len(ratios)):
-    height = ratios[j]
-    ax2.bar(xpos, height, width, bottom=bottom, color=colors[j])
-    ypos = bottom + ax2.patches[j].get_height() / 2
-    bottom += height
-    ax2.text(xpos, ypos, "%d%%" % (ax2.patches[j].get_height() * 100),
-             ha='center')
+# Adding from the top matches the legend.
+for j, (height, label) in enumerate(reversed([*zip(age_ratios, age_labels)])):
+    bottom -= height
+    bc = ax2.bar(0, height, width, bottom=bottom, color='C0', label=label,
+                 alpha=0.1 + 0.25 * j)
+    ax2.bar_label(bc, labels=[f"{height:.0%}"], label_type='center')
 
 ax2.set_title('Age of approvers')
-ax2.legend(('50-65', 'Over 65', '35-49', 'Under 35'))
+ax2.legend()
 ax2.axis('off')
 ax2.set_xlim(- 2.5 * width, 2.5 * width)
 
 # use ConnectionPatch to draw lines between the two plots
-# get the wedge data
-theta1, theta2 = ax1.patches[0].theta1, ax1.patches[0].theta2
-center, r = ax1.patches[0].center, ax1.patches[0].r
-bar_height = sum([item.get_height() for item in ax2.patches])
+theta1, theta2 = wedges[0].theta1, wedges[0].theta2
+center, r = wedges[0].center, wedges[0].r
+bar_height = sum(age_ratios)
 
 # draw top connecting line
 x = r * np.cos(np.pi / 180 * theta2) + center[0]
@@ -76,16 +72,11 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.pie
-matplotlib.axes.Axes.bar
-matplotlib.pyplot
-matplotlib.patches.ConnectionPatch
+#    - `matplotlib.axes.Axes.bar` / `matplotlib.pyplot.bar`
+#    - `matplotlib.axes.Axes.pie` / `matplotlib.pyplot.pie`
+#    - `matplotlib.patches.ConnectionPatch`
diff --git a/examples/pie_and_polar_charts/nested_pie.py b/examples/pie_and_polar_charts/nested_pie.py
index b0c921351b8e..5a31ab1ffdc8 100644
--- a/examples/pie_and_polar_charts/nested_pie.py
+++ b/examples/pie_and_polar_charts/nested_pie.py
@@ -30,7 +30,7 @@
 size = 0.3
 vals = np.array([[60., 32.], [37., 40.], [29., 10.]])
 
-cmap = plt.get_cmap("tab20c")
+cmap = plt.colormaps["tab20c"]
 outer_colors = cmap(np.arange(3)*4)
 inner_colors = cmap([1, 2, 5, 6, 9, 10])
 
@@ -56,12 +56,12 @@
 
 size = 0.3
 vals = np.array([[60., 32.], [37., 40.], [29., 10.]])
-#normalize vals to 2 pi
+# Normalize vals to 2 pi
 valsnorm = vals/np.sum(vals)*2*np.pi
-#obtain the ordinates of the bar edges
+# Obtain the ordinates of the bar edges
 valsleft = np.cumsum(np.append(0, valsnorm.flatten()[:-1])).reshape(vals.shape)
 
-cmap = plt.get_cmap("tab20c")
+cmap = plt.colormaps["tab20c"]
 outer_colors = cmap(np.arange(3)*4)
 inner_colors = cmap([1, 2, 5, 6, 9, 10])
 
@@ -79,19 +79,13 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.pie
-matplotlib.pyplot.pie
-matplotlib.axes.Axes.bar
-matplotlib.pyplot.bar
-matplotlib.projections.polar
-matplotlib.axes.Axes.set
-matplotlib.axes.Axes.set_axis_off
+#    - `matplotlib.axes.Axes.pie` / `matplotlib.pyplot.pie`
+#    - `matplotlib.axes.Axes.bar` / `matplotlib.pyplot.bar`
+#    - `matplotlib.projections.polar`
+#    - ``Axes.set`` (`matplotlib.artist.Artist.set`)
+#    - `matplotlib.axes.Axes.set_axis_off`
diff --git a/examples/pie_and_polar_charts/pie_and_donut_labels.py b/examples/pie_and_polar_charts/pie_and_donut_labels.py
index 49f286f5f0b9..73e36ac03090 100644
--- a/examples/pie_and_polar_charts/pie_and_donut_labels.py
+++ b/examples/pie_and_polar_charts/pie_and_donut_labels.py
@@ -43,7 +43,7 @@
 
 
 def func(pct, allvals):
-    absolute = int(round(pct/100.*np.sum(allvals)))
+    absolute = int(np.round(pct/100.*np.sum(allvals)))
     return "{:.1f}%\n({:d} g)".format(pct, absolute)
 
 
@@ -125,16 +125,10 @@ def func(pct, allvals):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.pie
-matplotlib.pyplot.pie
-matplotlib.axes.Axes.legend
-matplotlib.pyplot.legend
+#    - `matplotlib.axes.Axes.pie` / `matplotlib.pyplot.pie`
+#    - `matplotlib.axes.Axes.legend` / `matplotlib.pyplot.legend`
diff --git a/examples/pie_and_polar_charts/pie_demo2.py b/examples/pie_and_polar_charts/pie_demo2.py
index 071a4d75700b..1f1ffcefbd96 100644
--- a/examples/pie_and_polar_charts/pie_demo2.py
+++ b/examples/pie_and_polar_charts/pie_demo2.py
@@ -47,14 +47,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.pie
-matplotlib.pyplot.pie
+#    - `matplotlib.axes.Axes.pie` / `matplotlib.pyplot.pie`
diff --git a/examples/pie_and_polar_charts/pie_features.py b/examples/pie_and_polar_charts/pie_features.py
index 83fe35da9444..d25ce839bf62 100644
--- a/examples/pie_and_polar_charts/pie_features.py
+++ b/examples/pie_and_polar_charts/pie_features.py
@@ -36,14 +36,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.pie
-matplotlib.pyplot.pie
+#    - `matplotlib.axes.Axes.pie` / `matplotlib.pyplot.pie`
diff --git a/examples/pie_and_polar_charts/polar_bar.py b/examples/pie_and_polar_charts/polar_bar.py
index a833342b532c..75ad64ba3ff4 100644
--- a/examples/pie_and_polar_charts/polar_bar.py
+++ b/examples/pie_and_polar_charts/polar_bar.py
@@ -26,15 +26,10 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.bar
-matplotlib.pyplot.bar
-matplotlib.projections.polar
+#    - `matplotlib.axes.Axes.bar` / `matplotlib.pyplot.bar`
+#    - `matplotlib.projections.polar`
diff --git a/examples/pie_and_polar_charts/polar_demo.py b/examples/pie_and_polar_charts/polar_demo.py
index bbc3d132511a..59db1792f172 100644
--- a/examples/pie_and_polar_charts/polar_demo.py
+++ b/examples/pie_and_polar_charts/polar_demo.py
@@ -24,18 +24,14 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.plot
-matplotlib.projections.polar
-matplotlib.projections.polar.PolarAxes
-matplotlib.projections.polar.PolarAxes.set_rticks
-matplotlib.projections.polar.PolarAxes.set_rmax
-matplotlib.projections.polar.PolarAxes.set_rlabel_position
+#    - `matplotlib.axes.Axes.plot` / `matplotlib.pyplot.plot`
+#    - `matplotlib.projections.polar`
+#    - `matplotlib.projections.polar.PolarAxes`
+#    - `matplotlib.projections.polar.PolarAxes.set_rticks`
+#    - `matplotlib.projections.polar.PolarAxes.set_rmax`
+#    - `matplotlib.projections.polar.PolarAxes.set_rlabel_position`
diff --git a/examples/pie_and_polar_charts/polar_legend.py b/examples/pie_and_polar_charts/polar_legend.py
index dd3adbdc3d5d..ddea65cea39e 100644
--- a/examples/pie_and_polar_charts/polar_legend.py
+++ b/examples/pie_and_polar_charts/polar_legend.py
@@ -29,16 +29,12 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.plot
-matplotlib.axes.Axes.legend
-matplotlib.projections.polar
-matplotlib.projections.polar.PolarAxes
+#    - `matplotlib.axes.Axes.plot` / `matplotlib.pyplot.plot`
+#    - `matplotlib.axes.Axes.legend` / `matplotlib.pyplot.legend`
+#    - `matplotlib.projections.polar`
+#    - `matplotlib.projections.polar.PolarAxes`
diff --git a/examples/pie_and_polar_charts/polar_scatter.py b/examples/pie_and_polar_charts/polar_scatter.py
index 49518df6dac4..fffb6d2091fd 100644
--- a/examples/pie_and_polar_charts/polar_scatter.py
+++ b/examples/pie_and_polar_charts/polar_scatter.py
@@ -57,19 +57,14 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.scatter
-matplotlib.pyplot.scatter
-matplotlib.projections.polar
-matplotlib.projections.polar.PolarAxes.set_rorigin
-matplotlib.projections.polar.PolarAxes.set_theta_zero_location
-matplotlib.projections.polar.PolarAxes.set_thetamin
-matplotlib.projections.polar.PolarAxes.set_thetamax
+#    - `matplotlib.axes.Axes.scatter` / `matplotlib.pyplot.scatter`
+#    - `matplotlib.projections.polar`
+#    - `matplotlib.projections.polar.PolarAxes.set_rorigin`
+#    - `matplotlib.projections.polar.PolarAxes.set_theta_zero_location`
+#    - `matplotlib.projections.polar.PolarAxes.set_thetamin`
+#    - `matplotlib.projections.polar.PolarAxes.set_thetamax`
diff --git a/examples/pyplots/README.txt b/examples/pyplots/README.txt
index eac052a32951..30c7d60fdb36 100644
--- a/examples/pyplots/README.txt
+++ b/examples/pyplots/README.txt
@@ -1,4 +1,4 @@
 .. _pyplots_examples:
 
-Pyplot
+pyplot
 ======
diff --git a/examples/pyplots/auto_subplots_adjust.py b/examples/pyplots/auto_subplots_adjust.py
deleted file mode 100644
index 40c88a8e07cc..000000000000
--- a/examples/pyplots/auto_subplots_adjust.py
+++ /dev/null
@@ -1,60 +0,0 @@
-"""
-====================
-Auto Subplots Adjust
-====================
-
-Automatically adjust subplot parameters. This example shows a way to determine
-a subplot parameter from the extent of the ticklabels using a callback on the
-:doc:`draw_event</users/event_handling>`.
-
-Note that a similar result would be achieved using `~.Figure.tight_layout`
-or `~.Figure.set_constrained_layout`; this example shows how one could
-customize the subplot parameter adjustment.
-"""
-
-import matplotlib.pyplot as plt
-import matplotlib.transforms as mtransforms
-
-fig, ax = plt.subplots()
-ax.plot(range(10))
-ax.set_yticks((2, 5, 7))
-labels = ax.set_yticklabels(('really, really, really', 'long', 'labels'))
-
-def on_draw(event):
-    bboxes = []
-    for label in labels:
-        bbox = label.get_window_extent()
-        # the figure transform goes from relative coords->pixels and we
-        # want the inverse of that
-        bboxi = bbox.transformed(fig.transFigure.inverted())
-        bboxes.append(bboxi)
-    # the bbox that bounds all the bboxes, again in relative figure coords
-    bbox = mtransforms.Bbox.union(bboxes)
-    if fig.subplotpars.left < bbox.width:
-        # we need to move it over
-        fig.subplots_adjust(left=1.1*bbox.width)  # pad a little
-        fig.canvas.draw()
-
-fig.canvas.mpl_connect('draw_event', on_draw)
-
-plt.show()
-
-#############################################################################
-#
-# ------------
-#
-# References
-# """"""""""
-#
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.artist.Artist.get_window_extent
-matplotlib.transforms.Bbox
-matplotlib.transforms.Bbox.transformed
-matplotlib.transforms.Bbox.union
-matplotlib.transforms.Transform.inverted
-matplotlib.figure.Figure.subplots_adjust
-matplotlib.figure.SubplotParams
-matplotlib.backend_bases.FigureCanvasBase.mpl_connect
diff --git a/examples/pyplots/axline.py b/examples/pyplots/axline.py
index 94694e4e7a4e..68149eaafc4f 100644
--- a/examples/pyplots/axline.py
+++ b/examples/pyplots/axline.py
@@ -42,18 +42,11 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.pyplot.axhline
-matplotlib.pyplot.axvline
-matplotlib.pyplot.axline
-matplotlib.axes.Axes.axhline
-matplotlib.axes.Axes.axvline
-matplotlib.axes.Axes.axline
+#    - `matplotlib.axes.Axes.axhline` / `matplotlib.pyplot.axhline`
+#    - `matplotlib.axes.Axes.axvline` / `matplotlib.pyplot.axvline`
+#    - `matplotlib.axes.Axes.axline` / `matplotlib.pyplot.axline`
diff --git a/examples/pyplots/boxplot_demo_pyplot.py b/examples/pyplots/boxplot_demo_pyplot.py
deleted file mode 100644
index a92be1a3f808..000000000000
--- a/examples/pyplots/boxplot_demo_pyplot.py
+++ /dev/null
@@ -1,94 +0,0 @@
-"""
-============
-Boxplot Demo
-============
-
-Example boxplot code
-"""
-
-import numpy as np
-import matplotlib.pyplot as plt
-
-# Fixing random state for reproducibility
-np.random.seed(19680801)
-
-# fake up some data
-spread = np.random.rand(50) * 100
-center = np.ones(25) * 50
-flier_high = np.random.rand(10) * 100 + 100
-flier_low = np.random.rand(10) * -100
-data = np.concatenate((spread, center, flier_high, flier_low))
-
-###############################################################################
-
-fig1, ax1 = plt.subplots()
-ax1.set_title('Basic Plot')
-ax1.boxplot(data)
-
-###############################################################################
-
-fig2, ax2 = plt.subplots()
-ax2.set_title('Notched boxes')
-ax2.boxplot(data, notch=True)
-
-###############################################################################
-
-green_diamond = dict(markerfacecolor='g', marker='D')
-fig3, ax3 = plt.subplots()
-ax3.set_title('Changed Outlier Symbols')
-ax3.boxplot(data, flierprops=green_diamond)
-
-###############################################################################
-
-fig4, ax4 = plt.subplots()
-ax4.set_title('Hide Outlier Points')
-ax4.boxplot(data, showfliers=False)
-
-###############################################################################
-
-red_square = dict(markerfacecolor='r', marker='s')
-fig5, ax5 = plt.subplots()
-ax5.set_title('Horizontal Boxes')
-ax5.boxplot(data, vert=False, flierprops=red_square)
-
-###############################################################################
-
-fig6, ax6 = plt.subplots()
-ax6.set_title('Shorter Whisker Length')
-ax6.boxplot(data, flierprops=red_square, vert=False, whis=0.75)
-
-###############################################################################
-# Fake up some more data
-
-spread = np.random.rand(50) * 100
-center = np.ones(25) * 40
-flier_high = np.random.rand(10) * 100 + 100
-flier_low = np.random.rand(10) * -100
-d2 = np.concatenate((spread, center, flier_high, flier_low))
-
-###############################################################################
-# Making a 2-D array only works if all the columns are the
-# same length.  If they are not, then use a list instead.
-# This is actually more efficient because boxplot converts
-# a 2-D array into a list of vectors internally anyway.
-
-data = [data, d2, d2[::2]]
-fig7, ax7 = plt.subplots()
-ax7.set_title('Multiple Samples with Different sizes')
-ax7.boxplot(data)
-
-plt.show()
-
-#############################################################################
-#
-# ------------
-#
-# References
-# """"""""""
-#
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.boxplot
-matplotlib.pyplot.boxplot
diff --git a/examples/pyplots/fig_axes_customize_simple.py b/examples/pyplots/fig_axes_customize_simple.py
deleted file mode 100644
index bc77aab61441..000000000000
--- a/examples/pyplots/fig_axes_customize_simple.py
+++ /dev/null
@@ -1,57 +0,0 @@
-"""
-=========================
-Fig Axes Customize Simple
-=========================
-
-Customize the background, labels and ticks of a simple plot.
-"""
-
-import matplotlib.pyplot as plt
-
-###############################################################################
-# `.pyplot.figure` creates a `matplotlib.figure.Figure` instance.
-
-fig = plt.figure()
-rect = fig.patch  # a rectangle instance
-rect.set_facecolor('lightgoldenrodyellow')
-
-ax1 = fig.add_axes([0.1, 0.3, 0.4, 0.4])
-rect = ax1.patch
-rect.set_facecolor('lightslategray')
-
-
-for label in ax1.xaxis.get_ticklabels():
-    # label is a Text instance
-    label.set_color('tab:red')
-    label.set_rotation(45)
-    label.set_fontsize(16)
-
-for line in ax1.yaxis.get_ticklines():
-    # line is a Line2D instance
-    line.set_color('tab:green')
-    line.set_markersize(25)
-    line.set_markeredgewidth(3)
-
-plt.show()
-
-#############################################################################
-#
-# ------------
-#
-# References
-# """"""""""
-#
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axis.Axis.get_ticklabels
-matplotlib.axis.Axis.get_ticklines
-matplotlib.text.Text.set_rotation
-matplotlib.text.Text.set_fontsize
-matplotlib.text.Text.set_color
-matplotlib.lines.Line2D
-matplotlib.lines.Line2D.set_color
-matplotlib.lines.Line2D.set_markersize
-matplotlib.lines.Line2D.set_markeredgewidth
-matplotlib.patches.Patch.set_facecolor
diff --git a/examples/pyplots/fig_axes_labels_simple.py b/examples/pyplots/fig_axes_labels_simple.py
deleted file mode 100644
index b7d3bd25b74c..000000000000
--- a/examples/pyplots/fig_axes_labels_simple.py
+++ /dev/null
@@ -1,46 +0,0 @@
-"""
-==================
-Simple axes labels
-==================
-
-Label the axes of a plot.
-"""
-import numpy as np
-import matplotlib.pyplot as plt
-
-fig = plt.figure()
-fig.subplots_adjust(top=0.8)
-ax1 = fig.add_subplot(211)
-ax1.set_ylabel('volts')
-ax1.set_title('a sine wave')
-
-t = np.arange(0.0, 1.0, 0.01)
-s = np.sin(2 * np.pi * t)
-line, = ax1.plot(t, s, lw=2)
-
-# Fixing random state for reproducibility
-np.random.seed(19680801)
-
-ax2 = fig.add_axes([0.15, 0.1, 0.7, 0.3])
-n, bins, patches = ax2.hist(np.random.randn(1000), 50)
-ax2.set_xlabel('time (s)')
-
-plt.show()
-
-#############################################################################
-#
-# ------------
-#
-# References
-# """"""""""
-#
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.set_xlabel
-matplotlib.axes.Axes.set_ylabel
-matplotlib.axes.Axes.set_title
-matplotlib.axes.Axes.plot
-matplotlib.axes.Axes.hist
-matplotlib.figure.Figure.add_axes
diff --git a/examples/pyplots/pyplot_formatstr.py b/examples/pyplots/pyplot_formatstr.py
deleted file mode 100644
index 3e5b1806b5c5..000000000000
--- a/examples/pyplots/pyplot_formatstr.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""
-====================
-plot() format string
-====================
-
-Use a format string (here, 'ro') to set the color and markers of a
-`~matplotlib.axes.Axes.plot`.
-"""
-
-import matplotlib.pyplot as plt
-plt.plot([1, 2, 3, 4], [1, 4, 9, 16], 'ro')
-plt.show()
-
-#############################################################################
-#
-# ------------
-#
-# References
-# """"""""""
-#
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.pyplot.plot
-matplotlib.axes.Axes.plot
diff --git a/examples/pyplots/pyplot_mathtext.py b/examples/pyplots/pyplot_mathtext.py
index 40bbaccf72d2..a62dd6d95da0 100644
--- a/examples/pyplots/pyplot_mathtext.py
+++ b/examples/pyplots/pyplot_mathtext.py
@@ -16,20 +16,15 @@
 plt.text(1, -0.6, r'$\sum_{i=0}^\infty x_i$', fontsize=20)
 plt.text(0.6, 0.6, r'$\mathcal{A}\mathrm{sin}(2 \omega t)$',
          fontsize=20)
-plt.xlabel('time (s)')
-plt.ylabel('volts (mV)')
+plt.xlabel('Time [s]')
+plt.ylabel('Voltage [mV]')
 plt.show()
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.pyplot.text
-matplotlib.axes.Axes.text
+#    - `matplotlib.axes.Axes.text` / `matplotlib.pyplot.text`
diff --git a/examples/pyplots/pyplot_simple.py b/examples/pyplots/pyplot_simple.py
index 25bb924c76ed..1a3b457acedd 100644
--- a/examples/pyplots/pyplot_simple.py
+++ b/examples/pyplots/pyplot_simple.py
@@ -3,26 +3,27 @@
 Pyplot Simple
 =============
 
-A very simple pyplot where a list of numbers are ploted against their
+A very simple pyplot where a list of numbers are plotted against their
 index. Creates a straight line due to the rate of change being 1 for
-both the X and Y axis.
+both the X and Y axis. Use a format string (here, 'o-r') to set the
+markers (circles), linestyle (solid line) and color (red).
+
+.. redirect-from:: /gallery/pyplots/fig_axes_labels_simple
+.. redirect-from:: /gallery/pyplots/pyplot_formatstr
 """
 import matplotlib.pyplot as plt
-plt.plot([1, 2, 3, 4])
+
+plt.plot([1, 2, 3, 4], 'o-r')
 plt.ylabel('some numbers')
 plt.show()
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.pyplot.plot
-matplotlib.pyplot.ylabel
-matplotlib.pyplot.show
+#    - `matplotlib.pyplot.plot`
+#    - `matplotlib.pyplot.ylabel`
+#    - `matplotlib.pyplot.show`
diff --git a/examples/pyplots/pyplot_text.py b/examples/pyplots/pyplot_text.py
index b5952ba00706..e50e9038827a 100644
--- a/examples/pyplots/pyplot_text.py
+++ b/examples/pyplots/pyplot_text.py
@@ -28,18 +28,14 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.pyplot.hist
-matplotlib.pyplot.xlabel
-matplotlib.pyplot.ylabel
-matplotlib.pyplot.text
-matplotlib.pyplot.grid
-matplotlib.pyplot.show
+#    - `matplotlib.pyplot.hist`
+#    - `matplotlib.pyplot.xlabel`
+#    - `matplotlib.pyplot.ylabel`
+#    - `matplotlib.pyplot.text`
+#    - `matplotlib.pyplot.grid`
+#    - `matplotlib.pyplot.show`
diff --git a/examples/pyplots/pyplot_three.py b/examples/pyplots/pyplot_three.py
index 9026e4acae1f..476796b45f81 100644
--- a/examples/pyplots/pyplot_three.py
+++ b/examples/pyplots/pyplot_three.py
@@ -17,14 +17,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.pyplot.plot
-matplotlib.axes.Axes.plot
+#    - `matplotlib.axes.Axes.plot` / `matplotlib.pyplot.plot`
diff --git a/examples/pyplots/pyplot_two_subplots.py b/examples/pyplots/pyplot_two_subplots.py
index 9a2f1ada246c..5280fb0bb37a 100644
--- a/examples/pyplots/pyplot_two_subplots.py
+++ b/examples/pyplots/pyplot_two_subplots.py
@@ -27,14 +27,10 @@ def f(t):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.pyplot.figure
-matplotlib.pyplot.subplot
+#    - `matplotlib.pyplot.figure`
+#    - `matplotlib.pyplot.subplot`
diff --git a/examples/pyplots/text_layout.py b/examples/pyplots/text_layout.py
deleted file mode 100644
index 8b1db3b6af3c..000000000000
--- a/examples/pyplots/text_layout.py
+++ /dev/null
@@ -1,67 +0,0 @@
-"""
-===========
-Text Layout
-===========
-
-Create text with different alignment and rotation.
-"""
-
-import matplotlib.pyplot as plt
-import matplotlib.patches as patches
-
-fig = plt.figure()
-
-left, width = .25, .5
-bottom, height = .25, .5
-right = left + width
-top = bottom + height
-
-# Draw a rectangle in figure coordinates ((0, 0) is bottom left and (1, 1) is
-# upper right).
-p = patches.Rectangle((left, bottom), width, height, fill=False)
-fig.add_artist(p)
-
-# Figure.text (aka. plt.figtext) behaves like Axes.text (aka. plt.text), with
-# the sole exception that the coordinates are relative to the figure ((0, 0) is
-# bottom left and (1, 1) is upper right).
-fig.text(left, bottom, 'left top',
-         horizontalalignment='left', verticalalignment='top')
-fig.text(left, bottom, 'left bottom',
-         horizontalalignment='left', verticalalignment='bottom')
-fig.text(right, top, 'right bottom',
-         horizontalalignment='right', verticalalignment='bottom')
-fig.text(right, top, 'right top',
-         horizontalalignment='right', verticalalignment='top')
-fig.text(right, bottom, 'center top',
-         horizontalalignment='center', verticalalignment='top')
-fig.text(left, 0.5*(bottom+top), 'right center',
-         horizontalalignment='right', verticalalignment='center',
-         rotation='vertical')
-fig.text(left, 0.5*(bottom+top), 'left center',
-         horizontalalignment='left', verticalalignment='center',
-         rotation='vertical')
-fig.text(0.5*(left+right), 0.5*(bottom+top), 'middle',
-         horizontalalignment='center', verticalalignment='center',
-         fontsize=20, color='red')
-fig.text(right, 0.5*(bottom+top), 'centered',
-         horizontalalignment='center', verticalalignment='center',
-         rotation='vertical')
-fig.text(left, top, 'rotated\nwith newlines',
-         horizontalalignment='center', verticalalignment='center',
-         rotation=45)
-
-plt.show()
-
-#############################################################################
-#
-# ------------
-#
-# References
-# """"""""""
-#
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.figure.Figure.add_artist
-matplotlib.figure.Figure.text
diff --git a/examples/pyplots/whats_new_1_subplot3d.py b/examples/pyplots/whats_new_1_subplot3d.py
deleted file mode 100644
index 6e304c2a94e2..000000000000
--- a/examples/pyplots/whats_new_1_subplot3d.py
+++ /dev/null
@@ -1,53 +0,0 @@
-"""
-======================
-What's New 1 Subplot3d
-======================
-
-Create two three-dimensional plots in the same figure.
-"""
-
-from matplotlib import cm
-#from matplotlib.ticker import LinearLocator, FixedLocator, FormatStrFormatter
-import matplotlib.pyplot as plt
-import numpy as np
-
-fig = plt.figure()
-
-ax = fig.add_subplot(1, 2, 1, projection='3d')
-X = np.arange(-5, 5, 0.25)
-Y = np.arange(-5, 5, 0.25)
-X, Y = np.meshgrid(X, Y)
-R = np.sqrt(X**2 + Y**2)
-Z = np.sin(R)
-surf = ax.plot_surface(X, Y, Z, rstride=1, cstride=1, cmap=cm.viridis,
-                       linewidth=0, antialiased=False)
-ax.set_zlim3d(-1.01, 1.01)
-
-#ax.zaxis.set_major_locator(LinearLocator(10))
-#ax.zaxis.set_major_formatter(FormatStrFormatter('%.03f'))
-
-fig.colorbar(surf, shrink=0.5, aspect=5)
-
-from mpl_toolkits.mplot3d.axes3d import get_test_data
-ax = fig.add_subplot(1, 2, 2, projection='3d')
-X, Y, Z = get_test_data(0.05)
-ax.plot_wireframe(X, Y, Z, rstride=10, cstride=10)
-
-plt.show()
-
-#############################################################################
-#
-# ------------
-#
-# References
-# """"""""""
-#
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-import mpl_toolkits
-matplotlib.figure.Figure.add_subplot
-mpl_toolkits.mplot3d.axes3d.Axes3D.plot_surface
-mpl_toolkits.mplot3d.axes3d.Axes3D.plot_wireframe
-mpl_toolkits.mplot3d.axes3d.Axes3D.set_zlim3d
diff --git a/examples/pyplots/whats_new_98_4_fill_between.py b/examples/pyplots/whats_new_98_4_fill_between.py
deleted file mode 100644
index 7193cfd02d1f..000000000000
--- a/examples/pyplots/whats_new_98_4_fill_between.py
+++ /dev/null
@@ -1,34 +0,0 @@
-"""
-============
-Fill Between
-============
-
-Fill the area between two curves.
-"""
-import matplotlib.pyplot as plt
-import numpy as np
-
-x = np.arange(-5, 5, 0.01)
-y1 = -5*x*x + x + 10
-y2 = 5*x*x + x
-
-fig, ax = plt.subplots()
-ax.plot(x, y1, x, y2, color='black')
-ax.fill_between(x, y1, y2, where=(y2 > y1), facecolor='yellow', alpha=0.5)
-ax.fill_between(x, y1, y2, where=(y2 <= y1), facecolor='red', alpha=0.5)
-ax.set_title('Fill Between')
-
-plt.show()
-
-#############################################################################
-#
-# ------------
-#
-# References
-# """"""""""
-#
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.fill_between
diff --git a/examples/pyplots/whats_new_98_4_legend.py b/examples/pyplots/whats_new_98_4_legend.py
deleted file mode 100644
index 01c773c2c0d4..000000000000
--- a/examples/pyplots/whats_new_98_4_legend.py
+++ /dev/null
@@ -1,37 +0,0 @@
-"""
-========================
-What's New 0.98.4 Legend
-========================
-
-Create a legend and tweak it with a shadow and a box.
-"""
-import matplotlib.pyplot as plt
-import numpy as np
-
-
-ax = plt.subplot()
-t1 = np.arange(0.0, 1.0, 0.01)
-for n in [1, 2, 3, 4]:
-    plt.plot(t1, t1**n, label=f"n={n}")
-
-leg = plt.legend(loc='best', ncol=2, mode="expand", shadow=True, fancybox=True)
-leg.get_frame().set_alpha(0.5)
-
-
-plt.show()
-
-#############################################################################
-#
-# ------------
-#
-# References
-# """"""""""
-#
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.legend
-matplotlib.pyplot.legend
-matplotlib.legend.Legend
-matplotlib.legend.Legend.get_frame
diff --git a/examples/pyplots/whats_new_99_axes_grid.py b/examples/pyplots/whats_new_99_axes_grid.py
deleted file mode 100644
index 1429e0d4d268..000000000000
--- a/examples/pyplots/whats_new_99_axes_grid.py
+++ /dev/null
@@ -1,64 +0,0 @@
-"""
-=========================
-What's New 0.99 Axes Grid
-=========================
-
-Create RGB composite images.
-"""
-import numpy as np
-import matplotlib.pyplot as plt
-from mpl_toolkits.axes_grid1.axes_rgb import RGBAxes
-
-
-def get_demo_image():
-    # prepare image
-    delta = 0.5
-
-    extent = (-3, 4, -4, 3)
-    x = np.arange(-3.0, 4.001, delta)
-    y = np.arange(-4.0, 3.001, delta)
-    X, Y = np.meshgrid(x, y)
-    Z1 = np.exp(-X**2 - Y**2)
-    Z2 = np.exp(-(X - 1)**2 - (Y - 1)**2)
-    Z = (Z1 - Z2) * 2
-
-    return Z, extent
-
-
-def get_rgb():
-    Z, extent = get_demo_image()
-
-    Z[Z < 0] = 0.
-    Z = Z / Z.max()
-
-    R = Z[:13, :13]
-    G = Z[2:, 2:]
-    B = Z[:13, 2:]
-
-    return R, G, B
-
-
-fig = plt.figure()
-ax = RGBAxes(fig, [0.1, 0.1, 0.8, 0.8])
-
-r, g, b = get_rgb()
-ax.imshow_rgb(r, g, b, origin="lower")
-
-ax.RGB.set_xlim(0., 9.5)
-ax.RGB.set_ylim(0.9, 10.6)
-
-plt.show()
-
-#############################################################################
-#
-# ------------
-#
-# References
-# """"""""""
-#
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import mpl_toolkits
-mpl_toolkits.axes_grid1.axes_rgb.RGBAxes
-mpl_toolkits.axes_grid1.axes_rgb.RGBAxes.imshow_rgb
diff --git a/examples/pyplots/whats_new_99_mplot3d.py b/examples/pyplots/whats_new_99_mplot3d.py
deleted file mode 100644
index 28a383aa7659..000000000000
--- a/examples/pyplots/whats_new_99_mplot3d.py
+++ /dev/null
@@ -1,38 +0,0 @@
-"""
-=======================
-What's New 0.99 Mplot3d
-=======================
-
-Create a 3D surface plot.
-"""
-import numpy as np
-import matplotlib.pyplot as plt
-from matplotlib import cm
-from mpl_toolkits.mplot3d import Axes3D
-
-X = np.arange(-5, 5, 0.25)
-Y = np.arange(-5, 5, 0.25)
-X, Y = np.meshgrid(X, Y)
-R = np.sqrt(X**2 + Y**2)
-Z = np.sin(R)
-
-fig = plt.figure()
-ax = Axes3D(fig, auto_add_to_figure=False)
-fig.add_axes(ax)
-ax.plot_surface(X, Y, Z, rstride=1, cstride=1, cmap=cm.viridis)
-
-plt.show()
-
-#############################################################################
-#
-# ------------
-#
-# References
-# """"""""""
-#
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import mpl_toolkits
-mpl_toolkits.mplot3d.Axes3D
-mpl_toolkits.mplot3d.Axes3D.plot_surface
diff --git a/examples/pyplots/whats_new_99_spines.py b/examples/pyplots/whats_new_99_spines.py
deleted file mode 100644
index 29aae70d85f7..000000000000
--- a/examples/pyplots/whats_new_99_spines.py
+++ /dev/null
@@ -1,71 +0,0 @@
-"""
-======================
-What's New 0.99 Spines
-======================
-
-"""
-import matplotlib.pyplot as plt
-import numpy as np
-
-
-def adjust_spines(ax, spines):
-    for loc, spine in ax.spines.items():
-        if loc in spines:
-            spine.set_position(('outward', 10))  # outward by 10 points
-        else:
-            spine.set_color('none')  # don't draw spine
-
-    # turn off ticks where there is no spine
-    if 'left' in spines:
-        ax.yaxis.set_ticks_position('left')
-    else:
-        # no yaxis ticks
-        ax.yaxis.set_ticks([])
-
-    if 'bottom' in spines:
-        ax.xaxis.set_ticks_position('bottom')
-    else:
-        # no xaxis ticks
-        ax.xaxis.set_ticks([])
-
-fig = plt.figure()
-
-x = np.linspace(0, 2*np.pi, 100)
-y = 2*np.sin(x)
-
-ax = fig.add_subplot(2, 2, 1)
-ax.plot(x, y)
-adjust_spines(ax, ['left'])
-
-ax = fig.add_subplot(2, 2, 2)
-ax.plot(x, y)
-adjust_spines(ax, [])
-
-ax = fig.add_subplot(2, 2, 3)
-ax.plot(x, y)
-adjust_spines(ax, ['left', 'bottom'])
-
-ax = fig.add_subplot(2, 2, 4)
-ax.plot(x, y)
-adjust_spines(ax, ['bottom'])
-
-plt.show()
-
-#############################################################################
-#
-# ------------
-#
-# References
-# """"""""""
-#
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axis.Axis.set_ticks
-matplotlib.axis.XAxis.set_ticks_position
-matplotlib.axis.YAxis.set_ticks_position
-matplotlib.spines
-matplotlib.spines.Spine
-matplotlib.spines.Spine.set_color
-matplotlib.spines.Spine.set_position
diff --git a/examples/scales/asinh_demo.py b/examples/scales/asinh_demo.py
new file mode 100644
index 000000000000..69e4cea4fa48
--- /dev/null
+++ b/examples/scales/asinh_demo.py
@@ -0,0 +1,109 @@
+"""
+============
+Asinh Demo
+============
+
+Illustration of the `asinh <.scale.AsinhScale>` axis scaling,
+which uses the transformation
+
+.. math::
+
+    a \\rightarrow a_0 \\sinh^{-1} (a / a_0)
+
+For coordinate values close to zero (i.e. much smaller than
+the "linear width" :math:`a_0`), this leaves values essentially unchanged:
+
+.. math::
+
+    a \\rightarrow a + \\mathcal{O}(a^3)
+
+but for larger values (i.e. :math:`|a| \\gg a_0`, this is asymptotically
+
+.. math::
+
+    a \\rightarrow a_0 \\, \\mathrm{sgn}(a) \\ln |a| + \\mathcal{O}(1)
+
+As with the `symlog <.scale.SymmetricalLogScale>` scaling,
+this allows one to plot quantities
+that cover a very wide dynamic range that includes both positive
+and negative values. However, ``symlog`` involves a transformation
+that has discontinuities in its gradient because it is built
+from *separate* linear and logarithmic transformations.
+The ``asinh`` scaling uses a transformation that is smooth
+for all (finite) values, which is both mathematically cleaner
+and reduces visual artifacts associated with an abrupt
+transition between linear and logarithmic regions of the plot.
+
+.. note::
+   `.scale.AsinhScale` is experimental, and the API may change.
+
+See `~.scale.AsinhScale`, `~.scale.SymmetricalLogScale`.
+"""
+
+import numpy as np
+import matplotlib.pyplot as plt
+
+# Prepare sample values for variations on y=x graph:
+x = np.linspace(-3, 6, 500)
+
+###############################################################################
+# Compare "symlog" and "asinh" behaviour on sample y=x graph,
+# where there is a discontinuous gradient in "symlog" near y=2:
+fig1 = plt.figure()
+ax0, ax1 = fig1.subplots(1, 2, sharex=True)
+
+ax0.plot(x, x)
+ax0.set_yscale('symlog')
+ax0.grid()
+ax0.set_title('symlog')
+
+ax1.plot(x, x)
+ax1.set_yscale('asinh')
+ax1.grid()
+ax1.set_title('asinh')
+
+
+###############################################################################
+# Compare "asinh" graphs with different scale parameter "linear_width":
+fig2 = plt.figure(constrained_layout=True)
+axs = fig2.subplots(1, 3, sharex=True)
+for ax, (a0, base) in zip(axs, ((0.2, 2), (1.0, 0), (5.0, 10))):
+    ax.set_title('linear_width={:.3g}'.format(a0))
+    ax.plot(x, x, label='y=x')
+    ax.plot(x, 10*x, label='y=10x')
+    ax.plot(x, 100*x, label='y=100x')
+    ax.set_yscale('asinh', linear_width=a0, base=base)
+    ax.grid()
+    ax.legend(loc='best', fontsize='small')
+
+
+###############################################################################
+# Compare "symlog" and "asinh" scalings
+# on 2D Cauchy-distributed random numbers,
+# where one may be able to see more subtle artifacts near y=2
+# due to the gradient-discontinuity in "symlog":
+fig3 = plt.figure()
+ax = fig3.subplots(1, 1)
+r = 3 * np.tan(np.random.uniform(-np.pi / 2.02, np.pi / 2.02,
+                                 size=(5000,)))
+th = np.random.uniform(0, 2*np.pi, size=r.shape)
+
+ax.scatter(r * np.cos(th), r * np.sin(th), s=4, alpha=0.5)
+ax.set_xscale('asinh')
+ax.set_yscale('symlog')
+ax.set_xlabel('asinh')
+ax.set_ylabel('symlog')
+ax.set_title('2D Cauchy random deviates')
+ax.set_xlim(-50, 50)
+ax.set_ylim(-50, 50)
+ax.grid()
+
+plt.show()
+
+###############################################################################
+#
+# .. admonition:: References
+#
+#    - `matplotlib.scale.AsinhScale`
+#    - `matplotlib.ticker.AsinhLocator`
+#    - `matplotlib.scale.SymmetricalLogScale`
diff --git a/examples/scales/custom_scale.py b/examples/scales/custom_scale.py
index ea2c2df00b34..bfeb8b99bd98 100644
--- a/examples/scales/custom_scale.py
+++ b/examples/scales/custom_scale.py
@@ -6,7 +6,7 @@
 Create a custom scale, by implementing the scaling use for latitude data in a
 Mercator Projection.
 
-Unless you are making special use of the `~.Transform` class, you probably
+Unless you are making special use of the `.Transform` class, you probably
 don't need to use this verbose method, and instead can use `~.scale.FuncScale`
 and the ``'function'`` option of `~.Axes.set_xscale` and `~.Axes.set_yscale`.
 See the last example in :doc:`/gallery/scales/scales`.
@@ -34,12 +34,12 @@ class MercatorLatitudeScale(mscale.ScaleBase):
     there is user-defined threshold, above and below which nothing
     will be plotted.  This defaults to +/- 85 degrees.
 
-    __ http://en.wikipedia.org/wiki/Mercator_projection
+    __ https://en.wikipedia.org/wiki/Mercator_projection
     """
 
     # The scale class must have a member ``name`` that defines the string used
-    # to select the scale.  For example, ``gca().set_yscale("mercator")`` would
-    # be used to select this scale.
+    # to select the scale.  For example, ``ax.set_yscale("mercator")`` would be
+    # used to select this scale.
     name = 'mercator'
 
     def __init__(self, axis, *, thresh=np.deg2rad(85), **kwargs):
@@ -159,7 +159,7 @@ def inverted(self):
     s = np.radians(t)/2.
 
     plt.plot(t, s, '-', lw=2)
-    plt.gca().set_yscale('mercator')
+    plt.yscale('mercator')
 
     plt.xlabel('Longitude')
     plt.ylabel('Latitude')
diff --git a/examples/scales/log_bar.py b/examples/scales/log_bar.py
index bcbdee2a7f98..239069806c5c 100644
--- a/examples/scales/log_bar.py
+++ b/examples/scales/log_bar.py
@@ -20,8 +20,7 @@
     y = [d[i] for d in data]
     b = ax.bar(x + i * dimw, y, dimw, bottom=0.001)
 
-ax.set_xticks(x + dimw / 2)
-ax.set_xticklabels(map(str, x))
+ax.set_xticks(x + dimw / 2, labels=map(str, x))
 ax.set_yscale('log')
 
 ax.set_xlabel('x')
diff --git a/examples/scales/power_norm.py b/examples/scales/power_norm.py
index 60795fb5b524..9ab8454465f5 100644
--- a/examples/scales/power_norm.py
+++ b/examples/scales/power_norm.py
@@ -38,16 +38,12 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.colors
-matplotlib.colors.PowerNorm
-matplotlib.axes.Axes.hist2d
-matplotlib.pyplot.hist2d
+#    - `matplotlib.colors`
+#    - `matplotlib.colors.PowerNorm`
+#    - `matplotlib.axes.Axes.hist2d`
+#    - `matplotlib.pyplot.hist2d`
diff --git a/examples/scales/scales.py b/examples/scales/scales.py
index d47d0281b33c..25ec82608f01 100644
--- a/examples/scales/scales.py
+++ b/examples/scales/scales.py
@@ -103,20 +103,16 @@ def inverse(a):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.set_yscale
-matplotlib.axes.Axes.set_xscale
-matplotlib.axis.Axis.set_major_locator
-matplotlib.scale.LogitScale
-matplotlib.scale.LogScale
-matplotlib.scale.LinearScale
-matplotlib.scale.SymmetricalLogScale
-matplotlib.scale.FuncScale
+#    - `matplotlib.axes.Axes.set_xscale`
+#    - `matplotlib.axes.Axes.set_yscale`
+#    - `matplotlib.axis.Axis.set_major_locator`
+#    - `matplotlib.scale.LinearScale`
+#    - `matplotlib.scale.LogScale`
+#    - `matplotlib.scale.SymmetricalLogScale`
+#    - `matplotlib.scale.LogitScale`
+#    - `matplotlib.scale.FuncScale`
diff --git a/examples/scales/log_test.py b/examples/scales/semilogx_demo.py
similarity index 86%
rename from examples/scales/log_test.py
rename to examples/scales/semilogx_demo.py
index 72c04d61aaae..00c708a03479 100644
--- a/examples/scales/log_test.py
+++ b/examples/scales/semilogx_demo.py
@@ -3,6 +3,8 @@
 Log Axis
 ========
 
+.. redirect-from:: /gallery/scales/log_test
+
 This is an example of assigning a log-scale for the x-axis using
 `~.axes.Axes.semilogx`.
 """
diff --git a/examples/scales/symlog_demo.py b/examples/scales/symlog_demo.py
index e1c433b22b88..6c5f04ade8d6 100644
--- a/examples/scales/symlog_demo.py
+++ b/examples/scales/symlog_demo.py
@@ -33,3 +33,17 @@
 
 fig.tight_layout()
 plt.show()
+
+###############################################################################
+# It should be noted that the coordinate transform used by ``symlog``
+# has a discontinuous gradient at the transition between its linear
+# and logarithmic regions. The ``asinh`` axis scale is an alternative
+# technique that may avoid visual artifacts caused by these discontinuities.
+
+###############################################################################
+#
+# .. admonition:: References
+#
+#    - `matplotlib.scale.SymmetricalLogScale`
+#    - `matplotlib.ticker.SymmetricalLogLocator`
+#    - `matplotlib.scale.AsinhScale`
diff --git a/examples/shapes_and_collections/arrow_guide.py b/examples/shapes_and_collections/arrow_guide.py
index 284944e95bb8..24151544ba17 100644
--- a/examples/shapes_and_collections/arrow_guide.py
+++ b/examples/shapes_and_collections/arrow_guide.py
@@ -23,13 +23,16 @@
 3. Entire patch fixed in data space
 
 Below each use case is presented in turn.
+
+.. redirect-from:: /gallery/text_labels_and_annotations/arrow_simple_demo
 """
+
 import matplotlib.patches as mpatches
 import matplotlib.pyplot as plt
 x_tail = 0.1
-y_tail = 0.1
+y_tail = 0.5
 x_head = 0.9
-y_head = 0.9
+y_head = 0.8
 dx = x_head - x_tail
 dy = y_head - y_tail
 
@@ -54,8 +57,7 @@
 arrow = mpatches.FancyArrowPatch((x_tail, y_tail), (x_head, y_head),
                                  mutation_scale=100)
 axs[1].add_patch(arrow)
-axs[1].set_xlim(0, 2)
-axs[1].set_ylim(0, 2)
+axs[1].set(xlim=(0, 2), ylim=(0, 2))
 
 ###############################################################################
 # Head shape and anchor points fixed in display space
@@ -81,28 +83,42 @@
                                  mutation_scale=100,
                                  transform=axs[1].transAxes)
 axs[1].add_patch(arrow)
-axs[1].set_xlim(0, 2)
-axs[1].set_ylim(0, 2)
+axs[1].set(xlim=(0, 2), ylim=(0, 2))
 
 
 ###############################################################################
 # Head shape and anchor points fixed in data space
 # ------------------------------------------------
 #
-# In this case we use `.patches.Arrow`.
+# In this case we use `.patches.Arrow`, or `.patches.FancyArrow` (the latter is
+# in orange).
 #
 # Note that when the axis limits are changed, the arrow shape and location
 # change.
+#
+# `.FancyArrow`'s API is relatively awkward, and requires in particular passing
+# ``length_includes_head=True`` so that the arrow *tip* is ``(dx, dy)`` away
+# from the arrow start.  It is only included in this reference because it is
+# the arrow class returned by `.Axes.arrow` (in green).
 
 fig, axs = plt.subplots(nrows=2)
 
 arrow = mpatches.Arrow(x_tail, y_tail, dx, dy)
 axs[0].add_patch(arrow)
+arrow = mpatches.FancyArrow(x_tail, y_tail - .4, dx, dy,
+                            width=.1, length_includes_head=True, color="C1")
+axs[0].add_patch(arrow)
+axs[0].arrow(x_tail + 1, y_tail - .4, dx, dy,
+             width=.1, length_includes_head=True, color="C2")
 
 arrow = mpatches.Arrow(x_tail, y_tail, dx, dy)
 axs[1].add_patch(arrow)
-axs[1].set_xlim(0, 2)
-axs[1].set_ylim(0, 2)
+arrow = mpatches.FancyArrow(x_tail, y_tail - .4, dx, dy,
+                            width=.1, length_includes_head=True, color="C1")
+axs[1].add_patch(arrow)
+axs[1].arrow(x_tail + 1, y_tail - .4, dx, dy,
+             width=.1, length_includes_head=True, color="C2")
+axs[1].set(xlim=(0, 2), ylim=(0, 2))
 
 ###############################################################################
 
diff --git a/examples/shapes_and_collections/artist_reference.py b/examples/shapes_and_collections/artist_reference.py
index d8e267c98d5e..054c1f1e088a 100644
--- a/examples/shapes_and_collections/artist_reference.py
+++ b/examples/shapes_and_collections/artist_reference.py
@@ -45,7 +45,7 @@ def label(xy, text):
 label(grid[2], "Wedge")
 
 # add a Polygon
-polygon = mpatches.RegularPolygon(grid[3], 5, 0.1)
+polygon = mpatches.RegularPolygon(grid[3], 5, radius=0.1)
 patches.append(polygon)
 label(grid[3], "Polygon")
 
@@ -104,30 +104,26 @@ def label(xy, text):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.path
-matplotlib.path.Path
-matplotlib.lines
-matplotlib.lines.Line2D
-matplotlib.patches
-matplotlib.patches.Circle
-matplotlib.patches.Ellipse
-matplotlib.patches.Wedge
-matplotlib.patches.Rectangle
-matplotlib.patches.Arrow
-matplotlib.patches.PathPatch
-matplotlib.patches.FancyBboxPatch
-matplotlib.patches.RegularPolygon
-matplotlib.collections
-matplotlib.collections.PatchCollection
-matplotlib.cm.ScalarMappable.set_array
-matplotlib.axes.Axes.add_collection
-matplotlib.axes.Axes.add_line
+#    - `matplotlib.path`
+#    - `matplotlib.path.Path`
+#    - `matplotlib.lines`
+#    - `matplotlib.lines.Line2D`
+#    - `matplotlib.patches`
+#    - `matplotlib.patches.Circle`
+#    - `matplotlib.patches.Ellipse`
+#    - `matplotlib.patches.Wedge`
+#    - `matplotlib.patches.Rectangle`
+#    - `matplotlib.patches.Arrow`
+#    - `matplotlib.patches.PathPatch`
+#    - `matplotlib.patches.FancyBboxPatch`
+#    - `matplotlib.patches.RegularPolygon`
+#    - `matplotlib.collections`
+#    - `matplotlib.collections.PatchCollection`
+#    - `matplotlib.cm.ScalarMappable.set_array`
+#    - `matplotlib.axes.Axes.add_collection`
+#    - `matplotlib.axes.Axes.add_line`
diff --git a/examples/shapes_and_collections/collections.py b/examples/shapes_and_collections/collections.py
index 8b3a38823a8e..161e2f1d28e5 100644
--- a/examples/shapes_and_collections/collections.py
+++ b/examples/shapes_and_collections/collections.py
@@ -3,11 +3,10 @@
 Line, Poly and RegularPoly Collection with autoscaling
 =========================================================
 
-For the first two subplots, we will use spirals.  Their
-size will be set in plot units, not data units.  Their positions
-will be set in data units by using the "offsets" and "transOffset"
-kwargs of the `~.collections.LineCollection` and
-`~.collections.PolyCollection`.
+For the first two subplots, we will use spirals.  Their size will be set in
+plot units, not data units.  Their positions will be set in data units by using
+the *offsets* and *offset_transform* keyword arguments of the `.LineCollection`
+and `.PolyCollection`.
 
 The third subplot will make regular polygons, with the same
 type of scaling and positioning as in the first two.
@@ -47,8 +46,8 @@
                     hspace=0.3, wspace=0.3)
 
 
-col = collections.LineCollection([spiral], offsets=xyo,
-                                 transOffset=ax1.transData)
+col = collections.LineCollection(
+    [spiral], offsets=xyo, offset_transform=ax1.transData)
 trans = fig.dpi_scale_trans + transforms.Affine2D().scale(1.0/72.0)
 col.set_transform(trans)  # the points to pixels transform
 # Note: the first argument to the collection initializer
@@ -60,7 +59,7 @@
 # but it is good enough to generate a plot that you can use
 # as a starting point.  If you know beforehand the range of
 # x and y that you want to show, it is better to set them
-# explicitly, leave out the autolim kwarg (or set it to False),
+# explicitly, leave out the *autolim* keyword argument (or set it to False),
 # and omit the 'ax1.autoscale_view()' call below.
 
 # Make a transform for the line segments such that their size is
@@ -72,8 +71,8 @@
 
 
 # The same data as above, but fill the curves.
-col = collections.PolyCollection([spiral], offsets=xyo,
-                                 transOffset=ax2.transData)
+col = collections.PolyCollection(
+    [spiral], offsets=xyo, offset_transform=ax2.transData)
 trans = transforms.Affine2D().scale(fig.dpi/72.0)
 col.set_transform(trans)  # the points to pixels transform
 ax2.add_collection(col, autolim=True)
@@ -86,7 +85,7 @@
 # 7-sided regular polygons
 
 col = collections.RegularPolyCollection(
-    7, sizes=np.abs(xx) * 10.0, offsets=xyo, transOffset=ax3.transData)
+    7, sizes=np.abs(xx) * 10.0, offsets=xyo, offset_transform=ax3.transData)
 trans = transforms.Affine2D().scale(fig.dpi / 72.0)
 col.set_transform(trans)  # the points to pixels transform
 ax3.add_collection(col, autolim=True)
@@ -127,20 +126,16 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.figure.Figure
-matplotlib.collections
-matplotlib.collections.LineCollection
-matplotlib.collections.RegularPolyCollection
-matplotlib.axes.Axes.add_collection
-matplotlib.axes.Axes.autoscale_view
-matplotlib.transforms.Affine2D
-matplotlib.transforms.Affine2D.scale
+#    - `matplotlib.figure.Figure`
+#    - `matplotlib.collections`
+#    - `matplotlib.collections.LineCollection`
+#    - `matplotlib.collections.RegularPolyCollection`
+#    - `matplotlib.axes.Axes.add_collection`
+#    - `matplotlib.axes.Axes.autoscale_view`
+#    - `matplotlib.transforms.Affine2D`
+#    - `matplotlib.transforms.Affine2D.scale`
diff --git a/examples/shapes_and_collections/compound_path.py b/examples/shapes_and_collections/compound_path.py
index ceff94400686..d721eaf1c392 100644
--- a/examples/shapes_and_collections/compound_path.py
+++ b/examples/shapes_and_collections/compound_path.py
@@ -23,7 +23,7 @@
 
 path = Path(vertices, codes)
 
-pathpatch = PathPatch(path, facecolor='None', edgecolor='green')
+pathpatch = PathPatch(path, facecolor='none', edgecolor='green')
 
 fig, ax = plt.subplots()
 ax.add_patch(pathpatch)
@@ -35,18 +35,14 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.path
-matplotlib.path.Path
-matplotlib.patches
-matplotlib.patches.PathPatch
-matplotlib.axes.Axes.add_patch
-matplotlib.axes.Axes.autoscale_view
+#    - `matplotlib.path`
+#    - `matplotlib.path.Path`
+#    - `matplotlib.patches`
+#    - `matplotlib.patches.PathPatch`
+#    - `matplotlib.axes.Axes.add_patch`
+#    - `matplotlib.axes.Axes.autoscale_view`
diff --git a/examples/shapes_and_collections/dolphin.py b/examples/shapes_and_collections/dolphin.py
index 5f606a3425c0..325b55a96f7b 100644
--- a/examples/shapes_and_collections/dolphin.py
+++ b/examples/shapes_and_collections/dolphin.py
@@ -105,21 +105,17 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.path
-matplotlib.path.Path
-matplotlib.patches
-matplotlib.patches.PathPatch
-matplotlib.patches.Circle
-matplotlib.axes.Axes.add_patch
-matplotlib.transforms
-matplotlib.transforms.Affine2D
-matplotlib.transforms.Affine2D.rotate_deg
+#    - `matplotlib.path`
+#    - `matplotlib.path.Path`
+#    - `matplotlib.patches`
+#    - `matplotlib.patches.PathPatch`
+#    - `matplotlib.patches.Circle`
+#    - `matplotlib.axes.Axes.add_patch`
+#    - `matplotlib.transforms`
+#    - `matplotlib.transforms.Affine2D`
+#    - `matplotlib.transforms.Affine2D.rotate_deg`
diff --git a/examples/shapes_and_collections/donut.py b/examples/shapes_and_collections/donut.py
index 9afa26c85e6f..d4c308e75fae 100644
--- a/examples/shapes_and_collections/donut.py
+++ b/examples/shapes_and_collections/donut.py
@@ -64,23 +64,19 @@ def make_circle(r):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.path
-matplotlib.path.Path
-matplotlib.patches
-matplotlib.patches.PathPatch
-matplotlib.patches.Circle
-matplotlib.axes.Axes.add_patch
-matplotlib.axes.Axes.annotate
-matplotlib.axes.Axes.set_aspect
-matplotlib.axes.Axes.set_xlim
-matplotlib.axes.Axes.set_ylim
-matplotlib.axes.Axes.set_title
+#    - `matplotlib.path`
+#    - `matplotlib.path.Path`
+#    - `matplotlib.patches`
+#    - `matplotlib.patches.PathPatch`
+#    - `matplotlib.patches.Circle`
+#    - `matplotlib.axes.Axes.add_patch`
+#    - `matplotlib.axes.Axes.annotate`
+#    - `matplotlib.axes.Axes.set_aspect`
+#    - `matplotlib.axes.Axes.set_xlim`
+#    - `matplotlib.axes.Axes.set_ylim`
+#    - `matplotlib.axes.Axes.set_title`
diff --git a/examples/shapes_and_collections/ellipse_collection.py b/examples/shapes_and_collections/ellipse_collection.py
index 9b7a71f55643..7a92eff580ee 100644
--- a/examples/shapes_and_collections/ellipse_collection.py
+++ b/examples/shapes_and_collections/ellipse_collection.py
@@ -7,6 +7,7 @@
 a `~.collections.EllipseCollection` or `~.collections.PathCollection`, the use
 of an `~.collections.EllipseCollection` allows for much shorter code.
 """
+
 import matplotlib.pyplot as plt
 import numpy as np
 from matplotlib.collections import EllipseCollection
@@ -25,7 +26,7 @@
 fig, ax = plt.subplots()
 
 ec = EllipseCollection(ww, hh, aa, units='x', offsets=XY,
-                       transOffset=ax.transData)
+                       offset_transform=ax.transData)
 ec.set_array((X + Y).ravel())
 ax.add_collection(ec)
 ax.autoscale_view()
@@ -37,17 +38,13 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.collections
-matplotlib.collections.EllipseCollection
-matplotlib.axes.Axes.add_collection
-matplotlib.axes.Axes.autoscale_view
-matplotlib.cm.ScalarMappable.set_array
+#    - `matplotlib.collections`
+#    - `matplotlib.collections.EllipseCollection`
+#    - `matplotlib.axes.Axes.add_collection`
+#    - `matplotlib.axes.Axes.autoscale_view`
+#    - `matplotlib.cm.ScalarMappable.set_array`
diff --git a/examples/shapes_and_collections/ellipse_demo.py b/examples/shapes_and_collections/ellipse_demo.py
index 8b03e845bdbb..8d2615af7717 100644
--- a/examples/shapes_and_collections/ellipse_demo.py
+++ b/examples/shapes_and_collections/ellipse_demo.py
@@ -42,10 +42,6 @@
 # Draw many ellipses with different angles.
 #
 
-import matplotlib.pyplot as plt
-import numpy as np
-from matplotlib.patches import Ellipse
-
 angle_step = 45  # degrees
 angles = np.arange(0, 180, angle_step)
 
@@ -62,18 +58,14 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.patches
-matplotlib.patches.Ellipse
-matplotlib.axes.Axes.add_artist
-matplotlib.artist.Artist.set_clip_box
-matplotlib.artist.Artist.set_alpha
-matplotlib.patches.Patch.set_facecolor
+#    - `matplotlib.patches`
+#    - `matplotlib.patches.Ellipse`
+#    - `matplotlib.axes.Axes.add_artist`
+#    - `matplotlib.artist.Artist.set_clip_box`
+#    - `matplotlib.artist.Artist.set_alpha`
+#    - `matplotlib.patches.Patch.set_facecolor`
diff --git a/examples/shapes_and_collections/fancybox_demo.py b/examples/shapes_and_collections/fancybox_demo.py
index 22772a50983d..ea1383d01941 100644
--- a/examples/shapes_and_collections/fancybox_demo.py
+++ b/examples/shapes_and_collections/fancybox_demo.py
@@ -6,6 +6,8 @@
 The following examples show how to plot boxes with different visual properties.
 """
 
+import inspect
+
 import matplotlib.pyplot as plt
 import matplotlib.transforms as mtransforms
 import matplotlib.patches as mpatch
@@ -15,17 +17,26 @@
 # First we'll show some sample boxes with fancybox.
 
 styles = mpatch.BoxStyle.get_styles()
-spacing = 1.2
-
-figheight = (spacing * len(styles) + .5)
-fig = plt.figure(figsize=(4 / 1.5, figheight / 1.5))
-fontsize = 0.3 * 72
-
-for i, stylename in enumerate(sorted(styles)):
-    fig.text(0.5, (spacing * (len(styles) - i) - 0.5) / figheight, stylename,
-             ha="center",
-             size=fontsize,
-             bbox=dict(boxstyle=stylename, fc="w", ec="k"))
+ncol = 2
+nrow = (len(styles) + 1) // ncol
+axs = (plt.figure(figsize=(3 * ncol, 1 + nrow))
+       .add_gridspec(1 + nrow, ncol, wspace=.5).subplots())
+for ax in axs.flat:
+    ax.set_axis_off()
+for ax in axs[0, :]:
+    ax.text(.2, .5, "boxstyle",
+            transform=ax.transAxes, size="large", color="tab:blue",
+            horizontalalignment="right", verticalalignment="center")
+    ax.text(.4, .5, "default parameters",
+            transform=ax.transAxes,
+            horizontalalignment="left", verticalalignment="center")
+for ax, (stylename, stylecls) in zip(axs[1:, :].T.flat, styles.items()):
+    ax.text(.2, .5, stylename, bbox=dict(boxstyle=stylename, fc="w", ec="k"),
+            transform=ax.transAxes, size="large", color="tab:blue",
+            horizontalalignment="right", verticalalignment="center")
+    ax.text(.4, .5, str(inspect.signature(stylecls))[1:-1].replace(", ", "\n"),
+            transform=ax.transAxes,
+            horizontalalignment="left", verticalalignment="center")
 
 
 ###############################################################################
@@ -33,7 +44,7 @@
 
 
 def add_fancy_patch_around(ax, bb, **kwargs):
-    fancy = FancyBboxPatch((bb.xmin, bb.ymin), bb.width, bb.height,
+    fancy = FancyBboxPatch(bb.p0, bb.width, bb.height,
                            fc=(1, 0.8, 1, 0.5), ec=(1, 0.5, 1, 0.5),
                            **kwargs)
     ax.add_patch(fancy)
@@ -101,19 +112,15 @@ def draw_control_points_for_patches(ax):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.patches
-matplotlib.patches.FancyBboxPatch
-matplotlib.patches.BoxStyle
-matplotlib.patches.BoxStyle.get_styles
-matplotlib.transforms.Bbox
-matplotlib.figure.Figure.text
-matplotlib.axes.Axes.text
+#    - `matplotlib.patches`
+#    - `matplotlib.patches.FancyBboxPatch`
+#    - `matplotlib.patches.BoxStyle`
+#    - ``matplotlib.patches.BoxStyle.get_styles``
+#    - `matplotlib.transforms.Bbox`
+#    - `matplotlib.figure.Figure.text`
+#    - `matplotlib.axes.Axes.text`
diff --git a/examples/shapes_and_collections/hatch_demo.py b/examples/shapes_and_collections/hatch_demo.py
index c537181abe41..00b3200a2268 100644
--- a/examples/shapes_and_collections/hatch_demo.py
+++ b/examples/shapes_and_collections/hatch_demo.py
@@ -47,19 +47,14 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.patches
-matplotlib.patches.Ellipse
-matplotlib.patches.Polygon
-matplotlib.axes.Axes.add_patch
-matplotlib.patches.Patch.set_hatch
-matplotlib.axes.Axes.bar
-matplotlib.pyplot.bar
+#    - `matplotlib.patches`
+#    - `matplotlib.patches.Ellipse`
+#    - `matplotlib.patches.Polygon`
+#    - `matplotlib.axes.Axes.add_patch`
+#    - `matplotlib.patches.Patch.set_hatch`
+#    - `matplotlib.axes.Axes.bar` / `matplotlib.pyplot.bar`
diff --git a/examples/shapes_and_collections/hatch_style_reference.py b/examples/shapes_and_collections/hatch_style_reference.py
index a364d893dcaa..5fa13163ff33 100644
--- a/examples/shapes_and_collections/hatch_style_reference.py
+++ b/examples/shapes_and_collections/hatch_style_reference.py
@@ -52,16 +52,12 @@ def hatches_plot(ax, h):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.patches
-matplotlib.patches.Rectangle
-matplotlib.axes.Axes.add_patch
-matplotlib.axes.Axes.text
+#    - `matplotlib.patches`
+#    - `matplotlib.patches.Rectangle`
+#    - `matplotlib.axes.Axes.add_patch`
+#    - `matplotlib.axes.Axes.text`
diff --git a/examples/shapes_and_collections/line_collection.py b/examples/shapes_and_collections/line_collection.py
index 61e4c5317e59..9adfd8024e5b 100644
--- a/examples/shapes_and_collections/line_collection.py
+++ b/examples/shapes_and_collections/line_collection.py
@@ -86,19 +86,14 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.collections
-matplotlib.collections.LineCollection
-matplotlib.cm.ScalarMappable.set_array
-matplotlib.axes.Axes.add_collection
-matplotlib.figure.Figure.colorbar
-matplotlib.pyplot.colorbar
-matplotlib.pyplot.sci
+#    - `matplotlib.collections`
+#    - `matplotlib.collections.LineCollection`
+#    - `matplotlib.cm.ScalarMappable.set_array`
+#    - `matplotlib.axes.Axes.add_collection`
+#    - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar`
+#    - `matplotlib.pyplot.sci`
diff --git a/examples/shapes_and_collections/marker_path.py b/examples/shapes_and_collections/marker_path.py
deleted file mode 100644
index 7d43df365b32..000000000000
--- a/examples/shapes_and_collections/marker_path.py
+++ /dev/null
@@ -1,41 +0,0 @@
-"""
-===========
-Marker Path
-===========
-
-Using a `~.path.Path` as marker for a `~.axes.Axes.plot`.
-"""
-import matplotlib.pyplot as plt
-import matplotlib.path as mpath
-import numpy as np
-
-
-star = mpath.Path.unit_regular_star(6)
-circle = mpath.Path.unit_circle()
-# concatenate the circle with an internal cutout of the star
-verts = np.concatenate([circle.vertices, star.vertices[::-1, ...]])
-codes = np.concatenate([circle.codes, star.codes])
-cut_star = mpath.Path(verts, codes)
-
-
-plt.plot(np.arange(10)**2, '--r', marker=cut_star, markersize=15)
-
-plt.show()
-
-#############################################################################
-#
-# ------------
-#
-# References
-# """"""""""
-#
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.path
-matplotlib.path.Path
-matplotlib.path.Path.unit_regular_star
-matplotlib.path.Path.unit_circle
-matplotlib.axes.Axes.plot
-matplotlib.pyplot.plot
diff --git a/examples/shapes_and_collections/patch_collection.py b/examples/shapes_and_collections/patch_collection.py
index 33e137edb6a1..cdd9f4687619 100644
--- a/examples/shapes_and_collections/patch_collection.py
+++ b/examples/shapes_and_collections/patch_collection.py
@@ -45,7 +45,7 @@
 ]
 
 for i in range(N):
-    polygon = Polygon(np.random.rand(N, 2), True)
+    polygon = Polygon(np.random.rand(N, 2), closed=True)
     patches.append(polygon)
 
 colors = 100 * np.random.rand(len(patches))
@@ -58,20 +58,16 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.patches
-matplotlib.patches.Circle
-matplotlib.patches.Wedge
-matplotlib.patches.Polygon
-matplotlib.collections.PatchCollection
-matplotlib.collections.Collection.set_array
-matplotlib.axes.Axes.add_collection
-matplotlib.figure.Figure.colorbar
+#    - `matplotlib.patches`
+#    - `matplotlib.patches.Circle`
+#    - `matplotlib.patches.Wedge`
+#    - `matplotlib.patches.Polygon`
+#    - `matplotlib.collections.PatchCollection`
+#    - `matplotlib.collections.Collection.set_array`
+#    - `matplotlib.axes.Axes.add_collection`
+#    - `matplotlib.figure.Figure.colorbar`
diff --git a/examples/shapes_and_collections/path_patch.py b/examples/shapes_and_collections/path_patch.py
index 8ad132f9cb73..08f1a9457957 100644
--- a/examples/shapes_and_collections/path_patch.py
+++ b/examples/shapes_and_collections/path_patch.py
@@ -40,17 +40,13 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.path
-matplotlib.path.Path
-matplotlib.patches
-matplotlib.patches.PathPatch
-matplotlib.axes.Axes.add_patch
+#    - `matplotlib.path`
+#    - `matplotlib.path.Path`
+#    - `matplotlib.patches`
+#    - `matplotlib.patches.PathPatch`
+#    - `matplotlib.axes.Axes.add_patch`
diff --git a/examples/shapes_and_collections/quad_bezier.py b/examples/shapes_and_collections/quad_bezier.py
index 0aacd26c55f4..0059d627126d 100644
--- a/examples/shapes_and_collections/quad_bezier.py
+++ b/examples/shapes_and_collections/quad_bezier.py
@@ -27,17 +27,13 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.path
-matplotlib.path.Path
-matplotlib.patches
-matplotlib.patches.PathPatch
-matplotlib.axes.Axes.add_patch
+#    - `matplotlib.path`
+#    - `matplotlib.path.Path`
+#    - `matplotlib.patches`
+#    - `matplotlib.patches.PathPatch`
+#    - `matplotlib.axes.Axes.add_patch`
diff --git a/examples/shapes_and_collections/scatter.py b/examples/shapes_and_collections/scatter.py
index 673766a6ea4f..f5ecd8f10139 100644
--- a/examples/shapes_and_collections/scatter.py
+++ b/examples/shapes_and_collections/scatter.py
@@ -23,13 +23,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-import matplotlib
-
-matplotlib.axes.Axes.scatter
-matplotlib.pyplot.scatter
+#    - `matplotlib.axes.Axes.scatter` / `matplotlib.pyplot.scatter`
diff --git a/examples/showcase/anatomy.py b/examples/showcase/anatomy.py
index 96afa7f5d408..f53aa2bb9d9e 100644
--- a/examples/showcase/anatomy.py
+++ b/examples/showcase/anatomy.py
@@ -6,10 +6,18 @@
 This figure shows the name of several matplotlib elements composing a figure
 """
 
+
 import numpy as np
 import matplotlib.pyplot as plt
+from matplotlib.patches import Circle
+from matplotlib.patheffects import withStroke
 from matplotlib.ticker import AutoMinorLocator, MultipleLocator
 
+royal_blue = [0, 20/256, 82/256]
+
+
+# make the figure
+
 np.random.seed(19680801)
 
 X = np.linspace(0.5, 3.5, 100)
@@ -17,149 +25,96 @@
 Y2 = 1+np.cos(1+X/0.75)/2
 Y3 = np.random.uniform(Y1, Y2, len(X))
 
-fig = plt.figure(figsize=(8, 8))
-ax = fig.add_subplot(1, 1, 1, aspect=1)
-
-
-def minor_tick(x, pos):
-    if not x % 1.0:
-        return ""
-    return f"{x:.2f}"
+fig = plt.figure(figsize=(7.5, 7.5))
+ax = fig.add_axes([0.2, 0.17, 0.68, 0.7], aspect=1)
 
 ax.xaxis.set_major_locator(MultipleLocator(1.000))
 ax.xaxis.set_minor_locator(AutoMinorLocator(4))
 ax.yaxis.set_major_locator(MultipleLocator(1.000))
 ax.yaxis.set_minor_locator(AutoMinorLocator(4))
-# FuncFormatter is created and used automatically
-ax.xaxis.set_minor_formatter(minor_tick)
+ax.xaxis.set_minor_formatter("{x:.2f}")
 
 ax.set_xlim(0, 4)
 ax.set_ylim(0, 4)
 
-ax.tick_params(which='major', width=1.0)
-ax.tick_params(which='major', length=10)
-ax.tick_params(which='minor', width=1.0, labelsize=10)
-ax.tick_params(which='minor', length=5, labelsize=10, labelcolor='0.25')
+ax.tick_params(which='major', width=1.0, length=10, labelsize=14)
+ax.tick_params(which='minor', width=1.0, length=5, labelsize=10,
+               labelcolor='0.25')
 
 ax.grid(linestyle="--", linewidth=0.5, color='.25', zorder=-10)
 
-ax.plot(X, Y1, c=(0.25, 0.25, 1.00), lw=2, label="Blue signal", zorder=10)
-ax.plot(X, Y2, c=(1.00, 0.25, 0.25), lw=2, label="Red signal")
-ax.plot(X, Y3, linewidth=0,
-        marker='o', markerfacecolor='w', markeredgecolor='k')
+ax.plot(X, Y1, c='C0', lw=2.5, label="Blue signal", zorder=10)
+ax.plot(X, Y2, c='C1', lw=2.5, label="Orange signal")
+ax.plot(X[::3], Y3[::3], linewidth=0, markersize=9,
+        marker='s', markerfacecolor='none', markeredgecolor='C4',
+        markeredgewidth=2.5)
 
 ax.set_title("Anatomy of a figure", fontsize=20, verticalalignment='bottom')
-ax.set_xlabel("X axis label")
-ax.set_ylabel("Y axis label")
-
-ax.legend()
-
-
-def circle(x, y, radius=0.15):
-    from matplotlib.patches import Circle
-    from matplotlib.patheffects import withStroke
-    circle = Circle((x, y), radius, clip_on=False, zorder=10, linewidth=1,
-                    edgecolor='black', facecolor=(0, 0, 0, .0125),
-                    path_effects=[withStroke(linewidth=5, foreground='w')])
-    ax.add_artist(circle)
-
-
-def text(x, y, text):
-    ax.text(x, y, text, backgroundcolor="white",
-            ha='center', va='top', weight='bold', color='blue')
-
-
-# Minor tick
-circle(0.50, -0.10)
-text(0.50, -0.32, "Minor tick label")
-
-# Major tick
-circle(-0.03, 4.00)
-text(0.03, 3.80, "Major tick")
-
-# Minor tick
-circle(0.00, 3.50)
-text(0.00, 3.30, "Minor tick")
-
-# Major tick label
-circle(-0.15, 3.00)
-text(-0.15, 2.80, "Major tick label")
-
-# X Label
-circle(1.80, -0.27)
-text(1.80, -0.45, "X axis label")
-
-# Y Label
-circle(-0.27, 1.80)
-text(-0.27, 1.6, "Y axis label")
-
-# Title
-circle(1.60, 4.13)
-text(1.60, 3.93, "Title")
-
-# Blue plot
-circle(1.75, 2.80)
-text(1.75, 2.60, "Line\n(line plot)")
-
-# Red plot
-circle(1.20, 0.60)
-text(1.20, 0.40, "Line\n(line plot)")
-
-# Scatter plot
-circle(3.20, 1.75)
-text(3.20, 1.55, "Markers\n(scatter plot)")
-
-# Grid
-circle(3.00, 3.00)
-text(3.00, 2.80, "Grid")
-
-# Legend
-circle(3.70, 3.80)
-text(3.70, 3.60, "Legend")
-
-# Axes
-circle(0.5, 0.5)
-text(0.5, 0.3, "Axes")
-
-# Figure
-circle(-0.3, 0.65)
-text(-0.3, 0.45, "Figure")
-
-color = 'blue'
-ax.annotate('Spines', xy=(4.0, 0.35), xytext=(3.3, 0.5),
-            weight='bold', color=color,
-            arrowprops=dict(arrowstyle='->',
-                            connectionstyle="arc3",
-                            color=color))
-
-ax.annotate('', xy=(3.15, 0.0), xytext=(3.45, 0.45),
-            weight='bold', color=color,
-            arrowprops=dict(arrowstyle='->',
-                            connectionstyle="arc3",
-                            color=color))
-
-ax.text(4.0, -0.4, "Made with https://matplotlib.org",
-        fontsize=10, ha="right", color='.5')
-
+ax.set_xlabel("x Axis label", fontsize=14)
+ax.set_ylabel("y Axis label", fontsize=14)
+ax.legend(loc="upper right", fontsize=14)
+
+
+# Annotate the figure
+
+def annotate(x, y, text, code):
+    # Circle marker
+    c = Circle((x, y), radius=0.15, clip_on=False, zorder=10, linewidth=2.5,
+               edgecolor=royal_blue + [0.6], facecolor='none',
+               path_effects=[withStroke(linewidth=7, foreground='white')])
+    ax.add_artist(c)
+
+    # use path_effects as a background for the texts
+    # draw the path_effects and the colored text separately so that the
+    # path_effects cannot clip other texts
+    for path_effects in [[withStroke(linewidth=7, foreground='white')], []]:
+        color = 'white' if path_effects else royal_blue
+        ax.text(x, y-0.2, text, zorder=100,
+                ha='center', va='top', weight='bold', color=color,
+                style='italic', fontfamily='Courier New',
+                path_effects=path_effects)
+
+        color = 'white' if path_effects else 'black'
+        ax.text(x, y-0.33, code, zorder=100,
+                ha='center', va='top', weight='normal', color=color,
+                fontfamily='monospace', fontsize='medium',
+                path_effects=path_effects)
+
+
+annotate(3.5, -0.13, "Minor tick label", "ax.xaxis.set_minor_formatter")
+annotate(-0.03, 1.0, "Major tick", "ax.yaxis.set_major_locator")
+annotate(0.00, 3.75, "Minor tick", "ax.yaxis.set_minor_locator")
+annotate(-0.15, 3.00, "Major tick label", "ax.yaxis.set_major_formatter")
+annotate(1.68, -0.39, "xlabel", "ax.set_xlabel")
+annotate(-0.38, 1.67, "ylabel", "ax.set_ylabel")
+annotate(1.52, 4.15, "Title", "ax.set_title")
+annotate(1.75, 2.80, "Line", "ax.plot")
+annotate(2.25, 1.54, "Markers", "ax.scatter")
+annotate(3.00, 3.00, "Grid", "ax.grid")
+annotate(3.60, 3.58, "Legend", "ax.legend")
+annotate(2.5, 0.55, "Axes", "fig.subplots")
+annotate(4, 4.5, "Figure", "plt.figure")
+annotate(0.65, 0.01, "x Axis", "ax.xaxis")
+annotate(0, 0.36, "y Axis", "ax.yaxis")
+annotate(4.0, 0.7, "Spine", "ax.spines")
+
+# frame around figure
+fig.patch.set(linewidth=4, edgecolor='0.5')
 plt.show()
 
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.pyplot.figure
-matplotlib.axes.Axes.text
-matplotlib.axis.Axis.set_minor_formatter
-matplotlib.axis.Axis.set_major_locator
-matplotlib.axis.Axis.set_minor_locator
-matplotlib.patches.Circle
-matplotlib.patheffects.withStroke
-matplotlib.ticker.FuncFormatter
+#    - `matplotlib.pyplot.figure`
+#    - `matplotlib.axes.Axes.text`
+#    - `matplotlib.axis.Axis.set_minor_formatter`
+#    - `matplotlib.axis.Axis.set_major_locator`
+#    - `matplotlib.axis.Axis.set_minor_locator`
+#    - `matplotlib.patches.Circle`
+#    - `matplotlib.patheffects.withStroke`
+#    - `matplotlib.ticker.FuncFormatter`
diff --git a/examples/showcase/bachelors_degrees_by_gender.py b/examples/showcase/bachelors_degrees_by_gender.py
deleted file mode 100644
index 079ba399634c..000000000000
--- a/examples/showcase/bachelors_degrees_by_gender.py
+++ /dev/null
@@ -1,132 +0,0 @@
-"""
-============================
-Bachelor's degrees by gender
-============================
-
-A graph of multiple time series which demonstrates extensive custom
-styling of plot frame, tick lines and labels, and line graph properties.
-
-Also demonstrates the custom placement of text labels along the right edge
-as an alternative to a conventional legend.
-"""
-
-import numpy as np
-import matplotlib.pyplot as plt
-from matplotlib.cbook import get_sample_data
-
-
-fname = get_sample_data('percent_bachelors_degrees_women_usa.csv',
-                        asfileobj=False)
-gender_degree_data = np.genfromtxt(fname, delimiter=',', names=True)
-
-# You typically want your plot to be ~1.33x wider than tall. This plot
-# is a rare exception because of the number of lines being plotted on it.
-# Common sizes: (10, 7.5) and (12, 9)
-fig, ax = plt.subplots(1, 1, figsize=(12, 14))
-
-# These are the colors that will be used in the plot
-ax.set_prop_cycle(color=[
-    '#1f77b4', '#aec7e8', '#ff7f0e', '#ffbb78', '#2ca02c', '#98df8a',
-    '#d62728', '#ff9896', '#9467bd', '#c5b0d5', '#8c564b', '#c49c94',
-    '#e377c2', '#f7b6d2', '#7f7f7f', '#c7c7c7', '#bcbd22', '#dbdb8d',
-    '#17becf', '#9edae5'])
-
-# Remove the plot frame lines. They are unnecessary here.
-ax.spines[:].set_visible(False)
-
-# Ensure that the axis ticks only show up on the bottom and left of the plot.
-# Ticks on the right and top of the plot are generally unnecessary.
-ax.xaxis.tick_bottom()
-ax.yaxis.tick_left()
-
-fig.subplots_adjust(left=.06, right=.75, bottom=.02, top=.94)
-# Limit the range of the plot to only where the data is.
-# Avoid unnecessary whitespace.
-ax.set_xlim(1969.5, 2011.1)
-ax.set_ylim(-0.25, 90)
-
-# Set a fixed location and format for ticks.
-ax.set_xticks(range(1970, 2011, 10))
-ax.set_yticks(range(0, 91, 10))
-# Use automatic StrMethodFormatter creation
-ax.xaxis.set_major_formatter('{x:.0f}')
-ax.yaxis.set_major_formatter('{x:.0f}%')
-
-# Provide tick lines across the plot to help your viewers trace along
-# the axis ticks. Make sure that the lines are light and small so they
-# don't obscure the primary data lines.
-ax.grid(True, 'major', 'y', ls='--', lw=.5, c='k', alpha=.3)
-
-# Remove the tick marks; they are unnecessary with the tick lines we just
-# plotted. Make sure your axis ticks are large enough to be easily read.
-# You don't want your viewers squinting to read your plot.
-ax.tick_params(axis='both', which='both', labelsize=14,
-               bottom=False, top=False, labelbottom=True,
-               left=False, right=False, labelleft=True)
-
-# Now that the plot is prepared, it's time to actually plot the data!
-# Note that I plotted the majors in order of the highest % in the final year.
-majors = ['Health Professions', 'Public Administration', 'Education',
-          'Psychology', 'Foreign Languages', 'English',
-          'Communications\nand Journalism', 'Art and Performance', 'Biology',
-          'Agriculture', 'Social Sciences and History', 'Business',
-          'Math and Statistics', 'Architecture', 'Physical Sciences',
-          'Computer Science', 'Engineering']
-
-y_offsets = {'Foreign Languages': 0.5, 'English': -0.5,
-             'Communications\nand Journalism': 0.75,
-             'Art and Performance': -0.25, 'Agriculture': 1.25,
-             'Social Sciences and History': 0.25, 'Business': -0.75,
-             'Math and Statistics': 0.75, 'Architecture': -0.75,
-             'Computer Science': 0.75, 'Engineering': -0.25}
-
-for column in majors:
-    # Plot each line separately with its own color.
-    column_rec_name = column.replace('\n', '_').replace(' ', '_')
-
-    line, = ax.plot('Year', column_rec_name, data=gender_degree_data,
-                    lw=2.5)
-
-    # Add a text label to the right end of every line. Most of the code below
-    # is adding specific offsets y position because some labels overlapped.
-    y_pos = gender_degree_data[column_rec_name][-1] - 0.5
-
-    if column in y_offsets:
-        y_pos += y_offsets[column]
-
-    # Again, make sure that all labels are large enough to be easily read
-    # by the viewer.
-    ax.text(2011.5, y_pos, column, fontsize=14, color=line.get_color())
-
-# Make the title big enough so it spans the entire plot, but don't make it
-# so big that it requires two lines to show.
-
-# Note that if the title is descriptive enough, it is unnecessary to include
-# axis labels; they are self-evident, in this plot's case.
-fig.suptitle("Percentage of Bachelor's degrees conferred to women in "
-             "the U.S.A. by major (1970-2011)", fontsize=18, ha="center")
-
-# Finally, save the figure as a PNG.
-# You can also save it as a PDF, JPEG, etc.
-# Just change the file extension in this call.
-# fig.savefig('percent-bachelors-degrees-women-usa.png', bbox_inches='tight')
-plt.show()
-
-#############################################################################
-#
-# ------------
-#
-# References
-# """"""""""
-#
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.pyplot.subplots
-matplotlib.axes.Axes.text
-matplotlib.axis.Axis.set_major_formatter
-matplotlib.axis.XAxis.tick_bottom
-matplotlib.axis.YAxis.tick_left
-matplotlib.artist.Artist.set_visible
-matplotlib.ticker.StrMethodFormatter
diff --git a/examples/showcase/firefox.py b/examples/showcase/firefox.py
index 713809b8292d..69025d39eba1 100644
--- a/examples/showcase/firefox.py
+++ b/examples/showcase/firefox.py
@@ -12,8 +12,8 @@
 from matplotlib.path import Path
 import matplotlib.patches as patches
 
-# From: http://raphaeljs.com/icons/#firefox
-firefox = "M28.4,22.469c0.479-0.964,0.851-1.991,1.095-3.066c0.953-3.661,0.666-6.854,0.666-6.854l-0.327,2.104c0,0-0.469-3.896-1.044-5.353c-0.881-2.231-1.273-2.214-1.274-2.21c0.542,1.379,0.494,2.169,0.483,2.288c-0.01-0.016-0.019-0.032-0.027-0.047c-0.131-0.324-0.797-1.819-2.225-2.878c-2.502-2.481-5.943-4.014-9.745-4.015c-4.056,0-7.705,1.745-10.238,4.525C5.444,6.5,5.183,5.938,5.159,5.317c0,0-0.002,0.002-0.006,0.005c0-0.011-0.003-0.021-0.003-0.031c0,0-1.61,1.247-1.436,4.612c-0.299,0.574-0.56,1.172-0.777,1.791c-0.375,0.817-0.75,2.004-1.059,3.746c0,0,0.133-0.422,0.399-0.988c-0.064,0.482-0.103,0.971-0.116,1.467c-0.09,0.845-0.118,1.865-0.039,3.088c0,0,0.032-0.406,0.136-1.021c0.834,6.854,6.667,12.165,13.743,12.165l0,0c1.86,0,3.636-0.37,5.256-1.036C24.938,27.771,27.116,25.196,28.4,22.469zM16.002,3.356c2.446,0,4.73,0.68,6.68,1.86c-2.274-0.528-3.433-0.261-3.423-0.248c0.013,0.015,3.384,0.589,3.981,1.411c0,0-1.431,0-2.856,0.41c-0.065,0.019,5.242,0.663,6.327,5.966c0,0-0.582-1.213-1.301-1.42c0.473,1.439,0.351,4.17-0.1,5.528c-0.058,0.174-0.118-0.755-1.004-1.155c0.284,2.037-0.018,5.268-1.432,6.158c-0.109,0.07,0.887-3.189,0.201-1.93c-4.093,6.276-8.959,2.539-10.934,1.208c1.585,0.388,3.267,0.108,4.242-0.559c0.982-0.672,1.564-1.162,2.087-1.047c0.522,0.117,0.87-0.407,0.464-0.872c-0.405-0.466-1.392-1.105-2.725-0.757c-0.94,0.247-2.107,1.287-3.886,0.233c-1.518-0.899-1.507-1.63-1.507-2.095c0-0.366,0.257-0.88,0.734-1.028c0.58,0.062,1.044,0.214,1.537,0.466c0.005-0.135,0.006-0.315-0.001-0.519c0.039-0.077,0.015-0.311-0.047-0.596c-0.036-0.287-0.097-0.582-0.19-0.851c0.01-0.002,0.017-0.007,0.021-0.021c0.076-0.344,2.147-1.544,2.299-1.659c0.153-0.114,0.55-0.378,0.506-1.183c-0.015-0.265-0.058-0.294-2.232-0.286c-0.917,0.003-1.425-0.894-1.589-1.245c0.222-1.231,0.863-2.11,1.919-2.704c0.02-0.011,0.015-0.021-0.008-0.027c0.219-0.127-2.524-0.006-3.76,1.604C9.674,8.045,9.219,7.95,8.71,7.95c-0.638,0-1.139,0.07-1.603,0.187c-0.05,0.013-0.122,0.011-0.208-0.001C6.769,8.04,6.575,7.88,6.365,7.672c0.161-0.18,0.324-0.356,0.495-0.526C9.201,4.804,12.43,3.357,16.002,3.356z"
+# From: https://dmitrybaranovskiy.github.io/raphael/icons/#firefox
+firefox = "M28.4,22.469c0.479-0.964,0.851-1.991,1.095-3.066c0.953-3.661,0.666-6.854,0.666-6.854l-0.327,2.104c0,0-0.469-3.896-1.044-5.353c-0.881-2.231-1.273-2.214-1.274-2.21c0.542,1.379,0.494,2.169,0.483,2.288c-0.01-0.016-0.019-0.032-0.027-0.047c-0.131-0.324-0.797-1.819-2.225-2.878c-2.502-2.481-5.943-4.014-9.745-4.015c-4.056,0-7.705,1.745-10.238,4.525C5.444,6.5,5.183,5.938,5.159,5.317c0,0-0.002,0.002-0.006,0.005c0-0.011-0.003-0.021-0.003-0.031c0,0-1.61,1.247-1.436,4.612c-0.299,0.574-0.56,1.172-0.777,1.791c-0.375,0.817-0.75,2.004-1.059,3.746c0,0,0.133-0.422,0.399-0.988c-0.064,0.482-0.103,0.971-0.116,1.467c-0.09,0.845-0.118,1.865-0.039,3.088c0,0,0.032-0.406,0.136-1.021c0.834,6.854,6.667,12.165,13.743,12.165l0,0c1.86,0,3.636-0.37,5.256-1.036C24.938,27.771,27.116,25.196,28.4,22.469zM16.002,3.356c2.446,0,4.73,0.68,6.68,1.86c-2.274-0.528-3.433-0.261-3.423-0.248c0.013,0.015,3.384,0.589,3.981,1.411c0,0-1.431,0-2.856,0.41c-0.065,0.019,5.242,0.663,6.327,5.966c0,0-0.582-1.213-1.301-1.42c0.473,1.439,0.351,4.17-0.1,5.528c-0.058,0.174-0.118-0.755-1.004-1.155c0.284,2.037-0.018,5.268-1.432,6.158c-0.109,0.07,0.887-3.189,0.201-1.93c-4.093,6.276-8.959,2.539-10.934,1.208c1.585,0.388,3.267,0.108,4.242-0.559c0.982-0.672,1.564-1.162,2.087-1.047c0.522,0.117,0.87-0.407,0.464-0.872c-0.405-0.466-1.392-1.105-2.725-0.757c-0.94,0.247-2.107,1.287-3.886,0.233c-1.518-0.899-1.507-1.63-1.507-2.095c0-0.366,0.257-0.88,0.734-1.028c0.58,0.062,1.044,0.214,1.537,0.466c0.005-0.135,0.006-0.315-0.001-0.519c0.039-0.077,0.015-0.311-0.047-0.596c-0.036-0.287-0.097-0.582-0.19-0.851c0.01-0.002,0.017-0.007,0.021-0.021c0.076-0.344,2.147-1.544,2.299-1.659c0.153-0.114,0.55-0.378,0.506-1.183c-0.015-0.265-0.058-0.294-2.232-0.286c-0.917,0.003-1.425-0.894-1.589-1.245c0.222-1.231,0.863-2.11,1.919-2.704c0.02-0.011,0.015-0.021-0.008-0.027c0.219-0.127-2.524-0.006-3.76,1.604C9.674,8.045,9.219,7.95,8.71,7.95c-0.638,0-1.139,0.07-1.603,0.187c-0.05,0.013-0.122,0.011-0.208-0.001C6.769,8.04,6.575,7.88,6.365,7.672c0.161-0.18,0.324-0.356,0.495-0.526C9.201,4.804,12.43,3.357,16.002,3.356z"  # noqa
 
 
 def svg_parse(path):
diff --git a/examples/showcase/integral.py b/examples/showcase/integral.py
index e0d07fec3de2..c75ef940b0db 100644
--- a/examples/showcase/integral.py
+++ b/examples/showcase/integral.py
@@ -46,8 +46,7 @@ def func(x):
 ax.spines.top.set_visible(False)
 ax.xaxis.set_ticks_position('bottom')
 
-ax.set_xticks((a, b))
-ax.set_xticklabels(('$a$', '$b$'))
+ax.set_xticks([a, b], labels=['$a$', '$b$'])
 ax.set_yticks([])
 
 plt.show()
diff --git a/examples/showcase/stock_prices.py b/examples/showcase/stock_prices.py
new file mode 100644
index 000000000000..7f7ffba08f03
--- /dev/null
+++ b/examples/showcase/stock_prices.py
@@ -0,0 +1,119 @@
+"""
+==========================
+Stock prices over 32 years
+==========================
+
+.. redirect-from:: /gallery/showcase/bachelors_degrees_by_gender
+
+A graph of multiple time series that demonstrates custom styling of plot frame,
+tick lines, tick labels, and line graph properties. It also uses custom
+placement of text labels along the right edge as an alternative to a
+conventional legend.
+
+Note: The third-party mpl style dufte_ produces similar-looking plots with less
+code.
+
+.. _dufte: https://github.com/nschloe/dufte
+"""
+
+import numpy as np
+import matplotlib.transforms as mtransforms
+import matplotlib.pyplot as plt
+from matplotlib.cbook import get_sample_data
+
+
+def convertdate(x):
+    return np.datetime64(x, 'D')
+
+
+fname = get_sample_data('Stocks.csv', asfileobj=False)
+stock_data = np.genfromtxt(fname, encoding='utf-8', delimiter=',',
+                           names=True, dtype=None, converters={0: convertdate},
+                           skip_header=1)
+
+
+fig, ax = plt.subplots(1, 1, figsize=(6, 8), layout='constrained')
+
+# These are the colors that will be used in the plot
+ax.set_prop_cycle(color=[
+    '#1f77b4', '#aec7e8', '#ff7f0e', '#ffbb78', '#2ca02c', '#98df8a',
+    '#d62728', '#ff9896', '#9467bd', '#c5b0d5', '#8c564b', '#c49c94',
+    '#e377c2', '#f7b6d2', '#7f7f7f', '#c7c7c7', '#bcbd22', '#dbdb8d',
+    '#17becf', '#9edae5'])
+
+stocks_name = ['IBM', 'Apple', 'Microsoft', 'Xerox', 'Amazon', 'Dell',
+               'Alphabet', 'Adobe', 'S&P 500', 'NASDAQ']
+stocks_ticker = ['IBM', 'AAPL', 'MSFT', 'XRX', 'AMZN', 'DELL', 'GOOGL',
+                 'ADBE', 'GSPC', 'IXIC']
+
+# Manually adjust the label positions vertically (units are points = 1/72 inch)
+y_offsets = {k: 0 for k in stocks_ticker}
+y_offsets['IBM'] = 5
+y_offsets['AAPL'] = -5
+y_offsets['AMZN'] = -6
+
+for nn, column in enumerate(stocks_ticker):
+    # Plot each line separately with its own color.
+    # don't include any data with NaN.
+    good = np.nonzero(np.isfinite(stock_data[column]))
+    line, = ax.plot(stock_data['Date'][good], stock_data[column][good], lw=2.5)
+
+    # Add a text label to the right end of every line. Most of the code below
+    # is adding specific offsets y position because some labels overlapped.
+    y_pos = stock_data[column][-1]
+
+    # Use an offset transform, in points, for any text that needs to be nudged
+    # up or down.
+    offset = y_offsets[column] / 72
+    trans = mtransforms.ScaledTranslation(0, offset, fig.dpi_scale_trans)
+    trans = ax.transData + trans
+
+    # Again, make sure that all labels are large enough to be easily read
+    # by the viewer.
+    ax.text(np.datetime64('2022-10-01'), y_pos, stocks_name[nn],
+            color=line.get_color(), transform=trans)
+
+ax.set_xlim(np.datetime64('1989-06-01'), np.datetime64('2023-01-01'))
+
+fig.suptitle("Technology company stocks prices dollars (1990-2022)",
+             ha="center")
+
+# Remove the plot frame lines. They are unnecessary here.
+ax.spines[:].set_visible(False)
+
+# Ensure that the axis ticks only show up on the bottom and left of the plot.
+# Ticks on the right and top of the plot are generally unnecessary.
+ax.xaxis.tick_bottom()
+ax.yaxis.tick_left()
+ax.set_yscale('log')
+
+# Provide tick lines across the plot to help your viewers trace along
+# the axis ticks. Make sure that the lines are light and small so they
+# don't obscure the primary data lines.
+ax.grid(True, 'major', 'both', ls='--', lw=.5, c='k', alpha=.3)
+
+# Remove the tick marks; they are unnecessary with the tick lines we just
+# plotted. Make sure your axis ticks are large enough to be easily read.
+# You don't want your viewers squinting to read your plot.
+ax.tick_params(axis='both', which='both', labelsize='large',
+               bottom=False, top=False, labelbottom=True,
+               left=False, right=False, labelleft=True)
+
+# Finally, save the figure as a PNG.
+# You can also save it as a PDF, JPEG, etc.
+# Just change the file extension in this call.
+# fig.savefig('stock-prices.png', bbox_inches='tight')
+plt.show()
+
+#############################################################################
+#
+# .. admonition:: References
+#
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
+#
+#    - `matplotlib.pyplot.subplots`
+#    - `matplotlib.axes.Axes.text`
+#    - `matplotlib.axis.XAxis.tick_bottom`
+#    - `matplotlib.axis.YAxis.tick_left`
+#    - `matplotlib.artist.Artist.set_visible`
diff --git a/examples/specialty_plots/anscombe.py b/examples/specialty_plots/anscombe.py
index 93390907f7b3..0d45ca350229 100644
--- a/examples/specialty_plots/anscombe.py
+++ b/examples/specialty_plots/anscombe.py
@@ -55,15 +55,11 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.axline
-matplotlib.axes.Axes.text
-matplotlib.axes.Axes.tick_params
+#    - `matplotlib.axes.Axes.axline` / `matplotlib.pyplot.axline`
+#    - `matplotlib.axes.Axes.text` / `matplotlib.pyplot.text`
+#    - `matplotlib.axes.Axes.tick_params` / matplotlib.pyplot.tick_params`
diff --git a/examples/specialty_plots/leftventricle_bulleye.py b/examples/specialty_plots/leftventricle_bulleye.py
index 3f32dafd2b08..b3e1ecbfd25c 100644
--- a/examples/specialty_plots/leftventricle_bulleye.py
+++ b/examples/specialty_plots/leftventricle_bulleye.py
@@ -56,6 +56,9 @@ def bullseye_plot(ax, data, seg_bold=None, cmap=None, norm=None):
     theta = np.linspace(0, 2 * np.pi, 768)
     r = np.linspace(0.2, 1, 4)
 
+    # Remove grid
+    ax.grid(False)
+
     # Create the bound for the segment 17
     for i in range(r.shape[0]):
         ax.plot(theta, np.repeat(r[i], theta.shape), '-k', lw=linewidth)
@@ -171,8 +174,6 @@ def bullseye_plot(ax, data, seg_bold=None, cmap=None, norm=None):
 norm3 = mpl.colors.BoundaryNorm(bounds, cmap3.N)
 fig.colorbar(mpl.cm.ScalarMappable(cmap=cmap3, norm=norm3),
              cax=axl3,
-             # to use 'extend', you must specify two extra boundaries:
-             boundaries=[0] + bounds + [18],
              extend='both',
              ticks=bounds,  # optional
              spacing='proportional',
diff --git a/examples/specialty_plots/mri_with_eeg.py b/examples/specialty_plots/mri_with_eeg.py
index 0f622bf42a67..8f269e9e92ec 100644
--- a/examples/specialty_plots/mri_with_eeg.py
+++ b/examples/specialty_plots/mri_with_eeg.py
@@ -1,6 +1,6 @@
 """
 ============
-MRI With EEG
+MRI with EEG
 ============
 
 Displays a set of subplots with an MRI image, its intensity
@@ -64,12 +64,11 @@
 offsets = np.zeros((n_rows, 2), dtype=float)
 offsets[:, 1] = ticklocs
 
-lines = LineCollection(segs, offsets=offsets, transOffset=None)
+lines = LineCollection(segs, offsets=offsets, offset_transform=None)
 ax2.add_collection(lines)
 
 # Set the yticks to use axes coordinates on the y axis
-ax2.set_yticks(ticklocs)
-ax2.set_yticklabels(['PG3', 'PG5', 'PG7', 'PG9'])
+ax2.set_yticks(ticklocs, labels=['PG3', 'PG5', 'PG7', 'PG9'])
 
 ax2.set_xlabel('Time (s)')
 
diff --git a/examples/specialty_plots/radar_chart.py b/examples/specialty_plots/radar_chart.py
index 42358c766d01..21519137df9a 100644
--- a/examples/specialty_plots/radar_chart.py
+++ b/examples/specialty_plots/radar_chart.py
@@ -11,7 +11,7 @@
 matplotlib.axis to the desired number of vertices, but the orientation of the
 polygon is not aligned with the radial axes.
 
-.. [1] http://en.wikipedia.org/wiki/Radar_chart
+.. [1] https://en.wikipedia.org/wiki/Radar_chart
 """
 
 import numpy as np
@@ -42,11 +42,20 @@ def radar_factory(num_vars, frame='circle'):
     # calculate evenly-spaced axis angles
     theta = np.linspace(0, 2*np.pi, num_vars, endpoint=False)
 
+    class RadarTransform(PolarAxes.PolarTransform):
+
+        def transform_path_non_affine(self, path):
+            # Paths with non-unit interpolation steps correspond to gridlines,
+            # in which case we force interpolation (to defeat PolarTransform's
+            # autoconversion to circular arcs).
+            if path._interpolation_steps > 1:
+                path = path.interpolated(num_vars)
+            return Path(self.transform(path.vertices), path.codes)
+
     class RadarAxes(PolarAxes):
 
         name = 'radar'
-        # use 1 line segment to connect specified points
-        RESOLUTION = 1
+        PolarTransform = RadarTransform
 
         def __init__(self, *args, **kwargs):
             super().__init__(*args, **kwargs)
@@ -122,7 +131,7 @@ def example_data():
     #     Organic Carbon fraction 1 (OC)
     #     Organic Carbon fraction 2 (OC2)
     #     Organic Carbon fraction 3 (OC3)
-    #     Pyrolized Organic Carbon (OP)
+    #     Pyrolyzed Organic Carbon (OP)
     #  2)Inclusion of gas-phase specie carbon monoxide (CO)
     #  3)Inclusion of gas-phase specie ozone (O3).
     #  4)Inclusion of both gas-phase species is present...
@@ -175,7 +184,7 @@ def example_data():
                      horizontalalignment='center', verticalalignment='center')
         for d, color in zip(case_data, colors):
             ax.plot(theta, d, color=color)
-            ax.fill(theta, d, facecolor=color, alpha=0.25)
+            ax.fill(theta, d, facecolor=color, alpha=0.25, label='_nolegend_')
         ax.set_varlabels(spoke_labels)
 
     # add legend relative to top-left plot
@@ -192,20 +201,16 @@ def example_data():
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.path
-matplotlib.path.Path
-matplotlib.spines
-matplotlib.spines.Spine
-matplotlib.projections
-matplotlib.projections.polar
-matplotlib.projections.polar.PolarAxes
-matplotlib.projections.register_projection
+#    - `matplotlib.path`
+#    - `matplotlib.path.Path`
+#    - `matplotlib.spines`
+#    - `matplotlib.spines.Spine`
+#    - `matplotlib.projections`
+#    - `matplotlib.projections.polar`
+#    - `matplotlib.projections.polar.PolarAxes`
+#    - `matplotlib.projections.register_projection`
diff --git a/examples/specialty_plots/sankey_basics.py b/examples/specialty_plots/sankey_basics.py
index 82d94c0d169b..3bb0cc91cb52 100644
--- a/examples/specialty_plots/sankey_basics.py
+++ b/examples/specialty_plots/sankey_basics.py
@@ -103,16 +103,12 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.sankey
-matplotlib.sankey.Sankey
-matplotlib.sankey.Sankey.add
-matplotlib.sankey.Sankey.finish
+#    - `matplotlib.sankey`
+#    - `matplotlib.sankey.Sankey`
+#    - `matplotlib.sankey.Sankey.add`
+#    - `matplotlib.sankey.Sankey.finish`
diff --git a/examples/specialty_plots/sankey_links.py b/examples/specialty_plots/sankey_links.py
index 61dfc06d41b0..851111e8d693 100644
--- a/examples/specialty_plots/sankey_links.py
+++ b/examples/specialty_plots/sankey_links.py
@@ -58,16 +58,12 @@ def corner(sankey):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.sankey
-matplotlib.sankey.Sankey
-matplotlib.sankey.Sankey.add
-matplotlib.sankey.Sankey.finish
+#    - `matplotlib.sankey`
+#    - `matplotlib.sankey.Sankey`
+#    - `matplotlib.sankey.Sankey.add`
+#    - `matplotlib.sankey.Sankey.finish`
diff --git a/examples/specialty_plots/sankey_rankine.py b/examples/specialty_plots/sankey_rankine.py
index 379d2d65f7ba..6313ba3acdcf 100644
--- a/examples/specialty_plots/sankey_rankine.py
+++ b/examples/specialty_plots/sankey_rankine.py
@@ -85,16 +85,12 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.sankey
-matplotlib.sankey.Sankey
-matplotlib.sankey.Sankey.add
-matplotlib.sankey.Sankey.finish
+#    - `matplotlib.sankey`
+#    - `matplotlib.sankey.Sankey`
+#    - `matplotlib.sankey.Sankey.add`
+#    - `matplotlib.sankey.Sankey.finish`
diff --git a/examples/specialty_plots/skewt.py b/examples/specialty_plots/skewt.py
index e6023fef4b5b..4cf3f1905e5c 100644
--- a/examples/specialty_plots/skewt.py
+++ b/examples/specialty_plots/skewt.py
@@ -261,18 +261,14 @@ def upper_xlim(self):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.transforms
-matplotlib.spines
-matplotlib.spines.Spine
-matplotlib.spines.Spine.register_axis
-matplotlib.projections
-matplotlib.projections.register_projection
+#    - `matplotlib.transforms`
+#    - `matplotlib.spines`
+#    - `matplotlib.spines.Spine`
+#    - `matplotlib.spines.Spine.register_axis`
+#    - `matplotlib.projections`
+#    - `matplotlib.projections.register_projection`
diff --git a/examples/specialty_plots/topographic_hillshading.py b/examples/specialty_plots/topographic_hillshading.py
index 1b97a8a57808..f76aecd094d3 100644
--- a/examples/specialty_plots/topographic_hillshading.py
+++ b/examples/specialty_plots/topographic_hillshading.py
@@ -13,8 +13,8 @@
 In most cases, hillshading is used purely for visual purposes, and *dx*/*dy*
 can be safely ignored. In that case, you can tweak *vert_exag* (vertical
 exaggeration) by trial and error to give the desired visual effect. However,
-this example demonstrates how to use the *dx* and *dy* kwargs to ensure that
-the *vert_exag* parameter is the true vertical exaggeration.
+this example demonstrates how to use the *dx* and *dy* keyword arguments to
+ensure that the *vert_exag* parameter is the true vertical exaggeration.
 """
 import numpy as np
 import matplotlib.pyplot as plt
@@ -24,7 +24,7 @@
 
 dem = get_sample_data('jacksboro_fault_dem.npz', np_load=True)
 z = dem['elevation']
-#-- Optional dx and dy for accurate vertical exaggeration ---------------------
+# -- Optional dx and dy for accurate vertical exaggeration --------------------
 # If you need topographically accurate vertical exaggeration, or you don't want
 # to guess at what *vert_exag* should be, you'll need to specify the cellsize
 # of the grid (i.e. the *dx* and *dy* parameters).  Otherwise, any *vert_exag*
@@ -36,7 +36,7 @@
 dx, dy = dem['dx'], dem['dy']
 dy = 111200 * dy
 dx = 111200 * dx * np.cos(np.radians(dem['ymin']))
-#------------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 
 # Shade from the northwest, with the sun 45 degrees from horizontal
 ls = LightSource(azdeg=315, altdeg=45)
diff --git a/examples/spines/README.txt b/examples/spines/README.txt
new file mode 100644
index 000000000000..40bc3952eacd
--- /dev/null
+++ b/examples/spines/README.txt
@@ -0,0 +1,4 @@
+.. _spines_examples:
+
+Spines
+======
diff --git a/examples/ticks_and_spines/centered_spines_with_arrows.py b/examples/spines/centered_spines_with_arrows.py
similarity index 100%
rename from examples/ticks_and_spines/centered_spines_with_arrows.py
rename to examples/spines/centered_spines_with_arrows.py
diff --git a/examples/ticks_and_spines/multiple_yaxis_with_spines.py b/examples/spines/multiple_yaxis_with_spines.py
similarity index 100%
rename from examples/ticks_and_spines/multiple_yaxis_with_spines.py
rename to examples/spines/multiple_yaxis_with_spines.py
diff --git a/examples/ticks_and_spines/spine_placement_demo.py b/examples/spines/spine_placement_demo.py
similarity index 97%
rename from examples/ticks_and_spines/spine_placement_demo.py
rename to examples/spines/spine_placement_demo.py
index e567d8160d9c..d433236657f9 100644
--- a/examples/ticks_and_spines/spine_placement_demo.py
+++ b/examples/spines/spine_placement_demo.py
@@ -6,7 +6,7 @@
 Adjusting the location and appearance of axis spines.
 
 Note: If you want to obtain arrow heads at the ends of the axes, also check
-out the :doc:`/gallery/ticks_and_spines/centered_spines_with_arrows` example.
+out the :doc:`/gallery/spines/centered_spines_with_arrows` example.
 """
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/examples/ticks_and_spines/spines.py b/examples/spines/spines.py
similarity index 64%
rename from examples/ticks_and_spines/spines.py
rename to examples/spines/spines.py
index 08e3700d1387..d21947d33636 100644
--- a/examples/ticks_and_spines/spines.py
+++ b/examples/spines/spines.py
@@ -5,9 +5,12 @@
 
 This demo compares:
 
-- normal axes, with spines on all four sides;
-- an axes with spines only on the left and bottom;
-- an axes using custom bounds to limit the extent of the spine.
+- normal Axes, with spines on all four sides;
+- an Axes with spines only on the left and bottom;
+- an Axes using custom bounds to limit the extent of the spine.
+
+Each `.axes.Axes` has a list of `.Spine` objects, accessible
+via the container ``ax.spines``.
 """
 import numpy as np
 import matplotlib.pyplot as plt
@@ -44,3 +47,12 @@
 ax2.xaxis.set_ticks_position('bottom')
 
 plt.show()
+
+# .. admonition:: References
+#
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
+#
+#    - `matplotlib.Spines.set_visible`
+#    - `matplotlib.Spines.set_bounds`
+#    - `matplotlib.axis.set_ticks_position`
diff --git a/examples/ticks_and_spines/spines_bounds.py b/examples/spines/spines_bounds.py
similarity index 90%
rename from examples/ticks_and_spines/spines_bounds.py
rename to examples/spines/spines_bounds.py
index 96205a43d38e..5ccf3051e1ea 100644
--- a/examples/ticks_and_spines/spines_bounds.py
+++ b/examples/spines/spines_bounds.py
@@ -21,8 +21,7 @@
 
 # set ticks and tick labels
 ax.set_xlim((0, 2*np.pi))
-ax.set_xticks([0, np.pi, 2*np.pi])
-ax.set_xticklabels(['0', r'$\pi$', r'2$\pi$'])
+ax.set_xticks([0, np.pi, 2*np.pi], labels=['0', r'$\pi$', r'2$\pi$'])
 ax.set_ylim((-1.5, 1.5))
 ax.set_yticks([-1, 0, 1])
 
diff --git a/examples/ticks_and_spines/spines_dropped.py b/examples/spines/spines_dropped.py
similarity index 100%
rename from examples/ticks_and_spines/spines_dropped.py
rename to examples/spines/spines_dropped.py
diff --git a/examples/statistics/barchart_demo.py b/examples/statistics/barchart_demo.py
index e9c2b94c0b95..18819ca35b08 100644
--- a/examples/statistics/barchart_demo.py
+++ b/examples/statistics/barchart_demo.py
@@ -15,24 +15,16 @@
 just make up some data for little Johnny Doe.
 """
 
+from collections import namedtuple
 import numpy as np
-import matplotlib
 import matplotlib.pyplot as plt
-from matplotlib.ticker import MaxNLocator
-from collections import namedtuple
 
-np.random.seed(42)
 
 Student = namedtuple('Student', ['name', 'grade', 'gender'])
-Score = namedtuple('Score', ['score', 'percentile'])
+Score = namedtuple('Score', ['value', 'unit', 'percentile'])
 
-# GLOBAL CONSTANTS
-test_names = ['Pacer Test', 'Flexed Arm\n Hang', 'Mile Run', 'Agility',
-              'Push Ups']
-test_units = dict(zip(test_names, ['laps', 'sec', 'min:sec', 'sec', '']))
 
-
-def attach_ordinal(num):
+def to_ordinal(num):
     """Convert an integer to an ordinal string, e.g. 2 -> '2nd'."""
     suffixes = {str(i): v
                 for i, v in enumerate(['th', 'st', 'nd', 'rd', 'th',
@@ -44,133 +36,76 @@ def attach_ordinal(num):
     return v + suffixes[v[-1]]
 
 
-def format_score(score, test):
+def format_score(score):
     """
     Create score labels for the right y-axis as the test name followed by the
     measurement unit (if any), split over two lines.
     """
-    unit = test_units[test]
-    if unit:
-        return f'{score}\n{unit}'
-    else:  # If no unit, don't include a newline, so that label stays centered.
-        return score
-
+    return f'{score.value}\n{score.unit}' if score.unit else str(score.value)
 
-def format_ycursor(y):
-    y = int(y)
-    if y < 0 or y >= len(test_names):
-        return ''
-    else:
-        return test_names[y]
 
-
-def plot_student_results(student, scores, cohort_size):
-    fig, ax1 = plt.subplots(figsize=(9, 7))  # Create the figure
-    fig.subplots_adjust(left=0.115, right=0.88)
+def plot_student_results(student, scores_by_test, cohort_size):
+    fig, ax1 = plt.subplots(figsize=(9, 7), constrained_layout=True)
     fig.canvas.manager.set_window_title('Eldorado K-8 Fitness Chart')
 
-    pos = np.arange(len(test_names))
-
-    rects = ax1.barh(pos, [scores[k].percentile for k in test_names],
-                     align='center',
-                     height=0.5,
-                     tick_label=test_names)
-
     ax1.set_title(student.name)
+    ax1.set_xlabel(
+        'Percentile Ranking Across {grade} Grade {gender}s\n'
+        'Cohort Size: {cohort_size}'.format(
+            grade=to_ordinal(student.grade),
+            gender=student.gender.title(),
+            cohort_size=cohort_size))
+
+    test_names = list(scores_by_test.keys())
+    percentiles = [score.percentile for score in scores_by_test.values()]
+
+    rects = ax1.barh(test_names, percentiles, align='center', height=0.5)
+    # Partition the percentile values to be able to draw large numbers in
+    # white within the bar, and small numbers in black outside the bar.
+    large_percentiles = [to_ordinal(p) if p > 40 else '' for p in percentiles]
+    small_percentiles = [to_ordinal(p) if p <= 40 else '' for p in percentiles]
+    ax1.bar_label(rects, small_percentiles,
+                  padding=5, color='black', fontweight='bold')
+    ax1.bar_label(rects, large_percentiles,
+                  padding=-32, color='white', fontweight='bold')
 
     ax1.set_xlim([0, 100])
-    ax1.xaxis.set_major_locator(MaxNLocator(11))
+    ax1.set_xticks([0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100])
     ax1.xaxis.grid(True, linestyle='--', which='major',
                    color='grey', alpha=.25)
-
-    # Plot a solid vertical gridline to highlight the median position
-    ax1.axvline(50, color='grey', alpha=0.25)
+    ax1.axvline(50, color='grey', alpha=0.25)  # median position
 
     # Set the right-hand Y-axis ticks and labels
     ax2 = ax1.twinx()
-
-    # Set the tick locations
-    ax2.set_yticks(pos)
     # Set equal limits on both yaxis so that the ticks line up
     ax2.set_ylim(ax1.get_ylim())
-
-    # Set the tick labels
-    ax2.set_yticklabels([format_score(scores[k].score, k) for k in test_names])
+    # Set the tick locations and labels
+    ax2.set_yticks(
+        np.arange(len(scores_by_test)),
+        labels=[format_score(score) for score in scores_by_test.values()])
 
     ax2.set_ylabel('Test Scores')
 
-    xlabel = ('Percentile Ranking Across {grade} Grade {gender}s\n'
-              'Cohort Size: {cohort_size}')
-    ax1.set_xlabel(xlabel.format(grade=attach_ordinal(student.grade),
-                                 gender=student.gender.title(),
-                                 cohort_size=cohort_size))
-
-    rect_labels = []
-    # Lastly, write in the ranking inside each bar to aid in interpretation
-    for rect in rects:
-        # Rectangle widths are already integer-valued but are floating
-        # type, so it helps to remove the trailing decimal point and 0 by
-        # converting width to int type
-        width = int(rect.get_width())
-
-        rank_str = attach_ordinal(width)
-        # The bars aren't wide enough to print the ranking inside
-        if width < 40:
-            # Shift the text to the right side of the right edge
-            xloc = 5
-            # Black against white background
-            clr = 'black'
-            align = 'left'
-        else:
-            # Shift the text to the left side of the right edge
-            xloc = -5
-            # White on magenta
-            clr = 'white'
-            align = 'right'
-
-        # Center the text vertically in the bar
-        yloc = rect.get_y() + rect.get_height() / 2
-        label = ax1.annotate(
-            rank_str, xy=(width, yloc), xytext=(xloc, 0),
-            textcoords="offset points",
-            horizontalalignment=align, verticalalignment='center',
-            color=clr, weight='bold', clip_on=True)
-        rect_labels.append(label)
-
-    # Make the interactive mouse over give the bar title
-    ax2.fmt_ydata = format_ycursor
-    # Return all of the artists created
-    return {'fig': fig,
-            'ax': ax1,
-            'ax_right': ax2,
-            'bars': rects,
-            'perc_labels': rect_labels}
-
-
-student = Student('Johnny Doe', 2, 'boy')
-scores = dict(zip(
-    test_names,
-    (Score(v, p) for v, p in
-     zip(['7', '48', '12:52', '17', '14'],
-         np.round(np.random.uniform(0, 100, len(test_names)), 0)))))
-cohort_size = 62  # The number of other 2nd grade boys
-
-arts = plot_student_results(student, scores, cohort_size)
-plt.show()
 
+student = Student(name='Johnny Doe', grade=2, gender='Boy')
+scores_by_test = {
+    'Pacer Test': Score(7, 'laps', percentile=37),
+    'Flexed Arm\n Hang': Score(48, 'sec', percentile=95),
+    'Mile Run': Score('12:52', 'min:sec', percentile=73),
+    'Agility': Score(17, 'sec', percentile=60),
+    'Push Ups': Score(14, '', percentile=16),
+}
+
+plot_student_results(student, scores_by_test, cohort_size=62)
+plt.show()
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-matplotlib.axes.Axes.bar
-matplotlib.pyplot.bar
-matplotlib.axes.Axes.annotate
-matplotlib.pyplot.annotate
-matplotlib.axes.Axes.twinx
+#    - `matplotlib.axes.Axes.bar` / `matplotlib.pyplot.bar`
+#    - `matplotlib.axes.Axes.bar_label` / `matplotlib.pyplot.bar_label`
+#    - `matplotlib.axes.Axes.twinx` / `matplotlib.pyplot.twinx`
diff --git a/examples/statistics/boxplot.py b/examples/statistics/boxplot.py
index 9c5d7dd29186..fa8500cfc42f 100644
--- a/examples/statistics/boxplot.py
+++ b/examples/statistics/boxplot.py
@@ -3,16 +3,15 @@
 Artist customization in box plots
 =================================
 
-This example demonstrates how to use the various kwargs
-to fully customize box plots. The first figure demonstrates
-how to remove and add individual components (note that the
-mean is the only value not shown by default). The second
-figure demonstrates how the styles of the artists can
-be customized. It also demonstrates how to set the limit
-of the whiskers to specific percentiles (lower right axes)
+This example demonstrates how to use the various keyword arguments to fully
+customize box plots. The first figure demonstrates how to remove and add
+individual components (note that the mean is the only value not shown by
+default). The second figure demonstrates how the styles of the artists can be
+customized. It also demonstrates how to set the limit of the whiskers to
+specific percentiles (lower right axes)
 
-A good general reference on boxplots and their history can be found
-here: http://vita.had.co.nz/papers/boxplots.pdf
+A good general reference on boxplots and their history can be found here:
+https://vita.had.co.nz/papers/boxplots.pdf
 
 """
 
@@ -98,13 +97,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.boxplot
-matplotlib.pyplot.boxplot
+#    - `matplotlib.axes.Axes.boxplot` / `matplotlib.pyplot.boxplot`
diff --git a/examples/statistics/boxplot_color.py b/examples/statistics/boxplot_color.py
index c1c00c607590..c26b6672f567 100644
--- a/examples/statistics/boxplot_color.py
+++ b/examples/statistics/boxplot_color.py
@@ -54,13 +54,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.boxplot
-matplotlib.pyplot.boxplot
+#    - `matplotlib.axes.Axes.boxplot` / `matplotlib.pyplot.boxplot`
diff --git a/examples/statistics/boxplot_demo.py b/examples/statistics/boxplot_demo.py
index d5eb08f9cf1d..252ca25bd58d 100644
--- a/examples/statistics/boxplot_demo.py
+++ b/examples/statistics/boxplot_demo.py
@@ -8,6 +8,8 @@
 The following examples show off how to visualize boxplots with
 Matplotlib. There are many options to control their appearance and
 the statistics that they use to summarize the data.
+
+.. redirect-from:: /gallery/pyplots/boxplot_demo_pyplot
 """
 
 import matplotlib.pyplot as plt
@@ -105,7 +107,7 @@
 fig.canvas.manager.set_window_title('A Boxplot Example')
 fig.subplots_adjust(left=0.075, right=0.95, top=0.9, bottom=0.25)
 
-bp = ax1.boxplot(data, notch=0, sym='+', vert=1, whis=1.5)
+bp = ax1.boxplot(data, notch=False, sym='+', vert=True, whis=1.5)
 plt.setp(bp['boxes'], color='black')
 plt.setp(bp['whiskers'], color='black')
 plt.setp(bp['fliers'], color='red', marker='+')
@@ -221,7 +223,7 @@ def fake_bootstrapper(n):
 fig, ax = plt.subplots()
 pos = np.arange(len(treatments)) + 1
 bp = ax.boxplot(treatments, sym='k+', positions=pos,
-                notch=1, bootstrap=5000,
+                notch=True, bootstrap=5000,
                 usermedians=medians,
                 conf_intervals=conf_intervals)
 
@@ -231,16 +233,24 @@ def fake_bootstrapper(n):
 plt.setp(bp['fliers'], markersize=3.0)
 plt.show()
 
+
+###############################################################################
+# Here we customize the widths of the caps .
+
+x = np.linspace(-7, 7, 140)
+x = np.hstack([-25, x, 25])
+fig, ax = plt.subplots()
+
+ax.boxplot([x, x], notch=True, capwidths=[0.01, 0.2])
+
+plt.show()
+
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.boxplot
-matplotlib.pyplot.boxplot
-matplotlib.axes.Axes.set
+#    - `matplotlib.axes.Axes.boxplot` / `matplotlib.pyplot.boxplot`
+#    - `matplotlib.artist.Artist.set` / `matplotlib.pyplot.setp`
diff --git a/examples/statistics/boxplot_vs_violin.py b/examples/statistics/boxplot_vs_violin.py
index 5107a45f0dcb..f1162a1ef7a7 100644
--- a/examples/statistics/boxplot_vs_violin.py
+++ b/examples/statistics/boxplot_vs_violin.py
@@ -45,26 +45,19 @@
 # adding horizontal grid lines
 for ax in axs:
     ax.yaxis.grid(True)
-    ax.set_xticks([y + 1 for y in range(len(all_data))])
+    ax.set_xticks([y + 1 for y in range(len(all_data))],
+                  labels=['x1', 'x2', 'x3', 'x4'])
     ax.set_xlabel('Four separate samples')
     ax.set_ylabel('Observed values')
 
-# add x-tick labels
-plt.setp(axs, xticks=[y + 1 for y in range(len(all_data))],
-         xticklabels=['x1', 'x2', 'x3', 'x4'])
 plt.show()
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.boxplot
-matplotlib.pyplot.boxplot
-matplotlib.axes.Axes.violinplot
-matplotlib.pyplot.violinplot
+#    - `matplotlib.axes.Axes.boxplot` / `matplotlib.pyplot.boxplot`
+#    - `matplotlib.axes.Axes.violinplot` / `matplotlib.pyplot.violinplot`
diff --git a/examples/statistics/bxp.py b/examples/statistics/bxp.py
index b5e22be0e0d2..374db300b5bd 100644
--- a/examples/statistics/bxp.py
+++ b/examples/statistics/bxp.py
@@ -105,13 +105,10 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.bxp
-matplotlib.cbook.boxplot_stats
+#    - `matplotlib.axes.Axes.bxp`
+#    - `matplotlib.cbook.boxplot_stats`
diff --git a/examples/statistics/confidence_ellipse.py b/examples/statistics/confidence_ellipse.py
index 06d5523f522e..c67da152ad7d 100644
--- a/examples/statistics/confidence_ellipse.py
+++ b/examples/statistics/confidence_ellipse.py
@@ -34,9 +34,9 @@
 #
 # The radiuses of the ellipse can be controlled by n_std which is the number
 # of standard deviations. The default value is 3 which makes the ellipse
-# enclose 99.4% of the points if the data is normally distributed
+# enclose 98.9% of the points if the data is normally distributed
 # like in these examples (3 standard deviations in 1-D contain 99.7%
-# of the data, which is 99.4% of the data in 2-D).
+# of the data, which is 98.9% of the data in 2-D).
 
 
 def confidence_ellipse(x, y, ax, n_std=3.0, facecolor='none', **kwargs):
@@ -67,19 +67,19 @@ def confidence_ellipse(x, y, ax, n_std=3.0, facecolor='none', **kwargs):
     cov = np.cov(x, y)
     pearson = cov[0, 1]/np.sqrt(cov[0, 0] * cov[1, 1])
     # Using a special case to obtain the eigenvalues of this
-    # two-dimensionl dataset.
+    # two-dimensional dataset.
     ell_radius_x = np.sqrt(1 + pearson)
     ell_radius_y = np.sqrt(1 - pearson)
     ellipse = Ellipse((0, 0), width=ell_radius_x * 2, height=ell_radius_y * 2,
                       facecolor=facecolor, **kwargs)
 
-    # Calculating the stdandard deviation of x from
+    # Calculating the standard deviation of x from
     # the squareroot of the variance and multiplying
     # with the given number of standard deviations.
     scale_x = np.sqrt(cov[0, 0]) * n_std
     mean_x = np.mean(x)
 
-    # calculating the stdandard deviation of y ...
+    # calculating the standard deviation of y ...
     scale_y = np.sqrt(cov[1, 1]) * n_std
     mean_y = np.mean(y)
 
@@ -97,7 +97,7 @@ def confidence_ellipse(x, y, ax, n_std=3.0, facecolor='none', **kwargs):
 # A helper function to create a correlated dataset
 # """"""""""""""""""""""""""""""""""""""""""""""""
 #
-# Creates a random two-dimesional dataset with the specified
+# Creates a random two-dimensional dataset with the specified
 # two-dimensional mean (mu) and dimensions (scale).
 # The correlation can be controlled by the param 'dependency',
 # a 2x2 matrix.
@@ -190,7 +190,7 @@ def get_correlated_dataset(n, dependency, mu, scale):
 # Using the keyword arguments
 # """""""""""""""""""""""""""
 #
-# Use the kwargs specified for matplotlib.patches.Patch in order
+# Use the keyword arguments specified for `matplotlib.patches.Patch` in order
 # to have the ellipse rendered in different ways.
 
 fig, ax_kwargs = plt.subplots(figsize=(6, 6))
@@ -210,20 +210,17 @@ def get_correlated_dataset(n, dependency, mu, scale):
 
 ax_kwargs.scatter(x, y, s=0.5)
 ax_kwargs.scatter(mu[0], mu[1], c='red', s=3)
-ax_kwargs.set_title('Using kwargs')
+ax_kwargs.set_title('Using keyword arguments')
 
 fig.subplots_adjust(hspace=0.25)
 plt.show()
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.transforms.Affine2D
-matplotlib.patches.Ellipse
+#    - `matplotlib.transforms.Affine2D`
+#    - `matplotlib.patches.Ellipse`
diff --git a/examples/statistics/customized_violin.py b/examples/statistics/customized_violin.py
index 61c52c2d9a87..4809e5f28d81 100644
--- a/examples/statistics/customized_violin.py
+++ b/examples/statistics/customized_violin.py
@@ -3,12 +3,11 @@
 Violin plot customization
 =========================
 
-This example demonstrates how to fully customize violin plots.
-The first plot shows the default style by providing only
-the data. The second plot first limits what matplotlib draws
-with additional kwargs. Then a simplified representation of
-a box plot is drawn on top. Lastly, the styles of the artists
-of the violins are modified.
+This example demonstrates how to fully customize violin plots. The first plot
+shows the default style by providing only the data. The second plot first
+limits what Matplotlib draws with additional keyword arguments. Then a
+simplified representation of a box plot is drawn on top. Lastly, the styles of
+the artists of the violins are modified.
 
 For more information on violin plots, the scikit-learn docs have a great
 section: https://scikit-learn.org/stable/modules/density.html
@@ -30,8 +29,7 @@ def adjacent_values(vals, q1, q3):
 def set_axis_style(ax, labels):
     ax.xaxis.set_tick_params(direction='out')
     ax.xaxis.set_ticks_position('bottom')
-    ax.set_xticks(np.arange(1, len(labels) + 1))
-    ax.set_xticklabels(labels)
+    ax.set_xticks(np.arange(1, len(labels) + 1), labels=labels)
     ax.set_xlim(0.25, len(labels) + 0.75)
     ax.set_xlabel('Sample name')
 
@@ -77,15 +75,10 @@ def set_axis_style(ax, labels):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.violinplot
-matplotlib.pyplot.violinplot
-matplotlib.axes.Axes.vlines
-matplotlib.pyplot.vlines
+#    - `matplotlib.axes.Axes.violinplot` / `matplotlib.pyplot.violinplot`
+#    - `matplotlib.axes.Axes.vlines` / `matplotlib.pyplot.vlines`
diff --git a/examples/statistics/errorbar.py b/examples/statistics/errorbar.py
index c6c0a8d61704..8d674095b4e4 100644
--- a/examples/statistics/errorbar.py
+++ b/examples/statistics/errorbar.py
@@ -21,13 +21,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.errorbar
-matplotlib.pyplot.errorbar
+#    - `matplotlib.axes.Axes.errorbar` / `matplotlib.pyplot.errorbar`
diff --git a/examples/statistics/errorbar_features.py b/examples/statistics/errorbar_features.py
index 253d0008dcae..78e80f0aeb88 100644
--- a/examples/statistics/errorbar_features.py
+++ b/examples/statistics/errorbar_features.py
@@ -48,13 +48,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.errorbar
-matplotlib.pyplot.errorbar
+#    - `matplotlib.axes.Axes.errorbar` / `matplotlib.pyplot.errorbar`
diff --git a/examples/statistics/errorbar_limits.py b/examples/statistics/errorbar_limits.py
index 914fef4cdbbc..5013b82ed977 100644
--- a/examples/statistics/errorbar_limits.py
+++ b/examples/statistics/errorbar_limits.py
@@ -77,13 +77,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.errorbar
-matplotlib.pyplot.errorbar
+#    - `matplotlib.axes.Axes.errorbar` / `matplotlib.pyplot.errorbar`
diff --git a/examples/statistics/errorbars_and_boxes.py b/examples/statistics/errorbars_and_boxes.py
index 7c647aedaadd..a8bdd7a46384 100644
--- a/examples/statistics/errorbars_and_boxes.py
+++ b/examples/statistics/errorbars_and_boxes.py
@@ -12,9 +12,9 @@
   1. an `~.axes.Axes` object is passed directly to the function
   2. the function operates on the ``Axes`` methods directly, not through
      the ``pyplot`` interface
-  3. plotting kwargs that could be abbreviated are spelled out for
-     better code readability in the future (for example we use
-     ``facecolor`` instead of ``fc``)
+  3. plotting keyword arguments that could be abbreviated are spelled out for
+     better code readability in the future (for example we use *facecolor*
+     instead of *fc*)
   4. the artists returned by the ``Axes`` plotting methods are then
      returned by the function so that, if desired, their styles
      can be modified later outside of the function (they are not
@@ -40,7 +40,7 @@
 
 
 def make_error_boxes(ax, xdata, ydata, xerror, yerror, facecolor='r',
-                     edgecolor='None', alpha=0.5):
+                     edgecolor='none', alpha=0.5):
 
     # Loop over data points; create box from errors at each point
     errorboxes = [Rectangle((x - xe[0], y - ye[0]), xe.sum(), ye.sum())
@@ -55,7 +55,7 @@ def make_error_boxes(ax, xdata, ydata, xerror, yerror, facecolor='r',
 
     # Plot errorbars
     artists = ax.errorbar(xdata, ydata, xerr=xerror, yerr=yerror,
-                          fmt='None', ecolor='k')
+                          fmt='none', ecolor='k')
 
     return artists
 
@@ -70,15 +70,11 @@ def make_error_boxes(ax, xdata, ydata, xerror, yerror, facecolor='r',
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.errorbar
-matplotlib.pyplot.errorbar
-matplotlib.axes.Axes.add_collection
-matplotlib.collections.PatchCollection
+#    - `matplotlib.axes.Axes.errorbar` / `matplotlib.pyplot.errorbar`
+#    - `matplotlib.axes.Axes.add_collection`
+#    - `matplotlib.collections.PatchCollection`
diff --git a/examples/statistics/hexbin_demo.py b/examples/statistics/hexbin_demo.py
index 3d8e85cf8f00..b97e4f6c4347 100644
--- a/examples/statistics/hexbin_demo.py
+++ b/examples/statistics/hexbin_demo.py
@@ -1,14 +1,10 @@
 """
-===========
-Hexbin Demo
-===========
+=====================
+Hexagonal binned plot
+=====================
 
-Plotting hexbins with Matplotlib.
-
-Hexbin is an axes method or pyplot function that is essentially
-a pcolor of a 2D histogram with hexagonal cells.  It can be
-much more informative than a scatter plot. In the first plot
-below, try substituting 'scatter' for 'hexbin'.
+`~.Axes.hexbin` is a 2D histogram plot, in which the bins are hexagons and
+the color represents the number of data points within each bin.
 """
 
 import numpy as np
@@ -17,41 +13,31 @@
 # Fixing random state for reproducibility
 np.random.seed(19680801)
 
-n = 100000
+n = 100_000
 x = np.random.standard_normal(n)
 y = 2.0 + 3.0 * x + 4.0 * np.random.standard_normal(n)
-xmin = x.min()
-xmax = x.max()
-ymin = y.min()
-ymax = y.max()
-
-fig, axs = plt.subplots(ncols=2, sharey=True, figsize=(7, 4))
-fig.subplots_adjust(hspace=0.5, left=0.07, right=0.93)
-ax = axs[0]
-hb = ax.hexbin(x, y, gridsize=50, cmap='inferno')
-ax.set(xlim=(xmin, xmax), ylim=(ymin, ymax))
-ax.set_title("Hexagon binning")
-cb = fig.colorbar(hb, ax=ax)
-cb.set_label('counts')
-
-ax = axs[1]
-hb = ax.hexbin(x, y, gridsize=50, bins='log', cmap='inferno')
-ax.set(xlim=(xmin, xmax), ylim=(ymin, ymax))
-ax.set_title("With a log color scale")
-cb = fig.colorbar(hb, ax=ax)
-cb.set_label('log10(N)')
+xlim = x.min(), x.max()
+ylim = y.min(), y.max()
+
+fig, (ax0, ax1) = plt.subplots(ncols=2, sharey=True, figsize=(9, 4))
+
+hb = ax0.hexbin(x, y, gridsize=50, cmap='inferno')
+ax0.set(xlim=xlim, ylim=ylim)
+ax0.set_title("Hexagon binning")
+cb = fig.colorbar(hb, ax=ax0, label='counts')
+
+hb = ax1.hexbin(x, y, gridsize=50, bins='log', cmap='inferno')
+ax1.set(xlim=xlim, ylim=ylim)
+ax1.set_title("With a log color scale")
+cb = fig.colorbar(hb, ax=ax1, label='log10(N)')
 
 plt.show()
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.hexbin
-matplotlib.pyplot.hexbin
+#    - `matplotlib.axes.Axes.hexbin` / `matplotlib.pyplot.hexbin`
diff --git a/examples/statistics/hist.py b/examples/statistics/hist.py
index 5fd409911c89..6c880961c922 100644
--- a/examples/statistics/hist.py
+++ b/examples/statistics/hist.py
@@ -3,7 +3,7 @@
 Histograms
 ==========
 
-Demonstrates how to plot histograms with matplotlib.
+How to plot histograms with Matplotlib.
 """
 
 import matplotlib.pyplot as plt
@@ -11,9 +11,8 @@
 from matplotlib import colors
 from matplotlib.ticker import PercentFormatter
 
-# Fixing random state for reproducibility
-np.random.seed(19680801)
-
+# Create a random number generator with a fixed seed for reproducibility
+rng = np.random.default_rng(19680801)
 
 ###############################################################################
 # Generate data and plot a simple histogram
@@ -26,15 +25,15 @@
 N_points = 100000
 n_bins = 20
 
-# Generate a normal distribution, center at x=0 and y=5
-x = np.random.randn(N_points)
-y = .4 * x + np.random.randn(100000) + 5
+# Generate two normal distributions
+dist1 = rng.standard_normal(N_points)
+dist2 = 0.4 * rng.standard_normal(N_points) + 5
 
 fig, axs = plt.subplots(1, 2, sharey=True, tight_layout=True)
 
-# We can set the number of bins with the `bins` kwarg
-axs[0].hist(x, bins=n_bins)
-axs[1].hist(y, bins=n_bins)
+# We can set the number of bins with the *bins* keyword argument.
+axs[0].hist(dist1, bins=n_bins)
+axs[1].hist(dist2, bins=n_bins)
 
 
 ###############################################################################
@@ -49,7 +48,7 @@
 fig, axs = plt.subplots(1, 2, tight_layout=True)
 
 # N is the count in each bin, bins is the lower-limit of the bin
-N, bins, patches = axs[0].hist(x, bins=n_bins)
+N, bins, patches = axs[0].hist(dist1, bins=n_bins)
 
 # We'll color code by height, but you could use any scalar
 fracs = N / N.max()
@@ -63,7 +62,7 @@
     thispatch.set_facecolor(color)
 
 # We can also normalize our inputs by the total number of counts
-axs[1].hist(x, bins=n_bins, density=True)
+axs[1].hist(dist1, bins=n_bins, density=True)
 
 # Now we format the y-axis to display percentage
 axs[1].yaxis.set_major_formatter(PercentFormatter(xmax=1))
@@ -77,7 +76,7 @@
 # corresponding to each axis of the histogram.
 
 fig, ax = plt.subplots(tight_layout=True)
-hist = ax.hist2d(x, y)
+hist = ax.hist2d(dist1, dist2)
 
 
 ###############################################################################
@@ -91,27 +90,23 @@
                         tight_layout=True)
 
 # We can increase the number of bins on each axis
-axs[0].hist2d(x, y, bins=40)
+axs[0].hist2d(dist1, dist2, bins=40)
 
 # As well as define normalization of the colors
-axs[1].hist2d(x, y, bins=40, norm=colors.LogNorm())
+axs[1].hist2d(dist1, dist2, bins=40, norm=colors.LogNorm())
 
 # We can also define custom numbers of bins for each axis
-axs[2].hist2d(x, y, bins=(80, 10), norm=colors.LogNorm())
+axs[2].hist2d(dist1, dist2, bins=(80, 10), norm=colors.LogNorm())
 
 plt.show()
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.hist
-matplotlib.pyplot.hist
-matplotlib.pyplot.hist2d
-matplotlib.ticker.PercentFormatter
+#    - `matplotlib.axes.Axes.hist` / `matplotlib.pyplot.hist`
+#    - `matplotlib.pyplot.hist2d`
+#    - `matplotlib.ticker.PercentFormatter`
diff --git a/examples/statistics/histogram_cumulative.py b/examples/statistics/histogram_cumulative.py
index f5da13aa49fe..a057cc7b1267 100644
--- a/examples/statistics/histogram_cumulative.py
+++ b/examples/statistics/histogram_cumulative.py
@@ -7,14 +7,13 @@
 step function in order to visualize the empirical cumulative
 distribution function (CDF) of a sample. We also show the theoretical CDF.
 
-A couple of other options to the ``hist`` function are demonstrated.
-Namely, we use the ``normed`` parameter to normalize the histogram and
-a couple of different options to the ``cumulative`` parameter.
-The ``normed`` parameter takes a boolean value. When ``True``, the bin
-heights are scaled such that the total area of the histogram is 1. The
-``cumulative`` kwarg is a little more nuanced. Like ``normed``, you
-can pass it True or False, but you can also pass it -1 to reverse the
-distribution.
+A couple of other options to the ``hist`` function are demonstrated. Namely, we
+use the *normed* parameter to normalize the histogram and a couple of different
+options to the *cumulative* parameter. The *normed* parameter takes a boolean
+value. When ``True``, the bin heights are scaled such that the total area of
+the histogram is 1. The *cumulative* keyword argument is a little more nuanced.
+Like *normed*, you can pass it True or False, but you can also pass it -1 to
+reverse the distribution.
 
 Since we're showing a normalized and cumulative histogram, these curves
 are effectively the cumulative distribution functions (CDFs) of the
@@ -73,13 +72,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.hist
-matplotlib.pyplot.hist
+#    - `matplotlib.axes.Axes.hist` / `matplotlib.pyplot.hist`
diff --git a/examples/statistics/histogram_features.py b/examples/statistics/histogram_features.py
index 27c4940822d8..31f88384f24c 100644
--- a/examples/statistics/histogram_features.py
+++ b/examples/statistics/histogram_features.py
@@ -48,16 +48,12 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.hist
-matplotlib.pyplot.hist
-matplotlib.axes.Axes.set_title
-matplotlib.axes.Axes.set_xlabel
-matplotlib.axes.Axes.set_ylabel
+#    - `matplotlib.axes.Axes.hist` / `matplotlib.pyplot.hist`
+#    - `matplotlib.axes.Axes.set_title`
+#    - `matplotlib.axes.Axes.set_xlabel`
+#    - `matplotlib.axes.Axes.set_ylabel`
diff --git a/examples/statistics/histogram_histtypes.py b/examples/statistics/histogram_histtypes.py
index c22c96329be0..ca5c051d943c 100644
--- a/examples/statistics/histogram_histtypes.py
+++ b/examples/statistics/histogram_histtypes.py
@@ -51,13 +51,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.hist
-matplotlib.pyplot.hist
+#    - `matplotlib.axes.Axes.hist` / `matplotlib.pyplot.hist`
diff --git a/examples/statistics/histogram_multihist.py b/examples/statistics/histogram_multihist.py
index 65c7b11f337e..c832259c6670 100644
--- a/examples/statistics/histogram_multihist.py
+++ b/examples/statistics/histogram_multihist.py
@@ -47,13 +47,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.hist
-matplotlib.pyplot.hist
+#    - `matplotlib.axes.Axes.hist` / `matplotlib.pyplot.hist`
diff --git a/examples/statistics/multiple_histograms_side_by_side.py b/examples/statistics/multiple_histograms_side_by_side.py
index eef1a22602e4..6e7f34ac9556 100644
--- a/examples/statistics/multiple_histograms_side_by_side.py
+++ b/examples/statistics/multiple_histograms_side_by_side.py
@@ -45,8 +45,8 @@
 
 # The bin_edges are the same for all of the histograms
 bin_edges = np.linspace(hist_range[0], hist_range[1], number_of_bins + 1)
-centers = 0.5 * (bin_edges + np.roll(bin_edges, 1))[:-1]
 heights = np.diff(bin_edges)
+centers = bin_edges[:-1] + heights / 2
 
 # Cycle through and plot each histogram
 fig, ax = plt.subplots()
@@ -54,8 +54,7 @@
     lefts = x_loc - 0.5 * binned_data
     ax.barh(centers, binned_data, height=heights, left=lefts)
 
-ax.set_xticks(x_locations)
-ax.set_xticklabels(labels)
+ax.set_xticks(x_locations, labels)
 
 ax.set_ylabel("Data values")
 ax.set_xlabel("Data sets")
@@ -64,13 +63,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.barh
-matplotlib.pyplot.barh
+#    - `matplotlib.axes.Axes.barh` / `matplotlib.pyplot.barh`
diff --git a/examples/statistics/time_series_histogram.py b/examples/statistics/time_series_histogram.py
index c0e95f93bfc6..94f904fab91e 100644
--- a/examples/statistics/time_series_histogram.py
+++ b/examples/statistics/time_series_histogram.py
@@ -97,14 +97,10 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.pcolormesh
-matplotlib.pyplot.pcolormesh
-matplotlib.figure.Figure.colorbar
+#    - `matplotlib.axes.Axes.pcolormesh` / `matplotlib.pyplot.pcolormesh`
+#    - `matplotlib.figure.Figure.colorbar`
diff --git a/examples/statistics/violinplot.py b/examples/statistics/violinplot.py
index a2ff6aed61ba..7c9c894f7aec 100644
--- a/examples/statistics/violinplot.py
+++ b/examples/statistics/violinplot.py
@@ -88,13 +88,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.violinplot
-matplotlib.pyplot.violinplot
+#    - `matplotlib.axes.Axes.violinplot` / `matplotlib.pyplot.violinplot`
diff --git a/examples/style_sheets/ggplot.py b/examples/style_sheets/ggplot.py
index a1563f1bd0d2..52139c348b82 100644
--- a/examples/style_sheets/ggplot.py
+++ b/examples/style_sheets/ggplot.py
@@ -8,7 +8,7 @@
 
 These settings were shamelessly stolen from [1]_ (with permission).
 
-.. [1] https://web.archive.org/web/20111215111010/http://www.huyng.com/archives/sane-color-scheme-for-matplotlib/691/
+.. [1] https://everyhue.me/posts/sane-color-scheme-for-matplotlib/
 
 .. _ggplot: https://ggplot2.tidyverse.org/
 .. _R: https://www.r-project.org/
@@ -23,7 +23,7 @@
 np.random.seed(19680801)
 
 fig, axs = plt.subplots(ncols=2, nrows=2)
-ax1, ax2, ax3, ax4 = axs.ravel()
+ax1, ax2, ax3, ax4 = axs.flat
 
 # scatter plot (Note: `plt.scatter` doesn't use default colors)
 x, y = np.random.normal(size=(2, 200))
@@ -45,8 +45,7 @@
 ax3.bar(x, y1, width)
 ax3.bar(x + width, y2, width,
         color=list(plt.rcParams['axes.prop_cycle'])[2]['color'])
-ax3.set_xticks(x + width)
-ax3.set_xticklabels(['a', 'b', 'c', 'd', 'e'])
+ax3.set_xticks(x + width, labels=['a', 'b', 'c', 'd', 'e'])
 
 # circles with colors from default color cycle
 for i, color in enumerate(plt.rcParams['axes.prop_cycle']):
diff --git a/examples/style_sheets/plot_solarizedlight2.py b/examples/style_sheets/plot_solarizedlight2.py
index 530e4027cdc6..5fa82b295932 100644
--- a/examples/style_sheets/plot_solarizedlight2.py
+++ b/examples/style_sheets/plot_solarizedlight2.py
@@ -6,7 +6,7 @@
 This shows an example of "Solarized_Light" styling, which
 tries to replicate the styles of:
 
-- http://ethanschoonover.com/solarized
+- https://ethanschoonover.com/solarized/
 - https://github.com/jrnold/ggthemes
 - http://www.pygal.org/en/stable/documentation/builtin_styles.html#light-solarized
 
diff --git a/examples/style_sheets/style_sheets_reference.py b/examples/style_sheets/style_sheets_reference.py
index 8bdeb0c62bc7..657c73aadb10 100644
--- a/examples/style_sheets/style_sheets_reference.py
+++ b/examples/style_sheets/style_sheets_reference.py
@@ -11,6 +11,7 @@
 
 import numpy as np
 import matplotlib.pyplot as plt
+import matplotlib.colors as mcolors
 
 # Fixing random state for reproducibility
 np.random.seed(19680801)
@@ -26,15 +27,19 @@ def plot_scatter(ax, prng, nb_samples=100):
     return ax
 
 
-def plot_colored_sinusoidal_lines(ax):
-    """Plot sinusoidal lines with colors following the style color cycle."""
-    L = 2 * np.pi
-    x = np.linspace(0, L)
+def plot_colored_lines(ax):
+    """Plot lines with colors following the style color cycle."""
+    t = np.linspace(-10, 10, 100)
+
+    def sigmoid(t, t0):
+        return 1 / (1 + np.exp(-(t - t0)))
+
     nb_colors = len(plt.rcParams['axes.prop_cycle'])
-    shift = np.linspace(0, L, nb_colors, endpoint=False)
-    for s in shift:
-        ax.plot(x, np.sin(x + s), '-')
-    ax.set_xlim([x[0], x[-1]])
+    shifts = np.linspace(-5, 5, nb_colors)
+    amplitudes = np.linspace(1, 1.5, nb_colors)
+    for t0, a in zip(shifts, amplitudes):
+        ax.plot(t, a * sigmoid(t, t0), '-')
+    ax.set_xlim(-10, 10)
     return ax
 
 
@@ -45,8 +50,7 @@ def plot_bar_graphs(ax, prng, min_value=5, max_value=25, nb_samples=5):
     width = 0.25
     ax.bar(x, ya, width)
     ax.bar(x + width, yb, width, color='C2')
-    ax.set_xticks(x + width)
-    ax.set_xticklabels(['a', 'b', 'c', 'd', 'e'])
+    ax.set_xticks(x + width, labels=['a', 'b', 'c', 'd', 'e'])
     return ax
 
 
@@ -105,40 +109,43 @@ def plot_figure(style_label=""):
     # across the different figures.
     prng = np.random.RandomState(96917002)
 
-    # Tweak the figure size to be better suited for a row of numerous plots:
-    # double the width and halve the height. NB: use relative changes because
-    # some styles may have a figure size different from the default one.
-    (fig_width, fig_height) = plt.rcParams['figure.figsize']
-    fig_size = [fig_width * 2, fig_height / 2]
-
     fig, axs = plt.subplots(ncols=6, nrows=1, num=style_label,
-                            figsize=fig_size, squeeze=True)
-    axs[0].set_ylabel(style_label)
+                            figsize=(14.8, 2.7), constrained_layout=True)
+
+    # make a suptitle, in the same style for all subfigures,
+    # except those with dark backgrounds, which get a lighter color:
+    background_color = mcolors.rgb_to_hsv(
+        mcolors.to_rgb(plt.rcParams['figure.facecolor']))[2]
+    if background_color < 0.5:
+        title_color = [0.8, 0.8, 1]
+    else:
+        title_color = np.array([19, 6, 84]) / 256
+    fig.suptitle(style_label, x=0.01, ha='left', color=title_color,
+                 fontsize=14, fontfamily='DejaVu Sans', fontweight='normal')
 
     plot_scatter(axs[0], prng)
     plot_image_and_patch(axs[1], prng)
     plot_bar_graphs(axs[2], prng)
     plot_colored_circles(axs[3], prng)
-    plot_colored_sinusoidal_lines(axs[4])
+    plot_colored_lines(axs[4])
     plot_histograms(axs[5], prng)
 
-    fig.tight_layout()
-
-    return fig
-
 
 if __name__ == "__main__":
 
     # Setup a list of all available styles, in alphabetical order but
     # the `default` and `classic` ones, which will be forced resp. in
     # first and second position.
+    # styles with leading underscores are for internal use such as testing
+    # and plot types gallery. These are excluded here.
     style_list = ['default', 'classic'] + sorted(
-        style for style in plt.style.available if style != 'classic')
+        style for style in plt.style.available
+        if style != 'classic' and not style.startswith('_'))
 
     # Plot a demonstration figure for every available style sheet.
     for style_label in style_list:
         with plt.rc_context({"figure.max_open_warning": len(style_list)}):
             with plt.style.context(style_label):
-                fig = plot_figure(style_label=style_label)
+                plot_figure(style_label=style_label)
 
     plt.show()
diff --git a/examples/subplots_axes_and_figures/align_labels_demo.py b/examples/subplots_axes_and_figures/align_labels_demo.py
index 4be8081ee1f0..0e600b790c47 100644
--- a/examples/subplots_axes_and_figures/align_labels_demo.py
+++ b/examples/subplots_axes_and_figures/align_labels_demo.py
@@ -30,8 +30,7 @@
     ax.set_ylabel('YLabel1 %d' % i)
     ax.set_xlabel('XLabel1 %d' % i)
     if i == 0:
-        for tick in ax.get_xticklabels():
-            tick.set_rotation(55)
+        ax.tick_params(axis='x', rotation=55)
 fig.align_labels()  # same as fig.align_xlabels(); fig.align_ylabels()
 
 plt.show()
diff --git a/examples/subplots_axes_and_figures/auto_subplots_adjust.py b/examples/subplots_axes_and_figures/auto_subplots_adjust.py
new file mode 100644
index 000000000000..bd6326b8291f
--- /dev/null
+++ b/examples/subplots_axes_and_figures/auto_subplots_adjust.py
@@ -0,0 +1,86 @@
+"""
+===============================================
+Programmatically controlling subplot adjustment
+===============================================
+
+.. note::
+
+    This example is primarily intended to show some advanced concepts in
+    Matplotlib.
+
+    If you are only looking for having enough space for your labels, it is
+    almost always simpler and good enough to either set the subplot parameters
+    manually using `.Figure.subplots_adjust`, or use one of the automatic
+    layout mechanisms
+    (:doc:`/tutorials/intermediate/constrainedlayout_guide` or
+    :doc:`/tutorials/intermediate/tight_layout_guide`).
+
+This example describes a user-defined way to read out Artist sizes and
+set the subplot parameters accordingly. Its main purpose is to illustrate
+some advanced concepts like reading out text positions, working with
+bounding boxes and transforms and using
+:ref:`events <event-handling-tutorial>`. But it can also serve as a starting
+point if you want to automate the layouting and need more flexibility than
+tight layout and constrained layout.
+
+Below, we collect the bounding boxes of all y-labels and move the left border
+of the subplot to the right so that it leaves enough room for the union of all
+the bounding boxes.
+
+There's one catch with calculating text bounding boxes:
+Querying the text bounding boxes (`.Text.get_window_extent`) needs a
+renderer (`.RendererBase` instance), to calculate the text size. This renderer
+is only available after the figure has been drawn (`.Figure.draw`).
+
+A solution to this is putting the adjustment logic in a draw callback.
+This function is executed after the figure has been drawn. It can now check
+if the subplot leaves enough room for the text. If not, the subplot parameters
+are updated and second draw is triggered.
+
+.. redirect-from:: /gallery/pyplots/auto_subplots_adjust
+"""
+
+import matplotlib.pyplot as plt
+import matplotlib.transforms as mtransforms
+
+fig, ax = plt.subplots()
+ax.plot(range(10))
+ax.set_yticks([2, 5, 7], labels=['really, really, really', 'long', 'labels'])
+
+
+def on_draw(event):
+    bboxes = []
+    for label in ax.get_yticklabels():
+        # Bounding box in pixels
+        bbox_px = label.get_window_extent()
+        # Transform to relative figure coordinates. This is the inverse of
+        # transFigure.
+        bbox_fig = bbox_px.transformed(fig.transFigure.inverted())
+        bboxes.append(bbox_fig)
+    # the bbox that bounds all the bboxes, again in relative figure coords
+    bbox = mtransforms.Bbox.union(bboxes)
+    if fig.subplotpars.left < bbox.width:
+        # Move the subplot left edge more to the right
+        fig.subplots_adjust(left=1.1*bbox.width)  # pad a little
+        fig.canvas.draw()
+
+
+fig.canvas.mpl_connect('draw_event', on_draw)
+
+plt.show()
+
+#############################################################################
+#
+# .. admonition:: References
+#
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
+#
+#    - `matplotlib.artist.Artist.get_window_extent`
+#    - `matplotlib.transforms.Bbox`
+#    - `matplotlib.transforms.BboxBase.transformed`
+#    - `matplotlib.transforms.BboxBase.union`
+#    - `matplotlib.transforms.Transform.inverted`
+#    - `matplotlib.figure.Figure.subplots_adjust`
+#    - `matplotlib.figure.SubplotParams`
+#    - `matplotlib.backend_bases.FigureCanvasBase.mpl_connect`
diff --git a/examples/subplots_axes_and_figures/axes_box_aspect.py b/examples/subplots_axes_and_figures/axes_box_aspect.py
index 6acfcb6046f9..019c7e43c787 100644
--- a/examples/subplots_axes_and_figures/axes_box_aspect.py
+++ b/examples/subplots_axes_and_figures/axes_box_aspect.py
@@ -3,7 +3,7 @@
 Axes box aspect
 ===============
 
-This demo shows how to set the aspect of an axes box directly via
+This demo shows how to set the aspect of an Axes box directly via
 `~.Axes.set_box_aspect`. The box aspect is the ratio between axes height
 and axes width in physical units, independent of the data limits.
 This is useful to e.g. produce a square plot, independent of the data it
@@ -19,7 +19,6 @@
 #
 # Produce a square axes, no matter what the data limits are.
 
-import matplotlib
 import numpy as np
 import matplotlib.pyplot as plt
 
@@ -120,7 +119,7 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 # When setting the box aspect, one may still set the data aspect as well.
-# Here we create an axes with a box twice as long as tall and use an "equal"
+# Here we create an Axes with a box twice as long as tall and use an "equal"
 # data aspect for its contents, i.e. the circle actually stays circular.
 
 fig6, ax = plt.subplots()
@@ -136,8 +135,8 @@
 # Box aspect for many subplots
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
-# It is possible to pass the box aspect to an axes at initialization. The
-# following creates a 2 by 3 subplot grid with all square axes.
+# It is possible to pass the box aspect to an Axes at initialization. The
+# following creates a 2 by 3 subplot grid with all square Axes.
 
 fig7, axs = plt.subplots(2, 3, subplot_kw=dict(box_aspect=1),
                          sharex=True, sharey=True, constrained_layout=True)
@@ -148,12 +147,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-matplotlib.axes.Axes.set_box_aspect
+#    - `matplotlib.axes.Axes.set_box_aspect`
diff --git a/examples/subplots_axes_and_figures/axes_margins.py b/examples/subplots_axes_and_figures/axes_margins.py
index 41347f715d4d..d532f6138fe8 100644
--- a/examples/subplots_axes_and_figures/axes_margins.py
+++ b/examples/subplots_axes_and_figures/axes_margins.py
@@ -13,6 +13,7 @@
 
 import numpy as np
 import matplotlib.pyplot as plt
+from matplotlib.patches import Polygon
 
 
 def f(t):
@@ -64,7 +65,7 @@ def f(t):
 for ax, status in zip((ax1, ax2), ('Is', 'Is Not')):
     cells = ax.pcolor(x, y, x+y, cmap='inferno', shading='auto')  # sticky
     ax.add_patch(
-        plt.Polygon(poly_coords, color='forestgreen', alpha=0.5)
+        Polygon(poly_coords, color='forestgreen', alpha=0.5)
     )  # not sticky
     ax.margins(x=0.1, y=0.05)
     ax.set_aspect('equal')
@@ -75,18 +76,12 @@ def f(t):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.margins
-matplotlib.pyplot.margins
-matplotlib.axes.Axes.use_sticky_edges
-matplotlib.axes.Axes.pcolor
-matplotlib.pyplot.pcolor
-matplotlib.pyplot.Polygon
+#    - `matplotlib.axes.Axes.margins` / `matplotlib.pyplot.margins`
+#    - `matplotlib.axes.Axes.use_sticky_edges`
+#    - `matplotlib.axes.Axes.pcolor` / `matplotlib.pyplot.pcolor`
+#    - `matplotlib.patches.Polygon`
diff --git a/examples/subplots_axes_and_figures/axes_zoom_effect.py b/examples/subplots_axes_and_figures/axes_zoom_effect.py
index b525cd7ccd41..4b7ff6e91e30 100644
--- a/examples/subplots_axes_and_figures/axes_zoom_effect.py
+++ b/examples/subplots_axes_and_figures/axes_zoom_effect.py
@@ -5,6 +5,8 @@
 
 """
 
+import matplotlib.pyplot as plt
+
 from matplotlib.transforms import (
     Bbox, TransformedBbox, blended_transform_factory)
 from mpl_toolkits.axes_grid1.inset_locator import (
@@ -30,7 +32,6 @@ def connect_bbox(bbox1, bbox2,
     bbox_patch2 = BboxPatch(bbox2, **prop_patches)
 
     p = BboxConnectorPatch(bbox1, bbox2,
-                           # loc1a=3, loc2a=2, loc1b=4, loc2b=1,
                            loc1a=loc1a, loc2a=loc2a, loc1b=loc1b, loc2b=loc2b,
                            clip_on=False,
                            **prop_patches)
@@ -107,19 +108,14 @@ def zoom_effect02(ax1, ax2, **kwargs):
     return c1, c2, bbox_patch1, bbox_patch2, p
 
 
-import matplotlib.pyplot as plt
-
-plt.figure(figsize=(5, 5))
-ax1 = plt.subplot(221)
-ax2 = plt.subplot(212)
-ax2.set_xlim(0, 1)
-ax2.set_xlim(0, 5)
-zoom_effect01(ax1, ax2, 0.2, 0.8)
-
+axs = plt.figure().subplot_mosaic([
+    ["zoom1", "zoom2"],
+    ["main", "main"],
+])
 
-ax1 = plt.subplot(222)
-ax1.set_xlim(2, 3)
-ax2.set_xlim(0, 5)
-zoom_effect02(ax1, ax2)
+axs["main"].set(xlim=(0, 5))
+zoom_effect01(axs["zoom1"], axs["main"], 0.2, 0.8)
+axs["zoom2"].set(xlim=(2, 3))
+zoom_effect02(axs["zoom2"], axs["main"])
 
 plt.show()
diff --git a/examples/subplots_axes_and_figures/colorbar_placement.py b/examples/subplots_axes_and_figures/colorbar_placement.py
index 6beed5035856..66e267ce6d43 100644
--- a/examples/subplots_axes_and_figures/colorbar_placement.py
+++ b/examples/subplots_axes_and_figures/colorbar_placement.py
@@ -23,7 +23,6 @@
         pcm = ax.pcolormesh(np.random.random((20, 20)) * (col + 1),
                             cmap=cmaps[col])
         fig.colorbar(pcm, ax=ax)
-plt.show()
 
 ######################################################################
 # The first column has the same type of data in both rows, so it may
@@ -38,7 +37,6 @@
         pcm = ax.pcolormesh(np.random.random((20, 20)) * (col + 1),
                             cmap=cmaps[col])
     fig.colorbar(pcm, ax=axs[:, col], shrink=0.6)
-plt.show()
 
 ######################################################################
 # Relatively complicated colorbar layouts are possible using this
@@ -53,7 +51,6 @@
 fig.colorbar(pcm, ax=[axs[0, 2]], location='bottom')
 fig.colorbar(pcm, ax=axs[1:, :], location='right', shrink=0.6)
 fig.colorbar(pcm, ax=[axs[2, 1]], location='left')
-plt.show()
 
 ######################################################################
 # Colorbars with fixed-aspect-ratio axes
@@ -75,11 +72,10 @@
             ax.set_aspect(1/2)
         if row == 1:
             fig.colorbar(pcm, ax=ax, shrink=0.6)
-plt.show()
 
 ######################################################################
 # One way around this issue is to use an `.Axes.inset_axes` to locate the
-# axes in axes co-ordinates.  Note that if you zoom in on the axes, and
+# axes in axes coordinates.  Note that if you zoom in on the axes, and
 # change the shape of the axes, the colorbar will also change position.
 
 fig, axs = plt.subplots(2, 2, constrained_layout=True)
@@ -94,6 +90,7 @@
         else:
             ax.set_aspect(1/2)
         if row == 1:
-            cax = ax.inset_axes([1.04, 0.2, 0.05, 0.6], transform=ax.transAxes)
+            cax = ax.inset_axes([1.04, 0.2, 0.05, 0.6])
             fig.colorbar(pcm, ax=ax, cax=cax)
+
 plt.show()
diff --git a/examples/subplots_axes_and_figures/custom_figure_class.py b/examples/subplots_axes_and_figures/custom_figure_class.py
index cf2363976550..efaa3f3621f1 100644
--- a/examples/subplots_axes_and_figures/custom_figure_class.py
+++ b/examples/subplots_axes_and_figures/custom_figure_class.py
@@ -41,15 +41,11 @@ def __init__(self, *args, watermark=None, **kwargs):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.pyplot.figure
-matplotlib.figure.Figure
-matplotlib.figure.Figure.text
+#    - `matplotlib.pyplot.figure`
+#    - `matplotlib.figure.Figure`
+#    - `matplotlib.figure.Figure.text`
diff --git a/examples/subplots_axes_and_figures/demo_constrained_layout.py b/examples/subplots_axes_and_figures/demo_constrained_layout.py
index e7aca95777d7..26109cbe3129 100644
--- a/examples/subplots_axes_and_figures/demo_constrained_layout.py
+++ b/examples/subplots_axes_and_figures/demo_constrained_layout.py
@@ -62,13 +62,10 @@ def example_plot(ax):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.gridspec.GridSpec
-matplotlib.gridspec.GridSpecFromSubplotSpec
+#    - `matplotlib.gridspec.GridSpec`
+#    - `matplotlib.gridspec.GridSpecFromSubplotSpec`
diff --git a/examples/subplots_axes_and_figures/demo_tight_layout.py b/examples/subplots_axes_and_figures/demo_tight_layout.py
index 75eb8a44aa40..e3f22618ede5 100644
--- a/examples/subplots_axes_and_figures/demo_tight_layout.py
+++ b/examples/subplots_axes_and_figures/demo_tight_layout.py
@@ -3,9 +3,8 @@
 Resizing axes with tight layout
 ===============================
 
-`~.figure.Figure.tight_layout` attempts to resize subplots in
-a figure so that there are no overlaps between axes objects and labels
-on the axes.
+`~.Figure.tight_layout` attempts to resize subplots in a figure so that there
+are no overlaps between axes objects and labels on the axes.
 
 See :doc:`/tutorials/intermediate/tight_layout_guide` for more details and
 :doc:`/tutorials/intermediate/constrainedlayout_guide` for an alternative.
@@ -31,7 +30,7 @@ def example_plot(ax):
 
 fig, ax = plt.subplots()
 example_plot(ax)
-plt.tight_layout()
+fig.tight_layout()
 
 ###############################################################################
 
@@ -40,61 +39,53 @@ def example_plot(ax):
 example_plot(ax2)
 example_plot(ax3)
 example_plot(ax4)
-plt.tight_layout()
+fig.tight_layout()
 
 ###############################################################################
 
 fig, (ax1, ax2) = plt.subplots(nrows=2, ncols=1)
 example_plot(ax1)
 example_plot(ax2)
-plt.tight_layout()
+fig.tight_layout()
 
 ###############################################################################
 
 fig, (ax1, ax2) = plt.subplots(nrows=1, ncols=2)
 example_plot(ax1)
 example_plot(ax2)
-plt.tight_layout()
+fig.tight_layout()
 
 ###############################################################################
 
 fig, axs = plt.subplots(nrows=3, ncols=3)
 for ax in axs.flat:
     example_plot(ax)
-plt.tight_layout()
+fig.tight_layout()
 
 ###############################################################################
 
-fig = plt.figure()
-
+plt.figure()
 ax1 = plt.subplot(221)
 ax2 = plt.subplot(223)
 ax3 = plt.subplot(122)
-
 example_plot(ax1)
 example_plot(ax2)
 example_plot(ax3)
-
 plt.tight_layout()
 
 ###############################################################################
 
-fig = plt.figure()
-
+plt.figure()
 ax1 = plt.subplot2grid((3, 3), (0, 0))
 ax2 = plt.subplot2grid((3, 3), (0, 1), colspan=2)
 ax3 = plt.subplot2grid((3, 3), (1, 0), colspan=2, rowspan=2)
 ax4 = plt.subplot2grid((3, 3), (1, 2), rowspan=2)
-
 example_plot(ax1)
 example_plot(ax2)
 example_plot(ax3)
 example_plot(ax4)
-
 plt.tight_layout()
 
-plt.show()
-
 ###############################################################################
 
 fig = plt.figure()
@@ -103,20 +94,16 @@ def example_plot(ax):
 ax1 = fig.add_subplot(gs1[0])
 ax2 = fig.add_subplot(gs1[1])
 ax3 = fig.add_subplot(gs1[2])
-
 example_plot(ax1)
 example_plot(ax2)
 example_plot(ax3)
-
 gs1.tight_layout(fig, rect=[None, None, 0.45, None])
 
 gs2 = fig.add_gridspec(2, 1)
 ax4 = fig.add_subplot(gs2[0])
 ax5 = fig.add_subplot(gs2[1])
-
 example_plot(ax4)
 example_plot(ax5)
-
 with warnings.catch_warnings():
     # gs2.tight_layout cannot handle the subplots from the first gridspec
     # (gs1), so it will raise a warning. We are going to match the gridspecs
@@ -135,16 +122,13 @@ def example_plot(ax):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.pyplot.tight_layout
-matplotlib.figure.Figure.tight_layout
-matplotlib.figure.Figure.add_gridspec
-matplotlib.figure.Figure.add_subplot
-matplotlib.pyplot.subplot2grid
+#    - `matplotlib.figure.Figure.tight_layout` /
+#      `matplotlib.pyplot.tight_layout`
+#    - `matplotlib.figure.Figure.add_gridspec`
+#    - `matplotlib.figure.Figure.add_subplot`
+#    - `matplotlib.pyplot.subplot2grid`
diff --git a/examples/subplots_axes_and_figures/figure_size_units.py b/examples/subplots_axes_and_figures/figure_size_units.py
index f3154267ac50..94de72c1554c 100644
--- a/examples/subplots_axes_and_figures/figure_size_units.py
+++ b/examples/subplots_axes_and_figures/figure_size_units.py
@@ -56,30 +56,26 @@
 # tedious for quick iterations.
 #
 # Because of the default ``rcParams['figure.dpi'] = 100``, one can mentally
-# divide the needed pixel value by 100 [*]_:
+# divide the needed pixel value by 100 [#]_:
 #
 plt.subplots(figsize=(6, 2))
 plt.text(0.5, 0.5, '600px x 200px', **text_kwargs)
 plt.show()
 
 #############################################################################
-# .. [*] Unfortunately, this does not work well for the ``matplotlib inline``
-#        backend in jupyter because that backend uses a different default of
+# .. [#] Unfortunately, this does not work well for the ``matplotlib inline``
+#        backend in Jupyter because that backend uses a different default of
 #        ``rcParams['figure.dpi'] = 72``. Additionally, it saves the figure
 #        with ``bbox_inches='tight'``, which crops the figure and makes the
 #        actual size unpredictable.
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-
-matplotlib.pyplot.figure
-matplotlib.pyplot.subplots
-matplotlib.pyplot.subplot_mosaic
+#    - `matplotlib.pyplot.figure`
+#    - `matplotlib.pyplot.subplots`
+#    - `matplotlib.pyplot.subplot_mosaic`
diff --git a/examples/subplots_axes_and_figures/ganged_plots.py b/examples/subplots_axes_and_figures/ganged_plots.py
index 4014dabdf046..1456bcd8d3e4 100644
--- a/examples/subplots_axes_and_figures/ganged_plots.py
+++ b/examples/subplots_axes_and_figures/ganged_plots.py
@@ -21,7 +21,7 @@
 s3 = s1 * s2
 
 fig, axs = plt.subplots(3, 1, sharex=True)
-# Remove horizontal space between axes
+# Remove vertical space between axes
 fig.subplots_adjust(hspace=0)
 
 # Plot each graph, and manually set the y tick values
diff --git a/examples/subplots_axes_and_figures/geo_demo.py b/examples/subplots_axes_and_figures/geo_demo.py
index 562f9d710438..27b6f27ae6e4 100644
--- a/examples/subplots_axes_and_figures/geo_demo.py
+++ b/examples/subplots_axes_and_figures/geo_demo.py
@@ -6,7 +6,7 @@
 This shows 4 possible geographic projections.  Cartopy_ supports more
 projections.
 
-.. _Cartopy: http://scitools.org.uk/cartopy
+.. _Cartopy: https://scitools.org.uk/cartopy/
 """
 
 import matplotlib.pyplot as plt
diff --git a/examples/subplots_axes_and_figures/gridspec_and_subplots.py b/examples/subplots_axes_and_figures/gridspec_and_subplots.py
index fbb7ebd013a0..133fd37b5d71 100644
--- a/examples/subplots_axes_and_figures/gridspec_and_subplots.py
+++ b/examples/subplots_axes_and_figures/gridspec_and_subplots.py
@@ -8,7 +8,10 @@
 and then remove the covered axes and fill the gap with a new bigger axes.
 Here we create a layout with the bottom two axes in the last column combined.
 
-See also :doc:`/tutorials/intermediate/gridspec`.
+To start with this layout (rather than removing the overlapping axes) use
+`~.pyplot.subplot_mosaic`.
+
+See also :doc:`/tutorials/intermediate/arranging_axes`.
 """
 
 import matplotlib.pyplot as plt
diff --git a/examples/subplots_axes_and_figures/gridspec_nested.py b/examples/subplots_axes_and_figures/gridspec_nested.py
index e47106e5d47c..2a73fc4b3c1c 100644
--- a/examples/subplots_axes_and_figures/gridspec_nested.py
+++ b/examples/subplots_axes_and_figures/gridspec_nested.py
@@ -7,7 +7,7 @@
 set the position for a nested grid of subplots.
 
 Note that the same functionality can be achieved more directly with
-`~.figure.FigureBase.subfigures`; see
+`~.FigureBase.subfigures`; see
 :doc:`/gallery/subplots_axes_and_figures/subfigures`.
 
 """
diff --git a/examples/subplots_axes_and_figures/multiple_figs_demo.py b/examples/subplots_axes_and_figures/multiple_figs_demo.py
index 2d30768902c7..ee667e95565f 100644
--- a/examples/subplots_axes_and_figures/multiple_figs_demo.py
+++ b/examples/subplots_axes_and_figures/multiple_figs_demo.py
@@ -10,10 +10,11 @@
 
 .. note::
 
-    We discourage working with multiple figures in pyplot because managing
-    the *current figure* is cumbersome and error-prone. Instead, we recommend
-    to use the object-oriented approach and call methods on Figure and Axes
-    instances.
+    We discourage working with multiple figures through the implicit pyplot
+    interface because managing the *current figure* is cumbersome and
+    error-prone. Instead, we recommend using the explicit approach and call
+    methods on Figure and Axes instances. See :ref:`api_interfaces` for an
+    explanation of the trade-offs between the implicit and explicit interfaces.
 
 """
 import matplotlib.pyplot as plt
diff --git a/examples/subplots_axes_and_figures/secondary_axis.py b/examples/subplots_axes_and_figures/secondary_axis.py
index 4fc3de442d3b..8122a211f899 100644
--- a/examples/subplots_axes_and_figures/secondary_axis.py
+++ b/examples/subplots_axes_and_figures/secondary_axis.py
@@ -8,7 +8,7 @@
 axes with only one axis visible via `.axes.Axes.secondary_xaxis` and
 `.axes.Axes.secondary_yaxis`.  This secondary axis can have a different scale
 than the main axis by providing both a forward and an inverse conversion
-function in a tuple to the ``functions`` kwarg:
+function in a tuple to the *functions* keyword argument:
 """
 
 import matplotlib.pyplot as plt
@@ -87,9 +87,9 @@ def one_over(x):
 #   nominal plot limits.
 #
 #   In the specific case of the numpy linear interpolation, `numpy.interp`,
-#   this condition can be arbitrarily enforced by providing optional kwargs
-#   *left*, *right* such that values outside the data range are mapped
-#   well outside the plot limits.
+#   this condition can be arbitrarily enforced by providing optional keyword
+#   arguments *left*, *right* such that values outside the data range are
+#   mapped well outside the plot limits.
 
 fig, ax = plt.subplots(constrained_layout=True)
 xdata = np.arange(1, 11, 0.4)
@@ -183,14 +183,10 @@ def anomaly_to_celsius(x):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-
-matplotlib.axes.Axes.secondary_xaxis
-matplotlib.axes.Axes.secondary_yaxis
+#    - `matplotlib.axes.Axes.secondary_xaxis`
+#    - `matplotlib.axes.Axes.secondary_yaxis`
diff --git a/examples/subplots_axes_and_figures/shared_axis_demo.py b/examples/subplots_axes_and_figures/shared_axis_demo.py
index f09e5c87759b..55c2819cebcf 100644
--- a/examples/subplots_axes_and_figures/shared_axis_demo.py
+++ b/examples/subplots_axes_and_figures/shared_axis_demo.py
@@ -4,14 +4,14 @@
 ===========
 
 You can share the x or y axis limits for one axis with another by
-passing an axes instance as a *sharex* or *sharey* keyword argument.
+passing an `~.axes.Axes` instance as a *sharex* or *sharey* keyword argument.
 
 Changing the axis limits on one axes will be reflected automatically
 in the other, and vice-versa, so when you navigate with the toolbar
-the axes will follow each other on their shared axes.  Ditto for
+the Axes will follow each other on their shared axis.  Ditto for
 changes in the axis scaling (e.g., log vs. linear).  However, it is
 possible to have differences in tick labeling, e.g., you can selectively
-turn off the tick labels on one axes.
+turn off the tick labels on one Axes.
 
 The example below shows how to customize the tick labels on the
 various axes.  Shared axes share the tick locator, tick formatter,
@@ -20,13 +20,13 @@
 because you may want to make the tick labels smaller on the upper
 axes, e.g., in the example below.
 
-If you want to turn off the ticklabels for a given axes (e.g., on
+If you want to turn off the ticklabels for a given Axes (e.g., on
 subplot(211) or subplot(212), you cannot do the standard trick::
 
    setp(ax2, xticklabels=[])
 
 because this changes the tick Formatter, which is shared among all
-axes.  But you can alter the visibility of the labels, which is a
+Axes.  But you can alter the visibility of the labels, which is a
 property::
 
   setp(ax2.get_xticklabels(), visible=False)
@@ -42,13 +42,13 @@
 
 ax1 = plt.subplot(311)
 plt.plot(t, s1)
-plt.setp(ax1.get_xticklabels(), fontsize=6)
+plt.tick_params('x', labelsize=6)
 
 # share x only
 ax2 = plt.subplot(312, sharex=ax1)
 plt.plot(t, s2)
 # make these tick labels invisible
-plt.setp(ax2.get_xticklabels(), visible=False)
+plt.tick_params('x', labelbottom=False)
 
 # share x and y
 ax3 = plt.subplot(313, sharex=ax1, sharey=ax1)
diff --git a/examples/subplots_axes_and_figures/subplot.py b/examples/subplots_axes_and_figures/subplot.py
index 5502d7c23f2b..c368746a8856 100644
--- a/examples/subplots_axes_and_figures/subplot.py
+++ b/examples/subplots_axes_and_figures/subplot.py
@@ -4,18 +4,25 @@
 =================
 
 Simple demo with multiple subplots.
+
+For more options, see :doc:`/gallery/subplots_axes_and_figures/subplots_demo`.
+
+.. redirect-from:: /gallery/subplots_axes_and_figures/subplot_demo
 """
+
 import numpy as np
 import matplotlib.pyplot as plt
 
-###############################################################################
-
+# Create some fake data.
 x1 = np.linspace(0.0, 5.0)
-x2 = np.linspace(0.0, 2.0)
-
 y1 = np.cos(2 * np.pi * x1) * np.exp(-x1)
+x2 = np.linspace(0.0, 2.0)
 y2 = np.cos(2 * np.pi * x2)
 
+###############################################################################
+# `~.pyplot.subplots()` is the recommended method to generate simple subplot
+# arrangements:
+
 fig, (ax1, ax2) = plt.subplots(2, 1)
 fig.suptitle('A tale of 2 subplots')
 
@@ -28,22 +35,8 @@
 
 plt.show()
 
-#############################################################################
-#
-#
-# Alternative Method For Creating Multiple Plots
-# """"""""""""""""""""""""""""""""""""""""""""""
-#
-# Subplots can also be generated using `~.pyplot.subplot()` \
-# as in the following example:
-#
-
-
-x1 = np.linspace(0.0, 5.0)
-x2 = np.linspace(0.0, 2.0)
-
-y1 = np.cos(2 * np.pi * x1) * np.exp(-x1)
-y2 = np.cos(2 * np.pi * x2)
+###############################################################################
+# Subplots can also be generated one at a time using `~.pyplot.subplot()`:
 
 plt.subplot(2, 1, 1)
 plt.plot(x1, y1, 'o-')
diff --git a/examples/subplots_axes_and_figures/subplot_demo.py b/examples/subplots_axes_and_figures/subplot_demo.py
deleted file mode 100644
index 836476829a65..000000000000
--- a/examples/subplots_axes_and_figures/subplot_demo.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""
-==================
-Basic Subplot Demo
-==================
-
-Demo with two subplots.
-For more options, see
-:doc:`/gallery/subplots_axes_and_figures/subplots_demo`
-"""
-import numpy as np
-import matplotlib.pyplot as plt
-
-# Data for plotting
-x1 = np.linspace(0.0, 5.0)
-x2 = np.linspace(0.0, 2.0)
-y1 = np.cos(2 * np.pi * x1) * np.exp(-x1)
-y2 = np.cos(2 * np.pi * x2)
-
-# Create two subplots sharing y axis
-fig, (ax1, ax2) = plt.subplots(2, sharey=True)
-
-ax1.plot(x1, y1, 'ko-')
-ax1.set(title='A tale of 2 subplots', ylabel='Damped oscillation')
-
-ax2.plot(x2, y2, 'r.-')
-ax2.set(xlabel='time (s)', ylabel='Undamped')
-
-plt.show()
diff --git a/examples/subplots_axes_and_figures/subplot_toolbar.py b/examples/subplots_axes_and_figures/subplot_toolbar.py
deleted file mode 100644
index e65b1f7091f0..000000000000
--- a/examples/subplots_axes_and_figures/subplot_toolbar.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""
-===============
-Subplot Toolbar
-===============
-
-Matplotlib has a toolbar available for adjusting subplot spacing.
-"""
-import matplotlib.pyplot as plt
-import numpy as np
-
-
-# Fixing random state for reproducibility
-np.random.seed(19680801)
-
-fig, axs = plt.subplots(2, 2)
-
-axs[0, 0].imshow(np.random.random((100, 100)))
-
-axs[0, 1].imshow(np.random.random((100, 100)))
-
-axs[1, 0].imshow(np.random.random((100, 100)))
-
-axs[1, 1].imshow(np.random.random((100, 100)))
-
-plt.subplot_tool()
-plt.show()
diff --git a/examples/subplots_axes_and_figures/subplots_adjust.py b/examples/subplots_axes_and_figures/subplots_adjust.py
index fecc41f6f5ff..3eb6d709a546 100644
--- a/examples/subplots_axes_and_figures/subplots_adjust.py
+++ b/examples/subplots_axes_and_figures/subplots_adjust.py
@@ -1,10 +1,16 @@
 """
-===============
-Subplots Adjust
-===============
+=============================
+Subplots spacings and margins
+=============================
 
-Adjusting the spacing of margins and subplots using
-`~matplotlib.pyplot.subplots_adjust`.
+Adjusting the spacing of margins and subplots using `.pyplot.subplots_adjust`.
+
+.. note::
+   There is also a tool window to adjust the margins and spacings of displayed
+   figures interactively.  It can be opened via the toolbar or by calling
+   `.pyplot.subplot_tool`.
+
+.. redirect-from:: /gallery/subplots_axes_and_figures/subplot_toolbar
 """
 
 import matplotlib.pyplot as plt
@@ -14,11 +20,12 @@
 np.random.seed(19680801)
 
 plt.subplot(211)
-plt.imshow(np.random.random((100, 100)), cmap=plt.cm.BuPu_r)
+plt.imshow(np.random.random((100, 100)))
 plt.subplot(212)
-plt.imshow(np.random.random((100, 100)), cmap=plt.cm.BuPu_r)
+plt.imshow(np.random.random((100, 100)))
 
 plt.subplots_adjust(bottom=0.1, right=0.8, top=0.9)
 cax = plt.axes([0.85, 0.1, 0.075, 0.8])
 plt.colorbar(cax=cax)
+
 plt.show()
diff --git a/examples/subplots_axes_and_figures/subplots_demo.py b/examples/subplots_axes_and_figures/subplots_demo.py
index bbc8afa469fa..41b14dadd620 100644
--- a/examples/subplots_axes_and_figures/subplots_demo.py
+++ b/examples/subplots_axes_and_figures/subplots_demo.py
@@ -176,7 +176,7 @@
 ax3.plot(x + 1, -y, 'tab:green')
 ax4.plot(x + 2, -y**2, 'tab:red')
 
-for ax in axs.flat:
+for ax in fig.get_axes():
     ax.label_outer()
 
 ###############################################################################
diff --git a/examples/subplots_axes_and_figures/two_scales.py b/examples/subplots_axes_and_figures/two_scales.py
index 4873a6f3dd85..307f6c7053be 100644
--- a/examples/subplots_axes_and_figures/two_scales.py
+++ b/examples/subplots_axes_and_figures/two_scales.py
@@ -41,15 +41,11 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.twinx
-matplotlib.axes.Axes.twiny
-matplotlib.axes.Axes.tick_params
+#    - `matplotlib.axes.Axes.twinx` / `matplotlib.pyplot.twinx`
+#    - `matplotlib.axes.Axes.twiny` / `matplotlib.pyplot.twiny`
+#    - `matplotlib.axes.Axes.tick_params` / `matplotlib.pyplot.tick_params`
diff --git a/examples/subplots_axes_and_figures/zoom_inset_axes.py b/examples/subplots_axes_and_figures/zoom_inset_axes.py
index e4b630aa9356..85f3f78ec6b4 100644
--- a/examples/subplots_axes_and_figures/zoom_inset_axes.py
+++ b/examples/subplots_axes_and_figures/zoom_inset_axes.py
@@ -33,8 +33,8 @@ def get_demo_image():
 x1, x2, y1, y2 = -1.5, -0.9, -2.5, -1.9
 axins.set_xlim(x1, x2)
 axins.set_ylim(y1, y2)
-axins.set_xticklabels('')
-axins.set_yticklabels('')
+axins.set_xticklabels([])
+axins.set_yticklabels([])
 
 ax.indicate_inset_zoom(axins, edgecolor="black")
 
@@ -42,14 +42,11 @@ def get_demo_image():
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions and methods is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.inset_axes
-matplotlib.axes.Axes.indicate_inset_zoom
-matplotlib.axes.Axes.imshow
+#    - `matplotlib.axes.Axes.inset_axes`
+#    - `matplotlib.axes.Axes.indicate_inset_zoom`
+#    - `matplotlib.axes.Axes.imshow`
diff --git a/examples/text_labels_and_annotations/accented_text.py b/examples/text_labels_and_annotations/accented_text.py
index eb45fe8f276d..9e9ad65e9f15 100644
--- a/examples/text_labels_and_annotations/accented_text.py
+++ b/examples/text_labels_and_annotations/accented_text.py
@@ -1,9 +1,9 @@
 r"""
 =================================
-Using accented text in matplotlib
+Using accented text in Matplotlib
 =================================
 
-Matplotlib supports accented characters via TeX mathtext or unicode.
+Matplotlib supports accented characters via TeX mathtext or Unicode.
 
 Using mathtext, the following accents are provided: \\hat, \\breve, \\grave,
 \\bar, \\acute, \\tilde, \\vec, \\dot, \\ddot.  All of them have the same
@@ -24,7 +24,8 @@
 ax.text(4, 0.5, r"$F=m\ddot{x}$")
 fig.tight_layout()
 
-# Unicode demo
+#############################################################################
+# You can also use Unicode characters directly in strings.
 fig, ax = plt.subplots()
 ax.set_title("GISCARD CHAHUTÉ À L'ASSEMBLÉE")
 ax.set_xlabel("LE COUP DE DÉ DE DE GAULLE")
diff --git a/examples/pyplots/align_ylabels.py b/examples/text_labels_and_annotations/align_ylabels.py
similarity index 80%
rename from examples/pyplots/align_ylabels.py
rename to examples/text_labels_and_annotations/align_ylabels.py
index 114145f14676..8e47909cc6c1 100644
--- a/examples/pyplots/align_ylabels.py
+++ b/examples/text_labels_and_annotations/align_ylabels.py
@@ -6,6 +6,7 @@
 Two methods are shown here, one using a short call to `.Figure.align_ylabels`
 and the second a manual way to align the labels.
 
+.. redirect-from:: /gallery/pyplots/align_ylabels
 """
 import numpy as np
 import matplotlib.pyplot as plt
@@ -72,19 +73,14 @@ def make_plot(axs):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.figure.Figure.align_ylabels
-matplotlib.axis.Axis.set_label_coords
-matplotlib.axes.Axes.plot
-matplotlib.pyplot.plot
-matplotlib.axes.Axes.set_title
-matplotlib.axes.Axes.set_ylabel
-matplotlib.axes.Axes.set_ylim
+#    - `matplotlib.figure.Figure.align_ylabels`
+#    - `matplotlib.axis.Axis.set_label_coords`
+#    - `matplotlib.axes.Axes.plot` / `matplotlib.pyplot.plot`
+#    - `matplotlib.axes.Axes.set_title`
+#    - `matplotlib.axes.Axes.set_ylabel`
+#    - `matplotlib.axes.Axes.set_ylim`
diff --git a/examples/text_labels_and_annotations/angle_annotation.py b/examples/text_labels_and_annotations/angle_annotation.py
index d22501232ce2..8272dd1f3e06 100644
--- a/examples/text_labels_and_annotations/angle_annotation.py
+++ b/examples/text_labels_and_annotations/angle_annotation.py
@@ -58,7 +58,6 @@
 
 
 import numpy as np
-import matplotlib
 import matplotlib.pyplot as plt
 from matplotlib.patches import Arc
 from matplotlib.transforms import IdentityTransform, TransformedBbox, Bbox
@@ -135,8 +134,7 @@ def get_size(self):
         if self.unit == "points":
             factor = self.ax.figure.dpi / 72.
         elif self.unit[:4] == "axes":
-            b = TransformedBbox(Bbox.from_bounds(0, 0, 1, 1),
-                                self.ax.transAxes)
+            b = TransformedBbox(Bbox.unit(), self.ax.transAxes)
             dic = {"max": max(b.width, b.height),
                    "min": min(b.width, b.height),
                    "width": b.width, "height": b.height}
@@ -314,18 +312,14 @@ def plot_angle(ax, pos, angle, length=0.95, acol="C0", **kwargs):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-matplotlib.patches.Arc
-matplotlib.axes.Axes.annotate
-matplotlib.pyplot.annotate
-matplotlib.text.Annotation
-matplotlib.transforms.IdentityTransform
-matplotlib.transforms.TransformedBbox
-matplotlib.transforms.Bbox
+#    - `matplotlib.patches.Arc`
+#    - `matplotlib.axes.Axes.annotate` / `matplotlib.pyplot.annotate`
+#    - `matplotlib.text.Annotation`
+#    - `matplotlib.transforms.IdentityTransform`
+#    - `matplotlib.transforms.TransformedBbox`
+#    - `matplotlib.transforms.Bbox`
diff --git a/examples/text_labels_and_annotations/angles_on_bracket_arrows.py b/examples/text_labels_and_annotations/angles_on_bracket_arrows.py
new file mode 100644
index 000000000000..35a6cad22130
--- /dev/null
+++ b/examples/text_labels_and_annotations/angles_on_bracket_arrows.py
@@ -0,0 +1,64 @@
+"""
+===================================
+Angle annotations on bracket arrows
+===================================
+
+This example shows how to add angle annotations to bracket arrow styles
+created using `.FancyArrowPatch`. *angleA* and *angleB* are measured from a
+vertical line as positive (to the left) or negative (to the right). Blue
+`.FancyArrowPatch` arrows indicate the directions of *angleA* and *angleB*
+from the vertical and axes text annotate the angle sizes.
+"""
+
+import matplotlib.pyplot as plt
+import numpy as np
+from matplotlib.patches import FancyArrowPatch
+
+
+def get_point_of_rotated_vertical(origin, line_length, degrees):
+    """Return xy coordinates of the vertical line end rotated by degrees."""
+    rad = np.deg2rad(-degrees)
+    return [origin[0] + line_length * np.sin(rad),
+            origin[1] + line_length * np.cos(rad)]
+
+
+fig, ax = plt.subplots(figsize=(8, 7))
+ax.set(xlim=(0, 6), ylim=(-1, 4))
+ax.set_title("Orientation of the bracket arrows relative to angleA and angleB")
+
+for i, style in enumerate(["]-[", "|-|"]):
+    for j, angle in enumerate([-40, 60]):
+        y = 2*i + j
+        arrow_centers = ((1, y), (5, y))
+        vlines = ((1, y + 0.5), (5, y + 0.5))
+        anglesAB = (angle, -angle)
+        bracketstyle = f"{style}, angleA={anglesAB[0]}, angleB={anglesAB[1]}"
+        bracket = FancyArrowPatch(*arrow_centers, arrowstyle=bracketstyle,
+                                  mutation_scale=42)
+        ax.add_patch(bracket)
+        ax.text(3, y + 0.05, bracketstyle, ha="center", va="bottom")
+        ax.vlines([i[0] for i in vlines], [y, y], [i[1] for i in vlines],
+                  linestyles="--", color="C0")
+        # Get the top coordinates for the drawn patches at A and B
+        patch_tops = [get_point_of_rotated_vertical(center, 0.5, angle)
+                      for center, angle in zip(arrow_centers, anglesAB)]
+        # Define the connection directions for the annotation arrows
+        connection_dirs = (1, -1) if angle > 0 else (-1, 1)
+        # Add arrows and annotation text
+        arrowstyle = "Simple, tail_width=0.5, head_width=4, head_length=8"
+        for vline, dir, patch_top, angle in zip(vlines, connection_dirs,
+                                                patch_tops, anglesAB):
+            kw = dict(connectionstyle=f"arc3,rad={dir * 0.5}",
+                      arrowstyle=arrowstyle, color="C0")
+            ax.add_patch(FancyArrowPatch(vline, patch_top, **kw))
+            ax.text(vline[0] - dir * 0.15, y + 0.3, f'{angle}°', ha="center",
+                    va="center")
+
+#############################################################################
+#
+# .. admonition:: References
+#
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
+#
+#    - `matplotlib.patches.ArrowStyle`
diff --git a/examples/pyplots/annotate_transform.py b/examples/text_labels_and_annotations/annotate_transform.py
similarity index 79%
rename from examples/pyplots/annotate_transform.py
rename to examples/text_labels_and_annotations/annotate_transform.py
index 5816a05a0455..1145f7fdb9a2 100644
--- a/examples/pyplots/annotate_transform.py
+++ b/examples/text_labels_and_annotations/annotate_transform.py
@@ -6,6 +6,8 @@
 This example shows how to use different coordinate systems for annotations.
 For a complete overview of the annotation capabilities, also see the
 :doc:`annotation tutorial</tutorials/text/annotations>`.
+
+.. redirect-from:: /gallery/pyplots/annotate_transform
 """
 
 import numpy as np
@@ -43,15 +45,10 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.transforms.Transform.transform
-matplotlib.axes.Axes.annotate
-matplotlib.pyplot.annotate
+#    - `matplotlib.transforms.Transform.transform`
+#    - `matplotlib.axes.Axes.annotate` / `matplotlib.pyplot.annotate`
diff --git a/examples/pyplots/annotation_basic.py b/examples/text_labels_and_annotations/annotation_basic.py
similarity index 74%
rename from examples/pyplots/annotation_basic.py
rename to examples/text_labels_and_annotations/annotation_basic.py
index 1b2e6ec1a09c..d9ea9748197f 100644
--- a/examples/pyplots/annotation_basic.py
+++ b/examples/text_labels_and_annotations/annotation_basic.py
@@ -8,6 +8,8 @@
 
 For a complete overview of the annotation capabilities, also see the
 :doc:`annotation tutorial</tutorials/text/annotations>`.
+
+.. redirect-from:: /gallery/pyplots/annotation_basic
 """
 import numpy as np
 import matplotlib.pyplot as plt
@@ -26,14 +28,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.annotate
-matplotlib.pyplot.annotate
+#    - `matplotlib.axes.Axes.annotate` / `matplotlib.pyplot.annotate`
diff --git a/examples/text_labels_and_annotations/annotation_demo.py b/examples/text_labels_and_annotations/annotation_demo.py
index f04460b7698b..2008a8744675 100644
--- a/examples/text_labels_and_annotations/annotation_demo.py
+++ b/examples/text_labels_and_annotations/annotation_demo.py
@@ -107,7 +107,7 @@
 # In the example below, the *xy* point is in native coordinates (*xycoords*
 # defaults to 'data').  For a polar axes, this is in (theta, radius) space.
 # The text in the example is placed in the fractional figure coordinate system.
-# Text keyword args like horizontal and vertical alignment are respected.
+# Text keyword arguments like horizontal and vertical alignment are respected.
 
 fig, ax = plt.subplots(subplot_kw=dict(projection='polar'), figsize=(3, 3))
 r = np.arange(0, 1, 0.001)
@@ -125,6 +125,7 @@
             horizontalalignment='left',
             verticalalignment='bottom')
 
+#############################################################################
 # You can also use polar notation on a cartesian axes.  Here the native
 # coordinate system ('data') is cartesian, so you need to specify the
 # xycoords and textcoords as 'polar' if you want to use (theta, radius).
@@ -230,6 +231,7 @@
 
 ax.set(xlim=(-1, 5), ylim=(-4, 3))
 
+#############################################################################
 # We'll create another figure so that it doesn't get too cluttered
 fig, ax = plt.subplots()
 
@@ -247,7 +249,6 @@
             xy=(2., -1), xycoords='data',
             xytext=(-100, 60), textcoords='offset points',
             size=20,
-            # bbox=dict(boxstyle="round", fc="0.8"),
             arrowprops=dict(arrowstyle="fancy",
                             fc="0.6", ec="none",
                             patchB=el,
@@ -256,7 +257,6 @@
             xy=(2., -1), xycoords='data',
             xytext=(100, 60), textcoords='offset points',
             size=20,
-            # bbox=dict(boxstyle="round", fc="0.8"),
             arrowprops=dict(arrowstyle="simple",
                             fc="0.6", ec="none",
                             patchB=el,
@@ -265,7 +265,6 @@
             xy=(2., -1), xycoords='data',
             xytext=(-100, -100), textcoords='offset points',
             size=20,
-            # bbox=dict(boxstyle="round", fc="0.8"),
             arrowprops=dict(arrowstyle="wedge,tail_width=0.7",
                             fc="0.6", ec="none",
                             patchB=el,
@@ -338,11 +337,8 @@
 # It is also possible to generate draggable annotations
 
 an1 = ax1.annotate('Drag me 1', xy=(.5, .7), xycoords='data',
-                   #xytext=(.5, .7), textcoords='data',
                    ha="center", va="center",
-                   bbox=bbox_args,
-                   #arrowprops=arrow_args
-                   )
+                   bbox=bbox_args)
 
 an2 = ax1.annotate('Drag me 2', xy=(.5, .5), xycoords=an1,
                    xytext=(.5, .3), textcoords='axes fraction',
diff --git a/examples/pyplots/annotation_polar.py b/examples/text_labels_and_annotations/annotation_polar.py
similarity index 77%
rename from examples/pyplots/annotation_polar.py
rename to examples/text_labels_and_annotations/annotation_polar.py
index 42d747fc60a6..a7f8b764d914 100644
--- a/examples/pyplots/annotation_polar.py
+++ b/examples/text_labels_and_annotations/annotation_polar.py
@@ -7,6 +7,8 @@
 
 For a complete overview of the annotation capabilities, also see the
 :doc:`annotation tutorial</tutorials/text/annotations>`.
+
+.. redirect-from:: /gallery/pyplots/annotation_polar
 """
 import numpy as np
 import matplotlib.pyplot as plt
@@ -32,15 +34,10 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.projections.polar
-matplotlib.axes.Axes.annotate
-matplotlib.pyplot.annotate
+#    - `matplotlib.projections.polar`
+#    - `matplotlib.axes.Axes.annotate` / `matplotlib.pyplot.annotate`
diff --git a/examples/text_labels_and_annotations/arrow_demo.py b/examples/text_labels_and_annotations/arrow_demo.py
index 9e678249d1a1..cf9e86d12c3b 100644
--- a/examples/text_labels_and_annotations/arrow_demo.py
+++ b/examples/text_labels_and_annotations/arrow_demo.py
@@ -3,145 +3,74 @@
 Arrow Demo
 ==========
 
-Arrow drawing example for the new fancy_arrow facilities.
-
-Code contributed by: Rob Knight <rob@spot.colorado.edu>
-
-usage:
-
-  python arrow_demo.py realistic|full|sample|extreme
+Three ways of drawing arrows to encode arrow "strength" (e.g., transition
+probabilities in a Markov model) using arrow length, width, or alpha (opacity).
+"""
 
+import itertools
 
-"""
 import matplotlib.pyplot as plt
 import numpy as np
 
-rates_to_bases = {'r1': 'AT', 'r2': 'TA', 'r3': 'GA', 'r4': 'AG', 'r5': 'CA',
-                  'r6': 'AC', 'r7': 'GT', 'r8': 'TG', 'r9': 'CT', 'r10': 'TC',
-                  'r11': 'GC', 'r12': 'CG'}
-numbered_bases_to_rates = {v: k for k, v in rates_to_bases.items()}
-lettered_bases_to_rates = {v: 'r' + v for k, v in rates_to_bases.items()}
-
 
-def make_arrow_plot(data, size=4, display='length', shape='right',
-                    max_arrow_width=0.03, arrow_sep=0.02, alpha=0.5,
-                    normalize_data=False, ec=None, labelcolor=None,
-                    head_starts_at_zero=True,
-                    rate_labels=lettered_bases_to_rates,
-                    **kwargs):
+def make_arrow_graph(ax, data, size=4, display='length', shape='right',
+                     max_arrow_width=0.03, arrow_sep=0.02, alpha=0.5,
+                     normalize_data=False, ec=None, labelcolor=None,
+                     **kwargs):
     """
     Makes an arrow plot.
 
     Parameters
     ----------
+    ax
+        The axes where the graph is drawn.
     data
         Dict with probabilities for the bases and pair transitions.
     size
-        Size of the graph in inches.
+        Size of the plot, in inches.
     display : {'length', 'width', 'alpha'}
         The arrow property to change.
     shape : {'full', 'left', 'right'}
         For full or half arrows.
     max_arrow_width : float
-        Maximum width of an arrow, data coordinates.
+        Maximum width of an arrow, in data coordinates.
     arrow_sep : float
-        Separation between arrows in a pair, data coordinates.
+        Separation between arrows in a pair, in data coordinates.
     alpha : float
         Maximum opacity of arrows.
     **kwargs
-        Can be anything allowed by a Arrow object, e.g. *linewidth* or
-        *edgecolor*.
+        `.FancyArrow` properties, e.g. *linewidth* or *edgecolor*.
     """
 
-    plt.xlim(-0.5, 1.5)
-    plt.ylim(-0.5, 1.5)
-    plt.gcf().set_size_inches(size, size)
-    plt.xticks([])
-    plt.yticks([])
+    ax.set(xlim=(-0.25, 1.25), ylim=(-0.25, 1.25), xticks=[], yticks=[],
+           title=f'flux encoded as arrow {display}')
     max_text_size = size * 12
     min_text_size = size
-    label_text_size = size * 2.5
-    text_params = {'ha': 'center', 'va': 'center', 'family': 'sans-serif',
-                   'fontweight': 'bold'}
-    r2 = np.sqrt(2)
-
-    deltas = {
-        'AT': (1, 0),
-        'TA': (-1, 0),
-        'GA': (0, 1),
-        'AG': (0, -1),
-        'CA': (-1 / r2, 1 / r2),
-        'AC': (1 / r2, -1 / r2),
-        'GT': (1 / r2, 1 / r2),
-        'TG': (-1 / r2, -1 / r2),
-        'CT': (0, 1),
-        'TC': (0, -1),
-        'GC': (1, 0),
-        'CG': (-1, 0)}
-
-    colors = {
-        'AT': 'r',
-        'TA': 'k',
-        'GA': 'g',
-        'AG': 'r',
-        'CA': 'b',
-        'AC': 'r',
-        'GT': 'g',
-        'TG': 'k',
-        'CT': 'b',
-        'TC': 'k',
-        'GC': 'g',
-        'CG': 'b'}
-
-    label_positions = {
-        'AT': 'center',
-        'TA': 'center',
-        'GA': 'center',
-        'AG': 'center',
-        'CA': 'left',
-        'AC': 'left',
-        'GT': 'left',
-        'TG': 'left',
-        'CT': 'center',
-        'TC': 'center',
-        'GC': 'center',
-        'CG': 'center'}
-
-    def do_fontsize(k):
-        return float(np.clip(max_text_size * np.sqrt(data[k]),
-                             min_text_size, max_text_size))
-
-    plt.text(0, 1, '$A_3$', color='r', size=do_fontsize('A'), **text_params)
-    plt.text(1, 1, '$T_3$', color='k', size=do_fontsize('T'), **text_params)
-    plt.text(0, 0, '$G_3$', color='g', size=do_fontsize('G'), **text_params)
-    plt.text(1, 0, '$C_3$', color='b', size=do_fontsize('C'), **text_params)
+    label_text_size = size * 4
+
+    bases = 'ATGC'
+    coords = {
+        'A': np.array([0, 1]),
+        'T': np.array([1, 1]),
+        'G': np.array([0, 0]),
+        'C': np.array([1, 0]),
+    }
+    colors = {'A': 'r', 'T': 'k', 'G': 'g', 'C': 'b'}
+
+    for base in bases:
+        fontsize = np.clip(max_text_size * data[base]**(1/2),
+                           min_text_size, max_text_size)
+        ax.text(*coords[base], f'${base}_3$',
+                color=colors[base], size=fontsize,
+                horizontalalignment='center', verticalalignment='center',
+                weight='bold')
 
     arrow_h_offset = 0.25  # data coordinates, empirically determined
     max_arrow_length = 1 - 2 * arrow_h_offset
     max_head_width = 2.5 * max_arrow_width
     max_head_length = 2 * max_arrow_width
-    arrow_params = {'length_includes_head': True, 'shape': shape,
-                    'head_starts_at_zero': head_starts_at_zero}
     sf = 0.6  # max arrow size represents this in data coords
 
-    d = (r2 / 2 + arrow_h_offset - 0.5) / r2  # distance for diags
-    r2v = arrow_sep / r2  # offset for diags
-
-    # tuple of x, y for start position
-    positions = {
-        'AT': (arrow_h_offset, 1 + arrow_sep),
-        'TA': (1 - arrow_h_offset, 1 - arrow_sep),
-        'GA': (-arrow_sep, arrow_h_offset),
-        'AG': (arrow_sep, 1 - arrow_h_offset),
-        'CA': (1 - d - r2v, d - r2v),
-        'AC': (d + r2v, 1 - d + r2v),
-        'GT': (d - r2v, d + r2v),
-        'TG': (1 - d + r2v, 1 - d - r2v),
-        'CT': (1 - arrow_sep, arrow_h_offset),
-        'TC': (1 + arrow_sep, 1 - arrow_h_offset),
-        'GC': (arrow_h_offset, arrow_sep),
-        'CG': (1 - arrow_h_offset, -arrow_sep)}
-
     if normalize_data:
         # find maximum value for rates, i.e. where keys are 2 chars long
         max_val = max((v for k, v in data.items() if len(k) == 2), default=0)
@@ -149,7 +78,8 @@ def do_fontsize(k):
         for k, v in data.items():
             data[k] = v / max_val * sf
 
-    def draw_arrow(pair, alpha=alpha, ec=ec, labelcolor=labelcolor):
+    # iterate over strings 'AT', 'TA', 'AG', 'GA', etc.
+    for pair in map(''.join, itertools.permutations(bases, 2)):
         # set the length of the arrow
         if display == 'length':
             length = (max_head_length
@@ -159,7 +89,6 @@ def draw_arrow(pair, alpha=alpha, ec=ec, labelcolor=labelcolor):
         # set the transparency of the arrow
         if display == 'alpha':
             alpha = min(data[pair] / sf, alpha)
-
         # set the width of the arrow
         if display == 'width':
             scale = data[pair] / sf
@@ -171,137 +100,60 @@ def draw_arrow(pair, alpha=alpha, ec=ec, labelcolor=labelcolor):
             head_width = max_head_width
             head_length = max_head_length
 
-        fc = colors[pair]
-        ec = ec or fc
-
-        x_scale, y_scale = deltas[pair]
-        x_pos, y_pos = positions[pair]
-        plt.arrow(x_pos, y_pos, x_scale * length, y_scale * length,
-                  fc=fc, ec=ec, alpha=alpha, width=width,
-                  head_width=head_width, head_length=head_length,
-                  **arrow_params)
-
-        # figure out coordinates for text
+        fc = colors[pair[0]]
+
+        cp0 = coords[pair[0]]
+        cp1 = coords[pair[1]]
+        # unit vector in arrow direction
+        delta = cos, sin = (cp1 - cp0) / np.hypot(*(cp1 - cp0))
+        x_pos, y_pos = (
+            (cp0 + cp1) / 2  # midpoint
+            - delta * length / 2  # half the arrow length
+            + np.array([-sin, cos]) * arrow_sep  # shift outwards by arrow_sep
+        )
+        ax.arrow(
+            x_pos, y_pos, cos * length, sin * length,
+            fc=fc, ec=ec or fc, alpha=alpha, width=width,
+            head_width=head_width, head_length=head_length, shape=shape,
+            length_includes_head=True,
+            **kwargs
+        )
+
+        # figure out coordinates for text:
         # if drawing relative to base: x and y are same as for arrow
         # dx and dy are one arrow width left and up
-        # need to rotate based on direction of arrow, use x_scale and y_scale
-        # as sin x and cos x?
-        sx, cx = y_scale, x_scale
-
-        where = label_positions[pair]
-        if where == 'left':
-            orig_position = 3 * np.array([[max_arrow_width, max_arrow_width]])
-        elif where == 'absolute':
-            orig_position = np.array([[max_arrow_length / 2.0,
-                                       3 * max_arrow_width]])
-        elif where == 'right':
-            orig_position = np.array([[length - 3 * max_arrow_width,
-                                       3 * max_arrow_width]])
-        elif where == 'center':
-            orig_position = np.array([[length / 2.0, 3 * max_arrow_width]])
-        else:
-            raise ValueError("Got unknown position parameter %s" % where)
-
-        M = np.array([[cx, sx], [-sx, cx]])
-        coords = np.dot(orig_position, M) + [[x_pos, y_pos]]
-        x, y = np.ravel(coords)
-        orig_label = rate_labels[pair]
-        label = r'$%s_{_{\mathrm{%s}}}$' % (orig_label[0], orig_label[1:])
-
-        plt.text(x, y, label, size=label_text_size, ha='center', va='center',
-                 color=labelcolor or fc)
-
-    for p in sorted(positions):
-        draw_arrow(p)
-
-
-# test data
-all_on_max = dict([(i, 1) for i in 'TCAG'] +
-                  [(i + j, 0.6) for i in 'TCAG' for j in 'TCAG'])
-
-realistic_data = {
-    'A': 0.4,
-    'T': 0.3,
-    'G': 0.5,
-    'C': 0.2,
-    'AT': 0.4,
-    'AC': 0.3,
-    'AG': 0.2,
-    'TA': 0.2,
-    'TC': 0.3,
-    'TG': 0.4,
-    'CT': 0.2,
-    'CG': 0.3,
-    'CA': 0.2,
-    'GA': 0.1,
-    'GT': 0.4,
-    'GC': 0.1}
-
-extreme_data = {
-    'A': 0.75,
-    'T': 0.10,
-    'G': 0.10,
-    'C': 0.05,
-    'AT': 0.6,
-    'AC': 0.3,
-    'AG': 0.1,
-    'TA': 0.02,
-    'TC': 0.3,
-    'TG': 0.01,
-    'CT': 0.2,
-    'CG': 0.5,
-    'CA': 0.2,
-    'GA': 0.1,
-    'GT': 0.4,
-    'GC': 0.2}
-
-sample_data = {
-    'A': 0.2137,
-    'T': 0.3541,
-    'G': 0.1946,
-    'C': 0.2376,
-    'AT': 0.0228,
-    'AC': 0.0684,
-    'AG': 0.2056,
-    'TA': 0.0315,
-    'TC': 0.0629,
-    'TG': 0.0315,
-    'CT': 0.1355,
-    'CG': 0.0401,
-    'CA': 0.0703,
-    'GA': 0.1824,
-    'GT': 0.0387,
-    'GC': 0.1106}
+        orig_positions = {
+            'base': [3 * max_arrow_width, 3 * max_arrow_width],
+            'center': [length / 2, 3 * max_arrow_width],
+            'tip': [length - 3 * max_arrow_width, 3 * max_arrow_width],
+        }
+        # for diagonal arrows, put the label at the arrow base
+        # for vertical or horizontal arrows, center the label
+        where = 'base' if (cp0 != cp1).all() else 'center'
+        # rotate based on direction of arrow (cos, sin)
+        M = [[cos, -sin], [sin, cos]]
+        x, y = np.dot(M, orig_positions[where]) + [x_pos, y_pos]
+        label = r'$r_{_{\mathrm{%s}}}$' % (pair,)
+        ax.text(x, y, label, size=label_text_size, ha='center', va='center',
+                color=labelcolor or fc)
 
 
 if __name__ == '__main__':
-    from sys import argv
-    d = None
-    if len(argv) > 1:
-        if argv[1] == 'full':
-            d = all_on_max
-            scaled = False
-        elif argv[1] == 'extreme':
-            d = extreme_data
-            scaled = False
-        elif argv[1] == 'realistic':
-            d = realistic_data
-            scaled = False
-        elif argv[1] == 'sample':
-            d = sample_data
-            scaled = True
-    if d is None:
-        d = all_on_max
-        scaled = False
-    if len(argv) > 2:
-        display = argv[2]
-    else:
-        display = 'length'
+    data = {  # test data
+        'A': 0.4, 'T': 0.3, 'G': 0.6, 'C': 0.2,
+        'AT': 0.4, 'AC': 0.3, 'AG': 0.2,
+        'TA': 0.2, 'TC': 0.3, 'TG': 0.4,
+        'CT': 0.2, 'CG': 0.3, 'CA': 0.2,
+        'GA': 0.1, 'GT': 0.4, 'GC': 0.1,
+    }
 
     size = 4
-    plt.figure(figsize=(size, size))
+    fig = plt.figure(figsize=(3 * size, size), constrained_layout=True)
+    axs = fig.subplot_mosaic([["length", "width", "alpha"]])
 
-    make_arrow_plot(d, display=display, linewidth=0.001, edgecolor=None,
-                    normalize_data=scaled, head_starts_at_zero=True, size=size)
+    for display, ax in axs.items():
+        make_arrow_graph(
+            ax, data, display=display, linewidth=0.001, edgecolor=None,
+            normalize_data=True, size=size)
 
     plt.show()
diff --git a/examples/text_labels_and_annotations/arrow_simple_demo.py b/examples/text_labels_and_annotations/arrow_simple_demo.py
deleted file mode 100644
index c8a07ee204d3..000000000000
--- a/examples/text_labels_and_annotations/arrow_simple_demo.py
+++ /dev/null
@@ -1,11 +0,0 @@
-"""
-=================
-Arrow Simple Demo
-=================
-
-"""
-import matplotlib.pyplot as plt
-
-ax = plt.axes()
-ax.arrow(0, 0, 0.5, 0.5, head_width=0.05, head_length=0.1, fc='k', ec='k')
-plt.show()
diff --git a/examples/text_labels_and_annotations/custom_legends.py b/examples/text_labels_and_annotations/custom_legends.py
index e9f840fe768f..7f4ca07398f4 100644
--- a/examples/text_labels_and_annotations/custom_legends.py
+++ b/examples/text_labels_and_annotations/custom_legends.py
@@ -19,7 +19,8 @@
 and call ``ax.legend()``, you will get the following:
 """
 # sphinx_gallery_thumbnail_number = 2
-from matplotlib import rcParams, cycler
+import matplotlib as mpl
+from matplotlib import cycler
 import matplotlib.pyplot as plt
 import numpy as np
 
@@ -29,7 +30,7 @@
 N = 10
 data = (np.geomspace(1, 10, 100) + np.random.randn(N, 100)).T
 cmap = plt.cm.coolwarm
-rcParams['axes.prop_cycle'] = cycler(color=cmap(np.linspace(0, 1, N)))
+mpl.rcParams['axes.prop_cycle'] = cycler(color=cmap(np.linspace(0, 1, N)))
 
 fig, ax = plt.subplots()
 lines = ax.plot(data)
diff --git a/examples/text_labels_and_annotations/date.py b/examples/text_labels_and_annotations/date.py
index c8287fffcdc6..5ce94a5d876c 100644
--- a/examples/text_labels_and_annotations/date.py
+++ b/examples/text_labels_and_annotations/date.py
@@ -3,66 +3,61 @@
 Date tick labels
 ================
 
-Show how to make date plots in Matplotlib using date tick locators and
-formatters.  See :doc:`/gallery/ticks_and_spines/major_minor_demo` for more
-information on controlling major and minor ticks.
-
 Matplotlib date plotting is done by converting date instances into
 days since an epoch (by default 1970-01-01T00:00:00). The
 :mod:`matplotlib.dates` module provides the converter functions `.date2num`
-and `.num2date`, which convert `datetime.datetime` and `numpy.datetime64`
+and `.num2date` that convert `datetime.datetime` and `numpy.datetime64`
 objects to and from Matplotlib's internal representation.  These data
-types are registered with with the unit conversion mechanism described in
+types are registered with the unit conversion mechanism described in
 :mod:`matplotlib.units`, so the conversion happens automatically for the user.
 The registration process also sets the default tick ``locator`` and
 ``formatter`` for the axis to be `~.matplotlib.dates.AutoDateLocator` and
-`~.matplotlib.dates.AutoDateFormatter`.  These can be changed manually with
-`.Axis.set_major_locator` and `.Axis.set_major_formatter`; see for example
-:doc:`/gallery/ticks_and_spines/date_demo_convert`.
-
-An alternative formatter is the `~.matplotlib.dates.ConciseDateFormatter`
-as described at :doc:`/gallery/ticks_and_spines/date_concise_formatter`,
-which often removes the need to rotate the tick labels.
+`~.matplotlib.dates.AutoDateFormatter`.
+
+An alternative formatter is the `~.dates.ConciseDateFormatter`,
+used in the second ``Axes`` below (see
+:doc:`/gallery/ticks/date_concise_formatter`), which often removes the need to
+rotate the tick labels. The last ``Axes`` formats the dates manually, using
+`~.dates.DateFormatter` to format the dates using the format strings documented
+at `datetime.date.strftime`.
 """
 
-import numpy as np
 import matplotlib.pyplot as plt
 import matplotlib.dates as mdates
 import matplotlib.cbook as cbook
 
-# Load a numpy structured array from yahoo csv data with fields date, open,
-# close, volume, adj_close from the mpl-data/example directory.  This array
-# stores the date as an np.datetime64 with a day unit ('D') in the 'date'
-# column.
+# Load a numpy record array from yahoo csv data with fields date, open, high,
+# low, close, volume, adj_close from the mpl-data/sample_data directory. The
+# record array stores the date as an np.datetime64 with a day unit ('D') in
+# the date column.
 data = cbook.get_sample_data('goog.npz', np_load=True)['price_data']
 
-fig, ax = plt.subplots()
-ax.plot('date', 'adj_close', data=data)
-
-# Major ticks every 6 months.
-fmt_half_year = mdates.MonthLocator(interval=6)
-ax.xaxis.set_major_locator(fmt_half_year)
-
-# Minor ticks every month.
-fmt_month = mdates.MonthLocator()
-ax.xaxis.set_minor_locator(fmt_month)
-
+fig, axs = plt.subplots(3, 1, figsize=(6.4, 7), constrained_layout=True)
+# common to all three:
+for ax in axs:
+    ax.plot('date', 'adj_close', data=data)
+    # Major ticks every half year, minor ticks every month,
+    ax.xaxis.set_major_locator(mdates.MonthLocator(bymonth=(1, 7)))
+    ax.xaxis.set_minor_locator(mdates.MonthLocator())
+    ax.grid(True)
+    ax.set_ylabel(r'Price [\$]')
+
+# different formats:
+ax = axs[0]
+ax.set_title('DefaultFormatter', loc='left', y=0.85, x=0.02, fontsize='medium')
+
+ax = axs[1]
+ax.set_title('ConciseFormatter', loc='left', y=0.85, x=0.02, fontsize='medium')
+ax.xaxis.set_major_formatter(
+    mdates.ConciseDateFormatter(ax.xaxis.get_major_locator()))
+
+ax = axs[2]
+ax.set_title('Manual DateFormatter', loc='left', y=0.85, x=0.02,
+             fontsize='medium')
 # Text in the x axis will be displayed in 'YYYY-mm' format.
-ax.xaxis.set_major_formatter(mdates.DateFormatter('%Y-%m'))
-
-# Round to nearest years.
-datemin = np.datetime64(data['date'][0], 'Y')
-datemax = np.datetime64(data['date'][-1], 'Y') + np.timedelta64(1, 'Y')
-ax.set_xlim(datemin, datemax)
-
-# Format the coords message box, i.e. the numbers displayed as the cursor moves
-# across the axes within the interactive GUI.
-ax.format_xdata = mdates.DateFormatter('%Y-%m')
-ax.format_ydata = lambda x: f'${x:.2f}'  # Format the price.
-ax.grid(True)
-
-# Rotates and right aligns the x labels, and moves the bottom of the
-# axes up to make room for them.
-fig.autofmt_xdate()
+ax.xaxis.set_major_formatter(mdates.DateFormatter('%Y-%b'))
+# Rotates and right-aligns the x labels so they don't crowd each other.
+for label in ax.get_xticklabels(which='major'):
+    label.set(rotation=30, horizontalalignment='right')
 
 plt.show()
diff --git a/examples/text_labels_and_annotations/date_index_formatter.py b/examples/text_labels_and_annotations/date_index_formatter.py
deleted file mode 100644
index 55cc81b75131..000000000000
--- a/examples/text_labels_and_annotations/date_index_formatter.py
+++ /dev/null
@@ -1,60 +0,0 @@
-"""
-=====================================
-Custom tick formatter for time series
-=====================================
-
-When plotting time series, e.g., financial time series, one often wants
-to leave out days on which there is no data, i.e. weekends.  The example
-below shows how to use an 'index formatter' to achieve the desired plot
-"""
-import numpy as np
-import matplotlib.pyplot as plt
-import matplotlib.cbook as cbook
-
-# Load a numpy record array from yahoo csv data with fields date, open, close,
-# volume, adj_close from the mpl-data/example directory. The record array
-# stores the date as an np.datetime64 with a day unit ('D') in the date column.
-r = (cbook.get_sample_data('goog.npz', np_load=True)['price_data']
-     .view(np.recarray))
-r = r[-30:]  # get the last 30 days
-
-# first we'll do it the default way, with gaps on weekends
-fig, (ax1, ax2) = plt.subplots(ncols=2, figsize=(8, 4))
-ax1.plot(r.date, r.adj_close, 'o-')
-ax1.set_title("Default")
-fig.autofmt_xdate()
-
-# next we'll write a custom formatter
-N = len(r)
-ind = np.arange(N)  # the evenly spaced plot indices
-
-
-def format_date(x, pos=None):
-    thisind = np.clip(int(x + 0.5), 0, N - 1)
-    return r.date[thisind].item().strftime('%Y-%m-%d')
-
-
-ax2.plot(ind, r.adj_close, 'o-')
-# Use automatic FuncFormatter creation
-ax2.xaxis.set_major_formatter(format_date)
-ax2.set_title("Custom tick formatter")
-fig.autofmt_xdate()
-
-plt.show()
-
-
-#############################################################################
-#
-# ------------
-#
-# References
-# """"""""""
-#
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.pyplot.subplots
-matplotlib.axis.Axis.set_major_formatter
-matplotlib.cbook.get_sample_data
-matplotlib.ticker.FuncFormatter
diff --git a/examples/text_labels_and_annotations/demo_annotation_box.py b/examples/text_labels_and_annotations/demo_annotation_box.py
index 51cf88d07b07..44dff1b87d31 100644
--- a/examples/text_labels_and_annotations/demo_annotation_box.py
+++ b/examples/text_labels_and_annotations/demo_annotation_box.py
@@ -1,13 +1,12 @@
 """
 ===================
-Demo Annotation Box
+AnnotationBbox demo
 ===================
 
-The AnnotationBbox Artist creates an annotation using an OffsetBox. This
-example demonstrates three different OffsetBoxes: TextArea, DrawingArea and
-OffsetImage. AnnotationBbox gives more fine-grained control than using the axes
-method annotate.
-
+`.AnnotationBbox` creates an annotation using an `.OffsetBox`, and
+provides more fine-grained control than `.Axes.annotate`.  This example
+demonstrates the use of AnnotationBbox together with three different
+OffsetBoxes: `.TextArea`, `.DrawingArea`, and `.OffsetImage`.
 """
 
 import matplotlib.pyplot as plt
@@ -104,20 +103,16 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods and classes is shown in this
-# example:
-
-Circle
-TextArea
-DrawingArea
-OffsetImage
-AnnotationBbox
-get_sample_data
-plt.subplots
-plt.imread
-plt.show
+#    - `matplotlib.patches.Circle`
+#    - `matplotlib.offsetbox.TextArea`
+#    - `matplotlib.offsetbox.DrawingArea`
+#    - `matplotlib.offsetbox.OffsetImage`
+#    - `matplotlib.offsetbox.AnnotationBbox`
+#    - `matplotlib.cbook.get_sample_data`
+#    - `matplotlib.pyplot.subplots`
+#    - `matplotlib.pyplot.imread`
diff --git a/examples/text_labels_and_annotations/demo_text_path.py b/examples/text_labels_and_annotations/demo_text_path.py
index 460670d79dae..3d23e047fd90 100644
--- a/examples/text_labels_and_annotations/demo_text_path.py
+++ b/examples/text_labels_and_annotations/demo_text_path.py
@@ -46,8 +46,6 @@ def draw(self, renderer=None):
 
 if __name__ == "__main__":
 
-    usetex = plt.rcParams["text.usetex"]
-
     fig, (ax1, ax2) = plt.subplots(2)
 
     # EXAMPLE 1
@@ -68,30 +66,28 @@ def draw(self, renderer=None):
     ax1.add_artist(ao)
 
     # another text
-    from matplotlib.patches import PathPatch
-    if usetex:
-        r = r"\mbox{textpath supports mathtext \& \TeX}"
-    else:
-        r = r"textpath supports mathtext & TeX"
-
-    text_path = TextPath((0, 0), r, size=20, usetex=usetex)
-
-    p1 = PathPatch(text_path, ec="w", lw=3, fc="w", alpha=0.9,
-                   transform=IdentityTransform())
-    p2 = PathPatch(text_path, ec="none", fc="k",
-                   transform=IdentityTransform())
-
-    offsetbox2 = AuxTransformBox(IdentityTransform())
-    offsetbox2.add_artist(p1)
-    offsetbox2.add_artist(p2)
-
-    ab = AnnotationBbox(offsetbox2, (0.95, 0.05),
-                        xycoords='axes fraction',
-                        boxcoords="offset points",
-                        box_alignment=(1., 0.),
-                        frameon=False
-                        )
-    ax1.add_artist(ab)
+    for usetex, ypos, string in [
+            (False, 0.25, r"textpath supports mathtext"),
+            (True, 0.05, r"textpath supports \TeX"),
+    ]:
+        text_path = TextPath((0, 0), string, size=20, usetex=usetex)
+
+        p1 = PathPatch(text_path, ec="w", lw=3, fc="w", alpha=0.9,
+                       transform=IdentityTransform())
+        p2 = PathPatch(text_path, ec="none", fc="k",
+                       transform=IdentityTransform())
+
+        offsetbox2 = AuxTransformBox(IdentityTransform())
+        offsetbox2.add_artist(p1)
+        offsetbox2.add_artist(p2)
+
+        ab = AnnotationBbox(offsetbox2, (0.95, ypos),
+                            xycoords='axes fraction',
+                            boxcoords="offset points",
+                            box_alignment=(1., 0.),
+                            frameon=False,
+                            )
+        ax1.add_artist(ab)
 
     ax1.imshow([[0, 1, 2], [1, 2, 3]], cmap=plt.cm.gist_gray_r,
                interpolation="bilinear", aspect="auto")
@@ -100,32 +96,34 @@ def draw(self, renderer=None):
 
     arr = np.arange(256).reshape(1, 256) / 256
 
-    if usetex:
-        s = (r"$\displaystyle\left[\sum_{n=1}^\infty"
-             r"\frac{-e^{i\pi}}{2^n}\right]$!")
-    else:
-        s = r"$\left[\sum_{n=1}^\infty\frac{-e^{i\pi}}{2^n}\right]$!"
-    text_path = TextPath((0, 0), s, size=40, usetex=usetex)
-    text_patch = PathClippedImagePatch(text_path, arr, ec="none",
-                                       transform=IdentityTransform())
-
-    shadow1 = Shadow(text_patch, 1, -1, fc="none", ec="0.6", lw=3)
-    shadow2 = Shadow(text_patch, 1, -1, fc="0.3", ec="none")
-
-    # make offset box
-    offsetbox = AuxTransformBox(IdentityTransform())
-    offsetbox.add_artist(shadow1)
-    offsetbox.add_artist(shadow2)
-    offsetbox.add_artist(text_patch)
-
-    # place the anchored offset box using AnnotationBbox
-    ab = AnnotationBbox(offsetbox, (0.5, 0.5),
-                        xycoords='data',
-                        boxcoords="offset points",
-                        box_alignment=(0.5, 0.5),
-                        )
-
-    ax2.add_artist(ab)
+    for usetex, xpos, string in [
+            (False, 0.25,
+             r"$\left[\sum_{n=1}^\infty\frac{-e^{i\pi}}{2^n}\right]$!"),
+            (True, 0.75,
+             r"$\displaystyle\left[\sum_{n=1}^\infty"
+             r"\frac{-e^{i\pi}}{2^n}\right]$!"),
+    ]:
+        text_path = TextPath((0, 0), string, size=40, usetex=usetex)
+        text_patch = PathClippedImagePatch(text_path, arr, ec="none",
+                                           transform=IdentityTransform())
+
+        shadow1 = Shadow(text_patch, 1, -1, fc="none", ec="0.6", lw=3)
+        shadow2 = Shadow(text_patch, 1, -1, fc="0.3", ec="none")
+
+        # make offset box
+        offsetbox = AuxTransformBox(IdentityTransform())
+        offsetbox.add_artist(shadow1)
+        offsetbox.add_artist(shadow2)
+        offsetbox.add_artist(text_patch)
+
+        # place the anchored offset box using AnnotationBbox
+        ab = AnnotationBbox(offsetbox, (xpos, 0.5),
+                            xycoords='data',
+                            boxcoords="offset points",
+                            box_alignment=(0.5, 0.5),
+                            )
+
+        ax2.add_artist(ab)
 
     ax2.set_xlim(0, 1)
     ax2.set_ylim(0, 1)
diff --git a/examples/text_labels_and_annotations/demo_text_rotation_mode.py b/examples/text_labels_and_annotations/demo_text_rotation_mode.py
index bbe1639706ed..690dca6ad4ef 100644
--- a/examples/text_labels_and_annotations/demo_text_rotation_mode.py
+++ b/examples/text_labels_and_annotations/demo_text_rotation_mode.py
@@ -17,73 +17,70 @@
   the bounding box of the rotated text.
 - ``rotation_mode='anchor'`` aligns the unrotated text and then rotates the
   text around the point of alignment.
-
 """
+
 import matplotlib.pyplot as plt
-from mpl_toolkits.axes_grid1.axes_grid import ImageGrid
 
 
-def test_rotation_mode(fig, mode, subplot_location):
+def test_rotation_mode(fig, mode):
     ha_list = ["left", "center", "right"]
     va_list = ["top", "center", "baseline", "bottom"]
-    grid = ImageGrid(fig, subplot_location,
-                     nrows_ncols=(len(va_list), len(ha_list)),
-                     share_all=True, aspect=True, cbar_mode=None)
+    axs = fig.subplots(len(va_list), len(ha_list), sharex=True, sharey=True,
+                       subplot_kw=dict(aspect=1),
+                       gridspec_kw=dict(hspace=0, wspace=0))
 
     # labels and title
-    for ha, ax in zip(ha_list, grid.axes_row[-1]):
-        ax.axis["bottom"].label.set_text(ha)
-    for va, ax in zip(va_list, grid.axes_column[0]):
-        ax.axis["left"].label.set_text(va)
-    grid.axes_row[0][1].set_title(f"rotation_mode='{mode}'", size="large")
+    for ha, ax in zip(ha_list, axs[-1, :]):
+        ax.set_xlabel(ha)
+    for va, ax in zip(va_list, axs[:, 0]):
+        ax.set_ylabel(va)
+    axs[0, 1].set_title(f"rotation_mode='{mode}'", size="large")
 
-    if mode == "default":
-        kw = dict()
-    else:
-        kw = dict(
-            bbox=dict(boxstyle="square,pad=0.", ec="none", fc="C1", alpha=0.3))
+    kw = (
+        {} if mode == "default" else
+        {"bbox": dict(boxstyle="square,pad=0.", ec="none", fc="C1", alpha=0.3)}
+    )
+
+    texts = {}
 
     # use a different text alignment in each axes
-    texts = []
-    for (va, ha), ax in zip([(x, y) for x in va_list for y in ha_list], grid):
-        # prepare axes layout
-        for axis in ax.axis.values():
-            axis.toggle(ticks=False, ticklabels=False)
-        ax.axvline(0.5, color="skyblue", zorder=0)
-        ax.axhline(0.5, color="skyblue", zorder=0)
-        ax.plot(0.5, 0.5, color="C0", marker="o", zorder=1)
-
-        # add text with rotation and alignment settings
-        tx = ax.text(0.5, 0.5, "Tpg",
-                     size="x-large", rotation=40,
-                     horizontalalignment=ha, verticalalignment=va,
-                     rotation_mode=mode, **kw)
-        texts.append(tx)
+    for i, va in enumerate(va_list):
+        for j, ha in enumerate(ha_list):
+            ax = axs[i, j]
+            # prepare axes layout
+            ax.set(xticks=[], yticks=[])
+            ax.axvline(0.5, color="skyblue", zorder=0)
+            ax.axhline(0.5, color="skyblue", zorder=0)
+            ax.plot(0.5, 0.5, color="C0", marker="o", zorder=1)
+            # add text with rotation and alignment settings
+            tx = ax.text(0.5, 0.5, "Tpg",
+                         size="x-large", rotation=40,
+                         horizontalalignment=ha, verticalalignment=va,
+                         rotation_mode=mode, **kw)
+            texts[ax] = tx
 
     if mode == "default":
         # highlight bbox
         fig.canvas.draw()
-        for ax, tx in zip(grid, texts):
-            bb = tx.get_window_extent().transformed(ax.transData.inverted())
+        for ax, text in texts.items():
+            bb = text.get_window_extent().transformed(ax.transData.inverted())
             rect = plt.Rectangle((bb.x0, bb.y0), bb.width, bb.height,
                                  facecolor="C1", alpha=0.3, zorder=2)
             ax.add_patch(rect)
 
 
-fig = plt.figure(figsize=(8, 6))
-test_rotation_mode(fig, "default", 121)
-test_rotation_mode(fig, "anchor", 122)
+fig = plt.figure(figsize=(8, 5))
+subfigs = fig.subfigures(1, 2)
+test_rotation_mode(subfigs[0], "default")
+test_rotation_mode(subfigs[1], "anchor")
 plt.show()
 
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following method is shown in this example:
-
-import matplotlib
-matplotlib.axes.Axes.text
+#    - `matplotlib.axes.Axes.text` / `matplotlib.pyplot.text`
diff --git a/examples/text_labels_and_annotations/fancyarrow_demo.py b/examples/text_labels_and_annotations/fancyarrow_demo.py
index d7ee56c33566..12bf39ee57b6 100644
--- a/examples/text_labels_and_annotations/fancyarrow_demo.py
+++ b/examples/text_labels_and_annotations/fancyarrow_demo.py
@@ -4,69 +4,60 @@
 ================================
 
 Overview of the arrow styles available in `~.Axes.annotate`.
-
 """
+
+import inspect
+import re
+import itertools
+
 import matplotlib.patches as mpatches
 import matplotlib.pyplot as plt
 
 styles = mpatches.ArrowStyle.get_styles()
-
 ncol = 2
 nrow = (len(styles) + 1) // ncol
-figheight = (nrow + 0.5)
-fig = plt.figure(figsize=(4 * ncol / 1.5, figheight / 1.5))
-fontsize = 0.2 * 70
-
-
-ax = fig.add_axes([0, 0, 1, 1], frameon=False, aspect=1.)
-
-ax.set_xlim(0, 4 * ncol)
-ax.set_ylim(0, figheight)
-
-
-def to_texstring(s):
-    s = s.replace("<", r"$<$")
-    s = s.replace(">", r"$>$")
-    s = s.replace("|", r"$|$")
-    return s
-
-
-for i, (stylename, styleclass) in enumerate(sorted(styles.items())):
-    x = 3.2 + (i // nrow) * 4
-    y = (figheight - 0.7 - i % nrow)  # /figheight
-    p = mpatches.Circle((x, y), 0.2)
-    ax.add_patch(p)
-
-    ax.annotate(to_texstring(stylename), (x, y),
-                (x - 1.2, y),
-                ha="right", va="center",
-                size=fontsize,
-                arrowprops=dict(arrowstyle=stylename,
-                                patchB=p,
-                                shrinkA=5,
-                                shrinkB=5,
-                                fc="k", ec="k",
-                                connectionstyle="arc3,rad=-0.05",
-                                ),
+axs = (plt.figure(figsize=(4 * ncol, 1 + nrow))
+       .add_gridspec(1 + nrow, ncol,
+                     wspace=.7, left=.1, right=.9, bottom=0, top=1).subplots())
+for ax in axs.flat:
+    ax.set_axis_off()
+for ax in axs[0, :]:
+    ax.text(0, .5, "arrowstyle",
+            transform=ax.transAxes, size="large", color="tab:blue",
+            horizontalalignment="center", verticalalignment="center")
+    ax.text(.35, .5, "default parameters",
+            transform=ax.transAxes,
+            horizontalalignment="left", verticalalignment="center")
+for ax, (stylename, stylecls) in zip(axs[1:, :].T.flat, styles.items()):
+    l, = ax.plot(.25, .5, "ok", transform=ax.transAxes)
+    ax.annotate(stylename, (.25, .5), (-0.1, .5),
+                xycoords="axes fraction", textcoords="axes fraction",
+                size="large", color="tab:blue",
+                horizontalalignment="center", verticalalignment="center",
+                arrowprops=dict(
+                    arrowstyle=stylename, connectionstyle="arc3,rad=-0.05",
+                    color="k", shrinkA=5, shrinkB=5, patchB=l,
+                ),
                 bbox=dict(boxstyle="square", fc="w"))
-
-ax.xaxis.set_visible(False)
-ax.yaxis.set_visible(False)
+    # wrap at every nth comma (n = 1 or 2, depending on text length)
+    s = str(inspect.signature(stylecls))[1:-1]
+    n = 2 if s.count(',') > 3 else 1
+    ax.text(.35, .5,
+            re.sub(', ', lambda m, c=itertools.count(1): m.group()
+                   if next(c) % n else '\n', s),
+            transform=ax.transAxes,
+            horizontalalignment="left", verticalalignment="center")
 
 plt.show()
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.patches
-matplotlib.patches.ArrowStyle
-matplotlib.patches.ArrowStyle.get_styles
-matplotlib.axes.Axes.annotate
+#    - `matplotlib.patches`
+#    - `matplotlib.patches.ArrowStyle`
+#    - ``matplotlib.patches.ArrowStyle.get_styles``
+#    - `matplotlib.axes.Axes.annotate`
diff --git a/examples/text_labels_and_annotations/figlegend_demo.py b/examples/text_labels_and_annotations/figlegend_demo.py
index 674b7627f09f..6fc31235f634 100644
--- a/examples/text_labels_and_annotations/figlegend_demo.py
+++ b/examples/text_labels_and_annotations/figlegend_demo.py
@@ -23,8 +23,8 @@
 l3, = axs[1].plot(x, y3, color='tab:green')
 l4, = axs[1].plot(x, y4, color='tab:red', marker='^')
 
-fig.legend((l1, l2), ('Line 1', 'Line 2'), 'upper left')
-fig.legend((l3, l4), ('Line 3', 'Line 4'), 'upper right')
+fig.legend((l1, l2), ('Line 1', 'Line 2'), loc='upper left')
+fig.legend((l3, l4), ('Line 3', 'Line 4'), loc='upper right')
 
 plt.tight_layout()
 plt.show()
diff --git a/examples/text_labels_and_annotations/font_family_rc.py b/examples/text_labels_and_annotations/font_family_rc.py
new file mode 100644
index 000000000000..d840a8575920
--- /dev/null
+++ b/examples/text_labels_and_annotations/font_family_rc.py
@@ -0,0 +1,73 @@
+"""
+===========================
+Configuring the font family
+===========================
+
+You can explicitly set which font family is picked up, either by specifying
+family names of fonts installed on user's system, or generic-families
+(e.g., 'serif', 'sans-serif', 'monospace', 'fantasy' or 'cursive'),
+or a combination of both.
+(see :doc:`font tutorial </tutorials/text/text_props>`)
+
+In the example below, we are overriding the default sans-serif generic family
+to include a specific (Tahoma) font. (Note that the best way to achieve this
+would simply be to prepend 'Tahoma' in 'font.family')
+
+The default family is set with the font.family rcparam,
+e.g. ::
+
+  rcParams['font.family'] = 'sans-serif'
+
+and for the font.family you set a list of font styles to try to find
+in order::
+
+  rcParams['font.sans-serif'] = ['Tahoma', 'DejaVu Sans',
+                                 'Lucida Grande', 'Verdana']
+
+.. redirect-from:: /gallery/font_family_rc_sgskip
+
+
+
+The font font.family defaults are OS dependent and can be viewed with
+"""
+import matplotlib.pyplot as plt
+
+print(plt.rcParams["font.sans-serif"][0])
+print(plt.rcParams["font.monospace"][0])
+
+
+#################################################################
+# Choose default sans-serif font
+
+def print_text(text):
+    fig, ax = plt.subplots(figsize=(6, 1), facecolor="#eefade")
+    ax.text(0.5, 0.5, text, ha='center', va='center', size=40)
+    ax.axis("off")
+    plt.show()
+
+
+plt.rcParams["font.family"] = "sans-serif"
+print_text("Hello World! 01")
+
+
+#################################################################
+# Choose sans-serif font and specify to it to "Nimbus Sans"
+
+plt.rcParams["font.family"] = "sans-serif"
+plt.rcParams["font.sans-serif"] = ["Nimbus Sans"]
+print_text("Hello World! 02")
+
+
+##################################################################
+# Choose default monospace font
+
+plt.rcParams["font.family"] = "monospace"
+print_text("Hello World! 03")
+
+
+###################################################################
+# Choose monospace font and specify to it to "FreeMono"
+
+plt.rcParams["font.family"] = "monospace"
+plt.rcParams["font.monospace"] = ["FreeMono"]
+print_text("Hello World! 04")
diff --git a/examples/text_labels_and_annotations/font_family_rc_sgskip.py b/examples/text_labels_and_annotations/font_family_rc_sgskip.py
deleted file mode 100644
index 1eada97fb7e2..000000000000
--- a/examples/text_labels_and_annotations/font_family_rc_sgskip.py
+++ /dev/null
@@ -1,31 +0,0 @@
-"""
-===========================
-Configuring the font family
-===========================
-
-You can explicitly set which font family is picked up for a given font
-style (e.g., 'serif', 'sans-serif', or 'monospace').
-
-In the example below, we only allow one font family (Tahoma) for the
-sans-serif font style.  The default family is set with the font.family rcparam,
-e.g. ::
-
-  rcParams['font.family'] = 'sans-serif'
-
-and for the font.family you set a list of font styles to try to find
-in order::
-
-  rcParams['font.sans-serif'] = ['Tahoma', 'DejaVu Sans',
-                                 'Lucida Grande', 'Verdana']
-"""
-
-from matplotlib import rcParams
-rcParams['font.family'] = 'sans-serif'
-rcParams['font.sans-serif'] = ['Tahoma']
-import matplotlib.pyplot as plt
-
-fig, ax = plt.subplots()
-ax.plot([1, 2, 3], label='test')
-
-ax.legend()
-plt.show()
diff --git a/examples/text_labels_and_annotations/font_file.py b/examples/text_labels_and_annotations/font_file.py
index 6f3071b87b61..7d808a122231 100644
--- a/examples/text_labels_and_annotations/font_file.py
+++ b/examples/text_labels_and_annotations/font_file.py
@@ -12,7 +12,7 @@
 Matplotlib.
 
 For a more flexible solution, see
-:doc:`/gallery/text_labels_and_annotations/font_family_rc_sgskip` and
+:doc:`/gallery/text_labels_and_annotations/font_family_rc` and
 :doc:`/gallery/text_labels_and_annotations/fonts_demo`.
 """
 
@@ -32,13 +32,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.set_title
+#    - `matplotlib.axes.Axes.set_title`
diff --git a/examples/text_labels_and_annotations/fonts_demo.py b/examples/text_labels_and_annotations/fonts_demo.py
index 1aa38dcbcf38..112c6b0b4ce9 100644
--- a/examples/text_labels_and_annotations/fonts_demo.py
+++ b/examples/text_labels_and_annotations/fonts_demo.py
@@ -5,95 +5,66 @@
 
 Set font properties using setters.
 
-See :doc:`fonts_demo_kw` to achieve the same effect using kwargs.
+See :doc:`fonts_demo_kw` to achieve the same effect using keyword arguments.
 """
 
 from matplotlib.font_manager import FontProperties
 import matplotlib.pyplot as plt
 
-font0 = FontProperties()
+fig = plt.figure()
 alignment = {'horizontalalignment': 'center', 'verticalalignment': 'baseline'}
-# Show family options
-
-families = ['serif', 'sans-serif', 'cursive', 'fantasy', 'monospace']
-
-font1 = font0.copy()
-font1.set_size('large')
-
-t = plt.figtext(0.1, 0.9, 'family', fontproperties=font1, **alignment)
-
 yp = [0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2]
+heading_font = FontProperties(size='large')
 
+# Show family options
+fig.text(0.1, 0.9, 'family', fontproperties=heading_font, **alignment)
+families = ['serif', 'sans-serif', 'cursive', 'fantasy', 'monospace']
 for k, family in enumerate(families):
-    font = font0.copy()
+    font = FontProperties()
     font.set_family(family)
-    t = plt.figtext(0.1, yp[k], family, fontproperties=font, **alignment)
+    fig.text(0.1, yp[k], family, fontproperties=font, **alignment)
 
 # Show style options
-
 styles = ['normal', 'italic', 'oblique']
-
-t = plt.figtext(0.3, 0.9, 'style', fontproperties=font1, **alignment)
-
+fig.text(0.3, 0.9, 'style', fontproperties=heading_font, **alignment)
 for k, style in enumerate(styles):
-    font = font0.copy()
+    font = FontProperties()
     font.set_family('sans-serif')
     font.set_style(style)
-    t = plt.figtext(0.3, yp[k], style, fontproperties=font, **alignment)
+    fig.text(0.3, yp[k], style, fontproperties=font, **alignment)
 
 # Show variant options
-
 variants = ['normal', 'small-caps']
-
-t = plt.figtext(0.5, 0.9, 'variant', fontproperties=font1, **alignment)
-
+fig.text(0.5, 0.9, 'variant', fontproperties=heading_font, **alignment)
 for k, variant in enumerate(variants):
-    font = font0.copy()
+    font = FontProperties()
     font.set_family('serif')
     font.set_variant(variant)
-    t = plt.figtext(0.5, yp[k], variant, fontproperties=font, **alignment)
+    fig.text(0.5, yp[k], variant, fontproperties=font, **alignment)
 
 # Show weight options
-
 weights = ['light', 'normal', 'medium', 'semibold', 'bold', 'heavy', 'black']
-
-t = plt.figtext(0.7, 0.9, 'weight', fontproperties=font1, **alignment)
-
+fig.text(0.7, 0.9, 'weight', fontproperties=heading_font, **alignment)
 for k, weight in enumerate(weights):
-    font = font0.copy()
+    font = FontProperties()
     font.set_weight(weight)
-    t = plt.figtext(0.7, yp[k], weight, fontproperties=font, **alignment)
+    fig.text(0.7, yp[k], weight, fontproperties=font, **alignment)
 
 # Show size options
-
-sizes = ['xx-small', 'x-small', 'small', 'medium', 'large',
-         'x-large', 'xx-large']
-
-t = plt.figtext(0.9, 0.9, 'size', fontproperties=font1, **alignment)
-
+sizes = [
+    'xx-small', 'x-small', 'small', 'medium', 'large', 'x-large', 'xx-large']
+fig.text(0.9, 0.9, 'size', fontproperties=heading_font, **alignment)
 for k, size in enumerate(sizes):
-    font = font0.copy()
+    font = FontProperties()
     font.set_size(size)
-    t = plt.figtext(0.9, yp[k], size, fontproperties=font, **alignment)
+    fig.text(0.9, yp[k], size, fontproperties=font, **alignment)
 
 # Show bold italic
-
-font = font0.copy()
-font.set_style('italic')
-font.set_weight('bold')
-font.set_size('x-small')
-t = plt.figtext(0.3, 0.1, 'bold italic', fontproperties=font, **alignment)
-
-font = font0.copy()
-font.set_style('italic')
-font.set_weight('bold')
-font.set_size('medium')
-t = plt.figtext(0.3, 0.2, 'bold italic', fontproperties=font, **alignment)
-
-font = font0.copy()
-font.set_style('italic')
-font.set_weight('bold')
-font.set_size('x-large')
-t = plt.figtext(-0.4, 0.3, 'bold italic', fontproperties=font, **alignment)
+font = FontProperties(style='italic', weight='bold', size='x-small')
+fig.text(0.3, 0.1, 'bold italic', fontproperties=font, **alignment)
+font = FontProperties(style='italic', weight='bold', size='medium')
+fig.text(0.3, 0.2, 'bold italic', fontproperties=font, **alignment)
+font = FontProperties(style='italic', weight='bold', size='x-large')
+fig.text(0.3, 0.3, 'bold italic', fontproperties=font, **alignment)
 
 plt.show()
diff --git a/examples/text_labels_and_annotations/fonts_demo_kw.py b/examples/text_labels_and_annotations/fonts_demo_kw.py
index afbdf1504431..ca19222f878d 100644
--- a/examples/text_labels_and_annotations/fonts_demo_kw.py
+++ b/examples/text_labels_and_annotations/fonts_demo_kw.py
@@ -1,76 +1,56 @@
 """
-===================
-Fonts demo (kwargs)
-===================
+==============================
+Fonts demo (keyword arguments)
+==============================
 
-Set font properties using kwargs.
+Set font properties using keyword arguments.
 
 See :doc:`fonts_demo` to achieve the same effect using setters.
 """
 
 import matplotlib.pyplot as plt
 
+fig = plt.figure()
 alignment = {'horizontalalignment': 'center', 'verticalalignment': 'baseline'}
+yp = [0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2]
 
 # Show family options
-
+fig.text(0.1, 0.9, 'family', size='large', **alignment)
 families = ['serif', 'sans-serif', 'cursive', 'fantasy', 'monospace']
-
-t = plt.figtext(0.1, 0.9, 'family', size='large', **alignment)
-
-yp = [0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2]
-
 for k, family in enumerate(families):
-    t = plt.figtext(0.1, yp[k], family, family=family, **alignment)
+    fig.text(0.1, yp[k], family, family=family, **alignment)
 
 # Show style options
-
+fig.text(0.3, 0.9, 'style', **alignment)
 styles = ['normal', 'italic', 'oblique']
-
-t = plt.figtext(0.3, 0.9, 'style', **alignment)
-
 for k, style in enumerate(styles):
-    t = plt.figtext(0.3, yp[k], style, family='sans-serif', style=style,
-                    **alignment)
+    fig.text(0.3, yp[k], style, family='sans-serif', style=style, **alignment)
 
 # Show variant options
-
+fig.text(0.5, 0.9, 'variant', **alignment)
 variants = ['normal', 'small-caps']
-
-t = plt.figtext(0.5, 0.9, 'variant', **alignment)
-
 for k, variant in enumerate(variants):
-    t = plt.figtext(0.5, yp[k], variant, family='serif', variant=variant,
-                    **alignment)
+    fig.text(0.5, yp[k], variant, family='serif', variant=variant, **alignment)
 
 # Show weight options
-
+fig.text(0.7, 0.9, 'weight', **alignment)
 weights = ['light', 'normal', 'medium', 'semibold', 'bold', 'heavy', 'black']
-
-t = plt.figtext(0.7, 0.9, 'weight', **alignment)
-
 for k, weight in enumerate(weights):
-    t = plt.figtext(0.7, yp[k], weight, weight=weight, **alignment)
+    fig.text(0.7, yp[k], weight, weight=weight, **alignment)
 
 # Show size options
-
-sizes = ['xx-small', 'x-small', 'small', 'medium', 'large',
-         'x-large', 'xx-large']
-
-t = plt.figtext(0.9, 0.9, 'size', **alignment)
-
+fig.text(0.9, 0.9, 'size', **alignment)
+sizes = [
+    'xx-small', 'x-small', 'small', 'medium', 'large', 'x-large', 'xx-large']
 for k, size in enumerate(sizes):
-    t = plt.figtext(0.9, yp[k], size, size=size, **alignment)
+    fig.text(0.9, yp[k], size, size=size, **alignment)
 
 # Show bold italic
-t = plt.figtext(0.3, 0.1, 'bold italic', style='italic',
-                weight='bold', size='x-small',
-                **alignment)
-t = plt.figtext(0.3, 0.2, 'bold italic',
-                style='italic', weight='bold', size='medium',
-                **alignment)
-t = plt.figtext(0.3, 0.3, 'bold italic',
-                style='italic', weight='bold', size='x-large',
-                **alignment)
+fig.text(0.3, 0.1, 'bold italic',
+         style='italic', weight='bold', size='x-small', **alignment)
+fig.text(0.3, 0.2, 'bold italic',
+         style='italic', weight='bold', size='medium', **alignment)
+fig.text(0.3, 0.3, 'bold italic',
+         style='italic', weight='bold', size='x-large', **alignment)
 
 plt.show()
diff --git a/examples/text_labels_and_annotations/label_subplots.py b/examples/text_labels_and_annotations/label_subplots.py
new file mode 100644
index 000000000000..974b775a9a97
--- /dev/null
+++ b/examples/text_labels_and_annotations/label_subplots.py
@@ -0,0 +1,70 @@
+"""
+==================
+Labelling subplots
+==================
+
+Labelling subplots is relatively straightforward, and varies,
+so Matplotlib does not have a general method for doing this.
+
+Simplest is putting the label inside the axes.  Note, here
+we use `.pyplot.subplot_mosaic`, and use the subplot labels
+as keys for the subplots, which is a nice convenience.  However,
+the same method works with `.pyplot.subplots` or keys that are
+different than what you want to label the subplot with.
+"""
+
+import matplotlib.pyplot as plt
+import matplotlib.transforms as mtransforms
+
+fig, axs = plt.subplot_mosaic([['a)', 'c)'], ['b)', 'c)'], ['d)', 'd)']],
+                              constrained_layout=True)
+
+for label, ax in axs.items():
+    # label physical distance in and down:
+    trans = mtransforms.ScaledTranslation(10/72, -5/72, fig.dpi_scale_trans)
+    ax.text(0.0, 1.0, label, transform=ax.transAxes + trans,
+            fontsize='medium', verticalalignment='top', fontfamily='serif',
+            bbox=dict(facecolor='0.7', edgecolor='none', pad=3.0))
+
+plt.show()
+
+##############################################################################
+# We may prefer the labels outside the axes, but still aligned
+# with each other, in which case we use a slightly different transform:
+
+fig, axs = plt.subplot_mosaic([['a)', 'c)'], ['b)', 'c)'], ['d)', 'd)']],
+                              constrained_layout=True)
+
+for label, ax in axs.items():
+    # label physical distance to the left and up:
+    trans = mtransforms.ScaledTranslation(-20/72, 7/72, fig.dpi_scale_trans)
+    ax.text(0.0, 1.0, label, transform=ax.transAxes + trans,
+            fontsize='medium', va='bottom', fontfamily='serif')
+
+plt.show()
+
+##############################################################################
+# If we want it aligned with the title, either incorporate in the title or
+# use the *loc* keyword argument:
+
+fig, axs = plt.subplot_mosaic([['a)', 'c)'], ['b)', 'c)'], ['d)', 'd)']],
+                              constrained_layout=True)
+
+for label, ax in axs.items():
+    ax.set_title('Normal Title', fontstyle='italic')
+    ax.set_title(label, fontfamily='serif', loc='left', fontsize='medium')
+
+plt.show()
+
+#############################################################################
+#
+# .. admonition:: References
+#
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
+#
+#    - `matplotlib.figure.Figure.subplot_mosaic` /
+#      `matplotlib.pyplot.subplot_mosaic`
+#    - `matplotlib.axes.Axes.set_title`
+#    - `matplotlib.axes.Axes.text`
+#    - `matplotlib.transforms.ScaledTranslation`
diff --git a/examples/text_labels_and_annotations/legend.py b/examples/text_labels_and_annotations/legend.py
index 7e6162a51c25..33d8af3204e4 100644
--- a/examples/text_labels_and_annotations/legend.py
+++ b/examples/text_labels_and_annotations/legend.py
@@ -30,16 +30,10 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.plot
-matplotlib.pyplot.plot
-matplotlib.axes.Axes.legend
-matplotlib.pyplot.legend
+#    - `matplotlib.axes.Axes.plot` / `matplotlib.pyplot.plot`
+#    - `matplotlib.axes.Axes.legend` / `matplotlib.pyplot.legend`
diff --git a/examples/text_labels_and_annotations/line_with_text.py b/examples/text_labels_and_annotations/line_with_text.py
index ffacab587f92..51f1a27d98ec 100644
--- a/examples/text_labels_and_annotations/line_with_text.py
+++ b/examples/text_labels_and_annotations/line_with_text.py
@@ -55,7 +55,6 @@ def draw(self, renderer):
 fig, ax = plt.subplots()
 x, y = np.random.rand(2, 20)
 line = MyLine(x, y, mfc='red', ms=12, label='line label')
-#line.text.set_text('line label')
 line.text.set_color('red')
 line.text.set_fontsize(16)
 
@@ -65,27 +64,23 @@ def draw(self, renderer):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.lines
-matplotlib.lines.Line2D
-matplotlib.lines.Line2D.set_data
-matplotlib.artist
-matplotlib.artist.Artist
-matplotlib.artist.Artist.draw
-matplotlib.artist.Artist.set_transform
-matplotlib.text
-matplotlib.text.Text
-matplotlib.text.Text.set_color
-matplotlib.text.Text.set_fontsize
-matplotlib.text.Text.set_position
-matplotlib.axes.Axes.add_line
-matplotlib.transforms
-matplotlib.transforms.Affine2D
+#    - `matplotlib.lines`
+#    - `matplotlib.lines.Line2D`
+#    - `matplotlib.lines.Line2D.set_data`
+#    - `matplotlib.artist`
+#    - `matplotlib.artist.Artist`
+#    - `matplotlib.artist.Artist.draw`
+#    - `matplotlib.artist.Artist.set_transform`
+#    - `matplotlib.text`
+#    - `matplotlib.text.Text`
+#    - `matplotlib.text.Text.set_color`
+#    - `matplotlib.text.Text.set_fontsize`
+#    - `matplotlib.text.Text.set_position`
+#    - `matplotlib.axes.Axes.add_line`
+#    - `matplotlib.transforms`
+#    - `matplotlib.transforms.Affine2D`
diff --git a/examples/text_labels_and_annotations/mathtext_asarray.py b/examples/text_labels_and_annotations/mathtext_asarray.py
index b40ba3ce18e4..224634046c68 100644
--- a/examples/text_labels_and_annotations/mathtext_asarray.py
+++ b/examples/text_labels_and_annotations/mathtext_asarray.py
@@ -21,10 +21,11 @@ def text_to_rgba(s, *, dpi, **kwargs):
     # (If desired, one can also directly save the image to the filesystem.)
     fig = Figure(facecolor="none")
     fig.text(0, 0, s, **kwargs)
-    buf = BytesIO()
-    fig.savefig(buf, dpi=dpi, format="png", bbox_inches="tight", pad_inches=0)
-    buf.seek(0)
-    rgba = plt.imread(buf)
+    with BytesIO() as buf:
+        fig.savefig(buf, dpi=dpi, format="png", bbox_inches="tight",
+                    pad_inches=0)
+        buf.seek(0)
+        rgba = plt.imread(buf)
     return rgba
 
 
@@ -47,16 +48,12 @@ def text_to_rgba(s, *, dpi, **kwargs):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.figure.Figure.figimage
-matplotlib.figure.Figure.text
-matplotlib.transforms.IdentityTransform
-matplotlib.image.imread
+#    - `matplotlib.figure.Figure.figimage`
+#    - `matplotlib.figure.Figure.text`
+#    - `matplotlib.transforms.IdentityTransform`
+#    - `matplotlib.image.imread`
diff --git a/examples/text_labels_and_annotations/mathtext_examples.py b/examples/text_labels_and_annotations/mathtext_examples.py
index 6d8be49599cf..838b68bb2ca2 100644
--- a/examples/text_labels_and_annotations/mathtext_examples.py
+++ b/examples/text_labels_and_annotations/mathtext_examples.py
@@ -5,121 +5,116 @@
 
 Selected features of Matplotlib's math rendering engine.
 """
-import matplotlib.pyplot as plt
+import re
 import subprocess
 import sys
-import re
 
-# Selection of features following "Writing mathematical expressions" tutorial
-mathtext_titles = {
-    0: "Header demo",
-    1: "Subscripts and superscripts",
-    2: "Fractions, binomials and stacked numbers",
-    3: "Radicals",
-    4: "Fonts",
-    5: "Accents",
-    6: "Greek, Hebrew",
-    7: "Delimiters, functions and Symbols"}
-n_lines = len(mathtext_titles)
+import matplotlib.pyplot as plt
 
-# Randomly picked examples
-mathext_demos = {
-    0: r"$W^{3\beta}_{\delta_1 \rho_1 \sigma_2} = "
-    r"U^{3\beta}_{\delta_1 \rho_1} + \frac{1}{8 \pi 2} "
-    r"\int^{\alpha_2}_{\alpha_2} d \alpha^\prime_2 \left[\frac{ "
-    r"U^{2\beta}_{\delta_1 \rho_1} - \alpha^\prime_2U^{1\beta}_"
-    r"{\rho_1 \sigma_2} }{U^{0\beta}_{\rho_1 \sigma_2}}\right]$",
 
-    1: r"$\alpha_i > \beta_i,\ "
-    r"\alpha_{i+1}^j = {\rm sin}(2\pi f_j t_i) e^{-5 t_i/\tau},\ "
-    r"\ldots$",
+# Selection of features following "Writing mathematical expressions" tutorial,
+# with randomly picked examples.
+mathtext_demos = {
+    "Header demo":
+        r"$W^{3\beta}_{\delta_1 \rho_1 \sigma_2} = "
+        r"U^{3\beta}_{\delta_1 \rho_1} + \frac{1}{8 \pi 2} "
+        r"\int^{\alpha_2}_{\alpha_2} d \alpha^\prime_2 \left[\frac{ "
+        r"U^{2\beta}_{\delta_1 \rho_1} - \alpha^\prime_2U^{1\beta}_"
+        r"{\rho_1 \sigma_2} }{U^{0\beta}_{\rho_1 \sigma_2}}\right]$",
 
-    2: r"$\frac{3}{4},\ \binom{3}{4},\ \genfrac{}{}{0}{}{3}{4},\ "
-    r"\left(\frac{5 - \frac{1}{x}}{4}\right),\ \ldots$",
+    "Subscripts and superscripts":
+        r"$\alpha_i > \beta_i,\ "
+        r"\alpha_{i+1}^j = {\rm sin}(2\pi f_j t_i) e^{-5 t_i/\tau},\ "
+        r"\ldots$",
 
-    3: r"$\sqrt{2},\ \sqrt[3]{x},\ \ldots$",
+    "Fractions, binomials and stacked numbers":
+        r"$\frac{3}{4},\ \binom{3}{4},\ \genfrac{}{}{0}{}{3}{4},\ "
+        r"\left(\frac{5 - \frac{1}{x}}{4}\right),\ \ldots$",
 
-    4: r"$\mathrm{Roman}\ , \ \mathit{Italic}\ , \ \mathtt{Typewriter} \ "
-    r"\mathrm{or}\ \mathcal{CALLIGRAPHY}$",
+    "Radicals":
+        r"$\sqrt{2},\ \sqrt[3]{x},\ \ldots$",
 
-    5: r"$\acute a,\ \bar a,\ \breve a,\ \dot a,\ \ddot a, \ \grave a, \ "
-    r"\hat a,\ \tilde a,\ \vec a,\ \widehat{xyz},\ \widetilde{xyz},\ "
-    r"\ldots$",
+    "Fonts":
+        r"$\mathrm{Roman}\ , \ \mathit{Italic}\ , \ \mathtt{Typewriter} \ "
+        r"\mathrm{or}\ \mathcal{CALLIGRAPHY}$",
 
-    6: r"$\alpha,\ \beta,\ \chi,\ \delta,\ \lambda,\ \mu,\ "
-    r"\Delta,\ \Gamma,\ \Omega,\ \Phi,\ \Pi,\ \Upsilon,\ \nabla,\ "
-    r"\aleph,\ \beth,\ \daleth,\ \gimel,\ \ldots$",
+    "Accents":
+        r"$\acute a,\ \bar a,\ \breve a,\ \dot a,\ \ddot a, \ \grave a, \ "
+        r"\hat a,\ \tilde a,\ \vec a,\ \widehat{xyz},\ \widetilde{xyz},\ "
+        r"\ldots$",
 
-    7: r"$\coprod,\ \int,\ \oint,\ \prod,\ \sum,\ "
-    r"\log,\ \sin,\ \approx,\ \oplus,\ \star,\ \varpropto,\ "
-    r"\infty,\ \partial,\ \Re,\ \leftrightsquigarrow, \ \ldots$"}
+    "Greek, Hebrew":
+        r"$\alpha,\ \beta,\ \chi,\ \delta,\ \lambda,\ \mu,\ "
+        r"\Delta,\ \Gamma,\ \Omega,\ \Phi,\ \Pi,\ \Upsilon,\ \nabla,\ "
+        r"\aleph,\ \beth,\ \daleth,\ \gimel,\ \ldots$",
+
+    "Delimiters, functions and Symbols":
+        r"$\coprod,\ \int,\ \oint,\ \prod,\ \sum,\ "
+        r"\log,\ \sin,\ \approx,\ \oplus,\ \star,\ \varpropto,\ "
+        r"\infty,\ \partial,\ \Re,\ \leftrightsquigarrow, \ \ldots$",
+}
+n_lines = len(mathtext_demos)
 
 
 def doall():
     # Colors used in Matplotlib online documentation.
-    mpl_blue_rvb = (191. / 255., 209. / 256., 212. / 255.)
-    mpl_orange_rvb = (202. / 255., 121. / 256., 0. / 255.)
-    mpl_grey_rvb = (51. / 255., 51. / 255., 51. / 255.)
+    mpl_grey_rgb = (51 / 255, 51 / 255, 51 / 255)
 
     # Creating figure and axis.
-    plt.figure(figsize=(6, 7))
-    plt.axes([0.01, 0.01, 0.98, 0.90], facecolor="white", frameon=True)
-    plt.gca().set_xlim(0., 1.)
-    plt.gca().set_ylim(0., 1.)
-    plt.gca().set_title("Matplotlib's math rendering engine",
-                        color=mpl_grey_rvb, fontsize=14, weight='bold')
-    plt.gca().set_xticklabels("", visible=False)
-    plt.gca().set_yticklabels("", visible=False)
+    fig = plt.figure(figsize=(7, 7))
+    ax = fig.add_axes([0.01, 0.01, 0.98, 0.90],
+                      facecolor="white", frameon=True)
+    ax.set_xlim(0, 1)
+    ax.set_ylim(0, 1)
+    ax.set_title("Matplotlib's math rendering engine",
+                 color=mpl_grey_rgb, fontsize=14, weight='bold')
+    ax.set_xticks([])
+    ax.set_yticks([])
 
     # Gap between lines in axes coords
     line_axesfrac = 1 / n_lines
 
-    # Plotting header demonstration formula
-    full_demo = mathext_demos[0]
-    plt.annotate(full_demo,
-                 xy=(0.5, 1. - 0.59 * line_axesfrac),
-                 color=mpl_orange_rvb, ha='center', fontsize=20)
+    # Plot header demonstration formula.
+    full_demo = mathtext_demos['Header demo']
+    ax.annotate(full_demo,
+                xy=(0.5, 1. - 0.59 * line_axesfrac),
+                color='tab:orange', ha='center', fontsize=20)
+
+    # Plot feature demonstration formulae.
+    for i_line, (title, demo) in enumerate(mathtext_demos.items()):
+        print(i_line, demo)
+        if i_line == 0:
+            continue
 
-    # Plotting features demonstration formulae
-    for i_line in range(1, n_lines):
         baseline = 1 - i_line * line_axesfrac
         baseline_next = baseline - line_axesfrac
-        title = mathtext_titles[i_line] + ":"
-        fill_color = ['white', mpl_blue_rvb][i_line % 2]
-        plt.fill_between([0., 1.], [baseline, baseline],
-                         [baseline_next, baseline_next],
-                         color=fill_color, alpha=0.5)
-        plt.annotate(title,
-                     xy=(0.07, baseline - 0.3 * line_axesfrac),
-                     color=mpl_grey_rvb, weight='bold')
-        demo = mathext_demos[i_line]
-        plt.annotate(demo,
-                     xy=(0.05, baseline - 0.75 * line_axesfrac),
-                     color=mpl_grey_rvb, fontsize=16)
-
-    for i in range(n_lines):
-        s = mathext_demos[i]
-        print(i, s)
+        fill_color = ['white', 'tab:blue'][i_line % 2]
+        ax.axhspan(baseline, baseline_next, color=fill_color, alpha=0.2)
+        ax.annotate(f'{title}:',
+                    xy=(0.06, baseline - 0.3 * line_axesfrac),
+                    color=mpl_grey_rgb, weight='bold')
+        ax.annotate(demo,
+                    xy=(0.04, baseline - 0.75 * line_axesfrac),
+                    color=mpl_grey_rgb, fontsize=16)
+
     plt.show()
 
 
 if '--latex' in sys.argv:
     # Run: python mathtext_examples.py --latex
     # Need amsmath and amssymb packages.
-    fd = open("mathtext_examples.ltx", "w")
-    fd.write("\\documentclass{article}\n")
-    fd.write("\\usepackage{amsmath, amssymb}\n")
-    fd.write("\\begin{document}\n")
-    fd.write("\\begin{enumerate}\n")
-
-    for i in range(n_lines):
-        s = mathext_demos[i]
-        s = re.sub(r"(?<!\\)\$", "$$", s)
-        fd.write("\\item %s\n" % s)
-
-    fd.write("\\end{enumerate}\n")
-    fd.write("\\end{document}\n")
-    fd.close()
+    with open("mathtext_examples.ltx", "w") as fd:
+        fd.write("\\documentclass{article}\n")
+        fd.write("\\usepackage{amsmath, amssymb}\n")
+        fd.write("\\begin{document}\n")
+        fd.write("\\begin{enumerate}\n")
+
+        for s in mathtext_demos.values():
+            s = re.sub(r"(?<!\\)\$", "$$", s)
+            fd.write("\\item %s\n" % s)
+
+        fd.write("\\end{enumerate}\n")
+        fd.write("\\end{document}\n")
 
     subprocess.call(["pdflatex", "mathtext_examples.ltx"])
 else:
diff --git a/examples/text_labels_and_annotations/mathtext_fontfamily_example.py b/examples/text_labels_and_annotations/mathtext_fontfamily_example.py
index 2b417cfcac91..77095b00dee8 100644
--- a/examples/text_labels_and_annotations/mathtext_fontfamily_example.py
+++ b/examples/text_labels_and_annotations/mathtext_fontfamily_example.py
@@ -13,25 +13,26 @@
 
 import matplotlib.pyplot as plt
 
-plt.figure(figsize=(6, 5))
+
+fig, ax = plt.subplots(figsize=(6, 5))
 
 # A simple plot for the background.
-plt.plot(range(11), color="0.9")
+ax.plot(range(11), color="0.9")
 
 # A text mixing normal text and math text.
 msg = (r"Normal Text. $Text\ in\ math\ mode:\ "
        r"\int_{0}^{\infty } x^2 dx$")
 
 # Set the text in the plot.
-plt.text(1, 7, msg, size=12, math_fontfamily='cm')
+ax.text(1, 7, msg, size=12, math_fontfamily='cm')
 
 # Set another font for the next text.
-plt.text(1, 3, msg, size=12, math_fontfamily='dejavuserif')
+ax.text(1, 3, msg, size=12, math_fontfamily='dejavuserif')
 
 # *math_fontfamily* can be used in most places where there is text,
 # like in the title:
-plt.title(r"$Title\ in\ math\ mode:\ \int_{0}^{\infty } x^2 dx$",
-          math_fontfamily='stixsans', size=14)
+ax.set_title(r"$Title\ in\ math\ mode:\ \int_{0}^{\infty } x^2 dx$",
+             math_fontfamily='stixsans', size=14)
 
 # Note that the normal text is not changed by *math_fontfamily*.
 plt.show()
diff --git a/examples/text_labels_and_annotations/multiline.py b/examples/text_labels_and_annotations/multiline.py
index d0ca38b95232..2aa6fea8c1af 100644
--- a/examples/text_labels_and_annotations/multiline.py
+++ b/examples/text_labels_and_annotations/multiline.py
@@ -34,9 +34,9 @@
          va="baseline", ha="right", multialignment="left",
          bbox=dict(fc="none"))
 
-ax1.set_xticks([0.2, 0.4, 0.6, 0.8, 1.])
-ax1.set_xticklabels(["Jan\n2009", "Feb\n2009", "Mar\n2009", "Apr\n2009",
-                     "May\n2009"])
+ax1.set_xticks([0.2, 0.4, 0.6, 0.8, 1.],
+               labels=["Jan\n2009", "Feb\n2009", "Mar\n2009", "Apr\n2009",
+                       "May\n2009"])
 
 ax1.axhline(0.4)
 ax1.set_title("test line spacing for multiline text")
diff --git a/examples/text_labels_and_annotations/rainbow_text.py b/examples/text_labels_and_annotations/rainbow_text.py
index e66bef4b54af..9cec0bdc8f81 100644
--- a/examples/text_labels_and_annotations/rainbow_text.py
+++ b/examples/text_labels_and_annotations/rainbow_text.py
@@ -24,7 +24,7 @@
 """
 
 import matplotlib.pyplot as plt
-from matplotlib.transforms import Affine2D
+from matplotlib.transforms import Affine2D, offset_copy
 
 
 def rainbow_text(x, y, strings, colors, orientation='horizontal',
@@ -51,7 +51,8 @@ def rainbow_text(x, y, strings, colors, orientation='horizontal',
     if ax is None:
         ax = plt.gca()
     t = ax.transData
-    canvas = ax.figure.canvas
+    fig = ax.figure
+    canvas = fig.canvas
 
     assert orientation in ['horizontal', 'vertical']
     if orientation == 'vertical':
@@ -63,10 +64,16 @@ def rainbow_text(x, y, strings, colors, orientation='horizontal',
         # Need to draw to update the text position.
         text.draw(canvas.get_renderer())
         ex = text.get_window_extent()
+        # Convert window extent from pixels to inches
+        # to avoid issues displaying at different dpi
+        ex = fig.dpi_scale_trans.inverted().transform_bbox(ex)
+
         if orientation == 'horizontal':
-            t = text.get_transform() + Affine2D().translate(ex.width, 0)
+            t = text.get_transform() + \
+                offset_copy(Affine2D(), fig=fig, x=ex.width, y=0)
         else:
-            t = text.get_transform() + Affine2D().translate(0, ex.height)
+            t = text.get_transform() + \
+                offset_copy(Affine2D(), fig=fig, x=0, y=ex.height)
 
 
 words = "all unicorns poop rainbows ! ! !".split()
diff --git a/examples/text_labels_and_annotations/tex_demo.py b/examples/text_labels_and_annotations/tex_demo.py
index c467ecea955e..830058daf370 100644
--- a/examples/text_labels_and_annotations/tex_demo.py
+++ b/examples/text_labels_and_annotations/tex_demo.py
@@ -14,10 +14,10 @@
 """
 
 import numpy as np
-import matplotlib
-matplotlib.rcParams['text.usetex'] = True
 import matplotlib.pyplot as plt
 
+plt.rcParams['text.usetex'] = True
+
 
 t = np.linspace(0.0, 1.0, 100)
 s = np.cos(4 * np.pi * t) + 2
diff --git a/examples/text_labels_and_annotations/text_alignment.py b/examples/text_labels_and_annotations/text_alignment.py
index 836a75ae7920..a748481d5261 100644
--- a/examples/text_labels_and_annotations/text_alignment.py
+++ b/examples/text_labels_and_annotations/text_alignment.py
@@ -1,26 +1,64 @@
 """
-===================
-Precise text layout
-===================
+==============
+Text alignment
+==============
+
+Texts are aligned relative to their anchor point depending on the properties
+``horizontalalignment`` and ``verticalalignment``.
+
+.. redirect-from:: /gallery/pyplots/text_layout
+
+.. plot::
+
+    import matplotlib.pyplot as plt
+    import numpy as np
+
+    y = [0.22, 0.34, 0.5, 0.56, 0.78]
+    x = [0.17, 0.5, 0.855]
+    X, Y = np.meshgrid(x, y)
+
+    fig, ax = plt.subplots(figsize=(6, 4), dpi=100)
+    ax.set(xlim=(0, 1), ylim=(0, 1), xticks=[], yticks=[])
+    ax.spines[:].set_visible(False)
+    ax.text(0.5, 0.5, 'plot', fontsize=128, ha='center', va='center', zorder=1)
+    ax.hlines(y, x[0], x[-1], color='grey')
+    ax.vlines(x, y[0], y[-1], color='grey')
+    ax.plot(X.ravel(), Y.ravel(), 'o')
+    pad_x = 0.02
+    pad_y = 0.04
+    ax.text(x[0] - pad_x, y[0], 'bottom', ha='right', va='center')
+    ax.text(x[0] - pad_x, y[1], 'baseline', ha='right', va='center')
+    ax.text(x[0] - pad_x, y[2], 'center', ha='right', va='center')
+    ax.text(x[0] - pad_x, y[3], 'center_baseline', ha='right', va='center')
+    ax.text(x[0] - pad_x, y[4], 'top', ha='right', va='center')
+    ax.text(x[0], y[0] - pad_y, 'left', ha='center', va='top')
+    ax.text(x[1], y[0] - pad_y, 'center', ha='center', va='top')
+    ax.text(x[2], y[0] - pad_y, 'right', ha='center', va='top')
+    ax.set_xlabel('horizontalalignment', fontsize=14)
+    ax.set_ylabel('verticalalignment', fontsize=14, labelpad=35)
+    ax.set_title(
+        'Relative position of text anchor point depending on alignment')
+    plt.show()
 
-You can precisely layout text in data or axes coordinates.  This example shows
-you some of the alignment and rotation specifications for text layout.
 """
 
+#############################################################################
+# The following plot uses this to align text relative to a plotted rectangle.
+
 import matplotlib.pyplot as plt
 
+fig, ax = plt.subplots()
+
 # Build a rectangle in axes coords
 left, width = .25, .5
 bottom, height = .25, .5
 right = left + width
 top = bottom + height
-ax = plt.gca()
 p = plt.Rectangle((left, bottom), width, height, fill=False)
 p.set_transform(ax.transAxes)
 p.set_clip_on(False)
 ax.add_patch(p)
 
-
 ax.text(left, bottom, 'left top',
         horizontalalignment='left',
         verticalalignment='top',
@@ -75,6 +113,6 @@
         rotation=45,
         transform=ax.transAxes)
 
-plt.axis('off')
+ax.set_axis_off()
 
 plt.show()
diff --git a/examples/pyplots/text_commands.py b/examples/text_labels_and_annotations/text_commands.py
similarity index 62%
rename from examples/pyplots/text_commands.py
rename to examples/text_labels_and_annotations/text_commands.py
index e144baea1988..cb6d5413f8d4 100644
--- a/examples/pyplots/text_commands.py
+++ b/examples/text_labels_and_annotations/text_commands.py
@@ -4,6 +4,8 @@
 =============
 
 Plotting text of many different kinds.
+
+.. redirect-from:: /gallery/pyplots/text_commands
 """
 
 import matplotlib.pyplot as plt
@@ -23,7 +25,7 @@
 
 ax.text(2, 6, r'an equation: $E=mc^2$', fontsize=15)
 
-ax.text(3, 2, 'unicode: Institut f\374r Festk\366rperphysik')
+ax.text(3, 2, 'Unicode: Institut f\374r Festk\366rperphysik')
 
 ax.text(0.95, 0.01, 'colored text in axes coords',
         verticalalignment='bottom', horizontalalignment='right',
@@ -41,20 +43,16 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.figure.Figure.suptitle
-matplotlib.figure.Figure.add_subplot
-matplotlib.figure.Figure.subplots_adjust
-matplotlib.axes.Axes.set_title
-matplotlib.axes.Axes.set_xlabel
-matplotlib.axes.Axes.set_ylabel
-matplotlib.axes.Axes.text
-matplotlib.axes.Axes.annotate
+#    - `matplotlib.figure.Figure.suptitle`
+#    - `matplotlib.figure.Figure.add_subplot`
+#    - `matplotlib.figure.Figure.subplots_adjust`
+#    - `matplotlib.axes.Axes.set_title`
+#    - `matplotlib.axes.Axes.set_xlabel`
+#    - `matplotlib.axes.Axes.set_ylabel`
+#    - `matplotlib.axes.Axes.text`
+#    - `matplotlib.axes.Axes.annotate`
diff --git a/examples/text_labels_and_annotations/titles_demo.py b/examples/text_labels_and_annotations/titles_demo.py
index 266deb761971..57323aac38e3 100644
--- a/examples/text_labels_and_annotations/titles_demo.py
+++ b/examples/text_labels_and_annotations/titles_demo.py
@@ -38,8 +38,8 @@
 plt.show()
 
 ###########################################################################
-# Automatic positioning can be turned off by manually specifying the
-# *y* kwarg for the title or setting :rc:`axes.titley` in the rcParams.
+# Automatic positioning can be turned off by manually specifying the *y*
+# keyword argument for the title or setting :rc:`axes.titley` in the rcParams.
 
 fig, axs = plt.subplots(1, 2, constrained_layout=True)
 
diff --git a/examples/text_labels_and_annotations/usetex_baseline_test.py b/examples/text_labels_and_annotations/usetex_baseline_test.py
index 8f42ea8db2b8..f40808b9f83e 100644
--- a/examples/text_labels_and_annotations/usetex_baseline_test.py
+++ b/examples/text_labels_and_annotations/usetex_baseline_test.py
@@ -3,49 +3,17 @@
 Usetex Baseline Test
 ====================
 
-A test for :rc:`text.latex.preview`, a deprecated feature which relied
-on the preview.sty LaTeX package to properly align TeX baselines.  This
-feature has been deprecated as Matplotlib's dvi parser now computes baselines
-just as well as preview.sty; this example will be removed together with
-:rc:`text.latex.preview` after the deprecation elapses.
+Comparison of text baselines computed for mathtext and usetex.
 """
 
 import matplotlib.pyplot as plt
-import matplotlib.axes as maxes
 
 
 plt.rcParams.update({"mathtext.fontset": "cm", "mathtext.rm": "serif"})
-
-
-@maxes.subplot_class_factory
-class LatexPreviewSubplot(maxes.Axes):
-    """
-    A hackish way to simultaneously draw texts with text.latex.preview=True and
-    text.latex.preview=False in the same figure.  It does not work with the ps
-    backend.
-    """
-
-    def __init__(self, *args, preview=False, **kwargs):
-        self.preview = preview
-        super().__init__(*args, **kwargs)
-
-    def draw(self, renderer):
-        from matplotlib import _api  # internal, *do not use*
-        with _api.suppress_matplotlib_deprecation_warning():
-            with plt.rc_context({"text.latex.preview": self.preview}):
-                super().draw(renderer)
-
-
-def test_window_extent(ax, usetex, preview):
-
-    ax.xaxis.set_visible(False)
-    ax.yaxis.set_visible(False)
-
-    test_strings = ["lg", r"$\frac{1}{2}\pi$",
-                    r"$p^{3^A}$", r"$p_{3_2}$"]
-
+axs = plt.figure(figsize=(2 * 3, 6.5)).subplots(1, 2)
+for ax, usetex in zip(axs, [False, True]):
     ax.axvline(0, color="r")
-
+    test_strings = ["lg", r"$\frac{1}{2}\pi$", r"$p^{3^A}$", r"$p_{3_2}$"]
     for i, s in enumerate(test_strings):
         ax.axhline(i, color="r")
         ax.text(0., 3 - i, s,
@@ -53,26 +21,6 @@ def test_window_extent(ax, usetex, preview):
                 verticalalignment="baseline",
                 size=50,
                 bbox=dict(pad=0, ec="k", fc="none"))
-
-    ax.set_xlim(-0.1, 1.1)
-    ax.set_ylim(-.8, 3.9)
-
-    title = f"usetex={usetex}\n"
-    if usetex:
-        title += f"preview={preview}"
-    ax.set_title(title)
-
-
-fig = plt.figure(figsize=(2 * 3, 6.5))
-
-for i, usetex, preview in [[0, False, False],
-                           [1, True, False],
-                           [2, True, True]]:
-    ax = LatexPreviewSubplot(fig, 1, 3, i + 1, preview=preview)
-    fig.add_subplot(ax)
-    fig.subplots_adjust(top=0.85)
-
-    test_window_extent(ax, usetex=usetex, preview=preview)
-
-
+    ax.set(xlim=(-0.1, 1.1), ylim=(-.8, 3.9), xticks=[], yticks=[],
+           title=f"usetex={usetex}\n")
 plt.show()
diff --git a/examples/text_labels_and_annotations/usetex_fonteffects.py b/examples/text_labels_and_annotations/usetex_fonteffects.py
index 2b14a6336438..a289f3854ed7 100644
--- a/examples/text_labels_and_annotations/usetex_fonteffects.py
+++ b/examples/text_labels_and_annotations/usetex_fonteffects.py
@@ -15,12 +15,13 @@ def setfont(font):
 
 
 fig = plt.figure()
-for y, font, text in zip(range(5),
-                         ['ptmr8r', 'ptmri8r', 'ptmro8r',
-                          'ptmr8rn', 'ptmrr8re'],
-                         ['Nimbus Roman No9 L ' + x for x in
-                          ['', 'Italics (real italics for comparison)',
-                           '(slanted)', '(condensed)', '(extended)']]):
+for y, font, text in zip(
+    range(5),
+    ['ptmr8r', 'ptmri8r', 'ptmro8r', 'ptmr8rn', 'ptmrr8re'],
+    [f'Nimbus Roman No9 L {x}'
+     for x in ['', 'Italics (real italics for comparison)',
+               '(slanted)', '(condensed)', '(extended)']],
+):
     fig.text(.1, 1 - (y + 1) / 6, setfont(font) + text, usetex=True)
 
 fig.suptitle('Usetex font effects')
diff --git a/examples/text_labels_and_annotations/watermark_text.py b/examples/text_labels_and_annotations/watermark_text.py
index 77101a4df4fc..200a3c8dac15 100644
--- a/examples/text_labels_and_annotations/watermark_text.py
+++ b/examples/text_labels_and_annotations/watermark_text.py
@@ -18,19 +18,15 @@
 
 ax.text(0.5, 0.5, 'created with matplotlib', transform=ax.transAxes,
         fontsize=40, color='gray', alpha=0.5,
-        ha='center', va='center', rotation='30')
+        ha='center', va='center', rotation=30)
 
 plt.show()
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.figure.Figure.text
+#    - `matplotlib.figure.Figure.text`
diff --git a/examples/ticks/README.txt b/examples/ticks/README.txt
new file mode 100644
index 000000000000..82441a0d9ee7
--- /dev/null
+++ b/examples/ticks/README.txt
@@ -0,0 +1,4 @@
+.. _ticks_examples:
+
+Ticks
+=====
diff --git a/examples/ticks/auto_ticks.py b/examples/ticks/auto_ticks.py
new file mode 100644
index 000000000000..3ceaf415645b
--- /dev/null
+++ b/examples/ticks/auto_ticks.py
@@ -0,0 +1,48 @@
+"""
+====================================
+Automatically setting tick positions
+====================================
+
+Setting the behavior of tick auto-placement.
+
+By default, Matplotlib will choose the number of ticks and tick positions so
+that there is a reasonable number of ticks on the axis and they are located
+at "round" numbers.
+
+As a result, there may be no ticks on the edges of the plot.
+"""
+
+import matplotlib.pyplot as plt
+import numpy as np
+np.random.seed(19680801)
+
+fig, ax = plt.subplots()
+dots = np.linspace(0.3, 1.2, 10)
+X, Y = np.meshgrid(dots, dots)
+x, y = X.ravel(), Y.ravel()
+ax.scatter(x, y, c=x+y)
+plt.show()
+
+###############################################################################
+# If you want to keep ticks at round numbers, and also have ticks at the edges
+# you can switch :rc:`axes.autolimit_mode` to 'round_numbers'. This expands the
+# axis limits to the next round number.
+
+plt.rcParams['axes.autolimit_mode'] = 'round_numbers'
+
+# Note: The limits are calculated at draw-time. Therefore, when using
+# :rc:`axes.autolimit_mode` in a context manager, it is important that
+# the ``show()`` command is within the context.
+
+fig, ax = plt.subplots()
+ax.scatter(x, y, c=x+y)
+plt.show()
+
+###############################################################################
+# The round numbers autolimit_mode is still respected if you set an additional
+# margin around the data using `.Axes.set_xmargin` / `.Axes.set_ymargin`:
+
+fig, ax = plt.subplots()
+ax.scatter(x, y, c=x+y)
+ax.set_xmargin(0.8)
+plt.show()
diff --git a/examples/ticks_and_spines/centered_ticklabels.py b/examples/ticks/centered_ticklabels.py
similarity index 81%
rename from examples/ticks_and_spines/centered_ticklabels.py
rename to examples/ticks/centered_ticklabels.py
index 61431e3ab21c..34ab9e8b9083 100644
--- a/examples/ticks_and_spines/centered_ticklabels.py
+++ b/examples/ticks/centered_ticklabels.py
@@ -7,7 +7,7 @@
 'center', 'left', or 'right' can be controlled using the horizontal alignment
 property::
 
-    for label in ax.xaxis.get_xticklabels():
+    for label in ax.get_xticklabels():
         label.set_horizontalalignment('right')
 
 However there is no direct way to center the labels between ticks. To fake
@@ -23,7 +23,7 @@
 import matplotlib.ticker as ticker
 import matplotlib.pyplot as plt
 
-# load some financial data; Google's stock price
+# Load some financial data; Google's stock price
 r = (cbook.get_sample_data('goog.npz', np_load=True)['price_data']
      .view(np.recarray))
 r = r[-250:]  # get the last 250 days
@@ -38,11 +38,12 @@
 ax.xaxis.set_major_formatter(ticker.NullFormatter())
 ax.xaxis.set_minor_formatter(dates.DateFormatter('%b'))
 
-for tick in ax.xaxis.get_minor_ticks():
-    tick.tick1line.set_markersize(0)
-    tick.tick2line.set_markersize(0)
-    tick.label1.set_horizontalalignment('center')
+# Remove the tick lines
+ax.tick_params(axis='x', which='minor', tick1On=False, tick2On=False)
 
+# Align the minor tick label
+for label in ax.get_xticklabels(minor=True):
+    label.set_horizontalalignment('center')
 imid = len(r) // 2
 ax.set_xlabel(str(r.date[imid].item().year))
 plt.show()
diff --git a/examples/ticks_and_spines/colorbar_tick_labelling_demo.py b/examples/ticks/colorbar_tick_labelling_demo.py
similarity index 100%
rename from examples/ticks_and_spines/colorbar_tick_labelling_demo.py
rename to examples/ticks/colorbar_tick_labelling_demo.py
diff --git a/examples/ticks/custom_ticker1.py b/examples/ticks/custom_ticker1.py
new file mode 100644
index 000000000000..f3e0ec4ef3bf
--- /dev/null
+++ b/examples/ticks/custom_ticker1.py
@@ -0,0 +1,35 @@
+"""
+=============
+Custom Ticker
+=============
+
+The :mod:`matplotlib.ticker` module defines many preset tickers, but was
+primarily designed for extensibility, i.e., to support user customized ticking.
+
+In this example, a user defined function is used to format the ticks in
+millions of dollars on the y axis.
+"""
+
+import matplotlib.pyplot as plt
+
+
+def millions(x, pos):
+    """The two arguments are the value and tick position."""
+    return '${:1.1f}M'.format(x*1e-6)
+
+
+fig, ax = plt.subplots()
+# set_major_formatter internally creates a FuncFormatter from the callable.
+ax.yaxis.set_major_formatter(millions)
+money = [1.5e5, 2.5e6, 5.5e6, 2.0e7]
+ax.bar(['Bill', 'Fred', 'Mary', 'Sue'], money)
+plt.show()
+
+#############################################################################
+#
+# .. admonition:: References
+#
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
+#
+#    - `matplotlib.axis.Axis.set_major_formatter`
diff --git a/examples/ticks_and_spines/date_concise_formatter.py b/examples/ticks/date_concise_formatter.py
similarity index 98%
rename from examples/ticks_and_spines/date_concise_formatter.py
rename to examples/ticks/date_concise_formatter.py
index 0a6e53c39207..7a7089ac839d 100644
--- a/examples/ticks_and_spines/date_concise_formatter.py
+++ b/examples/ticks/date_concise_formatter.py
@@ -101,7 +101,7 @@
 # limits are mostly hours, we label Feb 4 00:00 as simply "Feb-4".
 #
 # Note that these format lists can also be passed to `.ConciseDateFormatter`
-# as optional kwargs.
+# as optional keyword arguments.
 #
 # Here we modify the labels to be "day month year", instead of the ISO
 # "year month day":
@@ -142,8 +142,8 @@
 # Registering a converter with localization
 # =========================================
 #
-# `.ConciseDateFormatter` doesn't have rcParams entries, but localization
-# can be accomplished by passing kwargs to `~.ConciseDateConverter` and
+# `.ConciseDateFormatter` doesn't have rcParams entries, but localization can
+# be accomplished by passing keyword arguments to `.ConciseDateConverter` and
 # registering the datatypes you will use with the units registry:
 
 import datetime
diff --git a/examples/ticks_and_spines/date_demo_convert.py b/examples/ticks/date_demo_convert.py
similarity index 97%
rename from examples/ticks_and_spines/date_demo_convert.py
rename to examples/ticks/date_demo_convert.py
index e1f266cbe09b..9d0b1695cb68 100644
--- a/examples/ticks_and_spines/date_demo_convert.py
+++ b/examples/ticks/date_demo_convert.py
@@ -17,7 +17,7 @@
 y = np.arange(len(dates))
 
 fig, ax = plt.subplots()
-ax.plot_date(dates, y ** 2)
+ax.plot(dates, y**2, 'o')
 
 # this is superfluous, since the autoscaler should get it right, but
 # use date2num and num2date to convert between dates and floats if
diff --git a/examples/ticks_and_spines/date_demo_rrule.py b/examples/ticks/date_demo_rrule.py
similarity index 98%
rename from examples/ticks_and_spines/date_demo_rrule.py
rename to examples/ticks/date_demo_rrule.py
index d358f5731048..c020a44c375b 100644
--- a/examples/ticks_and_spines/date_demo_rrule.py
+++ b/examples/ticks/date_demo_rrule.py
@@ -35,7 +35,7 @@
 
 
 fig, ax = plt.subplots()
-plt.plot_date(dates, s)
+plt.plot(dates, s, 'o')
 ax.xaxis.set_major_locator(loc)
 ax.xaxis.set_major_formatter(formatter)
 ax.xaxis.set_tick_params(rotation=30, labelsize=10)
diff --git a/examples/ticks/date_formatters_locators.py b/examples/ticks/date_formatters_locators.py
new file mode 100644
index 000000000000..9d765c238470
--- /dev/null
+++ b/examples/ticks/date_formatters_locators.py
@@ -0,0 +1,92 @@
+"""
+=================================
+Date tick locators and formatters
+=================================
+
+This example illustrates the usage and effect of the various date locators and
+formatters.
+"""
+
+import numpy as np
+import matplotlib.pyplot as plt
+import matplotlib.ticker as ticker
+from matplotlib.dates import (AutoDateLocator, YearLocator, MonthLocator,
+                              DayLocator, WeekdayLocator, HourLocator,
+                              MinuteLocator, SecondLocator, MicrosecondLocator,
+                              RRuleLocator, rrulewrapper, MONTHLY,
+                              MO, TU, WE, TH, FR, SA, SU, DateFormatter,
+                              AutoDateFormatter, ConciseDateFormatter)
+
+locators = [
+    ('AutoDateLocator(maxticks=8)', '2003-02-01', '%Y-%m'),
+    ('YearLocator(month=4)', '2003-02-01', '%Y-%m'),
+    ('MonthLocator(bymonth=[4,8,12])', '2003-02-01', '%Y-%m'),
+    ('DayLocator(interval=180)', '2003-02-01', '%Y-%m-%d'),
+    ('WeekdayLocator(byweekday=SU, interval=4)', '2000-07-01', '%a %Y-%m-%d'),
+    ('HourLocator(byhour=range(0,24,6))', '2000-02-04', '%H h'),
+    ('MinuteLocator(interval=15)', '2000-02-01 02:00', '%H:%M'),
+    ('SecondLocator(bysecond=(0,30))', '2000-02-01 00:02', '%H:%M:%S'),
+    ('MicrosecondLocator(interval=1000)', '2000-02-01 00:00:00.005', '%S.%f'),
+    ('RRuleLocator(rrulewrapper(freq=MONTHLY, \nbyweekday=(MO, TU, WE, TH,' +
+     ' FR), bysetpos=-1))', '2000-07-01', '%Y-%m-%d')
+]
+
+formatters = [
+    ('AutoDateFormatter(ax.xaxis.get_major_locator())'),
+    ('ConciseDateFormatter(ax.xaxis.get_major_locator())'),
+    ('DateFormatter("%b %Y")')
+]
+
+
+def plot_axis(ax, locator=None, xmax='2002-02-01', fmt=None, formatter=None):
+    """Set up common parameters for the Axes in the example."""
+    ax.spines.right.set_visible(False)
+    ax.spines.left.set_visible(False)
+    ax.spines.top.set_visible(False)
+    ax.yaxis.set_major_locator(ticker.NullLocator())
+    ax.tick_params(which='major', width=1.00, length=5)
+    ax.tick_params(which='minor', width=0.75, length=2.5)
+    ax.set_xlim(np.datetime64('2000-02-01'), np.datetime64(xmax))
+    if locator:
+        ax.xaxis.set_major_locator(eval(locator))
+        ax.xaxis.set_major_formatter(DateFormatter(fmt))
+    else:
+        ax.xaxis.set_major_formatter(eval(formatter))
+    ax.text(0.0, 0.2, locator or formatter, transform=ax.transAxes,
+            fontsize=14, fontname='Monospace', color='tab:blue')
+
+
+fig, ax = plt.subplots(len(locators), 1, figsize=(8, len(locators) * .8),
+                       layout='constrained')
+fig.suptitle('Date Locators')
+for i, loc in enumerate(locators):
+    plot_axis(ax[i], *loc)
+
+fig, ax = plt.subplots(len(formatters), 1, figsize=(8, len(formatters) * .8),
+                       layout='constrained')
+fig.suptitle('Date Formatters')
+for i, fmt in enumerate(formatters):
+    plot_axis(ax[i], formatter=fmt)
+
+
+#############################################################################
+#
+# .. admonition:: References
+#
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
+#
+#    - `matplotlib.dates.AutoDateLocator`
+#    - `matplotlib.dates.YearLocator`
+#    - `matplotlib.dates.MonthLocator`
+#    - `matplotlib.dates.DayLocator`
+#    - `matplotlib.dates.WeekdayLocator`
+#    - `matplotlib.dates.HourLocator`
+#    - `matplotlib.dates.MinuteLocator`
+#    - `matplotlib.dates.SecondLocator`
+#    - `matplotlib.dates.MicrosecondLocator`
+#    - `matplotlib.dates.RRuleLocator`
+#    - `matplotlib.dates.rrulewrapper`
+#    - `matplotlib.dates.DateFormatter`
+#    - `matplotlib.dates.AutoDateFormatter`
+#    - `matplotlib.dates.ConciseDateFormatter`
diff --git a/examples/ticks/date_index_formatter.py b/examples/ticks/date_index_formatter.py
new file mode 100644
index 000000000000..a2bf4b8796f9
--- /dev/null
+++ b/examples/ticks/date_index_formatter.py
@@ -0,0 +1,83 @@
+"""
+=====================================
+Custom tick formatter for time series
+=====================================
+
+.. redirect-from:: /gallery/text_labels_and_annotations/date_index_formatter
+.. redirect-from:: /gallery/ticks/date_index_formatter2
+
+When plotting daily data, e.g., financial time series, one often wants
+to leave out days on which there is no data, for instance weekends, so that
+the data are plotted at regular intervals without extra spaces for the days
+with no data.
+The example shows how to use an 'index formatter' to achieve the desired plot.
+"""
+
+import numpy as np
+import matplotlib.pyplot as plt
+import matplotlib.cbook as cbook
+import matplotlib.lines as ml
+from matplotlib.dates import DateFormatter, DayLocator
+from matplotlib.ticker import Formatter
+
+
+# Load a numpy record array from yahoo csv data with fields date, open, high,
+# low, close, volume, adj_close from the mpl-data/sample_data directory. The
+# record array stores the date as an np.datetime64 with a day unit ('D') in
+# the date column (``r.date``).
+r = (cbook.get_sample_data('goog.npz', np_load=True)['price_data']
+     .view(np.recarray))
+r = r[:9]  # get the first 9 days
+
+fig, (ax1, ax2) = plt.subplots(nrows=2, figsize=(6, 6),
+                               constrained_layout={'hspace': .15})
+
+# First we'll do it the default way, with gaps on weekends
+ax1.plot(r.date, r.adj_close, 'o-')
+
+# Highlight gaps in daily data
+gaps = np.flatnonzero(np.diff(r.date) > np.timedelta64(1, 'D'))
+for gap in r[['date', 'adj_close']][np.stack((gaps, gaps + 1)).T]:
+    ax1.plot(gap.date, gap.adj_close, 'w--', lw=2)
+ax1.legend(handles=[ml.Line2D([], [], ls='--', label='Gaps in daily data')])
+
+ax1.set_title("Plot y at x Coordinates")
+ax1.xaxis.set_major_locator(DayLocator())
+ax1.xaxis.set_major_formatter(DateFormatter('%a'))
+
+
+# Next we'll write a custom index formatter. Below we will plot
+# the data against an index that goes from 0, 1,  ... len(data).  Instead of
+# formatting the tick marks as integers, we format as times.
+def format_date(x, _):
+    try:
+        # convert datetime64 to datetime, and use datetime's strftime:
+        return r.date[round(x)].item().strftime('%a')
+    except IndexError:
+        pass
+
+# Create an index plot (x defaults to range(len(y)) if omitted)
+ax2.plot(r.adj_close, 'o-')
+
+ax2.set_title("Plot y at Index Coordinates Using Custom Formatter")
+ax2.xaxis.set_major_formatter(format_date)  # internally creates FuncFormatter
+
+#############################################################################
+# Instead of passing a function into `.Axis.set_major_formatter` you can use
+# any other callable, e.g. an instance of a class that implements __call__:
+
+
+class MyFormatter(Formatter):
+    def __init__(self, dates, fmt='%a'):
+        self.dates = dates
+        self.fmt = fmt
+
+    def __call__(self, x, pos=0):
+        """Return the label for time x at position pos."""
+        try:
+            return self.dates[round(x)].item().strftime(self.fmt)
+        except IndexError:
+            pass
+
+
+ax2.xaxis.set_major_formatter(MyFormatter(r.date, '%a'))
diff --git a/examples/ticks_and_spines/date_precision_and_epochs.py b/examples/ticks/date_precision_and_epochs.py
similarity index 92%
rename from examples/ticks_and_spines/date_precision_and_epochs.py
rename to examples/ticks/date_precision_and_epochs.py
index 9526adba55e7..c50bbd234331 100644
--- a/examples/ticks_and_spines/date_precision_and_epochs.py
+++ b/examples/ticks/date_precision_and_epochs.py
@@ -20,7 +20,6 @@
 import datetime
 import numpy as np
 
-import matplotlib
 import matplotlib.pyplot as plt
 import matplotlib.dates as mdates
 
@@ -67,7 +66,7 @@ def _reset_epoch_for_tutorial():
 
 #############################################################################
 # If a user wants to use modern dates at microsecond precision, they
-# can change the epoch using `~.set_epoch`.  However, the epoch has to be
+# can change the epoch using `.set_epoch`.  However, the epoch has to be
 # set before any date operations to prevent confusion between different
 # epochs. Trying to change the epoch later will raise a `RuntimeError`.
 
@@ -132,7 +131,7 @@ def _reset_epoch_for_tutorial():
 fig, ax = plt.subplots(constrained_layout=True)
 ax.plot(xold, y)
 ax.set_title('Epoch: ' + mdates.get_epoch())
-plt.setp(ax.xaxis.get_majorticklabels(), rotation=40)
+ax.xaxis.set_tick_params(rotation=40)
 plt.show()
 
 #############################################################################
@@ -141,20 +140,18 @@ def _reset_epoch_for_tutorial():
 fig, ax = plt.subplots(constrained_layout=True)
 ax.plot(x, y)
 ax.set_title('Epoch: ' + mdates.get_epoch())
-plt.setp(ax.xaxis.get_majorticklabels(), rotation=40)
+ax.xaxis.set_tick_params(rotation=40)
 plt.show()
 
 _reset_epoch_for_tutorial()  # Don't do this.  Just for this tutorial.
 
 #############################################################################
-# ------------
 #
-# References
-# """"""""""
+# .. admonition:: References
 #
-# The use of the following functions, methods and classes is shown
-# in this example:
-
-matplotlib.dates.num2date
-matplotlib.dates.date2num
-matplotlib.dates.set_epoch
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
+#
+#    - `matplotlib.dates.num2date`
+#    - `matplotlib.dates.date2num`
+#    - `matplotlib.dates.set_epoch`
diff --git a/examples/pyplots/dollar_ticks.py b/examples/ticks/dollar_ticks.py
similarity index 60%
rename from examples/pyplots/dollar_ticks.py
rename to examples/ticks/dollar_ticks.py
index fb7032c052a6..694e613db08d 100644
--- a/examples/pyplots/dollar_ticks.py
+++ b/examples/ticks/dollar_ticks.py
@@ -4,6 +4,8 @@
 ============
 
 Use a `~.ticker.FormatStrFormatter` to prepend dollar signs on y axis labels.
+
+.. redirect-from:: /gallery/pyplots/dollar_ticks
 """
 import numpy as np
 import matplotlib.pyplot as plt
@@ -25,17 +27,13 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.pyplot.subplots
-matplotlib.axis.Axis.set_major_formatter
-matplotlib.axis.Axis.set_tick_params
-matplotlib.axis.Tick
-matplotlib.ticker.StrMethodFormatter
+#    - `matplotlib.pyplot.subplots`
+#    - `matplotlib.axis.Axis.set_major_formatter`
+#    - `matplotlib.axis.Axis.set_tick_params`
+#    - `matplotlib.axis.Tick`
+#    - `matplotlib.ticker.StrMethodFormatter`
diff --git a/examples/ticks/fig_axes_customize_simple.py b/examples/ticks/fig_axes_customize_simple.py
new file mode 100644
index 000000000000..74742f718939
--- /dev/null
+++ b/examples/ticks/fig_axes_customize_simple.py
@@ -0,0 +1,45 @@
+"""
+=========================
+Fig Axes Customize Simple
+=========================
+
+Customize the background, labels and ticks of a simple plot.
+
+.. redirect-from:: /gallery/pyplots/fig_axes_customize_simple
+"""
+
+import matplotlib.pyplot as plt
+
+###############################################################################
+# `.pyplot.figure` creates a `matplotlib.figure.Figure` instance.
+
+fig = plt.figure()
+rect = fig.patch  # a rectangle instance
+rect.set_facecolor('lightgoldenrodyellow')
+
+ax1 = fig.add_axes([0.1, 0.3, 0.4, 0.4])
+rect = ax1.patch
+rect.set_facecolor('lightslategray')
+
+ax1.tick_params(axis='x', labelcolor='tab:red', labelrotation=45, labelsize=16)
+ax1.tick_params(axis='y', color='tab:green', size=25, width=3)
+
+plt.show()
+
+#############################################################################
+#
+# .. admonition:: References
+#
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
+#
+#    - `matplotlib.axis.Axis.get_ticklabels`
+#    - `matplotlib.axis.Axis.get_ticklines`
+#    - `matplotlib.text.Text.set_rotation`
+#    - `matplotlib.text.Text.set_fontsize`
+#    - `matplotlib.text.Text.set_color`
+#    - `matplotlib.lines.Line2D`
+#    - `matplotlib.lines.Line2D.set_markeredgecolor`
+#    - `matplotlib.lines.Line2D.set_markersize`
+#    - `matplotlib.lines.Line2D.set_markeredgewidth`
+#    - `matplotlib.patches.Patch.set_facecolor`
diff --git a/examples/ticks_and_spines/major_minor_demo.py b/examples/ticks/major_minor_demo.py
similarity index 86%
rename from examples/ticks_and_spines/major_minor_demo.py
rename to examples/ticks/major_minor_demo.py
index 34bc773a839a..26d9a2ce5844 100644
--- a/examples/ticks_and_spines/major_minor_demo.py
+++ b/examples/ticks/major_minor_demo.py
@@ -82,19 +82,15 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.pyplot.subplots
-matplotlib.axis.Axis.set_major_formatter
-matplotlib.axis.Axis.set_major_locator
-matplotlib.axis.Axis.set_minor_locator
-matplotlib.ticker.AutoMinorLocator
-matplotlib.ticker.MultipleLocator
-matplotlib.ticker.StrMethodFormatter
+#    - `matplotlib.pyplot.subplots`
+#    - `matplotlib.axis.Axis.set_major_formatter`
+#    - `matplotlib.axis.Axis.set_major_locator`
+#    - `matplotlib.axis.Axis.set_minor_locator`
+#    - `matplotlib.ticker.AutoMinorLocator`
+#    - `matplotlib.ticker.MultipleLocator`
+#    - `matplotlib.ticker.StrMethodFormatter`
diff --git a/examples/ticks_and_spines/scalarformatter.py b/examples/ticks/scalarformatter.py
similarity index 100%
rename from examples/ticks_and_spines/scalarformatter.py
rename to examples/ticks/scalarformatter.py
diff --git a/examples/ticks_and_spines/tick-formatters.py b/examples/ticks/tick-formatters.py
similarity index 75%
rename from examples/ticks_and_spines/tick-formatters.py
rename to examples/ticks/tick-formatters.py
index 3693b51a4b1a..ac118cbfce03 100644
--- a/examples/ticks_and_spines/tick-formatters.py
+++ b/examples/ticks/tick-formatters.py
@@ -7,6 +7,7 @@
 is formatted as a string.
 
 This example illustrates the usage and effect of the most common formatters.
+
 """
 
 import matplotlib.pyplot as plt
@@ -34,12 +35,13 @@ def setup(ax, title):
             fontsize=14, fontname='Monospace', color='tab:blue')
 
 
+#############################################################################
 # Tick formatters can be set in one of two ways, either by passing a ``str``
 # or function to `~.Axis.set_major_formatter` or `~.Axis.set_minor_formatter`,
 # or by creating an instance of one of the various `~.ticker.Formatter` classes
 # and providing that to `~.Axis.set_major_formatter` or
 # `~.Axis.set_minor_formatter`.
-
+#
 # The first two examples directly pass a ``str`` or function.
 
 fig0, axs0 = plt.subplots(2, 1, figsize=(8, 2))
@@ -53,14 +55,15 @@ def setup(ax, title):
 
 # A function can also be used directly as a formatter. The function must take
 # two arguments: ``x`` for the tick value and ``pos`` for the tick position,
-# and must return a ``str``  This creates a FuncFormatter automatically.
+# and must return a ``str``. This creates a FuncFormatter automatically.
 setup(axs0[1], title="lambda x, pos: str(x-5)")
 axs0[1].xaxis.set_major_formatter(lambda x, pos: str(x-5))
 
 fig0.tight_layout()
 
 
-# The remaining examples use Formatter objects.
+#############################################################################
+# The remaining examples use `.Formatter` objects.
 
 fig1, axs1 = plt.subplots(7, 1, figsize=(8, 6))
 fig1.suptitle('Formatter Object Formatting')
@@ -80,7 +83,7 @@ def major_formatter(x, pos):
     return f'[{x:.2f}]'
 
 
-setup(axs1[2], title='FuncFormatter("[{:.2f}]".format')
+setup(axs1[2], title='FuncFormatter("[{:.2f}]".format)')
 axs1[2].xaxis.set_major_formatter(major_formatter)
 
 # Fixed formatter
@@ -110,29 +113,25 @@ def major_formatter(x, pos):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.pyplot.subplots
-matplotlib.axes.Axes.text
-matplotlib.axis.Axis.set_major_formatter
-matplotlib.axis.Axis.set_major_locator
-matplotlib.axis.Axis.set_minor_locator
-matplotlib.axis.XAxis.set_ticks_position
-matplotlib.axis.YAxis.set_ticks_position
-matplotlib.ticker.FixedFormatter
-matplotlib.ticker.FixedLocator
-matplotlib.ticker.FormatStrFormatter
-matplotlib.ticker.FuncFormatter
-matplotlib.ticker.MultipleLocator
-matplotlib.ticker.NullFormatter
-matplotlib.ticker.NullLocator
-matplotlib.ticker.PercentFormatter
-matplotlib.ticker.ScalarFormatter
-matplotlib.ticker.StrMethodFormatter
+#    - `matplotlib.pyplot.subplots`
+#    - `matplotlib.axes.Axes.text`
+#    - `matplotlib.axis.Axis.set_major_formatter`
+#    - `matplotlib.axis.Axis.set_major_locator`
+#    - `matplotlib.axis.Axis.set_minor_locator`
+#    - `matplotlib.axis.XAxis.set_ticks_position`
+#    - `matplotlib.axis.YAxis.set_ticks_position`
+#    - `matplotlib.ticker.FixedFormatter`
+#    - `matplotlib.ticker.FixedLocator`
+#    - `matplotlib.ticker.FormatStrFormatter`
+#    - `matplotlib.ticker.FuncFormatter`
+#    - `matplotlib.ticker.MultipleLocator`
+#    - `matplotlib.ticker.NullFormatter`
+#    - `matplotlib.ticker.NullLocator`
+#    - `matplotlib.ticker.PercentFormatter`
+#    - `matplotlib.ticker.ScalarFormatter`
+#    - `matplotlib.ticker.StrMethodFormatter`
diff --git a/examples/ticks_and_spines/tick-locators.py b/examples/ticks/tick-locators.py
similarity index 100%
rename from examples/ticks_and_spines/tick-locators.py
rename to examples/ticks/tick-locators.py
diff --git a/examples/ticks_and_spines/tick_label_right.py b/examples/ticks/tick_label_right.py
similarity index 64%
rename from examples/ticks_and_spines/tick_label_right.py
rename to examples/ticks/tick_label_right.py
index f49492e93bf1..79eccd8777e7 100644
--- a/examples/ticks_and_spines/tick_label_right.py
+++ b/examples/ticks/tick_label_right.py
@@ -3,10 +3,9 @@
 Set default y-axis tick labels on the right
 ============================================
 
-We can use :rc:`ytick.labelright` (default False) and :rc:`ytick.right`
-(default False) and :rc:`ytick.labelleft` (default True) and :rc:`ytick.left`
-(default True) to control where on the axes ticks and their labels appear.
-These properties can also be set in the ``.matplotlib/matplotlibrc``.
+We can use :rc:`ytick.labelright`, :rc:`ytick.right`, :rc:`ytick.labelleft`,
+and :rc:`ytick.left` to control where on the axes ticks and their labels
+appear. These properties can also be set in ``.matplotlib/matplotlibrc``.
 
 """
 import matplotlib.pyplot as plt
diff --git a/examples/ticks_and_spines/tick_labels_from_values.py b/examples/ticks/tick_labels_from_values.py
similarity index 76%
rename from examples/ticks_and_spines/tick_labels_from_values.py
rename to examples/ticks/tick_labels_from_values.py
index 355692d89890..e03a2be87198 100644
--- a/examples/ticks_and_spines/tick_labels_from_values.py
+++ b/examples/ticks/tick_labels_from_values.py
@@ -41,17 +41,13 @@ def format_fn(tick_val, tick_pos):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.pyplot.subplots
-matplotlib.axis.Axis.set_major_formatter
-matplotlib.axis.Axis.set_major_locator
-matplotlib.ticker.FuncFormatter
-matplotlib.ticker.MaxNLocator
+#    - `matplotlib.pyplot.subplots`
+#    - `matplotlib.axis.Axis.set_major_formatter`
+#    - `matplotlib.axis.Axis.set_major_locator`
+#    - `matplotlib.ticker.FuncFormatter`
+#    - `matplotlib.ticker.MaxNLocator`
diff --git a/examples/ticks/tick_xlabel_top.py b/examples/ticks/tick_xlabel_top.py
new file mode 100644
index 000000000000..de2ca569851a
--- /dev/null
+++ b/examples/ticks/tick_xlabel_top.py
@@ -0,0 +1,32 @@
+"""
+==================================
+Move x-axis tick labels to the top
+==================================
+
+`~.axes.Axes.tick_params` can be used to configure the ticks. *top* and
+*labeltop* control the visibility tick lines and labels at the top x-axis.
+To move x-axis ticks from bottom to top, we have to activate the top ticks
+and deactivate the bottom ticks::
+
+    ax.tick_params(top=True, labeltop=True, bottom=False, labelbottom=False)
+
+.. note::
+
+    If the change should be made for all future plots and not only the current
+    Axes, you can adapt the respective config parameters
+
+    - :rc:`xtick.top`
+    - :rc:`xtick.labeltop`
+    - :rc:`xtick.bottom`
+    - :rc:`xtick.labelbottom`
+
+"""
+
+import matplotlib.pyplot as plt
+
+fig, ax = plt.subplots()
+ax.plot(range(10))
+ax.tick_params(top=True, labeltop=True, bottom=False, labelbottom=False)
+ax.set_title('x-ticks moved to the top')
+
+plt.show()
diff --git a/examples/ticks_and_spines/ticklabels_rotation.py b/examples/ticks/ticklabels_rotation.py
similarity index 100%
rename from examples/ticks_and_spines/ticklabels_rotation.py
rename to examples/ticks/ticklabels_rotation.py
diff --git a/examples/ticks/ticks_too_many.py b/examples/ticks/ticks_too_many.py
new file mode 100644
index 000000000000..c1f05bf4c17e
--- /dev/null
+++ b/examples/ticks/ticks_too_many.py
@@ -0,0 +1,76 @@
+"""
+=====================
+Fixing too many ticks
+=====================
+
+One common cause for unexpected tick behavior is passing a list of strings
+instead of numbers or datetime objects. This can easily happen without notice
+when reading in a comma-delimited text file. Matplotlib treats lists of strings
+as *categorical* variables
+(:doc:`/gallery/lines_bars_and_markers/categorical_variables`), and by default
+puts one tick per category, and plots them in the order in which they are
+supplied.  If this is not desired, the solution is to convert the strings to
+a numeric type as in the following examples.
+
+"""
+
+############################################################################
+# Example 1: Strings can lead to an unexpected order of number ticks
+# ------------------------------------------------------------------
+
+import matplotlib.pyplot as plt
+import numpy as np
+
+fig, ax = plt.subplots(1, 2, constrained_layout=True, figsize=(6, 2.5))
+x = ['1', '5', '2', '3']
+y = [1, 4, 2, 3]
+ax[0].plot(x, y, 'd')
+ax[0].tick_params(axis='x', color='r', labelcolor='r')
+ax[0].set_xlabel('Categories')
+ax[0].set_title('Ticks seem out of order / misplaced')
+
+# convert to numbers:
+x = np.asarray(x, dtype='float')
+ax[1].plot(x, y, 'd')
+ax[1].set_xlabel('Floats')
+ax[1].set_title('Ticks as expected')
+
+############################################################################
+# Example 2: Strings can lead to very many ticks
+# ----------------------------------------------
+# If *x* has 100 elements, all strings, then we would have 100 (unreadable)
+# ticks, and again the solution is to convert the strings to floats:
+
+fig, ax = plt.subplots(1, 2, figsize=(6, 2.5))
+x = [f'{xx}' for xx in np.arange(100)]
+y = np.arange(100)
+ax[0].plot(x, y)
+ax[0].tick_params(axis='x', color='r', labelcolor='r')
+ax[0].set_title('Too many ticks')
+ax[0].set_xlabel('Categories')
+
+ax[1].plot(np.asarray(x, float), y)
+ax[1].set_title('x converted to numbers')
+ax[1].set_xlabel('Floats')
+
+############################################################################
+# Example 3: Strings can lead to an unexpected order of datetime ticks
+# --------------------------------------------------------------------
+# A common case is when dates are read from a CSV file, they need to be
+# converted from strings to datetime objects to get the proper date locators
+# and formatters.
+
+fig, ax = plt.subplots(1, 2, constrained_layout=True, figsize=(6, 2.75))
+x = ['2021-10-01', '2021-11-02', '2021-12-03', '2021-09-01']
+y = [0, 2, 3, 1]
+ax[0].plot(x, y, 'd')
+ax[0].tick_params(axis='x', labelrotation=90, color='r', labelcolor='r')
+ax[0].set_title('Dates out of order')
+
+# convert to datetime64
+x = np.asarray(x, dtype='datetime64[s]')
+ax[1].plot(x, y, 'd')
+ax[1].tick_params(axis='x', labelrotation=90)
+ax[1].set_title('x converted to datetimes')
+
+plt.show()
diff --git a/examples/ticks_and_spines/README.txt b/examples/ticks_and_spines/README.txt
deleted file mode 100644
index e7869c5a08d1..000000000000
--- a/examples/ticks_and_spines/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-.. _ticks_and_spines_examples:
-
-Ticks and spines
-================
diff --git a/examples/ticks_and_spines/auto_ticks.py b/examples/ticks_and_spines/auto_ticks.py
deleted file mode 100644
index 5e06b8cf02ab..000000000000
--- a/examples/ticks_and_spines/auto_ticks.py
+++ /dev/null
@@ -1,47 +0,0 @@
-"""
-=================================
-Automatically setting tick labels
-=================================
-
-Setting the behavior of tick auto-placement.
-
-If you don't explicitly set tick positions / labels, Matplotlib will attempt
-to choose them both automatically based on the displayed data and its limits.
-
-By default, this attempts to choose tick positions that are distributed
-along the axis:
-"""
-
-import matplotlib.pyplot as plt
-import numpy as np
-np.random.seed(19680801)
-
-fig, ax = plt.subplots()
-dots = np.arange(10) / 100. + .03
-x, y = np.meshgrid(dots, dots)
-data = [x.ravel(), y.ravel()]
-ax.scatter(*data, c=data[1])
-
-###############################################################################
-# Sometimes choosing evenly-distributed ticks results in strange tick numbers.
-# If you'd like Matplotlib to keep ticks located at round numbers, you can
-# change this behavior with the following rcParams value:
-
-print(plt.rcParams['axes.autolimit_mode'])
-
-# Now change this value and see the results
-with plt.rc_context({'axes.autolimit_mode': 'round_numbers'}):
-    fig, ax = plt.subplots()
-    ax.scatter(*data, c=data[1])
-
-###############################################################################
-# You can also alter the margins of the axes around the data by
-# with ``axes.(x,y)margin``:
-
-with plt.rc_context({'axes.autolimit_mode': 'round_numbers',
-                     'axes.xmargin': .8,
-                     'axes.ymargin': .8}):
-    fig, ax = plt.subplots()
-    ax.scatter(*data, c=data[1])
-
-plt.show()
diff --git a/examples/ticks_and_spines/custom_ticker1.py b/examples/ticks_and_spines/custom_ticker1.py
deleted file mode 100644
index c45802efbc43..000000000000
--- a/examples/ticks_and_spines/custom_ticker1.py
+++ /dev/null
@@ -1,42 +0,0 @@
-"""
-==============
-Custom Ticker1
-==============
-
-The new ticker code was designed to explicitly support user customized
-ticking. The documentation of :mod:`matplotlib.ticker` details this
-process.  That code defines a lot of preset tickers but was primarily
-designed to be user extensible.
-
-In this example a user defined function is used to format the ticks in
-millions of dollars on the y axis.
-"""
-import matplotlib.pyplot as plt
-
-money = [1.5e5, 2.5e6, 5.5e6, 2.0e7]
-
-
-def millions(x, pos):
-    """The two args are the value and tick position."""
-    return '${:1.1f}M'.format(x*1e-6)
-
-fig, ax = plt.subplots()
-# Use automatic FuncFormatter creation
-ax.yaxis.set_major_formatter(millions)
-ax.bar(['Bill', 'Fred', 'Mary', 'Sue'], money)
-plt.show()
-
-#############################################################################
-#
-# ------------
-#
-# References
-# """"""""""
-#
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.pyplot.subplots
-matplotlib.axis.Axis.set_major_formatter
-matplotlib.ticker.FuncFormatter
diff --git a/examples/ticks_and_spines/date_index_formatter2.py b/examples/ticks_and_spines/date_index_formatter2.py
deleted file mode 100644
index 38c9038812ae..000000000000
--- a/examples/ticks_and_spines/date_index_formatter2.py
+++ /dev/null
@@ -1,45 +0,0 @@
-"""
-====================
-Date Index Formatter
-====================
-
-When plotting daily data, a frequent request is to plot the data
-ignoring skips, e.g., no extra spaces for weekends.  This is particularly
-common in financial time series, when you may have data for M-F and
-not Sat, Sun and you don't want gaps in the x axis.  The approach is
-to simply use the integer index for the xdata and a custom tick
-Formatter to get the appropriate date string for a given index.
-"""
-
-import dateutil.parser
-from matplotlib import cbook, dates
-import matplotlib.pyplot as plt
-from matplotlib.ticker import Formatter
-import numpy as np
-
-
-datafile = cbook.get_sample_data('msft.csv', asfileobj=False)
-print('loading %s' % datafile)
-msft_data = np.genfromtxt(
-    datafile, delimiter=',', names=True,
-    converters={0: lambda s: dates.date2num(dateutil.parser.parse(s))})
-
-
-class MyFormatter(Formatter):
-    def __init__(self, dates, fmt='%Y-%m-%d'):
-        self.dates = dates
-        self.fmt = fmt
-
-    def __call__(self, x, pos=0):
-        """Return the label for time x at position pos."""
-        ind = int(round(x))
-        if ind >= len(self.dates) or ind < 0:
-            return ''
-        return dates.num2date(self.dates[ind]).strftime(self.fmt)
-
-
-fig, ax = plt.subplots()
-ax.xaxis.set_major_formatter(MyFormatter(msft_data['Date']))
-ax.plot(msft_data['Close'], 'o-')
-fig.autofmt_xdate()
-plt.show()
diff --git a/examples/ticks_and_spines/tick_xlabel_top.py b/examples/ticks_and_spines/tick_xlabel_top.py
deleted file mode 100644
index 5ed2f81c23ce..000000000000
--- a/examples/ticks_and_spines/tick_xlabel_top.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""
-==========================================
-Set default x-axis tick labels on the top
-==========================================
-
-We can use :rc:`xtick.labeltop` and :rc:`xtick.top` and :rc:`xtick.labelbottom`
-and :rc:`xtick.bottom` to control where on the axes ticks and their labels
-appear.
-
-These properties can also be set in ``.matplotlib/matplotlibrc``.
-"""
-
-import matplotlib.pyplot as plt
-import numpy as np
-
-
-plt.rcParams['xtick.bottom'] = plt.rcParams['xtick.labelbottom'] = False
-plt.rcParams['xtick.top'] = plt.rcParams['xtick.labeltop'] = True
-
-x = np.arange(10)
-
-fig, ax = plt.subplots()
-
-ax.plot(x)
-ax.set_title('xlabel top')  # Note title moves to make room for ticks
-
-plt.show()
diff --git a/examples/units/bar_unit_demo.py b/examples/units/bar_unit_demo.py
index da963e19f734..7b24a453154d 100644
--- a/examples/units/bar_unit_demo.py
+++ b/examples/units/bar_unit_demo.py
@@ -33,8 +33,7 @@
        label='Women')
 
 ax.set_title('Scores by group and gender')
-ax.set_xticks(ind + width / 2)
-ax.set_xticklabels(('G1', 'G2', 'G3', 'G4', 'G5'))
+ax.set_xticks(ind + width / 2, labels=['G1', 'G2', 'G3', 'G4', 'G5'])
 
 ax.legend()
 ax.yaxis.set_units(inch)
diff --git a/examples/units/basic_units.py b/examples/units/basic_units.py
index 727b538ec183..3b4f13313f50 100644
--- a/examples/units/basic_units.py
+++ b/examples/units/basic_units.py
@@ -5,10 +5,10 @@
 
 """
 
-from distutils.version import LooseVersion
 import math
 
 import numpy as np
+from packaging.version import parse as parse_version
 
 import matplotlib.units as units
 import matplotlib.ticker as ticker
@@ -79,8 +79,8 @@ def __call__(self, *args):
         arg_units = [self.unit]
         for a in args:
             if hasattr(a, 'get_unit') and not hasattr(a, 'convert_to'):
-                # if this arg has a unit type but no conversion ability,
-                # this operation is prohibited
+                # If this argument has a unit type but no conversion ability,
+                # this operation is prohibited.
                 return NotImplemented
 
             if hasattr(a, 'convert_to'):
@@ -132,6 +132,9 @@ def __init__(self, value, unit):
         self.unit = unit
         self.proxy_target = self.value
 
+    def __copy__(self):
+        return TaggedValue(self.value, self.unit)
+
     def __getattribute__(self, name):
         if name.startswith('__'):
             return object.__getattribute__(self, name)
@@ -155,7 +158,7 @@ def __str__(self):
     def __len__(self):
         return len(self.value)
 
-    if LooseVersion(np.__version__) >= '1.20':
+    if parse_version(np.__version__) >= parse_version('1.20'):
         def __getitem__(self, key):
             return TaggedValue(self.value[key], self.unit)
 
@@ -343,8 +346,6 @@ def axisinfo(unit, axis):
 
     @staticmethod
     def convert(val, unit, axis):
-        if units.ConversionInterface.is_numlike(val):
-            return val
         if np.iterable(val):
             if isinstance(val, np.ma.MaskedArray):
                 val = val.astype(float).filled(np.nan)
diff --git a/examples/units/ellipse_with_units.py b/examples/units/ellipse_with_units.py
index 2a2242cde30c..369ad5cf4e68 100644
--- a/examples/units/ellipse_with_units.py
+++ b/examples/units/ellipse_with_units.py
@@ -1,14 +1,15 @@
 """
 ==================
-Ellipse With Units
+Ellipse with units
 ==================
 
-Compare the ellipse generated with arcs versus a polygonal approximation
+Compare the ellipse generated with arcs versus a polygonal approximation.
 
 .. only:: builder_html
 
    This example requires :download:`basic_units.py <basic_units.py>`
 """
+
 from basic_units import cm
 import numpy as np
 from matplotlib import patches
diff --git a/examples/units/evans_test.py b/examples/units/evans_test.py
index 8e6c363eaaf9..3a4ac2fe7f55 100644
--- a/examples/units/evans_test.py
+++ b/examples/units/evans_test.py
@@ -48,9 +48,6 @@ def convert(obj, unit, axis):
 
         If *obj* is a sequence, return the converted sequence.
         """
-        if units.ConversionInterface.is_numlike(obj):
-            return obj
-
         if np.iterable(obj):
             return [o.value(unit) for o in obj]
         else:
diff --git a/examples/units/units_sample.py b/examples/units/units_sample.py
index db39ee73dbe9..81547601e711 100644
--- a/examples/units/units_sample.py
+++ b/examples/units/units_sample.py
@@ -19,14 +19,14 @@
 
 cms = cm * np.arange(0, 10, 2)
 
-fig, axs = plt.subplots(2, 2)
+fig, axs = plt.subplots(2, 2, constrained_layout=True)
 
 axs[0, 0].plot(cms, cms)
 
 axs[0, 1].plot(cms, cms, xunits=cm, yunits=inch)
 
 axs[1, 0].plot(cms, cms, xunits=inch, yunits=cm)
-axs[1, 0].set_xlim(3, 6)  # scalars are interpreted in current units
+axs[1, 0].set_xlim(-1, 4)  # scalars are interpreted in current units
 
 axs[1, 1].plot(cms, cms, xunits=inch, yunits=inch)
 axs[1, 1].set_xlim(3*cm, 6*cm)  # cm are converted to inches
diff --git a/examples/user_interfaces/README.txt b/examples/user_interfaces/README.txt
index d526adc9d65d..75b469da7cf6 100644
--- a/examples/user_interfaces/README.txt
+++ b/examples/user_interfaces/README.txt
@@ -8,6 +8,6 @@ following the embedding_in_SOMEGUI.py examples here. Currently
 Matplotlib supports PyQt/PySide, PyGObject, Tkinter, and wxPython.
 
 When embedding Matplotlib in a GUI, you must use the Matplotlib API
-directly rather than the pylab/pyplot proceedural interface, so take a
+directly rather than the pylab/pyplot procedural interface, so take a
 look at the examples/api directory for some example code working with
 the API.
diff --git a/examples/user_interfaces/canvasagg.py b/examples/user_interfaces/canvasagg.py
index 38785b94f65d..afb1c3acbf7f 100644
--- a/examples/user_interfaces/canvasagg.py
+++ b/examples/user_interfaces/canvasagg.py
@@ -14,14 +14,21 @@
     the backend to "Agg" would be sufficient.
 
 In this example, we show how to save the contents of the agg canvas to a file,
-and how to extract them to a string, which can in turn be passed off to PIL or
-put in a numpy array.  The latter functionality allows e.g. to use Matplotlib
-inside a cgi-script *without* needing to write a figure to disk.
+and how to extract them to a numpy array, which can in turn be passed off
+to Pillow_.  The latter functionality allows e.g. to use Matplotlib inside a
+cgi-script *without* needing to write a figure to disk, and to write images in
+any format supported by Pillow.
+
+.. _Pillow: https://pillow.readthedocs.io/
+.. redirect-from:: /gallery/misc/agg_buffer
+.. redirect-from:: /gallery/misc/agg_buffer_to_array
 """
 
 from matplotlib.backends.backend_agg import FigureCanvasAgg
 from matplotlib.figure import Figure
 import numpy as np
+from PIL import Image
+
 
 fig = Figure(figsize=(5, 4), dpi=100)
 # A canvas must be manually attached to the figure (pyplot would automatically
@@ -37,31 +44,27 @@
 # etc.).
 fig.savefig("test.png")
 
-# Option 2: Retrieve a view on the renderer buffer...
+# Option 2: Retrieve a memoryview on the renderer buffer, and convert it to a
+# numpy array.
 canvas.draw()
-buf = canvas.buffer_rgba()
-# ... convert to a NumPy array ...
-X = np.asarray(buf)
+rgba = np.asarray(canvas.buffer_rgba())
 # ... and pass it to PIL.
-from PIL import Image
-im = Image.fromarray(X)
+im = Image.fromarray(rgba)
+# This image can then be saved to any format supported by Pillow, e.g.:
+im.save("test.bmp")
 
 # Uncomment this line to display the image using ImageMagick's `display` tool.
 # im.show()
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.backends.backend_agg.FigureCanvasAgg
-matplotlib.figure.Figure
-matplotlib.figure.Figure.add_subplot
-matplotlib.figure.Figure.savefig
-matplotlib.axes.Axes.plot
+#    - `matplotlib.backends.backend_agg.FigureCanvasAgg`
+#    - `matplotlib.figure.Figure`
+#    - `matplotlib.figure.Figure.add_subplot`
+#    - `matplotlib.figure.Figure.savefig` / `matplotlib.pyplot.savefig`
+#    - `matplotlib.axes.Axes.plot` / `matplotlib.pyplot.plot`
diff --git a/examples/user_interfaces/embedding_in_gtk3_panzoom_sgskip.py b/examples/user_interfaces/embedding_in_gtk3_panzoom_sgskip.py
index 2f0833f09511..7009b55bada7 100644
--- a/examples/user_interfaces/embedding_in_gtk3_panzoom_sgskip.py
+++ b/examples/user_interfaces/embedding_in_gtk3_panzoom_sgskip.py
@@ -20,7 +20,7 @@
 win = Gtk.Window()
 win.connect("delete-event", Gtk.main_quit)
 win.set_default_size(400, 300)
-win.set_title("Embedding in GTK")
+win.set_title("Embedding in GTK3")
 
 fig = Figure(figsize=(5, 4), dpi=100)
 ax = fig.add_subplot(1, 1, 1)
@@ -36,7 +36,7 @@
 vbox.pack_start(canvas, True, True, 0)
 
 # Create toolbar
-toolbar = NavigationToolbar(canvas, win)
+toolbar = NavigationToolbar(canvas)
 vbox.pack_start(toolbar, False, False, 0)
 
 win.show_all()
diff --git a/examples/user_interfaces/embedding_in_gtk3_sgskip.py b/examples/user_interfaces/embedding_in_gtk3_sgskip.py
index f5872304964d..b672ba8d9ff0 100644
--- a/examples/user_interfaces/embedding_in_gtk3_sgskip.py
+++ b/examples/user_interfaces/embedding_in_gtk3_sgskip.py
@@ -19,7 +19,7 @@
 win = Gtk.Window()
 win.connect("delete-event", Gtk.main_quit)
 win.set_default_size(400, 300)
-win.set_title("Embedding in GTK")
+win.set_title("Embedding in GTK3")
 
 fig = Figure(figsize=(5, 4), dpi=100)
 ax = fig.add_subplot()
diff --git a/examples/user_interfaces/embedding_in_gtk4_panzoom_sgskip.py b/examples/user_interfaces/embedding_in_gtk4_panzoom_sgskip.py
new file mode 100644
index 000000000000..b132aff1074f
--- /dev/null
+++ b/examples/user_interfaces/embedding_in_gtk4_panzoom_sgskip.py
@@ -0,0 +1,51 @@
+"""
+===========================================
+Embedding in GTK4 with a navigation toolbar
+===========================================
+
+Demonstrate NavigationToolbar with GTK4 accessed via pygobject.
+"""
+
+import gi
+gi.require_version('Gtk', '4.0')
+from gi.repository import Gtk
+
+from matplotlib.backends.backend_gtk4 import (
+    NavigationToolbar2GTK4 as NavigationToolbar)
+from matplotlib.backends.backend_gtk4agg import (
+    FigureCanvasGTK4Agg as FigureCanvas)
+from matplotlib.figure import Figure
+import numpy as np
+
+
+def on_activate(app):
+    win = Gtk.ApplicationWindow(application=app)
+    win.set_default_size(400, 300)
+    win.set_title("Embedding in GTK4")
+
+    fig = Figure(figsize=(5, 4), dpi=100)
+    ax = fig.add_subplot(1, 1, 1)
+    t = np.arange(0.0, 3.0, 0.01)
+    s = np.sin(2*np.pi*t)
+    ax.plot(t, s)
+
+    vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
+    win.set_child(vbox)
+
+    # Add canvas to vbox
+    canvas = FigureCanvas(fig)  # a Gtk.DrawingArea
+    canvas.set_hexpand(True)
+    canvas.set_vexpand(True)
+    vbox.append(canvas)
+
+    # Create toolbar
+    toolbar = NavigationToolbar(canvas)
+    vbox.append(toolbar)
+
+    win.show()
+
+
+app = Gtk.Application(
+    application_id='org.matplotlib.examples.EmbeddingInGTK4PanZoom')
+app.connect('activate', on_activate)
+app.run(None)
diff --git a/examples/user_interfaces/embedding_in_gtk4_sgskip.py b/examples/user_interfaces/embedding_in_gtk4_sgskip.py
new file mode 100644
index 000000000000..c92e139de25f
--- /dev/null
+++ b/examples/user_interfaces/embedding_in_gtk4_sgskip.py
@@ -0,0 +1,45 @@
+"""
+=================
+Embedding in GTK4
+=================
+
+Demonstrate adding a FigureCanvasGTK4Agg widget to a Gtk.ScrolledWindow using
+GTK4 accessed via pygobject.
+"""
+
+import gi
+gi.require_version('Gtk', '4.0')
+from gi.repository import Gtk
+
+from matplotlib.backends.backend_gtk4agg import (
+    FigureCanvasGTK4Agg as FigureCanvas)
+from matplotlib.figure import Figure
+import numpy as np
+
+
+def on_activate(app):
+    win = Gtk.ApplicationWindow(application=app)
+    win.set_default_size(400, 300)
+    win.set_title("Embedding in GTK4")
+
+    fig = Figure(figsize=(5, 4), dpi=100)
+    ax = fig.add_subplot()
+    t = np.arange(0.0, 3.0, 0.01)
+    s = np.sin(2*np.pi*t)
+    ax.plot(t, s)
+
+    # A scrolled margin goes outside the scrollbars and viewport.
+    sw = Gtk.ScrolledWindow(margin_top=10, margin_bottom=10,
+                            margin_start=10, margin_end=10)
+    win.set_child(sw)
+
+    canvas = FigureCanvas(fig)  # a Gtk.DrawingArea
+    canvas.set_size_request(800, 600)
+    sw.set_child(canvas)
+
+    win.show()
+
+
+app = Gtk.Application(application_id='org.matplotlib.examples.EmbeddingInGTK4')
+app.connect('activate', on_activate)
+app.run(None)
diff --git a/examples/user_interfaces/embedding_in_qt_sgskip.py b/examples/user_interfaces/embedding_in_qt_sgskip.py
index 8994c079943d..f276a2a47c16 100644
--- a/examples/user_interfaces/embedding_in_qt_sgskip.py
+++ b/examples/user_interfaces/embedding_in_qt_sgskip.py
@@ -4,9 +4,9 @@
 ===============
 
 Simple Qt application embedding Matplotlib canvases.  This program will work
-equally well using Qt4 and Qt5.  Either version of Qt can be selected (for
-example) by setting the ``MPLBACKEND`` environment variable to "Qt4Agg" or
-"Qt5Agg", or by first importing the desired version of PyQt.
+equally well using any Qt binding (PyQt6, PySide6, PyQt5, PySide2).  The
+binding can be selected by setting the ``QT_API`` environment variable to the
+binding name, or by first importing it.
 """
 
 import sys
@@ -14,13 +14,9 @@
 
 import numpy as np
 
-from matplotlib.backends.qt_compat import QtCore, QtWidgets
-if QtCore.qVersion() >= "5.":
-    from matplotlib.backends.backend_qt5agg import (
-        FigureCanvas, NavigationToolbar2QT as NavigationToolbar)
-else:
-    from matplotlib.backends.backend_qt4agg import (
-        FigureCanvas, NavigationToolbar2QT as NavigationToolbar)
+from matplotlib.backends.qt_compat import QtWidgets
+from matplotlib.backends.backend_qtagg import (
+    FigureCanvas, NavigationToolbar2QT as NavigationToolbar)
 from matplotlib.figure import Figure
 
 
@@ -32,13 +28,15 @@ def __init__(self):
         layout = QtWidgets.QVBoxLayout(self._main)
 
         static_canvas = FigureCanvas(Figure(figsize=(5, 3)))
+        # Ideally one would use self.addToolBar here, but it is slightly
+        # incompatible between PyQt6 and other bindings, so we just add the
+        # toolbar as a plain widget instead.
+        layout.addWidget(NavigationToolbar(static_canvas, self))
         layout.addWidget(static_canvas)
-        self.addToolBar(NavigationToolbar(static_canvas, self))
 
         dynamic_canvas = FigureCanvas(Figure(figsize=(5, 3)))
         layout.addWidget(dynamic_canvas)
-        self.addToolBar(QtCore.Qt.BottomToolBarArea,
-                        NavigationToolbar(dynamic_canvas, self))
+        layout.addWidget(NavigationToolbar(dynamic_canvas, self))
 
         self._static_ax = static_canvas.figure.subplots()
         t = np.linspace(0, 10, 501)
@@ -70,4 +68,4 @@ def _update_canvas(self):
     app.show()
     app.activateWindow()
     app.raise_()
-    qapp.exec_()
+    qapp.exec()
diff --git a/examples/user_interfaces/embedding_in_tk_sgskip.py b/examples/user_interfaces/embedding_in_tk_sgskip.py
index e7342f3dcbf3..55fb2b48b5d6 100644
--- a/examples/user_interfaces/embedding_in_tk_sgskip.py
+++ b/examples/user_interfaces/embedding_in_tk_sgskip.py
@@ -21,7 +21,10 @@
 
 fig = Figure(figsize=(5, 4), dpi=100)
 t = np.arange(0, 3, .01)
-fig.add_subplot().plot(t, 2 * np.sin(2 * np.pi * t))
+ax = fig.add_subplot()
+line, = ax.plot(t, 2 * np.sin(2 * np.pi * t))
+ax.set_xlabel("time [s]")
+ax.set_ylabel("f(t)")
 
 canvas = FigureCanvasTkAgg(fig, master=root)  # A tk.DrawingArea.
 canvas.draw()
@@ -30,19 +33,35 @@
 toolbar = NavigationToolbar2Tk(canvas, root, pack_toolbar=False)
 toolbar.update()
 
-
 canvas.mpl_connect(
     "key_press_event", lambda event: print(f"you pressed {event.key}"))
 canvas.mpl_connect("key_press_event", key_press_handler)
 
-button = tkinter.Button(master=root, text="Quit", command=root.quit)
+button_quit = tkinter.Button(master=root, text="Quit", command=root.destroy)
+
+
+def update_frequency(new_val):
+    # retrieve frequency
+    f = float(new_val)
+
+    # update data
+    y = 2 * np.sin(2 * np.pi * f * t)
+    line.set_data(t, y)
+
+    # required to update canvas and attached toolbar!
+    canvas.draw()
+
+
+slider_update = tkinter.Scale(root, from_=1, to=5, orient=tkinter.HORIZONTAL,
+                              command=update_frequency, label="Frequency [Hz]")
 
 # Packing order is important. Widgets are processed sequentially and if there
 # is no space left, because the window is too small, they are not displayed.
 # The canvas is rather flexible in its size, so we pack it last which makes
 # sure the UI controls are displayed as long as possible.
-button.pack(side=tkinter.BOTTOM)
+button_quit.pack(side=tkinter.BOTTOM)
+slider_update.pack(side=tkinter.BOTTOM)
 toolbar.pack(side=tkinter.BOTTOM, fill=tkinter.X)
-canvas.get_tk_widget().pack(side=tkinter.TOP, fill=tkinter.BOTH, expand=1)
+canvas.get_tk_widget().pack(side=tkinter.TOP, fill=tkinter.BOTH, expand=True)
 
 tkinter.mainloop()
diff --git a/examples/user_interfaces/embedding_in_wx2_sgskip.py b/examples/user_interfaces/embedding_in_wx2_sgskip.py
index 19580517e9e1..fcebeeee8cd6 100644
--- a/examples/user_interfaces/embedding_in_wx2_sgskip.py
+++ b/examples/user_interfaces/embedding_in_wx2_sgskip.py
@@ -47,8 +47,8 @@ def add_toolbar(self):
         self.toolbar.update()
 
 
-# alternatively you could use
-#class App(wx.App):
+# Alternatively you could use:
+# class App(wx.App):
 class App(WIT.InspectableApp):
     def OnInit(self):
         """Create the main window and insert the custom frame."""
diff --git a/examples/user_interfaces/embedding_in_wx5_sgskip.py b/examples/user_interfaces/embedding_in_wx5_sgskip.py
index 2a97089697bc..c3c3d91f7368 100644
--- a/examples/user_interfaces/embedding_in_wx5_sgskip.py
+++ b/examples/user_interfaces/embedding_in_wx5_sgskip.py
@@ -9,7 +9,7 @@
 import wx.lib.agw.aui as aui
 import wx.lib.mixins.inspection as wit
 
-import matplotlib as mpl
+from matplotlib.figure import Figure
 from matplotlib.backends.backend_wxagg import (
     FigureCanvasWxAgg as FigureCanvas,
     NavigationToolbar2WxAgg as NavigationToolbar)
@@ -18,7 +18,7 @@
 class Plot(wx.Panel):
     def __init__(self, parent, id=-1, dpi=None, **kwargs):
         super().__init__(parent, id=id, **kwargs)
-        self.figure = mpl.figure.Figure(dpi=dpi, figsize=(2, 2))
+        self.figure = Figure(dpi=dpi, figsize=(2, 2))
         self.canvas = FigureCanvas(self, -1, self.figure)
         self.toolbar = NavigationToolbar(self.canvas)
         self.toolbar.Realize()
@@ -44,16 +44,16 @@ def add(self, name="plot"):
 
 
 def demo():
-    # alternatively you could use
-    #app = wx.App()
+    # Alternatively you could use:
+    # app = wx.App()
     # InspectableApp is a great debug tool, see:
     # http://wiki.wxpython.org/Widget%20Inspection%20Tool
     app = wit.InspectableApp()
     frame = wx.Frame(None, -1, 'Plotter')
     plotter = PlotNotebook(frame)
-    axes1 = plotter.add('figure 1').gca()
+    axes1 = plotter.add('figure 1').add_subplot()
     axes1.plot([1, 2, 3], [2, 1, 4])
-    axes2 = plotter.add('figure 2').gca()
+    axes2 = plotter.add('figure 2').add_subplot()
     axes2.plot([1, 2, 3, 4, 5], [2, 1, 4, 2, 3])
     frame.Show()
     app.MainLoop()
diff --git a/examples/user_interfaces/embedding_webagg_sgskip.py b/examples/user_interfaces/embedding_webagg_sgskip.py
index d3a313c6b9ef..dbd6bfb2bcc9 100644
--- a/examples/user_interfaces/embedding_webagg_sgskip.py
+++ b/examples/user_interfaces/embedding_webagg_sgskip.py
@@ -11,10 +11,13 @@
 The framework being used must support web sockets.
 """
 
+import argparse
 import io
 import json
 import mimetypes
 from pathlib import Path
+import signal
+import socket
 
 try:
     import tornado
@@ -27,7 +30,7 @@
 
 
 import matplotlib as mpl
-from matplotlib.backends.backend_webagg_core import (
+from matplotlib.backends.backend_webagg import (
     FigureManagerWebAgg, new_figure_manager_given_figure)
 from matplotlib.figure import Figure
 
@@ -238,13 +241,36 @@ def __init__(self, figure):
 
 
 if __name__ == "__main__":
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-p', '--port', type=int, default=8080,
+                        help='Port to listen on (0 for a random port).')
+    args = parser.parse_args()
+
     figure = create_figure()
     application = MyApplication(figure)
 
     http_server = tornado.httpserver.HTTPServer(application)
-    http_server.listen(8080)
-
-    print("http://127.0.0.1:8080/")
+    sockets = tornado.netutil.bind_sockets(args.port, '')
+    http_server.add_sockets(sockets)
+
+    for s in sockets:
+        addr, port = s.getsockname()[:2]
+        if s.family is socket.AF_INET6:
+            addr = f'[{addr}]'
+        print(f"Listening on http://{addr}:{port}/")
     print("Press Ctrl+C to quit")
 
-    tornado.ioloop.IOLoop.instance().start()
+    ioloop = tornado.ioloop.IOLoop.instance()
+
+    def shutdown():
+        ioloop.stop()
+        print("Server stopped")
+
+    old_handler = signal.signal(
+        signal.SIGINT,
+        lambda sig, frame: ioloop.add_callback_from_signal(shutdown))
+
+    try:
+        ioloop.start()
+    finally:
+        signal.signal(signal.SIGINT, old_handler)
diff --git a/examples/user_interfaces/fourier_demo_wx_sgskip.py b/examples/user_interfaces/fourier_demo_wx_sgskip.py
index ba67e925dcd8..3a24e861d038 100644
--- a/examples/user_interfaces/fourier_demo_wx_sgskip.py
+++ b/examples/user_interfaces/fourier_demo_wx_sgskip.py
@@ -70,15 +70,15 @@ def __init__(self, parent, label, param):
         self.sliderText = wx.TextCtrl(parent, -1, style=wx.TE_PROCESS_ENTER)
         self.slider = wx.Slider(parent, -1)
         # self.slider.SetMax(param.maximum*1000)
-        self.slider.SetRange(0, param.maximum * 1000)
+        self.slider.SetRange(0, int(param.maximum * 1000))
         self.setKnob(param.value)
 
         sizer = wx.BoxSizer(wx.HORIZONTAL)
         sizer.Add(self.sliderLabel, 0,
-                  wx.EXPAND | wx.ALIGN_CENTER | wx.ALL,
+                  wx.EXPAND | wx.ALL,
                   border=2)
         sizer.Add(self.sliderText, 0,
-                  wx.EXPAND | wx.ALIGN_CENTER | wx.ALL,
+                  wx.EXPAND | wx.ALL,
                   border=2)
         sizer.Add(self.slider, 1, wx.EXPAND)
         self.sizer = sizer
@@ -99,7 +99,7 @@ def sliderTextHandler(self, event):
 
     def setKnob(self, value):
         self.sliderText.SetValue('%g' % value)
-        self.slider.SetValue(value * 1000)
+        self.slider.SetValue(int(value * 1000))
 
 
 class FourierDemoFrame(wx.Frame):
@@ -115,9 +115,9 @@ def __init__(self, *args, **kwargs):
         sizer = wx.BoxSizer(wx.VERTICAL)
         sizer.Add(self.canvas, 1, wx.EXPAND)
         sizer.Add(self.frequencySliderGroup.sizer, 0,
-                  wx.EXPAND | wx.ALIGN_CENTER | wx.ALL, border=5)
+                  wx.EXPAND | wx.ALL, border=5)
         sizer.Add(self.amplitudeSliderGroup.sizer, 0,
-                  wx.EXPAND | wx.ALIGN_CENTER | wx.ALL, border=5)
+                  wx.EXPAND | wx.ALL, border=5)
         panel.SetSizer(sizer)
 
     def createCanvas(self, parent):
diff --git a/examples/user_interfaces/gtk_spreadsheet_sgskip.py b/examples/user_interfaces/gtk3_spreadsheet_sgskip.py
similarity index 97%
rename from examples/user_interfaces/gtk_spreadsheet_sgskip.py
rename to examples/user_interfaces/gtk3_spreadsheet_sgskip.py
index 1f0f6e702240..925ea33faa48 100644
--- a/examples/user_interfaces/gtk_spreadsheet_sgskip.py
+++ b/examples/user_interfaces/gtk3_spreadsheet_sgskip.py
@@ -1,7 +1,7 @@
 """
-===============
-GTK Spreadsheet
-===============
+================
+GTK3 Spreadsheet
+================
 
 Example of embedding Matplotlib in an application and interacting with a
 treeview to store data.  Double click on an entry to update plot data.
diff --git a/examples/user_interfaces/gtk4_spreadsheet_sgskip.py b/examples/user_interfaces/gtk4_spreadsheet_sgskip.py
new file mode 100644
index 000000000000..047ae4cf974e
--- /dev/null
+++ b/examples/user_interfaces/gtk4_spreadsheet_sgskip.py
@@ -0,0 +1,91 @@
+"""
+================
+GTK4 Spreadsheet
+================
+
+Example of embedding Matplotlib in an application and interacting with a
+treeview to store data.  Double click on an entry to update plot data.
+"""
+
+import gi
+gi.require_version('Gtk', '4.0')
+gi.require_version('Gdk', '4.0')
+from gi.repository import Gtk
+
+from matplotlib.backends.backend_gtk4agg import FigureCanvas  # or gtk4cairo.
+
+from numpy.random import random
+from matplotlib.figure import Figure
+
+
+class DataManager(Gtk.ApplicationWindow):
+    num_rows, num_cols = 20, 10
+
+    data = random((num_rows, num_cols))
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.set_default_size(600, 600)
+
+        self.set_title('GtkListStore demo')
+
+        vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, homogeneous=False,
+                       spacing=8)
+        self.set_child(vbox)
+
+        label = Gtk.Label(label='Double click a row to plot the data')
+        vbox.append(label)
+
+        sw = Gtk.ScrolledWindow()
+        sw.set_has_frame(True)
+        sw.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
+        sw.set_hexpand(True)
+        sw.set_vexpand(True)
+        vbox.append(sw)
+
+        model = self.create_model()
+        self.treeview = Gtk.TreeView(model=model)
+        self.treeview.connect('row-activated', self.plot_row)
+        sw.set_child(self.treeview)
+
+        # Matplotlib stuff
+        fig = Figure(figsize=(6, 4), constrained_layout=True)
+
+        self.canvas = FigureCanvas(fig)  # a Gtk.DrawingArea
+        self.canvas.set_hexpand(True)
+        self.canvas.set_vexpand(True)
+        vbox.append(self.canvas)
+        ax = fig.add_subplot()
+        self.line, = ax.plot(self.data[0, :], 'go')  # plot the first row
+
+        self.add_columns()
+
+    def plot_row(self, treeview, path, view_column):
+        ind, = path  # get the index into data
+        points = self.data[ind, :]
+        self.line.set_ydata(points)
+        self.canvas.draw()
+
+    def add_columns(self):
+        for i in range(self.num_cols):
+            column = Gtk.TreeViewColumn(str(i), Gtk.CellRendererText(), text=i)
+            self.treeview.append_column(column)
+
+    def create_model(self):
+        types = [float] * self.num_cols
+        store = Gtk.ListStore(*types)
+        for row in self.data:
+            # Gtk.ListStore.append is broken in PyGObject, so insert manually.
+            it = store.insert(-1)
+            store.set(it, {i: val for i, val in enumerate(row)})
+        return store
+
+
+def on_activate(app):
+    manager = DataManager(application=app)
+    manager.show()
+
+
+app = Gtk.Application(application_id='org.matplotlib.examples.GTK4Spreadsheet')
+app.connect('activate', on_activate)
+app.run()
diff --git a/examples/user_interfaces/mathtext_wx_sgskip.py b/examples/user_interfaces/mathtext_wx_sgskip.py
index ca5a869bef5b..3e00073cca23 100644
--- a/examples/user_interfaces/mathtext_wx_sgskip.py
+++ b/examples/user_interfaces/mathtext_wx_sgskip.py
@@ -15,7 +15,6 @@
 import numpy as np
 import wx
 
-IS_GTK = 'wxGTK' in wx.PlatformInfo
 IS_WIN = 'wxMSW' in wx.PlatformInfo
 
 
@@ -66,7 +65,7 @@ def __init__(self, parent, title):
         menuBar.Append(menu, "&File")
         self.Bind(wx.EVT_MENU, self.OnClose, m_exit)
 
-        if IS_GTK or IS_WIN:
+        if IS_WIN:
             # Equation Menu
             menu = wx.Menu()
             for i, (mt, func) in enumerate(functions):
diff --git a/examples/user_interfaces/mpl_with_glade3_sgskip.py b/examples/user_interfaces/mpl_with_glade3_sgskip.py
index 2464c5e04c41..5e6a43caca61 100644
--- a/examples/user_interfaces/mpl_with_glade3_sgskip.py
+++ b/examples/user_interfaces/mpl_with_glade3_sgskip.py
@@ -1,8 +1,7 @@
 """
 =======================
-Matplotlib With Glade 3
+Matplotlib with Glade 3
 =======================
-
 """
 
 from pathlib import Path
diff --git a/examples/user_interfaces/pylab_with_gtk_sgskip.py b/examples/user_interfaces/pylab_with_gtk3_sgskip.py
similarity index 96%
rename from examples/user_interfaces/pylab_with_gtk_sgskip.py
rename to examples/user_interfaces/pylab_with_gtk3_sgskip.py
index 561bdbad341c..4d943032df5a 100644
--- a/examples/user_interfaces/pylab_with_gtk_sgskip.py
+++ b/examples/user_interfaces/pylab_with_gtk3_sgskip.py
@@ -1,7 +1,7 @@
 """
-===============
-pyplot with GTK
-===============
+================
+pyplot with GTK3
+================
 
 An example of how to use pyplot to manage your figure windows, but modify the
 GUI by accessing the underlying GTK widgets.
@@ -46,6 +46,7 @@
 vbox.pack_start(label, False, False, 0)
 vbox.reorder_child(toolbar, -1)
 
+
 def update(event):
     if event.xdata is None:
         label.set_markup('Drag mouse over axes for position')
@@ -53,6 +54,7 @@ def update(event):
         label.set_markup(
             f'<span color="#ef0000">x,y=({event.xdata}, {event.ydata})</span>')
 
+
 fig.canvas.mpl_connect('motion_notify_event', update)
 
 plt.show()
diff --git a/examples/user_interfaces/pylab_with_gtk4_sgskip.py b/examples/user_interfaces/pylab_with_gtk4_sgskip.py
new file mode 100644
index 000000000000..6e0cebcce23c
--- /dev/null
+++ b/examples/user_interfaces/pylab_with_gtk4_sgskip.py
@@ -0,0 +1,51 @@
+"""
+================
+pyplot with GTK4
+================
+
+An example of how to use pyplot to manage your figure windows, but modify the
+GUI by accessing the underlying GTK widgets.
+"""
+
+import matplotlib
+matplotlib.use('GTK4Agg')  # or 'GTK4Cairo'
+import matplotlib.pyplot as plt
+
+import gi
+gi.require_version('Gtk', '4.0')
+from gi.repository import Gtk
+
+
+fig, ax = plt.subplots()
+ax.plot([1, 2, 3], 'ro-', label='easy as 1 2 3')
+ax.plot([1, 4, 9], 'gs--', label='easy as 1 2 3 squared')
+ax.legend()
+
+manager = fig.canvas.manager
+# you can access the window or vbox attributes this way
+toolbar = manager.toolbar
+vbox = manager.vbox
+
+# now let's add a button to the toolbar
+button = Gtk.Button(label='Click me')
+button.connect('clicked', lambda button: print('hi mom'))
+button.set_tooltip_text('Click me for fun and profit')
+toolbar.append(button)
+
+# now let's add a widget to the vbox
+label = Gtk.Label()
+label.set_markup('Drag mouse over axes for position')
+vbox.insert_child_after(label, fig.canvas)
+
+
+def update(event):
+    if event.xdata is None:
+        label.set_markup('Drag mouse over axes for position')
+    else:
+        label.set_markup(
+            f'<span color="#ef0000">x,y=({event.xdata}, {event.ydata})</span>')
+
+
+fig.canvas.mpl_connect('motion_notify_event', update)
+
+plt.show()
diff --git a/examples/user_interfaces/svg_histogram_sgskip.py b/examples/user_interfaces/svg_histogram_sgskip.py
index 026cb5b1cc03..4311399fcae6 100644
--- a/examples/user_interfaces/svg_histogram_sgskip.py
+++ b/examples/user_interfaces/svg_histogram_sgskip.py
@@ -149,7 +149,7 @@
 """ % json.dumps(hist_patches)
 
 # Add a transition effect
-css = tree.getchildren()[0][0]
+css = tree.find('.//{http://www.w3.org/2000/svg}style')
 css.text = css.text + "g {-webkit-transition:opacity 0.4s ease-out;" + \
     "-moz-transition:opacity 0.4s ease-out;}"
 
diff --git a/examples/user_interfaces/toolmanager_sgskip.py b/examples/user_interfaces/toolmanager_sgskip.py
index cec5e577051f..aa381cc2f490 100644
--- a/examples/user_interfaces/toolmanager_sgskip.py
+++ b/examples/user_interfaces/toolmanager_sgskip.py
@@ -3,25 +3,26 @@
 Tool Manager
 ============
 
-This example demonstrates how to:
+This example demonstrates how to
 
-* Modify the Toolbar
-* Create tools
-* Add tools
-* Remove tools
+* modify the Toolbar
+* create tools
+* add tools
+* remove tools
 
-Using `matplotlib.backend_managers.ToolManager`
+using `matplotlib.backend_managers.ToolManager`.
 """
 
 import matplotlib.pyplot as plt
-plt.rcParams['toolbar'] = 'toolmanager'
 from matplotlib.backend_tools import ToolBase, ToolToggleBase
 
 
+plt.rcParams['toolbar'] = 'toolmanager'
+
+
 class ListTools(ToolBase):
     """List all the tools controlled by the `ToolManager`."""
-    # keyboard shortcut
-    default_keymap = 'm'
+    default_keymap = 'm'  # keyboard shortcut
     description = 'List Tools'
 
     def trigger(self, *args, **kwargs):
@@ -77,7 +78,6 @@ def set_lines_visibility(self, state):
 fig.canvas.manager.toolmanager.add_tool('List', ListTools)
 fig.canvas.manager.toolmanager.add_tool('Show', GroupHideTool, gid='mygroup')
 
-
 # Add an existing tool to new group `foo`.
 # It can be added as many times as we want
 fig.canvas.manager.toolbar.add_tool('zoom', 'foo')
diff --git a/examples/user_interfaces/web_application_server_sgskip.py b/examples/user_interfaces/web_application_server_sgskip.py
index ff16277cc752..c430c24b70ed 100644
--- a/examples/user_interfaces/web_application_server_sgskip.py
+++ b/examples/user_interfaces/web_application_server_sgskip.py
@@ -44,7 +44,7 @@ def hello():
 #############################################################################
 #
 # Since the above code is a Flask application, it should be run using the
-# `flask command-line tool <https://flask.palletsprojects.com/en/master/cli/>`_
+# `flask command-line tool <https://flask.palletsprojects.com/en/latest/cli/>`_
 # Assuming that the working directory contains this script:
 #
 # Unix-like systems
diff --git a/examples/userdemo/anchored_box01.py b/examples/userdemo/anchored_box01.py
deleted file mode 100644
index 00f75c7f5518..000000000000
--- a/examples/userdemo/anchored_box01.py
+++ /dev/null
@@ -1,18 +0,0 @@
-"""
-==============
-Anchored Box01
-==============
-
-"""
-import matplotlib.pyplot as plt
-from matplotlib.offsetbox import AnchoredText
-
-
-fig, ax = plt.subplots(figsize=(3, 3))
-
-at = AnchoredText("Figure 1a",
-                  prop=dict(size=15), frameon=True, loc='upper left')
-at.patch.set_boxstyle("round,pad=0.,rounding_size=0.2")
-ax.add_artist(at)
-
-plt.show()
diff --git a/examples/userdemo/anchored_box02.py b/examples/userdemo/anchored_box02.py
deleted file mode 100644
index 59db0a4180a8..000000000000
--- a/examples/userdemo/anchored_box02.py
+++ /dev/null
@@ -1,23 +0,0 @@
-"""
-==============
-Anchored Box02
-==============
-
-"""
-from matplotlib.patches import Circle
-import matplotlib.pyplot as plt
-from mpl_toolkits.axes_grid1.anchored_artists import AnchoredDrawingArea
-
-
-fig, ax = plt.subplots(figsize=(3, 3))
-
-ada = AnchoredDrawingArea(40, 20, 0, 0,
-                          loc='upper right', pad=0., frameon=False)
-p1 = Circle((10, 10), 10)
-ada.drawing_area.add_artist(p1)
-p2 = Circle((30, 10), 5, fc="r")
-ada.drawing_area.add_artist(p2)
-
-ax.add_artist(ada)
-
-plt.show()
diff --git a/examples/userdemo/anchored_box03.py b/examples/userdemo/anchored_box03.py
deleted file mode 100644
index ba673d8471a5..000000000000
--- a/examples/userdemo/anchored_box03.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-==============
-Anchored Box03
-==============
-
-"""
-from matplotlib.patches import Ellipse
-import matplotlib.pyplot as plt
-from mpl_toolkits.axes_grid1.anchored_artists import AnchoredAuxTransformBox
-
-
-fig, ax = plt.subplots(figsize=(3, 3))
-
-box = AnchoredAuxTransformBox(ax.transData, loc='upper left')
-el = Ellipse((0, 0), width=0.1, height=0.4, angle=30)  # in data coordinates!
-box.drawing_area.add_artist(el)
-
-ax.add_artist(box)
-
-plt.show()
diff --git a/examples/userdemo/anchored_box04.py b/examples/userdemo/anchored_box04.py
index d641e7a18ac4..2a4a0f4cea07 100644
--- a/examples/userdemo/anchored_box04.py
+++ b/examples/userdemo/anchored_box04.py
@@ -12,7 +12,7 @@
 
 fig, ax = plt.subplots(figsize=(3, 3))
 
-box1 = TextArea(" Test : ", textprops=dict(color="k"))
+box1 = TextArea(" Test: ", textprops=dict(color="k"))
 
 box2 = DrawingArea(60, 20, 0, 0)
 el1 = Ellipse((10, 10), width=16, height=5, angle=30, fc="r")
diff --git a/examples/userdemo/colormap_normalizations_symlognorm.py b/examples/userdemo/colormap_normalizations_symlognorm.py
deleted file mode 100644
index ff0d4872f75e..000000000000
--- a/examples/userdemo/colormap_normalizations_symlognorm.py
+++ /dev/null
@@ -1,40 +0,0 @@
-"""
-==================================
-Colormap Normalizations Symlognorm
-==================================
-
-Demonstration of using norm to map colormaps onto data in non-linear ways.
-"""
-
-import numpy as np
-import matplotlib.pyplot as plt
-import matplotlib.colors as colors
-
-"""
-SymLogNorm: two humps, one negative and one positive, The positive
-with 5-times the amplitude. Linearly, you cannot see detail in the
-negative hump.  Here we logarithmically scale the positive and
-negative data separately.
-
-Note that colorbar labels do not come out looking very good.
-"""
-
-N = 100
-X, Y = np.mgrid[-3:3:complex(0, N), -2:2:complex(0, N)]
-Z1 = np.exp(-X**2 - Y**2)
-Z2 = np.exp(-(X - 1)**2 - (Y - 1)**2)
-Z = (Z1 - Z2) * 2
-
-fig, ax = plt.subplots(2, 1)
-
-pcm = ax[0].pcolormesh(X, Y, Z,
-                       norm=colors.SymLogNorm(linthresh=0.03, linscale=0.03,
-                                              vmin=-1.0, vmax=1.0, base=10),
-                       cmap='RdBu_r', shading='nearest')
-fig.colorbar(pcm, ax=ax[0], extend='both')
-
-pcm = ax[1].pcolormesh(X, Y, Z, cmap='RdBu_r', vmin=-np.max(Z),
-                       shading='nearest')
-fig.colorbar(pcm, ax=ax[1], extend='both')
-
-plt.show()
diff --git a/examples/userdemo/connectionstyle_demo.py b/examples/userdemo/connectionstyle_demo.py
index ad0f425a3b92..f9def1d94f24 100644
--- a/examples/userdemo/connectionstyle_demo.py
+++ b/examples/userdemo/connectionstyle_demo.py
@@ -30,7 +30,7 @@ def demo_con_style(ax, connectionstyle):
             transform=ax.transAxes, ha="left", va="top")
 
 
-fig, axs = plt.subplots(3, 5, figsize=(8, 4.8))
+fig, axs = plt.subplots(3, 5, figsize=(7, 6.3), constrained_layout=True)
 demo_con_style(axs[0, 0], "angle3,angleA=90,angleB=0")
 demo_con_style(axs[1, 0], "angle3,angleA=0,angleB=90")
 demo_con_style(axs[0, 1], "arc3,rad=0.")
@@ -47,21 +47,17 @@ def demo_con_style(ax, connectionstyle):
 demo_con_style(axs[2, 4], "bar,angle=180,fraction=-0.2")
 
 for ax in axs.flat:
-    ax.set(xlim=(0, 1), ylim=(0, 1), xticks=[], yticks=[], aspect=1)
-fig.tight_layout(pad=0.2)
+    ax.set(xlim=(0, 1), ylim=(0, 1.25), xticks=[], yticks=[], aspect=1.25)
+fig.set_constrained_layout_pads(wspace=0, hspace=0, w_pad=0, h_pad=0)
 
 plt.show()
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.annotate
-matplotlib.patches.FancyArrowPatch
+#    - `matplotlib.axes.Axes.annotate`
+#    - `matplotlib.patches.FancyArrowPatch`
diff --git a/examples/userdemo/demo_gridspec03.py b/examples/userdemo/demo_gridspec03.py
index 2fa3fa58c0fc..55f424a808f8 100644
--- a/examples/userdemo/demo_gridspec03.py
+++ b/examples/userdemo/demo_gridspec03.py
@@ -31,6 +31,7 @@ def annotate_axes(fig):
 
 annotate_axes(fig)
 
+#############################################################################
 
 fig = plt.figure()
 fig.suptitle("Controlling spacing around and between subplots")
diff --git a/examples/userdemo/pgf_fonts.py b/examples/userdemo/pgf_fonts.py
index 1f9d49853bcf..112c249752c2 100644
--- a/examples/userdemo/pgf_fonts.py
+++ b/examples/userdemo/pgf_fonts.py
@@ -1,8 +1,7 @@
 """
 =========
-Pgf Fonts
+PGF fonts
 =========
-
 """
 
 import matplotlib.pyplot as plt
diff --git a/examples/userdemo/pgf_preamble_sgskip.py b/examples/userdemo/pgf_preamble_sgskip.py
index e16ee0f1bbf5..ca193a0aecc0 100644
--- a/examples/userdemo/pgf_preamble_sgskip.py
+++ b/examples/userdemo/pgf_preamble_sgskip.py
@@ -1,8 +1,7 @@
 """
 ============
-Pgf Preamble
+PGF preamble
 ============
-
 """
 
 import matplotlib as mpl
diff --git a/examples/userdemo/pgf_texsystem.py b/examples/userdemo/pgf_texsystem.py
index dc44e8c12298..20f35b5cc906 100644
--- a/examples/userdemo/pgf_texsystem.py
+++ b/examples/userdemo/pgf_texsystem.py
@@ -1,8 +1,7 @@
 """
 =============
-Pgf Texsystem
+PGF texsystem
 =============
-
 """
 
 import matplotlib.pyplot as plt
diff --git a/examples/widgets/annotated_cursor.py b/examples/widgets/annotated_cursor.py
new file mode 100644
index 000000000000..abef5bfdc94f
--- /dev/null
+++ b/examples/widgets/annotated_cursor.py
@@ -0,0 +1,342 @@
+"""
+================
+Annotated Cursor
+================
+
+Display a data cursor including a text box, which shows the plot point close
+to the mouse pointer.
+
+The new cursor inherits from `~matplotlib.widgets.Cursor` and demonstrates the
+creation of new widgets and their event callbacks.
+
+See also the :doc:`cross hair cursor
+</gallery/event_handling/cursor_demo>`, which implements a cursor tracking the
+plotted data, but without using inheritance and without displaying the
+currently tracked coordinates.
+
+.. note::
+    The figure related to this example does not show the cursor, because that
+    figure is automatically created in a build queue, where the first mouse
+    movement, which triggers the cursor creation, is missing.
+
+"""
+from matplotlib.widgets import Cursor
+import numpy as np
+import matplotlib.pyplot as plt
+
+
+class AnnotatedCursor(Cursor):
+    """
+    A crosshair cursor like `~matplotlib.widgets.Cursor` with a text showing \
+    the current coordinates.
+
+    For the cursor to remain responsive you must keep a reference to it.
+    The data of the axis specified as *dataaxis* must be in ascending
+    order. Otherwise, the `numpy.searchsorted` call might fail and the text
+    disappears. You can satisfy the requirement by sorting the data you plot.
+    Usually the data is already sorted (if it was created e.g. using
+    `numpy.linspace`), but e.g. scatter plots might cause this problem.
+    The cursor sticks to the plotted line.
+
+    Parameters
+    ----------
+    line : `matplotlib.lines.Line2D`
+        The plot line from which the data coordinates are displayed.
+
+    numberformat : `python format string <https://docs.python.org/3/\
+    library/string.html#formatstrings>`_, optional, default: "{0:.4g};{1:.4g}"
+        The displayed text is created by calling *format()* on this string
+        with the two coordinates.
+
+    offset : (float, float) default: (5, 5)
+        The offset in display (pixel) coordinates of the text position
+        relative to the cross hair.
+
+    dataaxis : {"x", "y"}, optional, default: "x"
+        If "x" is specified, the vertical cursor line sticks to the mouse
+        pointer. The horizontal cursor line sticks to *line*
+        at that x value. The text shows the data coordinates of *line*
+        at the pointed x value. If you specify "y", it works in the opposite
+        manner. But: For the "y" value, where the mouse points to, there might
+        be multiple matching x values, if the plotted function is not biunique.
+        Cursor and text coordinate will always refer to only one x value.
+        So if you use the parameter value "y", ensure that your function is
+        biunique.
+
+    Other Parameters
+    ----------------
+    textprops : `matplotlib.text` properties as dictionary
+        Specifies the appearance of the rendered text object.
+
+    **cursorargs : `matplotlib.widgets.Cursor` properties
+        Arguments passed to the internal `~matplotlib.widgets.Cursor` instance.
+        The `matplotlib.axes.Axes` argument is mandatory! The parameter
+        *useblit* can be set to *True* in order to achieve faster rendering.
+
+    """
+
+    def __init__(self, line, numberformat="{0:.4g};{1:.4g}", offset=(5, 5),
+                 dataaxis='x', textprops=None, **cursorargs):
+        if textprops is None:
+            textprops = {}
+        # The line object, for which the coordinates are displayed
+        self.line = line
+        # The format string, on which .format() is called for creating the text
+        self.numberformat = numberformat
+        # Text position offset
+        self.offset = np.array(offset)
+        # The axis in which the cursor position is looked up
+        self.dataaxis = dataaxis
+
+        # First call baseclass constructor.
+        # Draws cursor and remembers background for blitting.
+        # Saves ax as class attribute.
+        super().__init__(**cursorargs)
+
+        # Default value for position of text.
+        self.set_position(self.line.get_xdata()[0], self.line.get_ydata()[0])
+        # Create invisible animated text
+        self.text = self.ax.text(
+            self.ax.get_xbound()[0],
+            self.ax.get_ybound()[0],
+            "0, 0",
+            animated=bool(self.useblit),
+            visible=False, **textprops)
+        # The position at which the cursor was last drawn
+        self.lastdrawnplotpoint = None
+
+    def onmove(self, event):
+        """
+        Overridden draw callback for cursor. Called when moving the mouse.
+        """
+
+        # Leave method under the same conditions as in overridden method
+        if self.ignore(event):
+            self.lastdrawnplotpoint = None
+            return
+        if not self.canvas.widgetlock.available(self):
+            self.lastdrawnplotpoint = None
+            return
+
+        # If the mouse left drawable area, we now make the text invisible.
+        # Baseclass will redraw complete canvas after, which makes both text
+        # and cursor disappear.
+        if event.inaxes != self.ax:
+            self.lastdrawnplotpoint = None
+            self.text.set_visible(False)
+            super().onmove(event)
+            return
+
+        # Get the coordinates, which should be displayed as text,
+        # if the event coordinates are valid.
+        plotpoint = None
+        if event.xdata is not None and event.ydata is not None:
+            # Get plot point related to current x position.
+            # These coordinates are displayed in text.
+            plotpoint = self.set_position(event.xdata, event.ydata)
+            # Modify event, such that the cursor is displayed on the
+            # plotted line, not at the mouse pointer,
+            # if the returned plot point is valid
+            if plotpoint is not None:
+                event.xdata = plotpoint[0]
+                event.ydata = plotpoint[1]
+
+        # If the plotpoint is given, compare to last drawn plotpoint and
+        # return if they are the same.
+        # Skip even the call of the base class, because this would restore the
+        # background, draw the cursor lines and would leave us the job to
+        # re-draw the text.
+        if plotpoint is not None and plotpoint == self.lastdrawnplotpoint:
+            return
+
+        # Baseclass redraws canvas and cursor. Due to blitting,
+        # the added text is removed in this call, because the
+        # background is redrawn.
+        super().onmove(event)
+
+        # Check if the display of text is still necessary.
+        # If not, just return.
+        # This behaviour is also cloned from the base class.
+        if not self.get_active() or not self.visible:
+            return
+
+        # Draw the widget, if event coordinates are valid.
+        if plotpoint is not None:
+            # Update position and displayed text.
+            # Position: Where the event occurred.
+            # Text: Determined by set_position() method earlier
+            # Position is transformed to pixel coordinates,
+            # an offset is added there and this is transformed back.
+            temp = [event.xdata, event.ydata]
+            temp = self.ax.transData.transform(temp)
+            temp = temp + self.offset
+            temp = self.ax.transData.inverted().transform(temp)
+            self.text.set_position(temp)
+            self.text.set_text(self.numberformat.format(*plotpoint))
+            self.text.set_visible(self.visible)
+
+            # Tell base class, that we have drawn something.
+            # Baseclass needs to know, that it needs to restore a clean
+            # background, if the cursor leaves our figure context.
+            self.needclear = True
+
+            # Remember the recently drawn cursor position, so events for the
+            # same position (mouse moves slightly between two plot points)
+            # can be skipped
+            self.lastdrawnplotpoint = plotpoint
+        # otherwise, make text invisible
+        else:
+            self.text.set_visible(False)
+
+        # Draw changes. Cannot use _update method of baseclass,
+        # because it would first restore the background, which
+        # is done already and is not necessary.
+        if self.useblit:
+            self.ax.draw_artist(self.text)
+            self.canvas.blit(self.ax.bbox)
+        else:
+            # If blitting is deactivated, the overridden _update call made
+            # by the base class immediately returned.
+            # We still have to draw the changes.
+            self.canvas.draw_idle()
+
+    def set_position(self, xpos, ypos):
+        """
+        Finds the coordinates, which have to be shown in text.
+
+        The behaviour depends on the *dataaxis* attribute. Function looks
+        up the matching plot coordinate for the given mouse position.
+
+        Parameters
+        ----------
+        xpos : float
+            The current x position of the cursor in data coordinates.
+            Important if *dataaxis* is set to 'x'.
+        ypos : float
+            The current y position of the cursor in data coordinates.
+            Important if *dataaxis* is set to 'y'.
+
+        Returns
+        -------
+        ret : {2D array-like, None}
+            The coordinates which should be displayed.
+            *None* is the fallback value.
+        """
+
+        # Get plot line data
+        xdata = self.line.get_xdata()
+        ydata = self.line.get_ydata()
+
+        # The dataaxis attribute decides, in which axis we look up which cursor
+        # coordinate.
+        if self.dataaxis == 'x':
+            pos = xpos
+            data = xdata
+            lim = self.ax.get_xlim()
+        elif self.dataaxis == 'y':
+            pos = ypos
+            data = ydata
+            lim = self.ax.get_ylim()
+        else:
+            raise ValueError(f"The data axis specifier {self.dataaxis} should "
+                             f"be 'x' or 'y'")
+
+        # If position is valid and in valid plot data range.
+        if pos is not None and lim[0] <= pos <= lim[-1]:
+            # Find closest x value in sorted x vector.
+            # This requires the plotted data to be sorted.
+            index = np.searchsorted(data, pos)
+            # Return none, if this index is out of range.
+            if index < 0 or index >= len(data):
+                return None
+            # Return plot point as tuple.
+            return (xdata[index], ydata[index])
+
+        # Return none if there is no good related point for this x position.
+        return None
+
+    def clear(self, event):
+        """
+        Overridden clear callback for cursor, called before drawing the figure.
+        """
+
+        # The base class saves the clean background for blitting.
+        # Text and cursor are invisible,
+        # until the first mouse move event occurs.
+        super().clear(event)
+        if self.ignore(event):
+            return
+        self.text.set_visible(False)
+
+    def _update(self):
+        """
+        Overridden method for either blitting or drawing the widget canvas.
+
+        Passes call to base class if blitting is activated, only.
+        In other cases, one draw_idle call is enough, which is placed
+        explicitly in this class (see *onmove()*).
+        In that case, `~matplotlib.widgets.Cursor` is not supposed to draw
+        something using this method.
+        """
+
+        if self.useblit:
+            super()._update()
+
+
+fig, ax = plt.subplots(figsize=(8, 6))
+ax.set_title("Cursor Tracking x Position")
+
+x = np.linspace(-5, 5, 1000)
+y = x**2
+
+line, = ax.plot(x, y)
+ax.set_xlim(-5, 5)
+ax.set_ylim(0, 25)
+
+# A minimum call
+# Set useblit=True on most backends for enhanced performance
+# and pass the ax parameter to the Cursor base class.
+# cursor = AnnotatedCursor(line=lin[0], ax=ax, useblit=True)
+
+# A more advanced call. Properties for text and lines are passed.
+# Watch the passed color names and the color of cursor line and text, to
+# relate the passed options to graphical elements.
+# The dataaxis parameter is still the default.
+cursor = AnnotatedCursor(
+    line=line,
+    numberformat="{0:.2f}\n{1:.2f}",
+    dataaxis='x', offset=[10, 10],
+    textprops={'color': 'blue', 'fontweight': 'bold'},
+    ax=ax,
+    useblit=True,
+    color='red',
+    linewidth=2)
+
+plt.show()
+
+###############################################################################
+# Trouble with non-biunique functions
+# -----------------------------------
+# A call demonstrating problems with the *dataaxis=y* parameter.
+# The text now looks up the matching x value for the current cursor y position
+# instead of vice versa. Hover your cursor to y=4. There are two x values
+# producing this y value: -2 and 2. The function is only unique,
+# but not biunique. Only one value is shown in the text.
+
+fig, ax = plt.subplots(figsize=(8, 6))
+ax.set_title("Cursor Tracking y Position")
+
+line, = ax.plot(x, y)
+ax.set_xlim(-5, 5)
+ax.set_ylim(0, 25)
+
+cursor = AnnotatedCursor(
+    line=line,
+    numberformat="{0:.2f}\n{1:.2f}",
+    dataaxis='y', offset=[10, 10],
+    textprops={'color': 'blue', 'fontweight': 'bold'},
+    ax=ax,
+    useblit=True,
+    color='red', linewidth=2)
+
+plt.show()
diff --git a/examples/widgets/buttons.py b/examples/widgets/buttons.py
index b1b918e479c6..24331a4acd00 100644
--- a/examples/widgets/buttons.py
+++ b/examples/widgets/buttons.py
@@ -16,10 +16,10 @@
 freqs = np.arange(2, 20, 3)
 
 fig, ax = plt.subplots()
-plt.subplots_adjust(bottom=0.2)
+fig.subplots_adjust(bottom=0.2)
 t = np.arange(0.0, 1.0, 0.001)
 s = np.sin(2*np.pi*freqs[0]*t)
-l, = plt.plot(t, s, lw=2)
+l, = ax.plot(t, s, lw=2)
 
 
 class Index:
@@ -40,8 +40,8 @@ def prev(self, event):
         plt.draw()
 
 callback = Index()
-axprev = plt.axes([0.7, 0.05, 0.1, 0.075])
-axnext = plt.axes([0.81, 0.05, 0.1, 0.075])
+axprev = fig.add_axes([0.7, 0.05, 0.1, 0.075])
+axnext = fig.add_axes([0.81, 0.05, 0.1, 0.075])
 bnext = Button(axnext, 'Next')
 bnext.on_clicked(callback.next)
 bprev = Button(axprev, 'Previous')
@@ -51,13 +51,9 @@ def prev(self, event):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.widgets.Button
+#    - `matplotlib.widgets.Button`
diff --git a/examples/widgets/check_buttons.py b/examples/widgets/check_buttons.py
index 9a499a25ebce..d4a96c7f95d0 100644
--- a/examples/widgets/check_buttons.py
+++ b/examples/widgets/check_buttons.py
@@ -9,6 +9,7 @@
 check boxes. There are 3 different sine waves shown and we can choose which
 waves are displayed with the check buttons.
 """
+
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib.widgets import CheckButtons
@@ -22,12 +23,12 @@
 l0, = ax.plot(t, s0, visible=False, lw=2, color='k', label='2 Hz')
 l1, = ax.plot(t, s1, lw=2, color='r', label='4 Hz')
 l2, = ax.plot(t, s2, lw=2, color='g', label='6 Hz')
-plt.subplots_adjust(left=0.2)
+fig.subplots_adjust(left=0.2)
 
 lines = [l0, l1, l2]
 
 # Make checkbuttons with all plotted lines with correct visibility
-rax = plt.axes([0.05, 0.4, 0.1, 0.15])
+rax = fig.add_axes([0.05, 0.4, 0.1, 0.15])
 labels = [str(line.get_label()) for line in lines]
 visibility = [line.get_visible() for line in lines]
 check = CheckButtons(rax, labels, visibility)
@@ -44,13 +45,9 @@ def func(label):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.widgets.CheckButtons
+#    - `matplotlib.widgets.CheckButtons`
diff --git a/examples/widgets/cursor.py b/examples/widgets/cursor.py
index d95c53da5f84..151a8dd08d4c 100644
--- a/examples/widgets/cursor.py
+++ b/examples/widgets/cursor.py
@@ -12,8 +12,7 @@
 # Fixing random state for reproducibility
 np.random.seed(19680801)
 
-fig = plt.figure(figsize=(8, 6))
-ax = fig.add_subplot(facecolor='#FFFFCC')
+fig, ax = plt.subplots(figsize=(8, 6))
 
 x, y = 4*(np.random.rand(2, 100) - .5)
 ax.plot(x, y, 'o')
@@ -27,13 +26,9 @@
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.widgets.Cursor
+#    - `matplotlib.widgets.Cursor`
diff --git a/examples/widgets/lasso_selector_demo_sgskip.py b/examples/widgets/lasso_selector_demo_sgskip.py
index 4827517f7b6f..f1b84316595e 100644
--- a/examples/widgets/lasso_selector_demo_sgskip.py
+++ b/examples/widgets/lasso_selector_demo_sgskip.py
@@ -102,14 +102,10 @@ def accept(event):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.widgets.LassoSelector
-matplotlib.path.Path
+#    - `matplotlib.widgets.LassoSelector`
+#    - `matplotlib.path.Path`
diff --git a/examples/widgets/mouse_cursor.py b/examples/widgets/mouse_cursor.py
new file mode 100644
index 000000000000..1b0a1b2c57c3
--- /dev/null
+++ b/examples/widgets/mouse_cursor.py
@@ -0,0 +1,46 @@
+"""
+============
+Mouse Cursor
+============
+
+This example sets an alternative cursor on a figure canvas.
+
+Note, this is an interactive example, and must be run to see the effect.
+"""
+
+import matplotlib.pyplot as plt
+from matplotlib.backend_tools import Cursors
+
+
+fig, axs = plt.subplots(len(Cursors), figsize=(6, len(Cursors) + 0.5),
+                        gridspec_kw={'hspace': 0})
+fig.suptitle('Hover over an Axes to see alternate Cursors')
+
+for cursor, ax in zip(Cursors, axs):
+    ax.cursor_to_use = cursor
+    ax.text(0.5, 0.5, cursor.name,
+            horizontalalignment='center', verticalalignment='center')
+    ax.set(xticks=[], yticks=[])
+
+
+def hover(event):
+    if fig.canvas.widgetlock.locked():
+        # Don't do anything if the zoom/pan tools have been enabled.
+        return
+
+    fig.canvas.set_cursor(
+        event.inaxes.cursor_to_use if event.inaxes else Cursors.POINTER)
+
+
+fig.canvas.mpl_connect('motion_notify_event', hover)
+
+plt.show()
+
+#############################################################################
+#
+# .. admonition:: References
+#
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
+#
+#    - `matplotlib.backend_bases.FigureCanvasBase.set_cursor`
diff --git a/examples/widgets/multicursor.py b/examples/widgets/multicursor.py
index 0916a5134442..618fa17c5ad6 100644
--- a/examples/widgets/multicursor.py
+++ b/examples/widgets/multicursor.py
@@ -5,33 +5,34 @@
 
 Showing a cursor on multiple plots simultaneously.
 
-This example generates two subplots and on hovering the cursor over data in one
-subplot, the values of that datapoint are shown in both respectively.
+This example generates three axes split over two different figures.  On
+hovering the cursor over data in one subplot, the values of that datapoint are
+shown in all axes.
 """
+
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib.widgets import MultiCursor
 
 t = np.arange(0.0, 2.0, 0.01)
 s1 = np.sin(2*np.pi*t)
-s2 = np.sin(4*np.pi*t)
+s2 = np.sin(3*np.pi*t)
+s3 = np.sin(4*np.pi*t)
 
 fig, (ax1, ax2) = plt.subplots(2, sharex=True)
 ax1.plot(t, s1)
 ax2.plot(t, s2)
+fig, ax3 = plt.subplots()
+ax3.plot(t, s3)
 
-multi = MultiCursor(fig.canvas, (ax1, ax2), color='r', lw=1)
+multi = MultiCursor(None, (ax1, ax2, ax3), color='r', lw=1)
 plt.show()
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.widgets.MultiCursor
+#    - `matplotlib.widgets.MultiCursor`
diff --git a/examples/widgets/polygon_selector_demo.py b/examples/widgets/polygon_selector_demo.py
index d4b14154ef3b..da9e65c39268 100644
--- a/examples/widgets/polygon_selector_demo.py
+++ b/examples/widgets/polygon_selector_demo.py
@@ -1,7 +1,7 @@
 """
-================
-Polygon Selector
-================
+=======================================================
+Select indices from a collection using polygon selector
+=======================================================
 
 Shows how one can select indices of a polygon interactively.
 """
@@ -50,7 +50,7 @@ def __init__(self, ax, collection, alpha_other=0.3):
         elif len(self.fc) == 1:
             self.fc = np.tile(self.fc, (self.Npts, 1))
 
-        self.poly = PolygonSelector(ax, self.onselect)
+        self.poly = PolygonSelector(ax, self.onselect, draw_bounding_box=True)
         self.ind = []
 
     def onselect(self, verts):
@@ -94,14 +94,10 @@ def disconnect(self):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.widgets.PolygonSelector
-matplotlib.path.Path
+#    - `matplotlib.widgets.PolygonSelector`
+#    - `matplotlib.path.Path`
diff --git a/examples/widgets/polygon_selector_simple.py b/examples/widgets/polygon_selector_simple.py
new file mode 100644
index 000000000000..cdc84b07eaf6
--- /dev/null
+++ b/examples/widgets/polygon_selector_simple.py
@@ -0,0 +1,46 @@
+"""
+================
+Polygon Selector
+================
+
+Shows how to create a polygon programmatically or interactively
+"""
+
+import matplotlib.pyplot as plt
+from matplotlib.widgets import PolygonSelector
+
+###############################################################################
+#
+# To create the polygon programmatically
+fig, ax = plt.subplots()
+fig.show()
+
+selector = PolygonSelector(ax, lambda *args: None)
+
+# Add three vertices
+selector.verts = [(0.1, 0.4), (0.5, 0.9), (0.3, 0.2)]
+
+
+###############################################################################
+#
+# To create the polygon interactively
+
+fig2, ax2 = plt.subplots()
+fig2.show()
+
+selector2 = PolygonSelector(ax2, lambda *args: None)
+
+print("Click on the figure to create a polygon.")
+print("Press the 'esc' key to start a new polygon.")
+print("Try holding the 'shift' key to move all of the vertices.")
+print("Try holding the 'ctrl' key to move a single vertex.")
+
+
+#############################################################################
+#
+# .. admonition:: References
+#
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
+#
+#    - `matplotlib.widgets.PolygonSelector`
diff --git a/examples/widgets/radio_buttons.py b/examples/widgets/radio_buttons.py
index abad1f5f1efa..28e446fc5b80 100644
--- a/examples/widgets/radio_buttons.py
+++ b/examples/widgets/radio_buttons.py
@@ -9,6 +9,7 @@
 In this case, the buttons let the user choose one of the three different sine
 waves to be shown in the plot.
 """
+
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib.widgets import RadioButtons
@@ -20,10 +21,10 @@
 
 fig, ax = plt.subplots()
 l, = ax.plot(t, s0, lw=2, color='red')
-plt.subplots_adjust(left=0.3)
+fig.subplots_adjust(left=0.3)
 
 axcolor = 'lightgoldenrodyellow'
-rax = plt.axes([0.05, 0.7, 0.15, 0.15], facecolor=axcolor)
+rax = fig.add_axes([0.05, 0.7, 0.15, 0.15], facecolor=axcolor)
 radio = RadioButtons(rax, ('2 Hz', '4 Hz', '8 Hz'))
 
 
@@ -34,7 +35,7 @@ def hzfunc(label):
     plt.draw()
 radio.on_clicked(hzfunc)
 
-rax = plt.axes([0.05, 0.4, 0.15, 0.15], facecolor=axcolor)
+rax = fig.add_axes([0.05, 0.4, 0.15, 0.15], facecolor=axcolor)
 radio2 = RadioButtons(rax, ('red', 'blue', 'green'))
 
 
@@ -43,8 +44,8 @@ def colorfunc(label):
     plt.draw()
 radio2.on_clicked(colorfunc)
 
-rax = plt.axes([0.05, 0.1, 0.15, 0.15], facecolor=axcolor)
-radio3 = RadioButtons(rax, ('-', '--', '-.', 'steps', ':'))
+rax = fig.add_axes([0.05, 0.1, 0.15, 0.15], facecolor=axcolor)
+radio3 = RadioButtons(rax, ('-', '--', '-.', ':'))
 
 
 def stylefunc(label):
@@ -56,13 +57,9 @@ def stylefunc(label):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.widgets.RadioButtons
+#    - `matplotlib.widgets.RadioButtons`
diff --git a/examples/widgets/range_slider.py b/examples/widgets/range_slider.py
index 9dc104251786..bdb69fa80859 100644
--- a/examples/widgets/range_slider.py
+++ b/examples/widgets/range_slider.py
@@ -26,14 +26,14 @@
 img = np.random.randn(N, N)
 
 fig, axs = plt.subplots(1, 2, figsize=(10, 5))
-plt.subplots_adjust(bottom=0.25)
+fig.subplots_adjust(bottom=0.25)
 
 im = axs[0].imshow(img)
 axs[1].hist(img.flatten(), bins='auto')
 axs[1].set_title('Histogram of pixel intensities')
 
 # Create the RangeSlider
-slider_ax = plt.axes([0.20, 0.1, 0.60, 0.03])
+slider_ax = fig.add_axes([0.20, 0.1, 0.60, 0.03])
 slider = RangeSlider(slider_ax, "Threshold", img.min(), img.max())
 
 # Create the Vertical lines on the histogram
@@ -62,13 +62,9 @@ def update(val):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.widgets.RangeSlider
+#    - `matplotlib.widgets.RangeSlider`
diff --git a/examples/widgets/rectangle_selector.py b/examples/widgets/rectangle_selector.py
index 4dcab351dd8e..8ede9ad66fc4 100644
--- a/examples/widgets/rectangle_selector.py
+++ b/examples/widgets/rectangle_selector.py
@@ -1,22 +1,21 @@
 """
-==================
-Rectangle Selector
-==================
+===============================
+Rectangle and ellipse selectors
+===============================
 
-Do a mouseclick somewhere, move the mouse to some destination, release
-the button.  This class gives click- and release-events and also draws
-a line or a box from the click-point to the actual mouseposition
-(within the same axes) until the button is released.  Within the
-method ``self.ignore()`` it is checked whether the button from eventpress
-and eventrelease are the same.
+Click somewhere, move the mouse, and release the mouse button.
+`.RectangleSelector` and `.EllipseSelector` draw a rectangle or an ellipse
+from the initial click position to the current mouse position (within the same
+axes) until the button is released.  A connected callback receives the click-
+and release-events.
 """
 
-from matplotlib.widgets import RectangleSelector
+from matplotlib.widgets import EllipseSelector, RectangleSelector
 import numpy as np
 import matplotlib.pyplot as plt
 
 
-def line_select_callback(eclick, erelease):
+def select_callback(eclick, erelease):
     """
     Callback for line selection.
 
@@ -25,48 +24,50 @@ def line_select_callback(eclick, erelease):
     x1, y1 = eclick.xdata, eclick.ydata
     x2, y2 = erelease.xdata, erelease.ydata
     print(f"({x1:3.2f}, {y1:3.2f}) --> ({x2:3.2f}, {y2:3.2f})")
-    print(f" The buttons you used were: {eclick.button} {erelease.button}")
+    print(f"The buttons you used were: {eclick.button} {erelease.button}")
 
 
 def toggle_selector(event):
-    print(' Key pressed.')
+    print('Key pressed.')
     if event.key == 't':
-        if toggle_selector.RS.active:
-            print(' RectangleSelector deactivated.')
-            toggle_selector.RS.set_active(False)
-        else:
-            print(' RectangleSelector activated.')
-            toggle_selector.RS.set_active(True)
+        for selector in selectors:
+            name = type(selector).__name__
+            if selector.active:
+                print(f'{name} deactivated.')
+                selector.set_active(False)
+            else:
+                print(f'{name} activated.')
+                selector.set_active(True)
 
 
-fig, ax = plt.subplots()
+fig = plt.figure(constrained_layout=True)
+axs = fig.subplots(2)
+
 N = 100000  # If N is large one can see improvement by using blitting.
 x = np.linspace(0, 10, N)
 
-ax.plot(x, np.sin(2*np.pi*x))  # plot something
-ax.set_title(
-    "Click and drag to draw a rectangle.\n"
-    "Press 't' to toggle the selector on and off.")
-
-# drawtype is 'box' or 'line' or 'none'
-toggle_selector.RS = RectangleSelector(ax, line_select_callback,
-                                       drawtype='box', useblit=True,
-                                       button=[1, 3],  # disable middle button
-                                       minspanx=5, minspany=5,
-                                       spancoords='pixels',
-                                       interactive=True)
-fig.canvas.mpl_connect('key_press_event', toggle_selector)
+selectors = []
+for ax, selector_class in zip(axs, [RectangleSelector, EllipseSelector]):
+    ax.plot(x, np.sin(2*np.pi*x))  # plot something
+    ax.set_title(f"Click and drag to draw a {selector_class.__name__}.")
+    selectors.append(selector_class(
+        ax, select_callback,
+        useblit=True,
+        button=[1, 3],  # disable middle button
+        minspanx=5, minspany=5,
+        spancoords='pixels',
+        interactive=True))
+    fig.canvas.mpl_connect('key_press_event', toggle_selector)
+axs[0].set_title("Press 't' to toggle the selectors on and off.\n"
+                 + axs[0].get_title())
 plt.show()
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.widgets.RectangleSelector
+#    - `matplotlib.widgets.RectangleSelector`
+#    - `matplotlib.widgets.EllipseSelector`
diff --git a/examples/widgets/slider_demo.py b/examples/widgets/slider_demo.py
index fade13904618..6f849645f9bf 100644
--- a/examples/widgets/slider_demo.py
+++ b/examples/widgets/slider_demo.py
@@ -12,6 +12,7 @@
 See :doc:`/gallery/widgets/range_slider` for an example of using
 a ``RangeSlider`` to define a range of values.
 """
+
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib.widgets import Slider, Button
@@ -29,17 +30,14 @@ def f(t, amplitude, frequency):
 
 # Create the figure and the line that we will manipulate
 fig, ax = plt.subplots()
-line, = plt.plot(t, f(t, init_amplitude, init_frequency), lw=2)
+line, = ax.plot(t, f(t, init_amplitude, init_frequency), lw=2)
 ax.set_xlabel('Time [s]')
 
-axcolor = 'lightgoldenrodyellow'
-ax.margins(x=0)
-
 # adjust the main plot to make room for the sliders
-plt.subplots_adjust(left=0.25, bottom=0.25)
+fig.subplots_adjust(left=0.25, bottom=0.25)
 
 # Make a horizontal slider to control the frequency.
-axfreq = plt.axes([0.25, 0.1, 0.65, 0.03], facecolor=axcolor)
+axfreq = fig.add_axes([0.25, 0.1, 0.65, 0.03])
 freq_slider = Slider(
     ax=axfreq,
     label='Frequency [Hz]',
@@ -49,7 +47,7 @@ def f(t, amplitude, frequency):
 )
 
 # Make a vertically oriented slider to control the amplitude
-axamp = plt.axes([0.1, 0.25, 0.0225, 0.63], facecolor=axcolor)
+axamp = fig.add_axes([0.1, 0.25, 0.0225, 0.63])
 amp_slider = Slider(
     ax=axamp,
     label="Amplitude",
@@ -71,8 +69,8 @@ def update(val):
 amp_slider.on_changed(update)
 
 # Create a `matplotlib.widgets.Button` to reset the sliders to initial values.
-resetax = plt.axes([0.8, 0.025, 0.1, 0.04])
-button = Button(resetax, 'Reset', color=axcolor, hovercolor='0.975')
+resetax = fig.add_axes([0.8, 0.025, 0.1, 0.04])
+button = Button(resetax, 'Reset', hovercolor='0.975')
 
 
 def reset(event):
@@ -84,14 +82,10 @@ def reset(event):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.widgets.Button
-matplotlib.widgets.Slider
+#    - `matplotlib.widgets.Button`
+#    - `matplotlib.widgets.Slider`
diff --git a/examples/widgets/slider_snap_demo.py b/examples/widgets/slider_snap_demo.py
index 085099c552eb..5ace232c12c5 100644
--- a/examples/widgets/slider_snap_demo.py
+++ b/examples/widgets/slider_snap_demo.py
@@ -15,6 +15,7 @@
 See :doc:`/gallery/widgets/range_slider` for an example of using
 a ``RangeSlider`` to define a range of values.
 """
+
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib.widgets import Slider, Button
@@ -25,12 +26,11 @@
 s = a0 * np.sin(2 * np.pi * f0 * t)
 
 fig, ax = plt.subplots()
-plt.subplots_adjust(bottom=0.25)
-l, = plt.plot(t, s, lw=2)
+fig.subplots_adjust(bottom=0.25)
+l, = ax.plot(t, s, lw=2)
 
-slider_bkd_color = 'lightgoldenrodyellow'
-ax_freq = plt.axes([0.25, 0.1, 0.65, 0.03], facecolor=slider_bkd_color)
-ax_amp = plt.axes([0.25, 0.15, 0.65, 0.03], facecolor=slider_bkd_color)
+ax_freq = fig.add_axes([0.25, 0.1, 0.65, 0.03])
+ax_amp = fig.add_axes([0.25, 0.15, 0.65, 0.03])
 
 # define the values to use for snapping
 allowed_amplitudes = np.concatenate([np.linspace(.1, 5, 100), [6, 7, 8, 9]])
@@ -59,8 +59,8 @@ def update(val):
 sfreq.on_changed(update)
 samp.on_changed(update)
 
-ax_reset = plt.axes([0.8, 0.025, 0.1, 0.04])
-button = Button(ax_reset, 'Reset', color=slider_bkd_color, hovercolor='0.975')
+ax_reset = fig.add_axes([0.8, 0.025, 0.1, 0.04])
+button = Button(ax_reset, 'Reset', hovercolor='0.975')
 
 
 def reset(event):
@@ -73,14 +73,10 @@ def reset(event):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.widgets.Slider
-matplotlib.widgets.Button
+#    - `matplotlib.widgets.Slider`
+#    - `matplotlib.widgets.Button`
diff --git a/examples/widgets/span_selector.py b/examples/widgets/span_selector.py
index a61038781d44..fa75a70d2863 100644
--- a/examples/widgets/span_selector.py
+++ b/examples/widgets/span_selector.py
@@ -3,9 +3,18 @@
 Span Selector
 =============
 
-The SpanSelector is a mouse widget to select a xmin/xmax range and plot the
-detail view of the selected region in the lower axes
+The `.SpanSelector` is a mouse widget that enables selecting a range on an
+axis.
+
+Here, an x-range can be selected on the upper axis; a detailed view of the
+selected range is then plotted on the lower axis.
+
+.. note::
+
+    If the SpanSelector object is garbage collected you will lose the
+    interactivity.  You must keep a hard reference to it to prevent this.
 """
+
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib.widgets import SpanSelector
@@ -14,40 +23,41 @@
 np.random.seed(19680801)
 
 fig, (ax1, ax2) = plt.subplots(2, figsize=(8, 6))
-ax1.set(facecolor='#FFFFCC')
 
 x = np.arange(0.0, 5.0, 0.01)
-y = np.sin(2*np.pi*x) + 0.5*np.random.randn(len(x))
+y = np.sin(2 * np.pi * x) + 0.5 * np.random.randn(len(x))
 
-ax1.plot(x, y, '-')
+ax1.plot(x, y)
 ax1.set_ylim(-2, 2)
-ax1.set_title('Press left mouse button and drag to test')
+ax1.set_title('Press left mouse button and drag '
+              'to select a region in the top graph')
 
-ax2.set(facecolor='#FFFFCC')
-line2, = ax2.plot(x, y, '-')
+line2, = ax2.plot([], [])
 
 
 def onselect(xmin, xmax):
     indmin, indmax = np.searchsorted(x, (xmin, xmax))
     indmax = min(len(x) - 1, indmax)
 
-    thisx = x[indmin:indmax]
-    thisy = y[indmin:indmax]
-    line2.set_data(thisx, thisy)
-    ax2.set_xlim(thisx[0], thisx[-1])
-    ax2.set_ylim(thisy.min(), thisy.max())
-    fig.canvas.draw()
-
-#############################################################################
-# .. note::
-#
-#    If the SpanSelector object is garbage collected you will lose the
-#    interactivity.  You must keep a hard reference to it to prevent this.
-#
-
-
-span = SpanSelector(ax1, onselect, 'horizontal', useblit=True,
-                    rectprops=dict(alpha=0.5, facecolor='red'))
+    region_x = x[indmin:indmax]
+    region_y = y[indmin:indmax]
+
+    if len(region_x) >= 2:
+        line2.set_data(region_x, region_y)
+        ax2.set_xlim(region_x[0], region_x[-1])
+        ax2.set_ylim(region_y.min(), region_y.max())
+        fig.canvas.draw_idle()
+
+
+span = SpanSelector(
+    ax1,
+    onselect,
+    "horizontal",
+    useblit=True,
+    props=dict(alpha=0.5, facecolor="tab:blue"),
+    interactive=True,
+    drag_from_anywhere=True
+)
 # Set useblit=True on most backends for enhanced performance.
 
 
@@ -55,13 +65,9 @@ def onselect(xmin, xmax):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.widgets.SpanSelector
+#    - `matplotlib.widgets.SpanSelector`
diff --git a/examples/widgets/textbox.py b/examples/widgets/textbox.py
index 4e65af7bd9a1..33a996ae73c2 100644
--- a/examples/widgets/textbox.py
+++ b/examples/widgets/textbox.py
@@ -40,7 +40,7 @@ def submit(expression):
 
 
 axbox = fig.add_axes([0.1, 0.05, 0.8, 0.075])
-text_box = TextBox(axbox, "Evaluate")
+text_box = TextBox(axbox, "Evaluate", textalignment="center")
 text_box.on_submit(submit)
 text_box.set_val("t ** 2")  # Trigger `submit` with the initial string.
 
@@ -48,12 +48,9 @@ def submit(expression):
 
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-from matplotlib.widgets import TextBox
+#    - `matplotlib.widgets.TextBox`
diff --git a/extern/ttconv/pprdrv.h b/extern/ttconv/pprdrv.h
index 39e81fee7f0c..8c0b6c195564 100644
--- a/extern/ttconv/pprdrv.h
+++ b/extern/ttconv/pprdrv.h
@@ -48,20 +48,6 @@ class TTStreamWriter
     virtual void putline(const char* a);
 };
 
-class TTDictionaryCallback
-{
-private:
-    // Private copy and assignment
-    TTDictionaryCallback& operator=(const TTStreamWriter& other);
-    TTDictionaryCallback(const TTStreamWriter& other);
-
-public:
-    TTDictionaryCallback() { }
-    virtual ~TTDictionaryCallback() { }
-
-    virtual void add_pair(const char* key, const char* value) = 0;
-};
-
 void replace_newlines_with_spaces(char* a);
 
 /*
@@ -95,6 +81,12 @@ class TTException
 #define DEBUG_TRUETYPE          /* truetype fonts, conversion to Postscript */
 #endif
 
+#if DEBUG_TRUETYPE
+#define debug(...) printf(__VA_ARGS__)
+#else
+#define debug(...)
+#endif
+
 /* Do not change anything below this line. */
 
 enum font_type_enum
@@ -102,12 +94,9 @@ enum font_type_enum
     PS_TYPE_3  = 3,
     PS_TYPE_42 = 42,
     PS_TYPE_42_3_HYBRID = 43,
-    PDF_TYPE_3 = -3
 };
 
 /* routines in pprdrv_tt.c */
 void insert_ttfont(const char *filename, TTStreamWriter& stream, font_type_enum target_type, std::vector<int>& glyph_ids);
 
-void get_pdf_charprocs(const char *filename, std::vector<int>& glyph_ids, TTDictionaryCallback& dict);
-
 /* end of file */
diff --git a/extern/ttconv/pprdrv_tt.cpp b/extern/ttconv/pprdrv_tt.cpp
index 934215470808..a0c724c8aa11 100644
--- a/extern/ttconv/pprdrv_tt.cpp
+++ b/extern/ttconv/pprdrv_tt.cpp
@@ -121,10 +121,7 @@ BYTE *GetTable(struct TTFONT *font, const char *name)
 {
     BYTE *ptr;
     ULONG x;
-
-#ifdef DEBUG_TRUETYPE
     debug("GetTable(file,font,\"%s\")",name);
-#endif
 
     /* We must search the table directory. */
     ptr = font->offset_table + 12;
@@ -142,9 +139,7 @@ BYTE *GetTable(struct TTFONT *font, const char *name)
 
             try
             {
-#ifdef DEBUG_TRUETYPE
                 debug("Loading table \"%s\" from offset %d, %d bytes",name,offset,length);
-#endif
 
                 if ( fseek( font->file, (long)offset, SEEK_SET ) )
                 {
@@ -200,10 +195,7 @@ void Read_name(struct TTFONT *font)
     int platform;                       /* Current platform id */
     int nameid;                         /* name id, */
     int offset,length;                  /* offset and length of string. */
-
-#ifdef DEBUG_TRUETYPE
     debug("Read_name()");
-#endif
 
     table_ptr = NULL;
 
@@ -235,11 +227,8 @@ void Read_name(struct TTFONT *font)
             nameid = getUSHORT(ptr2+6);
             length = getUSHORT(ptr2+8);
             offset = getUSHORT(ptr2+10);
-
-#ifdef DEBUG_TRUETYPE
             debug("platform %d, encoding %d, language 0x%x, name %d, offset %d, length %d",
                   platform,encoding,language,nameid,offset,length);
-#endif
 
             /* Copyright notice */
             if ( platform == 1 && nameid == 0 )
@@ -248,10 +237,7 @@ void Read_name(struct TTFONT *font)
                 strncpy(font->Copyright,(const char*)strings+offset,length);
                 font->Copyright[length]='\0';
                 replace_newlines_with_spaces(font->Copyright);
-
-#ifdef DEBUG_TRUETYPE
                 debug("font->Copyright=\"%s\"",font->Copyright);
-#endif
                 continue;
             }
 
@@ -264,10 +250,7 @@ void Read_name(struct TTFONT *font)
                 strncpy(font->FamilyName,(const char*)strings+offset,length);
                 font->FamilyName[length]='\0';
                 replace_newlines_with_spaces(font->FamilyName);
-
-#ifdef DEBUG_TRUETYPE
                 debug("font->FamilyName=\"%s\"",font->FamilyName);
-#endif
                 continue;
             }
 
@@ -280,10 +263,7 @@ void Read_name(struct TTFONT *font)
                 strncpy(font->Style,(const char*)strings+offset,length);
                 font->Style[length]='\0';
                 replace_newlines_with_spaces(font->Style);
-
-#ifdef DEBUG_TRUETYPE
                 debug("font->Style=\"%s\"",font->Style);
-#endif
                 continue;
             }
 
@@ -296,10 +276,7 @@ void Read_name(struct TTFONT *font)
                 strncpy(font->FullName,(const char*)strings+offset,length);
                 font->FullName[length]='\0';
                 replace_newlines_with_spaces(font->FullName);
-
-#ifdef DEBUG_TRUETYPE
                 debug("font->FullName=\"%s\"",font->FullName);
-#endif
                 continue;
             }
 
@@ -312,10 +289,7 @@ void Read_name(struct TTFONT *font)
                 strncpy(font->Version,(const char*)strings+offset,length);
                 font->Version[length]='\0';
                 replace_newlines_with_spaces(font->Version);
-
-#ifdef DEBUG_TRUETYPE
                 debug("font->Version=\"%s\"",font->Version);
-#endif
                 continue;
             }
 
@@ -328,10 +302,7 @@ void Read_name(struct TTFONT *font)
                 strncpy(font->PostName,(const char*)strings+offset,length);
                 font->PostName[length]='\0';
                 replace_newlines_with_spaces(font->PostName);
-
-#ifdef DEBUG_TRUETYPE
                 debug("font->PostName=\"%s\"",font->PostName);
-#endif
                 continue;
             }
 
@@ -343,10 +314,7 @@ void Read_name(struct TTFONT *font)
                 utf16be_to_ascii(font->PostName, (char *)strings+offset, length);
                 font->PostName[length/2]='\0';
                 replace_newlines_with_spaces(font->PostName);
-
-#ifdef DEBUG_TRUETYPE
                 debug("font->PostName=\"%s\"",font->PostName);
-#endif
                 continue;
             }
 
@@ -358,10 +326,7 @@ void Read_name(struct TTFONT *font)
                 strncpy(font->Trademark,(const char*)strings+offset,length);
                 font->Trademark[length]='\0';
                 replace_newlines_with_spaces(font->Trademark);
-
-#ifdef DEBUG_TRUETYPE
                 debug("font->Trademark=\"%s\"",font->Trademark);
-#endif
                 continue;
             }
         }
@@ -677,10 +642,7 @@ void sfnts_glyf_table(TTStreamWriter& stream, struct TTFONT *font, ULONG oldoffs
     ULONG total=0;              /* running total of bytes written to table */
     int x;
     bool loca_is_local=false;
-
-#ifdef DEBUG_TRUETYPE
     debug("sfnts_glyf_table(font,%d)", (int)correct_total_length);
-#endif
 
     if (font->loca_table == NULL)
     {
@@ -709,10 +671,7 @@ void sfnts_glyf_table(TTStreamWriter& stream, struct TTFONT *font, ULONG oldoffs
             length = getULONG( font->loca_table + ((x+1) * 4) );
             length -= off;
         }
-
-#ifdef DEBUG_TRUETYPE
         debug("glyph length=%d",(int)length);
-#endif
 
         /* Start new string if necessary. */
         sfnts_new_table( stream, (int)length );
@@ -798,33 +757,36 @@ void ttfont_sfnts(TTStreamWriter& stream, struct TTFONT *font)
     ** Find the tables we want and store there vital
     ** statistics in tables[].
     */
-    for (x=0; x < 9; x++ )
-    {
-        do
-        {
-            diff = strncmp( (char*)ptr, table_names[x], 4 );
-
-            if ( diff > 0 )             /* If we are past it. */
-            {
-                tables[x].length = 0;
-                diff = 0;
-            }
-            else if ( diff < 0 )        /* If we haven't hit it yet. */
-            {
-                ptr += 16;
-            }
-            else if ( diff == 0 )       /* Here it is! */
-            {
-                tables[x].newoffset = nextoffset;
-                tables[x].checksum = getULONG( ptr + 4 );
-                tables[x].oldoffset = getULONG( ptr + 8 );
-                tables[x].length = getULONG( ptr + 12 );
-                nextoffset += ( ((tables[x].length + 3) / 4) * 4 );
-                count++;
-                ptr += 16;
-            }
-        }
-        while (diff != 0);
+    ULONG num_tables_read = 0;  /* Number of tables read from the directory */
+    for (x = 0; x < 9; x++) {
+        do {
+          if (num_tables_read < font->numTables) {
+              /* There are still tables to read from ptr */
+              diff = strncmp((char*)ptr, table_names[x], 4);
+
+              if (diff > 0) {           /* If we are past it. */
+                  tables[x].length = 0;
+                  diff = 0;
+              } else if (diff < 0) {      /* If we haven't hit it yet. */
+                  ptr += 16;
+                  num_tables_read++;
+              } else if (diff == 0) {     /* Here it is! */
+                  tables[x].newoffset = nextoffset;
+                  tables[x].checksum = getULONG( ptr + 4 );
+                  tables[x].oldoffset = getULONG( ptr + 8 );
+                  tables[x].length = getULONG( ptr + 12 );
+                  nextoffset += ( ((tables[x].length + 3) / 4) * 4 );
+                  count++;
+                  ptr += 16;
+                  num_tables_read++;
+              }
+          } else {
+            /* We've read the whole table directory already */
+            /* Some tables couldn't be found */
+            tables[x].length = 0;
+            break;  /* Proceed to next tables[x] */
+          }
+        } while (diff != 0);
 
     } /* end of for loop which passes over the table directory */
 
@@ -841,18 +803,23 @@ void ttfont_sfnts(TTStreamWriter& stream, struct TTFONT *font)
 
     /* Now, generate those silly numTables numbers. */
     sfnts_pputUSHORT(stream, count);            /* number of tables */
-    if ( count == 9 )
-    {
-        sfnts_pputUSHORT(stream, 7);          /* searchRange */
-        sfnts_pputUSHORT(stream, 3);          /* entrySelector */
-        sfnts_pputUSHORT(stream, 81);         /* rangeShift */
-    }
-#ifdef DEBUG_TRUETYPE
-    else
-    {
-        debug("only %d tables selected",count);
+
+    int search_range = 1;
+    int entry_sel = 0;
+
+    while (search_range <= count) {
+        search_range <<= 1;
+        entry_sel++;
     }
-#endif
+    entry_sel = entry_sel > 0 ? entry_sel - 1 : 0;
+    search_range = (search_range >> 1) * 16;
+    int range_shift = count * 16 - search_range;
+
+    sfnts_pputUSHORT(stream, search_range);      /* searchRange */
+    sfnts_pputUSHORT(stream, entry_sel);         /* entrySelector */
+    sfnts_pputUSHORT(stream, range_shift);       /* rangeShift */
+
+    debug("only %d tables selected",count);
 
     /* Now, emmit the table directory. */
     for (x=0; x < 9; x++)
@@ -885,10 +852,7 @@ void ttfont_sfnts(TTStreamWriter& stream, struct TTFONT *font)
         {
             continue;
         }
-
-#ifdef DEBUG_TRUETYPE
         debug("emmiting table '%s'",table_names[x]);
-#endif
 
         /* 'glyf' table gets special treatment */
         if ( strcmp(table_names[x],"glyf")==0 )
@@ -1278,9 +1242,7 @@ void read_font(const char *filename, font_type_enum target_type, std::vector<int
 
     /* Determine how many directory entries there are. */
     font.numTables = getUSHORT( font.offset_table + 4 );
-#ifdef DEBUG_TRUETYPE
     debug("numTables=%d",(int)font.numTables);
-#endif
 
     /* Expand the memory block to hold the whole thing. */
     font.offset_table = (BYTE*)realloc( font.offset_table, sizeof(BYTE) * (12 + font.numTables * 16) );
@@ -1301,9 +1263,7 @@ void read_font(const char *filename, font_type_enum target_type, std::vector<int
         font.MfrRevision = getFixed( ptr + 4 );           /* font revision number */
         font.unitsPerEm = getUSHORT( ptr + 18 );
         font.HUPM = font.unitsPerEm / 2;
-#ifdef DEBUG_TRUETYPE
         debug("unitsPerEm=%d",(int)font.unitsPerEm);
-#endif
         font.llx = topost2( getFWord( ptr + 36 ) );               /* bounding box info */
         font.lly = topost2( getFWord( ptr + 38 ) );
         font.urx = topost2( getFWord( ptr + 40 ) );
@@ -1336,8 +1296,7 @@ void read_font(const char *filename, font_type_enum target_type, std::vector<int
     /* If we are generating a Type 3 font, we will need to */
     /* have the 'loca' and 'glyf' tables arround while */
     /* we are generating the CharStrings. */
-    if (font.target_type == PS_TYPE_3 || font.target_type == PDF_TYPE_3 ||
-            font.target_type == PS_TYPE_42_3_HYBRID)
+    if (font.target_type == PS_TYPE_3 || font.target_type == PS_TYPE_42_3_HYBRID)
     {
         BYTE *ptr;                      /* We need only one value */
         ptr = GetTable(&font, "hhea");
@@ -1401,38 +1360,6 @@ void insert_ttfont(const char *filename, TTStreamWriter& stream,
 
 } /* end of insert_ttfont() */
 
-class StringStreamWriter : public TTStreamWriter
-{
-    std::ostringstream oss;
-
-public:
-    void write(const char* a)
-    {
-        oss << a;
-    }
-
-    std::string str()
-    {
-        return oss.str();
-    }
-};
-
-void get_pdf_charprocs(const char *filename, std::vector<int>& glyph_ids, TTDictionaryCallback& dict)
-{
-    struct TTFONT font;
-
-    read_font(filename, PDF_TYPE_3, glyph_ids, font);
-
-    for (std::vector<int>::const_iterator i = glyph_ids.begin();
-            i != glyph_ids.end(); ++i)
-    {
-        StringStreamWriter writer;
-        tt_type3_charproc(writer, &font, *i);
-        const char* name = ttfont_CharStrings_getname(&font, *i);
-        dict.add_pair(name, writer.str().c_str());
-    }
-}
-
 TTFONT::TTFONT() :
     file(NULL),
     PostName(NULL),
diff --git a/extern/ttconv/pprdrv_tt2.cpp b/extern/ttconv/pprdrv_tt2.cpp
index 058bc005348b..ec2298c8c42b 100644
--- a/extern/ttconv/pprdrv_tt2.cpp
+++ b/extern/ttconv/pprdrv_tt2.cpp
@@ -60,8 +60,6 @@ class GlyphToType3
 
     int stack_depth;            /* A book-keeping variable for keeping track of the depth of the PS stack */
 
-    bool pdf_mode;
-
     void load_char(TTFONT* font, BYTE *glyph);
     void stack(TTStreamWriter& stream, int new_elem);
     void stack_end(TTStreamWriter& stream);
@@ -91,12 +89,6 @@ struct FlaggedPoint
     FlaggedPoint(Flag flag_, FWord x_, FWord y_): flag(flag_), x(x_), y(y_) {};
 };
 
-double area(FWord *x, FWord *y, int n);
-#define sqr(x) ((x)*(x))
-
-#define NOMOREINCTR -1
-#define NOMOREOUTCTR -1
-
 /*
 ** This routine is used to break the character
 ** procedure up into a number of smaller
@@ -111,9 +103,8 @@ double area(FWord *x, FWord *y, int n);
 */
 void GlyphToType3::stack(TTStreamWriter& stream, int new_elem)
 {
-    if ( !pdf_mode && num_pts > 25 )                    /* Only do something of we will */
+    if ( num_pts > 25 )  /* Only do something of we will have a log of points. */
     {
-        /* have a log of points. */
         if (stack_depth == 0)
         {
             stream.put_char('{');
@@ -132,7 +123,7 @@ void GlyphToType3::stack(TTStreamWriter& stream, int new_elem)
 
 void GlyphToType3::stack_end(TTStreamWriter& stream)                    /* called at end */
 {
-    if ( !pdf_mode && stack_depth )
+    if ( stack_depth )
     {
         stream.puts("}_e");
         stack_depth=0;
@@ -238,19 +229,17 @@ void GlyphToType3::PSConvert(TTStreamWriter& stream)
 
     /* Now, we can fill the whole thing. */
     stack(stream, 1);
-    stream.puts( pdf_mode ? "f" : "_cl" );
+    stream.puts("_cl");
 } /* end of PSConvert() */
 
 void GlyphToType3::PSMoveto(TTStreamWriter& stream, int x, int y)
 {
-    stream.printf(pdf_mode ? "%d %d m\n" : "%d %d _m\n",
-                  x, y);
+    stream.printf("%d %d _m\n", x, y);
 }
 
 void GlyphToType3::PSLineto(TTStreamWriter& stream, int x, int y)
 {
-    stream.printf(pdf_mode ? "%d %d l\n" : "%d %d _l\n",
-                  x, y);
+    stream.printf("%d %d _l\n", x, y);
 }
 
 /*
@@ -278,9 +267,9 @@ void GlyphToType3::PSCurveto(TTStreamWriter& stream,
     cy[1] = (sy[2]+2*sy[1])/3;
     cx[2] = sx[2];
     cy[2] = sy[2];
-    stream.printf("%d %d %d %d %d %d %s\n",
+    stream.printf("%d %d %d %d %d %d _c\n",
                   (int)cx[0], (int)cy[0], (int)cx[1], (int)cy[1],
-                  (int)cx[2], (int)cy[2], pdf_mode ? "c" : "_c");
+                  (int)cx[2], (int)cy[2]);
 }
 
 /*
@@ -464,50 +453,27 @@ void GlyphToType3::do_composite(TTStreamWriter& stream, struct TTFONT *font, BYT
                       (int)flags,arg1,arg2);
 #endif
 
-        if (pdf_mode)
+        /* If we have an (X,Y) shift and it is non-zero, */
+        /* translate the coordinate system. */
+        if ( flags & ARGS_ARE_XY_VALUES )
         {
-            if ( flags & ARGS_ARE_XY_VALUES )
-            {
-                /* We should have been able to use 'Do' to reference the
-                   subglyph here.  However, that doesn't seem to work with
-                   xpdf or gs (only acrobat), so instead, this just includes
-                   the subglyph here inline. */
-                stream.printf("q 1 0 0 1 %d %d cm\n", topost(arg1), topost(arg2));
-            }
-            else
-            {
-                stream.printf("%% unimplemented shift, arg1=%d, arg2=%d\n",arg1,arg2);
-            }
-            GlyphToType3(stream, font, glyphIndex, true);
-            if ( flags & ARGS_ARE_XY_VALUES )
-            {
-                stream.printf("\nQ\n");
-            }
+            if ( arg1 != 0 || arg2 != 0 )
+                stream.printf("gsave %d %d translate\n", topost(arg1), topost(arg2) );
         }
         else
         {
-            /* If we have an (X,Y) shif and it is non-zero, */
-            /* translate the coordinate system. */
-            if ( flags & ARGS_ARE_XY_VALUES )
-            {
-                if ( arg1 != 0 || arg2 != 0 )
-                    stream.printf("gsave %d %d translate\n", topost(arg1), topost(arg2) );
-            }
-            else
-            {
-                stream.printf("%% unimplemented shift, arg1=%d, arg2=%d\n",arg1,arg2);
-            }
+            stream.printf("%% unimplemented shift, arg1=%d, arg2=%d\n",arg1,arg2);
+        }
 
-            /* Invoke the CharStrings procedure to print the component. */
-            stream.printf("false CharStrings /%s get exec\n",
-                          ttfont_CharStrings_getname(font,glyphIndex));
+        /* Invoke the CharStrings procedure to print the component. */
+        stream.printf("false CharStrings /%s get exec\n",
+                      ttfont_CharStrings_getname(font, glyphIndex));
 
-            /* If we translated the coordinate system, */
-            /* put it back the way it was. */
-            if ( flags & ARGS_ARE_XY_VALUES && (arg1 != 0 || arg2 != 0) )
-            {
-                stream.puts("grestore ");
-            }
+        /* If we translated the coordinate system, */
+        /* put it back the way it was. */
+        if ( flags & ARGS_ARE_XY_VALUES && (arg1 != 0 || arg2 != 0) )
+        {
+            stream.puts("grestore ");
         }
 
     }
@@ -559,7 +525,6 @@ GlyphToType3::GlyphToType3(TTStreamWriter& stream, struct TTFONT *font, int char
     ycoor = NULL;
     epts_ctr = NULL;
     stack_depth = 0;
-    pdf_mode = font->target_type < 0;
 
     /* Get a pointer to the data. */
     glyph = find_glyph_data( font, charindex );
@@ -610,15 +575,7 @@ GlyphToType3::GlyphToType3(TTStreamWriter& stream, struct TTFONT *font, int char
     /* Execute setcachedevice in order to inform the font machinery */
     /* of the character bounding box and advance width. */
     stack(stream, 7);
-    if (pdf_mode)
-    {
-        if (!embedded) {
-            stream.printf("%d 0 %d %d %d %d d1\n",
-                          topost(advance_width),
-                          topost(llx), topost(lly), topost(urx), topost(ury) );
-        }
-    }
-    else if (font->target_type == PS_TYPE_42_3_HYBRID)
+    if (font->target_type == PS_TYPE_42_3_HYBRID)
     {
         stream.printf("pop gsave .001 .001 scale %d 0 %d %d %d %d setcachedevice\n",
                       topost(advance_width),
diff --git a/extern/ttconv/ttutil.cpp b/extern/ttconv/ttutil.cpp
index 85e7e23c4f07..6028e1d45d4a 100644
--- a/extern/ttconv/ttutil.cpp
+++ b/extern/ttconv/ttutil.cpp
@@ -14,18 +14,6 @@
 #include <cstdlib>
 #include "pprdrv.h"
 
-#if DEBUG_TRUETYPE
-void debug(const char *format, ... )
-{
-  va_list arg_list;
-  va_start(arg_list, format);
-
-  printf(format, arg_list);
-
-  va_end(arg_list);
-}
-#endif
-
 #define PRINTF_BUFFER_SIZE 512
 void TTStreamWriter::printf(const char* format, ...)
 {
@@ -45,6 +33,7 @@ void TTStreamWriter::printf(const char* format, ...)
 #else
     vsnprintf(buffer2, size, format, arg_list);
 #endif
+    this->write(buffer2);
     free(buffer2);
   } else {
     this->write(buffer);
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
index c3d4aaf62d0b..77d25bbe3358 100644
--- a/lib/matplotlib/__init__.py
+++ b/lib/matplotlib/__init__.py
@@ -17,10 +17,13 @@
 
 at the ipython shell prompt.
 
-For the most part, direct use of the object-oriented library is encouraged when
-programming; pyplot is primarily for working interactively.  The exceptions are
-the pyplot functions `.pyplot.figure`, `.pyplot.subplot`, `.pyplot.subplots`,
-and `.pyplot.savefig`, which can greatly simplify scripting.
+For the most part, direct use of the explicit object-oriented library is
+encouraged when programming; the implicit pyplot interface is primarily for
+working interactively. The exceptions to this suggestion are the pyplot
+functions `.pyplot.figure`, `.pyplot.subplot`, `.pyplot.subplots`, and
+`.pyplot.savefig`, which can greatly simplify scripting.  See
+:ref:`api_interfaces` for an explanation of the tradeoffs between the implicit
+and explicit interfaces.
 
 Modules include:
 
@@ -78,14 +81,14 @@
 developed and maintained by a host of others.
 
 Occasionally the internal documentation (python docstrings) will refer
-to MATLAB&reg;, a registered trademark of The MathWorks, Inc.
+to MATLAB®, a registered trademark of The MathWorks, Inc.
+
 """
 
 import atexit
 from collections import namedtuple
 from collections.abc import MutableMapping
 import contextlib
-from distutils.version import LooseVersion
 import functools
 import importlib
 import inspect
@@ -102,20 +105,16 @@
 import tempfile
 import warnings
 
+import numpy
+from packaging.version import parse as parse_version
+
 # cbook must import matplotlib only within function
 # definitions, so it is safe to import from it here.
-from . import _api, cbook, docstring, rcsetup
-from matplotlib.cbook import MatplotlibDeprecationWarning, sanitize_sequence
-from matplotlib.cbook import mplDeprecation  # deprecated
+from . import _api, _version, cbook, _docstring, rcsetup
+from matplotlib.cbook import sanitize_sequence
+from matplotlib._api import MatplotlibDeprecationWarning
 from matplotlib.rcsetup import validate_backend, cycler
 
-import numpy
-
-# Get the version from the _version.py versioneer file. For a git checkout,
-# this is computed based on the number of commits since the last tag.
-from ._version import get_versions
-__version__ = str(get_versions()['version'])
-del get_versions
 
 _log = logging.getLogger(__name__)
 
@@ -134,6 +133,64 @@
   year      = 2007
 }"""
 
+# modelled after sys.version_info
+_VersionInfo = namedtuple('_VersionInfo',
+                          'major, minor, micro, releaselevel, serial')
+
+
+def _parse_to_version_info(version_str):
+    """
+    Parse a version string to a namedtuple analogous to sys.version_info.
+
+    See:
+    https://packaging.pypa.io/en/latest/version.html#packaging.version.parse
+    https://docs.python.org/3/library/sys.html#sys.version_info
+    """
+    v = parse_version(version_str)
+    if v.pre is None and v.post is None and v.dev is None:
+        return _VersionInfo(v.major, v.minor, v.micro, 'final', 0)
+    elif v.dev is not None:
+        return _VersionInfo(v.major, v.minor, v.micro, 'alpha', v.dev)
+    elif v.pre is not None:
+        releaselevel = {
+            'a': 'alpha',
+            'b': 'beta',
+            'rc': 'candidate'}.get(v.pre[0], 'alpha')
+        return _VersionInfo(v.major, v.minor, v.micro, releaselevel, v.pre[1])
+    else:
+        # fallback for v.post: guess-next-dev scheme from setuptools_scm
+        return _VersionInfo(v.major, v.minor, v.micro + 1, 'alpha', v.post)
+
+
+def _get_version():
+    """Return the version string used for __version__."""
+    # Only shell out to a git subprocess if really needed, i.e. when we are in
+    # a matplotlib git repo but not in a shallow clone, such as those used by
+    # CI, as the latter would trigger a warning from setuptools_scm.
+    root = Path(__file__).resolve().parents[2]
+    if ((root / ".matplotlib-repo").exists()
+            and (root / ".git").exists()
+            and not (root / ".git/shallow").exists()):
+        import setuptools_scm
+        return setuptools_scm.get_version(
+            root=root,
+            version_scheme="release-branch-semver",
+            local_scheme="node-and-date",
+            fallback_version=_version.version,
+        )
+    else:  # Get the version from the _version.py setuptools_scm file.
+        return _version.version
+
+
+@_api.caching_module_getattr
+class __getattr__:
+    __version__ = property(lambda self: _get_version())
+    __version_info__ = property(
+        lambda self: _parse_to_version_info(self.__version__))
+    # module-level deprecations
+    URL_REGEX = _api.deprecated("3.5", obj_type="")(property(
+        lambda self: re.compile(r'^http://|^https://|^ftp://|^file:')))
+
 
 def _check_versions():
 
@@ -145,13 +202,13 @@ def _check_versions():
             ("cycler", "0.10"),
             ("dateutil", "2.7"),
             ("kiwisolver", "1.0.1"),
-            ("numpy", "1.16"),
+            ("numpy", "1.19"),
             ("pyparsing", "2.2.1"),
     ]:
         module = importlib.import_module(modname)
-        if LooseVersion(module.__version__) < minver:
-            raise ImportError("Matplotlib requires {}>={}; you have {}"
-                              .format(modname, minver, module.__version__))
+        if parse_version(module.__version__) < parse_version(minver):
+            raise ImportError(f"Matplotlib requires {modname}>={minver}; "
+                              f"you have {module.__version__}")
 
 
 _check_versions()
@@ -227,7 +284,7 @@ def wrapper(**kwargs):
     return wrapper
 
 
-_ExecInfo = namedtuple("_ExecInfo", "executable version")
+_ExecInfo = namedtuple("_ExecInfo", "executable raw_version version")
 
 
 class ExecutableNotFoundError(FileNotFoundError):
@@ -251,21 +308,23 @@ def _get_executable_info(name):
     ----------
     name : str
         The executable to query.  The following values are currently supported:
-        "dvipng", "gs", "inkscape", "magick", "pdftops".  This list is subject
-        to change without notice.
+        "dvipng", "gs", "inkscape", "magick", "pdftocairo", "pdftops".  This
+        list is subject to change without notice.
 
     Returns
     -------
     tuple
         A namedtuple with fields ``executable`` (`str`) and ``version``
-        (`distutils.version.LooseVersion`, or ``None`` if the version cannot be
-        determined).
+        (`packaging.Version`, or ``None`` if the version cannot be determined).
 
     Raises
     ------
     ExecutableNotFoundError
         If the executable is not found or older than the oldest version
-        supported by Matplotlib.
+        supported by Matplotlib.  For debugging purposes, it is also
+        possible to "hide" an executable from Matplotlib by adding it to the
+        :envvar:`_MPLHIDEEXECUTABLES` environment variable (a comma-separated
+        list), which must be set prior to any calls to this function.
     ValueError
         If the executable is not one that we know how to query.
     """
@@ -289,17 +348,21 @@ def impl(args, regex, min_ver=None, ignore_exit_code=False):
             raise ExecutableNotFoundError(str(_ose)) from _ose
         match = re.search(regex, output)
         if match:
-            version = LooseVersion(match.group(1))
-            if min_ver is not None and version < min_ver:
+            raw_version = match.group(1)
+            version = parse_version(raw_version)
+            if min_ver is not None and version < parse_version(min_ver):
                 raise ExecutableNotFoundError(
                     f"You have {args[0]} version {version} but the minimum "
                     f"version supported by Matplotlib is {min_ver}")
-            return _ExecInfo(args[0], version)
+            return _ExecInfo(args[0], raw_version, version)
         else:
             raise ExecutableNotFoundError(
                 f"Failed to determine the version of {args[0]} from "
                 f"{' '.join(args)}, which output {output}")
 
+    if name in os.environ.get("_MPLHIDEEXECUTABLES", "").split(","):
+        raise ExecutableNotFoundError(f"{name} was hidden")
+
     if name == "dvipng":
         return impl(["dvipng", "-version"], "(?m)^dvipng(?: .*)? (.+)", "1.6")
     elif name == "gs":
@@ -351,17 +414,20 @@ def impl(args, regex, min_ver=None, ignore_exit_code=False):
         else:
             path = "convert"
         info = impl([path, "--version"], r"^Version: ImageMagick (\S*)")
-        if info.version == "7.0.10-34":
+        if info.raw_version == "7.0.10-34":
             # https://github.com/ImageMagick/ImageMagick/issues/2720
             raise ExecutableNotFoundError(
                 f"You have ImageMagick {info.version}, which is unsupported")
         return info
+    elif name == "pdftocairo":
+        return impl(["pdftocairo", "-v"], "pdftocairo version (.*)")
     elif name == "pdftops":
         info = impl(["pdftops", "-v"], "^pdftops version (.*)",
                     ignore_exit_code=True)
-        if info and not ("3.0" <= info.version
-                         # poppler version numbers.
-                         or "0.9" <= info.version <= "1.0"):
+        if info and not (
+                3 <= info.version.major or
+                # poppler version numbers.
+                parse_version("0.9") <= info.version < parse_version("1.0")):
             raise ExecutableNotFoundError(
                 f"You have pdftops version {info.version} but the minimum "
                 f"version supported by Matplotlib is 3.0")
@@ -370,6 +436,7 @@ def impl(args, regex, min_ver=None, ignore_exit_code=False):
         raise ValueError("Unknown executable: {!r}".format(name))
 
 
+@_api.deprecated("3.6", alternative="a vendored copy of this function")
 def checkdep_usetex(s):
     if not s:
         return False
@@ -394,7 +461,7 @@ def _get_xdg_config_dir():
     Return the XDG configuration directory, according to the XDG base
     directory spec:
 
-    https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+    https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
     """
     return os.environ.get('XDG_CONFIG_HOME') or str(Path.home() / ".config")
 
@@ -403,17 +470,19 @@ def _get_xdg_cache_dir():
     """
     Return the XDG cache directory, according to the XDG base directory spec:
 
-    https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+    https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
     """
     return os.environ.get('XDG_CACHE_HOME') or str(Path.home() / ".cache")
 
 
-def _get_config_or_cache_dir(xdg_base):
+def _get_config_or_cache_dir(xdg_base_getter):
     configdir = os.environ.get('MPLCONFIGDIR')
     if configdir:
         configdir = Path(configdir).resolve()
-    elif sys.platform.startswith(('linux', 'freebsd')) and xdg_base:
-        configdir = Path(xdg_base, "matplotlib")
+    elif sys.platform.startswith(('linux', 'freebsd')):
+        # Only call _xdg_base_getter here so that MPLCONFIGDIR is tried first,
+        # as _xdg_base_getter can throw.
+        configdir = Path(xdg_base_getter(), "matplotlib")
     else:
         configdir = Path.home() / ".matplotlib"
     try:
@@ -441,7 +510,7 @@ def _get_config_or_cache_dir(xdg_base):
 @_logged_cached('CONFIGDIR=%s')
 def get_configdir():
     """
-    Return the string path of the the configuration directory.
+    Return the string path of the configuration directory.
 
     The directory is chosen as follows:
 
@@ -454,7 +523,7 @@ def get_configdir():
     4. Else, create a temporary directory, and use it as the configuration
        directory.
     """
-    return _get_config_or_cache_dir(_get_xdg_config_dir())
+    return _get_config_or_cache_dir(_get_xdg_config_dir)
 
 
 @_logged_cached('CACHEDIR=%s')
@@ -465,7 +534,7 @@ def get_cachedir():
     The procedure used to find the directory is the same as for
     _get_config_dir, except using ``$XDG_CACHE_HOME``/``$HOME/.cache`` instead.
     """
-    return _get_config_or_cache_dir(_get_xdg_cache_dir())
+    return _get_config_or_cache_dir(_get_xdg_cache_dir)
 
 
 @_logged_cached('matplotlib data path: %s')
@@ -522,31 +591,18 @@ def gen_candidates():
 # rcParams deprecated and automatically mapped to another key.
 # Values are tuples of (version, new_name, f_old2new, f_new2old).
 _deprecated_map = {}
-
 # rcParams deprecated; some can manually be mapped to another key.
 # Values are tuples of (version, new_name_or_None).
-_deprecated_ignore_map = {
-    'mpl_toolkits.legacy_colorbar': ('3.4', None),
-}
-
+_deprecated_ignore_map = {}
 # rcParams deprecated; can use None to suppress warnings; remain actually
-# listed in the rcParams (not included in _all_deprecated).
+# listed in the rcParams.
 # Values are tuples of (version,)
-_deprecated_remain_as_none = {
-    'animation.avconv_path': ('3.3',),
-    'animation.avconv_args': ('3.3',),
-    'animation.html_args': ('3.3',),
-    'mathtext.fallback_to_cm': ('3.3',),
-    'keymap.all_axes': ('3.3',),
-    'savefig.jpeg_quality': ('3.3',),
-    'text.latex.preview': ('3.3',),
-}
+_deprecated_remain_as_none = {}
 
 
-_all_deprecated = {*_deprecated_map, *_deprecated_ignore_map}
-
-
-@docstring.Substitution("\n".join(map("- {}".format, rcsetup._validators)))
+@_docstring.Substitution(
+    "\n".join(map("- {}".format, sorted(rcsetup._validators, key=str.lower)))
+)
 class RcParams(MutableMapping, dict):
     """
     A dictionary object including validation.
@@ -612,7 +668,9 @@ def __getitem__(self, key):
                 version, name=key, obj_type="rcparam", alternative=alt_key)
             return dict.__getitem__(self, alt_key) if alt_key else None
 
-        elif key == "backend":
+        # In theory, this should only ever be used after the global rcParams
+        # has been set up, but better be safe e.g. in presence of breakpoints.
+        elif key == "backend" and self is globals().get("rcParams"):
             val = dict.__getitem__(self, key)
             if val is rcsetup._auto_backend_sentinel:
                 from matplotlib import pyplot as plt
@@ -620,6 +678,11 @@ def __getitem__(self, key):
 
         return dict.__getitem__(self, key)
 
+    def _get_backend_or_none(self):
+        """Get the requested backend, if any, without triggering resolution."""
+        backend = dict.__getitem__(self, "backend")
+        return None if backend is rcsetup._auto_backend_sentinel else backend
+
     def __repr__(self):
         class_name = self.__class__.__name__
         indent = len(class_name) + 1
@@ -657,7 +720,11 @@ def find_all(self, pattern):
                         if pattern_re.search(key))
 
     def copy(self):
-        return {k: dict.__getitem__(self, k) for k in self}
+        """Copy this RcParams instance."""
+        rccopy = RcParams()
+        for k in self:  # Skip deprecations and revalidation.
+            dict.__setitem__(rccopy, k, dict.__getitem__(self, k))
+        return rccopy
 
 
 def rc_params(fail_on_error=False):
@@ -665,12 +732,10 @@ def rc_params(fail_on_error=False):
     return rc_params_from_file(matplotlib_fname(), fail_on_error)
 
 
-URL_REGEX = re.compile(r'^http://|^https://|^ftp://|^file:')
-
-
+@_api.deprecated("3.5")
 def is_url(filename):
     """Return whether *filename* is an http, https, ftp, or file URL path."""
-    return URL_REGEX.match(filename) is not None
+    return __getattr__("URL_REGEX").match(filename) is not None
 
 
 @functools.lru_cache()
@@ -686,7 +751,8 @@ def _get_ssl_context():
 
 @contextlib.contextmanager
 def _open_file_or_url(fname):
-    if not isinstance(fname, Path) and is_url(fname):
+    if (isinstance(fname, str)
+            and fname.startswith(('http://', 'https://', 'ftp://', 'file:'))):
         import urllib.request
         ssl_ctx = _get_ssl_context()
         if ssl_ctx is None:
@@ -697,10 +763,7 @@ def _open_file_or_url(fname):
             yield (line.decode('utf-8') for line in f)
     else:
         fname = os.path.expanduser(fname)
-        encoding = locale.getpreferredencoding(do_setlocale=False)
-        if encoding is None:
-            encoding = "utf-8"
-        with open(fname, encoding=encoding) as f:
+        with open(fname, encoding='utf-8') as f:
             yield f
 
 
@@ -721,12 +784,13 @@ def _rc_params_in_file(fname, transform=lambda x: x, fail_on_error=False):
     fail_on_error : bool, default: False
         Whether invalid entries should result in an exception or a warning.
     """
+    import matplotlib as mpl
     rc_temp = {}
     with _open_file_or_url(fname) as fd:
         try:
             for line_no, line in enumerate(fd, 1):
                 line = transform(line)
-                strippedline = line.split('#', 1)[0].strip()
+                strippedline = cbook._strip_comment(line)
                 if not strippedline:
                     continue
                 tup = strippedline.split(':', 1)
@@ -737,16 +801,15 @@ def _rc_params_in_file(fname, transform=lambda x: x, fail_on_error=False):
                 key, val = tup
                 key = key.strip()
                 val = val.strip()
+                if val.startswith('"') and val.endswith('"'):
+                    val = val[1:-1]  # strip double quotes
                 if key in rc_temp:
                     _log.warning('Duplicate key in file %r, line %d (%r)',
                                  fname, line_no, line.rstrip('\n'))
                 rc_temp[key] = (val, line, line_no)
         except UnicodeDecodeError:
-            _log.warning('Cannot decode configuration file %s with encoding '
-                         '%s, check LANG and LC_* variables.',
-                         fname,
-                         locale.getpreferredencoding(do_setlocale=False)
-                         or 'utf-8 (default)')
+            _log.warning('Cannot decode configuration file %r as utf-8.',
+                         fname)
             raise
 
     config = RcParams()
@@ -767,7 +830,10 @@ def _rc_params_in_file(fname, transform=lambda x: x, fail_on_error=False):
                 version, name=key, alternative=alt_key, obj_type='rcparam',
                 addendum="Please update your matplotlibrc.")
         else:
-            version = 'master' if '.post' in __version__ else f'v{__version__}'
+            # __version__ must be looked up as an attribute to trigger the
+            # module-level __getattr__.
+            version = ('main' if '.post' in mpl.__version__
+                       else f'v{mpl.__version__}')
             _log.warning("""
 Bad key %(key)s in file %(fname)s, line %(line_no)s (%(line)r)
 You probably need to get an updated matplotlibrc file from
@@ -823,11 +889,17 @@ def rc_params_from_file(fname, fail_on_error=False, use_default_template=True):
     transform=lambda line: line[1:] if line.startswith("#") else line,
     fail_on_error=True)
 dict.update(rcParamsDefault, rcsetup._hardcoded_defaults)
+# Normally, the default matplotlibrc file contains *no* entry for backend (the
+# corresponding line starts with ##, not #; we fill on _auto_backend_sentinel
+# in that case.  However, packagers can set a different default backend
+# (resulting in a normal `#backend: foo` line) in which case we should *not*
+# fill in _auto_backend_sentinel.
+dict.setdefault(rcParamsDefault, "backend", rcsetup._auto_backend_sentinel)
 rcParams = RcParams()  # The global instance.
 dict.update(rcParams, dict.items(rcParamsDefault))
 dict.update(rcParams, _rc_params_in_file(matplotlib_fname()))
+rcParamsOrig = rcParams.copy()
 with _api.suppress_matplotlib_deprecation_warning():
-    rcParamsOrig = RcParams(rcParams.copy())
     # This also checks that all rcParams are indeed listed in the template.
     # Assigning to rcsetup.defaultParams is left only for backcompat.
     defaultParams = rcsetup.defaultParams = {
@@ -921,7 +993,7 @@ def rcdefaults():
     Restore the `.rcParams` from Matplotlib's internal default style.
 
     Style-blacklisted `.rcParams` (defined in
-    `matplotlib.style.core.STYLE_BLACKLIST`) are not updated.
+    ``matplotlib.style.core.STYLE_BLACKLIST``) are not updated.
 
     See Also
     --------
@@ -946,7 +1018,7 @@ def rc_file_defaults():
     Restore the `.rcParams` from the original rc file loaded by Matplotlib.
 
     Style-blacklisted `.rcParams` (defined in
-    `matplotlib.style.core.STYLE_BLACKLIST`) are not updated.
+    ``matplotlib.style.core.STYLE_BLACKLIST``) are not updated.
     """
     # Deprecation warnings were already handled when creating rcParamsOrig, no
     # need to reemit them here.
@@ -961,7 +1033,7 @@ def rc_file(fname, *, use_default_template=True):
     Update `.rcParams` from file.
 
     Style-blacklisted `.rcParams` (defined in
-    `matplotlib.style.core.STYLE_BLACKLIST`) are not updated.
+    ``matplotlib.style.core.STYLE_BLACKLIST``) are not updated.
 
     Parameters
     ----------
@@ -988,6 +1060,8 @@ def rc_context(rc=None, fname=None):
     """
     Return a context manager for temporarily changing rcParams.
 
+    The :rc:`backend` will not be reset by the context manager.
+
     Parameters
     ----------
     rc : dict
@@ -1016,7 +1090,8 @@ def rc_context(rc=None, fname=None):
              plt.plot(x, y)  # uses 'print.rc'
 
     """
-    orig = rcParams.copy()
+    orig = dict(rcParams.copy())
+    del orig['backend']
     try:
         if fname:
             rc_file(fname)
@@ -1038,20 +1113,24 @@ def use(backend, *, force=True):
         backend names, which are case-insensitive:
 
         - interactive backends:
-          GTK3Agg, GTK3Cairo, MacOSX, nbAgg,
-          Qt4Agg, Qt4Cairo, Qt5Agg, Qt5Cairo,
-          TkAgg, TkCairo, WebAgg, WX, WXAgg, WXCairo
+          GTK3Agg, GTK3Cairo, GTK4Agg, GTK4Cairo, MacOSX, nbAgg, QtAgg,
+          QtCairo, TkAgg, TkCairo, WebAgg, WX, WXAgg, WXCairo, Qt5Agg, Qt5Cairo
 
         - non-interactive backends:
           agg, cairo, pdf, pgf, ps, svg, template
 
         or a string of the form: ``module://my.module.name``.
 
+        Switching to an interactive backend is not possible if an unrelated
+        event loop has already been started (e.g., switching to GTK3Agg if a
+        TkAgg window has already been opened).  Switching to a non-interactive
+        backend is always possible.
+
     force : bool, default: True
         If True (the default), raise an `ImportError` if the backend cannot be
         set up (either because it fails to import, or because an incompatible
-        GUI interactive framework is already running); if False, ignore the
-        failure.
+        GUI interactive framework is already running); if False, silently
+        ignore the failure.
 
     See Also
     --------
@@ -1059,9 +1138,8 @@ def use(backend, *, force=True):
     matplotlib.get_backend
     """
     name = validate_backend(backend)
-    # we need to use the base-class method here to avoid (prematurely)
-    # resolving the "auto" backend setting
-    if dict.__getitem__(rcParams, 'backend') == name:
+    # don't (prematurely) resolve the "auto" backend setting
+    if rcParams._get_backend_or_none() == name:
         # Nothing to do if the requested backend is already set
         pass
     else:
@@ -1112,7 +1190,14 @@ def interactive(b):
 
 
 def is_interactive():
-    """Return whether to redraw after every plotting command."""
+    """
+    Return whether to redraw after every plotting command.
+
+    .. note::
+
+        This function is only intended for use in backends. End users should
+        use `.pyplot.isinteractive` instead.
+    """
     return rcParams['interactive']
 
 
@@ -1133,15 +1218,15 @@ def _init_tests():
         _log.warning(
             f"Matplotlib is not built with the correct FreeType version to "
             f"run tests.  Rebuild without setting system_freetype=1 in "
-            f"setup.cfg.  Expect many image comparison failures below.  "
+            f"mplsetup.cfg.  Expect many image comparison failures below.  "
             f"Expected freetype version {LOCAL_FREETYPE_VERSION}.  "
             f"Found freetype version {ft2font.__freetype_version__}.  "
             "Freetype build type is {}local".format(
                 "" if ft2font.__freetype_build_type__ == 'local' else "not "))
 
 
-@_api.delete_parameter("3.3", "recursionlimit")
-def test(verbosity=None, coverage=False, *, recursionlimit=0, **kwargs):
+@_api.deprecated("3.5", alternative='pytest')
+def test(verbosity=None, coverage=False, **kwargs):
     """Run the matplotlib test suite."""
 
     try:
@@ -1155,11 +1240,8 @@ def test(verbosity=None, coverage=False, *, recursionlimit=0, **kwargs):
         return -1
 
     old_backend = get_backend()
-    old_recursionlimit = sys.getrecursionlimit()
     try:
         use('agg')
-        if recursionlimit:
-            sys.setrecursionlimit(recursionlimit)
 
         args = kwargs.pop('argv', [])
         provide_default_modules = True
@@ -1188,8 +1270,6 @@ def test(verbosity=None, coverage=False, *, recursionlimit=0, **kwargs):
     finally:
         if old_backend.lower() != 'agg':
             use(old_backend)
-        if recursionlimit:
-            sys.setrecursionlimit(old_recursionlimit)
 
     return retcode
 
@@ -1222,24 +1302,6 @@ def _label_from_arg(y, default_name):
     return None
 
 
-_DATA_DOC_TITLE = """
-
-Notes
------
-"""
-
-_DATA_DOC_APPENDIX = """
-
-.. note::
-    In addition to the above described arguments, this function can take
-    a *data* keyword argument. If such a *data* argument is given,
-{replaced}
-
-    Objects passed as **data** must support item access (``data[s]``) and
-    membership test (``s in data``).
-"""
-
-
 def _add_data_doc(docstring, replace_names):
     """
     Add documentation for a *data* field to the given docstring.
@@ -1262,17 +1324,26 @@ def _add_data_doc(docstring, replace_names):
             or replace_names is not None and len(replace_names) == 0):
         return docstring
     docstring = inspect.cleandoc(docstring)
-    repl = (
-        ("    every other argument can also be string ``s``, which is\n"
-         "    interpreted as ``data[s]`` (unless this raises an exception).")
-        if replace_names is None else
-        ("    the following arguments can also be string ``s``, which is\n"
-         "    interpreted as ``data[s]`` (unless this raises an exception):\n"
-         "    " + ", ".join(map("*{}*".format, replace_names))) + ".")
-    addendum = _DATA_DOC_APPENDIX.format(replaced=repl)
-    if _DATA_DOC_TITLE not in docstring:
-        addendum = _DATA_DOC_TITLE + addendum
-    return docstring + addendum
+
+    data_doc = ("""\
+    If given, all parameters also accept a string ``s``, which is
+    interpreted as ``data[s]`` (unless this raises an exception)."""
+                if replace_names is None else f"""\
+    If given, the following parameters also accept a string ``s``, which is
+    interpreted as ``data[s]`` (unless this raises an exception):
+
+    {', '.join(map('*{}*'.format, replace_names))}""")
+    # using string replacement instead of formatting has the advantages
+    # 1) simpler indent handling
+    # 2) prevent problems with formatting characters '{', '%' in the docstring
+    if _log.level <= logging.DEBUG:
+        # test_data_parameter_replacement() tests against these log messages
+        # make sure to keep message and test in sync
+        if "data : indexable object, optional" not in docstring:
+            _log.debug("data parameter docstring error: no data parameter")
+        if 'DATA_PARAMETER_PLACEHOLDER' not in docstring:
+            _log.debug("data parameter docstring error: missing placeholder")
+    return docstring.replace('    DATA_PARAMETER_PLACEHOLDER', data_doc)
 
 
 def _preprocess_data(func=None, *, replace_names=None, label_namer=None):
@@ -1382,7 +1453,11 @@ def inner(ax, *args, data=None, **kwargs):
     return inner
 
 
-_log.debug('matplotlib version %s', __version__)
 _log.debug('interactive is %s', is_interactive())
 _log.debug('platform is %s', sys.platform)
-_log.debug('loaded modules: %s', list(sys.modules))
+
+
+# workaround: we must defer colormaps import to after loading rcParams, because
+# colormap creation depends on rcParams
+from matplotlib.cm import _colormaps as colormaps
+from matplotlib.colors import _color_sequences as color_sequences
diff --git a/lib/matplotlib/_afm.py b/lib/matplotlib/_afm.py
new file mode 100644
index 000000000000..3d02d7f9c1d6
--- /dev/null
+++ b/lib/matplotlib/_afm.py
@@ -0,0 +1,532 @@
+"""
+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
+either:
+
+1) copyrighted or used a non-BSD compatible license
+2) had too many dependencies and a free standing lib was needed
+3) did more than needed and it was easier to write afresh rather than
+   figure out how to get just what was needed.
+
+It is pretty easy to use, and has no external dependencies:
+
+>>> import matplotlib as mpl
+>>> from pathlib import Path
+>>> afm_path = Path(mpl.get_data_path(), 'fonts', 'afm', 'ptmr8a.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
+being used.
+"""
+
+from collections import namedtuple
+import logging
+import re
+
+from ._mathtext_data import uni2type1
+
+
+_log = logging.getLogger(__name__)
+
+
+def _to_int(x):
+    # Some AFM files have floats where we are expecting ints -- there is
+    # probably a better way to handle this (support floats, round rather than
+    # truncate).  But I don't know what the best approach is now and this
+    # change to _to_int should at least prevent Matplotlib from crashing on
+    # these.  JDH (2009-11-06)
+    return int(float(x))
+
+
+def _to_float(x):
+    # Some AFM files use "," instead of "." as decimal separator -- this
+    # shouldn't be ambiguous (unless someone is wicked enough to use "," as
+    # thousands separator...).
+    if isinstance(x, bytes):
+        # Encoding doesn't really matter -- if we have codepoints >127 the call
+        # to float() will error anyways.
+        x = x.decode('latin-1')
+    return float(x.replace(',', '.'))
+
+
+def _to_str(x):
+    return x.decode('utf8')
+
+
+def _to_list_of_ints(s):
+    s = s.replace(b',', b' ')
+    return [_to_int(val) for val in s.split()]
+
+
+def _to_list_of_floats(s):
+    return [_to_float(val) for val in s.split()]
+
+
+def _to_bool(s):
+    if s.lower().strip() in (b'false', b'0', b'no'):
+        return False
+    else:
+        return True
+
+
+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.:
+
+        * 'False'->False
+        * '0'->0
+        * '-168 -218 1000 898'-> [-168, -218, 1000, 898]
+
+    Dictionary keys are
+
+      StartFontMetrics, FontName, FullName, FamilyName, Weight,
+      ItalicAngle, IsFixedPitch, FontBBox, UnderlinePosition,
+      UnderlineThickness, Version, Notice, EncodingScheme, CapHeight,
+      XHeight, Ascender, Descender, StartCharMetrics
+    """
+    header_converters = {
+        b'StartFontMetrics': _to_float,
+        b'FontName': _to_str,
+        b'FullName': _to_str,
+        b'FamilyName': _to_str,
+        b'Weight': _to_str,
+        b'ItalicAngle': _to_float,
+        b'IsFixedPitch': _to_bool,
+        b'FontBBox': _to_list_of_ints,
+        b'UnderlinePosition': _to_float,
+        b'UnderlineThickness': _to_float,
+        b'Version': _to_str,
+        # Some AFM files have non-ASCII characters (which are not allowed by
+        # the spec).  Given that there is actually no public API to even access
+        # this field, just return it as straight bytes.
+        b'Notice': lambda x: x,
+        b'EncodingScheme': _to_str,
+        b'CapHeight': _to_float,  # Is the second version a mistake, or
+        b'Capheight': _to_float,  # do some AFM files contain 'Capheight'? -JKS
+        b'XHeight': _to_float,
+        b'Ascender': _to_float,
+        b'Descender': _to_float,
+        b'StdHW': _to_float,
+        b'StdVW': _to_float,
+        b'StartCharMetrics': _to_int,
+        b'CharacterSet': _to_str,
+        b'Characters': _to_int,
+    }
+    d = {}
+    first_line = True
+    for line in fh:
+        line = line.rstrip()
+        if line.startswith(b'Comment'):
+            continue
+        lst = line.split(b' ', 1)
+        key = lst[0]
+        if first_line:
+            # AFM spec, Section 4: The StartFontMetrics keyword
+            # [followed by a version number] must be the first line in
+            # the file, and the EndFontMetrics keyword must be the
+            # last non-empty line in the file.  We just check the
+            # first header entry.
+            if key != b'StartFontMetrics':
+                raise RuntimeError('Not an AFM file')
+            first_line = False
+        if len(lst) == 2:
+            val = lst[1]
+        else:
+            val = b''
+        try:
+            converter = header_converters[key]
+        except KeyError:
+            _log.error('Found an unknown keyword in AFM header (was %r)' % key)
+            continue
+        try:
+            d[key] = converter(val)
+        except ValueError:
+            _log.error('Value error parsing header in AFM: %s, %s', key, val)
+            continue
+        if key == b'StartCharMetrics':
+            break
+    else:
+        raise RuntimeError('Bad parse')
+    return d
+
+
+CharMetrics = namedtuple('CharMetrics', 'width, name, bbox')
+CharMetrics.__doc__ = """
+    Represents the character metrics of a single character.
+
+    Notes
+    -----
+    The fields do currently only describe a subset of character metrics
+    information defined in the AFM standard.
+    """
+CharMetrics.width.__doc__ = """The character width (WX)."""
+CharMetrics.name.__doc__ = """The character name (N)."""
+CharMetrics.bbox.__doc__ = """
+    The bbox of the character (B) as a tuple (*llx*, *lly*, *urx*, *ury*)."""
+
+
+def _parse_char_metrics(fh):
+    """
+    Parse the given filehandle for character metrics information and return
+    the information as dicts.
+
+    It is assumed that the file cursor is on the line behind
+    'StartCharMetrics'.
+
+    Returns
+    -------
+    ascii_d : dict
+         A mapping "ASCII num of the character" to `.CharMetrics`.
+    name_d : dict
+         A mapping "character name" to `.CharMetrics`.
+
+    Notes
+    -----
+    This function is incomplete per the standard, but thus far parses
+    all the sample afm files tried.
+    """
+    required_keys = {'C', 'WX', 'N', 'B'}
+
+    ascii_d = {}
+    name_d = {}
+    for line in fh:
+        # We are defensively letting values be utf8. The spec requires
+        # ascii, but there are non-compliant fonts in circulation
+        line = _to_str(line.rstrip())  # Convert from byte-literal
+        if line.startswith('EndCharMetrics'):
+            return ascii_d, name_d
+        # Split the metric line into a dictionary, keyed by metric identifiers
+        vals = dict(s.strip().split(' ', 1) for s in line.split(';') if s)
+        # There may be other metrics present, but only these are needed
+        if not required_keys.issubset(vals):
+            raise RuntimeError('Bad char metrics line: %s' % line)
+        num = _to_int(vals['C'])
+        wx = _to_float(vals['WX'])
+        name = vals['N']
+        bbox = _to_list_of_floats(vals['B'])
+        bbox = list(map(int, bbox))
+        metrics = CharMetrics(wx, name, bbox)
+        # Workaround: If the character name is 'Euro', give it the
+        # corresponding character code, according to WinAnsiEncoding (see PDF
+        # Reference).
+        if name == 'Euro':
+            num = 128
+        elif name == 'minus':
+            num = ord("\N{MINUS SIGN}")  # 0x2212
+        if num != -1:
+            ascii_d[num] = metrics
+        name_d[name] = metrics
+    raise RuntimeError('Bad parse')
+
+
+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::
+
+      d[ ('A', 'y') ] = -50
+
+    """
+
+    line = next(fh)
+    if not line.startswith(b'StartKernPairs'):
+        raise RuntimeError('Bad start of kern pairs data: %s' % line)
+
+    d = {}
+    for line in fh:
+        line = line.rstrip()
+        if not line:
+            continue
+        if line.startswith(b'EndKernPairs'):
+            next(fh)  # EndKernData
+            return d
+        vals = line.split()
+        if len(vals) != 4 or vals[0] != b'KPX':
+            raise RuntimeError('Bad kern pairs line: %s' % line)
+        c1, c2, val = _to_str(vals[1]), _to_str(vals[2]), _to_float(vals[3])
+        d[(c1, c2)] = val
+    raise RuntimeError('Bad kern pairs parse')
+
+
+CompositePart = namedtuple('CompositePart', 'name, dx, dy')
+CompositePart.__doc__ = """
+    Represents the information on a composite element of a composite char."""
+CompositePart.name.__doc__ = """Name of the part, e.g. 'acute'."""
+CompositePart.dx.__doc__ = """x-displacement of the part from the origin."""
+CompositePart.dy.__doc__ = """y-displacement of the part from the origin."""
+
+
+def _parse_composites(fh):
+    """
+    Parse the given filehandle for composites information return them as a
+    dict.
+
+    It is assumed that the file cursor is on the line behind 'StartComposites'.
+
+    Returns
+    -------
+    dict
+        A dict mapping composite character names to a parts list. The parts
+        list is a list of `.CompositePart` entries describing the parts of
+        the composite.
+
+    Examples
+    --------
+    A composite definition line::
+
+      CC Aacute 2 ; PCC A 0 0 ; PCC acute 160 170 ;
+
+    will be represented as::
+
+      composites['Aacute'] = [CompositePart(name='A', dx=0, dy=0),
+                              CompositePart(name='acute', dx=160, dy=170)]
+
+    """
+    composites = {}
+    for line in fh:
+        line = line.rstrip()
+        if not line:
+            continue
+        if line.startswith(b'EndComposites'):
+            return composites
+        vals = line.split(b';')
+        cc = vals[0].split()
+        name, _num_parts = cc[1], _to_int(cc[2])
+        pccParts = []
+        for s in vals[1:-1]:
+            pcc = s.split()
+            part = CompositePart(pcc[1], _to_float(pcc[2]), _to_float(pcc[3]))
+            pccParts.append(part)
+        composites[name] = pccParts
+
+    raise RuntimeError('Bad composites parse')
+
+
+def _parse_optional(fh):
+    """
+    Parse the optional fields for kern pair data and composites.
+
+    Returns
+    -------
+    kern_data : dict
+        A dict containing kerning information. May be empty.
+        See `._parse_kern_pairs`.
+    composites : dict
+        A dict containing composite information. May be empty.
+        See `._parse_composites`.
+    """
+    optional = {
+        b'StartKernData': _parse_kern_pairs,
+        b'StartComposites':  _parse_composites,
+        }
+
+    d = {b'StartKernData': {},
+         b'StartComposites': {}}
+    for line in fh:
+        line = line.rstrip()
+        if not line:
+            continue
+        key = line.split()[0]
+
+        if key in optional:
+            d[key] = optional[key](fh)
+
+    return d[b'StartKernData'], d[b'StartComposites']
+
+
+class AFM:
+
+    def __init__(self, fh):
+        """Parse the AFM file in file object *fh*."""
+        self._header = _parse_header(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):
+            return 0, 0, 0, 0, 0
+        total_width = 0
+        namelast = None
+        miny = 1e9
+        maxy = 0
+        left = 0
+        if not isinstance(s, str):
+            s = _to_str(s)
+        for c in s:
+            if c == '\n':
+                continue
+            name = uni2type1.get(ord(c), f"uni{ord(c):04X}")
+            try:
+                wx, _, bbox = self._metrics_by_name[name]
+            except KeyError:
+                name = 'question'
+                wx, _, bbox = self._metrics_by_name[name]
+            total_width += wx + self._kern.get((namelast, name), 0)
+            l, b, w, h = bbox
+            left = min(left, l)
+            miny = min(miny, b)
+            maxy = max(maxy, b + h)
+
+            namelast = name
+
+        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_width_char(self, c, isord=False):
+        """
+        Get the width of the character from the character metric WX field.
+        """
+        if not isord:
+            c = ord(c)
+        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 self._kern.get((name1, name2), 0)
+
+    def get_fontname(self):
+        """Return the font name, e.g., 'Times-Roman'."""
+        return self._header[b'FontName']
+
+    @property
+    def postscript_name(self):  # For consistency with FT2Font.
+        return self.get_fontname()
+
+    def get_fullname(self):
+        """Return the font full name, e.g., 'Times-Roman'."""
+        name = self._header.get(b'FullName')
+        if name is None:  # use FontName as a substitute
+            name = self._header[b'FontName']
+        return name
+
+    def get_familyname(self):
+        """Return the font family name, e.g., 'Times'."""
+        name = self._header.get(b'FamilyName')
+        if name is not None:
+            return name
+
+        # FamilyName not specified so we'll make a guess
+        name = self.get_fullname()
+        extras = (r'(?i)([ -](regular|plain|italic|oblique|bold|semibold|'
+                  r'light|ultralight|extra|condensed))+$')
+        return re.sub(extras, '', name)
+
+    @property
+    def family_name(self):
+        """The font family name, e.g., 'Times'."""
+        return self.get_familyname()
+
+    def get_weight(self):
+        """Return the font weight, e.g., 'Bold' or 'Roman'."""
+        return self._header[b'Weight']
+
+    def get_angle(self):
+        """Return the fontangle as float."""
+        return self._header[b'ItalicAngle']
+
+    def get_capheight(self):
+        """Return the cap height as float."""
+        return self._header[b'CapHeight']
+
+    def get_xheight(self):
+        """Return the xheight as float."""
+        return self._header[b'XHeight']
+
+    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/_animation_data.py b/lib/matplotlib/_animation_data.py
index 257f0c4a7f6f..4bf2ae3148d2 100644
--- a/lib/matplotlib/_animation_data.py
+++ b/lib/matplotlib/_animation_data.py
@@ -1,4 +1,4 @@
-# Javascript template for HTMLWriter
+# JavaScript template for HTMLWriter
 JS_INCLUDE = """
 <link rel="stylesheet"
 href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
@@ -196,7 +196,7 @@
   <div class="anim-controls">
     <input id="_anim_slider{id}" type="range" class="anim-slider"
            name="points" min="0" max="1" step="1" value="0"
-           oninput="anim{id}.set_frame(parseInt(this.value));"></input>
+           oninput="anim{id}.set_frame(parseInt(this.value));">
     <div class="anim-buttons">
       <button title="Decrease speed" aria-label="Decrease speed" onclick="anim{id}.slower()">
           <i class="fa fa-minus"></i></button>
diff --git a/lib/matplotlib/_api/__init__.py b/lib/matplotlib/_api/__init__.py
index f251e07bab59..96ea22df4498 100644
--- a/lib/matplotlib/_api/__init__.py
+++ b/lib/matplotlib/_api/__init__.py
@@ -3,13 +3,14 @@
 
 This documentation is only relevant for Matplotlib developers, not for users.
 
-.. warning:
+.. warning::
 
     This module and its submodules are for internal use only.  Do not use them
     in your own code.  We may change the API at any time with no warning.
 
 """
 
+import functools
 import itertools
 import re
 import sys
@@ -119,15 +120,15 @@ def check_in_list(_values, *, _print_supported_values=True, **kwargs):
     --------
     >>> _api.check_in_list(["foo", "bar"], arg=arg, other_arg=other_arg)
     """
+    if not kwargs:
+        raise TypeError("No argument to check!")
     values = _values
     for key, val in kwargs.items():
         if val not in values:
+            msg = f"{val!r} is not a valid value for {key}"
             if _print_supported_values:
-                raise ValueError(
-                    f"{val!r} is not a valid value for {key}; "
-                    f"supported values are {', '.join(map(repr, values))}")
-            else:
-                raise ValueError(f"{val!r} is not a valid value for {key}")
+                msg += f"; supported values are {', '.join(map(repr, values))}"
+            raise ValueError(msg)
 
 
 def check_shape(_shape, **kwargs):
@@ -191,6 +192,155 @@ def check_getitem(_mapping, **kwargs):
             .format(v, k, ', '.join(map(repr, mapping)))) from None
 
 
+def caching_module_getattr(cls):
+    """
+    Helper decorator for implementing module-level ``__getattr__`` as a class.
+
+    This decorator must be used at the module toplevel as follows::
+
+        @caching_module_getattr
+        class __getattr__:  # The class *must* be named ``__getattr__``.
+            @property  # Only properties are taken into account.
+            def name(self): ...
+
+    The ``__getattr__`` class will be replaced by a ``__getattr__``
+    function such that trying to access ``name`` on the module will
+    resolve the corresponding property (which may be decorated e.g. with
+    ``_api.deprecated`` for deprecating module globals).  The properties are
+    all implicitly cached.  Moreover, a suitable AttributeError is generated
+    and raised if no property with the given name exists.
+    """
+
+    assert cls.__name__ == "__getattr__"
+    # Don't accidentally export cls dunders.
+    props = {name: prop for name, prop in vars(cls).items()
+             if isinstance(prop, property)}
+    instance = cls()
+
+    @functools.lru_cache(None)
+    def __getattr__(name):
+        if name in props:
+            return props[name].__get__(instance)
+        raise AttributeError(
+            f"module {cls.__module__!r} has no attribute {name!r}")
+
+    return __getattr__
+
+
+def define_aliases(alias_d, cls=None):
+    """
+    Class decorator for defining property aliases.
+
+    Use as ::
+
+        @_api.define_aliases({"property": ["alias", ...], ...})
+        class C: ...
+
+    For each property, if the corresponding ``get_property`` is defined in the
+    class so far, an alias named ``get_alias`` will be defined; the same will
+    be done for setters.  If neither the getter nor the setter exists, an
+    exception will be raised.
+
+    The alias map is stored as the ``_alias_map`` attribute on the class and
+    can be used by `.normalize_kwargs` (which assumes that higher priority
+    aliases come last).
+    """
+    if cls is None:  # Return the actual class decorator.
+        return functools.partial(define_aliases, alias_d)
+
+    def make_alias(name):  # Enforce a closure over *name*.
+        @functools.wraps(getattr(cls, name))
+        def method(self, *args, **kwargs):
+            return getattr(self, name)(*args, **kwargs)
+        return method
+
+    for prop, aliases in alias_d.items():
+        exists = False
+        for prefix in ["get_", "set_"]:
+            if prefix + prop in vars(cls):
+                exists = True
+                for alias in aliases:
+                    method = make_alias(prefix + prop)
+                    method.__name__ = prefix + alias
+                    method.__doc__ = "Alias for `{}`.".format(prefix + prop)
+                    setattr(cls, prefix + alias, method)
+        if not exists:
+            raise ValueError(
+                "Neither getter nor setter exists for {!r}".format(prop))
+
+    def get_aliased_and_aliases(d):
+        return {*d, *(alias for aliases in d.values() for alias in aliases)}
+
+    preexisting_aliases = getattr(cls, "_alias_map", {})
+    conflicting = (get_aliased_and_aliases(preexisting_aliases)
+                   & get_aliased_and_aliases(alias_d))
+    if conflicting:
+        # Need to decide on conflict resolution policy.
+        raise NotImplementedError(
+            f"Parent class already defines conflicting aliases: {conflicting}")
+    cls._alias_map = {**preexisting_aliases, **alias_d}
+    return cls
+
+
+def select_matching_signature(funcs, *args, **kwargs):
+    """
+    Select and call the function that accepts ``*args, **kwargs``.
+
+    *funcs* is a list of functions which should not raise any exception (other
+    than `TypeError` if the arguments passed do not match their signature).
+
+    `select_matching_signature` tries to call each of the functions in *funcs*
+    with ``*args, **kwargs`` (in the order in which they are given).  Calls
+    that fail with a `TypeError` are silently skipped.  As soon as a call
+    succeeds, `select_matching_signature` returns its return value.  If no
+    function accepts ``*args, **kwargs``, then the `TypeError` raised by the
+    last failing call is re-raised.
+
+    Callers should normally make sure that any ``*args, **kwargs`` can only
+    bind a single *func* (to avoid any ambiguity), although this is not checked
+    by `select_matching_signature`.
+
+    Notes
+    -----
+    `select_matching_signature` is intended to help implementing
+    signature-overloaded functions.  In general, such functions should be
+    avoided, except for back-compatibility concerns.  A typical use pattern is
+    ::
+
+        def my_func(*args, **kwargs):
+            params = select_matching_signature(
+                [lambda old1, old2: locals(), lambda new: locals()],
+                *args, **kwargs)
+            if "old1" in params:
+                warn_deprecated(...)
+                old1, old2 = params.values()  # note that locals() is ordered.
+            else:
+                new, = params.values()
+            # do things with params
+
+    which allows *my_func* to be called either with two parameters (*old1* and
+    *old2*) or a single one (*new*).  Note that the new signature is given
+    last, so that callers get a `TypeError` corresponding to the new signature
+    if the arguments they passed in do not match any signature.
+    """
+    # Rather than relying on locals() ordering, one could have just used func's
+    # signature (``bound = inspect.signature(func).bind(*args, **kwargs);
+    # bound.apply_defaults(); return bound``) but that is significantly slower.
+    for i, func in enumerate(funcs):
+        try:
+            return func(*args, **kwargs)
+        except TypeError:
+            if i == len(funcs) - 1:
+                raise
+
+
+def recursive_subclasses(cls):
+    """Yield *cls* and direct and indirect subclasses of *cls*."""
+    yield cls
+    for subcls in cls.__subclasses__():
+        yield from recursive_subclasses(subcls)
+
+
 def warn_external(message, category=None):
     """
     `warnings.warn` wrapper that sets *stacklevel* to "outside Matplotlib".
diff --git a/lib/matplotlib/_api/deprecation.py b/lib/matplotlib/_api/deprecation.py
index 7c3a17965928..7c304173b2e5 100644
--- a/lib/matplotlib/_api/deprecation.py
+++ b/lib/matplotlib/_api/deprecation.py
@@ -3,7 +3,7 @@
 
 This documentation is only relevant for Matplotlib developers, not for users.
 
-.. warning:
+.. warning::
 
     This module is for internal use only.  Do not use it in your own code.
     We may change the API at any time with no warning.
@@ -13,25 +13,12 @@
 import contextlib
 import functools
 import inspect
+import math
 import warnings
 
 
-class MatplotlibDeprecationWarning(UserWarning):
-    """
-    A class for issuing deprecation warnings for Matplotlib users.
-
-    In light of the fact that Python builtin DeprecationWarnings are ignored
-    by default as of Python 2.7 (see link below), this class was put in to
-    allow for the signaling of deprecation, but via UserWarnings which are not
-    ignored by default.
-
-    https://docs.python.org/dev/whatsnew/2.7.html#the-future-for-python-2-x
-    """
-
-
-# mplDeprecation is deprecated. Use MatplotlibDeprecationWarning instead.
-# remove when removing the re-import from cbook
-mplDeprecation = MatplotlibDeprecationWarning
+class MatplotlibDeprecationWarning(DeprecationWarning):
+    """A class for issuing deprecation warnings for Matplotlib users."""
 
 
 def _generate_deprecation_warning(
@@ -45,13 +32,11 @@ def _generate_deprecation_warning(
         removal = f"in {removal}" if removal else "two minor releases later"
     if not message:
         message = (
-            "\nThe %(name)s %(obj_type)s"
+            ("The %(name)s %(obj_type)s" if obj_type else "%(name)s")
             + (" will be deprecated in a future version"
                if pending else
                (" was deprecated in Matplotlib %(since)s"
-                + (" and will be removed %(removal)s"
-                   if removal else
-                   "")))
+                + (" and will be removed %(removal)s" if removal else "")))
             + "."
             + (" Use %(alternative)s instead." if alternative else "")
             + (" %(addendum)s" if addendum else ""))
@@ -72,31 +57,24 @@ def warn_deprecated(
     ----------
     since : str
         The release at which this API became deprecated.
-
     message : str, optional
         Override the default deprecation message.  The ``%(since)s``,
         ``%(name)s``, ``%(alternative)s``, ``%(obj_type)s``, ``%(addendum)s``,
         and ``%(removal)s`` format specifiers will be replaced by the values
         of the respective arguments passed to this function.
-
     name : str, optional
         The name of the deprecated object.
-
     alternative : str, optional
         An alternative API that the user may use in place of the deprecated
         API.  The deprecation warning will tell the user about this alternative
         if provided.
-
     pending : bool, optional
         If True, uses a PendingDeprecationWarning instead of a
         DeprecationWarning.  Cannot be used together with *removal*.
-
     obj_type : str, optional
         The object type being deprecated.
-
     addendum : str, optional
         Additional text appended directly to the final message.
-
     removal : str, optional
         The expected removal version.  With the default (an empty string), a
         removal version is automatically computed from *since*.  Set to other
@@ -105,7 +83,7 @@ def warn_deprecated(
 
     Examples
     --------
-    Basic example::
+    ::
 
         # To warn of the deprecation of "matplotlib.name_of_module"
         warn_deprecated('1.4.0', name='matplotlib.name_of_module',
@@ -134,46 +112,13 @@ def deprecated(since, *, message='', name='', alternative='', pending=False,
     ``@deprecated`` would mess up ``__init__`` inheritance when installing its
     own (deprecation-emitting) ``C.__init__``).
 
-    Parameters
-    ----------
-    since : str
-        The release at which this API became deprecated.
-
-    message : str, optional
-        Override the default deprecation message.  The ``%(since)s``,
-        ``%(name)s``, ``%(alternative)s``, ``%(obj_type)s``, ``%(addendum)s``,
-        and ``%(removal)s`` format specifiers will be replaced by the values
-        of the respective arguments passed to this function.
-
-    name : str, optional
-        The name used in the deprecation message; if not provided, the name
-        is automatically determined from the deprecated object.
-
-    alternative : str, optional
-        An alternative API that the user may use in place of the deprecated
-        API.  The deprecation warning will tell the user about this alternative
-        if provided.
-
-    pending : bool, optional
-        If True, uses a PendingDeprecationWarning instead of a
-        DeprecationWarning.  Cannot be used together with *removal*.
-
-    obj_type : str, optional
-        The object type being deprecated; by default, 'class' if decorating
-        a class, 'attribute' if decorating a property, 'function' otherwise.
-
-    addendum : str, optional
-        Additional text appended directly to the final message.
-
-    removal : str, optional
-        The expected removal version.  With the default (an empty string), a
-        removal version is automatically computed from *since*.  Set to other
-        Falsy values to not schedule a removal date.  Cannot be used together
-        with *pending*.
+    Parameters are the same as for `warn_deprecated`, except that *obj_type*
+    defaults to 'class' if decorating a class, 'attribute' if decorating a
+    property, and 'function' otherwise.
 
     Examples
     --------
-    Basic example::
+    ::
 
         @deprecated('1.4.0')
         def the_function_to_deprecate():
@@ -200,13 +145,14 @@ def finalize(wrapper, new_doc):
                 return obj
 
         elif isinstance(obj, (property, classproperty)):
-            obj_type = "attribute"
+            if obj_type is None:
+                obj_type = "attribute"
             func = None
             name = name or obj.fget.__name__
             old_doc = obj.__doc__
 
             class _deprecated_property(type(obj)):
-                def __get__(self, instance, owner):
+                def __get__(self, instance, owner=None):
                     if instance is not None or owner is not None \
                             and isinstance(self, classproperty):
                         emit_warning()
@@ -256,10 +202,13 @@ def wrapper(*args, **kwargs):
         old_doc = inspect.cleandoc(old_doc or '').strip('\n')
 
         notes_header = '\nNotes\n-----'
+        second_arg = ' '.join([t.strip() for t in
+                               (message, f"Use {alternative} instead."
+                                if alternative else "", addendum) if t])
         new_doc = (f"[*Deprecated*] {old_doc}\n"
                    f"{notes_header if notes_header not in old_doc else ''}\n"
                    f".. deprecated:: {since}\n"
-                   f"   {message.strip()}")
+                   f"   {second_arg}")
 
         if not old_doc:
             # This is to prevent a spurious 'unexpected unindent' warning from
@@ -273,7 +222,7 @@ def wrapper(*args, **kwargs):
 
 class deprecate_privatize_attribute:
     """
-    Helper to deprecate public access to an attribute.
+    Helper to deprecate public access to an attribute (or method).
 
     This helper should only be used at class scope, as follows::
 
@@ -281,9 +230,10 @@ class Foo:
             attr = _deprecate_privatize_attribute(*args, **kwargs)
 
     where *all* parameters are forwarded to `deprecated`.  This form makes
-    ``attr`` a property which forwards access to ``self._attr`` (same name but
-    with a leading underscore), with a deprecation warning.  Note that the
-    attribute name is derived from *the name this helper is assigned to*.
+    ``attr`` a property which forwards read and write access to ``self._attr``
+    (same name but with a leading underscore), with a deprecation warning.
+    Note that the attribute name is derived from *the name this helper is
+    assigned to*.  This helper also works for deprecating methods.
     """
 
     def __init__(self, *args, **kwargs):
@@ -291,7 +241,17 @@ def __init__(self, *args, **kwargs):
 
     def __set_name__(self, owner, name):
         setattr(owner, name, self.deprecator(
-            property(lambda self: getattr(self, f"_{name}")), name=name))
+            property(lambda self: getattr(self, f"_{name}"),
+                     lambda self, value: setattr(self, f"_{name}", value)),
+            name=name))
+
+
+# Used by _copy_docstring_and_deprecators to redecorate pyplot wrappers and
+# boilerplate.py to retrieve original signatures.  It may seem natural to store
+# this information as an attribute on the wrapper, but if the wrapper gets
+# itself functools.wraps()ed, then such attributes are silently propagated to
+# the outer wrapper, which is not desired.
+DECORATORS = {}
 
 
 def rename_parameter(since, old, new, func=None):
@@ -313,8 +273,10 @@ def rename_parameter(since, old, new, func=None):
         def func(good_name): ...
     """
 
+    decorator = functools.partial(rename_parameter, since, old, new)
+
     if func is None:
-        return functools.partial(rename_parameter, since, old, new)
+        return decorator
 
     signature = inspect.signature(func)
     assert old not in signature.parameters, (
@@ -339,6 +301,7 @@ def wrapper(*args, **kwargs):
     # would both show up in the pyplot function for an Axes method as well and
     # pyplot would explicitly pass both arguments to the Axes method.
 
+    DECORATORS[wrapper] = decorator
     return wrapper
 
 
@@ -375,8 +338,10 @@ def delete_parameter(since, name, func=None, **kwargs):
         def func(used_arg, other_arg, unused, more_args): ...
     """
 
+    decorator = functools.partial(delete_parameter, since, name, **kwargs)
+
     if func is None:
-        return functools.partial(delete_parameter, since, name, **kwargs)
+        return decorator
 
     signature = inspect.signature(func)
     # Name of `**kwargs` parameter of the decorated function, typically
@@ -389,12 +354,22 @@ def func(used_arg, other_arg, unused, more_args): ...
         is_varargs = kind is inspect.Parameter.VAR_POSITIONAL
         is_varkwargs = kind is inspect.Parameter.VAR_KEYWORD
         if not is_varargs and not is_varkwargs:
+            name_idx = (
+                # Deprecated parameter can't be passed positionally.
+                math.inf if kind is inspect.Parameter.KEYWORD_ONLY
+                # If call site has no more than this number of parameters, the
+                # deprecated parameter can't have been passed positionally.
+                else [*signature.parameters].index(name))
             func.__signature__ = signature = signature.replace(parameters=[
                 param.replace(default=_deprecated_parameter)
                 if param.name == name else param
                 for param in signature.parameters.values()])
+        else:
+            name_idx = -1  # Deprecated parameter can always have been passed.
     else:
         is_varargs = is_varkwargs = False
+        # Deprecated parameter can't be passed positionally.
+        name_idx = math.inf
         assert kwargs_name, (
             f"Matplotlib internal error: {name!r} must be a parameter for "
             f"{func.__name__}()")
@@ -403,6 +378,10 @@ def func(used_arg, other_arg, unused, more_args): ...
 
     @functools.wraps(func)
     def wrapper(*inner_args, **inner_kwargs):
+        if len(inner_args) <= name_idx and name not in inner_kwargs:
+            # Early return in the simple, non-deprecated case (much faster than
+            # calling bind()).
+            return func(*inner_args, **inner_kwargs)
         arguments = signature.bind(*inner_args, **inner_kwargs).arguments
         if is_varargs and arguments.get(name):
             warn_deprecated(
@@ -430,6 +409,7 @@ def wrapper(*inner_args, **inner_kwargs):
                 **kwargs)
         return func(*inner_args, **inner_kwargs)
 
+    DECORATORS[wrapper] = decorator
     return wrapper
 
 
@@ -437,10 +417,16 @@ def make_keyword_only(since, name, func=None):
     """
     Decorator indicating that passing parameter *name* (or any of the following
     ones) positionally to *func* is being deprecated.
+
+    When used on a method that has a pyplot wrapper, this should be the
+    outermost decorator, so that :file:`boilerplate.py` can access the original
+    signature.
     """
 
+    decorator = functools.partial(make_keyword_only, since, name)
+
     if func is None:
-        return functools.partial(make_keyword_only, since, name)
+        return decorator
 
     signature = inspect.signature(func)
     POK = inspect.Parameter.POSITIONAL_OR_KEYWORD
@@ -450,19 +436,16 @@ def make_keyword_only(since, name, func=None):
         f"Matplotlib internal error: {name!r} must be a positional-or-keyword "
         f"parameter for {func.__name__}()")
     names = [*signature.parameters]
-    kwonly = [name for name in names[names.index(name):]
+    name_idx = names.index(name)
+    kwonly = [name for name in names[name_idx:]
               if signature.parameters[name].kind == POK]
-    func.__signature__ = signature.replace(parameters=[
-        param.replace(kind=KWO) if param.name in kwonly else param
-        for param in signature.parameters.values()])
 
     @functools.wraps(func)
     def wrapper(*args, **kwargs):
         # Don't use signature.bind here, as it would fail when stacked with
         # rename_parameter and an "old" argument name is passed in
         # (signature.bind would fail, but the actual call would succeed).
-        idx = [*func.__signature__.parameters].index(name)
-        if len(args) > idx:
+        if len(args) > name_idx:
             warn_deprecated(
                 since, message="Passing the %(name)s %(obj_type)s "
                 "positionally is deprecated since Matplotlib %(since)s; the "
@@ -470,6 +453,11 @@ def wrapper(*args, **kwargs):
                 name=name, obj_type=f"parameter of {func.__name__}()")
         return func(*args, **kwargs)
 
+    # Don't modify *func*'s signature, as boilerplate.py needs it.
+    wrapper.__signature__ = signature.replace(parameters=[
+        param.replace(kind=KWO) if param.name in kwonly else param
+        for param in signature.parameters.values()])
+    DECORATORS[wrapper] = decorator
     return wrapper
 
 
diff --git a/lib/matplotlib/_blocking_input.py b/lib/matplotlib/_blocking_input.py
new file mode 100644
index 000000000000..45f077571443
--- /dev/null
+++ b/lib/matplotlib/_blocking_input.py
@@ -0,0 +1,30 @@
+def blocking_input_loop(figure, event_names, timeout, handler):
+    """
+    Run *figure*'s event loop while listening to interactive events.
+
+    The events listed in *event_names* are passed to *handler*.
+
+    This function is used to implement `.Figure.waitforbuttonpress`,
+    `.Figure.ginput`, and `.Axes.clabel`.
+
+    Parameters
+    ----------
+    figure : `~matplotlib.figure.Figure`
+    event_names : list of str
+        The names of the events passed to *handler*.
+    timeout : float
+        If positive, the event loop is stopped after *timeout* seconds.
+    handler : Callable[[Event], Any]
+        Function called for each event; it can force an early exit of the event
+        loop by calling ``canvas.stop_event_loop()``.
+    """
+    if figure.canvas.manager:
+        figure.show()  # Ensure that the figure is shown if we are managing it.
+    # Connect the events to the on_event function call.
+    cids = [figure.canvas.mpl_connect(name, handler) for name in event_names]
+    try:
+        figure.canvas.start_event_loop(timeout)  # Start event loop.
+    finally:  # Run even on exception like ctrl-c.
+        # Disconnect the callbacks.
+        for cid in cids:
+            figure.canvas.mpl_disconnect(cid)
diff --git a/lib/matplotlib/_cm.py b/lib/matplotlib/_cm.py
index 84b2fd3799f2..586417d53954 100644
--- a/lib/matplotlib/_cm.py
+++ b/lib/matplotlib/_cm.py
@@ -459,44 +459,50 @@ def _g36(x): return 2 * x - 1
                 'blue':  ((0., 1., 1.), (1.0, 0.5, 0.5))}
 
 _nipy_spectral_data = {
-      'red': [(0.0, 0.0, 0.0), (0.05, 0.4667, 0.4667),
-              (0.10, 0.5333, 0.5333), (0.15, 0.0, 0.0),
-              (0.20, 0.0, 0.0), (0.25, 0.0, 0.0),
-              (0.30, 0.0, 0.0), (0.35, 0.0, 0.0),
-              (0.40, 0.0, 0.0), (0.45, 0.0, 0.0),
-              (0.50, 0.0, 0.0), (0.55, 0.0, 0.0),
-              (0.60, 0.0, 0.0), (0.65, 0.7333, 0.7333),
-              (0.70, 0.9333, 0.9333), (0.75, 1.0, 1.0),
-              (0.80, 1.0, 1.0), (0.85, 1.0, 1.0),
-              (0.90, 0.8667, 0.8667), (0.95, 0.80, 0.80),
-              (1.0, 0.80, 0.80)],
-    'green': [(0.0, 0.0, 0.0), (0.05, 0.0, 0.0),
-              (0.10, 0.0, 0.0), (0.15, 0.0, 0.0),
-              (0.20, 0.0, 0.0), (0.25, 0.4667, 0.4667),
-              (0.30, 0.6000, 0.6000), (0.35, 0.6667, 0.6667),
-              (0.40, 0.6667, 0.6667), (0.45, 0.6000, 0.6000),
-              (0.50, 0.7333, 0.7333), (0.55, 0.8667, 0.8667),
-              (0.60, 1.0, 1.0), (0.65, 1.0, 1.0),
-              (0.70, 0.9333, 0.9333), (0.75, 0.8000, 0.8000),
-              (0.80, 0.6000, 0.6000), (0.85, 0.0, 0.0),
-              (0.90, 0.0, 0.0), (0.95, 0.0, 0.0),
-              (1.0, 0.80, 0.80)],
-     'blue': [(0.0, 0.0, 0.0), (0.05, 0.5333, 0.5333),
-              (0.10, 0.6000, 0.6000), (0.15, 0.6667, 0.6667),
-              (0.20, 0.8667, 0.8667), (0.25, 0.8667, 0.8667),
-              (0.30, 0.8667, 0.8667), (0.35, 0.6667, 0.6667),
-              (0.40, 0.5333, 0.5333), (0.45, 0.0, 0.0),
-              (0.5, 0.0, 0.0), (0.55, 0.0, 0.0),
-              (0.60, 0.0, 0.0), (0.65, 0.0, 0.0),
-              (0.70, 0.0, 0.0), (0.75, 0.0, 0.0),
-              (0.80, 0.0, 0.0), (0.85, 0.0, 0.0),
-              (0.90, 0.0, 0.0), (0.95, 0.0, 0.0),
-              (1.0, 0.80, 0.80)],
+    'red': [
+        (0.0, 0.0, 0.0), (0.05, 0.4667, 0.4667),
+        (0.10, 0.5333, 0.5333), (0.15, 0.0, 0.0),
+        (0.20, 0.0, 0.0), (0.25, 0.0, 0.0),
+        (0.30, 0.0, 0.0), (0.35, 0.0, 0.0),
+        (0.40, 0.0, 0.0), (0.45, 0.0, 0.0),
+        (0.50, 0.0, 0.0), (0.55, 0.0, 0.0),
+        (0.60, 0.0, 0.0), (0.65, 0.7333, 0.7333),
+        (0.70, 0.9333, 0.9333), (0.75, 1.0, 1.0),
+        (0.80, 1.0, 1.0), (0.85, 1.0, 1.0),
+        (0.90, 0.8667, 0.8667), (0.95, 0.80, 0.80),
+        (1.0, 0.80, 0.80),
+    ],
+    'green': [
+        (0.0, 0.0, 0.0), (0.05, 0.0, 0.0),
+        (0.10, 0.0, 0.0), (0.15, 0.0, 0.0),
+        (0.20, 0.0, 0.0), (0.25, 0.4667, 0.4667),
+        (0.30, 0.6000, 0.6000), (0.35, 0.6667, 0.6667),
+        (0.40, 0.6667, 0.6667), (0.45, 0.6000, 0.6000),
+        (0.50, 0.7333, 0.7333), (0.55, 0.8667, 0.8667),
+        (0.60, 1.0, 1.0), (0.65, 1.0, 1.0),
+        (0.70, 0.9333, 0.9333), (0.75, 0.8000, 0.8000),
+        (0.80, 0.6000, 0.6000), (0.85, 0.0, 0.0),
+        (0.90, 0.0, 0.0), (0.95, 0.0, 0.0),
+        (1.0, 0.80, 0.80),
+    ],
+    'blue': [
+        (0.0, 0.0, 0.0), (0.05, 0.5333, 0.5333),
+        (0.10, 0.6000, 0.6000), (0.15, 0.6667, 0.6667),
+        (0.20, 0.8667, 0.8667), (0.25, 0.8667, 0.8667),
+        (0.30, 0.8667, 0.8667), (0.35, 0.6667, 0.6667),
+        (0.40, 0.5333, 0.5333), (0.45, 0.0, 0.0),
+        (0.5, 0.0, 0.0), (0.55, 0.0, 0.0),
+        (0.60, 0.0, 0.0), (0.65, 0.0, 0.0),
+        (0.70, 0.0, 0.0), (0.75, 0.0, 0.0),
+        (0.80, 0.0, 0.0), (0.85, 0.0, 0.0),
+        (0.90, 0.0, 0.0), (0.95, 0.0, 0.0),
+        (1.0, 0.80, 0.80),
+    ],
 }
 
 
 # 34 colormaps based on color specifications and designs
-# developed by Cynthia Brewer (http://colorbrewer.org).
+# developed by Cynthia Brewer (https://colorbrewer2.org/).
 # The ColorBrewer palettes have been included under the terms
 # of an Apache-stype license (for details, see the file
 # LICENSE_COLORBREWER in the license directory of the matplotlib
@@ -1207,7 +1213,7 @@ def _gist_yarg(x): return 1 - x
 # Implementation of Carey Rappaport's CMRmap.
 # See `A Color Map for Effective Black-and-White Rendering of Color-Scale
 # Images' by Carey Rappaport
-# http://www.mathworks.com/matlabcentral/fileexchange/2662-cmrmap-m
+# https://www.mathworks.com/matlabcentral/fileexchange/2662-cmrmap-m
 _CMRmap_data = {'red':    ((0.000, 0.00, 0.00),
                            (0.125, 0.15, 0.15),
                            (0.250, 0.30, 0.30),
@@ -1239,7 +1245,7 @@ def _gist_yarg(x): return 1 - x
 
 # An MIT licensed, colorblind-friendly heatmap from Wistia:
 #   https://github.com/wistia/heatmap-palette
-#   http://wistia.com/blog/heatmaps-for-colorblindness
+#   https://wistia.com/learn/culture/heatmaps-for-colorblindness
 #
 # >>> import matplotlib.colors as c
 # >>> colors = ["#e4ff7a", "#ffe81a", "#ffbd00", "#ffa000", "#fc7f00"]
diff --git a/lib/matplotlib/_color_data.py b/lib/matplotlib/_color_data.py
index e50998b18fd5..44f97adbb76a 100644
--- a/lib/matplotlib/_color_data.py
+++ b/lib/matplotlib/_color_data.py
@@ -1,6 +1,3 @@
-from collections import OrderedDict
-
-
 BASE_COLORS = {
     'b': (0, 0, 1),        # blue
     'g': (0, 0.5, 0),      # green
@@ -14,32 +11,29 @@
 
 
 # These colors are from Tableau
-TABLEAU_COLORS = (
-    ('blue', '#1f77b4'),
-    ('orange', '#ff7f0e'),
-    ('green', '#2ca02c'),
-    ('red', '#d62728'),
-    ('purple', '#9467bd'),
-    ('brown', '#8c564b'),
-    ('pink', '#e377c2'),
-    ('gray', '#7f7f7f'),
-    ('olive', '#bcbd22'),
-    ('cyan', '#17becf'),
-)
+TABLEAU_COLORS = {
+    'tab:blue': '#1f77b4',
+    'tab:orange': '#ff7f0e',
+    'tab:green': '#2ca02c',
+    'tab:red': '#d62728',
+    'tab:purple': '#9467bd',
+    'tab:brown': '#8c564b',
+    'tab:pink': '#e377c2',
+    'tab:gray': '#7f7f7f',
+    'tab:olive': '#bcbd22',
+    'tab:cyan': '#17becf',
+}
 
-# Normalize name to "tab:<name>" to avoid name collisions.
-TABLEAU_COLORS = OrderedDict(
-    ('tab:' + name, value) for name, value in TABLEAU_COLORS)
 
 # This mapping of color names -> hex values is taken from
 # a survey run by Randall Munroe see:
 # https://blog.xkcd.com/2010/05/03/color-survey-results/
 # for more details.  The results are hosted at
-# https://xkcd.com/color/rgb
+# https://xkcd.com/color/rgb/
 # and also available as a text file at
 # https://xkcd.com/color/rgb.txt
 #
-# License: http://creativecommons.org/publicdomain/zero/1.0/
+# License: https://creativecommons.org/publicdomain/zero/1.0/
 XKCD_COLORS = {
     'cloudy blue': '#acc2d9',
     'dark pastel green': '#56ae57',
diff --git a/lib/matplotlib/_constrained_layout.py b/lib/matplotlib/_constrained_layout.py
index 58bb0ccabf95..5b5e0b9cf642 100644
--- a/lib/matplotlib/_constrained_layout.py
+++ b/lib/matplotlib/_constrained_layout.py
@@ -11,18 +11,7 @@
 layout.  Axes manually placed via ``figure.add_axes()`` will not.
 
 See Tutorial: :doc:`/tutorials/intermediate/constrainedlayout_guide`
-"""
-
-import logging
-
-import numpy as np
-
-from matplotlib import _api
-import matplotlib.transforms as mtransforms
 
-_log = logging.getLogger(__name__)
-
-"""
 General idea:
 -------------
 
@@ -31,8 +20,8 @@
 often just set to 1 for an equal grid.
 
 Subplotspecs that are derived from this gridspec can contain either a
-``SubPanel``, a ``GridSpecFromSubplotSpec``, or an axes.  The ``SubPanel`` and
-``GridSpecFromSubplotSpec`` are dealt with recursively and each contain an
+``SubPanel``, a ``GridSpecFromSubplotSpec``, or an ``Axes``.  The ``SubPanel``
+and ``GridSpecFromSubplotSpec`` are dealt with recursively and each contain an
 analogous layout.
 
 Each ``GridSpec`` has a ``_layoutgrid`` attached to it.  The ``_layoutgrid``
@@ -58,10 +47,22 @@
 for more discussion of the algorithm with examples.
 """
 
+import logging
+
+import numpy as np
+
+from matplotlib import _api, artist as martist
+import matplotlib.transforms as mtransforms
+import matplotlib._layoutgrid as mlayoutgrid
+
+
+_log = logging.getLogger(__name__)
+
 
 ######################################################
-def do_constrained_layout(fig, renderer, h_pad, w_pad,
-                          hspace=None, wspace=None):
+def do_constrained_layout(fig, h_pad, w_pad,
+                          hspace=None, wspace=None, rect=(0, 0, 1, 1),
+                          compress=False):
     """
     Do the constrained_layout.  Called at draw time in
      ``figure.constrained_layout()``
@@ -83,20 +84,29 @@ def do_constrained_layout(fig, renderer, h_pad, w_pad,
        A value of 0.2 for a three-column layout would have a space
        of 0.1 of the figure width between each column.
        If h/wspace < h/w_pad, then the pads are used instead.
+
+    rect : tuple of 4 floats
+        Rectangle in figure coordinates to perform constrained layout in
+        [left, bottom, width, height], each from 0-1.
+
+    compress : bool
+        Whether to shift Axes so that white space in between them is
+        removed. This is useful for simple grids of fixed-aspect Axes (e.g.
+        a grid of images).
+
+    Returns
+    -------
+    layoutgrid : private debugging structure
     """
 
-    # list of unique gridspecs that contain child axes:
-    gss = set()
-    for ax in fig.axes:
-        if hasattr(ax, 'get_subplotspec'):
-            gs = ax.get_subplotspec().get_gridspec()
-            if gs._layoutgrid is not None:
-                gss.add(gs)
-    gss = list(gss)
-    if len(gss) == 0:
+    renderer = fig._get_renderer()
+    # make layoutgrid tree...
+    layoutgrids = make_layoutgrids(fig, None, rect=rect)
+    if not layoutgrids['hasgrids']:
         _api.warn_external('There are no gridspecs with layoutgrids. '
                            'Possibly did not call parent GridSpec with the'
                            ' "figure" keyword')
+        return
 
     for _ in range(2):
         # do the algorithm twice.  This has to be done because decorations
@@ -106,42 +116,144 @@ def do_constrained_layout(fig, renderer, h_pad, w_pad,
 
         # make margins for all the axes and subfigures in the
         # figure.  Add margins for colorbars...
-        _make_layout_margins(fig, renderer, h_pad=h_pad, w_pad=w_pad,
-                             hspace=hspace, wspace=wspace)
-        _make_margin_suptitles(fig, renderer, h_pad=h_pad, w_pad=w_pad)
+        make_layout_margins(layoutgrids, fig, renderer, h_pad=h_pad,
+                            w_pad=w_pad, hspace=hspace, wspace=wspace)
+        make_margin_suptitles(layoutgrids, fig, renderer, h_pad=h_pad,
+                              w_pad=w_pad)
 
         # if a layout is such that a columns (or rows) margin has no
         # constraints, we need to make all such instances in the grid
         # match in margin size.
-        _match_submerged_margins(fig)
+        match_submerged_margins(layoutgrids, fig)
 
         # update all the variables in the layout.
-        fig._layoutgrid.update_variables()
-
-        if _check_no_collapsed_axes(fig):
-            _reposition_axes(fig, renderer, h_pad=h_pad, w_pad=w_pad,
-                             hspace=hspace, wspace=wspace)
+        layoutgrids[fig].update_variables()
+
+        warn_collapsed = ('constrained_layout not applied because '
+                          'axes sizes collapsed to zero.  Try making '
+                          'figure larger or axes decorations smaller.')
+        if check_no_collapsed_axes(layoutgrids, fig):
+            reposition_axes(layoutgrids, fig, renderer, h_pad=h_pad,
+                            w_pad=w_pad, hspace=hspace, wspace=wspace)
+            if compress:
+                layoutgrids = compress_fixed_aspect(layoutgrids, fig)
+                layoutgrids[fig].update_variables()
+                if check_no_collapsed_axes(layoutgrids, fig):
+                    reposition_axes(layoutgrids, fig, renderer, h_pad=h_pad,
+                                    w_pad=w_pad, hspace=hspace, wspace=wspace)
+                else:
+                    _api.warn_external(warn_collapsed)
         else:
-            _api.warn_external('constrained_layout not applied because '
-                               'axes sizes collapsed to zero.  Try making '
-                               'figure larger or axes decorations smaller.')
-        _reset_margins(fig)
+            _api.warn_external(warn_collapsed)
+        reset_margins(layoutgrids, fig)
+    return layoutgrids
 
 
-def _check_no_collapsed_axes(fig):
+def make_layoutgrids(fig, layoutgrids, rect=(0, 0, 1, 1)):
+    """
+    Make the layoutgrid tree.
+
+    (Sub)Figures get a layoutgrid so we can have figure margins.
+
+    Gridspecs that are attached to axes get a layoutgrid so axes
+    can have margins.
+    """
+
+    if layoutgrids is None:
+        layoutgrids = dict()
+        layoutgrids['hasgrids'] = False
+    if not hasattr(fig, '_parent'):
+        # top figure;  pass rect as parent to allow user-specified
+        # margins
+        layoutgrids[fig] = mlayoutgrid.LayoutGrid(parent=rect, name='figlb')
+    else:
+        # subfigure
+        gs = fig._subplotspec.get_gridspec()
+        # it is possible the gridspec containing this subfigure hasn't
+        # been added to the tree yet:
+        layoutgrids = make_layoutgrids_gs(layoutgrids, gs)
+        # add the layoutgrid for the subfigure:
+        parentlb = layoutgrids[gs]
+        layoutgrids[fig] = mlayoutgrid.LayoutGrid(
+            parent=parentlb,
+            name='panellb',
+            parent_inner=True,
+            nrows=1, ncols=1,
+            parent_pos=(fig._subplotspec.rowspan,
+                        fig._subplotspec.colspan))
+    # recursively do all subfigures in this figure...
+    for sfig in fig.subfigs:
+        layoutgrids = make_layoutgrids(sfig, layoutgrids)
+
+    # for each axes at the local level add its gridspec:
+    for ax in fig._localaxes:
+        if hasattr(ax, 'get_subplotspec'):
+            gs = ax.get_subplotspec().get_gridspec()
+            layoutgrids = make_layoutgrids_gs(layoutgrids, gs)
+
+    return layoutgrids
+
+
+def make_layoutgrids_gs(layoutgrids, gs):
+    """
+    Make the layoutgrid for a gridspec (and anything nested in the gridspec)
+    """
+
+    if gs in layoutgrids or gs.figure is None:
+        return layoutgrids
+    # in order to do constrained_layout there has to be at least *one*
+    # gridspec in the tree:
+    layoutgrids['hasgrids'] = True
+    if not hasattr(gs, '_subplot_spec'):
+        # normal gridspec
+        parent = layoutgrids[gs.figure]
+        layoutgrids[gs] = mlayoutgrid.LayoutGrid(
+                parent=parent,
+                parent_inner=True,
+                name='gridspec',
+                ncols=gs._ncols, nrows=gs._nrows,
+                width_ratios=gs.get_width_ratios(),
+                height_ratios=gs.get_height_ratios())
+    else:
+        # this is a gridspecfromsubplotspec:
+        subplot_spec = gs._subplot_spec
+        parentgs = subplot_spec.get_gridspec()
+        # if a nested gridspec it is possible the parent is not in there yet:
+        if parentgs not in layoutgrids:
+            layoutgrids = make_layoutgrids_gs(layoutgrids, parentgs)
+        subspeclb = layoutgrids[parentgs]
+        # gridspecfromsubplotspec need an outer container:
+        # get a unique representation:
+        rep = (gs, 'top')
+        if rep not in layoutgrids:
+            layoutgrids[rep] = mlayoutgrid.LayoutGrid(
+                parent=subspeclb,
+                name='top',
+                nrows=1, ncols=1,
+                parent_pos=(subplot_spec.rowspan, subplot_spec.colspan))
+        layoutgrids[gs] = mlayoutgrid.LayoutGrid(
+                parent=layoutgrids[rep],
+                name='gridspec',
+                nrows=gs._nrows, ncols=gs._ncols,
+                width_ratios=gs.get_width_ratios(),
+                height_ratios=gs.get_height_ratios())
+    return layoutgrids
+
+
+def check_no_collapsed_axes(layoutgrids, fig):
     """
     Check that no axes have collapsed to zero size.
     """
-    for panel in fig.subfigs:
-        ok = _check_no_collapsed_axes(panel)
+    for sfig in fig.subfigs:
+        ok = check_no_collapsed_axes(layoutgrids, sfig)
         if not ok:
             return False
 
     for ax in fig.axes:
         if hasattr(ax, 'get_subplotspec'):
             gs = ax.get_subplotspec().get_gridspec()
-            lg = gs._layoutgrid
-            if lg is not None:
+            if gs in layoutgrids:
+                lg = layoutgrids[gs]
                 for i in range(gs.nrows):
                     for j in range(gs.ncols):
                         bb = lg.get_inner_bbox(i, j)
@@ -150,12 +262,48 @@ def _check_no_collapsed_axes(fig):
     return True
 
 
-def _get_margin_from_padding(object, *, w_pad=0, h_pad=0,
-                             hspace=0, wspace=0):
-
-    ss = object._subplotspec
+def compress_fixed_aspect(layoutgrids, fig):
+    gs = None
+    for ax in fig.axes:
+        if not hasattr(ax, 'get_subplotspec'):
+            continue
+        ax.apply_aspect()
+        sub = ax.get_subplotspec()
+        _gs = sub.get_gridspec()
+        if gs is None:
+            gs = _gs
+            extraw = np.zeros(gs.ncols)
+            extrah = np.zeros(gs.nrows)
+        elif _gs != gs:
+            raise ValueError('Cannot do compressed layout if axes are not'
+                                'all from the same gridspec')
+        orig = ax.get_position(original=True)
+        actual = ax.get_position(original=False)
+        dw = orig.width - actual.width
+        if dw > 0:
+            extraw[sub.colspan] = np.maximum(extraw[sub.colspan], dw)
+        dh = orig.height - actual.height
+        if dh > 0:
+            extrah[sub.rowspan] = np.maximum(extrah[sub.rowspan], dh)
+
+    if gs is None:
+        raise ValueError('Cannot do compressed layout if no axes '
+                         'are part of a gridspec.')
+    w = np.sum(extraw) / 2
+    layoutgrids[fig].edit_margin_min('left', w)
+    layoutgrids[fig].edit_margin_min('right', w)
+
+    h = np.sum(extrah) / 2
+    layoutgrids[fig].edit_margin_min('top', h)
+    layoutgrids[fig].edit_margin_min('bottom', h)
+    return layoutgrids
+
+
+def get_margin_from_padding(obj, *, w_pad=0, h_pad=0,
+                            hspace=0, wspace=0):
+
+    ss = obj._subplotspec
     gs = ss.get_gridspec()
-    lg = gs._layoutgrid
 
     if hasattr(gs, 'hspace'):
         _hspace = (gs.hspace if gs.hspace is not None else hspace)
@@ -189,8 +337,8 @@ def _get_margin_from_padding(object, *, w_pad=0, h_pad=0,
     return margin
 
 
-def _make_layout_margins(fig, renderer, *, w_pad=0, h_pad=0,
-                         hspace=0, wspace=0):
+def make_layout_margins(layoutgrids, fig, renderer, *, w_pad=0, h_pad=0,
+                        hspace=0, wspace=0):
     """
     For each axes, make a margin between the *pos* layoutbox and the
     *axes* layoutbox be a minimum size that can accommodate the
@@ -198,30 +346,29 @@ def _make_layout_margins(fig, renderer, *, w_pad=0, h_pad=0,
 
     Then make room for colorbars.
     """
-    for panel in fig.subfigs:  # recursively make child panel margins
-        ss = panel._subplotspec
-        _make_layout_margins(panel, renderer, w_pad=w_pad, h_pad=h_pad,
-                             hspace=hspace, wspace=wspace)
+    for sfig in fig.subfigs:  # recursively make child panel margins
+        ss = sfig._subplotspec
+        make_layout_margins(layoutgrids, sfig, renderer,
+                            w_pad=w_pad, h_pad=h_pad,
+                            hspace=hspace, wspace=wspace)
 
-        margins = _get_margin_from_padding(panel, w_pad=0, h_pad=0,
-                                           hspace=hspace, wspace=wspace)
-        panel._layoutgrid.parent.edit_outer_margin_mins(margins, ss)
+        margins = get_margin_from_padding(sfig, w_pad=0, h_pad=0,
+                                          hspace=hspace, wspace=wspace)
+        layoutgrids[sfig].parent.edit_outer_margin_mins(margins, ss)
 
-    for ax in fig._localaxes.as_list():
+    for ax in fig._localaxes:
         if not hasattr(ax, 'get_subplotspec') or not ax.get_in_layout():
             continue
 
         ss = ax.get_subplotspec()
         gs = ss.get_gridspec()
-        nrows, ncols = gs.get_geometry()
 
-        if gs._layoutgrid is None:
+        if gs not in layoutgrids:
             return
 
-        margin = _get_margin_from_padding(ax, w_pad=w_pad, h_pad=h_pad,
-                                           hspace=hspace, wspace=wspace)
-        margin0 = margin.copy()
-        pos, bbox = _get_pos_and_bbox(ax, renderer)
+        margin = get_margin_from_padding(ax, w_pad=w_pad, h_pad=h_pad,
+                                         hspace=hspace, wspace=wspace)
+        pos, bbox = get_pos_and_bbox(ax, renderer)
         # the margin is the distance between the bounding box of the axes
         # and its position (plus the padding from above)
         margin['left'] += pos.x0 - bbox.x0
@@ -234,11 +381,11 @@ def _make_layout_margins(fig, renderer, *, w_pad=0, h_pad=0,
         # padding margin, versus the margin for axes decorators.
         for cbax in ax._colorbars:
             # note pad is a fraction of the parent width...
-            pad = _colorbar_get_pad(cbax)
+            pad = colorbar_get_pad(layoutgrids, cbax)
             # colorbars can be child of more than one subplot spec:
-            cbp_rspan, cbp_cspan = _get_cb_parent_spans(cbax)
+            cbp_rspan, cbp_cspan = get_cb_parent_spans(cbax)
             loc = cbax._colorbar_info['location']
-            cbpos, cbbbox = _get_pos_and_bbox(cbax, renderer)
+            cbpos, cbbbox = get_pos_and_bbox(cbax, renderer)
             if loc == 'right':
                 if cbp_cspan.stop == ss.colspan.stop:
                     # only increase if the colorbar is on the right edge
@@ -271,10 +418,10 @@ def _make_layout_margins(fig, renderer, *, w_pad=0, h_pad=0,
                         cbbbox.y1 > bbox.y1):
                     margin['top'] += cbbbox.y1 - bbox.y1
         # pass the new margins down to the layout grid for the solution...
-        gs._layoutgrid.edit_outer_margin_mins(margin, ss)
+        layoutgrids[gs].edit_outer_margin_mins(margin, ss)
 
 
-def _make_margin_suptitles(fig, renderer, *, w_pad=0, h_pad=0):
+def make_margin_suptitles(layoutgrids, fig, renderer, *, w_pad=0, h_pad=0):
     # Figure out how large the suptitle is and make the
     # top level figure margin larger.
 
@@ -286,29 +433,34 @@ def _make_margin_suptitles(fig, renderer, *, w_pad=0, h_pad=0):
     h_pad_local = padbox.height
     w_pad_local = padbox.width
 
-    for panel in fig.subfigs:
-        _make_margin_suptitles(panel, renderer, w_pad=w_pad, h_pad=h_pad)
+    for sfig in fig.subfigs:
+        make_margin_suptitles(layoutgrids, sfig, renderer,
+                              w_pad=w_pad, h_pad=h_pad)
 
     if fig._suptitle is not None and fig._suptitle.get_in_layout():
         p = fig._suptitle.get_position()
-        fig._suptitle.set_position((p[0], 1 - h_pad_local))
-        bbox = inv_trans_fig(fig._suptitle.get_tightbbox(renderer))
-        fig._layoutgrid.edit_margin_min('top', bbox.height + 2.0 * h_pad)
+        if getattr(fig._suptitle, '_autopos', False):
+            fig._suptitle.set_position((p[0], 1 - h_pad_local))
+            bbox = inv_trans_fig(fig._suptitle.get_tightbbox(renderer))
+            layoutgrids[fig].edit_margin_min('top', bbox.height + 2 * h_pad)
 
     if fig._supxlabel is not None and fig._supxlabel.get_in_layout():
         p = fig._supxlabel.get_position()
-        fig._supxlabel.set_position((p[0], h_pad_local))
-        bbox = inv_trans_fig(fig._supxlabel.get_tightbbox(renderer))
-        fig._layoutgrid.edit_margin_min('bottom', bbox.height + 2.0 * h_pad)
+        if getattr(fig._supxlabel, '_autopos', False):
+            fig._supxlabel.set_position((p[0], h_pad_local))
+            bbox = inv_trans_fig(fig._supxlabel.get_tightbbox(renderer))
+            layoutgrids[fig].edit_margin_min('bottom',
+                                             bbox.height + 2 * h_pad)
 
-    if fig._supylabel is not None and fig._supxlabel.get_in_layout():
+    if fig._supylabel is not None and fig._supylabel.get_in_layout():
         p = fig._supylabel.get_position()
-        fig._supylabel.set_position((w_pad_local, p[1]))
-        bbox = inv_trans_fig(fig._supylabel.get_tightbbox(renderer))
-        fig._layoutgrid.edit_margin_min('left', bbox.width + 2.0 * w_pad)
+        if getattr(fig._supylabel, '_autopos', False):
+            fig._supylabel.set_position((w_pad_local, p[1]))
+            bbox = inv_trans_fig(fig._supylabel.get_tightbbox(renderer))
+            layoutgrids[fig].edit_margin_min('left', bbox.width + 2 * w_pad)
 
 
-def _match_submerged_margins(fig):
+def match_submerged_margins(layoutgrids, fig):
     """
     Make the margins that are submerged inside an Axes the same size.
 
@@ -333,18 +485,18 @@ def _match_submerged_margins(fig):
     See test_constrained_layout::test_constrained_layout12 for an example.
     """
 
-    for panel in fig.subfigs:
-        _match_submerged_margins(panel)
+    for sfig in fig.subfigs:
+        match_submerged_margins(layoutgrids, sfig)
 
     axs = [a for a in fig.get_axes() if (hasattr(a, 'get_subplotspec')
                                          and a.get_in_layout())]
 
     for ax1 in axs:
         ss1 = ax1.get_subplotspec()
-        lg1 = ss1.get_gridspec()._layoutgrid
-        if lg1 is None:
+        if ss1.get_gridspec() not in layoutgrids:
             axs.remove(ax1)
             continue
+        lg1 = layoutgrids[ss1.get_gridspec()]
 
         # interior columns:
         if len(ss1.colspan) > 1:
@@ -358,7 +510,7 @@ def _match_submerged_margins(fig):
             )
             for ax2 in axs:
                 ss2 = ax2.get_subplotspec()
-                lg2 = ss2.get_gridspec()._layoutgrid
+                lg2 = layoutgrids[ss2.get_gridspec()]
                 if lg2 is not None and len(ss2.colspan) > 1:
                     maxsubl2 = np.max(
                         lg2.margin_vals['left'][ss2.colspan[1:]] +
@@ -388,7 +540,7 @@ def _match_submerged_margins(fig):
 
             for ax2 in axs:
                 ss2 = ax2.get_subplotspec()
-                lg2 = ss2.get_gridspec()._layoutgrid
+                lg2 = layoutgrids[ss2.get_gridspec()]
                 if lg2 is not None:
                     if len(ss2.rowspan) > 1:
                         maxsubt = np.max([np.max(
@@ -405,7 +557,7 @@ def _match_submerged_margins(fig):
                 lg1.edit_margin_min('bottom', maxsubb, cell=i)
 
 
-def _get_cb_parent_spans(cbax):
+def get_cb_parent_spans(cbax):
     """
     Figure out which subplotspecs this colorbar belongs to:
     """
@@ -425,7 +577,7 @@ def _get_cb_parent_spans(cbax):
     return rowspan, colspan
 
 
-def _get_pos_and_bbox(ax, renderer):
+def get_pos_and_bbox(ax, renderer):
     """
     Get the position and the bbox for the axes.
 
@@ -440,17 +592,12 @@ def _get_pos_and_bbox(ax, renderer):
         Position in figure coordinates.
     bbox : Bbox
         Tight bounding box in figure coordinates.
-
     """
     fig = ax.figure
     pos = ax.get_position(original=True)
     # pos is in panel co-ords, but we need in figure for the layout
     pos = pos.transformed(fig.transSubfigure - fig.transFigure)
-    try:
-        tightbbox = ax.get_tightbbox(renderer=renderer, for_layout_only=True)
-    except TypeError:
-        tightbbox = ax.get_tightbbox(renderer=renderer)
-
+    tightbbox = martist._get_tightbbox_for_layout_only(ax, renderer)
     if tightbbox is None:
         bbox = pos
     else:
@@ -458,20 +605,21 @@ def _get_pos_and_bbox(ax, renderer):
     return pos, bbox
 
 
-def _reposition_axes(fig, renderer, *, w_pad=0, h_pad=0, hspace=0, wspace=0):
+def reposition_axes(layoutgrids, fig, renderer, *,
+                    w_pad=0, h_pad=0, hspace=0, wspace=0):
     """
     Reposition all the axes based on the new inner bounding box.
     """
     trans_fig_to_subfig = fig.transFigure - fig.transSubfigure
     for sfig in fig.subfigs:
-        bbox = sfig._layoutgrid.get_outer_bbox()
+        bbox = layoutgrids[sfig].get_outer_bbox()
         sfig._redo_transform_rel_fig(
             bbox=bbox.transformed(trans_fig_to_subfig))
-        _reposition_axes(sfig, renderer,
-                         w_pad=w_pad, h_pad=h_pad,
-                         wspace=wspace, hspace=hspace)
+        reposition_axes(layoutgrids, sfig, renderer,
+                        w_pad=w_pad, h_pad=h_pad,
+                        wspace=wspace, hspace=hspace)
 
-    for ax in fig._localaxes.as_list():
+    for ax in fig._localaxes:
         if not hasattr(ax, 'get_subplotspec') or not ax.get_in_layout():
             continue
 
@@ -479,14 +627,11 @@ def _reposition_axes(fig, renderer, *, w_pad=0, h_pad=0, hspace=0, wspace=0):
         # coordinates...
         ss = ax.get_subplotspec()
         gs = ss.get_gridspec()
-        nrows, ncols = gs.get_geometry()
-        if gs._layoutgrid is None:
+        if gs not in layoutgrids:
             return
 
-        bbox = gs._layoutgrid.get_inner_bbox(rows=ss.rowspan, cols=ss.colspan)
-
-        bboxouter = gs._layoutgrid.get_outer_bbox(rows=ss.rowspan,
-                                                  cols=ss.colspan)
+        bbox = layoutgrids[gs].get_inner_bbox(rows=ss.rowspan,
+                                              cols=ss.colspan)
 
         # transform from figure to panel for set_position:
         newbbox = trans_fig_to_subfig.transform_bbox(bbox)
@@ -498,11 +643,11 @@ def _reposition_axes(fig, renderer, *, w_pad=0, h_pad=0, hspace=0, wspace=0):
         offset = {'left': 0, 'right': 0, 'bottom': 0, 'top': 0}
         for nn, cbax in enumerate(ax._colorbars[::-1]):
             if ax == cbax._colorbar_info['parents'][0]:
-                margin = _reposition_colorbar(
-                    cbax, renderer, offset=offset)
+                reposition_colorbar(layoutgrids, cbax, renderer,
+                                    offset=offset)
 
 
-def _reposition_colorbar(cbax, renderer, *, offset=None):
+def reposition_colorbar(layoutgrids, cbax, renderer, *, offset=None):
     """
     Place the colorbar in its new place.
 
@@ -524,13 +669,13 @@ def _reposition_colorbar(cbax, renderer, *, offset=None):
 
     parents = cbax._colorbar_info['parents']
     gs = parents[0].get_gridspec()
-    ncols, nrows = gs.ncols, gs.nrows
     fig = cbax.figure
     trans_fig_to_subfig = fig.transFigure - fig.transSubfigure
 
-    cb_rspans, cb_cspans = _get_cb_parent_spans(cbax)
-    bboxparent = gs._layoutgrid.get_bbox_for_cb(rows=cb_rspans, cols=cb_cspans)
-    pb = gs._layoutgrid.get_inner_bbox(rows=cb_rspans, cols=cb_cspans)
+    cb_rspans, cb_cspans = get_cb_parent_spans(cbax)
+    bboxparent = layoutgrids[gs].get_bbox_for_cb(rows=cb_rspans,
+                                                 cols=cb_cspans)
+    pb = layoutgrids[gs].get_inner_bbox(rows=cb_rspans, cols=cb_cspans)
 
     location = cbax._colorbar_info['location']
     anchor = cbax._colorbar_info['anchor']
@@ -538,12 +683,12 @@ def _reposition_colorbar(cbax, renderer, *, offset=None):
     aspect = cbax._colorbar_info['aspect']
     shrink = cbax._colorbar_info['shrink']
 
-    cbpos, cbbbox = _get_pos_and_bbox(cbax, renderer)
+    cbpos, cbbbox = get_pos_and_bbox(cbax, renderer)
 
     # Colorbar gets put at extreme edge of outer bbox of the subplotspec
     # It needs to be moved in by: 1) a pad 2) its "margin" 3) by
     # any colorbars already added at this location:
-    cbpad = _colorbar_get_pad(cbax)
+    cbpad = colorbar_get_pad(layoutgrids, cbax)
     if location in ('left', 'right'):
         # fraction and shrink are fractions of parent
         pbcb = pb.shrunk(fraction, shrink).anchored(anchor, pb)
@@ -579,34 +724,38 @@ def _reposition_colorbar(cbax, renderer, *, offset=None):
     pbcb = trans_fig_to_subfig.transform_bbox(pbcb)
     cbax.set_transform(fig.transSubfigure)
     cbax._set_position(pbcb)
-    cbax.set_aspect(aspect, anchor=anchor, adjustable='box')
+    cbax.set_anchor(anchor)
+    if location in ['bottom', 'top']:
+        aspect = 1 / aspect
+    cbax.set_box_aspect(aspect)
+    cbax.set_aspect('auto')
     return offset
 
 
-def _reset_margins(fig):
+def reset_margins(layoutgrids, fig):
     """
     Reset the margins in the layoutboxes of fig.
 
     Margins are usually set as a minimum, so if the figure gets smaller
     the minimum needs to be zero in order for it to grow again.
     """
-    for span in fig.subfigs:
-        _reset_margins(span)
+    for sfig in fig.subfigs:
+        reset_margins(layoutgrids, sfig)
     for ax in fig.axes:
         if hasattr(ax, 'get_subplotspec') and ax.get_in_layout():
             ss = ax.get_subplotspec()
             gs = ss.get_gridspec()
-            if gs._layoutgrid is not None:
-                gs._layoutgrid.reset_margins()
-    fig._layoutgrid.reset_margins()
+            if gs in layoutgrids:
+                layoutgrids[gs].reset_margins()
+    layoutgrids[fig].reset_margins()
 
 
-def _colorbar_get_pad(cax):
+def colorbar_get_pad(layoutgrids, cax):
     parents = cax._colorbar_info['parents']
     gs = parents[0].get_gridspec()
 
-    cb_rspans, cb_cspans = _get_cb_parent_spans(cax)
-    bboxouter = gs._layoutgrid.get_inner_bbox(rows=cb_rspans, cols=cb_cspans)
+    cb_rspans, cb_cspans = get_cb_parent_spans(cax)
+    bboxouter = layoutgrids[gs].get_inner_bbox(rows=cb_rspans, cols=cb_cspans)
 
     if cax._colorbar_info['location'] in ['right', 'left']:
         size = bboxouter.width
diff --git a/lib/matplotlib/_docstring.py b/lib/matplotlib/_docstring.py
new file mode 100644
index 000000000000..ecd209ca0853
--- /dev/null
+++ b/lib/matplotlib/_docstring.py
@@ -0,0 +1,97 @@
+import inspect
+
+from . import _api
+
+
+class Substitution:
+    """
+    A decorator that performs %-substitution on an object's docstring.
+
+    This decorator should be robust even if ``obj.__doc__`` is None (for
+    example, if -OO was passed to the interpreter).
+
+    Usage: construct a docstring.Substitution with a sequence or dictionary
+    suitable for performing substitution; then decorate a suitable function
+    with the constructed object, e.g.::
+
+        sub_author_name = Substitution(author='Jason')
+
+        @sub_author_name
+        def some_function(x):
+            "%(author)s wrote this function"
+
+        # note that some_function.__doc__ is now "Jason wrote this function"
+
+    One can also use positional arguments::
+
+        sub_first_last_names = Substitution('Edgar Allen', 'Poe')
+
+        @sub_first_last_names
+        def some_function(x):
+            "%s %s wrote the Raven"
+    """
+    def __init__(self, *args, **kwargs):
+        if args and kwargs:
+            raise TypeError("Only positional or keyword args are allowed")
+        self.params = args or kwargs
+
+    def __call__(self, func):
+        if func.__doc__:
+            func.__doc__ = inspect.cleandoc(func.__doc__) % self.params
+        return func
+
+    def update(self, *args, **kwargs):
+        """
+        Update ``self.params`` (which must be a dict) with the supplied args.
+        """
+        self.params.update(*args, **kwargs)
+
+
+class _ArtistKwdocLoader(dict):
+    def __missing__(self, key):
+        if not key.endswith(":kwdoc"):
+            raise KeyError(key)
+        name = key[:-len(":kwdoc")]
+        from matplotlib.artist import Artist, kwdoc
+        try:
+            cls, = [cls for cls in _api.recursive_subclasses(Artist)
+                    if cls.__name__ == name]
+        except ValueError as e:
+            raise KeyError(key) from e
+        return self.setdefault(key, kwdoc(cls))
+
+
+class _ArtistPropertiesSubstitution(Substitution):
+    """
+    A `.Substitution` with two additional features:
+
+    - Substitutions of the form ``%(classname:kwdoc)s`` (ending with the
+      literal ":kwdoc" suffix) trigger lookup of an Artist subclass with the
+      given *classname*, and are substituted with the `.kwdoc` of that class.
+    - Decorating a class triggers substitution both on the class docstring and
+      on the class' ``__init__`` docstring (which is a commonly required
+      pattern for Artist subclasses).
+    """
+
+    def __init__(self):
+        self.params = _ArtistKwdocLoader()
+
+    def __call__(self, obj):
+        super().__call__(obj)
+        if isinstance(obj, type) and obj.__init__ != object.__init__:
+            self(obj.__init__)
+        return obj
+
+
+def copy(source):
+    """Copy a docstring from another source function (if present)."""
+    def do_copy(target):
+        if source.__doc__:
+            target.__doc__ = source.__doc__
+        return target
+    return do_copy
+
+
+# Create a decorator that will house the various docstring snippets reused
+# throughout Matplotlib.
+dedent_interpd = interpd = _ArtistPropertiesSubstitution()
diff --git a/lib/matplotlib/_enums.py b/lib/matplotlib/_enums.py
index 35fe82482869..c8c50f7c3028 100644
--- a/lib/matplotlib/_enums.py
+++ b/lib/matplotlib/_enums.py
@@ -11,7 +11,7 @@
 """
 
 from enum import Enum, auto
-from matplotlib import cbook, docstring
+from matplotlib import _docstring
 
 
 class _AutoStringNameEnum(Enum):
@@ -24,23 +24,6 @@ def __hash__(self):
         return str(self).__hash__()
 
 
-def _deprecate_case_insensitive_join_cap(s):
-    s_low = s.lower()
-    if s != s_low:
-        if s_low in ['miter', 'round', 'bevel']:
-            cbook.warn_deprecated(
-                "3.3", message="Case-insensitive capstyles are deprecated "
-                "since %(since)s and support for them will be removed "
-                "%(removal)s; please pass them in lowercase.")
-        elif s_low in ['butt', 'round', 'projecting']:
-            cbook.warn_deprecated(
-                "3.3", message="Case-insensitive joinstyles are deprecated "
-                "since %(since)s and support for them will be removed "
-                "%(removal)s; please pass them in lowercase.")
-        # Else, error out at the check_in_list stage.
-    return s_low
-
-
 class JoinStyle(str, _AutoStringNameEnum):
     """
     Define how the connection between two line segments is drawn.
@@ -100,10 +83,6 @@ class JoinStyle(str, _AutoStringNameEnum):
     round = auto()
     bevel = auto()
 
-    def __init__(self, s):
-        s = _deprecate_case_insensitive_join_cap(s)
-        Enum.__init__(self)
-
     @staticmethod
     def demo():
         """Demonstrate how each JoinStyle looks for various join angles."""
@@ -149,6 +128,9 @@ class CapStyle(str, _AutoStringNameEnum):
     For a visual impression of each *CapStyle*, `view these docs online
     <CapStyle>` or run `CapStyle.demo`.
 
+    By default, `~.backend_bases.GraphicsContextBase` draws a stroked line as
+    squared off at its endpoints.
+
     **Supported values:**
 
     .. rst-class:: value-list
@@ -169,13 +151,9 @@ class CapStyle(str, _AutoStringNameEnum):
         CapStyle.demo()
 
     """
-    butt = 'butt'
-    projecting = 'projecting'
-    round = 'round'
-
-    def __init__(self, s):
-        s = _deprecate_case_insensitive_join_cap(s)
-        Enum.__init__(self)
+    butt = auto()
+    projecting = auto()
+    round = auto()
 
     @staticmethod
     def demo():
@@ -193,7 +171,6 @@ def demo():
             ax.plot(xx, yy, lw=12, color='tab:blue', solid_capstyle=style)
             ax.plot(xx, yy, lw=1, color='black')
             ax.plot(xx, yy, 'o', color='tab:red', markersize=3)
-        ax.text(2.25, 0.55, '(default)', ha='center')
 
         ax.set_ylim(-.5, 1.5)
         ax.set_axis_off()
@@ -204,5 +181,5 @@ def demo():
         + ", ".join([f"'{cs.name}'" for cs in CapStyle]) \
         + "}"
 
-docstring.interpd.update({'JoinStyle': JoinStyle.input_description,
+_docstring.interpd.update({'JoinStyle': JoinStyle.input_description,
                           'CapStyle': CapStyle.input_description})
diff --git a/lib/matplotlib/_fontconfig_pattern.py b/lib/matplotlib/_fontconfig_pattern.py
new file mode 100644
index 000000000000..c47e19bf99dc
--- /dev/null
+++ b/lib/matplotlib/_fontconfig_pattern.py
@@ -0,0 +1,209 @@
+"""
+A module for parsing and generating `fontconfig patterns`_.
+
+.. _fontconfig patterns:
+   https://www.freedesktop.org/software/fontconfig/fontconfig-user.html
+"""
+
+# This class logically belongs in `matplotlib.font_manager`, but placing it
+# there would have created cyclical dependency problems, because it also needs
+# to be available from `matplotlib.rcsetup` (for parsing matplotlibrc files).
+
+from functools import lru_cache
+import re
+import numpy as np
+from pyparsing import (Literal, ZeroOrMore, Optional, Regex, StringEnd,
+                       ParseException, Suppress)
+
+family_punc = r'\\\-:,'
+family_unescape = re.compile(r'\\([%s])' % family_punc).sub
+family_escape = re.compile(r'([%s])' % family_punc).sub
+
+value_punc = r'\\=_:,'
+value_unescape = re.compile(r'\\([%s])' % value_punc).sub
+value_escape = re.compile(r'([%s])' % value_punc).sub
+
+
+class FontconfigPatternParser:
+    """
+    A simple pyparsing-based parser for `fontconfig patterns`_.
+
+    .. _fontconfig patterns:
+       https://www.freedesktop.org/software/fontconfig/fontconfig-user.html
+    """
+
+    _constants = {
+        'thin':           ('weight', 'light'),
+        'extralight':     ('weight', 'light'),
+        'ultralight':     ('weight', 'light'),
+        'light':          ('weight', 'light'),
+        'book':           ('weight', 'book'),
+        'regular':        ('weight', 'regular'),
+        'normal':         ('weight', 'normal'),
+        'medium':         ('weight', 'medium'),
+        'demibold':       ('weight', 'demibold'),
+        'semibold':       ('weight', 'semibold'),
+        'bold':           ('weight', 'bold'),
+        'extrabold':      ('weight', 'extra bold'),
+        'black':          ('weight', 'black'),
+        'heavy':          ('weight', 'heavy'),
+        'roman':          ('slant', 'normal'),
+        'italic':         ('slant', 'italic'),
+        'oblique':        ('slant', 'oblique'),
+        'ultracondensed': ('width', 'ultra-condensed'),
+        'extracondensed': ('width', 'extra-condensed'),
+        'condensed':      ('width', 'condensed'),
+        'semicondensed':  ('width', 'semi-condensed'),
+        'expanded':       ('width', 'expanded'),
+        'extraexpanded':  ('width', 'extra-expanded'),
+        'ultraexpanded':  ('width', 'ultra-expanded')
+        }
+
+    def __init__(self):
+
+        family = Regex(
+            r'([^%s]|(\\[%s]))*' % (family_punc, family_punc)
+        ).setParseAction(self._family)
+
+        size = Regex(
+            r"([0-9]+\.?[0-9]*|\.[0-9]+)"
+        ).setParseAction(self._size)
+
+        name = Regex(
+            r'[a-z]+'
+        ).setParseAction(self._name)
+
+        value = Regex(
+            r'([^%s]|(\\[%s]))*' % (value_punc, value_punc)
+        ).setParseAction(self._value)
+
+        families = (
+            family
+            + ZeroOrMore(
+                Literal(',')
+                + family)
+        ).setParseAction(self._families)
+
+        point_sizes = (
+            size
+            + ZeroOrMore(
+                Literal(',')
+                + size)
+        ).setParseAction(self._point_sizes)
+
+        property = (
+            (name
+             + Suppress(Literal('='))
+             + value
+             + ZeroOrMore(
+                 Suppress(Literal(','))
+                 + value))
+            | name
+        ).setParseAction(self._property)
+
+        pattern = (
+            Optional(
+                families)
+            + Optional(
+                Literal('-')
+                + point_sizes)
+            + ZeroOrMore(
+                Literal(':')
+                + property)
+            + StringEnd()
+        )
+
+        self._parser = pattern
+        self.ParseException = ParseException
+
+    def parse(self, pattern):
+        """
+        Parse the given fontconfig *pattern* and return a dictionary
+        of key/value pairs useful for initializing a
+        `.font_manager.FontProperties` object.
+        """
+        props = self._properties = {}
+        try:
+            self._parser.parseString(pattern)
+        except self.ParseException as e:
+            raise ValueError(
+                "Could not parse font string: '%s'\n%s" % (pattern, e)) from e
+
+        self._properties = None
+
+        self._parser.resetCache()
+
+        return props
+
+    def _family(self, s, loc, tokens):
+        return [family_unescape(r'\1', str(tokens[0]))]
+
+    def _size(self, s, loc, tokens):
+        return [float(tokens[0])]
+
+    def _name(self, s, loc, tokens):
+        return [str(tokens[0])]
+
+    def _value(self, s, loc, tokens):
+        return [value_unescape(r'\1', str(tokens[0]))]
+
+    def _families(self, s, loc, tokens):
+        self._properties['family'] = [str(x) for x in tokens]
+        return []
+
+    def _point_sizes(self, s, loc, tokens):
+        self._properties['size'] = [str(x) for x in tokens]
+        return []
+
+    def _property(self, s, loc, tokens):
+        if len(tokens) == 1:
+            if tokens[0] in self._constants:
+                key, val = self._constants[tokens[0]]
+                self._properties.setdefault(key, []).append(val)
+        else:
+            key = tokens[0]
+            val = tokens[1:]
+            self._properties.setdefault(key, []).extend(val)
+        return []
+
+
+# `parse_fontconfig_pattern` is a bottleneck during the tests because it is
+# repeatedly called when the rcParams are reset (to validate the default
+# fonts).  In practice, the cache size doesn't grow beyond a few dozen entries
+# during the test suite.
+parse_fontconfig_pattern = lru_cache()(FontconfigPatternParser().parse)
+
+
+def _escape_val(val, escape_func):
+    """
+    Given a string value or a list of string values, run each value through
+    the input escape function to make the values into legal font config
+    strings.  The result is returned as a string.
+    """
+    if not np.iterable(val) or isinstance(val, str):
+        val = [val]
+
+    return ','.join(escape_func(r'\\\1', str(x)) for x in val
+                    if x is not None)
+
+
+def generate_fontconfig_pattern(d):
+    """
+    Given a dictionary of key/value pairs, generates a fontconfig
+    pattern string.
+    """
+    props = []
+
+    # Family is added first w/o a keyword
+    family = d.get_family()
+    if family is not None and family != []:
+        props.append(_escape_val(family, family_escape))
+
+    # The other keys are added as key=value
+    for key in ['style', 'variant', 'weight', 'stretch', 'file', 'size']:
+        val = getattr(d, 'get_' + key)()
+        # Don't use 'if not val' because 0 is a valid input.
+        if val is not None and val != []:
+            props.append(":%s=%s" % (key, _escape_val(val, value_escape)))
+
+    return ''.join(props)
diff --git a/lib/matplotlib/_layoutgrid.py b/lib/matplotlib/_layoutgrid.py
index e46b3fe8c062..12eec6f2b2d6 100644
--- a/lib/matplotlib/_layoutgrid.py
+++ b/lib/matplotlib/_layoutgrid.py
@@ -20,8 +20,10 @@
 import kiwisolver as kiwi
 import logging
 import numpy as np
-from matplotlib.transforms import Bbox
 
+import matplotlib as mpl
+import matplotlib.patches as mpatches
+from matplotlib.transforms import Bbox
 
 _log = logging.getLogger(__name__)
 
@@ -39,7 +41,9 @@ def __init__(self, parent=None, parent_pos=(0, 0),
         self.parent = parent
         self.parent_pos = parent_pos
         self.parent_inner = parent_inner
-        self.name = name
+        self.name = name + seq_id()
+        if isinstance(parent, LayoutGrid):
+            self.name = f'{parent.name}.{self.name}'
         self.nrows = nrows
         self.ncols = ncols
         self.height_ratios = np.atleast_1d(height_ratios)
@@ -50,8 +54,10 @@ def __init__(self, parent=None, parent_pos=(0, 0),
             self.width_ratios = np.ones(ncols)
 
         sn = self.name + '_'
-        if parent is None:
-            self.parent = None
+        if not isinstance(parent, LayoutGrid):
+            # parent can be a rect if not a LayoutGrid
+            # allows specifying a rectangle to contain the layout.
+            self.parent = parent
             self.solver = kiwi.Solver()
         else:
             self.parent = parent
@@ -168,7 +174,8 @@ def hard_constraints(self):
                 self.solver.addConstraint(c | 'required')
 
     def add_child(self, child, i=0, j=0):
-        self.children[i, j] = child
+        # np.ix_ returns the cross product of i and j indices
+        self.children[np.ix_(np.atleast_1d(i), np.atleast_1d(j))] = child
 
     def parent_constraints(self):
         # constraints that are due to the parent...
@@ -176,12 +183,13 @@ def parent_constraints(self):
         # parent's left, the last column right equal to the
         # parent's right...
         parent = self.parent
-        if parent is None:
-            hc = [self.lefts[0] == 0,
-                  self.rights[-1] == 1,
+        if not isinstance(parent, LayoutGrid):
+            # specify a rectangle in figure coordinates
+            hc = [self.lefts[0] == parent[0],
+                  self.rights[-1] == parent[0] + parent[2],
                   # top and bottom reversed order...
-                  self.tops[0] == 1,
-                  self.bottoms[-1] == 0]
+                  self.tops[0] == parent[1] + parent[3],
+                  self.bottoms[-1] == parent[1]]
         else:
             rows, cols = self.parent_pos
             rows = np.atleast_1d(rows)
@@ -502,20 +510,12 @@ def seq_id():
     return '%06d' % next(_layoutboxobjnum)
 
 
-def print_children(lb):
-    """Print the children of the layoutbox."""
-    for child in lb.children:
-        print_children(child)
-
-
-def plot_children(fig, lg, level=0, printit=False):
+def plot_children(fig, lg=None, level=0):
     """Simple plotting to show where boxes are."""
-    import matplotlib.pyplot as plt
-    import matplotlib.patches as mpatches
-
-    fig.canvas.draw()
-
-    colors = plt.rcParams["axes.prop_cycle"].by_key()["color"]
+    if lg is None:
+        _layoutgrids = fig.get_layout_engine().execute(fig)
+        lg = _layoutgrids[fig]
+    colors = mpl.rcParams["axes.prop_cycle"].by_key()["color"]
     col = colors[level]
     for i in range(lg.nrows):
         for j in range(lg.ncols):
diff --git a/lib/matplotlib/_mathtext.py b/lib/matplotlib/_mathtext.py
index 6f0e47b239e6..44bb5a9e8fd8 100644
--- a/lib/matplotlib/_mathtext.py
+++ b/lib/matplotlib/_mathtext.py
@@ -2,28 +2,28 @@
 Implementation details for :mod:`.mathtext`.
 """
 
+import copy
 from collections import namedtuple
 import enum
 import functools
-from io import StringIO
 import logging
 import os
+import re
 import types
 import unicodedata
 
 import numpy as np
 from pyparsing import (
-    Combine, Empty, FollowedBy, Forward, Group, Literal, oneOf, OneOrMore,
-    Optional, ParseBaseException, ParseFatalException, ParserElement,
-    ParseResults, QuotedString, Regex, StringEnd, Suppress, ZeroOrMore)
+    Empty, Forward, Literal, NotAny, oneOf, OneOrMore, Optional,
+    ParseBaseException, ParseExpression, ParseFatalException, ParserElement,
+    ParseResults, QuotedString, Regex, StringEnd, ZeroOrMore, pyparsing_common)
 
 import matplotlib as mpl
 from . import _api, cbook
 from ._mathtext_data import (
-    latex_to_bakoma, latex_to_standard, stix_virtual_fonts, tex2uni)
-from .afm import AFM
+    latex_to_bakoma, stix_glyph_fixes, stix_virtual_fonts, tex2uni)
 from .font_manager import FontProperties, findfont, get_font
-from .ft2font import KERNING_DEFAULT
+from .ft2font import FT2Image, KERNING_DEFAULT
 
 
 ParserElement.enablePackrat()
@@ -34,29 +34,28 @@
 # FONTS
 
 
-def get_unicode_index(symbol, math=True):
+@_api.delete_parameter("3.6", "math")
+def get_unicode_index(symbol, math=False):  # Publicly exported.
     r"""
     Return the integer index (from the Unicode table) of *symbol*.
 
     Parameters
     ----------
     symbol : str
-        A single unicode character, a TeX command (e.g. r'\pi') or a Type1
+        A single (Unicode) character, a TeX command (e.g. r'\pi') or a Type1
         symbol name (e.g. 'phi').
-    math : bool, default: True
-        If False, always treat as a single unicode character.
+    math : bool, default: False
+        If True (deprecated), replace ASCII hyphen-minus by Unicode minus.
     """
-    # for a non-math symbol, simply return its unicode index
-    if not math:
-        return ord(symbol)
     # From UTF #25: U+2212 minus sign is the preferred
     # representation of the unary and binary minus sign rather than
     # the ASCII-derived U+002D hyphen-minus, because minus sign is
     # unambiguous and because it is rendered with a more desirable
     # length, usually longer than a hyphen.
-    if symbol == '-':
+    # Remove this block when the 'math' parameter is deleted.
+    if math and symbol == '-':
         return 0x2212
-    try:  # This will succeed if symbol is a single unicode char
+    try:  # This will succeed if symbol is a single Unicode char
         return ord(symbol)
     except TypeError:
         pass
@@ -68,6 +67,85 @@ def get_unicode_index(symbol, math=True):
             .format(symbol)) from err
 
 
+VectorParse = namedtuple("VectorParse", "width height depth glyphs rects",
+                         module="matplotlib.mathtext")
+VectorParse.__doc__ = r"""
+The namedtuple type returned by ``MathTextParser("path").parse(...)``.
+
+This tuple contains the global metrics (*width*, *height*, *depth*), a list of
+*glyphs* (including their positions) and of *rect*\angles.
+"""
+
+
+RasterParse = namedtuple("RasterParse", "ox oy width height depth image",
+                         module="matplotlib.mathtext")
+RasterParse.__doc__ = r"""
+The namedtuple type returned by ``MathTextParser("agg").parse(...)``.
+
+This tuple contains the global metrics (*width*, *height*, *depth*), and a
+raster *image*.  The offsets *ox*, *oy* are always zero.
+"""
+
+
+class Output:
+    r"""
+    Result of `ship`\ping a box: lists of positioned glyphs and rectangles.
+
+    This class is not exposed to end users, but converted to a `VectorParse` or
+    a `RasterParse` by `.MathTextParser.parse`.
+    """
+
+    def __init__(self, box):
+        self.box = box
+        self.glyphs = []  # (ox, oy, info)
+        self.rects = []  # (x1, y1, x2, y2)
+
+    def to_vector(self):
+        w, h, d = map(
+            np.ceil, [self.box.width, self.box.height, self.box.depth])
+        gs = [(info.font, info.fontsize, info.num, ox, h - oy + info.offset)
+              for ox, oy, info in self.glyphs]
+        rs = [(x1, h - y2, x2 - x1, y2 - y1)
+              for x1, y1, x2, y2 in self.rects]
+        return VectorParse(w, h + d, d, gs, rs)
+
+    def to_raster(self):
+        # Metrics y's and mathtext y's are oriented in opposite directions,
+        # hence the switch between ymin and ymax.
+        xmin = min([*[ox + info.metrics.xmin for ox, oy, info in self.glyphs],
+                    *[x1 for x1, y1, x2, y2 in self.rects], 0]) - 1
+        ymin = min([*[oy - info.metrics.ymax for ox, oy, info in self.glyphs],
+                    *[y1 for x1, y1, x2, y2 in self.rects], 0]) - 1
+        xmax = max([*[ox + info.metrics.xmax for ox, oy, info in self.glyphs],
+                    *[x2 for x1, y1, x2, y2 in self.rects], 0]) + 1
+        ymax = max([*[oy - info.metrics.ymin for ox, oy, info in self.glyphs],
+                    *[y2 for x1, y1, x2, y2 in self.rects], 0]) + 1
+        w = xmax - xmin
+        h = ymax - ymin - self.box.depth
+        d = ymax - ymin - self.box.height
+        image = FT2Image(np.ceil(w), np.ceil(h + max(d, 0)))
+
+        # Ideally, we could just use self.glyphs and self.rects here, shifting
+        # their coordinates by (-xmin, -ymin), but this yields slightly
+        # different results due to floating point slop; shipping twice is the
+        # old approach and keeps baseline images backcompat.
+        shifted = ship(self.box, (-xmin, -ymin))
+
+        for ox, oy, info in shifted.glyphs:
+            info.font.draw_glyph_to_bitmap(
+                image, ox, oy - info.metrics.iceberg, info.glyph,
+                antialiased=mpl.rcParams['text.antialiased'])
+        for x1, y1, x2, y2 in shifted.rects:
+            height = max(int(y2 - y1) - 1, 0)
+            if height == 0:
+                center = (y2 + y1) / 2
+                y = int(center - (height + 1) / 2)
+            else:
+                y = int(y1)
+            image.draw_rect_filled(int(x1), y, np.ceil(x2), y + height)
+        return RasterParse(0, 0, w, h + d, d, image)
+
+
 class Fonts:
     """
     An abstract base class for a system of fonts to use for mathtext.
@@ -77,27 +155,19 @@ class Fonts:
     to do the actual drawing.
     """
 
-    def __init__(self, default_font_prop, mathtext_backend):
+    def __init__(self, default_font_prop, load_glyph_flags):
         """
         Parameters
         ----------
         default_font_prop : `~.font_manager.FontProperties`
             The default non-math font, or the base font for Unicode (generic)
             font rendering.
-        mathtext_backend : `MathtextBackend` subclass
-            Backend to which rendering is actually delegated.
+        load_glyph_flags : int
+            Flags passed to the glyph loader (e.g. ``FT_Load_Glyph`` and
+            ``FT_Load_Char`` for FreeType-based fonts).
         """
         self.default_font_prop = default_font_prop
-        self.mathtext_backend = mathtext_backend
-        self.used_characters = {}
-
-    @_api.deprecated("3.4")
-    def destroy(self):
-        """
-        Fix any cyclical references before the object is about
-        to be destroyed.
-        """
-        self.used_characters = None
+        self.load_glyph_flags = load_glyph_flags
 
     def get_kern(self, font1, fontclass1, sym1, fontsize1,
                  font2, fontclass2, sym2, fontsize2, dpi):
@@ -108,7 +178,7 @@ def get_kern(self, font1, fontclass1, sym1, fontsize1,
         """
         return 0.
 
-    def get_metrics(self, font, font_class, sym, fontsize, dpi, math=True):
+    def get_metrics(self, font, font_class, sym, fontsize, dpi):
         r"""
         Parameters
         ----------
@@ -127,8 +197,6 @@ def get_metrics(self, font, font_class, sym, fontsize, dpi, math=True):
             Font size in points.
         dpi : float
             Rendering dots-per-inch.
-        math : bool
-            Whether we are currently in math mode or not.
 
         Returns
         -------
@@ -146,33 +214,23 @@ def get_metrics(self, font, font_class, sym, fontsize, dpi, math=True):
             - *slanted*: Whether the glyph should be considered as "slanted"
               (currently used for kerning sub/superscripts).
         """
-        info = self._get_info(font, font_class, sym, fontsize, dpi, math)
+        info = self._get_info(font, font_class, sym, fontsize, dpi)
         return info.metrics
 
-    def set_canvas_size(self, w, h, d):
-        """
-        Set the size of the buffer used to render the math expression.
-        Only really necessary for the bitmap backends.
-        """
-        self.width, self.height, self.depth = np.ceil([w, h, d])
-        self.mathtext_backend.set_canvas_size(
-            self.width, self.height, self.depth)
-
-    @_api.rename_parameter("3.4", "facename", "font")
-    def render_glyph(self, ox, oy, font, font_class, sym, fontsize, dpi):
+    def render_glyph(
+            self, output, ox, oy, font, font_class, sym, fontsize, dpi):
         """
         At position (*ox*, *oy*), draw the glyph specified by the remaining
         parameters (see `get_metrics` for their detailed description).
         """
         info = self._get_info(font, font_class, sym, fontsize, dpi)
-        self.used_characters.setdefault(info.font.fname, set()).add(info.num)
-        self.mathtext_backend.render_glyph(ox, oy, info)
+        output.glyphs.append((ox, oy, info))
 
-    def render_rect_filled(self, x1, y1, x2, y2):
+    def render_rect_filled(self, output, x1, y1, x2, y2):
         """
         Draw a filled rectangle from (*x1*, *y1*) to (*x2*, *y2*).
         """
-        self.mathtext_backend.render_rect_filled(x1, y1, x2, y2)
+        output.rects.append((x1, y1, x2, y2))
 
     def get_xheight(self, font, fontsize, dpi):
         """
@@ -195,20 +253,6 @@ def get_used_characters(self):
         """
         return self.used_characters
 
-    def get_results(self, box):
-        """
-        Get the data needed by the backend to render the math
-        expression.  The return value is backend-specific.
-        """
-        result = self.mathtext_backend.get_results(
-            box, self.get_used_characters())
-        if self.destroy != TruetypeFonts.destroy.__get__(self):
-            destroy = _api.deprecate_method_override(
-                __class__.destroy, self, since="3.4")
-            if destroy:
-                destroy()
-        return result
-
     def get_sized_alternatives_for_symbol(self, fontname, sym):
         """
         Override if your font provides multiple sizes of the same
@@ -224,21 +268,18 @@ class TruetypeFonts(Fonts):
     A generic base class for all font setups that use Truetype fonts
     (through FT2Font).
     """
-    def __init__(self, default_font_prop, mathtext_backend):
-        super().__init__(default_font_prop, mathtext_backend)
-        self.glyphd = {}
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        # Per-instance cache.
+        self._get_info = functools.lru_cache(None)(self._get_info)
         self._fonts = {}
 
-        filename = findfont(default_font_prop)
+        filename = findfont(self.default_font_prop)
         default_font = get_font(filename)
         self._fonts['default'] = default_font
         self._fonts['regular'] = default_font
 
-    @_api.deprecated("3.4")
-    def destroy(self):
-        self.glyphd = None
-        super().destroy()
-
     def _get_font(self, font):
         if font in self.fontmap:
             basename = self.fontmap[font]
@@ -257,19 +298,11 @@ def _get_offset(self, font, glyph, fontsize, dpi):
             return (glyph.height / 64 / 2) + (fontsize/3 * dpi/72)
         return 0.
 
-    def _get_info(self, fontname, font_class, sym, fontsize, dpi, math=True):
-        key = fontname, font_class, sym, fontsize, dpi
-        bunch = self.glyphd.get(key)
-        if bunch is not None:
-            return bunch
-
-        font, num, symbol_name, fontsize, slanted = \
-            self._get_glyph(fontname, font_class, sym, fontsize, math)
-
+    # The return value of _get_info is cached per-instance.
+    def _get_info(self, fontname, font_class, sym, fontsize, dpi):
+        font, num, slanted = self._get_glyph(fontname, font_class, sym)
         font.set_size(fontsize, dpi)
-        glyph = font.load_char(
-            num,
-            flags=self.mathtext_backend.get_hinting_type())
+        glyph = font.load_char(num, flags=self.load_glyph_flags)
 
         xmin, ymin, xmax, ymax = [val/64.0 for val in glyph.bbox]
         offset = self._get_offset(font, glyph, fontsize, dpi)
@@ -286,17 +319,15 @@ def _get_info(self, fontname, font_class, sym, fontsize, dpi, math=True):
             slanted = slanted
             )
 
-        result = self.glyphd[key] = types.SimpleNamespace(
+        return types.SimpleNamespace(
             font            = font,
             fontsize        = fontsize,
             postscript_name = font.postscript_name,
             metrics         = metrics,
-            symbol_name     = symbol_name,
             num             = num,
             glyph           = glyph,
             offset          = offset
             )
-        return result
 
     def get_xheight(self, fontname, fontsize, dpi):
         font = self._get_font(fontname)
@@ -356,8 +387,7 @@ def __init__(self, *args, **kwargs):
 
     _slanted_symbols = set(r"\int \oint".split())
 
-    def _get_glyph(self, fontname, font_class, sym, fontsize, math=True):
-        symbol_name = None
+    def _get_glyph(self, fontname, font_class, sym):
         font = None
         if fontname in self.fontmap and sym in latex_to_bakoma:
             basename, num = latex_to_bakoma[sym]
@@ -368,17 +398,10 @@ def _get_glyph(self, fontname, font_class, sym, fontsize, math=True):
             font = self._get_font(fontname)
             if font is not None:
                 num = ord(sym)
-
-        if font is not None:
-            gid = font.get_char_index(num)
-            if gid != 0:
-                symbol_name = font.get_glyph_name(gid)
-
-        if symbol_name is None:
-            return self._stix_fallback._get_glyph(
-                fontname, font_class, sym, fontsize, math)
-
-        return font, num, symbol_name, fontsize, slanted
+        if font is not None and font.get_char_index(num) != 0:
+            return font, num, slanted
+        else:
+            return self._stix_fallback._get_glyph(fontname, font_class, sym)
 
     # The Bakoma fonts contain many pre-sized alternatives for the
     # delimiters.  The AutoSizedChar class will use these alternatives
@@ -451,19 +474,15 @@ class UnicodeFonts(TruetypeFonts):
     This class will "fallback" on the Bakoma fonts when a required
     symbol can not be found in the font.
     """
-    use_cmex = True  # Unused; delete once mathtext becomes private.
 
     def __init__(self, *args, **kwargs):
         # This must come first so the backend's owner is set correctly
         fallback_rc = mpl.rcParams['mathtext.fallback']
-        if mpl.rcParams['mathtext.fallback_to_cm'] is not None:
-            fallback_rc = ('cm' if mpl.rcParams['mathtext.fallback_to_cm']
-                           else None)
         font_cls = {'stix': StixFonts,
                     'stixsans': StixSansFonts,
                     'cm': BakomaFonts
                     }.get(fallback_rc)
-        self.cm_fallback = font_cls(*args, **kwargs) if font_cls else None
+        self._fallback_font = font_cls(*args, **kwargs) if font_cls else None
 
         super().__init__(*args, **kwargs)
         self.fontmap = {}
@@ -476,7 +495,7 @@ def __init__(self, *args, **kwargs):
         self.fontmap['ex'] = font
 
         # include STIX sized alternatives for glyphs if fallback is STIX
-        if isinstance(self.cm_fallback, StixFonts):
+        if isinstance(self._fallback_font, StixFonts):
             stixsizedaltfonts = {
                  0: 'STIXGeneral',
                  1: 'STIXSizeOneSym',
@@ -495,14 +514,14 @@ def __init__(self, *args, **kwargs):
     def _map_virtual_font(self, fontname, font_class, uniindex):
         return fontname, uniindex
 
-    def _get_glyph(self, fontname, font_class, sym, fontsize, math=True):
+    def _get_glyph(self, fontname, font_class, sym):
         try:
-            uniindex = get_unicode_index(sym, math)
+            uniindex = get_unicode_index(sym)
             found_symbol = True
         except ValueError:
             uniindex = ord('?')
             found_symbol = False
-            _log.warning("No TeX to unicode mapping for {!a}.".format(sym))
+            _log.warning("No TeX to Unicode mapping for {!a}.".format(sym))
 
         fontname, uniindex = self._map_virtual_font(
             fontname, font_class, uniindex)
@@ -522,56 +541,56 @@ def _get_glyph(self, fontname, font_class, sym, fontsize, math=True):
             found_symbol = False
             font = self._get_font(new_fontname)
             if font is not None:
+                if font.family_name == "cmr10" and uniindex == 0x2212:
+                    # minus sign exists in cmsy10 (not cmr10)
+                    font = get_font(
+                        cbook._get_data_path("fonts/ttf/cmsy10.ttf"))
+                    uniindex = 0xa1
                 glyphindex = font.get_char_index(uniindex)
                 if glyphindex != 0:
                     found_symbol = True
 
         if not found_symbol:
-            if self.cm_fallback:
+            if self._fallback_font:
                 if (fontname in ('it', 'regular')
-                        and isinstance(self.cm_fallback, StixFonts)):
+                        and isinstance(self._fallback_font, StixFonts)):
                     fontname = 'rm'
 
-                g = self.cm_fallback._get_glyph(fontname, font_class,
-                                                sym, fontsize)
-                fname = g[0].family_name
-                if fname in list(BakomaFonts._fontmap.values()):
-                    fname = "Computer Modern"
-                _log.info("Substituting symbol %s from %s", sym, fname)
+                g = self._fallback_font._get_glyph(fontname, font_class, sym)
+                family = g[0].family_name
+                if family in list(BakomaFonts._fontmap.values()):
+                    family = "Computer Modern"
+                _log.info("Substituting symbol %s from %s", sym, family)
                 return g
 
             else:
                 if (fontname in ('it', 'regular')
                         and isinstance(self, StixFonts)):
-                    return self._get_glyph('rm', font_class, sym, fontsize)
+                    return self._get_glyph('rm', font_class, sym)
                 _log.warning("Font {!r} does not have a glyph for {!a} "
                              "[U+{:x}], substituting with a dummy "
                              "symbol.".format(new_fontname, sym, uniindex))
-                fontname = 'rm'
-                font = self._get_font(fontname)
+                font = self._get_font('rm')
                 uniindex = 0xA4  # currency char, for lack of anything better
-                glyphindex = font.get_char_index(uniindex)
                 slanted = False
 
-        symbol_name = font.get_glyph_name(glyphindex)
-        return font, uniindex, symbol_name, fontsize, slanted
+        return font, uniindex, slanted
 
     def get_sized_alternatives_for_symbol(self, fontname, sym):
-        if self.cm_fallback:
-            return self.cm_fallback.get_sized_alternatives_for_symbol(
+        if self._fallback_font:
+            return self._fallback_font.get_sized_alternatives_for_symbol(
                 fontname, sym)
         return [(fontname, sym)]
 
 
 class DejaVuFonts(UnicodeFonts):
-    use_cmex = False  # Unused; delete once mathtext becomes private.
 
     def __init__(self, *args, **kwargs):
         # This must come first so the backend's owner is set correctly
         if isinstance(self, DejaVuSerifFonts):
-            self.cm_fallback = StixFonts(*args, **kwargs)
+            self._fallback_font = StixFonts(*args, **kwargs)
         else:
-            self.cm_fallback = StixSansFonts(*args, **kwargs)
+            self._fallback_font = StixSansFonts(*args, **kwargs)
         self.bakoma = BakomaFonts(*args, **kwargs)
         TruetypeFonts.__init__(self, *args, **kwargs)
         self.fontmap = {}
@@ -588,11 +607,10 @@ def __init__(self, *args, **kwargs):
             self.fontmap[key] = fullpath
             self.fontmap[name] = fullpath
 
-    def _get_glyph(self, fontname, font_class, sym, fontsize, math=True):
+    def _get_glyph(self, fontname, font_class, sym):
         # Override prime symbol to use Bakoma.
         if sym == r'\prime':
-            return self.bakoma._get_glyph(
-                fontname, font_class, sym, fontsize, math)
+            return self.bakoma._get_glyph(fontname, font_class, sym)
         else:
             # check whether the glyph is available in the display font
             uniindex = get_unicode_index(sym)
@@ -600,11 +618,9 @@ def _get_glyph(self, fontname, font_class, sym, fontsize, math=True):
             if font is not None:
                 glyphindex = font.get_char_index(uniindex)
                 if glyphindex != 0:
-                    return super()._get_glyph(
-                        'ex', font_class, sym, fontsize, math)
+                    return super()._get_glyph('ex', font_class, sym)
             # otherwise return regular glyph
-            return super()._get_glyph(
-                fontname, font_class, sym, fontsize, math)
+            return super()._get_glyph(fontname, font_class, sym)
 
 
 class DejaVuSerifFonts(DejaVuFonts):
@@ -667,8 +683,7 @@ class StixFonts(UnicodeFonts):
         4: 'STIXSizeFourSym',
         5: 'STIXSizeFiveSym',
     }
-    use_cmex = False  # Unused; delete once mathtext becomes private.
-    cm_fallback = False
+    _fallback_font = False
     _sans = False
 
     def __init__(self, *args, **kwargs):
@@ -718,6 +733,10 @@ def _map_virtual_font(self, fontname, font_class, uniindex):
                 uniindex = 0x1
                 fontname = mpl.rcParams['mathtext.default']
 
+        # Fix some incorrect glyphs.
+        if fontname in ('rm', 'it'):
+            uniindex = stix_glyph_fixes.get(uniindex, uniindex)
+
         # Handle private use area glyphs
         if fontname in ('it', 'rm', 'bf') and 0xe000 <= uniindex <= 0xf8ff:
             fontname = 'nonuni' + fontname
@@ -753,164 +772,6 @@ class StixSansFonts(StixFonts):
     _sans = True
 
 
-class StandardPsFonts(Fonts):
-    """
-    Use the standard postscript fonts for rendering to backend_ps
-
-    Unlike the other font classes, BakomaFont and UnicodeFont, this
-    one requires the Ps backend.
-    """
-    basepath = str(cbook._get_data_path('fonts/afm'))
-
-    fontmap = {
-        'cal': 'pzcmi8a',  # Zapf Chancery
-        'rm':  'pncr8a',   # New Century Schoolbook
-        'tt':  'pcrr8a',   # Courier
-        'it':  'pncri8a',  # New Century Schoolbook Italic
-        'sf':  'phvr8a',   # Helvetica
-        'bf':  'pncb8a',   # New Century Schoolbook Bold
-        None:  'psyr',     # Symbol
-    }
-
-    def __init__(self, default_font_prop, mathtext_backend=None):
-        if mathtext_backend is None:
-            # Circular import, can be dropped after public access to
-            # StandardPsFonts is removed and mathtext_backend made a required
-            # parameter.
-            from . import mathtext
-            mathtext_backend = mathtext.MathtextBackendPath()
-        super().__init__(default_font_prop, mathtext_backend)
-        self.glyphd = {}
-        self.fonts = {}
-
-        filename = findfont(default_font_prop, fontext='afm',
-                            directory=self.basepath)
-        if filename is None:
-            filename = findfont('Helvetica', fontext='afm',
-                                directory=self.basepath)
-        with open(filename, 'rb') as fd:
-            default_font = AFM(fd)
-        default_font.fname = filename
-
-        self.fonts['default'] = default_font
-        self.fonts['regular'] = default_font
-
-    pswriter = _api.deprecated("3.4")(property(lambda self: StringIO()))
-
-    def _get_font(self, font):
-        if font in self.fontmap:
-            basename = self.fontmap[font]
-        else:
-            basename = font
-
-        cached_font = self.fonts.get(basename)
-        if cached_font is None:
-            fname = os.path.join(self.basepath, basename + ".afm")
-            with open(fname, 'rb') as fd:
-                cached_font = AFM(fd)
-            cached_font.fname = fname
-            self.fonts[basename] = cached_font
-            self.fonts[cached_font.get_fontname()] = cached_font
-        return cached_font
-
-    def _get_info(self, fontname, font_class, sym, fontsize, dpi, math=True):
-        """Load the cmfont, metrics and glyph with caching."""
-        key = fontname, sym, fontsize, dpi
-        tup = self.glyphd.get(key)
-
-        if tup is not None:
-            return tup
-
-        # Only characters in the "Letter" class should really be italicized.
-        # This class includes greek letters, so we're ok
-        if (fontname == 'it' and
-                (len(sym) > 1
-                 or not unicodedata.category(sym).startswith("L"))):
-            fontname = 'rm'
-
-        found_symbol = False
-
-        if sym in latex_to_standard:
-            fontname, num = latex_to_standard[sym]
-            glyph = chr(num)
-            found_symbol = True
-        elif len(sym) == 1:
-            glyph = sym
-            num = ord(glyph)
-            found_symbol = True
-        else:
-            _log.warning(
-                "No TeX to built-in Postscript mapping for {!r}".format(sym))
-
-        slanted = (fontname == 'it')
-        font = self._get_font(fontname)
-
-        if found_symbol:
-            try:
-                symbol_name = font.get_name_char(glyph)
-            except KeyError:
-                _log.warning(
-                    "No glyph in standard Postscript font {!r} for {!r}"
-                    .format(font.get_fontname(), sym))
-                found_symbol = False
-
-        if not found_symbol:
-            glyph = '?'
-            num = ord(glyph)
-            symbol_name = font.get_name_char(glyph)
-
-        offset = 0
-
-        scale = 0.001 * fontsize
-
-        xmin, ymin, xmax, ymax = [val * scale
-                                  for val in font.get_bbox_char(glyph)]
-        metrics = types.SimpleNamespace(
-            advance  = font.get_width_char(glyph) * scale,
-            width    = font.get_width_char(glyph) * scale,
-            height   = font.get_height_char(glyph) * scale,
-            xmin = xmin,
-            xmax = xmax,
-            ymin = ymin+offset,
-            ymax = ymax+offset,
-            # iceberg is the equivalent of TeX's "height"
-            iceberg = ymax + offset,
-            slanted = slanted
-            )
-
-        self.glyphd[key] = types.SimpleNamespace(
-            font            = font,
-            fontsize        = fontsize,
-            postscript_name = font.get_fontname(),
-            metrics         = metrics,
-            symbol_name     = symbol_name,
-            num             = num,
-            glyph           = glyph,
-            offset          = offset
-            )
-
-        return self.glyphd[key]
-
-    def get_kern(self, font1, fontclass1, sym1, fontsize1,
-                 font2, fontclass2, sym2, fontsize2, dpi):
-        if font1 == font2 and fontsize1 == fontsize2:
-            info1 = self._get_info(font1, fontclass1, sym1, fontsize1, dpi)
-            info2 = self._get_info(font2, fontclass2, sym2, fontsize2, dpi)
-            font = info1.font
-            return (font.get_kern_dist(info1.glyph, info2.glyph)
-                    * 0.001 * fontsize1)
-        return super().get_kern(font1, fontclass1, sym1, fontsize1,
-                                font2, fontclass2, sym2, fontsize2, dpi)
-
-    def get_xheight(self, font, fontsize, dpi):
-        font = self._get_font(font)
-        return font.get_xheight() * 0.001 * fontsize
-
-    def get_underline_thickness(self, font, fontsize, dpi):
-        font = self._get_font(font)
-        return font.get_underline_thickness() * 0.001 * fontsize
-
-
 ##############################################################################
 # TeX-LIKE BOX MODEL
 
@@ -923,8 +784,8 @@ def get_underline_thickness(self, font, fontsize, dpi):
 #
 # The most relevant "chapters" are:
 #    Data structures for boxes and their friends
-#    Shipping pages out (Ship class)
-#    Packaging (hpack and vpack)
+#    Shipping pages out (ship())
+#    Packaging (hpack() and vpack())
 #    Data structures for math mode
 #    Subroutines for math mode
 #    Typesetting math formulas
@@ -935,10 +796,8 @@ def get_underline_thickness(self, font, fontsize, dpi):
 # Note that (as TeX) y increases downward, unlike many other parts of
 # matplotlib.
 
-# How much text shrinks when going to the next-smallest level.  GROW_FACTOR
-# must be the inverse of SHRINK_FACTOR.
+# How much text shrinks when going to the next-smallest level.
 SHRINK_FACTOR   = 0.7
-GROW_FACTOR     = 1 / SHRINK_FACTOR
 # The number of different sizes of chars to use, beyond which they will not
 # get any smaller
 NUM_SIZE_LEVELS = 6
@@ -966,16 +825,16 @@ class FontConstantsBase:
     # superscript is present
     sub2 = 0.5
 
-    # Percentage of x-height that sub/supercripts are offset relative to the
+    # Percentage of x-height that sub/superscripts are offset relative to the
     # nucleus edge for non-slanted nuclei
     delta = 0.025
 
     # Additional percentage of last character height above 2/3 of the
-    # x-height that supercripts are offset relative to the subscript
+    # x-height that superscripts are offset relative to the subscript
     # for slanted nuclei
     delta_slanted = 0.2
 
-    # Percentage of x-height that supercripts and subscripts are offset for
+    # Percentage of x-height that superscripts and subscripts are offset for
     # integrals
     delta_integral = 0.1
 
@@ -1042,12 +901,11 @@ class DejaVuSansFontConstants(FontConstantsBase):
 
 def _get_font_constant_set(state):
     constants = _font_constant_mapping.get(
-        state.font_output._get_font(state.font).family_name,
-        FontConstantsBase)
+        state.fontset._get_font(state.font).family_name, FontConstantsBase)
     # STIX sans isn't really its own fonts, just different code points
     # in the STIX fonts, so we have to detect this one separately.
     if (constants is STIXFontConstants and
-            isinstance(state.font_output, StixSansFonts)):
+            isinstance(state.fontset, StixSansFonts)):
         return STIXSansFontConstants
     return constants
 
@@ -1059,7 +917,7 @@ def __init__(self):
         self.size = 0
 
     def __repr__(self):
-        return self.__class__.__name__
+        return type(self).__name__
 
     def get_kerning(self, next):
         return 0.0
@@ -1071,15 +929,8 @@ def shrink(self):
         """
         self.size += 1
 
-    def grow(self):
-        """
-        Grows one level larger.  There is no limit to how big
-        something can get.
-        """
-        self.size -= 1
-
-    def render(self, x, y):
-        pass
+    def render(self, output, x, y):
+        """Render this node."""
 
 
 class Box(Node):
@@ -1098,13 +949,7 @@ def shrink(self):
             self.height *= SHRINK_FACTOR
             self.depth  *= SHRINK_FACTOR
 
-    def grow(self):
-        super().grow()
-        self.width  *= GROW_FACTOR
-        self.height *= GROW_FACTOR
-        self.depth  *= GROW_FACTOR
-
-    def render(self, x1, y1, x2, y2):
+    def render(self, output, x1, y1, x2, y2):
         pass
 
 
@@ -1135,15 +980,14 @@ class Char(Node):
     `Hlist`.
     """
 
-    def __init__(self, c, state, math=True):
+    def __init__(self, c, state):
         super().__init__()
         self.c = c
-        self.font_output = state.font_output
+        self.fontset = state.fontset
         self.font = state.font
         self.font_class = state.font_class
         self.fontsize = state.fontsize
         self.dpi = state.dpi
-        self.math = math
         # The real width, height and depth will be set during the
         # pack phase, after we know the real fontsize
         self._update_metrics()
@@ -1152,9 +996,8 @@ def __repr__(self):
         return '`%s`' % self.c
 
     def _update_metrics(self):
-        metrics = self._metrics = self.font_output.get_metrics(
-            self.font, self.font_class, self.c, self.fontsize, self.dpi,
-            self.math)
+        metrics = self._metrics = self.fontset.get_metrics(
+            self.font, self.font_class, self.c, self.fontsize, self.dpi)
         if self.c == ' ':
             self.width = metrics.advance
         else:
@@ -1175,18 +1018,15 @@ def get_kerning(self, next):
         advance = self._metrics.advance - self.width
         kern = 0.
         if isinstance(next, Char):
-            kern = self.font_output.get_kern(
+            kern = self.fontset.get_kern(
                 self.font, self.font_class, self.c, self.fontsize,
                 next.font, next.font_class, next.c, next.fontsize,
                 self.dpi)
         return advance + kern
 
-    def render(self, x, y):
-        """
-        Render the character to the canvas
-        """
-        self.font_output.render_glyph(
-            x, y,
+    def render(self, output, x, y):
+        self.fontset.render_glyph(
+            output, x, y,
             self.font, self.font_class, self.c, self.fontsize, self.dpi)
 
     def shrink(self):
@@ -1197,13 +1037,6 @@ def shrink(self):
             self.height   *= SHRINK_FACTOR
             self.depth    *= SHRINK_FACTOR
 
-    def grow(self):
-        super().grow()
-        self.fontsize *= GROW_FACTOR
-        self.width    *= GROW_FACTOR
-        self.height   *= GROW_FACTOR
-        self.depth    *= GROW_FACTOR
-
 
 class Accent(Char):
     """
@@ -1212,7 +1045,7 @@ class Accent(Char):
     TrueType fonts.
     """
     def _update_metrics(self):
-        metrics = self._metrics = self.font_output.get_metrics(
+        metrics = self._metrics = self.fontset.get_metrics(
             self.font, self.font_class, self.c, self.fontsize, self.dpi)
         self.width = metrics.xmax - metrics.xmin
         self.height = metrics.ymax - metrics.ymin
@@ -1222,16 +1055,9 @@ def shrink(self):
         super().shrink()
         self._update_metrics()
 
-    def grow(self):
-        super().grow()
-        self._update_metrics()
-
-    def render(self, x, y):
-        """
-        Render the character to the canvas.
-        """
-        self.font_output.render_glyph(
-            x - self._metrics.xmin, y + self._metrics.ymin,
+    def render(self, output, x, y):
+        self.fontset.render_glyph(
+            output, x - self._metrics.xmin, y + self._metrics.ymin,
             self.font, self.font_class, self.c, self.fontsize, self.dpi)
 
 
@@ -1248,27 +1074,16 @@ def __init__(self, elements):
         self.glue_order   = 0    # The order of infinity (0 - 3) for the glue
 
     def __repr__(self):
-        return '[%s <%.02f %.02f %.02f %.02f> %s]' % (
+        return '%s<w=%.02f h=%.02f d=%.02f s=%.02f>[%s]' % (
             super().__repr__(),
             self.width, self.height,
             self.depth, self.shift_amount,
-            ' '.join([repr(x) for x in self.children]))
-
-    @staticmethod
-    def _determine_order(totals):
-        """
-        Determine the highest order of glue used by the members of this list.
-
-        Helper function used by vpack and hpack.
-        """
-        for i in range(len(totals))[::-1]:
-            if totals[i] != 0:
-                return i
-        return 0
+            ', '.join([repr(x) for x in self.children]))
 
     def _set_glue(self, x, sign, totals, error_type):
-        o = self._determine_order(totals)
-        self.glue_order = o
+        self.glue_order = o = next(
+            # Highest order of glue used by the members of this list.
+            (i for i in range(len(totals))[::-1] if totals[i] != 0), 0)
         self.glue_sign = sign
         if totals[o] != 0.:
             self.glue_set = x / totals[o]
@@ -1278,7 +1093,7 @@ def _set_glue(self, x, sign, totals, error_type):
         if o == 0:
             if len(self.children):
                 _log.warning("%s %s: %r",
-                             error_type, self.__class__.__name__, self)
+                             error_type, type(self).__name__, self)
 
     def shrink(self):
         for child in self.children:
@@ -1288,13 +1103,6 @@ def shrink(self):
             self.shift_amount *= SHRINK_FACTOR
             self.glue_set     *= SHRINK_FACTOR
 
-    def grow(self):
-        for child in self.children:
-            child.grow()
-        super().grow()
-        self.shift_amount *= GROW_FACTOR
-        self.glue_set     *= GROW_FACTOR
-
 
 class Hlist(List):
     """A horizontal list of boxes."""
@@ -1303,7 +1111,7 @@ def __init__(self, elements, w=0., m='additional', do_kern=True):
         super().__init__(elements)
         if do_kern:
             self.kern()
-        self.hpack()
+        self.hpack(w=w, m=m)
 
     def kern(self):
         """
@@ -1404,9 +1212,9 @@ def hpack(self, w=0., m='additional'):
             self.glue_ratio = 0.
             return
         if x > 0.:
-            self._set_glue(x, 1, total_stretch, "Overfull")
+            self._set_glue(x, 1, total_stretch, "Overful")
         else:
-            self._set_glue(x, -1, total_shrink, "Underfull")
+            self._set_glue(x, -1, total_shrink, "Underful")
 
 
 class Vlist(List):
@@ -1414,7 +1222,7 @@ class Vlist(List):
 
     def __init__(self, elements, h=0., m='additional'):
         super().__init__(elements)
-        self.vpack()
+        self.vpack(h=h, m=m)
 
     def vpack(self, h=0., m='additional', l=np.inf):
         """
@@ -1426,8 +1234,8 @@ def vpack(self, h=0., m='additional', l=np.inf):
         h : float, default: 0
             A height.
         m : {'exactly', 'additional'}, default: 'additional'
-            Whether to produce a box whose height is 'exactly' *w*; or a box
-            with the natural height of the contents, plus *w* ('additional').
+            Whether to produce a box whose height is 'exactly' *h*; or a box
+            with the natural height of the contents, plus *h* ('additional').
         l : float, default: np.inf
             The maximum height.
 
@@ -1483,9 +1291,9 @@ def vpack(self, h=0., m='additional', l=np.inf):
             return
 
         if x > 0.:
-            self._set_glue(x, 1, total_stretch, "Overfull")
+            self._set_glue(x, 1, total_stretch, "Overful")
         else:
-            self._set_glue(x, -1, total_shrink, "Underfull")
+            self._set_glue(x, -1, total_shrink, "Underful")
 
 
 class Rule(Box):
@@ -1501,10 +1309,10 @@ class Rule(Box):
 
     def __init__(self, width, height, depth, state):
         super().__init__(width, height, depth)
-        self.font_output = state.font_output
+        self.fontset = state.fontset
 
-    def render(self, x, y, w, h):
-        self.font_output.render_rect_filled(x, y, x + w, y + h)
+    def render(self, output, x, y, w, h):
+        self.fontset.render_rect_filled(output, x, y, x + w, y + h)
 
 
 class Hrule(Rule):
@@ -1512,8 +1320,7 @@ class Hrule(Rule):
 
     def __init__(self, state, thickness=None):
         if thickness is None:
-            thickness = state.font_output.get_underline_thickness(
-                state.font, state.fontsize, state.dpi)
+            thickness = state.get_current_underline_thickness()
         height = depth = thickness * 0.5
         super().__init__(np.inf, height, depth, state)
 
@@ -1522,8 +1329,7 @@ class Vrule(Rule):
     """Convenience class to create a vertical rule."""
 
     def __init__(self, state):
-        thickness = state.font_output.get_underline_thickness(
-            state.font, state.fontsize, state.dpi)
+        thickness = state.get_current_underline_thickness()
         super().__init__(thickness, np.inf, np.inf, state)
 
 
@@ -1549,10 +1355,7 @@ class Glue(Node):
     it's easier to stick to what TeX does.)
     """
 
-    glue_subtype = _api.deprecated("3.3")(property(lambda self: "normal"))
-
-    @_api.delete_parameter("3.3", "copy")
-    def __init__(self, glue_type, copy=False):
+    def __init__(self, glue_type):
         super().__init__()
         if isinstance(glue_type, str):
             glue_spec = _GlueSpec._named[glue_type]
@@ -1568,56 +1371,6 @@ def shrink(self):
             g = self.glue_spec
             self.glue_spec = g._replace(width=g.width * SHRINK_FACTOR)
 
-    def grow(self):
-        super().grow()
-        g = self.glue_spec
-        self.glue_spec = g._replace(width=g.width * GROW_FACTOR)
-
-
-# Some convenient ways to get common kinds of glue
-
-
-@_api.deprecated("3.3", alternative="Glue('fil')")
-class Fil(Glue):
-    def __init__(self):
-        super().__init__('fil')
-
-
-@_api.deprecated("3.3", alternative="Glue('fill')")
-class Fill(Glue):
-    def __init__(self):
-        super().__init__('fill')
-
-
-@_api.deprecated("3.3", alternative="Glue('filll')")
-class Filll(Glue):
-    def __init__(self):
-        super().__init__('filll')
-
-
-@_api.deprecated("3.3", alternative="Glue('neg_fil')")
-class NegFil(Glue):
-    def __init__(self):
-        super().__init__('neg_fil')
-
-
-@_api.deprecated("3.3", alternative="Glue('neg_fill')")
-class NegFill(Glue):
-    def __init__(self):
-        super().__init__('neg_fill')
-
-
-@_api.deprecated("3.3", alternative="Glue('neg_filll')")
-class NegFilll(Glue):
-    def __init__(self):
-        super().__init__('neg_filll')
-
-
-@_api.deprecated("3.3", alternative="Glue('ss')")
-class SsGlue(Glue):
-    def __init__(self):
-        super().__init__('ss')
-
 
 class HCentered(Hlist):
     """
@@ -1665,25 +1418,6 @@ def shrink(self):
         if self.size < NUM_SIZE_LEVELS:
             self.width *= SHRINK_FACTOR
 
-    def grow(self):
-        super().grow()
-        self.width *= GROW_FACTOR
-
-
-class SubSuperCluster(Hlist):
-    """
-    A hack to get around that fact that this code does a two-pass parse like
-    TeX.  This lets us store enough information in the hlist itself, namely the
-    nucleus, sub- and super-script, such that if another script follows that
-    needs to be attached, it can be reconfigured on the fly.
-    """
-
-    def __init__(self):
-        self.nucleus = None
-        self.sub = None
-        self.super = None
-        super().__init__([])
-
 
 class AutoHeightChar(Hlist):
     """
@@ -1695,10 +1429,10 @@ class AutoHeightChar(Hlist):
     """
 
     def __init__(self, c, height, depth, state, always=False, factor=None):
-        alternatives = state.font_output.get_sized_alternatives_for_symbol(
+        alternatives = state.fontset.get_sized_alternatives_for_symbol(
             state.font, c)
 
-        xHeight = state.font_output.get_xheight(
+        xHeight = state.fontset.get_xheight(
             state.font, state.fontsize, state.dpi)
 
         state = state.copy()
@@ -1734,7 +1468,7 @@ class AutoWidthChar(Hlist):
     """
 
     def __init__(self, c, width, state, always=False, char_class=Char):
-        alternatives = state.font_output.get_sized_alternatives_for_symbol(
+        alternatives = state.fontset.get_sized_alternatives_for_symbol(
             state.font, c)
 
         state = state.copy()
@@ -1752,81 +1486,72 @@ def __init__(self, c, width, state, always=False, char_class=Char):
         self.width = char.width
 
 
-class Ship:
+def ship(box, xy=(0, 0)):
     """
-    Ship boxes to output once they have been set up, this sends them to output.
+    Ship out *box* at offset *xy*, converting it to an `Output`.
 
-    Since boxes can be inside of boxes inside of boxes, the main work of `Ship`
+    Since boxes can be inside of boxes inside of boxes, the main work of `ship`
     is done by two mutually recursive routines, `hlist_out` and `vlist_out`,
     which traverse the `Hlist` nodes and `Vlist` nodes inside of horizontal
     and vertical boxes.  The global variables used in TeX to store state as it
-    processes have become member variables here.
+    processes have become local variables here.
     """
+    ox, oy = xy
+    cur_v = 0.
+    cur_h = 0.
+    off_h = ox
+    off_v = oy + box.height
+    output = Output(box)
 
-    def __call__(self, ox, oy, box):
-        self.max_push    = 0  # Deepest nesting of push commands so far
-        self.cur_s       = 0
-        self.cur_v       = 0.
-        self.cur_h       = 0.
-        self.off_h       = ox
-        self.off_v       = oy + box.height
-        self.hlist_out(box)
-
-    @staticmethod
     def clamp(value):
-        if value < -1000000000.:
-            return -1000000000.
-        if value > 1000000000.:
-            return 1000000000.
-        return value
-
-    def hlist_out(self, box):
-        cur_g         = 0
-        cur_glue      = 0.
-        glue_order    = box.glue_order
-        glue_sign     = box.glue_sign
-        base_line     = self.cur_v
-        left_edge     = self.cur_h
-        self.cur_s    += 1
-        self.max_push = max(self.cur_s, self.max_push)
-        clamp         = self.clamp
+        return -1e9 if value < -1e9 else +1e9 if value > +1e9 else value
+
+    def hlist_out(box):
+        nonlocal cur_v, cur_h, off_h, off_v
+
+        cur_g = 0
+        cur_glue = 0.
+        glue_order = box.glue_order
+        glue_sign = box.glue_sign
+        base_line = cur_v
+        left_edge = cur_h
 
         for p in box.children:
             if isinstance(p, Char):
-                p.render(self.cur_h + self.off_h, self.cur_v + self.off_v)
-                self.cur_h += p.width
+                p.render(output, cur_h + off_h, cur_v + off_v)
+                cur_h += p.width
             elif isinstance(p, Kern):
-                self.cur_h += p.width
+                cur_h += p.width
             elif isinstance(p, List):
                 # node623
                 if len(p.children) == 0:
-                    self.cur_h += p.width
+                    cur_h += p.width
                 else:
-                    edge = self.cur_h
-                    self.cur_v = base_line + p.shift_amount
+                    edge = cur_h
+                    cur_v = base_line + p.shift_amount
                     if isinstance(p, Hlist):
-                        self.hlist_out(p)
+                        hlist_out(p)
                     else:
                         # p.vpack(box.height + box.depth, 'exactly')
-                        self.vlist_out(p)
-                    self.cur_h = edge + p.width
-                    self.cur_v = base_line
+                        vlist_out(p)
+                    cur_h = edge + p.width
+                    cur_v = base_line
             elif isinstance(p, Box):
                 # node624
                 rule_height = p.height
-                rule_depth  = p.depth
-                rule_width  = p.width
+                rule_depth = p.depth
+                rule_width = p.width
                 if np.isinf(rule_height):
                     rule_height = box.height
                 if np.isinf(rule_depth):
                     rule_depth = box.depth
                 if rule_height > 0 and rule_width > 0:
-                    self.cur_v = base_line + rule_depth
-                    p.render(self.cur_h + self.off_h,
-                             self.cur_v + self.off_v,
+                    cur_v = base_line + rule_depth
+                    p.render(output,
+                             cur_h + off_h, cur_v + off_v,
                              rule_width, rule_height)
-                    self.cur_v = base_line
-                self.cur_h += rule_width
+                    cur_v = base_line
+                cur_h += rule_width
             elif isinstance(p, Glue):
                 # node625
                 glue_spec = p.glue_spec
@@ -1840,38 +1565,36 @@ def hlist_out(self, box):
                         cur_glue += glue_spec.shrink
                         cur_g = round(clamp(box.glue_set * cur_glue))
                 rule_width += cur_g
-                self.cur_h += rule_width
-        self.cur_s -= 1
-
-    def vlist_out(self, box):
-        cur_g         = 0
-        cur_glue      = 0.
-        glue_order    = box.glue_order
-        glue_sign     = box.glue_sign
-        self.cur_s    += 1
-        self.max_push = max(self.max_push, self.cur_s)
-        left_edge     = self.cur_h
-        self.cur_v    -= box.height
-        top_edge      = self.cur_v
-        clamp         = self.clamp
+                cur_h += rule_width
+
+    def vlist_out(box):
+        nonlocal cur_v, cur_h, off_h, off_v
+
+        cur_g = 0
+        cur_glue = 0.
+        glue_order = box.glue_order
+        glue_sign = box.glue_sign
+        left_edge = cur_h
+        cur_v -= box.height
+        top_edge = cur_v
 
         for p in box.children:
             if isinstance(p, Kern):
-                self.cur_v += p.width
+                cur_v += p.width
             elif isinstance(p, List):
                 if len(p.children) == 0:
-                    self.cur_v += p.height + p.depth
+                    cur_v += p.height + p.depth
                 else:
-                    self.cur_v += p.height
-                    self.cur_h = left_edge + p.shift_amount
-                    save_v = self.cur_v
+                    cur_v += p.height
+                    cur_h = left_edge + p.shift_amount
+                    save_v = cur_v
                     p.width = box.width
                     if isinstance(p, Hlist):
-                        self.hlist_out(p)
+                        hlist_out(p)
                     else:
-                        self.vlist_out(p)
-                    self.cur_v = save_v + p.depth
-                    self.cur_h = left_edge
+                        vlist_out(p)
+                    cur_v = save_v + p.depth
+                    cur_h = left_edge
             elif isinstance(p, Box):
                 rule_height = p.height
                 rule_depth = p.depth
@@ -1880,9 +1603,9 @@ def vlist_out(self, box):
                     rule_width = box.width
                 rule_height += rule_depth
                 if rule_height > 0 and rule_depth > 0:
-                    self.cur_v += rule_height
-                    p.render(self.cur_h + self.off_h,
-                             self.cur_v + self.off_v,
+                    cur_v += rule_height
+                    p.render(output,
+                             cur_h + off_h, cur_v + off_v,
                              rule_width, rule_height)
             elif isinstance(p, Glue):
                 glue_spec = p.glue_spec
@@ -1896,14 +1619,13 @@ def vlist_out(self, box):
                         cur_glue += glue_spec.shrink
                         cur_g = round(clamp(box.glue_set * cur_glue))
                 rule_height += cur_g
-                self.cur_v += rule_height
+                cur_v += rule_height
             elif isinstance(p, Char):
                 raise RuntimeError(
                     "Internal mathtext error: Char node found in vlist")
-        self.cur_s -= 1
 
-
-ship = Ship()
+    hlist_out(box)
+    return output
 
 
 ##############################################################################
@@ -1915,9 +1637,69 @@ def Error(msg):
     def raise_error(s, loc, toks):
         raise ParseFatalException(s, loc, msg)
 
-    empty = Empty()
-    empty.setParseAction(raise_error)
-    return empty
+    return Empty().setParseAction(raise_error)
+
+
+class ParserState:
+    """
+    Parser state.
+
+    States are pushed and popped from a stack as necessary, and the "current"
+    state is always at the top of the stack.
+
+    Upon entering and leaving a group { } or math/non-math, the stack is pushed
+    and popped accordingly.
+    """
+
+    def __init__(self, fontset, font, font_class, fontsize, dpi):
+        self.fontset = fontset
+        self._font = font
+        self.font_class = font_class
+        self.fontsize = fontsize
+        self.dpi = dpi
+
+    def copy(self):
+        return copy.copy(self)
+
+    @property
+    def font(self):
+        return self._font
+
+    @font.setter
+    def font(self, name):
+        if name in ('rm', 'it', 'bf'):
+            self.font_class = name
+        self._font = name
+
+    def get_current_underline_thickness(self):
+        """Return the underline thickness for this state."""
+        return self.fontset.get_underline_thickness(
+            self.font, self.fontsize, self.dpi)
+
+
+def cmd(expr, args):
+    r"""
+    Helper to define TeX commands.
+
+    ``cmd("\cmd", args)`` is equivalent to
+    ``"\cmd" - (args | Error("Expected \cmd{arg}{...}"))`` where the names in
+    the error message are taken from element names in *args*.  If *expr*
+    already includes arguments (e.g. "\cmd{arg}{...}"), then they are stripped
+    when constructing the parse element, but kept (and *expr* is used as is) in
+    the error message.
+    """
+
+    def names(elt):
+        if isinstance(elt, ParseExpression):
+            for expr in elt.exprs:
+                yield from names(expr)
+        elif elt.resultsName:
+            yield elt.resultsName
+
+    csname = expr.split("{", 1)[0]
+    err = (csname + "".join("{%s}" % name for name in names(args))
+           if expr == csname else expr)
+    return csname - (args | Error(f"Expected {err}"))
 
 
 class Parser:
@@ -1930,51 +1712,53 @@ class Parser:
     """
 
     class _MathStyle(enum.Enum):
-        DISPLAYSTYLE = enum.auto()
-        TEXTSTYLE = enum.auto()
-        SCRIPTSTYLE = enum.auto()
-        SCRIPTSCRIPTSTYLE = enum.auto()
-
-    _binary_operators = set('''
-      + * -
-      \\pm             \\sqcap                   \\rhd
-      \\mp             \\sqcup                   \\unlhd
-      \\times          \\vee                     \\unrhd
-      \\div            \\wedge                   \\oplus
-      \\ast            \\setminus                \\ominus
-      \\star           \\wr                      \\otimes
-      \\circ           \\diamond                 \\oslash
-      \\bullet         \\bigtriangleup           \\odot
-      \\cdot           \\bigtriangledown         \\bigcirc
-      \\cap            \\triangleleft            \\dagger
-      \\cup            \\triangleright           \\ddagger
-      \\uplus          \\lhd                     \\amalg'''.split())
-
-    _relation_symbols = set('''
+        DISPLAYSTYLE = 0
+        TEXTSTYLE = 1
+        SCRIPTSTYLE = 2
+        SCRIPTSCRIPTSTYLE = 3
+
+    _binary_operators = set(
+      '+ * - \N{MINUS SIGN}'
+      r'''
+      \pm             \sqcap                   \rhd
+      \mp             \sqcup                   \unlhd
+      \times          \vee                     \unrhd
+      \div            \wedge                   \oplus
+      \ast            \setminus                \ominus
+      \star           \wr                      \otimes
+      \circ           \diamond                 \oslash
+      \bullet         \bigtriangleup           \odot
+      \cdot           \bigtriangledown         \bigcirc
+      \cap            \triangleleft            \dagger
+      \cup            \triangleright           \ddagger
+      \uplus          \lhd                     \amalg
+      \dotplus        \dotminus'''.split())
+
+    _relation_symbols = set(r'''
       = < > :
-      \\leq        \\geq        \\equiv   \\models
-      \\prec       \\succ       \\sim     \\perp
-      \\preceq     \\succeq     \\simeq   \\mid
-      \\ll         \\gg         \\asymp   \\parallel
-      \\subset     \\supset     \\approx  \\bowtie
-      \\subseteq   \\supseteq   \\cong    \\Join
-      \\sqsubset   \\sqsupset   \\neq     \\smile
-      \\sqsubseteq \\sqsupseteq \\doteq   \\frown
-      \\in         \\ni         \\propto  \\vdash
-      \\dashv      \\dots       \\dotplus \\doteqdot'''.split())
-
-    _arrow_symbols = set('''
-      \\leftarrow              \\longleftarrow           \\uparrow
-      \\Leftarrow              \\Longleftarrow           \\Uparrow
-      \\rightarrow             \\longrightarrow          \\downarrow
-      \\Rightarrow             \\Longrightarrow          \\Downarrow
-      \\leftrightarrow         \\longleftrightarrow      \\updownarrow
-      \\Leftrightarrow         \\Longleftrightarrow      \\Updownarrow
-      \\mapsto                 \\longmapsto              \\nearrow
-      \\hookleftarrow          \\hookrightarrow          \\searrow
-      \\leftharpoonup          \\rightharpoonup          \\swarrow
-      \\leftharpoondown        \\rightharpoondown        \\nwarrow
-      \\rightleftharpoons      \\leadsto'''.split())
+      \leq        \geq        \equiv   \models
+      \prec       \succ       \sim     \perp
+      \preceq     \succeq     \simeq   \mid
+      \ll         \gg         \asymp   \parallel
+      \subset     \supset     \approx  \bowtie
+      \subseteq   \supseteq   \cong    \Join
+      \sqsubset   \sqsupset   \neq     \smile
+      \sqsubseteq \sqsupseteq \doteq   \frown
+      \in         \ni         \propto  \vdash
+      \dashv      \dots       \doteqdot'''.split())
+
+    _arrow_symbols = set(r'''
+      \leftarrow              \longleftarrow           \uparrow
+      \Leftarrow              \Longleftarrow           \Uparrow
+      \rightarrow             \longrightarrow          \downarrow
+      \Rightarrow             \Longrightarrow          \Downarrow
+      \leftrightarrow         \longleftrightarrow      \updownarrow
+      \Leftrightarrow         \Longleftrightarrow      \Updownarrow
+      \mapsto                 \longmapsto              \nearrow
+      \hookleftarrow          \hookrightarrow          \searrow
+      \leftharpoonup          \rightharpoonup          \swarrow
+      \leftharpoondown        \rightharpoondown        \nwarrow
+      \rightleftharpoons      \leadsto'''.split())
 
     _spaced_symbols = _binary_operators | _relation_symbols | _arrow_symbols
 
@@ -1985,8 +1769,7 @@ class _MathStyle(enum.Enum):
        \bigwedge \bigodot \bigotimes \bigoplus \biguplus
        '''.split())
 
-    _overunder_functions = set(
-        "lim liminf limsup sup max min".split())
+    _overunder_functions = set("lim liminf limsup sup max min".split())
 
     _dropsub_symbols = set(r'''\int \oint'''.split())
 
@@ -1997,208 +1780,142 @@ class _MathStyle(enum.Enum):
       liminf sin cos exp limsup sinh cosh gcd ln sup cot hom log tan
       coth inf max tanh""".split())
 
-    _ambi_delim = set("""
-      | \\| / \\backslash \\uparrow \\downarrow \\updownarrow \\Uparrow
-      \\Downarrow \\Updownarrow . \\vert \\Vert \\\\|""".split())
-
-    _left_delim = set(r"( [ \{ < \lfloor \langle \lceil".split())
-
-    _right_delim = set(r") ] \} > \rfloor \rangle \rceil".split())
+    _ambi_delims = set(r"""
+      | \| / \backslash \uparrow \downarrow \updownarrow \Uparrow
+      \Downarrow \Updownarrow . \vert \Vert""".split())
+    _left_delims = set(r"( [ \{ < \lfloor \langle \lceil".split())
+    _right_delims = set(r") ] \} > \rfloor \rangle \rceil".split())
+    _delims = _left_delims | _right_delims | _ambi_delims
 
     def __init__(self):
         p = types.SimpleNamespace()
-        # All forward declarations are here
+
+        def set_names_and_parse_actions():
+            for key, val in vars(p).items():
+                if not key.startswith('_'):
+                    # Set names on everything -- very useful for debugging
+                    val.setName(key)
+                    # Set actions
+                    if hasattr(self, key):
+                        val.setParseAction(getattr(self, key))
+
+        # Root definitions.
+
+        # In TeX parlance, a csname is a control sequence name (a "\foo").
+        def csnames(group, names):
+            ends_with_alpha = []
+            ends_with_nonalpha = []
+            for name in names:
+                if name[-1].isalpha():
+                    ends_with_alpha.append(name)
+                else:
+                    ends_with_nonalpha.append(name)
+            return Regex(r"\\(?P<{}>(?:{})(?![A-Za-z]){})".format(
+                group,
+                "|".join(map(re.escape, ends_with_alpha)),
+                "".join(f"|{s}" for s in map(re.escape, ends_with_nonalpha)),
+            ))
+
+        p.float_literal  = Regex(r"[-+]?([0-9]+\.?[0-9]*|\.[0-9]+)")
+        p.space          = oneOf(self._space_widths)("space")
+
+        p.style_literal  = oneOf(
+            [str(e.value) for e in self._MathStyle])("style_literal")
+
+        p.symbol         = Regex(
+            r"[a-zA-Z0-9 +\-*/<>=:,.;!\?&'@()\[\]|\U00000080-\U0001ffff]"
+            r"|\\[%${}\[\]_|]"
+            + r"|\\(?:{})(?![A-Za-z])".format(
+                "|".join(map(re.escape, tex2uni)))
+        )("sym").leaveWhitespace()
+        p.unknown_symbol = Regex(r"\\[A-Za-z]*")("name")
+
+        p.font           = csnames("font", self._fontnames)
+        p.start_group    = (
+            Optional(r"\math" + oneOf(self._fontnames)("font")) + "{")
+        p.end_group      = Literal("}")
+
+        p.delim          = oneOf(self._delims)
+
+        set_names_and_parse_actions()  # for root definitions.
+
+        # Mutually recursive definitions.  (Minimizing the number of Forward
+        # elements is important for speed.)
         p.accent           = Forward()
-        p.ambi_delim       = Forward()
-        p.apostrophe       = Forward()
         p.auto_delim       = Forward()
         p.binom            = Forward()
-        p.bslash           = Forward()
-        p.c_over_c         = Forward()
         p.customspace      = Forward()
-        p.end_group        = Forward()
-        p.float_literal    = Forward()
-        p.font             = Forward()
         p.frac             = Forward()
         p.dfrac            = Forward()
         p.function         = Forward()
         p.genfrac          = Forward()
         p.group            = Forward()
-        p.int_literal      = Forward()
-        p.latexfont        = Forward()
-        p.lbracket         = Forward()
-        p.left_delim       = Forward()
-        p.lbrace           = Forward()
-        p.main             = Forward()
-        p.math             = Forward()
-        p.math_string      = Forward()
-        p.non_math         = Forward()
         p.operatorname     = Forward()
         p.overline         = Forward()
         p.overset          = Forward()
         p.placeable        = Forward()
-        p.rbrace           = Forward()
-        p.rbracket         = Forward()
         p.required_group   = Forward()
-        p.right_delim      = Forward()
-        p.right_delim_safe = Forward()
         p.simple           = Forward()
-        p.simple_group     = Forward()
-        p.single_symbol    = Forward()
-        p.accentprefixed   = Forward()
-        p.space            = Forward()
+        p.optional_group   = Forward()
         p.sqrt             = Forward()
-        p.start_group      = Forward()
         p.subsuper         = Forward()
-        p.subsuperop       = Forward()
-        p.symbol           = Forward()
-        p.symbol_name      = Forward()
         p.token            = Forward()
         p.underset         = Forward()
-        p.unknown_symbol   = Forward()
-
-        # Set names on everything -- very useful for debugging
-        for key, val in vars(p).items():
-            if not key.startswith('_'):
-                val.setName(key)
-
-        p.float_literal <<= Regex(r"[-+]?([0-9]+\.?[0-9]*|\.[0-9]+)")
-        p.int_literal   <<= Regex("[-+]?[0-9]+")
-
-        p.lbrace        <<= Literal('{').suppress()
-        p.rbrace        <<= Literal('}').suppress()
-        p.lbracket      <<= Literal('[').suppress()
-        p.rbracket      <<= Literal(']').suppress()
-        p.bslash        <<= Literal('\\')
-
-        p.space         <<= oneOf(list(self._space_widths))
-        p.customspace   <<= (
-            Suppress(Literal(r'\hspace'))
-            - ((p.lbrace + p.float_literal + p.rbrace)
-               | Error(r"Expected \hspace{n}"))
-        )
-
-        unicode_range = "\U00000080-\U0001ffff"
-        p.single_symbol <<= Regex(
-            r"([a-zA-Z0-9 +\-*/<>=:,.;!\?&'@()\[\]|%s])|(\\[%%${}\[\]_|])" %
-            unicode_range)
-        p.accentprefixed <<= Suppress(p.bslash) + oneOf(self._accentprefixed)
-        p.symbol_name   <<= (
-            Combine(p.bslash + oneOf(list(tex2uni)))
-            + FollowedBy(Regex("[^A-Za-z]").leaveWhitespace() | StringEnd())
-        )
-        p.symbol        <<= (p.single_symbol | p.symbol_name).leaveWhitespace()
-
-        p.apostrophe    <<= Regex("'+")
-
-        p.c_over_c      <<= (
-            Suppress(p.bslash)
-            + oneOf(list(self._char_over_chars))
-        )
-
-        p.accent        <<= Group(
-            Suppress(p.bslash)
-            + oneOf([*self._accent_map, *self._wide_accents])
-            - p.placeable
-        )
 
-        p.function      <<= (
-            Suppress(p.bslash)
-            + oneOf(list(self._function_names))
-        )
+        set_names_and_parse_actions()  # for mutually recursive definitions.
 
-        p.start_group    <<= Optional(p.latexfont) + p.lbrace
-        p.end_group      <<= p.rbrace.copy()
-        p.simple_group   <<= Group(p.lbrace + ZeroOrMore(p.token) + p.rbrace)
-        p.required_group <<= Group(p.lbrace + OneOrMore(p.token) + p.rbrace)
-        p.group          <<= Group(
-            p.start_group + ZeroOrMore(p.token) + p.end_group
-        )
+        p.customspace <<= cmd(r"\hspace", "{" + p.float_literal("space") + "}")
 
-        p.font          <<= Suppress(p.bslash) + oneOf(list(self._fontnames))
-        p.latexfont     <<= (
-            Suppress(p.bslash)
-            + oneOf(['math' + x for x in self._fontnames])
-        )
+        p.accent <<= (
+            csnames("accent", [*self._accent_map, *self._wide_accents])
+            - p.placeable("sym"))
 
-        p.frac          <<= Group(
-            Suppress(Literal(r"\frac"))
-            - ((p.required_group + p.required_group)
-               | Error(r"Expected \frac{num}{den}"))
-        )
+        p.function <<= csnames("name", self._function_names)
+        p.operatorname <<= cmd(
+            r"\operatorname",
+            "{" + ZeroOrMore(p.simple | p.unknown_symbol)("name") + "}")
 
-        p.dfrac         <<= Group(
-            Suppress(Literal(r"\dfrac"))
-            - ((p.required_group + p.required_group)
-               | Error(r"Expected \dfrac{num}{den}"))
-        )
+        p.group <<= p.start_group + ZeroOrMore(p.token)("group") + p.end_group
 
-        p.binom         <<= Group(
-            Suppress(Literal(r"\binom"))
-            - ((p.required_group + p.required_group)
-               | Error(r"Expected \binom{num}{den}"))
-        )
+        p.optional_group <<= "{" + ZeroOrMore(p.token)("group") + "}"
+        p.required_group <<= "{" + OneOrMore(p.token)("group") + "}"
 
-        p.ambi_delim    <<= oneOf(list(self._ambi_delim))
-        p.left_delim    <<= oneOf(list(self._left_delim))
-        p.right_delim   <<= oneOf(list(self._right_delim))
-        p.right_delim_safe <<= oneOf([*(self._right_delim - {'}'}), r'\}'])
-
-        p.genfrac <<= Group(
-            Suppress(Literal(r"\genfrac"))
-            - (((p.lbrace
-                 + Optional(p.ambi_delim | p.left_delim, default='')
-                 + p.rbrace)
-                + (p.lbrace
-                   + Optional(p.ambi_delim | p.right_delim_safe, default='')
-                   + p.rbrace)
-                + (p.lbrace + p.float_literal + p.rbrace)
-                + p.simple_group + p.required_group + p.required_group)
-               | Error("Expected "
-                       r"\genfrac{ldelim}{rdelim}{rulesize}{style}{num}{den}"))
-        )
+        p.frac  <<= cmd(
+            r"\frac", p.required_group("num") + p.required_group("den"))
+        p.dfrac <<= cmd(
+            r"\dfrac", p.required_group("num") + p.required_group("den"))
+        p.binom <<= cmd(
+            r"\binom", p.required_group("num") + p.required_group("den"))
 
-        p.sqrt <<= Group(
-            Suppress(Literal(r"\sqrt"))
-            - ((Group(Optional(
-                p.lbracket + OneOrMore(~p.rbracket + p.token) + p.rbracket))
-                + p.required_group)
-               | Error("Expected \\sqrt{value}"))
-        )
+        p.genfrac <<= cmd(
+            r"\genfrac",
+            "{" + Optional(p.delim)("ldelim") + "}"
+            + "{" + Optional(p.delim)("rdelim") + "}"
+            + "{" + p.float_literal("rulesize") + "}"
+            + "{" + Optional(p.style_literal)("style") + "}"
+            + p.required_group("num")
+            + p.required_group("den"))
 
-        p.overline <<= Group(
-            Suppress(Literal(r"\overline"))
-            - (p.required_group | Error("Expected \\overline{value}"))
-        )
-
-        p.overset <<= Group(
-            Suppress(Literal(r"\overset"))
-            - ((p.simple_group + p.simple_group)
-               | Error("Expected \\overset{body}{annotation}"))
-        )
-
-        p.underset <<= Group(
-            Suppress(Literal(r"\underset"))
-            - ((p.simple_group + p.simple_group)
-               | Error("Expected \\underset{body}{annotation}"))
-        )
+        p.sqrt <<= cmd(
+            r"\sqrt{value}",
+            Optional("[" + OneOrMore(NotAny("]") + p.token)("root") + "]")
+            + p.required_group("value"))
 
-        p.unknown_symbol <<= Combine(p.bslash + Regex("[A-Za-z]*"))
+        p.overline <<= cmd(r"\overline", p.required_group("body"))
 
-        p.operatorname <<= Group(
-            Suppress(Literal(r"\operatorname"))
-            - ((p.lbrace + ZeroOrMore(p.simple | p.unknown_symbol) + p.rbrace)
-               | Error("Expected \\operatorname{value}"))
-        )
+        p.overset  <<= cmd(
+            r"\overset",
+            p.optional_group("annotation") + p.optional_group("body"))
+        p.underset <<= cmd(
+            r"\underset",
+            p.optional_group("annotation") + p.optional_group("body"))
 
         p.placeable     <<= (
-            p.accentprefixed  # Must be before accent so named symbols that are
-                              # prefixed with an accent name work
-            | p.accent   # Must be before symbol as all accents are symbols
-            | p.symbol   # Must be third to catch all named symbols and single
+            p.accent     # Must be before symbol as all accents are symbols
+            | p.symbol   # Must be second to catch all named symbols and single
                          # chars not in a group
-            | p.c_over_c
             | p.function
+            | p.operatorname
             | p.group
             | p.frac
             | p.dfrac
@@ -2208,7 +1925,6 @@ def __init__(self):
             | p.underset
             | p.sqrt
             | p.overline
-            | p.operatorname
         )
 
         p.simple        <<= (
@@ -2218,14 +1934,12 @@ def __init__(self):
             | p.subsuper
         )
 
-        p.subsuperop    <<= oneOf(["_", "^"])
-
-        p.subsuper      <<= Group(
-            (Optional(p.placeable)
-             + OneOrMore(p.subsuperop - p.placeable)
-             + Optional(p.apostrophe))
-            | (p.placeable + Optional(p.apostrophe))
-            | p.apostrophe
+        p.subsuper      <<= (
+            (Optional(p.placeable)("nucleus")
+             + OneOrMore(oneOf(["_", "^"]) - p.placeable)("subsuper")
+             + Regex("'*")("apostrophes"))
+            | Regex("'+")("apostrophes")
+            | (p.placeable("nucleus") + Regex("'*")("apostrophes"))
         )
 
         p.token         <<= (
@@ -2235,34 +1949,26 @@ def __init__(self):
         )
 
         p.auto_delim    <<= (
-            Suppress(Literal(r"\left"))
-            - ((p.left_delim | p.ambi_delim)
-               | Error("Expected a delimiter"))
-            + Group(ZeroOrMore(p.simple | p.auto_delim))
-            + Suppress(Literal(r"\right"))
-            - ((p.right_delim | p.ambi_delim)
-               | Error("Expected a delimiter"))
+            r"\left" - (p.delim("left") | Error("Expected a delimiter"))
+            + ZeroOrMore(p.simple | p.auto_delim)("mid")
+            + r"\right" - (p.delim("right") | Error("Expected a delimiter"))
         )
 
-        p.math          <<= OneOrMore(p.token)
-
-        p.math_string   <<= QuotedString('$', '\\', unquoteResults=False)
-
-        p.non_math      <<= Regex(r"(?:(?:\\[$])|[^$])*").leaveWhitespace()
-
-        p.main          <<= (
+        # Leaf definitions.
+        p.math          = OneOrMore(p.token)
+        p.math_string   = QuotedString('$', '\\', unquoteResults=False)
+        p.non_math      = Regex(r"(?:(?:\\[$])|[^$])*").leaveWhitespace()
+        p.main          = (
             p.non_math + ZeroOrMore(p.math_string + p.non_math) + StringEnd()
         )
-
-        # Set actions
-        for key, val in vars(p).items():
-            if not key.startswith('_'):
-                if hasattr(self, key):
-                    val.setParseAction(getattr(self, key))
+        set_names_and_parse_actions()  # for leaf definitions.
 
         self._expression = p.main
         self._math_expression = p.math
 
+        # To add space to nucleus operators after sub/superscripts
+        self._in_subscript_or_superscript = False
+
     def parse(self, s, fonts_object, fontsize, dpi):
         """
         Parse expression *s* using the given *fonts_object* for
@@ -2271,7 +1977,7 @@ def parse(self, s, fonts_object, fontsize, dpi):
         Returns the parse tree of `Node` instances.
         """
         self._state_stack = [
-            self.State(fonts_object, 'default', 'rm', fontsize, dpi)]
+            ParserState(fonts_object, 'default', 'rm', fontsize, dpi)]
         self._em_width_cache = {}
         try:
             result = self._expression.parseString(s)
@@ -2281,46 +1987,12 @@ def parse(self, s, fonts_object, fontsize, dpi):
                                         " " * (err.column - 1) + "^",
                                         str(err)])) from err
         self._state_stack = None
+        self._in_subscript_or_superscript = False
+        # prevent operator spacing from leaking into a new expression
         self._em_width_cache = {}
         self._expression.resetCache()
         return result[0]
 
-    # The state of the parser is maintained in a stack.  Upon
-    # entering and leaving a group { } or math/non-math, the stack
-    # is pushed and popped accordingly.  The current state always
-    # exists in the top element of the stack.
-    class State:
-        """
-        Stores the state of the parser.
-
-        States are pushed and popped from a stack as necessary, and
-        the "current" state is always at the top of the stack.
-        """
-        def __init__(self, font_output, font, font_class, fontsize, dpi):
-            self.font_output = font_output
-            self._font = font
-            self.font_class = font_class
-            self.fontsize = fontsize
-            self.dpi = dpi
-
-        def copy(self):
-            return Parser.State(
-                self.font_output,
-                self.font,
-                self.font_class,
-                self.fontsize,
-                self.dpi)
-
-        @property
-        def font(self):
-            return self._font
-
-        @font.setter
-        def font(self, name):
-            if name in ('rm', 'it', 'bf'):
-                self.font_class = name
-            self._font = name
-
     def get_state(self):
         """Get the current `State` of the parser."""
         return self._state_stack[-1]
@@ -2346,21 +2018,27 @@ def math(self, s, loc, toks):
 
     def non_math(self, s, loc, toks):
         s = toks[0].replace(r'\$', '$')
-        symbols = [Char(c, self.get_state(), math=False) for c in s]
+        symbols = [Char(c, self.get_state()) for c in s]
         hlist = Hlist(symbols)
         # We're going into math now, so set font to 'it'
         self.push_state()
         self.get_state().font = mpl.rcParams['mathtext.default']
         return [hlist]
 
+    float_literal = staticmethod(pyparsing_common.convertToFloat)
+
     def _make_space(self, percentage):
-        # All spaces are relative to em width
+        # In TeX, an em (the unit usually used to measure horizontal lengths)
+        # is not the width of the character 'm'; it is the same in different
+        # font styles (e.g. roman or italic). Mathtext, however, uses 'm' in
+        # the italic style so that horizontal spaces don't depend on the
+        # current font style.
         state = self.get_state()
         key = (state.font, state.fontsize, state.dpi)
         width = self._em_width_cache.get(key)
         if width is None:
-            metrics = state.font_output.get_metrics(
-                state.font, mpl.rcParams['mathtext.default'], 'm',
+            metrics = state.fontset.get_metrics(
+                'it', mpl.rcParams['mathtext.default'], 'm',
                 state.fontsize, state.dpi)
             width = metrics.advance
             self._em_width_cache[key] = width
@@ -2382,16 +2060,22 @@ def _make_space(self, percentage):
     }
 
     def space(self, s, loc, toks):
-        tok, = toks
-        num = self._space_widths[tok]
+        num = self._space_widths[toks["space"]]
         box = self._make_space(num)
         return [box]
 
     def customspace(self, s, loc, toks):
-        return [self._make_space(float(toks[0]))]
+        return [self._make_space(toks["space"])]
 
     def symbol(self, s, loc, toks):
-        c, = toks
+        c = toks["sym"]
+        if c == "-":
+            # "U+2212 minus sign is the preferred representation of the unary
+            # and binary minus sign rather than the ASCII-derived U+002D
+            # hyphen-minus, because minus sign is unambiguous and because it
+            # is rendered with a more desirable length, usually longer than a
+            # hyphen." (https://www.unicode.org/reports/tr25/)
+            c = "\N{MINUS SIGN}"
         try:
             char = Char(c, self.get_state())
         except ValueError as err:
@@ -2405,7 +2089,7 @@ def symbol(self, s, loc, toks):
             # Binary operators at start of string should not be spaced
             if (c in self._binary_operators and
                     (len(s[:loc].split()) == 0 or prev_char == '{' or
-                     prev_char in self._left_delim)):
+                     prev_char in self._left_delims)):
                 return [char]
             else:
                 return [Hlist([self._make_space(0.2),
@@ -2413,70 +2097,23 @@ def symbol(self, s, loc, toks):
                                self._make_space(0.2)],
                               do_kern=True)]
         elif c in self._punctuation_symbols:
+            prev_char = next((c for c in s[:loc][::-1] if c != ' '), '')
+            next_char = next((c for c in s[loc + 1:] if c != ' '), '')
 
             # Do not space commas between brackets
             if c == ',':
-                prev_char = next((c for c in s[:loc][::-1] if c != ' '), '')
-                next_char = next((c for c in s[loc + 1:] if c != ' '), '')
                 if prev_char == '{' and next_char == '}':
                     return [char]
 
             # Do not space dots as decimal separators
-            if c == '.' and s[loc - 1].isdigit() and s[loc + 1].isdigit():
+            if c == '.' and prev_char.isdigit() and next_char.isdigit():
                 return [char]
             else:
                 return [Hlist([char, self._make_space(0.2)], do_kern=True)]
         return [char]
 
-    accentprefixed = symbol
-
     def unknown_symbol(self, s, loc, toks):
-        c, = toks
-        raise ParseFatalException(s, loc, "Unknown symbol: %s" % c)
-
-    _char_over_chars = {
-        # The first 2 entries in the tuple are (font, char, sizescale) for
-        # the two symbols under and over.  The third element is the space
-        # (in multiples of underline height)
-        r'AA': (('it', 'A', 1.0), (None, '\\circ', 0.5), 0.0),
-    }
-
-    def c_over_c(self, s, loc, toks):
-        sym, = toks
-        state = self.get_state()
-        thickness = state.font_output.get_underline_thickness(
-            state.font, state.fontsize, state.dpi)
-
-        under_desc, over_desc, space = \
-            self._char_over_chars.get(sym, (None, None, 0.0))
-        if under_desc is None:
-            raise ParseFatalException("Error parsing symbol")
-
-        over_state = state.copy()
-        if over_desc[0] is not None:
-            over_state.font = over_desc[0]
-        over_state.fontsize *= over_desc[2]
-        over = Accent(over_desc[1], over_state)
-
-        under_state = state.copy()
-        if under_desc[0] is not None:
-            under_state.font = under_desc[0]
-        under_state.fontsize *= under_desc[2]
-        under = Char(under_desc[1], under_state)
-
-        width = max(over.width, under.width)
-
-        over_centered = HCentered([over])
-        over_centered.hpack(width, 'exactly')
-
-        under_centered = HCentered([under])
-        under_centered.hpack(width, 'exactly')
-
-        return Vlist([
-                over_centered,
-                Vbox(0., thickness * space),
-                under_centered
-                ])
+        raise ParseFatalException(s, loc, f"Unknown symbol: {toks['name']}")
 
     _accent_map = {
         r'hat':            r'\circumflexaccent',
@@ -2487,6 +2124,8 @@ def c_over_c(self, s, loc, toks):
         r'tilde':          r'\combiningtilde',
         r'dot':            r'\combiningdotabove',
         r'ddot':           r'\combiningdiaeresis',
+        r'dddot':          r'\combiningthreedotsabove',
+        r'ddddot':         r'\combiningfourdotsabove',
         r'vec':            r'\combiningrightarrowabove',
         r'"':              r'\combiningdiaeresis',
         r"`":              r'\combininggraveaccent',
@@ -2501,17 +2140,11 @@ def c_over_c(self, s, loc, toks):
 
     _wide_accents = set(r"widehat widetilde widebar".split())
 
-    # make a lambda and call it to get the namespace right
-    _accentprefixed = (lambda am: [
-        p for p in tex2uni
-        if any(p.startswith(a) and a != p for a in am)
-    ])(set(_accent_map))
-
     def accent(self, s, loc, toks):
         state = self.get_state()
-        thickness = state.font_output.get_underline_thickness(
-            state.font, state.fontsize, state.dpi)
-        (accent, sym), = toks
+        thickness = state.get_current_underline_thickness()
+        accent = toks["accent"]
+        sym = toks["sym"]
         if accent in self._wide_accents:
             accent_box = AutoWidthChar(
                 '\\' + accent, sym.width, state, char_class=Accent)
@@ -2530,7 +2163,7 @@ def accent(self, s, loc, toks):
 
     def function(self, s, loc, toks):
         hlist = self.operatorname(s, loc, toks)
-        hlist.function_name, = toks
+        hlist.function_name = toks["name"]
         return hlist
 
     def operatorname(self, s, loc, toks):
@@ -2539,7 +2172,8 @@ def operatorname(self, s, loc, toks):
         state.font = 'rm'
         hlist_list = []
         # Change the font of Chars, but leave Kerns alone
-        for c in toks[0]:
+        name = toks["name"]
+        for c in name:
             if isinstance(c, Char):
                 c.font = 'rm'
                 c._update_metrics()
@@ -2548,38 +2182,47 @@ def operatorname(self, s, loc, toks):
                 hlist_list.append(Char(c, state))
             else:
                 hlist_list.append(c)
-        next_char_loc = loc + len(toks[0]) + 1
-        if isinstance(toks[0], ParseResults):
+        next_char_loc = loc + len(name) + 1
+        if isinstance(name, ParseResults):
             next_char_loc += len('operatorname{}')
         next_char = next((c for c in s[next_char_loc:] if c != ' '), '')
-        delimiters = self._left_delim | self._ambi_delim | self._right_delim
-        delimiters |= {'^', '_'}
+        delimiters = self._delims | {'^', '_'}
         if (next_char not in delimiters and
-                toks[0] not in self._overunder_functions):
+                name not in self._overunder_functions):
             # Add thin space except when followed by parenthesis, bracket, etc.
             hlist_list += [self._make_space(self._space_widths[r'\,'])]
         self.pop_state()
+        # if followed by a super/subscript, set flag to true
+        # This flag tells subsuper to add space after this operator
+        if next_char in {'^', '_'}:
+            self._in_subscript_or_superscript = True
+        else:
+            self._in_subscript_or_superscript = False
+
         return Hlist(hlist_list)
 
     def start_group(self, s, loc, toks):
         self.push_state()
         # Deal with LaTeX-style font tokens
-        if len(toks):
-            self.get_state().font = toks[0][4:]
+        if toks.get("font"):
+            self.get_state().font = toks.get("font")
         return []
 
     def group(self, s, loc, toks):
-        grp = Hlist(toks[0])
+        grp = Hlist(toks.get("group", []))
         return [grp]
-    required_group = simple_group = group
+
+    def required_group(self, s, loc, toks):
+        return Hlist(toks.get("group", []))
+
+    optional_group = required_group
 
     def end_group(self, s, loc, toks):
         self.pop_state()
         return []
 
     def font(self, s, loc, toks):
-        name, = toks
-        self.get_state().font = name
+        self.get_state().font = toks["font"]
         return []
 
     def is_overunder(self, nucleus):
@@ -2603,72 +2246,36 @@ def is_between_brackets(self, s, loc):
         return False
 
     def subsuper(self, s, loc, toks):
-        assert len(toks) == 1
-
-        nucleus = None
-        sub = None
-        super = None
-
-        # Pick all of the apostrophes out, including first apostrophes that
-        # have been parsed as characters
-        napostrophes = 0
-        new_toks = []
-        for tok in toks[0]:
-            if isinstance(tok, str) and tok not in ('^', '_'):
-                napostrophes += len(tok)
-            elif isinstance(tok, Char) and tok.c == "'":
-                napostrophes += 1
-            else:
-                new_toks.append(tok)
-        toks = new_toks
-
-        if len(toks) == 0:
-            assert napostrophes
-            nucleus = Hbox(0.0)
-        elif len(toks) == 1:
-            if not napostrophes:
-                return toks[0]  # .asList()
-            else:
-                nucleus = toks[0]
-        elif len(toks) in (2, 3):
-            # single subscript or superscript
-            nucleus = toks[0] if len(toks) == 3 else Hbox(0.0)
-            op, next = toks[-2:]
+        nucleus = toks.get("nucleus", Hbox(0))
+        subsuper = toks.get("subsuper", [])
+        napostrophes = len(toks.get("apostrophes", []))
+
+        if not subsuper and not napostrophes:
+            return nucleus
+
+        sub = super = None
+        while subsuper:
+            op, arg, *subsuper = subsuper
             if op == '_':
-                sub = next
-            else:
-                super = next
-        elif len(toks) in (4, 5):
-            # subscript and superscript
-            nucleus = toks[0] if len(toks) == 5 else Hbox(0.0)
-            op1, next1, op2, next2 = toks[-4:]
-            if op1 == op2:
-                if op1 == '_':
+                if sub is not None:
                     raise ParseFatalException("Double subscript")
-                else:
-                    raise ParseFatalException("Double superscript")
-            if op1 == '_':
-                sub = next1
-                super = next2
+                sub = arg
             else:
-                super = next1
-                sub = next2
-        else:
-            raise ParseFatalException(
-                "Subscript/superscript sequence is too long. "
-                "Use braces { } to remove ambiguity.")
+                if super is not None:
+                    raise ParseFatalException("Double superscript")
+                super = arg
 
         state = self.get_state()
-        rule_thickness = state.font_output.get_underline_thickness(
+        rule_thickness = state.fontset.get_underline_thickness(
             state.font, state.fontsize, state.dpi)
-        xHeight = state.font_output.get_xheight(
+        xHeight = state.fontset.get_xheight(
             state.font, state.fontsize, state.dpi)
 
         if napostrophes:
             if super is None:
                 super = Hlist([])
             for i in range(napostrophes):
-                super.children.extend(self.symbol(s, loc, ['\\prime']))
+                super.children.extend(self.symbol(s, loc, {"sym": "\\prime"}))
             # kern() and hpack() needed to get the metrics right after
             # extending
             super.kern()
@@ -2698,9 +2305,9 @@ def subsuper(self, s, loc, toks):
                 hlist = HCentered([sub])
                 hlist.hpack(width, 'exactly')
                 vlist.extend([Vbox(0, vgap), hlist])
-                shift = hlist.height + vgap
+                shift = hlist.height + vgap + nucleus.depth
             vlist = Vlist(vlist)
-            vlist.shift_amount = shift + nucleus.depth
+            vlist.shift_amount = shift
             result = Hlist([vlist])
             return [result]
 
@@ -2789,18 +2396,22 @@ def subsuper(self, s, loc, toks):
 
         if not self.is_dropsub(last_char):
             x.width += constants.script_space * xHeight
-        result = Hlist([nucleus, x])
 
+        # Do we need to add a space after the nucleus?
+        # To find out, check the flag set by operatorname
+        spaced_nucleus = [nucleus, x]
+        if self._in_subscript_or_superscript:
+            spaced_nucleus += [self._make_space(self._space_widths[r'\,'])]
+            self._in_subscript_or_superscript = False
+
+        result = Hlist(spaced_nucleus)
         return [result]
 
     def _genfrac(self, ldelim, rdelim, rule, style, num, den):
         state = self.get_state()
-        thickness = state.font_output.get_underline_thickness(
-            state.font, state.fontsize, state.dpi)
-
-        rule = float(rule)
+        thickness = state.get_current_underline_thickness()
 
-        if style is not self._MathStyle.DISPLAYSTYLE:
+        for _ in range(style.value):
             num.shrink()
             den.shrink()
         cnum = HCentered([num])
@@ -2817,7 +2428,7 @@ def _genfrac(self, ldelim, rdelim, rule, style, num, den):
 
         # Shift so the fraction line sits in the middle of the
         # equals sign
-        metrics = state.font_output.get_metrics(
+        metrics = state.fontset.get_metrics(
             state.font, mpl.rcParams['mathtext.default'],
             '=', state.fontsize, state.dpi)
         shift = (cden.height -
@@ -2834,37 +2445,36 @@ def _genfrac(self, ldelim, rdelim, rule, style, num, den):
             return self._auto_sized_delimiter(ldelim, result, rdelim)
         return result
 
+    def style_literal(self, s, loc, toks):
+        return self._MathStyle(int(toks["style_literal"]))
+
     def genfrac(self, s, loc, toks):
-        args, = toks
-        return self._genfrac(*args)
+        return self._genfrac(
+            toks.get("ldelim", ""), toks.get("rdelim", ""),
+            toks["rulesize"], toks.get("style", self._MathStyle.TEXTSTYLE),
+            toks["num"], toks["den"])
 
     def frac(self, s, loc, toks):
-        state = self.get_state()
-        thickness = state.font_output.get_underline_thickness(
-            state.font, state.fontsize, state.dpi)
-        (num, den), = toks
-        return self._genfrac('', '', thickness, self._MathStyle.TEXTSTYLE,
-                             num, den)
+        return self._genfrac(
+            "", "", self.get_state().get_current_underline_thickness(),
+            self._MathStyle.TEXTSTYLE, toks["num"], toks["den"])
 
     def dfrac(self, s, loc, toks):
-        state = self.get_state()
-        thickness = state.font_output.get_underline_thickness(
-            state.font, state.fontsize, state.dpi)
-        (num, den), = toks
-        return self._genfrac('', '', thickness, self._MathStyle.DISPLAYSTYLE,
-                             num, den)
+        return self._genfrac(
+            "", "", self.get_state().get_current_underline_thickness(),
+            self._MathStyle.DISPLAYSTYLE, toks["num"], toks["den"])
 
     def binom(self, s, loc, toks):
-        (num, den), = toks
-        return self._genfrac('(', ')', 0.0, self._MathStyle.TEXTSTYLE,
-                             num, den)
+        return self._genfrac(
+            "(", ")", 0,
+            self._MathStyle.TEXTSTYLE, toks["num"], toks["den"])
 
-    def _genset(self, state, annotation, body, overunder):
-        thickness = state.font_output.get_underline_thickness(
-            state.font, state.fontsize, state.dpi)
+    def _genset(self, s, loc, toks):
+        annotation = toks["annotation"]
+        body = toks["body"]
+        thickness = self.get_state().get_current_underline_thickness()
 
         annotation.shrink()
-
         cannotation = HCentered([annotation])
         cbody = HCentered([body])
         width = max(cannotation.width, cbody.width)
@@ -2872,16 +2482,14 @@ def _genset(self, state, annotation, body, overunder):
         cbody.hpack(width, 'exactly')
 
         vgap = thickness * 3
-        if overunder == "under":
+        if s[loc + 1] == "u":  # \underset
             vlist = Vlist([cbody,                       # body
                            Vbox(0, vgap),               # space
                            cannotation                  # annotation
                            ])
             # Shift so the body sits in the same vertical position
-            shift_amount = cbody.depth + cannotation.height + vgap
-
-            vlist.shift_amount = shift_amount
-        else:
+            vlist.shift_amount = cbody.depth + cannotation.height + vgap
+        else:  # \overset
             vlist = Vlist([cannotation,                 # annotation
                            Vbox(0, vgap),               # space
                            cbody                        # body
@@ -2891,11 +2499,13 @@ def _genset(self, state, annotation, body, overunder):
         # an Hlist and extend it with an Hbox(0, horizontal_gap)
         return vlist
 
+    overset = underset = _genset
+
     def sqrt(self, s, loc, toks):
-        (root, body), = toks
+        root = toks.get("root")
+        body = toks["value"]
         state = self.get_state()
-        thickness = state.font_output.get_underline_thickness(
-            state.font, state.fontsize, state.dpi)
+        thickness = state.get_current_underline_thickness()
 
         # Determine the height of the body, and add a little extra to
         # the height so it doesn't seem cramped
@@ -2932,11 +2542,10 @@ def sqrt(self, s, loc, toks):
         return [hlist]
 
     def overline(self, s, loc, toks):
-        (body,), = toks
+        body = toks["body"]
 
         state = self.get_state()
-        thickness = state.font_output.get_underline_thickness(
-            state.font, state.fontsize, state.dpi)
+        thickness = state.get_current_underline_thickness()
 
         height = body.height - body.shift_amount + thickness * 3.0
         depth = body.depth + body.shift_amount
@@ -2951,24 +2560,6 @@ def overline(self, s, loc, toks):
         hlist = Hlist([rightside])
         return [hlist]
 
-    def overset(self, s, loc, toks):
-        assert len(toks) == 1
-        assert len(toks[0]) == 2
-
-        state = self.get_state()
-        annotation, body = toks[0]
-
-        return self._genset(state, annotation, body, overunder="over")
-
-    def underset(self, s, loc, toks):
-        assert len(toks) == 1
-        assert len(toks[0]) == 2
-
-        state = self.get_state()
-        annotation, body = toks[0]
-
-        return self._genset(state, annotation, body, overunder="under")
-
     def _auto_sized_delimiter(self, front, middle, back):
         state = self.get_state()
         if len(middle):
@@ -2992,6 +2583,8 @@ def _auto_sized_delimiter(self, front, middle, back):
         return hlist
 
     def auto_delim(self, s, loc, toks):
-        front, middle, back = toks
-
-        return self._auto_sized_delimiter(front, middle.asList(), back)
+        return self._auto_sized_delimiter(
+            toks["left"],
+            # if "mid" in toks ... can be removed when requiring pyparsing 3.
+            toks["mid"].asList() if "mid" in toks else [],
+            toks["right"])
diff --git a/lib/matplotlib/_mathtext_data.py b/lib/matplotlib/_mathtext_data.py
index e17f1e05903f..8dac9301ed81 100644
--- a/lib/matplotlib/_mathtext_data.py
+++ b/lib/matplotlib/_mathtext_data.py
@@ -132,7 +132,7 @@
     ']'                          : ('cmr10', 0x5d),
 
     '*'                          : ('cmsy10', 0xa4),
-    '-'                          : ('cmsy10', 0xa1),
+    '\N{MINUS SIGN}'             : ('cmsy10', 0xa1),
     '\\Downarrow'                : ('cmsy10', 0x2b),
     '\\Im'                       : ('cmsy10', 0x3d),
     '\\Leftarrow'                : ('cmsy10', 0x28),
@@ -236,173 +236,6 @@
     '\\_'                        : ('cmtt10', 0x5f)
 }
 
-latex_to_cmex = {  # Unused; delete once mathtext becomes private.
-    r'\__sqrt__'   : 112,
-    r'\bigcap'     : 92,
-    r'\bigcup'     : 91,
-    r'\bigodot'    : 75,
-    r'\bigoplus'   : 77,
-    r'\bigotimes'  : 79,
-    r'\biguplus'   : 93,
-    r'\bigvee'     : 95,
-    r'\bigwedge'   : 94,
-    r'\coprod'     : 97,
-    r'\int'        : 90,
-    r'\leftangle'  : 173,
-    r'\leftbrace'  : 169,
-    r'\oint'       : 73,
-    r'\prod'       : 89,
-    r'\rightangle' : 174,
-    r'\rightbrace' : 170,
-    r'\sum'        : 88,
-    r'\widehat'    : 98,
-    r'\widetilde'  : 101,
-}
-
-latex_to_standard = {
-    r'\cong'                     : ('psyr', 64),
-    r'\Delta'                    : ('psyr', 68),
-    r'\Phi'                      : ('psyr', 70),
-    r'\Gamma'                    : ('psyr', 89),
-    r'\alpha'                    : ('psyr', 97),
-    r'\beta'                     : ('psyr', 98),
-    r'\chi'                      : ('psyr', 99),
-    r'\delta'                    : ('psyr', 100),
-    r'\varepsilon'               : ('psyr', 101),
-    r'\phi'                      : ('psyr', 102),
-    r'\gamma'                    : ('psyr', 103),
-    r'\eta'                      : ('psyr', 104),
-    r'\iota'                     : ('psyr', 105),
-    r'\varphi'                   : ('psyr', 106),
-    r'\kappa'                    : ('psyr', 108),
-    r'\nu'                       : ('psyr', 110),
-    r'\pi'                       : ('psyr', 112),
-    r'\theta'                    : ('psyr', 113),
-    r'\rho'                      : ('psyr', 114),
-    r'\sigma'                    : ('psyr', 115),
-    r'\tau'                      : ('psyr', 116),
-    r'\upsilon'                  : ('psyr', 117),
-    r'\varpi'                    : ('psyr', 118),
-    r'\omega'                    : ('psyr', 119),
-    r'\xi'                       : ('psyr', 120),
-    r'\psi'                      : ('psyr', 121),
-    r'\zeta'                     : ('psyr', 122),
-    r'\sim'                      : ('psyr', 126),
-    r'\leq'                      : ('psyr', 163),
-    r'\infty'                    : ('psyr', 165),
-    r'\clubsuit'                 : ('psyr', 167),
-    r'\diamondsuit'              : ('psyr', 168),
-    r'\heartsuit'                : ('psyr', 169),
-    r'\spadesuit'                : ('psyr', 170),
-    r'\leftrightarrow'           : ('psyr', 171),
-    r'\leftarrow'                : ('psyr', 172),
-    r'\uparrow'                  : ('psyr', 173),
-    r'\rightarrow'               : ('psyr', 174),
-    r'\downarrow'                : ('psyr', 175),
-    r'\pm'                       : ('psyr', 176),
-    r'\geq'                      : ('psyr', 179),
-    r'\times'                    : ('psyr', 180),
-    r'\propto'                   : ('psyr', 181),
-    r'\partial'                  : ('psyr', 182),
-    r'\bullet'                   : ('psyr', 183),
-    r'\div'                      : ('psyr', 184),
-    r'\neq'                      : ('psyr', 185),
-    r'\equiv'                    : ('psyr', 186),
-    r'\approx'                   : ('psyr', 187),
-    r'\ldots'                    : ('psyr', 188),
-    r'\aleph'                    : ('psyr', 192),
-    r'\Im'                       : ('psyr', 193),
-    r'\Re'                       : ('psyr', 194),
-    r'\wp'                       : ('psyr', 195),
-    r'\otimes'                   : ('psyr', 196),
-    r'\oplus'                    : ('psyr', 197),
-    r'\oslash'                   : ('psyr', 198),
-    r'\cap'                      : ('psyr', 199),
-    r'\cup'                      : ('psyr', 200),
-    r'\supset'                   : ('psyr', 201),
-    r'\supseteq'                 : ('psyr', 202),
-    r'\subset'                   : ('psyr', 204),
-    r'\subseteq'                 : ('psyr', 205),
-    r'\in'                       : ('psyr', 206),
-    r'\notin'                    : ('psyr', 207),
-    r'\angle'                    : ('psyr', 208),
-    r'\nabla'                    : ('psyr', 209),
-    r'\textregistered'           : ('psyr', 210),
-    r'\copyright'                : ('psyr', 211),
-    r'\texttrademark'            : ('psyr', 212),
-    r'\Pi'                       : ('psyr', 213),
-    r'\prod'                     : ('psyr', 213),
-    r'\surd'                     : ('psyr', 214),
-    r'\__sqrt__'                 : ('psyr', 214),
-    r'\cdot'                     : ('psyr', 215),
-    r'\urcorner'                 : ('psyr', 216),
-    r'\vee'                      : ('psyr', 217),
-    r'\wedge'                    : ('psyr', 218),
-    r'\Leftrightarrow'           : ('psyr', 219),
-    r'\Leftarrow'                : ('psyr', 220),
-    r'\Uparrow'                  : ('psyr', 221),
-    r'\Rightarrow'               : ('psyr', 222),
-    r'\Downarrow'                : ('psyr', 223),
-    r'\Diamond'                  : ('psyr', 224),
-    r'\Sigma'                    : ('psyr', 229),
-    r'\sum'                      : ('psyr', 229),
-    r'\forall'                   : ('psyr',  34),
-    r'\exists'                   : ('psyr',  36),
-    r'\lceil'                    : ('psyr', 233),
-    r'\lbrace'                   : ('psyr', 123),
-    r'\Psi'                      : ('psyr',  89),
-    r'\bot'                      : ('psyr', 0o136),
-    r'\Omega'                    : ('psyr', 0o127),
-    r'\leftbracket'              : ('psyr', 0o133),
-    r'\rightbracket'             : ('psyr', 0o135),
-    r'\leftbrace'                : ('psyr', 123),
-    r'\leftparen'                : ('psyr', 0o50),
-    r'\prime'                    : ('psyr', 0o242),
-    r'\sharp'                    : ('psyr', 0o43),
-    r'\slash'                    : ('psyr', 0o57),
-    r'\Lambda'                   : ('psyr', 0o114),
-    r'\neg'                      : ('psyr', 0o330),
-    r'\Upsilon'                  : ('psyr', 0o241),
-    r'\rightbrace'               : ('psyr', 0o175),
-    r'\rfloor'                   : ('psyr', 0o373),
-    r'\lambda'                   : ('psyr', 0o154),
-    r'\to'                       : ('psyr', 0o256),
-    r'\Xi'                       : ('psyr', 0o130),
-    r'\emptyset'                 : ('psyr', 0o306),
-    r'\lfloor'                   : ('psyr', 0o353),
-    r'\rightparen'               : ('psyr', 0o51),
-    r'\rceil'                    : ('psyr', 0o371),
-    r'\ni'                       : ('psyr', 0o47),
-    r'\epsilon'                  : ('psyr', 0o145),
-    r'\Theta'                    : ('psyr', 0o121),
-    r'\langle'                   : ('psyr', 0o341),
-    r'\leftangle'                : ('psyr', 0o341),
-    r'\rangle'                   : ('psyr', 0o361),
-    r'\rightangle'               : ('psyr', 0o361),
-    r'\rbrace'                   : ('psyr', 0o175),
-    r'\circ'                     : ('psyr', 0o260),
-    r'\diamond'                  : ('psyr', 0o340),
-    r'\mu'                       : ('psyr', 0o155),
-    r'\mid'                      : ('psyr', 0o352),
-    r'\imath'                    : ('pncri8a', 105),
-    r'\%'                        : ('pncr8a',  37),
-    r'\$'                        : ('pncr8a',  36),
-    r'\{'                        : ('pncr8a', 123),
-    r'\}'                        : ('pncr8a', 125),
-    r'\backslash'                : ('pncr8a',  92),
-    r'\ast'                      : ('pncr8a',  42),
-    r'\#'                        : ('pncr8a',  35),
-
-    r'\circumflexaccent'         : ('pncri8a',   124), # for \hat
-    r'\combiningbreve'           : ('pncri8a',   81),  # for \breve
-    r'\combininggraveaccent'     : ('pncri8a', 114), # for \grave
-    r'\combiningacuteaccent'     : ('pncri8a', 63), # for \accute
-    r'\combiningdiaeresis'       : ('pncri8a', 91), # for \ddot
-    r'\combiningtilde'           : ('pncri8a', 75), # for \tilde
-    r'\combiningrightarrowabove' : ('pncri8a', 110), # for \vec
-    r'\combiningdotabove'        : ('pncri8a', 26), # for \dot
-}
-
 # Automatically generated.
 
 type12uni = {
@@ -1116,6 +949,7 @@
     'cwopencirclearrow'        : 8635,
     'geqq'                     : 8807,
     'rightleftarrows'          : 8644,
+    'aa'                       : 229,
     'ac'                       : 8766,
     'ae'                       : 230,
     'int'                      : 8747,
@@ -1166,6 +1000,8 @@
     'combiningtilde'           : 771,
     'combiningrightarrowabove' : 8407,
     'combiningdotabove'        : 775,
+    'combiningthreedotsabove'  : 8411,
+    'combiningfourdotsabove'   : 8412,
     'to'                       : 8594,
     'succeq'                   : 8829,
     'emptyset'                 : 8709,
@@ -1382,3 +1218,11 @@
         (0x0061, 0x007a, 'rm', 0x1d68a)  # a-z
         ],
     }
+
+
+# Fix some incorrect glyphs.
+stix_glyph_fixes = {
+    # Cap and Cup glyphs are swapped.
+    0x22d2: 0x22d3,
+    0x22d3: 0x22d2,
+}
diff --git a/lib/matplotlib/_pylab_helpers.py b/lib/matplotlib/_pylab_helpers.py
index 27904dd84b6f..d32a69d4ff99 100644
--- a/lib/matplotlib/_pylab_helpers.py
+++ b/lib/matplotlib/_pylab_helpers.py
@@ -4,7 +4,6 @@
 
 import atexit
 from collections import OrderedDict
-import gc
 
 
 class Gcf:
@@ -65,7 +64,7 @@ def destroy(cls, num):
         if hasattr(manager, "_cidgcf"):
             manager.canvas.mpl_disconnect(manager._cidgcf)
         manager.destroy()
-        gc.collect(1)
+        del manager, num
 
     @classmethod
     def destroy_fig(cls, fig):
@@ -78,14 +77,10 @@ def destroy_fig(cls, fig):
     @classmethod
     def destroy_all(cls):
         """Destroy all figures."""
-        # Reimport gc in case the module globals have already been removed
-        # during interpreter shutdown.
-        import gc
         for manager in list(cls.figs.values()):
             manager.canvas.mpl_disconnect(manager._cidgcf)
             manager.destroy()
         cls.figs.clear()
-        gc.collect(1)
 
     @classmethod
     def has_fignum(cls, num):
diff --git a/lib/matplotlib/_text_helpers.py b/lib/matplotlib/_text_helpers.py
new file mode 100644
index 000000000000..18bfb550c90b
--- /dev/null
+++ b/lib/matplotlib/_text_helpers.py
@@ -0,0 +1,74 @@
+"""
+Low-level text helper utilities.
+"""
+
+import dataclasses
+
+from . import _api
+from .ft2font import KERNING_DEFAULT, LOAD_NO_HINTING
+
+
+LayoutItem = dataclasses.make_dataclass(
+    "LayoutItem", ["ft_object", "char", "glyph_idx", "x", "prev_kern"])
+
+
+def warn_on_missing_glyph(codepoint):
+    _api.warn_external(
+        "Glyph {} ({}) missing from current font.".format(
+            codepoint,
+            chr(codepoint).encode("ascii", "namereplace").decode("ascii")))
+    block = ("Hebrew" if 0x0590 <= codepoint <= 0x05ff else
+             "Arabic" if 0x0600 <= codepoint <= 0x06ff else
+             "Devanagari" if 0x0900 <= codepoint <= 0x097f else
+             "Bengali" if 0x0980 <= codepoint <= 0x09ff else
+             "Gurmukhi" if 0x0a00 <= codepoint <= 0x0a7f else
+             "Gujarati" if 0x0a80 <= codepoint <= 0x0aff else
+             "Oriya" if 0x0b00 <= codepoint <= 0x0b7f else
+             "Tamil" if 0x0b80 <= codepoint <= 0x0bff else
+             "Telugu" if 0x0c00 <= codepoint <= 0x0c7f else
+             "Kannada" if 0x0c80 <= codepoint <= 0x0cff else
+             "Malayalam" if 0x0d00 <= codepoint <= 0x0d7f else
+             "Sinhala" if 0x0d80 <= codepoint <= 0x0dff else
+             None)
+    if block:
+        _api.warn_external(
+            f"Matplotlib currently does not support {block} natively.")
+
+
+def layout(string, font, *, kern_mode=KERNING_DEFAULT):
+    """
+    Render *string* with *font*.  For each character in *string*, yield a
+    (glyph-index, x-position) pair.  When such a pair is yielded, the font's
+    glyph is set to the corresponding character.
+
+    Parameters
+    ----------
+    string : str
+        The string to be rendered.
+    font : FT2Font
+        The font.
+    kern_mode : int
+        A FreeType kerning mode.
+
+    Yields
+    ------
+    glyph_index : int
+    x_position : float
+    """
+    x = 0
+    prev_glyph_idx = None
+    char_to_font = font._get_fontmap(string)
+    base_font = font
+    for char in string:
+        # This has done the fallback logic
+        font = char_to_font.get(char, base_font)
+        glyph_idx = font.get_char_index(ord(char))
+        kern = (
+            base_font.get_kerning(prev_glyph_idx, glyph_idx, kern_mode) / 64
+            if prev_glyph_idx is not None else 0.
+        )
+        x += kern
+        glyph = font.load_glyph(glyph_idx, flags=LOAD_NO_HINTING)
+        yield LayoutItem(font, char, glyph_idx, x, kern)
+        x += glyph.linearHoriAdvance / 65536
+        prev_glyph_idx = glyph_idx
diff --git a/lib/matplotlib/_text_layout.py b/lib/matplotlib/_text_layout.py
deleted file mode 100644
index c7a87e848688..000000000000
--- a/lib/matplotlib/_text_layout.py
+++ /dev/null
@@ -1,44 +0,0 @@
-"""
-Text layouting utilities.
-"""
-
-import dataclasses
-
-from .ft2font import KERNING_DEFAULT, LOAD_NO_HINTING
-
-
-LayoutItem = dataclasses.make_dataclass(
-    "LayoutItem", ["char", "glyph_idx", "x", "prev_kern"])
-
-
-def layout(string, font, *, kern_mode=KERNING_DEFAULT):
-    """
-    Render *string* with *font*.  For each character in *string*, yield a
-    (glyph-index, x-position) pair.  When such a pair is yielded, the font's
-    glyph is set to the corresponding character.
-
-    Parameters
-    ----------
-    string : str
-        The string to be rendered.
-    font : FT2Font
-        The font.
-    kern_mode : int
-        A FreeType kerning mode.
-
-    Yields
-    ------
-    glyph_index : int
-    x_position : float
-    """
-    x = 0
-    prev_glyph_idx = None
-    for char in string:
-        glyph_idx = font.get_char_index(ord(char))
-        kern = (font.get_kerning(prev_glyph_idx, glyph_idx, kern_mode) / 64
-                if prev_glyph_idx is not None else 0.)
-        x += kern
-        glyph = font.load_glyph(glyph_idx, flags=LOAD_NO_HINTING)
-        yield LayoutItem(char, glyph_idx, x, kern)
-        x += glyph.linearHoriAdvance / 65536
-        prev_glyph_idx = glyph_idx
diff --git a/lib/matplotlib/_tight_bbox.py b/lib/matplotlib/_tight_bbox.py
new file mode 100644
index 000000000000..b2147b960735
--- /dev/null
+++ b/lib/matplotlib/_tight_bbox.py
@@ -0,0 +1,84 @@
+"""
+Helper module for the *bbox_inches* parameter in `.Figure.savefig`.
+"""
+
+from matplotlib.transforms import Bbox, TransformedBbox, Affine2D
+
+
+def adjust_bbox(fig, bbox_inches, fixed_dpi=None):
+    """
+    Temporarily adjust the figure so that only the specified area
+    (bbox_inches) is saved.
+
+    It modifies fig.bbox, fig.bbox_inches,
+    fig.transFigure._boxout, and fig.patch.  While the figure size
+    changes, the scale of the original figure is conserved.  A
+    function which restores the original values are returned.
+    """
+    origBbox = fig.bbox
+    origBboxInches = fig.bbox_inches
+    orig_layout = fig.get_layout_engine()
+    fig.set_layout_engine(None)
+    _boxout = fig.transFigure._boxout
+
+    old_aspect = []
+    locator_list = []
+    sentinel = object()
+    for ax in fig.axes:
+        locator_list.append(ax.get_axes_locator())
+        current_pos = ax.get_position(original=False).frozen()
+        ax.set_axes_locator(lambda a, r, _pos=current_pos: _pos)
+        # override the method that enforces the aspect ratio on the Axes
+        if 'apply_aspect' in ax.__dict__:
+            old_aspect.append(ax.apply_aspect)
+        else:
+            old_aspect.append(sentinel)
+        ax.apply_aspect = lambda pos=None: None
+
+    def restore_bbox():
+        for ax, loc, aspect in zip(fig.axes, locator_list, old_aspect):
+            ax.set_axes_locator(loc)
+            if aspect is sentinel:
+                # delete our no-op function which un-hides the original method
+                del ax.apply_aspect
+            else:
+                ax.apply_aspect = aspect
+
+        fig.bbox = origBbox
+        fig.bbox_inches = origBboxInches
+        fig.set_layout_engine(orig_layout)
+        fig.transFigure._boxout = _boxout
+        fig.transFigure.invalidate()
+        fig.patch.set_bounds(0, 0, 1, 1)
+
+    if fixed_dpi is None:
+        fixed_dpi = fig.dpi
+    tr = Affine2D().scale(fixed_dpi)
+    dpi_scale = fixed_dpi / fig.dpi
+
+    fig.bbox_inches = Bbox.from_bounds(0, 0, *bbox_inches.size)
+    x0, y0 = tr.transform(bbox_inches.p0)
+    w1, h1 = fig.bbox.size * dpi_scale
+    fig.transFigure._boxout = Bbox.from_bounds(-x0, -y0, w1, h1)
+    fig.transFigure.invalidate()
+
+    fig.bbox = TransformedBbox(fig.bbox_inches, tr)
+
+    fig.patch.set_bounds(x0 / w1, y0 / h1,
+                         fig.bbox.width / w1, fig.bbox.height / h1)
+
+    return restore_bbox
+
+
+def process_figure_for_rasterizing(fig, bbox_inches_restore, fixed_dpi=None):
+    """
+    A function that needs to be called when figure dpi changes during the
+    drawing (e.g., rasterizing).  It recovers the bbox and re-adjust it with
+    the new dpi.
+    """
+
+    bbox_inches, restore_bbox = bbox_inches_restore
+    restore_bbox()
+    r = adjust_bbox(fig, bbox_inches, fixed_dpi)
+
+    return bbox_inches, r
diff --git a/lib/matplotlib/_tight_layout.py b/lib/matplotlib/_tight_layout.py
new file mode 100644
index 000000000000..192c2dcfdcb9
--- /dev/null
+++ b/lib/matplotlib/_tight_layout.py
@@ -0,0 +1,340 @@
+"""
+Routines to adjust subplot params so that subplots are
+nicely fit in the figure. In doing so, only axis labels, tick labels, axes
+titles and offsetboxes that are anchored to axes are currently considered.
+
+Internally, this module assumes that the margins (left margin, etc.) which are
+differences between ``Axes.get_tightbbox`` and ``Axes.bbox`` are independent of
+Axes position. This may fail if ``Axes.adjustable`` is ``datalim`` as well as
+such cases as when left or right margin are affected by xlabel.
+"""
+
+import numpy as np
+
+import matplotlib as mpl
+from matplotlib import _api, artist as martist
+from matplotlib.font_manager import FontProperties
+from matplotlib.transforms import Bbox
+
+
+def _auto_adjust_subplotpars(
+        fig, renderer, shape, span_pairs, subplot_list,
+        ax_bbox_list=None, pad=1.08, h_pad=None, w_pad=None, rect=None):
+    """
+    Return a dict of subplot parameters to adjust spacing between subplots
+    or ``None`` if resulting axes would have zero height or width.
+
+    Note that this function ignores geometry information of subplot itself, but
+    uses what is given by the *shape* and *subplot_list* parameters.  Also, the
+    results could be incorrect if some subplots have ``adjustable=datalim``.
+
+    Parameters
+    ----------
+    shape : tuple[int, int]
+        Number of rows and columns of the grid.
+    span_pairs : list[tuple[slice, slice]]
+        List of rowspans and colspans occupied by each subplot.
+    subplot_list : list of subplots
+        List of subplots that will be used to calculate optimal subplot_params.
+    pad : float
+        Padding between the figure edge and the edges of subplots, as a
+        fraction of the font size.
+    h_pad, w_pad : float
+        Padding (height/width) between edges of adjacent subplots, as a
+        fraction of the font size.  Defaults to *pad*.
+    rect : tuple
+        (left, bottom, right, top), default: None.
+    """
+    rows, cols = shape
+
+    font_size_inch = (FontProperties(
+        size=mpl.rcParams["font.size"]).get_size_in_points() / 72)
+    pad_inch = pad * font_size_inch
+    vpad_inch = h_pad * font_size_inch if h_pad is not None else pad_inch
+    hpad_inch = w_pad * font_size_inch if w_pad is not None else pad_inch
+
+    if len(span_pairs) != len(subplot_list) or len(subplot_list) == 0:
+        raise ValueError
+
+    if rect is None:
+        margin_left = margin_bottom = margin_right = margin_top = None
+    else:
+        margin_left, margin_bottom, _right, _top = rect
+        margin_right = 1 - _right if _right else None
+        margin_top = 1 - _top if _top else None
+
+    vspaces = np.zeros((rows + 1, cols))
+    hspaces = np.zeros((rows, cols + 1))
+
+    if ax_bbox_list is None:
+        ax_bbox_list = [
+            Bbox.union([ax.get_position(original=True) for ax in subplots])
+            for subplots in subplot_list]
+
+    for subplots, ax_bbox, (rowspan, colspan) in zip(
+            subplot_list, ax_bbox_list, span_pairs):
+        if all(not ax.get_visible() for ax in subplots):
+            continue
+
+        bb = []
+        for ax in subplots:
+            if ax.get_visible():
+                bb += [martist._get_tightbbox_for_layout_only(ax, renderer)]
+
+        tight_bbox_raw = Bbox.union(bb)
+        tight_bbox = fig.transFigure.inverted().transform_bbox(tight_bbox_raw)
+
+        hspaces[rowspan, colspan.start] += ax_bbox.xmin - tight_bbox.xmin  # l
+        hspaces[rowspan, colspan.stop] += tight_bbox.xmax - ax_bbox.xmax  # r
+        vspaces[rowspan.start, colspan] += tight_bbox.ymax - ax_bbox.ymax  # t
+        vspaces[rowspan.stop, colspan] += ax_bbox.ymin - tight_bbox.ymin  # b
+
+    fig_width_inch, fig_height_inch = fig.get_size_inches()
+
+    # margins can be negative for axes with aspect applied, so use max(, 0) to
+    # make them nonnegative.
+    if not margin_left:
+        margin_left = max(hspaces[:, 0].max(), 0) + pad_inch/fig_width_inch
+        suplabel = fig._supylabel
+        if suplabel and suplabel.get_in_layout():
+            rel_width = fig.transFigure.inverted().transform_bbox(
+                suplabel.get_window_extent(renderer)).width
+            margin_left += rel_width + pad_inch/fig_width_inch
+    if not margin_right:
+        margin_right = max(hspaces[:, -1].max(), 0) + pad_inch/fig_width_inch
+    if not margin_top:
+        margin_top = max(vspaces[0, :].max(), 0) + pad_inch/fig_height_inch
+        if fig._suptitle and fig._suptitle.get_in_layout():
+            rel_height = fig.transFigure.inverted().transform_bbox(
+                fig._suptitle.get_window_extent(renderer)).height
+            margin_top += rel_height + pad_inch/fig_height_inch
+    if not margin_bottom:
+        margin_bottom = max(vspaces[-1, :].max(), 0) + pad_inch/fig_height_inch
+        suplabel = fig._supxlabel
+        if suplabel and suplabel.get_in_layout():
+            rel_height = fig.transFigure.inverted().transform_bbox(
+                suplabel.get_window_extent(renderer)).height
+            margin_bottom += rel_height + pad_inch/fig_height_inch
+
+    if margin_left + margin_right >= 1:
+        _api.warn_external('Tight layout not applied. The left and right '
+                           'margins cannot be made large enough to '
+                           'accommodate all axes decorations.')
+        return None
+    if margin_bottom + margin_top >= 1:
+        _api.warn_external('Tight layout not applied. The bottom and top '
+                           'margins cannot be made large enough to '
+                           'accommodate all axes decorations.')
+        return None
+
+    kwargs = dict(left=margin_left,
+                  right=1 - margin_right,
+                  bottom=margin_bottom,
+                  top=1 - margin_top)
+
+    if cols > 1:
+        hspace = hspaces[:, 1:-1].max() + hpad_inch / fig_width_inch
+        # axes widths:
+        h_axes = (1 - margin_right - margin_left - hspace * (cols - 1)) / cols
+        if h_axes < 0:
+            _api.warn_external('Tight layout not applied. tight_layout '
+                               'cannot make axes width small enough to '
+                               'accommodate all axes decorations')
+            return None
+        else:
+            kwargs["wspace"] = hspace / h_axes
+    if rows > 1:
+        vspace = vspaces[1:-1, :].max() + vpad_inch / fig_height_inch
+        v_axes = (1 - margin_top - margin_bottom - vspace * (rows - 1)) / rows
+        if v_axes < 0:
+            _api.warn_external('Tight layout not applied. tight_layout '
+                               'cannot make axes height small enough to '
+                               'accommodate all axes decorations.')
+            return None
+        else:
+            kwargs["hspace"] = vspace / v_axes
+
+    return kwargs
+
+
+@_api.deprecated("3.5")
+def auto_adjust_subplotpars(
+        fig, renderer, nrows_ncols, num1num2_list, subplot_list,
+        ax_bbox_list=None, pad=1.08, h_pad=None, w_pad=None, rect=None):
+    """
+    Return a dict of subplot parameters to adjust spacing between subplots
+    or ``None`` if resulting axes would have zero height or width.
+
+    Note that this function ignores geometry information of subplot
+    itself, but uses what is given by the *nrows_ncols* and *num1num2_list*
+    parameters.  Also, the results could be incorrect if some subplots have
+    ``adjustable=datalim``.
+
+    Parameters
+    ----------
+    nrows_ncols : tuple[int, int]
+        Number of rows and number of columns of the grid.
+    num1num2_list : list[tuple[int, int]]
+        List of numbers specifying the area occupied by the subplot
+    subplot_list : list of subplots
+        List of subplots that will be used to calculate optimal subplot_params.
+    pad : float
+        Padding between the figure edge and the edges of subplots, as a
+        fraction of the font size.
+    h_pad, w_pad : float
+        Padding (height/width) between edges of adjacent subplots, as a
+        fraction of the font size.  Defaults to *pad*.
+    rect : tuple
+        (left, bottom, right, top), default: None.
+    """
+    nrows, ncols = nrows_ncols
+    span_pairs = []
+    for n1, n2 in num1num2_list:
+        if n2 is None:
+            n2 = n1
+        span_pairs.append((slice(n1 // ncols, n2 // ncols + 1),
+                           slice(n1 % ncols, n2 % ncols + 1)))
+    return _auto_adjust_subplotpars(
+        fig, renderer, nrows_ncols, num1num2_list, subplot_list,
+        ax_bbox_list, pad, h_pad, w_pad, rect)
+
+
+def get_subplotspec_list(axes_list, grid_spec=None):
+    """
+    Return a list of subplotspec from the given list of axes.
+
+    For an instance of axes that does not support subplotspec, None is inserted
+    in the list.
+
+    If grid_spec is given, None is inserted for those not from the given
+    grid_spec.
+    """
+    subplotspec_list = []
+    for ax in axes_list:
+        axes_or_locator = ax.get_axes_locator()
+        if axes_or_locator is None:
+            axes_or_locator = ax
+
+        if hasattr(axes_or_locator, "get_subplotspec"):
+            subplotspec = axes_or_locator.get_subplotspec()
+            if subplotspec is not None:
+                subplotspec = subplotspec.get_topmost_subplotspec()
+                gs = subplotspec.get_gridspec()
+                if grid_spec is not None:
+                    if gs != grid_spec:
+                        subplotspec = None
+                elif gs.locally_modified_subplot_params():
+                    subplotspec = None
+        else:
+            subplotspec = None
+
+        subplotspec_list.append(subplotspec)
+
+    return subplotspec_list
+
+
+def get_tight_layout_figure(fig, axes_list, subplotspec_list, renderer,
+                            pad=1.08, h_pad=None, w_pad=None, rect=None):
+    """
+    Return subplot parameters for tight-layouted-figure with specified padding.
+
+    Parameters
+    ----------
+    fig : Figure
+    axes_list : list of Axes
+    subplotspec_list : list of `.SubplotSpec`
+        The subplotspecs of each axes.
+    renderer : renderer
+    pad : float
+        Padding between the figure edge and the edges of subplots, as a
+        fraction of the font size.
+    h_pad, w_pad : float
+        Padding (height/width) between edges of adjacent subplots.  Defaults to
+        *pad*.
+    rect : tuple (left, bottom, right, top), default: None.
+        rectangle in normalized figure coordinates
+        that the whole subplots area (including labels) will fit into.
+        Defaults to using the entire figure.
+
+    Returns
+    -------
+    subplotspec or None
+        subplotspec kwargs to be passed to `.Figure.subplots_adjust` or
+        None if tight_layout could not be accomplished.
+    """
+
+    # Multiple axes can share same subplotspec (e.g., if using axes_grid1);
+    # we need to group them together.
+    ss_to_subplots = {ss: [] for ss in subplotspec_list}
+    for ax, ss in zip(axes_list, subplotspec_list):
+        ss_to_subplots[ss].append(ax)
+    ss_to_subplots.pop(None, None)  # Skip subplotspec == None.
+    if not ss_to_subplots:
+        return {}
+    subplot_list = list(ss_to_subplots.values())
+    ax_bbox_list = [ss.get_position(fig) for ss in ss_to_subplots]
+
+    max_nrows = max(ss.get_gridspec().nrows for ss in ss_to_subplots)
+    max_ncols = max(ss.get_gridspec().ncols for ss in ss_to_subplots)
+
+    span_pairs = []
+    for ss in ss_to_subplots:
+        # The intent here is to support axes from different gridspecs where
+        # one's nrows (or ncols) is a multiple of the other (e.g. 2 and 4),
+        # but this doesn't actually work because the computed wspace, in
+        # relative-axes-height, corresponds to different physical spacings for
+        # the 2-row grid and the 4-row grid.  Still, this code is left, mostly
+        # for backcompat.
+        rows, cols = ss.get_gridspec().get_geometry()
+        div_row, mod_row = divmod(max_nrows, rows)
+        div_col, mod_col = divmod(max_ncols, cols)
+        if mod_row != 0:
+            _api.warn_external('tight_layout not applied: number of rows '
+                               'in subplot specifications must be '
+                               'multiples of one another.')
+            return {}
+        if mod_col != 0:
+            _api.warn_external('tight_layout not applied: number of '
+                               'columns in subplot specifications must be '
+                               'multiples of one another.')
+            return {}
+        span_pairs.append((
+            slice(ss.rowspan.start * div_row, ss.rowspan.stop * div_row),
+            slice(ss.colspan.start * div_col, ss.colspan.stop * div_col)))
+
+    kwargs = _auto_adjust_subplotpars(fig, renderer,
+                                      shape=(max_nrows, max_ncols),
+                                      span_pairs=span_pairs,
+                                      subplot_list=subplot_list,
+                                      ax_bbox_list=ax_bbox_list,
+                                      pad=pad, h_pad=h_pad, w_pad=w_pad)
+
+    # kwargs can be none if tight_layout fails...
+    if rect is not None and kwargs is not None:
+        # if rect is given, the whole subplots area (including
+        # labels) will fit into the rect instead of the
+        # figure. Note that the rect argument of
+        # *auto_adjust_subplotpars* specify the area that will be
+        # covered by the total area of axes.bbox. Thus we call
+        # auto_adjust_subplotpars twice, where the second run
+        # with adjusted rect parameters.
+
+        left, bottom, right, top = rect
+        if left is not None:
+            left += kwargs["left"]
+        if bottom is not None:
+            bottom += kwargs["bottom"]
+        if right is not None:
+            right -= (1 - kwargs["right"])
+        if top is not None:
+            top -= (1 - kwargs["top"])
+
+        kwargs = _auto_adjust_subplotpars(fig, renderer,
+                                          shape=(max_nrows, max_ncols),
+                                          span_pairs=span_pairs,
+                                          subplot_list=subplot_list,
+                                          ax_bbox_list=ax_bbox_list,
+                                          pad=pad, h_pad=h_pad, w_pad=w_pad,
+                                          rect=(left, bottom, right, top))
+
+    return kwargs
diff --git a/lib/matplotlib/_type1font.py b/lib/matplotlib/_type1font.py
new file mode 100644
index 000000000000..0413cb0016a0
--- /dev/null
+++ b/lib/matplotlib/_type1font.py
@@ -0,0 +1,877 @@
+"""
+A class representing a Type 1 font.
+
+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.
+
+Usage::
+
+    font = Type1Font(filename)
+    clear_part, encrypted_part, finale = font.parts
+    slanted_font = font.transform({'slant': 0.167})
+    extended_font = font.transform({'extend': 1.2})
+
+Sources:
+
+* Adobe Technical Note #5040, Supporting Downloadable PostScript
+  Language Fonts.
+
+* Adobe Type 1 Font Format, Adobe Systems Incorporated, third printing,
+  v1.1, 1993. ISBN 0-201-57044-0.
+"""
+
+import binascii
+import functools
+import logging
+import re
+import string
+import struct
+
+import numpy as np
+
+from matplotlib.cbook import _format_approx
+from . import _api
+
+_log = logging.getLogger(__name__)
+
+
+class _Token:
+    """
+    A token in a PostScript stream.
+
+    Attributes
+    ----------
+    pos : int
+        Position, i.e. offset from the beginning of the data.
+    raw : str
+        Raw text of the token.
+    kind : str
+        Description of the token (for debugging or testing).
+    """
+    __slots__ = ('pos', 'raw')
+    kind = '?'
+
+    def __init__(self, pos, raw):
+        _log.debug('type1font._Token %s at %d: %r', self.kind, pos, raw)
+        self.pos = pos
+        self.raw = raw
+
+    def __str__(self):
+        return f"<{self.kind} {self.raw} @{self.pos}>"
+
+    def endpos(self):
+        """Position one past the end of the token"""
+        return self.pos + len(self.raw)
+
+    def is_keyword(self, *names):
+        """Is this a name token with one of the names?"""
+        return False
+
+    def is_slash_name(self):
+        """Is this a name token that starts with a slash?"""
+        return False
+
+    def is_delim(self):
+        """Is this a delimiter token?"""
+        return False
+
+    def is_number(self):
+        """Is this a number token?"""
+        return False
+
+    def value(self):
+        return self.raw
+
+
+class _NameToken(_Token):
+    kind = 'name'
+
+    def is_slash_name(self):
+        return self.raw.startswith('/')
+
+    def value(self):
+        return self.raw[1:]
+
+
+class _BooleanToken(_Token):
+    kind = 'boolean'
+
+    def value(self):
+        return self.raw == 'true'
+
+
+class _KeywordToken(_Token):
+    kind = 'keyword'
+
+    def is_keyword(self, *names):
+        return self.raw in names
+
+
+class _DelimiterToken(_Token):
+    kind = 'delimiter'
+
+    def is_delim(self):
+        return True
+
+    def opposite(self):
+        return {'[': ']', ']': '[',
+                '{': '}', '}': '{',
+                '<<': '>>', '>>': '<<'
+                }[self.raw]
+
+
+class _WhitespaceToken(_Token):
+    kind = 'whitespace'
+
+
+class _StringToken(_Token):
+    kind = 'string'
+    _escapes_re = re.compile(r'\\([\\()nrtbf]|[0-7]{1,3})')
+    _replacements = {'\\': '\\', '(': '(', ')': ')', 'n': '\n',
+                     'r': '\r', 't': '\t', 'b': '\b', 'f': '\f'}
+    _ws_re = re.compile('[\0\t\r\f\n ]')
+
+    @classmethod
+    def _escape(cls, match):
+        group = match.group(1)
+        try:
+            return cls._replacements[group]
+        except KeyError:
+            return chr(int(group, 8))
+
+    @functools.lru_cache()
+    def value(self):
+        if self.raw[0] == '(':
+            return self._escapes_re.sub(self._escape, self.raw[1:-1])
+        else:
+            data = self._ws_re.sub('', self.raw[1:-1])
+            if len(data) % 2 == 1:
+                data += '0'
+            return binascii.unhexlify(data)
+
+
+class _BinaryToken(_Token):
+    kind = 'binary'
+
+    def value(self):
+        return self.raw[1:]
+
+
+class _NumberToken(_Token):
+    kind = 'number'
+
+    def is_number(self):
+        return True
+
+    def value(self):
+        if '.' not in self.raw:
+            return int(self.raw)
+        else:
+            return float(self.raw)
+
+
+def _tokenize(data: bytes, skip_ws: bool):
+    """
+    A generator that produces _Token instances from Type-1 font code.
+
+    The consumer of the generator may send an integer to the tokenizer to
+    indicate that the next token should be _BinaryToken of the given length.
+
+    Parameters
+    ----------
+    data : bytes
+        The data of the font to tokenize.
+
+    skip_ws : bool
+        If true, the generator will drop any _WhitespaceTokens from the output.
+    """
+
+    text = data.decode('ascii', 'replace')
+    whitespace_or_comment_re = re.compile(r'[\0\t\r\f\n ]+|%[^\r\n]*')
+    token_re = re.compile(r'/{0,2}[^]\0\t\r\f\n ()<>{}/%[]+')
+    instring_re = re.compile(r'[()\\]')
+    hex_re = re.compile(r'^<[0-9a-fA-F\0\t\r\f\n ]*>$')
+    oct_re = re.compile(r'[0-7]{1,3}')
+    pos = 0
+    next_binary = None
+
+    while pos < len(text):
+        if next_binary is not None:
+            n = next_binary
+            next_binary = (yield _BinaryToken(pos, data[pos:pos+n]))
+            pos += n
+            continue
+        match = whitespace_or_comment_re.match(text, pos)
+        if match:
+            if not skip_ws:
+                next_binary = (yield _WhitespaceToken(pos, match.group()))
+            pos = match.end()
+        elif text[pos] == '(':
+            # PostScript string rules:
+            # - parentheses must be balanced
+            # - backslashes escape backslashes and parens
+            # - also codes \n\r\t\b\f and octal escapes are recognized
+            # - other backslashes do not escape anything
+            start = pos
+            pos += 1
+            depth = 1
+            while depth:
+                match = instring_re.search(text, pos)
+                if match is None:
+                    raise ValueError(
+                        f'Unterminated string starting at {start}')
+                pos = match.end()
+                if match.group() == '(':
+                    depth += 1
+                elif match.group() == ')':
+                    depth -= 1
+                else:  # a backslash
+                    char = text[pos]
+                    if char in r'\()nrtbf':
+                        pos += 1
+                    else:
+                        octal = oct_re.match(text, pos)
+                        if octal:
+                            pos = octal.end()
+                        else:
+                            pass  # non-escaping backslash
+            next_binary = (yield _StringToken(start, text[start:pos]))
+        elif text[pos:pos + 2] in ('<<', '>>'):
+            next_binary = (yield _DelimiterToken(pos, text[pos:pos + 2]))
+            pos += 2
+        elif text[pos] == '<':
+            start = pos
+            try:
+                pos = text.index('>', pos) + 1
+            except ValueError as e:
+                raise ValueError(f'Unterminated hex string starting at {start}'
+                                 ) from e
+            if not hex_re.match(text[start:pos]):
+                raise ValueError(f'Malformed hex string starting at {start}')
+            next_binary = (yield _StringToken(pos, text[start:pos]))
+        else:
+            match = token_re.match(text, pos)
+            if match:
+                raw = match.group()
+                if raw.startswith('/'):
+                    next_binary = (yield _NameToken(pos, raw))
+                elif match.group() in ('true', 'false'):
+                    next_binary = (yield _BooleanToken(pos, raw))
+                else:
+                    try:
+                        float(raw)
+                        next_binary = (yield _NumberToken(pos, raw))
+                    except ValueError:
+                        next_binary = (yield _KeywordToken(pos, raw))
+                pos = match.end()
+            else:
+                next_binary = (yield _DelimiterToken(pos, text[pos]))
+                pos += 1
+
+
+class _BalancedExpression(_Token):
+    pass
+
+
+def _expression(initial, tokens, data):
+    """
+    Consume some number of tokens and return a balanced PostScript expression.
+
+    Parameters
+    ----------
+    initial : _Token
+        The token that triggered parsing a balanced expression.
+    tokens : iterator of _Token
+        Following tokens.
+    data : bytes
+        Underlying data that the token positions point to.
+
+    Returns
+    -------
+    _BalancedExpression
+    """
+    delim_stack = []
+    token = initial
+    while True:
+        if token.is_delim():
+            if token.raw in ('[', '{'):
+                delim_stack.append(token)
+            elif token.raw in (']', '}'):
+                if not delim_stack:
+                    raise RuntimeError(f"unmatched closing token {token}")
+                match = delim_stack.pop()
+                if match.raw != token.opposite():
+                    raise RuntimeError(
+                        f"opening token {match} closed by {token}"
+                    )
+                if not delim_stack:
+                    break
+            else:
+                raise RuntimeError(f'unknown delimiter {token}')
+        elif not delim_stack:
+            break
+        token = next(tokens)
+    return _BalancedExpression(
+        initial.pos,
+        data[initial.pos:token.endpos()].decode('ascii', 'replace')
+    )
+
+
+class Type1Font:
+    """
+    A class representing a Type-1 font, for use by backends.
+
+    Attributes
+    ----------
+    parts : tuple
+        A 3-tuple of the cleartext part, the encrypted part, and the finale of
+        zeros.
+
+    decrypted : bytes
+        The decrypted form of ``parts[1]``.
+
+    prop : dict[str, Any]
+        A dictionary of font properties. Noteworthy keys include:
+
+        - FontName: PostScript name of the font
+        - Encoding: dict from numeric codes to glyph names
+        - FontMatrix: bytes object encoding a matrix
+        - UniqueID: optional font identifier, dropped when modifying the font
+        - CharStrings: dict from glyph names to byte code
+        - Subrs: array of byte code subroutines
+        - OtherSubrs: bytes object encoding some PostScript code
+    """
+    __slots__ = ('parts', 'decrypted', 'prop', '_pos', '_abbr')
+    # the _pos dict contains (begin, end) indices to parts[0] + decrypted
+    # so that they can be replaced when transforming the font;
+    # but since sometimes a definition appears in both parts[0] and decrypted,
+    # _pos[name] is an array of such pairs
+    #
+    # _abbr maps three standard abbreviations to their particular names in
+    # this font (e.g. 'RD' is named '-|' in some fonts)
+
+    def __init__(self, input):
+        """
+        Initialize a Type-1 font.
+
+        Parameters
+        ----------
+        input : str or 3-tuple
+            Either a pfb file name, or a 3-tuple of already-decoded Type-1
+            font `~.Type1Font.parts`.
+        """
+        if isinstance(input, tuple) and len(input) == 3:
+            self.parts = input
+        else:
+            with open(input, 'rb') as file:
+                data = self._read(file)
+            self.parts = self._split(data)
+
+        self.decrypted = self._decrypt(self.parts[1], 'eexec')
+        self._abbr = {'RD': 'RD', 'ND': 'ND', 'NP': 'NP'}
+        self._parse()
+
+    def _read(self, file):
+        """Read the font from a file, decoding into usable parts."""
+        rawdata = file.read()
+        if not rawdata.startswith(b'\x80'):
+            return rawdata
+
+        data = b''
+        while rawdata:
+            if not rawdata.startswith(b'\x80'):
+                raise RuntimeError('Broken pfb file (expected byte 128, '
+                                   'got %d)' % rawdata[0])
+            type = rawdata[1]
+            if type in (1, 2):
+                length, = struct.unpack('<i', rawdata[2:6])
+                segment = rawdata[6:6 + length]
+                rawdata = rawdata[6 + length:]
+
+            if type == 1:       # ASCII text: include verbatim
+                data += segment
+            elif type == 2:     # binary data: encode in hexadecimal
+                data += binascii.hexlify(segment)
+            elif type == 3:     # end of file
+                break
+            else:
+                raise RuntimeError('Unknown segment type %d in pfb file' %
+                                   type)
+
+        return data
+
+    def _split(self, data):
+        """
+        Split the Type 1 font into its three main parts.
+
+        The three parts are: (1) the cleartext part, which ends in a
+        eexec operator; (2) the encrypted part; (3) the fixed part,
+        which contains 512 ASCII zeros possibly divided on various
+        lines, a cleartomark operator, and possibly something else.
+        """
+
+        # Cleartext part: just find the eexec and skip whitespace
+        idx = data.index(b'eexec')
+        idx += len(b'eexec')
+        while data[idx] in b' \t\r\n':
+            idx += 1
+        len1 = idx
+
+        # Encrypted part: find the cleartomark operator and count
+        # zeros backward
+        idx = data.rindex(b'cleartomark') - 1
+        zeros = 512
+        while zeros and data[idx] in b'0' or data[idx] in b'\r\n':
+            if data[idx] in b'0':
+                zeros -= 1
+            idx -= 1
+        if zeros:
+            # this may have been a problem on old implementations that
+            # used the zeros as necessary padding
+            _log.info('Insufficiently many zeros in Type 1 font')
+
+        # Convert encrypted part to binary (if we read a pfb file, we may end
+        # up converting binary to hexadecimal to binary again; but if we read
+        # a pfa file, this part is already in hex, and I am not quite sure if
+        # even the pfb format guarantees that it will be in binary).
+        idx1 = len1 + ((idx - len1 + 2) & ~1)  # ensure an even number of bytes
+        binary = binascii.unhexlify(data[len1:idx1])
+
+        return data[:len1], binary, data[idx+1:]
+
+    @staticmethod
+    def _decrypt(ciphertext, key, ndiscard=4):
+        """
+        Decrypt ciphertext using the Type-1 font algorithm.
+
+        The algorithm is described in Adobe's "Adobe Type 1 Font Format".
+        The key argument can be an integer, or one of the strings
+        'eexec' and 'charstring', which map to the key specified for the
+        corresponding part of Type-1 fonts.
+
+        The ndiscard argument should be an integer, usually 4.
+        That number of bytes is discarded from the beginning of plaintext.
+        """
+
+        key = _api.check_getitem({'eexec': 55665, 'charstring': 4330}, key=key)
+        plaintext = []
+        for byte in ciphertext:
+            plaintext.append(byte ^ (key >> 8))
+            key = ((key+byte) * 52845 + 22719) & 0xffff
+
+        return bytes(plaintext[ndiscard:])
+
+    @staticmethod
+    def _encrypt(plaintext, key, ndiscard=4):
+        """
+        Encrypt plaintext using the Type-1 font algorithm.
+
+        The algorithm is described in Adobe's "Adobe Type 1 Font Format".
+        The key argument can be an integer, or one of the strings
+        'eexec' and 'charstring', which map to the key specified for the
+        corresponding part of Type-1 fonts.
+
+        The ndiscard argument should be an integer, usually 4. That
+        number of bytes is prepended to the plaintext before encryption.
+        This function prepends NUL bytes for reproducibility, even though
+        the original algorithm uses random bytes, presumably to avoid
+        cryptanalysis.
+        """
+
+        key = _api.check_getitem({'eexec': 55665, 'charstring': 4330}, key=key)
+        ciphertext = []
+        for byte in b'\0' * ndiscard + plaintext:
+            c = byte ^ (key >> 8)
+            ciphertext.append(c)
+            key = ((key + c) * 52845 + 22719) & 0xffff
+
+        return bytes(ciphertext)
+
+    def _parse(self):
+        """
+        Find the values of various font properties. This limited kind
+        of parsing is described in Chapter 10 "Adobe Type Manager
+        Compatibility" of the Type-1 spec.
+        """
+        # Start with reasonable defaults
+        prop = {'Weight': 'Regular', 'ItalicAngle': 0.0, 'isFixedPitch': False,
+                'UnderlinePosition': -100, 'UnderlineThickness': 50}
+        pos = {}
+        data = self.parts[0] + self.decrypted
+
+        source = _tokenize(data, True)
+        while True:
+            # See if there is a key to be assigned a value
+            # e.g. /FontName in /FontName /Helvetica def
+            try:
+                token = next(source)
+            except StopIteration:
+                break
+            if token.is_delim():
+                # skip over this - we want top-level keys only
+                _expression(token, source, data)
+            if token.is_slash_name():
+                key = token.value()
+                keypos = token.pos
+            else:
+                continue
+
+            # Some values need special parsing
+            if key in ('Subrs', 'CharStrings', 'Encoding', 'OtherSubrs'):
+                prop[key], endpos = {
+                    'Subrs': self._parse_subrs,
+                    'CharStrings': self._parse_charstrings,
+                    'Encoding': self._parse_encoding,
+                    'OtherSubrs': self._parse_othersubrs
+                }[key](source, data)
+                pos.setdefault(key, []).append((keypos, endpos))
+                continue
+
+            try:
+                token = next(source)
+            except StopIteration:
+                break
+
+            if isinstance(token, _KeywordToken):
+                # constructs like
+                # FontDirectory /Helvetica known {...} {...} ifelse
+                # mean the key was not really a key
+                continue
+
+            if token.is_delim():
+                value = _expression(token, source, data).raw
+            else:
+                value = token.value()
+
+            # look for a 'def' possibly preceded by access modifiers
+            try:
+                kw = next(
+                    kw for kw in source
+                    if not kw.is_keyword('readonly', 'noaccess', 'executeonly')
+                )
+            except StopIteration:
+                break
+
+            # sometimes noaccess def and readonly def are abbreviated
+            if kw.is_keyword('def', self._abbr['ND'], self._abbr['NP']):
+                prop[key] = value
+                pos.setdefault(key, []).append((keypos, kw.endpos()))
+
+            # detect the standard abbreviations
+            if value == '{noaccess def}':
+                self._abbr['ND'] = key
+            elif value == '{noaccess put}':
+                self._abbr['NP'] = key
+            elif value == '{string currentfile exch readstring pop}':
+                self._abbr['RD'] = key
+
+        # Fill in the various *Name properties
+        if 'FontName' not in prop:
+            prop['FontName'] = (prop.get('FullName') or
+                                prop.get('FamilyName') or
+                                'Unknown')
+        if 'FullName' not in prop:
+            prop['FullName'] = prop['FontName']
+        if 'FamilyName' not in prop:
+            extras = ('(?i)([ -](regular|plain|italic|oblique|(semi)?bold|'
+                      '(ultra)?light|extra|condensed))+$')
+            prop['FamilyName'] = re.sub(extras, '', prop['FullName'])
+        # Decrypt the encrypted parts
+        ndiscard = prop.get('lenIV', 4)
+        cs = prop['CharStrings']
+        for key, value in cs.items():
+            cs[key] = self._decrypt(value, 'charstring', ndiscard)
+        if 'Subrs' in prop:
+            prop['Subrs'] = [
+                self._decrypt(value, 'charstring', ndiscard)
+                for value in prop['Subrs']
+            ]
+
+        self.prop = prop
+        self._pos = pos
+
+    def _parse_subrs(self, tokens, _data):
+        count_token = next(tokens)
+        if not count_token.is_number():
+            raise RuntimeError(
+                f"Token following /Subrs must be a number, was {count_token}"
+            )
+        count = count_token.value()
+        array = [None] * count
+        next(t for t in tokens if t.is_keyword('array'))
+        for _ in range(count):
+            next(t for t in tokens if t.is_keyword('dup'))
+            index_token = next(tokens)
+            if not index_token.is_number():
+                raise RuntimeError(
+                    "Token following dup in Subrs definition must be a "
+                    f"number, was {index_token}"
+                )
+            nbytes_token = next(tokens)
+            if not nbytes_token.is_number():
+                raise RuntimeError(
+                    "Second token following dup in Subrs definition must "
+                    f"be a number, was {nbytes_token}"
+                )
+            token = next(tokens)
+            if not token.is_keyword(self._abbr['RD']):
+                raise RuntimeError(
+                    f"Token preceding subr must be {self._abbr['RD']}, "
+                    f"was {token}"
+                )
+            binary_token = tokens.send(1+nbytes_token.value())
+            array[index_token.value()] = binary_token.value()
+
+        return array, next(tokens).endpos()
+
+    @staticmethod
+    def _parse_charstrings(tokens, _data):
+        count_token = next(tokens)
+        if not count_token.is_number():
+            raise RuntimeError(
+                "Token following /CharStrings must be a number, "
+                f"was {count_token}"
+            )
+        count = count_token.value()
+        charstrings = {}
+        next(t for t in tokens if t.is_keyword('begin'))
+        while True:
+            token = next(t for t in tokens
+                         if t.is_keyword('end') or t.is_slash_name())
+            if token.raw == 'end':
+                return charstrings, token.endpos()
+            glyphname = token.value()
+            nbytes_token = next(tokens)
+            if not nbytes_token.is_number():
+                raise RuntimeError(
+                    f"Token following /{glyphname} in CharStrings definition "
+                    f"must be a number, was {nbytes_token}"
+                )
+            next(tokens)  # usually RD or |-
+            binary_token = tokens.send(1+nbytes_token.value())
+            charstrings[glyphname] = binary_token.value()
+
+    @staticmethod
+    def _parse_encoding(tokens, _data):
+        # this only works for encodings that follow the Adobe manual
+        # but some old fonts include non-compliant data - we log a warning
+        # and return a possibly incomplete encoding
+        encoding = {}
+        while True:
+            token = next(t for t in tokens
+                         if t.is_keyword('StandardEncoding', 'dup', 'def'))
+            if token.is_keyword('StandardEncoding'):
+                return _StandardEncoding, token.endpos()
+            if token.is_keyword('def'):
+                return encoding, token.endpos()
+            index_token = next(tokens)
+            if not index_token.is_number():
+                _log.warning(
+                    f"Parsing encoding: expected number, got {index_token}"
+                )
+                continue
+            name_token = next(tokens)
+            if not name_token.is_slash_name():
+                _log.warning(
+                    f"Parsing encoding: expected slash-name, got {name_token}"
+                )
+                continue
+            encoding[index_token.value()] = name_token.value()
+
+    @staticmethod
+    def _parse_othersubrs(tokens, data):
+        init_pos = None
+        while True:
+            token = next(tokens)
+            if init_pos is None:
+                init_pos = token.pos
+            if token.is_delim():
+                _expression(token, tokens, data)
+            elif token.is_keyword('def', 'ND', '|-'):
+                return data[init_pos:token.endpos()], token.endpos()
+
+    def transform(self, effects):
+        """
+        Return a new font that is slanted and/or extended.
+
+        Parameters
+        ----------
+        effects : dict
+            A dict with optional entries:
+
+            - 'slant' : float, default: 0
+                Tangent of the angle that the font is to be slanted to the
+                right. Negative values slant to the left.
+            - 'extend' : float, default: 1
+                Scaling factor for the font width. Values less than 1 condense
+                the glyphs.
+
+        Returns
+        -------
+        `Type1Font`
+        """
+        fontname = self.prop['FontName']
+        italicangle = self.prop['ItalicAngle']
+
+        array = [
+            float(x) for x in (self.prop['FontMatrix']
+                               .lstrip('[').rstrip(']').split())
+        ]
+        oldmatrix = np.eye(3, 3)
+        oldmatrix[0:3, 0] = array[::2]
+        oldmatrix[0:3, 1] = array[1::2]
+        modifier = np.eye(3, 3)
+
+        if 'slant' in effects:
+            slant = effects['slant']
+            fontname += '_Slant_%d' % int(1000 * slant)
+            italicangle = round(
+                float(italicangle) - np.arctan(slant) / np.pi * 180,
+                5
+            )
+            modifier[1, 0] = slant
+
+        if 'extend' in effects:
+            extend = effects['extend']
+            fontname += '_Extend_%d' % int(1000 * extend)
+            modifier[0, 0] = extend
+
+        newmatrix = np.dot(modifier, oldmatrix)
+        array[::2] = newmatrix[0:3, 0]
+        array[1::2] = newmatrix[0:3, 1]
+        fontmatrix = (
+            '[%s]' % ' '.join(_format_approx(x, 6) for x in array)
+        )
+        replacements = (
+            [(x, '/FontName/%s def' % fontname)
+             for x in self._pos['FontName']]
+            + [(x, '/ItalicAngle %a def' % italicangle)
+               for x in self._pos['ItalicAngle']]
+            + [(x, '/FontMatrix %s readonly def' % fontmatrix)
+               for x in self._pos['FontMatrix']]
+            + [(x, '') for x in self._pos.get('UniqueID', [])]
+        )
+
+        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')
+            if pos0 < len(self.parts[0]):
+                if pos1 >= len(self.parts[0]):
+                    raise RuntimeError(
+                        f"text to be replaced with {value} spans "
+                        "the eexec boundary"
+                    )
+                len0 += len(value) - pos1 + pos0
+
+        data = bytes(data)
+        return Type1Font((
+            data[:len0],
+            self._encrypt(data[len0:], 'eexec'),
+            self.parts[2]
+        ))
+
+
+_StandardEncoding = {
+    **{ord(letter): letter for letter in string.ascii_letters},
+    0: '.notdef',
+    32: 'space',
+    33: 'exclam',
+    34: 'quotedbl',
+    35: 'numbersign',
+    36: 'dollar',
+    37: 'percent',
+    38: 'ampersand',
+    39: 'quoteright',
+    40: 'parenleft',
+    41: 'parenright',
+    42: 'asterisk',
+    43: 'plus',
+    44: 'comma',
+    45: 'hyphen',
+    46: 'period',
+    47: 'slash',
+    48: 'zero',
+    49: 'one',
+    50: 'two',
+    51: 'three',
+    52: 'four',
+    53: 'five',
+    54: 'six',
+    55: 'seven',
+    56: 'eight',
+    57: 'nine',
+    58: 'colon',
+    59: 'semicolon',
+    60: 'less',
+    61: 'equal',
+    62: 'greater',
+    63: 'question',
+    64: 'at',
+    91: 'bracketleft',
+    92: 'backslash',
+    93: 'bracketright',
+    94: 'asciicircum',
+    95: 'underscore',
+    96: 'quoteleft',
+    123: 'braceleft',
+    124: 'bar',
+    125: 'braceright',
+    126: 'asciitilde',
+    161: 'exclamdown',
+    162: 'cent',
+    163: 'sterling',
+    164: 'fraction',
+    165: 'yen',
+    166: 'florin',
+    167: 'section',
+    168: 'currency',
+    169: 'quotesingle',
+    170: 'quotedblleft',
+    171: 'guillemotleft',
+    172: 'guilsinglleft',
+    173: 'guilsinglright',
+    174: 'fi',
+    175: 'fl',
+    177: 'endash',
+    178: 'dagger',
+    179: 'daggerdbl',
+    180: 'periodcentered',
+    182: 'paragraph',
+    183: 'bullet',
+    184: 'quotesinglbase',
+    185: 'quotedblbase',
+    186: 'quotedblright',
+    187: 'guillemotright',
+    188: 'ellipsis',
+    189: 'perthousand',
+    191: 'questiondown',
+    193: 'grave',
+    194: 'acute',
+    195: 'circumflex',
+    196: 'tilde',
+    197: 'macron',
+    198: 'breve',
+    199: 'dotaccent',
+    200: 'dieresis',
+    202: 'ring',
+    203: 'cedilla',
+    205: 'hungarumlaut',
+    206: 'ogonek',
+    207: 'caron',
+    208: 'emdash',
+    225: 'AE',
+    227: 'ordfeminine',
+    232: 'Lslash',
+    233: 'Oslash',
+    234: 'OE',
+    235: 'ordmasculine',
+    241: 'ae',
+    245: 'dotlessi',
+    248: 'lslash',
+    249: 'oslash',
+    250: 'oe',
+    251: 'germandbls',
+}
diff --git a/lib/matplotlib/_version.py b/lib/matplotlib/_version.py
deleted file mode 100644
index 08dc9b6117f2..000000000000
--- a/lib/matplotlib/_version.py
+++ /dev/null
@@ -1,460 +0,0 @@
-
-# This file helps to compute a version number in source trees obtained from
-# git-archive tarball (such as those provided by githubs download-from-tag
-# feature). Distribution tarballs (built by setup.py sdist) and build
-# directories (produced by setup.py build) will contain a much shorter file
-# that just contains the computed version number.
-
-# This file is released into the public domain. Generated by
-# versioneer-0.15 (https://github.com/warner/python-versioneer)
-
-import errno
-import os
-import re
-import subprocess
-import sys
-
-
-def get_keywords():
-    # these strings will be replaced by git during git-archive.
-    # setup.py/versioneer.py will grep for the variable names, so they must
-    # each be defined on a line of their own. _version.py will just call
-    # get_keywords().
-    git_refnames = "$Format:%d$"
-    git_full = "$Format:%H$"
-    keywords = {"refnames": git_refnames, "full": git_full}
-    return keywords
-
-
-class VersioneerConfig:
-    pass
-
-
-def get_config():
-    # these strings are filled in when 'setup.py versioneer' creates
-    # _version.py
-    cfg = VersioneerConfig()
-    cfg.VCS = "git"
-    cfg.style = "pep440-post"
-    cfg.tag_prefix = "v"
-    cfg.parentdir_prefix = "matplotlib-"
-    cfg.versionfile_source = "lib/matplotlib/_version.py"
-    cfg.verbose = False
-    return cfg
-
-
-class NotThisMethod(Exception):
-    pass
-
-
-LONG_VERSION_PY = {}
-HANDLERS = {}
-
-
-def register_vcs_handler(vcs, method):  # decorator
-    def decorate(f):
-        if vcs not in HANDLERS:
-            HANDLERS[vcs] = {}
-        HANDLERS[vcs][method] = f
-        return f
-    return decorate
-
-
-def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False):
-    assert isinstance(commands, list)
-    p = None
-    for c in commands:
-        try:
-            dispcmd = str([c] + args)
-            # remember shell=False, so use git.cmd on windows, not just git
-            p = subprocess.Popen([c] + args, cwd=cwd, stdout=subprocess.PIPE,
-                                 stderr=(subprocess.PIPE if hide_stderr
-                                         else None))
-            break
-        except EnvironmentError:
-            e = sys.exc_info()[1]
-            if e.errno == errno.ENOENT:
-                continue
-            if verbose:
-                print("unable to run %s" % dispcmd)
-                print(e)
-            return None
-    else:
-        if verbose:
-            print("unable to find command, tried %s" % (commands,))
-        return None
-    stdout = p.communicate()[0].strip()
-    if sys.version_info[0] >= 3:
-        stdout = stdout.decode()
-    if p.returncode != 0:
-        if verbose:
-            print("unable to run %s (error)" % dispcmd)
-        return None
-    return stdout
-
-
-def versions_from_parentdir(parentdir_prefix, root, verbose):
-    # Source tarballs conventionally unpack into a directory that includes
-    # both the project name and a version string.
-    dirname = os.path.basename(root)
-    if not dirname.startswith(parentdir_prefix):
-        if verbose:
-            print("guessing rootdir is '%s', but '%s' doesn't start with "
-                  "prefix '%s'" % (root, dirname, parentdir_prefix))
-        raise NotThisMethod("rootdir doesn't start with parentdir_prefix")
-    return {"version": dirname[len(parentdir_prefix):],
-            "full-revisionid": None,
-            "dirty": False, "error": None}
-
-
-@register_vcs_handler("git", "get_keywords")
-def git_get_keywords(versionfile_abs):
-    # the code embedded in _version.py can just fetch the value of these
-    # keywords. When used from setup.py, we don't want to import _version.py,
-    # so we do it with a regexp instead. This function is not used from
-    # _version.py.
-    keywords = {}
-    try:
-        f = open(versionfile_abs, "r")
-        for line in f.readlines():
-            if line.strip().startswith("git_refnames ="):
-                mo = re.search(r'=\s*"(.*)"', line)
-                if mo:
-                    keywords["refnames"] = mo.group(1)
-            if line.strip().startswith("git_full ="):
-                mo = re.search(r'=\s*"(.*)"', line)
-                if mo:
-                    keywords["full"] = mo.group(1)
-        f.close()
-    except EnvironmentError:
-        pass
-    return keywords
-
-
-@register_vcs_handler("git", "keywords")
-def git_versions_from_keywords(keywords, tag_prefix, verbose):
-    if not keywords:
-        raise NotThisMethod("no keywords at all, weird")
-    refnames = keywords["refnames"].strip()
-    if refnames.startswith("$Format"):
-        if verbose:
-            print("keywords are unexpanded, not using")
-        raise NotThisMethod("unexpanded keywords, not a git-archive tarball")
-    refs = set([r.strip() for r in refnames.strip("()").split(",")])
-    # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of
-    # just "foo-1.0". If we see a "tag: " prefix, prefer those.
-    TAG = "tag: "
-    tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)])
-    if not tags:
-        # Either we're using git < 1.8.3, or there really are no tags. We use
-        # a heuristic: assume all version tags have a digit. The old git %d
-        # expansion behaves like git log --decorate=short and strips out the
-        # refs/heads/ and refs/tags/ prefixes that would let us distinguish
-        # between branches and tags. By ignoring refnames without digits, we
-        # filter out many common branch names like "release" and
-        # "stabilization", as well as "HEAD" and "master".
-        tags = set([r for r in refs if re.search(r'\d', r)])
-        if verbose:
-            print("discarding '%s', no digits" % ",".join(refs-tags))
-    if verbose:
-        print("likely tags: %s" % ",".join(sorted(tags)))
-    for ref in sorted(tags):
-        # sorting will prefer e.g. "2.0" over "2.0rc1"
-        if ref.startswith(tag_prefix):
-            r = ref[len(tag_prefix):]
-            if verbose:
-                print("picking %s" % r)
-            return {"version": r,
-                    "full-revisionid": keywords["full"].strip(),
-                    "dirty": False, "error": None
-                    }
-    # no suitable tags, so version is "0+unknown", but full hex is still there
-    if verbose:
-        print("no suitable tags, using unknown + full revision id")
-    return {"version": "0+unknown",
-            "full-revisionid": keywords["full"].strip(),
-            "dirty": False, "error": "no suitable tags"}
-
-
-@register_vcs_handler("git", "pieces_from_vcs")
-def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
-    # this runs 'git' from the root of the source tree. This only gets called
-    # if the git-archive 'subst' keywords were *not* expanded, and
-    # _version.py hasn't already been rewritten with a short version string,
-    # meaning we're inside a checked out source tree.
-
-    if not os.path.exists(os.path.join(root, ".git")):
-        if verbose:
-            print("no .git in %s" % root)
-        raise NotThisMethod("no .git directory")
-
-    GITS = ["git"]
-    if sys.platform == "win32":
-        GITS = ["git.cmd", "git.exe"]
-    # if there is a tag, this yields TAG-NUM-gHEX[-dirty]
-    # if there are no tags, this yields HEX[-dirty] (no NUM)
-    describe_out = run_command(GITS, ["describe", "--tags", "--dirty",
-                                      "--always", "--long"],
-                               cwd=root)
-    # --long was added in git-1.5.5
-    if describe_out is None:
-        raise NotThisMethod("'git describe' failed")
-    describe_out = describe_out.strip()
-    full_out = run_command(GITS, ["rev-parse", "HEAD"], cwd=root)
-    if full_out is None:
-        raise NotThisMethod("'git rev-parse' failed")
-    full_out = full_out.strip()
-
-    pieces = {}
-    pieces["long"] = full_out
-    pieces["short"] = full_out[:7]  # maybe improved later
-    pieces["error"] = None
-
-    # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty]
-    # TAG might have hyphens.
-    git_describe = describe_out
-
-    # look for -dirty suffix
-    dirty = git_describe.endswith("-dirty")
-    pieces["dirty"] = dirty
-    if dirty:
-        git_describe = git_describe[:git_describe.rindex("-dirty")]
-
-    # now we have TAG-NUM-gHEX or HEX
-
-    if "-" in git_describe:
-        # TAG-NUM-gHEX
-        mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe)
-        if not mo:
-            # unparsable. Maybe git-describe is misbehaving?
-            pieces["error"] = ("unable to parse git-describe output: '%s'"
-                               % describe_out)
-            return pieces
-
-        # tag
-        full_tag = mo.group(1)
-        if not full_tag.startswith(tag_prefix):
-            if verbose:
-                fmt = "tag '%s' doesn't start with prefix '%s'"
-                print(fmt % (full_tag, tag_prefix))
-            pieces["error"] = ("tag '%s' doesn't start with prefix '%s'"
-                               % (full_tag, tag_prefix))
-            return pieces
-        pieces["closest-tag"] = full_tag[len(tag_prefix):]
-
-        # distance: number of commits since tag
-        pieces["distance"] = int(mo.group(2))
-
-        # commit: short hex revision ID
-        pieces["short"] = mo.group(3)
-
-    else:
-        # HEX: no tags
-        pieces["closest-tag"] = None
-        count_out = run_command(GITS, ["rev-list", "HEAD", "--count"],
-                                cwd=root)
-        pieces["distance"] = int(count_out)  # total number of commits
-
-    return pieces
-
-
-def plus_or_dot(pieces):
-    if "+" in pieces.get("closest-tag", ""):
-        return "."
-    return "+"
-
-
-def render_pep440(pieces):
-    # now build up version string, with post-release "local version
-    # identifier". Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you
-    # get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty
-
-    # exceptions:
-    # 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty]
-
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"] or pieces["dirty"]:
-            rendered += plus_or_dot(pieces)
-            rendered += "%d.g%s" % (pieces["distance"], pieces["short"])
-            if pieces["dirty"]:
-                rendered += ".dirty"
-    else:
-        # exception #1
-        rendered = "0+untagged.%d.g%s" % (pieces["distance"],
-                                          pieces["short"])
-        if pieces["dirty"]:
-            rendered += ".dirty"
-    return rendered
-
-
-def render_pep440_pre(pieces):
-    # TAG[.post.devDISTANCE] . No -dirty
-
-    # exceptions:
-    # 1: no tags. 0.post.devDISTANCE
-
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"]:
-            rendered += ".post.dev%d" % pieces["distance"]
-    else:
-        # exception #1
-        rendered = "0.post.dev%d" % pieces["distance"]
-    return rendered
-
-
-def render_pep440_post(pieces):
-    # TAG[.postDISTANCE[.dev0]+gHEX] . The ".dev0" means dirty. Note that
-    # .dev0 sorts backwards (a dirty tree will appear "older" than the
-    # corresponding clean one), but you shouldn't be releasing software with
-    # -dirty anyways.
-
-    # exceptions:
-    # 1: no tags. 0.postDISTANCE[.dev0]
-
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"] or pieces["dirty"]:
-            rendered += ".post%d" % pieces["distance"]
-            if pieces["dirty"]:
-                rendered += ".dev0"
-            rendered += plus_or_dot(pieces)
-            rendered += "g%s" % pieces["short"]
-    else:
-        # exception #1
-        rendered = "0.post%d" % pieces["distance"]
-        if pieces["dirty"]:
-            rendered += ".dev0"
-        rendered += "+g%s" % pieces["short"]
-    return rendered
-
-
-def render_pep440_old(pieces):
-    # TAG[.postDISTANCE[.dev0]] . The ".dev0" means dirty.
-
-    # exceptions:
-    # 1: no tags. 0.postDISTANCE[.dev0]
-
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"] or pieces["dirty"]:
-            rendered += ".post%d" % pieces["distance"]
-            if pieces["dirty"]:
-                rendered += ".dev0"
-    else:
-        # exception #1
-        rendered = "0.post%d" % pieces["distance"]
-        if pieces["dirty"]:
-            rendered += ".dev0"
-    return rendered
-
-
-def render_git_describe(pieces):
-    # TAG[-DISTANCE-gHEX][-dirty], like 'git describe --tags --dirty
-    # --always'
-
-    # exceptions:
-    # 1: no tags. HEX[-dirty]  (note: no 'g' prefix)
-
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"]:
-            rendered += "-%d-g%s" % (pieces["distance"], pieces["short"])
-    else:
-        # exception #1
-        rendered = pieces["short"]
-    if pieces["dirty"]:
-        rendered += "-dirty"
-    return rendered
-
-
-def render_git_describe_long(pieces):
-    # TAG-DISTANCE-gHEX[-dirty], like 'git describe --tags --dirty
-    # --always -long'. The distance/hash is unconditional.
-
-    # exceptions:
-    # 1: no tags. HEX[-dirty]  (note: no 'g' prefix)
-
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        rendered += "-%d-g%s" % (pieces["distance"], pieces["short"])
-    else:
-        # exception #1
-        rendered = pieces["short"]
-    if pieces["dirty"]:
-        rendered += "-dirty"
-    return rendered
-
-
-def render(pieces, style):
-    if pieces["error"]:
-        return {"version": "unknown",
-                "full-revisionid": pieces.get("long"),
-                "dirty": None,
-                "error": pieces["error"]}
-
-    if not style or style == "default":
-        style = "pep440"  # the default
-
-    if style == "pep440":
-        rendered = render_pep440(pieces)
-    elif style == "pep440-pre":
-        rendered = render_pep440_pre(pieces)
-    elif style == "pep440-post":
-        rendered = render_pep440_post(pieces)
-    elif style == "pep440-old":
-        rendered = render_pep440_old(pieces)
-    elif style == "git-describe":
-        rendered = render_git_describe(pieces)
-    elif style == "git-describe-long":
-        rendered = render_git_describe_long(pieces)
-    else:
-        raise ValueError("unknown style '%s'" % style)
-
-    return {"version": rendered, "full-revisionid": pieces["long"],
-            "dirty": pieces["dirty"], "error": None}
-
-
-def get_versions():
-    # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have
-    # __file__, we can work backwards from there to the root. Some
-    # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which
-    # case we can only use expanded keywords.
-
-    cfg = get_config()
-    verbose = cfg.verbose
-
-    try:
-        return git_versions_from_keywords(get_keywords(), cfg.tag_prefix,
-                                          verbose)
-    except NotThisMethod:
-        pass
-
-    try:
-        root = os.path.realpath(__file__)
-        # versionfile_source is the relative path from the top of the source
-        # tree (where the .git directory might live) to this file. Invert
-        # this to find the root from __file__.
-        for _ in cfg.versionfile_source.split('/'):
-            root = os.path.dirname(root)
-    except NameError:
-        return {"version": "0+unknown", "full-revisionid": None,
-                "dirty": None,
-                "error": "unable to find root of source tree"}
-
-    try:
-        pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose)
-        return render(pieces, cfg.style)
-    except NotThisMethod:
-        pass
-
-    try:
-        if cfg.parentdir_prefix:
-            return versions_from_parentdir(cfg.parentdir_prefix, root, verbose)
-    except NotThisMethod:
-        pass
-
-    return {"version": "0+unknown", "full-revisionid": None,
-            "dirty": None,
-            "error": "unable to compute version"}
diff --git a/lib/matplotlib/afm.py b/lib/matplotlib/afm.py
index 0106664f5ccc..d95c88a0e2b4 100644
--- a/lib/matplotlib/afm.py
+++ b/lib/matplotlib/afm.py
@@ -1,532 +1,3 @@
-"""
-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
-either:
-
-1) copyrighted or used a non-BSD compatible license
-2) had too many dependencies and a free standing lib was needed
-3) did more than needed and it was easier to write afresh rather than
-   figure out how to get just what was needed.
-
-It is pretty easy to use, and has no external dependencies:
-
->>> import matplotlib as mpl
->>> from pathlib import Path
->>> afm_path = Path(mpl.get_data_path(), 'fonts', 'afm', 'ptmr8a.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
-being used.
-"""
-
-from collections import namedtuple
-import logging
-import re
-
-from ._mathtext_data import uni2type1
-
-
-_log = logging.getLogger(__name__)
-
-
-def _to_int(x):
-    # Some AFM files have floats where we are expecting ints -- there is
-    # probably a better way to handle this (support floats, round rather than
-    # truncate).  But I don't know what the best approach is now and this
-    # change to _to_int should at least prevent Matplotlib from crashing on
-    # these.  JDH (2009-11-06)
-    return int(float(x))
-
-
-def _to_float(x):
-    # Some AFM files use "," instead of "." as decimal separator -- this
-    # shouldn't be ambiguous (unless someone is wicked enough to use "," as
-    # thousands separator...).
-    if isinstance(x, bytes):
-        # Encoding doesn't really matter -- if we have codepoints >127 the call
-        # to float() will error anyways.
-        x = x.decode('latin-1')
-    return float(x.replace(',', '.'))
-
-
-def _to_str(x):
-    return x.decode('utf8')
-
-
-def _to_list_of_ints(s):
-    s = s.replace(b',', b' ')
-    return [_to_int(val) for val in s.split()]
-
-
-def _to_list_of_floats(s):
-    return [_to_float(val) for val in s.split()]
-
-
-def _to_bool(s):
-    if s.lower().strip() in (b'false', b'0', b'no'):
-        return False
-    else:
-        return True
-
-
-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.:
-
-        * 'False'->False
-        * '0'->0
-        * '-168 -218 1000 898'-> [-168, -218, 1000, 898]
-
-    Dictionary keys are
-
-      StartFontMetrics, FontName, FullName, FamilyName, Weight,
-      ItalicAngle, IsFixedPitch, FontBBox, UnderlinePosition,
-      UnderlineThickness, Version, Notice, EncodingScheme, CapHeight,
-      XHeight, Ascender, Descender, StartCharMetrics
-    """
-    header_converters = {
-        b'StartFontMetrics': _to_float,
-        b'FontName': _to_str,
-        b'FullName': _to_str,
-        b'FamilyName': _to_str,
-        b'Weight': _to_str,
-        b'ItalicAngle': _to_float,
-        b'IsFixedPitch': _to_bool,
-        b'FontBBox': _to_list_of_ints,
-        b'UnderlinePosition': _to_float,
-        b'UnderlineThickness': _to_float,
-        b'Version': _to_str,
-        # Some AFM files have non-ASCII characters (which are not allowed by
-        # the spec).  Given that there is actually no public API to even access
-        # this field, just return it as straight bytes.
-        b'Notice': lambda x: x,
-        b'EncodingScheme': _to_str,
-        b'CapHeight': _to_float,  # Is the second version a mistake, or
-        b'Capheight': _to_float,  # do some AFM files contain 'Capheight'? -JKS
-        b'XHeight': _to_float,
-        b'Ascender': _to_float,
-        b'Descender': _to_float,
-        b'StdHW': _to_float,
-        b'StdVW': _to_float,
-        b'StartCharMetrics': _to_int,
-        b'CharacterSet': _to_str,
-        b'Characters': _to_int,
-    }
-    d = {}
-    first_line = True
-    for line in fh:
-        line = line.rstrip()
-        if line.startswith(b'Comment'):
-            continue
-        lst = line.split(b' ', 1)
-        key = lst[0]
-        if first_line:
-            # AFM spec, Section 4: The StartFontMetrics keyword
-            # [followed by a version number] must be the first line in
-            # the file, and the EndFontMetrics keyword must be the
-            # last non-empty line in the file.  We just check the
-            # first header entry.
-            if key != b'StartFontMetrics':
-                raise RuntimeError('Not an AFM file')
-            first_line = False
-        if len(lst) == 2:
-            val = lst[1]
-        else:
-            val = b''
-        try:
-            converter = header_converters[key]
-        except KeyError:
-            _log.error('Found an unknown keyword in AFM header (was %r)' % key)
-            continue
-        try:
-            d[key] = converter(val)
-        except ValueError:
-            _log.error('Value error parsing header in AFM: %s, %s', key, val)
-            continue
-        if key == b'StartCharMetrics':
-            break
-    else:
-        raise RuntimeError('Bad parse')
-    return d
-
-
-CharMetrics = namedtuple('CharMetrics', 'width, name, bbox')
-CharMetrics.__doc__ = """
-    Represents the character metrics of a single character.
-
-    Notes
-    -----
-    The fields do currently only describe a subset of character metrics
-    information defined in the AFM standard.
-    """
-CharMetrics.width.__doc__ = """The character width (WX)."""
-CharMetrics.name.__doc__ = """The character name (N)."""
-CharMetrics.bbox.__doc__ = """
-    The bbox of the character (B) as a tuple (*llx*, *lly*, *urx*, *ury*)."""
-
-
-def _parse_char_metrics(fh):
-    """
-    Parse the given filehandle for character metrics information and return
-    the information as dicts.
-
-    It is assumed that the file cursor is on the line behind
-    'StartCharMetrics'.
-
-    Returns
-    -------
-    ascii_d : dict
-         A mapping "ASCII num of the character" to `.CharMetrics`.
-    name_d : dict
-         A mapping "character name" to `.CharMetrics`.
-
-    Notes
-    -----
-    This function is incomplete per the standard, but thus far parses
-    all the sample afm files tried.
-    """
-    required_keys = {'C', 'WX', 'N', 'B'}
-
-    ascii_d = {}
-    name_d = {}
-    for line in fh:
-        # We are defensively letting values be utf8. The spec requires
-        # ascii, but there are non-compliant fonts in circulation
-        line = _to_str(line.rstrip())  # Convert from byte-literal
-        if line.startswith('EndCharMetrics'):
-            return ascii_d, name_d
-        # Split the metric line into a dictionary, keyed by metric identifiers
-        vals = dict(s.strip().split(' ', 1) for s in line.split(';') if s)
-        # There may be other metrics present, but only these are needed
-        if not required_keys.issubset(vals):
-            raise RuntimeError('Bad char metrics line: %s' % line)
-        num = _to_int(vals['C'])
-        wx = _to_float(vals['WX'])
-        name = vals['N']
-        bbox = _to_list_of_floats(vals['B'])
-        bbox = list(map(int, bbox))
-        metrics = CharMetrics(wx, name, bbox)
-        # Workaround: If the character name is 'Euro', give it the
-        # corresponding character code, according to WinAnsiEncoding (see PDF
-        # Reference).
-        if name == 'Euro':
-            num = 128
-        elif name == 'minus':
-            num = ord("\N{MINUS SIGN}")  # 0x2212
-        if num != -1:
-            ascii_d[num] = metrics
-        name_d[name] = metrics
-    raise RuntimeError('Bad parse')
-
-
-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::
-
-      d[ ('A', 'y') ] = -50
-
-    """
-
-    line = next(fh)
-    if not line.startswith(b'StartKernPairs'):
-        raise RuntimeError('Bad start of kern pairs data: %s' % line)
-
-    d = {}
-    for line in fh:
-        line = line.rstrip()
-        if not line:
-            continue
-        if line.startswith(b'EndKernPairs'):
-            next(fh)  # EndKernData
-            return d
-        vals = line.split()
-        if len(vals) != 4 or vals[0] != b'KPX':
-            raise RuntimeError('Bad kern pairs line: %s' % line)
-        c1, c2, val = _to_str(vals[1]), _to_str(vals[2]), _to_float(vals[3])
-        d[(c1, c2)] = val
-    raise RuntimeError('Bad kern pairs parse')
-
-
-CompositePart = namedtuple('CompositePart', 'name, dx, dy')
-CompositePart.__doc__ = """
-    Represents the information on a composite element of a composite char."""
-CompositePart.name.__doc__ = """Name of the part, e.g. 'acute'."""
-CompositePart.dx.__doc__ = """x-displacement of the part from the origin."""
-CompositePart.dy.__doc__ = """y-displacement of the part from the origin."""
-
-
-def _parse_composites(fh):
-    """
-    Parse the given filehandle for composites information return them as a
-    dict.
-
-    It is assumed that the file cursor is on the line behind 'StartComposites'.
-
-    Returns
-    -------
-    dict
-        A dict mapping composite character names to a parts list. The parts
-        list is a list of `.CompositePart` entries describing the parts of
-        the composite.
-
-    Examples
-    --------
-    A composite definition line::
-
-      CC Aacute 2 ; PCC A 0 0 ; PCC acute 160 170 ;
-
-    will be represented as::
-
-      composites['Aacute'] = [CompositePart(name='A', dx=0, dy=0),
-                              CompositePart(name='acute', dx=160, dy=170)]
-
-    """
-    composites = {}
-    for line in fh:
-        line = line.rstrip()
-        if not line:
-            continue
-        if line.startswith(b'EndComposites'):
-            return composites
-        vals = line.split(b';')
-        cc = vals[0].split()
-        name, numParts = cc[1], _to_int(cc[2])
-        pccParts = []
-        for s in vals[1:-1]:
-            pcc = s.split()
-            part = CompositePart(pcc[1], _to_float(pcc[2]), _to_float(pcc[3]))
-            pccParts.append(part)
-        composites[name] = pccParts
-
-    raise RuntimeError('Bad composites parse')
-
-
-def _parse_optional(fh):
-    """
-    Parse the optional fields for kern pair data and composites.
-
-    Returns
-    -------
-    kern_data : dict
-        A dict containing kerning information. May be empty.
-        See `._parse_kern_pairs`.
-    composites : dict
-        A dict containing composite information. May be empty.
-        See `._parse_composites`.
-    """
-    optional = {
-        b'StartKernData': _parse_kern_pairs,
-        b'StartComposites':  _parse_composites,
-        }
-
-    d = {b'StartKernData': {},
-         b'StartComposites': {}}
-    for line in fh:
-        line = line.rstrip()
-        if not line:
-            continue
-        key = line.split()[0]
-
-        if key in optional:
-            d[key] = optional[key](fh)
-
-    return d[b'StartKernData'], d[b'StartComposites']
-
-
-class AFM:
-
-    def __init__(self, fh):
-        """Parse the AFM file in file object *fh*."""
-        self._header = _parse_header(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):
-            return 0, 0, 0, 0, 0
-        total_width = 0
-        namelast = None
-        miny = 1e9
-        maxy = 0
-        left = 0
-        if not isinstance(s, str):
-            s = _to_str(s)
-        for c in s:
-            if c == '\n':
-                continue
-            name = uni2type1.get(ord(c), f"uni{ord(c):04X}")
-            try:
-                wx, _, bbox = self._metrics_by_name[name]
-            except KeyError:
-                name = 'question'
-                wx, _, bbox = self._metrics_by_name[name]
-            total_width += wx + self._kern.get((namelast, name), 0)
-            l, b, w, h = bbox
-            left = min(left, l)
-            miny = min(miny, b)
-            maxy = max(maxy, b + h)
-
-            namelast = name
-
-        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_width_char(self, c, isord=False):
-        """
-        Get the width of the character from the character metric WX field.
-        """
-        if not isord:
-            c = ord(c)
-        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 self._kern.get((name1, name2), 0)
-
-    def get_fontname(self):
-        """Return the font name, e.g., 'Times-Roman'."""
-        return self._header[b'FontName']
-
-    @property
-    def postscript_name(self):  # For consistency with FT2Font.
-        return self.get_fontname()
-
-    def get_fullname(self):
-        """Return the font full name, e.g., 'Times-Roman'."""
-        name = self._header.get(b'FullName')
-        if name is None:  # use FontName as a substitute
-            name = self._header[b'FontName']
-        return name
-
-    def get_familyname(self):
-        """Return the font family name, e.g., 'Times'."""
-        name = self._header.get(b'FamilyName')
-        if name is not None:
-            return name
-
-        # FamilyName not specified so we'll make a guess
-        name = self.get_fullname()
-        extras = (r'(?i)([ -](regular|plain|italic|oblique|bold|semibold|'
-                  r'light|ultralight|extra|condensed))+$')
-        return re.sub(extras, '', name)
-
-    @property
-    def family_name(self):
-        """The font family name, e.g., 'Times'."""
-        return self.get_familyname()
-
-    def get_weight(self):
-        """Return the font weight, e.g., 'Bold' or 'Roman'."""
-        return self._header[b'Weight']
-
-    def get_angle(self):
-        """Return the fontangle as float."""
-        return self._header[b'ItalicAngle']
-
-    def get_capheight(self):
-        """Return the cap height as float."""
-        return self._header[b'CapHeight']
-
-    def get_xheight(self):
-        """Return the xheight as float."""
-        return self._header[b'XHeight']
-
-    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)
+from matplotlib._afm import *  # noqa: F401, F403
+from matplotlib import _api
+_api.warn_deprecated("3.6", name=__name__, obj_type="module")
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
index af9b9b82b3e0..6f6aede7ecbc 100644
--- a/lib/matplotlib/animation.py
+++ b/lib/matplotlib/animation.py
@@ -1,7 +1,8 @@
 # TODO:
 # * Documentation -- this will need a new section of the User's Guide.
 #      Both for Animations and just timers.
-#   - Also need to update http://www.scipy.org/Cookbook/Matplotlib/Animations
+#   - Also need to update
+#     https://scipy-cookbook.readthedocs.io/items/Matplotlib_Animations.html
 # * Blit
 #   * Currently broken with Qt4 for widgets that don't start on screen
 #   * Still a few edge cases that aren't working correctly
@@ -16,6 +17,7 @@
 #   * Can blit be enabled for movies?
 # * Need to consider event sources to allow clicking through multiple figures
 
+
 import abc
 import base64
 import contextlib
@@ -42,21 +44,16 @@
 _log = logging.getLogger(__name__)
 
 # Process creation flag for subprocess to prevent it raising a terminal
-# window. See for example:
-# https://stackoverflow.com/questions/24130623/using-python-subprocess-popen-cant-prevent-exe-stopped-working-prompt
-if sys.platform == 'win32':
-    subprocess_creation_flags = CREATE_NO_WINDOW = 0x08000000
-else:
-    # Apparently None won't work here
-    subprocess_creation_flags = 0
+# window. See for example https://stackoverflow.com/q/24130623/
+subprocess_creation_flags = (
+    subprocess.CREATE_NO_WINDOW if sys.platform == 'win32' else 0)
 
 # Other potential writing methods:
 # * http://pymedia.org/
 # * libming (produces swf) python wrappers: https://github.com/libming/libming
 # * Wrap x264 API:
 
-# (http://stackoverflow.com/questions/2940671/
-# how-to-encode-series-of-images-into-h264-using-x264-api-c-c )
+# (https://stackoverflow.com/q/2940671/)
 
 
 def adjusted_figsize(w, h, dpi, n):
@@ -156,19 +153,17 @@ def __getitem__(self, name):
 
 class AbstractMovieWriter(abc.ABC):
     """
-    Abstract base class for writing movies. Fundamentally, what a MovieWriter
-    does is provide is a way to grab frames by calling grab_frame().
-
-    setup() is called to start the process and finish() is called afterwards.
+    Abstract base class for writing movies, providing a way to grab frames by
+    calling `~AbstractMovieWriter.grab_frame`.
 
-    This class is set up to provide for writing movie frame data to a pipe.
-    saving() is provided as a context manager to facilitate this process as::
+    `setup` is called to start the process and `finish` is called afterwards.
+    `saving` is provided as a context manager to facilitate this process as ::
 
         with moviewriter.saving(fig, outfile='myfile.mp4', dpi=100):
             # Iterate over frames
             moviewriter.grab_frame(**savefig_kwargs)
 
-    The use of the context manager ensures that setup() and finish() are
+    The use of the context manager ensures that `setup` and `finish` are
     performed as necessary.
 
     An instance of a concrete subclass of this class can be given as the
@@ -261,9 +256,6 @@ class MovieWriter(AbstractMovieWriter):
     # stored.  Third-party writers cannot meaningfully set these as they cannot
     # extend rcParams with new keys.
 
-    exec_key = _api.deprecate_privatize_attribute("3.3")
-    args_key = _api.deprecate_privatize_attribute("3.3")
-
     # Pipe-based writers only support RGBA, but file-based ones support more
     # formats.
     supported_formats = ["rgba"]
@@ -339,29 +331,6 @@ def _run(self):
 
     def finish(self):
         """Finish any processing for writing the movie."""
-        overridden_cleanup = _api.deprecate_method_override(
-            __class__.cleanup, self, since="3.4", alternative="finish()")
-        if overridden_cleanup is not None:
-            overridden_cleanup()
-        else:
-            self._cleanup()  # Inline _cleanup() once cleanup() is removed.
-
-    def grab_frame(self, **savefig_kwargs):
-        # docstring inherited
-        _log.debug('MovieWriter.grab_frame: Grabbing frame.')
-        # Readjust the figure size in case it has been changed by the user.
-        # All frames must have the same size to save the movie correctly.
-        self.fig.set_size_inches(self._w, self._h)
-        # Save the figure data to the sink, using the frame format and dpi.
-        self.fig.savefig(self._proc.stdin, format=self.frame_format,
-                         dpi=self.dpi, **savefig_kwargs)
-
-    def _args(self):
-        """Assemble list of encoder-specific command-line arguments."""
-        return NotImplementedError("args needs to be implemented by subclass.")
-
-    def _cleanup(self):  # Inline to finish() once cleanup() is removed.
-        """Clean-up and collect the process used to write the movie file."""
         out, err = self._proc.communicate()
         # Use the encoding/errors that universal_newlines would use.
         out = TextIOWrapper(BytesIO(out)).read()
@@ -378,9 +347,19 @@ def _cleanup(self):  # Inline to finish() once cleanup() is removed.
             raise subprocess.CalledProcessError(
                 self._proc.returncode, self._proc.args, out, err)
 
-    @_api.deprecated("3.4")
-    def cleanup(self):
-        self._cleanup()
+    def grab_frame(self, **savefig_kwargs):
+        # docstring inherited
+        _log.debug('MovieWriter.grab_frame: Grabbing frame.')
+        # Readjust the figure size in case it has been changed by the user.
+        # All frames must have the same size to save the movie correctly.
+        self.fig.set_size_inches(self._w, self._h)
+        # Save the figure data to the sink, using the frame format and dpi.
+        self.fig.savefig(self._proc.stdin, format=self.frame_format,
+                         dpi=self.dpi, **savefig_kwargs)
+
+    def _args(self):
+        """Assemble list of encoder-specific command-line arguments."""
+        return NotImplementedError("args needs to be implemented by subclass.")
 
     @classmethod
     def bin_path(cls):
@@ -407,9 +386,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.frame_format = mpl.rcParams['animation.frame_format']
 
-    @_api.delete_parameter("3.3", "clear_temp")
-    def setup(self, fig, outfile, dpi=None, frame_prefix=None,
-              clear_temp=True):
+    def setup(self, fig, outfile, dpi=None, frame_prefix=None):
         """
         Setup for writing the movie file.
 
@@ -423,13 +400,10 @@ def setup(self, fig, outfile, dpi=None, frame_prefix=None,
             The dpi of the output file. This, with the figure size,
             controls the size in pixels of the resulting movie file.
         frame_prefix : str, optional
-            The filename prefix to use for temporary files.  If None (the
+            The filename prefix to use for temporary files.  If *None* (the
             default), files are written to a temporary directory which is
-            deleted by `cleanup` (regardless of the value of *clear_temp*).
-        clear_temp : bool, optional
-            If the temporary files should be deleted after stitching
-            the final result.  Setting this to ``False`` can be useful for
-            debugging.  Defaults to ``True``.
+            deleted by `cleanup`; if not *None*, no temporary files are
+            deleted.
         """
         self.fig = fig
         self.outfile = outfile
@@ -444,7 +418,6 @@ def setup(self, fig, outfile, dpi=None, frame_prefix=None,
         else:
             self._tmpdir = None
             self.temp_prefix = frame_prefix
-        self._clear_temp = clear_temp
         self._frame_counter = 0  # used for generating sequential file names
         self._temp_paths = list()
         self.fname_format_str = '%s%%07d.%s'
@@ -453,15 +426,6 @@ def __del__(self):
         if self._tmpdir:
             self._tmpdir.cleanup()
 
-    @_api.deprecated("3.3")
-    @property
-    def clear_temp(self):
-        return self._clear_temp
-
-    @clear_temp.setter
-    def clear_temp(self, value):
-        self._clear_temp = value
-
     @property
     def frame_format(self):
         """
@@ -488,10 +452,9 @@ def _base_temp_name(self):
 
     def grab_frame(self, **savefig_kwargs):
         # docstring inherited
-        # Overloaded to explicitly close temp file.
         # Creates a filename for saving using basename and counter.
         path = Path(self._base_temp_name() % self._frame_counter)
-        self._temp_paths.append(path)  # Record the filename for later cleanup.
+        self._temp_paths.append(path)  # Record the filename for later use.
         self._frame_counter += 1  # Ensures each created name is unique.
         _log.debug('FileMovieWriter.grab_frame: Grabbing frame %d to path=%s',
                    self._frame_counter, path)
@@ -502,20 +465,15 @@ def grab_frame(self, **savefig_kwargs):
     def finish(self):
         # Call run here now that all frame grabbing is done. All temp files
         # are available to be assembled.
-        self._run()
-        super().finish()  # Will call clean-up
-
-    def _cleanup(self):  # Inline to finish() once cleanup() is removed.
-        super()._cleanup()
-        if self._tmpdir:
-            _log.debug('MovieWriter: clearing temporary path=%s', self._tmpdir)
-            self._tmpdir.cleanup()
-        else:
-            if self._clear_temp:
-                _log.debug('MovieWriter: clearing temporary paths=%s',
-                           self._temp_paths)
-                for path in self._temp_paths:
-                    path.unlink()
+        try:
+            self._run()
+            super().finish()
+        finally:
+            if self._tmpdir:
+                _log.debug(
+                    'MovieWriter: clearing temporary path=%s', self._tmpdir
+                )
+                self._tmpdir.cleanup()
 
 
 @writers.register('pillow')
@@ -532,7 +490,6 @@ def grab_frame(self, **savefig_kwargs):
         buf = BytesIO()
         self.fig.savefig(
             buf, **{**savefig_kwargs, "format": "rgba", "dpi": self.dpi})
-        renderer = self.fig.canvas.get_renderer()
         self._frames.append(Image.frombuffer(
             "RGBA", self.frame_size, buf.getbuffer(), "raw", "RGBA", 0, 1))
 
@@ -548,8 +505,8 @@ class FFMpegBase:
     """
     Mixin class for FFMpeg output.
 
-    To be useful this must be multiply-inherited from with a
-    `MovieWriterBase` sub-class.
+    This is a base class for the concrete `FFMpegWriter` and `FFMpegFileWriter`
+    classes.
     """
 
     _exec_key = 'animation.ffmpeg_path'
@@ -583,17 +540,6 @@ def output_args(self):
 
         return args + ['-y', self.outfile]
 
-    @classmethod
-    def isAvailable(cls):
-        return (
-            super().isAvailable()
-            # Ubuntu 12.04 ships a broken ffmpeg binary which we shouldn't use.
-            # NOTE: when removed, remove the same method in AVConvBase.
-            and b'LibAv' not in subprocess.run(
-                [cls.bin_path()], creationflags=subprocess_creation_flags,
-                stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL,
-                stderr=subprocess.PIPE).stderr)
-
 
 # Combine FFMpeg options with pipe-based writing
 @writers.register('ffmpeg')
@@ -652,67 +598,47 @@ def _args(self):
         return [self.bin_path(), *args, *self.output_args]
 
 
-# Base class of avconv information.  AVConv has identical arguments to FFMpeg.
-@_api.deprecated('3.3')
-class AVConvBase(FFMpegBase):
-    """
-    Mixin class for avconv output.
-
-    To be useful this must be multiply-inherited from with a
-    `MovieWriterBase` sub-class.
-    """
-
-    _exec_key = 'animation.avconv_path'
-    _args_key = 'animation.avconv_args'
-
-    # NOTE : should be removed when the same method is removed in FFMpegBase.
-    isAvailable = classmethod(MovieWriter.isAvailable.__func__)
-
-
-# Combine AVConv options with pipe-based writing
-@writers.register('avconv')
-class AVConvWriter(AVConvBase, FFMpegWriter):
-    """
-    Pipe-based avconv writer.
-
-    Frames are streamed directly to avconv via a pipe and written in a single
-    pass.
-    """
-
-
-# Combine AVConv options with file-based writing
-@writers.register('avconv_file')
-class AVConvFileWriter(AVConvBase, FFMpegFileWriter):
-    """
-    File-based avconv writer.
-
-    Frames are written to temporary files on disk and then stitched
-    together at the end.
-    """
-
-
 # Base class for animated GIFs with ImageMagick
 class ImageMagickBase:
     """
     Mixin class for ImageMagick output.
 
-    To be useful this must be multiply-inherited from with a
-    `MovieWriterBase` sub-class.
+    This is a base class for the concrete `ImageMagickWriter` and
+    `ImageMagickFileWriter` classes, which define an ``input_names`` attribute
+    (or property) specifying the input names passed to ImageMagick.
     """
 
     _exec_key = 'animation.convert_path'
     _args_key = 'animation.convert_args'
 
+    @_api.deprecated("3.6")
     @property
     def delay(self):
         return 100. / self.fps
 
+    @_api.deprecated("3.6")
     @property
     def output_args(self):
         extra_args = (self.extra_args if self.extra_args is not None
                       else mpl.rcParams[self._args_key])
         return [*extra_args, self.outfile]
 
+    def _args(self):
+        # ImageMagick does not recognize "raw".
+        fmt = "rgba" if self.frame_format == "raw" else self.frame_format
+        extra_args = (self.extra_args if self.extra_args is not None
+                      else mpl.rcParams[self._args_key])
+        return [
+            self.bin_path(),
+            "-size", "%ix%i" % self.frame_size,
+            "-depth", "8",
+            "-delay", str(100 / self.fps),
+            "-loop", "0",
+            f"{fmt}:{self.input_names}",
+            *extra_args,
+            self.outfile,
+        ]
+
     @classmethod
     def bin_path(cls):
         binpath = super().bin_path()
@@ -734,18 +660,13 @@ def isAvailable(cls):
 @writers.register('imagemagick')
 class ImageMagickWriter(ImageMagickBase, MovieWriter):
     """
-    Pipe-based animated gif.
+    Pipe-based animated gif writer.
 
     Frames are streamed directly to ImageMagick via a pipe and written
     in a single pass.
-
     """
-    def _args(self):
-        return ([self.bin_path(),
-                 '-size', '%ix%i' % self.frame_size, '-depth', '8',
-                 '-delay', str(self.delay), '-loop', '0',
-                 '%s:-' % self.frame_format]
-                + self.output_args)
+
+    input_names = "-"  # stdin
 
 
 # Combine ImageMagick options with temp file-based writing
@@ -759,15 +680,8 @@ class ImageMagickFileWriter(ImageMagickBase, FileMovieWriter):
     """
 
     supported_formats = ['png', 'jpeg', 'tiff', 'raw', 'rgba']
-
-    def _args(self):
-        # Force format: ImageMagick does not recognize 'raw'.
-        fmt = 'rgba:' if self.frame_format == 'raw' else ''
-        return ([self.bin_path(),
-                 '-size', '%ix%i' % self.frame_size, '-depth', '8',
-                 '-delay', str(self.delay), '-loop', '0',
-                 '%s%s*.%s' % (fmt, self.temp_prefix, self.frame_format)]
-                + self.output_args)
+    input_names = property(
+        lambda self: f'{self.temp_prefix}*.{self.frame_format}')
 
 
 # Taken directly from jakevdp's JSAnimation package at
@@ -795,8 +709,6 @@ class HTMLWriter(FileMovieWriter):
     """Writer for JavaScript-based HTML movies."""
 
     supported_formats = ['png', 'jpeg', 'tiff', 'svg']
-    args_key = _api.deprecated("3.3")(property(
-        lambda self: 'animation.html_args'))
 
     @classmethod
     def isAvailable(cls):
@@ -824,7 +736,7 @@ def __init__(self, fps=30, codec=None, bitrate=None, extra_args=None,
 
         super().__init__(fps, codec, bitrate, extra_args, metadata)
 
-    def setup(self, fig, outfile, dpi, frame_dir=None):
+    def setup(self, fig, outfile, dpi=None, frame_dir=None):
         outfile = Path(outfile)
         _api.check_in_list(['.html', '.htm'], outfile_extension=outfile.suffix)
 
@@ -893,19 +805,13 @@ def finish(self):
 
         # duplicate the temporary file clean up logic from
         # FileMovieWriter.cleanup.  We can not call the inherited
-        # versions of finished or cleanup because both assume that
+        # versions of finish or cleanup because both assume that
         # there is a subprocess that we either need to call to merge
         # many frames together or that there is a subprocess call that
         # we need to clean up.
         if self._tmpdir:
             _log.debug('MovieWriter: clearing temporary path=%s', self._tmpdir)
             self._tmpdir.cleanup()
-        else:
-            if self._clear_temp:
-                _log.debug('MovieWriter: clearing temporary paths=%s',
-                           self._temp_paths)
-                for path in self._temp_paths:
-                    path.unlink()
 
 
 class Animation:
@@ -972,9 +878,11 @@ def __del__(self):
         if not getattr(self, '_draw_was_started', True):
             warnings.warn(
                 'Animation was deleted without rendering anything. This is '
-                'most likely unintended. To prevent deletion, assign the '
-                'Animation to a variable that exists for as long as you need '
-                'the Animation.')
+                'most likely not intended. To prevent deletion, assign the '
+                'Animation to a variable, e.g. `anim`, that exists until you '
+                'output the Animation using `plt.show()` or '
+                '`anim.save()`.'
+            )
 
     def _start(self, *args):
         """
@@ -1238,11 +1146,11 @@ def _blit_draw(self, artists):
         # Handles blitted drawing, which renders only the artists given instead
         # of the entire figure.
         updated_ax = {a.axes for a in artists}
-        # Enumerate artists to cache axes' backgrounds. We do not draw
+        # Enumerate artists to cache Axes backgrounds. We do not draw
         # artists yet to not cache foreground from plots with shared axes
         for ax in updated_ax:
             # If we haven't cached the background for the current view of this
-            # axes object, do so now. This might not always be reliable, but
+            # Axes object, do so now. This might not always be reliable, but
             # it's an attempt to automate the process.
             cur_view = ax._get_view()
             view, bg = self._blit_cache.get(ax, (object(), None))
@@ -1252,12 +1160,12 @@ def _blit_draw(self, artists):
         # Make a separate pass to draw foreground.
         for a in artists:
             a.axes.draw_artist(a)
-        # After rendering all the needed artists, blit each axes individually.
+        # After rendering all the needed artists, blit each Axes individually.
         for ax in updated_ax:
             ax.figure.canvas.blit(ax.bbox)
 
     def _blit_clear(self, artists):
-        # Get a list of the axes that need clearing from the artists that
+        # Get a list of the Axes that need clearing from the artists that
         # have been drawn. Grab the appropriate saved background from the
         # cache and restore.
         axes = {a.axes for a in artists}
@@ -1272,13 +1180,19 @@ def _blit_clear(self, artists):
                 self._blit_cache.pop(ax)
 
     def _setup_blit(self):
-        # Setting up the blit requires: a cache of the background for the
-        # axes
+        # Setting up the blit requires: a cache of the background for the Axes
         self._blit_cache = dict()
         self._drawn_artists = []
+        # _post_draw needs to be called first to initialize the renderer
+        self._post_draw(None, self._blit)
+        # Then we need to clear the Frame for the initial draw
+        # This is typically handled in _on_resize because QT and Tk
+        # emit a resize event on launch, but the macosx backend does not,
+        # thus we force it here for everyone for consistency
+        self._init_draw()
+        # Connect to future resize events
         self._resize_id = self._fig.canvas.mpl_connect('resize_event',
                                                        self._on_resize)
-        self._post_draw(None, self._blit)
 
     def _on_resize(self, event):
         # On resize, we need to disable the resize event handling so we don't
@@ -1381,7 +1295,20 @@ def to_html5_video(self, embed_limit=None):
             return 'Video too large to embed.'
 
     def to_jshtml(self, fps=None, embed_frames=True, default_mode=None):
-        """Generate HTML representation of the animation"""
+        """
+        Generate HTML representation of the animation.
+
+        Parameters
+        ----------
+        fps : int, optional
+            Movie frame rate (per second). If not set, the frame rate from
+            the animation's frame interval.
+        embed_frames : bool, optional
+        default_mode : str, optional
+            What to do when the animation ends. Must be one of ``{'loop',
+            'once', 'reflect'}``. Defaults to ``'loop'`` if ``self.repeat``
+            is True, otherwise ``'once'``.
+        """
         if fps is None and hasattr(self, '_interval'):
             # Convert interval in ms to frames per second
             fps = 1000 / self._interval
@@ -1475,19 +1402,32 @@ def _step(self, *args):
         # delay and set the callback to one which will then set the interval
         # back.
         still_going = super()._step(*args)
-        if not still_going and self.repeat:
-            self._init_draw()
-            self.frame_seq = self.new_frame_seq()
-            self.event_source.interval = self._repeat_delay
-            return True
-        else:
-            self.event_source.interval = self._interval
-            return still_going
+        if not still_going:
+            if self.repeat:
+                # Restart the draw loop
+                self._init_draw()
+                self.frame_seq = self.new_frame_seq()
+                self.event_source.interval = self._repeat_delay
+                return True
+            else:
+                # We are done with the animation. Call pause to remove
+                # animated flags from artists that were using blitting
+                self.pause()
+                if self._blit:
+                    # Remove the resize callback if we were blitting
+                    self._fig.canvas.mpl_disconnect(self._resize_id)
+                self._fig.canvas.mpl_disconnect(self._close_id)
+                self.event_source = None
+                return False
+
+        self.event_source.interval = self._interval
+        return True
 
 
 class ArtistAnimation(TimedAnimation):
     """
-    Animation using a fixed set of `.Artist` objects.
+    `TimedAnimation` subclass that creates an animation by using a fixed
+    set of `.Artist` objects.
 
     Before creating an instance, all plotting should have taken place
     and the relevant artists saved.
@@ -1563,7 +1503,8 @@ def _draw_frame(self, artists):
 
 class FuncAnimation(TimedAnimation):
     """
-    Makes an animation by repeatedly calling a function *func*.
+    `TimedAnimation` subclass that makes an animation by repeatedly calling
+    a function *func*.
 
     .. note::
 
@@ -1579,12 +1520,24 @@ class FuncAnimation(TimedAnimation):
     func : callable
         The function to call at each frame.  The first argument will
         be the next value in *frames*.   Any additional positional
-        arguments can be supplied via the *fargs* parameter.
+        arguments can be supplied using `functools.partial` or via the *fargs*
+        parameter.
 
         The required signature is::
 
             def func(frame, *fargs) -> iterable_of_artists
 
+        It is often more convenient to provide the arguments using
+        `functools.partial`. In this way it is also possible to pass keyword
+        arguments. To pass a function with both positional and keyword
+        arguments, set all arguments as keyword arguments, just leaving the
+        *frame* argument unset::
+
+            def func(frame, art, *, y=None):
+                ...
+
+            ani = FuncAnimation(fig, partial(func, art=ln, y='foo'))
+
         If ``blit == True``, *func* must return an iterable of all artists
         that were modified or created. This information is used by the blitting
         algorithm to determine which parts of the figure have to be updated.
@@ -1623,7 +1576,8 @@ def init_func() -> iterable_of_artists
         value is unused if ``blit == False`` and may be omitted in that case.
 
     fargs : tuple or None, optional
-        Additional arguments to pass to each call to *func*.
+        Additional arguments to pass to each call to *func*. Note: the use of
+        `functools.partial` is preferred over *fargs*. See *func* for details.
 
     save_count : int, default: 100
         Fallback for the number of values from *frames* to cache. This is
@@ -1693,7 +1647,7 @@ def iter_frames(frames=frames):
             self.save_count = 100
         else:
             # itertools.islice returns an error when passed a numpy int instead
-            # of a native python int (http://bugs.python.org/issue30537).
+            # of a native python int (https://bugs.python.org/issue30537).
             # As a workaround, convert save_count to a native python int.
             self.save_count = int(self.save_count)
 
@@ -1750,8 +1704,21 @@ def _init_draw(self):
         # For blitting, the init_func should return a sequence of modified
         # artists.
         if self._init_func is None:
-            self._draw_frame(next(self.new_frame_seq()))
-
+            try:
+                frame_data = next(self.new_frame_seq())
+            except StopIteration:
+                # we can't start the iteration, it may have already been
+                # exhausted by a previous save or just be 0 length.
+                # warn and bail.
+                warnings.warn(
+                    "Can not start iterating the frames for the initial draw. "
+                    "This can be caused by passing in a 0 length sequence "
+                    "for *frames*.\n\n"
+                    "If you passed *frames* as a generator "
+                    "it may be exhausted due to a previous display or save."
+                )
+                return
+            self._draw_frame(frame_data)
         else:
             self._drawn_artists = self._init_func()
             if self._blit:
@@ -1785,7 +1752,7 @@ def _draw_frame(self, framedata):
             except TypeError:
                 raise err from None
 
-            # check each item if is artist
+            # check each item if it's artist
             for i in self._drawn_artists:
                 if not isinstance(i, mpl.artist.Artist):
                     raise err
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
index b6f13f898f50..1ca1c1d3e37e 100644
--- a/lib/matplotlib/artist.py
+++ b/lib/matplotlib/artist.py
@@ -1,6 +1,8 @@
-from collections import OrderedDict, namedtuple
-from functools import wraps
+from collections import namedtuple
+import contextlib
+from functools import lru_cache, wraps
 import inspect
+from inspect import Signature, Parameter
 import logging
 from numbers import Number
 import re
@@ -9,7 +11,9 @@
 import numpy as np
 
 import matplotlib as mpl
-from . import _api, cbook, docstring
+from . import _api, cbook
+from .colors import BoundaryNorm
+from .cm import ScalarMappable
 from .path import Path
 from .transforms import (Bbox, IdentityTransform, Transform, TransformedBbox,
                          TransformedPatchPath, TransformedPath)
@@ -26,12 +30,8 @@ def allow_rasterization(draw):
     renderer.
     """
 
-    # Axes has a second (deprecated) argument inframe for its draw method.
-    # args and kwargs are deprecated, but we don't wrap this in
-    # _api.delete_parameter for performance; the relevant deprecation
-    # warning will be emitted by the inner draw() call.
     @wraps(draw)
-    def draw_wrapper(artist, renderer, *args, **kwargs):
+    def draw_wrapper(artist, renderer):
         try:
             if artist.get_rasterized():
                 if renderer._raster_depth == 0 and not renderer._rasterizing:
@@ -48,7 +48,7 @@ def draw_wrapper(artist, renderer, *args, **kwargs):
             if artist.get_agg_filter() is not None:
                 renderer.start_filter()
 
-            return draw(artist, renderer, *args, **kwargs)
+            return draw(artist, renderer)
         finally:
             if artist.get_agg_filter() is not None:
                 renderer.stop_filter(artist.get_agg_filter())
@@ -87,6 +87,12 @@ def _stale_axes_callback(self, val):
 _XYPair = namedtuple("_XYPair", "x y")
 
 
+class _Unset:
+    def __repr__(self):
+        return "<UNSET>"
+_UNSET = _Unset()
+
+
 class Artist:
     """
     Abstract base class for objects that render into a FigureCanvas.
@@ -96,6 +102,51 @@ class Artist:
 
     zorder = 0
 
+    def __init_subclass__(cls):
+        # Inject custom set() methods into the subclass with signature and
+        # docstring based on the subclasses' properties.
+
+        if not hasattr(cls.set, '_autogenerated_signature'):
+            # Don't overwrite cls.set if the subclass or one of its parents
+            # has defined a set method set itself.
+            # If there was no explicit definition, cls.set is inherited from
+            # the hierarchy of auto-generated set methods, which hold the
+            # flag _autogenerated_signature.
+            return
+
+        cls.set = lambda self, **kwargs: Artist.set(self, **kwargs)
+        cls.set.__name__ = "set"
+        cls.set.__qualname__ = f"{cls.__qualname__}.set"
+        cls._update_set_signature_and_docstring()
+
+    _PROPERTIES_EXCLUDED_FROM_SET = [
+        'navigate_mode',  # not a user-facing function
+        'figure',         # changing the figure is such a profound operation
+                          # that we don't want this in set()
+        '3d_properties',  # cannot be used as a keyword due to leading digit
+    ]
+
+    @classmethod
+    def _update_set_signature_and_docstring(cls):
+        """
+        Update the signature of the set function to list all properties
+        as keyword arguments.
+
+        Property aliases are not listed in the signature for brevity, but
+        are still accepted as keyword arguments.
+        """
+        cls.set.__signature__ = Signature(
+            [Parameter("self", Parameter.POSITIONAL_OR_KEYWORD),
+             *[Parameter(prop, Parameter.KEYWORD_ONLY, default=_UNSET)
+               for prop in ArtistInspector(cls).get_setters()
+               if prop not in Artist._PROPERTIES_EXCLUDED_FROM_SET]])
+        cls.set._autogenerated_signature = True
+
+        cls.set.__doc__ = (
+            "Set multiple properties at once.\n\n"
+            "Supported properties are\n\n"
+            + kwdoc(cls))
+
     def __init__(self):
         self._stale = True
         self.stale_callback = None
@@ -112,13 +163,12 @@ def __init__(self):
         self._clipon = True
         self._label = ''
         self._picker = None
-        self._contains = None
         self._rasterized = False
         self._agg_filter = None
         # Normally, artist classes need to be queried for mouseover info if and
         # only if they override get_cursor_data.
         self._mouseover = type(self).get_cursor_data != Artist.get_cursor_data
-        self._callbacks = cbook.CallbackRegistry()
+        self._callbacks = cbook.CallbackRegistry(signals=["pchanged"])
         try:
             self.axes = None
         except AttributeError:
@@ -136,7 +186,7 @@ def __init__(self):
     def __getstate__(self):
         d = self.__dict__.copy()
         # remove the unpicklable remove method, this will get re-added on load
-        # (by the axes) if the artist lives on an axes.
+        # (by the Axes) if the artist lives on an Axes.
         d['stale_callback'] = None
         return d
 
@@ -166,10 +216,8 @@ def remove(self):
             if hasattr(self, 'axes') and self.axes:
                 # remove from the mouse hit list
                 self.axes._mouseover_set.discard(self)
-                # mark the axes as stale
                 self.axes.stale = True
-                # decouple the artist from the axes
-                self.axes = None
+                self.axes = None  # decouple the artist from the Axes
                 _ax_flag = True
 
             if self.figure:
@@ -188,13 +236,13 @@ def remove(self):
     def have_units(self):
         """Return whether units are set on any axis."""
         ax = self.axes
-        return ax and any(axis.have_units() for axis in ax._get_axis_list())
+        return ax and any(axis.have_units() for axis in ax._axis_map.values())
 
     def convert_xunits(self, x):
         """
         Convert *x* using the unit type of the xaxis.
 
-        If the artist is not in contained in an Axes or if the xaxis does not
+        If the artist is not contained in an Axes or if the xaxis does not
         have units, *x* itself is returned.
         """
         ax = getattr(self, 'axes', None)
@@ -206,7 +254,7 @@ def convert_yunits(self, y):
         """
         Convert *y* using the unit type of the yaxis.
 
-        If the artist is not in contained in an Axes or if the yaxis does not
+        If the artist is not contained in an Axes or if the yaxis does not
         have units, *y* itself is returned.
         """
         ax = getattr(self, 'axes', None)
@@ -251,9 +299,9 @@ def stale(self, val):
         if val and self.stale_callback is not None:
             self.stale_callback(self, val)
 
-    def get_window_extent(self, renderer):
+    def get_window_extent(self, renderer=None):
         """
-        Get the axes bounding box in display space.
+        Get the artist's bounding box in display space.
 
         The bounding box' width and height are nonnegative.
 
@@ -271,24 +319,7 @@ def get_window_extent(self, renderer):
         """
         return Bbox([[0, 0], [0, 0]])
 
-    def _get_clipping_extent_bbox(self):
-        """
-        Return a bbox with the extents of the intersection of the clip_path
-        and clip_box for this artist, or None if both of these are
-        None, or ``get_clip_on`` is False.
-        """
-        bbox = None
-        if self.get_clip_on():
-            clip_box = self.get_clip_box()
-            if clip_box is not None:
-                bbox = clip_box
-            clip_path = self.get_clip_path()
-            if clip_path is not None and bbox is not None:
-                clip_path = clip_path.get_fully_transformed_path()
-                bbox = Bbox.intersection(bbox, clip_path.get_extents())
-        return bbox
-
-    def get_tightbbox(self, renderer):
+    def get_tightbbox(self, renderer=None):
         """
         Like `.Artist.get_window_extent`, but includes any clipping.
 
@@ -309,7 +340,7 @@ def get_tightbbox(self, renderer):
             if clip_box is not None:
                 bbox = Bbox.intersection(bbox, clip_box)
             clip_path = self.get_clip_path()
-            if clip_path is not None and bbox is not None:
+            if clip_path is not None:
                 clip_path = clip_path.get_fully_transformed_path()
                 bbox = Bbox.intersection(bbox, clip_path.get_extents())
         return bbox
@@ -404,10 +435,9 @@ def _default_contains(self, mouseevent, figure=None):
         """
         Base impl. for checking whether a mouseevent happened in an artist.
 
-        1. If the artist defines a custom checker, use it (deprecated).
-        2. If the artist figure is known and the event did not occur in that
+        1. If the artist figure is known and the event did not occur in that
            figure (by checking its ``canvas`` attribute), reject it.
-        3. Otherwise, return `None, {}`, indicating that the subclass'
+        2. Otherwise, return `None, {}`, indicating that the subclass'
            implementation should be used.
 
         Subclasses should start their definition of `contains` as follows:
@@ -420,8 +450,6 @@ def _default_contains(self, mouseevent, figure=None):
         The *figure* kwarg is provided for the implementation of
         `.Figure.contains`.
         """
-        if callable(self._contains):
-            return self._contains(self, mouseevent)
         if figure is not None and mouseevent.canvas is not figure.canvas:
             return False, {}
         return None, {}
@@ -449,45 +477,6 @@ def contains(self, mouseevent):
         _log.warning("%r needs 'contains' method", self.__class__.__name__)
         return False, {}
 
-    @_api.deprecated("3.3", alternative="set_picker")
-    def set_contains(self, picker):
-        """
-        Define a custom contains test for the artist.
-
-        The provided callable replaces the default `.contains` method
-        of the artist.
-
-        Parameters
-        ----------
-        picker : callable
-            A custom picker function to evaluate if an event is within the
-            artist. The function must have the signature::
-
-                def contains(artist: Artist, event: MouseEvent) -> bool, dict
-
-            that returns:
-
-            - a bool indicating if the event is within the artist
-            - a dict of additional information. The dict should at least
-              return the same information as the default ``contains()``
-              implementation of the respective artist, but may provide
-              additional information.
-        """
-        if not callable(picker):
-            raise TypeError("picker is not a callable")
-        self._contains = picker
-
-    @_api.deprecated("3.3", alternative="get_picker")
-    def get_contains(self):
-        """
-        Return the custom contains function of the artist if set, or *None*.
-
-        See Also
-        --------
-        set_contains
-        """
-        return self._contains
-
     def pickable(self):
         """
         Return whether the artist is pickable.
@@ -509,6 +498,7 @@ def pick(self, mouseevent):
         --------
         set_picker, get_picker, pickable
         """
+        from .backend_bases import PickEvent  # Circular import.
         # Pick self
         if self.pickable():
             picker = self.get_picker()
@@ -517,18 +507,19 @@ def pick(self, mouseevent):
             else:
                 inside, prop = self.contains(mouseevent)
             if inside:
-                self.figure.canvas.pick_event(mouseevent, self, **prop)
+                PickEvent("pick_event", self.figure.canvas,
+                          mouseevent, self, **prop)._process()
 
         # Pick children
         for a in self.get_children():
-            # make sure the event happened in the same axes
+            # make sure the event happened in the same Axes
             ax = getattr(a, 'axes', None)
             if (mouseevent.inaxes is None or ax is None
                     or mouseevent.inaxes == ax):
                 # we need to check if mouseevent.inaxes is None
-                # because some objects associated with an axes (e.g., a
+                # because some objects associated with an Axes (e.g., a
                 # tick label) can be outside the bounding box of the
-                # axes and inaxes will be None
+                # Axes and inaxes will be None
                 # also check that ax is None so that it traverse objects
                 # which do no have an axes property but children might
                 a.pick(mouseevent)
@@ -684,6 +675,9 @@ def set_sketch_params(self, scale=None, length=None, randomness=None):
             The scale factor by which the length is shrunken or
             expanded (default 16.0)
 
+            The PGF backend uses this argument as an RNG seed and not as
+            described above. Using the same seed yields the same random shape.
+
             .. ACCEPTS: (scale: float, length: float, randomness: float)
         """
         if scale is None:
@@ -834,6 +828,30 @@ def get_in_layout(self):
         """
         return self._in_layout
 
+    def _fully_clipped_to_axes(self):
+        """
+        Return a boolean flag, ``True`` if the artist is clipped to the Axes
+        and can thus be skipped in layout calculations. Requires `get_clip_on`
+        is True, one of `clip_box` or `clip_path` is set, ``clip_box.extents``
+        is equivalent to ``ax.bbox.extents`` (if set), and ``clip_path._patch``
+        is equivalent to ``ax.patch`` (if set).
+        """
+        # Note that ``clip_path.get_fully_transformed_path().get_extents()``
+        # cannot be directly compared to ``axes.bbox.extents`` because the
+        # extents may be undefined (i.e. equivalent to ``Bbox.null()``)
+        # before the associated artist is drawn, and this method is meant
+        # to determine whether ``axes.get_tightbbox()`` may bypass drawing
+        clip_box = self.get_clip_box()
+        clip_path = self.get_clip_path()
+        return (self.axes is not None
+                and self.get_clip_on()
+                and (clip_box is not None or clip_path is not None)
+                and (clip_box is None
+                     or np.all(clip_box.extents == self.axes.bbox.extents))
+                and (clip_path is None
+                     or isinstance(clip_path, TransformedPatchPath)
+                     and clip_path._patch is self.axes.patch))
+
     def get_clip_on(self):
         """Return whether the artist uses clipping."""
         return self._clipon
@@ -860,7 +878,7 @@ def set_clip_on(self, b):
         """
         Set whether the artist uses clipping.
 
-        When False artists will be visible outside of the axes which
+        When False artists will be visible outside of the Axes which
         can lead to unexpected results.
 
         Parameters
@@ -919,18 +937,18 @@ def set_agg_filter(self, filter_func):
         Parameters
         ----------
         filter_func : callable
-            A filter function, which takes a (m, n, 3) float array and a dpi
-            value, and returns a (m, n, 3) array.
+            A filter function, which takes a (m, n, depth) float array
+            and a dpi value, and returns a (m, n, depth) array and two
+            offsets from the bottom left corner of the image
 
             .. ACCEPTS: a filter function, which takes a (m, n, 3) float array
-                and a dpi value, and returns a (m, n, 3) array
+                and a dpi value, and returns a (m, n, 3) array and two offsets
+                from the bottom left corner of the image
         """
         self._agg_filter = filter_func
         self.stale = True
 
-    @_api.delete_parameter("3.3", "args")
-    @_api.delete_parameter("3.3", "kwargs")
-    def draw(self, renderer, *args, **kwargs):
+    def draw(self, renderer):
         """
         Draw the Artist (and its children) using the given renderer.
 
@@ -1008,7 +1026,7 @@ def set_animated(self, b):
 
         If True, the artist is excluded from regular drawing of the figure.
         You have to call `.Figure.draw_artist` / `.Axes.draw_artist`
-        explicitly on the artist. This appoach is used to speed up animations
+        explicitly on the artist. This approach is used to speed up animations
         using blitting.
 
         See also `matplotlib.animation` and
@@ -1035,38 +1053,6 @@ def set_in_layout(self, in_layout):
         """
         self._in_layout = in_layout
 
-    def update(self, props):
-        """
-        Update this artist's properties from the dict *props*.
-
-        Parameters
-        ----------
-        props : dict
-        """
-        ret = []
-        with cbook._setattr_cm(self, eventson=False):
-            for k, v in props.items():
-                if k != k.lower():
-                    _api.warn_deprecated(
-                        "3.3", message="Case-insensitive properties were "
-                        "deprecated in %(since)s and support will be removed "
-                        "%(removal)s")
-                    k = k.lower()
-                # White list attributes we want to be able to update through
-                # art.update, art.set, setp.
-                if k == "axes":
-                    ret.append(setattr(self, k, v))
-                else:
-                    func = getattr(self, f"set_{k}", None)
-                    if not callable(func):
-                        raise AttributeError(f"{type(self).__name__!r} object "
-                                             f"has no property {k!r}")
-                    ret.append(func(v))
-        if ret:
-            self.pchanged()
-            self.stale = True
-        return ret
-
     def get_label(self):
         """Return the label used for this artist in the legend."""
         return self._label
@@ -1117,6 +1103,11 @@ def sticky_edges(self):
         where one usually expects no margin on the bottom edge (0) of the
         histogram.
 
+        Moreover, margin expansion "bumps" against sticky edges and cannot
+        cross them.  For example, if the upper data limit is 1.0, the upper
+        view limit computed by simple margin application is 1.2, but there is a
+        sticky edge at 1.1, then the actual upper view limit will be 1.1.
+
         This attribute cannot be assigned to; however, the ``x`` and ``y``
         lists can be modified in place as needed.
 
@@ -1149,34 +1140,70 @@ def properties(self):
         """Return a dictionary of all the properties of the artist."""
         return ArtistInspector(self).properties()
 
+    def _update_props(self, props, errfmt):
+        """
+        Helper for `.Artist.set` and `.Artist.update`.
+
+        *errfmt* is used to generate error messages for invalid property
+        names; it get formatted with ``type(self)`` and the property name.
+        """
+        ret = []
+        with cbook._setattr_cm(self, eventson=False):
+            for k, v in props.items():
+                # Allow attributes we want to be able to update through
+                # art.update, art.set, setp.
+                if k == "axes":
+                    ret.append(setattr(self, k, v))
+                else:
+                    func = getattr(self, f"set_{k}", None)
+                    if not callable(func):
+                        raise AttributeError(
+                            errfmt.format(cls=type(self), prop_name=k))
+                    ret.append(func(v))
+        if ret:
+            self.pchanged()
+            self.stale = True
+        return ret
+
+    def update(self, props):
+        """
+        Update this artist's properties from the dict *props*.
+
+        Parameters
+        ----------
+        props : dict
+        """
+        return self._update_props(
+            props, "{cls.__name__!r} object has no property {prop_name!r}")
+
+    def _internal_update(self, kwargs):
+        """
+        Update artist properties without prenormalizing them, but generating
+        errors as if calling `set`.
+
+        The lack of prenormalization is to maintain backcompatibility.
+        """
+        return self._update_props(
+            kwargs, "{cls.__name__}.set() got an unexpected keyword argument "
+            "{prop_name!r}")
+
     def set(self, **kwargs):
-        """A property batch setter.  Pass *kwargs* to set properties."""
-        kwargs = cbook.normalize_kwargs(kwargs, self)
-        move_color_to_start = False
-        if "color" in kwargs:
-            keys = [*kwargs]
-            i_color = keys.index("color")
-            props = ["edgecolor", "facecolor"]
-            if any(tp.__module__ == "matplotlib.collections"
-                   and tp.__name__ == "Collection"
-                   for tp in type(self).__mro__):
-                props.append("alpha")
-            for other in props:
-                if other not in keys:
-                    continue
-                i_other = keys.index(other)
-                if i_other < i_color:
-                    move_color_to_start = True
-                    _api.warn_deprecated(
-                        "3.3", message=f"You have passed the {other!r} kwarg "
-                        "before the 'color' kwarg.  Artist.set() currently "
-                        "reorders the properties to apply 'color' first, but "
-                        "this is deprecated since %(since)s and will be "
-                        "removed %(removal)s; please pass 'color' first "
-                        "instead.")
-        if move_color_to_start:
-            kwargs = {"color": kwargs.pop("color"), **kwargs}
-        return self.update(kwargs)
+        # docstring and signature are auto-generated via
+        # Artist._update_set_signature_and_docstring() at the end of the
+        # module.
+        return self._internal_update(cbook.normalize_kwargs(kwargs, self))
+
+    @contextlib.contextmanager
+    def _cm_set(self, **kwargs):
+        """
+        `.Artist.set` context-manager that restores original values at exit.
+        """
+        orig_vals = {k: getattr(self, f"get_{k}")() for k in kwargs}
+        try:
+            self.set(**kwargs)
+            yield
+        finally:
+            self.set(**orig_vals)
 
     def findobj(self, match=None, include_self=True):
         """
@@ -1262,42 +1289,96 @@ def format_cursor_data(self, data):
             method yourself.
 
         The default implementation converts ints and floats and arrays of ints
-        and floats into a comma-separated string enclosed in square brackets.
+        and floats into a comma-separated string enclosed in square brackets,
+        unless the artist has an associated colorbar, in which case scalar
+        values are formatted using the colorbar's formatter.
 
         See Also
         --------
         get_cursor_data
         """
-        try:
-            data[0]
-        except (TypeError, IndexError):
-            data = [data]
-        data_str = ', '.join('{:0.3g}'.format(item) for item in data
-                             if isinstance(item, Number))
-        return "[" + data_str + "]"
+        if np.ndim(data) == 0 and isinstance(self, ScalarMappable):
+            # This block logically belongs to ScalarMappable, but can't be
+            # implemented in it because most ScalarMappable subclasses inherit
+            # from Artist first and from ScalarMappable second, so
+            # Artist.format_cursor_data would always have precedence over
+            # ScalarMappable.format_cursor_data.
+            n = self.cmap.N
+            if np.ma.getmask(data):
+                return "[]"
+            normed = self.norm(data)
+            if np.isfinite(normed):
+                if isinstance(self.norm, BoundaryNorm):
+                    # not an invertible normalization mapping
+                    cur_idx = np.argmin(np.abs(self.norm.boundaries - data))
+                    neigh_idx = max(0, cur_idx - 1)
+                    # use max diff to prevent delta == 0
+                    delta = np.diff(
+                        self.norm.boundaries[neigh_idx:cur_idx + 2]
+                    ).max()
 
-    @property
-    def mouseover(self):
-        """
-        If this property is set to *True*, the artist will be queried for
-        custom context information when the mouse cursor moves over it.
+                else:
+                    # Midpoints of neighboring color intervals.
+                    neighbors = self.norm.inverse(
+                        (int(normed * n) + np.array([0, 1])) / n)
+                    delta = abs(neighbors - data).max()
+                g_sig_digits = cbook._g_sig_digits(data, delta)
+            else:
+                g_sig_digits = 3  # Consistent with default below.
+            return "[{:-#.{}g}]".format(data, g_sig_digits)
+        else:
+            try:
+                data[0]
+            except (TypeError, IndexError):
+                data = [data]
+            data_str = ', '.join('{:0.3g}'.format(item) for item in data
+                                 if isinstance(item, Number))
+            return "[" + data_str + "]"
 
-        See also :meth:`get_cursor_data`, :class:`.ToolCursorPosition` and
-        :class:`.NavigationToolbar2`.
+    def get_mouseover(self):
+        """
+        Return whether this artist is queried for custom context information
+        when the mouse cursor moves over it.
         """
         return self._mouseover
 
-    @mouseover.setter
-    def mouseover(self, val):
-        val = bool(val)
-        self._mouseover = val
+    def set_mouseover(self, mouseover):
+        """
+        Set whether this artist is queried for custom context information when
+        the mouse cursor moves over it.
+
+        Parameters
+        ----------
+        mouseover : bool
+
+        See Also
+        --------
+        get_cursor_data
+        .ToolCursorPosition
+        .NavigationToolbar2
+        """
+        self._mouseover = bool(mouseover)
         ax = self.axes
         if ax:
-            if val:
+            if self._mouseover:
                 ax._mouseover_set.add(self)
             else:
                 ax._mouseover_set.discard(self)
 
+    mouseover = property(get_mouseover, set_mouseover)  # backcompat.
+
+
+def _get_tightbbox_for_layout_only(obj, *args, **kwargs):
+    """
+    Matplotlib's `.Axes.get_tightbbox` and `.Axis.get_tightbbox` support a
+    *for_layout_only* kwarg; this helper tries to uses the kwarg but skips it
+    when encountering third-party subclasses that do not support it.
+    """
+    try:
+        return obj.get_tightbbox(*args, **{**kwargs, "for_layout_only": True})
+    except TypeError:
+        return obj.get_tightbbox(*args, **kwargs)
+
 
 class ArtistInspector:
     """
@@ -1413,17 +1494,29 @@ def get_setters(self):
                 continue
             func = getattr(self.o, name)
             if (not callable(func)
-                    or len(inspect.signature(func).parameters) < 2
+                    or self.number_of_parameters(func) < 2
                     or self.is_alias(func)):
                 continue
             setters.append(name[4:])
         return setters
 
-    def is_alias(self, o):
-        """Return whether method object *o* is an alias for another method."""
-        ds = inspect.getdoc(o)
+    @staticmethod
+    @lru_cache(maxsize=None)
+    def number_of_parameters(func):
+        """Return number of parameters of the callable *func*."""
+        return len(inspect.signature(func).parameters)
+
+    @staticmethod
+    @lru_cache(maxsize=None)
+    def is_alias(method):
+        """
+        Return whether the object *method* is an alias for another method.
+        """
+
+        ds = inspect.getdoc(method)
         if ds is None:
             return False
+
         return ds.startswith('Alias for ')
 
     def aliased_name(self, s):
@@ -1437,6 +1530,22 @@ def aliased_name(self, s):
         aliases = ''.join(' or %s' % x for x in sorted(self.aliasd.get(s, [])))
         return s + aliases
 
+    _NOT_LINKABLE = {
+        # A set of property setter methods that are not available in our
+        # current docs. This is a workaround used to prevent trying to link
+        # these setters which would lead to "target reference not found"
+        # warnings during doc build.
+        'matplotlib.image._ImageBase.set_alpha',
+        'matplotlib.image._ImageBase.set_array',
+        'matplotlib.image._ImageBase.set_data',
+        'matplotlib.image._ImageBase.set_filternorm',
+        'matplotlib.image._ImageBase.set_filterrad',
+        'matplotlib.image._ImageBase.set_interpolation',
+        'matplotlib.image._ImageBase.set_interpolation_stage',
+        'matplotlib.image._ImageBase.set_resample',
+        'matplotlib.text._AnnotationBase.set_annotation_clip',
+    }
+
     def aliased_name_rest(self, s, target):
         """
         Return 'PROPNAME or alias' if *s* has an alias, else return 'PROPNAME',
@@ -1446,6 +1555,10 @@ def aliased_name_rest(self, s, target):
         alias, return 'markerfacecolor or mfc' and for the transform
         property, which does not, return 'transform'.
         """
+        # workaround to prevent "reference target not found"
+        if target in self._NOT_LINKABLE:
+            return f'``{s}``'
+
         aliases = ''.join(' or %s' % x for x in sorted(self.aliasd.get(s, [])))
         return ':meth:`%s <%s>`%s' % (s, target, aliases)
 
@@ -1578,7 +1691,7 @@ def getp(obj, property=None):
         If *property* is 'somename', this function returns
         ``obj.get_somename()``.
 
-        If is is None (or unset), it *prints* all gettable properties from
+        If it's None (or unset), it *prints* all gettable properties from
         *obj*.  Many properties have aliases for shorter typing, e.g. 'lw' is
         an alias for 'linewidth'.  In the output, aliases and full property
         names will be listed as:
@@ -1683,8 +1796,7 @@ def setp(obj, *args, file=None, **kwargs):
     if len(args) % 2:
         raise ValueError('The set args must be string, value pairs')
 
-    # put args into ordereddict to maintain order
-    funcvals = OrderedDict((k, v) for k, v in zip(args[::2], args[1::2]))
+    funcvals = dict(zip(args[::2], args[1::2]))
     ret = [o.update(funcvals) for o in objs] + [o.set(**kwargs) for o in objs]
     return list(cbook.flatten(ret))
 
@@ -1710,5 +1822,6 @@ def kwdoc(artist):
             if mpl.rcParams['docstring.hardcopy'] else
             'Properties:\n' + '\n'.join(ai.pprint_setters(leadingspace=4)))
 
-
-docstring.interpd.update(Artist_kwdoc=kwdoc(Artist))
+# We defer this to the end of them module, because it needs ArtistInspector
+# to be defined.
+Artist._update_set_signature_and_docstring()
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
index 82ee7918c25d..59b685224d9c 100644
--- a/lib/matplotlib/axes/_axes.py
+++ b/lib/matplotlib/axes/_axes.py
@@ -7,13 +7,13 @@
 import numpy as np
 from numpy import ma
 
+import matplotlib as mpl
 import matplotlib.category  # Register category unit converter as side-effect.
 import matplotlib.cbook as cbook
 import matplotlib.collections as mcoll
 import matplotlib.colors as mcolors
 import matplotlib.contour as mcontour
-import matplotlib.dates  # Register date unit converter as side-effect.
-import matplotlib.docstring as docstring
+import matplotlib.dates  # noqa # Register date unit converter as side-effect.
 import matplotlib.image as mimage
 import matplotlib.legend as mlegend
 import matplotlib.lines as mlines
@@ -30,7 +30,7 @@
 import matplotlib.transforms as mtransforms
 import matplotlib.tri as mtri
 import matplotlib.units as munits
-from matplotlib import _api, _preprocess_data, rcParams
+from matplotlib import _api, _docstring, _preprocess_data
 from matplotlib.axes._base import (
     _AxesBase, _TransformedBoundsLocator, _process_plot_format)
 from matplotlib.axes._secondary_axes import SecondaryAxis
@@ -43,6 +43,7 @@
 # All the other methods should go in the _AxesBase class.
 
 
+@_docstring.interpd
 class Axes(_AxesBase):
     """
     The `Axes` contains most of the figure elements: `~.axis.Axis`,
@@ -117,9 +118,9 @@ def set_title(self, label, fontdict=None, loc=None, pad=None, *, y=None,
             Which title to set.
 
         y : float, default: :rc:`axes.titley`
-            Vertical Axes loation for the title (1.0 is the top).  If
-            None (the default), y is determined automatically to avoid
-            decorators on the Axes.
+            Vertical Axes location for the title (1.0 is the top).  If
+            None (the default) and :rc:`axes.titley` is also None, y is
+            determined automatically to avoid decorators on the Axes.
 
         pad : float, default: :rc:`axes.titlepad`
             The offset of the title from the top of the Axes, in points.
@@ -136,10 +137,10 @@ def set_title(self, label, fontdict=None, loc=None, pad=None, *, y=None,
             of valid text properties.
         """
         if loc is None:
-            loc = rcParams['axes.titlelocation']
+            loc = mpl.rcParams['axes.titlelocation']
 
         if y is None:
-            y = rcParams['axes.titley']
+            y = mpl.rcParams['axes.titley']
         if y is None:
             y = 1.0
         else:
@@ -151,21 +152,21 @@ def set_title(self, label, fontdict=None, loc=None, pad=None, *, y=None,
                   'right': self._right_title}
         title = _api.check_getitem(titles, loc=loc.lower())
         default = {
-            'fontsize': rcParams['axes.titlesize'],
-            'fontweight': rcParams['axes.titleweight'],
+            'fontsize': mpl.rcParams['axes.titlesize'],
+            'fontweight': mpl.rcParams['axes.titleweight'],
             'verticalalignment': 'baseline',
             'horizontalalignment': loc.lower()}
-        titlecolor = rcParams['axes.titlecolor']
+        titlecolor = mpl.rcParams['axes.titlecolor']
         if not cbook._str_lower_equal(titlecolor, 'auto'):
             default["color"] = titlecolor
         if pad is None:
-            pad = rcParams['axes.titlepad']
+            pad = mpl.rcParams['axes.titlepad']
         self._set_title_offset_trans(float(pad))
         title.set_text(label)
         title.update(default)
         if fontdict is not None:
             title.update(fontdict)
-        title.update(kwargs)
+        title._internal_update(kwargs)
         return title
 
     def get_legend_handles_labels(self, legend_handler_map=None):
@@ -182,7 +183,7 @@ def get_legend_handles_labels(self, legend_handler_map=None):
             [self], legend_handler_map)
         return handles, labels
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def legend(self, *args, **kwargs):
         """
         Place a legend on the Axes.
@@ -190,10 +191,11 @@ def legend(self, *args, **kwargs):
         Call signatures::
 
             legend()
-            legend(labels)
             legend(handles, labels)
+            legend(handles=handles)
+            legend(labels)
 
-        The call signatures correspond to these three different ways to use
+        The call signatures correspond to the following different ways to use
         this method:
 
         **1. Automatic detection of elements to be shown in the legend**
@@ -214,34 +216,49 @@ def legend(self, *args, **kwargs):
             line.set_label('Label via method')
             ax.legend()
 
-        Specific lines can be excluded from the automatic legend element
-        selection by defining a label starting with an underscore.
-        This is default for all artists, so calling `.Axes.legend` without
-        any arguments and without setting the labels manually will result in
-        no legend being drawn.
+        .. note::
+            Specific artists can be excluded from the automatic legend element
+            selection by using a label starting with an underscore, "_".
+            A string starting with an underscore is the default label for all
+            artists, so calling `.Axes.legend` without any arguments and
+            without setting the labels manually will result in no legend being
+            drawn.
 
 
-        **2. Labeling existing plot elements**
+        **2. Explicitly listing the artists and labels in the legend**
 
-        To make a legend for lines which already exist on the Axes
-        (via plot for instance), simply call this function with an iterable
-        of strings, one for each legend item. For example::
+        For full control of which artists have a legend entry, it is possible
+        to pass an iterable of legend artists followed by an iterable of
+        legend labels respectively::
 
-            ax.plot([1, 2, 3])
-            ax.legend(['A simple line'])
+            ax.legend([line1, line2, line3], ['label1', 'label2', 'label3'])
 
-        Note: This call signature is discouraged, because the relation between
-        plot elements and labels is only implicit by their order and can
-        easily be mixed up.
 
+        **3. Explicitly listing the artists in the legend**
 
-        **3. Explicitly defining the elements in the legend**
+        This is similar to 2, but the labels are taken from the artists'
+        label properties. Example::
 
-        For full control of which artists have a legend entry, it is possible
-        to pass an iterable of legend artists followed by an iterable of
-        legend labels respectively::
+            line1, = ax.plot([1, 2, 3], label='label1')
+            line2, = ax.plot([1, 2, 3], label='label2')
+            ax.legend(handles=[line1, line2])
+
+
+        **4. Labeling existing plot elements**
+
+        .. admonition:: Discouraged
+
+            This call signature is discouraged, because the relation between
+            plot elements and labels is only implicit by their order and can
+            easily be mixed up.
+
+        To make a legend for all artists on an Axes, call this function with
+        an iterable of strings, one for each legend item. For example::
+
+            ax.plot([1, 2, 3])
+            ax.plot([5, 6, 7])
+            ax.legend(['First line', 'Second line'])
 
-            ax.legend([line1, line2, line3], ['label1', 'label2', 'label3'])
 
         Parameters
         ----------
@@ -311,13 +328,27 @@ def inset_axes(self, bounds, *, transform=None, zorder=5, **kwargs):
             Defaults to `ax.transAxes`, i.e. the units of *rect* are in
             Axes-relative coordinates.
 
+        projection : {None, 'aitoff', 'hammer', 'lambert', 'mollweide', \
+'polar', 'rectilinear', str}, optional
+            The projection type of the inset `~.axes.Axes`. *str* is the name
+            of a custom projection, see `~matplotlib.projections`. The default
+            None results in a 'rectilinear' projection.
+
+        polar : bool, default: False
+            If True, equivalent to projection='polar'.
+
+        axes_class : subclass type of `~.axes.Axes`, optional
+            The `.axes.Axes` subclass that is instantiated.  This parameter
+            is incompatible with *projection* and *polar*.  See
+            :ref:`axisartist_users-guide-index` for examples.
+
         zorder : number
             Defaults to 5 (same as `.Axes.legend`).  Adjust higher or lower
             to change whether it is above or below data plotted on the
             parent Axes.
 
         **kwargs
-            Other keyword arguments are passed on to the child `.Axes`.
+            Other keyword arguments are passed on to the inset Axes class.
 
         Returns
         -------
@@ -343,7 +374,10 @@ def inset_axes(self, bounds, *, transform=None, zorder=5, **kwargs):
         # This puts the rectangle into figure-relative coordinates.
         inset_locator = _TransformedBoundsLocator(bounds, transform)
         bounds = inset_locator(self, None).bounds
-        inset_ax = Axes(self.figure, bounds, zorder=zorder, **kwargs)
+        projection_class, pkw = self.figure._process_projection_requirements(
+                bounds, **kwargs)
+        inset_ax = projection_class(self.figure, bounds, zorder=zorder, **pkw)
+
         # this locator lets the axes move if in data coordinates.
         # it gets called in `ax.apply_aspect() (of all places)
         inset_ax.set_axes_locator(inset_locator)
@@ -352,7 +386,7 @@ def inset_axes(self, bounds, *, transform=None, zorder=5, **kwargs):
 
         return inset_ax
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def indicate_inset(self, bounds, inset_ax=None, *, transform=None,
                        facecolor='none', edgecolor='0.5', alpha=0.5,
                        zorder=4.99, **kwargs):
@@ -397,7 +431,7 @@ def indicate_inset(self, bounds, inset_ax=None, *, transform=None,
         **kwargs
             Other keyword arguments are passed on to the `.Rectangle` patch:
 
-            %(Rectangle_kwdoc)s
+            %(Rectangle:kwdoc)s
 
         Returns
         -------
@@ -504,7 +538,7 @@ def indicate_inset_zoom(self, inset_ax, **kwargs):
         rect = (xlim[0], ylim[0], xlim[1] - xlim[0], ylim[1] - ylim[0])
         return self.indicate_inset(rect, inset_ax, **kwargs)
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def secondary_xaxis(self, location, *, functions=None, **kwargs):
         """
         Add a second x-axis to this Axes.
@@ -546,7 +580,7 @@ def invert(x):
             raise ValueError('secondary_xaxis location must be either '
                              'a float or "top"/"bottom"')
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def secondary_yaxis(self, location, *, functions=None, **kwargs):
         """
         Add a second y-axis to this Axes.
@@ -578,7 +612,7 @@ def secondary_yaxis(self, location, *, functions=None, **kwargs):
             raise ValueError('secondary_yaxis location must be either '
                              'a float or "left"/"right"')
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def text(self, x, y, s, fontdict=None, **kwargs):
         """
         Add text to the Axes.
@@ -609,7 +643,7 @@ def text(self, x, y, s, fontdict=None, **kwargs):
         **kwargs : `~matplotlib.text.Text` properties.
             Other miscellaneous text parameters.
 
-            %(Text_kwdoc)s
+            %(Text:kwdoc)s
 
         Examples
         --------
@@ -646,10 +680,14 @@ def text(self, x, y, s, fontdict=None, **kwargs):
         self._add_text(t)
         return t
 
-    @_api.rename_parameter("3.3", "s", "text")
-    @docstring.dedent_interpd
-    def annotate(self, text, xy, *args, **kwargs):
-        a = mtext.Annotation(text, xy, *args, **kwargs)
+    @_docstring.dedent_interpd
+    def annotate(self, text, xy, xytext=None, xycoords='data', textcoords=None,
+                 arrowprops=None, annotation_clip=None, **kwargs):
+        # Signature must match Annotation. This is verified in
+        # test_annotate_signature().
+        a = mtext.Annotation(text, xy, xytext=xytext, xycoords=xycoords,
+                             textcoords=textcoords, arrowprops=arrowprops,
+                             annotation_clip=annotation_clip, **kwargs)
         a.set_transform(mtransforms.IdentityTransform())
         if 'clip_on' in kwargs:
             a.set_clip_path(self.patch)
@@ -658,10 +696,10 @@ def annotate(self, text, xy, *args, **kwargs):
     annotate.__doc__ = mtext.Annotation.__init__.__doc__
     #### Lines and spans
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def axhline(self, y=0, xmin=0, xmax=1, **kwargs):
         """
-        Add a horizontal line across the axis.
+        Add a horizontal line across the Axes.
 
         Parameters
         ----------
@@ -686,7 +724,7 @@ def axhline(self, y=0, xmin=0, xmax=1, **kwargs):
             Valid keyword arguments are `.Line2D` properties, with the
             exception of 'transform':
 
-            %(Line2D_kwdoc)s
+            %(Line2D:kwdoc)s
 
         See Also
         --------
@@ -722,10 +760,11 @@ def axhline(self, y=0, xmin=0, xmax=1, **kwargs):
         trans = self.get_yaxis_transform(which='grid')
         l = mlines.Line2D([xmin, xmax], [y, y], transform=trans, **kwargs)
         self.add_line(l)
-        self._request_autoscale_view(scalex=False, scaley=scaley)
+        if scaley:
+            self._request_autoscale_view("y")
         return l
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def axvline(self, x=0, ymin=0, ymax=1, **kwargs):
         """
         Add a vertical line across the Axes.
@@ -753,7 +792,7 @@ def axvline(self, x=0, ymin=0, ymax=1, **kwargs):
             Valid keyword arguments are `.Line2D` properties, with the
             exception of 'transform':
 
-            %(Line2D_kwdoc)s
+            %(Line2D:kwdoc)s
 
         See Also
         --------
@@ -789,7 +828,8 @@ def axvline(self, x=0, ymin=0, ymax=1, **kwargs):
         trans = self.get_xaxis_transform(which='grid')
         l = mlines.Line2D([x, x], [ymin, ymax], transform=trans, **kwargs)
         self.add_line(l)
-        self._request_autoscale_view(scalex=scalex, scaley=False)
+        if scalex:
+            self._request_autoscale_view("x")
         return l
 
     @staticmethod
@@ -800,7 +840,7 @@ def _check_no_units(vals, names):
                 raise ValueError(f"{name} must be a single scalar value, "
                                  f"but got {val}")
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def axline(self, xy1, xy2=None, *, slope=None, **kwargs):
         """
         Add an infinitely long straight line.
@@ -837,7 +877,7 @@ def axline(self, xy1, xy2=None, *, slope=None, **kwargs):
         **kwargs
             Valid kwargs are `.Line2D` properties
 
-            %(Line2D_kwdoc)s
+            %(Line2D:kwdoc)s
 
         See Also
         --------
@@ -866,15 +906,15 @@ def axline(self, xy1, xy2=None, *, slope=None, **kwargs):
         if line.get_clip_path() is None:
             line.set_clip_path(self.patch)
         if not line.get_label():
-            line.set_label(f"_line{len(self.lines)}")
-        self.lines.append(line)
-        line._remove_method = self.lines.remove
+            line.set_label(f"_child{len(self._children)}")
+        self._children.append(line)
+        line._remove_method = self._children.remove
         self.update_datalim(datalim)
 
         self._request_autoscale_view()
         return line
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def axhspan(self, ymin, ymax, xmin=0, xmax=1, **kwargs):
         """
         Add a horizontal span (rectangle) across the Axes.
@@ -905,7 +945,7 @@ def axhspan(self, ymin, ymax, xmin=0, xmax=1, **kwargs):
         ----------------
         **kwargs : `~matplotlib.patches.Polygon` properties
 
-        %(Polygon_kwdoc)s
+        %(Polygon:kwdoc)s
 
         See Also
         --------
@@ -919,10 +959,10 @@ def axhspan(self, ymin, ymax, xmin=0, xmax=1, **kwargs):
         p = mpatches.Polygon(verts, **kwargs)
         p.set_transform(self.get_yaxis_transform(which="grid"))
         self.add_patch(p)
-        self._request_autoscale_view(scalex=False)
+        self._request_autoscale_view("y")
         return p
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def axvspan(self, xmin, xmax, ymin=0, ymax=1, **kwargs):
         """
         Add a vertical span (rectangle) across the Axes.
@@ -953,7 +993,7 @@ def axvspan(self, xmin, xmax, ymin=0, ymax=1, **kwargs):
         ----------------
         **kwargs : `~matplotlib.patches.Polygon` properties
 
-        %(Polygon_kwdoc)s
+        %(Polygon:kwdoc)s
 
         See Also
         --------
@@ -974,8 +1014,9 @@ def axvspan(self, xmin, xmax, ymin=0, ymax=1, **kwargs):
         verts = [(xmin, ymin), (xmin, ymax), (xmax, ymax), (xmax, ymin)]
         p = mpatches.Polygon(verts, **kwargs)
         p.set_transform(self.get_xaxis_transform(which="grid"))
+        p.get_path()._interpolation_steps = 100
         self.add_patch(p)
-        self._request_autoscale_view(scaley=False)
+        self._request_autoscale_view("x")
         return p
 
     @_preprocess_data(replace_names=["y", "xmin", "xmax", "colors"],
@@ -992,7 +1033,7 @@ def hlines(self, y, xmin, xmax, colors=None, linestyles='solid',
 
         xmin, xmax : float or array-like
             Respective beginning and end of each line. If scalars are
-            provided, all lines will have same length.
+            provided, all lines will have the same length.
 
         colors : list of colors, default: :rc:`lines.color`
 
@@ -1006,6 +1047,8 @@ def hlines(self, y, xmin, xmax, colors=None, linestyles='solid',
 
         Other Parameters
         ----------------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
         **kwargs :  `~matplotlib.collections.LineCollection` properties.
 
         See Also
@@ -1040,16 +1083,17 @@ def hlines(self, y, xmin, xmax, colors=None, linestyles='solid',
         lines = mcoll.LineCollection(masked_verts, colors=colors,
                                      linestyles=linestyles, label=label)
         self.add_collection(lines, autolim=False)
-        lines.update(kwargs)
+        lines._internal_update(kwargs)
 
         if len(y) > 0:
-            minx = min(xmin.min(), xmax.min())
-            maxx = max(xmin.max(), xmax.max())
-            miny = y.min()
-            maxy = y.max()
-
+            # Extreme values of xmin/xmax/y.  Using masked_verts here handles
+            # the case of y being a masked *object* array (as can be generated
+            # e.g. by errorbar()), which would make nanmin/nanmax stumble.
+            minx = np.nanmin(masked_verts[..., 0])
+            maxx = np.nanmax(masked_verts[..., 0])
+            miny = np.nanmin(masked_verts[..., 1])
+            maxy = np.nanmax(masked_verts[..., 1])
             corners = (minx, miny), (maxx, maxy)
-
             self.update_datalim(corners)
             self._request_autoscale_view()
 
@@ -1069,7 +1113,7 @@ def vlines(self, x, ymin, ymax, colors=None, linestyles='solid',
 
         ymin, ymax : float or array-like
             Respective beginning and end of each line. If scalars are
-            provided, all lines will have same length.
+            provided, all lines will have the same length.
 
         colors : list of colors, default: :rc:`lines.color`
 
@@ -1083,6 +1127,8 @@ def vlines(self, x, ymin, ymax, colors=None, linestyles='solid',
 
         Other Parameters
         ----------------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
         **kwargs : `~matplotlib.collections.LineCollection` properties.
 
         See Also
@@ -1117,14 +1163,16 @@ def vlines(self, x, ymin, ymax, colors=None, linestyles='solid',
         lines = mcoll.LineCollection(masked_verts, colors=colors,
                                      linestyles=linestyles, label=label)
         self.add_collection(lines, autolim=False)
-        lines.update(kwargs)
+        lines._internal_update(kwargs)
 
         if len(x) > 0:
-            minx = x.min()
-            maxx = x.max()
-            miny = min(ymin.min(), ymax.min())
-            maxy = max(ymin.max(), ymax.max())
-
+            # Extreme values of x/ymin/ymax.  Using masked_verts here handles
+            # the case of x being a masked *object* array (as can be generated
+            # e.g. by errorbar()), which would make nanmin/nanmax stumble.
+            minx = np.nanmin(masked_verts[..., 0])
+            maxx = np.nanmax(masked_verts[..., 0])
+            miny = np.nanmin(masked_verts[..., 1])
+            maxy = np.nanmax(masked_verts[..., 1])
             corners = (minx, miny), (maxx, maxy)
             self.update_datalim(corners)
             self._request_autoscale_view()
@@ -1134,7 +1182,7 @@ def vlines(self, x, ymin, ymax, colors=None, linestyles='solid',
     @_preprocess_data(replace_names=["positions", "lineoffsets",
                                      "linelengths", "linewidths",
                                      "colors", "linestyles"])
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def eventplot(self, positions, orientation='horizontal', lineoffsets=1,
                   linelengths=1, linewidths=None, colors=None,
                   linestyles='solid', **kwargs):
@@ -1211,6 +1259,9 @@ def eventplot(self, positions, orientation='horizontal', lineoffsets=1,
             If *positions* is 2D, this can be a sequence with length matching
             the length of *positions*.
 
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             Other keyword arguments are line collection properties.  See
             `.LineCollection` for a list of the valid properties.
@@ -1231,10 +1282,11 @@ def eventplot(self, positions, orientation='horizontal', lineoffsets=1,
         --------
         .. plot:: gallery/lines_bars_and_markers/eventplot_demo.py
         """
-        # We do the conversion first since not all unitized data is uniform
-        positions, lineoffsets, linelengths = self._process_unit_info(
-            [("x", positions), ("y", lineoffsets), ("y", linelengths)], kwargs)
 
+        lineoffsets, linelengths = self._process_unit_info(
+                [("y", lineoffsets), ("y", linelengths)], kwargs)
+
+        # fix positions, noting that it can be a list of lists:
         if not np.iterable(positions):
             positions = [positions]
         elif any(np.iterable(position) for position in positions):
@@ -1245,6 +1297,11 @@ def eventplot(self, positions, orientation='horizontal', lineoffsets=1,
         if len(positions) == 0:
             return []
 
+        poss = []
+        for position in positions:
+            poss += self._process_unit_info([("x", position)], kwargs)
+        positions = poss
+
         # prevent 'singular' keys from **kwargs dict from overriding the effect
         # of 'plural' keyword arguments (e.g. 'color' overriding 'colors')
         colors = cbook._local_over_kwdict(colors, kwargs, 'color')
@@ -1328,7 +1385,7 @@ def eventplot(self, positions, orientation='horizontal', lineoffsets=1,
                                          color=color,
                                          linestyle=linestyle)
             self.add_collection(coll, autolim=False)
-            coll.update(kwargs)
+            coll._internal_update(kwargs)
             colls.append(coll)
 
         if len(positions) > 0:
@@ -1344,10 +1401,9 @@ def eventplot(self, positions, orientation='horizontal', lineoffsets=1,
                 minline = (lineoffsets - linelengths).min()
                 maxline = (lineoffsets + linelengths).max()
 
-                if (orientation is not None and
-                        orientation.lower() == "vertical"):
+                if orientation == "vertical":
                     corners = (minline, minpos), (maxline, maxpos)
-                else:  # "horizontal", None or "none" (see EventCollection)
+                else:  # "horizontal"
                     corners = (minpos, minline), (maxpos, maxline)
                 self.update_datalim(corners)
                 self._request_autoscale_view()
@@ -1358,7 +1414,7 @@ def eventplot(self, positions, orientation='horizontal', lineoffsets=1,
 
     # Uses a custom implementation of data-kwarg handling in
     # _process_plot_var_args.
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def plot(self, *args, scalex=True, scaley=True, data=None, **kwargs):
         """
         Plot y versus x as lines and/or markers.
@@ -1489,7 +1545,8 @@ def plot(self, *args, scalex=True, scaley=True, data=None, **kwargs):
         ----------------
         scalex, scaley : bool, default: True
             These parameters determine if the view limits are adapted to the
-            data limits. The values are passed on to `autoscale_view`.
+            data limits. The values are passed on to
+            `~.axes.Axes.autoscale_view`.
 
         **kwargs : `.Line2D` properties, optional
             *kwargs* are used to specify properties like a line label (for
@@ -1505,7 +1562,7 @@ def plot(self, *args, scalex=True, scaley=True, data=None, **kwargs):
 
             Here is a list of available `.Line2D` properties:
 
-            %(Line2D_kwdoc)s
+            %(Line2D:kwdoc)s
 
         See Also
         --------
@@ -1605,15 +1662,30 @@ def plot(self, *args, scalex=True, scaley=True, data=None, **kwargs):
         lines = [*self._get_lines(*args, data=data, **kwargs)]
         for line in lines:
             self.add_line(line)
-        self._request_autoscale_view(scalex=scalex, scaley=scaley)
+        if scalex:
+            self._request_autoscale_view("x")
+        if scaley:
+            self._request_autoscale_view("y")
         return lines
 
     @_preprocess_data(replace_names=["x", "y"], label_namer="y")
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def plot_date(self, x, y, fmt='o', tz=None, xdate=True, ydate=False,
                   **kwargs):
         """
-        Plot co-ercing the axis to treat floats as dates.
+        [*Discouraged*] Plot coercing the axis to treat floats as dates.
+
+        .. admonition:: Discouraged
+
+            This method exists for historic reasons and will be deprecated in
+            the future.
+
+            - ``datetime``-like data should directly be plotted using
+              `~.Axes.plot`.
+            -  If you need to plot plain numeric data as :ref:`date-format` or
+               need to set a timezone, call ``ax.xaxis.axis_date`` /
+               ``ax.yaxis.axis_date`` before `~.Axes.plot`. See
+               `.Axis.axis_date`.
 
         Similar to `.plot`, this plots *y* vs. *x* as lines or markers.
         However, the axis labels are formatted as dates depending on *xdate*
@@ -1642,15 +1714,17 @@ def plot_date(self, x, y, fmt='o', tz=None, xdate=True, ydate=False,
 
         Returns
         -------
-        list of `~.Line2D`
+        list of `.Line2D`
             Objects representing the plotted data.
 
         Other Parameters
         ----------------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
         **kwargs
             Keyword arguments control the `.Line2D` properties:
 
-            %(Line2D_kwdoc)s
+            %(Line2D:kwdoc)s
 
         See Also
         --------
@@ -1676,7 +1750,7 @@ def plot_date(self, x, y, fmt='o', tz=None, xdate=True, ydate=False,
         return self.plot(x, y, fmt, **kwargs)
 
     # @_preprocess_data() # let 'plot' do the unpacking..
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def loglog(self, *args, **kwargs):
         """
         Make a plot with log scaling on both the x and y axis.
@@ -1710,15 +1784,13 @@ def loglog(self, *args, **kwargs):
             Non-positive values can be masked as invalid, or clipped to a very
             small positive number.
 
+        **kwargs
+            All parameters supported by `.plot`.
+
         Returns
         -------
-        list of `~.Line2D`
+        list of `.Line2D`
             Objects representing the plotted data.
-
-        Other Parameters
-        ----------------
-        **kwargs
-            All parameters supported by `.plot`.
         """
         dx = {k: v for k, v in kwargs.items()
               if k in ['base', 'subs', 'nonpositive',
@@ -1732,7 +1804,7 @@ def loglog(self, *args, **kwargs):
             *args, **{k: v for k, v in kwargs.items() if k not in {*dx, *dy}})
 
     # @_preprocess_data() # let 'plot' do the unpacking..
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def semilogx(self, *args, **kwargs):
         """
         Make a plot with log scaling on the x axis.
@@ -1763,15 +1835,13 @@ def semilogx(self, *args, **kwargs):
             Non-positive values in x can be masked as invalid, or clipped to a
             very small positive number.
 
+        **kwargs
+            All parameters supported by `.plot`.
+
         Returns
         -------
-        list of `~.Line2D`
+        list of `.Line2D`
             Objects representing the plotted data.
-
-        Other Parameters
-        ----------------
-        **kwargs
-            All parameters supported by `.plot`.
         """
         d = {k: v for k, v in kwargs.items()
              if k in ['base', 'subs', 'nonpositive',
@@ -1781,7 +1851,7 @@ def semilogx(self, *args, **kwargs):
             *args, **{k: v for k, v in kwargs.items() if k not in d})
 
     # @_preprocess_data() # let 'plot' do the unpacking..
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def semilogy(self, *args, **kwargs):
         """
         Make a plot with log scaling on the y axis.
@@ -1812,15 +1882,13 @@ def semilogy(self, *args, **kwargs):
             Non-positive values in y can be masked as invalid, or clipped to a
             very small positive number.
 
+        **kwargs
+            All parameters supported by `.plot`.
+
         Returns
         -------
-        list of `~.Line2D`
+        list of `.Line2D`
             Objects representing the plotted data.
-
-        Other Parameters
-        ----------------
-        **kwargs
-            All parameters supported by `.plot`.
         """
         d = {k: v for k, v in kwargs.items()
              if k in ['base', 'subs', 'nonpositive',
@@ -1886,6 +1954,9 @@ def acorr(self, x, **kwargs):
             The marker for plotting the data points.
             Only used if *usevlines* is ``False``.
 
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             Additional parameters are passed to `.Axes.vlines` and
             `.Axes.axhline` if *usevlines* is ``True``; otherwise they are
@@ -1960,6 +2031,9 @@ def xcorr(self, x, y, normed=True, detrend=mlab.detrend_none,
             The marker for plotting the data points.
             Only used if *usevlines* is ``False``.
 
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             Additional parameters are passed to `.Axes.vlines` and
             `.Axes.axhline` if *usevlines* is ``True``; otherwise they are
@@ -2048,10 +2122,6 @@ def step(self, x, y, *args, where='pre', data=None, **kwargs):
             and plotted on the given positions, however, this is a rarely
             needed feature for step plots.
 
-        data : indexable object, optional
-            An object with labelled data. If given, provide the label names to
-            plot in *x* and *y*.
-
         where : {'pre', 'post', 'mid'}, default: 'pre'
             Define where the steps should be placed:
 
@@ -2063,19 +2133,17 @@ def step(self, x, y, *args, where='pre', data=None, **kwargs):
               value ``y[i]``.
             - 'mid': Steps occur half-way between the *x* positions.
 
-        Returns
-        -------
-        list of `.Line2D`
-            Objects representing the plotted data.
+        data : indexable object, optional
+            An object with labelled data. If given, provide the label names to
+            plot in *x* and *y*.
 
-        Other Parameters
-        ----------------
         **kwargs
             Additional parameters are the same as those for `.plot`.
 
-        Notes
-        -----
-        .. [notes section required to get data note injection right]
+        Returns
+        -------
+        list of `.Line2D`
+            Objects representing the plotted data.
         """
         _api.check_in_list(('pre', 'post', 'mid'), where=where)
         kwargs['drawstyle'] = 'steps-' + where
@@ -2111,14 +2179,22 @@ def _convert_dx(dx, x0, xconv, convert):
             # removes the units from unit packages like `pint` that
             # wrap numpy arrays.
             try:
-                x0 = cbook.safe_first_element(x0)
+                x0 = cbook._safe_first_finite(x0)
             except (TypeError, IndexError, KeyError):
-                x0 = x0
+                pass
+            except StopIteration:
+                # this means we found no finite element, fall back to first
+                # element unconditionally
+                x0 = cbook.safe_first_element(x0)
 
             try:
-                x = cbook.safe_first_element(xconv)
+                x = cbook._safe_first_finite(xconv)
             except (TypeError, IndexError, KeyError):
                 x = xconv
+            except StopIteration:
+                # this means we found no finite element, fall back to first
+                # element unconditionally
+                x = cbook.safe_first_element(xconv)
 
             delist = False
             if not np.iterable(dx):
@@ -2134,7 +2210,7 @@ def _convert_dx(dx, x0, xconv, convert):
         return dx
 
     @_preprocess_data()
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def bar(self, x, height, width=0.8, bottom=None, *, align="center",
             **kwargs):
         r"""
@@ -2160,7 +2236,7 @@ def bar(self, x, height, width=0.8, bottom=None, *, align="center",
             The width(s) of the bars.
 
         bottom : float or array-like, default: 0
-            The y coordinate(s) of the bars bases.
+            The y coordinate(s) of the bottom side(s) of the bars.
 
         align : {'center', 'edge'}, default: 'center'
             Alignment of the bars to the *x* coordinates:
@@ -2191,6 +2267,14 @@ def bar(self, x, height, width=0.8, bottom=None, *, align="center",
             The tick labels of the bars.
             Default: None (Use default numeric labels.)
 
+        label : str or list of str, optional
+            A single label is attached to the resulting `.BarContainer` as a
+            label for the whole dataset.
+            If a list is provided, it must be the same length as *x* and
+            labels the individual bars. Repeated labels are not de-duplicated
+            and will cause repeated label entries, so this is best used when
+            bars also differ in style (e.g., by passing a list to *color*.)
+
         xerr, yerr : float or array-like of shape(N,) or shape(2, N), optional
             If not *None*, add horizontal / vertical errorbars to the bar tips.
             The values are +/- sizes relative to the data:
@@ -2202,8 +2286,8 @@ def bar(self, x, height, width=0.8, bottom=None, *, align="center",
               errors.
             - *None*: No errorbar. (Default)
 
-            See :doc:`/gallery/statistics/errorbar_features`
-            for an example on the usage of ``xerr`` and ``yerr``.
+            See :doc:`/gallery/statistics/errorbar_features` for an example on
+            the usage of *xerr* and *yerr*.
 
         ecolor : color or list of color, default: 'black'
             The line color of the errorbars.
@@ -2212,16 +2296,19 @@ def bar(self, x, height, width=0.8, bottom=None, *, align="center",
            The length of the error bar caps in points.
 
         error_kw : dict, optional
-            Dictionary of kwargs to be passed to the `~.Axes.errorbar`
-            method. Values of *ecolor* or *capsize* defined here take
-            precedence over the independent kwargs.
+            Dictionary of keyword arguments to be passed to the
+            `~.Axes.errorbar` method. Values of *ecolor* or *capsize* defined
+            here take precedence over the independent keyword arguments.
 
         log : bool, default: False
             If *True*, set the y-axis to be log scale.
 
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs : `.Rectangle` properties
 
-        %(Rectangle_kwdoc)s
+        %(Rectangle:kwdoc)s
 
         See Also
         --------
@@ -2254,7 +2341,7 @@ def bar(self, x, height, width=0.8, bottom=None, *, align="center",
                 ezorder += 0.01
         error_kw.setdefault('zorder', ezorder)
         ecolor = kwargs.pop('ecolor', 'k')
-        capsize = kwargs.pop('capsize', rcParams["errorbar.capsize"])
+        capsize = kwargs.pop('capsize', mpl.rcParams["errorbar.capsize"])
         error_kw.setdefault('ecolor', ecolor)
         error_kw.setdefault('capsize', capsize)
 
@@ -2271,7 +2358,7 @@ def bar(self, x, height, width=0.8, bottom=None, *, align="center",
         if orientation == 'vertical':
             if y is None:
                 y = 0
-        elif orientation == 'horizontal':
+        else:  # horizontal
             if x is None:
                 x = 0
 
@@ -2280,7 +2367,7 @@ def bar(self, x, height, width=0.8, bottom=None, *, align="center",
                 [("x", x), ("y", height)], kwargs, convert=False)
             if log:
                 self.set_yscale('log', nonpositive='clip')
-        elif orientation == 'horizontal':
+        else:  # horizontal
             self._process_unit_info(
                 [("x", width), ("y", y)], kwargs, convert=False)
             if log:
@@ -2309,10 +2396,20 @@ def bar(self, x, height, width=0.8, bottom=None, *, align="center",
         if orientation == 'vertical':
             tick_label_axis = self.xaxis
             tick_label_position = x
-        elif orientation == 'horizontal':
+        else:  # horizontal
             tick_label_axis = self.yaxis
             tick_label_position = y
 
+        if not isinstance(label, str) and np.iterable(label):
+            bar_container_label = '_nolegend_'
+            patch_labels = label
+        else:
+            bar_container_label = label
+            patch_labels = ['_nolegend_'] * len(x)
+        if len(patch_labels) != len(x):
+            raise ValueError(f'number of labels ({len(patch_labels)}) '
+                             f'does not match number of bars ({len(x)}).')
+
         linewidth = itertools.cycle(np.atleast_1d(linewidth))
         hatch = itertools.cycle(np.atleast_1d(hatch))
         color = itertools.chain(itertools.cycle(mcolors.to_rgba_array(color)),
@@ -2338,7 +2435,7 @@ def bar(self, x, height, width=0.8, bottom=None, *, align="center",
                                     f'and width ({width.dtype}) '
                                     f'are incompatible') from e
                 bottom = y
-            elif orientation == 'horizontal':
+            else:  # horizontal
                 try:
                     bottom = y - height / 2
                 except TypeError as e:
@@ -2346,27 +2443,27 @@ def bar(self, x, height, width=0.8, bottom=None, *, align="center",
                                     f'and height ({height.dtype}) '
                                     f'are incompatible') from e
                 left = x
-        elif align == 'edge':
+        else:  # edge
             left = x
             bottom = y
 
         patches = []
         args = zip(left, bottom, width, height, color, edgecolor, linewidth,
-                   hatch)
-        for l, b, w, h, c, e, lw, htch in args:
+                   hatch, patch_labels)
+        for l, b, w, h, c, e, lw, htch, lbl in args:
             r = mpatches.Rectangle(
                 xy=(l, b), width=w, height=h,
                 facecolor=c,
                 edgecolor=e,
                 linewidth=lw,
-                label='_nolegend_',
+                label=lbl,
                 hatch=htch,
                 )
-            r.update(kwargs)
+            r._internal_update(kwargs)
             r.get_path()._interpolation_steps = 100
             if orientation == 'vertical':
                 r.sticky_edges.y.append(b)
-            elif orientation == 'horizontal':
+            else:  # horizontal
                 r.sticky_edges.x.append(l)
             self.add_patch(r)
             patches.append(r)
@@ -2377,7 +2474,7 @@ def bar(self, x, height, width=0.8, bottom=None, *, align="center",
                 ex = [l + 0.5 * w for l, w in zip(left, width)]
                 ey = [b + h for b, h in zip(bottom, height)]
 
-            elif orientation == 'horizontal':
+            else:  # horizontal
                 # using list comps rather than arrays to preserve unit info
                 ex = [l + w for l, w in zip(left, width)]
                 ey = [b + 0.5 * h for b, h in zip(bottom, height)]
@@ -2394,11 +2491,12 @@ def bar(self, x, height, width=0.8, bottom=None, *, align="center",
 
         if orientation == 'vertical':
             datavalues = height
-        elif orientation == 'horizontal':
+        else:  # horizontal
             datavalues = width
 
         bar_container = BarContainer(patches, errorbar, datavalues=datavalues,
-                                     orientation=orientation, label=label)
+                                     orientation=orientation,
+                                     label=bar_container_label)
         self.add_container(bar_container)
 
         if tick_labels is not None:
@@ -2408,9 +2506,10 @@ def bar(self, x, height, width=0.8, bottom=None, *, align="center",
 
         return bar_container
 
-    @docstring.dedent_interpd
+    # @_preprocess_data() # let 'bar' do the unpacking..
+    @_docstring.dedent_interpd
     def barh(self, y, width, height=0.8, left=None, *, align="center",
-             **kwargs):
+             data=None, **kwargs):
         r"""
         Make a horizontal bar plot.
 
@@ -2434,7 +2533,7 @@ def barh(self, y, width, height=0.8, left=None, *, align="center",
             The heights of the bars.
 
         left : float or array-like, default: 0
-            The x coordinates of the left sides of the bars.
+            The x coordinates of the left side(s) of the bars.
 
         align : {'center', 'edge'}, default: 'center'
             Alignment of the base to the *y* coordinates*:
@@ -2466,9 +2565,17 @@ def barh(self, y, width, height=0.8, left=None, *, align="center",
             The tick labels of the bars.
             Default: None (Use default numeric labels.)
 
+        label : str or list of str, optional
+            A single label is attached to the resulting `.BarContainer` as a
+            label for the whole dataset.
+            If a list is provided, it must be the same length as *y* and
+            labels the individual bars. Repeated labels are not de-duplicated
+            and will cause repeated label entries, so this is best used when
+            bars also differ in style (e.g., by passing a list to *color*.)
+
         xerr, yerr : float or array-like of shape(N,) or shape(2, N), optional
-            If not ``None``, add horizontal / vertical errorbars to the
-            bar tips. The values are +/- sizes relative to the data:
+            If not *None*, add horizontal / vertical errorbars to the bar tips.
+            The values are +/- sizes relative to the data:
 
             - scalar: symmetric +/- values for all bars
             - shape(N,): symmetric +/- values for each bar
@@ -2477,8 +2584,8 @@ def barh(self, y, width, height=0.8, left=None, *, align="center",
               errors.
             - *None*: No errorbar. (default)
 
-            See :doc:`/gallery/statistics/errorbar_features`
-            for an example on the usage of ``xerr`` and ``yerr``.
+            See :doc:`/gallery/statistics/errorbar_features` for an example on
+            the usage of *xerr* and *yerr*.
 
         ecolor : color or list of color, default: 'black'
             The line color of the errorbars.
@@ -2487,16 +2594,20 @@ def barh(self, y, width, height=0.8, left=None, *, align="center",
            The length of the error bar caps in points.
 
         error_kw : dict, optional
-            Dictionary of kwargs to be passed to the `~.Axes.errorbar`
-            method. Values of *ecolor* or *capsize* defined here take
-            precedence over the independent kwargs.
+            Dictionary of keyword arguments to be passed to the
+            `~.Axes.errorbar` method. Values of *ecolor* or *capsize* defined
+            here take precedence over the independent keyword arguments.
 
         log : bool, default: False
             If ``True``, set the x-axis to be log scale.
 
+        data : indexable object, optional
+            If given, all parameters also accept a string ``s``, which is
+            interpreted as ``data[s]`` (unless this raises an exception).
+
         **kwargs : `.Rectangle` properties
 
-        %(Rectangle_kwdoc)s
+        %(Rectangle:kwdoc)s
 
         See Also
         --------
@@ -2506,12 +2617,11 @@ def barh(self, y, width, height=0.8, left=None, *, align="center",
         -----
         Stacked bars can be achieved by passing individual *left* values per
         bar. See
-        :doc:`/gallery/lines_bars_and_markers/horizontal_barchart_distribution`
-        .
+        :doc:`/gallery/lines_bars_and_markers/horizontal_barchart_distribution`.
         """
         kwargs.setdefault('orientation', 'horizontal')
         patches = self.bar(x=left, height=height, width=width, bottom=y,
-                           align=align, **kwargs)
+                           align=align, data=data, **kwargs)
         return patches
 
     def bar_label(self, container, labels=None, *, fmt="%g", label_type="edge",
@@ -2550,13 +2660,25 @@ def bar_label(self, container, labels=None, *, fmt="%g", label_type="edge",
 
         **kwargs
             Any remaining keyword arguments are passed through to
-            `.Axes.annotate`.
+            `.Axes.annotate`. The alignment parameters (
+            *horizontalalignment* / *ha*, *verticalalignment* / *va*) are
+            not supported because the labels are automatically aligned to
+            the bars.
 
         Returns
         -------
         list of `.Text`
             A list of `.Text` instances for the labels.
         """
+        for key in ['horizontalalignment', 'ha', 'verticalalignment', 'va']:
+            if key in kwargs:
+                raise ValueError(
+                    f"Passing {key!r} to bar_label() is not supported.")
+
+        a, b = self.yaxis.get_view_interval()
+        y_inverted = a > b
+        c, d = self.xaxis.get_view_interval()
+        x_inverted = c > d
 
         # want to know whether to put label on positive or negative direction
         # cannot use np.sign here because it will return 0 if x == 0
@@ -2585,7 +2707,7 @@ def sign(x):
         annotations = []
 
         for bar, err, dat, lbl in itertools.zip_longest(
-            bars, errs, datavalues, labels
+                bars, errs, datavalues, labels
         ):
             (x0, y0), (x1, y1) = bar.get_bbox().get_points()
             xc, yc = (x0 + x1) / 2, (y0 + y1) / 2
@@ -2593,45 +2715,55 @@ def sign(x):
             if orientation == "vertical":
                 extrema = max(y0, y1) if dat >= 0 else min(y0, y1)
                 length = abs(y0 - y1)
-            elif orientation == "horizontal":
+            else:  # horizontal
                 extrema = max(x0, x1) if dat >= 0 else min(x0, x1)
                 length = abs(x0 - x1)
 
-            if err is None:
+            if err is None or np.size(err) == 0:
                 endpt = extrema
             elif orientation == "vertical":
                 endpt = err[:, 1].max() if dat >= 0 else err[:, 1].min()
-            elif orientation == "horizontal":
+            else:  # horizontal
                 endpt = err[:, 0].max() if dat >= 0 else err[:, 0].min()
 
             if label_type == "center":
                 value = sign(dat) * length
-            elif label_type == "edge":
+            else:  # edge
                 value = extrema
 
             if label_type == "center":
                 xy = xc, yc
-            elif label_type == "edge" and orientation == "vertical":
-                xy = xc, endpt
-            elif label_type == "edge" and orientation == "horizontal":
-                xy = endpt, yc
+            else:  # edge
+                if orientation == "vertical":
+                    xy = xc, endpt
+                else:  # horizontal
+                    xy = endpt, yc
 
             if orientation == "vertical":
-                xytext = 0, sign(dat) * padding
-            else:
-                xytext = sign(dat) * padding, 0
+                y_direction = -1 if y_inverted else 1
+                xytext = 0, y_direction * sign(dat) * padding
+            else:  # horizontal
+                x_direction = -1 if x_inverted else 1
+                xytext = x_direction * sign(dat) * padding, 0
 
             if label_type == "center":
                 ha, va = "center", "center"
-            elif label_type == "edge":
-                if orientation == "vertical" and dat >= 0:
-                    ha, va = "center", "bottom"
-                elif orientation == "vertical" and dat < 0:
-                    ha, va = "center", "top"
-                elif orientation == "horizontal" and dat >= 0:
-                    ha, va = "left", "center"
-                elif orientation == "horizontal" and dat < 0:
-                    ha, va = "right", "center"
+            else:  # edge
+                if orientation == "vertical":
+                    ha = 'center'
+                    if y_inverted:
+                        va = 'top' if dat > 0 else 'bottom'  # also handles NaN
+                    else:
+                        va = 'top' if dat < 0 else 'bottom'  # also handles NaN
+                else:  # horizontal
+                    if x_inverted:
+                        ha = 'right' if dat > 0 else 'left'  # also handles NaN
+                    else:
+                        ha = 'right' if dat < 0 else 'left'  # also handles NaN
+                    va = 'center'
+
+            if np.isnan(dat):
+                lbl = ''
 
             annotation = self.annotate(fmt % value if lbl is None else lbl,
                                        xy, xytext, textcoords="offset points",
@@ -2641,7 +2773,7 @@ def sign(x):
         return annotations
 
     @_preprocess_data()
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def broken_barh(self, xranges, yrange, **kwargs):
         """
         Plot a horizontal sequence of rectangles.
@@ -2668,6 +2800,8 @@ def broken_barh(self, xranges, yrange, **kwargs):
 
         Other Parameters
         ----------------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
         **kwargs : `.BrokenBarHCollection` properties
 
             Each *kwarg* can be either a single argument applying to all
@@ -2683,15 +2817,15 @@ def broken_barh(self, xranges, yrange, **kwargs):
 
             Supported keywords:
 
-            %(BrokenBarHCollection_kwdoc)s
+            %(BrokenBarHCollection:kwdoc)s
         """
         # process the unit information
         if len(xranges):
-            xdata = cbook.safe_first_element(xranges)
+            xdata = cbook._safe_first_finite(xranges)
         else:
             xdata = None
         if len(yrange):
-            ydata = cbook.safe_first_element(yrange)
+            ydata = cbook._safe_first_finite(yrange)
         else:
             ydata = None
         self._process_unit_info(
@@ -2715,6 +2849,7 @@ def broken_barh(self, xranges, yrange, **kwargs):
         return col
 
     @_preprocess_data()
+    @_api.delete_parameter("3.6", "use_line_collection")
     def stem(self, *args, linefmt=None, markerfmt=None, basefmt=None, bottom=0,
              label=None, use_line_collection=True, orientation='vertical'):
         """
@@ -2732,6 +2867,8 @@ def stem(self, *args, linefmt=None, markerfmt=None, basefmt=None, bottom=0,
 
         The *locs*-positions are optional. The formats may be provided either
         as positional or as keyword-arguments.
+        Passing *markerfmt* and *basefmt* positionally is deprecated since
+        Matplotlib 3.5.
 
         Parameters
         ----------
@@ -2764,8 +2901,8 @@ def stem(self, *args, linefmt=None, markerfmt=None, basefmt=None, bottom=0,
 
         markerfmt : str, optional
             A string defining the color and/or shape of the markers at the stem
-            heads.  Default: 'C0o', i.e. filled circles with the first color of
-            the color cycle.
+            heads. If the marker is not given, use the marker 'o', i.e. filled
+            circles. If the color is not given, use the color from *linefmt*.
 
         basefmt : str, default: 'C3-' ('C2-' in classic mode)
             A format string defining the properties of the baseline.
@@ -2781,11 +2918,15 @@ def stem(self, *args, linefmt=None, markerfmt=None, basefmt=None, bottom=0,
             The label to use for the stems in legends.
 
         use_line_collection : bool, default: True
+            *Deprecated since 3.6*
+
             If ``True``, store and plot the stem lines as a
             `~.collections.LineCollection` instead of individual lines, which
             significantly increases performance.  If ``False``, defaults to the
-            old behavior of using a list of `.Line2D` objects.  This parameter
-            may be deprecated in the future.
+            old behavior of using a list of `.Line2D` objects.
+
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
 
         Returns
         -------
@@ -2809,65 +2950,54 @@ def stem(self, *args, linefmt=None, markerfmt=None, basefmt=None, bottom=0,
             heads, = args
             locs = np.arange(len(heads))
             args = ()
+        elif isinstance(args[1], str):
+            heads, *args = args
+            locs = np.arange(len(heads))
         else:
             locs, heads, *args = args
+        if len(args) > 1:
+            _api.warn_deprecated(
+                "3.5",
+                message="Passing the markerfmt parameter positionally is "
+                        "deprecated since Matplotlib %(since)s; the "
+                        "parameter will become keyword-only %(removal)s.")
 
         if orientation == 'vertical':
             locs, heads = self._process_unit_info([("x", locs), ("y", heads)])
-        else:
+        else:  # horizontal
             heads, locs = self._process_unit_info([("x", heads), ("y", locs)])
 
-        # defaults for formats
+        # resolve line format
         if linefmt is None:
-            try:
-                # fallback to positional argument
-                linefmt = args[0]
-            except IndexError:
-                linecolor = 'C0'
-                linemarker = 'None'
-                linestyle = '-'
-            else:
-                linestyle, linemarker, linecolor = \
-                    _process_plot_format(linefmt)
-        else:
-            linestyle, linemarker, linecolor = _process_plot_format(linefmt)
+            linefmt = args[0] if len(args) > 0 else "C0-"
+        linestyle, linemarker, linecolor = _process_plot_format(linefmt)
 
+        # resolve marker format
         if markerfmt is None:
-            try:
-                # fallback to positional argument
-                markerfmt = args[1]
-            except IndexError:
-                markercolor = 'C0'
-                markermarker = 'o'
-                markerstyle = 'None'
-            else:
-                markerstyle, markermarker, markercolor = \
-                    _process_plot_format(markerfmt)
-        else:
-            markerstyle, markermarker, markercolor = \
-                _process_plot_format(markerfmt)
-
+            # if not given as kwarg, check for positional or fall back to 'o'
+            markerfmt = args[1] if len(args) > 1 else "o"
+        if markerfmt == '':
+            markerfmt = ' '  # = empty line style; '' would resolve rcParams
+        markerstyle, markermarker, markercolor = \
+            _process_plot_format(markerfmt)
+        if markermarker is None:
+            markermarker = 'o'
+        if markerstyle is None:
+            markerstyle = 'None'
+        if markercolor is None:
+            markercolor = linecolor
+
+        # resolve baseline format
         if basefmt is None:
-            try:
-                # fallback to positional argument
-                basefmt = args[2]
-            except IndexError:
-                if rcParams['_internal.classic_mode']:
-                    basecolor = 'C2'
-                else:
-                    basecolor = 'C3'
-                basemarker = 'None'
-                basestyle = '-'
-            else:
-                basestyle, basemarker, basecolor = \
-                    _process_plot_format(basefmt)
-        else:
-            basestyle, basemarker, basecolor = _process_plot_format(basefmt)
+            basefmt = (args[2] if len(args) > 2 else
+                       "C2-" if mpl.rcParams["_internal.classic_mode"] else
+                       "C3-")
+        basestyle, basemarker, basecolor = _process_plot_format(basefmt)
 
         # New behaviour in 3.1 is to use a LineCollection for the stemlines
         if use_line_collection:
             if linestyle is None:
-                linestyle = rcParams['lines.linestyle']
+                linestyle = mpl.rcParams['lines.linestyle']
             xlines = self.vlines if orientation == "vertical" else self.hlines
             stemlines = xlines(
                 locs, bottom, heads,
@@ -2916,14 +3046,12 @@ def pie(self, x, explode=None, labels=None, colors=None,
             autopct=None, pctdistance=0.6, shadow=False, labeldistance=1.1,
             startangle=0, radius=1, counterclock=True,
             wedgeprops=None, textprops=None, center=(0, 0),
-            frame=False, rotatelabels=False, *, normalize=None):
+            frame=False, rotatelabels=False, *, normalize=True):
         """
         Plot a pie chart.
 
         Make a pie chart of array *x*.  The fractional area of each wedge is
-        given by ``x/sum(x)``.  If ``sum(x) < 1``, then the values of *x* give
-        the fractional area directly and the array will not be normalized. The
-        resulting pie will have an empty wedge of size ``1 - sum(x)``.
+        given by ``x/sum(x)``.
 
         The wedges are plotted counterclockwise, by default starting from the
         x-axis.
@@ -2957,19 +3085,11 @@ def pie(self, x, explode=None, labels=None, colors=None,
         shadow : bool, default: False
             Draw a shadow beneath the pie.
 
-        normalize : None or bool, default: None
+        normalize : bool, default: True
             When *True*, always make a full pie by normalizing x so that
             ``sum(x) == 1``. *False* makes a partial pie if ``sum(x) <= 1``
             and raises a `ValueError` for ``sum(x) > 1``.
 
-            When *None*, defaults to *True* if ``sum(x) >= 1`` and *False* if
-            ``sum(x) < 1``.
-
-            Please note that the previous default value of *None* is now
-            deprecated, and the default will change to *True* in the next
-            release. Please pass ``normalize=False`` explicitly if you want to
-            draw a partial pie.
-
         labeldistance : float or None, default: 1.1
             The radial distance at which the pie labels are drawn.
             If set to ``None``, label are not drawn, but are stored for use in
@@ -3004,6 +3124,9 @@ def pie(self, x, explode=None, labels=None, colors=None,
         rotatelabels : bool, default: False
             Rotate each label to the angle of the corresponding slice if true.
 
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         Returns
         -------
         patches : list
@@ -3035,17 +3158,6 @@ def pie(self, x, explode=None, labels=None, colors=None,
 
         sx = x.sum()
 
-        if normalize is None:
-            if sx < 1:
-                _api.warn_deprecated(
-                    "3.3", message="normalize=None does not normalize "
-                    "if the sum is less than 1 but this behavior "
-                    "is deprecated since %(since)s until %(removal)s. "
-                    "After the deprecation "
-                    "period the default value will be normalize=True. "
-                    "To prevent normalization pass normalize=False ")
-            else:
-                normalize = True
         if normalize:
             x = x / sx
         elif sx > 1:
@@ -3066,20 +3178,11 @@ def pie(self, x, explode=None, labels=None, colors=None,
             def get_next_color():
                 return next(color_cycle)
 
-        if radius is None:
-            _api.warn_deprecated(
-                "3.3", message="Support for passing a radius of None to mean "
-                "1 is deprecated since %(since)s and will be removed "
-                "%(removal)s.")
-            radius = 1
+        _api.check_isinstance(Number, radius=radius, startangle=startangle)
+        if radius <= 0:
+            raise ValueError(f'radius must be a positive number, not {radius}')
 
         # Starting theta1 is the start fraction of the circle
-        if startangle is None:
-            _api.warn_deprecated(
-                "3.3", message="Support for passing a startangle of None to "
-                "mean 0 is deprecated since %(since)s and will be removed "
-                "%(removal)s.")
-            startangle = 0
         theta1 = startangle / 360
 
         if wedgeprops is None:
@@ -3128,7 +3231,7 @@ def get_next_color():
                               horizontalalignment=label_alignment_h,
                               verticalalignment=label_alignment_v,
                               rotation=label_rotation,
-                              size=rcParams['xtick.labelsize'])
+                              size=mpl.rcParams['xtick.labelsize'])
                 t.set(**textprops)
                 texts.append(t)
 
@@ -3163,9 +3266,41 @@ def get_next_color():
         else:
             return slices, texts, autotexts
 
+    @staticmethod
+    def _errorevery_to_mask(x, errorevery):
+        """
+        Normalize `errorbar`'s *errorevery* to be a boolean mask for data *x*.
+
+        This function is split out to be usable both by 2D and 3D errorbars.
+        """
+        if isinstance(errorevery, Integral):
+            errorevery = (0, errorevery)
+        if isinstance(errorevery, tuple):
+            if (len(errorevery) == 2 and
+                    isinstance(errorevery[0], Integral) and
+                    isinstance(errorevery[1], Integral)):
+                errorevery = slice(errorevery[0], None, errorevery[1])
+            else:
+                raise ValueError(
+                    f'{errorevery=!r} is a not a tuple of two integers')
+        elif isinstance(errorevery, slice):
+            pass
+        elif not isinstance(errorevery, str) and np.iterable(errorevery):
+            try:
+                x[errorevery]  # fancy indexing
+            except (ValueError, IndexError) as err:
+                raise ValueError(
+                    f"{errorevery=!r} is iterable but not a valid NumPy fancy "
+                    "index to match 'xerr'/'yerr'") from err
+        else:
+            raise ValueError(f"{errorevery=!r} is not a recognized value")
+        everymask = np.zeros(len(x), bool)
+        everymask[errorevery] = True
+        return everymask
+
     @_preprocess_data(replace_names=["x", "y", "xerr", "yerr"],
                       label_namer="y")
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def errorbar(self, x, y, yerr=None, xerr=None,
                  fmt='', ecolor=None, elinewidth=None, capsize=None,
                  barsabove=False, lolims=False, uplims=False,
@@ -3193,7 +3328,7 @@ def errorbar(self, x, y, yerr=None, xerr=None,
               errors.
             - *None*: No errorbar.
 
-            Note that all error arrays should have *positive* values.
+            All values must be >= 0.
 
             See :doc:`/gallery/statistics/errorbar_features`
             for an example on the usage of ``xerr`` and ``yerr``.
@@ -3259,6 +3394,9 @@ def errorbar(self, x, y, yerr=None, xerr=None,
 
         Other Parameters
         ----------------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             All other keyword arguments are passed on to the `~.Axes.plot` call
             drawing the markers. For example, this code makes big red squares
@@ -3272,63 +3410,87 @@ def errorbar(self, x, y, yerr=None, xerr=None,
             property names, *markerfacecolor*, *markeredgecolor*, *markersize*
             and *markeredgewidth*.
 
-            Valid kwargs for the marker properties are `.Line2D` properties:
-
-            %(Line2D_kwdoc)s
+            Valid kwargs for the marker properties are:
+
+            - *dashes*
+            - *dash_capstyle*
+            - *dash_joinstyle*
+            - *drawstyle*
+            - *fillstyle*
+            - *linestyle*
+            - *marker*
+            - *markeredgecolor*
+            - *markeredgewidth*
+            - *markerfacecolor*
+            - *markerfacecoloralt*
+            - *markersize*
+            - *markevery*
+            - *solid_capstyle*
+            - *solid_joinstyle*
+
+            Refer to the corresponding `.Line2D` property for more details:
+
+            %(Line2D:kwdoc)s
         """
         kwargs = cbook.normalize_kwargs(kwargs, mlines.Line2D)
-        # anything that comes in as 'None', drop so the default thing
-        # happens down stream
+        # Drop anything that comes in as None to use the default instead.
         kwargs = {k: v for k, v in kwargs.items() if v is not None}
         kwargs.setdefault('zorder', 2)
 
-        self._process_unit_info([("x", x), ("y", y)], kwargs, convert=False)
+        # Casting to object arrays preserves units.
+        if not isinstance(x, np.ndarray):
+            x = np.asarray(x, dtype=object)
+        if not isinstance(y, np.ndarray):
+            y = np.asarray(y, dtype=object)
 
-        # Make sure all the args are iterable; use lists not arrays to preserve
-        # units.
-        if not np.iterable(x):
-            x = [x]
-
-        if not np.iterable(y):
-            y = [y]
-
-        if len(x) != len(y):
-            raise ValueError("'x' and 'y' must have the same size")
+        def _upcast_err(err):
+            """
+            Safely handle tuple of containers that carry units.
 
-        if xerr is not None:
-            if not np.iterable(xerr):
-                xerr = [xerr] * len(x)
+            This function covers the case where the input to the xerr/yerr is a
+            length 2 tuple of equal length ndarray-subclasses that carry the
+            unit information in the container.
 
-        if yerr is not None:
-            if not np.iterable(yerr):
-                yerr = [yerr] * len(y)
+            If we have a tuple of nested numpy array (subclasses), we defer
+            coercing the units to be consistent to the underlying unit
+            library (and implicitly the broadcasting).
 
-        if isinstance(errorevery, Integral):
-            errorevery = (0, errorevery)
-        if isinstance(errorevery, tuple):
-            if (len(errorevery) == 2 and
-                    isinstance(errorevery[0], Integral) and
-                    isinstance(errorevery[1], Integral)):
-                errorevery = slice(errorevery[0], None, errorevery[1])
-            else:
-                raise ValueError(
-                    f'errorevery={errorevery!r} is a not a tuple of two '
-                    f'integers')
+            Otherwise, fallback to casting to an object array.
+            """
 
-        elif isinstance(errorevery, slice):
-            pass
+            if (
+                    # make sure it is not a scalar
+                    np.iterable(err) and
+                    # and it is not empty
+                    len(err) > 0 and
+                    # and the first element is an array sub-class use
+                    # safe_first_element because getitem is index-first not
+                    # location first on pandas objects so err[0] almost always
+                    # fails.
+                    isinstance(cbook._safe_first_finite(err), np.ndarray)
+            ):
+                # Get the type of the first element
+                atype = type(cbook._safe_first_finite(err))
+                # Promote the outer container to match the inner container
+                if atype is np.ndarray:
+                    # Converts using np.asarray, because data cannot
+                    # be directly passed to init of np.ndarray
+                    return np.asarray(err, dtype=object)
+                # If atype is not np.ndarray, directly pass data to init.
+                # This works for types such as unyts and astropy units
+                return atype(err)
+            # Otherwise wrap it in an object array
+            return np.asarray(err, dtype=object)
+
+        if xerr is not None and not isinstance(xerr, np.ndarray):
+            xerr = _upcast_err(xerr)
+        if yerr is not None and not isinstance(yerr, np.ndarray):
+            yerr = _upcast_err(yerr)
+        x, y = np.atleast_1d(x, y)  # Make sure all the args are iterable.
+        if len(x) != len(y):
+            raise ValueError("'x' and 'y' must have the same size")
 
-        elif not isinstance(errorevery, str) and np.iterable(errorevery):
-            # fancy indexing
-            try:
-                x[errorevery]
-            except (ValueError, IndexError) as err:
-                raise ValueError(
-                    f"errorevery={errorevery!r} is iterable but not a valid "
-                    f"NumPy fancy index to match 'xerr'/'yerr'") from err
-        else:
-            raise ValueError(
-                f"errorevery={errorevery!r} is not a recognized value")
+        everymask = self._errorevery_to_mask(x, errorevery)
 
         label = kwargs.pop("label", None)
         kwargs['label'] = '_nolegend_'
@@ -3363,20 +3525,20 @@ def errorbar(self, x, y, yerr=None, xerr=None,
         if ecolor is None:
             ecolor = base_style['color']
 
-        # Eject any marker information from line format string, as it's not
+        # Eject any line-specific information from format string, as it's not
         # needed for bars or caps.
-        base_style.pop('marker', None)
-        base_style.pop('markersize', None)
-        base_style.pop('markerfacecolor', None)
-        base_style.pop('markeredgewidth', None)
-        base_style.pop('markeredgecolor', None)
-        base_style.pop('markevery', None)
-        base_style.pop('linestyle', None)
+        for key in ['marker', 'markersize', 'markerfacecolor',
+                    'markerfacecoloralt',
+                    'markeredgewidth', 'markeredgecolor', 'markevery',
+                    'linestyle', 'fillstyle', 'drawstyle', 'dash_capstyle',
+                    'dash_joinstyle', 'solid_capstyle', 'solid_joinstyle',
+                    'dashes']:
+            base_style.pop(key, None)
 
         # Make the style dict for the line collections (the bars).
         eb_lines_style = {**base_style, 'color': ecolor}
 
-        if elinewidth:
+        if elinewidth is not None:
             eb_lines_style['linewidth'] = elinewidth
         elif 'linewidth' in kwargs:
             eb_lines_style['linewidth'] = kwargs['linewidth']
@@ -3388,7 +3550,7 @@ def errorbar(self, x, y, yerr=None, xerr=None,
         # Make the style dict for caps (the "hats").
         eb_cap_style = {**base_style, 'linestyle': 'none'}
         if capsize is None:
-            capsize = rcParams["errorbar.capsize"]
+            capsize = mpl.rcParams["errorbar.capsize"]
         if capsize > 0:
             eb_cap_style['markersize'] = 2. * capsize
         if capthick is not None:
@@ -3405,127 +3567,71 @@ def errorbar(self, x, y, yerr=None, xerr=None,
         barcols = []
         caplines = []
 
-        # arrays fine here, they are booleans and hence not units
-        lolims = np.broadcast_to(lolims, len(x)).astype(bool)
-        uplims = np.broadcast_to(uplims, len(x)).astype(bool)
-        xlolims = np.broadcast_to(xlolims, len(x)).astype(bool)
-        xuplims = np.broadcast_to(xuplims, len(x)).astype(bool)
-
-        everymask = np.zeros(len(x), bool)
-        everymask[errorevery] = True
-
-        def apply_mask(arrays, mask):
-            # Return, for each array in *arrays*, the elements for which *mask*
-            # is True, without using fancy indexing.
-            return [[*itertools.compress(array, mask)] for array in arrays]
-
-        def extract_err(name, err, data, lolims, uplims):
-            """
-            Private function to compute error bars.
-
-            Parameters
-            ----------
-            name : {'x', 'y'}
-                Name used in the error message.
-            err : array-like
-                xerr or yerr from errorbar().
-            data : array-like
-                x or y from errorbar().
-            lolims : array-like
-                Error is only applied on **upper** side when this is True.  See
-                the note in the main docstring about this parameter's name.
-            uplims : array-like
-                Error is only applied on **lower** side when this is True.  See
-                the note in the main docstring about this parameter's name.
-            """
-            try:  # Asymmetric error: pair of 1D iterables.
-                a, b = err
-                iter(a)
-                iter(b)
-            except (TypeError, ValueError):
-                a = b = err  # Symmetric error: 1D iterable.
-            if np.ndim(a) > 1 or np.ndim(b) > 1:
+        # Vectorized fancy-indexer.
+        def apply_mask(arrays, mask): return [array[mask] for array in arrays]
+
+        # dep: dependent dataset, indep: independent dataset
+        for (dep_axis, dep, err, lolims, uplims, indep, lines_func,
+             marker, lomarker, himarker) in [
+                ("x", x, xerr, xlolims, xuplims, y, self.hlines,
+                 "|", mlines.CARETRIGHTBASE, mlines.CARETLEFTBASE),
+                ("y", y, yerr, lolims, uplims, x, self.vlines,
+                 "_", mlines.CARETUPBASE, mlines.CARETDOWNBASE),
+        ]:
+            if err is None:
+                continue
+            lolims = np.broadcast_to(lolims, len(dep)).astype(bool)
+            uplims = np.broadcast_to(uplims, len(dep)).astype(bool)
+            try:
+                np.broadcast_to(err, (2, len(dep)))
+            except ValueError:
                 raise ValueError(
-                    f"{name}err must be a scalar or a 1D or (2, n) array-like")
-            # Using list comprehensions rather than arrays to preserve units.
-            for e in [a, b]:
-                if len(data) != len(e):
-                    raise ValueError(
-                        f"The lengths of the data ({len(data)}) and the "
-                        f"error {len(e)} do not match")
-            low = [v if lo else v - e for v, e, lo in zip(data, a, lolims)]
-            high = [v if up else v + e for v, e, up in zip(data, b, uplims)]
-            return low, high
-
-        if xerr is not None:
-            left, right = extract_err('x', xerr, x, xlolims, xuplims)
-            barcols.append(self.hlines(
-                *apply_mask([y, left, right], everymask), **eb_lines_style))
-            # select points without upper/lower limits in x and
-            # draw normal errorbars for these points
-            noxlims = ~(xlolims | xuplims)
-            if noxlims.any() and capsize > 0:
-                yo, lo, ro = apply_mask([y, left, right], noxlims & everymask)
-                caplines.extend([
-                    mlines.Line2D(lo, yo, marker='|', **eb_cap_style),
-                    mlines.Line2D(ro, yo, marker='|', **eb_cap_style)])
-            if xlolims.any():
-                xo, yo, ro = apply_mask([x, y, right], xlolims & everymask)
-                if self.xaxis_inverted():
-                    marker = mlines.CARETLEFTBASE
-                else:
-                    marker = mlines.CARETRIGHTBASE
-                caplines.append(mlines.Line2D(
-                    ro, yo, ls='None', marker=marker, **eb_cap_style))
-                if capsize > 0:
-                    caplines.append(mlines.Line2D(
-                        xo, yo, marker='|', **eb_cap_style))
-            if xuplims.any():
-                xo, yo, lo = apply_mask([x, y, left], xuplims & everymask)
-                if self.xaxis_inverted():
-                    marker = mlines.CARETRIGHTBASE
-                else:
-                    marker = mlines.CARETLEFTBASE
-                caplines.append(mlines.Line2D(
-                    lo, yo, ls='None', marker=marker, **eb_cap_style))
-                if capsize > 0:
-                    caplines.append(mlines.Line2D(
-                        xo, yo, marker='|', **eb_cap_style))
-
-        if yerr is not None:
-            lower, upper = extract_err('y', yerr, y, lolims, uplims)
-            barcols.append(self.vlines(
-                *apply_mask([x, lower, upper], everymask), **eb_lines_style))
-            # select points without upper/lower limits in y and
-            # draw normal errorbars for these points
-            noylims = ~(lolims | uplims)
-            if noylims.any() and capsize > 0:
-                xo, lo, uo = apply_mask([x, lower, upper], noylims & everymask)
-                caplines.extend([
-                    mlines.Line2D(xo, lo, marker='_', **eb_cap_style),
-                    mlines.Line2D(xo, uo, marker='_', **eb_cap_style)])
-            if lolims.any():
-                xo, yo, uo = apply_mask([x, y, upper], lolims & everymask)
-                if self.yaxis_inverted():
-                    marker = mlines.CARETDOWNBASE
-                else:
-                    marker = mlines.CARETUPBASE
-                caplines.append(mlines.Line2D(
-                    xo, uo, ls='None', marker=marker, **eb_cap_style))
-                if capsize > 0:
-                    caplines.append(mlines.Line2D(
-                        xo, yo, marker='_', **eb_cap_style))
-            if uplims.any():
-                xo, yo, lo = apply_mask([x, y, lower], uplims & everymask)
-                if self.yaxis_inverted():
-                    marker = mlines.CARETUPBASE
-                else:
-                    marker = mlines.CARETDOWNBASE
-                caplines.append(mlines.Line2D(
-                    xo, lo, ls='None', marker=marker, **eb_cap_style))
+                    f"'{dep_axis}err' (shape: {np.shape(err)}) must be a "
+                    f"scalar or a 1D or (2, n) array-like whose shape matches "
+                    f"'{dep_axis}' (shape: {np.shape(dep)})") from None
+            res = np.zeros(err.shape, dtype=bool)  # Default in case of nan
+            if np.any(np.less(err, -err, out=res, where=(err == err))):
+                # like err<0, but also works for timedelta and nan.
+                raise ValueError(
+                    f"'{dep_axis}err' must not contain negative values")
+            # This is like
+            #     elow, ehigh = np.broadcast_to(...)
+            #     return dep - elow * ~lolims, dep + ehigh * ~uplims
+            # except that broadcast_to would strip units.
+            low, high = dep + np.row_stack([-(1 - lolims), 1 - uplims]) * err
+
+            barcols.append(lines_func(
+                *apply_mask([indep, low, high], everymask), **eb_lines_style))
+            # Normal errorbars for points without upper/lower limits.
+            nolims = ~(lolims | uplims)
+            if nolims.any() and capsize > 0:
+                indep_masked, lo_masked, hi_masked = apply_mask(
+                    [indep, low, high], nolims & everymask)
+                for lh_masked in [lo_masked, hi_masked]:
+                    # Since this has to work for x and y as dependent data, we
+                    # first set both x and y to the independent variable and
+                    # overwrite the respective dependent data in a second step.
+                    line = mlines.Line2D(indep_masked, indep_masked,
+                                         marker=marker, **eb_cap_style)
+                    line.set(**{f"{dep_axis}data": lh_masked})
+                    caplines.append(line)
+            for idx, (lims, hl) in enumerate([(lolims, high), (uplims, low)]):
+                if not lims.any():
+                    continue
+                hlmarker = (
+                    himarker
+                    if getattr(self, f"{dep_axis}axis").get_inverted() ^ idx
+                    else lomarker)
+                x_masked, y_masked, hl_masked = apply_mask(
+                    [x, y, hl], lims & everymask)
+                # As above, we set the dependent data in a second step.
+                line = mlines.Line2D(x_masked, y_masked,
+                                     marker=hlmarker, **eb_cap_style)
+                line.set(**{f"{dep_axis}data": hl_masked})
+                caplines.append(line)
                 if capsize > 0:
                     caplines.append(mlines.Line2D(
-                        xo, yo, marker='_', **eb_cap_style))
+                        x_masked, y_masked, marker=marker, **eb_cap_style))
 
         for l in caplines:
             self.add_line(l)
@@ -3547,28 +3653,41 @@ def boxplot(self, x, notch=None, sym=None, vert=None, whis=None,
                 showbox=None, showfliers=None, boxprops=None,
                 labels=None, flierprops=None, medianprops=None,
                 meanprops=None, capprops=None, whiskerprops=None,
-                manage_ticks=True, autorange=False, zorder=None):
+                manage_ticks=True, autorange=False, zorder=None,
+                capwidths=None):
         """
-        Make a box and whisker plot.
+        Draw a box and whisker plot.
+
+        The box extends from the first quartile (Q1) to the third
+        quartile (Q3) of the data, with a line at the median.  The
+        whiskers extend from the box by 1.5x the inter-quartile range
+        (IQR).  Flier points are those past the end of the whiskers.
+        See https://en.wikipedia.org/wiki/Box_plot for reference.
+
+        .. code-block:: none
+
+                  Q1-1.5IQR   Q1   median  Q3   Q3+1.5IQR
+                               |-----:-----|
+               o      |--------|     :     |--------|    o  o
+                               |-----:-----|
+             flier             <----------->            fliers
+                                    IQR
 
-        Make a box and whisker plot for each column of *x* or each
-        vector in sequence *x*.  The box extends from the lower to
-        upper quartile values of the data, with a line at the median.
-        The whiskers extend from the box to show the range of the
-        data.  Flier points are those past the end of the whiskers.
 
         Parameters
         ----------
         x : Array or a sequence of vectors.
-            The input data.
+            The input data.  If a 2D array, a boxplot is drawn for each column
+            in *x*.  If a sequence of 1D arrays, a boxplot is drawn for each
+            array in *x*.
 
         notch : bool, default: False
-            Whether to draw a notched box plot (`True`), or a rectangular box
-            plot (`False`).  The notches represent the confidence interval (CI)
-            around the median.  The documentation for *bootstrap* describes how
-            the locations of the notches are computed by default, but their
-            locations may also be overridden by setting the *conf_intervals*
-            parameter.
+            Whether to draw a notched boxplot (`True`), or a rectangular
+            boxplot (`False`).  The notches represent the confidence interval
+            (CI) around the median.  The documentation for *bootstrap*
+            describes how the locations of the notches are computed by
+            default, but their locations may also be overridden by setting the
+            *conf_intervals* parameter.
 
             .. note::
 
@@ -3643,7 +3762,7 @@ def boxplot(self, x, notch=None, sym=None, vert=None, whis=None,
 
         patch_artist : bool, default: False
             If `False` produces boxes with the Line2D artist. Otherwise,
-            boxes and drawn with Patch artists.
+            boxes are drawn with Patch artists.
 
         labels : sequence, optional
             Labels for each dataset (one per dataset).
@@ -3702,6 +3821,8 @@ def boxplot(self, x, notch=None, sym=None, vert=None, whis=None,
             Show the arithmetic means.
         capprops : dict, default: None
             The style of the caps.
+        capwidths : float or array, default: None
+            The widths of the caps.
         boxprops : dict, default: None
             The style of the box.
         whiskerprops : dict, default: None
@@ -3712,33 +3833,38 @@ def boxplot(self, x, notch=None, sym=None, vert=None, whis=None,
             The style of the median.
         meanprops : dict, default: None
             The style of the mean.
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
 
+        See Also
+        --------
+        violinplot : Draw an estimate of the probability density function.
         """
 
         # Missing arguments default to rcParams.
         if whis is None:
-            whis = rcParams['boxplot.whiskers']
+            whis = mpl.rcParams['boxplot.whiskers']
         if bootstrap is None:
-            bootstrap = rcParams['boxplot.bootstrap']
+            bootstrap = mpl.rcParams['boxplot.bootstrap']
 
         bxpstats = cbook.boxplot_stats(x, whis=whis, bootstrap=bootstrap,
                                        labels=labels, autorange=autorange)
         if notch is None:
-            notch = rcParams['boxplot.notch']
+            notch = mpl.rcParams['boxplot.notch']
         if vert is None:
-            vert = rcParams['boxplot.vertical']
+            vert = mpl.rcParams['boxplot.vertical']
         if patch_artist is None:
-            patch_artist = rcParams['boxplot.patchartist']
+            patch_artist = mpl.rcParams['boxplot.patchartist']
         if meanline is None:
-            meanline = rcParams['boxplot.meanline']
+            meanline = mpl.rcParams['boxplot.meanline']
         if showmeans is None:
-            showmeans = rcParams['boxplot.showmeans']
+            showmeans = mpl.rcParams['boxplot.showmeans']
         if showcaps is None:
-            showcaps = rcParams['boxplot.showcaps']
+            showcaps = mpl.rcParams['boxplot.showcaps']
         if showbox is None:
-            showbox = rcParams['boxplot.showbox']
+            showbox = mpl.rcParams['boxplot.showbox']
         if showfliers is None:
-            showfliers = rcParams['boxplot.showfliers']
+            showfliers = mpl.rcParams['boxplot.showfliers']
 
         if boxprops is None:
             boxprops = {}
@@ -3760,7 +3886,7 @@ def boxplot(self, x, notch=None, sym=None, vert=None, whis=None,
 
         # if non-default sym value, put it into the flier dictionary
         # the logic for providing the default symbol ('b+') now lives
-        # in bxp in the initial value of final_flierprops
+        # in bxp in the initial value of flierkw
         # handle all of the *sym* related logic here so we only have to pass
         # on the flierprops dict.
         if sym is not None:
@@ -3825,7 +3951,8 @@ def boxplot(self, x, notch=None, sym=None, vert=None, whis=None,
                            medianprops=medianprops, meanprops=meanprops,
                            meanline=meanline, showfliers=showfliers,
                            capprops=capprops, whiskerprops=whiskerprops,
-                           manage_ticks=manage_ticks, zorder=zorder)
+                           manage_ticks=manage_ticks, zorder=zorder,
+                           capwidths=capwidths)
         return artists
 
     def bxp(self, bxpstats, positions=None, widths=None, vert=True,
@@ -3833,7 +3960,8 @@ def bxp(self, bxpstats, positions=None, widths=None, vert=True,
             showcaps=True, showbox=True, showfliers=True,
             boxprops=None, whiskerprops=None, flierprops=None,
             medianprops=None, capprops=None, meanprops=None,
-            meanline=False, manage_ticks=True, zorder=None):
+            meanline=False, manage_ticks=True, zorder=None,
+            capwidths=None):
         """
         Drawing function for box and whisker plots.
 
@@ -3849,85 +3977,49 @@ def bxp(self, bxpstats, positions=None, widths=None, vert=True,
           A list of dictionaries containing stats for each boxplot.
           Required keys are:
 
-          - ``med``: The median (scalar float).
-
-          - ``q1``: The first quartile (25th percentile) (scalar
-            float).
-
-          - ``q3``: The third quartile (75th percentile) (scalar
-            float).
-
-          - ``whislo``: Lower bound of the lower whisker (scalar
-            float).
-
-          - ``whishi``: Upper bound of the upper whisker (scalar
-            float).
+          - ``med``: Median (scalar).
+          - ``q1``, ``q3``: First & third quartiles (scalars).
+          - ``whislo``, ``whishi``: Lower & upper whisker positions (scalars).
 
           Optional keys are:
 
-          - ``mean``: The mean (scalar float). Needed if
-            ``showmeans=True``.
-
-          - ``fliers``: Data beyond the whiskers (sequence of floats).
+          - ``mean``: Mean (scalar).  Needed if ``showmeans=True``.
+          - ``fliers``: Data beyond the whiskers (array-like).
             Needed if ``showfliers=True``.
-
-          - ``cilo`` & ``cihi``: Lower and upper confidence intervals
+          - ``cilo``, ``cihi``: Lower & upper confidence intervals
             about the median. Needed if ``shownotches=True``.
-
-          - ``label``: Name of the dataset (string). If available,
+          - ``label``: Name of the dataset (str).  If available,
             this will be used a tick label for the boxplot
 
         positions : array-like, default: [1, 2, ..., n]
           The positions of the boxes. The ticks and limits
           are automatically set to match the positions.
 
-        widths : array-like, default: None
-          Either a scalar or a vector and sets the width of each
-          box. The default is ``0.15*(distance between extreme
-          positions)``, clipped to no less than 0.15 and no more than
-          0.5.
+        widths : float or array-like, default: None
+          The widths of the boxes.  The default is
+          ``clip(0.15*(distance between extreme positions), 0.15, 0.5)``.
+
+        capwidths : float or array-like, default: None
+          Either a scalar or a vector and sets the width of each cap.
+          The default is ``0.5*(with of the box)``, see *widths*.
 
         vert : bool, default: True
-          If `True` (default), makes the boxes vertical.  If `False`,
-          makes horizontal boxes.
+          If `True` (default), makes the boxes vertical.
+          If `False`, makes horizontal boxes.
 
         patch_artist : bool, default: False
           If `False` produces boxes with the `.Line2D` artist.
           If `True` produces boxes with the `~matplotlib.patches.Patch` artist.
 
-        shownotches : bool, default: False
-          If `False` (default), produces a rectangular box plot.
-          If `True`, will produce a notched box plot
-
-        showmeans : bool, default: False
-          If `True`, will toggle on the rendering of the means
-
-        showcaps  : bool, default: True
-          If `True`, will toggle on the rendering of the caps
-
-        showbox  : bool, default: True
-          If `True`, will toggle on the rendering of the box
-
-        showfliers : bool, default: True
-          If `True`, will toggle on the rendering of the fliers
+        shownotches, showmeans, showcaps, showbox, showfliers : bool
+          Whether to draw the CI notches, the mean value (both default to
+          False), the caps, the box, and the fliers (all three default to
+          True).
 
-        boxprops : dict or None (default)
-          If provided, will set the plotting style of the boxes
-
-        whiskerprops : dict or None (default)
-          If provided, will set the plotting style of the whiskers
-
-        capprops : dict or None (default)
-          If provided, will set the plotting style of the caps
-
-        flierprops : dict or None (default)
-          If provided will set the plotting style of the fliers
-
-        medianprops : dict or None (default)
-          If provided, will set the plotting style of the medians
-
-        meanprops : dict or None (default)
-          If provided, will set the plotting style of the means
+        boxprops, whiskerprops, capprops, flierprops, medianprops, meanprops :\
+ dict, optional
+          Artist properties for the boxes, whiskers, caps, fliers, medians, and
+          means.
 
         meanline : bool, default: False
           If `True` (and *showmeans* is `True`), will try to render the mean
@@ -3949,28 +4041,19 @@ def bxp(self, bxpstats, positions=None, widths=None, vert=True,
           of the `.Line2D` instances created. That dictionary has the
           following keys (assuming vertical boxplots):
 
-          - ``boxes``: the main body of the boxplot showing the
-            quartiles and the median's confidence intervals if
-            enabled.
-
+          - ``boxes``: main bodies of the boxplot showing the quartiles, and
+            the median's confidence intervals if enabled.
           - ``medians``: horizontal lines at the median of each box.
-
-          - ``whiskers``: the vertical lines extending to the most
-            extreme, non-outlier data points.
-
-          - ``caps``: the horizontal lines at the ends of the
-            whiskers.
-
-          - ``fliers``: points representing data that extend beyond
-            the whiskers (fliers).
-
+          - ``whiskers``: vertical lines up to the last non-outlier data.
+          - ``caps``: horizontal lines at the ends of the whiskers.
+          - ``fliers``: points representing data beyond the whiskers (fliers).
           - ``means``: points or lines representing the means.
 
         Examples
         --------
         .. plot:: gallery/statistics/bxp.py
-
         """
+
         # lists of artists to be output
         whiskers = []
         caps = []
@@ -3988,72 +4071,46 @@ def bxp(self, bxpstats, positions=None, widths=None, vert=True,
 
         zdelta = 0.1
 
-        def line_props_with_rcdefaults(subkey, explicit, zdelta=0,
-                                       use_marker=True):
-            d = {k.split('.')[-1]: v for k, v in rcParams.items()
-                 if k.startswith(f'boxplot.{subkey}')}
+        def merge_kw_rc(subkey, explicit, zdelta=0, usemarker=True):
+            d = {k.split('.')[-1]: v for k, v in mpl.rcParams.items()
+                 if k.startswith(f'boxplot.{subkey}props')}
             d['zorder'] = zorder + zdelta
-            if not use_marker:
+            if not usemarker:
                 d['marker'] = ''
             d.update(cbook.normalize_kwargs(explicit, mlines.Line2D))
             return d
 
-        # box properties
-        if patch_artist:
-            final_boxprops = {
-                'linestyle': rcParams['boxplot.boxprops.linestyle'],
-                'linewidth': rcParams['boxplot.boxprops.linewidth'],
-                'edgecolor': rcParams['boxplot.boxprops.color'],
-                'facecolor': ('white' if rcParams['_internal.classic_mode']
-                              else rcParams['patch.facecolor']),
-                'zorder': zorder,
-                **cbook.normalize_kwargs(boxprops, mpatches.PathPatch)
-            }
-        else:
-            final_boxprops = line_props_with_rcdefaults('boxprops', boxprops,
-                                                        use_marker=False)
-        final_whiskerprops = line_props_with_rcdefaults(
-            'whiskerprops', whiskerprops, use_marker=False)
-        final_capprops = line_props_with_rcdefaults(
-            'capprops', capprops, use_marker=False)
-        final_flierprops = line_props_with_rcdefaults(
-            'flierprops', flierprops)
-        final_medianprops = line_props_with_rcdefaults(
-            'medianprops', medianprops, zdelta, use_marker=False)
-        final_meanprops = line_props_with_rcdefaults(
-            'meanprops', meanprops, zdelta)
+        box_kw = {
+            'linestyle': mpl.rcParams['boxplot.boxprops.linestyle'],
+            'linewidth': mpl.rcParams['boxplot.boxprops.linewidth'],
+            'edgecolor': mpl.rcParams['boxplot.boxprops.color'],
+            'facecolor': ('white' if mpl.rcParams['_internal.classic_mode']
+                          else mpl.rcParams['patch.facecolor']),
+            'zorder': zorder,
+            **cbook.normalize_kwargs(boxprops, mpatches.PathPatch)
+        } if patch_artist else merge_kw_rc('box', boxprops, usemarker=False)
+        whisker_kw = merge_kw_rc('whisker', whiskerprops, usemarker=False)
+        cap_kw = merge_kw_rc('cap', capprops, usemarker=False)
+        flier_kw = merge_kw_rc('flier', flierprops)
+        median_kw = merge_kw_rc('median', medianprops, zdelta, usemarker=False)
+        mean_kw = merge_kw_rc('mean', meanprops, zdelta)
         removed_prop = 'marker' if meanline else 'linestyle'
         # Only remove the property if it's not set explicitly as a parameter.
         if meanprops is None or removed_prop not in meanprops:
-            final_meanprops[removed_prop] = ''
-
-        def patch_list(xs, ys, **kwargs):
-            path = mpath.Path(
-                # Last vertex will have a CLOSEPOLY code and thus be ignored.
-                np.append(np.column_stack([xs, ys]), [(0, 0)], 0),
-                closed=True)
-            patch = mpatches.PathPatch(path, **kwargs)
-            self.add_artist(patch)
-            return [patch]
+            mean_kw[removed_prop] = ''
 
         # vertical or horizontal plot?
-        if vert:
-            def doplot(*args, **kwargs):
-                return self.plot(*args, **kwargs)
-
-            def dopatch(xs, ys, **kwargs):
-                return patch_list(xs, ys, **kwargs)
+        maybe_swap = slice(None) if vert else slice(None, None, -1)
 
-        else:
-            def doplot(*args, **kwargs):
-                shuffled = []
-                for i in range(0, len(args), 2):
-                    shuffled.extend([args[i + 1], args[i]])
-                return self.plot(*shuffled, **kwargs)
+        def do_plot(xs, ys, **kwargs):
+            return self.plot(*[xs, ys][maybe_swap], **kwargs)[0]
 
-            def dopatch(xs, ys, **kwargs):
-                xs, ys = ys, xs  # flip X, Y
-                return patch_list(xs, ys, **kwargs)
+        def do_patch(xs, ys, **kwargs):
+            path = mpath.Path._create_closed(
+                np.column_stack([xs, ys][maybe_swap]))
+            patch = mpatches.PathPatch(path, **kwargs)
+            self.add_artist(patch)
+            return patch
 
         # input validation
         N = len(bxpstats)
@@ -4077,38 +4134,45 @@ def dopatch(xs, ys, **kwargs):
         elif len(widths) != N:
             raise ValueError(datashape_message.format("widths"))
 
-        for pos, width, stats in zip(positions, widths, bxpstats):
+        # capwidth
+        if capwidths is None:
+            capwidths = 0.5 * np.array(widths)
+        elif np.isscalar(capwidths):
+            capwidths = [capwidths] * N
+        elif len(capwidths) != N:
+            raise ValueError(datashape_message.format("capwidths"))
+
+        for pos, width, stats, capwidth in zip(positions, widths, bxpstats,
+                                               capwidths):
             # try to find a new label
             datalabels.append(stats.get('label', pos))
 
             # whisker coords
-            whisker_x = np.ones(2) * pos
-            whiskerlo_y = np.array([stats['q1'], stats['whislo']])
-            whiskerhi_y = np.array([stats['q3'], stats['whishi']])
-
+            whis_x = [pos, pos]
+            whislo_y = [stats['q1'], stats['whislo']]
+            whishi_y = [stats['q3'], stats['whishi']]
             # cap coords
-            cap_left = pos - width * 0.25
-            cap_right = pos + width * 0.25
-            cap_x = np.array([cap_left, cap_right])
-            cap_lo = np.ones(2) * stats['whislo']
-            cap_hi = np.ones(2) * stats['whishi']
-
+            cap_left = pos - capwidth * 0.5
+            cap_right = pos + capwidth * 0.5
+            cap_x = [cap_left, cap_right]
+            cap_lo = np.full(2, stats['whislo'])
+            cap_hi = np.full(2, stats['whishi'])
             # box and median coords
             box_left = pos - width * 0.5
             box_right = pos + width * 0.5
             med_y = [stats['med'], stats['med']]
-
             # notched boxes
             if shownotches:
-                box_x = [box_left, box_right, box_right, cap_right, box_right,
-                         box_right, box_left, box_left, cap_left, box_left,
-                         box_left]
+                notch_left = pos - width * 0.25
+                notch_right = pos + width * 0.25
+                box_x = [box_left, box_right, box_right, notch_right,
+                         box_right, box_right, box_left, box_left, notch_left,
+                         box_left, box_left]
                 box_y = [stats['q1'], stats['q1'], stats['cilo'],
                          stats['med'], stats['cihi'], stats['q3'],
                          stats['q3'], stats['cihi'], stats['med'],
                          stats['cilo'], stats['q1']]
-                med_x = cap_x
-
+                med_x = [notch_left, notch_right]
             # plain boxes
             else:
                 box_x = [box_left, box_right, box_right, box_left, box_left]
@@ -4116,50 +4180,33 @@ def dopatch(xs, ys, **kwargs):
                          stats['q1']]
                 med_x = [box_left, box_right]
 
-            # maybe draw the box:
+            # maybe draw the box
             if showbox:
-                if patch_artist:
-                    boxes.extend(dopatch(box_x, box_y, **final_boxprops))
-                else:
-                    boxes.extend(doplot(box_x, box_y, **final_boxprops))
-
+                do_box = do_patch if patch_artist else do_plot
+                boxes.append(do_box(box_x, box_y, **box_kw))
             # draw the whiskers
-            whiskers.extend(doplot(
-                whisker_x, whiskerlo_y, **final_whiskerprops
-            ))
-            whiskers.extend(doplot(
-                whisker_x, whiskerhi_y, **final_whiskerprops
-            ))
-
-            # maybe draw the caps:
+            whiskers.append(do_plot(whis_x, whislo_y, **whisker_kw))
+            whiskers.append(do_plot(whis_x, whishi_y, **whisker_kw))
+            # maybe draw the caps
             if showcaps:
-                caps.extend(doplot(cap_x, cap_lo, **final_capprops))
-                caps.extend(doplot(cap_x, cap_hi, **final_capprops))
-
+                caps.append(do_plot(cap_x, cap_lo, **cap_kw))
+                caps.append(do_plot(cap_x, cap_hi, **cap_kw))
             # draw the medians
-            medians.extend(doplot(med_x, med_y, **final_medianprops))
-
+            medians.append(do_plot(med_x, med_y, **median_kw))
             # maybe draw the means
             if showmeans:
                 if meanline:
-                    means.extend(doplot(
+                    means.append(do_plot(
                         [box_left, box_right], [stats['mean'], stats['mean']],
-                        **final_meanprops
+                        **mean_kw
                     ))
                 else:
-                    means.extend(doplot(
-                        [pos], [stats['mean']], **final_meanprops
-                    ))
-
+                    means.append(do_plot([pos], [stats['mean']], **mean_kw))
             # maybe draw the fliers
             if showfliers:
-                # fliers coords
                 flier_x = np.full(len(stats['fliers']), pos, dtype=np.float64)
                 flier_y = stats['fliers']
-
-                fliers.extend(doplot(
-                    flier_x, flier_y, **final_flierprops
-                ))
+                fliers.append(do_plot(flier_x, flier_y, **flier_kw))
 
         if manage_ticks:
             axis_name = "x" if vert else "y"
@@ -4191,8 +4238,7 @@ def dopatch(xs, ys, **kwargs):
                 axis.set_major_formatter(formatter)
             formatter.seq = [*formatter.seq, *datalabels]
 
-            self._request_autoscale_view(
-                scalex=self._autoscaleXon, scaley=self._autoscaleYon)
+            self._request_autoscale_view()
 
         return dict(whiskers=whiskers, caps=caps, boxes=boxes,
                     medians=medians, fliers=fliers, means=means)
@@ -4268,7 +4314,7 @@ def _parse_scatter_color_args(c, edgecolors, kwargs, xsize,
                 mcolors.to_rgba_array(kwcolor)
             except ValueError as err:
                 raise ValueError(
-                    "'color' kwarg must be an color or sequence of color "
+                    "'color' kwarg must be a color or sequence of color "
                     "specs.  For a sequence of values to be color-mapped, use "
                     "the 'c' argument instead.") from err
             if edgecolors is None:
@@ -4276,18 +4322,18 @@ def _parse_scatter_color_args(c, edgecolors, kwargs, xsize,
             if facecolors is None:
                 facecolors = kwcolor
 
-        if edgecolors is None and not rcParams['_internal.classic_mode']:
-            edgecolors = rcParams['scatter.edgecolors']
+        if edgecolors is None and not mpl.rcParams['_internal.classic_mode']:
+            edgecolors = mpl.rcParams['scatter.edgecolors']
 
         c_was_none = c is None
         if c is None:
             c = (facecolors if facecolors is not None
-                 else "b" if rcParams['_internal.classic_mode']
+                 else "b" if mpl.rcParams['_internal.classic_mode']
                  else get_next_color_func())
         c_is_string_or_strings = (
             isinstance(c, str)
             or (np.iterable(c) and len(c) > 0
-                and isinstance(cbook.safe_first_element(c), str)))
+                and isinstance(cbook._safe_first_finite(c), str)))
 
         def invalid_shape_exception(csize, xsize):
             return ValueError(
@@ -4351,6 +4397,7 @@ def invalid_shape_exception(csize, xsize):
                                      "edgecolors", "c", "facecolor",
                                      "facecolors", "color"],
                       label_namer="y")
+    @_docstring.interpd
     def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
                 vmin=None, vmax=None, alpha=None, linewidths=None, *,
                 edgecolors=None, plotnonfinite=False, **kwargs):
@@ -4363,7 +4410,7 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
             The data positions.
 
         s : float or array-like, shape (n, ), optional
-            The marker size in points**2.
+            The marker size in points**2 (typographic points are 1/72 in.).
             Default is ``rcParams['lines.markersize'] ** 2``.
 
         c : array-like or list of colors or color, optional
@@ -4397,21 +4444,17 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
             See :mod:`matplotlib.markers` for more information about marker
             styles.
 
-        cmap : str or `~matplotlib.colors.Colormap`, default: :rc:`image.cmap`
-            A `.Colormap` instance or registered colormap name. *cmap* is only
-            used if *c* is an array of floats.
+        %(cmap_doc)s
+
+            This parameter is ignored if *c* is RGB(A).
 
-        norm : `~matplotlib.colors.Normalize`, default: None
-            If *c* is an array of floats, *norm* is used to scale the color
-            data, *c*, in the range 0 to 1, in order to map into the colormap
-            *cmap*.
-            If *None*, use the default `.colors.Normalize`.
+        %(norm_doc)s
 
-        vmin, vmax : float, default: None
-            *vmin* and *vmax* are used in conjunction with the default norm to
-            map the color array *c* to the colormap *cmap*. If None, the
-            respective min and max of the color array is used.
-            It is deprecated to use *vmin*/*vmax* when *norm* is given.
+            This parameter is ignored if *c* is RGB(A).
+
+        %(vmin_vmax_doc)s
+
+            This parameter is ignored if *c* is RGB(A).
 
         alpha : float, default: None
             The alpha blending value, between 0 (transparent) and 1 (opaque).
@@ -4443,6 +4486,8 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
 
         Other Parameters
         ----------------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
         **kwargs : `~matplotlib.collections.Collection` properties
 
         See Also
@@ -4466,9 +4511,7 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
 
         """
         # Process **kwargs to handle aliases, conflicts with explicit kwargs:
-
         x, y = self._process_unit_info([("x", x), ("y", y)], kwargs)
-
         # np.ma.ravel yields an ndarray, not a masked array,
         # unless its argument is a masked array.
         x = np.ma.ravel(x)
@@ -4477,8 +4520,8 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
             raise ValueError("x and y must be the same size")
 
         if s is None:
-            s = (20 if rcParams['_internal.classic_mode'] else
-                 rcParams['lines.markersize'] ** 2.0)
+            s = (20 if mpl.rcParams['_internal.classic_mode'] else
+                 mpl.rcParams['lines.markersize'] ** 2.0)
         s = np.ma.ravel(s)
         if (len(s) not in (1, x.size) or
                 (not np.issubdtype(s.dtype, np.floating) and
@@ -4514,7 +4557,7 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
 
         # load default marker from rcParams
         if marker is None:
-            marker = rcParams['scatter.marker']
+            marker = mpl.rcParams['scatter.marker']
 
         if isinstance(marker, mmarkers.MarkerStyle):
             marker_obj = marker
@@ -4546,8 +4589,8 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
                 # promote the facecolor to be the edgecolor
                 edgecolors = colors
                 # set the facecolor to 'none' (at the last chance) because
-                # we can not not fill a path if the facecolor is non-null.
-                # (which is defendable at the renderer level)
+                # we can not fill a path if the facecolor is non-null
+                # (which is defendable at the renderer level).
                 colors = 'none'
             else:
                 # if we are not nulling the face color we can do this
@@ -4555,38 +4598,47 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
                 edgecolors = 'face'
 
             if linewidths is None:
-                linewidths = rcParams['lines.linewidth']
+                linewidths = mpl.rcParams['lines.linewidth']
             elif np.iterable(linewidths):
                 linewidths = [
-                    lw if lw is not None else rcParams['lines.linewidth']
+                    lw if lw is not None else mpl.rcParams['lines.linewidth']
                     for lw in linewidths]
 
         offsets = np.ma.column_stack([x, y])
 
         collection = mcoll.PathCollection(
-                (path,), scales,
-                facecolors=colors,
-                edgecolors=edgecolors,
-                linewidths=linewidths,
-                offsets=offsets,
-                transOffset=kwargs.pop('transform', self.transData),
-                alpha=alpha
-                )
+            (path,), scales,
+            facecolors=colors,
+            edgecolors=edgecolors,
+            linewidths=linewidths,
+            offsets=offsets,
+            offset_transform=kwargs.pop('transform', self.transData),
+            alpha=alpha,
+        )
         collection.set_transform(mtransforms.IdentityTransform())
-        collection.update(kwargs)
-
         if colors is None:
             collection.set_array(c)
             collection.set_cmap(cmap)
             collection.set_norm(norm)
             collection._scale_norm(norm, vmin, vmax)
+        else:
+            extra_kwargs = {
+                    'cmap': cmap, 'norm': norm, 'vmin': vmin, 'vmax': vmax
+                    }
+            extra_keys = [k for k, v in extra_kwargs.items() if v is not None]
+            if any(extra_keys):
+                keys_str = ", ".join(f"'{k}'" for k in extra_keys)
+                _api.warn_external(
+                    "No data for colormapping provided via 'c'. "
+                    f"Parameters {keys_str} will be ignored")
+        collection._internal_update(kwargs)
 
         # Classic mode only:
         # ensure there are margins to allow for the
         # finite size of the symbols.  In v2.x, margins
         # are present by default, so we disable this
         # scatter-specific override.
-        if rcParams['_internal.classic_mode']:
+        if mpl.rcParams['_internal.classic_mode']:
             if self._xmargin < 0.05 and x.size > 0:
                 self.set_xmargin(0.05)
             if self._ymargin < 0.05 and x.size > 0:
@@ -4598,7 +4650,7 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
         return collection
 
     @_preprocess_data(replace_names=["x", "y", "C"], label_namer="y")
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def hexbin(self, x, y, C=None, gridsize=100, bins=None,
                xscale='linear', yscale='linear', extent=None,
                cmap=None, norm=None, vmin=None, vmax=None,
@@ -4629,7 +4681,31 @@ def hexbin(self, x, y, C=None, gridsize=100, bins=None,
             the hexagons are approximately regular.
 
             Alternatively, if a tuple (*nx*, *ny*), the number of hexagons
-            in the *x*-direction and the *y*-direction.
+            in the *x*-direction and the *y*-direction. In the
+            *y*-direction, counting is done along vertically aligned
+            hexagons, not along the zig-zag chains of hexagons; see the
+            following illustration.
+
+            .. plot::
+
+               import numpy
+               import matplotlib.pyplot as plt
+
+               np.random.seed(19680801)
+               n= 300
+               x = np.random.standard_normal(n)
+               y = np.random.standard_normal(n)
+
+               fig, ax = plt.subplots(figsize=(4, 4))
+               h = ax.hexbin(x, y, gridsize=(5, 3))
+               hx, hy = h.get_offsets().T
+               ax.plot(hx[24::3], hy[24::3], 'ro-')
+               ax.plot(hx[-3:], hy[-3:], 'ro-')
+               ax.set_title('gridsize=(5, 3)')
+               ax.axis('off')
+
+            To get approximately regular hexagons, choose
+            :math:`n_x = \\sqrt{3}\\,n_y`.
 
         bins : 'log' or int or sequence, default: None
             Discretization of the hexagon values.
@@ -4659,17 +4735,16 @@ def hexbin(self, x, y, C=None, gridsize=100, bins=None,
             colormapped rectangles along the bottom of the x-axis and
             left of the y-axis.
 
-        extent : float, default: *None*
-            The limits of the bins. The default assigns the limits
-            based on *gridsize*, *x*, *y*, *xscale* and *yscale*.
+        extent : 4-tuple of float, default: *None*
+            The limits of the bins (xmin, xmax, ymin, ymax).
+            The default assigns the limits based on
+            *gridsize*, *x*, *y*, *xscale* and *yscale*.
 
             If *xscale* or *yscale* is set to 'log', the limits are
             expected to be the exponent for a power of 10. E.g. for
             x-limits of 1 and 50 in 'linear' scale and y-limits
             of 10 and 1000 in 'log' scale, enter (1, 50, 1, 3).
 
-            Order of scalars is (left, right, bottom, top).
-
         Returns
         -------
         `~matplotlib.collections.PolyCollection`
@@ -4686,21 +4761,11 @@ def hexbin(self, x, y, C=None, gridsize=100, bins=None,
 
         Other Parameters
         ----------------
-        cmap : str or `~matplotlib.colors.Colormap`, default: :rc:`image.cmap`
-            The Colormap instance or registered colormap name used to map
-            the bin values to colors.
-
-        norm : `~matplotlib.colors.Normalize`, optional
-            The Normalize instance scales the bin values to the canonical
-            colormap range [0, 1] for mapping to colors. By default, the data
-            range is mapped to the colorbar range using linear scaling.
-
-        vmin, vmax : float, default: None
-            The colorbar range. If *None*, suitable min/max values are
-            automatically chosen by the `~.Normalize` instance (defaults to
-            the respective min/max values of the bins in case of the default
-            linear scaling).
-            It is deprecated to use *vmin*/*vmax* when *norm* is given.
+        %(cmap_doc)s
+
+        %(norm_doc)s
+
+        %(vmin_vmax_doc)s
 
         alpha : float between 0 and 1, optional
             The alpha blending value, between 0 (transparent) and 1 (opaque).
@@ -4729,11 +4794,17 @@ def reduce_C_function(C: array) -> float
             - `numpy.sum`: integral of the point values
             - `numpy.amax`: value taken from the largest point
 
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs : `~matplotlib.collections.PolyCollection` properties
             All other keyword arguments are passed on to `.PolyCollection`:
 
-            %(PolyCollection_kwdoc)s
+            %(PolyCollection:kwdoc)s
 
+        See Also
+        --------
+        hist2d : 2D histogram rectangular bins
         """
         self._process_unit_info([("x", x), ("y", y)], kwargs, convert=False)
 
@@ -4746,28 +4817,39 @@ def reduce_C_function(C: array) -> float
             nx = gridsize
             ny = int(nx / math.sqrt(3))
         # Count the number of data in each hexagon
-        x = np.array(x, float)
-        y = np.array(y, float)
+        x = np.asarray(x, float)
+        y = np.asarray(y, float)
+
+        # Will be log()'d if necessary, and then rescaled.
+        tx = x
+        ty = y
+
         if xscale == 'log':
             if np.any(x <= 0.0):
-                raise ValueError("x contains non-positive values, so can not"
-                                 " be log-scaled")
-            x = np.log10(x)
+                raise ValueError("x contains non-positive values, so can not "
+                                 "be log-scaled")
+            tx = np.log10(tx)
         if yscale == 'log':
             if np.any(y <= 0.0):
-                raise ValueError("y contains non-positive values, so can not"
-                                 " be log-scaled")
-            y = np.log10(y)
+                raise ValueError("y contains non-positive values, so can not "
+                                 "be log-scaled")
+            ty = np.log10(ty)
         if extent is not None:
             xmin, xmax, ymin, ymax = extent
         else:
-            xmin, xmax = (np.min(x), np.max(x)) if len(x) else (0, 1)
-            ymin, ymax = (np.min(y), np.max(y)) if len(y) else (0, 1)
+            xmin, xmax = (tx.min(), tx.max()) if len(x) else (0, 1)
+            ymin, ymax = (ty.min(), ty.max()) if len(y) else (0, 1)
 
             # to avoid issues with singular data, expand the min/max pairs
             xmin, xmax = mtransforms.nonsingular(xmin, xmax, expander=0.1)
             ymin, ymax = mtransforms.nonsingular(ymin, ymax, expander=0.1)
 
+        nx1 = nx + 1
+        ny1 = ny + 1
+        nx2 = nx
+        ny2 = ny
+        n = nx1 * ny1 + nx2 * ny2
+
         # In the x-direction, the hexagons exactly cover the region from
         # xmin to xmax. Need some padding to avoid roundoff errors.
         padding = 1.e-9 * (xmax - xmin)
@@ -4775,80 +4857,48 @@ def reduce_C_function(C: array) -> float
         xmax += padding
         sx = (xmax - xmin) / nx
         sy = (ymax - ymin) / ny
-
-        if marginals:
-            xorig = x.copy()
-            yorig = y.copy()
-
-        x = (x - xmin) / sx
-        y = (y - ymin) / sy
-        ix1 = np.round(x).astype(int)
-        iy1 = np.round(y).astype(int)
-        ix2 = np.floor(x).astype(int)
-        iy2 = np.floor(y).astype(int)
-
-        nx1 = nx + 1
-        ny1 = ny + 1
-        nx2 = nx
-        ny2 = ny
-        n = nx1 * ny1 + nx2 * ny2
-
-        d1 = (x - ix1) ** 2 + 3.0 * (y - iy1) ** 2
-        d2 = (x - ix2 - 0.5) ** 2 + 3.0 * (y - iy2 - 0.5) ** 2
+        # Positions in hexagon index coordinates.
+        ix = (tx - xmin) / sx
+        iy = (ty - ymin) / sy
+        ix1 = np.round(ix).astype(int)
+        iy1 = np.round(iy).astype(int)
+        ix2 = np.floor(ix).astype(int)
+        iy2 = np.floor(iy).astype(int)
+        # flat indices, plus one so that out-of-range points go to position 0.
+        i1 = np.where((0 <= ix1) & (ix1 < nx1) & (0 <= iy1) & (iy1 < ny1),
+                      ix1 * ny1 + iy1 + 1, 0)
+        i2 = np.where((0 <= ix2) & (ix2 < nx2) & (0 <= iy2) & (iy2 < ny2),
+                      ix2 * ny2 + iy2 + 1, 0)
+
+        d1 = (ix - ix1) ** 2 + 3.0 * (iy - iy1) ** 2
+        d2 = (ix - ix2 - 0.5) ** 2 + 3.0 * (iy - iy2 - 0.5) ** 2
         bdist = (d1 < d2)
-        if C is None:
-            lattice1 = np.zeros((nx1, ny1))
-            lattice2 = np.zeros((nx2, ny2))
-            c1 = (0 <= ix1) & (ix1 < nx1) & (0 <= iy1) & (iy1 < ny1) & bdist
-            c2 = (0 <= ix2) & (ix2 < nx2) & (0 <= iy2) & (iy2 < ny2) & ~bdist
-            np.add.at(lattice1, (ix1[c1], iy1[c1]), 1)
-            np.add.at(lattice2, (ix2[c2], iy2[c2]), 1)
-            if mincnt is not None:
-                lattice1[lattice1 < mincnt] = np.nan
-                lattice2[lattice2 < mincnt] = np.nan
-            accum = np.concatenate([lattice1.ravel(), lattice2.ravel()])
-            good_idxs = ~np.isnan(accum)
 
+        if C is None:  # [1:] drops out-of-range points.
+            counts1 = np.bincount(i1[bdist], minlength=1 + nx1 * ny1)[1:]
+            counts2 = np.bincount(i2[~bdist], minlength=1 + nx2 * ny2)[1:]
+            accum = np.concatenate([counts1, counts2]).astype(float)
+            if mincnt is not None:
+                accum[accum < mincnt] = np.nan
+            C = np.ones(len(x))
         else:
-            if mincnt is None:
-                mincnt = 0
-
-            # create accumulation arrays
-            lattice1 = np.empty((nx1, ny1), dtype=object)
-            for i in range(nx1):
-                for j in range(ny1):
-                    lattice1[i, j] = []
-            lattice2 = np.empty((nx2, ny2), dtype=object)
-            for i in range(nx2):
-                for j in range(ny2):
-                    lattice2[i, j] = []
-
+            # store the C values in a list per hexagon index
+            Cs_at_i1 = [[] for _ in range(1 + nx1 * ny1)]
+            Cs_at_i2 = [[] for _ in range(1 + nx2 * ny2)]
             for i in range(len(x)):
                 if bdist[i]:
-                    if 0 <= ix1[i] < nx1 and 0 <= iy1[i] < ny1:
-                        lattice1[ix1[i], iy1[i]].append(C[i])
+                    Cs_at_i1[i1[i]].append(C[i])
                 else:
-                    if 0 <= ix2[i] < nx2 and 0 <= iy2[i] < ny2:
-                        lattice2[ix2[i], iy2[i]].append(C[i])
-
-            for i in range(nx1):
-                for j in range(ny1):
-                    vals = lattice1[i, j]
-                    if len(vals) > mincnt:
-                        lattice1[i, j] = reduce_C_function(vals)
-                    else:
-                        lattice1[i, j] = np.nan
-            for i in range(nx2):
-                for j in range(ny2):
-                    vals = lattice2[i, j]
-                    if len(vals) > mincnt:
-                        lattice2[i, j] = reduce_C_function(vals)
-                    else:
-                        lattice2[i, j] = np.nan
+                    Cs_at_i2[i2[i]].append(C[i])
+            if mincnt is None:
+                mincnt = 0
+            accum = np.array(
+                [reduce_C_function(acc) if len(acc) > mincnt else np.nan
+                 for Cs_at_i in [Cs_at_i1, Cs_at_i2]
+                 for acc in Cs_at_i[1:]],  # [1:] drops out-of-range points.
+                float)
 
-            accum = np.concatenate([lattice1.astype(float).ravel(),
-                                    lattice2.astype(float).ravel()])
-            good_idxs = ~np.isnan(accum)
+        good_idxs = ~np.isnan(accum)
 
         offsets = np.zeros((n, 2), float)
         offsets[:nx1 * ny1, 0] = np.repeat(np.arange(nx1), ny1)
@@ -4892,8 +4942,9 @@ def reduce_C_function(C: array) -> float
                 edgecolors=edgecolors,
                 linewidths=linewidths,
                 offsets=offsets,
-                transOffset=mtransforms.AffineDeltaTransform(self.transData),
-                )
+                offset_transform=mtransforms.AffineDeltaTransform(
+                    self.transData),
+            )
 
         # Set normalizer if bins is 'log'
         if bins == 'log':
@@ -4901,16 +4952,11 @@ def reduce_C_function(C: array) -> float
                 _api.warn_external("Only one of 'bins' and 'norm' arguments "
                                    f"can be supplied, ignoring bins={bins}")
             else:
-                norm = mcolors.LogNorm()
+                norm = mcolors.LogNorm(vmin=vmin, vmax=vmax)
+                vmin = vmax = None
             bins = None
 
-        if isinstance(norm, mcolors.LogNorm):
-            if (accum == 0).any():
-                # make sure we have no zeros
-                accum += 1
-
-        # autoscale the norm with current accum values if it hasn't
-        # been set
+        # autoscale the norm with current accum values if it hasn't been set
         if norm is not None:
             if norm.vmin is None and norm.vmax is None:
                 norm.autoscale(accum)
@@ -4927,7 +4973,7 @@ def reduce_C_function(C: array) -> float
         collection.set_cmap(cmap)
         collection.set_norm(norm)
         collection.set_alpha(alpha)
-        collection.update(kwargs)
+        collection._internal_update(kwargs)
         collection._scale_norm(norm, vmin, vmax)
 
         corners = ((xmin, ymin), (xmax, ymax))
@@ -4939,96 +4985,62 @@ def reduce_C_function(C: array) -> float
         if not marginals:
             return collection
 
-        if C is None:
-            C = np.ones(len(x))
+        # Process marginals
+        bars = []
+        for zname, z, zmin, zmax, zscale, nbins in [
+                ("x", x, xmin, xmax, xscale, nx),
+                ("y", y, ymin, ymax, yscale, 2 * ny),
+        ]:
 
-        def coarse_bin(x, y, coarse):
-            ind = coarse.searchsorted(x).clip(0, len(coarse) - 1)
-            mus = np.zeros(len(coarse))
-            for i in range(len(coarse)):
-                yi = y[ind == i]
-                if len(yi) > 0:
-                    mu = reduce_C_function(yi)
-                else:
-                    mu = np.nan
-                mus[i] = mu
-            return mus
-
-        coarse = np.linspace(xmin, xmax, gridsize)
-
-        xcoarse = coarse_bin(xorig, C, coarse)
-        valid = ~np.isnan(xcoarse)
-        verts, values = [], []
-        for i, val in enumerate(xcoarse):
-            thismin = coarse[i]
-            if i < len(coarse) - 1:
-                thismax = coarse[i + 1]
+            if zscale == "log":
+                bin_edges = np.geomspace(zmin, zmax, nbins + 1)
             else:
-                thismax = thismin + np.diff(coarse)[-1]
-
-            if not valid[i]:
-                continue
-
-            verts.append([(thismin, 0),
-                          (thismin, 0.05),
-                          (thismax, 0.05),
-                          (thismax, 0)])
-            values.append(val)
-
-        values = np.array(values)
-        trans = self.get_xaxis_transform(which='grid')
-
-        hbar = mcoll.PolyCollection(verts, transform=trans, edgecolors='face')
-
-        hbar.set_array(values)
-        hbar.set_cmap(cmap)
-        hbar.set_norm(norm)
-        hbar.set_alpha(alpha)
-        hbar.update(kwargs)
-        self.add_collection(hbar, autolim=False)
-
-        coarse = np.linspace(ymin, ymax, gridsize)
-        ycoarse = coarse_bin(yorig, C, coarse)
-        valid = ~np.isnan(ycoarse)
-        verts, values = [], []
-        for i, val in enumerate(ycoarse):
-            thismin = coarse[i]
-            if i < len(coarse) - 1:
-                thismax = coarse[i + 1]
-            else:
-                thismax = thismin + np.diff(coarse)[-1]
-            if not valid[i]:
-                continue
-            verts.append([(0, thismin), (0.0, thismax),
-                          (0.05, thismax), (0.05, thismin)])
-            values.append(val)
-
-        values = np.array(values)
-
-        trans = self.get_yaxis_transform(which='grid')
-
-        vbar = mcoll.PolyCollection(verts, transform=trans, edgecolors='face')
-        vbar.set_array(values)
-        vbar.set_cmap(cmap)
-        vbar.set_norm(norm)
-        vbar.set_alpha(alpha)
-        vbar.update(kwargs)
-        self.add_collection(vbar, autolim=False)
-
-        collection.hbar = hbar
-        collection.vbar = vbar
+                bin_edges = np.linspace(zmin, zmax, nbins + 1)
+
+            verts = np.empty((nbins, 4, 2))
+            verts[:, 0, 0] = verts[:, 1, 0] = bin_edges[:-1]
+            verts[:, 2, 0] = verts[:, 3, 0] = bin_edges[1:]
+            verts[:, 0, 1] = verts[:, 3, 1] = .00
+            verts[:, 1, 1] = verts[:, 2, 1] = .05
+            if zname == "y":
+                verts = verts[:, :, ::-1]  # Swap x and y.
+
+            # Sort z-values into bins defined by bin_edges.
+            bin_idxs = np.searchsorted(bin_edges, z) - 1
+            values = np.empty(nbins)
+            for i in range(nbins):
+                # Get C-values for each bin, and compute bin value with
+                # reduce_C_function.
+                ci = C[bin_idxs == i]
+                values[i] = reduce_C_function(ci) if len(ci) > 0 else np.nan
+
+            mask = ~np.isnan(values)
+            verts = verts[mask]
+            values = values[mask]
+
+            trans = getattr(self, f"get_{zname}axis_transform")(which="grid")
+            bar = mcoll.PolyCollection(
+                verts, transform=trans, edgecolors="face")
+            bar.set_array(values)
+            bar.set_cmap(cmap)
+            bar.set_norm(norm)
+            bar.set_alpha(alpha)
+            bar._internal_update(kwargs)
+            bars.append(self.add_collection(bar, autolim=False))
+
+        collection.hbar, collection.vbar = bars
 
         def on_changed(collection):
-            hbar.set_cmap(collection.get_cmap())
-            hbar.set_clim(collection.get_clim())
-            vbar.set_cmap(collection.get_cmap())
-            vbar.set_clim(collection.get_clim())
+            collection.hbar.set_cmap(collection.get_cmap())
+            collection.hbar.set_cmap(collection.get_cmap())
+            collection.vbar.set_clim(collection.get_clim())
+            collection.vbar.set_clim(collection.get_clim())
 
-        collection.callbacksSM.connect('changed', on_changed)
+        collection.callbacks.connect('changed', on_changed)
 
         return collection
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def arrow(self, x, y, dx, dy, **kwargs):
         """
         Add an arrow to the Axes.
@@ -5037,12 +5049,6 @@ def arrow(self, x, y, dx, dy, **kwargs):
 
         Parameters
         ----------
-        x, y : float
-            The x and y coordinates of the arrow base.
-
-        dx, dy : float
-            The length of the arrow along x and y direction.
-
         %(FancyArrow)s
 
         Returns
@@ -5073,44 +5079,40 @@ def arrow(self, x, y, dx, dy, **kwargs):
         self._request_autoscale_view()
         return a
 
-    @docstring.copy(mquiver.QuiverKey.__init__)
-    def quiverkey(self, Q, X, Y, U, label, **kw):
-        qk = mquiver.QuiverKey(Q, X, Y, U, label, **kw)
+    @_docstring.copy(mquiver.QuiverKey.__init__)
+    def quiverkey(self, Q, X, Y, U, label, **kwargs):
+        qk = mquiver.QuiverKey(Q, X, Y, U, label, **kwargs)
         self.add_artist(qk)
         return qk
 
     # Handle units for x and y, if they've been passed
-    def _quiver_units(self, args, kw):
+    def _quiver_units(self, args, kwargs):
         if len(args) > 3:
             x, y = args[0:2]
-            x, y = self._process_unit_info([("x", x), ("y", y)], kw)
+            x, y = self._process_unit_info([("x", x), ("y", y)], kwargs)
             return (x, y) + args[2:]
         return args
 
     # args can by a combination if X, Y, U, V, C and all should be replaced
     @_preprocess_data()
-    def quiver(self, *args, **kw):
+    @_docstring.dedent_interpd
+    def quiver(self, *args, **kwargs):
+        """%(quiver_doc)s"""
         # Make sure units are handled for x and y values
-        args = self._quiver_units(args, kw)
-
-        q = mquiver.Quiver(self, *args, **kw)
-
+        args = self._quiver_units(args, kwargs)
+        q = mquiver.Quiver(self, *args, **kwargs)
         self.add_collection(q, autolim=True)
         self._request_autoscale_view()
         return q
-    quiver.__doc__ = mquiver.Quiver.quiver_doc
 
     # args can be some combination of X, Y, U, V, C and all should be replaced
     @_preprocess_data()
-    @docstring.dedent_interpd
-    def barbs(self, *args, **kw):
-        """
-        %(barbs_doc)s
-        """
+    @_docstring.dedent_interpd
+    def barbs(self, *args, **kwargs):
+        """%(barbs_doc)s"""
         # Make sure units are handled for x and y values
-        args = self._quiver_units(args, kw)
-
-        b = mquiver.Barbs(self, *args, **kw)
+        args = self._quiver_units(args, kwargs)
+        b = mquiver.Barbs(self, *args, **kwargs)
         self.add_collection(b, autolim=True)
         self._request_autoscale_view()
         return b
@@ -5243,25 +5245,24 @@ def _fill_between_x_or_y(
 
         Other Parameters
         ----------------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             All other keyword arguments are passed on to `.PolyCollection`.
             They control the `.Polygon` properties:
 
-            %(PolyCollection_kwdoc)s
+            %(PolyCollection:kwdoc)s
 
         See Also
         --------
         fill_between : Fill between two sets of y-values.
         fill_betweenx : Fill between two sets of x-values.
-
-        Notes
-        -----
-        .. [notes section required to get data note injection right]
         """
 
         dep_dir = {"x": "y", "y": "x"}[ind_dir]
 
-        if not rcParams["_internal.classic_mode"]:
+        if not mpl.rcParams["_internal.classic_mode"]:
             kwargs = cbook.normalize_kwargs(kwargs, mcoll.Collection)
             if not any(c in kwargs for c in ("color", "facecolor")):
                 kwargs["facecolor"] = \
@@ -5285,9 +5286,10 @@ def _fill_between_x_or_y(
                 raise ValueError(f"where size ({where.size}) does not match "
                                  f"{ind_dir} size ({ind.size})")
         where = where & ~functools.reduce(
-            np.logical_or, map(np.ma.getmask, [ind, dep1, dep2]))
+            np.logical_or, map(np.ma.getmaskarray, [ind, dep1, dep2]))
 
-        ind, dep1, dep2 = np.broadcast_arrays(np.atleast_1d(ind), dep1, dep2)
+        ind, dep1, dep2 = np.broadcast_arrays(
+            np.atleast_1d(ind), dep1, dep2, subok=True)
 
         polys = []
         for idx0, idx1 in cbook.contiguous_regions(where):
@@ -5371,7 +5373,7 @@ def fill_between(self, x, y1, y2=0, where=None, interpolate=False,
             dir="horizontal", ind="x", dep="y"
         )
     fill_between = _preprocess_data(
-        docstring.dedent_interpd(fill_between),
+        _docstring.dedent_interpd(fill_between),
         replace_names=["x", "y1", "y2", "where"])
 
     def fill_betweenx(self, y, x1, x2=0, where=None,
@@ -5385,14 +5387,21 @@ def fill_betweenx(self, y, x1, x2=0, where=None,
             dir="vertical", ind="y", dep="x"
         )
     fill_betweenx = _preprocess_data(
-        docstring.dedent_interpd(fill_betweenx),
+        _docstring.dedent_interpd(fill_betweenx),
         replace_names=["y", "x1", "x2", "where"])
 
     #### plotting z(x, y): imshow, pcolor and relatives, contour
+
+    # Once this deprecation elapses, also move vmin, vmax right after norm, to
+    # match the signature of other methods returning ScalarMappables and keep
+    # the documentation for *norm*, *vmax* and *vmin* together.
+    @_api.make_keyword_only("3.5", "aspect")
     @_preprocess_data()
+    @_docstring.interpd
     def imshow(self, X, cmap=None, norm=None, aspect=None,
-               interpolation=None, alpha=None, vmin=None, vmax=None,
-               origin=None, extent=None, *, filternorm=True, filterrad=4.0,
+               interpolation=None, alpha=None,
+               vmin=None, vmax=None, origin=None, extent=None, *,
+               interpolation_stage=None, filternorm=True, filterrad=4.0,
                resample=None, url=None, **kwargs):
         """
         Display data as an image, i.e., on a 2D regular raster.
@@ -5427,15 +5436,17 @@ def imshow(self, X, cmap=None, norm=None, aspect=None,
 
             Out-of-range RGB(A) values are clipped.
 
-        cmap : str or `~matplotlib.colors.Colormap`, default: :rc:`image.cmap`
-            The Colormap instance or registered colormap name used to map
-            scalar data to colors. This parameter is ignored for RGB(A) data.
+        %(cmap_doc)s
+
+            This parameter is ignored if *X* is RGB(A).
+
+        %(norm_doc)s
 
-        norm : `~matplotlib.colors.Normalize`, optional
-            The `.Normalize` instance used to scale scalar data to the [0, 1]
-            range before mapping to colors using *cmap*. By default, a linear
-            scaling mapping the lowest value to 0 and the highest to 1 is used.
-            This parameter is ignored for RGB(A) data.
+            This parameter is ignored if *X* is RGB(A).
+
+        %(vmin_vmax_doc)s
+
+            This parameter is ignored if *X* is RGB(A).
 
         aspect : {'equal', 'auto'} or float, default: :rc:`image.aspect`
             The aspect ratio of the Axes.  This parameter is particularly
@@ -5484,18 +5495,17 @@ def imshow(self, X, cmap=None, norm=None, aspect=None,
             which can be set by *filterrad*. Additionally, the antigrain image
             resize filter is controlled by the parameter *filternorm*.
 
+        interpolation_stage : {'data', 'rgba'}, default: 'data'
+            If 'data', interpolation
+            is carried out on the data provided by the user.  If 'rgba', the
+            interpolation is carried out after the colormapping has been
+            applied (visual interpolation).
+
         alpha : float or array-like, optional
             The alpha blending value, between 0 (transparent) and 1 (opaque).
             If *alpha* is an array, the alpha blending values are applied pixel
             by pixel, and *alpha* must have the same shape as *X*.
 
-        vmin, vmax : float, optional
-            When using scalar data and no explicit *norm*, *vmin* and *vmax*
-            define the data range that the colormap covers. By default,
-            the colormap covers the complete value range of the supplied
-            data. It is deprecated to use *vmin*/*vmax* when *norm* is given.
-            When using RGB(A) data, parameters *vmin*/*vmax* are ignored.
-
         origin : {'upper', 'lower'}, default: :rc:`image.origin`
             Place the [0, 0] index of the array in the upper left or lower
             left corner of the Axes. The convention (the default) 'upper' is
@@ -5553,6 +5563,9 @@ def imshow(self, X, cmap=None, norm=None, aspect=None,
 
         Other Parameters
         ----------------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs : `~matplotlib.artist.Artist` properties
             These parameters are passed on to the constructor of the
             `.AxesImage` artist.
@@ -5579,11 +5592,14 @@ def imshow(self, X, cmap=None, norm=None, aspect=None,
         (unassociated) alpha representation.
         """
         if aspect is None:
-            aspect = rcParams['image.aspect']
+            aspect = mpl.rcParams['image.aspect']
         self.set_aspect(aspect)
-        im = mimage.AxesImage(self, cmap, norm, interpolation, origin, extent,
-                              filternorm=filternorm, filterrad=filterrad,
-                              resample=resample, **kwargs)
+        im = mimage.AxesImage(self, cmap=cmap, norm=norm,
+                              interpolation=interpolation, origin=origin,
+                              extent=extent, filternorm=filternorm,
+                              filterrad=filterrad, resample=resample,
+                              interpolation_stage=interpolation_stage,
+                              **kwargs)
 
         im.set_data(X)
         im.set_alpha(alpha)
@@ -5600,7 +5616,7 @@ def imshow(self, X, cmap=None, norm=None, aspect=None,
         self.add_image(im)
         return im
 
-    def _pcolorargs(self, funcname, *args, shading='flat', **kwargs):
+    def _pcolorargs(self, funcname, *args, shading='auto', **kwargs):
         # - create X and Y if not present;
         # - reshape X and Y as needed if they are 1-D;
         # - check for proper sizes based on `shading` kwarg;
@@ -5610,7 +5626,7 @@ def _pcolorargs(self, funcname, *args, shading='flat', **kwargs):
         _valid_shading = ['gouraud', 'nearest', 'flat', 'auto']
         try:
             _api.check_in_list(_valid_shading, shading=shading)
-        except ValueError as err:
+        except ValueError:
             _api.warn_external(f"shading value '{shading}' not in list of "
                                f"valid values {_valid_shading}. Setting "
                                "shading='auto'.")
@@ -5630,9 +5646,10 @@ def _pcolorargs(self, funcname, *args, shading='flat', **kwargs):
         if len(args) == 3:
             # Check x and y for bad data...
             C = np.asanyarray(args[2])
-            X, Y = [cbook.safe_masked_invalid(a) for a in args[:2]]
             # unit conversion allows e.g. datetime objects as axis values
+            X, Y = args[:2]
             X, Y = self._process_unit_info([("x", X), ("y", Y)], kwargs)
+            X, Y = [cbook.safe_masked_invalid(a) for a in [X, Y]]
 
             if funcname == 'pcolormesh':
                 if np.ma.is_masked(X) or np.ma.is_masked(Y):
@@ -5660,9 +5677,8 @@ def _pcolorargs(self, funcname, *args, shading='flat', **kwargs):
             y = Y.reshape(Ny, 1)
             Y = y.repeat(Nx, axis=1)
         if X.shape != Y.shape:
-            raise TypeError(
-                'Incompatible X, Y inputs to %s; see help(%s)' % (
-                funcname, funcname))
+            raise TypeError(f'Incompatible X, Y inputs to {funcname}; '
+                            f'see help({funcname})')
 
         if shading == 'auto':
             if ncols == Nx and nrows == Ny:
@@ -5671,25 +5687,16 @@ def _pcolorargs(self, funcname, *args, shading='flat', **kwargs):
                 shading = 'flat'
 
         if shading == 'flat':
-            if not (ncols in (Nx, Nx - 1) and nrows in (Ny, Ny - 1)):
+            if (Nx, Ny) != (ncols + 1, nrows + 1):
                 raise TypeError('Dimensions of C %s are incompatible with'
                                 ' X (%d) and/or Y (%d); see help(%s)' % (
                                     C.shape, Nx, Ny, funcname))
-            if (ncols == Nx or nrows == Ny):
-                _api.warn_deprecated(
-                    "3.3", message="shading='flat' when X and Y have the same "
-                    "dimensions as C is deprecated since %(since)s.  Either "
-                    "specify the corners of the quadrilaterals with X and Y, "
-                    "or pass shading='auto', 'nearest' or 'gouraud', or set "
-                    "rcParams['pcolor.shading'].  This will become an error "
-                    "%(removal)s.")
-            C = C[:Ny - 1, :Nx - 1]
         else:    # ['nearest', 'gouraud']:
             if (Nx, Ny) != (ncols, nrows):
                 raise TypeError('Dimensions of C %s are incompatible with'
                                 ' X (%d) and/or Y (%d); see help(%s)' % (
                                     C.shape, Nx, Ny, funcname))
-            if shading in ['nearest', 'auto']:
+            if shading == 'nearest':
                 # grid is specified at the center, so define corners
                 # at the midpoints between the grid centers and then use the
                 # flat algorithm.
@@ -5725,8 +5732,20 @@ def _interp_grid(X):
         C = cbook.safe_masked_invalid(C)
         return X, Y, C, shading
 
+    def _pcolor_grid_deprecation_helper(self):
+        grid_active = any(axis._major_tick_kw["gridOn"]
+                          for axis in self._axis_map.values())
+        # explicit is-True check because get_axisbelow() can also be 'line'
+        grid_hidden_by_pcolor = self.get_axisbelow() is True
+        if grid_active and not grid_hidden_by_pcolor:
+            _api.warn_deprecated(
+                "3.5", message="Auto-removal of grids by pcolor() and "
+                "pcolormesh() is deprecated since %(since)s and will be "
+                "removed %(removal)s; please call grid(False) first.")
+        self.grid(False)
+
     @_preprocess_data()
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def pcolor(self, *args, shading=None, alpha=None, norm=None, cmap=None,
                vmin=None, vmax=None, **kwargs):
         r"""
@@ -5750,7 +5769,8 @@ def pcolor(self, *args, shading=None, alpha=None, norm=None, cmap=None,
         Parameters
         ----------
         C : 2D array-like
-            The color-mapped values.
+            The color-mapped values.  Color-mapping is controlled by *cmap*,
+            *norm*, *vmin*, and *vmax*.
 
         X, Y : array-like, optional
             The coordinates of the corners of quadrilaterals of a pcolormesh::
@@ -5779,9 +5799,8 @@ def pcolor(self, *args, shading=None, alpha=None, norm=None, cmap=None,
             expanded as needed into the appropriate 2D arrays, making a
             rectangular grid.
 
-        shading : {'flat', 'nearest', 'auto'}, optional
-            The fill style for the quadrilateral; defaults to 'flat' or
-            :rc:`pcolor.shading`. Possible values:
+        shading : {'flat', 'nearest', 'auto'}, default: :rc:`pcolor.shading`
+            The fill style for the quadrilateral. Possible values:
 
             - 'flat': A solid color is used for each quad. The color of the
               quad (i, j), (i+1, j), (i, j+1), (i+1, j+1) is given by
@@ -5798,21 +5817,11 @@ def pcolor(self, *args, shading=None, alpha=None, norm=None, cmap=None,
             See :doc:`/gallery/images_contours_and_fields/pcolormesh_grids`
             for more description.
 
-        cmap : str or `~matplotlib.colors.Colormap`, default: :rc:`image.cmap`
-            A Colormap instance or registered colormap name. The colormap
-            maps the *C* values to colors.
+        %(cmap_doc)s
 
-        norm : `~matplotlib.colors.Normalize`, optional
-            The Normalize instance scales the data values to the canonical
-            colormap range [0, 1] for mapping to colors. By default, the data
-            range is mapped to the colorbar range using linear scaling.
+        %(norm_doc)s
 
-        vmin, vmax : float, default: None
-            The colorbar range. If *None*, suitable min/max values are
-            automatically chosen by the `~.Normalize` instance (defaults to
-            the respective min/max values of *C* in case of the default linear
-            scaling).
-            It is deprecated to use *vmin*/*vmax* when *norm* is given.
+        %(vmin_vmax_doc)s
 
         edgecolors : {'none', None, 'face', color, color sequence}, optional
             The color of the edges. Defaults to 'none'. Possible values:
@@ -5848,11 +5857,14 @@ def pcolor(self, *args, shading=None, alpha=None, norm=None, cmap=None,
             Stroking the edges may be preferred if *alpha* is 1, but will
             cause artifacts otherwise.
 
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             Additionally, the following arguments are allowed. They are passed
             along to the `~matplotlib.collections.PolyCollection` constructor:
 
-        %(PolyCollection_kwdoc)s
+        %(PolyCollection:kwdoc)s
 
         See Also
         --------
@@ -5880,7 +5892,7 @@ def pcolor(self, *args, shading=None, alpha=None, norm=None, cmap=None,
         """
 
         if shading is None:
-            shading = rcParams['pcolor.shading']
+            shading = mpl.rcParams['pcolor.shading']
         shading = shading.lower()
         X, Y, C, shading = self._pcolorargs('pcolor', *args, shading=shading,
                                             kwargs=kwargs)
@@ -5933,14 +5945,10 @@ def pcolor(self, *args, shading=None, alpha=None, norm=None, cmap=None,
 
         kwargs.setdefault('snap', False)
 
-        collection = mcoll.PolyCollection(verts, **kwargs)
-
-        collection.set_alpha(alpha)
-        collection.set_array(C)
-        collection.set_cmap(cmap)
-        collection.set_norm(norm)
+        collection = mcoll.PolyCollection(
+            verts, array=C, cmap=cmap, norm=norm, alpha=alpha, **kwargs)
         collection._scale_norm(norm, vmin, vmax)
-        self.grid(False)
+        self._pcolor_grid_deprecation_helper()
 
         x = X.compressed()
         y = Y.compressed()
@@ -5972,7 +5980,7 @@ def pcolor(self, *args, shading=None, alpha=None, norm=None, cmap=None,
         return collection
 
     @_preprocess_data()
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def pcolormesh(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
                    vmax=None, shading=None, antialiased=False, **kwargs):
         """
@@ -5994,7 +6002,8 @@ def pcolormesh(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
         Parameters
         ----------
         C : 2D array-like
-            The color-mapped values.
+            The color-mapped values.  Color-mapping is controlled by *cmap*,
+            *norm*, *vmin*, and *vmax*.
 
         X, Y : array-like, optional
             The coordinates of the corners of quadrilaterals of a pcolormesh::
@@ -6025,21 +6034,11 @@ def pcolormesh(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
             expanded as needed into the appropriate 2D arrays, making a
             rectangular grid.
 
-        cmap : str or `~matplotlib.colors.Colormap`, default: :rc:`image.cmap`
-            A Colormap instance or registered colormap name. The colormap
-            maps the *C* values to colors.
+        %(cmap_doc)s
 
-        norm : `~matplotlib.colors.Normalize`, optional
-            The Normalize instance scales the data values to the canonical
-            colormap range [0, 1] for mapping to colors. By default, the data
-            range is mapped to the colorbar range using linear scaling.
+        %(norm_doc)s
 
-        vmin, vmax : float, default: None
-            The colorbar range. If *None*, suitable min/max values are
-            automatically chosen by the `~.Normalize` instance (defaults to
-            the respective min/max values of *C* in case of the default linear
-            scaling).
-            It is deprecated to use *vmin*/*vmax* when *norm* is given.
+        %(vmin_vmax_doc)s
 
         edgecolors : {'none', None, 'face', color, color sequence}, optional
             The color of the edges. Defaults to 'none'. Possible values:
@@ -6082,7 +6081,7 @@ def pcolormesh(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
         snap : bool, default: False
             Whether to snap the mesh to pixel boundaries.
 
-        rasterized: bool, optional
+        rasterized : bool, optional
             Rasterize the pcolormesh when drawing vector graphics.  This can
             speed up rendering and produce smaller files for large data sets.
             See also :doc:`/gallery/misc/rasterization_demo`.
@@ -6093,11 +6092,14 @@ def pcolormesh(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
 
         Other Parameters
         ----------------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             Additionally, the following arguments are allowed. They are passed
             along to the `~matplotlib.collections.QuadMesh` constructor:
 
-        %(QuadMesh_kwdoc)s
+        %(QuadMesh:kwdoc)s
 
         See Also
         --------
@@ -6154,31 +6156,25 @@ def pcolormesh(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
 
         """
         if shading is None:
-            shading = rcParams['pcolor.shading']
+            shading = mpl.rcParams['pcolor.shading']
         shading = shading.lower()
         kwargs.setdefault('edgecolors', 'none')
 
         X, Y, C, shading = self._pcolorargs('pcolormesh', *args,
                                             shading=shading, kwargs=kwargs)
-        Ny, Nx = X.shape
-        X = X.ravel()
-        Y = Y.ravel()
-
-        # convert to one dimensional arrays
+        coords = np.stack([X, Y], axis=-1)
+        # convert to one dimensional array
         C = C.ravel()
-        coords = np.column_stack((X, Y)).astype(float, copy=False)
-        collection = mcoll.QuadMesh(Nx - 1, Ny - 1, coords,
-                                    antialiased=antialiased, shading=shading,
-                                    **kwargs)
-        snap = kwargs.get('snap', rcParams['pcolormesh.snap'])
-        collection.set_snap(snap)
-        collection.set_alpha(alpha)
-        collection.set_array(C)
-        collection.set_cmap(cmap)
-        collection.set_norm(norm)
+
+        kwargs.setdefault('snap', mpl.rcParams['pcolormesh.snap'])
+
+        collection = mcoll.QuadMesh(
+            coords, antialiased=antialiased, shading=shading,
+            array=C, cmap=cmap, norm=norm, alpha=alpha, **kwargs)
         collection._scale_norm(norm, vmin, vmax)
+        self._pcolor_grid_deprecation_helper()
 
-        self.grid(False)
+        coords = coords.reshape(-1, 2)  # flatten the grid structure; keep x, y
 
         # Transform from native to data coordinates?
         t = collection._transform
@@ -6202,7 +6198,7 @@ def pcolormesh(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
         return collection
 
     @_preprocess_data()
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def pcolorfast(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
                    vmax=None, **kwargs):
         """
@@ -6232,8 +6228,8 @@ def pcolorfast(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
         C : array-like
             The image data. Supported array shapes are:
 
-            - (M, N): an image with scalar data. The data is visualized
-              using a colormap.
+            - (M, N): an image with scalar data.  Color-mapping is controlled
+              by *cmap*, *norm*, *vmin*, and *vmax*.
             - (M, N, 3): an image with RGB values (0-1 float or 0-255 int).
             - (M, N, 4): an image with RGBA values (0-1 float or 0-255 int),
               i.e. including transparency.
@@ -6276,21 +6272,17 @@ def pcolorfast(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
 
             These arguments can only be passed positionally.
 
-        cmap : str or `~matplotlib.colors.Colormap`, default: :rc:`image.cmap`
-            A Colormap instance or registered colormap name. The colormap
-            maps the *C* values to colors.
+        %(cmap_doc)s
+
+            This parameter is ignored if *C* is RGB(A).
+
+        %(norm_doc)s
 
-        norm : `~matplotlib.colors.Normalize`, optional
-            The Normalize instance scales the data values to the canonical
-            colormap range [0, 1] for mapping to colors. By default, the data
-            range is mapped to the colorbar range using linear scaling.
+            This parameter is ignored if *C* is RGB(A).
 
-        vmin, vmax : float, default: None
-            The colorbar range. If *None*, suitable min/max values are
-            automatically chosen by the `~.Normalize` instance (defaults to
-            the respective min/max values of *C* in case of the default linear
-            scaling).
-            It is deprecated to use *vmin*/*vmax* when *norm* is given.
+        %(vmin_vmax_doc)s
+
+            This parameter is ignored if *C* is RGB(A).
 
         alpha : float, default: None
             The alpha blending value, between 0 (transparent) and 1 (opaque).
@@ -6309,13 +6301,12 @@ def pcolorfast(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
 
         Other Parameters
         ----------------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             Supported additional parameters depend on the type of grid.
             See return types of *image* for further description.
-
-        Notes
-        -----
-        .. [notes section required to get data note injection right]
         """
 
         C = args[-1]
@@ -6356,7 +6347,7 @@ def pcolorfast(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
             else:
                 raise ValueError("C must be 2D or 3D")
             collection = mcoll.QuadMesh(
-                nc, nr, coords, **qm_kwargs,
+                coords, **qm_kwargs,
                 alpha=alpha, cmap=cmap, norm=norm,
                 antialiased=False, edgecolors="none")
             self.add_collection(collection, autolim=False)
@@ -6367,7 +6358,7 @@ def pcolorfast(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
             extent = xl, xr, yb, yt = x[0], x[-1], y[0], y[-1]
             if style == "image":
                 im = mimage.AxesImage(
-                    self, cmap, norm,
+                    self, cmap=cmap, norm=norm,
                     data=C, alpha=alpha, extent=extent,
                     interpolation='nearest', origin='lower',
                     **kwargs)
@@ -6393,32 +6384,36 @@ def pcolorfast(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
         return ret
 
     @_preprocess_data()
+    @_docstring.dedent_interpd
     def contour(self, *args, **kwargs):
-        kwargs['filled'] = False
-        contours = mcontour.QuadContourSet(self, *args, **kwargs)
-        self._request_autoscale_view()
-        return contours
-    contour.__doc__ = """
+        """
         Plot contour lines.
 
         Call signature::
 
             contour([X, Y,] Z, [levels], **kwargs)
-        """ + mcontour.QuadContourSet._contour_doc
-
-    @_preprocess_data()
-    def contourf(self, *args, **kwargs):
-        kwargs['filled'] = True
+        %(contour_doc)s
+        """
+        kwargs['filled'] = False
         contours = mcontour.QuadContourSet(self, *args, **kwargs)
         self._request_autoscale_view()
         return contours
-    contourf.__doc__ = """
+
+    @_preprocess_data()
+    @_docstring.dedent_interpd
+    def contourf(self, *args, **kwargs):
+        """
         Plot filled contours.
 
         Call signature::
 
             contourf([X, Y,] Z, [levels], **kwargs)
-        """ + mcontour.QuadContourSet._contour_doc
+        %(contour_doc)s
+        """
+        kwargs['filled'] = True
+        contours = mcontour.QuadContourSet(self, *args, **kwargs)
+        self._request_autoscale_view()
+        return contours
 
     def clabel(self, CS, levels=None, **kwargs):
         """
@@ -6428,7 +6423,7 @@ def clabel(self, CS, levels=None, **kwargs):
 
         Parameters
         ----------
-        CS : `~.ContourSet` instance
+        CS : `.ContourSet` instance
             Line contours to label.
 
         levels : array-like, optional
@@ -6448,23 +6443,33 @@ def hist(self, x, bins=None, range=None, density=False, weights=None,
              orientation='vertical', rwidth=None, log=False,
              color=None, label=None, stacked=False, **kwargs):
         """
-        Plot a histogram.
+        Compute and plot a histogram.
 
-        Compute and draw the histogram of *x*.  The return value is a tuple
-        (*n*, *bins*, *patches*) or ([*n0*, *n1*, ...], *bins*, [*patches0*,
-        *patches1*, ...]) if the input contains multiple data.  See the
-        documentation of the *weights* parameter to draw a histogram of
-        already-binned data.
+        This method uses `numpy.histogram` to bin the data in *x* and count the
+        number of values in each bin, then draws the distribution either as a
+        `.BarContainer` or `.Polygon`. The *bins*, *range*, *density*, and
+        *weights* parameters are forwarded to `numpy.histogram`.
 
-        Multiple data can be provided via *x* as a list of datasets
-        of potentially different length ([*x0*, *x1*, ...]), or as
-        a 2D ndarray in which each column is a dataset.  Note that
-        the ndarray form is transposed relative to the list form.
+        If the data has already been binned and counted, use `~.bar` or
+        `~.stairs` to plot the distribution::
 
-        Masked arrays are not supported.
+            counts, bins = np.histogram(x)
+            plt.stairs(counts, bins)
+
+        Alternatively, plot pre-computed bins and counts using ``hist()`` by
+        treating each bin as a single point with a weight equal to its count::
+
+            plt.hist(bins[:-1], bins, weights=counts)
+
+        The data input *x* can be a singular array, a list of datasets of
+        potentially different lengths ([*x0*, *x1*, ...]), or a 2D ndarray in
+        which each column is a dataset. Note that the ndarray form is
+        transposed relative to the list form. If the input is an array, then
+        the return value is a tuple (*n*, *bins*, *patches*); if the input is a
+        sequence of arrays, then the return value is a tuple
+        ([*n0*, *n1*, ...], *bins*, [*patches0*, *patches1*, ...]).
 
-        The *bins*, *range*, *weights*, and *density* parameters behave as in
-        `numpy.histogram`.
+        Masked arrays are not supported.
 
         Parameters
         ----------
@@ -6518,15 +6523,6 @@ def hist(self, x, bins=None, range=None, density=False, weights=None,
             normalized, so that the integral of the density over the range
             remains 1.
 
-            This parameter can be used to draw a histogram of data that has
-            already been binned, e.g. using `numpy.histogram` (by treating each
-            bin as a single point with a weight equal to its count) ::
-
-                counts, bins = np.histogram(data)
-                plt.hist(bins[:-1], bins, weights=counts)
-
-            (or you may alternatively use `~.bar()`).
-
         cumulative : bool or -1, default: False
             If ``True``, then a histogram is computed where each bin gives the
             counts in that bin plus all bins for smaller values. The last bin
@@ -6614,18 +6610,22 @@ def hist(self, x, bins=None, range=None, density=False, weights=None,
 
         Other Parameters
         ----------------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             `~matplotlib.patches.Patch` properties
 
         See Also
         --------
-        hist2d : 2D histograms
+        hist2d : 2D histogram with rectangular bins
+        hexbin : 2D histogram with hexagonal bins
 
         Notes
         -----
-        For large numbers of bins (>1000), 'step' and 'stepfilled' can be
-        significantly faster than 'bar' and 'barstacked'.
-
+        For large numbers of bins (>1000), plotting can be significantly faster
+        if *histtype* is set to 'step' or 'stepfilled' rather than 'bar' or
+        'barstacked'.
         """
         # Avoid shadowing the builtin.
         bin_range = range
@@ -6635,7 +6635,7 @@ def hist(self, x, bins=None, range=None, density=False, weights=None,
             x = [x]
 
         if bins is None:
-            bins = rcParams['hist.bins']
+            bins = mpl.rcParams['hist.bins']
 
         # Validate string inputs here to avoid cluttering subsequent code.
         _api.check_in_list(['bar', 'barstacked', 'step', 'stepfilled'],
@@ -6737,6 +6737,7 @@ def hist(self, x, bins=None, range=None, density=False, weights=None,
             m, bins = np.histogram(x[i], bins, weights=w[i], **hist_kwargs)
             tops.append(m)
         tops = np.array(tops, float)  # causes problems later if it's an int
+        bins = np.array(bins, float)  # causes problems if float16
         if stacked:
             tops = tops.cumsum(axis=0)
             # If a stacked density plot, normalize so the area of all the
@@ -6761,7 +6762,7 @@ def hist(self, x, bins=None, range=None, density=False, weights=None,
             if rwidth is not None:
                 dr = np.clip(rwidth, 0, 1)
             elif (len(tops) > 1 and
-                  ((not stacked) or rcParams['_internal.classic_mode'])):
+                  ((not stacked) or mpl.rcParams['_internal.classic_mode'])):
                 dr = 0.8
             else:
                 dr = 1.0
@@ -6886,11 +6887,11 @@ def hist(self, x, bins=None, range=None, density=False, weights=None,
         for patch, lbl in itertools.zip_longest(patches, labels):
             if patch:
                 p = patch[0]
-                p.update(kwargs)
+                p._internal_update(kwargs)
                 if lbl is not None:
                     p.set_label(lbl)
                 for p in patch[1:]:
-                    p.update(kwargs)
+                    p._internal_update(kwargs)
                     p.set_label('_nolegend_')
 
         if nx == 1:
@@ -6935,6 +6936,9 @@ def stairs(self, values, edges=None, *,
 
         Other Parameters
         ----------------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             `~matplotlib.patches.StepPatch` properties
 
@@ -6945,7 +6949,7 @@ def stairs(self, values, edges=None, *,
         else:
             _color = self._get_lines.get_next_color()
         if fill:
-            kwargs.setdefault('edgecolor', 'none')
+            kwargs.setdefault('linewidth', 0)
             kwargs.setdefault('facecolor', _color)
         else:
             kwargs.setdefault('edgecolor', _color)
@@ -6975,7 +6979,7 @@ def stairs(self, values, edges=None, *,
         return patch
 
     @_preprocess_data(replace_names=["x", "y", "weights"])
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def hist2d(self, x, y, bins=10, range=None, density=False, weights=None,
                cmin=None, cmax=None, **kwargs):
         """
@@ -7034,20 +7038,18 @@ def hist2d(self, x, y, bins=10, range=None, density=False, weights=None,
 
         Other Parameters
         ----------------
-        cmap : Colormap or str, optional
-            A `.colors.Colormap` instance.  If not set, use rc settings.
+        %(cmap_doc)s
 
-        norm : Normalize, optional
-            A `.colors.Normalize` instance is used to
-            scale luminance data to ``[0, 1]``. If not set, defaults to
-            `.colors.Normalize()`.
+        %(norm_doc)s
 
-        vmin/vmax : None or scalar, optional
-            Arguments passed to the `~.colors.Normalize` instance.
+        %(vmin_vmax_doc)s
 
         alpha : ``0 <= scalar <= 1`` or ``None``, optional
             The alpha blending value.
 
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             Additional parameters are passed along to the
             `~.Axes.pcolormesh` method and `~matplotlib.collections.QuadMesh`
@@ -7056,6 +7058,7 @@ def hist2d(self, x, y, bins=10, range=None, density=False, weights=None,
         See Also
         --------
         hist : 1D histogram plotting
+        hexbin : 2D histogram with hexagonal bins
 
         Notes
         -----
@@ -7083,7 +7086,7 @@ def hist2d(self, x, y, bins=10, range=None, density=False, weights=None,
         return h, xedges, yedges, pc
 
     @_preprocess_data(replace_names=["x"])
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def psd(self, x, NFFT=None, Fs=None, Fc=None, detrend=None,
             window=None, noverlap=None, pad_to=None,
             sides=None, scale_by_freq=None, return_line=None, **kwargs):
@@ -7135,10 +7138,13 @@ def psd(self, x, NFFT=None, Fs=None, Fc=None, detrend=None,
 
         Other Parameters
         ----------------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             Keyword arguments control the `.Line2D` properties:
 
-            %(Line2D_kwdoc)s
+            %(Line2D:kwdoc)s
 
         See Also
         --------
@@ -7179,12 +7185,9 @@ def psd(self, x, NFFT=None, Fs=None, Fc=None, detrend=None,
         self.set_xlabel('Frequency')
         self.set_ylabel('Power Spectral Density (%s)' % psd_units)
         self.grid(True)
-        vmin, vmax = self.viewLim.intervaly
-        intv = vmax - vmin
-        logi = int(np.log10(intv))
-        if logi == 0:
-            logi = .1
-        step = 10 * logi
+
+        vmin, vmax = self.get_ybound()
+        step = max(10 * int(np.log10(vmax - vmin)), 1)
         ticks = np.arange(math.floor(vmin), math.ceil(vmax) + 1, step)
         self.set_yticks(ticks)
 
@@ -7194,7 +7197,7 @@ def psd(self, x, NFFT=None, Fs=None, Fc=None, detrend=None,
             return pxx, freqs, line
 
     @_preprocess_data(replace_names=["x", "y"], label_namer="y")
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def csd(self, x, y, NFFT=None, Fs=None, Fc=None, detrend=None,
             window=None, noverlap=None, pad_to=None,
             sides=None, scale_by_freq=None, return_line=None, **kwargs):
@@ -7248,10 +7251,13 @@ def csd(self, x, y, NFFT=None, Fs=None, Fc=None, detrend=None,
 
         Other Parameters
         ----------------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             Keyword arguments control the `.Line2D` properties:
 
-            %(Line2D_kwdoc)s
+            %(Line2D:kwdoc)s
 
         See Also
         --------
@@ -7281,11 +7287,9 @@ def csd(self, x, y, NFFT=None, Fs=None, Fc=None, detrend=None,
         self.set_xlabel('Frequency')
         self.set_ylabel('Cross Spectrum Magnitude (dB)')
         self.grid(True)
-        vmin, vmax = self.viewLim.intervaly
-
-        intv = vmax - vmin
-        step = 10 * int(np.log10(intv))
 
+        vmin, vmax = self.get_ybound()
+        step = max(10 * int(np.log10(vmax - vmin)), 1)
         ticks = np.arange(math.floor(vmin), math.ceil(vmax) + 1, step)
         self.set_yticks(ticks)
 
@@ -7295,7 +7299,7 @@ def csd(self, x, y, NFFT=None, Fs=None, Fc=None, detrend=None,
             return pxy, freqs, line
 
     @_preprocess_data(replace_names=["x"])
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def magnitude_spectrum(self, x, Fs=None, Fc=None, window=None,
                            pad_to=None, sides=None, scale=None,
                            **kwargs):
@@ -7338,10 +7342,13 @@ def magnitude_spectrum(self, x, Fs=None, Fc=None, window=None,
 
         Other Parameters
         ----------------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             Keyword arguments control the `.Line2D` properties:
 
-            %(Line2D_kwdoc)s
+            %(Line2D:kwdoc)s
 
         See Also
         --------
@@ -7378,7 +7385,7 @@ def magnitude_spectrum(self, x, Fs=None, Fc=None, window=None,
         return spec, freqs, line
 
     @_preprocess_data(replace_names=["x"])
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def angle_spectrum(self, x, Fs=None, Fc=None, window=None,
                        pad_to=None, sides=None, **kwargs):
         """
@@ -7415,10 +7422,13 @@ def angle_spectrum(self, x, Fs=None, Fc=None, window=None,
 
         Other Parameters
         ----------------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             Keyword arguments control the `.Line2D` properties:
 
-            %(Line2D_kwdoc)s
+            %(Line2D:kwdoc)s
 
         See Also
         --------
@@ -7444,7 +7454,7 @@ def angle_spectrum(self, x, Fs=None, Fc=None, window=None,
         return spec, freqs, lines[0]
 
     @_preprocess_data(replace_names=["x"])
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def phase_spectrum(self, x, Fs=None, Fc=None, window=None,
                        pad_to=None, sides=None, **kwargs):
         """
@@ -7481,10 +7491,13 @@ def phase_spectrum(self, x, Fs=None, Fc=None, window=None,
 
         Other Parameters
         ----------------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             Keyword arguments control the `.Line2D` properties:
 
-            %(Line2D_kwdoc)s
+            %(Line2D:kwdoc)s
 
         See Also
         --------
@@ -7510,15 +7523,14 @@ def phase_spectrum(self, x, Fs=None, Fc=None, window=None,
         return spec, freqs, lines[0]
 
     @_preprocess_data(replace_names=["x", "y"])
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def cohere(self, x, y, NFFT=256, Fs=2, Fc=0, detrend=mlab.detrend_none,
                window=mlab.window_hanning, noverlap=0, pad_to=None,
                sides='default', scale_by_freq=None, **kwargs):
         r"""
         Plot the coherence between *x* and *y*.
 
-        Plot the coherence between *x* and *y*.  Coherence is the
-        normalized cross spectral density:
+        Coherence is the normalized cross spectral density:
 
         .. math::
 
@@ -7548,10 +7560,13 @@ def cohere(self, x, y, NFFT=256, Fs=2, Fc=0, detrend=mlab.detrend_none,
 
         Other Parameters
         ----------------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             Keyword arguments control the `.Line2D` properties:
 
-            %(Line2D_kwdoc)s
+            %(Line2D:kwdoc)s
 
         References
         ----------
@@ -7560,7 +7575,8 @@ def cohere(self, x, y, NFFT=256, Fs=2, Fc=0, detrend=mlab.detrend_none,
         """
         cxy, freqs = mlab.cohere(x=x, y=y, NFFT=NFFT, Fs=Fs, detrend=detrend,
                                  window=window, noverlap=noverlap,
-                                 scale_by_freq=scale_by_freq)
+                                 scale_by_freq=scale_by_freq, sides=sides,
+                                 pad_to=pad_to)
         freqs += Fc
 
         self.plot(freqs, cxy, **kwargs)
@@ -7571,7 +7587,7 @@ def cohere(self, x, y, NFFT=256, Fs=2, Fc=0, detrend=mlab.detrend_none,
         return cxy, freqs
 
     @_preprocess_data(replace_names=["x"])
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def specgram(self, x, NFFT=None, Fs=None, Fc=None, detrend=None,
                  window=None, noverlap=None,
                  cmap=None, xextent=None, pad_to=None, sides=None,
@@ -7626,6 +7642,9 @@ def specgram(self, x, NFFT=None, Fs=None, Fc=None, detrend=None,
             right border of the last bin. Note that for *noverlap>0* the width
             of the bins is smaller than those of the segments.
 
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             Additional keyword arguments are passed on to `~.axes.Axes.imshow`
             which makes the specgram image. The origin keyword argument
@@ -7702,7 +7721,7 @@ def specgram(self, x, NFFT=None, Fs=None, Fc=None, detrend=None,
             else:
                 Z = 20. * np.log10(spec)
         else:
-            raise ValueError('Unknown scale %s', scale)
+            raise ValueError(f'Unknown scale {scale!r}')
 
         Z = np.flipud(Z)
 
@@ -7724,7 +7743,7 @@ def specgram(self, x, NFFT=None, Fs=None, Fc=None, detrend=None,
 
         return spec, freqs, t, im
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def spy(self, Z, precision=0, marker=None, markersize=None,
             aspect='equal', origin="upper", **kwargs):
         """
@@ -7801,7 +7820,7 @@ def spy(self, Z, precision=0, marker=None, markersize=None,
             For the marker style, you can pass any `.Line2D` property except
             for *linestyle*:
 
-            %(Line2D_kwdoc)s
+            %(Line2D:kwdoc)s
         """
         if marker is None and markersize is None and hasattr(Z, 'tocoo'):
             marker = 's'
@@ -7856,7 +7875,7 @@ def spy(self, Z, precision=0, marker=None, markersize=None,
         self.title.set_y(1.05)
         if origin == "upper":
             self.xaxis.tick_top()
-        else:
+        else:  # lower
             self.xaxis.tick_bottom()
         self.xaxis.set_ticks_position('both')
         self.xaxis.set_major_locator(
@@ -7968,8 +7987,12 @@ def violinplot(self, dataset, positions=None, vert=True, widths=0.5,
           The method used to calculate the estimator bandwidth.  This can be
           'scott', 'silverman', a scalar constant or a callable.  If a
           scalar, this will be used directly as `kde.factor`.  If a
-          callable, it should take a `GaussianKDE` instance as its only
-          parameter and return a scalar. If None (default), 'scott' is used.
+          callable, it should take a `matplotlib.mlab.GaussianKDE` instance as
+          its only parameter and return a scalar. If None (default), 'scott'
+          is used.
+
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
 
         Returns
         -------
@@ -8003,8 +8026,8 @@ def violinplot(self, dataset, positions=None, vert=True, widths=0.5,
         """
 
         def _kde_method(X, coords):
-            if hasattr(X, 'values'):  # support pandas.Series
-                X = X.values
+            # Unpack in case of e.g. Pandas or xarray object
+            X = cbook._unpack_to_numpy(X)
             # fallback gracefully if the vector contains only one value
             if np.all(X[0] == X):
                 return (X[0] == coords).astype(float)
@@ -8102,7 +8125,6 @@ def violin(self, vpstats, positions=None, vert=True, widths=0.5,
           - ``cquantiles``: A `~.collections.LineCollection` instance created
             to identify the quantiles values of each of the violin's
             distribution.
-
         """
 
         # Statistical quantities to be plotted on the violins
@@ -8110,10 +8132,11 @@ def violin(self, vpstats, positions=None, vert=True, widths=0.5,
         mins = []
         maxes = []
         medians = []
-        quantiles = np.asarray([])
+        quantiles = []
+
+        qlens = []  # Number of quantiles in each dataset.
 
-        # Collections to be returned
-        artists = {}
+        artists = {}  # Collections to be returned
 
         N = len(vpstats)
         datashape_message = ("List of violinplot statistics and `{0}` "
@@ -8131,84 +8154,56 @@ def violin(self, vpstats, positions=None, vert=True, widths=0.5,
         elif len(widths) != N:
             raise ValueError(datashape_message.format("widths"))
 
-        # Calculate ranges for statistics lines
-        pmins = -0.25 * np.array(widths) + positions
-        pmaxes = 0.25 * np.array(widths) + positions
+        # Calculate ranges for statistics lines (shape (2, N)).
+        line_ends = [[-0.25], [0.25]] * np.array(widths) + positions
+
+        # Colors.
+        if mpl.rcParams['_internal.classic_mode']:
+            fillcolor = 'y'
+            linecolor = 'r'
+        else:
+            fillcolor = linecolor = self._get_lines.get_next_color()
 
         # Check whether we are rendering vertically or horizontally
         if vert:
             fill = self.fill_betweenx
-            perp_lines = self.hlines
-            par_lines = self.vlines
+            perp_lines = functools.partial(self.hlines, colors=linecolor)
+            par_lines = functools.partial(self.vlines, colors=linecolor)
         else:
             fill = self.fill_between
-            perp_lines = self.vlines
-            par_lines = self.hlines
-
-        if rcParams['_internal.classic_mode']:
-            fillcolor = 'y'
-            edgecolor = 'r'
-        else:
-            fillcolor = edgecolor = self._get_lines.get_next_color()
+            perp_lines = functools.partial(self.vlines, colors=linecolor)
+            par_lines = functools.partial(self.hlines, colors=linecolor)
 
         # Render violins
         bodies = []
         for stats, pos, width in zip(vpstats, positions, widths):
-            # The 0.5 factor reflects the fact that we plot from v-p to
-            # v+p
+            # The 0.5 factor reflects the fact that we plot from v-p to v+p.
             vals = np.array(stats['vals'])
             vals = 0.5 * width * vals / vals.max()
-            bodies += [fill(stats['coords'],
-                            -vals + pos,
-                            vals + pos,
-                            facecolor=fillcolor,
-                            alpha=0.3)]
+            bodies += [fill(stats['coords'], -vals + pos, vals + pos,
+                            facecolor=fillcolor, alpha=0.3)]
             means.append(stats['mean'])
             mins.append(stats['min'])
             maxes.append(stats['max'])
             medians.append(stats['median'])
-            q = stats.get('quantiles')
-            if q is not None:
-                # If exist key quantiles, assume it's a list of floats
-                quantiles = np.concatenate((quantiles, q))
+            q = stats.get('quantiles')  # a list of floats, or None
+            if q is None:
+                q = []
+            quantiles.extend(q)
+            qlens.append(len(q))
         artists['bodies'] = bodies
 
-        # Render means
-        if showmeans:
-            artists['cmeans'] = perp_lines(means, pmins, pmaxes,
-                                           colors=edgecolor)
-
-        # Render extrema
-        if showextrema:
-            artists['cmaxes'] = perp_lines(maxes, pmins, pmaxes,
-                                           colors=edgecolor)
-            artists['cmins'] = perp_lines(mins, pmins, pmaxes,
-                                          colors=edgecolor)
-            artists['cbars'] = par_lines(positions, mins, maxes,
-                                         colors=edgecolor)
-
-        # Render medians
-        if showmedians:
-            artists['cmedians'] = perp_lines(medians,
-                                             pmins,
-                                             pmaxes,
-                                             colors=edgecolor)
-
-        # Render quantile values
-        if quantiles.size > 0:
-            # Recalculate ranges for statistics lines for quantiles.
-            # ppmins are the left end of quantiles lines
-            ppmins = np.asarray([])
-            # pmaxes are the right end of quantiles lines
-            ppmaxs = np.asarray([])
-            for stats, cmin, cmax in zip(vpstats, pmins, pmaxes):
-                q = stats.get('quantiles')
-                if q is not None:
-                    ppmins = np.concatenate((ppmins, [cmin] * np.size(q)))
-                    ppmaxs = np.concatenate((ppmaxs, [cmax] * np.size(q)))
-            # Start rendering
-            artists['cquantiles'] = perp_lines(quantiles, ppmins, ppmaxs,
-                                               colors=edgecolor)
+        if showmeans:  # Render means
+            artists['cmeans'] = perp_lines(means, *line_ends)
+        if showextrema:  # Render extrema
+            artists['cmaxes'] = perp_lines(maxes, *line_ends)
+            artists['cmins'] = perp_lines(mins, *line_ends)
+            artists['cbars'] = par_lines(positions, mins, maxes)
+        if showmedians:  # Render medians
+            artists['cmedians'] = perp_lines(medians, *line_ends)
+        if quantiles:  # Render quantiles: each width is repeated qlen times.
+            artists['cquantiles'] = perp_lines(
+                quantiles, *np.repeat(line_ends, qlens, axis=1))
 
         return artists
 
@@ -8226,3 +8221,13 @@ def violin(self, vpstats, positions=None, vert=True, widths=0.5,
     tricontourf = mtri.tricontourf
     tripcolor = mtri.tripcolor
     triplot = mtri.triplot
+
+    def _get_aspect_ratio(self):
+        """
+        Convenience method to calculate the aspect ratio of the axes in
+        the display coordinate system.
+        """
+        figure_size = self.get_figure().get_size_inches()
+        ll, ur = self.get_position() * figure_size
+        width, height = ur - ll
+        return height / (width * self.get_data_ratio())
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
index 728d22cd7d08..056ff7ea2ced 100644
--- a/lib/matplotlib/axes/_base.py
+++ b/lib/matplotlib/axes/_base.py
@@ -1,4 +1,4 @@
-from collections import OrderedDict
+from collections.abc import MutableSequence
 from contextlib import ExitStack
 import functools
 import inspect
@@ -11,22 +11,22 @@
 import numpy as np
 
 import matplotlib as mpl
-from matplotlib import _api, cbook
+from matplotlib import _api, cbook, _docstring, offsetbox
+import matplotlib.artist as martist
+import matplotlib.axis as maxis
 from matplotlib.cbook import _OrderedSet, _check_1d, index_of
-from matplotlib import docstring
+import matplotlib.collections as mcoll
 import matplotlib.colors as mcolors
+import matplotlib.font_manager as font_manager
+import matplotlib.image as mimage
 import matplotlib.lines as mlines
 import matplotlib.patches as mpatches
-import matplotlib.artist as martist
-import matplotlib.transforms as mtransforms
-import matplotlib.ticker as mticker
-import matplotlib.axis as maxis
+from matplotlib.rcsetup import cycler, validate_axisbelow
 import matplotlib.spines as mspines
-import matplotlib.font_manager as font_manager
+import matplotlib.table as mtable
 import matplotlib.text as mtext
-import matplotlib.image as mimage
-import matplotlib.path as mpath
-from matplotlib.rcsetup import cycler, validate_axisbelow
+import matplotlib.ticker as mticker
+import matplotlib.transforms as mtransforms
 
 _log = logging.getLogger(__name__)
 
@@ -94,16 +94,16 @@ def wrapper(self, *args, **kwargs):
 
 class _TransformedBoundsLocator:
     """
-    Axes locator for `.Axes.inset_axes` and similarly positioned axes.
+    Axes locator for `.Axes.inset_axes` and similarly positioned Axes.
 
     The locator is a callable object used in `.Axes.set_aspect` to compute the
-    axes location depending on the renderer.
+    Axes location depending on the renderer.
     """
 
     def __init__(self, bounds, transform):
         """
         *bounds* (a ``[l, b, w, h]`` rectangle) and *transform* together
-        specify the position of the inset axes.
+        specify the position of the inset Axes.
         """
         self._bounds = bounds
         self._transform = transform
@@ -117,7 +117,7 @@ def __call__(self, ax, renderer):
             self._transform - ax.figure.transSubfigure)
 
 
-def _process_plot_format(fmt):
+def _process_plot_format(fmt, *, ambiguous_fmt_datakey=False):
     """
     Convert a MATLAB style color/line style format string to a (*linestyle*,
     *marker*, *color*) tuple.
@@ -162,31 +162,31 @@ def _process_plot_format(fmt):
     except ValueError:
         pass  # No, not just a color.
 
+    errfmt = ("{!r} is neither a data key nor a valid format string ({})"
+              if ambiguous_fmt_datakey else
+              "{!r} is not a valid format string ({})")
+
     i = 0
     while i < len(fmt):
         c = fmt[i]
         if fmt[i:i+2] in mlines.lineStyles:  # First, the two-char styles.
             if linestyle is not None:
-                raise ValueError(
-                    'Illegal format string "%s"; two linestyle symbols' % fmt)
+                raise ValueError(errfmt.format(fmt, "two linestyle symbols"))
             linestyle = fmt[i:i+2]
             i += 2
         elif c in mlines.lineStyles:
             if linestyle is not None:
-                raise ValueError(
-                    'Illegal format string "%s"; two linestyle symbols' % fmt)
+                raise ValueError(errfmt.format(fmt, "two linestyle symbols"))
             linestyle = c
             i += 1
         elif c in mlines.lineMarkers:
             if marker is not None:
-                raise ValueError(
-                    'Illegal format string "%s"; two marker symbols' % fmt)
+                raise ValueError(errfmt.format(fmt, "two marker symbols"))
             marker = c
             i += 1
         elif c in mcolors.get_named_colors_mapping():
             if color is not None:
-                raise ValueError(
-                    'Illegal format string "%s"; two color symbols' % fmt)
+                raise ValueError(errfmt.format(fmt, "two color symbols"))
             color = c
             i += 1
         elif c == 'C' and i < len(fmt) - 1:
@@ -195,7 +195,7 @@ def _process_plot_format(fmt):
             i += 2
         else:
             raise ValueError(
-                'Unrecognized character %c in format string' % c)
+                errfmt.format(fmt, f"unrecognized character {c!r}"))
 
     if linestyle is None and marker is None:
         linestyle = mpl.rcParams['lines.linestyle']
@@ -221,7 +221,7 @@ class _process_plot_var_args:
     def __init__(self, axes, command='plot'):
         self.axes = axes
         self.command = command
-        self.set_prop_cycle()
+        self.set_prop_cycle(None)
 
     def __getstate__(self):
         # note: it is not possible to pickle a generator (and thus a cycler).
@@ -229,18 +229,13 @@ def __getstate__(self):
 
     def __setstate__(self, state):
         self.__dict__ = state.copy()
-        self.set_prop_cycle()
+        self.set_prop_cycle(None)
 
-    def set_prop_cycle(self, *args, **kwargs):
-        # Can't do `args == (None,)` as that crashes cycler.
-        if not (args or kwargs) or (len(args) == 1 and args[0] is None):
-            prop_cycler = mpl.rcParams['axes.prop_cycle']
-        else:
-            prop_cycler = cycler(*args, **kwargs)
-
-        self.prop_cycler = itertools.cycle(prop_cycler)
-        # This should make a copy
-        self._prop_keys = prop_cycler.keys
+    def set_prop_cycle(self, cycler):
+        if cycler is None:
+            cycler = mpl.rcParams['axes.prop_cycle']
+        self.prop_cycler = itertools.cycle(cycler)
+        self._prop_keys = cycler.keys  # This should make a copy
 
     def __call__(self, *args, data=None, **kwargs):
         self.axes._process_unit_info(kwargs=kwargs)
@@ -297,6 +292,7 @@ def __call__(self, *args, data=None, **kwargs):
                 kwargs["label"] = mpl._label_from_arg(
                     replaced[label_namer_idx], args[label_namer_idx])
             args = replaced
+        ambiguous_fmt_datakey = data is not None and len(args) == 2
 
         if len(args) >= 4 and not cbook.is_scalar_or_string(
                 kwargs.get("label")):
@@ -312,7 +308,8 @@ def __call__(self, *args, data=None, **kwargs):
             if args and isinstance(args[0], str):
                 this += args[0],
                 args = args[1:]
-            yield from self._plot_args(this, kwargs)
+            yield from self._plot_args(
+                this, kwargs, ambiguous_fmt_datakey=ambiguous_fmt_datakey)
 
     def get_next_color(self):
         """Return the next color in the cycle."""
@@ -406,7 +403,8 @@ def _makefill(self, x, y, kw, kwargs):
         seg.set(**kwargs)
         return seg, kwargs
 
-    def _plot_args(self, tup, kwargs, return_kwargs=False):
+    def _plot_args(self, tup, kwargs, *,
+                   return_kwargs=False, ambiguous_fmt_datakey=False):
         """
         Process the arguments of ``plot([x], y, [fmt], **kwargs)`` calls.
 
@@ -433,9 +431,13 @@ def _plot_args(self, tup, kwargs, return_kwargs=False):
             The keyword arguments passed to ``plot()``.
 
         return_kwargs : bool
-            If true, return the effective keyword arguments after label
+            Whether to also return the effective keyword arguments after label
             unpacking as well.
 
+        ambiguous_fmt_datakey : bool
+            Whether the format string in *tup* could also have been a
+            misspelled data key.
+
         Returns
         -------
         result
@@ -449,7 +451,8 @@ def _plot_args(self, tup, kwargs, return_kwargs=False):
         if len(tup) > 1 and isinstance(tup[-1], str):
             # xy is tup with fmt stripped (could still be (y,) only)
             *xy, fmt = tup
-            linestyle, marker, color = _process_plot_format(fmt)
+            linestyle, marker, color = _process_plot_format(
+                fmt, ambiguous_fmt_datakey=ambiguous_fmt_datakey)
         elif len(tup) == 3:
             raise ValueError('third arg must be a format string')
         else:
@@ -517,6 +520,8 @@ def _plot_args(self, tup, kwargs, return_kwargs=False):
         ncx, ncy = x.shape[1], y.shape[1]
         if ncx > 1 and ncy > 1 and ncx != ncy:
             raise ValueError(f"x has {ncx} columns but y has {ncy} columns")
+        if ncx == 0 or ncy == 0:
+            return []
 
         label = kwargs.get('label')
         n_datasets = max(ncx, ncy)
@@ -539,20 +544,35 @@ def _plot_args(self, tup, kwargs, return_kwargs=False):
             return [l[0] for l in result]
 
 
-@cbook._define_aliases({"facecolor": ["fc"]})
+@_api.define_aliases({"facecolor": ["fc"]})
 class _AxesBase(martist.Artist):
     name = "rectilinear"
 
-    _shared_x_axes = cbook.Grouper()
-    _shared_y_axes = cbook.Grouper()
+    # axis names are the prefixes for the attributes that contain the
+    # respective axis; e.g. 'x' <-> self.xaxis, containing an XAxis.
+    # Note that PolarAxes uses these attributes as well, so that we have
+    # 'x' <-> self.xaxis, containing a ThetaAxis. In particular we do not
+    # have 'theta' in _axis_names.
+    # In practice, this is ('x', 'y') for all 2D Axes and ('x', 'y', 'z')
+    # for Axes3D.
+    _axis_names = ("x", "y")
+    _shared_axes = {name: cbook.Grouper() for name in _axis_names}
     _twinned_axes = cbook.Grouper()
 
+    _subclass_uses_cla = False
+
+    @property
+    def _axis_map(self):
+        """A mapping of axis names, e.g. 'x', to `Axis` instances."""
+        return {name: getattr(self, f"{name}axis")
+                for name in self._axis_names}
+
     def __str__(self):
         return "{0}({1[0]:g},{1[1]:g};{1[2]:g}x{1[3]:g})".format(
             type(self).__name__, self._position.bounds)
 
-    @_api.make_keyword_only("3.4", "facecolor")
     def __init__(self, fig, rect,
+                 *,
                  facecolor=None,  # defaults to rc axes.facecolor
                  frameon=True,
                  sharex=None,  # use Axes instance's xaxis info
@@ -564,15 +584,15 @@ def __init__(self, fig, rect,
                  **kwargs
                  ):
         """
-        Build an axes in a figure.
+        Build an Axes in a figure.
 
         Parameters
         ----------
         fig : `~matplotlib.figure.Figure`
-            The axes is build in the `.Figure` *fig*.
+            The Axes is built in the `.Figure` *fig*.
 
-        rect : [left, bottom, width, height]
-            The axes is build in the rectangle *rect*. *rect* is in
+        rect : tuple (left, bottom, width, height).
+            The Axes is built in the rectangle *rect*. *rect* is in
             `.Figure` coordinates.
 
         sharex, sharey : `~.axes.Axes`, optional
@@ -580,16 +600,16 @@ def __init__(self, fig, rect,
             y axis in the input `~.axes.Axes`.
 
         frameon : bool, default: True
-            Whether the axes frame is visible.
+            Whether the Axes frame is visible.
 
         box_aspect : float, optional
-            Set a fixed aspect for the axes box, i.e. the ratio of height to
+            Set a fixed aspect for the Axes box, i.e. the ratio of height to
             width. See `~.axes.Axes.set_box_aspect` for details.
 
         **kwargs
             Other optional keyword arguments:
 
-            %(Axes_kwdoc)s
+            %(Axes:kwdoc)s
 
         Returns
         -------
@@ -609,15 +629,14 @@ def __init__(self, fig, rect,
         self._aspect = 'auto'
         self._adjustable = 'box'
         self._anchor = 'C'
-        self._stale_viewlim_x = False
-        self._stale_viewlim_y = False
+        self._stale_viewlims = {name: False for name in self._axis_names}
         self._sharex = sharex
         self._sharey = sharey
         self.set_label(label)
         self.set_figure(fig)
         self.set_box_aspect(box_aspect)
         self._axes_locator = None  # Optionally set via update(kwargs).
-        # placeholder for any colorbars added that use this axes.
+        # placeholder for any colorbars added that use this Axes.
         # (see colorbar.py):
         self._colorbars = []
         self.spines = mspines.Spines.from_dict(self._gen_axes_spines())
@@ -631,7 +650,7 @@ def __init__(self, fig, rect,
         self.set_axisbelow(mpl.rcParams['axes.axisbelow'])
 
         self._rasterization_zorder = None
-        self.cla()
+        self.clear()
 
         # funcs used to format x and y - fall back on major formatters
         self.fmt_xdata = None
@@ -645,12 +664,11 @@ def __init__(self, fig, rect,
         if yscale:
             self.set_yscale(yscale)
 
-        self.update(kwargs)
+        self._internal_update(kwargs)
 
-        for name, axis in self._get_axis_map().items():
-            axis.callbacks._pickled_cids.add(
-                axis.callbacks.connect(
-                    'units finalize', self._unit_change_handler(name)))
+        for name, axis in self._axis_map.items():
+            axis.callbacks._connect_picklable(
+                'units', self._unit_change_handler(name))
 
         rcParams = mpl.rcParams
         self.tick_params(
@@ -683,25 +701,38 @@ def __init__(self, fig, rect,
                         rcParams['ytick.major.right']),
             which='major')
 
+    def __init_subclass__(cls, **kwargs):
+        parent_uses_cla = super(cls, cls)._subclass_uses_cla
+        if 'cla' in cls.__dict__:
+            _api.warn_deprecated(
+                '3.6',
+                pending=True,
+                message=f'Overriding `Axes.cla` in {cls.__qualname__} is '
+                'pending deprecation in %(since)s and will be fully '
+                'deprecated in favor of `Axes.clear` in the future. '
+                'Please report '
+                f'this to the {cls.__module__!r} author.')
+        cls._subclass_uses_cla = 'cla' in cls.__dict__ or parent_uses_cla
+        super().__init_subclass__(**kwargs)
+
     def __getstate__(self):
-        # The renderer should be re-created by the figure, and then cached at
-        # that point.
         state = super().__getstate__()
         # Prune the sharing & twinning info to only contain the current group.
-        for grouper_name in [
-                '_shared_x_axes', '_shared_y_axes', '_twinned_axes']:
-            grouper = getattr(self, grouper_name)
-            state[grouper_name] = (grouper.get_siblings(self)
-                                   if self in grouper else None)
+        state["_shared_axes"] = {
+            name: self._shared_axes[name].get_siblings(self)
+            for name in self._axis_names if self in self._shared_axes[name]}
+        state["_twinned_axes"] = (self._twinned_axes.get_siblings(self)
+                                  if self in self._twinned_axes else None)
         return state
 
     def __setstate__(self, state):
         # Merge the grouping info back into the global groupers.
-        for grouper_name in [
-                '_shared_x_axes', '_shared_y_axes', '_twinned_axes']:
-            siblings = state.pop(grouper_name)
-            if siblings:
-                getattr(self, grouper_name).join(*siblings)
+        shared_axes = state.pop("_shared_axes")
+        for name, shared_siblings in shared_axes.items():
+            self._shared_axes[name].join(*shared_siblings)
+        twinned_siblings = state.pop("_twinned_axes")
+        if twinned_siblings:
+            self._twinned_axes.join(*twinned_siblings)
         self.__dict__ = state
         self._stale = True
 
@@ -709,25 +740,27 @@ def __repr__(self):
         fields = []
         if self.get_label():
             fields += [f"label={self.get_label()!r}"]
-        titles = []
-        for k in ["left", "center", "right"]:
-            title = self.get_title(loc=k)
-            if title:
-                titles.append(f"{k!r}:{title!r}")
-        if titles:
-            fields += ["title={" + ",".join(titles) + "}"]
-        if self.get_xlabel():
-            fields += [f"xlabel={self.get_xlabel()!r}"]
-        if self.get_ylabel():
-            fields += [f"ylabel={self.get_ylabel()!r}"]
-        return f"<{self.__class__.__name__}:" + ", ".join(fields) + ">"
-
-    def get_window_extent(self, *args, **kwargs):
-        """
-        Return the axes bounding box in display space; *args* and *kwargs*
+        if hasattr(self, "get_title"):
+            titles = {}
+            for k in ["left", "center", "right"]:
+                title = self.get_title(loc=k)
+                if title:
+                    titles[k] = title
+            if titles:
+                fields += [f"title={titles}"]
+        for name, axis in self._axis_map.items():
+            if axis.get_label() and axis.get_label().get_text():
+                fields += [f"{name}label={axis.get_label().get_text()!r}"]
+        return f"<{self.__class__.__name__}: " + ", ".join(fields) + ">"
+
+    @_api.delete_parameter("3.6", "args")
+    @_api.delete_parameter("3.6", "kwargs")
+    def get_window_extent(self, renderer=None, *args, **kwargs):
+        """
+        Return the Axes bounding box in display space; *args* and *kwargs*
         are empty.
 
-        This bounding box does not include the spines, ticks, ticklables,
+        This bounding box does not include the spines, ticks, ticklabels,
         or other labels.  For a bounding box including these elements use
         `~matplotlib.axes.Axes.get_tightbbox`.
 
@@ -766,31 +799,42 @@ def set_figure(self, fig):
     def _unstale_viewLim(self):
         # We should arrange to store this information once per share-group
         # instead of on every axis.
-        scalex = any(ax._stale_viewlim_x
-                     for ax in self._shared_x_axes.get_siblings(self))
-        scaley = any(ax._stale_viewlim_y
-                     for ax in self._shared_y_axes.get_siblings(self))
-        if scalex or scaley:
-            for ax in self._shared_x_axes.get_siblings(self):
-                ax._stale_viewlim_x = False
-            for ax in self._shared_y_axes.get_siblings(self):
-                ax._stale_viewlim_y = False
-            self.autoscale_view(scalex=scalex, scaley=scaley)
+        need_scale = {
+            name: any(ax._stale_viewlims[name]
+                      for ax in self._shared_axes[name].get_siblings(self))
+            for name in self._axis_names}
+        if any(need_scale.values()):
+            for name in need_scale:
+                for ax in self._shared_axes[name].get_siblings(self):
+                    ax._stale_viewlims[name] = False
+            self.autoscale_view(**{f"scale{name}": scale
+                                   for name, scale in need_scale.items()})
 
     @property
     def viewLim(self):
         self._unstale_viewLim()
         return self._viewLim
 
-    # API could be better, right now this is just to match the old calls to
-    # autoscale_view() after each plotting method.
-    def _request_autoscale_view(self, tight=None, scalex=True, scaley=True):
+    def _request_autoscale_view(self, axis="all", tight=None):
+        """
+        Mark a single axis, or all of them, as stale wrt. autoscaling.
+
+        No computation is performed until the next autoscaling; thus, separate
+        calls to control individual axises incur negligible performance cost.
+
+        Parameters
+        ----------
+        axis : str, default: "all"
+            Either an element of ``self._axis_names``, or "all".
+        tight : bool or None, default: None
+        """
+        axis_names = _api.check_getitem(
+            {**{k: [k] for k in self._axis_names}, "all": self._axis_names},
+            axis=axis)
+        for name in axis_names:
+            self._stale_viewlims[name] = True
         if tight is not None:
             self._tight = tight
-        if scalex:
-            self._stale_viewlim_x = True  # Else keep old state.
-        if scaley:
-            self._stale_viewlim_y = True
 
     def _set_lim_and_transforms(self):
         """
@@ -801,7 +845,7 @@ def _set_lim_and_transforms(self):
 
             This method is primarily used by rectilinear projections of the
             `~matplotlib.axes.Axes` class, and is meant to be overridden by
-            new kinds of projection axes that need different transformations
+            new kinds of projection Axes that need different transformations
             and limits. (See `~matplotlib.projections.polar.PolarAxes` for an
             example.)
         """
@@ -850,7 +894,7 @@ def get_xaxis_transform(self, which='grid'):
             # for cartesian projection, this is top spine
             return self.spines.top.get_spine_transform()
         else:
-            raise ValueError('unknown value for which')
+            raise ValueError(f'unknown value for which: {which!r}')
 
     def get_xaxis_text1_transform(self, pad_points):
         """
@@ -858,7 +902,7 @@ def get_xaxis_text1_transform(self, pad_points):
         -------
         transform : Transform
             The transform used for drawing x-axis labels, which will add
-            *pad_points* of padding (in points) between the axes and the label.
+            *pad_points* of padding (in points) between the axis and the label.
             The x-direction is in data coordinates and the y-direction is in
             axis coordinates
         valign : {'center', 'top', 'bottom', 'baseline', 'center_baseline'}
@@ -884,7 +928,7 @@ def get_xaxis_text2_transform(self, pad_points):
         -------
         transform : Transform
             The transform used for drawing secondary x-axis labels, which will
-            add *pad_points* of padding (in points) between the axes and the
+            add *pad_points* of padding (in points) between the axis and the
             label.  The x-direction is in data coordinates and the y-direction
             is in axis coordinates
         valign : {'center', 'top', 'bottom', 'baseline', 'center_baseline'}
@@ -926,7 +970,7 @@ def get_yaxis_transform(self, which='grid'):
             # for cartesian projection, this is top spine
             return self.spines.right.get_spine_transform()
         else:
-            raise ValueError('unknown value for which')
+            raise ValueError(f'unknown value for which: {which!r}')
 
     def get_yaxis_text1_transform(self, pad_points):
         """
@@ -934,7 +978,7 @@ def get_yaxis_text1_transform(self, pad_points):
         -------
         transform : Transform
             The transform used for drawing y-axis labels, which will add
-            *pad_points* of padding (in points) between the axes and the label.
+            *pad_points* of padding (in points) between the axis and the label.
             The x-direction is in axis coordinates and the y-direction is in
             data coordinates
         valign : {'center', 'top', 'bottom', 'baseline', 'center_baseline'}
@@ -960,7 +1004,7 @@ def get_yaxis_text2_transform(self, pad_points):
         -------
         transform : Transform
             The transform used for drawing secondart y-axis labels, which will
-            add *pad_points* of padding (in points) between the axes and the
+            add *pad_points* of padding (in points) between the axis and the
             label.  The x-direction is in axis coordinates and the y-direction
             is in data coordinates
         valign : {'center', 'top', 'bottom', 'baseline', 'center_baseline'}
@@ -984,7 +1028,9 @@ def _update_transScale(self):
         self.transScale.set(
             mtransforms.blended_transform_factory(
                 self.xaxis.get_transform(), self.yaxis.get_transform()))
-        for line in getattr(self, "lines", []):  # Not set during init.
+        for line in getattr(self, "_children", []):  # Not set during init.
+            if not isinstance(line, mlines.Line2D):
+                continue
             try:
                 line._transformed_path.invalidate()
             except AttributeError:
@@ -992,7 +1038,7 @@ def _update_transScale(self):
 
     def get_position(self, original=False):
         """
-        Get a copy of the axes rectangle as a `.Bbox`.
+        Return the position of the Axes within the figure as a `.Bbox`.
 
         Parameters
         ----------
@@ -1016,7 +1062,7 @@ def get_position(self, original=False):
 
     def set_position(self, pos, which='both'):
         """
-        Set the axes position.
+        Set the Axes position.
 
         Axes have two position attributes. The 'original' position is the
         position allocated for the Axes. The 'active' position is the
@@ -1027,7 +1073,7 @@ def set_position(self, pos, which='both'):
         Parameters
         ----------
         pos : [left, bottom, width, height] or `~matplotlib.transforms.Bbox`
-            The new position of the in `.Figure` coordinates.
+            The new position of the Axes in `.Figure` coordinates.
 
         which : {'both', 'active', 'original'}, default: 'both'
             Determines which position variables to change.
@@ -1046,7 +1092,7 @@ def _set_position(self, pos, which='both'):
         """
         Private version of set_position.
 
-        Call this internally to get the same functionality of `get_position`,
+        Call this internally to get the same functionality of `set_position`,
         but not to take the axis out of the constrained_layout hierarchy.
         """
         if not isinstance(pos, mtransforms.BboxBase):
@@ -1062,8 +1108,9 @@ def reset_position(self):
         """
         Reset the active position to the original position.
 
-        This resets the a possible position change due to aspect constraints.
-        For an explanation of the positions see `.set_position`.
+        This undoes changes to the active position (as defined in
+        `.set_position`) which may have been performed to satisfy fixed-aspect
+        constraints.
         """
         for ax in self._twinned_axes.get_siblings(self):
             pos = ax.get_position(original=True)
@@ -1071,7 +1118,7 @@ def reset_position(self):
 
     def set_axes_locator(self, locator):
         """
-        Set the axes locator.
+        Set the Axes locator.
 
         Parameters
         ----------
@@ -1087,13 +1134,13 @@ def get_axes_locator(self):
         return self._axes_locator
 
     def _set_artist_props(self, a):
-        """Set the boilerplate props for artists added to axes."""
+        """Set the boilerplate props for artists added to Axes."""
         a.set_figure(self.figure)
         if not a.is_transform_set():
             a.set_transform(self.transData)
 
         a.axes = self
-        if a.mouseover:
+        if a.get_mouseover():
             self._mouseover_set.add(a)
 
     def _gen_axes_patch(self):
@@ -1101,10 +1148,10 @@ def _gen_axes_patch(self):
         Returns
         -------
         Patch
-            The patch used to draw the background of the axes.  It is also used
-            as the clipping path for any data elements on the axes.
+            The patch used to draw the background of the Axes.  It is also used
+            as the clipping path for any data elements on the Axes.
 
-            In the standard axes, this is a rectangle, but in other projections
+            In the standard Axes, this is a rectangle, but in other projections
             it may not be.
 
         Notes
@@ -1119,30 +1166,30 @@ def _gen_axes_spines(self, locations=None, offset=0.0, units='inches'):
         -------
         dict
             Mapping of spine names to `.Line2D` or `.Patch` instances that are
-            used to draw axes spines.
+            used to draw Axes spines.
 
-            In the standard axes, spines are single line segments, but in other
+            In the standard Axes, spines are single line segments, but in other
             projections they may not be.
 
         Notes
         -----
         Intended to be overridden by new projection types.
         """
-        return OrderedDict((side, mspines.Spine.linear_spine(self, side))
-                           for side in ['left', 'right', 'bottom', 'top'])
+        return {side: mspines.Spine.linear_spine(self, side)
+                for side in ['left', 'right', 'bottom', 'top']}
 
     def sharex(self, other):
         """
         Share the x-axis with *other*.
 
         This is equivalent to passing ``sharex=other`` when constructing the
-        axes, and cannot be used if the x-axis is already being shared with
-        another axes.
+        Axes, and cannot be used if the x-axis is already being shared with
+        another Axes.
         """
         _api.check_isinstance(_AxesBase, other=other)
         if self._sharex is not None and other is not self._sharex:
             raise ValueError("x-axis is already shared")
-        self._shared_x_axes.join(self, other)
+        self._shared_axes["x"].join(self, other)
         self._sharex = other
         self.xaxis.major = other.xaxis.major  # Ticker instances holding
         self.xaxis.minor = other.xaxis.minor  # locator and formatter.
@@ -1155,13 +1202,13 @@ def sharey(self, other):
         Share the y-axis with *other*.
 
         This is equivalent to passing ``sharey=other`` when constructing the
-        axes, and cannot be used if the y-axis is already being shared with
-        another axes.
+        Axes, and cannot be used if the y-axis is already being shared with
+        another Axes.
         """
         _api.check_isinstance(_AxesBase, other=other)
         if self._sharey is not None and other is not self._sharey:
             raise ValueError("y-axis is already shared")
-        self._shared_y_axes.join(self, other)
+        self._shared_axes["y"].join(self, other)
         self._sharey = other
         self.yaxis.major = other.yaxis.major  # Ticker instances holding
         self.yaxis.minor = other.yaxis.minor  # locator and formatter.
@@ -1169,9 +1216,12 @@ def sharey(self, other):
         self.set_ylim(y0, y1, emit=False, auto=other.get_autoscaley_on())
         self.yaxis._scale = other.yaxis._scale
 
-    def cla(self):
-        """Clear the axes."""
-        # Note: this is called by Axes.__init__()
+    def __clear(self):
+        """Clear the Axes."""
+        # The actual implementation of clear() as long as clear() has to be
+        # an adapter delegating to the correct implementation.
+        # The implementation can move back into clear() when the
+        # deprecation on cla() subclassing expires.
 
         # stash the current visibility state
         if hasattr(self, 'patch'):
@@ -1182,31 +1232,22 @@ def cla(self):
         xaxis_visible = self.xaxis.get_visible()
         yaxis_visible = self.yaxis.get_visible()
 
-        self.xaxis.clear()
-        self.yaxis.clear()
-
-        for name, spine in self.spines.items():
+        for axis in self._axis_map.values():
+            axis.clear()  # Also resets the scale to linear.
+        for spine in self.spines.values():
             spine.clear()
 
         self.ignore_existing_data_limits = True
-        self.callbacks = cbook.CallbackRegistry()
+        self.callbacks = cbook.CallbackRegistry(
+            signals=["xlim_changed", "ylim_changed", "zlim_changed"])
 
-        if self._sharex is not None:
-            self.sharex(self._sharex)
-        else:
-            self.xaxis._set_scale('linear')
-            try:
-                self.set_xlim(0, 1)
-            except TypeError:
-                pass
-        if self._sharey is not None:
-            self.sharey(self._sharey)
-        else:
-            self.yaxis._set_scale('linear')
-            try:
-                self.set_ylim(0, 1)
-            except TypeError:
-                pass
+        for name, axis in self._axis_map.items():
+            share = getattr(self, f"_share{name}")
+            if share is not None:
+                getattr(self, f"share{name}")(share)
+            else:
+                axis._set_scale("linear")
+                axis._set_lim(0, 1, auto=True)
 
         # update the minor locator for x and y axis based on rcParams
         if mpl.rcParams['xtick.minor.visible']:
@@ -1214,10 +1255,6 @@ def cla(self):
         if mpl.rcParams['ytick.minor.visible']:
             self.yaxis.set_minor_locator(mticker.AutoMinorLocator())
 
-        if self._sharex is None:
-            self._autoscaleXon = True
-        if self._sharey is None:
-            self._autoscaleYon = True
         self._xmargin = mpl.rcParams['axes.xmargin']
         self._ymargin = mpl.rcParams['axes.ymargin']
         self._tight = None
@@ -1228,18 +1265,12 @@ def cla(self):
         self._get_patches_for_fill = _process_plot_var_args(self, 'fill')
 
         self._gridOn = mpl.rcParams['axes.grid']
-        self.lines = []
-        self.patches = []
-        self.texts = []
-        self.tables = []
-        self.artists = []
-        self.images = []
+        self._children = []
         self._mouseover_set = _OrderedSet()
         self.child_axes = []
         self._current_image = None  # strictly for pyplot via _sci, _gci
         self._projection_init = None  # strictly for pyplot.subplot
         self.legend_ = None
-        self.collections = []  # collection.Collection instances
         self.containers = []
 
         self.grid(False)  # Disable grid on init to use rcParameter
@@ -1281,13 +1312,13 @@ def cla(self):
         for _title in (self.title, self._left_title, self._right_title):
             self._set_artist_props(_title)
 
-        # The patch draws the background of the axes.  We want this to be below
+        # The patch draws the background of the Axes.  We want this to be below
         # the other artists.  We use the frame to draw the edges so we are
         # setting the edgecolor to None.
         self.patch = self._gen_axes_patch()
         self.patch.set_figure(self.figure)
         self.patch.set_facecolor(self._facecolor)
-        self.patch.set_edgecolor('None')
+        self.patch.set_edgecolor('none')
         self.patch.set_linewidth(0)
         self.patch.set_transform(self.transAxes)
 
@@ -1296,8 +1327,8 @@ def cla(self):
         self.xaxis.set_clip_path(self.patch)
         self.yaxis.set_clip_path(self.patch)
 
-        self._shared_x_axes.clean()
-        self._shared_y_axes.clean()
+        self._shared_axes["x"].clean()
+        self._shared_axes["y"].clean()
         if self._sharex is not None:
             self.xaxis.set_visible(xaxis_visible)
             self.patch.set_visible(patch_visible)
@@ -1308,8 +1339,185 @@ def cla(self):
         self.stale = True
 
     def clear(self):
-        """Clear the axes."""
-        self.cla()
+        """Clear the Axes."""
+        # Act as an alias, or as the superclass implementation depending on the
+        # subclass implementation.
+        if self._subclass_uses_cla:
+            self.cla()
+        else:
+            self.__clear()
+
+    def cla(self):
+        """Clear the Axes."""
+        # Act as an alias, or as the superclass implementation depending on the
+        # subclass implementation.
+        if self._subclass_uses_cla:
+            self.__clear()
+        else:
+            self.clear()
+
+    class ArtistList(MutableSequence):
+        """
+        A sublist of Axes children based on their type.
+
+        The type-specific children sublists will become immutable in
+        Matplotlib 3.7. Then, these artist lists will likely be replaced by
+        tuples. Use as if this is a tuple already.
+
+        This class exists only for the transition period to warn on the
+        deprecated modification of artist lists.
+        """
+        def __init__(self, axes, prop_name, add_name,
+                     valid_types=None, invalid_types=None):
+            """
+            Parameters
+            ----------
+            axes : .axes.Axes
+                The Axes from which this sublist will pull the children
+                Artists.
+            prop_name : str
+                The property name used to access this sublist from the Axes;
+                used to generate deprecation warnings.
+            add_name : str
+                The method name used to add Artists of this sublist's type to
+                the Axes; used to generate deprecation warnings.
+            valid_types : list of type, optional
+                A list of types that determine which children will be returned
+                by this sublist. If specified, then the Artists in the sublist
+                must be instances of any of these types. If unspecified, then
+                any type of Artist is valid (unless limited by
+                *invalid_types*.)
+            invalid_types : tuple, optional
+                A list of types that determine which children will *not* be
+                returned by this sublist. If specified, then Artists in the
+                sublist will never be an instance of these types. Otherwise, no
+                types will be excluded.
+            """
+            self._axes = axes
+            self._prop_name = prop_name
+            self._add_name = add_name
+            self._type_check = lambda artist: (
+                (not valid_types or isinstance(artist, valid_types)) and
+                (not invalid_types or not isinstance(artist, invalid_types))
+            )
+
+        def __repr__(self):
+            return f'<Axes.ArtistList of {len(self)} {self._prop_name}>'
+
+        def __len__(self):
+            return sum(self._type_check(artist)
+                       for artist in self._axes._children)
+
+        def __iter__(self):
+            for artist in list(self._axes._children):
+                if self._type_check(artist):
+                    yield artist
+
+        def __getitem__(self, key):
+            return [artist
+                    for artist in self._axes._children
+                    if self._type_check(artist)][key]
+
+        def __add__(self, other):
+            if isinstance(other, (list, _AxesBase.ArtistList)):
+                return [*self, *other]
+            return NotImplemented
+
+        def __radd__(self, other):
+            if isinstance(other, list):
+                return other + list(self)
+            return NotImplemented
+
+        def insert(self, index, item):
+            _api.warn_deprecated(
+                '3.5',
+                name=f'modification of the Axes.{self._prop_name}',
+                obj_type='property',
+                alternative=f'Axes.{self._add_name}')
+            try:
+                index = self._axes._children.index(self[index])
+            except IndexError:
+                index = None
+            getattr(self._axes, self._add_name)(item)
+            if index is not None:
+                # Move new item to the specified index, if there's something to
+                # put it before.
+                self._axes._children[index:index] = self._axes._children[-1:]
+                del self._axes._children[-1]
+
+        def __setitem__(self, key, item):
+            _api.warn_deprecated(
+                '3.5',
+                name=f'modification of the Axes.{self._prop_name}',
+                obj_type='property',
+                alternative=f'Artist.remove() and Axes.f{self._add_name}')
+            del self[key]
+            if isinstance(key, slice):
+                key = key.start
+            if not np.iterable(item):
+                self.insert(key, item)
+                return
+
+            try:
+                index = self._axes._children.index(self[key])
+            except IndexError:
+                index = None
+            for i, artist in enumerate(item):
+                getattr(self._axes, self._add_name)(artist)
+            if index is not None:
+                # Move new items to the specified index, if there's something
+                # to put it before.
+                i = -(i + 1)
+                self._axes._children[index:index] = self._axes._children[i:]
+                del self._axes._children[i:]
+
+        def __delitem__(self, key):
+            _api.warn_deprecated(
+                '3.5',
+                name=f'modification of the Axes.{self._prop_name}',
+                obj_type='property',
+                alternative='Artist.remove()')
+            if isinstance(key, slice):
+                for artist in self[key]:
+                    artist.remove()
+            else:
+                self[key].remove()
+
+    @property
+    def artists(self):
+        return self.ArtistList(self, 'artists', 'add_artist', invalid_types=(
+            mcoll.Collection, mimage.AxesImage, mlines.Line2D, mpatches.Patch,
+            mtable.Table, mtext.Text))
+
+    @property
+    def collections(self):
+        return self.ArtistList(self, 'collections', 'add_collection',
+                               valid_types=mcoll.Collection)
+
+    @property
+    def images(self):
+        return self.ArtistList(self, 'images', 'add_image',
+                               valid_types=mimage.AxesImage)
+
+    @property
+    def lines(self):
+        return self.ArtistList(self, 'lines', 'add_line',
+                               valid_types=mlines.Line2D)
+
+    @property
+    def patches(self):
+        return self.ArtistList(self, 'patches', 'add_patch',
+                               valid_types=mpatches.Patch)
+
+    @property
+    def tables(self):
+        return self.ArtistList(self, 'tables', 'add_table',
+                               valid_types=mtable.Table)
+
+    @property
+    def texts(self):
+        return self.ArtistList(self, 'texts', 'add_artist',
+                               valid_types=mtext.Text)
 
     def get_facecolor(self):
         """Get the facecolor of the Axes."""
@@ -1357,13 +1565,13 @@ def set_prop_cycle(self, *args, **kwargs):
 
         Form 2 creates a `~cycler.Cycler` which cycles over one or more
         properties simultaneously and set it as the property cycle of the
-        axes. If multiple properties are given, their value lists must have
+        Axes. If multiple properties are given, their value lists must have
         the same length. This is just a shortcut for explicitly creating a
         cycler and passing it to the function, i.e. it's short for
         ``set_prop_cycle(cycler(label=values label2=values2, ...))``.
 
         Form 3 creates a `~cycler.Cycler` for a single property and set it
-        as the property cycle of the axes. This form exists for compatibility
+        as the property cycle of the Axes. This form exists for compatibility
         with the original `cycler.cycler` interface. Its use is discouraged
         in favor of the kwarg form, i.e. ``set_prop_cycle(label=values)``.
 
@@ -1414,32 +1622,35 @@ def set_prop_cycle(self, *args, **kwargs):
         self._get_patches_for_fill.set_prop_cycle(prop_cycle)
 
     def get_aspect(self):
+        """
+        Return the aspect ratio of the axes scaling.
+
+        This is either "auto" or a float giving the ratio of y/x-scale.
+        """
         return self._aspect
 
     def set_aspect(self, aspect, adjustable=None, anchor=None, share=False):
         """
-        Set the aspect of the axis scaling, i.e. the ratio of y-unit to x-unit.
+        Set the aspect ratio of the axes scaling, i.e. y/x-scale.
 
         Parameters
         ----------
-        aspect : {'auto'} or num
+        aspect : {'auto', 'equal'} or float
             Possible values:
 
-            ========   =================================================
-            value      description
-            ========   =================================================
-            'auto'     automatic; fill the position rectangle with data.
-            num        a circle will be stretched such that the height
-                       is *num* times the width.  'equal' is a synonym
-                       for ``aspect=1``, i.e. same scaling for x and y.
-            ========   =================================================
+            - 'auto': fill the position rectangle with data.
+            - 'equal': same as ``aspect=1``, i.e. same scaling for x and y.
+            - *float*: The displayed size of 1 unit in y-data coordinates will
+              be *aspect* times the displayed size of 1 unit in x-data
+              coordinates; e.g. for ``aspect=2`` a square in data coordinates
+              will be rendered with a height of twice its width.
 
         adjustable : None or {'box', 'datalim'}, optional
             If not ``None``, this defines which parameter will be adjusted to
             meet the required aspect. See `.set_adjustable` for further
             details.
 
-        anchor : None or str or 2-tuple of float, optional
+        anchor : None or str or (float, float), optional
             If not ``None``, this defines where the Axes will be drawn if there
             is extra space due to aspect constraints. The most common way to
             to specify the anchor are abbreviations of cardinal directions:
@@ -1472,8 +1683,8 @@ def set_aspect(self, aspect, adjustable=None, anchor=None, share=False):
             aspect = float(aspect)  # raise ValueError if necessary
 
         if share:
-            axes = {*self._shared_x_axes.get_siblings(self),
-                    *self._shared_y_axes.get_siblings(self)}
+            axes = {sibling for name in self._axis_names
+                    for sibling in self._shared_axes[name].get_siblings(self)}
         else:
             axes = [self]
 
@@ -1534,8 +1745,8 @@ def set_adjustable(self, adjustable, share=False):
         """
         _api.check_in_list(["box", "datalim"], adjustable=adjustable)
         if share:
-            axs = {*self._shared_x_axes.get_siblings(self),
-                   *self._shared_y_axes.get_siblings(self)}
+            axs = {sibling for name in self._axis_names
+                   for sibling in self._shared_axes[name].get_siblings(self)}
         else:
             axs = [self]
         if (adjustable == "datalim"
@@ -1544,7 +1755,7 @@ def set_adjustable(self, adjustable, share=False):
                         for ax in axs)):
             # Limits adjustment by apply_aspect assumes that the axes' aspect
             # ratio can be computed from the data limits and scales.
-            raise ValueError("Cannot set axes adjustable to 'datalim' for "
+            raise ValueError("Cannot set Axes adjustable to 'datalim' for "
                              "Axes which override 'get_data_ratio'")
         for ax in axs:
             ax._adjustable = adjustable
@@ -1552,7 +1763,7 @@ def set_adjustable(self, adjustable, share=False):
 
     def get_box_aspect(self):
         """
-        Return the axes box aspect, i.e. the ratio of height to width.
+        Return the Axes box aspect, i.e. the ratio of height to width.
 
         The box aspect is ``None`` (i.e. chosen depending on the available
         figure space) unless explicitly specified.
@@ -1568,21 +1779,21 @@ def get_box_aspect(self):
 
     def set_box_aspect(self, aspect=None):
         """
-        Set the axes box aspect, i.e. the ratio of height to width.
+        Set the Axes box aspect, i.e. the ratio of height to width.
 
-        This defines the aspect of the axes in figure space and is not to be
+        This defines the aspect of the Axes in figure space and is not to be
         confused with the data aspect (see `~.Axes.set_aspect`).
 
         Parameters
         ----------
         aspect : float or None
             Changes the physical dimensions of the Axes, such that the ratio
-            of the axes height to the axes width in physical units is equal to
+            of the Axes height to the Axes width in physical units is equal to
             *aspect*. Defining a box aspect will change the *adjustable*
             property to 'datalim' (see `~.Axes.set_adjustable`).
 
             *None* will disable a fixed box aspect so that height and width
-            of the axes are chosen independently.
+            of the Axes are chosen independently.
 
         See Also
         --------
@@ -1627,28 +1838,21 @@ def set_anchor(self, anchor, share=False):
 
         Parameters
         ----------
-        anchor : 2-tuple of floats or {'C', 'SW', 'S', 'SE', ...}
-            The anchor position may be either:
-
-            - a sequence (*cx*, *cy*). *cx* and *cy* may range from 0
-              to 1, where 0 is left or bottom and 1 is right or top.
-
-            - a string using cardinal directions as abbreviation:
-
-              - 'C' for centered
-              - 'S' (south) for bottom-center
-              - 'SW' (south west) for bottom-left
-              - etc.
-
-              Here is an overview of the possible positions:
-
-              +------+------+------+
-              | 'NW' | 'N'  | 'NE' |
-              +------+------+------+
-              | 'W'  | 'C'  | 'E'  |
-              +------+------+------+
-              | 'SW' | 'S'  | 'SE' |
-              +------+------+------+
+        anchor : (float, float) or {'C', 'SW', 'S', 'SE', 'E', 'NE', ...}
+            Either an (*x*, *y*) pair of relative coordinates (0 is left or
+            bottom, 1 is right or top), 'C' (center), or a cardinal direction
+            ('SW', southwest, is bottom left, etc.).  str inputs are shorthands
+            for (*x*, *y*) coordinates, as shown in the following table::
+
+            .. code-block:: none
+
+               +-----------------+-----------------+-----------------+
+               | 'NW' (0.0, 1.0) | 'N' (0.5, 1.0)  | 'NE' (1.0, 1.0) |
+               +-----------------+-----------------+-----------------+
+               | 'W'  (0.0, 0.5) | 'C' (0.5, 0.5)  | 'E'  (1.0, 0.5) |
+               +-----------------+-----------------+-----------------+
+               | 'SW' (0.0, 0.0) | 'S' (0.5, 0.0)  | 'SE' (1.0, 0.0) |
+               +-----------------+-----------------+-----------------+
 
         share : bool, default: False
             If ``True``, apply the settings to all shared Axes.
@@ -1662,8 +1866,8 @@ def set_anchor(self, anchor, share=False):
             raise ValueError('argument must be among %s' %
                              ', '.join(mtransforms.Bbox.coefs))
         if share:
-            axes = {*self._shared_x_axes.get_siblings(self),
-                    *self._shared_y_axes.get_siblings(self)}
+            axes = {sibling for name in self._axis_names
+                    for sibling in self._shared_axes[name].get_siblings(self)}
         else:
             axes = [self]
         for ax in axes:
@@ -1693,6 +1897,13 @@ def apply_aspect(self, position=None):
         Axes box (position) or the view limits. In the former case,
         `~matplotlib.axes.Axes.get_anchor` will affect the position.
 
+        Parameters
+        ----------
+        position : None or .Bbox
+            If not ``None``, this defines the position of the
+            Axes within the figure as a Bbox. See `~.Axes.get_position`
+            for further details.
+
         Notes
         -----
         This is called automatically when each Axes is drawn.  You may need
@@ -1718,7 +1929,7 @@ def apply_aspect(self, position=None):
             return
 
         trans = self.get_figure().transSubfigure
-        bb = mtransforms.Bbox.from_bounds(0, 0, 1, 1).transformed(trans)
+        bb = mtransforms.Bbox.unit().transformed(trans)
         # this is the physical aspect of the panel (or figure):
         fig_aspect = bb.height / bb.width
 
@@ -1778,12 +1989,14 @@ def apply_aspect(self, position=None):
         xm = 0
         ym = 0
 
-        shared_x = self in self._shared_x_axes
-        shared_y = self in self._shared_y_axes
-        # Not sure whether we need this check:
+        shared_x = self in self._shared_axes["x"]
+        shared_y = self in self._shared_axes["y"]
+
         if shared_x and shared_y:
-            raise RuntimeError("adjustable='datalim' is not allowed when both "
-                               "axes are shared")
+            raise RuntimeError("set_aspect(..., adjustable='datalim') or "
+                               "axis('equal') are not allowed when both axes "
+                               "are shared.  Try set_aspect(..., "
+                               "adjustable='box').")
 
         # If y is shared, then we are only allowed to change x, etc.
         if shared_y:
@@ -1883,7 +2096,6 @@ def axis(self, *args, emit=True, **kwargs):
                 self.set_autoscale_on(True)
                 self.set_aspect('auto')
                 self.autoscale_view(tight=False)
-                # self.apply_aspect()
                 if s == 'equal':
                     self.set_aspect('equal', adjustable='datalim')
                 elif s == 'scaled':
@@ -1907,8 +2119,8 @@ def axis(self, *args, emit=True, **kwargs):
                     self.set_ylim([ylim[0], ylim[0] + edge_size],
                                   emit=emit, auto=False)
             else:
-                raise ValueError('Unrecognized string %s to axis; '
-                                 'try on or off' % s)
+                raise ValueError(f"Unrecognized string {s!r} to axis; "
+                                 "try 'on' or 'off'")
         else:
             if len(args) == 1:
                 limits = args[0]
@@ -1950,19 +2162,23 @@ def get_lines(self):
 
     def get_xaxis(self):
         """
-        Return the XAxis instance.
+        [*Discouraged*] Return the XAxis instance.
 
-        The use of this function is discouraged. You should instead directly
-        access the attribute ``ax.xaxis``.
+        .. admonition:: Discouraged
+
+            The use of this function is discouraged. You should instead
+            directly access the attribute ``ax.xaxis``.
         """
         return self.xaxis
 
     def get_yaxis(self):
         """
-        Return the YAxis instance.
+        [*Discouraged*] Return the YAxis instance.
+
+        .. admonition:: Discouraged
 
-        The use of this function is discouraged. You should instead directly
-        access the attribute ``ax.yaxis``.
+            The use of this function is discouraged. You should instead
+            directly access the attribute ``ax.yaxis``.
         """
         return self.yaxis
 
@@ -1978,13 +2194,16 @@ def _sci(self, im):
         Set the current image.
 
         This image will be the target of colormap functions like
-        `~.pyplot.viridis`, and other functions such as `~.pyplot.clim`.  The
-        current image is an attribute of the current axes.
+        ``pyplot.viridis``, and other functions such as `~.pyplot.clim`.  The
+        current image is an attribute of the current Axes.
         """
+        _api.check_isinstance(
+            (mpl.contour.ContourSet, mcoll.Collection, mimage.AxesImage),
+            im=im)
         if isinstance(im, mpl.contour.ContourSet):
-            if im.collections[0] not in self.collections:
+            if im.collections[0] not in self._children:
                 raise ValueError("ContourSet must be in current Axes")
-        elif im not in self.images and im not in self.collections:
+        elif im not in self._children:
             raise ValueError("Argument must be an image, collection, or "
                              "ContourSet in this Axes")
         self._current_image = im
@@ -1995,21 +2214,33 @@ def _gci(self):
 
     def has_data(self):
         """
-        Return whether any artists have been added to the axes.
+        Return whether any artists have been added to the Axes.
 
         This should not be used to determine whether the *dataLim*
         need to be updated, and may not actually be useful for
         anything.
         """
-        return (
-            len(self.collections) +
-            len(self.images) +
-            len(self.lines) +
-            len(self.patches)) > 0
+        return any(isinstance(a, (mcoll.Collection, mimage.AxesImage,
+                                  mlines.Line2D, mpatches.Patch))
+                   for a in self._children)
+
+    def _deprecate_noninstance(self, _name, _types, **kwargs):
+        """
+        For each *key, value* pair in *kwargs*, check that *value* is an
+        instance of one of *_types*; if not, raise an appropriate deprecation.
+        """
+        for key, value in kwargs.items():
+            if not isinstance(value, _types):
+                _api.warn_deprecated(
+                    '3.5', name=_name,
+                    message=f'Passing argument *{key}* of unexpected type '
+                    f'{type(value).__qualname__} to %(name)s which only '
+                    f'accepts {_types} is deprecated since %(since)s and will '
+                    'become an error %(removal)s.')
 
     def add_artist(self, a):
         """
-        Add an `~.Artist` to the axes, and return the artist.
+        Add an `.Artist` to the Axes; return the artist.
 
         Use `add_artist` only for artists for which there is no dedicated
         "add" method; and if necessary, use a method such as `update_datalim`
@@ -2021,8 +2252,8 @@ def add_artist(self, a):
         ``ax.transData``.
         """
         a.axes = self
-        self.artists.append(a)
-        a._remove_method = self.artists.remove
+        self._children.append(a)
+        a._remove_method = self._children.remove
         self._set_artist_props(a)
         a.set_clip_path(self.patch)
         self.stale = True
@@ -2030,12 +2261,12 @@ def add_artist(self, a):
 
     def add_child_axes(self, ax):
         """
-        Add an `~.AxesBase` to the axes' children; return the child axes.
+        Add an `.AxesBase` to the Axes' children; return the child Axes.
 
         This is the lowlevel version.  See `.axes.Axes.inset_axes`.
         """
 
-        # normally axes have themselves as the axes, but these need to have
+        # normally Axes have themselves as the Axes, but these need to have
         # their parent...
         # Need to bypass the getter...
         ax._axes = self
@@ -2048,13 +2279,15 @@ def add_child_axes(self, ax):
 
     def add_collection(self, collection, autolim=True):
         """
-        Add a `~.Collection` to the axes' collections; return the collection.
+        Add a `.Collection` to the Axes; return the collection.
         """
+        self._deprecate_noninstance('add_collection', mcoll.Collection,
+                                    collection=collection)
         label = collection.get_label()
         if not label:
-            collection.set_label('_collection%d' % len(self.collections))
-        self.collections.append(collection)
-        collection._remove_method = self.collections.remove
+            collection.set_label(f'_child{len(self._children)}')
+        self._children.append(collection)
+        collection._remove_method = self._children.remove
         self._set_artist_props(collection)
 
         if collection.get_clip_path() is None:
@@ -2080,13 +2313,14 @@ def add_collection(self, collection, autolim=True):
 
     def add_image(self, image):
         """
-        Add an `~.AxesImage` to the axes' images; return the image.
+        Add an `.AxesImage` to the Axes; return the image.
         """
+        self._deprecate_noninstance('add_image', mimage.AxesImage, image=image)
         self._set_artist_props(image)
         if not image.get_label():
-            image.set_label('_image%d' % len(self.images))
-        self.images.append(image)
-        image._remove_method = self.images.remove
+            image.set_label(f'_child{len(self._children)}')
+        self._children.append(image)
+        image._remove_method = self._children.remove
         self.stale = True
         return image
 
@@ -2096,27 +2330,29 @@ def _update_image_limits(self, image):
 
     def add_line(self, line):
         """
-        Add a `.Line2D` to the axes' lines; return the line.
+        Add a `.Line2D` to the Axes; return the line.
         """
+        self._deprecate_noninstance('add_line', mlines.Line2D, line=line)
         self._set_artist_props(line)
         if line.get_clip_path() is None:
             line.set_clip_path(self.patch)
 
         self._update_line_limits(line)
         if not line.get_label():
-            line.set_label('_line%d' % len(self.lines))
-        self.lines.append(line)
-        line._remove_method = self.lines.remove
+            line.set_label(f'_child{len(self._children)}')
+        self._children.append(line)
+        line._remove_method = self._children.remove
         self.stale = True
         return line
 
     def _add_text(self, txt):
         """
-        Add a `~.Text` to the axes' texts; return the text.
+        Add a `.Text` to the Axes; return the text.
         """
+        self._deprecate_noninstance('_add_text', mtext.Text, txt=txt)
         self._set_artist_props(txt)
-        self.texts.append(txt)
-        txt._remove_method = self.texts.remove
+        self._children.append(txt)
+        txt._remove_method = self._children.remove
         self.stale = True
         return txt
 
@@ -2128,52 +2364,57 @@ def _update_line_limits(self, line):
         if path.vertices.size == 0:
             return
 
-        line_trans = line.get_transform()
+        line_trf = line.get_transform()
 
-        if line_trans == self.transData:
+        if line_trf == self.transData:
             data_path = path
-
-        elif any(line_trans.contains_branch_seperately(self.transData)):
-            # identify the transform to go from line's coordinates
-            # to data coordinates
-            trans_to_data = line_trans - self.transData
-
-            # if transData is affine we can use the cached non-affine component
-            # of line's path. (since the non-affine part of line_trans is
-            # entirely encapsulated in trans_to_data).
+        elif any(line_trf.contains_branch_seperately(self.transData)):
+            # Compute the transform from line coordinates to data coordinates.
+            trf_to_data = line_trf - self.transData
+            # If transData is affine we can use the cached non-affine component
+            # of line's path (since the non-affine part of line_trf is
+            # entirely encapsulated in trf_to_data).
             if self.transData.is_affine:
                 line_trans_path = line._get_transformed_path()
                 na_path, _ = line_trans_path.get_transformed_path_and_affine()
-                data_path = trans_to_data.transform_path_affine(na_path)
+                data_path = trf_to_data.transform_path_affine(na_path)
             else:
-                data_path = trans_to_data.transform_path(path)
+                data_path = trf_to_data.transform_path(path)
         else:
-            # for backwards compatibility we update the dataLim with the
+            # For backwards compatibility we update the dataLim with the
             # coordinate range of the given path, even though the coordinate
             # systems are completely different. This may occur in situations
             # such as when ax.transAxes is passed through for absolute
             # positioning.
             data_path = path
 
-        if data_path.vertices.size > 0:
-            updatex, updatey = line_trans.contains_branch_seperately(
-                self.transData)
-            self.dataLim.update_from_path(data_path,
-                                          self.ignore_existing_data_limits,
-                                          updatex=updatex,
-                                          updatey=updatey)
-            self.ignore_existing_data_limits = False
+        if not data_path.vertices.size:
+            return
+
+        updatex, updatey = line_trf.contains_branch_seperately(self.transData)
+        if self.name != "rectilinear":
+            # This block is mostly intended to handle axvline in polar plots,
+            # for which updatey would otherwise be True.
+            if updatex and line_trf == self.get_yaxis_transform():
+                updatex = False
+            if updatey and line_trf == self.get_xaxis_transform():
+                updatey = False
+        self.dataLim.update_from_path(data_path,
+                                      self.ignore_existing_data_limits,
+                                      updatex=updatex, updatey=updatey)
+        self.ignore_existing_data_limits = False
 
     def add_patch(self, p):
         """
-        Add a `~.Patch` to the axes' patches; return the patch.
+        Add a `.Patch` to the Axes; return the patch.
         """
+        self._deprecate_noninstance('add_patch', mpatches.Patch, p=p)
         self._set_artist_props(p)
         if p.get_clip_path() is None:
             p.set_clip_path(self.patch)
         self._update_patch_limits(p)
-        self.patches.append(p)
-        p._remove_method = self.patches.remove
+        self._children.append(p)
+        p._remove_method = self._children.remove
         return p
 
     def _update_patch_limits(self, patch):
@@ -2190,33 +2431,46 @@ def _update_patch_limits(self, patch):
                 ((not patch.get_width()) and (not patch.get_height()))):
             return
         p = patch.get_path()
-        vertices = p.vertices if p.codes is None else p.vertices[np.isin(
-            p.codes, (mpath.Path.CLOSEPOLY, mpath.Path.STOP), invert=True)]
-        if vertices.size > 0:
-            xys = patch.get_patch_transform().transform(vertices)
-            if patch.get_data_transform() != self.transData:
-                patch_to_data = (patch.get_data_transform() -
-                                 self.transData)
-                xys = patch_to_data.transform(xys)
-
-            updatex, updatey = patch.get_transform().\
-                contains_branch_seperately(self.transData)
-            self.update_datalim(xys, updatex=updatex,
-                                updatey=updatey)
+        # Get all vertices on the path
+        # Loop through each segment to get extrema for Bezier curve sections
+        vertices = []
+        for curve, code in p.iter_bezier(simplify=False):
+            # Get distance along the curve of any extrema
+            _, dzeros = curve.axis_aligned_extrema()
+            # Calculate vertices of start, end and any extrema in between
+            vertices.append(curve([0, *dzeros, 1]))
+
+        if len(vertices):
+            vertices = np.row_stack(vertices)
+
+        patch_trf = patch.get_transform()
+        updatex, updatey = patch_trf.contains_branch_seperately(self.transData)
+        if not (updatex or updatey):
+            return
+        if self.name != "rectilinear":
+            # As in _update_line_limits, but for axvspan.
+            if updatex and patch_trf == self.get_yaxis_transform():
+                updatex = False
+            if updatey and patch_trf == self.get_xaxis_transform():
+                updatey = False
+        trf_to_data = patch_trf - self.transData
+        xys = trf_to_data.transform(vertices)
+        self.update_datalim(xys, updatex=updatex, updatey=updatey)
 
     def add_table(self, tab):
         """
-        Add a `~.Table` to the axes' tables; return the table.
+        Add a `.Table` to the Axes; return the table.
         """
+        self._deprecate_noninstance('add_table', mtable.Table, tab=tab)
         self._set_artist_props(tab)
-        self.tables.append(tab)
+        self._children.append(tab)
         tab.set_clip_path(self.patch)
-        tab._remove_method = self.tables.remove
+        tab._remove_method = self._children.remove
         return tab
 
     def add_container(self, container):
         """
-        Add a `~.Container` to the axes' containers; return the container.
+        Add a `.Container` to the Axes' containers; return the container.
         """
         label = container.get_label()
         if not label:
@@ -2232,16 +2486,17 @@ def _unit_change_handler(self, axis_name, event=None):
         if event is None:  # Allow connecting `self._unit_change_handler(name)`
             return functools.partial(
                 self._unit_change_handler, axis_name, event=object())
-        _api.check_in_list(self._get_axis_map(), axis_name=axis_name)
+        _api.check_in_list(self._axis_map, axis_name=axis_name)
+        for line in self.lines:
+            line.recache_always()
         self.relim()
-        self._request_autoscale_view(scalex=(axis_name == "x"),
-                                     scaley=(axis_name == "y"))
+        self._request_autoscale_view(axis_name)
 
     def relim(self, visible_only=False):
         """
         Recompute the data limits based on current artists.
 
-        At present, `~.Collection` instances are not supported.
+        At present, `.Collection` instances are not supported.
 
         Parameters
         ----------
@@ -2254,17 +2509,14 @@ def relim(self, visible_only=False):
         self.dataLim.set_points(mtransforms.Bbox.null().get_points())
         self.ignore_existing_data_limits = True
 
-        for line in self.lines:
-            if not visible_only or line.get_visible():
-                self._update_line_limits(line)
-
-        for p in self.patches:
-            if not visible_only or p.get_visible():
-                self._update_patch_limits(p)
-
-        for image in self.images:
-            if not visible_only or image.get_visible():
-                self._update_image_limits(image)
+        for artist in self._children:
+            if not visible_only or artist.get_visible():
+                if isinstance(artist, mlines.Line2D):
+                    self._update_line_limits(artist)
+                elif isinstance(artist, mpatches.Patch):
+                    self._update_patch_limits(artist)
+                elif isinstance(artist, mimage.AxesImage):
+                    self._update_image_limits(artist)
 
     def update_datalim(self, xys, updatex=True, updatey=True):
         """
@@ -2291,19 +2543,6 @@ def update_datalim(self, xys, updatex=True, updatey=True):
                                          updatex=updatex, updatey=updatey)
         self.ignore_existing_data_limits = False
 
-    @_api.deprecated(
-        "3.3", alternative="ax.dataLim.set(Bbox.union([ax.dataLim, bounds]))")
-    def update_datalim_bounds(self, bounds):
-        """
-        Extend the `~.Axes.datalim` Bbox to include the given
-        `~matplotlib.transforms.Bbox`.
-
-        Parameters
-        ----------
-        bounds : `~matplotlib.transforms.Bbox`
-        """
-        self.dataLim.set(mtransforms.Bbox.union([self.dataLim, bounds]))
-
     def _process_unit_info(self, datasets=None, kwargs=None, *, convert=True):
         """
         Set axis units based on *datasets* and *kwargs*, and optionally apply
@@ -2313,11 +2552,12 @@ def _process_unit_info(self, datasets=None, kwargs=None, *, convert=True):
         ----------
         datasets : list
             List of (axis_name, dataset) pairs (where the axis name is defined
-            as in `._get_axis_map`.
+            as in `._axis_map`).  Individual datasets can also be None
+            (which gets passed through).
         kwargs : dict
             Other parameters from which unit info (i.e., the *xunits*,
-            *yunits*, *zunits* (for 3D axes), *runits* and *thetaunits* (for
-            polar axes) entries) is popped, if present.  Note that this dict is
+            *yunits*, *zunits* (for 3D Axes), *runits* and *thetaunits* (for
+            polar) entries) is popped, if present.  Note that this dict is
             mutated in-place!
         convert : bool, default: True
             Whether to return the original datasets or the converted ones.
@@ -2334,7 +2574,7 @@ def _process_unit_info(self, datasets=None, kwargs=None, *, convert=True):
         # (e.g. if some are scalars, etc.).
         datasets = datasets or []
         kwargs = kwargs or {}
-        axis_map = self._get_axis_map()
+        axis_map = self._axis_map
         for axis_name, data in datasets:
             try:
                 axis = axis_map[axis_name]
@@ -2360,7 +2600,8 @@ def _process_unit_info(self, datasets=None, kwargs=None, *, convert=True):
                 for dataset_axis_name, data in datasets:
                     if dataset_axis_name == axis_name and data is not None:
                         axis.update_units(data)
-        return [axis_map[axis_name].convert_units(data) if convert else data
+        return [axis_map[axis_name].convert_units(data)
+                if convert and data is not None else data
                 for axis_name, data in datasets]
 
     def in_axes(self, mouseevent):
@@ -2369,57 +2610,27 @@ def in_axes(self, mouseevent):
         """
         return self.patch.contains(mouseevent)[0]
 
-    def get_autoscale_on(self):
-        """
-        Get whether autoscaling is applied for both axes on plot commands
-        """
-        return self._autoscaleXon and self._autoscaleYon
-
-    def get_autoscalex_on(self):
-        """
-        Get whether autoscaling for the x-axis is applied on plot commands
-        """
-        return self._autoscaleXon
+    get_autoscalex_on = _axis_method_wrapper("xaxis", "_get_autoscale_on")
+    get_autoscaley_on = _axis_method_wrapper("yaxis", "_get_autoscale_on")
+    set_autoscalex_on = _axis_method_wrapper("xaxis", "_set_autoscale_on")
+    set_autoscaley_on = _axis_method_wrapper("yaxis", "_set_autoscale_on")
 
-    def get_autoscaley_on(self):
-        """
-        Get whether autoscaling for the y-axis is applied on plot commands
-        """
-        return self._autoscaleYon
+    def get_autoscale_on(self):
+        """Return True if each axis is autoscaled, False otherwise."""
+        return all(axis._get_autoscale_on()
+                   for axis in self._axis_map.values())
 
     def set_autoscale_on(self, b):
         """
-        Set whether autoscaling is applied to axes on the next draw or call to
-        `.Axes.autoscale_view`.
-
-        Parameters
-        ----------
-        b : bool
-        """
-        self._autoscaleXon = b
-        self._autoscaleYon = b
-
-    def set_autoscalex_on(self, b):
-        """
-        Set whether autoscaling for the x-axis is applied to axes on the next
-        draw or call to `.Axes.autoscale_view`.
+        Set whether autoscaling is applied to each axis on the next draw or
+        call to `.Axes.autoscale_view`.
 
         Parameters
         ----------
         b : bool
         """
-        self._autoscaleXon = b
-
-    def set_autoscaley_on(self, b):
-        """
-        Set whether autoscaling for the y-axis is applied to axes on the next
-        draw or call to `.Axes.autoscale_view`.
-
-        Parameters
-        ----------
-        b : bool
-        """
-        self._autoscaleYon = b
+        for axis in self._axis_map.values():
+            axis._set_autoscale_on(b)
 
     @property
     def use_sticky_edges(self):
@@ -2441,20 +2652,19 @@ def use_sticky_edges(self):
     @use_sticky_edges.setter
     def use_sticky_edges(self, b):
         self._use_sticky_edges = bool(b)
-        # No effect until next autoscaling, which will mark the axes as stale.
+        # No effect until next autoscaling, which will mark the Axes as stale.
 
     def set_xmargin(self, m):
         """
         Set padding of X data limits prior to autoscaling.
 
-        *m* times the data interval will be added to each
-        end of that interval before it is used in autoscaling.
-        For example, if your data is in the range [0, 2], a factor of
-        ``m = 0.1`` will result in a range [-0.2, 2.2].
+        *m* times the data interval will be added to each end of that interval
+        before it is used in autoscaling.  If *m* is negative, this will clip
+        the data range instead of expanding it.
 
-        Negative values -0.5 < m < 0 will result in clipping of the data range.
-        I.e. for a data range [0, 2], a factor of ``m = -0.1`` will result in
-        a range [0.2, 1.8].
+        For example, if your data is in the range [0, 2], a margin of 0.1 will
+        result in a range [-0.2, 2.2]; a margin of -0.1 will result in a range
+        of [0.2, 1.8].
 
         Parameters
         ----------
@@ -2463,21 +2673,20 @@ def set_xmargin(self, m):
         if m <= -0.5:
             raise ValueError("margin must be greater than -0.5")
         self._xmargin = m
-        self._request_autoscale_view(scalex=True, scaley=False)
+        self._request_autoscale_view("x")
         self.stale = True
 
     def set_ymargin(self, m):
         """
         Set padding of Y data limits prior to autoscaling.
 
-        *m* times the data interval will be added to each
-        end of that interval before it is used in autoscaling.
-        For example, if your data is in the range [0, 2], a factor of
-        ``m = 0.1`` will result in a range [-0.2, 2.2].
+        *m* times the data interval will be added to each end of that interval
+        before it is used in autoscaling.  If *m* is negative, this will clip
+        the data range instead of expanding it.
 
-        Negative values -0.5 < m < 0 will result in clipping of the data range.
-        I.e. for a data range [0, 2], a factor of ``m = -0.1`` will result in
-        a range [0.2, 1.8].
+        For example, if your data is in the range [0, 2], a margin of 0.1 will
+        result in a range [-0.2, 2.2]; a margin of -0.1 will result in a range
+        of [0.2, 1.8].
 
         Parameters
         ----------
@@ -2486,14 +2695,14 @@ def set_ymargin(self, m):
         if m <= -0.5:
             raise ValueError("margin must be greater than -0.5")
         self._ymargin = m
-        self._request_autoscale_view(scalex=False, scaley=True)
+        self._request_autoscale_view("y")
         self.stale = True
 
     def margins(self, *margins, x=None, y=None, tight=True):
         """
         Set or retrieve autoscaling margins.
 
-        The padding added to each limit of the axes is the *margin*
+        The padding added to each limit of the Axes is the *margin*
         times the data interval. All input parameters must be floats
         within the range [0, 1]. Passing both positional and keyword
         arguments is invalid and will raise a TypeError. If no
@@ -2521,11 +2730,11 @@ def margins(self, *margins, x=None, y=None, tight=True):
             only the y-axis.
 
         tight : bool or None, default: True
-            The *tight* parameter is passed to :meth:`autoscale_view`,
+            The *tight* parameter is passed to `~.axes.Axes.autoscale_view`,
             which is executed after a margin is changed; the default
             here is *True*, on the assumption that when margins are
             specified, no additional padding to match tick marks is
-            usually desired.  Set *tight* to *None* will preserve
+            usually desired.  Setting *tight* to *None* preserves
             the previous setting.
 
         Returns
@@ -2541,7 +2750,7 @@ def margins(self, *margins, x=None, y=None, tight=True):
         before calling :meth:`margins`.
         """
 
-        if margins and x is not None and y is not None:
+        if margins and (x is not None or y is not None):
             raise TypeError('Cannot pass both positional and keyword '
                             'arguments for x and/or y.')
         elif len(margins) == 1:
@@ -2595,7 +2804,7 @@ def autoscale(self, enable=True, axis='both', tight=None):
         Convenience method for simple axis view autoscaling.
         It turns autoscaling on or off, and then,
         if autoscaling for either axis is on, it performs
-        the autoscaling on the specified axis or axes.
+        the autoscaling on the specified axis or Axes.
 
         Parameters
         ----------
@@ -2603,29 +2812,35 @@ def autoscale(self, enable=True, axis='both', tight=None):
             True turns autoscaling on, False turns it off.
             None leaves the autoscaling state unchanged.
         axis : {'both', 'x', 'y'}, default: 'both'
-            Which axis to operate on.
+            The axis on which to operate.  (For 3D Axes, *axis* can also be set
+            to 'z', and 'both' refers to all three axes.)
         tight : bool or None, default: None
             If True, first set the margins to zero.  Then, this argument is
-            forwarded to `autoscale_view` (regardless of its value); see the
-            description of its behavior there.
+            forwarded to `~.axes.Axes.autoscale_view` (regardless of
+            its value); see the description of its behavior there.
         """
         if enable is None:
             scalex = True
             scaley = True
         else:
-            scalex = False
-            scaley = False
             if axis in ['x', 'both']:
-                self._autoscaleXon = bool(enable)
-                scalex = self._autoscaleXon
+                self.set_autoscalex_on(bool(enable))
+                scalex = self.get_autoscalex_on()
+            else:
+                scalex = False
             if axis in ['y', 'both']:
-                self._autoscaleYon = bool(enable)
-                scaley = self._autoscaleYon
+                self.set_autoscaley_on(bool(enable))
+                scaley = self.get_autoscaley_on()
+            else:
+                scaley = False
         if tight and scalex:
             self._xmargin = 0
         if tight and scaley:
             self._ymargin = 0
-        self._request_autoscale_view(tight=tight, scalex=scalex, scaley=scaley)
+        if scalex:
+            self._request_autoscale_view("x", tight=tight)
+        if scaley:
+            self._request_autoscale_view("y", tight=tight)
 
     def autoscale_view(self, tight=None, scalex=True, scaley=True):
         """
@@ -2662,7 +2877,7 @@ def autoscale_view(self, tight=None, scalex=True, scaley=True):
         case, use :meth:`matplotlib.axes.Axes.relim` prior to calling
         autoscale_view.
 
-        If the views of the axes are fixed, e.g. via `set_xlim`, they will
+        If the views of the Axes are fixed, e.g. via `set_xlim`, they will
         not be changed by autoscale_view().
         See :meth:`matplotlib.axes.Axes.autoscale` for an alternative.
         """
@@ -2671,53 +2886,54 @@ def autoscale_view(self, tight=None, scalex=True, scaley=True):
 
         x_stickies = y_stickies = np.array([])
         if self.use_sticky_edges:
-            # Only iterate over axes and artists if needed.  The check for
-            # ``hasattr(ax, "lines")`` is necessary because this can be called
-            # very early in the axes init process (e.g., for twin axes) when
-            # these attributes don't even exist yet, in which case
+            # Only iterate over Axes and artists if needed.  The check for
+            # ``hasattr(ax, "_children")`` is necessary because this can be
+            # called very early in the Axes init process (e.g., for twin Axes)
+            # when these attributes don't even exist yet, in which case
             # `get_children` would raise an AttributeError.
-            if self._xmargin and scalex and self._autoscaleXon:
+            if self._xmargin and scalex and self.get_autoscalex_on():
                 x_stickies = np.sort(np.concatenate([
                     artist.sticky_edges.x
-                    for ax in self._shared_x_axes.get_siblings(self)
-                    if hasattr(ax, "lines")
+                    for ax in self._shared_axes["x"].get_siblings(self)
+                    if hasattr(ax, "_children")
                     for artist in ax.get_children()]))
-            if self._ymargin and scaley and self._autoscaleYon:
+            if self._ymargin and scaley and self.get_autoscaley_on():
                 y_stickies = np.sort(np.concatenate([
                     artist.sticky_edges.y
-                    for ax in self._shared_y_axes.get_siblings(self)
-                    if hasattr(ax, "lines")
+                    for ax in self._shared_axes["y"].get_siblings(self)
+                    if hasattr(ax, "_children")
                     for artist in ax.get_children()]))
         if self.get_xscale() == 'log':
             x_stickies = x_stickies[x_stickies > 0]
         if self.get_yscale() == 'log':
             y_stickies = y_stickies[y_stickies > 0]
 
-        def handle_single_axis(scale, autoscaleon, shared_axes, interval,
-                               minpos, axis, margin, stickies, set_bound):
+        def handle_single_axis(
+                scale, shared_axes, name, axis, margin, stickies, set_bound):
 
-            if not (scale and autoscaleon):
+            if not (scale and axis._get_autoscale_on()):
                 return  # nothing to do...
 
             shared = shared_axes.get_siblings(self)
             # Base autoscaling on finite data limits when there is at least one
             # finite data limit among all the shared_axes and intervals.
-            # Also, find the minimum minpos for use in the margin calculation.
-            x_values = []
-            minimum_minpos = np.inf
-            for ax in shared:
-                x_values.extend(getattr(ax.dataLim, interval))
-                minimum_minpos = min(minimum_minpos,
-                                     getattr(ax.dataLim, minpos))
-            x_values = np.extract(np.isfinite(x_values), x_values)
-            if x_values.size >= 1:
-                x0, x1 = (x_values.min(), x_values.max())
+            values = [val for ax in shared
+                      for val in getattr(ax.dataLim, f"interval{name}")
+                      if np.isfinite(val)]
+            if values:
+                x0, x1 = (min(values), max(values))
+            elif getattr(self._viewLim, f"mutated{name}")():
+                # No data, but explicit viewLims already set:
+                # in mutatedx or mutatedy.
+                return
             else:
                 x0, x1 = (-np.inf, np.inf)
-            # If x0 and x1 are non finite, use the locator to figure out
-            # default limits.
+            # If x0 and x1 are nonfinite, get default limits from the locator.
             locator = axis.get_major_locator()
             x0, x1 = locator.nonsingular(x0, x1)
+            # Find the minimum minpos for use in the margin calculation.
+            minimum_minpos = min(
+                getattr(ax.dataLim, f"minpos{name}") for ax in shared)
 
             # Prevent margin addition from crossing a sticky value.  A small
             # tolerance must be added due to floating point issues with
@@ -2755,32 +2971,11 @@ def handle_single_axis(scale, autoscaleon, shared_axes, interval,
             # End of definition of internal function 'handle_single_axis'.
 
         handle_single_axis(
-            scalex, self._autoscaleXon, self._shared_x_axes, 'intervalx',
-            'minposx', self.xaxis, self._xmargin, x_stickies, self.set_xbound)
+            scalex, self._shared_axes["x"], 'x', self.xaxis, self._xmargin,
+            x_stickies, self.set_xbound)
         handle_single_axis(
-            scaley, self._autoscaleYon, self._shared_y_axes, 'intervaly',
-            'minposy', self.yaxis, self._ymargin, y_stickies, self.set_ybound)
-
-    def _get_axis_list(self):
-        return self.xaxis, self.yaxis
-
-    def _get_axis_map(self):
-        """
-        Return a mapping of `Axis` "names" to `Axis` instances.
-
-        The `Axis` name is derived from the attribute under which the instance
-        is stored, so e.g. for polar axes, the theta-axis is still named "x"
-        and the r-axis is still named "y" (for back-compatibility).
-
-        In practice, this means that the entries are typically "x" and "y", and
-        additionally "z" for 3D axes.
-        """
-        d = {}
-        axis_list = self._get_axis_list()
-        for k, v in vars(self).items():
-            if k.endswith("axis") and v in axis_list:
-                d[k[:-len("axis")]] = v
-        return d
+            scaley, self._shared_axes["y"], 'y', self.yaxis, self._ymargin,
+            y_stickies, self.set_ybound)
 
     def _update_title_position(self, renderer):
         """
@@ -2793,35 +2988,39 @@ def _update_title_position(self, renderer):
 
         titles = (self.title, self._left_title, self._right_title)
 
+        # Need to check all our twins too, and all the children as well.
+        axs = self._twinned_axes.get_siblings(self) + self.child_axes
+        for ax in self.child_axes:  # Child positions must be updated first.
+            locator = ax.get_axes_locator()
+            ax.apply_aspect(locator(self, renderer) if locator else None)
+
         for title in titles:
             x, _ = title.get_position()
             # need to start again in case of window resizing
             title.set_position((x, 1.0))
-            # need to check all our twins too...
-            axs = self._twinned_axes.get_siblings(self)
-            # and all the children
-            for ax in self.child_axes:
-                if ax is not None:
-                    locator = ax.get_axes_locator()
-                    if locator:
-                        pos = locator(self, renderer)
-                        ax.apply_aspect(pos)
-                    else:
-                        ax.apply_aspect()
-                    axs = axs + [ax]
-            top = -np.Inf
+            top = -np.inf
             for ax in axs:
+                bb = None
                 if (ax.xaxis.get_ticks_position() in ['top', 'unknown']
                         or ax.xaxis.get_label_position() == 'top'):
                     bb = ax.xaxis.get_tightbbox(renderer)
-                else:
-                    bb = ax.get_window_extent(renderer)
-                if bb is not None:
-                    top = max(top, bb.ymax)
+                if bb is None:
+                    if 'outline' in ax.spines:
+                        # Special case for colorbars:
+                        bb = ax.spines['outline'].get_window_extent()
+                    else:
+                        bb = ax.get_window_extent(renderer)
+                top = max(top, bb.ymax)
+                if title.get_text():
+                    ax.yaxis.get_tightbbox(renderer)  # update offsetText
+                    if ax.yaxis.offsetText.get_text():
+                        bb = ax.yaxis.offsetText.get_tightbbox(renderer)
+                        if bb.intersection(title.get_tightbbox(renderer), bb):
+                            top = bb.ymax
             if top < 0:
-                # the top of axes is not even on the figure, so don't try and
+                # the top of Axes is not even on the figure, so don't try and
                 # automatically place it.
-                _log.debug('top of axes not in the figure, so title not moved')
+                _log.debug('top of Axes not in the figure, so title not moved')
                 return
             if title.get_window_extent(renderer).ymin < top:
                 _, y = self.transAxes.inverted().transform((0, top))
@@ -2841,17 +3040,8 @@ def _update_title_position(self, renderer):
 
     # Drawing
     @martist.allow_rasterization
-    @_api.delete_parameter(
-        "3.3", "inframe", alternative="Axes.redraw_in_frame()")
-    def draw(self, renderer=None, inframe=False):
+    def draw(self, renderer):
         # docstring inherited
-        if renderer is None:
-            _api.warn_deprecated(
-                "3.3", message="Support for not passing the 'renderer' "
-                "parameter to Axes.draw() is deprecated since %(since)s and "
-                "will be removed %(removal)s.  Use axes.draw_artist(axes) "
-                "instead.")
-            renderer = self.figure._cachedRenderer
         if renderer is None:
             raise RuntimeError('No renderer defined')
         if not self.get_visible():
@@ -2863,18 +3053,14 @@ def draw(self, renderer=None, inframe=False):
         # prevent triggering call backs during the draw process
         self._stale = True
 
-        # loop over self and child axes...
+        # loop over self and child Axes...
         locator = self.get_axes_locator()
-        if locator:
-            pos = locator(self, renderer)
-            self.apply_aspect(pos)
-        else:
-            self.apply_aspect()
+        self.apply_aspect(locator(self, renderer) if locator else None)
 
         artists = self.get_children()
         artists.remove(self.patch)
 
-        # the frame draws the edges around the axes patch -- we
+        # the frame draws the edges around the Axes patch -- we
         # decouple these so the patch can be in the background and the
         # frame in the foreground. Do this before drawing the axis
         # objects so that the spine has the opportunity to update them.
@@ -2884,18 +3070,14 @@ def draw(self, renderer=None, inframe=False):
 
         self._update_title_position(renderer)
 
-        if not self.axison or inframe:
-            for _axis in self._get_axis_list():
+        if not self.axison:
+            for _axis in self._axis_map.values():
                 artists.remove(_axis)
 
-        if inframe:
-            artists.remove(self.title)
-            artists.remove(self._left_title)
-            artists.remove(self._right_title)
-
         if not self.figure.canvas.is_saving():
-            artists = [a for a in artists
-                       if not a.get_animated() or a in self.images]
+            artists = [
+                a for a in artists
+                if not a.get_animated() or isinstance(a, mimage.AxesImage)]
         artists = sorted(artists, key=attrgetter('zorder'))
 
         # rasterize artists with negative zorder
@@ -2922,7 +3104,8 @@ def draw(self, renderer=None, inframe=False):
                 a.draw(renderer)
             renderer.stop_rasterizing()
 
-        mimage._draw_list_compositing_images(renderer, self, artists)
+        mimage._draw_list_compositing_images(
+            renderer, self, artists, self.figure.suppressComposite)
 
         renderer.close_group('axes')
         self.stale = False
@@ -2930,44 +3113,32 @@ def draw(self, renderer=None, inframe=False):
     def draw_artist(self, a):
         """
         Efficiently redraw a single artist.
-
-        This method can only be used after an initial draw of the figure,
-        because that creates and caches the renderer needed here.
         """
-        if self.figure._cachedRenderer is None:
-            raise AttributeError("draw_artist can only be used after an "
-                                 "initial draw which caches the renderer")
-        a.draw(self.figure._cachedRenderer)
+        a.draw(self.figure.canvas.get_renderer())
 
     def redraw_in_frame(self):
         """
         Efficiently redraw Axes data, but not axis ticks, labels, etc.
-
-        This method can only be used after an initial draw which caches the
-        renderer.
         """
-        if self.figure._cachedRenderer is None:
-            raise AttributeError("redraw_in_frame can only be used after an "
-                                 "initial draw which caches the renderer")
         with ExitStack() as stack:
-            for artist in [*self._get_axis_list(),
+            for artist in [*self._axis_map.values(),
                            self.title, self._left_title, self._right_title]:
-                stack.callback(artist.set_visible, artist.get_visible())
-                artist.set_visible(False)
-            self.draw(self.figure._cachedRenderer)
+                stack.enter_context(artist._cm_set(visible=False))
+            self.draw(self.figure.canvas.get_renderer())
 
+    @_api.deprecated("3.6", alternative="Axes.figure.canvas.get_renderer()")
     def get_renderer_cache(self):
-        return self.figure._cachedRenderer
+        return self.figure.canvas.get_renderer()
 
     # Axes rectangle characteristics
 
     def get_frame_on(self):
-        """Get whether the axes rectangle patch is drawn."""
+        """Get whether the Axes rectangle patch is drawn."""
         return self._frameon
 
     def set_frame_on(self, b):
         """
-        Set whether the axes rectangle patch is drawn.
+        Set whether the Axes rectangle patch is drawn.
 
         Parameters
         ----------
@@ -3013,31 +3184,30 @@ def set_axisbelow(self, b):
         --------
         get_axisbelow
         """
+        # Check that b is True, False or 'line'
         self._axisbelow = axisbelow = validate_axisbelow(b)
-        if axisbelow is True:
-            zorder = 0.5
-        elif axisbelow is False:
-            zorder = 2.5
-        elif axisbelow == "line":
-            zorder = 1.5
-        else:
-            raise ValueError("Unexpected axisbelow value")
-        for axis in self._get_axis_list():
+        zorder = {
+            True: 0.5,
+            'line': 1.5,
+            False: 2.5,
+        }[axisbelow]
+        for axis in self._axis_map.values():
             axis.set_zorder(zorder)
         self.stale = True
 
-    @docstring.dedent_interpd
-    def grid(self, b=None, which='major', axis='both', **kwargs):
+    @_docstring.dedent_interpd
+    @_api.rename_parameter("3.5", "b", "visible")
+    def grid(self, visible=None, which='major', axis='both', **kwargs):
         """
         Configure the grid lines.
 
         Parameters
         ----------
-        b : bool or None, optional
-            Whether to show the grid lines. If any *kwargs* are supplied,
-            it is assumed you want the grid on and *b* will be set to True.
+        visible : bool or None, optional
+            Whether to show the grid lines.  If any *kwargs* are supplied, it
+            is assumed you want the grid on and *visible* will be set to True.
 
-            If *b* is *None* and there are no *kwargs*, this toggles the
+            If *visible* is *None* and there are no *kwargs*, this toggles the
             visibility of the lines.
 
         which : {'major', 'minor', 'both'}, optional
@@ -3053,7 +3223,7 @@ def grid(self, b=None, which='major', axis='both', **kwargs):
 
             Valid keyword arguments are:
 
-            %(Line2D_kwdoc)s
+            %(Line2D:kwdoc)s
 
         Notes
         -----
@@ -3065,14 +3235,14 @@ def grid(self, b=None, which='major', axis='both', **kwargs):
         """
         _api.check_in_list(['x', 'y', 'both'], axis=axis)
         if axis in ['x', 'both']:
-            self.xaxis.grid(b, which=which, **kwargs)
+            self.xaxis.grid(visible, which=which, **kwargs)
         if axis in ['y', 'both']:
-            self.yaxis.grid(b, which=which, **kwargs)
+            self.yaxis.grid(visible, which=which, **kwargs)
 
     def ticklabel_format(self, *, axis='both', style='', scilimits=None,
                          useOffset=None, useLocale=None, useMathText=None):
         r"""
-        Configure the `.ScalarFormatter` used by default for linear axes.
+        Configure the `.ScalarFormatter` used by default for linear Axes.
 
         If a parameter is not set, the corresponding property of the formatter
         is left unchanged.
@@ -3080,7 +3250,7 @@ def ticklabel_format(self, *, axis='both', style='', scilimits=None,
         Parameters
         ----------
         axis : {'x', 'y', 'both'}, default: 'both'
-            The axes to configure.  Only major ticks are affected.
+            The axis to configure.  Only major ticks are affected.
 
         style : {'sci', 'scientific', 'plain'}
             Whether to use scientific notation.
@@ -3125,8 +3295,8 @@ def ticklabel_format(self, *, axis='both', style='', scilimits=None,
                                  ) from err
         STYLES = {'sci': True, 'scientific': True, 'plain': False, '': None}
         is_sci_style = _api.check_getitem(STYLES, style=style)
-        axis_map = {**{k: [v] for k, v in self._get_axis_map().items()},
-                    'both': self._get_axis_list()}
+        axis_map = {**{k: [v] for k, v in self._axis_map.items()},
+                    'both': list(self._axis_map.values())}
         axises = _api.check_getitem(axis_map, axis=axis)
         try:
             for axis in axises:
@@ -3154,8 +3324,8 @@ def locator_params(self, axis='both', tight=None, **kwargs):
         Parameters
         ----------
         axis : {'both', 'x', 'y'}, default: 'both'
-            The axis on which to operate.
-
+            The axis on which to operate.  (For 3D Axes, *axis* can also be
+            set to 'z', and 'both' refers to all three axes.)
         tight : bool or None, optional
             Parameter passed to `~.Axes.autoscale_view`.
             Default is None, for no change.
@@ -3167,7 +3337,7 @@ def locator_params(self, axis='both', tight=None, **kwargs):
             ``set_params()`` method of the locator. Supported keywords depend
             on the type of the locator. See for example
             `~.ticker.MaxNLocator.set_params` for the `.ticker.MaxNLocator`
-            used by default for linear axes.
+            used by default for linear.
 
         Examples
         --------
@@ -3177,15 +3347,12 @@ def locator_params(self, axis='both', tight=None, **kwargs):
             ax.locator_params(tight=True, nbins=4)
 
         """
-        _api.check_in_list(['x', 'y', 'both'], axis=axis)
-        update_x = axis in ['x', 'both']
-        update_y = axis in ['y', 'both']
-        if update_x:
-            self.xaxis.get_major_locator().set_params(**kwargs)
-        if update_y:
-            self.yaxis.get_major_locator().set_params(**kwargs)
-        self._request_autoscale_view(tight=tight,
-                                     scalex=update_x, scaley=update_y)
+        _api.check_in_list([*self._axis_names, "both"], axis=axis)
+        for name in self._axis_names:
+            if axis in [name, "both"]:
+                loc = self._axis_map[name].get_major_locator()
+                loc.set_params(**kwargs)
+                self._request_autoscale_view(name, tight=tight)
         self.stale = True
 
     def tick_params(self, axis='both', **kwargs):
@@ -3207,7 +3374,7 @@ def tick_params(self, axis='both', **kwargs):
         Other Parameters
         ----------------
         direction : {'in', 'out', 'inout'}
-            Puts ticks inside the axes, outside the axes, or both.
+            Puts ticks inside the Axes, outside the Axes, or both.
         length : float
             Tick length in points.
         width : float
@@ -3305,7 +3472,7 @@ def set_xlabel(self, xlabel, fontdict=None, labelpad=None, *,
             The label text.
 
         labelpad : float, default: :rc:`axes.labelpad`
-            Spacing in points from the axes bounding box including ticks
+            Spacing in points from the Axes bounding box including ticks
             and tick labels.  If None, the previous value is left as is.
 
         loc : {'left', 'center', 'right'}, default: :rc:`xaxis.labellocation`
@@ -3330,15 +3497,19 @@ def set_xlabel(self, xlabel, fontdict=None, labelpad=None, *,
                                 f"its corresponding low level keyword "
                                 f"arguments ({protected_kw}) are also "
                                 f"supplied")
-            loc = 'center'
+
         else:
             loc = (loc if loc is not None
                    else mpl.rcParams['xaxis.labellocation'])
-        _api.check_in_list(('left', 'center', 'right'), loc=loc)
-        if loc == 'left':
-            kwargs.update(x=0, horizontalalignment='left')
-        elif loc == 'right':
-            kwargs.update(x=1, horizontalalignment='right')
+            _api.check_in_list(('left', 'center', 'right'), loc=loc)
+
+            x = {
+                'left': 0,
+                'center': 0.5,
+                'right': 1,
+            }[loc]
+            kwargs.update(x=x, horizontalalignment=loc)
+
         return self.xaxis.set_label_text(xlabel, fontdict, **kwargs)
 
     def invert_xaxis(self):
@@ -3375,7 +3546,7 @@ def set_xbound(self, lower=None, upper=None):
         """
         Set the lower and upper numerical bounds of the x-axis.
 
-        This method will honor axes inversion regardless of parameter order.
+        This method will honor axis inversion regardless of parameter order.
         It will not change the autoscaling setting (`.get_autoscalex_on()`).
 
         Parameters
@@ -3414,7 +3585,7 @@ def get_xlim(self):
 
         See Also
         --------
-        set_xlim
+        .Axes.set_xlim
         set_xbound, get_xbound
         invert_xaxis, xaxis_inverted
 
@@ -3422,7 +3593,6 @@ def get_xlim(self):
         -----
         The x-axis may be inverted, in which case the *left* value will
         be greater than the *right* value.
-
         """
         return tuple(self.viewLim.intervalx)
 
@@ -3443,6 +3613,7 @@ def _validate_converted_limits(self, limit, convert):
                 raise ValueError("Axis limits cannot be NaN or Inf")
             return converted_limit
 
+    @_api.make_keyword_only("3.6", "emit")
     def set_xlim(self, left=None, right=None, emit=True, auto=False,
                  *, xmin=None, xmax=None):
         """
@@ -3472,9 +3643,8 @@ def set_xlim(self, left=None, right=None, emit=True, auto=False,
             False turns off, None leaves unchanged.
 
         xmin, xmax : float, optional
-            They are equivalent to left and right respectively,
-            and it is an error to pass both *xmin* and *left* or
-            *xmax* and *right*.
+            They are equivalent to left and right respectively, and it is an
+            error to pass both *xmin* and *left* or *xmax* and *right*.
 
         Returns
         -------
@@ -3509,119 +3679,21 @@ def set_xlim(self, left=None, right=None, emit=True, auto=False,
         present is on the right.
 
         >>> set_xlim(5000, 0)
-
         """
         if right is None and np.iterable(left):
             left, right = left
         if xmin is not None:
             if left is not None:
-                raise TypeError('Cannot pass both `xmin` and `left`')
+                raise TypeError("Cannot pass both 'left' and 'xmin'")
             left = xmin
         if xmax is not None:
             if right is not None:
-                raise TypeError('Cannot pass both `xmax` and `right`')
+                raise TypeError("Cannot pass both 'right' and 'xmax'")
             right = xmax
-
-        self._process_unit_info([("x", (left, right))], convert=False)
-        left = self._validate_converted_limits(left, self.convert_xunits)
-        right = self._validate_converted_limits(right, self.convert_xunits)
-
-        if left is None or right is None:
-            # Axes init calls set_xlim(0, 1) before get_xlim() can be called,
-            # so only grab the limits if we really need them.
-            old_left, old_right = self.get_xlim()
-            if left is None:
-                left = old_left
-            if right is None:
-                right = old_right
-
-        if self.get_xscale() == 'log' and (left <= 0 or right <= 0):
-            # Axes init calls set_xlim(0, 1) before get_xlim() can be called,
-            # so only grab the limits if we really need them.
-            old_left, old_right = self.get_xlim()
-            if left <= 0:
-                _api.warn_external(
-                    'Attempted to set non-positive left xlim on a '
-                    'log-scaled axis.\n'
-                    'Invalid limit will be ignored.')
-                left = old_left
-            if right <= 0:
-                _api.warn_external(
-                    'Attempted to set non-positive right xlim on a '
-                    'log-scaled axis.\n'
-                    'Invalid limit will be ignored.')
-                right = old_right
-        if left == right:
-            _api.warn_external(
-                f"Attempting to set identical left == right == {left} results "
-                f"in singular transformations; automatically expanding.")
-        reverse = left > right
-        left, right = self.xaxis.get_major_locator().nonsingular(left, right)
-        left, right = self.xaxis.limit_range_for_scale(left, right)
-        # cast to bool to avoid bad interaction between python 3.8 and np.bool_
-        left, right = sorted([left, right], reverse=bool(reverse))
-
-        self._viewLim.intervalx = (left, right)
-        # Mark viewlims as no longer stale without triggering an autoscale.
-        for ax in self._shared_x_axes.get_siblings(self):
-            ax._stale_viewlim_x = False
-        if auto is not None:
-            self._autoscaleXon = bool(auto)
-
-        if emit:
-            self.callbacks.process('xlim_changed', self)
-            # Call all of the other x-axes that are shared with this one
-            for other in self._shared_x_axes.get_siblings(self):
-                if other is not self:
-                    other.set_xlim(self.viewLim.intervalx,
-                                   emit=False, auto=auto)
-                    if other.figure != self.figure:
-                        other.figure.canvas.draw_idle()
-        self.stale = True
-        return left, right
+        return self.xaxis._set_lim(left, right, emit=emit, auto=auto)
 
     get_xscale = _axis_method_wrapper("xaxis", "get_scale")
-
-    def set_xscale(self, value, **kwargs):
-        """
-        Set the x-axis scale.
-
-        Parameters
-        ----------
-        value : {"linear", "log", "symlog", "logit", ...} or `.ScaleBase`
-            The axis scale type to apply.
-
-        **kwargs
-            Different keyword arguments are accepted, depending on the scale.
-            See the respective class keyword arguments:
-
-            - `matplotlib.scale.LinearScale`
-            - `matplotlib.scale.LogScale`
-            - `matplotlib.scale.SymmetricalLogScale`
-            - `matplotlib.scale.LogitScale`
-            - `matplotlib.scale.FuncScale`
-
-        Notes
-        -----
-        By default, Matplotlib supports the above mentioned scales.
-        Additionally, custom scales may be registered using
-        `matplotlib.scale.register_scale`. These scales can then also
-        be used here.
-        """
-        old_default_lims = (self.xaxis.get_major_locator()
-                            .nonsingular(-np.inf, np.inf))
-        g = self.get_shared_x_axes()
-        for ax in g.get_siblings(self):
-            ax.xaxis._set_scale(value, **kwargs)
-            ax._update_transScale()
-            ax.stale = True
-        new_default_lims = (self.xaxis.get_major_locator()
-                            .nonsingular(-np.inf, np.inf))
-        if old_default_lims != new_default_lims:
-            # Force autoscaling now, to take advantage of the scale locator's
-            # nonsingular() before it possibly gets swapped out by the user.
-            self.autoscale_view(scaley=False)
-
+    set_xscale = _axis_method_wrapper("xaxis", "_set_axes_scale")
     get_xticks = _axis_method_wrapper("xaxis", "get_ticklocs")
     set_xticks = _axis_method_wrapper("xaxis", "set_ticks")
     get_xmajorticklabels = _axis_method_wrapper("xaxis", "get_majorticklabels")
@@ -3649,7 +3721,7 @@ def set_ylabel(self, ylabel, fontdict=None, labelpad=None, *,
             The label text.
 
         labelpad : float, default: :rc:`axes.labelpad`
-            Spacing in points from the axes bounding box including ticks
+            Spacing in points from the Axes bounding box including ticks
             and tick labels.  If None, the previous value is left as is.
 
         loc : {'bottom', 'center', 'top'}, default: :rc:`yaxis.labellocation`
@@ -3674,15 +3746,19 @@ def set_ylabel(self, ylabel, fontdict=None, labelpad=None, *,
                                 f"its corresponding low level keyword "
                                 f"arguments ({protected_kw}) are also "
                                 f"supplied")
-            loc = 'center'
+
         else:
             loc = (loc if loc is not None
                    else mpl.rcParams['yaxis.labellocation'])
-        _api.check_in_list(('bottom', 'center', 'top'), loc=loc)
-        if loc == 'bottom':
-            kwargs.update(y=0, horizontalalignment='left')
-        elif loc == 'top':
-            kwargs.update(y=1, horizontalalignment='right')
+            _api.check_in_list(('bottom', 'center', 'top'), loc=loc)
+
+            y, ha = {
+                'bottom': (0, 'left'),
+                'center': (0.5, 'center'),
+                'top': (1, 'right')
+            }[loc]
+            kwargs.update(y=y, horizontalalignment=ha)
+
         return self.yaxis.set_label_text(ylabel, fontdict, **kwargs)
 
     def invert_yaxis(self):
@@ -3719,7 +3795,7 @@ def set_ybound(self, lower=None, upper=None):
         """
         Set the lower and upper numerical bounds of the y-axis.
 
-        This method will honor axes inversion regardless of parameter order.
+        This method will honor axis inversion regardless of parameter order.
         It will not change the autoscaling setting (`.get_autoscaley_on()`).
 
         Parameters
@@ -3758,7 +3834,7 @@ def get_ylim(self):
 
         See Also
         --------
-        set_ylim
+        .Axes.set_ylim
         set_ybound, get_ybound
         invert_yaxis, yaxis_inverted
 
@@ -3766,10 +3842,10 @@ def get_ylim(self):
         -----
         The y-axis may be inverted, in which case the *bottom* value
         will be greater than the *top* value.
-
         """
         return tuple(self.viewLim.intervaly)
 
+    @_api.make_keyword_only("3.6", "emit")
     def set_ylim(self, bottom=None, top=None, emit=True, auto=False,
                  *, ymin=None, ymax=None):
         """
@@ -3799,9 +3875,8 @@ def set_ylim(self, bottom=None, top=None, emit=True, auto=False,
             *False* turns off, *None* leaves unchanged.
 
         ymin, ymax : float, optional
-            They are equivalent to bottom and top respectively,
-            and it is an error to pass both *ymin* and *bottom* or
-            *ymax* and *top*.
+            They are equivalent to bottom and top respectively, and it is an
+            error to pass both *ymin* and *bottom* or *ymax* and *top*.
 
         Returns
         -------
@@ -3841,114 +3916,16 @@ def set_ylim(self, bottom=None, top=None, emit=True, auto=False,
             bottom, top = bottom
         if ymin is not None:
             if bottom is not None:
-                raise TypeError('Cannot pass both `ymin` and `bottom`')
+                raise TypeError("Cannot pass both 'bottom' and 'ymin'")
             bottom = ymin
         if ymax is not None:
             if top is not None:
-                raise TypeError('Cannot pass both `ymax` and `top`')
+                raise TypeError("Cannot pass both 'top' and 'ymax'")
             top = ymax
-
-        self._process_unit_info([("y", (bottom, top))], convert=False)
-        bottom = self._validate_converted_limits(bottom, self.convert_yunits)
-        top = self._validate_converted_limits(top, self.convert_yunits)
-
-        if bottom is None or top is None:
-            # Axes init calls set_ylim(0, 1) before get_ylim() can be called,
-            # so only grab the limits if we really need them.
-            old_bottom, old_top = self.get_ylim()
-            if bottom is None:
-                bottom = old_bottom
-            if top is None:
-                top = old_top
-
-        if self.get_yscale() == 'log' and (bottom <= 0 or top <= 0):
-            # Axes init calls set_xlim(0, 1) before get_xlim() can be called,
-            # so only grab the limits if we really need them.
-            old_bottom, old_top = self.get_ylim()
-            if bottom <= 0:
-                _api.warn_external(
-                    'Attempted to set non-positive bottom ylim on a '
-                    'log-scaled axis.\n'
-                    'Invalid limit will be ignored.')
-                bottom = old_bottom
-            if top <= 0:
-                _api.warn_external(
-                    'Attempted to set non-positive top ylim on a '
-                    'log-scaled axis.\n'
-                    'Invalid limit will be ignored.')
-                top = old_top
-        if bottom == top:
-            _api.warn_external(
-                f"Attempting to set identical bottom == top == {bottom} "
-                f"results in singular transformations; automatically "
-                f"expanding.")
-        reverse = bottom > top
-        bottom, top = self.yaxis.get_major_locator().nonsingular(bottom, top)
-        bottom, top = self.yaxis.limit_range_for_scale(bottom, top)
-        # cast to bool to avoid bad interaction between python 3.8 and np.bool_
-        bottom, top = sorted([bottom, top], reverse=bool(reverse))
-
-        self._viewLim.intervaly = (bottom, top)
-        # Mark viewlims as no longer stale without triggering an autoscale.
-        for ax in self._shared_y_axes.get_siblings(self):
-            ax._stale_viewlim_y = False
-        if auto is not None:
-            self._autoscaleYon = bool(auto)
-
-        if emit:
-            self.callbacks.process('ylim_changed', self)
-            # Call all of the other y-axes that are shared with this one
-            for other in self._shared_y_axes.get_siblings(self):
-                if other is not self:
-                    other.set_ylim(self.viewLim.intervaly,
-                                   emit=False, auto=auto)
-                    if other.figure != self.figure:
-                        other.figure.canvas.draw_idle()
-        self.stale = True
-        return bottom, top
+        return self.yaxis._set_lim(bottom, top, emit=emit, auto=auto)
 
     get_yscale = _axis_method_wrapper("yaxis", "get_scale")
-
-    def set_yscale(self, value, **kwargs):
-        """
-        Set the y-axis scale.
-
-        Parameters
-        ----------
-        value : {"linear", "log", "symlog", "logit", ...} or `.ScaleBase`
-            The axis scale type to apply.
-
-        **kwargs
-            Different keyword arguments are accepted, depending on the scale.
-            See the respective class keyword arguments:
-
-            - `matplotlib.scale.LinearScale`
-            - `matplotlib.scale.LogScale`
-            - `matplotlib.scale.SymmetricalLogScale`
-            - `matplotlib.scale.LogitScale`
-            - `matplotlib.scale.FuncScale`
-
-        Notes
-        -----
-        By default, Matplotlib supports the above mentioned scales.
-        Additionally, custom scales may be registered using
-        `matplotlib.scale.register_scale`. These scales can then also
-        be used here.
-        """
-        old_default_lims = (self.yaxis.get_major_locator()
-                            .nonsingular(-np.inf, np.inf))
-        g = self.get_shared_y_axes()
-        for ax in g.get_siblings(self):
-            ax.yaxis._set_scale(value, **kwargs)
-            ax._update_transScale()
-            ax.stale = True
-        new_default_lims = (self.yaxis.get_major_locator()
-                            .nonsingular(-np.inf, np.inf))
-        if old_default_lims != new_default_lims:
-            # Force autoscaling now, to take advantage of the scale locator's
-            # nonsingular() before it possibly gets swapped out by the user.
-            self.autoscale_view(scalex=False)
-
+    set_yscale = _axis_method_wrapper("yaxis", "_set_axes_scale")
     get_yticks = _axis_method_wrapper("yaxis", "get_ticklocs")
     set_yticks = _axis_method_wrapper("yaxis", "set_ticks")
     get_ymajorticklabels = _axis_method_wrapper("yaxis", "get_majorticklabels")
@@ -3983,19 +3960,14 @@ def format_ydata(self, y):
 
     def format_coord(self, x, y):
         """Return a format string formatting the *x*, *y* coordinates."""
-        if x is None:
-            xs = '???'
-        else:
-            xs = self.format_xdata(x)
-        if y is None:
-            ys = '???'
-        else:
-            ys = self.format_ydata(y)
-        return 'x=%s y=%s' % (xs, ys)
+        return "x={} y={}".format(
+            "???" if x is None else self.format_xdata(x),
+            "???" if y is None else self.format_ydata(y),
+        )
 
     def minorticks_on(self):
         """
-        Display minor ticks on the axes.
+        Display minor ticks on the Axes.
 
         Displaying minor ticks may reduce performance; you may turn them off
         using `minorticks_off()` if drawing speed is a problem.
@@ -4013,7 +3985,7 @@ def minorticks_on(self):
                 ax.set_minor_locator(mticker.AutoMinorLocator())
 
     def minorticks_off(self):
-        """Remove minor ticks from the axes."""
+        """Remove minor ticks from the Axes."""
         self.xaxis.set_minor_locator(mticker.NullLocator())
         self.yaxis.set_minor_locator(mticker.NullLocator())
 
@@ -4021,25 +3993,25 @@ def minorticks_off(self):
 
     def can_zoom(self):
         """
-        Return whether this axes supports the zoom box button functionality.
+        Return whether this Axes supports the zoom box button functionality.
         """
         return True
 
     def can_pan(self):
         """
-        Return whether this axes supports any pan/zoom button functionality.
+        Return whether this Axes supports any pan/zoom button functionality.
         """
         return True
 
     def get_navigate(self):
         """
-        Get whether the axes responds to navigation commands
+        Get whether the Axes responds to navigation commands.
         """
         return self._navigate
 
     def set_navigate(self, b):
         """
-        Set whether the axes responds to navigation toolbar commands
+        Set whether the Axes responds to navigation toolbar commands.
 
         Parameters
         ----------
@@ -4049,16 +4021,16 @@ def set_navigate(self, b):
 
     def get_navigate_mode(self):
         """
-        Get the navigation toolbar button status: 'PAN', 'ZOOM', or None
+        Get the navigation toolbar button status: 'PAN', 'ZOOM', or None.
         """
         return self._navigate_mode
 
     def set_navigate_mode(self, b):
         """
-        Set the navigation toolbar button status;
+        Set the navigation toolbar button status.
 
-        .. warning ::
-            this is not a user-API function.
+        .. warning::
+            This is not a user-API function.
 
         """
         self._navigate_mode = b
@@ -4097,62 +4069,27 @@ def _set_view(self, view):
         self.set_xlim((xmin, xmax))
         self.set_ylim((ymin, ymax))
 
-    def _set_view_from_bbox(self, bbox, direction='in',
-                            mode=None, twinx=False, twiny=False):
+    def _prepare_view_from_bbox(self, bbox, direction='in',
+                                mode=None, twinx=False, twiny=False):
         """
-        Update view from a selection bbox.
-
-        .. note::
+        Helper function to prepare the new bounds from a bbox.
 
-            Intended to be overridden by new projection types, but if not, the
-            default implementation sets the view limits to the bbox directly.
-
-        Parameters
-        ----------
-        bbox : 4-tuple or 3 tuple
-            * If bbox is a 4 tuple, it is the selected bounding box limits,
-              in *display* coordinates.
-            * If bbox is a 3 tuple, it is an (xp, yp, scl) triple, where
-              (xp, yp) is the center of zooming and scl the scale factor to
-              zoom by.
-
-        direction : str
-            The direction to apply the bounding box.
-                * `'in'` - The bounding box describes the view directly, i.e.,
-                           it zooms in.
-                * `'out'` - The bounding box describes the size to make the
-                            existing view, i.e., it zooms out.
-
-        mode : str or None
-            The selection mode, whether to apply the bounding box in only the
-            `'x'` direction, `'y'` direction or both (`None`).
-
-        twinx : bool
-            Whether this axis is twinned in the *x*-direction.
-
-        twiny : bool
-            Whether this axis is twinned in the *y*-direction.
+        This helper function returns the new x and y bounds from the zoom
+        bbox. This a convenience method to abstract the bbox logic
+        out of the base setter.
         """
         if len(bbox) == 3:
-            Xmin, Xmax = self.get_xlim()
-            Ymin, Ymax = self.get_ylim()
-
             xp, yp, scl = bbox  # Zooming code
-
             if scl == 0:  # Should not happen
                 scl = 1.
-
             if scl > 1:
                 direction = 'in'
             else:
                 direction = 'out'
                 scl = 1/scl
-
             # get the limits of the axes
-            tranD2C = self.transData.transform
-            xmin, ymin = tranD2C((Xmin, Ymin))
-            xmax, ymax = tranD2C((Xmax, Ymax))
-
+            (xmin, ymin), (xmax, ymax) = self.transData.transform(
+                np.transpose([self.get_xlim(), self.get_ylim()]))
             # set the range
             xwidth = xmax - xmin
             ywidth = ymax - ymin
@@ -4160,7 +4097,6 @@ def _set_view_from_bbox(self, bbox, direction='in',
             ycen = (ymax + ymin)*.5
             xzc = (xp*(scl - 1) + xcen)/scl
             yzc = (yp*(scl - 1) + ycen)/scl
-
             bbox = [xzc - xwidth/2./scl, yzc - ywidth/2./scl,
                     xzc + xwidth/2./scl, yzc + ywidth/2./scl]
         elif len(bbox) != 4:
@@ -4197,7 +4133,7 @@ def _set_view_from_bbox(self, bbox, direction='in',
                 [xmin0, xmax0, xmin, xmax])  # To screen space.
             factor = (sxmax0 - sxmin0) / (sxmax - sxmin)  # Unzoom factor.
             # Move original bounds away by
-            # (factor) x (distance between unzoom box and axes bbox).
+            # (factor) x (distance between unzoom box and Axes bbox).
             sxmin1 = sxmin0 - factor * (sxmin - sxmin0)
             sxmax1 = sxmax0 + factor * (sxmax0 - sxmax)
             # And back to data space.
@@ -4211,10 +4147,52 @@ def _set_view_from_bbox(self, bbox, direction='in',
             symax1 = symax0 + factor * (symax0 - symax)
             new_ybound = y_trf.inverted().transform([symin1, symax1])
 
+        return new_xbound, new_ybound
+
+    def _set_view_from_bbox(self, bbox, direction='in',
+                            mode=None, twinx=False, twiny=False):
+        """
+        Update view from a selection bbox.
+
+        .. note::
+
+            Intended to be overridden by new projection types, but if not, the
+            default implementation sets the view limits to the bbox directly.
+
+        Parameters
+        ----------
+        bbox : 4-tuple or 3 tuple
+            * If bbox is a 4 tuple, it is the selected bounding box limits,
+              in *display* coordinates.
+            * If bbox is a 3 tuple, it is an (xp, yp, scl) triple, where
+              (xp, yp) is the center of zooming and scl the scale factor to
+              zoom by.
+
+        direction : str
+            The direction to apply the bounding box.
+                * `'in'` - The bounding box describes the view directly, i.e.,
+                           it zooms in.
+                * `'out'` - The bounding box describes the size to make the
+                            existing view, i.e., it zooms out.
+
+        mode : str or None
+            The selection mode, whether to apply the bounding box in only the
+            `'x'` direction, `'y'` direction or both (`None`).
+
+        twinx : bool
+            Whether this axis is twinned in the *x*-direction.
+
+        twiny : bool
+            Whether this axis is twinned in the *y*-direction.
+        """
+        new_xbound, new_ybound = self._prepare_view_from_bbox(
+            bbox, direction=direction, mode=mode, twinx=twinx, twiny=twiny)
         if not twinx and mode != "y":
             self.set_xbound(new_xbound)
+            self.set_autoscalex_on(False)
         if not twiny and mode != "x":
             self.set_ybound(new_ybound)
+            self.set_autoscaley_on(False)
 
     def start_pan(self, x, y, button):
         """
@@ -4249,22 +4227,13 @@ def end_pan(self):
         """
         del self._pan_start
 
-    def drag_pan(self, button, key, x, y):
+    def _get_pan_points(self, button, key, x, y):
         """
-        Called when the mouse moves during a pan operation.
-
-        Parameters
-        ----------
-        button : `.MouseButton`
-            The pressed mouse button.
-        key : str or None
-            The pressed key, if any.
-        x, y : float
-            The mouse coordinates in display coords.
+        Helper function to return the new points after a pan.
 
-        Notes
-        -----
-        This is intended to be overridden by new projection types.
+        This helper function returns the points on the axis after a pan has
+        occurred. This is a convenience method to abstract the pan logic
+        out of the base setter.
         """
         def format_deltas(key, dx, dy):
             if key == 'control':
@@ -4318,22 +4287,37 @@ def format_deltas(key, dx, dy):
         points = result.get_points().astype(object)
         # Just ignore invalid limits (typically, underflow in log-scale).
         points[~valid] = None
-        self.set_xlim(points[:, 0])
-        self.set_ylim(points[:, 1])
+        return points
+
+    def drag_pan(self, button, key, x, y):
+        """
+        Called when the mouse moves during a pan operation.
+
+        Parameters
+        ----------
+        button : `.MouseButton`
+            The pressed mouse button.
+        key : str or None
+            The pressed key, if any.
+        x, y : float
+            The mouse coordinates in display coords.
+
+        Notes
+        -----
+        This is intended to be overridden by new projection types.
+        """
+        points = self._get_pan_points(button, key, x, y)
+        if points is not None:
+            self.set_xlim(points[:, 0])
+            self.set_ylim(points[:, 1])
 
     def get_children(self):
         # docstring inherited.
         return [
-            *self.collections,
-            *self.patches,
-            *self.lines,
-            *self.texts,
-            *self.artists,
+            *self._children,
             *self.spines.values(),
-            *self._get_axis_list(),
+            *self._axis_map.values(),
             self.title, self._left_title, self._right_title,
-            *self.tables,
-            *self.images,
             *self.child_axes,
             *([self.legend_] if self.legend_ is not None else []),
             self.patch,
@@ -4348,7 +4332,7 @@ def contains(self, mouseevent):
 
     def contains_point(self, point):
         """
-        Return whether *point* (pair of pixel coordinates) is inside the axes
+        Return whether *point* (pair of pixel coordinates) is inside the Axes
         patch.
         """
         return self.patch.contains_point(point, radius=1.0)
@@ -4364,26 +4348,31 @@ def get_default_bbox_extra_artists(self):
 
         artists = self.get_children()
 
+        for axis in self._axis_map.values():
+            # axis tight bboxes are calculated separately inside
+            # Axes.get_tightbbox() using for_layout_only=True
+            artists.remove(axis)
         if not (self.axison and self._frameon):
             # don't do bbox on spines if frame not on.
             for spine in self.spines.values():
                 artists.remove(spine)
 
-        if not self.axison:
-            for _axis in self._get_axis_list():
-                artists.remove(_axis)
-
         artists.remove(self.title)
         artists.remove(self._left_title)
         artists.remove(self._right_title)
 
-        return [artist for artist in artists
-                if (artist.get_visible() and artist.get_in_layout())]
+        # always include types that do not internally implement clipping
+        # to Axes. may have clip_on set to True and clip_box equivalent
+        # to ax.bbox but then ignore these properties during draws.
+        noclip = (_AxesBase, maxis.Axis,
+                  offsetbox.AnnotationBbox, offsetbox.OffsetBox)
+        return [a for a in artists if a.get_visible() and a.get_in_layout()
+                and (isinstance(a, noclip) or not a._fully_clipped_to_axes())]
 
-    def get_tightbbox(self, renderer, call_axes_locator=True,
+    def get_tightbbox(self, renderer=None, call_axes_locator=True,
                       bbox_extra_artists=None, *, for_layout_only=False):
         """
-        Return the tight bounding box of the axes, including axis and their
+        Return the tight bounding box of the Axes, including axis and their
         decorators (xlabel, title, etc).
 
         Artists that have ``artist.set_in_layout(False)`` are not included
@@ -4397,7 +4386,7 @@ def get_tightbbox(self, renderer, call_axes_locator=True,
 
         bbox_extra_artists : list of `.Artist` or ``None``
             List of artists to include in the tight bounding box.  If
-            ``None`` (default), then all artist children of the axes are
+            ``None`` (default), then all artist children of the Axes are
             included in the tight bounding box.
 
         call_axes_locator : bool, default: True
@@ -4405,7 +4394,7 @@ def get_tightbbox(self, renderer, call_axes_locator=True,
             ``_axes_locator`` attribute, which is necessary to get the correct
             bounding box. ``call_axes_locator=False`` can be used if the
             caller is only interested in the relative size of the tightbbox
-            compared to the axes bbox.
+            compared to the Axes bbox.
 
         for_layout_only : default: False
             The bounding box will *not* include the x-extent of the title and
@@ -4424,36 +4413,21 @@ def get_tightbbox(self, renderer, call_axes_locator=True,
         """
 
         bb = []
+        if renderer is None:
+            renderer = self.figure._get_renderer()
 
         if not self.get_visible():
             return None
 
         locator = self.get_axes_locator()
-        if locator and call_axes_locator:
-            pos = locator(self, renderer)
-            self.apply_aspect(pos)
-        else:
-            self.apply_aspect()
-
-        if self.axison:
-            if self.xaxis.get_visible():
-                try:
-                    bb_xaxis = self.xaxis.get_tightbbox(
-                        renderer, for_layout_only=for_layout_only)
-                except TypeError:
-                    # in case downstream library has redefined axis:
-                    bb_xaxis = self.xaxis.get_tightbbox(renderer)
-                if bb_xaxis:
-                    bb.append(bb_xaxis)
-            if self.yaxis.get_visible():
-                try:
-                    bb_yaxis = self.yaxis.get_tightbbox(
-                        renderer, for_layout_only=for_layout_only)
-                except TypeError:
-                    # in case downstream library has redefined axis:
-                    bb_yaxis = self.yaxis.get_tightbbox(renderer)
-                if bb_yaxis:
-                    bb.append(bb_yaxis)
+        self.apply_aspect(
+            locator(self, renderer) if locator and call_axes_locator else None)
+
+        for axis in self._axis_map.values():
+            if self.axison and axis.get_visible():
+                ba = martist._get_tightbbox_for_layout_only(axis, renderer)
+                if ba:
+                    bb.append(ba)
         self._update_title_position(renderer)
         axbbox = self.get_window_extent(renderer)
         bb.append(axbbox)
@@ -4474,17 +4448,6 @@ def get_tightbbox(self, renderer, call_axes_locator=True,
             bbox_artists = self.get_default_bbox_extra_artists()
 
         for a in bbox_artists:
-            # Extra check here to quickly see if clipping is on and
-            # contained in the axes.  If it is, don't get the tightbbox for
-            # this artist because this can be expensive:
-            clip_extent = a._get_clipping_extent_bbox()
-            if clip_extent is not None:
-                clip_extent = mtransforms.Bbox.intersection(
-                    clip_extent, axbbox)
-                if np.all(clip_extent.extents == axbbox.extents):
-                    # clip extent is inside the axes bbox so don't check
-                    # this artist
-                    continue
             bbox = a.get_tightbbox(renderer)
             if (bbox is not None
                     and 0 < bbox.width < np.inf
@@ -4494,7 +4457,7 @@ def get_tightbbox(self, renderer, call_axes_locator=True,
             [b for b in bb if b.width != 0 or b.height != 0])
 
     def _make_twin_axes(self, *args, **kwargs):
-        """Make a twinx axes of self. This is used for twinx and twiny."""
+        """Make a twinx Axes of self. This is used for twinx and twiny."""
         # Typically, SubplotBase._make_twin_axes is called instead of this.
         if 'sharex' in kwargs and 'sharey' in kwargs:
             raise ValueError("Twinned Axes may share only one axis")
@@ -4525,7 +4488,7 @@ def twinx(self):
         Notes
         -----
         For those who are 'picking' artists while using twinx, pick
-        events are only called for the artists in the top-most axes.
+        events are only called for the artists in the top-most Axes.
         """
         ax2 = self._make_twin_axes(sharex=self)
         ax2.yaxis.tick_right()
@@ -4555,7 +4518,7 @@ def twiny(self):
         Notes
         -----
         For those who are 'picking' artists while using twiny, pick
-        events are only called for the artists in the top-most axes.
+        events are only called for the artists in the top-most Axes.
         """
         ax2 = self._make_twin_axes(sharey=self)
         ax2.xaxis.tick_top()
@@ -4567,9 +4530,9 @@ def twiny(self):
         return ax2
 
     def get_shared_x_axes(self):
-        """Return a reference to the shared axes Grouper object for x axes."""
-        return self._shared_x_axes
+        """Return an immutable view on the shared x-axes Grouper."""
+        return cbook.GrouperView(self._shared_axes["x"])
 
     def get_shared_y_axes(self):
-        """Return a reference to the shared axes Grouper object for y axes."""
-        return self._shared_y_axes
+        """Return an immutable view on the shared y-axes Grouper."""
+        return cbook.GrouperView(self._shared_axes["y"])
diff --git a/lib/matplotlib/axes/_secondary_axes.py b/lib/matplotlib/axes/_secondary_axes.py
index 98a612013a16..55aeafa391b3 100644
--- a/lib/matplotlib/axes/_secondary_axes.py
+++ b/lib/matplotlib/axes/_secondary_axes.py
@@ -1,9 +1,9 @@
 import numpy as np
 
-from matplotlib import _api
-import matplotlib.docstring as docstring
+from matplotlib import _api, _docstring
 import matplotlib.ticker as mticker
 from matplotlib.axes._base import _AxesBase, _TransformedBoundsLocator
+from matplotlib.axis import Axis
 
 
 class SecondaryAxis(_AxesBase):
@@ -123,18 +123,9 @@ def apply_aspect(self, position=None):
         self._set_lims()
         super().apply_aspect(position)
 
-    def set_ticks(self, ticks, *, minor=False):
-        """
-        Set the x ticks with list of *ticks*
-
-        Parameters
-        ----------
-        ticks : list
-            List of x-axis tick locations.
-        minor : bool, default: False
-            If ``False`` sets major ticks, if ``True`` sets minor ticks.
-        """
-        ret = self._axis.set_ticks(ticks, minor=minor)
+    @_docstring.copy(Axis.set_ticks)
+    def set_ticks(self, ticks, labels=None, *, minor=False, **kwargs):
+        ret = self._axis.set_ticks(ticks, labels, minor=minor, **kwargs)
         self.stale = True
         self._ticks_set = True
         return ret
@@ -284,7 +275,8 @@ def set_color(self, color):
     If a 2-tuple of functions, the user specifies the transform
     function and its inverse.  i.e.
     ``functions=(lambda x: 2 / x, lambda x: 2 / x)`` would be an
-    reciprocal transform with a factor of 2.
+    reciprocal transform with a factor of 2. Both functions must accept
+    numpy arrays as input.
 
     The user can also directly supply a subclass of
     `.transforms.Transform` so long as it has an inverse.
@@ -301,4 +293,4 @@ def set_color(self, color):
 **kwargs : `~matplotlib.axes.Axes` properties.
     Other miscellaneous axes parameters.
 '''
-docstring.interpd.update(_secax_docstring=_secax_docstring)
+_docstring.interpd.update(_secax_docstring=_secax_docstring)
diff --git a/lib/matplotlib/axes/_subplots.py b/lib/matplotlib/axes/_subplots.py
index 5042e3bbd860..b31388a2154f 100644
--- a/lib/matplotlib/axes/_subplots.py
+++ b/lib/matplotlib/axes/_subplots.py
@@ -1,9 +1,7 @@
-import functools
-
-from matplotlib import _api, docstring
-import matplotlib.artist as martist
+import matplotlib as mpl
+from matplotlib import cbook
 from matplotlib.axes._axes import Axes
-from matplotlib.gridspec import GridSpec, SubplotSpec
+from matplotlib.gridspec import SubplotSpec
 
 
 class SubplotBase:
@@ -37,31 +35,6 @@ def __init__(self, fig, *args, **kwargs):
         # This will also update the axes position.
         self.set_subplotspec(SubplotSpec._from_subplot_args(fig, args))
 
-    def __reduce__(self):
-        # get the first axes class which does not inherit from a subplotbase
-        axes_class = next(
-            c for c in type(self).__mro__
-            if issubclass(c, Axes) and not issubclass(c, SubplotBase))
-        return (_picklable_subplot_class_constructor,
-                (axes_class,),
-                self.__getstate__())
-
-    @_api.deprecated(
-        "3.4", alternative="get_subplotspec",
-        addendum="(get_subplotspec returns a SubplotSpec instance.)")
-    def get_geometry(self):
-        """Get the subplot geometry, e.g., (2, 2, 3)."""
-        rows, cols, num1, num2 = self.get_subplotspec().get_geometry()
-        return rows, cols, num1 + 1  # for compatibility
-
-    @_api.deprecated("3.4", alternative="set_subplotspec")
-    def change_geometry(self, numrows, numcols, num):
-        """Change subplot geometry, e.g., from (1, 1, 1) to (2, 2, 3)."""
-        self._subplotspec = GridSpec(numrows, numcols,
-                                     figure=self.figure)[num - 1]
-        self.update_params()
-        self.set_position(self.figbox)
-
     def get_subplotspec(self):
         """Return the `.SubplotSpec` instance associated with the subplot."""
         return self._subplotspec
@@ -75,64 +48,54 @@ def get_gridspec(self):
         """Return the `.GridSpec` instance associated with the subplot."""
         return self._subplotspec.get_gridspec()
 
-    @_api.deprecated(
-        "3.4", alternative="get_subplotspec().get_position(self.figure)")
-    @property
-    def figbox(self):
-        return self.get_subplotspec().get_position(self.figure)
-
-    @_api.deprecated("3.4", alternative="get_gridspec().nrows")
-    @property
-    def numRows(self):
-        return self.get_gridspec().nrows
-
-    @_api.deprecated("3.4", alternative="get_gridspec().ncols")
-    @property
-    def numCols(self):
-        return self.get_gridspec().ncols
-
-    @_api.deprecated("3.4")
-    def update_params(self):
-        """Update the subplot position from ``self.figure.subplotpars``."""
-        # Now a no-op, as figbox/numRows/numCols are (deprecated) auto-updating
-        # properties.
-
-    @_api.deprecated("3.4", alternative="ax.get_subplotspec().is_first_row()")
-    def is_first_row(self):
-        return self.get_subplotspec().rowspan.start == 0
-
-    @_api.deprecated("3.4", alternative="ax.get_subplotspec().is_last_row()")
-    def is_last_row(self):
-        return self.get_subplotspec().rowspan.stop == self.get_gridspec().nrows
-
-    @_api.deprecated("3.4", alternative="ax.get_subplotspec().is_first_col()")
-    def is_first_col(self):
-        return self.get_subplotspec().colspan.start == 0
-
-    @_api.deprecated("3.4", alternative="ax.get_subplotspec().is_last_col()")
-    def is_last_col(self):
-        return self.get_subplotspec().colspan.stop == self.get_gridspec().ncols
-
     def label_outer(self):
         """
         Only show "outer" labels and tick labels.
 
-        x-labels are only kept for subplots on the last row; y-labels only for
-        subplots on the first column.
+        x-labels are only kept for subplots on the last row (or first row, if
+        labels are on the top side); y-labels only for subplots on the first
+        column (or last column, if labels are on the right side).
         """
+        self._label_outer_xaxis(check_patch=False)
+        self._label_outer_yaxis(check_patch=False)
+
+    def _label_outer_xaxis(self, *, check_patch):
+        # see documentation in label_outer.
+        if check_patch and not isinstance(self.patch, mpl.patches.Rectangle):
+            return
         ss = self.get_subplotspec()
-        lastrow = ss.is_last_row()
-        firstcol = ss.is_first_col()
-        if not lastrow:
-            for label in self.get_xticklabels(which="both"):
-                label.set_visible(False)
-            self.xaxis.get_offset_text().set_visible(False)
-            self.set_xlabel("")
-        if not firstcol:
-            for label in self.get_yticklabels(which="both"):
-                label.set_visible(False)
-            self.yaxis.get_offset_text().set_visible(False)
-            self.set_ylabel("")
+        label_position = self.xaxis.get_label_position()
+        if not ss.is_first_row():  # Remove top label/ticklabels/offsettext.
+            if label_position == "top":
+                self.set_xlabel("")
+            self.xaxis.set_tick_params(which="both", labeltop=False)
+            if self.xaxis.offsetText.get_position()[1] == 1:
+                self.xaxis.offsetText.set_visible(False)
+        if not ss.is_last_row():  # Remove bottom label/ticklabels/offsettext.
+            if label_position == "bottom":
+                self.set_xlabel("")
+            self.xaxis.set_tick_params(which="both", labelbottom=False)
+            if self.xaxis.offsetText.get_position()[1] == 0:
+                self.xaxis.offsetText.set_visible(False)
+
+    def _label_outer_yaxis(self, *, check_patch):
+        # see documentation in label_outer.
+        if check_patch and not isinstance(self.patch, mpl.patches.Rectangle):
+            return
+        ss = self.get_subplotspec()
+        label_position = self.yaxis.get_label_position()
+        if not ss.is_first_col():  # Remove left label/ticklabels/offsettext.
+            if label_position == "left":
+                self.set_ylabel("")
+            self.yaxis.set_tick_params(which="both", labelleft=False)
+            if self.yaxis.offsetText.get_position()[0] == 0:
+                self.yaxis.offsetText.set_visible(False)
+        if not ss.is_last_col():  # Remove right label/ticklabels/offsettext.
+            if label_position == "right":
+                self.set_ylabel("")
+            self.yaxis.set_tick_params(which="both", labelright=False)
+            if self.yaxis.offsetText.get_position()[0] == 1:
+                self.yaxis.offsetText.set_visible(False)
 
     def _make_twin_axes(self, *args, **kwargs):
         """Make a twinx axes of self. This is used for twinx and twiny."""
@@ -148,59 +111,6 @@ def _make_twin_axes(self, *args, **kwargs):
         return twin
 
 
-# this here to support cartopy which was using a private part of the
-# API to register their Axes subclasses.
-
-# In 3.1 this should be changed to a dict subclass that warns on use
-# In 3.3 to a dict subclass that raises a useful exception on use
-# In 3.4 should be removed
-
-# The slow timeline is to give cartopy enough time to get several
-# release out before we break them.
-_subplot_classes = {}
-
-
-@functools.lru_cache(None)
-def subplot_class_factory(axes_class=None):
-    """
-    Make a new class that inherits from `.SubplotBase` and the
-    given axes_class (which is assumed to be a subclass of `.axes.Axes`).
-    This is perhaps a little bit roundabout to make a new class on
-    the fly like this, but it means that a new Subplot class does
-    not have to be created for every type of Axes.
-    """
-    if axes_class is None:
-        _api.warn_deprecated(
-            "3.3", message="Support for passing None to subplot_class_factory "
-            "is deprecated since %(since)s; explicitly pass the default Axes "
-            "class instead. This will become an error %(removal)s.")
-        axes_class = Axes
-    try:
-        # Avoid creating two different instances of GeoAxesSubplot...
-        # Only a temporary backcompat fix.  This should be removed in
-        # 3.4
-        return next(cls for cls in SubplotBase.__subclasses__()
-                    if cls.__bases__ == (SubplotBase, axes_class))
-    except StopIteration:
-        return type("%sSubplot" % axes_class.__name__,
-                    (SubplotBase, axes_class),
-                    {'_axes_class': axes_class})
-
-
+subplot_class_factory = cbook._make_class_factory(
+    SubplotBase, "{}Subplot", "_axes_class")
 Subplot = subplot_class_factory(Axes)  # Provided for backward compatibility.
-
-
-def _picklable_subplot_class_constructor(axes_class):
-    """
-    Stub factory that returns an empty instance of the appropriate subplot
-    class when called with an axes class. This is purely to allow pickling of
-    Axes and Subplots.
-    """
-    subplot_class = subplot_class_factory(axes_class)
-    return subplot_class.__new__(subplot_class)
-
-
-docstring.interpd.update(Axes_kwdoc=martist.kwdoc(Axes))
-docstring.dedent_interpd(Axes.__init__)
-
-docstring.interpd.update(Subplot_kwdoc=martist.kwdoc(Axes))
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
index c28d185057b8..66279bf1bc37 100644
--- a/lib/matplotlib/axis.py
+++ b/lib/matplotlib/axis.py
@@ -5,13 +5,14 @@
 import datetime
 import functools
 import logging
+from numbers import Number
 
 import numpy as np
 
 import matplotlib as mpl
-from matplotlib import _api
+from matplotlib import _api, cbook
 import matplotlib.artist as martist
-import matplotlib.cbook as cbook
+import matplotlib.colors as mcolors
 import matplotlib.lines as mlines
 import matplotlib.scale as mscale
 import matplotlib.text as mtext
@@ -54,30 +55,29 @@ class Tick(martist.Artist):
         The right/top tick label.
 
     """
-    @_api.delete_parameter("3.3", "label")
-    def __init__(self, axes, loc, label=None,
-                 size=None,  # points
-                 width=None,
-                 color=None,
-                 tickdir=None,
-                 pad=None,
-                 labelsize=None,
-                 labelcolor=None,
-                 zorder=None,
-                 gridOn=None,  # defaults to axes.grid depending on
-                               # axes.grid.which
-                 tick1On=True,
-                 tick2On=True,
-                 label1On=True,
-                 label2On=False,
-                 major=True,
-                 labelrotation=0,
-                 grid_color=None,
-                 grid_linestyle=None,
-                 grid_linewidth=None,
-                 grid_alpha=None,
-                 **kw  # Other Line2D kwargs applied to gridlines.
-                 ):
+    def __init__(
+        self, axes, loc, *,
+        size=None,  # points
+        width=None,
+        color=None,
+        tickdir=None,
+        pad=None,
+        labelsize=None,
+        labelcolor=None,
+        zorder=None,
+        gridOn=None,  # defaults to axes.grid depending on axes.grid.which
+        tick1On=True,
+        tick2On=True,
+        label1On=True,
+        label2On=False,
+        major=True,
+        labelrotation=0,
+        grid_color=None,
+        grid_linestyle=None,
+        grid_linewidth=None,
+        grid_alpha=None,
+        **kwargs,  # Other Line2D kwargs applied to gridlines.
+    ):
         """
         bbox is the Bound2D bounding box in display coords of the Axes
         loc is the tick location in data coords
@@ -144,11 +144,14 @@ def __init__(self, axes, loc, label=None,
             grid_linestyle = mpl.rcParams["grid.linestyle"]
         if grid_linewidth is None:
             grid_linewidth = mpl.rcParams["grid.linewidth"]
-        if grid_alpha is None:
+        if grid_alpha is None and not mcolors._has_alpha_channel(grid_color):
+            # alpha precedence: kwarg > color alpha > rcParams['grid.alpha']
+            # Note: only resolve to rcParams if the color does not have alpha
+            # otherwise `grid(color=(1, 1, 1, 0.5))` would work like
+            #   grid(color=(1, 1, 1, 0.5), alpha=rcParams['grid.alpha'])
+            # so the that the rcParams default would override color alpha.
             grid_alpha = mpl.rcParams["grid.alpha"]
-        grid_kw = {k[5:]: v for k, v in kw.items()}
-
-        self.apply_tickdir(tickdir)
+        grid_kw = {k[5:]: v for k, v in kwargs.items()}
 
         self.tick1line = mlines.Line2D(
             [], [],
@@ -170,22 +173,15 @@ def __init__(self, axes, loc, label=None,
             GRIDLINE_INTERPOLATION_STEPS
         self.label1 = mtext.Text(
             np.nan, np.nan,
-            fontsize=labelsize, color=labelcolor, visible=label1On)
+            fontsize=labelsize, color=labelcolor, visible=label1On,
+            rotation=self._labelrotation[1])
         self.label2 = mtext.Text(
             np.nan, np.nan,
-            fontsize=labelsize, color=labelcolor, visible=label2On)
-        for meth, attr in [("_get_tick1line", "tick1line"),
-                           ("_get_tick2line", "tick2line"),
-                           ("_get_gridline", "gridline"),
-                           ("_get_text1", "label1"),
-                           ("_get_text2", "label2")]:
-            overridden_method = _api.deprecate_method_override(
-                getattr(__class__, meth), self, since="3.3", message="Relying "
-                f"on {meth} to initialize Tick.{attr} is deprecated since "
-                f"%(since)s and will not work %(removal)s; please directly "
-                f"set the attribute in the subclass' __init__ instead.")
-            if overridden_method:
-                setattr(self, attr, overridden_method())
+            fontsize=labelsize, color=labelcolor, visible=label2On,
+            rotation=self._labelrotation[1])
+
+        self._apply_tickdir(tickdir)
+
         for artist in [self.tick1line, self.tick2line, self.gridline,
                        self.label1, self.label2]:
             self._set_artist_props(artist)
@@ -193,7 +189,7 @@ def __init__(self, axes, loc, label=None,
         self.update_position(loc)
 
     @property
-    @_api.deprecated("3.1", alternative="Tick.label1", pending=True)
+    @_api.deprecated("3.1", alternative="Tick.label1", removal="3.8")
     def label(self):
         return self.label1
 
@@ -209,21 +205,28 @@ def _set_labelrotation(self, labelrotation):
         _api.check_in_list(['auto', 'default'], labelrotation=mode)
         self._labelrotation = (mode, angle)
 
-    def apply_tickdir(self, tickdir):
+    def _apply_tickdir(self, tickdir):
         """Set tick direction.  Valid values are 'out', 'in', 'inout'."""
+        # This method is responsible for updating `_pad`, and, in subclasses,
+        # for setting the tick{1,2}line markers as well.  From the user
+        # perspective this should always be called though _apply_params, which
+        # further updates ticklabel positions using the new pads.
         if tickdir is None:
             tickdir = mpl.rcParams[f'{self.__name__}.direction']
         _api.check_in_list(['in', 'out', 'inout'], tickdir=tickdir)
         self._tickdir = tickdir
         self._pad = self._base_pad + self.get_tick_padding()
+
+    @_api.deprecated("3.5", alternative="`.Axis.set_tick_params`")
+    def apply_tickdir(self, tickdir):
+        self._apply_tickdir(tickdir)
         self.stale = True
-        # Subclass overrides should compute _tickmarkers as appropriate here.
 
     def get_tickdir(self):
         return self._tickdir
 
     def get_tick_padding(self):
-        """Get the length of the tick outside of the axes."""
+        """Get the length of the tick outside of the Axes."""
         padding = {
             'in': 0.0,
             'inout': 0.5,
@@ -242,6 +245,7 @@ def set_clip_path(self, clippath, transform=None):
         self.gridline.set_clip_path(clippath, transform)
         self.stale = True
 
+    @_api.deprecated("3.6")
     def get_pad_pixels(self):
         return self.figure.dpi * self._base_pad / 72
 
@@ -349,52 +353,50 @@ def get_view_interval(self):
         """
         raise NotImplementedError('Derived must override')
 
-    def _apply_params(self, **kw):
+    def _apply_params(self, **kwargs):
         for name, target in [("gridOn", self.gridline),
                              ("tick1On", self.tick1line),
                              ("tick2On", self.tick2line),
                              ("label1On", self.label1),
                              ("label2On", self.label2)]:
-            if name in kw:
-                target.set_visible(kw.pop(name))
-        if any(k in kw for k in ['size', 'width', 'pad', 'tickdir']):
-            self._size = kw.pop('size', self._size)
+            if name in kwargs:
+                target.set_visible(kwargs.pop(name))
+        if any(k in kwargs for k in ['size', 'width', 'pad', 'tickdir']):
+            self._size = kwargs.pop('size', self._size)
             # Width could be handled outside this block, but it is
             # convenient to leave it here.
-            self._width = kw.pop('width', self._width)
-            self._base_pad = kw.pop('pad', self._base_pad)
-            # apply_tickdir uses _size and _base_pad to make _pad,
-            # and also makes _tickmarkers.
-            self.apply_tickdir(kw.pop('tickdir', self._tickdir))
-            self.tick1line.set_marker(self._tickmarkers[0])
-            self.tick2line.set_marker(self._tickmarkers[1])
+            self._width = kwargs.pop('width', self._width)
+            self._base_pad = kwargs.pop('pad', self._base_pad)
+            # _apply_tickdir uses _size and _base_pad to make _pad, and also
+            # sets the ticklines markers.
+            self._apply_tickdir(kwargs.pop('tickdir', self._tickdir))
             for line in (self.tick1line, self.tick2line):
                 line.set_markersize(self._size)
                 line.set_markeredgewidth(self._width)
-            # _get_text1_transform uses _pad from apply_tickdir.
+            # _get_text1_transform uses _pad from _apply_tickdir.
             trans = self._get_text1_transform()[0]
             self.label1.set_transform(trans)
             trans = self._get_text2_transform()[0]
             self.label2.set_transform(trans)
-        tick_kw = {k: v for k, v in kw.items() if k in ['color', 'zorder']}
-        if 'color' in kw:
-            tick_kw['markeredgecolor'] = kw['color']
+        tick_kw = {k: v for k, v in kwargs.items() if k in ['color', 'zorder']}
+        if 'color' in kwargs:
+            tick_kw['markeredgecolor'] = kwargs['color']
         self.tick1line.set(**tick_kw)
         self.tick2line.set(**tick_kw)
         for k, v in tick_kw.items():
             setattr(self, '_' + k, v)
 
-        if 'labelrotation' in kw:
-            self._set_labelrotation(kw.pop('labelrotation'))
+        if 'labelrotation' in kwargs:
+            self._set_labelrotation(kwargs.pop('labelrotation'))
             self.label1.set(rotation=self._labelrotation[1])
             self.label2.set(rotation=self._labelrotation[1])
 
-        label_kw = {k[5:]: v for k, v in kw.items()
+        label_kw = {k[5:]: v for k, v in kwargs.items()
                     if k in ['labelsize', 'labelcolor']}
         self.label1.set(**label_kw)
         self.label2.set(**label_kw)
 
-        grid_kw = {k[5:]: v for k, v in kw.items()
+        grid_kw = {k[5:]: v for k, v in kwargs.items()
                    if k in _gridline_param_names}
         self.gridline.set(**grid_kw)
 
@@ -419,20 +421,13 @@ class XTick(Tick):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         # x in data coords, y in axes coords
+        ax = self.axes
         self.tick1line.set(
-            xdata=[0], ydata=[0],
-            transform=self.axes.get_xaxis_transform(which="tick1"),
-            marker=self._tickmarkers[0],
-        )
+            data=([0], [0]), transform=ax.get_xaxis_transform("tick1"))
         self.tick2line.set(
-            xdata=[0], ydata=[1],
-            transform=self.axes.get_xaxis_transform(which="tick2"),
-            marker=self._tickmarkers[1],
-        )
+            data=([0], [1]), transform=ax.get_xaxis_transform("tick2"))
         self.gridline.set(
-            xdata=[0, 0], ydata=[0, 1],
-            transform=self.axes.get_xaxis_transform(which="grid"),
-        )
+            data=([0, 0], [0, 1]), transform=ax.get_xaxis_transform("grid"))
         # the y loc is 3 points below the min of y axis
         trans, va, ha = self._get_text1_transform()
         self.label1.set(
@@ -451,15 +446,16 @@ def _get_text1_transform(self):
     def _get_text2_transform(self):
         return self.axes.get_xaxis_text2_transform(self._pad)
 
-    def apply_tickdir(self, tickdir):
+    def _apply_tickdir(self, tickdir):
         # docstring inherited
-        super().apply_tickdir(tickdir)
-        self._tickmarkers = {
+        super()._apply_tickdir(tickdir)
+        mark1, mark2 = {
             'out': (mlines.TICKDOWN, mlines.TICKUP),
             'in': (mlines.TICKUP, mlines.TICKDOWN),
             'inout': ('|', '|'),
         }[self._tickdir]
-        self.stale = True
+        self.tick1line.set_marker(mark1)
+        self.tick2line.set_marker(mark2)
 
     def update_position(self, loc):
         """Set the location of tick in data coords with scalar *loc*."""
@@ -486,20 +482,13 @@ class YTick(Tick):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         # x in axes coords, y in data coords
+        ax = self.axes
         self.tick1line.set(
-            xdata=[0], ydata=[0],
-            transform=self.axes.get_yaxis_transform(which="tick1"),
-            marker=self._tickmarkers[0],
-        )
+            data=([0], [0]), transform=ax.get_yaxis_transform("tick1"))
         self.tick2line.set(
-            xdata=[1], ydata=[0],
-            transform=self.axes.get_yaxis_transform(which="tick2"),
-            marker=self._tickmarkers[1],
-        )
+            data=([1], [0]), transform=ax.get_yaxis_transform("tick2"))
         self.gridline.set(
-            xdata=[0, 1], ydata=[0, 0],
-            transform=self.axes.get_yaxis_transform(which="grid"),
-        )
+            data=([0, 1], [0, 0]), transform=ax.get_yaxis_transform("grid"))
         # the y loc is 3 points below the min of y axis
         trans, va, ha = self._get_text1_transform()
         self.label1.set(
@@ -518,15 +507,16 @@ def _get_text1_transform(self):
     def _get_text2_transform(self):
         return self.axes.get_yaxis_text2_transform(self._pad)
 
-    def apply_tickdir(self, tickdir):
+    def _apply_tickdir(self, tickdir):
         # docstring inherited
-        super().apply_tickdir(tickdir)
-        self._tickmarkers = {
+        super()._apply_tickdir(tickdir)
+        mark1, mark2 = {
             'out': (mlines.TICKLEFT, mlines.TICKRIGHT),
             'in': (mlines.TICKRIGHT, mlines.TICKLEFT),
             'inout': ('_', '_'),
         }[self._tickdir]
-        self.stale = True
+        self.tick1line.set_marker(mark1)
+        self.tick2line.set_marker(mark2)
 
     def update_position(self, loc):
         """Set the location of tick in data coords with scalar *loc*."""
@@ -558,6 +548,8 @@ class Ticker:
     def __init__(self):
         self._locator = None
         self._formatter = None
+        self._locator_is_default = True
+        self._formatter_is_default = True
 
     @property
     def locator(self):
@@ -645,11 +637,15 @@ class Axis(martist.Artist):
         The minor ticks.
     """
     OFFSETTEXTPAD = 3
+    # The class used in _get_tick() to create tick instances. Must either be
+    # overwritten in subclasses, or subclasses must reimplement _get_tick().
+    _tick_class = None
 
     def __str__(self):
         return "{}({},{})".format(
             type(self).__name__, *self.axes.transAxes.transform((0, 0)))
 
+    @_api.make_keyword_only("3.6", name="pickradius")
     def __init__(self, axes, pickradius=15):
         """
         Parameters
@@ -670,7 +666,8 @@ def __init__(self, axes, pickradius=15):
         self.axes = axes
         self.major = Ticker()
         self.minor = Ticker()
-        self.callbacks = cbook.CallbackRegistry()
+        self.callbacks = cbook.CallbackRegistry(
+            signals=["units", "units finalize"])
 
         self._autolabelpos = True
 
@@ -693,7 +690,39 @@ def __init__(self, axes, pickradius=15):
         self._minor_tick_kw = dict()
 
         self.clear()
-        self._set_scale('linear')
+        self._autoscale_on = True
+
+    @property
+    def isDefault_majloc(self):
+        return self.major._locator_is_default
+
+    @isDefault_majloc.setter
+    def isDefault_majloc(self, value):
+        self.major._locator_is_default = value
+
+    @property
+    def isDefault_majfmt(self):
+        return self.major._formatter_is_default
+
+    @isDefault_majfmt.setter
+    def isDefault_majfmt(self, value):
+        self.major._formatter_is_default = value
+
+    @property
+    def isDefault_minloc(self):
+        return self.minor._locator_is_default
+
+    @isDefault_minloc.setter
+    def isDefault_minloc(self, value):
+        self.minor._locator_is_default = value
+
+    @property
+    def isDefault_minfmt(self):
+        return self.minor._formatter_is_default
+
+    @isDefault_minfmt.setter
+    def isDefault_minfmt(self, value):
+        self.minor._formatter_is_default = value
 
     # During initialization, Axis objects often create ticks that are later
     # unused; this turns out to be a very slow step.  Instead, use a custom
@@ -751,13 +780,84 @@ def _set_scale(self, value, **kwargs):
         self.isDefault_majfmt = True
         self.isDefault_minfmt = True
 
+    # This method is directly wrapped by Axes.set_{x,y}scale.
+    def _set_axes_scale(self, value, **kwargs):
+        """
+        Set this Axis' scale.
+
+        Parameters
+        ----------
+        value : {"linear", "log", "symlog", "logit", ...} or `.ScaleBase`
+            The axis scale type to apply.
+
+        **kwargs
+            Different keyword arguments are accepted, depending on the scale.
+            See the respective class keyword arguments:
+
+            - `matplotlib.scale.LinearScale`
+            - `matplotlib.scale.LogScale`
+            - `matplotlib.scale.SymmetricalLogScale`
+            - `matplotlib.scale.LogitScale`
+            - `matplotlib.scale.FuncScale`
+
+        Notes
+        -----
+        By default, Matplotlib supports the above mentioned scales.
+        Additionally, custom scales may be registered using
+        `matplotlib.scale.register_scale`. These scales can then also
+        be used here.
+        """
+        name, = [name for name, axis in self.axes._axis_map.items()
+                 if axis is self]  # The axis name.
+        old_default_lims = (self.get_major_locator()
+                            .nonsingular(-np.inf, np.inf))
+        g = self.axes._shared_axes[name]
+        for ax in g.get_siblings(self.axes):
+            ax._axis_map[name]._set_scale(value, **kwargs)
+            ax._update_transScale()
+            ax.stale = True
+        new_default_lims = (self.get_major_locator()
+                            .nonsingular(-np.inf, np.inf))
+        if old_default_lims != new_default_lims:
+            # Force autoscaling now, to take advantage of the scale locator's
+            # nonsingular() before it possibly gets swapped out by the user.
+            self.axes.autoscale_view(
+                **{f"scale{k}": k == name for k in self.axes._axis_names})
+
     def limit_range_for_scale(self, vmin, vmax):
         return self._scale.limit_range_for_scale(vmin, vmax, self.get_minpos())
 
+    def _get_autoscale_on(self):
+        """Return whether this Axis is autoscaled."""
+        return self._autoscale_on
+
+    def _set_autoscale_on(self, b):
+        """
+        Set whether this Axis is autoscaled when drawing or by
+        `.Axes.autoscale_view`.
+
+        Parameters
+        ----------
+        b : bool
+        """
+        self._autoscale_on = b
+
     def get_children(self):
         return [self.label, self.offsetText,
                 *self.get_major_ticks(), *self.get_minor_ticks()]
 
+    def _reset_major_tick_kw(self):
+        self._major_tick_kw.clear()
+        self._major_tick_kw['gridOn'] = (
+                mpl.rcParams['axes.grid'] and
+                mpl.rcParams['axes.grid.which'] in ('both', 'major'))
+
+    def _reset_minor_tick_kw(self):
+        self._minor_tick_kw.clear()
+        self._minor_tick_kw['gridOn'] = (
+                mpl.rcParams['axes.grid'] and
+                mpl.rcParams['axes.grid.which'] in ('both', 'minor'))
+
     def clear(self):
         """
         Clear the axis.
@@ -777,7 +877,8 @@ def clear(self):
         self._set_scale('linear')
 
         # Clear the callback registry for this axis, or it may "leak"
-        self.callbacks = cbook.CallbackRegistry()
+        self.callbacks = cbook.CallbackRegistry(
+            signals=["units", "units finalize"])
 
         # whether the grids are on
         self._major_tick_kw['gridOn'] = (
@@ -786,7 +887,6 @@ def clear(self):
         self._minor_tick_kw['gridOn'] = (
                 mpl.rcParams['axes.grid'] and
                 mpl.rcParams['axes.grid.which'] in ('both', 'minor'))
-
         self.reset_ticks()
 
         self.converter = None
@@ -794,11 +894,6 @@ def clear(self):
         self.set_units(None)
         self.stale = True
 
-    @_api.deprecated("3.4", alternative="Axis.clear()")
-    def cla(self):
-        """Clear this axis."""
-        return self.clear()
-
     def reset_ticks(self):
         """
         Re-initialize the major and minor Tick lists.
@@ -819,7 +914,7 @@ def reset_ticks(self):
         except AttributeError:
             pass
 
-    def set_tick_params(self, which='major', reset=False, **kw):
+    def set_tick_params(self, which='major', reset=False, **kwargs):
         """
         Set appearance parameters for ticks, ticklabels, and gridlines.
 
@@ -827,16 +922,16 @@ def set_tick_params(self, which='major', reset=False, **kw):
         :meth:`matplotlib.axes.Axes.tick_params`.
         """
         _api.check_in_list(['major', 'minor', 'both'], which=which)
-        kwtrans = self._translate_tick_kw(kw)
+        kwtrans = self._translate_tick_params(kwargs)
 
         # the kwargs are stored in self._major/minor_tick_kw so that any
         # future new ticks will automatically get them
         if reset:
             if which in ['major', 'both']:
-                self._major_tick_kw.clear()
+                self._reset_major_tick_kw()
                 self._major_tick_kw.update(kwtrans)
             if which in ['minor', 'both']:
-                self._minor_tick_kw.clear()
+                self._reset_minor_tick_kw()
                 self._minor_tick_kw.update(kwtrans)
             self.reset_ticks()
         else:
@@ -859,47 +954,56 @@ def set_tick_params(self, which='major', reset=False, **kw):
         self.stale = True
 
     @staticmethod
-    def _translate_tick_kw(kw):
+    def _translate_tick_params(kw):
+        """
+        Translate the kwargs supported by `.Axis.set_tick_params` to kwargs
+        supported by `.Tick._apply_params`.
+
+        In particular, this maps axis specific names like 'top', 'left'
+        to the generic tick1, tick2 logic of the axis. Additionally, there
+        are some other name translations.
+
+        Returns a new dict of translated kwargs.
+
+        Note: The input *kwargs* are currently modified, but that's ok for
+        the only caller.
+        """
         # The following lists may be moved to a more accessible location.
-        kwkeys = ['size', 'width', 'color', 'tickdir', 'pad',
-                  'labelsize', 'labelcolor', 'zorder', 'gridOn',
-                  'tick1On', 'tick2On', 'label1On', 'label2On',
-                  'length', 'direction', 'left', 'bottom', 'right', 'top',
-                  'labelleft', 'labelbottom', 'labelright', 'labeltop',
-                  'labelrotation'] + _gridline_param_names
-        kwtrans = {}
-        if 'length' in kw:
-            kwtrans['size'] = kw.pop('length')
-        if 'direction' in kw:
-            kwtrans['tickdir'] = kw.pop('direction')
-        if 'rotation' in kw:
-            kwtrans['labelrotation'] = kw.pop('rotation')
-        if 'left' in kw:
-            kwtrans['tick1On'] = kw.pop('left')
-        if 'bottom' in kw:
-            kwtrans['tick1On'] = kw.pop('bottom')
-        if 'right' in kw:
-            kwtrans['tick2On'] = kw.pop('right')
-        if 'top' in kw:
-            kwtrans['tick2On'] = kw.pop('top')
-        if 'labelleft' in kw:
-            kwtrans['label1On'] = kw.pop('labelleft')
-        if 'labelbottom' in kw:
-            kwtrans['label1On'] = kw.pop('labelbottom')
-        if 'labelright' in kw:
-            kwtrans['label2On'] = kw.pop('labelright')
-        if 'labeltop' in kw:
-            kwtrans['label2On'] = kw.pop('labeltop')
+        allowed_keys = [
+            'size', 'width', 'color', 'tickdir', 'pad',
+            'labelsize', 'labelcolor', 'zorder', 'gridOn',
+            'tick1On', 'tick2On', 'label1On', 'label2On',
+            'length', 'direction', 'left', 'bottom', 'right', 'top',
+            'labelleft', 'labelbottom', 'labelright', 'labeltop',
+            'labelrotation',
+            *_gridline_param_names]
+
+        keymap = {
+            # tick_params key -> axis key
+            'length': 'size',
+            'direction': 'tickdir',
+            'rotation': 'labelrotation',
+            'left': 'tick1On',
+            'bottom': 'tick1On',
+            'right': 'tick2On',
+            'top': 'tick2On',
+            'labelleft': 'label1On',
+            'labelbottom': 'label1On',
+            'labelright': 'label2On',
+            'labeltop': 'label2On',
+        }
+        kwtrans = {newkey: kw.pop(oldkey)
+                   for oldkey, newkey in keymap.items() if oldkey in kw}
         if 'colors' in kw:
             c = kw.pop('colors')
             kwtrans['color'] = c
             kwtrans['labelcolor'] = c
         # Maybe move the checking up to the caller of this method.
         for key in kw:
-            if key not in kwkeys:
+            if key not in allowed_keys:
                 raise ValueError(
                     "keyword %s is not recognized; valid keywords are %s"
-                    % (key, kwkeys))
+                    % (key, allowed_keys))
         kwtrans.update(kw)
         return kwtrans
 
@@ -910,7 +1014,7 @@ def set_clip_path(self, clippath, transform=None):
         self.stale = True
 
     def get_view_interval(self):
-        """Return the view limits ``(min, max)`` of this axis."""
+        """Return the ``(min, max)`` view limits of this axis."""
         raise NotImplementedError('Derived must override')
 
     def set_view_interval(self, vmin, vmax, ignore=False):
@@ -929,7 +1033,7 @@ def set_view_interval(self, vmin, vmax, ignore=False):
         raise NotImplementedError('Derived must override')
 
     def get_data_interval(self):
-        """Return the Interval instance for this axis data limits."""
+        """Return the ``(min, max)`` data limits of this axis."""
         raise NotImplementedError('Derived must override')
 
     def set_data_interval(self, vmin, vmax, ignore=False):
@@ -965,10 +1069,9 @@ def set_inverted(self, inverted):
         the top for the y-axis; the "inverse" direction is increasing to the
         left for the x-axis and to the bottom for the y-axis.
         """
-        # Currently, must be implemented in subclasses using set_xlim/set_ylim
-        # rather than generically using set_view_interval, so that shared
-        # axes get updated as well.
-        raise NotImplementedError('Derived must override')
+        a, b = self.get_view_interval()
+        # cast to bool to avoid bad interaction between python 3.8 and np.bool_
+        self._set_lim(*sorted((a, b), reverse=bool(inverted)), auto=None)
 
     def set_default_intervals(self):
         """
@@ -982,32 +1085,102 @@ def set_default_intervals(self):
         # interface provides a hook for custom types to register
         # default limits through the AxisInfo.default_limits
         # attribute, and the derived code below will check for that
-        # and use it if is available (else just use 0..1)
+        # and use it if it's available (else just use 0..1)
+
+    def _set_lim(self, v0, v1, *, emit=True, auto):
+        """
+        Set view limits.
+
+        This method is a helper for the Axes ``set_xlim``, ``set_ylim``, and
+        ``set_zlim`` methods.
+
+        Parameters
+        ----------
+        v0, v1 : float
+            The view limits.  (Passing *v0* as a (low, high) pair is not
+            supported; normalization must occur in the Axes setters.)
+        emit : bool, default: True
+            Whether to notify observers of limit change.
+        auto : bool or None, default: False
+            Whether to turn on autoscaling of the x-axis. True turns on, False
+            turns off, None leaves unchanged.
+        """
+        name, = [name for name, axis in self.axes._axis_map.items()
+                 if axis is self]  # The axis name.
+
+        self.axes._process_unit_info([(name, (v0, v1))], convert=False)
+        v0 = self.axes._validate_converted_limits(v0, self.convert_units)
+        v1 = self.axes._validate_converted_limits(v1, self.convert_units)
+
+        if v0 is None or v1 is None:
+            # Axes init calls set_xlim(0, 1) before get_xlim() can be called,
+            # so only grab the limits if we really need them.
+            old0, old1 = self.get_view_interval()
+            if v0 is None:
+                v0 = old0
+            if v1 is None:
+                v1 = old1
+
+        if self.get_scale() == 'log' and (v0 <= 0 or v1 <= 0):
+            # Axes init calls set_xlim(0, 1) before get_xlim() can be called,
+            # so only grab the limits if we really need them.
+            old0, old1 = self.get_view_interval()
+            if v0 <= 0:
+                _api.warn_external(f"Attempt to set non-positive {name}lim on "
+                                   f"a log-scaled axis will be ignored.")
+                v0 = old0
+            if v1 <= 0:
+                _api.warn_external(f"Attempt to set non-positive {name}lim on "
+                                   f"a log-scaled axis will be ignored.")
+                v1 = old1
+        if v0 == v1:
+            _api.warn_external(
+                f"Attempting to set identical low and high {name}lims "
+                f"makes transformation singular; automatically expanding.")
+        reverse = bool(v0 > v1)  # explicit cast needed for python3.8+np.bool_.
+        v0, v1 = self.get_major_locator().nonsingular(v0, v1)
+        v0, v1 = self.limit_range_for_scale(v0, v1)
+        v0, v1 = sorted([v0, v1], reverse=bool(reverse))
+
+        self.set_view_interval(v0, v1, ignore=True)
+        # Mark viewlims as no longer stale without triggering an autoscale.
+        for ax in self.axes._shared_axes[name].get_siblings(self.axes):
+            ax._stale_viewlims[name] = False
+        if auto is not None:
+            self._set_autoscale_on(bool(auto))
+
+        if emit:
+            self.axes.callbacks.process(f"{name}lim_changed", self.axes)
+            # Call all of the other axes that are shared with this one
+            for other in self.axes._shared_axes[name].get_siblings(self.axes):
+                if other is not self.axes:
+                    other._axis_map[name]._set_lim(
+                        v0, v1, emit=False, auto=auto)
+                    if other.figure != self.figure:
+                        other.figure.canvas.draw_idle()
+
+        self.stale = True
+        return v0, v1
 
     def _set_artist_props(self, a):
         if a is None:
             return
         a.set_figure(self.figure)
 
+    @_api.deprecated("3.6")
     def get_ticklabel_extents(self, renderer):
-        """
-        Get the extents of the tick labels on either side
-        of the axes.
-        """
-
+        """Get the extents of the tick labels on either side of the axes."""
         ticks_to_draw = self._update_ticks()
-        ticklabelBoxes, ticklabelBoxes2 = self._get_tick_bboxes(ticks_to_draw,
-                                                                renderer)
-
-        if len(ticklabelBoxes):
-            bbox = mtransforms.Bbox.union(ticklabelBoxes)
+        tlb1, tlb2 = self._get_ticklabel_bboxes(ticks_to_draw, renderer)
+        if len(tlb1):
+            bbox1 = mtransforms.Bbox.union(tlb1)
         else:
-            bbox = mtransforms.Bbox.from_extents(0, 0, 0, 0)
-        if len(ticklabelBoxes2):
-            bbox2 = mtransforms.Bbox.union(ticklabelBoxes2)
+            bbox1 = mtransforms.Bbox.from_extents(0, 0, 0, 0)
+        if len(tlb2):
+            bbox2 = mtransforms.Bbox.union(tlb2)
         else:
             bbox2 = mtransforms.Bbox.from_extents(0, 0, 0, 0)
-        return bbox, bbox2
+        return bbox1, bbox2
 
     def _update_ticks(self):
         """
@@ -1052,14 +1225,16 @@ def _update_ticks(self):
 
         return ticks_to_draw
 
-    def _get_tick_bboxes(self, ticks, renderer):
+    def _get_ticklabel_bboxes(self, ticks, renderer=None):
         """Return lists of bboxes for ticks' label1's and label2's."""
+        if renderer is None:
+            renderer = self.figure._get_renderer()
         return ([tick.label1.get_window_extent(renderer)
                  for tick in ticks if tick.label1.get_visible()],
                 [tick.label2.get_window_extent(renderer)
                  for tick in ticks if tick.label2.get_visible()])
 
-    def get_tightbbox(self, renderer, *, for_layout_only=False):
+    def get_tightbbox(self, renderer=None, *, for_layout_only=False):
         """
         Return a bounding box that encloses the axis. It only accounts
         tick labels, axis label, and offsetText.
@@ -1071,24 +1246,23 @@ def get_tightbbox(self, renderer, *, for_layout_only=False):
         """
         if not self.get_visible():
             return
-
+        if renderer is None:
+            renderer = self.figure._get_renderer()
         ticks_to_draw = self._update_ticks()
 
         self._update_label_position(renderer)
 
         # go back to just this axis's tick labels
-        ticklabelBoxes, ticklabelBoxes2 = self._get_tick_bboxes(
-                    ticks_to_draw, renderer)
+        tlb1, tlb2 = self._get_ticklabel_bboxes(ticks_to_draw, renderer)
 
-        self._update_offset_text_position(ticklabelBoxes, ticklabelBoxes2)
+        self._update_offset_text_position(tlb1, tlb2)
         self.offsetText.set_text(self.major.formatter.get_offset())
 
         bboxes = [
             *(a.get_window_extent(renderer)
               for a in [self.offsetText]
               if a.get_visible()),
-            *ticklabelBoxes,
-            *ticklabelBoxes2,
+            *tlb1, *tlb2,
         ]
         # take care of label
         if self.label.get_visible():
@@ -1128,22 +1302,20 @@ def draw(self, renderer, *args, **kwargs):
         renderer.open_group(__name__, gid=self.get_gid())
 
         ticks_to_draw = self._update_ticks()
-        ticklabelBoxes, ticklabelBoxes2 = self._get_tick_bboxes(ticks_to_draw,
-                                                                renderer)
+        tlb1, tlb2 = self._get_ticklabel_bboxes(ticks_to_draw, renderer)
 
         for tick in ticks_to_draw:
             tick.draw(renderer)
 
-        # scale up the axis label box to also find the neighbors, not
-        # just the tick labels that actually overlap note we need a
-        # *copy* of the axis label box because we don't want to scale
-        # the actual bbox
+        # Scale up the axis label box to also find the neighbors, not just the
+        # tick labels that actually overlap.  We need a *copy* of the axis
+        # label box because we don't want to scale the actual bbox.
 
         self._update_label_position(renderer)
 
         self.label.draw(renderer)
 
-        self._update_offset_text_position(ticklabelBoxes, ticklabelBoxes2)
+        self._update_offset_text_position(tlb1, tlb2)
         self.offsetText.set_text(self.major.formatter.get_offset())
         self.offsetText.draw(renderer)
 
@@ -1166,10 +1338,11 @@ def get_offset_text(self):
 
     def get_pickradius(self):
         """Return the depth of the axis used by the picker."""
-        return self.pickradius
+        return self._pickradius
 
     def get_majorticklabels(self):
         """Return this Axis' major tick labels, as a list of `~.text.Text`."""
+        self._update_ticks()
         ticks = self.get_major_ticks()
         labels1 = [tick.label1 for tick in ticks if tick.label1.get_visible()]
         labels2 = [tick.label2 for tick in ticks if tick.label2.get_visible()]
@@ -1177,6 +1350,7 @@ def get_majorticklabels(self):
 
     def get_minorticklabels(self):
         """Return this Axis' minor tick labels, as a list of `~.text.Text`."""
+        self._update_ticks()
         ticks = self.get_minor_ticks()
         labels1 = [tick.label1 for tick in ticks if tick.label1.get_visible()]
         labels2 = [tick.label2 for tick in ticks if tick.label2.get_visible()]
@@ -1199,13 +1373,6 @@ def get_ticklabels(self, minor=False, which=None):
         Returns
         -------
         list of `~matplotlib.text.Text`
-
-        Notes
-        -----
-        The tick label strings are not populated until a ``draw`` method has
-        been called.
-
-        See also: `~.pyplot.draw` and `~.FigureCanvasBase.draw`.
         """
         if which is not None:
             if which == 'minor':
@@ -1251,24 +1418,38 @@ def get_majorticklocs(self):
     def get_minorticklocs(self):
         """Return this Axis' minor tick locations in data coordinates."""
         # Remove minor ticks duplicating major ticks.
-        major_locs = self.major.locator()
-        minor_locs = self.minor.locator()
-        transform = self._scale.get_transform()
-        tr_minor_locs = transform.transform(minor_locs)
-        tr_major_locs = transform.transform(major_locs)
-        lo, hi = sorted(transform.transform(self.get_view_interval()))
-        # Use the transformed view limits as scale.  1e-5 is the default rtol
-        # for np.isclose.
-        tol = (hi - lo) * 1e-5
+        minor_locs = np.asarray(self.minor.locator())
         if self.remove_overlapping_locs:
-            minor_locs = [
-                loc for loc, tr_loc in zip(minor_locs, tr_minor_locs)
-                if ~np.isclose(tr_loc, tr_major_locs, atol=tol, rtol=0).any()]
+            major_locs = self.major.locator()
+            transform = self._scale.get_transform()
+            tr_minor_locs = transform.transform(minor_locs)
+            tr_major_locs = transform.transform(major_locs)
+            lo, hi = sorted(transform.transform(self.get_view_interval()))
+            # Use the transformed view limits as scale.  1e-5 is the default
+            # rtol for np.isclose.
+            tol = (hi - lo) * 1e-5
+            mask = np.isclose(tr_minor_locs[:, None], tr_major_locs[None, :],
+                              atol=tol, rtol=0).any(axis=1)
+            minor_locs = minor_locs[~mask]
         return minor_locs
 
-    @_api.make_keyword_only("3.3", "minor")
-    def get_ticklocs(self, minor=False):
-        """Return this Axis' tick locations in data coordinates."""
+    def get_ticklocs(self, *, minor=False):
+        """
+        Return this Axis' tick locations in data coordinates.
+
+        The locations are not clipped to the current axis limits and hence
+        may contain locations that are not visible in the output.
+
+        Parameters
+        ----------
+        minor : bool, default: False
+            True to return the minor tick directions,
+            False to return the major tick directions.
+
+        Returns
+        -------
+        numpy array of tick locations
+        """
         return self.get_minorticklocs() if minor else self.get_majorticklocs()
 
     def get_ticks_direction(self, minor=False):
@@ -1294,7 +1475,12 @@ def get_ticks_direction(self, minor=False):
 
     def _get_tick(self, major):
         """Return the default tick instance."""
-        raise NotImplementedError('derived must override')
+        if self._tick_class is None:
+            raise NotImplementedError(
+                f"The Axis subclass {self.__class__.__name__} must define "
+                "_tick_class or reimplement _get_tick()")
+        tick_kw = self._major_tick_kw if major else self._minor_tick_kw
+        return self._tick_class(self.axes, 0, major=major, **tick_kw)
 
     def _get_tick_label_size(self, axis_name):
         """
@@ -1364,17 +1550,18 @@ def get_minor_ticks(self, numticks=None):
 
         return self.minorTicks[:numticks]
 
-    def grid(self, b=None, which='major', **kwargs):
+    @_api.rename_parameter("3.5", "b", "visible")
+    def grid(self, visible=None, which='major', **kwargs):
         """
         Configure the grid lines.
 
         Parameters
         ----------
-        b : bool or None
-            Whether to show the grid lines. If any *kwargs* are supplied,
-            it is assumed you want the grid on and *b* will be set to True.
+        visible : bool or None
+            Whether to show the grid lines.  If any *kwargs* are supplied, it
+            is assumed you want the grid on and *visible* will be set to True.
 
-            If *b* is *None* and there are no *kwargs*, this toggles the
+            If *visible* is *None* and there are no *kwargs*, this toggles the
             visibility of the lines.
 
         which : {'major', 'minor', 'both'}
@@ -1385,35 +1572,24 @@ def grid(self, b=None, which='major', **kwargs):
 
                 grid(color='r', linestyle='-', linewidth=2)
         """
-        if b is not None:
-            if 'visible' in kwargs and bool(b) != bool(kwargs['visible']):
-                raise ValueError(
-                    "'b' and 'visible' specify inconsistent grid visibilities")
-            if kwargs and not b:  # something false-like but not None
+        if kwargs:
+            if visible is None:
+                visible = True
+            elif not visible:  # something false-like but not None
                 _api.warn_external('First parameter to grid() is false, '
                                    'but line properties are supplied. The '
                                    'grid will be enabled.')
-                b = True
+                visible = True
         which = which.lower()
         _api.check_in_list(['major', 'minor', 'both'], which=which)
-        gridkw = {'grid_' + item[0]: item[1] for item in kwargs.items()}
-        if 'grid_visible' in gridkw:
-            forced_visibility = True
-            gridkw['gridOn'] = gridkw.pop('grid_visible')
-        else:
-            forced_visibility = False
-
+        gridkw = {f'grid_{name}': value for name, value in kwargs.items()}
         if which in ['minor', 'both']:
-            if b is None and not forced_visibility:
-                gridkw['gridOn'] = not self._minor_tick_kw['gridOn']
-            elif b is not None:
-                gridkw['gridOn'] = b
+            gridkw['gridOn'] = (not self._minor_tick_kw['gridOn']
+                                if visible is None else visible)
             self.set_tick_params(which='minor', **gridkw)
         if which in ['major', 'both']:
-            if b is None and not forced_visibility:
-                gridkw['gridOn'] = not self._major_tick_kw['gridOn']
-            elif b is not None:
-                gridkw['gridOn'] = b
+            gridkw['gridOn'] = (not self._major_tick_kw['gridOn']
+                                if visible is None else visible)
             self.set_tick_params(which='major', **gridkw)
         self.stale = True
 
@@ -1433,7 +1609,7 @@ def update_units(self, data):
         if default is not None and self.units is None:
             self.set_units(default)
 
-        if neednew:
+        elif neednew:
             self._update_axisinfo()
         self.stale = True
         return True
@@ -1506,16 +1682,13 @@ def set_units(self, u):
         """
         if u == self.units:
             return
-        if self is self.axes.xaxis:
-            shared = [
-                ax.xaxis
-                for ax in self.axes.get_shared_x_axes().get_siblings(self.axes)
-            ]
-        elif self is self.axes.yaxis:
-            shared = [
-                ax.yaxis
-                for ax in self.axes.get_shared_y_axes().get_siblings(self.axes)
-            ]
+        for name, axis in self.axes._axis_map.items():
+            if self is axis:
+                shared = [
+                    getattr(ax, f"{name}axis")
+                    for ax
+                    in self.axes._shared_axes[name].get_siblings(self.axes)]
+                break
         else:
             shared = [self]
         for axis in shared:
@@ -1654,23 +1827,37 @@ def set_pickradius(self, pickradius):
 
         Parameters
         ----------
-        pickradius :  float
+        pickradius : float
+            The acceptance radius for containment tests.
+            See also `.Axis.contains`.
         """
-        self.pickradius = pickradius
+        if not isinstance(pickradius, Number) or pickradius < 0:
+            raise ValueError("pick radius should be a distance")
+        self._pickradius = pickradius
+
+    pickradius = property(
+        get_pickradius, set_pickradius, doc="The acceptance radius for "
+        "containment tests. See also `.Axis.contains`.")
 
-    # Helper for set_ticklabels. Defining it here makes it pickleable.
+    # Helper for set_ticklabels. Defining it here makes it picklable.
     @staticmethod
     def _format_with_dict(tickd, x, pos):
         return tickd.get(x, "")
 
     def set_ticklabels(self, ticklabels, *, minor=False, **kwargs):
         r"""
-        Set the text values of the tick labels.
+        [*Discouraged*] Set the text values of the tick labels.
 
-        .. warning::
-            This method should only be used after fixing the tick positions
-            using `.Axis.set_ticks`. Otherwise, the labels may end up in
-            unexpected positions.
+        .. admonition:: Discouraged
+
+            The use of this method is discouraged, because of the dependency
+            on tick positions. In most cases, you'll want to use
+            ``set_[x/y]ticks(positions, labels)`` instead.
+
+            If you are using this method, you should always fix the tick
+            positions before, e.g. by using `.Axis.set_ticks` or by explicitly
+            setting a `~.ticker.FixedLocator`. Otherwise, ticks are free to
+            move and the labels may end up in unexpected positions.
 
         Parameters
         ----------
@@ -1689,8 +1876,11 @@ def set_ticklabels(self, ticklabels, *, minor=False, **kwargs):
             For each tick, includes ``tick.label1`` if it is visible, then
             ``tick.label2`` if it is visible, in that order.
         """
-        ticklabels = [t.get_text() if hasattr(t, 'get_text') else t
-                      for t in ticklabels]
+        try:
+            ticklabels = [t.get_text() if hasattr(t, 'get_text') else t
+                          for t in ticklabels]
+        except TypeError:
+            raise TypeError(f"{ticklabels:=} must be a sequence") from None
         locator = (self.get_minor_locator() if minor
                    else self.get_major_locator())
         if isinstance(locator, mticker.FixedLocator):
@@ -1723,10 +1913,10 @@ def set_ticklabels(self, ticklabels, *, minor=False, **kwargs):
             tick_label = formatter(loc, pos)
             # deal with label1
             tick.label1.set_text(tick_label)
-            tick.label1.update(kwargs)
+            tick.label1._internal_update(kwargs)
             # deal with label2
             tick.label2.set_text(tick_label)
-            tick.label2.update(kwargs)
+            tick.label2._internal_update(kwargs)
             # only return visible tick labels
             if tick.label1.get_visible():
                 ret.append(tick.label1)
@@ -1738,8 +1928,7 @@ def set_ticklabels(self, ticklabels, *, minor=False, **kwargs):
 
     # Wrapper around set_ticklabels used to generate Axes.set_x/ytickabels; can
     # go away once the API of Axes.set_x/yticklabels becomes consistent.
-    @_api.make_keyword_only("3.3", "fontdict")
-    def _set_ticklabels(self, labels, fontdict=None, minor=False, **kwargs):
+    def _set_ticklabels(self, labels, *, fontdict=None, minor=False, **kwargs):
         """
         Set this Axis' labels with list of string labels.
 
@@ -1767,7 +1956,7 @@ def _set_ticklabels(self, labels, fontdict=None, minor=False, **kwargs):
 
         Returns
         -------
-        list of `~.Text`
+        list of `.Text`
             The labels.
 
         Other Parameters
@@ -1778,9 +1967,35 @@ def _set_ticklabels(self, labels, fontdict=None, minor=False, **kwargs):
             kwargs.update(fontdict)
         return self.set_ticklabels(labels, minor=minor, **kwargs)
 
-    def set_ticks(self, ticks, *, minor=False):
+    def _set_tick_locations(self, ticks, *, minor=False):
+        # see docstring of set_ticks
+
+        # XXX if the user changes units, the information will be lost here
+        ticks = self.convert_units(ticks)
+        for name, axis in self.axes._axis_map.items():
+            if self is axis:
+                shared = [
+                    getattr(ax, f"{name}axis")
+                    for ax
+                    in self.axes._shared_axes[name].get_siblings(self.axes)]
+                break
+        else:
+            shared = [self]
+        if len(ticks):
+            for axis in shared:
+                # set_view_interval maintains any preexisting inversion.
+                axis.set_view_interval(min(ticks), max(ticks))
+        self.axes.stale = True
+        if minor:
+            self.set_minor_locator(mticker.FixedLocator(ticks))
+            return self.get_minor_ticks(len(ticks))
+        else:
+            self.set_major_locator(mticker.FixedLocator(ticks))
+            return self.get_major_ticks(len(ticks))
+
+    def set_ticks(self, ticks, labels=None, *, minor=False, **kwargs):
         """
-        Set this Axis' tick locations.
+        Set this Axis' tick locations and optionally labels.
 
         If necessary, the view limits of the Axis are expanded so that all
         given ticks are visible.
@@ -1788,9 +2003,22 @@ def set_ticks(self, ticks, *, minor=False):
         Parameters
         ----------
         ticks : list of floats
-            List of tick locations.
+            List of tick locations.  The axis `.Locator` is replaced by a
+            `~.ticker.FixedLocator`.
+
+            Some tick formatters will not label arbitrary tick positions;
+            e.g. log formatters only label decade ticks by default. In
+            such a case you can set a formatter explicitly on the axis
+            using `.Axis.set_major_formatter` or provide formatted
+            *labels* yourself.
+        labels : list of str, optional
+            List of tick labels. If not set, the labels are generated with
+            the axis tick `.Formatter`.
         minor : bool, default: False
             If ``False``, set the major ticks; if ``True``, the minor ticks.
+        **kwargs
+            `.Text` properties for the labels. These take effect only if you
+            pass *labels*. In other cases, please use `~.Axes.tick_params`.
 
         Notes
         -----
@@ -1799,39 +2027,10 @@ def set_ticks(self, ticks, *, minor=False):
         other limits, you should set the limits explicitly after setting the
         ticks.
         """
-        # XXX if the user changes units, the information will be lost here
-        ticks = self.convert_units(ticks)
-        if self is self.axes.xaxis:
-            shared = [
-                ax.xaxis
-                for ax in self.axes.get_shared_x_axes().get_siblings(self.axes)
-            ]
-        elif self is self.axes.yaxis:
-            shared = [
-                ax.yaxis
-                for ax in self.axes.get_shared_y_axes().get_siblings(self.axes)
-            ]
-        elif hasattr(self.axes, "zaxis") and self is self.axes.zaxis:
-            shared = [
-                ax.zaxis
-                for ax in self.axes._shared_z_axes.get_siblings(self.axes)
-            ]
-        else:
-            shared = [self]
-        for axis in shared:
-            if len(ticks) > 1:
-                xleft, xright = axis.get_view_interval()
-                if xright > xleft:
-                    axis.set_view_interval(min(ticks), max(ticks))
-                else:
-                    axis.set_view_interval(max(ticks), min(ticks))
-        self.axes.stale = True
-        if minor:
-            self.set_minor_locator(mticker.FixedLocator(ticks))
-            return self.get_minor_ticks(len(ticks))
-        else:
-            self.set_major_locator(mticker.FixedLocator(ticks))
-            return self.get_major_ticks(len(ticks))
+        result = self._set_tick_locations(ticks, minor=minor)
+        if labels is not None:
+            self.set_ticklabels(labels, minor=minor, **kwargs)
+        return result
 
     def _get_tick_boxes_siblings(self, renderer):
         """
@@ -1842,7 +2041,7 @@ def _get_tick_boxes_siblings(self, renderer):
         """
         # Get the Grouper keeping track of x or y label groups for this figure.
         axis_names = [
-            name for name, axis in self.axes._get_axis_map().items()
+            name for name, axis in self.axes._axis_map.items()
             if name in self.figure._align_label_groups and axis is self]
         if len(axis_names) != 1:
             return [], []
@@ -1850,11 +2049,11 @@ def _get_tick_boxes_siblings(self, renderer):
         grouper = self.figure._align_label_groups[axis_name]
         bboxes = []
         bboxes2 = []
-        # If we want to align labels from other axes:
+        # If we want to align labels from other Axes:
         for ax in grouper.get_siblings(self.axes):
-            axis = ax._get_axis_map()[axis_name]
+            axis = getattr(ax, f"{axis_name}axis")
             ticks_to_draw = axis._update_ticks()
-            tlb, tlb2 = axis._get_tick_bboxes(ticks_to_draw, renderer)
+            tlb, tlb2 = axis._get_ticklabel_bboxes(ticks_to_draw, renderer)
             bboxes.extend(tlb)
             bboxes2.extend(tlb2)
         return bboxes, bboxes2
@@ -1873,16 +2072,6 @@ def _update_offset_text_position(self, bboxes, bboxes2):
         """
         raise NotImplementedError('Derived must override')
 
-    @_api.deprecated("3.3")
-    def pan(self, numsteps):
-        """Pan by *numsteps* (can be positive or negative)."""
-        self.major.locator.pan(numsteps)
-
-    @_api.deprecated("3.3")
-    def zoom(self, direction):
-        """Zoom in/out on axis; if *direction* is >0 zoom in, else zoom out."""
-        self.major.locator.zoom(direction)
-
     def axis_date(self, tz=None):
         """
         Set up axis ticks and labels to treat data along this Axis as dates.
@@ -1995,6 +2184,7 @@ def setter(self, vmin, vmax, ignore=False):
 class XAxis(Axis):
     __name__ = 'xaxis'
     axis_name = 'x'  #: Read-only name identifying the axis.
+    _tick_class = XTick
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -2031,17 +2221,10 @@ def contains(self, mouseevent):
             return False, {}
         (l, b), (r, t) = self.axes.transAxes.transform([(0, 0), (1, 1)])
         inaxis = 0 <= xaxes <= 1 and (
-            b - self.pickradius < y < b or
-            t < y < t + self.pickradius)
+            b - self._pickradius < y < b or
+            t < y < t + self._pickradius)
         return inaxis, {}
 
-    def _get_tick(self, major):
-        if major:
-            tick_kw = self._major_tick_kw
-        else:
-            tick_kw = self._minor_tick_kw
-        return XTick(self.axes, 0, major=major, **tick_kw)
-
     def set_label_position(self, position):
         """
         Set the label position (top or bottom)
@@ -2072,10 +2255,9 @@ def _update_label_position(self, renderer):
         if self.label_position == 'bottom':
             try:
                 spine = self.axes.spines['bottom']
-                spinebbox = spine.get_transform().transform_path(
-                    spine.get_path()).get_extents()
+                spinebbox = spine.get_window_extent()
             except KeyError:
-                # use axes if spine doesn't exist
+                # use Axes if spine doesn't exist
                 spinebbox = self.axes.bbox
             bbox = mtransforms.Bbox.union(bboxes + [spinebbox])
             bottom = bbox.y0
@@ -2083,14 +2265,12 @@ def _update_label_position(self, renderer):
             self.label.set_position(
                 (x, bottom - self.labelpad * self.figure.dpi / 72)
             )
-
         else:
             try:
                 spine = self.axes.spines['top']
-                spinebbox = spine.get_transform().transform_path(
-                    spine.get_path()).get_extents()
+                spinebbox = spine.get_window_extent()
             except KeyError:
-                # use axes if spine doesn't exist
+                # use Axes if spine doesn't exist
                 spinebbox = self.axes.bbox
             bbox = mtransforms.Bbox.union(bboxes2 + [spinebbox])
             top = bbox.y1
@@ -2123,26 +2303,27 @@ def _update_offset_text_position(self, bboxes, bboxes2):
             y = top + self.OFFSETTEXTPAD * self.figure.dpi / 72
         self.offsetText.set_position((x, y))
 
+    @_api.deprecated("3.6")
     def get_text_heights(self, renderer):
         """
         Return how much space should be reserved for text above and below the
-        axes, as a pair of floats.
+        Axes, as a pair of floats.
         """
         bbox, bbox2 = self.get_ticklabel_extents(renderer)
         # MGDTODO: Need a better way to get the pad
-        padPixels = self.majorTicks[0].get_pad_pixels()
+        pad_pixels = self.majorTicks[0].get_pad_pixels()
 
         above = 0.0
         if bbox2.height:
-            above += bbox2.height + padPixels
+            above += bbox2.height + pad_pixels
         below = 0.0
         if bbox.height:
-            below += bbox.height + padPixels
+            below += bbox.height + pad_pixels
 
         if self.get_label_position() == 'top':
-            above += self.label.get_window_extent(renderer).height + padPixels
+            above += self.label.get_window_extent(renderer).height + pad_pixels
         else:
-            below += self.label.get_window_extent(renderer).height + padPixels
+            below += self.label.get_window_extent(renderer).height + pad_pixels
         return above, below
 
     def set_ticks_position(self, position):
@@ -2187,7 +2368,7 @@ def set_ticks_position(self, position):
 
     def tick_top(self):
         """
-        Move ticks and ticklabels (if present) to the top of the axes.
+        Move ticks and ticklabels (if present) to the top of the Axes.
         """
         label = True
         if 'label1On' in self._major_tick_kw:
@@ -2199,7 +2380,7 @@ def tick_top(self):
 
     def tick_bottom(self):
         """
-        Move ticks and ticklabels (if present) to the bottom of the axes.
+        Move ticks and ticklabels (if present) to the bottom of the Axes.
         """
         label = True
         if 'label1On' in self._major_tick_kw:
@@ -2225,33 +2406,23 @@ def get_ticks_position(self):
     def get_minpos(self):
         return self.axes.dataLim.minposx
 
-    def set_inverted(self, inverted):
-        # docstring inherited
-        a, b = self.get_view_interval()
-        # cast to bool to avoid bad interaction between python 3.8 and np.bool_
-        self.axes.set_xlim(sorted((a, b), reverse=bool(inverted)), auto=None)
-
     def set_default_intervals(self):
         # docstring inherited
-        xmin, xmax = 0., 1.
-        dataMutated = self.axes.dataLim.mutatedx()
-        viewMutated = self.axes.viewLim.mutatedx()
-        if not dataMutated or not viewMutated:
+        # only change view if dataLim has not changed and user has
+        # not changed the view:
+        if (not self.axes.dataLim.mutatedx() and
+                not self.axes.viewLim.mutatedx()):
             if self.converter is not None:
                 info = self.converter.axisinfo(self.units, self)
                 if info.default_limits is not None:
-                    valmin, valmax = info.default_limits
-                    xmin = self.converter.convert(valmin, self.units, self)
-                    xmax = self.converter.convert(valmax, self.units, self)
-            if not dataMutated:
-                self.axes.dataLim.intervalx = xmin, xmax
-            if not viewMutated:
-                self.axes.viewLim.intervalx = xmin, xmax
+                    xmin, xmax = self.convert_units(info.default_limits)
+                    self.axes.viewLim.intervalx = xmin, xmax
         self.stale = True
 
     def get_tick_space(self):
-        ends = self.axes.transAxes.transform([[0, 0], [1, 0]])
-        length = ((ends[1][0] - ends[0][0]) / self.axes.figure.dpi) * 72
+        ends = mtransforms.Bbox.unit().transformed(
+            self.axes.transAxes - self.figure.dpi_scale_trans)
+        length = ends.width * 72
         # There is a heuristic here that the aspect ratio of tick text
         # is no more than 3:1
         size = self._get_tick_label_size('x') * 3
@@ -2264,6 +2435,7 @@ def get_tick_space(self):
 class YAxis(Axis):
     __name__ = 'yaxis'
     axis_name = 'y'  #: Read-only name identifying the axis.
+    _tick_class = YTick
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -2302,17 +2474,10 @@ def contains(self, mouseevent):
             return False, {}
         (l, b), (r, t) = self.axes.transAxes.transform([(0, 0), (1, 1)])
         inaxis = 0 <= yaxes <= 1 and (
-            l - self.pickradius < x < l or
-            r < x < r + self.pickradius)
+            l - self._pickradius < x < l or
+            r < x < r + self._pickradius)
         return inaxis, {}
 
-    def _get_tick(self, major):
-        if major:
-            tick_kw = self._major_tick_kw
-        else:
-            tick_kw = self._minor_tick_kw
-        return YTick(self.axes, 0, major=major, **tick_kw)
-
     def set_label_position(self, position):
         """
         Set the label position (left or right)
@@ -2339,15 +2504,13 @@ def _update_label_position(self, renderer):
         # get bounding boxes for this axis and any siblings
         # that have been set by `fig.align_ylabels()`
         bboxes, bboxes2 = self._get_tick_boxes_siblings(renderer=renderer)
-
         x, y = self.label.get_position()
         if self.label_position == 'left':
             try:
                 spine = self.axes.spines['left']
-                spinebbox = spine.get_transform().transform_path(
-                    spine.get_path()).get_extents()
+                spinebbox = spine.get_window_extent()
             except KeyError:
-                # use axes if spine doesn't exist
+                # use Axes if spine doesn't exist
                 spinebbox = self.axes.bbox
             bbox = mtransforms.Bbox.union(bboxes + [spinebbox])
             left = bbox.x0
@@ -2358,14 +2521,13 @@ def _update_label_position(self, renderer):
         else:
             try:
                 spine = self.axes.spines['right']
-                spinebbox = spine.get_transform().transform_path(
-                    spine.get_path()).get_extents()
+                spinebbox = spine.get_window_extent()
             except KeyError:
-                # use axes if spine doesn't exist
+                # use Axes if spine doesn't exist
                 spinebbox = self.axes.bbox
+
             bbox = mtransforms.Bbox.union(bboxes2 + [spinebbox])
             right = bbox.x1
-
             self.label.set_position(
                 (right + self.labelpad * self.figure.dpi / 72, y)
             )
@@ -2375,8 +2537,13 @@ def _update_offset_text_position(self, bboxes, bboxes2):
         Update the offset_text position based on the sequence of bounding
         boxes of all the ticklabels
         """
-        x, y = self.offsetText.get_position()
-        top = self.axes.bbox.ymax
+        x, _ = self.offsetText.get_position()
+        if 'outline' in self.axes.spines:
+            # Special case for colorbars:
+            bbox = self.axes.spines['outline'].get_window_extent()
+        else:
+            bbox = self.axes.bbox
+        top = bbox.ymax
         self.offsetText.set_position(
             (x, top + self.OFFSETTEXTPAD * self.figure.dpi / 72)
         )
@@ -2394,22 +2561,23 @@ def set_offset_position(self, position):
         self.offsetText.set_position((x, y))
         self.stale = True
 
+    @_api.deprecated("3.6")
     def get_text_widths(self, renderer):
         bbox, bbox2 = self.get_ticklabel_extents(renderer)
         # MGDTODO: Need a better way to get the pad
-        padPixels = self.majorTicks[0].get_pad_pixels()
+        pad_pixels = self.majorTicks[0].get_pad_pixels()
 
         left = 0.0
         if bbox.width:
-            left += bbox.width + padPixels
+            left += bbox.width + pad_pixels
         right = 0.0
         if bbox2.width:
-            right += bbox2.width + padPixels
+            right += bbox2.width + pad_pixels
 
         if self.get_label_position() == 'left':
-            left += self.label.get_window_extent(renderer).width + padPixels
+            left += self.label.get_window_extent(renderer).width + pad_pixels
         else:
-            right += self.label.get_window_extent(renderer).width + padPixels
+            right += self.label.get_window_extent(renderer).width + pad_pixels
         return left, right
 
     def set_ticks_position(self, position):
@@ -2450,7 +2618,7 @@ def set_ticks_position(self, position):
 
     def tick_right(self):
         """
-        Move ticks and ticklabels (if present) to the right of the axes.
+        Move ticks and ticklabels (if present) to the right of the Axes.
         """
         label = True
         if 'label1On' in self._major_tick_kw:
@@ -2463,7 +2631,7 @@ def tick_right(self):
 
     def tick_left(self):
         """
-        Move ticks and ticklabels (if present) to the left of the axes.
+        Move ticks and ticklabels (if present) to the left of the Axes.
         """
         label = True
         if 'label1On' in self._major_tick_kw:
@@ -2490,33 +2658,23 @@ def get_ticks_position(self):
     def get_minpos(self):
         return self.axes.dataLim.minposy
 
-    def set_inverted(self, inverted):
-        # docstring inherited
-        a, b = self.get_view_interval()
-        # cast to bool to avoid bad interaction between python 3.8 and np.bool_
-        self.axes.set_ylim(sorted((a, b), reverse=bool(inverted)), auto=None)
-
     def set_default_intervals(self):
         # docstring inherited
-        ymin, ymax = 0., 1.
-        dataMutated = self.axes.dataLim.mutatedy()
-        viewMutated = self.axes.viewLim.mutatedy()
-        if not dataMutated or not viewMutated:
+        # only change view if dataLim has not changed and user has
+        # not changed the view:
+        if (not self.axes.dataLim.mutatedy() and
+                not self.axes.viewLim.mutatedy()):
             if self.converter is not None:
                 info = self.converter.axisinfo(self.units, self)
                 if info.default_limits is not None:
-                    valmin, valmax = info.default_limits
-                    ymin = self.converter.convert(valmin, self.units, self)
-                    ymax = self.converter.convert(valmax, self.units, self)
-            if not dataMutated:
-                self.axes.dataLim.intervaly = ymin, ymax
-            if not viewMutated:
-                self.axes.viewLim.intervaly = ymin, ymax
+                    ymin, ymax = self.convert_units(info.default_limits)
+                    self.axes.viewLim.intervaly = ymin, ymax
         self.stale = True
 
     def get_tick_space(self):
-        ends = self.axes.transAxes.transform([[0, 0], [0, 1]])
-        length = ((ends[1][1] - ends[0][1]) / self.axes.figure.dpi) * 72
+        ends = mtransforms.Bbox.unit().transformed(
+            self.axes.transAxes - self.figure.dpi_scale_trans)
+        length = ends.height * 72
         # Having a spacing of at least 2 just looks good.
         size = self._get_tick_label_size('y') * 2
         if size > 0:
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
index 32e069ed69cf..6e603cafbef0 100644
--- a/lib/matplotlib/backend_bases.py
+++ b/lib/matplotlib/backend_bases.py
@@ -26,30 +26,30 @@
 """
 
 from collections import namedtuple
-from contextlib import contextmanager, suppress
+from contextlib import ExitStack, contextmanager, nullcontext
 from enum import Enum, IntEnum
 import functools
 import importlib
 import inspect
 import io
+import itertools
 import logging
 import os
-import re
 import sys
 import time
-import traceback
 from weakref import WeakKeyDictionary
 
 import numpy as np
 
 import matplotlib as mpl
 from matplotlib import (
-    _api, backend_tools as tools, cbook, colors, docstring, textpath,
-    tight_bbox, transforms, widgets, get_backend, is_interactive, rcParams)
+    _api, backend_tools as tools, cbook, colors, _docstring, textpath,
+    _tight_bbox, transforms, widgets, get_backend, is_interactive, rcParams)
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_managers import ToolManager
 from matplotlib.cbook import _setattr_cm
 from matplotlib.path import Path
+from matplotlib.texmanager import TexManager
 from matplotlib.transforms import Affine2D
 from matplotlib._enums import JoinStyle, CapStyle
 
@@ -69,6 +69,7 @@
     'svgz': 'Scalable Vector Graphics',
     'tif': 'Tagged Image File Format',
     'tiff': 'Tagged Image File Format',
+    'webp': 'WebP Image Format',
 }
 _default_backends = {
     'eps': 'matplotlib.backends.backend_ps',
@@ -84,6 +85,7 @@
     'svgz': 'matplotlib.backends.backend_svg',
     'tif': 'matplotlib.backends.backend_agg',
     'tiff': 'matplotlib.backends.backend_agg',
+    'webp': 'matplotlib.backends.backend_agg',
 }
 
 
@@ -98,13 +100,15 @@ def _safe_pyplot_import():
         current_framework = cbook._get_running_interactive_framework()
         if current_framework is None:
             raise  # No, something else went wrong, likely with the install...
-        backend_mapping = {'qt5': 'qt5agg',
-                           'qt4': 'qt4agg',
-                           'gtk3': 'gtk3agg',
-                           'wx': 'wxagg',
-                           'tk': 'tkagg',
-                           'macosx': 'macosx',
-                           'headless': 'agg'}
+        backend_mapping = {
+            'qt': 'qtagg',
+            'gtk3': 'gtk3agg',
+            'gtk4': 'gtk4agg',
+            'wx': 'wxagg',
+            'tk': 'tkagg',
+            'macosx': 'macosx',
+            'headless': 'agg',
+        }
         backend = backend_mapping[current_framework]
         rcParams["backend"] = mpl.rcParamsOrig["backend"] = backend
         import matplotlib.pyplot as plt  # Now this should succeed.
@@ -149,20 +153,20 @@ class RendererBase:
     An abstract base class to handle drawing/rendering operations.
 
     The following methods must be implemented in the backend for full
-    functionality (though just implementing :meth:`draw_path` alone would
-    give a highly capable backend):
+    functionality (though just implementing `draw_path` alone would give a
+    highly capable backend):
 
-    * :meth:`draw_path`
-    * :meth:`draw_image`
-    * :meth:`draw_gouraud_triangle`
+    * `draw_path`
+    * `draw_image`
+    * `draw_gouraud_triangle`
 
     The following methods *should* be implemented in the backend for
     optimization reasons:
 
-    * :meth:`draw_text`
-    * :meth:`draw_markers`
-    * :meth:`draw_path_collection`
-    * :meth:`draw_quad_mesh`
+    * `draw_text`
+    * `draw_markers`
+    * `draw_path_collection`
+    * `draw_quad_mesh`
     """
 
     def __init__(self):
@@ -195,10 +199,9 @@ def draw_markers(self, gc, marker_path, marker_trans, path,
         """
         Draw a marker at each of *path*'s vertices (excluding control points).
 
-        This provides a fallback implementation of draw_markers that
-        makes multiple calls to :meth:`draw_path`.  Some backends may
-        want to override this method in order to draw the marker only
-        once and reuse it multiple times.
+        The base (fallback) implementation makes multiple calls to `draw_path`.
+        Backends may want to override this method in order to draw the marker
+        only once and reuse it multiple times.
 
         Parameters
         ----------
@@ -218,38 +221,38 @@ def draw_markers(self, gc, marker_path, marker_trans, path,
                                rgbFace)
 
     def draw_path_collection(self, gc, master_transform, paths, all_transforms,
-                             offsets, offsetTrans, facecolors, edgecolors,
+                             offsets, offset_trans, facecolors, edgecolors,
                              linewidths, linestyles, antialiaseds, urls,
                              offset_position):
         """
-        Draw a collection of paths selecting drawing properties from
-        the lists *facecolors*, *edgecolors*, *linewidths*,
-        *linestyles* and *antialiaseds*. *offsets* is a list of
-        offsets to apply to each of the paths.  The offsets in
-        *offsets* are first transformed by *offsetTrans* before being
-        applied.
-
-        *offset_position* may be either "screen" or "data" depending on the
-        space that the offsets are in; "data" is deprecated.
-
-        This provides a fallback implementation of
-        :meth:`draw_path_collection` that makes multiple calls to
-        :meth:`draw_path`.  Some backends may want to override this in
-        order to render each set of path data only once, and then
-        reference that path multiple times with the different offsets,
-        colors, styles etc.  The generator methods
-        :meth:`_iter_collection_raw_paths` and
-        :meth:`_iter_collection` are provided to help with (and
-        standardize) the implementation across backends.  It is highly
-        recommended to use those generators, so that changes to the
-        behavior of :meth:`draw_path_collection` can be made globally.
+        Draw a collection of *paths*.
+
+        Each path is first transformed by the corresponding entry
+        in *all_transforms* (a list of (3, 3) matrices) and then by
+        *master_transform*.  They are then translated by the corresponding
+        entry in *offsets*, which has been first transformed by *offset_trans*.
+
+        *facecolors*, *edgecolors*, *linewidths*, *linestyles*, and
+        *antialiased* are lists that set the corresponding properties.
+
+        *offset_position* is unused now, but the argument is kept for
+        backwards compatibility.
+
+        The base (fallback) implementation makes multiple calls to `draw_path`.
+        Backends may want to override this in order to render each set of
+        path data only once, and then reference that path multiple times with
+        the different offsets, colors, styles etc.  The generator methods
+        `_iter_collection_raw_paths` and `_iter_collection` are provided to
+        help with (and standardize) the implementation across backends.  It
+        is highly recommended to use those generators, so that changes to the
+        behavior of `draw_path_collection` can be made globally.
         """
         path_ids = self._iter_collection_raw_paths(master_transform,
                                                    paths, all_transforms)
 
         for xo, yo, path_id, gc0, rgbFace in self._iter_collection(
-                gc, master_transform, all_transforms, list(path_ids), offsets,
-                offsetTrans, facecolors, edgecolors, linewidths, linestyles,
+                gc, list(path_ids), offsets, offset_trans,
+                facecolors, edgecolors, linewidths, linestyles,
                 antialiaseds, urls, offset_position):
             path, transform = path_id
             # Only apply another translation if we have an offset, else we
@@ -266,13 +269,14 @@ def draw_quad_mesh(self, gc, master_transform, meshWidth, meshHeight,
                        coordinates, offsets, offsetTrans, facecolors,
                        antialiased, edgecolors):
         """
-        Fallback implementation of :meth:`draw_quad_mesh` that generates paths
-        and then calls :meth:`draw_path_collection`.
+        Draw a quadmesh.
+
+        The base (fallback) implementation converts the quadmesh to paths and
+        then calls `draw_path_collection`.
         """
 
         from matplotlib.collections import QuadMesh
-        paths = QuadMesh.convert_mesh_to_paths(
-            meshWidth, meshHeight, coordinates)
+        paths = QuadMesh._convert_mesh_to_paths(coordinates)
 
         if edgecolors is None:
             edgecolors = facecolors
@@ -320,18 +324,17 @@ def draw_gouraud_triangles(self, gc, triangles_array, colors_array,
     def _iter_collection_raw_paths(self, master_transform, paths,
                                    all_transforms):
         """
-        Helper method (along with :meth:`_iter_collection`) to implement
-        :meth:`draw_path_collection` in a space-efficient manner.
+        Helper method (along with `_iter_collection`) to implement
+        `draw_path_collection` in a memory-efficient manner.
 
-        This method yields all of the base path/transform
-        combinations, given a master transform, a list of paths and
-        list of transforms.
+        This method yields all of the base path/transform combinations, given a
+        master transform, a list of paths and list of transforms.
 
         The arguments should be exactly what is passed in to
-        :meth:`draw_path_collection`.
+        `draw_path_collection`.
 
-        The backend should take each yielded path and transform and
-        create an object that can be referenced (reused) later.
+        The backend should take each yielded path and transform and create an
+        object that can be referenced (reused) later.
         """
         Npaths = len(paths)
         Ntransforms = len(all_transforms)
@@ -351,8 +354,8 @@ def _iter_collection_uses_per_path(self, paths, all_transforms,
                                        offsets, facecolors, edgecolors):
         """
         Compute how many times each raw path object returned by
-        _iter_collection_raw_paths would be used when calling
-        _iter_collection. This is intended for the backend to decide
+        `_iter_collection_raw_paths` would be used when calling
+        `_iter_collection`. This is intended for the backend to decide
         on the tradeoff between using the paths in-line and storing
         them once and reusing. Rounds up in case the number of uses
         is not the same for every path.
@@ -364,24 +367,22 @@ def _iter_collection_uses_per_path(self, paths, all_transforms,
         N = max(Npath_ids, len(offsets))
         return (N + Npath_ids - 1) // Npath_ids
 
-    def _iter_collection(self, gc, master_transform, all_transforms,
-                         path_ids, offsets, offsetTrans, facecolors,
+    def _iter_collection(self, gc, path_ids, offsets, offset_trans, facecolors,
                          edgecolors, linewidths, linestyles,
                          antialiaseds, urls, offset_position):
         """
-        Helper method (along with :meth:`_iter_collection_raw_paths`) to
-        implement :meth:`draw_path_collection` in a space-efficient manner.
+        Helper method (along with `_iter_collection_raw_paths`) to implement
+        `draw_path_collection` in a memory-efficient manner.
 
-        This method yields all of the path, offset and graphics
-        context combinations to draw the path collection.  The caller
-        should already have looped over the results of
-        :meth:`_iter_collection_raw_paths` to draw this collection.
+        This method yields all of the path, offset and graphics context
+        combinations to draw the path collection.  The caller should already
+        have looped over the results of `_iter_collection_raw_paths` to draw
+        this collection.
 
         The arguments should be the same as that passed into
-        :meth:`draw_path_collection`, with the exception of
-        *path_ids*, which is a list of arbitrary objects that the
-        backend will use to reference one of the paths created in the
-        :meth:`_iter_collection_raw_paths` stage.
+        `draw_path_collection`, with the exception of *path_ids*, which is a
+        list of arbitrary objects that the backend will use to reference one of
+        the paths created in the `_iter_collection_raw_paths` stage.
 
         Each yielded result is of the form::
 
@@ -391,7 +392,6 @@ def _iter_collection(self, gc, master_transform, all_transforms,
         *path_ids*; *gc* is a graphics context and *rgbFace* is a color to
         use for filling the path.
         """
-        Ntransforms = len(all_transforms)
         Npaths = len(path_ids)
         Noffsets = len(offsets)
         N = max(Npaths, Noffsets)
@@ -399,74 +399,55 @@ def _iter_collection(self, gc, master_transform, all_transforms,
         Nedgecolors = len(edgecolors)
         Nlinewidths = len(linewidths)
         Nlinestyles = len(linestyles)
-        Naa = len(antialiaseds)
         Nurls = len(urls)
 
-        if offset_position == "data":
-            _api.warn_deprecated(
-                "3.3", message="Support for offset_position='data' is "
-                "deprecated since %(since)s and will be removed %(removal)s.")
-
         if (Nfacecolors == 0 and Nedgecolors == 0) or Npaths == 0:
             return
-        if Noffsets:
-            toffsets = offsetTrans.transform(offsets)
 
         gc0 = self.new_gc()
         gc0.copy_properties(gc)
 
-        if Nfacecolors == 0:
-            rgbFace = None
+        def cycle_or_default(seq, default=None):
+            # Cycle over *seq* if it is not empty; else always yield *default*.
+            return (itertools.cycle(seq) if len(seq)
+                    else itertools.repeat(default))
+
+        pathids = cycle_or_default(path_ids)
+        toffsets = cycle_or_default(offset_trans.transform(offsets), (0, 0))
+        fcs = cycle_or_default(facecolors)
+        ecs = cycle_or_default(edgecolors)
+        lws = cycle_or_default(linewidths)
+        lss = cycle_or_default(linestyles)
+        aas = cycle_or_default(antialiaseds)
+        urls = cycle_or_default(urls)
 
         if Nedgecolors == 0:
             gc0.set_linewidth(0.0)
 
-        xo, yo = 0, 0
-        for i in range(N):
-            path_id = path_ids[i % Npaths]
-            if Noffsets:
-                xo, yo = toffsets[i % Noffsets]
-                if offset_position == 'data':
-                    if Ntransforms:
-                        transform = (
-                            Affine2D(all_transforms[i % Ntransforms]) +
-                            master_transform)
-                    else:
-                        transform = master_transform
-                    (xo, yo), (xp, yp) = transform.transform(
-                        [(xo, yo), (0, 0)])
-                    xo = -(xp - xo)
-                    yo = -(yp - yo)
+        for pathid, (xo, yo), fc, ec, lw, ls, aa, url in itertools.islice(
+                zip(pathids, toffsets, fcs, ecs, lws, lss, aas, urls), N):
             if not (np.isfinite(xo) and np.isfinite(yo)):
                 continue
-            if Nfacecolors:
-                rgbFace = facecolors[i % Nfacecolors]
             if Nedgecolors:
                 if Nlinewidths:
-                    gc0.set_linewidth(linewidths[i % Nlinewidths])
+                    gc0.set_linewidth(lw)
                 if Nlinestyles:
-                    gc0.set_dashes(*linestyles[i % Nlinestyles])
-                fg = edgecolors[i % Nedgecolors]
-                if len(fg) == 4:
-                    if fg[3] == 0.0:
-                        gc0.set_linewidth(0)
-                    else:
-                        gc0.set_foreground(fg)
+                    gc0.set_dashes(*ls)
+                if len(ec) == 4 and ec[3] == 0.0:
+                    gc0.set_linewidth(0)
                 else:
-                    gc0.set_foreground(fg)
-            if rgbFace is not None and len(rgbFace) == 4:
-                if rgbFace[3] == 0:
-                    rgbFace = None
-            gc0.set_antialiased(antialiaseds[i % Naa])
+                    gc0.set_foreground(ec)
+            if fc is not None and len(fc) == 4 and fc[3] == 0:
+                fc = None
+            gc0.set_antialiased(aa)
             if Nurls:
-                gc0.set_url(urls[i % Nurls])
-
-            yield xo, yo, path_id, gc0, rgbFace
+                gc0.set_url(url)
+            yield xo, yo, pathid, gc0, fc
         gc0.restore()
 
     def get_image_magnification(self):
         """
-        Get the factor by which to magnify images passed to :meth:`draw_image`.
+        Get the factor by which to magnify images passed to `draw_image`.
         Allows a backend to have images at a different resolution to other
         artists.
         """
@@ -494,14 +475,13 @@ def draw_image(self, gc, x, y, im, transform=None):
 
         transform : `matplotlib.transforms.Affine2DBase`
             If and only if the concrete backend is written such that
-            :meth:`option_scale_image` returns ``True``, an affine
-            transformation (i.e., an `.Affine2DBase`) *may* be passed to
-            :meth:`draw_image`.  The translation vector of the transformation
-            is given in physical units (i.e., dots or pixels). Note that
-            the transformation does not override *x* and *y*, and has to be
-            applied *before* translating the result by *x* and *y* (this can
-            be accomplished by adding *x* and *y* to the translation vector
-            defined by *transform*).
+            `option_scale_image` returns ``True``, an affine transformation
+            (i.e., an `.Affine2DBase`) *may* be passed to `draw_image`.  The
+            translation vector of the transformation is given in physical units
+            (i.e., dots or pixels). Note that the transformation does not
+            override *x* and *y*, and has to be applied *before* translating
+            the result by *x* and *y* (this can be accomplished by adding *x*
+            and *y* to the translation vector defined by *transform*).
         """
         raise NotImplementedError
 
@@ -517,20 +497,19 @@ def option_image_nocomposite(self):
 
     def option_scale_image(self):
         """
-        Return whether arbitrary affine transformations in :meth:`draw_image`
-        are supported (True for most vector backends).
+        Return whether arbitrary affine transformations in `draw_image` are
+        supported (True for most vector backends).
         """
         return False
 
-    @_api.delete_parameter("3.3", "ismath")
-    def draw_tex(self, gc, x, y, s, prop, angle, ismath='TeX!', mtext=None):
+    def draw_tex(self, gc, x, y, s, prop, angle, *, mtext=None):
         """
         """
         self._draw_text_as_path(gc, x, y, s, prop, angle, ismath="TeX")
 
     def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
         """
-        Draw the text instance.
+        Draw a text instance.
 
         Parameters
         ----------
@@ -626,13 +605,12 @@ def get_text_width_height_descent(self, s, prop, ismath):
         to the baseline), in display coords, of the string *s* with
         `.FontProperties` *prop*.
         """
+        fontsize = prop.get_size_in_points()
+
         if ismath == 'TeX':
             # todo: handle props
-            texmanager = self._text2path.get_texmanager()
-            fontsize = prop.get_size_in_points()
-            w, h, d = texmanager.get_text_width_height_descent(
+            return TexManager().get_text_width_height_descent(
                 s, fontsize, renderer=self)
-            return w, h, d
 
         dpi = self.points_to_pixels(72)
         if ismath:
@@ -641,8 +619,7 @@ def get_text_width_height_descent(self, s, prop, ismath):
 
         flags = self._text2path._get_hinting_flag()
         font = self._text2path._get_font(prop)
-        size = prop.get_size_in_points()
-        font.set_size(size, dpi)
+        font.set_size(fontsize, dpi)
         # the width and height of unrotated string
         font.set_text(s, 0.0, flags=flags)
         w, h = font.get_width_height()
@@ -656,7 +633,7 @@ def flipy(self):
         """
         Return whether y values increase from top to bottom.
 
-        Note that this only affects drawing of texts and images.
+        Note that this only affects drawing of texts.
         """
         return True
 
@@ -667,7 +644,6 @@ def get_canvas_width_height(self):
     def get_texmanager(self):
         """Return the `.TexManager` instance."""
         if self._texmanager is None:
-            from matplotlib.texmanager import TexManager
             self._texmanager = TexManager()
         return self._texmanager
 
@@ -835,12 +811,9 @@ def get_dashes(self):
         """
         Return the dash style as an (offset, dash-list) pair.
 
-        The dash list is a even-length list that gives the ink on, ink off in
-        points.  See p. 107 of to PostScript `blue book`_ for more info.
+        See `.set_dashes` for details.
 
         Default value is (None, None).
-
-        .. _blue book: https://www-cdf.fnal.gov/offline/PostScript/BLUEBOOK.PDF
         """
         return self._dashes
 
@@ -904,7 +877,7 @@ def set_antialiased(self, b):
         # Use ints to make life easier on extension code trying to read the gc.
         self._antialiased = int(bool(b))
 
-    @docstring.interpd
+    @_docstring.interpd
     def set_capstyle(self, cs):
         """
         Set how to draw endpoints of lines.
@@ -930,24 +903,28 @@ def set_dashes(self, dash_offset, dash_list):
 
         Parameters
         ----------
-        dash_offset : float or None
-            The offset (usually 0).
+        dash_offset : float
+            Distance, in points, into the dash pattern at which to
+            start the pattern. It is usually set to 0.
         dash_list : array-like or None
-            The on-off sequence as points.
+            The on-off sequence as points.  None specifies a solid line. All
+            values must otherwise be non-negative (:math:`\\ge 0`).
 
         Notes
         -----
-        ``(None, None)`` specifies a solid line.
-
-        See p. 107 of to PostScript `blue book`_ for more info.
-
-        .. _blue book: https://www-cdf.fnal.gov/offline/PostScript/BLUEBOOK.PDF
+        See p. 666 of the PostScript
+        `Language Reference
+        <https://www.adobe.com/jp/print/postscript/pdfs/PLRM.pdf>`_
+        for more info.
         """
         if dash_list is not None:
             dl = np.asarray(dash_list)
             if np.any(dl < 0.0):
                 raise ValueError(
-                    "All values in the dash list must be positive")
+                    "All values in the dash list must be non-negative")
+            if dl.size and not np.any(dl > 0.0):
+                raise ValueError(
+                    'At least one value in the dash list must be positive')
         self._dashes = dash_offset, dash_list
 
     def set_foreground(self, fg, isRGBA=False):
@@ -970,7 +947,7 @@ def set_foreground(self, fg, isRGBA=False):
         else:
             self._rgb = colors.to_rgba(fg)
 
-    @docstring.interpd
+    @_docstring.interpd
     def set_joinstyle(self, js):
         """
         Set how to draw connections between line segments.
@@ -1228,9 +1205,10 @@ def _on_timer(self):
 
 class Event:
     """
-    A Matplotlib event.  Attach additional attributes as defined in
-    :meth:`FigureCanvasBase.mpl_connect`.  The following attributes
-    are defined and shown with their default values
+    A Matplotlib event.
+
+    The following attributes are defined and shown with their default values.
+    Subclasses may define additional attributes.
 
     Attributes
     ----------
@@ -1241,28 +1219,33 @@ class Event:
     guiEvent
         The GUI event that triggered the Matplotlib event.
     """
+
     def __init__(self, name, canvas, guiEvent=None):
         self.name = name
         self.canvas = canvas
         self.guiEvent = guiEvent
 
+    def _process(self):
+        """Generate an event with name ``self.name`` on ``self.canvas``."""
+        self.canvas.callbacks.process(self.name, self)
+
 
 class DrawEvent(Event):
     """
-    An event triggered by a draw operation on the canvas
+    An event triggered by a draw operation on the canvas.
 
-    In most backends callbacks subscribed to this callback will be
-    fired after the rendering is complete but before the screen is
-    updated.  Any extra artists drawn to the canvas's renderer will
-    be reflected without an explicit call to ``blit``.
+    In most backends, callbacks subscribed to this event will be fired after
+    the rendering is complete but before the screen is updated. Any extra
+    artists drawn to the canvas's renderer will be reflected without an
+    explicit call to ``blit``.
 
     .. warning::
 
        Calling ``canvas.draw`` and ``canvas.blit`` in these callbacks may
        not be safe with all backends and may cause infinite recursion.
 
-    In addition to the `Event` attributes, the following event
-    attributes are defined:
+    A DrawEvent has a number of special attributes in addition to those defined
+    by the parent `Event` class.
 
     Attributes
     ----------
@@ -1276,10 +1259,10 @@ def __init__(self, name, canvas, renderer):
 
 class ResizeEvent(Event):
     """
-    An event triggered by a canvas resize
+    An event triggered by a canvas resize.
 
-    In addition to the `Event` attributes, the following event
-    attributes are defined:
+    A ResizeEvent has a number of special attributes in addition to those
+    defined by the parent `Event` class.
 
     Attributes
     ----------
@@ -1288,6 +1271,7 @@ class ResizeEvent(Event):
     height : int
         Height of the canvas in pixels.
     """
+
     def __init__(self, name, canvas):
         super().__init__(name, canvas)
         self.width, self.height = canvas.get_width_height()
@@ -1301,44 +1285,34 @@ class LocationEvent(Event):
     """
     An event that has a screen location.
 
-    The following additional attributes are defined and shown with
-    their default values.
-
-    In addition to the `Event` attributes, the following
-    event attributes are defined:
+    A LocationEvent has a number of special attributes in addition to those
+    defined by the parent `Event` class.
 
     Attributes
     ----------
-    x : int
-        x position - pixels from left of canvas.
-    y : int
-        y position - pixels from bottom of canvas.
+    x, y : int or None
+        Event location in pixels from bottom left of canvas.
     inaxes : `~.axes.Axes` or None
         The `~.axes.Axes` instance over which the mouse is, if any.
-    xdata : float or None
-        x data coordinate of the mouse.
-    ydata : float or None
-        y data coordinate of the mouse.
+    xdata, ydata : float or None
+        Data coordinates of the mouse within *inaxes*, or *None* if the mouse
+        is not over an Axes.
     """
 
-    lastevent = None  # the last event that was triggered before this one
+    lastevent = None  # The last event processed so far.
 
     def __init__(self, name, canvas, x, y, guiEvent=None):
-        """
-        (*x*, *y*) in figure coords ((0, 0) = bottom left).
-        """
         super().__init__(name, canvas, guiEvent=guiEvent)
         # x position - pixels from left of canvas
         self.x = int(x) if x is not None else x
         # y position - pixels from right of canvas
         self.y = int(y) if y is not None else y
-        self.inaxes = None  # the Axes instance if mouse us over axes
+        self.inaxes = None  # the Axes instance the mouse is over
         self.xdata = None   # x coord of mouse in data coords
         self.ydata = None   # y coord of mouse in data coords
 
         if x is None or y is None:
-            # cannot check if event was in axes if no (x, y) info
-            self._update_enter_leave()
+            # cannot check if event was in Axes if no (x, y) info
             return
 
         if self.canvas.mouse_grabber is None:
@@ -1356,34 +1330,6 @@ def __init__(self, name, canvas, x, y, guiEvent=None):
                 self.xdata = xdata
                 self.ydata = ydata
 
-        self._update_enter_leave()
-
-    def _update_enter_leave(self):
-        """Process the figure/axes enter leave events."""
-        if LocationEvent.lastevent is not None:
-            last = LocationEvent.lastevent
-            if last.inaxes != self.inaxes:
-                # process axes enter/leave events
-                try:
-                    if last.inaxes is not None:
-                        last.canvas.callbacks.process('axes_leave_event', last)
-                except Exception:
-                    pass
-                    # See ticket 2901582.
-                    # I think this is a valid exception to the rule
-                    # against catching all exceptions; if anything goes
-                    # wrong, we simply want to move on and process the
-                    # current event.
-                if self.inaxes is not None:
-                    self.canvas.callbacks.process('axes_enter_event', self)
-
-        else:
-            # process a figure enter event
-            if self.inaxes is not None:
-                self.canvas.callbacks.process('axes_enter_event', self)
-
-        LocationEvent.lastevent = self
-
 
 class MouseButton(IntEnum):
     LEFT = 1
@@ -1395,23 +1341,25 @@ class MouseButton(IntEnum):
 
 class MouseEvent(LocationEvent):
     """
-    A mouse event ('button_press_event',
-                   'button_release_event',
-                   'scroll_event',
-                   'motion_notify_event').
+    A mouse event ('button_press_event', 'button_release_event', \
+'scroll_event', 'motion_notify_event').
 
-    In addition to the `Event` and `LocationEvent`
-    attributes, the following attributes are defined:
+    A MouseEvent has a number of special attributes in addition to those
+    defined by the parent `Event` and `LocationEvent` classes.
 
     Attributes
     ----------
     button : None or `MouseButton` or {'up', 'down'}
         The button pressed. 'up' and 'down' are used for scroll events.
+
         Note that LEFT and RIGHT actually refer to the "primary" and
         "secondary" buttons, i.e. if the user inverts their left and right
         buttons ("left-handed setting") then the LEFT button will be the one
         physically on the right.
 
+        If this is unset, *name* is "scroll_event", and *step* is nonzero, then
+        this will be set to "up" or "down" depending on the sign of *step*.
+
     key : None or str
         The key pressed when the mouse event triggered, e.g. 'shift'.
         See `KeyEvent`.
@@ -1443,21 +1391,19 @@ def on_press(event):
 
     def __init__(self, name, canvas, x, y, button=None, key=None,
                  step=0, dblclick=False, guiEvent=None):
-        """
-        (*x*, *y*) in figure coords ((0, 0) = bottom left)
-        button pressed None, 1, 2, 3, 'up', 'down'
-        """
+        super().__init__(name, canvas, x, y, guiEvent=guiEvent)
         if button in MouseButton.__members__.values():
             button = MouseButton(button)
+        if name == "scroll_event" and button is None:
+            if step > 0:
+                button = "up"
+            elif step < 0:
+                button = "down"
         self.button = button
         self.key = key
         self.step = step
         self.dblclick = dblclick
 
-        # super-init is deferred to the end because it calls back on
-        # 'axes_enter_event', which requires a fully initialized event.
-        super().__init__(name, canvas, x, y, guiEvent=guiEvent)
-
     def __str__(self):
         return (f"{self.name}: "
                 f"xy=({self.x}, {self.y}) xydata=({self.xdata}, {self.ydata}) "
@@ -1467,11 +1413,14 @@ def __str__(self):
 
 class PickEvent(Event):
     """
-    A pick event, fired when the user picks a location on the canvas
+    A pick event.
+
+    This event is fired when the user picks a location on the canvas
     sufficiently close to an artist that has been made pickable with
     `.Artist.set_picker`.
 
-    Attrs: all the `Event` attributes plus
+    A PickEvent has a number of special attributes in addition to those defined
+    by the parent `Event` class.
 
     Attributes
     ----------
@@ -1482,8 +1431,8 @@ class PickEvent(Event):
         (see `.Artist.set_picker`).
     other
         Additional attributes may be present depending on the type of the
-        picked object; e.g., a `~.Line2D` pick may define different extra
-        attributes than a `~.PatchCollection` pick.
+        picked object; e.g., a `.Line2D` pick may define different extra
+        attributes than a `.PatchCollection` pick.
 
     Examples
     --------
@@ -1500,8 +1449,11 @@ def on_pick(event):
 
         cid = fig.canvas.mpl_connect('pick_event', on_pick)
     """
+
     def __init__(self, name, canvas, mouseevent, artist,
                  guiEvent=None, **kwargs):
+        if guiEvent is None:
+            guiEvent = mouseevent.guiEvent
         super().__init__(name, canvas, guiEvent)
         self.mouseevent = mouseevent
         self.artist = artist
@@ -1512,19 +1464,16 @@ class KeyEvent(LocationEvent):
     """
     A key event (key press, key release).
 
-    Attach additional attributes as defined in
-    :meth:`FigureCanvasBase.mpl_connect`.
-
-    In addition to the `Event` and `LocationEvent`
-    attributes, the following attributes are defined:
+    A KeyEvent has a number of special attributes in addition to those defined
+    by the parent `Event` and `LocationEvent` classes.
 
     Attributes
     ----------
     key : None or str
-        the key(s) pressed. Could be **None**, a single case sensitive ascii
-        character ("g", "G", "#", etc.), a special key
-        ("control", "shift", "f1", "up", etc.) or a
-        combination of the above (e.g., "ctrl+alt+g", "ctrl+alt+G").
+        The key(s) pressed. Could be *None*, a single case sensitive Unicode
+        character ("g", "G", "#", etc.), a special key ("control", "shift",
+        "f1", "up", etc.) or a combination of the above (e.g., "ctrl+alt+g",
+        "ctrl+alt+G").
 
     Notes
     -----
@@ -1542,16 +1491,51 @@ def on_key(event):
 
         cid = fig.canvas.mpl_connect('key_press_event', on_key)
     """
+
     def __init__(self, name, canvas, key, x=0, y=0, guiEvent=None):
-        self.key = key
-        # super-init deferred to the end: callback errors if called before
         super().__init__(name, canvas, x, y, guiEvent=guiEvent)
+        self.key = key
+
+
+# Default callback for key events.
+def _key_handler(event):
+    # Dead reckoning of key.
+    if event.name == "key_press_event":
+        event.canvas._key = event.key
+    elif event.name == "key_release_event":
+        event.canvas._key = None
+
+
+# Default callback for mouse events.
+def _mouse_handler(event):
+    # Dead-reckoning of button and key.
+    if event.name == "button_press_event":
+        event.canvas._button = event.button
+    elif event.name == "button_release_event":
+        event.canvas._button = None
+    elif event.name == "motion_notify_event" and event.button is None:
+        event.button = event.canvas._button
+    if event.key is None:
+        event.key = event.canvas._key
+    # Emit axes_enter/axes_leave.
+    if event.name == "motion_notify_event":
+        last = LocationEvent.lastevent
+        last_axes = last.inaxes if last is not None else None
+        if last_axes != event.inaxes:
+            if last_axes is not None:
+                try:
+                    last.canvas.callbacks.process("axes_leave_event", last)
+                except Exception:
+                    pass  # The last canvas may already have been torn down.
+            if event.inaxes is not None:
+                event.canvas.callbacks.process("axes_enter_event", event)
+        LocationEvent.lastevent = (
+            None if event.name == "figure_leave_event" else event)
 
 
 def _get_renderer(figure, print_method=None):
     """
-    Get the renderer that would be used to save a `~.Figure`, and cache it on
-    the figure.
+    Get the renderer that would be used to save a `.Figure`.
 
     If you need a renderer without any active draw methods use
     renderer._draw_disabled to temporary patch them out at your call site.
@@ -1564,35 +1548,32 @@ class Done(Exception):
 
     def _draw(renderer): raise Done(renderer)
 
-    with cbook._setattr_cm(figure, draw=_draw):
-        orig_canvas = figure.canvas
+    with cbook._setattr_cm(figure, draw=_draw), ExitStack() as stack:
         if print_method is None:
             fmt = figure.canvas.get_default_filetype()
             # Even for a canvas' default output type, a canvas switch may be
             # needed, e.g. for FigureCanvasBase.
-            print_method = getattr(
-                figure.canvas._get_output_canvas(None, fmt), f"print_{fmt}")
+            print_method = stack.enter_context(
+                figure.canvas._switch_canvas_and_return_print_method(fmt))
         try:
             print_method(io.BytesIO())
         except Done as exc:
-            renderer, = figure._cachedRenderer, = exc.args
+            renderer, = exc.args
             return renderer
         else:
             raise RuntimeError(f"{print_method} did not call Figure.draw, so "
                                f"no renderer is available")
-        finally:
-            figure.canvas = orig_canvas
 
 
 def _no_output_draw(figure):
-    renderer = _get_renderer(figure)
-    with renderer._draw_disabled():
-        figure.draw(renderer)
+    # _no_output_draw was promoted to the figure level, but
+    # keep this here in case someone was calling it...
+    figure.draw_without_rendering()
 
 
 def _is_non_interactive_terminal_ipython(ip):
     """
-    Return whether we are in a a terminal IPython, but non interactive.
+    Return whether we are in a terminal IPython, but non interactive.
 
     When in _terminal_ IPython, ip.parent will have and `interact` attribute,
     if this attribute is False we do not setup eventloop integration as the
@@ -1604,73 +1585,6 @@ def _is_non_interactive_terminal_ipython(ip):
             and getattr(ip.parent, 'interact', None) is False)
 
 
-def _check_savefig_extra_args(func=None, extra_kwargs=()):
-    """
-    Decorator for the final print_* methods that accept keyword arguments.
-
-    If any unused keyword arguments are left, this decorator will warn about
-    them, and as part of the warning, will attempt to specify the function that
-    the user actually called, instead of the backend-specific method. If unable
-    to determine which function the user called, it will specify `.savefig`.
-
-    For compatibility across backends, this does not warn about keyword
-    arguments added by `FigureCanvasBase.print_figure` for use in a subset of
-    backends, because the user would not have added them directly.
-    """
-
-    if func is None:
-        return functools.partial(_check_savefig_extra_args,
-                                 extra_kwargs=extra_kwargs)
-
-    old_sig = inspect.signature(func)
-
-    @functools.wraps(func)
-    def wrapper(*args, **kwargs):
-        name = 'savefig'  # Reasonable default guess.
-        public_api = re.compile(
-            r'^savefig|print_[A-Za-z0-9]+|_no_output_draw$'
-        )
-        seen_print_figure = False
-        for frame, line in traceback.walk_stack(None):
-            if frame is None:
-                # when called in embedded context may hit frame is None.
-                break
-            if re.match(r'\A(matplotlib|mpl_toolkits)(\Z|\.(?!tests\.))',
-                        # Work around sphinx-gallery not setting __name__.
-                        frame.f_globals.get('__name__', '')):
-                if public_api.match(frame.f_code.co_name):
-                    name = frame.f_code.co_name
-                    if name in ('print_figure', '_no_output_draw'):
-                        seen_print_figure = True
-
-            else:
-                break
-
-        accepted_kwargs = {*old_sig.parameters, *extra_kwargs}
-        if seen_print_figure:
-            for kw in ['dpi', 'facecolor', 'edgecolor', 'orientation',
-                       'bbox_inches_restore']:
-                # Ignore keyword arguments that are passed in by print_figure
-                # for the use of other renderers.
-                if kw not in accepted_kwargs:
-                    kwargs.pop(kw, None)
-
-        for arg in list(kwargs):
-            if arg in accepted_kwargs:
-                continue
-            _api.warn_deprecated(
-                '3.3', name=name,
-                message='%(name)s() got unexpected keyword argument "'
-                        + arg + '" which is no longer supported as of '
-                        '%(since)s and will become an error '
-                        '%(removal)s')
-            kwargs.pop(arg)
-
-        return func(*args, **kwargs)
-
-    return wrapper
-
-
 class FigureCanvasBase:
     """
     The canvas the figure renders into.
@@ -1681,10 +1595,17 @@ class FigureCanvasBase:
         A high-level figure instance.
     """
 
-    # Set to one of {"qt5", "qt4", "gtk3", "wx", "tk", "macosx"} if an
+    # Set to one of {"qt", "gtk3", "gtk4", "wx", "tk", "macosx"} if an
     # interactive framework is required, or None otherwise.
     required_interactive_framework = None
 
+    # The manager class instantiated by new_manager.
+    # (This is defined as a classproperty because the manager class is
+    # currently defined *after* the canvas class, but one could also assign
+    # ``FigureCanvasBase.manager_class = FigureManagerBase``
+    # after defining both classes.)
+    manager_class = _api.classproperty(lambda cls: FigureManagerBase)
+
     events = [
         'resize_event',
         'draw_event',
@@ -1726,9 +1647,13 @@ def __init__(self, figure=None):
         self._button = None  # the button pressed
         self._key = None  # the key pressed
         self._lastx, self._lasty = None, None
-        self.mouse_grabber = None  # the axes currently grabbing mouse
+        self.mouse_grabber = None  # the Axes currently grabbing mouse
         self.toolbar = None  # NavigationToolbar2 will set me
         self._is_idle_drawing = False
+        # We don't want to scale up the figure DPI more than once.
+        figure._original_dpi = figure.dpi
+        self._device_pixel_ratio = 1
+        super().__init__()  # Typically the GUI widget init (if any).
 
     callbacks = property(lambda self: self.figure._canvas_callbacks)
     button_pick_id = property(lambda self: self.figure._button_pick_id)
@@ -1753,13 +1678,30 @@ def _fix_ipython_backend2gui(cls):
             # In case we ever move the patch to IPython and remove these APIs,
             # don't break on our side.
             return
-        rif = getattr(cls, "required_interactive_framework", None)
-        backend2gui_rif = {"qt5": "qt", "qt4": "qt", "gtk3": "gtk3",
-                           "wx": "wx", "macosx": "osx"}.get(rif)
+        backend2gui_rif = {
+            "qt": "qt",
+            "gtk3": "gtk3",
+            "gtk4": "gtk4",
+            "wx": "wx",
+            "macosx": "osx",
+        }.get(cls.required_interactive_framework)
         if backend2gui_rif:
             if _is_non_interactive_terminal_ipython(ip):
                 ip.enable_gui(backend2gui_rif)
 
+    @classmethod
+    def new_manager(cls, figure, num):
+        """
+        Create a new figure manager for *figure*, using this canvas class.
+
+        Notes
+        -----
+        This method should not be reimplemented in subclasses.  If
+        custom manager creation logic is needed, please reimplement
+        ``FigureManager.create_with_canvas``.
+        """
+        return cls.manager_class.create_with_canvas(cls, figure, num)
+
     @contextmanager
     def _idle_draw_cntx(self):
         self._is_idle_drawing = True
@@ -1775,6 +1717,7 @@ def is_saving(self):
         """
         return self._is_saving
 
+    @_api.deprecated("3.6", alternative="canvas.figure.pick")
     def pick(self, mouseevent):
         if not self.widgetlock.locked():
             self.figure.pick(mouseevent)
@@ -1783,14 +1726,30 @@ def blit(self, bbox=None):
         """Blit the canvas in bbox (default entire canvas)."""
 
     def resize(self, w, h):
-        """Set the canvas size in pixels."""
+        """
+        UNUSED: Set the canvas size in pixels.
+
+        Certain backends may implement a similar method internally, but this is
+        not a requirement of, nor is it used by, Matplotlib itself.
+        """
+        # The entire method is actually deprecated, but we allow pass-through
+        # to a parent class to support e.g. QWidget.resize.
+        if hasattr(super(), "resize"):
+            return super().resize(w, h)
+        else:
+            _api.warn_deprecated("3.6", name="resize", obj_type="method",
+                                 alternative="FigureManagerBase.resize")
 
+    @_api.deprecated("3.6", alternative=(
+        "callbacks.process('draw_event', DrawEvent(...))"))
     def draw_event(self, renderer):
         """Pass a `DrawEvent` to all functions connected to ``draw_event``."""
         s = 'draw_event'
         event = DrawEvent(s, self, renderer)
         self.callbacks.process(s, event)
 
+    @_api.deprecated("3.6", alternative=(
+        "callbacks.process('resize_event', ResizeEvent(...))"))
     def resize_event(self):
         """
         Pass a `ResizeEvent` to all functions connected to ``resize_event``.
@@ -1800,6 +1759,8 @@ def resize_event(self):
         self.callbacks.process(s, event)
         self.draw_idle()
 
+    @_api.deprecated("3.6", alternative=(
+        "callbacks.process('close_event', CloseEvent(...))"))
     def close_event(self, guiEvent=None):
         """
         Pass a `CloseEvent` to all functions connected to ``close_event``.
@@ -1816,6 +1777,8 @@ def close_event(self, guiEvent=None):
             # AttributeError occurs on OSX with qt4agg upon exiting
             # with an open window; 'callbacks' attribute no longer exists.
 
+    @_api.deprecated("3.6", alternative=(
+        "callbacks.process('key_press_event', KeyEvent(...))"))
     def key_press_event(self, key, guiEvent=None):
         """
         Pass a `KeyEvent` to all functions connected to ``key_press_event``.
@@ -1826,6 +1789,8 @@ def key_press_event(self, key, guiEvent=None):
             s, self, key, self._lastx, self._lasty, guiEvent=guiEvent)
         self.callbacks.process(s, event)
 
+    @_api.deprecated("3.6", alternative=(
+        "callbacks.process('key_release_event', KeyEvent(...))"))
     def key_release_event(self, key, guiEvent=None):
         """
         Pass a `KeyEvent` to all functions connected to ``key_release_event``.
@@ -1836,6 +1801,8 @@ def key_release_event(self, key, guiEvent=None):
         self.callbacks.process(s, event)
         self._key = None
 
+    @_api.deprecated("3.6", alternative=(
+        "callbacks.process('pick_event', PickEvent(...))"))
     def pick_event(self, mouseevent, artist, **kwargs):
         """
         Callback processing for pick events.
@@ -1852,6 +1819,8 @@ def pick_event(self, mouseevent, artist, **kwargs):
                           **kwargs)
         self.callbacks.process(s, event)
 
+    @_api.deprecated("3.6", alternative=(
+        "callbacks.process('scroll_event', MouseEvent(...))"))
     def scroll_event(self, x, y, step, guiEvent=None):
         """
         Callback processing for scroll events.
@@ -1872,6 +1841,8 @@ def scroll_event(self, x, y, step, guiEvent=None):
                                 step=step, guiEvent=guiEvent)
         self.callbacks.process(s, mouseevent)
 
+    @_api.deprecated("3.6", alternative=(
+        "callbacks.process('button_press_event', MouseEvent(...))"))
     def button_press_event(self, x, y, button, dblclick=False, guiEvent=None):
         """
         Callback processing for mouse button press events.
@@ -1889,6 +1860,8 @@ def button_press_event(self, x, y, button, dblclick=False, guiEvent=None):
                                 dblclick=dblclick, guiEvent=guiEvent)
         self.callbacks.process(s, mouseevent)
 
+    @_api.deprecated("3.6", alternative=(
+        "callbacks.process('button_release_event', MouseEvent(...))"))
     def button_release_event(self, x, y, button, guiEvent=None):
         """
         Callback processing for mouse button release events.
@@ -1913,6 +1886,9 @@ def button_release_event(self, x, y, button, guiEvent=None):
         self.callbacks.process(s, event)
         self._button = None
 
+    # Also remove _lastx, _lasty when this goes away.
+    @_api.deprecated("3.6", alternative=(
+        "callbacks.process('motion_notify_event', MouseEvent(...))"))
     def motion_notify_event(self, x, y, guiEvent=None):
         """
         Callback processing for mouse movement events.
@@ -1938,6 +1914,8 @@ def motion_notify_event(self, x, y, guiEvent=None):
                            guiEvent=guiEvent)
         self.callbacks.process(s, event)
 
+    @_api.deprecated("3.6", alternative=(
+        "callbacks.process('leave_notify_event', LocationEvent(...))"))
     def leave_notify_event(self, guiEvent=None):
         """
         Callback processing for the mouse cursor leaving the canvas.
@@ -1954,6 +1932,8 @@ def leave_notify_event(self, guiEvent=None):
         LocationEvent.lastevent = None
         self._lastx, self._lasty = None, None
 
+    @_api.deprecated("3.6", alternative=(
+        "callbacks.process('enter_notify_event', LocationEvent(...))"))
     def enter_notify_event(self, guiEvent=None, xy=None):
         """
         Callback processing for the mouse cursor entering the canvas.
@@ -1995,7 +1975,8 @@ def inaxes(self, xy):
         Returns
         -------
         `~matplotlib.axes.Axes` or None
-            The topmost visible axes containing the point, or None if no axes.
+            The topmost visible Axes containing the point, or None if there
+            is no Axes at the point.
         """
         axes_list = [a for a in self.figure.get_axes()
                      if a.patch.contains_point(xy) and a.get_visible()]
@@ -2011,7 +1992,7 @@ def grab_mouse(self, ax):
         Set the child `~.axes.Axes` which is grabbing the mouse events.
 
         Usually called by the widgets themselves. It is an error to call this
-        if the mouse is already grabbed by another axes.
+        if the mouse is already grabbed by another Axes.
         """
         if self.mouse_grabber not in (None, ax):
             raise RuntimeError("Another Axes already grabs mouse input")
@@ -2027,14 +2008,32 @@ def release_mouse(self, ax):
         if self.mouse_grabber is ax:
             self.mouse_grabber = None
 
+    def set_cursor(self, cursor):
+        """
+        Set the current cursor.
+
+        This may have no effect if the backend does not display anything.
+
+        If required by the backend, this method should trigger an update in
+        the backend event loop after the cursor is set, as this method may be
+        called e.g. before a long-running task during which the GUI is not
+        updated.
+
+        Parameters
+        ----------
+        cursor : `.Cursors`
+            The cursor to display over the canvas. Note: some backends may
+            change the cursor for the entire window.
+        """
+
     def draw(self, *args, **kwargs):
         """
         Render the `.Figure`.
 
-        It is important that this method actually walk the artist tree
-        even if not output is produced because this will trigger
-        deferred work (like computing limits auto-limits and tick
-        values) that users may want access to before saving to disk.
+        This method must walk the artist tree, even if no output is produced,
+        because it triggers deferred work that users may want to access
+        before saving output to disk. For example computing limits,
+        auto-limits, and tick values.
         """
 
     def draw_idle(self, *args, **kwargs):
@@ -2054,12 +2053,80 @@ def draw_idle(self, *args, **kwargs):
             with self._idle_draw_cntx():
                 self.draw(*args, **kwargs)
 
-    def get_width_height(self):
+    @property
+    def device_pixel_ratio(self):
+        """
+        The ratio of physical to logical pixels used for the canvas on screen.
+
+        By default, this is 1, meaning physical and logical pixels are the same
+        size. Subclasses that support High DPI screens may set this property to
+        indicate that said ratio is different. All Matplotlib interaction,
+        unless working directly with the canvas, remains in logical pixels.
+
+        """
+        return self._device_pixel_ratio
+
+    def _set_device_pixel_ratio(self, ratio):
         """
-        Return the figure width and height in points or pixels
-        (depending on the backend), truncated to integers.
+        Set the ratio of physical to logical pixels used for the canvas.
+
+        Subclasses that support High DPI screens can set this property to
+        indicate that said ratio is different. The canvas itself will be
+        created at the physical size, while the client side will use the
+        logical size. Thus the DPI of the Figure will change to be scaled by
+        this ratio. Implementations that support High DPI screens should use
+        physical pixels for events so that transforms back to Axes space are
+        correct.
+
+        By default, this is 1, meaning physical and logical pixels are the same
+        size.
+
+        Parameters
+        ----------
+        ratio : float
+            The ratio of logical to physical pixels used for the canvas.
+
+        Returns
+        -------
+        bool
+            Whether the ratio has changed. Backends may interpret this as a
+            signal to resize the window, repaint the canvas, or change any
+            other relevant properties.
+        """
+        if self._device_pixel_ratio == ratio:
+            return False
+        # In cases with mixed resolution displays, we need to be careful if the
+        # device pixel ratio changes - in this case we need to resize the
+        # canvas accordingly. Some backends provide events that indicate a
+        # change in DPI, but those that don't will update this before drawing.
+        dpi = ratio * self.figure._original_dpi
+        self.figure._set_dpi(dpi, forward=False)
+        self._device_pixel_ratio = ratio
+        return True
+
+    def get_width_height(self, *, physical=False):
         """
-        return int(self.figure.bbox.width), int(self.figure.bbox.height)
+        Return the figure width and height in integral points or pixels.
+
+        When the figure is used on High DPI screens (and the backend supports
+        it), the truncation to integers occurs after scaling by the device
+        pixel ratio.
+
+        Parameters
+        ----------
+        physical : bool, default: False
+            Whether to return true physical pixels or logical pixels. Physical
+            pixels may be used by backends that support HiDPI, but still
+            configure the canvas using its actual size.
+
+        Returns
+        -------
+        width, height : int
+            The size of the figure, in points or pixels, depending on the
+            backend.
+        """
+        return tuple(int(size / (1 if physical else self.device_pixel_ratio))
+                     for size in self.figure.bbox.max)
 
     @classmethod
     def get_supported_filetypes(cls):
@@ -2080,21 +2147,30 @@ def get_supported_filetypes_grouped(cls):
             groupings[name].sort()
         return groupings
 
-    def _get_output_canvas(self, backend, fmt):
+    @contextmanager
+    def _switch_canvas_and_return_print_method(self, fmt, backend=None):
         """
-        Set the canvas in preparation for saving the figure.
+        Context manager temporarily setting the canvas for saving the figure::
+
+            with canvas._switch_canvas_and_return_print_method(fmt, backend) \\
+                    as print_method:
+                # ``print_method`` is a suitable ``print_{fmt}`` method, and
+                # the figure's canvas is temporarily switched to the method's
+                # canvas within the with... block.  ``print_method`` is also
+                # wrapped to suppress extra kwargs passed by ``print_figure``.
 
         Parameters
         ----------
-        backend : str or None
-            If not None, switch the figure canvas to the ``FigureCanvas`` class
-            of the given backend.
         fmt : str
             If *backend* is None, then determine a suitable canvas class for
             saving to format *fmt* -- either the current canvas class, if it
             supports *fmt*, or whatever `get_registered_canvas_class` returns;
             switch the figure canvas to that canvas class.
+        backend : str or None, default: None
+            If not None, switch the figure canvas to the ``FigureCanvas`` class
+            of the given backend.
         """
+        canvas = None
         if backend is not None:
             # Return a specific canvas class, if requested.
             canvas_class = (
@@ -2105,16 +2181,34 @@ def _get_output_canvas(self, backend, fmt):
                     f"The {backend!r} backend does not support {fmt} output")
         elif hasattr(self, f"print_{fmt}"):
             # Return the current canvas if it supports the requested format.
-            return self
+            canvas = self
+            canvas_class = None  # Skip call to switch_backends.
         else:
             # Return a default canvas for the requested format, if it exists.
             canvas_class = get_registered_canvas_class(fmt)
         if canvas_class:
-            return self.switch_backends(canvas_class)
-        # Else report error for unsupported format.
-        raise ValueError(
-            "Format {!r} is not supported (supported formats: {})"
-            .format(fmt, ", ".join(sorted(self.get_supported_filetypes()))))
+            canvas = self.switch_backends(canvas_class)
+        if canvas is None:
+            raise ValueError(
+                "Format {!r} is not supported (supported formats: {})".format(
+                    fmt, ", ".join(sorted(self.get_supported_filetypes()))))
+        meth = getattr(canvas, f"print_{fmt}")
+        mod = (meth.func.__module__
+               if hasattr(meth, "func")  # partialmethod, e.g. backend_wx.
+               else meth.__module__)
+        if mod.startswith(("matplotlib.", "mpl_toolkits.")):
+            optional_kws = {  # Passed by print_figure for other renderers.
+                "dpi", "facecolor", "edgecolor", "orientation",
+                "bbox_inches_restore"}
+            skip = optional_kws - {*inspect.signature(meth).parameters}
+            print_method = functools.wraps(meth)(lambda *args, **kwargs: meth(
+                *args, **{k: v for k, v in kwargs.items() if k not in skip}))
+        else:  # Let third-parties do as they see fit.
+            print_method = meth
+        try:
+            yield print_method
+        finally:
+            self.figure.canvas = self
 
     def print_figure(
             self, filename, dpi=None, facecolor=None, edgecolor=None,
@@ -2182,10 +2276,6 @@ def print_figure(
                     filename = filename.rstrip('.') + '.' + format
         format = format.lower()
 
-        # get canvas object and print method for format
-        canvas = self._get_output_canvas(backend, format)
-        print_method = getattr(canvas, 'print_%s' % format)
-
         if dpi is None:
             dpi = rcParams['savefig.dpi']
         if dpi == 'figure':
@@ -2193,27 +2283,24 @@ def print_figure(
 
         # Remove the figure manager, if any, to avoid resizing the GUI widget.
         with cbook._setattr_cm(self, manager=None), \
-                cbook._setattr_cm(self.figure, dpi=dpi), \
-                cbook._setattr_cm(canvas, _is_saving=True):
-            origfacecolor = self.figure.get_facecolor()
-            origedgecolor = self.figure.get_edgecolor()
-
-            if facecolor is None:
-                facecolor = rcParams['savefig.facecolor']
-            if cbook._str_equal(facecolor, 'auto'):
-                facecolor = origfacecolor
-            if edgecolor is None:
-                edgecolor = rcParams['savefig.edgecolor']
-            if cbook._str_equal(edgecolor, 'auto'):
-                edgecolor = origedgecolor
-
-            self.figure.set_facecolor(facecolor)
-            self.figure.set_edgecolor(edgecolor)
+             self._switch_canvas_and_return_print_method(format, backend) \
+                 as print_method, \
+             cbook._setattr_cm(self.figure, dpi=dpi), \
+             cbook._setattr_cm(self.figure.canvas, _device_pixel_ratio=1), \
+             cbook._setattr_cm(self.figure.canvas, _is_saving=True), \
+             ExitStack() as stack:
+
+            for prop in ["facecolor", "edgecolor"]:
+                color = locals()[prop]
+                if color is None:
+                    color = rcParams[f"savefig.{prop}"]
+                if not cbook._str_equal(color, "auto"):
+                    stack.enter_context(self.figure._cm_set(**{prop: color}))
 
             if bbox_inches is None:
                 bbox_inches = rcParams['savefig.bbox']
 
-            if (self.figure.get_constrained_layout() or
+            if (self.figure.get_layout_engine() is not None or
                     bbox_inches == "tight"):
                 # we need to trigger a draw before printing to make sure
                 # CL works.  "tight" also needs a draw to get the right
@@ -2223,10 +2310,7 @@ def print_figure(
                     functools.partial(
                         print_method, orientation=orientation)
                 )
-                ctx = (renderer._draw_disabled()
-                       if hasattr(renderer, '_draw_disabled')
-                       else suppress())
-                with ctx:
+                with getattr(renderer, "_draw_disabled", nullcontext)():
                     self.figure.draw(renderer)
 
             if bbox_inches:
@@ -2238,16 +2322,15 @@ def print_figure(
                     bbox_inches = bbox_inches.padded(pad_inches)
 
                 # call adjust_bbox to save only the given area
-                restore_bbox = tight_bbox.adjust_bbox(self.figure, bbox_inches,
-                                                      canvas.fixed_dpi)
+                restore_bbox = _tight_bbox.adjust_bbox(
+                    self.figure, bbox_inches, self.figure.canvas.fixed_dpi)
 
                 _bbox_inches_restore = (bbox_inches, restore_bbox)
             else:
                 _bbox_inches_restore = None
 
-            # we have already done CL above, so turn it off:
-            cl_state = self.figure.get_constrained_layout()
-            self.figure.set_constrained_layout(False)
+            # we have already done layout above, so turn it off:
+            stack.enter_context(self.figure._cm_set(layout_engine='none'))
             try:
                 # _get_renderer may change the figure dpi (as vector formats
                 # force the figure dpi to 72), so we need to set it again here.
@@ -2263,11 +2346,6 @@ def print_figure(
                 if bbox_inches and restore_bbox:
                     restore_bbox()
 
-                self.figure.set_facecolor(origfacecolor)
-                self.figure.set_edgecolor(origedgecolor)
-                self.figure.set_canvas(self)
-            # reset to cached state
-            self.figure.set_constrained_layout(cl_state)
             return result
 
     @classmethod
@@ -2281,26 +2359,6 @@ def get_default_filetype(cls):
         """
         return rcParams['savefig.format']
 
-    @_api.deprecated(
-        "3.4", alternative="manager.get_window_title or GUI-specific methods")
-    def get_window_title(self):
-        """
-        Return the title text of the window containing the figure, or None
-        if there is no window (e.g., a PS backend).
-        """
-        if self.manager is not None:
-            return self.manager.get_window_title()
-
-    @_api.deprecated(
-        "3.4", alternative="manager.set_window_title or GUI-specific methods")
-    def set_window_title(self, title):
-        """
-        Set the title text of the window containing the figure.  Note that
-        this has no effect if there is no window (e.g., a PS backend).
-        """
-        if self.manager is not None:
-            self.manager.set_window_title(title)
-
     def get_default_filename(self):
         """
         Return a string, which includes extension, suitable for use as
@@ -2357,7 +2415,7 @@ def mpl_connect(self, s, func):
                 def func(event: Event) -> Any
 
             For the location events (button and key press/release), if the
-            mouse is over the axes, the ``inaxes`` attribute of the event will
+            mouse is over the Axes, the ``inaxes`` attribute of the event will
             be set to the `~matplotlib.axes.Axes` the event occurs is over, and
             additionally, the variables ``xdata`` and ``ydata`` attributes will
             be set to the mouse location in data coordinates.  See `.KeyEvent`
@@ -2487,7 +2545,7 @@ def key_press_handler(event, canvas=None, toolbar=None):
         back-compatibility, but, if set, should always be equal to
         ``event.canvas.toolbar``.
     """
-    # these bindings happen whether you are over an axes or not
+    # these bindings happen whether you are over an Axes or not
 
     if event.key is None:
         return
@@ -2510,7 +2568,6 @@ def key_press_handler(event, canvas=None, toolbar=None):
     grid_minor_keys = rcParams['keymap.grid_minor']
     toggle_yscale_keys = rcParams['keymap.yscale']
     toggle_xscale_keys = rcParams['keymap.xscale']
-    all_keys = dict.__getitem__(rcParams, 'keymap.all_axes')
 
     # toggle fullscreen mode ('f', 'ctrl + f')
     if event.key in fullscreen_keys:
@@ -2551,7 +2608,7 @@ def key_press_handler(event, canvas=None, toolbar=None):
     if event.inaxes is None:
         return
 
-    # these bindings require the mouse to be over an axes to trigger
+    # these bindings require the mouse to be over an Axes to trigger
     def _get_uniform_gridstate(ticks):
         # Return True/False if all grid lines are on or off, None if they are
         # not all in the same state.
@@ -2563,7 +2620,7 @@ def _get_uniform_gridstate(ticks):
             return None
 
     ax = event.inaxes
-    # toggle major grids in current axes (default key 'g')
+    # toggle major grids in current Axes (default key 'g')
     # Both here and below (for 'G'), we do nothing if *any* grid (major or
     # minor, x or y) is not in a uniform state, to avoid messing up user
     # customization.
@@ -2585,7 +2642,7 @@ def _get_uniform_gridstate(ticks):
             ax.grid(x_state, which="major" if x_state else "both", axis="x")
             ax.grid(y_state, which="major" if y_state else "both", axis="y")
             canvas.draw_idle()
-    # toggle major and minor grids in current axes (default key 'G')
+    # toggle major and minor grids in current Axes (default key 'G')
     if (event.key in grid_minor_keys
             # Exclude major grids not in a uniform state.
             and None not in [_get_uniform_gridstate(ax.xaxis.majorTicks),
@@ -2629,29 +2686,6 @@ def _get_uniform_gridstate(ticks):
                 _log.warning(str(exc))
                 ax.set_xscale('linear')
             ax.figure.canvas.draw_idle()
-    # enable navigation for all axes that contain the event (default key 'a')
-    elif event.key in all_keys:
-        for a in canvas.figure.get_axes():
-            if (event.x is not None and event.y is not None
-                    and a.in_axes(event)):  # FIXME: Why only these?
-                _api.warn_deprecated(
-                    "3.3", message="Toggling axes navigation from the "
-                    "keyboard is deprecated since %(since)s and will be "
-                    "removed %(removal)s.")
-                a.set_navigate(True)
-    # enable navigation only for axes with this index (if such an axes exist,
-    # otherwise do nothing)
-    elif event.key.isdigit() and event.key != '0':
-        n = int(event.key) - 1
-        if n < len(canvas.figure.get_axes()):
-            for i, a in enumerate(canvas.figure.get_axes()):
-                if (event.x is not None and event.y is not None
-                        and a.in_axes(event)):  # FIXME: Why only these?
-                    _api.warn_deprecated(
-                        "3.3", message="Toggling axes navigation from the "
-                        "keyboard is deprecated since %(since)s and will be "
-                        "removed %(removal)s.")
-                    a.set_navigate(i == n)
 
 
 def button_press_handler(event, canvas=None, toolbar=None):
@@ -2737,7 +2771,8 @@ class FigureManagerBase:
                 figure.canvas.manager.button_press_handler_id)
     """
 
-    statusbar = _api.deprecated("3.3")(property(lambda self: None))
+    _toolbar2_class = None
+    _toolmanager_toolbar_class = None
 
     def __init__(self, canvas, num):
         self.canvas = canvas
@@ -2756,14 +2791,36 @@ def __init__(self, canvas, num):
         self.toolmanager = (ToolManager(canvas.figure)
                             if mpl.rcParams['toolbar'] == 'toolmanager'
                             else None)
-        self.toolbar = None
+        if (mpl.rcParams["toolbar"] == "toolbar2"
+                and self._toolbar2_class):
+            self.toolbar = self._toolbar2_class(self.canvas)
+        elif (mpl.rcParams["toolbar"] == "toolmanager"
+                and self._toolmanager_toolbar_class):
+            self.toolbar = self._toolmanager_toolbar_class(self.toolmanager)
+        else:
+            self.toolbar = None
+
+        if self.toolmanager:
+            tools.add_tools_to_manager(self.toolmanager)
+            if self.toolbar:
+                tools.add_tools_to_container(self.toolbar)
 
         @self.canvas.figure.add_axobserver
         def notify_axes_change(fig):
-            # Called whenever the current axes is changed.
+            # Called whenever the current Axes is changed.
             if self.toolmanager is None and self.toolbar is not None:
                 self.toolbar.update()
 
+    @classmethod
+    def create_with_canvas(cls, canvas_class, figure, num):
+        """
+        Create a manager for a given *figure* using a specific *canvas_class*.
+
+        Backends should override this method if they have specific needs for
+        setting up the canvas or the manager.
+        """
+        return cls(canvas_class(figure), num)
+
     def show(self):
         """
         For GUI backends, show the figure window and redraw.
@@ -2789,24 +2846,7 @@ def full_screen_toggle(self):
         pass
 
     def resize(self, w, h):
-        """For GUI backends, resize the window (in pixels)."""
-
-    @_api.deprecated(
-        "3.4", alternative="self.canvas.callbacks.process(event.name, event)")
-    def key_press(self, event):
-        """
-        Implement the default Matplotlib key bindings defined at
-        :ref:`key-event-handling`.
-        """
-        if rcParams['toolbar'] != 'toolmanager':
-            key_press_handler(event)
-
-    @_api.deprecated(
-        "3.4", alternative="self.canvas.callbacks.process(event.name, event)")
-    def button_press(self, event):
-        """The default Matplotlib button actions for extra mouse buttons."""
-        if rcParams['toolbar'] != 'toolmanager':
-            button_press_handler(event)
+        """For GUI backends, resize the window (in physical pixels)."""
 
     def get_window_title(self):
         """
@@ -2852,9 +2892,6 @@ class NavigationToolbar2:
       :meth:`save_figure`
          save the current figure
 
-      :meth:`set_cursor`
-         if you want the pointer icon to change
-
       :meth:`draw_rubberband` (optional)
          draw the zoom to rect "rubberband" rectangle
 
@@ -2890,8 +2927,7 @@ class NavigationToolbar2:
          'Left button pans, Right button zooms\n'
          'x/y fixes axis, CTRL fixes aspect',
          'move', 'pan'),
-        ('Zoom', 'Zoom to rectangle\nx/y fixes axis, CTRL fixes aspect',
-         'zoom_to_rect', 'zoom'),
+        ('Zoom', 'Zoom to rectangle\nx/y fixes axis', 'zoom_to_rect', 'zoom'),
         ('Subplots', 'Configure subplots', 'subplots', 'configure_subplots'),
         (None, None, None, None),
         ('Save', 'Save the figure', 'filesave', 'save_figure'),
@@ -2902,15 +2938,7 @@ def __init__(self, canvas):
         canvas.toolbar = self
         self._nav_stack = cbook.Stack()
         # This cursor will be set after the initial draw.
-        self._lastCursor = cursors.POINTER
-
-        init = _api.deprecate_method_override(
-            __class__._init_toolbar, self, allow_empty=True, since="3.3",
-            addendum="Please fully initialize the toolbar in your subclass' "
-            "__init__; a fully empty _init_toolbar implementation may be kept "
-            "for compatibility with earlier versions of Matplotlib.")
-        if init:
-            init()
+        self._last_cursor = tools.Cursors.POINTER
 
         self._id_press = self.canvas.mpl_connect(
             'button_press_event', self._zoom_pan_handler)
@@ -2973,46 +3001,22 @@ def forward(self, *args):
         self.set_history_buttons()
         self._update_view()
 
-    @_api.deprecated("3.3", alternative="__init__")
-    def _init_toolbar(self):
-        """
-        This is where you actually build the GUI widgets (called by
-        __init__).  The icons ``home.xpm``, ``back.xpm``, ``forward.xpm``,
-        ``hand.xpm``, ``zoom_to_rect.xpm`` and ``filesave.xpm`` are standard
-        across backends (there are ppm versions in CVS also).
-
-        You just need to set the callbacks
-
-        home         : self.home
-        back         : self.back
-        forward      : self.forward
-        hand         : self.pan
-        zoom_to_rect : self.zoom
-        filesave     : self.save_figure
-
-        You only need to define the last one - the others are in the base
-        class implementation.
-
-        """
-        raise NotImplementedError
-
     def _update_cursor(self, event):
         """
         Update the cursor after a mouse move event or a tool (de)activation.
         """
-        if not event.inaxes or not self.mode:
-            if self._lastCursor != cursors.POINTER:
-                self.set_cursor(cursors.POINTER)
-                self._lastCursor = cursors.POINTER
-        else:
+        if self.mode and event.inaxes and event.inaxes.get_navigate():
             if (self.mode == _Mode.ZOOM
-                    and self._lastCursor != cursors.SELECT_REGION):
-                self.set_cursor(cursors.SELECT_REGION)
-                self._lastCursor = cursors.SELECT_REGION
+                    and self._last_cursor != tools.Cursors.SELECT_REGION):
+                self.canvas.set_cursor(tools.Cursors.SELECT_REGION)
+                self._last_cursor = tools.Cursors.SELECT_REGION
             elif (self.mode == _Mode.PAN
-                  and self._lastCursor != cursors.MOVE):
-                self.set_cursor(cursors.MOVE)
-                self._lastCursor = cursors.MOVE
+                  and self._last_cursor != tools.Cursors.MOVE):
+                self.canvas.set_cursor(tools.Cursors.MOVE)
+                self._last_cursor = tools.Cursors.MOVE
+        elif self._last_cursor != tools.Cursors.POINTER:
+            self.canvas.set_cursor(tools.Cursors.POINTER)
+            self._last_cursor = tools.Cursors.POINTER
 
     @contextmanager
     def _wait_cursor_for_draw_cm(self):
@@ -3029,10 +3033,10 @@ def _wait_cursor_for_draw_cm(self):
             time.time(), getattr(self, "_draw_time", -np.inf))
         if self._draw_time - last_draw_time > 1:
             try:
-                self.set_cursor(cursors.WAIT)
+                self.canvas.set_cursor(tools.Cursors.WAIT)
                 yield
             finally:
-                self.set_cursor(self._lastCursor)
+                self.canvas.set_cursor(self._last_cursor)
         else:
             yield
 
@@ -3078,20 +3082,15 @@ def _zoom_pan_handler(self, event):
             elif event.name == "button_release_event":
                 self.release_zoom(event)
 
-    @_api.deprecated("3.3")
-    def press(self, event):
-        """Called whenever a mouse button is pressed."""
-
-    @_api.deprecated("3.3")
-    def release(self, event):
-        """Callback for mouse button release."""
-
     def pan(self, *args):
         """
         Toggle the pan/zoom tool.
 
         Pan with left button, zoom with right.
         """
+        if not self.canvas.widgetlock.available(self):
+            self.set_message("pan unavailable")
+            return
         if self.mode == _Mode.PAN:
             self.mode = _Mode.NONE
             self.canvas.widgetlock.release(self)
@@ -3121,12 +3120,6 @@ def press_pan(self, event):
         id_drag = self.canvas.mpl_connect("motion_notify_event", self.drag_pan)
         self._pan_info = self._PanInfo(
             button=event.button, axes=axes, cid=id_drag)
-        press = _api.deprecate_method_override(
-            __class__.press, self, since="3.3", message="Calling an "
-            "overridden press() at pan start is deprecated since %(since)s "
-            "and will be removed %(removal)s; override press_pan() instead.")
-        if press is not None:
-            press(event)
 
     def drag_pan(self, event):
         """Callback for dragging in pan/zoom mode."""
@@ -3145,17 +3138,14 @@ def release_pan(self, event):
             'motion_notify_event', self.mouse_move)
         for ax in self._pan_info.axes:
             ax.end_pan()
-        release = _api.deprecate_method_override(
-            __class__.press, self, since="3.3", message="Calling an "
-            "overridden release() at pan stop is deprecated since %(since)s "
-            "and will be removed %(removal)s; override release_pan() instead.")
-        if release is not None:
-            release(event)
-        self._draw()
+        self.canvas.draw_idle()
         self._pan_info = None
         self.push_current()
 
     def zoom(self, *args):
+        if not self.canvas.widgetlock.available(self):
+            self.set_message("zoom unavailable")
+            return
         """Toggle zoom to rect mode."""
         if self.mode == _Mode.ZOOM:
             self.mode = _Mode.NONE
@@ -3167,7 +3157,7 @@ def zoom(self, *args):
             a.set_navigate_mode(self.mode._navigate_mode)
         self.set_message(self.mode)
 
-    _ZoomInfo = namedtuple("_ZoomInfo", "direction start_xy axes cid")
+    _ZoomInfo = namedtuple("_ZoomInfo", "direction start_xy axes cid cbar")
 
     def press_zoom(self, event):
         """Callback for mouse button press in zoom to rect mode."""
@@ -3182,15 +3172,16 @@ def press_zoom(self, event):
             self.push_current()  # set the home button to this view
         id_zoom = self.canvas.mpl_connect(
             "motion_notify_event", self.drag_zoom)
+        # A colorbar is one-dimensional, so we extend the zoom rectangle out
+        # to the edge of the Axes bbox in the other dimension. To do that we
+        # store the orientation of the colorbar for later.
+        if hasattr(axes[0], "_colorbar"):
+            cbar = axes[0]._colorbar.orientation
+        else:
+            cbar = None
         self._zoom_info = self._ZoomInfo(
             direction="in" if event.button == 1 else "out",
-            start_xy=(event.x, event.y), axes=axes, cid=id_zoom)
-        press = _api.deprecate_method_override(
-            __class__.press, self, since="3.3", message="Calling an "
-            "overridden press() at zoom start is deprecated since %(since)s "
-            "and will be removed %(removal)s; override press_zoom() instead.")
-        if press is not None:
-            press(event)
+            start_xy=(event.x, event.y), axes=axes, cid=id_zoom, cbar=cbar)
 
     def drag_zoom(self, event):
         """Callback for dragging in zoom mode."""
@@ -3198,10 +3189,17 @@ def drag_zoom(self, event):
         ax = self._zoom_info.axes[0]
         (x1, y1), (x2, y2) = np.clip(
             [start_xy, [event.x, event.y]], ax.bbox.min, ax.bbox.max)
-        if event.key == "x":
+        key = event.key
+        # Force the key on colorbars to extend the short-axis bbox
+        if self._zoom_info.cbar == "horizontal":
+            key = "x"
+        elif self._zoom_info.cbar == "vertical":
+            key = "y"
+        if key == "x":
             y1, y2 = ax.bbox.intervaly
-        elif event.key == "y":
+        elif key == "y":
             x1, x2 = ax.bbox.intervalx
+
         self.draw_rubberband(event, x1, y1, x2, y2)
 
     def release_zoom(self, event):
@@ -3215,44 +3213,36 @@ def release_zoom(self, event):
         self.remove_rubberband()
 
         start_x, start_y = self._zoom_info.start_xy
+        key = event.key
+        # Force the key on colorbars to ignore the zoom-cancel on the
+        # short-axis side
+        if self._zoom_info.cbar == "horizontal":
+            key = "x"
+        elif self._zoom_info.cbar == "vertical":
+            key = "y"
         # Ignore single clicks: 5 pixels is a threshold that allows the user to
         # "cancel" a zoom action by zooming by less than 5 pixels.
-        if ((abs(event.x - start_x) < 5 and event.key != "y")
-                or (abs(event.y - start_y) < 5 and event.key != "x")):
-            self._draw()
+        if ((abs(event.x - start_x) < 5 and key != "y") or
+                (abs(event.y - start_y) < 5 and key != "x")):
+            self.canvas.draw_idle()
             self._zoom_info = None
-            release = _api.deprecate_method_override(
-                __class__.press, self, since="3.3", message="Calling an "
-                "overridden release() at zoom stop is deprecated since "
-                "%(since)s and will be removed %(removal)s; override "
-                "release_zoom() instead.")
-            if release is not None:
-                release(event)
             return
 
         for i, ax in enumerate(self._zoom_info.axes):
-            # Detect whether this axes is twinned with an earlier axes in the
-            # list of zoomed axes, to avoid double zooming.
+            # Detect whether this Axes is twinned with an earlier Axes in the
+            # list of zoomed Axes, to avoid double zooming.
             twinx = any(ax.get_shared_x_axes().joined(ax, prev)
                         for prev in self._zoom_info.axes[:i])
             twiny = any(ax.get_shared_y_axes().joined(ax, prev)
                         for prev in self._zoom_info.axes[:i])
             ax._set_view_from_bbox(
                 (start_x, start_y, event.x, event.y),
-                self._zoom_info.direction, event.key, twinx, twiny)
+                self._zoom_info.direction, key, twinx, twiny)
 
-        self._draw()
+        self.canvas.draw_idle()
         self._zoom_info = None
         self.push_current()
 
-        release = _api.deprecate_method_override(
-            __class__.release, self, since="3.3", message="Calling an "
-            "overridden release() at zoom stop is deprecated since %(since)s "
-            "and will be removed %(removal)s; override release_zoom() "
-            "instead.")
-        if release is not None:
-            release(event)
-
     def push_current(self):
         """Push the current view limits and position onto the stack."""
         self._nav_stack.push(
@@ -3264,33 +3254,10 @@ def push_current(self):
                  for ax in self.canvas.figure.axes}))
         self.set_history_buttons()
 
-    @_api.deprecated("3.3", alternative="toolbar.canvas.draw_idle()")
-    def draw(self):
-        """Redraw the canvases, update the locators."""
-        self._draw()
-
-    # Can be removed once Locator.refresh() is removed, and replaced by an
-    # inline call to self.canvas.draw_idle().
-    def _draw(self):
-        for a in self.canvas.figure.get_axes():
-            xaxis = getattr(a, 'xaxis', None)
-            yaxis = getattr(a, 'yaxis', None)
-            locators = []
-            if xaxis is not None:
-                locators.append(xaxis.get_major_locator())
-                locators.append(xaxis.get_minor_locator())
-            if yaxis is not None:
-                locators.append(yaxis.get_major_locator())
-                locators.append(yaxis.get_minor_locator())
-
-            for loc in locators:
-                mpl.ticker._if_refresh_overridden_call_and_emit_deprec(loc)
-        self.canvas.draw_idle()
-
     def _update_view(self):
         """
         Update the viewlim and position from the view and position stack for
-        each axes.
+        each Axes.
         """
         nav_info = self._nav_stack()
         if nav_info is None:
@@ -3306,14 +3273,29 @@ def _update_view(self):
         self.canvas.draw_idle()
 
     def configure_subplots(self, *args):
-        plt = _safe_pyplot_import()
-        self.subplot_tool = plt.subplot_tool(self.canvas.figure)
-        self.subplot_tool.figure.canvas.manager.show()
+        if hasattr(self, "subplot_tool"):
+            self.subplot_tool.figure.canvas.manager.show()
+            return
+        # 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.
+            manager = type(self.canvas).new_manager(Figure(figsize=(6, 3)), -1)
+        manager.set_window_title("Subplot configuration tool")
+        tool_fig = manager.canvas.figure
+        tool_fig.subplots_adjust(top=0.9)
+        self.subplot_tool = widgets.SubplotTool(self.canvas.figure, tool_fig)
+        tool_fig.canvas.mpl_connect(
+            "close_event", lambda e: delattr(self, "subplot_tool"))
+        self.canvas.mpl_connect(
+            "close_event", lambda e: manager.destroy())
+        manager.show()
+        return self.subplot_tool
 
     def save_figure(self, *args):
         """Save the current figure."""
         raise NotImplementedError
 
+    @_api.deprecated("3.5", alternative="`.FigureCanvasBase.set_cursor`")
     def set_cursor(self, cursor):
         """
         Set the current cursor to one of the :class:`Cursors` enums values.
@@ -3323,9 +3305,10 @@ def set_cursor(self, cursor):
         called e.g. before a long-running task during which the GUI is not
         updated.
         """
+        self.canvas.set_cursor(cursor)
 
     def update(self):
-        """Reset the axes stack."""
+        """Reset the Axes stack."""
         self._nav_stack.clear()
         self.set_history_buttons()
 
@@ -3488,29 +3471,6 @@ def set_message(self, s):
         raise NotImplementedError
 
 
-@_api.deprecated("3.3")
-class StatusbarBase:
-    """Base class for the statusbar."""
-    def __init__(self, toolmanager):
-        self.toolmanager = toolmanager
-        self.toolmanager.toolmanager_connect('tool_message_event',
-                                             self._message_cbk)
-
-    def _message_cbk(self, event):
-        """Capture the 'tool_message_event' and set the message."""
-        self.set_message(event.message)
-
-    def set_message(self, s):
-        """
-        Display a message on toolbar or in status bar.
-
-        Parameters
-        ----------
-        s : str
-            Message text.
-        """
-
-
 class _Backend:
     # A backend can be defined by using the following pattern:
     #
@@ -3547,9 +3507,7 @@ def new_figure_manager(cls, num, *args, **kwargs):
     @classmethod
     def new_figure_manager_given_figure(cls, num, figure):
         """Create a new figure manager instance for the given figure."""
-        canvas = cls.FigureCanvas(figure)
-        manager = cls.FigureManager(canvas, num)
-        return manager
+        return cls.FigureCanvas.new_manager(figure, num)
 
     @classmethod
     def draw_if_interactive(cls):
@@ -3578,19 +3536,12 @@ def show(cls, *, block=None):
         if cls.mainloop is None:
             return
         if block is None:
-            # Hack: Are we in IPython's pylab mode?
+            # Hack: Are we in IPython's %pylab mode?  In pylab mode, IPython
+            # (>= 0.10) tacks a _needmain attribute onto pyplot.show (always
+            # set to False).
             from matplotlib import pyplot
-            try:
-                # IPython versions >= 0.10 tack the _needmain attribute onto
-                # pyplot.show, and always set it to False, when in %pylab mode.
-                ipython_pylab = not pyplot.show._needmain
-            except AttributeError:
-                ipython_pylab = False
+            ipython_pylab = hasattr(pyplot.show, "_needmain")
             block = not ipython_pylab and not is_interactive()
-            # TODO: The above is a hack to get the WebAgg backend working with
-            # ipython's `%pylab` mode until proper integration is implemented.
-            if get_backend() == "WebAgg":
-                block = True
         if block:
             cls.mainloop()
 
diff --git a/lib/matplotlib/backend_managers.py b/lib/matplotlib/backend_managers.py
index 384b453ede1c..e7dd748325e5 100644
--- a/lib/matplotlib/backend_managers.py
+++ b/lib/matplotlib/backend_managers.py
@@ -1,6 +1,4 @@
-from matplotlib import _api, cbook, widgets
-from matplotlib.rcsetup import validate_stringlist
-import matplotlib.backend_tools as tools
+from matplotlib import _api, backend_tools, cbook, widgets
 
 
 class ToolEvent:
@@ -175,8 +173,7 @@ def _remove_keys(self, name):
         for k in self.get_tool_keymap(name):
             del self._keys[k]
 
-    @_api.delete_parameter("3.3", "args")
-    def update_keymap(self, name, key, *args):
+    def update_keymap(self, name, key):
         """
         Set the keymap to associate with the specified tool.
 
@@ -188,23 +185,15 @@ def update_keymap(self, name, key, *args):
             Keys to associate with the tool.
         """
         if name not in self._tools:
-            raise KeyError('%s not in Tools' % name)
+            raise KeyError(f'{name!r} not in Tools')
         self._remove_keys(name)
-        for key in [key, *args]:
-            if isinstance(key, str) and validate_stringlist(key) != [key]:
-                _api.warn_deprecated(
-                    "3.3", message="Passing a list of keys as a single "
-                    "comma-separated string is deprecated since %(since)s and "
-                    "support will be removed %(removal)s; pass keys as a list "
-                    "of strings instead.")
-                key = validate_stringlist(key)
-            if isinstance(key, str):
-                key = [key]
-            for k in key:
-                if k in self._keys:
-                    _api.warn_external(
-                        f'Key {k} changed from {self._keys[k]} to {name}')
-                self._keys[k] = name
+        if isinstance(key, str):
+            key = [key]
+        for k in key:
+            if k in self._keys:
+                _api.warn_external(
+                    f'Key {k} changed from {self._keys[k]} to {name}')
+            self._keys[k] = name
 
     def remove_tool(self, name):
         """
@@ -217,17 +206,20 @@ def remove_tool(self, name):
         """
 
         tool = self.get_tool(name)
-        tool.destroy()
+        destroy = _api.deprecate_method_override(
+            backend_tools.ToolBase.destroy, tool, since="3.6",
+            alternative="tool_removed_event")
+        if destroy is not None:
+            destroy()
 
-        # If is a toggle tool and toggled, untoggle
+        # If it's a toggle tool and toggled, untoggle
         if getattr(tool, 'toggled', False):
             self.trigger_tool(tool, 'toolmanager')
 
         self._remove_keys(name)
 
-        s = 'tool_removed_event'
-        event = ToolEvent(s, self, tool)
-        self._callbacks.process(s, event)
+        event = ToolEvent('tool_removed_event', self, tool)
+        self._callbacks.process(event.name, event)
 
         del self._tools[name]
 
@@ -243,8 +235,9 @@ def add_tool(self, name, tool, *args, **kwargs):
         ----------
         name : str
             Name of the tool, treated as the ID, has to be unique.
-        tool : class_like, i.e. str or type
-            Reference to find the class of the Tool to added.
+        tool : type
+            Class of the tool to be added.  A subclass will be used
+            instead if one was registered for the current canvas class.
 
         Notes
         -----
@@ -255,7 +248,7 @@ def add_tool(self, name, tool, *args, **kwargs):
         matplotlib.backend_tools.ToolBase : The base class for tools.
         """
 
-        tool_cls = self._get_cls_to_instantiate(tool)
+        tool_cls = backend_tools._find_tool_class(type(self.canvas), tool)
         if not tool_cls:
             raise ValueError('Impossible to find class for %s' % str(tool))
 
@@ -264,14 +257,24 @@ def add_tool(self, name, tool, *args, **kwargs):
                                'exists, not added')
             return self._tools[name]
 
+        if name == 'cursor' and tool_cls != backend_tools.SetCursorBase:
+            _api.warn_deprecated("3.5",
+                                 message="Overriding ToolSetCursor with "
+                                 f"{tool_cls.__qualname__} was only "
+                                 "necessary to provide the .set_cursor() "
+                                 "method, which is deprecated since "
+                                 "%(since)s and will be removed "
+                                 "%(removal)s. Please report this to the "
+                                 f"{tool_cls.__module__} author.")
+
         tool_obj = tool_cls(self, name, *args, **kwargs)
         self._tools[name] = tool_obj
 
-        if tool_cls.default_keymap is not None:
-            self.update_keymap(name, tool_cls.default_keymap)
+        if tool_obj.default_keymap is not None:
+            self.update_keymap(name, tool_obj.default_keymap)
 
         # For toggle tools init the radio_group in self._toggled
-        if isinstance(tool_obj, tools.ToolToggleBase):
+        if isinstance(tool_obj, backend_tools.ToolToggleBase):
             # None group is not mutually exclusive, a set is used to keep track
             # of all toggled tools in this group
             if tool_obj.radio_group is None:
@@ -281,18 +284,15 @@ def add_tool(self, name, tool, *args, **kwargs):
 
             # If initially toggled
             if tool_obj.toggled:
-                self._handle_toggle(tool_obj, None, None, None)
+                self._handle_toggle(tool_obj, None, None)
         tool_obj.set_figure(self.figure)
 
-        self._tool_added_event(tool_obj)
-        return tool_obj
+        event = ToolEvent('tool_added_event', self, tool_obj)
+        self._callbacks.process(event.name, event)
 
-    def _tool_added_event(self, tool):
-        s = 'tool_added_event'
-        event = ToolEvent(s, self, tool)
-        self._callbacks.process(s, event)
+        return tool_obj
 
-    def _handle_toggle(self, tool, sender, canvasevent, data):
+    def _handle_toggle(self, tool, canvasevent, data):
         """
         Toggle tools, need to untoggle prior to using other Toggle tool.
         Called from trigger_tool.
@@ -300,8 +300,6 @@ def _handle_toggle(self, tool, sender, canvasevent, data):
         Parameters
         ----------
         tool : `.ToolBase`
-        sender : object
-            Object that wishes to trigger the tool.
         canvasevent : Event
             Original Canvas event or None.
         data : object
@@ -337,23 +335,6 @@ def _handle_toggle(self, tool, sender, canvasevent, data):
         # Keep track of the toggled tool in the radio_group
         self._toggled[radio_group] = toggled
 
-    def _get_cls_to_instantiate(self, callback_class):
-        # Find the class that corresponds to the tool
-        if isinstance(callback_class, str):
-            # FIXME: make more complete searching structure
-            if callback_class in globals():
-                callback_class = globals()[callback_class]
-            else:
-                mod = 'backend_tools'
-                current_module = __import__(mod,
-                                            globals(), locals(), [mod], 1)
-
-                callback_class = getattr(current_module, callback_class, False)
-        if callable(callback_class):
-            return callback_class
-        else:
-            return None
-
     def trigger_tool(self, name, sender=None, canvasevent=None, data=None):
         """
         Trigger a tool and emit the ``tool_trigger_{name}`` event.
@@ -376,23 +357,15 @@ def trigger_tool(self, name, sender=None, canvasevent=None, data=None):
         if sender is None:
             sender = self
 
-        self._trigger_tool(name, sender, canvasevent, data)
+        if isinstance(tool, backend_tools.ToolToggleBase):
+            self._handle_toggle(tool, canvasevent, data)
+
+        tool.trigger(sender, canvasevent, data)  # Actually trigger Tool.
 
         s = 'tool_trigger_%s' % name
         event = ToolTriggerEvent(s, sender, tool, canvasevent, data)
         self._callbacks.process(s, event)
 
-    def _trigger_tool(self, name, sender=None, canvasevent=None, data=None):
-        """Actually trigger a tool."""
-        tool = self.get_tool(name)
-
-        if isinstance(tool, tools.ToolToggleBase):
-            self._handle_toggle(tool, sender, canvasevent, data)
-
-        # Important!!!
-        # This is where the Tool object gets triggered
-        tool.trigger(sender, canvasevent, data)
-
     def _key_press(self, event):
         if event.key is None or self.keypresslock.locked():
             return
@@ -426,10 +399,12 @@ def get_tool(self, name, warn=True):
         `.ToolBase` or None
             The tool or None if no tool with the given name exists.
         """
-        if isinstance(name, tools.ToolBase) and name.name in self._tools:
+        if (isinstance(name, backend_tools.ToolBase)
+                and name.name in self._tools):
             return name
         if name not in self._tools:
             if warn:
-                _api.warn_external(f"ToolManager does not control tool {name}")
+                _api.warn_external(
+                    f"ToolManager does not control tool {name!r}")
             return None
         return self._tools[name]
diff --git a/lib/matplotlib/backend_tools.py b/lib/matplotlib/backend_tools.py
index a8bad1edab5a..bc13951793b2 100644
--- a/lib/matplotlib/backend_tools.py
+++ b/lib/matplotlib/backend_tools.py
@@ -11,7 +11,8 @@
     `matplotlib.backend_managers.ToolManager`
 """
 
-from enum import IntEnum
+import enum
+import functools
 import re
 import time
 from types import SimpleNamespace
@@ -25,11 +26,46 @@
 from matplotlib import _api, cbook
 
 
-class Cursors(IntEnum):  # Must subclass int for the macOS backend.
+class Cursors(enum.IntEnum):  # Must subclass int for the macOS backend.
     """Backend-independent cursor types."""
-    HAND, POINTER, SELECT_REGION, MOVE, WAIT = range(5)
+    POINTER = enum.auto()
+    HAND = enum.auto()
+    SELECT_REGION = enum.auto()
+    MOVE = enum.auto()
+    WAIT = enum.auto()
+    RESIZE_HORIZONTAL = enum.auto()
+    RESIZE_VERTICAL = enum.auto()
 cursors = Cursors  # Backcompat.
 
+
+# _tool_registry, _register_tool_class, and _find_tool_class implement a
+# mechanism through which ToolManager.add_tool can determine whether a subclass
+# of the requested tool class has been registered (either for the current
+# canvas class or for a parent class), in which case that tool subclass will be
+# instantiated instead.  This is the mechanism used e.g. to allow different
+# GUI backends to implement different specializations for ConfigureSubplots.
+
+
+_tool_registry = set()
+
+
+def _register_tool_class(canvas_cls, tool_cls=None):
+    """Decorator registering *tool_cls* as a tool class for *canvas_cls*."""
+    if tool_cls is None:
+        return functools.partial(_register_tool_class, canvas_cls)
+    _tool_registry.add((canvas_cls, tool_cls))
+    return tool_cls
+
+
+def _find_tool_class(canvas_cls, tool_cls):
+    """Find a subclass of *tool_cls* registered for *canvas_cls*."""
+    for canvas_parent in canvas_cls.__mro__:
+        for tool_child in _api.recursive_subclasses(tool_cls):
+            if (canvas_parent, tool_child) in _tool_registry:
+                return tool_child
+    return tool_cls
+
+
 # Views positions tool
 _views_positions = 'viewpos'
 
@@ -38,42 +74,33 @@ class ToolBase:
     """
     Base tool class.
 
-    A base tool, only implements `trigger` method or not method at all.
+    A base tool, only implements `trigger` method or no method at all.
     The tool is instantiated by `matplotlib.backend_managers.ToolManager`.
-
-    Attributes
-    ----------
-    toolmanager : `matplotlib.backend_managers.ToolManager`
-        ToolManager that controls this Tool.
-    figure : `FigureCanvas`
-        Figure instance that is affected by this Tool.
-    name : str
-        Used as **Id** of the tool, has to be unique among tools of the same
-        ToolManager.
     """
 
     default_keymap = None
     """
     Keymap to associate with this tool.
 
-    **String**: List of comma separated keys that will be used to call this
-    tool when the keypress event of ``self.figure.canvas`` is emitted.
+    ``list[str]``: List of keys that will trigger this tool when a keypress
+    event is emitted on ``self.figure.canvas``.  Note that this attribute is
+    looked up on the instance, and can therefore be a property (this is used
+    e.g. by the built-in tools to load the rcParams at instantiation time).
     """
 
     description = None
     """
     Description of the Tool.
 
-    **String**: If the Tool is included in the Toolbar this text is used
-    as a Tooltip.
+    `str`: Tooltip used if the Tool is included in a Toolbar.
     """
 
     image = None
     """
     Filename of the image.
 
-    **String**: Filename of the image to use in the toolbar. If None, the
-    *name* is used as a label in the toolbar button.
+    `str`: Filename of the image to use in a Toolbar.  If None, the *name* is
+    used as a label in the toolbar button.
     """
 
     def __init__(self, toolmanager, name):
@@ -81,23 +108,26 @@ def __init__(self, toolmanager, name):
         self._toolmanager = toolmanager
         self._figure = None
 
+    name = property(
+        lambda self: self._name,
+        doc="The tool id (str, must be unique among tools of a tool manager).")
+    toolmanager = property(
+        lambda self: self._toolmanager,
+        doc="The `.ToolManager` that controls this tool.")
+    canvas = property(
+        lambda self: self._figure.canvas if self._figure is not None else None,
+        doc="The canvas of the figure affected by this tool, or None.")
+
     @property
     def figure(self):
+        """The Figure affected by this tool, or None."""
         return self._figure
 
     @figure.setter
     def figure(self, figure):
-        self.set_figure(figure)
-
-    @property
-    def canvas(self):
-        if not self._figure:
-            return None
-        return self._figure.canvas
+        self._figure = figure
 
-    @property
-    def toolmanager(self):
-        return self._toolmanager
+    set_figure = figure.fset
 
     def _make_classic_style_pseudo_toolbar(self):
         """
@@ -108,22 +138,11 @@ def _make_classic_style_pseudo_toolbar(self):
         """
         return SimpleNamespace(canvas=self.canvas)
 
-    def set_figure(self, figure):
-        """
-        Assign a figure to the tool.
-
-        Parameters
-        ----------
-        figure : `.Figure`
-        """
-        self._figure = figure
-
     def trigger(self, sender, event, data=None):
         """
         Called when this tool gets used.
 
-        This method is called by
-        `matplotlib.backend_managers.ToolManager.trigger_tool`.
+        This method is called by `.ToolManager.trigger_tool`.
 
         Parameters
         ----------
@@ -136,17 +155,12 @@ def trigger(self, sender, event, data=None):
         """
         pass
 
-    @property
-    def name(self):
-        """Tool Id."""
-        return self._name
-
+    @_api.deprecated("3.6", alternative="tool_removed_event")
     def destroy(self):
         """
         Destroy the tool.
 
-        This method is called when the tool is removed by
-        `matplotlib.backend_managers.ToolManager.remove_tool`.
+        This method is called by `.ToolManager.remove_tool`.
         """
         pass
 
@@ -167,10 +181,10 @@ class ToolToggleBase(ToolBase):
     """
 
     radio_group = None
-    """Attribute to group 'radio' like tools (mutually exclusive).
+    """
+    Attribute to group 'radio' like tools (mutually exclusive).
 
-    **String** that identifies the group or **None** if not belonging to a
-    group.
+    `str` that identifies the group or **None** if not belonging to a group.
     """
 
     cursor = None
@@ -217,7 +231,6 @@ def disable(self, event=None):
     @property
     def toggled(self):
         """State of the toggled tool."""
-
         return self._toggled
 
     def set_figure(self, figure):
@@ -249,12 +262,11 @@ class SetCursorBase(ToolBase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self._id_drag = None
-        self._cursor = None
+        self._current_tool = None
         self._default_cursor = cursors.POINTER
         self._last_cursor = self._default_cursor
         self.toolmanager.toolmanager_connect('tool_added_event',
                                              self._add_tool_cbk)
-
         # process current tools
         for tool in self.toolmanager.tools.values():
             self._add_tool(tool)
@@ -269,10 +281,9 @@ def set_figure(self, figure):
 
     def _tool_trigger_cbk(self, event):
         if event.tool.toggled:
-            self._cursor = event.tool.cursor
+            self._current_tool = event.tool
         else:
-            self._cursor = None
-
+            self._current_tool = None
         self._set_cursor_cbk(event.canvasevent)
 
     def _add_tool(self, tool):
@@ -288,26 +299,28 @@ def _add_tool_cbk(self, event):
         self._add_tool(event.tool)
 
     def _set_cursor_cbk(self, event):
-        if not event:
+        if not event or not self.canvas:
             return
-
-        if not getattr(event, 'inaxes', False) or not self._cursor:
-            if self._last_cursor != self._default_cursor:
-                self.set_cursor(self._default_cursor)
-                self._last_cursor = self._default_cursor
-        elif self._cursor:
-            cursor = self._cursor
-            if cursor and self._last_cursor != cursor:
-                self.set_cursor(cursor)
-                self._last_cursor = cursor
-
+        if (self._current_tool and getattr(event, "inaxes", None)
+                and event.inaxes.get_navigate()):
+            if self._last_cursor != self._current_tool.cursor:
+                self.canvas.set_cursor(self._current_tool.cursor)
+                self._last_cursor = self._current_tool.cursor
+        elif self._last_cursor != self._default_cursor:
+            self.canvas.set_cursor(self._default_cursor)
+            self._last_cursor = self._default_cursor
+
+    @_api.deprecated("3.5", alternative="`.FigureCanvasBase.set_cursor`")
     def set_cursor(self, cursor):
         """
         Set the cursor.
-
-        This method has to be implemented per backend.
         """
-        raise NotImplementedError
+        self.canvas.set_cursor(cursor)
+
+
+# This exists solely for deprecation warnings; remove with
+# SetCursorBase.set_cursor.
+ToolSetCursor = SetCursorBase
 
 
 class ToolCursorPosition(ToolBase):
@@ -342,7 +355,7 @@ def send_message(self, event):
 
 class RubberbandBase(ToolBase):
     """Draw and remove a rubberband."""
-    def trigger(self, sender, event, data):
+    def trigger(self, sender, event, data=None):
         """Call `draw_rubberband` or `remove_rubberband` based on data."""
         if not self.figure.canvas.widgetlock.available(sender):
             return
@@ -372,7 +385,7 @@ class ToolQuit(ToolBase):
     """Tool to call the figure manager destroy method."""
 
     description = 'Quit the figure'
-    default_keymap = mpl.rcParams['keymap.quit']
+    default_keymap = property(lambda self: mpl.rcParams['keymap.quit'])
 
     def trigger(self, sender, event, data=None):
         Gcf.destroy_fig(self.figure)
@@ -382,47 +395,17 @@ class ToolQuitAll(ToolBase):
     """Tool to call the figure manager destroy method."""
 
     description = 'Quit all figures'
-    default_keymap = mpl.rcParams['keymap.quit_all']
+    default_keymap = property(lambda self: mpl.rcParams['keymap.quit_all'])
 
     def trigger(self, sender, event, data=None):
         Gcf.destroy_all()
 
 
-class _ToolEnableAllNavigation(ToolBase):
-    """Tool to enable all axes for toolmanager interaction."""
-
-    description = 'Enable all axes toolmanager'
-    default_keymap = mpl.rcParams['keymap.all_axes']
-
-    def trigger(self, sender, event, data=None):
-        mpl.backend_bases.key_press_handler(event, self.figure.canvas, None)
-
-
-@_api.deprecated("3.3")
-class ToolEnableAllNavigation(_ToolEnableAllNavigation):
-    pass
-
-
-class _ToolEnableNavigation(ToolBase):
-    """Tool to enable a specific axes for toolmanager interaction."""
-
-    description = 'Enable one axes toolmanager'
-    default_keymap = ('1', '2', '3', '4', '5', '6', '7', '8', '9')
-
-    def trigger(self, sender, event, data=None):
-        mpl.backend_bases.key_press_handler(event, self.figure.canvas, None)
-
-
-@_api.deprecated("3.3")
-class ToolEnableNavigation(_ToolEnableNavigation):
-    pass
-
-
 class ToolGrid(ToolBase):
     """Tool to toggle the major grids of the figure."""
 
     description = 'Toggle major grids'
-    default_keymap = mpl.rcParams['keymap.grid']
+    default_keymap = property(lambda self: mpl.rcParams['keymap.grid'])
 
     def trigger(self, sender, event, data=None):
         sentinel = str(uuid.uuid4())
@@ -437,7 +420,7 @@ class ToolMinorGrid(ToolBase):
     """Tool to toggle the major and minor grids of the figure."""
 
     description = 'Toggle major and minor grids'
-    default_keymap = mpl.rcParams['keymap.grid_minor']
+    default_keymap = property(lambda self: mpl.rcParams['keymap.grid_minor'])
 
     def trigger(self, sender, event, data=None):
         sentinel = str(uuid.uuid4())
@@ -448,16 +431,13 @@ def trigger(self, sender, event, data=None):
             mpl.backend_bases.key_press_handler(event, self.figure.canvas)
 
 
-class ToolFullScreen(ToolToggleBase):
+class ToolFullScreen(ToolBase):
     """Tool to toggle full screen."""
 
     description = 'Toggle fullscreen mode'
-    default_keymap = mpl.rcParams['keymap.fullscreen']
+    default_keymap = property(lambda self: mpl.rcParams['keymap.fullscreen'])
 
-    def enable(self, event):
-        self.figure.canvas.manager.full_screen_toggle()
-
-    def disable(self, event):
+    def trigger(self, sender, event, data=None):
         self.figure.canvas.manager.full_screen_toggle()
 
 
@@ -469,11 +449,11 @@ def trigger(self, sender, event, data=None):
             return
         super().trigger(sender, event, data)
 
-    def enable(self, event):
+    def enable(self, event=None):
         self.set_scale(event.inaxes, 'log')
         self.figure.canvas.draw_idle()
 
-    def disable(self, event):
+    def disable(self, event=None):
         self.set_scale(event.inaxes, 'linear')
         self.figure.canvas.draw_idle()
 
@@ -482,7 +462,7 @@ class ToolYScale(AxisScaleBase):
     """Tool to toggle between linear and logarithmic scales on the Y axis."""
 
     description = 'Toggle scale Y axis'
-    default_keymap = mpl.rcParams['keymap.yscale']
+    default_keymap = property(lambda self: mpl.rcParams['keymap.yscale'])
 
     def set_scale(self, ax, scale):
         ax.set_yscale(scale)
@@ -492,7 +472,7 @@ class ToolXScale(AxisScaleBase):
     """Tool to toggle between linear and logarithmic scales on the X axis."""
 
     description = 'Toggle scale X axis'
-    default_keymap = mpl.rcParams['keymap.xscale']
+    default_keymap = property(lambda self: mpl.rcParams['keymap.xscale'])
 
     def set_scale(self, ax, scale):
         ax.set_xscale(scale)
@@ -613,33 +593,6 @@ def update_home_views(self, figure=None):
             if a not in self.home_views[figure]:
                 self.home_views[figure][a] = a._get_view()
 
-    @_api.deprecated("3.3", alternative="self.figure.canvas.draw_idle()")
-    def refresh_locators(self):
-        """Redraw the canvases, update the locators."""
-        self._refresh_locators()
-
-    # Can be removed once Locator.refresh() is removed, and replaced by an
-    # inline call to self.figure.canvas.draw_idle().
-    def _refresh_locators(self):
-        for a in self.figure.get_axes():
-            xaxis = getattr(a, 'xaxis', None)
-            yaxis = getattr(a, 'yaxis', None)
-            zaxis = getattr(a, 'zaxis', None)
-            locators = []
-            if xaxis is not None:
-                locators.append(xaxis.get_major_locator())
-                locators.append(xaxis.get_minor_locator())
-            if yaxis is not None:
-                locators.append(yaxis.get_major_locator())
-                locators.append(yaxis.get_minor_locator())
-            if zaxis is not None:
-                locators.append(zaxis.get_major_locator())
-                locators.append(zaxis.get_minor_locator())
-
-            for loc in locators:
-                mpl.ticker._if_refresh_overridden_call_and_emit_deprec(loc)
-        self.figure.canvas.draw_idle()
-
     def home(self):
         """Recall the first view and position from the stack."""
         self.views[self.figure].home()
@@ -673,7 +626,7 @@ class ToolHome(ViewsPositionsBase):
 
     description = 'Reset original view'
     image = 'home'
-    default_keymap = mpl.rcParams['keymap.home']
+    default_keymap = property(lambda self: mpl.rcParams['keymap.home'])
     _on_trigger = 'home'
 
 
@@ -682,7 +635,7 @@ class ToolBack(ViewsPositionsBase):
 
     description = 'Back to previous view'
     image = 'back'
-    default_keymap = mpl.rcParams['keymap.back']
+    default_keymap = property(lambda self: mpl.rcParams['keymap.back'])
     _on_trigger = 'back'
 
 
@@ -691,7 +644,7 @@ class ToolForward(ViewsPositionsBase):
 
     description = 'Forward to next view'
     image = 'forward'
-    default_keymap = mpl.rcParams['keymap.forward']
+    default_keymap = property(lambda self: mpl.rcParams['keymap.forward'])
     _on_trigger = 'forward'
 
 
@@ -707,7 +660,7 @@ class SaveFigureBase(ToolBase):
 
     description = 'Save the figure'
     image = 'filesave'
-    default_keymap = mpl.rcParams['keymap.save']
+    default_keymap = property(lambda self: mpl.rcParams['keymap.save'])
 
 
 class ZoomPanBase(ToolToggleBase):
@@ -723,7 +676,7 @@ def __init__(self, *args):
         self.scrollthresh = .5  # .5 second scroll threshold
         self.lastscroll = time.time()-self.scrollthresh
 
-    def enable(self, event):
+    def enable(self, event=None):
         """Connect press/release events and lock the canvas."""
         self.figure.canvas.widgetlock(self)
         self._idPress = self.figure.canvas.mpl_connect(
@@ -733,7 +686,7 @@ def enable(self, event):
         self._idScroll = self.figure.canvas.mpl_connect(
             'scroll_event', self.scroll_zoom)
 
-    def disable(self, event):
+    def disable(self, event=None):
         """Release the canvas and disconnect press/release events."""
         self._cancel_action()
         self.figure.canvas.widgetlock.release(self)
@@ -782,7 +735,7 @@ class ToolZoom(ZoomPanBase):
 
     description = 'Zoom to rectangle'
     image = 'zoom_to_rect'
-    default_keymap = mpl.rcParams['keymap.zoom']
+    default_keymap = property(lambda self: mpl.rcParams['keymap.zoom'])
     cursor = cursors.SELECT_REGION
     radio_group = 'default'
 
@@ -794,7 +747,7 @@ def _cancel_action(self):
         for zoom_id in self._ids_zoom:
             self.figure.canvas.mpl_disconnect(zoom_id)
         self.toolmanager.trigger_tool('rubberband', self)
-        self.toolmanager.get_tool(_views_positions)._refresh_locators()
+        self.figure.canvas.draw_idle()
         self._xypress = None
         self._button_pressed = None
         self._ids_zoom = []
@@ -868,7 +821,7 @@ def _release(self, event):
             self._cancel_action()
             return
 
-        last_a = []
+        done_ax = []
 
         for cur_xypress in self._xypress:
             x, y = event.x, event.y
@@ -879,14 +832,9 @@ def _release(self, event):
                 return
 
             # detect twinx, twiny axes and avoid double zooming
-            twinx, twiny = False, False
-            if last_a:
-                for la in last_a:
-                    if a.get_shared_x_axes().joined(a, la):
-                        twinx = True
-                    if a.get_shared_y_axes().joined(a, la):
-                        twiny = True
-            last_a.append(a)
+            twinx = any(a.get_shared_x_axes().joined(a, a1) for a1 in done_ax)
+            twiny = any(a.get_shared_y_axes().joined(a, a1) for a1 in done_ax)
+            done_ax.append(a)
 
             if self._button_pressed == 1:
                 direction = 'in'
@@ -906,7 +854,7 @@ def _release(self, event):
 class ToolPan(ZoomPanBase):
     """Pan axes with left mouse, zoom with right."""
 
-    default_keymap = mpl.rcParams['keymap.pan']
+    default_keymap = property(lambda self: mpl.rcParams['keymap.pan'])
     description = 'Pan axes with left mouse, zoom with right'
     image = 'move'
     cursor = cursors.MOVE
@@ -921,7 +869,7 @@ def _cancel_action(self):
         self._xypress = []
         self.figure.canvas.mpl_disconnect(self._id_drag)
         self.toolmanager.messagelock.release(self)
-        self.toolmanager.get_tool(_views_positions)._refresh_locators()
+        self.figure.canvas.draw_idle()
 
     def _press(self, event):
         if event.button == 1:
@@ -971,13 +919,13 @@ def _mouse_move(self, event):
 
 class ToolHelpBase(ToolBase):
     description = 'Print tool list, shortcuts and description'
-    default_keymap = mpl.rcParams['keymap.help']
+    default_keymap = property(lambda self: mpl.rcParams['keymap.help'])
     image = 'help'
 
     @staticmethod
     def format_shortcut(key_sequence):
         """
-        Converts a shortcut string from the notation used in rc config to the
+        Convert a shortcut string from the notation used in rc config to the
         standard notation for displaying shortcuts, e.g. 'ctrl+a' -> 'Ctrl+A'.
         """
         return (key_sequence if len(key_sequence) == 1 else
@@ -1011,7 +959,7 @@ class ToolCopyToClipboardBase(ToolBase):
     """Tool to copy the figure to the clipboard."""
 
     description = 'Copy the canvas figure to clipboard'
-    default_keymap = mpl.rcParams['keymap.copy']
+    default_keymap = property(lambda self: mpl.rcParams['keymap.copy'])
 
     def trigger(self, *args, **kwargs):
         message = "Copy tool is not available"
@@ -1020,30 +968,26 @@ def trigger(self, *args, **kwargs):
 
 default_tools = {'home': ToolHome, 'back': ToolBack, 'forward': ToolForward,
                  'zoom': ToolZoom, 'pan': ToolPan,
-                 'subplots': 'ToolConfigureSubplots',
-                 'save': 'ToolSaveFigure',
+                 'subplots': ConfigureSubplotsBase,
+                 'save': SaveFigureBase,
                  'grid': ToolGrid,
                  'grid_minor': ToolMinorGrid,
                  'fullscreen': ToolFullScreen,
                  'quit': ToolQuit,
                  'quit_all': ToolQuitAll,
-                 'allnav': _ToolEnableAllNavigation,
-                 'nav': _ToolEnableNavigation,
                  'xscale': ToolXScale,
                  'yscale': ToolYScale,
                  'position': ToolCursorPosition,
                  _views_positions: ToolViewsPositions,
-                 'cursor': 'ToolSetCursor',
-                 'rubberband': 'ToolRubberband',
-                 'help': 'ToolHelp',
-                 'copy': 'ToolCopyToClipboard',
+                 'cursor': SetCursorBase,
+                 'rubberband': RubberbandBase,
+                 'help': ToolHelpBase,
+                 'copy': ToolCopyToClipboardBase,
                  }
-"""Default tools"""
 
 default_toolbar_tools = [['navigation', ['home', 'back', 'forward']],
                          ['zoompan', ['pan', 'zoom', 'subplots']],
                          ['io', ['save', 'help']]]
-"""Default tools in the toolbar"""
 
 
 def add_tools_to_manager(toolmanager, tools=default_tools):
@@ -1055,8 +999,8 @@ def add_tools_to_manager(toolmanager, tools=default_tools):
     toolmanager : `.backend_managers.ToolManager`
         Manager to which the tools are added.
     tools : {str: class_like}, optional
-        The tools to add in a {name: tool} dict, see `add_tool` for more
-        info.
+        The tools to add in a {name: tool} dict, see
+        `.backend_managers.ToolManager.add_tool` for more info.
     """
 
     for name, tool in tools.items():
@@ -1070,11 +1014,12 @@ def add_tools_to_container(container, tools=default_toolbar_tools):
     Parameters
     ----------
     container : Container
-        `backend_bases.ToolContainerBase` object that will get the tools added.
+        `.backend_bases.ToolContainerBase` object that will get the tools
+        added.
     tools : list, optional
         List in the form ``[[group1, [tool1, tool2 ...]], [group2, [...]]]``
         where the tools ``[tool1, tool2, ...]`` will display in group1.
-        See `add_tool` for details.
+        See `.backend_bases.ToolContainerBase.add_tool` for details.
     """
 
     for group, grouptools in tools:
diff --git a/lib/matplotlib/backends/__init__.py b/lib/matplotlib/backends/__init__.py
index 6f4015d6ea8e..3e687f85b0be 100644
--- a/lib/matplotlib/backends/__init__.py
+++ b/lib/matplotlib/backends/__init__.py
@@ -1,2 +1,3 @@
 # NOTE: plt.switch_backend() (called at import time) will add a "backend"
 # attribute here for backcompat.
+_QT_FORCE_QT5_BINDING = False
diff --git a/lib/matplotlib/backends/_backend_gtk.py b/lib/matplotlib/backends/_backend_gtk.py
new file mode 100644
index 000000000000..7eda5b924268
--- /dev/null
+++ b/lib/matplotlib/backends/_backend_gtk.py
@@ -0,0 +1,326 @@
+"""
+Common code for GTK3 and GTK4 backends.
+"""
+
+import logging
+import sys
+
+import matplotlib as mpl
+from matplotlib import _api, backend_tools, cbook
+from matplotlib._pylab_helpers import Gcf
+from matplotlib.backend_bases import (
+    _Backend, FigureManagerBase, NavigationToolbar2, TimerBase)
+from matplotlib.backend_tools import Cursors
+
+import gi
+# The GTK3/GTK4 backends will have already called `gi.require_version` to set
+# the desired GTK.
+from gi.repository import Gdk, Gio, GLib, Gtk
+
+
+try:
+    gi.require_foreign("cairo")
+except ImportError as e:
+    raise ImportError("Gtk-based backends require cairo") from e
+
+_log = logging.getLogger(__name__)
+_application = None  # Placeholder
+
+
+def _shutdown_application(app):
+    # The application might prematurely shut down if Ctrl-C'd out of IPython,
+    # so close all windows.
+    for win in app.get_windows():
+        win.close()
+    # The PyGObject wrapper incorrectly thinks that None is not allowed, or we
+    # would call this:
+    # Gio.Application.set_default(None)
+    # Instead, we set this property and ignore default applications with it:
+    app._created_by_matplotlib = True
+    global _application
+    _application = None
+
+
+def _create_application():
+    global _application
+
+    if _application is None:
+        app = Gio.Application.get_default()
+        if app is None or getattr(app, '_created_by_matplotlib', False):
+            # display_is_valid returns False only if on Linux and neither X11
+            # nor Wayland display can be opened.
+            if not mpl._c_internal_utils.display_is_valid():
+                raise RuntimeError('Invalid DISPLAY variable')
+            _application = Gtk.Application.new('org.matplotlib.Matplotlib3',
+                                               Gio.ApplicationFlags.NON_UNIQUE)
+            # The activate signal must be connected, but we don't care for
+            # handling it, since we don't do any remote processing.
+            _application.connect('activate', lambda *args, **kwargs: None)
+            _application.connect('shutdown', _shutdown_application)
+            _application.register()
+            cbook._setup_new_guiapp()
+        else:
+            _application = app
+
+    return _application
+
+
+def mpl_to_gtk_cursor_name(mpl_cursor):
+    return _api.check_getitem({
+        Cursors.MOVE: "move",
+        Cursors.HAND: "pointer",
+        Cursors.POINTER: "default",
+        Cursors.SELECT_REGION: "crosshair",
+        Cursors.WAIT: "wait",
+        Cursors.RESIZE_HORIZONTAL: "ew-resize",
+        Cursors.RESIZE_VERTICAL: "ns-resize",
+    }, cursor=mpl_cursor)
+
+
+class TimerGTK(TimerBase):
+    """Subclass of `.TimerBase` using GTK timer events."""
+
+    def __init__(self, *args, **kwargs):
+        self._timer = None
+        super().__init__(*args, **kwargs)
+
+    def _timer_start(self):
+        # Need to stop it, otherwise we potentially leak a timer id that will
+        # never be stopped.
+        self._timer_stop()
+        self._timer = GLib.timeout_add(self._interval, self._on_timer)
+
+    def _timer_stop(self):
+        if self._timer is not None:
+            GLib.source_remove(self._timer)
+            self._timer = None
+
+    def _timer_set_interval(self):
+        # Only stop and restart it if the timer has already been started.
+        if self._timer is not None:
+            self._timer_stop()
+            self._timer_start()
+
+    def _on_timer(self):
+        super()._on_timer()
+
+        # Gtk timeout_add() requires that the callback returns True if it
+        # is to be called again.
+        if self.callbacks and not self._single:
+            return True
+        else:
+            self._timer = None
+            return False
+
+
+class _FigureManagerGTK(FigureManagerBase):
+    """
+    Attributes
+    ----------
+    canvas : `FigureCanvas`
+        The FigureCanvas instance
+    num : int or str
+        The Figure number
+    toolbar : Gtk.Toolbar or Gtk.Box
+        The toolbar
+    vbox : Gtk.VBox
+        The Gtk.VBox containing the canvas and toolbar
+    window : Gtk.Window
+        The Gtk.Window
+    """
+
+    def __init__(self, canvas, num):
+        self._gtk_ver = gtk_ver = Gtk.get_major_version()
+
+        app = _create_application()
+        self.window = Gtk.Window()
+        app.add_window(self.window)
+        super().__init__(canvas, num)
+
+        if gtk_ver == 3:
+            self.window.set_wmclass("matplotlib", "Matplotlib")
+            icon_ext = "png" if sys.platform == "win32" else "svg"
+            self.window.set_icon_from_file(
+                str(cbook._get_data_path(f"images/matplotlib.{icon_ext}")))
+
+        self.vbox = Gtk.Box()
+        self.vbox.set_property("orientation", Gtk.Orientation.VERTICAL)
+
+        if gtk_ver == 3:
+            self.window.add(self.vbox)
+            self.vbox.show()
+            self.canvas.show()
+            self.vbox.pack_start(self.canvas, True, True, 0)
+        elif gtk_ver == 4:
+            self.window.set_child(self.vbox)
+            self.vbox.prepend(self.canvas)
+
+        # calculate size for window
+        w, h = self.canvas.get_width_height()
+
+        if self.toolbar is not None:
+            if gtk_ver == 3:
+                self.toolbar.show()
+                self.vbox.pack_end(self.toolbar, False, False, 0)
+            elif gtk_ver == 4:
+                sw = Gtk.ScrolledWindow(vscrollbar_policy=Gtk.PolicyType.NEVER)
+                sw.set_child(self.toolbar)
+                self.vbox.append(sw)
+            min_size, nat_size = self.toolbar.get_preferred_size()
+            h += nat_size.height
+
+        self.window.set_default_size(w, h)
+
+        self._destroying = False
+        self.window.connect("destroy", lambda *args: Gcf.destroy(self))
+        self.window.connect({3: "delete_event", 4: "close-request"}[gtk_ver],
+                            lambda *args: Gcf.destroy(self))
+        if mpl.is_interactive():
+            self.window.show()
+            self.canvas.draw_idle()
+
+        self.canvas.grab_focus()
+
+    def destroy(self, *args):
+        if self._destroying:
+            # Otherwise, this can be called twice when the user presses 'q',
+            # which calls Gcf.destroy(self), then this destroy(), then triggers
+            # Gcf.destroy(self) once again via
+            # `connect("destroy", lambda *args: Gcf.destroy(self))`.
+            return
+        self._destroying = True
+        self.window.destroy()
+        self.canvas.destroy()
+
+    def show(self):
+        # show the figure window
+        self.window.show()
+        self.canvas.draw()
+        if mpl.rcParams["figure.raise_window"]:
+            meth_name = {3: "get_window", 4: "get_surface"}[self._gtk_ver]
+            if getattr(self.window, meth_name)():
+                self.window.present()
+            else:
+                # If this is called by a callback early during init,
+                # self.window (a GtkWindow) may not have an associated
+                # low-level GdkWindow (on GTK3) or GdkSurface (on GTK4) yet,
+                # and present() would crash.
+                _api.warn_external("Cannot raise window yet to be setup")
+
+    def full_screen_toggle(self):
+        is_fullscreen = {
+            3: lambda w: (w.get_window().get_state()
+                          & Gdk.WindowState.FULLSCREEN),
+            4: lambda w: w.is_fullscreen(),
+        }[self._gtk_ver]
+        if is_fullscreen(self.window):
+            self.window.unfullscreen()
+        else:
+            self.window.fullscreen()
+
+    def get_window_title(self):
+        return self.window.get_title()
+
+    def set_window_title(self, title):
+        self.window.set_title(title)
+
+    def resize(self, width, height):
+        width = int(width / self.canvas.device_pixel_ratio)
+        height = int(height / self.canvas.device_pixel_ratio)
+        if self.toolbar:
+            min_size, nat_size = self.toolbar.get_preferred_size()
+            height += nat_size.height
+        canvas_size = self.canvas.get_allocation()
+        if self._gtk_ver >= 4 or canvas_size.width == canvas_size.height == 1:
+            # A canvas size of (1, 1) cannot exist in most cases, because
+            # window decorations would prevent such a small window. This call
+            # must be before the window has been mapped and widgets have been
+            # sized, so just change the window's starting size.
+            self.window.set_default_size(width, height)
+        else:
+            self.window.resize(width, height)
+
+
+class _NavigationToolbar2GTK(NavigationToolbar2):
+    # Must be implemented in GTK3/GTK4 backends:
+    # * __init__
+    # * save_figure
+
+    def set_message(self, s):
+        escaped = GLib.markup_escape_text(s)
+        self.message.set_markup(f'<small>{escaped}</small>')
+
+    def draw_rubberband(self, event, x0, y0, x1, y1):
+        height = self.canvas.figure.bbox.height
+        y1 = height - y1
+        y0 = height - y0
+        rect = [int(val) for val in (x0, y0, x1 - x0, y1 - y0)]
+        self.canvas._draw_rubberband(rect)
+
+    def remove_rubberband(self):
+        self.canvas._draw_rubberband(None)
+
+    def _update_buttons_checked(self):
+        for name, active in [("Pan", "PAN"), ("Zoom", "ZOOM")]:
+            button = self._gtk_ids.get(name)
+            if button:
+                with button.handler_block(button._signal_handler):
+                    button.set_active(self.mode.name == active)
+
+    def pan(self, *args):
+        super().pan(*args)
+        self._update_buttons_checked()
+
+    def zoom(self, *args):
+        super().zoom(*args)
+        self._update_buttons_checked()
+
+    def set_history_buttons(self):
+        can_backward = self._nav_stack._pos > 0
+        can_forward = self._nav_stack._pos < len(self._nav_stack._elements) - 1
+        if 'Back' in self._gtk_ids:
+            self._gtk_ids['Back'].set_sensitive(can_backward)
+        if 'Forward' in self._gtk_ids:
+            self._gtk_ids['Forward'].set_sensitive(can_forward)
+
+
+class RubberbandGTK(backend_tools.RubberbandBase):
+    def draw_rubberband(self, x0, y0, x1, y1):
+        _NavigationToolbar2GTK.draw_rubberband(
+            self._make_classic_style_pseudo_toolbar(), None, x0, y0, x1, y1)
+
+    def remove_rubberband(self):
+        _NavigationToolbar2GTK.remove_rubberband(
+            self._make_classic_style_pseudo_toolbar())
+
+
+class ConfigureSubplotsGTK(backend_tools.ConfigureSubplotsBase):
+    def trigger(self, *args):
+        _NavigationToolbar2GTK.configure_subplots(self, None)
+
+
+class _BackendGTK(_Backend):
+    backend_version = "%s.%s.%s" % (
+        Gtk.get_major_version(),
+        Gtk.get_minor_version(),
+        Gtk.get_micro_version(),
+    )
+
+    @staticmethod
+    def mainloop():
+        global _application
+        if _application is None:
+            return
+
+        try:
+            _application.run()  # Quits when all added windows close.
+        except KeyboardInterrupt:
+            # Ensure all windows can process their close event from
+            # _shutdown_application.
+            context = GLib.MainContext.default()
+            while context.pending():
+                context.iteration(True)
+            raise
+        finally:
+            # Running after quit is undefined, so create a new one next time.
+            _application = None
diff --git a/lib/matplotlib/backends/_backend_pdf_ps.py b/lib/matplotlib/backends/_backend_pdf_ps.py
index 6c4f129b927f..4ab23915e9e2 100644
--- a/lib/matplotlib/backends/_backend_pdf_ps.py
+++ b/lib/matplotlib/backends/_backend_pdf_ps.py
@@ -2,12 +2,14 @@
 Common functionality between the PDF and PS backends.
 """
 
+from io import BytesIO
 import functools
 
+from fontTools import subset
+
 import matplotlib as mpl
-from matplotlib import _api
 from .. import font_manager, ft2font
-from ..afm import AFM
+from .._afm import AFM
 from ..backend_bases import RendererBase
 
 
@@ -17,6 +19,39 @@ def _cached_get_afm_from_fname(fname):
         return AFM(fh)
 
 
+def get_glyphs_subset(fontfile, characters):
+    """
+    Subset a TTF font
+
+    Reads the named fontfile and restricts the font to the characters.
+    Returns a serialization of the subset font as file-like object.
+
+    Parameters
+    ----------
+    symbol : str
+        Path to the font file
+    characters : str
+        Continuous set of characters to include in subset
+    """
+
+    options = subset.Options(glyph_names=True, recommended_glyphs=True)
+
+    # prevent subsetting FontForge Timestamp and other tables
+    options.drop_tables += ['FFTM', 'PfEd', 'BDF']
+
+    # if fontfile is a ttc, specify font number
+    if fontfile.endswith(".ttc"):
+        options.font_number = 0
+
+    with subset.load_font(fontfile, options) as font:
+        subsetter = subset.Subsetter(options=options)
+        subsetter.populate(text=characters)
+        subsetter.subset(font)
+        fh = BytesIO()
+        font.save(fh, reorderTables=False)
+        return fh
+
+
 class CharacterTracker:
     """
     Helper for font subsetting by the pdf and ps backends.
@@ -28,29 +63,15 @@ class CharacterTracker:
     def __init__(self):
         self.used = {}
 
-    @_api.deprecated("3.3")
-    @property
-    def used_characters(self):
-        d = {}
-        for fname, chars in self.used.items():
-            realpath, stat_key = mpl.cbook.get_realpath_and_stat(fname)
-            d[stat_key] = (realpath, chars)
-        return d
-
     def track(self, font, s):
         """Record that string *s* is being typeset using font *font*."""
-        if isinstance(font, str):
-            # Unused, can be removed after removal of track_characters.
-            fname = font
-        else:
-            fname = font.fname
-        self.used.setdefault(fname, set()).update(map(ord, s))
+        char_to_font = font._get_fontmap(s)
+        for _c, _f in char_to_font.items():
+            self.used.setdefault(_f.fname, set()).add(ord(_c))
 
-    # Not public, can be removed when pdf/ps merge_used_characters is removed.
-    def merge(self, other):
-        """Update self with a font path to character codepoints."""
-        for fname, charset in other.items():
-            self.used.setdefault(fname, set()).update(charset)
+    def track_glyph(self, font, glyph):
+        """Record that codepoint *glyph* is being typeset using font *font*."""
+        self.used.setdefault(font.fname, set()).add(glyph)
 
 
 class RendererPDFPSBase(RendererBase):
@@ -89,12 +110,7 @@ def get_text_width_height_descent(self, s, prop, ismath):
                 s, fontsize, renderer=self)
             return w, h, d
         elif ismath:
-            # Circular import.
-            from matplotlib.backends.backend_ps import RendererPS
-            parse = self._text2path.mathtext_parser.parse(
-                s, 72, prop,
-                _force_standard_ps_fonts=(isinstance(self, RendererPS)
-                                          and mpl.rcParams["ps.useafm"]))
+            parse = self._text2path.mathtext_parser.parse(s, 72, prop)
             return parse.width, parse.height, parse.depth
         elif mpl.rcParams[self._use_afm_rc_name]:
             font = self._get_font_afm(prop)
@@ -121,8 +137,8 @@ def _get_font_afm(self, prop):
         return _cached_get_afm_from_fname(fname)
 
     def _get_font_ttf(self, prop):
-        fname = font_manager.findfont(prop)
-        font = font_manager.get_font(fname)
+        fnames = font_manager.fontManager._find_fonts_by_props(prop)
+        font = font_manager.get_font(fnames)
         font.clear()
         font.set_size(prop.get_size_in_points(), 72)
         return font
diff --git a/lib/matplotlib/backends/_backend_tk.py b/lib/matplotlib/backends/_backend_tk.py
index c13546ddca04..2aec1440f6c6 100644
--- a/lib/matplotlib/backends/_backend_tk.py
+++ b/lib/matplotlib/backends/_backend_tk.py
@@ -5,34 +5,34 @@
 import os.path
 import sys
 import tkinter as tk
-from tkinter.simpledialog import SimpleDialog
 import tkinter.filedialog
+import tkinter.font
 import tkinter.messagebox
+from tkinter.simpledialog import SimpleDialog
 
 import numpy as np
+from PIL import Image, ImageTk
 
 import matplotlib as mpl
 from matplotlib import _api, backend_tools, cbook, _c_internal_utils
 from matplotlib.backend_bases import (
     _Backend, FigureCanvasBase, FigureManagerBase, NavigationToolbar2,
-    StatusbarBase, TimerBase, ToolContainerBase, cursors, _Mode)
+    TimerBase, ToolContainerBase, cursors, _Mode,
+    CloseEvent, KeyEvent, LocationEvent, MouseEvent, ResizeEvent)
 from matplotlib._pylab_helpers import Gcf
-from matplotlib.figure import Figure
-from matplotlib.widgets import SubplotTool
 from . import _tkagg
 
 
 _log = logging.getLogger(__name__)
-
-backend_version = tk.TkVersion
-
 cursord = {
     cursors.MOVE: "fleur",
     cursors.HAND: "hand2",
     cursors.POINTER: "arrow",
     cursors.SELECT_REGION: "tcross",
     cursors.WAIT: "watch",
-    }
+    cursors.RESIZE_HORIZONTAL: "sb_h_double_arrow",
+    cursors.RESIZE_VERTICAL: "sb_v_double_arrow",
+}
 
 
 @contextmanager
@@ -49,6 +49,9 @@ def _restore_foreground_window_at_end():
 # Initialize to a non-empty string that is not a Tcl command
 _blit_tcl_name = "mpl_blit_" + uuid.uuid4().hex
 
+TK_PHOTO_COMPOSITE_OVERLAY = 0  # apply transparency rules pixel-wise
+TK_PHOTO_COMPOSITE_SET = 1  # set image buffer directly
+
 
 def _blit(argsid):
     """
@@ -56,15 +59,10 @@ def _blit(argsid):
 
     *argsid* is a unique string identifier to fetch the correct arguments from
     the ``_blit_args`` dict, since arguments cannot be passed directly.
-
-    photoimage blanking must occur in the same event and thread as blitting
-    to avoid flickering.
     """
-    photoimage, dataptr, offsets, bboxptr, blank = _blit_args.pop(argsid)
-    if blank:
-        photoimage.blank()
-    _tkagg.blit(
-        photoimage.tk.interpaddr(), str(photoimage), dataptr, offsets, bboxptr)
+    photoimage, dataptr, offsets, bboxptr, comp_rule = _blit_args.pop(argsid)
+    _tkagg.blit(photoimage.tk.interpaddr(), str(photoimage), dataptr,
+                comp_rule, offsets, bboxptr)
 
 
 def blit(photoimage, aggimage, offsets, bbox=None):
@@ -77,7 +75,9 @@ def blit(photoimage, aggimage, offsets, bbox=None):
     for big-endian ARGB32 (i.e. ARGB8888) data.
 
     If *bbox* is passed, it defines the region that gets blitted. That region
-    will NOT be blanked before blitting.
+    will be composed with the previous data according to the alpha channel.
+    Blitting will be clipped to pixels inside the canvas, including silently
+    doing nothing if the *bbox* region is entirely outside the canvas.
 
     Tcl events must be dispatched to trigger a blit from a non-Tcl thread.
     """
@@ -90,11 +90,13 @@ def blit(photoimage, aggimage, offsets, bbox=None):
         x2 = min(math.ceil(x2), width)
         y1 = max(math.floor(y1), 0)
         y2 = min(math.ceil(y2), height)
+        if (x1 > x2) or (y1 > y2):
+            return
         bboxptr = (x1, x2, y1, y2)
-        blank = False
+        comp_rule = TK_PHOTO_COMPOSITE_OVERLAY
     else:
         bboxptr = (0, width, 0, height)
-        blank = True
+        comp_rule = TK_PHOTO_COMPOSITE_SET
 
     # NOTE: _tkagg.blit is thread unsafe and will crash the process if called
     # from a thread (GH#13293). Instead of blanking and blitting here,
@@ -103,7 +105,7 @@ def blit(photoimage, aggimage, offsets, bbox=None):
 
     # tkapp.call coerces all arguments to strings, so to avoid string parsing
     # within _blit, pack up the arguments into a global data structure.
-    args = photoimage, dataptr, offsets, bboxptr, blank
+    args = photoimage, dataptr, offsets, bboxptr, comp_rule
     # Need a unique key to avoid thread races.
     # Again, make the key a string to avoid string parsing in _blit.
     argsid = str(id(args))
@@ -158,23 +160,22 @@ def _on_timer(self):
 
 class FigureCanvasTk(FigureCanvasBase):
     required_interactive_framework = "tk"
+    manager_class = _api.classproperty(lambda cls: FigureManagerTk)
 
-    @_api.delete_parameter(
-        "3.4", "resize_callback",
-        alternative="get_tk_widget().bind('<Configure>', ..., True)")
-    def __init__(self, figure=None, master=None, resize_callback=None):
+    def __init__(self, figure=None, master=None):
         super().__init__(figure)
-        self._idle = True
-        self._idle_callback = None
-        w, h = self.figure.bbox.size.astype(int)
+        self._idle_draw_id = None
+        self._event_loop_id = None
+        w, h = self.get_width_height(physical=True)
         self._tkcanvas = tk.Canvas(
             master=master, background="white",
             width=w, height=h, borderwidth=0, highlightthickness=0)
         self._tkphoto = tk.PhotoImage(
             master=self._tkcanvas, width=w, height=h)
         self._tkcanvas.create_image(w//2, h//2, image=self._tkphoto)
-        self._resize_callback = resize_callback
         self._tkcanvas.bind("<Configure>", self.resize)
+        if sys.platform == 'win32':
+            self._tkcanvas.bind("<Map>", self._update_device_pixel_ratio)
         self._tkcanvas.bind("<Key>", self.key_press)
         self._tkcanvas.bind("<Motion>", self.motion_notify_event)
         self._tkcanvas.bind("<Enter>", self.enter_notify_event)
@@ -195,7 +196,7 @@ def __init__(self, figure=None, master=None, resize_callback=None):
         # Mouse wheel for windows goes to the window with the focus.
         # Since the canvas won't usually have the focus, bind the
         # event to the window containing the canvas instead.
-        # See http://wiki.tcl.tk/3893 (mousewheel) for details
+        # See https://wiki.tcl-lang.org/3893 (mousewheel) for details
         root = self._tkcanvas.winfo_toplevel()
         root.bind("<MouseWheel>", self.scroll_event_windows, "+")
 
@@ -203,16 +204,28 @@ def __init__(self, figure=None, master=None, resize_callback=None):
         # to the window and filter.
         def filter_destroy(event):
             if event.widget is self._tkcanvas:
-                self.close_event()
+                CloseEvent("close_event", self)._process()
         root.bind("<Destroy>", filter_destroy, "+")
 
-        self._master = master
         self._tkcanvas.focus_set()
 
+        self._rubberband_rect_black = None
+        self._rubberband_rect_white = None
+
+    def _update_device_pixel_ratio(self, event=None):
+        # Tk gives scaling with respect to 72 DPI, but Windows screens are
+        # scaled vs 96 dpi, and pixel ratio settings are given in whole
+        # percentages, so round to 2 digits.
+        ratio = round(self._tkcanvas.tk.call('tk', 'scaling') / (96 / 72), 2)
+        if self._set_device_pixel_ratio(ratio):
+            # The easiest way to resize the canvas is to resize the canvas
+            # widget itself, since we implement all the logic for resizing the
+            # canvas backing store on that event.
+            w, h = self.get_width_height(physical=True)
+            self._tkcanvas.configure(width=w, height=h)
+
     def resize(self, event):
         width, height = event.width, event.height
-        if self._resize_callback is not None:
-            self._resize_callback(event)
 
         # compute desired figure size in inches
         dpival = self.figure.dpi
@@ -225,22 +238,21 @@ def resize(self, event):
             master=self._tkcanvas, width=int(width), height=int(height))
         self._tkcanvas.create_image(
             int(width / 2), int(height / 2), image=self._tkphoto)
-        self.resize_event()
+        ResizeEvent("resize_event", self)._process()
+        self.draw_idle()
 
     def draw_idle(self):
         # docstring inherited
-        if not self._idle:
+        if self._idle_draw_id:
             return
 
-        self._idle = False
-
         def idle_draw(*args):
             try:
                 self.draw()
             finally:
-                self._idle = True
+                self._idle_draw_id = None
 
-        self._idle_callback = self._tkcanvas.after_idle(idle_draw)
+        self._idle_draw_id = self._tkcanvas.after_idle(idle_draw)
 
     def get_tk_widget(self):
         """
@@ -251,70 +263,69 @@ def get_tk_widget(self):
         """
         return self._tkcanvas
 
+    def _event_mpl_coords(self, event):
+        # calling canvasx/canvasy allows taking scrollbars into account (i.e.
+        # the top of the widget may have been scrolled out of view).
+        return (self._tkcanvas.canvasx(event.x),
+                # flipy so y=0 is bottom of canvas
+                self.figure.bbox.height - self._tkcanvas.canvasy(event.y))
+
     def motion_notify_event(self, event):
-        x = event.x
-        # flipy so y=0 is bottom of canvas
-        y = self.figure.bbox.height - event.y
-        super().motion_notify_event(x, y, guiEvent=event)
+        MouseEvent("motion_notify_event", self,
+                   *self._event_mpl_coords(event),
+                   guiEvent=event)._process()
 
     def enter_notify_event(self, event):
-        x = event.x
-        # flipy so y=0 is bottom of canvas
-        y = self.figure.bbox.height - event.y
-        super().enter_notify_event(guiEvent=event, xy=(x, y))
+        LocationEvent("figure_enter_event", self,
+                      *self._event_mpl_coords(event),
+                      guiEvent=event)._process()
 
-    def button_press_event(self, event, dblclick=False):
-        x = event.x
-        # flipy so y=0 is bottom of canvas
-        y = self.figure.bbox.height - event.y
-        num = getattr(event, 'num', None)
+    def leave_notify_event(self, event):
+        LocationEvent("figure_leave_event", self,
+                      *self._event_mpl_coords(event),
+                      guiEvent=event)._process()
 
-        if sys.platform == 'darwin':
-            # 2 and 3 were reversed on the OSX platform I tested under tkagg.
-            if num == 2:
-                num = 3
-            elif num == 3:
-                num = 2
+    def button_press_event(self, event, dblclick=False):
+        # set focus to the canvas so that it can receive keyboard events
+        self._tkcanvas.focus_set()
 
-        super().button_press_event(x, y, num,
-                                   dblclick=dblclick, guiEvent=event)
+        num = getattr(event, 'num', None)
+        if sys.platform == 'darwin':  # 2 and 3 are reversed.
+            num = {2: 3, 3: 2}.get(num, num)
+        MouseEvent("button_press_event", self,
+                   *self._event_mpl_coords(event), num, dblclick=dblclick,
+                   guiEvent=event)._process()
 
     def button_dblclick_event(self, event):
         self.button_press_event(event, dblclick=True)
 
     def button_release_event(self, event):
-        x = event.x
-        # flipy so y=0 is bottom of canvas
-        y = self.figure.bbox.height - event.y
-
         num = getattr(event, 'num', None)
-
-        if sys.platform == 'darwin':
-            # 2 and 3 were reversed on the OSX platform I tested under tkagg.
-            if num == 2:
-                num = 3
-            elif num == 3:
-                num = 2
-
-        super().button_release_event(x, y, num, guiEvent=event)
+        if sys.platform == 'darwin':  # 2 and 3 are reversed.
+            num = {2: 3, 3: 2}.get(num, num)
+        MouseEvent("button_release_event", self,
+                   *self._event_mpl_coords(event), num,
+                   guiEvent=event)._process()
 
     def scroll_event(self, event):
-        x = event.x
-        y = self.figure.bbox.height - event.y
         num = getattr(event, 'num', None)
         step = 1 if num == 4 else -1 if num == 5 else 0
-        super().scroll_event(x, y, step, guiEvent=event)
+        MouseEvent("scroll_event", self,
+                   *self._event_mpl_coords(event), step=step,
+                   guiEvent=event)._process()
 
     def scroll_event_windows(self, event):
         """MouseWheel event processor"""
         # need to find the window that contains the mouse
         w = event.widget.winfo_containing(event.x_root, event.y_root)
-        if w == self._tkcanvas:
-            x = event.x_root - w.winfo_rootx()
-            y = event.y_root - w.winfo_rooty()
-            y = self.figure.bbox.height - y
-            step = event.delta/120.
-            FigureCanvasBase.scroll_event(self, x, y, step, guiEvent=event)
+        if w != self._tkcanvas:
+            return
+        x = self._tkcanvas.canvasx(event.x_root - w.winfo_rootx())
+        y = (self.figure.bbox.height
+             - self._tkcanvas.canvasy(event.y_root - w.winfo_rooty()))
+        step = event.delta / 120
+        MouseEvent("scroll_event", self,
+                   x, y, step=step, guiEvent=event)._process()
 
     def _get_key(self, event):
         unikey = event.char
@@ -356,12 +367,14 @@ def _get_key(self, event):
         return key
 
     def key_press(self, event):
-        key = self._get_key(event)
-        FigureCanvasBase.key_press_event(self, key, guiEvent=event)
+        KeyEvent("key_press_event", self,
+                 self._get_key(event), *self._event_mpl_coords(event),
+                 guiEvent=event)._process()
 
     def key_release(self, event):
-        key = self._get_key(event)
-        FigureCanvasBase.key_release_event(self, key, guiEvent=event)
+        KeyEvent("key_release_event", self,
+                 self._get_key(event), *self._event_mpl_coords(event),
+                 guiEvent=event)._process()
 
     def new_timer(self, *args, **kwargs):
         # docstring inherited
@@ -369,17 +382,32 @@ def new_timer(self, *args, **kwargs):
 
     def flush_events(self):
         # docstring inherited
-        self._master.update()
+        self._tkcanvas.update()
 
     def start_event_loop(self, timeout=0):
         # docstring inherited
         if timeout > 0:
-            self._master.after(int(1000*timeout), self.stop_event_loop)
-        self._master.mainloop()
+            milliseconds = int(1000 * timeout)
+            if milliseconds > 0:
+                self._event_loop_id = self._tkcanvas.after(
+                    milliseconds, self.stop_event_loop)
+            else:
+                self._event_loop_id = self._tkcanvas.after_idle(
+                    self.stop_event_loop)
+        self._tkcanvas.mainloop()
 
     def stop_event_loop(self):
         # docstring inherited
-        self._master.quit()
+        if self._event_loop_id:
+            self._tkcanvas.after_cancel(self._event_loop_id)
+            self._event_loop_id = None
+        self._tkcanvas.quit()
+
+    def set_cursor(self, cursor):
+        try:
+            self._tkcanvas.configure(cursor=cursord[cursor])
+        except tkinter.TclError:
+            pass
 
 
 class FigureManagerTk(FigureManagerBase):
@@ -404,24 +432,64 @@ def __init__(self, canvas, num, window):
         self.window.withdraw()
         # packing toolbar first, because if space is getting low, last packed
         # widget is getting shrunk first (-> the canvas)
-        self.toolbar = self._get_toolbar()
         self.canvas._tkcanvas.pack(side=tk.TOP, fill=tk.BOTH, expand=1)
 
-        if self.toolmanager:
-            backend_tools.add_tools_to_manager(self.toolmanager)
-            if self.toolbar:
-                backend_tools.add_tools_to_container(self.toolbar)
+        # If the window has per-monitor DPI awareness, then setup a Tk variable
+        # to store the DPI, which will be updated by the C code, and the trace
+        # will handle it on the Python side.
+        window_frame = int(window.wm_frame(), 16)
+        self._window_dpi = tk.IntVar(master=window, value=96,
+                                     name=f'window_dpi{window_frame}')
+        self._window_dpi_cbname = ''
+        if _tkagg.enable_dpi_awareness(window_frame, window.tk.interpaddr()):
+            self._window_dpi_cbname = self._window_dpi.trace_add(
+                'write', self._update_window_dpi)
 
         self._shown = False
 
-    def _get_toolbar(self):
-        if mpl.rcParams['toolbar'] == 'toolbar2':
-            toolbar = NavigationToolbar2Tk(self.canvas, self.window)
-        elif mpl.rcParams['toolbar'] == 'toolmanager':
-            toolbar = ToolbarTk(self.toolmanager, self.window)
-        else:
-            toolbar = None
-        return toolbar
+    @classmethod
+    def create_with_canvas(cls, canvas_class, figure, num):
+        # docstring inherited
+        with _restore_foreground_window_at_end():
+            if cbook._get_running_interactive_framework() is None:
+                cbook._setup_new_guiapp()
+                _c_internal_utils.Win32_SetProcessDpiAwareness_max()
+            window = tk.Tk(className="matplotlib")
+            window.withdraw()
+
+            # Put a Matplotlib icon on the window rather than the default tk
+            # icon. See https://www.tcl.tk/man/tcl/TkCmd/wm.html#M50
+            #
+            # `ImageTk` can be replaced with `tk` whenever the minimum
+            # supported Tk version is increased to 8.6, as Tk 8.6+ natively
+            # supports PNG images.
+            icon_fname = str(cbook._get_data_path(
+                'images/matplotlib.png'))
+            icon_img = ImageTk.PhotoImage(file=icon_fname, master=window)
+
+            icon_fname_large = str(cbook._get_data_path(
+                'images/matplotlib_large.png'))
+            icon_img_large = ImageTk.PhotoImage(
+                file=icon_fname_large, master=window)
+            try:
+                window.iconphoto(False, icon_img_large, icon_img)
+            except Exception as exc:
+                # log the failure (due e.g. to Tk version), but carry on
+                _log.info('Could not load matplotlib icon: %s', exc)
+
+            canvas = canvas_class(figure, master=window)
+            manager = cls(canvas, num, window)
+            if mpl.is_interactive():
+                manager.show()
+                canvas.draw_idle()
+            return manager
+
+    def _update_window_dpi(self, *args):
+        newdpi = self._window_dpi.get()
+        self.window.call('tk', 'scaling', newdpi / 72)
+        if self.toolbar and hasattr(self.toolbar, '_rescale'):
+            self.toolbar._rescale()
+        self.canvas._update_device_pixel_ratio()
 
     def resize(self, width, height):
         max_size = 1_400_000  # the measured max on xorg 1.20.8 was 1_409_023
@@ -444,6 +512,7 @@ def destroy(*args):
                     Gcf.destroy(self)
                 self.window.protocol("WM_DELETE_WINDOW", destroy)
                 self.window.deiconify()
+                self.canvas._tkcanvas.focus_set()
             else:
                 self.canvas.draw_idle()
             if mpl.rcParams['figure.raise_window']:
@@ -452,21 +521,30 @@ def destroy(*args):
             self._shown = True
 
     def destroy(self, *args):
-        if self.canvas._idle_callback:
-            self.canvas._tkcanvas.after_cancel(self.canvas._idle_callback)
+        if self.canvas._idle_draw_id:
+            self.canvas._tkcanvas.after_cancel(self.canvas._idle_draw_id)
+        if self.canvas._event_loop_id:
+            self.canvas._tkcanvas.after_cancel(self.canvas._event_loop_id)
+        if self._window_dpi_cbname:
+            self._window_dpi.trace_remove('write', self._window_dpi_cbname)
 
         # NOTE: events need to be flushed before issuing destroy (GH #9956),
-        # however, self.window.update() can break user code. This is the
-        # safest way to achieve a complete draining of the event queue,
-        # but it may require users to update() on their own to execute the
-        # completion in obscure corner cases.
+        # however, self.window.update() can break user code. An async callback
+        # is the safest way to achieve a complete draining of the event queue,
+        # but it leaks if no tk event loop is running. Therefore we explicitly
+        # check for an event loop and choose our best guess.
         def delayed_destroy():
             self.window.destroy()
 
             if self._owns_mainloop and not Gcf.get_num_fig_managers():
                 self.window.quit()
 
-        self.window.after_idle(delayed_destroy)
+        if cbook._get_running_interactive_framework() == "tk":
+            # "after idle after 0" avoids Tcl error/race (GH #19940)
+            self.window.after_idle(self.window.after, 0, delayed_destroy)
+        else:
+            self.window.update()
+            delayed_destroy()
 
     def get_window_title(self):
         return self.window.wm_title()
@@ -480,24 +558,26 @@ def full_screen_toggle(self):
 
 
 class NavigationToolbar2Tk(NavigationToolbar2, tk.Frame):
-    """
-    Attributes
-    ----------
-    canvas : `FigureCanvas`
-        The figure canvas on which to operate.
-    win : tk.Window
-        The tk.Window which owns this toolbar.
-    pack_toolbar : bool, default: True
-        If True, add the toolbar to the parent's pack manager's packing list
-        during initialization with ``side='bottom'`` and ``fill='x'``.
-        If you want to use the toolbar with a different layout manager, use
-        ``pack_toolbar=False``.
-    """
-    def __init__(self, canvas, window, *, pack_toolbar=True):
-        # Avoid using self.window (prefer self.canvas.get_tk_widget().master),
-        # so that Tool implementations can reuse the methods.
-        self.window = window
+    window = _api.deprecated("3.6", alternative="self.master")(
+        property(lambda self: self.master))
+
+    def __init__(self, canvas, window=None, *, pack_toolbar=True):
+        """
+        Parameters
+        ----------
+        canvas : `FigureCanvas`
+            The figure canvas on which to operate.
+        window : tk.Window
+            The tk.Window which owns this toolbar.
+        pack_toolbar : bool, default: True
+            If True, add the toolbar to the parent's pack manager's packing
+            list during initialization with ``side="bottom"`` and ``fill="x"``.
+            If you want to use the toolbar with a different layout manager, use
+            ``pack_toolbar=False``.
+        """
 
+        if window is None:
+            window = canvas.get_tk_widget().master
         tk.Frame.__init__(self, master=window, borderwidth=2,
                           width=int(canvas.figure.bbox.width), height=50)
 
@@ -516,22 +596,53 @@ def __init__(self, canvas, window, *, pack_toolbar=True):
                 if tooltip_text is not None:
                     ToolTip.createToolTip(button, tooltip_text)
 
+        self._label_font = tkinter.font.Font(root=window, size=10)
+
         # This filler item ensures the toolbar is always at least two text
         # lines high. Otherwise the canvas gets redrawn as the mouse hovers
         # over images because those use two-line messages which resize the
         # toolbar.
-        label = tk.Label(master=self,
+        label = tk.Label(master=self, font=self._label_font,
                          text='\N{NO-BREAK SPACE}\n\N{NO-BREAK SPACE}')
         label.pack(side=tk.RIGHT)
 
         self.message = tk.StringVar(master=self)
-        self._message_label = tk.Label(master=self, textvariable=self.message)
+        self._message_label = tk.Label(master=self, font=self._label_font,
+                                       textvariable=self.message,
+                                       justify=tk.RIGHT)
         self._message_label.pack(side=tk.RIGHT)
 
         NavigationToolbar2.__init__(self, canvas)
         if pack_toolbar:
             self.pack(side=tk.BOTTOM, fill=tk.X)
 
+    def _rescale(self):
+        """
+        Scale all children of the toolbar to current DPI setting.
+
+        Before this is called, the Tk scaling setting will have been updated to
+        match the new DPI. Tk widgets do not update for changes to scaling, but
+        all measurements made after the change will match the new scaling. Thus
+        this function re-applies all the same sizes in points, which Tk will
+        scale correctly to pixels.
+        """
+        for widget in self.winfo_children():
+            if isinstance(widget, (tk.Button, tk.Checkbutton)):
+                if hasattr(widget, '_image_file'):
+                    # Explicit class because ToolbarTk calls _rescale.
+                    NavigationToolbar2Tk._set_image_for_button(self, widget)
+                else:
+                    # Text-only button is handled by the font setting instead.
+                    pass
+            elif isinstance(widget, tk.Frame):
+                widget.configure(height='22p', pady='1p')
+                widget.pack_configure(padx='4p')
+            elif isinstance(widget, tk.Label):
+                pass  # Text is handled by the font setting instead.
+            else:
+                _log.warning('Unknown child class %s', widget.winfo_class)
+        self._label_font.configure(size=10)
+
     def _update_buttons_checked(self):
         # sync button checkstates to match active mode
         for text, mode in [('Zoom', _Mode.ZOOM), ('Pan', _Mode.PAN)]:
@@ -553,35 +664,115 @@ def set_message(self, s):
         self.message.set(s)
 
     def draw_rubberband(self, event, x0, y0, x1, y1):
+        # Block copied from remove_rubberband for backend_tools convenience.
+        if self.canvas._rubberband_rect_white:
+            self.canvas._tkcanvas.delete(self.canvas._rubberband_rect_white)
+        if self.canvas._rubberband_rect_black:
+            self.canvas._tkcanvas.delete(self.canvas._rubberband_rect_black)
         height = self.canvas.figure.bbox.height
         y0 = height - y0
         y1 = height - y1
-        if hasattr(self, "lastrect"):
-            self.canvas._tkcanvas.delete(self.lastrect)
-        self.lastrect = self.canvas._tkcanvas.create_rectangle(x0, y0, x1, y1)
+        self.canvas._rubberband_rect_black = (
+            self.canvas._tkcanvas.create_rectangle(
+                x0, y0, x1, y1))
+        self.canvas._rubberband_rect_white = (
+            self.canvas._tkcanvas.create_rectangle(
+                x0, y0, x1, y1, outline='white', dash=(3, 3)))
+
+    def remove_rubberband(self):
+        if self.canvas._rubberband_rect_white:
+            self.canvas._tkcanvas.delete(self.canvas._rubberband_rect_white)
+            self.canvas._rubberband_rect_white = None
+        if self.canvas._rubberband_rect_black:
+            self.canvas._tkcanvas.delete(self.canvas._rubberband_rect_black)
+            self.canvas._rubberband_rect_black = None
 
-    def release_zoom(self, event):
-        super().release_zoom(event)
-        if hasattr(self, "lastrect"):
-            self.canvas._tkcanvas.delete(self.lastrect)
-            del self.lastrect
+    lastrect = _api.deprecated("3.6")(
+        property(lambda self: self.canvas._rubberband_rect_black))
 
-    def set_cursor(self, cursor):
-        window = self.canvas.get_tk_widget().master
-        try:
-            window.configure(cursor=cursord[cursor])
-        except tkinter.TclError:
-            pass
+    def _set_image_for_button(self, button):
+        """
+        Set the image for a button based on its pixel size.
 
-    def _Button(self, text, image_file, toggle, command):
-        if tk.TkVersion >= 8.6:
-            PhotoImage = tk.PhotoImage
+        The pixel size is determined by the DPI scaling of the window.
+        """
+        if button._image_file is None:
+            return
+
+        # Allow _image_file to be relative to Matplotlib's "images" data
+        # directory.
+        path_regular = cbook._get_data_path('images', button._image_file)
+        path_large = path_regular.with_name(
+            path_regular.name.replace('.png', '_large.png'))
+        size = button.winfo_pixels('18p')
+
+        # Nested functions because ToolbarTk calls  _Button.
+        def _get_color(color_name):
+            # `winfo_rgb` returns an (r, g, b) tuple in the range 0-65535
+            return button.winfo_rgb(button.cget(color_name))
+
+        def _is_dark(color):
+            if isinstance(color, str):
+                color = _get_color(color)
+            return max(color) < 65535 / 2
+
+        def _recolor_icon(image, color):
+            image_data = np.asarray(image).copy()
+            black_mask = (image_data[..., :3] == 0).all(axis=-1)
+            image_data[black_mask, :3] = color
+            return Image.fromarray(image_data, mode="RGBA")
+
+        # Use the high-resolution (48x48 px) icon if it exists and is needed
+        with Image.open(path_large if (size > 24 and path_large.exists())
+                        else path_regular) as im:
+            image = ImageTk.PhotoImage(im.resize((size, size)), master=self)
+            button._ntimage = image
+
+            # create a version of the icon with the button's text color
+            foreground = (255 / 65535) * np.array(
+                button.winfo_rgb(button.cget("foreground")))
+            im_alt = _recolor_icon(im, foreground)
+            image_alt = ImageTk.PhotoImage(
+                im_alt.resize((size, size)), master=self)
+            button._ntimage_alt = image_alt
+
+        if _is_dark("background"):
+            # For Checkbuttons, we need to set `image` and `selectimage` at
+            # the same time. Otherwise, when updating the `image` option
+            # (such as when changing DPI), if the old `selectimage` has
+            # just been overwritten, Tk will throw an error.
+            image_kwargs = {"image": image_alt}
         else:
-            from PIL.ImageTk import PhotoImage
-        image = (PhotoImage(master=self, file=image_file)
-                 if image_file is not None else None)
+            image_kwargs = {"image": image}
+        # Checkbuttons may switch the background to `selectcolor` in the
+        # checked state, so check separately which image it needs to use in
+        # that state to still ensure enough contrast with the background.
+        if (
+            isinstance(button, tk.Checkbutton)
+            and button.cget("selectcolor") != ""
+        ):
+            if self._windowingsystem != "x11":
+                selectcolor = "selectcolor"
+            else:
+                # On X11, selectcolor isn't used directly for indicator-less
+                # buttons. See `::tk::CheckEnter` in the Tk button.tcl source
+                # code for details.
+                r1, g1, b1 = _get_color("selectcolor")
+                r2, g2, b2 = _get_color("activebackground")
+                selectcolor = ((r1+r2)/2, (g1+g2)/2, (b1+b2)/2)
+            if _is_dark(selectcolor):
+                image_kwargs["selectimage"] = image_alt
+            else:
+                image_kwargs["selectimage"] = image
+
+        button.configure(**image_kwargs, height='18p', width='18p')
+
+    def _Button(self, text, image_file, toggle, command):
         if not toggle:
-            b = tk.Button(master=self, text=text, image=image, command=command)
+            b = tk.Button(
+                master=self, text=text, command=command,
+                relief="flat", overrelief="groove", borderwidth=1,
+            )
         else:
             # There is a bug in tkinter included in some python 3.6 versions
             # that without this variable, produces a "visual" toggling of
@@ -590,18 +781,24 @@ def _Button(self, text, image_file, toggle, command):
             # https://bugs.python.org/issue25684
             var = tk.IntVar(master=self)
             b = tk.Checkbutton(
-                master=self, text=text, image=image, command=command,
-                indicatoron=False, variable=var)
+                master=self, text=text, command=command, indicatoron=False,
+                variable=var, offrelief="flat", overrelief="groove",
+                borderwidth=1
+            )
             b.var = var
-        b._ntimage = image
+        b._image_file = image_file
+        if image_file is not None:
+            # Explicit class because ToolbarTk calls _Button.
+            NavigationToolbar2Tk._set_image_for_button(self, b)
+        else:
+            b.configure(font=self._label_font)
         b.pack(side=tk.LEFT)
         return b
 
     def _Spacer(self):
-        # Buttons are 30px high. Make this 26px tall +2px padding to center it.
-        s = tk.Frame(
-            master=self, height=26, relief=tk.RIDGE, pady=2, bg="DarkGray")
-        s.pack(side=tk.LEFT, padx=5)
+        # Buttons are also 18pt high.
+        s = tk.Frame(master=self, height='18p', relief=tk.RIDGE, bg='DarkGray')
+        s.pack(side=tk.LEFT, padx='3p')
         return s
 
     def save_figure(self, *args):
@@ -619,7 +816,7 @@ def save_figure(self, *args):
         # asksaveasfilename dialog when you choose various save types
         # from the dropdown.  Passing in the empty string seems to
         # work - JDH!
-        #defaultextension = self.canvas.get_default_filetype()
+        # defaultextension = self.canvas.get_default_filetype()
         defaultextension = ''
         initialdir = os.path.expanduser(mpl.rcParams['savefig.directory'])
         initialfile = self.canvas.get_default_filename()
@@ -683,7 +880,7 @@ def showtip(self, text):
         if self.tipwindow or not self.text:
             return
         x, y, _, _ = self.widget.bbox("insert")
-        x = x + self.widget.winfo_rootx() + 27
+        x = x + self.widget.winfo_rootx() + self.widget.winfo_width()
         y = y + self.widget.winfo_rooty()
         self.tipwindow = tw = tk.Toplevel(self.widget)
         tw.wm_overrideredirect(1)
@@ -706,22 +903,21 @@ def hidetip(self):
             tw.destroy()
 
 
+@backend_tools._register_tool_class(FigureCanvasTk)
 class RubberbandTk(backend_tools.RubberbandBase):
     def draw_rubberband(self, x0, y0, x1, y1):
-        height = self.figure.canvas.figure.bbox.height
-        y0 = height - y0
-        y1 = height - y1
-        if hasattr(self, "lastrect"):
-            self.figure.canvas._tkcanvas.delete(self.lastrect)
-        self.lastrect = self.figure.canvas._tkcanvas.create_rectangle(
-            x0, y0, x1, y1)
+        NavigationToolbar2Tk.draw_rubberband(
+            self._make_classic_style_pseudo_toolbar(), None, x0, y0, x1, y1)
 
     def remove_rubberband(self):
-        if hasattr(self, "lastrect"):
-            self.figure.canvas._tkcanvas.delete(self.lastrect)
-            del self.lastrect
+        NavigationToolbar2Tk.remove_rubberband(
+            self._make_classic_style_pseudo_toolbar())
 
+    lastrect = _api.deprecated("3.6")(
+        property(lambda self: self.figure.canvas._rubberband_rect_black))
 
+
+@_api.deprecated("3.5", alternative="ToolSetCursor")
 class SetCursorTk(backend_tools.SetCursorBase):
     def set_cursor(self, cursor):
         NavigationToolbar2Tk.set_cursor(
@@ -729,25 +925,38 @@ def set_cursor(self, cursor):
 
 
 class ToolbarTk(ToolContainerBase, tk.Frame):
-    def __init__(self, toolmanager, window):
+    def __init__(self, toolmanager, window=None):
         ToolContainerBase.__init__(self, toolmanager)
+        if window is None:
+            window = self.toolmanager.canvas.get_tk_widget().master
         xmin, xmax = self.toolmanager.canvas.figure.bbox.intervalx
         height, width = 50, xmax - xmin
         tk.Frame.__init__(self, master=window,
                           width=int(width), height=int(height),
                           borderwidth=2)
+        self._label_font = tkinter.font.Font(size=10)
         self._message = tk.StringVar(master=self)
-        self._message_label = tk.Label(master=self, textvariable=self._message)
+        self._message_label = tk.Label(master=self, font=self._label_font,
+                                       textvariable=self._message)
         self._message_label.pack(side=tk.RIGHT)
         self._toolitems = {}
         self.pack(side=tk.TOP, fill=tk.X)
         self._groups = {}
 
+    def _rescale(self):
+        return NavigationToolbar2Tk._rescale(self)
+
     def add_toolitem(
             self, name, group, position, image_file, description, toggle):
         frame = self._get_groupframe(group)
-        button = NavigationToolbar2Tk._Button(self, name, image_file, toggle,
+        buttons = frame.pack_slaves()
+        if position >= len(buttons) or position < 0:
+            before = None
+        else:
+            before = buttons[position]
+        button = NavigationToolbar2Tk._Button(frame, name, image_file, toggle,
                                               lambda: self._button_click(name))
+        button.pack_configure(before=before)
         if description is not None:
             ToolTip.createToolTip(button, description)
         self._toolitems.setdefault(name, [])
@@ -759,6 +968,7 @@ def _get_groupframe(self, group):
                 self._add_separator()
             frame = tk.Frame(master=self, borderwidth=0)
             frame.pack(side=tk.LEFT, fill=tk.Y)
+            frame._label_font = self._label_font
             self._groups[group] = frame
         return self._groups[group]
 
@@ -786,59 +996,20 @@ def set_message(self, s):
         self._message.set(s)
 
 
-@_api.deprecated("3.3")
-class StatusbarTk(StatusbarBase, tk.Frame):
-    def __init__(self, window, *args, **kwargs):
-        StatusbarBase.__init__(self, *args, **kwargs)
-        xmin, xmax = self.toolmanager.canvas.figure.bbox.intervalx
-        height, width = 50, xmax - xmin
-        tk.Frame.__init__(self, master=window,
-                          width=int(width), height=int(height),
-                          borderwidth=2)
-        self._message = tk.StringVar(master=self)
-        self._message_label = tk.Label(master=self, textvariable=self._message)
-        self._message_label.pack(side=tk.RIGHT)
-        self.pack(side=tk.TOP, fill=tk.X)
-
-    def set_message(self, s):
-        self._message.set(s)
-
-
+@backend_tools._register_tool_class(FigureCanvasTk)
 class SaveFigureTk(backend_tools.SaveFigureBase):
     def trigger(self, *args):
         NavigationToolbar2Tk.save_figure(
             self._make_classic_style_pseudo_toolbar())
 
 
+@backend_tools._register_tool_class(FigureCanvasTk)
 class ConfigureSubplotsTk(backend_tools.ConfigureSubplotsBase):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.window = None
-
     def trigger(self, *args):
-        self.init_window()
-        self.window.lift()
-
-    def init_window(self):
-        if self.window:
-            return
-
-        toolfig = Figure(figsize=(6, 3))
-        self.window = tk.Tk()
-
-        canvas = type(self.canvas)(toolfig, master=self.window)
-        toolfig.subplots_adjust(top=0.9)
-        SubplotTool(self.figure, toolfig)
-        canvas.draw()
-        canvas.get_tk_widget().pack(side=tk.TOP, fill=tk.BOTH, expand=1)
-        self.window.protocol("WM_DELETE_WINDOW", self.destroy)
-
-    def destroy(self, *args, **kwargs):
-        if self.window is not None:
-            self.window.destroy()
-            self.window = None
+        NavigationToolbar2Tk.configure_subplots(self)
 
 
+@backend_tools._register_tool_class(FigureCanvasTk)
 class HelpTk(backend_tools.ToolHelpBase):
     def trigger(self, *args):
         dialog = SimpleDialog(
@@ -846,50 +1017,16 @@ def trigger(self, *args):
         dialog.done = lambda num: dialog.frame.master.withdraw()
 
 
-backend_tools.ToolSaveFigure = SaveFigureTk
-backend_tools.ToolConfigureSubplots = ConfigureSubplotsTk
-backend_tools.ToolSetCursor = SetCursorTk
-backend_tools.ToolRubberband = RubberbandTk
-backend_tools.ToolHelp = HelpTk
-backend_tools.ToolCopyToClipboard = backend_tools.ToolCopyToClipboardBase
 Toolbar = ToolbarTk
+FigureManagerTk._toolbar2_class = NavigationToolbar2Tk
+FigureManagerTk._toolmanager_toolbar_class = ToolbarTk
 
 
 @_Backend.export
 class _BackendTk(_Backend):
+    backend_version = tk.TkVersion
     FigureManager = FigureManagerTk
 
-    @classmethod
-    def new_figure_manager_given_figure(cls, num, figure):
-        """
-        Create a new figure manager instance for the given figure.
-        """
-        with _restore_foreground_window_at_end():
-            if cbook._get_running_interactive_framework() is None:
-                cbook._setup_new_guiapp()
-            window = tk.Tk(className="matplotlib")
-            window.withdraw()
-
-            # Put a Matplotlib icon on the window rather than the default tk
-            # icon.  Tkinter doesn't allow colour icons on linux systems, but
-            # tk>=8.5 has a iconphoto command which we call directly.  See
-            # http://mail.python.org/pipermail/tkinter-discuss/2006-November/000954.html
-            icon_fname = str(cbook._get_data_path(
-                'images/matplotlib_128.ppm'))
-            icon_img = tk.PhotoImage(file=icon_fname, master=window)
-            try:
-                window.iconphoto(False, icon_img)
-            except Exception as exc:
-                # log the failure (due e.g. to Tk version), but carry on
-                _log.info('Could not load matplotlib icon: %s', exc)
-
-            canvas = cls.FigureCanvas(figure, master=window)
-            manager = cls.FigureManager(canvas, num, window)
-            if mpl.is_interactive():
-                manager.show()
-                canvas.draw_idle()
-            return manager
-
     @staticmethod
     def mainloop():
         managers = Gcf.get_all_fig_managers()
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
index a9b0383f4bdd..8fda2606b472 100644
--- a/lib/matplotlib/backends/backend_agg.py
+++ b/lib/matplotlib/backends/backend_agg.py
@@ -1,5 +1,5 @@
 """
-An `Anti-Grain Geometry <http://antigrain.com>`_ (AGG) backend.
+An `Anti-Grain Geometry`_ (AGG) backend.
 
 Features that are implemented:
 
@@ -17,25 +17,21 @@
 Still TODO:
 
 * integrate screen dpi w/ ppi and text
+
+.. _Anti-Grain Geometry: http://agg.sourceforge.net/antigrain.com
 """
 
-try:
-    import threading
-except ImportError:
-    import dummy_threading as threading
 from contextlib import nullcontext
 from math import radians, cos, sin
+import threading
 
 import numpy as np
-from PIL import Image
 
 import matplotlib as mpl
 from matplotlib import _api, cbook
-from matplotlib import colors as mcolors
 from matplotlib.backend_bases import (
-    _Backend, _check_savefig_extra_args, FigureCanvasBase, FigureManagerBase,
-    RendererBase)
-from matplotlib.font_manager import findfont, get_font
+    _Backend, FigureCanvasBase, FigureManagerBase, RendererBase)
+from matplotlib.font_manager import fontManager as _fontManager, get_font
 from matplotlib.ft2font import (LOAD_FORCE_AUTOHINT, LOAD_NO_HINTING,
                                 LOAD_DEFAULT, LOAD_NO_AUTOHINT)
 from matplotlib.mathtext import MathTextParser
@@ -44,9 +40,6 @@
 from matplotlib.backends._backend_agg import RendererAgg as _RendererAgg
 
 
-backend_version = 'v2.2'
-
-
 def get_hinting_flag():
     mapping = {
         'default': LOAD_DEFAULT,
@@ -109,27 +102,10 @@ def _update_methods(self):
         self.draw_gouraud_triangles = self._renderer.draw_gouraud_triangles
         self.draw_image = self._renderer.draw_image
         self.draw_markers = self._renderer.draw_markers
-        # This is its own method for the duration of the deprecation of
-        # offset_position = "data".
-        # self.draw_path_collection = self._renderer.draw_path_collection
+        self.draw_path_collection = self._renderer.draw_path_collection
         self.draw_quad_mesh = self._renderer.draw_quad_mesh
         self.copy_from_bbox = self._renderer.copy_from_bbox
 
-    @_api.deprecated("3.4")
-    def get_content_extents(self):
-        orig_img = np.asarray(self.buffer_rgba())
-        slice_y, slice_x = cbook._get_nonzero_slices(orig_img[..., 3])
-        return (slice_x.start, slice_y.start,
-                slice_x.stop - slice_x.start, slice_y.stop - slice_y.start)
-
-    @_api.deprecated("3.4")
-    def tostring_rgba_minimized(self):
-        extents = self.get_content_extents()
-        bbox = [[extents[0], self.height - (extents[1] + extents[3])],
-                [extents[0] + extents[2], self.height - extents[1]]]
-        region = self.copy_from_bbox(bbox)
-        return np.array(region), extents
-
     def draw_path(self, gc, path, transform, rgbFace=None):
         # docstring inherited
         nmax = mpl.rcParams['agg.path.chunksize']  # here at least for testing
@@ -150,35 +126,69 @@ def draw_path(self, gc, path, transform, rgbFace=None):
                     c = c[ii0:ii1]
                     c[0] = Path.MOVETO  # move to end of last chunk
                 p = Path(v, c)
+                p.simplify_threshold = path.simplify_threshold
                 try:
                     self._renderer.draw_path(gc, p, transform, rgbFace)
-                except OverflowError as err:
-                    raise OverflowError(
-                        "Exceeded cell block limit (set 'agg.path.chunksize' "
-                        "rcparam)") from err
+                except OverflowError:
+                    msg = (
+                        "Exceeded cell block limit in Agg.\n\n"
+                        "Please reduce the value of "
+                        f"rcParams['agg.path.chunksize'] (currently {nmax}) "
+                        "or increase the path simplification threshold"
+                        "(rcParams['path.simplify_threshold'] = "
+                        f"{mpl.rcParams['path.simplify_threshold']:.2f} by "
+                        "default and path.simplify_threshold = "
+                        f"{path.simplify_threshold:.2f} on the input)."
+                    )
+                    raise OverflowError(msg) from None
         else:
             try:
                 self._renderer.draw_path(gc, path, transform, rgbFace)
-            except OverflowError as err:
-                raise OverflowError("Exceeded cell block limit (set "
-                                    "'agg.path.chunksize' rcparam)") from err
-
-    def draw_path_collection(self, gc, master_transform, paths, all_transforms,
-                             offsets, offsetTrans, facecolors, edgecolors,
-                             linewidths, linestyles, antialiaseds, urls,
-                             offset_position):
-        if offset_position == "data":
-            _api.warn_deprecated(
-                "3.3", message="Support for offset_position='data' is "
-                "deprecated since %(since)s and will be removed %(removal)s.")
-        return self._renderer.draw_path_collection(
-            gc, master_transform, paths, all_transforms, offsets, offsetTrans,
-            facecolors, edgecolors, linewidths, linestyles, antialiaseds, urls,
-            offset_position)
+            except OverflowError:
+                cant_chunk = ''
+                if rgbFace is not None:
+                    cant_chunk += "- can not split filled path\n"
+                if gc.get_hatch() is not None:
+                    cant_chunk += "- can not split hatched path\n"
+                if not path.should_simplify:
+                    cant_chunk += "- path.should_simplify is False\n"
+                if len(cant_chunk):
+                    msg = (
+                        "Exceeded cell block limit in Agg, however for the "
+                        "following reasons:\n\n"
+                        f"{cant_chunk}\n"
+                        "we can not automatically split up this path to draw."
+                        "\n\nPlease manually simplify your path."
+                    )
+
+                else:
+                    inc_threshold = (
+                        "or increase the path simplification threshold"
+                        "(rcParams['path.simplify_threshold'] = "
+                        f"{mpl.rcParams['path.simplify_threshold']} "
+                        "by default and path.simplify_threshold "
+                        f"= {path.simplify_threshold} "
+                        "on the input)."
+                        )
+                    if nmax > 100:
+                        msg = (
+                            "Exceeded cell block limit in Agg.  Please reduce "
+                            "the value of rcParams['agg.path.chunksize'] "
+                            f"(currently {nmax}) {inc_threshold}"
+                        )
+                    else:
+                        msg = (
+                            "Exceeded cell block limit in Agg.  Please set "
+                            "the value of rcParams['agg.path.chunksize'], "
+                            f"(currently {nmax}) to be greater than 100 "
+                            + inc_threshold
+                        )
+
+                raise OverflowError(msg) from None
 
     def draw_mathtext(self, gc, x, y, s, prop, angle):
         """Draw mathtext using :mod:`matplotlib.mathtext`."""
-        ox, oy, width, height, descent, font_image, used_characters = \
+        ox, oy, width, height, descent, font_image = \
             self.mathtext_parser.parse(s, self.dpi, prop)
 
         xd = descent * sin(radians(angle))
@@ -189,18 +199,12 @@ def draw_mathtext(self, gc, x, y, s, prop, angle):
 
     def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
         # docstring inherited
-
         if ismath:
             return self.draw_mathtext(gc, x, y, s, prop, angle)
-
-        flags = get_hinting_flag()
-        font = self._get_agg_font(prop)
-
-        if font is None:
-            return None
+        font = self._prepare_font(prop)
         # We pass '0' for angle here, since it will be rotated (in raster
         # space) in the following call to draw_text_image).
-        font.set_text(s, 0, flags=flags)
+        font.set_text(s, 0, flags=get_hinting_flag())
         font.draw_glyphs_to_bitmap(
             antialiased=mpl.rcParams['text.antialiased'])
         d = font.get_descent() / 64.0
@@ -217,12 +221,8 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
     def get_text_width_height_descent(self, s, prop, ismath):
         # docstring inherited
 
-        if ismath in ["TeX", "TeX!"]:
-            if ismath == "TeX!":
-                _api.warn_deprecated(
-                    "3.3", message="Support for ismath='TeX!' is deprecated "
-                    "since %(since)s and will be removed %(removal)s; use "
-                    "ismath='TeX' instead.")
+        _api.check_in_list(["TeX", True, False], ismath=ismath)
+        if ismath == "TeX":
             # todo: handle props
             texmanager = self.get_texmanager()
             fontsize = prop.get_size_in_points()
@@ -231,13 +231,12 @@ def get_text_width_height_descent(self, s, prop, ismath):
             return w, h, d
 
         if ismath:
-            ox, oy, width, height, descent, fonts, used_characters = \
+            ox, oy, width, height, descent, font_image = \
                 self.mathtext_parser.parse(s, self.dpi, prop)
             return width, height, descent
 
-        flags = get_hinting_flag()
-        font = self._get_agg_font(prop)
-        font.set_text(s, 0.0, flags=flags)
+        font = self._prepare_font(prop)
+        font.set_text(s, 0.0, flags=get_hinting_flag())
         w, h = font.get_width_height()  # width and height of unrotated string
         d = font.get_descent()
         w /= 64.0  # convert from subpixels
@@ -266,17 +265,14 @@ def get_canvas_width_height(self):
         # docstring inherited
         return self.width, self.height
 
-    def _get_agg_font(self, prop):
+    def _prepare_font(self, font_prop):
         """
-        Get the font for text instance t, caching for efficiency
+        Get the `.FT2Font` for *font_prop*, clear its buffer, and set its size.
         """
-        fname = findfont(prop)
-        font = get_font(fname)
-
+        font = get_font(_fontManager._find_fonts_by_props(font_prop))
         font.clear()
-        size = prop.get_size_in_points()
+        size = font_prop.get_size_in_points()
         font.set_size(size, self.dpi)
-
         return font
 
     def points_to_pixels(self, points):
@@ -388,6 +384,8 @@ def post_processing(image, dpi):
 class FigureCanvasAgg(FigureCanvasBase):
     # docstring inherited
 
+    _lastKey = None  # Overwritten per-instance on the first draw.
+
     def copy_from_bbox(self, bbox):
         renderer = self.get_renderer()
         return renderer.copy_from_bbox(bbox)
@@ -398,7 +396,8 @@ def restore_region(self, region, bbox=None, xy=None):
 
     def draw(self):
         # docstring inherited
-        self.renderer = self.get_renderer(cleared=True)
+        self.renderer = self.get_renderer()
+        self.renderer.clear()
         # Acquire a lock on the shared font cache.
         with RendererAgg.lock, \
              (self.toolbar._wait_cursor_for_draw_cm() if self.toolbar
@@ -408,11 +407,11 @@ def draw(self):
             # don't forget to call the superclass.
             super().draw()
 
+    @_api.delete_parameter("3.6", "cleared", alternative="renderer.clear()")
     def get_renderer(self, cleared=False):
         w, h = self.figure.bbox.size
         key = w, h, self.figure.dpi
-        reuse_renderer = (hasattr(self, "renderer")
-                          and getattr(self, "_lastKey", None) == key)
+        reuse_renderer = (self._lastKey == key)
         if not reuse_renderer:
             self.renderer = RendererAgg(w, h, self.figure.dpi)
             self._lastKey = key
@@ -447,7 +446,7 @@ def buffer_rgba(self):
         """
         return self.renderer.buffer_rgba()
 
-    @_check_savefig_extra_args
+    @_api.delete_parameter("3.5", "args")
     def print_raw(self, filename_or_obj, *args):
         FigureCanvasAgg.draw(self)
         renderer = self.get_renderer()
@@ -456,7 +455,17 @@ def print_raw(self, filename_or_obj, *args):
 
     print_rgba = print_raw
 
-    @_check_savefig_extra_args
+    def _print_pil(self, filename_or_obj, fmt, pil_kwargs, metadata=None):
+        """
+        Draw the canvas, then save it using `.image.imsave` (to which
+        *pil_kwargs* and *metadata* are forwarded).
+        """
+        FigureCanvasAgg.draw(self)
+        mpl.image.imsave(
+            filename_or_obj, self.buffer_rgba(), format=fmt, origin="upper",
+            dpi=self.figure.dpi, metadata=metadata, pil_kwargs=pil_kwargs)
+
+    @_api.delete_parameter("3.5", "args")
     def print_png(self, filename_or_obj, *args,
                   metadata=None, pil_kwargs=None):
         """
@@ -505,10 +514,7 @@ def print_png(self, filename_or_obj, *args,
             If the 'pnginfo' key is present, it completely overrides
             *metadata*, including the default 'Software' key.
         """
-        FigureCanvasAgg.draw(self)
-        mpl.image.imsave(
-            filename_or_obj, self.buffer_rgba(), format="png", origin="upper",
-            dpi=self.figure.dpi, metadata=metadata, pil_kwargs=pil_kwargs)
+        self._print_pil(filename_or_obj, "png", pil_kwargs, metadata)
 
     def print_to_buffer(self):
         FigureCanvasAgg.draw(self)
@@ -520,85 +526,40 @@ def print_to_buffer(self):
     # print_figure(), and the latter ensures that `self.figure.dpi` already
     # matches the dpi kwarg (if any).
 
-    @_check_savefig_extra_args(
-        extra_kwargs=["quality", "optimize", "progressive"])
-    @_api.delete_parameter("3.3", "quality",
-                           alternative="pil_kwargs={'quality': ...}")
-    @_api.delete_parameter("3.3", "optimize",
-                           alternative="pil_kwargs={'optimize': ...}")
-    @_api.delete_parameter("3.3", "progressive",
-                           alternative="pil_kwargs={'progressive': ...}")
-    def print_jpg(self, filename_or_obj, *args, pil_kwargs=None, **kwargs):
+    @_api.delete_parameter("3.5", "args")
+    def print_jpg(self, filename_or_obj, *args, pil_kwargs=None):
+        # savefig() has already applied savefig.facecolor; we now set it to
+        # white to make imsave() blend semi-transparent figures against an
+        # assumed white background.
+        with mpl.rc_context({"savefig.facecolor": "white"}):
+            self._print_pil(filename_or_obj, "jpeg", pil_kwargs)
+
+    print_jpeg = print_jpg
+
+    def print_tif(self, filename_or_obj, *, pil_kwargs=None):
+        self._print_pil(filename_or_obj, "tiff", pil_kwargs)
+
+    print_tiff = print_tif
+
+    def print_webp(self, filename_or_obj, *, pil_kwargs=None):
+        self._print_pil(filename_or_obj, "webp", pil_kwargs)
+
+    print_jpg.__doc__, print_tif.__doc__, print_webp.__doc__ = map(
         """
-        Write the figure to a JPEG file.
+        Write the figure to a {} file.
 
         Parameters
         ----------
         filename_or_obj : str or path-like or file-like
             The file to write to.
-
-        Other Parameters
-        ----------------
-        quality : int, default: :rc:`savefig.jpeg_quality`
-            The image quality, on a scale from 1 (worst) to 95 (best).
-            Values above 95 should be avoided; 100 disables portions of
-            the JPEG compression algorithm, and results in large files
-            with hardly any gain in image quality.  This parameter is
-            deprecated.
-        optimize : bool, default: False
-            Whether the encoder should make an extra pass over the image
-            in order to select optimal encoder settings.  This parameter is
-            deprecated.
-        progressive : bool, default: False
-            Whether the image should be stored as a progressive JPEG file.
-            This parameter is deprecated.
         pil_kwargs : dict, optional
             Additional keyword arguments that are passed to
-            `PIL.Image.Image.save` when saving the figure.  These take
-            precedence over *quality*, *optimize* and *progressive*.
-        """
-        # Remove transparency by alpha-blending on an assumed white background.
-        r, g, b, a = mcolors.to_rgba(self.figure.get_facecolor())
-        try:
-            self.figure.set_facecolor(a * np.array([r, g, b]) + 1 - a)
-            FigureCanvasAgg.draw(self)
-        finally:
-            self.figure.set_facecolor((r, g, b, a))
-        if pil_kwargs is None:
-            pil_kwargs = {}
-        for k in ["quality", "optimize", "progressive"]:
-            if k in kwargs:
-                pil_kwargs.setdefault(k, kwargs.pop(k))
-        if "quality" not in pil_kwargs:
-            quality = pil_kwargs["quality"] = \
-                dict.__getitem__(mpl.rcParams, "savefig.jpeg_quality")
-            if quality not in [0, 75, 95]:  # default qualities.
-                _api.warn_deprecated(
-                    "3.3", name="savefig.jpeg_quality", obj_type="rcParam",
-                    addendum="Set the quality using "
-                    "`pil_kwargs={'quality': ...}`; the future default "
-                    "quality will be 75, matching the default of Pillow and "
-                    "libjpeg.")
-        pil_kwargs.setdefault("dpi", (self.figure.dpi, self.figure.dpi))
-        # Drop alpha channel now.
-        return (Image.fromarray(np.asarray(self.buffer_rgba())[..., :3])
-                .save(filename_or_obj, format='jpeg', **pil_kwargs))
-
-    print_jpeg = print_jpg
-
-    @_check_savefig_extra_args
-    def print_tif(self, filename_or_obj, *, pil_kwargs=None):
-        FigureCanvasAgg.draw(self)
-        if pil_kwargs is None:
-            pil_kwargs = {}
-        pil_kwargs.setdefault("dpi", (self.figure.dpi, self.figure.dpi))
-        return (Image.fromarray(np.asarray(self.buffer_rgba()))
-                .save(filename_or_obj, format='tiff', **pil_kwargs))
-
-    print_tiff = print_tif
+            `PIL.Image.Image.save` when saving the figure.
+        """.format, ["JPEG", "TIFF", "WebP"])
 
 
 @_Backend.export
 class _BackendAgg(_Backend):
+    backend_version = 'v2.2'
     FigureCanvas = FigureCanvasAgg
     FigureManager = FigureManagerBase
diff --git a/lib/matplotlib/backends/backend_cairo.py b/lib/matplotlib/backends/backend_cairo.py
index b05a5fc0967a..3d6cec641884 100644
--- a/lib/matplotlib/backends/backend_cairo.py
+++ b/lib/matplotlib/backends/backend_cairo.py
@@ -1,11 +1,12 @@
 """
-A Cairo backend for matplotlib
+A Cairo backend for Matplotlib
 ==============================
 :Author: Steve Chaplin and others
 
 This backend depends on cairocffi or pycairo.
 """
 
+import functools
 import gzip
 import math
 
@@ -13,46 +14,26 @@
 
 try:
     import cairo
-    if cairo.version_info < (1, 11, 0):
-        # Introduced create_for_data for Py3.
+    if cairo.version_info < (1, 14, 0):  # Introduced set_device_scale.
         raise ImportError
 except ImportError:
     try:
         import cairocffi as cairo
     except ImportError as err:
         raise ImportError(
-            "cairo backend requires that pycairo>=1.11.0 or cairocffi "
+            "cairo backend requires that pycairo>=1.14.0 or cairocffi "
             "is installed") from err
 
+import matplotlib as mpl
 from .. import _api, cbook, font_manager
 from matplotlib.backend_bases import (
-    _Backend, _check_savefig_extra_args, FigureCanvasBase, FigureManagerBase,
-    GraphicsContextBase, RendererBase)
+    _Backend, FigureCanvasBase, FigureManagerBase, GraphicsContextBase,
+    RendererBase)
 from matplotlib.font_manager import ttfFontProperty
-from matplotlib.mathtext import MathTextParser
 from matplotlib.path import Path
 from matplotlib.transforms import Affine2D
 
 
-backend_version = cairo.version
-
-
-if cairo.__name__ == "cairocffi":
-    # Convert a pycairo context to a cairocffi one.
-    def _to_context(ctx):
-        if not isinstance(ctx, cairo.Context):
-            ctx = cairo.Context._from_pointer(
-                cairo.ffi.cast(
-                    'cairo_t **',
-                    id(ctx) + object.__basicsize__)[0],
-                incref=True)
-        return ctx
-else:
-    # Pass-through a pycairo context.
-    def _to_context(ctx):
-        return ctx
-
-
 def _append_path(ctx, path, transform, clip=None):
     for points, code in path.iter_segments(
             transform, remove_nans=True, clip=clip):
@@ -121,25 +102,38 @@ def attr(field):
 
 
 class RendererCairo(RendererBase):
-    fontweights = _api.deprecated("3.3")(property(lambda self: {*_f_weights}))
-    fontangles = _api.deprecated("3.3")(property(lambda self: {*_f_angles}))
-    mathtext_parser = _api.deprecated("3.4")(
-        property(lambda self: MathTextParser('Cairo')))
-
     def __init__(self, dpi):
         self.dpi = dpi
         self.gc = GraphicsContextCairo(renderer=self)
+        self.width = None
+        self.height = None
         self.text_ctx = cairo.Context(
            cairo.ImageSurface(cairo.FORMAT_ARGB32, 1, 1))
         super().__init__()
 
+    def set_context(self, ctx):
+        surface = ctx.get_target()
+        if hasattr(surface, "get_width") and hasattr(surface, "get_height"):
+            size = surface.get_width(), surface.get_height()
+        elif hasattr(surface, "get_extents"):  # GTK4 RecordingSurface.
+            ext = surface.get_extents()
+            size = ext.width, ext.height
+        else:  # vector surfaces.
+            ctx.save()
+            ctx.reset_clip()
+            rect, *rest = ctx.copy_clip_rectangle_list()
+            if rest:
+                raise TypeError("Cannot infer surface size")
+            size = rect.width, rect.height
+            ctx.restore()
+        self.gc.ctx = ctx
+        self.width, self.height = size
+
+    @_api.deprecated("3.6", alternative="set_context")
     def set_ctx_from_surface(self, surface):
         self.gc.ctx = cairo.Context(surface)
-        # Although it may appear natural to automatically call
-        # `self.set_width_height(surface.get_width(), surface.get_height())`
-        # here (instead of having the caller do so separately), this would fail
-        # for PDF/PS/SVG surfaces, which have no way to report their extents.
 
+    @_api.deprecated("3.6")
     def set_width_height(self, width, height):
         self.width = width
         self.height = height
@@ -243,9 +237,14 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
             ctx.new_path()
             ctx.move_to(x, y)
 
-            ctx.select_font_face(*_cairo_font_args_from_font_prop(prop))
             ctx.save()
-            ctx.set_font_size(prop.get_size_in_points() * self.dpi / 72)
+            ctx.select_font_face(*_cairo_font_args_from_font_prop(prop))
+            ctx.set_font_size(self.points_to_pixels(prop.get_size_in_points()))
+            opts = cairo.FontOptions()
+            opts.set_antialias(
+                cairo.ANTIALIAS_DEFAULT if mpl.rcParams["text.antialiased"]
+                else cairo.ANTIALIAS_NONE)
+            ctx.set_font_options(opts)
             if angle:
                 ctx.rotate(np.deg2rad(-angle))
             ctx.show_text(s)
@@ -266,7 +265,7 @@ def _draw_mathtext(self, gc, x, y, s, prop, angle):
             ctx.move_to(ox, -oy)
             ctx.select_font_face(
                 *_cairo_font_args_from_font_prop(ttfFontProperty(font)))
-            ctx.set_font_size(fontsize * self.dpi / 72)
+            ctx.set_font_size(self.points_to_pixels(fontsize))
             ctx.show_text(chr(idx))
 
         for ox, oy, w, h in rects:
@@ -298,9 +297,7 @@ def get_text_width_height_descent(self, s, prop, ismath):
         # save/restore prevents the problem
         ctx.save()
         ctx.select_font_face(*_cairo_font_args_from_font_prop(prop))
-        # Cairo (says it) uses 1/96 inch user space units, ref: cairo_gstate.c
-        # but if /96.0 is used the font is too small
-        ctx.set_font_size(prop.get_size_in_points() * self.dpi / 72)
+        ctx.set_font_size(self.points_to_pixels(prop.get_size_in_points()))
 
         y_bearing, w, h = ctx.text_extents(s)[1:4]
         ctx.restore()
@@ -348,9 +345,9 @@ def set_alpha(self, alpha):
         else:
             self.ctx.set_source_rgba(rgb[0], rgb[1], rgb[2], rgb[3])
 
-    # def set_antialiased(self, b):
-        # cairo has many antialiasing modes, we need to pick one for True and
-        # one for False.
+    def set_antialiased(self, b):
+        self.ctx.set_antialias(
+            cairo.ANTIALIAS_DEFAULT if b else cairo.ANTIALIAS_NONE)
 
     def set_capstyle(self, cs):
         self.ctx.set_line_cap(_api.check_getitem(self._capd, capstyle=cs))
@@ -411,6 +408,18 @@ def __init__(self, slices, data):
 
 
 class FigureCanvasCairo(FigureCanvasBase):
+    @property
+    def _renderer(self):
+        # In theory, _renderer should be set in __init__, but GUI canvas
+        # subclasses (FigureCanvasFooCairo) don't always interact well with
+        # multiple inheritance (FigureCanvasFoo inits but doesn't super-init
+        # FigureCanvasCairo), so initialize it in the getter instead.
+        if not hasattr(self, "_cached_renderer"):
+            self._cached_renderer = RendererCairo(self.figure.dpi)
+        return self._cached_renderer
+
+    def get_renderer(self):
+        return self._renderer
 
     def copy_from_bbox(self, bbox):
         surface = self._renderer.gc.ctx.get_target()
@@ -445,11 +454,9 @@ def restore_region(self, region):
         surface.mark_dirty_rectangle(
             slx.start, sly.start, slx.stop - slx.start, sly.stop - sly.start)
 
-    @_check_savefig_extra_args
     def print_png(self, fobj):
         self._get_printed_image_surface().write_to_png(fobj)
 
-    @_check_savefig_extra_args
     def print_rgba(self, fobj):
         width, height = self.get_width_height()
         buf = self._get_printed_image_surface().get_data()
@@ -459,28 +466,14 @@ def print_rgba(self, fobj):
     print_raw = print_rgba
 
     def _get_printed_image_surface(self):
+        self._renderer.dpi = self.figure.dpi
         width, height = self.get_width_height()
-        renderer = RendererCairo(self.figure.dpi)
-        renderer.set_width_height(width, height)
         surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
-        renderer.set_ctx_from_surface(surface)
-        self.figure.draw(renderer)
+        self._renderer.set_context(cairo.Context(surface))
+        self.figure.draw(self._renderer)
         return surface
 
-    def print_pdf(self, fobj, *args, **kwargs):
-        return self._save(fobj, 'pdf', *args, **kwargs)
-
-    def print_ps(self, fobj, *args, **kwargs):
-        return self._save(fobj, 'ps', *args, **kwargs)
-
-    def print_svg(self, fobj, *args, **kwargs):
-        return self._save(fobj, 'svg', *args, **kwargs)
-
-    def print_svgz(self, fobj, *args, **kwargs):
-        return self._save(fobj, 'svgz', *args, **kwargs)
-
-    @_check_savefig_extra_args
-    def _save(self, fo, fmt, *, orientation='portrait'):
+    def _save(self, fmt, fobj, *, orientation='portrait'):
         # save PDF/PS/SVG
 
         dpi = 72
@@ -496,45 +489,62 @@ def _save(self, fo, fmt, *, orientation='portrait'):
             if not hasattr(cairo, 'PSSurface'):
                 raise RuntimeError('cairo has not been compiled with PS '
                                    'support enabled')
-            surface = cairo.PSSurface(fo, width_in_points, height_in_points)
+            surface = cairo.PSSurface(fobj, width_in_points, height_in_points)
         elif fmt == 'pdf':
             if not hasattr(cairo, 'PDFSurface'):
                 raise RuntimeError('cairo has not been compiled with PDF '
                                    'support enabled')
-            surface = cairo.PDFSurface(fo, width_in_points, height_in_points)
+            surface = cairo.PDFSurface(fobj, width_in_points, height_in_points)
         elif fmt in ('svg', 'svgz'):
             if not hasattr(cairo, 'SVGSurface'):
                 raise RuntimeError('cairo has not been compiled with SVG '
                                    'support enabled')
             if fmt == 'svgz':
-                if isinstance(fo, str):
-                    fo = gzip.GzipFile(fo, 'wb')
+                if isinstance(fobj, str):
+                    fobj = gzip.GzipFile(fobj, 'wb')
                 else:
-                    fo = gzip.GzipFile(None, 'wb', fileobj=fo)
-            surface = cairo.SVGSurface(fo, width_in_points, height_in_points)
+                    fobj = gzip.GzipFile(None, 'wb', fileobj=fobj)
+            surface = cairo.SVGSurface(fobj, width_in_points, height_in_points)
         else:
             raise ValueError("Unknown format: {!r}".format(fmt))
 
-        # surface.set_dpi() can be used
-        renderer = RendererCairo(self.figure.dpi)
-        renderer.set_width_height(width_in_points, height_in_points)
-        renderer.set_ctx_from_surface(surface)
-        ctx = renderer.gc.ctx
+        self._renderer.dpi = self.figure.dpi
+        self._renderer.set_context(cairo.Context(surface))
+        ctx = self._renderer.gc.ctx
 
         if orientation == 'landscape':
             ctx.rotate(np.pi / 2)
             ctx.translate(0, -height_in_points)
             # Perhaps add an '%%Orientation: Landscape' comment?
 
-        self.figure.draw(renderer)
+        self.figure.draw(self._renderer)
 
         ctx.show_page()
         surface.finish()
         if fmt == 'svgz':
-            fo.close()
+            fobj.close()
+
+    print_pdf = functools.partialmethod(_save, "pdf")
+    print_ps = functools.partialmethod(_save, "ps")
+    print_svg = functools.partialmethod(_save, "svg")
+    print_svgz = functools.partialmethod(_save, "svgz")
+
+
+@_api.deprecated("3.6")
+class _RendererGTKCairo(RendererCairo):
+    def set_context(self, ctx):
+        if (cairo.__name__ == "cairocffi"
+                and not isinstance(ctx, cairo.Context)):
+            ctx = cairo.Context._from_pointer(
+                cairo.ffi.cast(
+                    'cairo_t **',
+                    id(ctx) + object.__basicsize__)[0],
+                incref=True)
+        self.gc.ctx = ctx
 
 
 @_Backend.export
 class _BackendCairo(_Backend):
+    backend_version = cairo.version
     FigureCanvas = FigureCanvasCairo
     FigureManager = FigureManagerBase
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
index 1dbf5d93a929..cb1062cf157c 100644
--- a/lib/matplotlib/backends/backend_gtk3.py
+++ b/lib/matplotlib/backends/backend_gtk3.py
@@ -6,12 +6,10 @@
 
 import matplotlib as mpl
 from matplotlib import _api, backend_tools, cbook
-from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_bases import (
-    _Backend, FigureCanvasBase, FigureManagerBase, NavigationToolbar2,
-    StatusbarBase, TimerBase, ToolContainerBase, cursors)
-from matplotlib.figure import Figure
-from matplotlib.widgets import SubplotTool
+    FigureCanvasBase, ToolContainerBase,
+    CloseEvent, KeyEvent, LocationEvent, MouseEvent, ResizeEvent)
+from matplotlib.backend_tools import Cursors
 
 try:
     import gi
@@ -28,67 +26,53 @@
     raise ImportError from e
 
 from gi.repository import Gio, GLib, GObject, Gtk, Gdk
+from . import _backend_gtk
+from ._backend_gtk import (
+    _BackendGTK, _FigureManagerGTK, _NavigationToolbar2GTK,
+    TimerGTK as TimerGTK3,
+)
 
 
 _log = logging.getLogger(__name__)
 
-backend_version = "%s.%s.%s" % (
-    Gtk.get_major_version(), Gtk.get_micro_version(), Gtk.get_minor_version())
 
-try:
-    _display = Gdk.Display.get_default()
-    cursord = {
-        cursors.MOVE:          Gdk.Cursor.new_from_name(_display, "move"),
-        cursors.HAND:          Gdk.Cursor.new_from_name(_display, "pointer"),
-        cursors.POINTER:       Gdk.Cursor.new_from_name(_display, "default"),
-        cursors.SELECT_REGION: Gdk.Cursor.new_from_name(_display, "crosshair"),
-        cursors.WAIT:          Gdk.Cursor.new_from_name(_display, "wait"),
-    }
-except TypeError as exc:
-    # Happens when running headless.  Convert to ImportError to cooperate with
-    # backend switching.
-    raise ImportError(exc) from exc
-
-
-class TimerGTK3(TimerBase):
-    """Subclass of `.TimerBase` using GTK3 timer events."""
-
-    def __init__(self, *args, **kwargs):
-        self._timer = None
-        super().__init__(*args, **kwargs)
-
-    def _timer_start(self):
-        # Need to stop it, otherwise we potentially leak a timer id that will
-        # never be stopped.
-        self._timer_stop()
-        self._timer = GLib.timeout_add(self._interval, self._on_timer)
-
-    def _timer_stop(self):
-        if self._timer is not None:
-            GLib.source_remove(self._timer)
-            self._timer = None
-
-    def _timer_set_interval(self):
-        # Only stop and restart it if the timer has already been started
-        if self._timer is not None:
-            self._timer_stop()
-            self._timer_start()
-
-    def _on_timer(self):
-        super()._on_timer()
-
-        # Gtk timeout_add() requires that the callback returns True if it
-        # is to be called again.
-        if self.callbacks and not self._single:
-            return True
-        else:
-            self._timer = None
-            return False
-
-
-class FigureCanvasGTK3(Gtk.DrawingArea, FigureCanvasBase):
+@_api.caching_module_getattr  # module-level deprecations
+class __getattr__:
+    @_api.deprecated("3.5", obj_type="")
+    @property
+    def cursord(self):
+        try:
+            new_cursor = functools.partial(
+                Gdk.Cursor.new_from_name, Gdk.Display.get_default())
+            return {
+                Cursors.MOVE:          new_cursor("move"),
+                Cursors.HAND:          new_cursor("pointer"),
+                Cursors.POINTER:       new_cursor("default"),
+                Cursors.SELECT_REGION: new_cursor("crosshair"),
+                Cursors.WAIT:          new_cursor("wait"),
+            }
+        except TypeError:
+            return {}
+
+    icon_filename = _api.deprecated("3.6", obj_type="")(property(
+        lambda self:
+        "matplotlib.png" if sys.platform == "win32" else "matplotlib.svg"))
+    window_icon = _api.deprecated("3.6", obj_type="")(property(
+        lambda self:
+        str(cbook._get_data_path("images", __getattr__("icon_filename")))))
+
+
+@functools.lru_cache()
+def _mpl_to_gtk_cursor(mpl_cursor):
+    return Gdk.Cursor.new_from_name(
+        Gdk.Display.get_default(),
+        _backend_gtk.mpl_to_gtk_cursor_name(mpl_cursor))
+
+
+class FigureCanvasGTK3(FigureCanvasBase, Gtk.DrawingArea):
     required_interactive_framework = "gtk3"
     _timer_cls = TimerGTK3
+    manager_class = _api.classproperty(lambda cls: FigureManagerGTK3)
     # Setting this as a static constant prevents
     # this resulting expression from leaking
     event_mask = (Gdk.EventMask.BUTTON_PRESS_MASK
@@ -99,28 +83,27 @@ class FigureCanvasGTK3(Gtk.DrawingArea, FigureCanvasBase):
                   | Gdk.EventMask.ENTER_NOTIFY_MASK
                   | Gdk.EventMask.LEAVE_NOTIFY_MASK
                   | Gdk.EventMask.POINTER_MOTION_MASK
-                  | Gdk.EventMask.POINTER_MOTION_HINT_MASK
                   | Gdk.EventMask.SCROLL_MASK)
 
     def __init__(self, figure=None):
-        FigureCanvasBase.__init__(self, figure)
-        GObject.GObject.__init__(self)
+        super().__init__(figure=figure)
 
         self._idle_draw_id = 0
-        self._lastCursor = None
         self._rubberband_rect = None
 
         self.connect('scroll_event',         self.scroll_event)
         self.connect('button_press_event',   self.button_press_event)
         self.connect('button_release_event', self.button_release_event)
         self.connect('configure_event',      self.configure_event)
+        self.connect('screen-changed',       self._update_device_pixel_ratio)
+        self.connect('notify::scale-factor', self._update_device_pixel_ratio)
         self.connect('draw',                 self.on_draw_event)
         self.connect('draw',                 self._post_draw)
         self.connect('key_press_event',      self.key_press_event)
         self.connect('key_release_event',    self.key_release_event)
         self.connect('motion_notify_event',  self.motion_notify_event)
-        self.connect('leave_notify_event',   self.leave_notify_event)
         self.connect('enter_notify_event',   self.enter_notify_event)
+        self.connect('leave_notify_event',   self.leave_notify_event)
         self.connect('size_allocate',        self.size_allocate)
 
         self.set_events(self.__class__.event_mask)
@@ -133,83 +116,88 @@ def __init__(self, figure=None):
         style_ctx.add_provider(css, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
         style_ctx.add_class("matplotlib-canvas")
 
-        renderer_init = _api.deprecate_method_override(
-            __class__._renderer_init, self, allow_empty=True, since="3.3",
-            addendum="Please initialize the renderer, if needed, in the "
-            "subclass' __init__; a fully empty _renderer_init implementation "
-            "may be kept for compatibility with earlier versions of "
-            "Matplotlib.")
-        if renderer_init:
-            renderer_init()
-
-    @_api.deprecated("3.3", alternative="__init__")
-    def _renderer_init(self):
-        pass
-
     def destroy(self):
-        #Gtk.DrawingArea.destroy(self)
-        self.close_event()
+        CloseEvent("close_event", self)._process()
+
+    def set_cursor(self, cursor):
+        # docstring inherited
+        window = self.get_property("window")
+        if window is not None:
+            window.set_cursor(_mpl_to_gtk_cursor(cursor))
+            context = GLib.MainContext.default()
+            context.iteration(True)
+
+    def _mpl_coords(self, event=None):
+        """
+        Convert the position of a GTK event, or of the current cursor position
+        if *event* is None, to Matplotlib coordinates.
+
+        GTK use logical pixels, but the figure is scaled to physical pixels for
+        rendering.  Transform to physical pixels so that all of the down-stream
+        transforms work as expected.
+
+        Also, the origin is different and needs to be corrected.
+        """
+        if event is None:
+            window = self.get_window()
+            t, x, y, state = window.get_device_position(
+                window.get_display().get_device_manager().get_client_pointer())
+        else:
+            x, y = event.x, event.y
+        x = x * self.device_pixel_ratio
+        # flip y so y=0 is bottom of canvas
+        y = self.figure.bbox.height - y * self.device_pixel_ratio
+        return x, y
 
     def scroll_event(self, widget, event):
-        x = event.x
-        # flipy so y=0 is bottom of canvas
-        y = self.get_allocation().height - event.y
         step = 1 if event.direction == Gdk.ScrollDirection.UP else -1
-        FigureCanvasBase.scroll_event(self, x, y, step, guiEvent=event)
+        MouseEvent("scroll_event", self, *self._mpl_coords(event), step=step,
+                   guiEvent=event)._process()
         return False  # finish event propagation?
 
     def button_press_event(self, widget, event):
-        x = event.x
-        # flipy so y=0 is bottom of canvas
-        y = self.get_allocation().height - event.y
-        FigureCanvasBase.button_press_event(
-            self, x, y, event.button, guiEvent=event)
+        MouseEvent("button_press_event", self,
+                   *self._mpl_coords(event), event.button,
+                   guiEvent=event)._process()
         return False  # finish event propagation?
 
     def button_release_event(self, widget, event):
-        x = event.x
-        # flipy so y=0 is bottom of canvas
-        y = self.get_allocation().height - event.y
-        FigureCanvasBase.button_release_event(
-            self, x, y, event.button, guiEvent=event)
+        MouseEvent("button_release_event", self,
+                   *self._mpl_coords(event), event.button,
+                   guiEvent=event)._process()
         return False  # finish event propagation?
 
     def key_press_event(self, widget, event):
-        key = self._get_key(event)
-        FigureCanvasBase.key_press_event(self, key, guiEvent=event)
+        KeyEvent("key_press_event", self,
+                 self._get_key(event), *self._mpl_coords(),
+                 guiEvent=event)._process()
         return True  # stop event propagation
 
     def key_release_event(self, widget, event):
-        key = self._get_key(event)
-        FigureCanvasBase.key_release_event(self, key, guiEvent=event)
+        KeyEvent("key_release_event", self,
+                 self._get_key(event), *self._mpl_coords(),
+                 guiEvent=event)._process()
         return True  # stop event propagation
 
     def motion_notify_event(self, widget, event):
-        if event.is_hint:
-            t, x, y, state = event.window.get_device_position(event.device)
-        else:
-            x, y = event.x, event.y
-
-        # flipy so y=0 is bottom of canvas
-        y = self.get_allocation().height - y
-        FigureCanvasBase.motion_notify_event(self, x, y, guiEvent=event)
+        MouseEvent("motion_notify_event", self, *self._mpl_coords(event),
+                   guiEvent=event)._process()
         return False  # finish event propagation?
 
-    def leave_notify_event(self, widget, event):
-        FigureCanvasBase.leave_notify_event(self, event)
-
     def enter_notify_event(self, widget, event):
-        x = event.x
-        # flipy so y=0 is bottom of canvas
-        y = self.get_allocation().height - event.y
-        FigureCanvasBase.enter_notify_event(self, guiEvent=event, xy=(x, y))
+        LocationEvent("figure_enter_event", self, *self._mpl_coords(event),
+                      guiEvent=event)._process()
+
+    def leave_notify_event(self, widget, event):
+        LocationEvent("figure_leave_event", self, *self._mpl_coords(event),
+                      guiEvent=event)._process()
 
     def size_allocate(self, widget, allocation):
         dpival = self.figure.dpi
-        winch = allocation.width / dpival
-        hinch = allocation.height / dpival
+        winch = allocation.width * self.device_pixel_ratio / dpival
+        hinch = allocation.height * self.device_pixel_ratio / dpival
         self.figure.set_size_inches(winch, hinch, forward=False)
-        FigureCanvasBase.resize_event(self)
+        ResizeEvent("resize_event", self)._process()
         self.draw_idle()
 
     def _get_key(self, event):
@@ -226,13 +214,24 @@ def _get_key(self, event):
         for key_mask, prefix in modifiers:
             if event.state & key_mask:
                 if not (prefix == 'shift' and unikey.isprintable()):
-                    key = '{0}+{1}'.format(prefix, key)
+                    key = f'{prefix}+{key}'
         return key
 
+    def _update_device_pixel_ratio(self, *args, **kwargs):
+        # We need to be careful in cases with mixed resolution displays if
+        # device_pixel_ratio changes.
+        if self._set_device_pixel_ratio(self.get_scale_factor()):
+            # The easiest way to resize the canvas is to emit a resize event
+            # since we implement all the logic for resizing the canvas for that
+            # event.
+            self.queue_resize()
+            self.queue_draw()
+
     def configure_event(self, widget, event):
         if widget.get_property("window") is None:
             return
-        w, h = event.width, event.height
+        w = event.width * self.device_pixel_ratio
+        h = event.height * self.device_pixel_ratio
         if w < 3 or h < 3:
             return  # empty fig
         # resize the figure (in inches)
@@ -249,7 +248,8 @@ def _post_draw(self, widget, ctx):
         if self._rubberband_rect is None:
             return
 
-        x0, y0, w, h = self._rubberband_rect
+        x0, y0, w, h = (dim / self.device_pixel_ratio
+                        for dim in self._rubberband_rect)
         x1 = x0 + w
         y1 = y0 + h
 
@@ -297,157 +297,15 @@ def idle_draw(*args):
 
     def flush_events(self):
         # docstring inherited
-        Gdk.threads_enter()
-        while Gtk.events_pending():
-            Gtk.main_iteration()
-        Gdk.flush()
-        Gdk.threads_leave()
-
-
-class FigureManagerGTK3(FigureManagerBase):
-    """
-    Attributes
-    ----------
-    canvas : `FigureCanvas`
-        The FigureCanvas instance
-    num : int or str
-        The Figure number
-    toolbar : Gtk.Toolbar
-        The Gtk.Toolbar
-    vbox : Gtk.VBox
-        The Gtk.VBox containing the canvas and toolbar
-    window : Gtk.Window
-        The Gtk.Window
-
-    """
-    def __init__(self, canvas, num):
-        self.window = Gtk.Window()
-        super().__init__(canvas, num)
-
-        self.window.set_wmclass("matplotlib", "Matplotlib")
-        try:
-            self.window.set_icon_from_file(window_icon)
-        except Exception:
-            # Some versions of gtk throw a glib.GError but not all, so I am not
-            # sure how to catch it.  I am unhappy doing a blanket catch here,
-            # but am not sure what a better way is - JDH
-            _log.info('Could not load matplotlib icon: %s', sys.exc_info()[1])
-
-        self.vbox = Gtk.Box()
-        self.vbox.set_property("orientation", Gtk.Orientation.VERTICAL)
-        self.window.add(self.vbox)
-        self.vbox.show()
-
-        self.canvas.show()
-
-        self.vbox.pack_start(self.canvas, True, True, 0)
-        # calculate size for window
-        w = int(self.canvas.figure.bbox.width)
-        h = int(self.canvas.figure.bbox.height)
-
-        self.toolbar = self._get_toolbar()
-
-        if self.toolmanager:
-            backend_tools.add_tools_to_manager(self.toolmanager)
-            if self.toolbar:
-                backend_tools.add_tools_to_container(self.toolbar)
-
-        if self.toolbar is not None:
-            self.toolbar.show()
-            self.vbox.pack_end(self.toolbar, False, False, 0)
-            min_size, nat_size = self.toolbar.get_preferred_size()
-            h += nat_size.height
-
-        self.window.set_default_size(w, h)
-
-        self._destroying = False
-        self.window.connect("destroy", lambda *args: Gcf.destroy(self))
-        self.window.connect("delete_event", lambda *args: Gcf.destroy(self))
-        if mpl.is_interactive():
-            self.window.show()
-            self.canvas.draw_idle()
-
-        self.canvas.grab_focus()
-
-    def destroy(self, *args):
-        if self._destroying:
-            # Otherwise, this can be called twice when the user presses 'q',
-            # which calls Gcf.destroy(self), then this destroy(), then triggers
-            # Gcf.destroy(self) once again via
-            # `connect("destroy", lambda *args: Gcf.destroy(self))`.
-            return
-        self._destroying = True
-        self.vbox.destroy()
-        self.window.destroy()
-        self.canvas.destroy()
-        if self.toolbar:
-            self.toolbar.destroy()
-
-        if (Gcf.get_num_fig_managers() == 0 and not mpl.is_interactive() and
-                Gtk.main_level() >= 1):
-            Gtk.main_quit()
-
-    def show(self):
-        # show the figure window
-        self.window.show()
-        self.canvas.draw()
-        if mpl.rcParams['figure.raise_window']:
-            if self.window.get_window():
-                self.window.present()
-            else:
-                # If this is called by a callback early during init,
-                # self.window (a GtkWindow) may not have an associated
-                # low-level GdkWindow (self.window.get_window()) yet, and
-                # present() would crash.
-                _api.warn_external("Cannot raise window yet to be setup")
-
-    def full_screen_toggle(self):
-        self._full_screen_flag = not self._full_screen_flag
-        if self._full_screen_flag:
-            self.window.fullscreen()
-        else:
-            self.window.unfullscreen()
-    _full_screen_flag = False
-
-    def _get_toolbar(self):
-        # must be inited after the window, drawingArea and figure
-        # attrs are set
-        if mpl.rcParams['toolbar'] == 'toolbar2':
-            toolbar = NavigationToolbar2GTK3(self.canvas, self.window)
-        elif mpl.rcParams['toolbar'] == 'toolmanager':
-            toolbar = ToolbarGTK3(self.toolmanager)
-        else:
-            toolbar = None
-        return toolbar
-
-    def get_window_title(self):
-        return self.window.get_title()
-
-    def set_window_title(self, title):
-        self.window.set_title(title)
-
-    def resize(self, width, height):
-        """Set the canvas size in pixels."""
-        if self.toolbar:
-            toolbar_size = self.toolbar.size_request()
-            height += toolbar_size.height
-        canvas_size = self.canvas.get_allocation()
-        if canvas_size.width == canvas_size.height == 1:
-            # A canvas size of (1, 1) cannot exist in most cases, because
-            # window decorations would prevent such a small window. This call
-            # must be before the window has been mapped and widgets have been
-            # sized, so just change the window's starting size.
-            self.window.set_default_size(width, height)
-        else:
-            self.window.resize(width, height)
-
+        context = GLib.MainContext.default()
+        while context.pending():
+            context.iteration(True)
 
-class NavigationToolbar2GTK3(NavigationToolbar2, Gtk.Toolbar):
-    ctx = _api.deprecated("3.3")(property(
-        lambda self: self.canvas.get_property("window").cairo_create()))
 
-    def __init__(self, canvas, window):
-        self.win = window
+class NavigationToolbar2GTK3(_NavigationToolbar2GTK, Gtk.Toolbar):
+    @_api.delete_parameter("3.6", "window")
+    def __init__(self, canvas, window=None):
+        self._win = window
         GObject.GObject.__init__(self)
 
         self.set_style(Gtk.ToolbarStyle.ICONS)
@@ -462,21 +320,16 @@ def __init__(self, canvas, window):
                     str(cbook._get_data_path('images',
                                              f'{image_file}-symbolic.svg'))),
                 Gtk.IconSize.LARGE_TOOLBAR)
-            self._gtk_ids[text] = tbutton = (
+            self._gtk_ids[text] = button = (
                 Gtk.ToggleToolButton() if callback in ['zoom', 'pan'] else
                 Gtk.ToolButton())
-            tbutton.set_label(text)
-            tbutton.set_icon_widget(image)
-            self.insert(tbutton, -1)
+            button.set_label(text)
+            button.set_icon_widget(image)
             # Save the handler id, so that we can block it as needed.
-            tbutton._signal_handler = tbutton.connect(
+            button._signal_handler = button.connect(
                 'clicked', getattr(self, callback))
-            tbutton.set_tooltip_text(tooltip_text)
-
-        toolitem = Gtk.SeparatorToolItem()
-        self.insert(toolitem, -1)
-        toolitem.set_draw(False)
-        toolitem.set_expand(True)
+            button.set_tooltip_text(tooltip_text)
+            self.insert(button, -1)
 
         # This filler item ensures the toolbar is always at least two text
         # lines high. Otherwise the canvas gets redrawn as the mouse hovers
@@ -487,51 +340,20 @@ def __init__(self, canvas, window):
         label = Gtk.Label()
         label.set_markup(
             '<small>\N{NO-BREAK SPACE}\n\N{NO-BREAK SPACE}</small>')
+        toolitem.set_expand(True)  # Push real message to the right.
         toolitem.add(label)
 
         toolitem = Gtk.ToolItem()
         self.insert(toolitem, -1)
         self.message = Gtk.Label()
+        self.message.set_justify(Gtk.Justification.RIGHT)
         toolitem.add(self.message)
 
         self.show_all()
 
-        NavigationToolbar2.__init__(self, canvas)
-
-    def set_message(self, s):
-        escaped = GLib.markup_escape_text(s)
-        self.message.set_markup(f'<small>{escaped}</small>')
+        _NavigationToolbar2GTK.__init__(self, canvas)
 
-    def set_cursor(self, cursor):
-        window = self.canvas.get_property("window")
-        if window is not None:
-            window.set_cursor(cursord[cursor])
-            Gtk.main_iteration()
-
-    def draw_rubberband(self, event, x0, y0, x1, y1):
-        height = self.canvas.figure.bbox.height
-        y1 = height - y1
-        y0 = height - y0
-        rect = [int(val) for val in (x0, y0, x1 - x0, y1 - y0)]
-        self.canvas._draw_rubberband(rect)
-
-    def remove_rubberband(self):
-        self.canvas._draw_rubberband(None)
-
-    def _update_buttons_checked(self):
-        for name, active in [("Pan", "PAN"), ("Zoom", "ZOOM")]:
-            button = self._gtk_ids.get(name)
-            if button:
-                with button.handler_block(button._signal_handler):
-                    button.set_active(self.mode.name == active)
-
-    def pan(self, *args):
-        super().pan(*args)
-        self._update_buttons_checked()
-
-    def zoom(self, *args):
-        super().zoom(*args)
-        self._update_buttons_checked()
+    win = _api.deprecated("3.6")(property(lambda self: self._win))
 
     def save_figure(self, *args):
         dialog = Gtk.FileChooserDialog(
@@ -546,7 +368,7 @@ def save_figure(self, *args):
             ff = Gtk.FileFilter()
             ff.set_name(name)
             for fmt in fmts:
-                ff.add_pattern("*." + fmt)
+                ff.add_pattern(f'*.{fmt}')
             dialog.add_filter(ff)
             if self.canvas.get_default_filetype() in fmts:
                 dialog.set_filter(ff)
@@ -556,7 +378,7 @@ def on_notify_filter(*args):
             name = dialog.get_filter().get_name()
             fmt = self.canvas.get_supported_filetypes_grouped()[name][0]
             dialog.set_current_name(
-                str(Path(dialog.get_current_name()).with_suffix("." + fmt)))
+                str(Path(dialog.get_current_name()).with_suffix(f'.{fmt}')))
 
         dialog.set_current_folder(mpl.rcParams["savefig.directory"])
         dialog.set_current_name(self.canvas.get_default_filename())
@@ -575,15 +397,11 @@ def on_notify_filter(*args):
         try:
             self.canvas.figure.savefig(fname, format=fmt)
         except Exception as e:
-            error_msg_gtk(str(e), parent=self)
-
-    def set_history_buttons(self):
-        can_backward = self._nav_stack._pos > 0
-        can_forward = self._nav_stack._pos < len(self._nav_stack._elements) - 1
-        if 'Back' in self._gtk_ids:
-            self._gtk_ids['Back'].set_sensitive(can_backward)
-        if 'Forward' in self._gtk_ids:
-            self._gtk_ids['Forward'].set_sensitive(can_forward)
+            dialog = Gtk.MessageDialog(
+                parent=self.canvas.get_toplevel(), message_format=str(e),
+                type=Gtk.MessageType.ERROR, buttons=Gtk.ButtonsType.OK)
+            dialog.run()
+            dialog.destroy()
 
 
 class ToolbarGTK3(ToolContainerBase, Gtk.Box):
@@ -594,6 +412,7 @@ def __init__(self, toolmanager):
         Gtk.Box.__init__(self)
         self.set_property('orientation', Gtk.Orientation.HORIZONTAL)
         self._message = Gtk.Label()
+        self._message.set_justify(Gtk.Justification.RIGHT)
         self.pack_end(self._message, False, False, 0)
         self.show_all()
         self._groups = {}
@@ -602,26 +421,26 @@ def __init__(self, toolmanager):
     def add_toolitem(self, name, group, position, image_file, description,
                      toggle):
         if toggle:
-            tbutton = Gtk.ToggleToolButton()
+            button = Gtk.ToggleToolButton()
         else:
-            tbutton = Gtk.ToolButton()
-        tbutton.set_label(name)
+            button = Gtk.ToolButton()
+        button.set_label(name)
 
         if image_file is not None:
             image = Gtk.Image.new_from_gicon(
                 Gio.Icon.new_for_string(image_file),
                 Gtk.IconSize.LARGE_TOOLBAR)
-            tbutton.set_icon_widget(image)
+            button.set_icon_widget(image)
 
         if position is None:
             position = -1
 
-        self._add_button(tbutton, group, position)
-        signal = tbutton.connect('clicked', self._call_tool, name)
-        tbutton.set_tooltip_text(description)
-        tbutton.show_all()
+        self._add_button(button, group, position)
+        signal = button.connect('clicked', self._call_tool, name)
+        button.set_tooltip_text(description)
+        button.show_all()
         self._toolitems.setdefault(name, [])
-        self._toolitems[name].append((tbutton, signal))
+        self._toolitems[name].append((button, signal))
 
     def _add_button(self, button, group, position):
         if group not in self._groups:
@@ -647,7 +466,7 @@ def toggle_toolitem(self, name, toggled):
 
     def remove_toolitem(self, name):
         if name not in self._toolitems:
-            self.toolmanager.message_event('%s Not in toolbar' % name, self)
+            self.toolmanager.message_event(f'{name} not in toolbar', self)
             return
 
         for group in self._groups:
@@ -666,52 +485,21 @@ def set_message(self, s):
         self._message.set_label(s)
 
 
-@_api.deprecated("3.3")
-class StatusbarGTK3(StatusbarBase, Gtk.Statusbar):
-    def __init__(self, *args, **kwargs):
-        StatusbarBase.__init__(self, *args, **kwargs)
-        Gtk.Statusbar.__init__(self)
-        self._context = self.get_context_id('message')
-
-    def set_message(self, s):
-        self.pop(self._context)
-        self.push(self._context, s)
-
-
-class RubberbandGTK3(backend_tools.RubberbandBase):
-    def draw_rubberband(self, x0, y0, x1, y1):
-        NavigationToolbar2GTK3.draw_rubberband(
-            self._make_classic_style_pseudo_toolbar(), None, x0, y0, x1, y1)
-
-    def remove_rubberband(self):
-        NavigationToolbar2GTK3.remove_rubberband(
-            self._make_classic_style_pseudo_toolbar())
-
-
+@backend_tools._register_tool_class(FigureCanvasGTK3)
 class SaveFigureGTK3(backend_tools.SaveFigureBase):
     def trigger(self, *args, **kwargs):
-
-        class PseudoToolbar:
-            canvas = self.figure.canvas
-
-        return NavigationToolbar2GTK3.save_figure(PseudoToolbar())
+        NavigationToolbar2GTK3.save_figure(
+            self._make_classic_style_pseudo_toolbar())
 
 
+@_api.deprecated("3.5", alternative="ToolSetCursor")
 class SetCursorGTK3(backend_tools.SetCursorBase):
     def set_cursor(self, cursor):
         NavigationToolbar2GTK3.set_cursor(
             self._make_classic_style_pseudo_toolbar(), cursor)
 
 
-class ConfigureSubplotsGTK3(backend_tools.ConfigureSubplotsBase, Gtk.Window):
-    def _get_canvas(self, fig):
-        return self.canvas.__class__(fig)
-
-    def trigger(self, *args):
-        NavigationToolbar2GTK3.configure_subplots(
-            self._make_classic_style_pseudo_toolbar(), None)
-
-
+@backend_tools._register_tool_class(FigureCanvasGTK3)
 class HelpGTK3(backend_tools.ToolHelpBase):
     def _normalize_shortcut(self, key):
         """
@@ -797,6 +585,7 @@ def trigger(self, *args):
             self._show_shortcuts_dialog()
 
 
+@backend_tools._register_tool_class(FigureCanvasGTK3)
 class ToolCopyToClipboardGTK3(backend_tools.ToolCopyToClipboardBase):
     def trigger(self, *args, **kwargs):
         clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD)
@@ -806,14 +595,7 @@ def trigger(self, *args, **kwargs):
         clipboard.set_image(pb)
 
 
-# Define the file to use as the GTk icon
-if sys.platform == 'win32':
-    icon_filename = 'matplotlib.png'
-else:
-    icon_filename = 'matplotlib.svg'
-window_icon = str(cbook._get_data_path('images', icon_filename))
-
-
+@_api.deprecated("3.6")
 def error_msg_gtk(msg, parent=None):
     if parent is not None:  # find the toplevel Gtk.Window
         parent = parent.get_toplevel()
@@ -828,23 +610,19 @@ def error_msg_gtk(msg, parent=None):
     dialog.destroy()
 
 
-backend_tools.ToolSaveFigure = SaveFigureGTK3
-backend_tools.ToolConfigureSubplots = ConfigureSubplotsGTK3
-backend_tools.ToolSetCursor = SetCursorGTK3
-backend_tools.ToolRubberband = RubberbandGTK3
-backend_tools.ToolHelp = HelpGTK3
-backend_tools.ToolCopyToClipboard = ToolCopyToClipboardGTK3
-
 Toolbar = ToolbarGTK3
+backend_tools._register_tool_class(
+    FigureCanvasGTK3, _backend_gtk.ConfigureSubplotsGTK)
+backend_tools._register_tool_class(
+    FigureCanvasGTK3, _backend_gtk.RubberbandGTK)
+
 
+class FigureManagerGTK3(_FigureManagerGTK):
+    _toolbar2_class = NavigationToolbar2GTK3
+    _toolmanager_toolbar_class = ToolbarGTK3
 
-@_Backend.export
-class _BackendGTK3(_Backend):
+
+@_BackendGTK.export
+class _BackendGTK3(_BackendGTK):
     FigureCanvas = FigureCanvasGTK3
     FigureManager = FigureManagerGTK3
-
-    @staticmethod
-    def mainloop():
-        if Gtk.main_level() == 0:
-            cbook._setup_new_guiapp()
-            Gtk.main()
diff --git a/lib/matplotlib/backends/backend_gtk3agg.py b/lib/matplotlib/backends/backend_gtk3agg.py
index ecd15327aa02..10aa15ac2a6b 100644
--- a/lib/matplotlib/backends/backend_gtk3agg.py
+++ b/lib/matplotlib/backends/backend_gtk3agg.py
@@ -1,26 +1,23 @@
 import numpy as np
 
-from .. import cbook
-try:
-    from . import backend_cairo
-except ImportError as e:
-    raise ImportError('backend Gtk3Agg requires cairo') from e
+from .. import _api, cbook, transforms
 from . import backend_agg, backend_gtk3
-from .backend_cairo import cairo
 from .backend_gtk3 import Gtk, _BackendGTK3
-from matplotlib import transforms
 
+import cairo  # Presence of cairo is already checked by _backend_gtk.
 
-class FigureCanvasGTK3Agg(backend_gtk3.FigureCanvasGTK3,
-                          backend_agg.FigureCanvasAgg):
+
+class FigureCanvasGTK3Agg(backend_agg.FigureCanvasAgg,
+                          backend_gtk3.FigureCanvasGTK3):
     def __init__(self, figure):
-        backend_gtk3.FigureCanvasGTK3.__init__(self, figure)
+        super().__init__(figure=figure)
         self._bbox_queue = []
 
     def on_draw_event(self, widget, ctx):
-        """GtkDrawable draw event, like expose_event in GTK 2.X."""
+        scale = self.device_pixel_ratio
         allocation = self.get_allocation()
-        w, h = allocation.width, allocation.height
+        w = allocation.width * scale
+        h = allocation.height * scale
 
         if not len(self._bbox_queue):
             Gtk.render_background(
@@ -31,8 +28,6 @@ def on_draw_event(self, widget, ctx):
         else:
             bbox_queue = self._bbox_queue
 
-        ctx = backend_cairo._to_context(ctx)
-
         for bbox in bbox_queue:
             x = int(bbox.x0)
             y = h - int(bbox.y1)
@@ -43,7 +38,8 @@ def on_draw_event(self, widget, ctx):
                 np.asarray(self.copy_from_bbox(bbox)))
             image = cairo.ImageSurface.create_for_data(
                 buf.ravel().data, cairo.FORMAT_ARGB32, width, height)
-            ctx.set_source_surface(image, x, y)
+            image.set_device_scale(scale, scale)
+            ctx.set_source_surface(image, x / scale, y / scale)
             ctx.paint()
 
         if len(self._bbox_queue):
@@ -57,25 +53,18 @@ def blit(self, bbox=None):
         if bbox is None:
             bbox = self.figure.bbox
 
+        scale = self.device_pixel_ratio
         allocation = self.get_allocation()
-        x = int(bbox.x0)
-        y = allocation.height - int(bbox.y1)
-        width = int(bbox.x1) - int(bbox.x0)
-        height = int(bbox.y1) - int(bbox.y0)
+        x = int(bbox.x0 / scale)
+        y = allocation.height - int(bbox.y1 / scale)
+        width = (int(bbox.x1) - int(bbox.x0)) // scale
+        height = (int(bbox.y1) - int(bbox.y0)) // scale
 
         self._bbox_queue.append(bbox)
         self.queue_draw_area(x, y, width, height)
 
-    def draw(self):
-        backend_agg.FigureCanvasAgg.draw(self)
-        super().draw()
-
-    def print_png(self, filename, *args, **kwargs):
-        # Do this so we can save the resolution of figure in the PNG file
-        agg = self.switch_backends(backend_agg.FigureCanvasAgg)
-        return agg.print_png(filename, *args, **kwargs)
-
 
+@_api.deprecated("3.6", alternative="backend_gtk3.FigureManagerGTK3")
 class FigureManagerGTK3Agg(backend_gtk3.FigureManagerGTK3):
     pass
 
@@ -83,4 +72,3 @@ class FigureManagerGTK3Agg(backend_gtk3.FigureManagerGTK3):
 @_BackendGTK3.export
 class _BackendGTK3Cairo(_BackendGTK3):
     FigureCanvas = FigureCanvasGTK3Agg
-    FigureManager = FigureManagerGTK3Agg
diff --git a/lib/matplotlib/backends/backend_gtk3cairo.py b/lib/matplotlib/backends/backend_gtk3cairo.py
index af290902d8a6..49215510c178 100644
--- a/lib/matplotlib/backends/backend_gtk3cairo.py
+++ b/lib/matplotlib/backends/backend_gtk3cairo.py
@@ -1,33 +1,24 @@
 from contextlib import nullcontext
 
-from . import backend_cairo, backend_gtk3
-from .backend_gtk3 import Gtk, _BackendGTK3
+from .backend_cairo import (  # noqa
+    FigureCanvasCairo, _RendererGTKCairo as RendererGTK3Cairo)
+from .backend_gtk3 import Gtk, FigureCanvasGTK3, _BackendGTK3
 
 
-class RendererGTK3Cairo(backend_cairo.RendererCairo):
-    def set_context(self, ctx):
-        self.gc.ctx = backend_cairo._to_context(ctx)
-
-
-class FigureCanvasGTK3Cairo(backend_gtk3.FigureCanvasGTK3,
-                            backend_cairo.FigureCanvasCairo):
-
-    def __init__(self, figure):
-        super().__init__(figure)
-        self._renderer = RendererGTK3Cairo(self.figure.dpi)
-
+class FigureCanvasGTK3Cairo(FigureCanvasCairo, FigureCanvasGTK3):
     def on_draw_event(self, widget, ctx):
-        """GtkDrawable draw event."""
         with (self.toolbar._wait_cursor_for_draw_cm() if self.toolbar
               else nullcontext()):
             self._renderer.set_context(ctx)
+            scale = self.device_pixel_ratio
+            # Scale physical drawing to logical size.
+            ctx.scale(1 / scale, 1 / scale)
             allocation = self.get_allocation()
             Gtk.render_background(
                 self.get_style_context(), ctx,
                 allocation.x, allocation.y,
                 allocation.width, allocation.height)
-            self._renderer.set_width_height(
-                allocation.width, allocation.height)
+            self._renderer.dpi = self.figure.dpi
             self.figure.draw(self._renderer)
 
 
diff --git a/lib/matplotlib/backends/backend_gtk4.py b/lib/matplotlib/backends/backend_gtk4.py
new file mode 100644
index 000000000000..923787150a8d
--- /dev/null
+++ b/lib/matplotlib/backends/backend_gtk4.py
@@ -0,0 +1,578 @@
+import functools
+import io
+import os
+
+import matplotlib as mpl
+from matplotlib import _api, backend_tools, cbook
+from matplotlib.backend_bases import (
+    FigureCanvasBase, ToolContainerBase,
+    KeyEvent, LocationEvent, MouseEvent, ResizeEvent)
+
+try:
+    import gi
+except ImportError as err:
+    raise ImportError("The GTK4 backends require PyGObject") from err
+
+try:
+    # :raises ValueError: If module/version is already loaded, already
+    # required, or unavailable.
+    gi.require_version("Gtk", "4.0")
+except ValueError as e:
+    # in this case we want to re-raise as ImportError so the
+    # auto-backend selection logic correctly skips.
+    raise ImportError from e
+
+from gi.repository import Gio, GLib, Gtk, Gdk, GdkPixbuf
+from . import _backend_gtk
+from ._backend_gtk import (
+    _BackendGTK, _FigureManagerGTK, _NavigationToolbar2GTK,
+    TimerGTK as TimerGTK4,
+)
+
+
+class FigureCanvasGTK4(FigureCanvasBase, Gtk.DrawingArea):
+    required_interactive_framework = "gtk4"
+    supports_blit = False
+    _timer_cls = TimerGTK4
+    manager_class = _api.classproperty(lambda cls: FigureManagerGTK4)
+    _context_is_scaled = False
+
+    def __init__(self, figure=None):
+        super().__init__(figure=figure)
+
+        self.set_hexpand(True)
+        self.set_vexpand(True)
+
+        self._idle_draw_id = 0
+        self._rubberband_rect = None
+
+        self.set_draw_func(self._draw_func)
+        self.connect('resize', self.resize_event)
+        self.connect('notify::scale-factor', self._update_device_pixel_ratio)
+
+        click = Gtk.GestureClick()
+        click.set_button(0)  # All buttons.
+        click.connect('pressed', self.button_press_event)
+        click.connect('released', self.button_release_event)
+        self.add_controller(click)
+
+        key = Gtk.EventControllerKey()
+        key.connect('key-pressed', self.key_press_event)
+        key.connect('key-released', self.key_release_event)
+        self.add_controller(key)
+
+        motion = Gtk.EventControllerMotion()
+        motion.connect('motion', self.motion_notify_event)
+        motion.connect('enter', self.enter_notify_event)
+        motion.connect('leave', self.leave_notify_event)
+        self.add_controller(motion)
+
+        scroll = Gtk.EventControllerScroll.new(
+            Gtk.EventControllerScrollFlags.VERTICAL)
+        scroll.connect('scroll', self.scroll_event)
+        self.add_controller(scroll)
+
+        self.set_focusable(True)
+
+        css = Gtk.CssProvider()
+        css.load_from_data(b".matplotlib-canvas { background-color: white; }")
+        style_ctx = self.get_style_context()
+        style_ctx.add_provider(css, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
+        style_ctx.add_class("matplotlib-canvas")
+
+    def destroy(self):
+        self.close_event()
+
+    def set_cursor(self, cursor):
+        # docstring inherited
+        self.set_cursor_from_name(_backend_gtk.mpl_to_gtk_cursor_name(cursor))
+
+    def _mpl_coords(self, xy=None):
+        """
+        Convert the *xy* position of a GTK event, or of the current cursor
+        position if *xy* is None, to Matplotlib coordinates.
+
+        GTK use logical pixels, but the figure is scaled to physical pixels for
+        rendering.  Transform to physical pixels so that all of the down-stream
+        transforms work as expected.
+
+        Also, the origin is different and needs to be corrected.
+        """
+        if xy is None:
+            surface = self.get_native().get_surface()
+            is_over, x, y, mask = surface.get_device_position(
+                self.get_display().get_default_seat().get_pointer())
+        else:
+            x, y = xy
+        x = x * self.device_pixel_ratio
+        # flip y so y=0 is bottom of canvas
+        y = self.figure.bbox.height - y * self.device_pixel_ratio
+        return x, y
+
+    def scroll_event(self, controller, dx, dy):
+        MouseEvent("scroll_event", self,
+                   *self._mpl_coords(), step=dy)._process()
+        return True
+
+    def button_press_event(self, controller, n_press, x, y):
+        MouseEvent("button_press_event", self,
+                   *self._mpl_coords((x, y)), controller.get_current_button()
+                   )._process()
+        self.grab_focus()
+
+    def button_release_event(self, controller, n_press, x, y):
+        MouseEvent("button_release_event", self,
+                   *self._mpl_coords((x, y)), controller.get_current_button()
+                   )._process()
+
+    def key_press_event(self, controller, keyval, keycode, state):
+        KeyEvent("key_press_event", self,
+                 self._get_key(keyval, keycode, state), *self._mpl_coords()
+                 )._process()
+        return True
+
+    def key_release_event(self, controller, keyval, keycode, state):
+        KeyEvent("key_release_event", self,
+                 self._get_key(keyval, keycode, state), *self._mpl_coords()
+                 )._process()
+        return True
+
+    def motion_notify_event(self, controller, x, y):
+        MouseEvent("motion_notify_event", self,
+                   *self._mpl_coords((x, y)))._process()
+
+    def leave_notify_event(self, controller):
+        LocationEvent("figure_leave_event", self,
+                      *self._mpl_coords())._process()
+
+    def enter_notify_event(self, controller, x, y):
+        LocationEvent("figure_enter_event", self,
+                      *self._mpl_coords((x, y)))._process()
+
+    def resize_event(self, area, width, height):
+        self._update_device_pixel_ratio()
+        dpi = self.figure.dpi
+        winch = width * self.device_pixel_ratio / dpi
+        hinch = height * self.device_pixel_ratio / dpi
+        self.figure.set_size_inches(winch, hinch, forward=False)
+        ResizeEvent("resize_event", self)._process()
+        self.draw_idle()
+
+    def _get_key(self, keyval, keycode, state):
+        unikey = chr(Gdk.keyval_to_unicode(keyval))
+        key = cbook._unikey_or_keysym_to_mplkey(
+            unikey,
+            Gdk.keyval_name(keyval))
+        modifiers = [
+            (Gdk.ModifierType.CONTROL_MASK, 'ctrl'),
+            (Gdk.ModifierType.ALT_MASK, 'alt'),
+            (Gdk.ModifierType.SHIFT_MASK, 'shift'),
+            (Gdk.ModifierType.SUPER_MASK, 'super'),
+        ]
+        for key_mask, prefix in modifiers:
+            if state & key_mask:
+                if not (prefix == 'shift' and unikey.isprintable()):
+                    key = f'{prefix}+{key}'
+        return key
+
+    def _update_device_pixel_ratio(self, *args, **kwargs):
+        # We need to be careful in cases with mixed resolution displays if
+        # device_pixel_ratio changes.
+        if self._set_device_pixel_ratio(self.get_scale_factor()):
+            self.draw()
+
+    def _draw_rubberband(self, rect):
+        self._rubberband_rect = rect
+        # TODO: Only update the rubberband area.
+        self.queue_draw()
+
+    def _draw_func(self, drawing_area, ctx, width, height):
+        self.on_draw_event(self, ctx)
+        self._post_draw(self, ctx)
+
+    def _post_draw(self, widget, ctx):
+        if self._rubberband_rect is None:
+            return
+
+        lw = 1
+        dash = 3
+        if not self._context_is_scaled:
+            x0, y0, w, h = (dim / self.device_pixel_ratio
+                            for dim in self._rubberband_rect)
+        else:
+            x0, y0, w, h = self._rubberband_rect
+            lw *= self.device_pixel_ratio
+            dash *= self.device_pixel_ratio
+        x1 = x0 + w
+        y1 = y0 + h
+
+        # Draw the lines from x0, y0 towards x1, y1 so that the
+        # dashes don't "jump" when moving the zoom box.
+        ctx.move_to(x0, y0)
+        ctx.line_to(x0, y1)
+        ctx.move_to(x0, y0)
+        ctx.line_to(x1, y0)
+        ctx.move_to(x0, y1)
+        ctx.line_to(x1, y1)
+        ctx.move_to(x1, y0)
+        ctx.line_to(x1, y1)
+
+        ctx.set_antialias(1)
+        ctx.set_line_width(lw)
+        ctx.set_dash((dash, dash), 0)
+        ctx.set_source_rgb(0, 0, 0)
+        ctx.stroke_preserve()
+
+        ctx.set_dash((dash, dash), dash)
+        ctx.set_source_rgb(1, 1, 1)
+        ctx.stroke()
+
+    def on_draw_event(self, widget, ctx):
+        # to be overwritten by GTK4Agg or GTK4Cairo
+        pass
+
+    def draw(self):
+        # docstring inherited
+        if self.is_drawable():
+            self.queue_draw()
+
+    def draw_idle(self):
+        # docstring inherited
+        if self._idle_draw_id != 0:
+            return
+        def idle_draw(*args):
+            try:
+                self.draw()
+            finally:
+                self._idle_draw_id = 0
+            return False
+        self._idle_draw_id = GLib.idle_add(idle_draw)
+
+    def flush_events(self):
+        # docstring inherited
+        context = GLib.MainContext.default()
+        while context.pending():
+            context.iteration(True)
+
+
+class NavigationToolbar2GTK4(_NavigationToolbar2GTK, Gtk.Box):
+    @_api.delete_parameter("3.6", "window")
+    def __init__(self, canvas, window=None):
+        self._win = window
+        Gtk.Box.__init__(self)
+
+        self.add_css_class('toolbar')
+
+        self._gtk_ids = {}
+        for text, tooltip_text, image_file, callback in self.toolitems:
+            if text is None:
+                self.append(Gtk.Separator())
+                continue
+            image = Gtk.Image.new_from_gicon(
+                Gio.Icon.new_for_string(
+                    str(cbook._get_data_path('images',
+                                             f'{image_file}-symbolic.svg'))))
+            self._gtk_ids[text] = button = (
+                Gtk.ToggleButton() if callback in ['zoom', 'pan'] else
+                Gtk.Button())
+            button.set_child(image)
+            button.add_css_class('flat')
+            button.add_css_class('image-button')
+            # Save the handler id, so that we can block it as needed.
+            button._signal_handler = button.connect(
+                'clicked', getattr(self, callback))
+            button.set_tooltip_text(tooltip_text)
+            self.append(button)
+
+        # This filler item ensures the toolbar is always at least two text
+        # lines high. Otherwise the canvas gets redrawn as the mouse hovers
+        # over images because those use two-line messages which resize the
+        # toolbar.
+        label = Gtk.Label()
+        label.set_markup(
+            '<small>\N{NO-BREAK SPACE}\n\N{NO-BREAK SPACE}</small>')
+        label.set_hexpand(True)  # Push real message to the right.
+        self.append(label)
+
+        self.message = Gtk.Label()
+        self.message.set_justify(Gtk.Justification.RIGHT)
+        self.append(self.message)
+
+        _NavigationToolbar2GTK.__init__(self, canvas)
+
+    win = _api.deprecated("3.6")(property(lambda self: self._win))
+
+    def save_figure(self, *args):
+        dialog = Gtk.FileChooserNative(
+            title='Save the figure',
+            transient_for=self.canvas.get_root(),
+            action=Gtk.FileChooserAction.SAVE,
+            modal=True)
+        self._save_dialog = dialog  # Must keep a reference.
+
+        ff = Gtk.FileFilter()
+        ff.set_name('All files')
+        ff.add_pattern('*')
+        dialog.add_filter(ff)
+        dialog.set_filter(ff)
+
+        formats = []
+        default_format = None
+        for i, (name, fmts) in enumerate(
+                self.canvas.get_supported_filetypes_grouped().items()):
+            ff = Gtk.FileFilter()
+            ff.set_name(name)
+            for fmt in fmts:
+                ff.add_pattern(f'*.{fmt}')
+            dialog.add_filter(ff)
+            formats.append(name)
+            if self.canvas.get_default_filetype() in fmts:
+                default_format = i
+        # Setting the choice doesn't always work, so make sure the default
+        # format is first.
+        formats = [formats[default_format], *formats[:default_format],
+                   *formats[default_format+1:]]
+        dialog.add_choice('format', 'File format', formats, formats)
+        dialog.set_choice('format', formats[default_format])
+
+        dialog.set_current_folder(Gio.File.new_for_path(
+            os.path.expanduser(mpl.rcParams['savefig.directory'])))
+        dialog.set_current_name(self.canvas.get_default_filename())
+
+        @functools.partial(dialog.connect, 'response')
+        def on_response(dialog, response):
+            file = dialog.get_file()
+            fmt = dialog.get_choice('format')
+            fmt = self.canvas.get_supported_filetypes_grouped()[fmt][0]
+            dialog.destroy()
+            self._save_dialog = None
+            if response != Gtk.ResponseType.ACCEPT:
+                return
+            # Save dir for next time, unless empty str (which means use cwd).
+            if mpl.rcParams['savefig.directory']:
+                parent = file.get_parent()
+                mpl.rcParams['savefig.directory'] = parent.get_path()
+            try:
+                self.canvas.figure.savefig(file.get_path(), format=fmt)
+            except Exception as e:
+                msg = Gtk.MessageDialog(
+                    transient_for=self.canvas.get_root(),
+                    message_type=Gtk.MessageType.ERROR,
+                    buttons=Gtk.ButtonsType.OK, modal=True,
+                    text=str(e))
+                msg.show()
+
+        dialog.show()
+
+
+class ToolbarGTK4(ToolContainerBase, Gtk.Box):
+    _icon_extension = '-symbolic.svg'
+
+    def __init__(self, toolmanager):
+        ToolContainerBase.__init__(self, toolmanager)
+        Gtk.Box.__init__(self)
+        self.set_property('orientation', Gtk.Orientation.HORIZONTAL)
+
+        # Tool items are created later, but must appear before the message.
+        self._tool_box = Gtk.Box()
+        self.append(self._tool_box)
+        self._groups = {}
+        self._toolitems = {}
+
+        # This filler item ensures the toolbar is always at least two text
+        # lines high. Otherwise the canvas gets redrawn as the mouse hovers
+        # over images because those use two-line messages which resize the
+        # toolbar.
+        label = Gtk.Label()
+        label.set_markup(
+            '<small>\N{NO-BREAK SPACE}\n\N{NO-BREAK SPACE}</small>')
+        label.set_hexpand(True)  # Push real message to the right.
+        self.append(label)
+
+        self._message = Gtk.Label()
+        self._message.set_justify(Gtk.Justification.RIGHT)
+        self.append(self._message)
+
+    def add_toolitem(self, name, group, position, image_file, description,
+                     toggle):
+        if toggle:
+            button = Gtk.ToggleButton()
+        else:
+            button = Gtk.Button()
+        button.set_label(name)
+        button.add_css_class('flat')
+
+        if image_file is not None:
+            image = Gtk.Image.new_from_gicon(
+                Gio.Icon.new_for_string(image_file))
+            button.set_child(image)
+            button.add_css_class('image-button')
+
+        if position is None:
+            position = -1
+
+        self._add_button(button, group, position)
+        signal = button.connect('clicked', self._call_tool, name)
+        button.set_tooltip_text(description)
+        self._toolitems.setdefault(name, [])
+        self._toolitems[name].append((button, signal))
+
+    def _find_child_at_position(self, group, position):
+        children = [None]
+        child = self._groups[group].get_first_child()
+        while child is not None:
+            children.append(child)
+            child = child.get_next_sibling()
+        return children[position]
+
+    def _add_button(self, button, group, position):
+        if group not in self._groups:
+            if self._groups:
+                self._add_separator()
+            group_box = Gtk.Box()
+            self._tool_box.append(group_box)
+            self._groups[group] = group_box
+        self._groups[group].insert_child_after(
+            button, self._find_child_at_position(group, position))
+
+    def _call_tool(self, btn, name):
+        self.trigger_tool(name)
+
+    def toggle_toolitem(self, name, toggled):
+        if name not in self._toolitems:
+            return
+        for toolitem, signal in self._toolitems[name]:
+            toolitem.handler_block(signal)
+            toolitem.set_active(toggled)
+            toolitem.handler_unblock(signal)
+
+    def remove_toolitem(self, name):
+        if name not in self._toolitems:
+            self.toolmanager.message_event(f'{name} not in toolbar', self)
+            return
+
+        for group in self._groups:
+            for toolitem, _signal in self._toolitems[name]:
+                if toolitem in self._groups[group]:
+                    self._groups[group].remove(toolitem)
+        del self._toolitems[name]
+
+    def _add_separator(self):
+        sep = Gtk.Separator()
+        sep.set_property("orientation", Gtk.Orientation.VERTICAL)
+        self._tool_box.append(sep)
+
+    def set_message(self, s):
+        self._message.set_label(s)
+
+
+@backend_tools._register_tool_class(FigureCanvasGTK4)
+class SaveFigureGTK4(backend_tools.SaveFigureBase):
+    def trigger(self, *args, **kwargs):
+        NavigationToolbar2GTK4.save_figure(
+            self._make_classic_style_pseudo_toolbar())
+
+
+@backend_tools._register_tool_class(FigureCanvasGTK4)
+class HelpGTK4(backend_tools.ToolHelpBase):
+    def _normalize_shortcut(self, key):
+        """
+        Convert Matplotlib key presses to GTK+ accelerator identifiers.
+
+        Related to `FigureCanvasGTK4._get_key`.
+        """
+        special = {
+            'backspace': 'BackSpace',
+            'pagedown': 'Page_Down',
+            'pageup': 'Page_Up',
+            'scroll_lock': 'Scroll_Lock',
+        }
+
+        parts = key.split('+')
+        mods = ['<' + mod + '>' for mod in parts[:-1]]
+        key = parts[-1]
+
+        if key in special:
+            key = special[key]
+        elif len(key) > 1:
+            key = key.capitalize()
+        elif key.isupper():
+            mods += ['<shift>']
+
+        return ''.join(mods) + key
+
+    def _is_valid_shortcut(self, key):
+        """
+        Check for a valid shortcut to be displayed.
+
+        - GTK will never send 'cmd+' (see `FigureCanvasGTK4._get_key`).
+        - The shortcut window only shows keyboard shortcuts, not mouse buttons.
+        """
+        return 'cmd+' not in key and not key.startswith('MouseButton.')
+
+    def trigger(self, *args):
+        section = Gtk.ShortcutsSection()
+
+        for name, tool in sorted(self.toolmanager.tools.items()):
+            if not tool.description:
+                continue
+
+            # Putting everything in a separate group allows GTK to
+            # automatically split them into separate columns/pages, which is
+            # useful because we have lots of shortcuts, some with many keys
+            # that are very wide.
+            group = Gtk.ShortcutsGroup()
+            section.append(group)
+            # A hack to remove the title since we have no group naming.
+            child = group.get_first_child()
+            while child is not None:
+                child.set_visible(False)
+                child = child.get_next_sibling()
+
+            shortcut = Gtk.ShortcutsShortcut(
+                accelerator=' '.join(
+                    self._normalize_shortcut(key)
+                    for key in self.toolmanager.get_tool_keymap(name)
+                    if self._is_valid_shortcut(key)),
+                title=tool.name,
+                subtitle=tool.description)
+            group.append(shortcut)
+
+        window = Gtk.ShortcutsWindow(
+            title='Help',
+            modal=True,
+            transient_for=self._figure.canvas.get_root())
+        window.set_child(section)
+
+        window.show()
+
+
+@backend_tools._register_tool_class(FigureCanvasGTK4)
+class ToolCopyToClipboardGTK4(backend_tools.ToolCopyToClipboardBase):
+    def trigger(self, *args, **kwargs):
+        with io.BytesIO() as f:
+            self.canvas.print_rgba(f)
+            w, h = self.canvas.get_width_height()
+            pb = GdkPixbuf.Pixbuf.new_from_data(f.getbuffer(),
+                                                GdkPixbuf.Colorspace.RGB, True,
+                                                8, w, h, w*4)
+        clipboard = self.canvas.get_clipboard()
+        clipboard.set(pb)
+
+
+backend_tools._register_tool_class(
+    FigureCanvasGTK4, _backend_gtk.ConfigureSubplotsGTK)
+backend_tools._register_tool_class(
+    FigureCanvasGTK4, _backend_gtk.RubberbandGTK)
+Toolbar = ToolbarGTK4
+
+
+class FigureManagerGTK4(_FigureManagerGTK):
+    _toolbar2_class = NavigationToolbar2GTK4
+    _toolmanager_toolbar_class = ToolbarGTK4
+
+
+@_BackendGTK.export
+class _BackendGTK4(_BackendGTK):
+    FigureCanvas = FigureCanvasGTK4
+    FigureManager = FigureManagerGTK4
diff --git a/lib/matplotlib/backends/backend_gtk4agg.py b/lib/matplotlib/backends/backend_gtk4agg.py
new file mode 100644
index 000000000000..d7ee04616e72
--- /dev/null
+++ b/lib/matplotlib/backends/backend_gtk4agg.py
@@ -0,0 +1,41 @@
+import numpy as np
+
+from .. import _api, cbook
+from . import backend_agg, backend_gtk4
+from .backend_gtk4 import Gtk, _BackendGTK4
+
+import cairo  # Presence of cairo is already checked by _backend_gtk.
+
+
+class FigureCanvasGTK4Agg(backend_agg.FigureCanvasAgg,
+                          backend_gtk4.FigureCanvasGTK4):
+
+    def on_draw_event(self, widget, ctx):
+        scale = self.device_pixel_ratio
+        allocation = self.get_allocation()
+
+        Gtk.render_background(
+            self.get_style_context(), ctx,
+            allocation.x, allocation.y,
+            allocation.width, allocation.height)
+
+        buf = cbook._unmultiplied_rgba8888_to_premultiplied_argb32(
+            np.asarray(self.get_renderer().buffer_rgba()))
+        height, width, _ = buf.shape
+        image = cairo.ImageSurface.create_for_data(
+            buf.ravel().data, cairo.FORMAT_ARGB32, width, height)
+        image.set_device_scale(scale, scale)
+        ctx.set_source_surface(image, 0, 0)
+        ctx.paint()
+
+        return False
+
+
+@_api.deprecated("3.6", alternative="backend_gtk4.FigureManagerGTK4")
+class FigureManagerGTK4Agg(backend_gtk4.FigureManagerGTK4):
+    pass
+
+
+@_BackendGTK4.export
+class _BackendGTK4Agg(_BackendGTK4):
+    FigureCanvas = FigureCanvasGTK4Agg
diff --git a/lib/matplotlib/backends/backend_gtk4cairo.py b/lib/matplotlib/backends/backend_gtk4cairo.py
new file mode 100644
index 000000000000..83cbd081c26d
--- /dev/null
+++ b/lib/matplotlib/backends/backend_gtk4cairo.py
@@ -0,0 +1,29 @@
+from contextlib import nullcontext
+
+from .backend_cairo import (  # noqa
+    FigureCanvasCairo, _RendererGTKCairo as RendererGTK4Cairo)
+from .backend_gtk4 import Gtk, FigureCanvasGTK4, _BackendGTK4
+
+
+class FigureCanvasGTK4Cairo(FigureCanvasCairo, FigureCanvasGTK4):
+    _context_is_scaled = True
+
+    def on_draw_event(self, widget, ctx):
+        with (self.toolbar._wait_cursor_for_draw_cm() if self.toolbar
+              else nullcontext()):
+            self._renderer.set_context(ctx)
+            scale = self.device_pixel_ratio
+            # Scale physical drawing to logical size.
+            ctx.scale(1 / scale, 1 / scale)
+            allocation = self.get_allocation()
+            Gtk.render_background(
+                self.get_style_context(), ctx,
+                allocation.x, allocation.y,
+                allocation.width, allocation.height)
+            self._renderer.dpi = self.figure.dpi
+            self.figure.draw(self._renderer)
+
+
+@_BackendGTK4.export
+class _BackendGTK4Cairo(_BackendGTK4):
+    FigureCanvas = FigureCanvasGTK4Cairo
diff --git a/lib/matplotlib/backends/backend_macosx.py b/lib/matplotlib/backends/backend_macosx.py
index c84087f3b209..10dff3ef33f1 100644
--- a/lib/matplotlib/backends/backend_macosx.py
+++ b/lib/matplotlib/backends/backend_macosx.py
@@ -1,11 +1,13 @@
+import os
+
 import matplotlib as mpl
-from matplotlib import cbook
+from matplotlib import _api, cbook
 from matplotlib._pylab_helpers import Gcf
-from matplotlib.backends import _macosx
-from matplotlib.backends.backend_agg import FigureCanvasAgg
+from . import _macosx
+from .backend_agg import FigureCanvasAgg
 from matplotlib.backend_bases import (
     _Backend, FigureCanvasBase, FigureManagerBase, NavigationToolbar2,
-    TimerBase)
+    ResizeEvent, TimerBase)
 from matplotlib.figure import Figure
 from matplotlib.widgets import SubplotTool
 
@@ -15,87 +17,98 @@ class TimerMac(_macosx.Timer, TimerBase):
     # completely implemented at the C-level (in _macosx.Timer)
 
 
-class FigureCanvasMac(_macosx.FigureCanvas, FigureCanvasAgg):
+class FigureCanvasMac(FigureCanvasAgg, _macosx.FigureCanvas, FigureCanvasBase):
     # docstring inherited
 
-    # Events such as button presses, mouse movements, and key presses
-    # are handled in the C code and the base class methods
-    # button_press_event, button_release_event, motion_notify_event,
-    # key_press_event, and key_release_event are called from there.
+    # Ideally this class would be `class FCMacAgg(FCAgg, FCMac)`
+    # (FC=FigureCanvas) where FCMac would be an ObjC-implemented mac-specific
+    # class also inheriting from FCBase (this is the approach with other GUI
+    # toolkits).  However, writing an extension type inheriting from a Python
+    # base class is slightly tricky (the extension type must be a heap type),
+    # and we can just as well lift the FCBase base up one level, keeping it *at
+    # the end* to have the right method resolution order.
+
+    # Events such as button presses, mouse movements, and key presses are
+    # handled in C and events (MouseEvent, etc.) are triggered from there.
 
     required_interactive_framework = "macosx"
     _timer_cls = TimerMac
+    manager_class = _api.classproperty(lambda cls: FigureManagerMac)
 
     def __init__(self, figure):
-        FigureCanvasBase.__init__(self, figure)
-        width, height = self.get_width_height()
-        _macosx.FigureCanvas.__init__(self, width, height)
-        self._dpi_ratio = 1.0
-
-    def _set_device_scale(self, value):
-        if self._dpi_ratio != value:
-            # Need the new value in place before setting figure.dpi, which
-            # will trigger a resize
-            self._dpi_ratio, old_value = value, self._dpi_ratio
-            self.figure.dpi = self.figure.dpi / old_value * self._dpi_ratio
-
-    def _draw(self):
-        renderer = self.get_renderer(cleared=self.figure.stale)
-        if self.figure.stale:
-            self.figure.draw(renderer)
-        return renderer
+        super().__init__(figure=figure)
+        self._draw_pending = False
+        self._is_drawing = False
 
     def draw(self):
-        # docstring inherited
-        self.draw_idle()
-        self.flush_events()
+        """Render the figure and update the macosx canvas."""
+        # The renderer draw is done here; delaying causes problems with code
+        # that uses the result of the draw() to update plot elements.
+        if self._is_drawing:
+            return
+        with cbook._setattr_cm(self, _is_drawing=True):
+            super().draw()
+        self.update()
 
-    # draw_idle is provided by _macosx.FigureCanvas
+    def draw_idle(self):
+        # docstring inherited
+        if not (getattr(self, '_draw_pending', False) or
+                getattr(self, '_is_drawing', False)):
+            self._draw_pending = True
+            # Add a singleshot timer to the eventloop that will call back
+            # into the Python method _draw_idle to take care of the draw
+            self._single_shot_timer(self._draw_idle)
+
+    def _single_shot_timer(self, callback):
+        """Add a single shot timer with the given callback"""
+        # We need to explicitly stop (called from delete) the timer after
+        # firing, otherwise segfaults will occur when trying to deallocate
+        # the singleshot timers.
+        def callback_func(callback, timer):
+            callback()
+            del timer
+        timer = self.new_timer(interval=0)
+        timer.add_callback(callback_func, callback, timer)
+        timer.start()
+
+    def _draw_idle(self):
+        """
+        Draw method for singleshot timer
+
+        This draw method can be added to a singleshot timer, which can
+        accumulate draws while the eventloop is spinning. This method will
+        then only draw the first time and short-circuit the others.
+        """
+        with self._idle_draw_cntx():
+            if not self._draw_pending:
+                # Short-circuit because our draw request has already been
+                # taken care of
+                return
+            self._draw_pending = False
+            self.draw()
 
     def blit(self, bbox=None):
-        self.draw_idle()
+        # docstring inherited
+        super().blit(bbox)
+        self.update()
 
     def resize(self, width, height):
-        dpi = self.figure.dpi
-        width /= dpi
-        height /= dpi
-        self.figure.set_size_inches(width * self._dpi_ratio,
-                                    height * self._dpi_ratio,
-                                    forward=False)
-        FigureCanvasBase.resize_event(self)
+        # Size from macOS is logical pixels, dpi is physical.
+        scale = self.figure.dpi / self.device_pixel_ratio
+        width /= scale
+        height /= scale
+        self.figure.set_size_inches(width, height, forward=False)
+        ResizeEvent("resize_event", self)._process()
         self.draw_idle()
 
 
-class FigureManagerMac(_macosx.FigureManager, FigureManagerBase):
-    """
-    Wrap everything up into a window for the pylab interface
-    """
-    def __init__(self, canvas, num):
-        _macosx.FigureManager.__init__(self, canvas)
-        FigureManagerBase.__init__(self, canvas, num)
-        if mpl.rcParams['toolbar'] == 'toolbar2':
-            self.toolbar = NavigationToolbar2Mac(canvas)
-        else:
-            self.toolbar = None
-        if self.toolbar is not None:
-            self.toolbar.update()
-
-        if mpl.is_interactive():
-            self.show()
-            self.canvas.draw_idle()
-
-    def close(self):
-        Gcf.destroy(self)
-
-
 class NavigationToolbar2Mac(_macosx.NavigationToolbar2, NavigationToolbar2):
 
     def __init__(self, canvas):
-        self.canvas = canvas  # Needed by the _macosx __init__.
         data_path = cbook._get_data_path('images')
         _, tooltips, image_names, _ = zip(*NavigationToolbar2.toolitems)
         _macosx.NavigationToolbar2.__init__(
-            self,
+            self, canvas,
             tuple(str(data_path / image_name) + ".pdf"
                   for image_name in image_names if image_name is not None),
             tuple(tooltip for tooltip in tooltips if tooltip is not None))
@@ -104,20 +117,22 @@ def __init__(self, canvas):
     def draw_rubberband(self, event, x0, y0, x1, y1):
         self.canvas.set_rubberband(int(x0), int(y0), int(x1), int(y1))
 
-    def release_zoom(self, event):
-        super().release_zoom(event)
+    def remove_rubberband(self):
         self.canvas.remove_rubberband()
 
-    def set_cursor(self, cursor):
-        _macosx.set_cursor(cursor)
-
     def save_figure(self, *args):
+        directory = os.path.expanduser(mpl.rcParams['savefig.directory'])
         filename = _macosx.choose_save_file('Save the figure',
+                                            directory,
                                             self.canvas.get_default_filename())
         if filename is None:  # Cancel
             return
+        # Save dir for next time, unless empty str (which means use cwd).
+        if mpl.rcParams['savefig.directory']:
+            mpl.rcParams['savefig.directory'] = os.path.dirname(filename)
         self.canvas.figure.savefig(filename)
 
+    @_api.deprecated("3.6", alternative='configure_subplots()')
     def prepare_configure_subplots(self):
         toolfig = Figure(figsize=(6, 3))
         canvas = FigureCanvasMac(toolfig)
@@ -126,8 +141,36 @@ def prepare_configure_subplots(self):
         _tool = SubplotTool(self.canvas.figure, toolfig)
         return canvas
 
-    def set_message(self, message):
-        _macosx.NavigationToolbar2.set_message(self, message.encode('utf-8'))
+
+class FigureManagerMac(_macosx.FigureManager, FigureManagerBase):
+    _toolbar2_class = NavigationToolbar2Mac
+
+    def __init__(self, canvas, num):
+        self._shown = False
+        _macosx.FigureManager.__init__(self, canvas)
+        icon_path = str(cbook._get_data_path('images/matplotlib.pdf'))
+        _macosx.FigureManager.set_icon(icon_path)
+        FigureManagerBase.__init__(self, canvas, num)
+        if self.toolbar is not None:
+            self.toolbar.update()
+        if mpl.is_interactive():
+            self.show()
+            self.canvas.draw_idle()
+
+    def _close_button_pressed(self):
+        Gcf.destroy(self)
+        self.canvas.flush_events()
+
+    @_api.deprecated("3.6")
+    def close(self):
+        return self._close_button_pressed()
+
+    def show(self):
+        if not self._shown:
+            self._show()
+            self._shown = True
+        if mpl.rcParams["figure.raise_window"]:
+            self._raise()
 
 
 @_Backend.export
diff --git a/lib/matplotlib/backends/backend_mixed.py b/lib/matplotlib/backends/backend_mixed.py
index 54ca8f81ba02..5fadb96a0f73 100644
--- a/lib/matplotlib/backends/backend_mixed.py
+++ b/lib/matplotlib/backends/backend_mixed.py
@@ -1,8 +1,8 @@
 import numpy as np
 
 from matplotlib import cbook
-from matplotlib.backends.backend_agg import RendererAgg
-from matplotlib.tight_bbox import process_figure_for_rasterizing
+from .backend_agg import RendererAgg
+from matplotlib._tight_bbox import process_figure_for_rasterizing
 
 
 class MixedModeRenderer:
@@ -53,7 +53,7 @@ def __init__(self, figure, width, height, dpi, vector_renderer,
         # the figure dpi before and after the rasterization. Although
         # this looks ugly, I couldn't find a better solution. -JJL
         self.figure = figure
-        self._figdpi = figure.get_dpi()
+        self._figdpi = figure.dpi
 
         self._bbox_inches_restore = bbox_inches_restore
 
@@ -74,7 +74,7 @@ def start_rasterizing(self):
         `stop_rasterizing` is called) will be drawn with the raster backend.
         """
         # change the dpi of the figure temporarily.
-        self.figure.set_dpi(self.dpi)
+        self.figure.dpi = self.dpi
         if self._bbox_inches_restore:  # when tight bbox is used
             r = process_figure_for_rasterizing(self.figure,
                                                self._bbox_inches_restore)
@@ -110,7 +110,7 @@ def stop_rasterizing(self):
         self._raster_renderer = None
 
         # restore the figure dpi.
-        self.figure.set_dpi(self._figdpi)
+        self.figure.dpi = self._figdpi
 
         if self._bbox_inches_restore:  # when tight bbox is used
             r = process_figure_for_rasterizing(self.figure,
diff --git a/lib/matplotlib/backends/backend_nbagg.py b/lib/matplotlib/backends/backend_nbagg.py
index 0fb8b03ea266..712f45735940 100644
--- a/lib/matplotlib/backends/backend_nbagg.py
+++ b/lib/matplotlib/backends/backend_nbagg.py
@@ -1,4 +1,4 @@
-"""Interactive figures in the IPython notebook"""
+"""Interactive figures in the IPython notebook."""
 # Note: There is a notebook in
 # lib/matplotlib/backends/web_backend/nbagg_uat.ipynb to help verify
 # that changes made maintain expected behaviour.
@@ -9,20 +9,16 @@
 import pathlib
 import uuid
 
+from ipykernel.comm import Comm
 from IPython.display import display, Javascript, HTML
-try:
-    # Jupyter/IPython 4.x or later
-    from ipykernel.comm import Comm
-except ImportError:
-    # Jupyter/IPython 3.x or earlier
-    from IPython.kernel.comm import Comm
 
 from matplotlib import is_interactive
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_bases import _Backend, NavigationToolbar2
-from matplotlib.backends.backend_webagg_core import (
-    FigureCanvasWebAggCore, FigureManagerWebAgg, NavigationToolbar2WebAgg,
-    TimerTornado)
+from .backend_webagg_core import (
+    FigureCanvasWebAggCore, FigureManagerWebAgg, NavigationToolbar2WebAgg)
+from .backend_webagg_core import (  # noqa: F401 # pylint: disable=W0611
+    TimerTornado, TimerAsyncio)
 
 
 def connection_info():
@@ -43,18 +39,13 @@ def connection_info():
     return '\n'.join(result)
 
 
-# Note: Version 3.2 and 4.x icons
-# http://fontawesome.io/3.2.1/icons/
-# http://fontawesome.io/
-# the `fa fa-xxx` part targets font-awesome 4, (IPython 3.x)
-# the icon-xxx targets font awesome 3.21 (IPython 2.x)
-_FONT_AWESOME_CLASSES = {
-    'home': 'fa fa-home icon-home',
-    'back': 'fa fa-arrow-left icon-arrow-left',
-    'forward': 'fa fa-arrow-right icon-arrow-right',
-    'zoom_to_rect': 'fa fa-square-o icon-check-empty',
-    'move': 'fa fa-arrows icon-move',
-    'download': 'fa fa-floppy-o icon-save',
+_FONT_AWESOME_CLASSES = {  # font-awesome 4 names
+    'home': 'fa fa-home',
+    'back': 'fa fa-arrow-left',
+    'forward': 'fa fa-arrow-right',
+    'zoom_to_rect': 'fa fa-square-o',
+    'move': 'fa fa-arrows',
+    'download': 'fa fa-floppy-o',
     None: None
 }
 
@@ -71,12 +62,27 @@ class NavigationIPy(NavigationToolbar2WebAgg):
 
 
 class FigureManagerNbAgg(FigureManagerWebAgg):
-    ToolbarCls = NavigationIPy
+    _toolbar2_class = ToolbarCls = NavigationIPy
 
     def __init__(self, canvas, num):
         self._shown = False
         super().__init__(canvas, num)
 
+    @classmethod
+    def create_with_canvas(cls, canvas_class, figure, num):
+        canvas = canvas_class(figure)
+        manager = cls(canvas, num)
+        if is_interactive():
+            manager.show()
+            canvas.draw_idle()
+
+        def destroy(event):
+            canvas.mpl_disconnect(cid)
+            Gcf.destroy(manager)
+
+        cid = canvas.mpl_connect('close_event', destroy)
+        return manager
+
     def display_js(self):
         # XXX How to do this just once? It has to deal with multiple
         # browser instances using the same kernel (require.js - but the
@@ -90,6 +96,15 @@ def show(self):
         else:
             self.canvas.draw_idle()
         self._shown = True
+        # plt.figure adds an event which makes the figure in focus the active
+        # one. Disable this behaviour, as it results in figures being put as
+        # the active figure after they have been shown, even in non-interactive
+        # mode.
+        if hasattr(self, '_cidgcf'):
+            self.canvas.mpl_disconnect(self._cidgcf)
+        if not is_interactive():
+            from matplotlib._pylab_helpers import Gcf
+            Gcf.figs.pop(self.num, None)
 
     def reshow(self):
         """
@@ -142,7 +157,7 @@ def remove_comm(self, comm_id):
 
 
 class FigureCanvasNbAgg(FigureCanvasWebAggCore):
-    pass
+    manager_class = FigureManagerNbAgg
 
 
 class CommSocket:
@@ -226,42 +241,3 @@ def on_message(self, message):
 class _BackendNbAgg(_Backend):
     FigureCanvas = FigureCanvasNbAgg
     FigureManager = FigureManagerNbAgg
-
-    @staticmethod
-    def new_figure_manager_given_figure(num, figure):
-        canvas = FigureCanvasNbAgg(figure)
-        manager = FigureManagerNbAgg(canvas, num)
-        if is_interactive():
-            manager.show()
-            figure.canvas.draw_idle()
-
-        def destroy(event):
-            canvas.mpl_disconnect(cid)
-            Gcf.destroy(manager)
-
-        cid = canvas.mpl_connect('close_event', destroy)
-        return manager
-
-    @staticmethod
-    def show(block=None):
-        ## TODO: something to do when keyword block==False ?
-        from matplotlib._pylab_helpers import Gcf
-
-        managers = Gcf.get_all_fig_managers()
-        if not managers:
-            return
-
-        interactive = is_interactive()
-
-        for manager in managers:
-            manager.show()
-
-            # plt.figure adds an event which makes the figure in focus the
-            # active one. Disable this behaviour, as it results in
-            # figures being put as the active figure after they have been
-            # shown, even in non-interactive mode.
-            if hasattr(manager, '_cidgcf'):
-                manager.canvas.mpl_disconnect(manager._cidgcf)
-
-            if not interactive:
-                Gcf.figs.pop(manager.num, None)
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
index 26a12764da38..a3ea5dac6e43 100644
--- a/lib/matplotlib/backends/backend_pdf.py
+++ b/lib/matplotlib/backends/backend_pdf.py
@@ -1,10 +1,10 @@
 """
-A PDF matplotlib backend
-Author: Jouni K Seppänen <jks@iki.fi>
+A PDF Matplotlib backend.
+
+Author: Jouni K Seppänen <jks@iki.fi> and others.
 """
 
 import codecs
-import collections
 from datetime import datetime
 from enum import Enum
 from functools import total_ordering
@@ -13,8 +13,9 @@
 import logging
 import math
 import os
-import re
+import string
 import struct
+import sys
 import time
 import types
 import warnings
@@ -24,20 +25,17 @@
 from PIL import Image
 
 import matplotlib as mpl
-from matplotlib import _api, _text_layout, cbook
+from matplotlib import _api, _text_helpers, _type1font, cbook, dviread
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_bases import (
-    _Backend, _check_savefig_extra_args, FigureCanvasBase, FigureManagerBase,
-    GraphicsContextBase, RendererBase, _no_output_draw)
+    _Backend, FigureCanvasBase, FigureManagerBase, GraphicsContextBase,
+    RendererBase)
 from matplotlib.backends.backend_mixed import MixedModeRenderer
 from matplotlib.figure import Figure
-from matplotlib.font_manager import findfont, get_font
-from matplotlib.afm import AFM
-import matplotlib.type1font as type1font
-import matplotlib.dviread as dviread
+from matplotlib.font_manager import get_font, fontManager as _fontManager
+from matplotlib._afm import AFM
 from matplotlib.ft2font import (FIXED_WIDTH, ITALIC, LOAD_NO_SCALE,
-                                LOAD_NO_HINTING, KERNING_UNFITTED)
-from matplotlib.mathtext import MathTextParser
+                                LOAD_NO_HINTING, KERNING_UNFITTED, FT2Font)
 from matplotlib.transforms import Affine2D, BboxBase
 from matplotlib.path import Path
 from matplotlib.dates import UTC
@@ -88,13 +86,18 @@
 
 # TODOs:
 #
-# * encoding of fonts, including mathtext fonts and unicode support
+# * encoding of fonts, including mathtext fonts and Unicode support
 # * TTF support has lots of small TODOs, e.g., how do you know if a font
 #   is serif/sans-serif, or symbolic/non-symbolic?
 # * draw_quad_mesh
 
 
+@_api.deprecated("3.6", alternative="a vendored copy of _fill")
 def fill(strings, linelen=75):
+    return _fill(strings, linelen=linelen)
+
+
+def _fill(strings, linelen=75):
     """
     Make one string from sequence of strings, with whitespace in between.
 
@@ -115,25 +118,6 @@ def fill(strings, linelen=75):
     result.append(b' '.join(strings[lasti:]))
     return b'\n'.join(result)
 
-# PDF strings are supposed to be able to include any eight-bit data,
-# except that unbalanced parens and backslashes must be escaped by a
-# backslash. However, sf bug #2708559 shows that the carriage return
-# character may get read as a newline; these characters correspond to
-# \gamma and \Omega in TeX's math font encoding. Escaping them fixes
-# the bug.
-_string_escape_regex = re.compile(br'([\\()\r\n])')
-
-
-def _string_escape(match):
-    m = match.group(0)
-    if m in br'\()':
-        return b'\\' + m
-    elif m == b'\n':
-        return br'\n'
-    elif m == b'\r':
-        return br'\r'
-    assert False
-
 
 def _create_pdf_info_dict(backend, metadata):
     """
@@ -246,6 +230,77 @@ def _datetime_to_pdf(d):
     return r
 
 
+def _calculate_quad_point_coordinates(x, y, width, height, angle=0):
+    """
+    Calculate the coordinates of rectangle when rotated by angle around x, y
+    """
+
+    angle = math.radians(-angle)
+    sin_angle = math.sin(angle)
+    cos_angle = math.cos(angle)
+    a = x + height * sin_angle
+    b = y + height * cos_angle
+    c = x + width * cos_angle + height * sin_angle
+    d = y - width * sin_angle + height * cos_angle
+    e = x + width * cos_angle
+    f = y - width * sin_angle
+    return ((x, y), (e, f), (c, d), (a, b))
+
+
+def _get_coordinates_of_block(x, y, width, height, angle=0):
+    """
+    Get the coordinates of rotated rectangle and rectangle that covers the
+    rotated rectangle.
+    """
+
+    vertices = _calculate_quad_point_coordinates(x, y, width,
+                                                 height, angle)
+
+    # Find min and max values for rectangle
+    # adjust so that QuadPoints is inside Rect
+    # PDF docs says that QuadPoints should be ignored if any point lies
+    # outside Rect, but for Acrobat it is enough that QuadPoints is on the
+    # border of Rect.
+
+    pad = 0.00001 if angle % 90 else 0
+    min_x = min(v[0] for v in vertices) - pad
+    min_y = min(v[1] for v in vertices) - pad
+    max_x = max(v[0] for v in vertices) + pad
+    max_y = max(v[1] for v in vertices) + pad
+    return (tuple(itertools.chain.from_iterable(vertices)),
+            (min_x, min_y, max_x, max_y))
+
+
+def _get_link_annotation(gc, x, y, width, height, angle=0):
+    """
+    Create a link annotation object for embedding URLs.
+    """
+    quadpoints, rect = _get_coordinates_of_block(x, y, width, height, angle)
+    link_annotation = {
+        'Type': Name('Annot'),
+        'Subtype': Name('Link'),
+        'Rect': rect,
+        'Border': [0, 0, 0],
+        'A': {
+            'S': Name('URI'),
+            'URI': gc.get_url(),
+        },
+    }
+    if angle % 90:
+        # Add QuadPoints
+        link_annotation['QuadPoints'] = quadpoints
+    return link_annotation
+
+
+# PDF strings are supposed to be able to include any eight-bit data, except
+# that unbalanced parens and backslashes must be escaped by a backslash.
+# However, sf bug #2708559 shows that the carriage return character may get
+# read as a newline; these characters correspond to \gamma and \Omega in TeX's
+# math font encoding. Escaping them fixes the bug.
+_str_escapes = str.maketrans({
+    '\\': '\\\\', '(': '\\(', ')': '\\)', '\n': '\\n', '\r': '\\r'})
+
+
 def pdfRepr(obj):
     """Map Python objects to PDF syntax."""
 
@@ -271,38 +326,36 @@ def pdfRepr(obj):
     elif isinstance(obj, (int, np.integer)):
         return b"%d" % obj
 
-    # Unicode strings are encoded in UTF-16BE with byte-order mark.
+    # Non-ASCII Unicode strings are encoded in UTF-16BE with byte-order mark.
     elif isinstance(obj, str):
-        try:
-            # But maybe it's really ASCII?
-            s = obj.encode('ASCII')
-            return pdfRepr(s)
-        except UnicodeEncodeError:
-            s = codecs.BOM_UTF16_BE + obj.encode('UTF-16BE')
-            return pdfRepr(s)
+        return pdfRepr(obj.encode('ascii') if obj.isascii()
+                       else codecs.BOM_UTF16_BE + obj.encode('UTF-16BE'))
 
     # Strings are written in parentheses, with backslashes and parens
     # escaped. Actually balanced parens are allowed, but it is
     # simpler to escape them all. TODO: cut long strings into lines;
     # I believe there is some maximum line length in PDF.
+    # Despite the extra decode/encode, translate is faster than regex.
     elif isinstance(obj, bytes):
-        return b'(' + _string_escape_regex.sub(_string_escape, obj) + b')'
+        return (
+            b'(' +
+            obj.decode('latin-1').translate(_str_escapes).encode('latin-1')
+            + b')')
 
     # Dictionaries. The keys must be PDF names, so if we find strings
     # there, we make Name objects from them. The values may be
     # anything, so the caller must ensure that PDF names are
     # represented as Name objects.
     elif isinstance(obj, dict):
-        return fill([
+        return _fill([
             b"<<",
-            *[Name(key).pdfRepr() + b" " + pdfRepr(obj[key])
-              for key in sorted(obj)],
+            *[Name(k).pdfRepr() + b" " + pdfRepr(v) for k, v in obj.items()],
             b">>",
         ])
 
     # Lists.
     elif isinstance(obj, (list, tuple)):
-        return fill([b"[", *[pdfRepr(val) for val in obj], b"]"])
+        return _fill([b"[", *[pdfRepr(val) for val in obj], b"]"])
 
     # The null keyword.
     elif obj is None:
@@ -314,13 +367,28 @@ def pdfRepr(obj):
 
     # A bounding box
     elif isinstance(obj, BboxBase):
-        return fill([pdfRepr(val) for val in obj.bounds])
+        return _fill([pdfRepr(val) for val in obj.bounds])
 
     else:
         raise TypeError("Don't know a PDF representation for {} objects"
                         .format(type(obj)))
 
 
+def _font_supports_glyph(fonttype, glyph):
+    """
+    Returns True if the font is able to provide codepoint *glyph* in a PDF.
+
+    For a Type 3 font, this method returns True only for single-byte
+    characters. For Type 42 fonts this method return True if the character is
+    from the Basic Multilingual Plane.
+    """
+    if fonttype == 3:
+        return glyph <= 255
+    if fonttype == 42:
+        return glyph <= 65535
+    raise NotImplementedError()
+
+
 class Reference:
     """
     PDF reference object.
@@ -348,7 +416,8 @@ def write(self, contents, file):
 class Name:
     """PDF name object."""
     __slots__ = ('name',)
-    _regex = re.compile(r'[^!-~]')
+    _hexify = {c: '#%02x' % c
+               for c in {*range(256)} - {*range(ord('!'), ord('~') + 1)}}
 
     def __init__(self, name):
         if isinstance(name, Name):
@@ -356,13 +425,13 @@ def __init__(self, name):
         else:
             if isinstance(name, bytes):
                 name = name.decode('ascii')
-            self.name = self._regex.sub(Name.hexify, name).encode('ascii')
+            self.name = name.translate(self._hexify).encode('ascii')
 
     def __repr__(self):
         return "<Name %s>" % self.name
 
     def __str__(self):
-        return '/' + str(self.name)
+        return '/' + self.name.decode('ascii')
 
     def __eq__(self, other):
         return isinstance(other, Name) and self.name == other.name
@@ -374,6 +443,7 @@ def __hash__(self):
         return hash(self.name)
 
     @staticmethod
+    @_api.deprecated("3.6")
     def hexify(match):
         return '#%02x' % ord(match.group())
 
@@ -381,8 +451,8 @@ def pdfRepr(self):
         return b'/' + self.name
 
 
+@_api.deprecated("3.6")
 class Operator:
-    """PDF operator object."""
     __slots__ = ('op',)
 
     def __init__(self, op):
@@ -404,46 +474,52 @@ def pdfRepr(self):
         return self._x
 
 
-# PDF operators (not an exhaustive list)
-class Op(Operator, Enum):
+class Op(Enum):
+    """PDF operators (not an exhaustive list)."""
+
     close_fill_stroke = b'b'
     fill_stroke = b'B'
     fill = b'f'
-    closepath = b'h',
+    closepath = b'h'
     close_stroke = b's'
     stroke = b'S'
     endpath = b'n'
-    begin_text = b'BT',
+    begin_text = b'BT'
     end_text = b'ET'
     curveto = b'c'
     rectangle = b're'
     lineto = b'l'
-    moveto = b'm',
+    moveto = b'm'
     concat_matrix = b'cm'
     use_xobject = b'Do'
-    setgray_stroke = b'G',
+    setgray_stroke = b'G'
     setgray_nonstroke = b'g'
     setrgb_stroke = b'RG'
-    setrgb_nonstroke = b'rg',
+    setrgb_nonstroke = b'rg'
     setcolorspace_stroke = b'CS'
-    setcolorspace_nonstroke = b'cs',
+    setcolorspace_nonstroke = b'cs'
     setcolor_stroke = b'SCN'
     setcolor_nonstroke = b'scn'
-    setdash = b'd',
+    setdash = b'd'
     setlinejoin = b'j'
     setlinecap = b'J'
     setgstate = b'gs'
-    gsave = b'q',
+    gsave = b'q'
     grestore = b'Q'
     textpos = b'Td'
     selectfont = b'Tf'
-    textmatrix = b'Tm',
+    textmatrix = b'Tm'
     show = b'Tj'
     showkern = b'TJ'
     setlinewidth = b'w'
     clip = b'W'
     shading = b'sh'
 
+    op = _api.deprecated('3.6')(property(lambda self: self.value))
+
+    def pdfRepr(self):
+        return self.value
+
     @classmethod
     def paint_path(cls, fill, stroke):
         """
@@ -681,15 +757,14 @@ def __init__(self, filename, metadata=None):
         self._soft_mask_states = {}
         self._soft_mask_seq = (Name(f'SM{i}') for i in itertools.count(1))
         self._soft_mask_groups = []
-        # reproducible writeHatches needs an ordered dict:
-        self.hatchPatterns = collections.OrderedDict()
+        self.hatchPatterns = {}
         self._hatch_pattern_seq = (Name(f'H{i}') for i in itertools.count(1))
         self.gouraudTriangles = []
 
-        self._images = collections.OrderedDict()   # reproducible writeImages
+        self._images = {}
         self._image_seq = (Name(f'I{i}') for i in itertools.count(1))
 
-        self.markers = collections.OrderedDict()   # reproducible writeMarkers
+        self.markers = {}
         self.multi_byte_charprocs = {}
 
         self.paths = []
@@ -716,11 +791,6 @@ def __init__(self, filename, metadata=None):
                      'ProcSet': procsets}
         self.writeObject(self.resourceObject, resources)
 
-    @_api.deprecated("3.3")
-    @property
-    def used_characters(self):
-        return self.file._character_tracker.used_characters
-
     def newPage(self, width, height):
         self.endStream()
 
@@ -732,9 +802,6 @@ def newPage(self, width, height):
                    'Resources': self.resourceObject,
                    'MediaBox': [0, 0, 72 * width, 72 * height],
                    'Contents': contentObject,
-                   'Group': {'Type': Name('Group'),
-                             'S': Name('Transparency'),
-                             'CS': Name('DeviceRGB')},
                    'Annots': annotsObject,
                    }
         pageObject = self.reserveObject('page')
@@ -744,8 +811,10 @@ def newPage(self, width, height):
 
         self.beginStream(contentObject.id,
                          self.reserveObject('length of content stream'))
-        # Initialize the pdf graphics state to match the default mpl
-        # graphics context: currently only the join style needs to be set
+        # Initialize the pdf graphics state to match the default Matplotlib
+        # graphics context (colorspace and joinstyle).
+        self.output(Name('DeviceRGB'), Op.setcolorspace_stroke)
+        self.output(Name('DeviceRGB'), Op.setcolorspace_nonstroke)
         self.output(GraphicsContextPdf.joinstyles['round'], Op.setlinejoin)
 
         # Clear the list of annotations for the next page
@@ -760,6 +829,22 @@ def newTextnote(self, text, positionRect=[-100, -100, 0, 0]):
                    }
         self.pageAnnotations.append(theNote)
 
+    def _get_subsetted_psname(self, ps_name, charmap):
+        def toStr(n, base):
+            if n < base:
+                return string.ascii_uppercase[n]
+            else:
+                return (
+                    toStr(n // base, base) + string.ascii_uppercase[n % base]
+                )
+
+        # encode to string using base 26
+        hashed = hash(frozenset(charmap.keys())) % ((sys.maxsize + 1) * 2)
+        prefix = toStr(hashed, 26)
+
+        # get first 6 characters from prefix
+        return prefix[:6] + "+" + ps_name
+
     def finalize(self):
         """Write out the various deferred objects and the pdf end matter."""
 
@@ -811,7 +896,7 @@ def write(self, data):
             self.currentstream.write(data)
 
     def output(self, *data):
-        self.write(fill([pdfRepr(x) for x in data]))
+        self.write(_fill([pdfRepr(x) for x in data]))
         self.write(b'\n')
 
     def beginStream(self, id, len, extra=None, png=None):
@@ -823,6 +908,11 @@ def endStream(self):
             self.currentstream.end()
             self.currentstream = None
 
+    def outputStream(self, ref, data, *, extra=None):
+        self.beginStream(ref.id, None, extra)
+        self.currentstream.write(data)
+        self.endStream()
+
     def _write_annotations(self):
         for annotsObject, annotations in self._annotations:
             self.writeObject(annotsObject, annotations)
@@ -835,20 +925,28 @@ def fontName(self, fontprop):
         """
 
         if isinstance(fontprop, str):
-            filename = fontprop
+            filenames = [fontprop]
         elif mpl.rcParams['pdf.use14corefonts']:
-            filename = findfont(
-                fontprop, fontext='afm', directory=RendererPdf._afm_font_dir)
+            filenames = _fontManager._find_fonts_by_props(
+                fontprop, fontext='afm', directory=RendererPdf._afm_font_dir
+            )
         else:
-            filename = findfont(fontprop)
-
-        Fx = self.fontNames.get(filename)
-        if Fx is None:
-            Fx = next(self._internal_font_seq)
-            self.fontNames[filename] = Fx
-            _log.debug('Assigning font %s = %r', Fx, filename)
-
-        return Fx
+            filenames = _fontManager._find_fonts_by_props(fontprop)
+        first_Fx = None
+        for fname in filenames:
+            Fx = self.fontNames.get(fname)
+            if not first_Fx:
+                first_Fx = Fx
+            if Fx is None:
+                Fx = next(self._internal_font_seq)
+                self.fontNames[fname] = Fx
+                _log.debug('Assigning font %s = %r', Fx, fname)
+                if not first_Fx:
+                    first_Fx = Fx
+
+        # find_fontsprop's first value always adheres to
+        # findfont's value, so technically no behaviour change
+        return first_Fx
 
     def dviFontName(self, dvifont):
         """
@@ -861,7 +959,7 @@ def dviFontName(self, dvifont):
         if dvi_info is not None:
             return dvi_info.pdfname
 
-        tex_font_map = dviread.PsfontsMap(dviread.find_tex_file('pdftex.map'))
+        tex_font_map = dviread.PsfontsMap(dviread._find_tex_file('pdftex.map'))
         psfont = tex_font_map[dvifont.texname]
         if psfont.filename is None:
             raise ValueError(
@@ -952,7 +1050,7 @@ def _embedTeXFont(self, fontinfo):
             return fontdictObject
 
         # We have a font file to embed - read it in and apply any effects
-        t1font = type1font.Type1Font(fontinfo.fontfile)
+        t1font = _type1font.Type1Font(fontinfo.fontfile)
         if fontinfo.effects:
             t1font = t1font.transform(fontinfo.effects)
         fontdict['BaseFont'] = Name(t1font.prop['FontName'])
@@ -1027,22 +1125,19 @@ def createType1Descriptor(self, t1font, fontfile):
 
         self.writeObject(fontdescObject, descriptor)
 
-        self.beginStream(fontfileObject.id, None,
-                         {'Length1': len(t1font.parts[0]),
-                          'Length2': len(t1font.parts[1]),
-                          'Length3': 0})
-        self.currentstream.write(t1font.parts[0])
-        self.currentstream.write(t1font.parts[1])
-        self.endStream()
+        self.outputStream(fontfileObject, b"".join(t1font.parts[:2]),
+                          extra={'Length1': len(t1font.parts[0]),
+                                 'Length2': len(t1font.parts[1]),
+                                 'Length3': 0})
 
         return fontdescObject
 
-    def _get_xobject_symbol_name(self, filename, symbol_name):
+    def _get_xobject_glyph_name(self, filename, glyph_name):
         Fx = self.fontName(filename)
         return "-".join([
             Fx.name.decode(),
             os.path.splitext(os.path.basename(filename))[0],
-            symbol_name])
+            glyph_name])
 
     _identityToUnicodeCMap = b"""/CIDInit /ProcSet findresource begin
 12 dict begin
@@ -1117,7 +1212,6 @@ def get_char_width(charcode):
                 width = font.load_char(
                     s, flags=LOAD_NO_SCALE | LOAD_NO_HINTING).horiAdvance
                 return cvt(width)
-
             with warnings.catch_warnings():
                 # Ignore 'Required glyph missing from current font' warning
                 # from ft2font: here we're just building the widths table, but
@@ -1156,13 +1250,13 @@ def get_char_width(charcode):
             charprocs = {}
             for charname in sorted(rawcharprocs):
                 stream = rawcharprocs[charname]
-                charprocDict = {'Length': len(stream)}
+                charprocDict = {}
                 # The 2-byte characters are used as XObjects, so they
                 # need extra info in their dictionary
                 if charname in multi_byte_chars:
-                    charprocDict['Type'] = Name('XObject')
-                    charprocDict['Subtype'] = Name('Form')
-                    charprocDict['BBox'] = bbox
+                    charprocDict = {'Type': Name('XObject'),
+                                    'Subtype': Name('Form'),
+                                    'BBox': bbox}
                     # Each glyph includes bounding box information,
                     # but xpdf and ghostscript can't handle it in a
                     # Form XObject (they segfault!!!), so we remove it
@@ -1171,14 +1265,12 @@ def get_char_width(charcode):
                     # value.
                     stream = stream[stream.find(b"d1") + 2:]
                 charprocObject = self.reserveObject('charProc')
-                self.beginStream(charprocObject.id, None, charprocDict)
-                self.currentstream.write(stream)
-                self.endStream()
+                self.outputStream(charprocObject, stream, extra=charprocDict)
 
                 # Send the glyphs with ccode > 255 to the XObject dictionary,
                 # and the others to the font itself
                 if charname in multi_byte_chars:
-                    name = self._get_xobject_symbol_name(filename, charname)
+                    name = self._get_xobject_glyph_name(filename, charname)
                     self.multi_byte_charprocs[name] = charprocObject
                 else:
                     charprocs[charname] = charprocObject
@@ -1201,6 +1293,22 @@ def embedTTFType42(font, characters, descriptor):
             wObject = self.reserveObject('Type 0 widths')
             toUnicodeMapObject = self.reserveObject('ToUnicode map')
 
+            subset_str = "".join(chr(c) for c in characters)
+            _log.debug("SUBSET %s characters: %s", filename, subset_str)
+            fontdata = _backend_pdf_ps.get_glyphs_subset(filename, subset_str)
+            _log.debug(
+                "SUBSET %s %d -> %d", filename,
+                os.stat(filename).st_size, fontdata.getbuffer().nbytes
+            )
+
+            # We need this ref for XObjects
+            full_font = font
+
+            # reload the font object from the subset
+            # (all the necessary data could probably be obtained directly
+            # using fontLib.ttLib)
+            font = FT2Font(fontdata)
+
             cidFontDict = {
                 'Type': Name('Font'),
                 'Subtype': Name('CIDFontType2'),
@@ -1225,21 +1333,9 @@ def embedTTFType42(font, characters, descriptor):
 
             # Make fontfile stream
             descriptor['FontFile2'] = fontfileObject
-            length1Object = self.reserveObject('decoded length of a font')
-            self.beginStream(
-                fontfileObject.id,
-                self.reserveObject('length of font stream'),
-                {'Length1': length1Object})
-            with open(filename, 'rb') as fontfile:
-                length1 = 0
-                while True:
-                    data = fontfile.read(4096)
-                    if not data:
-                        break
-                    length1 += len(data)
-                    self.currentstream.write(data)
-            self.endStream()
-            self.writeObject(length1Object, length1)
+            self.outputStream(
+                fontfileObject, fontdata.getvalue(),
+                extra={'Length1': fontdata.getbuffer().nbytes})
 
             # Make the 'W' (Widths) array, CidToGidMap and ToUnicode CMap
             # at the same time
@@ -1275,6 +1371,11 @@ def embedTTFType42(font, characters, descriptor):
 
             unicode_bfrange = []
             for start, end in unicode_groups:
+                # Ensure the CID map contains only chars from BMP
+                if start > 65535:
+                    continue
+                end = min(65535, end)
+
                 unicode_bfrange.append(
                     b"<%04x> <%04x> [%s]" %
                     (start, end,
@@ -1282,20 +1383,39 @@ def embedTTFType42(font, characters, descriptor):
             unicode_cmap = (self._identityToUnicodeCMap %
                             (len(unicode_groups), b"\n".join(unicode_bfrange)))
 
+            # Add XObjects for unsupported chars
+            glyph_ids = []
+            for ccode in characters:
+                if not _font_supports_glyph(fonttype, ccode):
+                    gind = full_font.get_char_index(ccode)
+                    glyph_ids.append(gind)
+
+            bbox = [cvt(x, nearest=False) for x in full_font.bbox]
+            rawcharprocs = _get_pdf_charprocs(filename, glyph_ids)
+            for charname in sorted(rawcharprocs):
+                stream = rawcharprocs[charname]
+                charprocDict = {'Type': Name('XObject'),
+                                'Subtype': Name('Form'),
+                                'BBox': bbox}
+                # Each glyph includes bounding box information,
+                # but xpdf and ghostscript can't handle it in a
+                # Form XObject (they segfault!!!), so we remove it
+                # from the stream here.  It's not needed anyway,
+                # since the Form XObject includes it in its BBox
+                # value.
+                stream = stream[stream.find(b"d1") + 2:]
+                charprocObject = self.reserveObject('charProc')
+                self.outputStream(charprocObject, stream, extra=charprocDict)
+
+                name = self._get_xobject_glyph_name(filename, charname)
+                self.multi_byte_charprocs[name] = charprocObject
+
             # CIDToGIDMap stream
             cid_to_gid_map = "".join(cid_to_gid_map).encode("utf-16be")
-            self.beginStream(cidToGidMapObject.id,
-                             None,
-                             {'Length': len(cid_to_gid_map)})
-            self.currentstream.write(cid_to_gid_map)
-            self.endStream()
+            self.outputStream(cidToGidMapObject, cid_to_gid_map)
 
             # ToUnicode CMap
-            self.beginStream(toUnicodeMapObject.id,
-                             None,
-                             {'Length': unicode_cmap})
-            self.currentstream.write(unicode_cmap)
-            self.endStream()
+            self.outputStream(toUnicodeMapObject, unicode_cmap)
 
             descriptor['MaxWidth'] = max_width
 
@@ -1309,7 +1429,11 @@ def embedTTFType42(font, characters, descriptor):
 
         # Beginning of main embedTTF function...
 
-        ps_name = font.postscript_name.encode('ascii', 'replace')
+        ps_name = self._get_subsetted_psname(
+            font.postscript_name,
+            font.get_charmap()
+        )
+        ps_name = ps_name.encode('ascii', 'replace')
         ps_name = Name(ps_name)
         pclt = font.get_sfnt_table('pclt') or {'capHeight': 0, 'xHeight': 0}
         post = font.get_sfnt_table('post') or {'italicAngle': (0, 0)}
@@ -1469,7 +1593,7 @@ def writeHatches(self):
                  # Change origin to match Agg at top-left.
                  'Matrix': [1, 0, 0, 1, 0, self.height * 72]})
 
-            stroke_rgb, fill_rgb, path = hatch_style
+            stroke_rgb, fill_rgb, hatch = hatch_style
             self.output(stroke_rgb[0], stroke_rgb[1], stroke_rgb[2],
                         Op.setrgb_stroke)
             if fill_rgb is not None:
@@ -1481,7 +1605,7 @@ def writeHatches(self):
             self.output(mpl.rcParams['hatch.linewidth'], Op.setlinewidth)
 
             self.output(*self.pathOperations(
-                Path.hatch(path),
+                Path.hatch(hatch),
                 Affine2D().scale(sidelen),
                 simplify=False))
             self.output(Op.fill_stroke)
@@ -1646,16 +1770,20 @@ def _writeImg(self, data, id, smask=None):
                 # Convert to indexed color if there are 256 colors or fewer
                 # This can significantly reduce the file size
                 num_colors = len(img_colors)
-                img = img.convert(mode='P', dither=Image.NONE,
-                                  palette=Image.ADAPTIVE, colors=num_colors)
+                # These constants were converted to IntEnums and deprecated in
+                # Pillow 9.2
+                dither = getattr(Image, 'Dither', Image).NONE
+                pmode = getattr(Image, 'Palette', Image).ADAPTIVE
+                img = img.convert(
+                    mode='P', dither=dither, palette=pmode, colors=num_colors
+                )
                 png_data, bit_depth, palette = self._writePng(img)
                 if bit_depth is None or palette is None:
                     raise RuntimeError("invalid PNG header")
                 palette = palette[:num_colors * 3]  # Trim padding
-                palette = pdfRepr(palette)
-                obj['ColorSpace'] = Verbatim(b'[/Indexed /DeviceRGB '
-                                             + str(num_colors - 1).encode()
-                                             + b' ' + palette + b']')
+                obj['ColorSpace'] = Verbatim(
+                    b'[/Indexed /DeviceRGB %d %s]'
+                    % (num_colors - 1, pdfRepr(palette)))
                 obj['BitsPerComponent'] = bit_depth
                 color_channels = 1
             else:
@@ -1770,7 +1898,8 @@ def pathOperations(path, transform, clip=None, simplify=None, sketch=None):
         return [Verbatim(_path.convert_to_string(
             path, transform, clip, simplify, sketch,
             6,
-            [Op.moveto.op, Op.lineto.op, b'', Op.curveto.op, Op.closepath.op],
+            [Op.moveto.value, Op.lineto.value, b'', Op.curveto.value,
+             Op.closepath.value],
             True))]
 
     def writePath(self, path, transform, clip=False, sketch=None):
@@ -1844,11 +1973,6 @@ def __init__(self, file, image_dpi, height, width):
         self.gc = self.new_gc()
         self.image_dpi = image_dpi
 
-    @_api.deprecated("3.4")
-    @property
-    def mathtext_parser(self):
-        return MathTextParser("Pdf")
-
     def finalize(self):
         self.file.output(*self.gc.finalize())
 
@@ -1879,15 +2003,6 @@ def check_gc(self, gc, fillcolor=None):
         gc._fillcolor = orig_fill
         gc._effective_alphas = orig_alphas
 
-    @_api.deprecated("3.3")
-    def track_characters(self, *args, **kwargs):
-        """Keep track of which characters are required from each font."""
-        self.file._character_tracker.track(*args, **kwargs)
-
-    @_api.deprecated("3.3")
-    def merge_used_characters(self, *args, **kwargs):
-        self.file._character_tracker.merge(*args, **kwargs)
-
     def get_image_magnification(self):
         return self.image_dpi/72.0
 
@@ -1931,7 +2046,7 @@ def draw_path(self, gc, path, transform, rgbFace=None):
         self.file.output(self.gc.paint())
 
     def draw_path_collection(self, gc, master_transform, paths, all_transforms,
-                             offsets, offsetTrans, facecolors, edgecolors,
+                             offsets, offset_trans, facecolors, edgecolors,
                              linewidths, linestyles, antialiaseds, urls,
                              offset_position):
         # We can only reuse the objects if the presence of fill and
@@ -1973,7 +2088,7 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
         if (not can_do_optimization) or (not should_do_optimization):
             return RendererBase.draw_path_collection(
                 self, gc, master_transform, paths, all_transforms,
-                offsets, offsetTrans, facecolors, edgecolors,
+                offsets, offset_trans, facecolors, edgecolors,
                 linewidths, linestyles, antialiaseds, urls,
                 offset_position)
 
@@ -1989,8 +2104,8 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
         output(*self.gc.push())
         lastx, lasty = 0, 0
         for xo, yo, path_id, gc0, rgbFace in self._iter_collection(
-                gc, master_transform, all_transforms, path_codes, offsets,
-                offsetTrans, facecolors, edgecolors, linewidths, linestyles,
+                gc, path_codes, offsets, offset_trans,
+                facecolors, edgecolors, linewidths, linestyles,
                 antialiaseds, urls, offset_position):
 
             self.check_gc(gc0, rgbFace)
@@ -2098,17 +2213,8 @@ def draw_mathtext(self, gc, x, y, s, prop, angle):
             self._text2path.mathtext_parser.parse(s, 72, prop)
 
         if gc.get_url() is not None:
-            link_annotation = {
-                'Type': Name('Annot'),
-                'Subtype': Name('Link'),
-                'Rect': (x, y, x + width, y + height),
-                'Border': [0, 0, 0],
-                'A': {
-                    'S': Name('URI'),
-                    'URI': gc.get_url(),
-                },
-            }
-            self.file._annotations[-1][1].append(link_annotation)
+            self.file._annotations[-1][1].append(_get_link_annotation(
+                gc, x, y, width, height, angle))
 
         fonttype = mpl.rcParams['pdf.fonttype']
 
@@ -2122,16 +2228,16 @@ def draw_mathtext(self, gc, x, y, s, prop, angle):
         self.check_gc(gc, gc._rgb)
         prev_font = None, None
         oldx, oldy = 0, 0
-        type3_multibytes = []
+        unsupported_chars = []
 
         self.file.output(Op.begin_text)
         for font, fontsize, num, ox, oy in glyphs:
-            self.file._character_tracker.track(font, chr(num))
+            self.file._character_tracker.track_glyph(font, num)
             fontname = font.fname
-            if fonttype == 3 and num > 255:
-                # For Type3 fonts, multibyte characters must be emitted
-                # separately (below).
-                type3_multibytes.append((font, fontsize, ox, oy, num))
+            if not _font_supports_glyph(fonttype, num):
+                # Unsupported chars (i.e. multibyte in Type 3 or beyond BMP in
+                # Type 42) must be emitted separately (below).
+                unsupported_chars.append((font, fontsize, ox, oy, num))
             else:
                 self._setup_textpos(ox, oy, 0, oldx, oldy)
                 oldx, oldy = ox, oy
@@ -2143,7 +2249,7 @@ def draw_mathtext(self, gc, x, y, s, prop, angle):
                                  Op.show)
         self.file.output(Op.end_text)
 
-        for font, fontsize, ox, oy, num in type3_multibytes:
+        for font, fontsize, ox, oy, num in unsupported_chars:
             self._draw_xobject_glyph(
                 font, fontsize, font.get_char_index(num), ox, oy)
 
@@ -2155,8 +2261,7 @@ def draw_mathtext(self, gc, x, y, s, prop, angle):
         # Pop off the global transformation
         self.file.output(Op.grestore)
 
-    @_api.delete_parameter("3.3", "ismath")
-    def draw_tex(self, gc, x, y, s, prop, angle, ismath='TeX!', mtext=None):
+    def draw_tex(self, gc, x, y, s, prop, angle, *, mtext=None):
         # docstring inherited
         texmanager = self.get_texmanager()
         fontsize = prop.get_size_in_points()
@@ -2165,17 +2270,8 @@ def draw_tex(self, gc, x, y, s, prop, angle, ismath='TeX!', mtext=None):
             page, = dvi
 
         if gc.get_url() is not None:
-            link_annotation = {
-                'Type': Name('Annot'),
-                'Subtype': Name('Link'),
-                'Rect': (x, y, x + page.width, y + page.height),
-                'Border': [0, 0, 0],
-                'A': {
-                    'S': Name('URI'),
-                    'URI': gc.get_url(),
-                },
-            }
-            self.file._annotations[-1][1].append(link_annotation)
+            self.file._annotations[-1][1].append(_get_link_annotation(
+                gc, x, y, page.width, page.height, angle))
 
         # Gather font information and do some setup for combining
         # characters into strings. The variable seq will contain a
@@ -2275,55 +2371,52 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
         if gc.get_url() is not None:
             font.set_text(s)
             width, height = font.get_width_height()
-            link_annotation = {
-                'Type': Name('Annot'),
-                'Subtype': Name('Link'),
-                'Rect': (x, y, x + width / 64, y + height / 64),
-                'Border': [0, 0, 0],
-                'A': {
-                    'S': Name('URI'),
-                    'URI': gc.get_url(),
-                },
-            }
-            self.file._annotations[-1][1].append(link_annotation)
+            self.file._annotations[-1][1].append(_get_link_annotation(
+                gc, x, y, width / 64, height / 64, angle))
 
-        # If fonttype != 3 emit the whole string at once without manual
-        # kerning.
-        if fonttype != 3:
+        # If fonttype is neither 3 nor 42, emit the whole string at once
+        # without manual kerning.
+        if fonttype not in [3, 42]:
             self.file.output(Op.begin_text,
                              self.file.fontName(prop), fontsize, Op.selectfont)
             self._setup_textpos(x, y, angle)
             self.file.output(self.encode_string(s, fonttype),
                              Op.show, Op.end_text)
 
-        # There is no way to access multibyte characters of Type 3 fonts, as
-        # they cannot have a CIDMap.  Therefore, in this case we break the
-        # string into chunks, where each chunk contains either a string of
-        # consecutive 1-byte characters or a single multibyte character.
-        # A sequence of 1-byte characters is broken into multiple chunks to
-        # adjust the kerning between adjacent chunks.  Each chunk is emitted
-        # with a separate command: 1-byte characters use the regular text show
-        # command (TJ) with appropriate kerning between chunks, whereas
-        # multibyte characters use the XObject command (Do).  (If using Type
-        # 42 fonts, all of this complication is avoided, but of course,
-        # subsetting those fonts is complex/hard to implement.)
+        # A sequence of characters is broken into multiple chunks. The chunking
+        # serves two purposes:
+        #   - For Type 3 fonts, there is no way to access multibyte characters,
+        #     as they cannot have a CIDMap.  Therefore, in this case we break
+        #     the string into chunks, where each chunk contains either a string
+        #     of consecutive 1-byte characters or a single multibyte character.
+        #   - A sequence of 1-byte characters is split into chunks to allow for
+        #     kerning adjustments between consecutive chunks.
+        #
+        # Each chunk is emitted with a separate command: 1-byte characters use
+        # the regular text show command (TJ) with appropriate kerning between
+        # chunks, whereas multibyte characters use the XObject command (Do).
         else:
-            # List of (start_x, [prev_kern, char, char, ...]), w/o zero kerns.
+            # List of (ft_object, start_x, [prev_kern, char, char, ...]),
+            # w/o zero kerns.
             singlebyte_chunks = []
-            # List of (start_x, glyph_index).
+            # List of (ft_object, start_x, glyph_index).
             multibyte_glyphs = []
             prev_was_multibyte = True
-            for item in _text_layout.layout(
+            prev_font = font
+            for item in _text_helpers.layout(
                     s, font, kern_mode=KERNING_UNFITTED):
-                if ord(item.char) <= 255:
-                    if prev_was_multibyte:
-                        singlebyte_chunks.append((item.x, []))
+                if _font_supports_glyph(fonttype, ord(item.char)):
+                    if prev_was_multibyte or item.ft_object != prev_font:
+                        singlebyte_chunks.append((item.ft_object, item.x, []))
+                        prev_font = item.ft_object
                     if item.prev_kern:
-                        singlebyte_chunks[-1][1].append(item.prev_kern)
-                    singlebyte_chunks[-1][1].append(item.char)
+                        singlebyte_chunks[-1][2].append(item.prev_kern)
+                    singlebyte_chunks[-1][2].append(item.char)
                     prev_was_multibyte = False
                 else:
-                    multibyte_glyphs.append((item.x, item.glyph_idx))
+                    multibyte_glyphs.append(
+                        (item.ft_object, item.x, item.glyph_idx)
+                    )
                     prev_was_multibyte = True
             # Do the rotation and global translation as a single matrix
             # concatenation up front
@@ -2333,10 +2426,12 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
                              -math.sin(a), math.cos(a),
                              x, y, Op.concat_matrix)
             # Emit all the 1-byte characters in a BT/ET group.
-            self.file.output(Op.begin_text,
-                             self.file.fontName(prop), fontsize, Op.selectfont)
+
+            self.file.output(Op.begin_text)
             prev_start_x = 0
-            for start_x, kerns_or_chars in singlebyte_chunks:
+            for ft_object, start_x, kerns_or_chars in singlebyte_chunks:
+                ft_name = self.file.fontName(ft_object.fname)
+                self.file.output(ft_name, fontsize, Op.selectfont)
                 self._setup_textpos(start_x, 0, 0, prev_start_x, 0, 0)
                 self.file.output(
                     # See pdf spec "Text space details" for the 1000/fontsize
@@ -2348,14 +2443,16 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
                 prev_start_x = start_x
             self.file.output(Op.end_text)
             # Then emit all the multibyte characters, one at a time.
-            for start_x, glyph_idx in multibyte_glyphs:
-                self._draw_xobject_glyph(font, fontsize, glyph_idx, start_x, 0)
+            for ft_object, start_x, glyph_idx in multibyte_glyphs:
+                self._draw_xobject_glyph(
+                    ft_object, fontsize, glyph_idx, start_x, 0
+                )
             self.file.output(Op.grestore)
 
     def _draw_xobject_glyph(self, font, fontsize, glyph_idx, x, y):
         """Draw a multibyte character from a Type 3 font as an XObject."""
-        symbol_name = font.get_glyph_name(glyph_idx)
-        name = self.file._get_xobject_symbol_name(font.fname, symbol_name)
+        glyph_name = font.get_glyph_name(glyph_idx)
+        name = self.file._get_xobject_glyph_name(font.fname, glyph_name)
         self.file.output(
             Op.gsave,
             0.001 * fontsize, 0, 0, 0.001 * fontsize, x, y, Op.concat_matrix,
@@ -2657,11 +2754,8 @@ def savefig(self, figure=None, **kwargs):
 
         Parameters
         ----------
-        figure : `.Figure` or int, optional
-            Specifies what figure is saved to file. If not specified, the
-            active figure is saved. If a `.Figure` instance is provided, this
-            figure is saved. If an int is specified, the figure instance to
-            save is looked up by number.
+        figure : `.Figure` or int, default: the active figure
+            The figure, or index of the figure, that is saved to the file.
         """
         if not isinstance(figure, Figure):
             if figure is None:
@@ -2702,15 +2796,11 @@ class FigureCanvasPdf(FigureCanvasBase):
     def get_default_filetype(self):
         return 'pdf'
 
-    @_check_savefig_extra_args
-    @_api.delete_parameter("3.4", "dpi")
     def print_pdf(self, filename, *,
-                  dpi=None,  # dpi to use for images
                   bbox_inches_restore=None, metadata=None):
 
-        if dpi is None:  # always use this branch after deprecation elapses.
-            dpi = self.figure.get_dpi()
-        self.figure.set_dpi(72)            # there are 72 pdf points to an inch
+        dpi = self.figure.dpi
+        self.figure.dpi = 72  # there are 72 pdf points to an inch
         width, height = self.figure.get_size_inches()
         if isinstance(filename, PdfPages):
             file = filename._file
@@ -2733,7 +2823,7 @@ def print_pdf(self, filename, *,
                 file.close()
 
     def draw(self):
-        _no_output_draw(self.figure)
+        self.figure.draw_without_rendering()
         return super().draw()
 
 
diff --git a/lib/matplotlib/backends/backend_pgf.py b/lib/matplotlib/backends/backend_pgf.py
index 9d01f603e021..c3b900a97399 100644
--- a/lib/matplotlib/backends/backend_pgf.py
+++ b/lib/matplotlib/backends/backend_pgf.py
@@ -1,4 +1,3 @@
-import atexit
 import codecs
 import datetime
 import functools
@@ -18,8 +17,7 @@
 import matplotlib as mpl
 from matplotlib import _api, cbook, font_manager as fm
 from matplotlib.backend_bases import (
-    _Backend, _check_savefig_extra_args, FigureCanvasBase, FigureManagerBase,
-    GraphicsContextBase, RendererBase, _no_output_draw
+    _Backend, FigureCanvasBase, FigureManagerBase, RendererBase
 )
 from matplotlib.backends.backend_mixed import MixedModeRenderer
 from matplotlib.backends.backend_pdf import (
@@ -36,58 +34,70 @@
 # which is not recognized by TeX.
 
 
-def get_fontspec():
-    """Build fontspec preamble from rc."""
-    latex_fontspec = []
-    texcommand = mpl.rcParams["pgf.texsystem"]
+@_api.caching_module_getattr
+class __getattr__:
+    NO_ESCAPE = _api.deprecated("3.6", obj_type="")(
+        property(lambda self: _NO_ESCAPE))
+    re_mathsep = _api.deprecated("3.6", obj_type="")(
+        property(lambda self: _split_math.__self__))
 
-    if texcommand != "pdflatex":
-        latex_fontspec.append("\\usepackage{fontspec}")
 
-    if texcommand != "pdflatex" and mpl.rcParams["pgf.rcfonts"]:
-        families = ["serif", "sans\\-serif", "monospace"]
-        commands = ["setmainfont", "setsansfont", "setmonofont"]
-        for family, command in zip(families, commands):
-            # 1) Forward slashes also work on Windows, so don't mess with
-            # backslashes.  2) The dirname needs to include a separator.
-            path = pathlib.Path(fm.findfont(family))
-            latex_fontspec.append(r"\%s{%s}[Path=\detokenize{%s}]" % (
-                command, path.name, path.parent.as_posix() + "/"))
-
-    return "\n".join(latex_fontspec)
+@_api.deprecated("3.6")
+def get_fontspec():
+    """Build fontspec preamble from rc."""
+    with mpl.rc_context({"pgf.preamble": ""}):
+        return _get_preamble()
 
 
+@_api.deprecated("3.6")
 def get_preamble():
     """Get LaTeX preamble from rc."""
     return mpl.rcParams["pgf.preamble"]
 
-###############################################################################
 
-# This almost made me cry!!!
-# In the end, it's better to use only one unit for all coordinates, since the
+def _get_preamble():
+    """Prepare a LaTeX preamble based on the rcParams configuration."""
+    preamble = [mpl.rcParams["pgf.preamble"]]
+    if mpl.rcParams["pgf.texsystem"] != "pdflatex":
+        preamble.append("\\usepackage{fontspec}")
+        if mpl.rcParams["pgf.rcfonts"]:
+            families = ["serif", "sans\\-serif", "monospace"]
+            commands = ["setmainfont", "setsansfont", "setmonofont"]
+            for family, command in zip(families, commands):
+                # 1) Forward slashes also work on Windows, so don't mess with
+                # backslashes.  2) The dirname needs to include a separator.
+                path = pathlib.Path(fm.findfont(family))
+                preamble.append(r"\%s{%s}[Path=\detokenize{%s/}]" % (
+                    command, path.name, path.parent.as_posix()))
+    preamble.append(mpl.texmanager._usepackage_if_not_loaded(
+        "underscore", option="strings"))  # Documented as "must come last".
+    return "\n".join(preamble)
+
+
+# It's better to use only one unit for all coordinates, since the
 # arithmetic in latex seems to produce inaccurate conversions.
 latex_pt_to_in = 1. / 72.27
 latex_in_to_pt = 1. / latex_pt_to_in
 mpl_pt_to_in = 1. / 72.
 mpl_in_to_pt = 1. / mpl_pt_to_in
 
-###############################################################################
-# helper functions
-
-NO_ESCAPE = r"(?<!\\)(?:\\\\)*"
-re_mathsep = re.compile(NO_ESCAPE + r"\$")
-
 
+_NO_ESCAPE = r"(?<!\\)(?:\\\\)*"
+_split_math = re.compile(_NO_ESCAPE + r"\$").split
 _replace_escapetext = functools.partial(
-    # When the next character is _, ^, $, or % (not preceded by an escape),
-    # insert a backslash.
-    re.compile(NO_ESCAPE + "(?=[_^$%])").sub, "\\\\")
+    # When the next character is an unescaped % or ^, insert a backslash.
+    re.compile(_NO_ESCAPE + "(?=[%^])").sub, "\\\\")
 _replace_mathdefault = functools.partial(
     # Replace \mathdefault (when not preceded by an escape) by empty string.
-    re.compile(NO_ESCAPE + r"(\\mathdefault)").sub, "")
+    re.compile(_NO_ESCAPE + r"(\\mathdefault)").sub, "")
 
 
+@_api.deprecated("3.6")
 def common_texification(text):
+    return _tex_escape(text)
+
+
+def _tex_escape(text):
     r"""
     Do some necessary and/or useful substitutions for texts to be included in
     LaTeX documents.
@@ -96,14 +106,14 @@ def common_texification(text):
     ``$`` with ``\(\displaystyle %s\)``. Escaped math separators (``\$``)
     are ignored.
 
-    The following characters are escaped in text segments: ``_^$%``
+    The following characters are escaped in text segments: ``^%``
     """
     # Sometimes, matplotlib adds the unknown command \mathdefault.
     # Not using \mathnormal instead since this looks odd for the latex cm font.
     text = _replace_mathdefault(text)
     text = text.replace("\N{MINUS SIGN}", r"\ensuremath{-}")
     # split text into normaltext and inline math parts
-    parts = re_mathsep.split(text)
+    parts = _split_math(text)
     for i, s in enumerate(parts):
         if not i % 2:
             # textmode replacements
@@ -115,15 +125,23 @@ def common_texification(text):
     return "".join(parts)
 
 
+@_api.deprecated("3.6")
 def writeln(fh, line):
-    # every line of a file included with \\input must be terminated with %
-    # if not, latex will create additional vertical spaces for some reason
+    return _writeln(fh, line)
+
+
+def _writeln(fh, line):
+    # Ending lines with a % prevents TeX from inserting spurious spaces
+    # (https://tex.stackexchange.com/questions/7453).
     fh.write(line)
     fh.write("%\n")
 
 
-def _font_properties_str(prop):
-    # translate font properties to latex commands, return as string
+def _escape_and_apply_props(s, prop):
+    """
+    Generate a TeX string that renders string *s* with font properties *prop*,
+    also applying any required escapes to *s*.
+    """
     commands = []
 
     families = {"serif": r"\rmfamily", "sans": r"\sffamily",
@@ -149,7 +167,7 @@ def _font_properties_str(prop):
         commands.append(r"\bfseries")
 
     commands.append(r"\selectfont")
-    return "".join(commands)
+    return "".join(commands) + " " + _tex_escape(s)
 
 
 def _metadata_to_str(key, value):
@@ -165,26 +183,28 @@ def _metadata_to_str(key, value):
 
 def make_pdf_to_png_converter():
     """Return a function that converts a pdf file to a png file."""
-    if shutil.which("pdftocairo"):
-        def cairo_convert(pdffile, pngfile, dpi):
-            cmd = ["pdftocairo", "-singlefile", "-png", "-r", "%d" % dpi,
-                   pdffile, os.path.splitext(pngfile)[0]]
-            subprocess.check_output(cmd, stderr=subprocess.STDOUT)
-        return cairo_convert
+    try:
+        mpl._get_executable_info("pdftocairo")
+    except mpl.ExecutableNotFoundError:
+        pass
+    else:
+        return lambda pdffile, pngfile, dpi: subprocess.check_output(
+            ["pdftocairo", "-singlefile", "-transp", "-png", "-r", "%d" % dpi,
+             pdffile, os.path.splitext(pngfile)[0]],
+            stderr=subprocess.STDOUT)
     try:
         gs_info = mpl._get_executable_info("gs")
     except mpl.ExecutableNotFoundError:
         pass
     else:
-        def gs_convert(pdffile, pngfile, dpi):
-            cmd = [gs_info.executable,
-                   '-dQUIET', '-dSAFER', '-dBATCH', '-dNOPAUSE', '-dNOPROMPT',
-                   '-dUseCIEColor', '-dTextAlphaBits=4',
-                   '-dGraphicsAlphaBits=4', '-dDOINTERPOLATE',
-                   '-sDEVICE=png16m', '-sOutputFile=%s' % pngfile,
-                   '-r%d' % dpi, pdffile]
-            subprocess.check_output(cmd, stderr=subprocess.STDOUT)
-        return gs_convert
+        return lambda pdffile, pngfile, dpi: subprocess.check_output(
+            [gs_info.executable,
+             '-dQUIET', '-dSAFER', '-dBATCH', '-dNOPAUSE', '-dNOPROMPT',
+             '-dUseCIEColor', '-dTextAlphaBits=4',
+             '-dGraphicsAlphaBits=4', '-dDOINTERPOLATE',
+             '-sDEVICE=pngalpha', '-sOutputFile=%s' % pngfile,
+             '-r%d' % dpi, pdffile],
+            stderr=subprocess.STDOUT)
     raise RuntimeError("No suitable pdf to png renderer found.")
 
 
@@ -209,22 +229,15 @@ class LatexManager:
 
     @staticmethod
     def _build_latex_header():
-        latex_preamble = get_preamble()
-        latex_fontspec = get_fontspec()
-        # Create LaTeX header with some content, else LaTeX will load some math
-        # fonts later when we don't expect the additional output on stdout.
-        # TODO: is this sufficient?
         latex_header = [
-            r"\documentclass{minimal}",
+            r"\documentclass{article}",
             # Include TeX program name as a comment for cache invalidation.
             # TeX does not allow this to be the first line.
             rf"% !TeX program = {mpl.rcParams['pgf.texsystem']}",
             # Test whether \includegraphics supports interpolate option.
             r"\usepackage{graphicx}",
-            latex_preamble,
-            latex_fontspec,
+            _get_preamble(),
             r"\begin{document}",
-            r"text $math \mu$",  # force latex to load fonts now
             r"\typeout{pgf_backend_query_start}",
         ]
         return "\n".join(latex_header)
@@ -273,38 +286,41 @@ def __init__(self):
         self._finalize_tmpdir = weakref.finalize(self, self._tmpdir.cleanup)
 
         # test the LaTeX setup to ensure a clean startup of the subprocess
-        self.texcommand = mpl.rcParams["pgf.texsystem"]
-        self.latex_header = LatexManager._build_latex_header()
-        latex_end = "\n\\makeatletter\n\\@@end\n"
         try:
-            latex = subprocess.Popen(
-                [self.texcommand, "-halt-on-error"],
-                stdin=subprocess.PIPE, stdout=subprocess.PIPE,
-                encoding="utf-8", cwd=self.tmpdir)
+            self._setup_latex_process(expect_reply=False)
         except FileNotFoundError as err:
             raise RuntimeError(
-                f"{self.texcommand} not found.  Install it or change "
+                f"{self.latex.args[0]!r} not found.  Install it or change "
                 f"rcParams['pgf.texsystem'] to an available TeX "
                 f"implementation.") from err
         except OSError as err:
-            raise RuntimeError("Error starting process %r" %
-                               self.texcommand) from err
-        test_input = self.latex_header + latex_end
-        stdout, stderr = latex.communicate(test_input)
-        if latex.returncode != 0:
-            raise LatexError("LaTeX returned an error, probably missing font "
-                             "or error in preamble.", stdout)
+            raise RuntimeError(
+                f"Error starting process {self.latex.args[0]!r}") from err
+        stdout, stderr = self.latex.communicate("\n\\makeatletter\\@@end\n")
+        if self.latex.returncode != 0:
+            raise LatexError(
+                f"LaTeX errored (probably missing font or error in preamble) "
+                f"while processing the following input:\n"
+                f"{self._build_latex_header()}",
+                stdout)
 
         self.latex = None  # Will be set up on first use.
-        self.str_cache = {}  # cache for strings already processed
+        # Per-instance cache.
+        self._get_box_metrics = functools.lru_cache()(self._get_box_metrics)
 
-    def _setup_latex_process(self):
+    str_cache = _api.deprecated("3.5")(property(lambda self: {}))
+    texcommand = _api.deprecated("3.6")(
+        property(lambda self: mpl.rcParams["pgf.texsystem"]))
+    latex_header = _api.deprecated("3.6")(
+        property(lambda self: self._build_latex_header()))
+
+    def _setup_latex_process(self, *, expect_reply=True):
         # Open LaTeX process for real work; register it for deletion.  On
         # Windows, we must ensure that the subprocess has quit before being
         # able to delete the tmpdir in which it runs; in order to do so, we
         # must first `kill()` it, and then `communicate()` with it.
         self.latex = subprocess.Popen(
-            [self.texcommand, "-halt-on-error"],
+            [mpl.rcParams["pgf.texsystem"], "-halt-on-error"],
             stdin=subprocess.PIPE, stdout=subprocess.PIPE,
             encoding="utf-8", cwd=self.tmpdir)
 
@@ -316,56 +332,42 @@ def finalize_latex(latex):
             self, finalize_latex, self.latex)
         # write header with 'pgf_backend_query_start' token
         self._stdin_writeln(self._build_latex_header())
-        # read all lines until our 'pgf_backend_query_start' token appears
-        self._expect("*pgf_backend_query_start")
-        self._expect_prompt()
-
-    @_api.deprecated("3.3")
-    def latex_stdin_utf8(self):
-        return self.latex.stdin
+        if expect_reply:  # read until 'pgf_backend_query_start' token appears
+            self._expect("*pgf_backend_query_start")
+            self._expect_prompt()
 
     def get_width_height_descent(self, text, prop):
         """
-        Get the width, total height and descent for a text typeset by the
-        current LaTeX environment.
+        Get the width, total height, and descent (in TeX points) for a text
+        typeset by the current LaTeX environment.
         """
+        return self._get_box_metrics(_escape_and_apply_props(text, prop))
 
-        # apply font properties and define textbox
-        prop_cmds = _font_properties_str(prop)
-        textbox = "\\sbox0{%s %s}" % (prop_cmds, text)
-
-        # check cache
-        if textbox in self.str_cache:
-            return self.str_cache[textbox]
-
-        # send textbox to LaTeX and wait for prompt
-        self._stdin_writeln(textbox)
-        try:
-            self._expect_prompt()
-        except LatexError as e:
-            raise ValueError("Error processing '{}'\nLaTeX Output:\n{}"
-                             .format(text, e.latex_output)) from e
-
-        # typeout width, height and text offset of the last textbox
-        self._stdin_writeln(r"\typeout{\the\wd0,\the\ht0,\the\dp0}")
-        # read answer from latex and advance to the next prompt
+    def _get_box_metrics(self, tex):
+        """
+        Get the width, total height and descent (in TeX points) for a TeX
+        command's output in the current LaTeX environment.
+        """
+        # This method gets wrapped in __init__ for per-instance caching.
+        self._stdin_writeln(  # Send textbox to TeX & request metrics typeout.
+            r"\sbox0{%s}\typeout{\the\wd0,\the\ht0,\the\dp0}" % tex)
         try:
             answer = self._expect_prompt()
-        except LatexError as e:
-            raise ValueError("Error processing '{}'\nLaTeX Output:\n{}"
-                             .format(text, e.latex_output)) from e
-
-        # parse metrics from the answer string
+        except LatexError as err:
+            # Here and below, use '{}' instead of {!r} to avoid doubling all
+            # backslashes.
+            raise ValueError("Error measuring {}\nLaTeX Output:\n{}"
+                             .format(tex, err.latex_output)) from err
         try:
-            width, height, offset = answer.splitlines()[0].split(",")
+            # Parse metrics from the answer string.  Last line is prompt, and
+            # next-to-last-line is blank line from \typeout.
+            width, height, offset = answer.splitlines()[-3].split(",")
         except Exception as err:
-            raise ValueError("Error processing '{}'\nLaTeX Output:\n{}"
-                             .format(text, answer)) from err
+            raise ValueError("Error measuring {}\nLaTeX Output:\n{}"
+                             .format(tex, answer)) from err
         w, h, o = float(width[:-2]), float(height[:-2]), float(offset[:-2])
-
-        # the height returned from LaTeX goes from base to top.
-        # the height matplotlib expects goes from bottom to top.
-        self.str_cache[textbox] = (w, h + o, o)
+        # The height returned from LaTeX goes from base to top;
+        # the height Matplotlib expects goes from bottom to top.
         return w, h + o, o
 
 
@@ -377,7 +379,7 @@ def _get_image_inclusion_command():
         # Don't mess with backslashes on Windows.
         % cbook._get_data_path("images/matplotlib.png").as_posix())
     try:
-        prompt = man._expect_prompt()
+        man._expect_prompt()
         return r"\includegraphics"
     except LatexError:
         # Discard the broken manager.
@@ -387,8 +389,7 @@ def _get_image_inclusion_command():
 
 class RendererPgf(RendererBase):
 
-    @_api.delete_parameter("3.3", "dummy")
-    def __init__(self, figure, fh, dummy=False):
+    def __init__(self, figure, fh):
         """
         Create a new PGF renderer that translates any drawing instruction
         into text commands to be interpreted in a latex pgfpicture environment.
@@ -407,17 +408,11 @@ def __init__(self, figure, fh, dummy=False):
         self.figure = figure
         self.image_counter = 0
 
-        if dummy:
-            # dummy==True deactivate all methods
-            for m in RendererPgf.__dict__:
-                if m.startswith("draw_"):
-                    self.__dict__[m] = lambda *args, **kwargs: None
-
     def draw_markers(self, gc, marker_path, marker_trans, path, trans,
                      rgbFace=None):
         # docstring inherited
 
-        writeln(self.fh, r"\begin{pgfscope}")
+        _writeln(self.fh, r"\begin{pgfscope}")
 
         # convert from display units to in
         f = 1. / self.dpi
@@ -429,59 +424,63 @@ def draw_markers(self, gc, marker_path, marker_trans, path, trans,
         # build marker definition
         bl, tr = marker_path.get_extents(marker_trans).get_points()
         coords = bl[0] * f, bl[1] * f, tr[0] * f, tr[1] * f
-        writeln(self.fh,
-                r"\pgfsys@defobject{currentmarker}"
-                r"{\pgfqpoint{%fin}{%fin}}{\pgfqpoint{%fin}{%fin}}{" % coords)
+        _writeln(self.fh,
+                 r"\pgfsys@defobject{currentmarker}"
+                 r"{\pgfqpoint{%fin}{%fin}}{\pgfqpoint{%fin}{%fin}}{" % coords)
         self._print_pgf_path(None, marker_path, marker_trans)
         self._pgf_path_draw(stroke=gc.get_linewidth() != 0.0,
                             fill=rgbFace is not None)
-        writeln(self.fh, r"}")
+        _writeln(self.fh, r"}")
+
+        maxcoord = 16383 / 72.27 * self.dpi  # Max dimensions in LaTeX.
+        clip = (-maxcoord, -maxcoord, maxcoord, maxcoord)
 
         # draw marker for each vertex
-        for point, code in path.iter_segments(trans, simplify=False):
+        for point, code in path.iter_segments(trans, simplify=False,
+                                              clip=clip):
             x, y = point[0] * f, point[1] * f
-            writeln(self.fh, r"\begin{pgfscope}")
-            writeln(self.fh, r"\pgfsys@transformshift{%fin}{%fin}" % (x, y))
-            writeln(self.fh, r"\pgfsys@useobject{currentmarker}{}")
-            writeln(self.fh, r"\end{pgfscope}")
+            _writeln(self.fh, r"\begin{pgfscope}")
+            _writeln(self.fh, r"\pgfsys@transformshift{%fin}{%fin}" % (x, y))
+            _writeln(self.fh, r"\pgfsys@useobject{currentmarker}{}")
+            _writeln(self.fh, r"\end{pgfscope}")
 
-        writeln(self.fh, r"\end{pgfscope}")
+        _writeln(self.fh, r"\end{pgfscope}")
 
     def draw_path(self, gc, path, transform, rgbFace=None):
         # docstring inherited
-        writeln(self.fh, r"\begin{pgfscope}")
+        _writeln(self.fh, r"\begin{pgfscope}")
         # draw the path
         self._print_pgf_clip(gc)
         self._print_pgf_path_styles(gc, rgbFace)
         self._print_pgf_path(gc, path, transform, rgbFace)
         self._pgf_path_draw(stroke=gc.get_linewidth() != 0.0,
                             fill=rgbFace is not None)
-        writeln(self.fh, r"\end{pgfscope}")
+        _writeln(self.fh, r"\end{pgfscope}")
 
         # if present, draw pattern on top
         if gc.get_hatch():
-            writeln(self.fh, r"\begin{pgfscope}")
+            _writeln(self.fh, r"\begin{pgfscope}")
             self._print_pgf_path_styles(gc, rgbFace)
 
             # combine clip and path for clipping
             self._print_pgf_clip(gc)
             self._print_pgf_path(gc, path, transform, rgbFace)
-            writeln(self.fh, r"\pgfusepath{clip}")
+            _writeln(self.fh, r"\pgfusepath{clip}")
 
             # build pattern definition
-            writeln(self.fh,
-                    r"\pgfsys@defobject{currentpattern}"
-                    r"{\pgfqpoint{0in}{0in}}{\pgfqpoint{1in}{1in}}{")
-            writeln(self.fh, r"\begin{pgfscope}")
-            writeln(self.fh,
-                    r"\pgfpathrectangle"
-                    r"{\pgfqpoint{0in}{0in}}{\pgfqpoint{1in}{1in}}")
-            writeln(self.fh, r"\pgfusepath{clip}")
+            _writeln(self.fh,
+                     r"\pgfsys@defobject{currentpattern}"
+                     r"{\pgfqpoint{0in}{0in}}{\pgfqpoint{1in}{1in}}{")
+            _writeln(self.fh, r"\begin{pgfscope}")
+            _writeln(self.fh,
+                     r"\pgfpathrectangle"
+                     r"{\pgfqpoint{0in}{0in}}{\pgfqpoint{1in}{1in}}")
+            _writeln(self.fh, r"\pgfusepath{clip}")
             scale = mpl.transforms.Affine2D().scale(self.dpi)
             self._print_pgf_path(None, gc.get_hatch_path(), scale)
             self._pgf_path_draw(stroke=True)
-            writeln(self.fh, r"\end{pgfscope}")
-            writeln(self.fh, r"}")
+            _writeln(self.fh, r"\end{pgfscope}")
+            _writeln(self.fh, r"}")
             # repeat pattern, filling the bounding rect of the path
             f = 1. / self.dpi
             (xmin, ymin), (xmax, ymax) = \
@@ -489,16 +488,16 @@ def draw_path(self, gc, path, transform, rgbFace=None):
             xmin, xmax = f * xmin, f * xmax
             ymin, ymax = f * ymin, f * ymax
             repx, repy = math.ceil(xmax - xmin), math.ceil(ymax - ymin)
-            writeln(self.fh,
-                    r"\pgfsys@transformshift{%fin}{%fin}" % (xmin, ymin))
+            _writeln(self.fh,
+                     r"\pgfsys@transformshift{%fin}{%fin}" % (xmin, ymin))
             for iy in range(repy):
                 for ix in range(repx):
-                    writeln(self.fh, r"\pgfsys@useobject{currentpattern}{}")
-                    writeln(self.fh, r"\pgfsys@transformshift{1in}{0in}")
-                writeln(self.fh, r"\pgfsys@transformshift{-%din}{0in}" % repx)
-                writeln(self.fh, r"\pgfsys@transformshift{0in}{1in}")
+                    _writeln(self.fh, r"\pgfsys@useobject{currentpattern}{}")
+                    _writeln(self.fh, r"\pgfsys@transformshift{1in}{0in}")
+                _writeln(self.fh, r"\pgfsys@transformshift{-%din}{0in}" % repx)
+                _writeln(self.fh, r"\pgfsys@transformshift{0in}{1in}")
 
-            writeln(self.fh, r"\end{pgfscope}")
+            _writeln(self.fh, r"\end{pgfscope}")
 
     def _print_pgf_clip(self, gc):
         f = 1. / self.dpi
@@ -508,30 +507,30 @@ def _print_pgf_clip(self, gc):
             p1, p2 = bbox.get_points()
             w, h = p2 - p1
             coords = p1[0] * f, p1[1] * f, w * f, h * f
-            writeln(self.fh,
-                    r"\pgfpathrectangle"
-                    r"{\pgfqpoint{%fin}{%fin}}{\pgfqpoint{%fin}{%fin}}"
-                    % coords)
-            writeln(self.fh, r"\pgfusepath{clip}")
+            _writeln(self.fh,
+                     r"\pgfpathrectangle"
+                     r"{\pgfqpoint{%fin}{%fin}}{\pgfqpoint{%fin}{%fin}}"
+                     % coords)
+            _writeln(self.fh, r"\pgfusepath{clip}")
 
         # check for clip path
         clippath, clippath_trans = gc.get_clip_path()
         if clippath is not None:
             self._print_pgf_path(gc, clippath, clippath_trans)
-            writeln(self.fh, r"\pgfusepath{clip}")
+            _writeln(self.fh, r"\pgfusepath{clip}")
 
     def _print_pgf_path_styles(self, gc, rgbFace):
         # cap style
         capstyles = {"butt": r"\pgfsetbuttcap",
                      "round": r"\pgfsetroundcap",
                      "projecting": r"\pgfsetrectcap"}
-        writeln(self.fh, capstyles[gc.get_capstyle()])
+        _writeln(self.fh, capstyles[gc.get_capstyle()])
 
         # join style
         joinstyles = {"miter": r"\pgfsetmiterjoin",
                       "round": r"\pgfsetroundjoin",
                       "bevel": r"\pgfsetbeveljoin"}
-        writeln(self.fh, joinstyles[gc.get_joinstyle()])
+        _writeln(self.fh, joinstyles[gc.get_joinstyle()])
 
         # filling
         has_fill = rgbFace is not None
@@ -543,73 +542,99 @@ def _print_pgf_path_styles(self, gc, rgbFace):
             fillopacity = rgbFace[3] if has_fill and len(rgbFace) > 3 else 1.0
 
         if has_fill:
-            writeln(self.fh,
-                    r"\definecolor{currentfill}{rgb}{%f,%f,%f}"
-                    % tuple(rgbFace[:3]))
-            writeln(self.fh, r"\pgfsetfillcolor{currentfill}")
+            _writeln(self.fh,
+                     r"\definecolor{currentfill}{rgb}{%f,%f,%f}"
+                     % tuple(rgbFace[:3]))
+            _writeln(self.fh, r"\pgfsetfillcolor{currentfill}")
         if has_fill and fillopacity != 1.0:
-            writeln(self.fh, r"\pgfsetfillopacity{%f}" % fillopacity)
+            _writeln(self.fh, r"\pgfsetfillopacity{%f}" % fillopacity)
 
         # linewidth and color
         lw = gc.get_linewidth() * mpl_pt_to_in * latex_in_to_pt
         stroke_rgba = gc.get_rgb()
-        writeln(self.fh, r"\pgfsetlinewidth{%fpt}" % lw)
-        writeln(self.fh,
-                r"\definecolor{currentstroke}{rgb}{%f,%f,%f}"
-                % stroke_rgba[:3])
-        writeln(self.fh, r"\pgfsetstrokecolor{currentstroke}")
+        _writeln(self.fh, r"\pgfsetlinewidth{%fpt}" % lw)
+        _writeln(self.fh,
+                 r"\definecolor{currentstroke}{rgb}{%f,%f,%f}"
+                 % stroke_rgba[:3])
+        _writeln(self.fh, r"\pgfsetstrokecolor{currentstroke}")
         if strokeopacity != 1.0:
-            writeln(self.fh, r"\pgfsetstrokeopacity{%f}" % strokeopacity)
+            _writeln(self.fh, r"\pgfsetstrokeopacity{%f}" % strokeopacity)
 
         # line style
         dash_offset, dash_list = gc.get_dashes()
         if dash_list is None:
-            writeln(self.fh, r"\pgfsetdash{}{0pt}")
+            _writeln(self.fh, r"\pgfsetdash{}{0pt}")
         else:
-            writeln(self.fh,
-                    r"\pgfsetdash{%s}{%fpt}"
-                    % ("".join(r"{%fpt}" % dash for dash in dash_list),
-                       dash_offset))
+            _writeln(self.fh,
+                     r"\pgfsetdash{%s}{%fpt}"
+                     % ("".join(r"{%fpt}" % dash for dash in dash_list),
+                        dash_offset))
 
     def _print_pgf_path(self, gc, path, transform, rgbFace=None):
         f = 1. / self.dpi
         # check for clip box / ignore clip for filled paths
         bbox = gc.get_clip_rectangle() if gc else None
+        maxcoord = 16383 / 72.27 * self.dpi  # Max dimensions in LaTeX.
         if bbox and (rgbFace is None):
             p1, p2 = bbox.get_points()
-            clip = (p1[0], p1[1], p2[0], p2[1])
+            clip = (max(p1[0], -maxcoord), max(p1[1], -maxcoord),
+                    min(p2[0], maxcoord), min(p2[1], maxcoord))
         else:
-            clip = None
+            clip = (-maxcoord, -maxcoord, maxcoord, maxcoord)
         # build path
         for points, code in path.iter_segments(transform, clip=clip):
             if code == Path.MOVETO:
                 x, y = tuple(points)
-                writeln(self.fh,
-                        r"\pgfpathmoveto{\pgfqpoint{%fin}{%fin}}" %
-                        (f * x, f * y))
+                _writeln(self.fh,
+                         r"\pgfpathmoveto{\pgfqpoint{%fin}{%fin}}" %
+                         (f * x, f * y))
             elif code == Path.CLOSEPOLY:
-                writeln(self.fh, r"\pgfpathclose")
+                _writeln(self.fh, r"\pgfpathclose")
             elif code == Path.LINETO:
                 x, y = tuple(points)
-                writeln(self.fh,
-                        r"\pgfpathlineto{\pgfqpoint{%fin}{%fin}}" %
-                        (f * x, f * y))
+                _writeln(self.fh,
+                         r"\pgfpathlineto{\pgfqpoint{%fin}{%fin}}" %
+                         (f * x, f * y))
             elif code == Path.CURVE3:
                 cx, cy, px, py = tuple(points)
                 coords = cx * f, cy * f, px * f, py * f
-                writeln(self.fh,
-                        r"\pgfpathquadraticcurveto"
-                        r"{\pgfqpoint{%fin}{%fin}}{\pgfqpoint{%fin}{%fin}}"
-                        % coords)
+                _writeln(self.fh,
+                         r"\pgfpathquadraticcurveto"
+                         r"{\pgfqpoint{%fin}{%fin}}{\pgfqpoint{%fin}{%fin}}"
+                         % coords)
             elif code == Path.CURVE4:
                 c1x, c1y, c2x, c2y, px, py = tuple(points)
                 coords = c1x * f, c1y * f, c2x * f, c2y * f, px * f, py * f
-                writeln(self.fh,
-                        r"\pgfpathcurveto"
-                        r"{\pgfqpoint{%fin}{%fin}}"
-                        r"{\pgfqpoint{%fin}{%fin}}"
-                        r"{\pgfqpoint{%fin}{%fin}}"
-                        % coords)
+                _writeln(self.fh,
+                         r"\pgfpathcurveto"
+                         r"{\pgfqpoint{%fin}{%fin}}"
+                         r"{\pgfqpoint{%fin}{%fin}}"
+                         r"{\pgfqpoint{%fin}{%fin}}"
+                         % coords)
+
+        # apply pgf decorators
+        sketch_params = gc.get_sketch_params() if gc else None
+        if sketch_params is not None:
+            # Only "length" directly maps to "segment length" in PGF's API.
+            # PGF uses "amplitude" to pass the combined deviation in both x-
+            # and y-direction, while matplotlib only varies the length of the
+            # wiggle along the line ("randomness" and "length" parameters)
+            # and has a separate "scale" argument for the amplitude.
+            # -> Use "randomness" as PRNG seed to allow the user to force the
+            # same shape on multiple sketched lines
+            scale, length, randomness = sketch_params
+            if scale is not None:
+                # make matplotlib and PGF rendering visually similar
+                length *= 0.5
+                scale *= 2
+                # PGF guarantees that repeated loading is a no-op
+                _writeln(self.fh, r"\usepgfmodule{decorations}")
+                _writeln(self.fh, r"\usepgflibrary{decorations.pathmorphing}")
+                _writeln(self.fh, r"\pgfkeys{/pgf/decoration/.cd, "
+                         f"segment length = {(length * f):f}in, "
+                         f"amplitude = {(scale * f):f}in}}")
+                _writeln(self.fh, f"\\pgfmathsetseed{{{int(randomness)}}}")
+                _writeln(self.fh, r"\pgfdecoratecurrentpath{random steps}")
 
     def _pgf_path_draw(self, stroke=True, fill=False):
         actions = []
@@ -617,7 +642,7 @@ def _pgf_path_draw(self, stroke=True, fill=False):
             actions.append("stroke")
         if fill:
             actions.append("fill")
-        writeln(self.fh, r"\pgfusepath{%s}" % ",".join(actions))
+        _writeln(self.fh, r"\pgfusepath{%s}" % ",".join(actions))
 
     def option_scale_image(self):
         # docstring inherited
@@ -635,9 +660,9 @@ def draw_image(self, gc, x, y, im, transform=None):
             return
 
         if not os.path.exists(getattr(self.fh, "name", "")):
-            _api.warn_external(
+            raise ValueError(
                 "streamed pgf-code does not support raster graphics, consider "
-                "using the pgf-to-pdf option.")
+                "using the pgf-to-pdf option")
 
         # save the images to png files
         path = pathlib.Path(self.fh.name)
@@ -646,29 +671,29 @@ def draw_image(self, gc, x, y, im, transform=None):
         self.image_counter += 1
 
         # reference the image in the pgf picture
-        writeln(self.fh, r"\begin{pgfscope}")
+        _writeln(self.fh, r"\begin{pgfscope}")
         self._print_pgf_clip(gc)
         f = 1. / self.dpi  # from display coords to inch
         if transform is None:
-            writeln(self.fh,
-                    r"\pgfsys@transformshift{%fin}{%fin}" % (x * f, y * f))
+            _writeln(self.fh,
+                     r"\pgfsys@transformshift{%fin}{%fin}" % (x * f, y * f))
             w, h = w * f, h * f
         else:
             tr1, tr2, tr3, tr4, tr5, tr6 = transform.frozen().to_values()
-            writeln(self.fh,
-                    r"\pgfsys@transformcm{%f}{%f}{%f}{%f}{%fin}{%fin}" %
-                    (tr1 * f, tr2 * f, tr3 * f, tr4 * f,
-                     (tr5 + x) * f, (tr6 + y) * f))
+            _writeln(self.fh,
+                     r"\pgfsys@transformcm{%f}{%f}{%f}{%f}{%fin}{%fin}" %
+                     (tr1 * f, tr2 * f, tr3 * f, tr4 * f,
+                      (tr5 + x) * f, (tr6 + y) * f))
             w = h = 1  # scale is already included in the transform
         interp = str(transform is None).lower()  # interpolation in PDF reader
-        writeln(self.fh,
-                r"\pgftext[left,bottom]"
-                r"{%s[interpolate=%s,width=%fin,height=%fin]{%s}}" %
-                (_get_image_inclusion_command(),
-                 interp, w, h, fname_img))
-        writeln(self.fh, r"\end{pgfscope}")
-
-    def draw_tex(self, gc, x, y, s, prop, angle, ismath="TeX!", mtext=None):
+        _writeln(self.fh,
+                 r"\pgftext[left,bottom]"
+                 r"{%s[interpolate=%s,width=%fin,height=%fin]{%s}}" %
+                 (_get_image_inclusion_command(),
+                  interp, w, h, fname_img))
+        _writeln(self.fh, r"\end{pgfscope}")
+
+    def draw_tex(self, gc, x, y, s, prop, angle, ismath="TeX", mtext=None):
         # docstring inherited
         self.draw_text(gc, x, y, s, prop, angle, ismath, mtext)
 
@@ -676,20 +701,18 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
         # docstring inherited
 
         # prepare string for tex
-        s = common_texification(s)
-        prop_cmds = _font_properties_str(prop)
-        s = r"%s %s" % (prop_cmds, s)
+        s = _escape_and_apply_props(s, prop)
 
-        writeln(self.fh, r"\begin{pgfscope}")
+        _writeln(self.fh, r"\begin{pgfscope}")
 
         alpha = gc.get_alpha()
         if alpha != 1.0:
-            writeln(self.fh, r"\pgfsetfillopacity{%f}" % alpha)
-            writeln(self.fh, r"\pgfsetstrokeopacity{%f}" % alpha)
+            _writeln(self.fh, r"\pgfsetfillopacity{%f}" % alpha)
+            _writeln(self.fh, r"\pgfsetstrokeopacity{%f}" % alpha)
         rgb = tuple(gc.get_rgb())[:3]
-        writeln(self.fh, r"\definecolor{textcolor}{rgb}{%f,%f,%f}" % rgb)
-        writeln(self.fh, r"\pgfsetstrokecolor{textcolor}")
-        writeln(self.fh, r"\pgfsetfillcolor{textcolor}")
+        _writeln(self.fh, r"\definecolor{textcolor}{rgb}{%f,%f,%f}" % rgb)
+        _writeln(self.fh, r"\pgfsetstrokecolor{textcolor}")
+        _writeln(self.fh, r"\pgfsetfillcolor{textcolor}")
         s = r"\color{textcolor}" + s
 
         dpi = self.figure.dpi
@@ -718,15 +741,11 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
         if angle != 0:
             text_args.append("rotate=%f" % angle)
 
-        writeln(self.fh, r"\pgftext[%s]{%s}" % (",".join(text_args), s))
-        writeln(self.fh, r"\end{pgfscope}")
+        _writeln(self.fh, r"\pgftext[%s]{%s}" % (",".join(text_args), s))
+        _writeln(self.fh, r"\end{pgfscope}")
 
     def get_text_width_height_descent(self, s, prop, ismath):
         # docstring inherited
-
-        # check if the math is supposed to be displaystyled
-        s = common_texification(s)
-
         # get text metrics in units of latex pt, convert to display units
         w, h, d = (LatexManager._get_cached_or_new()
                    .get_width_height_descent(s, prop))
@@ -750,36 +769,6 @@ def points_to_pixels(self, points):
         return points * mpl_pt_to_in * self.dpi
 
 
-@_api.deprecated("3.3", alternative="GraphicsContextBase")
-class GraphicsContextPgf(GraphicsContextBase):
-    pass
-
-
-@_api.deprecated("3.4")
-class TmpDirCleaner:
-    _remaining_tmpdirs = set()
-
-    @_api.classproperty
-    @_api.deprecated("3.4")
-    def remaining_tmpdirs(cls):
-        return cls._remaining_tmpdirs
-
-    @staticmethod
-    @_api.deprecated("3.4")
-    def add(tmpdir):
-        TmpDirCleaner._remaining_tmpdirs.add(tmpdir)
-
-    @staticmethod
-    @_api.deprecated("3.4")
-    @atexit.register
-    def cleanup_remaining_tmpdirs():
-        for tmpdir in TmpDirCleaner._remaining_tmpdirs:
-            error_message = "error deleting tmp directory {}".format(tmpdir)
-            shutil.rmtree(
-                tmpdir,
-                onerror=lambda *args: _log.error(error_message))
-
-
 class FigureCanvasPgf(FigureCanvasBase):
     filetypes = {"pgf": "LaTeX PGF picture",
                  "pdf": "LaTeX compiled PGF picture",
@@ -788,7 +777,6 @@ class FigureCanvasPgf(FigureCanvasBase):
     def get_default_filetype(self):
         return 'pdf'
 
-    @_check_savefig_extra_args
     def _print_pgf_to_fh(self, fh, *, bbox_inches_restore=None):
 
         header_text = """%% Creator: Matplotlib, PGF backend
@@ -799,6 +787,10 @@ def _print_pgf_to_fh(self, fh, *, bbox_inches_restore=None):
 %% Make sure the required packages are loaded in your preamble
 %%   \\usepackage{pgf}
 %%
+%% Also ensure that all the required font packages are loaded; for instance,
+%% the lmodern package is sometimes necessary when using math font.
+%%   \\usepackage{lmodern}
+%%
 %% Figures using additional raster images can only be included by \\input if
 %% they are in the same directory as the main LaTeX file. For loading figures
 %% from other directories you can use the `import` package
@@ -811,39 +803,37 @@ def _print_pgf_to_fh(self, fh, *, bbox_inches_restore=None):
 
         # append the preamble used by the backend as a comment for debugging
         header_info_preamble = ["%% Matplotlib used the following preamble"]
-        for line in get_preamble().splitlines():
-            header_info_preamble.append("%%   " + line)
-        for line in get_fontspec().splitlines():
+        for line in _get_preamble().splitlines():
             header_info_preamble.append("%%   " + line)
         header_info_preamble.append("%%")
         header_info_preamble = "\n".join(header_info_preamble)
 
         # get figure size in inch
         w, h = self.figure.get_figwidth(), self.figure.get_figheight()
-        dpi = self.figure.get_dpi()
+        dpi = self.figure.dpi
 
         # create pgfpicture environment and write the pgf code
         fh.write(header_text)
         fh.write(header_info_preamble)
         fh.write("\n")
-        writeln(fh, r"\begingroup")
-        writeln(fh, r"\makeatletter")
-        writeln(fh, r"\begin{pgfpicture}")
-        writeln(fh,
-                r"\pgfpathrectangle{\pgfpointorigin}{\pgfqpoint{%fin}{%fin}}"
-                % (w, h))
-        writeln(fh, r"\pgfusepath{use as bounding box, clip}")
+        _writeln(fh, r"\begingroup")
+        _writeln(fh, r"\makeatletter")
+        _writeln(fh, r"\begin{pgfpicture}")
+        _writeln(fh,
+                 r"\pgfpathrectangle{\pgfpointorigin}{\pgfqpoint{%fin}{%fin}}"
+                 % (w, h))
+        _writeln(fh, r"\pgfusepath{use as bounding box, clip}")
         renderer = MixedModeRenderer(self.figure, w, h, dpi,
                                      RendererPgf(self.figure, fh),
                                      bbox_inches_restore=bbox_inches_restore)
         self.figure.draw(renderer)
 
         # end the pgfpicture environment
-        writeln(fh, r"\end{pgfpicture}")
-        writeln(fh, r"\makeatother")
-        writeln(fh, r"\endgroup")
+        _writeln(fh, r"\end{pgfpicture}")
+        _writeln(fh, r"\makeatother")
+        _writeln(fh, r"\endgroup")
 
-    def print_pgf(self, fname_or_fh, *args, **kwargs):
+    def print_pgf(self, fname_or_fh, **kwargs):
         """
         Output pgf macros for drawing the figure so it can be included and
         rendered in latex documents.
@@ -851,54 +841,49 @@ def print_pgf(self, fname_or_fh, *args, **kwargs):
         with cbook.open_file_cm(fname_or_fh, "w", encoding="utf-8") as file:
             if not cbook.file_requires_unicode(file):
                 file = codecs.getwriter("utf-8")(file)
-            self._print_pgf_to_fh(file, *args, **kwargs)
+            self._print_pgf_to_fh(file, **kwargs)
 
-    def print_pdf(self, fname_or_fh, *args, metadata=None, **kwargs):
+    def print_pdf(self, fname_or_fh, *, metadata=None, **kwargs):
         """Use LaTeX to compile a pgf generated figure to pdf."""
-        w, h = self.figure.get_figwidth(), self.figure.get_figheight()
+        w, h = self.figure.get_size_inches()
 
         info_dict = _create_pdf_info_dict('pgf', metadata or {})
-        hyperref_options = ','.join(
+        pdfinfo = ','.join(
             _metadata_to_str(k, v) for k, v in info_dict.items())
 
+        # print figure to pgf and compile it with latex
         with TemporaryDirectory() as tmpdir:
             tmppath = pathlib.Path(tmpdir)
-
-            # print figure to pgf and compile it with latex
-            self.print_pgf(tmppath / "figure.pgf", *args, **kwargs)
-
-            latexcode = """
-\\PassOptionsToPackage{pdfinfo={%s}}{hyperref}
-\\RequirePackage{hyperref}
-\\documentclass[12pt]{minimal}
-\\usepackage[paperwidth=%fin, paperheight=%fin, margin=0in]{geometry}
-%s
-%s
-\\usepackage{pgf}
-
-\\begin{document}
-\\centering
-\\input{figure.pgf}
-\\end{document}""" % (hyperref_options, w, h, get_preamble(), get_fontspec())
-            (tmppath / "figure.tex").write_text(latexcode, encoding="utf-8")
-
+            self.print_pgf(tmppath / "figure.pgf", **kwargs)
+            (tmppath / "figure.tex").write_text(
+                "\n".join([
+                    r"\documentclass[12pt]{article}",
+                    r"\usepackage[pdfinfo={%s}]{hyperref}" % pdfinfo,
+                    r"\usepackage[papersize={%fin,%fin}, margin=0in]{geometry}"
+                    % (w, h),
+                    r"\usepackage{pgf}",
+                    _get_preamble(),
+                    r"\begin{document}",
+                    r"\centering",
+                    r"\input{figure.pgf}",
+                    r"\end{document}",
+                ]), encoding="utf-8")
             texcommand = mpl.rcParams["pgf.texsystem"]
             cbook._check_and_log_subprocess(
                 [texcommand, "-interaction=nonstopmode", "-halt-on-error",
                  "figure.tex"], _log, cwd=tmpdir)
-
             with (tmppath / "figure.pdf").open("rb") as orig, \
                  cbook.open_file_cm(fname_or_fh, "wb") as dest:
                 shutil.copyfileobj(orig, dest)  # copy file contents to target
 
-    def print_png(self, fname_or_fh, *args, **kwargs):
+    def print_png(self, fname_or_fh, **kwargs):
         """Use LaTeX to compile a pgf figure to pdf and convert it to png."""
         converter = make_pdf_to_png_converter()
         with TemporaryDirectory() as tmpdir:
             tmppath = pathlib.Path(tmpdir)
             pdf_path = tmppath / "figure.pdf"
             png_path = tmppath / "figure.png"
-            self.print_pdf(pdf_path, *args, **kwargs)
+            self.print_pdf(pdf_path, **kwargs)
             converter(pdf_path, png_path, dpi=self.figure.dpi)
             with png_path.open("rb") as orig, \
                  cbook.open_file_cm(fname_or_fh, "wb") as dest:
@@ -908,7 +893,7 @@ def get_renderer(self):
         return RendererPgf(self.figure, None)
 
     def draw(self):
-        _no_output_draw(self.figure)
+        self.figure.draw_without_rendering()
         return super().draw()
 
 
@@ -943,7 +928,6 @@ class PdfPages:
         '_info_dict',
         '_metadata',
     )
-    metadata = _api.deprecated('3.3')(property(lambda self: self._metadata))
 
     def __init__(self, filename, *, keep_empty=True, metadata=None):
         """
@@ -968,58 +952,30 @@ def __init__(self, filename, *, keep_empty=True, metadata=None):
             'Creator', 'Producer', 'CreationDate', 'ModDate', and
             'Trapped'. Values have been predefined for 'Creator', 'Producer'
             and 'CreationDate'. They can be removed by setting them to `None`.
+
+            Note that some versions of LaTeX engines may ignore the 'Producer'
+            key and set it to themselves.
         """
         self._output_name = filename
         self._n_figures = 0
         self.keep_empty = keep_empty
         self._metadata = (metadata or {}).copy()
-        if metadata:
-            for key in metadata:
-                canonical = {
-                    'creationdate': 'CreationDate',
-                    'moddate': 'ModDate',
-                }.get(key.lower(), key.lower().title())
-                if canonical != key:
-                    _api.warn_deprecated(
-                        '3.3', message='Support for setting PDF metadata keys '
-                        'case-insensitively is deprecated since %(since)s and '
-                        'will be removed %(removal)s; '
-                        f'set {canonical} instead of {key}.')
-                    self._metadata[canonical] = self._metadata.pop(key)
         self._info_dict = _create_pdf_info_dict('pgf', self._metadata)
         self._file = BytesIO()
 
     def _write_header(self, width_inches, height_inches):
-        hyperref_options = ','.join(
+        pdfinfo = ','.join(
             _metadata_to_str(k, v) for k, v in self._info_dict.items())
-
-        latex_preamble = get_preamble()
-        latex_fontspec = get_fontspec()
-        latex_header = r"""\PassOptionsToPackage{{
-  pdfinfo={{
-    {metadata}
-  }}
-}}{{hyperref}}
-\RequirePackage{{hyperref}}
-\documentclass[12pt]{{minimal}}
-\usepackage[
-    paperwidth={width}in,
-    paperheight={height}in,
-    margin=0in
-]{{geometry}}
-{preamble}
-{fontspec}
-\usepackage{{pgf}}
-\setlength{{\parindent}}{{0pt}}
-
-\begin{{document}}%%
-""".format(
-            width=width_inches,
-            height=height_inches,
-            preamble=latex_preamble,
-            fontspec=latex_fontspec,
-            metadata=hyperref_options,
-        )
+        latex_header = "\n".join([
+            r"\documentclass[12pt]{article}",
+            r"\usepackage[pdfinfo={%s}]{hyperref}" % pdfinfo,
+            r"\usepackage[papersize={%fin,%fin}, margin=0in]{geometry}"
+            % (width_inches, height_inches),
+            r"\usepackage{pgf}",
+            _get_preamble(),
+            r"\setlength{\parindent}{0pt}",
+            r"\begin{document}%",
+        ])
         self._file.write(latex_header.encode('utf-8'))
 
     def __enter__(self):
@@ -1059,11 +1015,8 @@ def savefig(self, figure=None, **kwargs):
 
         Parameters
         ----------
-        figure : `.Figure` or int, optional
-            Specifies what figure is saved to file. If not specified, the
-            active figure is saved. If a `.Figure` instance is provided, this
-            figure is saved. If an int is specified, the figure instance to
-            save is looked up by number.
+        figure : `.Figure` or int, default: the active figure
+            The figure, or index of the figure, that is saved to the file.
         """
         if not isinstance(figure, Figure):
             if figure is None:
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
index 5dbc841adc92..629f0133ed52 100644
--- a/lib/matplotlib/backends/backend_ps.py
+++ b/lib/matplotlib/backends/backend_ps.py
@@ -2,12 +2,12 @@
 A PostScript backend, which can produce both PostScript .ps and .eps.
 """
 
+import codecs
 import datetime
 from enum import Enum
-import glob
-from io import StringIO, TextIOWrapper
+import functools
+from io import StringIO
 import logging
-import math
 import os
 import pathlib
 import re
@@ -18,17 +18,14 @@
 import numpy as np
 
 import matplotlib as mpl
-from matplotlib import _api, cbook, _path
-from matplotlib import _text_layout
-from matplotlib.afm import AFM
+from matplotlib import _api, cbook, _path, _text_helpers
+from matplotlib._afm import AFM
 from matplotlib.backend_bases import (
-    _Backend, _check_savefig_extra_args, FigureCanvasBase, FigureManagerBase,
-    GraphicsContextBase, RendererBase, _no_output_draw)
+    _Backend, FigureCanvasBase, FigureManagerBase, RendererBase)
 from matplotlib.cbook import is_writable_file_like, file_requires_unicode
 from matplotlib.font_manager import get_font
-from matplotlib.ft2font import LOAD_NO_HINTING, LOAD_NO_SCALE
+from matplotlib.ft2font import LOAD_NO_SCALE, FT2Font
 from matplotlib._ttconv import convert_ttf_to_ps
-from matplotlib.mathtext import MathTextParser
 from matplotlib._mathtext_data import uni2type1
 from matplotlib.path import Path
 from matplotlib.texmanager import TexManager
@@ -36,11 +33,9 @@
 from matplotlib.backends.backend_mixed import MixedModeRenderer
 from . import _backend_pdf_ps
 
-_log = logging.getLogger(__name__)
-
-backend_version = 'Level II'
 
-debugPS = 0
+_log = logging.getLogger(__name__)
+debugPS = False
 
 
 class PsBackendHelper:
@@ -62,9 +57,9 @@ def __init__(self):
              'a5': (5.83, 8.27),
              'a6': (4.13, 5.83),
              'a7': (2.91, 4.13),
-             'a8': (2.07, 2.91),
-             'a9': (1.457, 2.05),
-             'a10': (1.02, 1.457),
+             'a8': (2.05, 2.91),
+             'a9': (1.46, 2.05),
+             'a10': (1.02, 1.46),
              'b0': (40.55, 57.32),
              'b1': (28.66, 40.55),
              'b2': (20.27, 28.66),
@@ -87,24 +82,11 @@ def _get_papertype(w, h):
     return 'a0'
 
 
-def _num_to_str(val):
-    if isinstance(val, str):
-        return val
-
-    ival = int(val)
-    if val == ival:
-        return str(ival)
-
-    s = "%1.3f" % val
-    s = s.rstrip("0")
-    s = s.rstrip(".")
-    return s
-
-
 def _nums_to_str(*args):
-    return ' '.join(map(_num_to_str, args))
+    return " ".join(f"{arg:1.3f}".rstrip("0").rstrip(".") for arg in args)
 
 
+@_api.deprecated("3.6", alternative="a vendored copy of this function")
 def quote_ps_string(s):
     """
     Quote dangerous characters of S for use in a PostScript string constant.
@@ -134,16 +116,16 @@ def _move_path_to_path_or_stream(src, dst):
         shutil.move(src, dst, copy_function=shutil.copyfile)
 
 
-def _font_to_ps_type3(font_path, glyph_ids):
+def _font_to_ps_type3(font_path, chars):
     """
-    Subset *glyph_ids* from the font at *font_path* into a Type 3 font.
+    Subset *chars* from the font at *font_path* into a Type 3 font.
 
     Parameters
     ----------
     font_path : path-like
         Path to the font to be subsetted.
-    glyph_ids : list of int
-        The glyph indices to include in the subsetted font.
+    chars : str
+        The characters to include in the subsetted font.
 
     Returns
     -------
@@ -152,6 +134,7 @@ def _font_to_ps_type3(font_path, glyph_ids):
         verbatim into a PostScript file.
     """
     font = get_font(font_path, hinting_factor=1)
+    glyph_ids = [font.get_char_index(c) for c in chars]
 
     preamble = """\
 %!PS-Adobe-3.0 Resource-Font
@@ -180,12 +163,12 @@ def _font_to_ps_type3(font_path, glyph_ids):
  2 copy known not {pop /.notdef} if
  true 3 1 roll get exec
  end
-} d
+} _d
 
 /BuildChar {
  1 index /Encoding get exch get
  1 index /BuildGlyph get exec
-} d
+} _d
 
 FontName currentdict end definefont pop
 """
@@ -208,12 +191,64 @@ def _font_to_ps_type3(font_path, glyph_ids):
                 # decomposer always explicitly moving to the closing point
                 # first).
                 [b"m", b"l", b"", b"c", b""], True).decode("ascii")
-            + "ce} d"
+            + "ce} _d"
         )
 
     return preamble + "\n".join(entries) + postamble
 
 
+def _font_to_ps_type42(font_path, chars, fh):
+    """
+    Subset *chars* from the font at *font_path* into a Type 42 font at *fh*.
+
+    Parameters
+    ----------
+    font_path : path-like
+        Path to the font to be subsetted.
+    chars : str
+        The characters to include in the subsetted font.
+    fh : file-like
+        Where to write the font.
+    """
+    subset_str = ''.join(chr(c) for c in chars)
+    _log.debug("SUBSET %s characters: %s", font_path, subset_str)
+    try:
+        fontdata = _backend_pdf_ps.get_glyphs_subset(font_path, subset_str)
+        _log.debug("SUBSET %s %d -> %d", font_path, os.stat(font_path).st_size,
+                   fontdata.getbuffer().nbytes)
+
+        # Give ttconv a subsetted font along with updated glyph_ids.
+        font = FT2Font(fontdata)
+        glyph_ids = [font.get_char_index(c) for c in chars]
+        with TemporaryDirectory() as tmpdir:
+            tmpfile = os.path.join(tmpdir, "tmp.ttf")
+
+            with open(tmpfile, 'wb') as tmp:
+                tmp.write(fontdata.getvalue())
+
+            # TODO: allow convert_ttf_to_ps to input file objects (BytesIO)
+            convert_ttf_to_ps(os.fsencode(tmpfile), fh, 42, glyph_ids)
+    except RuntimeError:
+        _log.warning(
+            "The PostScript backend does not currently "
+            "support the selected font.")
+        raise
+
+
+def _log_if_debug_on(meth):
+    """
+    Wrap `RendererPS` method *meth* to emit a PS comment with the method name,
+    if the global flag `debugPS` is set.
+    """
+    @functools.wraps(meth)
+    def wrapper(self, *args, **kwargs):
+        if debugPS:
+            self._pswriter.write(f"% {meth.__name__}\n")
+        return meth(self, *args, **kwargs)
+
+    return wrapper
+
+
 class RendererPS(_backend_pdf_ps.RendererPDFPSBase):
     """
     The renderer handles all the drawing primitives using a graphics
@@ -223,11 +258,6 @@ class RendererPS(_backend_pdf_ps.RendererPDFPSBase):
     _afm_font_dir = cbook._get_data_path("fonts/afm")
     _use_afm_rc_name = "ps.useafm"
 
-    mathtext_parser = _api.deprecated("3.4")(property(
-        lambda self: MathTextParser("PS")))
-    used_characters = _api.deprecated("3.3")(property(
-        lambda self: self._character_tracker.used_characters))
-
     def __init__(self, width, height, pswriter, imagedpi=72):
         # Although postscript itself is dpi independent, we need to inform the
         # image code about a requested dpi to generate high resolution images
@@ -253,23 +283,27 @@ def __init__(self, width, height, pswriter, imagedpi=72):
         self._path_collection_id = 0
 
         self._character_tracker = _backend_pdf_ps.CharacterTracker()
-
-    @_api.deprecated("3.3")
-    def track_characters(self, *args, **kwargs):
-        """Keep track of which characters are required from each font."""
-        self._character_tracker.track(*args, **kwargs)
-
-    @_api.deprecated("3.3")
-    def merge_used_characters(self, *args, **kwargs):
-        self._character_tracker.merge(*args, **kwargs)
+        self._logwarn_once = functools.lru_cache(None)(_log.warning)
+
+    def _is_transparent(self, rgb_or_rgba):
+        if rgb_or_rgba is None:
+            return True  # Consistent with rgbFace semantics.
+        elif len(rgb_or_rgba) == 4:
+            if rgb_or_rgba[3] == 0:
+                return True
+            if rgb_or_rgba[3] != 1:
+                self._logwarn_once(
+                    "The PostScript backend does not support transparency; "
+                    "partially transparent artists will be rendered opaque.")
+            return False
+        else:  # len() == 3.
+            return False
 
     def set_color(self, r, g, b, store=True):
         if (r, g, b) != self.color:
-            if r == g and r == b:
-                self._pswriter.write("%1.3f setgray\n" % r)
-            else:
-                self._pswriter.write(
-                    "%1.3f %1.3f %1.3f setrgbcolor\n" % (r, g, b))
+            self._pswriter.write(f"{r:1.3f} setgray\n"
+                                 if r == g == b else
+                                 f"{r:1.3f} {g:1.3f} {b:1.3f} setrgbcolor\n")
             if store:
                 self.color = (r, g, b)
 
@@ -312,11 +346,10 @@ def set_linedash(self, offset, seq, store=True):
             if np.array_equal(seq, oldseq) and oldo == offset:
                 return
 
-        if seq is not None and len(seq):
-            s = "[%s] %d setdash\n" % (_nums_to_str(*seq), offset)
-            self._pswriter.write(s)
-        else:
-            self._pswriter.write("[] 0 setdash\n")
+        self._pswriter.write(f"[{_nums_to_str(*seq)}]"
+                             f" {_nums_to_str(offset)} setdash\n"
+                             if seq is not None and len(seq) else
+                             "[] 0 setdash\n")
         if store:
             self.linedash = (offset, seq)
 
@@ -344,7 +377,7 @@ def create_hatch(self, hatch):
 
      /PaintProc {{
         pop
-        {linewidth:f} setlinewidth
+        {linewidth:g} setlinewidth
 {self._convert_path(
     Path.hatch(hatch), Affine2D().scale(sidelen), simplify=False)}
         gsave
@@ -354,7 +387,7 @@ def create_hatch(self, hatch):
      }} bind
    >>
    matrix
-   0.0 {pageheight:f} translate
+   0 {pageheight:g} translate
    makepattern
    /{name} exch def
 """)
@@ -388,7 +421,7 @@ def _get_clip_cmd(self, gc):
             key = (path, id(trf))
             custom_clip_cmd = self._clip_paths.get(key)
             if custom_clip_cmd is None:
-                custom_clip_cmd = "c%x" % len(self._clip_paths)
+                custom_clip_cmd = "c%d" % len(self._clip_paths)
                 self._pswriter.write(f"""\
 /{custom_clip_cmd} {{
 {self._convert_path(path, trf, simplify=False)}
@@ -400,23 +433,14 @@ def _get_clip_cmd(self, gc):
             clip.append(f"{custom_clip_cmd}\n")
         return "".join(clip)
 
+    @_log_if_debug_on
     def draw_image(self, gc, x, y, im, transform=None):
         # docstring inherited
 
         h, w = im.shape[:2]
         imagecmd = "false 3 colorimage"
         data = im[::-1, :, :3]  # Vertically flipped rgb values.
-        # data.tobytes().hex() has no spaces, so can be linewrapped by simply
-        # splitting data every nchars. It's equivalent to textwrap.fill only
-        # much faster.
-        nchars = 128
-        data = data.tobytes().hex()
-        hexlines = "\n".join(
-            [
-                data[n * nchars:(n + 1) * nchars]
-                for n in range(math.ceil(len(data) / nchars))
-            ]
-        )
+        hexdata = data.tobytes().hex("\n", -64)  # Linewrap to 128 chars.
 
         if transform is None:
             matrix = "1 0 0 1 0 0"
@@ -430,18 +454,19 @@ def draw_image(self, gc, x, y, im, transform=None):
         self._pswriter.write(f"""\
 gsave
 {self._get_clip_cmd(gc)}
-{x:f} {y:f} translate
+{x:g} {y:g} translate
 [{matrix}] concat
-{xscale:f} {yscale:f} scale
+{xscale:g} {yscale:g} scale
 /DataString {w:d} string def
 {w:d} {h:d} 8 [ {w:d} 0 0 -{h:d} 0 {h:d} ]
 {{
 currentfile DataString readhexstring pop
 }} bind {imagecmd}
-{hexlines}
+{hexdata}
 grestore
 """)
 
+    @_log_if_debug_on
     def draw_path(self, gc, path, transform, rgbFace=None):
         # docstring inherited
         clip = rgbFace is None and gc.get_hatch_path() is None
@@ -449,16 +474,14 @@ def draw_path(self, gc, path, transform, rgbFace=None):
         ps = self._convert_path(path, transform, clip=clip, simplify=simplify)
         self._draw_ps(ps, gc, rgbFace)
 
+    @_log_if_debug_on
     def draw_markers(
             self, gc, marker_path, marker_trans, path, trans, rgbFace=None):
         # docstring inherited
 
-        if debugPS:
-            self._pswriter.write('% draw_markers \n')
-
         ps_color = (
             None
-            if _is_transparent(rgbFace)
+            if self._is_transparent(rgbFace)
             else '%1.3f setgray' % rgbFace[0]
             if rgbFace[0] == rgbFace[1] == rgbFace[2]
             else '%1.3f %1.3f %1.3f setrgbcolor' % rgbFace[:3])
@@ -504,8 +527,9 @@ def draw_markers(
         ps = '\n'.join(ps_cmd)
         self._draw_ps(ps, gc, rgbFace, fill=False, stroke=False)
 
+    @_log_if_debug_on
     def draw_path_collection(self, gc, master_transform, paths, all_transforms,
-                             offsets, offsetTrans, facecolors, edgecolors,
+                             offsets, offset_trans, facecolors, edgecolors,
                              linewidths, linestyles, antialiaseds, urls,
                              offset_position):
         # Is the optimization worth it? Rough calculation:
@@ -521,14 +545,14 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
         if not should_do_optimization:
             return RendererBase.draw_path_collection(
                 self, gc, master_transform, paths, all_transforms,
-                offsets, offsetTrans, facecolors, edgecolors,
+                offsets, offset_trans, facecolors, edgecolors,
                 linewidths, linestyles, antialiaseds, urls,
                 offset_position)
 
         path_codes = []
         for i, (path, transform) in enumerate(self._iter_collection_raw_paths(
                 master_transform, paths, all_transforms)):
-            name = 'p%x_%x' % (self._path_collection_id, i)
+            name = 'p%d_%d' % (self._path_collection_id, i)
             path_bytes = self._convert_path(path, transform, simplify=False)
             self._pswriter.write(f"""\
 /{name} {{
@@ -540,19 +564,22 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
             path_codes.append(name)
 
         for xo, yo, path_id, gc0, rgbFace in self._iter_collection(
-                gc, master_transform, all_transforms, path_codes, offsets,
-                offsetTrans, facecolors, edgecolors, linewidths, linestyles,
+                gc, path_codes, offsets, offset_trans,
+                facecolors, edgecolors, linewidths, linestyles,
                 antialiaseds, urls, offset_position):
             ps = "%g %g %s" % (xo, yo, path_id)
             self._draw_ps(ps, gc0, rgbFace)
 
         self._path_collection_id += 1
 
-    @_api.delete_parameter("3.3", "ismath")
-    def draw_tex(self, gc, x, y, s, prop, angle, ismath='TeX!', mtext=None):
+    @_log_if_debug_on
+    def draw_tex(self, gc, x, y, s, prop, angle, *, mtext=None):
         # docstring inherited
+        if self._is_transparent(gc.get_rgb()):
+            return  # Special handling for fully transparent.
+
         if not hasattr(self, "psfrag"):
-            _log.warning(
+            self._logwarn_once(
                 "The PS backend determines usetex status solely based on "
                 "rcParams['text.usetex'] and does not support having "
                 "usetex=True only for some elements; this element will thus "
@@ -570,19 +597,11 @@ def draw_tex(self, gc, x, y, s, prop, angle, ismath='TeX!', mtext=None):
         s = fontcmd % s
         tex = r'\color[rgb]{%s} %s' % (color, s)
 
-        corr = 0  # w/2*(fontsize-10)/10
-        if dict.__getitem__(mpl.rcParams, 'text.latex.preview'):
-            # use baseline alignment!
-            pos = _nums_to_str(x-corr, y)
-            self.psfrag.append(
-                r'\psfrag{%s}[Bl][Bl][1][%f]{\fontsize{%f}{%f}%s}' % (
-                    thetext, angle, fontsize, fontsize*1.25, tex))
-        else:
-            # Stick to the bottom alignment.
-            pos = _nums_to_str(x-corr, y-bl)
-            self.psfrag.append(
-                r'\psfrag{%s}[bl][bl][1][%f]{\fontsize{%f}{%f}%s}' % (
-                    thetext, angle, fontsize, fontsize*1.25, tex))
+        # Stick to the bottom alignment.
+        pos = _nums_to_str(x, y-bl)
+        self.psfrag.append(
+            r'\psfrag{%s}[bl][bl][1][%f]{\fontsize{%f}{%f}%s}' % (
+                thetext, angle, fontsize, fontsize*1.25, tex))
 
         self._pswriter.write(f"""\
 gsave
@@ -593,13 +612,11 @@ def draw_tex(self, gc, x, y, s, prop, angle, ismath='TeX!', mtext=None):
 """)
         self.textcnt += 1
 
+    @_log_if_debug_on
     def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
         # docstring inherited
 
-        if debugPS:
-            self._pswriter.write("% text\n")
-
-        if _is_transparent(gc.get_rgb()):
+        if self._is_transparent(gc.get_rgb()):
             return  # Special handling for fully transparent.
 
         if ismath == 'TeX':
@@ -611,7 +628,7 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
         if mpl.rcParams['ps.useafm']:
             font = self._get_font_afm(prop)
             scale = 0.001 * prop.get_size_in_points()
-
+            stream = []
             thisx = 0
             last_name = None  # kerns returns 0 for None.
             xs_names = []
@@ -627,64 +644,78 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
                 thisx += kern * scale
                 xs_names.append((thisx, name))
                 thisx += width * scale
+            ps_name = (font.postscript_name
+                       .encode("ascii", "replace").decode("ascii"))
+            stream.append((ps_name, xs_names))
 
         else:
             font = self._get_font_ttf(prop)
-            font.set_text(s, 0, flags=LOAD_NO_HINTING)
             self._character_tracker.track(font, s)
-            xs_names = [(item.x, font.get_glyph_name(item.glyph_idx))
-                        for item in _text_layout.layout(s, font)]
+            stream = []
+            prev_font = curr_stream = None
+            for item in _text_helpers.layout(s, font):
+                ps_name = (item.ft_object.postscript_name
+                           .encode("ascii", "replace").decode("ascii"))
+                if item.ft_object is not prev_font:
+                    if curr_stream:
+                        stream.append(curr_stream)
+                    prev_font = item.ft_object
+                    curr_stream = [ps_name, []]
+                curr_stream[1].append(
+                    (item.x, item.ft_object.get_glyph_name(item.glyph_idx))
+                )
+            # append the last entry if exists
+            if curr_stream:
+                stream.append(curr_stream)
 
         self.set_color(*gc.get_rgb())
-        ps_name = (font.postscript_name
-                   .encode("ascii", "replace").decode("ascii"))
-        self.set_font(ps_name, prop.get_size_in_points())
-        thetext = "\n".join(f"{x:f} 0 m /{name:s} glyphshow"
-                            for x, name in xs_names)
-        self._pswriter.write(f"""\
+
+        for ps_name, xs_names in stream:
+            self.set_font(ps_name, prop.get_size_in_points(), False)
+            thetext = "\n".join(f"{x:g} 0 m /{name:s} glyphshow"
+                                for x, name in xs_names)
+            self._pswriter.write(f"""\
 gsave
 {self._get_clip_cmd(gc)}
-{x:f} {y:f} translate
-{angle:f} rotate
+{x:g} {y:g} translate
+{angle:g} rotate
 {thetext}
 grestore
 """)
 
+    @_log_if_debug_on
     def draw_mathtext(self, gc, x, y, s, prop, angle):
         """Draw the math text using matplotlib.mathtext."""
-        if debugPS:
-            self._pswriter.write("% mathtext\n")
-
         width, height, descent, glyphs, rects = \
-            self._text2path.mathtext_parser.parse(
-                s, 72, prop,
-                _force_standard_ps_fonts=mpl.rcParams["ps.useafm"])
+            self._text2path.mathtext_parser.parse(s, 72, prop)
         self.set_color(*gc.get_rgb())
         self._pswriter.write(
             f"gsave\n"
-            f"{x:f} {y:f} translate\n"
-            f"{angle:f} rotate\n")
+            f"{x:g} {y:g} translate\n"
+            f"{angle:g} rotate\n")
         lastfont = None
         for font, fontsize, num, ox, oy in glyphs:
-            self._character_tracker.track(font, chr(num))
+            self._character_tracker.track_glyph(font, num)
             if (font.postscript_name, fontsize) != lastfont:
                 lastfont = font.postscript_name, fontsize
                 self._pswriter.write(
                     f"/{font.postscript_name} {fontsize} selectfont\n")
-            symbol_name = (
+            glyph_name = (
                 font.get_name_char(chr(num)) if isinstance(font, AFM) else
                 font.get_glyph_name(font.get_char_index(num)))
             self._pswriter.write(
-                f"{ox:f} {oy:f} moveto\n"
-                f"/{symbol_name} glyphshow\n")
+                f"{ox:g} {oy:g} moveto\n"
+                f"/{glyph_name} glyphshow\n")
         for ox, oy, w, h in rects:
             self._pswriter.write(f"{ox} {oy} {w} {h} rectfill\n")
         self._pswriter.write("grestore\n")
 
+    @_log_if_debug_on
     def draw_gouraud_triangle(self, gc, points, colors, trans):
         self.draw_gouraud_triangles(gc, points.reshape((1, 3, 2)),
                                     colors.reshape((1, 3, 4)), trans)
 
+    @_log_if_debug_on
     def draw_gouraud_triangles(self, gc, points, colors, trans):
         assert len(points) == len(colors)
         assert points.ndim == 3
@@ -705,13 +736,13 @@ def draw_gouraud_triangles(self, gc, points, colors, trans):
         xmin, ymin = points_min
         xmax, ymax = points_max
 
-        streamarr = np.empty(
+        data = np.empty(
             shape[0] * shape[1],
             dtype=[('flags', 'u1'), ('points', '2>u4'), ('colors', '3u1')])
-        streamarr['flags'] = 0
-        streamarr['points'] = (flat_points - points_min) * factor
-        streamarr['colors'] = flat_colors[:, :3] * 255.0
-        stream = quote_ps_string(streamarr.tobytes())
+        data['flags'] = 0
+        data['points'] = (flat_points - points_min) * factor
+        data['colors'] = flat_colors[:, :3] * 255.0
+        hexdata = data.tobytes().hex("\n", -64)  # Linewrap to 128 chars.
 
         self._pswriter.write(f"""\
 gsave
@@ -721,32 +752,30 @@ def draw_gouraud_triangles(self, gc, points, colors, trans):
    /BitsPerComponent 8
    /BitsPerFlag 8
    /AntiAlias true
-   /Decode [ {xmin:f} {xmax:f} {ymin:f} {ymax:f} 0 1 0 1 0 1 ]
-   /DataSource ({stream})
+   /Decode [ {xmin:g} {xmax:g} {ymin:g} {ymax:g} 0 1 0 1 0 1 ]
+   /DataSource <
+{hexdata}
+>
 >>
 shfill
 grestore
 """)
 
-    def _draw_ps(self, ps, gc, rgbFace, fill=True, stroke=True, command=None):
+    def _draw_ps(self, ps, gc, rgbFace, *, fill=True, stroke=True):
         """
-        Emit the PostScript snippet 'ps' with all the attributes from 'gc'
-        applied.  'ps' must consist of PostScript commands to construct a path.
+        Emit the PostScript snippet *ps* with all the attributes from *gc*
+        applied.  *ps* must consist of PostScript commands to construct a path.
 
-        The fill and/or stroke kwargs can be set to False if the
-        'ps' string already includes filling and/or stroking, in
-        which case _draw_ps is just supplying properties and
-        clipping.
+        The *fill* and/or *stroke* kwargs can be set to False if the *ps*
+        string already includes filling and/or stroking, in which case
+        `_draw_ps` is just supplying properties and clipping.
         """
-        # local variable eliminates all repeated attribute lookups
         write = self._pswriter.write
-        if debugPS and command:
-            write("% "+command+"\n")
         mightstroke = (gc.get_linewidth() > 0
-                       and not _is_transparent(gc.get_rgb()))
+                       and not self._is_transparent(gc.get_rgb()))
         if not mightstroke:
             stroke = False
-        if _is_transparent(rgbFace):
+        if self._is_transparent(rgbFace):
             fill = False
         hatch = gc.get_hatch()
 
@@ -755,12 +784,12 @@ def _draw_ps(self, ps, gc, rgbFace, fill=True, stroke=True, command=None):
             self.set_linejoin(gc.get_joinstyle())
             self.set_linecap(gc.get_capstyle())
             self.set_linedash(*gc.get_dashes())
+        if mightstroke or hatch:
             self.set_color(*gc.get_rgb()[:3])
         write('gsave\n')
 
         write(self._get_clip_cmd(gc))
 
-        # Jochen, is the strip necessary? - this could be a honking big string
         write(ps.strip())
         write("\n")
 
@@ -784,30 +813,6 @@ def _draw_ps(self, ps, gc, rgbFace, fill=True, stroke=True, command=None):
         write("grestore\n")
 
 
-def _is_transparent(rgb_or_rgba):
-    if rgb_or_rgba is None:
-        return True  # Consistent with rgbFace semantics.
-    elif len(rgb_or_rgba) == 4:
-        if rgb_or_rgba[3] == 0:
-            return True
-        if rgb_or_rgba[3] != 1:
-            _log.warning(
-                "The PostScript backend does not support transparency; "
-                "partially transparent artists will be rendered opaque.")
-        return False
-    else:  # len() == 3.
-        return False
-
-
-@_api.deprecated("3.4", alternative="GraphicsContextBase")
-class GraphicsContextPS(GraphicsContextBase):
-    def get_capstyle(self):
-        return {'butt': 0, 'round': 1, 'projecting': 2}[super().get_capstyle()]
-
-    def get_joinstyle(self):
-        return {'miter': 0, 'round': 1, 'bevel': 2}[super().get_joinstyle()]
-
-
 class _Orientation(Enum):
     portrait, landscape = range(2)
 
@@ -823,21 +828,14 @@ class FigureCanvasPS(FigureCanvasBase):
     def get_default_filetype(self):
         return 'ps'
 
-    def print_ps(self, outfile, *args, **kwargs):
-        return self._print_ps(outfile, 'ps', *args, **kwargs)
-
-    def print_eps(self, outfile, *args, **kwargs):
-        return self._print_ps(outfile, 'eps', *args, **kwargs)
-
-    @_api.delete_parameter("3.4", "dpi")
+    @_api.delete_parameter("3.5", "args")
     def _print_ps(
-            self, outfile, format, *args,
-            dpi=None, metadata=None, papertype=None, orientation='portrait',
+            self, fmt, outfile, *args,
+            metadata=None, papertype=None, orientation='portrait',
             **kwargs):
 
-        if dpi is None:  # always use this branch after deprecation elapses.
-            dpi = self.figure.get_dpi()
-        self.figure.set_dpi(72)  # Override the dpi kwarg
+        dpi = self.figure.dpi
+        self.figure.dpi = 72  # Override the dpi kwarg
 
         dsc_comments = {}
         if isinstance(outfile, (str, os.PathLike)):
@@ -868,12 +866,11 @@ def _print_ps(
         printer = (self._print_figure_tex
                    if mpl.rcParams['text.usetex'] else
                    self._print_figure)
-        printer(outfile, format, dpi=dpi, dsc_comments=dsc_comments,
+        printer(fmt, outfile, dpi=dpi, dsc_comments=dsc_comments,
                 orientation=orientation, papertype=papertype, **kwargs)
 
-    @_check_savefig_extra_args
     def _print_figure(
-            self, outfile, format, *,
+            self, fmt, outfile, *,
             dpi, dsc_comments, orientation, papertype,
             bbox_inches_restore=None):
         """
@@ -883,13 +880,9 @@ def _print_figure(
         all string containing Document Structuring Convention comments,
         generated from the *metadata* parameter to `.print_figure`.
         """
-        is_eps = format == 'eps'
-        if isinstance(outfile, (str, os.PathLike)):
-            outfile = os.fspath(outfile)
-            passed_in_file_object = False
-        elif is_writable_file_like(outfile):
-            passed_in_file_object = True
-        else:
+        is_eps = fmt == 'eps'
+        if not (isinstance(outfile, (str, os.PathLike))
+                or is_writable_file_like(outfile)):
             raise ValueError("outfile must be a path or a file-like object")
 
         # find the appropriate papertype
@@ -960,24 +953,15 @@ def print_figure_impl(fh):
                         in ps_renderer._character_tracker.used.items():
                     if not chars:
                         continue
-                    font = get_font(font_path)
-                    glyph_ids = [font.get_char_index(c) for c in chars]
                     fonttype = mpl.rcParams['ps.fonttype']
                     # Can't use more than 255 chars from a single Type 3 font.
-                    if len(glyph_ids) > 255:
+                    if len(chars) > 255:
                         fonttype = 42
                     fh.flush()
                     if fonttype == 3:
-                        fh.write(_font_to_ps_type3(font_path, glyph_ids))
-                    else:
-                        try:
-                            convert_ttf_to_ps(os.fsencode(font_path),
-                                              fh, fonttype, glyph_ids)
-                        except RuntimeError:
-                            _log.warning(
-                                "The PostScript backend does not currently "
-                                "support the selected font.")
-                            raise
+                        fh.write(_font_to_ps_type3(font_path, chars))
+                    else:  # Type 42 only.
+                        _font_to_ps_type42(font_path, chars, fh)
             print("end", file=fh)
             print("%%EndProlog", file=fh)
 
@@ -1016,27 +1000,14 @@ def print_figure_impl(fh):
                                  tmpfile, is_eps, ptype=papertype, bbox=bbox)
                 _move_path_to_path_or_stream(tmpfile, outfile)
 
-        else:
-            # Write directly to outfile.
-            if passed_in_file_object:
-                requires_unicode = file_requires_unicode(outfile)
-
-                if not requires_unicode:
-                    fh = TextIOWrapper(outfile, encoding="latin-1")
-                    # Prevent the TextIOWrapper from closing the underlying
-                    # file.
-                    fh.close = lambda: None
-                else:
-                    fh = outfile
-
-                print_figure_impl(fh)
-            else:
-                with open(outfile, 'w', encoding='latin-1') as fh:
-                    print_figure_impl(fh)
+        else:  # Write directly to outfile.
+            with cbook.open_file_cm(outfile, "w", encoding="latin-1") as file:
+                if not file_requires_unicode(file):
+                    file = codecs.getwriter("latin-1")(file)
+                print_figure_impl(file)
 
-    @_check_savefig_extra_args
     def _print_figure_tex(
-            self, outfile, format, *,
+            self, fmt, outfile, *,
             dpi, dsc_comments, orientation, papertype,
             bbox_inches_restore=None):
         """
@@ -1046,7 +1017,7 @@ def _print_figure_tex(
 
         The rest of the behavior is as for `._print_figure`.
         """
-        is_eps = format == 'eps'
+        is_eps = fmt == 'eps'
 
         width, height = self.figure.get_size_inches()
         xo = 0
@@ -1070,8 +1041,8 @@ def _print_figure_tex(
 
         # write to a temp file, we'll move it to outfile when done
         with TemporaryDirectory() as tmpdir:
-            tmpfile = os.path.join(tmpdir, "tmp.ps")
-            pathlib.Path(tmpfile).write_text(
+            tmppath = pathlib.Path(tmpdir, "tmp.ps")
+            tmppath.write_text(
                 f"""\
 %!PS-Adobe-3.0 EPSF-3.0
 {dsc_comments}
@@ -1107,35 +1078,38 @@ def _print_figure_tex(
                     papertype = _get_papertype(width, height)
                 paper_width, paper_height = papersize[papertype]
 
-            texmanager = ps_renderer.get_texmanager()
-            font_preamble = texmanager.get_font_preamble()
-            custom_preamble = texmanager.get_custom_preamble()
-
-            psfrag_rotated = convert_psfrags(tmpfile, ps_renderer.psfrag,
-                                             font_preamble,
-                                             custom_preamble, paper_width,
-                                             paper_height,
-                                             orientation.name)
+            psfrag_rotated = _convert_psfrags(
+                tmppath, ps_renderer.psfrag, paper_width, paper_height,
+                orientation.name)
 
             if (mpl.rcParams['ps.usedistiller'] == 'ghostscript'
                     or mpl.rcParams['text.usetex']):
                 _try_distill(gs_distill,
-                             tmpfile, is_eps, ptype=papertype, bbox=bbox,
+                             tmppath, is_eps, ptype=papertype, bbox=bbox,
                              rotated=psfrag_rotated)
             elif mpl.rcParams['ps.usedistiller'] == 'xpdf':
                 _try_distill(xpdf_distill,
-                             tmpfile, is_eps, ptype=papertype, bbox=bbox,
+                             tmppath, is_eps, ptype=papertype, bbox=bbox,
                              rotated=psfrag_rotated)
 
-            _move_path_to_path_or_stream(tmpfile, outfile)
+            _move_path_to_path_or_stream(tmppath, outfile)
+
+    print_ps = functools.partialmethod(_print_ps, "ps")
+    print_eps = functools.partialmethod(_print_ps, "eps")
 
     def draw(self):
-        _no_output_draw(self.figure)
+        self.figure.draw_without_rendering()
         return super().draw()
 
 
+@_api.deprecated("3.6")
 def convert_psfrags(tmpfile, psfrags, font_preamble, custom_preamble,
                     paper_width, paper_height, orientation):
+    return _convert_psfrags(
+        pathlib.Path(tmpfile), psfrags, paper_width, paper_height, orientation)
+
+
+def _convert_psfrags(tmppath, psfrags, paper_width, paper_height, orientation):
     """
     When we want to use the LaTeX backend with postscript, we write PSFrag tags
     to a temporary postscript file, each one marking a position for LaTeX to
@@ -1146,8 +1120,9 @@ def convert_psfrags(tmpfile, psfrags, font_preamble, custom_preamble,
     with mpl.rc_context({
             "text.latex.preamble":
             mpl.rcParams["text.latex.preamble"] +
-            r"\usepackage{psfrag,color}""\n"
-            r"\usepackage[dvips]{graphicx}""\n"
+            mpl.texmanager._usepackage_if_not_loaded("color") +
+            mpl.texmanager._usepackage_if_not_loaded("graphicx") +
+            mpl.texmanager._usepackage_if_not_loaded("psfrag") +
             r"\geometry{papersize={%(width)sin,%(height)sin},margin=0in}"
             % {"width": paper_width, "height": paper_height}
     }):
@@ -1161,7 +1136,7 @@ def convert_psfrags(tmpfile, psfrags, font_preamble, custom_preamble,
             % {
                 "psfrags": "\n".join(psfrags),
                 "angle": 90 if orientation == 'landscape' else 0,
-                "epsfile": pathlib.Path(tmpfile).resolve().as_posix(),
+                "epsfile": tmppath.resolve().as_posix(),
             },
             fontsize=10)  # tex's default fontsize.
 
@@ -1169,7 +1144,7 @@ def convert_psfrags(tmpfile, psfrags, font_preamble, custom_preamble,
         psfile = os.path.join(tmpdir, "tmp.ps")
         cbook._check_and_log_subprocess(
             ['dvips', '-q', '-R0', '-o', psfile, dvifile], _log)
-        shutil.move(psfile, tmpfile)
+        shutil.move(psfile, tmppath)
 
     # check if the dvips created a ps in landscape paper.  Somehow,
     # above latex+dvips results in a ps file in a landscape mode for a
@@ -1178,14 +1153,14 @@ def convert_psfrags(tmpfile, psfrags, font_preamble, custom_preamble,
     # the generated ps file is in landscape and return this
     # information. The return value is used in pstoeps step to recover
     # the correct bounding box. 2010-06-05 JJL
-    with open(tmpfile) as fh:
+    with open(tmppath) as fh:
         psfrag_rotated = "Landscape" in fh.read(1000)
     return psfrag_rotated
 
 
-def _try_distill(func, *args, **kwargs):
+def _try_distill(func, tmppath, *args, **kwargs):
     try:
-        func(*args, **kwargs)
+        func(str(tmppath), *args, **kwargs)
     except mpl.ExecutableNotFoundError as exc:
         _log.warning("%s.  Distillation step skipped.", exc)
 
@@ -1234,32 +1209,26 @@ def xpdf_distill(tmpfile, eps=False, ptype='letter', bbox=None, rotated=False):
     mpl._get_executable_info("gs")  # Effectively checks for ps2pdf.
     mpl._get_executable_info("pdftops")
 
-    pdffile = tmpfile + '.pdf'
-    psfile = tmpfile + '.ps'
-
-    # Pass options as `-foo#bar` instead of `-foo=bar` to keep Windows happy
-    # (https://www.ghostscript.com/doc/9.22/Use.htm#MS_Windows).
-    cbook._check_and_log_subprocess(
-        ["ps2pdf",
-         "-dAutoFilterColorImages#false",
-         "-dAutoFilterGrayImages#false",
-         "-sAutoRotatePages#None",
-         "-sGrayImageFilter#FlateEncode",
-         "-sColorImageFilter#FlateEncode",
-         "-dEPSCrop" if eps else "-sPAPERSIZE#%s" % ptype,
-         tmpfile, pdffile], _log)
-    cbook._check_and_log_subprocess(
-        ["pdftops", "-paper", "match", "-level2", pdffile, psfile], _log)
-
-    os.remove(tmpfile)
-    shutil.move(psfile, tmpfile)
-
+    with TemporaryDirectory() as tmpdir:
+        tmppdf = pathlib.Path(tmpdir, "tmp.pdf")
+        tmpps = pathlib.Path(tmpdir, "tmp.ps")
+        # Pass options as `-foo#bar` instead of `-foo=bar` to keep Windows
+        # happy (https://ghostscript.com/doc/9.56.1/Use.htm#MS_Windows).
+        cbook._check_and_log_subprocess(
+            ["ps2pdf",
+             "-dAutoFilterColorImages#false",
+             "-dAutoFilterGrayImages#false",
+             "-sAutoRotatePages#None",
+             "-sGrayImageFilter#FlateEncode",
+             "-sColorImageFilter#FlateEncode",
+             "-dEPSCrop" if eps else "-sPAPERSIZE#%s" % ptype,
+             tmpfile, tmppdf], _log)
+        cbook._check_and_log_subprocess(
+            ["pdftops", "-paper", "match", "-level2", tmppdf, tmpps], _log)
+        shutil.move(tmpps, tmpfile)
     if eps:
         pstoeps(tmpfile)
 
-    for fname in glob.glob(tmpfile+'.*'):
-        os.remove(fname)
-
 
 def get_bbox_header(lbrt, rotated=False):
     """
@@ -1348,28 +1317,31 @@ def pstoeps(tmpfile, bbox=None, rotated=False):
 # the matplotlib primitives and some abbreviations.
 #
 # References:
-# http://www.adobe.com/products/postscript/pdfs/PLRM.pdf
-# http://www.mactech.com/articles/mactech/Vol.09/09.04/PostscriptTutorial/
+# https://www.adobe.com/content/dam/acom/en/devnet/actionscript/articles/PLRM.pdf
+# http://preserve.mactech.com/articles/mactech/Vol.09/09.04/PostscriptTutorial
 # http://www.math.ubc.ca/people/faculty/cass/graphics/text/www/
 #
 
 # The usage comments use the notation of the operator summary
 # in the PostScript Language reference manual.
 psDefs = [
-    # name proc  *d*  -
-    "/d { bind def } bind def",
+    # name proc  *_d*  -
+    # Note that this cannot be bound to /d, because when embedding a Type3 font
+    # we may want to define a "d" glyph using "/d{...} d" which would locally
+    # overwrite the definition.
+    "/_d { bind def } bind def",
     # x y  *m*  -
-    "/m { moveto } d",
+    "/m { moveto } _d",
     # x y  *l*  -
-    "/l { lineto } d",
+    "/l { lineto } _d",
     # x y  *r*  -
-    "/r { rlineto } d",
+    "/r { rlineto } _d",
     # x1 y1 x2 y2 x y *c*  -
-    "/c { curveto } d",
+    "/c { curveto } _d",
     # *cl*  -
-    "/cl { closepath } d",
+    "/cl { closepath } _d",
     # *ce*  -
-    "/ce { closepath eofill } d",
+    "/ce { closepath eofill } _d",
     # w h x y  *box*  -
     """/box {
       m
@@ -1377,18 +1349,19 @@ def pstoeps(tmpfile, bbox=None, rotated=False):
       0 exch r
       neg 0 r
       cl
-    } d""",
+    } _d""",
     # w h x y  *clipbox*  -
     """/clipbox {
       box
       clip
       newpath
-    } d""",
+    } _d""",
     # wx wy llx lly urx ury  *setcachedevice*  -
-    "/sc { setcachedevice } d",
+    "/sc { setcachedevice } _d",
 ]
 
 
 @_Backend.export
 class _BackendPS(_Backend):
+    backend_version = 'Level II'
     FigureCanvas = FigureCanvasPS
diff --git a/lib/matplotlib/backends/backend_qt.py b/lib/matplotlib/backends/backend_qt.py
new file mode 100644
index 000000000000..2afff892ad2e
--- /dev/null
+++ b/lib/matplotlib/backends/backend_qt.py
@@ -0,0 +1,1022 @@
+import functools
+import os
+import sys
+import traceback
+
+import matplotlib as mpl
+from matplotlib import _api, backend_tools, cbook
+from matplotlib._pylab_helpers import Gcf
+from matplotlib.backend_bases import (
+    _Backend, FigureCanvasBase, FigureManagerBase, NavigationToolbar2,
+    TimerBase, cursors, ToolContainerBase, MouseButton,
+    CloseEvent, KeyEvent, LocationEvent, MouseEvent, ResizeEvent)
+import matplotlib.backends.qt_editor.figureoptions as figureoptions
+from . import qt_compat
+from .qt_compat import (
+    QtCore, QtGui, QtWidgets, __version__, QT_API,
+    _enum, _to_int,
+    _devicePixelRatioF, _isdeleted, _setDevicePixelRatio,
+    _maybe_allow_interrupt
+)
+
+
+# SPECIAL_KEYS are Qt::Key that do *not* return their Unicode name
+# instead they have manually specified names.
+SPECIAL_KEYS = {
+    _to_int(getattr(_enum("QtCore.Qt.Key"), k)): v for k, v in [
+        ("Key_Escape", "escape"),
+        ("Key_Tab", "tab"),
+        ("Key_Backspace", "backspace"),
+        ("Key_Return", "enter"),
+        ("Key_Enter", "enter"),
+        ("Key_Insert", "insert"),
+        ("Key_Delete", "delete"),
+        ("Key_Pause", "pause"),
+        ("Key_SysReq", "sysreq"),
+        ("Key_Clear", "clear"),
+        ("Key_Home", "home"),
+        ("Key_End", "end"),
+        ("Key_Left", "left"),
+        ("Key_Up", "up"),
+        ("Key_Right", "right"),
+        ("Key_Down", "down"),
+        ("Key_PageUp", "pageup"),
+        ("Key_PageDown", "pagedown"),
+        ("Key_Shift", "shift"),
+        # In OSX, the control and super (aka cmd/apple) keys are switched.
+        ("Key_Control", "control" if sys.platform != "darwin" else "cmd"),
+        ("Key_Meta", "meta" if sys.platform != "darwin" else "control"),
+        ("Key_Alt", "alt"),
+        ("Key_CapsLock", "caps_lock"),
+        ("Key_F1", "f1"),
+        ("Key_F2", "f2"),
+        ("Key_F3", "f3"),
+        ("Key_F4", "f4"),
+        ("Key_F5", "f5"),
+        ("Key_F6", "f6"),
+        ("Key_F7", "f7"),
+        ("Key_F8", "f8"),
+        ("Key_F9", "f9"),
+        ("Key_F10", "f10"),
+        ("Key_F10", "f11"),
+        ("Key_F12", "f12"),
+        ("Key_Super_L", "super"),
+        ("Key_Super_R", "super"),
+    ]
+}
+# Define which modifier keys are collected on keyboard events.
+# Elements are (Qt::KeyboardModifiers, Qt::Key) tuples.
+# Order determines the modifier order (ctrl+alt+...) reported by Matplotlib.
+_MODIFIER_KEYS = [
+    (_to_int(getattr(_enum("QtCore.Qt.KeyboardModifier"), mod)),
+     _to_int(getattr(_enum("QtCore.Qt.Key"), key)))
+    for mod, key in [
+        ("ControlModifier", "Key_Control"),
+        ("AltModifier", "Key_Alt"),
+        ("ShiftModifier", "Key_Shift"),
+        ("MetaModifier", "Key_Meta"),
+    ]
+]
+cursord = {
+    k: getattr(_enum("QtCore.Qt.CursorShape"), v) for k, v in [
+        (cursors.MOVE, "SizeAllCursor"),
+        (cursors.HAND, "PointingHandCursor"),
+        (cursors.POINTER, "ArrowCursor"),
+        (cursors.SELECT_REGION, "CrossCursor"),
+        (cursors.WAIT, "WaitCursor"),
+        (cursors.RESIZE_HORIZONTAL, "SizeHorCursor"),
+        (cursors.RESIZE_VERTICAL, "SizeVerCursor"),
+    ]
+}
+
+
+@_api.caching_module_getattr
+class __getattr__:
+    qApp = _api.deprecated(
+        "3.6", alternative="QtWidgets.QApplication.instance()")(
+            property(lambda self: QtWidgets.QApplication.instance()))
+
+
+# lru_cache keeps a reference to the QApplication instance, keeping it from
+# being GC'd.
+@functools.lru_cache(1)
+def _create_qApp():
+    app = QtWidgets.QApplication.instance()
+
+    # Create a new QApplication and configure if if non exists yet, as only one
+    # QApplication can exist at a time.
+    if app is None:
+        # display_is_valid returns False only if on Linux and neither X11
+        # nor Wayland display can be opened.
+        if not mpl._c_internal_utils.display_is_valid():
+            raise RuntimeError('Invalid DISPLAY variable')
+
+        # Check to make sure a QApplication from a different major version
+        # of Qt is not instantiated in the process
+        if QT_API in {'PyQt6', 'PySide6'}:
+            other_bindings = ('PyQt5', 'PySide2')
+        elif QT_API in {'PyQt5', 'PySide2'}:
+            other_bindings = ('PyQt6', 'PySide6')
+        else:
+            raise RuntimeError("Should never be here")
+
+        for binding in other_bindings:
+            mod = sys.modules.get(f'{binding}.QtWidgets')
+            if mod is not None and mod.QApplication.instance() is not None:
+                other_core = sys.modules.get(f'{binding}.QtCore')
+                _api.warn_external(
+                    f'Matplotlib is using {QT_API} which wraps '
+                    f'{QtCore.qVersion()} however an instantiated '
+                    f'QApplication from {binding} which wraps '
+                    f'{other_core.qVersion()} exists.  Mixing Qt major '
+                    'versions may not work as expected.'
+                )
+                break
+        try:
+            QtWidgets.QApplication.setAttribute(
+                QtCore.Qt.AA_EnableHighDpiScaling)
+        except AttributeError:  # Only for Qt>=5.6, <6.
+            pass
+        try:
+            QtWidgets.QApplication.setHighDpiScaleFactorRoundingPolicy(
+                QtCore.Qt.HighDpiScaleFactorRoundingPolicy.PassThrough)
+        except AttributeError:  # Only for Qt>=5.14.
+            pass
+        app = QtWidgets.QApplication(["matplotlib"])
+        if sys.platform == "darwin":
+            image = str(cbook._get_data_path('images/matplotlib.svg'))
+            icon = QtGui.QIcon(image)
+            app.setWindowIcon(icon)
+        app.lastWindowClosed.connect(app.quit)
+        cbook._setup_new_guiapp()
+
+    try:
+        app.setAttribute(QtCore.Qt.AA_UseHighDpiPixmaps)  # Only for Qt<6.
+    except AttributeError:
+        pass
+
+    return app
+
+
+class TimerQT(TimerBase):
+    """Subclass of `.TimerBase` using QTimer events."""
+
+    def __init__(self, *args, **kwargs):
+        # Create a new timer and connect the timeout() signal to the
+        # _on_timer method.
+        self._timer = QtCore.QTimer()
+        self._timer.timeout.connect(self._on_timer)
+        super().__init__(*args, **kwargs)
+
+    def __del__(self):
+        # The check for deletedness is needed to avoid an error at animation
+        # shutdown with PySide2.
+        if not _isdeleted(self._timer):
+            self._timer_stop()
+
+    def _timer_set_single_shot(self):
+        self._timer.setSingleShot(self._single)
+
+    def _timer_set_interval(self):
+        self._timer.setInterval(self._interval)
+
+    def _timer_start(self):
+        self._timer.start()
+
+    def _timer_stop(self):
+        self._timer.stop()
+
+
+class FigureCanvasQT(FigureCanvasBase, QtWidgets.QWidget):
+    required_interactive_framework = "qt"
+    _timer_cls = TimerQT
+    manager_class = _api.classproperty(lambda cls: FigureManagerQT)
+
+    buttond = {
+        getattr(_enum("QtCore.Qt.MouseButton"), k): v for k, v in [
+            ("LeftButton", MouseButton.LEFT),
+            ("RightButton", MouseButton.RIGHT),
+            ("MiddleButton", MouseButton.MIDDLE),
+            ("XButton1", MouseButton.BACK),
+            ("XButton2", MouseButton.FORWARD),
+        ]
+    }
+
+    def __init__(self, figure=None):
+        _create_qApp()
+        super().__init__(figure=figure)
+
+        self._draw_pending = False
+        self._is_drawing = False
+        self._draw_rect_callback = lambda painter: None
+        self._in_resize_event = False
+
+        self.setAttribute(
+            _enum("QtCore.Qt.WidgetAttribute").WA_OpaquePaintEvent)
+        self.setMouseTracking(True)
+        self.resize(*self.get_width_height())
+
+        palette = QtGui.QPalette(QtGui.QColor("white"))
+        self.setPalette(palette)
+
+    def _update_pixel_ratio(self):
+        if self._set_device_pixel_ratio(_devicePixelRatioF(self)):
+            # The easiest way to resize the canvas is to emit a resizeEvent
+            # since we implement all the logic for resizing the canvas for
+            # that event.
+            event = QtGui.QResizeEvent(self.size(), self.size())
+            self.resizeEvent(event)
+
+    def _update_screen(self, screen):
+        # Handler for changes to a window's attached screen.
+        self._update_pixel_ratio()
+        if screen is not None:
+            screen.physicalDotsPerInchChanged.connect(self._update_pixel_ratio)
+            screen.logicalDotsPerInchChanged.connect(self._update_pixel_ratio)
+
+    def showEvent(self, event):
+        # Set up correct pixel ratio, and connect to any signal changes for it,
+        # once the window is shown (and thus has these attributes).
+        window = self.window().windowHandle()
+        window.screenChanged.connect(self._update_screen)
+        self._update_screen(window.screen())
+
+    def set_cursor(self, cursor):
+        # docstring inherited
+        self.setCursor(_api.check_getitem(cursord, cursor=cursor))
+
+    def mouseEventCoords(self, pos=None):
+        """
+        Calculate mouse coordinates in physical pixels.
+
+        Qt uses logical pixels, but the figure is scaled to physical
+        pixels for rendering.  Transform to physical pixels so that
+        all of the down-stream transforms work as expected.
+
+        Also, the origin is different and needs to be corrected.
+        """
+        if pos is None:
+            pos = self.mapFromGlobal(QtGui.QCursor.pos())
+        elif hasattr(pos, "position"):  # qt6 QtGui.QEvent
+            pos = pos.position()
+        elif hasattr(pos, "pos"):  # qt5 QtCore.QEvent
+            pos = pos.pos()
+        # (otherwise, it's already a QPoint)
+        x = pos.x()
+        # flip y so y=0 is bottom of canvas
+        y = self.figure.bbox.height / self.device_pixel_ratio - pos.y()
+        return x * self.device_pixel_ratio, y * self.device_pixel_ratio
+
+    def enterEvent(self, event):
+        LocationEvent("figure_enter_event", self,
+                      *self.mouseEventCoords(event),
+                      guiEvent=event)._process()
+
+    def leaveEvent(self, event):
+        QtWidgets.QApplication.restoreOverrideCursor()
+        LocationEvent("figure_leave_event", self,
+                      *self.mouseEventCoords(),
+                      guiEvent=event)._process()
+
+    def mousePressEvent(self, event):
+        button = self.buttond.get(event.button())
+        if button is not None:
+            MouseEvent("button_press_event", self,
+                       *self.mouseEventCoords(event), button,
+                       guiEvent=event)._process()
+
+    def mouseDoubleClickEvent(self, event):
+        button = self.buttond.get(event.button())
+        if button is not None:
+            MouseEvent("button_press_event", self,
+                       *self.mouseEventCoords(event), button, dblclick=True,
+                       guiEvent=event)._process()
+
+    def mouseMoveEvent(self, event):
+        MouseEvent("motion_notify_event", self,
+                   *self.mouseEventCoords(event),
+                   guiEvent=event)._process()
+
+    def mouseReleaseEvent(self, event):
+        button = self.buttond.get(event.button())
+        if button is not None:
+            MouseEvent("button_release_event", self,
+                       *self.mouseEventCoords(event), button,
+                       guiEvent=event)._process()
+
+    def wheelEvent(self, event):
+        # from QWheelEvent::pixelDelta doc: pixelDelta is sometimes not
+        # provided (`isNull()`) and is unreliable on X11 ("xcb").
+        if (event.pixelDelta().isNull()
+                or QtWidgets.QApplication.instance().platformName() == "xcb"):
+            steps = event.angleDelta().y() / 120
+        else:
+            steps = event.pixelDelta().y()
+        if steps:
+            MouseEvent("scroll_event", self,
+                       *self.mouseEventCoords(event), step=steps,
+                       guiEvent=event)._process()
+
+    def keyPressEvent(self, event):
+        key = self._get_key(event)
+        if key is not None:
+            KeyEvent("key_press_event", self,
+                     key, *self.mouseEventCoords(),
+                     guiEvent=event)._process()
+
+    def keyReleaseEvent(self, event):
+        key = self._get_key(event)
+        if key is not None:
+            KeyEvent("key_release_event", self,
+                     key, *self.mouseEventCoords(),
+                     guiEvent=event)._process()
+
+    def resizeEvent(self, event):
+        if self._in_resize_event:  # Prevent PyQt6 recursion
+            return
+        self._in_resize_event = True
+        try:
+            w = event.size().width() * self.device_pixel_ratio
+            h = event.size().height() * self.device_pixel_ratio
+            dpival = self.figure.dpi
+            winch = w / dpival
+            hinch = h / dpival
+            self.figure.set_size_inches(winch, hinch, forward=False)
+            # pass back into Qt to let it finish
+            QtWidgets.QWidget.resizeEvent(self, event)
+            # emit our resize events
+            ResizeEvent("resize_event", self)._process()
+            self.draw_idle()
+        finally:
+            self._in_resize_event = False
+
+    def sizeHint(self):
+        w, h = self.get_width_height()
+        return QtCore.QSize(w, h)
+
+    def minumumSizeHint(self):
+        return QtCore.QSize(10, 10)
+
+    def _get_key(self, event):
+        event_key = event.key()
+        event_mods = _to_int(event.modifiers())  # actually a bitmask
+
+        # get names of the pressed modifier keys
+        # 'control' is named 'control' when a standalone key, but 'ctrl' when a
+        # modifier
+        # bit twiddling to pick out modifier keys from event_mods bitmask,
+        # if event_key is a MODIFIER, it should not be duplicated in mods
+        mods = [SPECIAL_KEYS[key].replace('control', 'ctrl')
+                for mod, key in _MODIFIER_KEYS
+                if event_key != key and event_mods & mod]
+        try:
+            # for certain keys (enter, left, backspace, etc) use a word for the
+            # key, rather than Unicode
+            key = SPECIAL_KEYS[event_key]
+        except KeyError:
+            # Unicode defines code points up to 0x10ffff (sys.maxunicode)
+            # QT will use Key_Codes larger than that for keyboard keys that are
+            # are not Unicode characters (like multimedia keys)
+            # skip these
+            # if you really want them, you should add them to SPECIAL_KEYS
+            if event_key > sys.maxunicode:
+                return None
+
+            key = chr(event_key)
+            # qt delivers capitalized letters.  fix capitalization
+            # note that capslock is ignored
+            if 'shift' in mods:
+                mods.remove('shift')
+            else:
+                key = key.lower()
+
+        return '+'.join(mods + [key])
+
+    def flush_events(self):
+        # docstring inherited
+        QtWidgets.QApplication.instance().processEvents()
+
+    def start_event_loop(self, timeout=0):
+        # docstring inherited
+        if hasattr(self, "_event_loop") and self._event_loop.isRunning():
+            raise RuntimeError("Event loop already running")
+        self._event_loop = event_loop = QtCore.QEventLoop()
+        if timeout > 0:
+            _ = QtCore.QTimer.singleShot(int(timeout * 1000), event_loop.quit)
+
+        with _maybe_allow_interrupt(event_loop):
+            qt_compat._exec(event_loop)
+
+    def stop_event_loop(self, event=None):
+        # docstring inherited
+        if hasattr(self, "_event_loop"):
+            self._event_loop.quit()
+
+    def draw(self):
+        """Render the figure, and queue a request for a Qt draw."""
+        # The renderer draw is done here; delaying causes problems with code
+        # that uses the result of the draw() to update plot elements.
+        if self._is_drawing:
+            return
+        with cbook._setattr_cm(self, _is_drawing=True):
+            super().draw()
+        self.update()
+
+    def draw_idle(self):
+        """Queue redraw of the Agg buffer and request Qt paintEvent."""
+        # The Agg draw needs to be handled by the same thread Matplotlib
+        # modifies the scene graph from. Post Agg draw request to the
+        # current event loop in order to ensure thread affinity and to
+        # accumulate multiple draw requests from event handling.
+        # TODO: queued signal connection might be safer than singleShot
+        if not (getattr(self, '_draw_pending', False) or
+                getattr(self, '_is_drawing', False)):
+            self._draw_pending = True
+            QtCore.QTimer.singleShot(0, self._draw_idle)
+
+    def blit(self, bbox=None):
+        # docstring inherited
+        if bbox is None and self.figure:
+            bbox = self.figure.bbox  # Blit the entire canvas if bbox is None.
+        # repaint uses logical pixels, not physical pixels like the renderer.
+        l, b, w, h = [int(pt / self.device_pixel_ratio) for pt in bbox.bounds]
+        t = b + h
+        self.repaint(l, self.rect().height() - t, w, h)
+
+    def _draw_idle(self):
+        with self._idle_draw_cntx():
+            if not self._draw_pending:
+                return
+            self._draw_pending = False
+            if self.height() < 0 or self.width() < 0:
+                return
+            try:
+                self.draw()
+            except Exception:
+                # Uncaught exceptions are fatal for PyQt5, so catch them.
+                traceback.print_exc()
+
+    def drawRectangle(self, rect):
+        # Draw the zoom rectangle to the QPainter.  _draw_rect_callback needs
+        # to be called at the end of paintEvent.
+        if rect is not None:
+            x0, y0, w, h = [int(pt / self.device_pixel_ratio) for pt in rect]
+            x1 = x0 + w
+            y1 = y0 + h
+            def _draw_rect_callback(painter):
+                pen = QtGui.QPen(
+                    QtGui.QColor("black"),
+                    1 / self.device_pixel_ratio
+                )
+
+                pen.setDashPattern([3, 3])
+                for color, offset in [
+                        (QtGui.QColor("black"), 0),
+                        (QtGui.QColor("white"), 3),
+                ]:
+                    pen.setDashOffset(offset)
+                    pen.setColor(color)
+                    painter.setPen(pen)
+                    # Draw the lines from x0, y0 towards x1, y1 so that the
+                    # dashes don't "jump" when moving the zoom box.
+                    painter.drawLine(x0, y0, x0, y1)
+                    painter.drawLine(x0, y0, x1, y0)
+                    painter.drawLine(x0, y1, x1, y1)
+                    painter.drawLine(x1, y0, x1, y1)
+        else:
+            def _draw_rect_callback(painter):
+                return
+        self._draw_rect_callback = _draw_rect_callback
+        self.update()
+
+
+class MainWindow(QtWidgets.QMainWindow):
+    closing = QtCore.Signal()
+
+    def closeEvent(self, event):
+        self.closing.emit()
+        super().closeEvent(event)
+
+
+class FigureManagerQT(FigureManagerBase):
+    """
+    Attributes
+    ----------
+    canvas : `FigureCanvas`
+        The FigureCanvas instance
+    num : int or str
+        The Figure number
+    toolbar : qt.QToolBar
+        The qt.QToolBar
+    window : qt.QMainWindow
+        The qt.QMainWindow
+    """
+
+    def __init__(self, canvas, num):
+        self.window = MainWindow()
+        super().__init__(canvas, num)
+        self.window.closing.connect(
+            # The lambda prevents the event from being immediately gc'd.
+            lambda: CloseEvent("close_event", self.canvas)._process())
+        self.window.closing.connect(self._widgetclosed)
+
+        if sys.platform != "darwin":
+            image = str(cbook._get_data_path('images/matplotlib.svg'))
+            icon = QtGui.QIcon(image)
+            self.window.setWindowIcon(icon)
+
+        self.window._destroying = False
+
+        if self.toolbar:
+            self.window.addToolBar(self.toolbar)
+            tbs_height = self.toolbar.sizeHint().height()
+        else:
+            tbs_height = 0
+
+        # resize the main window so it will display the canvas with the
+        # requested size:
+        cs = canvas.sizeHint()
+        cs_height = cs.height()
+        height = cs_height + tbs_height
+        self.window.resize(cs.width(), height)
+
+        self.window.setCentralWidget(self.canvas)
+
+        if mpl.is_interactive():
+            self.window.show()
+            self.canvas.draw_idle()
+
+        # Give the keyboard focus to the figure instead of the manager:
+        # StrongFocus accepts both tab and click to focus and will enable the
+        # canvas to process event without clicking.
+        # https://doc.qt.io/qt-5/qt.html#FocusPolicy-enum
+        self.canvas.setFocusPolicy(_enum("QtCore.Qt.FocusPolicy").StrongFocus)
+        self.canvas.setFocus()
+
+        self.window.raise_()
+
+    def full_screen_toggle(self):
+        if self.window.isFullScreen():
+            self.window.showNormal()
+        else:
+            self.window.showFullScreen()
+
+    def _widgetclosed(self):
+        if self.window._destroying:
+            return
+        self.window._destroying = True
+        try:
+            Gcf.destroy(self)
+        except AttributeError:
+            pass
+            # It seems that when the python session is killed,
+            # Gcf can get destroyed before the Gcf.destroy
+            # line is run, leading to a useless AttributeError.
+
+    def resize(self, width, height):
+        # The Qt methods return sizes in 'virtual' pixels so we do need to
+        # rescale from physical to logical pixels.
+        width = int(width / self.canvas.device_pixel_ratio)
+        height = int(height / self.canvas.device_pixel_ratio)
+        extra_width = self.window.width() - self.canvas.width()
+        extra_height = self.window.height() - self.canvas.height()
+        self.canvas.resize(width, height)
+        self.window.resize(width + extra_width, height + extra_height)
+
+    def show(self):
+        self.window.show()
+        if mpl.rcParams['figure.raise_window']:
+            self.window.activateWindow()
+            self.window.raise_()
+
+    def destroy(self, *args):
+        # check for qApp first, as PySide deletes it in its atexit handler
+        if QtWidgets.QApplication.instance() is None:
+            return
+        if self.window._destroying:
+            return
+        self.window._destroying = True
+        if self.toolbar:
+            self.toolbar.destroy()
+        self.window.close()
+
+    def get_window_title(self):
+        return self.window.windowTitle()
+
+    def set_window_title(self, title):
+        self.window.setWindowTitle(title)
+
+
+class NavigationToolbar2QT(NavigationToolbar2, QtWidgets.QToolBar):
+    message = QtCore.Signal(str)
+
+    toolitems = [*NavigationToolbar2.toolitems]
+    toolitems.insert(
+        # Add 'customize' action after 'subplots'
+        [name for name, *_ in toolitems].index("Subplots") + 1,
+        ("Customize", "Edit axis, curve and image parameters",
+         "qt4_editor_options", "edit_parameters"))
+
+    def __init__(self, canvas, parent=None, coordinates=True):
+        """coordinates: should we show the coordinates on the right?"""
+        QtWidgets.QToolBar.__init__(self, parent)
+        self.setAllowedAreas(QtCore.Qt.ToolBarArea(
+            _to_int(_enum("QtCore.Qt.ToolBarArea").TopToolBarArea) |
+            _to_int(_enum("QtCore.Qt.ToolBarArea").BottomToolBarArea)))
+
+        self.coordinates = coordinates
+        self._actions = {}  # mapping of toolitem method names to QActions.
+        self._subplot_dialog = None
+
+        for text, tooltip_text, image_file, callback in self.toolitems:
+            if text is None:
+                self.addSeparator()
+            else:
+                a = self.addAction(self._icon(image_file + '.png'),
+                                   text, getattr(self, callback))
+                self._actions[callback] = a
+                if callback in ['zoom', 'pan']:
+                    a.setCheckable(True)
+                if tooltip_text is not None:
+                    a.setToolTip(tooltip_text)
+
+        # Add the (x, y) location widget at the right side of the toolbar
+        # The stretch factor is 1 which means any resizing of the toolbar
+        # will resize this label instead of the buttons.
+        if self.coordinates:
+            self.locLabel = QtWidgets.QLabel("", self)
+            self.locLabel.setAlignment(QtCore.Qt.AlignmentFlag(
+                _to_int(_enum("QtCore.Qt.AlignmentFlag").AlignRight) |
+                _to_int(_enum("QtCore.Qt.AlignmentFlag").AlignVCenter)))
+            self.locLabel.setSizePolicy(QtWidgets.QSizePolicy(
+                _enum("QtWidgets.QSizePolicy.Policy").Expanding,
+                _enum("QtWidgets.QSizePolicy.Policy").Ignored,
+            ))
+            labelAction = self.addWidget(self.locLabel)
+            labelAction.setVisible(True)
+
+        NavigationToolbar2.__init__(self, canvas)
+
+    def _icon(self, name):
+        """
+        Construct a `.QIcon` from an image file *name*, including the extension
+        and relative to Matplotlib's "images" data directory.
+        """
+        # use a high-resolution icon with suffix '_large' if available
+        # note: user-provided icons may not have '_large' versions
+        path_regular = cbook._get_data_path('images', name)
+        path_large = path_regular.with_name(
+            path_regular.name.replace('.png', '_large.png'))
+        filename = str(path_large if path_large.exists() else path_regular)
+
+        pm = QtGui.QPixmap(filename)
+        _setDevicePixelRatio(pm, _devicePixelRatioF(self))
+        if self.palette().color(self.backgroundRole()).value() < 128:
+            icon_color = self.palette().color(self.foregroundRole())
+            mask = pm.createMaskFromColor(
+                QtGui.QColor('black'),
+                _enum("QtCore.Qt.MaskMode").MaskOutColor)
+            pm.fill(icon_color)
+            pm.setMask(mask)
+        return QtGui.QIcon(pm)
+
+    def edit_parameters(self):
+        axes = self.canvas.figure.get_axes()
+        if not axes:
+            QtWidgets.QMessageBox.warning(
+                self.canvas.parent(), "Error", "There are no axes to edit.")
+            return
+        elif len(axes) == 1:
+            ax, = axes
+        else:
+            titles = [
+                ax.get_label() or
+                ax.get_title() or
+                ax.get_title("left") or
+                ax.get_title("right") or
+                " - ".join(filter(None, [ax.get_xlabel(), ax.get_ylabel()])) or
+                f"<anonymous {type(ax).__name__}>"
+                for ax in axes]
+            duplicate_titles = [
+                title for title in titles if titles.count(title) > 1]
+            for i, ax in enumerate(axes):
+                if titles[i] in duplicate_titles:
+                    titles[i] += f" (id: {id(ax):#x})"  # Deduplicate titles.
+            item, ok = QtWidgets.QInputDialog.getItem(
+                self.canvas.parent(),
+                'Customize', 'Select axes:', titles, 0, False)
+            if not ok:
+                return
+            ax = axes[titles.index(item)]
+        figureoptions.figure_edit(ax, self)
+
+    def _update_buttons_checked(self):
+        # sync button checkstates to match active mode
+        if 'pan' in self._actions:
+            self._actions['pan'].setChecked(self.mode.name == 'PAN')
+        if 'zoom' in self._actions:
+            self._actions['zoom'].setChecked(self.mode.name == 'ZOOM')
+
+    def pan(self, *args):
+        super().pan(*args)
+        self._update_buttons_checked()
+
+    def zoom(self, *args):
+        super().zoom(*args)
+        self._update_buttons_checked()
+
+    def set_message(self, s):
+        self.message.emit(s)
+        if self.coordinates:
+            self.locLabel.setText(s)
+
+    def draw_rubberband(self, event, x0, y0, x1, y1):
+        height = self.canvas.figure.bbox.height
+        y1 = height - y1
+        y0 = height - y0
+        rect = [int(val) for val in (x0, y0, x1 - x0, y1 - y0)]
+        self.canvas.drawRectangle(rect)
+
+    def remove_rubberband(self):
+        self.canvas.drawRectangle(None)
+
+    def configure_subplots(self):
+        if self._subplot_dialog is None:
+            self._subplot_dialog = SubplotToolQt(
+                self.canvas.figure, self.canvas.parent())
+            self.canvas.mpl_connect(
+                "close_event", lambda e: self._subplot_dialog.reject())
+        self._subplot_dialog.update_from_current_subplotpars()
+        self._subplot_dialog.show()
+        return self._subplot_dialog
+
+    def save_figure(self, *args):
+        filetypes = self.canvas.get_supported_filetypes_grouped()
+        sorted_filetypes = sorted(filetypes.items())
+        default_filetype = self.canvas.get_default_filetype()
+
+        startpath = os.path.expanduser(mpl.rcParams['savefig.directory'])
+        start = os.path.join(startpath, self.canvas.get_default_filename())
+        filters = []
+        selectedFilter = None
+        for name, exts in sorted_filetypes:
+            exts_list = " ".join(['*.%s' % ext for ext in exts])
+            filter = '%s (%s)' % (name, exts_list)
+            if default_filetype in exts:
+                selectedFilter = filter
+            filters.append(filter)
+        filters = ';;'.join(filters)
+
+        fname, filter = qt_compat._getSaveFileName(
+            self.canvas.parent(), "Choose a filename to save to", start,
+            filters, selectedFilter)
+        if fname:
+            # Save dir for next time, unless empty str (i.e., use cwd).
+            if startpath != "":
+                mpl.rcParams['savefig.directory'] = os.path.dirname(fname)
+            try:
+                self.canvas.figure.savefig(fname)
+            except Exception as e:
+                QtWidgets.QMessageBox.critical(
+                    self, "Error saving file", str(e),
+                    _enum("QtWidgets.QMessageBox.StandardButton").Ok,
+                    _enum("QtWidgets.QMessageBox.StandardButton").NoButton)
+
+    def set_history_buttons(self):
+        can_backward = self._nav_stack._pos > 0
+        can_forward = self._nav_stack._pos < len(self._nav_stack._elements) - 1
+        if 'back' in self._actions:
+            self._actions['back'].setEnabled(can_backward)
+        if 'forward' in self._actions:
+            self._actions['forward'].setEnabled(can_forward)
+
+
+class SubplotToolQt(QtWidgets.QDialog):
+    def __init__(self, targetfig, parent):
+        super().__init__()
+        self.setWindowIcon(QtGui.QIcon(
+            str(cbook._get_data_path("images/matplotlib.png"))))
+        self.setObjectName("SubplotTool")
+        self._spinboxes = {}
+        main_layout = QtWidgets.QHBoxLayout()
+        self.setLayout(main_layout)
+        for group, spinboxes, buttons in [
+                ("Borders",
+                 ["top", "bottom", "left", "right"],
+                 [("Export values", self._export_values)]),
+                ("Spacings",
+                 ["hspace", "wspace"],
+                 [("Tight layout", self._tight_layout),
+                  ("Reset", self._reset),
+                  ("Close", self.close)])]:
+            layout = QtWidgets.QVBoxLayout()
+            main_layout.addLayout(layout)
+            box = QtWidgets.QGroupBox(group)
+            layout.addWidget(box)
+            inner = QtWidgets.QFormLayout(box)
+            for name in spinboxes:
+                self._spinboxes[name] = spinbox = QtWidgets.QDoubleSpinBox()
+                spinbox.setRange(0, 1)
+                spinbox.setDecimals(3)
+                spinbox.setSingleStep(0.005)
+                spinbox.setKeyboardTracking(False)
+                spinbox.valueChanged.connect(self._on_value_changed)
+                inner.addRow(name, spinbox)
+            layout.addStretch(1)
+            for name, method in buttons:
+                button = QtWidgets.QPushButton(name)
+                # Don't trigger on <enter>, which is used to input values.
+                button.setAutoDefault(False)
+                button.clicked.connect(method)
+                layout.addWidget(button)
+                if name == "Close":
+                    button.setFocus()
+        self._figure = targetfig
+        self._defaults = {}
+        self._export_values_dialog = None
+        self.update_from_current_subplotpars()
+
+    def update_from_current_subplotpars(self):
+        self._defaults = {spinbox: getattr(self._figure.subplotpars, name)
+                          for name, spinbox in self._spinboxes.items()}
+        self._reset()  # Set spinbox current values without triggering signals.
+
+    def _export_values(self):
+        # Explicitly round to 3 decimals (which is also the spinbox precision)
+        # to avoid numbers of the form 0.100...001.
+        self._export_values_dialog = QtWidgets.QDialog()
+        layout = QtWidgets.QVBoxLayout()
+        self._export_values_dialog.setLayout(layout)
+        text = QtWidgets.QPlainTextEdit()
+        text.setReadOnly(True)
+        layout.addWidget(text)
+        text.setPlainText(
+            ",\n".join(f"{attr}={spinbox.value():.3}"
+                       for attr, spinbox in self._spinboxes.items()))
+        # Adjust the height of the text widget to fit the whole text, plus
+        # some padding.
+        size = text.maximumSize()
+        size.setHeight(
+            QtGui.QFontMetrics(text.document().defaultFont())
+            .size(0, text.toPlainText()).height() + 20)
+        text.setMaximumSize(size)
+        self._export_values_dialog.show()
+
+    def _on_value_changed(self):
+        spinboxes = self._spinboxes
+        # Set all mins and maxes, so that this can also be used in _reset().
+        for lower, higher in [("bottom", "top"), ("left", "right")]:
+            spinboxes[higher].setMinimum(spinboxes[lower].value() + .001)
+            spinboxes[lower].setMaximum(spinboxes[higher].value() - .001)
+        self._figure.subplots_adjust(
+            **{attr: spinbox.value() for attr, spinbox in spinboxes.items()})
+        self._figure.canvas.draw_idle()
+
+    def _tight_layout(self):
+        self._figure.tight_layout()
+        for attr, spinbox in self._spinboxes.items():
+            spinbox.blockSignals(True)
+            spinbox.setValue(vars(self._figure.subplotpars)[attr])
+            spinbox.blockSignals(False)
+        self._figure.canvas.draw_idle()
+
+    def _reset(self):
+        for spinbox, value in self._defaults.items():
+            spinbox.setRange(0, 1)
+            spinbox.blockSignals(True)
+            spinbox.setValue(value)
+            spinbox.blockSignals(False)
+        self._on_value_changed()
+
+
+class ToolbarQt(ToolContainerBase, QtWidgets.QToolBar):
+    def __init__(self, toolmanager, parent=None):
+        ToolContainerBase.__init__(self, toolmanager)
+        QtWidgets.QToolBar.__init__(self, parent)
+        self.setAllowedAreas(QtCore.Qt.ToolBarArea(
+            _to_int(_enum("QtCore.Qt.ToolBarArea").TopToolBarArea) |
+            _to_int(_enum("QtCore.Qt.ToolBarArea").BottomToolBarArea)))
+        message_label = QtWidgets.QLabel("")
+        message_label.setAlignment(QtCore.Qt.AlignmentFlag(
+            _to_int(_enum("QtCore.Qt.AlignmentFlag").AlignRight) |
+            _to_int(_enum("QtCore.Qt.AlignmentFlag").AlignVCenter)))
+        message_label.setSizePolicy(QtWidgets.QSizePolicy(
+            _enum("QtWidgets.QSizePolicy.Policy").Expanding,
+            _enum("QtWidgets.QSizePolicy.Policy").Ignored,
+        ))
+        self._message_action = self.addWidget(message_label)
+        self._toolitems = {}
+        self._groups = {}
+
+    def add_toolitem(
+            self, name, group, position, image_file, description, toggle):
+
+        button = QtWidgets.QToolButton(self)
+        if image_file:
+            button.setIcon(NavigationToolbar2QT._icon(self, image_file))
+        button.setText(name)
+        if description:
+            button.setToolTip(description)
+
+        def handler():
+            self.trigger_tool(name)
+        if toggle:
+            button.setCheckable(True)
+            button.toggled.connect(handler)
+        else:
+            button.clicked.connect(handler)
+
+        self._toolitems.setdefault(name, [])
+        self._add_to_group(group, name, button, position)
+        self._toolitems[name].append((button, handler))
+
+    def _add_to_group(self, group, name, button, position):
+        gr = self._groups.get(group, [])
+        if not gr:
+            sep = self.insertSeparator(self._message_action)
+            gr.append(sep)
+        before = gr[position]
+        widget = self.insertWidget(before, button)
+        gr.insert(position, widget)
+        self._groups[group] = gr
+
+    def toggle_toolitem(self, name, toggled):
+        if name not in self._toolitems:
+            return
+        for button, handler in self._toolitems[name]:
+            button.toggled.disconnect(handler)
+            button.setChecked(toggled)
+            button.toggled.connect(handler)
+
+    def remove_toolitem(self, name):
+        for button, handler in self._toolitems[name]:
+            button.setParent(None)
+        del self._toolitems[name]
+
+    def set_message(self, s):
+        self.widgetForAction(self._message_action).setText(s)
+
+
+@backend_tools._register_tool_class(FigureCanvasQT)
+class ConfigureSubplotsQt(backend_tools.ConfigureSubplotsBase):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._subplot_dialog = None
+
+    def trigger(self, *args):
+        NavigationToolbar2QT.configure_subplots(self)
+
+
+@backend_tools._register_tool_class(FigureCanvasQT)
+class SaveFigureQt(backend_tools.SaveFigureBase):
+    def trigger(self, *args):
+        NavigationToolbar2QT.save_figure(
+            self._make_classic_style_pseudo_toolbar())
+
+
+@_api.deprecated("3.5", alternative="ToolSetCursor")
+class SetCursorQt(backend_tools.SetCursorBase):
+    def set_cursor(self, cursor):
+        NavigationToolbar2QT.set_cursor(
+            self._make_classic_style_pseudo_toolbar(), cursor)
+
+
+@backend_tools._register_tool_class(FigureCanvasQT)
+class RubberbandQt(backend_tools.RubberbandBase):
+    def draw_rubberband(self, x0, y0, x1, y1):
+        NavigationToolbar2QT.draw_rubberband(
+            self._make_classic_style_pseudo_toolbar(), None, x0, y0, x1, y1)
+
+    def remove_rubberband(self):
+        NavigationToolbar2QT.remove_rubberband(
+            self._make_classic_style_pseudo_toolbar())
+
+
+@backend_tools._register_tool_class(FigureCanvasQT)
+class HelpQt(backend_tools.ToolHelpBase):
+    def trigger(self, *args):
+        QtWidgets.QMessageBox.information(None, "Help", self._get_help_html())
+
+
+@backend_tools._register_tool_class(FigureCanvasQT)
+class ToolCopyToClipboardQT(backend_tools.ToolCopyToClipboardBase):
+    def trigger(self, *args, **kwargs):
+        pixmap = self.canvas.grab()
+        QtWidgets.QApplication.instance().clipboard().setPixmap(pixmap)
+
+
+FigureManagerQT._toolbar2_class = NavigationToolbar2QT
+FigureManagerQT._toolmanager_toolbar_class = ToolbarQt
+
+
+@_Backend.export
+class _BackendQT(_Backend):
+    backend_version = __version__
+    FigureCanvas = FigureCanvasQT
+    FigureManager = FigureManagerQT
+
+    @staticmethod
+    def mainloop():
+        qapp = QtWidgets.QApplication.instance()
+        with _maybe_allow_interrupt(qapp):
+            qt_compat._exec(qapp)
diff --git a/lib/matplotlib/backends/backend_qt4.py b/lib/matplotlib/backends/backend_qt4.py
deleted file mode 100644
index 9443bff90557..000000000000
--- a/lib/matplotlib/backends/backend_qt4.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from .. import _api
-from .backend_qt5 import (
-    backend_version, SPECIAL_KEYS,
-    SUPER, ALT, CTRL, SHIFT, MODIFIER_KEYS,  # These are deprecated.
-    cursord, _create_qApp, _BackendQT5, TimerQT, MainWindow, FigureCanvasQT,
-    FigureManagerQT, NavigationToolbar2QT, SubplotToolQt, exception_handler)
-
-
-_api.warn_deprecated("3.3", name=__name__, obj_type="backend")
-
-
-@_BackendQT5.export
-class _BackendQT4(_BackendQT5):
-    class FigureCanvas(FigureCanvasQT):
-        required_interactive_framework = "qt4"
diff --git a/lib/matplotlib/backends/backend_qt4agg.py b/lib/matplotlib/backends/backend_qt4agg.py
deleted file mode 100644
index 9f028c477643..000000000000
--- a/lib/matplotlib/backends/backend_qt4agg.py
+++ /dev/null
@@ -1,16 +0,0 @@
-"""
-Render to qt from agg
-"""
-
-from .. import _api
-from .backend_qt5agg import (
-    _BackendQT5Agg, FigureCanvasQTAgg, FigureManagerQT, NavigationToolbar2QT)
-
-
-_api.warn_deprecated("3.3", name=__name__, obj_type="backend")
-
-
-@_BackendQT5Agg.export
-class _BackendQT4Agg(_BackendQT5Agg):
-    class FigureCanvas(FigureCanvasQTAgg):
-        required_interactive_framework = "qt4"
diff --git a/lib/matplotlib/backends/backend_qt4cairo.py b/lib/matplotlib/backends/backend_qt4cairo.py
deleted file mode 100644
index 650b8166a6d1..000000000000
--- a/lib/matplotlib/backends/backend_qt4cairo.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from .. import _api
-from .backend_qt5cairo import _BackendQT5Cairo, FigureCanvasQTCairo
-
-
-_api.warn_deprecated("3.3", name=__name__, obj_type="backend")
-
-
-@_BackendQT5Cairo.export
-class _BackendQT4Cairo(_BackendQT5Cairo):
-    class FigureCanvas(FigureCanvasQTCairo):
-        required_interactive_framework = "qt4"
diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
index 0c2d32e1e8d1..b6f643a34aa9 100644
--- a/lib/matplotlib/backends/backend_qt5.py
+++ b/lib/matplotlib/backends/backend_qt5.py
@@ -1,1031 +1,28 @@
-import functools
-import os
-import signal
-import sys
-import traceback
+from .. import backends
 
-import matplotlib as mpl
-from matplotlib import _api, backend_tools, cbook
-from matplotlib._pylab_helpers import Gcf
-from matplotlib.backend_bases import (
-    _Backend, FigureCanvasBase, FigureManagerBase, NavigationToolbar2,
-    TimerBase, cursors, ToolContainerBase, StatusbarBase, MouseButton)
-import matplotlib.backends.qt_editor.figureoptions as figureoptions
-from matplotlib.backends.qt_editor._formsubplottool import UiSubplotTool
-from . import qt_compat
-from .qt_compat import (
-    QtCore, QtGui, QtWidgets, __version__, QT_API,
-    _devicePixelRatioF, _isdeleted, _setDevicePixelRatio,
-)
-
-backend_version = __version__
-
-# SPECIAL_KEYS are keys that do *not* return their unicode name
-# instead they have manually specified names
-SPECIAL_KEYS = {QtCore.Qt.Key_Control: 'control',
-                QtCore.Qt.Key_Shift: 'shift',
-                QtCore.Qt.Key_Alt: 'alt',
-                QtCore.Qt.Key_Meta: 'meta',
-                QtCore.Qt.Key_Super_L: 'super',
-                QtCore.Qt.Key_Super_R: 'super',
-                QtCore.Qt.Key_CapsLock: 'caps_lock',
-                QtCore.Qt.Key_Return: 'enter',
-                QtCore.Qt.Key_Left: 'left',
-                QtCore.Qt.Key_Up: 'up',
-                QtCore.Qt.Key_Right: 'right',
-                QtCore.Qt.Key_Down: 'down',
-                QtCore.Qt.Key_Escape: 'escape',
-                QtCore.Qt.Key_F1: 'f1',
-                QtCore.Qt.Key_F2: 'f2',
-                QtCore.Qt.Key_F3: 'f3',
-                QtCore.Qt.Key_F4: 'f4',
-                QtCore.Qt.Key_F5: 'f5',
-                QtCore.Qt.Key_F6: 'f6',
-                QtCore.Qt.Key_F7: 'f7',
-                QtCore.Qt.Key_F8: 'f8',
-                QtCore.Qt.Key_F9: 'f9',
-                QtCore.Qt.Key_F10: 'f10',
-                QtCore.Qt.Key_F11: 'f11',
-                QtCore.Qt.Key_F12: 'f12',
-                QtCore.Qt.Key_Home: 'home',
-                QtCore.Qt.Key_End: 'end',
-                QtCore.Qt.Key_PageUp: 'pageup',
-                QtCore.Qt.Key_PageDown: 'pagedown',
-                QtCore.Qt.Key_Tab: 'tab',
-                QtCore.Qt.Key_Backspace: 'backspace',
-                QtCore.Qt.Key_Enter: 'enter',
-                QtCore.Qt.Key_Insert: 'insert',
-                QtCore.Qt.Key_Delete: 'delete',
-                QtCore.Qt.Key_Pause: 'pause',
-                QtCore.Qt.Key_SysReq: 'sysreq',
-                QtCore.Qt.Key_Clear: 'clear', }
-if sys.platform == 'darwin':
-    # in OSX, the control and super (aka cmd/apple) keys are switched, so
-    # switch them back.
-    SPECIAL_KEYS.update({QtCore.Qt.Key_Control: 'cmd',  # cmd/apple key
-                         QtCore.Qt.Key_Meta: 'control',
-                         })
-# Define which modifier keys are collected on keyboard events.
-# Elements are (Modifier Flag, Qt Key) tuples.
-# Order determines the modifier order (ctrl+alt+...) reported by Matplotlib.
-_MODIFIER_KEYS = [
-    (QtCore.Qt.ControlModifier, QtCore.Qt.Key_Control),
-    (QtCore.Qt.AltModifier, QtCore.Qt.Key_Alt),
-    (QtCore.Qt.ShiftModifier, QtCore.Qt.Key_Shift),
-    (QtCore.Qt.MetaModifier, QtCore.Qt.Key_Meta),
-]
-cursord = {
-    cursors.MOVE: QtCore.Qt.SizeAllCursor,
-    cursors.HAND: QtCore.Qt.PointingHandCursor,
-    cursors.POINTER: QtCore.Qt.ArrowCursor,
-    cursors.SELECT_REGION: QtCore.Qt.CrossCursor,
-    cursors.WAIT: QtCore.Qt.WaitCursor,
-    }
-SUPER = 0  # Deprecated.
-ALT = 1  # Deprecated.
-CTRL = 2  # Deprecated.
-SHIFT = 3  # Deprecated.
-MODIFIER_KEYS = [  # Deprecated.
-    (SPECIAL_KEYS[key], mod, key) for mod, key in _MODIFIER_KEYS]
-
-
-# make place holder
-qApp = None
-
-
-def _create_qApp():
-    """
-    Only one qApp can exist at a time, so check before creating one.
-    """
-    global qApp
-
-    if qApp is None:
-        app = QtWidgets.QApplication.instance()
-        if app is None:
-            # display_is_valid returns False only if on Linux and neither X11
-            # nor Wayland display can be opened.
-            if not mpl._c_internal_utils.display_is_valid():
-                raise RuntimeError('Invalid DISPLAY variable')
-            try:
-                QtWidgets.QApplication.setAttribute(
-                    QtCore.Qt.AA_EnableHighDpiScaling)
-            except AttributeError:  # Attribute only exists for Qt>=5.6.
-                pass
-            try:
-                QtWidgets.QApplication.setHighDpiScaleFactorRoundingPolicy(
-                    QtCore.Qt.HighDpiScaleFactorRoundingPolicy.PassThrough)
-            except AttributeError:  # Added in Qt>=5.14.
-                pass
-            qApp = QtWidgets.QApplication(["matplotlib"])
-            qApp.lastWindowClosed.connect(qApp.quit)
-            cbook._setup_new_guiapp()
-        else:
-            qApp = app
-
-    try:
-        qApp.setAttribute(QtCore.Qt.AA_UseHighDpiPixmaps)
-    except AttributeError:
-        pass
-
-
-def _allow_super_init(__init__):
-    """
-    Decorator for ``__init__`` to allow ``super().__init__`` on PyQt4/PySide2.
-    """
-
-    if QT_API == "PyQt5":
-
-        return __init__
-
-    else:
-        # To work around lack of cooperative inheritance in PyQt4, PySide,
-        # and PySide2, when calling FigureCanvasQT.__init__, we temporarily
-        # patch QWidget.__init__ by a cooperative version, that first calls
-        # QWidget.__init__ with no additional arguments, and then finds the
-        # next class in the MRO with an __init__ that does support cooperative
-        # inheritance (i.e., not defined by the PyQt4, PySide, PySide2, sip
-        # or Shiboken packages), and manually call its `__init__`, once again
-        # passing the additional arguments.
-
-        qwidget_init = QtWidgets.QWidget.__init__
-
-        def cooperative_qwidget_init(self, *args, **kwargs):
-            qwidget_init(self)
-            mro = type(self).__mro__
-            next_coop_init = next(
-                cls for cls in mro[mro.index(QtWidgets.QWidget) + 1:]
-                if cls.__module__.split(".")[0] not in [
-                    "PyQt4", "sip", "PySide", "PySide2", "Shiboken"])
-            next_coop_init.__init__(self, *args, **kwargs)
-
-        @functools.wraps(__init__)
-        def wrapper(self, *args, **kwargs):
-            with cbook._setattr_cm(QtWidgets.QWidget,
-                                   __init__=cooperative_qwidget_init):
-                __init__(self, *args, **kwargs)
-
-        return wrapper
-
-
-class TimerQT(TimerBase):
-    """Subclass of `.TimerBase` using QTimer events."""
-
-    def __init__(self, *args, **kwargs):
-        # Create a new timer and connect the timeout() signal to the
-        # _on_timer method.
-        self._timer = QtCore.QTimer()
-        self._timer.timeout.connect(self._on_timer)
-        super().__init__(*args, **kwargs)
-
-    def __del__(self):
-        # The check for deletedness is needed to avoid an error at animation
-        # shutdown with PySide2.
-        if not _isdeleted(self._timer):
-            self._timer_stop()
-
-    def _timer_set_single_shot(self):
-        self._timer.setSingleShot(self._single)
-
-    def _timer_set_interval(self):
-        self._timer.setInterval(self._interval)
-
-    def _timer_start(self):
-        self._timer.start()
-
-    def _timer_stop(self):
-        self._timer.stop()
-
-
-class FigureCanvasQT(QtWidgets.QWidget, FigureCanvasBase):
-    required_interactive_framework = "qt5"
-    _timer_cls = TimerQT
-
-    # map Qt button codes to MouseEvent's ones:
-    buttond = {QtCore.Qt.LeftButton: MouseButton.LEFT,
-               QtCore.Qt.MidButton: MouseButton.MIDDLE,
-               QtCore.Qt.RightButton: MouseButton.RIGHT,
-               QtCore.Qt.XButton1: MouseButton.BACK,
-               QtCore.Qt.XButton2: MouseButton.FORWARD,
-               }
-
-    @_allow_super_init
-    def __init__(self, figure=None):
-        _create_qApp()
-        super().__init__(figure=figure)
-
-        # We don't want to scale up the figure DPI more than once.
-        # Note, we don't handle a signal for changing DPI yet.
-        self.figure._original_dpi = self.figure.dpi
-        self._update_figure_dpi()
-        # In cases with mixed resolution displays, we need to be careful if the
-        # dpi_ratio changes - in this case we need to resize the canvas
-        # accordingly.
-        self._dpi_ratio_prev = self._dpi_ratio
-
-        self._draw_pending = False
-        self._is_drawing = False
-        self._draw_rect_callback = lambda painter: None
-
-        self.setAttribute(QtCore.Qt.WA_OpaquePaintEvent)
-        self.setMouseTracking(True)
-        self.resize(*self.get_width_height())
-
-        palette = QtGui.QPalette(QtCore.Qt.white)
-        self.setPalette(palette)
-
-    def _update_figure_dpi(self):
-        dpi = self._dpi_ratio * self.figure._original_dpi
-        self.figure._set_dpi(dpi, forward=False)
-
-    @property
-    def _dpi_ratio(self):
-        return _devicePixelRatioF(self)
-
-    def _update_pixel_ratio(self):
-        # We need to be careful in cases with mixed resolution displays if
-        # dpi_ratio changes.
-        if self._dpi_ratio != self._dpi_ratio_prev:
-            # We need to update the figure DPI.
-            self._update_figure_dpi()
-            self._dpi_ratio_prev = self._dpi_ratio
-            # The easiest way to resize the canvas is to emit a resizeEvent
-            # since we implement all the logic for resizing the canvas for
-            # that event.
-            event = QtGui.QResizeEvent(self.size(), self.size())
-            self.resizeEvent(event)
-            # resizeEvent triggers a paintEvent itself, so we exit this one
-            # (after making sure that the event is immediately handled).
-
-    def _update_screen(self, screen):
-        # Handler for changes to a window's attached screen.
-        self._update_pixel_ratio()
-        if screen is not None:
-            screen.physicalDotsPerInchChanged.connect(self._update_pixel_ratio)
-            screen.logicalDotsPerInchChanged.connect(self._update_pixel_ratio)
-
-    def showEvent(self, event):
-        # Set up correct pixel ratio, and connect to any signal changes for it,
-        # once the window is shown (and thus has these attributes).
-        window = self.window().windowHandle()
-        window.screenChanged.connect(self._update_screen)
-        self._update_screen(window.screen())
-
-    def get_width_height(self):
-        w, h = FigureCanvasBase.get_width_height(self)
-        return int(w / self._dpi_ratio), int(h / self._dpi_ratio)
-
-    def enterEvent(self, event):
-        try:
-            x, y = self.mouseEventCoords(event.pos())
-        except AttributeError:
-            # the event from PyQt4 does not include the position
-            x = y = None
-        FigureCanvasBase.enter_notify_event(self, guiEvent=event, xy=(x, y))
-
-    def leaveEvent(self, event):
-        QtWidgets.QApplication.restoreOverrideCursor()
-        FigureCanvasBase.leave_notify_event(self, guiEvent=event)
-
-    def mouseEventCoords(self, pos):
-        """
-        Calculate mouse coordinates in physical pixels.
-
-        Qt5 use logical pixels, but the figure is scaled to physical
-        pixels for rendering.  Transform to physical pixels so that
-        all of the down-stream transforms work as expected.
-
-        Also, the origin is different and needs to be corrected.
-        """
-        dpi_ratio = self._dpi_ratio
-        x = pos.x()
-        # flip y so y=0 is bottom of canvas
-        y = self.figure.bbox.height / dpi_ratio - pos.y()
-        return x * dpi_ratio, y * dpi_ratio
-
-    def mousePressEvent(self, event):
-        x, y = self.mouseEventCoords(event.pos())
-        button = self.buttond.get(event.button())
-        if button is not None:
-            FigureCanvasBase.button_press_event(self, x, y, button,
-                                                guiEvent=event)
-
-    def mouseDoubleClickEvent(self, event):
-        x, y = self.mouseEventCoords(event.pos())
-        button = self.buttond.get(event.button())
-        if button is not None:
-            FigureCanvasBase.button_press_event(self, x, y,
-                                                button, dblclick=True,
-                                                guiEvent=event)
-
-    def mouseMoveEvent(self, event):
-        x, y = self.mouseEventCoords(event)
-        FigureCanvasBase.motion_notify_event(self, x, y, guiEvent=event)
-
-    def mouseReleaseEvent(self, event):
-        x, y = self.mouseEventCoords(event)
-        button = self.buttond.get(event.button())
-        if button is not None:
-            FigureCanvasBase.button_release_event(self, x, y, button,
-                                                  guiEvent=event)
-
-    if QtCore.qVersion() >= "5.":
-        def wheelEvent(self, event):
-            x, y = self.mouseEventCoords(event)
-            # from QWheelEvent::delta doc
-            if event.pixelDelta().x() == 0 and event.pixelDelta().y() == 0:
-                steps = event.angleDelta().y() / 120
-            else:
-                steps = event.pixelDelta().y()
-            if steps:
-                FigureCanvasBase.scroll_event(
-                    self, x, y, steps, guiEvent=event)
-    else:
-        def wheelEvent(self, event):
-            x = event.x()
-            # flipy so y=0 is bottom of canvas
-            y = self.figure.bbox.height - event.y()
-            # from QWheelEvent::delta doc
-            steps = event.delta() / 120
-            if event.orientation() == QtCore.Qt.Vertical:
-                FigureCanvasBase.scroll_event(
-                    self, x, y, steps, guiEvent=event)
-
-    def keyPressEvent(self, event):
-        key = self._get_key(event)
-        if key is not None:
-            FigureCanvasBase.key_press_event(self, key, guiEvent=event)
-
-    def keyReleaseEvent(self, event):
-        key = self._get_key(event)
-        if key is not None:
-            FigureCanvasBase.key_release_event(self, key, guiEvent=event)
-
-    def resizeEvent(self, event):
-        w = event.size().width() * self._dpi_ratio
-        h = event.size().height() * self._dpi_ratio
-        dpival = self.figure.dpi
-        winch = w / dpival
-        hinch = h / dpival
-        self.figure.set_size_inches(winch, hinch, forward=False)
-        # pass back into Qt to let it finish
-        QtWidgets.QWidget.resizeEvent(self, event)
-        # emit our resize events
-        FigureCanvasBase.resize_event(self)
-
-    def sizeHint(self):
-        w, h = self.get_width_height()
-        return QtCore.QSize(w, h)
-
-    def minumumSizeHint(self):
-        return QtCore.QSize(10, 10)
-
-    def _get_key(self, event):
-        event_key = event.key()
-        event_mods = int(event.modifiers())  # actually a bitmask
-
-        # get names of the pressed modifier keys
-        # 'control' is named 'control' when a standalone key, but 'ctrl' when a
-        # modifier
-        # bit twiddling to pick out modifier keys from event_mods bitmask,
-        # if event_key is a MODIFIER, it should not be duplicated in mods
-        mods = [SPECIAL_KEYS[key].replace('control', 'ctrl')
-                for mod, key in _MODIFIER_KEYS
-                if event_key != key and event_mods & mod]
-        try:
-            # for certain keys (enter, left, backspace, etc) use a word for the
-            # key, rather than unicode
-            key = SPECIAL_KEYS[event_key]
-        except KeyError:
-            # unicode defines code points up to 0x10ffff (sys.maxunicode)
-            # QT will use Key_Codes larger than that for keyboard keys that are
-            # are not unicode characters (like multimedia keys)
-            # skip these
-            # if you really want them, you should add them to SPECIAL_KEYS
-            if event_key > sys.maxunicode:
-                return None
-
-            key = chr(event_key)
-            # qt delivers capitalized letters.  fix capitalization
-            # note that capslock is ignored
-            if 'shift' in mods:
-                mods.remove('shift')
-            else:
-                key = key.lower()
-
-        return '+'.join(mods + [key])
-
-    def flush_events(self):
-        # docstring inherited
-        qApp.processEvents()
-
-    def start_event_loop(self, timeout=0):
-        # docstring inherited
-        if hasattr(self, "_event_loop") and self._event_loop.isRunning():
-            raise RuntimeError("Event loop already running")
-        self._event_loop = event_loop = QtCore.QEventLoop()
-        if timeout > 0:
-            timer = QtCore.QTimer.singleShot(int(timeout * 1000),
-                                             event_loop.quit)
-        event_loop.exec_()
-
-    def stop_event_loop(self, event=None):
-        # docstring inherited
-        if hasattr(self, "_event_loop"):
-            self._event_loop.quit()
-
-    def draw(self):
-        """Render the figure, and queue a request for a Qt draw."""
-        # The renderer draw is done here; delaying causes problems with code
-        # that uses the result of the draw() to update plot elements.
-        if self._is_drawing:
-            return
-        with cbook._setattr_cm(self, _is_drawing=True):
-            super().draw()
-        self.update()
-
-    def draw_idle(self):
-        """Queue redraw of the Agg buffer and request Qt paintEvent."""
-        # The Agg draw needs to be handled by the same thread Matplotlib
-        # modifies the scene graph from. Post Agg draw request to the
-        # current event loop in order to ensure thread affinity and to
-        # accumulate multiple draw requests from event handling.
-        # TODO: queued signal connection might be safer than singleShot
-        if not (getattr(self, '_draw_pending', False) or
-                getattr(self, '_is_drawing', False)):
-            self._draw_pending = True
-            QtCore.QTimer.singleShot(0, self._draw_idle)
-
-    def blit(self, bbox=None):
-        # docstring inherited
-        if bbox is None and self.figure:
-            bbox = self.figure.bbox  # Blit the entire canvas if bbox is None.
-        # repaint uses logical pixels, not physical pixels like the renderer.
-        l, b, w, h = [int(pt / self._dpi_ratio) for pt in bbox.bounds]
-        t = b + h
-        self.repaint(l, self.rect().height() - t, w, h)
-
-    def _draw_idle(self):
-        with self._idle_draw_cntx():
-            if not self._draw_pending:
-                return
-            self._draw_pending = False
-            if self.height() < 0 or self.width() < 0:
-                return
-            try:
-                self.draw()
-            except Exception:
-                # Uncaught exceptions are fatal for PyQt5, so catch them.
-                traceback.print_exc()
-
-    def drawRectangle(self, rect):
-        # Draw the zoom rectangle to the QPainter.  _draw_rect_callback needs
-        # to be called at the end of paintEvent.
-        if rect is not None:
-            x0, y0, w, h = [int(pt / self._dpi_ratio) for pt in rect]
-            x1 = x0 + w
-            y1 = y0 + h
-            def _draw_rect_callback(painter):
-                pen = QtGui.QPen(QtCore.Qt.black, 1 / self._dpi_ratio)
-                pen.setDashPattern([3, 3])
-                for color, offset in [
-                        (QtCore.Qt.black, 0), (QtCore.Qt.white, 3)]:
-                    pen.setDashOffset(offset)
-                    pen.setColor(color)
-                    painter.setPen(pen)
-                    # Draw the lines from x0, y0 towards x1, y1 so that the
-                    # dashes don't "jump" when moving the zoom box.
-                    painter.drawLine(x0, y0, x0, y1)
-                    painter.drawLine(x0, y0, x1, y0)
-                    painter.drawLine(x0, y1, x1, y1)
-                    painter.drawLine(x1, y0, x1, y1)
-        else:
-            def _draw_rect_callback(painter):
-                return
-        self._draw_rect_callback = _draw_rect_callback
-        self.update()
-
-
-class MainWindow(QtWidgets.QMainWindow):
-    closing = QtCore.Signal()
-
-    def closeEvent(self, event):
-        self.closing.emit()
-        super().closeEvent(event)
-
-
-class FigureManagerQT(FigureManagerBase):
-    """
-    Attributes
-    ----------
-    canvas : `FigureCanvas`
-        The FigureCanvas instance
-    num : int or str
-        The Figure number
-    toolbar : qt.QToolBar
-        The qt.QToolBar
-    window : qt.QMainWindow
-        The qt.QMainWindow
-    """
-
-    def __init__(self, canvas, num):
-        self.window = MainWindow()
-        super().__init__(canvas, num)
-        self.window.closing.connect(canvas.close_event)
-        self.window.closing.connect(self._widgetclosed)
-
-        image = str(cbook._get_data_path('images/matplotlib.svg'))
-        self.window.setWindowIcon(QtGui.QIcon(image))
-
-        self.window._destroying = False
-
-        self.toolbar = self._get_toolbar(self.canvas, self.window)
-
-        if self.toolmanager:
-            backend_tools.add_tools_to_manager(self.toolmanager)
-            if self.toolbar:
-                backend_tools.add_tools_to_container(self.toolbar)
+backends._QT_FORCE_QT5_BINDING = True
 
-        if self.toolbar:
-            self.window.addToolBar(self.toolbar)
-            tbs_height = self.toolbar.sizeHint().height()
-        else:
-            tbs_height = 0
-
-        # resize the main window so it will display the canvas with the
-        # requested size:
-        cs = canvas.sizeHint()
-        cs_height = cs.height()
-        height = cs_height + tbs_height
-        self.window.resize(cs.width(), height)
-
-        self.window.setCentralWidget(self.canvas)
-
-        if mpl.is_interactive():
-            self.window.show()
-            self.canvas.draw_idle()
-
-        # Give the keyboard focus to the figure instead of the manager:
-        # StrongFocus accepts both tab and click to focus and will enable the
-        # canvas to process event without clicking.
-        # https://doc.qt.io/qt-5/qt.html#FocusPolicy-enum
-        self.canvas.setFocusPolicy(QtCore.Qt.StrongFocus)
-        self.canvas.setFocus()
-
-        self.window.raise_()
-
-    def full_screen_toggle(self):
-        if self.window.isFullScreen():
-            self.window.showNormal()
-        else:
-            self.window.showFullScreen()
-
-    def _widgetclosed(self):
-        if self.window._destroying:
-            return
-        self.window._destroying = True
-        try:
-            Gcf.destroy(self)
-        except AttributeError:
-            pass
-            # It seems that when the python session is killed,
-            # Gcf can get destroyed before the Gcf.destroy
-            # line is run, leading to a useless AttributeError.
-
-    def _get_toolbar(self, canvas, parent):
-        # must be inited after the window, drawingArea and figure
-        # attrs are set
-        if mpl.rcParams['toolbar'] == 'toolbar2':
-            toolbar = NavigationToolbar2QT(canvas, parent, True)
-        elif mpl.rcParams['toolbar'] == 'toolmanager':
-            toolbar = ToolbarQt(self.toolmanager, self.window)
-        else:
-            toolbar = None
-        return toolbar
-
-    def resize(self, width, height):
-        # these are Qt methods so they return sizes in 'virtual' pixels
-        # so we do not need to worry about dpi scaling here.
-        extra_width = self.window.width() - self.canvas.width()
-        extra_height = self.window.height() - self.canvas.height()
-        self.canvas.resize(width, height)
-        self.window.resize(width + extra_width, height + extra_height)
-
-    def show(self):
-        self.window.show()
-        if mpl.rcParams['figure.raise_window']:
-            self.window.activateWindow()
-            self.window.raise_()
-
-    def destroy(self, *args):
-        # check for qApp first, as PySide deletes it in its atexit handler
-        if QtWidgets.QApplication.instance() is None:
-            return
-        if self.window._destroying:
-            return
-        self.window._destroying = True
-        if self.toolbar:
-            self.toolbar.destroy()
-        self.window.close()
-
-    def get_window_title(self):
-        return self.window.windowTitle()
-
-    def set_window_title(self, title):
-        self.window.setWindowTitle(title)
-
-
-class NavigationToolbar2QT(NavigationToolbar2, QtWidgets.QToolBar):
-    message = QtCore.Signal(str)
-
-    toolitems = [*NavigationToolbar2.toolitems]
-    toolitems.insert(
-        # Add 'customize' action after 'subplots'
-        [name for name, *_ in toolitems].index("Subplots") + 1,
-        ("Customize", "Edit axis, curve and image parameters",
-         "qt4_editor_options", "edit_parameters"))
-
-    def __init__(self, canvas, parent, coordinates=True):
-        """coordinates: should we show the coordinates on the right?"""
-        QtWidgets.QToolBar.__init__(self, parent)
-        self.setAllowedAreas(
-            QtCore.Qt.TopToolBarArea | QtCore.Qt.BottomToolBarArea)
-
-        self.coordinates = coordinates
-        self._actions = {}  # mapping of toolitem method names to QActions.
-
-        for text, tooltip_text, image_file, callback in self.toolitems:
-            if text is None:
-                self.addSeparator()
-            else:
-                a = self.addAction(self._icon(image_file + '.png'),
-                                   text, getattr(self, callback))
-                self._actions[callback] = a
-                if callback in ['zoom', 'pan']:
-                    a.setCheckable(True)
-                if tooltip_text is not None:
-                    a.setToolTip(tooltip_text)
-
-        # Add the (x, y) location widget at the right side of the toolbar
-        # The stretch factor is 1 which means any resizing of the toolbar
-        # will resize this label instead of the buttons.
-        if self.coordinates:
-            self.locLabel = QtWidgets.QLabel("", self)
-            self.locLabel.setAlignment(
-                QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
-            self.locLabel.setSizePolicy(
-                QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding,
-                                      QtWidgets.QSizePolicy.Ignored))
-            labelAction = self.addWidget(self.locLabel)
-            labelAction.setVisible(True)
-
-        NavigationToolbar2.__init__(self, canvas)
-
-    @_api.deprecated("3.3", alternative="self.canvas.parent()")
-    @property
-    def parent(self):
-        return self.canvas.parent()
-
-    @_api.deprecated("3.3", alternative="self.canvas.setParent()")
-    @parent.setter
-    def parent(self, value):
-        pass
-
-    @_api.deprecated(
-        "3.3", alternative="os.path.join(mpl.get_data_path(), 'images')")
-    @property
-    def basedir(self):
-        return str(cbook._get_data_path('images'))
-
-    def _icon(self, name):
-        """
-        Construct a `.QIcon` from an image file *name*, including the extension
-        and relative to Matplotlib's "images" data directory.
-        """
-        if QtCore.qVersion() >= '5.':
-            name = name.replace('.png', '_large.png')
-        pm = QtGui.QPixmap(str(cbook._get_data_path('images', name)))
-        _setDevicePixelRatio(pm, _devicePixelRatioF(self))
-        if self.palette().color(self.backgroundRole()).value() < 128:
-            icon_color = self.palette().color(self.foregroundRole())
-            mask = pm.createMaskFromColor(QtGui.QColor('black'),
-                                          QtCore.Qt.MaskOutColor)
-            pm.fill(icon_color)
-            pm.setMask(mask)
-        return QtGui.QIcon(pm)
-
-    def edit_parameters(self):
-        axes = self.canvas.figure.get_axes()
-        if not axes:
-            QtWidgets.QMessageBox.warning(
-                self.canvas.parent(), "Error", "There are no axes to edit.")
-            return
-        elif len(axes) == 1:
-            ax, = axes
-        else:
-            titles = [
-                ax.get_label() or
-                ax.get_title() or
-                " - ".join(filter(None, [ax.get_xlabel(), ax.get_ylabel()])) or
-                f"<anonymous {type(ax).__name__}>"
-                for ax in axes]
-            duplicate_titles = [
-                title for title in titles if titles.count(title) > 1]
-            for i, ax in enumerate(axes):
-                if titles[i] in duplicate_titles:
-                    titles[i] += f" (id: {id(ax):#x})"  # Deduplicate titles.
-            item, ok = QtWidgets.QInputDialog.getItem(
-                self.canvas.parent(),
-                'Customize', 'Select axes:', titles, 0, False)
-            if not ok:
-                return
-            ax = axes[titles.index(item)]
-        figureoptions.figure_edit(ax, self)
-
-    def _update_buttons_checked(self):
-        # sync button checkstates to match active mode
-        if 'pan' in self._actions:
-            self._actions['pan'].setChecked(self.mode.name == 'PAN')
-        if 'zoom' in self._actions:
-            self._actions['zoom'].setChecked(self.mode.name == 'ZOOM')
-
-    def pan(self, *args):
-        super().pan(*args)
-        self._update_buttons_checked()
-
-    def zoom(self, *args):
-        super().zoom(*args)
-        self._update_buttons_checked()
-
-    def set_message(self, s):
-        self.message.emit(s)
-        if self.coordinates:
-            self.locLabel.setText(s)
-
-    def set_cursor(self, cursor):
-        self.canvas.setCursor(cursord[cursor])
-
-    def draw_rubberband(self, event, x0, y0, x1, y1):
-        height = self.canvas.figure.bbox.height
-        y1 = height - y1
-        y0 = height - y0
-        rect = [int(val) for val in (x0, y0, x1 - x0, y1 - y0)]
-        self.canvas.drawRectangle(rect)
-
-    def remove_rubberband(self):
-        self.canvas.drawRectangle(None)
-
-    def configure_subplots(self):
-        image = str(cbook._get_data_path('images/matplotlib.png'))
-        dia = SubplotToolQt(self.canvas.figure, self.canvas.parent())
-        dia.setWindowIcon(QtGui.QIcon(image))
-        dia.exec_()
-
-    def save_figure(self, *args):
-        filetypes = self.canvas.get_supported_filetypes_grouped()
-        sorted_filetypes = sorted(filetypes.items())
-        default_filetype = self.canvas.get_default_filetype()
-
-        startpath = os.path.expanduser(mpl.rcParams['savefig.directory'])
-        start = os.path.join(startpath, self.canvas.get_default_filename())
-        filters = []
-        selectedFilter = None
-        for name, exts in sorted_filetypes:
-            exts_list = " ".join(['*.%s' % ext for ext in exts])
-            filter = '%s (%s)' % (name, exts_list)
-            if default_filetype in exts:
-                selectedFilter = filter
-            filters.append(filter)
-        filters = ';;'.join(filters)
-
-        fname, filter = qt_compat._getSaveFileName(
-            self.canvas.parent(), "Choose a filename to save to", start,
-            filters, selectedFilter)
-        if fname:
-            # Save dir for next time, unless empty str (i.e., use cwd).
-            if startpath != "":
-                mpl.rcParams['savefig.directory'] = os.path.dirname(fname)
-            try:
-                self.canvas.figure.savefig(fname)
-            except Exception as e:
-                QtWidgets.QMessageBox.critical(
-                    self, "Error saving file", str(e),
-                    QtWidgets.QMessageBox.Ok, QtWidgets.QMessageBox.NoButton)
-
-    def set_history_buttons(self):
-        can_backward = self._nav_stack._pos > 0
-        can_forward = self._nav_stack._pos < len(self._nav_stack._elements) - 1
-        if 'back' in self._actions:
-            self._actions['back'].setEnabled(can_backward)
-        if 'forward' in self._actions:
-            self._actions['forward'].setEnabled(can_forward)
-
-
-class SubplotToolQt(UiSubplotTool):
-    def __init__(self, targetfig, parent):
-        super().__init__(None)
-
-        self._figure = targetfig
-
-        for lower, higher in [("bottom", "top"), ("left", "right")]:
-            self._widgets[lower].valueChanged.connect(
-                lambda val: self._widgets[higher].setMinimum(val + .001))
-            self._widgets[higher].valueChanged.connect(
-                lambda val: self._widgets[lower].setMaximum(val - .001))
-
-        self._attrs = ["top", "bottom", "left", "right", "hspace", "wspace"]
-        self._defaults = {attr: vars(self._figure.subplotpars)[attr]
-                          for attr in self._attrs}
-
-        # Set values after setting the range callbacks, but before setting up
-        # the redraw callbacks.
-        self._reset()
-
-        for attr in self._attrs:
-            self._widgets[attr].valueChanged.connect(self._on_value_changed)
-        for action, method in [("Export values", self._export_values),
-                               ("Tight layout", self._tight_layout),
-                               ("Reset", self._reset),
-                               ("Close", self.close)]:
-            self._widgets[action].clicked.connect(method)
-
-    def _export_values(self):
-        # Explicitly round to 3 decimals (which is also the spinbox precision)
-        # to avoid numbers of the form 0.100...001.
-        dialog = QtWidgets.QDialog()
-        layout = QtWidgets.QVBoxLayout()
-        dialog.setLayout(layout)
-        text = QtWidgets.QPlainTextEdit()
-        text.setReadOnly(True)
-        layout.addWidget(text)
-        text.setPlainText(
-            ",\n".join("{}={:.3}".format(attr, self._widgets[attr].value())
-                       for attr in self._attrs))
-        # Adjust the height of the text widget to fit the whole text, plus
-        # some padding.
-        size = text.maximumSize()
-        size.setHeight(
-            QtGui.QFontMetrics(text.document().defaultFont())
-            .size(0, text.toPlainText()).height() + 20)
-        text.setMaximumSize(size)
-        dialog.exec_()
-
-    def _on_value_changed(self):
-        self._figure.subplots_adjust(**{attr: self._widgets[attr].value()
-                                        for attr in self._attrs})
-        self._figure.canvas.draw_idle()
-
-    def _tight_layout(self):
-        self._figure.tight_layout()
-        for attr in self._attrs:
-            widget = self._widgets[attr]
-            widget.blockSignals(True)
-            widget.setValue(vars(self._figure.subplotpars)[attr])
-            widget.blockSignals(False)
-        self._figure.canvas.draw_idle()
-
-    def _reset(self):
-        for attr, value in self._defaults.items():
-            self._widgets[attr].setValue(value)
-
-
-class ToolbarQt(ToolContainerBase, QtWidgets.QToolBar):
-    def __init__(self, toolmanager, parent):
-        ToolContainerBase.__init__(self, toolmanager)
-        QtWidgets.QToolBar.__init__(self, parent)
-        self.setAllowedAreas(
-            QtCore.Qt.TopToolBarArea | QtCore.Qt.BottomToolBarArea)
-        message_label = QtWidgets.QLabel("")
-        message_label.setAlignment(
-            QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
-        message_label.setSizePolicy(
-            QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding,
-                                  QtWidgets.QSizePolicy.Ignored))
-        self._message_action = self.addWidget(message_label)
-        self._toolitems = {}
-        self._groups = {}
-
-    def add_toolitem(
-            self, name, group, position, image_file, description, toggle):
-
-        button = QtWidgets.QToolButton(self)
-        if image_file:
-            button.setIcon(NavigationToolbar2QT._icon(self, image_file))
-        button.setText(name)
-        if description:
-            button.setToolTip(description)
-
-        def handler():
-            self.trigger_tool(name)
-        if toggle:
-            button.setCheckable(True)
-            button.toggled.connect(handler)
-        else:
-            button.clicked.connect(handler)
-
-        self._toolitems.setdefault(name, [])
-        self._add_to_group(group, name, button, position)
-        self._toolitems[name].append((button, handler))
-
-    def _add_to_group(self, group, name, button, position):
-        gr = self._groups.get(group, [])
-        if not gr:
-            sep = self.insertSeparator(self._message_action)
-            gr.append(sep)
-        before = gr[position]
-        widget = self.insertWidget(before, button)
-        gr.insert(position, widget)
-        self._groups[group] = gr
-
-    def toggle_toolitem(self, name, toggled):
-        if name not in self._toolitems:
-            return
-        for button, handler in self._toolitems[name]:
-            button.toggled.disconnect(handler)
-            button.setChecked(toggled)
-            button.toggled.connect(handler)
-
-    def remove_toolitem(self, name):
-        for button, handler in self._toolitems[name]:
-            button.setParent(None)
-        del self._toolitems[name]
-
-    def set_message(self, s):
-        self.widgetForAction(self._message_action).setText(s)
-
-
-@_api.deprecated("3.3")
-class StatusbarQt(StatusbarBase, QtWidgets.QLabel):
-    def __init__(self, window, *args, **kwargs):
-        StatusbarBase.__init__(self, *args, **kwargs)
-        QtWidgets.QLabel.__init__(self)
-        window.statusBar().addWidget(self)
-
-    def set_message(self, s):
-        self.setText(s)
-
-
-class ConfigureSubplotsQt(backend_tools.ConfigureSubplotsBase):
-    def trigger(self, *args):
-        NavigationToolbar2QT.configure_subplots(
-            self._make_classic_style_pseudo_toolbar())
-
-
-class SaveFigureQt(backend_tools.SaveFigureBase):
-    def trigger(self, *args):
-        NavigationToolbar2QT.save_figure(
-            self._make_classic_style_pseudo_toolbar())
-
-
-class SetCursorQt(backend_tools.SetCursorBase):
-    def set_cursor(self, cursor):
-        NavigationToolbar2QT.set_cursor(
-            self._make_classic_style_pseudo_toolbar(), cursor)
-
-
-class RubberbandQt(backend_tools.RubberbandBase):
-    def draw_rubberband(self, x0, y0, x1, y1):
-        NavigationToolbar2QT.draw_rubberband(
-            self._make_classic_style_pseudo_toolbar(), None, x0, y0, x1, y1)
-
-    def remove_rubberband(self):
-        NavigationToolbar2QT.remove_rubberband(
-            self._make_classic_style_pseudo_toolbar())
-
-
-class HelpQt(backend_tools.ToolHelpBase):
-    def trigger(self, *args):
-        QtWidgets.QMessageBox.information(None, "Help", self._get_help_html())
-
-
-class ToolCopyToClipboardQT(backend_tools.ToolCopyToClipboardBase):
-    def trigger(self, *args, **kwargs):
-        pixmap = self.canvas.grab()
-        qApp.clipboard().setPixmap(pixmap)
 
+from .backend_qt import (  # noqa
+    SPECIAL_KEYS,
+    # Public API
+    cursord, _create_qApp, _BackendQT, TimerQT, MainWindow, FigureCanvasQT,
+    FigureManagerQT, ToolbarQt, NavigationToolbar2QT, SubplotToolQt,
+    SaveFigureQt, ConfigureSubplotsQt, SetCursorQt, RubberbandQt,
+    HelpQt, ToolCopyToClipboardQT,
+    # internal re-exports
+    FigureCanvasBase,  FigureManagerBase, MouseButton, NavigationToolbar2,
+    TimerBase, ToolContainerBase, figureoptions, Gcf
+)
+from . import backend_qt as _backend_qt  # noqa
 
-backend_tools.ToolSaveFigure = SaveFigureQt
-backend_tools.ToolConfigureSubplots = ConfigureSubplotsQt
-backend_tools.ToolSetCursor = SetCursorQt
-backend_tools.ToolRubberband = RubberbandQt
-backend_tools.ToolHelp = HelpQt
-backend_tools.ToolCopyToClipboard = ToolCopyToClipboardQT
 
+@_BackendQT.export
+class _BackendQT5(_BackendQT):
+    pass
 
-@_Backend.export
-class _BackendQT5(_Backend):
-    FigureCanvas = FigureCanvasQT
-    FigureManager = FigureManagerQT
 
-    @staticmethod
-    def mainloop():
-        old_signal = signal.getsignal(signal.SIGINT)
-        # allow SIGINT exceptions to close the plot window.
-        is_python_signal_handler = old_signal is not None
-        if is_python_signal_handler:
-            signal.signal(signal.SIGINT, signal.SIG_DFL)
-        try:
-            qApp.exec_()
-        finally:
-            # reset the SIGINT exception handler
-            if is_python_signal_handler:
-                signal.signal(signal.SIGINT, old_signal)
+def __getattr__(name):
+    if name == 'qApp':
+        return _backend_qt.qApp
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
diff --git a/lib/matplotlib/backends/backend_qt5agg.py b/lib/matplotlib/backends/backend_qt5agg.py
index 897c28c38f04..8a92fd5135d5 100644
--- a/lib/matplotlib/backends/backend_qt5agg.py
+++ b/lib/matplotlib/backends/backend_qt5agg.py
@@ -1,84 +1,14 @@
 """
-Render to qt from agg.
+Render to qt from agg
 """
+from .. import backends
 
-import ctypes
+backends._QT_FORCE_QT5_BINDING = True
+from .backend_qtagg import (    # noqa: F401, E402 # pylint: disable=W0611
+    _BackendQTAgg, FigureCanvasQTAgg, FigureManagerQT, NavigationToolbar2QT,
+    FigureCanvasAgg, FigureCanvasQT)
 
-from matplotlib.transforms import Bbox
 
-from .. import cbook
-from .backend_agg import FigureCanvasAgg
-from .backend_qt5 import (
-    QtCore, QtGui, QtWidgets, _BackendQT5, FigureCanvasQT, FigureManagerQT,
-    NavigationToolbar2QT, backend_version)
-from .qt_compat import QT_API, _setDevicePixelRatio
-
-
-class FigureCanvasQTAgg(FigureCanvasAgg, FigureCanvasQT):
-
-    def __init__(self, figure=None):
-        # Must pass 'figure' as kwarg to Qt base class.
-        super().__init__(figure=figure)
-
-    def paintEvent(self, event):
-        """
-        Copy the image from the Agg canvas to the qt.drawable.
-
-        In Qt, all drawing should be done inside of here when a widget is
-        shown onscreen.
-        """
-        self._draw_idle()  # Only does something if a draw is pending.
-
-        # If the canvas does not have a renderer, then give up and wait for
-        # FigureCanvasAgg.draw(self) to be called.
-        if not hasattr(self, 'renderer'):
-            return
-
-        painter = QtGui.QPainter(self)
-        try:
-            # See documentation of QRect: bottom() and right() are off
-            # by 1, so use left() + width() and top() + height().
-            rect = event.rect()
-            # scale rect dimensions using the screen dpi ratio to get
-            # correct values for the Figure coordinates (rather than
-            # QT5's coords)
-            width = rect.width() * self._dpi_ratio
-            height = rect.height() * self._dpi_ratio
-            left, top = self.mouseEventCoords(rect.topLeft())
-            # shift the "top" by the height of the image to get the
-            # correct corner for our coordinate system
-            bottom = top - height
-            # same with the right side of the image
-            right = left + width
-            # create a buffer using the image bounding box
-            bbox = Bbox([[left, bottom], [right, top]])
-            reg = self.copy_from_bbox(bbox)
-            buf = cbook._unmultiplied_rgba8888_to_premultiplied_argb32(
-                memoryview(reg))
-
-            # clear the widget canvas
-            painter.eraseRect(rect)
-
-            qimage = QtGui.QImage(buf, buf.shape[1], buf.shape[0],
-                                  QtGui.QImage.Format_ARGB32_Premultiplied)
-            _setDevicePixelRatio(qimage, self._dpi_ratio)
-            # set origin using original QT coordinates
-            origin = QtCore.QPoint(rect.left(), rect.top())
-            painter.drawImage(origin, qimage)
-            # Adjust the buf reference count to work around a memory
-            # leak bug in QImage under PySide on Python 3.
-            if QT_API in ('PySide', 'PySide2'):
-                ctypes.c_long.from_address(id(buf)).value = 1
-
-            self._draw_rect_callback(painter)
-        finally:
-            painter.end()
-
-    def print_figure(self, *args, **kwargs):
-        super().print_figure(*args, **kwargs)
-        self.draw()
-
-
-@_BackendQT5.export
-class _BackendQT5Agg(_BackendQT5):
-    FigureCanvas = FigureCanvasQTAgg
+@_BackendQTAgg.export
+class _BackendQT5Agg(_BackendQTAgg):
+    pass
diff --git a/lib/matplotlib/backends/backend_qt5cairo.py b/lib/matplotlib/backends/backend_qt5cairo.py
index 4b6d7305e7c1..a4263f597119 100644
--- a/lib/matplotlib/backends/backend_qt5cairo.py
+++ b/lib/matplotlib/backends/backend_qt5cairo.py
@@ -1,45 +1,11 @@
-import ctypes
+from .. import backends
 
-from .backend_cairo import cairo, FigureCanvasCairo, RendererCairo
-from .backend_qt5 import QtCore, QtGui, _BackendQT5, FigureCanvasQT
-from .qt_compat import QT_API, _setDevicePixelRatio
+backends._QT_FORCE_QT5_BINDING = True
+from .backend_qtcairo import (  # noqa: F401, E402 # pylint: disable=W0611
+    _BackendQTCairo, FigureCanvasQTCairo, FigureCanvasCairo, FigureCanvasQT
+)
 
 
-class FigureCanvasQTCairo(FigureCanvasQT, FigureCanvasCairo):
-    def __init__(self, figure=None):
-        super().__init__(figure=figure)
-        self._renderer = RendererCairo(self.figure.dpi)
-        self._renderer.set_width_height(-1, -1)  # Invalid values.
-
-    def draw(self):
-        if hasattr(self._renderer.gc, "ctx"):
-            self.figure.draw(self._renderer)
-        super().draw()
-
-    def paintEvent(self, event):
-        dpi_ratio = self._dpi_ratio
-        width = int(dpi_ratio * self.width())
-        height = int(dpi_ratio * self.height())
-        if (width, height) != self._renderer.get_canvas_width_height():
-            surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
-            self._renderer.set_ctx_from_surface(surface)
-            self._renderer.set_width_height(width, height)
-            self.figure.draw(self._renderer)
-        buf = self._renderer.gc.ctx.get_target().get_data()
-        qimage = QtGui.QImage(buf, width, height,
-                              QtGui.QImage.Format_ARGB32_Premultiplied)
-        # Adjust the buf reference count to work around a memory leak bug in
-        # QImage under PySide on Python 3.
-        if QT_API == 'PySide':
-            ctypes.c_long.from_address(id(buf)).value = 1
-        _setDevicePixelRatio(qimage, dpi_ratio)
-        painter = QtGui.QPainter(self)
-        painter.eraseRect(event.rect())
-        painter.drawImage(0, 0, qimage)
-        self._draw_rect_callback(painter)
-        painter.end()
-
-
-@_BackendQT5.export
-class _BackendQT5Cairo(_BackendQT5):
-    FigureCanvas = FigureCanvasQTCairo
+@_BackendQTCairo.export
+class _BackendQT5Cairo(_BackendQTCairo):
+    pass
diff --git a/lib/matplotlib/backends/backend_qtagg.py b/lib/matplotlib/backends/backend_qtagg.py
new file mode 100644
index 000000000000..dde185107e98
--- /dev/null
+++ b/lib/matplotlib/backends/backend_qtagg.py
@@ -0,0 +1,87 @@
+"""
+Render to qt from agg.
+"""
+
+import ctypes
+
+from matplotlib.transforms import Bbox
+
+from .qt_compat import QT_API, _enum, _setDevicePixelRatio
+from .. import cbook
+from .backend_agg import FigureCanvasAgg
+from .backend_qt import QtCore, QtGui, _BackendQT, FigureCanvasQT
+from .backend_qt import (  # noqa: F401 # pylint: disable=W0611
+    FigureManagerQT, NavigationToolbar2QT)
+
+
+class FigureCanvasQTAgg(FigureCanvasAgg, FigureCanvasQT):
+
+    def paintEvent(self, event):
+        """
+        Copy the image from the Agg canvas to the qt.drawable.
+
+        In Qt, all drawing should be done inside of here when a widget is
+        shown onscreen.
+        """
+        self._draw_idle()  # Only does something if a draw is pending.
+
+        # If the canvas does not have a renderer, then give up and wait for
+        # FigureCanvasAgg.draw(self) to be called.
+        if not hasattr(self, 'renderer'):
+            return
+
+        painter = QtGui.QPainter(self)
+        try:
+            # See documentation of QRect: bottom() and right() are off
+            # by 1, so use left() + width() and top() + height().
+            rect = event.rect()
+            # scale rect dimensions using the screen dpi ratio to get
+            # correct values for the Figure coordinates (rather than
+            # QT5's coords)
+            width = rect.width() * self.device_pixel_ratio
+            height = rect.height() * self.device_pixel_ratio
+            left, top = self.mouseEventCoords(rect.topLeft())
+            # shift the "top" by the height of the image to get the
+            # correct corner for our coordinate system
+            bottom = top - height
+            # same with the right side of the image
+            right = left + width
+            # create a buffer using the image bounding box
+            bbox = Bbox([[left, bottom], [right, top]])
+            reg = self.copy_from_bbox(bbox)
+            buf = cbook._unmultiplied_rgba8888_to_premultiplied_argb32(
+                memoryview(reg))
+
+            # clear the widget canvas
+            painter.eraseRect(rect)
+
+            if QT_API == "PyQt6":
+                from PyQt6 import sip
+                ptr = int(sip.voidptr(buf))
+            else:
+                ptr = buf
+            qimage = QtGui.QImage(
+                ptr, buf.shape[1], buf.shape[0],
+                _enum("QtGui.QImage.Format").Format_ARGB32_Premultiplied)
+            _setDevicePixelRatio(qimage, self.device_pixel_ratio)
+            # set origin using original QT coordinates
+            origin = QtCore.QPoint(rect.left(), rect.top())
+            painter.drawImage(origin, qimage)
+            # Adjust the buf reference count to work around a memory
+            # leak bug in QImage under PySide.
+            if QT_API in ('PySide', 'PySide2'):
+                if QtCore.__version_info__ < (5, 12):
+                    ctypes.c_long.from_address(id(buf)).value = 1
+
+            self._draw_rect_callback(painter)
+        finally:
+            painter.end()
+
+    def print_figure(self, *args, **kwargs):
+        super().print_figure(*args, **kwargs)
+        self.draw()
+
+
+@_BackendQT.export
+class _BackendQTAgg(_BackendQT):
+    FigureCanvas = FigureCanvasQTAgg
diff --git a/lib/matplotlib/backends/backend_qtcairo.py b/lib/matplotlib/backends/backend_qtcairo.py
new file mode 100644
index 000000000000..f6064285df5b
--- /dev/null
+++ b/lib/matplotlib/backends/backend_qtcairo.py
@@ -0,0 +1,47 @@
+import ctypes
+
+from .backend_cairo import cairo, FigureCanvasCairo
+from .backend_qt import QtCore, QtGui, _BackendQT, FigureCanvasQT
+from .qt_compat import QT_API, _enum, _setDevicePixelRatio
+
+
+class FigureCanvasQTCairo(FigureCanvasCairo, FigureCanvasQT):
+    def draw(self):
+        if hasattr(self._renderer.gc, "ctx"):
+            self._renderer.dpi = self.figure.dpi
+            self.figure.draw(self._renderer)
+        super().draw()
+
+    def paintEvent(self, event):
+        width = int(self.device_pixel_ratio * self.width())
+        height = int(self.device_pixel_ratio * self.height())
+        if (width, height) != self._renderer.get_canvas_width_height():
+            surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
+            self._renderer.set_context(cairo.Context(surface))
+            self._renderer.dpi = self.figure.dpi
+            self.figure.draw(self._renderer)
+        buf = self._renderer.gc.ctx.get_target().get_data()
+        if QT_API == "PyQt6":
+            from PyQt6 import sip
+            ptr = int(sip.voidptr(buf))
+        else:
+            ptr = buf
+        qimage = QtGui.QImage(
+            ptr, width, height,
+            _enum("QtGui.QImage.Format").Format_ARGB32_Premultiplied)
+        # Adjust the buf reference count to work around a memory leak bug in
+        # QImage under PySide.
+        if QT_API in ('PySide', 'PySide2'):
+            if QtCore.__version_info__ < (5, 12):
+                ctypes.c_long.from_address(id(buf)).value = 1
+        _setDevicePixelRatio(qimage, self.device_pixel_ratio)
+        painter = QtGui.QPainter(self)
+        painter.eraseRect(event.rect())
+        painter.drawImage(0, 0, qimage)
+        self._draw_rect_callback(painter)
+        painter.end()
+
+
+@_BackendQT.export
+class _BackendQTCairo(_BackendQT):
+    FigureCanvas = FigureCanvasQTCairo
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
index 21a853693b1c..9a472899c193 100644
--- a/lib/matplotlib/backends/backend_svg.py
+++ b/lib/matplotlib/backends/backend_svg.py
@@ -1,9 +1,9 @@
-from collections import OrderedDict
 import base64
+import codecs
 import datetime
 import gzip
 import hashlib
-from io import BytesIO, StringIO, TextIOWrapper
+from io import BytesIO
 import itertools
 import logging
 import os
@@ -14,23 +14,19 @@
 from PIL import Image
 
 import matplotlib as mpl
-from matplotlib import _api, cbook
+from matplotlib import _api, cbook, font_manager as fm
 from matplotlib.backend_bases import (
-     _Backend, _check_savefig_extra_args, FigureCanvasBase, FigureManagerBase,
-     RendererBase, _no_output_draw)
+     _Backend, FigureCanvasBase, FigureManagerBase, RendererBase)
 from matplotlib.backends.backend_mixed import MixedModeRenderer
 from matplotlib.colors import rgb2hex
 from matplotlib.dates import UTC
-from matplotlib.font_manager import findfont, get_font
-from matplotlib.ft2font import LOAD_NO_HINTING
-from matplotlib.mathtext import MathTextParser
 from matplotlib.path import Path
 from matplotlib import _path
 from matplotlib.transforms import Affine2D, Affine2DBase
 
+
 _log = logging.getLogger(__name__)
 
-backend_version = mpl.__version__
 
 # ----------------------------------------------------------------------
 # SimpleXMLWriter class
@@ -70,7 +66,12 @@
 # --------------------------------------------------------------------
 
 
+@_api.deprecated("3.6", alternative="a vendored copy of _escape_cdata")
 def escape_cdata(s):
+    return _escape_cdata(s)
+
+
+def _escape_cdata(s):
     s = s.replace("&", "&amp;")
     s = s.replace("<", "&lt;")
     s = s.replace(">", "&gt;")
@@ -80,12 +81,22 @@ def escape_cdata(s):
 _escape_xml_comment = re.compile(r'-(?=-)')
 
 
+@_api.deprecated("3.6", alternative="a vendored copy of _escape_comment")
 def escape_comment(s):
-    s = escape_cdata(s)
+    return _escape_comment.sub(s)
+
+
+def _escape_comment(s):
+    s = _escape_cdata(s)
     return _escape_xml_comment.sub('- ', s)
 
 
+@_api.deprecated("3.6", alternative="a vendored copy of _escape_attrib")
 def escape_attrib(s):
+    return _escape_attrib(s)
+
+
+def _escape_attrib(s):
     s = s.replace("&", "&amp;")
     s = s.replace("'", "&apos;")
     s = s.replace('"', "&quot;")
@@ -94,7 +105,18 @@ def escape_attrib(s):
     return s
 
 
+def _quote_escape_attrib(s):
+    return ('"' + _escape_cdata(s) + '"' if '"' not in s else
+            "'" + _escape_cdata(s) + "'" if "'" not in s else
+            '"' + _escape_attrib(s) + '"')
+
+
+@_api.deprecated("3.6", alternative="a vendored copy of _short_float_fmt")
 def short_float_fmt(x):
+    return _short_float_fmt(x)
+
+
+def _short_float_fmt(x):
     """
     Create a short string representation of a float, which is %f
     formatting with trailing zeros and the decimal point removed.
@@ -128,7 +150,7 @@ def __flush(self, indent=True):
             self.__open = 0
         if self.__data:
             data = ''.join(self.__data)
-            self.__write(escape_cdata(data))
+            self.__write(_escape_cdata(data))
             self.__data = []
 
     def start(self, tag, attrib={}, **extra):
@@ -151,16 +173,16 @@ def start(self, tag, attrib={}, **extra):
         An element identifier.
         """
         self.__flush()
-        tag = escape_cdata(tag)
+        tag = _escape_cdata(tag)
         self.__data = []
         self.__tags.append(tag)
         self.__write(self.__indentation[:len(self.__tags) - 1])
         self.__write("<%s" % tag)
-        for k, v in sorted({**attrib, **extra}.items()):
+        for k, v in {**attrib, **extra}.items():
             if v:
-                k = escape_cdata(k)
-                v = escape_attrib(v)
-                self.__write(' %s="%s"' % (k, v))
+                k = _escape_cdata(k)
+                v = _quote_escape_attrib(v)
+                self.__write(' %s=%s' % (k, v))
         self.__open = 1
         return len(self.__tags) - 1
 
@@ -175,7 +197,7 @@ def comment(self, comment):
         """
         self.__flush()
         self.__write(self.__indentation[:len(self.__tags)])
-        self.__write("<!-- %s -->\n" % escape_comment(comment))
+        self.__write("<!-- %s -->\n" % _escape_comment(comment))
 
     def data(self, text):
         """
@@ -201,7 +223,7 @@ def end(self, tag=None, indent=True):
         """
         if tag:
             assert self.__tags, "unbalanced end(%s)" % tag
-            assert escape_cdata(tag) == self.__tags[-1], \
+            assert _escape_cdata(tag) == self.__tags[-1], \
                 "expected end(%s), got %s" % (self.__tags[-1], tag)
         else:
             assert self.__tags, "unbalanced end()"
@@ -245,37 +267,54 @@ def flush(self):
         pass  # replaced by the constructor
 
 
-def generate_transform(transform_list=[]):
-    if len(transform_list):
-        output = StringIO()
-        for type, value in transform_list:
-            if (type == 'scale' and (value == (1,) or value == (1, 1))
-                    or type == 'translate' and value == (0, 0)
-                    or type == 'rotate' and value == (0,)):
-                continue
-            if type == 'matrix' and isinstance(value, Affine2DBase):
-                value = value.to_values()
-            output.write('%s(%s)' % (
-                type, ' '.join(short_float_fmt(x) for x in value)))
-        return output.getvalue()
-    return ''
-
-
-def generate_css(attrib={}):
-    if attrib:
-        output = StringIO()
-        attrib = sorted(attrib.items())
-        for k, v in attrib:
-            k = escape_attrib(k)
-            v = escape_attrib(v)
-            output.write("%s:%s;" % (k, v))
-        return output.getvalue()
-    return ''
+def _generate_transform(transform_list):
+    parts = []
+    for type, value in transform_list:
+        if (type == 'scale' and (value == (1,) or value == (1, 1))
+                or type == 'translate' and value == (0, 0)
+                or type == 'rotate' and value == (0,)):
+            continue
+        if type == 'matrix' and isinstance(value, Affine2DBase):
+            value = value.to_values()
+        parts.append('%s(%s)' % (
+            type, ' '.join(_short_float_fmt(x) for x in value)))
+    return ' '.join(parts)
+
+
+@_api.deprecated("3.6")
+def generate_transform(transform_list=None):
+    return _generate_transform(transform_list or [])
+
+
+def _generate_css(attrib):
+    return "; ".join(f"{k}: {v}" for k, v in attrib.items())
+
+
+@_api.deprecated("3.6")
+def generate_css(attrib=None):
+    return _generate_css(attrib or {})
 
 
 _capstyle_d = {'projecting': 'square', 'butt': 'butt', 'round': 'round'}
 
 
+def _check_is_str(info, key):
+    if not isinstance(info, str):
+        raise TypeError(f'Invalid type for {key} metadata. Expected str, not '
+                        f'{type(info)}.')
+
+
+def _check_is_iterable_of_str(infos, key):
+    if np.iterable(infos):
+        for info in infos:
+            if not isinstance(info, str):
+                raise TypeError(f'Invalid type for {key} metadata. Expected '
+                                f'iterable of str, not {type(info)}.')
+    else:
+        raise TypeError(f'Invalid type for {key} metadata. Expected str or '
+                        f'iterable of str, not {type(infos)}.')
+
+
 class RendererSVG(RendererBase):
     def __init__(self, width, height, svgwriter, basename=None, image_dpi=72,
                  *, metadata=None):
@@ -284,21 +323,25 @@ def __init__(self, width, height, svgwriter, basename=None, image_dpi=72,
         self.writer = XMLWriter(svgwriter)
         self.image_dpi = image_dpi  # actual dpi at which we rasterize stuff
 
-        self._groupd = {}
+        if basename is None:
+            basename = getattr(svgwriter, "name", "")
+            if not isinstance(basename, str):
+                basename = ""
         self.basename = basename
+
+        self._groupd = {}
         self._image_counter = itertools.count()
-        self._clipd = OrderedDict()
+        self._clipd = {}
         self._markers = {}
         self._path_collection_id = 0
-        self._hatchd = OrderedDict()
+        self._hatchd = {}
         self._has_gouraud = False
         self._n_gradients = 0
-        self._fonts = OrderedDict()
 
         super().__init__()
         self._glyph_map = dict()
-        str_height = short_float_fmt(height)
-        str_width = short_float_fmt(width)
+        str_height = _short_float_fmt(height)
+        str_width = _short_float_fmt(width)
         svgwriter.write(svgProlog)
         self._start_id = self.writer.start(
             'svg',
@@ -311,11 +354,6 @@ def __init__(self, width, height, svgwriter, basename=None, image_dpi=72,
         self._write_metadata(metadata)
         self._write_default_style()
 
-    @_api.deprecated("3.4")
-    @property
-    def mathtext_parser(self):
-        return MathTextParser('SVG')
-
     def finalize(self):
         self._write_clips()
         self._write_hatches()
@@ -338,7 +376,9 @@ def _write_metadata(self, metadata):
         writer = self.writer
 
         if 'Title' in metadata:
-            writer.element('title', text=metadata['Title'])
+            title = metadata['Title']
+            _check_is_str(title, 'Title')
+            writer.element('title', text=title)
 
         # Special handling.
         date = metadata.get('Date', None)
@@ -355,14 +395,14 @@ def _write_metadata(self, metadata):
                     elif isinstance(d, (datetime.datetime, datetime.date)):
                         dates.append(d.isoformat())
                     else:
-                        raise ValueError(
-                            'Invalid type for Date metadata. '
-                            'Expected iterable of str, date, or datetime, '
-                            'not {!r}.'.format(type(d)))
+                        raise TypeError(
+                            f'Invalid type for Date metadata. '
+                            f'Expected iterable of str, date, or datetime, '
+                            f'not {type(d)}.')
             else:
-                raise ValueError('Invalid type for Date metadata. '
-                                 'Expected str, date, datetime, or iterable '
-                                 'of the same, not {!r}.'.format(type(date)))
+                raise TypeError(f'Invalid type for Date metadata. '
+                                f'Expected str, date, datetime, or iterable '
+                                f'of the same, not {type(date)}.')
             metadata['Date'] = '/'.join(dates)
         elif 'Date' not in metadata:
             # Do not add `Date` if the user explicitly set `Date` to `None`
@@ -394,36 +434,40 @@ def ensure_metadata(mid):
             writer.element('dc:type', attrib={'rdf:resource': uri})
 
         # Single value only.
-        for key in ['title', 'coverage', 'date', 'description', 'format',
-                    'identifier', 'language', 'relation', 'source']:
-            info = metadata.pop(key.title(), None)
+        for key in ['Title', 'Coverage', 'Date', 'Description', 'Format',
+                    'Identifier', 'Language', 'Relation', 'Source']:
+            info = metadata.pop(key, None)
             if info is not None:
                 mid = ensure_metadata(mid)
-                writer.element(f'dc:{key}', text=info)
+                _check_is_str(info, key)
+                writer.element(f'dc:{key.lower()}', text=info)
 
         # Multiple Agent values.
-        for key in ['creator', 'contributor', 'publisher', 'rights']:
-            agents = metadata.pop(key.title(), None)
+        for key in ['Creator', 'Contributor', 'Publisher', 'Rights']:
+            agents = metadata.pop(key, None)
             if agents is None:
                 continue
 
             if isinstance(agents, str):
                 agents = [agents]
 
+            _check_is_iterable_of_str(agents, key)
+            # Now we know that we have an iterable of str
             mid = ensure_metadata(mid)
-            writer.start(f'dc:{key}')
+            writer.start(f'dc:{key.lower()}')
             for agent in agents:
                 writer.start('cc:Agent')
                 writer.element('dc:title', text=agent)
                 writer.end('cc:Agent')
-            writer.end(f'dc:{key}')
+            writer.end(f'dc:{key.lower()}')
 
         # Multiple values.
         keywords = metadata.pop('Keywords', None)
         if keywords is not None:
             if isinstance(keywords, str):
                 keywords = [keywords]
-
+            _check_is_iterable_of_str(keywords, 'Keywords')
+            # Now we know that we have an iterable of str
             mid = ensure_metadata(mid)
             writer.start('dc:subject')
             writer.start('rdf:Bag')
@@ -441,7 +485,7 @@ def ensure_metadata(mid):
 
     def _write_default_style(self):
         writer = self.writer
-        default_style = generate_css({
+        default_style = _generate_css({
             'stroke-linejoin': 'round',
             'stroke-linecap': 'butt'})
         writer.start('defs')
@@ -458,18 +502,7 @@ def _make_id(self, type, content):
         return '%s%s' % (type, m.hexdigest()[:10])
 
     def _make_flip_transform(self, transform):
-        return (transform +
-                Affine2D()
-                .scale(1.0, -1.0)
-                .translate(0.0, self.height))
-
-    def _get_font(self, prop):
-        fname = findfont(prop)
-        font = get_font(fname)
-        font.clear()
-        size = prop.get_size_in_points()
-        font.set_size(size, 72.0)
-        return font
+        return transform + Affine2D().scale(1, -1).translate(0, self.height)
 
     def _get_hatch(self, gc, rgbFace):
         """
@@ -528,7 +561,7 @@ def _write_hatches(self):
             writer.element(
                 'path',
                 d=path_data,
-                style=generate_css(hatch_style)
+                style=_generate_css(hatch_style)
                 )
             writer.end('pattern')
         writer.end('defs')
@@ -543,7 +576,7 @@ def _get_style_dict(self, gc, rgbFace):
             attrib['fill'] = "url(#%s)" % self._get_hatch(gc, rgbFace)
             if (rgbFace is not None and len(rgbFace) == 4 and rgbFace[3] != 1.0
                     and not forced_alpha):
-                attrib['fill-opacity'] = short_float_fmt(rgbFace[3])
+                attrib['fill-opacity'] = _short_float_fmt(rgbFace[3])
         else:
             if rgbFace is None:
                 attrib['fill'] = 'none'
@@ -552,25 +585,25 @@ def _get_style_dict(self, gc, rgbFace):
                     attrib['fill'] = rgb2hex(rgbFace)
                 if (len(rgbFace) == 4 and rgbFace[3] != 1.0
                         and not forced_alpha):
-                    attrib['fill-opacity'] = short_float_fmt(rgbFace[3])
+                    attrib['fill-opacity'] = _short_float_fmt(rgbFace[3])
 
         if forced_alpha and gc.get_alpha() != 1.0:
-            attrib['opacity'] = short_float_fmt(gc.get_alpha())
+            attrib['opacity'] = _short_float_fmt(gc.get_alpha())
 
         offset, seq = gc.get_dashes()
         if seq is not None:
             attrib['stroke-dasharray'] = ','.join(
-                short_float_fmt(val) for val in seq)
-            attrib['stroke-dashoffset'] = short_float_fmt(float(offset))
+                _short_float_fmt(val) for val in seq)
+            attrib['stroke-dashoffset'] = _short_float_fmt(float(offset))
 
         linewidth = gc.get_linewidth()
         if linewidth:
             rgb = gc.get_rgb()
             attrib['stroke'] = rgb2hex(rgb)
             if not forced_alpha and rgb[3] != 1.0:
-                attrib['stroke-opacity'] = short_float_fmt(rgb[3])
+                attrib['stroke-opacity'] = _short_float_fmt(rgb[3])
             if linewidth != 1.0:
-                attrib['stroke-width'] = short_float_fmt(linewidth)
+                attrib['stroke-width'] = _short_float_fmt(linewidth)
             if gc.get_joinstyle() != 'round':
                 attrib['stroke-linejoin'] = gc.get_joinstyle()
             if gc.get_capstyle() != 'butt':
@@ -579,9 +612,9 @@ def _get_style_dict(self, gc, rgbFace):
         return attrib
 
     def _get_style(self, gc, rgbFace):
-        return generate_css(self._get_style_dict(gc, rgbFace))
+        return _generate_css(self._get_style_dict(gc, rgbFace))
 
-    def _get_clip(self, gc):
+    def _get_clip_attrs(self, gc):
         cliprect = gc.get_clip_rectangle()
         clippath, clippath_trans = gc.get_clip_path()
         if clippath is not None:
@@ -592,8 +625,7 @@ def _get_clip(self, gc):
             y = self.height-(y+h)
             dictkey = (x, y, w, h)
         else:
-            return None
-
+            return {}
         clip = self._clipd.get(dictkey)
         if clip is None:
             oid = self._make_id('p', dictkey)
@@ -603,7 +635,7 @@ def _get_clip(self, gc):
                 self._clipd[dictkey] = (dictkey, oid)
         else:
             clip, oid = clip
-        return oid
+        return {'clip-path': f'url(#{oid})'}
 
     def _write_clips(self):
         if not len(self._clipd):
@@ -621,10 +653,10 @@ def _write_clips(self):
                 x, y, w, h = clip
                 writer.element(
                     'rect',
-                    x=short_float_fmt(x),
-                    y=short_float_fmt(y),
-                    width=short_float_fmt(w),
-                    height=short_float_fmt(h))
+                    x=_short_float_fmt(x),
+                    y=_short_float_fmt(y),
+                    width=_short_float_fmt(w),
+                    height=_short_float_fmt(h))
             writer.end('clipPath')
         writer.end('defs')
 
@@ -663,16 +695,10 @@ def draw_path(self, gc, path, transform, rgbFace=None):
             path, trans_and_flip, clip=clip, simplify=simplify,
             sketch=gc.get_sketch_params())
 
-        attrib = {}
-        attrib['style'] = self._get_style(gc, rgbFace)
-
-        clipid = self._get_clip(gc)
-        if clipid is not None:
-            attrib['clip-path'] = 'url(#%s)' % clipid
-
         if gc.get_url() is not None:
             self.writer.start('a', {'xlink:href': gc.get_url()})
-        self.writer.element('path', d=path_data, attrib=attrib)
+        self.writer.element('path', d=path_data, **self._get_clip_attrs(gc),
+                            style=self._get_style(gc, rgbFace))
         if gc.get_url() is not None:
             self.writer.end('a')
 
@@ -689,9 +715,9 @@ def draw_markers(
             marker_trans + Affine2D().scale(1.0, -1.0),
             simplify=False)
         style = self._get_style_dict(gc, rgbFace)
-        dictkey = (path_data, generate_css(style))
+        dictkey = (path_data, _generate_css(style))
         oid = self._markers.get(dictkey)
-        style = generate_css({k: v for k, v in style.items()
+        style = _generate_css({k: v for k, v in style.items()
                               if k.startswith('stroke')})
 
         if oid is None:
@@ -701,12 +727,7 @@ def draw_markers(
             writer.end('defs')
             self._markers[dictkey] = oid
 
-        attrib = {}
-        clipid = self._get_clip(gc)
-        if clipid is not None:
-            attrib['clip-path'] = 'url(#%s)' % clipid
-        writer.start('g', attrib=attrib)
-
+        writer.start('g', **self._get_clip_attrs(gc))
         trans_and_flip = self._make_flip_transform(trans)
         attrib = {'xlink:href': '#%s' % oid}
         clip = (0, 0, self.width*72, self.height*72)
@@ -714,14 +735,14 @@ def draw_markers(
                 trans_and_flip, clip=clip, simplify=False):
             if len(vertices):
                 x, y = vertices[-2:]
-                attrib['x'] = short_float_fmt(x)
-                attrib['y'] = short_float_fmt(y)
+                attrib['x'] = _short_float_fmt(x)
+                attrib['y'] = _short_float_fmt(y)
                 attrib['style'] = self._get_style(gc, rgbFace)
                 writer.element('use', attrib=attrib)
         writer.end('g')
 
     def draw_path_collection(self, gc, master_transform, paths, all_transforms,
-                             offsets, offsetTrans, facecolors, edgecolors,
+                             offsets, offset_trans, facecolors, edgecolors,
                              linewidths, linestyles, antialiaseds, urls,
                              offset_position):
         # Is the optimization worth it? Rough calculation:
@@ -737,7 +758,7 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
         if not should_do_optimization:
             return super().draw_path_collection(
                 gc, master_transform, paths, all_transforms,
-                offsets, offsetTrans, facecolors, edgecolors,
+                offsets, offset_trans, facecolors, edgecolors,
                 linewidths, linestyles, antialiaseds, urls,
                 offset_position)
 
@@ -755,23 +776,23 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
         writer.end('defs')
 
         for xo, yo, path_id, gc0, rgbFace in self._iter_collection(
-                gc, master_transform, all_transforms, path_codes, offsets,
-                offsetTrans, facecolors, edgecolors, linewidths, linestyles,
+                gc, path_codes, offsets, offset_trans,
+                facecolors, edgecolors, linewidths, linestyles,
                 antialiaseds, urls, offset_position):
-            clipid = self._get_clip(gc0)
             url = gc0.get_url()
             if url is not None:
                 writer.start('a', attrib={'xlink:href': url})
-            if clipid is not None:
-                writer.start('g', attrib={'clip-path': 'url(#%s)' % clipid})
+            clip_attrs = self._get_clip_attrs(gc0)
+            if clip_attrs:
+                writer.start('g', **clip_attrs)
             attrib = {
                 'xlink:href': '#%s' % path_id,
-                'x': short_float_fmt(xo),
-                'y': short_float_fmt(self.height - yo),
+                'x': _short_float_fmt(xo),
+                'y': _short_float_fmt(self.height - yo),
                 'style': self._get_style(gc0, rgbFace)
                 }
             writer.element('use', attrib=attrib)
-            if clipid is not None:
+            if clip_attrs:
                 writer.end('g')
             if url is not None:
                 writer.end('a')
@@ -849,18 +870,18 @@ def draw_gouraud_triangle(self, gc, points, colors, trans):
                 'linearGradient',
                 id="GR%x_%d" % (self._n_gradients, i),
                 gradientUnits="userSpaceOnUse",
-                x1=short_float_fmt(x1), y1=short_float_fmt(y1),
-                x2=short_float_fmt(xb), y2=short_float_fmt(yb))
+                x1=_short_float_fmt(x1), y1=_short_float_fmt(y1),
+                x2=_short_float_fmt(xb), y2=_short_float_fmt(yb))
             writer.element(
                 'stop',
                 offset='1',
-                style=generate_css({
+                style=_generate_css({
                     'stop-color': rgb2hex(avg_color),
-                    'stop-opacity': short_float_fmt(rgba_color[-1])}))
+                    'stop-opacity': _short_float_fmt(rgba_color[-1])}))
             writer.element(
                 'stop',
                 offset='0',
-                style=generate_css({'stop-color': rgb2hex(rgba_color),
+                style=_generate_css({'stop-color': rgb2hex(rgba_color),
                                     'stop-opacity': "0"}))
 
             writer.end('linearGradient')
@@ -868,9 +889,9 @@ def draw_gouraud_triangle(self, gc, points, colors, trans):
         writer.end('defs')
 
         # triangle formation using "path"
-        dpath = "M " + short_float_fmt(x1)+',' + short_float_fmt(y1)
-        dpath += " L " + short_float_fmt(x2) + ',' + short_float_fmt(y2)
-        dpath += " " + short_float_fmt(x3) + ',' + short_float_fmt(y3) + " Z"
+        dpath = "M " + _short_float_fmt(x1)+',' + _short_float_fmt(y1)
+        dpath += " L " + _short_float_fmt(x2) + ',' + _short_float_fmt(y2)
+        dpath += " " + _short_float_fmt(x3) + ',' + _short_float_fmt(y3) + " Z"
 
         writer.element(
             'path',
@@ -912,17 +933,10 @@ def draw_gouraud_triangle(self, gc, points, colors, trans):
 
     def draw_gouraud_triangles(self, gc, triangles_array, colors_array,
                                transform):
-        attrib = {}
-        clipid = self._get_clip(gc)
-        if clipid is not None:
-            attrib['clip-path'] = 'url(#%s)' % clipid
-
-        self.writer.start('g', attrib=attrib)
-
+        self.writer.start('g', **self._get_clip_attrs(gc))
         transform = transform.frozen()
         for tri, col in zip(triangles_array, colors_array):
             self.draw_gouraud_triangle(gc, tri, col, transform)
-
         self.writer.end('g')
 
     def option_scale_image(self):
@@ -940,18 +954,18 @@ def draw_image(self, gc, x, y, im, transform=None):
         if w == 0 or h == 0:
             return
 
-        attrib = {}
-        clipid = self._get_clip(gc)
-        if clipid is not None:
-            # Can't apply clip-path directly to the image because the
-            # image has a transformation, which would also be applied
-            # to the clip-path
-            self.writer.start('g', attrib={'clip-path': 'url(#%s)' % clipid})
+        clip_attrs = self._get_clip_attrs(gc)
+        if clip_attrs:
+            # Can't apply clip-path directly to the image because the image has
+            # a transformation, which would also be applied to the clip-path.
+            self.writer.start('g', **clip_attrs)
 
-        oid = gc.get_gid()
         url = gc.get_url()
         if url is not None:
             self.writer.start('a', attrib={'xlink:href': url})
+
+        attrib = {}
+        oid = gc.get_gid()
         if mpl.rcParams['svg.image_inline']:
             buf = BytesIO()
             Image.fromarray(im).save(buf, format="png")
@@ -969,7 +983,6 @@ def draw_image(self, gc, x, y, im, transform=None):
             Image.fromarray(im).save(filename)
             oid = oid or 'Im_' + self._make_id('image', filename)
             attrib['xlink:href'] = filename
-
         attrib['id'] = oid
 
         if transform is None:
@@ -978,16 +991,16 @@ def draw_image(self, gc, x, y, im, transform=None):
 
             self.writer.element(
                 'image',
-                transform=generate_transform([
+                transform=_generate_transform([
                     ('scale', (1, -1)), ('translate', (0, -h))]),
-                x=short_float_fmt(x),
-                y=short_float_fmt(-(self.height - y - h)),
-                width=short_float_fmt(w), height=short_float_fmt(h),
+                x=_short_float_fmt(x),
+                y=_short_float_fmt(-(self.height - y - h)),
+                width=_short_float_fmt(w), height=_short_float_fmt(h),
                 attrib=attrib)
         else:
             alpha = gc.get_alpha()
             if alpha != 1.0:
-                attrib['opacity'] = short_float_fmt(alpha)
+                attrib['opacity'] = _short_float_fmt(alpha)
 
             flipped = (
                 Affine2D().scale(1.0 / w, 1.0 / h) +
@@ -997,19 +1010,19 @@ def draw_image(self, gc, x, y, im, transform=None):
                 .scale(1.0, -1.0)
                 .translate(0.0, self.height))
 
-            attrib['transform'] = generate_transform(
+            attrib['transform'] = _generate_transform(
                 [('matrix', flipped.frozen())])
             attrib['style'] = (
                 'image-rendering:crisp-edges;'
                 'image-rendering:pixelated')
             self.writer.element(
                 'image',
-                width=short_float_fmt(w), height=short_float_fmt(h),
+                width=_short_float_fmt(w), height=_short_float_fmt(h),
                 attrib=attrib)
 
         if url is not None:
             self.writer.end('a')
-        if clipid is not None:
+        if clip_attrs:
             self.writer.end('g')
 
     def _update_glyph_map_defs(self, glyph_map_new):
@@ -1027,7 +1040,7 @@ def _update_glyph_map_defs(self, glyph_map_new):
                     Path(vertices * 64, codes), simplify=False)
                 writer.element(
                     'path', id=char_id, d=path_data,
-                    transform=generate_transform([('scale', (1 / 64,))]))
+                    transform=_generate_transform([('scale', (1 / 64,))]))
             writer.end('defs')
             self._glyph_map.update(glyph_map_new)
 
@@ -1062,11 +1075,11 @@ def _draw_text_as_path(self, gc, x, y, s, prop, angle, ismath, mtext=None):
             style['fill'] = color
         alpha = gc.get_alpha() if gc.get_forced_alpha() else gc.get_rgb()[3]
         if alpha != 1:
-            style['opacity'] = short_float_fmt(alpha)
+            style['opacity'] = _short_float_fmt(alpha)
         font_scale = fontsize / text2path.FONT_SCALE
         attrib = {
-            'style': generate_css(style),
-            'transform': generate_transform([
+            'style': _generate_css(style),
+            'transform': _generate_transform([
                 ('translate', (x, y)),
                 ('rotate', (-angle,)),
                 ('scale', (font_scale, -font_scale))]),
@@ -1083,9 +1096,9 @@ def _draw_text_as_path(self, gc, x, y, s, prop, angle, ismath, mtext=None):
             for glyph_id, xposition, yposition, scale in glyph_info:
                 attrib = {'xlink:href': '#%s' % glyph_id}
                 if xposition != 0.0:
-                    attrib['x'] = short_float_fmt(xposition)
+                    attrib['x'] = _short_float_fmt(xposition)
                 if yposition != 0.0:
-                    attrib['y'] = short_float_fmt(yposition)
+                    attrib['y'] = _short_float_fmt(yposition)
                 writer.element('use', attrib=attrib)
 
         else:
@@ -1102,7 +1115,7 @@ def _draw_text_as_path(self, gc, x, y, s, prop, angle, ismath, mtext=None):
                 char_id = self._adjust_char_id(char_id)
                 writer.element(
                     'use',
-                    transform=generate_transform([
+                    transform=_generate_transform([
                         ('translate', (xposition, yposition)),
                         ('scale', (scale,)),
                         ]),
@@ -1125,20 +1138,66 @@ def _draw_text_as_text(self, gc, x, y, s, prop, angle, ismath, mtext=None):
 
         alpha = gc.get_alpha() if gc.get_forced_alpha() else gc.get_rgb()[3]
         if alpha != 1:
-            style['opacity'] = short_float_fmt(alpha)
+            style['opacity'] = _short_float_fmt(alpha)
 
         if not ismath:
-            font = self._get_font(prop)
-            font.set_text(s, 0.0, flags=LOAD_NO_HINTING)
-
             attrib = {}
-            style['font-family'] = str(font.family_name)
-            style['font-weight'] = str(prop.get_weight()).lower()
-            style['font-stretch'] = str(prop.get_stretch()).lower()
-            style['font-style'] = prop.get_style().lower()
-            # Must add "px" to workaround a Firefox bug
-            style['font-size'] = short_float_fmt(prop.get_size()) + 'px'
-            attrib['style'] = generate_css(style)
+
+            font_parts = []
+            if prop.get_style() != 'normal':
+                font_parts.append(prop.get_style())
+            if prop.get_variant() != 'normal':
+                font_parts.append(prop.get_variant())
+            weight = fm.weight_dict[prop.get_weight()]
+            if weight != 400:
+                font_parts.append(f'{weight}')
+
+            def _format_font_name(fn):
+                normalize_names = {
+                    'sans': 'sans-serif',
+                    'sans serif': 'sans-serif'
+                }
+                # A generic font family.  We need to do two things:
+                #  1. list all of the configured fonts with quoted names
+                #  2. append the generic name unquoted
+                if fn in fm.font_family_aliases:
+                    # fix spelling of sans-serif
+                    # we accept 3 ways CSS only supports 1
+                    fn = normalize_names.get(fn, fn)
+                    # get all of the font names and fix spelling of sans-serif
+                    # if it comes back
+                    aliases = [
+                        normalize_names.get(_, _) for _ in
+                        fm.FontManager._expand_aliases(fn)
+                    ]
+                    # make sure the generic name appears at least once
+                    # duplicate is OK, next layer will deduplicate
+                    aliases.append(fn)
+
+                    for a in aliases:
+                        # generic font families must not be quoted
+                        if a in fm.font_family_aliases:
+                            yield a
+                        # specific font families must be quoted
+                        else:
+                            yield repr(a)
+                # specific font families must be quoted
+                else:
+                    yield repr(fn)
+
+            def _get_all_names(prop):
+                for f in prop.get_family():
+                    yield from _format_font_name(f)
+
+            font_parts.extend([
+                f'{_short_float_fmt(prop.get_size())}px',
+                # ensure quoting and expansion of font names
+                ", ".join(dict.fromkeys(_get_all_names(prop)))
+            ])
+            style['font'] = ' '.join(font_parts)
+            if prop.get_stretch() != 'normal':
+                style['font-stretch'] = prop.get_stretch()
+            attrib['style'] = _generate_css(style)
 
             if mtext and (angle == 0 or mtext.get_rotation_mode() == "anchor"):
                 # If text anchoring can be supported, get the original
@@ -1162,20 +1221,18 @@ def _draw_text_as_text(self, gc, x, y, s, prop, angle, ismath, mtext=None):
                                  'center': 'middle'}
                 style['text-anchor'] = ha_mpl_to_svg[mtext.get_ha()]
 
-                attrib['x'] = short_float_fmt(ax)
-                attrib['y'] = short_float_fmt(ay)
-                attrib['style'] = generate_css(style)
-                attrib['transform'] = "rotate(%s, %s, %s)" % (
-                    short_float_fmt(-angle),
-                    short_float_fmt(ax),
-                    short_float_fmt(ay))
-                writer.element('text', s, attrib=attrib)
+                attrib['x'] = _short_float_fmt(ax)
+                attrib['y'] = _short_float_fmt(ay)
+                attrib['style'] = _generate_css(style)
+                attrib['transform'] = _generate_transform([
+                    ("rotate", (-angle, ax, ay))])
+
             else:
-                attrib['transform'] = generate_transform([
+                attrib['transform'] = _generate_transform([
                     ('translate', (x, y)),
                     ('rotate', (-angle,))])
 
-                writer.element('text', s, attrib=attrib)
+            writer.element('text', s, attrib=attrib)
 
         else:
             writer.comment(s)
@@ -1186,8 +1243,8 @@ def _draw_text_as_text(self, gc, x, y, s, prop, angle, ismath, mtext=None):
             # Apply attributes to 'g', not 'text', because we likely have some
             # rectangles as well with the same style and transformation.
             writer.start('g',
-                         style=generate_css(style),
-                         transform=generate_transform([
+                         style=_generate_css(style),
+                         transform=_generate_transform([
                              ('translate', (x, y)),
                              ('rotate', (-angle,))]),
                          )
@@ -1195,13 +1252,24 @@ def _draw_text_as_text(self, gc, x, y, s, prop, angle, ismath, mtext=None):
             writer.start('text')
 
             # Sort the characters by font, and output one tspan for each.
-            spans = OrderedDict()
+            spans = {}
             for font, fontsize, thetext, new_x, new_y in glyphs:
-                style = generate_css({
-                    'font-size': short_float_fmt(fontsize) + 'px',
-                    'font-family': font.family_name,
-                    'font-style': font.style_name.lower(),
-                    'font-weight': font.style_name.lower()})
+                entry = fm.ttfFontProperty(font)
+                font_parts = []
+                if entry.style != 'normal':
+                    font_parts.append(entry.style)
+                if entry.variant != 'normal':
+                    font_parts.append(entry.variant)
+                if entry.weight != 400:
+                    font_parts.append(f'{entry.weight}')
+                font_parts.extend([
+                    f'{_short_float_fmt(fontsize)}px',
+                    f'{entry.name!r}',  # ensure quoting
+                ])
+                style = {'font': ' '.join(font_parts)}
+                if entry.stretch != 'normal':
+                    style['font-stretch'] = entry.stretch
+                style = _generate_css(style)
                 if thetext == 32:
                     thetext = 0xa0  # non-breaking space
                 spans.setdefault(style, []).append((new_x, -new_y, thetext))
@@ -1216,7 +1284,7 @@ def _draw_text_as_text(self, gc, x, y, s, prop, angle, ismath, mtext=None):
 
                 attrib = {
                     'style': style,
-                    'x': ' '.join(short_float_fmt(c[0]) for c in chars),
+                    'x': ' '.join(_short_float_fmt(c[0]) for c in chars),
                     'y': ys
                     }
 
@@ -1230,28 +1298,26 @@ def _draw_text_as_text(self, gc, x, y, s, prop, angle, ismath, mtext=None):
             for x, y, width, height in rects:
                 writer.element(
                     'rect',
-                    x=short_float_fmt(x),
-                    y=short_float_fmt(-y-1),
-                    width=short_float_fmt(width),
-                    height=short_float_fmt(height)
+                    x=_short_float_fmt(x),
+                    y=_short_float_fmt(-y-1),
+                    width=_short_float_fmt(width),
+                    height=_short_float_fmt(height)
                     )
 
             writer.end('g')
 
-    @_api.delete_parameter("3.3", "ismath")
-    def draw_tex(self, gc, x, y, s, prop, angle, ismath='TeX!', mtext=None):
+    def draw_tex(self, gc, x, y, s, prop, angle, *, mtext=None):
         # docstring inherited
         self._draw_text_as_path(gc, x, y, s, prop, angle, ismath="TeX")
 
     def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
         # docstring inherited
 
-        clipid = self._get_clip(gc)
-        if clipid is not None:
+        clip_attrs = self._get_clip_attrs(gc)
+        if clip_attrs:
             # Cannot apply clip-path directly to the text, because
-            # is has a transformation
-            self.writer.start(
-                'g', attrib={'clip-path': 'url(#%s)' % clipid})
+            # it has a transformation
+            self.writer.start('g', **clip_attrs)
 
         if gc.get_url() is not None:
             self.writer.start('a', {'xlink:href': gc.get_url()})
@@ -1264,7 +1330,7 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
         if gc.get_url() is not None:
             self.writer.end('a')
 
-        if clipid is not None:
+        if clip_attrs:
             self.writer.end('g')
 
     def flipy(self):
@@ -1286,7 +1352,9 @@ class FigureCanvasSVG(FigureCanvasBase):
 
     fixed_dpi = 72
 
-    def print_svg(self, filename, *args, **kwargs):
+    @_api.delete_parameter("3.5", "args")
+    def print_svg(self, filename, *args, bbox_inches_restore=None,
+                  metadata=None):
         """
         Parameters
         ----------
@@ -1319,52 +1387,30 @@ def print_svg(self, filename, *args, **kwargs):
             __ DC_
         """
         with cbook.open_file_cm(filename, "w", encoding="utf-8") as fh:
-
-            filename = getattr(fh, 'name', '')
-            if not isinstance(filename, str):
-                filename = ''
-
-            if cbook.file_requires_unicode(fh):
-                detach = False
-            else:
-                fh = TextIOWrapper(fh, 'utf-8')
-                detach = True
-
-            self._print_svg(filename, fh, **kwargs)
-
-            # Detach underlying stream from wrapper so that it remains open in
-            # the caller.
-            if detach:
-                fh.detach()
-
+            if not cbook.file_requires_unicode(fh):
+                fh = codecs.getwriter('utf-8')(fh)
+            dpi = self.figure.dpi
+            self.figure.dpi = 72
+            width, height = self.figure.get_size_inches()
+            w, h = width * 72, height * 72
+            renderer = MixedModeRenderer(
+                self.figure, width, height, dpi,
+                RendererSVG(w, h, fh, image_dpi=dpi, metadata=metadata),
+                bbox_inches_restore=bbox_inches_restore)
+            self.figure.draw(renderer)
+            renderer.finalize()
+
+    @_api.delete_parameter("3.5", "args")
     def print_svgz(self, filename, *args, **kwargs):
         with cbook.open_file_cm(filename, "wb") as fh, \
                 gzip.GzipFile(mode='w', fileobj=fh) as gzipwriter:
-            return self.print_svg(gzipwriter)
-
-    @_check_savefig_extra_args
-    @_api.delete_parameter("3.4", "dpi")
-    def _print_svg(self, filename, fh, *, dpi=None, bbox_inches_restore=None,
-                   metadata=None):
-        if dpi is None:  # always use this branch after deprecation elapses.
-            dpi = self.figure.get_dpi()
-        self.figure.set_dpi(72)
-        width, height = self.figure.get_size_inches()
-        w, h = width * 72, height * 72
-
-        renderer = MixedModeRenderer(
-            self.figure, width, height, dpi,
-            RendererSVG(w, h, fh, filename, dpi, metadata=metadata),
-            bbox_inches_restore=bbox_inches_restore)
-
-        self.figure.draw(renderer)
-        renderer.finalize()
+            return self.print_svg(gzipwriter, **kwargs)
 
     def get_default_filetype(self):
         return 'svg'
 
     def draw(self):
-        _no_output_draw(self.figure)
+        self.figure.draw_without_rendering()
         return super().draw()
 
 
@@ -1380,4 +1426,5 @@ def draw(self):
 
 @_Backend.export
 class _BackendSVG(_Backend):
+    backend_version = mpl.__version__
     FigureCanvas = FigureCanvasSVG
diff --git a/lib/matplotlib/backends/backend_template.py b/lib/matplotlib/backends/backend_template.py
index 7ed017a0c6eb..6b7aba9a504b 100644
--- a/lib/matplotlib/backends/backend_template.py
+++ b/lib/matplotlib/backends/backend_template.py
@@ -29,6 +29,7 @@
     plt.savefig("figure.xyz")
 """
 
+from matplotlib import _api
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_bases import (
      FigureCanvasBase, FigureManagerBase, GraphicsContextBase, RendererBase)
@@ -40,7 +41,7 @@ class RendererTemplate(RendererBase):
     The renderer handles drawing/rendering operations.
 
     This is a minimal do-nothing class that can be used to get started when
-    writing a new backend.  Refer to `backend_bases.RendererBase` for
+    writing a new backend.  Refer to `.backend_bases.RendererBase` for
     documentation of the methods.
     """
 
@@ -62,7 +63,7 @@ def draw_path(self, gc, path, transform, rgbFace=None):
     # relative timings by leaving it out. backend implementers concerned with
     # performance will probably want to implement it
 #     def draw_path_collection(self, gc, master_transform, paths,
-#                              all_transforms, offsets, offsetTrans,
+#                              all_transforms, offsets, offset_trans,
 #                              facecolors, edgecolors, linewidths, linestyles,
 #                              antialiaseds):
 #         pass
@@ -100,14 +101,14 @@ def points_to_pixels(self, points):
         # if backend doesn't have dpi, e.g., postscript or svg
         return points
         # elif backend assumes a value for pixels_per_inch
-        #return points/72.0 * self.dpi.get() * pixels_per_inch/72.0
+        # return points/72.0 * self.dpi.get() * pixels_per_inch/72.0
         # else
-        #return points/72.0 * self.dpi.get()
+        # return points/72.0 * self.dpi.get()
 
 
 class GraphicsContextTemplate(GraphicsContextBase):
     """
-    The graphics context provides the color, line styles, etc...  See the cairo
+    The graphics context provides the color, line styles, etc.  See the cairo
     and postscript backends for examples of mapping the graphics context
     attributes (cap styles, join styles, line widths, colors) to a particular
     backend.  In cairo this is done by wrapping a cairo.Context object and
@@ -130,19 +131,11 @@ class GraphicsContextTemplate(GraphicsContextBase):
 ########################################################################
 #
 # The following functions and classes are for pyplot and implement
-# window/figure managers, etc...
+# window/figure managers, etc.
 #
 ########################################################################
 
 
-def draw_if_interactive():
-    """
-    For image backends - is not required.
-    For GUI backends - this should be overridden if drawing should be done in
-    interactive python mode.
-    """
-
-
 def show(*, block=None):
     """
     For image backends - is not required.
@@ -155,22 +148,12 @@ def show(*, block=None):
         pass
 
 
-def new_figure_manager(num, *args, FigureClass=Figure, **kwargs):
-    """Create a new figure manager instance."""
-    # If a main-level app must be created, this (and
-    # new_figure_manager_given_figure) is the usual place to do it -- see
-    # backend_wx, backend_wxagg and backend_tkagg for examples.  Not all GUIs
-    # require explicit instantiation of a main-level app (e.g., backend_gtk3)
-    # for pylab.
-    thisFig = FigureClass(*args, **kwargs)
-    return new_figure_manager_given_figure(num, thisFig)
-
+class FigureManagerTemplate(FigureManagerBase):
+    """
+    Helper class for pyplot mode, wraps everything up into a neat bundle.
 
-def new_figure_manager_given_figure(num, figure):
-    """Create a new figure manager instance for the given figure."""
-    canvas = FigureCanvasTemplate(figure)
-    manager = FigureManagerTemplate(canvas, num)
-    return manager
+    For non-interactive backends, the base class is sufficient.
+    """
 
 
 class FigureCanvasTemplate(FigureCanvasBase):
@@ -190,6 +173,11 @@ class methods button_press_event, button_release_event,
         A high-level Figure instance
     """
 
+    # The instantiated manager class.  For further customization,
+    # ``FigureManager.create_with_canvas`` can also be overridden; see the
+    # wx-based backends for an example.
+    manager_class = FigureManagerTemplate
+
     def draw(self):
         """
         Draw the figure using the renderer.
@@ -209,6 +197,7 @@ def draw(self):
     # you should add it to the class-scope filetypes dictionary as follows:
     filetypes = {**FigureCanvasBase.filetypes, 'foo': 'My magic Foo format'}
 
+    @_api.delete_parameter("3.5", "args")
     def print_foo(self, filename, *args, **kwargs):
         """
         Write out format foo.
@@ -225,14 +214,6 @@ def get_default_filetype(self):
         return 'foo'
 
 
-class FigureManagerTemplate(FigureManagerBase):
-    """
-    Helper class for pyplot mode, wraps everything up into a neat bundle.
-
-    For non-interactive backends, the base class is sufficient.
-    """
-
-
 ########################################################################
 #
 # Now just provide the standard names that backend.__init__ is expecting
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
index 31012d80eab8..f95b6011eadf 100644
--- a/lib/matplotlib/backends/backend_tkagg.py
+++ b/lib/matplotlib/backends/backend_tkagg.py
@@ -1,7 +1,8 @@
 from . import _backend_tk
 from .backend_agg import FigureCanvasAgg
-from ._backend_tk import (
-    _BackendTk, FigureCanvasTk, FigureManagerTk, NavigationToolbar2Tk)
+from ._backend_tk import _BackendTk, FigureCanvasTk
+from ._backend_tk import (  # noqa: F401 # pylint: disable=W0611
+    FigureManagerTk, NavigationToolbar2Tk)
 
 
 class FigureCanvasTkAgg(FigureCanvasAgg, FigureCanvasTk):
diff --git a/lib/matplotlib/backends/backend_tkcairo.py b/lib/matplotlib/backends/backend_tkcairo.py
index a81fd0d92bb8..a6951c03c65a 100644
--- a/lib/matplotlib/backends/backend_tkcairo.py
+++ b/lib/matplotlib/backends/backend_tkcairo.py
@@ -3,21 +3,17 @@
 import numpy as np
 
 from . import _backend_tk
-from .backend_cairo import cairo, FigureCanvasCairo, RendererCairo
+from .backend_cairo import cairo, FigureCanvasCairo
 from ._backend_tk import _BackendTk, FigureCanvasTk
 
 
 class FigureCanvasTkCairo(FigureCanvasCairo, FigureCanvasTk):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self._renderer = RendererCairo(self.figure.dpi)
-
     def draw(self):
         width = int(self.figure.bbox.width)
         height = int(self.figure.bbox.height)
         surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
-        self._renderer.set_ctx_from_surface(surface)
-        self._renderer.set_width_height(width, height)
+        self._renderer.set_context(cairo.Context(surface))
+        self._renderer.dpi = self.figure.dpi
         self.figure.draw(self._renderer)
         buf = np.reshape(surface.get_data(), (height, width, 4))
         _backend_tk.blit(
diff --git a/lib/matplotlib/backends/backend_webagg.py b/lib/matplotlib/backends/backend_webagg.py
index 7f43187ac65f..9e1e4925496f 100644
--- a/lib/matplotlib/backends/backend_webagg.py
+++ b/lib/matplotlib/backends/backend_webagg.py
@@ -36,7 +36,8 @@
 from matplotlib.backend_bases import _Backend
 from matplotlib._pylab_helpers import Gcf
 from . import backend_webagg_core as core
-from .backend_webagg_core import TimerTornado
+from .backend_webagg_core import (  # noqa: F401 # pylint: disable=W0611
+    TimerAsyncio, TimerTornado)
 
 
 class ServerThread(threading.Thread):
@@ -47,8 +48,12 @@ def run(self):
 webagg_server_thread = ServerThread()
 
 
+class FigureManagerWebAgg(core.FigureManagerWebAgg):
+    _toolbar2_class = core.NavigationToolbar2WebAgg
+
+
 class FigureCanvasWebAgg(core.FigureCanvasWebAggCore):
-    pass
+    manager_class = FigureManagerWebAgg
 
 
 class WebAggApplication(tornado.web.Application):
@@ -299,10 +304,10 @@ def ipython_inline_display(figure):
 @_Backend.export
 class _BackendWebAgg(_Backend):
     FigureCanvas = FigureCanvasWebAgg
-    FigureManager = core.FigureManagerWebAgg
+    FigureManager = FigureManagerWebAgg
 
     @staticmethod
-    def show():
+    def show(*, block=None):
         WebAggApplication.initialize()
 
         url = "http://{address}:{port}{prefix}".format(
diff --git a/lib/matplotlib/backends/backend_webagg_core.py b/lib/matplotlib/backends/backend_webagg_core.py
index ed0d6173a6fe..ee2d73d0cf95 100644
--- a/lib/matplotlib/backends/backend_webagg_core.py
+++ b/lib/matplotlib/backends/backend_webagg_core.py
@@ -8,8 +8,9 @@
 #   way over a web socket.
 #
 # - `backend_webagg.py` contains a concrete implementation of a basic
-#   application, implemented with tornado.
+#   application, implemented with asyncio.
 
+import asyncio
 import datetime
 from io import BytesIO, StringIO
 import json
@@ -19,11 +20,11 @@
 
 import numpy as np
 from PIL import Image
-import tornado
 
-from matplotlib import _api, backend_bases
+from matplotlib import _api, backend_bases, backend_tools
 from matplotlib.backends import backend_agg
-from matplotlib.backend_bases import _Backend
+from matplotlib.backend_bases import (
+    _Backend, KeyEvent, LocationEvent, MouseEvent, ResizeEvent)
 
 _log = logging.getLogger(__name__)
 
@@ -85,6 +86,8 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
     def _timer_start(self):
+        import tornado
+
         self._timer_stop()
         if self._single:
             ioloop = tornado.ioloop.IOLoop.instance()
@@ -98,6 +101,8 @@ def _timer_start(self):
             self._timer.start()
 
     def _timer_stop(self):
+        import tornado
+
         if self._timer is None:
             return
         elif self._single:
@@ -114,8 +119,44 @@ def _timer_set_interval(self):
             self._timer_start()
 
 
+class TimerAsyncio(backend_bases.TimerBase):
+    def __init__(self, *args, **kwargs):
+        self._task = None
+        super().__init__(*args, **kwargs)
+
+    async def _timer_task(self, interval):
+        while True:
+            try:
+                await asyncio.sleep(interval)
+                self._on_timer()
+
+                if self._single:
+                    break
+            except asyncio.CancelledError:
+                break
+
+    def _timer_start(self):
+        self._timer_stop()
+
+        self._task = asyncio.ensure_future(
+            self._timer_task(max(self.interval / 1_000., 1e-6))
+        )
+
+    def _timer_stop(self):
+        if self._task is not None:
+            self._task.cancel()
+        self._task = None
+
+    def _timer_set_interval(self):
+        # Only stop and restart it if the timer has already been started
+        if self._task is not None:
+            self._timer_stop()
+            self._timer_start()
+
+
 class FigureCanvasWebAggCore(backend_agg.FigureCanvasAgg):
-    _timer_cls = TimerTornado
+    manager_class = _api.classproperty(lambda cls: FigureManagerWebAgg)
+    _timer_cls = TimerAsyncio
     # Webagg and friends having the right methods, but still
     # having bugs in practice.  Do not advertise that it works until
     # we can debug this.
@@ -123,24 +164,21 @@ class FigureCanvasWebAggCore(backend_agg.FigureCanvasAgg):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-
         # Set to True when the renderer contains data that is newer
         # than the PNG buffer.
         self._png_is_old = True
-
         # Set to True by the `refresh` message so that the next frame
         # sent to the clients will be a full frame.
         self._force_full = True
-
+        # The last buffer, for diff mode.
+        self._last_buff = np.empty((0, 0))
         # Store the current image mode so that at any point, clients can
         # request the information. This should be changed by calling
         # self.set_image_mode(mode) so that the notification can be given
         # to the connected clients.
         self._current_image_mode = 'full'
-
-        # Store the DPI ratio of the browser.  This is the scaling that
-        # occurs automatically for all images on a HiDPI display.
-        self._dpi_ratio = 1
+        # Track mouse events to fill in the x, y position of key events.
+        self._last_mouse_xy = (None, None)
 
     def show(self):
         # show the figure window
@@ -161,6 +199,19 @@ def blit(self, bbox=None):
     def draw_idle(self):
         self.send_event("draw")
 
+    def set_cursor(self, cursor):
+        # docstring inherited
+        cursor = _api.check_getitem({
+            backend_tools.Cursors.HAND: 'pointer',
+            backend_tools.Cursors.POINTER: 'default',
+            backend_tools.Cursors.SELECT_REGION: 'crosshair',
+            backend_tools.Cursors.MOVE: 'move',
+            backend_tools.Cursors.WAIT: 'wait',
+            backend_tools.Cursors.RESIZE_HORIZONTAL: 'ew-resize',
+            backend_tools.Cursors.RESIZE_VERTICAL: 'ns-resize',
+        }, cursor=cursor)
+        self.send_event('cursor', cursor=cursor)
+
     def set_image_mode(self, mode):
         """
         Set the image mode for any subsequent images which will be sent
@@ -179,17 +230,18 @@ def get_diff_image(self):
         if self._png_is_old:
             renderer = self.get_renderer()
 
+            pixels = np.asarray(renderer.buffer_rgba())
             # The buffer is created as type uint32 so that entire
             # pixels can be compared in one numpy call, rather than
             # needing to compare each plane separately.
-            buff = (np.frombuffer(renderer.buffer_rgba(), dtype=np.uint32)
-                    .reshape((renderer.height, renderer.width)))
-
-            # If any pixels have transparency, we need to force a full
-            # draw as we cannot overlay new on top of old.
-            pixels = buff.view(dtype=np.uint8).reshape(buff.shape + (4,))
-
-            if self._force_full or np.any(pixels[:, :, 3] != 255):
+            buff = pixels.view(np.uint32).squeeze(2)
+
+            if (self._force_full
+                    # If the buffer has changed size we need to do a full draw.
+                    or buff.shape != self._last_buff.shape
+                    # If any pixels have transparency, we need to force a full
+                    # draw as we cannot overlay new on top of old.
+                    or (pixels[:, :, 3] != 255).any()):
                 self.set_image_mode('full')
                 output = buff
             else:
@@ -198,7 +250,7 @@ def get_diff_image(self):
                 output = np.where(diff, buff, 0)
 
             # Store the current buffer so we can compute the next diff.
-            np.copyto(self._last_buff, buff)
+            self._last_buff = buff.copy()
             self._force_full = False
             self._png_is_old = False
 
@@ -207,31 +259,6 @@ def get_diff_image(self):
                 Image.fromarray(data).save(png, format="png")
                 return png.getvalue()
 
-    def get_renderer(self, cleared=None):
-        # Mirrors super.get_renderer, but caches the old one so that we can do
-        # things such as produce a diff image in get_diff_image.
-        w, h = self.figure.bbox.size.astype(int)
-        key = w, h, self.figure.dpi
-        try:
-            self._lastKey, self._renderer
-        except AttributeError:
-            need_new_renderer = True
-        else:
-            need_new_renderer = (self._lastKey != key)
-
-        if need_new_renderer:
-            self._renderer = backend_agg.RendererAgg(
-                w, h, self.figure.dpi)
-            self._lastKey = key
-            self._last_buff = np.copy(np.frombuffer(
-                self._renderer.buffer_rgba(), dtype=np.uint32
-            ).reshape((self._renderer.height, self._renderer.width)))
-
-        elif cleared:
-            self._renderer.clear()
-
-        return self._renderer
-
     def handle_event(self, event):
         e_type = event['type']
         handler = getattr(self, 'handle_{0}'.format(e_type),
@@ -258,40 +285,35 @@ def _handle_mouse(self, event):
         x = event['x']
         y = event['y']
         y = self.get_renderer().height - y
-
-        # Javascript button numbers and matplotlib button numbers are
-        # off by 1
+        self._last_mouse_xy = x, y
+        # JavaScript button numbers and Matplotlib button numbers are off by 1.
         button = event['button'] + 1
 
         e_type = event['type']
-        guiEvent = event.get('guiEvent', None)
-        if e_type == 'button_press':
-            self.button_press_event(x, y, button, guiEvent=guiEvent)
+        guiEvent = event.get('guiEvent')
+        if e_type in ['button_press', 'button_release']:
+            MouseEvent(e_type + '_event', self, x, y, button,
+                       guiEvent=guiEvent)._process()
         elif e_type == 'dblclick':
-            self.button_press_event(x, y, button, dblclick=True,
-                                    guiEvent=guiEvent)
-        elif e_type == 'button_release':
-            self.button_release_event(x, y, button, guiEvent=guiEvent)
-        elif e_type == 'motion_notify':
-            self.motion_notify_event(x, y, guiEvent=guiEvent)
-        elif e_type == 'figure_enter':
-            self.enter_notify_event(xy=(x, y), guiEvent=guiEvent)
-        elif e_type == 'figure_leave':
-            self.leave_notify_event()
+            MouseEvent('button_press_event', self, x, y, button, dblclick=True,
+                       guiEvent=guiEvent)._process()
         elif e_type == 'scroll':
-            self.scroll_event(x, y, event['step'], guiEvent=guiEvent)
+            MouseEvent('scroll_event', self, x, y, step=event['step'],
+                       guiEvent=guiEvent)._process()
+        elif e_type == 'motion_notify':
+            MouseEvent(e_type + '_event', self, x, y,
+                       guiEvent=guiEvent)._process()
+        elif e_type in ['figure_enter', 'figure_leave']:
+            LocationEvent(e_type + '_event', self, x, y,
+                          guiEvent=guiEvent)._process()
     handle_button_press = handle_button_release = handle_dblclick = \
         handle_figure_enter = handle_figure_leave = handle_motion_notify = \
         handle_scroll = _handle_mouse
 
     def _handle_key(self, event):
-        key = _handle_key(event['key'])
-        e_type = event['type']
-        guiEvent = event.get('guiEvent', None)
-        if e_type == 'key_press':
-            self.key_press_event(key, guiEvent=guiEvent)
-        elif e_type == 'key_release':
-            self.key_release_event(key, guiEvent=guiEvent)
+        KeyEvent(event['type'] + '_event', self,
+                 _handle_key(event['key']), *self._last_mouse_xy,
+                 guiEvent=event.get('guiEvent'))._process()
     handle_key_press = handle_key_release = _handle_key
 
     def handle_toolbar_button(self, event):
@@ -311,8 +333,8 @@ def handle_refresh(self, event):
         self.draw_idle()
 
     def handle_resize(self, event):
-        x, y = event.get('width', 800), event.get('height', 800)
-        x, y = int(x) * self._dpi_ratio, int(y) * self._dpi_ratio
+        x = int(event.get('width', 800)) * self.device_pixel_ratio
+        y = int(event.get('height', 800)) * self.device_pixel_ratio
         fig = self.figure
         # An attempt at approximating the figure size in pixels.
         fig.set_size_inches(x / fig.dpi, y / fig.dpi, forward=False)
@@ -321,20 +343,22 @@ def handle_resize(self, event):
         # identical or within a pixel or so).
         self._png_is_old = True
         self.manager.resize(*fig.bbox.size, forward=False)
-        self.resize_event()
+        ResizeEvent('resize_event', self)._process()
+        self.draw_idle()
 
     def handle_send_image_mode(self, event):
         # The client requests notification of what the current image mode is.
         self.send_event('image_mode', mode=self._current_image_mode)
 
+    def handle_set_device_pixel_ratio(self, event):
+        self._handle_set_device_pixel_ratio(event.get('device_pixel_ratio', 1))
+
     def handle_set_dpi_ratio(self, event):
-        dpi_ratio = event.get('dpi_ratio', 1)
-        if dpi_ratio != self._dpi_ratio:
-            # We don't want to scale up the figure dpi more than once.
-            if not hasattr(self.figure, '_original_dpi'):
-                self.figure._original_dpi = self.figure.dpi
-            self.figure.dpi = dpi_ratio * self.figure._original_dpi
-            self._dpi_ratio = dpi_ratio
+        # This handler is for backwards-compatibility with older ipympl.
+        self._handle_set_device_pixel_ratio(event.get('dpi_ratio', 1))
+
+    def _handle_set_device_pixel_ratio(self, device_pixel_ratio):
+        if self._set_device_pixel_ratio(device_pixel_ratio):
             self._force_full = True
             self.draw_idle()
 
@@ -365,9 +389,11 @@ class NavigationToolbar2WebAgg(backend_bases.NavigationToolbar2):
         if name_of_method in _ALLOWED_TOOL_ITEMS
     ]
 
+    cursor = _api.deprecate_privatize_attribute("3.5")
+
     def __init__(self, canvas):
         self.message = ''
-        self.cursor = 0
+        self._cursor = None  # Remove with deprecation.
         super().__init__(canvas)
 
     def set_message(self, message):
@@ -375,19 +401,11 @@ def set_message(self, message):
             self.canvas.send_event("message", message=message)
         self.message = message
 
-    def set_cursor(self, cursor):
-        if cursor != self.cursor:
-            self.canvas.send_event("cursor", cursor=cursor)
-        self.cursor = cursor
-
     def draw_rubberband(self, event, x0, y0, x1, y1):
-        self.canvas.send_event(
-            "rubberband", x0=x0, y0=y0, x1=x1, y1=y1)
+        self.canvas.send_event("rubberband", x0=x0, y0=y0, x1=x1, y1=y1)
 
-    def release_zoom(self, event):
-        super().release_zoom(event)
-        self.canvas.send_event(
-            "rubberband", x0=-1, y0=-1, x1=-1, y1=-1)
+    def remove_rubberband(self):
+        self.canvas.send_event("rubberband", x0=-1, y0=-1, x1=-1, y1=-1)
 
     def save_figure(self, *args):
         """Save the current figure"""
@@ -409,24 +427,22 @@ def set_history_buttons(self):
 
 
 class FigureManagerWebAgg(backend_bases.FigureManagerBase):
+    # This must be None to not break ipympl
+    _toolbar2_class = None
     ToolbarCls = NavigationToolbar2WebAgg
 
     def __init__(self, canvas, num):
         self.web_sockets = set()
         super().__init__(canvas, num)
-        self.toolbar = self._get_toolbar(canvas)
 
     def show(self):
         pass
 
-    def _get_toolbar(self, canvas):
-        toolbar = self.ToolbarCls(canvas)
-        return toolbar
-
     def resize(self, w, h, forward=True):
         self._send_event(
             'resize',
-            size=(w / self.canvas._dpi_ratio, h / self.canvas._dpi_ratio),
+            size=(w / self.canvas.device_pixel_ratio,
+                  h / self.canvas.device_pixel_ratio),
             forward=forward)
 
     def set_window_title(self, title):
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
index 9d12357d2523..4d88547b865d 100644
--- a/lib/matplotlib/backends/backend_wx.py
+++ b/lib/matplotlib/backends/backend_wx.py
@@ -7,6 +7,7 @@
 Copyright (C) Jeremy O'Donoghue & John Hunter, 2003-4.
 """
 
+import functools
 import logging
 import math
 import pathlib
@@ -18,46 +19,40 @@
 
 import matplotlib as mpl
 from matplotlib.backend_bases import (
-    _Backend, _check_savefig_extra_args, FigureCanvasBase, FigureManagerBase,
+    _Backend, FigureCanvasBase, FigureManagerBase,
     GraphicsContextBase, MouseButton, NavigationToolbar2, RendererBase,
-    StatusbarBase, TimerBase, ToolContainerBase, cursors)
+    TimerBase, ToolContainerBase, cursors,
+    CloseEvent, KeyEvent, LocationEvent, MouseEvent, ResizeEvent)
 
 from matplotlib import _api, cbook, backend_tools
 from matplotlib._pylab_helpers import Gcf
-from matplotlib.backend_managers import ToolManager
-from matplotlib.figure import Figure
 from matplotlib.path import Path
 from matplotlib.transforms import Affine2D
-from matplotlib.widgets import SubplotTool
 
 import wx
 
 _log = logging.getLogger(__name__)
 
-# Debugging settings here...
-# Debug level set here. If the debug level is less than 5, information
-# messages (progressively more info for lower value) are printed. In addition,
-# traceback is performed, and pdb activated, for all uncaught exceptions in
-# this case
-_DEBUG = 5
-_DEBUG_lvls = {1: 'Low ', 2: 'Med ', 3: 'High', 4: 'Error'}
-
-
-@_api.deprecated("3.3")
-def DEBUG_MSG(string, lvl=3, o=None):
-    if lvl >= _DEBUG:
-        print(f"{_DEBUG_lvls[lvl]}- {string} in {type(o)}")
-
-
 # the True dots per inch on the screen; should be display dependent; see
-# http://groups.google.com/groups?q=screen+dpi+x11&hl=en&lr=&ie=UTF-8&oe=UTF-8&safe=off&selm=7077.26e81ad5%40swift.cs.tcd.ie&rnum=5
+# http://groups.google.com/d/msg/comp.lang.postscript/-/omHAc9FEuAsJ?hl=en
 # for some info about screen dpi
 PIXELS_PER_INCH = 75
 
-# Delay time for idle checks
-IDLE_DELAY = 5  # Documented as deprecated as of Matplotlib 3.1.
+
+@_api.caching_module_getattr  # module-level deprecations
+class __getattr__:
+    cursord = _api.deprecated("3.5", obj_type="")(property(lambda self: {
+        cursors.MOVE: wx.CURSOR_HAND,
+        cursors.HAND: wx.CURSOR_HAND,
+        cursors.POINTER: wx.CURSOR_ARROW,
+        cursors.SELECT_REGION: wx.CURSOR_CROSS,
+        cursors.WAIT: wx.CURSOR_WAIT,
+        cursors.RESIZE_HORIZONTAL: wx.CURSOR_SIZEWE,
+        cursors.RESIZE_VERTICAL: wx.CURSOR_SIZENS,
+    }))
 
 
+@_api.deprecated("3.6")
 def error_msg_wx(msg, parent=None):
     """Signal an error condition with a popup error dialog."""
     dialog = wx.MessageDialog(parent=parent,
@@ -69,6 +64,15 @@ def error_msg_wx(msg, parent=None):
     return None
 
 
+# lru_cache holds a reference to the App and prevents it from being gc'ed.
+@functools.lru_cache(1)
+def _create_wxapp():
+    wxapp = wx.App(False)
+    wxapp.SetExitOnFrameDelete(True)
+    cbook._setup_new_guiapp()
+    return wxapp
+
+
 class TimerWx(TimerBase):
     """Subclass of `.TimerBase` using wx.Timer events."""
 
@@ -88,6 +92,10 @@ def _timer_set_interval(self):
             self._timer_start()  # Restart with new interval.
 
 
+@_api.deprecated(
+    "2.0", name="wx", obj_type="backend", removal="the future",
+    alternative="wxagg",
+    addendum="See the Matplotlib usage FAQ for more info on backends.")
 class RendererWx(RendererBase):
     """
     The renderer handles all the drawing primitives using a graphics
@@ -129,7 +137,7 @@ class RendererWx(RendererBase):
 
     # wxPython allows for portable font styles, choosing them appropriately for
     # the target platform. Map some standard font names to the portable styles.
-    # QUESTION: Is it be wise to agree standard fontnames across all backends?
+    # QUESTION: Is it wise to agree to standard fontnames across all backends?
     fontnames = {
         'Sans': wx.FONTFAMILY_SWISS,
         'Roman': wx.FONTFAMILY_ROMAN,
@@ -142,10 +150,6 @@ class RendererWx(RendererBase):
 
     def __init__(self, bitmap, dpi):
         """Initialise a wxWindows renderer instance."""
-        _api.warn_deprecated(
-            "2.0", name="wx", obj_type="backend", removal="the future",
-            alternative="wxagg", addendum="See the Matplotlib usage FAQ for "
-            "more info on backends.")
         super().__init__()
         _log.debug("%s - __init__()", type(self))
         self.width = bitmap.GetWidth()
@@ -159,6 +163,7 @@ def flipy(self):
         # docstring inherited
         return True
 
+    @_api.deprecated("3.6")
     def offset_text_height(self):
         return True
 
@@ -280,16 +285,6 @@ def new_gc(self):
         self.gc.unselect()
         return self.gc
 
-    @_api.deprecated("3.3", alternative=".gc")
-    def get_gc(self):
-        """
-        Fetch the locally cached gc.
-        """
-        # This is a dirty hack to allow anything with access to a renderer to
-        # access the current graphics context
-        assert self.gc is not None, "gc must be defined"
-        return self.gc
-
     def get_wx_font(self, s, prop):
         """Return a wx font.  Cache font instances for efficiency."""
         _log.debug("%s - get_wx_font()", type(self))
@@ -314,7 +309,7 @@ def points_to_pixels(self, points):
 
 class GraphicsContextWx(GraphicsContextBase):
     """
-    The graphics context provides the color, line styles, etc...
+    The graphics context provides the color, line styles, etc.
 
     This class stores a reference to a wxMemoryDC, and a
     wxGraphicsContext that draws to it.  Creating a wxGraphicsContext
@@ -343,8 +338,7 @@ def __init__(self, bitmap, renderer):
 
         dc, gfx_ctx = self._cache.get(bitmap, (None, None))
         if dc is None:
-            dc = wx.MemoryDC()
-            dc.SelectObject(bitmap)
+            dc = wx.MemoryDC(bitmap)
             gfx_ctx = wx.GraphicsContext.Create(dc)
             gfx_ctx._lastcliprect = None
             self._cache[bitmap] = dc, gfx_ctx
@@ -434,6 +428,7 @@ class _FigureCanvasWxBase(FigureCanvasBase, wx.Panel):
 
     required_interactive_framework = "wx"
     _timer_cls = TimerWx
+    manager_class = _api.classproperty(lambda cls: FigureManagerWx)
 
     keyvald = {
         wx.WXK_CONTROL: 'control',
@@ -513,27 +508,35 @@ def __init__(self, parent, id, figure=None):
         _log.debug("%s - __init__() - bitmap w:%d h:%d", type(self), w, h)
         self._isDrawn = False
         self._rubberband_rect = None
-
-        self.Bind(wx.EVT_SIZE, self._onSize)
-        self.Bind(wx.EVT_PAINT, self._onPaint)
-        self.Bind(wx.EVT_CHAR_HOOK, self._onKeyDown)
-        self.Bind(wx.EVT_KEY_UP, self._onKeyUp)
-        self.Bind(wx.EVT_LEFT_DOWN, self._onMouseButton)
-        self.Bind(wx.EVT_LEFT_DCLICK, self._onMouseButton)
-        self.Bind(wx.EVT_LEFT_UP, self._onMouseButton)
-        self.Bind(wx.EVT_MIDDLE_DOWN, self._onMouseButton)
-        self.Bind(wx.EVT_MIDDLE_DCLICK, self._onMouseButton)
-        self.Bind(wx.EVT_MIDDLE_UP, self._onMouseButton)
-        self.Bind(wx.EVT_RIGHT_DOWN, self._onMouseButton)
-        self.Bind(wx.EVT_RIGHT_DCLICK, self._onMouseButton)
-        self.Bind(wx.EVT_RIGHT_UP, self._onMouseButton)
-        self.Bind(wx.EVT_MOUSEWHEEL, self._onMouseWheel)
-        self.Bind(wx.EVT_MOTION, self._onMotion)
-        self.Bind(wx.EVT_LEAVE_WINDOW, self._onLeave)
-        self.Bind(wx.EVT_ENTER_WINDOW, self._onEnter)
-
-        self.Bind(wx.EVT_MOUSE_CAPTURE_CHANGED, self._onCaptureLost)
-        self.Bind(wx.EVT_MOUSE_CAPTURE_LOST, self._onCaptureLost)
+        self._rubberband_pen_black = wx.Pen('BLACK', 1, wx.PENSTYLE_SHORT_DASH)
+        self._rubberband_pen_white = wx.Pen('WHITE', 1, wx.PENSTYLE_SOLID)
+
+        self.Bind(wx.EVT_SIZE, self._on_size)
+        self.Bind(wx.EVT_PAINT, self._on_paint)
+        self.Bind(wx.EVT_CHAR_HOOK, self._on_key_down)
+        self.Bind(wx.EVT_KEY_UP, self._on_key_up)
+        self.Bind(wx.EVT_LEFT_DOWN, self._on_mouse_button)
+        self.Bind(wx.EVT_LEFT_DCLICK, self._on_mouse_button)
+        self.Bind(wx.EVT_LEFT_UP, self._on_mouse_button)
+        self.Bind(wx.EVT_MIDDLE_DOWN, self._on_mouse_button)
+        self.Bind(wx.EVT_MIDDLE_DCLICK, self._on_mouse_button)
+        self.Bind(wx.EVT_MIDDLE_UP, self._on_mouse_button)
+        self.Bind(wx.EVT_RIGHT_DOWN, self._on_mouse_button)
+        self.Bind(wx.EVT_RIGHT_DCLICK, self._on_mouse_button)
+        self.Bind(wx.EVT_RIGHT_UP, self._on_mouse_button)
+        self.Bind(wx.EVT_MOUSE_AUX1_DOWN, self._on_mouse_button)
+        self.Bind(wx.EVT_MOUSE_AUX1_UP, self._on_mouse_button)
+        self.Bind(wx.EVT_MOUSE_AUX2_DOWN, self._on_mouse_button)
+        self.Bind(wx.EVT_MOUSE_AUX2_UP, self._on_mouse_button)
+        self.Bind(wx.EVT_MOUSE_AUX1_DCLICK, self._on_mouse_button)
+        self.Bind(wx.EVT_MOUSE_AUX2_DCLICK, self._on_mouse_button)
+        self.Bind(wx.EVT_MOUSEWHEEL, self._on_mouse_wheel)
+        self.Bind(wx.EVT_MOTION, self._on_motion)
+        self.Bind(wx.EVT_ENTER_WINDOW, self._on_enter)
+        self.Bind(wx.EVT_LEAVE_WINDOW, self._on_leave)
+
+        self.Bind(wx.EVT_MOUSE_CAPTURE_CHANGED, self._on_capture_lost)
+        self.Bind(wx.EVT_MOUSE_CAPTURE_LOST, self._on_capture_lost)
 
         self.SetBackgroundStyle(wx.BG_STYLE_PAINT)  # Reduce flicker.
         self.SetBackgroundColour(wx.WHITE)
@@ -601,11 +604,10 @@ def _get_imagesave_wildcards(self):
         wildcards = '|'.join(wildcards)
         return wildcards, extensions, filter_index
 
-    @_api.delete_parameter("3.4", "origin")
-    def gui_repaint(self, drawDC=None, origin='WX'):
+    def gui_repaint(self, drawDC=None):
         """
-        Performs update of the displayed image on the GUI canvas, using the
-        supplied wx.PaintDC device context.
+        Update the displayed image on the GUI canvas, using the supplied
+        wx.PaintDC device context.
 
         The 'WXAgg' backend sets origin accordingly.
         """
@@ -620,15 +622,16 @@ def gui_repaint(self, drawDC=None, origin='WX'):
         # DC (see GraphicsContextWx._cache).
         bmp = (self.bitmap.ConvertToImage().ConvertToBitmap()
                if wx.Platform == '__WXMSW__'
-                  and isinstance(self.figure._cachedRenderer, RendererWx)
+                  and isinstance(self.figure.canvas.get_renderer(), RendererWx)
                else self.bitmap)
         drawDC.DrawBitmap(bmp, 0, 0)
         if self._rubberband_rect is not None:
-            x0, y0, x1, y1 = self._rubberband_rect
-            drawDC.DrawLineList(
-                [(x0, y0, x1, y0), (x1, y0, x1, y1),
-                 (x0, y0, x0, y1), (x0, y1, x1, y1)],
-                wx.Pen('BLACK', 1, wx.PENSTYLE_SHORT_DASH))
+            # Some versions of wx+python don't support numpy.float64 here.
+            x0, y0, x1, y1 = map(round, self._rubberband_rect)
+            rect = [(x0, y0, x1, y0), (x1, y0, x1, y1),
+                    (x0, y0, x0, y1), (x0, y1, x1, y1)]
+            drawDC.DrawLineList(rect, self._rubberband_pen_white)
+            drawDC.DrawLineList(rect, self._rubberband_pen_black)
 
     filetypes = {
         **FigureCanvasBase.filetypes,
@@ -651,9 +654,9 @@ def print_figure(self, filename, *args, **kwargs):
         if self._isDrawn:
             self.draw()
 
-    def _onPaint(self, event):
+    def _on_paint(self, event):
         """Called when wxPaintEvt is generated."""
-        _log.debug("%s - _onPaint()", type(self))
+        _log.debug("%s - _on_paint()", type(self))
         drawDC = wx.PaintDC(self)
         if not self._isDrawn:
             self.draw(drawDC=drawDC)
@@ -661,7 +664,7 @@ def _onPaint(self, event):
             self.gui_repaint(drawDC=drawDC)
         drawDC.Destroy()
 
-    def _onSize(self, event):
+    def _on_size(self, event):
         """
         Called when wxEventSize is generated.
 
@@ -669,7 +672,7 @@ def _onSize(self, event):
         is better to take the performance hit and redraw the whole window.
         """
 
-        _log.debug("%s - _onSize()", type(self))
+        _log.debug("%s - _on_size()", type(self))
         sz = self.GetParent().GetSizer()
         if sz:
             si = sz.GetItem(self)
@@ -703,7 +706,8 @@ def _onSize(self, event):
         # so no need to do anything here except to make sure
         # the whole background is repainted.
         self.Refresh(eraseBackground=False)
-        FigureCanvasBase.resize_event(self)
+        ResizeEvent("resize_event", self)._process()
+        self.draw_idle()
 
     def _get_key(self, event):
 
@@ -719,30 +723,60 @@ def _get_key(self, event):
         else:
             key = None
 
-        for meth, prefix, key_name in (
-                [event.ControlDown, 'ctrl', 'control'],
-                [event.AltDown, 'alt', 'alt'],
-                [event.ShiftDown, 'shift', 'shift'],):
+        for meth, prefix, key_name in [
+                (event.ControlDown, 'ctrl', 'control'),
+                (event.AltDown, 'alt', 'alt'),
+                (event.ShiftDown, 'shift', 'shift'),
+        ]:
             if meth() and key_name != key:
                 if not (key_name == 'shift' and key.isupper()):
                     key = '{0}+{1}'.format(prefix, key)
 
         return key
 
-    def _onKeyDown(self, event):
+    def _mpl_coords(self, pos=None):
+        """
+        Convert a wx position, defaulting to the current cursor position, to
+        Matplotlib coordinates.
+        """
+        if pos is None:
+            pos = wx.GetMouseState()
+            x, y = self.ScreenToClient(pos.X, pos.Y)
+        else:
+            x, y = pos.X, pos.Y
+        # flip y so y=0 is bottom of canvas
+        return x, self.figure.bbox.height - y
+
+    def _on_key_down(self, event):
         """Capture key press."""
-        key = self._get_key(event)
-        FigureCanvasBase.key_press_event(self, key, guiEvent=event)
+        KeyEvent("key_press_event", self,
+                 self._get_key(event), *self._mpl_coords(),
+                 guiEvent=event)._process()
         if self:
             event.Skip()
 
-    def _onKeyUp(self, event):
+    def _on_key_up(self, event):
         """Release key."""
-        key = self._get_key(event)
-        FigureCanvasBase.key_release_event(self, key, guiEvent=event)
+        KeyEvent("key_release_event", self,
+                 self._get_key(event), *self._mpl_coords(),
+                 guiEvent=event)._process()
         if self:
             event.Skip()
 
+    def set_cursor(self, cursor):
+        # docstring inherited
+        cursor = wx.Cursor(_api.check_getitem({
+            cursors.MOVE: wx.CURSOR_HAND,
+            cursors.HAND: wx.CURSOR_HAND,
+            cursors.POINTER: wx.CURSOR_ARROW,
+            cursors.SELECT_REGION: wx.CURSOR_CROSS,
+            cursors.WAIT: wx.CURSOR_WAIT,
+            cursors.RESIZE_HORIZONTAL: wx.CURSOR_SIZEWE,
+            cursors.RESIZE_VERTICAL: wx.CURSOR_SIZENS,
+        }, cursor=cursor))
+        self.SetCursor(cursor)
+        self.Refresh()
+
     def _set_capture(self, capture=True):
         """Control wx mouse capture."""
         if self.HasCapture():
@@ -750,36 +784,37 @@ def _set_capture(self, capture=True):
         if capture:
             self.CaptureMouse()
 
-    def _onCaptureLost(self, event):
+    def _on_capture_lost(self, event):
         """Capture changed or lost"""
         self._set_capture(False)
 
-    def _onMouseButton(self, event):
+    def _on_mouse_button(self, event):
         """Start measuring on an axis."""
         event.Skip()
         self._set_capture(event.ButtonDown() or event.ButtonDClick())
-        x = event.X
-        y = self.figure.bbox.height - event.Y
+        x, y = self._mpl_coords(event)
         button_map = {
             wx.MOUSE_BTN_LEFT: MouseButton.LEFT,
             wx.MOUSE_BTN_MIDDLE: MouseButton.MIDDLE,
             wx.MOUSE_BTN_RIGHT: MouseButton.RIGHT,
+            wx.MOUSE_BTN_AUX1: MouseButton.BACK,
+            wx.MOUSE_BTN_AUX2: MouseButton.FORWARD,
         }
         button = event.GetButton()
         button = button_map.get(button, button)
         if event.ButtonDown():
-            self.button_press_event(x, y, button, guiEvent=event)
+            MouseEvent("button_press_event", self,
+                       x, y, button, guiEvent=event)._process()
         elif event.ButtonDClick():
-            self.button_press_event(x, y, button, dblclick=True,
-                                    guiEvent=event)
+            MouseEvent("button_press_event", self,
+                       x, y, button, dblclick=True, guiEvent=event)._process()
         elif event.ButtonUp():
-            self.button_release_event(x, y, button, guiEvent=event)
+            MouseEvent("button_release_event", self,
+                       x, y, button, guiEvent=event)._process()
 
-    def _onMouseWheel(self, event):
+    def _on_mouse_wheel(self, event):
         """Translate mouse wheel events into matplotlib events"""
-        # Determine mouse location
-        x = event.GetX()
-        y = self.figure.bbox.height - event.GetY()
+        x, y = self._mpl_coords(event)
         # Convert delta/rotation/rate into a floating point step size
         step = event.LinesPerAction * event.WheelRotation / event.WheelDelta
         # Done handling event
@@ -793,26 +828,29 @@ def _onMouseWheel(self, event):
                 return  # Return without processing event
             else:
                 self._skipwheelevent = True
-        FigureCanvasBase.scroll_event(self, x, y, step, guiEvent=event)
+        MouseEvent("scroll_event", self,
+                   x, y, step=step, guiEvent=event)._process()
 
-    def _onMotion(self, event):
+    def _on_motion(self, event):
         """Start measuring on an axis."""
-        x = event.GetX()
-        y = self.figure.bbox.height - event.GetY()
         event.Skip()
-        FigureCanvasBase.motion_notify_event(self, x, y, guiEvent=event)
+        MouseEvent("motion_notify_event", self,
+                   *self._mpl_coords(event),
+                   guiEvent=event)._process()
 
-    def _onLeave(self, event):
-        """Mouse has left the window."""
+    def _on_enter(self, event):
+        """Mouse has entered the window."""
         event.Skip()
-        FigureCanvasBase.leave_notify_event(self, guiEvent=event)
+        LocationEvent("figure_enter_event", self,
+                      *self._mpl_coords(event),
+                      guiEvent=event)._process()
 
-    def _onEnter(self, event):
-        """Mouse has entered the window."""
-        x = event.GetX()
-        y = self.figure.bbox.height - event.GetY()
+    def _on_leave(self, event):
+        """Mouse has left the window."""
         event.Skip()
-        FigureCanvasBase.enter_notify_event(self, guiEvent=event, xy=(x, y))
+        LocationEvent("figure_leave_event", self,
+                      *self._mpl_coords(event),
+                      guiEvent=event)._process()
 
 
 class FigureCanvasWx(_FigureCanvasWxBase):
@@ -829,67 +867,19 @@ def draw(self, drawDC=None):
         self._isDrawn = True
         self.gui_repaint(drawDC=drawDC)
 
-    def print_bmp(self, filename, *args, **kwargs):
-        return self._print_image(filename, wx.BITMAP_TYPE_BMP, *args, **kwargs)
-
-    def print_jpeg(self, filename, *args, **kwargs):
-        return self._print_image(filename, wx.BITMAP_TYPE_JPEG,
-                                 *args, **kwargs)
-    print_jpg = print_jpeg
-
-    def print_pcx(self, filename, *args, **kwargs):
-        return self._print_image(filename, wx.BITMAP_TYPE_PCX, *args, **kwargs)
-
-    def print_png(self, filename, *args, **kwargs):
-        return self._print_image(filename, wx.BITMAP_TYPE_PNG, *args, **kwargs)
-
-    def print_tiff(self, filename, *args, **kwargs):
-        return self._print_image(filename, wx.BITMAP_TYPE_TIF, *args, **kwargs)
-    print_tif = print_tiff
-
-    def print_xpm(self, filename, *args, **kwargs):
-        return self._print_image(filename, wx.BITMAP_TYPE_XPM, *args, **kwargs)
-
-    @_check_savefig_extra_args
-    def _print_image(self, filename, filetype, *, quality=None):
-        origBitmap = self.bitmap
-
-        self.bitmap = wx.Bitmap(math.ceil(self.figure.bbox.width),
-                                math.ceil(self.figure.bbox.height))
-        renderer = RendererWx(self.bitmap, self.figure.dpi)
-
-        gc = renderer.new_gc()
-        self.figure.draw(renderer)
-
-        # image is the object that we call SaveFile on.
-        image = self.bitmap
-        # set the JPEG quality appropriately.  Unfortunately, it is only
-        # possible to set the quality on a wx.Image object.  So if we
-        # are saving a JPEG, convert the wx.Bitmap to a wx.Image,
-        # and set the quality.
-        if filetype == wx.BITMAP_TYPE_JPEG:
-            if quality is None:
-                quality = dict.__getitem__(mpl.rcParams,
-                                           'savefig.jpeg_quality')
-            image = self.bitmap.ConvertToImage()
-            image.SetOption(wx.IMAGE_OPTION_QUALITY, str(quality))
-
-        # Now that we have rendered into the bitmap, save it to the appropriate
-        # file type and clean up.
-        if (cbook.is_writable_file_like(filename) and
-                not isinstance(image, wx.Image)):
-            image = image.ConvertToImage()
-        if not image.SaveFile(filename, filetype):
+    def _print_image(self, filetype, filename):
+        bitmap = wx.Bitmap(math.ceil(self.figure.bbox.width),
+                           math.ceil(self.figure.bbox.height))
+        self.figure.draw(RendererWx(bitmap, self.figure.dpi))
+        saved_obj = (bitmap.ConvertToImage()
+                     if cbook.is_writable_file_like(filename)
+                     else bitmap)
+        if not saved_obj.SaveFile(filename, filetype):
             raise RuntimeError(f'Could not save figure to {filename}')
-
-        # Restore everything to normal
-        self.bitmap = origBitmap
-
-        # Note: draw is required here since bits of state about the
-        # last renderer are strewn about the artist draw methods.  Do
-        # not remove the draw without first verifying that these have
-        # been cleaned up.  The artist contains() methods will fail
-        # otherwise.
+        # draw() is required here since bits of state about the last renderer
+        # are strewn about the artist draw methods.  Do not remove the draw
+        # without first verifying that these have been cleaned up.  The artist
+        # contains() methods will fail otherwise.
         if self._isDrawn:
             self.draw()
         # The "if self" check avoids a "wrapped C/C++ object has been deleted"
@@ -897,9 +887,22 @@ def _print_image(self, filename, filetype, *, quality=None):
         if self:
             self.Refresh()
 
+    print_bmp = functools.partialmethod(
+        _print_image, wx.BITMAP_TYPE_BMP)
+    print_jpeg = print_jpg = functools.partialmethod(
+        _print_image, wx.BITMAP_TYPE_JPEG)
+    print_pcx = functools.partialmethod(
+        _print_image, wx.BITMAP_TYPE_PCX)
+    print_png = functools.partialmethod(
+        _print_image, wx.BITMAP_TYPE_PNG)
+    print_tiff = print_tif = functools.partialmethod(
+        _print_image, wx.BITMAP_TYPE_TIF)
+    print_xpm = functools.partialmethod(
+        _print_image, wx.BITMAP_TYPE_XPM)
+
 
 class FigureFrameWx(wx.Frame):
-    def __init__(self, num, fig):
+    def __init__(self, num, fig, *, canvas_class=None):
         # On non-Windows platform, explicitly set the position - fix
         # positioning bug on some Linux platforms
         if wx.Platform == '__WXMSW__':
@@ -909,95 +912,74 @@ def __init__(self, num, fig):
         super().__init__(parent=None, id=-1, pos=pos)
         # Frame will be sized later by the Fit method
         _log.debug("%s - __init__()", type(self))
-        self.num = num
         _set_frame_icon(self)
 
-        self.canvas = self.get_canvas(fig)
-        w, h = map(math.ceil, fig.bbox.size)
-        self.canvas.SetInitialSize(wx.Size(w, h))
-        self.canvas.SetFocus()
-        self.sizer = wx.BoxSizer(wx.VERTICAL)
-        self.sizer.Add(self.canvas, 1, wx.TOP | wx.LEFT | wx.EXPAND)
-        # By adding toolbar in sizer, we are able to put it at the bottom
-        # of the frame - so appearance is closer to GTK version
-
-        self.figmgr = FigureManagerWx(self.canvas, num, self)
-
-        self.toolbar = self._get_toolbar()
-
-        if self.figmgr.toolmanager:
-            backend_tools.add_tools_to_manager(self.figmgr.toolmanager)
-            if self.toolbar:
-                backend_tools.add_tools_to_container(self.toolbar)
-
-        if self.toolbar is not None:
-            self.toolbar.Realize()
-            # On Windows platform, default window size is incorrect, so set
-            # toolbar width to figure width.
-            tw, th = self.toolbar.GetSize()
-            fw, fh = self.canvas.GetSize()
-            # By adding toolbar in sizer, we are able to put it at the bottom
-            # of the frame - so appearance is closer to GTK version.
-            self.toolbar.SetSize(wx.Size(fw, th))
-            self.sizer.Add(self.toolbar, 0, wx.LEFT | wx.EXPAND)
-        self.SetSizer(self.sizer)
-        self.Fit()
+        # The parameter will become required after the deprecation elapses.
+        if canvas_class is not None:
+            self.canvas = canvas_class(self, -1, fig)
+        else:
+            _api.warn_deprecated(
+                "3.6", message="The canvas_class parameter will become "
+                "required after the deprecation period starting in Matplotlib "
+                "%(since)s elapses.")
+            self.canvas = self.get_canvas(fig)
 
-        self.canvas.SetMinSize((2, 2))
+        # Auto-attaches itself to self.canvas.manager
+        manager = FigureManagerWx(self.canvas, num, self)
 
-        self.Bind(wx.EVT_CLOSE, self._onClose)
+        toolbar = self.canvas.manager.toolbar
+        if toolbar is not None:
+            self.SetToolBar(toolbar)
 
-    @property
-    def toolmanager(self):
-        return self.figmgr.toolmanager
+        # On Windows, canvas sizing must occur after toolbar addition;
+        # otherwise the toolbar further resizes the canvas.
+        w, h = map(math.ceil, fig.bbox.size)
+        self.canvas.SetInitialSize(wx.Size(w, h))
+        self.canvas.SetMinSize((2, 2))
+        self.canvas.SetFocus()
 
-    def _get_toolbar(self):
-        if mpl.rcParams['toolbar'] == 'toolbar2':
-            toolbar = NavigationToolbar2Wx(self.canvas)
-        elif mpl.rcParams['toolbar'] == 'toolmanager':
-            toolbar = ToolbarWx(self.toolmanager, self)
-        else:
-            toolbar = None
-        return toolbar
+        self.Fit()
 
+        self.Bind(wx.EVT_CLOSE, self._on_close)
+
+    sizer = _api.deprecated("3.6", alternative="frame.GetSizer()")(
+        property(lambda self: self.GetSizer()))
+    figmgr = _api.deprecated("3.6", alternative="frame.canvas.manager")(
+        property(lambda self: self.canvas.manager))
+    num = _api.deprecated("3.6", alternative="frame.canvas.manager.num")(
+        property(lambda self: self.canvas.manager.num))
+    toolbar = _api.deprecated("3.6", alternative="frame.GetToolBar()")(
+        property(lambda self: self.GetToolBar()))
+    toolmanager = _api.deprecated(
+        "3.6", alternative="frame.canvas.manager.toolmanager")(
+            property(lambda self: self.canvas.manager.toolmanager))
+
+    @_api.deprecated(
+        "3.6", alternative="the canvas_class constructor parameter")
     def get_canvas(self, fig):
         return FigureCanvasWx(self, -1, fig)
 
+    @_api.deprecated("3.6", alternative="frame.canvas.manager")
     def get_figure_manager(self):
         _log.debug("%s - get_figure_manager()", type(self))
-        return self.figmgr
+        return self.canvas.manager
 
-    def _onClose(self, event):
-        _log.debug("%s - onClose()", type(self))
-        self.canvas.close_event()
+    def _on_close(self, event):
+        _log.debug("%s - on_close()", type(self))
+        CloseEvent("close_event", self.canvas)._process()
         self.canvas.stop_event_loop()
         # set FigureManagerWx.frame to None to prevent repeated attempts to
         # close this frame from FigureManagerWx.destroy()
-        self.figmgr.frame = None
+        self.canvas.manager.frame = None
         # remove figure manager from Gcf.figs
-        Gcf.destroy(self.figmgr)
+        Gcf.destroy(self.canvas.manager)
+        try:  # See issue 2941338.
+            self.canvas.mpl_disconnect(self.canvas.toolbar._id_drag)
+        except AttributeError:  # If there's no toolbar.
+            pass
         # Carry on with close event propagation, frame & children destruction
         event.Skip()
 
-    def GetToolBar(self):
-        """Override wxFrame::GetToolBar as we don't have managed toolbar"""
-        return self.toolbar
-
-    def Destroy(self, *args, **kwargs):
-        try:
-            self.canvas.mpl_disconnect(self.toolbar._id_drag)
-            # Rationale for line above: see issue 2941338.
-        except AttributeError:
-            pass  # classic toolbar lacks the attribute
-        # The "if self" check avoids a "wrapped C/C++ object has been deleted"
-        # RuntimeError at exit with e.g.
-        # MPLBACKEND=wxagg python -c 'from pylab import *; plot()'.
-        if self and not self.IsBeingDeleted():
-            super().Destroy(*args, **kwargs)
-            # self.toolbar.Destroy() should not be necessary if the close event
-            # is allowed to propagate.
-        return True
-
 
 class FigureManagerWx(FigureManagerBase):
     """
@@ -1017,20 +999,18 @@ class FigureManagerWx(FigureManagerBase):
     def __init__(self, canvas, num, frame):
         _log.debug("%s - __init__()", type(self))
         self.frame = self.window = frame
-        self._initializing = True
         super().__init__(canvas, num)
-        self._initializing = False
 
-    @property
-    def toolbar(self):
-        return self.frame.GetToolBar()
-
-    @toolbar.setter
-    def toolbar(self, value):
-        # Never allow this, except that base class inits this to None before
-        # the frame is set up.
-        if not self._initializing:
-            raise AttributeError("can't set attribute")
+    @classmethod
+    def create_with_canvas(cls, canvas_class, figure, num):
+        # docstring inherited
+        wxapp = wx.GetApp() or _create_wxapp()
+        frame = FigureFrameWx(num, figure, canvas_class=canvas_class)
+        manager = figure.canvas.manager
+        if mpl.is_interactive():
+            manager.frame.Show()
+            figure.canvas.draw_idle()
+        return manager
 
     def show(self):
         # docstring inherited
@@ -1062,9 +1042,9 @@ def set_window_title(self, title):
 
     def resize(self, width, height):
         # docstring inherited
-        self.canvas.SetInitialSize(
-            wx.Size(math.ceil(width), math.ceil(height)))
-        self.window.GetSizer().Fit(self.window)
+        # Directly using SetClientSize doesn't handle the toolbar on Windows.
+        self.window.SetSize(self.window.ClientToWindowSize(wx.Size(
+            math.ceil(width), math.ceil(height))))
 
 
 def _load_bitmap(filename):
@@ -1085,18 +1065,9 @@ def _set_frame_icon(frame):
     frame.SetIcons(bundle)
 
 
-cursord = {
-    cursors.MOVE: wx.CURSOR_HAND,
-    cursors.HAND: wx.CURSOR_HAND,
-    cursors.POINTER: wx.CURSOR_ARROW,
-    cursors.SELECT_REGION: wx.CURSOR_CROSS,
-    cursors.WAIT: wx.CURSOR_WAIT,
-}
-
-
 class NavigationToolbar2Wx(NavigationToolbar2, wx.ToolBar):
-    def __init__(self, canvas, coordinates=True):
-        wx.ToolBar.__init__(self, canvas.GetParent(), -1)
+    def __init__(self, canvas, coordinates=True, *, style=wx.TB_BOTTOM):
+        wx.ToolBar.__init__(self, canvas.GetParent(), -1, style=style)
 
         if 'wxMac' in wx.PlatformInfo:
             self.SetToolBitmapSize((24, 24))
@@ -1120,28 +1091,13 @@ def __init__(self, canvas, coordinates=True):
         self._coordinates = coordinates
         if self._coordinates:
             self.AddStretchableSpace()
-            self._label_text = wx.StaticText(self)
+            self._label_text = wx.StaticText(self, style=wx.ALIGN_RIGHT)
             self.AddControl(self._label_text)
 
         self.Realize()
 
         NavigationToolbar2.__init__(self, canvas)
 
-        self._prevZoomRect = None
-        # for now, use alternate zoom-rectangle drawing on all
-        # Macs. N.B. In future versions of wx it may be possible to
-        # detect Retina displays with window.GetContentScaleFactor()
-        # and/or dc.GetContentScaleFactor()
-        self._retinaFix = 'wxMac' in wx.PlatformInfo
-
-    prevZoomRect = _api.deprecate_privatize_attribute("3.3")
-    retinaFix = _api.deprecate_privatize_attribute("3.3")
-    savedRetinaImage = _api.deprecate_privatize_attribute("3.3")
-    wxoverlay = _api.deprecate_privatize_attribute("3.3")
-    zoomAxes = _api.deprecate_privatize_attribute("3.3")
-    zoomStartX = _api.deprecate_privatize_attribute("3.3")
-    zoomStartY = _api.deprecate_privatize_attribute("3.3")
-
     @staticmethod
     def _icon(name):
         """
@@ -1167,33 +1123,33 @@ def _icon(name):
         return wx.Bitmap.FromBufferRGBA(
             image.shape[1], image.shape[0], image.tobytes())
 
-    @_api.deprecated("3.4")
-    def get_canvas(self, frame, fig):
-        return type(self.canvas)(frame, -1, fig)
+    def _update_buttons_checked(self):
+        if "Pan" in self.wx_ids:
+            self.ToggleTool(self.wx_ids["Pan"], self.mode.name == "PAN")
+        if "Zoom" in self.wx_ids:
+            self.ToggleTool(self.wx_ids["Zoom"], self.mode.name == "ZOOM")
 
     def zoom(self, *args):
-        tool = self.wx_ids['Zoom']
-        self.ToggleTool(tool, not self.GetToolState(tool))
         super().zoom(*args)
+        self._update_buttons_checked()
 
     def pan(self, *args):
-        tool = self.wx_ids['Pan']
-        self.ToggleTool(tool, not self.GetToolState(tool))
         super().pan(*args)
+        self._update_buttons_checked()
 
     def save_figure(self, *args):
         # Fetch the required filename and file type.
         filetypes, exts, filter_index = self.canvas._get_imagesave_wildcards()
         default_file = self.canvas.get_default_filename()
-        dlg = wx.FileDialog(
+        dialog = wx.FileDialog(
             self.canvas.GetParent(), "Save to file",
             mpl.rcParams["savefig.directory"], default_file, filetypes,
             wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
-        dlg.SetFilterIndex(filter_index)
-        if dlg.ShowModal() == wx.ID_OK:
-            path = pathlib.Path(dlg.GetPath())
+        dialog.SetFilterIndex(filter_index)
+        if dialog.ShowModal() == wx.ID_OK:
+            path = pathlib.Path(dialog.GetPath())
             _log.debug('%s - Save file path: %s', type(self), path)
-            fmt = exts[dlg.GetFilterIndex()]
+            fmt = exts[dialog.GetFilterIndex()]
             ext = path.suffix[1:]
             if ext in self.canvas.get_supported_filetypes() and fmt != ext:
                 # looks like they forgot to set the image type drop
@@ -1208,41 +1164,11 @@ def save_figure(self, *args):
             try:
                 self.canvas.figure.savefig(str(path), format=fmt)
             except Exception as e:
-                error_msg_wx(str(e))
-
-    def set_cursor(self, cursor):
-        cursor = wx.Cursor(cursord[cursor])
-        self.canvas.SetCursor(cursor)
-        self.canvas.Update()
-
-    def press_zoom(self, event):
-        super().press_zoom(event)
-        if self.mode.name == 'ZOOM':
-            if not self._retinaFix:
-                self._wxoverlay = wx.Overlay()
-            else:
-                if event.inaxes is not None:
-                    self._savedRetinaImage = self.canvas.copy_from_bbox(
-                        event.inaxes.bbox)
-                    self._zoomStartX = event.xdata
-                    self._zoomStartY = event.ydata
-                    self._zoomAxes = event.inaxes
-
-    def release_zoom(self, event):
-        super().release_zoom(event)
-        if self.mode.name == 'ZOOM':
-            # When the mouse is released we reset the overlay and it
-            # restores the former content to the window.
-            if not self._retinaFix:
-                self._wxoverlay.Reset()
-                del self._wxoverlay
-            else:
-                del self._savedRetinaImage
-                if self._prevZoomRect:
-                    self._prevZoomRect.pop(0).remove()
-                    self._prevZoomRect = None
-                if self._zoomAxes:
-                    self._zoomAxes = None
+                dialog = wx.MessageDialog(
+                    parent=self.canvas.GetParent(), message=str(e),
+                    caption='Matplotlib error')
+                dialog.ShowModal()
+                dialog.Destroy()
 
     def draw_rubberband(self, event, x0, y0, x1, y1):
         height = self.canvas.figure.bbox.height
@@ -1266,29 +1192,16 @@ def set_history_buttons(self):
             self.EnableTool(self.wx_ids['Forward'], can_forward)
 
 
-@_api.deprecated("3.3")
-class StatusBarWx(wx.StatusBar):
-    """
-    A status bar is added to _FigureFrame to allow measurements and the
-    previously selected scroll function to be displayed as a user convenience.
-    """
-
-    def __init__(self, parent, *args, **kwargs):
-        super().__init__(parent, -1)
-        self.SetFieldsCount(2)
-
-    def set_function(self, string):
-        self.SetStatusText("%s" % string, 1)
-
-
 # tools for matplotlib.backend_managers.ToolManager:
 
 class ToolbarWx(ToolContainerBase, wx.ToolBar):
-    def __init__(self, toolmanager, parent, style=wx.TB_HORIZONTAL):
+    def __init__(self, toolmanager, parent=None, style=wx.TB_BOTTOM):
+        if parent is None:
+            parent = toolmanager.canvas.GetParent()
         ToolContainerBase.__init__(self, toolmanager)
         wx.ToolBar.__init__(self, parent, -1, style=style)
         self._space = self.AddStretchableSpace()
-        self._label_text = wx.StaticText(self)
+        self._label_text = wx.StaticText(self, style=wx.ALIGN_RIGHT)
         self.AddControl(self._label_text)
         self._toolitems = {}
         self._groups = {}  # Mapping of groups to the separator after them.
@@ -1368,37 +1281,27 @@ def set_message(self, s):
         self._label_text.SetLabel(s)
 
 
-@_api.deprecated("3.3")
-class StatusbarWx(StatusbarBase, wx.StatusBar):
-    """For use with ToolManager."""
-    def __init__(self, parent, *args, **kwargs):
-        StatusbarBase.__init__(self, *args, **kwargs)
-        wx.StatusBar.__init__(self, parent, -1)
-        self.SetFieldsCount(1)
-        self.SetStatusText("")
-
-    def set_message(self, s):
-        self.SetStatusText(s)
-
-
+@backend_tools._register_tool_class(_FigureCanvasWxBase)
 class ConfigureSubplotsWx(backend_tools.ConfigureSubplotsBase):
     def trigger(self, *args):
-        NavigationToolbar2Wx.configure_subplots(
-            self._make_classic_style_pseudo_toolbar())
+        NavigationToolbar2Wx.configure_subplots(self)
 
 
+@backend_tools._register_tool_class(_FigureCanvasWxBase)
 class SaveFigureWx(backend_tools.SaveFigureBase):
     def trigger(self, *args):
         NavigationToolbar2Wx.save_figure(
             self._make_classic_style_pseudo_toolbar())
 
 
+@_api.deprecated("3.5", alternative="ToolSetCursor")
 class SetCursorWx(backend_tools.SetCursorBase):
     def set_cursor(self, cursor):
         NavigationToolbar2Wx.set_cursor(
             self._make_classic_style_pseudo_toolbar(), cursor)
 
 
+@backend_tools._register_tool_class(_FigureCanvasWxBase)
 class RubberbandWx(backend_tools.RubberbandBase):
     def draw_rubberband(self, x0, y0, x1, y1):
         NavigationToolbar2Wx.draw_rubberband(
@@ -1431,15 +1334,15 @@ def __init__(self, parent, help_entries):
                 grid_sizer.Add(label, 0, 0, 0)
         # finalize layout, create button
         sizer.Add(grid_sizer, 0, wx.ALL, 6)
-        OK = wx.Button(self, wx.ID_OK)
-        sizer.Add(OK, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 8)
+        ok = wx.Button(self, wx.ID_OK)
+        sizer.Add(ok, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 8)
         self.SetSizer(sizer)
         sizer.Fit(self)
         self.Layout()
-        self.Bind(wx.EVT_CLOSE, self.OnClose)
-        OK.Bind(wx.EVT_BUTTON, self.OnClose)
+        self.Bind(wx.EVT_CLOSE, self._on_close)
+        ok.Bind(wx.EVT_BUTTON, self._on_close)
 
-    def OnClose(self, event):
+    def _on_close(self, event):
         _HelpDialog._instance = None  # remove global reference
         self.DestroyLater()
         event.Skip()
@@ -1454,12 +1357,14 @@ def show(cls, parent, help_entries):
         cls._instance.Show()
 
 
+@backend_tools._register_tool_class(_FigureCanvasWxBase)
 class HelpWx(backend_tools.ToolHelpBase):
     def trigger(self, *args):
         _HelpDialog.show(self.figure.canvas.GetTopLevelParent(),
                          self._get_help_entries())
 
 
+@backend_tools._register_tool_class(_FigureCanvasWxBase)
 class ToolCopyToClipboardWx(backend_tools.ToolCopyToClipboardBase):
     def trigger(self, *args, **kwargs):
         if not self.canvas._isDrawn:
@@ -1472,41 +1377,14 @@ def trigger(self, *args, **kwargs):
             wx.TheClipboard.Close()
 
 
-backend_tools.ToolSaveFigure = SaveFigureWx
-backend_tools.ToolConfigureSubplots = ConfigureSubplotsWx
-backend_tools.ToolSetCursor = SetCursorWx
-backend_tools.ToolRubberband = RubberbandWx
-backend_tools.ToolHelp = HelpWx
-backend_tools.ToolCopyToClipboard = ToolCopyToClipboardWx
+FigureManagerWx._toolbar2_class = NavigationToolbar2Wx
+FigureManagerWx._toolmanager_toolbar_class = ToolbarWx
 
 
 @_Backend.export
 class _BackendWx(_Backend):
     FigureCanvas = FigureCanvasWx
     FigureManager = FigureManagerWx
-    _frame_class = FigureFrameWx
-
-    @classmethod
-    def new_figure_manager(cls, num, *args, **kwargs):
-        # Create a wx.App instance if it has not been created so far.
-        wxapp = wx.GetApp()
-        if wxapp is None:
-            wxapp = wx.App(False)
-            wxapp.SetExitOnFrameDelete(True)
-            cbook._setup_new_guiapp()
-            # Retain a reference to the app object so that it does not get
-            # garbage collected.
-            _BackendWx._theWxApp = wxapp
-        return super().new_figure_manager(num, *args, **kwargs)
-
-    @classmethod
-    def new_figure_manager_given_figure(cls, num, figure):
-        frame = cls._frame_class(num, figure)
-        figmgr = frame.get_figure_manager()
-        if mpl.is_interactive():
-            figmgr.frame.Show()
-            figure.canvas.draw_idle()
-        return figmgr
 
     @staticmethod
     def mainloop():
diff --git a/lib/matplotlib/backends/backend_wxagg.py b/lib/matplotlib/backends/backend_wxagg.py
index 106578e7e14b..ca7f91583766 100644
--- a/lib/matplotlib/backends/backend_wxagg.py
+++ b/lib/matplotlib/backends/backend_wxagg.py
@@ -1,11 +1,14 @@
 import wx
 
+from .. import _api
 from .backend_agg import FigureCanvasAgg
-from .backend_wx import (
-    _BackendWx, _FigureCanvasWxBase, FigureFrameWx,
+from .backend_wx import _BackendWx, _FigureCanvasWxBase, FigureFrameWx
+from .backend_wx import (  # noqa: F401 # pylint: disable=W0611
     NavigationToolbar2Wx as NavigationToolbar2WxAgg)
 
 
+@_api.deprecated(
+    "3.6", alternative="FigureFrameWx(..., canvas_class=FigureCanvasWxAgg)")
 class FigureFrameWxAgg(FigureFrameWx):
     def get_canvas(self, fig):
         return FigureCanvasWxAgg(self, -1, fig)
@@ -27,66 +30,32 @@ def draw(self, drawDC=None):
         Render the figure using agg.
         """
         FigureCanvasAgg.draw(self)
-
-        self.bitmap = _convert_agg_to_wx_bitmap(self.get_renderer(), None)
+        self.bitmap = _rgba_to_wx_bitmap(self.get_renderer().buffer_rgba())
         self._isDrawn = True
         self.gui_repaint(drawDC=drawDC)
 
     def blit(self, bbox=None):
         # docstring inherited
+        bitmap = _rgba_to_wx_bitmap(self.get_renderer().buffer_rgba())
         if bbox is None:
-            self.bitmap = _convert_agg_to_wx_bitmap(self.get_renderer(), None)
-            self.gui_repaint()
-            return
-
-        srcBmp = _convert_agg_to_wx_bitmap(self.get_renderer(), None)
-        srcDC = wx.MemoryDC()
-        srcDC.SelectObject(srcBmp)
-
-        destDC = wx.MemoryDC()
-        destDC.SelectObject(self.bitmap)
-
-        x = int(bbox.x0)
-        y = int(self.bitmap.GetHeight() - bbox.y1)
-        destDC.Blit(x, y, int(bbox.width), int(bbox.height), srcDC, x, y)
-
-        destDC.SelectObject(wx.NullBitmap)
-        srcDC.SelectObject(wx.NullBitmap)
+            self.bitmap = bitmap
+        else:
+            srcDC = wx.MemoryDC(bitmap)
+            destDC = wx.MemoryDC(self.bitmap)
+            x = int(bbox.x0)
+            y = int(self.bitmap.GetHeight() - bbox.y1)
+            destDC.Blit(x, y, int(bbox.width), int(bbox.height), srcDC, x, y)
+            destDC.SelectObject(wx.NullBitmap)
+            srcDC.SelectObject(wx.NullBitmap)
         self.gui_repaint()
 
 
-def _convert_agg_to_wx_bitmap(agg, bbox):
-    """
-    Convert the region of the agg buffer bounded by bbox to a wx.Bitmap.  If
-    bbox is None, the entire buffer is converted.
-    Note: agg must be a backend_agg.RendererAgg instance.
-    """
-    if bbox is None:
-        # agg => rgba buffer -> bitmap
-        return wx.Bitmap.FromBufferRGBA(int(agg.width), int(agg.height),
-                                        agg.buffer_rgba())
-    else:
-        # agg => rgba buffer -> bitmap => clipped bitmap
-        srcBmp = wx.Bitmap.FromBufferRGBA(int(agg.width), int(agg.height),
-                                          agg.buffer_rgba())
-        srcDC = wx.MemoryDC()
-        srcDC.SelectObject(srcBmp)
-
-        destBmp = wx.Bitmap(int(bbox.width), int(bbox.height))
-        destDC = wx.MemoryDC()
-        destDC.SelectObject(destBmp)
-
-        x = int(bbox.x0)
-        y = int(int(agg.height) - bbox.y1)
-        destDC.Blit(0, 0, int(bbox.width), int(bbox.height), srcDC, x, y)
-
-        srcDC.SelectObject(wx.NullBitmap)
-        destDC.SelectObject(wx.NullBitmap)
-
-        return destBmp
+def _rgba_to_wx_bitmap(rgba):
+    """Convert an RGBA buffer to a wx.Bitmap."""
+    h, w, _ = rgba.shape
+    return wx.Bitmap.FromBufferRGBA(w, h, rgba)
 
 
 @_BackendWx.export
 class _BackendWxAgg(_BackendWx):
     FigureCanvas = FigureCanvasWxAgg
-    _frame_class = FigureFrameWxAgg
diff --git a/lib/matplotlib/backends/backend_wxcairo.py b/lib/matplotlib/backends/backend_wxcairo.py
index 6cb0b9d68414..0416a187d091 100644
--- a/lib/matplotlib/backends/backend_wxcairo.py
+++ b/lib/matplotlib/backends/backend_wxcairo.py
@@ -1,17 +1,20 @@
 import wx.lib.wxcairo as wxcairo
 
-from .backend_cairo import cairo, FigureCanvasCairo, RendererCairo
-from .backend_wx import (
-    _BackendWx, _FigureCanvasWxBase, FigureFrameWx,
+from .. import _api
+from .backend_cairo import cairo, FigureCanvasCairo
+from .backend_wx import _BackendWx, _FigureCanvasWxBase, FigureFrameWx
+from .backend_wx import (  # noqa: F401 # pylint: disable=W0611
     NavigationToolbar2Wx as NavigationToolbar2WxCairo)
 
 
+@_api.deprecated(
+    "3.6", alternative="FigureFrameWx(..., canvas_class=FigureCanvasWxCairo)")
 class FigureFrameWxCairo(FigureFrameWx):
     def get_canvas(self, fig):
         return FigureCanvasWxCairo(self, -1, fig)
 
 
-class FigureCanvasWxCairo(_FigureCanvasWxBase, FigureCanvasCairo):
+class FigureCanvasWxCairo(FigureCanvasCairo, _FigureCanvasWxBase):
     """
     The FigureCanvas contains the figure and does event handling.
 
@@ -21,20 +24,11 @@ class FigureCanvasWxCairo(_FigureCanvasWxBase, FigureCanvasCairo):
     we give a hint as to our preferred minimum size.
     """
 
-    def __init__(self, parent, id, figure):
-        # _FigureCanvasWxBase should be fixed to have the same signature as
-        # every other FigureCanvas and use cooperative inheritance, but in the
-        # meantime the following will make do.
-        _FigureCanvasWxBase.__init__(self, parent, id, figure)
-        FigureCanvasCairo.__init__(self, figure)
-        self._renderer = RendererCairo(self.figure.dpi)
-
     def draw(self, drawDC=None):
-        width = int(self.figure.bbox.width)
-        height = int(self.figure.bbox.height)
-        surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
-        self._renderer.set_ctx_from_surface(surface)
-        self._renderer.set_width_height(width, height)
+        size = self.figure.bbox.size.astype(int)
+        surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, *size)
+        self._renderer.set_context(cairo.Context(surface))
+        self._renderer.dpi = self.figure.dpi
         self.figure.draw(self._renderer)
         self.bitmap = wxcairo.BitmapFromImageSurface(surface)
         self._isDrawn = True
@@ -44,4 +38,3 @@ def draw(self, drawDC=None):
 @_BackendWx.export
 class _BackendWxCairo(_BackendWx):
     FigureCanvas = FigureCanvasWxCairo
-    _frame_class = FigureFrameWxCairo
diff --git a/lib/matplotlib/backends/qt_compat.py b/lib/matplotlib/backends/qt_compat.py
index 21b89125d88e..06db924feea3 100644
--- a/lib/matplotlib/backends/qt_compat.py
+++ b/lib/matplotlib/backends/qt_compat.py
@@ -2,173 +2,131 @@
 Qt binding and backend selector.
 
 The selection logic is as follows:
-- if any of PyQt5, PySide2, PyQt4 or PySide have already been imported
-  (checked in that order), use it;
+- if any of PyQt6, PySide6, PyQt5, or PySide2 have already been
+  imported (checked in that order), use it;
 - otherwise, if the QT_API environment variable (used by Enthought) is set, use
-  it to determine which binding to use (but do not change the backend based on
-  it; i.e. if the Qt5Agg backend is requested but QT_API is set to "pyqt4",
-  then actually use Qt5 with PyQt5 or PySide2 (whichever can be imported);
+  it to determine which binding to use;
 - otherwise, use whatever the rcParams indicate.
-
-Support for PyQt4 is deprecated.
 """
 
-from distutils.version import LooseVersion
+import functools
+import operator
 import os
 import platform
 import sys
+import signal
+import socket
+import contextlib
+
+from packaging.version import parse as parse_version
 
 import matplotlib as mpl
 from matplotlib import _api
 
+from . import _QT_FORCE_QT5_BINDING
 
+QT_API_PYQT6 = "PyQt6"
+QT_API_PYSIDE6 = "PySide6"
 QT_API_PYQT5 = "PyQt5"
 QT_API_PYSIDE2 = "PySide2"
-QT_API_PYQTv2 = "PyQt4v2"
-QT_API_PYSIDE = "PySide"
-QT_API_PYQT = "PyQt4"   # Use the old sip v1 API (Py3 defaults to v2).
 QT_API_ENV = os.environ.get("QT_API")
 if QT_API_ENV is not None:
     QT_API_ENV = QT_API_ENV.lower()
-# Mapping of QT_API_ENV to requested binding.  ETS does not support PyQt4v1.
-# (https://github.com/enthought/pyface/blob/master/pyface/qt/__init__.py)
-_ETS = {"pyqt5": QT_API_PYQT5, "pyside2": QT_API_PYSIDE2,
-        "pyqt": QT_API_PYQTv2, "pyside": QT_API_PYSIDE,
-        None: None}
+_ETS = {  # Mapping of QT_API_ENV to requested binding.
+    "pyqt6": QT_API_PYQT6, "pyside6": QT_API_PYSIDE6,
+    "pyqt5": QT_API_PYQT5, "pyside2": QT_API_PYSIDE2,
+}
 # First, check if anything is already imported.
-if "PyQt5.QtCore" in sys.modules:
+if sys.modules.get("PyQt6.QtCore"):
+    QT_API = QT_API_PYQT6
+elif sys.modules.get("PySide6.QtCore"):
+    QT_API = QT_API_PYSIDE6
+elif sys.modules.get("PyQt5.QtCore"):
     QT_API = QT_API_PYQT5
-elif "PySide2.QtCore" in sys.modules:
+elif sys.modules.get("PySide2.QtCore"):
     QT_API = QT_API_PYSIDE2
-elif "PyQt4.QtCore" in sys.modules:
-    QT_API = QT_API_PYQTv2
-elif "PySide.QtCore" in sys.modules:
-    QT_API = QT_API_PYSIDE
 # Otherwise, check the QT_API environment variable (from Enthought).  This can
 # only override the binding, not the backend (in other words, we check that the
-# requested backend actually matches).  Use dict.__getitem__ to avoid
+# requested backend actually matches).  Use _get_backend_or_none to avoid
 # triggering backend resolution (which can result in a partially but
 # incompletely imported backend_qt5).
-elif dict.__getitem__(mpl.rcParams, "backend") in ["Qt5Agg", "Qt5Cairo"]:
+elif (mpl.rcParams._get_backend_or_none() or "").lower().startswith("qt5"):
     if QT_API_ENV in ["pyqt5", "pyside2"]:
         QT_API = _ETS[QT_API_ENV]
     else:
-        QT_API = None
-elif dict.__getitem__(mpl.rcParams, "backend") in ["Qt4Agg", "Qt4Cairo"]:
-    if QT_API_ENV in ["pyqt4", "pyside"]:
-        QT_API = _ETS[QT_API_ENV]
-    else:
+        _QT_FORCE_QT5_BINDING = True  # noqa
         QT_API = None
 # A non-Qt backend was selected but we still got there (possible, e.g., when
 # fully manually embedding Matplotlib in a Qt app without using pyplot).
+elif QT_API_ENV is None:
+    QT_API = None
+elif QT_API_ENV in _ETS:
+    QT_API = _ETS[QT_API_ENV]
 else:
-    try:
-        QT_API = _ETS[QT_API_ENV]
-    except KeyError as err:
-        raise RuntimeError(
-            "The environment variable QT_API has the unrecognized value {!r};"
-            "valid values are 'pyqt5', 'pyside2', 'pyqt', and "
-            "'pyside'") from err
+    raise RuntimeError(
+        "The environment variable QT_API has the unrecognized value {!r}; "
+        "valid values are {}".format(QT_API_ENV, ", ".join(_ETS)))
 
 
-def _setup_pyqt5():
-    global QtCore, QtGui, QtWidgets, __version__, is_pyqt5, \
-        _isdeleted, _getSaveFileName
+def _setup_pyqt5plus():
+    global QtCore, QtGui, QtWidgets, __version__
+    global _getSaveFileName, _isdeleted, _to_int
 
-    if QT_API == QT_API_PYQT5:
-        from PyQt5 import QtCore, QtGui, QtWidgets
-        import sip
+    if QT_API == QT_API_PYQT6:
+        from PyQt6 import QtCore, QtGui, QtWidgets, sip
         __version__ = QtCore.PYQT_VERSION_STR
         QtCore.Signal = QtCore.pyqtSignal
         QtCore.Slot = QtCore.pyqtSlot
         QtCore.Property = QtCore.pyqtProperty
         _isdeleted = sip.isdeleted
-    elif QT_API == QT_API_PYSIDE2:
-        from PySide2 import QtCore, QtGui, QtWidgets, __version__
-        import shiboken2
-        def _isdeleted(obj): return not shiboken2.isValid(obj)
-    else:
-        raise ValueError("Unexpected value for the 'backend.qt5' rcparam")
-    _getSaveFileName = QtWidgets.QFileDialog.getSaveFileName
-
-    @_api.deprecated("3.3", alternative="QtCore.qVersion()")
-    def is_pyqt5():
-        return True
-
-
-def _setup_pyqt4():
-    global QtCore, QtGui, QtWidgets, __version__, is_pyqt5, \
-        _isdeleted, _getSaveFileName
-
-    def _setup_pyqt4_internal(api):
-        global QtCore, QtGui, QtWidgets, \
-            __version__, is_pyqt5, _isdeleted, _getSaveFileName
-        # List of incompatible APIs:
-        # http://pyqt.sourceforge.net/Docs/PyQt4/incompatible_apis.html
-        _sip_apis = ["QDate", "QDateTime", "QString", "QTextStream", "QTime",
-                     "QUrl", "QVariant"]
-        try:
-            import sip
-        except ImportError:
-            pass
+        _to_int = operator.attrgetter('value')
+    elif QT_API == QT_API_PYSIDE6:
+        from PySide6 import QtCore, QtGui, QtWidgets, __version__
+        import shiboken6
+        def _isdeleted(obj): return not shiboken6.isValid(obj)
+        if parse_version(__version__) >= parse_version('6.4'):
+            _to_int = operator.attrgetter('value')
         else:
-            for _sip_api in _sip_apis:
-                try:
-                    sip.setapi(_sip_api, api)
-                except ValueError:
-                    pass
-        from PyQt4 import QtCore, QtGui
-        import sip  # Always succeeds *after* importing PyQt4.
+            _to_int = int
+    elif QT_API == QT_API_PYQT5:
+        from PyQt5 import QtCore, QtGui, QtWidgets
+        import sip
         __version__ = QtCore.PYQT_VERSION_STR
-        # PyQt 4.6 introduced getSaveFileNameAndFilter:
-        # https://riverbankcomputing.com/news/pyqt-46
-        if __version__ < LooseVersion("4.6"):
-            raise ImportError("PyQt<4.6 is not supported")
         QtCore.Signal = QtCore.pyqtSignal
         QtCore.Slot = QtCore.pyqtSlot
         QtCore.Property = QtCore.pyqtProperty
         _isdeleted = sip.isdeleted
-        _getSaveFileName = QtGui.QFileDialog.getSaveFileNameAndFilter
-
-    if QT_API == QT_API_PYQTv2:
-        _setup_pyqt4_internal(api=2)
-    elif QT_API == QT_API_PYSIDE:
-        from PySide import QtCore, QtGui, __version__, __version_info__
-        import shiboken
-        # PySide 1.0.3 fixed the following:
-        # https://srinikom.github.io/pyside-bz-archive/809.html
-        if __version_info__ < (1, 0, 3):
-            raise ImportError("PySide<1.0.3 is not supported")
-        def _isdeleted(obj): return not shiboken.isValid(obj)
-        _getSaveFileName = QtGui.QFileDialog.getSaveFileName
-    elif QT_API == QT_API_PYQT:
-        _setup_pyqt4_internal(api=1)
+        _to_int = int
+    elif QT_API == QT_API_PYSIDE2:
+        from PySide2 import QtCore, QtGui, QtWidgets, __version__
+        try:
+            from PySide2 import shiboken2
+        except ImportError:
+            import shiboken2
+        def _isdeleted(obj):
+            return not shiboken2.isValid(obj)
+        _to_int = int
     else:
-        raise ValueError("Unexpected value for the 'backend.qt4' rcparam")
-    QtWidgets = QtGui
-
-    @_api.deprecated("3.3", alternative="QtCore.qVersion()")
-    def is_pyqt5():
-        return False
+        raise AssertionError(f"Unexpected QT_API: {QT_API}")
+    _getSaveFileName = QtWidgets.QFileDialog.getSaveFileName
 
 
-if QT_API in [QT_API_PYQT5, QT_API_PYSIDE2]:
-    _setup_pyqt5()
-elif QT_API in [QT_API_PYQTv2, QT_API_PYSIDE, QT_API_PYQT]:
-    _setup_pyqt4()
+if QT_API in [QT_API_PYQT6, QT_API_PYQT5, QT_API_PYSIDE6, QT_API_PYSIDE2]:
+    _setup_pyqt5plus()
 elif QT_API is None:  # See above re: dict.__getitem__.
-    if dict.__getitem__(mpl.rcParams, "backend") == "Qt4Agg":
-        _candidates = [(_setup_pyqt4, QT_API_PYQTv2),
-                       (_setup_pyqt4, QT_API_PYSIDE),
-                       (_setup_pyqt4, QT_API_PYQT),
-                       (_setup_pyqt5, QT_API_PYQT5),
-                       (_setup_pyqt5, QT_API_PYSIDE2)]
+    if _QT_FORCE_QT5_BINDING:
+        _candidates = [
+            (_setup_pyqt5plus, QT_API_PYQT5),
+            (_setup_pyqt5plus, QT_API_PYSIDE2),
+        ]
     else:
-        _candidates = [(_setup_pyqt5, QT_API_PYQT5),
-                       (_setup_pyqt5, QT_API_PYSIDE2),
-                       (_setup_pyqt4, QT_API_PYQTv2),
-                       (_setup_pyqt4, QT_API_PYSIDE),
-                       (_setup_pyqt4, QT_API_PYQT)]
+        _candidates = [
+            (_setup_pyqt5plus, QT_API_PYQT6),
+            (_setup_pyqt5plus, QT_API_PYSIDE6),
+            (_setup_pyqt5plus, QT_API_PYQT5),
+            (_setup_pyqt5plus, QT_API_PYSIDE2),
+        ]
+
     for _setup, QT_API in _candidates:
         try:
             _setup()
@@ -176,28 +134,38 @@ def is_pyqt5():
             continue
         break
     else:
-        raise ImportError("Failed to import any qt binding")
+        raise ImportError(
+            "Failed to import any of the following Qt binding modules: {}"
+            .format(", ".join(_ETS.values())))
 else:  # We should not get there.
-    raise AssertionError("Unexpected QT_API: {}".format(QT_API))
+    raise AssertionError(f"Unexpected QT_API: {QT_API}")
 
 
 # Fixes issues with Big Sur
 # https://bugreports.qt.io/browse/QTBUG-87014, fixed in qt 5.15.2
 if (sys.platform == 'darwin' and
-        LooseVersion(platform.mac_ver()[0]) >= LooseVersion("10.16") and
-        LooseVersion(QtCore.qVersion()) < LooseVersion("5.15.2") and
-        "QT_MAC_WANTS_LAYER" not in os.environ):
-    os.environ["QT_MAC_WANTS_LAYER"] = "1"
+        parse_version(platform.mac_ver()[0]) >= parse_version("10.16") and
+        QtCore.QLibraryInfo.version().segments() <= [5, 15, 2]):
+    os.environ.setdefault("QT_MAC_WANTS_LAYER", "1")
 
 
-# These globals are only defined for backcompatibility purposes.
-ETS = dict(pyqt=(QT_API_PYQTv2, 4), pyside=(QT_API_PYSIDE, 4),
-           pyqt5=(QT_API_PYQT5, 5), pyside2=(QT_API_PYSIDE2, 5))
+# PyQt6 enum compat helpers.
 
-QT_RC_MAJOR_VERSION = int(QtCore.qVersion().split(".")[0])
 
-if QT_RC_MAJOR_VERSION == 4:
-    _api.warn_deprecated("3.3", name="support for Qt4")
+@functools.lru_cache(None)
+def _enum(name):
+    # foo.bar.Enum.Entry (PyQt6) <=> foo.bar.Entry (non-PyQt6).
+    return operator.attrgetter(
+        name if QT_API == 'PyQt6' else name.rpartition(".")[0]
+    )(sys.modules[QtCore.__package__])
+
+
+# Backports.
+
+
+def _exec(obj):
+    # exec on PyQt6, exec_ elsewhere.
+    obj.exec() if hasattr(obj, "exec") else obj.exec_()
 
 
 def _devicePixelRatioF(obj):
@@ -212,7 +180,7 @@ def _devicePixelRatioF(obj):
     except AttributeError:
         pass
     try:
-        # Not available on Qt4 or some older Qt5.
+        # Not available on older Qt5.
         # self.devicePixelRatio() returns 0 in rare cases
         return obj.devicePixelRatio() or 1
     except AttributeError:
@@ -226,5 +194,84 @@ def _setDevicePixelRatio(obj, val):
     This can be replaced by the direct call when we require Qt>=5.6.
     """
     if hasattr(obj, 'setDevicePixelRatio'):
-        # Not available on Qt4 or some older Qt5.
+        # Not available on older Qt5.
         obj.setDevicePixelRatio(val)
+
+
+@contextlib.contextmanager
+def _maybe_allow_interrupt(qapp):
+    """
+    This manager allows to terminate a plot by sending a SIGINT. It is
+    necessary because the running Qt backend prevents Python interpreter to
+    run and process signals (i.e., to raise KeyboardInterrupt exception). To
+    solve this one needs to somehow wake up the interpreter and make it close
+    the plot window. We do this by using the signal.set_wakeup_fd() function
+    which organizes a write of the signal number into a socketpair connected
+    to the QSocketNotifier (since it is part of the Qt backend, it can react
+    to that write event). Afterwards, the Qt handler empties the socketpair
+    by a recv() command to re-arm it (we need this if a signal different from
+    SIGINT was caught by set_wakeup_fd() and we shall continue waiting). If
+    the SIGINT was caught indeed, after exiting the on_signal() function the
+    interpreter reacts to the SIGINT according to the handle() function which
+    had been set up by a signal.signal() call: it causes the qt_object to
+    exit by calling its quit() method. Finally, we call the old SIGINT
+    handler with the same arguments that were given to our custom handle()
+    handler.
+
+    We do this only if the old handler for SIGINT was not None, which means
+    that a non-python handler was installed, i.e. in Julia, and not SIG_IGN
+    which means we should ignore the interrupts.
+    """
+    old_sigint_handler = signal.getsignal(signal.SIGINT)
+    handler_args = None
+    skip = False
+    if old_sigint_handler in (None, signal.SIG_IGN, signal.SIG_DFL):
+        skip = True
+    else:
+        wsock, rsock = socket.socketpair()
+        wsock.setblocking(False)
+        old_wakeup_fd = signal.set_wakeup_fd(wsock.fileno())
+        sn = QtCore.QSocketNotifier(
+            rsock.fileno(), _enum('QtCore.QSocketNotifier.Type').Read
+        )
+
+        # We do not actually care about this value other than running some
+        # Python code to ensure that the interpreter has a chance to handle the
+        # signal in Python land.  We also need to drain the socket because it
+        # will be written to as part of the wakeup!  There are some cases where
+        # this may fire too soon / more than once on Windows so we should be
+        # forgiving about reading an empty socket.
+        rsock.setblocking(False)
+        # Clear the socket to re-arm the notifier.
+        @sn.activated.connect
+        def _may_clear_sock(*args):
+            try:
+                rsock.recv(1)
+            except BlockingIOError:
+                pass
+
+        def handle(*args):
+            nonlocal handler_args
+            handler_args = args
+            qapp.quit()
+
+        signal.signal(signal.SIGINT, handle)
+    try:
+        yield
+    finally:
+        if not skip:
+            wsock.close()
+            rsock.close()
+            sn.setEnabled(False)
+            signal.set_wakeup_fd(old_wakeup_fd)
+            signal.signal(signal.SIGINT, old_sigint_handler)
+            if handler_args is not None:
+                old_sigint_handler(*handler_args)
+
+
+@_api.caching_module_getattr
+class __getattr__:
+    ETS = _api.deprecated("3.5")(property(lambda self: dict(
+        pyqt5=(QT_API_PYQT5, 5), pyside2=(QT_API_PYSIDE2, 5))))
+    QT_RC_MAJOR_VERSION = _api.deprecated("3.5")(property(
+        lambda self: int(QtCore.qVersion().split(".")[0])))
diff --git a/lib/matplotlib/backends/qt_editor/_formlayout.py b/lib/matplotlib/backends/qt_editor/_formlayout.py
index e2b371f1652d..1306e0c02fa6 100644
--- a/lib/matplotlib/backends/qt_editor/_formlayout.py
+++ b/lib/matplotlib/backends/qt_editor/_formlayout.py
@@ -47,7 +47,8 @@
 from numbers import Integral, Real
 
 from matplotlib import _api, colors as mcolors
-from matplotlib.backends.qt_compat import QtGui, QtWidgets, QtCore
+from matplotlib.backends.qt_compat import (
+    QtGui, QtWidgets, QtCore, _enum, _to_int)
 
 _log = logging.getLogger(__name__)
 
@@ -70,7 +71,7 @@ def __init__(self, parent=None):
     def choose_color(self):
         color = QtWidgets.QColorDialog.getColor(
             self._color, self.parentWidget(), "",
-            QtWidgets.QColorDialog.ShowAlphaChannel)
+            _enum("QtWidgets.QColorDialog.ColorDialogOption").ShowAlphaChannel)
         if color.isValid():
             self.set_color(color)
 
@@ -203,8 +204,7 @@ def get_font(self):
 def is_edit_valid(edit):
     text = edit.text()
     state = edit.validator().validate(text, 0)[0]
-
-    return state == QtGui.QDoubleValidator.Acceptable
+    return state == _enum("QtGui.QDoubleValidator.State").Acceptable
 
 
 class FormWidget(QtWidgets.QWidget):
@@ -291,10 +291,7 @@ def setup(self):
                 field.setCurrentIndex(selindex)
             elif isinstance(value, bool):
                 field = QtWidgets.QCheckBox(self)
-                if value:
-                    field.setCheckState(QtCore.Qt.Checked)
-                else:
-                    field.setCheckState(QtCore.Qt.Unchecked)
+                field.setChecked(value)
             elif isinstance(value, Integral):
                 field = QtWidgets.QSpinBox(self)
                 field.setRange(-10**9, 10**9)
@@ -336,15 +333,23 @@ def get(self):
                 else:
                     value = value[index]
             elif isinstance(value, bool):
-                value = field.checkState() == QtCore.Qt.Checked
+                value = field.isChecked()
             elif isinstance(value, Integral):
                 value = int(field.value())
             elif isinstance(value, Real):
                 value = float(str(field.text()))
             elif isinstance(value, datetime.datetime):
-                value = field.dateTime().toPyDateTime()
+                datetime_ = field.dateTime()
+                if hasattr(datetime_, "toPyDateTime"):
+                    value = datetime_.toPyDateTime()
+                else:
+                    value = datetime_.toPython()
             elif isinstance(value, datetime.date):
-                value = field.date().toPyDate()
+                date_ = field.date()
+                if hasattr(date_, "toPyDate"):
+                    value = date_.toPyDate()
+                else:
+                    value = date_.toPython()
             else:
                 value = eval(str(field.text()))
             valuelist.append(value)
@@ -436,10 +441,16 @@ def __init__(self, data, title="", comment="",
 
         # Button box
         self.bbox = bbox = QtWidgets.QDialogButtonBox(
-            QtWidgets.QDialogButtonBox.Ok | QtWidgets.QDialogButtonBox.Cancel)
+            QtWidgets.QDialogButtonBox.StandardButton(
+                _to_int(
+                    _enum("QtWidgets.QDialogButtonBox.StandardButton").Ok) |
+                _to_int(
+                    _enum("QtWidgets.QDialogButtonBox.StandardButton").Cancel)
+            ))
         self.formwidget.update_buttons.connect(self.update_buttons)
         if self.apply_callback is not None:
-            apply_btn = bbox.addButton(QtWidgets.QDialogButtonBox.Apply)
+            apply_btn = bbox.addButton(
+                _enum("QtWidgets.QDialogButtonBox.StandardButton").Apply)
             apply_btn.clicked.connect(self.apply)
 
         bbox.accepted.connect(self.accept)
@@ -462,14 +473,16 @@ def update_buttons(self):
         for field in self.float_fields:
             if not is_edit_valid(field):
                 valid = False
-        for btn_type in (QtWidgets.QDialogButtonBox.Ok,
-                         QtWidgets.QDialogButtonBox.Apply):
-            btn = self.bbox.button(btn_type)
+        for btn_type in ["Ok", "Apply"]:
+            btn = self.bbox.button(
+                getattr(_enum("QtWidgets.QDialogButtonBox.StandardButton"),
+                        btn_type))
             if btn is not None:
                 btn.setEnabled(valid)
 
     def accept(self):
         self.data = self.formwidget.get()
+        self.apply_callback(self.data)
         super().accept()
 
     def reject(self):
@@ -486,8 +499,7 @@ def get(self):
 
 def fedit(data, title="", comment="", icon=None, parent=None, apply=None):
     """
-    Create form dialog and return result
-    (if Cancel button is pressed, return None)
+    Create form dialog
 
     data: datalist, datagroup
     title: str
@@ -505,7 +517,7 @@ def fedit(data, title="", comment="", icon=None, parent=None, apply=None):
        box) for each member of a datagroup inside a datagroup
 
     Supported types for field_value:
-      - int, float, str, unicode, bool
+      - int, float, str, bool
       - colors: in Qt-compatible text form, i.e. in hex format or name
                 (red, ...) (automatically detected from a string)
       - list/tuple:
@@ -518,12 +530,19 @@ def fedit(data, title="", comment="", icon=None, parent=None, apply=None):
     if QtWidgets.QApplication.startingUp():
         _app = QtWidgets.QApplication([])
     dialog = FormDialog(data, title, comment, icon, parent, apply)
-    if dialog.exec_():
-        return dialog.get()
+
+    if parent is not None:
+        if hasattr(parent, "_fedit_dialog"):
+            parent._fedit_dialog.close()
+        parent._fedit_dialog = dialog
+
+    dialog.show()
 
 
 if __name__ == "__main__":
 
+    _app = QtWidgets.QApplication([])
+
     def create_datalist_example():
         return [('str', 'this is a string'),
                 ('list', [0, '1', '3', '4']),
@@ -546,23 +565,29 @@ def create_datagroup_example():
                 (datalist, "Category 2", "Category 2 comment"),
                 (datalist, "Category 3", "Category 3 comment"))
 
-    #--------- datalist example
+    # --------- datalist example
     datalist = create_datalist_example()
 
     def apply_test(data):
         print("data:", data)
-    print("result:", fedit(datalist, title="Example",
-                           comment="This is just an <b>example</b>.",
-                           apply=apply_test))
+    fedit(datalist, title="Example",
+          comment="This is just an <b>example</b>.",
+          apply=apply_test)
+
+    _app.exec()
 
-    #--------- datagroup example
+    # --------- datagroup example
     datagroup = create_datagroup_example()
-    print("result:", fedit(datagroup, "Global title"))
+    fedit(datagroup, "Global title",
+          apply=apply_test)
+    _app.exec()
 
-    #--------- datagroup inside a datagroup example
+    # --------- datagroup inside a datagroup example
     datalist = create_datalist_example()
     datagroup = create_datagroup_example()
-    print("result:", fedit(((datagroup, "Title 1", "Tab 1 comment"),
-                            (datalist, "Title 2", "Tab 2 comment"),
-                            (datalist, "Title 3", "Tab 3 comment")),
-                           "Global title"))
+    fedit(((datagroup, "Title 1", "Tab 1 comment"),
+           (datalist, "Title 2", "Tab 2 comment"),
+           (datalist, "Title 3", "Tab 3 comment")),
+          "Global title",
+          apply=apply_test)
+    _app.exec()
diff --git a/lib/matplotlib/backends/qt_editor/_formsubplottool.py b/lib/matplotlib/backends/qt_editor/_formsubplottool.py
deleted file mode 100644
index d8d0af0107b4..000000000000
--- a/lib/matplotlib/backends/qt_editor/_formsubplottool.py
+++ /dev/null
@@ -1,40 +0,0 @@
-from matplotlib.backends.qt_compat import QtWidgets
-
-
-class UiSubplotTool(QtWidgets.QDialog):
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.setObjectName("SubplotTool")
-        self._widgets = {}
-
-        main_layout = QtWidgets.QHBoxLayout()
-        self.setLayout(main_layout)
-
-        for group, spinboxes, buttons in [
-                ("Borders",
-                 ["top", "bottom", "left", "right"], ["Export values"]),
-                ("Spacings",
-                 ["hspace", "wspace"], ["Tight layout", "Reset", "Close"]),
-        ]:
-            layout = QtWidgets.QVBoxLayout()
-            main_layout.addLayout(layout)
-            box = QtWidgets.QGroupBox(group)
-            layout.addWidget(box)
-            inner = QtWidgets.QFormLayout(box)
-            for name in spinboxes:
-                self._widgets[name] = widget = QtWidgets.QDoubleSpinBox()
-                widget.setMinimum(0)
-                widget.setMaximum(1)
-                widget.setDecimals(3)
-                widget.setSingleStep(0.005)
-                widget.setKeyboardTracking(False)
-                inner.addRow(name, widget)
-            layout.addStretch(1)
-            for name in buttons:
-                self._widgets[name] = widget = QtWidgets.QPushButton(name)
-                # Don't trigger on <enter>, which is used to input values.
-                widget.setAutoDefault(False)
-                layout.addWidget(widget)
-
-        self._widgets["Close"].setFocus()
diff --git a/lib/matplotlib/backends/qt_editor/figureoptions.py b/lib/matplotlib/backends/qt_editor/figureoptions.py
index 98cf3c610773..67e00006910f 100644
--- a/lib/matplotlib/backends/qt_editor/figureoptions.py
+++ b/lib/matplotlib/backends/qt_editor/figureoptions.py
@@ -5,12 +5,10 @@
 
 """Module that provides a GUI-based editor for Matplotlib's figure options."""
 
-import re
-
 from matplotlib import cbook, cm, colors as mcolors, markers, image as mimage
 from matplotlib.backends.qt_compat import QtGui
 from matplotlib.backends.qt_editor import _formlayout
-
+from matplotlib.dates import DateConverter, num2date
 
 LINESTYLES = {'-': 'Solid',
               '--': 'Dashed',
@@ -33,45 +31,45 @@ def figure_edit(axes, parent=None):
     sep = (None, None)  # separator
 
     # Get / General
-    # Cast to builtin floats as they have nicer reprs.
-    xmin, xmax = map(float, axes.get_xlim())
-    ymin, ymax = map(float, axes.get_ylim())
+    def convert_limits(lim, converter):
+        """Convert axis limits for correct input editors."""
+        if isinstance(converter, DateConverter):
+            return map(num2date, lim)
+        # Cast to builtin floats as they have nicer reprs.
+        return map(float, lim)
+
+    xconverter = axes.xaxis.converter
+    xmin, xmax = convert_limits(axes.get_xlim(), xconverter)
+    yconverter = axes.yaxis.converter
+    ymin, ymax = convert_limits(axes.get_ylim(), yconverter)
     general = [('Title', axes.get_title()),
                sep,
                (None, "<b>X-Axis</b>"),
                ('Left', xmin), ('Right', xmax),
                ('Label', axes.get_xlabel()),
-               ('Scale', [axes.get_xscale(), 'linear', 'log', 'logit']),
+               ('Scale', [axes.get_xscale(),
+                          'linear', 'log', 'symlog', 'logit']),
                sep,
                (None, "<b>Y-Axis</b>"),
                ('Bottom', ymin), ('Top', ymax),
                ('Label', axes.get_ylabel()),
-               ('Scale', [axes.get_yscale(), 'linear', 'log', 'logit']),
+               ('Scale', [axes.get_yscale(),
+                          'linear', 'log', 'symlog', 'logit']),
                sep,
                ('(Re-)Generate automatic legend', False),
                ]
 
     # Save the unit data
-    xconverter = axes.xaxis.converter
-    yconverter = axes.yaxis.converter
     xunits = axes.xaxis.get_units()
     yunits = axes.yaxis.get_units()
 
-    # Sorting for default labels (_lineXXX, _imageXXX).
-    def cmp_key(label):
-        match = re.match(r"(_line|_image)(\d+)", label)
-        if match:
-            return match.group(1), int(match.group(2))
-        else:
-            return label, 0
-
     # Get / Curves
-    linedict = {}
+    labeled_lines = []
     for line in axes.get_lines():
         label = line.get_label()
         if label == '_nolegend_':
             continue
-        linedict[label] = line
+        labeled_lines.append((label, line))
     curves = []
 
     def prepare_data(d, init):
@@ -101,9 +99,7 @@ def prepare_data(d, init):
                 sorted(short2name.items(),
                        key=lambda short_and_name: short_and_name[1]))
 
-    curvelabels = sorted(linedict, key=cmp_key)
-    for label in curvelabels:
-        line = linedict[label]
+    for label, line in labeled_lines:
         color = mcolors.to_hex(
             mcolors.to_rgba(line.get_color(), line.get_alpha()),
             keep_alpha=True)
@@ -132,19 +128,17 @@ def prepare_data(d, init):
     has_curve = bool(curves)
 
     # Get ScalarMappables.
-    mappabledict = {}
+    labeled_mappables = []
     for mappable in [*axes.images, *axes.collections]:
         label = mappable.get_label()
         if label == '_nolegend_' or mappable.get_array() is None:
             continue
-        mappabledict[label] = mappable
-    mappablelabels = sorted(mappabledict, key=cmp_key)
+        labeled_mappables.append((label, mappable))
     mappables = []
-    cmaps = [(cmap, name) for name, cmap in sorted(cm._cmap_registry.items())]
-    for label in mappablelabels:
-        mappable = mappabledict[label]
+    cmaps = [(cmap, name) for name, cmap in sorted(cm._colormaps.items())]
+    for label, mappable in labeled_mappables:
         cmap = mappable.get_cmap()
-        if cmap not in cm._cmap_registry.values():
+        if cmap not in cm._colormaps.values():
             cmaps = [(cmap, cmap.name), *cmaps]
         low, high = mappable.get_clim()
         mappabledata = [
@@ -205,7 +199,7 @@ def apply_callback(data):
 
         # Set / Curves
         for index, curve in enumerate(curves):
-            line = linedict[curvelabels[index]]
+            line = labeled_lines[index][1]
             (label, linestyle, drawstyle, linewidth, color, marker, markersize,
              markerfacecolor, markeredgecolor) = curve
             line.set_label(label)
@@ -223,7 +217,7 @@ def apply_callback(data):
 
         # Set ScalarMappables.
         for index, mappable_settings in enumerate(mappables):
-            mappable = mappabledict[mappablelabels[index]]
+            mappable = labeled_mappables[index][1]
             if len(mappable_settings) == 5:
                 label, cmap, low, high, interpolation = mappable_settings
                 mappable.set_interpolation(interpolation)
@@ -236,12 +230,12 @@ def apply_callback(data):
         # re-generate legend, if checkbox is checked
         if generate_legend:
             draggable = None
-            ncol = 1
+            ncols = 1
             if axes.legend_ is not None:
                 old_legend = axes.get_legend()
                 draggable = old_legend._draggable is not None
-                ncol = old_legend._ncol
-            new_legend = axes.legend(ncol=ncol)
+                ncols = old_legend._ncols
+            new_legend = axes.legend(ncols=ncols)
             if new_legend:
                 new_legend.set_draggable(draggable)
 
@@ -251,10 +245,8 @@ def apply_callback(data):
         if not (axes.get_xlim() == orig_xlim and axes.get_ylim() == orig_ylim):
             figure.canvas.toolbar.push_current()
 
-    data = _formlayout.fedit(
+    _formlayout.fedit(
         datalist, title="Figure options", parent=parent,
         icon=QtGui.QIcon(
             str(cbook._get_data_path('images', 'qt4_editor_options.svg'))),
         apply=apply_callback)
-    if data is not None:
-        apply_callback(data)
diff --git a/lib/matplotlib/backends/qt_editor/formsubplottool.py b/lib/matplotlib/backends/qt_editor/formsubplottool.py
deleted file mode 100644
index db79a3a054e0..000000000000
--- a/lib/matplotlib/backends/qt_editor/formsubplottool.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from matplotlib import _api
-from ._formsubplottool import UiSubplotTool
-
-
-_api.warn_deprecated(
-    "3.3", obj_type="module", name=__name__,
-    alternative="matplotlib.backends.backend_qt5.SubplotToolQt")
-__all__ = ["UiSubplotTool"]
diff --git a/lib/matplotlib/backends/web_backend/css/fbm.css b/lib/matplotlib/backends/web_backend/css/fbm.css
index 0e21d19ae801..ce35d99a5e64 100644
--- a/lib/matplotlib/backends/web_backend/css/fbm.css
+++ b/lib/matplotlib/backends/web_backend/css/fbm.css
@@ -1,95 +1,95 @@
 
 /* Flexible box model classes */
-/* Taken from Alex Russell http://infrequently.org/2009/08/css-3-progress/ */
- 
+/* Taken from Alex Russell https://infrequently.org/2009/08/css-3-progress/ */
+
 .hbox {
 	display: -webkit-box;
 	-webkit-box-orient: horizontal;
 	-webkit-box-align: stretch;
- 
+
 	display: -moz-box;
 	-moz-box-orient: horizontal;
 	-moz-box-align: stretch;
- 
+
 	display: box;
 	box-orient: horizontal;
 	box-align: stretch;
 }
- 
+
 .hbox > * {
 	-webkit-box-flex: 0;
 	-moz-box-flex: 0;
 	box-flex: 0;
 }
- 
+
 .vbox {
 	display: -webkit-box;
 	-webkit-box-orient: vertical;
 	-webkit-box-align: stretch;
- 
+
 	display: -moz-box;
 	-moz-box-orient: vertical;
 	-moz-box-align: stretch;
- 
+
 	display: box;
 	box-orient: vertical;
 	box-align: stretch;
 }
- 
+
 .vbox > * {
 	-webkit-box-flex: 0;
 	-moz-box-flex: 0;
 	box-flex: 0;
 }
-  
+
 .reverse {
 	-webkit-box-direction: reverse;
 	-moz-box-direction: reverse;
 	box-direction: reverse;
 }
- 
+
 .box-flex0 {
 	-webkit-box-flex: 0;
 	-moz-box-flex: 0;
 	box-flex: 0;
 }
- 
+
 .box-flex1, .box-flex {
 	-webkit-box-flex: 1;
 	-moz-box-flex: 1;
 	box-flex: 1;
 }
- 
+
 .box-flex2 {
 	-webkit-box-flex: 2;
 	-moz-box-flex: 2;
 	box-flex: 2;
 }
- 
+
 .box-group1 {
 	-webkit-box-flex-group: 1;
 	-moz-box-flex-group: 1;
 	box-flex-group: 1;
 }
- 
+
 .box-group2 {
 	-webkit-box-flex-group: 2;
 	-moz-box-flex-group: 2;
 	box-flex-group: 2;
 }
- 
+
 .start {
 	-webkit-box-pack: start;
 	-moz-box-pack: start;
 	box-pack: start;
 }
- 
+
 .end {
 	-webkit-box-pack: end;
 	-moz-box-pack: end;
 	box-pack: end;
 }
- 
+
 .center {
 	-webkit-box-pack: center;
 	-moz-box-pack: center;
diff --git a/lib/matplotlib/backends/web_backend/css/page.css b/lib/matplotlib/backends/web_backend/css/page.css
index c380ef0a3ffc..ded0d9220379 100644
--- a/lib/matplotlib/backends/web_backend/css/page.css
+++ b/lib/matplotlib/backends/web_backend/css/page.css
@@ -80,4 +80,3 @@ span#login_widget {
     margin: 10px;
     vertical-align: top;
 }
-
diff --git a/lib/matplotlib/backends/web_backend/ipython_inline_figure.html b/lib/matplotlib/backends/web_backend/ipython_inline_figure.html
index 9cc6aa9020e2..b941d352a7d6 100644
--- a/lib/matplotlib/backends/web_backend/ipython_inline_figure.html
+++ b/lib/matplotlib/backends/web_backend/ipython_inline_figure.html
@@ -2,7 +2,7 @@
      websocket server, so we have to get in client-side and fetch our
      resources that way. -->
 <script>
-  // We can't proceed until these Javascript files are fetched, so
+  // We can't proceed until these JavaScript files are fetched, so
   // we fetch them synchronously
   $.ajaxSetup({async: false});
   $.getScript("http://" + window.location.hostname + ":{{ port }}{{prefix}}/_static/js/mpl_tornado.js");
diff --git a/lib/matplotlib/backends/web_backend/js/mpl.js b/lib/matplotlib/backends/web_backend/js/mpl.js
index 4adeb987653f..e77ba1aaf9e9 100644
--- a/lib/matplotlib/backends/web_backend/js/mpl.js
+++ b/lib/matplotlib/backends/web_backend/js/mpl.js
@@ -63,7 +63,9 @@ mpl.figure = function (figure_id, websocket, ondownload, parent_element) {
         fig.send_message('supports_binary', { value: fig.supports_binary });
         fig.send_message('send_image_mode', {});
         if (fig.ratio !== 1) {
-            fig.send_message('set_dpi_ratio', { dpi_ratio: fig.ratio });
+            fig.send_message('set_device_pixel_ratio', {
+                device_pixel_ratio: fig.ratio,
+            });
         }
         fig.send_message('refresh', {});
     };
@@ -110,6 +112,7 @@ mpl.figure.prototype._init_canvas = function () {
     var fig = this;
 
     var canvas_div = (this.canvas_div = document.createElement('div'));
+    canvas_div.setAttribute('tabindex', '0');
     canvas_div.setAttribute(
         'style',
         'border: 1px solid #ddd;' +
@@ -120,7 +123,8 @@ mpl.figure.prototype._init_canvas = function () {
             'outline: 0;' +
             'overflow: hidden;' +
             'position: relative;' +
-            'resize: both;'
+            'resize: both;' +
+            'z-index: 2;'
     );
 
     function on_keyboard_event_closure(name) {
@@ -143,7 +147,13 @@ mpl.figure.prototype._init_canvas = function () {
 
     var canvas = (this.canvas = document.createElement('canvas'));
     canvas.classList.add('mpl-canvas');
-    canvas.setAttribute('style', 'box-sizing: content-box;');
+    canvas.setAttribute(
+        'style',
+        'box-sizing: content-box;' +
+            'pointer-events: none;' +
+            'position: relative;' +
+            'z-index: 0;'
+    );
 
     this.context = canvas.getContext('2d');
 
@@ -163,7 +173,12 @@ mpl.figure.prototype._init_canvas = function () {
     ));
     rubberband_canvas.setAttribute(
         'style',
-        'box-sizing: content-box; position: absolute; left: 0; top: 0; z-index: 1;'
+        'box-sizing: content-box;' +
+            'left: 0;' +
+            'pointer-events: none;' +
+            'position: absolute;' +
+            'top: 0;' +
+            'z-index: 1;'
     );
 
     // Apply a ponyfill if ResizeObserver is not implemented by browser.
@@ -213,10 +228,10 @@ mpl.figure.prototype._init_canvas = function () {
                 canvas.setAttribute('width', width * fig.ratio);
                 canvas.setAttribute('height', height * fig.ratio);
             }
-            canvas.setAttribute(
-                'style',
-                'width: ' + width + 'px; height: ' + height + 'px;'
-            );
+            /* This rescales the canvas back to display pixels, so that it
+             * appears correct on HiDPI screens. */
+            canvas.style.width = width + 'px';
+            canvas.style.height = height + 'px';
 
             rubberband_canvas.setAttribute('width', width);
             rubberband_canvas.setAttribute('height', height);
@@ -232,34 +247,53 @@ mpl.figure.prototype._init_canvas = function () {
     this.resizeObserverInstance.observe(canvas_div);
 
     function on_mouse_event_closure(name) {
-        return function (event) {
-            return fig.mouse_event(event, name);
-        };
+        /* User Agent sniffing is bad, but WebKit is busted:
+         * https://bugs.webkit.org/show_bug.cgi?id=144526
+         * https://bugs.webkit.org/show_bug.cgi?id=181818
+         * The worst that happens here is that they get an extra browser
+         * selection when dragging, if this check fails to catch them.
+         */
+        var UA = navigator.userAgent;
+        var isWebKit = /AppleWebKit/.test(UA) && !/Chrome/.test(UA);
+        if(isWebKit) {
+            return function (event) {
+                /* This prevents the web browser from automatically changing to
+                 * the text insertion cursor when the button is pressed. We
+                 * want to control all of the cursor setting manually through
+                 * the 'cursor' event from matplotlib */
+                event.preventDefault()
+                return fig.mouse_event(event, name);
+            };
+        } else {
+            return function (event) {
+                return fig.mouse_event(event, name);
+            };
+        }
     }
 
-    rubberband_canvas.addEventListener(
+    canvas_div.addEventListener(
         'mousedown',
         on_mouse_event_closure('button_press')
     );
-    rubberband_canvas.addEventListener(
+    canvas_div.addEventListener(
         'mouseup',
         on_mouse_event_closure('button_release')
     );
-    rubberband_canvas.addEventListener(
+    canvas_div.addEventListener(
         'dblclick',
         on_mouse_event_closure('dblclick')
     );
     // Throttle sequential mouse events to 1 every 20ms.
-    rubberband_canvas.addEventListener(
+    canvas_div.addEventListener(
         'mousemove',
         on_mouse_event_closure('motion_notify')
     );
 
-    rubberband_canvas.addEventListener(
+    canvas_div.addEventListener(
         'mouseenter',
         on_mouse_event_closure('figure_enter')
     );
-    rubberband_canvas.addEventListener(
+    canvas_div.addEventListener(
         'mouseleave',
         on_mouse_event_closure('figure_leave')
     );
@@ -287,7 +321,7 @@ mpl.figure.prototype._init_canvas = function () {
     };
 
     // Disable right mouse context menu.
-    this.rubberband_canvas.addEventListener('contextmenu', function (_e) {
+    canvas_div.addEventListener('contextmenu', function (_e) {
         event.preventDefault();
         return false;
     });
@@ -442,22 +476,7 @@ mpl.figure.prototype.handle_figure_label = function (fig, msg) {
 };
 
 mpl.figure.prototype.handle_cursor = function (fig, msg) {
-    var cursor = msg['cursor'];
-    switch (cursor) {
-        case 0:
-            cursor = 'pointer';
-            break;
-        case 1:
-            cursor = 'default';
-            break;
-        case 2:
-            cursor = 'crosshair';
-            break;
-        case 3:
-            cursor = 'move';
-            break;
-    }
-    fig.rubberband_canvas.style.cursor = cursor;
+    fig.canvas_div.style.cursor = msg['cursor'];
 };
 
 mpl.figure.prototype.handle_message = function (fig, msg) {
@@ -569,35 +588,11 @@ mpl.figure.prototype._make_on_message_function = function (fig) {
     };
 };
 
-// from http://stackoverflow.com/questions/1114465/getting-mouse-location-in-canvas
-mpl.findpos = function (e) {
-    //this section is from http://www.quirksmode.org/js/events_properties.html
-    var targ;
-    if (!e) {
-        e = window.event;
-    }
-    if (e.target) {
-        targ = e.target;
-    } else if (e.srcElement) {
-        targ = e.srcElement;
-    }
-    if (targ.nodeType === 3) {
-        // defeat Safari bug
-        targ = targ.parentNode;
-    }
-
-    // pageX,Y are the mouse positions relative to the document
-    var boundingRect = targ.getBoundingClientRect();
-    var x = e.pageX - (boundingRect.left + document.body.scrollLeft);
-    var y = e.pageY - (boundingRect.top + document.body.scrollTop);
-
-    return { x: x, y: y };
-};
 
 /*
  * return a copy of an object with only non-object keys
  * we need this to avoid circular references
- * http://stackoverflow.com/a/24161582/3208463
+ * https://stackoverflow.com/a/24161582/3208463
  */
 function simpleKeys(original) {
     return Object.keys(original).reduce(function (obj, key) {
@@ -609,15 +604,15 @@ function simpleKeys(original) {
 }
 
 mpl.figure.prototype.mouse_event = function (event, name) {
-    var canvas_pos = mpl.findpos(event);
-
     if (name === 'button_press') {
         this.canvas.focus();
         this.canvas_div.focus();
     }
 
-    var x = canvas_pos.x * this.ratio;
-    var y = canvas_pos.y * this.ratio;
+    // from https://stackoverflow.com/q/1114465
+    var boundingRect = this.canvas.getBoundingClientRect();
+    var x = (event.clientX - boundingRect.left) * this.ratio;
+    var y = (event.clientY - boundingRect.top) * this.ratio;
 
     this.send_message(name, {
         x: x,
@@ -627,11 +622,6 @@ mpl.figure.prototype.mouse_event = function (event, name) {
         guiEvent: simpleKeys(event),
     });
 
-    /* This prevents the web browser from automatically changing to
-     * the text insertion cursor when the button is pressed.  We want
-     * to control all of the cursor setting manually through the
-     * 'cursor' event from matplotlib */
-    event.preventDefault();
     return false;
 };
 
diff --git a/lib/matplotlib/backends/web_backend/js/nbagg_mpl.js b/lib/matplotlib/backends/web_backend/js/nbagg_mpl.js
index 8e7e38157925..26d79ff4e1da 100644
--- a/lib/matplotlib/backends/web_backend/js/nbagg_mpl.js
+++ b/lib/matplotlib/backends/web_backend/js/nbagg_mpl.js
@@ -228,11 +228,6 @@ mpl.figure.prototype._canvas_extra_style = function (el) {
 };
 
 mpl.figure.prototype._key_event_extra = function (event, _name) {
-    var manager = IPython.notebook.keyboard_manager;
-    if (!manager) {
-        manager = IPython.keyboard_manager;
-    }
-
     // Check for shift+enter
     if (event.shiftKey && event.which === 13) {
         this.canvas_div.blur();
diff --git a/lib/matplotlib/backends/web_backend/nbagg_uat.ipynb b/lib/matplotlib/backends/web_backend/nbagg_uat.ipynb
index a914e7190664..e9fc62bc2883 100644
--- a/lib/matplotlib/backends/web_backend/nbagg_uat.ipynb
+++ b/lib/matplotlib/backends/web_backend/nbagg_uat.ipynb
@@ -266,7 +266,7 @@
    "source": [
     "### UAT 10 - Saving notebook\n",
     "\n",
-    "Saving the notebook (with CTRL+S or File->Save) should result in the saved notebook having static versions of the figues embedded within. The image should be the last update from user interaction and interactive plotting. (check by converting with ``ipython nbconvert <notebook>``)"
+    "Saving the notebook (with CTRL+S or File->Save) should result in the saved notebook having static versions of the figures embedded within. The image should be the last update from user interaction and interactive plotting. (check by converting with ``ipython nbconvert <notebook>``)"
    ]
   },
   {
@@ -389,7 +389,7 @@
    "source": [
     "### UAT 16 - Events\n",
     "\n",
-    "Pressing any keyboard key or mouse button (or scrolling) should cycle the line line while the figure has focus.  The figure should have focus by default when it is created and re-gain it by clicking on the canvas.  Clicking anywhere outside of the figure should release focus, but moving the mouse out of the figure should not release focus."
+    "Pressing any keyboard key or mouse button (or scrolling) should cycle the line while the figure has focus.  The figure should have focus by default when it is created and re-gain it by clicking on the canvas.  Clicking anywhere outside of the figure should release focus, but moving the mouse out of the figure should not release focus."
    ]
   },
   {
diff --git a/lib/matplotlib/bezier.py b/lib/matplotlib/bezier.py
index 32889edc8fbd..1c92487b9b9f 100644
--- a/lib/matplotlib/bezier.py
+++ b/lib/matplotlib/bezier.py
@@ -172,7 +172,6 @@ def find_bezier_t_intersecting_with_closedpath(
         if start_inside ^ middle_inside:
             t1 = middle_t
             end = middle
-            end_inside = middle_inside
         else:
             t0 = middle_t
             start = middle
@@ -593,28 +592,3 @@ def make_wedged_bezier2(bezier2, width, w1=1., wm=0.5, w2=0.):
                                      c3x_right, c3y_right)
 
     return path_left, path_right
-
-
-@_api.deprecated(
-    "3.3", alternative="Path.cleaned() and remove the final STOP if needed")
-def make_path_regular(p):
-    """
-    If the ``codes`` attribute of `.Path` *p* is None, return a copy of *p*
-    with ``codes`` set to (MOVETO, LINETO, LINETO, ..., LINETO); otherwise
-    return *p* itself.
-    """
-    from .path import Path
-    c = p.codes
-    if c is None:
-        c = np.full(len(p.vertices), Path.LINETO, dtype=Path.code_type)
-        c[0] = Path.MOVETO
-        return Path(p.vertices, c)
-    else:
-        return p
-
-
-@_api.deprecated("3.3", alternative="Path.make_compound_path()")
-def concatenate_paths(paths):
-    """Concatenate a list of paths into a single path."""
-    from .path import Path
-    return Path.make_compound_path(*paths)
diff --git a/lib/matplotlib/blocking_input.py b/lib/matplotlib/blocking_input.py
index afbfdacfdbd7..bf986ca5237b 100644
--- a/lib/matplotlib/blocking_input.py
+++ b/lib/matplotlib/blocking_input.py
@@ -26,6 +26,7 @@
 from matplotlib.backend_bases import MouseButton
 import matplotlib.lines as mlines
 
+_api.warn_deprecated("3.5", name=__name__, obj_type="module")
 _log = logging.getLogger(__name__)
 
 
@@ -82,7 +83,7 @@ def __call__(self, n=1, timeout=30):
         self.n = n
         self.events = []
 
-        if hasattr(self.fig.canvas, "manager"):
+        if self.fig.canvas.manager:
             # Ensure that the figure is shown, if we are managing it.
             self.fig.show()
         # Connect the events to the on_event function call.
diff --git a/lib/matplotlib/category.py b/lib/matplotlib/category.py
index 2e7f19cd7a64..55f21a57ca96 100644
--- a/lib/matplotlib/category.py
+++ b/lib/matplotlib/category.py
@@ -54,9 +54,15 @@ def convert(value, unit, axis):
         # dtype = object preserves numerical pass throughs
         values = np.atleast_1d(np.array(value, dtype=object))
         # pass through sequence of non binary numbers
-        if all(units.ConversionInterface.is_numlike(v)
-               and not isinstance(v, (str, bytes))
-               for v in values):
+        with _api.suppress_matplotlib_deprecation_warning():
+            is_numlike = all(units.ConversionInterface.is_numlike(v)
+                             and not isinstance(v, (str, bytes))
+                             for v in values)
+        if values.size and is_numlike:
+            _api.warn_deprecated(
+                "3.5", message="Support for passing numbers through unit "
+                "converters is deprecated since %(since)s and support will be "
+                "removed %(removal)s; use Axis.convert_units instead.")
             return np.asarray(values, dtype=float)
         # force an update so it also does type checking
         unit.update(values)
@@ -74,12 +80,13 @@ def axisinfo(unit, axis):
         axis : `~matplotlib.axis.Axis`
             axis for which information is being set
 
+            .. note:: *axis* is not used
+
         Returns
         -------
         `~matplotlib.units.AxisInfo`
             Information to support default tick labeling
 
-        .. note: axis is not used
         """
         StrCategoryConverter._validate_unit(unit)
         # locator and formatter take mapping dict because
@@ -124,7 +131,7 @@ class StrCategoryLocator(ticker.Locator):
     def __init__(self, units_mapping):
         """
         Parameters
-        -----------
+        ----------
         units_mapping : dict
             Mapping of category names (str) to indices (int).
         """
@@ -223,7 +230,7 @@ def update(self, data):
                 convertible = self._str_is_convertible(val)
             if val not in self._mapping:
                 self._mapping[val] = next(self._counter)
-        if convertible:
+        if data.size and convertible:
             _log.info('Using categorical units to plot a list of strings '
                       'that are all parsable as floats or dates. If these '
                       'strings should be plotted as numbers, cast to the '
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
index 7fae32ce8a4d..abb6c6df4fab 100644
--- a/lib/matplotlib/cbook/__init__.py
+++ b/lib/matplotlib/cbook/__init__.py
@@ -12,35 +12,35 @@
 import functools
 import gzip
 import itertools
+import math
 import operator
 import os
 from pathlib import Path
-import re
 import shlex
 import subprocess
 import sys
 import time
 import traceback
 import types
-import warnings
 import weakref
 
 import numpy as np
 
 import matplotlib
 from matplotlib import _api, _c_internal_utils
-from matplotlib._api.deprecation import (
-    MatplotlibDeprecationWarning, mplDeprecation)
 
 
-@_api.deprecated("3.4")
-def deprecated(*args, **kwargs):
-    return _api.deprecated(*args, **kwargs)
-
-
-@_api.deprecated("3.4")
-def warn_deprecated(*args, **kwargs):
-    _api.warn_deprecated(*args, **kwargs)
+@_api.caching_module_getattr
+class __getattr__:
+    # module-level deprecations
+    MatplotlibDeprecationWarning = _api.deprecated(
+        "3.6", obj_type="",
+        alternative="matplotlib.MatplotlibDeprecationWarning")(
+        property(lambda self: _api.deprecation.MatplotlibDeprecationWarning))
+    mplDeprecation = _api.deprecated(
+        "3.6", obj_type="",
+        alternative="matplotlib.MatplotlibDeprecationWarning")(
+        property(lambda self: _api.deprecation.MatplotlibDeprecationWarning))
 
 
 def _get_running_interactive_framework():
@@ -51,20 +51,27 @@ def _get_running_interactive_framework():
     Returns
     -------
     Optional[str]
-        One of the following values: "qt5", "qt4", "gtk3", "wx", "tk",
+        One of the following values: "qt", "gtk3", "gtk4", "wx", "tk",
         "macosx", "headless", ``None``.
     """
-    QtWidgets = (sys.modules.get("PyQt5.QtWidgets")
-                 or sys.modules.get("PySide2.QtWidgets"))
+    # Use ``sys.modules.get(name)`` rather than ``name in sys.modules`` as
+    # entries can also have been explicitly set to None.
+    QtWidgets = (
+        sys.modules.get("PyQt6.QtWidgets")
+        or sys.modules.get("PySide6.QtWidgets")
+        or sys.modules.get("PyQt5.QtWidgets")
+        or sys.modules.get("PySide2.QtWidgets")
+    )
     if QtWidgets and QtWidgets.QApplication.instance():
-        return "qt5"
-    QtGui = (sys.modules.get("PyQt4.QtGui")
-             or sys.modules.get("PySide.QtGui"))
-    if QtGui and QtGui.QApplication.instance():
-        return "qt4"
+        return "qt"
     Gtk = sys.modules.get("gi.repository.Gtk")
-    if Gtk and Gtk.main_level():
-        return "gtk3"
+    if Gtk:
+        if Gtk.MAJOR_VERSION == 4:
+            from gi.repository import GLib
+            if GLib.main_depth():
+                return "gtk4"
+        if Gtk.MAJOR_VERSION == 3 and Gtk.main_level():
+            return "gtk3"
     wx = sys.modules.get("wx")
     if wx and wx.GetApp():
         return "wx"
@@ -76,9 +83,9 @@ def _get_running_interactive_framework():
                 if frame.f_code in codes:
                     return "tk"
                 frame = frame.f_back
-    if 'matplotlib.backends._macosx' in sys.modules:
-        if sys.modules["matplotlib.backends._macosx"].event_loop_is_running():
-            return "macosx"
+    macosx = sys.modules.get("matplotlib.backends._macosx")
+    if macosx and macosx.event_loop_is_running():
+        return "macosx"
     if not _c_internal_utils.display_is_valid():
         return "headless"
     return None
@@ -121,12 +128,13 @@ def _weak_or_strong_ref(func, callback):
 
 class CallbackRegistry:
     """
-    Handle registering and disconnecting for a set of signals and callbacks:
+    Handle registering, processing, blocking, and disconnecting
+    for a set of signals and callbacks:
 
         >>> def oneat(x):
-        ...    print('eat', x)
+        ...     print('eat', x)
         >>> def ondrink(x):
-        ...    print('drink', x)
+        ...     print('drink', x)
 
         >>> from matplotlib.cbook import CallbackRegistry
         >>> callbacks = CallbackRegistry()
@@ -138,9 +146,15 @@ class CallbackRegistry:
         drink 123
         >>> callbacks.process('eat', 456)
         eat 456
-        >>> callbacks.process('be merry', 456) # nothing will be called
+        >>> callbacks.process('be merry', 456)   # nothing will be called
+
         >>> callbacks.disconnect(id_eat)
-        >>> callbacks.process('eat', 456)      # nothing will be called
+        >>> callbacks.process('eat', 456)        # nothing will be called
+
+        >>> with callbacks.blocked(signal='drink'):
+        ...     callbacks.process('drink', 123)  # nothing will be called
+        >>> callbacks.process('drink', 123)
+        drink 123
 
     In practice, one should always disconnect all callbacks when they are
     no longer needed to avoid dangling references (and thus memory leaks).
@@ -161,13 +175,20 @@ class CallbackRegistry:
        The default handler prints the exception (with `traceback.print_exc`) if
        an interactive event loop is running; it re-raises the exception if no
        interactive event loop is running.
+
+    signals : list, optional
+        If not None, *signals* is a list of signals that this registry handles:
+        attempting to `process` or to `connect` to a signal not in the list
+        throws a `ValueError`.  The default, None, does not restrict the
+        handled signals.
     """
 
     # We maintain two mappings:
     #   callbacks: signal -> {cid -> weakref-to-callback}
     #   _func_cid_map: signal -> {weakref-to-callback -> cid}
 
-    def __init__(self, exception_handler=_exception_printer):
+    def __init__(self, exception_handler=_exception_printer, *, signals=None):
+        self._signals = None if signals is None else list(signals)  # Copy it.
         self.exception_handler = exception_handler
         self.callbacks = {}
         self._cid_gen = itertools.count()
@@ -197,9 +218,13 @@ def __setstate__(self, state):
             s: {proxy: cid for cid, proxy in d.items()}
             for s, d in self.callbacks.items()}
 
-    @_api.rename_parameter("3.4", "s", "signal")
     def connect(self, signal, func):
         """Register *func* to be called when signal *signal* is generated."""
+        if signal == "units finalize":
+            _api.warn_deprecated(
+                "3.5", name=signal, obj_type="signal", alternative="units")
+        if self._signals is not None:
+            _api.check_in_list(self._signals, signal=signal)
         self._func_cid_map.setdefault(signal, {})
         proxy = _weak_or_strong_ref(func, self._remove_proxy)
         if proxy in self._func_cid_map[signal]:
@@ -210,6 +235,16 @@ def connect(self, signal, func):
         self.callbacks[signal][cid] = proxy
         return cid
 
+    def _connect_picklable(self, signal, func):
+        """
+        Like `.connect`, but the callback is kept when pickling/unpickling.
+
+        Currently internal-use only.
+        """
+        cid = self.connect(signal, func)
+        self._pickled_cids.add(cid)
+        return cid
+
     # Keep a reference to sys.is_finalizing, as sys may have been cleared out
     # at that point.
     def _remove_proxy(self, proxy, *, _is_finalizing=sys.is_finalizing):
@@ -263,6 +298,8 @@ def process(self, s, *args, **kwargs):
         All of the functions registered to receive callbacks on *s* will be
         called with ``*args`` and ``**kwargs``.
         """
+        if self._signals is not None:
+            _api.check_in_list(self._signals, signal=s)
         for cid, ref in list(self.callbacks.get(s, {}).items()):
             func = ref()
             if func is not None:
@@ -276,6 +313,31 @@ def process(self, s, *args, **kwargs):
                     else:
                         raise
 
+    @contextlib.contextmanager
+    def blocked(self, *, signal=None):
+        """
+        Block callback signals from being processed.
+
+        A context manager to temporarily block/disable callback signals
+        from being processed by the registered listeners.
+
+        Parameters
+        ----------
+        signal : str, optional
+            The callback signal to block. The default is to block all signals.
+        """
+        orig = self.callbacks
+        try:
+            if signal is None:
+                # Empty out the callbacks
+                self.callbacks = {}
+            else:
+                # Only remove the specific signal
+                self.callbacks = {k: orig[k] for k in orig if k != signal}
+            yield
+        finally:
+            self.callbacks = orig
+
 
 class silent_list(list):
     """
@@ -311,56 +373,9 @@ def __repr__(self):
             return "<an empty list>"
 
 
-@_api.deprecated("3.3")
-class IgnoredKeywordWarning(UserWarning):
-    """
-    A class for issuing warnings about keyword arguments that will be ignored
-    by Matplotlib.
-    """
-    pass
-
-
-@_api.deprecated("3.3", alternative="normalize_kwargs")
-def local_over_kwdict(local_var, kwargs, *keys):
-    """
-    Enforces the priority of a local variable over potentially conflicting
-    argument(s) from a kwargs dict. The following possible output values are
-    considered in order of priority::
-
-        local_var > kwargs[keys[0]] > ... > kwargs[keys[-1]]
-
-    The first of these whose value is not None will be returned. If all are
-    None then None will be returned. Each key in keys will be removed from the
-    kwargs dict in place.
-
-    Parameters
-    ----------
-    local_var : any object
-        The local variable (highest priority).
-
-    kwargs : dict
-        Dictionary of keyword arguments; modified in place.
-
-    keys : str(s)
-        Name(s) of keyword arguments to process, in descending order of
-        priority.
-
-    Returns
-    -------
-    any object
-        Either local_var or one of kwargs[key] for key in keys.
-
-    Raises
-    ------
-    IgnoredKeywordWarning
-        For each key in keys that is removed from kwargs but not used as
-        the output value.
-    """
-    return _local_over_kwdict(local_var, kwargs, *keys, IgnoredKeywordWarning)
-
-
 def _local_over_kwdict(
-        local_var, kwargs, *keys, warning_cls=MatplotlibDeprecationWarning):
+        local_var, kwargs, *keys,
+        warning_cls=_api.MatplotlibDeprecationWarning):
     out = local_var
     for key in keys:
         kwarg_val = kwargs.pop(key, None)
@@ -396,6 +411,26 @@ def strip_math(s):
     return s
 
 
+def _strip_comment(s):
+    """Strip everything from the first unquoted #."""
+    pos = 0
+    while True:
+        quote_pos = s.find('"', pos)
+        hash_pos = s.find('#', pos)
+        if quote_pos < 0:
+            without_comment = s if hash_pos < 0 else s[:hash_pos]
+            return without_comment.strip()
+        elif 0 <= hash_pos < quote_pos:
+            return s[:hash_pos].strip()
+        else:
+            closing_quote_pos = s.find('"', quote_pos + 1)
+            if closing_quote_pos < 0:
+                raise ValueError(
+                    f"Missing closing quote in: {s!r}. If you need a double-"
+                    'quote inside a string, use escaping: e.g. "the \" char"')
+            pos = closing_quote_pos + 1  # behind closing quote
+
+
 def is_writable_file_like(obj):
     """Return whether *obj* looks like a file object with a *write* method."""
     return callable(getattr(obj, 'write', None))
@@ -445,16 +480,11 @@ def to_filehandle(fname, flag='r', return_opened=False, encoding=None):
     """
     if isinstance(fname, os.PathLike):
         fname = os.fspath(fname)
-    if "U" in flag:
-        _api.warn_deprecated(
-            "3.3", message="Passing a flag containing 'U' to to_filehandle() "
-            "is deprecated since %(since)s and will be removed %(removal)s.")
-        flag = flag.replace("U", "")
     if isinstance(fname, str):
         if fname.endswith('.gz'):
             fh = gzip.open(fname, flag)
         elif fname.endswith('.bz2'):
-            # python may not be complied with bz2 support,
+            # python may not be compiled with bz2 support,
             # bury import until we need it
             import bz2
             fh = bz2.BZ2File(fname, flag)
@@ -471,15 +501,10 @@ def to_filehandle(fname, flag='r', return_opened=False, encoding=None):
     return fh
 
 
-@contextlib.contextmanager
 def open_file_cm(path_or_file, mode="r", encoding=None):
     r"""Pass through file objects and context-manage path-likes."""
     fh, opened = to_filehandle(path_or_file, mode, True, encoding)
-    if opened:
-        with fh:
-            yield fh
-    else:
-        yield fh
+    return fh if opened else contextlib.nullcontext(fh)
 
 
 def is_scalar_or_string(val):
@@ -556,23 +581,7 @@ def flatten(seq, scalarp=is_scalar_or_string):
             yield from flatten(item, scalarp)
 
 
-@_api.deprecated("3.3", alternative="os.path.realpath and os.stat")
-@functools.lru_cache()
-def get_realpath_and_stat(path):
-    realpath = os.path.realpath(path)
-    stat = os.stat(realpath)
-    stat_key = (stat.st_ino, stat.st_dev)
-    return realpath, stat_key
-
-
-# A regular expression used to determine the amount of space to
-# remove.  It looks for the first sequence of spaces immediately
-# following the first newline, or at the beginning of the string.
-_find_dedent_regex = re.compile(r"(?:(?:\n\r?)|^)( *)\S")
-# A cache to hold the regexs that actually remove the indent.
-_dedent_regex = {}
-
-
+@_api.deprecated("3.6", alternative="functools.lru_cache")
 class maxdict(dict):
     """
     A dictionary with a maximum size.
@@ -582,18 +591,15 @@ class maxdict(dict):
     This doesn't override all the relevant methods to constrain the size,
     just ``__setitem__``, so use with caution.
     """
+
     def __init__(self, maxsize):
-        dict.__init__(self)
+        super().__init__()
         self.maxsize = maxsize
-        self._killkeys = []
 
     def __setitem__(self, k, v):
-        if k not in self:
-            if len(self) >= self.maxsize:
-                del self[self._killkeys[0]]
-                del self._killkeys[0]
-            self._killkeys.append(k)
-        dict.__setitem__(self, k, v)
+        super().__setitem__(k, v)
+        while len(self) >= self.maxsize:
+            del self[next(iter(self))]
 
 
 class Stack:
@@ -702,6 +708,7 @@ def remove(self, o):
                 self.push(elem)
 
 
+@_api.deprecated("3.5", alternative="psutil.virtual_memory")
 def report_memory(i=0):  # argument may go away
     """Return the memory consumed by the process."""
     def call(command, os_name):
@@ -911,6 +918,34 @@ def get_siblings(self, a):
         return [x() for x in siblings]
 
 
+class GrouperView:
+    """Immutable view over a `.Grouper`."""
+
+    def __init__(self, grouper):
+        self._grouper = grouper
+
+    class _GrouperMethodForwarder:
+        def __init__(self, deprecated_kw=None):
+            self._deprecated_kw = deprecated_kw
+
+        def __set_name__(self, owner, name):
+            wrapped = getattr(Grouper, name)
+            forwarder = functools.wraps(wrapped)(
+                lambda self, *args, **kwargs: wrapped(
+                    self._grouper, *args, **kwargs))
+            if self._deprecated_kw:
+                forwarder = _api.deprecated(**self._deprecated_kw)(forwarder)
+            setattr(owner, name, forwarder)
+
+    __contains__ = _GrouperMethodForwarder()
+    __iter__ = _GrouperMethodForwarder()
+    joined = _GrouperMethodForwarder()
+    get_siblings = _GrouperMethodForwarder()
+    clean = _GrouperMethodForwarder(deprecated_kw=dict(since="3.6"))
+    join = _GrouperMethodForwarder(deprecated_kw=dict(since="3.6"))
+    remove = _GrouperMethodForwarder(deprecated_kw=dict(since="3.6"))
+
+
 def simple_linear_interpolation(a, steps):
     """
     Resample an array with ``steps - 1`` points between original point pairs.
@@ -983,7 +1018,7 @@ def delete_masked_points(*args):
             else:
                 x = np.asarray(x)
         margs.append(x)
-    masks = []    # list of masks that are True where good
+    masks = []  # List of masks that are True where good.
     for i, x in enumerate(margs):
         if seqlist[i]:
             if x.ndim > 1:
@@ -1135,6 +1170,7 @@ def boxplot_stats(X, whis=1.5, bootstrap=None, labels=None,
         med        50th percentile
         q1         first quartile (25th percentile)
         q3         third quartile (75th percentile)
+        iqr        interquartile range
         cilo       lower notch around the median
         cihi       upper notch around the median
         whislo     end of the lower whisker
@@ -1216,11 +1252,11 @@ def _compute_conf_interval(data, med, iqr, bootstrap):
             stats['med'] = np.nan
             stats['q1'] = np.nan
             stats['q3'] = np.nan
+            stats['iqr'] = np.nan
             stats['cilo'] = np.nan
             stats['cihi'] = np.nan
             stats['whislo'] = np.nan
             stats['whishi'] = np.nan
-            stats['med'] = np.nan
             continue
 
         # up-convert to an array, just to be safe
@@ -1335,47 +1371,17 @@ def _to_unmasked_float_array(x):
 
 def _check_1d(x):
     """Convert scalars to 1D arrays; pass-through arrays as is."""
-    if not hasattr(x, 'shape') or len(x.shape) < 1:
+    # Unpack in case of e.g. Pandas or xarray object
+    x = _unpack_to_numpy(x)
+    # plot requires `shape` and `ndim`.  If passed an
+    # object that doesn't provide them, then force to numpy array.
+    # Note this will strip unit information.
+    if (not hasattr(x, 'shape') or
+            not hasattr(x, 'ndim') or
+            len(x.shape) < 1):
         return np.atleast_1d(x)
     else:
-        try:
-            # work around
-            # https://github.com/pandas-dev/pandas/issues/27775 which
-            # means the shape of multi-dimensional slicing is not as
-            # expected.  That this ever worked was an unintentional
-            # quirk of pandas and will raise an exception in the
-            # future.  This slicing warns in pandas >= 1.0rc0 via
-            # https://github.com/pandas-dev/pandas/pull/30588
-            #
-            # < 1.0rc0 : x[:, None].ndim == 1, no warning, custom type
-            # >= 1.0rc1 : x[:, None].ndim == 2, warns, numpy array
-            # future : x[:, None] -> raises
-            #
-            # This code should correctly identify and coerce to a
-            # numpy array all pandas versions.
-            with warnings.catch_warnings(record=True) as w:
-                warnings.filterwarnings(
-                    "always",
-                    category=Warning,
-                    message='Support for multi-dimensional indexing')
-
-                ndim = x[:, None].ndim
-                # we have definitely hit a pandas index or series object
-                # cast to a numpy array.
-                if len(w) > 0:
-                    return np.asanyarray(x)
-            # We have likely hit a pandas object, or at least
-            # something where 2D slicing does not result in a 2D
-            # object.
-            if ndim < 2:
-                return np.atleast_1d(x)
-            return x
-        # In pandas 1.1.0, multidimensional indexing leads to an
-        # AssertionError for some Series objects, but should be
-        # IndexError as described in
-        # https://github.com/pandas-dev/pandas/issues/35527
-        except (AssertionError, IndexError, TypeError):
-            return np.atleast_1d(x)
+        return x
 
 
 def _reshape_2D(X, name):
@@ -1390,15 +1396,8 @@ def _reshape_2D(X, name):
     *name* is used to generate the error message for invalid inputs.
     """
 
-    # unpack if we have a values or to_numpy method.
-    try:
-        X = X.to_numpy()
-    except AttributeError:
-        try:
-            if isinstance(X.values, np.ndarray):
-                X = X.values
-        except AttributeError:
-            pass
+    # Unpack in case of e.g. Pandas or xarray object
+    X = _unpack_to_numpy(X)
 
     # Iterate over columns for ndarrays.
     if isinstance(X, np.ndarray):
@@ -1424,9 +1423,13 @@ def _reshape_2D(X, name):
     for xi in X:
         # check if this is iterable, except for strings which we
         # treat as singletons.
-        if (isinstance(xi, collections.abc.Iterable) and
-                not isinstance(xi, str)):
-            is_1d = False
+        if not isinstance(xi, str):
+            try:
+                iter(xi)
+            except TypeError:
+                pass
+            else:
+                is_1d = False
         xi = np.asanyarray(xi)
         nd = np.ndim(xi)
         if nd > 1:
@@ -1502,7 +1505,7 @@ def violin_stats(X, method, points=100, quantiles=None):
     # Want quantiles to be as the same shape as data sequences
     if quantiles is not None and len(quantiles) != 0:
         quantiles = _reshape_2D(quantiles, "quantiles")
-    # Else, mock quantiles if is none or empty
+    # Else, mock quantiles if it's none or empty
     else:
         quantiles = [[]] * len(X)
 
@@ -1680,7 +1683,7 @@ def index_of(y):
        The x and y values to plot.
     """
     try:
-        return y.index.values, y.values
+        return y.index.to_numpy(), y.to_numpy()
     except AttributeError:
         pass
     try:
@@ -1697,22 +1700,53 @@ def safe_first_element(obj):
     """
     Return the first element in *obj*.
 
-    This is an type-independent way of obtaining the first element, supporting
-    both index access and the iterator protocol.
+    This is an type-independent way of obtaining the first element,
+    supporting both index access and the iterator protocol.
     """
-    if isinstance(obj, collections.abc.Iterator):
-        # needed to accept `array.flat` as input.
-        # np.flatiter reports as an instance of collections.Iterator
-        # but can still be indexed via [].
-        # This has the side effect of re-setting the iterator, but
-        # that is acceptable.
+    return _safe_first_finite(obj, skip_nonfinite=False)
+
+
+def _safe_first_finite(obj, *, skip_nonfinite=True):
+    """
+    Return the first non-None (and optionally finite) element in *obj*.
+
+    This is a method for internal use.
+
+    This is an type-independent way of obtaining the first non-None element,
+    supporting both index access and the iterator protocol.
+    The first non-None element will be obtained when skip_none is True.
+    """
+    def safe_isfinite(val):
+        if val is None:
+            return False
         try:
-            return obj[0]
+            return np.isfinite(val) if np.isscalar(val) else True
         except TypeError:
-            pass
-        raise RuntimeError("matplotlib does not support generators "
-                           "as input")
-    return next(iter(obj))
+            # This is something that numpy can not make heads or tails
+            # of, assume "finite"
+            return True
+    if skip_nonfinite is False:
+        if isinstance(obj, collections.abc.Iterator):
+            # needed to accept `array.flat` as input.
+            # np.flatiter reports as an instance of collections.Iterator
+            # but can still be indexed via [].
+            # This has the side effect of re-setting the iterator, but
+            # that is acceptable.
+            try:
+                return obj[0]
+            except TypeError:
+                pass
+            raise RuntimeError("matplotlib does not support generators "
+                               "as input")
+        return next(iter(obj))
+    elif isinstance(obj, np.flatiter):
+        # TODO do the finite filtering on this
+        return obj[0]
+    elif isinstance(obj, collections.abc.Iterator):
+        raise RuntimeError("matplotlib does not "
+                           "support generators as input")
+    else:
+        return next(val for val in obj if safe_isfinite(val))
 
 
 def sanitize_sequence(data):
@@ -1723,24 +1757,10 @@ def sanitize_sequence(data):
             else data)
 
 
-@_api.delete_parameter("3.3", "required")
-@_api.delete_parameter("3.3", "forbidden")
-@_api.delete_parameter("3.3", "allowed")
-def normalize_kwargs(kw, alias_mapping=None, required=(), forbidden=(),
-                     allowed=None):
+def normalize_kwargs(kw, alias_mapping=None):
     """
     Helper function to normalize kwarg inputs.
 
-    The order they are resolved are:
-
-    1. aliasing
-    2. required
-    3. forbidden
-    4. allowed
-
-    This order means that only the canonical names need appear in
-    *allowed*, *forbidden*, *required*.
-
     Parameters
     ----------
     kw : dict or None
@@ -1749,32 +1769,20 @@ def normalize_kwargs(kw, alias_mapping=None, required=(), forbidden=(),
         the form ``props=None``.
 
     alias_mapping : dict or Artist subclass or Artist instance, optional
-        A mapping between a canonical name to a list of
-        aliases, in order of precedence from lowest to highest.
+        A mapping between a canonical name to a list of aliases, in order of
+        precedence from lowest to highest.
 
-        If the canonical value is not in the list it is assumed to have
-        the highest priority.
+        If the canonical value is not in the list it is assumed to have the
+        highest priority.
 
         If an Artist subclass or instance is passed, use its properties alias
         mapping.
 
-    required : list of str, optional
-        A list of keys that must be in *kws*.  This parameter is deprecated.
-
-    forbidden : list of str, optional
-        A list of keys which may not be in *kw*.  This parameter is deprecated.
-
-    allowed : list of str, optional
-        A list of allowed fields.  If this not None, then raise if
-        *kw* contains any keys not in the union of *required*
-        and *allowed*.  To allow only the required fields pass in
-        an empty tuple ``allowed=()``.  This parameter is deprecated.
-
     Raises
     ------
     TypeError
-        To match what python raises if invalid args/kwargs are passed to
-        a callable.
+        To match what Python raises if invalid arguments/keyword arguments are
+        passed to a callable.
     """
     from matplotlib.artist import Artist
 
@@ -1802,25 +1810,6 @@ def normalize_kwargs(kw, alias_mapping=None, required=(), forbidden=(),
         canonical_to_seen[canonical] = k
         ret[canonical] = v
 
-    fail_keys = [k for k in required if k not in ret]
-    if fail_keys:
-        raise TypeError("The required keys {keys!r} "
-                        "are not in kwargs".format(keys=fail_keys))
-
-    fail_keys = [k for k in forbidden if k in ret]
-    if fail_keys:
-        raise TypeError("The forbidden keys {keys!r} "
-                        "are in kwargs".format(keys=fail_keys))
-
-    if allowed is not None:
-        allowed_set = {*required, *allowed}
-        fail_keys = [k for k in ret if k not in allowed_set]
-        if fail_keys:
-            raise TypeError(
-                "kwargs contains {keys!r} which are not in the required "
-                "{req!r} or allowed {allow!r} keys".format(
-                    keys=fail_keys, req=required, allow=allowed))
-
     return ret
 
 
@@ -1898,61 +1887,6 @@ def _str_lower_equal(obj, s):
     return isinstance(obj, str) and obj.lower() == s
 
 
-def _define_aliases(alias_d, cls=None):
-    """
-    Class decorator for defining property aliases.
-
-    Use as ::
-
-        @cbook._define_aliases({"property": ["alias", ...], ...})
-        class C: ...
-
-    For each property, if the corresponding ``get_property`` is defined in the
-    class so far, an alias named ``get_alias`` will be defined; the same will
-    be done for setters.  If neither the getter nor the setter exists, an
-    exception will be raised.
-
-    The alias map is stored as the ``_alias_map`` attribute on the class and
-    can be used by `~.normalize_kwargs` (which assumes that higher priority
-    aliases come last).
-    """
-    if cls is None:  # Return the actual class decorator.
-        return functools.partial(_define_aliases, alias_d)
-
-    def make_alias(name):  # Enforce a closure over *name*.
-        @functools.wraps(getattr(cls, name))
-        def method(self, *args, **kwargs):
-            return getattr(self, name)(*args, **kwargs)
-        return method
-
-    for prop, aliases in alias_d.items():
-        exists = False
-        for prefix in ["get_", "set_"]:
-            if prefix + prop in vars(cls):
-                exists = True
-                for alias in aliases:
-                    method = make_alias(prefix + prop)
-                    method.__name__ = prefix + alias
-                    method.__doc__ = "Alias for `{}`.".format(prefix + prop)
-                    setattr(cls, prefix + alias, method)
-        if not exists:
-            raise ValueError(
-                "Neither getter nor setter exists for {!r}".format(prop))
-
-    def get_aliased_and_aliases(d):
-        return {*d, *(alias for aliases in d.values() for alias in aliases)}
-
-    preexisting_aliases = getattr(cls, "_alias_map", {})
-    conflicting = (get_aliased_and_aliases(preexisting_aliases)
-                   & get_aliased_and_aliases(alias_d))
-    if conflicting:
-        # Need to decide on conflict resolution policy.
-        raise NotImplementedError(
-            f"Parent class already defines conflicting aliases: {conflicting}")
-    cls._alias_map = {**preexisting_aliases, **alias_d}
-    return cls
-
-
 def _array_perimeter(arr):
     """
     Get the elements on the perimeter of *arr*.
@@ -1971,7 +1905,7 @@ def _array_perimeter(arr):
 
     Examples
     --------
-    >>> i, j = np.ogrid[:3,:4]
+    >>> i, j = np.ogrid[:3, :4]
     >>> a = i*10 + j
     >>> a
     array([[ 0,  1,  2,  3],
@@ -2015,7 +1949,7 @@ def _unfold(arr, axis, size, step):
 
     Examples
     --------
-    >>> i, j = np.ogrid[:3,:7]
+    >>> i, j = np.ogrid[:3, :7]
     >>> a = i*10 + j
     >>> a
     array([[ 0,  1,  2,  3,  4,  5,  6],
@@ -2156,7 +2090,7 @@ def discard(self, key):
         self._od.pop(key, None)
 
 
-# Agg's buffers are unmultiplied RGBA8888, which neither PyQt4 nor cairo
+# Agg's buffers are unmultiplied RGBA8888, which neither PyQt5 nor cairo
 # support; however, both do support premultiplied ARGB32.
 
 
@@ -2287,6 +2221,27 @@ def _format_approx(number, precision):
     return f'{number:.{precision}f}'.rstrip('0').rstrip('.') or '0'
 
 
+def _g_sig_digits(value, delta):
+    """
+    Return the number of significant digits to %g-format *value*, assuming that
+    it is known with an error of *delta*.
+    """
+    if delta == 0:
+        # delta = 0 may occur when trying to format values over a tiny range;
+        # in that case, replace it by the distance to the closest float.
+        delta = abs(np.spacing(value))
+    # If e.g. value = 45.67 and delta = 0.02, then we want to round to 2 digits
+    # after the decimal point (floor(log10(0.02)) = -2); 45.67 contributes 2
+    # digits before the decimal point (floor(log10(45.67)) + 1 = 2): the total
+    # is 4 significant digits.  A value of 0 contributes 1 "digit" before the
+    # decimal point.
+    # For inf or nan, the precision doesn't matter.
+    return max(
+        0,
+        (math.floor(math.log10(abs(value))) + 1 if value else 1)
+        - math.floor(math.log10(delta))) if math.isfinite(value) else 0
+
+
 def _unikey_or_keysym_to_mplkey(unikey, keysym):
     """
     Convert a Unicode key or X keysym to a Matplotlib key name.
@@ -2310,3 +2265,74 @@ def _unikey_or_keysym_to_mplkey(unikey, keysym):
         "next": "pagedown",  # Used by tk.
     }.get(key, key)
     return key
+
+
+@functools.lru_cache(None)
+def _make_class_factory(mixin_class, fmt, attr_name=None):
+    """
+    Return a function that creates picklable classes inheriting from a mixin.
+
+    After ::
+
+        factory = _make_class_factory(FooMixin, fmt, attr_name)
+        FooAxes = factory(Axes)
+
+    ``Foo`` is a class that inherits from ``FooMixin`` and ``Axes`` and **is
+    picklable** (picklability is what differentiates this from a plain call to
+    `type`).  Its ``__name__`` is set to ``fmt.format(Axes.__name__)`` and the
+    base class is stored in the ``attr_name`` attribute, if not None.
+
+    Moreover, the return value of ``factory`` is memoized: calls with the same
+    ``Axes`` class always return the same subclass.
+    """
+
+    @functools.lru_cache(None)
+    def class_factory(axes_class):
+        # if we have already wrapped this class, declare victory!
+        if issubclass(axes_class, mixin_class):
+            return axes_class
+
+        # The parameter is named "axes_class" for backcompat but is really just
+        # a base class; no axes semantics are used.
+        base_class = axes_class
+
+        class subcls(mixin_class, base_class):
+            # Better approximation than __module__ = "matplotlib.cbook".
+            __module__ = mixin_class.__module__
+
+            def __reduce__(self):
+                return (_picklable_class_constructor,
+                        (mixin_class, fmt, attr_name, base_class),
+                        self.__getstate__())
+
+        subcls.__name__ = subcls.__qualname__ = fmt.format(base_class.__name__)
+        if attr_name is not None:
+            setattr(subcls, attr_name, base_class)
+        return subcls
+
+    class_factory.__module__ = mixin_class.__module__
+    return class_factory
+
+
+def _picklable_class_constructor(mixin_class, fmt, attr_name, base_class):
+    """Internal helper for _make_class_factory."""
+    factory = _make_class_factory(mixin_class, fmt, attr_name)
+    cls = factory(base_class)
+    return cls.__new__(cls)
+
+
+def _unpack_to_numpy(x):
+    """Internal helper to extract data from e.g. pandas and xarray objects."""
+    if isinstance(x, np.ndarray):
+        # If numpy, return directly
+        return x
+    if hasattr(x, 'to_numpy'):
+        # Assume that any function to_numpy() do actually return a numpy array
+        return x.to_numpy()
+    if hasattr(x, 'values'):
+        xtmp = x.values
+        # For example a dict has a 'values' attribute, but it is not a property
+        # so in this case we do not want to return a function
+        if isinstance(xtmp, np.ndarray):
+            return xtmp
+    return x
diff --git a/lib/matplotlib/cbook/deprecation.py b/lib/matplotlib/cbook/deprecation.py
deleted file mode 100644
index 5a0f02f7decf..000000000000
--- a/lib/matplotlib/cbook/deprecation.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# imports are for backward compatibility
-from matplotlib._api.deprecation import (
-    MatplotlibDeprecationWarning, mplDeprecation, warn_deprecated, deprecated)
-
-warn_deprecated("3.4",
-                message="The module matplotlib.cbook.deprecation is "
-                "considered internal and it will be made private in the "
-                "future.")
diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py
index 376d703da13f..ec0d472992ef 100644
--- a/lib/matplotlib/cm.py
+++ b/lib/matplotlib/cm.py
@@ -15,18 +15,26 @@
   normalization.
 """
 
-from collections.abc import MutableMapping
+from collections.abc import Mapping
+import functools
 
 import numpy as np
 from numpy import ma
 
 import matplotlib as mpl
-from matplotlib import _api, colors, cbook
+from matplotlib import _api, colors, cbook, scale
 from matplotlib._cm import datad
 from matplotlib._cm_listed import cmaps as cmaps_listed
 
 
-LUTSIZE = mpl.rcParams['image.lut']
+@_api.caching_module_getattr  # module-level deprecations
+class __getattr__:
+    LUTSIZE = _api.deprecated(
+        "3.5", obj_type="", alternative="rcParams['image.lut']")(
+            property(lambda self: _LUTSIZE))
+
+
+_LUTSIZE = mpl.rcParams['image.lut']
 
 
 def _gen_cmap_registry():
@@ -37,69 +45,193 @@ def _gen_cmap_registry():
     cmap_d = {**cmaps_listed}
     for name, spec in datad.items():
         cmap_d[name] = (  # Precache the cmaps at a fixed lutsize..
-            colors.LinearSegmentedColormap(name, spec, LUTSIZE)
+            colors.LinearSegmentedColormap(name, spec, _LUTSIZE)
             if 'red' in spec else
             colors.ListedColormap(spec['listed'], name)
             if 'listed' in spec else
-            colors.LinearSegmentedColormap.from_list(name, spec, LUTSIZE))
+            colors.LinearSegmentedColormap.from_list(name, spec, _LUTSIZE))
     # Generate reversed cmaps.
     for cmap in list(cmap_d.values()):
         rmap = cmap.reversed()
-        cmap._global = True
-        rmap._global = True
         cmap_d[rmap.name] = rmap
     return cmap_d
 
 
-class _DeprecatedCmapDictWrapper(MutableMapping):
-    """Dictionary mapping for deprecated _cmap_d access."""
+class ColormapRegistry(Mapping):
+    r"""
+    Container for colormaps that are known to Matplotlib by name.
+
+    The universal registry instance is `matplotlib.colormaps`. There should be
+    no need for users to instantiate `.ColormapRegistry` themselves.
+
+    Read access uses a dict-like interface mapping names to `.Colormap`\s::
 
-    def __init__(self, cmap_registry):
-        self._cmap_registry = cmap_registry
+        import matplotlib as mpl
+        cmap = mpl.colormaps['viridis']
 
-    def __delitem__(self, key):
-        self._warn_deprecated()
-        self._cmap_registry.__delitem__(key)
+    Returned `.Colormap`\s are copies, so that their modification does not
+    change the global definition of the colormap.
 
-    def __getitem__(self, key):
-        self._warn_deprecated()
-        return self._cmap_registry.__getitem__(key)
+    Additional colormaps can be added via `.ColormapRegistry.register`::
+
+        mpl.colormaps.register(my_colormap)
+    """
+    def __init__(self, cmaps):
+        self._cmaps = cmaps
+        self._builtin_cmaps = tuple(cmaps)
+        # A shim to allow register_cmap() to force an override
+        self._allow_override_builtin = False
+
+    def __getitem__(self, item):
+        try:
+            return self._cmaps[item].copy()
+        except KeyError:
+            raise KeyError(f"{item!r} is not a known colormap name") from None
 
     def __iter__(self):
-        self._warn_deprecated()
-        return self._cmap_registry.__iter__()
+        return iter(self._cmaps)
 
     def __len__(self):
-        self._warn_deprecated()
-        return self._cmap_registry.__len__()
-
-    def __setitem__(self, key, val):
-        self._warn_deprecated()
-        self._cmap_registry.__setitem__(key, val)
-
-    def get(self, key, default=None):
-        self._warn_deprecated()
-        return self._cmap_registry.get(key, default)
-
-    def _warn_deprecated(self):
-        _api.warn_deprecated(
-            "3.3",
-            message="The global colormaps dictionary is no longer "
-                    "considered public API.",
-            alternative="Please use register_cmap() and get_cmap() to "
-                        "access the contents of the dictionary."
-        )
+        return len(self._cmaps)
+
+    def __str__(self):
+        return ('ColormapRegistry; available colormaps:\n' +
+                ', '.join(f"'{name}'" for name in self))
+
+    def __call__(self):
+        """
+        Return a list of the registered colormap names.
+
+        This exists only for backward-compatibility in `.pyplot` which had a
+        ``plt.colormaps()`` method. The recommended way to get this list is
+        now ``list(colormaps)``.
+        """
+        return list(self)
+
+    def register(self, cmap, *, name=None, force=False):
+        """
+        Register a new colormap.
+
+        The colormap name can then be used as a string argument to any ``cmap``
+        parameter in Matplotlib. It is also available in ``pyplot.get_cmap``.
+
+        The colormap registry stores a copy of the given colormap, so that
+        future changes to the original colormap instance do not affect the
+        registered colormap. Think of this as the registry taking a snapshot
+        of the colormap at registration.
+
+        Parameters
+        ----------
+        cmap : matplotlib.colors.Colormap
+            The colormap to register.
+
+        name : str, optional
+            The name for the colormap. If not given, ``cmap.name`` is used.
+
+        force : bool, default: False
+            If False, a ValueError is raised if trying to overwrite an already
+            registered name. True supports overwriting registered colormaps
+            other than the builtin colormaps.
+        """
+        _api.check_isinstance(colors.Colormap, cmap=cmap)
+
+        name = name or cmap.name
+        if name in self:
+            if not force:
+                # don't allow registering an already existing cmap
+                # unless explicitly asked to
+                raise ValueError(
+                    f'A colormap named "{name}" is already registered.')
+            elif (name in self._builtin_cmaps
+                    and not self._allow_override_builtin):
+                # We don't allow overriding a builtin unless privately
+                # coming from register_cmap()
+                raise ValueError("Re-registering the builtin cmap "
+                                 f"{name!r} is not allowed.")
+
+            # Warn that we are updating an already existing colormap
+            _api.warn_external(f"Overwriting the cmap {name!r} "
+                               "that was already in the registry.")
+
+        self._cmaps[name] = cmap.copy()
+
+    def unregister(self, name):
+        """
+        Remove a colormap from the registry.
 
+        You cannot remove built-in colormaps.
 
-_cmap_registry = _gen_cmap_registry()
-globals().update(_cmap_registry)
-# This is no longer considered public API
-cmap_d = _DeprecatedCmapDictWrapper(_cmap_registry)
-__builtin_cmaps = tuple(_cmap_registry)
+        If the named colormap is not registered, returns with no error, raises
+        if you try to de-register a default colormap.
 
-# Continue with definitions ...
+        .. warning::
 
+            Colormap names are currently a shared namespace that may be used
+            by multiple packages. Use `unregister` only if you know you
+            have registered that name before. In particular, do not
+            unregister just in case to clean the name before registering a
+            new colormap.
 
+        Parameters
+        ----------
+        name : str
+            The name of the colormap to be removed.
+
+        Raises
+        ------
+        ValueError
+            If you try to remove a default built-in colormap.
+        """
+        if name in self._builtin_cmaps:
+            raise ValueError(f"cannot unregister {name!r} which is a builtin "
+                             "colormap.")
+        self._cmaps.pop(name, None)
+
+    def get_cmap(self, cmap):
+        """
+        Return a color map specified through *cmap*.
+
+        Parameters
+        ----------
+        cmap : str or `~matplotlib.colors.Colormap` or None
+
+            - if a `.Colormap`, return it
+            - if a string, look it up in ``mpl.colormaps``
+            - if None, return the Colormap defined in :rc:`image.cmap`
+
+        Returns
+        -------
+        Colormap
+        """
+        # get the default color map
+        if cmap is None:
+            return self[mpl.rcParams["image.cmap"]]
+
+        # if the user passed in a Colormap, simply return it
+        if isinstance(cmap, colors.Colormap):
+            return cmap
+        if isinstance(cmap, str):
+            _api.check_in_list(sorted(_colormaps), cmap=cmap)
+            # otherwise, it must be a string so look it up
+            return self[cmap]
+        raise TypeError(
+            'get_cmap expects None or an instance of a str or Colormap . ' +
+            f'you passed {cmap!r} of type {type(cmap)}'
+        )
+
+
+# public access to the colormaps should be via `matplotlib.colormaps`. For now,
+# we still create the registry here, but that should stay an implementation
+# detail.
+_colormaps = ColormapRegistry(_gen_cmap_registry())
+globals().update(_colormaps)
+
+
+@_api.deprecated(
+    '3.6',
+    pending=True,
+    alternative="``matplotlib.colormaps.register(name)``"
+)
 def register_cmap(name=None, cmap=None, *, override_builtin=False):
     """
     Add a colormap to the set recognized by :func:`get_cmap`.
@@ -127,14 +259,6 @@ def register_cmap(name=None, cmap=None, *, override_builtin=False):
         colormap.
 
         Please do not use this unless you are sure you need it.
-
-    Notes
-    -----
-    Registering a colormap stores a reference to the colormap object
-    which can currently be modified and inadvertently change the global
-    colormap state. This behavior is deprecated and in Matplotlib 3.5
-    the registered colormap will be immutable.
-
     """
     _api.check_isinstance((str, None), name=name)
     if name is None:
@@ -143,36 +267,18 @@ def register_cmap(name=None, cmap=None, *, override_builtin=False):
         except AttributeError as err:
             raise ValueError("Arguments must include a name or a "
                              "Colormap") from err
-    if name in _cmap_registry:
-        if not override_builtin and name in __builtin_cmaps:
-            msg = f"Trying to re-register the builtin cmap {name!r}."
-            raise ValueError(msg)
-        else:
-            msg = f"Trying to register the cmap {name!r} which already exists."
-            _api.warn_external(msg)
+    # override_builtin is allowed here for backward compatibility
+    # this is just a shim to enable that to work privately in
+    # the global ColormapRegistry
+    _colormaps._allow_override_builtin = override_builtin
+    _colormaps.register(cmap, name=name, force=override_builtin)
+    _colormaps._allow_override_builtin = False
 
-    if not isinstance(cmap, colors.Colormap):
-        raise ValueError("You must pass a Colormap instance. "
-                         f"You passed {cmap} a {type(cmap)} object.")
 
-    cmap._global = True
-    _cmap_registry[name] = cmap
-    return
-
-
-def get_cmap(name=None, lut=None):
+def _get_cmap(name=None, lut=None):
     """
     Get a colormap instance, defaulting to rc values if *name* is None.
 
-    Colormaps added with :func:`register_cmap` take precedence over
-    built-in colormaps.
-
-    Notes
-    -----
-    Currently, this returns the global colormap object, which is deprecated.
-    In Matplotlib 3.5, you will no longer be able to modify the global
-    colormaps in-place.
-
     Parameters
     ----------
     name : `matplotlib.colors.Colormap` or str or None, default: None
@@ -182,18 +288,39 @@ def get_cmap(name=None, lut=None):
     lut : int or None, default: None
         If *name* is not already a Colormap instance and *lut* is not None, the
         colormap will be resampled to have *lut* entries in the lookup table.
+
+    Returns
+    -------
+    Colormap
     """
     if name is None:
         name = mpl.rcParams['image.cmap']
     if isinstance(name, colors.Colormap):
         return name
-    _api.check_in_list(sorted(_cmap_registry), name=name)
+    _api.check_in_list(sorted(_colormaps), name=name)
     if lut is None:
-        return _cmap_registry[name]
+        return _colormaps[name]
     else:
-        return _cmap_registry[name]._resample(lut)
-
-
+        return _colormaps[name].resampled(lut)
+
+# do it in two steps like this so we can have an un-deprecated version in
+# pyplot.
+get_cmap = _api.deprecated(
+    '3.6',
+    name='get_cmap',
+    pending=True,
+    alternative=(
+        "``matplotlib.colormaps[name]`` " +
+        "or ``matplotlib.colormaps.get_cmap(obj)``"
+    )
+)(_get_cmap)
+
+
+@_api.deprecated(
+    '3.6',
+    pending=True,
+    alternative="``matplotlib.colormaps.unregister(name)``"
+)
 def unregister_cmap(name):
     """
     Remove a colormap recognized by :func:`get_cmap`.
@@ -203,7 +330,7 @@ def unregister_cmap(name):
     If the named colormap is not registered, returns with no error, raises
     if you try to de-register a default colormap.
 
-    .. warning ::
+    .. warning::
 
       Colormap names are currently a shared namespace that may be used
       by multiple packages. Use `unregister_cmap` only if you know you
@@ -225,14 +352,38 @@ def unregister_cmap(name):
     ------
     ValueError
        If you try to de-register a default built-in colormap.
+    """
+    cmap = _colormaps.get(name, None)
+    _colormaps.unregister(name)
+    return cmap
 
+
+def _auto_norm_from_scale(scale_cls):
+    """
+    Automatically generate a norm class from *scale_cls*.
+
+    This differs from `.colors.make_norm_from_scale` in the following points:
+
+    - This function is not a class decorator, but directly returns a norm class
+      (as if decorating `.Normalize`).
+    - The scale is automatically constructed with ``nonpositive="mask"``, if it
+      supports such a parameter, to work around the difference in defaults
+      between standard scales (which use "clip") and norms (which use "mask").
+
+    Note that ``make_norm_from_scale`` caches the generated norm classes
+    (not the instances) and reuses them for later calls.  For example,
+    ``type(_auto_norm_from_scale("log")) == LogNorm``.
     """
-    if name not in _cmap_registry:
-        return
-    if name in __builtin_cmaps:
-        raise ValueError(f"cannot unregister {name!r} which is a builtin "
-                         "colormap.")
-    return _cmap_registry.pop(name)
+    # Actually try to construct an instance, to verify whether
+    # ``nonpositive="mask"`` is supported.
+    try:
+        norm = colors.make_norm_from_scale(
+            functools.partial(scale_cls, nonpositive="mask"))(
+            colors.Normalize)()
+    except TypeError:
+        norm = colors.make_norm_from_scale(scale_cls)(
+            colors.Normalize)()
+    return type(norm)
 
 
 class ScalarMappable:
@@ -245,26 +396,29 @@ class ScalarMappable:
 
     def __init__(self, norm=None, cmap=None):
         """
-
         Parameters
         ----------
-        norm : `matplotlib.colors.Normalize` (or subclass thereof)
+        norm : `.Normalize` (or subclass thereof) or str or None
             The normalizing object which scales data, typically into the
             interval ``[0, 1]``.
+            If a `str`, a `.Normalize` subclass is dynamically generated based
+            on the scale with the corresponding name.
             If *None*, *norm* defaults to a *colors.Normalize* object which
             initializes its scaling based on the first data processed.
         cmap : str or `~matplotlib.colors.Colormap`
             The colormap used to map normalized data values to RGBA colors.
         """
         self._A = None
-        self.norm = None  # So that the setter knows we're initializing.
+        self._norm = None  # So that the setter knows we're initializing.
         self.set_norm(norm)  # The Normalize instance of this ScalarMappable.
         self.cmap = None  # So that the setter knows we're initializing.
         self.set_cmap(cmap)  # The Colormap instance of this ScalarMappable.
         #: The last colorbar associated with this ScalarMappable. May be None.
         self.colorbar = None
-        self.callbacksSM = cbook.CallbackRegistry()
-        self._update_dict = {'array': False}
+        self.callbacks = cbook.CallbackRegistry(signals=["changed"])
+
+    callbacksSM = _api.deprecated("3.5", alternative="callbacks")(
+        property(lambda self: self.callbacks))
 
     def _scale_norm(self, norm, vmin, vmax):
         """
@@ -278,13 +432,11 @@ def _scale_norm(self, norm, vmin, vmax):
         """
         if vmin is not None or vmax is not None:
             self.set_clim(vmin, vmax)
-            if norm is not None:
-                _api.warn_deprecated(
-                    "3.3",
-                    message="Passing parameters norm and vmin/vmax "
-                            "simultaneously is deprecated since %(since)s and "
-                            "will become an error %(removal)s. Please pass "
-                            "vmin/vmax directly to the norm when creating it.")
+            if isinstance(norm, colors.Normalize):
+                raise ValueError(
+                    "Passing a Normalize instance simultaneously with "
+                    "vmin/vmax is not supported.  Please pass vmin/vmax "
+                    "directly to the norm when creating it.")
 
         # always resolve the autoscaling so we have concrete limits
         # rather than deferring to draw time.
@@ -309,7 +461,7 @@ def to_rgba(self, x, alpha=None, bytes=False, norm=True):
         If the last dimension is 3, the *alpha* kwarg (defaulting to 1)
         will be used to fill in the transparency.  If the last dimension
         is 4, the *alpha* kwarg is ignored; it does not
-        replace the pre-existing alpha.  A ValueError will be raised
+        replace the preexisting alpha.  A ValueError will be raised
         if the third dimension is other than 3 or 4.
 
         In either case, if *bytes* is *False* (default), the rgba
@@ -362,17 +514,34 @@ def to_rgba(self, x, alpha=None, bytes=False, norm=True):
 
     def set_array(self, A):
         """
-        Set the image array from numpy array *A*.
+        Set the value array from array-like *A*.
 
         Parameters
         ----------
-        A : ndarray or None
+        A : array-like or None
+            The values that are mapped to colors.
+
+            The base class `.ScalarMappable` does not make any assumptions on
+            the dimensionality and shape of the value array *A*.
         """
+        if A is None:
+            self._A = None
+            return
+
+        A = cbook.safe_masked_invalid(A, copy=True)
+        if not np.can_cast(A.dtype, float, "same_kind"):
+            raise TypeError(f"Image data of dtype {A.dtype} cannot be "
+                            "converted to float")
+
         self._A = A
-        self._update_dict['array'] = True
 
     def get_array(self):
-        """Return the data array."""
+        """
+        Return the array of values, that are mapped to colors.
+
+        The base class `.ScalarMappable` does not make any assumptions on
+        the dimensionality and shape of the array.
+        """
         return self._A
 
     def get_cmap(self):
@@ -399,6 +568,8 @@ def set_clim(self, vmin=None, vmax=None):
 
              .. ACCEPTS: (vmin: float, vmax: float)
         """
+        # If the norm's limits are updated self.changed() will be called
+        # through the callbacks attached to the norm
         if vmax is None:
             try:
                 vmin, vmax = vmin
@@ -408,7 +579,6 @@ def set_clim(self, vmin=None, vmax=None):
             self.norm.vmin = colors._sanitize_extrema(vmin)
         if vmax is not None:
             self.norm.vmax = colors._sanitize_extrema(vmax)
-        self.changed()
 
     def get_alpha(self):
         """
@@ -429,18 +599,51 @@ def set_cmap(self, cmap):
         cmap : `.Colormap` or str or None
         """
         in_init = self.cmap is None
-        cmap = get_cmap(cmap)
-        self.cmap = cmap
+
+        self.cmap = _ensure_cmap(cmap)
         if not in_init:
             self.changed()  # Things are not set up properly yet.
 
+    @property
+    def norm(self):
+        return self._norm
+
+    @norm.setter
+    def norm(self, norm):
+        _api.check_isinstance((colors.Normalize, str, None), norm=norm)
+        if norm is None:
+            norm = colors.Normalize()
+        elif isinstance(norm, str):
+            try:
+                scale_cls = scale._scale_mapping[norm]
+            except KeyError:
+                raise ValueError(
+                    "Invalid norm str name; the following values are "
+                    "supported: {}".format(", ".join(scale._scale_mapping))
+                ) from None
+            norm = _auto_norm_from_scale(scale_cls)()
+
+        if norm is self.norm:
+            # We aren't updating anything
+            return
+
+        in_init = self.norm is None
+        # Remove the current callback and connect to the new one
+        if not in_init:
+            self.norm.callbacks.disconnect(self._id_norm)
+        self._norm = norm
+        self._id_norm = self.norm.callbacks.connect('changed',
+                                                    self.changed)
+        if not in_init:
+            self.changed()
+
     def set_norm(self, norm):
         """
         Set the normalization instance.
 
         Parameters
         ----------
-        norm : `.Normalize` or None
+        norm : `.Normalize` or str or None
 
         Notes
         -----
@@ -448,13 +651,7 @@ def set_norm(self, norm):
         the norm of the mappable will reset the norm, locator, and formatters
         on the colorbar to default.
         """
-        _api.check_isinstance((colors.Normalize, None), norm=norm)
-        in_init = self.norm is None
-        if norm is None:
-            norm = colors.Normalize()
         self.norm = norm
-        if not in_init:
-            self.changed()  # Things are not set up properly yet.
 
     def autoscale(self):
         """
@@ -463,8 +660,9 @@ def autoscale(self):
         """
         if self._A is None:
             raise TypeError('You must first set_array for mappable')
+        # If the norm's limits are updated self.changed() will be called
+        # through the callbacks attached to the norm
         self.norm.autoscale(self._A)
-        self.changed()
 
     def autoscale_None(self):
         """
@@ -473,39 +671,72 @@ def autoscale_None(self):
         """
         if self._A is None:
             raise TypeError('You must first set_array for mappable')
+        # If the norm's limits are updated self.changed() will be called
+        # through the callbacks attached to the norm
         self.norm.autoscale_None(self._A)
-        self.changed()
-
-    def _add_checker(self, checker):
-        """
-        Add an entry to a dictionary of boolean flags
-        that are set to True when the mappable is changed.
-        """
-        self._update_dict[checker] = False
-
-    def _check_update(self, checker):
-        """Return whether mappable has changed since the last check."""
-        if self._update_dict[checker]:
-            self._update_dict[checker] = False
-            return True
-        return False
 
     def changed(self):
         """
         Call this whenever the mappable is changed to notify all the
         callbackSM listeners to the 'changed' signal.
         """
-        self.callbacksSM.process('changed', self)
-        for key in self._update_dict:
-            self._update_dict[key] = True
+        self.callbacks.process('changed', self)
         self.stale = True
 
-    update_dict = _api.deprecate_privatize_attribute("3.3")
 
-    @_api.deprecated("3.3")
-    def add_checker(self, checker):
-        return self._add_checker(checker)
+# The docstrings here must be generic enough to apply to all relevant methods.
+mpl._docstring.interpd.update(
+    cmap_doc="""\
+cmap : str or `~matplotlib.colors.Colormap`, default: :rc:`image.cmap`
+    The Colormap instance or registered colormap name used to map scalar data
+    to colors.""",
+    norm_doc="""\
+norm : str or `~matplotlib.colors.Normalize`, optional
+    The normalization method used to scale scalar data to the [0, 1] range
+    before mapping to colors using *cmap*. By default, a linear scaling is
+    used, mapping the lowest value to 0 and the highest to 1.
+
+    If given, this can be one of the following:
+
+    - An instance of `.Normalize` or one of its subclasses
+      (see :doc:`/tutorials/colors/colormapnorms`).
+    - A scale name, i.e. one of "linear", "log", "symlog", "logit", etc.  For a
+      list of available scales, call `matplotlib.scale.get_scale_names()`.
+      In that case, a suitable `.Normalize` subclass is dynamically generated
+      and instantiated.""",
+    vmin_vmax_doc="""\
+vmin, vmax : float, optional
+    When using scalar data and no explicit *norm*, *vmin* and *vmax* define
+    the data range that the colormap covers. By default, the colormap covers
+    the complete value range of the supplied data. It is an error to use
+    *vmin*/*vmax* when a *norm* instance is given (but using a `str` *norm*
+    name together with *vmin*/*vmax* is acceptable).""",
+)
+
+
+def _ensure_cmap(cmap):
+    """
+    Ensure that we have a `.Colormap` object.
+
+    For internal use to preserve type stability of errors.
+
+    Parameters
+    ----------
+    cmap : None, str, Colormap
+
+        - if a `Colormap`, return it
+        - if a string, look it up in mpl.colormaps
+        - if None, look up the default color map in mpl.colormaps
+
+    Returns
+    -------
+    Colormap
 
-    @_api.deprecated("3.3")
-    def check_update(self, checker):
-        return self._check_update(checker)
+    """
+    if isinstance(cmap, colors.Colormap):
+        return cmap
+    cmap_name = cmap if cmap is not None else mpl.rcParams["image.cmap"]
+    # use check_in_list to ensure type stability of the exception raised by
+    # the internal usage of this (ValueError vs KeyError)
+    _api.check_in_list(sorted(_colormaps), cmap=cmap_name)
+    return mpl.colormaps[cmap_name]
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
index bb270b218e22..cef043e79ddb 100644
--- a/lib/matplotlib/collections.py
+++ b/lib/matplotlib/collections.py
@@ -9,25 +9,28 @@
 line segments).
 """
 
+import inspect
 import math
 from numbers import Number
+import warnings
+
 import numpy as np
 
 import matplotlib as mpl
-from . import (_api, _path, artist, cbook, cm, colors as mcolors, docstring,
+from . import (_api, _path, artist, cbook, cm, colors as mcolors, _docstring,
                hatch as mhatch, lines as mlines, path as mpath, transforms)
 from ._enums import JoinStyle, CapStyle
-import warnings
 
 
 # "color" is excluded; it is a compound setter, and its docstring differs
 # in LineCollection.
-@cbook._define_aliases({
+@_api.define_aliases({
     "antialiased": ["antialiaseds", "aa"],
     "edgecolor": ["edgecolors", "ec"],
     "facecolor": ["facecolors", "fc"],
     "linestyle": ["linestyles", "dashes", "ls"],
     "linewidth": ["linewidths", "lw"],
+    "offset_transform": ["transOffset"],
 })
 class Collection(artist.Artist, cm.ScalarMappable):
     r"""
@@ -59,8 +62,6 @@ class Collection(artist.Artist, cm.ScalarMappable):
     mappable will be used to set the ``facecolors`` and ``edgecolors``,
     ignoring those that were manually passed in.
     """
-    _offsets = np.zeros((0, 2))
-    _transOffset = transforms.IdentityTransform()
     #: Either a list of 3x3 arrays or an Nx3x3 array (representing N
     #: transforms), suitable for the `all_transforms` argument to
     #: `~matplotlib.backend_bases.RendererBase.draw_path_collection`;
@@ -73,8 +74,8 @@ class Collection(artist.Artist, cm.ScalarMappable):
     # subclass-by-subclass basis.
     _edge_default = False
 
-    @_api.delete_parameter("3.3", "offset_position")
-    @docstring.interpd
+    @_docstring.interpd
+    @_api.make_keyword_only("3.6", name="edgecolors")
     def __init__(self,
                  edgecolors=None,
                  facecolors=None,
@@ -84,13 +85,13 @@ def __init__(self,
                  joinstyle=None,
                  antialiaseds=None,
                  offsets=None,
-                 transOffset=None,
+                 offset_transform=None,
                  norm=None,  # optional for ScalarMappable
                  cmap=None,  # ditto
                  pickradius=5.0,
                  hatch=None,
                  urls=None,
-                 offset_position='screen',
+                 *,
                  zorder=1,
                  **kwargs
                  ):
@@ -127,19 +128,12 @@ def __init__(self,
             A vector by which to translate each patch after rendering (default
             is no translation). The translation is performed in screen (pixel)
             coordinates (i.e. after the Artist's transform is applied).
-        transOffset : `~.transforms.Transform`, default: `.IdentityTransform`
+        offset_transform : `~.Transform`, default: `.IdentityTransform`
             A single transform which will be applied to each *offsets* vector
             before it is used.
-        offset_position : {{'screen' (default), 'data' (deprecated)}}
-            If set to 'data' (deprecated), *offsets* will be treated as if it
-            is in data coordinates instead of in screen coordinates.
-        norm : `~.colors.Normalize`, optional
-            Forwarded to `.ScalarMappable`. The default of
-            ``None`` means that the first draw call will set ``vmin`` and
-            ``vmax`` using the minimum and maximum values of the data.
-        cmap : `~.colors.Colormap`, optional
-            Forwarded to `.ScalarMappable`. The default of
-            ``None`` will result in :rc:`image.cmap` being used.
+        cmap, norm
+            Data normalization and colormapping parameters. See
+            `.ScalarMappable` for a detailed description.
         hatch : str, optional
             Hatching pattern to use in filled paths, if any. Valid strings are
             ['/', '\\', '|', '-', '+', 'x', 'o', 'O', '.', '*']. See
@@ -183,9 +177,6 @@ def __init__(self,
         self.set_pickradius(pickradius)
         self.set_urls(urls)
         self.set_hatch(hatch)
-        self._offset_position = "screen"
-        if offset_position != "screen":
-            self.set_offset_position(offset_position)  # emit deprecation.
         self.set_zorder(zorder)
 
         if capstyle:
@@ -198,40 +189,48 @@ def __init__(self,
         else:
             self._joinstyle = None
 
-        self._offsets = np.zeros((1, 2))
-        # save if offsets passed in were none...
-        self._offsetsNone = offsets is None
-        self._uniform_offsets = None
         if offsets is not None:
             offsets = np.asanyarray(offsets, float)
             # Broadcast (2,) -> (1, 2) but nothing else.
             if offsets.shape == (2,):
                 offsets = offsets[None, :]
-            if transOffset is not None:
-                self._offsets = offsets
-                self._transOffset = transOffset
-            else:
-                self._uniform_offsets = offsets
+
+        self._offsets = offsets
+        self._offset_transform = offset_transform
 
         self._path_effects = None
-        self.update(kwargs)
+        self._internal_update(kwargs)
         self._paths = None
 
     def get_paths(self):
         return self._paths
 
-    def set_paths(self):
+    def set_paths(self, paths):
         raise NotImplementedError
 
     def get_transforms(self):
         return self._transforms
 
     def get_offset_transform(self):
-        t = self._transOffset
-        if (not isinstance(t, transforms.Transform)
-                and hasattr(t, '_as_mpl_transform')):
-            t = t._as_mpl_transform(self.axes)
-        return t
+        """Return the `.Transform` instance used by this artist offset."""
+        if self._offset_transform is None:
+            self._offset_transform = transforms.IdentityTransform()
+        elif (not isinstance(self._offset_transform, transforms.Transform)
+              and hasattr(self._offset_transform, '_as_mpl_transform')):
+            self._offset_transform = \
+                self._offset_transform._as_mpl_transform(self.axes)
+        return self._offset_transform
+
+    @_api.rename_parameter("3.6", "transOffset", "offset_transform")
+    def set_offset_transform(self, offset_transform):
+        """
+        Set the artist offset transform.
+
+        Parameters
+        ----------
+        offset_transform : `.Transform`
+        """
+        self._offset_transform = offset_transform
 
     def get_datalim(self, transData):
         # Calculate the data limits and return them as a `.Bbox`.
@@ -251,15 +250,18 @@ def get_datalim(self, transData):
         # 3. otherwise return a null Bbox.
 
         transform = self.get_transform()
-        transOffset = self.get_offset_transform()
-        if (not self._offsetsNone and
-                not transOffset.contains_branch(transData)):
-            # if there are offsets but in some coords other than data,
+        offset_trf = self.get_offset_transform()
+        if not (isinstance(offset_trf, transforms.IdentityTransform)
+                or offset_trf.contains_branch(transData)):
+            # if the offsets are in some coords other than data,
             # then don't use them for autoscaling.
             return transforms.Bbox.null()
-        offsets = self._offsets
+        offsets = self.get_offsets()
 
         paths = self.get_paths()
+        if not len(paths):
+            # No paths to transform
+            return transforms.Bbox.null()
 
         if not transform.is_affine:
             paths = [transform.transform_path_non_affine(p) for p in paths]
@@ -268,38 +270,37 @@ def get_datalim(self, transData):
             # transforms.get_affine().contains_branch(transData).  But later,
             # be careful to only apply the affine part that remains.
 
-        if isinstance(offsets, np.ma.MaskedArray):
-            offsets = offsets.filled(np.nan)
-            # get_path_collection_extents handles nan but not masked arrays
-
-        if len(paths) and len(offsets):
-            if any(transform.contains_branch_seperately(transData)):
-                # collections that are just in data units (like quiver)
-                # can properly have the axes limits set by their shape +
-                # offset.  LineCollections that have no offsets can
-                # also use this algorithm (like streamplot).
-                return mpath.get_path_collection_extents(
-                    transform.get_affine() - transData, paths,
-                    self.get_transforms(),
-                    transOffset.transform_non_affine(offsets),
-                    transOffset.get_affine().frozen())
-            if not self._offsetsNone:
-                # this is for collections that have their paths (shapes)
-                # in physical, axes-relative, or figure-relative units
-                # (i.e. like scatter). We can't uniquely set limits based on
-                # those shapes, so we just set the limits based on their
-                # location.
-
-                offsets = (transOffset - transData).transform(offsets)
-                # note A-B means A B^{-1}
-                offsets = np.ma.masked_invalid(offsets)
-                if not offsets.mask.all():
-                    bbox = transforms.Bbox.null()
-                    bbox.update_from_data_xy(offsets)
-                    return bbox
+        if any(transform.contains_branch_seperately(transData)):
+            # collections that are just in data units (like quiver)
+            # can properly have the axes limits set by their shape +
+            # offset.  LineCollections that have no offsets can
+            # also use this algorithm (like streamplot).
+            if isinstance(offsets, np.ma.MaskedArray):
+                offsets = offsets.filled(np.nan)
+                # get_path_collection_extents handles nan but not masked arrays
+            return mpath.get_path_collection_extents(
+                transform.get_affine() - transData, paths,
+                self.get_transforms(),
+                offset_trf.transform_non_affine(offsets),
+                offset_trf.get_affine().frozen())
+
+        # NOTE: None is the default case where no offsets were passed in
+        if self._offsets is not None:
+            # this is for collections that have their paths (shapes)
+            # in physical, axes-relative, or figure-relative units
+            # (i.e. like scatter). We can't uniquely set limits based on
+            # those shapes, so we just set the limits based on their
+            # location.
+            offsets = (offset_trf - transData).transform(offsets)
+            # note A-B means A B^{-1}
+            offsets = np.ma.masked_invalid(offsets)
+            if not offsets.mask.all():
+                bbox = transforms.Bbox.null()
+                bbox.update_from_data_xy(offsets)
+                return bbox
         return transforms.Bbox.null()
 
-    def get_window_extent(self, renderer):
+    def get_window_extent(self, renderer=None):
         # TODO: check to ensure that this does not fail for
         # cases other than scatter plot legend
         return self.get_datalim(transforms.IdentityTransform())
@@ -308,8 +309,8 @@ def _prepare_points(self):
         # Helper for drawing and hit testing.
 
         transform = self.get_transform()
-        transOffset = self.get_offset_transform()
-        offsets = self._offsets
+        offset_trf = self.get_offset_transform()
+        offsets = self.get_offsets()
         paths = self.get_paths()
 
         if self.have_units():
@@ -320,26 +321,25 @@ def _prepare_points(self):
                 xs = self.convert_xunits(xs)
                 ys = self.convert_yunits(ys)
                 paths.append(mpath.Path(np.column_stack([xs, ys]), path.codes))
-            if offsets.size:
-                xs = self.convert_xunits(offsets[:, 0])
-                ys = self.convert_yunits(offsets[:, 1])
-                offsets = np.column_stack([xs, ys])
+            xs = self.convert_xunits(offsets[:, 0])
+            ys = self.convert_yunits(offsets[:, 1])
+            offsets = np.column_stack([xs, ys])
 
         if not transform.is_affine:
             paths = [transform.transform_path_non_affine(path)
                      for path in paths]
             transform = transform.get_affine()
-        if not transOffset.is_affine:
-            offsets = transOffset.transform_non_affine(offsets)
+        if not offset_trf.is_affine:
+            offsets = offset_trf.transform_non_affine(offsets)
             # This might have changed an ndarray into a masked array.
-            transOffset = transOffset.get_affine()
+            offset_trf = offset_trf.get_affine()
 
         if isinstance(offsets, np.ma.MaskedArray):
             offsets = offsets.filled(np.nan)
             # Changing from a masked array to nan-filled ndarray
             # is probably most efficient at this point.
 
-        return transform, transOffset, offsets, paths
+        return transform, offset_trf, offsets, paths
 
     @artist.allow_rasterization
     def draw(self, renderer):
@@ -349,7 +349,7 @@ def draw(self, renderer):
 
         self.update_scalarmappable()
 
-        transform, transOffset, offsets, paths = self._prepare_points()
+        transform, offset_trf, offsets, paths = self._prepare_points()
 
         gc = renderer.new_gc()
         self._set_gc_clip(gc)
@@ -405,30 +405,31 @@ def draw(self, renderer):
             gc.set_url(self._urls[0])
             renderer.draw_markers(
                 gc, paths[0], combined_transform.frozen(),
-                mpath.Path(offsets), transOffset, tuple(facecolors[0]))
+                mpath.Path(offsets), offset_trf, tuple(facecolors[0]))
         else:
             renderer.draw_path_collection(
                 gc, transform.frozen(), paths,
-                self.get_transforms(), offsets, transOffset,
+                self.get_transforms(), offsets, offset_trf,
                 self.get_facecolor(), self.get_edgecolor(),
                 self._linewidths, self._linestyles,
                 self._antialiaseds, self._urls,
-                self._offset_position)
+                "screen")  # offset_position, kept for backcompat.
 
         gc.restore()
         renderer.close_group(self.__class__.__name__)
         self.stale = False
 
-    def set_pickradius(self, pr):
+    @_api.rename_parameter("3.6", "pr", "pickradius")
+    def set_pickradius(self, pickradius):
         """
         Set the pick radius used for containment tests.
 
         Parameters
         ----------
-        pr : float
+        pickradius : float
             Pick radius, in points.
         """
-        self._pickradius = pr
+        self._pickradius = pickradius
 
     def get_pickradius(self):
         return self._pickradius
@@ -456,7 +457,7 @@ def contains(self, mouseevent):
         if self.axes:
             self.axes._unstale_viewLim()
 
-        transform, transOffset, offsets, paths = self._prepare_points()
+        transform, offset_trf, offsets, paths = self._prepare_points()
 
         # Tests if the point is contained on one of the polygons formed
         # by the control points of each of the paths. A point is considered
@@ -466,8 +467,7 @@ def contains(self, mouseevent):
         ind = _path.point_in_path_collection(
             mouseevent.x, mouseevent.y, pickradius,
             transform.frozen(), paths, self.get_transforms(),
-            offsets, transOffset, pickradius <= 0,
-            self._offset_position)
+            offsets, offset_trf, pickradius <= 0)
 
         return len(ind) > 0, dict(ind=ind)
 
@@ -543,52 +543,18 @@ def set_offsets(self, offsets):
         ----------
         offsets : (N, 2) or (2,) array-like
         """
-        offsets = np.asanyarray(offsets, float)
+        offsets = np.asanyarray(offsets)
         if offsets.shape == (2,):  # Broadcast (2,) -> (1, 2) but nothing else.
             offsets = offsets[None, :]
-        # This decision is based on how they are initialized above in __init__.
-        if self._uniform_offsets is None:
-            self._offsets = offsets
-        else:
-            self._uniform_offsets = offsets
+        self._offsets = np.column_stack(
+            (np.asarray(self.convert_xunits(offsets[:, 0]), 'float'),
+             np.asarray(self.convert_yunits(offsets[:, 1]), 'float')))
         self.stale = True
 
     def get_offsets(self):
         """Return the offsets for the collection."""
-        # This decision is based on how they are initialized above in __init__.
-        if self._uniform_offsets is None:
-            return self._offsets
-        else:
-            return self._uniform_offsets
-
-    @_api.deprecated("3.3")
-    def set_offset_position(self, offset_position):
-        """
-        Set how offsets are applied.  If *offset_position* is 'screen'
-        (default) the offset is applied after the master transform has
-        been applied, that is, the offsets are in screen coordinates.
-        If offset_position is 'data', the offset is applied before the
-        master transform, i.e., the offsets are in data coordinates.
-
-        Parameters
-        ----------
-        offset_position : {'screen', 'data'}
-        """
-        _api.check_in_list(['screen', 'data'], offset_position=offset_position)
-        self._offset_position = offset_position
-        self.stale = True
-
-    @_api.deprecated("3.3")
-    def get_offset_position(self):
-        """
-        Return how offsets are applied for the collection.  If
-        *offset_position* is 'screen', the offset is applied after the
-        master transform has been applied, that is, the offsets are in
-        screen coordinates.  If offset_position is 'data', the offset
-        is applied before the master transform, i.e., the offsets are
-        in data coordinates.
-        """
-        return self._offset_position
+        # Default to zeros in the no-offset (None) case
+        return np.zeros((1, 2)) if self._offsets is None else self._offsets
 
     def _get_default_linewidth(self):
         # This may be overridden in a subclass.
@@ -661,7 +627,7 @@ def set_linestyle(self, ls):
         self._linewidths, self._linestyles = self._bcast_lwls(
             self._us_lw, self._us_linestyles)
 
-    @docstring.interpd
+    @_docstring.interpd
     def set_capstyle(self, cs):
         """
         Set the `.CapStyle` for the collection (for all its elements).
@@ -675,7 +641,7 @@ def set_capstyle(self, cs):
     def get_capstyle(self):
         return self._capstyle.name
 
-    @docstring.interpd
+    @_docstring.interpd
     def set_joinstyle(self, js):
         """
         Set the `.JoinStyle` for the collection (for all its elements).
@@ -721,7 +687,7 @@ def _bcast_lwls(linewidths, dashes):
             dashes = list(dashes) * (l_lw // gcd)
             linewidths = list(linewidths) * (l_dashes // gcd)
 
-        # scale the dash patters
+        # scale the dash patterns
         dashes = [mlines._scale_dashes(o, d, lw)
                   for (o, d), lw in zip(dashes, linewidths)]
 
@@ -851,7 +817,6 @@ def set_alpha(self, alpha):
             supported.
         """
         artist.Artist._set_alpha_for_array(self, alpha)
-        self._update_dict['array'] = True
         self._set_facecolor(self._original_facecolor)
         self._set_edgecolor(self._original_edgecolor)
 
@@ -907,7 +872,7 @@ def update_scalarmappable(self):
         if not self._set_mappable_flags():
             return
         # Allow possibility to call 'self.set_array(None)'.
-        if self._check_update("array") and self._A is not None:
+        if self._A is not None:
             # QuadMesh can map 2d arrays (but pcolormesh supplies 1d array)
             if self._A.ndim > 1 and not isinstance(self, QuadMesh):
                 raise ValueError('Collections can only map rank 1 arrays')
@@ -944,8 +909,11 @@ def update_from(self, other):
 
         artist.Artist.update_from(self, other)
         self._antialiaseds = other._antialiaseds
+        self._mapped_colors = other._mapped_colors
+        self._edge_is_mapped = other._edge_is_mapped
         self._original_edgecolor = other._original_edgecolor
         self._edgecolors = other._edgecolors
+        self._face_is_mapped = other._face_is_mapped
         self._original_facecolor = other._original_facecolor
         self._facecolors = other._facecolors
         self._linewidths = other._linewidths
@@ -958,7 +926,6 @@ def update_from(self, other):
         self._A = other._A
         self.norm = other.norm
         self.cmap = other.cmap
-        # do we need to copy self._update_dict? -JJL
         self.stale = True
 
 
@@ -1078,8 +1045,8 @@ def legend_elements(self, prop="colors", num="auto",
             Finally, a `~.ticker.Locator` can be provided.
         fmt : str, `~matplotlib.ticker.Formatter`, or None (default)
             The format or formatter to use for the labels. If a string must be
-            a valid input for a `~.StrMethodFormatter`. If None (the default),
-            use a `~.ScalarFormatter`.
+            a valid input for a `.StrMethodFormatter`. If None (the default),
+            use a `.ScalarFormatter`.
         func : function, default: ``lambda x: x``
             Function to calculate the labels.  Often the size (or color)
             argument to `~.Axes.scatter` will have been pre-processed by the
@@ -1127,7 +1094,9 @@ def legend_elements(self, prop="colors", num="auto",
             raise ValueError("Valid values for `prop` are 'colors' or "
                              f"'sizes'. You supplied '{prop}' instead.")
 
-        fmt.set_bounds(func(u).min(), func(u).max())
+        fu = func(u)
+        fmt.axis.set_view_interval(fu.min(), fu.max())
+        fmt.axis.set_data_interval(fu.min(), fu.max())
         if num == "auto":
             num = 9
             if len(u) <= num:
@@ -1157,9 +1126,9 @@ def legend_elements(self, prop="colors", num="auto",
             ix = np.argsort(xarr)
             values = np.interp(label_values, xarr[ix], yarr[ix])
 
-        kw = dict(markeredgewidth=self.get_linewidths()[0],
-                  alpha=self.get_alpha())
-        kw.update(kwargs)
+        kw = {"markeredgewidth": self.get_linewidths()[0],
+              "alpha": self.get_alpha(),
+              **kwargs}
 
         for val, lab in zip(values, label_values):
             if prop == "colors":
@@ -1180,6 +1149,8 @@ def legend_elements(self, prop="colors", num="auto",
 
 
 class PolyCollection(_CollectionWithSizes):
+
+    @_api.make_keyword_only("3.6", name="closed")
     def __init__(self, verts, sizes=None, closed=True, **kwargs):
         """
         Parameters
@@ -1243,11 +1214,7 @@ def set_verts(self, verts, closed=True):
         self._paths = []
         for xy in verts:
             if len(xy):
-                if isinstance(xy, np.ma.MaskedArray):
-                    xy = np.ma.concatenate([xy, xy[:1]])
-                else:
-                    xy = np.concatenate([xy, xy[:1]])
-                self._paths.append(mpath.Path(xy, closed=True))
+                self._paths.append(mpath.Path._create_closed(xy))
             else:
                 self._paths.append(mpath.Path(xy))
 
@@ -1258,12 +1225,8 @@ def set_verts_and_codes(self, verts, codes):
         if len(verts) != len(codes):
             raise ValueError("'codes' must be a 1D list or array "
                              "with the same length of 'verts'")
-        self._paths = []
-        for xy, cds in zip(verts, codes):
-            if len(xy):
-                self._paths.append(mpath.Path(xy, cds))
-            else:
-                self._paths.append(mpath.Path(xy))
+        self._paths = [mpath.Path(xy, cds) if len(xy) else mpath.Path(xy)
+                       for xy, cds in zip(verts, codes)]
         self.stale = True
 
 
@@ -1316,6 +1279,7 @@ class RegularPolyCollection(_CollectionWithSizes):
     _path_generator = mpath.Path.unit_regular_polygon
     _factor = np.pi ** (-1/2)
 
+    @_api.make_keyword_only("3.6", name="rotation")
     def __init__(self,
                  numsides,
                  rotation=0,
@@ -1347,7 +1311,7 @@ def __init__(self,
                 edgecolors=("black",),
                 linewidths=(1,),
                 offsets=offsets,
-                transOffset=ax.transData,
+                offset_transform=ax.transData,
                 )
         """
         super().__init__(**kwargs)
@@ -1390,7 +1354,7 @@ class LineCollection(Collection):
     Represents a sequence of `.Line2D`\s that should be drawn together.
 
     This class extends `.Collection` to represent a sequence of
-    `~.Line2D`\s instead of just a sequence of `~.Patch`\s.
+    `.Line2D`\s instead of just a sequence of `.Patch`\s.
     Just as in `.Collection`, each property of a *LineCollection* may be either
     a single value or a list of values. This list is then used cyclically for
     each element of the LineCollection, so the property of the ``i``\th element
@@ -1406,7 +1370,7 @@ class LineCollection(Collection):
     _edge_default = True
 
     def __init__(self, segments,  # Can be None.
-                 *args,           # Deprecated.
+                 *,
                  zorder=2,        # Collection.zorder is 1
                  **kwargs
                  ):
@@ -1442,18 +1406,6 @@ def __init__(self, segments,  # Can be None.
         **kwargs
             Forwarded to `.Collection`.
         """
-        argnames = ["linewidths", "colors", "antialiaseds", "linestyles",
-                    "offsets", "transOffset", "norm", "cmap", "pickradius",
-                    "zorder", "facecolors"]
-        if args:
-            argkw = {name: val for name, val in zip(argnames, args)}
-            kwargs.update(argkw)
-            cbook.warn_deprecated(
-                "3.4", message="Since %(since)s, passing LineCollection "
-                "arguments other than the first, 'segments', as positional "
-                "arguments is deprecated, and they will become keyword-only "
-                "arguments %(removal)s."
-                )
         # Unfortunately, mplot3d needs this explicit setting of 'facecolors'.
         kwargs.setdefault('facecolors', 'none')
         super().__init__(
@@ -1464,17 +1416,10 @@ def __init__(self, segments,  # Can be None.
     def set_segments(self, segments):
         if segments is None:
             return
-        _segments = []
 
-        for seg in segments:
-            if not isinstance(seg, np.ma.MaskedArray):
-                seg = np.asarray(seg, float)
-            _segments.append(seg)
-
-        if self._uniform_offsets is not None:
-            _segments = self._add_offsets(_segments)
-
-        self._paths = [mpath.Path(_seg) for _seg in _segments]
+        self._paths = [mpath.Path(seg) if isinstance(seg, np.ma.MaskedArray)
+                       else mpath.Path(np.asarray(seg, float))
+                       for seg in segments]
         self.stale = True
 
     set_verts = set_segments  # for compatibility with PolyCollection
@@ -1491,25 +1436,19 @@ def get_segments(self):
         segments = []
 
         for path in self._paths:
-            vertices = [vertex for vertex, _ in path.iter_segments()]
+            vertices = [
+                vertex
+                for vertex, _
+                # Never simplify here, we want to get the data-space values
+                # back and there in no way to know the "right" simplification
+                # threshold so never try.
+                in path.iter_segments(simplify=False)
+            ]
             vertices = np.asarray(vertices)
             segments.append(vertices)
 
         return segments
 
-    def _add_offsets(self, segs):
-        offsets = self._uniform_offsets
-        Nsegs = len(segs)
-        Noffs = offsets.shape[0]
-        if Noffs == 1:
-            for i in range(Nsegs):
-                segs[i] = segs[i] + i * offsets
-        else:
-            for i in range(Nsegs):
-                io = i % Noffs
-                segs[i] = segs[i] + offsets[io:io + 1]
-        return segs
-
     def _get_default_linewidth(self):
         return mpl.rcParams['lines.linewidth']
 
@@ -1553,6 +1492,7 @@ class EventCollection(LineCollection):
 
     _edge_default = True
 
+    @_api.make_keyword_only("3.6", name="lineoffset")
     def __init__(self,
                  positions,  # Cannot be None.
                  orientation='horizontal',
@@ -1664,7 +1604,7 @@ def switch_orientation(self):
         self._is_horizontal = not self.is_horizontal()
         self.stale = True
 
-    def set_orientation(self, orientation=None):
+    def set_orientation(self, orientation):
         """
         Set the orientation of the event line.
 
@@ -1672,24 +1612,9 @@ def set_orientation(self, orientation=None):
         ----------
         orientation : {'horizontal', 'vertical'}
         """
-        try:
-            is_horizontal = _api.check_getitem(
-                {"horizontal": True, "vertical": False},
-                orientation=orientation)
-        except ValueError:
-            if (orientation is None or orientation.lower() == "none"
-                    or orientation.lower() == "horizontal"):
-                is_horizontal = True
-            elif orientation.lower() == "vertical":
-                is_horizontal = False
-            else:
-                raise
-            normalized = "horizontal" if is_horizontal else "vertical"
-            _api.warn_deprecated(
-                "3.3", message="Support for setting the orientation of "
-                f"EventCollection to {orientation!r} is deprecated since "
-                f"%(since)s and will be removed %(removal)s; please set it to "
-                f"{normalized!r} instead.")
+        is_horizontal = _api.check_getitem(
+            {"horizontal": True, "vertical": False},
+            orientation=orientation)
         if is_horizontal == self.is_horizontal():
             return
         self.switch_orientation()
@@ -1763,6 +1688,7 @@ def __init__(self, sizes, **kwargs):
 class EllipseCollection(Collection):
     """A collection of ellipses, drawn using splines."""
 
+    @_api.make_keyword_only("3.6", name="units")
     def __init__(self, widths, heights, angles, units='points', **kwargs):
         """
         Parameters
@@ -1816,7 +1742,7 @@ def _set_transforms(self):
         elif self._units == 'dots':
             sc = 1.0
         else:
-            raise ValueError('unrecognized units: %s' % self._units)
+            raise ValueError(f'Unrecognized units: {self._units!r}')
 
         self._transforms = np.zeros((len(self._widths), 3, 3))
         widths = self._widths * sc
@@ -1845,29 +1771,35 @@ class PatchCollection(Collection):
     """
     A generic collection of patches.
 
-    This makes it easier to assign a colormap to a heterogeneous
+    PatchCollection draws faster than a large number of equivalent individual
+    Patches. It also makes it easier to assign a colormap to a heterogeneous
     collection of patches.
-
-    This also may improve plotting speed, since PatchCollection will
-    draw faster than a large number of patches.
     """
 
+    @_api.make_keyword_only("3.6", name="match_original")
     def __init__(self, patches, match_original=False, **kwargs):
         """
-        *patches*
-            a sequence of Patch objects.  This list may include
+        Parameters
+        ----------
+        patches : list of `.Patch`
+            A sequence of Patch objects.  This list may include
             a heterogeneous assortment of different patch types.
 
-        *match_original*
+        match_original : bool, default: False
             If True, use the colors and linewidths of the original
             patches.  If False, new colors may be assigned by
             providing the standard collection arguments, facecolor,
             edgecolor, linewidths, norm or cmap.
 
-        If any of *edgecolors*, *facecolors*, *linewidths*, *antialiaseds* are
-        None, they default to their `.rcParams` patch setting, in sequence
-        form.
+        **kwargs
+            All other parameters are forwarded to `.Collection`.
+
+            If any of *edgecolors*, *facecolors*, *linewidths*, *antialiaseds*
+            are None, they default to their `.rcParams` patch setting, in
+            sequence form.
 
+        Notes
+        -----
         The use of `~matplotlib.cm.ScalarMappable` functionality is optional.
         If the `~matplotlib.cm.ScalarMappable` matrix ``_A`` has been set (via
         a call to `~.ScalarMappable.set_array`), at draw time a call to scalar
@@ -1926,7 +1858,7 @@ def set_paths(self):
     @staticmethod
     def convert_mesh_to_paths(tri):
         """
-        Convert a given mesh into a sequence of `~.Path` objects.
+        Convert a given mesh into a sequence of `.Path` objects.
 
         This function is primarily of use to implementers of backends that do
         not directly support meshes.
@@ -1960,9 +1892,42 @@ def draw(self, renderer):
 
 
 class QuadMesh(Collection):
-    """
+    r"""
     Class for the efficient drawing of a quadrilateral mesh.
 
+    A quadrilateral mesh is a grid of M by N adjacent quadrilaterals that are
+    defined via a (M+1, N+1) grid of vertices. The quadrilateral (m, n) is
+    defined by the vertices ::
+
+               (m+1, n) ----------- (m+1, n+1)
+                  /                   /
+                 /                 /
+                /               /
+            (m, n) -------- (m, n+1)
+
+    The mesh need not be regular and the polygons need not be convex.
+
+    Parameters
+    ----------
+    coordinates : (M+1, N+1, 2) array-like
+        The vertices. ``coordinates[m, n]`` specifies the (x, y) coordinates
+        of vertex (m, n).
+
+    antialiased : bool, default: True
+
+    shading : {'flat', 'gouraud'}, default: 'flat'
+
+    Notes
+    -----
+    Unlike other `.Collection`\s, the default *pickradius* of `.QuadMesh` is 0,
+    i.e. `~.Artist.contains` checks whether the test point is within any of the
+    mesh quadrilaterals.
+
+    There exists a deprecated API version ``QuadMesh(M, N, coords)``, where
+    the dimensions are given explicitly and ``coords`` is a (M*N, 2)
+    array-like. This has been deprecated in Matplotlib 3.5. The following
+    describes the semantics of this deprecated API.
+
     A quadrilateral mesh consists of a grid of vertices.
     The dimensions of this array are (*meshWidth* + 1, *meshHeight* + 1).
     Each vertex in the mesh has a different set of "mesh coordinates"
@@ -1985,23 +1950,48 @@ class QuadMesh(Collection):
     For example, the first entry in *coordinates* is the coordinates of the
     vertex at mesh coordinates (0, 0), then the one at (0, 1), then at (0, 2)
     .. (0, meshWidth), (1, 0), (1, 1), and so on.
-
-    *shading* may be 'flat', or 'gouraud'
     """
-    def __init__(self, meshWidth, meshHeight, coordinates,
-                 antialiased=True, shading='flat', **kwargs):
-        super().__init__(**kwargs)
-        self._meshWidth = meshWidth
-        self._meshHeight = meshHeight
-        # By converting to floats now, we can avoid that on every draw.
-        self._coordinates = np.asarray(coordinates, float).reshape(
-            (meshHeight + 1, meshWidth + 1, 2))
+
+    def __init__(self, *args, **kwargs):
+        # signature deprecation since="3.5": Change to new signature after the
+        # deprecation has expired. Also remove setting __init__.__signature__,
+        # and remove the Notes from the docstring.
+        params = _api.select_matching_signature(
+            [
+                lambda meshWidth, meshHeight, coordinates, antialiased=True,
+                       shading='flat', **kwargs: locals(),
+                lambda coordinates, antialiased=True, shading='flat', **kwargs:
+                       locals()
+            ],
+            *args, **kwargs).values()
+        *old_w_h, coords, antialiased, shading, kwargs = params
+        if old_w_h:  # The old signature matched.
+            _api.warn_deprecated(
+                "3.5",
+                message="This usage of Quadmesh is deprecated: Parameters "
+                        "meshWidth and meshHeights will be removed; "
+                        "coordinates must be 2D; all parameters except "
+                        "coordinates will be keyword-only.")
+            w, h = old_w_h
+            coords = np.asarray(coords, np.float64).reshape((h + 1, w + 1, 2))
+        kwargs.setdefault("pickradius", 0)
+        # end of signature deprecation code
+
+        _api.check_shape((None, None, 2), coordinates=coords)
+        self._coordinates = coords
         self._antialiased = antialiased
         self._shading = shading
-
         self._bbox = transforms.Bbox.unit()
-        self._bbox.update_from_data_xy(coordinates.reshape(
-            ((meshWidth + 1) * (meshHeight + 1), 2)))
+        self._bbox.update_from_data_xy(self._coordinates.reshape(-1, 2))
+        # super init delayed after own init because array kwarg requires
+        # self._coordinates and self._shading
+        super().__init__(**kwargs)
+        self.set_mouseover(False)
+
+    # Only needed during signature deprecation
+    __init__.__signature__ = inspect.signature(
+        lambda self, coordinates, *,
+               antialiased=True, shading='flat', pickradius=0, **kwargs: None)
 
     def get_paths(self):
         if self._paths is None:
@@ -2009,17 +1999,79 @@ def get_paths(self):
         return self._paths
 
     def set_paths(self):
-        self._paths = self.convert_mesh_to_paths(
-            self._meshWidth, self._meshHeight, self._coordinates)
+        self._paths = self._convert_mesh_to_paths(self._coordinates)
         self.stale = True
 
+    def set_array(self, A):
+        """
+        Set the data values.
+
+        Parameters
+        ----------
+        A : (M, N) array-like or M*N array-like
+            If the values are provided as a 2D grid, the shape must match the
+            coordinates grid. If the values are 1D, they are reshaped to 2D.
+            M, N follow from the coordinates grid, where the coordinates grid
+            shape is (M, N) for 'gouraud' *shading* and (M+1, N+1) for 'flat'
+            shading.
+        """
+        height, width = self._coordinates.shape[0:-1]
+        misshapen_data = False
+        faulty_data = False
+
+        if self._shading == 'flat':
+            h, w = height-1, width-1
+        else:
+            h, w = height, width
+
+        if A is not None:
+            shape = np.shape(A)
+            if len(shape) == 1:
+                if shape[0] != (h*w):
+                    faulty_data = True
+            elif shape != (h, w):
+                if np.prod(shape) == (h * w):
+                    misshapen_data = True
+                else:
+                    faulty_data = True
+
+            if misshapen_data:
+                _api.warn_deprecated(
+                    "3.5", message=f"For X ({width}) and Y ({height}) "
+                    f"with {self._shading} shading, the expected shape of "
+                    f"A is ({h}, {w}). Passing A ({A.shape}) is deprecated "
+                    "since %(since)s and will become an error %(removal)s.")
+
+            if faulty_data:
+                raise TypeError(
+                    f"Dimensions of A {A.shape} are incompatible with "
+                    f"X ({width}) and/or Y ({height})")
+
+        return super().set_array(A)
+
     def get_datalim(self, transData):
         return (self.get_transform() - transData).transform_bbox(self._bbox)
 
+    def get_coordinates(self):
+        """
+        Return the vertices of the mesh as an (M+1, N+1, 2) array.
+
+        M, N are the number of quadrilaterals in the rows / columns of the
+        mesh, corresponding to (M+1, N+1) vertices.
+        The last dimension specifies the components (x, y).
+        """
+        return self._coordinates
+
     @staticmethod
+    @_api.deprecated("3.5", alternative="`QuadMesh(coordinates).get_paths()"
+                     "<.QuadMesh.get_paths>`")
     def convert_mesh_to_paths(meshWidth, meshHeight, coordinates):
+        return QuadMesh._convert_mesh_to_paths(coordinates)
+
+    @staticmethod
+    def _convert_mesh_to_paths(coordinates):
         """
-        Convert a given mesh into a sequence of `~.Path` objects.
+        Convert a given mesh into a sequence of `.Path` objects.
 
         This function is primarily of use to implementers of backends that do
         not directly support quadmeshes.
@@ -2028,20 +2080,23 @@ def convert_mesh_to_paths(meshWidth, meshHeight, coordinates):
             c = coordinates.data
         else:
             c = coordinates
-        points = np.concatenate((
-                    c[:-1, :-1],
-                    c[:-1, 1:],
-                    c[1:, 1:],
-                    c[1:, :-1],
-                    c[:-1, :-1]
-                ), axis=2)
-        points = points.reshape((meshWidth * meshHeight, 5, 2))
+        points = np.concatenate([
+            c[:-1, :-1],
+            c[:-1, 1:],
+            c[1:, 1:],
+            c[1:, :-1],
+            c[:-1, :-1]
+        ], axis=2).reshape((-1, 5, 2))
         return [mpath.Path(x) for x in points]
 
+    @_api.deprecated("3.5")
     def convert_mesh_to_triangles(self, meshWidth, meshHeight, coordinates):
+        return self._convert_mesh_to_triangles(coordinates)
+
+    def _convert_mesh_to_triangles(self, coordinates):
         """
         Convert a given mesh into a sequence of triangles, each point
-        with its own color.  This is useful for experiments using
+        with its own color.  The result can be used to construct a call to
         `~.RendererBase.draw_gouraud_triangle`.
         """
         if isinstance(coordinates, np.ma.MaskedArray):
@@ -2054,29 +2109,25 @@ def convert_mesh_to_triangles(self, meshWidth, meshHeight, coordinates):
         p_c = p[1:, 1:]
         p_d = p[1:, :-1]
         p_center = (p_a + p_b + p_c + p_d) / 4.0
-
-        triangles = np.concatenate((
-                p_a, p_b, p_center,
-                p_b, p_c, p_center,
-                p_c, p_d, p_center,
-                p_d, p_a, p_center,
-            ), axis=2)
-        triangles = triangles.reshape((meshWidth * meshHeight * 4, 3, 2))
-
-        c = self.get_facecolor().reshape((meshHeight + 1, meshWidth + 1, 4))
+        triangles = np.concatenate([
+            p_a, p_b, p_center,
+            p_b, p_c, p_center,
+            p_c, p_d, p_center,
+            p_d, p_a, p_center,
+        ], axis=2).reshape((-1, 3, 2))
+
+        c = self.get_facecolor().reshape((*coordinates.shape[:2], 4))
         c_a = c[:-1, :-1]
         c_b = c[:-1, 1:]
         c_c = c[1:, 1:]
         c_d = c[1:, :-1]
         c_center = (c_a + c_b + c_c + c_d) / 4.0
-
-        colors = np.concatenate((
-                        c_a, c_b, c_center,
-                        c_b, c_c, c_center,
-                        c_c, c_d, c_center,
-                        c_d, c_a, c_center,
-                    ), axis=2)
-        colors = colors.reshape((meshWidth * meshHeight * 4, 3, 4))
+        colors = np.concatenate([
+            c_a, c_b, c_center,
+            c_b, c_c, c_center,
+            c_c, c_d, c_center,
+            c_d, c_a, c_center,
+        ], axis=2).reshape((-1, 3, 4))
 
         return triangles, colors
 
@@ -2086,14 +2137,13 @@ def draw(self, renderer):
             return
         renderer.open_group(self.__class__.__name__, self.get_gid())
         transform = self.get_transform()
-        transOffset = self.get_offset_transform()
-        offsets = self._offsets
+        offset_trf = self.get_offset_transform()
+        offsets = self.get_offsets()
 
         if self.have_units():
-            if len(self._offsets):
-                xs = self.convert_xunits(self._offsets[:, 0])
-                ys = self.convert_yunits(self._offsets[:, 1])
-                offsets = np.column_stack([xs, ys])
+            xs = self.convert_xunits(offsets[:, 0])
+            ys = self.convert_yunits(offsets[:, 1])
+            offsets = np.column_stack([xs, ys])
 
         self.update_scalarmappable()
 
@@ -2105,9 +2155,9 @@ def draw(self, renderer):
         else:
             coordinates = self._coordinates
 
-        if not transOffset.is_affine:
-            offsets = transOffset.transform_non_affine(offsets)
-            transOffset = transOffset.get_affine()
+        if not offset_trf.is_affine:
+            offsets = offset_trf.transform_non_affine(offsets)
+            offset_trf = offset_trf.get_affine()
 
         gc = renderer.new_gc()
         gc.set_snap(self.get_snap())
@@ -2115,14 +2165,14 @@ def draw(self, renderer):
         gc.set_linewidth(self.get_linewidth()[0])
 
         if self._shading == 'gouraud':
-            triangles, colors = self.convert_mesh_to_triangles(
-                self._meshWidth, self._meshHeight, coordinates)
+            triangles, colors = self._convert_mesh_to_triangles(coordinates)
             renderer.draw_gouraud_triangles(
                 gc, triangles, colors, transform.frozen())
         else:
             renderer.draw_quad_mesh(
-                gc, transform.frozen(), self._meshWidth, self._meshHeight,
-                coordinates, offsets, transOffset,
+                gc, transform.frozen(),
+                coordinates.shape[1] - 1, coordinates.shape[0] - 1,
+                coordinates, offsets, offset_trf,
                 # Backends expect flattened rgba arrays (n*m, 4) for fc and ec
                 self.get_facecolor().reshape((-1, 4)),
                 self._antialiased, self.get_edgecolors().reshape((-1, 4)))
@@ -2130,11 +2180,8 @@ def draw(self, renderer):
         renderer.close_group(self.__class__.__name__)
         self.stale = False
 
-
-_artist_kwdoc = artist.kwdoc(Collection)
-for k in ('QuadMesh', 'TriMesh', 'PolyCollection', 'BrokenBarHCollection',
-          'RegularPolyCollection', 'PathCollection',
-          'StarPolygonCollection', 'PatchCollection',
-          'CircleCollection', 'Collection',):
-    docstring.interpd.update({f'{k}_kwdoc': _artist_kwdoc})
-docstring.interpd.update(LineCollection_kwdoc=artist.kwdoc(LineCollection))
+    def get_cursor_data(self, event):
+        contained, info = self.contains(event)
+        if contained and self.get_array() is not None:
+            return self.get_array().ravel()[info["ind"]]
+        return None
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
index 31d9b6176821..2983e3fa51ce 100644
--- a/lib/matplotlib/colorbar.py
+++ b/lib/matplotlib/colorbar.py
@@ -4,48 +4,31 @@
 
 .. note::
    Colorbars are typically created through `.Figure.colorbar` or its pyplot
-   wrapper `.pyplot.colorbar`, which use `.make_axes` and `.Colorbar`
-   internally.
+   wrapper `.pyplot.colorbar`, which internally use `.Colorbar` together with
+   `.make_axes_gridspec` (for `.GridSpec`-positioned axes) or `.make_axes` (for
+   non-`.GridSpec`-positioned axes).
 
-   As an end-user, you most likely won't have to call the methods or
-   instantiate the classes in this module explicitly.
-
-:class:`ColorbarBase`
-    The base class with full colorbar drawing functionality.
-    It can be used as-is to make a colorbar for a given colormap;
-    a mappable object (e.g., image) is not needed.
-
-:class:`Colorbar`
-    On top of `.ColorbarBase` this connects the colorbar with a
-    `.ScalarMappable` such as an image or contour plot.
-
-:func:`make_axes`
-    Create an `~.axes.Axes` suitable for a colorbar. This functions can be
-    used with figures containing a single axes or with freely placed axes.
-
-:func:`make_axes_gridspec`
-    Create a `~.SubplotBase` suitable for a colorbar. This function should
-    be used for adding a colorbar to a `.GridSpec`.
+   End-users most likely won't need to directly use this module's API.
 """
 
-import copy
 import logging
-import textwrap
 
 import numpy as np
 
 import matplotlib as mpl
-from matplotlib import _api, collections, cm, colors, contour, ticker
+from matplotlib import _api, cbook, collections, cm, colors, contour, ticker
 import matplotlib.artist as martist
 import matplotlib.patches as mpatches
 import matplotlib.path as mpath
+import matplotlib.scale as mscale
 import matplotlib.spines as mspines
 import matplotlib.transforms as mtransforms
-from matplotlib import docstring
+from matplotlib import _docstring
 
 _log = logging.getLogger(__name__)
 
-_make_axes_param_doc = """
+_docstring.interpd.update(
+    _make_axes_kw_doc="""
 location : None or {'left', 'right', 'top', 'bottom'}
     The location, relative to the parent axes, where the colorbar axes
     is created.  It also determines the *orientation* of the colorbar
@@ -53,271 +36,96 @@
     and bottom are horizontal).  If None, the location will come from the
     *orientation* if it is set (vertical colorbars on the right, horizontal
     ones at the bottom), or default to 'right' if *orientation* is unset.
+
 orientation : None or {'vertical', 'horizontal'}
     The orientation of the colorbar.  It is preferable to set the *location*
     of the colorbar, as that also determines the *orientation*; passing
     incompatible values for *location* and *orientation* raises an exception.
+
 fraction : float, default: 0.15
     Fraction of original axes to use for colorbar.
+
 shrink : float, default: 1.0
     Fraction by which to multiply the size of the colorbar.
+
 aspect : float, default: 20
     Ratio of long to short dimensions.
-"""
-_make_axes_other_param_doc = """
+
 pad : float, default: 0.05 if vertical, 0.15 if horizontal
     Fraction of original axes between colorbar and new image axes.
+
 anchor : (float, float), optional
     The anchor point of the colorbar axes.
     Defaults to (0.0, 0.5) if vertical; (0.5, 1.0) if horizontal.
+
 panchor : (float, float), or *False*, optional
     The anchor point of the colorbar parent axes. If *False*, the parent
     axes' anchor will be unchanged.
-    Defaults to (1.0, 0.5) if vertical; (0.5, 0.0) if horizontal.
-"""
-
-_colormap_kw_doc = """
-
-    ============  ====================================================
-    Property      Description
-    ============  ====================================================
-    *extend*      {'neither', 'both', 'min', 'max'}
-                  If not 'neither', make pointed end(s) for out-of-
-                  range values.  These are set for a given colormap
-                  using the colormap set_under and set_over methods.
-    *extendfrac*  {*None*, 'auto', length, lengths}
-                  If set to *None*, both the minimum and maximum
-                  triangular colorbar extensions with have a length of
-                  5% of the interior colorbar length (this is the
-                  default setting). If set to 'auto', makes the
-                  triangular colorbar extensions the same lengths as
-                  the interior boxes (when *spacing* is set to
-                  'uniform') or the same lengths as the respective
-                  adjacent interior boxes (when *spacing* is set to
-                  'proportional'). If a scalar, indicates the length
-                  of both the minimum and maximum triangular colorbar
-                  extensions as a fraction of the interior colorbar
-                  length. A two-element sequence of fractions may also
-                  be given, indicating the lengths of the minimum and
-                  maximum colorbar extensions respectively as a
-                  fraction of the interior colorbar length.
-    *extendrect*  bool
-                  If *False* the minimum and maximum colorbar extensions
-                  will be triangular (the default). If *True* the
-                  extensions will be rectangular.
-    *spacing*     {'uniform', 'proportional'}
-                  Uniform spacing gives each discrete color the same
-                  space; proportional makes the space proportional to
-                  the data interval.
-    *ticks*       *None* or list of ticks or Locator
-                  If None, ticks are determined automatically from the
-                  input.
-    *format*      None or str or Formatter
-                  If None, `~.ticker.ScalarFormatter` is used.
-                  If a format string is given, e.g., '%.3f', that is used.
-                  An alternative `~.ticker.Formatter` may be given instead.
-    *drawedges*   bool
-                  Whether to draw lines at color boundaries.
-    *label*       str
-                  The label on the colorbar's long axis.
-    ============  ====================================================
-
-    The following will probably be useful only in the context of
-    indexed colors (that is, when the mappable has norm=NoNorm()),
-    or other unusual circumstances.
-
-    ============   ===================================================
-    Property       Description
-    ============   ===================================================
-    *boundaries*   None or a sequence
-    *values*       None or a sequence which must be of length 1 less
-                   than the sequence of *boundaries*. For each region
-                   delimited by adjacent entries in *boundaries*, the
-                   colormapped to the corresponding value in values
-                   will be used.
-    ============   ===================================================
-
-"""
-
-docstring.interpd.update(colorbar_doc="""
-Add a colorbar to a plot.
-
-Parameters
-----------
-mappable
-    The `matplotlib.cm.ScalarMappable` (i.e., `~matplotlib.image.AxesImage`,
-    `~matplotlib.contour.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. ::
-
-        fig.colorbar(cm.ScalarMappable(norm=norm, cmap=cmap), ax=ax)
-
-cax : `~matplotlib.axes.Axes`, optional
-    Axes into which the colorbar will be drawn.
-
-ax : `~matplotlib.axes.Axes`, list of Axes, optional
-    One or more parent axes from which space for a new colorbar axes will be
-    stolen, if *cax* is None.  This has no effect if *cax* is set.
-
-use_gridspec : bool, optional
-    If *cax* is ``None``, a new *cax* is created as an instance of Axes.  If
-    *ax* is an instance of Subplot and *use_gridspec* is ``True``, *cax* is
-    created as an instance of Subplot using the :mod:`~.gridspec` module.
-
-Returns
--------
-colorbar : `~matplotlib.colorbar.Colorbar`
-    See also its base class, `~matplotlib.colorbar.ColorbarBase`.
-
-Notes
------
-Additional keyword arguments are of two kinds:
-
-  axes properties:
-%s
-%s
-  colorbar properties:
-%s
-
-If *mappable* is a `~.contour.ContourSet`, its *extend* kwarg is included
-automatically.
-
-The *shrink* kwarg provides a simple way to scale the colorbar with respect
-to the axes. Note that if *cax* is specified, it determines the size of the
-colorbar and *shrink* and *aspect* kwargs are ignored.
-
-For more precise control, you can manually specify the positions of
-the axes objects in which the mappable and the colorbar are drawn.  In
-this case, do not use any of the axes properties kwargs.
-
-It is known that some vector graphics viewers (svg and pdf) renders white gaps
-between segments of the colorbar.  This is due to bugs in the viewers, not
-Matplotlib.  As a workaround, the colorbar can be rendered with overlapping
-segments::
-
-    cbar = colorbar()
-    cbar.solids.set_edgecolor("face")
-    draw()
-
-However this has negative consequences in other circumstances, e.g. with
-semi-transparent images (alpha < 1) and colorbar extensions; therefore, this
-workaround is not used by default (see issue #1188).
-""" % (textwrap.indent(_make_axes_param_doc, "    "),
-       textwrap.indent(_make_axes_other_param_doc, "    "),
-       _colormap_kw_doc))
-
-# Deprecated since 3.4.
-colorbar_doc = docstring.interpd.params["colorbar_doc"]
-colormap_kw_doc = _colormap_kw_doc
-make_axes_kw_doc = _make_axes_param_doc + _make_axes_other_param_doc
-
-
-def _set_ticks_on_axis_warn(*args, **kw):
+    Defaults to (1.0, 0.5) if vertical; (0.5, 0.0) if horizontal.""",
+    _colormap_kw_doc="""
+extend : {'neither', 'both', 'min', 'max'}
+    Make pointed end(s) for out-of-range values (unless 'neither').  These are
+    set for a given colormap using the colormap set_under and set_over methods.
+
+extendfrac : {*None*, 'auto', length, lengths}
+    If set to *None*, both the minimum and maximum triangular colorbar
+    extensions will have a length of 5% of the interior colorbar length (this
+    is the default setting).
+
+    If set to 'auto', makes the triangular colorbar extensions the same lengths
+    as the interior boxes (when *spacing* is set to 'uniform') or the same
+    lengths as the respective adjacent interior boxes (when *spacing* is set to
+    'proportional').
+
+    If a scalar, indicates the length of both the minimum and maximum
+    triangular colorbar extensions as a fraction of the interior colorbar
+    length.  A two-element sequence of fractions may also be given, indicating
+    the lengths of the minimum and maximum colorbar extensions respectively as
+    a fraction of the interior colorbar length.
+
+extendrect : bool
+    If *False* the minimum and maximum colorbar extensions will be triangular
+    (the default).  If *True* the extensions will be rectangular.
+
+spacing : {'uniform', 'proportional'}
+    For discrete colorbars (`.BoundaryNorm` or contours), 'uniform' gives each
+    color the same space; 'proportional' makes the space proportional to the
+    data interval.
+
+ticks : None or list of ticks or Locator
+    If None, ticks are determined automatically from the input.
+
+format : None or str or Formatter
+    If None, `~.ticker.ScalarFormatter` is used.
+    Format strings, e.g., ``"%4.2e"`` or ``"{x:.2e}"``, are supported.
+    An alternative `~.ticker.Formatter` may be given instead.
+
+drawedges : bool
+    Whether to draw lines at color boundaries.
+
+label : str
+    The label on the colorbar's long axis.
+
+boundaries, values : None or a sequence
+    If unset, the colormap will be displayed on a 0-1 scale.
+    If sequences, *values* must have a length 1 less than *boundaries*.  For
+    each region delimited by adjacent entries in *boundaries*, the color mapped
+    to the corresponding value in values will be used.
+    Normally only useful for indexed colors (i.e. ``norm=NoNorm()``) or other
+    unusual circumstances.""")
+
+
+def _set_ticks_on_axis_warn(*args, **kwargs):
     # a top level function which gets put in at the axes'
-    # set_xticks and set_yticks by ColorbarBase.__init__.
+    # set_xticks and set_yticks by Colorbar.__init__.
     _api.warn_external("Use the colorbar set_ticks() method instead.")
 
 
-class _ColorbarAutoLocator(ticker.MaxNLocator):
-    """
-    AutoLocator for Colorbar
-
-    This locator is just a `.MaxNLocator` except the min and max are
-    clipped by the norm's min and max (i.e. vmin/vmax from the
-    image/pcolor/contour object).  This is necessary so ticks don't
-    extrude into the "extend regions".
-    """
-
-    def __init__(self, colorbar):
-        """
-        This ticker needs to know the *colorbar* so that it can access
-        its *vmin* and *vmax*.  Otherwise it is the same as
-        `~.ticker.AutoLocator`.
-        """
-
-        self._colorbar = colorbar
-        nbins = 'auto'
-        steps = [1, 2, 2.5, 5, 10]
-        super().__init__(nbins=nbins, steps=steps)
-
-    def tick_values(self, vmin, vmax):
-        # flip if needed:
-        if vmin > vmax:
-            vmin, vmax = vmax, vmin
-        vmin = max(vmin, self._colorbar.norm.vmin)
-        vmax = min(vmax, self._colorbar.norm.vmax)
-        ticks = super().tick_values(vmin, vmax)
-        rtol = (vmax - vmin) * 1e-10
-        return ticks[(ticks >= vmin - rtol) & (ticks <= vmax + rtol)]
-
-
-class _ColorbarAutoMinorLocator(ticker.AutoMinorLocator):
-    """
-    AutoMinorLocator for Colorbar
-
-    This locator is just a `.AutoMinorLocator` except the min and max are
-    clipped by the norm's min and max (i.e. vmin/vmax from the
-    image/pcolor/contour object).  This is necessary so that the minorticks
-    don't extrude into the "extend regions".
-    """
-
-    def __init__(self, colorbar, n=None):
-        """
-        This ticker needs to know the *colorbar* so that it can access
-        its *vmin* and *vmax*.
-        """
-        self._colorbar = colorbar
-        self.ndivs = n
-        super().__init__(n=None)
-
-    def __call__(self):
-        vmin = self._colorbar.norm.vmin
-        vmax = self._colorbar.norm.vmax
-        ticks = super().__call__()
-        rtol = (vmax - vmin) * 1e-10
-        return ticks[(ticks >= vmin - rtol) & (ticks <= vmax + rtol)]
-
-
-class _ColorbarLogLocator(ticker.LogLocator):
-    """
-    LogLocator for Colorbarbar
-
-    This locator is just a `.LogLocator` except the min and max are
-    clipped by the norm's min and max (i.e. vmin/vmax from the
-    image/pcolor/contour object).  This is necessary so ticks don't
-    extrude into the "extend regions".
-
-    """
-    def __init__(self, colorbar, *args, **kwargs):
-        """
-        This ticker needs to know the *colorbar* so that it can access
-        its *vmin* and *vmax*.  Otherwise it is the same as
-        `~.ticker.LogLocator`.  The ``*args`` and ``**kwargs`` are the
-        same as `~.ticker.LogLocator`.
-        """
-        self._colorbar = colorbar
-        super().__init__(*args, **kwargs)
-
-    def tick_values(self, vmin, vmax):
-        if vmin > vmax:
-            vmin, vmax = vmax, vmin
-        vmin = max(vmin, self._colorbar.norm.vmin)
-        vmax = min(vmax, self._colorbar.norm.vmax)
-        ticks = super().tick_values(vmin, vmax)
-        rtol = (np.log10(vmax) - np.log10(vmin)) * 1e-10
-        ticks = ticks[(np.log10(ticks) >= np.log10(vmin) - rtol) &
-                      (np.log10(ticks) <= np.log10(vmax) + rtol)]
-        return ticks
-
-
 class _ColorbarSpine(mspines.Spine):
     def __init__(self, axes):
-        super().__init__(axes, 'colorbar',
-                         mpath.Path(np.empty((0, 2)), closed=True))
+        self._ax = axes
+        super().__init__(axes, 'colorbar', mpath.Path(np.empty((0, 2))))
+        mpatches.Patch.set_transform(self, axes.transAxes)
 
     def get_window_extent(self, renderer=None):
         # This Spine has no Axis associated with it, and doesn't need to adjust
@@ -327,6 +135,7 @@ def get_window_extent(self, renderer=None):
 
     def set_xy(self, xy):
         self._path = mpath.Path(xy, closed=True)
+        self._xy = xy
         self.stale = True
 
     def draw(self, renderer):
@@ -335,30 +144,71 @@ def draw(self, renderer):
         return ret
 
 
-class ColorbarBase:
+class _ColorbarAxesLocator:
+    """
+    Shrink the axes if there are triangular or rectangular extends.
+    """
+    def __init__(self, cbar):
+        self._cbar = cbar
+        self._orig_locator = cbar.ax._axes_locator
+
+    def __call__(self, ax, renderer):
+        if self._orig_locator is not None:
+            pos = self._orig_locator(ax, renderer)
+        else:
+            pos = ax.get_position(original=True)
+        if self._cbar.extend == 'neither':
+            return pos
+
+        y, extendlen = self._cbar._proportional_y()
+        if not self._cbar._extend_lower():
+            extendlen[0] = 0
+        if not self._cbar._extend_upper():
+            extendlen[1] = 0
+        len = sum(extendlen) + 1
+        shrink = 1 / len
+        offset = extendlen[0] / len
+        # we need to reset the aspect ratio of the axes to account
+        # of the extends...
+        if hasattr(ax, '_colorbar_info'):
+            aspect = ax._colorbar_info['aspect']
+        else:
+            aspect = False
+        # now shrink and/or offset to take into account the
+        # extend tri/rectangles.
+        if self._cbar.orientation == 'vertical':
+            if aspect:
+                self._cbar.ax.set_box_aspect(aspect*shrink)
+            pos = pos.shrunk(1, shrink).translated(0, offset * pos.height)
+        else:
+            if aspect:
+                self._cbar.ax.set_box_aspect(1/(aspect * shrink))
+            pos = pos.shrunk(shrink, 1).translated(offset * pos.width, 0)
+        return pos
+
+    def get_subplotspec(self):
+        # make tight_layout happy..
+        ss = getattr(self._cbar.ax, 'get_subplotspec', None)
+        if ss is None:
+            if not hasattr(self._orig_locator, "get_subplotspec"):
+                return None
+            ss = self._orig_locator.get_subplotspec
+        return ss()
+
+
+@_docstring.interpd
+class Colorbar:
     r"""
     Draw a colorbar in an existing axes.
 
-    There are only some rare cases in which you would work directly with a
-    `.ColorbarBase` as an end-user. Typically, colorbars are used
-    with `.ScalarMappable`\s such as an `.AxesImage` generated via
-    `~.axes.Axes.imshow`. For these cases you will use `.Colorbar` and
-    likely create it via `.pyplot.colorbar` or `.Figure.colorbar`.
-
-    The main application of using a `.ColorbarBase` explicitly is drawing
-    colorbars that are not associated with other elements in the figure, e.g.
-    when showing a colormap by itself.
-
-    If the *cmap* kwarg is given but *boundaries* and *values* are left as
-    None, then the colormap will be displayed on a 0-1 scale. To show the
-    under- and over-value colors, specify the *norm* as::
+    Typically, colorbars are created using `.Figure.colorbar` or
+    `.pyplot.colorbar` and associated with `.ScalarMappable`\s (such as an
+    `.AxesImage` generated via `~.axes.Axes.imshow`).
 
-        norm=colors.Normalize(clip=False)
-
-    To show the colors versus index instead of on the 0-1 scale,
-    use::
-
-        norm=colors.NoNorm()
+    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*
+    to `Colorbar`.
 
     Useful public methods are :meth:`set_label` and :meth:`add_lines`.
 
@@ -375,44 +225,44 @@ class ColorbarBase:
     ----------
     ax : `~matplotlib.axes.Axes`
         The `~.axes.Axes` instance in which the colorbar is drawn.
-    cmap : `~matplotlib.colors.Colormap`, default: :rc:`image.cmap`
-        The colormap to use.
-    norm : `~matplotlib.colors.Normalize`
 
-    alpha : float
-        The colorbar transparency between 0 (transparent) and 1 (opaque).
+    mappable : `.ScalarMappable`
+        The mappable whose colormap and norm will be used.
 
-    values
+        To show the under- and over- value colors, the mappable's norm should
+        be specified as ::
 
-    boundaries
+            norm = colors.Normalize(clip=False)
 
-    orientation : {'vertical', 'horizontal'}
+        To show the colors versus index instead of on a 0-1 scale, use::
 
-    ticklocation : {'auto', 'left', 'right', 'top', 'bottom'}
+            norm=colors.NoNorm()
 
-    extend : {'neither', 'both', 'min', 'max'}
+    cmap : `~matplotlib.colors.Colormap`, default: :rc:`image.cmap`
+        The colormap to use.  This parameter is ignored, unless *mappable* is
+        None.
 
-    spacing : {'uniform', 'proportional'}
+    norm : `~matplotlib.colors.Normalize`
+        The normalization to use.  This parameter is ignored, unless *mappable*
+        is None.
+
+    alpha : float
+        The colorbar transparency between 0 (transparent) and 1 (opaque).
 
-    ticks : `~matplotlib.ticker.Locator` or array-like of float
+    orientation : {'vertical', 'horizontal'}
 
-    format : str or `~matplotlib.ticker.Formatter`
+    ticklocation : {'auto', 'left', 'right', 'top', 'bottom'}
 
     drawedges : bool
 
     filled : bool
-
-    extendfrac
-
-    extendrec
-
-    label : str
+    %(_colormap_kw_doc)s
     """
 
     n_rasterize = 50  # rasterize solids if number of colors >= n_rasterize
 
-    @_api.make_keyword_only("3.3", "cmap")
-    def __init__(self, ax, cmap=None,
+    @_api.delete_parameter("3.6", "filled")
+    def __init__(self, ax, mappable=None, *, cmap=None,
                  norm=None,
                  alpha=None,
                  values=None,
@@ -429,7 +279,35 @@ def __init__(self, ax, cmap=None,
                  extendrect=False,
                  label='',
                  ):
-        _api.check_isinstance([colors.Colormap, None], cmap=cmap)
+
+        if mappable is None:
+            mappable = cm.ScalarMappable(norm=norm, cmap=cmap)
+
+        # Ensure the given mappable's norm has appropriate vmin and vmax
+        # set even if mappable.draw has not yet been called.
+        if mappable.get_array() is not None:
+            mappable.autoscale_None()
+
+        self.mappable = mappable
+        cmap = mappable.cmap
+        norm = mappable.norm
+
+        if isinstance(mappable, contour.ContourSet):
+            cs = mappable
+            alpha = cs.get_alpha()
+            boundaries = cs._levels
+            values = cs.cvalues
+            extend = cs.extend
+            filled = cs.filled
+            if ticks is None:
+                ticks = ticker.FixedLocator(cs.levels, nbins=10)
+        elif isinstance(mappable, martist.Artist):
+            alpha = mappable.get_alpha()
+
+        mappable.colorbar = self
+        mappable.colorbar_cid = mappable.callbacks.connect(
+            'changed', self.update_normal)
+
         _api.check_in_list(
             ['vertical', 'horizontal'], orientation=orientation)
         _api.check_in_list(
@@ -439,20 +317,19 @@ def __init__(self, ax, cmap=None,
             ['uniform', 'proportional'], spacing=spacing)
 
         self.ax = ax
-        # Bind some methods to the axes to warn users against using them.
-        ax.set_xticks = ax.set_yticks = _set_ticks_on_axis_warn
-        ax.set(navigate=False)
-
-        if cmap is None:
-            cmap = cm.get_cmap()
-        if norm is None:
-            norm = colors.Normalize()
+        self.ax._axes_locator = _ColorbarAxesLocator(self)
+
         if extend is None:
-            if hasattr(norm, 'extend'):
+            if (not isinstance(mappable, contour.ContourSet)
+                    and getattr(cmap, 'colorbar_extend', False) is not False):
+                extend = cmap.colorbar_extend
+            elif hasattr(norm, 'extend'):
                 extend = norm.extend
             else:
                 extend = 'neither'
-        self.alpha = alpha
+        self.alpha = None
+        # Call set_alpha to handle array-like alphas properly
+        self.set_alpha(alpha)
         self.cmap = cmap
         self.norm = norm
         self.values = values
@@ -465,31 +342,34 @@ def __init__(self, ax, cmap=None,
         self.spacing = spacing
         self.orientation = orientation
         self.drawedges = drawedges
-        self.filled = filled
+        self._filled = filled
         self.extendfrac = extendfrac
         self.extendrect = extendrect
+        self._extend_patches = []
         self.solids = None
         self.solids_patches = []
         self.lines = []
 
-        for spine in ax.spines.values():
+        for spine in self.ax.spines.values():
             spine.set_visible(False)
-        self.outline = ax.spines['outline'] = _ColorbarSpine(ax)
-
-        self.patch = mpatches.Polygon(
+        self.outline = self.ax.spines['outline'] = _ColorbarSpine(self.ax)
+        # Only kept for backcompat; remove after deprecation of .patch elapses.
+        self._patch = mpatches.Polygon(
             np.empty((0, 2)),
             color=mpl.rcParams['axes.facecolor'], linewidth=0.01, zorder=-1)
-        ax.add_artist(self.patch)
+        ax.add_artist(self._patch)
 
         self.dividers = collections.LineCollection(
             [],
             colors=[mpl.rcParams['axes.edgecolor']],
-            linewidths=[0.5 * mpl.rcParams['axes.linewidth']])
+            linewidths=[0.5 * mpl.rcParams['axes.linewidth']],
+            clip_on=False)
         self.ax.add_collection(self.dividers)
 
-        self.locator = None
-        self.formatter = None
-        self._manual_tick_data_values = None
+        self._locator = None
+        self._minorlocator = None
+        self._formatter = None
+        self._minorformatter = None
         self.__scale = None  # linear, log10 for now.  Hopefully more?
 
         if ticklocation == 'auto':
@@ -500,277 +380,184 @@ def __init__(self, ax, cmap=None,
         self._reset_locator_formatter_scale()
 
         if np.iterable(ticks):
-            self.locator = ticker.FixedLocator(ticks, nbins=len(ticks))
+            self._locator = ticker.FixedLocator(ticks, nbins=len(ticks))
         else:
-            self.locator = ticks    # Handle default in _ticker()
+            self._locator = ticks
 
         if isinstance(format, str):
-            self.formatter = ticker.FormatStrFormatter(format)
-        else:
-            self.formatter = format  # Assume it is a Formatter or None
-        self.draw_all()
-
-    def _extend_lower(self):
-        """Return whether the lower limit is open ended."""
-        return self.extend in ('both', 'min')
-
-    def _extend_upper(self):
-        """Return whether the upper limit is open ended."""
-        return self.extend in ('both', 'max')
-
-    def draw_all(self):
-        """
-        Calculate any free parameters based on the current cmap and norm,
-        and do all the drawing.
-        """
-        self._config_axis()  # Inline it after deprecation elapses.
-        # Set self._boundaries and self._values, including extensions.
-        self._process_values()
-        # Set self.vmin and self.vmax to first and last boundary, excluding
-        # extensions.
-        self.vmin, self.vmax = self._boundaries[self._inside][[0, -1]]
-        # Compute the X/Y mesh.
-        X, Y = self._mesh()
-        # Extract bounding polygon (the last entry's value (X[0, 1]) doesn't
-        # matter, it just matches the CLOSEPOLY code).
-        x = np.concatenate([X[[0, 1, -2, -1], 0], X[[-1, -2, 1, 0, 0], 1]])
-        y = np.concatenate([Y[[0, 1, -2, -1], 0], Y[[-1, -2, 1, 0, 0], 1]])
-        xy = np.column_stack([x, y])
-        # Configure axes limits, patch, and outline.
-        xmin, ymin = xy.min(axis=0)
-        xmax, ymax = xy.max(axis=0)
-        self.ax.set(xlim=(xmin, xmax), ylim=(ymin, ymax))
-        self.outline.set_xy(xy)
-        self.patch.set_xy(xy)
-        self.update_ticks()
-        if self.filled:
-            self._add_solids(X, Y, self._values[:, np.newaxis])
-
-    @_api.deprecated("3.3")
-    def config_axis(self):
-        self._config_axis()
-
-    def _config_axis(self):
-        """Set up long and short axis."""
-        ax = self.ax
-        if self.orientation == 'vertical':
-            long_axis, short_axis = ax.yaxis, ax.xaxis
-            if mpl.rcParams['ytick.minor.visible']:
-                self.minorticks_on()
-        else:
-            long_axis, short_axis = ax.xaxis, ax.yaxis
-            if mpl.rcParams['xtick.minor.visible']:
-                self.minorticks_on()
-        long_axis.set(label_position=self.ticklocation,
-                      ticks_position=self.ticklocation)
-        short_axis.set_ticks([])
-        short_axis.set_ticks([], minor=True)
-        self.stale = True
-
-    def _get_ticker_locator_formatter(self):
-        """
-        Return the ``locator`` and ``formatter`` of the colorbar.
-
-        If they have not been defined (i.e. are *None*), suitable formatter
-        and locator instances will be created, attached to the respective
-        attributes and returned.
-        """
-        locator = self.locator
-        formatter = self.formatter
-        if locator is None:
-            if self.boundaries is None:
-                if isinstance(self.norm, colors.NoNorm):
-                    nv = len(self._values)
-                    base = 1 + int(nv / 10)
-                    locator = ticker.IndexLocator(base=base, offset=0)
-                elif isinstance(self.norm, colors.BoundaryNorm):
-                    b = self.norm.boundaries
-                    locator = ticker.FixedLocator(b, nbins=10)
-                elif isinstance(self.norm, colors.LogNorm):
-                    locator = _ColorbarLogLocator(self)
-                elif isinstance(self.norm, colors.SymLogNorm):
-                    # The subs setting here should be replaced
-                    # by logic in the locator.
-                    locator = ticker.SymmetricalLogLocator(
-                                      subs=np.arange(1, 10),
-                                      linthresh=self.norm.linthresh,
-                                      base=10)
-                else:
-                    if mpl.rcParams['_internal.classic_mode']:
-                        locator = ticker.MaxNLocator()
-                    else:
-                        locator = _ColorbarAutoLocator(self)
-            else:
-                b = self._boundaries[self._inside]
-                locator = ticker.FixedLocator(b, nbins=10)
-
-        if formatter is None:
-            if isinstance(self.norm, colors.LogNorm):
-                formatter = ticker.LogFormatterSciNotation()
-            elif isinstance(self.norm, colors.SymLogNorm):
-                formatter = ticker.LogFormatterSciNotation(
-                                        linthresh=self.norm.linthresh)
-            else:
-                formatter = ticker.ScalarFormatter()
+            # Check format between FormatStrFormatter and StrMethodFormatter
+            try:
+                self._formatter = ticker.FormatStrFormatter(format)
+                _ = self._formatter(0)
+            except TypeError:
+                self._formatter = ticker.StrMethodFormatter(format)
         else:
-            formatter = self.formatter
-
-        self.locator = locator
-        self.formatter = formatter
-        _log.debug('locator: %r', locator)
-        return locator, formatter
-
-    def _use_auto_colorbar_locator(self):
-        """
-        Return if we should use an adjustable tick locator or a fixed
-        one.  (check is used twice so factored out here...)
-        """
-        contouring = self.boundaries is not None and self.spacing == 'uniform'
-        return (type(self.norm) in [colors.Normalize, colors.LogNorm] and
-                not contouring)
+            self._formatter = format  # Assume it is a Formatter or None
+        self._draw_all()
+
+        if isinstance(mappable, contour.ContourSet) and not mappable.filled:
+            self.add_lines(mappable)
+
+        # Link the Axes and Colorbar for interactive use
+        self.ax._colorbar = self
+        # Don't navigate on any of these types of mappables
+        if (isinstance(self.norm, (colors.BoundaryNorm, colors.NoNorm)) or
+                isinstance(self.mappable, contour.ContourSet)):
+            self.ax.set_navigate(False)
+
+        # These are the functions that set up interactivity on this colorbar
+        self._interactive_funcs = ["_get_view", "_set_view",
+                                   "_set_view_from_bbox", "drag_pan"]
+        for x in self._interactive_funcs:
+            setattr(self.ax, x, getattr(self, x))
+        # Set the cla function to the cbar's method to override it
+        self.ax.cla = self._cbar_cla
+        # Callbacks for the extend calculations to handle inverting the axis
+        self._extend_cid1 = self.ax.callbacks.connect(
+            "xlim_changed", self._do_extends)
+        self._extend_cid2 = self.ax.callbacks.connect(
+            "ylim_changed", self._do_extends)
+
+    @property
+    def locator(self):
+        """Major tick `.Locator` for the colorbar."""
+        return self._long_axis().get_major_locator()
+
+    @locator.setter
+    def locator(self, loc):
+        self._long_axis().set_major_locator(loc)
+        self._locator = loc
+
+    @property
+    def minorlocator(self):
+        """Minor tick `.Locator` for the colorbar."""
+        return self._long_axis().get_minor_locator()
+
+    @minorlocator.setter
+    def minorlocator(self, loc):
+        self._long_axis().set_minor_locator(loc)
+        self._minorlocator = loc
+
+    @property
+    def formatter(self):
+        """Major tick label `.Formatter` for the colorbar."""
+        return self._long_axis().get_major_formatter()
+
+    @formatter.setter
+    def formatter(self, fmt):
+        self._long_axis().set_major_formatter(fmt)
+        self._formatter = fmt
+
+    @property
+    def minorformatter(self):
+        """Minor tick `.Formatter` for the colorbar."""
+        return self._long_axis().get_minor_formatter()
+
+    @minorformatter.setter
+    def minorformatter(self, fmt):
+        self._long_axis().set_minor_formatter(fmt)
+        self._minorformatter = fmt
+
+    def _cbar_cla(self):
+        """Function to clear the interactive colorbar state."""
+        for x in self._interactive_funcs:
+            delattr(self.ax, x)
+        # We now restore the old cla() back and can call it directly
+        del self.ax.cla
+        self.ax.cla()
 
-    def _reset_locator_formatter_scale(self):
-        """
-        Reset the locator et al to defaults.  Any user-hardcoded changes
-        need to be re-entered if this gets called (either at init, or when
-        the mappable normal gets changed: Colorbar.update_normal)
-        """
-        self.locator = None
-        self.formatter = None
-        if isinstance(self.norm, colors.LogNorm):
-            # *both* axes are made log so that determining the
-            # mid point is easier.
-            self.ax.set_xscale('log')
-            self.ax.set_yscale('log')
-            self.minorticks_on()
-            self.__scale = 'log'
-        else:
-            self.ax.set_xscale('linear')
-            self.ax.set_yscale('linear')
-            if type(self.norm) is colors.Normalize:
-                self.__scale = 'linear'
-            else:
-                self.__scale = 'manual'
+    # Also remove ._patch after deprecation elapses.
+    patch = _api.deprecate_privatize_attribute("3.5", alternative="ax")
 
-    def update_ticks(self):
-        """
-        Force the update of the ticks and ticklabels. This must be
-        called whenever the tick locator and/or tick formatter changes.
-        """
-        ax = self.ax
-        # Get the locator and formatter; defaults to self.locator if not None.
-        locator, formatter = self._get_ticker_locator_formatter()
-        long_axis = ax.yaxis if self.orientation == 'vertical' else ax.xaxis
-        if self._use_auto_colorbar_locator():
-            _log.debug('Using auto colorbar locator %r on colorbar', locator)
-            long_axis.set_major_locator(locator)
-            long_axis.set_major_formatter(formatter)
-        else:
-            _log.debug('Using fixed locator on colorbar')
-            ticks, ticklabels, offset_string = self._ticker(locator, formatter)
-            long_axis.set_ticks(ticks)
-            long_axis.set_ticklabels(ticklabels)
-            long_axis.get_major_formatter().set_offset_string(offset_string)
+    filled = _api.deprecate_privatize_attribute("3.6")
 
-    def set_ticks(self, ticks, update_ticks=True):
+    def update_normal(self, mappable):
         """
-        Set tick locations.
-
-        Parameters
-        ----------
-        ticks : array-like or `~matplotlib.ticker.Locator` or None
-            The tick positions can be hard-coded by an array of values; or
-            they can be defined by a `.Locator`. Setting to *None* reverts
-            to using a default locator.
+        Update solid patches, lines, etc.
 
-        update_ticks : bool, default: True
-            If True, tick locations are updated immediately.  If False, the
-            user has to call `update_ticks` later to update the ticks.
+        This is meant to be called when the norm of the image or contour plot
+        to which this colorbar belongs changes.
 
+        If the norm on the mappable is different than before, this resets the
+        locator and formatter for the axis, so if these have been customized,
+        they will need to be customized again.  However, if the norm only
+        changes values of *vmin*, *vmax* or *cmap* then the old formatter
+        and locator will be preserved.
         """
-        if np.iterable(ticks):
-            self.locator = ticker.FixedLocator(ticks, nbins=len(ticks))
-        else:
-            self.locator = ticks
+        _log.debug('colorbar update normal %r %r', mappable.norm, self.norm)
+        self.mappable = mappable
+        self.set_alpha(mappable.get_alpha())
+        self.cmap = mappable.cmap
+        if mappable.norm != self.norm:
+            self.norm = mappable.norm
+            self._reset_locator_formatter_scale()
 
-        if update_ticks:
-            self.update_ticks()
+        self._draw_all()
+        if isinstance(self.mappable, contour.ContourSet):
+            CS = self.mappable
+            if not CS.filled:
+                self.add_lines(CS)
         self.stale = True
 
-    def get_ticks(self, minor=False):
-        """Return the x ticks as a list of locations."""
-        if self._manual_tick_data_values is None:
-            ax = self.ax
-            long_axis = (
-                ax.yaxis if self.orientation == 'vertical' else ax.xaxis)
-            return long_axis.get_majorticklocs()
-        else:
-            # We made the axes manually, the old way, and the ylim is 0-1,
-            # so the majorticklocs are in those units, not data units.
-            return self._manual_tick_data_values
-
-    def set_ticklabels(self, ticklabels, update_ticks=True):
+    @_api.deprecated("3.6", alternative="fig.draw_without_rendering()")
+    def draw_all(self):
         """
-        Set tick labels.
-
-        Tick labels are updated immediately unless *update_ticks* is *False*,
-        in which case one should call `.update_ticks` explicitly.
+        Calculate any free parameters based on the current cmap and norm,
+        and do all the drawing.
         """
-        if isinstance(self.locator, ticker.FixedLocator):
-            self.formatter = ticker.FixedFormatter(ticklabels)
-            if update_ticks:
-                self.update_ticks()
-        else:
-            _api.warn_external("set_ticks() must have been called.")
-        self.stale = True
+        self._draw_all()
 
-    def minorticks_on(self):
+    def _draw_all(self):
         """
-        Turn the minor ticks of the colorbar on without extruding
-        into the "extend regions".
+        Calculate any free parameters based on the current cmap and norm,
+        and do all the drawing.
         """
-        ax = self.ax
-        long_axis = ax.yaxis if self.orientation == 'vertical' else ax.xaxis
-
-        if long_axis.get_scale() == 'log':
-            long_axis.set_minor_locator(_ColorbarLogLocator(self, base=10.,
-                                                            subs='auto'))
-            long_axis.set_minor_formatter(ticker.LogFormatterSciNotation())
+        if self.orientation == 'vertical':
+            if mpl.rcParams['ytick.minor.visible']:
+                self.minorticks_on()
         else:
-            long_axis.set_minor_locator(_ColorbarAutoMinorLocator(self))
-
-    def minorticks_off(self):
-        """Turn the minor ticks of the colorbar off."""
-        ax = self.ax
-        long_axis = ax.yaxis if self.orientation == 'vertical' else ax.xaxis
-        long_axis.set_minor_locator(ticker.NullLocator())
-
-    def set_label(self, label, *, loc=None, **kwargs):
-        """
-        Add a label to the long axis of the colorbar.
+            if mpl.rcParams['xtick.minor.visible']:
+                self.minorticks_on()
+        self._long_axis().set(label_position=self.ticklocation,
+                              ticks_position=self.ticklocation)
+        self._short_axis().set_ticks([])
+        self._short_axis().set_ticks([], minor=True)
 
-        Parameters
-        ----------
-        label : str
-            The label text.
-        loc : str, optional
-            The location of the label.
+        # Set self._boundaries and self._values, including extensions.
+        # self._boundaries are the edges of each square of color, and
+        # self._values are the value to map into the norm to get the
+        # color:
+        self._process_values()
+        # Set self.vmin and self.vmax to first and last boundary, excluding
+        # extensions:
+        self.vmin, self.vmax = self._boundaries[self._inside][[0, -1]]
+        # Compute the X/Y mesh.
+        X, Y = self._mesh()
+        # draw the extend triangles, and shrink the inner axes to accommodate.
+        # also adds the outline path to self.outline spine:
+        self._do_extends()
+        lower, upper = self.vmin, self.vmax
+        if self._long_axis().get_inverted():
+            # If the axis is inverted, we need to swap the vmin/vmax
+            lower, upper = upper, lower
+        if self.orientation == 'vertical':
+            self.ax.set_xlim(0, 1)
+            self.ax.set_ylim(lower, upper)
+        else:
+            self.ax.set_ylim(0, 1)
+            self.ax.set_xlim(lower, upper)
 
-            - For horizontal orientation one of {'left', 'center', 'right'}
-            - For vertical orientation one of {'bottom', 'center', 'top'}
+        # set up the tick locators and formatters.  A bit complicated because
+        # boundary norms + uniform spacing requires a manual locator.
+        self.update_ticks()
 
-            Defaults to :rc:`xaxis.labellocation` or :rc:`yaxis.labellocation`
-            depending on the orientation.
-        **kwargs
-            Keyword arguments are passed to `~.Axes.set_xlabel` /
-            `~.Axes.set_ylabel`.
-            Supported keywords are *labelpad* and `.Text` properties.
-        """
-        if self.orientation == "vertical":
-            self.ax.set_ylabel(label, loc=loc, **kwargs)
-        else:
-            self.ax.set_xlabel(label, loc=loc, **kwargs)
-        self.stale = True
+        if self._filled:
+            ind = np.arange(len(self._values))
+            if self._extend_lower():
+                ind = ind[1:]
+            if self._extend_upper():
+                ind = ind[:-1]
+            self._add_solids(X, Y, self._values[ind, np.newaxis])
 
     def _add_solids(self, X, Y, C):
         """Draw the colors; optionally add separators."""
@@ -786,27 +573,46 @@ def _add_solids(self, X, Y, C):
                 and any(hatch is not None for hatch in mappable.hatches)):
             self._add_solids_patches(X, Y, C, mappable)
         else:
-            self._add_solids_pcolormesh(X, Y, C)
-        self.dividers.set_segments(
-            np.dstack([X, Y])[1:-1] if self.drawedges else [])
-
-    def _add_solids_pcolormesh(self, X, Y, C):
-        _log.debug('Setting pcolormesh')
-        if C.shape[0] == Y.shape[0]:
-            # trim the last one to be compatible with old behavior.
-            C = C[:-1]
-        self.solids = self.ax.pcolormesh(
-            X, Y, C, cmap=self.cmap, norm=self.norm, alpha=self.alpha,
-            edgecolors='none', shading='flat')
+            self.solids = self.ax.pcolormesh(
+                X, Y, C, cmap=self.cmap, norm=self.norm, alpha=self.alpha,
+                edgecolors='none', shading='flat')
+            if not self.drawedges:
+                if len(self._y) >= self.n_rasterize:
+                    self.solids.set_rasterized(True)
+        self._update_dividers()
+
+    def _update_dividers(self):
         if not self.drawedges:
-            if len(self._y) >= self.n_rasterize:
-                self.solids.set_rasterized(True)
+            self.dividers.set_segments([])
+            return
+        # Place all *internal* dividers.
+        if self.orientation == 'vertical':
+            lims = self.ax.get_ylim()
+            bounds = (lims[0] < self._y) & (self._y < lims[1])
+        else:
+            lims = self.ax.get_xlim()
+            bounds = (lims[0] < self._y) & (self._y < lims[1])
+        y = self._y[bounds]
+        # And then add outer dividers if extensions are on.
+        if self._extend_lower():
+            y = np.insert(y, 0, lims[0])
+        if self._extend_upper():
+            y = np.append(y, lims[1])
+        X, Y = np.meshgrid([0, 1], y)
+        if self.orientation == 'vertical':
+            segments = np.dstack([X, Y])
+        else:
+            segments = np.dstack([Y, X])
+        self.dividers.set_segments(segments)
 
     def _add_solids_patches(self, X, Y, C, mappable):
-        hatches = mappable.hatches * len(C)  # Have enough hatches.
+        hatches = mappable.hatches * (len(C) + 1)  # Have enough hatches.
+        if self._extend_lower():
+            # remove first hatch that goes into the extend patch
+            hatches = hatches[1:]
         patches = []
         for i in range(len(X) - 1):
-            xy = np.array([[X[i, 0], Y[i, 0]],
+            xy = np.array([[X[i, 0], Y[i, 1]],
                            [X[i, 1], Y[i, 0]],
                            [X[i + 1, 1], Y[i + 1, 0]],
                            [X[i + 1, 0], Y[i + 1, 1]]])
@@ -818,7 +624,101 @@ def _add_solids_patches(self, X, Y, C, mappable):
             patches.append(patch)
         self.solids_patches = patches
 
-    def add_lines(self, levels, colors, linewidths, erase=True):
+    def _do_extends(self, ax=None):
+        """
+        Add the extend tri/rectangles on the outside of the axes.
+
+        ax is unused, but required due to the callbacks on xlim/ylim changed
+        """
+        # Clean up any previous extend patches
+        for patch in self._extend_patches:
+            patch.remove()
+        self._extend_patches = []
+        # extend lengths are fraction of the *inner* part of colorbar,
+        # not the total colorbar:
+        _, extendlen = self._proportional_y()
+        bot = 0 - (extendlen[0] if self._extend_lower() else 0)
+        top = 1 + (extendlen[1] if self._extend_upper() else 0)
+
+        # xyout is the outline of the colorbar including the extend patches:
+        if not self.extendrect:
+            # triangle:
+            xyout = np.array([[0, 0], [0.5, bot], [1, 0],
+                              [1, 1], [0.5, top], [0, 1], [0, 0]])
+        else:
+            # rectangle:
+            xyout = np.array([[0, 0], [0, bot], [1, bot], [1, 0],
+                              [1, 1], [1, top], [0, top], [0, 1],
+                              [0, 0]])
+
+        if self.orientation == 'horizontal':
+            xyout = xyout[:, ::-1]
+
+        # xyout is the path for the spine:
+        self.outline.set_xy(xyout)
+        if not self._filled:
+            return
+
+        # Make extend triangles or rectangles filled patches.  These are
+        # defined in the outer parent axes' coordinates:
+        mappable = getattr(self, 'mappable', None)
+        if (isinstance(mappable, contour.ContourSet)
+                and any(hatch is not None for hatch in mappable.hatches)):
+            hatches = mappable.hatches * (len(self._y) + 1)
+        else:
+            hatches = [None] * (len(self._y) + 1)
+
+        if self._extend_lower():
+            if not self.extendrect:
+                # triangle
+                xy = np.array([[0, 0], [0.5, bot], [1, 0]])
+            else:
+                # rectangle
+                xy = np.array([[0, 0], [0, bot], [1., bot], [1, 0]])
+            if self.orientation == 'horizontal':
+                xy = xy[:, ::-1]
+            # add the patch
+            val = -1 if self._long_axis().get_inverted() else 0
+            color = self.cmap(self.norm(self._values[val]))
+            patch = mpatches.PathPatch(
+                mpath.Path(xy), facecolor=color, alpha=self.alpha,
+                linewidth=0, antialiased=False,
+                transform=self.ax.transAxes,
+                hatch=hatches[0], clip_on=False,
+                # Place it right behind the standard patches, which is
+                # needed if we updated the extends
+                zorder=np.nextafter(self.ax.patch.zorder, -np.inf))
+            self.ax.add_patch(patch)
+            self._extend_patches.append(patch)
+            # remove first hatch that goes into the extend patch
+            hatches = hatches[1:]
+        if self._extend_upper():
+            if not self.extendrect:
+                # triangle
+                xy = np.array([[0, 1], [0.5, top], [1, 1]])
+            else:
+                # rectangle
+                xy = np.array([[0, 1], [0, top], [1, top], [1, 1]])
+            if self.orientation == 'horizontal':
+                xy = xy[:, ::-1]
+            # add the patch
+            val = 0 if self._long_axis().get_inverted() else -1
+            color = self.cmap(self.norm(self._values[val]))
+            hatch_idx = len(self._y) - 1
+            patch = mpatches.PathPatch(
+                mpath.Path(xy), facecolor=color, alpha=self.alpha,
+                linewidth=0, antialiased=False,
+                transform=self.ax.transAxes, hatch=hatches[hatch_idx],
+                clip_on=False,
+                # Place it right behind the standard patches, which is
+                # needed if we updated the extends
+                zorder=np.nextafter(self.ax.patch.zorder, -np.inf))
+            self.ax.add_patch(patch)
+            self._extend_patches.append(patch)
+
+        self._update_dividers()
+
+    def add_lines(self, *args, **kwargs):
         """
         Draw lines on the colorbar.
 
@@ -836,7 +736,31 @@ def add_lines(self, levels, colors, linewidths, erase=True):
             for each line.
         erase : bool, default: True
             Whether to remove any previously added lines.
+
+        Notes
+        -----
+        Alternatively, this method can also be called with the signature
+        ``colorbar.add_lines(contour_set, erase=True)``, in which case
+        *levels*, *colors*, and *linewidths* are taken from *contour_set*.
         """
+        params = _api.select_matching_signature(
+            [lambda self, CS, erase=True: locals(),
+             lambda self, levels, colors, linewidths, erase=True: locals()],
+            self, *args, **kwargs)
+        if "CS" in params:
+            self, CS, erase = params.values()
+            if not isinstance(CS, contour.ContourSet) or CS.filled:
+                raise ValueError("If a single artist is passed to add_lines, "
+                                 "it must be a ContourSet of lines")
+            # TODO: Make colorbar lines auto-follow changes in contour lines.
+            return self.add_lines(
+                CS.levels,
+                [c[0] for c in CS.tcolors],
+                [t[0] for t in CS.tlinewidths],
+                erase=erase)
+        else:
+            self, levels, colors, linewidths, erase = params.values()
+
         y = self._locate(levels)
         rtol = (self._y[-1] - self._y[0]) * 1e-10
         igood = (y < self._y[-1] + rtol) & (y > self._y[0] - rtol)
@@ -845,72 +769,302 @@ def add_lines(self, levels, colors, linewidths, erase=True):
             colors = np.asarray(colors)[igood]
         if np.iterable(linewidths):
             linewidths = np.asarray(linewidths)[igood]
-        X, Y = np.meshgrid([self._y[0], self._y[-1]], y)
+        X, Y = np.meshgrid([0, 1], y)
         if self.orientation == 'vertical':
             xy = np.stack([X, Y], axis=-1)
         else:
             xy = np.stack([Y, X], axis=-1)
-        col = collections.LineCollection(xy, linewidths=linewidths)
+        col = collections.LineCollection(xy, linewidths=linewidths,
+                                         colors=colors)
 
         if erase and self.lines:
             for lc in self.lines:
                 lc.remove()
             self.lines = []
         self.lines.append(col)
-        col.set_color(colors)
+
+        # make a clip path that is just a linewidth bigger than the axes...
+        fac = np.max(linewidths) / 72
+        xy = np.array([[0, 0], [1, 0], [1, 1], [0, 1], [0, 0]])
+        inches = self.ax.get_figure().dpi_scale_trans
+        # do in inches:
+        xy = inches.inverted().transform(self.ax.transAxes.transform(xy))
+        xy[[0, 1, 4], 1] -= fac
+        xy[[2, 3], 1] += fac
+        # back to axes units...
+        xy = self.ax.transAxes.inverted().transform(inches.transform(xy))
+        col.set_clip_path(mpath.Path(xy, closed=True),
+                          self.ax.transAxes)
         self.ax.add_collection(col)
         self.stale = True
 
-    def _ticker(self, locator, formatter):
+    def update_ticks(self):
+        """
+        Setup the ticks and ticklabels. This should not be needed by users.
+        """
+        # Get the locator and formatter; defaults to self._locator if not None.
+        self._get_ticker_locator_formatter()
+        self._long_axis().set_major_locator(self._locator)
+        self._long_axis().set_minor_locator(self._minorlocator)
+        self._long_axis().set_major_formatter(self._formatter)
+
+    def _get_ticker_locator_formatter(self):
+        """
+        Return the ``locator`` and ``formatter`` of the colorbar.
+
+        If they have not been defined (i.e. are *None*), the formatter and
+        locator are retrieved from the axis, or from the value of the
+        boundaries for a boundary norm.
+
+        Called by update_ticks...
+        """
+        locator = self._locator
+        formatter = self._formatter
+        minorlocator = self._minorlocator
+        if isinstance(self.norm, colors.BoundaryNorm):
+            b = self.norm.boundaries
+            if locator is None:
+                locator = ticker.FixedLocator(b, nbins=10)
+            if minorlocator is None:
+                minorlocator = ticker.FixedLocator(b)
+        elif isinstance(self.norm, colors.NoNorm):
+            if locator is None:
+                # put ticks on integers between the boundaries of NoNorm
+                nv = len(self._values)
+                base = 1 + int(nv / 10)
+                locator = ticker.IndexLocator(base=base, offset=.5)
+        elif self.boundaries is not None:
+            b = self._boundaries[self._inside]
+            if locator is None:
+                locator = ticker.FixedLocator(b, nbins=10)
+        else:  # most cases:
+            if locator is None:
+                # we haven't set the locator explicitly, so use the default
+                # for this axis:
+                locator = self._long_axis().get_major_locator()
+            if minorlocator is None:
+                minorlocator = self._long_axis().get_minor_locator()
+
+        if minorlocator is None:
+            minorlocator = ticker.NullLocator()
+
+        if formatter is None:
+            formatter = self._long_axis().get_major_formatter()
+
+        self._locator = locator
+        self._formatter = formatter
+        self._minorlocator = minorlocator
+        _log.debug('locator: %r', locator)
+
+    @_api.delete_parameter("3.5", "update_ticks")
+    def set_ticks(self, ticks, update_ticks=True, labels=None, *,
+                  minor=False, **kwargs):
+        """
+        Set tick locations.
+
+        Parameters
+        ----------
+        ticks : list of floats
+            List of tick locations.
+        labels : list of str, optional
+            List of tick labels. If not set, the labels show the data value.
+        minor : bool, default: False
+            If ``False``, set the major ticks; if ``True``, the minor ticks.
+        **kwargs
+            `.Text` properties for the labels. These take effect only if you
+            pass *labels*. In other cases, please use `~.Axes.tick_params`.
+        """
+        if np.iterable(ticks):
+            self._long_axis().set_ticks(ticks, labels=labels, minor=minor,
+                                        **kwargs)
+            self._locator = self._long_axis().get_major_locator()
+        else:
+            self._locator = ticks
+            self._long_axis().set_major_locator(self._locator)
+        self.stale = True
+
+    def get_ticks(self, minor=False):
+        """
+        Return the ticks as a list of locations.
+
+        Parameters
+        ----------
+        minor : boolean, default: False
+            if True return the minor ticks.
+        """
+        if minor:
+            return self._long_axis().get_minorticklocs()
+        else:
+            return self._long_axis().get_majorticklocs()
+
+    @_api.delete_parameter("3.5", "update_ticks")
+    def set_ticklabels(self, ticklabels, update_ticks=True, *, minor=False,
+                       **kwargs):
+        """
+        [*Discouraged*] Set tick labels.
+
+        .. admonition:: Discouraged
+
+            The use of this method is discouraged, because of the dependency
+            on tick positions. In most cases, you'll want to use
+            ``set_ticks(positions, labels=labels)`` instead.
+
+            If you are using this method, you should always fix the tick
+            positions before, e.g. by using `.Colorbar.set_ticks` or by
+            explicitly setting a `~.ticker.FixedLocator` on the long axis
+            of the colorbar. Otherwise, ticks are free to move and the
+            labels may end up in unexpected positions.
+
+        Parameters
+        ----------
+        ticklabels : sequence of str or of `.Text`
+            Texts for labeling each tick location in the sequence set by
+            `.Colorbar.set_ticks`; the number of labels must match the number
+            of locations.
+
+        update_ticks : bool, default: True
+            This keyword argument is ignored and will be be removed.
+            Deprecated
+
+         minor : bool
+            If True, set minor ticks instead of major ticks.
+
+        **kwargs
+            `.Text` properties for the labels.
+        """
+        self._long_axis().set_ticklabels(ticklabels, minor=minor, **kwargs)
+
+    def minorticks_on(self):
+        """
+        Turn on colorbar minor ticks.
+        """
+        self.ax.minorticks_on()
+        self._short_axis().set_minor_locator(ticker.NullLocator())
+
+    def minorticks_off(self):
+        """Turn the minor ticks of the colorbar off."""
+        self._minorlocator = ticker.NullLocator()
+        self._long_axis().set_minor_locator(self._minorlocator)
+
+    def set_label(self, label, *, loc=None, **kwargs):
+        """
+        Add a label to the long axis of the colorbar.
+
+        Parameters
+        ----------
+        label : str
+            The label text.
+        loc : str, optional
+            The location of the label.
+
+            - For horizontal orientation one of {'left', 'center', 'right'}
+            - For vertical orientation one of {'bottom', 'center', 'top'}
+
+            Defaults to :rc:`xaxis.labellocation` or :rc:`yaxis.labellocation`
+            depending on the orientation.
+        **kwargs
+            Keyword arguments are passed to `~.Axes.set_xlabel` /
+            `~.Axes.set_ylabel`.
+            Supported keywords are *labelpad* and `.Text` properties.
+        """
+        if self.orientation == "vertical":
+            self.ax.set_ylabel(label, loc=loc, **kwargs)
+        else:
+            self.ax.set_xlabel(label, loc=loc, **kwargs)
+        self.stale = True
+
+    def set_alpha(self, alpha):
+        """
+        Set the transparency between 0 (transparent) and 1 (opaque).
+
+        If an array is provided, *alpha* will be set to None to use the
+        transparency values associated with the colormap.
         """
-        Return the sequence of ticks (colorbar data locations),
-        ticklabels (strings), and the corresponding offset string.
+        self.alpha = None if isinstance(alpha, np.ndarray) else alpha
+
+    def _set_scale(self, scale, **kwargs):
+        """
+        Set the colorbar long axis scale.
+
+        Parameters
+        ----------
+        value : {"linear", "log", "symlog", "logit", ...} or `.ScaleBase`
+            The axis scale type to apply.
+
+        **kwargs
+            Different keyword arguments are accepted, depending on the scale.
+            See the respective class keyword arguments:
+
+            - `matplotlib.scale.LinearScale`
+            - `matplotlib.scale.LogScale`
+            - `matplotlib.scale.SymmetricalLogScale`
+            - `matplotlib.scale.LogitScale`
+            - `matplotlib.scale.FuncScale`
+
+        Notes
+        -----
+        By default, Matplotlib supports the above mentioned scales.
+        Additionally, custom scales may be registered using
+        `matplotlib.scale.register_scale`. These scales can then also
+        be used here.
         """
-        if isinstance(self.norm, colors.NoNorm) and self.boundaries is None:
-            intv = self._values[0], self._values[-1]
+        if self.orientation == 'vertical':
+            self.ax.set_yscale(scale, **kwargs)
         else:
-            intv = self.vmin, self.vmax
-        locator.create_dummy_axis(minpos=intv[0])
-        formatter.create_dummy_axis(minpos=intv[0])
-        locator.set_view_interval(*intv)
-        locator.set_data_interval(*intv)
-        formatter.set_view_interval(*intv)
-        formatter.set_data_interval(*intv)
-
-        b = np.array(locator())
-        if isinstance(locator, ticker.LogLocator):
-            eps = 1e-10
-            b = b[(b <= intv[1] * (1 + eps)) & (b >= intv[0] * (1 - eps))]
+            self.ax.set_xscale(scale, **kwargs)
+        if isinstance(scale, mscale.ScaleBase):
+            self.__scale = scale.name
         else:
-            eps = (intv[1] - intv[0]) * 1e-10
-            b = b[(b <= intv[1] + eps) & (b >= intv[0] - eps)]
-        self._manual_tick_data_values = b
-        ticks = self._locate(b)
-        ticklabels = formatter.format_ticks(b)
-        offset_string = formatter.get_offset()
-        return ticks, ticklabels, offset_string
-
-    def _process_values(self, b=None):
+            self.__scale = scale
+
+    def remove(self):
         """
-        Set the :attr:`_boundaries` and :attr:`_values` attributes
-        based on the input boundaries and values.  Input boundaries
-        can be *self.boundaries* or the argument *b*.
+        Remove this colorbar from the figure.
+
+        If the colorbar was created with ``use_gridspec=True`` the previous
+        gridspec is restored.
         """
-        if b is None:
-            b = self.boundaries
-        if b is not None:
-            self._boundaries = np.asarray(b, dtype=float)
-            if self.values is None:
-                self._values = 0.5 * (self._boundaries[:-1]
-                                      + self._boundaries[1:])
-                if isinstance(self.norm, colors.NoNorm):
-                    self._values = (self._values + 0.00001).astype(np.int16)
-            else:
-                self._values = np.array(self.values)
+        if hasattr(self.ax, '_colorbar_info'):
+            parents = self.ax._colorbar_info['parents']
+            for a in parents:
+                if self.ax in a._colorbars:
+                    a._colorbars.remove(self.ax)
+
+        self.ax.remove()
+
+        self.mappable.callbacks.disconnect(self.mappable.colorbar_cid)
+        self.mappable.colorbar = None
+        self.mappable.colorbar_cid = None
+        # Remove the extension callbacks
+        self.ax.callbacks.disconnect(self._extend_cid1)
+        self.ax.callbacks.disconnect(self._extend_cid2)
+
+        try:
+            ax = self.mappable.axes
+        except AttributeError:
             return
+        try:
+            gs = ax.get_subplotspec().get_gridspec()
+            subplotspec = gs.get_topmost_subplotspec()
+        except AttributeError:
+            # use_gridspec was False
+            pos = ax.get_position(original=True)
+            ax._set_position(pos)
+        else:
+            # use_gridspec was True
+            ax.set_subplotspec(subplotspec)
+
+    def _process_values(self):
+        """
+        Set `_boundaries` and `_values` based on the self.boundaries and
+        self.values if not None, or based on the size of the colormap and
+        the vmin/vmax of the norm.
+        """
         if self.values is not None:
+            # set self._boundaries from the values...
             self._values = np.array(self.values)
             if self.boundaries is None:
+                # bracket values by 1/2 dv:
                 b = np.zeros(len(self.values) + 1)
                 b[1:-1] = 0.5 * (self._values[:-1] + self._values[1:])
                 b[0] = 2.0 * b[1] - b[2]
@@ -919,150 +1073,39 @@ def _process_values(self, b=None):
                 return
             self._boundaries = np.array(self.boundaries)
             return
-        # Neither boundaries nor values are specified;
-        # make reasonable ones based on cmap and norm.
-        if isinstance(self.norm, colors.NoNorm):
-            b = self._uniform_y(self.cmap.N + 1) * self.cmap.N - 0.5
-            v = np.zeros(len(b) - 1, dtype=np.int16)
-            v[self._inside] = np.arange(self.cmap.N, dtype=np.int16)
-            if self._extend_lower():
-                v[0] = -1
-            if self._extend_upper():
-                v[-1] = self.cmap.N
-            self._boundaries = b
-            self._values = v
-            return
-        elif isinstance(self.norm, colors.BoundaryNorm):
-            b = list(self.norm.boundaries)
-            if self._extend_lower():
-                b = [b[0] - 1] + b
-            if self._extend_upper():
-                b = b + [b[-1] + 1]
-            b = np.array(b)
-            v = np.zeros(len(b) - 1)
-            bi = self.norm.boundaries
-            v[self._inside] = 0.5 * (bi[:-1] + bi[1:])
-            if self._extend_lower():
-                v[0] = b[0] - 1
-            if self._extend_upper():
-                v[-1] = b[-1] + 1
-            self._boundaries = b
-            self._values = v
-            return
-        else:
-            if not self.norm.scaled():
-                self.norm.vmin = 0
-                self.norm.vmax = 1
-
-            self.norm.vmin, self.norm.vmax = mtransforms.nonsingular(
-                self.norm.vmin,
-                self.norm.vmax,
-                expander=0.1)
-
-            b = self.norm.inverse(self._uniform_y(self.cmap.N + 1))
-
-            if isinstance(self.norm, (colors.PowerNorm, colors.LogNorm)):
-                # If using a lognorm or powernorm, ensure extensions don't
-                # go negative
-                if self._extend_lower():
-                    b[0] = 0.9 * b[0]
-                if self._extend_upper():
-                    b[-1] = 1.1 * b[-1]
-            else:
-                if self._extend_lower():
-                    b[0] = b[0] - 1
-                if self._extend_upper():
-                    b[-1] = b[-1] + 1
-        self._process_values(b)
-
-    def _get_extension_lengths(self, frac, automin, automax, default=0.05):
-        """
-        Return the lengths of colorbar extensions.
-
-        This is a helper method for _uniform_y and _proportional_y.
-        """
-        # Set the default value.
-        extendlength = np.array([default, default])
-        if isinstance(frac, str):
-            _api.check_in_list(['auto'], extendfrac=frac.lower())
-            # Use the provided values when 'auto' is required.
-            extendlength[:] = [automin, automax]
-        elif frac is not None:
-            try:
-                # Try to set min and max extension fractions directly.
-                extendlength[:] = frac
-                # If frac is a sequence containing None then NaN may
-                # be encountered. This is an error.
-                if np.isnan(extendlength).any():
-                    raise ValueError()
-            except (TypeError, ValueError) as err:
-                # Raise an error on encountering an invalid value for frac.
-                raise ValueError('invalid value for extendfrac') from err
-        return extendlength
-
-    def _uniform_y(self, N):
-        """
-        Return colorbar data coordinates for *N* uniformly
-        spaced boundaries, plus ends if required.
-        """
-        if self.extend == 'neither':
-            y = np.linspace(0, 1, N)
-        else:
-            automin = automax = 1. / (N - 1.)
-            extendlength = self._get_extension_lengths(self.extendfrac,
-                                                       automin, automax,
-                                                       default=0.05)
-            if self.extend == 'both':
-                y = np.zeros(N + 2, 'd')
-                y[0] = 0. - extendlength[0]
-                y[-1] = 1. + extendlength[1]
-            elif self.extend == 'min':
-                y = np.zeros(N + 1, 'd')
-                y[0] = 0. - extendlength[0]
-            else:
-                y = np.zeros(N + 1, 'd')
-                y[-1] = 1. + extendlength[1]
-            y[self._inside] = np.linspace(0, 1, N)
-        return y
 
-    def _proportional_y(self):
-        """
-        Return colorbar data coordinates for the boundaries of
-        a proportional colorbar.
-        """
+        # otherwise values are set from the boundaries
         if isinstance(self.norm, colors.BoundaryNorm):
-            y = (self._boundaries - self._boundaries[0])
-            y = y / (self._boundaries[-1] - self._boundaries[0])
+            b = self.norm.boundaries
+        elif isinstance(self.norm, colors.NoNorm):
+            # NoNorm has N blocks, so N+1 boundaries, centered on integers:
+            b = np.arange(self.cmap.N + 1) - .5
+        elif self.boundaries is not None:
+            b = self.boundaries
         else:
-            y = self.norm(self._boundaries.copy())
-            y = np.ma.filled(y, np.nan)
-        if self.extend == 'min':
-            # Exclude leftmost interval of y.
-            clen = y[-1] - y[1]
-            automin = (y[2] - y[1]) / clen
-            automax = (y[-1] - y[-2]) / clen
-        elif self.extend == 'max':
-            # Exclude rightmost interval in y.
-            clen = y[-2] - y[0]
-            automin = (y[1] - y[0]) / clen
-            automax = (y[-2] - y[-3]) / clen
-        elif self.extend == 'both':
-            # Exclude leftmost and rightmost intervals in y.
-            clen = y[-2] - y[1]
-            automin = (y[2] - y[1]) / clen
-            automax = (y[-2] - y[-3]) / clen
-        if self.extend in ('both', 'min', 'max'):
-            extendlength = self._get_extension_lengths(self.extendfrac,
-                                                       automin, automax,
-                                                       default=0.05)
-        if self.extend in ('both', 'min'):
-            y[0] = 0. - extendlength[0]
-        if self.extend in ('both', 'max'):
-            y[-1] = 1. + extendlength[1]
-        yi = y[self._inside]
-        norm = colors.Normalize(yi[0], yi[-1])
-        y[self._inside] = np.ma.filled(norm(yi), np.nan)
-        return y
+            # otherwise make the boundaries from the size of the cmap:
+            N = self.cmap.N + 1
+            b, _ = self._uniform_y(N)
+        # add extra boundaries if needed:
+        if self._extend_lower():
+            b = np.hstack((b[0] - 1, b))
+        if self._extend_upper():
+            b = np.hstack((b, b[-1] + 1))
+
+        # transform from 0-1 to vmin-vmax:
+        if not self.norm.scaled():
+            self.norm.vmin = 0
+            self.norm.vmax = 1
+        self.norm.vmin, self.norm.vmax = mtransforms.nonsingular(
+            self.norm.vmin, self.norm.vmax, expander=0.1)
+        if (not isinstance(self.norm, colors.BoundaryNorm) and
+                (self.boundaries is None)):
+            b = self.norm.inverse(b)
+
+        self._boundaries = np.asarray(b, dtype=float)
+        self._values = 0.5 * (self._boundaries[:-1] + self._boundaries[1:])
+        if isinstance(self.norm, colors.NoNorm):
+            self._values = (self._values + 0.00001).astype(np.int16)
 
     def _mesh(self):
         """
@@ -1071,38 +1114,77 @@ def _mesh(self):
         These are scaled between vmin and vmax, and already handle colorbar
         orientation.
         """
-        # copy the norm and change the vmin and vmax to the vmin and
-        # vmax of the colorbar, not the norm.  This allows the situation
-        # where the colormap has a narrower range than the colorbar, to
-        # accommodate extra contours:
-        norm = copy.copy(self.norm)
-        norm.vmin = self.vmin
-        norm.vmax = self.vmax
-        x = np.array([0.0, 1.0])
-        if self.spacing == 'uniform':
-            n_boundaries_no_extensions = len(self._boundaries[self._inside])
-            y = self._uniform_y(n_boundaries_no_extensions)
-        else:
-            y = self._proportional_y()
-        xmid = np.array([0.5])
-        if self.__scale != 'manual':
-            y = norm.inverse(y)
-            x = norm.inverse(x)
-            xmid = norm.inverse(xmid)
+        y, _ = self._proportional_y()
+        # Use the vmin and vmax of the colorbar, which may not be the same
+        # as the norm. There are situations where the colormap has a
+        # narrower range than the colorbar and we want to accommodate the
+        # extra contours.
+        if (isinstance(self.norm, (colors.BoundaryNorm, colors.NoNorm))
+                or self.boundaries is not None):
+            # not using a norm.
+            y = y * (self.vmax - self.vmin) + self.vmin
         else:
-            # if a norm doesn't have a named scale, or
-            # we are not using a norm
-            dv = self.vmax - self.vmin
-            x = x * dv + self.vmin
-            y = y * dv + self.vmin
-            xmid = xmid * dv + self.vmin
+            # Update the norm values in a context manager as it is only
+            # a temporary change and we don't want to propagate any signals
+            # attached to the norm (callbacks.blocked).
+            with self.norm.callbacks.blocked(), \
+                    cbook._setattr_cm(self.norm,
+                                      vmin=self.vmin,
+                                      vmax=self.vmax):
+                y = self.norm.inverse(y)
         self._y = y
-        X, Y = np.meshgrid(x, y)
-        if self._extend_lower() and not self.extendrect:
-            X[0, :] = xmid
-        if self._extend_upper() and not self.extendrect:
-            X[-1, :] = xmid
-        return (X, Y) if self.orientation == 'vertical' else (Y, X)
+        X, Y = np.meshgrid([0., 1.], y)
+        if self.orientation == 'vertical':
+            return (X, Y)
+        else:
+            return (Y, X)
+
+    def _forward_boundaries(self, x):
+        # map boundaries equally between 0 and 1...
+        b = self._boundaries
+        y = np.interp(x, b, np.linspace(0, 1, len(b)))
+        # the following avoids ticks in the extends:
+        eps = (b[-1] - b[0]) * 1e-6
+        # map these _well_ out of bounds to keep any ticks out
+        # of the extends region...
+        y[x < b[0]-eps] = -1
+        y[x > b[-1]+eps] = 2
+        return y
+
+    def _inverse_boundaries(self, x):
+        # invert the above...
+        b = self._boundaries
+        return np.interp(x, np.linspace(0, 1, len(b)), b)
+
+    def _reset_locator_formatter_scale(self):
+        """
+        Reset the locator et al to defaults.  Any user-hardcoded changes
+        need to be re-entered if this gets called (either at init, or when
+        the mappable normal gets changed: Colorbar.update_normal)
+        """
+        self._process_values()
+        self._locator = None
+        self._minorlocator = None
+        self._formatter = None
+        self._minorformatter = None
+        if (self.boundaries is not None or
+                isinstance(self.norm, colors.BoundaryNorm)):
+            if self.spacing == 'uniform':
+                funcs = (self._forward_boundaries, self._inverse_boundaries)
+                self._set_scale('function', functions=funcs)
+            elif self.spacing == 'proportional':
+                self._set_scale('linear')
+        elif getattr(self.norm, '_scale', None):
+            # use the norm's scale (if it exists and is not None):
+            self._set_scale(self.norm._scale)
+        elif type(self.norm) is colors.Normalize:
+            # plain Normalize:
+            self._set_scale('linear')
+        else:
+            # norm._scale is None or not an attr: derive the scale from
+            # the Norm:
+            funcs = (self.norm, self.norm.inverse)
+            self._set_scale('function', functions=funcs)
 
     def _locate(self, x):
         """
@@ -1118,214 +1200,143 @@ def _locate(self, x):
             b = self.norm(self._boundaries, clip=False).filled()
             xn = self.norm(x, clip=False).filled()
 
-        bunique = b
+        bunique = b[self._inside]
         yunique = self._y
-        # trim extra b values at beginning and end if they are
-        # not unique.  These are here for extended colorbars, and are not
-        # wanted for the interpolation.
-        if b[0] == b[1]:
-            bunique = bunique[1:]
-            yunique = yunique[1:]
-        if b[-1] == b[-2]:
-            bunique = bunique[:-1]
-            yunique = yunique[:-1]
 
         z = np.interp(xn, bunique, yunique)
         return z
 
-    def set_alpha(self, alpha):
-        """Set the transparency between 0 (transparent) and 1 (opaque)."""
-        self.alpha = alpha
-
-    def remove(self):
-        """Remove this colorbar from the figure."""
-        self.ax.remove()
-
-
-def _add_disjoint_kwargs(d, **kwargs):
-    """
-    Update dict *d* with entries in *kwargs*, which must be absent from *d*.
-    """
-    for k, v in kwargs.items():
-        if k in d:
-            _api.warn_deprecated(
-                "3.3", message=f"The {k!r} parameter to Colorbar has no "
-                "effect because it is overridden by the mappable; it is "
-                "deprecated since %(since)s and will be removed %(removal)s.")
-        d[k] = v
-
-
-class Colorbar(ColorbarBase):
-    """
-    This class connects a `ColorbarBase` to a `~.cm.ScalarMappable`
-    such as an `~.image.AxesImage` generated via `~.axes.Axes.imshow`.
-
-    .. note::
-        This class is not intended to be instantiated directly; instead, use
-        `.Figure.colorbar` or `.pyplot.colorbar` to create a colorbar.
-    """
-
-    def __init__(self, ax, mappable, **kwargs):
-        # Ensure the given mappable's norm has appropriate vmin and vmax set
-        # even if mappable.draw has not yet been called.
-        if mappable.get_array() is not None:
-            mappable.autoscale_None()
-
-        self.mappable = mappable
-        _add_disjoint_kwargs(kwargs, cmap=mappable.cmap, norm=mappable.norm)
-
-        if isinstance(mappable, contour.ContourSet):
-            cs = mappable
-            _add_disjoint_kwargs(
-                kwargs,
-                alpha=cs.get_alpha(),
-                boundaries=cs._levels,
-                values=cs.cvalues,
-                extend=cs.extend,
-                filled=cs.filled,
-            )
-            kwargs.setdefault(
-                'ticks', ticker.FixedLocator(cs.levels, nbins=10))
-            super().__init__(ax, **kwargs)
-            if not cs.filled:
-                self.add_lines(cs)
-        else:
-            if getattr(mappable.cmap, 'colorbar_extend', False) is not False:
-                kwargs.setdefault('extend', mappable.cmap.colorbar_extend)
-            if isinstance(mappable, martist.Artist):
-                _add_disjoint_kwargs(kwargs, alpha=mappable.get_alpha())
-            super().__init__(ax, **kwargs)
-
-        mappable.colorbar = self
-        mappable.colorbar_cid = mappable.callbacksSM.connect(
-            'changed', self.update_normal)
-
-    @_api.deprecated("3.3", alternative="update_normal")
-    def on_mappable_changed(self, mappable):
-        """
-        Update this colorbar to match the mappable's properties.
+    # trivial helpers
 
-        Typically this is automatically registered as an event handler
-        by :func:`colorbar_factory` and should not be called manually.
+    def _uniform_y(self, N):
         """
-        _log.debug('colorbar mappable changed')
-        self.update_normal(mappable)
-
-    def add_lines(self, CS, erase=True):
+        Return colorbar data coordinates for *N* uniformly
+        spaced boundaries, plus extension lengths if required.
         """
-        Add the lines from a non-filled `~.contour.ContourSet` to the colorbar.
+        automin = automax = 1. / (N - 1.)
+        extendlength = self._get_extension_lengths(self.extendfrac,
+                                                   automin, automax,
+                                                   default=0.05)
+        y = np.linspace(0, 1, N)
+        return y, extendlength
 
-        Parameters
-        ----------
-        CS : `~.contour.ContourSet`
-            The line positions are taken from the ContourSet levels. The
-            ContourSet must not be filled.
-        erase : bool, default: True
-            Whether to remove any previously added lines.
+    def _proportional_y(self):
         """
-        if not isinstance(CS, contour.ContourSet) or CS.filled:
-            raise ValueError('add_lines is only for a ContourSet of lines')
-        tcolors = [c[0] for c in CS.tcolors]
-        tlinewidths = [t[0] for t in CS.tlinewidths]
-        # Wishlist: Make colorbar lines auto-follow changes in contour lines.
-        super().add_lines(CS.levels, tcolors, tlinewidths, erase=erase)
-
-    def update_normal(self, mappable):
+        Return colorbar data coordinates for the boundaries of
+        a proportional colorbar, plus extension lengths if required:
         """
-        Update solid patches, lines, etc.
-
-        This is meant to be called when the norm of the image or contour plot
-        to which this colorbar belongs changes.
+        if (isinstance(self.norm, colors.BoundaryNorm) or
+                self.boundaries is not None):
+            y = (self._boundaries - self._boundaries[self._inside][0])
+            y = y / (self._boundaries[self._inside][-1] -
+                     self._boundaries[self._inside][0])
+            # need yscaled the same as the axes scale to get
+            # the extend lengths.
+            if self.spacing == 'uniform':
+                yscaled = self._forward_boundaries(self._boundaries)
+            else:
+                yscaled = y
+        else:
+            y = self.norm(self._boundaries.copy())
+            y = np.ma.filled(y, np.nan)
+            # the norm and the scale should be the same...
+            yscaled = y
+        y = y[self._inside]
+        yscaled = yscaled[self._inside]
+        # normalize from 0..1:
+        norm = colors.Normalize(y[0], y[-1])
+        y = np.ma.filled(norm(y), np.nan)
+        norm = colors.Normalize(yscaled[0], yscaled[-1])
+        yscaled = np.ma.filled(norm(yscaled), np.nan)
+        # make the lower and upper extend lengths proportional to the lengths
+        # of the first and last boundary spacing (if extendfrac='auto'):
+        automin = yscaled[1] - yscaled[0]
+        automax = yscaled[-1] - yscaled[-2]
+        extendlength = [0, 0]
+        if self._extend_lower() or self._extend_upper():
+            extendlength = self._get_extension_lengths(
+                    self.extendfrac, automin, automax, default=0.05)
+        return y, extendlength
 
-        If the norm on the mappable is different than before, this resets the
-        locator and formatter for the axis, so if these have been customized,
-        they will need to be customized again.  However, if the norm only
-        changes values of *vmin*, *vmax* or *cmap* then the old formatter
-        and locator will be preserved.
+    def _get_extension_lengths(self, frac, automin, automax, default=0.05):
         """
-        _log.debug('colorbar update normal %r %r', mappable.norm, self.norm)
-        self.mappable = mappable
-        self.set_alpha(mappable.get_alpha())
-        self.cmap = mappable.cmap
-        if mappable.norm != self.norm:
-            self.norm = mappable.norm
-            self._reset_locator_formatter_scale()
-
-        self.draw_all()
-        if isinstance(self.mappable, contour.ContourSet):
-            CS = self.mappable
-            if not CS.filled:
-                self.add_lines(CS)
-        self.stale = True
+        Return the lengths of colorbar extensions.
 
-    @_api.deprecated("3.3", alternative="update_normal")
-    def update_bruteforce(self, mappable):
-        """
-        Destroy and rebuild the colorbar.  This is
-        intended to become obsolete, and will probably be
-        deprecated and then removed.  It is not called when
-        the pyplot.colorbar function or the Figure.colorbar
-        method are used to create the colorbar.
+        This is a helper method for _uniform_y and _proportional_y.
         """
-        # We are using an ugly brute-force method: clearing and
-        # redrawing the whole thing.  The problem is that if any
-        # properties have been changed by methods other than the
-        # colorbar methods, those changes will be lost.
-        self.ax.cla()
-        self.locator = None
-        self.formatter = None
-
-        # clearing the axes will delete outline, patch, solids, and lines:
-        for spine in self.ax.spines.values():
-            spine.set_visible(False)
-        self.outline = self.ax.spines['outline'] = _ColorbarSpine(self.ax)
-        self.patch = mpatches.Polygon(
-            np.empty((0, 2)),
-            color=mpl.rcParams['axes.facecolor'], linewidth=0.01, zorder=-1)
-        self.ax.add_artist(self.patch)
-        self.solids = None
-        self.lines = []
-        self.update_normal(mappable)
-        self.draw_all()
-        if isinstance(self.mappable, contour.ContourSet):
-            CS = self.mappable
-            if not CS.filled:
-                self.add_lines(CS)
-            #if self.lines is not None:
-            #    tcolors = [c[0] for c in CS.tcolors]
-            #    self.lines.set_color(tcolors)
-        #Fixme? Recalculate boundaries, ticks if vmin, vmax have changed.
-        #Fixme: Some refactoring may be needed; we should not
-        # be recalculating everything if there was a simple alpha
-        # change.
+        # Set the default value.
+        extendlength = np.array([default, default])
+        if isinstance(frac, str):
+            _api.check_in_list(['auto'], extendfrac=frac.lower())
+            # Use the provided values when 'auto' is required.
+            extendlength[:] = [automin, automax]
+        elif frac is not None:
+            try:
+                # Try to set min and max extension fractions directly.
+                extendlength[:] = frac
+                # If frac is a sequence containing None then NaN may
+                # be encountered. This is an error.
+                if np.isnan(extendlength).any():
+                    raise ValueError()
+            except (TypeError, ValueError) as err:
+                # Raise an error on encountering an invalid value for frac.
+                raise ValueError('invalid value for extendfrac') from err
+        return extendlength
 
-    def remove(self):
-        """
-        Remove this colorbar from the figure.
+    def _extend_lower(self):
+        """Return whether the lower limit is open ended."""
+        minmax = "max" if self._long_axis().get_inverted() else "min"
+        return self.extend in ('both', minmax)
 
-        If the colorbar was created with ``use_gridspec=True`` the previous
-        gridspec is restored.
-        """
-        super().remove()
-        self.mappable.callbacksSM.disconnect(self.mappable.colorbar_cid)
-        self.mappable.colorbar = None
-        self.mappable.colorbar_cid = None
+    def _extend_upper(self):
+        """Return whether the upper limit is open ended."""
+        minmax = "min" if self._long_axis().get_inverted() else "max"
+        return self.extend in ('both', minmax)
 
-        try:
-            ax = self.mappable.axes
-        except AttributeError:
-            return
+    def _long_axis(self):
+        """Return the long axis"""
+        if self.orientation == 'vertical':
+            return self.ax.yaxis
+        return self.ax.xaxis
 
-        try:
-            gs = ax.get_subplotspec().get_gridspec()
-            subplotspec = gs.get_topmost_subplotspec()
-        except AttributeError:
-            # use_gridspec was False
-            pos = ax.get_position(original=True)
-            ax._set_position(pos)
-        else:
-            # use_gridspec was True
-            ax.set_subplotspec(subplotspec)
+    def _short_axis(self):
+        """Return the short axis"""
+        if self.orientation == 'vertical':
+            return self.ax.xaxis
+        return self.ax.yaxis
+
+    def _get_view(self):
+        # docstring inherited
+        # An interactive view for a colorbar is the norm's vmin/vmax
+        return self.norm.vmin, self.norm.vmax
+
+    def _set_view(self, view):
+        # docstring inherited
+        # An interactive view for a colorbar is the norm's vmin/vmax
+        self.norm.vmin, self.norm.vmax = view
+
+    def _set_view_from_bbox(self, bbox, direction='in',
+                            mode=None, twinx=False, twiny=False):
+        # docstring inherited
+        # For colorbars, we use the zoom bbox to scale the norm's vmin/vmax
+        new_xbound, new_ybound = self.ax._prepare_view_from_bbox(
+            bbox, direction=direction, mode=mode, twinx=twinx, twiny=twiny)
+        if self.orientation == 'horizontal':
+            self.norm.vmin, self.norm.vmax = new_xbound
+        elif self.orientation == 'vertical':
+            self.norm.vmin, self.norm.vmax = new_ybound
+
+    def drag_pan(self, button, key, x, y):
+        # docstring inherited
+        points = self.ax._get_pan_points(button, key, x, y)
+        if points is not None:
+            if self.orientation == 'horizontal':
+                self.norm.vmin, self.norm.vmax = points[:, 0]
+            elif self.orientation == 'vertical':
+                self.norm.vmin, self.norm.vmax = points[:, 1]
+
+
+ColorbarBase = Colorbar  # Backcompat API
 
 
 def _normalize_location_orientation(location, orientation):
@@ -1349,9 +1360,9 @@ def _normalize_location_orientation(location, orientation):
     return loc_settings
 
 
-@docstring.Substitution(_make_axes_param_doc, _make_axes_other_param_doc)
+@_docstring.interpd
 def make_axes(parents, location=None, orientation=None, fraction=0.15,
-              shrink=1.0, aspect=20, **kw):
+              shrink=1.0, aspect=20, **kwargs):
     """
     Create an `~.axes.Axes` suitable for a colorbar.
 
@@ -1360,40 +1371,38 @@ def make_axes(parents, location=None, orientation=None, fraction=0.15,
 
     Parameters
     ----------
-    parents : `~.axes.Axes` or list of `~.axes.Axes`
+    parents : `~.axes.Axes` or list or `numpy.ndarray` of `~.axes.Axes`
         The Axes to use as parents for placing the colorbar.
-    %s
+    %(_make_axes_kw_doc)s
 
     Returns
     -------
     cax : `~.axes.Axes`
         The child axes.
-    kw : dict
+    kwargs : dict
         The reduced keyword dictionary to be passed when creating the colorbar
         instance.
-
-    Other Parameters
-    ----------------
-    %s
     """
     loc_settings = _normalize_location_orientation(location, orientation)
-    # put appropriate values into the kw dict for passing back to
+    # put appropriate values into the kwargs dict for passing back to
     # the Colorbar class
-    kw['orientation'] = loc_settings['orientation']
-    location = kw['ticklocation'] = loc_settings['location']
-
-    anchor = kw.pop('anchor', loc_settings['anchor'])
-    parent_anchor = kw.pop('panchor', loc_settings['panchor'])
-
-    parents_iterable = np.iterable(parents)
-    # turn parents into a list if it is not already. We do this w/ np
-    # because `plt.subplots` can return an ndarray and is natural to
-    # pass to `colorbar`.
-    parents = np.atleast_1d(parents).ravel()
+    kwargs['orientation'] = loc_settings['orientation']
+    location = kwargs['ticklocation'] = loc_settings['location']
+
+    anchor = kwargs.pop('anchor', loc_settings['anchor'])
+    panchor = kwargs.pop('panchor', loc_settings['panchor'])
+    aspect0 = aspect
+    # turn parents into a list if it is not already.  Note we cannot
+    # use .flatten or .ravel as these copy the references rather than
+    # reuse them, leading to a memory leak
+    if isinstance(parents, np.ndarray):
+        parents = list(parents.flat)
+    elif not isinstance(parents, list):
+        parents = [parents]
     fig = parents[0].get_figure()
 
     pad0 = 0.05 if fig.get_constrained_layout() else loc_settings['pad']
-    pad = kw.pop('pad', pad0)
+    pad = kwargs.pop('pad', pad0)
 
     if not all(fig is ax.get_figure() for ax in parents):
         raise ValueError('Unable to create a colorbar axes as not all '
@@ -1429,33 +1438,35 @@ def make_axes(parents, location=None, orientation=None, fraction=0.15,
         new_posn = shrinking_trans.transform(ax.get_position(original=True))
         new_posn = mtransforms.Bbox(new_posn)
         ax._set_position(new_posn)
-        if parent_anchor is not False:
-            ax.set_anchor(parent_anchor)
+        if panchor is not False:
+            ax.set_anchor(panchor)
 
     cax = fig.add_axes(pbcb, label="<colorbar>")
     for a in parents:
         # tell the parent it has a colorbar
         a._colorbars += [cax]
     cax._colorbar_info = dict(
-        location=location,
         parents=parents,
+        location=location,
         shrink=shrink,
         anchor=anchor,
-        panchor=parent_anchor,
+        panchor=panchor,
         fraction=fraction,
-        aspect=aspect,
+        aspect=aspect0,
         pad=pad)
     # and we need to set the aspect ratio by hand...
-    cax.set_aspect(aspect, anchor=anchor, adjustable='box')
+    cax.set_anchor(anchor)
+    cax.set_box_aspect(aspect)
+    cax.set_aspect('auto')
 
-    return cax, kw
+    return cax, kwargs
 
 
-@docstring.Substitution(_make_axes_param_doc, _make_axes_other_param_doc)
+@_docstring.interpd
 def make_axes_gridspec(parent, *, location=None, orientation=None,
-                       fraction=0.15, shrink=1.0, aspect=20, **kw):
+                       fraction=0.15, shrink=1.0, aspect=20, **kwargs):
     """
-    Create a `~.SubplotBase` suitable for a colorbar.
+    Create a `.SubplotBase` suitable for a colorbar.
 
     The axes is placed in the figure of the *parent* axes, by resizing and
     repositioning *parent*.
@@ -1477,28 +1488,25 @@ def make_axes_gridspec(parent, *, location=None, orientation=None,
     ----------
     parent : `~.axes.Axes`
         The Axes to use as parent for placing the colorbar.
-    %s
+    %(_make_axes_kw_doc)s
 
     Returns
     -------
     cax : `~.axes.SubplotBase`
         The child axes.
-    kw : dict
+    kwargs : dict
         The reduced keyword dictionary to be passed when creating the colorbar
         instance.
-
-    Other Parameters
-    ----------------
-    %s
     """
 
     loc_settings = _normalize_location_orientation(location, orientation)
-    kw['orientation'] = loc_settings['orientation']
-    location = kw['ticklocation'] = loc_settings['location']
+    kwargs['orientation'] = loc_settings['orientation']
+    location = kwargs['ticklocation'] = loc_settings['location']
 
-    anchor = kw.pop('anchor', loc_settings['anchor'])
-    panchor = kw.pop('panchor', loc_settings['panchor'])
-    pad = kw.pop('pad', loc_settings["pad"])
+    aspect0 = aspect
+    anchor = kwargs.pop('anchor', loc_settings['anchor'])
+    panchor = kwargs.pop('panchor', loc_settings['panchor'])
+    pad = kwargs.pop('pad', loc_settings["pad"])
     wh_space = 2 * pad / (1 - pad)
 
     if location in ('left', 'right'):
@@ -1543,42 +1551,22 @@ def make_axes_gridspec(parent, *, location=None, orientation=None,
             aspect = 1 / aspect
 
     parent.set_subplotspec(ss_main)
-    parent.set_anchor(loc_settings["panchor"])
+    if panchor is not False:
+        parent.set_anchor(panchor)
 
     fig = parent.get_figure()
     cax = fig.add_subplot(ss_cb, label="<colorbar>")
-    cax.set_aspect(aspect, anchor=loc_settings["anchor"], adjustable='box')
-    return cax, kw
-
-
-@_api.deprecated("3.4", alternative="Colorbar")
-class ColorbarPatch(Colorbar):
-    pass
-
-
-@_api.deprecated("3.4", alternative="Colorbar")
-def colorbar_factory(cax, mappable, **kwargs):
-    """
-    Create a colorbar on the given axes for the given mappable.
-
-    .. note::
-        This is a low-level function to turn an existing axes into a colorbar
-        axes.  Typically, you'll want to use `~.Figure.colorbar` instead, which
-        automatically handles creation and placement of a suitable axes as
-        well.
-
-    Parameters
-    ----------
-    cax : `~matplotlib.axes.Axes`
-        The `~.axes.Axes` to turn into a colorbar.
-    mappable : `~matplotlib.cm.ScalarMappable`
-        The mappable to be described by the colorbar.
-    **kwargs
-        Keyword arguments are passed to the respective colorbar class.
+    cax.set_anchor(anchor)
+    cax.set_box_aspect(aspect)
+    cax.set_aspect('auto')
+    cax._colorbar_info = dict(
+        location=location,
+        parents=[parent],
+        shrink=shrink,
+        anchor=anchor,
+        panchor=panchor,
+        fraction=fraction,
+        aspect=aspect0,
+        pad=pad)
 
-    Returns
-    -------
-    `.Colorbar`
-        The created colorbar instance.
-    """
-    return Colorbar(cax, mappable, **kwargs)
+    return cax, kwargs
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
index 0edf4f76c4a8..3804a9bbfbe9 100644
--- a/lib/matplotlib/colors.py
+++ b/lib/matplotlib/colors.py
@@ -32,43 +32,17 @@
 "#rrggbb" format (`to_hex`), and a sequence of colors to an (n, 4)
 RGBA array (`to_rgba_array`).  Caching is used for efficiency.
 
-Matplotlib recognizes the following formats to specify a color:
-
-* an RGB or RGBA (red, green, blue, alpha) tuple of float values in closed
-  interval ``[0, 1]`` (e.g., ``(0.1, 0.2, 0.5)`` or ``(0.1, 0.2, 0.5, 0.3)``);
-* a hex RGB or RGBA string (e.g., ``'#0f0f0f'`` or ``'#0f0f0f80'``;
-  case-insensitive);
-* a shorthand hex RGB or RGBA string, equivalent to the hex RGB or RGBA
-  string obtained by duplicating each character, (e.g., ``'#abc'``, equivalent
-  to ``'#aabbcc'``, or ``'#abcd'``, equivalent to ``'#aabbccdd'``;
-  case-insensitive);
-* a string representation of a float value in ``[0, 1]`` inclusive for gray
-  level (e.g., ``'0.5'``);
-* one of the characters ``{'b', 'g', 'r', 'c', 'm', 'y', 'k', 'w'}``, which
-  are short-hand notations for shades of blue, green, red, cyan, magenta,
-  yellow, black, and white. Note that the colors ``'g', 'c', 'm', 'y'`` do not
-  coincide with the X11/CSS4 colors. Their particular shades were chosen for
-  better visibility of colored lines against typical backgrounds.
-* a X11/CSS4 color name (case-insensitive);
-* a name from the `xkcd color survey`_, prefixed with ``'xkcd:'`` (e.g.,
-  ``'xkcd:sky blue'``; case insensitive);
-* one of the Tableau Colors from the 'T10' categorical palette (the default
-  color cycle): ``{'tab:blue', 'tab:orange', 'tab:green', 'tab:red',
-  'tab:purple', 'tab:brown', 'tab:pink', 'tab:gray', 'tab:olive', 'tab:cyan'}``
-  (case-insensitive);
-* a "CN" color spec, i.e. 'C' followed by a number, which is an index into the
-  default property cycle (:rc:`axes.prop_cycle`); the indexing is intended to
-  occur at rendering time, and defaults to black if the cycle does not include
-  color.
+Colors that Matplotlib recognizes are listed at
+:doc:`/tutorials/colors/colors`.
 
 .. _palettable: https://jiffyclub.github.io/palettable/
 .. _xkcd color survey: https://xkcd.com/color/rgb/
 """
 
 import base64
-from collections.abc import Sized, Sequence
-import copy
+from collections.abc import Sized, Sequence, Mapping
 import functools
+import importlib
 import inspect
 import io
 import itertools
@@ -79,7 +53,7 @@
 
 import matplotlib as mpl
 import numpy as np
-from matplotlib import _api, cbook, scale
+from matplotlib import _api, _cm, cbook, scale
 from ._color_data import BASE_COLORS, TABLEAU_COLORS, CSS4_COLORS, XKCD_COLORS
 
 
@@ -119,6 +93,113 @@ def get_named_colors_mapping():
     return _colors_full_map
 
 
+class ColorSequenceRegistry(Mapping):
+    r"""
+    Container for sequences of colors that are known to Matplotlib by name.
+
+    The universal registry instance is `matplotlib.color_sequences`. There
+    should be no need for users to instantiate `.ColorSequenceRegistry`
+    themselves.
+
+    Read access uses a dict-like interface mapping names to lists of colors::
+
+        import matplotlib as mpl
+        cmap = mpl.color_sequences['tab10']
+
+    The returned lists are copies, so that their modification does not change
+    the global definition of the color sequence.
+
+    Additional color sequences can be added via
+    `.ColorSequenceRegistry.register`::
+
+        mpl.color_sequences.register('rgb', ['r', 'g', 'b'])
+    """
+
+    _BUILTIN_COLOR_SEQUENCES = {
+        'tab10': _cm._tab10_data,
+        'tab20': _cm._tab20_data,
+        'tab20b': _cm._tab20b_data,
+        'tab20c': _cm._tab20c_data,
+        'Pastel1': _cm._Pastel1_data,
+        'Pastel2': _cm._Pastel2_data,
+        'Paired': _cm._Paired_data,
+        'Accent': _cm._Accent_data,
+        'Dark2': _cm._Dark2_data,
+        'Set1': _cm._Set1_data,
+        'Set2': _cm._Set1_data,
+        'Set3': _cm._Set1_data,
+    }
+
+    def __init__(self):
+        self._color_sequences = {**self._BUILTIN_COLOR_SEQUENCES}
+
+    def __getitem__(self, item):
+        try:
+            return list(self._color_sequences[item])
+        except KeyError:
+            raise KeyError(f"{item!r} is not a known color sequence name")
+
+    def __iter__(self):
+        return iter(self._color_sequences)
+
+    def __len__(self):
+        return len(self._color_sequences)
+
+    def __str__(self):
+        return ('ColorSequenceRegistry; available colormaps:\n' +
+                ', '.join(f"'{name}'" for name in self))
+
+    def register(self, name, color_list):
+        """
+        Register a new color sequence.
+
+        The color sequence registry stores a copy of the given *color_list*, so
+        that future changes to the original list do not affect the registered
+        color sequence. Think of this as the registry taking a snapshot
+        of *color_list* at registration.
+
+        Parameters
+        ----------
+        name : str
+            The name for the color sequence.
+
+        color_list : list of colors
+            An iterable returning valid Matplotlib colors when iterating over.
+            Note however that the returned color sequence will always be a
+            list regardless of the input type.
+
+        """
+        if name in self._BUILTIN_COLOR_SEQUENCES:
+            raise ValueError(f"{name!r} is a reserved name for a builtin "
+                             "color sequence")
+
+        color_list = list(color_list)  # force copy and coerce type to list
+        for color in color_list:
+            try:
+                to_rgba(color)
+            except ValueError:
+                raise ValueError(
+                    f"{color!r} is not a valid color specification")
+
+        self._color_sequences[name] = color_list
+
+    def unregister(self, name):
+        """
+        Remove a sequence from the registry.
+
+        You cannot remove built-in color sequences.
+
+        If the name is not registered, returns with no error.
+        """
+        if name in self._BUILTIN_COLOR_SEQUENCES:
+            raise ValueError(
+                f"Cannot unregister builtin color sequence {name!r}")
+        self._color_sequences.pop(name, None)
+
+
+_color_sequences = ColorSequenceRegistry()
+
+
 def _sanitize_extrema(ex):
     if ex is None:
         return ex
@@ -147,6 +228,12 @@ def is_color_like(c):
         return True
 
 
+def _has_alpha_channel(c):
+    """Return whether *c* is a color with an alpha channel."""
+    # 4-element sequences are interpreted as r, g, b, a
+    return not isinstance(c, str) and len(c) == 4
+
+
 def _check_color_like(**kwargs):
     """
     For each *key, value* pair in *kwargs*, check that *value* is color-like.
@@ -184,18 +271,24 @@ def to_rgba(c, alpha=None):
     c : Matplotlib color or ``np.ma.masked``
 
     alpha : float, optional
-        If *alpha* is not ``None``, it forces the alpha value, except if *c* is
-        ``"none"`` (case-insensitive), which always maps to ``(0, 0, 0, 0)``.
+        If *alpha* is given, force the alpha value of the returned RGBA tuple
+        to *alpha*.
+
+        If None, the alpha value from *c* is used. If *c* does not have an
+        alpha channel, then alpha defaults to 1.
+
+        *alpha* is ignored for the color value ``"none"`` (case-insensitive),
+        which always maps to ``(0, 0, 0, 0)``.
 
     Returns
     -------
     tuple
-        Tuple of ``(r, g, b, a)`` scalars.
+        Tuple of floats ``(r, g, b, a)``, where each channel (red, green, blue,
+        alpha) can assume values between 0 and 1.
     """
     # Special-case nth color syntax because it should not be cached.
     if _is_nth_color(c):
-        from matplotlib import rcParams
-        prop_cycler = rcParams['axes.prop_cycle']
+        prop_cycler = mpl.rcParams['axes.prop_cycle']
         colors = prop_cycler.by_key().get('color', ['k'])
         c = colors[int(c[1:]) % len(colors)]
     try:
@@ -215,8 +308,12 @@ def _to_rgba_no_colorcycle(c, alpha=None):
     """
     Convert *c* to an RGBA color, with no support for color-cycle syntax.
 
-    If *alpha* is not ``None``, it forces the alpha value, except if *c* is
-    ``"none"`` (case-insensitive), which always maps to ``(0, 0, 0, 0)``.
+    If *alpha* is given, force the alpha value of the returned RGBA tuple
+    to *alpha*. Otherwise, the alpha value from *c* is used, if it has alpha
+    information, or defaults to 1.
+
+    *alpha* is ignored for the color value ``"none"`` (case-insensitive),
+    which always maps to ``(0, 0, 0, 0)``.
     """
     orig_c = c
     if c is np.ma.masked:
@@ -310,16 +407,23 @@ def to_rgba_array(c, alpha=None):
         row for each masked value or row in *c*.
 
     alpha : float or sequence of floats, optional
-        If *alpha* is not ``None``, it forces the alpha value, except if *c* is
-        ``"none"`` (case-insensitive), which always maps to ``(0, 0, 0, 0)``.
+        If *alpha* is given, force the alpha value of the returned RGBA tuple
+        to *alpha*.
+
+        If None, the alpha value from *c* is used. If *c* does not have an
+        alpha channel, then alpha defaults to 1.
+
+        *alpha* is ignored for the color value ``"none"`` (case-insensitive),
+        which always maps to ``(0, 0, 0, 0)``.
+
         If *alpha* is a sequence and *c* is a single color, *c* will be
         repeated to match the length of *alpha*.
 
     Returns
     -------
     array
-        (n, 4) array of RGBA colors.
-
+        (n, 4) array of RGBA colors,  where each channel (red, green, blue,
+        alpha) can assume values between 0 and 1.
     """
     # Special-case inputs that are already arrays, for performance.  (If the
     # array has the wrong kind or shape, raise the error during one-at-a-time
@@ -364,9 +468,7 @@ def to_rgba_array(c, alpha=None):
         pass
 
     if isinstance(c, str):
-        raise ValueError("Using a string of single character colors as "
-                         "a color sequence is not supported. The colors can "
-                         "be passed as an explicit list instead.")
+        raise ValueError(f"{c!r} is not a valid color value.")
 
     if len(c) == 0:
         return np.zeros((0, 4), float)
@@ -398,8 +500,17 @@ def to_hex(c, keep_alpha=False):
     """
     Convert *c* to a hex color.
 
-    Uses the ``#rrggbb`` format if *keep_alpha* is False (the default),
-    ``#rrggbbaa`` otherwise.
+    Parameters
+    ----------
+    c : :doc:`color </tutorials/colors/colors>` or `numpy.ma.masked`
+
+    keep_alpha : bool, default: False
+      If False, use the ``#rrggbb`` format, otherwise use ``#rrggbbaa``.
+
+    Returns
+    -------
+    str
+      ``#rrggbb`` or ``#rrggbbaa`` hex color string
     """
     c = to_rgba(c)
     if not keep_alpha:
@@ -503,9 +614,7 @@ def _create_lookup_table(N, data, gamma=1.0):
         adata = np.array(data)
     except Exception as err:
         raise TypeError("data must be convertible to an array") from err
-    shape = adata.shape
-    if len(shape) != 2 or shape[1] != 3:
-        raise ValueError("data must be nx3 format")
+    _api.check_shape((None, 3), data=adata)
 
     x = adata[:, 0]
     y0 = adata[:, 1]
@@ -535,20 +644,6 @@ def _create_lookup_table(N, data, gamma=1.0):
     return np.clip(lut, 0.0, 1.0)
 
 
-def _warn_if_global_cmap_modified(cmap):
-    if getattr(cmap, '_global', False):
-        _api.warn_deprecated(
-            "3.3",
-            removal="3.6",
-            message="You are modifying the state of a globally registered "
-                    "colormap. This has been deprecated since %(since)s and "
-                    "%(removal)s, you will not be able to modify a "
-                    "registered colormap in-place. To remove this warning, "
-                    "you can make a copy of the colormap first. "
-                    f'cmap = mpl.cm.get_cmap("{cmap.name}").copy()'
-        )
-
-
 class Colormap:
     """
     Baseclass for all scalar to RGBA mappings.
@@ -611,8 +706,12 @@ def __call__(self, X, alpha=None, bytes=False):
         if not self._isinit:
             self._init()
 
-        mask_bad = X.mask if np.ma.is_masked(X) else np.isnan(X)  # Mask nan's.
+        # Take the bad mask from a masked array, or in all other cases defer
+        # np.isnan() to after we have converted to an array.
+        mask_bad = X.mask if np.ma.is_masked(X) else None
         xa = np.array(X, copy=True)
+        if mask_bad is None:
+            mask_bad = np.isnan(xa)
         if not xa.dtype.isnative:
             xa = xa.byteswap().newbyteorder()  # Native byteorder is faster.
         if xa.dtype.kind == "f":
@@ -632,24 +731,20 @@ def __call__(self, X, alpha=None, bytes=False):
         xa[xa < 0] = self._i_under
         xa[mask_bad] = self._i_bad
 
+        lut = self._lut
         if bytes:
-            lut = (self._lut * 255).astype(np.uint8)
-        else:
-            lut = self._lut.copy()  # Don't let alpha modify original _lut.
+            lut = (lut * 255).astype(np.uint8)
 
-        rgba = np.empty(shape=xa.shape + (4,), dtype=lut.dtype)
-        lut.take(xa, axis=0, mode='clip', out=rgba)
+        rgba = lut.take(xa, axis=0, mode='clip')
 
         if alpha is not None:
-            if np.iterable(alpha):
-                alpha = np.asarray(alpha)
-                if alpha.shape != xa.shape:
-                    raise ValueError("alpha is array-like but its shape"
-                                     " %s doesn't match that of X %s" %
-                                     (alpha.shape, xa.shape))
             alpha = np.clip(alpha, 0, 1)
             if bytes:
-                alpha = (alpha * 255).astype(np.uint8)
+                alpha *= 255  # Will be cast to uint8 upon assignment.
+            if alpha.shape not in [(), xa.shape]:
+                raise ValueError(
+                    f"alpha is array-like but its shape {alpha.shape} does "
+                    f"not match that of X {xa.shape}")
             rgba[..., -1] = alpha
 
             # If the "bad" color is all zeros, then ignore alpha input.
@@ -669,9 +764,19 @@ def __copy__(self):
         cmapobject.__dict__.update(self.__dict__)
         if self._isinit:
             cmapobject._lut = np.copy(self._lut)
-        cmapobject._global = False
         return cmapobject
 
+    def __eq__(self, other):
+        if (not isinstance(other, Colormap) or self.name != other.name or
+                self.colorbar_extend != other.colorbar_extend):
+            return False
+        # To compare lookup tables the Colormaps have to be initialized
+        if not self._isinit:
+            self._init()
+        if not other._isinit:
+            other._init()
+        return np.array_equal(self._lut, other._lut)
+
     def get_bad(self):
         """Get the color for masked values."""
         if not self._isinit:
@@ -680,7 +785,6 @@ def get_bad(self):
 
     def set_bad(self, color='k', alpha=None):
         """Set the color for masked values."""
-        _warn_if_global_cmap_modified(self)
         self._rgba_bad = to_rgba(color, alpha)
         if self._isinit:
             self._set_extremes()
@@ -693,7 +797,6 @@ def get_under(self):
 
     def set_under(self, color='k', alpha=None):
         """Set the color for low out-of-range values."""
-        _warn_if_global_cmap_modified(self)
         self._rgba_under = to_rgba(color, alpha)
         if self._isinit:
             self._set_extremes()
@@ -706,7 +809,6 @@ def get_over(self):
 
     def set_over(self, color='k', alpha=None):
         """Set the color for high out-of-range values."""
-        _warn_if_global_cmap_modified(self)
         self._rgba_over = to_rgba(color, alpha)
         if self._isinit:
             self._set_extremes()
@@ -729,7 +831,7 @@ def with_extremes(self, *, bad=None, under=None, over=None):
         values and, when ``norm.clip = False``, low (*under*) and high (*over*)
         out-of-range values, have been set accordingly.
         """
-        new_cm = copy.copy(self)
+        new_cm = self.copy()
         new_cm.set_extremes(bad=bad, under=under, over=over)
         return new_cm
 
@@ -755,21 +857,30 @@ def is_gray(self):
         return (np.all(self._lut[:, 0] == self._lut[:, 1]) and
                 np.all(self._lut[:, 0] == self._lut[:, 2]))
 
-    def _resample(self, lutsize):
+    def resampled(self, lutsize):
         """Return a new colormap with *lutsize* entries."""
+        if hasattr(self, '_resample'):
+            _api.warn_external(
+                "The ability to resample a color map is now public API "
+                f"However the class {type(self)} still only implements "
+                "the previous private _resample method.  Please update "
+                "your class."
+            )
+            return self._resample(lutsize)
+
         raise NotImplementedError()
 
     def reversed(self, name=None):
         """
         Return a reversed instance of the Colormap.
 
-        .. note:: This function is not implemented for base class.
+        .. note:: This function is not implemented for the base class.
 
         Parameters
         ----------
         name : str, optional
-            The name for the reversed colormap. If it's None the
-            name will be the name of the parent colormap + "_r".
+            The name for the reversed colormap. If None, the
+            name is set to ``self.name + "_r"``.
 
         See Also
         --------
@@ -951,7 +1062,7 @@ def from_list(name, colors, N=256, gamma=1.0):
 
         return LinearSegmentedColormap(name, cdict, N, gamma)
 
-    def _resample(self, lutsize):
+    def resampled(self, lutsize):
         """Return a new colormap with *lutsize* entries."""
         new_cmap = LinearSegmentedColormap(self.name, self._segmentdata,
                                            lutsize)
@@ -972,8 +1083,8 @@ def reversed(self, name=None):
         Parameters
         ----------
         name : str, optional
-            The name for the reversed colormap. If it's None the
-            name will be the name of the parent colormap + "_r".
+            The name for the reversed colormap. If None, the
+            name is set to ``self.name + "_r"``.
 
         Returns
         -------
@@ -1055,7 +1166,7 @@ def _init(self):
         self._isinit = True
         self._set_extremes()
 
-    def _resample(self, lutsize):
+    def resampled(self, lutsize):
         """Return a new colormap with *lutsize* entries."""
         colors = self(np.linspace(0, 1, lutsize))
         new_cmap = ListedColormap(colors, name=self.name)
@@ -1072,8 +1183,8 @@ def reversed(self, name=None):
         Parameters
         ----------
         name : str, optional
-            The name for the reversed colormap. If it's None the
-            name will be the name of the parent colormap + "_r".
+            The name for the reversed colormap. If None, the
+            name is set to ``self.name + "_r"``.
 
         Returns
         -------
@@ -1120,10 +1231,50 @@ def __init__(self, vmin=None, vmax=None, clip=False):
         -----
         Returns 0 if ``vmin == vmax``.
         """
-        self.vmin = _sanitize_extrema(vmin)
-        self.vmax = _sanitize_extrema(vmax)
-        self.clip = clip
-        self._scale = scale.LinearScale(axis=None)
+        self._vmin = _sanitize_extrema(vmin)
+        self._vmax = _sanitize_extrema(vmax)
+        self._clip = clip
+        self._scale = None
+        self.callbacks = cbook.CallbackRegistry(signals=["changed"])
+
+    @property
+    def vmin(self):
+        return self._vmin
+
+    @vmin.setter
+    def vmin(self, value):
+        value = _sanitize_extrema(value)
+        if value != self._vmin:
+            self._vmin = value
+            self._changed()
+
+    @property
+    def vmax(self):
+        return self._vmax
+
+    @vmax.setter
+    def vmax(self, value):
+        value = _sanitize_extrema(value)
+        if value != self._vmax:
+            self._vmax = value
+            self._changed()
+
+    @property
+    def clip(self):
+        return self._clip
+
+    @clip.setter
+    def clip(self, value):
+        if value != self._clip:
+            self._clip = value
+            self._changed()
+
+    def _changed(self):
+        """
+        Call this whenever the norm is changed to notify all the
+        callback listeners to the 'changed' signal.
+        """
+        self.callbacks.process('changed')
 
     @staticmethod
     def process_value(value):
@@ -1183,12 +1334,13 @@ def __call__(self, value, clip=None):
 
         result, is_scalar = self.process_value(value)
 
-        self.autoscale_None(result)
+        if self.vmin is None or self.vmax is None:
+            self.autoscale_None(result)
         # Convert at least to float, without losing precision.
         (vmin,), _ = self.process_value(self.vmin)
         (vmax,), _ = self.process_value(self.vmax)
         if vmin == vmax:
-            result.fill(0)   # Or should it be all masked?  Or 0.5?
+            result.fill(0)  # Or should it be all masked?  Or 0.5?
         elif vmin > vmax:
             raise ValueError("minvalue must be less than or equal to maxvalue")
         else:
@@ -1254,7 +1406,7 @@ def __init__(self, vcenter, vmin=None, vmax=None):
             Defaults to the min value of the dataset.
         vmax : float, optional
             The data value that defines ``1.0`` in the normalization.
-            Defaults to the the max value of the dataset.
+            Defaults to the max value of the dataset.
 
         Examples
         --------
@@ -1269,9 +1421,8 @@ def __init__(self, vcenter, vmin=None, vmax=None):
             array([0., 0.25, 0.5, 0.625, 0.75, 0.875, 1.0])
         """
 
-        self.vcenter = vcenter
-        self.vmin = vmin
-        self.vmax = vmax
+        super().__init__(vmin=vmin, vmax=vmax)
+        self._vcenter = vcenter
         if vcenter is not None and vmax is not None and vcenter >= vmax:
             raise ValueError('vmin, vcenter, and vmax must be in '
                              'ascending order')
@@ -1279,6 +1430,16 @@ def __init__(self, vcenter, vmin=None, vmax=None):
             raise ValueError('vmin, vcenter, and vmax must be in '
                              'ascending order')
 
+    @property
+    def vcenter(self):
+        return self._vcenter
+
+    @vcenter.setter
+    def vcenter(self, value):
+        if value != self._vcenter:
+            self._vcenter = value
+            self._changed()
+
     def autoscale_None(self, A):
         """
         Get vmin and vmax, and then clip at vcenter
@@ -1298,13 +1459,25 @@ def __call__(self, value, clip=None):
 
         if not self.vmin <= self.vcenter <= self.vmax:
             raise ValueError("vmin, vcenter, vmax must increase monotonically")
+        # note that we must extrapolate for tick locators:
         result = np.ma.masked_array(
             np.interp(result, [self.vmin, self.vcenter, self.vmax],
-                      [0, 0.5, 1.]), mask=np.ma.getmask(result))
+                      [0, 0.5, 1], left=-np.inf, right=np.inf),
+            mask=np.ma.getmask(result))
         if is_scalar:
             result = np.atleast_1d(result)[0]
         return result
 
+    def inverse(self, value):
+        if not self.scaled():
+            raise ValueError("Not invertible until both vmin and vmax are set")
+        (vmin,), _ = self.process_value(self.vmin)
+        (vmax,), _ = self.process_value(self.vmax)
+        (vcenter,), _ = self.process_value(self.vcenter)
+        result = np.interp(value, [0, 0.5, 1], [vmin, vcenter, vmax],
+                           left=-np.inf, right=np.inf)
+        return result
+
 
 class CenteredNorm(Normalize):
     def __init__(self, vcenter=0, halfrange=None, clip=False):
@@ -1340,10 +1513,10 @@ def __init__(self, vcenter=0, halfrange=None, clip=False):
             >>> norm(data)
             array([0.25, 0.5 , 1.  ])
         """
+        super().__init__(vmin=None, vmax=None, clip=clip)
         self._vcenter = vcenter
         # calling the halfrange setter to set vmin and vmax
         self.halfrange = halfrange
-        self.clip = clip
 
     def _set_vmin_vmax(self):
         """
@@ -1364,7 +1537,7 @@ def autoscale(self, A):
     def autoscale_None(self, A):
         """Set *vmin* and *vmax*."""
         A = np.asanyarray(A)
-        if self.vmax is None and A.size:
+        if self._halfrange is None and A.size:
             self.autoscale(A)
 
     @property
@@ -1373,7 +1546,9 @@ def vcenter(self):
 
     @vcenter.setter
     def vcenter(self, vcenter):
-        self._vcenter = vcenter
+        if vcenter != self._vcenter:
+            self._vcenter = vcenter
+            self._changed()
         if self.vmax is not None:
             # recompute halfrange assuming vmin and vmax represent
             # min and max of data
@@ -1401,13 +1576,14 @@ def __call__(self, value, clip=None):
         return super().__call__(value, clip=clip)
 
 
-def _make_norm_from_scale(scale_cls, base_norm_cls=None, *, init=None):
+def make_norm_from_scale(scale_cls, base_norm_cls=None, *, init=None):
     """
-    Decorator for building a `.Normalize` subclass from a `.Scale` subclass.
+    Decorator for building a `.Normalize` subclass from a `~.scale.ScaleBase`
+    subclass.
 
     After ::
 
-        @_make_norm_from_scale(scale_cls)
+        @make_norm_from_scale(scale_cls)
         class norm_cls(Normalize):
             ...
 
@@ -1422,7 +1598,7 @@ class norm_cls(Normalize):
     a dummy axis).
 
     If the *scale_cls* constructor takes additional parameters, then *init*
-    should be passed to `_make_norm_from_scale`.  It is a callable which is
+    should be passed to `make_norm_from_scale`.  It is a callable which is
     *only* used for its signature.  First, this signature will become the
     signature of *norm_cls*.  Second, the *norm_cls* constructor will bind the
     parameters passed to it using this signature, extract the bound *vmin*,
@@ -1432,25 +1608,79 @@ class norm_cls(Normalize):
     """
 
     if base_norm_cls is None:
-        return functools.partial(_make_norm_from_scale, scale_cls, init=init)
+        return functools.partial(make_norm_from_scale, scale_cls, init=init)
+
+    if isinstance(scale_cls, functools.partial):
+        scale_args = scale_cls.args
+        scale_kwargs_items = tuple(scale_cls.keywords.items())
+        scale_cls = scale_cls.func
+    else:
+        scale_args = scale_kwargs_items = ()
 
     if init is None:
         def init(vmin=None, vmax=None, clip=False): pass
-    bound_init_signature = inspect.signature(init)
+
+    return _make_norm_from_scale(
+        scale_cls, scale_args, scale_kwargs_items,
+        base_norm_cls, inspect.signature(init))
+
+
+@functools.lru_cache(None)
+def _make_norm_from_scale(
+    scale_cls, scale_args, scale_kwargs_items,
+    base_norm_cls, bound_init_signature,
+):
+    """
+    Helper for `make_norm_from_scale`.
+
+    This function is split out to enable caching (in particular so that
+    different unpickles reuse the same class).  In order to do so,
+
+    - ``functools.partial`` *scale_cls* is expanded into ``func, args, kwargs``
+      to allow memoizing returned norms (partial instances always compare
+      unequal, but we can check identity based on ``func, args, kwargs``;
+    - *init* is replaced by *init_signature*, as signatures are picklable,
+      unlike to arbitrary lambdas.
+    """
 
     class Norm(base_norm_cls):
+        def __reduce__(self):
+            cls = type(self)
+            # If the class is toplevel-accessible, it is possible to directly
+            # pickle it "by name".  This is required to support norm classes
+            # defined at a module's toplevel, as the inner base_norm_cls is
+            # otherwise unpicklable (as it gets shadowed by the generated norm
+            # class).  If either import or attribute access fails, fall back to
+            # the general path.
+            try:
+                if cls is getattr(importlib.import_module(cls.__module__),
+                                  cls.__qualname__):
+                    return (_create_empty_object_of_class, (cls,), vars(self))
+            except (ImportError, AttributeError):
+                pass
+            return (_picklable_norm_constructor,
+                    (scale_cls, scale_args, scale_kwargs_items,
+                     base_norm_cls, bound_init_signature),
+                    vars(self))
 
         def __init__(self, *args, **kwargs):
             ba = bound_init_signature.bind(*args, **kwargs)
             ba.apply_defaults()
             super().__init__(
                 **{k: ba.arguments.pop(k) for k in ["vmin", "vmax", "clip"]})
-            self._scale = scale_cls(axis=None, **ba.arguments)
+            self._scale = functools.partial(
+                scale_cls, *scale_args, **dict(scale_kwargs_items))(
+                    axis=None, **ba.arguments)
             self._trf = self._scale.get_transform()
 
+        __init__.__signature__ = bound_init_signature.replace(parameters=[
+            inspect.Parameter("self", inspect.Parameter.POSITIONAL_OR_KEYWORD),
+            *bound_init_signature.parameters.values()])
+
         def __call__(self, value, clip=None):
             value, is_scalar = self.process_value(value)
-            self.autoscale_None(value)
+            if self.vmin is None or self.vmax is None:
+                self.autoscale_None(value)
             if self.vmin > self.vmax:
                 raise ValueError("vmin must be less or equal to vmax")
             if self.vmin == self.vmax:
@@ -1485,16 +1715,40 @@ def inverse(self, value):
                      .reshape(np.shape(value)))
             return value[0] if is_scalar else value
 
-    Norm.__name__ = base_norm_cls.__name__
-    Norm.__qualname__ = base_norm_cls.__qualname__
+        def autoscale(self, A):
+            # i.e. A[np.isfinite(...)], but also for non-array A's
+            in_trf_domain = np.extract(np.isfinite(self._trf.transform(A)), A)
+            if in_trf_domain.size == 0:
+                in_trf_domain = np.ma.masked
+            return super().autoscale(in_trf_domain)
+
+        def autoscale_None(self, A):
+            in_trf_domain = np.extract(np.isfinite(self._trf.transform(A)), A)
+            if in_trf_domain.size == 0:
+                in_trf_domain = np.ma.masked
+            return super().autoscale_None(in_trf_domain)
+
+    if base_norm_cls is Normalize:
+        Norm.__name__ = f"{scale_cls.__name__}Norm"
+        Norm.__qualname__ = f"{scale_cls.__qualname__}Norm"
+    else:
+        Norm.__name__ = base_norm_cls.__name__
+        Norm.__qualname__ = base_norm_cls.__qualname__
     Norm.__module__ = base_norm_cls.__module__
-    Norm.__init__.__signature__ = bound_init_signature.replace(parameters=[
-        inspect.Parameter("self", inspect.Parameter.POSITIONAL_OR_KEYWORD),
-        *bound_init_signature.parameters.values()])
+    Norm.__doc__ = base_norm_cls.__doc__
+
     return Norm
 
 
-@_make_norm_from_scale(
+def _create_empty_object_of_class(cls):
+    return cls.__new__(cls)
+
+
+def _picklable_norm_constructor(*args):
+    return _create_empty_object_of_class(_make_norm_from_scale(*args))
+
+
+@make_norm_from_scale(
     scale.FuncScale,
     init=lambda functions, vmin=None, vmax=None, clip=False: None)
 class FuncNorm(Normalize):
@@ -1527,20 +1781,13 @@ def forward(values: array-like) -> array-like
     """
 
 
-@_make_norm_from_scale(functools.partial(scale.LogScale, nonpositive="mask"))
-class LogNorm(Normalize):
-    """Normalize a given value to the 0-1 range on a log scale."""
-
-    def autoscale(self, A):
-        # docstring inherited.
-        super().autoscale(np.ma.masked_less_equal(A, 0, copy=False))
+LogNorm = make_norm_from_scale(
+    functools.partial(scale.LogScale, nonpositive="mask"))(Normalize)
+LogNorm.__name__ = LogNorm.__qualname__ = "LogNorm"
+LogNorm.__doc__ = "Normalize a given value to the 0-1 range on a log scale."
 
-    def autoscale_None(self, A):
-        # docstring inherited.
-        super().autoscale_None(np.ma.masked_less_equal(A, 0, copy=False))
 
-
-@_make_norm_from_scale(
+@make_norm_from_scale(
     scale.SymmetricalLogScale,
     init=lambda linthresh, linscale=1., vmin=None, vmax=None, clip=False, *,
                 base=10: None)
@@ -1578,6 +1825,38 @@ def linthresh(self, value):
         self._scale.linthresh = value
 
 
+@make_norm_from_scale(
+    scale.AsinhScale,
+    init=lambda linear_width=1, vmin=None, vmax=None, clip=False: None)
+class AsinhNorm(Normalize):
+    """
+    The inverse hyperbolic sine scale is approximately linear near
+    the origin, but becomes logarithmic for larger positive
+    or negative values. Unlike the `SymLogNorm`, the transition between
+    these linear and logarithmic regions is smooth, which may reduce
+    the risk of visual artifacts.
+
+    .. note::
+
+       This API is provisional and may be revised in the future
+       based on early user feedback.
+
+    Parameters
+    ----------
+    linear_width : float, default: 1
+        The effective width of the linear region, beyond which
+        the transformation becomes asymptotically logarithmic
+    """
+
+    @property
+    def linear_width(self):
+        return self._scale.linear_width
+
+    @linear_width.setter
+    def linear_width(self, value):
+        self._scale.linear_width = value
+
+
 class PowerNorm(Normalize):
     """
     Linearly map a given value to the 0-1 range and then apply
@@ -1635,19 +1914,23 @@ class BoundaryNorm(Normalize):
 
     Unlike `Normalize` or `LogNorm`, `BoundaryNorm` maps values to integers
     instead of to the interval 0-1.
-
-    Mapping to the 0-1 interval could have been done via piece-wise linear
-    interpolation, but using integers seems simpler, and reduces the number of
-    conversions back and forth between integer and floating point.
     """
+
+    # Mapping to the 0-1 interval could have been done via piece-wise linear
+    # interpolation, but using integers seems simpler, and reduces the number
+    # of conversions back and forth between int and float.
+
     def __init__(self, boundaries, ncolors, clip=False, *, extend='neither'):
         """
         Parameters
         ----------
         boundaries : array-like
-            Monotonically increasing sequence of at least 2 boundaries.
+            Monotonically increasing sequence of at least 2 bin edges:  data
+            falling in the n-th bin will be mapped to the n-th color.
+
         ncolors : int
             Number of colors in the colormap to be used.
+
         clip : bool, optional
             If clip is ``True``, out of range values are mapped to 0 if they
             are below ``boundaries[0]`` or mapped to ``ncolors - 1`` if they
@@ -1657,6 +1940,7 @@ def __init__(self, boundaries, ncolors, clip=False, *, extend='neither'):
             they are below ``boundaries[0]`` or mapped to *ncolors* if they are
             above ``boundaries[-1]``. These are then converted to valid indices
             by `Colormap.__call__`.
+
         extend : {'neither', 'both', 'min', 'max'}, default: 'neither'
             Extend the number of bins to include one or both of the
             regions beyond the boundaries.  For example, if ``extend``
@@ -1666,24 +1950,16 @@ def __init__(self, boundaries, ncolors, clip=False, *, extend='neither'):
             `~matplotlib.colorbar.Colorbar` will be drawn with
             the triangle extension on the left or lower end.
 
-        Returns
-        -------
-        int16 scalar or array
-
         Notes
         -----
-        *boundaries* defines the edges of bins, and data falling within a bin
-        is mapped to the color with the same index.
-
-        If the number of bins, including any extensions, is less than
-        *ncolors*, the color index is chosen by linear interpolation, mapping
-        the ``[0, nbins - 1]`` range onto the ``[0, ncolors - 1]`` range.
+        If there are fewer bins (including extensions) than colors, then the
+        color index is chosen by linearly interpolating the ``[0, nbins - 1]``
+        range onto the ``[0, ncolors - 1]`` range, effectively skipping some
+        colors in the middle of the colormap.
         """
         if clip and extend != 'neither':
             raise ValueError("'clip=True' is not compatible with 'extend'")
-        self.clip = clip
-        self.vmin = boundaries[0]
-        self.vmax = boundaries[-1]
+        super().__init__(vmin=boundaries[0], vmax=boundaries[-1], clip=clip)
         self.boundaries = np.asarray(boundaries)
         self.N = len(self.boundaries)
         if self.N < 2:
@@ -1708,6 +1984,10 @@ def __init__(self, boundaries, ncolors, clip=False, *, extend='neither'):
                              "number of bins")
 
     def __call__(self, value, clip=None):
+        """
+        This method behaves similarly to `.Normalize.__call__`, except that it
+        returns integers or arrays of int16.
+        """
         if clip is None:
             clip = self.clip
 
@@ -1721,7 +2001,7 @@ def __call__(self, value, clip=None):
         else:
             max_col = self.Ncmap
         # this gives us the bins in the lookup table in the range
-        # [0, _n_regions - 1]  (the offset is baked in in the init)
+        # [0, _n_regions - 1]  (the offset is set in the init)
         iret = np.digitize(xx, self.boundaries) - 1 + self._offset
         # if we have more colors than regions, stretch the region
         # index computed above to full range of the color bins.  This
@@ -2307,7 +2587,7 @@ def blend_soft_light(self, rgb, intensity):
 
     def blend_overlay(self, rgb, intensity):
         """
-        Combines an rgb image with an intensity map using "overlay" blending.
+        Combine an rgb image with an intensity map using "overlay" blending.
 
         Parameters
         ----------
diff --git a/lib/matplotlib/compat/__init__.py b/lib/matplotlib/compat/__init__.py
deleted file mode 100644
index 1d382019d5a8..000000000000
--- a/lib/matplotlib/compat/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from matplotlib import _api
-
-
-_api.warn_deprecated("3.3", name=__name__, obj_type="module")
diff --git a/lib/matplotlib/container.py b/lib/matplotlib/container.py
index c53cf9fccff9..a58e55ca196c 100644
--- a/lib/matplotlib/container.py
+++ b/lib/matplotlib/container.py
@@ -1,5 +1,5 @@
+from matplotlib import cbook
 from matplotlib.artist import Artist
-import matplotlib.cbook as cbook
 
 
 class Container(tuple):
@@ -18,7 +18,7 @@ def __new__(cls, *args, **kwargs):
         return tuple.__new__(cls, args[0])
 
     def __init__(self, kl, label=None):
-        self._callbacks = cbook.CallbackRegistry()
+        self._callbacks = cbook.CallbackRegistry(signals=["pchanged"])
         self._remove_method = None
         self.set_label(label)
 
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
index 00db07ab5bb8..2f8c934e70b9 100644
--- a/lib/matplotlib/contour.py
+++ b/lib/matplotlib/contour.py
@@ -2,13 +2,15 @@
 Classes to support contour plotting and labelling for the Axes class.
 """
 
+import functools
 from numbers import Integral
 
 import numpy as np
 from numpy import ma
 
 import matplotlib as mpl
-from matplotlib import _api
+from matplotlib import _api, _docstring
+from matplotlib.backend_bases import MouseButton
 import matplotlib.path as mpath
 import matplotlib.ticker as ticker
 import matplotlib.cm as cm
@@ -20,9 +22,6 @@
 import matplotlib.patches as mpatches
 import matplotlib.transforms as mtransforms
 
-# Import needed for adding manual selection capability to clabel
-from matplotlib.blocking_input import BlockingContourLabeler
-from matplotlib import docstring
 
 # We can't use a single line collection for contour because a line
 # collection can have only a single line style, and we want to be able to have
@@ -45,6 +44,35 @@ def get_rotation(self):
         return new_angle
 
 
+def _contour_labeler_event_handler(cs, inline, inline_spacing, event):
+    canvas = cs.axes.figure.canvas
+    is_button = event.name == "button_press_event"
+    is_key = event.name == "key_press_event"
+    # Quit (even if not in infinite mode; this is consistent with
+    # MATLAB and sometimes quite useful, but will require the user to
+    # test how many points were actually returned before using data).
+    if (is_button and event.button == MouseButton.MIDDLE
+            or is_key and event.key in ["escape", "enter"]):
+        canvas.stop_event_loop()
+    # Pop last click.
+    elif (is_button and event.button == MouseButton.RIGHT
+          or is_key and event.key in ["backspace", "delete"]):
+        # Unfortunately, if one is doing inline labels, then there is currently
+        # no way to fix the broken contour - once humpty-dumpty is broken, he
+        # can't be put back together.  In inline mode, this does nothing.
+        if not inline:
+            cs.pop_label()
+            canvas.draw()
+    # Add new click.
+    elif (is_button and event.button == MouseButton.LEFT
+          # On macOS/gtk, some keys return None.
+          or is_key and event.key is not None):
+        if event.inaxes == cs.axes:
+            cs.add_label_near(event.x, event.y, transform=False,
+                              inline=inline, inline_spacing=inline_spacing)
+            canvas.draw()
+
+
 class ContourLabeler:
     """Mixin to provide labelling capability to `.ContourSet`."""
 
@@ -198,8 +226,11 @@ def clabel(self, levels=None, *,
             print('End manual selection with second mouse button.')
             if not inline:
                 print('Remove last label by clicking third mouse button.')
-            blocking_contour_labeler = BlockingContourLabeler(self)
-            blocking_contour_labeler(inline, inline_spacing)
+            mpl._blocking_input.blocking_input_loop(
+                self.axes.figure, ["button_press_event", "key_press_event"],
+                timeout=-1, handler=functools.partial(
+                    _contour_labeler_event_handler,
+                    self, inline, inline_spacing))
         else:
             self.labels(inline, inline_spacing)
 
@@ -217,41 +248,28 @@ def too_close(self, x, y, lw):
         return any((x - loc[0]) ** 2 + (y - loc[1]) ** 2 < thresh
                    for loc in self.labelXYs)
 
-    @_api.deprecated("3.4")
-    def get_label_coords(self, distances, XX, YY, ysize, lw):
-        """
-        Return x, y, and the index of a label location.
-
-        Labels are plotted at a location with the smallest
-        deviation of the contour from a straight line
-        unless there is another label nearby, in which case
-        the next best place on the contour is picked up.
-        If all such candidates are rejected, the beginning
-        of the contour is chosen.
-        """
-        hysize = int(ysize / 2)
-        adist = np.argsort(distances)
-
-        for ind in adist:
-            x, y = XX[ind][hysize], YY[ind][hysize]
-            if self.too_close(x, y, lw):
-                continue
-            return x, y, ind
-
-        ind = adist[0]
-        x, y = XX[ind][hysize], YY[ind][hysize]
-        return x, y, ind
-
+    def _get_nth_label_width(self, nth):
+        """Return the width of the *nth* label, in pixels."""
+        fig = self.axes.figure
+        renderer = fig._get_renderer()
+        return (
+            text.Text(0, 0,
+                      self.get_text(self.labelLevelList[nth], self.labelFmt),
+                      figure=fig,
+                      size=self.labelFontSizeList[nth],
+                      fontproperties=self.labelFontProps)
+            .get_window_extent(renderer).width)
+
+    @_api.deprecated("3.5")
     def get_label_width(self, lev, fmt, fsize):
-        """
-        Return the width of the label in points.
-        """
+        """Return the width of the label in points."""
         if not isinstance(lev, str):
             lev = self.get_text(lev, fmt)
         fig = self.axes.figure
+        renderer = fig._get_renderer()
         width = (text.Text(0, 0, lev, figure=fig,
                            size=fsize, fontproperties=self.labelFontProps)
-                 .get_window_extent(mpl.tight_layout.get_renderer(fig)).width)
+                 .get_window_extent(renderer).width)
         width *= 72 / fig.dpi
         return width
 
@@ -498,11 +516,7 @@ def add_label_near(self, x, y, inline=True, inline_spacing=5,
         lmin = self.labelIndiceList.index(conmin)
 
         # Get label width for rotating labels and breaking contours
-        lw = self.get_label_width(self.labelLevelList[lmin],
-                                  self.labelFmt, self.labelFontSizeList[lmin])
-        # lw is in points.
-        lw *= self.axes.figure.dpi / 72  # scale to screen coordinates
-        # now lw in pixels
+        lw = self._get_nth_label_width(lmin)
 
         # Figure out label rotation.
         rotation, nlc = self.calc_label_rot_and_inline(
@@ -517,9 +531,7 @@ def add_label_near(self, x, y, inline=True, inline_spacing=5,
             paths.pop(segmin)
 
             # Add paths if not empty or single point
-            for n in nlc:
-                if len(n) > 1:
-                    paths.append(mpath.Path(n))
+            paths.extend([mpath.Path(n) for n in nlc if len(n) > 1])
 
     def pop_label(self, index=-1):
         """Defaults to removing last label, but any index can be supplied"""
@@ -534,14 +546,15 @@ def labels(self, inline, inline_spacing):
         else:
             add_label = self.add_label
 
-        for icon, lev, fsize, cvalue in zip(
-                self.labelIndiceList, self.labelLevelList,
-                self.labelFontSizeList, self.labelCValueList):
+        for idx, (icon, lev, cvalue) in enumerate(zip(
+                self.labelIndiceList,
+                self.labelLevelList,
+                self.labelCValueList,
+        )):
 
             con = self.collections[icon]
             trans = con.get_transform()
-            lw = self.get_label_width(lev, self.labelFmt, fsize)
-            lw *= self.axes.figure.dpi / 72  # scale to screen coordinates
+            lw = self._get_nth_label_width(idx)
             additions = []
             paths = con.get_paths()
             for segNum, linepath in enumerate(paths):
@@ -618,16 +631,15 @@ def _find_closest_point_on_path(xys, p):
     return (d2s[imin], projs[imin], (imin, imin+1))
 
 
-docstring.interpd.update(contour_set_attributes=r"""
+_docstring.interpd.update(contour_set_attributes=r"""
 Attributes
 ----------
 ax : `~matplotlib.axes.Axes`
     The Axes object in which the contours are drawn.
 
-collections : `.silent_list` of `.LineCollection`\s or `.PathCollection`\s
+collections : `.silent_list` of `.PathCollection`\s
     The `.Artist`\s representing the contour. This is a list of
-    `.LineCollection`\s for line contours and a list of `.PathCollection`\s
-    for filled contours.
+    `.PathCollection`\s for both line and filled contours.
 
 levels : array
     The values of the contour levels.
@@ -638,7 +650,7 @@ def _find_closest_point_on_path(xys, p):
 """)
 
 
-@docstring.dedent_interpd
+@_docstring.dedent_interpd
 class ContourSet(cm.ScalarMappable, ContourLabeler):
     """
     Store a set of contour lines or filled regions.
@@ -682,14 +694,12 @@ class ContourSet(cm.ScalarMappable, ContourLabeler):
     %(contour_set_attributes)s
     """
 
-    ax = _api.deprecated("3.3")(property(lambda self: self.axes))
-
     def __init__(self, ax, *args,
                  levels=None, filled=False, linewidths=None, linestyles=None,
                  hatches=(None,), alpha=None, origin=None, extent=None,
                  cmap=None, colors=None, norm=None, vmin=None, vmax=None,
                  extend='neither', antialiased=None, nchunk=0, locator=None,
-                 transform=None,
+                 transform=None, negative_linestyles=None,
                  **kwargs):
         """
         Draw contour lines or filled regions, depending on
@@ -774,9 +784,18 @@ def __init__(self, ax, *args,
 
         self._transform = transform
 
+        self.negative_linestyles = negative_linestyles
+        # If negative_linestyles was not defined as a keyword argument, define
+        # negative_linestyles with rcParams
+        if self.negative_linestyles is None:
+            self.negative_linestyles = \
+                mpl.rcParams['contour.negative_linestyle']
+
         kwargs = self._process_args(*args, **kwargs)
         self._process_levels()
 
+        self._extend_min = self.extend in ['min', 'both']
+        self._extend_max = self.extend in ['max', 'both']
         if self.colors is not None:
             ncolors = len(self.levels)
             if self.filled:
@@ -785,25 +804,27 @@ def __init__(self, ax, *args,
 
             # Handle the case where colors are given for the extended
             # parts of the contour.
-            extend_min = self.extend in ['min', 'both']
-            extend_max = self.extend in ['max', 'both']
+
             use_set_under_over = False
             # if we are extending the lower end, and we've been given enough
             # colors then skip the first color in the resulting cmap. For the
             # extend_max case we don't need to worry about passing more colors
             # than ncolors as ListedColormap will clip.
-            total_levels = ncolors + int(extend_min) + int(extend_max)
-            if len(self.colors) == total_levels and (extend_min or extend_max):
+            total_levels = (ncolors +
+                            int(self._extend_min) +
+                            int(self._extend_max))
+            if (len(self.colors) == total_levels and
+                    (self._extend_min or self._extend_max)):
                 use_set_under_over = True
-                if extend_min:
+                if self._extend_min:
                     i0 = 1
 
             cmap = mcolors.ListedColormap(self.colors[i0:None], N=ncolors)
 
             if use_set_under_over:
-                if extend_min:
+                if self._extend_min:
                     cmap.set_under(self.colors[0])
-                if extend_max:
+                if self._extend_max:
                     cmap.set_over(self.colors[-1])
 
         self.collections = cbook.silent_list(None)
@@ -823,16 +844,18 @@ def __init__(self, ax, *args,
             self.norm.vmax = vmax
         self._process_colors()
 
-        self.allsegs, self.allkinds = self._get_allsegs_and_allkinds()
+        if getattr(self, 'allsegs', None) is None:
+            self.allsegs, self.allkinds = self._get_allsegs_and_allkinds()
+        elif self.allkinds is None:
+            # allsegs specified in constructor may or may not have allkinds as
+            # well.  Must ensure allkinds can be zipped below.
+            self.allkinds = [None] * len(self.allsegs)
 
         if self.filled:
             if self.linewidths is not None:
                 _api.warn_external('linewidths is ignored by contourf')
             # Lower and upper contour levels.
             lowers, uppers = self._get_lowers_and_uppers()
-            # Ensure allkinds can be zipped below.
-            if self.allkinds is None:
-                self.allkinds = [None] * len(self.allsegs)
             # Default zorder taken from Collection
             self._contour_zorder = kwargs.pop('zorder', 1)
 
@@ -852,12 +875,14 @@ def __init__(self, ax, *args,
             aa = self.antialiased
             if aa is not None:
                 aa = (self.antialiased,)
-            # Default zorder taken from LineCollection
+            # Default zorder taken from LineCollection, which is higher than
+            # for filled contours so that lines are displayed on top.
             self._contour_zorder = kwargs.pop('zorder', 2)
 
             self.collections[:] = [
-                mcoll.LineCollection(
-                    segs,
+                mcoll.PathCollection(
+                    self._make_paths(segs, kinds),
+                    facecolors="none",
                     antialiaseds=aa,
                     linewidths=width,
                     linestyles=[lstyle],
@@ -865,8 +890,9 @@ def __init__(self, ax, *args,
                     transform=self.get_transform(),
                     zorder=self._contour_zorder,
                     label='_nolegend_')
-                for level, width, lstyle, segs
-                in zip(self.levels, tlinewidths, tlinestyles, self.allsegs)]
+                for level, width, lstyle, segs, kinds
+                in zip(self.levels, tlinewidths, tlinestyles, self.allsegs,
+                       self.allkinds)]
 
         for col in self.collections:
             self.axes.add_collection(col, autolim=False)
@@ -884,10 +910,7 @@ def __init__(self, ax, *args,
             )
 
     def get_transform(self):
-        """
-        Return the :class:`~matplotlib.transforms.Transform`
-        instance used by this ContourSet.
-        """
+        """Return the `.Transform` instance used by this ContourSet."""
         if self._transform is None:
             self._transform = self.axes.transData
         elif (not isinstance(self._transform, mtransforms.Transform)
@@ -998,11 +1021,23 @@ def _process_args(self, *args, **kwargs):
         return kwargs
 
     def _get_allsegs_and_allkinds(self):
-        """
-        Override in derived classes to create and return allsegs and allkinds.
-        allkinds can be None.
-        """
-        return self.allsegs, self.allkinds
+        """Compute ``allsegs`` and ``allkinds`` using C extension."""
+        allsegs = []
+        allkinds = []
+        if self.filled:
+            lowers, uppers = self._get_lowers_and_uppers()
+            for level, level_upper in zip(lowers, uppers):
+                vertices, kinds = \
+                    self._contour_generator.create_filled_contour(
+                        level, level_upper)
+                allsegs.append(vertices)
+                allkinds.append(kinds)
+        else:
+            for level in self.levels:
+                vertices, kinds = self._contour_generator.create_contour(level)
+                allsegs.append(vertices)
+                allkinds.append(kinds)
+        return allsegs, allkinds
 
     def _get_lowers_and_uppers(self):
         """
@@ -1020,13 +1055,32 @@ def _get_lowers_and_uppers(self):
         return (lowers, uppers)
 
     def _make_paths(self, segs, kinds):
-        if kinds is not None:
-            return [mpath.Path(seg, codes=kind)
-                    for seg, kind in zip(segs, kinds)]
-        else:
+        """
+        Create and return Path objects for the specified segments and optional
+        kind codes.  segs is a list of numpy arrays, each array is either a
+        closed line loop or open line strip of 2D points with a shape of
+        (npoints, 2).  kinds is either None or a list (with the same length as
+        segs) of numpy arrays, each array is of shape (npoints,) and contains
+        the kinds codes for the corresponding line in segs.  If kinds is None
+        then the Path constructor creates the kind codes assuming that the line
+        is an open strip.
+        """
+        if kinds is None:
             return [mpath.Path(seg) for seg in segs]
+        else:
+            return [mpath.Path(seg, codes=kind) for seg, kind
+                    in zip(segs, kinds)]
 
     def changed(self):
+        if not hasattr(self, "cvalues"):
+            # Just return after calling the super() changed function
+            cm.ScalarMappable.changed(self)
+            return
+        # Force an autoscale immediately because self.to_rgba() calls
+        # autoscale_None() internally with the data passed to it,
+        # so if vmin/vmax are not set yet, this would override them with
+        # content from *cvalues* rather than levels like we want
+        self.norm.autoscale_None(self.levels)
         tcolors = [(tuple(rgba),)
                    for rgba in self.to_rgba(self.cvalues, alpha=self.alpha)]
         self.tcolors = tcolors
@@ -1038,7 +1092,7 @@ def changed(self):
                 # update the collection's hatch (may be None)
                 collection.set_hatch(hatch)
             else:
-                collection.set_color(color)
+                collection.set_edgecolor(color)
         for label, cv in zip(self.labelTexts, self.labelCValues):
             label.set_alpha(self.alpha)
             label.set_color(self.labelMappable.to_rgba(cv))
@@ -1227,11 +1281,10 @@ def _process_linestyles(self):
         if linestyles is None:
             tlinestyles = ['solid'] * Nlev
             if self.monochrome:
-                neg_ls = mpl.rcParams['contour.negative_linestyle']
                 eps = - (self.zmax - self.zmin) * 1e-15
                 for i, lev in enumerate(self.levels):
                     if lev < eps:
-                        tlinestyles[i] = neg_ls
+                        tlinestyles[i] = self.negative_linestyles
         else:
             if isinstance(linestyles, str):
                 tlinestyles = [linestyles] * Nlev
@@ -1262,9 +1315,11 @@ def find_nearest_contour(self, x, y, indices=None, pixel=True):
         """
         Find the point in the contour plot that is closest to ``(x, y)``.
 
+        This method does not support filled contours.
+
         Parameters
         ----------
-        x, y: float
+        x, y : float
             The reference point.
         indices : list of int or None, default: None
             Indices of contour levels to consider.  If None (the default), all
@@ -1298,8 +1353,11 @@ def find_nearest_contour(self, x, y, indices=None, pixel=True):
         # sufficiently well that the time is not noticeable.
         # Nonetheless, improvements could probably be made.
 
+        if self.filled:
+            raise ValueError("Method does not support filled contours.")
+
         if indices is None:
-            indices = range(len(self.levels))
+            indices = range(len(self.collections))
 
         d2min = np.inf
         conmin = None
@@ -1332,7 +1390,7 @@ def find_nearest_contour(self, x, y, indices=None, pixel=True):
         return (conmin, segmin, imin, xmin, ymin, d2min)
 
 
-@docstring.dedent_interpd
+@_docstring.dedent_interpd
 class QuadContourSet(ContourSet):
     """
     Create and store a set of contour lines or filled regions.
@@ -1343,7 +1401,7 @@ class QuadContourSet(ContourSet):
     %(contour_set_attributes)s
     """
 
-    def _process_args(self, *args, corner_mask=None, **kwargs):
+    def _process_args(self, *args, corner_mask=None, algorithm=None, **kwargs):
         """
         Process args and kwargs.
         """
@@ -1356,21 +1414,31 @@ def _process_args(self, *args, corner_mask=None, **kwargs):
             contour_generator = args[0]._contour_generator
             self._mins = args[0]._mins
             self._maxs = args[0]._maxs
+            self._algorithm = args[0]._algorithm
         else:
-            import matplotlib._contour as _contour
+            import contourpy
+
+            if algorithm is None:
+                algorithm = mpl.rcParams['contour.algorithm']
+            mpl.rcParams.validate["contour.algorithm"](algorithm)
+            self._algorithm = algorithm
 
             if corner_mask is None:
-                corner_mask = mpl.rcParams['contour.corner_mask']
+                if self._algorithm == "mpl2005":
+                    # mpl2005 does not support corner_mask=True so if not
+                    # specifically requested then disable it.
+                    corner_mask = False
+                else:
+                    corner_mask = mpl.rcParams['contour.corner_mask']
             self._corner_mask = corner_mask
 
             x, y, z = self._contour_args(args, kwargs)
 
-            _mask = ma.getmask(z)
-            if _mask is ma.nomask or not _mask.any():
-                _mask = None
-
-            contour_generator = _contour.QuadContourGenerator(
-                x, y, z.filled(), _mask, self._corner_mask, self.nchunk)
+            contour_generator = contourpy.contour_generator(
+                x, y, z, name=self._algorithm, corner_mask=self._corner_mask,
+                line_type=contourpy.LineType.SeparateCode,
+                fill_type=contourpy.FillType.OuterCode,
+                chunk_size=self.nchunk)
 
             t = self.get_transform()
 
@@ -1391,25 +1459,6 @@ def _process_args(self, *args, corner_mask=None, **kwargs):
 
         return kwargs
 
-    def _get_allsegs_and_allkinds(self):
-        """Compute ``allsegs`` and ``allkinds`` using C extension."""
-        allsegs = []
-        if self.filled:
-            lowers, uppers = self._get_lowers_and_uppers()
-            allkinds = []
-            for level, level_upper in zip(lowers, uppers):
-                vertices, kinds = \
-                    self._contour_generator.create_filled_contour(
-                        level, level_upper)
-                allsegs.append(vertices)
-                allkinds.append(kinds)
-        else:
-            allkinds = None
-            for level in self.levels:
-                vertices = self._contour_generator.create_contour(level)
-                allsegs.append(vertices)
-        return allsegs, allkinds
-
     def _contour_args(self, args, kwargs):
         if self.filled:
             fn = 'contourf'
@@ -1521,207 +1570,240 @@ def _initialize_x_y(self, z):
             y = y[::-1]
         return np.meshgrid(x, y)
 
-    _contour_doc = """
-        `.contour` and `.contourf` draw contour lines and filled contours,
-        respectively.  Except as noted, function signatures and return values
-        are the same for both versions.
 
-        Parameters
-        ----------
-        X, Y : array-like, optional
-            The coordinates of the values in *Z*.
+_docstring.interpd.update(contour_doc="""
+`.contour` and `.contourf` draw contour lines and filled contours,
+respectively.  Except as noted, function signatures and return values
+are the same for both versions.
 
-            *X* and *Y* must both be 2D with the same shape as *Z* (e.g.
-            created via `numpy.meshgrid`), or they must both be 1-D such
-            that ``len(X) == M`` is the number of columns in *Z* and
-            ``len(Y) == N`` is the number of rows in *Z*.
+Parameters
+----------
+X, Y : array-like, optional
+    The coordinates of the values in *Z*.
 
-            If not given, they are assumed to be integer indices, i.e.
-            ``X = range(M)``, ``Y = range(N)``.
+    *X* and *Y* must both be 2D with the same shape as *Z* (e.g.
+    created via `numpy.meshgrid`), or they must both be 1-D such
+    that ``len(X) == N`` is the number of columns in *Z* and
+    ``len(Y) == M`` is the number of rows in *Z*.
 
-        Z : (M, N) array-like
-            The height values over which the contour is drawn.
+    *X* and *Y* must both be ordered monotonically.
 
-        levels : int or array-like, optional
-            Determines the number and positions of the contour lines / regions.
+    If not given, they are assumed to be integer indices, i.e.
+    ``X = range(N)``, ``Y = range(M)``.
 
-            If an int *n*, use `~matplotlib.ticker.MaxNLocator`, which tries
-            to automatically choose no more than *n+1* "nice" contour levels
-            between *vmin* and *vmax*.
+Z : (M, N) array-like
+    The height values over which the contour is drawn.  Color-mapping is
+    controlled by *cmap*, *norm*, *vmin*, and *vmax*.
 
-            If array-like, draw contour lines at the specified levels.
-            The values must be in increasing order.
+levels : int or array-like, optional
+    Determines the number and positions of the contour lines / regions.
 
-        Returns
-        -------
-        `~.contour.QuadContourSet`
-
-        Other Parameters
-        ----------------
-        corner_mask : bool, default: :rc:`contour.corner_mask`
-            Enable/disable corner masking, which only has an effect if *Z* is
-            a masked array.  If ``False``, any quad touching a masked point is
-            masked out.  If ``True``, only the triangular corners of quads
-            nearest those points are always masked out, other triangular
-            corners comprising three unmasked points are contoured as usual.
-
-        colors : color string or sequence of colors, optional
-            The colors of the levels, i.e. the lines for `.contour` and the
-            areas for `.contourf`.
-
-            The sequence is cycled for the levels in ascending order. If the
-            sequence is shorter than the number of levels, it's repeated.
-
-            As a shortcut, single color strings may be used in place of
-            one-element lists, i.e. ``'red'`` instead of ``['red']`` to color
-            all levels with the same color. This shortcut does only work for
-            color strings, not for other ways of specifying colors.
-
-            By default (value *None*), the colormap specified by *cmap*
-            will be used.
-
-        alpha : float, default: 1
-            The alpha blending value, between 0 (transparent) and 1 (opaque).
-
-        cmap : str or `.Colormap`, default: :rc:`image.cmap`
-            A `.Colormap` instance or registered colormap name. The colormap
-            maps the level values to colors.
-
-            If both *colors* and *cmap* are given, an error is raised.
-
-        norm : `~matplotlib.colors.Normalize`, optional
-            If a colormap is used, the `.Normalize` instance scales the level
-            values to the canonical colormap range [0, 1] for mapping to
-            colors. If not given, the default linear scaling is used.
-
-        vmin, vmax : float, optional
-            If not *None*, either or both of these values will be supplied to
-            the `.Normalize` instance, overriding the default color scaling
-            based on *levels*.
-
-        origin : {*None*, 'upper', 'lower', 'image'}, default: None
-            Determines the orientation and exact position of *Z* by specifying
-            the position of ``Z[0, 0]``.  This is only relevant, if *X*, *Y*
-            are not given.
-
-            - *None*: ``Z[0, 0]`` is at X=0, Y=0 in the lower left corner.
-            - 'lower': ``Z[0, 0]`` is at X=0.5, Y=0.5 in the lower left corner.
-            - 'upper': ``Z[0, 0]`` is at X=N+0.5, Y=0.5 in the upper left
-              corner.
-            - 'image': Use the value from :rc:`image.origin`.
-
-        extent : (x0, x1, y0, y1), optional
-            If *origin* is not *None*, then *extent* is interpreted as in
-            `.imshow`: it gives the outer pixel boundaries. In this case, the
-            position of Z[0, 0] is the center of the pixel, not a corner. If
-            *origin* is *None*, then (*x0*, *y0*) is the position of Z[0, 0],
-            and (*x1*, *y1*) is the position of Z[-1, -1].
-
-            This argument is ignored if *X* and *Y* are specified in the call
-            to contour.
-
-        locator : ticker.Locator subclass, optional
-            The locator is used to determine the contour levels if they
-            are not given explicitly via *levels*.
-            Defaults to `~.ticker.MaxNLocator`.
-
-        extend : {'neither', 'both', 'min', 'max'}, default: 'neither'
-            Determines the ``contourf``-coloring of values that are outside the
-            *levels* range.
-
-            If 'neither', values outside the *levels* range are not colored.
-            If 'min', 'max' or 'both', color the values below, above or below
-            and above the *levels* range.
-
-            Values below ``min(levels)`` and above ``max(levels)`` are mapped
-            to the under/over values of the `.Colormap`. Note that most
-            colormaps do not have dedicated colors for these by default, so
-            that the over and under values are the edge values of the colormap.
-            You may want to set these values explicitly using
-            `.Colormap.set_under` and `.Colormap.set_over`.
-
-            .. note::
-
-                An existing `.QuadContourSet` does not get notified if
-                properties of its colormap are changed. Therefore, an explicit
-                call `.QuadContourSet.changed()` is needed after modifying the
-                colormap. The explicit call can be left out, if a colorbar is
-                assigned to the `.QuadContourSet` because it internally calls
-                `.QuadContourSet.changed()`.
-
-            Example::
-
-                x = np.arange(1, 10)
-                y = x.reshape(-1, 1)
-                h = x * y
-
-                cs = plt.contourf(h, levels=[10, 30, 50],
-                    colors=['#808080', '#A0A0A0', '#C0C0C0'], extend='both')
-                cs.cmap.set_over('red')
-                cs.cmap.set_under('blue')
-                cs.changed()
-
-        xunits, yunits : registered units, optional
-            Override axis units by specifying an instance of a
-            :class:`matplotlib.units.ConversionInterface`.
-
-        antialiased : bool, optional
-            Enable antialiasing, overriding the defaults.  For
-            filled contours, the default is *True*.  For line contours,
-            it is taken from :rc:`lines.antialiased`.
-
-        nchunk : int >= 0, optional
-            If 0, no subdivision of the domain.  Specify a positive integer to
-            divide the domain into subdomains of *nchunk* by *nchunk* quads.
-            Chunking reduces the maximum length of polygons generated by the
-            contouring algorithm which reduces the rendering workload passed
-            on to the backend and also requires slightly less RAM.  It can
-            however introduce rendering artifacts at chunk boundaries depending
-            on the backend, the *antialiased* flag and value of *alpha*.
-
-        linewidths : float or array-like, default: :rc:`contour.linewidth`
-            *Only applies to* `.contour`.
-
-            The line width of the contour lines.
-
-            If a number, all levels will be plotted with this linewidth.
-
-            If a sequence, the levels in ascending order will be plotted with
-            the linewidths in the order specified.
-
-            If None, this falls back to :rc:`lines.linewidth`.
-
-        linestyles : {*None*, 'solid', 'dashed', 'dashdot', 'dotted'}, optional
-            *Only applies to* `.contour`.
-
-            If *linestyles* is *None*, the default is 'solid' unless the lines
-            are monochrome.  In that case, negative contours will take their
-            linestyle from :rc:`contour.negative_linestyle` setting.
-
-            *linestyles* can also be an iterable of the above strings
-            specifying a set of linestyles to be used. If this
-            iterable is shorter than the number of contour levels
-            it will be repeated as necessary.
-
-        hatches : list[str], optional
-            *Only applies to* `.contourf`.
-
-            A list of cross hatch patterns to use on the filled areas.
-            If None, no hatching will be added to the contour.
-            Hatching is supported in the PostScript, PDF, SVG and Agg
-            backends only.
-
-        Notes
-        -----
-        1. `.contourf` differs from the MATLAB version in that it does not draw
-           the polygon edges. To draw edges, add line contours with calls to
-           `.contour`.
+    If an int *n*, use `~matplotlib.ticker.MaxNLocator`, which tries
+    to automatically choose no more than *n+1* "nice" contour levels
+    between minimum and maximum numeric values of *Z*.
 
-        2. `.contourf` fills intervals that are closed at the top; that is, for
-           boundaries *z1* and *z2*, the filled region is::
+    If array-like, draw contour lines at the specified levels.
+    The values must be in increasing order.
 
-              z1 < Z <= z2
+Returns
+-------
+`~.contour.QuadContourSet`
 
-           except for the lowest interval, which is closed on both sides (i.e.
-           it includes the lowest value).
-        """
+Other Parameters
+----------------
+corner_mask : bool, default: :rc:`contour.corner_mask`
+    Enable/disable corner masking, which only has an effect if *Z* is
+    a masked array.  If ``False``, any quad touching a masked point is
+    masked out.  If ``True``, only the triangular corners of quads
+    nearest those points are always masked out, other triangular
+    corners comprising three unmasked points are contoured as usual.
+
+colors : color string or sequence of colors, optional
+    The colors of the levels, i.e. the lines for `.contour` and the
+    areas for `.contourf`.
+
+    The sequence is cycled for the levels in ascending order. If the
+    sequence is shorter than the number of levels, it's repeated.
+
+    As a shortcut, single color strings may be used in place of
+    one-element lists, i.e. ``'red'`` instead of ``['red']`` to color
+    all levels with the same color. This shortcut does only work for
+    color strings, not for other ways of specifying colors.
+
+    By default (value *None*), the colormap specified by *cmap*
+    will be used.
+
+alpha : float, default: 1
+    The alpha blending value, between 0 (transparent) and 1 (opaque).
+
+%(cmap_doc)s
+
+    This parameter is ignored if *colors* is set.
+
+%(norm_doc)s
+
+    This parameter is ignored if *colors* is set.
+
+%(vmin_vmax_doc)s
+
+    If *vmin* or *vmax* are not given, the default color scaling is based on
+    *levels*.
+
+    This parameter is ignored if *colors* is set.
+
+origin : {*None*, 'upper', 'lower', 'image'}, default: None
+    Determines the orientation and exact position of *Z* by specifying
+    the position of ``Z[0, 0]``.  This is only relevant, if *X*, *Y*
+    are not given.
+
+    - *None*: ``Z[0, 0]`` is at X=0, Y=0 in the lower left corner.
+    - 'lower': ``Z[0, 0]`` is at X=0.5, Y=0.5 in the lower left corner.
+    - 'upper': ``Z[0, 0]`` is at X=N+0.5, Y=0.5 in the upper left
+      corner.
+    - 'image': Use the value from :rc:`image.origin`.
+
+extent : (x0, x1, y0, y1), optional
+    If *origin* is not *None*, then *extent* is interpreted as in
+    `.imshow`: it gives the outer pixel boundaries. In this case, the
+    position of Z[0, 0] is the center of the pixel, not a corner. If
+    *origin* is *None*, then (*x0*, *y0*) is the position of Z[0, 0],
+    and (*x1*, *y1*) is the position of Z[-1, -1].
+
+    This argument is ignored if *X* and *Y* are specified in the call
+    to contour.
+
+locator : ticker.Locator subclass, optional
+    The locator is used to determine the contour levels if they
+    are not given explicitly via *levels*.
+    Defaults to `~.ticker.MaxNLocator`.
+
+extend : {'neither', 'both', 'min', 'max'}, default: 'neither'
+    Determines the ``contourf``-coloring of values that are outside the
+    *levels* range.
+
+    If 'neither', values outside the *levels* range are not colored.
+    If 'min', 'max' or 'both', color the values below, above or below
+    and above the *levels* range.
+
+    Values below ``min(levels)`` and above ``max(levels)`` are mapped
+    to the under/over values of the `.Colormap`. Note that most
+    colormaps do not have dedicated colors for these by default, so
+    that the over and under values are the edge values of the colormap.
+    You may want to set these values explicitly using
+    `.Colormap.set_under` and `.Colormap.set_over`.
+
+    .. note::
+
+        An existing `.QuadContourSet` does not get notified if
+        properties of its colormap are changed. Therefore, an explicit
+        call `.QuadContourSet.changed()` is needed after modifying the
+        colormap. The explicit call can be left out, if a colorbar is
+        assigned to the `.QuadContourSet` because it internally calls
+        `.QuadContourSet.changed()`.
+
+    Example::
+
+        x = np.arange(1, 10)
+        y = x.reshape(-1, 1)
+        h = x * y
+
+        cs = plt.contourf(h, levels=[10, 30, 50],
+            colors=['#808080', '#A0A0A0', '#C0C0C0'], extend='both')
+        cs.cmap.set_over('red')
+        cs.cmap.set_under('blue')
+        cs.changed()
+
+xunits, yunits : registered units, optional
+    Override axis units by specifying an instance of a
+    :class:`matplotlib.units.ConversionInterface`.
+
+antialiased : bool, optional
+    Enable antialiasing, overriding the defaults.  For
+    filled contours, the default is *True*.  For line contours,
+    it is taken from :rc:`lines.antialiased`.
+
+nchunk : int >= 0, optional
+    If 0, no subdivision of the domain.  Specify a positive integer to
+    divide the domain into subdomains of *nchunk* by *nchunk* quads.
+    Chunking reduces the maximum length of polygons generated by the
+    contouring algorithm which reduces the rendering workload passed
+    on to the backend and also requires slightly less RAM.  It can
+    however introduce rendering artifacts at chunk boundaries depending
+    on the backend, the *antialiased* flag and value of *alpha*.
+
+linewidths : float or array-like, default: :rc:`contour.linewidth`
+    *Only applies to* `.contour`.
+
+    The line width of the contour lines.
+
+    If a number, all levels will be plotted with this linewidth.
+
+    If a sequence, the levels in ascending order will be plotted with
+    the linewidths in the order specified.
+
+    If None, this falls back to :rc:`lines.linewidth`.
+
+linestyles : {*None*, 'solid', 'dashed', 'dashdot', 'dotted'}, optional
+    *Only applies to* `.contour`.
+
+    If *linestyles* is *None*, the default is 'solid' unless the lines are
+    monochrome. In that case, negative contours will instead take their
+    linestyle from the *negative_linestyles* argument.
+
+    *linestyles* can also be an iterable of the above strings specifying a set
+    of linestyles to be used. If this iterable is shorter than the number of
+    contour levels it will be repeated as necessary.
+
+negative_linestyles : {*None*, 'solid', 'dashed', 'dashdot', 'dotted'}, \
+                       optional
+    *Only applies to* `.contour`.
+
+    If *linestyles* is *None* and the lines are monochrome, this argument
+    specifies the line style for negative contours.
+
+    If *negative_linestyles* is *None*, the default is taken from
+    :rc:`contour.negative_linestyles`.
+
+    *negative_linestyles* can also be an iterable of the above strings
+    specifying a set of linestyles to be used. If this iterable is shorter than
+    the number of contour levels it will be repeated as necessary.
+
+hatches : list[str], optional
+    *Only applies to* `.contourf`.
+
+    A list of cross hatch patterns to use on the filled areas.
+    If None, no hatching will be added to the contour.
+    Hatching is supported in the PostScript, PDF, SVG and Agg
+    backends only.
+
+algorithm : {'mpl2005', 'mpl2014', 'serial', 'threaded'}, optional
+    Which contouring algorithm to use to calculate the contour lines and
+    polygons. The algorithms are implemented in
+    `ContourPy <https://github.com/contourpy/contourpy>`_, consult the
+    `ContourPy documentation <https://contourpy.readthedocs.io>`_ for
+    further information.
+
+    The default is taken from :rc:`contour.algorithm`.
+
+data : indexable object, optional
+    DATA_PARAMETER_PLACEHOLDER
+
+Notes
+-----
+1. `.contourf` differs from the MATLAB version in that it does not draw
+   the polygon edges. To draw edges, add line contours with calls to
+   `.contour`.
+
+2. `.contourf` fills intervals that are closed at the top; that is, for
+   boundaries *z1* and *z2*, the filled region is::
+
+      z1 < Z <= z2
+
+   except for the lowest interval, which is closed on both sides (i.e.
+   it includes the lowest value).
+
+3. `.contour` and `.contourf` use a `marching squares
+   <https://en.wikipedia.org/wiki/Marching_squares>`_ algorithm to
+   compute contour locations.  More information can be found in
+   `ContourPy documentation <https://contourpy.readthedocs.io>`_.
+""" % _docstring.interpd.params)
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
index 8d226c0d73c9..672ea2c3b003 100644
--- a/lib/matplotlib/dates.py
+++ b/lib/matplotlib/dates.py
@@ -1,6 +1,28 @@
 """
 Matplotlib provides sophisticated date plotting capabilities, standing on the
-shoulders of python :mod:`datetime` and the add-on module :mod:`dateutil`.
+shoulders of python :mod:`datetime` and the add-on module dateutil_.
+
+By default, Matplotlib uses the units machinery described in
+`~matplotlib.units` to convert `datetime.datetime`, and `numpy.datetime64`
+objects when plotted on an x- or y-axis. The user does not
+need to do anything for dates to be formatted, but dates often have strict
+formatting needs, so this module provides many axis locators and formatters.
+A basic example using `numpy.datetime64` is::
+
+    import numpy as np
+
+    times = np.arange(np.datetime64('2001-01-02'),
+                      np.datetime64('2002-02-03'), np.timedelta64(75, 'm'))
+    y = np.random.randn(len(times))
+
+    fig, ax = plt.subplots()
+    ax.plot(times, y)
+
+.. seealso::
+
+    - :doc:`/gallery/text_labels_and_annotations/date`
+    - :doc:`/gallery/ticks/date_concise_formatter`
+    - :doc:`/gallery/ticks/date_demo_convert`
 
 .. _date-format:
 
@@ -16,7 +38,7 @@
 20 microseconds for the rest of the allowable range of dates (year 0001 to
 9999). The epoch can be changed at import time via `.dates.set_epoch` or
 :rc:`dates.epoch` to other dates if necessary; see
-:doc:`/gallery/ticks_and_spines/date_precision_and_epochs` for a discussion.
+:doc:`/gallery/ticks/date_precision_and_epochs` for a discussion.
 
 .. note::
 
@@ -61,10 +83,11 @@
      Out[1]: 732401
 
 All the Matplotlib date converters, tickers and formatters are timezone aware.
-If no explicit timezone is provided, :rc:`timezone` is assumed.  If you want to
-use a custom time zone, pass a `datetime.tzinfo` instance with the tz keyword
-argument to `num2date`, `~.Axes.plot_date`, and any custom date tickers or
-locators you create.
+If no explicit timezone is provided, :rc:`timezone` is assumed, provided as a
+string.  If you want to use a different timezone, pass the *tz* keyword
+argument of `num2date` to any date tickers or locators you create.  This can
+be either a `datetime.tzinfo` instance or a string with the timezone name that
+can be parsed by `~dateutil.tz.gettz`.
 
 A wide range of specific and general purpose date tick locators and
 formatters are provided in this module.  See
@@ -119,10 +142,10 @@
 
 * `YearLocator`: Locate years that are multiples of base.
 
-* `RRuleLocator`: Locate using a `matplotlib.dates.rrulewrapper`.
-  `.rrulewrapper` is a simple wrapper around dateutil_'s `dateutil.rrule` which
-  allow almost arbitrary date tick specifications.  See :doc:`rrule example
-  </gallery/ticks_and_spines/date_demo_rrule>`.
+* `RRuleLocator`: Locate using a `rrulewrapper`.
+  `rrulewrapper` is a simple wrapper around dateutil_'s `dateutil.rrule`
+  which allow almost arbitrary date tick specifications.
+  See :doc:`rrule example </gallery/ticks/date_demo_rrule>`.
 
 * `AutoDateLocator`: On autoscale, this class picks the best `DateLocator`
   (e.g., `RRuleLocator`) to set the view limits and the tick locations.  If
@@ -144,8 +167,6 @@
   date information.  This is most useful when used with the `AutoDateLocator`.
 
 * `DateFormatter`: use `~datetime.datetime.strftime` format strings.
-
-* `IndexDateFormatter`: date plots with implicit *x* indexing.
 """
 
 import datetime
@@ -167,7 +188,7 @@
 
 __all__ = ('datestr2num', 'date2num', 'num2date', 'num2timedelta', 'drange',
            'epoch2num', 'num2epoch', 'set_epoch', 'get_epoch', 'DateFormatter',
-           'ConciseDateFormatter', 'IndexDateFormatter', 'AutoDateFormatter',
+           'ConciseDateFormatter', 'AutoDateFormatter',
            'DateLocator', 'RRuleLocator', 'AutoDateLocator', 'YearLocator',
            'MonthLocator', 'WeekdayLocator',
            'DayLocator', 'HourLocator', 'MinuteLocator',
@@ -175,24 +196,34 @@
            'rrule', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA', 'SU',
            'YEARLY', 'MONTHLY', 'WEEKLY', 'DAILY',
            'HOURLY', 'MINUTELY', 'SECONDLY', 'MICROSECONDLY', 'relativedelta',
-           'DateConverter', 'ConciseDateConverter')
+           'DateConverter', 'ConciseDateConverter', 'rrulewrapper')
 
 
 _log = logging.getLogger(__name__)
 UTC = datetime.timezone.utc
 
 
-def _get_rc_timezone():
-    """Retrieve the preferred timezone from the rcParams dictionary."""
-    s = mpl.rcParams['timezone']
-    if s == 'UTC':
-        return UTC
-    return dateutil.tz.gettz(s)
-
-
-"""
-Time-related constants.
-"""
+def _get_tzinfo(tz=None):
+    """
+    Generate tzinfo from a string or return tzinfo. If None,
+    retrieve the preferred timezone from the rcParams dictionary.
+    """
+    if tz is None:
+        tz = mpl.rcParams['timezone']
+        if tz == 'UTC':
+            return UTC
+    if isinstance(tz, str):
+        tzinfo = dateutil.tz.gettz(tz)
+        if tzinfo is None:
+            raise ValueError(f"{tz} is not a valid timezone as parsed by"
+                             " dateutil.tz.gettz.")
+        return tzinfo
+    if isinstance(tz, datetime.tzinfo):
+        return tz
+    raise TypeError("tz must be string or tzinfo subclass.")
+
+
+# Time-related constants.
 EPOCH_OFFSET = float(datetime.datetime(1970, 1, 1).toordinal())
 # EPOCH_OFFSET is not used by matplotlib
 JULIAN_OFFSET = 1721424.5  # Julian date at 0000-12-31
@@ -251,7 +282,7 @@ def set_epoch(epoch):
     `~.dates.set_epoch` must be called before any dates are converted
     (i.e. near the import section) or a RuntimeError will be raised.
 
-    See also :doc:`/gallery/ticks_and_spines/date_precision_and_epochs`.
+    See also :doc:`/gallery/ticks/date_precision_and_epochs`.
 
     Parameters
     ----------
@@ -302,11 +333,7 @@ def _dt64_to_ordinalf(d):
 
     NaT_int = np.datetime64('NaT').astype(np.int64)
     d_int = d.astype(np.int64)
-    try:
-        dt[d_int == NaT_int] = np.nan
-    except TypeError:
-        if d_int == NaT_int:
-            dt = np.nan
+    dt[d_int == NaT_int] = np.nan
     return dt
 
 
@@ -321,8 +348,7 @@ def _from_ordinalf(x, tz=None):
     :rc:`timezone`.
     """
 
-    if tz is None:
-        tz = _get_rc_timezone()
+    tz = _get_tzinfo(tz)
 
     dt = (np.datetime64(get_epoch()) +
           np.timedelta64(int(np.round(x * MUSECONDS_PER_DAY)), 'us'))
@@ -375,7 +401,9 @@ def datestr2num(d, default=None):
         return date2num(dt)
     else:
         if default is not None:
-            d = [dateutil.parser.parse(s, default=default) for s in d]
+            d = [date2num(dateutil.parser.parse(s, default=default))
+                 for s in d]
+            return np.asarray(d)
         d = np.asarray(d)
         if not d.size:
             return d
@@ -403,9 +431,8 @@ def date2num(d):
     The Gregorian calendar is assumed; this is not universal practice.
     For details see the module docstring.
     """
-    if hasattr(d, "values"):
-        # this unpacks pandas series or dataframes...
-        d = d.values
+    # Unpack in case of e.g. Pandas or xarray object
+    d = cbook._unpack_to_numpy(d)
 
     # make an iterable, but save state to unpack later:
     iterable = np.iterable(d)
@@ -486,8 +513,8 @@ def num2date(x, tz=None):
         Number of days (fraction part represents hours, minutes, seconds)
         since the epoch.  See `.get_epoch` for the
         epoch, which can be changed by :rc:`date.epoch` or `.set_epoch`.
-    tz : str, default: :rc:`timezone`
-        Timezone of *x*.
+    tz : str or `~datetime.tzinfo`, default: :rc:`timezone`
+        Timezone of *x*. If a string, *tz* is passed to `dateutil.tz`.
 
     Returns
     -------
@@ -499,12 +526,10 @@ def num2date(x, tz=None):
 
     Notes
     -----
-    The addition of one here is a historical artifact. Also, note that the
-    Gregorian calendar is assumed; this is not universal practice.
+    The Gregorian calendar is assumed; this is not universal practice.
     For details, see the module docstring.
     """
-    if tz is None:
-        tz = _get_rc_timezone()
+    tz = _get_tzinfo(tz)
     return _from_ordinalf_np_vectorized(x, tz).tolist()
 
 
@@ -563,7 +588,8 @@ def drange(dstart, dend, delta):
 
     # ensure, that an half open interval will be generated [dstart, dend)
     if dinterval_end >= dend:
-        # if the endpoint is greater than dend, just subtract one delta
+        # if the endpoint is greater than or equal to dend,
+        # just subtract one delta
         dinterval_end -= delta
         num -= 1
 
@@ -572,8 +598,16 @@ def drange(dstart, dend, delta):
 
 
 def _wrap_in_tex(text):
-    # Braces ensure dashes are not spaced like binary operators.
-    return '$\\mathdefault{' + text.replace('-', '{-}') + '}$'
+    p = r'([a-zA-Z]+)'
+    ret_text = re.sub(p, r'}$\1$\\mathdefault{', text)
+
+    # Braces ensure symbols are not spaced like binary operators.
+    ret_text = ret_text.replace('-', '{-}').replace(':', '{:}')
+    # To not concatenate space between numbers.
+    ret_text = ret_text.replace(' ', r'\;')
+    ret_text = '$\\mathdefault{' + ret_text + '}$'
+    ret_text = ret_text.replace('$\\mathdefault{}$', '')
+    return ret_text
 
 
 ## date tickers and formatters ###
@@ -585,27 +619,20 @@ class DateFormatter(ticker.Formatter):
     `~datetime.datetime.strftime` format string.
     """
 
-    @_api.deprecated("3.3")
-    @property
-    def illegal_s(self):
-        return re.compile(r"((^|[^%])(%%)*%s)")
-
     def __init__(self, fmt, tz=None, *, usetex=None):
         """
         Parameters
         ----------
         fmt : str
             `~datetime.datetime.strftime` format string
-        tz : `datetime.tzinfo`, default: :rc:`timezone`
-            Ticks timezone.
+        tz : str or `~datetime.tzinfo`, default: :rc:`timezone`
+            Ticks timezone. If a string, *tz* is passed to `dateutil.tz`.
         usetex : bool, default: :rc:`text.usetex`
             To enable/disable the use of TeX's math mode for rendering the
             results of the formatter.
         """
-        if tz is None:
-            tz = _get_rc_timezone()
+        self.tz = _get_tzinfo(tz)
         self.fmt = fmt
-        self.tz = tz
         self._usetex = (usetex if usetex is not None else
                         mpl.rcParams['text.usetex'])
 
@@ -614,34 +641,7 @@ def __call__(self, x, pos=0):
         return _wrap_in_tex(result) if self._usetex else result
 
     def set_tzinfo(self, tz):
-        self.tz = tz
-
-
-@_api.deprecated("3.3")
-class IndexDateFormatter(ticker.Formatter):
-    """Use with `.IndexLocator` to cycle format strings by index."""
-
-    def __init__(self, t, fmt, tz=None):
-        """
-        Parameters
-        ----------
-        t : list of float
-            A sequence of dates (floating point days).
-        fmt : str
-            A `~datetime.datetime.strftime` format string.
-        """
-        if tz is None:
-            tz = _get_rc_timezone()
-        self.t = t
-        self.fmt = fmt
-        self.tz = tz
-
-    def __call__(self, x, pos=0):
-        """Return the label for time *x* at position *pos*."""
-        ind = int(round(x))
-        if ind >= len(self.t) or ind <= 0:
-            return ''
-        return num2date(self.t[ind], self.tz).strftime(self.fmt)
+        self.tz = _get_tzinfo(tz)
 
 
 class ConciseDateFormatter(ticker.Formatter):
@@ -658,8 +658,8 @@ class ConciseDateFormatter(ticker.Formatter):
     locator : `.ticker.Locator`
         Locator that this axis is using.
 
-    tz : str, optional
-        Passed to `.dates.date2num`.
+    tz : str or `~datetime.tzinfo`, default: :rc:`timezone`
+        Ticks timezone, passed to `.dates.num2date`.
 
     formats : list of 6 strings, optional
         Format strings for 6 levels of tick labelling: mostly years,
@@ -690,7 +690,7 @@ class ConciseDateFormatter(ticker.Formatter):
 
     Examples
     --------
-    See :doc:`/gallery/ticks_and_spines/date_concise_formatter`
+    See :doc:`/gallery/ticks/date_concise_formatter`
 
     .. plot::
 
@@ -759,7 +759,7 @@ def __init__(self, locator, tz=None, formats=None, offset_formats=None,
 
         if offset_formats:
             if len(offset_formats) != 6:
-                raise ValueError('offsetfmts argument must be a list of '
+                raise ValueError('offset_formats argument must be a list of '
                                  '6 format strings (or None)')
             self.offset_formats = offset_formats
         else:
@@ -790,20 +790,22 @@ def format_ticks(self, values):
         #    year, month, day etc.
         # fmt for most ticks at this level
         fmts = self.formats
-        # format beginnings of days, months, years, etc...
+        # format beginnings of days, months, years, etc.
         zerofmts = self.zero_formats
         # offset fmt are for the offset in the upper left of the
         # or lower right of the axis.
         offsetfmts = self.offset_formats
+        show_offset = self.show_offset
 
         # determine the level we will label at:
         # mostly 0: years,  1: months,  2: days,
         # 3: hours, 4: minutes, 5: seconds, 6: microseconds
         for level in range(5, -1, -1):
-            if len(np.unique(tickdate[:, level])) > 1:
-                # level is less than 2 so a year is already present in the axis
-                if (level < 2):
-                    self.show_offset = False
+            unique = np.unique(tickdate[:, level])
+            if len(unique) > 1:
+                # if 1 is included in unique, the year is shown in ticks
+                if level < 2 and np.any(unique == 1):
+                    show_offset = False
                 break
             elif level == 0:
                 # all tickdate are the same, so only micros might be different
@@ -843,11 +845,13 @@ def format_ticks(self, values):
                     if '.' in labels[nn]:
                         labels[nn] = labels[nn][:-trailing_zeros].rstrip('.')
 
-        if self.show_offset:
+        if show_offset:
             # set the offset string:
             self.offset_string = tickdatetime[-1].strftime(offsetfmts[level])
             if self._usetex:
                 self.offset_string = _wrap_in_tex(self.offset_string)
+        else:
+            self.offset_string = ''
 
         if self._usetex:
             return [_wrap_in_tex(l) for l in labels]
@@ -866,48 +870,48 @@ class AutoDateFormatter(ticker.Formatter):
     A `.Formatter` which attempts to figure out the best format to use.  This
     is most useful when used with the `AutoDateLocator`.
 
-    The AutoDateFormatter has a scale dictionary that maps the scale
-    of the tick (the distance in days between one major tick) and a
-    format string.  The default looks like this::
+    `.AutoDateFormatter` has a ``.scale`` dictionary that maps tick scales (the
+    interval in days between one major tick) to format strings; this dictionary
+    defaults to ::
 
         self.scaled = {
-            DAYS_PER_YEAR: rcParams['date.autoformat.year'],
-            DAYS_PER_MONTH: rcParams['date.autoformat.month'],
-            1.0: rcParams['date.autoformat.day'],
-            1. / HOURS_PER_DAY: rcParams['date.autoformat.hour'],
-            1. / (MINUTES_PER_DAY): rcParams['date.autoformat.minute'],
-            1. / (SEC_PER_DAY): rcParams['date.autoformat.second'],
-            1. / (MUSECONDS_PER_DAY): rcParams['date.autoformat.microsecond'],
+            DAYS_PER_YEAR: rcParams['date.autoformatter.year'],
+            DAYS_PER_MONTH: rcParams['date.autoformatter.month'],
+            1: rcParams['date.autoformatter.day'],
+            1 / HOURS_PER_DAY: rcParams['date.autoformatter.hour'],
+            1 / MINUTES_PER_DAY: rcParams['date.autoformatter.minute'],
+            1 / SEC_PER_DAY: rcParams['date.autoformatter.second'],
+            1 / MUSECONDS_PER_DAY: rcParams['date.autoformatter.microsecond'],
         }
 
-    The algorithm picks the key in the dictionary that is >= the
-    current scale and uses that format string.  You can customize this
-    dictionary by doing::
+    The formatter uses the format string corresponding to the lowest key in
+    the dictionary that is greater or equal to the current scale.  Dictionary
+    entries can be customized::
 
-    >>> locator = AutoDateLocator()
-    >>> formatter = AutoDateFormatter(locator)
-    >>> formatter.scaled[1/(24.*60.)] = '%M:%S' # only show min and sec
-
-    A custom `.FuncFormatter` can also be used.  The following example shows
-    how to use a custom format function to strip trailing zeros from decimal
-    seconds and adds the date to the first ticklabel::
-
-        >>> def my_format_function(x, pos=None):
-        ...     x = matplotlib.dates.num2date(x)
-        ...     if pos == 0:
-        ...         fmt = '%D %H:%M:%S.%f'
-        ...     else:
-        ...         fmt = '%H:%M:%S.%f'
-        ...     label = x.strftime(fmt)
-        ...     label = label.rstrip("0")
-        ...     label = label.rstrip(".")
-        ...     return label
-        >>> from matplotlib.ticker import FuncFormatter
-        >>> formatter.scaled[1/(24.*60.)] = FuncFormatter(my_format_function)
+        locator = AutoDateLocator()
+        formatter = AutoDateFormatter(locator)
+        formatter.scaled[1/(24*60)] = '%M:%S' # only show min and sec
+
+    Custom callables can also be used instead of format strings.  The following
+    example shows how to use a custom format function to strip trailing zeros
+    from decimal seconds and adds the date to the first ticklabel::
+
+        def my_format_function(x, pos=None):
+            x = matplotlib.dates.num2date(x)
+            if pos == 0:
+                fmt = '%D %H:%M:%S.%f'
+            else:
+                fmt = '%H:%M:%S.%f'
+            label = x.strftime(fmt)
+            label = label.rstrip("0")
+            label = label.rstrip(".")
+            return label
+
+        formatter.scaled[1/(24*60)] = my_format_function
     """
 
     # This can be improved by providing some user-level direction on
-    # how to choose the best format (precedence, etc...)
+    # how to choose the best format (precedence, etc.).
 
     # Perhaps a 'struct' that has a field for each time-type where a
     # zero would indicate "don't show" and a number would indicate
@@ -927,8 +931,8 @@ def __init__(self, locator, tz=None, defaultfmt='%Y-%m-%d', *,
         locator : `.ticker.Locator`
             Locator that this axis is using.
 
-        tz : str, optional
-            Passed to `.dates.date2num`.
+        tz : str or `~datetime.tzinfo`, default: :rc:`timezone`
+            Ticks timezone. If a string, *tz* is passed to `dateutil.tz`.
 
         defaultfmt : str
             The default format to use if none of the values in ``self.scaled``
@@ -982,13 +986,29 @@ def __call__(self, x, pos=None):
 
 
 class rrulewrapper:
+    """
+    A simple wrapper around a `dateutil.rrule` allowing flexible
+    date tick specifications.
+    """
     def __init__(self, freq, tzinfo=None, **kwargs):
+        """
+        Parameters
+        ----------
+        freq : {YEARLY, MONTHLY, WEEKLY, DAILY, HOURLY, MINUTELY, SECONDLY}
+            Tick frequency. These constants are defined in `dateutil.rrule`,
+            but they are accessible from `matplotlib.dates` as well.
+        tzinfo : `datetime.tzinfo`, optional
+            Time zone information. The default is None.
+        **kwargs
+            Additional keyword arguments are passed to the `dateutil.rrule`.
+        """
         kwargs['freq'] = freq
         self._base_tzinfo = tzinfo
 
         self._update_rrule(**kwargs)
 
     def set(self, **kwargs):
+        """Set parameters for an existing wrapper."""
         self._construct.update(kwargs)
 
         self._update_rrule(**self._construct)
@@ -996,7 +1016,7 @@ def set(self, **kwargs):
     def _update_rrule(self, **kwargs):
         tzinfo = self._base_tzinfo
 
-        # rrule does not play nicely with time zones - especially pytz time
+        # rrule does not play nicely with timezones - especially pytz time
         # zones, it's best to use naive zones and attach timezones once the
         # datetimes are returned
         if 'dtstart' in kwargs:
@@ -1099,17 +1119,21 @@ def __init__(self, tz=None):
         """
         Parameters
         ----------
-        tz : `datetime.tzinfo`
+        tz : str or `~datetime.tzinfo`, default: :rc:`timezone`
+            Ticks timezone. If a string, *tz* is passed to `dateutil.tz`.
         """
-        if tz is None:
-            tz = _get_rc_timezone()
-        self.tz = tz
+        self.tz = _get_tzinfo(tz)
 
     def set_tzinfo(self, tz):
         """
-        Set time zone info.
+        Set timezone info.
+
+        Parameters
+        ----------
+        tz : str or `~datetime.tzinfo`, default: :rc:`timezone`
+            Ticks timezone. If a string, *tz* is passed to `dateutil.tz`.
         """
-        self.tz = tz
+        self.tz = _get_tzinfo(tz)
 
     def datalim_to_dt(self):
         """Convert axis data interval to datetime objects."""
@@ -1145,9 +1169,9 @@ def nonsingular(self, vmin, vmax):
         if it is too close to being singular (i.e. a range of ~0).
         """
         if not np.isfinite(vmin) or not np.isfinite(vmax):
-            # Except if there is no data, then use 2000-2010 as default.
-            return (date2num(datetime.date(2000, 1, 1)),
-                    date2num(datetime.date(2010, 1, 1)))
+            # Except if there is no data, then use 1970 as default.
+            return (date2num(datetime.date(1970, 1, 1)),
+                    date2num(datetime.date(1970, 1, 2)))
         if vmax < vmin:
             vmin, vmax = vmax, vmin
         unit = self._get_unit()
@@ -1175,6 +1199,15 @@ def __call__(self):
         return self.tick_values(dmin, dmax)
 
     def tick_values(self, vmin, vmax):
+        start, stop = self._create_rrule(vmin, vmax)
+        dates = self.rule.between(start, stop, True)
+        if len(dates) == 0:
+            return date2num([vmin, vmax])
+        return self.raise_if_exceeds(date2num(dates))
+
+    def _create_rrule(self, vmin, vmax):
+        # set appropriate rrule dtstart and until and return
+        # start and end
         delta = relativedelta(vmax, vmin)
 
         # We need to cap at the endpoints of valid datetime
@@ -1194,10 +1227,7 @@ def tick_values(self, vmin, vmax):
 
         self.rule.set(dtstart=start, until=stop)
 
-        dates = self.rule.between(vmin, vmax, True)
-        if len(dates) == 0:
-            return date2num([vmin, vmax])
-        return self.raise_if_exceeds(date2num(dates))
+        return vmin, vmax
 
     def _get_unit(self):
         # docstring inherited
@@ -1222,7 +1252,7 @@ def get_unit_generic(freq):
             return 1.0 / SEC_PER_DAY
         else:
             # error
-            return -1   # or should this just return '1'?
+            return -1  # or should this just return '1'?
 
     def _get_interval(self):
         return self.rule._rrule._interval
@@ -1273,8 +1303,8 @@ def __init__(self, tz=None, minticks=5, maxticks=None,
         """
         Parameters
         ----------
-        tz : `datetime.tzinfo`
-            Ticks timezone.
+        tz : str or `~datetime.tzinfo`, default: :rc:`timezone`
+            Ticks timezone. If a string, *tz* is passed to `dateutil.tz`.
         minticks : int
             The minimum number of ticks desired; controls whether ticks occur
             yearly, monthly, etc.
@@ -1293,7 +1323,7 @@ def __init__(self, tz=None, minticks=5, maxticks=None,
             the ticks to be at hours 0, 6, 12, 18 when hourly ticking is done
             at 6 hour intervals.
         """
-        super().__init__(tz)
+        super().__init__(tz=tz)
         self._freq = YEARLY
         self._freqs = [YEARLY, MONTHLY, DAILY, HOURLY, MINUTELY,
                        SECONDLY, MICROSECONDLY]
@@ -1344,9 +1374,9 @@ def nonsingular(self, vmin, vmax):
         # whatever is thrown at us, we can scale the unit.
         # But default nonsingular date plots at an ~4 year period.
         if not np.isfinite(vmin) or not np.isfinite(vmax):
-            # Except if there is no data, then use 2000-2010 as default.
-            return (date2num(datetime.date(2000, 1, 1)),
-                    date2num(datetime.date(2010, 1, 1)))
+            # Except if there is no data, then use 1970 as default.
+            return (date2num(datetime.date(1970, 1, 1)),
+                    date2num(datetime.date(1970, 1, 2)))
         if vmax < vmin:
             vmin, vmax = vmax, vmin
         if vmin == vmax:
@@ -1375,7 +1405,7 @@ def get_locator(self, dmin, dmax):
         # whenever possible.
         numYears = float(delta.years)
         numMonths = numYears * MONTHS_PER_YEAR + delta.months
-        numDays = tdelta.days   # Avoids estimates of days/month, days/year
+        numDays = tdelta.days  # Avoids estimates of days/month, days/year.
         numHours = numDays * HOURS_PER_DAY + delta.hours
         numMinutes = numHours * MIN_PER_HOUR + delta.minutes
         numSeconds = np.floor(tdelta.total_seconds())
@@ -1447,7 +1477,7 @@ def get_locator(self, dmin, dmax):
                                  byhour=byhour, byminute=byminute,
                                  bysecond=bysecond)
 
-            locator = RRuleLocator(rrule, self.tz)
+            locator = RRuleLocator(rrule, tz=self.tz)
         else:
             locator = MicrosecondLocator(interval, tz=self.tz)
             if date2num(dmin) > 70 * 365 and interval < 1000:
@@ -1458,14 +1488,10 @@ def get_locator(self, dmin, dmax):
                     'epoch.')
 
         locator.set_axis(self.axis)
-
-        if self.axis is not None:
-            locator.set_view_interval(*self.axis.get_view_interval())
-            locator.set_data_interval(*self.axis.get_data_interval())
         return locator
 
 
-class YearLocator(DateLocator):
+class YearLocator(RRuleLocator):
     """
     Make ticks on a given day of each year that is a multiple of base.
 
@@ -1479,55 +1505,40 @@ class YearLocator(DateLocator):
     """
     def __init__(self, base=1, month=1, day=1, tz=None):
         """
-        Mark years that are multiple of base on a given month and day
-        (default jan 1).
+        Parameters
+        ----------
+        base : int, default: 1
+            Mark ticks every *base* years.
+        month : int, default: 1
+            The month on which to place the ticks, starting from 1. Default is
+            January.
+        day : int, default: 1
+            The day on which to place the ticks.
+        tz : str or `~datetime.tzinfo`, default: :rc:`timezone`
+            Ticks timezone. If a string, *tz* is passed to `dateutil.tz`.
         """
-        super().__init__(tz)
+        rule = rrulewrapper(YEARLY, interval=base, bymonth=month,
+                            bymonthday=day, **self.hms0d)
+        super().__init__(rule, tz=tz)
         self.base = ticker._Edge_integer(base, 0)
-        self.replaced = {'month':  month,
-                         'day':    day,
-                         'hour':   0,
-                         'minute': 0,
-                         'second': 0,
-                         }
-        if not hasattr(tz, 'localize'):
-            # if tz is pytz, we need to do this w/ the localize fcn,
-            # otherwise datetime.replace works fine...
-            self.replaced['tzinfo'] = tz
-
-    def __call__(self):
-        # if no data have been set, this will tank with a ValueError
-        try:
-            dmin, dmax = self.viewlim_to_dt()
-        except ValueError:
-            return []
 
-        return self.tick_values(dmin, dmax)
+    def _create_rrule(self, vmin, vmax):
+        # 'start' needs to be a multiple of the interval to create ticks on
+        # interval multiples when the tick frequency is YEARLY
+        ymin = max(self.base.le(vmin.year) * self.base.step, 1)
+        ymax = min(self.base.ge(vmax.year) * self.base.step, 9999)
 
-    def tick_values(self, vmin, vmax):
-        ymin = self.base.le(vmin.year) * self.base.step
-        ymax = self.base.ge(vmax.year) * self.base.step
+        c = self.rule._construct
+        replace = {'year': ymin,
+                   'month': c.get('bymonth', 1),
+                   'day': c.get('bymonthday', 1),
+                   'hour': 0, 'minute': 0, 'second': 0}
 
-        vmin = vmin.replace(year=ymin, **self.replaced)
-        if hasattr(self.tz, 'localize'):
-            # look after pytz
-            if not vmin.tzinfo:
-                vmin = self.tz.localize(vmin, is_dst=True)
-
-        ticks = [vmin]
-
-        while True:
-            dt = ticks[-1]
-            if dt.year >= ymax:
-                return date2num(ticks)
-            year = dt.year + self.base.step
-            dt = dt.replace(year=year, **self.replaced)
-            if hasattr(self.tz, 'localize'):
-                # look after pytz
-                if not dt.tzinfo:
-                    dt = self.tz.localize(dt, is_dst=True)
+        start = vmin.replace(**replace)
+        stop = start.replace(year=ymax)
+        self.rule.set(dtstart=start, until=stop)
 
-            ticks.append(dt)
+        return start, stop
 
 
 class MonthLocator(RRuleLocator):
@@ -1536,23 +1547,25 @@ class MonthLocator(RRuleLocator):
     """
     def __init__(self, bymonth=None, bymonthday=1, interval=1, tz=None):
         """
-        Mark every month in *bymonth*; *bymonth* can be an int or
-        sequence.  Default is ``range(1, 13)``, i.e. every month.
-
-        *interval* is the interval between each iteration.  For
-        example, if ``interval=2``, mark every second occurrence.
+        Parameters
+        ----------
+        bymonth : int or list of int, default: all months
+            Ticks will be placed on every month in *bymonth*. Default is
+            ``range(1, 13)``, i.e. every month.
+        bymonthday : int, default: 1
+            The day on which to place the ticks.
+        interval : int, default: 1
+            The interval between each iteration. For example, if
+            ``interval=2``, mark every second occurrence.
+        tz : str or `~datetime.tzinfo`, default: :rc:`timezone`
+            Ticks timezone. If a string, *tz* is passed to `dateutil.tz`.
         """
         if bymonth is None:
             bymonth = range(1, 13)
-        elif isinstance(bymonth, np.ndarray):
-            # This fixes a bug in dateutil <= 2.3 which prevents the use of
-            # numpy arrays in (among other things) the bymonthday, byweekday
-            # and bymonth parameters.
-            bymonth = [x.item() for x in bymonth.astype(int)]
 
         rule = rrulewrapper(MONTHLY, bymonth=bymonth, bymonthday=bymonthday,
                             interval=interval, **self.hms0d)
-        super().__init__(rule, tz)
+        super().__init__(rule, tz=tz)
 
 
 class WeekdayLocator(RRuleLocator):
@@ -1562,25 +1575,24 @@ class WeekdayLocator(RRuleLocator):
 
     def __init__(self, byweekday=1, interval=1, tz=None):
         """
-        Mark every weekday in *byweekday*; *byweekday* can be a number or
-        sequence.
-
-        Elements of *byweekday* must be one of MO, TU, WE, TH, FR, SA,
-        SU, the constants from :mod:`dateutil.rrule`, which have been
-        imported into the :mod:`matplotlib.dates` namespace.
-
-        *interval* specifies the number of weeks to skip.  For example,
-        ``interval=2`` plots every second week.
+        Parameters
+        ----------
+        byweekday : int or list of int, default: all days
+            Ticks will be placed on every weekday in *byweekday*. Default is
+            every day.
+
+            Elements of *byweekday* must be one of MO, TU, WE, TH, FR, SA,
+            SU, the constants from :mod:`dateutil.rrule`, which have been
+            imported into the :mod:`matplotlib.dates` namespace.
+        interval : int, default: 1
+            The interval between each iteration. For example, if
+            ``interval=2``, mark every second occurrence.
+        tz : str or `~datetime.tzinfo`, default: :rc:`timezone`
+            Ticks timezone. If a string, *tz* is passed to `dateutil.tz`.
         """
-        if isinstance(byweekday, np.ndarray):
-            # This fixes a bug in dateutil <= 2.3 which prevents the use of
-            # numpy arrays in (among other things) the bymonthday, byweekday
-            # and bymonth parameters.
-            [x.item() for x in byweekday.astype(int)]
-
         rule = rrulewrapper(DAILY, byweekday=byweekday,
                             interval=interval, **self.hms0d)
-        super().__init__(rule, tz)
+        super().__init__(rule, tz=tz)
 
 
 class DayLocator(RRuleLocator):
@@ -1590,23 +1602,25 @@ class DayLocator(RRuleLocator):
     """
     def __init__(self, bymonthday=None, interval=1, tz=None):
         """
-        Mark every day in *bymonthday*; *bymonthday* can be an int or sequence.
-
-        Default is to tick every day of the month: ``bymonthday=range(1, 32)``.
+        Parameters
+        ----------
+        bymonthday : int or list of int, default: all days
+            Ticks will be placed on every day in *bymonthday*. Default is
+            ``bymonthday=range(1, 32)``, i.e., every day of the month.
+        interval : int, default: 1
+            The interval between each iteration. For example, if
+            ``interval=2``, mark every second occurrence.
+        tz : str or `~datetime.tzinfo`, default: :rc:`timezone`
+            Ticks timezone. If a string, *tz* is passed to `dateutil.tz`.
         """
         if interval != int(interval) or interval < 1:
             raise ValueError("interval must be an integer greater than 0")
         if bymonthday is None:
             bymonthday = range(1, 32)
-        elif isinstance(bymonthday, np.ndarray):
-            # This fixes a bug in dateutil <= 2.3 which prevents the use of
-            # numpy arrays in (among other things) the bymonthday, byweekday
-            # and bymonth parameters.
-            bymonthday = [x.item() for x in bymonthday.astype(int)]
 
         rule = rrulewrapper(DAILY, bymonthday=bymonthday,
                             interval=interval, **self.hms0d)
-        super().__init__(rule, tz)
+        super().__init__(rule, tz=tz)
 
 
 class HourLocator(RRuleLocator):
@@ -1615,18 +1629,23 @@ class HourLocator(RRuleLocator):
     """
     def __init__(self, byhour=None, interval=1, tz=None):
         """
-        Mark every hour in *byhour*; *byhour* can be an int or sequence.
-        Default is to tick every hour: ``byhour=range(24)``
-
-        *interval* is the interval between each iteration.  For
-        example, if ``interval=2``, mark every second occurrence.
+        Parameters
+        ----------
+        byhour : int or list of int, default: all hours
+            Ticks will be placed on every hour in *byhour*. Default is
+            ``byhour=range(24)``, i.e., every hour.
+        interval : int, default: 1
+            The interval between each iteration. For example, if
+            ``interval=2``, mark every second occurrence.
+        tz : str or `~datetime.tzinfo`, default: :rc:`timezone`
+            Ticks timezone. If a string, *tz* is passed to `dateutil.tz`.
         """
         if byhour is None:
             byhour = range(24)
 
         rule = rrulewrapper(HOURLY, byhour=byhour, interval=interval,
                             byminute=0, bysecond=0)
-        super().__init__(rule, tz)
+        super().__init__(rule, tz=tz)
 
 
 class MinuteLocator(RRuleLocator):
@@ -1635,18 +1654,23 @@ class MinuteLocator(RRuleLocator):
     """
     def __init__(self, byminute=None, interval=1, tz=None):
         """
-        Mark every minute in *byminute*; *byminute* can be an int or
-        sequence.  Default is to tick every minute: ``byminute=range(60)``
-
-        *interval* is the interval between each iteration.  For
-        example, if ``interval=2``, mark every second occurrence.
+        Parameters
+        ----------
+        byminute : int or list of int, default: all minutes
+            Ticks will be placed on every minutes in *byminutes*. Default is
+            ``byminute=range(60)``, i.e., every minute.
+        interval : int, default: 1
+            The interval between each iteration. For example, if
+            ``interval=2``, mark every second occurrence.
+        tz : str or `~datetime.tzinfo`, default: :rc:`timezone`
+            Ticks timezone. If a string, *tz* is passed to `dateutil.tz`.
         """
         if byminute is None:
             byminute = range(60)
 
         rule = rrulewrapper(MINUTELY, byminute=byminute, interval=interval,
                             bysecond=0)
-        super().__init__(rule, tz)
+        super().__init__(rule, tz=tz)
 
 
 class SecondLocator(RRuleLocator):
@@ -1655,18 +1679,22 @@ class SecondLocator(RRuleLocator):
     """
     def __init__(self, bysecond=None, interval=1, tz=None):
         """
-        Mark every second in *bysecond*; *bysecond* can be an int or
-        sequence.  Default is to tick every second: ``bysecond = range(60)``
-
-        *interval* is the interval between each iteration.  For
-        example, if ``interval=2``, mark every second occurrence.
-
+        Parameters
+        ----------
+        bysecond : int or list of int, default: all seconds
+            Ticks will be placed on every second in *bysecond*. Default is
+            ``bysecond = range(60)``, i.e., every second.
+        interval : int, default: 1
+            The interval between each iteration. For example, if
+            ``interval=2``, mark every second occurrence.
+        tz : str or `~datetime.tzinfo`, default: :rc:`timezone`
+            Ticks timezone. If a string, *tz* is passed to `dateutil.tz`.
         """
         if bysecond is None:
             bysecond = range(60)
 
         rule = rrulewrapper(SECONDLY, bysecond=bysecond, interval=interval)
-        super().__init__(rule, tz)
+        super().__init__(rule, tz=tz)
 
 
 class MicrosecondLocator(DateLocator):
@@ -1688,27 +1716,33 @@ class MicrosecondLocator(DateLocator):
         If you really must use datetime.datetime() or similar and still
         need microsecond precision, change the time origin via
         `.dates.set_epoch` to something closer to the dates being plotted.
-        See :doc:`/gallery/ticks_and_spines/date_precision_and_epochs`.
+        See :doc:`/gallery/ticks/date_precision_and_epochs`.
 
     """
     def __init__(self, interval=1, tz=None):
         """
-        *interval* is the interval between each iteration.  For
-        example, if ``interval=2``, mark every second microsecond.
-
+        Parameters
+        ----------
+        interval : int, default: 1
+            The interval between each iteration. For example, if
+            ``interval=2``, mark every second occurrence.
+        tz : str or `~datetime.tzinfo`, default: :rc:`timezone`
+            Ticks timezone. If a string, *tz* is passed to `dateutil.tz`.
         """
+        super().__init__(tz=tz)
         self._interval = interval
         self._wrapped_locator = ticker.MultipleLocator(interval)
-        self.tz = tz
 
     def set_axis(self, axis):
         self._wrapped_locator.set_axis(axis)
         return super().set_axis(axis)
 
+    @_api.deprecated("3.5", alternative="`.Axis.set_view_interval`")
     def set_view_interval(self, vmin, vmax):
         self._wrapped_locator.set_view_interval(vmin, vmax)
         return super().set_view_interval(vmin, vmax)
 
+    @_api.deprecated("3.5", alternative="`.Axis.set_data_interval`")
     def set_data_interval(self, vmin, vmax):
         self._wrapped_locator.set_data_interval(vmin, vmax)
         return super().set_data_interval(vmin, vmax)
@@ -1744,6 +1778,10 @@ def _get_interval(self):
         return self._interval
 
 
+@_api.deprecated(
+    "3.5",
+    alternative="``[date2num(datetime.utcfromtimestamp(t)) for t in e]`` or "
+                "numpy.datetime64 types")
 def epoch2num(e):
     """
     Convert UNIX time to days since Matplotlib epoch.
@@ -1765,6 +1803,7 @@ def epoch2num(e):
     return (dt + np.asarray(e)) / SEC_PER_DAY
 
 
+@_api.deprecated("3.5", alternative="`num2date(e).timestamp()<.num2date>`")
 def num2epoch(d):
     """
     Convert days since Matplotlib epoch to UNIX time.
@@ -1785,6 +1824,8 @@ def num2epoch(d):
     return np.asarray(d) * SEC_PER_DAY - dt
 
 
+@_api.deprecated("3.6", alternative="`AutoDateLocator` and `AutoDateFormatter`"
+                 " or vendor the code")
 def date_ticker_factory(span, tz=None, numticks=5):
     """
     Create a date locator with *numticks* (approx) and a date formatter
@@ -1851,8 +1892,8 @@ def axisinfo(self, unit, axis):
         majloc = AutoDateLocator(tz=tz,
                                  interval_multiples=self._interval_multiples)
         majfmt = AutoDateFormatter(majloc, tz=tz)
-        datemin = datetime.date(2000, 1, 1)
-        datemax = datetime.date(2010, 1, 1)
+        datemin = datetime.date(1970, 1, 1)
+        datemax = datetime.date(1970, 1, 2)
 
         return units.AxisInfo(majloc=majloc, majfmt=majfmt, label='',
                               default_limits=(datemin, datemax))
@@ -1876,7 +1917,7 @@ def default_units(x, axis):
             x = x.ravel()
 
         try:
-            x = cbook.safe_first_element(x)
+            x = cbook._safe_first_finite(x)
         except (TypeError, StopIteration):
             pass
 
@@ -1908,50 +1949,38 @@ def axisinfo(self, unit, axis):
                                       zero_formats=self._zero_formats,
                                       offset_formats=self._offset_formats,
                                       show_offset=self._show_offset)
-        datemin = datetime.date(2000, 1, 1)
-        datemax = datetime.date(2010, 1, 1)
+        datemin = datetime.date(1970, 1, 1)
+        datemax = datetime.date(1970, 1, 2)
         return units.AxisInfo(majloc=majloc, majfmt=majfmt, label='',
                               default_limits=(datemin, datemax))
 
 
-class _rcParam_helper:
+class _SwitchableDateConverter:
     """
-    This helper class is so that we can set the converter for dates
-    via the validator for the rcParams `date.converter` and
-    `date.interval_multiples`.  Never instatiated.
+    Helper converter-like object that generates and dispatches to
+    temporary ConciseDateConverter or DateConverter instances based on
+    :rc:`date.converter` and :rc:`date.interval_multiples`.
     """
 
-    conv_st = 'auto'
-    int_mult = True
+    @staticmethod
+    def _get_converter():
+        converter_cls = {
+            "concise": ConciseDateConverter, "auto": DateConverter}[
+                mpl.rcParams["date.converter"]]
+        interval_multiples = mpl.rcParams["date.interval_multiples"]
+        return converter_cls(interval_multiples=interval_multiples)
 
-    @classmethod
-    def set_converter(cls, s):
-        """Called by validator for rcParams date.converter"""
-        if s not in ['concise', 'auto']:
-            raise ValueError('Converter must be one of "concise" or "auto"')
-        cls.conv_st = s
-        cls.register_converters()
+    def axisinfo(self, *args, **kwargs):
+        return self._get_converter().axisinfo(*args, **kwargs)
 
-    @classmethod
-    def set_int_mult(cls, b):
-        """Called by validator for rcParams date.interval_multiples"""
-        cls.int_mult = b
-        cls.register_converters()
+    def default_units(self, *args, **kwargs):
+        return self._get_converter().default_units(*args, **kwargs)
+
+    def convert(self, *args, **kwargs):
+        return self._get_converter().convert(*args, **kwargs)
 
-    @classmethod
-    def register_converters(cls):
-        """
-        Helper to register the date converters when rcParams `date.converter`
-        and `date.interval_multiples` are changed.  Called by the helpers
-        above.
-        """
-        if cls.conv_st == 'concise':
-            converter = ConciseDateConverter
-        else:
-            converter = DateConverter
 
-        interval_multiples = cls.int_mult
-        convert = converter(interval_multiples=interval_multiples)
-        units.registry[np.datetime64] = convert
-        units.registry[datetime.date] = convert
-        units.registry[datetime.datetime] = convert
+units.registry[np.datetime64] = \
+    units.registry[datetime.date] = \
+    units.registry[datetime.datetime] = \
+    _SwitchableDateConverter()
diff --git a/lib/matplotlib/docstring.py b/lib/matplotlib/docstring.py
index d0e661ffffd9..b6ddcf5acd10 100644
--- a/lib/matplotlib/docstring.py
+++ b/lib/matplotlib/docstring.py
@@ -1,77 +1,4 @@
-import inspect
-
+from matplotlib._docstring import *  # noqa: F401, F403
 from matplotlib import _api
-
-
-class Substitution:
-    """
-    A decorator that performs %-substitution on an object's docstring.
-
-    This decorator should be robust even if ``obj.__doc__`` is None (for
-    example, if -OO was passed to the interpreter).
-
-    Usage: construct a docstring.Substitution with a sequence or dictionary
-    suitable for performing substitution; then decorate a suitable function
-    with the constructed object, e.g.::
-
-        sub_author_name = Substitution(author='Jason')
-
-        @sub_author_name
-        def some_function(x):
-            "%(author)s wrote this function"
-
-        # note that some_function.__doc__ is now "Jason wrote this function"
-
-    One can also use positional arguments::
-
-        sub_first_last_names = Substitution('Edgar Allen', 'Poe')
-
-        @sub_first_last_names
-        def some_function(x):
-            "%s %s wrote the Raven"
-    """
-    def __init__(self, *args, **kwargs):
-        if args and kwargs:
-            raise TypeError("Only positional or keyword args are allowed")
-        self.params = args or kwargs
-
-    def __call__(self, func):
-        if func.__doc__:
-            func.__doc__ = inspect.cleandoc(func.__doc__) % self.params
-        return func
-
-    def update(self, *args, **kwargs):
-        """
-        Update ``self.params`` (which must be a dict) with the supplied args.
-        """
-        self.params.update(*args, **kwargs)
-
-    @classmethod
-    @_api.deprecated("3.3", alternative="assign to the params attribute")
-    def from_params(cls, params):
-        """
-        In the case where the params is a mutable sequence (list or
-        dictionary) and it may change before this class is called, one may
-        explicitly use a reference to the params rather than using *args or
-        **kwargs which will copy the values and not reference them.
-
-        :meta private:
-        """
-        result = cls()
-        result.params = params
-        return result
-
-
-def copy(source):
-    """Copy a docstring from another source function (if present)."""
-    def do_copy(target):
-        if source.__doc__:
-            target.__doc__ = source.__doc__
-        return target
-    return do_copy
-
-
-# Create a decorator that will house the various docstring snippets reused
-# throughout Matplotlib.
-interpd = Substitution()
-dedent_interpd = interpd
+_api.warn_deprecated(
+    "3.6", obj_type='module', name=f"{__name__}")
diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
index 579fe0e11ece..296e67c4d5ff 100644
--- a/lib/matplotlib/dviread.py
+++ b/lib/matplotlib/dviread.py
@@ -25,12 +25,12 @@
 from pathlib import Path
 import re
 import struct
+import subprocess
 import sys
-import textwrap
 
 import numpy as np
 
-from matplotlib import _api, cbook, rcParams
+from matplotlib import _api, cbook
 
 _log = logging.getLogger(__name__)
 
@@ -39,8 +39,8 @@
 # are cached using lru_cache().
 
 # Dvi is a bytecode format documented in
-# http://mirrors.ctan.org/systems/knuth/dist/texware/dvitype.web
-# http://texdoc.net/texmf-dist/doc/generic/knuth/texware/dvitype.pdf
+# https://ctan.org/pkg/dvitype
+# https://texdoc.org/serve/dvitype.pdf/0
 #
 # The file consists of a preamble, some number of pages, a postamble,
 # and a finale. Different opcodes are allowed in different contexts,
@@ -58,10 +58,71 @@
 
 # The marks on a page consist of text and boxes. A page also has dimensions.
 Page = namedtuple('Page', 'text boxes height width descent')
-Text = namedtuple('Text', 'x y font glyph width')
 Box = namedtuple('Box', 'x y height width')
 
 
+# Also a namedtuple, for backcompat.
+class Text(namedtuple('Text', 'x y font glyph width')):
+    """
+    A glyph in the dvi file.
+
+    The *x* and *y* attributes directly position the glyph.  The *font*,
+    *glyph*, and *width* attributes are kept public for back-compatibility,
+    but users wanting to draw the glyph themselves are encouraged to instead
+    load the font specified by `font_path` at `font_size`, warp it with the
+    effects specified by `font_effects`, and load the glyph specified by
+    `glyph_name_or_index`.
+    """
+
+    def _get_pdftexmap_entry(self):
+        return PsfontsMap(find_tex_file("pdftex.map"))[self.font.texname]
+
+    @property
+    def font_path(self):
+        """The `~pathlib.Path` to the font for this glyph."""
+        psfont = self._get_pdftexmap_entry()
+        if psfont.filename is None:
+            raise ValueError("No usable font file found for {} ({}); "
+                             "the font may lack a Type-1 version"
+                             .format(psfont.psname.decode("ascii"),
+                                     psfont.texname.decode("ascii")))
+        return Path(psfont.filename)
+
+    @property
+    def font_size(self):
+        """The font size."""
+        return self.font.size
+
+    @property
+    def font_effects(self):
+        """
+        The "font effects" dict for this glyph.
+
+        This dict contains the values for this glyph of SlantFont and
+        ExtendFont (if any), read off :file:`pdftex.map`.
+        """
+        return self._get_pdftexmap_entry().effects
+
+    @property
+    def glyph_name_or_index(self):
+        """
+        Either the glyph name or the native charmap glyph index.
+
+        If :file:`pdftex.map` specifies an encoding for this glyph's font, that
+        is a mapping of glyph indices to Adobe glyph names; use it to convert
+        dvi indices to glyph names.  Callers can then convert glyph names to
+        glyph indices (with FT_Get_Name_Index/get_name_index), and load the
+        glyph using FT_Load_Glyph/load_glyph.
+
+        If :file:`pdftex.map` specifies no encoding, the indices directly map
+        to the font's "native" charmap; glyphs should directly loaded using
+        FT_Load_Char/load_char after selecting the native charmap.
+        """
+        entry = self._get_pdftexmap_entry()
+        return (_parse_enc(entry.encoding)[self.glyph]
+                if entry.encoding is not None else self.glyph)
+
+
 # Opcode argument parsing
 #
 # Each of the following functions takes a Dvi object and delta,
@@ -84,8 +145,6 @@ def _arg(nbytes, signed, dvi, _):
 
 def _arg_slen(dvi, delta):
     """
-    Signed, length *delta*
-
     Read *delta* bytes, returning None if *delta* is zero, and the bytes
     interpreted as a signed integer otherwise.
     """
@@ -96,26 +155,20 @@ def _arg_slen(dvi, delta):
 
 def _arg_slen1(dvi, delta):
     """
-    Signed, length *delta*+1
-
     Read *delta*+1 bytes, returning the bytes interpreted as signed.
     """
-    return dvi._arg(delta+1, True)
+    return dvi._arg(delta + 1, True)
 
 
 def _arg_ulen1(dvi, delta):
     """
-    Unsigned length *delta*+1
-
     Read *delta*+1 bytes, returning the bytes interpreted as unsigned.
     """
-    return dvi._arg(delta+1, False)
+    return dvi._arg(delta + 1, False)
 
 
 def _arg_olen1(dvi, delta):
     """
-    Optionally signed, length *delta*+1
-
     Read *delta*+1 bytes, returning the bytes interpreted as
     unsigned integer for 0<=*delta*<3 and signed if *delta*==3.
     """
@@ -139,30 +192,30 @@ def _dispatch(table, min, max=None, state=None, args=('raw',)):
     matches *state* if not None, reads arguments from the file according
     to *args*.
 
-    *table*
-        the dispatch table to be filled in
-
-    *min*
-        minimum opcode for calling this function
-
-    *max*
-        maximum opcode for calling this function, None if only *min* is allowed
-
-    *state*
-        state of the Dvi object in which these opcodes are allowed
-
-    *args*
-        sequence of argument specifications:
-
-        ``'raw'``: opcode minus minimum
-        ``'u1'``: read one unsigned byte
-        ``'u4'``: read four bytes, treat as an unsigned number
-        ``'s4'``: read four bytes, treat as a signed number
-        ``'slen'``: read (opcode - minimum) bytes, treat as signed
-        ``'slen1'``: read (opcode - minimum + 1) bytes, treat as signed
-        ``'ulen1'``: read (opcode - minimum + 1) bytes, treat as unsigned
-        ``'olen1'``: read (opcode - minimum + 1) bytes, treat as unsigned
-                     if under four bytes, signed if four bytes
+    Parameters
+    ----------
+    table : dict[int, callable]
+        The dispatch table to be filled in.
+
+    min, max : int
+        Range of opcodes that calls the registered function; *max* defaults to
+        *min*.
+
+    state : _dvistate, optional
+        State of the Dvi object in which these opcodes are allowed.
+
+    args : list[str], default: ['raw']
+        Sequence of argument specifications:
+
+        - 'raw': opcode minus minimum
+        - 'u1': read one unsigned byte
+        - 'u4': read four bytes, treat as an unsigned number
+        - 's4': read four bytes, treat as a signed number
+        - 'slen': read (opcode - minimum) bytes, treat as signed
+        - 'slen1': read (opcode - minimum + 1) bytes, treat as signed
+        - 'ulen1': read (opcode - minimum + 1) bytes, treat as unsigned
+        - 'olen1': read (opcode - minimum + 1) bytes, treat as unsigned
+          if under four bytes, signed if four bytes
     """
     def decorate(method):
         get_args = [_arg_mapping[x] for x in args]
@@ -185,6 +238,7 @@ def wrapper(self, byte):
 class Dvi:
     """
     A reader for a dvi ("device-independent") file, as produced by TeX.
+
     The current implementation can only iterate through pages in order,
     and does not even attempt to verify the postamble.
 
@@ -212,15 +266,8 @@ def __init__(self, filename, dpi):
         self.dpi = dpi
         self.fonts = {}
         self.state = _dvistate.pre
-        self.baseline = self._get_baseline(filename)
-
-    def _get_baseline(self, filename):
-        if dict.__getitem__(rcParams, 'text.latex.preview'):
-            baseline = Path(filename).with_suffix(".baseline")
-            if baseline.exists():
-                height, depth, width = baseline.read_bytes().split()
-                return float(depth)
-        return None
+
+    baseline = _api.deprecated("3.5")(property(lambda self: None))
 
     def __enter__(self):
         """Context manager enter method, does nothing."""
@@ -266,8 +313,8 @@ def _output(self):
         for elt in self.text + self.boxes:
             if isinstance(elt, Box):
                 x, y, h, w = elt
-                e = 0           # zero depth
-            else:               # glyph
+                e = 0  # zero depth
+            else:  # glyph
                 x, y, font, g, w = elt
                 h, e = font._height_depth_of(g)
             minx = min(minx, x)
@@ -290,10 +337,7 @@ def _output(self):
 
         # convert from TeX's "scaled points" to dpi units
         d = self.dpi / (72.27 * 2**16)
-        if self.baseline is None:
-            descent = (maxy - maxy_pure) * d
-        else:
-            descent = self.baseline
+        descent = (maxy - maxy_pure) * d
 
         text = [Text((x-minx)*d, (maxy-y)*d - descent, f, g, w*d)
                 for (x, y, f, g, w) in self.text]
@@ -311,6 +355,7 @@ def _read(self):
         # Pages appear to start with the sequence
         #   bop (begin of page)
         #   xxx comment
+        #   <push, ..., pop>  # if using chemformula
         #   down
         #   push
         #     down
@@ -322,17 +367,24 @@ def _read(self):
         #         etc.
         # (dviasm is useful to explore this structure.)
         # Thus, we use the vertical position at the first time the stack depth
-        # reaches 3, while at least three "downs" have been executed, as the
+        # reaches 3, while at least three "downs" have been executed (excluding
+        # those popped out (corresponding to the chemformula preamble)), as the
         # baseline (the "down" count is necessary to handle xcolor).
-        downs = 0
+        down_stack = [0]
         self._baseline_v = None
         while True:
             byte = self.file.read(1)[0]
             self._dtable[byte](self, byte)
-            downs += self._dtable[byte].__name__ == "_down"
+            name = self._dtable[byte].__name__
+            if name == "_push":
+                down_stack.append(down_stack[-1])
+            elif name == "_pop":
+                down_stack.pop()
+            elif name == "_down":
+                down_stack[-1] += 1
             if (self._baseline_v is None
                     and len(getattr(self, "stack", [])) == 3
-                    and downs >= 4):
+                    and down_stack[-1] >= 4):
                 self._baseline_v = self.v
             if byte == 140:                         # end of page
                 return True
@@ -479,13 +531,12 @@ def _fnt_def_real(self, k, c, s, d, a, l):
         n = self.file.read(a + l)
         fontname = n[-l:].decode('ascii')
         tfm = _tfmfile(fontname)
-        if tfm is None:
-            raise FileNotFoundError("missing font metrics file: %s" % fontname)
         if c != 0 and tfm.checksum != 0 and c != tfm.checksum:
             raise ValueError('tfm checksum mismatch: %s' % n)
-
-        vf = _vffile(fontname)
-
+        try:
+            vf = _vffile(fontname)
+        except FileNotFoundError:
+            vf = None
         self.fonts[k] = DviFont(scale=s, tfm=tfm, texname=n, vf=vf)
 
     @_dispatch(247, state=_dvistate.pre, args=('u1', 'u4', 'u4', 'u4', 'u1'))
@@ -604,7 +655,7 @@ def _height_depth_of(self, char):
                 result.append(_mul2012(value, self._scale))
         # cmsyXX (symbols font) glyph 0 ("minus") has a nonzero descent
         # so that TeX aligns equations properly
-        # (https://tex.stackexchange.com/questions/526103/),
+        # (https://tex.stackexchange.com/q/526103/)
         # but we actually care about the rasterization depth to align
         # the dvipng-generated images.
         if re.match(br'^cmsy\d+$', self.texname) and char == 0:
@@ -724,15 +775,6 @@ def _pre(self, i, x, cs, ds):
         # cs = checksum, ds = design size
 
 
-def _fix2comp(num):
-    """Convert from two's complement to negative."""
-    assert 0 <= num < 2**32
-    if num & 2**31:
-        return num - 2**32
-    else:
-        return num
-
-
 def _mul2012(num1, num2):
     """Multiply two numbers in 20.12 fixed point format."""
     # Separated into a function because >> has surprising precedence
@@ -766,29 +808,23 @@ def __init__(self, filename):
         _log.debug('opening tfm file %s', filename)
         with open(filename, 'rb') as file:
             header1 = file.read(24)
-            lh, bc, ec, nw, nh, nd = \
-                struct.unpack('!6H', header1[2:14])
+            lh, bc, ec, nw, nh, nd = struct.unpack('!6H', header1[2:14])
             _log.debug('lh=%d, bc=%d, ec=%d, nw=%d, nh=%d, nd=%d',
                        lh, bc, ec, nw, nh, nd)
             header2 = file.read(4*lh)
-            self.checksum, self.design_size = \
-                struct.unpack('!2I', header2[:8])
+            self.checksum, self.design_size = struct.unpack('!2I', header2[:8])
             # there is also encoding information etc.
             char_info = file.read(4*(ec-bc+1))
-            widths = file.read(4*nw)
-            heights = file.read(4*nh)
-            depths = file.read(4*nd)
-
+            widths = struct.unpack(f'!{nw}i', file.read(4*nw))
+            heights = struct.unpack(f'!{nh}i', file.read(4*nh))
+            depths = struct.unpack(f'!{nd}i', file.read(4*nd))
         self.width, self.height, self.depth = {}, {}, {}
-        widths, heights, depths = \
-            [struct.unpack('!%dI' % (len(x)/4), x)
-             for x in (widths, heights, depths)]
         for idx, char in enumerate(range(bc, ec+1)):
             byte0 = char_info[4*idx]
             byte1 = char_info[4*idx+1]
-            self.width[char] = _fix2comp(widths[byte0])
-            self.height[char] = _fix2comp(heights[byte1 >> 4])
-            self.depth[char] = _fix2comp(depths[byte1 & 0xf])
+            self.width[char] = widths[byte0]
+            self.height[char] = heights[byte1 >> 4]
+            self.depth[char] = depths[byte1 & 0xf]
 
 
 PsFont = namedtuple('PsFont', 'texname psname effects encoding filename')
@@ -838,7 +874,7 @@ class PsfontsMap:
     {'slant': 0.16700000000000001}
     >>> entry.filename
     """
-    __slots__ = ('_font', '_filename')
+    __slots__ = ('_filename', '_unparsed', '_parsed')
 
     # Create a filename -> PsfontsMap cache, so that calling
     # `PsfontsMap(filename)` with the same filename a second time immediately
@@ -846,179 +882,136 @@ class PsfontsMap:
     @lru_cache()
     def __new__(cls, filename):
         self = object.__new__(cls)
-        self._font = {}
         self._filename = os.fsdecode(filename)
+        # Some TeX distributions have enormous pdftex.map files which would
+        # take hundreds of milliseconds to parse, but it is easy enough to just
+        # store the unparsed lines (keyed by the first word, which is the
+        # texname) and parse them on-demand.
         with open(filename, 'rb') as file:
-            self._parse(file)
+            self._unparsed = {}
+            for line in file:
+                tfmname = line.split(b' ', 1)[0]
+                self._unparsed.setdefault(tfmname, []).append(line)
+        self._parsed = {}
         return self
 
     def __getitem__(self, texname):
         assert isinstance(texname, bytes)
+        if texname in self._unparsed:
+            for line in self._unparsed.pop(texname):
+                if self._parse_and_cache_line(line):
+                    break
         try:
-            result = self._font[texname]
+            return self._parsed[texname]
         except KeyError:
-            fmt = ('A PostScript file for the font whose TeX name is "{0}" '
-                   'could not be found in the file "{1}". The dviread module '
-                   'can only handle fonts that have an associated PostScript '
-                   'font file. '
-                   'This problem can often be solved by installing '
-                   'a suitable PostScript font package in your (TeX) '
-                   'package manager.')
-            msg = fmt.format(texname.decode('ascii'), self._filename)
-            msg = textwrap.fill(msg, break_on_hyphens=False,
-                                break_long_words=False)
-            _log.info(msg)
-            raise
-        fn, enc = result.filename, result.encoding
-        if fn is not None and not fn.startswith(b'/'):
-            fn = find_tex_file(fn)
-        if enc is not None and not enc.startswith(b'/'):
-            enc = find_tex_file(result.encoding)
-        return result._replace(filename=fn, encoding=enc)
-
-    def _parse(self, file):
+            raise LookupError(
+                f"An associated PostScript font (required by Matplotlib) "
+                f"could not be found for TeX font {texname.decode('ascii')!r} "
+                f"in {self._filename!r}; this problem can often be solved by "
+                f"installing a suitable PostScript font package in your TeX "
+                f"package manager") from None
+
+    def _parse_and_cache_line(self, line):
         """
-        Parse the font mapping file.
-
-        The format is, AFAIK: texname fontname [effects and filenames]
-        Effects are PostScript snippets like ".177 SlantFont",
-        filenames begin with one or two less-than signs. A filename
-        ending in enc is an encoding file, other filenames are font
-        files. This can be overridden with a left bracket: <[foobar
-        indicates an encoding file named foobar.
-
-        There is some difference between <foo.pfb and <<bar.pfb in
-        subsetting, but I have no example of << in my TeX installation.
+        Parse a line in the font mapping file.
+
+        The format is (partially) documented at
+        http://mirrors.ctan.org/systems/doc/pdftex/manual/pdftex-a.pdf
+        https://tug.org/texinfohtml/dvips.html#psfonts_002emap
+        Each line can have the following fields:
+
+        - tfmname (first, only required field),
+        - psname (defaults to tfmname, must come immediately after tfmname if
+          present),
+        - fontflags (integer, must come immediately after psname if present,
+          ignored by us),
+        - special (SlantFont and ExtendFont, only field that is double-quoted),
+        - fontfile, encodingfile (optional, prefixed by <, <<, or <[; << always
+          precedes a font, <[ always precedes an encoding, < can precede either
+          but then an encoding file must have extension .enc; < and << also
+          request different font subsetting behaviors but we ignore that; < can
+          be separated from the filename by whitespace).
+
+        special, fontfile, and encodingfile can appear in any order.
         """
         # If the map file specifies multiple encodings for a font, we
         # follow pdfTeX in choosing the last one specified. Such
         # entries are probably mistakes but they have occurred.
-        # http://tex.stackexchange.com/questions/10826/
-        # http://article.gmane.org/gmane.comp.tex.pdftex/4914
-
-        empty_re = re.compile(br'%|\s*$')
-        word_re = re.compile(
-            br'''(?x) (?:
-                 "<\[ (?P<enc1>  [^"]+    )" | # quoted encoding marked by [
-                 "<   (?P<enc2>  [^"]+.enc)" | # quoted encoding, ends in .enc
-                 "<<? (?P<file1> [^"]+    )" | # quoted font file name
-                 "    (?P<eff1>  [^"]+    )" | # quoted effects or font name
-                 <\[  (?P<enc3>  \S+      )  | # encoding marked by [
-                 <    (?P<enc4>  \S+  .enc)  | # encoding, ends in .enc
-                 <<?  (?P<file2> \S+      )  | # font file name
-                      (?P<eff2>  \S+      )    # effects or font name
-            )''')
-        effects_re = re.compile(
-            br'''(?x) (?P<slant> -?[0-9]*(?:\.[0-9]+)) \s* SlantFont
-                    | (?P<extend>-?[0-9]*(?:\.[0-9]+)) \s* ExtendFont''')
-
-        lines = (line.strip()
-                 for line in file
-                 if not empty_re.match(line))
-        for line in lines:
-            effects, encoding, filename = b'', None, None
-            words = word_re.finditer(line)
-
-            # The named groups are mutually exclusive and are
-            # referenced below at an estimated order of probability of
-            # occurrence based on looking at my copy of pdftex.map.
-            # The font names are probably unquoted:
-            w = next(words)
-            texname = w.group('eff2') or w.group('eff1')
-            w = next(words)
-            psname = w.group('eff2') or w.group('eff1')
-
-            for w in words:
-                # Any effects are almost always quoted:
-                eff = w.group('eff1') or w.group('eff2')
-                if eff:
-                    effects = eff
-                    continue
-                # Encoding files usually have the .enc suffix
-                # and almost never need quoting:
-                enc = (w.group('enc4') or w.group('enc3') or
-                       w.group('enc2') or w.group('enc1'))
-                if enc:
-                    if encoding is not None:
-                        _log.debug('Multiple encodings for %s = %s',
-                                   texname, psname)
-                    encoding = enc
-                    continue
-                # File names are probably unquoted:
-                filename = w.group('file2') or w.group('file1')
-
-            effects_dict = {}
-            for match in effects_re.finditer(effects):
-                slant = match.group('slant')
-                if slant:
-                    effects_dict['slant'] = float(slant)
-                else:
-                    effects_dict['extend'] = float(match.group('extend'))
+        # https://tex.stackexchange.com/q/10826/
+
+        if not line or line.startswith((b" ", b"%", b"*", b";", b"#")):
+            return
+        tfmname = basename = special = encodingfile = fontfile = None
+        is_subsetted = is_t1 = is_truetype = False
+        matches = re.finditer(br'"([^"]*)(?:"|$)|(\S+)', line)
+        for match in matches:
+            quoted, unquoted = match.groups()
+            if unquoted:
+                if unquoted.startswith(b"<<"):  # font
+                    fontfile = unquoted[2:]
+                elif unquoted.startswith(b"<["):  # encoding
+                    encodingfile = unquoted[2:]
+                elif unquoted.startswith(b"<"):  # font or encoding
+                    word = (
+                        # <foo => foo
+                        unquoted[1:]
+                        # < by itself => read the next word
+                        or next(filter(None, next(matches).groups())))
+                    if word.endswith(b".enc"):
+                        encodingfile = word
+                    else:
+                        fontfile = word
+                        is_subsetted = True
+                elif tfmname is None:
+                    tfmname = unquoted
+                elif basename is None:
+                    basename = unquoted
+            elif quoted:
+                special = quoted
+        effects = {}
+        if special:
+            words = reversed(special.split())
+            for word in words:
+                if word == b"SlantFont":
+                    effects["slant"] = float(next(words))
+                elif word == b"ExtendFont":
+                    effects["extend"] = float(next(words))
+
+        # Verify some properties of the line that would cause it to be ignored
+        # otherwise.
+        if fontfile is not None:
+            if fontfile.endswith((b".ttf", b".ttc")):
+                is_truetype = True
+            elif not fontfile.endswith(b".otf"):
+                is_t1 = True
+        elif basename is not None:
+            is_t1 = True
+        if is_truetype and is_subsetted and encodingfile is None:
+            return
+        if not is_t1 and ("slant" in effects or "extend" in effects):
+            return
+        if abs(effects.get("slant", 0)) > 1:
+            return
+        if abs(effects.get("extend", 0)) > 2:
+            return
+
+        if basename is None:
+            basename = tfmname
+        if encodingfile is not None:
+            encodingfile = _find_tex_file(encodingfile)
+        if fontfile is not None:
+            fontfile = _find_tex_file(fontfile)
+        self._parsed[tfmname] = PsFont(
+            texname=tfmname, psname=basename, effects=effects,
+            encoding=encodingfile, filename=fontfile)
+        return True
 
-            self._font[texname] = PsFont(
-                texname=texname, psname=psname, effects=effects_dict,
-                encoding=encoding, filename=filename)
 
-
-@_api.deprecated("3.3")
-class Encoding:
+def _parse_enc(path):
     r"""
     Parse a \*.enc file referenced from a psfonts.map style file.
 
-    The format this class understands is a very limited subset of PostScript.
-
-    Usage (subject to change)::
-
-      for name in Encoding(filename):
-          whatever(name)
-
-    Parameters
-    ----------
-    filename : str or path-like
-
-    Attributes
-    ----------
-    encoding : list
-        List of character names
-    """
-    __slots__ = ('encoding',)
-
-    def __init__(self, filename):
-        with open(filename, 'rb') as file:
-            _log.debug('Parsing TeX encoding %s', filename)
-            self.encoding = self._parse(file)
-            _log.debug('Result: %s', self.encoding)
-
-    def __iter__(self):
-        yield from self.encoding
-
-    @staticmethod
-    def _parse(file):
-        lines = (line.split(b'%', 1)[0].strip() for line in file)
-        data = b''.join(lines)
-        beginning = data.find(b'[')
-        if beginning < 0:
-            raise ValueError("Cannot locate beginning of encoding in {}"
-                             .format(file))
-        data = data[beginning:]
-        end = data.find(b']')
-        if end < 0:
-            raise ValueError("Cannot locate end of encoding in {}"
-                             .format(file))
-        data = data[:end]
-        return re.findall(br'/([^][{}<>\s]+)', data)
-
-
-# Note: this function should ultimately replace the Encoding class, which
-# appears to be mostly broken: because it uses b''.join(), there is no
-# whitespace left between glyph names (only slashes) so the final re.findall
-# returns a single string with all glyph names.  However this does not appear
-# to bother backend_pdf, so that needs to be investigated more.  (The fixed
-# version below is necessary for textpath/backend_svg, though.)
-def _parse_enc(path):
-    r"""
-    Parses a \*.enc file referenced from a psfonts.map style file.
-    The format this class understands is a very limited subset of PostScript.
+    The format supported by this function is a tiny subset of PostScript.
 
     Parameters
     ----------
@@ -1040,17 +1033,39 @@ def _parse_enc(path):
             "Failed to parse {} as Postscript encoding".format(path))
 
 
+class _LuatexKpsewhich:
+    @lru_cache()  # A singleton.
+    def __new__(cls):
+        self = object.__new__(cls)
+        self._proc = self._new_proc()
+        return self
+
+    def _new_proc(self):
+        return subprocess.Popen(
+            ["luatex", "--luaonly",
+             str(cbook._get_data_path("kpsewhich.lua"))],
+            stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+
+    def search(self, filename):
+        if self._proc.poll() is not None:  # Dead, restart it.
+            self._proc = self._new_proc()
+        self._proc.stdin.write(os.fsencode(filename) + b"\n")
+        self._proc.stdin.flush()
+        out = self._proc.stdout.readline().rstrip()
+        return None if out == b"nil" else os.fsdecode(out)
+
+
 @lru_cache()
-def find_tex_file(filename, format=None):
+@_api.delete_parameter("3.5", "format")
+def _find_tex_file(filename, format=None):
     """
-    Find a file in the texmf tree.
+    Find a file in the texmf tree using kpathsea_.
 
-    Calls :program:`kpsewhich` which is an interface to the kpathsea
-    library [1]_. Most existing TeX distributions on Unix-like systems use
-    kpathsea. It is also available as part of MikTeX, a popular
-    distribution on Windows.
+    The kpathsea library, provided by most existing TeX distributions, both
+    on Unix-like systems and on Windows (MikTeX), is invoked via a long-lived
+    luatex process if luatex is installed, or via kpsewhich otherwise.
 
-    *If the file is not found, an empty string is returned*.
+    .. _kpathsea: https://www.tug.org/kpathsea/
 
     Parameters
     ----------
@@ -1058,11 +1073,12 @@ def find_tex_file(filename, format=None):
     format : str or bytes
         Used as the value of the ``--format`` option to :program:`kpsewhich`.
         Could be e.g. 'tfm' or 'vf' to limit the search to that type of files.
+        Deprecated.
 
-    References
-    ----------
-    .. [1] `Kpathsea documentation <http://www.tug.org/kpathsea/>`_
-        The library that :program:`kpsewhich` is part of.
+    Raises
+    ------
+    FileNotFoundError
+        If the file is not found.
     """
 
     # we expect these to always be ascii encoded, but use utf-8
@@ -1072,31 +1088,63 @@ def find_tex_file(filename, format=None):
     if isinstance(format, bytes):
         format = format.decode('utf-8', errors='replace')
 
-    if os.name == 'nt':
-        # On Windows only, kpathsea can use utf-8 for cmd args and output.
-        # The `command_line_encoding` environment variable is set to force it
-        # to always use utf-8 encoding.  See Matplotlib issue #11848.
-        kwargs = {'env': {**os.environ, 'command_line_encoding': 'utf-8'},
-                  'encoding': 'utf-8'}
-    else:  # On POSIX, run through the equivalent of os.fsdecode().
-        kwargs = {'encoding': sys.getfilesystemencoding(),
-                  'errors': 'surrogatescape'}
-
-    cmd = ['kpsewhich']
-    if format is not None:
-        cmd += ['--format=' + format]
-    cmd += [filename]
     try:
-        result = cbook._check_and_log_subprocess(cmd, _log, **kwargs)
-    except (FileNotFoundError, RuntimeError):
-        return ''
-    return result.rstrip('\n')
+        lk = _LuatexKpsewhich()
+    except FileNotFoundError:
+        lk = None  # Fallback to directly calling kpsewhich, as below.
+
+    if lk and format is None:
+        path = lk.search(filename)
+
+    else:
+        if os.name == 'nt':
+            # On Windows only, kpathsea can use utf-8 for cmd args and output.
+            # The `command_line_encoding` environment variable is set to force
+            # it to always use utf-8 encoding.  See Matplotlib issue #11848.
+            kwargs = {'env': {**os.environ, 'command_line_encoding': 'utf-8'},
+                      'encoding': 'utf-8'}
+        else:  # On POSIX, run through the equivalent of os.fsdecode().
+            kwargs = {'encoding': sys.getfilesystemencoding(),
+                      'errors': 'surrogateescape'}
+
+        cmd = ['kpsewhich']
+        if format is not None:
+            cmd += ['--format=' + format]
+        cmd += [filename]
+        try:
+            path = (cbook._check_and_log_subprocess(cmd, _log, **kwargs)
+                    .rstrip('\n'))
+        except (FileNotFoundError, RuntimeError):
+            path = None
+
+    if path:
+        return path
+    else:
+        raise FileNotFoundError(
+            f"Matplotlib's TeX implementation searched for a file named "
+            f"{filename!r} in your texmf tree, but could not find it")
+
+
+# After the deprecation period elapses, delete this shim and rename
+# _find_tex_file to find_tex_file everywhere.
+@_api.delete_parameter("3.5", "format")
+def find_tex_file(filename, format=None):
+    try:
+        return (_find_tex_file(filename, format) if format is not None else
+                _find_tex_file(filename))
+    except FileNotFoundError as exc:
+        _api.warn_deprecated(
+            "3.6", message=f"{exc.args[0]}; in the future, this will raise a "
+            f"FileNotFoundError.")
+        return ""
+
+
+find_tex_file.__doc__ = _find_tex_file.__doc__
 
 
 @lru_cache()
 def _fontfile(cls, suffix, texname):
-    filename = find_tex_file(texname + suffix)
-    return cls(filename) if filename else None
+    return cls(_find_tex_file(texname + suffix))
 
 
 _tfmfile = partial(_fontfile, Tfm, ".tfm")
@@ -1112,16 +1160,21 @@ def _fontfile(cls, suffix, texname):
     parser.add_argument("dpi", nargs="?", type=float, default=None)
     args = parser.parse_args()
     with Dvi(args.filename, args.dpi) as dvi:
-        fontmap = PsfontsMap(find_tex_file('pdftex.map'))
+        fontmap = PsfontsMap(_find_tex_file('pdftex.map'))
         for page in dvi:
-            print('=== new page ===')
+            print(f"=== new page === "
+                  f"(w: {page.width}, h: {page.height}, d: {page.descent})")
             for font, group in itertools.groupby(
                     page.text, lambda text: text.font):
-                print('font', font.texname, 'scaled', font._scale / 2 ** 20)
+                print(f"font: {font.texname.decode('latin-1')!r}\t"
+                      f"scale: {font._scale / 2 ** 20}")
+                print("x", "y", "glyph", "chr", "w", "(glyphs)", sep="\t")
                 for text in group:
                     print(text.x, text.y, text.glyph,
                           chr(text.glyph) if chr(text.glyph).isprintable()
                           else ".",
-                          text.width)
-            for x, y, w, h in page.boxes:
-                print(x, y, 'BOX', w, h)
+                          text.width, sep="\t")
+            if page.boxes:
+                print("x", "y", "h", "w", "", "(boxes)", sep="\t")
+                for box in page.boxes:
+                    print(box.x, box.y, box.height, box.width, sep="\t")
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
index f9f4b6c663b1..e879549167cd 100644
--- a/lib/matplotlib/figure.py
+++ b/lib/matplotlib/figure.py
@@ -14,35 +14,36 @@
     Control the default spacing between subplots.
 """
 
+from contextlib import ExitStack
 import inspect
+import itertools
 import logging
 from numbers import Integral
 
 import numpy as np
 
 import matplotlib as mpl
-from matplotlib import docstring, projections
-from matplotlib import __version__ as _mpl_version
-
-import matplotlib.artist as martist
+from matplotlib import _blocking_input, backend_bases, _docstring, projections
 from matplotlib.artist import (
     Artist, allow_rasterization, _finalize_rasterization)
 from matplotlib.backend_bases import (
-    FigureCanvasBase, NonGuiException, MouseButton)
+    DrawEvent, FigureCanvasBase, NonGuiException, MouseButton, _get_renderer)
 import matplotlib._api as _api
 import matplotlib.cbook as cbook
 import matplotlib.colorbar as cbar
 import matplotlib.image as mimage
 
 from matplotlib.axes import Axes, SubplotBase, subplot_class_factory
-from matplotlib.blocking_input import BlockingMouseInput, BlockingKeyMouseInput
 from matplotlib.gridspec import GridSpec
+from matplotlib.layout_engine import (
+    ConstrainedLayoutEngine, TightLayoutEngine, LayoutEngine,
+    PlaceHolderLayoutEngine
+)
 import matplotlib.legend as mlegend
 from matplotlib.patches import Rectangle
 from matplotlib.text import Text
 from matplotlib.transforms import (Affine2D, Bbox, BboxTransformTo,
                                    TransformedBbox)
-import matplotlib._layoutgrid as layoutgrid
 
 _log = logging.getLogger(__name__)
 
@@ -52,75 +53,48 @@ def _stale_figure_callback(self, val):
         self.figure.stale = val
 
 
-class _AxesStack(cbook.Stack):
+class _AxesStack:
     """
-    Specialization of Stack, to handle all tracking of Axes in a Figure.
-
-    This stack stores ``ind, axes`` pairs, where ``ind`` is a serial index
-    tracking the order in which axes were added.
+    Helper class to track axes in a figure.
 
-    AxesStack is a callable; calling it returns the current axes.
+    Axes are tracked both in the order in which they have been added
+    (``self._axes`` insertion/iteration order) and in the separate "gca" stack
+    (which is the index to which they map in the ``self._axes`` dict).
     """
 
     def __init__(self):
-        super().__init__()
-        self._ind = 0
+        self._axes = {}  # Mapping of axes to "gca" order.
+        self._counter = itertools.count()
 
     def as_list(self):
-        """
-        Return a list of the Axes instances that have been added to the figure.
-        """
-        return [a for i, a in sorted(self._elements)]
-
-    def _entry_from_axes(self, e):
-        return next(((ind, a) for ind, a in self._elements if a == e), None)
+        """List the axes that have been added to the figure."""
+        return [*self._axes]  # This relies on dict preserving order.
 
     def remove(self, a):
         """Remove the axes from the stack."""
-        super().remove(self._entry_from_axes(a))
+        self._axes.pop(a)
 
     def bubble(self, a):
-        """
-        Move the given axes, which must already exist in the stack, to the top.
-        """
-        return super().bubble(self._entry_from_axes(a))
+        """Move an axes, which must already exist in the stack, to the top."""
+        if a not in self._axes:
+            raise ValueError("Axes has not been added yet")
+        self._axes[a] = next(self._counter)
 
     def add(self, a):
-        """
-        Add Axes *a* to the stack.
+        """Add an axes to the stack, ignoring it if already present."""
+        if a not in self._axes:
+            self._axes[a] = next(self._counter)
 
-        If *a* is already on the stack, don't add it again.
-        """
-        # All the error checking may be unnecessary; but this method
-        # is called so seldom that the overhead is negligible.
-        _api.check_isinstance(Axes, a=a)
-
-        if a in self:
-            return
-
-        self._ind += 1
-        super().push((self._ind, a))
-
-    def __call__(self):
-        """
-        Return the active axes.
-
-        If no axes exists on the stack, then returns None.
-        """
-        if not len(self._elements):
-            return None
-        else:
-            index, axes = self._elements[self._pos]
-            return axes
-
-    def __contains__(self, a):
-        return a in self.as_list()
+    def current(self):
+        """Return the active axes, or None if the stack is empty."""
+        return max(self._axes, key=self._axes.__getitem__, default=None)
 
 
 class SubplotParams:
     """
     A class to hold the parameters for a subplot.
     """
+
     def __init__(self, left=None, bottom=None, right=None, top=None,
                  wspace=None, hspace=None):
         """
@@ -147,17 +121,20 @@ def __init__(self, left=None, bottom=None, right=None, top=None,
             The height of the padding between subplots,
             as a fraction of the average Axes height.
         """
-        self.validate = True
+        self._validate = True
         for key in ["left", "bottom", "right", "top", "wspace", "hspace"]:
             setattr(self, key, mpl.rcParams[f"figure.subplot.{key}"])
         self.update(left, bottom, right, top, wspace, hspace)
 
+    # Also remove _validate after deprecation elapses.
+    validate = _api.deprecate_privatize_attribute("3.5")
+
     def update(self, left=None, bottom=None, right=None, top=None,
                wspace=None, hspace=None):
         """
         Update the dimensions of the passed parameters. *None* means unchanged.
         """
-        if self.validate:
+        if self._validate:
             if ((left if left is not None else self.left)
                     >= (right if right is not None else self.right)):
                 raise ValueError('left cannot be >= right')
@@ -180,13 +157,13 @@ def update(self, left=None, bottom=None, right=None, top=None,
 
 class FigureBase(Artist):
     """
-    Base class for `.figure.Figure` and `.figure.SubFigure` containing the
-    methods that add artists to the figure or subfigure, create Axes, etc.
+    Base class for `.Figure` and `.SubFigure` containing the methods that add
+    artists to the figure or subfigure, create Axes, etc.
     """
-    def __init__(self):
+    def __init__(self, **kwargs):
         super().__init__()
         # remove the non-figure artist _axes property
-        # as it makes no sense for a figure to be _in_ an axes
+        # as it makes no sense for a figure to be _in_ an Axes
         # this is used by the property methods in the artist base class
         # which are over-ridden in this class
         del self._axes
@@ -195,18 +172,13 @@ def __init__(self):
         self._supxlabel = None
         self._supylabel = None
 
-        # constrained_layout:
-        self._layoutgrid = None
-
         # groupers to keep track of x and y labels we want to align.
         # see self.align_xlabels and self.align_ylabels and
         # axis._get_tick_boxes_siblings
         self._align_label_groups = {"x": cbook.Grouper(), "y": cbook.Grouper()}
 
         self.figure = self
-        # list of child gridspecs for this figure
-        self._gridspecs = []
-        self._localaxes = _AxesStack()  # track all axes and current axes
+        self._localaxes = []  # track all axes
         self.artists = []
         self.lines = []
         self.patches = []
@@ -216,6 +188,7 @@ def __init__(self):
         self.subfigs = []
         self.stale = True
         self.suppressComposite = None
+        self.set(**kwargs)
 
     def _get_draw_artists(self, renderer):
         """Also runs apply_aspect"""
@@ -231,22 +204,15 @@ def _get_draw_artists(self, renderer):
         artists = sorted(
             (artist for artist in artists if not artist.get_animated()),
             key=lambda artist: artist.get_zorder())
-        for ax in self._localaxes.as_list():
+        for ax in self._localaxes:
             locator = ax.get_axes_locator()
-            if locator:
-                pos = locator(ax, renderer)
-                ax.apply_aspect(pos)
-            else:
-                ax.apply_aspect()
+            ax.apply_aspect(locator(ax, renderer) if locator else None)
 
             for child in ax.get_children():
                 if hasattr(child, 'apply_aspect'):
                     locator = child.get_axes_locator()
-                    if locator:
-                        pos = locator(child, renderer)
-                        child.apply_aspect(pos)
-                    else:
-                        child.apply_aspect()
+                    child.apply_aspect(
+                        locator(child, renderer) if locator else None)
         return artists
 
     def autofmt_xdate(
@@ -270,11 +236,7 @@ def autofmt_xdate(
         which : {'major', 'minor', 'both'}, default: 'major'
             Selects which ticklabels to rotate.
         """
-        if which is None:
-            _api.warn_deprecated(
-                "3.3", message="Support for passing which=None to mean "
-                "which='major' is deprecated since %(since)s and will be "
-                "removed %(removal)s.")
+        _api.check_in_list(['major', 'minor', 'both'], which=which)
         allsubplots = all(hasattr(ax, 'get_subplotspec') for ax in self.axes)
         if len(self.axes) == 1:
             for label in self.axes[0].get_xticklabels(which=which):
@@ -300,7 +262,7 @@ def get_children(self):
         """Get a list of artists contained in the figure."""
         return [self.patch,
                 *self.artists,
-                *self._localaxes.as_list(),
+                *self._localaxes,
                 *self.lines,
                 *self.patches,
                 *self.texts,
@@ -322,10 +284,10 @@ def contains(self, mouseevent):
         inside = self.bbox.contains(mouseevent.x, mouseevent.y)
         return inside, {}
 
-    def get_window_extent(self, *args, **kwargs):
-        """
-        Return the figure bounding box in display space. Arguments are ignored.
-        """
+    @_api.delete_parameter("3.6", "args")
+    @_api.delete_parameter("3.6", "kwargs")
+    def get_window_extent(self, renderer=None, *args, **kwargs):
+        # docstring inherited
         return self.bbox
 
     def _suplabels(self, t, info, **kwargs):
@@ -345,10 +307,10 @@ def _suplabels(self, t, info, **kwargs):
         verticalalignment, va : {'top', 'center', 'bottom', 'baseline'}, \
 default: %(va)s
             The vertical alignment of the text relative to (*x*, *y*).
-        fontsize, size : default: :rc:`figure.titlesize`
+        fontsize, size : default: :rc:`figure.%(rc)ssize`
             The font size of the text. See `.Text.set_size` for possible
             values.
-        fontweight, weight : default: :rc:`figure.titleweight`
+        fontweight, weight : default: :rc:`figure.%(rc)sweight`
             The font weight of the text. See `.Text.set_weight` for possible
             values.
 
@@ -362,18 +324,25 @@ def _suplabels(self, t, info, **kwargs):
         fontproperties : None or dict, optional
             A dict of font properties. If *fontproperties* is given the
             default values for font size and weight are taken from the
-            `.FontProperties` defaults. :rc:`figure.titlesize` and
-            :rc:`figure.titleweight` are ignored in this case.
+            `.FontProperties` defaults. :rc:`figure.%(rc)ssize` and
+            :rc:`figure.%(rc)sweight` are ignored in this case.
 
         **kwargs
             Additional kwargs are `matplotlib.text.Text` properties.
         """
 
-        manual_position = ('x' in kwargs or 'y' in kwargs)
         suplab = getattr(self, info['name'])
 
-        x = kwargs.pop('x', info['x0'])
-        y = kwargs.pop('y', info['y0'])
+        x = kwargs.pop('x', None)
+        y = kwargs.pop('y', None)
+        if info['name'] in ['_supxlabel', '_suptitle']:
+            autopos = y is None
+        elif info['name'] == '_supylabel':
+            autopos = x is None
+        if x is None:
+            x = info['x0']
+        if y is None:
+            y = info['y0']
 
         if 'horizontalalignment' not in kwargs and 'ha' not in kwargs:
             kwargs['horizontalalignment'] = info['ha']
@@ -384,9 +353,9 @@ def _suplabels(self, t, info, **kwargs):
 
         if 'fontproperties' not in kwargs:
             if 'fontsize' not in kwargs and 'size' not in kwargs:
-                kwargs['size'] = mpl.rcParams['figure.titlesize']
+                kwargs['size'] = mpl.rcParams[info['size']]
             if 'fontweight' not in kwargs and 'weight' not in kwargs:
-                kwargs['weight'] = mpl.rcParams['figure.titleweight']
+                kwargs['weight'] = mpl.rcParams[info['weight']]
 
         sup = self.text(x, y, t, **kwargs)
         if suplab is not None:
@@ -396,38 +365,40 @@ def _suplabels(self, t, info, **kwargs):
             sup.remove()
         else:
             suplab = sup
-        if manual_position:
-            suplab.set_in_layout(False)
+        suplab._autopos = autopos
         setattr(self, info['name'], suplab)
         self.stale = True
         return suplab
 
-    @docstring.Substitution(x0=0.5, y0=0.98, name='suptitle', ha='center',
-                            va='top')
-    @docstring.copy(_suplabels)
+    @_docstring.Substitution(x0=0.5, y0=0.98, name='suptitle', ha='center',
+                             va='top', rc='title')
+    @_docstring.copy(_suplabels)
     def suptitle(self, t, **kwargs):
         # docstring from _suplabels...
         info = {'name': '_suptitle', 'x0': 0.5, 'y0': 0.98,
-                'ha': 'center', 'va': 'top', 'rotation': 0}
+                'ha': 'center', 'va': 'top', 'rotation': 0,
+                'size': 'figure.titlesize', 'weight': 'figure.titleweight'}
         return self._suplabels(t, info, **kwargs)
 
-    @docstring.Substitution(x0=0.5, y0=0.01, name='supxlabel', ha='center',
-                            va='bottom')
-    @docstring.copy(_suplabels)
+    @_docstring.Substitution(x0=0.5, y0=0.01, name='supxlabel', ha='center',
+                             va='bottom', rc='label')
+    @_docstring.copy(_suplabels)
     def supxlabel(self, t, **kwargs):
         # docstring from _suplabels...
         info = {'name': '_supxlabel', 'x0': 0.5, 'y0': 0.01,
-                'ha': 'center', 'va': 'bottom', 'rotation': 0}
+                'ha': 'center', 'va': 'bottom', 'rotation': 0,
+                'size': 'figure.labelsize', 'weight': 'figure.labelweight'}
         return self._suplabels(t, info, **kwargs)
 
-    @docstring.Substitution(x0=0.02, y0=0.5, name='supylabel', ha='left',
-                            va='center')
-    @docstring.copy(_suplabels)
+    @_docstring.Substitution(x0=0.02, y0=0.5, name='supylabel', ha='left',
+                             va='center', rc='label')
+    @_docstring.copy(_suplabels)
     def supylabel(self, t, **kwargs):
         # docstring from _suplabels...
         info = {'name': '_supylabel', 'x0': 0.02, 'y0': 0.5,
                 'ha': 'left', 'va': 'center', 'rotation': 'vertical',
-                'rotation_mode': 'anchor'}
+                'rotation_mode': 'anchor', 'size': 'figure.labelsize',
+                'weight': 'figure.labelweight'}
         return self._suplabels(t, info, **kwargs)
 
     def get_edgecolor(self):
@@ -532,7 +503,7 @@ def add_artist(self, artist, clip=False):
         self.stale = True
         return artist
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def add_axes(self, *args, **kwargs):
         """
         Add an Axes to the figure.
@@ -544,8 +515,8 @@ def add_axes(self, *args, **kwargs):
 
         Parameters
         ----------
-        rect : sequence of float
-            The dimensions [left, bottom, width, height] of the new Axes. All
+        rect : tuple (left, bottom, width, height)
+            The dimensions (left, bottom, width, height) of the new Axes. All
             quantities are in fractions of figure width and height.
 
         projection : {None, 'aitoff', 'hammer', 'lambert', 'mollweide', \
@@ -587,7 +558,7 @@ def add_axes(self, *args, **kwargs):
             arguments if another projection is used, see the actual Axes
             class.
 
-            %(Axes_kwdoc)s
+            %(Axes:kwdoc)s
 
         Notes
         -----
@@ -618,12 +589,8 @@ def add_axes(self, *args, **kwargs):
         """
 
         if not len(args) and 'rect' not in kwargs:
-            _api.warn_deprecated(
-                "3.3",
-                message="Calling add_axes() without argument is "
-                "deprecated since %(since)s and will be removed %(removal)s. "
-                "You may want to use add_subplot() instead.")
-            return
+            raise TypeError(
+                "add_axes() missing 1 required positional argument: 'rect'")
         elif 'rect' in kwargs:
             if len(args):
                 raise TypeError(
@@ -649,7 +616,7 @@ def add_axes(self, *args, **kwargs):
             key = (projection_class, pkw)
         return self._add_axes_internal(a, key)
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def add_subplot(self, *args, **kwargs):
         """
         Add an `~.axes.Axes` to the figure as part of a subplot arrangement.
@@ -725,7 +692,7 @@ def add_subplot(self, *args, **kwargs):
             the following table but there might also be other keyword
             arguments if another projection is used.
 
-            %(Axes_kwdoc)s
+            %(Axes:kwdoc)s
 
         See Also
         --------
@@ -782,7 +749,8 @@ def add_subplot(self, *args, **kwargs):
     def _add_axes_internal(self, ax, key):
         """Private helper for `add_axes` and `add_subplot`."""
         self._axstack.add(ax)
-        self._localaxes.add(ax)
+        if ax not in self._localaxes:
+            self._localaxes.append(ax)
         self.sca(ax)
         ax._remove_method = self.delaxes
         # this is to support plt.subplot's re-selection logic
@@ -791,9 +759,9 @@ def _add_axes_internal(self, ax, key):
         ax.stale_callback = _stale_figure_callback
         return ax
 
-    @_api.make_keyword_only("3.3", "sharex")
-    def subplots(self, nrows=1, ncols=1, sharex=False, sharey=False,
-                 squeeze=True, subplot_kw=None, gridspec_kw=None):
+    def subplots(self, nrows=1, ncols=1, *, sharex=False, sharey=False,
+                 squeeze=True, width_ratios=None, height_ratios=None,
+                 subplot_kw=None, gridspec_kw=None):
         """
         Add a set of subplots to this figure.
 
@@ -806,8 +774,7 @@ def subplots(self, nrows=1, ncols=1, sharex=False, sharey=False,
             Number of rows/columns of the subplot grid.
 
         sharex, sharey : bool or {'none', 'all', 'row', 'col'}, default: False
-            Controls sharing of properties among x (*sharex*) or y (*sharey*)
-            axes:
+            Controls sharing of x-axis (*sharex*) or y-axis (*sharey*):
 
             - True or 'all': x- or y-axis will be shared among all subplots.
             - False or 'none': each subplot x- or y-axis will be independent.
@@ -837,6 +804,18 @@ def subplots(self, nrows=1, ncols=1, sharex=False, sharey=False,
               is always a 2D array containing Axes instances, even if it ends
               up being 1x1.
 
+        width_ratios : array-like of length *ncols*, optional
+            Defines the relative widths of the columns. Each column gets a
+            relative width of ``width_ratios[i] / sum(width_ratios)``.
+            If not given, all columns will have the same width.  Equivalent
+            to ``gridspec_kw={'width_ratios': [...]}``.
+
+        height_ratios : array-like of length *nrows*, optional
+            Defines the relative heights of the rows. Each row gets a
+            relative height of ``height_ratios[i] / sum(height_ratios)``.
+            If not given, all rows will have the same height. Equivalent
+            to ``gridspec_kw={'height_ratios': [...]}``.
+
         subplot_kw : dict, optional
             Dict with keywords passed to the `.Figure.add_subplot` call used to
             create each subplot.
@@ -899,8 +878,18 @@ def subplots(self, nrows=1, ncols=1, sharex=False, sharey=False,
             # Note that this is the same as
             fig.subplots(2, 2, sharex=True, sharey=True)
         """
-        if gridspec_kw is None:
-            gridspec_kw = {}
+        gridspec_kw = dict(gridspec_kw or {})
+        if height_ratios is not None:
+            if 'height_ratios' in gridspec_kw:
+                raise ValueError("'height_ratios' must not be defined both as "
+                                 "parameter and as key in 'gridspec_kw'")
+            gridspec_kw['height_ratios'] = height_ratios
+        if width_ratios is not None:
+            if 'width_ratios' in gridspec_kw:
+                raise ValueError("'width_ratios' must not be defined both as "
+                                 "parameter and as key in 'gridspec_kw'")
+            gridspec_kw['width_ratios'] = width_ratios
+
         gs = self.add_gridspec(nrows, ncols, figure=self, **gridspec_kw)
         axs = gs.subplots(sharex=sharex, sharey=sharey, squeeze=squeeze,
                           subplot_kw=subplot_kw)
@@ -915,33 +904,10 @@ def _reset_locators_and_formatters(axis):
             # Set the formatters and locators to be associated with axis
             # (where previously they may have been associated with another
             # Axis instance)
-            #
-            # Because set_major_formatter() etc. force isDefault_* to be False,
-            # we have to manually check if the original formatter was a
-            # default and manually set isDefault_* if that was the case.
-            majfmt = axis.get_major_formatter()
-            isDefault = majfmt.axis.isDefault_majfmt
-            axis.set_major_formatter(majfmt)
-            if isDefault:
-                majfmt.axis.isDefault_majfmt = True
-
-            majloc = axis.get_major_locator()
-            isDefault = majloc.axis.isDefault_majloc
-            axis.set_major_locator(majloc)
-            if isDefault:
-                majloc.axis.isDefault_majloc = True
-
-            minfmt = axis.get_minor_formatter()
-            isDefault = majloc.axis.isDefault_minfmt
-            axis.set_minor_formatter(minfmt)
-            if isDefault:
-                minfmt.axis.isDefault_minfmt = True
-
-            minloc = axis.get_minor_locator()
-            isDefault = majloc.axis.isDefault_minloc
-            axis.set_minor_locator(minloc)
-            if isDefault:
-                minloc.axis.isDefault_minloc = True
+            axis.get_major_formatter().set_axis(axis)
+            axis.get_major_locator().set_axis(axis)
+            axis.get_minor_formatter().set_axis(axis)
+            axis.get_minor_locator().set_axis(axis)
 
         def _break_share_link(ax, grouper):
             siblings = grouper.get_siblings(ax)
@@ -957,19 +923,71 @@ def _break_share_link(ax, grouper):
         self.stale = True
         self._localaxes.remove(ax)
 
-        last_ax = _break_share_link(ax, ax._shared_y_axes)
-        if last_ax is not None:
-            _reset_locators_and_formatters(last_ax.yaxis)
+        # Break link between any shared axes
+        for name in ax._axis_names:
+            last_ax = _break_share_link(ax, ax._shared_axes[name])
+            if last_ax is not None:
+                _reset_locators_and_formatters(getattr(last_ax, f"{name}axis"))
+
+        # Break link between any twinned axes
+        _break_share_link(ax, ax._twinned_axes)
+
+    def clear(self, keep_observers=False):
+        """
+        Clear the figure.
+
+        Parameters
+        ----------
+        keep_observers: bool, default: False
+            Set *keep_observers* to True if, for example,
+            a gui widget is tracking the Axes in the figure.
+        """
+        self.suppressComposite = None
+
+        # first clear the axes in any subfigures
+        for subfig in self.subfigs:
+            subfig.clear(keep_observers=keep_observers)
+        self.subfigs = []
+
+        for ax in tuple(self.axes):  # Iterate over the copy.
+            ax.clear()
+            self.delaxes(ax)  # Remove ax from self._axstack.
+
+        self.artists = []
+        self.lines = []
+        self.patches = []
+        self.texts = []
+        self.images = []
+        self.legends = []
+        if not keep_observers:
+            self._axobservers = cbook.CallbackRegistry()
+        self._suptitle = None
+        self._supxlabel = None
+        self._supylabel = None
+
+        self.stale = True
+
+    # synonym for `clear`.
+    def clf(self, keep_observers=False):
+        """
+        [*Discouraged*] Alias for the `clear()` method.
+
+        .. admonition:: Discouraged
+
+            The use of ``clf()`` is discouraged. Use ``clear()`` instead.
 
-        last_ax = _break_share_link(ax, ax._shared_x_axes)
-        if last_ax is not None:
-            _reset_locators_and_formatters(last_ax.xaxis)
+        Parameters
+        ----------
+        keep_observers: bool, default: False
+            Set *keep_observers* to True if, for example,
+            a gui widget is tracking the Axes in the figure.
+        """
+        return self.clear(keep_observers=keep_observers)
 
     # Note: in the docstring below, the newlines in the examples after the
     # calls to legend() allow replacing it with figlegend() to generate the
     # docstring of pyplot.figlegend.
-
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def legend(self, *args, **kwargs):
         """
         Place a legend on the figure.
@@ -977,10 +995,11 @@ def legend(self, *args, **kwargs):
         Call signatures::
 
             legend()
-            legend(labels)
             legend(handles, labels)
+            legend(handles=handles)
+            legend(labels)
 
-        The call signatures correspond to these three different ways to use
+        The call signatures correspond to the following different ways to use
         this method:
 
         **1. Automatic detection of elements to be shown in the legend**
@@ -1008,28 +1027,41 @@ def legend(self, *args, **kwargs):
         no legend being drawn.
 
 
-        **2. Labeling existing plot elements**
+        **2. Explicitly listing the artists and labels in the legend**
+
+        For full control of which artists have a legend entry, it is possible
+        to pass an iterable of legend artists followed by an iterable of
+        legend labels respectively::
+
+            fig.legend([line1, line2, line3], ['label1', 'label2', 'label3'])
+
+
+        **3. Explicitly listing the artists in the legend**
+
+        This is similar to 2, but the labels are taken from the artists'
+        label properties. Example::
+
+            line1, = ax1.plot([1, 2, 3], label='label1')
+            line2, = ax2.plot([1, 2, 3], label='label2')
+            fig.legend(handles=[line1, line2])
+
+
+        **4. Labeling existing plot elements**
+
+        .. admonition:: Discouraged
+
+            This call signature is discouraged, because the relation between
+            plot elements and labels is only implicit by their order and can
+            easily be mixed up.
 
         To make a legend for all artists on all Axes, call this function with
         an iterable of strings, one for each legend item. For example::
 
-            fig, (ax1, ax2)  = plt.subplots(1, 2)
+            fig, (ax1, ax2) = plt.subplots(1, 2)
             ax1.plot([1, 3, 5], color='blue')
             ax2.plot([2, 4, 6], color='red')
             fig.legend(['the blues', 'the reds'])
 
-        Note: This call signature is discouraged, because the relation between
-        plot elements and labels is only implicit by their order and can
-        easily be mixed up.
-
-
-        **3. Explicitly defining the elements in the legend**
-
-        For full control of which artists have a legend entry, it is possible
-        to pass an iterable of legend artists followed by an iterable of
-        legend labels respectively::
-
-            fig.legend([line1, line2, line3], ['label1', 'label2', 'label3'])
 
         Parameters
         ----------
@@ -1090,7 +1122,7 @@ def legend(self, *args, **kwargs):
         self.stale = True
         return l
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def text(self, x, y, s, fontdict=None, **kwargs):
         """
         Add text to figure.
@@ -1119,7 +1151,7 @@ def text(self, x, y, s, fontdict=None, **kwargs):
         **kwargs : `~matplotlib.text.Text` properties
             Other miscellaneous text parameters.
 
-            %(Text_kwdoc)s
+            %(Text:kwdoc)s
 
         See Also
         --------
@@ -1140,36 +1172,112 @@ def text(self, x, y, s, fontdict=None, **kwargs):
         self.stale = True
         return text
 
-    @docstring.dedent_interpd
-    def colorbar(self, mappable, cax=None, ax=None, use_gridspec=True, **kw):
-        """%(colorbar_doc)s"""
+    @_docstring.dedent_interpd
+    def colorbar(
+            self, mappable, cax=None, ax=None, use_gridspec=True, **kwargs):
+        """
+        Add a colorbar to a plot.
+
+        Parameters
+        ----------
+        mappable
+            The `matplotlib.cm.ScalarMappable` (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.
+            ::
+
+                fig.colorbar(cm.ScalarMappable(norm=norm, cmap=cmap), ax=ax)
+
+        cax : `~matplotlib.axes.Axes`, optional
+            Axes into which the colorbar will be drawn.
+
+        ax : `~.axes.Axes` or list or `numpy.ndarray` of Axes, optional
+            One or more parent axes from which space for a new colorbar axes
+            will be stolen, if *cax* is None.  This has no effect if *cax* is
+            set.
+
+        use_gridspec : bool, optional
+            If *cax* is ``None``, a new *cax* is created as an instance of
+            Axes.  If *ax* is an instance of Subplot and *use_gridspec* is
+            ``True``, *cax* is created as an instance of Subplot using the
+            :mod:`.gridspec` module.
+
+        Returns
+        -------
+        colorbar : `~matplotlib.colorbar.Colorbar`
+
+        Other Parameters
+        ----------------
+        %(_make_axes_kw_doc)s
+        %(_colormap_kw_doc)s
+
+        Notes
+        -----
+        If *mappable* is a `~.contour.ContourSet`, its *extend* kwarg is
+        included automatically.
+
+        The *shrink* kwarg provides a simple way to scale the colorbar with
+        respect to the axes. Note that if *cax* is specified, it determines the
+        size of the colorbar and *shrink* and *aspect* kwargs are ignored.
+
+        For more precise control, you can manually specify the positions of the
+        axes objects in which the mappable and the colorbar are drawn.  In this
+        case, do not use any of the axes properties kwargs.
+
+        It is known that some vector graphics viewers (svg and pdf) renders
+        white gaps between segments of the colorbar.  This is due to bugs in
+        the viewers, not Matplotlib.  As a workaround, the colorbar can be
+        rendered with overlapping segments::
+
+            cbar = colorbar()
+            cbar.solids.set_edgecolor("face")
+            draw()
+
+        However this has negative consequences in other circumstances, e.g.
+        with semi-transparent images (alpha < 1) and colorbar extensions;
+        therefore, this workaround is not used by default (see issue #1188).
+        """
+
         if ax is None:
-            ax = self.gca()
-            if (hasattr(mappable, "axes") and ax is not mappable.axes
-                    and cax is None):
-                _api.warn_deprecated(
-                    "3.4", message="Starting from Matplotlib 3.6, colorbar() "
-                    "will steal space from the mappable's axes, rather than "
-                    "from the current axes, to place the colorbar.  To "
-                    "silence this warning, explicitly pass the 'ax' argument "
-                    "to colorbar().")
+            ax = getattr(mappable, "axes", None)
 
+        if (self.get_layout_engine() is not None and
+                not self.get_layout_engine().colorbar_gridspec):
+            use_gridspec = False
         # Store the value of gca so that we can set it back later on.
-        current_ax = self.gca()
         if cax is None:
-            if (use_gridspec and isinstance(ax, SubplotBase)
-                    and not self.get_constrained_layout()):
-                cax, kw = cbar.make_axes_gridspec(ax, **kw)
+            if ax is None:
+                _api.warn_deprecated("3.6", message=(
+                    'Unable to determine Axes to steal space for Colorbar. '
+                    'Using gca(), but will raise in the future. '
+                    'Either provide the *cax* argument to use as the Axes for '
+                    'the Colorbar, provide the *ax* argument to steal space '
+                    'from it, or add *mappable* to an Axes.'))
+                ax = self.gca()
+            current_ax = self.gca()
+            userax = False
+            if (use_gridspec and isinstance(ax, SubplotBase)):
+                cax, kwargs = cbar.make_axes_gridspec(ax, **kwargs)
             else:
-                cax, kw = cbar.make_axes(ax, **kw)
+                cax, kwargs = cbar.make_axes(ax, **kwargs)
+            cax.grid(visible=False, which='both', axis='both')
+        else:
+            userax = True
 
         # need to remove kws that cannot be passed to Colorbar
         NON_COLORBAR_KEYS = ['fraction', 'pad', 'shrink', 'aspect', 'anchor',
                              'panchor']
-        cb_kw = {k: v for k, v in kw.items() if k not in NON_COLORBAR_KEYS}
+        cb_kw = {k: v for k, v in kwargs.items() if k not in NON_COLORBAR_KEYS}
+
         cb = cbar.Colorbar(cax, mappable, **cb_kw)
 
-        self.sca(current_ax)
+        if not userax:
+            self.sca(current_ax)
         self.stale = True
         return cb
 
@@ -1202,15 +1310,16 @@ def subplots_adjust(self, left=None, bottom=None, right=None, top=None,
             The height of the padding between subplots,
             as a fraction of the average Axes height.
         """
-        if self.get_constrained_layout():
-            self.set_constrained_layout(False)
+        if (self.get_layout_engine() is not None and
+                not self.get_layout_engine().adjust_compatible):
             _api.warn_external(
-                "This figure was using constrained_layout, but that is "
+                "This figure was using a layout engine that is "
                 "incompatible with subplots_adjust and/or tight_layout; "
-                "disabling constrained_layout.")
+                "not calling subplots_adjust.")
+            return
         self.subplotpars.update(left, bottom, right, top, wspace, hspace)
         for ax in self.axes:
-            if isinstance(ax, SubplotBase):
+            if hasattr(ax, 'get_subplotspec'):
                 ax._set_position(ax.get_subplotspec().get_position(self))
         self.stale = True
 
@@ -1258,6 +1367,8 @@ def align_xlabels(self, axs=None):
         if axs is None:
             axs = self.axes
         axs = np.ravel(axs)
+        axs = [ax for ax in axs if hasattr(ax, 'get_subplotspec')]
+
         for ax in axs:
             _log.debug(' Working on: %s', ax.get_xlabel())
             rowspan = ax.get_subplotspec().rowspan
@@ -1318,6 +1429,8 @@ def align_ylabels(self, axs=None):
         if axs is None:
             axs = self.axes
         axs = np.ravel(axs)
+        axs = [ax for ax in axs if hasattr(ax, 'get_subplotspec')]
+
         for ax in axs:
             _log.debug(' Working on: %s', ax.get_ylabel())
             colspan = ax.get_subplotspec().colspan
@@ -1400,7 +1513,6 @@ def add_gridspec(self, nrows=1, ncols=1, **kwargs):
 
         _ = kwargs.pop('figure', None)  # pop in case user has added this...
         gs = GridSpec(nrows=nrows, ncols=ncols, figure=self, **kwargs)
-        self._gridspecs.append(gs)
         return gs
 
     def subfigures(self, nrows=1, ncols=1, squeeze=True,
@@ -1457,12 +1569,9 @@ def subfigures(self, nrows=1, ncols=1, squeeze=True,
             # Returned axis array will be always 2-d, even if nrows=ncols=1.
             return sfarr
 
-        return sfarr
-
     def add_subfigure(self, subplotspec, **kwargs):
         """
-        Add a `~.figure.SubFigure` to the figure as part of a subplot
-        arrangement.
+        Add a `.SubFigure` to the figure as part of a subplot arrangement.
 
         Parameters
         ----------
@@ -1472,12 +1581,12 @@ def add_subfigure(self, subplotspec, **kwargs):
 
         Returns
         -------
-        `.figure.SubFigure`
+        `.SubFigure`
 
         Other Parameters
         ----------------
         **kwargs
-            Are passed to the `~.figure.SubFigure` object.
+            Are passed to the `.SubFigure` object.
 
         See Also
         --------
@@ -1493,32 +1602,18 @@ def sca(self, a):
         self._axobservers.process("_axes_change_event", self)
         return a
 
-    @docstring.dedent_interpd
-    def gca(self, **kwargs):
+    def gca(self):
         """
-        Get the current Axes, creating one if necessary.
-
-        The following kwargs are supported for ensuring the returned Axes
-        adheres to the given projection etc., and for Axes creation if
-        the active Axes does not exist:
-
-        %(Axes_kwdoc)s
+        Get the current Axes.
 
+        If there is currently no Axes on this Figure, a new one is created
+        using `.Figure.add_subplot`.  (To test whether there is currently an
+        Axes on a Figure, check whether ``figure.axes`` is empty.  To test
+        whether there is currently a Figure on the pyplot figure stack, check
+        whether `.pyplot.get_fignums()` is empty.)
         """
-        if kwargs:
-            _api.warn_deprecated(
-                "3.4",
-                message="Calling gca() with keyword arguments was deprecated "
-                "in Matplotlib %(since)s. Starting %(removal)s, gca() will "
-                "take no keyword arguments. The gca() function should only be "
-                "used to get the current axes, or if no axes exist, create "
-                "new axes with default keyword arguments. To create a new "
-                "axes with non-default arguments, use plt.axes() or "
-                "plt.subplot().")
-        if self._axstack.empty():
-            return self.add_subplot(1, 1, 1, **kwargs)
-        else:
-            return self._axstack()
+        ax = self._axstack.current()
+        return ax if ax is not None else self.add_subplot()
 
     def _gci(self):
         # Helper for `~matplotlib.pyplot.gci`.  Do not use elsewhere.
@@ -1537,13 +1632,13 @@ def _gci(self):
         Historically, the only colorable artists were images; hence the name
         ``gci`` (get current image).
         """
-        # Look first for an image in the current Axes:
-        if self._axstack.empty():
+        # Look first for an image in the current Axes.
+        ax = self._axstack.current()
+        if ax is None:
             return None
-        im = self._axstack()._gci()
+        im = ax._gci()
         if im is not None:
             return im
-
         # If there is no image in the current Axes, search for
         # one in a previously created Axes.  Whether this makes
         # sense is debatable, but it is the documented behavior.
@@ -1599,9 +1694,12 @@ def get_default_bbox_extra_artists(self):
                 bbox_artists.extend(ax.get_default_bbox_extra_artists())
         return bbox_artists
 
-    def get_tightbbox(self, renderer, bbox_extra_artists=None):
+    def get_tightbbox(self, renderer=None, bbox_extra_artists=None):
         """
-        Return a (tight) bounding box of the figure in inches.
+        Return a (tight) bounding box of the figure *in inches*.
+
+        Note that `.FigureBase` differs from all other artists, which return
+        their `.Bbox` in pixels.
 
         Artists that have ``artist.set_in_layout(False)`` are not included
         in the bbox.
@@ -1623,6 +1721,9 @@ def get_tightbbox(self, renderer, bbox_extra_artists=None):
             containing the bounding box (in figure inches).
         """
 
+        if renderer is None:
+            renderer = self.figure._get_renderer()
+
         bb = []
         if bbox_extra_artists is None:
             artists = self.get_default_bbox_extra_artists()
@@ -1631,7 +1732,7 @@ def get_tightbbox(self, renderer, bbox_extra_artists=None):
 
         for a in artists:
             bbox = a.get_tightbbox(renderer)
-            if bbox is not None and (bbox.width != 0 or bbox.height != 0):
+            if bbox is not None:
                 bb.append(bbox)
 
         for ax in self.axes:
@@ -1648,14 +1749,21 @@ def get_tightbbox(self, renderer, bbox_extra_artists=None):
               if (np.isfinite(b.width) and np.isfinite(b.height)
                   and (b.width != 0 or b.height != 0))]
 
+        isfigure = hasattr(self, 'bbox_inches')
         if len(bb) == 0:
-            return self.bbox_inches
+            if isfigure:
+                return self.bbox_inches
+            else:
+                # subfigures do not have bbox_inches, but do have a bbox
+                bb = [self.bbox]
 
         _bbox = Bbox.union(bb)
 
-        bbox_inches = TransformedBbox(_bbox, Affine2D().scale(1 / self.dpi))
+        if isfigure:
+            # transform from pixels to inches...
+            _bbox = TransformedBbox(_bbox, self.dpi_scale_trans.inverted())
 
-        return bbox_inches
+        return _bbox
 
     @staticmethod
     def _normalize_grid_string(layout):
@@ -1667,22 +1775,25 @@ def _normalize_grid_string(layout):
             layout = inspect.cleandoc(layout)
             return [list(ln) for ln in layout.strip('\n').split('\n')]
 
-    def subplot_mosaic(self, layout, *, subplot_kw=None, gridspec_kw=None,
-                       empty_sentinel='.'):
+    def subplot_mosaic(self, mosaic, *, sharex=False, sharey=False,
+                       width_ratios=None, height_ratios=None,
+                       empty_sentinel='.', subplot_kw=None, gridspec_kw=None):
         """
         Build a layout of Axes based on ASCII art or nested lists.
 
         This is a helper function to build complex GridSpec layouts visually.
 
-        .. note ::
+        .. note::
 
            This API is provisional and may be revised in the future based on
            early user feedback.
 
+        See :doc:`/tutorials/provisional/mosaic`
+        for an example and full API documentation
 
         Parameters
         ----------
-        layout : list of list of {hashable or nested} or str
+        mosaic : list of list of {hashable or nested} or str
 
             A visual layout of how you want your Axes to be arranged
             labeled as strings.  For example ::
@@ -1690,7 +1801,7 @@ def subplot_mosaic(self, layout, *, subplot_kw=None, gridspec_kw=None,
                x = [['A panel', 'A panel', 'edge'],
                     ['C panel', '.',       'edge']]
 
-            Produces 4 Axes:
+            produces 4 Axes:
 
             - 'A panel' which is 1 row high and spans the first two columns
             - 'edge' which is 2 rows high and is on the right edge
@@ -1716,6 +1827,24 @@ def subplot_mosaic(self, layout, *, subplot_kw=None, gridspec_kw=None,
             The string notation allows only single character Axes labels and
             does not support nesting but is very terse.
 
+        sharex, sharey : bool, default: False
+            If True, the x-axis (*sharex*) or y-axis (*sharey*) will be shared
+            among all subplots.  In that case, tick label visibility and axis
+            units behave as for `subplots`.  If False, each subplot's x- or
+            y-axis will be independent.
+
+        width_ratios : array-like of length *ncols*, optional
+            Defines the relative widths of the columns. Each column gets a
+            relative width of ``width_ratios[i] / sum(width_ratios)``.
+            If not given, all columns will have the same width.  Equivalent
+            to ``gridspec_kw={'width_ratios': [...]}``.
+
+        height_ratios : array-like of length *nrows*, optional
+            Defines the relative heights of the rows. Each row gets a
+            relative height of ``height_ratios[i] / sum(height_ratios)``.
+            If not given, all rows will have the same height. Equivalent
+            to ``gridspec_kw={'height_ratios': [...]}``.
+
         subplot_kw : dict, optional
             Dictionary with keywords passed to the `.Figure.add_subplot` call
             used to create each subplot.
@@ -1733,14 +1862,29 @@ def subplot_mosaic(self, layout, *, subplot_kw=None, gridspec_kw=None,
         Returns
         -------
         dict[label, Axes]
-           A dictionary mapping the labels to the Axes objects.
+           A dictionary mapping the labels to the Axes objects.  The order of
+           the axes is left-to-right and top-to-bottom of their position in the
+           total layout.
 
         """
         subplot_kw = subplot_kw or {}
-        gridspec_kw = gridspec_kw or {}
+        gridspec_kw = dict(gridspec_kw or {})
+        if height_ratios is not None:
+            if 'height_ratios' in gridspec_kw:
+                raise ValueError("'height_ratios' must not be defined both as "
+                                 "parameter and as key in 'gridspec_kw'")
+            gridspec_kw['height_ratios'] = height_ratios
+        if width_ratios is not None:
+            if 'width_ratios' in gridspec_kw:
+                raise ValueError("'width_ratios' must not be defined both as "
+                                 "parameter and as key in 'gridspec_kw'")
+            gridspec_kw['width_ratios'] = width_ratios
+
         # special-case string input
-        if isinstance(layout, str):
-            layout = self._normalize_grid_string(layout)
+        if isinstance(mosaic, str):
+            mosaic = self._normalize_grid_string(mosaic)
+        # Only accept strict bools to allow a possible future API expansion.
+        _api.check_isinstance(bool, sharex=sharex, sharey=sharey)
 
         def _make_array(inp):
             """
@@ -1758,10 +1902,10 @@ def _make_array(inp):
             """
             r0, *rest = inp
             if isinstance(r0, str):
-                raise ValueError('List layout specification must be 2D')
+                raise ValueError('List mosaic specification must be 2D')
             for j, r in enumerate(rest, start=1):
                 if isinstance(r, str):
-                    raise ValueError('List layout specification must be 2D')
+                    raise ValueError('List mosaic specification must be 2D')
                 if len(r0) != len(r):
                     raise ValueError(
                         "All of the rows must be the same length, however "
@@ -1774,23 +1918,24 @@ def _make_array(inp):
                     out[j, k] = v
             return out
 
-        def _identify_keys_and_nested(layout):
+        def _identify_keys_and_nested(mosaic):
             """
-            Given a 2D object array, identify unique IDs and nested layouts
+            Given a 2D object array, identify unique IDs and nested mosaics
 
             Parameters
             ----------
-            layout : 2D numpy object array
+            mosaic : 2D numpy object array
 
             Returns
             -------
-            unique_ids : set
-                The unique non-sub layout entries in this layout
+            unique_ids : tuple
+                The unique non-sub mosaic entries in this mosaic
             nested : dict[tuple[int, int]], 2D object array
             """
-            unique_ids = set()
+            # make sure we preserve the user supplied order
+            unique_ids = cbook._OrderedSet()
             nested = {}
-            for j, row in enumerate(layout):
+            for j, row in enumerate(mosaic):
                 for k, v in enumerate(row):
                     if v == empty_sentinel:
                         continue
@@ -1799,68 +1944,111 @@ def _identify_keys_and_nested(layout):
                     else:
                         unique_ids.add(v)
 
-            return unique_ids, nested
+            return tuple(unique_ids), nested
 
-        def _do_layout(gs, layout, unique_ids, nested):
+        def _do_layout(gs, mosaic, unique_ids, nested):
             """
-            Recursively do the layout.
+            Recursively do the mosaic.
 
             Parameters
             ----------
             gs : GridSpec
-            layout : 2D object array
+            mosaic : 2D object array
                 The input converted to a 2D numpy array for this level.
-            unique_ids : set
+            unique_ids : tuple
                 The identified scalar labels at this level of nesting.
             nested : dict[tuple[int, int]], 2D object array
-                The identified nested layouts, if any.
+                The identified nested mosaics, if any.
 
             Returns
             -------
             dict[label, Axes]
                 A flat dict of all of the Axes created.
             """
-            rows, cols = layout.shape
             output = dict()
 
-            # create the Axes at this level of nesting
+            # we need to merge together the Axes at this level and the axes
+            # in the (recursively) nested sub-mosaics so that we can add
+            # them to the figure in the "natural" order if you were to
+            # ravel in c-order all of the Axes that will be created
+            #
+            # This will stash the upper left index of each object (axes or
+            # nested mosaic) at this level
+            this_level = dict()
+
+            # go through the unique keys,
             for name in unique_ids:
-                indx = np.argwhere(layout == name)
+                # sort out where each axes starts/ends
+                indx = np.argwhere(mosaic == name)
                 start_row, start_col = np.min(indx, axis=0)
                 end_row, end_col = np.max(indx, axis=0) + 1
+                # and construct the slice object
                 slc = (slice(start_row, end_row), slice(start_col, end_col))
-
-                if (layout[slc] != name).any():
+                # some light error checking
+                if (mosaic[slc] != name).any():
                     raise ValueError(
-                        f"While trying to layout\n{layout!r}\n"
+                        f"While trying to layout\n{mosaic!r}\n"
                         f"we found that the label {name!r} specifies a "
                         "non-rectangular or non-contiguous area.")
-
-                ax = self.add_subplot(
-                    gs[slc], **{'label': str(name), **subplot_kw}
-                )
-                output[name] = ax
-
-            # do any sub-layouts
-            for (j, k), nested_layout in nested.items():
-                rows, cols = nested_layout.shape
-                nested_output = _do_layout(
-                    gs[j, k].subgridspec(rows, cols, **gridspec_kw),
-                    nested_layout,
-                    *_identify_keys_and_nested(nested_layout)
-                )
-                overlap = set(output) & set(nested_output)
-                if overlap:
-                    raise ValueError(f"There are duplicate keys {overlap} "
-                                     f"between the outer layout\n{layout!r}\n"
-                                     f"and the nested layout\n{nested_layout}")
-                output.update(nested_output)
+                # and stash this slice for later
+                this_level[(start_row, start_col)] = (name, slc, 'axes')
+
+            # do the same thing for the nested mosaics (simpler because these
+            # can not be spans yet!)
+            for (j, k), nested_mosaic in nested.items():
+                this_level[(j, k)] = (None, nested_mosaic, 'nested')
+
+            # now go through the things in this level and add them
+            # in order left-to-right top-to-bottom
+            for key in sorted(this_level):
+                name, arg, method = this_level[key]
+                # we are doing some hokey function dispatch here based
+                # on the 'method' string stashed above to sort out if this
+                # element is an Axes or a nested mosaic.
+                if method == 'axes':
+                    slc = arg
+                    # add a single axes
+                    if name in output:
+                        raise ValueError(f"There are duplicate keys {name} "
+                                         f"in the layout\n{mosaic!r}")
+                    ax = self.add_subplot(
+                        gs[slc], **{'label': str(name), **subplot_kw}
+                    )
+                    output[name] = ax
+                elif method == 'nested':
+                    nested_mosaic = arg
+                    j, k = key
+                    # recursively add the nested mosaic
+                    rows, cols = nested_mosaic.shape
+                    nested_output = _do_layout(
+                        gs[j, k].subgridspec(rows, cols, **gridspec_kw),
+                        nested_mosaic,
+                        *_identify_keys_and_nested(nested_mosaic)
+                    )
+                    overlap = set(output) & set(nested_output)
+                    if overlap:
+                        raise ValueError(
+                            f"There are duplicate keys {overlap} "
+                            f"between the outer layout\n{mosaic!r}\n"
+                            f"and the nested layout\n{nested_mosaic}"
+                        )
+                    output.update(nested_output)
+                else:
+                    raise RuntimeError("This should never happen")
             return output
 
-        layout = _make_array(layout)
-        rows, cols = layout.shape
+        mosaic = _make_array(mosaic)
+        rows, cols = mosaic.shape
         gs = self.add_gridspec(rows, cols, **gridspec_kw)
-        ret = _do_layout(gs, layout, *_identify_keys_and_nested(layout))
+        ret = _do_layout(gs, mosaic, *_identify_keys_and_nested(mosaic))
+        ax0 = next(iter(ret.values()))
+        for ax in ret.values():
+            if sharex:
+                ax.sharex(ax0)
+                ax._label_outer_xaxis(check_patch=True)
+            if sharey:
+                ax.sharey(ax0)
+                ax._label_outer_yaxis(check_patch=True)
         for k, ax in ret.items():
             if isinstance(k, str):
                 ax.set_label(k)
@@ -1873,6 +2061,7 @@ def _set_artist_props(self, a):
         a.set_transform(self.transSubfigure)
 
 
+@_docstring.interpd
 class SubFigure(FigureBase):
     """
     Logical figure that can be placed inside a figure.
@@ -1890,16 +2079,21 @@ class SubFigure(FigureBase):
 
     See :doc:`/gallery/subplots_axes_and_figures/subfigures`
     """
+    callbacks = _api.deprecated(
+            "3.6", alternative=("the 'resize_event' signal in "
+                                "Figure.canvas.callbacks")
+            )(property(lambda self: self._fig_callbacks))
 
     def __init__(self, parent, subplotspec, *,
                  facecolor=None,
                  edgecolor=None,
                  linewidth=0.0,
-                 frameon=None):
+                 frameon=None,
+                 **kwargs):
         """
         Parameters
         ----------
-        parent : `.figure.Figure` or `.figure.SubFigure`
+        parent : `.Figure` or `.SubFigure`
             Figure or subfigure that contains the SubFigure.  SubFigures
             can be nested.
 
@@ -1919,8 +2113,14 @@ def __init__(self, parent, subplotspec, *,
 
         frameon : bool, default: :rc:`figure.frameon`
             If ``False``, suppress drawing the figure background patch.
+
+        Other Parameters
+        ----------------
+        **kwargs : `.SubFigure` properties, optional
+
+            %(SubFigure:kwdoc)s
         """
-        super().__init__()
+        super().__init__(**kwargs)
         if facecolor is None:
             facecolor = mpl.rcParams['figure.facecolor']
         if edgecolor is None:
@@ -1931,12 +2131,13 @@ def __init__(self, parent, subplotspec, *,
         self._subplotspec = subplotspec
         self._parent = parent
         self.figure = parent.figure
+        self._fig_callbacks = parent._fig_callbacks
+
         # subfigures use the parent axstack
         self._axstack = parent._axstack
         self.subplotpars = parent.subplotpars
         self.dpi_scale_trans = parent.dpi_scale_trans
         self._axobservers = parent._axobservers
-        self.dpi = parent.dpi
         self.canvas = parent.canvas
         self.transFigure = parent.transFigure
         self.bbox_relative = None
@@ -1954,8 +2155,33 @@ def __init__(self, parent, subplotspec, *,
         self._set_artist_props(self.patch)
         self.patch.set_antialiased(False)
 
-        if parent._layoutgrid is not None:
-            self.init_layoutgrid()
+    @property
+    def dpi(self):
+        return self._parent.dpi
+
+    @dpi.setter
+    def dpi(self, value):
+        self._parent.dpi = value
+
+    def get_dpi(self):
+        """
+        Return the resolution of the parent figure in dots-per-inch as a float.
+        """
+        return self._parent.dpi
+
+    def set_dpi(self, val):
+        """
+        Set the resolution of parent figure in dots-per-inch.
+
+        Parameters
+        ----------
+        val : float
+        """
+        self._parent.dpi = val
+        self.stale = True
+
+    def _get_renderer(self):
+        return self._parent._get_renderer()
 
     def _redo_transform_rel_fig(self, bbox=None):
         """
@@ -1967,42 +2193,23 @@ def _redo_transform_rel_fig(self, bbox=None):
             If not None, then the bbox is used for relative bounding box.
             Otherwise it is calculated from the subplotspec.
         """
-
         if bbox is not None:
             self.bbox_relative.p0 = bbox.p0
             self.bbox_relative.p1 = bbox.p1
             return
-
-        gs = self._subplotspec.get_gridspec()
         # need to figure out *where* this subplotspec is.
-        wr = gs.get_width_ratios()
-        hr = gs.get_height_ratios()
-        nrows, ncols = gs.get_geometry()
-        if wr is None:
-            wr = np.ones(ncols)
-        else:
-            wr = np.array(wr)
-        if hr is None:
-            hr = np.ones(nrows)
-        else:
-            hr = np.array(hr)
-        widthf = np.sum(wr[self._subplotspec.colspan]) / np.sum(wr)
-        heightf = np.sum(hr[self._subplotspec.rowspan]) / np.sum(hr)
-
-        x0 = 0
-        if not self._subplotspec.is_first_col():
-            x0 += np.sum(wr[self._subplotspec.colspan.start - 1]) / np.sum(wr)
-
-        y0 = 0
-        if not self._subplotspec.is_last_row():
-            y0 += 1 - (np.sum(hr[self._subplotspec.rowspan.stop - 1]) /
-                       np.sum(hr))
-
+        gs = self._subplotspec.get_gridspec()
+        wr = np.asarray(gs.get_width_ratios())
+        hr = np.asarray(gs.get_height_ratios())
+        dx = wr[self._subplotspec.colspan].sum() / wr.sum()
+        dy = hr[self._subplotspec.rowspan].sum() / hr.sum()
+        x0 = wr[:self._subplotspec.colspan.start].sum() / wr.sum()
+        y0 = 1 - hr[:self._subplotspec.rowspan.stop].sum() / hr.sum()
         if self.bbox_relative is None:
-            self.bbox_relative = Bbox.from_bounds(x0, y0, widthf, heightf)
+            self.bbox_relative = Bbox.from_bounds(x0, y0, dx, dy)
         else:
             self.bbox_relative.p0 = (x0, y0)
-            self.bbox_relative.p1 = (x0 + widthf, y0 + heightf)
+            self.bbox_relative.p1 = (x0 + dx, y0 + dy)
 
     def get_constrained_layout(self):
         """
@@ -2028,46 +2235,28 @@ def get_constrained_layout_pads(self, relative=False):
         """
         return self._parent.get_constrained_layout_pads(relative=relative)
 
-    def init_layoutgrid(self):
-        """Initialize the layoutgrid for use in constrained_layout."""
-        if self._layoutgrid is None:
-            gs = self._subplotspec.get_gridspec()
-            parent = gs._layoutgrid
-            if parent is not None:
-                self._layoutgrid = layoutgrid.LayoutGrid(
-                    parent=parent,
-                    name=(parent.name + '.' + 'panellb' +
-                          layoutgrid.seq_id()),
-                    parent_inner=True,
-                    nrows=1, ncols=1,
-                    parent_pos=(self._subplotspec.rowspan,
-                                self._subplotspec.colspan))
-
-    def get_axes(self):
-        """
-        Return a list of Axes in the SubFigure. You can access and modify the
-        Axes in the Figure through this list.
-
-        Do not modify the list itself. Instead, use `~.SubFigure.add_axes`,
-        `~.SubFigure.add_subplot` or `~.SubFigure.delaxes` to add or remove an
-        Axes.
+    def get_layout_engine(self):
+        return self._parent.get_layout_engine()
 
-        Note: This is equivalent to the property `~.SubFigure.axes`.
+    @property
+    def axes(self):
         """
-        return self._localaxes.as_list()
-
-    axes = property(get_axes, doc="""
         List of Axes in the SubFigure.  You can access and modify the Axes
         in the SubFigure through this list.
 
-        Do not modify the list itself. Instead, use `~.SubFigure.add_axes`,
+        Modifying this list has no effect. Instead, use `~.SubFigure.add_axes`,
         `~.SubFigure.add_subplot` or `~.SubFigure.delaxes` to add or remove an
         Axes.
-        """)
+
+        Note: The `.SubFigure.axes` property and `~.SubFigure.get_axes` method
+        are equivalent.
+        """
+        return self._localaxes[:]
+
+    get_axes = axes.fget
 
     def draw(self, renderer):
         # docstring inherited
-        self._cachedRenderer = renderer
 
         # draw the figure bounding box, perhaps none for white figure
         if not self.get_visible():
@@ -2078,7 +2267,8 @@ def draw(self, renderer):
         try:
             renderer.open_group('subfigure', gid=self.get_gid())
             self.patch.draw(renderer)
-            mimage._draw_list_compositing_images(renderer, self, artists)
+            mimage._draw_list_compositing_images(
+                renderer, self, artists, self.figure.suppressComposite)
             for sfig in self.subfigs:
                 sfig.draw(renderer)
             renderer.close_group('subfigure')
@@ -2087,25 +2277,27 @@ def draw(self, renderer):
             self.stale = False
 
 
+@_docstring.interpd
 class Figure(FigureBase):
     """
     The top level container for all the plot elements.
 
-    The Figure instance supports callbacks through a *callbacks* attribute
-    which is a `.CallbackRegistry` instance.  The events you can connect to
-    are 'dpi_changed', and the callback will be called with ``func(fig)`` where
-    fig is the `Figure` instance.
-
     Attributes
     ----------
     patch
         The `.Rectangle` instance representing the figure background patch.
 
     suppressComposite
-        For multiple figure images, the figure will make composite images
+        For multiple images, the figure will make composite images
         depending on the renderer option_image_nocomposite function.  If
         *suppressComposite* is a boolean, this will override the renderer.
     """
+    # Remove the self._fig_callbacks properties on figure and subfigure
+    # after the deprecation expires.
+    callbacks = _api.deprecated(
+        "3.6", alternative=("the 'resize_event' signal in "
+                            "Figure.canvas.callbacks")
+        )(property(lambda self: self._fig_callbacks))
 
     def __str__(self):
         return "Figure(%gx%g)" % tuple(self.bbox.size)
@@ -2117,6 +2309,7 @@ def __repr__(self):
             naxes=len(self.axes),
         )
 
+    @_api.make_keyword_only("3.6", "facecolor")
     def __init__(self,
                  figsize=None,
                  dpi=None,
@@ -2127,6 +2320,9 @@ def __init__(self,
                  subplotpars=None,  # rc figure.subplot.*
                  tight_layout=None,  # rc figure.autolayout
                  constrained_layout=None,  # rc figure.constrained_layout.use
+                 *,
+                 layout=None,
+                 **kwargs
                  ):
         """
         Parameters
@@ -2155,31 +2351,110 @@ def __init__(self,
             parameters :rc:`figure.subplot.*` are used.
 
         tight_layout : bool or dict, default: :rc:`figure.autolayout`
-            If ``False`` use *subplotpars*. If ``True`` adjust subplot
-            parameters using `.tight_layout` with default padding.
-            When providing a dict containing the keys ``pad``, ``w_pad``,
-            ``h_pad``, and ``rect``, the default `.tight_layout` paddings
-            will be overridden.
+            Whether to use the tight layout mechanism. See `.set_tight_layout`.
+
+            .. admonition:: Discouraged
+
+                The use of this parameter is discouraged. Please use
+                ``layout='tight'`` instead for the common case of
+                ``tight_layout=True`` and use `.set_tight_layout` otherwise.
 
         constrained_layout : bool, default: :rc:`figure.constrained_layout.use`
-            If ``True`` use constrained layout to adjust positioning of plot
-            elements.  Like ``tight_layout``, but designed to be more
-            flexible.  See
-            :doc:`/tutorials/intermediate/constrainedlayout_guide`
-            for examples.  (Note: does not work with `add_subplot` or
-            `~.pyplot.subplot2grid`.)
-        """
-        super().__init__()
+            This is equal to ``layout='constrained'``.
+
+            .. admonition:: Discouraged
+
+                The use of this parameter is discouraged. Please use
+                ``layout='constrained'`` instead.
+
+        layout : {'constrained', 'compressed', 'tight', `.LayoutEngine`, None}
+            The layout mechanism for positioning of plot elements to avoid
+            overlapping Axes decorations (labels, ticks, etc). Note that
+            layout managers can have significant performance penalties.
+            Defaults to *None*.
+
+            - 'constrained': The constrained layout solver adjusts axes sizes
+               to avoid overlapping axes decorations.  Can handle complex plot
+               layouts and colorbars, and is thus recommended.
 
-        self.callbacks = cbook.CallbackRegistry()
+              See :doc:`/tutorials/intermediate/constrainedlayout_guide`
+              for examples.
+
+            - 'compressed': uses the same algorithm as 'constrained', but
+              removes extra space between fixed-aspect-ratio Axes.  Best for
+              simple grids of axes.
+
+            - 'tight': Use the tight layout mechanism. This is a relatively
+              simple algorithm that adjusts the subplot parameters so that
+              decorations do not overlap. See `.Figure.set_tight_layout` for
+              further details.
+
+            - A `.LayoutEngine` instance. Builtin layout classes are
+              `.ConstrainedLayoutEngine` and `.TightLayoutEngine`, more easily
+              accessible by 'constrained' and 'tight'.  Passing an instance
+              allows third parties to provide their own layout engine.
+
+            If not given, fall back to using the parameters *tight_layout* and
+            *constrained_layout*, including their config defaults
+            :rc:`figure.autolayout` and :rc:`figure.constrained_layout.use`.
+
+        Other Parameters
+        ----------------
+        **kwargs : `.Figure` properties, optional
+
+            %(Figure:kwdoc)s
+        """
+        super().__init__(**kwargs)
+        self._layout_engine = None
+
+        if layout is not None:
+            if (tight_layout is not None):
+                _api.warn_external(
+                    "The Figure parameters 'layout' and 'tight_layout' cannot "
+                    "be used together. Please use 'layout' only.")
+            if (constrained_layout is not None):
+                _api.warn_external(
+                    "The Figure parameters 'layout' and 'constrained_layout' "
+                    "cannot be used together. Please use 'layout' only.")
+            self.set_layout_engine(layout=layout)
+        elif tight_layout is not None:
+            if constrained_layout is not None:
+                _api.warn_external(
+                    "The Figure parameters 'tight_layout' and "
+                    "'constrained_layout' cannot be used together. Please use "
+                    "'layout' parameter")
+            self.set_layout_engine(layout='tight')
+            if isinstance(tight_layout, dict):
+                self.get_layout_engine().set(**tight_layout)
+        elif constrained_layout is not None:
+            if isinstance(constrained_layout, dict):
+                self.set_layout_engine(layout='constrained')
+                self.get_layout_engine().set(**constrained_layout)
+            elif constrained_layout:
+                self.set_layout_engine(layout='constrained')
+
+        else:
+            # everything is None, so use default:
+            self.set_layout_engine(layout=layout)
+
+        self._fig_callbacks = cbook.CallbackRegistry(signals=["dpi_changed"])
         # Callbacks traditionally associated with the canvas (and exposed with
         # a proxy property), but that actually need to be on the figure for
         # pickling.
-        self._canvas_callbacks = cbook.CallbackRegistry()
-        self._button_pick_id = self._canvas_callbacks.connect(
-            'button_press_event', lambda event: self.canvas.pick(event))
-        self._scroll_pick_id = self._canvas_callbacks.connect(
-            'scroll_event', lambda event: self.canvas.pick(event))
+        self._canvas_callbacks = cbook.CallbackRegistry(
+            signals=FigureCanvasBase.events)
+        connect = self._canvas_callbacks._connect_picklable
+        self._mouse_key_ids = [
+            connect('key_press_event', backend_bases._key_handler),
+            connect('key_release_event', backend_bases._key_handler),
+            connect('key_release_event', backend_bases._key_handler),
+            connect('button_press_event', backend_bases._mouse_handler),
+            connect('button_release_event', backend_bases._mouse_handler),
+            connect('scroll_event', backend_bases._mouse_handler),
+            connect('motion_notify_event', backend_bases._mouse_handler),
+        ]
+        self._button_pick_id = connect('button_press_event', self.pick)
+        self._scroll_pick_id = connect('scroll_event', self.pick)
 
         if figsize is None:
             figsize = mpl.rcParams['figure.figsize']
@@ -2220,20 +2495,100 @@ def __init__(self,
 
         self.subplotpars = subplotpars
 
-        # constrained_layout:
-        self._layoutgrid = None
-        self._constrained = False
+        self._axstack = _AxesStack()  # track all figure axes and current axes
+        self.clear()
 
-        self.set_tight_layout(tight_layout)
+    def pick(self, mouseevent):
+        if not self.canvas.widgetlock.locked():
+            super().pick(mouseevent)
 
-        self._axstack = _AxesStack()  # track all figure axes and current axes
-        self.clf()
-        self._cachedRenderer = None
+    def _check_layout_engines_compat(self, old, new):
+        """
+        Helper for set_layout engine
+
+        If the figure has used the old engine and added a colorbar then the
+        value of colorbar_gridspec must be the same on the new engine.
+        """
+        if old is None or new is None:
+            return True
+        if old.colorbar_gridspec == new.colorbar_gridspec:
+            return True
+        # colorbar layout different, so check if any colorbars are on the
+        # figure...
+        for ax in self.axes:
+            if hasattr(ax, '_colorbar'):
+                # colorbars list themselves as a colorbar.
+                return False
+        return True
+
+    def set_layout_engine(self, layout=None, **kwargs):
+        """
+        Set the layout engine for this figure.
+
+        Parameters
+        ----------
+        layout: {'constrained', 'compressed', 'tight', 'none'} or \
+`LayoutEngine` or None
+
+            - 'constrained' will use `~.ConstrainedLayoutEngine`
+            - 'compressed' will also use `~.ConstrainedLayoutEngine`, but with
+              a correction that attempts to make a good layout for fixed-aspect
+              ratio Axes.
+            - 'tight' uses `~.TightLayoutEngine`
+            - 'none' removes layout engine.
+
+            If `None`, the behavior is controlled by :rc:`figure.autolayout`
+            (which if `True` behaves as if 'tight' were passed) and
+            :rc:`figure.constrained_layout.use` (which if `True` behaves as if
+            'constrained' were passed).  If both are `True`,
+            :rc:`figure.autolayout` takes priority.
+
+            Users and libraries can define their own layout engines and pass
+            the instance directly as well.
+
+        kwargs: dict
+            The keyword arguments are passed to the layout engine to set things
+            like padding and margin sizes.  Only used if *layout* is a string.
+
+        """
+        if layout is None:
+            if mpl.rcParams['figure.autolayout']:
+                layout = 'tight'
+            elif mpl.rcParams['figure.constrained_layout.use']:
+                layout = 'constrained'
+            else:
+                self._layout_engine = None
+                return
+        if layout == 'tight':
+            new_layout_engine = TightLayoutEngine(**kwargs)
+        elif layout == 'constrained':
+            new_layout_engine = ConstrainedLayoutEngine(**kwargs)
+        elif layout == 'compressed':
+            new_layout_engine = ConstrainedLayoutEngine(compress=True,
+                                                        **kwargs)
+        elif layout == 'none':
+            if self._layout_engine is not None:
+                new_layout_engine = PlaceHolderLayoutEngine(
+                    self._layout_engine.adjust_compatible,
+                    self._layout_engine.colorbar_gridspec
+                )
+            else:
+                new_layout_engine = None
+        elif isinstance(layout, LayoutEngine):
+            new_layout_engine = layout
+        else:
+            raise ValueError(f"Invalid value for 'layout': {layout!r}")
 
-        self.set_constrained_layout(constrained_layout)
+        if self._check_layout_engines_compat(self._layout_engine,
+                                             new_layout_engine):
+            self._layout_engine = new_layout_engine
+        else:
+            raise RuntimeError('Colorbar layout of new layout engine not '
+                               'compatible with old engine, and a colorbar '
+                               'has been created.  Engine not changed.')
 
-        # list of child gridspecs for this figure
-        self._gridspecs = []
+    def get_layout_engine(self):
+        return self._layout_engine
 
     # TODO: I'd like to dynamically add the _repr_html_ method
     # to the figure in the right context, but then IPython doesn't
@@ -2283,25 +2638,27 @@ def show(self, warn=True):
             if warn:
                 _api.warn_external(str(exc))
 
-    def get_axes(self):
+    @property
+    def axes(self):
         """
-        Return a list of Axes in the Figure. You can access and modify the
-        Axes in the Figure through this list.
+        List of Axes in the Figure. You can access and modify the Axes in the
+        Figure through this list.
 
         Do not modify the list itself. Instead, use `~Figure.add_axes`,
         `~.Figure.add_subplot` or `~.Figure.delaxes` to add or remove an Axes.
 
-        Note: This is equivalent to the property `~.Figure.axes`.
+        Note: The `.Figure.axes` property and `~.Figure.get_axes` method are
+        equivalent.
         """
         return self._axstack.as_list()
 
-    axes = property(get_axes, doc="""
-        List of Axes in the Figure.  You can access and modify the Axes in the
-        Figure through this list.
+    get_axes = axes.fget
 
-        Do not modify the list itself. Instead, use "`~Figure.add_axes`,
-        `~.Figure.add_subplot` or `~.Figure.delaxes` to add or remove an Axes.
-        """)
+    def _get_renderer(self):
+        if hasattr(self.canvas, 'get_renderer'):
+            return self.canvas.get_renderer()
+        else:
+            return _get_renderer(self)
 
     def _get_dpi(self):
         return self._dpi
@@ -2322,30 +2679,38 @@ def _set_dpi(self, dpi, forward=True):
         self.dpi_scale_trans.clear().scale(dpi)
         w, h = self.get_size_inches()
         self.set_size_inches(w, h, forward=forward)
-        self.callbacks.process('dpi_changed', self)
+        self._fig_callbacks.process('dpi_changed', self)
 
     dpi = property(_get_dpi, _set_dpi, doc="The resolution in dots per inch.")
 
     def get_tight_layout(self):
         """Return whether `.tight_layout` is called when drawing."""
-        return self._tight
+        return isinstance(self.get_layout_engine(), TightLayoutEngine)
 
+    @_api.deprecated("3.6", alternative="set_layout_engine",
+                     pending=True)
     def set_tight_layout(self, tight):
         """
-        Set whether and how `.tight_layout` is called when drawing.
+        [*Discouraged*] Set whether and how `.tight_layout` is called when
+        drawing.
+
+        .. admonition:: Discouraged
+
+            This method is discouraged in favor of `~.set_layout_engine`.
 
         Parameters
         ----------
         tight : bool or dict with keys "pad", "w_pad", "h_pad", "rect" or None
             If a bool, sets whether to call `.tight_layout` upon drawing.
-            If ``None``, use the ``figure.autolayout`` rcparam instead.
+            If ``None``, use :rc:`figure.autolayout` instead.
             If a dict, pass it as kwargs to `.tight_layout`, overriding the
             default paddings.
         """
         if tight is None:
             tight = mpl.rcParams['figure.autolayout']
-        self._tight = bool(tight)
-        self._tight_parameters = tight if isinstance(tight, dict) else {}
+        _tight_parameters = tight if isinstance(tight, dict) else {}
+        if bool(tight):
+            self.set_layout_engine(TightLayoutEngine(**_tight_parameters))
         self.stale = True
 
     def get_constrained_layout(self):
@@ -2354,82 +2719,81 @@ def get_constrained_layout(self):
 
         See :doc:`/tutorials/intermediate/constrainedlayout_guide`.
         """
-        return self._constrained
+        return isinstance(self.get_layout_engine(), ConstrainedLayoutEngine)
 
+    @_api.deprecated("3.6", alternative="set_layout_engine('constrained')",
+                     pending=True)
     def set_constrained_layout(self, constrained):
         """
-        Set whether ``constrained_layout`` is used upon drawing. If None,
-        :rc:`figure.constrained_layout.use` value will be used.
+        [*Discouraged*] Set whether ``constrained_layout`` is used upon
+        drawing.
 
-        When providing a dict containing the keys `w_pad`, `h_pad`
+        If None, :rc:`figure.constrained_layout.use` value will be used.
+
+        When providing a dict containing the keys ``w_pad``, ``h_pad``
         the default ``constrained_layout`` paddings will be
         overridden.  These pads are in inches and default to 3.0/72.0.
         ``w_pad`` is the width padding and ``h_pad`` is the height padding.
 
-        See :doc:`/tutorials/intermediate/constrainedlayout_guide`.
+        .. admonition:: Discouraged
+
+            This method is discouraged in favor of `~.set_layout_engine`.
 
         Parameters
         ----------
         constrained : bool or dict or None
         """
-        self._constrained_layout_pads = dict()
-        self._constrained_layout_pads['w_pad'] = None
-        self._constrained_layout_pads['h_pad'] = None
-        self._constrained_layout_pads['wspace'] = None
-        self._constrained_layout_pads['hspace'] = None
         if constrained is None:
             constrained = mpl.rcParams['figure.constrained_layout.use']
-        self._constrained = bool(constrained)
-        if isinstance(constrained, dict):
-            self.set_constrained_layout_pads(**constrained)
-        else:
-            self.set_constrained_layout_pads()
-
-        self.init_layoutgrid()
-
+        _constrained = bool(constrained)
+        _parameters = constrained if isinstance(constrained, dict) else {}
+        if _constrained:
+            self.set_layout_engine(ConstrainedLayoutEngine(**_parameters))
         self.stale = True
 
+    @_api.deprecated(
+         "3.6", alternative="figure.get_layout_engine().set()",
+         pending=True)
     def set_constrained_layout_pads(self, **kwargs):
         """
-        Set padding for ``constrained_layout``.  Note the kwargs can be passed
-        as a dictionary ``fig.set_constrained_layout(**paddict)``.
+        Set padding for ``constrained_layout``.
+
+        Tip: The parameters can be passed from a dictionary by using
+        ``fig.set_constrained_layout(**pad_dict)``.
 
         See :doc:`/tutorials/intermediate/constrainedlayout_guide`.
 
         Parameters
         ----------
-        w_pad : float
+        w_pad : float, default: :rc:`figure.constrained_layout.w_pad`
             Width padding in inches.  This is the pad around Axes
             and is meant to make sure there is enough room for fonts to
             look good.  Defaults to 3 pts = 0.04167 inches
 
-        h_pad : float
+        h_pad : float, default: :rc:`figure.constrained_layout.h_pad`
             Height padding in inches. Defaults to 3 pts.
 
-        wspace : float
+        wspace : float, default: :rc:`figure.constrained_layout.wspace`
             Width padding between subplots, expressed as a fraction of the
             subplot width.  The total padding ends up being w_pad + wspace.
 
-        hspace : float
+        hspace : float, default: :rc:`figure.constrained_layout.hspace`
             Height padding between subplots, expressed as a fraction of the
             subplot width. The total padding ends up being h_pad + hspace.
 
         """
+        if isinstance(self.get_layout_engine(), ConstrainedLayoutEngine):
+            self.get_layout_engine().set(**kwargs)
 
-        todo = ['w_pad', 'h_pad', 'wspace', 'hspace']
-        for td in todo:
-            if td in kwargs and kwargs[td] is not None:
-                self._constrained_layout_pads[td] = kwargs[td]
-            else:
-                self._constrained_layout_pads[td] = (
-                    mpl.rcParams['figure.constrained_layout.' + td])
-
+    @_api.deprecated("3.6", alternative="fig.get_layout_engine().get()",
+                     pending=True)
     def get_constrained_layout_pads(self, relative=False):
         """
         Get padding for ``constrained_layout``.
 
         Returns a list of ``w_pad, h_pad`` in inches and
         ``wspace`` and ``hspace`` as fractions of the subplot.
+        All values are None if ``constrained_layout`` is not used.
 
         See :doc:`/tutorials/intermediate/constrainedlayout_guide`.
 
@@ -2438,16 +2802,19 @@ def get_constrained_layout_pads(self, relative=False):
         relative : bool
             If `True`, then convert from inches to figure relative.
         """
-        w_pad = self._constrained_layout_pads['w_pad']
-        h_pad = self._constrained_layout_pads['h_pad']
-        wspace = self._constrained_layout_pads['wspace']
-        hspace = self._constrained_layout_pads['hspace']
+        if not isinstance(self.get_layout_engine(), ConstrainedLayoutEngine):
+            return None, None, None, None
+        info = self.get_layout_engine().get_info()
+        w_pad = info['w_pad']
+        h_pad = info['h_pad']
+        wspace = info['wspace']
+        hspace = info['hspace']
 
         if relative and (w_pad is not None or h_pad is not None):
-            renderer0 = layoutgrid.get_renderer(self)
-            dpi = renderer0.dpi
-            w_pad = w_pad * dpi / renderer0.width
-            h_pad = h_pad * dpi / renderer0.height
+            renderer = self._get_renderer()
+            dpi = renderer.dpi
+            w_pad = w_pad * dpi / renderer.width
+            h_pad = h_pad * dpi / renderer.height
 
         return w_pad, h_pad, wspace, hspace
 
@@ -2461,6 +2828,7 @@ def set_canvas(self, canvas):
         """
         self.canvas = canvas
 
+    @_docstring.interpd
     def figimage(self, X, xo=0, yo=0, alpha=None, norm=None, cmap=None,
                  vmin=None, vmax=None, origin=None, resize=False, **kwargs):
         """
@@ -2474,9 +2842,11 @@ def figimage(self, X, xo=0, yo=0, alpha=None, norm=None, cmap=None,
         X
             The image data. This is an array of one of the following shapes:
 
-            - MxN: luminance (grayscale) values
-            - MxNx3: RGB values
-            - MxNx4: RGBA values
+            - (M, N): an image with scalar data.  Color-mapping is controlled
+              by *cmap*, *norm*, *vmin*, and *vmax*.
+            - (M, N, 3): an image with RGB values (0-1 float or 0-255 int).
+            - (M, N, 4): an image with RGBA values (0-1 float or 0-255 int),
+              i.e. including transparency.
 
         xo, yo : int
             The *x*/*y* image offset in pixels.
@@ -2484,16 +2854,17 @@ def figimage(self, X, xo=0, yo=0, alpha=None, norm=None, cmap=None,
         alpha : None or float
             The alpha blending value.
 
-        norm : `matplotlib.colors.Normalize`
-            A `.Normalize` instance to map the luminance to the
-            interval [0, 1].
+        %(cmap_doc)s
+
+            This parameter is ignored if *X* is RGB(A).
+
+        %(norm_doc)s
+
+            This parameter is ignored if *X* is RGB(A).
 
-        cmap : str or `matplotlib.colors.Colormap`, default: :rc:`image.cmap`
-            The colormap to use.
+        %(vmin_vmax_doc)s
 
-        vmin, vmax : float
-            If *norm* is not given, these values set the data limits for the
-            colormap.
+            This parameter is ignored if *X* is RGB(A).
 
         origin : {'upper', 'lower'}, default: :rc:`image.origin`
             Indicates where the [0, 0] index of the array is in the upper left
@@ -2534,7 +2905,9 @@ def figimage(self, X, xo=0, yo=0, alpha=None, norm=None, cmap=None,
             figsize = [x / dpi for x in (X.shape[1], X.shape[0])]
             self.set_size_inches(figsize, forward=True)
 
-        im = mimage.FigureImage(self, cmap, norm, xo, yo, origin, **kwargs)
+        im = mimage.FigureImage(self, cmap=cmap, norm=norm,
+                                offsetx=xo, offsety=yo,
+                                origin=origin, **kwargs)
         im.stale_callback = _stale_figure_callback
 
         im.set_array(X)
@@ -2583,12 +2956,9 @@ def set_size_inches(self, w, h=None, forward=True):
             raise ValueError(f'figure size must be positive finite not {size}')
         self.bbox_inches.p1 = size
         if forward:
-            canvas = getattr(self, 'canvas')
-            if canvas is not None:
-                dpi_ratio = getattr(canvas, '_dpi_ratio', 1)
-                manager = getattr(canvas, 'manager', None)
-                if manager is not None:
-                    manager.resize(*(size * self.dpi / dpi_ratio).astype(int))
+            manager = self.canvas.manager
+            if manager is not None:
+                manager.resize(*(size * self.dpi).astype(int))
         self.stale = True
 
     def get_size_inches(self):
@@ -2669,63 +3039,30 @@ def set_figheight(self, val, forward=True):
         """
         self.set_size_inches(self.get_figwidth(), val, forward=forward)
 
-    def clf(self, keep_observers=False):
-        """
-        Clear the figure.
-
-        Set *keep_observers* to True if, for example,
-        a gui widget is tracking the Axes in the figure.
-        """
-        self.suppressComposite = None
-        self.callbacks = cbook.CallbackRegistry()
-
-        for ax in tuple(self.axes):  # Iterate over the copy.
-            ax.cla()
-            self.delaxes(ax)         # removes ax from self._axstack
-
-        toolbar = getattr(self.canvas, 'toolbar', None)
+    def clear(self, keep_observers=False):
+        # docstring inherited
+        super().clear(keep_observers=keep_observers)
+        # FigureBase.clear does not clear toolbars, as
+        # only Figure can have toolbars
+        toolbar = self.canvas.toolbar
         if toolbar is not None:
             toolbar.update()
-        self._axstack.clear()
-        self.artists = []
-        self.lines = []
-        self.patches = []
-        self.texts = []
-        self.images = []
-        self.legends = []
-        if not keep_observers:
-            self._axobservers = cbook.CallbackRegistry()
-        self._suptitle = None
-        self._supxlabel = None
-        self._supylabel = None
-
-        if self.get_constrained_layout():
-            self.init_layoutgrid()
-        self.stale = True
-
-    def clear(self, keep_observers=False):
-        """Clear the figure -- synonym for `clf`."""
-        self.clf(keep_observers=keep_observers)
 
     @_finalize_rasterization
     @allow_rasterization
     def draw(self, renderer):
         # docstring inherited
-        self._cachedRenderer = renderer
 
         # draw the figure bounding box, perhaps none for white figure
         if not self.get_visible():
             return
 
         artists = self._get_draw_artists(renderer)
-
         try:
             renderer.open_group('figure', gid=self.get_gid())
-            if self.get_constrained_layout() and self.axes:
-                self.execute_constrained_layout(renderer)
-            if self.get_tight_layout() and self.axes:
+            if self.axes and self.get_layout_engine() is not None:
                 try:
-                    self.tight_layout(**self._tight_parameters)
+                    self.get_layout_engine().execute(self)
                 except ValueError:
                     pass
                     # ValueError can occur when resizing a window.
@@ -2741,19 +3078,22 @@ def draw(self, renderer):
         finally:
             self.stale = False
 
-        self.canvas.draw_event(renderer)
+        DrawEvent("draw_event", self.canvas, renderer)._process()
+
+    def draw_without_rendering(self):
+        """
+        Draw the figure with no output.  Useful to get the final size of
+        artists that require a draw before their size is known (e.g. text).
+        """
+        renderer = _get_renderer(self)
+        with renderer._draw_disabled():
+            self.draw(renderer)
 
     def draw_artist(self, a):
         """
         Draw `.Artist` *a* only.
-
-        This method can only be used after an initial draw of the figure,
-        because that creates and caches the renderer needed here.
         """
-        if self._cachedRenderer is None:
-            raise AttributeError("draw_artist can only be used after an "
-                                 "initial draw which caches the renderer")
-        a.draw(self._cachedRenderer)
+        a.draw(self.canvas.get_renderer())
 
     def __getstate__(self):
         state = super().__getstate__()
@@ -2763,29 +3103,23 @@ def __getstate__(self):
         # re-attached to another.
         state.pop("canvas")
 
-        # Set cached renderer to None -- it can't be pickled.
-        state["_cachedRenderer"] = None
+        # discard any changes to the dpi due to pixel ratio changes
+        state["_dpi"] = state.get('_original_dpi', state['_dpi'])
 
         # add version information to the state
-        state['__mpl_version__'] = _mpl_version
+        state['__mpl_version__'] = mpl.__version__
 
         # check whether the figure manager (if any) is registered with pyplot
         from matplotlib import _pylab_helpers
-        if getattr(self.canvas, 'manager', None) \
-                in _pylab_helpers.Gcf.figs.values():
+        if self.canvas.manager in _pylab_helpers.Gcf.figs.values():
             state['_restore_to_pylab'] = True
-
-        # set all the layoutgrid information to None.  kiwisolver objects can't
-        # be pickled, so we lose the layout options at this point.
-        state.pop('_layoutgrid', None)
-
         return state
 
     def __setstate__(self, state):
         version = state.pop('__mpl_version__')
         restore_to_pylab = state.pop('_restore_to_pylab', False)
 
-        if version != _mpl_version:
+        if version != mpl.__version__:
             _api.warn_external(
                 f"This figure was saved with matplotlib version {version} and "
                 f"is unlikely to function correctly.")
@@ -2794,7 +3128,6 @@ def __setstate__(self, state):
 
         # re-initialise some of the unstored state information
         FigureCanvasBase(self)  # Set self.canvas.
-        self._layoutgrid = None
 
         if restore_to_pylab:
             # lazy import to avoid circularity
@@ -2802,7 +3135,8 @@ def __setstate__(self, state):
             import matplotlib._pylab_helpers as pylab_helpers
             allnums = plt.get_fignums()
             num = max(allnums) + 1 if allnums else 1
-            mgr = plt._backend_mod.new_figure_manager_given_figure(num, self)
+            backend = plt._get_backend_mod()
+            mgr = backend.new_figure_manager_given_figure(num, self)
             pylab_helpers.Gcf._set_new_active_manager(mgr)
             plt.draw_if_interactive()
 
@@ -2820,10 +3154,11 @@ def savefig(self, fname, *, transparent=None, **kwargs):
 
         Call signature::
 
-          savefig(fname, dpi=None, facecolor='w', edgecolor='w',
-                  orientation='portrait', papertype=None, format=None,
-                  transparent=False, bbox_inches=None, pad_inches=0.1,
-                  frameon=None, metadata=None)
+          savefig(fname, *, dpi='figure', format=None, metadata=None,
+                  bbox_inches=None, pad_inches=0.1,
+                  facecolor='auto', edgecolor='auto',
+                  backend=None, **kwargs
+                 )
 
         The available output formats depend on the backend being used.
 
@@ -2851,30 +3186,28 @@ def savefig(self, fname, *, transparent=None, **kwargs):
             The resolution in dots per inch.  If 'figure', use the figure's
             dpi value.
 
-        quality : int, default: :rc:`savefig.jpeg_quality`
-            Applicable only if *format* is 'jpg' or 'jpeg', ignored otherwise.
-
-            The image quality, on a scale from 1 (worst) to 95 (best).
-            Values above 95 should be avoided; 100 disables portions of
-            the JPEG compression algorithm, and results in large files
-            with hardly any gain in image quality.
-
-            This parameter is deprecated.
-
-        optimize : bool, default: False
-            Applicable only if *format* is 'jpg' or 'jpeg', ignored otherwise.
-
-            Whether the encoder should make an extra pass over the image
-            in order to select optimal encoder settings.
+        format : str
+            The file format, e.g. 'png', 'pdf', 'svg', ... The behavior when
+            this is unset is documented under *fname*.
 
-            This parameter is deprecated.
+        metadata : dict, optional
+            Key/value pairs to store in the image metadata. The supported keys
+            and defaults depend on the image format and backend:
 
-        progressive : bool, default: False
-            Applicable only if *format* is 'jpg' or 'jpeg', ignored otherwise.
+            - 'png' with Agg backend: See the parameter ``metadata`` of
+              `~.FigureCanvasAgg.print_png`.
+            - 'pdf' with pdf backend: See the parameter ``metadata`` of
+              `~.backend_pdf.PdfPages`.
+            - 'svg' with svg backend: See the parameter ``metadata`` of
+              `~.FigureCanvasSVG.print_svg`.
+            - 'eps' and 'ps' with PS backend: Only 'Creator' is supported.
 
-            Whether the image should be stored as a progressive JPEG file.
+        bbox_inches : str or `.Bbox`, default: :rc:`savefig.bbox`
+            Bounding box in inches: only the given portion of the figure is
+            saved.  If 'tight', try to figure out the tight bbox of the figure.
 
-            This parameter is deprecated.
+        pad_inches : float, default: :rc:`savefig.pad_inches`
+            Amount of padding around the figure when bbox_inches is 'tight'.
 
         facecolor : color or 'auto', default: :rc:`savefig.facecolor`
             The facecolor of the figure.  If 'auto', use the current figure
@@ -2884,6 +3217,14 @@ def savefig(self, fname, *, transparent=None, **kwargs):
             The edgecolor of the figure.  If 'auto', use the current figure
             edgecolor.
 
+        backend : str, optional
+            Use a non-default backend to render the file, e.g. to render a
+            png file with the "cairo" backend rather than the default "agg",
+            or a pdf file with the "pgf" backend rather than the default
+            "pdf".  Note that the default backend is normally sufficient.  See
+            :ref:`the-builtin-backends` for a list of valid backends for each
+            file format.  Custom backends can be referenced as "module://...".
+
         orientation : {'landscape', 'portrait'}
             Currently only supported by the postscript backend.
 
@@ -2892,76 +3233,45 @@ def savefig(self, fname, *, transparent=None, **kwargs):
             'a10', 'b0' through 'b10'. Only supported for postscript
             output.
 
-        format : str
-            The file format, e.g. 'png', 'pdf', 'svg', ... The behavior when
-            this is unset is documented under *fname*.
-
         transparent : bool
             If *True*, the Axes patches will all be transparent; the
-            figure patch will also be transparent unless facecolor
-            and/or edgecolor are specified via kwargs.
-            This is useful, for example, for displaying
-            a plot on top of a colored background on a web page.  The
-            transparency of these patches will be restored to their
-            original values upon exit of this function.
+            Figure patch will also be transparent unless *facecolor*
+            and/or *edgecolor* are specified via kwargs.
 
-        bbox_inches : str or `.Bbox`, default: :rc:`savefig.bbox`
-            Bounding box in inches: only the given portion of the figure is
-            saved.  If 'tight', try to figure out the tight bbox of the figure.
+            If *False* has no effect and the color of the Axes and
+            Figure patches are unchanged (unless the Figure patch
+            is specified via the *facecolor* and/or *edgecolor* keyword
+            arguments in which case those colors are used).
 
-        pad_inches : float, default: :rc:`savefig.pad_inches`
-            Amount of padding around the figure when bbox_inches is 'tight'.
+            The transparency of these patches will be restored to their
+            original values upon exit of this function.
+
+            This is useful, for example, for displaying
+            a plot on top of a colored background on a web page.
 
         bbox_extra_artists : list of `~matplotlib.artist.Artist`, optional
             A list of extra artists that will be considered when the
             tight bbox is calculated.
 
-        backend : str, optional
-            Use a non-default backend to render the file, e.g. to render a
-            png file with the "cairo" backend rather than the default "agg",
-            or a pdf file with the "pgf" backend rather than the default
-            "pdf".  Note that the default backend is normally sufficient.  See
-            :ref:`the-builtin-backends` for a list of valid backends for each
-            file format.  Custom backends can be referenced as "module://...".
-
-        metadata : dict, optional
-            Key/value pairs to store in the image metadata. The supported keys
-            and defaults depend on the image format and backend:
-
-            - 'png' with Agg backend: See the parameter ``metadata`` of
-              `~.FigureCanvasAgg.print_png`.
-            - 'pdf' with pdf backend: See the parameter ``metadata`` of
-              `~.backend_pdf.PdfPages`.
-            - 'svg' with svg backend: See the parameter ``metadata`` of
-              `~.FigureCanvasSVG.print_svg`.
-            - 'eps' and 'ps' with PS backend: Only 'Creator' is supported.
-
         pil_kwargs : dict, optional
             Additional keyword arguments that are passed to
             `PIL.Image.Image.save` when saving the figure.
+
         """
 
         kwargs.setdefault('dpi', mpl.rcParams['savefig.dpi'])
         if transparent is None:
             transparent = mpl.rcParams['savefig.transparent']
 
-        if transparent:
-            kwargs.setdefault('facecolor', 'none')
-            kwargs.setdefault('edgecolor', 'none')
-            original_axes_colors = []
-            for ax in self.axes:
-                patch = ax.patch
-                original_axes_colors.append((patch.get_facecolor(),
-                                             patch.get_edgecolor()))
-                patch.set_facecolor('none')
-                patch.set_edgecolor('none')
+        with ExitStack() as stack:
+            if transparent:
+                kwargs.setdefault('facecolor', 'none')
+                kwargs.setdefault('edgecolor', 'none')
+                for ax in self.axes:
+                    stack.enter_context(
+                        ax.patch._cm_set(facecolor='none', edgecolor='none'))
 
-        self.canvas.print_figure(fname, **kwargs)
-
-        if transparent:
-            for ax, cc in zip(self.axes, original_axes_colors):
-                ax.patch.set_facecolor(cc[0])
-                ax.patch.set_edgecolor(cc[1])
+            self.canvas.print_figure(fname, **kwargs)
 
     def ginput(self, n=1, timeout=30, show_clicks=True,
                mouse_add=MouseButton.LEFT,
@@ -3012,12 +3322,52 @@ def ginput(self, n=1, timeout=30, show_clicks=True,
         terminates input and any other key (not already used by the window
         manager) selects a point.
         """
-        blocking_mouse_input = BlockingMouseInput(self,
-                                                  mouse_add=mouse_add,
-                                                  mouse_pop=mouse_pop,
-                                                  mouse_stop=mouse_stop)
-        return blocking_mouse_input(n=n, timeout=timeout,
-                                    show_clicks=show_clicks)
+        clicks = []
+        marks = []
+
+        def handler(event):
+            is_button = event.name == "button_press_event"
+            is_key = event.name == "key_press_event"
+            # Quit (even if not in infinite mode; this is consistent with
+            # MATLAB and sometimes quite useful, but will require the user to
+            # test how many points were actually returned before using data).
+            if (is_button and event.button == mouse_stop
+                    or is_key and event.key in ["escape", "enter"]):
+                self.canvas.stop_event_loop()
+            # Pop last click.
+            elif (is_button and event.button == mouse_pop
+                  or is_key and event.key in ["backspace", "delete"]):
+                if clicks:
+                    clicks.pop()
+                    if show_clicks:
+                        marks.pop().remove()
+                        self.canvas.draw()
+            # Add new click.
+            elif (is_button and event.button == mouse_add
+                  # On macOS/gtk, some keys return None.
+                  or is_key and event.key is not None):
+                if event.inaxes:
+                    clicks.append((event.xdata, event.ydata))
+                    _log.info("input %i: %f, %f",
+                              len(clicks), event.xdata, event.ydata)
+                    if show_clicks:
+                        line = mpl.lines.Line2D([event.xdata], [event.ydata],
+                                                marker="+", color="r")
+                        event.inaxes.add_line(line)
+                        marks.append(line)
+                        self.canvas.draw()
+            if len(clicks) == n and n > 0:
+                self.canvas.stop_event_loop()
+
+        _blocking_input.blocking_input_loop(
+            self, ["button_press_event", "key_press_event"], timeout, handler)
+
+        # Cleanup.
+        for mark in marks:
+            mark.remove()
+        self.canvas.draw()
+
+        return clicks
 
     def waitforbuttonpress(self, timeout=-1):
         """
@@ -3027,43 +3377,32 @@ def waitforbuttonpress(self, timeout=-1):
         mouse button was pressed and None if no input was given within
         *timeout* seconds.  Negative values deactivate *timeout*.
         """
-        blocking_input = BlockingKeyMouseInput(self)
-        return blocking_input(timeout=timeout)
+        event = None
+
+        def handler(ev):
+            nonlocal event
+            event = ev
+            self.canvas.stop_event_loop()
+
+        _blocking_input.blocking_input_loop(
+            self, ["button_press_event", "key_press_event"], timeout, handler)
 
-    def init_layoutgrid(self):
-        """Initialize the layoutgrid for use in constrained_layout."""
-        del(self._layoutgrid)
-        self._layoutgrid = layoutgrid.LayoutGrid(
-            parent=None, name='figlb')
+        return None if event is None else event.name == "key_press_event"
 
+    @_api.deprecated("3.6", alternative="figure.get_layout_engine().execute()")
     def execute_constrained_layout(self, renderer=None):
         """
         Use ``layoutgrid`` to determine pos positions within Axes.
 
         See also `.set_constrained_layout_pads`.
-        """
-
-        from matplotlib._constrained_layout import do_constrained_layout
-        from matplotlib.tight_layout import get_renderer
 
-        _log.debug('Executing constrainedlayout')
-        if self._layoutgrid is None:
-            _api.warn_external("Calling figure.constrained_layout, but "
-                               "figure not setup to do constrained layout. "
-                               "You either called GridSpec without the "
-                               "figure keyword, you are using plt.subplot, "
-                               "or you need to call figure or subplots "
-                               "with the constrained_layout=True kwarg.")
-            return
-        w_pad, h_pad, wspace, hspace = self.get_constrained_layout_pads()
-        # convert to unit-relative lengths
-        fig = self
-        width, height = fig.get_size_inches()
-        w_pad = w_pad / width
-        h_pad = h_pad / height
-        if renderer is None:
-            renderer = get_renderer(fig)
-        do_constrained_layout(fig, renderer, h_pad, w_pad, hspace, wspace)
+        Returns
+        -------
+        layoutgrid : private debugging object
+        """
+        if not isinstance(self.get_layout_engine(), ConstrainedLayoutEngine):
+            return None
+        return self.get_layout_engine().execute(self)
 
     def tight_layout(self, *, pad=1.08, h_pad=None, w_pad=None, rect=None):
         """
@@ -3087,29 +3426,25 @@ def tight_layout(self, *, pad=1.08, h_pad=None, w_pad=None, rect=None):
 
         See Also
         --------
-        .Figure.set_tight_layout
+        .Figure.set_layout_engine
         .pyplot.tight_layout
         """
-
-        from .tight_layout import (
-            get_renderer, get_subplotspec_list, get_tight_layout_figure)
-        from contextlib import suppress
+        from ._tight_layout import get_subplotspec_list
         subplotspec_list = get_subplotspec_list(self.axes)
         if None in subplotspec_list:
             _api.warn_external("This figure includes Axes that are not "
                                "compatible with tight_layout, so results "
                                "might be incorrect.")
-
-        renderer = get_renderer(self)
-        ctx = (renderer._draw_disabled()
-               if hasattr(renderer, '_draw_disabled')
-               else suppress())
-        with ctx:
-            kwargs = get_tight_layout_figure(
-                self, self.axes, subplotspec_list, renderer,
-                pad=pad, h_pad=h_pad, w_pad=w_pad, rect=rect)
-        if kwargs:
-            self.subplots_adjust(**kwargs)
+        # note that here we do not permanently set the figures engine to
+        # tight_layout but rather just perform the layout in place and remove
+        # any previous engines.
+        engine = TightLayoutEngine(pad=pad, h_pad=h_pad, w_pad=w_pad,
+                                   rect=rect)
+        try:
+            self.set_layout_engine(engine)
+            engine.execute(self)
+        finally:
+            self.set_layout_engine(None)
 
 
 def figaspect(arg):
@@ -3190,6 +3525,3 @@ def figaspect(arg):
     # the min/max dimensions (we don't want figures 10 feet tall!)
     newsize = np.clip(newsize, figsize_min, figsize_max)
     return newsize
-
-
-docstring.interpd.update(Figure_kwdoc=martist.kwdoc(Figure))
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
index f7a8bdb87225..a5742ef88f61 100644
--- a/lib/matplotlib/font_manager.py
+++ b/lib/matplotlib/font_manager.py
@@ -1,7 +1,7 @@
 """
 A module for finding, managing, and using fonts across platforms.
 
-This module provides a single `FontManager` instance that can
+This module provides a single `FontManager` instance, ``fontManager``, that can
 be shared across backends and platforms.  The `findfont`
 function returns the best TrueType (TTF) font file in the local or
 system font path that matches the specified `FontProperties`
@@ -23,7 +23,11 @@
 #   - setWeights function needs improvement
 #   - 'light' is an invalid weight value, remove it.
 
+from base64 import b64encode
+import copy
+import dataclasses
 from functools import lru_cache
+from io import BytesIO
 import json
 import logging
 from numbers import Number
@@ -32,16 +36,11 @@
 import re
 import subprocess
 import sys
-try:
-    import threading
-    from threading import Timer
-except ImportError:
-    import dummy_threading as threading
-    from dummy_threading import Timer
+import threading
 
 import matplotlib as mpl
-from matplotlib import _api, afm, cbook, ft2font, rcParams
-from matplotlib.fontconfig_pattern import (
+from matplotlib import _api, _afm, cbook, ft2font
+from matplotlib._fontconfig_pattern import (
     parse_fontconfig_pattern, generate_fontconfig_pattern)
 from matplotlib.rcsetup import _validators
 
@@ -129,14 +128,18 @@
 
 
 # OS Font paths
+try:
+    _HOME = Path.home()
+except Exception:  # Exceptions thrown by home() are not specified...
+    _HOME = Path(os.devnull)  # Just an arbitrary path with no children.
 MSFolders = \
     r'Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders'
 MSFontDirectories = [
     r'SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts',
     r'SOFTWARE\Microsoft\Windows\CurrentVersion\Fonts']
 MSUserFontDirectories = [
-    str(Path.home() / 'AppData/Local/Microsoft/Windows/Fonts'),
-    str(Path.home() / 'AppData/Roaming/Microsoft/Windows/Fonts'),
+    str(_HOME / 'AppData/Local/Microsoft/Windows/Fonts'),
+    str(_HOME / 'AppData/Roaming/Microsoft/Windows/Fonts'),
 ]
 X11FontDirectories = [
     # an old standard installation point
@@ -149,9 +152,9 @@
     # common application, not really useful
     "/usr/lib/openoffice/share/fonts/truetype/",
     # user fonts
-    str((Path(os.environ.get('XDG_DATA_HOME') or Path.home() / ".local/share"))
+    str((Path(os.environ.get('XDG_DATA_HOME') or _HOME / ".local/share"))
         / "fonts"),
-    str(Path.home() / ".fonts"),
+    str(_HOME / ".fonts"),
 ]
 OSXFontDirectories = [
     "/Library/Fonts/",
@@ -160,18 +163,13 @@
     # fonts installed via MacPorts
     "/opt/local/share/fonts",
     # user fonts
-    str(Path.home() / "Library/Fonts"),
+    str(_HOME / "Library/Fonts"),
 ]
 
 
-@lru_cache(64)
-def _cached_realpath(path):
-    return os.path.realpath(path)
-
-
 def get_fontext_synonyms(fontext):
     """
-    Return a list of file extensions extensions that are synonyms for
+    Return a list of file extensions that are synonyms for
     the given file extension *fileext*.
     """
     return {
@@ -188,11 +186,16 @@ def list_fonts(directory, extensions):
     recursively under the directory.
     """
     extensions = ["." + ext for ext in extensions]
-    return [os.path.join(dirpath, filename)
-            # os.walk ignores access errors, unlike Path.glob.
-            for dirpath, _, filenames in os.walk(directory)
-            for filename in filenames
-            if Path(filename).suffix.lower() in extensions]
+    if sys.platform == 'win32' and directory == win32FontDirectory():
+        return [os.path.join(directory, filename)
+                for filename in os.listdir(directory)
+                if os.path.isfile(filename)]
+    else:
+        return [os.path.join(dirpath, filename)
+                # os.walk ignores access errors, unlike Path.glob.
+                for dirpath, _, filenames in os.walk(directory)
+                for filename in filenames
+                if Path(filename).suffix.lower() in extensions]
 
 
 def win32FontDirectory():
@@ -244,11 +247,6 @@ def _win32RegistryFonts(reg_domain, base_dir):
                     key, value, tp = winreg.EnumValue(local, j)
                     if not isinstance(value, str):
                         continue
-
-                    # Work around for https://bugs.python.org/issue25778, which
-                    # is fixed in Py>=3.6.1.
-                    value = value.split("\0", 1)[0]
-
                     try:
                         # If value contains already an absolute path, then it
                         # is not changed further.
@@ -264,6 +262,8 @@ def _win32RegistryFonts(reg_domain, base_dir):
     return items
 
 
+# Also remove _win32RegistryFonts when this is removed.
+@_api.deprecated("3.5")
 def win32InstalledFonts(directory=None, fontext='ttf'):
     """
     Search for fonts in the specified font directory, or use the
@@ -291,9 +291,41 @@ def win32InstalledFonts(directory=None, fontext='ttf'):
     return [str(path) for path in items if path.suffix.lower() in fontext]
 
 
+def _get_win32_installed_fonts():
+    """List the font paths known to the Windows registry."""
+    import winreg
+    items = set()
+    # Search and resolve fonts listed in the registry.
+    for domain, base_dirs in [
+            (winreg.HKEY_LOCAL_MACHINE, [win32FontDirectory()]),  # System.
+            (winreg.HKEY_CURRENT_USER, MSUserFontDirectories),  # User.
+    ]:
+        for base_dir in base_dirs:
+            for reg_path in MSFontDirectories:
+                try:
+                    with winreg.OpenKey(domain, reg_path) as local:
+                        for j in range(winreg.QueryInfoKey(local)[1]):
+                            # value may contain the filename of the font or its
+                            # absolute path.
+                            key, value, tp = winreg.EnumValue(local, j)
+                            if not isinstance(value, str):
+                                continue
+                            try:
+                                # If value contains already an absolute path,
+                                # then it is not changed further.
+                                path = Path(base_dir, value).resolve()
+                            except RuntimeError:
+                                # Don't fail with invalid entries.
+                                continue
+                            items.add(path)
+                except (OSError, MemoryError):
+                    continue
+    return items
+
+
 @lru_cache()
-def _call_fc_list():
-    """Cache and list the font filenames known to `fc-list`."""
+def _get_fontconfig_fonts():
+    """Cache and list the font paths known to ``fc-list``."""
     try:
         if b'--format' not in subprocess.check_output(['fc-list', '--help']):
             _log.warning(  # fontconfig 2.7 implemented --format.
@@ -302,14 +334,15 @@ def _call_fc_list():
         out = subprocess.check_output(['fc-list', '--format=%{file}\\n'])
     except (OSError, subprocess.CalledProcessError):
         return []
-    return [os.fsdecode(fname) for fname in out.split(b'\n')]
+    return [Path(os.fsdecode(fname)) for fname in out.split(b'\n')]
 
 
+@_api.deprecated("3.5")
 def get_fontconfig_fonts(fontext='ttf'):
-    """List font filenames known to `fc-list` having the given extension."""
+    """List font filenames known to ``fc-list`` having the given extension."""
     fontext = ['.' + ext for ext in get_fontext_synonyms(fontext)]
-    return [fname for fname in _call_fc_list()
-            if Path(fname).suffix.lower() in fontext]
+    return [str(path) for path in _get_fontconfig_fonts()
+            if path.suffix.lower() in fontext]
 
 
 def findSystemFonts(fontpaths=None, fontext='ttf'):
@@ -325,14 +358,16 @@ def findSystemFonts(fontpaths=None, fontext='ttf'):
 
     if fontpaths is None:
         if sys.platform == 'win32':
+            installed_fonts = _get_win32_installed_fonts()
             fontpaths = MSUserFontDirectories + [win32FontDirectory()]
-            # now get all installed fonts directly...
-            fontfiles.update(win32InstalledFonts(fontext=fontext))
         else:
-            fontpaths = X11FontDirectories
+            installed_fonts = _get_fontconfig_fonts()
             if sys.platform == 'darwin':
                 fontpaths = [*X11FontDirectories, *OSXFontDirectories]
-            fontfiles.update(get_fontconfig_fonts(fontext))
+            else:
+                fontpaths = X11FontDirectories
+        fontfiles.update(str(path) for path in installed_fonts
+                         if path.suffix.lower()[1:] in fontexts)
 
     elif isinstance(fontpaths, str):
         fontpaths = [fontpaths]
@@ -343,35 +378,42 @@ def findSystemFonts(fontpaths=None, fontext='ttf'):
     return [fname for fname in fontfiles if os.path.exists(fname)]
 
 
-class FontEntry:
-    """
-    A class for storing Font properties.  It is used when populating
-    the font lookup dictionary.
-    """
-    def __init__(self,
-                 fname  ='',
-                 name   ='',
-                 style  ='normal',
-                 variant='normal',
-                 weight ='normal',
-                 stretch='normal',
-                 size   ='medium',
-                 ):
-        self.fname   = fname
-        self.name    = name
-        self.style   = style
-        self.variant = variant
-        self.weight  = weight
-        self.stretch = stretch
-        try:
-            self.size = str(float(size))
-        except ValueError:
-            self.size = size
-
-    def __repr__(self):
-        return "<Font '%s' (%s) %s %s %s %s>" % (
-            self.name, os.path.basename(self.fname), self.style, self.variant,
-            self.weight, self.stretch)
+def _fontentry_helper_repr_png(fontent):
+    from matplotlib.figure import Figure  # Circular import.
+    fig = Figure()
+    font_path = Path(fontent.fname) if fontent.fname != '' else None
+    fig.text(0, 0, fontent.name, font=font_path)
+    with BytesIO() as buf:
+        fig.savefig(buf, bbox_inches='tight', transparent=True)
+        return buf.getvalue()
+
+
+def _fontentry_helper_repr_html(fontent):
+    png_stream = _fontentry_helper_repr_png(fontent)
+    png_b64 = b64encode(png_stream).decode()
+    return f"<img src=\"data:image/png;base64, {png_b64}\" />"
+
+
+FontEntry = dataclasses.make_dataclass(
+    'FontEntry', [
+        ('fname', str, dataclasses.field(default='')),
+        ('name', str, dataclasses.field(default='')),
+        ('style', str, dataclasses.field(default='normal')),
+        ('variant', str, dataclasses.field(default='normal')),
+        ('weight', str, dataclasses.field(default='normal')),
+        ('stretch', str, dataclasses.field(default='normal')),
+        ('size', str, dataclasses.field(default='medium')),
+    ],
+    namespace={
+        '__doc__': """
+    A class for storing Font properties.
+
+    It is used when populating the font lookup dictionary.
+    """,
+        '_repr_html_': lambda self: _fontentry_helper_repr_html(self),
+        '_repr_png_': lambda self: _fontentry_helper_repr_png(self),
+    }
+)
 
 
 def ttfFontProperty(font):
@@ -507,7 +549,7 @@ def afmFontProperty(fontpath, font):
 
     Parameters
     ----------
-    font : `.AFM`
+    font : AFM
         The AFM font file from which information will be extracted.
 
     Returns
@@ -579,33 +621,34 @@ class FontProperties:
     specification and *math_fontfamily* for math fonts:
 
     - family: A list of font names in decreasing order of priority.
-      The items may include a generic font family name, either
-      'sans-serif' (default), 'serif', 'cursive', 'fantasy', or 'monospace'.
-      In that case, the actual font to be used will be looked up
-      from the associated rcParam.
+      The items may include a generic font family name, either 'sans-serif',
+      'serif', 'cursive', 'fantasy', or 'monospace'.  In that case, the actual
+      font to be used will be looked up from the associated rcParam during the
+      search process in `.findfont`. Default: :rc:`font.family`
 
-    - style: Either 'normal' (default), 'italic' or 'oblique'.
+    - style: Either 'normal', 'italic' or 'oblique'.
+      Default: :rc:`font.style`
 
-    - variant: Either 'normal' (default) or 'small-caps'.
+    - variant: Either 'normal' or 'small-caps'.
+      Default: :rc:`font.variant`
 
     - stretch: A numeric value in the range 0-1000 or one of
       'ultra-condensed', 'extra-condensed', 'condensed',
-      'semi-condensed', 'normal' (default), 'semi-expanded', 'expanded',
-      'extra-expanded' or 'ultra-expanded'.
+      'semi-condensed', 'normal', 'semi-expanded', 'expanded',
+      'extra-expanded' or 'ultra-expanded'. Default: :rc:`font.stretch`
 
     - weight: A numeric value in the range 0-1000 or one of
-      'ultralight', 'light', 'normal' (default), 'regular', 'book', 'medium',
+      'ultralight', 'light', 'normal', 'regular', 'book', 'medium',
       'roman', 'semibold', 'demibold', 'demi', 'bold', 'heavy',
-      'extra bold', 'black'.
+      'extra bold', 'black'. Default: :rc:`font.weight`
 
     - size: Either an relative value of 'xx-small', 'x-small',
       'small', 'medium', 'large', 'x-large', 'xx-large' or an
-      absolute font size, e.g., 10 (default).
+      absolute font size, e.g., 10. Default: :rc:`font.size`
 
-    - math_fontfamily: The family of fonts used to render math text; overrides
-      :rc:`mathtext.fontset`. Supported values are the same as the ones
-      supported by :rc:`mathtext.fontset`: 'dejavusans', 'dejavuserif', 'cm',
-      'stix', 'stixsans' and 'custom'.
+    - math_fontfamily: The family of fonts used to render math text.
+      Supported values are: 'dejavusans', 'dejavuserif', 'cm',
+      'stix', 'stixsans' and 'custom'. Default: :rc:`mathtext.fontset`
 
     Alternatively, a font may be specified using the absolute path to a font
     file, by using the *fname* kwarg.  However, in this case, it is typically
@@ -631,33 +674,10 @@ class FontProperties:
     fontconfig.
     """
 
-    def __init__(self,
-                 family = None,
-                 style  = None,
-                 variant= None,
-                 weight = None,
-                 stretch= None,
-                 size   = None,
-                 fname  = None,  # if set, it's a hardcoded filename to use
-                 math_fontfamily = None,
-                 ):
-        self._family = _normalize_font_family(rcParams['font.family'])
-        self._slant = rcParams['font.style']
-        self._variant = rcParams['font.variant']
-        self._weight = rcParams['font.weight']
-        self._stretch = rcParams['font.stretch']
-        self._size = rcParams['font.size']
-        self._file = None
-        self._math_fontfamily = None
-
-        if isinstance(family, str):
-            # Treat family as a fontconfig pattern if it is the only
-            # parameter provided.
-            if (style is None and variant is None and weight is None and
-                    stretch is None and size is None and fname is None):
-                self.set_fontconfig_pattern(family)
-                return
-
+    def __init__(self, family=None, style=None, variant=None, weight=None,
+                 stretch=None, size=None,
+                 fname=None,  # if set, it's a hardcoded filename to use
+                 math_fontfamily=None):
         self.set_family(family)
         self.set_style(style)
         self.set_variant(variant)
@@ -666,6 +686,13 @@ def __init__(self,
         self.set_file(fname)
         self.set_size(size)
         self.set_math_fontfamily(math_fontfamily)
+        # Treat family as a fontconfig pattern if it is the only parameter
+        # provided.  Even in that case, call the other setters first to set
+        # attributes not specified by the pattern to the rcParams defaults.
+        if (isinstance(family, str)
+                and style is None and variant is None and weight is None
+                and stretch is None and size is None and fname is None):
+            self.set_fontconfig_pattern(family)
 
     @classmethod
     def _from_any(cls, arg):
@@ -696,7 +723,7 @@ def __hash__(self):
              self.get_variant(),
              self.get_weight(),
              self.get_stretch(),
-             self.get_size_in_points(),
+             self.get_size(),
              self.get_file(),
              self.get_math_fontfamily())
         return hash(l)
@@ -709,7 +736,11 @@ def __str__(self):
 
     def get_family(self):
         """
-        Return a list of font names that comprise the font family.
+        Return a list of individual font family names or generic family names.
+
+        The font families or generic font families (which will be resolved
+        from their respective rcParams when searching for a matching font) in
+        the order of preference.
         """
         return self._family
 
@@ -724,7 +755,6 @@ def get_style(self):
         Return the font style.  Values are: 'normal', 'italic' or 'oblique'.
         """
         return self._slant
-    get_slant = get_style
 
     def get_variant(self):
         """
@@ -755,9 +785,6 @@ def get_size(self):
         """
         return self._size
 
-    def get_size_in_points(self):
-        return self._size
-
     def get_file(self):
         """
         Return the filename of the associated font.
@@ -780,76 +807,105 @@ def set_family(self, family):
         is CSS parlance), such as: 'serif', 'sans-serif', 'cursive',
         'fantasy', or 'monospace', a real font name or a list of real
         font names.  Real font names are not supported when
-        :rc:`text.usetex` is `True`.
+        :rc:`text.usetex` is `True`. Default: :rc:`font.family`
         """
         if family is None:
-            family = rcParams['font.family']
-        self._family = _normalize_font_family(family)
-    set_name = set_family
+            family = mpl.rcParams['font.family']
+        if isinstance(family, str):
+            family = [family]
+        self._family = family
 
     def set_style(self, style):
         """
-        Set the font style.  Values are: 'normal', 'italic' or 'oblique'.
+        Set the font style.
+
+        Parameters
+        ----------
+        style : {'normal', 'italic', 'oblique'}, default: :rc:`font.style`
         """
         if style is None:
-            style = rcParams['font.style']
+            style = mpl.rcParams['font.style']
         _api.check_in_list(['normal', 'italic', 'oblique'], style=style)
         self._slant = style
-    set_slant = set_style
 
     def set_variant(self, variant):
         """
-        Set the font variant.  Values are: 'normal' or 'small-caps'.
+        Set the font variant.
+
+        Parameters
+        ----------
+        variant : {'normal', 'small-caps'}, default: :rc:`font.variant`
         """
         if variant is None:
-            variant = rcParams['font.variant']
+            variant = mpl.rcParams['font.variant']
         _api.check_in_list(['normal', 'small-caps'], variant=variant)
         self._variant = variant
 
     def set_weight(self, weight):
         """
-        Set the font weight.  May be either a numeric value in the
-        range 0-1000 or one of 'ultralight', 'light', 'normal',
-        'regular', 'book', 'medium', 'roman', 'semibold', 'demibold',
-        'demi', 'bold', 'heavy', 'extra bold', 'black'
+        Set the font weight.
+
+        Parameters
+        ----------
+        weight : int or {'ultralight', 'light', 'normal', 'regular', 'book', \
+'medium', 'roman', 'semibold', 'demibold', 'demi', 'bold', 'heavy', \
+'extra bold', 'black'}, default: :rc:`font.weight`
+            If int, must be in the range  0-1000.
         """
         if weight is None:
-            weight = rcParams['font.weight']
+            weight = mpl.rcParams['font.weight']
+        if weight in weight_dict:
+            self._weight = weight
+            return
         try:
             weight = int(weight)
-            if weight < 0 or weight > 1000:
-                raise ValueError()
         except ValueError:
-            if weight not in weight_dict:
-                raise ValueError("weight is invalid")
-        self._weight = weight
+            pass
+        else:
+            if 0 <= weight <= 1000:
+                self._weight = weight
+                return
+        raise ValueError(f"{weight=} is invalid")
 
     def set_stretch(self, stretch):
         """
-        Set the font stretch or width.  Options are: 'ultra-condensed',
-        'extra-condensed', 'condensed', 'semi-condensed', 'normal',
-        'semi-expanded', 'expanded', 'extra-expanded' or
-        'ultra-expanded', or a numeric value in the range 0-1000.
+        Set the font stretch or width.
+
+        Parameters
+        ----------
+        stretch : int or {'ultra-condensed', 'extra-condensed', 'condensed', \
+'semi-condensed', 'normal', 'semi-expanded', 'expanded', 'extra-expanded', \
+'ultra-expanded'}, default: :rc:`font.stretch`
+            If int, must be in the range  0-1000.
         """
         if stretch is None:
-            stretch = rcParams['font.stretch']
+            stretch = mpl.rcParams['font.stretch']
+        if stretch in stretch_dict:
+            self._stretch = stretch
+            return
         try:
             stretch = int(stretch)
-            if stretch < 0 or stretch > 1000:
-                raise ValueError()
-        except ValueError as err:
-            if stretch not in stretch_dict:
-                raise ValueError("stretch is invalid") from err
-        self._stretch = stretch
+        except ValueError:
+            pass
+        else:
+            if 0 <= stretch <= 1000:
+                self._stretch = stretch
+                return
+        raise ValueError(f"{stretch=} is invalid")
 
     def set_size(self, size):
         """
-        Set the font size.  Either an relative value of 'xx-small',
-        'x-small', 'small', 'medium', 'large', 'x-large', 'xx-large'
-        or an absolute font size, e.g., 12.
+        Set the font size.
+
+        Parameters
+        ----------
+        size : float or {'xx-small', 'x-small', 'small', 'medium', \
+'large', 'x-large', 'xx-large'}, default: :rc:`font.size`
+            If float, the font size in points. The string values denote sizes
+            relative to the default font size.
         """
         if size is None:
-            size = rcParams['font.size']
+            size = mpl.rcParams['font.size']
         try:
             size = float(size)
         except ValueError:
@@ -915,7 +971,7 @@ def set_math_fontfamily(self, fontfamily):
         .text.Text.get_math_fontfamily
         """
         if fontfamily is None:
-            fontfamily = rcParams['mathtext.fontset']
+            fontfamily = mpl.rcParams['mathtext.fontset']
         else:
             valid_fonts = _validators['mathtext.fontset'].valid.values()
             # _check_in_list() Validates the parameter math_fontfamily as
@@ -925,9 +981,13 @@ def set_math_fontfamily(self, fontfamily):
 
     def copy(self):
         """Return a copy of self."""
-        new = type(self)()
-        vars(new).update(vars(self))
-        return new
+        return copy.copy(self)
+
+    # Aliases
+    set_name = set_family
+    get_slant = get_style
+    set_slant = set_style
+    get_size_in_points = get_size
 
 
 class _JSONEncoder(json.JSONEncoder):
@@ -998,16 +1058,10 @@ def json_load(filename):
     --------
     json_dump
     """
-    with open(filename, 'r') as fh:
+    with open(filename) as fh:
         return json.load(fh, object_hook=_json_decode)
 
 
-def _normalize_font_family(family):
-    if isinstance(family, str):
-        family = [family]
-    return family
-
-
 class FontManager:
     """
     On import, the `FontManager` singleton instance creates a list of ttf and
@@ -1027,23 +1081,10 @@ def __init__(self, size=None, weight='normal'):
         self.__default_weight = weight
         self.default_size = size
 
+        # Create list of font paths.
         paths = [cbook._get_data_path('fonts', subdir)
                  for subdir in ['ttf', 'afm', 'pdfcorefonts']]
-        #  Create list of font paths
-        for pathname in ['TTFPATH', 'AFMPATH']:
-            if pathname in os.environ:
-                ttfpath = os.environ[pathname]
-                if ttfpath.find(';') >= 0:  # win32 style
-                    paths.extend(ttfpath.split(';'))
-                elif ttfpath.find(':') >= 0:  # unix style
-                    paths.extend(ttfpath.split(':'))
-                else:
-                    paths.append(ttfpath)
-                _api.warn_deprecated(
-                    "3.3", name=pathname, obj_type="environment variable",
-                    alternative="FontManager.addfont()")
         _log.debug('font search path %s', str(paths))
-        #  Load TrueType fonts and create font dictionary.
 
         self.defaultFamily = {
             'ttf': 'DejaVu Sans',
@@ -1053,7 +1094,7 @@ def __init__(self, size=None, weight='normal'):
         self.ttflist = []
 
         # Delay the warning by 5s.
-        timer = Timer(5, lambda: _log.warning(
+        timer = threading.Timer(5, lambda: _log.warning(
             'Matplotlib is building the font cache; this may take a moment.'))
         timer.start()
         try:
@@ -1079,15 +1120,19 @@ def addfont(self, path):
         ----------
         path : str or path-like
         """
+        # Convert to string in case of a path as
+        # afmFontProperty and FT2Font expect this
+        path = os.fsdecode(path)
         if Path(path).suffix.lower() == ".afm":
             with open(path, "rb") as fh:
-                font = afm.AFM(fh)
+                font = _afm.AFM(fh)
             prop = afmFontProperty(path, font)
             self.afmlist.append(prop)
         else:
             font = ft2font.FT2Font(path)
             prop = ttfFontProperty(font)
             self.ttflist.append(prop)
+        self._findfont_cached.cache_clear()
 
     @property
     def defaultFont(self):
@@ -1107,7 +1152,7 @@ def get_default_size():
         """
         Return the default font size.
         """
-        return rcParams['font.size']
+        return mpl.rcParams['font.size']
 
     def set_default_weight(self, weight):
         """
@@ -1119,7 +1164,7 @@ def set_default_weight(self, weight):
     def _expand_aliases(family):
         if family in ('sans', 'sans serif'):
             family = 'sans-serif'
-        return rcParams['font.' + family]
+        return mpl.rcParams['font.' + family]
 
     # Each of the scoring functions below should return a value between
     # 0.0 (perfect match) and 1.0 (terrible match)
@@ -1297,14 +1342,111 @@ def findfont(self, prop, fontext='ttf', directory=None,
         # Pass the relevant rcParams (and the font manager, as `self`) to
         # _findfont_cached so to prevent using a stale cache entry after an
         # rcParam was changed.
-        rc_params = tuple(tuple(rcParams[key]) for key in [
+        rc_params = tuple(tuple(mpl.rcParams[key]) for key in [
             "font.serif", "font.sans-serif", "font.cursive", "font.fantasy",
             "font.monospace"])
-        return self._findfont_cached(
+        ret = self._findfont_cached(
             prop, fontext, directory, fallback_to_default, rebuild_if_missing,
             rc_params)
+        if isinstance(ret, Exception):
+            raise ret
+        return ret
+
+    def get_font_names(self):
+        """Return the list of available fonts."""
+        return list(set([font.name for font in self.ttflist]))
 
-    @lru_cache()
+    def _find_fonts_by_props(self, prop, fontext='ttf', directory=None,
+                             fallback_to_default=True, rebuild_if_missing=True):
+        """
+        Find font families that most closely match the given properties.
+
+        Parameters
+        ----------
+        prop : str or `~matplotlib.font_manager.FontProperties`
+            The font properties to search for. This can be either a
+            `.FontProperties` object or a string defining a
+            `fontconfig patterns`_.
+
+        fontext : {'ttf', 'afm'}, default: 'ttf'
+            The extension of the font file:
+
+            - 'ttf': TrueType and OpenType fonts (.ttf, .ttc, .otf)
+            - 'afm': Adobe Font Metrics (.afm)
+
+        directory : str, optional
+            If given, only search this directory and its subdirectories.
+
+        fallback_to_default : bool
+            If True, will fallback to the default font family (usually
+            "DejaVu Sans" or "Helvetica") if none of the families were found.
+
+        rebuild_if_missing : bool
+            Whether to rebuild the font cache and search again if the first
+            match appears to point to a nonexisting font (i.e., the font cache
+            contains outdated entries).
+
+        Returns
+        -------
+        list[str]
+            The paths of the fonts found
+
+        Notes
+        -----
+        This is an extension/wrapper of the original findfont API, which only
+        returns a single font for given font properties. Instead, this API
+        returns an dict containing multiple fonts and their filepaths
+        which closely match the given font properties.  Since this internally
+        uses the original API, there's no change to the logic of performing the
+        nearest neighbor search.  See `findfont` for more details.
+        """
+
+        prop = FontProperties._from_any(prop)
+
+        fpaths = []
+        for family in prop.get_family():
+            cprop = prop.copy()
+            cprop.set_family(family)  # set current prop's family
+
+            try:
+                fpaths.append(
+                    self.findfont(
+                        cprop, fontext, directory,
+                        fallback_to_default=False,  # don't fallback to default
+                        rebuild_if_missing=rebuild_if_missing,
+                    )
+                )
+            except ValueError:
+                if family in font_family_aliases:
+                    _log.warning(
+                        "findfont: Generic family %r not found because "
+                        "none of the following families were found: %s",
+                        family, ", ".join(self._expand_aliases(family))
+                    )
+                else:
+                    _log.warning("findfont: Font family %r not found.", family)
+
+        # only add default family if no other font was found and
+        # fallback_to_default is enabled
+        if not fpaths:
+            if fallback_to_default:
+                dfamily = self.defaultFamily[fontext]
+                cprop = prop.copy()
+                cprop.set_family(dfamily)
+                fpaths.append(
+                    self.findfont(
+                        cprop, fontext, directory,
+                        fallback_to_default=True,
+                        rebuild_if_missing=rebuild_if_missing,
+                    )
+                )
+            else:
+                raise ValueError("Failed to find any font, and fallback "
+                                 "to the default font was disabled")
+
+        return fpaths
+
+    @lru_cache(1024)
     def _findfont_cached(self, prop, fontext, directory, fallback_to_default,
                          rebuild_if_missing, rc_params):
 
@@ -1357,8 +1499,11 @@ def _findfont_cached(self, prop, fontext, directory, fallback_to_default,
                 return self.findfont(default_prop, fontext, directory,
                                      fallback_to_default=False)
             else:
-                raise ValueError(f"Failed to find font {prop}, and fallback "
-                                 f"to the default font was disabled")
+                # This return instead of raise is intentional, as we wish to
+                # cache the resulting exception, which will not occur if it was
+                # actually raised.
+                return ValueError(f"Failed to find font {prop}, and fallback "
+                                  f"to the default font was disabled")
         else:
             _log.debug('findfont: Matching %s to %s (%r) with score of %f.',
                        prop, best_font.name, best_font.fname, best_score)
@@ -1377,7 +1522,10 @@ def _findfont_cached(self, prop, fontext, directory, fallback_to_default,
                 return self.findfont(
                     prop, fontext, directory, rebuild_if_missing=False)
             else:
-                raise ValueError("No valid font could be found")
+                # This return instead of raise is intentional, as we wish to
+                # cache the resulting exception, which will not occur if it was
+                # actually raised.
+                return ValueError("No valid font could be found")
 
         return _cached_realpath(result)
 
@@ -1397,29 +1545,75 @@ def is_opentype_cff_font(filename):
 
 
 @lru_cache(64)
-def _get_font(filename, hinting_factor, *, _kerning_factor, thread_id):
+def _get_font(font_filepaths, hinting_factor, *, _kerning_factor, thread_id):
+    first_fontpath, *rest = font_filepaths
     return ft2font.FT2Font(
-        filename, hinting_factor, _kerning_factor=_kerning_factor)
+        first_fontpath, hinting_factor,
+        _fallback_list=[
+            ft2font.FT2Font(
+                fpath, hinting_factor,
+                _kerning_factor=_kerning_factor
+            )
+            for fpath in rest
+        ],
+        _kerning_factor=_kerning_factor
+    )
 
 
 # FT2Font objects cannot be used across fork()s because they reference the same
 # FT_Library object.  While invalidating *all* existing FT2Fonts after a fork
 # would be too complicated to be worth it, the main way FT2Fonts get reused is
-# via the cache of _get_font, which we can empty upon forking (in Py3.7+).
+# via the cache of _get_font, which we can empty upon forking (not on Windows,
+# which has no fork() or register_at_fork()).
 if hasattr(os, "register_at_fork"):
     os.register_at_fork(after_in_child=_get_font.cache_clear)
 
 
-def get_font(filename, hinting_factor=None):
+@lru_cache(64)
+def _cached_realpath(path):
     # Resolving the path avoids embedding the font twice in pdf/ps output if a
     # single font is selected using two different relative paths.
-    filename = _cached_realpath(filename)
+    return os.path.realpath(path)
+
+
+@_api.rename_parameter('3.6', "filepath", "font_filepaths")
+def get_font(font_filepaths, hinting_factor=None):
+    """
+    Get an `.ft2font.FT2Font` object given a list of file paths.
+
+    Parameters
+    ----------
+    font_filepaths : Iterable[str, Path, bytes], str, Path, bytes
+        Relative or absolute paths to the font files to be used.
+
+        If a single string, bytes, or `pathlib.Path`, then it will be treated
+        as a list with that entry only.
+
+        If more than one filepath is passed, then the returned FT2Font object
+        will fall back through the fonts, in the order given, to find a needed
+        glyph.
+
+    Returns
+    -------
+    `.ft2font.FT2Font`
+
+    """
+    if isinstance(font_filepaths, (str, Path, bytes)):
+        paths = (_cached_realpath(font_filepaths),)
+    else:
+        paths = tuple(_cached_realpath(fname) for fname in font_filepaths)
+
     if hinting_factor is None:
-        hinting_factor = rcParams['text.hinting_factor']
-    # also key on the thread ID to prevent segfaults with multi-threading
-    return _get_font(filename, hinting_factor,
-                     _kerning_factor=rcParams['text.kerning_factor'],
-                     thread_id=threading.get_ident())
+        hinting_factor = mpl.rcParams['text.hinting_factor']
+
+    return _get_font(
+        # must be a tuple to be cached
+        paths,
+        hinting_factor,
+        _kerning_factor=mpl.rcParams['text.kerning_factor'],
+        # also key on the thread ID to prevent segfaults with multi-threading
+        thread_id=threading.get_ident()
+    )
 
 
 def _load_fontmanager(*, try_read_cache=True):
@@ -1428,7 +1622,7 @@ def _load_fontmanager(*, try_read_cache=True):
     if try_read_cache:
         try:
             fm = json_load(fm_path)
-        except Exception as exc:
+        except Exception:
             pass
         else:
             if getattr(fm, "_version", object()) == FontManager.__version__:
@@ -1442,3 +1636,4 @@ def _load_fontmanager(*, try_read_cache=True):
 
 fontManager = _load_fontmanager()
 findfont = fontManager.findfont
+get_font_names = fontManager.get_font_names
diff --git a/lib/matplotlib/fontconfig_pattern.py b/lib/matplotlib/fontconfig_pattern.py
index c47e19bf99dc..94f0cb592708 100644
--- a/lib/matplotlib/fontconfig_pattern.py
+++ b/lib/matplotlib/fontconfig_pattern.py
@@ -1,209 +1,3 @@
-"""
-A module for parsing and generating `fontconfig patterns`_.
-
-.. _fontconfig patterns:
-   https://www.freedesktop.org/software/fontconfig/fontconfig-user.html
-"""
-
-# This class logically belongs in `matplotlib.font_manager`, but placing it
-# there would have created cyclical dependency problems, because it also needs
-# to be available from `matplotlib.rcsetup` (for parsing matplotlibrc files).
-
-from functools import lru_cache
-import re
-import numpy as np
-from pyparsing import (Literal, ZeroOrMore, Optional, Regex, StringEnd,
-                       ParseException, Suppress)
-
-family_punc = r'\\\-:,'
-family_unescape = re.compile(r'\\([%s])' % family_punc).sub
-family_escape = re.compile(r'([%s])' % family_punc).sub
-
-value_punc = r'\\=_:,'
-value_unescape = re.compile(r'\\([%s])' % value_punc).sub
-value_escape = re.compile(r'([%s])' % value_punc).sub
-
-
-class FontconfigPatternParser:
-    """
-    A simple pyparsing-based parser for `fontconfig patterns`_.
-
-    .. _fontconfig patterns:
-       https://www.freedesktop.org/software/fontconfig/fontconfig-user.html
-    """
-
-    _constants = {
-        'thin':           ('weight', 'light'),
-        'extralight':     ('weight', 'light'),
-        'ultralight':     ('weight', 'light'),
-        'light':          ('weight', 'light'),
-        'book':           ('weight', 'book'),
-        'regular':        ('weight', 'regular'),
-        'normal':         ('weight', 'normal'),
-        'medium':         ('weight', 'medium'),
-        'demibold':       ('weight', 'demibold'),
-        'semibold':       ('weight', 'semibold'),
-        'bold':           ('weight', 'bold'),
-        'extrabold':      ('weight', 'extra bold'),
-        'black':          ('weight', 'black'),
-        'heavy':          ('weight', 'heavy'),
-        'roman':          ('slant', 'normal'),
-        'italic':         ('slant', 'italic'),
-        'oblique':        ('slant', 'oblique'),
-        'ultracondensed': ('width', 'ultra-condensed'),
-        'extracondensed': ('width', 'extra-condensed'),
-        'condensed':      ('width', 'condensed'),
-        'semicondensed':  ('width', 'semi-condensed'),
-        'expanded':       ('width', 'expanded'),
-        'extraexpanded':  ('width', 'extra-expanded'),
-        'ultraexpanded':  ('width', 'ultra-expanded')
-        }
-
-    def __init__(self):
-
-        family = Regex(
-            r'([^%s]|(\\[%s]))*' % (family_punc, family_punc)
-        ).setParseAction(self._family)
-
-        size = Regex(
-            r"([0-9]+\.?[0-9]*|\.[0-9]+)"
-        ).setParseAction(self._size)
-
-        name = Regex(
-            r'[a-z]+'
-        ).setParseAction(self._name)
-
-        value = Regex(
-            r'([^%s]|(\\[%s]))*' % (value_punc, value_punc)
-        ).setParseAction(self._value)
-
-        families = (
-            family
-            + ZeroOrMore(
-                Literal(',')
-                + family)
-        ).setParseAction(self._families)
-
-        point_sizes = (
-            size
-            + ZeroOrMore(
-                Literal(',')
-                + size)
-        ).setParseAction(self._point_sizes)
-
-        property = (
-            (name
-             + Suppress(Literal('='))
-             + value
-             + ZeroOrMore(
-                 Suppress(Literal(','))
-                 + value))
-            | name
-        ).setParseAction(self._property)
-
-        pattern = (
-            Optional(
-                families)
-            + Optional(
-                Literal('-')
-                + point_sizes)
-            + ZeroOrMore(
-                Literal(':')
-                + property)
-            + StringEnd()
-        )
-
-        self._parser = pattern
-        self.ParseException = ParseException
-
-    def parse(self, pattern):
-        """
-        Parse the given fontconfig *pattern* and return a dictionary
-        of key/value pairs useful for initializing a
-        `.font_manager.FontProperties` object.
-        """
-        props = self._properties = {}
-        try:
-            self._parser.parseString(pattern)
-        except self.ParseException as e:
-            raise ValueError(
-                "Could not parse font string: '%s'\n%s" % (pattern, e)) from e
-
-        self._properties = None
-
-        self._parser.resetCache()
-
-        return props
-
-    def _family(self, s, loc, tokens):
-        return [family_unescape(r'\1', str(tokens[0]))]
-
-    def _size(self, s, loc, tokens):
-        return [float(tokens[0])]
-
-    def _name(self, s, loc, tokens):
-        return [str(tokens[0])]
-
-    def _value(self, s, loc, tokens):
-        return [value_unescape(r'\1', str(tokens[0]))]
-
-    def _families(self, s, loc, tokens):
-        self._properties['family'] = [str(x) for x in tokens]
-        return []
-
-    def _point_sizes(self, s, loc, tokens):
-        self._properties['size'] = [str(x) for x in tokens]
-        return []
-
-    def _property(self, s, loc, tokens):
-        if len(tokens) == 1:
-            if tokens[0] in self._constants:
-                key, val = self._constants[tokens[0]]
-                self._properties.setdefault(key, []).append(val)
-        else:
-            key = tokens[0]
-            val = tokens[1:]
-            self._properties.setdefault(key, []).extend(val)
-        return []
-
-
-# `parse_fontconfig_pattern` is a bottleneck during the tests because it is
-# repeatedly called when the rcParams are reset (to validate the default
-# fonts).  In practice, the cache size doesn't grow beyond a few dozen entries
-# during the test suite.
-parse_fontconfig_pattern = lru_cache()(FontconfigPatternParser().parse)
-
-
-def _escape_val(val, escape_func):
-    """
-    Given a string value or a list of string values, run each value through
-    the input escape function to make the values into legal font config
-    strings.  The result is returned as a string.
-    """
-    if not np.iterable(val) or isinstance(val, str):
-        val = [val]
-
-    return ','.join(escape_func(r'\\\1', str(x)) for x in val
-                    if x is not None)
-
-
-def generate_fontconfig_pattern(d):
-    """
-    Given a dictionary of key/value pairs, generates a fontconfig
-    pattern string.
-    """
-    props = []
-
-    # Family is added first w/o a keyword
-    family = d.get_family()
-    if family is not None and family != []:
-        props.append(_escape_val(family, family_escape))
-
-    # The other keys are added as key=value
-    for key in ['style', 'variant', 'weight', 'stretch', 'file', 'size']:
-        val = getattr(d, 'get_' + key)()
-        # Don't use 'if not val' because 0 is a valid input.
-        if val is not None and val != []:
-            props.append(":%s=%s" % (key, _escape_val(val, value_escape)))
-
-    return ''.join(props)
+from matplotlib._fontconfig_pattern import *  # noqa: F401, F403
+from matplotlib import _api
+_api.warn_deprecated("3.6", name=__name__, obj_type="module")
diff --git a/lib/matplotlib/gridspec.py b/lib/matplotlib/gridspec.py
index 973d3d66b157..2dc066adefa9 100644
--- a/lib/matplotlib/gridspec.py
+++ b/lib/matplotlib/gridspec.py
@@ -5,8 +5,10 @@
 The `GridSpec` specifies the overall grid structure. Individual cells within
 the grid are referenced by `SubplotSpec`\s.
 
-See the tutorial :doc:`/tutorials/intermediate/gridspec` for a comprehensive
-usage guide.
+Often, users need not access this module directly, and can use higher-level
+methods like `~.pyplot.subplots`, `~.pyplot.subplot_mosaic` and
+`~.Figure.subfigures`. See the tutorial
+:doc:`/tutorials/intermediate/arranging_axes` for a guide.
 """
 
 import copy
@@ -16,10 +18,8 @@
 import numpy as np
 
 import matplotlib as mpl
-from matplotlib import _api, _pylab_helpers, tight_layout, rcParams
+from matplotlib import _api, _pylab_helpers, _tight_layout
 from matplotlib.transforms import Bbox
-import matplotlib._layoutgrid as layoutgrid
-
 
 _log = logging.getLogger(__name__)
 
@@ -41,16 +41,16 @@ def __init__(self, nrows, ncols, height_ratios=None, width_ratios=None):
             relative width of ``width_ratios[i] / sum(width_ratios)``.
             If not given, all columns will have the same width.
         height_ratios : array-like of length *nrows*, optional
-            Defines the relative heights of the rows. Each column gets a
+            Defines the relative heights of the rows. Each row gets a
             relative height of ``height_ratios[i] / sum(height_ratios)``.
             If not given, all rows will have the same height.
         """
         if not isinstance(nrows, Integral) or nrows <= 0:
             raise ValueError(
-                f"Number of rows must be a positive integer, not {nrows}")
+                f"Number of rows must be a positive integer, not {nrows!r}")
         if not isinstance(ncols, Integral) or ncols <= 0:
             raise ValueError(
-                f"Number of columns must be a positive integer, not {ncols}")
+                f"Number of columns must be a positive integer, not {ncols!r}")
         self._nrows, self._ncols = nrows, ncols
         self.set_height_ratios(height_ratios)
         self.set_width_ratios(width_ratios)
@@ -142,6 +142,7 @@ def get_height_ratios(self):
         """
         return self._row_height_ratios
 
+    @_api.delete_parameter("3.7", "raw")
     def get_grid_positions(self, fig, raw=False):
         """
         Return the positions of the grid cells in figure coordinates.
@@ -309,23 +310,11 @@ def subplots(self, *, sharex=False, sharey=False, squeeze=True,
 
         # turn off redundant tick labeling
         if sharex in ["col", "all"]:
-            for ax in axarr[:-1, :].flat:  # Remove bottom labels/offsettexts.
-                ax.xaxis.set_tick_params(which="both", labelbottom=False)
-                if ax.xaxis.offsetText.get_position()[1] == 0:
-                    ax.xaxis.offsetText.set_visible(False)
-            for ax in axarr[1:, :].flat:  # Remove top labels/offsettexts.
-                ax.xaxis.set_tick_params(which="both", labeltop=False)
-                if ax.xaxis.offsetText.get_position()[1] == 1:
-                    ax.xaxis.offsetText.set_visible(False)
+            for ax in axarr.flat:
+                ax._label_outer_xaxis(check_patch=True)
         if sharey in ["row", "all"]:
-            for ax in axarr[:, 1:].flat:  # Remove left labels/offsettexts.
-                ax.yaxis.set_tick_params(which="both", labelleft=False)
-                if ax.yaxis.offsetText.get_position()[0] == 0:
-                    ax.yaxis.offsetText.set_visible(False)
-            for ax in axarr[:, :-1].flat:  # Remove right labels/offsettexts.
-                ax.yaxis.set_tick_params(which="both", labelright=False)
-                if ax.yaxis.offsetText.get_position()[0] == 1:
-                    ax.yaxis.offsetText.set_visible(False)
+            for ax in axarr.flat:
+                ax._label_outer_yaxis(check_patch=True)
 
         if squeeze:
             # Discarding unneeded dimensions that equal 1.  If we only have one
@@ -343,6 +332,8 @@ class GridSpec(GridSpecBase):
     The location of the grid cells is determined in a similar way to
     `~.figure.SubplotParams` using *left*, *right*, *top*, *bottom*, *wspace*
     and *hspace*.
+
+    Indexing a GridSpec instance returns a `.SubplotSpec`.
     """
     def __init__(self, nrows, ncols, figure=None,
                  left=None, bottom=None, right=None, top=None,
@@ -354,7 +345,7 @@ def __init__(self, nrows, ncols, figure=None,
         nrows, ncols : int
             The number of rows and columns of the grid.
 
-        figure : `~.figure.Figure`, optional
+        figure : `.Figure`, optional
             Only used for constrained layout to create a proper layoutgrid.
 
         left, right, top, bottom : float, optional
@@ -381,7 +372,7 @@ def __init__(self, nrows, ncols, figure=None,
             If not given, all columns will have the same width.
 
         height_ratios : array-like of length *nrows*, optional
-            Defines the relative heights of the rows. Each column gets a
+            Defines the relative heights of the rows. Each row gets a
             relative height of ``height_ratios[i] / sum(height_ratios)``.
             If not given, all rows will have the same height.
 
@@ -398,25 +389,8 @@ def __init__(self, nrows, ncols, figure=None,
                          width_ratios=width_ratios,
                          height_ratios=height_ratios)
 
-        # set up layoutgrid for constrained_layout:
-        self._layoutgrid = None
-        if self.figure is None or not self.figure.get_constrained_layout():
-            self._layoutgrid = None
-        else:
-            self._toplayoutbox = self.figure._layoutgrid
-            self._layoutgrid = layoutgrid.LayoutGrid(
-                parent=self.figure._layoutgrid,
-                parent_inner=True,
-                name=(self.figure._layoutgrid.name + '.gridspec' +
-                      layoutgrid.seq_id()),
-                ncols=ncols, nrows=nrows, width_ratios=width_ratios,
-                height_ratios=height_ratios)
-
     _AllowedKeys = ["left", "bottom", "right", "top", "wspace", "hspace"]
 
-    def __getstate__(self):
-        return {**self.__dict__, "_layoutgrid": None}
-
     def update(self, **kwargs):
         """
         Update the subplot parameters of the grid.
@@ -447,7 +421,7 @@ def update(self, **kwargs):
 
     def get_subplot_params(self, figure=None):
         """
-        Return the `~.SubplotParams` for the GridSpec.
+        Return the `.SubplotParams` for the GridSpec.
 
         In order of precedence the values are taken from
 
@@ -456,7 +430,8 @@ def get_subplot_params(self, figure=None):
         - :rc:`figure.subplot.*`
         """
         if figure is None:
-            kw = {k: rcParams["figure.subplot."+k] for k in self._AllowedKeys}
+            kw = {k: mpl.rcParams["figure.subplot."+k]
+                  for k in self._AllowedKeys}
             subplotpars = mpl.figure.SubplotParams(**kw)
         else:
             subplotpars = copy.copy(figure.subplotpars)
@@ -487,13 +462,13 @@ def tight_layout(self, figure, renderer=None,
         h_pad, w_pad : float, optional
             Padding (height/width) between edges of adjacent subplots.
             Defaults to *pad*.
-        rect : tuple of 4 floats, default: (0, 0, 1, 1), i.e. the whole figure
+        rect : tuple (left, bottom, right, top), default: None
             (left, bottom, right, top) rectangle in normalized figure
             coordinates that the whole subplots area (including labels) will
-            fit into.
+            fit into. Default (None) is the whole figure.
         """
 
-        subplotspec_list = tight_layout.get_subplotspec_list(
+        subplotspec_list = _tight_layout.get_subplotspec_list(
             figure.axes, grid_spec=self)
         if None in subplotspec_list:
             _api.warn_external("This figure includes Axes that are not "
@@ -501,9 +476,9 @@ def tight_layout(self, figure, renderer=None,
                                "might be incorrect.")
 
         if renderer is None:
-            renderer = tight_layout.get_renderer(figure)
+            renderer = figure._get_renderer()
 
-        kwargs = tight_layout.get_tight_layout_figure(
+        kwargs = _tight_layout.get_tight_layout_figure(
             figure, figure.axes, subplotspec_list, renderer,
             pad=pad, h_pad=h_pad, w_pad=w_pad, rect=rect)
         if kwargs:
@@ -520,11 +495,19 @@ def __init__(self, nrows, ncols,
                  wspace=None, hspace=None,
                  height_ratios=None, width_ratios=None):
         """
-        The number of rows and number of columns of the grid need to
-        be set. An instance of SubplotSpec is also needed to be set
-        from which the layout parameters will be inherited. The wspace
-        and hspace of the layout can be optionally specified or the
-        default values (from the figure or rcParams) will be used.
+        Parameters
+        ----------
+        nrows, ncols : int
+            Number of rows and number of columns of the grid.
+        subplot_spec : SubplotSpec
+            Spec from which the layout parameters are inherited.
+        wspace, hspace : float, optional
+            See `GridSpec` for more details. If not specified default values
+            (from the figure or rcParams) are used.
+        height_ratios : array-like of length *nrows*, optional
+            See `GridSpecBase` for details.
+        width_ratios : array-like of length *ncols*, optional
+            See `GridSpecBase` for details.
         """
         self._wspace = wspace
         self._hspace = hspace
@@ -533,35 +516,15 @@ def __init__(self, nrows, ncols,
         super().__init__(nrows, ncols,
                          width_ratios=width_ratios,
                          height_ratios=height_ratios)
-        # do the layoutgrids for constrained_layout:
-        subspeclb = subplot_spec.get_gridspec()._layoutgrid
-        if subspeclb is None:
-            self._layoutgrid = None
-        else:
-            # this _toplayoutbox is a container that spans the cols and
-            # rows in the parent gridspec.  Not yet implemented,
-            # but we do this so that it is possible to have subgridspec
-            # level artists.
-            self._toplayoutgrid = layoutgrid.LayoutGrid(
-                parent=subspeclb,
-                name=subspeclb.name + '.top' + layoutgrid.seq_id(),
-                nrows=1, ncols=1,
-                parent_pos=(subplot_spec.rowspan, subplot_spec.colspan))
-            self._layoutgrid = layoutgrid.LayoutGrid(
-                    parent=self._toplayoutgrid,
-                    name=(self._toplayoutgrid.name + '.gridspec' +
-                          layoutgrid.seq_id()),
-                    nrows=nrows, ncols=ncols,
-                    width_ratios=width_ratios, height_ratios=height_ratios)
 
     def get_subplot_params(self, figure=None):
         """Return a dictionary of subplot layout parameters."""
         hspace = (self._hspace if self._hspace is not None
                   else figure.subplotpars.hspace if figure is not None
-                  else rcParams["figure.subplot.hspace"])
+                  else mpl.rcParams["figure.subplot.hspace"])
         wspace = (self._wspace if self._wspace is not None
                   else figure.subplotpars.wspace if figure is not None
-                  else rcParams["figure.subplot.wspace"])
+                  else mpl.rcParams["figure.subplot.wspace"])
 
         figbox = self._subplot_spec.get_position(figure)
         left, bottom, right, top = figbox.extents
@@ -579,7 +542,7 @@ def get_topmost_subplotspec(self):
 
 class SubplotSpec:
     """
-    Specifies the location of a subplot in a `GridSpec`.
+    The location of a subplot in a `GridSpec`.
 
     .. note::
 
@@ -615,44 +578,22 @@ def _from_subplot_args(figure, args):
         - a `.SubplotSpec` -- returned as is;
         - one or three numbers -- a MATLAB-style subplot specifier.
         """
-        message = ("Passing non-integers as three-element position "
-                   "specification is deprecated since %(since)s and will be "
-                   "removed %(removal)s.")
         if len(args) == 1:
             arg, = args
             if isinstance(arg, SubplotSpec):
                 return arg
-            else:
-                if not isinstance(arg, Integral):
-                    _api.warn_deprecated("3.3", message=message)
-                    arg = str(arg)
-                try:
-                    rows, cols, num = map(int, str(arg))
-                except ValueError:
-                    raise ValueError(
-                        f"Single argument to subplot must be a three-digit "
-                        f"integer, not {arg}") from None
-                i = j = num
+            elif not isinstance(arg, Integral):
+                raise ValueError(
+                    f"Single argument to subplot must be a three-digit "
+                    f"integer, not {arg!r}")
+            try:
+                rows, cols, num = map(int, str(arg))
+            except ValueError:
+                raise ValueError(
+                    f"Single argument to subplot must be a three-digit "
+                    f"integer, not {arg!r}") from None
         elif len(args) == 3:
             rows, cols, num = args
-            if not (isinstance(rows, Integral) and isinstance(cols, Integral)):
-                _api.warn_deprecated("3.3", message=message)
-                rows, cols = map(int, [rows, cols])
-            gs = GridSpec(rows, cols, figure=figure)
-            if isinstance(num, tuple) and len(num) == 2:
-                if not all(isinstance(n, Integral) for n in num):
-                    _api.warn_deprecated("3.3", message=message)
-                    i, j = map(int, num)
-                else:
-                    i, j = num
-            else:
-                if not isinstance(num, Integral):
-                    _api.warn_deprecated("3.3", message=message)
-                    num = int(num)
-                if num < 1 or num > rows*cols:
-                    raise ValueError(
-                        f"num must be 1 <= num <= {rows*cols}, not {num}")
-                i = j = num
         else:
             raise TypeError(f"subplot() takes 1 or 3 positional arguments but "
                             f"{len(args)} were given")
@@ -660,6 +601,17 @@ def _from_subplot_args(figure, args):
         gs = GridSpec._check_gridspec_exists(figure, rows, cols)
         if gs is None:
             gs = GridSpec(rows, cols, figure=figure)
+        if isinstance(num, tuple) and len(num) == 2:
+            if not all(isinstance(n, Integral) for n in num):
+                raise ValueError(
+                    f"Subplot specifier tuple must contain integers, not {num}"
+                )
+            i, j = num
+        else:
+            if not isinstance(num, Integral) or num < 1 or num > rows*cols:
+                raise ValueError(
+                    f"num must be 1 <= num <= {rows*cols}, not {num!r}")
+            i = j = num
         return gs[i-1:j]
 
     # num2 is a property only to handle the case where it is None and someone
@@ -673,9 +625,6 @@ def num2(self):
     def num2(self, value):
         self._num2 = value
 
-    def __getstate__(self):
-        return {**self.__dict__}
-
     def get_gridspec(self):
         return self._gridspec
 
@@ -690,18 +639,6 @@ def get_geometry(self):
         rows, cols = self.get_gridspec().get_geometry()
         return rows, cols, self.num1, self.num2
 
-    @_api.deprecated("3.3", alternative="rowspan, colspan")
-    def get_rows_columns(self):
-        """
-        Return the subplot row and column numbers as a tuple
-        ``(n_rows, n_cols, row_start, row_stop, col_start, col_stop)``.
-        """
-        gridspec = self.get_gridspec()
-        nrows, ncols = gridspec.get_geometry()
-        row_start, col_start = divmod(self.num1, ncols)
-        row_stop, col_stop = divmod(self.num2, ncols)
-        return nrows, ncols, row_start, row_stop, col_start, col_stop
-
     @property
     def rowspan(self):
         """The rows spanned by this subplot, as a `range` object."""
@@ -729,8 +666,7 @@ def is_first_col(self):
     def is_last_col(self):
         return self.colspan.stop == self.get_gridspec().ncols
 
-    @_api.delete_parameter("3.4", "return_all")
-    def get_position(self, figure, return_all=False):
+    def get_position(self, figure):
         """
         Update the subplot position from ``figure.subplotpars``.
         """
@@ -744,12 +680,7 @@ def get_position(self, figure, return_all=False):
         fig_top = fig_tops[rows].max()
         fig_left = fig_lefts[cols].min()
         fig_right = fig_rights[cols].max()
-        figbox = Bbox.from_extents(fig_left, fig_bottom, fig_right, fig_top)
-
-        if return_all:
-            return figbox, rows[0], cols[0], nrows, ncols
-        else:
-            return figbox
+        return Bbox.from_extents(fig_left, fig_bottom, fig_right, fig_top)
 
     def get_topmost_subplotspec(self):
         """
diff --git a/lib/matplotlib/hatch.py b/lib/matplotlib/hatch.py
index af674decd41f..9c836cbf3cb9 100644
--- a/lib/matplotlib/hatch.py
+++ b/lib/matplotlib/hatch.py
@@ -101,12 +101,13 @@ def __init__(self, hatch, density):
     def set_vertices_and_codes(self, vertices, codes):
         offset = 1.0 / self.num_rows
         shape_vertices = self.shape_vertices * offset * self.size
-        if not self.filled:
-            inner_vertices = shape_vertices[::-1] * 0.9
         shape_codes = self.shape_codes
-        shape_size = len(shape_vertices)
-
-        cursor = 0
+        if not self.filled:
+            shape_vertices = np.concatenate(  # Forward, then backward.
+                [shape_vertices, shape_vertices[::-1] * 0.9])
+            shape_codes = np.concatenate([shape_codes, shape_codes])
+        vertices_parts = []
+        codes_parts = []
         for row in range(self.num_rows + 1):
             if row % 2 == 0:
                 cols = np.linspace(0, 1, self.num_rows + 1)
@@ -114,15 +115,10 @@ def set_vertices_and_codes(self, vertices, codes):
                 cols = np.linspace(offset / 2, 1 - offset / 2, self.num_rows)
             row_pos = row * offset
             for col_pos in cols:
-                vertices[cursor:cursor + shape_size] = (shape_vertices +
-                                                        (col_pos, row_pos))
-                codes[cursor:cursor + shape_size] = shape_codes
-                cursor += shape_size
-                if not self.filled:
-                    vertices[cursor:cursor + shape_size] = (inner_vertices +
-                                                            (col_pos, row_pos))
-                    codes[cursor:cursor + shape_size] = shape_codes
-                    cursor += shape_size
+                vertices_parts.append(shape_vertices + [col_pos, row_pos])
+                codes_parts.append(shape_codes)
+        np.concatenate(vertices_parts, out=vertices)
+        np.concatenate(codes_parts, out=codes)
 
 
 class Circles(Shapes):
@@ -149,16 +145,13 @@ def __init__(self, hatch, density):
         super().__init__(hatch, density)
 
 
-# TODO: __init__ and class attributes override all attributes set by
-# SmallCircles. Should this class derive from Circles instead?
-class SmallFilledCircles(SmallCircles):
+class SmallFilledCircles(Circles):
     size = 0.1
     filled = True
 
     def __init__(self, hatch, density):
         self.num_rows = (hatch.count('.')) * density
-        # Not super().__init__!
-        Circles.__init__(self, hatch, density)
+        super().__init__(hatch, density)
 
 
 class Stars(Shapes):
@@ -195,6 +188,7 @@ def _validate_hatch_pattern(hatch):
             invalids = ''.join(sorted(invalids))
             _api.warn_deprecated(
                 '3.4',
+                removal='3.7',  # one release after custom hatches (#20690)
                 message=f'hatch must consist of a string of "{valid}" or '
                         'None, but found the following invalid values '
                         f'"{invalids}". Passing invalid values is deprecated '
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
index 98e2b5eb790a..1fe8c048ea5e 100644
--- a/lib/matplotlib/image.py
+++ b/lib/matplotlib/image.py
@@ -7,22 +7,21 @@
 import os
 import logging
 from pathlib import Path
+import warnings
 
 import numpy as np
 import PIL.PngImagePlugin
 
 import matplotlib as mpl
-from matplotlib import _api
+from matplotlib import _api, cbook, cm
+# For clarity, names from _image are given explicitly in this module
+from matplotlib import _image
+# For user convenience, the names from _image are also imported into
+# the image namespace
+from matplotlib._image import *
 import matplotlib.artist as martist
 from matplotlib.backend_bases import FigureCanvasBase
 import matplotlib.colors as mcolors
-import matplotlib.cm as cm
-import matplotlib.cbook as cbook
-# For clarity, names from _image are given explicitly in this module:
-import matplotlib._image as _image
-# For user convenience, the names from _image are also imported into
-# the image namespace:
-from matplotlib._image import *
 from matplotlib.transforms import (
     Affine2D, BboxBase, Bbox, BboxTransform, BboxTransformTo,
     IdentityTransform, TransformedBbox)
@@ -150,7 +149,7 @@ def flush_images():
 
         for a in artists:
             if (isinstance(a, _ImageBase) and a.can_composite() and
-                    a.get_clip_on()):
+                    a.get_clip_on() and not a.get_clip_path()):
                 image_group.append(a)
             else:
                 flush_images()
@@ -166,7 +165,22 @@ def _resample(
     allocating the output array and fetching the relevant properties from the
     Image object *image_obj*.
     """
-
+    # AGG can only handle coordinates smaller than 24-bit signed integers,
+    # so raise errors if the input data is larger than _image.resample can
+    # handle.
+    msg = ('Data with more than {n} cannot be accurately displayed. '
+           'Downsampling to less than {n} before displaying. '
+           'To remove this warning, manually downsample your data.')
+    if data.shape[1] > 2**23:
+        warnings.warn(msg.format(n='2**23 columns'))
+        step = int(np.ceil(data.shape[1] / 2**23))
+        data = data[:, ::step]
+        transform = Affine2D().scale(step, 1) + transform
+    if data.shape[0] > 2**24:
+        warnings.warn(msg.format(n='2**24 rows'))
+        step = int(np.ceil(data.shape[0] / 2**24))
+        data = data[::step, :]
+        transform = Affine2D().scale(1, step) + transform
     # decide if we need to apply anti-aliasing if the data is upsampled:
     # compare the number of displayed pixels to the number of
     # the data pixels.
@@ -238,6 +252,8 @@ def __init__(self, ax,
                  filternorm=True,
                  filterrad=4.0,
                  resample=False,
+                 *,
+                 interpolation_stage=None,
                  **kwargs
                  ):
         martist.Artist.__init__(self)
@@ -249,18 +265,24 @@ def __init__(self, ax,
         self.set_filternorm(filternorm)
         self.set_filterrad(filterrad)
         self.set_interpolation(interpolation)
+        self.set_interpolation_stage(interpolation_stage)
         self.set_resample(resample)
         self.axes = ax
 
         self._imcache = None
 
-        self.update(kwargs)
+        self._internal_update(kwargs)
+
+    def __str__(self):
+        try:
+            size = self.get_size()
+            return f"{type(self).__name__}(size={size!r})"
+        except RuntimeError:
+            return type(self).__name__
 
     def __getstate__(self):
-        state = super().__getstate__()
-        # We can't pickle the C Image cached object.
-        state['_imcache'] = None
-        return state
+        # Save some space on the pickle by not saving the cache.
+        return {**super().__getstate__(), "_imcache": None}
 
     def get_size(self):
         """Return the size of the image as tuple (numrows, numcols)."""
@@ -301,7 +323,6 @@ def changed(self):
         Call this whenever the mappable is changed so observers can update.
         """
         self._imcache = None
-        self._rgbacache = None
         cm.ScalarMappable.changed(self)
 
     def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
@@ -392,53 +413,41 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
         if not unsampled:
             if not (A.ndim == 2 or A.ndim == 3 and A.shape[-1] in (3, 4)):
                 raise ValueError(f"Invalid shape {A.shape} for image data")
-
-            if A.ndim == 2:
+            if A.ndim == 2 and self._interpolation_stage != 'rgba':
                 # if we are a 2D array, then we are running through the
                 # norm + colormap transformation.  However, in general the
                 # input data is not going to match the size on the screen so we
                 # have to resample to the correct number of pixels
 
                 # TODO slice input array first
-                inp_dtype = A.dtype
                 a_min = A.min()
                 a_max = A.max()
-                # figure out the type we should scale to.  For floats,
-                # leave as is.  For integers cast to an appropriate-sized
-                # float.  Small integers get smaller floats in an attempt
-                # to keep the memory footprint reasonable.
-                if a_min is np.ma.masked:
-                    # all masked, so values don't matter
+                if a_min is np.ma.masked:  # All masked; values don't matter.
                     a_min, a_max = np.int32(0), np.int32(1)
-                if inp_dtype.kind == 'f':
-                    scaled_dtype = A.dtype
-                    # Cast to float64
-                    if A.dtype not in (np.float32, np.float16):
-                        if A.dtype != np.float64:
-                            _api.warn_external(
-                                f"Casting input data from '{A.dtype}' to "
-                                f"'float64' for imshow")
-                        scaled_dtype = np.float64
-                else:
-                    # probably an integer of some type.
+                if A.dtype.kind == 'f':  # Float dtype: scale to same dtype.
+                    scaled_dtype = np.dtype(
+                        np.float64 if A.dtype.itemsize > 4 else np.float32)
+                    if scaled_dtype.itemsize < A.dtype.itemsize:
+                        _api.warn_external(f"Casting input data from {A.dtype}"
+                                           f" to {scaled_dtype} for imshow.")
+                else:  # Int dtype, likely.
+                    # Scale to appropriately sized float: use float32 if the
+                    # dynamic range is small, to limit the memory footprint.
                     da = a_max.astype(np.float64) - a_min.astype(np.float64)
-                    # give more breathing room if a big dynamic range
                     scaled_dtype = np.float64 if da > 1e8 else np.float32
 
-                # scale the input data to [.1, .9].  The Agg
-                # interpolators clip to [0, 1] internally, use a
-                # smaller input scale to identify which of the
-                # interpolated points need to be should be flagged as
-                # over / under.
-                # This may introduce numeric instabilities in very broadly
-                # scaled data
+                # Scale the input data to [.1, .9].  The Agg interpolators clip
+                # to [0, 1] internally, and we use a smaller input scale to
+                # identify the interpolated points that need to be flagged as
+                # over/under.  This may introduce numeric instabilities in very
+                # broadly scaled data.
+
                 # Always copy, and don't allow array subtypes.
                 A_scaled = np.array(A, dtype=scaled_dtype)
-                # clip scaled data around norm if necessary.
-                # This is necessary for big numbers at the edge of
-                # float64's ability to represent changes.  Applying
-                # a norm first would be good, but ruins the interpolation
-                # of over numbers.
+                # Clip scaled data around norm if necessary.  This is necessary
+                # for big numbers at the edge of float64's ability to represent
+                # changes.  Applying a norm first would be good, but ruins the
+                # interpolation of over numbers.
                 self.norm.autoscale_None(A)
                 dv = np.float64(self.norm.vmax) - np.float64(self.norm.vmin)
                 vmid = np.float64(self.norm.vmin) + dv / 2
@@ -456,21 +465,17 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
                 if newmax is not None or newmin is not None:
                     np.clip(A_scaled, newmin, newmax, out=A_scaled)
 
-                # used to rescale the raw data to [offset, 1-offset]
-                # so that the resampling code will run cleanly.  Using
-                # dyadic numbers here could reduce the error, but
-                # would not full eliminate it and breaks a number of
-                # tests (due to the slightly different error bouncing
-                # some pixels across a boundary in the (very
+                # Rescale the raw data to [offset, 1-offset] so that the
+                # resampling code will run cleanly.  Using dyadic numbers here
+                # could reduce the error, but would not fully eliminate it and
+                # breaks a number of tests (due to the slightly different
+                # error bouncing some pixels across a boundary in the (very
                 # quantized) colormapping step).
                 offset = .1
                 frac = .8
-                # we need to run the vmin/vmax through the same rescaling
-                # that we run the raw data through because there are small
-                # errors in the round-trip due to float precision.  If we
-                # do not run the vmin/vmax through the same pipeline we can
-                # have values close or equal to the boundaries end up on the
-                # wrong side.
+                # Run vmin/vmax through the same rescaling as the raw data;
+                # otherwise, data values close or equal to the boundaries can
+                # end up on the wrong side due to floating point error.
                 vmin, vmax = self.norm.vmin, self.norm.vmax
                 if vmin is np.ma.masked:
                     vmin, vmax = a_min, a_max
@@ -478,8 +483,7 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
 
                 A_scaled -= a_min
                 vrange -= a_min
-                # a_min and a_max might be ndarray subclasses so use
-                # item to avoid errors
+                # .item() handles a_min/a_max being ndarray subclasses.
                 a_min = a_min.astype(scaled_dtype).item()
                 a_max = a_max.astype(scaled_dtype).item()
 
@@ -490,13 +494,11 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
                 vrange += offset
                 # resample the input data to the correct resolution and shape
                 A_resampled = _resample(self, A_scaled, out_shape, t)
-                # done with A_scaled now, remove from namespace to be sure!
-                del A_scaled
-                # un-scale the resampled data to approximately the
-                # original range things that interpolated to above /
-                # below the original min/max will still be above /
-                # below, but possibly clipped in the case of higher order
-                # interpolation + drastically changing data.
+                del A_scaled  # Make sure we don't use A_scaled anymore!
+                # Un-scale the resampled data to approximately the original
+                # range. Things that interpolated to outside the original range
+                # will still be outside, but possibly clipped in the case of
+                # higher order interpolation + drastically changing data.
                 A_resampled -= offset
                 vrange -= offset
                 if a_min != a_max:
@@ -514,8 +516,7 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
                 # we always have to interpolate the mask to account for
                 # non-affine transformations
                 out_alpha = _resample(self, mask, out_shape, t, resample=True)
-                # done with the mask now, delete from namespace to be sure!
-                del mask
+                del mask  # Make sure we don't use mask anymore!
                 # Agg updates out_alpha in place.  If the pixel has no image
                 # data it will not be updated (and still be 0 as we initialized
                 # it), if input data that would go into that output pixel than
@@ -534,15 +535,18 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
                 # we have re-set the vmin/vmax to account for small errors
                 # that may have moved input values in/out of range
                 s_vmin, s_vmax = vrange
-                if isinstance(self.norm, mcolors.LogNorm):
-                    if s_vmin < 0:
-                        s_vmin = max(s_vmin, np.finfo(scaled_dtype).eps)
-                with cbook._setattr_cm(self.norm,
-                                       vmin=s_vmin,
-                                       vmax=s_vmax,
-                                       ):
+                if isinstance(self.norm, mcolors.LogNorm) and s_vmin <= 0:
+                    # Don't give 0 or negative values to LogNorm
+                    s_vmin = np.finfo(scaled_dtype).eps
+                # Block the norm from sending an update signal during the
+                # temporary vmin/vmax change
+                with self.norm.callbacks.blocked(), \
+                     cbook._setattr_cm(self.norm, vmin=s_vmin, vmax=s_vmax):
                     output = self.norm(resampled_masked)
             else:
+                if A.ndim == 2:  # _interpolation_stage == 'rgba'
+                    self.norm.autoscale_None(A)
+                    A = self.to_rgba(A)
                 if A.shape[2] == 3:
                     A = _rgb_to_rgba(A)
                 alpha = self._get_scalar_alpha()
@@ -552,8 +556,7 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
                     self, _rgb_to_rgba(A[..., :3]), out_shape, t, alpha=alpha)
                 output[..., 3] = output_alpha  # recombine rgb and alpha
 
-            # at this point output is either a 2D array of normed data
-            # (of int or float)
+            # output is now either a 2D array of normed (int or float) data
             # or an RGBA array of re-sampled input
             output = self.to_rgba(output, bytes=True, norm=False)
             # output is now a correctly sized RGBA array of uint8
@@ -562,17 +565,15 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
             if A.ndim == 2:
                 alpha = self._get_scalar_alpha()
                 alpha_channel = output[:, :, 3]
-                alpha_channel[:] = np.asarray(
-                    np.asarray(alpha_channel, np.float32) * out_alpha * alpha,
-                    np.uint8)
+                alpha_channel[:] = (  # Assignment will cast to uint8.
+                    alpha_channel.astype(np.float32) * out_alpha * alpha)
 
         else:
             if self._imcache is None:
                 self._imcache = self.to_rgba(A, bytes=True, norm=(A.ndim == 2))
             output = self._imcache
 
-            # Subset the input image to only the part that will be
-            # displayed
+            # Subset the input image to only the part that will be displayed.
             subset = TransformedBbox(clip_bbox, t0.inverted()).frozen()
             output = output[
                 int(max(subset.ymin, 0)):
@@ -727,7 +728,6 @@ def set_data(self, A):
                 self._A = self._A.astype(np.uint8)
 
         self._imcache = None
-        self._rgbacache = None
         self.stale = True
 
     def set_array(self, A):
@@ -775,6 +775,22 @@ def set_interpolation(self, s):
         self._interpolation = s
         self.stale = True
 
+    def set_interpolation_stage(self, s):
+        """
+        Set when interpolation happens during the transform to RGBA.
+
+        Parameters
+        ----------
+        s : {'data', 'rgba'} or None
+            Whether to apply up/downsampling interpolation in data or rgba
+            space.
+        """
+        if s is None:
+            s = "data"  # placeholder for maybe having rcParam
+        _api.check_in_list(['data', 'rgba'], s=s)
+        self._interpolation_stage = s
+        self.stale = True
+
     def can_composite(self):
         """Return whether the image can be composited with its neighbors."""
         trans = self.get_transform()
@@ -849,13 +865,18 @@ class AxesImage(_ImageBase):
     cmap : str or `~matplotlib.colors.Colormap`, default: :rc:`image.cmap`
         The Colormap instance or registered colormap name used to map scalar
         data to colors.
-    norm : `~matplotlib.colors.Normalize`
+    norm : str or `~matplotlib.colors.Normalize`
         Maps luminance to 0-1.
     interpolation : str, default: :rc:`image.interpolation`
         Supported values are 'none', 'antialiased', 'nearest', 'bilinear',
         'bicubic', 'spline16', 'spline36', 'hanning', 'hamming', 'hermite',
         'kaiser', 'quadric', 'catrom', 'gaussian', 'bessel', 'mitchell',
         'sinc', 'lanczos', 'blackman'.
+    interpolation_stage : {'data', 'rgba'}, default: 'data'
+        If 'data', interpolation
+        is carried out on the data provided by the user.  If 'rgba', the
+        interpolation is carried out after the colormapping has been
+        applied (visual interpolation).
     origin : {'upper', 'lower'}, default: :rc:`image.origin`
         Place the [0, 0] index of the array in the upper left or lower left
         corner of the axes. The convention 'upper' is typically used for
@@ -880,9 +901,8 @@ class AxesImage(_ImageBase):
         the output image is larger than the input image.
     **kwargs : `.Artist` properties
     """
-    def __str__(self):
-        return "AxesImage(%g,%g;%gx%g)" % tuple(self.axes.bbox.bounds)
 
+    @_api.make_keyword_only("3.6", name="cmap")
     def __init__(self, ax,
                  cmap=None,
                  norm=None,
@@ -892,6 +912,8 @@ def __init__(self, ax,
                  filternorm=True,
                  filterrad=4.0,
                  resample=False,
+                 *,
+                 interpolation_stage=None,
                  **kwargs
                  ):
 
@@ -906,6 +928,7 @@ def __init__(self, ax,
             filternorm=filternorm,
             filterrad=filterrad,
             resample=resample,
+            interpolation_stage=interpolation_stage,
             **kwargs
         )
 
@@ -952,9 +975,9 @@ def set_extent(self, extent):
         self.axes.update_datalim(corners)
         self.sticky_edges.x[:] = [xmin, xmax]
         self.sticky_edges.y[:] = [ymin, ymax]
-        if self.axes._autoscaleXon:
+        if self.axes.get_autoscalex_on():
             self.axes.set_xlim((xmin, xmax), auto=None)
-        if self.axes._autoscaleYon:
+        if self.axes.get_autoscaley_on():
             self.axes.set_ylim((ymin, ymax), auto=None)
         self.stale = True
 
@@ -997,16 +1020,6 @@ def get_cursor_data(self, event):
         else:
             return arr[i, j]
 
-    def format_cursor_data(self, data):
-        if np.ndim(data) == 0 and self.colorbar:
-            return (
-                "["
-                + cbook.strip_math(
-                    self.colorbar.formatter.format_data_short(data)).strip()
-                + "]")
-        else:
-            return super().format_cursor_data(data)
-
 
 class NonUniformImage(AxesImage):
     mouseover = False  # This class still needs its own get_cursor_data impl.
@@ -1027,8 +1040,6 @@ def _check_unsampled_image(self):
         """Return False. Do not use unsampled image."""
         return False
 
-    is_grayscale = _api.deprecate_privatize_attribute("3.3")
-
     def make_image(self, renderer, magnification=1.0, unsampled=False):
         # docstring inherited
         if self._A is None:
@@ -1039,11 +1050,9 @@ def make_image(self, renderer, magnification=1.0, unsampled=False):
         if A.ndim == 2:
             if A.dtype != np.uint8:
                 A = self.to_rgba(A, bytes=True)
-                self._is_grayscale = self.cmap.is_gray()
             else:
                 A = np.repeat(A[:, :, np.newaxis], 4, 2)
                 A[:, :, 3] = 255
-                self._is_grayscale = True
         else:
             if A.dtype != np.uint8:
                 A = (255*A).astype(np.uint8)
@@ -1052,17 +1061,53 @@ def make_image(self, renderer, magnification=1.0, unsampled=False):
                 B[:, :, 0:3] = A
                 B[:, :, 3] = 255
                 A = B
-            self._is_grayscale = False
         vl = self.axes.viewLim
         l, b, r, t = self.axes.bbox.extents
-        width = (round(r) + 0.5) - (round(l) - 0.5)
-        height = (round(t) + 0.5) - (round(b) - 0.5)
-        width *= magnification
-        height *= magnification
-        im = _image.pcolor(self._Ax, self._Ay, A,
-                           int(height), int(width),
-                           (vl.x0, vl.x1, vl.y0, vl.y1),
-                           _interpd_[self._interpolation])
+        width = int(((round(r) + 0.5) - (round(l) - 0.5)) * magnification)
+        height = int(((round(t) + 0.5) - (round(b) - 0.5)) * magnification)
+        x_pix = np.linspace(vl.x0, vl.x1, width)
+        y_pix = np.linspace(vl.y0, vl.y1, height)
+        if self._interpolation == "nearest":
+            x_mid = (self._Ax[:-1] + self._Ax[1:]) / 2
+            y_mid = (self._Ay[:-1] + self._Ay[1:]) / 2
+            x_int = x_mid.searchsorted(x_pix)
+            y_int = y_mid.searchsorted(y_pix)
+            # The following is equal to `A[y_int[:, None], x_int[None, :]]`,
+            # but many times faster.  Both casting to uint32 (to have an
+            # effectively 1D array) and manual index flattening matter.
+            im = (
+                np.ascontiguousarray(A).view(np.uint32).ravel()[
+                    np.add.outer(y_int * A.shape[1], x_int)]
+                .view(np.uint8).reshape((height, width, 4)))
+        else:  # self._interpolation == "bilinear"
+            # Use np.interp to compute x_int/x_float has similar speed.
+            x_int = np.clip(
+                self._Ax.searchsorted(x_pix) - 1, 0, len(self._Ax) - 2)
+            y_int = np.clip(
+                self._Ay.searchsorted(y_pix) - 1, 0, len(self._Ay) - 2)
+            idx_int = np.add.outer(y_int * A.shape[1], x_int)
+            x_frac = np.clip(
+                np.divide(x_pix - self._Ax[x_int], np.diff(self._Ax)[x_int],
+                          dtype=np.float32),  # Downcasting helps with speed.
+                0, 1)
+            y_frac = np.clip(
+                np.divide(y_pix - self._Ay[y_int], np.diff(self._Ay)[y_int],
+                          dtype=np.float32),
+                0, 1)
+            f00 = np.outer(1 - y_frac, 1 - x_frac)
+            f10 = np.outer(y_frac, 1 - x_frac)
+            f01 = np.outer(1 - y_frac, x_frac)
+            f11 = np.outer(y_frac, x_frac)
+            im = np.empty((height, width, 4), np.uint8)
+            for chan in range(4):
+                ac = A[:, :, chan].reshape(-1)  # reshape(-1) avoids a copy.
+                # Shifting the buffer start (`ac[offset:]`) avoids an array
+                # addition (`ac[idx_int + offset]`).
+                buf = f00 * ac[idx_int]
+                buf += f10 * ac[A.shape[1]:][idx_int]
+                buf += f01 * ac[1:][idx_int]
+                buf += f11 * ac[A.shape[1] + 1:][idx_int]
+                im[:, :, chan] = buf  # Implicitly casts to uint8.
         return im, l, b, IdentityTransform()
 
     def set_data(self, x, y, A):
@@ -1141,6 +1186,8 @@ class PcolorImage(AxesImage):
     This uses a variation of the original irregular image code,
     and it is used by pcolorfast for the corresponding grid type.
     """
+
+    @_api.make_keyword_only("3.6", name="cmap")
     def __init__(self, ax,
                  x=None,
                  y=None,
@@ -1169,44 +1216,46 @@ def __init__(self, ax,
         cmap : str or `~matplotlib.colors.Colormap`, default: :rc:`image.cmap`
             The Colormap instance or registered colormap name used to map
             scalar data to colors.
-        norm : `~matplotlib.colors.Normalize`
+        norm : str or `~matplotlib.colors.Normalize`
             Maps luminance to 0-1.
         **kwargs : `.Artist` properties
         """
         super().__init__(ax, norm=norm, cmap=cmap)
-        self.update(kwargs)
+        self._internal_update(kwargs)
         if A is not None:
             self.set_data(x, y, A)
 
-    is_grayscale = _api.deprecate_privatize_attribute("3.3")
-
     def make_image(self, renderer, magnification=1.0, unsampled=False):
         # docstring inherited
         if self._A is None:
             raise RuntimeError('You must first set the image array')
         if unsampled:
             raise ValueError('unsampled not supported on PColorImage')
-        fc = self.axes.patch.get_facecolor()
-        bg = mcolors.to_rgba(fc, 0)
-        bg = (np.array(bg)*255).astype(np.uint8)
+
+        if self._imcache is None:
+            A = self.to_rgba(self._A, bytes=True)
+            self._imcache = np.pad(A, [(1, 1), (1, 1), (0, 0)], "constant")
+        padded_A = self._imcache
+        bg = mcolors.to_rgba(self.axes.patch.get_facecolor(), 0)
+        bg = (np.array(bg) * 255).astype(np.uint8)
+        if (padded_A[0, 0] != bg).all():
+            padded_A[[0, -1], :] = padded_A[:, [0, -1]] = bg
+
         l, b, r, t = self.axes.bbox.extents
         width = (round(r) + 0.5) - (round(l) - 0.5)
         height = (round(t) + 0.5) - (round(b) - 0.5)
         width = int(round(width * magnification))
         height = int(round(height * magnification))
-        if self._rgbacache is None:
-            A = self.to_rgba(self._A, bytes=True)
-            self._rgbacache = A
-            if self._A.ndim == 2:
-                self._is_grayscale = self.cmap.is_gray()
-        else:
-            A = self._rgbacache
         vl = self.axes.viewLim
-        im = _image.pcolor2(self._Ax, self._Ay, A,
-                            height,
-                            width,
-                            (vl.x0, vl.x1, vl.y0, vl.y1),
-                            bg)
+
+        x_pix = np.linspace(vl.x0, vl.x1, width)
+        y_pix = np.linspace(vl.y0, vl.y1, height)
+        x_int = self._Ax.searchsorted(x_pix)
+        y_int = self._Ay.searchsorted(y_pix)
+        im = (  # See comment in NonUniformImage.make_image re: performance.
+            padded_A.view(np.uint32).ravel()[
+                np.add.outer(y_int * padded_A.shape[1], x_int)]
+            .view(np.uint8).reshape((height, width, 4)))
         return im, l, b, IdentityTransform()
 
     def _check_unsampled_image(self):
@@ -1246,15 +1295,10 @@ def set_data(self, x, y, A):
                 (A.shape[:2], (y.size - 1, x.size - 1)))
         if A.ndim not in [2, 3]:
             raise ValueError("A must be 2D or 3D")
-        if A.ndim == 3 and A.shape[2] == 1:
-            A = A.squeeze(axis=-1)
-        self._is_grayscale = False
         if A.ndim == 3:
-            if A.shape[2] in [3, 4]:
-                if ((A[:, :, 0] == A[:, :, 1]).all() and
-                        (A[:, :, 0] == A[:, :, 2]).all()):
-                    self._is_grayscale = True
-            else:
+            if A.shape[2] == 1:
+                A = A.squeeze(axis=-1)
+            elif A.shape[2] not in [3, 4]:
                 raise ValueError("3D arrays must have RGB or RGBA as last dim")
 
         # For efficient cursor readout, ensure x and y are increasing.
@@ -1268,7 +1312,7 @@ def set_data(self, x, y, A):
         self._A = A
         self._Ax = x
         self._Ay = y
-        self._rgbacache = None
+        self._imcache = None
         self.stale = True
 
     def set_array(self, *args):
@@ -1295,6 +1339,7 @@ class FigureImage(_ImageBase):
 
     _interpolation = 'nearest'
 
+    @_api.make_keyword_only("3.6", name="cmap")
     def __init__(self, fig,
                  cmap=None,
                  norm=None,
@@ -1318,7 +1363,7 @@ def __init__(self, fig,
         self.figure = fig
         self.ox = offsetx
         self.oy = offsety
-        self.update(kwargs)
+        self._internal_update(kwargs)
         self.magnification = 1.0
 
     def get_extent(self):
@@ -1346,14 +1391,14 @@ def make_image(self, renderer, magnification=1.0, unsampled=False):
 
     def set_data(self, A):
         """Set the image array."""
-        cm.ScalarMappable.set_array(self,
-                                    cbook.safe_masked_invalid(A, copy=True))
+        cm.ScalarMappable.set_array(self, A)
         self.stale = True
 
 
 class BboxImage(_ImageBase):
     """The Image class whose size is determined by the given bbox."""
 
+    @_api.make_keyword_only("3.6", name="cmap")
     def __init__(self, bbox,
                  cmap=None,
                  norm=None,
@@ -1385,7 +1430,7 @@ def __init__(self, bbox,
 
     def get_window_extent(self, renderer=None):
         if renderer is None:
-            renderer = self.get_figure()._cachedRenderer
+            renderer = self.get_figure()._get_renderer()
 
         if isinstance(self.bbox, BboxBase):
             return self.bbox
@@ -1425,6 +1470,11 @@ def imread(fname, format=None):
     """
     Read an image from a file into an array.
 
+    .. note::
+
+        This function exists for historical reasons.  It is recommended to
+        use `PIL.Image.open` instead for loading images.
+
     Parameters
     ----------
     fname : str or file-like
@@ -1433,11 +1483,13 @@ def imread(fname, format=None):
 
         Passing a URL is deprecated.  Please open the URL
         for reading and pass the result to Pillow, e.g. with
-        ``PIL.Image.open(urllib.request.urlopen(url))``.
+        ``np.array(PIL.Image.open(urllib.request.urlopen(url)))``.
     format : str, optional
-        The image file format assumed for reading the data. If not
-        given, the format is deduced from the filename.  If nothing can
-        be deduced, PNG is tried.
+        The image file format assumed for reading the data.  The image is
+        loaded as a PNG file if *format* is set to "png", if *fname* is a path
+        or opened file with a ".png" extension, or if it is an URL.  In all
+        other cases, *format* is ignored and the format is auto-detected by
+        `PIL.Image.open`.
 
     Returns
     -------
@@ -1447,6 +1499,10 @@ def imread(fname, format=None):
         - (M, N) for grayscale images.
         - (M, N, 3) for RGB images.
         - (M, N, 4) for RGBA images.
+
+        PNG images are returned as float arrays (0-1).  All other formats are
+        returned as int arrays, with a bit depth determined by the file's
+        contents.
     """
     # hide imports to speed initial import on systems with slow linkers
     from urllib import parse
@@ -1475,29 +1531,13 @@ def imread(fname, format=None):
         ext = format
     img_open = (
         PIL.PngImagePlugin.PngImageFile if ext == 'png' else PIL.Image.open)
-    if isinstance(fname, str):
-        parsed = parse.urlparse(fname)
-        if len(parsed.scheme) > 1:  # Pillow doesn't handle URLs directly.
-            _api.warn_deprecated(
-                "3.4", message="Directly reading images from URLs is "
-                "deprecated since %(since)s and will no longer be supported "
-                "%(removal)s. Please open the URL for reading and pass the "
-                "result to Pillow, e.g. with "
-                "``PIL.Image.open(urllib.request.urlopen(url))``.")
-            # hide imports to speed initial import on systems with slow linkers
-            from urllib import request
-            ssl_ctx = mpl._get_ssl_context()
-            if ssl_ctx is None:
-                _log.debug(
-                    "Could not get certifi ssl context, https may not work."
-                )
-            with request.urlopen(fname, context=ssl_ctx) as response:
-                import io
-                try:
-                    response.seek(0)
-                except (AttributeError, io.UnsupportedOperation):
-                    response = io.BytesIO(response.read())
-                return imread(response, format=ext)
+    if isinstance(fname, str) and len(parse.urlparse(fname).scheme) > 1:
+        # Pillow doesn't handle URLs directly.
+        raise ValueError(
+            "Please open the URL for reading and pass the "
+            "result to Pillow, e.g. with "
+            "``np.array(PIL.Image.open(urllib.request.urlopen(url)))``."
+            )
     with img_open(fname) as image:
         return (_pil_png_to_float_array(image)
                 if isinstance(image, PIL.PngImagePlugin.PngImageFile) else
@@ -1507,7 +1547,15 @@ def imread(fname, format=None):
 def imsave(fname, arr, vmin=None, vmax=None, cmap=None, format=None,
            origin=None, dpi=100, *, metadata=None, pil_kwargs=None):
     """
-    Save an array as an image file.
+    Colormap and save an array as an image file.
+
+    RGB(A) images are passed through.  Single channel images will be
+    colormapped according to *cmap* and *norm*.
+
+    .. note ::
+
+       If you want to save a single channel image as gray scale please use an
+       image I/O library (such as pillow, tifffile, or imageio) directly.
 
     Parameters
     ----------
@@ -1565,20 +1613,20 @@ def imsave(fname, arr, vmin=None, vmax=None, cmap=None, format=None,
     else:
         # Don't bother creating an image; this avoids rounding errors on the
         # size when dividing and then multiplying by dpi.
-        sm = cm.ScalarMappable(cmap=cmap)
-        sm.set_clim(vmin, vmax)
         if origin is None:
             origin = mpl.rcParams["image.origin"]
         if origin == "lower":
             arr = arr[::-1]
         if (isinstance(arr, memoryview) and arr.format == "B"
                 and arr.ndim == 3 and arr.shape[-1] == 4):
-            # Such an ``arr`` would also be handled fine by sm.to_rgba (after
-            # casting with asarray), but it is useful to special-case it
+            # Such an ``arr`` would also be handled fine by sm.to_rgba below
+            # (after casting with asarray), but it is useful to special-case it
             # because that's what backend_agg passes, and can be in fact used
             # as is, saving a few operations.
             rgba = arr
         else:
+            sm = cm.ScalarMappable(cmap=cmap)
+            sm.set_clim(vmin, vmax)
             rgba = sm.to_rgba(arr, bytes=True)
         if pil_kwargs is None:
             pil_kwargs = {}
@@ -1661,7 +1709,7 @@ def _pil_png_to_float_array(pil_png):
     mode = pil_png.mode
     rawmode = pil_png.png.im_rawmode
     if rawmode == "1":  # Grayscale.
-        return np.asarray(pil_png, np.float32)
+        return np.asarray(pil_png).astype(np.float32)
     if rawmode == "L;2":  # Grayscale.
         return np.divide(pil_png, 2**2 - 1, dtype=np.float32)
     if rawmode == "L;4":  # Grayscale.
@@ -1716,7 +1764,7 @@ def thumbnail(infile, thumbfile, scale=0.1, interpolation='bilinear',
 
     Returns
     -------
-    `~.figure.Figure`
+    `.Figure`
         The figure instance containing the thumbnail.
     """
 
diff --git a/lib/matplotlib/layout_engine.py b/lib/matplotlib/layout_engine.py
new file mode 100644
index 000000000000..56e82b5699c7
--- /dev/null
+++ b/lib/matplotlib/layout_engine.py
@@ -0,0 +1,286 @@
+"""
+Classes to layout elements in a `.Figure`.
+
+Figures have a ``layout_engine`` property that holds a subclass of
+`~.LayoutEngine` defined here (or *None* for no layout).  At draw time
+``figure.get_layout_engine().execute()`` is called, the goal of which is
+usually to rearrange Axes on the figure to produce a pleasing layout. This is
+like a ``draw`` callback, however when printing we disable the layout engine
+for the final draw and it is useful to know the layout engine while the figure
+is being created, in particular to deal with colorbars.
+
+Matplotlib supplies two layout engines, `.TightLayoutEngine` and
+`.ConstrainedLayoutEngine`.  Third parties can create their own layout engine
+by subclassing `.LayoutEngine`.
+"""
+
+from contextlib import nullcontext
+
+import matplotlib as mpl
+import matplotlib._api as _api
+
+from matplotlib._constrained_layout import do_constrained_layout
+from matplotlib._tight_layout import (get_subplotspec_list,
+                                      get_tight_layout_figure)
+
+
+class LayoutEngine:
+    """
+    Base class for Matplotlib layout engines.
+
+    A layout engine can be passed to a figure at instantiation or at any time
+    with `~.figure.Figure.set_layout_engine`.  Once attached to a figure, the
+    layout engine ``execute`` function is called at draw time by
+    `~.figure.Figure.draw`, providing a special draw-time hook.
+
+    .. note::
+
+       However, note that layout engines affect the creation of colorbars, so
+       `~.figure.Figure.set_layout_engine` should be called before any
+       colorbars are created.
+
+    Currently, there are two properties of `LayoutEngine` classes that are
+    consulted while manipulating the figure:
+
+    - ``engine.colorbar_gridspec`` tells `.Figure.colorbar` whether to make the
+       axes using the gridspec method (see `.colorbar.make_axes_gridspec`) or
+       not (see `.colorbar.make_axes`);
+    - ``engine.adjust_compatible`` stops `.Figure.subplots_adjust` from being
+        run if it is not compatible with the layout engine.
+
+    To implement a custom `LayoutEngine`:
+
+    1. override ``_adjust_compatible`` and ``_colorbar_gridspec``
+    2. override `LayoutEngine.set` to update *self._params*
+    3. override `LayoutEngine.execute` with your implementation
+
+    """
+    # override these is sub-class
+    _adjust_compatible = None
+    _colorbar_gridspec = None
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self._params = {}
+
+    def set(self, **kwargs):
+        raise NotImplementedError
+
+    @property
+    def colorbar_gridspec(self):
+        """
+        Return a boolean if the layout engine creates colorbars using a
+        gridspec.
+        """
+        if self._colorbar_gridspec is None:
+            raise NotImplementedError
+        return self._colorbar_gridspec
+
+    @property
+    def adjust_compatible(self):
+        """
+        Return a boolean if the layout engine is compatible with
+        `~.Figure.subplots_adjust`.
+        """
+        if self._adjust_compatible is None:
+            raise NotImplementedError
+        return self._adjust_compatible
+
+    def get(self):
+        """
+        Return copy of the parameters for the layout engine.
+        """
+        return dict(self._params)
+
+    def execute(self, fig):
+        """
+        Execute the layout on the figure given by *fig*.
+        """
+        # subclasses must implement this.
+        raise NotImplementedError
+
+
+class PlaceHolderLayoutEngine(LayoutEngine):
+    """
+    This layout engine does not adjust the figure layout at all.
+
+    The purpose of this `.LayoutEngine` is to act as a place holder when the
+    user removes a layout engine to ensure an incompatible `.LayoutEngine` can
+    not be set later.
+
+    Parameters
+    ----------
+    adjust_compatible, colorbar_gridspec : bool
+        Allow the PlaceHolderLayoutEngine to mirror the behavior of whatever
+        layout engine it is replacing.
+
+    """
+    def __init__(self, adjust_compatible, colorbar_gridspec, **kwargs):
+        self._adjust_compatible = adjust_compatible
+        self._colorbar_gridspec = colorbar_gridspec
+        super().__init__(**kwargs)
+
+    def execute(self, fig):
+        return
+
+
+class TightLayoutEngine(LayoutEngine):
+    """
+    Implements the ``tight_layout`` geometry management.  See
+    :doc:`/tutorials/intermediate/tight_layout_guide` for details.
+    """
+    _adjust_compatible = True
+    _colorbar_gridspec = True
+
+    def __init__(self, *, pad=1.08, h_pad=None, w_pad=None,
+                 rect=(0, 0, 1, 1), **kwargs):
+        """
+        Initialize tight_layout engine.
+
+        Parameters
+        ----------
+        pad : float, 1.08
+            Padding between the figure edge and the edges of subplots, as a
+            fraction of the font size.
+        h_pad, w_pad : float
+            Padding (height/width) between edges of adjacent subplots.
+            Defaults to *pad*.
+        rect : tuple (left, bottom, right, top), default: (0, 0, 1, 1).
+            rectangle in normalized figure coordinates that the subplots
+            (including labels) will fit into.
+        """
+        super().__init__(**kwargs)
+        for td in ['pad', 'h_pad', 'w_pad', 'rect']:
+            # initialize these in case None is passed in above:
+            self._params[td] = None
+        self.set(pad=pad, h_pad=h_pad, w_pad=w_pad, rect=rect)
+
+    def execute(self, fig):
+        """
+        Execute tight_layout.
+
+        This decides the subplot parameters given the padding that
+        will allow the axes labels to not be covered by other labels
+        and axes.
+
+        Parameters
+        ----------
+        fig : `.Figure` to perform layout on.
+
+        See also: `.figure.Figure.tight_layout` and `.pyplot.tight_layout`.
+        """
+        info = self._params
+        subplotspec_list = get_subplotspec_list(fig.axes)
+        if None in subplotspec_list:
+            _api.warn_external("This figure includes Axes that are not "
+                               "compatible with tight_layout, so results "
+                               "might be incorrect.")
+        renderer = fig._get_renderer()
+        with getattr(renderer, "_draw_disabled", nullcontext)():
+            kwargs = get_tight_layout_figure(
+                fig, fig.axes, subplotspec_list, renderer,
+                pad=info['pad'], h_pad=info['h_pad'], w_pad=info['w_pad'],
+                rect=info['rect'])
+        if kwargs:
+            fig.subplots_adjust(**kwargs)
+
+    def set(self, *, pad=None, w_pad=None, h_pad=None, rect=None):
+        for td in self.set.__kwdefaults__:
+            if locals()[td] is not None:
+                self._params[td] = locals()[td]
+
+
+class ConstrainedLayoutEngine(LayoutEngine):
+    """
+    Implements the ``constrained_layout`` geometry management.  See
+    :doc:`/tutorials/intermediate/constrainedlayout_guide` for details.
+    """
+
+    _adjust_compatible = False
+    _colorbar_gridspec = False
+
+    def __init__(self, *, h_pad=None, w_pad=None,
+                 hspace=None, wspace=None, rect=(0, 0, 1, 1),
+                 compress=False, **kwargs):
+        """
+        Initialize ``constrained_layout`` settings.
+
+        Parameters
+        ----------
+        h_pad, w_pad : float
+            Padding around the axes elements in figure-normalized units.
+            Default to :rc:`figure.constrained_layout.h_pad` and
+            :rc:`figure.constrained_layout.w_pad`.
+        hspace, wspace : float
+            Fraction of the figure to dedicate to space between the
+            axes.  These are evenly spread between the gaps between the axes.
+            A value of 0.2 for a three-column layout would have a space
+            of 0.1 of the figure width between each column.
+            If h/wspace < h/w_pad, then the pads are used instead.
+            Default to :rc:`figure.constrained_layout.hspace` and
+            :rc:`figure.constrained_layout.wspace`.
+        rect : tuple of 4 floats
+            Rectangle in figure coordinates to perform constrained layout in
+            (left, bottom, width, height), each from 0-1.
+        compress : bool
+            Whether to shift Axes so that white space in between them is
+            removed. This is useful for simple grids of fixed-aspect Axes (e.g.
+            a grid of images).  See :ref:`compressed_layout`.
+        """
+        super().__init__(**kwargs)
+        # set the defaults:
+        self.set(w_pad=mpl.rcParams['figure.constrained_layout.w_pad'],
+                 h_pad=mpl.rcParams['figure.constrained_layout.h_pad'],
+                 wspace=mpl.rcParams['figure.constrained_layout.wspace'],
+                 hspace=mpl.rcParams['figure.constrained_layout.hspace'],
+                 rect=(0, 0, 1, 1))
+        # set anything that was passed in (None will be ignored):
+        self.set(w_pad=w_pad, h_pad=h_pad, wspace=wspace, hspace=hspace,
+                 rect=rect)
+        self._compress = compress
+
+    def execute(self, fig):
+        """
+        Perform constrained_layout and move and resize axes accordingly.
+
+        Parameters
+        ----------
+        fig : `.Figure` to perform layout on.
+        """
+        width, height = fig.get_size_inches()
+        # pads are relative to the current state of the figure...
+        w_pad = self._params['w_pad'] / width
+        h_pad = self._params['h_pad'] / height
+
+        return do_constrained_layout(fig, w_pad=w_pad, h_pad=h_pad,
+                                     wspace=self._params['wspace'],
+                                     hspace=self._params['hspace'],
+                                     rect=self._params['rect'],
+                                     compress=self._compress)
+
+    def set(self, *, h_pad=None, w_pad=None,
+            hspace=None, wspace=None, rect=None):
+        """
+        Set the pads for constrained_layout.
+
+        Parameters
+        ----------
+        h_pad, w_pad : float
+            Padding around the axes elements in figure-normalized units.
+            Default to :rc:`figure.constrained_layout.h_pad` and
+            :rc:`figure.constrained_layout.w_pad`.
+        hspace, wspace : float
+            Fraction of the figure to dedicate to space between the
+            axes.  These are evenly spread between the gaps between the axes.
+            A value of 0.2 for a three-column layout would have a space
+            of 0.1 of the figure width between each column.
+            If h/wspace < h/w_pad, then the pads are used instead.
+            Default to :rc:`figure.constrained_layout.hspace` and
+            :rc:`figure.constrained_layout.wspace`.
+        rect : tuple of 4 floats
+            Rectangle in figure coordinates to perform constrained layout in
+            (left, bottom, width, height), each from 0-1.
+        """
+        for td in self.set.__kwdefaults__:
+            if locals()[td] is not None:
+                self._params[td] = locals()[td]
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
index ff557816a865..9e5b903d59ab 100644
--- a/lib/matplotlib/legend.py
+++ b/lib/matplotlib/legend.py
@@ -28,22 +28,24 @@
 import numpy as np
 
 import matplotlib as mpl
-from matplotlib import _api, docstring, colors
+from matplotlib import _api, _docstring, colors, offsetbox
 from matplotlib.artist import Artist, allow_rasterization
 from matplotlib.cbook import silent_list
 from matplotlib.font_manager import FontProperties
 from matplotlib.lines import Line2D
 from matplotlib.patches import (Patch, Rectangle, Shadow, FancyBboxPatch,
                                 StepPatch)
-from matplotlib.collections import (LineCollection, RegularPolyCollection,
-                                    CircleCollection, PathCollection,
-                                    PolyCollection)
+from matplotlib.collections import (
+    Collection, CircleCollection, LineCollection, PathCollection,
+    PolyCollection, RegularPolyCollection)
+from matplotlib.text import Text
 from matplotlib.transforms import Bbox, BboxBase, TransformedBbox
 from matplotlib.transforms import BboxTransformTo, BboxTransformFrom
-
-from matplotlib.offsetbox import HPacker, VPacker, TextArea, DrawingArea
-from matplotlib.offsetbox import DraggableOffsetBox
-
+from matplotlib.offsetbox import (
+    AnchoredOffsetbox, DraggableOffsetBox,
+    HPacker, VPacker,
+    DrawingArea, TextArea,
+)
 from matplotlib.container import ErrorbarContainer, BarContainer, StemContainer
 from . import legend_handler
 
@@ -92,7 +94,7 @@ def _update_bbox_to_anchor(self, loc_in_canvas):
         self.legend.set_bbox_to_anchor(loc_in_bbox)
 
 
-docstring.interpd.update(_legend_kw_doc="""
+_docstring.interpd.update(_legend_kw_doc="""
 loc : str or pair of floats, default: :rc:`legend.loc` ('best' for axes, \
 'upper right' for figures)
     The location of the legend.
@@ -160,9 +162,12 @@ def _update_bbox_to_anchor(self, loc_in_canvas):
 
         loc='upper right', bbox_to_anchor=(0.5, 0.5)
 
-ncol : int, default: 1
+ncols : int, default: 1
     The number of columns that the legend has.
 
+    For backward compatibility, the spelling *ncol* is also supported
+    but it is discouraged. If both are given, *ncols* takes precedence.
+
 prop : None or `matplotlib.font_manager.FontProperties` or dict
     The font properties of the legend. If None (default), the current
     :data:`matplotlib.rcParams` will be used.
@@ -173,12 +178,15 @@ def _update_bbox_to_anchor(self, loc_in_canvas):
     absolute font size in points. String values are relative to the current
     default font size. This argument is only used if *prop* is not specified.
 
-labelcolor : str or list
+labelcolor : str or list, default: :rc:`legend.labelcolor`
     The color of the text in the legend. Either a valid color string
     (for example, 'red'), or a list of color strings. The labelcolor can
     also be made to match the color of the line or marker using 'linecolor',
     'markerfacecolor' (or 'mfc'), or 'markeredgecolor' (or 'mec').
 
+    Labelcolor can be set globally using :rc:`legend.labelcolor`. If None,
+    use :rc:`text.color`.
+
 numpoints : int, default: :rc:`legend.numpoints`
     The number of marker points in the legend when creating a legend
     entry for a `.Line2D` (line).
@@ -205,7 +213,7 @@ def _update_bbox_to_anchor(self, loc_in_canvas):
     Whether the legend should be drawn on a patch (frame).
 
 fancybox : bool, default: :rc:`legend.fancybox`
-    Whether round edges should be enabled around the `~.FancyBboxPatch` which
+    Whether round edges should be enabled around the `.FancyBboxPatch` which
     makes up the legend's background.
 
 shadow : bool, default: :rc:`legend.shadow`
@@ -237,9 +245,21 @@ def _update_bbox_to_anchor(self, loc_in_canvas):
 title : str or None
     The legend's title. Default is no title (``None``).
 
+title_fontproperties : None or `matplotlib.font_manager.FontProperties` or dict
+    The font properties of the legend's title. If None (default), the
+    *title_fontsize* argument will be used if present; if *title_fontsize* is
+    also None, the current :rc:`legend.title_fontsize` will be used.
+
 title_fontsize : int or {'xx-small', 'x-small', 'small', 'medium', 'large', \
 'x-large', 'xx-large'}, default: :rc:`legend.title_fontsize`
     The font size of the legend's title.
+    Note: This cannot be combined with *title_fontproperties*. If you want
+    to set the fontsize alongside other font properties, use the *size*
+    parameter in *title_fontproperties*.
+
+alignment : {'center', 'left', 'right'}, default: 'center'
+    The alignment of the legend title and the box of entries. The entries
+    are aligned as a single block, so that markers always lined up.
 
 borderpad : float, default: :rc:`legend.borderpad`
     The fractional whitespace inside the legend border, in font-size units.
@@ -250,6 +270,9 @@ def _update_bbox_to_anchor(self, loc_in_canvas):
 handlelength : float, default: :rc:`legend.handlelength`
     The length of the legend handles, in font-size units.
 
+handleheight : float, default: :rc:`legend.handleheight`
+    The height of the legend handles, in font-size units.
+
 handletextpad : float, default: :rc:`legend.handletextpad`
     The pad between the legend handle and text, in font-size units.
 
@@ -269,70 +292,58 @@ def _update_bbox_to_anchor(self, loc_in_canvas):
 class Legend(Artist):
     """
     Place a legend on the axes at location loc.
-
     """
-    codes = {'best':         0,  # only implemented for axes legends
-             'upper right':  1,
-             'upper left':   2,
-             'lower left':   3,
-             'lower right':  4,
-             'right':        5,
-             'center left':  6,
-             'center right': 7,
-             'lower center': 8,
-             'upper center': 9,
-             'center':       10,
-             }
 
+    # 'best' is only implemented for axes legends
+    codes = {'best': 0, **AnchoredOffsetbox.codes}
     zorder = 5
 
     def __str__(self):
         return "Legend"
 
-    @docstring.dedent_interpd
-    def __init__(self, parent, handles, labels,
-                 loc=None,
-                 numpoints=None,    # the number of points in the legend line
-                 markerscale=None,  # the relative size of legend markers
-                                    # vs. original
-                 markerfirst=True,  # controls ordering (left-to-right) of
-                                    # legend marker and label
-                 scatterpoints=None,    # number of scatter points
-                 scatteryoffsets=None,
-                 prop=None,          # properties for the legend texts
-                 fontsize=None,      # keyword to set font size directly
-                 labelcolor=None,    # keyword to set the text color
-
-                 # spacing & pad defined as a fraction of the font-size
-                 borderpad=None,      # the whitespace inside the legend border
-                 labelspacing=None,   # the vertical space between the legend
-                                      # entries
-                 handlelength=None,   # the length of the legend handles
-                 handleheight=None,   # the height of the legend handles
-                 handletextpad=None,  # the pad between the legend handle
-                                      # and text
-                 borderaxespad=None,  # the pad between the axes and legend
-                                      # border
-                 columnspacing=None,  # spacing between columns
-
-                 ncol=1,     # number of columns
-                 mode=None,  # mode for horizontal distribution of columns.
-                             # None, "expand"
-
-                 fancybox=None,  # True use a fancy box, false use a rounded
-                                 # box, none use rc
-                 shadow=None,
-                 title=None,  # set a title for the legend
-                 title_fontsize=None,  # the font size for the title
-                 framealpha=None,  # set frame alpha
-                 edgecolor=None,  # frame patch edgecolor
-                 facecolor=None,  # frame patch facecolor
-
-                 bbox_to_anchor=None,  # bbox that the legend will be anchored.
-                 bbox_transform=None,  # transform for the bbox
-                 frameon=None,  # draw frame
-                 handler_map=None,
-                 ):
+    @_api.make_keyword_only("3.6", "loc")
+    @_docstring.dedent_interpd
+    def __init__(
+        self, parent, handles, labels,
+        loc=None,
+        numpoints=None,      # number of points in the legend line
+        markerscale=None,    # relative size of legend markers vs. original
+        markerfirst=True,    # left/right ordering of legend marker and label
+        scatterpoints=None,  # number of scatter points
+        scatteryoffsets=None,
+        prop=None,           # properties for the legend texts
+        fontsize=None,       # keyword to set font size directly
+        labelcolor=None,     # keyword to set the text color
+
+        # spacing & pad defined as a fraction of the font-size
+        borderpad=None,      # whitespace inside the legend border
+        labelspacing=None,   # vertical space between the legend entries
+        handlelength=None,   # length of the legend handles
+        handleheight=None,   # height of the legend handles
+        handletextpad=None,  # pad between the legend handle and text
+        borderaxespad=None,  # pad between the axes and legend border
+        columnspacing=None,  # spacing between columns
+
+        ncols=1,     # number of columns
+        mode=None,  # horizontal distribution of columns: None or "expand"
+
+        fancybox=None,  # True: fancy box, False: rounded box, None: rcParam
+        shadow=None,
+        title=None,           # legend title
+        title_fontsize=None,  # legend title font size
+        framealpha=None,      # set frame alpha
+        edgecolor=None,       # frame patch edgecolor
+        facecolor=None,       # frame patch facecolor
+
+        bbox_to_anchor=None,  # bbox to which the legend will be anchored
+        bbox_transform=None,  # transform for the bbox
+        frameon=None,         # draw frame
+        handler_map=None,
+        title_fontproperties=None,  # properties for the legend title
+        alignment="center",       # control the alignment within the legend box
+        *,
+        ncol=1  # synonym for ncols (backward compatibility)
+    ):
         """
         Parameters
         ----------
@@ -355,7 +366,7 @@ def __init__(self, parent, handles, labels,
         -----
         Users can specify any arbitrary location for the legend using the
         *bbox_to_anchor* keyword argument. *bbox_to_anchor* can be a
-        `.BboxBase` (or derived therefrom) or a tuple of 2 or 4 floats.
+        `.BboxBase` (or derived there from) or a tuple of 2 or 4 floats.
         See `set_bbox_to_anchor` for more detail.
 
         The legend location can be specified by setting *loc* with a tuple of
@@ -364,7 +375,7 @@ def __init__(self, parent, handles, labels,
         """
         # local import only to avoid circularity
         from matplotlib.axes import Axes
-        from matplotlib.figure import Figure
+        from matplotlib.figure import FigureBase
 
         super().__init__()
 
@@ -389,24 +400,27 @@ def __init__(self, parent, handles, labels,
         #: instance.
         self._custom_handler_map = handler_map
 
-        locals_view = locals()
-        for name in ["numpoints", "markerscale", "shadow", "columnspacing",
-                     "scatterpoints", "handleheight", 'borderpad',
-                     'labelspacing', 'handlelength', 'handletextpad',
-                     'borderaxespad']:
-            if locals_view[name] is None:
-                value = mpl.rcParams["legend." + name]
-            else:
-                value = locals_view[name]
-            setattr(self, name, value)
-        del locals_view
+        def val_or_rc(val, rc_name):
+            return val if val is not None else mpl.rcParams[rc_name]
+
+        self.numpoints = val_or_rc(numpoints, 'legend.numpoints')
+        self.markerscale = val_or_rc(markerscale, 'legend.markerscale')
+        self.scatterpoints = val_or_rc(scatterpoints, 'legend.scatterpoints')
+        self.borderpad = val_or_rc(borderpad, 'legend.borderpad')
+        self.labelspacing = val_or_rc(labelspacing, 'legend.labelspacing')
+        self.handlelength = val_or_rc(handlelength, 'legend.handlelength')
+        self.handleheight = val_or_rc(handleheight, 'legend.handleheight')
+        self.handletextpad = val_or_rc(handletextpad, 'legend.handletextpad')
+        self.borderaxespad = val_or_rc(borderaxespad, 'legend.borderaxespad')
+        self.columnspacing = val_or_rc(columnspacing, 'legend.columnspacing')
+        self.shadow = val_or_rc(shadow, 'legend.shadow')
         # trim handles and labels if illegal label...
         _lab, _hand = [], []
         for label, handle in zip(labels, handles):
             if isinstance(label, str) and label.startswith('_'):
-                _api.warn_external('The handle {!r} has a label of {!r} '
-                                   'which cannot be automatically added to'
-                                   ' the legend.'.format(handle, label))
+                _api.warn_external(f"The label {label!r} of {handle!r} starts "
+                                   "with '_'. It is thus excluded from the "
+                                   "legend.")
             else:
                 _lab.append(label)
                 _hand.append(handle)
@@ -414,8 +428,8 @@ def __init__(self, parent, handles, labels,
 
         handles = list(handles)
         if len(handles) < 2:
-            ncol = 1
-        self._ncol = ncol
+            ncols = 1
+        self._ncols = ncols if ncols != 1 else ncol
 
         if self.numpoints <= 0:
             raise ValueError("numpoints must be > 0; it was %d" % numpoints)
@@ -438,11 +452,13 @@ def __init__(self, parent, handles, labels,
             self.isaxes = True
             self.axes = parent
             self.set_figure(parent.figure)
-        elif isinstance(parent, Figure):
+        elif isinstance(parent, FigureBase):
             self.isaxes = False
             self.set_figure(parent)
         else:
-            raise TypeError("Legend needs either Axes or Figure as parent")
+            raise TypeError(
+                "Legend needs either Axes or FigureBase as parent"
+            )
         self.parent = parent
 
         self._loc_used_default = loc is None
@@ -451,16 +467,11 @@ def __init__(self, parent, handles, labels,
             if not self.isaxes and loc in [0, 'best']:
                 loc = 'upper right'
         if isinstance(loc, str):
-            if loc not in self.codes:
-                raise ValueError(
-                    "Unrecognized location {!r}. Valid locations are\n\t{}\n"
-                    .format(loc, '\n\t'.join(self.codes)))
-            else:
-                loc = self.codes[loc]
+            loc = _api.check_getitem(self.codes, loc=loc)
         if not self.isaxes and loc == 0:
             raise ValueError(
                 "Automatic legend placement (loc='best') not implemented for "
-                "figure legend.")
+                "figure legend")
 
         self._mode = mode
         self.set_bbox_to_anchor(bbox_to_anchor, bbox_transform)
@@ -499,6 +510,9 @@ def __init__(self, parent, handles, labels,
         )
         self._set_artist_props(self.legendPatch)
 
+        _api.check_in_list(["center", "left", "right"], alignment=alignment)
+        self._alignment = alignment
+
         # init with null renderer
         self._init_legend_box(handles, labels, markerfirst)
 
@@ -506,11 +520,23 @@ def __init__(self, parent, handles, labels,
         self._set_loc(loc)
         self._loc_used_default = tmp  # ignore changes done by _set_loc
 
-        # figure out title fontsize:
-        if title_fontsize is None:
-            title_fontsize = mpl.rcParams['legend.title_fontsize']
-        tprop = FontProperties(size=title_fontsize)
-        self.set_title(title, prop=tprop)
+        # figure out title font properties:
+        if title_fontsize is not None and title_fontproperties is not None:
+            raise ValueError(
+                "title_fontsize and title_fontproperties can't be specified "
+                "at the same time. Only use one of them. ")
+        title_prop_fp = FontProperties._from_any(title_fontproperties)
+        if isinstance(title_fontproperties, dict):
+            if "size" not in title_fontproperties:
+                title_fontsize = mpl.rcParams["legend.title_fontsize"]
+                title_prop_fp.set_size(title_fontsize)
+        elif title_fontsize is not None:
+            title_prop_fp.set_size(title_fontsize)
+        elif not isinstance(title_fontproperties, FontProperties):
+            title_fontsize = mpl.rcParams["legend.title_fontsize"]
+            title_prop_fp.set_size(title_fontsize)
+
+        self.set_title(title, prop=title_prop_fp)
         self._draggable = None
 
         # set the text color
@@ -523,8 +549,11 @@ def __init__(self, parent, handles, labels,
             'mec':             ['get_markeredgecolor', 'get_edgecolor'],
         }
         if labelcolor is None:
-            pass
-        elif isinstance(labelcolor, str) and labelcolor in color_getters:
+            if mpl.rcParams['legend.labelcolor'] is not None:
+                labelcolor = mpl.rcParams['legend.labelcolor']
+            else:
+                labelcolor = mpl.rcParams['text.color']
+        if isinstance(labelcolor, str) and labelcolor in color_getters:
             getter_names = color_getters[labelcolor]
             for handle, text in zip(self.legendHandles, self.texts):
                 for getter_name in getter_names:
@@ -534,14 +563,16 @@ def __init__(self, parent, handles, labels,
                         break
                     except AttributeError:
                         pass
+        elif isinstance(labelcolor, str) and labelcolor == 'none':
+            for text in self.texts:
+                text.set_color(labelcolor)
         elif np.iterable(labelcolor):
             for text, color in zip(self.texts,
                                    itertools.cycle(
                                        colors.to_rgba_array(labelcolor))):
                 text.set_color(color)
         else:
-            raise ValueError("Invalid argument for labelcolor : %s" %
-                             str(labelcolor))
+            raise ValueError(f"Invalid labelcolor: {labelcolor!r}")
 
     def _set_artist_props(self, a):
         """
@@ -563,6 +594,10 @@ def _set_loc(self, loc):
         self.stale = True
         self._legend_box.set_offset(self._findoffset)
 
+    def set_ncols(self, ncols):
+        """Set the number of columns."""
+        self._ncols = ncols
+
     def _get_loc(self):
         return self._loc_real
 
@@ -604,7 +639,7 @@ def draw(self, renderer):
         # update the location and size of the legend. This needs to
         # be done in any case to clip the figure right.
         bbox = self._legend_box.get_window_extent(renderer)
-        self.legendPatch.set_bounds(bbox.x0, bbox.y0, bbox.width, bbox.height)
+        self.legendPatch.set_bounds(bbox.bounds)
         self.legendPatch.set_mutation_scale(fontsize)
 
         if self.shadow:
@@ -640,38 +675,24 @@ def draw(self, renderer):
 
     @classmethod
     def get_default_handler_map(cls):
-        """
-        A class method that returns the default handler map.
-        """
+        """Return the global default handler map, shared by all legends."""
         return cls._default_handler_map
 
     @classmethod
     def set_default_handler_map(cls, handler_map):
-        """
-        A class method to set the default handler map.
-        """
+        """Set the global default handler map, shared by all legends."""
         cls._default_handler_map = handler_map
 
     @classmethod
     def update_default_handler_map(cls, handler_map):
-        """
-        A class method to update the default handler map.
-        """
+        """Update the global default handler map, shared by all legends."""
         cls._default_handler_map.update(handler_map)
 
     def get_legend_handler_map(self):
-        """
-        Return the handler map.
-        """
-
+        """Return this legend instance's handler map."""
         default_handler_map = self.get_default_handler_map()
-
-        if self._custom_handler_map:
-            hm = default_handler_map.copy()
-            hm.update(self._custom_handler_map)
-            return hm
-        else:
-            return default_handler_map
+        return ({**default_handler_map, **self._custom_handler_map}
+                if self._custom_handler_map else default_handler_map)
 
     @staticmethod
     def get_legend_handler(legend_handler_map, orig_handle):
@@ -709,27 +730,19 @@ def _init_legend_box(self, handles, labels, markerfirst=True):
 
         fontsize = self._fontsize
 
-        # legend_box is a HPacker, horizontally packed with
-        # columns. Each column is a VPacker, vertically packed with
-        # legend items. Each legend item is HPacker packed with
-        # legend handleBox and labelBox. handleBox is an instance of
-        # offsetbox.DrawingArea which contains legend handle. labelBox
-        # is an instance of offsetbox.TextArea which contains legend
-        # text.
+        # legend_box is a HPacker, horizontally packed with columns.
+        # Each column is a VPacker, vertically packed with legend items.
+        # Each legend item is a HPacker packed with:
+        # - handlebox: a DrawingArea which contains the legend handle.
+        # - labelbox: a TextArea which contains the legend text.
 
         text_list = []  # the list of text instances
-        handle_list = []  # the list of text instances
+        handle_list = []  # the list of handle instances
         handles_and_labels = []
 
-        label_prop = dict(verticalalignment='baseline',
-                          horizontalalignment='left',
-                          fontproperties=self.prop,
-                          )
-
         # The approximate height and descent of text. These values are
         # only used for plotting the legend handle.
-        descent = 0.35 * fontsize * (self.handleheight - 0.7)
-        # 0.35 and 0.7 are just heuristic numbers and may need to be improved.
+        descent = 0.35 * fontsize * (self.handleheight - 0.7)  # heuristic.
         height = fontsize * self.handleheight - descent
         # each handle needs to be drawn inside a box of (x, y, w, h) =
         # (0, -descent, width, height).  And their coordinates should
@@ -741,21 +754,24 @@ def _init_legend_box(self, handles, labels, markerfirst=True):
         # manually set their transform to the self.get_transform().
         legend_handler_map = self.get_legend_handler_map()
 
-        for orig_handle, lab in zip(handles, labels):
+        for orig_handle, label in zip(handles, labels):
             handler = self.get_legend_handler(legend_handler_map, orig_handle)
             if handler is None:
                 _api.warn_external(
-                    "Legend does not support {!r} instances.\nA proxy artist "
-                    "may be used instead.\nSee: "
-                    "https://matplotlib.org/users/legend_guide.html"
-                    "#creating-artists-specifically-for-adding-to-the-legend-"
-                    "aka-proxy-artists".format(orig_handle))
-                # We don't have a handle for this artist, so we just defer
-                # to None.
+                             "Legend does not support handles for {0} "
+                             "instances.\nA proxy artist may be used "
+                             "instead.\nSee: https://matplotlib.org/"
+                             "stable/tutorials/intermediate/legend_guide.html"
+                             "#controlling-the-legend-entries".format(
+                                 type(orig_handle).__name__))
+                # No handle for this artist, so we just defer to None.
                 handle_list.append(None)
             else:
-                textbox = TextArea(lab, textprops=label_prop,
-                                   multilinebaseline=True)
+                textbox = TextArea(label, multilinebaseline=True,
+                                   textprops=dict(
+                                       verticalalignment='baseline',
+                                       horizontalalignment='left',
+                                       fontproperties=self.prop))
                 handlebox = DrawingArea(width=self.handlelength * fontsize,
                                         height=height,
                                         xdescent=0., ydescent=descent)
@@ -767,34 +783,25 @@ def _init_legend_box(self, handles, labels, markerfirst=True):
                                                          fontsize, handlebox))
                 handles_and_labels.append((handlebox, textbox))
 
-        if handles_and_labels:
-            # We calculate number of rows in each column. The first
-            # (num_largecol) columns will have (nrows+1) rows, and remaining
-            # (num_smallcol) columns will have (nrows) rows.
-            ncol = min(self._ncol, len(handles_and_labels))
-            nrows, num_largecol = divmod(len(handles_and_labels), ncol)
-            num_smallcol = ncol - num_largecol
-            # starting index of each column and number of rows in it.
-            rows_per_col = [nrows + 1] * num_largecol + [nrows] * num_smallcol
-            start_idxs = np.concatenate([[0], np.cumsum(rows_per_col)[:-1]])
-            cols = zip(start_idxs, rows_per_col)
-        else:
-            cols = []
-
         columnbox = []
-        for i0, di in cols:
-            # pack handleBox and labelBox into itemBox
-            itemBoxes = [HPacker(pad=0,
+        # array_split splits n handles_and_labels into ncols columns, with the
+        # first n%ncols columns having an extra entry.  filter(len, ...)
+        # handles the case where n < ncols: the last ncols-n columns are empty
+        # and get filtered out.
+        for handles_and_labels_column in filter(
+                len, np.array_split(handles_and_labels, self._ncols)):
+            # pack handlebox and labelbox into itembox
+            itemboxes = [HPacker(pad=0,
                                  sep=self.handletextpad * fontsize,
                                  children=[h, t] if markerfirst else [t, h],
                                  align="baseline")
-                         for h, t in handles_and_labels[i0:i0 + di]]
-            # pack columnBox
+                         for h, t in handles_and_labels_column]
+            # pack columnbox
             alignment = "baseline" if markerfirst else "right"
             columnbox.append(VPacker(pad=0,
                                      sep=self.labelspacing * fontsize,
                                      align=alignment,
-                                     children=itemBoxes))
+                                     children=itemboxes))
 
         mode = "expand" if self._mode == "expand" else "fixed"
         sep = self.columnspacing * fontsize
@@ -805,10 +812,11 @@ def _init_legend_box(self, handles, labels, markerfirst=True):
         self._legend_title_box = TextArea("")
         self._legend_box = VPacker(pad=self.borderpad * fontsize,
                                    sep=self.labelspacing * fontsize,
-                                   align="center",
+                                   align=self._alignment,
                                    children=[self._legend_title_box,
                                              self._legend_handle_box])
         self._legend_box.set_figure(self.figure)
+        self._legend_box.axes = self.axes
         self.texts = text_list
         self.legendHandles = handle_list
 
@@ -826,18 +834,23 @@ def _auto_legend_data(self):
             List of (x, y) offsets of all collection.
         """
         assert self.isaxes  # always holds, as this is only called internally
-        ax = self.parent
-        lines = [line.get_transform().transform_path(line.get_path())
-                 for line in ax.lines]
-        bboxes = [patch.get_bbox().transformed(patch.get_data_transform())
-                  if isinstance(patch, Rectangle) else
-                  patch.get_path().get_extents(patch.get_transform())
-                  for patch in ax.patches]
+        bboxes = []
+        lines = []
         offsets = []
-        for handle in ax.collections:
-            _, transOffset, hoffsets, _ = handle._prepare_points()
-            for offset in transOffset.transform(hoffsets):
-                offsets.append(offset)
+        for artist in self.parent._children:
+            if isinstance(artist, Line2D):
+                lines.append(
+                    artist.get_transform().transform_path(artist.get_path()))
+            elif isinstance(artist, Rectangle):
+                bboxes.append(
+                    artist.get_bbox().transformed(artist.get_data_transform()))
+            elif isinstance(artist, Patch):
+                bboxes.append(
+                    artist.get_path().get_extents(artist.get_transform()))
+            elif isinstance(artist, Collection):
+                _, offset_trf, hoffsets, _ = artist._prepare_points()
+                for offset in offset_trf.transform(hoffsets):
+                    offsets.append(offset)
         return bboxes, lines, offsets
 
     def get_children(self):
@@ -862,10 +875,41 @@ def get_texts(self):
         r"""Return the list of `~.text.Text`\s in the legend."""
         return silent_list('Text', self.texts)
 
+    def set_alignment(self, alignment):
+        """
+        Set the alignment of the legend title and the box of entries.
+
+        The entries are aligned as a single block, so that markers always
+        lined up.
+
+        Parameters
+        ----------
+        alignment : {'center', 'left', 'right'}.
+
+        """
+        _api.check_in_list(["center", "left", "right"], alignment=alignment)
+        self._alignment = alignment
+        self._legend_box.align = alignment
+
+    def get_alignment(self):
+        """Get the alignment value of the legend box"""
+        return self._legend_box.align
+
     def set_title(self, title, prop=None):
         """
-        Set the legend title. Fontproperties can be optionally set
-        with *prop* parameter.
+        Set legend title and title style.
+
+        Parameters
+        ----------
+        title : str
+            The legend title.
+
+        prop : `.font_manager.FontProperties` or `str` or `pathlib.Path`
+            The font properties of the legend title.
+            If a `str`, it is interpreted as a fontconfig pattern parsed by
+            `.FontProperties`.  If a `pathlib.Path`, it is interpreted as the
+            absolute path to a font file.
+
         """
         self._legend_title_box._text.set_text(title)
         if title:
@@ -887,24 +931,11 @@ def get_title(self):
     def get_window_extent(self, renderer=None):
         # docstring inherited
         if renderer is None:
-            renderer = self.figure._cachedRenderer
+            renderer = self.figure._get_renderer()
         return self._legend_box.get_window_extent(renderer=renderer)
 
-    def get_tightbbox(self, renderer):
-        """
-        Like `.Legend.get_window_extent`, but uses the box for the legend.
-
-        Parameters
-        ----------
-        renderer : `.RendererBase` subclass
-            renderer that will be used to draw the figures (i.e.
-            ``fig.canvas.get_renderer()``)
-
-        Returns
-        -------
-        `.BboxBase`
-            The bounding box in figure pixel coordinates.
-        """
+    def get_tightbbox(self, renderer=None):
+        # docstring inherited
         return self._legend_box.get_window_extent(renderer)
 
     def get_frame_on(self):
@@ -960,8 +991,7 @@ def set_bbox_to_anchor(self, bbox, transform=None):
             try:
                 l = len(bbox)
             except TypeError as err:
-                raise ValueError("Invalid argument for bbox : %s" %
-                                 str(bbox)) from err
+                raise ValueError(f"Invalid bbox: {bbox}") from err
 
             if l == 2:
                 bbox = [bbox[0], bbox[1], 0, 0]
@@ -989,29 +1019,10 @@ def _get_anchored_bbox(self, loc, bbox, parentbbox, renderer):
             bbox to be placed, in display coordinates.
         parentbbox : `~matplotlib.transforms.Bbox`
             A parent box which will contain the bbox, in display coordinates.
-
         """
-        assert loc in range(1, 11)  # called only internally
-
-        BEST, UR, UL, LL, LR, R, CL, CR, LC, UC, C = range(11)
-
-        anchor_coefs = {UR: "NE",
-                        UL: "NW",
-                        LL: "SW",
-                        LR: "SE",
-                        R: "E",
-                        CL: "W",
-                        CR: "E",
-                        LC: "S",
-                        UC: "N",
-                        C: "C"}
-
-        c = anchor_coefs[loc]
-
-        fontsize = renderer.points_to_pixels(self._fontsize)
-        container = parentbbox.padded(-self.borderaxespad * fontsize)
-        anchored_box = bbox.anchored(c, container=container)
-        return anchored_box.x0, anchored_box.y0
+        return offsetbox._get_anchored_bbox(
+            loc, bbox, parentbbox,
+            self.borderaxespad * renderer.points_to_pixels(self._fontsize))
 
     def _find_best_position(self, width, height, renderer, consider=None):
         """
@@ -1107,43 +1118,43 @@ def get_draggable(self):
 # Helper functions to parse legend arguments for both `figure.legend` and
 # `axes.legend`:
 def _get_legend_handles(axs, legend_handler_map=None):
-    """
-    Return a generator of artists that can be used as handles in
-    a legend.
-
-    """
+    """Yield artists that can be used as handles in a legend."""
     handles_original = []
     for ax in axs:
-        handles_original += (ax.lines + ax.patches +
-                             ax.collections + ax.containers)
+        handles_original += [
+            *(a for a in ax._children
+              if isinstance(a, (Line2D, Patch, Collection, Text))),
+            *ax.containers]
         # support parasite axes:
         if hasattr(ax, 'parasites'):
             for axx in ax.parasites:
-                handles_original += (axx.lines + axx.patches +
-                                     axx.collections + axx.containers)
-
-    handler_map = Legend.get_default_handler_map()
-
-    if legend_handler_map is not None:
-        handler_map = handler_map.copy()
-        handler_map.update(legend_handler_map)
+                handles_original += [
+                    *(a for a in axx._children
+                      if isinstance(a, (Line2D, Patch, Collection, Text))),
+                    *axx.containers]
 
+    handler_map = {**Legend.get_default_handler_map(),
+                   **(legend_handler_map or {})}
     has_handler = Legend.get_legend_handler
-
     for handle in handles_original:
         label = handle.get_label()
         if label != '_nolegend_' and has_handler(handler_map, handle):
             yield handle
+        elif (label and not label.startswith('_') and
+                not has_handler(handler_map, handle)):
+            _api.warn_external(
+                             "Legend does not support handles for {0} "
+                             "instances.\nSee: https://matplotlib.org/stable/"
+                             "tutorials/intermediate/legend_guide.html"
+                             "#implementing-a-custom-legend-handler".format(
+                                 type(handle).__name__))
+            continue
 
 
 def _get_legend_handles_labels(axs, legend_handler_map=None):
-    """
-    Return handles and labels for legend, internal method.
-
-    """
+    """Return handles and labels for legend."""
     handles = []
     labels = []
-
     for handle in _get_legend_handles(axs, legend_handler_map):
         label = handle.get_label()
         if label and not label.startswith('_'):
@@ -1199,7 +1210,7 @@ def _parse_legend_args(axs, *args, handles=None, labels=None, **kwargs):
     """
     log = logging.getLogger(__name__)
 
-    handlers = kwargs.get('handler_map', {}) or {}
+    handlers = kwargs.get('handler_map')
     extra_args = ()
 
     if (handles is not None or labels is not None) and args:
@@ -1222,7 +1233,10 @@ def _parse_legend_args(axs, *args, handles=None, labels=None, **kwargs):
     elif len(args) == 0:
         handles, labels = _get_legend_handles_labels(axs, handlers)
         if not handles:
-            log.warning('No handles with labels found to put in legend.')
+            log.warning(
+                "No artists with labels found to put in legend.  Note that "
+                "artists whose label start with an underscore are ignored "
+                "when legend() is called with no argument.")
 
     # One argument. User defined labels - automatic handle detection.
     elif len(args) == 1:
diff --git a/lib/matplotlib/legend_handler.py b/lib/matplotlib/legend_handler.py
index 45fb759d7b23..c21c6d1212d3 100644
--- a/lib/matplotlib/legend_handler.py
+++ b/lib/matplotlib/legend_handler.py
@@ -1,8 +1,12 @@
 """
 Default legend handlers.
 
-It is strongly encouraged to have read the :doc:`legend guide
-</tutorials/intermediate/legend_guide>` before this documentation.
+.. important::
+
+    This is a low-level legend API, which most end users do not need.
+
+    We recommend that you are familiar with the :doc:`legend guide
+    </tutorials/intermediate/legend_guide>` before reading this documentation.
 
 Legend handlers are expected to be a callable object with a following
 signature. ::
@@ -23,15 +27,15 @@
     def legend_artist(self, legend, orig_handle, fontsize, handlebox)
 """
 
+from collections.abc import Sequence
 from itertools import cycle
 
 import numpy as np
 
-from matplotlib import cbook
+from matplotlib import _api, cbook
 from matplotlib.lines import Line2D
 from matplotlib.patches import Rectangle
 import matplotlib.collections as mcoll
-import matplotlib.colors as mcolors
 
 
 def update_from_first_child(tgt, src):
@@ -116,6 +120,9 @@ def legend_artist(self, legend, orig_handle,
                                       xdescent, ydescent, width, height,
                                       fontsize, handlebox.get_transform())
 
+        if isinstance(artists, _Line2DHandleList):
+            artists = [artists[0]]
+
         # create_artists will return a list of artists.
         for a in artists:
             handlebox.add_artist(a)
@@ -133,21 +140,19 @@ class HandlerNpoints(HandlerBase):
     """
     A legend handler that shows *numpoints* points in the legend entry.
     """
-    def __init__(self, marker_pad=0.3, numpoints=None, **kw):
+
+    def __init__(self, marker_pad=0.3, numpoints=None, **kwargs):
         """
         Parameters
         ----------
         marker_pad : float
             Padding between points in legend entry.
-
         numpoints : int
             Number of points to show in legend entry.
-
-        Notes
-        -----
-        Any other keyword arguments are given to `HandlerBase`.
+        **kwargs
+            Keyword arguments forwarded to `.HandlerBase`.
         """
-        super().__init__(**kw)
+        super().__init__(**kwargs)
 
         self._numpoints = numpoints
         self._marker_pad = marker_pad
@@ -178,22 +183,20 @@ class HandlerNpointsYoffsets(HandlerNpoints):
     A legend handler that shows *numpoints* in the legend, and allows them to
     be individually offset in the y-direction.
     """
-    def __init__(self, numpoints=None, yoffsets=None, **kw):
+
+    def __init__(self, numpoints=None, yoffsets=None, **kwargs):
         """
         Parameters
         ----------
         numpoints : int
             Number of points to show in legend entry.
-
         yoffsets : array of floats
             Length *numpoints* list of y offsets for each point in
             legend entry.
-
-        Notes
-        -----
-        Any other keyword arguments are given to `HandlerNpoints`.
+        **kwargs
+            Keyword arguments forwarded to `.HandlerNpoints`.
         """
-        super().__init__(numpoints=numpoints, **kw)
+        super().__init__(numpoints=numpoints, **kwargs)
         self._yoffsets = yoffsets
 
     def get_ydata(self, legend, xdescent, ydescent, width, height, fontsize):
@@ -205,25 +208,11 @@ def get_ydata(self, legend, xdescent, ydescent, width, height, fontsize):
         return ydata
 
 
-class HandlerLine2D(HandlerNpoints):
+class HandlerLine2DCompound(HandlerNpoints):
     """
-    Handler for `.Line2D` instances.
+    Original handler for `.Line2D` instances, that relies on combining
+    a line-only with a marker-only artist.  May be deprecated in the future.
     """
-    def __init__(self, marker_pad=0.3, numpoints=None, **kw):
-        """
-        Parameters
-        ----------
-        marker_pad : float
-            Padding between points in legend entry.
-
-        numpoints : int
-            Number of points to show in legend entry.
-
-        Notes
-        -----
-        Any other keyword arguments are given to `HandlerNpoints`.
-        """
-        super().__init__(marker_pad=marker_pad, numpoints=numpoints, **kw)
 
     def create_artists(self, legend, orig_handle,
                        xdescent, ydescent, width, height, fontsize,
@@ -256,11 +245,69 @@ def create_artists(self, legend, orig_handle,
         return [legline, legline_marker]
 
 
+class _Line2DHandleList(Sequence):
+    def __init__(self, legline):
+        self._legline = legline
+
+    def __len__(self):
+        return 2
+
+    def __getitem__(self, index):
+        if index != 0:
+            # Make HandlerLine2D return [self._legline] directly after
+            # deprecation elapses.
+            _api.warn_deprecated(
+                "3.5", message="Access to the second element returned by "
+                "HandlerLine2D is deprecated since %(since)s; it will be "
+                "removed %(removal)s.")
+        return [self._legline, self._legline][index]
+
+
+class HandlerLine2D(HandlerNpoints):
+    """
+    Handler for `.Line2D` instances.
+
+    See Also
+    --------
+    HandlerLine2DCompound : An earlier handler implementation, which used one
+                            artist for the line and another for the marker(s).
+    """
+
+    def create_artists(self, legend, orig_handle,
+                       xdescent, ydescent, width, height, fontsize,
+                       trans):
+
+        xdata, xdata_marker = self.get_xdata(legend, xdescent, ydescent,
+                                             width, height, fontsize)
+
+        markevery = None
+        if self.get_numpoints(legend) == 1:
+            # Special case: one wants a single marker in the center
+            # and a line that extends on both sides. One will use a
+            # 3 points line, but only mark the #1 (i.e. middle) point.
+            xdata = np.linspace(xdata[0], xdata[-1], 3)
+            markevery = [1]
+
+        ydata = np.full_like(xdata, (height - ydescent) / 2)
+        legline = Line2D(xdata, ydata, markevery=markevery)
+
+        self.update_prop(legline, orig_handle, legend)
+
+        if legend.markerscale != 1:
+            newsz = legline.get_markersize() * legend.markerscale
+            legline.set_markersize(newsz)
+
+        legline.set_transform(trans)
+
+        return _Line2DHandleList(legline)
+
+
 class HandlerPatch(HandlerBase):
     """
     Handler for `.Patch` instances.
     """
-    def __init__(self, patch_func=None, **kw):
+
+    def __init__(self, patch_func=None, **kwargs):
         """
         Parameters
         ----------
@@ -275,11 +322,10 @@ def patch_func(legend=legend, orig_handle=orig_handle,
             Subsequently the created artist will have its ``update_prop``
             method called and the appropriate transform will be applied.
 
-        Notes
-        -----
-        Any other keyword arguments are given to `HandlerBase`.
+        **kwargs
+            Keyword arguments forwarded to `.HandlerBase`.
         """
-        super().__init__(**kw)
+        super().__init__(**kwargs)
         self._patch_func = patch_func
 
     def _create_patch(self, legend, orig_handle,
@@ -306,11 +352,6 @@ class HandlerStepPatch(HandlerBase):
     """
     Handler for `~.matplotlib.patches.StepPatch` instances.
     """
-    def __init__(self, **kw):
-        """
-        Any other keyword arguments are given to `HandlerBase`.
-        """
-        super().__init__(**kw)
 
     def _create_patch(self, legend, orig_handle,
                       xdescent, ydescent, width, height, fontsize):
@@ -382,8 +423,8 @@ def create_artists(self, legend, orig_handle,
 class HandlerRegularPolyCollection(HandlerNpointsYoffsets):
     r"""Handler for `.RegularPolyCollection`\s."""
 
-    def __init__(self, yoffsets=None, sizes=None, **kw):
-        super().__init__(yoffsets=yoffsets, **kw)
+    def __init__(self, yoffsets=None, sizes=None, **kwargs):
+        super().__init__(yoffsets=yoffsets, **kwargs)
 
         self._sizes = sizes
 
@@ -423,14 +464,13 @@ def update_prop(self, legend_handle, orig_handle, legend):
         legend_handle.set_clip_box(None)
         legend_handle.set_clip_path(None)
 
-    def create_collection(self, orig_handle, sizes, offsets, transOffset):
-        p = type(orig_handle)(orig_handle.get_numsides(),
-                              rotation=orig_handle.get_rotation(),
-                              sizes=sizes,
-                              offsets=offsets,
-                              transOffset=transOffset,
-                              )
-        return p
+    @_api.rename_parameter("3.6", "transOffset", "offset_transform")
+    def create_collection(self, orig_handle, sizes, offsets, offset_transform):
+        return type(orig_handle)(
+            orig_handle.get_numsides(),
+            rotation=orig_handle.get_rotation(), sizes=sizes,
+            offsets=offsets, offset_transform=offset_transform,
+        )
 
     def create_artists(self, legend, orig_handle,
                        xdescent, ydescent, width, height, fontsize,
@@ -444,46 +484,45 @@ def create_artists(self, legend, orig_handle,
         sizes = self.get_sizes(legend, orig_handle, xdescent, ydescent,
                                width, height, fontsize)
 
-        p = self.create_collection(orig_handle, sizes,
-                                   offsets=list(zip(xdata_marker, ydata)),
-                                   transOffset=trans)
+        p = self.create_collection(
+            orig_handle, sizes,
+            offsets=list(zip(xdata_marker, ydata)), offset_transform=trans)
 
         self.update_prop(p, orig_handle, legend)
-        p._transOffset = trans
+        p.set_offset_transform(trans)
         return [p]
 
 
 class HandlerPathCollection(HandlerRegularPolyCollection):
     r"""Handler for `.PathCollection`\s, which are used by `~.Axes.scatter`."""
-    def create_collection(self, orig_handle, sizes, offsets, transOffset):
-        p = type(orig_handle)([orig_handle.get_paths()[0]],
-                              sizes=sizes,
-                              offsets=offsets,
-                              transOffset=transOffset,
-                              )
-        return p
+
+    @_api.rename_parameter("3.6", "transOffset", "offset_transform")
+    def create_collection(self, orig_handle, sizes, offsets, offset_transform):
+        return type(orig_handle)(
+            [orig_handle.get_paths()[0]], sizes=sizes,
+            offsets=offsets, offset_transform=offset_transform,
+        )
 
 
 class HandlerCircleCollection(HandlerRegularPolyCollection):
     r"""Handler for `.CircleCollection`\s."""
-    def create_collection(self, orig_handle, sizes, offsets, transOffset):
-        p = type(orig_handle)(sizes,
-                              offsets=offsets,
-                              transOffset=transOffset,
-                              )
-        return p
+
+    @_api.rename_parameter("3.6", "transOffset", "offset_transform")
+    def create_collection(self, orig_handle, sizes, offsets, offset_transform):
+        return type(orig_handle)(
+            sizes, offsets=offsets, offset_transform=offset_transform)
 
 
 class HandlerErrorbar(HandlerLine2D):
     """Handler for Errorbars."""
 
     def __init__(self, xerr_size=0.5, yerr_size=None,
-                 marker_pad=0.3, numpoints=None, **kw):
+                 marker_pad=0.3, numpoints=None, **kwargs):
 
         self._xerr_size = xerr_size
         self._yerr_size = yerr_size
 
-        super().__init__(marker_pad=marker_pad, numpoints=numpoints, **kw)
+        super().__init__(marker_pad=marker_pad, numpoints=numpoints, **kwargs)
 
     def get_err_size(self, legend, xdescent, ydescent,
                      width, height, fontsize):
@@ -525,7 +564,7 @@ def create_artists(self, legend, orig_handle,
             self.update_prop(legline, plotlines, legend)
 
             legline.set_drawstyle('default')
-            legline.set_marker('None')
+            legline.set_marker('none')
 
             self.update_prop(legline_marker, plotlines, legend)
             legline_marker.set_linestyle('None')
@@ -585,30 +624,26 @@ class HandlerStem(HandlerNpointsYoffsets):
     """
     Handler for plots produced by `~.Axes.stem`.
     """
+
     def __init__(self, marker_pad=0.3, numpoints=None,
-                 bottom=None, yoffsets=None, **kw):
+                 bottom=None, yoffsets=None, **kwargs):
         """
         Parameters
         ----------
         marker_pad : float, default: 0.3
             Padding between points in legend entry.
-
         numpoints : int, optional
             Number of points to show in legend entry.
-
         bottom : float, optional
 
         yoffsets : array of floats, optional
             Length *numpoints* list of y offsets for each point in
             legend entry.
-
-        Notes
-        -----
-        Any other keyword arguments are given to `HandlerNpointsYoffsets`.
+        **kwargs
+            Keyword arguments forwarded to `.HandlerNpointsYoffsets`.
         """
-
         super().__init__(marker_pad=marker_pad, numpoints=numpoints,
-                         yoffsets=yoffsets, **kw)
+                         yoffsets=yoffsets, **kwargs)
         self._bottom = bottom
 
     def get_ydata(self, legend, xdescent, ydescent, width, height, fontsize):
@@ -678,19 +713,20 @@ def _copy_collection_props(self, legend_handle, orig_handle):
 class HandlerTuple(HandlerBase):
     """
     Handler for Tuple.
-
-    Additional kwargs are passed through to `HandlerBase`.
-
-    Parameters
-    ----------
-    ndivide : int, default: 1
-        The number of sections to divide the legend area into. If None,
-        use the length of the input tuple.
-    pad : float, default: :rc:`legend.borderpad`
-        Padding in units of fraction of font size.
     """
 
     def __init__(self, ndivide=1, pad=None, **kwargs):
+        """
+        Parameters
+        ----------
+        ndivide : int, default: 1
+            The number of sections to divide the legend area into.  If None,
+            use the length of the input tuple.
+        pad : float, default: :rc:`legend.borderpad`
+            Padding in units of fraction of font size.
+        **kwargs
+            Keyword arguments forwarded to `.HandlerBase`.
+        """
         self._ndivide = ndivide
         self._pad = pad
         super().__init__(**kwargs)
@@ -722,6 +758,8 @@ def create_artists(self, legend, orig_handle,
             _a_list = handler.create_artists(
                 legend, handle1,
                 next(xds_cycle), ydescent, width, height, fontsize, trans)
+            if isinstance(_a_list, _Line2DHandleList):
+                _a_list = [_a_list[0]]
             a_list.extend(_a_list)
 
         return a_list
@@ -734,32 +772,32 @@ class HandlerPolyCollection(HandlerBase):
     """
     def _update_prop(self, legend_handle, orig_handle):
         def first_color(colors):
-            if colors is None:
-                return None
-            colors = mcolors.to_rgba_array(colors)
-            if len(colors):
-                return colors[0]
-            else:
-                return "none"
+            if colors.size == 0:
+                return (0, 0, 0, 0)
+            return tuple(colors[0])
 
         def get_first(prop_array):
             if len(prop_array):
                 return prop_array[0]
             else:
                 return None
-        edgecolor = getattr(orig_handle, '_original_edgecolor',
-                            orig_handle.get_edgecolor())
-        legend_handle.set_edgecolor(first_color(edgecolor))
-        facecolor = getattr(orig_handle, '_original_facecolor',
-                            orig_handle.get_facecolor())
-        legend_handle.set_facecolor(first_color(facecolor))
-        legend_handle.set_fill(orig_handle.get_fill())
-        legend_handle.set_hatch(orig_handle.get_hatch())
+
+        # orig_handle is a PolyCollection and legend_handle is a Patch.
+        # Directly set Patch color attributes (must be RGBA tuples).
+        legend_handle._facecolor = first_color(orig_handle.get_facecolor())
+        legend_handle._edgecolor = first_color(orig_handle.get_edgecolor())
+        legend_handle._original_facecolor = orig_handle._original_facecolor
+        legend_handle._original_edgecolor = orig_handle._original_edgecolor
+        legend_handle._fill = orig_handle.get_fill()
+        legend_handle._hatch = orig_handle.get_hatch()
+        # Hatch color is anomalous in having no getters and setters.
+        legend_handle._hatch_color = orig_handle._hatch_color
+        # Setters are fine for the remaining attributes.
         legend_handle.set_linewidth(get_first(orig_handle.get_linewidths()))
         legend_handle.set_linestyle(get_first(orig_handle.get_linestyles()))
         legend_handle.set_transform(get_first(orig_handle.get_transforms()))
         legend_handle.set_figure(orig_handle.get_figure())
-        legend_handle.set_alpha(orig_handle.get_alpha())
+        # Alpha is already taken into account by the color attributes.
 
     def create_artists(self, legend, orig_handle,
                        xdescent, ydescent, width, height, fontsize, trans):
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
index 1203862a3f50..8df89373adf1 100644
--- a/lib/matplotlib/lines.py
+++ b/lib/matplotlib/lines.py
@@ -1,15 +1,16 @@
 """
-The 2D line class which can draw with a variety of line styles, markers and
-colors.
+2D lines with support for a variety of line styles, markers, colors, etc.
 """
 
+import copy
+
 from numbers import Integral, Number, Real
 import logging
 
 import numpy as np
 
 import matplotlib as mpl
-from . import _api, artist, cbook, colors as mcolors, docstring, rcParams
+from . import _api, cbook, colors as mcolors, _docstring
 from .artist import Artist, allow_rasterization
 from .cbook import (
     _to_unmasked_float_array, ls_mapper, ls_mapper_r, STEP_LOOKUP_MAP)
@@ -21,7 +22,7 @@
 # Imported here for backward compatibility, even though they don't
 # really belong.
 from . import _path
-from .markers import (
+from .markers import (  # noqa
     CARETLEFT, CARETRIGHT, CARETUP, CARETDOWN,
     CARETLEFTBASE, CARETRIGHTBASE, CARETUPBASE, CARETDOWNBASE,
     TICKLEFT, TICKRIGHT, TICKUP, TICKDOWN)
@@ -41,18 +42,14 @@ def _get_dash_pattern(style):
     # dashed styles
     elif style in ['dashed', 'dashdot', 'dotted']:
         offset = 0
-        dashes = tuple(rcParams['lines.{}_pattern'.format(style)])
+        dashes = tuple(mpl.rcParams['lines.{}_pattern'.format(style)])
     #
     elif isinstance(style, tuple):
         offset, dashes = style
         if offset is None:
-            _api.warn_deprecated(
-                "3.3", message="Passing the dash offset as None is deprecated "
-                "since %(since)s and support for it will be removed "
-                "%(removal)s; pass it as zero instead.")
-            offset = 0
+            raise ValueError(f'Unrecognized linestyle: {style!r}')
     else:
-        raise ValueError('Unrecognized linestyle: %s' % str(style))
+        raise ValueError(f'Unrecognized linestyle: {style!r}')
 
     # normalize offset to be positive and shorter than the dash cycle
     if dashes is not None:
@@ -64,7 +61,7 @@ def _get_dash_pattern(style):
 
 
 def _scale_dashes(offset, dashes, lw):
-    if not rcParams['lines.scale_dashes']:
+    if not mpl.rcParams['lines.scale_dashes']:
         return offset, dashes
     scaled_offset = offset * lw
     scaled_dashes = ([x * lw if x is not None else None for x in dashes]
@@ -109,7 +106,7 @@ def segment_hits(cx, cy, x, y, radius):
     return np.concatenate((points, lines))
 
 
-def _mark_every_path(markevery, tpath, affine, ax_transform):
+def _mark_every_path(markevery, tpath, affine, ax):
     """
     Helper function that sorts out how to deal the input
     `markevery` and returns the points where markers should be drawn.
@@ -157,15 +154,23 @@ def _slice_or_none(in_v, slc):
                     '`markevery` is a tuple with len 2 and second element is '
                     'a float, but the first element is not a float or an int; '
                     'markevery={}'.format(markevery))
+            if ax is None:
+                raise ValueError(
+                    "markevery is specified relative to the axes size, but "
+                    "the line does not have a Axes as parent")
+
             # calc cumulative distance along path (in display coords):
-            disp_coords = affine.transform(tpath.vertices)
+            fin = np.isfinite(verts).all(axis=1)
+            fverts = verts[fin]
+            disp_coords = affine.transform(fverts)
+
             delta = np.empty((len(disp_coords), 2))
             delta[0, :] = 0
             delta[1:, :] = disp_coords[1:, :] - disp_coords[:-1, :]
             delta = np.hypot(*delta.T).cumsum()
             # calc distance between markers along path based on the axes
             # bounding box diagonal being a distance of unity:
-            (x0, y0), (x1, y1) = ax_transform.transform([[0, 0], [1, 1]])
+            (x0, y0), (x1, y1) = ax.transAxes.transform([[0, 0], [1, 1]])
             scale = np.hypot(x1 - x0, y1 - y0)
             marker_delta = np.arange(start * scale, delta[-1], step * scale)
             # find closest actual data point that is closest to
@@ -174,7 +179,7 @@ def _slice_or_none(in_v, slc):
             inds = inds.argmin(axis=1)
             inds = np.unique(inds)
             # return, we are done here
-            return Path(verts[inds], _slice_or_none(codes, inds))
+            return Path(fverts[inds], _slice_or_none(codes, inds))
         else:
             raise ValueError(
                 f"markevery={markevery!r} is a tuple with len 2, but its "
@@ -196,7 +201,8 @@ def _slice_or_none(in_v, slc):
         raise ValueError(f"markevery={markevery!r} is not a recognized value")
 
 
-@cbook._define_aliases({
+@_docstring.interpd
+@_api.define_aliases({
     "antialiased": ["aa"],
     "color": ["c"],
     "drawstyle": ["ds"],
@@ -250,16 +256,6 @@ class Line2D(Artist):
 
     zorder = 2
 
-    @_api.deprecated("3.4")
-    @_api.classproperty
-    def validCap(cls):
-        return tuple(cs.value for cs in CapStyle)
-
-    @_api.deprecated("3.4")
-    @_api.classproperty
-    def validJoin(cls):
-        return tuple(js.value for js in JoinStyle)
-
     def __str__(self):
         if self._label != "":
             return f"Line2D({self._label})"
@@ -273,10 +269,12 @@ def __str__(self):
             return "Line2D(%s)" % ",".join(
                 map("({:g},{:g})".format, self._x, self._y))
 
+    @_api.make_keyword_only("3.6", name="linewidth")
     def __init__(self, xdata, ydata,
                  linewidth=None,  # all Nones default to rc
                  linestyle=None,
                  color=None,
+                 gapcolor=None,
                  marker=None,
                  markersize=None,
                  markeredgewidth=None,
@@ -300,7 +298,7 @@ def __init__(self, xdata, ydata,
 
         Additional keyword arguments are `.Line2D` properties:
 
-        %(Line2D_kwdoc)s
+        %(Line2D:kwdoc)s
 
         See :meth:`set_linestyle` for a description of the line styles,
         :meth:`set_marker` for a description of the markers, and
@@ -309,38 +307,34 @@ def __init__(self, xdata, ydata,
         """
         super().__init__()
 
-        #convert sequences to numpy arrays
+        # Convert sequences to NumPy arrays.
         if not np.iterable(xdata):
             raise RuntimeError('xdata must be a sequence')
         if not np.iterable(ydata):
             raise RuntimeError('ydata must be a sequence')
 
         if linewidth is None:
-            linewidth = rcParams['lines.linewidth']
+            linewidth = mpl.rcParams['lines.linewidth']
 
         if linestyle is None:
-            linestyle = rcParams['lines.linestyle']
+            linestyle = mpl.rcParams['lines.linestyle']
         if marker is None:
-            marker = rcParams['lines.marker']
-        if markerfacecolor is None:
-            markerfacecolor = rcParams['lines.markerfacecolor']
-        if markeredgecolor is None:
-            markeredgecolor = rcParams['lines.markeredgecolor']
+            marker = mpl.rcParams['lines.marker']
         if color is None:
-            color = rcParams['lines.color']
+            color = mpl.rcParams['lines.color']
 
         if markersize is None:
-            markersize = rcParams['lines.markersize']
+            markersize = mpl.rcParams['lines.markersize']
         if antialiased is None:
-            antialiased = rcParams['lines.antialiased']
+            antialiased = mpl.rcParams['lines.antialiased']
         if dash_capstyle is None:
-            dash_capstyle = rcParams['lines.dash_capstyle']
+            dash_capstyle = mpl.rcParams['lines.dash_capstyle']
         if dash_joinstyle is None:
-            dash_joinstyle = rcParams['lines.dash_joinstyle']
+            dash_joinstyle = mpl.rcParams['lines.dash_joinstyle']
         if solid_capstyle is None:
-            solid_capstyle = rcParams['lines.solid_capstyle']
+            solid_capstyle = mpl.rcParams['lines.solid_capstyle']
         if solid_joinstyle is None:
-            solid_joinstyle = rcParams['lines.solid_joinstyle']
+            solid_joinstyle = mpl.rcParams['lines.solid_joinstyle']
 
         if drawstyle is None:
             drawstyle = 'default'
@@ -357,14 +351,8 @@ def __init__(self, xdata, ydata,
         self._linestyles = None
         self._drawstyle = None
         self._linewidth = linewidth
-
-        # scaled dash + offset
-        self._dashSeq = None
-        self._dashOffset = 0
-        # unscaled dash + offset
-        # this is needed scaling the dash pattern by linewidth
-        self._us_dashSeq = None
-        self._us_dashOffset = 0
+        self._unscaled_dash_pattern = (0, None)  # offset, dash
+        self._dash_pattern = (0, None)  # offset, dash (scaled by linewidth)
 
         self.set_linewidth(linewidth)
         self.set_linestyle(linestyle)
@@ -372,7 +360,15 @@ def __init__(self, xdata, ydata,
 
         self._color = None
         self.set_color(color)
-        self._marker = MarkerStyle(marker, fillstyle)
+        if marker is None:
+            marker = 'none'  # Default.
+        if not isinstance(marker, MarkerStyle):
+            self._marker = MarkerStyle(marker, fillstyle)
+        else:
+            self._marker = marker
+
+        self._gapcolor = None
+        self.set_gapcolor(gapcolor)
 
         self._markevery = None
         self._markersize = None
@@ -387,19 +383,19 @@ def __init__(self, xdata, ydata,
         self._markerfacecolor = None
         self._markerfacecoloralt = None
 
-        self.set_markerfacecolor(markerfacecolor)
+        self.set_markerfacecolor(markerfacecolor)  # Normalizes None to rc.
         self.set_markerfacecoloralt(markerfacecoloralt)
-        self.set_markeredgecolor(markeredgecolor)
+        self.set_markeredgecolor(markeredgecolor)  # Normalizes None to rc.
         self.set_markeredgewidth(markeredgewidth)
 
         # update kwargs before updating data to give the caller a
         # chance to init axes (and hence unit support)
-        self.update(kwargs)
-        self.pickradius = pickradius
+        self._internal_update(kwargs)
+        self._pickradius = pickradius
         self.ind_offset = 0
         if (isinstance(self._picker, Number) and
                 not isinstance(self._picker, bool)):
-            self.pickradius = self._picker
+            self._pickradius = self._picker
 
         self._xorig = np.asarray([])
         self._yorig = np.asarray([])
@@ -460,9 +456,9 @@ def contains(self, mouseevent):
         # Convert pick radius from points to pixels
         if self.figure is None:
             _log.warning('no figure set when check if mouse is on line')
-            pixels = self.pickradius
+            pixels = self._pickradius
         else:
-            pixels = self.figure.dpi / 72. * self.pickradius
+            pixels = self.figure.dpi / 72. * self._pickradius
 
         # The math involved in checking for containment (here and inside of
         # segment_hits) assumes that it is OK to overflow, so temporarily set
@@ -493,7 +489,8 @@ def get_pickradius(self):
         """
         return self._pickradius
 
-    def set_pickradius(self, d):
+    @_api.rename_parameter("3.6", "d", "pickradius")
+    def set_pickradius(self, pickradius):
         """
         Set the pick radius used for containment tests.
 
@@ -501,12 +498,12 @@ def set_pickradius(self, d):
 
         Parameters
         ----------
-        d : float
+        pickradius : float
             Pick radius, in points.
         """
-        if not isinstance(d, Number) or d < 0:
+        if not isinstance(pickradius, Number) or pickradius < 0:
             raise ValueError("pick radius should be a distance")
-        self._pickradius = d
+        self._pickradius = pickradius
 
     pickradius = property(get_pickradius, set_pickradius)
 
@@ -550,37 +547,39 @@ def set_markevery(self, every):
 (float, float) or list[bool]
             Which markers to plot.
 
-            - every=None, every point will be plotted.
-            - every=N, every N-th marker will be plotted starting with
+            - ``every=None``: every point will be plotted.
+            - ``every=N``: every N-th marker will be plotted starting with
               marker 0.
-            - every=(start, N), every N-th marker, starting at point
-              start, will be plotted.
-            - every=slice(start, end, N), every N-th marker, starting at
-              point start, up to but not including point end, will be plotted.
-            - every=[i, j, m, n], only markers at points i, j, m, and n
-              will be plotted.
-            - every=[True, False, True], positions that are True will be
+            - ``every=(start, N)``: every N-th marker, starting at index
+              *start*, will be plotted.
+            - ``every=slice(start, end, N)``: every N-th marker, starting at
+              index *start*, up to but not including index *end*, will be
               plotted.
-            - every=0.1, (i.e. a float) then markers will be spaced at
-              approximately equal distances along the line; the distance
+            - ``every=[i, j, m, ...]``: only markers at the given indices
+              will be plotted.
+            - ``every=[True, False, True, ...]``: only positions that are True
+              will be plotted. The list must have the same length as the data
+              points.
+            - ``every=0.1``, (i.e. a float): markers will be spaced at
+              approximately equal visual distances along the line; the distance
               along the line between markers is determined by multiplying the
               display-coordinate distance of the axes bounding-box diagonal
-              by the value of every.
-            - every=(0.5, 0.1) (i.e. a length-2 tuple of float), the same
-              functionality as every=0.1 is exhibited but the first marker will
-              be 0.5 multiplied by the display-coordinate-diagonal-distance
-              along the line.
+              by the value of *every*.
+            - ``every=(0.5, 0.1)`` (i.e. a length-2 tuple of float): similar
+              to ``every=0.1`` but the first marker will be offset along the
+              line by 0.5 multiplied by the
+              display-coordinate-diagonal-distance along the line.
 
             For examples see
             :doc:`/gallery/lines_bars_and_markers/markevery_demo`.
 
         Notes
         -----
-        Setting the markevery property will only show markers at actual data
-        points.  When using float arguments to set the markevery property
-        on irregularly spaced data, the markers will likely not appear evenly
-        spaced because the actual data points do not coincide with the
-        theoretical spacing between markers.
+        Setting *markevery* will still only draw markers at actual data points.
+        While the float argument form aims for uniform visual spacing, it has
+        to coerce from the ideal spacing to the nearest available data point.
+        Depending on the number and distribution of data points, the result
+        may still not look evenly spaced.
 
         When using a start offset to specify the first marker, the offset will
         be from the first data point which may be different from the first
@@ -605,7 +604,7 @@ def get_markevery(self):
 
     def set_picker(self, p):
         """
-        Sets the event picker details for the line.
+        Set the event picker details for the line.
 
         Parameters
         ----------
@@ -615,10 +614,16 @@ def set_picker(self, p):
         if callable(p):
             self._contains = p
         else:
-            self.pickradius = p
+            self.set_pickradius(p)
         self._picker = p
 
-    def get_window_extent(self, renderer):
+    def get_bbox(self):
+        """Get the bounding box of this line."""
+        bbox = Bbox([[0, 0], [0, 0]])
+        bbox.update_from_data_xy(self.get_xydata())
+        return bbox
+
+    def get_window_extent(self, renderer=None):
         bbox = Bbox([[0, 0], [0, 0]])
         trans_data_to_xy = self.get_transform().transform
         bbox.update_from_data_xy(trans_data_to_xy(self.get_xydata()),
@@ -629,15 +634,6 @@ def get_window_extent(self, renderer):
             bbox = bbox.padded(ms)
         return bbox
 
-    @Artist.axes.setter
-    def axes(self, ax):
-        # call the set method from the base-class property
-        Artist.axes.fset(self, ax)
-        if ax is not None:
-            for axis in ax._get_axis_map().values():
-                axis.callbacks._pickled_cids.add(
-                    axis.callbacks.connect('units', self.recache_always))
-
     def set_data(self, *args):
         """
         Set the x and y data.
@@ -677,7 +673,8 @@ def recache(self, always=False):
                 self.axes.name == 'rectilinear' and
                 self.axes.get_xscale() == 'linear' and
                 self._markevery is None and
-                self.get_clip_on()):
+                self.get_clip_on() and
+                self.get_transform() == self.axes.transData):
             self._subslice = True
             nanmask = np.isnan(x)
             if nanmask.any():
@@ -701,7 +698,7 @@ def recache(self, always=False):
 
     def _transform_path(self, subslice=None):
         """
-        Puts a TransformedPath instance at self._transformed_path;
+        Put a TransformedPath instance at self._transformed_path;
         all invalidation of the transform is then handled by the
         TransformedPath instance.
         """
@@ -715,26 +712,16 @@ def _transform_path(self, subslice=None):
         self._transformed_path = TransformedPath(_path, self.get_transform())
 
     def _get_transformed_path(self):
-        """
-        Return the :class:`~matplotlib.transforms.TransformedPath` instance
-        of this line.
-        """
+        """Return this line's `~matplotlib.transforms.TransformedPath`."""
         if self._transformed_path is None:
             self._transform_path()
         return self._transformed_path
 
     def set_transform(self, t):
-        """
-        Set the Transformation instance used by this artist.
-
-        Parameters
-        ----------
-        t : `matplotlib.transforms.Transform`
-        """
-        super().set_transform(t)
+        # docstring inherited
         self._invalidx = True
         self._invalidy = True
-        self.stale = True
+        super().set_transform(t)
 
     def _is_sorted(self, x):
         """Return whether x is sorted in ascending order."""
@@ -774,9 +761,6 @@ def draw(self, renderer):
                 self._set_gc_clip(gc)
                 gc.set_url(self.get_url())
 
-                lc_rgba = mcolors.to_rgba(self._color, self._alpha)
-                gc.set_foreground(lc_rgba, isRGBA=True)
-
                 gc.set_antialiased(self._antialiased)
                 gc.set_linewidth(self._linewidth)
 
@@ -792,7 +776,27 @@ def draw(self, renderer):
                 if self.get_sketch_params() is not None:
                     gc.set_sketch_params(*self.get_sketch_params())
 
-                gc.set_dashes(self._dashOffset, self._dashSeq)
+                # We first draw a path within the gaps if needed.
+                if self.is_dashed() and self._gapcolor is not None:
+                    lc_rgba = mcolors.to_rgba(self._gapcolor, self._alpha)
+                    gc.set_foreground(lc_rgba, isRGBA=True)
+
+                    # Define the inverse pattern by moving the last gap to the
+                    # start of the sequence.
+                    dashes = self._dash_pattern[1]
+                    gaps = dashes[-1:] + dashes[:-1]
+                    # Set the offset so that this new first segment is skipped
+                    # (see backend_bases.GraphicsContextBase.set_dashes for
+                    # offset definition).
+                    offset_gaps = self._dash_pattern[0] + dashes[-1]
+
+                    gc.set_dashes(offset_gaps, gaps)
+                    renderer.draw_path(gc, tpath, affine.frozen())
+
+                lc_rgba = mcolors.to_rgba(self._color, self._alpha)
+                gc.set_foreground(lc_rgba, isRGBA=True)
+
+                gc.set_dashes(*self._dash_pattern)
                 renderer.draw_path(gc, tpath, affine.frozen())
                 gc.restore()
 
@@ -839,8 +843,8 @@ def draw(self, renderer):
                 # subsample the markers if markevery is not None
                 markevery = self.get_markevery()
                 if markevery is not None:
-                    subsampled = _mark_every_path(markevery, tpath,
-                                                  affine, self.axes.transAxes)
+                    subsampled = _mark_every_path(
+                        markevery, tpath, affine, self.axes)
                 else:
                     subsampled = tpath
 
@@ -896,6 +900,14 @@ def get_drawstyle(self):
         """
         return self._drawstyle
 
+    def get_gapcolor(self):
+        """
+        Return the line gapcolor.
+
+        See also `~.Line2D.set_gapcolor`.
+        """
+        return self._gapcolor
+
     def get_linestyle(self):
         """
         Return the linestyle.
@@ -928,7 +940,7 @@ def get_markeredgecolor(self):
         """
         mec = self._markeredgecolor
         if cbook._str_equal(mec, 'auto'):
-            if rcParams['_internal.classic_mode']:
+            if mpl.rcParams['_internal.classic_mode']:
                 if self._marker.get_marker() in ('.', ','):
                     return self._color
                 if (self._marker.is_filled()
@@ -1014,10 +1026,7 @@ def get_ydata(self, orig=True):
         return self._y
 
     def get_path(self):
-        """
-        Return the :class:`~matplotlib.path.Path` object associated
-        with this line.
-        """
+        """Return the `~matplotlib.path.Path` associated with this line."""
         if self._invalidy or self._invalidx:
             self.recache()
         return self._path
@@ -1050,8 +1059,7 @@ def set_color(self, color):
         ----------
         color : color
         """
-        if not cbook._str_equal(color, 'auto'):
-            mcolors._check_color_like(color=color)
+        mcolors._check_color_like(color=color)
         self._color = color
         self.stale = True
 
@@ -1090,6 +1098,29 @@ def set_drawstyle(self, drawstyle):
             self._invalidx = True
         self._drawstyle = drawstyle
 
+    def set_gapcolor(self, gapcolor):
+        """
+        Set a color to fill the gaps in the dashed line style.
+
+        .. note::
+
+            Striped lines are created by drawing two interleaved dashed lines.
+            There can be overlaps between those two, which may result in
+            artifacts when using transparency.
+
+            This functionality is experimental and may change.
+
+        Parameters
+        ----------
+        gapcolor : color or None
+            The color with which to fill the gaps. If None, the gaps are
+            unfilled.
+        """
+        if gapcolor is not None:
+            mcolors._check_color_like(color=gapcolor)
+        self._gapcolor = gapcolor
+        self.stale = True
+
     def set_linewidth(self, w):
         """
         Set the line width in points.
@@ -1100,13 +1131,10 @@ def set_linewidth(self, w):
             Line width, in points.
         """
         w = float(w)
-
         if self._linewidth != w:
             self.stale = True
         self._linewidth = w
-        # rescale the dashes + offset
-        self._dashOffset, self._dashSeq = _scale_dashes(
-            self._us_dashOffset, self._us_dashSeq, self._linewidth)
+        self._dash_pattern = _scale_dashes(*self._unscaled_dash_pattern, w)
 
     def set_linestyle(self, ls):
         """
@@ -1119,15 +1147,15 @@ def set_linestyle(self, ls):
 
             - A string:
 
-              ===============================   =================
-              Linestyle                         Description
-              ===============================   =================
-              ``'-'`` or ``'solid'``            solid line
-              ``'--'`` or  ``'dashed'``         dashed line
-              ``'-.'`` or  ``'dashdot'``        dash-dotted line
-              ``':'`` or ``'dotted'``           dotted line
-              ``'None'`` or ``' '`` or ``''``   draw nothing
-              ===============================   =================
+              ==========================================  =================
+              linestyle                                   description
+              ==========================================  =================
+              ``'-'`` or ``'solid'``                      solid line
+              ``'--'`` or  ``'dashed'``                   dashed line
+              ``'-.'`` or  ``'dashdot'``                  dash-dotted line
+              ``':'`` or ``'dotted'``                     dotted line
+              ``'none'``, ``'None'``, ``' '``, or ``''``  draw nothing
+              ==========================================  =================
 
             - Alternatively a dash tuple of the following form can be
               provided::
@@ -1142,21 +1170,18 @@ def set_linestyle(self, ls):
         if isinstance(ls, str):
             if ls in [' ', '', 'none']:
                 ls = 'None'
-
             _api.check_in_list([*self._lineStyles, *ls_mapper_r], ls=ls)
             if ls not in self._lineStyles:
                 ls = ls_mapper_r[ls]
             self._linestyle = ls
         else:
             self._linestyle = '--'
+        self._unscaled_dash_pattern = _get_dash_pattern(ls)
+        self._dash_pattern = _scale_dashes(
+            *self._unscaled_dash_pattern, self._linewidth)
+        self.stale = True
 
-        # get the unscaled dashes
-        self._us_dashOffset, self._us_dashSeq = _get_dash_pattern(ls)
-        # compute the linewidth scaled dashes
-        self._dashOffset, self._dashSeq = _scale_dashes(
-            self._us_dashOffset, self._us_dashSeq, self._linewidth)
-
-    @docstring.interpd
+    @_docstring.interpd
     def set_marker(self, marker):
         """
         Set the line marker.
@@ -1170,6 +1195,20 @@ def set_marker(self, marker):
         self._marker = MarkerStyle(marker, self._marker.get_fillstyle())
         self.stale = True
 
+    def _set_markercolor(self, name, has_rcdefault, val):
+        if val is None:
+            val = mpl.rcParams[f"lines.{name}"] if has_rcdefault else "auto"
+        attr = f"_{name}"
+        current = getattr(self, attr)
+        if current is None:
+            self.stale = True
+        else:
+            neq = current != val
+            # Much faster than `np.any(current != val)` if no arrays are used.
+            if neq.any() if isinstance(neq, np.ndarray) else neq:
+                self.stale = True
+        setattr(self, attr, val)
+
     def set_markeredgecolor(self, ec):
         """
         Set the marker edge color.
@@ -1178,55 +1217,42 @@ def set_markeredgecolor(self, ec):
         ----------
         ec : color
         """
-        if ec is None:
-            ec = 'auto'
-        if (self._markeredgecolor is None
-                or np.any(self._markeredgecolor != ec)):
-            self.stale = True
-        self._markeredgecolor = ec
+        self._set_markercolor("markeredgecolor", True, ec)
 
-    def set_markeredgewidth(self, ew):
+    def set_markerfacecolor(self, fc):
         """
-        Set the marker edge width in points.
+        Set the marker face color.
 
         Parameters
         ----------
-        ew : float
-             Marker edge width, in points.
+        fc : color
         """
-        if ew is None:
-            ew = rcParams['lines.markeredgewidth']
-        if self._markeredgewidth != ew:
-            self.stale = True
-        self._markeredgewidth = ew
+        self._set_markercolor("markerfacecolor", True, fc)
 
-    def set_markerfacecolor(self, fc):
+    def set_markerfacecoloralt(self, fc):
         """
-        Set the marker face color.
+        Set the alternate marker face color.
 
         Parameters
         ----------
         fc : color
         """
-        if fc is None:
-            fc = 'auto'
-        if np.any(self._markerfacecolor != fc):
-            self.stale = True
-        self._markerfacecolor = fc
+        self._set_markercolor("markerfacecoloralt", False, fc)
 
-    def set_markerfacecoloralt(self, fc):
+    def set_markeredgewidth(self, ew):
         """
-        Set the alternate marker face color.
+        Set the marker edge width in points.
 
         Parameters
         ----------
-        fc : color
+        ew : float
+             Marker edge width, in points.
         """
-        if fc is None:
-            fc = 'auto'
-        if np.any(self._markerfacecoloralt != fc):
+        if ew is None:
+            ew = mpl.rcParams['lines.markeredgewidth']
+        if self._markeredgewidth != ew:
             self.stale = True
-        self._markerfacecoloralt = fc
+        self._markeredgewidth = ew
 
     def set_markersize(self, sz):
         """
@@ -1250,7 +1276,7 @@ def set_xdata(self, x):
         ----------
         x : 1D array
         """
-        self._xorig = x
+        self._xorig = copy.copy(x)
         self._invalidx = True
         self.stale = True
 
@@ -1262,7 +1288,7 @@ def set_ydata(self, y):
         ----------
         y : 1D array
         """
-        self._yorig = y
+        self._yorig = copy.copy(y)
         self._invalidy = True
         self.stale = True
 
@@ -1276,6 +1302,9 @@ def set_dashes(self, seq):
         For example, (5, 2, 1, 2) describes a sequence of 5 point and 1 point
         dashes separated by 2 point spaces.
 
+        See also `~.Line2D.set_gapcolor`, which allows those spaces to be
+        filled with a color.
+
         Parameters
         ----------
         seq : sequence of floats (on/off ink in points) or (None, None)
@@ -1293,15 +1322,14 @@ def update_from(self, other):
         self._linestyle = other._linestyle
         self._linewidth = other._linewidth
         self._color = other._color
+        self._gapcolor = other._gapcolor
         self._markersize = other._markersize
         self._markerfacecolor = other._markerfacecolor
         self._markerfacecoloralt = other._markerfacecoloralt
         self._markeredgecolor = other._markeredgecolor
         self._markeredgewidth = other._markeredgewidth
-        self._dashSeq = other._dashSeq
-        self._us_dashSeq = other._us_dashSeq
-        self._dashOffset = other._dashOffset
-        self._us_dashOffset = other._us_dashOffset
+        self._unscaled_dash_pattern = other._unscaled_dash_pattern
+        self._dash_pattern = other._dash_pattern
         self._dashcapstyle = other._dashcapstyle
         self._dashjoinstyle = other._dashjoinstyle
         self._solidcapstyle = other._solidcapstyle
@@ -1311,11 +1339,13 @@ def update_from(self, other):
         self._marker = MarkerStyle(marker=other._marker)
         self._drawstyle = other._drawstyle
 
-    @docstring.interpd
+    @_docstring.interpd
     def set_dash_joinstyle(self, s):
         """
         How to join segments of the line if it `~Line2D.is_dashed`.
 
+        The default joinstyle is :rc:`lines.dash_joinstyle`.
+
         Parameters
         ----------
         s : `.JoinStyle` or %(JoinStyle)s
@@ -1325,11 +1355,13 @@ def set_dash_joinstyle(self, s):
             self.stale = True
         self._dashjoinstyle = js
 
-    @docstring.interpd
+    @_docstring.interpd
     def set_solid_joinstyle(self, s):
         """
         How to join segments if the line is solid (not `~Line2D.is_dashed`).
 
+        The default joinstyle is :rc:`lines.solid_joinstyle`.
+
         Parameters
         ----------
         s : `.JoinStyle` or %(JoinStyle)s
@@ -1355,11 +1387,13 @@ def get_solid_joinstyle(self):
         """
         return self._solidjoinstyle.name
 
-    @docstring.interpd
+    @_docstring.interpd
     def set_dash_capstyle(self, s):
         """
         How to draw the end caps if the line is `~Line2D.is_dashed`.
 
+        The default capstyle is :rc:`lines.dash_capstyle`.
+
         Parameters
         ----------
         s : `.CapStyle` or %(CapStyle)s
@@ -1369,11 +1403,13 @@ def set_dash_capstyle(self, s):
             self.stale = True
         self._dashcapstyle = cs
 
-    @docstring.interpd
+    @_docstring.interpd
     def set_solid_capstyle(self, s):
         """
         How to draw the end caps if the line is solid (not `~Line2D.is_dashed`)
 
+        The default capstyle is :rc:`lines.solid_capstyle`.
+
         Parameters
         ----------
         s : `.CapStyle` or %(CapStyle)s
@@ -1477,13 +1513,11 @@ def draw(self, renderer):
 
 class VertexSelector:
     """
-    Manage the callbacks to maintain a list of selected vertices for
-    `.Line2D`. Derived classes should override
-    :meth:`~matplotlib.lines.VertexSelector.process_selected` to do
+    Manage the callbacks to maintain a list of selected vertices for `.Line2D`.
+    Derived classes should override the `process_selected` method to do
     something with the picks.
 
-    Here is an example which highlights the selected verts with red
-    circles::
+    Here is an example which highlights the selected verts with red circles::
 
         import numpy as np
         import matplotlib.pyplot as plt
@@ -1491,7 +1525,7 @@ class VertexSelector:
 
         class HighlightSelected(lines.VertexSelector):
             def __init__(self, line, fmt='ro', **kwargs):
-                lines.VertexSelector.__init__(self, line)
+                super().__init__(line)
                 self.markers, = self.axes.plot([], [], fmt, **kwargs)
 
             def process_selected(self, ind, xs, ys):
@@ -1504,32 +1538,32 @@ def process_selected(self, ind, xs, ys):
 
         selector = HighlightSelected(line)
         plt.show()
-
     """
+
     def __init__(self, line):
         """
-        Initialize the class with a `.Line2D` instance.  The line should
-        already be added to some :class:`matplotlib.axes.Axes` instance and
-        should have the picker property set.
+        Parameters
+        ----------
+        line : `.Line2D`
+            The line must already have been added to an `~.axes.Axes` and must
+            have its picker property set.
         """
         if line.axes is None:
             raise RuntimeError('You must first add the line to the Axes')
-
         if line.get_picker() is None:
             raise RuntimeError('You must first set the picker property '
                                'of the line')
-
         self.axes = line.axes
         self.line = line
-        self.canvas = self.axes.figure.canvas
-        self.cid = self.canvas.mpl_connect('pick_event', self.onpick)
-
+        self.cid = self.canvas.callbacks._connect_picklable(
+            'pick_event', self.onpick)
         self.ind = set()
 
+    canvas = property(lambda self: self.axes.figure.canvas)
+
     def process_selected(self, ind, xs, ys):
         """
-        Default "do nothing" implementation of the
-        :meth:`process_selected` method.
+        Default "do nothing" implementation of the `process_selected` method.
 
         Parameters
         ----------
@@ -1554,9 +1588,3 @@ def onpick(self, event):
 lineMarkers = MarkerStyle.markers
 drawStyles = Line2D.drawStyles
 fillStyles = MarkerStyle.fillstyles
-
-docstring.interpd.update(Line2D_kwdoc=artist.kwdoc(Line2D))
-
-# You can not set the docstring of an instancemethod,
-# but you can on the underlying function.  Go figure.
-docstring.interpd(Line2D.__init__)
diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py
index ae2bb3da83ac..ace32192b322 100644
--- a/lib/matplotlib/markers.py
+++ b/lib/matplotlib/markers.py
@@ -45,7 +45,8 @@
 ``9`` (``CARETRIGHTBASE``)     |m34|  caretright (centered at base)
 ``10`` (``CARETUPBASE``)       |m35|  caretup (centered at base)
 ``11`` (``CARETDOWNBASE``)     |m36|  caretdown (centered at base)
-``"None"``, ``" "`` or  ``""``        nothing
+``"none"`` or ``"None"``              nothing
+``" "`` or  ``""``                    nothing
 ``'$...$'``                    |m37|  Render the string using mathtext.
                                       E.g ``"$f$"`` for marker showing the
                                       letter ``f``.
@@ -63,9 +64,10 @@
                                       rotated by ``angle``.
 ============================== ====== =========================================
 
-``None`` is the default which means 'nothing', however this table is
-referred to from other docs for the valid inputs from marker inputs and in
-those cases ``None`` still means 'default'.
+As a deprecated feature, ``None`` also means 'nothing' when directly
+constructing a `.MarkerStyle`, but note that there are other contexts where
+``marker=None`` instead means "the default marker" (e.g. :rc:`scatter.marker`
+for `.Axes.scatter`).
 
 Note that special symbols can be defined via the
 :doc:`STIX math font </tutorials/text/mathtext>`,
@@ -80,12 +82,16 @@
     plt.plot([1, 2, 3], marker=11)
     plt.plot([1, 2, 3], marker=matplotlib.markers.CARETDOWNBASE)
 
+Markers join and cap styles can be customized by creating a new instance of
+MarkerStyle.
+A MarkerStyle can also have a custom `~matplotlib.transforms.Transform`
+allowing it to be arbitrarily rotated or offset.
+
 Examples showing the use of markers:
 
 * :doc:`/gallery/lines_bars_and_markers/marker_reference`
-* :doc:`/gallery/shapes_and_collections/marker_path`
 * :doc:`/gallery/lines_bars_and_markers/scatter_star_poly`
-
+* :doc:`/gallery/lines_bars_and_markers/multivariate_marker_plot`
 
 .. |m00| image:: /_static/markers/m00.png
 .. |m01| image:: /_static/markers/m01.png
@@ -126,12 +132,15 @@
 .. |m36| image:: /_static/markers/m36.png
 .. |m37| image:: /_static/markers/m37.png
 """
+import copy
 
 from collections.abc import Sized
+import inspect
 
 import numpy as np
 
-from . import _api, cbook, rcParams
+import matplotlib as mpl
+from . import _api, cbook
 from .path import Path
 from .transforms import IdentityTransform, Affine2D
 from ._enums import JoinStyle, CapStyle
@@ -200,7 +209,7 @@ class MarkerStyle:
         CARETUPBASE: 'caretupbase',
         CARETDOWNBASE: 'caretdownbase',
         "None": 'nothing',
-        None: 'nothing',
+        "none": 'nothing',
         ' ': 'nothing',
         '': 'nothing'
     }
@@ -214,27 +223,57 @@ class MarkerStyle:
     fillstyles = ('full', 'left', 'right', 'bottom', 'top', 'none')
     _half_fillstyles = ('left', 'right', 'bottom', 'top')
 
-    # TODO: Is this ever used as a non-constant?
-    _point_size_reduction = 0.5
+    _unset = object()  # For deprecation of MarkerStyle(<noargs>).
 
-    def __init__(self, marker=None, fillstyle=None):
+    def __init__(self, marker=_unset, fillstyle=None,
+                 transform=None, capstyle=None, joinstyle=None):
         """
         Parameters
         ----------
-        marker : str, array-like, Path, MarkerStyle, or None, default: None
+        marker : str, array-like, Path, MarkerStyle, or None
             - Another instance of *MarkerStyle* copies the details of that
               ``marker``.
-            - *None* means no marker.
-            - For other possible marker values see the module docstring
+            - *None* means no marker.  This is the deprecated default.
+            - For other possible marker values, see the module docstring
               `matplotlib.markers`.
 
-        fillstyle : str, default: 'full'
+        fillstyle : str, default: :rc:`markers.fillstyle`
             One of 'full', 'left', 'right', 'bottom', 'top', 'none'.
+
+        transform : transforms.Transform, default: None
+            Transform that will be combined with the native transform of the
+            marker.
+
+        capstyle : CapStyle, default: None
+            Cap style that will override the default cap style of the marker.
+
+        joinstyle : JoinStyle, default: None
+            Join style that will override the default join style of the marker.
         """
         self._marker_function = None
+        self._user_transform = transform
+        self._user_capstyle = capstyle
+        self._user_joinstyle = joinstyle
         self._set_fillstyle(fillstyle)
+        # Remove _unset and signature rewriting after deprecation elapses.
+        if marker is self._unset:
+            marker = ""
+            _api.warn_deprecated(
+                "3.6", message="Calling MarkerStyle() with no parameters is "
+                "deprecated since %(since)s; support will be removed "
+                "%(removal)s.  Use MarkerStyle('') to construct an empty "
+                "MarkerStyle.")
+        if marker is None:
+            marker = ""
+            _api.warn_deprecated(
+                "3.6", message="MarkerStyle(None) is deprecated since "
+                "%(since)s; support will be removed %(removal)s.  Use "
+                "MarkerStyle('') to construct an empty MarkerStyle.")
         self._set_marker(marker)
 
+    __init__.__signature__ = inspect.signature(  # Only for deprecation period.
+        lambda self, marker, fillstyle=None: None)
+
     def _recache(self):
         if self._marker_function is None:
             return
@@ -244,7 +283,7 @@ def _recache(self):
         self._alt_transform = None
         self._snap_threshold = None
         self._joinstyle = JoinStyle.round
-        self._capstyle = CapStyle.butt
+        self._capstyle = self._user_capstyle or CapStyle.butt
         # Initial guess: Assume the marker is filled unless the fillstyle is
         # set to 'none'. The marker function will override this for unfilled
         # markers.
@@ -260,10 +299,6 @@ def is_filled(self):
     def get_fillstyle(self):
         return self._fillstyle
 
-    @_api.deprecated("3.4", alternative="a new marker")
-    def set_fillstyle(self, fillstyle):
-        return self._set_fillstyle(fillstyle)
-
     def _set_fillstyle(self, fillstyle):
         """
         Set the fillstyle.
@@ -275,24 +310,20 @@ def _set_fillstyle(self, fillstyle):
             markerfacecolor.
         """
         if fillstyle is None:
-            fillstyle = rcParams['markers.fillstyle']
+            fillstyle = mpl.rcParams['markers.fillstyle']
         _api.check_in_list(self.fillstyles, fillstyle=fillstyle)
         self._fillstyle = fillstyle
         self._recache()
 
     def get_joinstyle(self):
-        return self._joinstyle
+        return self._joinstyle.name
 
     def get_capstyle(self):
-        return self._capstyle
+        return self._capstyle.name
 
     def get_marker(self):
         return self._marker
 
-    @_api.deprecated("3.4", alternative="a new marker")
-    def set_marker(self, marker):
-        return self._set_marker(marker)
-
     def _set_marker(self, marker):
         """
         Set the marker.
@@ -321,7 +352,8 @@ def _set_marker(self, marker):
             self._marker_function = getattr(
                 self, '_set_' + self.markers[marker])
         elif isinstance(marker, MarkerStyle):
-            self.__dict__.update(marker.__dict__)
+            self.__dict__ = copy.deepcopy(marker.__dict__)
+
         else:
             try:
                 Path(marker)
@@ -348,7 +380,10 @@ def get_transform(self):
         Return the transform to be applied to the `.Path` from
         `MarkerStyle.get_path()`.
         """
-        return self._transform.frozen()
+        if self._user_transform is None:
+            return self._transform.frozen()
+        else:
+            return (self._transform + self._user_transform).frozen()
 
     def get_alt_path(self):
         """
@@ -364,11 +399,86 @@ def get_alt_transform(self):
         Return the transform to be applied to the `.Path` from
         `MarkerStyle.get_alt_path()`.
         """
-        return self._alt_transform.frozen()
+        if self._user_transform is None:
+            return self._alt_transform.frozen()
+        else:
+            return (self._alt_transform + self._user_transform).frozen()
 
     def get_snap_threshold(self):
         return self._snap_threshold
 
+    def get_user_transform(self):
+        """Return user supplied part of marker transform."""
+        if self._user_transform is not None:
+            return self._user_transform.frozen()
+
+    def transformed(self, transform: Affine2D):
+        """
+        Return a new version of this marker with the transform applied.
+
+        Parameters
+        ----------
+        transform : Affine2D, default: None
+            Transform will be combined with current user supplied transform.
+        """
+        new_marker = MarkerStyle(self)
+        if new_marker._user_transform is not None:
+            new_marker._user_transform += transform
+        else:
+            new_marker._user_transform = transform
+        return new_marker
+
+    def rotated(self, *, deg=None, rad=None):
+        """
+        Return a new version of this marker rotated by specified angle.
+
+        Parameters
+        ----------
+        deg : float, default: None
+            Rotation angle in degrees.
+
+        rad : float, default: None
+            Rotation angle in radians.
+
+        .. note:: You must specify exactly one of deg or rad.
+        """
+        if deg is None and rad is None:
+            raise ValueError('One of deg or rad is required')
+        if deg is not None and rad is not None:
+            raise ValueError('Only one of deg and rad can be supplied')
+        new_marker = MarkerStyle(self)
+        if new_marker._user_transform is None:
+            new_marker._user_transform = Affine2D()
+
+        if deg is not None:
+            new_marker._user_transform.rotate_deg(deg)
+        if rad is not None:
+            new_marker._user_transform.rotate(rad)
+
+        return new_marker
+
+    def scaled(self, sx, sy=None):
+        """
+        Return new marker scaled by specified scale factors.
+
+        If *sy* is None, the same scale is applied in both the *x*- and
+        *y*-directions.
+
+        Parameters
+        ----------
+        sx : float
+            *X*-direction scaling factor.
+        sy : float, default: None
+            *Y*-direction scaling factor.
+        """
+        if sy is None:
+            sy = sx
+
+        new_marker = MarkerStyle(self)
+        _transform = new_marker._user_transform or Affine2D()
+        new_marker._user_transform = _transform.scale(sx, sy)
+        return new_marker
+
     def _set_nothing(self):
         self._filled = False
 
@@ -392,30 +502,30 @@ def _set_tuple_marker(self):
         symstyle = marker[1]
         if symstyle == 0:
             self._path = Path.unit_regular_polygon(numsides)
-            self._joinstyle = JoinStyle.miter
+            self._joinstyle = self._user_joinstyle or JoinStyle.miter
         elif symstyle == 1:
             self._path = Path.unit_regular_star(numsides)
-            self._joinstyle = JoinStyle.bevel
+            self._joinstyle = self._user_joinstyle or JoinStyle.bevel
         elif symstyle == 2:
             self._path = Path.unit_regular_asterisk(numsides)
             self._filled = False
-            self._joinstyle = JoinStyle.bevel
+            self._joinstyle = self._user_joinstyle or JoinStyle.bevel
         else:
             raise ValueError(f"Unexpected tuple marker: {marker}")
         self._transform = Affine2D().scale(0.5).rotate_deg(rotation)
 
     def _set_mathtext_path(self):
         """
-        Draws mathtext markers '$...$' using TextPath object.
+        Draw mathtext markers '$...$' using TextPath object.
 
         Submitted by tcb
         """
-        from matplotlib.text import TextPath
+        from matplotlib.textpath import TextPath
 
         # again, the properties could be initialised just once outside
         # this function
         text = TextPath(xy=(0, 0), s=self.get_marker(),
-                        usetex=rcParams['text.usetex'])
+                        usetex=mpl.rcParams['text.usetex'])
         if len(text.vertices) == 0:
             return
 
@@ -433,8 +543,8 @@ def _set_mathtext_path(self):
     def _half_fill(self):
         return self.get_fillstyle() in self._half_fillstyles
 
-    def _set_circle(self, reduction=1.0):
-        self._transform = Affine2D().scale(0.5 * reduction)
+    def _set_circle(self, size=1.0):
+        self._transform = Affine2D().scale(0.5 * size)
         self._snap_threshold = np.inf
         if not self._half_fill():
             self._path = Path.unit_circle()
@@ -445,6 +555,9 @@ def _set_circle(self, reduction=1.0):
                 {'right': 0, 'top': 90, 'left': 180, 'bottom': 270}[fs])
             self._alt_transform = self._transform.frozen().rotate_deg(180.)
 
+    def _set_point(self):
+        self._set_circle(size=0.5)
+
     def _set_pixel(self):
         self._path = Path.unit_rectangle()
         # Ideally, you'd want -0.5, -0.5 here, but then the snapping
@@ -459,18 +572,13 @@ def _set_pixel(self):
         self._transform = Affine2D().translate(-0.49999, -0.49999)
         self._snap_threshold = None
 
-    def _set_point(self):
-        self._set_circle(reduction=self._point_size_reduction)
-
-    _triangle_path = Path([[0, 1], [-1, -1], [1, -1], [0, 1]], closed=True)
+    _triangle_path = Path._create_closed([[0, 1], [-1, -1], [1, -1]])
     # Going down halfway looks to small.  Golden ratio is too far.
-    _triangle_path_u = Path([[0, 1], [-3/5, -1/5], [3/5, -1/5], [0, 1]],
-                            closed=True)
-    _triangle_path_d = Path(
-        [[-3/5, -1/5], [3/5, -1/5], [1, -1], [-1, -1], [-3/5, -1/5]],
-        closed=True)
-    _triangle_path_l = Path([[0, 1], [0, -1], [-1, -1], [0, 1]], closed=True)
-    _triangle_path_r = Path([[0, 1], [0, -1], [1, -1], [0, 1]], closed=True)
+    _triangle_path_u = Path._create_closed([[0, 1], [-3/5, -1/5], [3/5, -1/5]])
+    _triangle_path_d = Path._create_closed(
+        [[-3/5, -1/5], [3/5, -1/5], [1, -1], [-1, -1]])
+    _triangle_path_l = Path._create_closed([[0, 1], [0, -1], [-1, -1]])
+    _triangle_path_r = Path._create_closed([[0, 1], [0, -1], [1, -1]])
 
     def _set_triangle(self, rot, skip):
         self._transform = Affine2D().scale(0.5).rotate_deg(rot)
@@ -500,7 +608,7 @@ def _set_triangle(self, rot, skip):
 
             self._alt_transform = self._transform
 
-        self._joinstyle = JoinStyle.miter
+        self._joinstyle = self._user_joinstyle or JoinStyle.miter
 
     def _set_triangle_up(self):
         return self._set_triangle(0.0, 0)
@@ -530,7 +638,7 @@ def _set_square(self):
             self._transform.rotate_deg(rotate)
             self._alt_transform = self._transform
 
-        self._joinstyle = JoinStyle.miter
+        self._joinstyle = self._user_joinstyle or JoinStyle.miter
 
     def _set_diamond(self):
         self._transform = Affine2D().translate(-0.5, -0.5).rotate_deg(45)
@@ -544,7 +652,7 @@ def _set_diamond(self):
             rotate = {'right': 0, 'top': 90, 'left': 180, 'bottom': 270}[fs]
             self._transform.rotate_deg(rotate)
             self._alt_transform = self._transform
-        self._joinstyle = JoinStyle.miter
+        self._joinstyle = self._user_joinstyle or JoinStyle.miter
 
     def _set_thin_diamond(self):
         self._set_diamond()
@@ -571,7 +679,7 @@ def _set_pentagon(self):
             }[self.get_fillstyle()]
             self._alt_transform = self._transform
 
-        self._joinstyle = JoinStyle.miter
+        self._joinstyle = self._user_joinstyle or JoinStyle.miter
 
     def _set_star(self):
         self._transform = Affine2D().scale(0.5)
@@ -593,7 +701,7 @@ def _set_star(self):
             }[self.get_fillstyle()]
             self._alt_transform = self._transform
 
-        self._joinstyle = JoinStyle.bevel
+        self._joinstyle = self._user_joinstyle or JoinStyle.bevel
 
     def _set_hexagon1(self):
         self._transform = Affine2D().scale(0.5)
@@ -617,7 +725,7 @@ def _set_hexagon1(self):
             }[self.get_fillstyle()]
             self._alt_transform = self._transform
 
-        self._joinstyle = JoinStyle.miter
+        self._joinstyle = self._user_joinstyle or JoinStyle.miter
 
     def _set_hexagon2(self):
         self._transform = Affine2D().scale(0.5).rotate_deg(30)
@@ -643,7 +751,7 @@ def _set_hexagon2(self):
             }[self.get_fillstyle()]
             self._alt_transform = self._transform
 
-        self._joinstyle = JoinStyle.miter
+        self._joinstyle = self._user_joinstyle or JoinStyle.miter
 
     def _set_octagon(self):
         self._transform = Affine2D().scale(0.5)
@@ -664,7 +772,7 @@ def _set_octagon(self):
                 {'left': 0, 'bottom': 90, 'right': 180, 'top': 270}[fs])
             self._alt_transform = self._transform.frozen().rotate_deg(180.0)
 
-        self._joinstyle = JoinStyle.miter
+        self._joinstyle = self._user_joinstyle or JoinStyle.miter
 
     _line_marker_path = Path([[0.0, -1.0], [0.0, 1.0]])
 
@@ -738,7 +846,7 @@ def _set_caretdown(self):
         self._snap_threshold = 3.0
         self._filled = False
         self._path = self._caret_path
-        self._joinstyle = JoinStyle.miter
+        self._joinstyle = self._user_joinstyle or JoinStyle.miter
 
     def _set_caretup(self):
         self._set_caretdown()
@@ -792,20 +900,17 @@ def _set_x(self):
         self._filled = False
         self._path = self._x_path
 
-    _plus_filled_path = Path(
-        np.array([(-1, -3), (+1, -3), (+1, -1), (+3, -1), (+3, +1), (+1, +1),
-                  (+1, +3), (-1, +3), (-1, +1), (-3, +1), (-3, -1), (-1, -1),
-                  (-1, -3)]) / 6, closed=True)
-    _plus_filled_path_t = Path(
-        np.array([(+3, 0), (+3, +1), (+1, +1), (+1, +3),
-                  (-1, +3), (-1, +1), (-3, +1), (-3, 0),
-                  (+3, 0)]) / 6, closed=True)
+    _plus_filled_path = Path._create_closed(np.array([
+        (-1, -3), (+1, -3), (+1, -1), (+3, -1), (+3, +1), (+1, +1),
+        (+1, +3), (-1, +3), (-1, +1), (-3, +1), (-3, -1), (-1, -1)]) / 6)
+    _plus_filled_path_t = Path._create_closed(np.array([
+        (+3, 0), (+3, +1), (+1, +1), (+1, +3),
+        (-1, +3), (-1, +1), (-3, +1), (-3, 0)]) / 6)
 
     def _set_plus_filled(self):
         self._transform = Affine2D()
         self._snap_threshold = 5.0
-        self._joinstyle = JoinStyle.miter
-        fs = self.get_fillstyle()
+        self._joinstyle = self._user_joinstyle or JoinStyle.miter
         if not self._half_fill():
             self._path = self._plus_filled_path
         else:
@@ -816,20 +921,17 @@ def _set_plus_filled(self):
                 {'top': 0, 'left': 90, 'bottom': 180, 'right': 270}[fs])
             self._alt_transform = self._transform.frozen().rotate_deg(180)
 
-    _x_filled_path = Path(
-        np.array([(-1, -2), (0, -1), (+1, -2), (+2, -1), (+1, 0), (+2, +1),
-                  (+1, +2), (0, +1), (-1, +2), (-2, +1), (-1, 0), (-2, -1),
-                  (-1, -2)]) / 4,
-        closed=True)
-    _x_filled_path_t = Path(
-        np.array([(+1, 0), (+2, +1), (+1, +2), (0, +1),
-                  (-1, +2), (-2, +1), (-1, 0), (+1, 0)]) / 4,
-        closed=True)
+    _x_filled_path = Path._create_closed(np.array([
+        (-1, -2), (0, -1), (+1, -2), (+2, -1), (+1, 0), (+2, +1),
+        (+1, +2), (0, +1), (-1, +2), (-2, +1), (-1, 0), (-2, -1)]) / 4)
+    _x_filled_path_t = Path._create_closed(np.array([
+        (+1, 0), (+2, +1), (+1, +2), (0, +1),
+        (-1, +2), (-2, +1), (-1, 0)]) / 4)
 
     def _set_x_filled(self):
         self._transform = Affine2D()
         self._snap_threshold = 5.0
-        self._joinstyle = JoinStyle.miter
+        self._joinstyle = self._user_joinstyle or JoinStyle.miter
         if not self._half_fill():
             self._path = self._x_filled_path
         else:
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
index f2eb39dd90b3..fc677e83616e 100644
--- a/lib/matplotlib/mathtext.py
+++ b/lib/matplotlib/mathtext.py
@@ -17,30 +17,24 @@
 
 from collections import namedtuple
 import functools
-from io import StringIO
 import logging
-import types
 
 import numpy as np
-from PIL import Image
 
-from matplotlib import _api, colors as mcolors, rcParams, _mathtext
+import matplotlib as mpl
+from matplotlib import _api, _mathtext
 from matplotlib.ft2font import FT2Image, LOAD_NO_HINTING
 from matplotlib.font_manager import FontProperties
-# Backcompat imports, all are deprecated as of 3.4.
-from matplotlib._mathtext import (  # noqa: F401
-    SHRINK_FACTOR, GROW_FACTOR, NUM_SIZE_LEVELS)
-from matplotlib._mathtext_data import (  # noqa: F401
-    latex_to_bakoma, latex_to_cmex, latex_to_standard, stix_virtual_fonts,
-    tex2uni)
+from ._mathtext import (  # noqa: reexported API
+    RasterParse, VectorParse, get_unicode_index)
 
 _log = logging.getLogger(__name__)
 
 
-get_unicode_index = _mathtext.get_unicode_index
 get_unicode_index.__module__ = __name__
 
 
+@_api.deprecated("3.6")
 class MathtextBackend:
     """
     The base class for the mathtext backend-specific code.  `MathtextBackend`
@@ -96,6 +90,7 @@ def get_hinting_type(self):
         return LOAD_NO_HINTING
 
 
+@_api.deprecated("3.6")
 class MathtextBackendAgg(MathtextBackend):
     """
     Render glyphs and rectangles to an FTImage buffer, which is later
@@ -129,7 +124,7 @@ def render_glyph(self, ox, oy, info):
         else:
             info.font.draw_glyph_to_bitmap(
                 self.image, ox, oy - info.metrics.iceberg, info.glyph,
-                antialiased=rcParams['text.antialiased'])
+                antialiased=mpl.rcParams['text.antialiased'])
 
     def render_rect_filled(self, x1, y1, x2, y2):
         if self.mode == 'bbox':
@@ -143,147 +138,17 @@ def render_rect_filled(self, x1, y1, x2, y2):
                 y = int(y1)
             self.image.draw_rect_filled(int(x1), y, np.ceil(x2), y + height)
 
-    def get_results(self, box, used_characters):
-        self.mode = 'bbox'
-        orig_height = box.height
-        orig_depth  = box.depth
-        _mathtext.ship(0, 0, box)
-        bbox = self.bbox
-        bbox = [bbox[0] - 1, bbox[1] - 1, bbox[2] + 1, bbox[3] + 1]
-        self.mode = 'render'
-        self.set_canvas_size(
-            bbox[2] - bbox[0],
-            (bbox[3] - bbox[1]) - orig_depth,
-            (bbox[3] - bbox[1]) - orig_height)
-        _mathtext.ship(-bbox[0], -bbox[1], box)
-        result = (self.ox,
-                  self.oy,
-                  self.width,
-                  self.height + self.depth,
-                  self.depth,
-                  self.image,
-                  used_characters)
+    def get_results(self, box):
         self.image = None
-        return result
+        self.mode = 'render'
+        return _mathtext.ship(box).to_raster()
 
     def get_hinting_type(self):
         from matplotlib.backends import backend_agg
         return backend_agg.get_hinting_flag()
 
 
-@_api.deprecated("3.4", alternative="mathtext.math_to_image")
-class MathtextBackendBitmap(MathtextBackendAgg):
-    def get_results(self, box, used_characters):
-        ox, oy, width, height, depth, image, characters = \
-            super().get_results(box, used_characters)
-        return image, depth
-
-
-@_api.deprecated("3.4", alternative="MathtextBackendPath")
-class MathtextBackendPs(MathtextBackend):
-    """
-    Store information to write a mathtext rendering to the PostScript backend.
-    """
-
-    _PSResult = namedtuple(
-        "_PSResult", "width height depth pswriter used_characters")
-
-    def __init__(self):
-        self.pswriter = StringIO()
-        self.lastfont = None
-
-    def render_glyph(self, ox, oy, info):
-        oy = self.height - oy + info.offset
-        postscript_name = info.postscript_name
-        fontsize = info.fontsize
-
-        if (postscript_name, fontsize) != self.lastfont:
-            self.lastfont = postscript_name, fontsize
-            self.pswriter.write(
-                f"/{postscript_name} findfont\n"
-                f"{fontsize} scalefont\n"
-                f"setfont\n")
-
-        self.pswriter.write(
-            f"{ox:f} {oy:f} moveto\n"
-            f"/{info.symbol_name} glyphshow\n")
-
-    def render_rect_filled(self, x1, y1, x2, y2):
-        ps = "%f %f %f %f rectfill\n" % (
-            x1, self.height - y2, x2 - x1, y2 - y1)
-        self.pswriter.write(ps)
-
-    def get_results(self, box, used_characters):
-        _mathtext.ship(0, 0, box)
-        return self._PSResult(self.width,
-                              self.height + self.depth,
-                              self.depth,
-                              self.pswriter,
-                              used_characters)
-
-
-@_api.deprecated("3.4", alternative="MathtextBackendPath")
-class MathtextBackendPdf(MathtextBackend):
-    """Store information to write a mathtext rendering to the PDF backend."""
-
-    _PDFResult = namedtuple(
-        "_PDFResult", "width height depth glyphs rects used_characters")
-
-    def __init__(self):
-        self.glyphs = []
-        self.rects = []
-
-    def render_glyph(self, ox, oy, info):
-        filename = info.font.fname
-        oy = self.height - oy + info.offset
-        self.glyphs.append(
-            (ox, oy, filename, info.fontsize,
-             info.num, info.symbol_name))
-
-    def render_rect_filled(self, x1, y1, x2, y2):
-        self.rects.append((x1, self.height - y2, x2 - x1, y2 - y1))
-
-    def get_results(self, box, used_characters):
-        _mathtext.ship(0, 0, box)
-        return self._PDFResult(self.width,
-                               self.height + self.depth,
-                               self.depth,
-                               self.glyphs,
-                               self.rects,
-                               used_characters)
-
-
-@_api.deprecated("3.4", alternative="MathtextBackendPath")
-class MathtextBackendSvg(MathtextBackend):
-    """
-    Store information to write a mathtext rendering to the SVG
-    backend.
-    """
-    def __init__(self):
-        self.svg_glyphs = []
-        self.svg_rects = []
-
-    def render_glyph(self, ox, oy, info):
-        oy = self.height - oy + info.offset
-
-        self.svg_glyphs.append(
-            (info.font, info.fontsize, info.num, ox, oy, info.metrics))
-
-    def render_rect_filled(self, x1, y1, x2, y2):
-        self.svg_rects.append(
-            (x1, self.height - y1 + 1, x2 - x1, y2 - y1))
-
-    def get_results(self, box, used_characters):
-        _mathtext.ship(0, 0, box)
-        svg_elements = types.SimpleNamespace(svg_glyphs=self.svg_glyphs,
-                                             svg_rects=self.svg_rects)
-        return (self.width,
-                self.height + self.depth,
-                self.depth,
-                svg_elements,
-                used_characters)
-
-
+@_api.deprecated("3.6")
 class MathtextBackendPath(MathtextBackend):
     """
     Store information to write a mathtext rendering to the text path
@@ -293,6 +158,7 @@ class MathtextBackendPath(MathtextBackend):
     _Result = namedtuple("_Result", "width height depth glyphs rects")
 
     def __init__(self):
+        super().__init__()
         self.glyphs = []
         self.rects = []
 
@@ -303,114 +169,21 @@ def render_glyph(self, ox, oy, info):
     def render_rect_filled(self, x1, y1, x2, y2):
         self.rects.append((x1, self.height - y2, x2 - x1, y2 - y1))
 
-    def get_results(self, box, used_characters):
-        _mathtext.ship(0, 0, box)
-        return self._Result(self.width,
-                            self.height + self.depth,
-                            self.depth,
-                            self.glyphs,
-                            self.rects)
-
-
-@_api.deprecated("3.4", alternative="MathtextBackendPath")
-class MathtextBackendCairo(MathtextBackend):
-    """
-    Store information to write a mathtext rendering to the Cairo
-    backend.
-    """
-
-    def __init__(self):
-        self.glyphs = []
-        self.rects = []
-
-    def render_glyph(self, ox, oy, info):
-        oy = oy - info.offset - self.height
-        thetext = chr(info.num)
-        self.glyphs.append(
-            (info.font, info.fontsize, thetext, ox, oy))
-
-    def render_rect_filled(self, x1, y1, x2, y2):
-        self.rects.append(
-            (x1, y1 - self.height, x2 - x1, y2 - y1))
-
-    def get_results(self, box, used_characters):
-        _mathtext.ship(0, 0, box)
-        return (self.width,
-                self.height + self.depth,
-                self.depth,
-                self.glyphs,
-                self.rects)
-
-
-for _cls_name in [
-        "Fonts",
-        *[c.__name__ for c in _mathtext.Fonts.__subclasses__()],
-        "FontConstantsBase",
-        *[c.__name__ for c in _mathtext.FontConstantsBase.__subclasses__()],
-        "Node",
-        *[c.__name__ for c in _mathtext.Node.__subclasses__()],
-        "Ship", "Parser",
-]:
-    globals()[_cls_name] = _api.deprecated("3.4")(
-        type(_cls_name, (getattr(_mathtext, _cls_name),), {}))
+    def get_results(self, box):
+        return _mathtext.ship(box).to_vector()
 
 
+@_api.deprecated("3.6")
 class MathTextWarning(Warning):
     pass
 
 
-@_api.deprecated("3.3")
-class GlueSpec:
-    """See `Glue`."""
-
-    def __init__(self, width=0., stretch=0., stretch_order=0,
-                 shrink=0., shrink_order=0):
-        self.width         = width
-        self.stretch       = stretch
-        self.stretch_order = stretch_order
-        self.shrink        = shrink
-        self.shrink_order  = shrink_order
-
-    def copy(self):
-        return GlueSpec(
-            self.width,
-            self.stretch,
-            self.stretch_order,
-            self.shrink,
-            self.shrink_order)
-
-    @classmethod
-    def factory(cls, glue_type):
-        return cls._types[glue_type]
-
-
-with _api.suppress_matplotlib_deprecation_warning():
-    GlueSpec._types = {k: GlueSpec(**v._asdict())
-                       for k, v in _mathtext._GlueSpec._named.items()}
-
-
-@_api.deprecated("3.4")
-def ship(ox, oy, box):
-    _mathtext.ship(ox, oy, box)
-
-
 ##############################################################################
 # MAIN
 
 
 class MathTextParser:
     _parser = None
-
-    _backend_mapping = {
-        'bitmap': MathtextBackendBitmap,
-        'agg':    MathtextBackendAgg,
-        'ps':     MathtextBackendPs,
-        'pdf':    MathtextBackendPdf,
-        'svg':    MathtextBackendSvg,
-        'path':   MathtextBackendPath,
-        'cairo':  MathtextBackendCairo,
-        'macosx': MathtextBackendAgg,
-    }
     _font_type_mapping = {
         'cm':          _mathtext.BakomaFonts,
         'dejavuserif': _mathtext.DejaVuSerifFonts,
@@ -421,10 +194,20 @@ class MathTextParser:
     }
 
     def __init__(self, output):
-        """Create a MathTextParser for the given backend *output*."""
-        self._output = output.lower()
+        """
+        Create a MathTextParser for the given backend *output*.
+
+        Parameters
+        ----------
+        output : {"path", "agg"}
+            Whether to return a `VectorParse` ("path") or a
+            `RasterParse` ("agg", or its synonym "macosx").
+        """
+        self._output_type = _api.check_getitem(
+            {"path": "vector", "agg": "raster", "macosx": "raster"},
+            output=output.lower())
 
-    def parse(self, s, dpi=72, prop=None, *, _force_standard_ps_fonts=False):
+    def parse(self, s, dpi=72, prop=None):
         """
         Parse the given math expression *s* at the given *dpi*.  If *prop* is
         provided, it is a `.FontProperties` object specifying the "default"
@@ -432,159 +215,45 @@ def parse(self, s, dpi=72, prop=None, *, _force_standard_ps_fonts=False):
 
         The results are cached, so multiple calls to `parse`
         with the same expression should be fast.
+
+        Depending on the *output* type, this returns either a `VectorParse` or
+        a `RasterParse`.
         """
-        if _force_standard_ps_fonts:
-            _api.warn_deprecated(
-                "3.4",
-                removal="3.5",
-                message=(
-                    "Mathtext using only standard PostScript fonts has "
-                    "been likely to produce wrong output for a while, "
-                    "has been deprecated in %(since)s and will be removed "
-                    "in %(removal)s, after which ps.useafm will have no "
-                    "effect on mathtext."
-                )
-            )
-
-        # lru_cache can't decorate parse() directly because the ps.useafm and
-        # mathtext.fontset rcParams also affect the parse (e.g. by affecting
-        # the glyph metrics).
-        return self._parse_cached(s, dpi, prop, _force_standard_ps_fonts)
+        # lru_cache can't decorate parse() directly because prop
+        # is mutable; key the cache using an internal copy (see
+        # text._get_text_metrics_with_cache for a similar case).
+        prop = prop.copy() if prop is not None else None
+        return self._parse_cached(s, dpi, prop)
 
     @functools.lru_cache(50)
-    def _parse_cached(self, s, dpi, prop, force_standard_ps_fonts):
+    def _parse_cached(self, s, dpi, prop):
+        from matplotlib.backends import backend_agg
+
         if prop is None:
             prop = FontProperties()
-
-        fontset_class = (
-            _mathtext.StandardPsFonts if force_standard_ps_fonts
-            else _api.check_getitem(
-                self._font_type_mapping, fontset=prop.get_math_fontfamily()))
-        backend = self._backend_mapping[self._output]()
-        font_output = fontset_class(prop, backend)
+        fontset_class = _api.check_getitem(
+            self._font_type_mapping, fontset=prop.get_math_fontfamily())
+        load_glyph_flags = {
+            "vector": LOAD_NO_HINTING,
+            "raster": backend_agg.get_hinting_flag(),
+        }[self._output_type]
+        fontset = fontset_class(prop, load_glyph_flags)
 
         fontsize = prop.get_size_in_points()
 
-        # This is a class variable so we don't rebuild the parser
-        # with each request.
-        if self._parser is None:
+        if self._parser is None:  # Cache the parser globally.
             self.__class__._parser = _mathtext.Parser()
 
-        box = self._parser.parse(s, font_output, fontsize, dpi)
-        font_output.set_canvas_size(box.width, box.height, box.depth)
-        return font_output.get_results(box)
-
-    @_api.deprecated("3.4", alternative="mathtext.math_to_image")
-    def to_mask(self, texstr, dpi=120, fontsize=14):
-        r"""
-        Convert a mathtext string to a grayscale array and depth.
-
-        Parameters
-        ----------
-        texstr : str
-            A valid mathtext string, e.g., r'IQ: $\sigma_i=15$'.
-        dpi : float
-            The dots-per-inch setting used to render the text.
-        fontsize : int
-            The font size in points
-
-        Returns
-        -------
-        array : 2D uint8 alpha
-            Mask array of rasterized tex.
-        depth : int
-            Offset of the baseline from the bottom of the image, in pixels.
-        """
-        assert self._output == "bitmap"
-        prop = FontProperties(size=fontsize)
-        ftimage, depth = self.parse(texstr, dpi=dpi, prop=prop)
-        return np.asarray(ftimage), depth
-
-    @_api.deprecated("3.4", alternative="mathtext.math_to_image")
-    def to_rgba(self, texstr, color='black', dpi=120, fontsize=14):
-        r"""
-        Convert a mathtext string to an RGBA array and depth.
-
-        Parameters
-        ----------
-        texstr : str
-            A valid mathtext string, e.g., r'IQ: $\sigma_i=15$'.
-        color : color
-            The text color.
-        dpi : float
-            The dots-per-inch setting used to render the text.
-        fontsize : int
-            The font size in points.
-
-        Returns
-        -------
-        array : (M, N, 4) array
-            RGBA color values of rasterized tex, colorized with *color*.
-        depth : int
-            Offset of the baseline from the bottom of the image, in pixels.
-        """
-        x, depth = self.to_mask(texstr, dpi=dpi, fontsize=fontsize)
+        box = self._parser.parse(s, fontset, fontsize, dpi)
+        output = _mathtext.ship(box)
+        if self._output_type == "vector":
+            return output.to_vector()
+        elif self._output_type == "raster":
+            return output.to_raster()
 
-        r, g, b, a = mcolors.to_rgba(color)
-        RGBA = np.zeros((x.shape[0], x.shape[1], 4), dtype=np.uint8)
-        RGBA[:, :, 0] = 255 * r
-        RGBA[:, :, 1] = 255 * g
-        RGBA[:, :, 2] = 255 * b
-        RGBA[:, :, 3] = x
-        return RGBA, depth
 
-    @_api.deprecated("3.4", alternative="mathtext.math_to_image")
-    def to_png(self, filename, texstr, color='black', dpi=120, fontsize=14):
-        r"""
-        Render a tex expression to a PNG file.
-
-        Parameters
-        ----------
-        filename
-            A writable filename or fileobject.
-        texstr : str
-            A valid mathtext string, e.g., r'IQ: $\sigma_i=15$'.
-        color : color
-            The text color.
-        dpi : float
-            The dots-per-inch setting used to render the text.
-        fontsize : int
-            The font size in points.
-
-        Returns
-        -------
-        int
-            Offset of the baseline from the bottom of the image, in pixels.
-        """
-        rgba, depth = self.to_rgba(
-            texstr, color=color, dpi=dpi, fontsize=fontsize)
-        Image.fromarray(rgba).save(filename, format="png")
-        return depth
-
-    @_api.deprecated("3.4", alternative="mathtext.math_to_image")
-    def get_depth(self, texstr, dpi=120, fontsize=14):
-        r"""
-        Get the depth of a mathtext string.
-
-        Parameters
-        ----------
-        texstr : str
-            A valid mathtext string, e.g., r'IQ: $\sigma_i=15$'.
-        dpi : float
-            The dots-per-inch setting used to render the text.
-
-        Returns
-        -------
-        int
-            Offset of the baseline from the bottom of the image, in pixels.
-        """
-        assert self._output == "bitmap"
-        prop = FontProperties(size=fontsize)
-        ftimage, depth = self.parse(texstr, dpi=dpi, prop=prop)
-        return depth
-
-
-def math_to_image(s, filename_or_obj, prop=None, dpi=None, format=None):
+def math_to_image(s, filename_or_obj, prop=None, dpi=None, format=None,
+                  *, color=None):
     """
     Given a math expression, renders it in a closely-clipped bounding
     box to an image file.
@@ -603,20 +272,16 @@ def math_to_image(s, filename_or_obj, prop=None, dpi=None, format=None):
     format : str, optional
         The output format, e.g., 'svg', 'pdf', 'ps' or 'png'.  If not set, the
         format is determined as for `.Figure.savefig`.
+    color : str, optional
+        Foreground color, defaults to :rc:`text.color`.
     """
     from matplotlib import figure
-    # backend_agg supports all of the core output formats
-    from matplotlib.backends import backend_agg
-
-    if prop is None:
-        prop = FontProperties()
 
     parser = MathTextParser('path')
     width, height, depth, _, _ = parser.parse(s, dpi=72, prop=prop)
 
     fig = figure.Figure(figsize=(width / 72.0, height / 72.0))
-    fig.text(0, depth/height, s, fontproperties=prop)
-    backend_agg.FigureCanvasAgg(fig)
+    fig.text(0, depth/height, s, fontproperties=prop, color=color)
     fig.savefig(filename_or_obj, dpi=dpi, format=format)
 
     return depth
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
index b6f6173254fd..5e85a9c1194f 100644
--- a/lib/matplotlib/mlab.py
+++ b/lib/matplotlib/mlab.py
@@ -1,8 +1,11 @@
 """
-Numerical python functions written for compatibility with MATLAB
-commands with the same names. Most numerical python functions can be found in
-the `numpy` and `scipy` libraries. What remains here is code for performing
-spectral computations.
+Numerical Python functions written for compatibility with MATLAB
+commands with the same names. Most numerical Python functions can be found in
+the `NumPy`_ and `SciPy`_ libraries. What remains here is code for performing
+spectral computations and kernel density estimations.
+
+.. _NumPy: https://numpy.org
+.. _SciPy: https://www.scipy.org
 
 Spectral functions
 ------------------
@@ -52,14 +55,12 @@
 
 import numpy as np
 
-from matplotlib import _api
-import matplotlib.cbook as cbook
-from matplotlib import docstring
+from matplotlib import _api, _docstring, cbook
 
 
 def window_hanning(x):
     """
-    Return x times the hanning window of len(x).
+    Return *x* times the Hanning (or Hann) window of len(*x*).
 
     See Also
     --------
@@ -70,7 +71,7 @@ def window_hanning(x):
 
 def window_none(x):
     """
-    No window function; simply return x.
+    No window function; simply return *x*.
 
     See Also
     --------
@@ -81,7 +82,7 @@ def window_none(x):
 
 def detrend(x, key=None, axis=None):
     """
-    Return x with its trend removed.
+    Return *x* with its trend removed.
 
     Parameters
     ----------
@@ -130,7 +131,7 @@ def detrend(x, key=None, axis=None):
 
 def detrend_mean(x, axis=None):
     """
-    Return x minus the mean(x).
+    Return *x* minus the mean(*x*).
 
     Parameters
     ----------
@@ -139,7 +140,7 @@ def detrend_mean(x, axis=None):
         Can have any dimensionality
 
     axis : int
-        The axis along which to take the mean.  See numpy.mean for a
+        The axis along which to take the mean.  See `numpy.mean` for a
         description of this argument.
 
     See Also
@@ -158,7 +159,7 @@ def detrend_mean(x, axis=None):
 
 def detrend_none(x, axis=None):
     """
-    Return x: no detrending.
+    Return *x*: no detrending.
 
     Parameters
     ----------
@@ -180,17 +181,13 @@ def detrend_none(x, axis=None):
 
 def detrend_linear(y):
     """
-    Return x minus best fit line; 'linear' detrending.
+    Return *x* minus best fit line; 'linear' detrending.
 
     Parameters
     ----------
     y : 0-D or 1-D array or sequence
         Array or sequence containing the data
 
-    axis : int
-        The axis along which to take the mean.  See numpy.mean for a
-        description of this argument.
-
     See Also
     --------
     detrend_mean : Another detrend algorithm.
@@ -216,9 +213,10 @@ def detrend_linear(y):
     return y - (b*x + a)
 
 
+@_api.deprecated("3.6")
 def stride_windows(x, n, noverlap=None, axis=0):
     """
-    Get all windows of x with length n as a single array,
+    Get all windows of *x* with length *n* as a single array,
     using strides to avoid data duplication.
 
     .. warning::
@@ -241,12 +239,24 @@ def stride_windows(x, n, noverlap=None, axis=0):
     References
     ----------
     `stackoverflow: Rolling window for 1D arrays in Numpy?
-    <http://stackoverflow.com/a/6811241>`_
+    <https://stackoverflow.com/a/6811241>`_
     `stackoverflow: Using strides for an efficient moving average filter
-    <http://stackoverflow.com/a/4947453>`_
+    <https://stackoverflow.com/a/4947453>`_
     """
     if noverlap is None:
         noverlap = 0
+    if np.ndim(x) != 1:
+        raise ValueError('only 1-dimensional arrays can be used')
+    return _stride_windows(x, n, noverlap, axis)
+
+
+def _stride_windows(x, n, noverlap=0, axis=0):
+    # np>=1.20 provides sliding_window_view, and we only ever use axis=0.
+    if hasattr(np.lib.stride_tricks, "sliding_window_view") and axis == 0:
+        if noverlap >= n:
+            raise ValueError('noverlap must be less than n')
+        return np.lib.stride_tricks.sliding_window_view(
+            x, n, axis=0)[::n - noverlap].T
 
     if noverlap >= n:
         raise ValueError('noverlap must be less than n')
@@ -255,13 +265,11 @@ def stride_windows(x, n, noverlap=None, axis=0):
 
     x = np.asarray(x)
 
-    if x.ndim != 1:
-        raise ValueError('only 1-dimensional arrays can be used')
     if n == 1 and noverlap == 0:
         if axis == 0:
             return x[np.newaxis]
         else:
-            return x[np.newaxis].transpose()
+            return x[np.newaxis].T
     if n > x.size:
         raise ValueError('n cannot be greater than the length of x')
 
@@ -371,7 +379,7 @@ def _spectral_helper(x, y=None, NFFT=None, Fs=None, detrend_func=None,
         raise ValueError(
             "The window length must match the data's first dimension")
 
-    result = stride_windows(x, NFFT, noverlap, axis=0)
+    result = _stride_windows(x, NFFT, noverlap)
     result = detrend(result, detrend_func, axis=0)
     result = result * window.reshape((-1, 1))
     result = np.fft.fft(result, n=pad_to, axis=0)[:numFreqs, :]
@@ -379,7 +387,7 @@ def _spectral_helper(x, y=None, NFFT=None, Fs=None, detrend_func=None,
 
     if not same_data:
         # if same_data is False, mode must be 'psd'
-        resultY = stride_windows(y, NFFT, noverlap)
+        resultY = _stride_windows(y, NFFT, noverlap)
         resultY = detrend(resultY, detrend_func, axis=0)
         resultY = resultY * window.reshape((-1, 1))
         resultY = np.fft.fft(resultY, n=pad_to, axis=0)[:numFreqs, :]
@@ -465,7 +473,7 @@ def _single_spectrum_helper(
 
 
 # Split out these keyword docs so that they can be used elsewhere
-docstring.interpd.update(
+_docstring.interpd.update(
     Spectral="""\
 Fs : float, default: 2
     The sampling frequency (samples per time unit).  It is used to calculate
@@ -489,8 +497,8 @@ def _single_spectrum_helper(
     the FFT.  While not increasing the actual resolution of the spectrum (the
     minimum distance between resolvable peaks), this can give more points in
     the plot, allowing for more detail. This corresponds to the *n* parameter
-    in the call to fft().  The default is None, which sets *pad_to* equal to
-    the length of the input signal (i.e. no padding).""",
+    in the call to `~numpy.fft.fft`.  The default is None, which sets *pad_to*
+    equal to the length of the input signal (i.e. no padding).""",
 
     PSD="""\
 pad_to : int, optional
@@ -499,8 +507,8 @@ def _single_spectrum_helper(
     of data points used.  While not increasing the actual resolution of the
     spectrum (the minimum distance between resolvable peaks), this can give
     more points in the plot, allowing for more detail. This corresponds to
-    the *n* parameter in the call to fft(). The default is None, which sets
-    *pad_to* equal to *NFFT*
+    the *n* parameter in the call to `~numpy.fft.fft`. The default is None,
+    which sets *pad_to* equal to *NFFT*
 
 NFFT : int, default: 256
     The number of data points used in each block for the FFT.  A power 2 is
@@ -510,7 +518,7 @@ def _single_spectrum_helper(
 detrend : {'none', 'mean', 'linear'} or callable, default: 'none'
     The function applied to each segment before fft-ing, designed to remove
     the mean or linear trend.  Unlike in MATLAB, where the *detrend* parameter
-    is a vector, in Matplotlib is it a function.  The :mod:`~matplotlib.mlab`
+    is a vector, in Matplotlib it is a function.  The :mod:`~matplotlib.mlab`
     module defines `.detrend_none`, `.detrend_mean`, and `.detrend_linear`,
     but you can use a custom function as well.  You can also use a string to
     choose one of the functions: 'none' calls `.detrend_none`. 'mean' calls
@@ -518,12 +526,12 @@ def _single_spectrum_helper(
 
 scale_by_freq : bool, default: True
     Whether the resulting density values should be scaled by the scaling
-    frequency, which gives density in units of Hz^-1.  This allows for
+    frequency, which gives density in units of 1/Hz.  This allows for
     integration over the returned frequency values.  The default is True for
     MATLAB compatibility.""")
 
 
-@docstring.dedent_interpd
+@_docstring.dedent_interpd
 def psd(x, NFFT=None, Fs=None, detrend=None, window=None,
         noverlap=None, pad_to=None, sides=None, scale_by_freq=None):
     r"""
@@ -579,7 +587,7 @@ def psd(x, NFFT=None, Fs=None, detrend=None, window=None,
     return Pxx.real, freqs
 
 
-@docstring.dedent_interpd
+@_docstring.dedent_interpd
 def csd(x, y, NFFT=None, Fs=None, detrend=None, window=None,
         noverlap=None, pad_to=None, sides=None, scale_by_freq=None):
     """
@@ -684,33 +692,33 @@ def csd(x, y, NFFT=None, Fs=None, detrend=None, window=None,
 complex_spectrum = functools.partial(_single_spectrum_helper, "complex")
 complex_spectrum.__doc__ = _single_spectrum_docs.format(
     quantity="complex-valued frequency spectrum",
-    **docstring.interpd.params)
+    **_docstring.interpd.params)
 magnitude_spectrum = functools.partial(_single_spectrum_helper, "magnitude")
 magnitude_spectrum.__doc__ = _single_spectrum_docs.format(
     quantity="magnitude (absolute value) of the frequency spectrum",
-    **docstring.interpd.params)
+    **_docstring.interpd.params)
 angle_spectrum = functools.partial(_single_spectrum_helper, "angle")
 angle_spectrum.__doc__ = _single_spectrum_docs.format(
     quantity="angle of the frequency spectrum (wrapped phase spectrum)",
-    **docstring.interpd.params)
+    **_docstring.interpd.params)
 phase_spectrum = functools.partial(_single_spectrum_helper, "phase")
 phase_spectrum.__doc__ = _single_spectrum_docs.format(
     quantity="phase of the frequency spectrum (unwrapped phase spectrum)",
-    **docstring.interpd.params)
+    **_docstring.interpd.params)
 
 
-@docstring.dedent_interpd
+@_docstring.dedent_interpd
 def specgram(x, NFFT=None, Fs=None, detrend=None, window=None,
              noverlap=None, pad_to=None, sides=None, scale_by_freq=None,
              mode=None):
     """
     Compute a spectrogram.
 
-    Compute and plot a spectrogram of data in x.  Data are split into
-    NFFT length segments and the spectrum of each section is
-    computed.  The windowing function window is applied to each
+    Compute and plot a spectrogram of data in *x*.  Data are split into
+    *NFFT* length segments and the spectrum of each section is
+    computed.  The windowing function *window* is applied to each
     segment, and the amount of overlap of each segment is
-    specified with noverlap.
+    specified with *noverlap*.
 
     Parameters
     ----------
@@ -752,13 +760,13 @@ def specgram(x, NFFT=None, Fs=None, detrend=None, window=None,
     --------
     psd : differs in the overlap and in the return values.
     complex_spectrum : similar, but with complex valued frequencies.
-    magnitude_spectrum : similar single segment when mode is 'magnitude'.
-    angle_spectrum : similar to single segment when mode is 'angle'.
-    phase_spectrum : similar to single segment when mode is 'phase'.
+    magnitude_spectrum : similar single segment when *mode* is 'magnitude'.
+    angle_spectrum : similar to single segment when *mode* is 'angle'.
+    phase_spectrum : similar to single segment when *mode* is 'phase'.
 
     Notes
     -----
-    detrend and scale_by_freq only apply when *mode* is set to 'psd'.
+    *detrend* and *scale_by_freq* only apply when *mode* is set to 'psd'.
 
     """
     if noverlap is None:
@@ -782,7 +790,7 @@ def specgram(x, NFFT=None, Fs=None, detrend=None, window=None,
     return spec, freqs, t
 
 
-@docstring.dedent_interpd
+@_docstring.dedent_interpd
 def cohere(x, y, NFFT=256, Fs=2, detrend=detrend_none, window=window_hanning,
            noverlap=0, pad_to=None, sides='default', scale_by_freq=None):
     r"""
@@ -841,7 +849,6 @@ class GaussianKDE:
     dataset : array-like
         Datapoints to estimate from. In case of univariate data this is a 1-D
         array, otherwise a 2D array with shape (# of dims, # of data).
-
     bw_method : str, scalar or callable, optional
         The method used to calculate the estimator bandwidth.  This can be
         'scott', 'silverman', a scalar constant or a callable.  If a
@@ -852,22 +859,17 @@ class GaussianKDE:
     Attributes
     ----------
     dataset : ndarray
-        The dataset with which `gaussian_kde` was initialized.
-
+        The dataset passed to the constructor.
     dim : int
         Number of dimensions.
-
     num_dp : int
         Number of datapoints.
-
     factor : float
         The bandwidth factor, obtained from `kde.covariance_factor`, with which
         the covariance matrix is multiplied.
-
     covariance : ndarray
         The covariance matrix of *dataset*, scaled by the calculated bandwidth
         (`kde.factor`).
-
     inv_cov : ndarray
         The inverse of *covariance*.
 
@@ -875,10 +877,8 @@ class GaussianKDE:
     -------
     kde.evaluate(points) : ndarray
         Evaluate the estimated pdf on a provided set of points.
-
     kde(points) : ndarray
         Same as kde.evaluate(points)
-
     """
 
     # This implementation with minor modification was too good to pass up.
diff --git a/lib/matplotlib/mpl-data/fonts/ttf/LICENSE_STIX b/lib/matplotlib/mpl-data/fonts/ttf/LICENSE_STIX
index 12c454a3e104..6034d9474814 100644
--- a/lib/matplotlib/mpl-data/fonts/ttf/LICENSE_STIX
+++ b/lib/matplotlib/mpl-data/fonts/ttf/LICENSE_STIX
@@ -34,7 +34,7 @@ Portions copyright (c) 1990 by Elsevier, Inc.
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
+https://scripts.sil.org/OFL
 
 -----------------------------------------------------------
 SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
diff --git a/lib/matplotlib/mpl-data/images/matplotlib_128.ppm b/lib/matplotlib/mpl-data/images/matplotlib_128.ppm
deleted file mode 100644
index d9a647b08a5a..000000000000
--- a/lib/matplotlib/mpl-data/images/matplotlib_128.ppm
+++ /dev/null
@@ -1,4 +0,0 @@
-P6
-128 128
-255
-ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþðôöØãéÀÒÜ©ÁÏ‘±Ã„§»�¥¹}¢·}¢·�¥¹„§»‘±Ã©ÁÏÁÓÝØãéðôöþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿõøùÉÙáš·Çj•­<t“[�U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|[�<t“j•­š·ÇÉÙáõøùÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùûû¿ÑÜw�´:r’V}U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|W~:r’wž´¿ÑÜùûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿîóõªÂÐaŽ¨^ƒU|U|U|U|U|U|U|W~6p�P‚Ÿh“«£¸–´Å­ÅÒ½ÐÛÂÓÝ´ÄγÃ̱Â̽ÐÛ­ÅÒ–´Å£¸h“«P‚Ÿ6p�W~U|U|U|U|U|U|U|^ƒb�¨ªÂÐîóõÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüýýºÎÙ]‹¥X~U|U|U|U|U|W~=t”l–®œ¸ÈËÚâöùúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöùúËÚ✸Èl–®=t”W~U|U|U|U|U|X~]‹¥»ÏÚüýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿïóö‘±Ã.jŒU|U|U|U|U|!`…f‘ª®ÅÒñõ÷ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñõ÷®ÅÒf‘ª!`…U|U|U|U|U|.jŒ‘±Ãïóöÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿéïów�´\�U|U|U|U|)f‰{¡¶ÄÕÞûüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûüüÄÕÞz ¶(eˆU|U|U|U|\�w�´éïóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñõ÷…¨¼\‚U|U|U|U|U†¡µÊÖûüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúûü´ÉÕU†¡U|U|U|U|\‚†©¼ñõ÷ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿøúû–´Å$b†U|U|U|\�v�³ÛåëÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýÞÞÞ³³³ŠŠŠÝÝÝÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÛåëv�³\�U|U|U|$b†–´ÅøúûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÁÓÝ0k�U|U|U|X~uœ³éïóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷ÅÅÅŽŽŽ\\\MMMMMMMMM¯¯¯ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèïòuœ³X~U|U|U|0k�ÁÓÝÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿòöørš±U|U|U|U|d�©ÞçíÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüÌÌÌŠŠŠTTTMMMMMMMMMMMMMMMMMM‡‡‡ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÞçíd�©U|U|U|U|s›²ó÷øÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÁÓÝ/jŒU|U|U|K~œÑÞåÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñññ©©©aaaMMMMMMMMMMMMMMMVQN�fTMMMMMM___þþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÑÞåK~œU|U|U|/jŒÂÓÝÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùûûv�³U|U|U|\�š·Çýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿêêê———SSSMMMMMMMMMMMMZSN”oWÎŒ_ú¡eÿ¤f}dSMMMMMMçççÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýš·Ç\�U|U|U|v�³ùûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿêðóH|šU|U|U|K~œÞçíÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿîîî———QQQMMMMMMMMMNMM�fTLj^ú¡eÿ¤fÿ¤fÿ¤fÿ¤f¦xYMMMMMM¿¿¿ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüûûûçççæææçççüüüþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÞçíK~œU|U|U|I}›êðóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÒßæ,h‹U|U|Z€™¶Çýýýÿÿÿÿÿÿÿÿÿÿÿÿùùù©©©VVVMMMMMMMMMUQN›sXç˜bÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÎŒ_MMMMMM”””ôôôðððíííéééçççææææææææææææææææææææææææçççéééíííðððôôôùùùþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýý™¶ÇZ€U|U|-i‹Òßæÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¯ÆÓ\�U|U|*gŠÎÜäÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÐÐÐfffMMMMMMMMMUQN¢vXñ�dÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fþ¤eü¢cïš_NMMMMMiiiææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææëëëòòòùùùþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÍÛã*f‰U|U|\�°ÇÓÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿŽ®ÀU|U|U|Ez™çîòÿÿÿÿÿÿÿÿÿÿÿÿõõõ“““MMMMMMMMMONM–pWîœcÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fþ¤eü¡cøž_õš\ôš\ôš\l[OMMMNNNÝÝÝææææææçççêêêìììíííïïïæææææææææíííìììêêêçççææææææææææææææææææææææææçççïïïùùùþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿçîòDz˜U|U|U|Ž®Àÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþ„§»U|U|U|j”­÷ùúÿÿÿÿÿÿÿÿÿÿÿÿ×××cccMMMMMMMMMwaRß”aÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fþ£eúŸaö›]ôš\ôš\ôš\ôš\ôš\’mSMMMMMMÆÆÆùùùüüüþþþÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿþþþüüüùùùôôôïïïéééææææææææææææææææææéééóóóýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷ùúi“¬U|U|U|„§»þþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþ}¢·U|U|U|�¯Áþþþÿÿÿÿÿÿÿÿÿþþþ®®®OOOMMMMMMVQN¶€[ý£eÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fý£døž`ôš\ôš\ôš\ôš\ôš\õš\ø�_ú b¾„\MMMMMM¦¦¦ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüõõõîîîçççææææææææææææçççðððûûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþ�¯ÁU|U|U|~£¸þþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ„§»U|U|U|”°ÁÿÿÿÿÿÿÿÿÿÿÿÿøøøŠŠŠMMMMMMMMMvaRç˜bÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fý£eøž`ôš\ôš\ôš\ôš\ôš\÷�_û bþ£eÿ¤fÿ¤fè™bMMMMMM}}}ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýöööíííæææææææææææææææðððüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ“°ÀU|U|U|„§»ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿŽ®ÀU|U|U|�¬»æææóóóÿÿÿÿÿÿõõõpppMMMMMMMMM¢vXü¢eÿ¤fÿ¤fÿ¤fÿ¤fþ¤eúŸaõš\ôš\ôš\ôš\õš\øž`ý£dÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fþ£e_UOMMMVVVüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûðððçççæææææææææçççóóóþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóæææ�¬»U|U|U|�¯Áÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¯ÆÓU|U|U|”°Áæææææææææóóóÿÿÿþþþ���MMMMMMMMMìšcÿ¤fÿ¤fÿ¤fÿ¤fü¢cöœ]ôš\ôš\ôš\õš\ùŸaþ£eÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤f‡iUMMMMMMÞÞÞÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýòòòçççæææææææææêêêùùùÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóæææææææææ“°ÀU|U|U|°ÇÓÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÑÞå[�U|U|�¯ÁÿÿÿóóóæææææææææóóóÿÿÿúúúwwwMMMMMMq^Rø eÿ¤fþ¤eùž`ôš\ôš\ôš\ôš\øž`ý£eÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤f°}ZMMMMMMµµµÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿàààýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüðððææææææææææææñññþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóæææææææææóóóÿÿÿ�¯ÁU|U|\�Òßæÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿéïó,h‹U|U|j”­þþþÿÿÿÿÿÿóóóæææææææææóóóÿÿÿðððcccMMMMMMˆjUû¢cöœ^ôš\ôš\ôš\öœ^ü¢dÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fØ‘`MMMMMM���ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóQQQccc§§§íííÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúúúëëëæææææææææëëëûûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóæææææææææóóóÿÿÿÿÿÿþþþi“¬U|U|-i‹êðóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùûûH|šU|U|Ez™÷ùúÿÿÿÿÿÿÿÿÿÿÿÿóóóæææææææææóóóÿÿÿàààVVVMMMMMM sTôš\ôš\ôš\úŸaþ¤eÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fú¡eSPMMMMdddÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿµµµMMMMMMMMMQQQ���ãããÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþóóóæææææææææççç÷÷÷ÿÿÿÿÿÿÿÿÿÿÿÿóóóæææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿ÷ùúDz˜U|U|I}›ùûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿv�³U|U|*gŠçîòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóæææææææææóóóÿÿÿÉÉÉNNNMMMMMMºVö›]ü¢dÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fwbSMMMMMMíííÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿrrrMMMMMMMMMMMMMMMOOOŽŽŽêêêÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúúúéééæææææææææôôôþþþÿÿÿóóóæææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿçîò*f‰U|U|w�´ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÁÓÝU|U|Z€ÎÜäÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóæææææææææòòòñññ¡¡¡MMMMMMROMØ�_ÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤f uXMMMMMMÅÅÅÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿáááMMMMMMXZP“¡dWYPMMMMMMMMMSSS§§§úúúÿÿÿÿÿÿÿÿÿÿÿÿýýýíííæææææææææñññòòòæææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÍÛãZ€U|U|ÂÓÝÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿó÷ø/jŒU|U|™¶Çÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóææææææææææææåå刈ˆMMMMMM_UOëšcÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fɉ^MMMMMMšššõõõòòòïïïíííëëëæææææææææíííïïïòòòõõõúúúþþþÿÿÿÿÿÿÿÿÿžžžMMMMMM¡²háÿ~Ùõ{œ¬gWYPMMMMMMMMMiiiØØØÿÿÿÿÿÿÿÿÿÿÿÿþþþñññææææææææææææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ˜µÆU|U|/jŒó÷øÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿs›²U|U|LœýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿòòòææææææææææææñññxxxMMMMMMo]Q÷ dÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fþ¤eü¢dì˜_MMMMMMnnnææææææææææææææææææææææææææææææææææææææææææìììóóó÷÷÷^^^MMMPQNÔðyáÿ~áÿ~áÿ~×ózŽœbOOMMMMMMMOOO§§§üüüÿÿÿÿÿÿÿÿÿÿÿÿõõõææææææææææææòòòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýK~œU|U|t›²ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÁÓÝU|U|\�ßèíÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñññææææææææææææóóóñññdddMMMMMM‡iUý£eÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fý£eúŸaö›]ôš\ôš\gXOMMMPPPàààæææææææææææææææææææææææææææææææææææææææææææææ¹¹¹MMMMMM{„\áÿ~áÿ~áÿ~áÿ~áÿ~áÿ~ÆßulrWMMMMMMMMM}}}ñññÿÿÿÿÿÿÿÿÿóóóææææææææææææñññÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÞçí\�U|U|ÁÓÝÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿøúû0k�U|U|š·ÇÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿôôôææææææææææææææææææóóóáááVVVMMMMMM£wYÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fü¢døž_ôš\ôš\ôš\ôš\ôš\ŒjRMMMMMMËËË÷÷÷úúúüüüþþþèèèæææçççüüüúúú÷÷÷óóóîîîéééæææææ怀€MMMMMM¬ÀgÛøxßü|áÿ~áÿ~áÿ~áÿ~áÿ~Þü}—¦eMMMMMMMMMÿÿÿÿÿÿóóóææææææææææææææææææôôôÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ™¶ÇU|U|0k�øúûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ–´ÅU|U|K~œýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷æææææææææôôôóóóæææææææææóóóËËËOOOMMMMMMÀ…]ÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fý£døž_ôš\ôš\ôš\ôš\ôš\÷œ^ú a¸�ZMMMMMM¬¬¬ÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûèèèQQQMMMX[PÔðs×ôt×ôtÛøxàý}áÿ~áÿ~áÿ~áÿ~�­gMMMMMMVVVãããÿÿÿóóóæææææææææóóóôôôæææææææææ÷÷÷ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýK~œU|U|—µÆÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñõ÷$b†U|U|ÑÞåÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûçççææææææòòòÿÿÿÿÿÿóóóæææææææææóóó°°°MMMMMMROMØ‘`ÿ¤fÿ¤fþ¤eúŸaôš\ôš\ôš\ôš\õš\ùž`ý£dÿ¤fÿ¤fâ–aMMMMMMƒƒƒÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿµµµMMMMMMŒ™`Øõu×ôt×ôt×ôt×ôtÜúzáþ~áÿ~¹ÏpNOMMMMMMMÇÇÇÿÿÿóóóæææææææææóóóÿÿÿÿÿÿòòòææææææçççûûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÑÞåU|U|$b†ñõ÷ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ…¨¼U|U|d�©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþêêêææææææíííþþþÿÿÿÿÿÿÿÿÿóóóæææææææææòòò“““MMMMMM]UOêšcý£döœ]ôš\ôš\ôš\õš\úŸaþ£eÿ¤fÿ¤fÿ¤fÿ¤fý£eYSNMMM[[[þþþÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿrrrMMMMMMÅÞtàþ~ÜúzØõu×ôt×ôt×ôtÙövÌævWZPMMMMMM¤¤¤ÿÿÿóóóæææææææææóóóÿÿÿÿÿÿÿÿÿþþþíííææææææêêêþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿc�©U|U|†©¼ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿéïó\‚U|X~ÞçíÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñññææææææéééýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóæææææææææïïïyyyMMMMMMn\Qí–[ôš\ôš\ôš\øž`þ£eÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤f�fTMMMMMMäääÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿáááMMMMMMinVáÿ~áÿ~áÿ~àþ~Ûøx×ôt×ôtÑírflTMMMMMM���ýýýóóóæææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýéééææææææñññÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÝçìX~U|\‚éïóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿw�´U|U|uœ³ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùùùæææææææææúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóæææææææææåååeeeMMMMMM‚eQò™[öœ]ü¢dÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤f©zZMMMMMM»»»ÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿžžžMMMMMM¡²háÿ~áÿ~áÿ~áÿ~áÿ~ßü|Øõu}ˆZMMMMMMeeeòòòóóóæææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúúúæææææææææùùùÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿt›²U|U|wž´ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿïóö[�U|\�éïóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþéééææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóæææææææææÐÐÐUUUMMMMMMžsUþ¤eÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÓŽ_MMMMMM“““ÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüü]]]MMMPQNÕñzáÿ~áÿ~áÿ~áÿ~áÿ~áÿ~ž¯hMMMMMMTTTÌÌÌêêêæææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóææææææéééþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèïò\�U|\�ïóöÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ‘±ÃU|U|v�³ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóææææææëëëþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóææææææææ溺ºNNNMMMMMM¾„\ÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fø ePNMMMMjjjÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿËËËMMMMMM|…\áÿ~áÿ~áÿ~áÿ~áÿ~áÿ~ºÐqOOMMMMMMM´´´ææææææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþëëëææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿuœ³U|U|’±Ãÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüýý.jŒU|U|Ûåëÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüçççææææææúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþêêêææææææææ樨¨MMMMMMQOM×�`ÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fr_RMMMMMMòòòÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿˆˆˆMMMMMM³Èoáÿ~áÿ~áÿ~áÿ~áÿ~ÏéxXZPMMMMMM¢¢¢ïïïæææææææææêêêþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúúúææææææçççüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÚåêU|U|.jŒüýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿºÎÙU|U|U†¡ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿêêêææææææðððÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñññææææææææææææååå���MMMMMM\TOê™cÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fšrWMMMMMMËËËÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿòòòQQQMMMZ\QÞû}áÿ~áÿ~áÿ~áÿ~Ûø|jpVMMMMMM€€€ñññæææææææææææææææñññÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿðððææææææðððÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿT…¡U|U|»ÏÚÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ]‹¥U|U|´ÉÕÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿãããWWW”””ÙÙÙüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿõõõæææææææææïïïææææææãããwwwMMMMMMm\QöŸdÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÆ]MMMMMM   ÷÷÷õõõçççæææççç÷÷÷ûûûþþþÿÿÿ´´´MMMMMM�œbáÿ~áÿ~áÿ~áÿ~àþ}ƒŽ^MMMMMMeeeçççæææææææææïïïæææææææææöööÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüçççææææææüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ³ÉÕU|U|]‹¦ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿîóõX~U|)f‰úûüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ���MMMMMMRRRšššëëëÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúúúæææææææææôôôÿÿÿóóóææææææÛÛÛdddMMMMMM„hTý£eÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fÿ¤fý£eç—^MMMMMMsssæææææææææææææææææææææçççíííoooMMMMMMÆÞuáÿ~áÿ~áÿ~áÿ~ ±hMMMMMMUUUÖÖÖæææææææææóóóÿÿÿôôôæææææææææúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñññææææææðððÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúûü(eˆU|X~ïóöÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿªÂÐU|U|{¡¶ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿìììQQQMMMMMMMMMMMMQQQ“““æææÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþêêêææææææïïïÿÿÿÿÿÿÿÿÿóóóææææææÎÎÎWWWMMMMMM uXÿ¤fÿ¤fÿ¤fÿ¤fü¢cø�_ôš\ôš\aVNMMMRRRãããæææææææææææææææææææææÌÌÌMMMMMMhnUßü|áÿ~áÿ~áÿ~¼ÓqOOMMMMMMM»»»æææææææææóóóÿÿÿÿÿÿþþþïïïææææææëëëþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýçççææææææüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿz ¶U|U|«ÃÐÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿaŽ¨U|U|ÄÕÞÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¡¡¡MMMMMMMMMSRMMMMMMMMMMOOOŒŒŒáááÿÿÿÿÿÿÿÿÿÿÿÿòòòææææææêêêþþþÿÿÿÿÿÿÿÿÿÿÿÿóóóææææææ¼¼¼OOOMMMMMM½ƒ\ÿ¤fý£d÷�_ôš\ôš\ôš\ôš\‡hRMMMMMMÏÏÏôôôçççæææçççñññíííèèè’’’MMMMMM›¬c×ôtÚ÷wàý}ÐêxY\QMMMMMMšššæææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿþþþêêêææææææòòòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñññææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÃÔÞU|U|b�¨ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùûû^ƒU|!`…ûüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûû___MMMNNMçÈaðÏc¢‘XWUNMMMMMMMMMMMM†††ÜÜÜÿÿÿüüüæææææææææùùùÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóæææææ楥¥MMMMMMQOMÒŒ\õš\ôš\ôš\ôš\õ›]ùž`²~ZMMMMMM²²²ÿÿÿèèèæææèèèÿÿÿÿÿÿûûû]]]MMMPPMÌæp×ôt×ôtÓïsjpVMMMMMMzzzäääææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùùùæææææææææüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûææææææéééþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúûü!`…U|_„ùûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¿ÑÜU|U|f‘ªÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÉÉÉMMMMMM~tQÿÛfÿÛfÿÛfóÒd¨–YZXNMMMMMMMMMMMMÈÈÈææææææðððÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóæææåå匌ŒMMMMMM[SNß�Zôš\õ›]ú aþ¤eÿ¤fÜ’aMMMMMM‰‰‰ÿÿÿèèèæææèèèÿÿÿÿÿÿÊÊÊMMMMMM|†\ÝúzØõuÖós�Œ[MMMMMMbbbÛÛÛææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿðððææææææîîîÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿìììææææææøøøÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿe‘ªU|U|ÀÒÜÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿw�´U|U|®ÅÒÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿŠŠŠMMMMMMÁª[ÿÛfÿÛfÿÛfÿÛfÿÛföÔd®›Z_[OMMMMMMMMMMMMsss½½½üüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóæææãããuuuMMMMMMjZOï™_þ£eÿ¤fÿ¤fÿ¤fü¢eUQNMMMaaaÿÿÿèèèæææèèèÿÿÿÿÿÿ‡‡‡MMMMMM´Éoáÿ~àþ~Ÿ°eMMMMMMRRRÊÊÊææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýçççææææææúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöööææææææðððÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ­ÅÒU|U|wž´ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ:r’U|W~ñõ÷ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúúúWWWMMMUSM÷ÕdÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfùÖeµ [c_PMMMMMMMMMMMMsssÇÇÇýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿòòòæææÛÛÛcccMMMMMM‚gTü¢eÿ¤fÿ¤fÿ¤fÿ¤f{cSMMMMMMêêêèèèæææèèèÿÿÿòòòQQQMMMZ]QÞû}áÿ~½ÔrOPMMMMMMM±±±ææææææòòòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóææææææïïïÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýææææææèèèþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñõ÷W~U|;s“ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿõøùV}U|=t”ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÍÍÍMMMMMMˆ{SÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfù×dµŸVfaOMMMMMMMMMMMMlllÁÁÁüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþïïïææææææÎÎÎWWWMMMMMMžtXÿ¤fÿ¤fÿ¤fÿ¤f¤wYMMMMMMÁÁÁèèèæææèèèÿÿÿ´´´MMMMMM�œbáÿ~ÑìxZ]QMMMMMM’’’æææææææææïïïþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýçççææææææüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿíííææææææùùùÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ<t“U|W~öùúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÉÙáU|U|l–®ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿšššMMMMMM¼¥ZÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfúÖaôÑ\òÏ[¿§YmfQMMMMMMMMMMMMggg»»»ûûûÿÿÿÿÿÿÿÿÿôôôææææææææææææ½½½OOOMMMMMM¼ƒ\ÿ¤fÿ¤fÿ¤fÌ‹^MMMMMM˜˜˜èèèæææèèèÿÿÿqqqMMMMMMÆÞuÜù|lsWMMMMMMuuuãããææææææææææææôôôÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñññææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿõõõææææææòòòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿk•®U|U|ÊÙâÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿš·ÇU|U|œ¸ÈÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿnnnMMMMMMíÍbÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfþÛeöÒ]ôÑ\ôÑ\ýÚdþÚeÊ°^skRMMMMMMMMMMMMbbb´´´ùùùûûûçççææææææöööóóóææ槧§MMMMMMQOMÔ�`ÿ¤fÿ¤fôždNMMMMMpppèèèæææèèèàààMMMMMMjqVàþ}†’`MMMMMM```ÚÚÚæææóóóöööææææææçççüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûææææææéééþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüææææææìììÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ›·ÈU|U|›·Èÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿj•­U|U|ËÚâÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöööOOOMMMicOÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfüÙdôÑ\ôÑ\÷Ô^ÿÛfÿÛfÿÛfþÚeϵ_zpSMMMMMMMMMMMM^^^¤¤¤ÞÞÞæææðððÿÿÿÿÿÿóóóæææ���MMMMMM[TOç˜bÿ¤fÿ¤fl\QMMMOOOàààæææèèèžžžMMMMMM¡³i¤¶jMMMMMMRRRÈÈÈæææóóóÿÿÿÿÿÿïïïææææææíííÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿìììææææææúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿéééææææææþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÊÙâU|U|k•®ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ<t“U|W~öùúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÐÐÐMMMMMM�‚TÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfùÖaôÑ\ôÑ\ú×aÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÖº`�vTMMMMMMMMMMMMXXXœœœñññÿÿÿÿÿÿÿÿÿóóóãããvvvMMMMMMk[QõŸdÿ¤f”oWMMMMMM¿¿¿æææååå]]]MMMPQN³ÈoPQNMMMMMM¯¯¯æææóóóÿÿÿÿÿÿÿÿÿýýýèèèææææææúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿôôôææææææòòòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿïïïææææææùùùÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöùúW~U|<t“ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþ[�U|6p�ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ­­­MMMMMM´ŸXÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛf÷Ô^ôÑ\ôÑ\ýÚdÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÜ¿a‡{UNNMMMMMMMMMMVVV   ïïïÿÿÿÿÿÿóóóÛÛÛdddMMMMMM�fTü¢e½ƒ\MMMMMMœœœæææ¹¹¹MMMMMMnuX[^QMMMMMM���æææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿôôôææææææîîîÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûææææææìììÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿôôôææææææõõõÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ6p�U|\�þþþÿÿÿÿÿÿÿÿÿÿÿÿðôöU|U|P‚Ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ���MMMMMMÔ¸^ÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfþÛeôÑ\ôÑ\öÒ]ÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfýÚeÙ»YŠ}ROOMMMMMMMMMMSSSšššëëëÿÿÿóóóÏÏÏWWWMMMMMM�tWã•_MMMMMMxxxæææMMMMMMMMMMMMMMMsssãããóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþèèèææææææüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþéééææææææþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿøøøææææææðððÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿP‚žU|U|ñõ÷ÿÿÿÿÿÿÿÿÿÿÿÿØãéU|U|h“«ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿuuuMMMMMMñÐcÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfüÙdôÑ\ôÑ\øÔ_ÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfú×aôÑ\ôÑ\âÃ]”…WQPMMMMMMMMMMQQQ“““æææóóó¾¾¾OOOMMMMMM³|V[SNMMMVVVØØØPPPMMMMMMMMMMMM^^^ÙÙÙóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñññææææææôôôÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿîîîææææææúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýææææææìììÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿg’«U|U|ÙäêÿÿÿÿÿÿÿÿÿÿÿÿÁÓÝU|U|£¸ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿaaaMMMWUMþÛeÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfú×bôÑ\ôÑ\úÖaÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛf÷Ô_ôÑ\ôÑ\üÙdÿÛfìËc›‹XSRMMMMMMMMMMOOOŒŒŒ××ר¨¨MMMMMMPNMYRNMMMMMM•••MMMMMMMMMMMMRRRÇÇÇóóóÿÿÿÿÿÿþþþÛÛÛ¡¡¡“““ÿÿÿÿÿÿÿÿÿúúúææææææíííÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóææææææöööÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþçççæææêêêÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ~£¸U|U|ÂÓÝÿÿÿÿÿÿÿÿÿÿÿÿ©ÁÏU|U|–´ÅÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþQQQMMMjdOÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfùÖaôÑ\ôÑ\ûØcÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfþÛeõÒ\ôÑ\õÒ]þÛeÿÛfÿÛfÿÛfïÎc¡�XVTNMMMMMMMMMMMM‚‚‚MMMMMMMMMMMMMMM___MMMMMMMMMMMM­­­êêêüüü××לœœcccMMMMMMOOOñññÿÿÿÿÿÿþþþèèèæææçççþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷ææææææòòòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿéééæææçççÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ•³ÅU|U|ªÂÐÿÿÿÿÿÿÿÿÿÿÿÿ‘±ÃU|U|­ÅÒÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóMMMMMMzpQÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛføÕ_ôÑ\ôÑ\üÙdÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfýÚdôÑ\ôÑ\÷Ô_ÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfóÒd¨–YZXNMMMMMMMMMMMMYYYMMMMMMMMMMMMMMMMMMMMMMMM���¿¿¿���^^^MMMMMMMMMMMMMMMMMMÃÃÃÿÿÿÿÿÿÿÿÿíííææææææûûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúúúææææææïïïÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿìììææææææýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¬ÄÑU|U|’±Ãÿÿÿÿÿÿÿÿÿÿÿÿ„§»U|U|½ÐÛÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿçççMMMMMM…yRÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛf÷Ô_ôÑ\ôÑ\þÚeÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfûØcôÑ\ôÑ\ùÖ`ÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛföÔd®›Z]ZNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM[[[YYYMMMMMMMMMMMMMMMMNPMMMMMMMMMžžžÿÿÿÿÿÿÿÿÿñññææææææ÷÷÷ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýææææææíííÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿíííææææææüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ½ÐÛU|U|…¨¼ÿÿÿÿÿÿÿÿÿÿÿÿ�¥¹U|U|ÂÓÝÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿßßßMMMMMMŒSÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛföÓ^ôÑ\ôÑ\þÛeÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfú×bôÑ\ôÑ\ú×aÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfïÍ\®šUa]NMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMR]vZs¬Yo£MMMMMM………ÿÿÿÿÿÿÿÿÿñññææææææñññÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþæææææææææÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèææææææùùùÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¬ÃÑU|U|O�žÿÿÿÿÿÿÿÿÿÿÿÿ}¢·U|U|´ÄÎèèèèèèèèèèèèèèèèèèèèèèèèèèèËËËMMMMMMŽ€RõÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]ôÑ\ôÑ\ôÑ\õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ\ôÑ\ôÑ\õÒ\õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ\êÉ[̱X«—UQPMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMsssèèèèèèèèèææææææææææææèèèèèèèèèèèèèèèèèèèèèèèèèèèçççæææææææææèèèèèèèèèèèèèèèèèèèèèèèèèèèèèèæææææææææçççèèèèèèèèèèèèèèèèèèèèèèèèèè胣µU|U|U|ÿÿÿÿÿÿÿÿÿÿÿÿ}¢·U|U|³ÃÌæææææææææææææææææææææææææææËËËMMMMMMŽ€RôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\ôÑ\òÏ[Û½Y½¥WŸ�T�vQb]NMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMqqqæææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææ‚¢´U|U|U|ÿÿÿÿÿÿÿÿÿÿÿÿ�¥¹U|U|±ÂÌèèèèèèèèèèèèèèèèèèèèèèèèèèèÎÎÎMMMMMM‹~RõÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]ôÑ\ôÑ\ôÑ\õÒ\õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ]õÒ\ôÑ\ôÑ\ëÊ[̲Y­™V��SpiPTRMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM‘‘‘ªªªªªªªªªªªª«««««««««««««««¹¹¹èèèèèèèèèææææææææææææèèèèèèèèèèèèèèèèèèèèèèèèèèèçççæææææææææèèèèèèèèèèèèèèèèèèèèèèèèèèèèèèæææææææææçççèèèèèèèèèèèèèèèèèèèèèèèèèèè�´ÂU|U|P‚žÿÿÿÿÿÿÿÿÿÿÿÿ„§»U|U|½ÐÛÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿçççMMMMMM…yRÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛf÷Ô_ôÑ\ôÑ\þÚeÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfüÙeäÅbë]¡�WuQa]NMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMQQQPPPMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMœœœäääîîîÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñññææææææ÷÷÷ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýææææææíííÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿíííææææææüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ½ÐÛU|U|…¨¼ÿÿÿÿÿÿÿÿÿÿÿÿ‘±ÃU|U|­ÅÒÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóMMMMMMzpQÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛføÕ_ôÑ\ôÑ\üÙdÿÛfóÒdÓ¸_³ž[“„VskRTSNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMeee………ŸŸŸŠŠŠXXXMMMMMMMMMMMMMMMMMM‘‘‘MMMMMMMMMMMMMMMMMMMMMMMM|||íííÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿíííææææææûûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúúúææææææïïïÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿìììææææææýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¬ÄÑU|U|’±Ãÿÿÿÿÿÿÿÿÿÿÿÿ©ÁÏU|U|–´ÅÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþQQQMMMjdOÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfÿÛfüÙeÞÁ]»¤V�ŒT�vSb^PMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMUUUppp•••¶¶¶ÖÖÖõõõððð¡¡¡VVVMMMMMMMMMMMMMMMMMMlllÎÎΤ¤¤MMMMMMMMMMMMOOOMMMMMMMMMMMMeeeÞÞÞÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþèèèæææçççþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷ææææææòòòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿéééæææçççÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ•³ÅU|U|ªÂÐÿÿÿÿÿÿÿÿÿÿÿÿÁÓÝU|U|£¸ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿaaaMMMXUMþÛeÿÛfÿÛfÿÛfóÑdÓ·_³ž[’„VrjRSRMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMeee†††¦¦¦ÇÇÇ×××äääæææúúúÿÿÿìììšššSSSMMMMMMMMMMMMMMMMMMOOO™™™ãããæææ}}}MMMMMMMMMMMM‰‰‰MMMMMMMMMMMMMMMSSS¾¾¾ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúúúææææææíííÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóææææææöööÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþçççæææêêêÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ~£¸U|U|ÂÓÝÿÿÿÿÿÿÿÿÿÿÿÿØãéU|U|h“«ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿuuuMMMMMMµ [¢‘X‚wTa]OMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMVVVvvv–––···×××öööÿÿÿÿÿÿÿÿÿÿÿÿôôôææææææÛÛÛ”””QQQMMMMMMMMMMMMMMMMMMMMMdddÅÅÅæææêêêåååZZZMMMMMMMMMMMM–––‹‹‹MMMMMMMMMMMMMMMMMM———úúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñññææææææôôôÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿîîîææææææúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýææææææìììÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿg’«U|U|ÙäêÿÿÿÿÿÿÿÿÿÿÿÿðôöU|U|P‚Ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ���MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNfff†††ššš¶¶¶ÔÔÔþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüÍÍÍ………OOOMMMMMMMMMMMMMMMMMMMMMMMM���àààæææóóóþþþàààMMMMMMZfZMMMMMMóóótttMMMMMMMMMMMMMMMMMMtttëëëÿÿÿÿÿÿÿÿÿþþþèèèææææææüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþéééææææææþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿøøøææææææðððÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿP‚žU|U|ñõ÷ÿÿÿÿÿÿÿÿÿÿÿÿþþþ[�U|6p�ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ­­­MMMMMMMMMMMMMMMWWWwww———···×××öööÿÿÿÿÿÿìììææææææûûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÜÜ܇‡‡NNNMMMMMMMMMMMMMMMMMMMMMMMM]]]»»»ææææææóóóÿÿÿÿÿÿ½½½MMMMMMz¢yPSPMMMfffÿÿÿììì^^^MMMMMMVQMROMMMMMMM\\\ÐÐÐÿÿÿÿÿÿôôôææææææîîîÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûææææææìììÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿôôôææææææõõõÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ6p�U|\�þþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ<t“U|W~öùúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÏÏÏdddŸŸŸÇÇÇèèèþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿòòòææææææôôôÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÖÖÖ���MMMMMMMMMMMMOYWVvoOUSMMMMMMMMM………ÛÛÛææææææóóóÿÿÿÿÿÿÿÿÿ•••MMMMMM�ÉŽ_n^MMMNNNøøøÿÿÿÖÖÖQQQMMMMMM—oSbVNMMMMMMOOO¬¬¬üüüèèèææææææúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿôôôææææææòòòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿïïïææææææùùùÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöùúW~U|<t“ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿj•­U|U|ËÚâÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþææææææéééÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúúúææææææìììÿÿÿÿÿÿÿÿÿÿÿÿÐÐÐzzzMMMMMMMMMMMMQ^[b£•\�‚MMMMMMMMMXXX¸¸¸æææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿlllMMMNON¢í¡nŠmMMMMMMÜÜÜÿÿÿÿÿÿ¶¶¶MMMMMMROMÈ…X|bQMMMMMMMMM€€€ÝÝÝæææíííÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿìììææææææúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿéééææææææþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÊÙâU|U|k•®ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿš·ÇU|U|œ¸Èÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿìììææææææüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþéééææææææûûûÿÿÿÿÿÿÿÿÿ………MMMMMMMMMRb^i´¢rÕ¾TidMMMMMMMMMzzzàààæææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿóóóNNNMMM`p`§õ¦}¦|MMMMMM¾¾¾ÿÿÿÿÿÿþþþ’’’MMMMMMaVNå“Z sTNMMMMMMMMcccÌÌÌüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûææææææéééþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüææææææìììÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ›·ÈU|U|›·ÈÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÉÙáU|U|l–®ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿòòòææææææõõõÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóææææææñññÿÿÿÿÿÿÿÿÿÛÛÛMMMMMMMMMyðÔf§˜MOOMMMMMMRRR¤¤¤äääæææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÌÌÌMMMMMMw˜v§õ¦ŒÃ‹MMMMMM   ÿÿÿÿÿÿÿÿÿúúússsMMMMMMyaPñ˜[ÃWXRMMMMMMMTTTÀÀÀÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñññææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿõõõææææææòòòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿk•®U|U|ÊÙâÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿõøùV}U|=t”ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿøøøææææææîîîÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüææææææçççýýýÿÿÿÿÿÿÿÿÿ†††MMMMMMMMMMMMMMMMMMpppÔÔÔææææææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¤¤¤MMMMMMŽÀŒ§õ¦œàšMMMMMM���ÿÿÿÿÿÿÿÿÿÿÿÿììì]]]MMMMMM™pSôš\Ý�Zl[OMMMMMMMMMšššúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýçççææææææüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿíííææææææùùùÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ<t“U|W~öùúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ:r’U|W~ñõ÷ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþèèèææææææýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿïïïææææææóóóÿÿÿÿÿÿÿÿÿæææRRRMMMMMMMMMOOO¤¤¤ûûûòòòææææææææææææöööÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ|||MMMMMM¥ê£§õ¦¦ó¤QVQMMMcccÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÔÔÔPPPMMMMMMºVôš\î—[ŽkTMMMMMMMMMvvvìììÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóææææææïïïÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýææææææèèèþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñõ÷W~U|;s“ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿw�´U|U|®ÅÒÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿðððææææææöööÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúúúææææææçççýýýÿÿÿÿÿÿÿÿÿ«««MMMMMMggg×××ÿÿÿóóóææææææææææææææææææïïïýýýÿÿÿÿÿÿÿÿÿüüüVVVMMMXaX±ÿ¯§õ¦§ô¥`r`MMMMMMõõõÿÿÿÿÿÿÿÿÿÿÿÿýýý«««MMMMMMSOMÕ‹Yôš\ó™[´}XQOMMMMMMM]]]ÓÓÓÿÿÿÿÿÿÿÿÿÿÿÿýýýçççææææææûûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöööææææææðððÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ­ÅÒU|U|wž´ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¿ÑÜU|U|f‘ªÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿøøøææææææìììÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿîîîææææææðððÿÿÿÿÿÿÿÿÿüüüuuu–––÷÷÷ÿÿÿóóóæææææææææòòòïïïæææææææææèèèôôôþþþÿÿÿÜÜÜMMMMMMn‰n±ÿ¯§õ¦§ô¥p�pMMMMMMØØØÿÿÿÿÿÿþþþôôôèèèåå円†MMMMMMcWOè”Zôš\ôš\Ö�\aWOMMMMMMOOO®®®þþþÿÿÿÿÿÿðððææææææîîîÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿìììææææææøøøÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿe‘ªU|U|ÀÒÜÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùûû^ƒU|!`…ûüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþéééææææææûûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüæææææææææùùùÿÿÿÿÿÿÿÿÿùùùÿÿÿÿÿÿóóóæææææææææóóóÿÿÿþþþôôôçççæææææææææèèèñññ°°°MMMMMM…²„±ÿ¯§õ¦§ô¥«MMMMMMºººúúúñññèèèæææææææææâââoooMMMMMM|cRò™[ôš\ôš\ì˜_}dSMMMMMMMMM‡‡‡õõõùùùæææææææææüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûææææææéééþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúûü `„U|_„úûüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿaŽ¨U|U|ÄÕÞÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóææææææñññÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿòòòææææææêêêþþþÿÿÿÿÿÿÿÿÿÿÿÿóóóæææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿüüüíííææææææææææææ‚‚‚MMMMMM—Õ–¬úª§õ¥§ô¥�È�MMMMMM’’’æææææææææææææææíííüüüêêê\\\MMMMMM�sVôš\ôš\ôš\÷ž`£wYMMMMMMMMMiiiÐÐÐææææææòòòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñññææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÃÔÞU|U|b�¨ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿªÂÐU|U|{¡¶ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüææææææçççýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþëëëææææææïïïÿÿÿÿÿÿÿÿÿóóóæææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúúúîîîææææææ___MMMPTP¥ð£§ô¥§ô¥§ô¥žãœMMMMMMwwwæææææææææîîîúúúÿÿÿÿÿÿÿÿÿÓÓÓOOOMMMMMMÁ„Zôš\ôš\ôš\úŸaɉ^XRNMMMMMMTTT²²²ëëëþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýçççææææææüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿz ¶U|U|«ÃÐÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿîóõX~U|)f‰úûüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿðððææææææòòòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúúúæææææææææôôôÿÿÿóóóæææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüâââMMMMMMcvb§ô¥§ô¥§ô¥§ô¥¦ó¤SYSMMM]]]íííôôôüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ²²²MMMMMMUQNÜ�]ôš\ôš\ôš\úŸaå—bl\PMMMMMMMMM™™™ûûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñññææææææðððÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúûü(eˆU|X~ïóöÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ]‹¥U|U|´ÉÕÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüææææææçççüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿõõõæææææææææïïïæææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÃÃÃMMMMMM{¡{­û¬­ú«§õ¥§ô¥§õ¥dwcMMMMMMóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþŽŽŽMMMMMMeYPî™_ôš\ôš\ôš\øž_í–[ŠiRMMMMMMMMMwwwíííÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüçççææææææüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ³ÉÕU|U|]‹¦ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿºÎÙU|U|U†¡ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿðððææææææðððÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñññæææææææææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿšššMMMMMM“Ê’±ÿ¯±ÿ¯§õ¦§ô¥§õ¦v–uMMMMMMÕÕÕÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿøøøpppMMMMMM€fT÷ž`ôš\ôš\ôš\ôš\ó™[±|XQOMMMMMMM^^^ÔÔÔÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿðððææææææðððÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿT…¡U|U|»ÏÚÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüýý.jŒU|U|ÛåëÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüçççææææææúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþêêêæææææææææïïïÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿrrrMMMMMM©ò¨±ÿ¯±ÿ¯§õ¦§ô¥§õ¦‡´…MMMMMM···ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿééé[[[MMMMMM¢vXøž_ôš\ôš\ôš\öœ]þ¤e×�``VOMMMMMMOOO°°°þþþÿÿÿÿÿÿÿÿÿÿÿÿúúúææææææçççüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÚåêU|U|.jŒüýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ‘±ÃU|U|v�³ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóææææææëëëþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóæææææææææææææææôôôÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿøøøPPPMMM]j]±ÿ¯±ÿ¯±ÿ¯§õ¦§ô¥§õ¦—Ò–MMMMMM˜˜˜ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÐÐÐOOOMMMMMM¾�Wôš\ôš\ôš\ôš\úŸaÿ¤fïœc{cSMMMMMMMMMŠŠŠöööÿÿÿÿÿÿþþþëëëææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿuœ³U|U|’±Ãÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿïóö\�U|\�éïóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþéééææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóæææææææææêêêæææææææææïïïþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÓÓÓMMMMMMt“s±ÿ¯±ÿ¯±ÿ¯§õ¦§ô¥§õ¦©ñ§MMMMMMzzzÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¯¯¯MMMMMMUPMØ�Yöœ]ôš\ôš\ôš\úŸaÿ¤fü¢e vXMMMMMMMMMjjjãããÿÿÿóóóææææææéééþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèïò\�U|\�ïóöÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿw�´U|U|uœ³ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùùùæææææææææúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóæææææææææóóóþþþñññæææææææææêêêùùùÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ©©©MMMMMM‹»‰±ÿ¯±ÿ¯±ÿ¯§õ¦§ô¥§õ¦±ÿ¯V]VMMM\\\ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùùùéé郃ƒMMMMMMfXOòžcúŸaôš\ôš\ôš\úŸaÿ¤fÿ¤fƈ^VQNMMMMMMVVVÁÁÁæææææææææùùùÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿt›²U|U|wž´ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿéïó\‚U|X~Þçíÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñññææææææéééýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóæææææææææóóóÿÿÿÿÿÿÿÿÿõõõçççæææææææææðððýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ���MMMMMM¢ä ±ÿ¯±ÿ¯±ÿ¯§õ¦§ô¥§õ¦±ÿ¯g|fMMMMMMðððÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýðððææææææàààjjjMMMMMM�fTý£eúŸaôš\ôš\ôš\úŸaÿ¤fÿ¤fä—bl\QMMMMMMMMM“““ãããñññÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÝçìX~U|\‚éïóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ…¨¼U|U|d�©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþêêêææææææíííþþþÿÿÿÿÿÿÿÿÿóóóæææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûêêêæææææææææçççóóóýýýÿÿÿÿÿÿÿÿÿÿÿÿýýýYYYMMMU[U°þ®±ÿ¯±ÿ¯±ÿ¯§õ¦§ô¥§õ¦±ÿ¯w™wMMMMMMÒÒÒÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýóóóçççæææææææææêêêäääZZZMMMMMM¤wYÿ¤fúŸaôš\ôš\ôš\úŸaÿ¤fÿ¤f÷ d‹kUMMMMMMMMMtttîîîÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿc�©U|U|†©¼ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñõ÷$b†U|U|ÑÞåÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûçççææææææòòòÿÿÿÿÿÿóóóæææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþóóóææææææææææææçççñññûûûÿÿÿÿÿÿâââMMMMMMkƒk±ÿ¯±ÿ¯±ÿ¯±ÿ¯§õ¦§ô¥§õ¦±ÿ¯‰·‡MMMMMM³³³ÿÿÿÿÿÿÿÿÿÿÿÿûûûñññçççææææææææææææóóóþþþÿÿÿÏÏÏOOOMMMMMMlj^ÿ¤fúŸaôš\ôš\ôš\úŸaÿ¤fÿ¤føž`¬yUPNMMMMMMM___ÖÖÖÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÐÝåU|U|$b†ñõ÷ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ–´ÅU|U|K~œýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷æææææææææôôôóóóæææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûïïïæææææææææææææææìììôôô···MMMMMM‚¬�±ÿ¯±ÿ¯±ÿ¯±ÿ¯§õ¦§ô¥§õ¦±ÿ¯™Õ˜MMMMMM•••ÿÿÿûûûôôôìììæææææææææææææææïïïûûûÿÿÿÿÿÿÿÿÿÿÿÿ®®®MMMMMMVQNã–bÿ¤fúŸaôš\ôš\ôš\úŸaú aôš\ôš\ΈX^UOMMMMMMPPP³³³þþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýK~œU|U|—µÆÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿøúû0k�U|U|š·Çÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿôôôææææææææææææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúúúïïïææææææææææææææ懇‡MMMMMMjƒj‘È�Ÿß�¨ñ§¯ü­§õ¦§ô¥¦ó¤¨ñ§™Ô—MMMMMMssséééææææææææææææææææææïïïúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþŠŠŠMMMMMMhZPõŸdÿ¤fúŸaôš\ôš\ôš\ôš\ôš\ôš\ú aî›cybSMMMMMMMMMŒŒŒ÷÷÷ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ™¶ÇU|U|0k�øúûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÁÓÝU|U|\�ÞçíÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñññææææææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüóóóéééæææææædddMMMMMMMMMMMMMMMMMMMMMOQOOQOMMMMMMMMMMMMMMMWWWåååæææææææææêêêóóóüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷mmmMMMMMMƒgTý£eÿ¤fúŸaôš\ôš\ôš\ôš\ùž`ÿ¤fÿ¤fü¢e�tXMMMMMMMMMnnnûûûÿÿÿÿÿÿÿÿÿÞçí\�U|U|ÂÓÝÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿs›²U|U|K~œýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿòòòææææææææææææõõõÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþúúúîîîrrrQQQMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM×××ìììóóóúúúþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿçççYYYMMMMMM¦xYÿ¤fú bôš\ôš\ôš\ôš\ùŸaÿ¤fÿ¤fÿ¤fà”aMMMMMMMMM®®®ÿÿÿÿÿÿÿÿÿýýýK~œU|U|t›²ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿó÷ø/jŒU|U|™¶Çÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóææææææææææææææææææñññþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùùù××׶¶¶œœœ‡‡‡yyyooojjjjjjnnnyyy‡‡‡œœœ¶¶¶ÖÖÖùùùÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÍÍÍNNNMMMMMMÅ…Zôš\ôš\ôš\ôš\ôš\ôš\úŸaÿ¤fì›caWOMMMMMMŠŠŠþþþÿÿÿÿÿÿÿÿÿ˜µÆU|U|0k�ó÷øÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÂÓÝU|U|Z€ÎÜäÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóæææææææææòòòñññæææææææææíííýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ«««MMMMMMVQMÛŽYôš\ùž`ùŸaôš\ôš\ôš\í™_l\QMMMMMMqqqøøøÿÿÿÿÿÿÿÿÿÍÛãZ€U|U|ÃÔÞÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿv�³U|U|*gŠçîòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóóæææææææææóóóÿÿÿþþþôôôæææææææææéééúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùùù€€€MMMMMMhYOñ›_ÿ¤fÿ¤fúŸaôš\ê•[p]PMMMMMMcccîîîÿÿÿÿÿÿÿÿÿçîò*f‰U|U|w�´ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùûûI}›U|U|Dz˜÷ùúÿÿÿÿÿÿÿÿÿÿÿÿóóóæææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷çççæææææææææóóóþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþóóóæææÞÞÞgggMMMMMM…hTý£eÿ¤fÿ¤fí™_p]PMMMMMM\\\åååÿÿÿÿÿÿÿÿÿ÷ùúDz˜U|U|I}›ùûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿêðó,h‹U|U|j”­þþþÿÿÿÿÿÿóóóæææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûëëëæææææææææëëëúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúúúëëëæææææææææÔÔÔWWWMMMMMM©zYÿ¤fì›cl\QMMMMMMYYYËËËóóóÿÿÿÿÿÿþþþh“«U|U|-i‹êðóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÒßæ\�U|U|�¯ÁÿÿÿóóóæææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþñññææææææææææææðððüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüðððææææææææææææñññþþþËËËNNNMMMNMM¬{ZbWPMMMMMM\\\ËËËææææææóóóÿÿÿ�¯ÁU|U|\�Òßæÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¯ÆÓU|U|U|”°Áæææææææææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùùùêêêæææææææææçççòòòýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýòòòçççæææææææææêêêùùùÿÿÿÿÿÿÿÿÿ©©©MMMMMMMMMMMMMMMcccåååóóóæææææææææ“°ÀU|U|U|±ÇÔÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿŽ®ÀU|U|U|�¬»æææóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþóóóçççæææææææææçççðððûûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûðððçççæææææææææçççóóóþþþÿÿÿÿÿÿÿÿÿÿÿÿýýý………MMMMMMMMMqqqîîîÿÿÿÿÿÿóóóæææ�¬»U|U|U|�¯Áÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ„§»U|U|U|”°ÁÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüðððæææææææææææææææìììõõõýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýõõõìììæææææææææææææææðððüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿõõõjjjMMMŠŠŠøøøÿÿÿÿÿÿÿÿÿÿÿÿ“°ÀU|U|U|„§»ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþ~£¸U|U|U|�¯Áþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûðððæææææææææææææææçççîîîõõõüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüõõõîîîçççææææææææææææçççðððûûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿãã㯯¯þþþÿÿÿÿÿÿÿÿÿþþþ�¯ÁU|U|U|~£¸þþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþ„§»U|U|U|j”­÷ùúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýóóóéééææææææææææææææææææéééïïïôôôùùùüüüþþþÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿþþþüüüùùùôôôïïïéééææææææææææææææææææéééóóóýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷ùúi“¬U|U|U|…¨¼þþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿŽ®ÀU|U|U|Dz˜çîòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþùùùïïïçççææææææææææææææææææææææææçççêêêëëëíííïïïæææææææææíííëëëêêêçççææææææææææææææææææææææææçççïïïùùùþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿæíñDz˜U|U|U|�¯Áÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ°ÇÓ\�U|U|*f‰ÍÛãÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþùùùòòòëëëææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææææëëëòòòùùùþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÍÛã*f‰U|U|\�°ÇÓÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÒßæ-i‹U|U|Z€˜µÆýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþùùùôôôðððíííéééçççææææææææææææææææææææææææçççéééíííðððôôôùùùþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýý˜µÆZ€U|U|-i‹ÒßæÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿêðóH|šU|U|U|K~œÞçíÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüûûûçççæææçççüüüþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÞçíK~œU|U|U|I}›êðóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùûûw�´U|U|U|\�™¶Çýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýý™¶Ç\�U|U|U|w�´ùûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÂÓÝ/jŒU|U|U|K~œÑÞåÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÑÞåK~œU|U|U|/jŒÂÓÝÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿó÷øs›²U|U|U|U|c�©ÞçíÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÝçìc�©U|U|U|U|t›²ó÷øÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÁÓÝ0k�U|U|U|X~t›²èïòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèïòt›²X~U|U|U|0k�ÁÓÝÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿøúû—µÆ$b†U|U|U|\�uœ³ÛåëÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÛåëuœ³\�U|U|U|$b†—µÆøúûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñõ÷†©¼\‚U|U|U|U|T…¡´ÉÕúûüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúûü³ÉÕT…¡U|U|U|U|\‚‡©½òöøÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿéïówž´\�U|U|U|U|(eˆz ¶ÃÔÞûüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûüüÃÔÞz ¶(eˆU|U|U|U|\�wž´éïóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿïóö’±Ã.jŒU|U|U|U|U|!`…e‘ª­ÅÒñõ÷ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñõ÷­ÅÒe‘ª!`…U|U|U|U|U|.jŒ’±Ãïóöÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüýý»ÏÚ]‹¦X~U|U|U|U|U|W~<t“k•®›·ÈÊÙâöùúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿèèèæææèèèÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöùúÊÙâ›·Èk•®<t“W~U|U|U|U|U|X~]‹¦¼ÏÚüýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿïóö«ÃÐb�¨^ƒU|U|U|U|U|U|U|W~6p�P‚žg’«~£¸•³Å¬ÄѽÐÛÁÓݳÄͲÂÌ°Á̽ÐÛ¬ÄÑ•³Å~£¸g’«P‚ž6p�W~U|U|U|U|U|U|U|^ƒc�©«ÃÐïóöÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùûûÀÒÜwž´;s“W~U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|W~;s“xŸµÀÒÜùûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿõøùÊÙâ›·Èk•®<t“[�U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|U|[�<t“k•®›·ÈÊÙâöùúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþñõ÷ÙäêÁÓݪÂÐ’±Ã…¨¼‚¥º}¢·}¢·‚¥º…¨¼’±ÃªÂÐÂÓÝÙäêñõ÷þþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
\ No newline at end of file
diff --git a/lib/matplotlib/mpl-data/kpsewhich.lua b/lib/matplotlib/mpl-data/kpsewhich.lua
new file mode 100644
index 000000000000..8e9172a45082
--- /dev/null
+++ b/lib/matplotlib/mpl-data/kpsewhich.lua
@@ -0,0 +1,3 @@
+-- see dviread._LuatexKpsewhich
+kpse.set_program_name("latex")
+while true do print(kpse.lookup(io.read():gsub("\r", ""))); io.flush(); end
diff --git a/matplotlibrc.template b/lib/matplotlib/mpl-data/matplotlibrc
similarity index 89%
rename from matplotlibrc.template
rename to lib/matplotlib/mpl-data/matplotlibrc
index d5d55c81d197..8dff1a6c6c33 100644
--- a/matplotlibrc.template
+++ b/lib/matplotlib/mpl-data/matplotlibrc
@@ -5,10 +5,7 @@
 ## This is a sample Matplotlib configuration file - you can find a copy
 ## of it on your system in site-packages/matplotlib/mpl-data/matplotlibrc
 ## (relative to your Python installation location).
-##
-## You should find a copy of it on your system at
-## site-packages/matplotlib/mpl-data/matplotlibrc (relative to your Python
-## installation location).  DO NOT EDIT IT!
+## DO NOT EDIT IT!
 ##
 ## If you wish to change your default style, copy this file to one of the
 ## following locations:
@@ -19,7 +16,7 @@
 ##         $HOME/.matplotlib/matplotlibrc
 ## and edit that copy.
 ##
-## See https://matplotlib.org/users/customizing.html#the-matplotlibrc-file
+## See https://matplotlib.org/stable/tutorials/introductory/customizing.html#customizing-with-matplotlibrc-files
 ## for more details on the paths which are checked for the configuration file.
 ##
 ## Blank lines, or lines starting with a comment symbol, are ignored, as are
@@ -33,10 +30,17 @@
 ## Colors: for the color values below, you can either use
 ##     - a Matplotlib color string, such as r, k, or b
 ##     - an RGB tuple, such as (1.0, 0.5, 0.0)
-##     - a hex string, such as ff00ff
+##     - a double-quoted hex string, such as "#ff00ff".
+##       The unquoted string ff00ff is also supported for backward
+##       compatibility, but is discouraged.
 ##     - a scalar grayscale intensity such as 0.75
 ##     - a legal html color name, e.g., red, blue, darkslategray
 ##
+## String values may optionally be enclosed in double quotes, which allows
+## using the comment character # in the string.
+##
+## This file (and other style files) must be encoded as utf-8.
+##
 ## Matplotlib configuration are currently divided into following parts:
 ##     - BACKENDS
 ##     - LINES
@@ -71,14 +75,14 @@
 ## ***************************************************************************
 ## The default backend.  If you omit this parameter, the first working
 ## backend from the following list is used:
-##     MacOSX Qt5Agg Gtk3Agg TkAgg WxAgg Agg
+##     MacOSX QtAgg Gtk4Agg Gtk3Agg TkAgg WxAgg Agg
 ## Other choices include:
-##     Qt5Cairo GTK3Cairo TkCairo WxCairo Cairo
-##     Qt4Agg Qt4Cairo Wx  # deprecated.
+##     QtCairo GTK4Cairo GTK3Cairo TkCairo WxCairo Cairo
+##     Qt5Agg Qt5Cairo Wx  # deprecated.
 ##     PS PDF SVG Template
 ## You can also deploy your own backend outside of Matplotlib by referring to
 ## the module name (which must be in the PYTHONPATH) as 'module://my_backend'.
-#backend: Agg
+##backend: Agg
 
 ## The port to use for the web server in the WebAgg backend.
 #webagg.port: 8988
@@ -130,10 +134,10 @@
 
 #markers.fillstyle: full  # {full, left, right, bottom, top, none}
 
-#pcolor.shading : flat
-#pcolormesh.snap : True  # Whether to snap the mesh to pixel boundaries. This
-                         # is provided solely to allow old test images to remain
-                         # unchanged. Set to False to obtain the previous behavior.
+#pcolor.shading: auto
+#pcolormesh.snap: True  # Whether to snap the mesh to pixel boundaries. This is
+                        # provided solely to allow old test images to remain
+                        # unchanged. Set to False to obtain the previous behavior.
 
 ## ***************************************************************************
 ## * PATCHES                                                                 *
@@ -141,7 +145,7 @@
 ## Patches are graphical objects that fill 2D space, like polygons or circles.
 ## See https://matplotlib.org/api/artist_api.html#module-matplotlib.patches
 ## for more information on patch properties.
-#patch.linewidth:       1      # edge width in points.
+#patch.linewidth:       1.0    # edge width in points.
 #patch.facecolor:       C0
 #patch.edgecolor:       black  # if forced, or patch is not filled
 #patch.force_edgecolor: False  # True to always use edgecolor
@@ -211,9 +215,9 @@
 ## on font properties.  The 6 font properties used for font matching are
 ## given below with their default values.
 ##
-## The font.family property can take either a concrete font name (not supported
-## when rendering text with usetex), or one of the following five generic
-## values:
+## The font.family property can take either a single or multiple entries of any
+## combination of concrete font names (not supported when rendering text with
+## usetex) or the following five generic values:
 ##     - 'serif' (e.g., Times),
 ##     - 'sans-serif' (e.g., Helvetica),
 ##     - 'cursive' (e.g., Zapf-Chancery),
@@ -276,6 +280,29 @@
 ## for more information on text properties
 #text.color: black
 
+## FreeType hinting flag ("foo" corresponds to FT_LOAD_FOO); may be one of the
+## following (Proprietary Matplotlib-specific synonyms are given in parentheses,
+## but their use is discouraged):
+## - default: Use the font's native hinter if possible, else FreeType's auto-hinter.
+##            ("either" is a synonym).
+## - no_autohint: Use the font's native hinter if possible, else don't hint.
+##                ("native" is a synonym.)
+## - force_autohint: Use FreeType's auto-hinter.  ("auto" is a synonym.)
+## - no_hinting: Disable hinting.  ("none" is a synonym.)
+#text.hinting: force_autohint
+
+#text.hinting_factor: 8  # Specifies the amount of softness for hinting in the
+                         # horizontal direction.  A value of 1 will hint to full
+                         # pixels.  A value of 2 will hint to half pixels etc.
+#text.kerning_factor: 0  # Specifies the scaling factor for kerning values.  This
+                         # is provided solely to allow old test images to remain
+                         # unchanged.  Set to 6 to obtain previous behavior.
+                         # Values  other than 0 or 6 have no defined meaning.
+#text.antialiased: True  # If True (default), the text will be antialiased.
+                         # This only affects raster outputs.
+#text.parse_math: True  # Use mathtext if there is an even number of unescaped
+                        # dollar signs.
+
 
 ## ***************************************************************************
 ## * LaTeX                                                                   *
@@ -288,9 +315,6 @@
                      # zapf chancery, charter, serif, sans-serif, helvetica,
                      # avant garde, courier, monospace, computer modern roman,
                      # computer modern sans serif, computer modern typewriter
-                     # If another font is desired which can loaded using the
-                     # LaTeX \usepackage command, please inquire at the
-                     # Matplotlib mailing list
 #text.latex.preamble:   # IMPROPER USE OF THIS FEATURE WILL LEAD TO LATEX FAILURES
                         # AND IS THEREFORE UNSUPPORTED. PLEASE DO NOT ASK FOR HELP
                         # IF THIS FEATURE DOES NOT DO WHAT YOU EXPECT IT TO.
@@ -301,33 +325,12 @@
                         # statements.
                         # 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.
-                        # Adobe Postscript (PSSNFS) font packages may also be
+                        # The following packages are always loaded with usetex,
+                        # so beware of package collisions:
+                        #   geometry, inputenc, type1cm.
+                        # PostScript (PSNFSS) font packages may also be
                         # loaded, depending on your font settings.
 
-## FreeType hinting flag ("foo" corresponds to FT_LOAD_FOO); may be one of the
-## following (Proprietary Matplotlib-specific synonyms are given in parentheses,
-## but their use is discouraged):
-## - default: Use the font's native hinter if possible, else FreeType's auto-hinter.
-##            ("either" is a synonym).
-## - no_autohint: Use the font's native hinter if possible, else don't hint.
-##                ("native" is a synonym.)
-## - force_autohint: Use FreeType's auto-hinter.  ("auto" is a synonym.)
-## - no_hinting: Disable hinting.  ("none" is a synonym.)
-#text.hinting: force_autohint
-
-#text.hinting_factor: 8  # Specifies the amount of softness for hinting in the
-                         # horizontal direction.  A value of 1 will hint to full
-                         # pixels.  A value of 2 will hint to half pixels etc.
-#text.kerning_factor : 0  # Specifies the scaling factor for kerning values. This
-                          # is provided solely to allow old test images to remain
-                          # unchanged. Set to 6 to obtain previous behavior. Values
-                          # other than 0 or 6 have no defined meaning.
-#text.antialiased: True  # If True (default), the text will be antialiased.
-                         # This only affects the Agg backend.
-
 ## The following settings allow you to select the fonts in math mode.
 #mathtext.fontset: dejavusans  # Should be 'dejavusans' (default),
                                # 'dejavuserif', 'cm' (Computer Modern), 'stix',
@@ -509,10 +512,10 @@
 ## ***************************************************************************
 ## * GRIDS                                                                   *
 ## ***************************************************************************
-#grid.color:     b0b0b0  # grid color
-#grid.linestyle: -       # solid
-#grid.linewidth: 0.8     # in points
-#grid.alpha:     1.0     # transparency, between 0.0 and 1.0
+#grid.color:     "#b0b0b0"  # grid color
+#grid.linestyle: -          # solid
+#grid.linewidth: 0.8        # in points
+#grid.alpha:     1.0        # transparency, between 0.0 and 1.0
 
 
 ## ***************************************************************************
@@ -530,6 +533,7 @@
 #legend.scatterpoints: 1        # number of scatter points
 #legend.markerscale:   1.0      # the relative size of legend markers vs. original
 #legend.fontsize:      medium
+#legend.labelcolor:    None
 #legend.title_fontsize: None    # None sets to the same as the default axes.
 
 ## Dimensions as fraction of font size:
@@ -548,6 +552,8 @@
 ## See https://matplotlib.org/api/figure_api.html#matplotlib.figure.Figure
 #figure.titlesize:   large     # size of the figure title (``Figure.suptitle()``)
 #figure.titleweight: normal    # weight of the figure title
+#figure.labelsize:   large     # size of the figure label (``Figure.sup[x|y]label()``)
+#figure.labelweight: normal    # weight of the figure label
 #figure.figsize:     6.4, 4.8  # figure size in inches
 #figure.dpi:         100       # figure dots per inch
 #figure.facecolor:   white     # figure face color
@@ -584,12 +590,12 @@
 ## ***************************************************************************
 ## * IMAGES                                                                  *
 ## ***************************************************************************
-#image.aspect: equal                # {equal, auto} or a number
-#image.interpolation:  antialiased  # see help(imshow) for options
-#image.cmap:   viridis              # A colormap name, gray etc...
-#image.lut:    256                  # the size of the colormap lookup table
-#image.origin: upper                # {lower, upper}
-#image.resample:  True
+#image.aspect:          equal        # {equal, auto} or a number
+#image.interpolation:   antialiased  # see help(imshow) for options
+#image.cmap:            viridis      # A colormap name (plasma, magma, etc.)
+#image.lut:             256          # the size of the colormap lookup table
+#image.origin:          upper        # {lower, upper}
+#image.resample:        True
 #image.composite_image: True  # When True, all the images on a set of axes are
                               # combined into a single composite image before
                               # saving a figure as a vector graphics file,
@@ -600,10 +606,11 @@
 ## * CONTOUR PLOTS                                                           *
 ## ***************************************************************************
 #contour.negative_linestyle: dashed  # string or on-off ink sequence
-#contour.corner_mask:        True    # {True, False, legacy}
+#contour.corner_mask:        True    # {True, False}
 #contour.linewidth:          None    # {float, None} Size of the contour line
                                      # widths. If set to None, it falls back to
                                      # `line.linewidth`.
+#contour.algorithm:          mpl2014 # {mpl2005, mpl2014, serial, threaded}
 
 
 ## ***************************************************************************
@@ -676,12 +683,14 @@
                                 # 'tight' is incompatible with pipe-based animation
                                 # backends (e.g. 'ffmpeg') but will work with those
                                 # based on temporary files (e.g. 'ffmpeg_file')
-#savefig.pad_inches:   0.1      # Padding to be used when bbox is set to 'tight'
-#savefig.directory:    ~        # default directory in savefig dialog box,
-                                # leave empty to always use current working directory
-#savefig.transparent: False     # setting that controls whether figures are saved with a
-                                # transparent background by default
-#savefig.orientation: portrait  # Orientation of saved figure
+#savefig.pad_inches:  0.1       # padding to be used, when bbox is set to 'tight'
+#savefig.directory:   ~         # default directory in savefig dialog, gets updated after
+                                # interactive saves, unless set to the empty string (i.e.
+                                # the current directory); use '.' to start at the current
+                                # directory but update after interactive saves
+#savefig.transparent: False     # whether figures are saved with a transparent
+                                # background by default
+#savefig.orientation: portrait  # orientation of saved figure, for PostScript output only
 
 ### tk backend params
 #tk.window_focus:   False  # Maintain shell focus for TkAgg
@@ -700,7 +709,7 @@
 #pdf.compression:    6  # integer from 0 to 9
                         # 0 disables compression (good for debugging)
 #pdf.fonttype:       3  # Output Type 3 (Type3) or Type 42 (TrueType)
-#pdf.use14corefonts : False
+#pdf.use14corefonts: False
 #pdf.inheritcolor:   False
 
 ### SVG backend params
@@ -726,9 +735,10 @@
 ## * INTERACTIVE KEYMAPS                                                     *
 ## ***************************************************************************
 ## Event keys to interact with figures/plots via keyboard.
-## See https://matplotlib.org/users/navigation_toolbar.html for more details on
-## interactive navigation.  Customize these settings according to your needs.
-## Leave the field(s) empty if you don't need a key-map. (i.e., fullscreen : '')
+## See https://matplotlib.org/stable/users/explain/interactive.html for more
+## details on interactive navigation.  Customize these settings according to
+## your needs. Leave the field(s) empty if you don't need a key-map. (i.e.,
+## fullscreen : '')
 #keymap.fullscreen: f, ctrl+f   # toggling
 #keymap.home: h, r, home        # home or reset mnemonic
 #keymap.back: left, c, backspace, MouseButton.BACK  # forward / backward keys
@@ -743,7 +753,7 @@
 #keymap.grid_minor: G           # switching on/off minor grids in current axes
 #keymap.yscale: l               # toggle scaling of y-axes ('log'/'linear')
 #keymap.xscale: k, L            # toggle scaling of x-axes ('log'/'linear')
-#keymap.copy: ctrl+c, cmd+c     # Copy figure to clipboard
+#keymap.copy: ctrl+c, cmd+c     # copy figure to clipboard
 
 
 ## ***************************************************************************
@@ -758,12 +768,18 @@
 #animation.bitrate: -1            # Controls size/quality trade-off for movie.
                                   # -1 implies let utility auto-determine
 #animation.frame_format: png      # Controls frame format used by temp files
-#animation.ffmpeg_path:  ffmpeg   # Path to ffmpeg binary. Without full path
-                                  # $PATH is searched
-#animation.ffmpeg_args:           # Additional arguments to pass to ffmpeg
-#animation.convert_path: convert  # Path to ImageMagick's convert binary.
-                                  # On Windows use the full path since convert
-                                  # is also the name of a system tool.
-#animation.convert_args:          # Additional arguments to pass to convert
+
+## Path to ffmpeg binary.  Unqualified paths are resolved by subprocess.Popen.
+#animation.ffmpeg_path:  ffmpeg
+## Additional arguments to pass to ffmpeg.
+#animation.ffmpeg_args:
+
+## Path to ImageMagick's convert binary.  Unqualified paths are resolved by
+## subprocess.Popen, except that on Windows, we look up an install of
+## ImageMagick in the registry (as convert is also the name of a system tool).
+#animation.convert_path: convert
+## Additional arguments to pass to convert.
+#animation.convert_args: -layers, OptimizePlus
+#
 #animation.embed_limit:  20.0     # Limit, in MB, of size of base64 encoded
                                   # animation in HTML (i.e. IPython notebook)
diff --git a/lib/matplotlib/mpl-data/sample_data/Stocks.csv b/lib/matplotlib/mpl-data/sample_data/Stocks.csv
new file mode 100644
index 000000000000..575d353dffe2
--- /dev/null
+++ b/lib/matplotlib/mpl-data/sample_data/Stocks.csv
@@ -0,0 +1,526 @@
+# Data source: https://finance.yahoo.com
+Date,IBM,AAPL,MSFT,XRX,AMZN,DELL,GOOGL,ADBE,^GSPC,^IXIC
+1990-01-01,10.970438003540039,0.24251236021518707,0.40375930070877075,11.202081680297852,,,,1.379060983657837,329.0799865722656,415.79998779296875
+1990-02-01,11.554415702819824,0.24251236021518707,0.43104037642478943,10.39472484588623,,,,1.7790844440460205,331.8900146484375,425.79998779296875
+1990-02-05,,,,,,,,,,
+1990-03-01,11.951693534851074,0.28801724314689636,0.4834197461605072,11.394058227539062,,,,2.2348830699920654,339.94000244140625,435.5
+1990-04-01,12.275476455688477,0.2817564308643341,0.5063362717628479,10.139430046081543,,,,2.2531447410583496,330.79998779296875,420.1000061035156
+1990-05-01,13.514284133911133,0.295173317193985,0.6372847557067871,9.704153060913086,,,,2.0985164642333984,361.2300109863281,459.0
+1990-05-04,,,,,,,,,,
+1990-06-01,13.380948066711426,0.3211067020893097,0.6634747385978699,9.749448776245117,,,,2.164785146713257,358.0199890136719,462.29998779296875
+1990-07-01,12.697657585144043,0.3013734817504883,0.5805402994155884,9.489465713500977,,,,2.069063901901245,356.1499938964844,438.20001220703125
+1990-08-01,11.601561546325684,0.26549553871154785,0.5368908047676086,8.553519248962402,,,,1.4750508069992065,322.55999755859375,381.20001220703125
+1990-08-06,,,,,,,,,,
+1990-09-01,12.251119613647461,0.20872052013874054,0.5499854683876038,7.255113124847412,,,,1.1210384368896484,306.04998779296875,344.5
+1990-10-01,12.15034294128418,0.22131578624248505,0.5565334558486938,6.248927116394043,,,,1.416249394416809,304.0,329.79998779296875
+1990-11-01,13.08609390258789,0.26449888944625854,0.6307373642921448,7.361023426055908,,,,1.4900128841400146,322.2200012207031,359.1000061035156
+1990-11-05,,,,,,,,,,
+1990-12-01,13.161062240600586,0.31051647663116455,0.6569272875785828,7.519896507263184,,,,1.7186784744262695,330.2200012207031,373.79998779296875
+1991-01-01,14.762505531311035,0.40078282356262207,0.8566243648529053,10.554410934448242,,,,2.242394208908081,343.92999267578125,414.20001220703125
+1991-02-01,14.995450973510742,0.4134202301502228,0.9057300686836243,12.286416053771973,,,,2.8402483463287354,367.07000732421875,453.1000061035156
+1991-02-04,,,,,,,,,,
+1991-03-01,13.39067268371582,0.49208223819732666,0.92646324634552,12.511940002441406,,,,3.1869795322418213,375.2200012207031,482.29998779296875
+1991-04-01,12.111870765686035,0.39800751209259033,0.8642628788948059,12.511940002441406,,,,3.0589873790740967,375.3399963378906,484.7200012207031
+1991-05-01,12.479341506958008,0.34011581540107727,0.9581103920936584,12.73144817352295,,,,2.9850986003875732,389.8299865722656,506.1099853515625
+1991-05-06,,,,,,,,,,
+1991-06-01,11.555957794189453,0.30108359456062317,0.89208984375,11.853414535522461,,,,2.5565452575683594,371.1600036621094,475.9200134277344
+1991-07-01,12.04675579071045,0.33554431796073914,0.9624748229980469,12.397871017456055,,,,3.1678967475891113,387.80999755859375,502.0400085449219
+1991-08-01,11.526222229003906,0.3845158815383911,1.1163398027420044,13.037229537963867,,,,3.012463331222534,395.42999267578125,525.6799926757812
+1991-08-06,,,,,,,,,,
+1991-09-01,12.478833198547363,0.3599340617656708,1.1654454469680786,13.740047454833984,,,,3.0346662998199463,387.8599853515625,526.8800048828125
+1991-10-01,11.83155345916748,0.37447676062583923,1.2292828559875488,14.41578483581543,,,,3.1431360244750977,392.45001220703125,542.97998046875
+1991-11-01,11.139124870300293,0.36902356147766113,1.2734787464141846,13.965290069580078,,,,2.846613883972168,375.2200012207031,523.9000244140625
+1991-11-04,,,,,,,,,,
+1991-12-01,10.851117134094238,0.4109107553958893,1.4568067789077759,15.42939281463623,,,,3.8844411373138428,417.0899963378906,586.3400268554688
+1992-01-01,10.973037719726562,0.4719553291797638,1.5746610164642334,17.584869384765625,,,,3.639812469482422,408.7799987792969,620.2100219726562
+1992-02-01,10.592026710510254,0.49199995398521423,1.61721932888031,18.04088020324707,,,,3.3547844886779785,412.70001220703125,633.469970703125
+1992-02-06,,,,,,,,,,
+1992-03-01,10.317353248596191,0.4253714978694916,1.5517452955245972,16.302349090576172,,,,3.043056011199951,403.69000244140625,603.77001953125
+1992-04-01,11.213163375854492,0.43906375765800476,1.4437123537063599,17.062589645385742,,,,2.631263494491577,414.95001220703125,578.6799926757812
+1992-05-01,11.213163375854492,0.4363253116607666,1.5844820737838745,17.263996124267578,,,,2.705594062805176,415.3500061035156,585.3099975585938
+1992-05-07,,,,,,,,,,
+1992-06-01,12.25231647491455,0.3505205810070038,1.3749638795852661,16.055517196655273,,,,2.705594062805176,408.1400146484375,563.5999755859375
+1992-07-01,11.861115455627441,0.34207984805107117,1.4289811849594116,17.38025665283203,,,,2.263554334640503,424.2099914550781,580.8300170898438
+1992-08-01,10.84400749206543,0.33659130334854126,1.4633547067642212,17.525571823120117,,,,1.9359338283538818,414.0299987792969,563.1199951171875
+1992-08-06,,,,,,,,,,
+1992-09-01,10.243829727172852,0.3310767114162445,1.58120858669281,18.464359283447266,,,,1.6753284931182861,417.79998779296875,583.27001953125
+1992-10-01,8.483662605285645,0.38518592715263367,1.7432584762573242,17.436922073364258,,,,2.12785267829895,418.67999267578125,605.1699829101562
+1992-11-01,8.658098220825195,0.42187052965164185,1.8291932344436646,18.493711471557617,,,,2.030792474746704,431.3500061035156,652.72998046875
+1992-11-05,,,,,,,,,,
+1992-12-01,6.505843639373779,0.43931084871292114,1.6769649982452393,18.788379669189453,,,,1.8814688920974731,435.7099914550781,676.9500122070312
+1993-01-01,6.651134490966797,0.43747296929359436,1.6990629434585571,20.329378128051758,,,,2.4787611961364746,438.7799987792969,696.3400268554688
+1993-02-01,7.022435188293457,0.38968151807785034,1.6376806497573853,19.618152618408203,,,,2.670894145965576,443.3800048828125,670.77001953125
+1993-02-04,,,,,,,,,,
+1993-03-01,6.6405534744262695,0.37947842478752136,1.8169171810150146,19.766319274902344,,,,2.573633909225464,451.6700134277344,690.1300048828125
+1993-04-01,6.346868991851807,0.3776364326477051,1.6794201135635376,18.451818466186523,,,,3.434307336807251,440.19000244140625,661.4199829101562
+1993-05-01,6.885295867919922,0.4172421991825104,1.8193715810775757,18.12286949157715,,,,3.959200859069824,450.19000244140625,700.530029296875
+1993-05-06,,,,,,,,,,
+1993-06-01,6.51603364944458,0.29166528582572937,1.7285257577896118,19.299583435058594,,,,3.7042527198791504,450.5299987792969,703.9500122070312
+1993-07-01,5.872671604156494,0.2049039751291275,1.453533411026001,17.638439178466797,,,,2.9742372035980225,448.1300048828125,704.7000122070312
+1993-08-01,6.037637233734131,0.19567380845546722,1.4756313562393188,17.759246826171875,,,,2.5536391735076904,463.55999755859375,742.8400268554688
+1993-08-05,,,,,,,,,,
+1993-09-01,5.574150562286377,0.1733584851026535,1.620492935180664,17.849544525146484,,,,2.1931254863739014,458.92999267578125,762.780029296875
+1993-10-01,6.105024337768555,0.22805523872375488,1.5738422870635986,19.34462547302246,,,,2.6137242317199707,467.8299865722656,779.260009765625
+1993-11-01,7.150176048278809,0.2336171418428421,1.5713871717453003,20.107433319091797,,,,2.786593437194824,461.7900085449219,754.3900146484375
+1993-11-04,,,,,,,,,,
+1993-12-01,7.535686016082764,0.21771006286144257,1.5836634635925293,22.01595687866211,,,,2.68115496635437,466.45001220703125,776.7999877929688
+1994-01-01,7.535686016082764,0.24376071989536285,1.672054648399353,24.171361923217773,,,,3.64516544342041,481.6099853515625,800.469970703125
+1994-02-01,7.052198886871338,0.27167221903800964,1.620492935180664,23.894229888916016,,,,3.5310842990875244,467.1400146484375,792.5
+1994-02-04,,,,,,,,,,
+1994-03-01,7.31842041015625,0.24837146699428558,1.6646885871887207,23.706161499023438,,,,2.9274797439575195,445.7699890136719,743.4600219726562
+1994-04-01,7.703606128692627,0.22409436106681824,1.8169171810150146,24.543949127197266,,,,3.2354440689086914,450.9100036621094,733.8400268554688
+1994-05-01,8.440468788146973,0.21849241852760315,2.1115520000457764,24.947307586669922,,,,3.4773480892181396,456.5,735.1900024414062
+1994-05-05,,,,,,,,,,
+1994-06-01,7.905290126800537,0.19873161613941193,2.028071165084839,24.444643020629883,,,,3.2959203720092773,444.2699890136719,705.9600219726562
+1994-07-01,8.325791358947754,0.2526327669620514,2.023160934448242,25.569963455200195,,,,3.756444215774536,458.260009765625,722.1599731445312
+1994-08-01,9.217235565185547,0.27138155698776245,2.2834222316741943,26.789077758789062,,,,3.847325563430786,475.489990234375,765.6199951171875
+1994-08-04,,,,,,,,,,
+1994-09-01,9.405942916870117,0.25350791215896606,2.2048532962799072,26.88198471069336,,,,3.9382081031799316,462.7099914550781,764.2899780273438
+1994-10-01,10.064526557922363,0.324998676776886,2.474935293197632,25.811735153198242,,,,4.368794918060303,472.3500061035156,777.489990234375
+1994-11-01,9.557921409606934,0.28031668066978455,2.470024824142456,24.741479873657227,,,,4.004726409912109,453.69000244140625,750.3200073242188
+1994-11-04,,,,,,,,,,
+1994-12-01,9.9633207321167,0.2943686842918396,2.401276111602783,25.12115478515625,,,,3.6103241443634033,459.2699890136719,751.9600219726562
+1995-01-01,9.77692985534668,0.3047473132610321,2.332528591156006,27.753808975219727,,,,3.5117223262786865,470.4200134277344,755.2000122070312
+1995-02-01,10.200541496276855,0.29814332723617554,2.474935293197632,28.13443946838379,,,,4.345465660095215,487.3900146484375,793.72998046875
+1995-02-06,,,,,,,,,,
+1995-03-01,11.169903755187988,0.2667955756187439,2.7941226959228516,29.989917755126953,,,,6.016797065734863,500.7099914550781,817.2100219726562
+1995-04-01,12.870043754577637,0.2895018756389618,3.2115228176116943,31.52293586730957,,,,7.08742618560791,514.7100219726562,843.97998046875
+1995-05-01,12.649023056030273,0.31457316875457764,3.326920747756958,28.96788215637207,,,,6.326970100402832,533.4000244140625,864.5800170898438
+1995-05-04,,,,,,,,,,
+1995-06-01,13.091790199279785,0.3524453043937683,3.5503528118133545,30.15083122253418,,,,7.057007789611816,544.75,933.4500122070312
+1995-07-01,14.847586631774902,0.3415350615978241,3.5552642345428467,30.697277069091797,,,,7.513277530670166,562.0599975585938,1001.2100219726562
+1995-08-01,14.09753131866455,0.32635587453842163,3.6338343620300293,31.08300018310547,,,,6.210629463195801,561.8800048828125,1020.1099853515625
+1995-08-08,,,,,,,,,,
+1995-09-01,12.916881561279297,0.28348639607429504,3.5552642345428467,34.767181396484375,,,,6.301961898803711,584.4099731445312,1043.5400390625
+1995-10-01,13.292764663696289,0.27635207772254944,3.92846941947937,33.5381965637207,,,,6.941293239593506,581.5,1036.06005859375
+1995-11-01,13.207347869873047,0.2901458144187927,3.4226772785186768,35.478694915771484,,,,8.243063926696777,605.3699951171875,1059.199951171875
+1995-11-08,,,,,,,,,,
+1995-12-01,12.52143669128418,0.24333631992340088,3.447230815887451,35.68303298950195,,,,7.557409763336182,615.9299926757812,1052.1300048828125
+1996-01-01,14.868143081665039,0.21089188754558563,3.6338343620300293,32.199371337890625,,,,4.14438533782959,636.02001953125,1059.7900390625
+1996-02-01,16.80373764038086,0.2099376916885376,3.876908779144287,33.924922943115234,,,,4.089058876037598,640.4299926757812,1100.050048828125
+1996-02-07,,,,,,,,,,
+1996-03-01,15.278267860412598,0.1875123232603073,4.051232814788818,32.900360107421875,,,,3.936483860015869,645.5,1101.4000244140625
+1996-04-01,14.797598838806152,0.1860809624195099,4.448990821838379,38.40559768676758,,,,5.248644828796387,654.1699829101562,1190.52001953125
+1996-05-01,14.660264015197754,0.1994406133890152,4.6650567054748535,41.25652313232422,,,,4.538435459136963,669.1199951171875,1243.4300537109375
+1996-05-08,,,,,,,,,,
+1996-06-01,13.641029357910156,0.1603158563375473,4.719073295593262,42.07575225830078,,,,4.385625839233398,670.6300048828125,1185.02001953125
+1996-07-01,14.812233924865723,0.1679503321647644,4.630680561065674,39.836021423339844,,,,3.7132644653320312,639.9500122070312,1080.5899658203125
+1996-08-01,15.759532928466797,0.18512675166130066,4.812370777130127,43.394588470458984,,,,4.269299030303955,651.989990234375,1141.5
+1996-08-07,,,,,,,,,,
+1996-09-01,17.209583282470703,0.16938161849975586,5.180670261383057,42.40607833862305,,,,4.5600385665893555,687.3300170898438,1226.9200439453125
+1996-10-01,17.831613540649414,0.17558389902114868,5.391822814941406,36.86507034301758,,,,4.244296073913574,705.27001953125,1221.510009765625
+1996-11-01,22.03032875061035,0.184172585606575,6.162785530090332,38.95176315307617,,,,4.841867923736572,757.02001953125,1292.6099853515625
+1996-11-06,,,,,,,,,,
+1996-12-01,20.998197555541992,0.15936164557933807,6.491794109344482,41.83340072631836,,,,4.581387996673584,740.739990234375,1291.030029296875
+1997-01-01,21.743183135986328,0.12691716849803925,8.01407527923584,46.8797492980957,,,,4.642676830291748,786.1599731445312,1379.8499755859375
+1997-02-01,19.924028396606445,0.1240537017583847,7.660515785217285,49.97840881347656,,,,4.47982120513916,790.8200073242188,1309.0
+1997-02-06,,,,,,,,,,
+1997-03-01,19.067983627319336,0.13932174444198608,7.203826904296875,45.4803581237793,,,,4.924733638763428,757.1199951171875,1221.699951171875
+1997-04-01,22.298084259033203,0.12977975606918335,9.546177864074707,49.431339263916016,,,,4.807621955871582,801.3400268554688,1260.760009765625
+1997-05-01,24.034704208374023,0.12691716849803925,9.742606163024902,54.45485305786133,,,,5.483453750610352,848.280029296875,1400.3199462890625
+1997-05-07,,,,,,,,,,
+1997-05-28,,,,,,,,,,
+1997-06-01,25.13742446899414,0.10878564417362213,9.929201126098633,63.396705627441406,0.07708299905061722,,,4.3084282875061035,885.1400146484375,1442.0699462890625
+1997-07-01,29.45465660095215,0.1335965245962143,11.107746124267578,66.42845916748047,0.11979199945926666,,,4.592585563659668,954.3099975585938,1593.81005859375
+1997-08-01,28.23609161376953,0.1660410314798355,10.385887145996094,60.97687911987305,0.11692699790000916,,,4.851738929748535,899.469970703125,1587.3199462890625
+1997-08-07,,,,,,,,,,
+1997-09-01,29.579116821289062,0.16556398570537567,10.395710945129395,67.9932632446289,0.21692700684070587,,,6.2071452140808105,947.280029296875,1685.68994140625
+1997-10-01,27.48627281188965,0.13001829385757446,10.214018821716309,64.32245635986328,0.25416699051856995,,,5.889601707458496,914.6199951171875,1593.6099853515625
+1997-11-01,30.555805206298828,0.13550494611263275,11.117568969726562,63.00460433959961,0.20624999701976776,,,5.180382251739502,955.4000244140625,1600.550048828125
+1997-11-06,,,,,,,,,,
+1997-12-01,29.25237274169922,0.10019782930612564,10.155089378356934,59.91267013549805,0.2510420083999634,,,5.087874889373779,970.4299926757812,1570.3499755859375
+1998-01-01,27.609769821166992,0.1397988647222519,11.721570014953613,65.44635009765625,0.24583299458026886,,,4.750911235809326,980.280029296875,1619.3599853515625
+1998-02-01,29.19993782043457,0.1803557574748993,13.317505836486816,72.36756134033203,0.3208329975605011,,,5.452751159667969,1049.3399658203125,1770.510009765625
+1998-02-06,,,,,,,,,,
+1998-03-01,29.10112953186035,0.2099376916885376,14.06391716003418,86.66805267333984,0.35637998580932617,,,5.576151371002197,1101.75,1835.6800537109375
+1998-04-01,32.4630012512207,0.20898354053497314,14.162128448486328,92.79229736328125,0.3822920024394989,,,6.177727699279785,1111.75,1868.4100341796875
+1998-05-01,32.918251037597656,0.2032574564218521,13.327329635620117,84.10579681396484,0.3671880066394806,,,4.930263519287109,1090.8199462890625,1778.8699951171875
+1998-05-06,,,,,,,,,,
+1998-06-01,32.225502014160156,0.2190026193857193,17.029911041259766,83.08383178710938,0.831250011920929,,,5.238887786865234,1133.8399658203125,1894.739990234375
+1998-07-01,37.19002914428711,0.26433059573173523,17.27544403076172,86.6082992553711,0.9239580035209656,,,3.988961935043335,1120.6700439453125,1872.3900146484375
+1998-08-01,31.611520767211914,0.23808826506137848,15.075493812561035,72.04536437988281,0.6979169845581055,,,3.2419238090515137,957.280029296875,1499.25
+1998-08-06,,,,,,,,,,
+1998-09-01,36.12905502319336,0.2910497486591339,17.295076370239258,69.53275299072266,0.9302080273628235,,,4.283971786499023,1017.010009765625,1693.8399658203125
+1998-10-01,41.75224685668945,0.2834153473377228,16.637067794799805,80.36154174804688,1.0536459684371948,,,4.59221076965332,1098.6700439453125,1771.3900146484375
+1998-11-01,46.4265251159668,0.2438134402036667,19.170928955078125,88.54693603515625,1.600000023841858,,,5.535391330718994,1163.6300048828125,1949.5400390625
+1998-11-06,,,,,,,,,,
+1998-12-01,51.91548538208008,0.3125200569629669,21.793180465698242,97.19573974609375,2.6770830154418945,,,5.782783031463623,1229.22998046875,2192.68994140625
+1999-01-01,51.59874725341797,0.3144294023513794,27.499271392822266,102.47120666503906,2.92343807220459,,,5.912916660308838,1279.6400146484375,2505.889892578125
+1999-02-01,47.797481536865234,0.2657618522644043,23.5904541015625,91.21175384521484,3.203125,,,4.984185218811035,1238.3299560546875,2288.030029296875
+1999-02-08,,,,,,,,,,
+1999-03-01,49.97552490234375,0.27435049414634705,28.16712188720703,88.21611785888672,4.304687976837158,,,7.027392387390137,1286.3699951171875,2461.39990234375
+1999-04-01,58.98025894165039,0.35116779804229736,25.554689407348633,97.44929504394531,4.301562786102295,,,7.854666709899902,1335.1800537109375,2542.860107421875
+1999-05-01,65.41220092773438,0.3363769054412842,25.35825538635254,93.19886779785156,2.96875,,,9.187017440795898,1301.8399658203125,2470.52001953125
+1999-05-06,,,,,,,,,,
+1999-05-27,,,,,,,,,,
+1999-06-01,72.96644592285156,0.35355332493782043,28.343910217285156,97.96764373779297,3.128124952316284,,,10.182408332824707,1372.7099609375,2686.1201171875
+1999-07-01,70.95524597167969,0.4251234233379364,26.96893310546875,81.35432434082031,2.50156307220459,,,10.634023666381836,1328.719970703125,2638.489990234375
+1999-08-01,70.32015991210938,0.49812400341033936,29.090301513671875,79.7938461303711,3.109375,,,12.354691505432129,1320.4100341796875,2739.35009765625
+1999-08-06,,,,,,,,,,
+1999-09-01,68.37564849853516,0.48333317041397095,28.46175193786621,69.8066177368164,3.996875047683716,,,14.07535457611084,1282.7099609375,2746.159912109375
+1999-10-01,55.519859313964844,0.6116815209388733,29.090301513671875,47.42917251586914,3.53125,,,17.35419464111328,1362.9300537109375,2966.429931640625
+1999-11-01,58.239349365234375,0.747186541557312,28.613975524902344,45.75767135620117,4.253125190734863,,,17.044021606445312,1388.9100341796875,3336.159912109375
+1999-11-08,,,,,,,,,,
+1999-12-01,61.04003143310547,0.7848799824714661,36.6919059753418,37.92245101928711,3.8062500953674316,,,16.687326431274414,1469.25,4069.31005859375
+2000-01-01,63.515560150146484,0.7920366525650024,30.75990104675293,35.14961242675781,3.2281250953674316,,,13.668244361877441,1394.4599609375,3940.35009765625
+2000-02-01,58.14006042480469,0.8750578165054321,28.088550567626953,36.62297058105469,3.4437499046325684,,,25.31960105895996,1366.4200439453125,4696.68994140625
+2000-02-08,,,,,,,,,,
+2000-03-01,67.05181884765625,1.0368047952651978,33.39197540283203,43.779178619384766,3.3499999046325684,,,27.631258010864258,1498.5799560546875,4572.830078125
+2000-04-01,63.157623291015625,0.947104275226593,21.920852661132812,45.03520965576172,2.7593750953674316,,,30.027847290039062,1452.4300537109375,3860.659912109375
+2000-05-01,60.785640716552734,0.6412634253501892,19.661985397338867,46.097347259521484,2.4156250953674316,,,27.948402404785156,1420.5999755859375,3400.909912109375
+2000-05-08,,,,,,,,,,
+2000-06-01,62.13500213623047,0.7996708750724792,25.142194747924805,35.529056549072266,1.8156249523162842,,,32.277984619140625,1454.5999755859375,3966.110107421875
+2000-07-01,63.65913009643555,0.7758141756057739,21.940492630004883,25.79067039489746,1.506250023841858,,,28.43518829345703,1430.8299560546875,3766.989990234375
+2000-08-01,74.86860656738281,0.9304049015045166,21.940492630004883,27.82395362854004,2.075000047683716,,,32.28449630737305,1517.6800537109375,4206.35009765625
+2000-08-08,,,,,,,,,,
+2000-09-01,63.94328689575195,0.3931553065776825,18.95485496520996,25.980575561523438,1.921875,,,38.555137634277344,1436.510009765625,3672.820068359375
+2000-10-01,55.92375183105469,0.29868337512016296,21.645862579345703,14.6140718460083,1.8312499523162842,,,37.785430908203125,1429.4000244140625,3369.6298828125
+2000-11-01,53.08496856689453,0.2519250810146332,18.03167152404785,12.016016960144043,1.234375,,,31.482683181762695,1314.949951171875,2597.929931640625
+2000-11-08,,,,,,,,,,
+2000-12-01,48.32046127319336,0.22711420059204102,13.631781578063965,8.067792892456055,0.778124988079071,,,28.90570068359375,1320.280029296875,2470.52001953125
+2001-01-01,63.6693229675293,0.33017459511756897,19.190568923950195,14.251648902893066,0.8656250238418579,,,21.702556610107422,1366.010009765625,2772.72998046875
+2001-02-01,56.790767669677734,0.2786443829536438,18.54237174987793,10.536102294921875,0.5093749761581421,,,14.440549850463867,1239.93994140625,2151.830078125
+2001-02-07,,,,,,,,,,
+2001-03-01,54.73835754394531,0.3369686007499695,17.18704605102539,10.535667419433594,0.5115000009536743,,,17.375865936279297,1160.3299560546875,1840.260009765625
+2001-04-01,65.52893829345703,0.38918623328208923,21.292295455932617,15.900238990783691,0.7889999747276306,,,22.32872772216797,1249.4599609375,2116.239990234375
+2001-05-01,63.62804412841797,0.3046000301837921,21.741714477539062,17.430465698242188,0.8345000147819519,,,19.768779754638672,1255.8199462890625,2110.489990234375
+2001-05-08,,,,,,,,,,
+2001-06-01,64.6737060546875,0.35498547554016113,22.942251205444336,16.83243751525879,0.7074999809265137,,,23.362648010253906,1224.3800048828125,2160.5400390625
+2001-07-01,59.949947357177734,0.28688937425613403,20.80202293395996,14.035829544067383,0.6244999766349792,,,18.640790939331055,1211.22998046875,2027.1300048828125
+2001-08-01,56.952762603759766,0.2832247018814087,17.929533004760742,16.18165397644043,0.44699999690055847,,,16.711578369140625,1133.5799560546875,1805.4300537109375
+2001-08-08,,,,,,,,,,
+2001-09-01,52.33213424682617,0.23680917918682098,16.081575393676758,13.6312894821167,0.2985000014305115,,,11.92334270477295,1040.93994140625,1498.800048828125
+2001-10-01,61.660858154296875,0.26810887455940247,18.275238037109375,12.312134742736816,0.3490000069141388,,,13.133195877075195,1059.780029296875,1690.199951171875
+2001-11-01,65.95150756835938,0.3252120614051819,20.17975616455078,14.774558067321777,0.5659999847412109,,,15.958827018737793,1139.449951171875,1930.5799560546875
+2001-11-07,,,,,,,,,,
+2001-12-01,69.1006088256836,0.3343726694583893,20.820878982543945,18.32748794555664,0.5410000085830688,,,15.446427345275879,1148.0799560546875,1950.4000244140625
+2002-01-01,61.63407897949219,0.37742963433265686,20.022619247436523,19.928070068359375,0.7095000147819519,,,16.771486282348633,1130.199951171875,1934.030029296875
+2002-02-01,56.052799224853516,0.3313194811344147,18.334945678710938,17.07868194580078,0.7049999833106995,,,18.105239868164062,1106.72998046875,1731.489990234375
+2002-02-06,,,,,,,,,,
+2002-03-01,59.49020767211914,0.3613981306552887,18.95407485961914,18.907917022705078,0.7149999737739563,,,20.051130294799805,1147.3900146484375,1845.3499755859375
+2002-04-01,47.912540435791016,0.3705587685108185,16.424144744873047,15.56605339050293,0.8345000147819519,,,19.893611907958984,1076.9200439453125,1688.22998046875
+2002-05-01,46.01911926269531,0.35574817657470703,15.999865531921387,15.777122497558594,0.9114999771118164,,,17.971961975097656,1067.1400146484375,1615.72998046875
+2002-05-08,,,,,,,,,,
+2002-06-01,41.26642990112305,0.2705524265766144,17.190977096557617,10.55325984954834,0.8125,,,14.188389778137207,989.8200073242188,1463.2099609375
+2002-07-01,40.349422454833984,0.23299239575862885,15.079033851623535,12.224191665649414,0.7225000262260437,,,11.933782577514648,911.6199951171875,1328.260009765625
+2002-08-01,43.203697204589844,0.22520573437213898,15.424735069274902,12.329721450805664,0.746999979019165,,,10.01123046875,916.0700073242188,1314.8499755859375
+2002-08-07,,,,,,,,,,
+2002-09-01,33.49409484863281,0.22138899564743042,13.746496200561523,8.706437110900879,0.796500027179718,,,9.513158798217773,815.280029296875,1172.06005859375
+2002-10-01,45.344242095947266,0.24535933136940002,16.804426193237305,11.678934097290039,0.9679999947547913,,,11.782204627990723,885.760009765625,1329.75
+2002-11-01,49.92806625366211,0.23665708303451538,18.127525329589844,15.337401390075684,1.1675000190734863,,,14.71778678894043,936.3099975585938,1478.780029296875
+2002-11-06,,,,,,,,,,
+2002-12-01,44.5990104675293,0.2187930941581726,16.248149871826172,14.15894889831543,0.9445000290870667,,,12.360349655151367,879.8200073242188,1335.510009765625
+2003-01-01,45.00184631347656,0.21925139427185059,14.91561222076416,15.56605339050293,1.0924999713897705,,,13.167760848999023,855.7000122070312,1320.9100341796875
+2003-02-01,44.85797119140625,0.22917553782463074,14.896756172180176,15.829883575439453,1.1004999876022339,,,13.712512969970703,841.1500244140625,1337.52001953125
+2003-02-06,,,,,,,,,,
+2003-03-01,45.22197723388672,0.2158920168876648,15.266251564025879,15.302220344543457,1.3014999628067017,,,15.372973442077637,848.1799926757812,1341.1700439453125
+2003-04-01,48.95253372192383,0.21711383759975433,16.123830795288086,17.342517852783203,1.434499979019165,,,17.22471046447754,916.9199829101562,1464.31005859375
+2003-05-01,50.76301956176758,0.2740640342235565,15.518482208251953,19.224523544311523,1.7944999933242798,,,17.618791580200195,963.5900268554688,1595.9100341796875
+2003-05-07,,,,,,,,,,
+2003-06-01,47.655845642089844,0.29101142287254333,16.16796875,18.626508712768555,1.815999984741211,,,15.997578620910645,974.5,1622.800048828125
+2003-07-01,46.933773040771484,0.32185351848602295,16.653514862060547,18.995861053466797,2.0820000171661377,,,16.333431243896484,990.3099975585938,1735.02001953125
+2003-08-01,47.37279510498047,0.34521347284317017,16.722881317138672,18.960683822631836,2.315999984741211,,,19.37755012512207,1008.010009765625,1810.449951171875
+2003-08-06,,,,,,,,,,
+2003-09-01,51.1259651184082,0.3163566291332245,17.530014038085938,18.046072006225586,2.4214999675750732,,,19.657007217407227,995.969970703125,1786.93994140625
+2003-10-01,51.79159927368164,0.3494885563850403,16.48325538635254,18.468202590942383,2.7214999198913574,,,21.84463119506836,1050.7099609375,1932.2099609375
+2003-11-01,52.405128479003906,0.3192576766014099,16.303056716918945,21.423110961914062,2.698499917984009,,,20.621614456176758,1058.199951171875,1960.260009765625
+2003-11-06,,,,,,,,,,
+2003-12-01,53.74093246459961,0.32628077268600464,17.35569190979004,24.272485733032227,2.63100004196167,,,19.5084171295166,1111.9200439453125,2003.3699951171875
+2004-01-01,57.53900146484375,0.3444499373435974,17.533241271972656,25.74994659423828,2.5199999809265137,,,19.119047164916992,1131.1300048828125,2066.14990234375
+2004-02-01,55.95598602294922,0.36521488428115845,16.82303810119629,24.87051010131836,2.1505000591278076,,,18.600963592529297,1144.93994140625,2029.8199462890625
+2004-02-06,,,,,,,,,,
+2004-03-01,53.3401985168457,0.4128514230251312,15.808448791503906,25.6268310546875,2.1640000343322754,,,19.62464141845703,1126.2099609375,1994.219970703125
+2004-04-01,51.208683013916016,0.39361342787742615,16.56939125061035,23.6217041015625,2.180000066757202,,,20.729951858520508,1107.300048828125,1920.1500244140625
+2004-05-01,51.45262145996094,0.4284247159957886,16.632802963256836,23.815183639526367,2.424999952316284,,,22.293439865112305,1120.6800537109375,1986.739990234375
+2004-05-06,,,,,,,,,,
+2004-06-01,51.300846099853516,0.4968261420726776,18.110280990600586,25.503700256347656,2.7200000286102295,,,23.227535247802734,1140.8399658203125,2047.7900390625
+2004-07-01,50.672325134277344,0.4937727451324463,18.065902709960938,24.378023147583008,1.9459999799728394,,,21.075881958007812,1101.719970703125,1887.3599853515625
+2004-08-01,49.28722381591797,0.5265995860099792,17.31130027770996,23.6217041015625,1.906999945640564,,,22.91964340209961,1104.239990234375,1838.0999755859375
+2004-08-06,,,,,,,,,,
+2004-09-01,50.00397872924805,0.5916416049003601,17.5849609375,24.764976501464844,2.0429999828338623,,64.8648681640625,24.718441009521484,1114.5799560546875,1896.8399658203125
+2004-10-01,52.34260559082031,0.800052285194397,17.788476943969727,25.978591918945312,1.7065000534057617,,95.41541290283203,28.003637313842773,1130.199951171875,1974.989990234375
+2004-11-01,54.96117401123047,1.0237311124801636,17.050731658935547,26.945974349975586,1.9839999675750732,,91.0810775756836,30.26772117614746,1173.8199462890625,2096.81005859375
+2004-11-08,,,,,,,,,,
+2004-12-01,57.60344696044922,0.9832708239555359,18.939943313598633,29.918479919433594,2.2144999504089355,,96.49149322509766,31.357276916503906,1211.9200439453125,2175.43994140625
+2005-01-01,54.58831024169922,1.1741228103637695,18.628063201904297,27.930959701538086,2.1610000133514404,,97.90790557861328,28.444419860839844,1181.27001953125,2062.409912109375
+2005-02-01,54.09749221801758,1.3698610067367554,17.83417510986328,27.438472747802734,1.7589999437332153,,94.0890884399414,30.86894416809082,1203.5999755859375,2051.719970703125
+2005-02-08,,,,,,,,,,
+2005-03-01,53.49815368652344,1.2724499702453613,17.18527603149414,26.6469669342041,1.7135000228881836,,90.34534454345703,33.57841110229492,1180.5899658203125,1999.22998046875
+2005-04-01,44.7164421081543,1.1011403799057007,17.988739013671875,23.305103302001953,1.6180000305175781,,110.110107421875,29.735000610351562,1156.8499755859375,1921.6500244140625
+2005-05-01,44.23051071166992,1.2141252756118774,18.3442440032959,23.867952346801758,1.7755000591278076,,138.77377319335938,33.119998931884766,1191.5,2068.219970703125
+2005-05-06,,,,,,,,,,
+2005-06-01,43.555538177490234,1.124043345451355,17.71768569946289,24.254899978637695,1.6545000076293945,,147.22222900390625,28.610000610351562,1191.3299560546875,2056.9599609375
+2005-07-01,48.991188049316406,1.3023751974105835,18.26690673828125,23.234752655029297,2.257499933242798,,144.02401733398438,29.639999389648438,1234.1800537109375,2184.830078125
+2005-08-01,47.3240966796875,1.431849479675293,19.529403686523438,23.58652687072754,2.134999990463257,,143.1431427001953,27.040000915527344,1220.3299560546875,2152.090087890625
+2005-08-08,,,,,,,,,,
+2005-09-01,47.202552795410156,1.6370543241500854,18.40694236755371,24.00865936279297,2.265000104904175,,158.3883819580078,29.850000381469727,1228.81005859375,2151.68994140625
+2005-10-01,48.1793098449707,1.7585887908935547,18.385473251342773,23.867952346801758,1.9930000305175781,,186.25625610351562,32.25,1207.010009765625,2120.300048828125
+2005-11-01,52.309974670410156,2.0709757804870605,19.80194664001465,24.976051330566406,2.4230000972747803,,202.65765380859375,32.61000061035156,1249.47998046875,2232.820068359375
+2005-11-08,,,,,,,,,,
+2005-12-01,48.483585357666016,2.1952593326568604,18.762245178222656,25.76755142211914,2.3575000762939453,,207.63763427734375,36.959999084472656,1248.2900390625,2205.320068359375
+2006-01-01,47.95273208618164,2.305800437927246,20.19721794128418,25.169517517089844,2.240999937057495,,216.5465545654297,39.72999954223633,1280.0799560546875,2305.820068359375
+2006-02-01,47.32752227783203,2.0914342403411865,19.27882957458496,26.207246780395508,1.871999979019165,,181.49148559570312,38.54999923706055,1280.6600341796875,2281.389892578125
+2006-02-08,,,,,,,,,,
+2006-03-01,48.76497268676758,1.9152405261993408,19.588937759399414,26.734920501708984,1.8265000581741333,,195.1951904296875,34.95000076293945,1294.8699951171875,2339.7900390625
+2006-04-01,48.6880989074707,2.149454355239868,17.385986328125,24.694625854492188,1.7604999542236328,,209.17918395996094,39.20000076293945,1310.6099853515625,2322.570068359375
+2006-05-01,47.24531936645508,1.8251585960388184,16.306108474731445,24.149375915527344,1.7304999828338623,,186.09609985351562,28.6299991607666,1270.0899658203125,2178.8798828125
+2006-05-08,,,,,,,,,,
+2006-06-01,45.58832931518555,1.7488168478012085,16.83946990966797,24.465961456298828,1.934000015258789,,209.8748779296875,30.360000610351562,1270.199951171875,2172.090087890625
+2006-07-01,45.938453674316406,2.075251340866089,17.388734817504883,24.78256607055664,1.344499945640564,,193.49349975585938,28.510000228881836,1276.6600341796875,2091.469970703125
+2006-08-01,48.051090240478516,2.0718915462493896,18.574007034301758,26.048952102661133,1.5414999723434448,,189.45445251464844,32.439998626708984,1303.8199462890625,2183.75
+2006-08-08,,,,,,,,,,
+2006-09-01,48.820682525634766,2.350689172744751,19.839282989501953,27.368104934692383,1.6059999465942383,,201.15115356445312,37.459999084472656,1335.8499755859375,2258.429931640625
+2006-10-01,55.01115798950195,2.475886821746826,20.82581329345703,29.90088653564453,1.9045000076293945,,238.4334259033203,38.25,1377.93994140625,2366.7099609375
+2006-11-01,54.766883850097656,2.798962354660034,21.29731559753418,29.021446228027344,2.0169999599456787,,242.64764404296875,40.15999984741211,1400.6300048828125,2431.77001953125
+2006-11-08,,,,,,,,,,
+2006-12-01,58.07079315185547,2.5907039642333984,21.73406219482422,29.812957763671875,1.9730000495910645,,230.47047424316406,41.119998931884766,1418.300048828125,2415.2900390625
+2007-01-01,59.266300201416016,2.617882013320923,22.461923599243164,30.252676010131836,1.8834999799728394,,251.00100708007812,38.869998931884766,1438.239990234375,2463.929931640625
+2007-02-01,55.55428695678711,2.583681344985962,20.50397491455078,30.37578582763672,1.9570000171661377,,224.949951171875,39.25,1406.8199462890625,2416.14990234375
+2007-02-07,,,,,,,,,,
+2007-03-01,56.51309585571289,2.8371317386627197,20.3559513092041,29.707414627075195,1.9895000457763672,,229.30931091308594,41.70000076293945,1420.8599853515625,2421.639892578125
+2007-04-01,61.27952575683594,3.0475287437438965,21.867843627929688,32.539215087890625,3.066499948501587,,235.92591857910156,41.560001373291016,1482.3699951171875,2525.090087890625
+2007-05-01,63.91150665283203,3.700700044631958,22.415639877319336,33.18999099731445,3.4570000171661377,,249.20420837402344,44.060001373291016,1530.6199951171875,2604.52001953125
+2007-05-08,,,,,,,,,,
+2007-06-01,63.347747802734375,3.7266552448272705,21.59428596496582,32.5040397644043,3.4205000400543213,,261.6116027832031,40.150001525878906,1503.3499755859375,2603.22998046875
+2007-07-01,66.59786987304688,4.023471355438232,21.242568969726562,30.70998764038086,3.927000045776367,,255.2552490234375,40.290000915527344,1455.27001953125,2546.27001953125
+2007-08-01,70.23324584960938,4.228675365447998,21.052053451538086,30.12954330444336,3.995500087738037,,257.88287353515625,42.75,1473.989990234375,2596.360107421875
+2007-08-08,,,,,,,,,,
+2007-09-01,71.1520004272461,4.68641471862793,21.662628173828125,30.49891471862793,4.65749979019165,,283.9189147949219,43.65999984741211,1526.75,2701.5
+2007-10-01,70.13726806640625,5.800380706787109,27.067256927490234,30.674802780151367,4.457499980926514,,353.8538513183594,47.900001525878906,1549.3800048828125,2859.1201171875
+2007-11-01,63.529457092285156,5.564334392547607,24.70686912536621,29.6898193359375,4.5279998779296875,,346.8468322753906,42.13999938964844,1481.1400146484375,2660.9599609375
+2007-11-07,,,,,,,,,,
+2007-12-01,65.52474212646484,6.048642158508301,26.26405906677246,28.4762020111084,4.631999969482422,,346.0860900878906,42.72999954223633,1468.3599853515625,2652.280029296875
+2008-01-01,64.92465209960938,4.133399963378906,24.050800323486328,27.21040916442871,3.884999990463257,,282.43243408203125,34.93000030517578,1378.550048828125,2389.860107421875
+2008-02-01,69.0161361694336,3.8176541328430176,20.066930770874023,25.923078536987305,3.2235000133514404,,235.82582092285156,33.650001525878906,1330.6300048828125,2271.47998046875
+2008-02-06,,,,,,,,,,
+2008-03-01,70.05885314941406,4.381966590881348,21.01883316040039,26.399211883544922,3.565000057220459,,220.45545959472656,35.59000015258789,1322.699951171875,2279.10009765625
+2008-04-01,73.44194030761719,5.311798572540283,21.122520446777344,24.706567764282227,3.93149995803833,,287.43243408203125,37.290000915527344,1385.5899658203125,2412.800048828125
+2008-05-01,78.75386810302734,5.763737201690674,20.974388122558594,24.016834259033203,4.080999851226807,,293.1932067871094,44.060001373291016,1400.3800048828125,2522.659912109375
+2008-05-07,,,,,,,,,,
+2008-06-01,72.41636657714844,5.11300802230835,20.449499130249023,23.981456756591797,3.6665000915527344,,263.4734802246094,39.38999938964844,1280.0,2292.97998046875
+2008-07-01,78.18988800048828,4.853753566741943,19.118900299072266,24.197914123535156,3.816999912261963,,237.1121063232422,41.349998474121094,1267.3800048828125,2325.550048828125
+2008-08-01,74.37141418457031,5.176827907562256,20.285959243774414,24.712379455566406,4.040500164031982,,231.8768768310547,42.83000183105469,1282.8299560546875,2367.52001953125
+2008-08-06,,,,,,,,,,
+2008-09-01,71.73551177978516,3.470762014389038,19.91908073425293,20.454687118530273,3.638000011444092,,200.46046447753906,39.470001220703125,1166.3599853515625,2091.8798828125
+2008-10-01,57.02163314819336,3.2854056358337402,16.66515350341797,14.2785062789917,2.861999988555908,,179.85986328125,26.639999389648438,968.75,1720.949951171875
+2008-11-01,50.04803466796875,2.8298041820526123,15.090431213378906,12.444729804992676,2.134999990463257,,146.6266326904297,23.15999984741211,896.239990234375,1535.5699462890625
+2008-11-06,,,,,,,,,,
+2008-12-01,51.90673828125,2.6062774658203125,14.606595039367676,14.189484596252441,2.563999891281128,,153.97897338867188,21.290000915527344,903.25,1577.030029296875
+2009-01-01,56.52627944946289,2.7522425651550293,12.848398208618164,11.888165473937988,2.940999984741211,,169.43443298339844,19.309999465942383,825.8800048828125,1476.4200439453125
+2009-02-01,56.76066589355469,2.7272019386291504,12.13459587097168,9.274202346801758,3.239500045776367,,169.16416931152344,16.700000762939453,735.0900268554688,1377.8399658203125
+2009-02-06,,,,,,,,,,
+2009-03-01,60.08320999145508,3.209982395172119,13.897279739379883,8.146258354187012,3.671999931335449,,174.20420837402344,21.389999389648438,797.8699951171875,1528.5899658203125
+2009-04-01,64.00231170654297,3.8423893451690674,15.3270902633667,11.028571128845215,4.026000022888184,,198.1831817626953,27.350000381469727,872.8099975585938,1717.300048828125
+2009-05-01,65.90607452392578,4.147140979766846,15.803704261779785,12.274019241333008,3.8994998931884766,,208.82382202148438,28.18000030517578,919.1400146484375,1774.3299560546875
+2009-05-06,,,,,,,,,,
+2009-06-01,65.09091186523438,4.349293231964111,18.0966796875,11.69642448425293,4.183000087738037,,211.00601196289062,28.299999237060547,919.3200073242188,1835.0400390625
+2009-07-01,73.51245880126953,4.989336013793945,17.906352996826172,14.879191398620605,4.288000106811523,,221.7467498779297,32.41999816894531,987.47998046875,1978.5
+2009-08-01,73.58724975585938,5.1365203857421875,18.766645431518555,15.714898109436035,4.059500217437744,,231.06607055664062,31.420000076293945,1020.6199951171875,2009.06005859375
+2009-08-06,,,,,,,,,,
+2009-09-01,74.90744018554688,5.659914016723633,19.69136619567871,14.061647415161133,4.668000221252441,,248.1731719970703,33.040000915527344,1057.0799560546875,2122.419921875
+2009-10-01,75.53370666503906,5.756102561950684,21.230228424072266,13.72740650177002,5.940499782562256,,268.3283386230469,32.939998626708984,1036.18994140625,2045.1099853515625
+2009-11-01,79.12847900390625,6.1045241355896,22.51645278930664,14.055986404418945,6.795499801635742,,291.7917785644531,35.08000183105469,1095.6300048828125,2144.60009765625
+2009-11-06,,,,,,,,,,
+2009-12-01,82.34589385986328,6.434925556182861,23.438796997070312,15.443329811096191,6.72599983215332,,310.30029296875,36.779998779296875,1115.0999755859375,2269.14990234375
+2010-01-01,76.99246215820312,5.86481237411499,21.670120239257812,15.999075889587402,6.270500183105469,,265.2352294921875,32.29999923706055,1073.8699951171875,2147.35009765625
+2010-02-01,79.99315643310547,6.248349666595459,22.04693031311035,17.19167137145996,5.920000076293945,,263.6636657714844,34.650001525878906,1104.489990234375,2238.260009765625
+2010-02-08,,,,,,,,,,
+2010-03-01,81.0396728515625,7.176041126251221,22.629026412963867,17.88887596130371,6.78849983215332,,283.8438415527344,35.369998931884766,1169.4300537109375,2397.9599609375
+2010-04-01,81.51359558105469,7.972740650177002,23.594758987426758,20.0878963470459,6.855000019073486,,263.11309814453125,33.599998474121094,1186.68994140625,2461.18994140625
+2010-05-01,79.1503677368164,7.84417724609375,19.932706832885742,17.157638549804688,6.2729997634887695,,243.0580596923828,32.08000183105469,1089.4100341796875,2257.0400390625
+2010-05-06,,,,,,,,,,
+2010-06-01,78.42550659179688,7.680809020996094,17.857412338256836,14.817129135131836,5.4629998207092285,,222.69769287109375,26.43000030517578,1030.7099609375,2109.239990234375
+2010-07-01,81.55033874511719,7.855478763580322,20.03040885925293,18.038850784301758,5.894499778747559,,242.66766357421875,28.719999313354492,1101.5999755859375,2254.699951171875
+2010-08-01,78.20323944091797,7.4233856201171875,18.214401245117188,15.64971923828125,6.241499900817871,,225.2352294921875,27.700000762939453,1049.3299560546875,2114.030029296875
+2010-08-06,,,,,,,,,,
+2010-09-01,85.6181411743164,8.664690971374512,19.10737419128418,19.168588638305664,7.853000164031982,,263.1581726074219,26.149999618530273,1141.199951171875,2368.6201171875
+2010-10-01,91.65619659423828,9.190831184387207,20.808244705200195,21.757949829101562,8.261500358581543,,307.15716552734375,28.149999618530273,1183.260009765625,2507.409912109375
+2010-11-01,90.290283203125,9.501388549804688,19.70814323425293,21.311634063720703,8.770000457763672,,278.1331481933594,27.799999237060547,1180.550048828125,2498.22998046875
+2010-11-08,,,,,,,,,,
+2010-12-01,94.08943176269531,9.84980583190918,21.909496307373047,21.423206329345703,9.0,,297.28228759765625,30.780000686645508,1257.6400146484375,2652.8701171875
+2011-01-01,103.8599853515625,10.361597061157227,21.76820182800293,19.823131561279297,8.482000350952148,,300.48046875,33.04999923706055,1286.1199951171875,2700.080078125
+2011-02-01,103.78302001953125,10.785745620727539,20.865453720092773,20.065792083740234,8.66450023651123,,307.00701904296875,34.5,1327.219970703125,2782.27001953125
+2011-02-08,,,,,,,,,,
+2011-03-01,104.95984649658203,10.64222526550293,20.04909324645996,19.879127502441406,9.006500244140625,,293.6736755371094,33.15999984741211,1325.8299560546875,2781.070068359375
+2011-04-01,109.79368591308594,10.691693305969238,20.467607498168945,18.910266876220703,9.790499687194824,,272.32232666015625,33.54999923706055,1363.6099853515625,2873.5400390625
+2011-05-01,108.73165130615234,10.621461868286133,19.7490291595459,19.135168075561523,9.834500312805176,,264.7747802734375,34.630001068115234,1345.199951171875,2835.300048828125
+2011-05-06,,,,,,,,,,
+2011-06-01,110.91179656982422,10.25013542175293,20.665348052978516,19.510000228881836,10.224499702453613,,253.4434356689453,31.450000762939453,1320.6400146484375,2773.52001953125
+2011-07-01,117.571044921875,11.923834800720215,21.778095245361328,17.562105178833008,11.12600040435791,,302.14715576171875,27.709999084472656,1292.280029296875,2756.3798828125
+2011-08-01,111.14454650878906,11.75130844116211,21.142244338989258,15.623312950134277,10.761500358581543,,270.7507629394531,25.239999771118164,1218.8900146484375,2579.4599609375
+2011-08-08,,,,,,,,,,
+2011-09-01,113.55061340332031,11.644124984741211,19.90796661376953,13.119815826416016,10.81149959564209,,257.77777099609375,24.170000076293945,1131.4200439453125,2415.39990234375
+2011-10-01,119.88819122314453,12.360504150390625,21.299680709838867,15.485393524169922,10.67549991607666,,296.6166076660156,29.40999984741211,1253.300048828125,2684.409912109375
+2011-11-01,122.07645416259766,11.670994758605957,20.459848403930664,15.42860221862793,9.614500045776367,,299.9949951171875,27.420000076293945,1246.9599609375,2620.340087890625
+2011-11-08,,,,,,,,,,
+2011-12-01,119.88117218017578,12.367225646972656,20.92014503479004,15.068914413452148,8.654999732971191,,323.2732849121094,28.270000457763672,1257.5999755859375,2605.14990234375
+2012-01-01,125.56623077392578,13.939234733581543,23.79706382751465,14.749091148376465,9.722000122070312,,290.3453369140625,30.950000762939453,1312.4100341796875,2813.840087890625
+2012-02-01,128.25875854492188,16.564136505126953,25.57801628112793,15.662582397460938,8.98449993133545,,309.4344482421875,32.88999938964844,1365.6800537109375,2966.889892578125
+2012-02-08,,,,,,,,,,
+2012-03-01,136.5597381591797,18.308074951171875,26.1682071685791,15.377117156982422,10.125499725341797,,320.9409484863281,34.310001373291016,1408.469970703125,3091.570068359375
+2012-04-01,135.53221130371094,17.83262062072754,25.97353172302246,14.882647514343262,11.595000267028809,,302.72772216796875,33.54999923706055,1397.9100341796875,3046.360107421875
+2012-05-01,126.25150299072266,17.64176368713379,23.677928924560547,13.811394691467285,10.645500183105469,,290.7207336425781,31.049999237060547,1310.3299560546875,2827.340087890625
+2012-05-08,,,,,,,,,,
+2012-06-01,128.5418243408203,17.83323097229004,24.976381301879883,15.054808616638184,11.417499542236328,,290.3253173828125,32.369998931884766,1362.1600341796875,2935.050048828125
+2012-07-01,128.80467224121094,18.650381088256836,24.06191635131836,13.332178115844727,11.664999961853027,,316.8017883300781,30.8799991607666,1379.3199462890625,2939.52001953125
+2012-08-01,128.06199645996094,20.314008712768555,25.1641845703125,14.178669929504395,12.41349983215332,,342.88787841796875,31.270000457763672,1406.5799560546875,3066.9599609375
+2012-08-08,,,,,,,,,,
+2012-09-01,136.92532348632812,20.458269119262695,24.459667205810547,14.120949745178223,12.715999603271484,,377.62762451171875,32.439998626708984,1440.6700439453125,3116.22998046875
+2012-10-01,128.39756774902344,18.256948471069336,23.456958770751953,12.4627103805542,11.644499778747559,,340.490478515625,34.029998779296875,1412.1600341796875,2977.22998046875
+2012-11-01,125.45381927490234,17.94904899597168,21.878910064697266,13.178736686706543,12.602499961853027,,349.5345458984375,34.61000061035156,1416.1800537109375,3010.239990234375
+2012-11-07,,,,,,,,,,
+2012-12-01,126.98394775390625,16.39484405517578,22.13326644897461,13.19808578491211,12.543499946594238,,354.0440368652344,37.68000030517578,1426.18994140625,3019.510009765625
+2013-01-01,134.6208953857422,14.03252124786377,22.746475219726562,15.598185539245605,13.274999618530273,,378.2232360839844,37.83000183105469,1498.1099853515625,3142.1298828125
+2013-02-01,133.1359405517578,13.598445892333984,23.036500930786133,15.79291820526123,13.213500022888184,,401.0010070800781,39.310001373291016,1514.6800537109375,3160.18994140625
+2013-02-06,,,,,,,,,,
+2013-03-01,141.99786376953125,13.716739654541016,23.903995513916016,16.74711036682129,13.32450008392334,,397.49249267578125,43.52000045776367,1569.18994140625,3267.52001953125
+2013-04-01,134.8347625732422,13.720457077026367,27.655447006225586,16.822824478149414,12.690500259399414,,412.69769287109375,45.08000183105469,1597.5699462890625,3328.7900390625
+2013-05-01,138.48284912109375,13.935823440551758,29.15936851501465,17.234567642211914,13.460000038146973,,436.0460510253906,42.90999984741211,1630.739990234375,3455.909912109375
+2013-05-08,,,,,,,,,,
+2013-06-01,127.82191467285156,12.368638038635254,29.060949325561523,17.783567428588867,13.884499549865723,,440.6256408691406,45.560001373291016,1606.280029296875,3403.25
+2013-07-01,130.45040893554688,14.115401268005371,26.789243698120117,19.142587661743164,15.060999870300293,,444.3193054199219,47.279998779296875,1685.72998046875,3626.3701171875
+2013-08-01,121.90938568115234,15.19745922088623,28.101774215698242,19.695158004760742,14.048999786376953,,423.8738708496094,45.75,1632.969970703125,3589.8701171875
+2013-08-07,,,,,,,,,,
+2013-09-01,124.47478485107422,14.96906566619873,28.19812774658203,20.306934356689453,15.631999969482422,,438.3934020996094,51.939998626708984,1681.550048828125,3771.47998046875
+2013-10-01,120.46192169189453,16.41180992126465,30.002870559692383,19.72601890563965,18.201499938964844,,515.8057861328125,54.220001220703125,1756.5400390625,3919.7099609375
+2013-11-01,120.77778625488281,17.45956802368164,32.30753707885742,22.58371353149414,19.680999755859375,,530.3253173828125,56.779998779296875,1805.81005859375,4059.889892578125
+2013-11-06,,,,,,,,,,
+2013-12-01,126.7584228515625,17.71782684326172,31.937856674194336,24.151473999023438,19.93950080871582,,560.9158935546875,59.880001068115234,1848.3599853515625,4176.58984375
+2014-01-01,119.39906311035156,15.80967903137207,32.304969787597656,21.634523391723633,17.934499740600586,,591.0760498046875,59.189998626708984,1782.5899658203125,4103.8798828125
+2014-02-01,125.13655090332031,16.61942481994629,32.70622634887695,21.913677215576172,18.104999542236328,,608.4334106445312,68.62999725341797,1859.449951171875,4308.1201171875
+2014-02-06,,,,,,,,,,
+2014-03-01,130.79644775390625,17.052499771118164,35.256614685058594,22.53180694580078,16.818500518798828,,557.8128051757812,65.73999786376953,1872.3399658203125,4198.990234375
+2014-04-01,133.50091552734375,18.747455596923828,34.7491340637207,24.246538162231445,15.206500053405762,,534.8800048828125,61.689998626708984,1883.949951171875,4114.56005859375
+2014-05-01,125.27215576171875,20.11072540283203,35.21359634399414,24.767969131469727,15.6274995803833,,571.6500244140625,64.54000091552734,1923.5699462890625,4242.6201171875
+2014-05-07,,,,,,,,,,
+2014-06-01,123.88963317871094,20.782461166381836,36.12032699584961,24.94846534729004,16.23900032043457,,584.6699829101562,72.36000061035156,1960.22998046875,4408.18017578125
+2014-07-01,130.99761962890625,21.37957000732422,37.38497543334961,26.72607421875,15.649499893188477,,579.5499877929688,69.25,1930.6700439453125,4369.77001953125
+2014-08-01,131.4281463623047,22.922651290893555,39.35124206542969,27.834640502929688,16.95199966430664,,582.3599853515625,71.9000015258789,2003.3699951171875,4580.27001953125
+2014-08-06,,,,,,,,,,
+2014-09-01,130.50729370117188,22.643360137939453,40.40761947631836,26.66560935974121,16.121999740600586,,588.4099731445312,69.19000244140625,1972.2900390625,4493.39013671875
+2014-10-01,113.0242691040039,24.27278709411621,40.92185974121094,26.89417266845703,15.27299976348877,,567.8699951171875,70.12000274658203,2018.050048828125,4630.740234375
+2014-11-01,111.49117279052734,26.729284286499023,41.67144012451172,28.27128028869629,16.93199920654297,,549.0800170898438,73.68000030517578,2067.56005859375,4791.6298828125
+2014-11-06,,,,,,,,,,
+2014-12-01,111.05672454833984,24.915250778198242,40.74142074584961,28.068769454956055,15.517499923706055,,530.6599731445312,72.69999694824219,2058.89990234375,4736.0498046875
+2015-01-01,106.12132263183594,26.445661544799805,35.434940338134766,26.79075813293457,17.726499557495117,,537.5499877929688,70.12999725341797,1994.989990234375,4635.240234375
+2015-02-01,112.09505462646484,28.996322631835938,38.460933685302734,27.767194747924805,19.007999420166016,,562.6300048828125,79.0999984741211,2104.5,4963.52978515625
+2015-02-06,,,,,,,,,,
+2015-03-01,111.87759399414062,28.197509765625,35.91679000854492,26.139816284179688,18.604999542236328,,554.7000122070312,73.94000244140625,2067.889892578125,4900.8798828125
+2015-04-01,119.3988265991211,28.360668182373047,42.96587371826172,23.521541595458984,21.089000701904297,,548.77001953125,76.05999755859375,2085.510009765625,4941.419921875
+2015-05-01,118.25563049316406,29.523195266723633,41.39352035522461,23.3579158782959,21.46150016784668,,545.3200073242188,79.08999633789062,2107.389892578125,5070.02978515625
+2015-05-06,,,,,,,,,,
+2015-06-01,114.24130249023438,28.542850494384766,39.253108978271484,21.762542724609375,21.704500198364258,,540.0399780273438,81.01000213623047,2063.110107421875,4986.8701171875
+2015-07-01,113.77072143554688,27.60302734375,41.520286560058594,22.683992385864258,26.8075008392334,,657.5,81.98999786376953,2103.840087890625,5128.27978515625
+2015-08-01,103.86784362792969,25.65966796875,38.692989349365234,20.93431854248047,25.644500732421875,,647.8200073242188,78.56999969482422,1972.1800537109375,4776.509765625
+2015-08-06,,,,,,,,,,
+2015-09-01,102.66226959228516,25.21347999572754,39.61040496826172,20.028608322143555,25.594499588012695,,638.3699951171875,82.22000122070312,1920.030029296875,4620.16015625
+2015-10-01,99.1993637084961,27.31651496887207,47.11008071899414,19.46390151977539,31.295000076293945,,737.3900146484375,88.66000366210938,2079.360107421875,5053.75
+2015-11-01,98.7319564819336,27.042200088500977,48.64043045043945,21.868392944335938,33.2400016784668,,762.8499755859375,91.45999908447266,2080.409912109375,5108.669921875
+2015-11-06,,,,,,,,,,
+2015-12-01,98.37144470214844,24.16438102722168,49.98638916015625,22.03421974182129,33.794498443603516,,778.010009765625,93.94000244140625,2043.93994140625,5007.41015625
+2016-01-01,89.20050811767578,22.3461971282959,49.63501739501953,20.343839645385742,29.350000381469727,,761.3499755859375,89.12999725341797,1940.239990234375,4613.9501953125
+2016-02-01,93.6608657836914,22.196985244750977,45.841888427734375,20.051719665527344,27.625999450683594,,717.219970703125,85.1500015258789,1932.22998046875,4557.9501953125
+2016-02-08,,,,,,,,,,
+2016-03-01,109.36297607421875,25.15644073486328,50.11842727661133,23.285871505737305,29.68199920654297,,762.9000244140625,93.80000305175781,2059.739990234375,4869.85009765625
+2016-04-01,105.3841552734375,21.636524200439453,45.25450134277344,20.178363800048828,32.97949981689453,,707.8800048828125,94.22000122070312,2065.300048828125,4775.35986328125
+2016-05-01,111.01663208007812,23.049110412597656,48.094825744628906,20.956079483032227,36.13949966430664,,748.8499755859375,99.47000122070312,2096.949951171875,4948.0498046875
+2016-05-06,,,,,,,,,,
+2016-06-01,110.65898895263672,22.20018196105957,46.75897216796875,19.947153091430664,35.78099822998047,,703.530029296875,95.79000091552734,2098.860107421875,4842.669921875
+2016-07-01,117.10401916503906,24.199600219726562,51.79398727416992,21.839828491210938,37.94049835205078,,791.3400268554688,97.86000061035156,2173.60009765625,5162.1298828125
+2016-08-01,115.83541107177734,24.638490676879883,52.506752014160156,20.885658264160156,38.45800018310547,,789.8499755859375,102.30999755859375,2170.949951171875,5213.22021484375
+2016-08-08,,,,,,,,,,
+2016-09-01,116.81381225585938,26.394628524780273,52.96271896362305,21.479366302490234,41.865501403808594,13.321450233459473,804.0599975585938,108.54000091552734,2168.27001953125,5312.0
+2016-10-01,113.019287109375,26.509033203125,55.095947265625,20.878395080566406,39.49100112915039,13.680961608886719,809.9000244140625,107.51000213623047,2126.14990234375,5189.14013671875
+2016-11-01,119.29200744628906,25.803936004638672,55.40858840942383,19.980859756469727,37.528499603271484,14.926712036132812,775.8800048828125,102.80999755859375,2198.81005859375,5323.68017578125
+2016-11-08,,,,,,,,,,
+2016-12-01,123.1717300415039,27.180198669433594,57.52321243286133,18.655929565429688,37.493499755859375,15.31966781616211,792.4500122070312,102.94999694824219,2238.830078125,5383.1201171875
+2017-01-01,129.5013427734375,28.47795867919922,59.84672927856445,22.670724868774414,41.17399978637695,17.554771423339844,820.1900024414062,113.37999725341797,2278.8701171875,5614.7900390625
+2017-02-01,133.43417358398438,32.148292541503906,59.22650909423828,24.339130401611328,42.25199890136719,17.69411849975586,844.9299926757812,118.33999633789062,2363.639892578125,5825.43994140625
+2017-02-08,,,,,,,,,,
+2017-03-01,130.24111938476562,33.85976028442383,61.33644485473633,24.011991500854492,44.32699966430664,17.858545303344727,847.7999877929688,130.1300048828125,2362.719970703125,5911.740234375
+2017-04-01,119.88253784179688,33.85739517211914,63.75787353515625,23.72492027282715,46.2495002746582,18.70298194885254,924.52001953125,133.74000549316406,2384.199951171875,6047.60986328125
+2017-05-01,114.1535415649414,36.00456237792969,65.0430908203125,23.328956604003906,49.73099899291992,19.338397979736328,987.0900268554688,141.86000061035156,2411.800048828125,6198.52001953125
+2017-05-08,,,,,,,,,,
+2017-06-01,116.17494201660156,34.084716796875,64.56354522705078,23.700172424316406,48.400001525878906,17.030832290649414,929.6799926757812,141.44000244140625,2423.409912109375,6140.419921875
+2017-07-01,109.25714874267578,35.19940948486328,68.0947265625,25.520694732666016,49.388999938964844,17.911497116088867,945.5,146.49000549316406,2470.300048828125,6348.1201171875
+2017-08-01,108.01860809326172,38.81330490112305,70.03360748291016,26.852062225341797,49.029998779296875,20.882347106933594,955.239990234375,155.16000366210938,2471.64990234375,6428.66015625
+2017-08-08,,,,,,,,,,
+2017-09-01,110.72441864013672,36.6182861328125,70.14307403564453,27.700807571411133,48.067501068115234,21.517763137817383,973.719970703125,149.17999267578125,2519.360107421875,6495.9599609375
+2017-10-01,117.57792663574219,40.163211822509766,78.32596588134766,25.408233642578125,55.263999938964844,23.067289352416992,1033.0400390625,175.16000366210938,2575.260009765625,6727.669921875
+2017-11-01,117.50923919677734,40.83085632324219,79.2582015991211,24.86334991455078,58.837501525878906,21.80481719970703,1036.1700439453125,181.47000122070312,2647.580078125,6873.97021484375
+2017-11-09,,,,,,,,,,
+2017-12-01,118.25981140136719,40.3528938293457,80.95279693603516,24.43583106994629,58.4734992980957,22.65203857421875,1053.4000244140625,175.24000549316406,2673.610107421875,6903.39013671875
+2018-01-01,126.18390655517578,39.9236946105957,89.91493225097656,28.855159759521484,72.54450225830078,19.982173919677734,1182.219970703125,199.75999450683594,2823.81005859375,7411.47998046875
+2018-02-01,120.11751556396484,42.472713470458984,88.74141693115234,25.634004592895508,75.62249755859375,20.7039852142334,1103.9200439453125,209.1300048828125,2713.830078125,7273.009765625
+2018-02-08,,,,,,,,,,
+2018-03-01,119.43197631835938,40.170265197753906,86.7812271118164,24.33201026916504,72.36699676513672,20.402997970581055,1037.1400146484375,216.0800018310547,2640.8701171875,7063.4501953125
+2018-04-01,112.83880615234375,39.566917419433594,88.92057037353516,26.82056999206543,78.30650329589844,20.00168228149414,1018.5800170898438,221.60000610351562,2648.050048828125,7066.27001953125
+2018-05-01,109.99760437011719,44.7408332824707,93.97891998291016,23.179109573364258,81.48100280761719,22.479249954223633,1100.0,249.27999877929688,2705.27001953125,7442.1201171875
+2018-05-09,,,,,,,,,,
+2018-06-01,109.95153045654297,44.4903450012207,94.16664123535156,20.467208862304688,84.98999786376953,23.571720123291016,1129.18994140625,243.80999755859375,2718.3701171875,7510.2998046875
+2018-07-01,114.06781768798828,45.73533630371094,101.30004119873047,22.375450134277344,88.87200164794922,25.784528732299805,1227.219970703125,244.67999267578125,2816.2900390625,7671.7900390625
+2018-08-01,115.2877197265625,54.709842681884766,107.2684097290039,24.00385284423828,100.635498046875,26.8017520904541,1231.800048828125,263.510009765625,2901.52001953125,8109.5400390625
+2018-08-09,,,,,,,,,,
+2018-09-01,120.2962646484375,54.445865631103516,109.63678741455078,23.24565315246582,100.1500015258789,27.066509246826172,1207.0799560546875,269.95001220703125,2913.97998046875,8046.35009765625
+2018-10-01,91.83122253417969,52.78649139404297,102.38966369628906,24.236047744750977,79.90049743652344,25.190916061401367,1090.5799560546875,245.75999450683594,2711.739990234375,7305.89990234375
+2018-11-01,98.86396026611328,43.07142639160156,106.3008041381836,23.4099178314209,84.50849914550781,29.396371841430664,1109.6500244140625,250.88999938964844,2760.169921875,7330.5400390625
+2018-11-08,,,,,,,,,,
+2018-12-01,91.58279418945312,38.17780685424805,97.78714752197266,17.18350601196289,75.09850311279297,24.59708595275879,1044.9599609375,226.24000549316406,2506.85009765625,6635.27978515625
+2019-01-01,108.30086517333984,40.28346252441406,100.5406265258789,24.84735679626465,85.9365005493164,24.456159591674805,1125.8900146484375,247.82000732421875,2704.10009765625,7281.740234375
+2019-02-01,111.28997039794922,41.90748596191406,107.85758972167969,27.216707229614258,81.99150085449219,28.095136642456055,1126.550048828125,262.5,2784.489990234375,7532.52978515625
+2019-02-07,,,,,,,,,,
+2019-03-01,115.00740814208984,46.17075729370117,114.03240966796875,28.167972564697266,89.0374984741211,29.539655685424805,1176.8900146484375,266.489990234375,2834.39990234375,7729.31982421875
+2019-04-01,114.33090209960938,48.77644348144531,126.27296447753906,29.61660385131836,96.32599639892578,33.9285774230957,1198.9599609375,289.25,2945.830078125,8095.39013671875
+2019-05-01,103.50668334960938,42.55390930175781,119.58222198486328,27.175188064575195,88.75350189208984,29.972509384155273,1106.5,270.8999938964844,2752.06005859375,7453.14990234375
+2019-05-09,,,,,,,,,,
+2019-06-01,113.73433685302734,48.293270111083984,130.00108337402344,31.43656349182129,94.68150329589844,25.56848907470703,1082.800048828125,294.6499938964844,2941.760009765625,8006.240234375
+2019-07-01,122.26231384277344,51.98261260986328,132.24281311035156,28.701255798339844,93.33899688720703,29.061506271362305,1218.199951171875,298.8599853515625,2980.3798828125,8175.419921875
+2019-08-01,111.7796401977539,50.93339920043945,133.78579711914062,25.92054557800293,88.81449890136719,25.9359073638916,1190.530029296875,284.510009765625,2926.4599609375,7962.8798828125
+2019-08-08,,,,,,,,,,
+2019-09-01,121.34967803955078,54.85721969604492,135.37051391601562,26.743131637573242,86.79550170898438,26.10200309753418,1221.1400146484375,276.25,2976.739990234375,7999.33984375
+2019-10-01,111.59463500976562,60.929054260253906,139.59625244140625,30.58913803100586,88.83300018310547,26.620418548583984,1258.800048828125,277.92999267578125,3037.56005859375,8292.3603515625
+2019-11-01,112.19547271728516,65.45783996582031,147.39544677734375,35.09682083129883,90.04000091552734,24.40582847595215,1304.0899658203125,309.5299987792969,3140.97998046875,8665.4697265625
+2019-11-07,,,,,,,,,,
+2019-12-01,113.17443084716797,72.13994598388672,154.07154846191406,33.23965072631836,92.39199829101562,25.86544418334961,1339.3900146484375,329.80999755859375,3230.780029296875,8972.599609375
+2020-01-01,121.35601806640625,76.03622436523438,166.31326293945312,32.28398132324219,100.43599700927734,24.546754837036133,1432.780029296875,351.1400146484375,3225.52001953125,9150.9404296875
+2020-02-01,109.88997650146484,67.1553726196289,158.28240966796875,29.225305557250977,94.1875,20.364192962646484,1339.25,345.1199951171875,2954.219970703125,8567.3701171875
+2020-02-07,,,,,,,,,,
+2020-03-01,94.6399154663086,62.61878204345703,154.502197265625,17.190288543701172,97.48600006103516,19.90617561340332,1161.949951171875,318.239990234375,2584.590087890625,7700.10009765625
+2020-04-01,107.12150573730469,72.34808349609375,175.5648956298828,16.6003360748291,123.69999694824219,21.486589431762695,1346.699951171875,353.6400146484375,2912.429931640625,8889.5498046875
+2020-05-01,106.55841827392578,78.29256439208984,179.52272033691406,14.412978172302246,122.11849975585938,24.98464012145996,1433.52001953125,386.6000061035156,3044.31005859375,9489.8701171875
+2020-05-07,,,,,,,,,,
+2020-06-01,104.41674041748047,90.0749740600586,199.92588806152344,13.877481460571289,137.9409942626953,27.652219772338867,1418.050048828125,435.30999755859375,3100.2900390625,10058.76953125
+2020-07-01,106.29290008544922,104.9491958618164,201.3994598388672,15.366937637329102,158.23399353027344,30.11343765258789,1487.949951171875,444.32000732421875,3271.1201171875,10745.26953125
+2020-08-01,106.61280059814453,127.44819641113281,221.55807495117188,17.406635284423828,172.54800415039062,33.25917053222656,1629.530029296875,513.3900146484375,3500.31005859375,11775.4599609375
+2020-08-07,,,,,,,,,,
+2020-09-01,106.57222747802734,114.5876235961914,207.12527465820312,17.323570251464844,157.43649291992188,34.06950759887695,1465.5999755859375,490.42999267578125,3363.0,11167.509765625
+2020-10-01,97.80435180664062,107.71099090576172,199.38504028320312,16.259458541870117,151.8074951171875,30.329862594604492,1616.1099853515625,447.1000061035156,3269.9599609375,10911.58984375
+2020-11-01,108.19266510009766,117.79344177246094,210.8082733154297,20.478687286376953,158.40199279785156,34.74394989013672,1754.4000244140625,478.4700012207031,3621.6298828125,12198.740234375
+2020-11-09,,,,,,,,,,
+2020-12-01,111.85865020751953,131.51597595214844,219.60447692871094,21.694869995117188,162.84649658203125,36.88808059692383,1752.6400146484375,500.1199951171875,3756.070068359375,12888.2802734375
+2021-01-01,105.84272766113281,130.7924346923828,229.0237274169922,19.891191482543945,160.30999755859375,36.6867561340332,1827.3599853515625,458.7699890136719,3714.239990234375,13070.6904296875
+2021-02-01,105.68277740478516,120.18710327148438,229.4384002685547,24.100215911865234,154.64649963378906,40.80388259887695,2021.9100341796875,459.6700134277344,3811.14990234375,13192.349609375
+2021-02-09,,,,,,,,,,
+2021-03-01,119.9990005493164,121.25013732910156,233.32164001464844,22.955739974975586,154.70399475097656,44.367366790771484,2062.52001953125,475.3699951171875,3972.889892578125,13246.8701171875
+2021-04-01,127.76121520996094,130.49156188964844,249.56121826171875,23.070621490478516,173.37100219726562,49.49113082885742,2353.5,508.3399963378906,4181.169921875,13962.6796875
+2021-05-01,129.4361114501953,123.6920166015625,247.08718872070312,22.41118812561035,161.15350341796875,49.64715576171875,2356.85009765625,504.5799865722656,4204.10986328125,13748.740234375
+2021-05-07,,,,,,,,,,
+2021-06-01,133.47738647460938,136.1819610595703,268.70587158203125,22.44941520690918,172.00799560546875,50.16557312011719,2441.7900390625,585.6400146484375,4297.5,14503.9501953125
+2021-07-01,128.35101318359375,145.03138732910156,282.6023864746094,23.305561065673828,166.37950134277344,48.63045883178711,2694.530029296875,621.6300048828125,4395.259765625,14672.6796875
+2021-08-01,127.78646087646484,150.96749877929688,299.4349365234375,21.74091148376465,173.5395050048828,49.053245544433594,2893.949951171875,663.7000122070312,4522.68017578125,15259.240234375
+2021-08-09,,,,,,,,,,
+2021-09-01,127.95899963378906,140.906982421875,280.1719665527344,19.48086166381836,164.2519989013672,52.36507034301758,2673.52001953125,575.719970703125,4307.5400390625,14448.580078125
+2021-10-01,115.22111511230469,149.1721954345703,329.56378173828125,17.397972106933594,168.6215057373047,55.35980224609375,2960.919921875,650.3599853515625,4605.3798828125,15498.3896484375
+2021-11-01,112.8140869140625,164.60723876953125,328.5401611328125,18.003969192504883,175.35350036621094,56.077186584472656,2837.949951171875,669.8499755859375,4567.0,15537.6904296875
+2021-11-04,,,,,,,,,,
+2021-11-09,,,,,,,,,,
+2021-12-01,130.48629760742188,177.08387756347656,334.8461608886719,22.1286563873291,166.7169952392578,55.77927017211914,2897.0400390625,567.0599975585938,4766.18017578125,15644.9697265625
+2022-01-01,130.3984375,174.30149841308594,309.6171875,20.856517791748047,149.57350158691406,56.41482162475586,2706.070068359375,534.2999877929688,4515.5498046875,14239.8798828125
+2022-02-01,119.60104370117188,164.66795349121094,297.4805908203125,19.47332763671875,153.56300354003906,50.60551452636719,2701.139892578125,467.67999267578125,4373.93994140625,13751.400390625
+2022-02-10,,,,,,,,,,
+2022-03-01,128.46168518066406,174.3538360595703,307.59356689453125,19.927804946899414,162.99749755859375,49.84086990356445,2781.35009765625,455.6199951171875,4530.41015625,14220.51953125
+2022-04-01,130.6254425048828,157.418701171875,276.8751220703125,17.399999618530273,124.28150177001953,46.68299102783203,2282.18994140625,395.95001220703125,4131.93017578125,12334.6396484375
+2022-05-01,137.1759796142578,148.6216278076172,271.2382507324219,18.81999969482422,120.20950317382812,49.939998626708984,2275.239990234375,416.4800109863281,4132.14990234375,12081.3896484375
+2022-05-09,,,,,,,,,,
+2022-06-01,141.86000061035156,137.44000244140625,256.4800109863281,15.819999694824219,107.4000015258789,48.939998626708984,2240.14990234375,365.6300048828125,3821.550048828125,11181.5400390625
+2022-06-28,141.86000061035156,137.44000244140625,256.4800109863281,15.819999694824219,107.4000015258789,48.939998626708984,2240.14990234375,365.6300048828125,3821.550048828125,11181.5400390625
diff --git a/lib/matplotlib/mpl-data/stylelib/Solarize_Light2.mplstyle b/lib/matplotlib/mpl-data/stylelib/Solarize_Light2.mplstyle
index 6c7aa7ee1219..418721314335 100644
--- a/lib/matplotlib/mpl-data/stylelib/Solarize_Light2.mplstyle
+++ b/lib/matplotlib/mpl-data/stylelib/Solarize_Light2.mplstyle
@@ -1,4 +1,4 @@
-# Solarized color palette taken from http://ethanschoonover.com/solarized
+# Solarized color palette taken from https://ethanschoonover.com/solarized/
 # Inspired by, and copied from ggthemes https://github.com/jrnold/ggthemes
 
 #TODO:
diff --git a/lib/matplotlib/mpl-data/stylelib/_mpl-gallery-nogrid.mplstyle b/lib/matplotlib/mpl-data/stylelib/_mpl-gallery-nogrid.mplstyle
new file mode 100644
index 000000000000..911658fe8833
--- /dev/null
+++ b/lib/matplotlib/mpl-data/stylelib/_mpl-gallery-nogrid.mplstyle
@@ -0,0 +1,19 @@
+# This style is used for the plot_types gallery. It is considered private.
+
+axes.grid: False
+axes.axisbelow: True
+
+figure.figsize: 2, 2
+# make it so the axes labels don't show up.  Obviously 
+# not good style for any quantitative analysis:
+figure.subplot.left: 0.01
+figure.subplot.right: 0.99
+figure.subplot.bottom: 0.01
+figure.subplot.top: 0.99
+
+xtick.major.size: 0.0
+ytick.major.size: 0.0
+
+# colors:
+image.cmap    : Blues
+axes.prop_cycle: cycler('color', ['1f77b4', '82bbdb', 'ccdff1'])
diff --git a/lib/matplotlib/mpl-data/stylelib/_mpl-gallery.mplstyle b/lib/matplotlib/mpl-data/stylelib/_mpl-gallery.mplstyle
new file mode 100644
index 000000000000..75c95bf16a1f
--- /dev/null
+++ b/lib/matplotlib/mpl-data/stylelib/_mpl-gallery.mplstyle
@@ -0,0 +1,19 @@
+# This style is used for the plot_types gallery. It is considered part of the private API.
+
+axes.grid: True
+axes.axisbelow: True
+
+figure.figsize: 2, 2
+# make it so the axes labels don't show up.  Obviously 
+# not good style for any quantitative analysis:
+figure.subplot.left: 0.01
+figure.subplot.right: 0.99
+figure.subplot.bottom: 0.01
+figure.subplot.top: 0.99
+
+xtick.major.size: 0.0
+ytick.major.size: 0.0
+
+# colors:
+image.cmap    : Blues
+axes.prop_cycle: cycler('color', ['1f77b4', '58a1cf', 'abd0e6'])
diff --git a/lib/matplotlib/mpl-data/stylelib/classic.mplstyle b/lib/matplotlib/mpl-data/stylelib/classic.mplstyle
index 2d7565e34095..6f65e8be95db 100644
--- a/lib/matplotlib/mpl-data/stylelib/classic.mplstyle
+++ b/lib/matplotlib/mpl-data/stylelib/classic.mplstyle
@@ -2,7 +2,7 @@
 
 
 ### LINES
-# See http://matplotlib.org/api/artist_api.html#module-matplotlib.lines for more
+# See https://matplotlib.org/api/artist_api.html#module-matplotlib.lines for more
 # information on line properties.
 lines.linewidth   : 1.0     # line width in points
 lines.linestyle   : -       # solid line
@@ -28,7 +28,7 @@ markers.fillstyle: full
 ### PATCHES
 # Patches are graphical objects that fill 2D space, like polygons or
 # circles.  See
-# http://matplotlib.org/api/artist_api.html#module-matplotlib.patches
+# https://matplotlib.org/api/artist_api.html#module-matplotlib.patches
 # information on patch properties
 patch.linewidth        : 1.0     # edge width in points
 patch.facecolor        : b
@@ -44,7 +44,7 @@ hist.bins              : 10
 ### FONT
 #
 # font properties used by text.Text.  See
-# http://matplotlib.org/api/font_manager_api.html for more
+# https://matplotlib.org/api/font_manager_api.html for more
 # information on font properties.  The 6 font properties used for font
 # matching are given below with their default values.
 #
@@ -96,7 +96,7 @@ font.monospace : DejaVu Sans Mono, Andale Mono, Nimbus Mono L, Courier New, Cour
 
 ### TEXT
 # text properties used by text.Text.  See
-# http://matplotlib.org/api/artist_api.html#module-matplotlib.text for more
+# https://matplotlib.org/api/artist_api.html#module-matplotlib.text for more
 # information on text properties
 
 text.color          : k
@@ -170,7 +170,7 @@ mathtext.default : it # The default font to use for math.
 ### AXES
 # default face and edge color, default tick sizes,
 # default fontsizes for ticklabels, and so on.  See
-# http://matplotlib.org/api/axes_api.html#module-matplotlib.axes
+# https://matplotlib.org/api/axes_api.html#module-matplotlib.axes
 axes.facecolor      : w       # axes background color
 axes.edgecolor      : k       # axes edge color
 axes.linewidth      : 1.0     # edge linewidth
@@ -207,9 +207,9 @@ axes.formatter.offset_threshold : 2      # When useoffset is True, the offset
                                          # at least this number of significant
                                          # digits from tick labels.
 
-axes.unicode_minus  : True    # use unicode for the minus symbol
+axes.unicode_minus  : True    # use Unicode for the minus symbol
                               # rather than hyphen.  See
-                              # http://en.wikipedia.org/wiki/Plus_and_minus_signs#Character_codes
+                              # https://en.wikipedia.org/wiki/Plus_and_minus_signs#Character_codes
 axes.prop_cycle    : cycler('color', 'bgrcmyk')
                                            # color cycle for plot lines
                                            # as list of string colorspecs:
@@ -235,7 +235,7 @@ date.autoformatter.microsecond : %H:%M:%S.%f
 date.converter:                  auto  # 'auto', 'concise'
 
 ### TICKS
-# see http://matplotlib.org/api/axis_api.html#matplotlib.axis.Tick
+# see https://matplotlib.org/api/axis_api.html#matplotlib.axis.Tick
 
 xtick.top            : True   # draw ticks on the top side
 xtick.bottom         : True   # draw ticks on the bottom side
@@ -304,9 +304,11 @@ legend.edgecolor     : inherit   # legend edge color (when 'inherit' uses axes.e
 
 
 ### FIGURE
-# See http://matplotlib.org/api/figure_api.html#matplotlib.figure.Figure
+# See https://matplotlib.org/api/figure_api.html#matplotlib.figure.Figure
 figure.titlesize : medium     # size of the figure title
 figure.titleweight : normal   # weight of the figure title
+figure.labelsize:   medium    # size of the figure label
+figure.labelweight: normal    # weight of the figure label
 figure.figsize   : 8, 6    # figure size in inches
 figure.dpi       : 80      # figure dots per inch
 figure.facecolor : 0.75    # figure facecolor; 0.75 is scalar gray
@@ -329,7 +331,7 @@ figure.subplot.hspace  : 0.2    # the amount of height reserved for space betwee
 ### IMAGES
 image.aspect : equal             # equal | auto | a number
 image.interpolation  : bilinear  # see help(imshow) for options
-image.cmap   : jet               # gray | jet etc...
+image.cmap   : jet               # gray | jet | ...
 image.lut    : 256               # the size of the colormap lookup table
 image.origin : upper             # lower | upper
 image.resample  : False
diff --git a/lib/matplotlib/mpl-data/stylelib/ggplot.mplstyle b/lib/matplotlib/mpl-data/stylelib/ggplot.mplstyle
index 67afd83cc42d..d1b3ba2e337b 100644
--- a/lib/matplotlib/mpl-data/stylelib/ggplot.mplstyle
+++ b/lib/matplotlib/mpl-data/stylelib/ggplot.mplstyle
@@ -1,4 +1,4 @@
-# from http://www.huyng.com/posts/sane-color-scheme-for-matplotlib/
+# from https://everyhue.me/posts/sane-color-scheme-for-matplotlib/
 
 patch.linewidth: 0.5
 patch.facecolor: 348ABD  # blue
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-bright.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-bright.mplstyle
similarity index 100%
rename from lib/matplotlib/mpl-data/stylelib/seaborn-bright.mplstyle
rename to lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-bright.mplstyle
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-colorblind.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-colorblind.mplstyle
similarity index 100%
rename from lib/matplotlib/mpl-data/stylelib/seaborn-colorblind.mplstyle
rename to lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-colorblind.mplstyle
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-dark-palette.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-dark-palette.mplstyle
similarity index 100%
rename from lib/matplotlib/mpl-data/stylelib/seaborn-dark-palette.mplstyle
rename to lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-dark-palette.mplstyle
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-dark.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-dark.mplstyle
similarity index 100%
rename from lib/matplotlib/mpl-data/stylelib/seaborn-dark.mplstyle
rename to lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-dark.mplstyle
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-darkgrid.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-darkgrid.mplstyle
similarity index 100%
rename from lib/matplotlib/mpl-data/stylelib/seaborn-darkgrid.mplstyle
rename to lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-darkgrid.mplstyle
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-deep.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-deep.mplstyle
similarity index 100%
rename from lib/matplotlib/mpl-data/stylelib/seaborn-deep.mplstyle
rename to lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-deep.mplstyle
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-muted.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-muted.mplstyle
similarity index 100%
rename from lib/matplotlib/mpl-data/stylelib/seaborn-muted.mplstyle
rename to lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-muted.mplstyle
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-notebook.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-notebook.mplstyle
similarity index 100%
rename from lib/matplotlib/mpl-data/stylelib/seaborn-notebook.mplstyle
rename to lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-notebook.mplstyle
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-paper.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-paper.mplstyle
similarity index 100%
rename from lib/matplotlib/mpl-data/stylelib/seaborn-paper.mplstyle
rename to lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-paper.mplstyle
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-pastel.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-pastel.mplstyle
similarity index 100%
rename from lib/matplotlib/mpl-data/stylelib/seaborn-pastel.mplstyle
rename to lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-pastel.mplstyle
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-poster.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-poster.mplstyle
similarity index 100%
rename from lib/matplotlib/mpl-data/stylelib/seaborn-poster.mplstyle
rename to lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-poster.mplstyle
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-talk.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-talk.mplstyle
similarity index 100%
rename from lib/matplotlib/mpl-data/stylelib/seaborn-talk.mplstyle
rename to lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-talk.mplstyle
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-ticks.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-ticks.mplstyle
similarity index 100%
rename from lib/matplotlib/mpl-data/stylelib/seaborn-ticks.mplstyle
rename to lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-ticks.mplstyle
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-white.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-white.mplstyle
similarity index 100%
rename from lib/matplotlib/mpl-data/stylelib/seaborn-white.mplstyle
rename to lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-white.mplstyle
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-whitegrid.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-whitegrid.mplstyle
similarity index 100%
rename from lib/matplotlib/mpl-data/stylelib/seaborn-whitegrid.mplstyle
rename to lib/matplotlib/mpl-data/stylelib/seaborn-v0_8-whitegrid.mplstyle
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-v0_8.mplstyle
similarity index 100%
rename from lib/matplotlib/mpl-data/stylelib/seaborn.mplstyle
rename to lib/matplotlib/mpl-data/stylelib/seaborn-v0_8.mplstyle
diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py
index 37d2295cda15..b583e320c7c7 100644
--- a/lib/matplotlib/offsetbox.py
+++ b/lib/matplotlib/offsetbox.py
@@ -24,7 +24,8 @@
 
 import numpy as np
 
-from matplotlib import _api, docstring, rcParams
+import matplotlib as mpl
+from matplotlib import _api, _docstring
 import matplotlib.artist as martist
 import matplotlib.path as mpath
 import matplotlib.text as mtext
@@ -192,14 +193,12 @@ class OffsetBox(martist.Artist):
     Being an artist itself, all parameters are passed on to `.Artist`.
     """
     def __init__(self, *args, **kwargs):
-
-        super().__init__(*args, **kwargs)
-
-        # Clipping has not been implemented in the OffesetBox family, so
+        super().__init__(*args)
+        self._internal_update(kwargs)
+        # Clipping has not been implemented in the OffsetBox family, so
         # disable the clip flag for consistency. It can always be turned back
         # on to zero effect.
         self.set_clip_on(False)
-
         self._children = []
         self._offset = (0, 0)
 
@@ -347,8 +346,10 @@ def get_extent(self, renderer):
         w, h, xd, yd, offsets = self.get_extent_offsets(renderer)
         return w, h, xd, yd
 
-    def get_window_extent(self, renderer):
-        """Return the bounding box (`.Bbox`) in display space."""
+    def get_window_extent(self, renderer=None):
+        # docstring inherited
+        if renderer is None:
+            renderer = self.figure._get_renderer()
         w, h, xd, yd, offsets = self.get_extent_offsets(renderer)
         px, py = self.get_offset(w, h, xd, yd, renderer)
         return mtransforms.Bbox.from_bounds(px - xd, py - yd, w, h)
@@ -358,15 +359,11 @@ def draw(self, renderer):
         Update the location of children if necessary and draw them
         to the given *renderer*.
         """
-        width, height, xdescent, ydescent, offsets = self.get_extent_offsets(
-                                                        renderer)
-
-        px, py = self.get_offset(width, height, xdescent, ydescent, renderer)
-
+        w, h, xdescent, ydescent, offsets = self.get_extent_offsets(renderer)
+        px, py = self.get_offset(w, h, xdescent, ydescent, renderer)
         for c, (ox, oy) in zip(self.get_visible_children(), offsets):
             c.set_offset((px + ox, py + oy))
             c.draw(renderer)
-
         bbox_artist(self, renderer, fill=False, props=dict(pad=0.))
         self.stale = False
 
@@ -406,7 +403,7 @@ def __init__(self, pad=None, sep=None, width=None, height=None,
         Notes
         -----
         *pad* and *sep* are in points and will be scaled with the renderer
-        dpi, while *width* and *height* are in in pixels.
+        dpi, while *width* and *height* are in pixels.
         """
         super().__init__()
         self.height = height
@@ -477,13 +474,6 @@ def get_extent_offsets(self, renderer):
         if not whd_list:
             return 2 * pad, 2 * pad, pad, pad, []
 
-        if self.height is None:
-            height_descent = max(h - yd for w, h, xd, yd in whd_list)
-            ydescent = max(yd for w, h, xd, yd in whd_list)
-            height = height_descent + ydescent
-        else:
-            height = self.height - 2 * pad  # width w/o pad
-
         hd_list = [(h, yd) for w, h, xd, yd in whd_list]
         height, ydescent, yoffsets = _get_aligned_offsets(hd_list,
                                                           self.height,
@@ -511,6 +501,8 @@ class PaddedBox(OffsetBox):
     The `.PaddedBox` contains a `.FancyBboxPatch` that is used to visualize
     it when rendering.
     """
+
+    @_api.make_keyword_only("3.6", name="draw_frame")
     def __init__(self, child, pad=None, draw_frame=False, patch_attrs=None):
         """
         Parameters
@@ -550,11 +542,8 @@ def get_extent_offsets(self, renderer):
 
     def draw(self, renderer):
         # docstring inherited
-        width, height, xdescent, ydescent, offsets = self.get_extent_offsets(
-                                                        renderer)
-
-        px, py = self.get_offset(width, height, xdescent, ydescent, renderer)
-
+        w, h, xdescent, ydescent, offsets = self.get_extent_offsets(renderer)
+        px, py = self.get_offset(w, h, xdescent, ydescent, renderer)
         for c, (ox, oy) in zip(self.get_visible_children(), offsets):
             c.set_offset((px + ox, py + oy))
 
@@ -563,11 +552,10 @@ def draw(self, renderer):
         for c in self.get_visible_children():
             c.draw(renderer)
 
-        #bbox_artist(self, renderer, fill=False, props=dict(pad=0.))
         self.stale = False
 
     def update_frame(self, bbox, fontsize=None):
-        self.patch.set_bounds(bbox.x0, bbox.y0, bbox.width, bbox.height)
+        self.patch.set_bounds(bbox.bounds)
         if fontsize:
             self.patch.set_mutation_scale(fontsize)
         self.stale = True
@@ -586,8 +574,7 @@ class DrawingArea(OffsetBox):
     boundaries of the parent.
     """
 
-    def __init__(self, width, height, xdescent=0.,
-                 ydescent=0., clip=False):
+    def __init__(self, width, height, xdescent=0., ydescent=0., clip=False):
         """
         Parameters
         ----------
@@ -649,8 +636,10 @@ def get_offset(self):
         """Return offset of the container."""
         return self._offset
 
-    def get_window_extent(self, renderer):
-        """Return the bounding box in display space."""
+    def get_window_extent(self, renderer=None):
+        # docstring inherited
+        if renderer is None:
+            renderer = self.figure._get_renderer()
         w, h, xd, yd = self.get_extent(renderer)
         ox, oy = self.get_offset()  # w, h, xd, yd)
 
@@ -706,11 +695,10 @@ class TextArea(OffsetBox):
     child text.
     """
 
-    @_api.delete_parameter("3.4", "minimumdescent")
+    @_api.make_keyword_only("3.6", name="textprops")
     def __init__(self, s,
                  textprops=None,
                  multilinebaseline=False,
-                 minimumdescent=True,
                  ):
         """
         Parameters
@@ -723,9 +711,6 @@ def __init__(self, s,
         multilinebaseline : bool, default: False
             Whether the baseline for multiline text is adjusted so that it
             is (approximately) center-aligned with single-line text.
-        minimumdescent : bool, default: True
-            If `True`, the box has a minimum descent of "p".  This is now
-            effectively always True.
         """
         if textprops is None:
             textprops = {}
@@ -737,7 +722,6 @@ def __init__(self, s,
         self._text.set_transform(self.offset_transform +
                                  self._baseline_transform)
         self._multilinebaseline = multilinebaseline
-        self._minimumdescent = minimumdescent
 
     def set_text(self, s):
         """Set the text of this area as a string."""
@@ -766,26 +750,6 @@ def get_multilinebaseline(self):
         """
         return self._multilinebaseline
 
-    @_api.deprecated("3.4")
-    def set_minimumdescent(self, t):
-        """
-        Set minimumdescent.
-
-        If True, extent of the single line text is adjusted so that
-        its descent is at least the one of the glyph "p".
-        """
-        # The current implementation of Text._get_layout always behaves as if
-        # this is True.
-        self._minimumdescent = t
-        self.stale = True
-
-    @_api.deprecated("3.4")
-    def get_minimumdescent(self):
-        """
-        Get minimumdescent.
-        """
-        return self._minimumdescent
-
     def set_transform(self, t):
         """
         set_transform is ignored.
@@ -809,8 +773,10 @@ def get_offset(self):
         """Return offset of the container."""
         return self._offset
 
-    def get_window_extent(self, renderer):
-        """Return the bounding box in display space."""
+    def get_window_extent(self, renderer=None):
+        # docstring inherited
+        if renderer is None:
+            renderer = self.figure._get_renderer()
         w, h, xd, yd = self.get_extent(renderer)
         ox, oy = self.get_offset()
         return mtransforms.Bbox.from_bounds(ox - xd, oy - yd, w, h)
@@ -821,7 +787,7 @@ def get_extent(self, renderer):
             ismath="TeX" if self._text.get_usetex() else False)
 
         bbox, info, yd = self._text._get_layout(renderer)
-        w, h = bbox.width, bbox.height
+        w, h = bbox.size
 
         self._baseline_transform.clear()
 
@@ -910,8 +876,10 @@ def get_offset(self):
         """Return offset of the container."""
         return self._offset
 
-    def get_window_extent(self, renderer):
-        """Return the bounding box in display space."""
+    def get_window_extent(self, renderer=None):
+        # docstring inherited
+        if renderer is None:
+            renderer = self.figure._get_renderer()
         w, h, xd, yd = self.get_extent(renderer)
         ox, oy = self.get_offset()  # w, h, xd, yd)
         return mtransforms.Bbox.from_bounds(ox - xd, oy - yd, w, h)
@@ -963,6 +931,7 @@ class AnchoredOffsetbox(OffsetBox):
              'center': 10,
              }
 
+    @_api.make_keyword_only("3.6", name="pad")
     def __init__(self, loc,
                  pad=0.4, borderpad=0.5,
                  child=None, prop=None, frameon=True,
@@ -973,43 +942,27 @@ def __init__(self, loc,
         Parameters
         ----------
         loc : str
-            The box location. Supported values:
-
-            - 'upper right'
-            - 'upper left'
-            - 'lower left'
-            - 'lower right'
-            - 'center left'
-            - 'center right'
-            - 'lower center'
-            - 'upper center'
-            - 'center'
-
+            The box location.  Valid locations are
+            'upper left', 'upper center', 'upper right',
+            'center left', 'center', 'center right',
+            'lower left', 'lower center, 'lower right'.
             For backward compatibility, numeric values are accepted as well.
             See the parameter *loc* of `.Legend` for details.
-
         pad : float, default: 0.4
             Padding around the child as fraction of the fontsize.
-
         borderpad : float, default: 0.5
             Padding between the offsetbox frame and the *bbox_to_anchor*.
-
         child : `.OffsetBox`
             The box that will be anchored.
-
         prop : `.FontProperties`
             This is only used as a reference for paddings. If not given,
             :rc:`legend.fontsize` is used.
-
         frameon : bool
             Whether to draw a frame around the box.
-
         bbox_to_anchor : `.BboxBase`, 2-tuple, or 4-tuple of floats
             Box that is used to position the legend in conjunction with *loc*.
-
         bbox_transform : None or :class:`matplotlib.transforms.Transform`
             The transform for the bounding box (*bbox_to_anchor*).
-
         **kwargs
             All other parameters are passed on to `.OffsetBox`.
 
@@ -1030,11 +983,11 @@ def __init__(self, loc,
         self.pad = pad
 
         if prop is None:
-            self.prop = FontProperties(size=rcParams["legend.fontsize"])
+            self.prop = FontProperties(size=mpl.rcParams["legend.fontsize"])
         else:
             self.prop = FontProperties._from_any(prop)
             if isinstance(prop, dict) and "size" not in prop:
-                self.prop.set_size(rcParams["legend.fontsize"])
+                self.prop.set_size(mpl.rcParams["legend.fontsize"])
 
         self.patch = FancyBboxPatch(
             xy=(0.0, 0.0), width=1., height=1.,
@@ -1081,8 +1034,7 @@ def get_bbox_to_anchor(self):
             if transform is None:
                 return self._bbox_to_anchor
             else:
-                return TransformedBbox(self._bbox_to_anchor,
-                                       transform)
+                return TransformedBbox(self._bbox_to_anchor, transform)
 
     def set_bbox_to_anchor(self, bbox, transform=None):
         """
@@ -1099,8 +1051,7 @@ def set_bbox_to_anchor(self, bbox, transform=None):
             try:
                 l = len(bbox)
             except TypeError as err:
-                raise ValueError("Invalid argument for bbox : %s" %
-                                 str(bbox)) from err
+                raise ValueError(f"Invalid bbox: {bbox}") from err
 
             if l == 2:
                 bbox = [bbox[0], bbox[1], 0, 0]
@@ -1110,8 +1061,11 @@ def set_bbox_to_anchor(self, bbox, transform=None):
         self._bbox_to_anchor_transform = transform
         self.stale = True
 
-    def get_window_extent(self, renderer):
-        """Return the bounding box in display space."""
+    def get_window_extent(self, renderer=None):
+        # docstring inherited
+        if renderer is None:
+            renderer = self.figure._get_renderer()
+
         self._update_offset_func(renderer)
         w, h, xd, yd = self.get_extent(renderer)
         ox, oy = self.get_offset(w, h, xd, yd, renderer)
@@ -1124,23 +1078,20 @@ def _update_offset_func(self, renderer, fontsize=None):
         """
         if fontsize is None:
             fontsize = renderer.points_to_pixels(
-                            self.prop.get_size_in_points())
+                self.prop.get_size_in_points())
 
-        def _offset(w, h, xd, yd, renderer, fontsize=fontsize, self=self):
+        def _offset(w, h, xd, yd, renderer):
             bbox = Bbox.from_bounds(0, 0, w, h)
             borderpad = self.borderpad * fontsize
             bbox_to_anchor = self.get_bbox_to_anchor()
-
-            x0, y0 = self._get_anchored_bbox(self.loc,
-                                             bbox,
-                                             bbox_to_anchor,
-                                             borderpad)
+            x0, y0 = _get_anchored_bbox(
+                self.loc, bbox, bbox_to_anchor, borderpad)
             return x0 + xd, y0 + yd
 
         self.set_offset(_offset)
 
     def update_frame(self, bbox, fontsize=None):
-        self.patch.set_bounds(bbox.x0, bbox.y0, bbox.width, bbox.height)
+        self.patch.set_bounds(bbox.bounds)
         if fontsize:
             self.patch.set_mutation_scale(fontsize)
 
@@ -1165,31 +1116,17 @@ def draw(self, renderer):
         self.get_child().draw(renderer)
         self.stale = False
 
-    def _get_anchored_bbox(self, loc, bbox, parentbbox, borderpad):
-        """
-        Return the position of the bbox anchored at the parentbbox
-        with the loc code, with the borderpad.
-        """
-        assert loc in range(1, 11)  # called only internally
-
-        BEST, UR, UL, LL, LR, R, CL, CR, LC, UC, C = range(11)
-
-        anchor_coefs = {UR: "NE",
-                        UL: "NW",
-                        LL: "SW",
-                        LR: "SE",
-                        R: "E",
-                        CL: "W",
-                        CR: "E",
-                        LC: "S",
-                        UC: "N",
-                        C: "C"}
-
-        c = anchor_coefs[loc]
 
-        container = parentbbox.padded(-borderpad)
-        anchored_box = bbox.anchored(c, container=container)
-        return anchored_box.x0, anchored_box.y0
+def _get_anchored_bbox(loc, bbox, parentbbox, borderpad):
+    """
+    Return the (x, y) position of the *bbox* anchored at the *parentbbox* with
+    the *loc* code with the *borderpad*.
+    """
+    # This is only called internally and *loc* should already have been
+    # validated.  If 0 (None), we just let ``bbox.anchored`` raise.
+    c = [None, "NE", "NW", "SW", "SE", "E", "W", "E", "S", "N", "C"][loc]
+    container = parentbbox.padded(-borderpad)
+    return bbox.anchored(c, container=container).p0
 
 
 class AnchoredText(AnchoredOffsetbox):
@@ -1197,6 +1134,7 @@ class AnchoredText(AnchoredOffsetbox):
     AnchoredOffsetbox with Text.
     """
 
+    @_api.make_keyword_only("3.6", name="pad")
     def __init__(self, s, loc, pad=0.4, borderpad=0.5, prop=None, **kwargs):
         """
         Parameters
@@ -1236,6 +1174,8 @@ def __init__(self, s, loc, pad=0.4, borderpad=0.5, prop=None, **kwargs):
 
 
 class OffsetImage(OffsetBox):
+
+    @_api.make_keyword_only("3.6", name="zoom")
     def __init__(self, arr,
                  zoom=1,
                  cmap=None,
@@ -1290,8 +1230,10 @@ def get_offset(self):
     def get_children(self):
         return [self.image]
 
-    def get_window_extent(self, renderer):
-        """Return the bounding box in display space."""
+    def get_window_extent(self, renderer=None):
+        # docstring inherited
+        if renderer is None:
+            renderer = self.figure._get_renderer()
         w, h, xd, yd = self.get_extent(renderer)
         ox, oy = self.get_offset()
         return mtransforms.Bbox.from_bounds(ox - xd, oy - yd, w, h)
@@ -1330,7 +1272,8 @@ class AnnotationBbox(martist.Artist, mtext._AnnotationBase):
     def __str__(self):
         return "AnnotationBbox(%g,%g)" % (self.xy[0], self.xy[1])
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
+    @_api.make_keyword_only("3.6", name="xycoords")
     def __init__(self, offsetbox, xy,
                  xybox=None,
                  xycoords='data',
@@ -1366,7 +1309,9 @@ def __init__(self, offsetbox, xy,
             *textcoords* in `.Annotation` for a detailed description.
 
         frameon : bool, default: True
-            Whether to draw a frame around the box.
+            By default, the text is surrounded by a white `.FancyBboxPatch`
+            (accessible as the ``patch`` attribute of the `.AnnotationBbox`).
+            If *frameon* is set to False, this patch is made invisible.
 
         pad : float, default: 0.4
             Padding around the offsetbox.
@@ -1381,26 +1326,15 @@ def __init__(self, offsetbox, xy,
         """
 
         martist.Artist.__init__(self)
-        mtext._AnnotationBase.__init__(self,
-                                       xy,
-                                       xycoords=xycoords,
-                                       annotation_clip=annotation_clip)
+        mtext._AnnotationBase.__init__(
+            self, xy, xycoords=xycoords, annotation_clip=annotation_clip)
 
         self.offsetbox = offsetbox
-
-        self.arrowprops = arrowprops
-
+        self.arrowprops = arrowprops.copy() if arrowprops is not None else None
         self.set_fontsize(fontsize)
-
-        if xybox is None:
-            self.xybox = xy
-        else:
-            self.xybox = xybox
-
-        if boxcoords is None:
-            self.boxcoords = xycoords
-        else:
-            self.boxcoords = boxcoords
+        self.xybox = xybox if xybox is not None else xy
+        self.boxcoords = boxcoords if boxcoords is not None else xycoords
+        self._box_alignment = box_alignment
 
         if arrowprops is not None:
             self._arrow_relpos = self.arrowprops.pop("relpos", (0.5, 0.5))
@@ -1410,10 +1344,7 @@ def __init__(self, offsetbox, xy,
             self._arrow_relpos = None
             self.arrow_patch = None
 
-        self._box_alignment = box_alignment
-
-        # frame
-        self.patch = FancyBboxPatch(
+        self.patch = FancyBboxPatch(  # frame
             xy=(0.0, 0.0), width=1., height=1.,
             facecolor='w', edgecolor='k',
             mutation_scale=self.prop.get_size_in_points(),
@@ -1424,7 +1355,7 @@ def __init__(self, offsetbox, xy,
         if bboxprops:
             self.patch.set(**bboxprops)
 
-        self.update(kwargs)
+        self._internal_update(kwargs)
 
     @property
     def xyann(self):
@@ -1451,9 +1382,6 @@ def contains(self, mouseevent):
         if not self._check_xy(None):
             return False, {}
         return self.offsetbox.contains(mouseevent)
-        #if self.arrow_patch is not None:
-        #    a, ainfo=self.arrow_patch.contains(event)
-        #    t = t or a
         # self.arrow_patch is currently not checked as this can be a line - JJ
 
     def get_children(self):
@@ -1475,50 +1403,30 @@ def set_fontsize(self, s=None):
         If *s* is not given, reset to :rc:`legend.fontsize`.
         """
         if s is None:
-            s = rcParams["legend.fontsize"]
+            s = mpl.rcParams["legend.fontsize"]
 
         self.prop = FontProperties(size=s)
         self.stale = True
 
-    @_api.delete_parameter("3.3", "s")
-    def get_fontsize(self, s=None):
+    def get_fontsize(self):
         """Return the fontsize in points."""
         return self.prop.get_size_in_points()
 
-    def get_window_extent(self, renderer):
-        """
-        get the bounding box in display space.
-        """
-        bboxes = [child.get_window_extent(renderer)
-                  for child in self.get_children()]
-
-        return Bbox.union(bboxes)
-
-    def get_tightbbox(self, renderer):
-        """
-        get tight bounding box in display space.
-        """
-        bboxes = [child.get_tightbbox(renderer)
-                  for child in self.get_children()]
+    def get_window_extent(self, renderer=None):
+        # docstring inherited
+        if renderer is None:
+            renderer = self.figure._get_renderer()
+        return Bbox.union([child.get_window_extent(renderer)
+                           for child in self.get_children()])
 
-        return Bbox.union(bboxes)
+    def get_tightbbox(self, renderer=None):
+        # docstring inherited
+        return Bbox.union([child.get_tightbbox(renderer)
+                           for child in self.get_children()])
 
     def update_positions(self, renderer):
         """
-        Update the pixel positions of the annotated point and the text.
-        """
-        xy_pixel = self._get_position_xy(renderer)
-        self._update_position_xybox(renderer, xy_pixel)
-
-        mutation_scale = renderer.points_to_pixels(self.get_fontsize())
-        self.patch.set_mutation_scale(mutation_scale)
-
-        if self.arrow_patch:
-            self.arrow_patch.set_mutation_scale(mutation_scale)
-
-    def _update_position_xybox(self, renderer, xy_pixel):
-        """
-        Update the pixel positions of the annotation text and the arrow patch.
+        Update pixel positions for the annotated point, the text and the arrow.
         """
 
         x, y = self.xybox
@@ -1531,46 +1439,34 @@ def _update_position_xybox(self, renderer, xy_pixel):
             ox0, oy0 = self._get_xy(renderer, x, y, self.boxcoords)
 
         w, h, xd, yd = self.offsetbox.get_extent(renderer)
+        fw, fh = self._box_alignment
+        self.offsetbox.set_offset((ox0 - fw * w + xd, oy0 - fh * h + yd))
 
-        _fw, _fh = self._box_alignment
-        self.offsetbox.set_offset((ox0 - _fw * w + xd, oy0 - _fh * h + yd))
-
-        # update patch position
         bbox = self.offsetbox.get_window_extent(renderer)
-        #self.offsetbox.set_offset((ox0-_fw*w, oy0-_fh*h))
-        self.patch.set_bounds(bbox.x0, bbox.y0,
-                              bbox.width, bbox.height)
+        self.patch.set_bounds(bbox.bounds)
 
-        x, y = xy_pixel
-
-        ox1, oy1 = x, y
+        mutation_scale = renderer.points_to_pixels(self.get_fontsize())
+        self.patch.set_mutation_scale(mutation_scale)
 
         if self.arrowprops:
-            d = self.arrowprops.copy()
-
             # Use FancyArrowPatch if self.arrowprops has "arrowstyle" key.
 
-            # adjust the starting point of the arrow relative to
-            # the textbox.
-            # TODO : Rotation needs to be accounted.
-            relpos = self._arrow_relpos
-
-            ox0 = bbox.x0 + bbox.width * relpos[0]
-            oy0 = bbox.y0 + bbox.height * relpos[1]
-
-            # The arrow will be drawn from (ox0, oy0) to (ox1,
-            # oy1). It will be first clipped by patchA and patchB.
-            # Then it will be shrunk by shrinkA and shrinkB
-            # (in points). If patch A is not set, self.bbox_patch
-            # is used.
-
-            self.arrow_patch.set_positions((ox0, oy0), (ox1, oy1))
-            fs = self.prop.get_size_in_points()
-            mutation_scale = d.pop("mutation_scale", fs)
-            mutation_scale = renderer.points_to_pixels(mutation_scale)
+            # Adjust the starting point of the arrow relative to the textbox.
+            # TODO: Rotation needs to be accounted.
+            arrow_begin = bbox.p0 + bbox.size * self._arrow_relpos
+            arrow_end = self._get_position_xy(renderer)
+            # The arrow (from arrow_begin to arrow_end) will be first clipped
+            # by patchA and patchB, then shrunk by shrinkA and shrinkB (in
+            # points).  If patch A is not set, self.bbox_patch is used.
+            self.arrow_patch.set_positions(arrow_begin, arrow_end)
+
+            if "mutation_scale" in self.arrowprops:
+                mutation_scale = renderer.points_to_pixels(
+                    self.arrowprops["mutation_scale"])
+                # Else, use fontsize-based mutation_scale defined above.
             self.arrow_patch.set_mutation_scale(mutation_scale)
 
-            patchA = d.pop("patchA", self.patch)
+            patchA = self.arrowprops.get("patchA", self.patch)
             self.arrow_patch.set_patchA(patchA)
 
     def draw(self, renderer):
@@ -1620,22 +1516,17 @@ def finalize_offset(self):
 
     def __init__(self, ref_artist, use_blit=False):
         self.ref_artist = ref_artist
+        if not ref_artist.pickable():
+            ref_artist.set_picker(True)
         self.got_artist = False
-
         self.canvas = self.ref_artist.figure.canvas
         self._use_blit = use_blit and self.canvas.supports_blit
-
-        c2 = self.canvas.mpl_connect('pick_event', self.on_pick)
-        c3 = self.canvas.mpl_connect('button_release_event', self.on_release)
-
-        if not ref_artist.pickable():
-            ref_artist.set_picker(True)
-        overridden_picker = _api.deprecate_method_override(
-            __class__.artist_picker, self, since="3.3",
-            addendum="Directly set the artist's picker if desired.")
-        if overridden_picker is not None:
-            ref_artist.set_picker(overridden_picker)
-        self.cids = [c2, c3]
+        self.cids = [
+            self.canvas.callbacks._connect_picklable(
+                'pick_event', self.on_pick),
+            self.canvas.callbacks._connect_picklable(
+                'button_release_event', self.on_release),
+        ]
 
     def on_motion(self, evt):
         if self._check_still_parented() and self.got_artist:
@@ -1644,21 +1535,12 @@ def on_motion(self, evt):
             self.update_offset(dx, dy)
             if self._use_blit:
                 self.canvas.restore_region(self.background)
-                self.ref_artist.draw(self.ref_artist.figure._cachedRenderer)
+                self.ref_artist.draw(
+                    self.ref_artist.figure._get_renderer())
                 self.canvas.blit()
             else:
                 self.canvas.draw()
 
-    @_api.deprecated("3.3", alternative="self.on_motion")
-    def on_motion_blit(self, evt):
-        if self._check_still_parented() and self.got_artist:
-            dx = evt.x - self.mouse_x
-            dy = evt.y - self.mouse_y
-            self.update_offset(dx, dy)
-            self.canvas.restore_region(self.background)
-            self.ref_artist.draw(self.ref_artist.figure._cachedRenderer)
-            self.canvas.blit()
-
     def on_pick(self, evt):
         if self._check_still_parented() and evt.artist == self.ref_artist:
             self.mouse_x = evt.mouseevent.x
@@ -1669,9 +1551,10 @@ def on_pick(self, evt):
                 self.canvas.draw()
                 self.background = \
                     self.canvas.copy_from_bbox(self.ref_artist.figure.bbox)
-                self.ref_artist.draw(self.ref_artist.figure._cachedRenderer)
+                self.ref_artist.draw(
+                    self.ref_artist.figure._get_renderer())
                 self.canvas.blit()
-            self._c1 = self.canvas.mpl_connect(
+            self._c1 = self.canvas.callbacks._connect_picklable(
                 "motion_notify_event", self.on_motion)
             self.save_offset()
 
@@ -1702,10 +1585,6 @@ def disconnect(self):
         else:
             self.canvas.mpl_disconnect(c1)
 
-    @_api.deprecated("3.3", alternative="self.ref_artist.contains")
-    def artist_picker(self, artist, evt):
-        return self.ref_artist.contains(evt)
-
     def save_offset(self):
         pass
 
@@ -1723,7 +1602,7 @@ def __init__(self, ref_artist, offsetbox, use_blit=False):
 
     def save_offset(self):
         offsetbox = self.offsetbox
-        renderer = offsetbox.figure._cachedRenderer
+        renderer = offsetbox.figure._get_renderer()
         w, h, xd, yd = offsetbox.get_extent(renderer)
         offset = offsetbox.get_offset(w, h, xd, yd, renderer)
         self.offsetbox_x, self.offsetbox_y = offset
@@ -1735,7 +1614,7 @@ def update_offset(self, dx, dy):
 
     def get_loc_in_canvas(self):
         offsetbox = self.offsetbox
-        renderer = offsetbox.figure._cachedRenderer
+        renderer = offsetbox.figure._get_renderer()
         w, h, xd, yd = offsetbox.get_extent(renderer)
         ox, oy = offsetbox._offset
         loc_in_canvas = (ox - xd, oy - yd)
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
index a5bb2019db56..f61524f65597 100644
--- a/lib/matplotlib/patches.py
+++ b/lib/matplotlib/patches.py
@@ -1,4 +1,7 @@
-import contextlib
+r"""
+Patches are `.Artist`\s with a face color and an edge color.
+"""
+
 import functools
 import inspect
 import math
@@ -9,7 +12,7 @@
 import numpy as np
 
 import matplotlib as mpl
-from . import (_api, artist, cbook, colors, docstring, hatch as mhatch,
+from . import (_api, artist, cbook, colors, _docstring, hatch as mhatch,
                lines as mlines, transforms)
 from .bezier import (
     NonIntersectingPathException, get_cos_sin, get_intersection,
@@ -19,7 +22,8 @@
 from ._enums import JoinStyle, CapStyle
 
 
-@cbook._define_aliases({
+@_docstring.interpd
+@_api.define_aliases({
     "antialiased": ["aa"],
     "edgecolor": ["ec"],
     "facecolor": ["fc"],
@@ -35,22 +39,11 @@ class Patch(artist.Artist):
     """
     zorder = 1
 
-    @_api.deprecated("3.4")
-    @_api.classproperty
-    def validCap(cls):
-        with _api.suppress_matplotlib_deprecation_warning():
-            return mlines.Line2D.validCap
-
-    @_api.deprecated("3.4")
-    @_api.classproperty
-    def validJoin(cls):
-        with _api.suppress_matplotlib_deprecation_warning():
-            return mlines.Line2D.validJoin
-
     # Whether to draw an edge by default.  Set on a
     # subclass-by-subclass basis.
     _edge_default = False
 
+    @_api.make_keyword_only("3.6", name="edgecolor")
     def __init__(self,
                  edgecolor=None,
                  facecolor=None,
@@ -66,20 +59,16 @@ def __init__(self,
         """
         The following kwarg properties are supported
 
-        %(Patch_kwdoc)s
+        %(Patch:kwdoc)s
         """
         super().__init__()
 
-        if linewidth is None:
-            linewidth = mpl.rcParams['patch.linewidth']
         if linestyle is None:
             linestyle = "solid"
         if capstyle is None:
             capstyle = CapStyle.butt
         if joinstyle is None:
             joinstyle = JoinStyle.miter
-        if antialiased is None:
-            antialiased = mpl.rcParams['patch.antialiased']
 
         self._hatch_color = colors.to_rgba(mpl.rcParams['hatch.color'])
         self._fill = True  # needed for set_facecolor call
@@ -92,9 +81,10 @@ def __init__(self,
         else:
             self.set_edgecolor(edgecolor)
             self.set_facecolor(facecolor)
-        # unscaled dashes.  Needed to scale dash patterns by lw
-        self._us_dashes = None
+
         self._linewidth = 0
+        self._unscaled_dash_pattern = (0, None)  # offset, dash
+        self._dash_pattern = (0, None)  # offset, dash (scaled by linewidth)
 
         self.set_fill(fill)
         self.set_linestyle(linestyle)
@@ -105,7 +95,7 @@ def __init__(self,
         self.set_joinstyle(joinstyle)
 
         if len(kwargs):
-            self.update(kwargs)
+            self._internal_update(kwargs)
 
     def get_verts(self):
         """
@@ -254,9 +244,8 @@ def update_from(self, other):
         self._fill = other._fill
         self._hatch = other._hatch
         self._hatch_color = other._hatch_color
-        # copy the unscaled dash pattern
-        self._us_dashes = other._us_dashes
-        self.set_linewidth(other._linewidth)  # also sets dash properties
+        self._unscaled_dash_pattern = other._unscaled_dash_pattern
+        self.set_linewidth(other._linewidth)  # also sets scaled dashes
         self.set_transform(other.get_data_transform())
         # If the transform of other needs further initialization, then it will
         # be the case for this artist too.
@@ -316,7 +305,7 @@ def set_antialiased(self, aa):
 
         Parameters
         ----------
-        b : bool or None
+        aa : bool or None
         """
         if aa is None:
             aa = mpl.rcParams['patch.antialiased']
@@ -344,7 +333,7 @@ def set_edgecolor(self, color):
 
         Parameters
         ----------
-        color : color or None or 'auto'
+        color : color or None
         """
         self._original_edgecolor = color
         self._set_edgecolor(color)
@@ -400,32 +389,24 @@ def set_linewidth(self, w):
         """
         if w is None:
             w = mpl.rcParams['patch.linewidth']
-            if w is None:
-                w = mpl.rcParams['axes.linewidth']
-
         self._linewidth = float(w)
-        # scale the dash pattern by the linewidth
-        offset, ls = self._us_dashes
-        self._dashoffset, self._dashes = mlines._scale_dashes(
-            offset, ls, self._linewidth)
+        self._dash_pattern = mlines._scale_dashes(
+            *self._unscaled_dash_pattern, w)
         self.stale = True
 
     def set_linestyle(self, ls):
         """
         Set the patch linestyle.
 
-        ===========================   =================
-        linestyle                     description
-        ===========================   =================
-        ``'-'`` or ``'solid'``        solid line
-        ``'--'`` or  ``'dashed'``     dashed line
-        ``'-.'`` or  ``'dashdot'``    dash-dotted line
-        ``':'`` or ``'dotted'``       dotted line
-        ``'None'``                    draw nothing
-        ``'none'``                    draw nothing
-        ``' '``                       draw nothing
-        ``''``                        draw nothing
-        ===========================   =================
+        ==========================================  =================
+        linestyle                                   description
+        ==========================================  =================
+        ``'-'`` or ``'solid'``                      solid line
+        ``'--'`` or  ``'dashed'``                   dashed line
+        ``'-.'`` or  ``'dashdot'``                  dash-dotted line
+        ``':'`` or ``'dotted'``                     dotted line
+        ``'none'``, ``'None'``, ``' '``, or ``''``  draw nothing
+        ==========================================  =================
 
         Alternatively a dash tuple of the following form can be provided::
 
@@ -443,11 +424,9 @@ def set_linestyle(self, ls):
         if ls in [' ', '', 'none']:
             ls = 'None'
         self._linestyle = ls
-        # get the unscaled dash pattern
-        offset, ls = self._us_dashes = mlines._get_dash_pattern(ls)
-        # scale the dash pattern by the linewidth
-        self._dashoffset, self._dashes = mlines._scale_dashes(
-            offset, ls, self._linewidth)
+        self._unscaled_dash_pattern = mlines._get_dash_pattern(ls)
+        self._dash_pattern = mlines._scale_dashes(
+            *self._unscaled_dash_pattern, self._linewidth)
         self.stale = True
 
     def set_fill(self, b):
@@ -472,11 +451,14 @@ def get_fill(self):
     # attribute.
     fill = property(get_fill, set_fill)
 
-    @docstring.interpd
+    @_docstring.interpd
     def set_capstyle(self, s):
         """
         Set the `.CapStyle`.
 
+        The default capstyle is 'round' for `.FancyArrowPatch` and 'butt' for
+        all other patches.
+
         Parameters
         ----------
         s : `.CapStyle` or %(CapStyle)s
@@ -487,13 +469,16 @@ def set_capstyle(self, s):
 
     def get_capstyle(self):
         """Return the capstyle."""
-        return self._capstyle
+        return self._capstyle.name
 
-    @docstring.interpd
+    @_docstring.interpd
     def set_joinstyle(self, s):
         """
         Set the `.JoinStyle`.
 
+        The default joinstyle is 'round' for `.FancyArrowPatch` and 'miter' for
+        all other patches.
+
         Parameters
         ----------
         s : `.JoinStyle` or %(JoinStyle)s
@@ -504,7 +489,7 @@ def set_joinstyle(self, s):
 
     def get_joinstyle(self):
         """Return the joinstyle."""
-        return self._joinstyle
+        return self._joinstyle.name
 
     def set_hatch(self, hatch):
         r"""
@@ -543,15 +528,15 @@ def get_hatch(self):
         """Return the hatching pattern."""
         return self._hatch
 
-    @contextlib.contextmanager
-    def _bind_draw_path_function(self, renderer):
+    def _draw_paths_with_artist_properties(
+            self, renderer, draw_path_args_list):
         """
         ``draw()`` helper factored out for sharing with `FancyArrowPatch`.
 
-        Yields a callable ``dp`` such that calling ``dp(*args, **kwargs)`` is
-        equivalent to calling ``renderer1.draw_path(gc, *args, **kwargs)``
-        where ``renderer1`` and ``gc`` have been suitably set from ``renderer``
-        and the artist's properties.
+        Configure *renderer* and the associated graphics context *gc*
+        from the artist properties, then repeatedly call
+        ``renderer.draw_path(gc, *draw_path_args)`` for each tuple
+        *draw_path_args* in *draw_path_args_list*.
         """
 
         renderer.open_group('patch', self.get_gid())
@@ -563,7 +548,7 @@ def _bind_draw_path_function(self, renderer):
         if self._edgecolor[3] == 0 or self._linestyle == 'None':
             lw = 0
         gc.set_linewidth(lw)
-        gc.set_dashes(self._dashoffset, self._dashes)
+        gc.set_dashes(*self._dash_pattern)
         gc.set_capstyle(self._capstyle)
         gc.set_joinstyle(self._joinstyle)
 
@@ -585,11 +570,8 @@ def _bind_draw_path_function(self, renderer):
             from matplotlib.patheffects import PathEffectRenderer
             renderer = PathEffectRenderer(self.get_path_effects(), renderer)
 
-        # In `with _bind_draw_path_function(renderer) as draw_path: ...`
-        # (in the implementations of `draw()` below), calls to `draw_path(...)`
-        # will occur as if they took place here with `gc` inserted as
-        # additional first argument.
-        yield functools.partial(renderer.draw_path, gc)
+        for draw_path_args in draw_path_args_list:
+            renderer.draw_path(gc, *draw_path_args)
 
         gc.restore()
         renderer.close_group('patch')
@@ -600,18 +582,17 @@ def draw(self, renderer):
         # docstring inherited
         if not self.get_visible():
             return
-        # Patch has traditionally ignored the dashoffset.
-        with cbook._setattr_cm(self, _dashoffset=0), \
-                self._bind_draw_path_function(renderer) as draw_path:
-            path = self.get_path()
-            transform = self.get_transform()
-            tpath = transform.transform_path_non_affine(path)
-            affine = transform.get_affine()
-            draw_path(tpath, affine,
-                      # Work around a bug in the PDF and SVG renderers, which
-                      # do not draw the hatches if the facecolor is fully
-                      # transparent, but do if it is None.
-                      self._facecolor if self._facecolor[3] else None)
+        path = self.get_path()
+        transform = self.get_transform()
+        tpath = transform.transform_path_non_affine(path)
+        affine = transform.get_affine()
+        self._draw_paths_with_artist_properties(
+            renderer,
+            [(tpath, affine,
+              # Work around a bug in the PDF and SVG renderers, which
+              # do not draw the hatches if the facecolor is fully
+              # transparent, but do if it is None.
+              self._facecolor if self._facecolor[3] else None)])
 
     def get_path(self):
         """Return the path of this patch."""
@@ -627,23 +608,12 @@ def _convert_xy_units(self, xy):
         return x, y
 
 
-_patch_kwdoc = artist.kwdoc(Patch)
-for k in ['Rectangle', 'Circle', 'RegularPolygon', 'Polygon', 'Wedge', 'Arrow',
-          'FancyArrow', 'CirclePolygon', 'Ellipse', 'Arc', 'FancyBboxPatch',
-          'Patch']:
-    docstring.interpd.update({f'{k}_kwdoc': _patch_kwdoc})
-
-# define Patch.__init__ docstring after the class has been added to interpd
-docstring.dedent_interpd(Patch.__init__)
-
-
 class Shadow(Patch):
     def __str__(self):
         return "Shadow(%s)" % (str(self.patch))
 
-    @_api.delete_parameter("3.3", "props")
-    @docstring.dedent_interpd
-    def __init__(self, patch, ox, oy, props=None, **kwargs):
+    @_docstring.dedent_interpd
+    def __init__(self, patch, ox, oy, **kwargs):
         """
         Create a shadow of the given *patch*.
 
@@ -657,38 +627,22 @@ def __init__(self, patch, ox, oy, props=None, **kwargs):
         ox, oy : float
             The shift of the shadow in data coordinates, scaled by a factor
             of dpi/72.
-        props : dict
-            *deprecated (use kwargs instead)* Properties of the shadow patch.
         **kwargs
             Properties of the shadow patch. Supported keys are:
 
-            %(Patch_kwdoc)s
+            %(Patch:kwdoc)s
         """
         super().__init__()
         self.patch = patch
-        # Note: when removing props, we can directly pass kwargs to _update()
-        # and remove self._props
-        if props is None:
-            color = .3 * np.asarray(colors.to_rgb(self.patch.get_facecolor()))
-            props = {
-                'facecolor': color,
-                'edgecolor': color,
-                'alpha': 0.5,
-            }
-        self._props = {**props, **kwargs}
         self._ox, self._oy = ox, oy
         self._shadow_transform = transforms.Affine2D()
-        self._update()
-
-    props = _api.deprecate_privatize_attribute("3.3")
 
-    def _update(self):
         self.update_from(self.patch)
-
-        # Place the shadow patch directly behind the inherited patch.
-        self.set_zorder(np.nextafter(self.patch.zorder, -np.inf))
-
-        self.update(self._props)
+        color = .3 * np.asarray(colors.to_rgb(self.patch.get_facecolor()))
+        self.update({'facecolor': color, 'edgecolor': color, 'alpha': 0.5,
+                     # Place shadow patch directly behind the inherited patch.
+                     'zorder': np.nextafter(self.patch.zorder, -np.inf),
+                     **kwargs})
 
     def _update_transform(self, renderer):
         ox = renderer.points_to_pixels(self._ox)
@@ -720,7 +674,7 @@ class Rectangle(Patch):
       :               (xy)---- width -----+
 
     One may picture *xy* as the bottom left corner, but which corner *xy* is
-    actually depends on the the direction of the axis and the sign of *width*
+    actually depends on the direction of the axis and the sign of *width*
     and *height*; e.g. *xy* would be the bottom right corner if the x-axis
     was inverted or if *width* was negative.
     """
@@ -730,8 +684,10 @@ def __str__(self):
         fmt = "Rectangle(xy=(%g, %g), width=%g, height=%g, angle=%g)"
         return fmt % pars
 
-    @docstring.dedent_interpd
-    def __init__(self, xy, width, height, angle=0.0, **kwargs):
+    @_docstring.dedent_interpd
+    @_api.make_keyword_only("3.6", name="angle")
+    def __init__(self, xy, width, height, angle=0.0, *,
+                 rotation_point='xy', **kwargs):
         """
         Parameters
         ----------
@@ -742,12 +698,16 @@ def __init__(self, xy, width, height, angle=0.0, **kwargs):
         height : float
             Rectangle height.
         angle : float, default: 0
-            Rotation in degrees anti-clockwise about *xy*.
+            Rotation in degrees anti-clockwise about the rotation point.
+        rotation_point : {'xy', 'center', (number, number)}, default: 'xy'
+            If ``'xy'``, rotate around the anchor point. If ``'center'`` rotate
+            around the center. If 2-tuple of number, rotate around this
+            coordinate.
 
         Other Parameters
         ----------------
         **kwargs : `.Patch` properties
-            %(Patch_kwdoc)s
+            %(Patch:kwdoc)s
         """
         super().__init__(**kwargs)
         self._x0 = xy[0]
@@ -755,6 +715,14 @@ def __init__(self, xy, width, height, angle=0.0, **kwargs):
         self._width = width
         self._height = height
         self.angle = float(angle)
+        self.rotation_point = rotation_point
+        # Required for RectangleSelector with axes aspect ratio != 1
+        # The patch is defined in data coordinates and when changing the
+        # selector with square modifier and not in data coordinates, we need
+        # to correct for the aspect ratio difference between the data and
+        # display coordinate systems. Its value is typically provide by
+        # Axes._get_aspect_ratio()
+        self._aspect_ratio_correction = 1.0
         self._convert_units()  # Validate the inputs.
 
     def get_path(self):
@@ -775,9 +743,36 @@ def get_patch_transform(self):
         # important to call the accessor method and not directly access the
         # transformation member variable.
         bbox = self.get_bbox()
-        return (transforms.BboxTransformTo(bbox)
-                + transforms.Affine2D().rotate_deg_around(
-                    bbox.x0, bbox.y0, self.angle))
+        if self.rotation_point == 'center':
+            width, height = bbox.x1 - bbox.x0, bbox.y1 - bbox.y0
+            rotation_point = bbox.x0 + width / 2., bbox.y0 + height / 2.
+        elif self.rotation_point == 'xy':
+            rotation_point = bbox.x0, bbox.y0
+        else:
+            rotation_point = self.rotation_point
+        return transforms.BboxTransformTo(bbox) \
+                + transforms.Affine2D() \
+                .translate(-rotation_point[0], -rotation_point[1]) \
+                .scale(1, self._aspect_ratio_correction) \
+                .rotate_deg(self.angle) \
+                .scale(1, 1 / self._aspect_ratio_correction) \
+                .translate(*rotation_point)
+
+    @property
+    def rotation_point(self):
+        """The rotation point of the patch."""
+        return self._rotation_point
+
+    @rotation_point.setter
+    def rotation_point(self, value):
+        if value in ['center', 'xy'] or (
+                isinstance(value, tuple) and len(value) == 2 and
+                isinstance(value[0], Number) and isinstance(value[1], Number)
+                ):
+            self._rotation_point = value
+        else:
+            raise ValueError("`rotation_point` must be one of "
+                             "{'xy', 'center', (number, number)}.")
 
     def get_x(self):
         """Return the left coordinate of the rectangle."""
@@ -791,6 +786,18 @@ def get_xy(self):
         """Return the left and bottom coords of the rectangle as a tuple."""
         return self._x0, self._y0
 
+    def get_corners(self):
+        """
+        Return the corners of the rectangle, moving anti-clockwise from
+        (x0, y0).
+        """
+        return self.get_patch_transform().transform(
+            [(0, 0), (1, 0), (1, 1), (0, 1)])
+
+    def get_center(self):
+        """Return the centre of the rectangle."""
+        return self.get_patch_transform().transform((0.5, 0.5))
+
     def get_width(self):
         """Return the width of the rectangle."""
         return self._width
@@ -799,6 +806,10 @@ def get_height(self):
         """Return the height of the rectangle."""
         return self._height
 
+    def get_angle(self):
+        """Get the rotation angle in degrees."""
+        return self.angle
+
     def set_x(self, x):
         """Set the left coordinate of the rectangle."""
         self._x0 = x
@@ -809,6 +820,15 @@ def set_y(self, y):
         self._y0 = y
         self.stale = True
 
+    def set_angle(self, angle):
+        """
+        Set the rotation angle in degrees.
+
+        The rotation is performed anti-clockwise around *xy*.
+        """
+        self.angle = angle
+        self.stale = True
+
     def set_xy(self, xy):
         """
         Set the left and bottom coordinates of the rectangle.
@@ -867,7 +887,8 @@ def __str__(self):
         return s % (self.xy[0], self.xy[1], self.numvertices, self.radius,
                     self.orientation)
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
+    @_api.make_keyword_only("3.6", name="radius")
     def __init__(self, xy, numVertices, radius=5, orientation=0,
                  **kwargs):
         """
@@ -888,7 +909,7 @@ def __init__(self, xy, numVertices, radius=5, orientation=0,
         **kwargs
             `Patch` properties:
 
-            %(Patch_kwdoc)s
+            %(Patch:kwdoc)s
         """
         self.xy = xy
         self.numvertices = numVertices
@@ -917,14 +938,14 @@ def __str__(self):
         s = "PathPatch%d((%g, %g) ...)"
         return s % (len(self._path.vertices), *tuple(self._path.vertices[0]))
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def __init__(self, path, **kwargs):
         """
         *path* is a `~.path.Path` object.
 
         Valid keyword arguments are:
 
-        %(Patch_kwdoc)s
+        %(Patch:kwdoc)s
         """
         super().__init__(**kwargs)
         self._path = path
@@ -946,7 +967,7 @@ class StepPatch(PathPatch):
 
     _edge_default = False
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def __init__(self, values, edges, *,
                  orientation='vertical', baseline=0, **kwargs):
         """
@@ -971,7 +992,7 @@ def __init__(self, values, edges, *,
 
         Other valid keyword arguments are:
 
-        %(Patch_kwdoc)s
+        %(Patch:kwdoc)s
         """
         self.orientation = orientation
         self._edges = np.asarray(edges)
@@ -1048,10 +1069,14 @@ class Polygon(Patch):
     """A general polygon patch."""
 
     def __str__(self):
-        s = "Polygon%d((%g, %g) ...)"
-        return s % (len(self._path.vertices), *tuple(self._path.vertices[0]))
+        if len(self._path.vertices):
+            s = "Polygon%d((%g, %g) ...)"
+            return s % (len(self._path.vertices), *self._path.vertices[0])
+        else:
+            return "Polygon0()"
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
+    @_api.make_keyword_only("3.6", name="closed")
     def __init__(self, xy, closed=True, **kwargs):
         """
         *xy* is a numpy array with shape Nx2.
@@ -1061,7 +1086,7 @@ def __init__(self, xy, closed=True, **kwargs):
 
         Valid keyword arguments are:
 
-        %(Patch_kwdoc)s
+        %(Patch:kwdoc)s
         """
         super().__init__(**kwargs)
         self._closed = closed
@@ -1147,7 +1172,8 @@ def __str__(self):
         fmt = "Wedge(center=(%g, %g), r=%g, theta1=%g, theta2=%g, width=%s)"
         return fmt % pars
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
+    @_api.make_keyword_only("3.6", name="width")
     def __init__(self, center, r, theta1, theta2, width=None, **kwargs):
         """
         A wedge centered at *x*, *y* center with radius *r* that
@@ -1157,7 +1183,7 @@ def __init__(self, center, r, theta1, theta2, width=None, **kwargs):
 
         Valid keyword arguments are:
 
-        %(Patch_kwdoc)s
+        %(Patch:kwdoc)s
         """
         super().__init__(**kwargs)
         self.center = center
@@ -1237,13 +1263,12 @@ class Arrow(Patch):
     def __str__(self):
         return "Arrow()"
 
-    _path = Path([[0.0, 0.1], [0.0, -0.1],
-                  [0.8, -0.1], [0.8, -0.3],
-                  [1.0, 0.0], [0.8, 0.3],
-                  [0.8, 0.1], [0.0, 0.1]],
-                 closed=True)
+    _path = Path._create_closed([
+        [0.0, 0.1], [0.0, -0.1], [0.8, -0.1], [0.8, -0.3], [1.0, 0.0],
+        [0.8, 0.3], [0.8, 0.1]])
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
+    @_api.make_keyword_only("3.6", name="width")
     def __init__(self, x, y, dx, dy, width=1.0, **kwargs):
         """
         Draws an arrow from (*x*, *y*) to (*x* + *dx*, *y* + *dy*).
@@ -1265,7 +1290,7 @@ def __init__(self, x, y, dx, dy, width=1.0, **kwargs):
         **kwargs
             Keyword arguments control the `Patch` properties:
 
-            %(Patch_kwdoc)s
+            %(Patch:kwdoc)s
 
         See Also
         --------
@@ -1298,13 +1323,20 @@ class FancyArrow(Polygon):
     def __str__(self):
         return "FancyArrow()"
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
+    @_api.make_keyword_only("3.6", name="width")
     def __init__(self, x, y, dx, dy, width=0.001, length_includes_head=False,
                  head_width=None, head_length=None, shape='full', overhang=0,
                  head_starts_at_zero=False, **kwargs):
         """
         Parameters
         ----------
+        x, y : float
+            The x and y coordinates of the arrow base.
+
+        dx, dy : float
+            The length of the arrow along x and y direction.
+
         width : float, default: 0.001
             Width of full arrow tail.
 
@@ -1331,24 +1363,84 @@ def __init__(self, x, y, dx, dy, width=0.001, length_includes_head=False,
         **kwargs
             `.Patch` properties:
 
-            %(Patch_kwdoc)s
+            %(Patch:kwdoc)s
+        """
+        self._x = x
+        self._y = y
+        self._dx = dx
+        self._dy = dy
+        self._width = width
+        self._length_includes_head = length_includes_head
+        self._head_width = head_width
+        self._head_length = head_length
+        self._shape = shape
+        self._overhang = overhang
+        self._head_starts_at_zero = head_starts_at_zero
+        self._make_verts()
+        super().__init__(self.verts, closed=True, **kwargs)
+
+    def set_data(self, *, x=None, y=None, dx=None, dy=None, width=None,
+                 head_width=None, head_length=None):
+        """
+        Set `.FancyArrow` x, y, dx, dy, width, head_with, and head_length.
+        Values left as None will not be updated.
+
+        Parameters
+        ----------
+        x, y : float or None, default: None
+            The x and y coordinates of the arrow base.
+
+        dx, dy : float or None, default: None
+            The length of the arrow along x and y direction.
+
+        width : float or None, default: None
+            Width of full arrow tail.
+
+        head_width : float or None, default: None
+            Total width of the full arrow head.
+
+        head_length : float or None, default: None
+            Length of arrow head.
         """
-        if head_width is None:
-            head_width = 3 * width
-        if head_length is None:
+        if x is not None:
+            self._x = x
+        if y is not None:
+            self._y = y
+        if dx is not None:
+            self._dx = dx
+        if dy is not None:
+            self._dy = dy
+        if width is not None:
+            self._width = width
+        if head_width is not None:
+            self._head_width = head_width
+        if head_length is not None:
+            self._head_length = head_length
+        self._make_verts()
+        self.set_xy(self.verts)
+
+    def _make_verts(self):
+        if self._head_width is None:
+            head_width = 3 * self._width
+        else:
+            head_width = self._head_width
+        if self._head_length is None:
             head_length = 1.5 * head_width
+        else:
+            head_length = self._head_length
 
-        distance = np.hypot(dx, dy)
+        distance = np.hypot(self._dx, self._dy)
 
-        if length_includes_head:
+        if self._length_includes_head:
             length = distance
         else:
             length = distance + head_length
         if not length:
-            verts = np.empty([0, 2])  # display nothing if empty
+            self.verts = np.empty([0, 2])  # display nothing if empty
         else:
             # start by drawing horizontal arrow, point at (0, 0)
-            hw, hl, hs, lw = head_width, head_length, overhang, width
+            hw, hl = head_width, head_length
+            hs, lw = self._overhang, self._width
             left_half_arrow = np.array([
                 [0.0, 0.0],                 # tip
                 [-hl, -hw / 2],             # leftmost
@@ -1357,40 +1449,42 @@ def __init__(self, x, y, dx, dy, width=0.001, length_includes_head=False,
                 [-length, 0],
             ])
             # if we're not including the head, shift up by head length
-            if not length_includes_head:
+            if not self._length_includes_head:
                 left_half_arrow += [head_length, 0]
             # if the head starts at 0, shift up by another head length
-            if head_starts_at_zero:
+            if self._head_starts_at_zero:
                 left_half_arrow += [head_length / 2, 0]
             # figure out the shape, and complete accordingly
-            if shape == 'left':
+            if self._shape == 'left':
                 coords = left_half_arrow
             else:
                 right_half_arrow = left_half_arrow * [1, -1]
-                if shape == 'right':
+                if self._shape == 'right':
                     coords = right_half_arrow
-                elif shape == 'full':
+                elif self._shape == 'full':
                     # The half-arrows contain the midpoint of the stem,
                     # which we can omit from the full arrow. Including it
                     # twice caused a problem with xpdf.
                     coords = np.concatenate([left_half_arrow[:-1],
                                              right_half_arrow[-2::-1]])
                 else:
-                    raise ValueError("Got unknown shape: %s" % shape)
+                    raise ValueError(f"Got unknown shape: {self._shape!r}")
             if distance != 0:
-                cx = dx / distance
-                sx = dy / distance
+                cx = self._dx / distance
+                sx = self._dy / distance
             else:
                 # Account for division by zero
                 cx, sx = 0, 1
             M = [[cx, sx], [-sx, cx]]
-            verts = np.dot(coords, M) + (x + dx, y + dy)
-
-        super().__init__(verts, closed=True, **kwargs)
+            self.verts = np.dot(coords, M) + [
+                self._x + self._dx,
+                self._y + self._dy,
+            ]
 
 
-docstring.interpd.update(
-    FancyArrow="\n".join(inspect.getdoc(FancyArrow.__init__).splitlines()[2:]))
+_docstring.interpd.update(
+    FancyArrow="\n".join(
+        (inspect.getdoc(FancyArrow.__init__) or "").splitlines()[2:]))
 
 
 class CirclePolygon(RegularPolygon):
@@ -1400,7 +1494,8 @@ def __str__(self):
         s = "CirclePolygon((%g, %g), radius=%g, resolution=%d)"
         return s % (self.xy[0], self.xy[1], self.radius, self.numvertices)
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
+    @_api.make_keyword_only("3.6", name="resolution")
     def __init__(self, xy, radius=5,
                  resolution=20,  # the number of vertices
                  ** kwargs):
@@ -1412,9 +1507,10 @@ def __init__(self, xy, radius=5,
 
         Valid keyword arguments are:
 
-        %(Patch_kwdoc)s
+        %(Patch:kwdoc)s
         """
-        super().__init__(xy, resolution, radius, orientation=0, **kwargs)
+        super().__init__(
+            xy, resolution, radius=radius, orientation=0, **kwargs)
 
 
 class Ellipse(Patch):
@@ -1426,7 +1522,8 @@ def __str__(self):
         fmt = "Ellipse(xy=(%s, %s), width=%s, height=%s, angle=%s)"
         return fmt % pars
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
+    @_api.make_keyword_only("3.6", name="angle")
     def __init__(self, xy, width, height, angle=0, **kwargs):
         """
         Parameters
@@ -1444,7 +1541,7 @@ def __init__(self, xy, width, height, angle=0, **kwargs):
         -----
         Valid keyword arguments are:
 
-        %(Patch_kwdoc)s
+        %(Patch:kwdoc)s
         """
         super().__init__(**kwargs)
 
@@ -1452,6 +1549,12 @@ def __init__(self, xy, width, height, angle=0, **kwargs):
         self._width, self._height = width, height
         self._angle = angle
         self._path = Path.unit_circle()
+        # Required for EllipseSelector with axes aspect ratio != 1
+        # The patch is defined in data coordinates and when changing the
+        # selector with square modifier and not in data coordinates, we need
+        # to correct for the aspect ratio difference between the data and
+        # display coordinate systems.
+        self._aspect_ratio_correction = 1.0
         # Note: This cannot be calculated until this is added to an Axes
         self._patch_transform = transforms.IdentityTransform()
 
@@ -1469,8 +1572,9 @@ def _recompute_transform(self):
         width = self.convert_xunits(self._width)
         height = self.convert_yunits(self._height)
         self._patch_transform = transforms.Affine2D() \
-            .scale(width * 0.5, height * 0.5) \
+            .scale(width * 0.5, height * 0.5 * self._aspect_ratio_correction) \
             .rotate_deg(self.angle) \
+            .scale(1, 1 / self._aspect_ratio_correction) \
             .translate(*center)
 
     def get_path(self):
@@ -1551,16 +1655,214 @@ def get_angle(self):
 
     angle = property(get_angle, set_angle)
 
+    def get_corners(self):
+        """
+        Return the corners of the ellipse bounding box.
+
+        The bounding box orientation is moving anti-clockwise from the
+        lower left corner defined before rotation.
+        """
+        return self.get_patch_transform().transform(
+            [(-1, -1), (1, -1), (1, 1), (-1, 1)])
+
 
-class Circle(Ellipse):
-    """A circle patch."""
+class Annulus(Patch):
+    """
+    An elliptical annulus.
+    """
+
+    @_docstring.dedent_interpd
+    def __init__(self, xy, r, width, angle=0.0, **kwargs):
+        """
+        Parameters
+        ----------
+        xy : (float, float)
+            xy coordinates of annulus centre.
+        r : float or (float, float)
+            The radius, or semi-axes:
+
+            - If float: radius of the outer circle.
+            - If two floats: semi-major and -minor axes of outer ellipse.
+        width : float
+            Width (thickness) of the annular ring. The width is measured inward
+            from the outer ellipse so that for the inner ellipse the semi-axes
+            are given by ``r - width``. *width* must be less than or equal to
+            the semi-minor axis.
+        angle : float, default: 0
+            Rotation angle in degrees (anti-clockwise from the positive
+            x-axis). Ignored for circular annuli (i.e., if *r* is a scalar).
+        **kwargs
+            Keyword arguments control the `Patch` properties:
+
+            %(Patch:kwdoc)s
+        """
+        super().__init__(**kwargs)
+
+        self.set_radii(r)
+        self.center = xy
+        self.width = width
+        self.angle = angle
+        self._path = None
+
+    def __str__(self):
+        if self.a == self.b:
+            r = self.a
+        else:
+            r = (self.a, self.b)
+
+        return "Annulus(xy=(%s, %s), r=%s, width=%s, angle=%s)" % \
+                (*self.center, r, self.width, self.angle)
+
+    def set_center(self, xy):
+        """
+        Set the center of the annulus.
+
+        Parameters
+        ----------
+        xy : (float, float)
+        """
+        self._center = xy
+        self._path = None
+        self.stale = True
+
+    def get_center(self):
+        """Return the center of the annulus."""
+        return self._center
+
+    center = property(get_center, set_center)
+
+    def set_width(self, width):
+        """
+        Set the width (thickness) of the annulus ring.
+
+        The width is measured inwards from the outer ellipse.
+
+        Parameters
+        ----------
+        width : float
+        """
+        if min(self.a, self.b) <= width:
+            raise ValueError(
+                'Width of annulus must be less than or equal semi-minor axis')
+
+        self._width = width
+        self._path = None
+        self.stale = True
+
+    def get_width(self):
+        """Return the width (thickness) of the annulus ring."""
+        return self._width
+
+    width = property(get_width, set_width)
+
+    def set_angle(self, angle):
+        """
+        Set the tilt angle of the annulus.
+
+        Parameters
+        ----------
+        angle : float
+        """
+        self._angle = angle
+        self._path = None
+        self.stale = True
+
+    def get_angle(self):
+        """Return the angle of the annulus."""
+        return self._angle
+
+    angle = property(get_angle, set_angle)
+
+    def set_semimajor(self, a):
+        """
+        Set the semi-major axis *a* of the annulus.
+
+        Parameters
+        ----------
+        a : float
+        """
+        self.a = float(a)
+        self._path = None
+        self.stale = True
+
+    def set_semiminor(self, b):
+        """
+        Set the semi-minor axis *b* of the annulus.
+
+        Parameters
+        ----------
+        b : float
+        """
+        self.b = float(b)
+        self._path = None
+        self.stale = True
+
+    def set_radii(self, r):
+        """
+        Set the semi-major (*a*) and semi-minor radii (*b*) of the annulus.
+
+        Parameters
+        ----------
+        r : float or (float, float)
+            The radius, or semi-axes:
+
+            - If float: radius of the outer circle.
+            - If two floats: semi-major and -minor axes of outer ellipse.
+        """
+        if np.shape(r) == (2,):
+            self.a, self.b = r
+        elif np.shape(r) == ():
+            self.a = self.b = float(r)
+        else:
+            raise ValueError("Parameter 'r' must be one or two floats.")
+
+        self._path = None
+        self.stale = True
+
+    def get_radii(self):
+        """Return the semi-major and semi-minor radii of the annulus."""
+        return self.a, self.b
 
+    radii = property(get_radii, set_radii)
+
+    def _transform_verts(self, verts, a, b):
+        return transforms.Affine2D() \
+            .scale(*self._convert_xy_units((a, b))) \
+            .rotate_deg(self.angle) \
+            .translate(*self._convert_xy_units(self.center)) \
+            .transform(verts)
+
+    def _recompute_path(self):
+        # circular arc
+        arc = Path.arc(0, 360)
+
+        # annulus needs to draw an outer ring
+        # followed by a reversed and scaled inner ring
+        a, b, w = self.a, self.b, self.width
+        v1 = self._transform_verts(arc.vertices, a, b)
+        v2 = self._transform_verts(arc.vertices[::-1], a - w, b - w)
+        v = np.vstack([v1, v2, v1[0, :], (0, 0)])
+        c = np.hstack([arc.codes, Path.MOVETO,
+                       arc.codes[1:], Path.MOVETO,
+                       Path.CLOSEPOLY])
+        self._path = Path(v, c)
+
+    def get_path(self):
+        if self._path is None:
+            self._recompute_path()
+        return self._path
+
+
+class Circle(Ellipse):
+    """
+    A circle patch.
+    """
     def __str__(self):
         pars = self.center[0], self.center[1], self.radius
         fmt = "Circle(xy=(%g, %g), radius=%g)"
         return fmt % pars
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def __init__(self, xy, radius=5, **kwargs):
         """
         Create a true circle at center *xy* = (*x*, *y*) with given *radius*.
@@ -1570,7 +1872,7 @@ def __init__(self, xy, radius=5, **kwargs):
 
         Valid keyword arguments are:
 
-        %(Patch_kwdoc)s
+        %(Patch:kwdoc)s
         """
         super().__init__(xy, radius * 2, radius * 2, **kwargs)
         self.radius = radius
@@ -1597,14 +1899,9 @@ class Arc(Ellipse):
     """
     An elliptical arc, i.e. a segment of an ellipse.
 
-    Due to internal optimizations, there are certain restrictions on using Arc:
-
-    - The arc cannot be filled.
-
-    - The arc must be used in an `~.axes.Axes` instance. It can not be added
-      directly to a `.Figure` because it is optimized to only render the
-      segments that are inside the axes bounding box with high resolution.
+    Due to internal optimizations, the arc cannot be filled.
     """
+
     def __str__(self):
         pars = (self.center[0], self.center[1], self.width,
                 self.height, self.angle, self.theta1, self.theta2)
@@ -1612,7 +1909,8 @@ def __str__(self):
                "height=%g, angle=%g, theta1=%g, theta2=%g)")
         return fmt % pars
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
+    @_api.make_keyword_only("3.6", name="angle")
     def __init__(self, xy, width, height, angle=0.0,
                  theta1=0.0, theta2=360.0, **kwargs):
         """
@@ -1647,16 +1945,19 @@ def __init__(self, xy, width, height, angle=0.0,
             with the exception of *fill* and *facecolor* because filling is
             not supported.
 
-        %(Patch_kwdoc)s
+        %(Patch:kwdoc)s
         """
         fill = kwargs.setdefault('fill', False)
         if fill:
             raise ValueError("Arc objects can not be filled")
 
-        super().__init__(xy, width, height, angle, **kwargs)
+        super().__init__(xy, width, height, angle=angle, **kwargs)
 
         self.theta1 = theta1
         self.theta2 = theta2
+        (self._theta1, self._theta2, self._stretched_width,
+         self._stretched_height) = self._theta_stretch()
+        self._path = Path.arc(self._theta1, self._theta2)
 
     @artist.allow_rasterization
     def draw(self, renderer):
@@ -1686,12 +1987,11 @@ def draw(self, renderer):
         with each visible arc using a fixed number of spline segments
         (8).  The algorithm proceeds as follows:
 
-        1. The points where the ellipse intersects the axes bounding
-           box are located.  (This is done be performing an inverse
-           transformation on the axes bbox such that it is relative
-           to the unit circle -- this makes the intersection
-           calculation much easier than doing rotated ellipse
-           intersection directly).
+        1. The points where the ellipse intersects the axes (or figure)
+           bounding box are located.  (This is done by performing an inverse
+           transformation on the bbox such that it is relative to the unit
+           circle -- this makes the intersection calculation much easier than
+           doing rotated ellipse intersection directly.)
 
            This uses the "line intersecting a circle" algorithm from:
 
@@ -1705,43 +2005,12 @@ def draw(self, renderer):
            pairs of vertices are drawn using the Bezier arc
            approximation technique implemented in `.Path.arc`.
         """
-        if not hasattr(self, 'axes'):
-            raise RuntimeError('Arcs can only be used in Axes instances')
         if not self.get_visible():
             return
 
         self._recompute_transform()
 
-        width = self.convert_xunits(self.width)
-        height = self.convert_yunits(self.height)
-
-        # If the width and height of ellipse are not equal, take into account
-        # stretching when calculating angles to draw between
-        def theta_stretch(theta, scale):
-            theta = np.deg2rad(theta)
-            x = np.cos(theta)
-            y = np.sin(theta)
-            stheta = np.rad2deg(np.arctan2(scale * y, x))
-            # arctan2 has the range [-pi, pi], we expect [0, 2*pi]
-            return (stheta + 360) % 360
-
-        theta1 = self.theta1
-        theta2 = self.theta2
-
-        if (
-            # if we need to stretch the angles because we are distorted
-            width != height
-            # and we are not doing a full circle.
-            #
-            # 0 and 360 do not exactly round-trip through the angle
-            # stretching (due to both float precision limitations and
-            # the difference between the range of arctan2 [-pi, pi] and
-            # this method [0, 360]) so avoid doing it if we don't have to.
-            and not (theta1 != theta2 and theta1 % 360 == theta2 % 360)
-        ):
-            theta1 = theta_stretch(self.theta1, width / height)
-            theta2 = theta_stretch(self.theta2, width / height)
-
+        self._update_path()
         # Get width and height in pixels we need to use
         # `self.get_data_transform` rather than `self.get_transform`
         # because we want the transform from dataspace to the
@@ -1750,12 +2019,13 @@ def theta_stretch(theta, scale):
         # `self.get_transform()` goes from an idealized unit-radius
         # space to screen space).
         data_to_screen_trans = self.get_data_transform()
-        pwidth, pheight = (data_to_screen_trans.transform((width, height)) -
-                           data_to_screen_trans.transform((0, 0)))
+        pwidth, pheight = (
+            data_to_screen_trans.transform((self._stretched_width,
+                                            self._stretched_height)) -
+            data_to_screen_trans.transform((0, 0)))
         inv_error = (1.0 / 1.89818e-6) * 0.5
 
         if pwidth < inv_error and pheight < inv_error:
-            self._path = Path.arc(theta1, theta2)
             return Patch.draw(self, renderer)
 
         def line_circle_intersect(x0, y0, x1, y1):
@@ -1793,10 +2063,12 @@ def segment_circle_intersect(x0, y0, x1, y1):
                 & (y0e - epsilon < ys) & (ys < y1e + epsilon)
             ]
 
-        # Transforms the axes box_path so that it is relative to the unit
-        # circle in the same way that it is relative to the desired ellipse.
-        box_path_transform = (transforms.BboxTransformTo(self.axes.bbox)
-                              + self.get_transform().inverted())
+        # Transform the axes (or figure) box_path so that it is relative to
+        # the unit circle in the same way that it is relative to the desired
+        # ellipse.
+        box_path_transform = (
+            transforms.BboxTransformTo((self.axes or self.figure).bbox)
+            - self.get_transform())
         box_path = Path.unit_rectangle().transformed(box_path_transform)
 
         thetas = set()
@@ -1807,10 +2079,11 @@ def segment_circle_intersect(x0, y0, x1, y1):
             # arctan2 return [-pi, pi), the rest of our angles are in
             # [0, 360], adjust as needed.
             theta = (np.rad2deg(np.arctan2(y, x)) + 360) % 360
-            thetas.update(theta[(theta1 < theta) & (theta < theta2)])
-        thetas = sorted(thetas) + [theta2]
-        last_theta = theta1
-        theta1_rad = np.deg2rad(theta1)
+            thetas.update(
+                theta[(self._theta1 < theta) & (theta < self._theta2)])
+        thetas = sorted(thetas) + [self._theta2]
+        last_theta = self._theta1
+        theta1_rad = np.deg2rad(self._theta1)
         inside = box_path.contains_point(
             (np.cos(theta1_rad), np.sin(theta1_rad))
         )
@@ -1829,6 +2102,46 @@ def segment_circle_intersect(x0, y0, x1, y1):
         # restore original path
         self._path = path_original
 
+    def _update_path(self):
+        # Compute new values and update and set new _path if any value changed
+        stretched = self._theta_stretch()
+        if any(a != b for a, b in zip(
+                stretched, (self._theta1, self._theta2, self._stretched_width,
+                            self._stretched_height))):
+            (self._theta1, self._theta2, self._stretched_width,
+             self._stretched_height) = stretched
+            self._path = Path.arc(self._theta1, self._theta2)
+
+    def _theta_stretch(self):
+        # If the width and height of ellipse are not equal, take into account
+        # stretching when calculating angles to draw between
+        def theta_stretch(theta, scale):
+            theta = np.deg2rad(theta)
+            x = np.cos(theta)
+            y = np.sin(theta)
+            stheta = np.rad2deg(np.arctan2(scale * y, x))
+            # arctan2 has the range [-pi, pi], we expect [0, 2*pi]
+            return (stheta + 360) % 360
+
+        width = self.convert_xunits(self.width)
+        height = self.convert_yunits(self.height)
+        if (
+            # if we need to stretch the angles because we are distorted
+            width != height
+            # and we are not doing a full circle.
+            #
+            # 0 and 360 do not exactly round-trip through the angle
+            # stretching (due to both float precision limitations and
+            # the difference between the range of arctan2 [-pi, pi] and
+            # this method [0, 360]) so avoid doing it if we don't have to.
+            and not (self.theta1 != self.theta2 and
+                     self.theta1 % 360 == self.theta2 % 360)
+        ):
+            theta1 = theta_stretch(self.theta1, width / height)
+            theta2 = theta_stretch(self.theta2, width / height)
+            return theta1, theta2, width, height
+        return self.theta1, self.theta2, width, height
+
 
 def bbox_artist(artist, renderer, props=None, fill=True):
     """
@@ -1859,50 +2172,56 @@ def draw_bbox(bbox, renderer, color='k', trans=None):
     box returned by an artist's `.Artist.get_window_extent`
     to test whether the artist is returning the correct bbox.
     """
-    r = Rectangle(xy=(bbox.x0, bbox.y0), width=bbox.width, height=bbox.height,
+    r = Rectangle(xy=bbox.p0, width=bbox.width, height=bbox.height,
                   edgecolor=color, fill=False, clip_on=False)
     if trans is not None:
         r.set_transform(trans)
     r.draw(renderer)
 
 
-def _simpleprint_styles(_styles):
-    """
-    A helper function for the _Style class.  Given the dictionary of
-    {stylename: styleclass}, return a string rep of the list of keys.
-    Used to update the documentation.
-    """
-    return "[{}]".format("|".join(map(" '{}' ".format, sorted(_styles))))
-
-
 class _Style:
     """
     A base class for the Styles. It is meant to be a container class,
     where actual styles are declared as subclass of it, and it
     provides some helper functions.
     """
-    def __new__(cls, stylename, **kw):
-        """Return the instance of the subclass with the given style name."""
 
+    def __init_subclass__(cls):
+        # Automatically perform docstring interpolation on the subclasses:
+        # This allows listing the supported styles via
+        # - %(BoxStyle:table)s
+        # - %(ConnectionStyle:table)s
+        # - %(ArrowStyle:table)s
+        # and additionally adding .. ACCEPTS: blocks via
+        # - %(BoxStyle:table_and_accepts)s
+        # - %(ConnectionStyle:table_and_accepts)s
+        # - %(ArrowStyle:table_and_accepts)s
+        _docstring.interpd.update({
+            f"{cls.__name__}:table": cls.pprint_styles(),
+            f"{cls.__name__}:table_and_accepts": (
+                cls.pprint_styles()
+                + "\n\n    .. ACCEPTS: ["
+                + "|".join(map(" '{}' ".format, cls._style_list))
+                + "]")
+        })
+
+    def __new__(cls, stylename, **kwargs):
+        """Return the instance of the subclass with the given style name."""
         # The "class" should have the _style_list attribute, which is a mapping
         # of style names to style classes.
-
         _list = stylename.replace(" ", "").split(",")
         _name = _list[0].lower()
         try:
             _cls = cls._style_list[_name]
         except KeyError as err:
-            raise ValueError("Unknown style : %s" % stylename) from err
-
+            raise ValueError(f"Unknown style: {stylename!r}") from err
         try:
             _args_pair = [cs.split("=") for cs in _list[1:]]
             _args = {k: float(v) for k, v in _args_pair}
         except ValueError as err:
-            raise ValueError("Incorrect style argument : %s" %
-                             stylename) from err
-        _args.update(kw)
-
-        return _cls(**_args)
+            raise ValueError(
+                f"Incorrect style argument: {stylename!r}") from err
+        return _cls(**{**_args, **kwargs})
 
     @classmethod
     def get_styles(cls):
@@ -1918,7 +2237,7 @@ def pprint_styles(cls):
                     f'``{name}``',
                     # [1:-1] drops the surrounding parentheses.
                     str(inspect.signature(cls))[1:-1] or 'None')
-                   for name, cls in sorted(cls._style_list.items())]]
+                   for name, cls in cls._style_list.items()]]
         # Convert to rst table.
         col_len = [max(len(cell) for cell in column) for column in zip(*table)]
         table_formatstr = '  '.join('=' * cl for cl in col_len)
@@ -1930,9 +2249,8 @@ def pprint_styles(cls):
             *['  '.join(cell.ljust(cl) for cell, cl in zip(row, col_len))
               for row in table[1:]],
             table_formatstr,
-            '',
         ])
-        return textwrap.indent(rst_table, prefix=' ' * 2)
+        return textwrap.indent(rst_table, prefix=' ' * 4)
 
     @classmethod
     def register(cls, name, style):
@@ -1951,6 +2269,7 @@ def _register_style(style_list, cls=None, *, name=None):
     return cls
 
 
+@_docstring.dedent_interpd
 class BoxStyle(_Style):
     """
     `BoxStyle` is a container class which defines several
@@ -1970,96 +2289,20 @@ class BoxStyle(_Style):
 
     The following boxstyle classes are defined.
 
-    %(AvailableBoxstyles)s
+    %(BoxStyle:table)s
 
-    An instance of any boxstyle class is an callable object,
-    whose call signature is::
+    An instance of a boxstyle class is a callable object, with the signature ::
 
-       __call__(self, x0, y0, width, height, mutation_size)
+       __call__(self, x0, y0, width, height, mutation_size) -> Path
 
-    and returns a `.Path` instance. *x0*, *y0*, *width* and
-    *height* specify the location and size of the box to be
-    drawn. *mutation_scale* determines the overall size of the
-    mutation (by which I mean the transformation of the rectangle to
-    the fancy box).
+    *x0*, *y0*, *width* and *height* specify the location and size of the box
+    to be drawn; *mutation_size* scales the outline properties such as padding.
     """
 
     _style_list = {}
 
-    @_api.deprecated("3.4")
-    class _Base:
-        """
-        Abstract base class for styling of `.FancyBboxPatch`.
-
-        This class is not an artist itself.  The `__call__` method returns the
-        `~matplotlib.path.Path` for outlining the fancy box. The actual drawing
-        is handled in `.FancyBboxPatch`.
-
-        Subclasses may only use parameters with default values in their
-        ``__init__`` method because they must be able to be initialized
-        without arguments.
-
-        Subclasses must implement the `__call__` method. It receives the
-        enclosing rectangle *x0, y0, width, height* as well as the
-        *mutation_size*, which scales the outline properties such as padding.
-        It returns the outline of the fancy box as `.path.Path`.
-        """
-
-        @_api.deprecated("3.4")
-        def transmute(self, x0, y0, width, height, mutation_size):
-            """Return the `~.path.Path` outlining the given rectangle."""
-            return self(self, x0, y0, width, height, mutation_size, 1)
-
-        # This can go away once the deprecation period elapses, leaving _Base
-        # as a fully abstract base class just providing docstrings, no logic.
-        def __init_subclass__(cls):
-            transmute = _api.deprecate_method_override(
-                __class__.transmute, cls, since="3.4")
-            if transmute:
-                cls.__call__ = transmute
-                return
-
-            __call__ = cls.__call__
-
-            @_api.delete_parameter("3.4", "mutation_aspect")
-            def call_wrapper(
-                    self, x0, y0, width, height, mutation_size,
-                    mutation_aspect=_api.deprecation._deprecated_parameter):
-                if mutation_aspect is _api.deprecation._deprecated_parameter:
-                    # Don't trigger deprecation warning internally.
-                    return __call__(self, x0, y0, width, height, mutation_size)
-                else:
-                    # Squeeze the given height by the aspect_ratio.
-                    y0, height = y0 / mutation_aspect, height / mutation_aspect
-                    path = self(x0, y0, width, height, mutation_size,
-                                mutation_aspect)
-                    vertices, codes = path.vertices, path.codes
-                    # Restore the height.
-                    vertices[:, 1] = vertices[:, 1] * mutation_aspect
-                    return Path(vertices, codes)
-
-            cls.__call__ = call_wrapper
-
-        def __call__(self, x0, y0, width, height, mutation_size):
-            """
-            Given the location and size of the box, return the path of
-            the box around it.
-
-            Parameters
-            ----------
-            x0, y0, width, height : float
-                Location and size of the box.
-            mutation_size : float
-                A reference scale for the mutation.
-
-            Returns
-            -------
-            `~matplotlib.path.Path`
-            """
-            raise NotImplementedError('Derived must override')
-
     @_register_style(_style_list)
-    class Square(_Base):
+    class Square:
         """A square box."""
 
         def __init__(self, pad=0.3):
@@ -2078,11 +2321,11 @@ def __call__(self, x0, y0, width, height, mutation_size):
             # boundary of the padded box
             x0, y0 = x0 - pad, y0 - pad
             x1, y1 = x0 + width, y0 + height
-            return Path([(x0, y0), (x1, y0), (x1, y1), (x0, y1), (x0, y0)],
-                        closed=True)
+            return Path._create_closed(
+                [(x0, y0), (x1, y0), (x1, y1), (x0, y1)])
 
     @_register_style(_style_list)
-    class Circle(_Base):
+    class Circle:
         """A circular box."""
 
         def __init__(self, pad=0.3):
@@ -2103,7 +2346,7 @@ def __call__(self, x0, y0, width, height, mutation_size):
                                max(width, height) / 2)
 
     @_register_style(_style_list)
-    class LArrow(_Base):
+    class LArrow:
         """A box in the shape of a left-pointing arrow."""
 
         def __init__(self, pad=0.3):
@@ -2128,11 +2371,11 @@ def __call__(self, x0, y0, width, height, mutation_size):
             dxx = dx / 2
             x0 = x0 + pad / 1.4  # adjust by ~sqrt(2)
 
-            return Path([(x0 + dxx, y0), (x1, y0), (x1, y1), (x0 + dxx, y1),
-                         (x0 + dxx, y1 + dxx), (x0 - dx, y0 + dx),
-                         (x0 + dxx, y0 - dxx),  # arrow
-                         (x0 + dxx, y0), (x0 + dxx, y0)],
-                        closed=True)
+            return Path._create_closed(
+                [(x0 + dxx, y0), (x1, y0), (x1, y1), (x0 + dxx, y1),
+                 (x0 + dxx, y1 + dxx), (x0 - dx, y0 + dx),
+                 (x0 + dxx, y0 - dxx),  # arrow
+                 (x0 + dxx, y0)])
 
     @_register_style(_style_list)
     class RArrow(LArrow):
@@ -2145,7 +2388,7 @@ def __call__(self, x0, y0, width, height, mutation_size):
             return p
 
     @_register_style(_style_list)
-    class DArrow(_Base):
+    class DArrow:
         """A box in the shape of a two-way arrow."""
         # Modified from LArrow to add a right arrow to the bbox.
 
@@ -2172,17 +2415,17 @@ def __call__(self, x0, y0, width, height, mutation_size):
             dxx = dx / 2
             x0 = x0 + pad / 1.4  # adjust by ~sqrt(2)
 
-            return Path([(x0 + dxx, y0), (x1, y0),  # bot-segment
-                         (x1, y0 - dxx), (x1 + dx + dxx, y0 + dx),
-                         (x1, y1 + dxx),  # right-arrow
-                         (x1, y1), (x0 + dxx, y1),  # top-segment
-                         (x0 + dxx, y1 + dxx), (x0 - dx, y0 + dx),
-                         (x0 + dxx, y0 - dxx),  # left-arrow
-                         (x0 + dxx, y0), (x0 + dxx, y0)],  # close-poly
-                        closed=True)
+            return Path._create_closed([
+                (x0 + dxx, y0), (x1, y0),  # bot-segment
+                (x1, y0 - dxx), (x1 + dx + dxx, y0 + dx),
+                (x1, y1 + dxx),  # right-arrow
+                (x1, y1), (x0 + dxx, y1),  # top-segment
+                (x0 + dxx, y1 + dxx), (x0 - dx, y0 + dx),
+                (x0 + dxx, y0 - dxx),  # left-arrow
+                (x0 + dxx, y0)])
 
     @_register_style(_style_list)
-    class Round(_Base):
+    class Round:
         """A box with round corners."""
 
         def __init__(self, pad=0.3, rounding_size=None):
@@ -2242,7 +2485,7 @@ def __call__(self, x0, y0, width, height, mutation_size):
             return path
 
     @_register_style(_style_list)
-    class Round4(_Base):
+    class Round4:
         """A box with rounded edges."""
 
         def __init__(self, pad=0.3, rounding_size=None):
@@ -2293,7 +2536,7 @@ def __call__(self, x0, y0, width, height, mutation_size):
             return path
 
     @_register_style(_style_list)
-    class Sawtooth(_Base):
+    class Sawtooth:
         """A box with a sawtooth outline."""
 
         def __init__(self, pad=0.3, tooth_size=None):
@@ -2404,6 +2647,7 @@ def __call__(self, x0, y0, width, height, mutation_size):
             return Path(saw_vertices, codes)
 
 
+@_docstring.dedent_interpd
 class ConnectionStyle(_Style):
     """
     `ConnectionStyle` is a container class which defines
@@ -2424,7 +2668,7 @@ class ConnectionStyle(_Style):
 
     The following classes are defined
 
-    %(AvailableConnectorstyles)s
+    %(ConnectionStyle:table)s
 
     An instance of any connection style class is an callable object,
     whose call signature is::
@@ -2840,6 +3084,7 @@ def _point_along_a_line(x0, y0, x1, y1, d):
     return x2, y2
 
 
+@_docstring.dedent_interpd
 class ArrowStyle(_Style):
     """
     `ArrowStyle` is a container class which defines several
@@ -2860,7 +3105,7 @@ class ArrowStyle(_Style):
 
     The following classes are defined
 
-    %(AvailableArrowstyles)s
+    %(ArrowStyle:table)s
 
     An instance of any arrow style class is a callable object,
     whose call signature is::
@@ -2874,6 +3119,14 @@ class ArrowStyle(_Style):
     stroked. This is meant to be used to correct the location of the
     head so that it does not overshoot the destination point, but not all
     classes support it.
+
+    Notes
+    -----
+    *angleA* and *angleB* specify the orientation of the bracket, as either a
+    clockwise or counterclockwise angle depending on the arrow type. 0 degrees
+    means perpendicular to the line connecting the arrow's head and tail.
+
+    .. plot:: gallery/text_labels_and_annotations/angles_on_bracket_arrows.py
     """
 
     _style_list = {}
@@ -2888,7 +3141,6 @@ class _Base:
         value indicating the path is open therefore is not fillable.  This
         class is not an artist and actual drawing of the fancy arrow is
         done by the FancyArrowPatch class.
-
         """
 
         # The derived classes are required to be able to be initialized
@@ -2898,10 +3150,11 @@ class is not an artist and actual drawing of the fancy arrow is
         @staticmethod
         def ensure_quadratic_bezier(path):
             """
-            Some ArrowStyle class only works with a simple quadratic Bezier
-            curve (created with Arc3Connection or Angle3Connector). This static
-            method is to check if the provided path is a simple quadratic
-            Bezier curve and returns its control points if true.
+            Some ArrowStyle classes only works with a simple quadratic
+            Bezier curve (created with `.ConnectionStyle.Arc3` or
+            `.ConnectionStyle.Angle3`). This static method checks if the
+            provided path is a simple quadratic Bezier curve and returns its
+            control points if true.
             """
             segments = list(path.iter_segments())
             if (len(segments) != 2 or segments[0][1] != Path.MOVETO or
@@ -2940,11 +3193,9 @@ def __call__(self, path, mutation_size, linewidth,
                                                         mutation_size,
                                                         linewidth)
                 if np.iterable(fillable):
-                    path_list = []
-                    for p in path_mutated:
-                        # Restore the height
-                        path_list.append(
-                            Path(p.vertices * [1, aspect_ratio], p.codes))
+                    # Restore the height
+                    path_list = [Path(p.vertices * [1, aspect_ratio], p.codes)
+                                 for p in path_mutated]
                     return path_list, fillable
                 else:
                     return path_mutated, fillable
@@ -2954,24 +3205,111 @@ def __call__(self, path, mutation_size, linewidth,
     class _Curve(_Base):
         """
         A simple arrow which will work with any path instance. The
-        returned path is simply concatenation of the original path + at
-        most two paths representing the arrow head at the begin point and the
-        at the end point. The arrow heads can be either open or closed.
+        returned path is the concatenation of the original path, and at
+        most two paths representing the arrow head or bracket at the begin
+        point and at the end point. The arrow heads can be either open
+        or closed.
         """
 
-        def __init__(self, beginarrow=None, endarrow=None,
-                     fillbegin=False, fillend=False,
-                     head_length=.2, head_width=.1):
+        beginarrow = endarrow = None  # Whether arrows are drawn.
+        arrow = "-"
+        fillbegin = fillend = False  # Whether arrows are filled.
+
+        def __init__(self, head_length=.4, head_width=.2, widthA=1., widthB=1.,
+                     lengthA=0.2, lengthB=0.2, angleA=0, angleB=0, scaleA=None,
+                     scaleB=None):
             """
-            The arrows are drawn if *beginarrow* and/or *endarrow* are
-            true. *head_length* and *head_width* determines the size
-            of the arrow relative to the *mutation scale*.  The
-            arrowhead at the begin (or end) is closed if fillbegin (or
-            fillend) is True.
+            Parameters
+            ----------
+            head_length : float, default: 0.4
+                Length of the arrow head, relative to *mutation_scale*.
+            head_width : float, default: 0.2
+                Width of the arrow head, relative to *mutation_scale*.
+            widthA : float, default: 1.0
+                Width of the bracket at the beginning of the arrow
+            widthB : float, default: 1.0
+                Width of the bracket at the end of the arrow
+            lengthA : float, default: 0.2
+                Length of the bracket at the beginning of the arrow
+            lengthB : float, default: 0.2
+                Length of the bracket at the end of the arrow
+            angleA : float, default 0
+                Orientation of the bracket at the beginning, as a
+                counterclockwise angle. 0 degrees means perpendicular
+                to the line.
+            angleB : float, default 0
+                Orientation of the bracket at the beginning, as a
+                counterclockwise angle. 0 degrees means perpendicular
+                to the line.
+            scaleA : float, default *mutation_size*
+                The mutation_size for the beginning bracket
+            scaleB : float, default *mutation_size*
+                The mutation_size for the end bracket
             """
-            self.beginarrow, self.endarrow = beginarrow, endarrow
+
             self.head_length, self.head_width = head_length, head_width
-            self.fillbegin, self.fillend = fillbegin, fillend
+            self.widthA, self.widthB = widthA, widthB
+            self.lengthA, self.lengthB = lengthA, lengthB
+            self.angleA, self.angleB = angleA, angleB
+            self.scaleA, self.scaleB = scaleA, scaleB
+
+            self._beginarrow_head = False
+            self._beginarrow_bracket = False
+            self._endarrow_head = False
+            self._endarrow_bracket = False
+
+            if "-" not in self.arrow:
+                raise ValueError("arrow must have the '-' between "
+                                 "the two heads")
+
+            beginarrow, endarrow = self.arrow.split("-", 1)
+
+            if beginarrow == "<":
+                self._beginarrow_head = True
+                self._beginarrow_bracket = False
+            elif beginarrow == "<|":
+                self._beginarrow_head = True
+                self._beginarrow_bracket = False
+                self.fillbegin = True
+            elif beginarrow in ("]", "|"):
+                self._beginarrow_head = False
+                self._beginarrow_bracket = True
+            elif self.beginarrow is True:
+                self._beginarrow_head = True
+                self._beginarrow_bracket = False
+
+                _api.warn_deprecated('3.5', name="beginarrow",
+                                     alternative="arrow")
+            elif self.beginarrow is False:
+                self._beginarrow_head = False
+                self._beginarrow_bracket = False
+
+                _api.warn_deprecated('3.5', name="beginarrow",
+                                     alternative="arrow")
+
+            if endarrow == ">":
+                self._endarrow_head = True
+                self._endarrow_bracket = False
+            elif endarrow == "|>":
+                self._endarrow_head = True
+                self._endarrow_bracket = False
+                self.fillend = True
+            elif endarrow in ("[", "|"):
+                self._endarrow_head = False
+                self._endarrow_bracket = True
+            elif self.endarrow is True:
+                self._endarrow_head = True
+                self._endarrow_bracket = False
+
+                _api.warn_deprecated('3.5', name="endarrow",
+                                     alternative="arrow")
+            elif self.endarrow is False:
+                self._endarrow_head = False
+                self._endarrow_bracket = False
+
+                _api.warn_deprecated('3.5', name="endarrow",
+                                     alternative="arrow")
+
             super().__init__()
 
         def _get_arrow_wedge(self, x0, y0, x1, y1,
@@ -3016,19 +3354,49 @@ def _get_arrow_wedge(self, x0, y0, x1, y1,
 
             return vertices_arrow, codes_arrow, ddx, ddy
 
+        def _get_bracket(self, x0, y0,
+                         x1, y1, width, length, angle):
+
+            cos_t, sin_t = get_cos_sin(x1, y1, x0, y0)
+
+            # arrow from x0, y0 to x1, y1
+            from matplotlib.bezier import get_normal_points
+            x1, y1, x2, y2 = get_normal_points(x0, y0, cos_t, sin_t, width)
+
+            dx, dy = length * cos_t, length * sin_t
+
+            vertices_arrow = [(x1 + dx, y1 + dy),
+                              (x1, y1),
+                              (x2, y2),
+                              (x2 + dx, y2 + dy)]
+            codes_arrow = [Path.MOVETO,
+                           Path.LINETO,
+                           Path.LINETO,
+                           Path.LINETO]
+
+            if angle:
+                trans = transforms.Affine2D().rotate_deg_around(x0, y0, angle)
+                vertices_arrow = trans.transform(vertices_arrow)
+
+            return vertices_arrow, codes_arrow
+
         def transmute(self, path, mutation_size, linewidth):
 
-            head_length = self.head_length * mutation_size
-            head_width = self.head_width * mutation_size
-            head_dist = np.hypot(head_length, head_width)
-            cos_t, sin_t = head_length / head_dist, head_width / head_dist
+            if self._beginarrow_head or self._endarrow_head:
+                head_length = self.head_length * mutation_size
+                head_width = self.head_width * mutation_size
+                head_dist = np.hypot(head_length, head_width)
+                cos_t, sin_t = head_length / head_dist, head_width / head_dist
+
+            scaleA = mutation_size if self.scaleA is None else self.scaleA
+            scaleB = mutation_size if self.scaleB is None else self.scaleB
 
             # begin arrow
             x0, y0 = path.vertices[0]
             x1, y1 = path.vertices[1]
 
             # If there is no room for an arrow and a line, then skip the arrow
-            has_begin_arrow = self.beginarrow and (x0, y0) != (x1, y1)
+            has_begin_arrow = self._beginarrow_head and (x0, y0) != (x1, y1)
             verticesA, codesA, ddxA, ddyA = (
                 self._get_arrow_wedge(x1, y1, x0, y0,
                                       head_dist, cos_t, sin_t, linewidth)
@@ -3041,7 +3409,7 @@ def transmute(self, path, mutation_size, linewidth):
             x3, y3 = path.vertices[-1]
 
             # If there is no room for an arrow and a line, then skip the arrow
-            has_end_arrow = self.endarrow and (x2, y2) != (x3, y3)
+            has_end_arrow = self._endarrow_head and (x2, y2) != (x3, y3)
             verticesB, codesB, ddxB, ddyB = (
                 self._get_arrow_wedge(x2, y2, x3, y3,
                                       head_dist, cos_t, sin_t, linewidth)
@@ -3067,6 +3435,16 @@ def transmute(self, path, mutation_size, linewidth):
                 else:
                     _path.append(Path(verticesA, codesA))
                     _fillable.append(False)
+            elif self._beginarrow_bracket:
+                x0, y0 = path.vertices[0]
+                x1, y1 = path.vertices[1]
+                verticesA, codesA = self._get_bracket(x0, y0, x1, y1,
+                                                      self.widthA * scaleA,
+                                                      self.lengthA * scaleA,
+                                                      self.angleA)
+
+                _path.append(Path(verticesA, codesA))
+                _fillable.append(False)
 
             if has_end_arrow:
                 if self.fillend:
@@ -3078,6 +3456,16 @@ def transmute(self, path, mutation_size, linewidth):
                 else:
                     _fillable.append(False)
                     _path.append(Path(verticesB, codesB))
+            elif self._endarrow_bracket:
+                x0, y0 = path.vertices[-1]
+                x1, y1 = path.vertices[-2]
+                verticesB, codesB = self._get_bracket(x0, y0, x1, y1,
+                                                      self.widthB * scaleB,
+                                                      self.lengthB * scaleB,
+                                                      self.angleB)
+
+                _path.append(Path(verticesB, codesB))
+                _fillable.append(False)
 
             return _path, _fillable
 
@@ -3085,304 +3473,162 @@ def transmute(self, path, mutation_size, linewidth):
     class Curve(_Curve):
         """A simple curve without any arrow head."""
 
-        def __init__(self):
-            super().__init__(beginarrow=False, endarrow=False)
+        def __init__(self):  # hide head_length, head_width
+            # These attributes (whose values come from backcompat) only matter
+            # if someone modifies beginarrow/etc. on an ArrowStyle instance.
+            super().__init__(head_length=.2, head_width=.1)
 
     @_register_style(_style_list, name="<-")
     class CurveA(_Curve):
         """An arrow with a head at its begin point."""
-
-        def __init__(self, head_length=.4, head_width=.2):
-            """
-            Parameters
-            ----------
-            head_length : float, default: 0.4
-                Length of the arrow head.
-
-            head_width : float, default: 0.2
-                Width of the arrow head.
-            """
-            super().__init__(beginarrow=True, endarrow=False,
-                             head_length=head_length, head_width=head_width)
+        arrow = "<-"
 
     @_register_style(_style_list, name="->")
     class CurveB(_Curve):
         """An arrow with a head at its end point."""
-
-        def __init__(self, head_length=.4, head_width=.2):
-            """
-            Parameters
-            ----------
-            head_length : float, default: 0.4
-                Length of the arrow head.
-
-            head_width : float, default: 0.2
-                Width of the arrow head.
-            """
-            super().__init__(beginarrow=False, endarrow=True,
-                             head_length=head_length, head_width=head_width)
+        arrow = "->"
 
     @_register_style(_style_list, name="<->")
     class CurveAB(_Curve):
         """An arrow with heads both at the begin and the end point."""
-
-        def __init__(self, head_length=.4, head_width=.2):
-            """
-            Parameters
-            ----------
-            head_length : float, default: 0.4
-                Length of the arrow head.
-
-            head_width : float, default: 0.2
-                Width of the arrow head.
-            """
-            super().__init__(beginarrow=True, endarrow=True,
-                             head_length=head_length, head_width=head_width)
+        arrow = "<->"
 
     @_register_style(_style_list, name="<|-")
     class CurveFilledA(_Curve):
         """An arrow with filled triangle head at the begin."""
-
-        def __init__(self, head_length=.4, head_width=.2):
-            """
-            Parameters
-            ----------
-            head_length : float, default: 0.4
-                Length of the arrow head.
-
-            head_width : float, default: 0.2
-                Width of the arrow head.
-            """
-            super().__init__(beginarrow=True, endarrow=False,
-                             fillbegin=True, fillend=False,
-                             head_length=head_length, head_width=head_width)
+        arrow = "<|-"
 
     @_register_style(_style_list, name="-|>")
     class CurveFilledB(_Curve):
         """An arrow with filled triangle head at the end."""
-
-        def __init__(self, head_length=.4, head_width=.2):
-            """
-            Parameters
-            ----------
-            head_length : float, default: 0.4
-                Length of the arrow head.
-
-            head_width : float, default: 0.2
-                Width of the arrow head.
-            """
-            super().__init__(beginarrow=False, endarrow=True,
-                             fillbegin=False, fillend=True,
-                             head_length=head_length, head_width=head_width)
+        arrow = "-|>"
 
     @_register_style(_style_list, name="<|-|>")
     class CurveFilledAB(_Curve):
         """An arrow with filled triangle heads at both ends."""
+        arrow = "<|-|>"
 
-        def __init__(self, head_length=.4, head_width=.2):
-            """
-            Parameters
-            ----------
-            head_length : float, default: 0.4
-                Length of the arrow head.
-
-            head_width : float, default: 0.2
-                Width of the arrow head.
-            """
-            super().__init__(beginarrow=True, endarrow=True,
-                             fillbegin=True, fillend=True,
-                             head_length=head_length, head_width=head_width)
-
-    class _Bracket(_Base):
-
-        def __init__(self, bracketA=None, bracketB=None,
-                     widthA=1., widthB=1.,
-                     lengthA=0.2, lengthB=0.2,
-                     angleA=None, angleB=None,
-                     scaleA=None, scaleB=None):
-            self.bracketA, self.bracketB = bracketA, bracketB
-            self.widthA, self.widthB = widthA, widthB
-            self.lengthA, self.lengthB = lengthA, lengthB
-            self.angleA, self.angleB = angleA, angleB
-            self.scaleA, self.scaleB = scaleA, scaleB
-
-        def _get_bracket(self, x0, y0,
-                         cos_t, sin_t, width, length, angle):
-
-            # arrow from x0, y0 to x1, y1
-            from matplotlib.bezier import get_normal_points
-            x1, y1, x2, y2 = get_normal_points(x0, y0, cos_t, sin_t, width)
-
-            dx, dy = length * cos_t, length * sin_t
-
-            vertices_arrow = [(x1 + dx, y1 + dy),
-                              (x1, y1),
-                              (x2, y2),
-                              (x2 + dx, y2 + dy)]
-            codes_arrow = [Path.MOVETO,
-                           Path.LINETO,
-                           Path.LINETO,
-                           Path.LINETO]
-
-            if angle is not None:
-                trans = transforms.Affine2D().rotate_deg_around(x0, y0, angle)
-                vertices_arrow = trans.transform(vertices_arrow)
-
-            return vertices_arrow, codes_arrow
-
-        def transmute(self, path, mutation_size, linewidth):
-
-            if self.scaleA is None:
-                scaleA = mutation_size
-            else:
-                scaleA = self.scaleA
-
-            if self.scaleB is None:
-                scaleB = mutation_size
-            else:
-                scaleB = self.scaleB
-
-            vertices_list, codes_list = [], []
-
-            if self.bracketA:
-                x0, y0 = path.vertices[0]
-                x1, y1 = path.vertices[1]
-                cos_t, sin_t = get_cos_sin(x1, y1, x0, y0)
-                verticesA, codesA = self._get_bracket(x0, y0, cos_t, sin_t,
-                                                      self.widthA * scaleA,
-                                                      self.lengthA * scaleA,
-                                                      self.angleA)
-                vertices_list.append(verticesA)
-                codes_list.append(codesA)
-
-            vertices_list.append(path.vertices)
-            codes_list.append(path.codes)
-
-            if self.bracketB:
-                x0, y0 = path.vertices[-1]
-                x1, y1 = path.vertices[-2]
-                cos_t, sin_t = get_cos_sin(x1, y1, x0, y0)
-                verticesB, codesB = self._get_bracket(x0, y0, cos_t, sin_t,
-                                                      self.widthB * scaleB,
-                                                      self.lengthB * scaleB,
-                                                      self.angleB)
-                vertices_list.append(verticesB)
-                codes_list.append(codesB)
-
-            vertices = np.concatenate(vertices_list)
-            codes = np.concatenate(codes_list)
-
-            p = Path(vertices, codes)
-
-            return p, False
-
-    @_register_style(_style_list, name="]-[")
-    class BracketAB(_Bracket):
-        """An arrow with outward square brackets at both ends."""
+    @_register_style(_style_list, name="]-")
+    class BracketA(_Curve):
+        """An arrow with an outward square bracket at its start."""
+        arrow = "]-"
 
-        def __init__(self,
-                     widthA=1., lengthA=0.2, angleA=None,
-                     widthB=1., lengthB=0.2, angleB=None):
+        def __init__(self, widthA=1., lengthA=0.2, angleA=0):
             """
             Parameters
             ----------
             widthA : float, default: 1.0
                 Width of the bracket.
-
             lengthA : float, default: 0.2
                 Length of the bracket.
+            angleA : float, default: 0 degrees
+                Orientation of the bracket, as a counterclockwise angle.
+                0 degrees means perpendicular to the line.
+            """
+            super().__init__(widthA=widthA, lengthA=lengthA, angleA=angleA)
 
-            angleA : float, default: None
-                Angle, in degrees, between the bracket and the line. Zero is
-                perpendicular to the line, and positive measures
-                counterclockwise.
+    @_register_style(_style_list, name="-[")
+    class BracketB(_Curve):
+        """An arrow with an outward square bracket at its end."""
+        arrow = "-["
 
+        def __init__(self, widthB=1., lengthB=0.2, angleB=0):
+            """
+            Parameters
+            ----------
             widthB : float, default: 1.0
                 Width of the bracket.
-
             lengthB : float, default: 0.2
                 Length of the bracket.
-
-            angleB : float, default: None
-                Angle, in degrees, between the bracket and the line. Zero is
-                perpendicular to the line, and positive measures
-                counterclockwise.
+            angleB : float, default: 0 degrees
+                Orientation of the bracket, as a counterclockwise angle.
+                0 degrees means perpendicular to the line.
             """
-            super().__init__(True, True,
-                             widthA=widthA, lengthA=lengthA, angleA=angleA,
-                             widthB=widthB, lengthB=lengthB, angleB=angleB)
+            super().__init__(widthB=widthB, lengthB=lengthB, angleB=angleB)
 
-    @_register_style(_style_list, name="]-")
-    class BracketA(_Bracket):
-        """An arrow with an outward square bracket at its start."""
+    @_register_style(_style_list, name="]-[")
+    class BracketAB(_Curve):
+        """An arrow with outward square brackets at both ends."""
+        arrow = "]-["
 
-        def __init__(self, widthA=1., lengthA=0.2, angleA=None):
+        def __init__(self,
+                     widthA=1., lengthA=0.2, angleA=0,
+                     widthB=1., lengthB=0.2, angleB=0):
             """
             Parameters
             ----------
-            widthA : float, default: 1.0
+            widthA, widthB : float, default: 1.0
                 Width of the bracket.
-
-            lengthA : float, default: 0.2
+            lengthA, lengthB : float, default: 0.2
                 Length of the bracket.
-
-            angleA : float, default: None
-                Angle between the bracket and the line.
+            angleA, angleB : float, default: 0 degrees
+                Orientation of the bracket, as a counterclockwise angle.
+                0 degrees means perpendicular to the line.
             """
-            super().__init__(True, None,
-                             widthA=widthA, lengthA=lengthA, angleA=angleA)
+            super().__init__(widthA=widthA, lengthA=lengthA, angleA=angleA,
+                             widthB=widthB, lengthB=lengthB, angleB=angleB)
 
-    @_register_style(_style_list, name="-[")
-    class BracketB(_Bracket):
-        """An arrow with an outward square bracket at its end."""
+    @_register_style(_style_list, name="|-|")
+    class BarAB(_Curve):
+        """An arrow with vertical bars ``|`` at both ends."""
+        arrow = "|-|"
 
-        def __init__(self, widthB=1., lengthB=0.2, angleB=None):
+        def __init__(self, widthA=1., angleA=0, widthB=1., angleB=0):
             """
             Parameters
             ----------
-            widthB : float, default: 1.0
+            widthA, widthB : float, default: 1.0
                 Width of the bracket.
-
-            lengthB : float, default: 0.2
-                Length of the bracket.
-
-            angleB : float, default: None
-                Angle, in degrees, between the bracket and the line. Zero is
-                perpendicular to the line, and positive measures
-                counterclockwise.
+            angleA, angleB : float, default: 0 degrees
+                Orientation of the bracket, as a counterclockwise angle.
+                0 degrees means perpendicular to the line.
             """
-            super().__init__(None, True,
-                             widthB=widthB, lengthB=lengthB, angleB=angleB)
+            super().__init__(widthA=widthA, lengthA=0, angleA=angleA,
+                             widthB=widthB, lengthB=0, angleB=angleB)
 
-    @_register_style(_style_list, name="|-|")
-    class BarAB(_Bracket):
-        """An arrow with vertical bars ``|`` at both ends."""
+    @_register_style(_style_list, name=']->')
+    class BracketCurve(_Curve):
+        """
+        An arrow with an outward square bracket at its start and a head at
+        the end.
+        """
+        arrow = "]->"
 
-        def __init__(self,
-                     widthA=1., angleA=None,
-                     widthB=1., angleB=None):
+        def __init__(self, widthA=1., lengthA=0.2, angleA=None):
             """
             Parameters
             ----------
             widthA : float, default: 1.0
                 Width of the bracket.
+            lengthA : float, default: 0.2
+                Length of the bracket.
+            angleA : float, default: 0 degrees
+                Orientation of the bracket, as a counterclockwise angle.
+                0 degrees means perpendicular to the line.
+            """
+            super().__init__(widthA=widthA, lengthA=lengthA, angleA=angleA)
 
-            angleA : float, default: None
-                Angle, in degrees, between the bracket and the line. Zero is
-                perpendicular to the line, and positive measures
-                counterclockwise.
+    @_register_style(_style_list, name='<-[')
+    class CurveBracket(_Curve):
+        """
+        An arrow with an outward square bracket at its end and a head at
+        the start.
+        """
+        arrow = "<-["
 
+        def __init__(self, widthB=1., lengthB=0.2, angleB=None):
+            """
+            Parameters
+            ----------
             widthB : float, default: 1.0
                 Width of the bracket.
-
-            angleB : float, default: None
-                Angle, in degrees, between the bracket and the line. Zero is
-                perpendicular to the line, and positive measures
-                counterclockwise.
+            lengthB : float, default: 0.2
+                Length of the bracket.
+            angleB : float, default: 0 degrees
+                Orientation of the bracket, as a counterclockwise angle.
+                0 degrees means perpendicular to the line.
             """
-            super().__init__(True, True,
-                             widthA=widthA, lengthA=0, angleA=angleA,
-                             widthB=widthB, lengthB=0, angleB=angleB)
+            super().__init__(widthB=widthB, lengthB=lengthB, angleB=angleB)
 
     @_register_style(_style_list)
     class Simple(_Base):
@@ -3597,17 +3843,6 @@ def transmute(self, path, mutation_size, linewidth):
             return path, True
 
 
-docstring.interpd.update(
-    AvailableBoxstyles=BoxStyle.pprint_styles(),
-    ListBoxstyles=_simpleprint_styles(BoxStyle._style_list),
-    AvailableArrowstyles=ArrowStyle.pprint_styles(),
-    AvailableConnectorstyles=ConnectionStyle.pprint_styles(),
-)
-docstring.dedent_interpd(BoxStyle)
-docstring.dedent_interpd(ArrowStyle)
-docstring.dedent_interpd(ConnectionStyle)
-
-
 class FancyBboxPatch(Patch):
     """
     A fancy box around a rectangle with lower left at *xy* = (*x*, *y*)
@@ -3624,7 +3859,8 @@ def __str__(self):
         s = self.__class__.__name__ + "((%g, %g), width=%g, height=%g)"
         return s % (self._x, self._y, self._width, self._height)
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
+    @_api.make_keyword_only("3.6", name="mutation_scale")
     @_api.delete_parameter("3.4", "bbox_transmuter", alternative="boxstyle")
     def __init__(self, xy, width, height,
                  boxstyle="round", bbox_transmuter=None,
@@ -3645,13 +3881,13 @@ def __init__(self, xy, width, height,
         boxstyle : str or `matplotlib.patches.BoxStyle`
             The style of the fancy box. This can either be a `.BoxStyle`
             instance or a string of the style name and optionally comma
-            seprarated attributes (e.g. "Round, pad=0.2"). This string is
+            separated attributes (e.g. "Round, pad=0.2"). This string is
             passed to `.BoxStyle` to construct a `.BoxStyle` object. See
             there for a full documentation.
 
             The following box styles are available:
 
-            %(AvailableBoxstyles)s
+            %(BoxStyle:table)s
 
         mutation_scale : float, default: 1
             Scaling factor applied to the attributes of the box style
@@ -3667,7 +3903,7 @@ def __init__(self, xy, width, height,
         ----------------
         **kwargs : `.Patch` properties
 
-        %(Patch_kwdoc)s
+        %(Patch:kwdoc)s
         """
 
         super().__init__(**kwargs)
@@ -3694,12 +3930,11 @@ def __init__(self, xy, width, height,
 
         self.stale = True
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def set_boxstyle(self, boxstyle=None, **kwargs):
         """
-        Set the box style.
+        Set the box style, possibly with further attributes.
 
-        Most box styles can be further configured using attributes.
         Attributes from the previous box style are not reused.
 
         Without argument (or with ``boxstyle=None``), the available box styles
@@ -3708,17 +3943,14 @@ def set_boxstyle(self, boxstyle=None, **kwargs):
         Parameters
         ----------
         boxstyle : str or `matplotlib.patches.BoxStyle`
-            The style of the fancy box. This can either be a `.BoxStyle`
-            instance or a string of the style name and optionally comma
-            seprarated attributes (e.g. "Round, pad=0.2"). This string is
-            passed to `.BoxStyle` to construct a `.BoxStyle` object. See
-            there for a full documentation.
+            The style of the box: either a `.BoxStyle` instance, or a string,
+            which is the style name and optionally comma separated attributes
+            (e.g. "Round,pad=0.2"). Such a string is used to construct a
+            `.BoxStyle` object, as documented in that class.
 
             The following box styles are available:
 
-            %(AvailableBoxstyles)s
-
-            .. ACCEPTS: %(ListBoxstyles)s
+            %(BoxStyle:table_and_accepts)s
 
         **kwargs
             Additional attributes for the box style. See the table above for
@@ -3728,19 +3960,20 @@ def set_boxstyle(self, boxstyle=None, **kwargs):
         --------
         ::
 
-            set_boxstyle("round,pad=0.2")
+            set_boxstyle("Round,pad=0.2")
             set_boxstyle("round", pad=0.2)
-
         """
         if boxstyle is None:
             return BoxStyle.pprint_styles()
-
-        if isinstance(boxstyle, BoxStyle._Base) or callable(boxstyle):
-            self._bbox_transmuter = boxstyle
-        else:
-            self._bbox_transmuter = BoxStyle(boxstyle, **kwargs)
+        self._bbox_transmuter = (
+            BoxStyle(boxstyle, **kwargs)
+            if isinstance(boxstyle, str) else boxstyle)
         self.stale = True
 
+    def get_boxstyle(self):
+        """Return the boxstyle object."""
+        return self._bbox_transmuter
+
     def set_mutation_scale(self, scale):
         """
         Set the mutation scale.
@@ -3772,10 +4005,6 @@ def get_mutation_aspect(self):
         return (self._mutation_aspect if self._mutation_aspect is not None
                 else 1)  # backcompat.
 
-    def get_boxstyle(self):
-        """Return the boxstyle object."""
-        return self._bbox_transmuter
-
     def get_path(self):
         """Return the mutated path of the rectangle."""
         boxstyle = self.get_boxstyle()
@@ -3915,14 +4144,13 @@ def __str__(self):
         else:
             return f"{type(self).__name__}({self._path_original})"
 
-    @docstring.dedent_interpd
-    @_api.delete_parameter("3.4", "dpi_cor")
+    @_docstring.dedent_interpd
+    @_api.make_keyword_only("3.6", name="path")
     def __init__(self, posA=None, posB=None, path=None,
                  arrowstyle="simple", connectionstyle="arc3",
                  patchA=None, patchB=None,
                  shrinkA=2, shrinkB=2,
                  mutation_scale=1, mutation_aspect=1,
-                 dpi_cor=1,
                  **kwargs):
         """
         There are two ways for defining an arrow:
@@ -3952,7 +4180,7 @@ def __init__(self, posA=None, posB=None, path=None,
             meant to be scaled with the *mutation_scale*.  The following arrow
             styles are available:
 
-            %(AvailableArrowstyles)s
+            %(ArrowStyle:table)s
 
         connectionstyle : str or `.ConnectionStyle` or None, optional, \
 default: 'arc3'
@@ -3961,7 +4189,7 @@ def __init__(self, posA=None, posB=None, path=None,
             names, with optional comma-separated attributes.  The following
             connection styles are available:
 
-            %(AvailableConnectorstyles)s
+            %(ConnectionStyle:table)s
 
         patchA, patchB : `.Patch`, default: None
             Head and tail patches, respectively.
@@ -3978,16 +4206,12 @@ def __init__(self, posA=None, posB=None, path=None,
             the mutation and the mutated box will be stretched by the inverse
             of it.
 
-        dpi_cor : float, default: 1
-            dpi_cor is currently used for linewidth-related things and shrink
-            factor. Mutation scale is affected by this.  Deprecated.
-
         Other Parameters
         ----------------
         **kwargs : `.Patch` properties, optional
             Here is a list of available `.Patch` properties:
 
-        %(Patch_kwdoc)s
+        %(Patch:kwdoc)s
 
             In contrast to other patches, the default ``capstyle`` and
             ``joinstyle`` for `FancyArrowPatch` are set to ``"round"``.
@@ -4022,32 +4246,7 @@ def __init__(self, posA=None, posB=None, path=None,
         self._mutation_scale = mutation_scale
         self._mutation_aspect = mutation_aspect
 
-        self._dpi_cor = dpi_cor
-
-    @_api.deprecated("3.4")
-    def set_dpi_cor(self, dpi_cor):
-        """
-        dpi_cor is currently used for linewidth-related things and
-        shrink factor. Mutation scale is affected by this.
-
-        Parameters
-        ----------
-        dpi_cor : float
-        """
-        self._dpi_cor = dpi_cor
-        self.stale = True
-
-    @_api.deprecated("3.4")
-    def get_dpi_cor(self):
-        """
-        dpi_cor is currently used for linewidth-related things and
-        shrink factor. Mutation scale is affected by this.
-
-        Returns
-        -------
-        scalar
-        """
-        return self._dpi_cor
+        self._dpi_cor = 1.0
 
     def set_positions(self, posA, posB):
         """
@@ -4087,67 +4286,87 @@ def set_patchB(self, patchB):
         self.patchB = patchB
         self.stale = True
 
-    def set_connectionstyle(self, connectionstyle, **kw):
+    @_docstring.dedent_interpd
+    def set_connectionstyle(self, connectionstyle=None, **kwargs):
         """
-        Set the connection style. Old attributes are forgotten.
+        Set the connection style, possibly with further attributes.
+
+        Attributes from the previous connection style are not reused.
+
+        Without argument (or with ``connectionstyle=None``), the available box
+        styles are returned as a human-readable string.
 
         Parameters
         ----------
-        connectionstyle : str or `.ConnectionStyle` or None, optional
-            Can be a string with connectionstyle name with
-            optional comma-separated attributes, e.g.::
+        connectionstyle : str or `matplotlib.patches.ConnectionStyle`
+            The style of the connection: either a `.ConnectionStyle` instance,
+            or a string, which is the style name and optionally comma separated
+            attributes (e.g. "Arc,armA=30,rad=10"). Such a string is used to
+            construct a `.ConnectionStyle` object, as documented in that class.
 
-                set_connectionstyle("arc,angleA=0,armA=30,rad=10")
+            The following connection styles are available:
 
-            Alternatively, the attributes can be provided as keywords, e.g.::
+            %(ConnectionStyle:table_and_accepts)s
 
-                set_connectionstyle("arc", angleA=0,armA=30,rad=10)
+        **kwargs
+            Additional attributes for the connection style. See the table above
+            for supported parameters.
 
-            Without any arguments (or with ``connectionstyle=None``), return
-            available styles as a list of strings.
-        """
+        Examples
+        --------
+        ::
 
+            set_connectionstyle("Arc,armA=30,rad=10")
+            set_connectionstyle("arc", armA=30, rad=10)
+        """
         if connectionstyle is None:
             return ConnectionStyle.pprint_styles()
-
-        if (isinstance(connectionstyle, ConnectionStyle._Base) or
-                callable(connectionstyle)):
-            self._connector = connectionstyle
-        else:
-            self._connector = ConnectionStyle(connectionstyle, **kw)
+        self._connector = (
+            ConnectionStyle(connectionstyle, **kwargs)
+            if isinstance(connectionstyle, str) else connectionstyle)
         self.stale = True
 
     def get_connectionstyle(self):
         """Return the `ConnectionStyle` used."""
         return self._connector
 
-    def set_arrowstyle(self, arrowstyle=None, **kw):
+    def set_arrowstyle(self, arrowstyle=None, **kwargs):
         """
-        Set the arrow style. Old attributes are forgotten. Without arguments
-        (or with ``arrowstyle=None``) returns available box styles as a list of
-        strings.
+        Set the arrow style, possibly with further attributes.
+
+        Attributes from the previous arrow style are not reused.
+
+        Without argument (or with ``arrowstyle=None``), the available box
+        styles are returned as a human-readable string.
 
         Parameters
         ----------
-        arrowstyle : None or ArrowStyle or str, default: None
-            Can be a string with arrowstyle name with optional comma-separated
-            attributes, e.g.::
+        arrowstyle : str or `matplotlib.patches.ArrowStyle`
+            The style of the arrow: either a `.ArrowStyle` instance, or a
+            string, which is the style name and optionally comma separated
+            attributes (e.g. "Fancy,head_length=0.2"). Such a string is used to
+            construct a `.ArrowStyle` object, as documented in that class.
 
-                set_arrowstyle("Fancy,head_length=0.2")
+            The following arrow styles are available:
 
-            Alternatively attributes can be provided as keywords, e.g.::
+            %(ArrowStyle:table_and_accepts)s
 
-                set_arrowstyle("fancy", head_length=0.2)
+        **kwargs
+            Additional attributes for the arrow style. See the table above for
+            supported parameters.
 
-        """
+        Examples
+        --------
+        ::
 
+            set_arrowstyle("Fancy,head_length=0.2")
+            set_arrowstyle("fancy", head_length=0.2)
+        """
         if arrowstyle is None:
             return ArrowStyle.pprint_styles()
-
-        if isinstance(arrowstyle, ArrowStyle._Base):
-            self._arrow_transmuter = arrowstyle
-        else:
-            self._arrow_transmuter = ArrowStyle(arrowstyle, **kw)
+        self._arrow_transmuter = (
+            ArrowStyle(arrowstyle, **kwargs)
+            if isinstance(arrowstyle, str) else arrowstyle)
         self.stale = True
 
     def get_arrowstyle(self):
@@ -4192,17 +4411,15 @@ def get_mutation_aspect(self):
                 else 1)  # backcompat.
 
     def get_path(self):
-        """
-        Return the path of the arrow in the data coordinates. Use
-        get_path_in_displaycoord() method to retrieve the arrow path
-        in display coordinates.
-        """
-        _path, fillable = self.get_path_in_displaycoord()
+        """Return the path of the arrow in the data coordinates."""
+        # The path is generated in display coordinates, then converted back to
+        # data coordinates.
+        _path, fillable = self._get_path_in_displaycoord()
         if np.iterable(fillable):
             _path = Path.make_compound_path(*_path)
         return self.get_transform().inverted().transform_path(_path)
 
-    def get_path_in_displaycoord(self):
+    def _get_path_in_displaycoord(self):
         """Return the mutated path of the arrow in display coordinates."""
         dpi_cor = self._dpi_cor
 
@@ -4227,29 +4444,30 @@ def get_path_in_displaycoord(self):
 
         return _path, fillable
 
+    get_path_in_displaycoord = _api.deprecate_privatize_attribute(
+        "3.5",
+        alternative="self.get_transform().transform_path(self.get_path())")
+
     def draw(self, renderer):
         if not self.get_visible():
             return
 
-        with self._bind_draw_path_function(renderer) as draw_path:
-
-            # FIXME : dpi_cor is for the dpi-dependency of the linewidth. There
-            # could be room for improvement.  Maybe get_path_in_displaycoord
-            # could take a renderer argument, but get_path should be adapted
-            # too.
-            self._dpi_cor = renderer.points_to_pixels(1.)
-            path, fillable = self.get_path_in_displaycoord()
+        # FIXME: dpi_cor is for the dpi-dependency of the linewidth.  There
+        # could be room for improvement.  Maybe _get_path_in_displaycoord could
+        # take a renderer argument, but get_path should be adapted too.
+        self._dpi_cor = renderer.points_to_pixels(1.)
+        path, fillable = self._get_path_in_displaycoord()
 
-            if not np.iterable(fillable):
-                path = [path]
-                fillable = [fillable]
+        if not np.iterable(fillable):
+            path = [path]
+            fillable = [fillable]
 
-            affine = transforms.IdentityTransform()
+        affine = transforms.IdentityTransform()
 
-            for p, f in zip(path, fillable):
-                draw_path(
-                    p, affine,
-                    self._facecolor if f and self._facecolor[3] else None)
+        self._draw_paths_with_artist_properties(
+            renderer,
+            [(p, affine, self._facecolor if f and self._facecolor[3] else None)
+             for p, f in zip(path, fillable)])
 
 
 class ConnectionPatch(FancyArrowPatch):
@@ -4259,8 +4477,8 @@ def __str__(self):
         return "ConnectionPatch((%g, %g), (%g, %g))" % \
                (self.xy1[0], self.xy1[1], self.xy2[0], self.xy2[1])
 
-    @docstring.dedent_interpd
-    @_api.delete_parameter("3.4", "dpi_cor")
+    @_docstring.dedent_interpd
+    @_api.make_keyword_only("3.6", name="axesA")
     def __init__(self, xyA, xyB, coordsA, coordsB=None,
                  axesA=None, axesB=None,
                  arrowstyle="-",
@@ -4272,7 +4490,6 @@ def __init__(self, xyA, xyB, coordsA, coordsB=None,
                  mutation_scale=10.,
                  mutation_aspect=None,
                  clip_on=False,
-                 dpi_cor=1.,
                  **kwargs):
         """
         Connect point *xyA* in *coordsA* with point *xyB* in *coordsB*.
@@ -4362,8 +4579,6 @@ def __init__(self, xyA, xyB, coordsA, coordsB=None,
                          mutation_aspect=mutation_aspect,
                          clip_on=clip_on,
                          **kwargs)
-        self._dpi_cor = dpi_cor
-
         # if True, draw annotation only if self.xy is inside the axes
         self._annotation_clip = None
 
@@ -4426,18 +4641,16 @@ def _get_xy(self, xy, s, axes=None):
 
     def set_annotation_clip(self, b):
         """
-        Set the clipping behavior.
+        Set the annotation's clipping behavior.
 
         Parameters
         ----------
         b : bool or None
-
-            - *False*: The annotation will always be drawn regardless of its
-              position.
-            - *True*: The annotation will only be drawn if ``self.xy`` is
-              inside the axes.
-            - *None*: The annotation will only be drawn if ``self.xy`` is
-              inside the axes and  ``self.xycoords == "data"``.
+            - True: The annotation will be clipped when ``self.xy`` is
+              outside the axes.
+            - False: The annotation will always be drawn.
+            - None: The annotation will be clipped when ``self.xy`` is
+              outside the axes and ``self.xycoords == "data"``.
         """
         self._annotation_clip = b
         self.stale = True
@@ -4450,7 +4663,7 @@ def get_annotation_clip(self):
         """
         return self._annotation_clip
 
-    def get_path_in_displaycoord(self):
+    def _get_path_in_displaycoord(self):
         """Return the mutated path of the arrow in display coordinates."""
         dpi_cor = self._dpi_cor
         posA = self._get_xy(self.xy1, self.coords1, self.axesA)
diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py
index 475db80c42ef..75566cdddcb1 100644
--- a/lib/matplotlib/path.py
+++ b/lib/matplotlib/path.py
@@ -9,6 +9,7 @@
 visualisation.
 """
 
+import copy
 from functools import lru_cache
 from weakref import WeakValueDictionary
 
@@ -28,11 +29,11 @@ class Path:
     The underlying storage is made up of two parallel numpy arrays:
 
     - *vertices*: an Nx2 float array of vertices
-    - *codes*: an N-length uint8 array of vertex types, or None
+    - *codes*: an N-length uint8 array of path codes, or None
 
     These two arrays always have the same length in the first
     dimension.  For example, to represent a cubic curve, you must
-    provide three vertices as well as three codes ``CURVE3``.
+    provide three vertices and three ``CURVE4`` codes.
 
     The code types are:
 
@@ -108,7 +109,7 @@ def __init__(self, vertices, codes=None, _interpolation_steps=1,
             handled correctly by the Agg PathIterator and other consumers of
             path data, such as :meth:`iter_segments`.
         codes : array-like or None, optional
-            n-length array integers representing the codes of the path.
+            N-length array of integers representing the codes of the path.
             If not None, codes must be the same length as vertices.
             If None, *vertices* will be treated as a series of line segments.
         _interpolation_steps : int, optional
@@ -161,7 +162,7 @@ def __init__(self, vertices, codes=None, _interpolation_steps=1,
     @classmethod
     def _fast_from_codes_and_verts(cls, verts, codes, internals_from=None):
         """
-        Creates a Path instance without the expense of calling the constructor.
+        Create a Path instance without the expense of calling the constructor.
 
         Parameters
         ----------
@@ -187,6 +188,17 @@ def _fast_from_codes_and_verts(cls, verts, codes, internals_from=None):
             pth._interpolation_steps = 1
         return pth
 
+    @classmethod
+    def _create_closed(cls, vertices):
+        """
+        Create a closed polygonal path going through *vertices*.
+
+        Unlike ``Path(..., closed=True)``, *vertices* should **not** end with
+        an entry for the CLOSEPATH; this entry is added by `._create_closed`.
+        """
+        v = _to_unmasked_float_array(vertices)
+        return cls(np.concatenate([v, v[:1]]), closed=True)
+
     def _update_values(self):
         self._simplify_threshold = mpl.rcParams['path.simplify_threshold']
         self._should_simplify = (
@@ -217,7 +229,7 @@ def codes(self):
         code is one of `STOP`, `MOVETO`, `LINETO`, `CURVE3`, `CURVE4`
         or `CLOSEPOLY`.  For codes that correspond to more than one
         vertex (`CURVE3` and `CURVE4`), that code will be repeated so
-        that the length of `self.vertices` and `self.codes` is always
+        that the length of `vertices` and `codes` is always
         the same.
         """
         return self._codes
@@ -259,28 +271,22 @@ def readonly(self):
         """
         return self._readonly
 
-    def __copy__(self):
+    def copy(self):
         """
         Return a shallow copy of the `Path`, which will share the
         vertices and codes with the source `Path`.
         """
-        import copy
         return copy.copy(self)
 
-    copy = __copy__
-
     def __deepcopy__(self, memo=None):
         """
         Return a deepcopy of the `Path`.  The `Path` will not be
         readonly, even if the source `Path` is.
         """
-        try:
-            codes = self.codes.copy()
-        except AttributeError:
-            codes = None
-        return self.__class__(
-            self.vertices.copy(), codes,
-            _interpolation_steps=self._interpolation_steps)
+        # Deepcopying arrays (vertices, codes) strips the writeable=False flag.
+        p = copy.deepcopy(super(), memo)
+        p._readonly = False
+        return p
 
     deepcopy = __deepcopy__
 
@@ -290,7 +296,7 @@ def make_compound_path_from_polys(cls, XY):
         Make a compound path object to draw a number
         of polygons with equal numbers of sides XY is a (numpolys x
         numsides x 2) numpy array of vertices.  Return object is a
-        :class:`Path`
+        :class:`Path`.
 
         .. plot:: gallery/misc/histogram_path.py
 
@@ -316,8 +322,8 @@ def make_compound_path_from_polys(cls, XY):
     @classmethod
     def make_compound_path(cls, *args):
         """
-        Make a compound path from a list of Path objects. Blindly removes all
-        Path.STOP control points.
+        Make a compound path from a list of `Path` objects. Blindly removes
+        all `Path.STOP` control points.
         """
         # Handle an empty list in args (i.e. no args).
         if not args:
@@ -458,9 +464,8 @@ def iter_bezier(self, **kwargs):
                 raise ValueError("Invalid Path.code_type: " + str(code))
             prev_vert = verts[-2:]
 
-    @_api.delete_parameter("3.3", "quantize")
     def cleaned(self, transform=None, remove_nans=False, clip=None,
-                quantize=False, simplify=False, curves=False,
+                *, simplify=False, curves=False,
                 stroke_width=1.0, snap=False, sketch=None):
         """
         Return a new Path with vertices and codes cleaned according to the
@@ -920,8 +925,8 @@ def unit_circle_righthalf(cls):
     @classmethod
     def arc(cls, theta1, theta2, n=None, is_wedge=False):
         """
-        Return the unit circle arc from angles *theta1* to *theta2* (in
-        degrees).
+        Return a `Path` for the unit circle arc from angles *theta1* to
+        *theta2* (in degrees).
 
         *theta2* is unwrapped to produce the shortest arc within 360 degrees.
         That is, if *theta2* > *theta1* + 360, the arc will be from *theta1* to
@@ -999,8 +1004,8 @@ def arc(cls, theta1, theta2, n=None, is_wedge=False):
     @classmethod
     def wedge(cls, theta1, theta2, n=None):
         """
-        Return the unit circle wedge from angles *theta1* to *theta2* (in
-        degrees).
+        Return a `Path` for the unit circle wedge from angles *theta1* to
+        *theta2* (in degrees).
 
         *theta2* is unwrapped to produce the shortest wedge within 360 degrees.
         That is, if *theta2* > *theta1* + 360, the wedge will be from *theta1*
@@ -1045,18 +1050,18 @@ def clip_to_bbox(self, bbox, inside=True):
 def get_path_collection_extents(
         master_transform, paths, transforms, offsets, offset_transform):
     r"""
-    Given a sequence of `Path`\s, `~.Transform`\s objects, and offsets, as
-    found in a `~.PathCollection`, returns the bounding box that encapsulates
+    Given a sequence of `Path`\s, `.Transform`\s objects, and offsets, as
+    found in a `.PathCollection`, returns the bounding box that encapsulates
     all of them.
 
     Parameters
     ----------
-    master_transform : `~.Transform`
+    master_transform : `.Transform`
         Global transformation applied to all paths.
     paths : list of `Path`
-    transforms : list of `~.Affine2D`
+    transforms : list of `.Affine2D`
     offsets : (N, 2) array-like
-    offset_transform : `~.Affine2D`
+    offset_transform : `.Affine2D`
         Transform applied to the offsets before offsetting the path.
 
     Notes
diff --git a/lib/matplotlib/patheffects.py b/lib/matplotlib/patheffects.py
index fb66df43f0fb..191f62b8d2be 100644
--- a/lib/matplotlib/patheffects.py
+++ b/lib/matplotlib/patheffects.py
@@ -1,6 +1,6 @@
 """
-Defines classes for path effects. The path effects are supported in `~.Text`,
-`~.Line2D` and `~.Patch`.
+Defines classes for path effects. The path effects are supported in `.Text`,
+`.Line2D` and `.Patch`.
 
 .. seealso::
    :doc:`/tutorials/advanced/patheffects_guide`
@@ -232,7 +232,6 @@ def __init__(self, offset=(2, -2),
             The shadow color.
         alpha : float, default: 0.3
             The alpha transparency of the created shadow patch.
-            http://matplotlib.1069221.n5.nabble.com/path-effects-question-td27630.html
         rho : float, default: 0.3
             A scale factor to apply to the rgbFace color if *shadow_rgbFace*
             is not specified.
diff --git a/lib/matplotlib/projections/__init__.py b/lib/matplotlib/projections/__init__.py
index 556273803665..16a5651da1d1 100644
--- a/lib/matplotlib/projections/__init__.py
+++ b/lib/matplotlib/projections/__init__.py
@@ -1,4 +1,58 @@
-from .. import axes, docstring
+"""
+Non-separable transforms that map from data space to screen space.
+
+Projections are defined as `~.axes.Axes` subclasses.  They include the
+following elements:
+
+- A transformation from data coordinates into display coordinates.
+
+- An inverse of that transformation.  This is used, for example, to convert
+  mouse positions from screen space back into data space.
+
+- Transformations for the gridlines, ticks and ticklabels.  Custom projections
+  will often need to place these elements in special locations, and Matplotlib
+  has a facility to help with doing so.
+
+- Setting up default values (overriding `~.axes.Axes.cla`), since the defaults
+  for a rectilinear axes may not be appropriate.
+
+- Defining the shape of the axes, for example, an elliptical axes, that will be
+  used to draw the background of the plot and for clipping any data elements.
+
+- Defining custom locators and formatters for the projection.  For example, in
+  a geographic projection, it may be more convenient to display the grid in
+  degrees, even if the data is in radians.
+
+- Set up interactive panning and zooming.  This is left as an "advanced"
+  feature left to the reader, but there is an example of this for polar plots
+  in `matplotlib.projections.polar`.
+
+- Any additional methods for additional convenience or features.
+
+Once the projection axes is defined, it can be used in one of two ways:
+
+- By defining the class attribute ``name``, the projection axes can be
+  registered with `matplotlib.projections.register_projection` and subsequently
+  simply invoked by name::
+
+      fig.add_subplot(projection="my_proj_name")
+
+- For more complex, parameterisable projections, a generic "projection" object
+  may be defined which includes the method ``_as_mpl_axes``. ``_as_mpl_axes``
+  should take no arguments and return the projection's axes subclass and a
+  dictionary of additional arguments to pass to the subclass' ``__init__``
+  method.  Subsequently a parameterised projection can be initialised with::
+
+      fig.add_subplot(projection=MyProjection(param1=param1_value))
+
+  where MyProjection is an object which implements a ``_as_mpl_axes`` method.
+
+A full-fledged and heavily annotated example is in
+:doc:`/gallery/misc/custom_projection`.  The polar plot functionality in
+`matplotlib.projections.polar` may also be of interest.
+"""
+
+from .. import axes, _docstring
 from .geo import AitoffAxes, HammerAxes, LambertAxes, MollweideAxes
 from .polar import PolarAxes
 from mpl_toolkits.mplot3d import Axes3D
@@ -57,4 +111,4 @@ def get_projection_class(projection=None):
 
 
 get_projection_names = projection_registry.get_projection_names
-docstring.interpd.update(projection_names=get_projection_names())
+_docstring.interpd.update(projection_names=get_projection_names())
diff --git a/lib/matplotlib/projections/geo.py b/lib/matplotlib/projections/geo.py
index 4aa374c5d75d..c9eaaea703e7 100644
--- a/lib/matplotlib/projections/geo.py
+++ b/lib/matplotlib/projections/geo.py
@@ -1,6 +1,7 @@
 import numpy as np
 
-from matplotlib import _api, rcParams
+import matplotlib as mpl
+from matplotlib import _api
 from matplotlib.axes import Axes
 import matplotlib.axis as maxis
 from matplotlib.patches import Circle
@@ -36,8 +37,9 @@ def _init_axis(self):
         # self.spines['geo'].register_axis(self.yaxis)
         self._update_transScale()
 
-    def cla(self):
-        super().cla()
+    def clear(self):
+        # docstring inherited
+        super().clear()
 
         self.set_longitude_grid(30)
         self.set_latitude_grid(15)
@@ -50,7 +52,7 @@ def cla(self):
         # Why do we need to turn on yaxis tick labels, but
         # xaxis tick labels are already on?
 
-        self.grid(rcParams['axes.grid'])
+        self.grid(mpl.rcParams['axes.grid'])
 
         Axes.set_xlim(self, -np.pi, np.pi)
         Axes.set_ylim(self, -np.pi / 2.0, np.pi / 2.0)
@@ -147,6 +149,7 @@ def set_yscale(self, *args, **kwargs):
     set_xscale = set_yscale
 
     def set_xlim(self, *args, **kwargs):
+        """Not supported. Please consider using Cartopy."""
         raise TypeError("Changing axes limits of a geographic projection is "
                         "not supported.  Please consider using Cartopy.")
 
@@ -155,14 +158,8 @@ def set_xlim(self, *args, **kwargs):
     def format_coord(self, lon, lat):
         """Return a format string formatting the coordinate."""
         lon, lat = np.rad2deg([lon, lat])
-        if lat >= 0.0:
-            ns = 'N'
-        else:
-            ns = 'S'
-        if lon >= 0.0:
-            ew = 'E'
-        else:
-            ew = 'W'
+        ns = 'N' if lat >= 0.0 else 'S'
+        ew = 'E' if lon >= 0.0 else 'W'
         return ('%f\N{DEGREE SIGN}%s, %f\N{DEGREE SIGN}%s'
                 % (abs(lat), ns, abs(lon), ew))
 
@@ -289,7 +286,7 @@ def __init__(self, *args, **kwargs):
         self._longitude_cap = np.pi / 2.0
         super().__init__(*args, **kwargs)
         self.set_aspect(0.5, adjustable='box', anchor='C')
-        self.cla()
+        self.clear()
 
     def _get_core_transform(self, resolution):
         return self.AitoffTransform(resolution)
@@ -334,7 +331,7 @@ def __init__(self, *args, **kwargs):
         self._longitude_cap = np.pi / 2.0
         super().__init__(*args, **kwargs)
         self.set_aspect(0.5, adjustable='box', anchor='C')
-        self.cla()
+        self.clear()
 
     def _get_core_transform(self, resolution):
         return self.HammerTransform(resolution)
@@ -404,7 +401,7 @@ def __init__(self, *args, **kwargs):
         self._longitude_cap = np.pi / 2.0
         super().__init__(*args, **kwargs)
         self.set_aspect(0.5, adjustable='box', anchor='C')
-        self.cla()
+        self.clear()
 
     def _get_core_transform(self, resolution):
         return self.MollweideTransform(resolution)
@@ -489,10 +486,11 @@ def __init__(self, *args, center_longitude=0, center_latitude=0, **kwargs):
         self._center_latitude = center_latitude
         super().__init__(*args, **kwargs)
         self.set_aspect('equal', adjustable='box', anchor='C')
-        self.cla()
+        self.clear()
 
-    def cla(self):
-        super().cla()
+    def clear(self):
+        # docstring inherited
+        super().clear()
         self.yaxis.set_major_formatter(NullFormatter())
 
     def _get_core_transform(self, resolution):
diff --git a/lib/matplotlib/projections/polar.py b/lib/matplotlib/projections/polar.py
index 41b13ee808cc..f5c42d4e7bed 100644
--- a/lib/matplotlib/projections/polar.py
+++ b/lib/matplotlib/projections/polar.py
@@ -1,9 +1,10 @@
-from collections import OrderedDict
+import math
 import types
 
 import numpy as np
 
-from matplotlib import _api, cbook, rcParams
+import matplotlib as mpl
+from matplotlib import _api, cbook
 from matplotlib.axes import Axes
 import matplotlib.axis as maxis
 import matplotlib.markers as mmarkers
@@ -11,16 +12,21 @@
 from matplotlib.path import Path
 import matplotlib.ticker as mticker
 import matplotlib.transforms as mtransforms
-import matplotlib.spines as mspines
+from matplotlib.spines import Spine
 
 
 class PolarTransform(mtransforms.Transform):
     """
-    The base polar transform.  This handles projection *theta* and
-    *r* into Cartesian coordinate space *x* and *y*, but does not
-    perform the ultimate affine transformation into the correct
-    position.
+    The base polar transform.
+
+    This transform maps polar coordinates ``(theta, r)`` into Cartesian
+    coordinates ``(x, y) = (r * cos(theta), r * sin(theta))`` (but does not
+    handle positioning in screen space).
+
+    Path segments at a fixed radius are automatically transformed to circular
+    arcs as long as ``path._interpolation_steps > 1``.
     """
+
     input_dims = output_dims = 2
 
     def __init__(self, axis=None, use_rmin=True,
@@ -187,11 +193,12 @@ class ThetaFormatter(mticker.Formatter):
     Used to format the *theta* tick labels.  Converts the native
     unit of radians into degrees and adds a degree symbol.
     """
+
     def __call__(self, x, pos=None):
         vmin, vmax = self.axis.get_view_interval()
         d = np.rad2deg(abs(vmax - vmin))
         digits = max(-int(np.log10(d) - 1.5), 0)
-        # Use unicode rather than mathtext with \circ, so that it will work
+        # Use Unicode rather than mathtext with \circ, so that it will work
         # correctly with any arbitrary font (assuming it has a degree sign),
         # whereas $5\circ$ will only work correctly with one of the supported
         # math fonts (Computer Modern and STIX).
@@ -230,6 +237,7 @@ class ThetaLocator(mticker.Locator):
     view spans the entire circle. In such cases, the previously used default
     locations of every 45 degrees are returned.
     """
+
     def __init__(self, base):
         self.base = base
         self.axis = self.base.axis = _AxisWrapper(self.base.axis)
@@ -245,10 +253,6 @@ def __call__(self):
         else:
             return np.deg2rad(self.base())
 
-    @_api.deprecated("3.3")
-    def pan(self, numsteps):
-        return self.base.pan(numsteps)
-
     def refresh(self):
         # docstring inherited
         return self.base.refresh()
@@ -257,10 +261,6 @@ def view_limits(self, vmin, vmax):
         vmin, vmax = np.rad2deg((vmin, vmax))
         return np.deg2rad(self.base.view_limits(vmin, vmax))
 
-    @_api.deprecated("3.3")
-    def zoom(self, direction):
-        return self.base.zoom(direction)
-
 
 class ThetaTick(maxis.XTick):
     """
@@ -289,9 +289,8 @@ def __init__(self, axes, *args, **kwargs):
             rotation_mode='anchor',
             transform=self.label2.get_transform() + self._text2_translate)
 
-    def _apply_params(self, **kw):
-        super()._apply_params(**kw)
-
+    def _apply_params(self, **kwargs):
+        super()._apply_params(**kwargs)
         # Ensure transform is correct; sometimes this gets reset.
         trans = self.label1.get_transform()
         if not trans.contains_branch(self._text1_translate):
@@ -364,13 +363,7 @@ class ThetaAxis(maxis.XAxis):
     """
     __name__ = 'thetaaxis'
     axis_name = 'theta'  #: Read-only name identifying the axis.
-
-    def _get_tick(self, major):
-        if major:
-            tick_kw = self._major_tick_kw
-        else:
-            tick_kw = self._minor_tick_kw
-        return ThetaTick(self.axes, 0, major=major, **tick_kw)
+    _tick_class = ThetaTick
 
     def _wrap_locator_formatter(self):
         self.set_major_locator(ThetaLocator(self.get_major_locator()))
@@ -379,16 +372,20 @@ def _wrap_locator_formatter(self):
         self.isDefault_majfmt = True
 
     def clear(self):
+        # docstring inherited
         super().clear()
         self.set_ticks_position('none')
         self._wrap_locator_formatter()
 
-    @_api.deprecated("3.4", alternative="ThetaAxis.clear()")
-    def cla(self):
-        self.clear()
-
     def _set_scale(self, value, **kwargs):
+        if value != 'linear':
+            raise NotImplementedError(
+                "The xscale cannot be set on a polar plot")
         super()._set_scale(value, **kwargs)
+        # LinearScale.set_default_locators_and_formatters just set the major
+        # locator to be an AutoLocator, so we customize it here to have ticks
+        # at sensible degree multiples.
+        self.get_major_locator().set_params(steps=[1, 1.5, 3, 4.5, 9, 10])
         self._wrap_locator_formatter()
 
     def _copy_tick_props(self, src, dest):
@@ -408,41 +405,26 @@ class RadialLocator(mticker.Locator):
     """
     Used to locate radius ticks.
 
-    Ensures that all ticks are strictly positive.  For all other
-    tasks, it delegates to the base
-    :class:`~matplotlib.ticker.Locator` (which may be different
-    depending on the scale of the *r*-axis.
+    Ensures that all ticks are strictly positive.  For all other tasks, it
+    delegates to the base `.Locator` (which may be different depending on the
+    scale of the *r*-axis).
     """
 
     def __init__(self, base, axes=None):
         self.base = base
         self._axes = axes
 
+    def set_axis(self, axis):
+        self.base.set_axis(axis)
+
     def __call__(self):
-        show_all = True
         # Ensure previous behaviour with full circle non-annular views.
         if self._axes:
             if _is_full_circle_rad(*self._axes.viewLim.intervalx):
                 rorigin = self._axes.get_rorigin() * self._axes.get_rsign()
                 if self._axes.get_rmin() <= rorigin:
-                    show_all = False
-        if show_all:
-            return self.base()
-        else:
-            return [tick for tick in self.base() if tick > rorigin]
-
-    @_api.deprecated("3.3")
-    def pan(self, numsteps):
-        return self.base.pan(numsteps)
-
-    @_api.deprecated("3.3")
-    def zoom(self, direction):
-        return self.base.zoom(direction)
-
-    @_api.deprecated("3.3")
-    def refresh(self):
-        # docstring inherited
-        return self.base.refresh()
+                    return [tick for tick in self.base() if tick > rorigin]
+        return self.base()
 
     def nonsingular(self, vmin, vmax):
         # docstring inherited
@@ -667,32 +649,23 @@ class RadialAxis(maxis.YAxis):
     """
     __name__ = 'radialaxis'
     axis_name = 'radius'  #: Read-only name identifying the axis.
+    _tick_class = RadialTick
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.sticky_edges.y.append(0)
 
-    def _get_tick(self, major):
-        if major:
-            tick_kw = self._major_tick_kw
-        else:
-            tick_kw = self._minor_tick_kw
-        return RadialTick(self.axes, 0, major=major, **tick_kw)
-
     def _wrap_locator_formatter(self):
         self.set_major_locator(RadialLocator(self.get_major_locator(),
                                              self.axes))
         self.isDefault_majloc = True
 
     def clear(self):
+        # docstring inherited
         super().clear()
         self.set_ticks_position('none')
         self._wrap_locator_formatter()
 
-    @_api.deprecated("3.4", alternative="RadialAxis.clear()")
-    def cla(self):
-        self.clear()
-
     def _set_scale(self, value, **kwargs):
         super()._set_scale(value, **kwargs)
         self._wrap_locator_formatter()
@@ -790,10 +763,11 @@ def __init__(self, *args,
         super().__init__(*args, **kwargs)
         self.use_sticky_edges = True
         self.set_aspect('equal', adjustable='box', anchor='C')
-        self.cla()
+        self.clear()
 
-    def cla(self):
-        super().cla()
+    def clear(self):
+        # docstring inherited
+        super().clear()
 
         self.title.set_y(1.05)
 
@@ -805,7 +779,7 @@ def cla(self):
             end.set_visible(False)
         self.set_xlim(0.0, 2 * np.pi)
 
-        self.grid(rcParams['polaraxes.grid'])
+        self.grid(mpl.rcParams['polaraxes.grid'])
         inner = self.spines.get('inner', None)
         if inner:
             inner.set_visible(False)
@@ -945,9 +919,7 @@ def get_yaxis_text2_transform(self, pad):
             pad_shift = _ThetaShift(self, pad, 'min')
         return self._yaxis_text_transform + pad_shift, 'center', halign
 
-    @_api.delete_parameter("3.3", "args")
-    @_api.delete_parameter("3.3", "kwargs")
-    def draw(self, renderer, *args, **kwargs):
+    def draw(self, renderer):
         self._unstale_viewLim()
         thetamin, thetamax = np.rad2deg(self._realViewLim.intervalx)
         if thetamin > thetamax:
@@ -991,20 +963,18 @@ def draw(self, renderer, *args, **kwargs):
             self.yaxis.reset_ticks()
             self.yaxis.set_clip_path(self.patch)
 
-        super().draw(renderer, *args, **kwargs)
+        super().draw(renderer)
 
     def _gen_axes_patch(self):
         return mpatches.Wedge((0.5, 0.5), 0.5, 0.0, 360.0)
 
     def _gen_axes_spines(self):
-        spines = OrderedDict([
-            ('polar', mspines.Spine.arc_spine(self, 'top',
-                                              (0.5, 0.5), 0.5, 0.0, 360.0)),
-            ('start', mspines.Spine.linear_spine(self, 'left')),
-            ('end', mspines.Spine.linear_spine(self, 'right')),
-            ('inner', mspines.Spine.arc_spine(self, 'bottom',
-                                              (0.5, 0.5), 0.0, 0.0, 360.0))
-        ])
+        spines = {
+            'polar': Spine.arc_spine(self, 'top', (0.5, 0.5), 0.5, 0, 360),
+            'start': Spine.linear_spine(self, 'left'),
+            'end': Spine.linear_spine(self, 'right'),
+            'inner': Spine.arc_spine(self, 'bottom', (0.5, 0.5), 0.0, 0, 360),
+        }
         spines['polar'].set_transform(self.transWedge + self.transAxes)
         spines['inner'].set_transform(self.transWedge + self.transAxes)
         spines['start'].set_transform(self._yaxis_transform)
@@ -1040,30 +1010,21 @@ def set_thetalim(self, *args, **kwargs):
         where minval and maxval are the minimum and maximum limits. Values are
         wrapped in to the range :math:`[0, 2\pi]` (in radians), so for example
         it is possible to do ``set_thetalim(-np.pi / 2, np.pi / 2)`` to have
-        an axes symmetric around 0. A ValueError is raised if the absolute
-        angle difference is larger than :math:`2\pi`.
+        an axis symmetric around 0. A ValueError is raised if the absolute
+        angle difference is larger than a full circle.
         """
-        thetamin = None
-        thetamax = None
-        left = None
-        right = None
-
-        if len(args) == 2:
-            if args[0] is not None and args[1] is not None:
-                left, right = args
-                if abs(right - left) > 2 * np.pi:
-                    raise ValueError('The angle range must be <= 2 pi')
-
+        orig_lim = self.get_xlim()  # in radians
         if 'thetamin' in kwargs:
-            thetamin = np.deg2rad(kwargs.pop('thetamin'))
+            kwargs['xmin'] = np.deg2rad(kwargs.pop('thetamin'))
         if 'thetamax' in kwargs:
-            thetamax = np.deg2rad(kwargs.pop('thetamax'))
-
-        if thetamin is not None and thetamax is not None:
-            if abs(thetamax - thetamin) > 2 * np.pi:
-                raise ValueError('The angle range must be <= 360 degrees')
-        return tuple(np.rad2deg(self.set_xlim(left=left, right=right,
-                                              xmin=thetamin, xmax=thetamax)))
+            kwargs['xmax'] = np.deg2rad(kwargs.pop('thetamax'))
+        new_min, new_max = self.set_xlim(*args, **kwargs)
+        # Parsing all permutations of *args, **kwargs is tricky; it is simpler
+        # to let set_xlim() do it and then validate the limits.
+        if abs(new_max - new_min) > 2 * np.pi:
+            self.set_xlim(orig_lim)  # un-accept the change
+            raise ValueError("The angle range must be less than a full circle")
+        return tuple(np.rad2deg((new_min, new_max)))
 
     def set_theta_offset(self, offset):
         """
@@ -1197,9 +1158,17 @@ def get_rorigin(self):
     def get_rsign(self):
         return np.sign(self._originViewLim.y1 - self._originViewLim.y0)
 
+    @_api.make_keyword_only("3.6", "emit")
     def set_rlim(self, bottom=None, top=None, emit=True, auto=False, **kwargs):
         """
-        See `~.polar.PolarAxes.set_ylim`.
+        Set the radial axis view limits.
+
+        This function behaves like `.Axes.set_ylim`, but additionally supports
+        *rmin* and *rmax* as aliases for *bottom* and *top*.
+
+        See Also
+        --------
+        .Axes.set_ylim
         """
         if 'rmin' in kwargs:
             if bottom is None:
@@ -1216,58 +1185,6 @@ def set_rlim(self, bottom=None, top=None, emit=True, auto=False, **kwargs):
         return self.set_ylim(bottom=bottom, top=top, emit=emit, auto=auto,
                              **kwargs)
 
-    def set_ylim(self, bottom=None, top=None, emit=True, auto=False,
-                 *, ymin=None, ymax=None):
-        """
-        Set the data limits for the radial axis.
-
-        Parameters
-        ----------
-        bottom : float, optional
-            The bottom limit (default: None, which leaves the bottom
-            limit unchanged).
-            The bottom and top ylims may be passed as the tuple
-            (*bottom*, *top*) as the first positional argument (or as
-            the *bottom* keyword argument).
-
-        top : float, optional
-            The top limit (default: None, which leaves the top limit
-            unchanged).
-
-        emit : bool, default: True
-            Whether to notify observers of limit change.
-
-        auto : bool or None, default: False
-            Whether to turn on autoscaling of the y-axis. True turns on,
-            False turns off, None leaves unchanged.
-
-        ymin, ymax : float, optional
-            These arguments are deprecated and will be removed in a future
-            version.  They are equivalent to *bottom* and *top* respectively,
-            and it is an error to pass both *ymin* and *bottom* or
-            *ymax* and *top*.
-
-        Returns
-        -------
-        bottom, top : (float, float)
-            The new y-axis limits in data coordinates.
-        """
-        if ymin is not None:
-            if bottom is not None:
-                raise ValueError('Cannot supply both positional "bottom" '
-                                 'argument and kwarg "ymin"')
-            else:
-                bottom = ymin
-        if ymax is not None:
-            if top is not None:
-                raise ValueError('Cannot supply both positional "top" '
-                                 'argument and kwarg "ymax"')
-            else:
-                top = ymax
-        if top is None and np.iterable(bottom):
-            bottom, top = bottom[0], bottom[1]
-        return super().set_ylim(bottom=bottom, top=top, emit=emit, auto=auto)
-
     def get_rlabel_position(self):
         """
         Returns
@@ -1328,7 +1245,7 @@ def set_thetagrids(self, angles, labels=None, fmt=None, **kwargs):
         Other Parameters
         ----------------
         **kwargs
-            *kwargs* are optional `~.Text` properties for the labels.
+            *kwargs* are optional `.Text` properties for the labels.
 
         See Also
         --------
@@ -1346,7 +1263,7 @@ def set_thetagrids(self, angles, labels=None, fmt=None, **kwargs):
         elif fmt is not None:
             self.xaxis.set_major_formatter(mticker.FormatStrFormatter(fmt))
         for t in self.xaxis.get_ticklabels():
-            t.update(kwargs)
+            t._internal_update(kwargs)
         return self.xaxis.get_ticklines(), self.xaxis.get_ticklabels()
 
     def set_rgrids(self, radii, labels=None, angle=None, fmt=None, **kwargs):
@@ -1380,7 +1297,7 @@ def set_rgrids(self, radii, labels=None, angle=None, fmt=None, **kwargs):
         Other Parameters
         ----------------
         **kwargs
-            *kwargs* are optional `~.Text` properties for the labels.
+            *kwargs* are optional `.Text` properties for the labels.
 
         See Also
         --------
@@ -1401,21 +1318,39 @@ def set_rgrids(self, radii, labels=None, angle=None, fmt=None, **kwargs):
             angle = self.get_rlabel_position()
         self.set_rlabel_position(angle)
         for t in self.yaxis.get_ticklabels():
-            t.update(kwargs)
+            t._internal_update(kwargs)
         return self.yaxis.get_gridlines(), self.yaxis.get_ticklabels()
 
-    def set_xscale(self, scale, *args, **kwargs):
-        if scale != 'linear':
-            raise NotImplementedError(
-                "You can not set the xscale on a polar plot.")
-
     def format_coord(self, theta, r):
         # docstring inherited
+        screen_xy = self.transData.transform((theta, r))
+        screen_xys = screen_xy + np.stack(
+            np.meshgrid([-1, 0, 1], [-1, 0, 1])).reshape((2, -1)).T
+        ts, rs = self.transData.inverted().transform(screen_xys).T
+        delta_t = abs((ts - theta + np.pi) % (2 * np.pi) - np.pi).max()
+        delta_t_halfturns = delta_t / np.pi
+        delta_t_degrees = delta_t_halfturns * 180
+        delta_r = abs(rs - r).max()
         if theta < 0:
             theta += 2 * np.pi
-        theta /= np.pi
-        return ('\N{GREEK SMALL LETTER THETA}=%0.3f\N{GREEK SMALL LETTER PI} '
-                '(%0.3f\N{DEGREE SIGN}), r=%0.3f') % (theta, theta * 180.0, r)
+        theta_halfturns = theta / np.pi
+        theta_degrees = theta_halfturns * 180
+
+        # See ScalarFormatter.format_data_short.  For r, use #g-formatting
+        # (as for linear axes), but for theta, use f-formatting as scientific
+        # notation doesn't make sense and the trailing dot is ugly.
+        def format_sig(value, delta, opt, fmt):
+            # For "f", only count digits after decimal point.
+            prec = (max(0, -math.floor(math.log10(delta))) if fmt == "f" else
+                    cbook._g_sig_digits(value, delta))
+            return f"{value:-{opt}.{prec}{fmt}}"
+
+        return ('\N{GREEK SMALL LETTER THETA}={}\N{GREEK SMALL LETTER PI} '
+                '({}\N{DEGREE SIGN}), r={}').format(
+                    format_sig(theta_halfturns, delta_t_halfturns, "", "f"),
+                    format_sig(theta_degrees, delta_t_degrees, "", "f"),
+                    format_sig(r, delta_r, "#", "g"),
+                )
 
     def get_data_ratio(self):
         """
@@ -1495,9 +1430,12 @@ def drag_pan(self, button, key, x, y):
             self.set_rmax(p.rmax / scale)
 
 
-# to keep things all self contained, we can put aliases to the Polar classes
+# To keep things all self-contained, we can put aliases to the Polar classes
 # defined above. This isn't strictly necessary, but it makes some of the
-# code more readable (and provides a backwards compatible Polar API)
+# code more readable, and provides a backwards compatible Polar API. In
+# particular, this is used by the :doc:`/gallery/specialty_plots/radar_chart`
+# example to override PolarTransform on a PolarAxes subclass, so make sure that
+# that example is unaffected before changing this.
 PolarAxes.PolarTransform = PolarTransform
 PolarAxes.PolarAffine = PolarAffine
 PolarAxes.InvertedPolarTransform = InvertedPolarTransform
diff --git a/lib/matplotlib/pylab.py b/lib/matplotlib/pylab.py
index 6b9f89d29ead..a9e30cfcd185 100644
--- a/lib/matplotlib/pylab.py
+++ b/lib/matplotlib/pylab.py
@@ -17,7 +17,7 @@
 
 from matplotlib.dates import (
     date2num, num2date, datestr2num, drange, epoch2num,
-    num2epoch, DateFormatter, IndexDateFormatter, DateLocator,
+    num2epoch, DateFormatter, DateLocator,
     RRuleLocator, YearLocator, MonthLocator, WeekdayLocator, DayLocator,
     HourLocator, MinuteLocator, SecondLocator, rrule, MO, TU, WE, TH, FR,
     SA, SU, YEARLY, MONTHLY, WEEKLY, DAILY, HOURLY, MINUTELY, SECONDLY,
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
index 86f6e9f8795d..6f757ae031ef 100644
--- a/lib/matplotlib/pyplot.py
+++ b/lib/matplotlib/pyplot.py
@@ -3,7 +3,8 @@
 
 """
 `matplotlib.pyplot` is a state-based interface to matplotlib. It provides
-a MATLAB-like way of plotting.
+an implicit,  MATLAB-like, way of plotting.  It also opens figures on your
+screen, and acts as the figure GUI manager.
 
 pyplot is mainly intended for interactive plots and simple cases of
 programmatic plot generation::
@@ -15,9 +16,27 @@
     y = np.sin(x)
     plt.plot(x, y)
 
-The object-oriented API is recommended for more complex plots.
+The explicit object-oriented API is recommended for complex plots, though
+pyplot is still usually used to create the figure and often the axes in the
+figure. See `.pyplot.figure`, `.pyplot.subplots`, and
+`.pyplot.subplot_mosaic` to create figures, and
+:doc:`Axes API </api/axes_api>` for the plotting methods on an Axes::
+
+    import numpy as np
+    import matplotlib.pyplot as plt
+
+    x = np.arange(0, 5, 0.1)
+    y = np.sin(x)
+    fig, ax = plt.subplots()
+    ax.plot(x, y)
+
+
+See :ref:`api_interfaces` for an explanation of the tradeoffs between the
+implicit and explicit interfaces.
 """
 
+from contextlib import ExitStack
+from enum import Enum
 import functools
 import importlib
 import inspect
@@ -25,11 +44,8 @@
 from numbers import Number
 import re
 import sys
+import threading
 import time
-try:
-    import threading
-except ImportError:
-    import dummy_threading as threading
 
 from cycler import cycler
 import matplotlib
@@ -39,9 +55,9 @@
 from matplotlib import rcsetup, style
 from matplotlib import _pylab_helpers, interactive
 from matplotlib import cbook
-from matplotlib import docstring
+from matplotlib import _docstring
 from matplotlib.backend_bases import FigureCanvasBase, MouseButton
-from matplotlib.figure import Figure, figaspect
+from matplotlib.figure import Figure, FigureBase, figaspect
 from matplotlib.gridspec import GridSpec, SubplotSpec
 from matplotlib import rcParams, rcParamsDefault, get_backend, rcParamsOrig
 from matplotlib.rcsetup import interactive_bk as _interactive_bk
@@ -52,7 +68,8 @@
 from matplotlib.scale import get_scale_names
 
 from matplotlib import cm
-from matplotlib.cm import get_cmap, register_cmap
+from matplotlib.cm import _colormaps as colormaps, register_cmap
+from matplotlib.colors import _color_sequences as color_sequences
 
 import numpy as np
 
@@ -61,7 +78,7 @@
 from matplotlib.lines import Line2D
 from matplotlib.text import Text, Annotation
 from matplotlib.patches import Polygon, Rectangle, Circle, Arrow
-from matplotlib.widgets import SubplotTool, Button, Slider, Widget
+from matplotlib.widgets import Button, Slider, Widget
 
 from .ticker import (
     TickHelper, Formatter, FixedFormatter, NullFormatter, FuncFormatter,
@@ -72,30 +89,17 @@
 _log = logging.getLogger(__name__)
 
 
-_code_objs = {
-    _api.rename_parameter:
-        _api.rename_parameter("", "old", "new", lambda new: None).__code__,
-    _api.make_keyword_only:
-        _api.make_keyword_only("", "p", lambda p: None).__code__,
-}
-
-
 def _copy_docstring_and_deprecators(method, func=None):
     if func is None:
         return functools.partial(_copy_docstring_and_deprecators, method)
-    decorators = [docstring.copy(method)]
+    decorators = [_docstring.copy(method)]
     # Check whether the definition of *method* includes @_api.rename_parameter
     # or @_api.make_keyword_only decorators; if so, propagate them to the
     # pyplot wrapper as well.
     while getattr(method, "__wrapped__", None) is not None:
-        for decorator_maker, code in _code_objs.items():
-            if method.__code__ is code:
-                kwargs = {
-                    k: v.cell_contents
-                    for k, v in zip(code.co_freevars, method.__closure__)}
-                assert kwargs["func"] is method.__wrapped__
-                kwargs.pop("func")
-                decorators.append(decorator_maker(**kwargs))
+        decorator = _api.deprecation.DECORATORS.get(method)
+        if decorator:
+            decorators.append(decorator)
         method = method.__wrapped__
     for decorator in decorators[::-1]:
         func = decorator(func)
@@ -105,99 +109,67 @@ def _copy_docstring_and_deprecators(method, func=None):
 ## Global ##
 
 
-_IP_REGISTERED = None
-_INSTALL_FIG_OBSERVER = False
+# The state controlled by {,un}install_repl_displayhook().
+_ReplDisplayHook = Enum("_ReplDisplayHook", ["NONE", "PLAIN", "IPYTHON"])
+_REPL_DISPLAYHOOK = _ReplDisplayHook.NONE
+
+
+def _draw_all_if_interactive():
+    if matplotlib.is_interactive():
+        draw_all()
 
 
 def install_repl_displayhook():
     """
-    Install a repl display hook so that any stale figure are automatically
-    redrawn when control is returned to the repl.
+    Connect to the display hook of the current shell.
+
+    The display hook gets called when the read-evaluate-print-loop (REPL) of
+    the shell has finished the execution of a command. We use this callback
+    to be able to automatically update a figure in interactive mode.
 
     This works both with IPython and with vanilla python shells.
     """
-    global _IP_REGISTERED
-    global _INSTALL_FIG_OBSERVER
-
-    class _NotIPython(Exception):
-        pass
-
-    # see if we have IPython hooks around, if use them
-
-    try:
-        if 'IPython' in sys.modules:
-            from IPython import get_ipython
-            ip = get_ipython()
-            if ip is None:
-                raise _NotIPython()
-
-            if _IP_REGISTERED:
-                return
-
-            def post_execute():
-                if matplotlib.is_interactive():
-                    draw_all()
+    global _REPL_DISPLAYHOOK
 
-            # IPython >= 2
-            try:
-                ip.events.register('post_execute', post_execute)
-            except AttributeError:
-                # IPython 1.x
-                ip.register_post_execute(post_execute)
+    if _REPL_DISPLAYHOOK is _ReplDisplayHook.IPYTHON:
+        return
 
-            _IP_REGISTERED = post_execute
-            _INSTALL_FIG_OBSERVER = False
+    # See if we have IPython hooks around, if so use them.
+    # Use ``sys.modules.get(name)`` rather than ``name in sys.modules`` as
+    # entries can also have been explicitly set to None.
+    mod_ipython = sys.modules.get("IPython")
+    if not mod_ipython:
+        _REPL_DISPLAYHOOK = _ReplDisplayHook.PLAIN
+        return
+    ip = mod_ipython.get_ipython()
+    if not ip:
+        _REPL_DISPLAYHOOK = _ReplDisplayHook.PLAIN
+        return
 
-            # trigger IPython's eventloop integration, if available
-            from IPython.core.pylabtools import backend2gui
-
-            ipython_gui_name = backend2gui.get(get_backend())
-            if ipython_gui_name:
-                ip.enable_gui(ipython_gui_name)
-        else:
-            _INSTALL_FIG_OBSERVER = True
+    ip.events.register("post_execute", _draw_all_if_interactive)
+    _REPL_DISPLAYHOOK = _ReplDisplayHook.IPYTHON
 
-    # import failed or ipython is not running
-    except (ImportError, _NotIPython):
-        _INSTALL_FIG_OBSERVER = True
+    from IPython.core.pylabtools import backend2gui
+    # trigger IPython's eventloop integration, if available
+    ipython_gui_name = backend2gui.get(get_backend())
+    if ipython_gui_name:
+        ip.enable_gui(ipython_gui_name)
 
 
 def uninstall_repl_displayhook():
-    """
-    Uninstall the matplotlib display hook.
-
-    .. warning::
-
-       Need IPython >= 2 for this to work.  For IPython < 2 will raise a
-       ``NotImplementedError``
-
-    .. warning::
-
-       If you are using vanilla python and have installed another
-       display hook this will reset ``sys.displayhook`` to what ever
-       function was there when matplotlib installed it's displayhook,
-       possibly discarding your changes.
-    """
-    global _IP_REGISTERED
-    global _INSTALL_FIG_OBSERVER
-    if _IP_REGISTERED:
+    """Disconnect from the display hook of the current shell."""
+    global _REPL_DISPLAYHOOK
+    if _REPL_DISPLAYHOOK is _ReplDisplayHook.IPYTHON:
         from IPython import get_ipython
         ip = get_ipython()
-        try:
-            ip.events.unregister('post_execute', _IP_REGISTERED)
-        except AttributeError as err:
-            raise NotImplementedError("Can not unregister events "
-                                      "in IPython < 2.0") from err
-        _IP_REGISTERED = None
-
-    if _INSTALL_FIG_OBSERVER:
-        _INSTALL_FIG_OBSERVER = False
+        ip.events.unregister("post_execute", _draw_all_if_interactive)
+    _REPL_DISPLAYHOOK = _ReplDisplayHook.NONE
 
 
 draw_all = _pylab_helpers.Gcf.draw_all
 
 
-@functools.wraps(matplotlib.set_loglevel)
+@_copy_docstring_and_deprecators(matplotlib.set_loglevel)
 def set_loglevel(*args, **kwargs):  # Ensure this appears in the pyplot docs.
     return matplotlib.set_loglevel(*args, **kwargs)
 
@@ -210,8 +182,30 @@ def findobj(o=None, match=None, include_self=True):
 
 
 def _get_required_interactive_framework(backend_mod):
-    return getattr(
-        backend_mod.FigureCanvas, "required_interactive_framework", None)
+    if not hasattr(getattr(backend_mod, "FigureCanvas", None),
+                   "required_interactive_framework"):
+        _api.warn_deprecated(
+            "3.6", name="Support for FigureCanvases without a "
+            "required_interactive_framework attribute")
+        return None
+    # Inline this once the deprecation elapses.
+    return backend_mod.FigureCanvas.required_interactive_framework
+
+_backend_mod = None
+
+
+def _get_backend_mod():
+    """
+    Ensure that a backend is selected and return it.
+
+    This is currently private, but may be made public in the future.
+    """
+    if _backend_mod is None:
+        # Use __getitem__ here to avoid going through the fallback logic (which
+        # will (re)import pyplot and then call switch_backend if we need to
+        # resolve the auto sentinel)
+        switch_backend(dict.__getitem__(rcParams, "backend"))
+    return _backend_mod
 
 
 def switch_backend(newbackend):
@@ -234,9 +228,9 @@ def switch_backend(newbackend):
 
     if newbackend is rcsetup._auto_backend_sentinel:
         current_framework = cbook._get_running_interactive_framework()
-        mapping = {'qt5': 'qt5agg',
-                   'qt4': 'qt4agg',
+        mapping = {'qt': 'qtagg',
                    'gtk3': 'gtk3agg',
+                   'gtk4': 'gtk4agg',
                    'wx': 'wxagg',
                    'tk': 'tkagg',
                    'macosx': 'macosx',
@@ -247,7 +241,8 @@ def switch_backend(newbackend):
             candidates = [best_guess]
         else:
             candidates = []
-        candidates += ["macosx", "qt5agg", "gtk3agg", "tkagg", "wxagg"]
+        candidates += [
+            "macosx", "qtagg", "gtk4agg", "gtk3agg", "tkagg", "wxagg"]
 
         # Don't try to fallback on the cairo-based backends as they each have
         # an additional dependency (pycairo) over the agg-based backend, and
@@ -267,15 +262,8 @@ def switch_backend(newbackend):
             rcParamsOrig["backend"] = "agg"
             return
 
-    # Backends are implemented as modules, but "inherit" default method
-    # implementations from backend_bases._Backend.  This is achieved by
-    # creating a "class" that inherits from backend_bases._Backend and whose
-    # body is filled with the module's globals.
-
-    backend_name = cbook._backend_module_name(newbackend)
-
-    class backend_mod(matplotlib.backend_bases._Backend):
-        locals().update(vars(importlib.import_module(backend_name)))
+    backend_mod = importlib.import_module(
+        cbook._backend_module_name(newbackend))
 
     required_framework = _get_required_interactive_framework(backend_mod)
     if required_framework is not None:
@@ -287,6 +275,44 @@ class backend_mod(matplotlib.backend_bases._Backend):
                 "framework, as {!r} is currently running".format(
                     newbackend, required_framework, current_framework))
 
+    # Load the new_figure_manager() and show() functions from the backend.
+
+    # Classically, backends can directly export these functions.  This should
+    # keep working for backcompat.
+    new_figure_manager = getattr(backend_mod, "new_figure_manager", None)
+    # show = getattr(backend_mod, "show", None)
+    # In that classical approach, backends are implemented as modules, but
+    # "inherit" default method implementations from backend_bases._Backend.
+    # This is achieved by creating a "class" that inherits from
+    # backend_bases._Backend and whose body is filled with the module globals.
+    class backend_mod(matplotlib.backend_bases._Backend):
+        locals().update(vars(backend_mod))
+
+    # However, the newer approach for defining new_figure_manager (and, in
+    # the future, show) is to derive them from canvas methods.  In that case,
+    # also update backend_mod accordingly; also, per-backend customization of
+    # draw_if_interactive is disabled.
+    if new_figure_manager is None:
+        # only try to get the canvas class if have opted into the new scheme
+        canvas_class = backend_mod.FigureCanvas
+        def new_figure_manager_given_figure(num, figure):
+            return canvas_class.new_manager(figure, num)
+
+        def new_figure_manager(num, *args, FigureClass=Figure, **kwargs):
+            fig = FigureClass(*args, **kwargs)
+            return new_figure_manager_given_figure(num, fig)
+
+        def draw_if_interactive():
+            if matplotlib.is_interactive():
+                manager = _pylab_helpers.Gcf.get_active()
+                if manager:
+                    manager.canvas.draw_idle()
+
+        backend_mod.new_figure_manager_given_figure = \
+            new_figure_manager_given_figure
+        backend_mod.new_figure_manager = new_figure_manager
+        backend_mod.draw_if_interactive = draw_if_interactive
+
     _log.debug("Loaded backend %s version %s.",
                newbackend, backend_mod.backend_version)
 
@@ -300,10 +326,27 @@ class backend_mod(matplotlib.backend_bases._Backend):
     # See https://github.com/matplotlib/matplotlib/issues/6092
     matplotlib.backends.backend = newbackend
 
+    # make sure the repl display hook is installed in case we become
+    # interactive
+    install_repl_displayhook()
+
 
 def _warn_if_gui_out_of_main_thread():
-    if (_get_required_interactive_framework(_backend_mod)
-            and threading.current_thread() is not threading.main_thread()):
+    warn = False
+    if _get_required_interactive_framework(_get_backend_mod()):
+        if hasattr(threading, 'get_native_id'):
+            # This compares native thread ids because even if Python-level
+            # Thread objects match, the underlying OS thread (which is what
+            # really matters) may be different on Python implementations with
+            # green threads.
+            if threading.get_native_id() != threading.main_thread().native_id:
+                warn = True
+        else:
+            # Fall back to Python-level Thread if native IDs are unavailable,
+            # mainly for PyPy.
+            if threading.current_thread() is not threading.main_thread():
+                warn = True
+    if warn:
         _api.warn_external(
             "Starting a Matplotlib GUI outside of the main thread will likely "
             "fail.")
@@ -313,12 +356,20 @@ def _warn_if_gui_out_of_main_thread():
 def new_figure_manager(*args, **kwargs):
     """Create a new figure manager instance."""
     _warn_if_gui_out_of_main_thread()
-    return _backend_mod.new_figure_manager(*args, **kwargs)
+    return _get_backend_mod().new_figure_manager(*args, **kwargs)
 
 
 # This function's signature is rewritten upon backend-load by switch_backend.
 def draw_if_interactive(*args, **kwargs):
-    return _backend_mod.draw_if_interactive(*args, **kwargs)
+    """
+    Redraw the current figure if in interactive mode.
+
+    .. warning::
+
+        End users will typically not have to call this function because the
+        the interactive mode takes care of this.
+    """
+    return _get_backend_mod().draw_if_interactive(*args, **kwargs)
 
 
 # This function's signature is rewritten upon backend-load by switch_backend.
@@ -326,45 +377,65 @@ def show(*args, **kwargs):
     """
     Display all open figures.
 
-    In non-interactive mode, *block* defaults to True.  All figures
-    will display and show will not return until all windows are closed.
-    If there are no figures, return immediately.
-
-    In interactive mode *block* defaults to False.  This will ensure
-    that all of the figures are shown and this function immediately returns.
-
     Parameters
     ----------
     block : bool, optional
+        Whether to wait for all figures to be closed before returning.
 
-        If `True` block and run the GUI main loop until all windows
+        If `True` block and run the GUI main loop until all figure windows
         are closed.
 
-        If `False` ensure that all windows are displayed and return
+        If `False` ensure that all figure windows are displayed and return
         immediately.  In this case, you are responsible for ensuring
         that the event loop is running to have responsive figures.
 
+        Defaults to True in non-interactive mode and to False in interactive
+        mode (see `.pyplot.isinteractive`).
+
     See Also
     --------
-    ion : enable interactive mode
-    ioff : disable interactive mode
+    ion : Enable interactive mode, which shows / updates the figure after
+          every plotting command, so that calling ``show()`` is not necessary.
+    ioff : Disable interactive mode.
+    savefig : Save the figure to an image file instead of showing it on screen.
 
+    Notes
+    -----
+    **Saving figures to file and showing a window at the same time**
+
+    If you want an image file as well as a user interface window, use
+    `.pyplot.savefig` before `.pyplot.show`. At the end of (a blocking)
+    ``show()`` the figure is closed and thus unregistered from pyplot. Calling
+    `.pyplot.savefig` afterwards would save a new and thus empty figure. This
+    limitation of command order does not apply if the show is non-blocking or
+    if you keep a reference to the figure and use `.Figure.savefig`.
+
+    **Auto-show in jupyter notebooks**
+
+    The jupyter backends (activated via ``%matplotlib inline``,
+    ``%matplotlib notebook``, or ``%matplotlib widget``), call ``show()`` at
+    the end of every cell by default. Thus, you usually don't have to call it
+    explicitly there.
     """
     _warn_if_gui_out_of_main_thread()
-    return _backend_mod.show(*args, **kwargs)
+    return _get_backend_mod().show(*args, **kwargs)
 
 
 def isinteractive():
     """
-    Return if pyplot is in "interactive mode" or not.
+    Return whether plots are updated after every plotting command.
 
-    If in interactive mode then:
+    The interactive mode is mainly useful if you build plots from the command
+    line and want to see the effect of each command while you are building the
+    figure.
+
+    In interactive mode:
 
     - newly created figures will be shown immediately;
     - figures will automatically redraw on change;
     - `.pyplot.show` will not block by default.
 
-    If not in interactive mode then:
+    In non-interactive mode:
 
     - newly created figures and changes to figures will not be reflected until
       explicitly asked to be;
@@ -372,78 +443,26 @@ def isinteractive():
 
     See Also
     --------
-    ion : enable interactive mode
-    ioff : disable interactive mode
-
-    show : show windows (and maybe block)
-    pause : show windows, run GUI event loop, and block for a time
+    ion : Enable interactive mode.
+    ioff : Disable interactive mode.
+    show : Show all figures (and maybe block).
+    pause : Show all figures, and block for a time.
     """
     return matplotlib.is_interactive()
 
 
-class _IoffContext:
-    """
-    Context manager for `.ioff`.
-
-    The state is changed in ``__init__()`` instead of ``__enter__()``. The
-    latter is a no-op. This allows using `.ioff` both as a function and
-    as a context.
-    """
-
-    def __init__(self):
-        self.wasinteractive = isinteractive()
-        matplotlib.interactive(False)
-        uninstall_repl_displayhook()
-
-    def __enter__(self):
-        pass
-
-    def __exit__(self, exc_type, exc_value, traceback):
-        if self.wasinteractive:
-            matplotlib.interactive(True)
-            install_repl_displayhook()
-        else:
-            matplotlib.interactive(False)
-            uninstall_repl_displayhook()
-
-
-class _IonContext:
-    """
-    Context manager for `.ion`.
-
-    The state is changed in ``__init__()`` instead of ``__enter__()``. The
-    latter is a no-op. This allows using `.ion` both as a function and
-    as a context.
-    """
-
-    def __init__(self):
-        self.wasinteractive = isinteractive()
-        matplotlib.interactive(True)
-        install_repl_displayhook()
-
-    def __enter__(self):
-        pass
-
-    def __exit__(self, exc_type, exc_value, traceback):
-        if not self.wasinteractive:
-            matplotlib.interactive(False)
-            uninstall_repl_displayhook()
-        else:
-            matplotlib.interactive(True)
-            install_repl_displayhook()
-
-
 def ioff():
     """
-    Turn interactive mode off.
+    Disable interactive mode.
+
+    See `.pyplot.isinteractive` for more details.
 
     See Also
     --------
-    ion : enable interactive mode
-    isinteractive : query current state
-
-    show : show windows (and maybe block)
-    pause : show windows, run GUI event loop, and block for a time
+    ion : Enable interactive mode.
+    isinteractive : Whether interactive mode is enabled.
+    show : Show all figures (and maybe block).
+    pause : Show all figures, and block for a time.
 
     Notes
     -----
@@ -461,24 +480,29 @@ def ioff():
             fig2 = plt.figure()
             # ...
 
-    To enable usage as a context manager, this function returns an
-    ``_IoffContext`` object. The return value is not intended to be stored
-    or accessed by the user.
+    To enable optional usage as a context manager, this function returns a
+    `~contextlib.ExitStack` object, which is not intended to be stored or
+    accessed by the user.
     """
-    return _IoffContext()
+    stack = ExitStack()
+    stack.callback(ion if isinteractive() else ioff)
+    matplotlib.interactive(False)
+    uninstall_repl_displayhook()
+    return stack
 
 
 def ion():
     """
-    Turn interactive mode on.
+    Enable interactive mode.
+
+    See `.pyplot.isinteractive` for more details.
 
     See Also
     --------
-    ioff : disable interactive mode
-    isinteractive : query current state
-
-    show : show windows (and maybe block)
-    pause : show windows, run GUI event loop, and block for a time
+    ioff : Disable interactive mode.
+    isinteractive : Whether interactive mode is enabled.
+    show : Show all figures (and maybe block).
+    pause : Show all figures, and block for a time.
 
     Notes
     -----
@@ -496,11 +520,15 @@ def ion():
             fig2 = plt.figure()
             # ...
 
-    To enable usage as a context manager, this function returns an
-    ``_IonContext`` object. The return value is not intended to be stored
-    or accessed by the user.
+    To enable optional usage as a context manager, this function returns a
+    `~contextlib.ExitStack` object, which is not intended to be stored or
+    accessed by the user.
     """
-    return _IonContext()
+    stack = ExitStack()
+    stack.callback(ion if isinteractive() else ioff)
+    matplotlib.interactive(True)
+    install_repl_displayhook()
+    return stack
 
 
 def pause(interval):
@@ -517,8 +545,8 @@ def pause(interval):
 
     See Also
     --------
-    matplotlib.animation : Complex animation
-    show : show figures and optional block forever
+    matplotlib.animation : Proper animations
+    show : Show all figures and optional block until all figures are closed.
     """
     manager = _pylab_helpers.Gcf.get_active()
     if manager is not None:
@@ -599,50 +627,43 @@ def xkcd(scale=1, length=100, randomness=2):
         # This figure will be in regular style
         fig2 = plt.figure()
     """
-    return _xkcd(scale, length, randomness)
-
-
-class _xkcd:
-    # This cannot be implemented in terms of rc_context() because this needs to
-    # work as a non-contextmanager too.
-
-    def __init__(self, scale, length, randomness):
-        self._orig = rcParams.copy()
-
-        if rcParams['text.usetex']:
-            raise RuntimeError(
-                "xkcd mode is not compatible with text.usetex = True")
-
-        from matplotlib import patheffects
-        rcParams.update({
-            'font.family': ['xkcd', 'xkcd Script', 'Humor Sans', 'Comic Neue',
-                            'Comic Sans MS'],
-            'font.size': 14.0,
-            'path.sketch': (scale, length, randomness),
-            'path.effects': [
-                patheffects.withStroke(linewidth=4, foreground="w")],
-            'axes.linewidth': 1.5,
-            'lines.linewidth': 2.0,
-            'figure.facecolor': 'white',
-            'grid.linewidth': 0.0,
-            'axes.grid': False,
-            'axes.unicode_minus': False,
-            'axes.edgecolor': 'black',
-            'xtick.major.size': 8,
-            'xtick.major.width': 3,
-            'ytick.major.size': 8,
-            'ytick.major.width': 3,
-        })
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, *args):
-        dict.update(rcParams, self._orig)
+    # This cannot be implemented in terms of contextmanager() or rc_context()
+    # because this needs to work as a non-contextmanager too.
+
+    if rcParams['text.usetex']:
+        raise RuntimeError(
+            "xkcd mode is not compatible with text.usetex = True")
+
+    stack = ExitStack()
+    stack.callback(dict.update, rcParams, rcParams.copy())
+
+    from matplotlib import patheffects
+    rcParams.update({
+        'font.family': ['xkcd', 'xkcd Script', 'Humor Sans', 'Comic Neue',
+                        'Comic Sans MS'],
+        'font.size': 14.0,
+        'path.sketch': (scale, length, randomness),
+        'path.effects': [
+            patheffects.withStroke(linewidth=4, foreground="w")],
+        'axes.linewidth': 1.5,
+        'lines.linewidth': 2.0,
+        'figure.facecolor': 'white',
+        'grid.linewidth': 0.0,
+        'axes.grid': False,
+        'axes.unicode_minus': False,
+        'axes.edgecolor': 'black',
+        'xtick.major.size': 8,
+        'xtick.major.width': 3,
+        'ytick.major.size': 8,
+        'ytick.major.width': 3,
+    })
+
+    return stack
 
 
 ## Figures ##
 
+@_api.make_keyword_only("3.6", "facecolor")
 def figure(num=None,  # autoincrement if None, else integer from 1-N
            figsize=None,  # defaults to rc figure.figsize
            dpi=None,  # defaults to rc figure.dpi
@@ -658,7 +679,7 @@ def figure(num=None,  # autoincrement if None, else integer from 1-N
 
     Parameters
     ----------
-    num : int or str or `.Figure`, optional
+    num : int or str or `.Figure` or `.SubFigure`, optional
         A unique identifier for the figure.
 
         If a figure with that identifier already exists, this figure is made
@@ -670,7 +691,8 @@ def figure(num=None,  # autoincrement if None, else integer from 1-N
         will be used for the ``Figure.number`` attribute, otherwise, an
         auto-generated integer value is used (starting at 1 and incremented
         for each new figure). If *num* is a string, the figure label and the
-        window title is set to this value.
+        window title is set to this value.  If num is a ``SubFigure``, its
+        parent ``Figure`` is activated.
 
     figsize : (float, float), default: :rc:`figure.figsize`
         Width, height in inches.
@@ -688,40 +710,32 @@ def figure(num=None,  # autoincrement if None, else integer from 1-N
         If False, suppress drawing the figure frame.
 
     FigureClass : subclass of `~matplotlib.figure.Figure`
-        Optionally use a custom `.Figure` instance.
+        If set, an instance of this subclass will be created, rather than a
+        plain `.Figure`.
 
     clear : bool, default: False
         If True and the figure already exists, then it is cleared.
 
-    tight_layout : bool or dict, default: :rc:`figure.autolayout`
-        If ``False`` use *subplotpars*. If ``True`` adjust subplot
-        parameters using `.tight_layout` with default padding.
-        When providing a dict containing the keys ``pad``, ``w_pad``,
-        ``h_pad``, and ``rect``, the default `.tight_layout` paddings
-        will be overridden.
-
-    constrained_layout : bool, default: :rc:`figure.constrained_layout.use`
-        If ``True`` use constrained layout to adjust positioning of plot
-        elements.  Like ``tight_layout``, but designed to be more
-        flexible.  See
-        :doc:`/tutorials/intermediate/constrainedlayout_guide`
-        for examples.  (Note: does not work with `add_subplot` or
-        `~.pyplot.subplot2grid`.)
+    layout : {'constrained', 'tight', `.LayoutEngine`, None}, default: None
+        The layout mechanism for positioning of plot elements to avoid
+        overlapping Axes decorations (labels, ticks, etc). Note that layout
+        managers can measurably slow down figure display. Defaults to *None*
+        (but see the documentation of the `.Figure` constructor regarding the
+        interaction with rcParams).
 
-
-    **kwargs : optional
-        See `~.matplotlib.figure.Figure` for other possible arguments.
+    **kwargs
+        Additional keyword arguments are passed to the `.Figure` constructor.
 
     Returns
     -------
     `~matplotlib.figure.Figure`
-        The `.Figure` instance returned will also be passed to
-        new_figure_manager in the backends, which allows to hook custom
-        `.Figure` classes into the pyplot interface. Additional kwargs will be
-        passed to the `.Figure` init function.
 
     Notes
     -----
+    Newly created figures are passed to the `~.FigureCanvasBase.new_manager`
+    method or the `new_figure_manager` function provided by the current
+    backend, which install a canvas and a manager on the figure.
+
     If you are creating many figures, make sure you explicitly call
     `.pyplot.close` on the figures you are not using, because this will
     enable pyplot to properly clean up the memory.
@@ -729,11 +743,11 @@ def figure(num=None,  # autoincrement if None, else integer from 1-N
     `~matplotlib.rcParams` defines the default values, which can be modified
     in the matplotlibrc file.
     """
-    if isinstance(num, Figure):
+    if isinstance(num, FigureBase):
         if num.canvas.manager is None:
             raise ValueError("The passed figure is not managed by pyplot")
         _pylab_helpers.Gcf.set_active(num.canvas.manager)
-        return num
+        return num.figure
 
     allnums = get_fignums()
     next_num = max(allnums) + 1 if allnums else 1
@@ -762,7 +776,8 @@ def figure(num=None,  # autoincrement if None, else integer from 1-N
                 f"Figures created through the pyplot interface "
                 f"(`matplotlib.pyplot.figure`) are retained until explicitly "
                 f"closed and may consume too much memory. (To control this "
-                f"warning, see the rcParam `figure.max_open_warning`).",
+                f"warning, see the rcParam `figure.max_open_warning`). "
+                f"Consider using `matplotlib.pyplot.close()`.",
                 RuntimeWarning)
 
         manager = new_figure_manager(
@@ -781,7 +796,7 @@ def figure(num=None,  # autoincrement if None, else integer from 1-N
         # FigureManager base class.
         draw_if_interactive()
 
-        if _INSTALL_FIG_OBSERVER:
+        if _REPL_DISPLAYHOOK is _ReplDisplayHook.PLAIN:
             fig.stale_callback = _auto_draw_if_interactive
 
     if clear:
@@ -815,8 +830,10 @@ def gcf():
     """
     Get the current figure.
 
-    If no current figure exists, a new one is created using
-    `~.pyplot.figure()`.
+    If there is currently no figure on the pyplot figure stack, a new one is
+    created using `~.pyplot.figure()`.  (To test whether there is currently a
+    figure on the pyplot figure stack, check whether `~.pyplot.get_fignums()`
+    is empty.)
     """
     manager = _pylab_helpers.Gcf.get_active()
     if manager is not None:
@@ -913,7 +930,7 @@ def close(fig=None):
 
 def clf():
     """Clear the current figure."""
-    gcf().clf()
+    gcf().clear()
 
 
 def draw():
@@ -935,7 +952,7 @@ def draw():
 def savefig(*args, **kwargs):
     fig = gcf()
     res = fig.savefig(*args, **kwargs)
-    fig.canvas.draw_idle()   # need this if 'transparent=True' to reset colors
+    fig.canvas.draw_idle()  # Need this if 'transparent=True', to reset colors.
     return res
 
 
@@ -950,10 +967,10 @@ def figlegend(*args, **kwargs):
 
 ## Axes ##
 
-@docstring.dedent_interpd
+@_docstring.dedent_interpd
 def axes(arg=None, **kwargs):
     """
-    Add an axes to the current figure and make it the current axes.
+    Add an Axes to the current figure and make it the current Axes.
 
     Call signatures::
 
@@ -966,10 +983,10 @@ def axes(arg=None, **kwargs):
     arg : None or 4-tuple
         The exact behavior of this function depends on the type:
 
-        - *None*: A new full window axes is added using
+        - *None*: A new full window Axes is added using
           ``subplot(**kwargs)``.
         - 4-tuple of floats *rect* = ``[left, bottom, width, height]``.
-          A new axes is added with dimensions *rect* in normalized
+          A new Axes is added with dimensions *rect* in normalized
           (0, 1) units using `~.Figure.add_axes` on the current figure.
 
     projection : {None, 'aitoff', 'hammer', 'lambert', 'mollweide', \
@@ -984,10 +1001,10 @@ def axes(arg=None, **kwargs):
     sharex, sharey : `~.axes.Axes`, optional
         Share the x or y `~matplotlib.axis` with sharex and/or sharey.
         The axis will have the same limits, ticks, and scale as the axis
-        of the shared axes.
+        of the shared Axes.
 
     label : str
-        A label for the returned axes.
+        A label for the returned Axes.
 
     Returns
     -------
@@ -1000,23 +1017,23 @@ def axes(arg=None, **kwargs):
     ----------------
     **kwargs
         This method also takes the keyword arguments for
-        the returned axes class. The keyword arguments for the
-        rectilinear axes class `~.axes.Axes` can be found in
+        the returned Axes class. The keyword arguments for the
+        rectilinear Axes class `~.axes.Axes` can be found in
         the following table but there might also be other keyword
-        arguments if another projection is used, see the actual axes
+        arguments if another projection is used, see the actual Axes
         class.
 
-        %(Axes_kwdoc)s
+        %(Axes:kwdoc)s
 
     Notes
     -----
-    If the figure already has a axes with key (*args*,
+    If the figure already has an Axes with key (*args*,
     *kwargs*) then it will simply make that axes current and
     return it.  This behavior is deprecated. Meanwhile, if you do
     not want this behavior (i.e., you want to force the creation of a
-    new axes), you must use a unique set of args and kwargs.  The axes
+    new axes), you must use a unique set of args and kwargs.  The Axes
     *label* attribute has been exposed for this purpose: if you want
-    two axes that are otherwise identical to be added to the figure,
+    two Axes that are otherwise identical to be added to the figure,
     make sure you give them unique labels.
 
     See Also
@@ -1031,15 +1048,19 @@ def axes(arg=None, **kwargs):
     --------
     ::
 
-        # Creating a new full window axes
+        # Creating a new full window Axes
         plt.axes()
 
-        # Creating a new axes with specified dimensions and some kwargs
-        plt.axes((left, bottom, width, height), facecolor='w')
+        # Creating a new Axes with specified dimensions and a grey background
+        plt.axes((left, bottom, width, height), facecolor='grey')
     """
     fig = gcf()
+    pos = kwargs.pop('position', None)
     if arg is None:
-        return fig.add_subplot(**kwargs)
+        if pos is None:
+            return fig.add_subplot(**kwargs)
+        else:
+            return fig.add_axes(pos, **kwargs)
     else:
         return fig.add_axes(arg, **kwargs)
 
@@ -1069,7 +1090,7 @@ def cla():
 
 ## More ways of creating axes ##
 
-@docstring.dedent_interpd
+@_docstring.dedent_interpd
 def subplot(*args, **kwargs):
     """
     Add an Axes to the current figure or retrieve an existing Axes.
@@ -1138,11 +1159,11 @@ def subplot(*args, **kwargs):
         the following table but there might also be other keyword
         arguments if another projection is used.
 
-        %(Axes_kwdoc)s
+        %(Axes:kwdoc)s
 
     Notes
     -----
-    Creating a new Axes will delete any pre-existing Axes that
+    Creating a new Axes will delete any preexisting Axes that
     overlaps with it beyond sharing a boundary::
 
         import matplotlib.pyplot as plt
@@ -1243,7 +1264,7 @@ def subplot(*args, **kwargs):
     key = SubplotSpec._from_subplot_args(fig, args)
 
     for ax in fig.axes:
-        # if we found an axes at the position sort out if we can re-use it
+        # if we found an Axes at the position sort out if we can re-use it
         if hasattr(ax, 'get_subplotspec') and ax.get_subplotspec() == key:
             # if the user passed no kwargs, re-use
             if kwargs == {}:
@@ -1259,21 +1280,21 @@ def subplot(*args, **kwargs):
 
     fig.sca(ax)
 
-    bbox = ax.bbox
-    axes_to_delete = []
-    for other_ax in fig.axes:
-        if other_ax == ax:
-            continue
-        if bbox.fully_overlaps(other_ax.bbox):
-            axes_to_delete.append(other_ax)
+    axes_to_delete = [other for other in fig.axes
+                      if other != ax and ax.bbox.fully_overlaps(other.bbox)]
+    if axes_to_delete:
+        _api.warn_deprecated(
+            "3.6", message="Auto-removal of overlapping axes is deprecated "
+            "since %(since)s and will be removed %(removal)s; explicitly call "
+            "ax.remove() as needed.")
     for ax_to_del in axes_to_delete:
         delaxes(ax_to_del)
 
     return ax
 
 
-@_api.make_keyword_only("3.3", "sharex")
-def subplots(nrows=1, ncols=1, sharex=False, sharey=False, squeeze=True,
+def subplots(nrows=1, ncols=1, *, sharex=False, sharey=False, squeeze=True,
+             width_ratios=None, height_ratios=None,
              subplot_kw=None, gridspec_kw=None, **fig_kw):
     """
     Create a figure and a set of subplots.
@@ -1319,6 +1340,18 @@ def subplots(nrows=1, ncols=1, sharex=False, sharey=False, squeeze=True,
           always a 2D array containing Axes instances, even if it ends up
           being 1x1.
 
+    width_ratios : array-like of length *ncols*, optional
+        Defines the relative widths of the columns. Each column gets a
+        relative width of ``width_ratios[i] / sum(width_ratios)``.
+        If not given, all columns will have the same width.  Equivalent
+        to ``gridspec_kw={'width_ratios': [...]}``.
+
+    height_ratios : array-like of length *nrows*, optional
+        Defines the relative heights of the rows. Each row gets a
+        relative height of ``height_ratios[i] / sum(height_ratios)``.
+        If not given, all rows will have the same height. Convenience
+        for ``gridspec_kw={'height_ratios': [...]}``.
+
     subplot_kw : dict, optional
         Dict with keywords passed to the
         `~matplotlib.figure.Figure.add_subplot` call used to create each
@@ -1334,13 +1367,12 @@ def subplots(nrows=1, ncols=1, sharex=False, sharey=False, squeeze=True,
 
     Returns
     -------
-    fig : `~.figure.Figure`
+    fig : `.Figure`
 
-    ax : `.axes.Axes` or array of Axes
-        *ax* can be either a single `~matplotlib.axes.Axes` object or an
-        array of Axes objects if more than one subplot was created.  The
-        dimensions of the resulting array can be controlled with the squeeze
-        keyword, see above.
+    ax : `~.axes.Axes` or array of Axes
+        *ax* can be either a single `~.axes.Axes` object, or an array of Axes
+        objects if more than one subplot was created.  The dimensions of the
+        resulting array can be controlled with the squeeze keyword, see above.
 
         Typical idioms for handling the return value are::
 
@@ -1410,26 +1442,30 @@ def subplots(nrows=1, ncols=1, sharex=False, sharey=False, squeeze=True,
     fig = figure(**fig_kw)
     axs = fig.subplots(nrows=nrows, ncols=ncols, sharex=sharex, sharey=sharey,
                        squeeze=squeeze, subplot_kw=subplot_kw,
-                       gridspec_kw=gridspec_kw)
+                       gridspec_kw=gridspec_kw, height_ratios=height_ratios,
+                       width_ratios=width_ratios)
     return fig, axs
 
 
-def subplot_mosaic(layout, *, subplot_kw=None, gridspec_kw=None,
-                   empty_sentinel='.', **fig_kw):
+def subplot_mosaic(mosaic, *, sharex=False, sharey=False,
+                   width_ratios=None, height_ratios=None, empty_sentinel='.',
+                   subplot_kw=None, gridspec_kw=None, **fig_kw):
     """
     Build a layout of Axes based on ASCII art or nested lists.
 
     This is a helper function to build complex GridSpec layouts visually.
 
-    .. note ::
+    .. note::
 
        This API is provisional and may be revised in the future based on
        early user feedback.
 
+    See :doc:`/tutorials/provisional/mosaic`
+    for an example and full API documentation
 
     Parameters
     ----------
-    layout : list of list of {hashable or nested} or str
+    mosaic : list of list of {hashable or nested} or str
 
         A visual layout of how you want your Axes to be arranged
         labeled as strings.  For example ::
@@ -1437,7 +1473,7 @@ def subplot_mosaic(layout, *, subplot_kw=None, gridspec_kw=None,
            x = [['A panel', 'A panel', 'edge'],
                 ['C panel', '.',       'edge']]
 
-        Produces 4 axes:
+        produces 4 axes:
 
         - 'A panel' which is 1 row high and spans the first two columns
         - 'edge' which is 2 rows high and is on the right edge
@@ -1458,13 +1494,23 @@ def subplot_mosaic(layout, *, subplot_kw=None, gridspec_kw=None,
         This only allows only single character Axes labels and does
         not allow nesting but is very terse.
 
-    subplot_kw : dict, optional
-        Dictionary with keywords passed to the `.Figure.add_subplot` call
-        used to create each subplot.
+    sharex, sharey : bool, default: False
+        If True, the x-axis (*sharex*) or y-axis (*sharey*) will be shared
+        among all subplots.  In that case, tick label visibility and axis units
+        behave as for `subplots`.  If False, each subplot's x- or y-axis will
+        be independent.
 
-    gridspec_kw : dict, optional
-        Dictionary with keywords passed to the `.GridSpec` constructor used
-        to create the grid the subplots are placed on.
+    width_ratios : array-like of length *ncols*, optional
+        Defines the relative widths of the columns. Each column gets a
+        relative width of ``width_ratios[i] / sum(width_ratios)``.
+        If not given, all columns will have the same width.  Convenience
+        for ``gridspec_kw={'width_ratios': [...]}``.
+
+    height_ratios : array-like of length *nrows*, optional
+        Defines the relative heights of the rows. Each row gets a
+        relative height of ``height_ratios[i] / sum(height_ratios)``.
+        If not given, all rows will have the same height. Convenience
+        for ``gridspec_kw={'height_ratios': [...]}``.
 
     empty_sentinel : object, optional
         Entry in the layout to mean "leave this space empty".  Defaults
@@ -1472,24 +1518,34 @@ def subplot_mosaic(layout, *, subplot_kw=None, gridspec_kw=None,
         `inspect.cleandoc` to remove leading white space, which may
         interfere with using white-space as the empty sentinel.
 
+    subplot_kw : dict, optional
+        Dictionary with keywords passed to the `.Figure.add_subplot` call
+        used to create each subplot.
+
+    gridspec_kw : dict, optional
+        Dictionary with keywords passed to the `.GridSpec` constructor used
+        to create the grid the subplots are placed on.
+
     **fig_kw
         All additional keyword arguments are passed to the
         `.pyplot.figure` call.
 
     Returns
     -------
-    fig : `~.figure.Figure`
+    fig : `.Figure`
        The new figure
 
     dict[label, Axes]
-       A dictionary mapping the labels to the Axes objects.
+       A dictionary mapping the labels to the Axes objects.  The order of
+       the axes is left-to-right and top-to-bottom of their position in the
+       total layout.
 
     """
     fig = figure(**fig_kw)
     ax_dict = fig.subplot_mosaic(
-        layout,
-        subplot_kw=subplot_kw,
-        gridspec_kw=gridspec_kw,
+        mosaic, sharex=sharex, sharey=sharey,
+        height_ratios=height_ratios, width_ratios=width_ratios,
+        subplot_kw=subplot_kw, gridspec_kw=gridspec_kw,
         empty_sentinel=empty_sentinel
     )
     return fig, ax_dict
@@ -1544,13 +1600,14 @@ def subplot2grid(shape, loc, rowspan=1, colspan=1, fig=None, **kwargs):
 
     subplotspec = gs.new_subplotspec(loc, rowspan=rowspan, colspan=colspan)
     ax = fig.add_subplot(subplotspec, **kwargs)
-    bbox = ax.bbox
-    axes_to_delete = []
-    for other_ax in fig.axes:
-        if other_ax == ax:
-            continue
-        if bbox.fully_overlaps(other_ax.bbox):
-            axes_to_delete.append(other_ax)
+
+    axes_to_delete = [other for other in fig.axes
+                      if other != ax and ax.bbox.fully_overlaps(other.bbox)]
+    if axes_to_delete:
+        _api.warn_deprecated(
+            "3.6", message="Auto-removal of overlapping axes is deprecated "
+            "since %(since)s and will be removed %(removal)s; explicitly call "
+            "ax.remove() as needed.")
     for ax_to_del in axes_to_delete:
         delaxes(ax_to_del)
 
@@ -1593,41 +1650,20 @@ def subplot_tool(targetfig=None):
     """
     Launch a subplot tool window for a figure.
 
-    A `matplotlib.widgets.SubplotTool` instance is returned. You must maintain
-    a reference to the instance to keep the associated callbacks alive.
+    Returns
+    -------
+    `matplotlib.widgets.SubplotTool`
     """
     if targetfig is None:
         targetfig = gcf()
-    with rc_context({"toolbar": "none"}):  # No navbar for the toolfig.
-        # Use new_figure_manager() instead of figure() so that the figure
-        # doesn't get registered with pyplot.
-        manager = new_figure_manager(-1, (6, 3))
-    manager.set_window_title("Subplot configuration tool")
-    tool_fig = manager.canvas.figure
-    tool_fig.subplots_adjust(top=0.9)
-    manager.show()
-    return SubplotTool(targetfig, tool_fig)
-
-
-# After deprecation elapses, this can be autogenerated by boilerplate.py.
-@_api.make_keyword_only("3.3", "pad")
-def tight_layout(pad=1.08, h_pad=None, w_pad=None, rect=None):
-    """
-    Adjust the padding between and around subplots.
-
-    Parameters
-    ----------
-    pad : float, default: 1.08
-        Padding between the figure edge and the edges of subplots,
-        as a fraction of the font size.
-    h_pad, w_pad : float, default: *pad*
-        Padding (height/width) between edges of adjacent subplots,
-        as a fraction of the font size.
-    rect : tuple (left, bottom, right, top), default: (0, 0, 1, 1)
-        A rectangle in normalized figure coordinates into which the whole
-        subplots area (including labels) will fit.
-    """
-    gcf().tight_layout(pad=pad, h_pad=h_pad, w_pad=w_pad, rect=rect)
+    tb = targetfig.canvas.manager.toolbar
+    if hasattr(tb, "configure_subplots"):  # toolbar2
+        return tb.configure_subplots()
+    elif hasattr(tb, "trigger_tool"):  # toolmanager
+        return tb.trigger_tool("subplots")
+    else:
+        raise ValueError("subplot_tool can only be launched for figures with "
+                         "an associated toolbar")
 
 
 def box(on=None):
@@ -1727,7 +1763,7 @@ def ylim(*args, **kwargs):
     return ret
 
 
-def xticks(ticks=None, labels=None, **kwargs):
+def xticks(ticks=None, labels=None, *, minor=False, **kwargs):
     """
     Get or set the current tick locations and labels of the x-axis.
 
@@ -1740,6 +1776,9 @@ def xticks(ticks=None, labels=None, **kwargs):
     labels : array-like, optional
         The labels to place at the given *ticks* locations.  This argument can
         only be passed if *ticks* is passed as well.
+    minor : bool, default: False
+        If ``False``, get/set the major ticks/labels; if ``True``, the minor
+        ticks/labels.
     **kwargs
         `.Text` properties can be used to control the appearance of the labels.
 
@@ -1770,24 +1809,24 @@ def xticks(ticks=None, labels=None, **kwargs):
     ax = gca()
 
     if ticks is None:
-        locs = ax.get_xticks()
+        locs = ax.get_xticks(minor=minor)
         if labels is not None:
             raise TypeError("xticks(): Parameter 'labels' can't be set "
                             "without setting 'ticks'")
     else:
-        locs = ax.set_xticks(ticks)
+        locs = ax.set_xticks(ticks, minor=minor)
 
     if labels is None:
-        labels = ax.get_xticklabels()
+        labels = ax.get_xticklabels(minor=minor)
+        for l in labels:
+            l._internal_update(kwargs)
     else:
-        labels = ax.set_xticklabels(labels, **kwargs)
-    for l in labels:
-        l.update(kwargs)
+        labels = ax.set_xticklabels(labels, minor=minor, **kwargs)
 
     return locs, labels
 
 
-def yticks(ticks=None, labels=None, **kwargs):
+def yticks(ticks=None, labels=None, *, minor=False, **kwargs):
     """
     Get or set the current tick locations and labels of the y-axis.
 
@@ -1800,6 +1839,9 @@ def yticks(ticks=None, labels=None, **kwargs):
     labels : array-like, optional
         The labels to place at the given *ticks* locations.  This argument can
         only be passed if *ticks* is passed as well.
+    minor : bool, default: False
+        If ``False``, get/set the major ticks/labels; if ``True``, the minor
+        ticks/labels.
     **kwargs
         `.Text` properties can be used to control the appearance of the labels.
 
@@ -1830,19 +1872,19 @@ def yticks(ticks=None, labels=None, **kwargs):
     ax = gca()
 
     if ticks is None:
-        locs = ax.get_yticks()
+        locs = ax.get_yticks(minor=minor)
         if labels is not None:
             raise TypeError("yticks(): Parameter 'labels' can't be set "
                             "without setting 'ticks'")
     else:
-        locs = ax.set_yticks(ticks)
+        locs = ax.set_yticks(ticks, minor=minor)
 
     if labels is None:
-        labels = ax.get_yticklabels()
+        labels = ax.get_yticklabels(minor=minor)
+        for l in labels:
+            l._internal_update(kwargs)
     else:
-        labels = ax.set_yticklabels(labels, **kwargs)
-    for l in labels:
-        l.update(kwargs)
+        labels = ax.set_yticklabels(labels, minor=minor, **kwargs)
 
     return locs, labels
 
@@ -1887,7 +1929,7 @@ def rgrids(radii=None, labels=None, angle=None, fmt=None, **kwargs):
     Other Parameters
     ----------------
     **kwargs
-        *kwargs* are optional `~.Text` properties for the labels.
+        *kwargs* are optional `.Text` properties for the labels.
 
     See Also
     --------
@@ -1955,7 +1997,7 @@ def thetagrids(angles=None, labels=None, fmt=None, **kwargs):
     Other Parameters
     ----------------
     **kwargs
-        *kwargs* are optional `~.Text` properties for the labels.
+        *kwargs* are optional `.Text` properties for the labels.
 
     See Also
     --------
@@ -1986,11 +2028,9 @@ def thetagrids(angles=None, labels=None, fmt=None, **kwargs):
     return lines, labels
 
 
-## Plotting Info ##
-
-
-def plotting():
-    pass
+_NON_PLOT_COMMANDS = {
+    'connect', 'disconnect', 'get_current_fig_manager', 'ginput',
+    'new_figure_manager', 'waitforbuttonpress'}
 
 
 def get_plot_commands():
@@ -2000,10 +2040,8 @@ def get_plot_commands():
     # This works by searching for all functions in this module and removing
     # a few hard-coded exclusions, as well as all of the colormap-setting
     # functions, and anything marked as private with a preceding underscore.
-    exclude = {'colormaps', 'colors', 'connect', 'disconnect',
-               'get_plot_commands', 'get_current_fig_manager', 'ginput',
-               'plotting', 'waitforbuttonpress'}
-    exclude |= set(colormaps())
+    exclude = {'colormaps', 'colors', 'get_plot_commands',
+               *_NON_PLOT_COMMANDS, *colormaps}
     this_module = inspect.getmodule(get_plot_commands)
     return sorted(
         name for name, obj in globals().items()
@@ -2012,309 +2050,11 @@ def get_plot_commands():
            and inspect.getmodule(obj) is this_module)
 
 
-def colormaps():
-    """
-    Matplotlib provides a number of colormaps, and others can be added using
-    :func:`~matplotlib.cm.register_cmap`.  This function documents the built-in
-    colormaps, and will also return a list of all registered colormaps if
-    called.
-
-    You can set the colormap for an image, pcolor, scatter, etc,
-    using a keyword argument::
-
-      imshow(X, cmap=cm.hot)
-
-    or using the :func:`set_cmap` function::
-
-      imshow(X)
-      pyplot.set_cmap('hot')
-      pyplot.set_cmap('jet')
-
-    In interactive mode, :func:`set_cmap` will update the colormap post-hoc,
-    allowing you to see which one works best for your data.
-
-    All built-in colormaps can be reversed by appending ``_r``: For instance,
-    ``gray_r`` is the reverse of ``gray``.
-
-    There are several common color schemes used in visualization:
-
-    Sequential schemes
-      for unipolar data that progresses from low to high
-    Diverging schemes
-      for bipolar data that emphasizes positive or negative deviations from a
-      central value
-    Cyclic schemes
-      for plotting values that wrap around at the endpoints, such as phase
-      angle, wind direction, or time of day
-    Qualitative schemes
-      for nominal data that has no inherent ordering, where color is used
-      only to distinguish categories
-
-    Matplotlib ships with 4 perceptually uniform colormaps which are
-    the recommended colormaps for sequential data:
-
-      =========   ===================================================
-      Colormap    Description
-      =========   ===================================================
-      inferno     perceptually uniform shades of black-red-yellow
-      magma       perceptually uniform shades of black-red-white
-      plasma      perceptually uniform shades of blue-red-yellow
-      viridis     perceptually uniform shades of blue-green-yellow
-      =========   ===================================================
-
-    The following colormaps are based on the `ColorBrewer
-    <https://colorbrewer2.org>`_ color specifications and designs developed by
-    Cynthia Brewer:
-
-    ColorBrewer Diverging (luminance is highest at the midpoint, and
-    decreases towards differently-colored endpoints):
-
-      ========  ===================================
-      Colormap  Description
-      ========  ===================================
-      BrBG      brown, white, blue-green
-      PiYG      pink, white, yellow-green
-      PRGn      purple, white, green
-      PuOr      orange, white, purple
-      RdBu      red, white, blue
-      RdGy      red, white, gray
-      RdYlBu    red, yellow, blue
-      RdYlGn    red, yellow, green
-      Spectral  red, orange, yellow, green, blue
-      ========  ===================================
-
-    ColorBrewer Sequential (luminance decreases monotonically):
-
-      ========  ====================================
-      Colormap  Description
-      ========  ====================================
-      Blues     white to dark blue
-      BuGn      white, light blue, dark green
-      BuPu      white, light blue, dark purple
-      GnBu      white, light green, dark blue
-      Greens    white to dark green
-      Greys     white to black (not linear)
-      Oranges   white, orange, dark brown
-      OrRd      white, orange, dark red
-      PuBu      white, light purple, dark blue
-      PuBuGn    white, light purple, dark green
-      PuRd      white, light purple, dark red
-      Purples   white to dark purple
-      RdPu      white, pink, dark purple
-      Reds      white to dark red
-      YlGn      light yellow, dark green
-      YlGnBu    light yellow, light green, dark blue
-      YlOrBr    light yellow, orange, dark brown
-      YlOrRd    light yellow, orange, dark red
-      ========  ====================================
-
-    ColorBrewer Qualitative:
-
-    (For plotting nominal data, `.ListedColormap` is used,
-    not `.LinearSegmentedColormap`.  Different sets of colors are
-    recommended for different numbers of categories.)
-
-    * Accent
-    * Dark2
-    * Paired
-    * Pastel1
-    * Pastel2
-    * Set1
-    * Set2
-    * Set3
-
-    A set of colormaps derived from those of the same name provided
-    with Matlab are also included:
-
-      =========   =======================================================
-      Colormap    Description
-      =========   =======================================================
-      autumn      sequential linearly-increasing shades of red-orange-yellow
-      bone        sequential increasing black-white colormap with
-                  a tinge of blue, to emulate X-ray film
-      cool        linearly-decreasing shades of cyan-magenta
-      copper      sequential increasing shades of black-copper
-      flag        repetitive red-white-blue-black pattern (not cyclic at
-                  endpoints)
-      gray        sequential linearly-increasing black-to-white
-                  grayscale
-      hot         sequential black-red-yellow-white, to emulate blackbody
-                  radiation from an object at increasing temperatures
-      jet         a spectral map with dark endpoints, blue-cyan-yellow-red;
-                  based on a fluid-jet simulation by NCSA [#]_
-      pink        sequential increasing pastel black-pink-white, meant
-                  for sepia tone colorization of photographs
-      prism       repetitive red-yellow-green-blue-purple-...-green pattern
-                  (not cyclic at endpoints)
-      spring      linearly-increasing shades of magenta-yellow
-      summer      sequential linearly-increasing shades of green-yellow
-      winter      linearly-increasing shades of blue-green
-      =========   =======================================================
-
-    A set of palettes from the `Yorick scientific visualisation
-    package <https://dhmunro.github.io/yorick-doc/>`_, an evolution of
-    the GIST package, both by David H. Munro are included:
-
-      ============  =======================================================
-      Colormap      Description
-      ============  =======================================================
-      gist_earth    mapmaker's colors from dark blue deep ocean to green
-                    lowlands to brown highlands to white mountains
-      gist_heat     sequential increasing black-red-orange-white, to emulate
-                    blackbody radiation from an iron bar as it grows hotter
-      gist_ncar     pseudo-spectral black-blue-green-yellow-red-purple-white
-                    colormap from National Center for Atmospheric
-                    Research [#]_
-      gist_rainbow  runs through the colors in spectral order from red to
-                    violet at full saturation (like *hsv* but not cyclic)
-      gist_stern    "Stern special" color table from Interactive Data
-                    Language software
-      ============  =======================================================
-
-    A set of cyclic colormaps:
-
-      ================  =================================================
-      Colormap          Description
-      ================  =================================================
-      hsv               red-yellow-green-cyan-blue-magenta-red, formed by
-                        changing the hue component in the HSV color space
-      twilight          perceptually uniform shades of
-                        white-blue-black-red-white
-      twilight_shifted  perceptually uniform shades of
-                        black-blue-white-red-black
-      ================  =================================================
-
-    Other miscellaneous schemes:
-
-      ============= =======================================================
-      Colormap      Description
-      ============= =======================================================
-      afmhot        sequential black-orange-yellow-white blackbody
-                    spectrum, commonly used in atomic force microscopy
-      brg           blue-red-green
-      bwr           diverging blue-white-red
-      coolwarm      diverging blue-gray-red, meant to avoid issues with 3D
-                    shading, color blindness, and ordering of colors [#]_
-      CMRmap        "Default colormaps on color images often reproduce to
-                    confusing grayscale images. The proposed colormap
-                    maintains an aesthetically pleasing color image that
-                    automatically reproduces to a monotonic grayscale with
-                    discrete, quantifiable saturation levels." [#]_
-      cubehelix     Unlike most other color schemes cubehelix was designed
-                    by D.A. Green to be monotonically increasing in terms
-                    of perceived brightness. Also, when printed on a black
-                    and white postscript printer, the scheme results in a
-                    greyscale with monotonically increasing brightness.
-                    This color scheme is named cubehelix because the (r, g, b)
-                    values produced can be visualised as a squashed helix
-                    around the diagonal in the (r, g, b) color cube.
-      gnuplot       gnuplot's traditional pm3d scheme
-                    (black-blue-red-yellow)
-      gnuplot2      sequential color printable as gray
-                    (black-blue-violet-yellow-white)
-      ocean         green-blue-white
-      rainbow       spectral purple-blue-green-yellow-orange-red colormap
-                    with diverging luminance
-      seismic       diverging blue-white-red
-      nipy_spectral black-purple-blue-green-yellow-red-white spectrum,
-                    originally from the Neuroimaging in Python project
-      terrain       mapmaker's colors, blue-green-yellow-brown-white,
-                    originally from IGOR Pro
-      turbo         Spectral map (purple-blue-green-yellow-orange-red) with
-                    a bright center and darker endpoints. A smoother
-                    alternative to jet.
-      ============= =======================================================
-
-    The following colormaps are redundant and may be removed in future
-    versions.  It's recommended to use the names in the descriptions
-    instead, which produce identical output:
-
-      =========  =======================================================
-      Colormap   Description
-      =========  =======================================================
-      gist_gray  identical to *gray*
-      gist_yarg  identical to *gray_r*
-      binary     identical to *gray_r*
-      =========  =======================================================
-
-    .. rubric:: Footnotes
-
-    .. [#] Rainbow colormaps, ``jet`` in particular, are considered a poor
-      choice for scientific visualization by many researchers: `Rainbow Color
-      Map (Still) Considered Harmful
-      <https://ieeexplore.ieee.org/document/4118486/?arnumber=4118486>`_
-
-    .. [#] Resembles "BkBlAqGrYeOrReViWh200" from NCAR Command
-      Language. See `Color Table Gallery
-      <https://www.ncl.ucar.edu/Document/Graphics/color_table_gallery.shtml>`_
-
-    .. [#] See `Diverging Color Maps for Scientific Visualization
-      <http://www.kennethmoreland.com/color-maps/>`_ by Kenneth Moreland.
-
-    .. [#] See `A Color Map for Effective Black-and-White Rendering of
-      Color-Scale Images
-      <https://www.mathworks.com/matlabcentral/fileexchange/2662-cmrmap-m>`_
-      by Carey Rappaport
-    """
-    return sorted(cm._cmap_registry)
-
-
-def _setup_pyplot_info_docstrings():
-    """
-    Setup the docstring of `plotting` and of the colormap-setting functions.
-
-    These must be done after the entire module is imported, so it is called
-    from the end of this module, which is generated by boilerplate.py.
-    """
-    commands = get_plot_commands()
-
-    first_sentence = re.compile(r"(?:\s*).+?\.(?:\s+|$)", flags=re.DOTALL)
-
-    # Collect the first sentence of the docstring for all of the
-    # plotting commands.
-    rows = []
-    max_name = len("Function")
-    max_summary = len("Description")
-    for name in commands:
-        doc = globals()[name].__doc__
-        summary = ''
-        if doc is not None:
-            match = first_sentence.match(doc)
-            if match is not None:
-                summary = inspect.cleandoc(match.group(0)).replace('\n', ' ')
-        name = '`%s`' % name
-        rows.append([name, summary])
-        max_name = max(max_name, len(name))
-        max_summary = max(max_summary, len(summary))
-
-    separator = '=' * max_name + ' ' + '=' * max_summary
-    lines = [
-        separator,
-        '{:{}} {:{}}'.format('Function', max_name, 'Description', max_summary),
-        separator,
-    ] + [
-        '{:{}} {:{}}'.format(name, max_name, summary, max_summary)
-        for name, summary in rows
-    ] + [
-        separator,
-    ]
-    plotting.__doc__ = '\n'.join(lines)
-
-    for cm_name in colormaps():
-        if cm_name in globals():
-            globals()[cm_name].__doc__ = f"""
-    Set the colormap to {cm_name!r}.
-
-    This changes the default colormap as well as the colormap of the current
-    image if there is one. See ``help(colormaps)`` for more information.
-    """
-
-
 ## Plotting part 1: manually generated functions and wrappers ##
 
 
 @_copy_docstring_and_deprecators(Figure.colorbar)
-def colorbar(mappable=None, cax=None, ax=None, **kw):
+def colorbar(mappable=None, cax=None, ax=None, **kwargs):
     if mappable is None:
         mappable = gci()
         if mappable is None:
@@ -2322,7 +2062,7 @@ def colorbar(mappable=None, cax=None, ax=None, **kw):
                                'creation. First define a mappable such as '
                                'an image (with imshow) or a contour set ('
                                'with contourf).')
-    ret = gcf().colorbar(mappable, cax=cax, ax=ax, **kw)
+    ret = gcf().colorbar(mappable, cax=cax, ax=ax, **kwargs)
     return ret
 
 
@@ -2347,6 +2087,13 @@ def clim(vmin=None, vmax=None):
     im.set_clim(vmin, vmax)
 
 
+# eventually this implementation should move here, use indirection for now to
+# avoid having two copies of the code floating around.
+def get_cmap(name=None, lut=None):
+    return cm._get_cmap(name=name, lut=lut)
+get_cmap.__doc__ = cm._get_cmap.__doc__
+
+
 def set_cmap(cmap):
     """
     Set the default colormap, and applies it to the current image if any.
@@ -2362,7 +2109,7 @@ def set_cmap(cmap):
     matplotlib.cm.register_cmap
     matplotlib.cm.get_cmap
     """
-    cmap = cm.get_cmap(cmap)
+    cmap = get_cmap(cmap)
 
     rc('image', cmap=cmap.name)
     im = gci()
@@ -2447,33 +2194,22 @@ def polar(*args, **kwargs):
     # If an axis already exists, check if it has a polar projection
     if gcf().get_axes():
         ax = gca()
-        if isinstance(ax, PolarAxes):
-            return ax
-        else:
+        if not isinstance(ax, PolarAxes):
             _api.warn_external('Trying to create polar plot on an Axes '
                                'that does not have a polar projection.')
-    ax = axes(projection="polar")
-    ret = ax.plot(*args, **kwargs)
-    return ret
+    else:
+        ax = axes(projection="polar")
+    return ax.plot(*args, **kwargs)
 
 
 # If rcParams['backend_fallback'] is true, and an interactive backend is
 # requested, ignore rcParams['backend'] and force selection of a backend that
 # is compatible with the current running interactive framework.
 if (rcParams["backend_fallback"]
-        and dict.__getitem__(rcParams, "backend") in (
+        and rcParams._get_backend_or_none() in (
             set(_interactive_bk) - {'WebAgg', 'nbAgg'})
         and cbook._get_running_interactive_framework()):
     dict.__setitem__(rcParams, "backend", rcsetup._auto_backend_sentinel)
-# Set up the backend.
-switch_backend(rcParams["backend"])
-
-# Just to be safe.  Interactive mode can be turned on without
-# calling `plt.ion()` so register it again here.
-# This is safe because multiple calls to `install_repl_displayhook`
-# are no-ops and the registered function respect `mpl.is_interactive()`
-# to determine if they should trigger a draw.
-install_repl_displayhook()
 
 
 ################# REMAINING CONTENT GENERATED BY boilerplate.py ##############
@@ -2497,8 +2233,8 @@ def figtext(x, y, s, fontdict=None, **kwargs):
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
 @_copy_docstring_and_deprecators(Figure.gca)
-def gca(**kwargs):
-    return gcf().gca(**kwargs)
+def gca():
+    return gcf().gca()
 
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
@@ -2535,6 +2271,12 @@ def suptitle(t, **kwargs):
     return gcf().suptitle(t, **kwargs)
 
 
+# Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
+@_copy_docstring_and_deprecators(Figure.tight_layout)
+def tight_layout(*, pad=1.08, h_pad=None, w_pad=None, rect=None):
+    return gcf().tight_layout(pad=pad, h_pad=h_pad, w_pad=w_pad, rect=rect)
+
+
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
 @_copy_docstring_and_deprecators(Figure.waitforbuttonpress)
 def waitforbuttonpress(timeout=-1):
@@ -2560,8 +2302,13 @@ def angle_spectrum(
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
 @_copy_docstring_and_deprecators(Axes.annotate)
-def annotate(text, xy, *args, **kwargs):
-    return gca().annotate(text, xy, *args, **kwargs)
+def annotate(
+        text, xy, xytext=None, xycoords='data', textcoords=None,
+        arrowprops=None, annotation_clip=None, **kwargs):
+    return gca().annotate(
+        text, xy, xytext=xytext, xycoords=xycoords,
+        textcoords=textcoords, arrowprops=arrowprops,
+        annotation_clip=annotation_clip, **kwargs)
 
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
@@ -2624,16 +2371,20 @@ def bar(
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
 @_copy_docstring_and_deprecators(Axes.barbs)
-def barbs(*args, data=None, **kw):
+def barbs(*args, data=None, **kwargs):
     return gca().barbs(
-        *args, **({"data": data} if data is not None else {}), **kw)
+        *args, **({"data": data} if data is not None else {}),
+        **kwargs)
 
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
 @_copy_docstring_and_deprecators(Axes.barh)
-def barh(y, width, height=0.8, left=None, *, align='center', **kwargs):
+def barh(
+        y, width, height=0.8, left=None, *, align='center',
+        data=None, **kwargs):
     return gca().barh(
-        y, width, height=height, left=left, align=align, **kwargs)
+        y, width, height=height, left=left, align=align,
+        **({"data": data} if data is not None else {}), **kwargs)
 
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
@@ -2656,7 +2407,7 @@ def boxplot(
         showfliers=None, boxprops=None, labels=None, flierprops=None,
         medianprops=None, meanprops=None, capprops=None,
         whiskerprops=None, manage_ticks=True, autorange=False,
-        zorder=None, *, data=None):
+        zorder=None, capwidths=None, *, data=None):
     return gca().boxplot(
         x, notch=notch, sym=sym, vert=vert, whis=whis,
         positions=positions, widths=widths, patch_artist=patch_artist,
@@ -2667,7 +2418,7 @@ def boxplot(
         flierprops=flierprops, medianprops=medianprops,
         meanprops=meanprops, capprops=capprops,
         whiskerprops=whiskerprops, manage_ticks=manage_ticks,
-        autorange=autorange, zorder=zorder,
+        autorange=autorange, zorder=zorder, capwidths=capwidths,
         **({"data": data} if data is not None else {}))
 
 
@@ -2789,8 +2540,8 @@ def fill_betweenx(
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
 @_copy_docstring_and_deprecators(Axes.grid)
-def grid(b=None, which='major', axis='both', **kwargs):
-    return gca().grid(b=b, which=which, axis=axis, **kwargs)
+def grid(visible=None, which='major', axis='both', **kwargs):
+    return gca().grid(visible=visible, which=which, axis=axis, **kwargs)
 
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
@@ -2867,12 +2618,13 @@ def hlines(
 def imshow(
         X, cmap=None, norm=None, aspect=None, interpolation=None,
         alpha=None, vmin=None, vmax=None, origin=None, extent=None, *,
-        filternorm=True, filterrad=4.0, resample=None, url=None,
-        data=None, **kwargs):
+        interpolation_stage=None, filternorm=True, filterrad=4.0,
+        resample=None, url=None, data=None, **kwargs):
     __ret = gca().imshow(
         X, cmap=cmap, norm=norm, aspect=aspect,
         interpolation=interpolation, alpha=alpha, vmin=vmin,
         vmax=vmax, origin=origin, extent=extent,
+        interpolation_stage=interpolation_stage,
         filternorm=filternorm, filterrad=filterrad, resample=resample,
         url=url, **({"data": data} if data is not None else {}),
         **kwargs)
@@ -2971,7 +2723,7 @@ def pie(
         pctdistance=0.6, shadow=False, labeldistance=1.1,
         startangle=0, radius=1, counterclock=True, wedgeprops=None,
         textprops=None, center=(0, 0), frame=False,
-        rotatelabels=False, *, normalize=None, data=None):
+        rotatelabels=False, *, normalize=True, data=None):
     return gca().pie(
         x, explode=explode, labels=labels, colors=colors,
         autopct=autopct, pctdistance=pctdistance, shadow=shadow,
@@ -3015,17 +2767,18 @@ def psd(
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
 @_copy_docstring_and_deprecators(Axes.quiver)
-def quiver(*args, data=None, **kw):
+def quiver(*args, data=None, **kwargs):
     __ret = gca().quiver(
-        *args, **({"data": data} if data is not None else {}), **kw)
+        *args, **({"data": data} if data is not None else {}),
+        **kwargs)
     sci(__ret)
     return __ret
 
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
 @_copy_docstring_and_deprecators(Axes.quiverkey)
-def quiverkey(Q, X, Y, U, label, **kw):
-    return gca().quiverkey(Q, X, Y, U, label, **kw)
+def quiverkey(Q, X, Y, U, label, **kwargs):
+    return gca().quiverkey(Q, X, Y, U, label, **kwargs)
 
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
@@ -3098,8 +2851,9 @@ def stackplot(
 @_copy_docstring_and_deprecators(Axes.stem)
 def stem(
         *args, linefmt=None, markerfmt=None, basefmt=None, bottom=0,
-        label=None, use_line_collection=True, orientation='vertical',
-        data=None):
+        label=None,
+        use_line_collection=_api.deprecation._deprecated_parameter,
+        orientation='vertical', data=None):
     return gca().stem(
         *args, linefmt=linefmt, markerfmt=markerfmt, basefmt=basefmt,
         bottom=bottom, label=label,
@@ -3122,7 +2876,8 @@ def streamplot(
         x, y, u, v, density=1, linewidth=None, color=None, cmap=None,
         norm=None, arrowsize=1, arrowstyle='-|>', minlength=0.1,
         transform=None, zorder=None, start_points=None, maxlength=4.0,
-        integration_direction='both', *, data=None):
+        integration_direction='both', broken_streamlines=True, *,
+        data=None):
     __ret = gca().streamplot(
         x, y, u, v, density=density, linewidth=linewidth, color=color,
         cmap=cmap, norm=norm, arrowsize=arrowsize,
@@ -3130,6 +2885,7 @@ def streamplot(
         transform=transform, zorder=zorder, start_points=start_points,
         maxlength=maxlength,
         integration_direction=integration_direction,
+        broken_streamlines=broken_streamlines,
         **({"data": data} if data is not None else {}))
     sci(__ret.lines)
     return __ret
@@ -3286,25 +3042,209 @@ def yscale(value, **kwargs):
 
 
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
-def autumn(): set_cmap('autumn')
-def bone(): set_cmap('bone')
-def cool(): set_cmap('cool')
-def copper(): set_cmap('copper')
-def flag(): set_cmap('flag')
-def gray(): set_cmap('gray')
-def hot(): set_cmap('hot')
-def hsv(): set_cmap('hsv')
-def jet(): set_cmap('jet')
-def pink(): set_cmap('pink')
-def prism(): set_cmap('prism')
-def spring(): set_cmap('spring')
-def summer(): set_cmap('summer')
-def winter(): set_cmap('winter')
-def magma(): set_cmap('magma')
-def inferno(): set_cmap('inferno')
-def plasma(): set_cmap('plasma')
-def viridis(): set_cmap('viridis')
-def nipy_spectral(): set_cmap('nipy_spectral')
-
-
-_setup_pyplot_info_docstrings()
+def autumn():
+    """
+    Set the colormap to 'autumn'.
+
+    This changes the default colormap as well as the colormap of the current
+    image if there is one. See ``help(colormaps)`` for more information.
+    """
+    set_cmap('autumn')
+
+
+# Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
+def bone():
+    """
+    Set the colormap to 'bone'.
+
+    This changes the default colormap as well as the colormap of the current
+    image if there is one. See ``help(colormaps)`` for more information.
+    """
+    set_cmap('bone')
+
+
+# Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
+def cool():
+    """
+    Set the colormap to 'cool'.
+
+    This changes the default colormap as well as the colormap of the current
+    image if there is one. See ``help(colormaps)`` for more information.
+    """
+    set_cmap('cool')
+
+
+# Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
+def copper():
+    """
+    Set the colormap to 'copper'.
+
+    This changes the default colormap as well as the colormap of the current
+    image if there is one. See ``help(colormaps)`` for more information.
+    """
+    set_cmap('copper')
+
+
+# Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
+def flag():
+    """
+    Set the colormap to 'flag'.
+
+    This changes the default colormap as well as the colormap of the current
+    image if there is one. See ``help(colormaps)`` for more information.
+    """
+    set_cmap('flag')
+
+
+# Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
+def gray():
+    """
+    Set the colormap to 'gray'.
+
+    This changes the default colormap as well as the colormap of the current
+    image if there is one. See ``help(colormaps)`` for more information.
+    """
+    set_cmap('gray')
+
+
+# Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
+def hot():
+    """
+    Set the colormap to 'hot'.
+
+    This changes the default colormap as well as the colormap of the current
+    image if there is one. See ``help(colormaps)`` for more information.
+    """
+    set_cmap('hot')
+
+
+# Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
+def hsv():
+    """
+    Set the colormap to 'hsv'.
+
+    This changes the default colormap as well as the colormap of the current
+    image if there is one. See ``help(colormaps)`` for more information.
+    """
+    set_cmap('hsv')
+
+
+# Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
+def jet():
+    """
+    Set the colormap to 'jet'.
+
+    This changes the default colormap as well as the colormap of the current
+    image if there is one. See ``help(colormaps)`` for more information.
+    """
+    set_cmap('jet')
+
+
+# Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
+def pink():
+    """
+    Set the colormap to 'pink'.
+
+    This changes the default colormap as well as the colormap of the current
+    image if there is one. See ``help(colormaps)`` for more information.
+    """
+    set_cmap('pink')
+
+
+# Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
+def prism():
+    """
+    Set the colormap to 'prism'.
+
+    This changes the default colormap as well as the colormap of the current
+    image if there is one. See ``help(colormaps)`` for more information.
+    """
+    set_cmap('prism')
+
+
+# Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
+def spring():
+    """
+    Set the colormap to 'spring'.
+
+    This changes the default colormap as well as the colormap of the current
+    image if there is one. See ``help(colormaps)`` for more information.
+    """
+    set_cmap('spring')
+
+
+# Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
+def summer():
+    """
+    Set the colormap to 'summer'.
+
+    This changes the default colormap as well as the colormap of the current
+    image if there is one. See ``help(colormaps)`` for more information.
+    """
+    set_cmap('summer')
+
+
+# Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
+def winter():
+    """
+    Set the colormap to 'winter'.
+
+    This changes the default colormap as well as the colormap of the current
+    image if there is one. See ``help(colormaps)`` for more information.
+    """
+    set_cmap('winter')
+
+
+# Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
+def magma():
+    """
+    Set the colormap to 'magma'.
+
+    This changes the default colormap as well as the colormap of the current
+    image if there is one. See ``help(colormaps)`` for more information.
+    """
+    set_cmap('magma')
+
+
+# Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
+def inferno():
+    """
+    Set the colormap to 'inferno'.
+
+    This changes the default colormap as well as the colormap of the current
+    image if there is one. See ``help(colormaps)`` for more information.
+    """
+    set_cmap('inferno')
+
+
+# Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
+def plasma():
+    """
+    Set the colormap to 'plasma'.
+
+    This changes the default colormap as well as the colormap of the current
+    image if there is one. See ``help(colormaps)`` for more information.
+    """
+    set_cmap('plasma')
+
+
+# Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
+def viridis():
+    """
+    Set the colormap to 'viridis'.
+
+    This changes the default colormap as well as the colormap of the current
+    image if there is one. See ``help(colormaps)`` for more information.
+    """
+    set_cmap('viridis')
+
+
+# Autogenerated by boilerplate.py.  Do not edit as changes will be lost.
+def nipy_spectral():
+    """
+    Set the colormap to 'nipy_spectral'.
+
+    This changes the default colormap as well as the colormap of the current
+    image if there is one. See ``help(colormaps)`` for more information.
+    """
+    set_cmap('nipy_spectral')
diff --git a/lib/matplotlib/quiver.py b/lib/matplotlib/quiver.py
index c2786615220f..6d9e4bea219b 100644
--- a/lib/matplotlib/quiver.py
+++ b/lib/matplotlib/quiver.py
@@ -15,12 +15,11 @@
 """
 
 import math
-import weakref
 
 import numpy as np
 from numpy import ma
 
-from matplotlib import _api, cbook, docstring, font_manager
+from matplotlib import _api, cbook, _docstring, font_manager
 import matplotlib.artist as martist
 import matplotlib.collections as mcollections
 from matplotlib.patches import CirclePolygon
@@ -33,29 +32,28 @@
 
 Call signature::
 
-  quiver([X, Y], U, V, [C], **kw)
+  quiver([X, Y], U, V, [C], **kwargs)
 
 *X*, *Y* define the arrow locations, *U*, *V* define the arrow directions, and
 *C* optionally sets the color.
 
-**Arrow size**
+**Arrow length**
 
 The default settings auto-scales the length of the arrows to a reasonable size.
 To change this behavior see the *scale* and *scale_units* parameters.
 
 **Arrow shape**
 
-The defaults give a slightly swept-back arrow; to make the head a
-triangle, make *headaxislength* the same as *headlength*. To make the
-arrow more pointed, reduce *headwidth* or increase *headlength* and
-*headaxislength*. To make the head smaller relative to the shaft,
-scale down all the head parameters. You will probably do best to leave
-minshaft alone.
+The arrow shape is determined by *width*, *headwidth*, *headlength* and
+*headaxislength*. See the notes below.
 
-**Arrow outline**
+**Arrow styling**
+
+Each arrow is internally represented by a filled polygon with a default edge
+linewidth of 0. As a result, an arrow is rather a filled area, not a line with
+a head, and `.PolyCollection` properties like *linewidth*, *edgecolor*,
+*facecolor*, etc. act accordingly.
 
-*linewidths* and *edgecolors* can be used to customize the arrow
-outlines.
 
 Parameters
 ----------
@@ -70,11 +68,12 @@
     must match the column and row dimensions of *U* and *V*.
 
 U, V : 1D or 2D array-like
-    The x and y direction components of the arrow vectors.
+    The x and y direction components of the arrow vectors. The interpretation
+    of these components (in data or in screen space) depends on *angles*.
 
-    They must have the same number of elements, matching the number of arrow
-    locations. *U* and *V* may be masked. Only locations unmasked in
-    *U*, *V*, and *C* will be drawn.
+    *U* and *V* must have the same number of elements, matching the number of
+    arrow locations in  *X*, *Y*. *U* and *V* may be masked. Locations masked
+    in any of *U*, *V*, and *C* will not be drawn.
 
 C : 1D or 2D array-like, optional
     Numeric data that defines the arrow colors by colormapping via *norm* and
@@ -84,38 +83,20 @@
     use *color* instead.  The size of *C* must match the number of arrow
     locations.
 
-units : {'width', 'height', 'dots', 'inches', 'x', 'y', 'xy'}, default: 'width'
-    The arrow dimensions (except for *length*) are measured in multiples of
-    this unit.
-
-    The following values are supported:
-
-    - 'width', 'height': The width or height of the axis.
-    - 'dots', 'inches': Pixels or inches based on the figure dpi.
-    - 'x', 'y', 'xy': *X*, *Y* or :math:`\\sqrt{X^2 + Y^2}` in data units.
-
-    The arrows scale differently depending on the units.  For
-    'x' or 'y', the arrows get larger as one zooms in; for other
-    units, the arrow size is independent of the zoom state.  For
-    'width or 'height', the arrow size increases with the width and
-    height of the axes, respectively, when the window is resized;
-    for 'dots' or 'inches', resizing does not change the arrows.
-
 angles : {'uv', 'xy'} or array-like, default: 'uv'
     Method for determining the angle of the arrows.
 
-    - 'uv': The arrow axis aspect ratio is 1 so that
-      if *U* == *V* the orientation of the arrow on the plot is 45 degrees
-      counter-clockwise from the horizontal axis (positive to the right).
+    - 'uv': Arrow direction in screen coordinates. Use this if the arrows
+      symbolize a quantity that is not based on *X*, *Y* data coordinates.
 
-      Use this if the arrows symbolize a quantity that is not based on
-      *X*, *Y* data coordinates.
+      If *U* == *V* the orientation of the arrow on the plot is 45 degrees
+      counter-clockwise from the  horizontal axis (positive to the right).
 
-    - 'xy': Arrows point from (x, y) to (x+u, y+v).
-      Use this for plotting a gradient field, for example.
+    - 'xy': Arrow direction in data coordinates, i.e. the arrows point from
+      (x, y) to (x+u, y+v). Use this e.g. for plotting a gradient field.
 
-    - Alternatively, arbitrary angles may be specified explicitly as an array
-      of values in degrees, counter-clockwise from the horizontal axis.
+    - Arbitrary angles may be specified explicitly as an array of values
+      in degrees, counter-clockwise from the horizontal axis.
 
       In this case *U*, *V* is only used to determine the length of the
       arrows.
@@ -123,7 +104,15 @@
     Note: inverting a data axis will correspondingly invert the
     arrows only with ``angles='xy'``.
 
+pivot : {'tail', 'mid', 'middle', 'tip'}, default: 'tail'
+    The part of the arrow that is anchored to the *X*, *Y* grid. The arrow
+    rotates about this point.
+
+    'mid' is a synonym for 'middle'.
+
 scale : float, optional
+    Scales the length of the arrow inversely.
+
     Number of data units per arrow length unit, e.g., m/s per plot width; a
     smaller scale parameter makes the arrow longer. Default is *None*.
 
@@ -145,19 +134,42 @@
     the same units as x and y, use
     ``angles='xy', scale_units='xy', scale=1``.
 
+units : {'width', 'height', 'dots', 'inches', 'x', 'y', 'xy'}, default: 'width'
+    Affects the arrow size (except for the length). In particular, the shaft
+    *width* is measured in multiples of this unit.
+
+    Supported values are:
+
+    - 'width', 'height': The width or height of the Axes.
+    - 'dots', 'inches': Pixels or inches based on the figure dpi.
+    - 'x', 'y', 'xy': *X*, *Y* or :math:`\\sqrt{X^2 + Y^2}` in data units.
+
+    The following table summarizes how these values affect the visible arrow
+    size under zooming and figure size changes:
+
+    =================  =================   ==================
+    units              zoom                figure size change
+    =================  =================   ==================
+    'x', 'y', 'xy'     arrow size scales   -
+    'width', 'height'  -                   arrow size scales
+    'dots', 'inches'   -                   -
+    =================  =================   ==================
+
 width : float, optional
-    Shaft width in arrow units; default depends on choice of units,
-    above, and number of vectors; a typical starting value is about
-    0.005 times the width of the plot.
+    Shaft width in arrow units. All head parameters are relative to *width*.
+
+    The default depends on choice of *units* above, and number of vectors;
+    a typical starting value is about 0.005 times the width of the plot.
 
 headwidth : float, default: 3
-    Head width as multiple of shaft width.
+    Head width as multiple of shaft *width*. See the notes below.
 
 headlength : float, default: 5
-    Head length as multiple of shaft width.
+    Head length as multiple of shaft *width*. See the notes below.
 
 headaxislength : float, default: 4.5
-    Head length at shaft intersection.
+    Head length at shaft intersection as multiple of shaft *width*.
+    See the notes below.
 
 minshaft : float, default: 1
     Length below which arrow scales, in units of head length. Do not
@@ -167,29 +179,57 @@
     Minimum length as a multiple of shaft width; if an arrow length
     is less than this, plot a dot (hexagon) of this diameter instead.
 
-pivot : {'tail', 'mid', 'middle', 'tip'}, default: 'tail'
-    The part of the arrow that is anchored to the *X*, *Y* grid. The arrow
-    rotates about this point.
-
-    'mid' is a synonym for 'middle'.
-
 color : color or color sequence, optional
     Explicit color(s) for the arrows. If *C* has been set, *color* has no
     effect.
 
-    This is a synonym for the `~.PolyCollection` *facecolor* parameter.
+    This is a synonym for the `.PolyCollection` *facecolor* parameter.
 
 Other Parameters
 ----------------
+data : indexable object, optional
+    DATA_PARAMETER_PLACEHOLDER
+
 **kwargs : `~matplotlib.collections.PolyCollection` properties, optional
     All other keyword arguments are passed on to `.PolyCollection`:
 
-    %(PolyCollection_kwdoc)s
+    %(PolyCollection:kwdoc)s
+
+Returns
+-------
+`~matplotlib.quiver.Quiver`
 
 See Also
 --------
 .Axes.quiverkey : Add a key to a quiver plot.
-""" % docstring.interpd.params
+
+Notes
+-----
+
+**Arrow shape**
+
+The arrow is drawn as a polygon using the nodes as shown below. The values
+*headwidth*, *headlength*, and *headaxislength* are in units of *width*.
+
+.. image:: /_static/quiver_sizes.svg
+   :width: 500px
+
+The defaults give a slightly swept-back arrow. Here are some guidelines how to
+get other head shapes:
+
+- To make the head a triangle, make *headaxislength* the same as *headlength*.
+- To make the arrow more pointed, reduce *headwidth* or increase *headlength*
+  and *headaxislength*.
+- To make the head smaller relative to the shaft, scale down all the head
+  parameters proportionally.
+- To remove the head completely, set all *head* parameters to 0.
+- To get a diamond-shaped head, make *headaxislength* larger than *headlength*.
+- Warning: For *headaxislength* < (*headlength* / *headwidth*), the "headaxis"
+  nodes (i.e. the ones connecting the head with the shaft) will protrude out
+  of the head in forward direction so that the arrow head looks broken.
+""" % _docstring.interpd.params
+
+_docstring.interpd.update(quiver_doc=_quiver_doc)
 
 
 class QuiverKey(martist.Artist):
@@ -200,8 +240,7 @@ class QuiverKey(martist.Artist):
 
     def __init__(self, Q, X, Y, U, label,
                  *, angle=0, coordinates='axes', color=None, labelsep=0.1,
-                 labelpos='N', labelcolor=None, fontproperties=None,
-                 **kw):
+                 labelpos='N', labelcolor=None, fontproperties=None, **kwargs):
         """
         Add a key to a quiver plot.
 
@@ -259,48 +298,30 @@ def __init__(self, Q, X, Y, U, label,
         self.color = color
         self.label = label
         self._labelsep_inches = labelsep
-        self.labelsep = (self._labelsep_inches * Q.axes.figure.dpi)
-
-        # try to prevent closure over the real self
-        weak_self = weakref.ref(self)
-
-        def on_dpi_change(fig):
-            self_weakref = weak_self()
-            if self_weakref is not None:
-                self_weakref.labelsep = self_weakref._labelsep_inches * fig.dpi
-                # simple brute force update works because _init is called at
-                # the start of draw.
-                self_weakref._initialized = False
-
-        self._cid = Q.axes.figure.callbacks.connect(
-            'dpi_changed', on_dpi_change)
 
         self.labelpos = labelpos
         self.labelcolor = labelcolor
         self.fontproperties = fontproperties or dict()
-        self.kw = kw
+        self.kw = kwargs
         _fp = self.fontproperties
-        # boxprops = dict(facecolor='red')
         self.text = mtext.Text(
-            text=label,  # bbox=boxprops,
+            text=label,
             horizontalalignment=self.halign[self.labelpos],
             verticalalignment=self.valign[self.labelpos],
             fontproperties=font_manager.FontProperties._from_any(_fp))
 
         if self.labelcolor is not None:
             self.text.set_color(self.labelcolor)
-        self._initialized = False
+        self._dpi_at_last_init = None
         self.zorder = Q.zorder + 0.1
 
-    def remove(self):
-        # docstring inherited
-        self.Q.axes.figure.callbacks.disconnect(self._cid)
-        self._cid = None
-        super().remove()  # pass the remove call up the stack
+    @property
+    def labelsep(self):
+        return self._labelsep_inches * self.Q.axes.figure.dpi
 
     def _init(self):
-        if True:  # not self._initialized:
-            if not self.Q._initialized:
+        if True:  # self._dpi_at_last_init != self.axes.figure.dpi
+            if self.Q._dpi_at_last_init != self.Q.axes.figure.dpi:
                 self.Q._init()
             self._set_transform()
             with cbook._setattr_cm(self.Q, pivot=self.pivot[self.labelpos],
@@ -312,18 +333,18 @@ def _init(self):
                          else 'uv')
                 self.verts = self.Q._make_verts(
                     np.array([u]), np.array([v]), angle)
-            kw = self.Q.polykw
-            kw.update(self.kw)
+            kwargs = self.Q.polykw
+            kwargs.update(self.kw)
             self.vector = mcollections.PolyCollection(
-                                        self.verts,
-                                        offsets=[(self.X, self.Y)],
-                                        transOffset=self.get_transform(),
-                                        **kw)
+                self.verts,
+                offsets=[(self.X, self.Y)],
+                offset_transform=self.get_transform(),
+                **kwargs)
             if self.color is not None:
                 self.vector.set_color(self.color)
             self.vector.set_transform(self.Q.get_transform())
             self.vector.set_figure(self.get_figure())
-            self._initialized = True
+            self._dpi_at_last_init = self.Q.axes.figure.dpi
 
     def _text_x(self, x):
         if self.labelpos == 'E':
@@ -454,11 +475,11 @@ class Quiver(mcollections.PolyCollection):
 
     _PIVOT_VALS = ('tail', 'middle', 'tip')
 
-    @docstring.Substitution(_quiver_doc)
+    @_docstring.Substitution(_quiver_doc)
     def __init__(self, ax, *args,
                  scale=None, headwidth=3, headlength=5, headaxislength=4.5,
                  minshaft=1, minlength=1, units='width', scale_units=None,
-                 angles='uv', width=None, color='k', pivot='tail', **kw):
+                 angles='uv', width=None, color='k', pivot='tail', **kwargs):
         """
         The constructor takes one required argument, an Axes
         instance, followed by the args and kwargs described
@@ -487,37 +508,14 @@ def __init__(self, ax, *args,
         self.pivot = pivot.lower()
         _api.check_in_list(self._PIVOT_VALS, pivot=self.pivot)
 
-        self.transform = kw.pop('transform', ax.transData)
-        kw.setdefault('facecolors', color)
-        kw.setdefault('linewidths', (0,))
-        super().__init__([], offsets=self.XY, transOffset=self.transform,
-                         closed=False, **kw)
-        self.polykw = kw
+        self.transform = kwargs.pop('transform', ax.transData)
+        kwargs.setdefault('facecolors', color)
+        kwargs.setdefault('linewidths', (0,))
+        super().__init__([], offsets=self.XY, offset_transform=self.transform,
+                         closed=False, **kwargs)
+        self.polykw = kwargs
         self.set_UVC(U, V, C)
-        self._initialized = False
-
-        weak_self = weakref.ref(self)  # Prevent closure over the real self.
-
-        def on_dpi_change(fig):
-            self_weakref = weak_self()
-            if self_weakref is not None:
-                # vertices depend on width, span which in turn depend on dpi
-                self_weakref._new_UV = True
-                # simple brute force update works because _init is called at
-                # the start of draw.
-                self_weakref._initialized = False
-
-        self._cid = ax.figure.callbacks.connect('dpi_changed', on_dpi_change)
-
-    @_api.deprecated("3.3", alternative="axes")
-    def ax(self):
-        return self.axes
-
-    def remove(self):
-        # docstring inherited
-        self.axes.figure.callbacks.disconnect(self._cid)
-        self._cid = None
-        super().remove()  # pass the remove call up the stack
+        self._dpi_at_last_init = None
 
     def _init(self):
         """
@@ -526,7 +524,7 @@ def _init(self):
         """
         # It seems that there are not enough event notifications
         # available to have this work on an as-needed basis at present.
-        if True:  # not self._initialized:
+        if True:  # self._dpi_at_last_init != self.axes.figure.dpi
             trans = self._set_transform()
             self.span = trans.inverted().transform_bbox(self.axes.bbox).width
             if self.width is None:
@@ -534,15 +532,16 @@ def _init(self):
                 self.width = 0.06 * self.span / sn
 
             # _make_verts sets self.scale if not already specified
-            if not self._initialized and self.scale is None:
+            if (self._dpi_at_last_init != self.axes.figure.dpi
+                    and self.scale is None):
                 self._make_verts(self.U, self.V, self.angles)
 
-            self._initialized = True
+            self._dpi_at_last_init = self.axes.figure.dpi
 
     def get_datalim(self, transData):
         trans = self.get_transform()
-        transOffset = self.get_offset_transform()
-        full_transform = (trans - transData) + (transOffset - transData)
+        offset_trf = self.get_offset_transform()
+        full_transform = (trans - transData) + (offset_trf - transData)
         XY = full_transform.transform(self.XY)
         bbox = transforms.Bbox.null()
         bbox.update_from_data_xy(XY, ignore=True)
@@ -553,7 +552,6 @@ def draw(self, renderer):
         self._init()
         verts = self._make_verts(self.U, self.V, self.angles)
         self.set_verts(verts, closed=False)
-        self._new_UV = False
         super().draw(renderer)
         self.stale = False
 
@@ -582,40 +580,21 @@ def set_UVC(self, U, V, C=None):
         self.Umask = mask
         if C is not None:
             self.set_array(C)
-        self._new_UV = True
         self.stale = True
 
     def _dots_per_unit(self, units):
-        """
-        Return a scale factor for converting from units to pixels
-        """
-        if units in ('x', 'y', 'xy'):
-            if units == 'x':
-                dx0 = self.axes.viewLim.width
-                dx1 = self.axes.bbox.width
-            elif units == 'y':
-                dx0 = self.axes.viewLim.height
-                dx1 = self.axes.bbox.height
-            else:  # 'xy' is assumed
-                dxx0 = self.axes.viewLim.width
-                dxx1 = self.axes.bbox.width
-                dyy0 = self.axes.viewLim.height
-                dyy1 = self.axes.bbox.height
-                dx1 = np.hypot(dxx1, dyy1)
-                dx0 = np.hypot(dxx0, dyy0)
-            dx = dx1 / dx0
-        else:
-            if units == 'width':
-                dx = self.axes.bbox.width
-            elif units == 'height':
-                dx = self.axes.bbox.height
-            elif units == 'dots':
-                dx = 1.0
-            elif units == 'inches':
-                dx = self.axes.figure.dpi
-            else:
-                raise ValueError('unrecognized units')
-        return dx
+        """Return a scale factor for converting from units to pixels."""
+        bb = self.axes.bbox
+        vl = self.axes.viewLim
+        return _api.check_getitem({
+            'x': bb.width / vl.width,
+            'y': bb.height / vl.height,
+            'xy': np.hypot(*bb.size) / np.hypot(*vl.size),
+            'width': bb.width,
+            'height': bb.height,
+            'dots': 1.,
+            'inches': self.axes.figure.dpi,
+        }, units=units)
 
     def _set_transform(self):
         """
@@ -763,7 +742,7 @@ def _h_arrows(self, length):
 
 Call signature::
 
-  barbs([X, Y], U, V, [C], **kw)
+  barbs([X, Y], U, V, [C], **kwargs)
 
 Where *X*, *Y* define the barb locations, *U*, *V* define the barb
 directions, and *C* optionally sets the color.
@@ -884,14 +863,17 @@ def _h_arrows(self, length):
 
 Other Parameters
 ----------------
+data : indexable object, optional
+    DATA_PARAMETER_PLACEHOLDER
+
 **kwargs
     The barbs can further be customized using `.PolyCollection` keyword
     arguments:
 
-    %(PolyCollection_kwdoc)s
-""" % docstring.interpd.params
+    %(PolyCollection:kwdoc)s
+""" % _docstring.interpd.params
 
-docstring.interpd.update(barbs_doc=_barbs_doc)
+_docstring.interpd.update(barbs_doc=_barbs_doc)
 
 
 class Barbs(mcollections.PolyCollection):
@@ -911,11 +893,11 @@ class Barbs(mcollections.PolyCollection):
     # This may be an abuse of polygons here to render what is essentially maybe
     # 1 triangle and a series of lines.  It works fine as far as I can tell
     # however.
-    @docstring.interpd
+    @_docstring.interpd
     def __init__(self, ax, *args,
                  pivot='tip', length=7, barbcolor=None, flagcolor=None,
                  sizes=None, fill_empty=False, barb_increments=None,
-                 rounding=True, flip_barb=False, **kw):
+                 rounding=True, flip_barb=False, **kwargs):
         """
         The constructor takes one required argument, an Axes
         instance, followed by the args and kwargs described
@@ -927,11 +909,9 @@ def __init__(self, ax, *args,
         self.barb_increments = barb_increments or dict()
         self.rounding = rounding
         self.flip = np.atleast_1d(flip_barb)
-        transform = kw.pop('transform', ax.transData)
+        transform = kwargs.pop('transform', ax.transData)
         self._pivot = pivot
         self._length = length
-        barbcolor = barbcolor
-        flagcolor = flagcolor
 
         # Flagcolor and barbcolor provide convenience parameters for
         # setting the facecolor and edgecolor, respectively, of the barb
@@ -939,22 +919,22 @@ def __init__(self, ax, *args,
         # rest of the barb by default
 
         if None in (barbcolor, flagcolor):
-            kw['edgecolors'] = 'face'
+            kwargs['edgecolors'] = 'face'
             if flagcolor:
-                kw['facecolors'] = flagcolor
+                kwargs['facecolors'] = flagcolor
             elif barbcolor:
-                kw['facecolors'] = barbcolor
+                kwargs['facecolors'] = barbcolor
             else:
                 # Set to facecolor passed in or default to black
-                kw.setdefault('facecolors', 'k')
+                kwargs.setdefault('facecolors', 'k')
         else:
-            kw['edgecolors'] = barbcolor
-            kw['facecolors'] = flagcolor
+            kwargs['edgecolors'] = barbcolor
+            kwargs['facecolors'] = flagcolor
 
         # Explicitly set a line width if we're not given one, otherwise
         # polygons are not outlined and we get no barbs
-        if 'linewidth' not in kw and 'lw' not in kw:
-            kw['linewidth'] = 1
+        if 'linewidth' not in kwargs and 'lw' not in kwargs:
+            kwargs['linewidth'] = 1
 
         # Parse out the data arrays from the various configurations supported
         x, y, u, v, c = _parse_args(*args, caller_name='barbs()')
@@ -964,8 +944,8 @@ def __init__(self, ax, *args,
 
         # Make a collection
         barb_size = self._length ** 2 / 4  # Empirically determined
-        super().__init__([], (barb_size,), offsets=xy, transOffset=transform,
-                         **kw)
+        super().__init__(
+            [], (barb_size,), offsets=xy, offset_transform=transform, **kwargs)
         self.set_transform(transforms.IdentityTransform())
 
         self.set_UVC(u, v, c)
@@ -1147,8 +1127,10 @@ def _make_barbs(self, u, v, nflags, nbarbs, half_barb, empty_flag, length,
         return barb_list
 
     def set_UVC(self, U, V, C=None):
-        self.u = ma.masked_invalid(U, copy=False).ravel()
-        self.v = ma.masked_invalid(V, copy=False).ravel()
+        # We need to ensure we have a copy, not a reference to an array that
+        # might change before draw().
+        self.u = ma.masked_invalid(U, copy=True).ravel()
+        self.v = ma.masked_invalid(V, copy=True).ravel()
 
         # Flip needs to have the same number of entries as everything else.
         # Use broadcast_to to avoid a bloated array of identical values.
@@ -1159,7 +1141,7 @@ def set_UVC(self, U, V, C=None):
             flip = self.flip
 
         if C is not None:
-            c = ma.masked_invalid(C, copy=False).ravel()
+            c = ma.masked_invalid(C, copy=True).ravel()
             x, y, u, v, c, flip = cbook.delete_masked_points(
                 self.x.ravel(), self.y.ravel(), self.u, self.v, c,
                 flip.ravel())
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
index e53dc2c27eb1..0a0e0bb2734c 100644
--- a/lib/matplotlib/rcsetup.py
+++ b/lib/matplotlib/rcsetup.py
@@ -17,14 +17,15 @@
 from functools import lru_cache, reduce
 from numbers import Number
 import operator
+import os
 import re
 
 import numpy as np
 
-from matplotlib import _api, animation, cbook
+from matplotlib import _api, cbook
 from matplotlib.cbook import ls_mapper
 from matplotlib.colors import Colormap, is_color_like
-from matplotlib.fontconfig_pattern import parse_fontconfig_pattern
+from matplotlib._fontconfig_pattern import parse_fontconfig_pattern
 from matplotlib._enums import JoinStyle, CapStyle
 
 # Don't let the original cycler collide with our validating cycler
@@ -33,13 +34,15 @@
 
 # The capitalized forms are needed for ipython at present; this may
 # change for later versions.
-interactive_bk = ['GTK3Agg', 'GTK3Cairo',
-                  'MacOSX',
-                  'nbAgg',
-                  'Qt4Agg', 'Qt4Cairo', 'Qt5Agg', 'Qt5Cairo',
-                  'TkAgg', 'TkCairo',
-                  'WebAgg',
-                  'WX', 'WXAgg', 'WXCairo']
+interactive_bk = [
+    'GTK3Agg', 'GTK3Cairo', 'GTK4Agg', 'GTK4Cairo',
+    'MacOSX',
+    'nbAgg',
+    'QtAgg', 'QtCairo', 'Qt5Agg', 'Qt5Cairo',
+    'TkAgg', 'TkCairo',
+    'WebAgg',
+    'WX', 'WXAgg', 'WXCairo',
+]
 non_interactive_bk = ['agg', 'cairo',
                       'pdf', 'pgf', 'ps', 'svg', 'template']
 all_backends = interactive_bk + non_interactive_bk
@@ -143,65 +146,7 @@ def validate_bool(b):
     elif b in ('f', 'n', 'no', 'off', 'false', '0', 0, False):
         return False
     else:
-        raise ValueError('Could not convert "%s" to bool' % b)
-
-
-@_api.deprecated("3.3")
-def validate_bool_maybe_none(b):
-    """Convert b to ``bool`` or raise, passing through *None*."""
-    if isinstance(b, str):
-        b = b.lower()
-    if b is None or b == 'none':
-        return None
-    if b in ('t', 'y', 'yes', 'on', 'true', '1', 1, True):
-        return True
-    elif b in ('f', 'n', 'no', 'off', 'false', '0', 0, False):
-        return False
-    else:
-        raise ValueError('Could not convert "%s" to bool' % b)
-
-
-def _validate_date_converter(s):
-    if s is None:
-        return
-    s = validate_string(s)
-    if s not in ['auto', 'concise']:
-        _api.warn_external(f'date.converter string must be "auto" or '
-                           f'"concise", not "{s}".  Check your matplotlibrc')
-        return
-    import matplotlib.dates as mdates
-    mdates._rcParam_helper.set_converter(s)
-
-
-def _validate_date_int_mult(s):
-    if s is None:
-        return
-    s = validate_bool(s)
-    import matplotlib.dates as mdates
-    mdates._rcParam_helper.set_int_mult(s)
-
-
-def _validate_tex_preamble(s):
-    if s is None or s == 'None':
-        _api.warn_deprecated(
-            "3.3", message="Support for setting the 'text.latex.preamble' or "
-            "'pgf.preamble' rcParam to None is deprecated since %(since)s and "
-            "will be removed %(removal)s; set it to an empty string instead.")
-        return ""
-    try:
-        if isinstance(s, str):
-            return s
-        elif np.iterable(s):
-            _api.warn_deprecated(
-                "3.3", message="Support for setting the 'text.latex.preamble' "
-                "or 'pgf.preamble' rcParam to a list of strings is deprecated "
-                "since %(since)s and will be removed %(removal)s; set it to a "
-                "single string instead.")
-            return '\n'.join(s)
-        else:
-            raise TypeError
-    except TypeError as e:
-        raise ValueError('Could not convert "%s" to string' % s) from e
+        raise ValueError(f'Cannot convert {b!r} to bool')
 
 
 def validate_axisbelow(s):
@@ -211,14 +156,8 @@ def validate_axisbelow(s):
         if isinstance(s, str):
             if s == 'line':
                 return 'line'
-            if s.lower().startswith('line'):
-                _api.warn_deprecated(
-                    "3.3", message=f"Support for setting axes.axisbelow to "
-                    f"{s!r} to mean 'line' is deprecated since %(since)s and "
-                    f"will be removed %(removal)s; set it to 'line' instead.")
-                return 'line'
-    raise ValueError('%s cannot be interpreted as'
-                     ' True, False, or "line"' % s)
+    raise ValueError(f'{s!r} cannot be interpreted as'
+                     ' True, False, or "line"')
 
 
 def validate_dpi(s):
@@ -242,6 +181,11 @@ def validator(s):
         if (allow_none and
                 (s is None or isinstance(s, str) and s.lower() == "none")):
             return None
+        if cls is str and not isinstance(s, str):
+            _api.warn_deprecated(
+                "3.5", message="Support for setting an rcParam that expects a "
+                "str value to a non-str value is deprecated since %(since)s "
+                "and support will be removed %(removal)s.")
         try:
             return cls(s)
         except (TypeError, ValueError) as e:
@@ -268,6 +212,15 @@ def validator(s):
     validate_float, doc='return a list of floats')
 
 
+def _validate_pathlike(s):
+    if isinstance(s, (str, os.PathLike)):
+        # Store value as str because savefig.directory needs to distinguish
+        # between "" (cwd) and "." (cwd, but gets updated by user selections).
+        return os.fsdecode(s)
+    else:
+        return validate_string(s)  # Emit deprecation warning.
+
+
 def validate_fonttype(s):
     """
     Confirm that this is a Postscript or PDF font type that we know how to
@@ -303,11 +256,6 @@ def validate_backend(s):
     return backend
 
 
-validate_toolbar = ValidateInStrings(
-    'toolbar', ['None', 'toolbar2', 'toolmanager'], ignorecase=True,
-    _deprecated_since="3.3")
-
-
 def _validate_toolbar(s):
     s = ValidateInStrings(
         'toolbar', ['None', 'toolbar2', 'toolmanager'], ignorecase=True)(s)
@@ -318,42 +266,6 @@ def _validate_toolbar(s):
     return s
 
 
-@_api.deprecated("3.3")
-def _make_nseq_validator(cls, n=None, allow_none=False):
-
-    def validator(s):
-        """Convert *n* objects using ``cls``, or raise."""
-        if isinstance(s, str):
-            s = [x.strip() for x in s.split(',')]
-            if n is not None and len(s) != n:
-                raise ValueError(
-                    f'Expected exactly {n} comma-separated values, '
-                    f'but got {len(s)} comma-separated values: {s}')
-        else:
-            if n is not None and len(s) != n:
-                raise ValueError(
-                    f'Expected exactly {n} values, '
-                    f'but got {len(s)} values: {s}')
-        try:
-            return [cls(val) if not allow_none or val is not None else val
-                    for val in s]
-        except ValueError as e:
-            raise ValueError(
-                f'Could not convert all entries to {cls.__name__}s') from e
-
-    return validator
-
-
-@_api.deprecated("3.3")
-def validate_nseq_float(n):
-    return _make_nseq_validator(float, n)
-
-
-@_api.deprecated("3.3")
-def validate_nseq_int(n):
-    return _make_nseq_validator(int, n)
-
-
 def validate_color_or_inherit(s):
     """Return a valid color arg."""
     if cbook._str_equal(s, 'inherit'):
@@ -374,6 +286,27 @@ def validate_color_for_prop_cycle(s):
     return validate_color(s)
 
 
+def _validate_color_or_linecolor(s):
+    if cbook._str_equal(s, 'linecolor'):
+        return s
+    elif cbook._str_equal(s, 'mfc') or cbook._str_equal(s, 'markerfacecolor'):
+        return 'markerfacecolor'
+    elif cbook._str_equal(s, 'mec') or cbook._str_equal(s, 'markeredgecolor'):
+        return 'markeredgecolor'
+    elif s is None:
+        return None
+    elif isinstance(s, str) and len(s) == 6 or len(s) == 8:
+        stmp = '#' + s
+        if is_color_like(stmp):
+            return stmp
+        if s.lower() == 'none':
+            return None
+    elif is_color_like(s):
+        return s
+
+    raise ValueError(f'{s!r} does not look like a color arg')
+
+
 def validate_color(s):
     """Return a valid color arg."""
     if isinstance(s, str):
@@ -408,10 +341,6 @@ def _validate_cmap(s):
     return s
 
 
-validate_orientation = ValidateInStrings(
-    'orientation', ['landscape', 'portrait'], _deprecated_since="3.3")
-
-
 def validate_aspect(s):
     if s in ('auto', 'equal'):
         return s
@@ -458,28 +387,25 @@ def validate_fontweight(s):
         raise ValueError(f'{s} is not a valid font weight.') from e
 
 
+def validate_fontstretch(s):
+    stretchvalues = [
+        'ultra-condensed', 'extra-condensed', 'condensed', 'semi-condensed',
+        'normal', 'semi-expanded', 'expanded', 'extra-expanded',
+        'ultra-expanded']
+    # Note: Historically, stretchvalues have been case-sensitive in Matplotlib
+    if s in stretchvalues:
+        return s
+    try:
+        return int(s)
+    except (ValueError, TypeError) as e:
+        raise ValueError(f'{s} is not a valid font stretch.') from e
+
+
 def validate_font_properties(s):
     parse_fontconfig_pattern(s)
     return s
 
 
-def _validate_mathtext_fallback_to_cm(b):
-    """
-    Temporary validate for fallback_to_cm, while deprecated
-
-    """
-    if isinstance(b, str):
-        b = b.lower()
-    if b is None or b == 'none':
-        return None
-    else:
-        _api.warn_deprecated(
-            "3.3", message="Support for setting the 'mathtext.fallback_to_cm' "
-            "rcParam is deprecated since %(since)s and will be removed "
-            "%(removal)s; use 'mathtext.fallback : 'cm' instead.")
-        return validate_bool_maybe_none(b)
-
-
 def _validate_mathtext_fallback(s):
     _fallback_fonts = ['cm', 'stix', 'stixsans']
     if isinstance(s, str):
@@ -495,19 +421,6 @@ def _validate_mathtext_fallback(s):
             "fallback off.")
 
 
-validate_fontset = ValidateInStrings(
-    'fontset',
-    ['dejavusans', 'dejavuserif', 'cm', 'stix', 'stixsans', 'custom'],
-    _deprecated_since="3.3")
-validate_mathtext_default = ValidateInStrings(
-    'default', "rm cal it tt sf bf default bb frak scr regular".split(),
-    _deprecated_since="3.3")
-_validate_alignment = ValidateInStrings(
-    'alignment',
-    ['center', 'top', 'bottom', 'baseline', 'center_baseline'],
-    _deprecated_since="3.3")
-
-
 def validate_whiskers(s):
     try:
         return _listify_validator(validate_float, n=2)(s)
@@ -515,18 +428,10 @@ def validate_whiskers(s):
         try:
             return float(s)
         except ValueError as e:
-            raise ValueError("Not a valid whisker value ['range', float, "
+            raise ValueError("Not a valid whisker value [float, "
                              "(float, float)]") from e
 
 
-validate_ps_papersize = ValidateInStrings(
-    'ps_papersize',
-    ['auto', 'letter', 'legal', 'ledger',
-     'a0', 'a1', 'a2', 'a3', 'a4', 'a5', 'a6', 'a7', 'a8', 'a9', 'a10',
-     'b0', 'b1', 'b2', 'b3', 'b4', 'b5', 'b6', 'b7', 'b8', 'b9', 'b10',
-     ], ignorecase=True, _deprecated_since="3.3")
-
-
 def validate_ps_distiller(s):
     if isinstance(s, str):
         s = s.lower()
@@ -564,25 +469,20 @@ def _is_iterable_not_string_like(x):
         # nonsensically interpreted as sequences of numbers (codepoints).
         return np.iterable(x) and not isinstance(x, (str, bytes, bytearray))
 
-    # (offset, (on, off, on, off, ...))
-    if (_is_iterable_not_string_like(ls)
-            and len(ls) == 2
-            and isinstance(ls[0], (type(None), Number))
-            and _is_iterable_not_string_like(ls[1])
-            and len(ls[1]) % 2 == 0
-            and all(isinstance(elem, Number) for elem in ls[1])):
-        if ls[0] is None:
-            _api.warn_deprecated(
-                "3.3", message="Passing the dash offset as None is deprecated "
-                "since %(since)s and support for it will be removed "
-                "%(removal)s; pass it as zero instead.")
-            ls = (0, ls[1])
-        return ls
-    # For backcompat: (on, off, on, off, ...); the offset is implicitly None.
-    if (_is_iterable_not_string_like(ls)
-            and len(ls) % 2 == 0
-            and all(isinstance(elem, Number) for elem in ls)):
-        return (0, ls)
+    if _is_iterable_not_string_like(ls):
+        if len(ls) == 2 and _is_iterable_not_string_like(ls[1]):
+            # (offset, (on, off, on, off, ...))
+            offset, onoff = ls
+        else:
+            # For backcompat: (on, off, on, off, ...); the offset is implicit.
+            offset = 0
+            onoff = ls
+
+        if (isinstance(offset, Number)
+                and len(onoff) % 2 == 0
+                and all(isinstance(elem, Number) for elem in onoff)):
+            return (offset, onoff)
+
     raise ValueError(f"linestyle {ls!r} is not a valid on-off ink sequence.")
 
 
@@ -599,14 +499,11 @@ def validate_markevery(s):
 
     Parameters
     ----------
-    s : None, int, float, slice, length-2 tuple of ints,
-        length-2 tuple of floats, list of ints
+    s : None, int, (int, int), slice, float, (float, float), or list[int]
 
     Returns
     -------
-    None, int, float, slice, length-2 tuple of ints,
-        length-2 tuple of floats, list of ints
-
+    None, int, (int, int), slice, float, (float, float), or list[int]
     """
     # Validate s against type slice float int and None
     if isinstance(s, (slice, float, int, type(None))):
@@ -632,62 +529,6 @@ def validate_markevery(s):
 
 validate_markeverylist = _listify_validator(validate_markevery)
 
-validate_legend_loc = ValidateInStrings(
-    'legend_loc',
-    ['best',
-     'upper right',
-     'upper left',
-     'lower left',
-     'lower right',
-     'right',
-     'center left',
-     'center right',
-     'lower center',
-     'upper center',
-     'center'], ignorecase=True, _deprecated_since="3.3")
-
-validate_svg_fonttype = ValidateInStrings(
-    'svg.fonttype', ['none', 'path'], _deprecated_since="3.3")
-
-
-@_api.deprecated("3.3")
-def validate_hinting(s):
-    return _validate_hinting(s)
-
-
-# Replace by plain list in _prop_validators after deprecation period.
-_validate_hinting = ValidateInStrings(
-    'text.hinting',
-    ['default', 'no_autohint', 'force_autohint', 'no_hinting',
-     'auto', 'native', 'either', 'none'],
-    ignorecase=True)
-
-
-validate_pgf_texsystem = ValidateInStrings(
-    'pgf.texsystem', ['xelatex', 'lualatex', 'pdflatex'],
-    _deprecated_since="3.3")
-
-
-@_api.deprecated("3.3")
-def validate_movie_writer(s):
-    # writers.list() would only list actually available writers, but
-    # FFMpeg.isAvailable is slow and not worth paying for at every import.
-    if s in animation.writers._registered:
-        return s
-    else:
-        raise ValueError(f"Supported animation writers are "
-                         f"{sorted(animation.writers._registered)}")
-
-
-validate_movie_frame_fmt = ValidateInStrings(
-    'animation.frame_format', ['png', 'jpeg', 'tiff', 'raw', 'rgba', 'ppm',
-                               'sgi', 'bmp', 'pbm', 'svg'],
-    _deprecated_since="3.3")
-validate_axis_locator = ValidateInStrings(
-    'major', ['minor', 'both', 'major'], _deprecated_since="3.3")
-validate_movie_html_fmt = ValidateInStrings(
-    'animation.html', ['html5', 'jshtml', 'none'], _deprecated_since="3.3")
-
 
 def validate_bbox(s):
     if isinstance(s, str):
@@ -736,10 +577,6 @@ def _validate_greaterequal0_lessequal1(s):
 }
 
 
-validate_grid_axis = ValidateInStrings(
-    'axes.grid.axis', ['x', 'y', 'both'], _deprecated_since="3.3")
-
-
 def validate_hatch(s):
     r"""
     Validate a hatch pattern.
@@ -877,6 +714,13 @@ def cycler(*args, **kwargs):
     return reduce(operator.add, (ccycler(k, v) for k, v in validated))
 
 
+class _DunderChecker(ast.NodeVisitor):
+    def visit_Attribute(self, node):
+        if node.attr.startswith("__") and node.attr.endswith("__"):
+            raise ValueError("cycler strings with dunders are forbidden")
+        self.generic_visit(node)
+
+
 def validate_cycler(s):
     """Return a Cycler object from a string repr or the object itself."""
     if isinstance(s, str):
@@ -888,23 +732,21 @@ def validate_cycler(s):
         # I locked it down by only having the 'cycler()' function available.
         # UPDATE: Partly plugging a security hole.
         # I really should have read this:
-        # http://nedbatchelder.com/blog/201206/eval_really_is_dangerous.html
+        # https://nedbatchelder.com/blog/201206/eval_really_is_dangerous.html
         # We should replace this eval with a combo of PyParsing and
         # ast.literal_eval()
         try:
-            if '.__' in s.replace(' ', ''):
-                raise ValueError("'%s' seems to have dunder methods. Raising"
-                                 " an exception for your safety")
+            _DunderChecker().visit(ast.parse(s))
             s = eval(s, {'cycler': cycler, '__builtins__': {}})
         except BaseException as e:
-            raise ValueError("'%s' is not a valid cycler construction: %s" %
-                             (s, e)) from e
+            raise ValueError(f"{s!r} is not a valid cycler construction: {e}"
+                             ) from e
     # Should make sure what comes from the above eval()
     # is a Cycler object.
     if isinstance(s, Cycler):
         cycler_inst = s
     else:
-        raise ValueError("object was not a string or Cycler instance: %s" % s)
+        raise ValueError(f"Object is not a string or Cycler instance: {s!r}")
 
     unknowns = cycler_inst.keys - (set(_prop_validators) | set(_prop_aliases))
     if unknowns:
@@ -916,12 +758,11 @@ def validate_cycler(s):
     for prop in cycler_inst.keys:
         norm_prop = _prop_aliases.get(prop, prop)
         if norm_prop != prop and norm_prop in cycler_inst.keys:
-            raise ValueError("Cannot specify both '{0}' and alias '{1}'"
-                             " in the same prop_cycle".format(norm_prop, prop))
+            raise ValueError(f"Cannot specify both {norm_prop!r} and alias "
+                             f"{prop!r} in the same prop_cycle")
         if norm_prop in checker:
-            raise ValueError("Another property was already aliased to '{0}'."
-                             " Collision normalizing '{1}'.".format(norm_prop,
-                                                                    prop))
+            raise ValueError(f"Another property was already aliased to "
+                             f"{norm_prop!r}. Collision normalizing {prop!r}.")
         checker.update([norm_prop])
 
     # This is just an extra-careful check, just in case there is some
@@ -955,23 +796,6 @@ def validate_hist_bins(s):
                      " a sequence of floats".format(valid_strs))
 
 
-@_api.deprecated("3.3")
-def validate_webagg_address(s):
-    if s is not None:
-        import socket
-        try:
-            socket.inet_aton(s)
-        except socket.error as e:
-            raise ValueError(
-                "'webagg.address' is not a valid IP address") from e
-        return s
-    raise ValueError("'webagg.address' is not a valid IP address")
-
-
-validate_axes_titlelocation = ValidateInStrings(
-    'axes.titlelocation', ['left', 'center', 'right'], _deprecated_since="3.3")
-
-
 class _ignorecase(list):
     """A marker class indicating that a list-of-str is case-insensitive."""
 
@@ -1090,7 +914,7 @@ def _convert_validator_spec(key, conv):
     "font.family":     validate_stringlist,  # used by text object
     "font.style":      validate_string,
     "font.variant":    validate_string,
-    "font.stretch":    validate_string,
+    "font.stretch":    validate_fontstretch,
     "font.weight":     validate_fontweight,
     "font.size":       validate_float,  # Base font size in points
     "font.serif":      validate_stringlist,
@@ -1102,12 +926,13 @@ def _convert_validator_spec(key, conv):
     # text props
     "text.color":          validate_color,
     "text.usetex":         validate_bool,
-    "text.latex.preamble": _validate_tex_preamble,
-    "text.latex.preview":  validate_bool,
-    "text.hinting":        _validate_hinting,
+    "text.latex.preamble": validate_string,
+    "text.hinting":        ["default", "no_autohint", "force_autohint",
+                            "no_hinting", "auto", "native", "either", "none"],
     "text.hinting_factor": validate_int,
     "text.kerning_factor": validate_int,
     "text.antialiased":    validate_bool,
+    "text.parse_math":     validate_bool,
 
     "mathtext.cal":            validate_font_properties,
     "mathtext.rm":             validate_font_properties,
@@ -1119,7 +944,6 @@ def _convert_validator_spec(key, conv):
                                 "stixsans", "custom"],
     "mathtext.default":        ["rm", "cal", "it", "tt", "sf", "bf", "default",
                                 "bb", "frak", "scr", "regular"],
-    "mathtext.fallback_to_cm": _validate_mathtext_fallback_to_cm,
     "mathtext.fallback":       _validate_mathtext_fallback,
 
     "image.aspect":          validate_aspect,  # equal, auto, a number
@@ -1136,6 +960,7 @@ def _convert_validator_spec(key, conv):
     "contour.negative_linestyle": _validate_linestyle,
     "contour.corner_mask":        validate_bool,
     "contour.linewidth":          validate_float_or_None,
+    "contour.algorithm":          ["mpl2005", "mpl2014", "serial", "threaded"],
 
     # errorbar props
     "errorbar.capsize": validate_float,
@@ -1208,10 +1033,9 @@ def _convert_validator_spec(key, conv):
     "date.autoformatter.second":      validate_string,
     "date.autoformatter.microsecond": validate_string,
 
-    # 'auto', 'concise', 'auto-noninterval'
-    'date.converter': _validate_date_converter,
+    'date.converter':          ['auto', 'concise'],
     # for auto date locator, choose interval_multiples
-    'date.interval_multiples': _validate_date_int_mult,
+    'date.interval_multiples': validate_bool,
 
     # legend properties
     "legend.fancybox": validate_bool,
@@ -1227,12 +1051,14 @@ def _convert_validator_spec(key, conv):
     "legend.scatterpoints":  validate_int,
     "legend.fontsize":       validate_fontsize,
     "legend.title_fontsize": validate_fontsize_None,
-     # the relative size of legend markers vs. original
+    # color of the legend
+    "legend.labelcolor":     _validate_color_or_linecolor,
+    # the relative size of legend markers vs. original
     "legend.markerscale":    validate_float,
     "legend.shadow":         validate_bool,
-     # whether or not to draw a frame around legend
+    # whether or not to draw a frame around legend
     "legend.frameon":        validate_bool,
-     # alpha value of the legend frame
+    # alpha value of the legend frame
     "legend.framealpha":     validate_float_or_None,
 
     ## the following dimensions are in fraction of the font size
@@ -1306,6 +1132,10 @@ def _convert_validator_spec(key, conv):
     "figure.titlesize":   validate_fontsize,
     "figure.titleweight": validate_fontweight,
 
+    # figure labels
+    "figure.labelsize":   validate_fontsize,
+    "figure.labelweight": validate_fontweight,
+
     # figure size in inches: width by height
     "figure.figsize":          _listify_validator(validate_float, n=2),
     "figure.dpi":              validate_float,
@@ -1337,12 +1167,11 @@ def _convert_validator_spec(key, conv):
     'savefig.facecolor':    validate_color_or_auto,
     'savefig.edgecolor':    validate_color_or_auto,
     'savefig.orientation':  ['landscape', 'portrait'],
-    'savefig.jpeg_quality': validate_int,
     "savefig.format":       validate_string,
     "savefig.bbox":         validate_bbox,  # "tight", or "standard" (= None)
     "savefig.pad_inches":   validate_float,
     # default directory in savefig dialog box
-    "savefig.directory":    validate_string,
+    "savefig.directory":    _validate_pathlike,
     "savefig.transparent":  validate_bool,
 
     "tk.window_focus": validate_bool,  # Maintain shell focus for TkAgg
@@ -1364,7 +1193,7 @@ def _convert_validator_spec(key, conv):
 
     "pgf.texsystem": ["xelatex", "lualatex", "pdflatex"],  # latex variant used
     "pgf.rcfonts":   validate_bool,  # use mpl's rc settings for font config
-    "pgf.preamble":  _validate_tex_preamble,  # custom LaTeX preamble
+    "pgf.preamble":  validate_string,  # custom LaTeX preamble
 
     # write raster image data into the svg file
     "svg.image_inline": validate_bool,
@@ -1395,7 +1224,6 @@ def _convert_validator_spec(key, conv):
     "keymap.grid_minor": validate_stringlist,
     "keymap.yscale":     validate_stringlist,
     "keymap.xscale":     validate_stringlist,
-    "keymap.all_axes":   validate_stringlist,
     "keymap.help":       validate_stringlist,
     "keymap.copy":       validate_stringlist,
 
@@ -1410,18 +1238,12 @@ def _convert_validator_spec(key, conv):
     # Controls image format when frames are written to disk
     "animation.frame_format": ["png", "jpeg", "tiff", "raw", "rgba", "ppm",
                                "sgi", "bmp", "pbm", "svg"],
-    # Additional arguments for HTML writer
-    "animation.html_args":    validate_stringlist,
     # Path to ffmpeg binary. If just binary name, subprocess uses $PATH.
-    "animation.ffmpeg_path":  validate_string,
+    "animation.ffmpeg_path":  _validate_pathlike,
     # Additional arguments for ffmpeg movie writer (using pipes)
     "animation.ffmpeg_args":  validate_stringlist,
-    # Path to AVConv binary. If just binary name, subprocess uses $PATH.
-    "animation.avconv_path":  validate_string,
-    # Additional arguments for avconv movie writer (using pipes)
-    "animation.avconv_args":  validate_stringlist,
      # Path to convert binary. If just binary name, subprocess uses $PATH.
-    "animation.convert_path": validate_string,
+    "animation.convert_path": _validate_pathlike,
      # Additional arguments for convert movie writer (using pipes)
     "animation.convert_args": validate_stringlist,
 
@@ -1432,18 +1254,11 @@ def _convert_validator_spec(key, conv):
     "_internal.classic_mode": validate_bool
 }
 _hardcoded_defaults = {  # Defaults not inferred from matplotlibrc.template...
-    # ... because it can"t be:
-    "backend": _auto_backend_sentinel,
     # ... because they are private:
     "_internal.classic_mode": False,
     # ... because they are deprecated:
-    "animation.avconv_path": "avconv",
-    "animation.avconv_args": [],
-    "animation.html_args": [],
-    "mathtext.fallback_to_cm": None,
-    "keymap.all_axes": ["a"],
-    "savefig.jpeg_quality": 95,
-    "text.latex.preview": False,
+    # No current deprecations.
+    # backend is handled separately when constructing rcParamsDefault.
 }
 _validators = {k: _convert_validator_spec(k, conv)
                for k, conv in _validators.items()}
diff --git a/lib/matplotlib/sankey.py b/lib/matplotlib/sankey.py
index 8032001561bb..290c67830e14 100644
--- a/lib/matplotlib/sankey.py
+++ b/lib/matplotlib/sankey.py
@@ -11,7 +11,7 @@
 from matplotlib.path import Path
 from matplotlib.patches import PathPatch
 from matplotlib.transforms import Affine2D
-from matplotlib import docstring
+from matplotlib import _docstring
 
 _log = logging.getLogger(__name__)
 
@@ -204,12 +204,12 @@ def _arc(self, quadrant=0, cw=True, radius=1, center=(0, 0)):
                                  # Insignificant
                                  # [6.12303177e-17, 1.00000000e+00]])
                                  [0.00000000e+00, 1.00000000e+00]])
-        if quadrant == 0 or quadrant == 2:
+        if quadrant in (0, 2):
             if cw:
                 vertices = ARC_VERTICES
             else:
                 vertices = ARC_VERTICES[:, ::-1]  # Swap x and y.
-        elif quadrant == 1 or quadrant == 3:
+        else:  # 1, 3
             # Negate x.
             if cw:
                 # Swap x and y.
@@ -299,15 +299,11 @@ def _add_output(self, path, angle, flow, length):
             else:  # Vertical
                 x += self.gap
                 if angle == UP:
-                    sign = 1
+                    sign, quadrant = 1, 3
                 else:
-                    sign = -1
+                    sign, quadrant = -1, 0
 
                 tip = [x - flow / 2.0, y + sign * (length + tipheight)]
-                if angle == UP:
-                    quadrant = 3
-                else:
-                    quadrant = 0
                 # Inner arc isn't needed if inner radius is zero
                 if self.radius:
                     path.extend(self._arc(quadrant=quadrant,
@@ -351,7 +347,7 @@ def _revert(self, path, first_action=Path.LINETO):
         # path[2] = path[2][::-1]
         # return path
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def add(self, patchlabel='', flows=None, orientations=None, labels='',
             trunklength=1.0, pathlengths=0.25, prior=None, connect=(0, 0),
             rotation=0, **kwargs):
@@ -431,7 +427,7 @@ def add(self, patchlabel='', flows=None, orientations=None, labels='',
            properties, listed below.  For example, one may want to use
            ``fill=False`` or ``label="A legend entry"``.
 
-        %(Patch_kwdoc)s
+        %(Patch:kwdoc)s
 
         See Also
         --------
@@ -525,7 +521,7 @@ def add(self, patchlabel='', flows=None, orientations=None, labels='',
             if orient == 1:
                 if is_input:
                     angles[i] = DOWN
-                elif not is_input:
+                elif is_input is False:
                     # Be specific since is_input can be None.
                     angles[i] = UP
             elif orient == 0:
@@ -538,7 +534,7 @@ def add(self, patchlabel='', flows=None, orientations=None, labels='',
                         f"but it must be -1, 0, or 1")
                 if is_input:
                     angles[i] = UP
-                elif not is_input:
+                elif is_input is False:
                     angles[i] = DOWN
 
         # Justify the lengths of the paths.
@@ -561,7 +557,7 @@ def add(self, patchlabel='', flows=None, orientations=None, labels='',
                 if angle == DOWN and is_input:
                     pathlengths[i] = ullength
                     ullength += flow
-                elif angle == UP and not is_input:
+                elif angle == UP and is_input is False:
                     pathlengths[i] = urlength
                     urlength -= flow  # Flow is negative for outputs.
             # Determine the lengths of the bottom-side arrows
@@ -571,7 +567,7 @@ def add(self, patchlabel='', flows=None, orientations=None, labels='',
                 if angle == UP and is_input:
                     pathlengths[n - i - 1] = lllength
                     lllength += flow
-                elif angle == DOWN and not is_input:
+                elif angle == DOWN and is_input is False:
                     pathlengths[n - i - 1] = lrlength
                     lrlength -= flow
             # Determine the lengths of the left-side arrows
@@ -591,7 +587,7 @@ def add(self, patchlabel='', flows=None, orientations=None, labels='',
             for i, (angle, is_input, spec) in enumerate(zip(
                   angles, are_inputs, list(zip(scaled_flows, pathlengths)))):
                 if angle == RIGHT:
-                    if not is_input:
+                    if is_input is False:
                         if has_right_output:
                             pathlengths[i] = 0
                         else:
@@ -637,7 +633,7 @@ def add(self, patchlabel='', flows=None, orientations=None, labels='',
             if angle == DOWN and is_input:
                 tips[i, :], label_locations[i, :] = self._add_input(
                     ulpath, angle, *spec)
-            elif angle == UP and not is_input:
+            elif angle == UP and is_input is False:
                 tips[i, :], label_locations[i, :] = self._add_output(
                     urpath, angle, *spec)
         # Add the bottom-side inputs and outputs from the middle outwards.
@@ -647,7 +643,7 @@ def add(self, patchlabel='', flows=None, orientations=None, labels='',
                 tip, label_location = self._add_input(llpath, angle, *spec)
                 tips[n - i - 1, :] = tip
                 label_locations[n - i - 1, :] = label_location
-            elif angle == DOWN and not is_input:
+            elif angle == DOWN and is_input is False:
                 tip, label_location = self._add_output(lrpath, angle, *spec)
                 tips[n - i - 1, :] = tip
                 label_locations[n - i - 1, :] = label_location
@@ -670,7 +666,7 @@ def add(self, patchlabel='', flows=None, orientations=None, labels='',
         has_right_output = False
         for i, (angle, is_input, spec) in enumerate(zip(
               angles, are_inputs, list(zip(scaled_flows, pathlengths)))):
-            if angle == RIGHT and not is_input:
+            if angle == RIGHT and is_input is False:
                 if not has_right_output:
                     # Make sure the upper path extends
                     # at least as far as the lower one.
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
index 7c90369250d0..21099c8594d5 100644
--- a/lib/matplotlib/scale.py
+++ b/lib/matplotlib/scale.py
@@ -1,24 +1,28 @@
 """
 Scales define the distribution of data values on an axis, e.g. a log scaling.
-
-They are attached to an `~.axis.Axis` and hold a `.Transform`, which is
-responsible for the actual data transformation.
+They are defined as subclasses of `ScaleBase`.
 
 See also `.axes.Axes.set_xscale` and the scales examples in the documentation.
+
+See :doc:`/gallery/scales/custom_scale` for a full example of defining a custom
+scale.
+
+Matplotlib also supports non-separable transformations that operate on both
+`~.axis.Axis` at the same time.  They are known as projections, and defined in
+`matplotlib.projections`.
 """
 
 import inspect
 import textwrap
 
 import numpy as np
-from numpy import ma
 
 import matplotlib as mpl
-from matplotlib import _api, docstring
+from matplotlib import _api, _docstring
 from matplotlib.ticker import (
     NullFormatter, ScalarFormatter, LogFormatterSciNotation, LogitFormatter,
     NullLocator, LogLocator, AutoLocator, AutoMinorLocator,
-    SymmetricalLogLocator, LogitLocator)
+    SymmetricalLogLocator, AsinhLocator, LogitLocator)
 from matplotlib.transforms import Transform, IdentityTransform
 
 
@@ -28,16 +32,20 @@ class ScaleBase:
 
     Scales are separable transformations, working on a single dimension.
 
-    Any subclasses will want to override:
-
-    - :attr:`name`
-    - :meth:`get_transform`
-    - :meth:`set_default_locators_and_formatters`
-
-    And optionally:
-
-    - :meth:`limit_range_for_scale`
-
+    Subclasses should override
+
+    :attr:`name`
+        The scale's name.
+    :meth:`get_transform`
+        A method returning a `.Transform`, which converts data coordinates to
+        scaled coordinates.  This transform should be invertible, so that e.g.
+        mouse positions can be converted back to data coordinates.
+    :meth:`set_default_locators_and_formatters`
+        A method that sets default locators and formatters for an `~.axis.Axis`
+        that uses this scale.
+    :meth:`limit_range_for_scale`
+        An optional method that "fixes" the axis range to acceptable values,
+        e.g. restricting log-scaled axes to positive values.
     """
 
     def __init__(self, axis):
@@ -56,8 +64,7 @@ def __init__(self, axis):
 
     def get_transform(self):
         """
-        Return the :class:`~matplotlib.transforms.Transform` object
-        associated with this scale.
+        Return the `.Transform` object associated with this scale.
         """
         raise NotImplementedError()
 
@@ -194,7 +201,6 @@ def set_default_locators_and_formatters(self, axis):
 class LogTransform(Transform):
     input_dims = output_dims = 1
 
-    @_api.rename_parameter("3.3", "nonpos", "nonpositive")
     def __init__(self, base, nonpositive='clip'):
         super().__init__()
         if base <= 0 or base == 1:
@@ -244,7 +250,7 @@ def __str__(self):
         return "{}(base={})".format(type(self).__name__, self.base)
 
     def transform_non_affine(self, a):
-        return ma.power(self.base, a)
+        return np.power(self.base, a)
 
     def inverted(self):
         return LogTransform(self.base)
@@ -256,17 +262,7 @@ class LogScale(ScaleBase):
     """
     name = 'log'
 
-    @_api.deprecated("3.3", alternative="scale.LogTransform")
-    @property
-    def LogTransform(self):
-        return LogTransform
-
-    @_api.deprecated("3.3", alternative="scale.InvertedLogTransform")
-    @property
-    def InvertedLogTransform(self):
-        return InvertedLogTransform
-
-    def __init__(self, axis, **kwargs):
+    def __init__(self, axis, *, base=10, subs=None, nonpositive="clip"):
         """
         Parameters
         ----------
@@ -282,18 +278,6 @@ def __init__(self, axis, **kwargs):
             in a log10 scale, ``[2, 3, 4, 5, 6, 7, 8, 9]`` will place 8
             logarithmically spaced minor ticks between each major tick.
         """
-        # After the deprecation, the whole (outer) __init__ can be replaced by
-        # def __init__(self, axis, *, base=10, subs=None, nonpositive="clip")
-        # The following is to emit the right warnings depending on the axis
-        # used, as the *old* kwarg names depended on the axis.
-        axis_name = getattr(axis, "axis_name", "x")
-        @_api.rename_parameter("3.3", f"base{axis_name}", "base")
-        @_api.rename_parameter("3.3", f"subs{axis_name}", "subs")
-        @_api.rename_parameter("3.3", f"nonpos{axis_name}", "nonpositive")
-        def __init__(*, base=10, subs=None, nonpositive="clip"):
-            return base, subs, nonpositive
-
-        base, subs, nonpositive = __init__(**kwargs)
         self._transform = LogTransform(base, nonpositive)
         self.subs = subs
 
@@ -452,28 +436,7 @@ class SymmetricalLogScale(ScaleBase):
     """
     name = 'symlog'
 
-    @_api.deprecated("3.3", alternative="scale.SymmetricalLogTransform")
-    @property
-    def SymmetricalLogTransform(self):
-        return SymmetricalLogTransform
-
-    @_api.deprecated(
-        "3.3", alternative="scale.InvertedSymmetricalLogTransform")
-    @property
-    def InvertedSymmetricalLogTransform(self):
-        return InvertedSymmetricalLogTransform
-
-    def __init__(self, axis, **kwargs):
-        axis_name = getattr(axis, "axis_name", "x")
-        # See explanation in LogScale.__init__.
-        @_api.rename_parameter("3.3", f"base{axis_name}", "base")
-        @_api.rename_parameter("3.3", f"linthresh{axis_name}", "linthresh")
-        @_api.rename_parameter("3.3", f"subs{axis_name}", "subs")
-        @_api.rename_parameter("3.3", f"linscale{axis_name}", "linscale")
-        def __init__(*, base=10, linthresh=2, subs=None, linscale=1):
-            return base, linthresh, subs, linscale
-
-        base, linthresh, subs, linscale = __init__(**kwargs)
+    def __init__(self, axis, *, base=10, linthresh=2, subs=None, linscale=1):
         self._transform = SymmetricalLogTransform(base, linthresh, linscale)
         self.subs = subs
 
@@ -494,10 +457,126 @@ def get_transform(self):
         return self._transform
 
 
+class AsinhTransform(Transform):
+    """Inverse hyperbolic-sine transformation used by `.AsinhScale`"""
+    input_dims = output_dims = 1
+
+    def __init__(self, linear_width):
+        super().__init__()
+        if linear_width <= 0.0:
+            raise ValueError("Scale parameter 'linear_width' " +
+                             "must be strictly positive")
+        self.linear_width = linear_width
+
+    def transform_non_affine(self, a):
+        return self.linear_width * np.arcsinh(a / self.linear_width)
+
+    def inverted(self):
+        return InvertedAsinhTransform(self.linear_width)
+
+
+class InvertedAsinhTransform(Transform):
+    """Hyperbolic sine transformation used by `.AsinhScale`"""
+    input_dims = output_dims = 1
+
+    def __init__(self, linear_width):
+        super().__init__()
+        self.linear_width = linear_width
+
+    def transform_non_affine(self, a):
+        return self.linear_width * np.sinh(a / self.linear_width)
+
+    def inverted(self):
+        return AsinhTransform(self.linear_width)
+
+
+class AsinhScale(ScaleBase):
+    """
+    A quasi-logarithmic scale based on the inverse hyperbolic sine (asinh)
+
+    For values close to zero, this is essentially a linear scale,
+    but for large magnitude values (either positive or negative)
+    it is asymptotically logarithmic. The transition between these
+    linear and logarithmic regimes is smooth, and has no discontinuities
+    in the function gradient in contrast to
+    the `.SymmetricalLogScale` ("symlog") scale.
+
+    Specifically, the transformation of an axis coordinate :math:`a` is
+    :math:`a \\rightarrow a_0 \\sinh^{-1} (a / a_0)` where :math:`a_0`
+    is the effective width of the linear region of the transformation.
+    In that region, the transformation is
+    :math:`a \\rightarrow a + \\mathcal{O}(a^3)`.
+    For large values of :math:`a` the transformation behaves as
+    :math:`a \\rightarrow a_0 \\, \\mathrm{sgn}(a) \\ln |a| + \\mathcal{O}(1)`.
+
+    .. note::
+
+       This API is provisional and may be revised in the future
+       based on early user feedback.
+    """
+
+    name = 'asinh'
+
+    auto_tick_multipliers = {
+        3: (2, ),
+        4: (2, ),
+        5: (2, ),
+        8: (2, 4),
+        10: (2, 5),
+        16: (2, 4, 8),
+        64: (4, 16),
+        1024: (256, 512)
+    }
+
+    def __init__(self, axis, *, linear_width=1.0,
+                 base=10, subs='auto', **kwargs):
+        """
+        Parameters
+        ----------
+        linear_width : float, default: 1
+            The scale parameter (elsewhere referred to as :math:`a_0`)
+            defining the extent of the quasi-linear region,
+            and the coordinate values beyond which the transformation
+            becomes asymptotically logarithmic.
+        base : int, default: 10
+            The number base used for rounding tick locations
+            on a logarithmic scale. If this is less than one,
+            then rounding is to the nearest integer multiple
+            of powers of ten.
+        subs : sequence of int
+            Multiples of the number base used for minor ticks.
+            If set to 'auto', this will use built-in defaults,
+            e.g. (2, 5) for base=10.
+        """
+        super().__init__(axis)
+        self._transform = AsinhTransform(linear_width)
+        self._base = int(base)
+        if subs == 'auto':
+            self._subs = self.auto_tick_multipliers.get(self._base)
+        else:
+            self._subs = subs
+
+    linear_width = property(lambda self: self._transform.linear_width)
+
+    def get_transform(self):
+        return self._transform
+
+    def set_default_locators_and_formatters(self, axis):
+        axis.set(major_locator=AsinhLocator(self.linear_width,
+                                            base=self._base),
+                 minor_locator=AsinhLocator(self.linear_width,
+                                            base=self._base,
+                                            subs=self._subs),
+                 minor_formatter=NullFormatter())
+        if self._base > 1:
+            axis.set_major_formatter(LogFormatterSciNotation(self._base))
+        else:
+            axis.set_major_formatter('{x:.3g}'),
+
+
 class LogitTransform(Transform):
     input_dims = output_dims = 1
 
-    @_api.rename_parameter("3.3", "nonpos", "nonpositive")
     def __init__(self, nonpositive='mask'):
         super().__init__()
         _api.check_in_list(['mask', 'clip'], nonpositive=nonpositive)
@@ -523,7 +602,6 @@ def __str__(self):
 class LogisticTransform(Transform):
     input_dims = output_dims = 1
 
-    @_api.rename_parameter("3.3", "nonpos", "nonpositive")
     def __init__(self, nonpositive='mask'):
         super().__init__()
         self._nonpositive = nonpositive
@@ -548,7 +626,6 @@ class LogitScale(ScaleBase):
     """
     name = 'logit'
 
-    @_api.rename_parameter("3.3", "nonpos", "nonpositive")
     def __init__(self, axis, nonpositive='mask', *,
                  one_half=r"\frac{1}{2}", use_overline=False):
         r"""
@@ -607,6 +684,7 @@ def limit_range_for_scale(self, vmin, vmax, minpos):
     'linear': LinearScale,
     'log':    LogScale,
     'symlog': SymmetricalLogScale,
+    'asinh':  AsinhScale,
     'logit':  LogitScale,
     'function': FuncScale,
     'functionlog': FuncScaleLog,
@@ -627,9 +705,13 @@ def scale_factory(scale, axis, **kwargs):
     scale : {%(names)s}
     axis : `matplotlib.axis.Axis`
     """
-    scale = scale.lower()
-    _api.check_in_list(_scale_mapping, scale=scale)
-    return _scale_mapping[scale](axis, **kwargs)
+    if scale != scale.lower():
+        _api.warn_deprecated(
+            "3.5", message="Support for case-insensitive scales is deprecated "
+            "since %(since)s and support will be removed %(removal)s.")
+        scale = scale.lower()
+    scale_cls = _api.check_getitem(_scale_mapping, scale=scale)
+    return scale_cls(axis, **kwargs)
 
 
 if scale_factory.__doc__:
@@ -655,16 +737,17 @@ def _get_scale_docs():
     """
     docs = []
     for name, scale_class in _scale_mapping.items():
+        docstring = inspect.getdoc(scale_class.__init__) or ""
         docs.extend([
             f"    {name!r}",
             "",
-            textwrap.indent(inspect.getdoc(scale_class.__init__), " " * 8),
+            textwrap.indent(docstring, " " * 8),
             ""
         ])
     return "\n".join(docs)
 
 
-docstring.interpd.update(
+_docstring.interpd.update(
     scale_type='{%s}' % ', '.join([repr(x) for x in get_scale_names()]),
     scale_docs=_get_scale_docs().rstrip(),
     )
diff --git a/lib/matplotlib/sphinxext/mathmpl.py b/lib/matplotlib/sphinxext/mathmpl.py
index b86d0e841c53..dd30f34a8e66 100644
--- a/lib/matplotlib/sphinxext/mathmpl.py
+++ b/lib/matplotlib/sphinxext/mathmpl.py
@@ -1,12 +1,79 @@
+r"""
+A role and directive to display mathtext in Sphinx
+==================================================
+
+.. warning::
+    In most cases, you will likely want to use one of `Sphinx's builtin Math
+    extensions
+    <https://www.sphinx-doc.org/en/master/usage/extensions/math.html>`__
+    instead of this one.
+
+Mathtext may be included in two ways:
+
+1. Inline, using the role::
+
+     This text uses inline math: :mathmpl:`\alpha > \beta`.
+
+   which produces:
+
+     This text uses inline math: :mathmpl:`\alpha > \beta`.
+
+2. Standalone, using the directive::
+
+     Here is some standalone math:
+
+     .. mathmpl::
+
+         \alpha > \beta
+
+   which produces:
+
+     Here is some standalone math:
+
+     .. mathmpl::
+
+         \alpha > \beta
+
+Options
+-------
+
+The ``mathmpl`` role and directive both support the following options:
+
+    fontset : str, default: 'cm'
+        The font set to use when displaying math. See :rc:`mathtext.fontset`.
+
+    fontsize : float
+        The font size, in points. Defaults to the value from the extension
+        configuration option defined below.
+
+Configuration options
+---------------------
+
+The mathtext extension has the following configuration options:
+
+    mathmpl_fontsize : float, default: 10.0
+        Default font size, in points.
+
+    mathmpl_srcset : list of str, default: []
+        Additional image sizes to generate when embedding in HTML, to support
+        `responsive resolution images
+        <https://developer.mozilla.org/en-US/docs/Learn/HTML/Multimedia_and_embedding/Responsive_images>`__.
+        The list should contain additional x-descriptors (``'1.5x'``, ``'2x'``,
+        etc.) to generate (1x is the default and always included.)
+
+"""
+
 import hashlib
 from pathlib import Path
 
 from docutils import nodes
 from docutils.parsers.rst import Directive, directives
 import sphinx
+from sphinx.errors import ConfigError, ExtensionError
 
 import matplotlib as mpl
 from matplotlib import _api, mathtext
+from matplotlib.rcsetup import validate_float_or_None
 
 
 # Define LaTeX math node:
@@ -25,32 +92,40 @@ def math_role(role, rawtext, text, lineno, inliner,
     node = latex_math(rawtext)
     node['latex'] = latex
     node['fontset'] = options.get('fontset', 'cm')
+    node['fontsize'] = options.get('fontsize',
+                                   setup.app.config.mathmpl_fontsize)
     return [node], []
-math_role.options = {'fontset': fontset_choice}
+math_role.options = {'fontset': fontset_choice,
+                     'fontsize': validate_float_or_None}
 
 
 class MathDirective(Directive):
+    """
+    The ``.. mathmpl::`` directive, as documented in the module's docstring.
+    """
     has_content = True
     required_arguments = 0
     optional_arguments = 0
     final_argument_whitespace = False
-    option_spec = {'fontset': fontset_choice}
+    option_spec = {'fontset': fontset_choice,
+                   'fontsize': validate_float_or_None}
 
     def run(self):
         latex = ''.join(self.content)
         node = latex_math(self.block_text)
         node['latex'] = latex
         node['fontset'] = self.options.get('fontset', 'cm')
+        node['fontsize'] = self.options.get('fontsize',
+                                            setup.app.config.mathmpl_fontsize)
         return [node]
 
 
 # This uses mathtext to render the expression
-def latex2png(latex, filename, fontset='cm'):
-    latex = "$%s$" % latex
-    with mpl.rc_context({'mathtext.fontset': fontset}):
+def latex2png(latex, filename, fontset='cm', fontsize=10, dpi=100):
+    with mpl.rc_context({'mathtext.fontset': fontset, 'font.size': fontsize}):
         try:
             depth = mathtext.math_to_image(
-                latex, filename, dpi=100, format="png")
+                f"${latex}$", filename, dpi=dpi, format="png")
         except Exception:
             _api.warn_external(f"Could not render math expression {latex}")
             depth = 0
@@ -62,14 +137,26 @@ def latex2html(node, source):
     inline = isinstance(node.parent, nodes.TextElement)
     latex = node['latex']
     fontset = node['fontset']
+    fontsize = node['fontsize']
     name = 'math-{}'.format(
-        hashlib.md5((latex + fontset).encode()).hexdigest()[-10:])
+        hashlib.md5(f'{latex}{fontset}{fontsize}'.encode()).hexdigest()[-10:])
 
     destdir = Path(setup.app.builder.outdir, '_images', 'mathmpl')
     destdir.mkdir(parents=True, exist_ok=True)
-    dest = destdir / f'{name}.png'
 
-    depth = latex2png(latex, dest, fontset)
+    dest = destdir / f'{name}.png'
+    depth = latex2png(latex, dest, fontset, fontsize=fontsize)
+
+    srcset = []
+    for size in setup.app.config.mathmpl_srcset:
+        filename = f'{name}-{size.replace(".", "_")}.png'
+        latex2png(latex, destdir / filename, fontset, fontsize=fontsize,
+                  dpi=100 * float(size[:-1]))
+        srcset.append(
+            f'{setup.app.builder.imgpath}/mathmpl/{filename} {size}')
+    if srcset:
+        srcset = (f'srcset="{setup.app.builder.imgpath}/mathmpl/{name}.png, ' +
+                  ', '.join(srcset) + '" ')
 
     if inline:
         cls = ''
@@ -81,11 +168,35 @@ def latex2html(node, source):
         style = ''
 
     return (f'<img src="{setup.app.builder.imgpath}/mathmpl/{name}.png"'
-            f' {cls}{style}/>')
+            f' {srcset}{cls}{style}/>')
+
+
+def _config_inited(app, config):
+    # Check for srcset hidpi images
+    for i, size in enumerate(app.config.mathmpl_srcset):
+        if size[-1] == 'x':  # "2x" = "2.0"
+            try:
+                float(size[:-1])
+            except ValueError:
+                raise ConfigError(
+                    f'Invalid value for mathmpl_srcset parameter: {size!r}. '
+                    'Must be a list of strings with the multiplicative '
+                    'factor followed by an "x".  e.g. ["2.0x", "1.5x"]')
+        else:
+            raise ConfigError(
+                f'Invalid value for mathmpl_srcset parameter: {size!r}. '
+                'Must be a list of strings with the multiplicative '
+                'factor followed by an "x".  e.g. ["2.0x", "1.5x"]')
 
 
 def setup(app):
     setup.app = app
+    app.add_config_value('mathmpl_fontsize', 10.0, True)
+    app.add_config_value('mathmpl_srcset', [], True)
+    try:
+        app.connect('config-inited', _config_inited)  # Sphinx 1.8+
+    except ExtensionError:
+        app.connect('env-updated', lambda app, env: _config_inited(app, None))
 
     # Add visit/depart methods to HTML-Translator:
     def visit_latex_math_html(self, node):
diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py
index 565f0b1baed7..9973e37ef28f 100644
--- a/lib/matplotlib/sphinxext/plot_directive.py
+++ b/lib/matplotlib/sphinxext/plot_directive.py
@@ -2,10 +2,13 @@
 A directive for including a Matplotlib plot in a Sphinx document
 ================================================================
 
-By default, in HTML output, `plot` will include a .png file with a link to a
-high-res .png and .pdf.  In LaTeX output, it will include a .pdf.
+This is a Sphinx extension providing a reStructuredText directive
+``.. plot::`` for including a plot in a Sphinx document.
 
-The source code for the plot may be included in one of three ways:
+In HTML output, ``.. plot::`` will include a .png file with a link
+to a high-res .png and .pdf.  In LaTeX output, it will include a .pdf.
+
+The plot content may be defined in one of three ways:
 
 1. **A path to a source file** as the argument to the directive::
 
@@ -16,7 +19,7 @@
 
      .. plot:: path/to/plot.py
 
-        The plot's caption.
+        The plot caption.
 
    Additionally, one may specify the name of a function to call (with
    no arguments) immediately after importing the module::
@@ -28,10 +31,8 @@
      .. plot::
 
         import matplotlib.pyplot as plt
-        import matplotlib.image as mpimg
-        import numpy as np
-        img = mpimg.imread('_static/stinkbug.png')
-        imgplot = plt.imshow(img)
+        plt.plot([1, 2, 3], [4, 5, 6])
+        plt.title("A plotting exammple")
 
 3. Using **doctest** syntax::
 
@@ -44,21 +45,22 @@
 Options
 -------
 
-The ``plot`` directive supports the following options:
+The ``.. plot::`` directive supports the following options:
 
-    format : {'python', 'doctest'}
-        The format of the input.
+    ``:format:`` : {'python', 'doctest'}
+        The format of the input.  If unset, the format is auto-detected.
 
-    include-source : bool
-        Whether to display the source code. The default can be changed
-        using the `plot_include_source` variable in :file:`conf.py`.
+    ``:include-source:`` : bool
+        Whether to display the source code. The default can be changed using
+        the ``plot_include_source`` variable in :file:`conf.py` (which itself
+        defaults to False).
 
-    encoding : str
+    ``:encoding:`` : str
         If this source file is in a non-UTF8 or non-ASCII encoding, the
         encoding must be specified using the ``:encoding:`` option.  The
         encoding will not be inferred using the ``-*- coding -*-`` metacomment.
 
-    context : bool or str
+    ``:context:`` : bool or str
         If provided, the code will be run in the context of all previous plot
         directives for which the ``:context:`` option was specified.  This only
         applies to inline code plot directives, not those run from files. If
@@ -67,18 +69,19 @@
         running the code. ``:context: close-figs`` keeps the context but closes
         previous figures before running the code.
 
-    nofigs : bool
+    ``:nofigs:`` : bool
         If specified, the code block will be run, but no figures will be
         inserted.  This is usually useful with the ``:context:`` option.
 
-    caption : str
+    ``:caption:`` : str
         If specified, the option's argument will be used as a caption for the
         figure. This overwrites the caption given in the content, when the plot
         is generated from a file.
 
-Additionally, this directive supports all of the options of the `image`
-directive, except for *target* (since plot will add its own target).  These
-include *alt*, *height*, *width*, *scale*, *align* and *class*.
+Additionally, this directive supports all the options of the `image directive
+<https://docutils.sourceforge.io/docs/ref/rst/directives.html#image>`_,
+except for ``:target:`` (since plot will add its own target).  These include
+``:alt:``, ``:height:``, ``:width:``, ``:scale:``, ``:align:`` and ``:class:``.
 
 Configuration options
 ---------------------
@@ -86,25 +89,26 @@
 The plot directive has the following configuration options:
 
     plot_include_source
-        Default value for the include-source option
+        Default value for the include-source option (default: False).
 
     plot_html_show_source_link
-        Whether to show a link to the source in HTML.
+        Whether to show a link to the source in HTML (default: True).
 
     plot_pre_code
-        Code that should be executed before each plot. If not specified or None
+        Code that should be executed before each plot. If None (the default),
         it will default to a string containing::
 
             import numpy as np
             from matplotlib import pyplot as plt
 
     plot_basedir
-        Base directory, to which ``plot::`` file names are relative
-        to.  (If None or empty, file names are relative to the
-        directory where the file containing the directive is.)
+        Base directory, to which ``plot::`` file names are relative to.
+        If None or empty (the default), file names are relative to the
+        directory where the file containing the directive is.
 
     plot_formats
-        File formats to generate. List of tuples or strings::
+        File formats to generate (default: ['png', 'hires.png', 'pdf']).
+        List of tuples or strings::
 
             [(suffix, dpi), suffix, ...]
 
@@ -114,16 +118,16 @@
         suffix:dpi,suffix:dpi, ...
 
     plot_html_show_formats
-        Whether to show links to the files in HTML.
+        Whether to show links to the files in HTML (default: True).
 
     plot_rcparams
         A dictionary containing any non-standard rcParams that should
-        be applied before each plot.
+        be applied before each plot (default: {}).
 
     plot_apply_rcparams
         By default, rcParams are applied when ``:context:`` option is not used
-        in a plot directive.  This configuration option overrides this behavior
-        and applies rcParams before each plot.
+        in a plot directive.  If set, this configuration option overrides this
+        behavior and applies rcParams before each plot.
 
     plot_working_directory
         By default, the working directory will be changed to the directory of
@@ -138,6 +142,7 @@
 """
 
 import contextlib
+import doctest
 from io import StringIO
 import itertools
 import os
@@ -159,9 +164,6 @@
 from matplotlib import _api, _pylab_helpers, cbook
 
 matplotlib.use("agg")
-align = _api.deprecated(
-    "3.4", alternative="docutils.parsers.rst.directives.images.Image.align")(
-        Image.align)
 
 __version__ = 2
 
@@ -180,7 +182,7 @@ def _option_boolean(arg):
     elif arg.strip().lower() in ('yes', '1', 'true'):
         return True
     else:
-        raise ValueError('"%s" unknown boolean' % arg)
+        raise ValueError(f'{arg!r} unknown boolean')
 
 
 def _option_context(arg):
@@ -193,6 +195,11 @@ def _option_format(arg):
     return directives.choice(arg, ('python', 'doctest'))
 
 
+def _deprecated_option_encoding(arg):
+    _api.warn_deprecated("3.5", name="encoding", obj_type="option")
+    return directives.encoding(arg)
+
+
 def mark_plot_labels(app, document):
     """
     To make plots referenceable, we need to move the reference from the
@@ -241,7 +248,7 @@ class PlotDirective(Directive):
         'format': _option_format,
         'context': _option_context,
         'nofigs': directives.flag,
-        'encoding': directives.encoding,
+        'encoding': _deprecated_option_encoding,
         'caption': directives.unchanged,
         }
 
@@ -258,7 +265,9 @@ def _copy_css_file(app, exc):
     if exc is None and app.builder.format == 'html':
         src = cbook._get_data_path('plot_directive/plot_directive.css')
         dst = app.outdir / Path('_static')
-        shutil.copy(src, dst)
+        dst.mkdir(exist_ok=True)
+        # Use copyfile because we do not want to copy src's permissions.
+        shutil.copyfile(src, dst / Path('plot_directive.css'))
 
 
 def setup(app):
@@ -301,6 +310,7 @@ def contains_doctest(text):
     return bool(m)
 
 
+@_api.deprecated("3.5", alternative="doctest.script_from_examples")
 def unescape_doctest(text):
     """
     Extract code from a piece of text, which contains either Python code
@@ -308,7 +318,6 @@ def unescape_doctest(text):
     """
     if not contains_doctest(text):
         return text
-
     code = ""
     for line in text.split("\n"):
         m = re.match(r'^\s*(>>>|\.\.\.) (.*)$', line)
@@ -321,11 +330,16 @@ def unescape_doctest(text):
     return code
 
 
+@_api.deprecated("3.5")
 def split_code_at_show(text):
+    """Split code at plt.show()."""
+    return _split_code_at_show(text)[1]
+
+
+def _split_code_at_show(text):
     """Split code at plt.show()."""
     parts = []
     is_doctest = contains_doctest(text)
-
     part = []
     for line in text.split("\n"):
         if (not is_doctest and line.strip() == 'plt.show()') or \
@@ -337,7 +351,7 @@ def split_code_at_show(text):
             part.append(line)
     if "\n".join(part).strip():
         parts.append("\n".join(part))
-    return parts
+    return is_doctest, parts
 
 
 # -----------------------------------------------------------------------------
@@ -423,25 +437,46 @@ def filenames(self):
         return [self.filename(fmt) for fmt in self.formats]
 
 
-def out_of_date(original, derived):
+def out_of_date(original, derived, includes=None):
     """
-    Return whether *derived* is out-of-date relative to *original*, both of
-    which are full file paths.
+    Return whether *derived* is out-of-date relative to *original* or any of
+    the RST files included in it using the RST include directive (*includes*).
+    *derived* and *original* are full paths, and *includes* is optionally a
+    list of full paths which may have been included in the *original*.
     """
-    return (not os.path.exists(derived) or
-            (os.path.exists(original) and
-             os.stat(derived).st_mtime < os.stat(original).st_mtime))
+    if not os.path.exists(derived):
+        return True
+
+    if includes is None:
+        includes = []
+    files_to_check = [original, *includes]
+
+    def out_of_date_one(original, derived_mtime):
+        return (os.path.exists(original) and
+                derived_mtime < os.stat(original).st_mtime)
+
+    derived_mtime = os.stat(derived).st_mtime
+    return any(out_of_date_one(f, derived_mtime) for f in files_to_check)
 
 
 class PlotError(RuntimeError):
     pass
 
 
+@_api.deprecated("3.5")
 def run_code(code, code_path, ns=None, function_name=None):
     """
     Import a Python module from a path, and run the function given by
     name, if function_name is not None.
     """
+    _run_code(unescape_doctest(code), code_path, ns, function_name)
+
+
+def _run_code(code, code_path, ns=None, function_name=None):
+    """
+    Import a Python module from a path, and run the function given by
+    name, if function_name is not None.
+    """
 
     # Change the working directory to the directory of the example, so
     # it can get at its data files, if any.  Add its path to sys.path
@@ -466,7 +501,6 @@ def run_code(code, code_path, ns=None, function_name=None):
             sys, argv=[code_path], path=[os.getcwd(), *sys.path]), \
             contextlib.redirect_stdout(StringIO()):
         try:
-            code = unescape_doctest(code)
             if ns is None:
                 ns = {}
             if not ns:
@@ -518,7 +552,8 @@ def get_plot_formats(config):
 
 def render_figures(code, code_path, output_dir, output_base, context,
                    function_name, config, context_reset=False,
-                   close_figs=False):
+                   close_figs=False,
+                   code_includes=None):
     """
     Run a pyplot script and save the images in *output_dir*.
 
@@ -529,13 +564,14 @@ def render_figures(code, code_path, output_dir, output_base, context,
 
     # Try to determine if all images already exist
 
-    code_pieces = split_code_at_show(code)
+    is_doctest, code_pieces = _split_code_at_show(code)
 
     # Look for single-figure output files first
     all_exists = True
     img = ImageFile(output_base, output_dir)
     for format, dpi in formats:
-        if out_of_date(code_path, img.filename(format)):
+        if context or out_of_date(code_path, img.filename(format),
+                                  includes=code_includes):
             all_exists = False
             break
         img.formats.append(format)
@@ -555,7 +591,8 @@ def render_figures(code, code_path, output_dir, output_base, context,
             else:
                 img = ImageFile('%s_%02d' % (output_base, j), output_dir)
             for fmt, dpi in formats:
-                if out_of_date(code_path, img.filename(fmt)):
+                if context or out_of_date(code_path, img.filename(fmt),
+                                          includes=code_includes):
                     all_exists = False
                     break
                 img.formats.append(fmt)
@@ -575,10 +612,7 @@ def render_figures(code, code_path, output_dir, output_base, context,
     # We didn't find the files, so build them
 
     results = []
-    if context:
-        ns = plot_context
-    else:
-        ns = {}
+    ns = plot_context if context else {}
 
     if context_reset:
         clear_state(config.plot_rcparams)
@@ -593,7 +627,9 @@ def render_figures(code, code_path, output_dir, output_base, context,
         elif close_figs:
             plt.close('all')
 
-        run_code(code_piece, code_path, ns, function_name)
+        _run_code(doctest.script_from_examples(code_piece) if is_doctest
+                  else code_piece,
+                  code_path, ns, function_name)
 
         images = []
         fig_managers = _pylab_helpers.Gcf.get_all_fig_managers()
@@ -701,9 +737,7 @@ def run(arguments, content, options, state_machine, state, lineno):
 
     # determine output directory name fragment
     source_rel_name = relpath(source_file_name, setup.confdir)
-    source_rel_dir = os.path.dirname(source_rel_name)
-    while source_rel_dir.startswith(os.path.sep):
-        source_rel_dir = source_rel_dir[1:]
+    source_rel_dir = os.path.dirname(source_rel_name).lstrip(os.path.sep)
 
     # build_dir: where to place output files (temporarily)
     build_dir = os.path.join(os.path.dirname(setup.app.doctreedir),
@@ -713,15 +747,12 @@ def run(arguments, content, options, state_machine, state, lineno):
     # see note in Python docs for warning about symbolic links on Windows.
     # need to compare source and dest paths at end
     build_dir = os.path.normpath(build_dir)
-
-    if not os.path.exists(build_dir):
-        os.makedirs(build_dir)
+    os.makedirs(build_dir, exist_ok=True)
 
     # output_dir: final location in the builder's directory
     dest_dir = os.path.abspath(os.path.join(setup.app.builder.outdir,
                                             source_rel_dir))
-    if not os.path.exists(dest_dir):
-        os.makedirs(dest_dir)  # no problem here for me, but just use built-ins
+    os.makedirs(dest_dir, exist_ok=True)
 
     # how to link to files from the RST file
     dest_dir_link = os.path.join(relpath(setup.confdir, rst_dir),
@@ -734,6 +765,25 @@ def run(arguments, content, options, state_machine, state, lineno):
         build_dir_link = build_dir
     source_link = dest_dir_link + '/' + output_base + source_ext
 
+    # get list of included rst files so that the output is updated when any
+    # plots in the included files change. These attributes are modified by the
+    # include directive (see the docutils.parsers.rst.directives.misc module).
+    try:
+        source_file_includes = [os.path.join(os.getcwd(), t[0])
+                                for t in state.document.include_log]
+    except AttributeError:
+        # the document.include_log attribute only exists in docutils >=0.17,
+        # before that we need to inspect the state machine
+        possible_sources = {os.path.join(setup.confdir, t[0])
+                            for t in state_machine.input_lines.items}
+        source_file_includes = [f for f in possible_sources
+                                if os.path.isfile(f)]
+    # remove the source file itself from the includes
+    try:
+        source_file_includes.remove(source_file_name)
+    except ValueError:
+        pass
+
     # make figures
     try:
         results = render_figures(code,
@@ -744,7 +794,8 @@ def run(arguments, content, options, state_machine, state, lineno):
                                  function_name,
                                  config,
                                  context_reset=context_opt == 'reset',
-                                 close_figs=context_opt == 'close-figs')
+                                 close_figs=context_opt == 'close-figs',
+                                 code_includes=source_file_includes)
         errors = []
     except PlotError as err:
         reporter = state.memo.reporter
@@ -815,8 +866,11 @@ def run(arguments, content, options, state_machine, state, lineno):
                     shutil.copyfile(fn, destimg)
 
     # copy script (if necessary)
-    Path(dest_dir, output_base + source_ext).write_text(
-        unescape_doctest(code) if source_file_name == rst_file else code,
-        encoding='utf-8')
+    if config.plot_html_show_source_link:
+        Path(dest_dir, output_base + source_ext).write_text(
+            doctest.script_from_examples(code)
+            if source_file_name == rst_file and is_doctest
+            else code,
+            encoding='utf-8')
 
     return errors
diff --git a/lib/matplotlib/spines.py b/lib/matplotlib/spines.py
index 40ceb157fd6e..3395c220a74e 100644
--- a/lib/matplotlib/spines.py
+++ b/lib/matplotlib/spines.py
@@ -3,8 +3,8 @@
 
 import numpy as np
 
-import matplotlib
-from matplotlib import _api, docstring, rcParams
+import matplotlib as mpl
+from matplotlib import _api, _docstring
 from matplotlib.artist import allow_rasterization
 import matplotlib.transforms as mtransforms
 import matplotlib.patches as mpatches
@@ -27,11 +27,12 @@ class Spine(mpatches.Patch):
     `~.Spine.set_patch_line`, `~.Spine.set_patch_circle`, or
     `~.Spine.set_patch_arc` has been called. Line-like is the default.
 
+    For examples see :ref:`spines_examples`.
     """
     def __str__(self):
         return "Spine"
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def __init__(self, axes, spine_type, path, **kwargs):
         """
         Parameters
@@ -48,15 +49,15 @@ def __init__(self, axes, spine_type, path, **kwargs):
         **kwargs
             Valid keyword arguments are:
 
-            %(Patch_kwdoc)s
+            %(Patch:kwdoc)s
         """
         super().__init__(**kwargs)
         self.axes = axes
         self.set_figure(self.axes.figure)
         self.spine_type = spine_type
         self.set_facecolor('none')
-        self.set_edgecolor(rcParams['axes.edgecolor'])
-        self.set_linewidth(rcParams['axes.linewidth'])
+        self.set_edgecolor(mpl.rcParams['axes.edgecolor'])
+        self.set_linewidth(mpl.rcParams['axes.linewidth'])
         self.set_capstyle('projecting')
         self.axis = None
 
@@ -69,7 +70,7 @@ def __init__(self, axes, spine_type, path, **kwargs):
         # non-rectangular axes is currently implemented, and this lets
         # them pass through the spines machinery without errors.)
         self._position = None
-        _api.check_isinstance(matplotlib.path.Path, path=path)
+        _api.check_isinstance(mpath.Path, path=path)
         self._path = path
 
         # To support drawing both linear and circular spines, this
@@ -222,10 +223,6 @@ def clear(self):
         if self.axis is not None:
             self.axis.clear()
 
-    @_api.deprecated("3.4", alternative="Spine.clear()")
-    def cla(self):
-        self.clear()
-
     def _adjust_location(self):
         """Automatically set spine bounds to the view interval."""
 
@@ -435,7 +432,7 @@ def linear_spine(cls, axes, spine_type, **kwargs):
         else:
             raise ValueError('unable to make path for spine "%s"' % spine_type)
         result = cls(axes, spine_type, path, **kwargs)
-        result.set_visible(rcParams['axes.spines.{0}'.format(spine_type)])
+        result.set_visible(mpl.rcParams['axes.spines.{0}'.format(spine_type)])
 
         return result
 
@@ -550,7 +547,7 @@ def __getattr__(self, name):
         try:
             return self._dict[name]
         except KeyError:
-            raise ValueError(
+            raise AttributeError(
                 f"'Spines' object does not contain a '{name}' spine")
 
     def __getitem__(self, key):
diff --git a/lib/matplotlib/stackplot.py b/lib/matplotlib/stackplot.py
index 9e8317ec987f..c97a21e029f9 100644
--- a/lib/matplotlib/stackplot.py
+++ b/lib/matplotlib/stackplot.py
@@ -1,11 +1,13 @@
 """
 Stacked area plot for 1D arrays inspired by Douglas Y'barbo's stackoverflow
 answer:
-http://stackoverflow.com/questions/2225995/how-can-i-create-stacked-line-graph-with-matplotlib
+https://stackoverflow.com/q/2225995/
 
-(http://stackoverflow.com/users/66549/doug)
+(https://stackoverflow.com/users/66549/doug)
 """
 
+import itertools
+
 import numpy as np
 
 from matplotlib import _api
@@ -41,12 +43,20 @@ def stackplot(axes, x, *args,
           size of each layer. It is also called 'Streamgraph'-layout. More
           details can be found at http://leebyron.com/streamgraph/.
 
-    labels : Length N list of str
-        Labels to assign to each data series.
+    labels : list of str, optional
+        A sequence of labels to assign to each data series. If unspecified,
+        then no labels will be applied to artists.
+
+    colors : list of color, optional
+        A sequence of colors to be cycled through and used to color the stacked
+        areas. 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.
 
-    colors : Length N list of color
-        A list or tuple of colors. These will be cycled through and used to
-        colour the stacked areas.
+    data : indexable object, optional
+        DATA_PARAMETER_PLACEHOLDER
 
     **kwargs
         All other keyword arguments are passed to `.Axes.fill_between`.
@@ -62,7 +72,9 @@ def stackplot(axes, x, *args,
 
     labels = iter(labels)
     if colors is not None:
-        axes.set_prop_cycle(color=colors)
+        colors = itertools.cycle(colors)
+    else:
+        colors = (axes._get_lines.get_next_color() for _ in y)
 
     # Assume data passed has not been 'stacked', so stack it here.
     # We'll need a float buffer for the upcoming calculations.
@@ -100,17 +112,16 @@ def stackplot(axes, x, *args,
         stack += first_line
 
     # Color between x = 0 and the first array.
-    color = axes._get_lines.get_next_color()
     coll = axes.fill_between(x, first_line, stack[0, :],
-                             facecolor=color, label=next(labels, None),
+                             facecolor=next(colors), label=next(labels, None),
                              **kwargs)
     coll.sticky_edges.y[:] = [0]
     r = [coll]
 
     # Color between array i-1 and array i
     for i in range(len(y) - 1):
-        color = axes._get_lines.get_next_color()
         r.append(axes.fill_between(x, stack[i, :], stack[i + 1, :],
-                                   facecolor=color, label=next(labels, None),
+                                   facecolor=next(colors),
+                                   label=next(labels, None),
                                    **kwargs))
     return r
diff --git a/lib/matplotlib/streamplot.py b/lib/matplotlib/streamplot.py
index 4e75ee19cb85..78d1c7d1e91a 100644
--- a/lib/matplotlib/streamplot.py
+++ b/lib/matplotlib/streamplot.py
@@ -5,12 +5,11 @@
 
 import numpy as np
 
-import matplotlib
-from matplotlib import _api, cm
+import matplotlib as mpl
+from matplotlib import _api, cm, patches
 import matplotlib.colors as mcolors
 import matplotlib.collections as mcollections
 import matplotlib.lines as mlines
-import matplotlib.patches as patches
 
 
 __all__ = ['streamplot']
@@ -19,14 +18,17 @@
 def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
                cmap=None, norm=None, arrowsize=1, arrowstyle='-|>',
                minlength=0.1, transform=None, zorder=None, start_points=None,
-               maxlength=4.0, integration_direction='both'):
+               maxlength=4.0, integration_direction='both',
+               broken_streamlines=True):
     """
     Draw streamlines of a vector flow.
 
     Parameters
     ----------
     x, y : 1D/2D arrays
-        Evenly spaced strictly increasing arrays to make a grid.
+        Evenly spaced strictly increasing arrays to make a grid.  If 2D, all
+        rows of *x* must be equal and all columns of *y* must be equal; i.e.,
+        they must be as if generated by ``np.meshgrid(x_1d, y_1d)``.
     u, v : 2D arrays
         *x* and *y*-velocities. The number of rows and columns must match
         the length of *y* and *x*, respectively.
@@ -44,12 +46,10 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
         The streamline color. If given an array, its values are converted to
         colors using *cmap* and *norm*.  The array must have the same shape
         as *u* and *v*.
-    cmap : `~matplotlib.colors.Colormap`
-        Colormap used to plot streamlines and arrows. This is only used if
-        *color* is an array.
-    norm : `~matplotlib.colors.Normalize`
-        Normalize object used to scale luminance data to 0, 1. If ``None``,
-        stretch (min, max) to (0, 1). This is only used if *color* is an array.
+    cmap, norm
+        Data normalization and colormapping parameters for *color*; only used
+        if *color* is an array of floats. See `~.Axes.imshow` for a detailed
+        description.
     arrowsize : float
         Scaling factor for the arrow size.
     arrowstyle : str
@@ -67,6 +67,12 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
         Maximum length of streamline in axes coordinates.
     integration_direction : {'forward', 'backward', 'both'}, default: 'both'
         Integrate the streamline in forward, backward or both directions.
+    data : indexable object, optional
+        DATA_PARAMETER_PLACEHOLDER
+    broken_streamlines : boolean, default: True
+        If False, forces streamlines to continue until they
+        leave the plot domain.  If True, they may be terminated if they
+        come too close to another streamline.
 
     Returns
     -------
@@ -97,7 +103,7 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
         color = axes._get_lines.get_next_color()
 
     if linewidth is None:
-        linewidth = matplotlib.rcParams['lines.linewidth']
+        linewidth = mpl.rcParams['lines.linewidth']
 
     line_kw = {}
     arrow_kw = dict(arrowstyle=arrowstyle, mutation_scale=10 * arrowsize)
@@ -112,8 +118,8 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
     if use_multicolor_lines:
         if color.shape != grid.shape:
             raise ValueError("If 'color' is given, it must match the shape of "
-                             "'Grid(x, y)'")
-        line_colors = []
+                             "the (x, y) grid")
+        line_colors = [[]]  # Empty entry allows concatenation of zero arrays.
         color = np.ma.masked_invalid(color)
     else:
         line_kw['color'] = color
@@ -122,7 +128,7 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
     if isinstance(linewidth, np.ndarray):
         if linewidth.shape != grid.shape:
             raise ValueError("If 'linewidth' is given, it must match the "
-                             "shape of 'Grid(x, y)'")
+                             "shape of the (x, y) grid")
         line_kw['linewidth'] = []
     else:
         line_kw['linewidth'] = linewidth
@@ -133,20 +139,20 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
 
     # Sanity checks.
     if u.shape != grid.shape or v.shape != grid.shape:
-        raise ValueError("'u' and 'v' must match the shape of 'Grid(x, y)'")
+        raise ValueError("'u' and 'v' must match the shape of the (x, y) grid")
 
     u = np.ma.masked_invalid(u)
     v = np.ma.masked_invalid(v)
 
-    integrate = get_integrator(u, v, dmap, minlength, maxlength,
-                               integration_direction)
+    integrate = _get_integrator(u, v, dmap, minlength, maxlength,
+                                integration_direction)
 
     trajectories = []
     if start_points is None:
         for xm, ym in _gen_starting_points(mask.shape):
             if mask[ym, xm] == 0:
                 xg, yg = dmap.mask2grid(xm, ym)
-                t = integrate(xg, yg)
+                t = integrate(xg, yg, broken_streamlines)
                 if t is not None:
                     trajectories.append(t)
     else:
@@ -167,25 +173,28 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
 
         for xs, ys in sp2:
             xg, yg = dmap.data2grid(xs, ys)
-            t = integrate(xg, yg)
+            # Floating point issues can cause xg, yg to be slightly out of
+            # bounds for xs, ys on the upper boundaries. Because we have
+            # already checked that the starting points are within the original
+            # grid, clip the xg, yg to the grid to work around this issue
+            xg = np.clip(xg, 0, grid.nx - 1)
+            yg = np.clip(yg, 0, grid.ny - 1)
+
+            t = integrate(xg, yg, broken_streamlines)
             if t is not None:
                 trajectories.append(t)
 
     if use_multicolor_lines:
         if norm is None:
             norm = mcolors.Normalize(color.min(), color.max())
-        if cmap is None:
-            cmap = cm.get_cmap(matplotlib.rcParams['image.cmap'])
-        else:
-            cmap = cm.get_cmap(cmap)
+        cmap = cm._ensure_cmap(cmap)
 
     streamlines = []
     arrows = []
     for t in trajectories:
-        tgx = np.array(t[0])
-        tgy = np.array(t[1])
+        tgx, tgy = t.T
         # Rescale from grid-coordinates to data-coordinates.
-        tx, ty = dmap.grid2data(*np.array(t))
+        tx, ty = dmap.grid2data(tgx, tgy)
         tx += grid.x_origin
         ty += grid.y_origin
 
@@ -210,7 +219,6 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
 
         p = patches.FancyArrowPatch(
             arrow_tail, arrow_head, transform=transform, **arrow_kw)
-        axes.add_patch(p)
         arrows.append(p)
 
     lc = mcollections.LineCollection(
@@ -222,22 +230,20 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
         lc.set_cmap(cmap)
         lc.set_norm(norm)
     axes.add_collection(lc)
-    axes.autoscale_view()
 
-    ac = matplotlib.collections.PatchCollection(arrows)
+    ac = mcollections.PatchCollection(arrows)
+    # Adding the collection itself is broken; see #2341.
+    for p in arrows:
+        axes.add_patch(p)
+
+    axes.autoscale_view()
     stream_container = StreamplotSet(lc, ac)
     return stream_container
 
 
 class StreamplotSet:
 
-    def __init__(self, lines, arrows, **kwargs):
-        if kwargs:
-            _api.warn_deprecated(
-                "3.3",
-                message="Passing arbitrary keyword arguments to StreamplotSet "
-                        "is deprecated since %(since) and will become an "
-                        "error %(removal)s.")
+    def __init__(self, lines, arrows):
         self.lines = lines
         self.arrows = arrows
 
@@ -291,19 +297,19 @@ def data2grid(self, xd, yd):
     def grid2data(self, xg, yg):
         return xg / self.x_data2grid, yg / self.y_data2grid
 
-    def start_trajectory(self, xg, yg):
+    def start_trajectory(self, xg, yg, broken_streamlines=True):
         xm, ym = self.grid2mask(xg, yg)
-        self.mask._start_trajectory(xm, ym)
+        self.mask._start_trajectory(xm, ym, broken_streamlines)
 
     def reset_start_point(self, xg, yg):
         xm, ym = self.grid2mask(xg, yg)
         self.mask._current_xy = (xm, ym)
 
-    def update_trajectory(self, xg, yg):
+    def update_trajectory(self, xg, yg, broken_streamlines=True):
         if not self.grid.within_grid(xg, yg):
             raise InvalidIndexError
         xm, ym = self.grid2mask(xg, yg)
-        self.mask._update_trajectory(xm, ym)
+        self.mask._update_trajectory(xm, ym, broken_streamlines)
 
     def undo_trajectory(self):
         self.mask._undo_trajectory()
@@ -313,21 +319,22 @@ class Grid:
     """Grid of data."""
     def __init__(self, x, y):
 
-        if x.ndim == 1:
+        if np.ndim(x) == 1:
             pass
-        elif x.ndim == 2:
-            x_row = x[0, :]
+        elif np.ndim(x) == 2:
+            x_row = x[0]
             if not np.allclose(x_row, x):
                 raise ValueError("The rows of 'x' must be equal")
             x = x_row
         else:
             raise ValueError("'x' can have at maximum 2 dimensions")
 
-        if y.ndim == 1:
+        if np.ndim(y) == 1:
             pass
-        elif y.ndim == 2:
-            y_col = y[:, 0]
-            if not np.allclose(y_col, y.T):
+        elif np.ndim(y) == 2:
+            yt = np.transpose(y)  # Also works for nested lists.
+            y_col = yt[0]
+            if not np.allclose(y_col, yt):
                 raise ValueError("The columns of 'y' must be equal")
             y = y_col
         else:
@@ -392,17 +399,17 @@ def __init__(self, density):
     def __getitem__(self, args):
         return self._mask[args]
 
-    def _start_trajectory(self, xm, ym):
+    def _start_trajectory(self, xm, ym, broken_streamlines=True):
         """Start recording streamline trajectory"""
         self._traj = []
-        self._update_trajectory(xm, ym)
+        self._update_trajectory(xm, ym, broken_streamlines)
 
     def _undo_trajectory(self):
         """Remove current trajectory from mask"""
         for t in self._traj:
             self._mask[t] = 0
 
-    def _update_trajectory(self, xm, ym):
+    def _update_trajectory(self, xm, ym, broken_streamlines=True):
         """
         Update current trajectory position in mask.
 
@@ -414,7 +421,10 @@ def _update_trajectory(self, xm, ym):
                 self._mask[ym, xm] = 1
                 self._current_xy = (xm, ym)
             else:
-                raise InvalidIndexError
+                if broken_streamlines:
+                    raise InvalidIndexError
+                else:
+                    pass
 
 
 class InvalidIndexError(Exception):
@@ -428,7 +438,7 @@ class TerminateTrajectory(Exception):
 # Integrator definitions
 # =======================
 
-def get_integrator(u, v, dmap, minlength, maxlength, integration_direction):
+def _get_integrator(u, v, dmap, minlength, maxlength, integration_direction):
 
     # rescale velocity onto grid-coordinates for integrations.
     u, v = dmap.data2grid(u, v)
@@ -453,7 +463,7 @@ def backward_time(xi, yi):
         dxi, dyi = forward_time(xi, yi)
         return -dxi, -dyi
 
-    def integrate(x0, y0):
+    def integrate(x0, y0, broken_streamlines=True):
         """
         Return x, y grid-coordinates of trajectory based on starting point.
 
@@ -465,30 +475,27 @@ def integrate(x0, y0):
         resulting trajectory is None if it is shorter than `minlength`.
         """
 
-        stotal, x_traj, y_traj = 0., [], []
+        stotal, xy_traj = 0., []
 
         try:
-            dmap.start_trajectory(x0, y0)
+            dmap.start_trajectory(x0, y0, broken_streamlines)
         except InvalidIndexError:
             return None
         if integration_direction in ['both', 'backward']:
-            s, xt, yt = _integrate_rk12(x0, y0, dmap, backward_time, maxlength)
+            s, xyt = _integrate_rk12(x0, y0, dmap, backward_time, maxlength,
+                                     broken_streamlines)
             stotal += s
-            x_traj += xt[::-1]
-            y_traj += yt[::-1]
+            xy_traj += xyt[::-1]
 
         if integration_direction in ['both', 'forward']:
             dmap.reset_start_point(x0, y0)
-            s, xt, yt = _integrate_rk12(x0, y0, dmap, forward_time, maxlength)
-            if len(x_traj) > 0:
-                xt = xt[1:]
-                yt = yt[1:]
+            s, xyt = _integrate_rk12(x0, y0, dmap, forward_time, maxlength,
+                                     broken_streamlines)
             stotal += s
-            x_traj += xt
-            y_traj += yt
+            xy_traj += xyt[1:]
 
         if stotal > minlength:
-            return x_traj, y_traj
+            return np.broadcast_arrays(xy_traj, np.empty((1, 2)))[0]
         else:  # reject short trajectories
             dmap.undo_trajectory()
             return None
@@ -496,11 +503,20 @@ def integrate(x0, y0):
     return integrate
 
 
+@_api.deprecated("3.5")
+def get_integrator(u, v, dmap, minlength, maxlength, integration_direction):
+    xy_traj = _get_integrator(
+        u, v, dmap, minlength, maxlength, integration_direction)
+    return (None if xy_traj is None
+            else ([], []) if not len(xy_traj)
+            else [*zip(*xy_traj)])
+
+
 class OutOfBounds(IndexError):
     pass
 
 
-def _integrate_rk12(x0, y0, dmap, f, maxlength):
+def _integrate_rk12(x0, y0, dmap, f, maxlength, broken_streamlines=True):
     """
     2nd-order Runge-Kutta algorithm with adaptive step size.
 
@@ -520,9 +536,8 @@ def _integrate_rk12(x0, y0, dmap, f, maxlength):
        timestep is more suited to the problem as this would be very hard
        to judge automatically otherwise.
 
-    This integrator is about 1.5 - 2x as fast as both the RK4 and RK45
-    solvers in most setups on my machine. I would recommend removing the
-    other two to keep things simple.
+    This integrator is about 1.5 - 2x as fast as RK4 and RK45 solvers (using
+    similar Python implementations) in most setups.
     """
     # This error is below that needed to match the RK4 integrator. It
     # is set for visual reasons -- too low and corners start
@@ -541,14 +556,12 @@ def _integrate_rk12(x0, y0, dmap, f, maxlength):
     stotal = 0
     xi = x0
     yi = y0
-    xf_traj = []
-    yf_traj = []
+    xyf_traj = []
 
     while True:
         try:
             if dmap.grid.within_grid(xi, yi):
-                xf_traj.append(xi)
-                yf_traj.append(yi)
+                xyf_traj.append((xi, yi))
             else:
                 raise OutOfBounds
 
@@ -562,9 +575,8 @@ def _integrate_rk12(x0, y0, dmap, f, maxlength):
             # Out of the domain during this step.
             # Take an Euler step to the boundary to improve neatness
             # unless the trajectory is currently empty.
-            if xf_traj:
-                ds, xf_traj, yf_traj = _euler_step(xf_traj, yf_traj,
-                                                   dmap, f)
+            if xyf_traj:
+                ds, xyf_traj = _euler_step(xyf_traj, dmap, f)
                 stotal += ds
             break
         except TerminateTrajectory:
@@ -575,7 +587,7 @@ def _integrate_rk12(x0, y0, dmap, f, maxlength):
         dx2 = ds * 0.5 * (k1x + k2x)
         dy2 = ds * 0.5 * (k1y + k2y)
 
-        nx, ny = dmap.grid.shape
+        ny, nx = dmap.grid.shape
         # Error is normalized to the axes coordinates
         error = np.hypot((dx2 - dx1) / (nx - 1), (dy2 - dy1) / (ny - 1))
 
@@ -584,7 +596,7 @@ def _integrate_rk12(x0, y0, dmap, f, maxlength):
             xi += dx2
             yi += dy2
             try:
-                dmap.update_trajectory(xi, yi)
+                dmap.update_trajectory(xi, yi, broken_streamlines)
             except InvalidIndexError:
                 break
             if stotal + ds > maxlength:
@@ -597,14 +609,13 @@ def _integrate_rk12(x0, y0, dmap, f, maxlength):
         else:
             ds = min(maxds, 0.85 * ds * (maxerror / error) ** 0.5)
 
-    return stotal, xf_traj, yf_traj
+    return stotal, xyf_traj
 
 
-def _euler_step(xf_traj, yf_traj, dmap, f):
+def _euler_step(xyf_traj, dmap, f):
     """Simple Euler integration step that extends streamline to boundary."""
     ny, nx = dmap.grid.shape
-    xi = xf_traj[-1]
-    yi = yf_traj[-1]
+    xi, yi = xyf_traj[-1]
     cx, cy = f(xi, yi)
     if cx == 0:
         dsx = np.inf
@@ -619,9 +630,8 @@ def _euler_step(xf_traj, yf_traj, dmap, f):
     else:
         dsy = (ny - 1 - yi) / cy
     ds = min(dsx, dsy)
-    xf_traj.append(xi + cx * ds)
-    yf_traj.append(yi + cy * ds)
-    return ds, xf_traj, yf_traj
+    xyf_traj.append((xi + cx * ds, yi + cy * ds))
+    return ds, xyf_traj
 
 
 # Utility functions
diff --git a/lib/matplotlib/style/__init__.py b/lib/matplotlib/style/__init__.py
index 42d050d22cd0..488c6d6ae1ec 100644
--- a/lib/matplotlib/style/__init__.py
+++ b/lib/matplotlib/style/__init__.py
@@ -1 +1,4 @@
-from .core import use, context, available, library, reload_library
+from .core import available, context, library, reload_library, use
+
+
+__all__ = ["available", "context", "library", "reload_library", "use"]
diff --git a/lib/matplotlib/style/core.py b/lib/matplotlib/style/core.py
index 0c2f632e016a..16d8af38f659 100644
--- a/lib/matplotlib/style/core.py
+++ b/lib/matplotlib/style/core.py
@@ -19,27 +19,56 @@
 import warnings
 
 import matplotlib as mpl
-from matplotlib import _api, rc_params_from_file, rcParamsDefault
+from matplotlib import _api, _docstring, rc_params_from_file, rcParamsDefault
 
 _log = logging.getLogger(__name__)
 
 __all__ = ['use', 'context', 'available', 'library', 'reload_library']
 
 
+@_api.caching_module_getattr  # module-level deprecations
+class __getattr__:
+    STYLE_FILE_PATTERN = _api.deprecated("3.5", obj_type="")(property(
+        lambda self: re.compile(r'([\S]+).%s$' % STYLE_EXTENSION)))
+
+
 BASE_LIBRARY_PATH = os.path.join(mpl.get_data_path(), 'stylelib')
 # Users may want multiple library paths, so store a list of paths.
 USER_LIBRARY_PATHS = [os.path.join(mpl.get_configdir(), 'stylelib')]
 STYLE_EXTENSION = 'mplstyle'
-STYLE_FILE_PATTERN = re.compile(r'([\S]+).%s$' % STYLE_EXTENSION)
-
-
 # A list of rcParams that should not be applied from styles
 STYLE_BLACKLIST = {
-    'interactive', 'backend', 'backend.qt4', 'webagg.port', 'webagg.address',
+    'interactive', 'backend', 'webagg.port', 'webagg.address',
     'webagg.port_retries', 'webagg.open_in_browser', 'backend_fallback',
-    'toolbar', 'timezone', 'datapath', 'figure.max_open_warning',
+    'toolbar', 'timezone', 'figure.max_open_warning',
     'figure.raise_window', 'savefig.directory', 'tk.window_focus',
     'docstring.hardcopy', 'date.epoch'}
+_DEPRECATED_SEABORN_STYLES = {
+    s: s.replace("seaborn", "seaborn-v0_8")
+    for s in [
+        "seaborn",
+        "seaborn-bright",
+        "seaborn-colorblind",
+        "seaborn-dark",
+        "seaborn-darkgrid",
+        "seaborn-dark-palette",
+        "seaborn-deep",
+        "seaborn-muted",
+        "seaborn-notebook",
+        "seaborn-paper",
+        "seaborn-pastel",
+        "seaborn-poster",
+        "seaborn-talk",
+        "seaborn-ticks",
+        "seaborn-white",
+        "seaborn-whitegrid",
+    ]
+}
+_DEPRECATED_SEABORN_MSG = (
+    "The seaborn styles shipped by Matplotlib are deprecated since %(since)s, "
+    "as they no longer correspond to the styles shipped by seaborn. However, "
+    "they will remain available as 'seaborn-v0_8-<style>'. Alternatively, "
+    "directly use the seaborn API instead.")
 
 
 def _remove_blacklisted_style_params(d, warn=True):
@@ -48,8 +77,8 @@ def _remove_blacklisted_style_params(d, warn=True):
         if key in STYLE_BLACKLIST:
             if warn:
                 _api.warn_external(
-                    "Style includes a parameter, '{0}', that is not related "
-                    "to style.  Ignoring".format(key))
+                    f"Style includes a parameter, {key!r}, that is not "
+                    "related to style.  Ignoring this parameter.")
         else:
             o[key] = d[key]
     return o
@@ -59,6 +88,9 @@ def _apply_style(d, warn=True):
     mpl.rcParams.update(_remove_blacklisted_style_params(d, warn=warn))
 
 
+@_docstring.Substitution(
+    "\n".join(map("- {}".format, sorted(STYLE_BLACKLIST, key=str.lower)))
+)
 def use(style):
     """
     Use Matplotlib style settings from a style specification.
@@ -78,7 +110,7 @@ def use(style):
 
         +------+-------------------------------------------------------------+
         | str  | The name of a style or a path/URL to a style file. For a    |
-        |      | list of available style names, see `style.available`.       |
+        |      | list of available style names, see `.style.available`.      |
         +------+-------------------------------------------------------------+
         | dict | Dictionary with valid key/value pairs for                   |
         |      | `matplotlib.rcParams`.                                      |
@@ -89,18 +121,30 @@ def use(style):
         |      | first to last in the list.                                  |
         +------+-------------------------------------------------------------+
 
+    Notes
+    -----
+    The following `.rcParams` are not related to style and will be ignored if
+    found in a style specification:
+
+    %s
     """
-    style_alias = {'mpl20': 'default',
-                   'mpl15': 'classic'}
     if isinstance(style, (str, Path)) or hasattr(style, 'keys'):
         # If name is a single str, Path or dict, make it a single element list.
         styles = [style]
     else:
         styles = style
 
-    styles = (style_alias.get(s, s) if isinstance(s, str) else s
-              for s in styles)
-    for style in styles:
+    style_alias = {'mpl20': 'default', 'mpl15': 'classic'}
+
+    def fix_style(s):
+        if isinstance(s, str):
+            s = style_alias.get(s, s)
+            if s in _DEPRECATED_SEABORN_STYLES:
+                _api.warn_deprecated("3.6", message=_DEPRECATED_SEABORN_MSG)
+                s = _DEPRECATED_SEABORN_STYLES[s]
+        return s
+
+    for style in map(fix_style, styles):
         if not isinstance(style, (str, Path)):
             _apply_style(style)
         elif style == 'default':
@@ -133,7 +177,7 @@ def context(style, after_reset=False):
 
         +------+-------------------------------------------------------------+
         | str  | The name of a style or a path/URL to a style file. For a    |
-        |      | list of available style names, see `style.available`.       |
+        |      | list of available style names, see `.style.available`.      |
         +------+-------------------------------------------------------------+
         | dict | Dictionary with valid key/value pairs for                   |
         |      | `matplotlib.rcParams`.                                      |
@@ -155,12 +199,14 @@ def context(style, after_reset=False):
         yield
 
 
+@_api.deprecated("3.5")
 def load_base_library():
     """Load style library defined in this package."""
     library = read_style_directory(BASE_LIBRARY_PATH)
     return library
 
 
+@_api.deprecated("3.5")
 def iter_user_libraries():
     for stylelib_path in USER_LIBRARY_PATHS:
         stylelib_path = os.path.expanduser(stylelib_path)
@@ -170,7 +216,7 @@ def iter_user_libraries():
 
 def update_user_library(library):
     """Update style library with user-defined rc files."""
-    for stylelib_path in iter_user_libraries():
+    for stylelib_path in map(os.path.expanduser, USER_LIBRARY_PATHS):
         styles = read_style_directory(stylelib_path)
         update_nested_dict(library, styles)
     return library
@@ -202,19 +248,26 @@ def update_nested_dict(main_dict, new_dict):
     return main_dict
 
 
-# Load style library
-# ==================
-_base_library = load_base_library()
+class _StyleLibrary(dict):
+    def __getitem__(self, key):
+        if key in _DEPRECATED_SEABORN_STYLES:
+            _api.warn_deprecated("3.6", message=_DEPRECATED_SEABORN_MSG)
+            key = _DEPRECATED_SEABORN_STYLES[key]
 
-library = None
+        return dict.__getitem__(self, key)
 
+
+# Load style library
+# ==================
+_base_library = read_style_directory(BASE_LIBRARY_PATH)
+library = _StyleLibrary()
 available = []
 
 
 def reload_library():
     """Reload the style library."""
-    global library
-    library = update_user_library(_base_library)
+    library.clear()
+    library.update(update_user_library(_base_library))
     available[:] = sorted(library.keys())
 
 
diff --git a/lib/matplotlib/table.py b/lib/matplotlib/table.py
index 965cb6eeda9b..d9f614532693 100644
--- a/lib/matplotlib/table.py
+++ b/lib/matplotlib/table.py
@@ -9,6 +9,11 @@
 """
 Tables drawing.
 
+.. note::
+    The table implementation in Matplotlib is lightly maintained. For a more
+    featureful table implementation, you may wish to try `blume
+    <https://github.com/swfiua/blume>`_.
+
 Use the factory function `~matplotlib.table.table` to create a ready-made
 table from texts. If you need more control, use the `.Table` class and its
 methods.
@@ -19,7 +24,7 @@
 Thanks to John Gill for providing the class and table.
 """
 
-from . import _api, artist, docstring
+from . import _api, _docstring
 from .artist import Artist, allow_rasterization
 from .patches import Rectangle
 from .text import Text
@@ -46,6 +51,7 @@ class Cell(Rectangle):
                      'vertical':     'RL'
                      }
 
+    @_api.make_keyword_only("3.6", name="edgecolor")
     def __init__(self, xy, width, height,
                  edgecolor='k', facecolor='w',
                  fill=True,
@@ -170,16 +176,16 @@ def get_required_width(self, renderer):
         l, b, w, h = self.get_text_bounds(renderer)
         return w * (1.0 + (2.0 * self.PAD))
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def set_text_props(self, **kwargs):
         """
         Update the text properties.
 
         Valid keyword arguments are:
 
-        %(Text_kwdoc)s
+        %(Text:kwdoc)s
         """
-        self._text.update(kwargs)
+        self._text._internal_update(kwargs)
         self.stale = True
 
     @property
@@ -310,7 +316,7 @@ def __init__(self, ax, loc=None, bbox=None, **kwargs):
         self._edges = None
         self._autoColumns = []
         self._autoFontsize = True
-        self.update(kwargs)
+        self._internal_update(kwargs)
 
         self.set_clip_on(False)
 
@@ -393,7 +399,7 @@ def draw(self, renderer):
         # Need a renderer to do hit tests on mouseevent; assume the last one
         # will do
         if renderer is None:
-            renderer = self.figure._cachedRenderer
+            renderer = self.figure._get_renderer()
         if renderer is None:
             raise RuntimeError('No renderer defined')
 
@@ -427,7 +433,7 @@ def contains(self, mouseevent):
             return inside, info
         # TODO: Return index of the cell containing the cursor so that the user
         # doesn't have to bind to each one individually.
-        renderer = self.figure._cachedRenderer
+        renderer = self.figure._get_renderer()
         if renderer is not None:
             boxes = [cell.get_window_extent(renderer)
                      for (row, col), cell in self._cells.items()
@@ -441,8 +447,10 @@ def get_children(self):
         """Return the Artists contained by the table."""
         return list(self._cells.values())
 
-    def get_window_extent(self, renderer):
-        """Return the bounding box of the table in window coords."""
+    def get_window_extent(self, renderer=None):
+        # docstring inherited
+        if renderer is None:
+            renderer = self.figure._get_renderer()
         self._update_positions(renderer)
         boxes = [cell.get_window_extent(renderer)
                  for cell in self._cells.values()]
@@ -639,10 +647,7 @@ def get_celld(self):
         return self._cells
 
 
-docstring.interpd.update(Table_kwdoc=artist.kwdoc(Table))
-
-
-@docstring.dedent_interpd
+@_docstring.dedent_interpd
 def table(ax,
           cellText=None, cellColours=None,
           cellLoc='right', colWidths=None,
@@ -723,7 +728,7 @@ def table(ax,
     **kwargs
         `.Table` properties.
 
-    %(Table_kwdoc)s
+    %(Table:kwdoc)s
     """
 
     if cellColours is None and cellText is None:
diff --git a/lib/matplotlib/testing/__init__.py b/lib/matplotlib/testing/__init__.py
index f9c547ce00aa..6f54a4866c18 100644
--- a/lib/matplotlib/testing/__init__.py
+++ b/lib/matplotlib/testing/__init__.py
@@ -1,12 +1,13 @@
 """
 Helper functions for testing.
 """
-
+from pathlib import Path
+from tempfile import TemporaryDirectory
 import locale
 import logging
+import os
 import subprocess
-from pathlib import Path
-from tempfile import TemporaryDirectory
+import sys
 
 import matplotlib as mpl
 from matplotlib import _api
@@ -49,6 +50,35 @@ def setup():
     set_reproducibility_for_testing()
 
 
+def subprocess_run_helper(func, *args, timeout, extra_env=None):
+    """
+    Run a function in a sub-process.
+
+    Parameters
+    ----------
+    func : function
+        The function to be run.  It must be in a module that is importable.
+    *args : str
+        Any additional command line arguments to be passed in
+        the first argument to ``subprocess.run``.
+    extra_env : dict[str, str]
+        Any additional environment variables to be set for the subprocess.
+    """
+    target = func.__name__
+    module = func.__module__
+    proc = subprocess.run(
+        [sys.executable,
+         "-c",
+         f"from {module} import {target}; {target}()",
+         *args],
+        env={**os.environ, "SOURCE_DATE_EPOCH": "0", **(extra_env or {})},
+        timeout=timeout, check=True,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        universal_newlines=True)
+    return proc
+
+
 def _check_for_pgf(texsystem):
     """
     Check if a given TeX system + pgf is available
@@ -61,13 +91,13 @@ def _check_for_pgf(texsystem):
     with TemporaryDirectory() as tmpdir:
         tex_path = Path(tmpdir, "test.tex")
         tex_path.write_text(r"""
-            \documentclass{minimal}
+            \documentclass{article}
             \usepackage{pgf}
             \begin{document}
             \typeout{pgfversion=\pgfversion}
             \makeatletter
             \@@end
-        """)
+        """, encoding="utf-8")
         try:
             subprocess.check_call(
                 [texsystem, "-halt-on-error", str(tex_path)], cwd=tmpdir,
@@ -78,4 +108,8 @@ def _check_for_pgf(texsystem):
 
 
 def _has_tex_package(package):
-    return bool(mpl.dviread.find_tex_file(f"{package}.sty"))
+    try:
+        mpl.dviread._find_tex_file(f"{package}.sty")
+        return True
+    except FileNotFoundError:
+        return False
diff --git a/lib/matplotlib/testing/_markers.py b/lib/matplotlib/testing/_markers.py
new file mode 100644
index 000000000000..fa7885151e33
--- /dev/null
+++ b/lib/matplotlib/testing/_markers.py
@@ -0,0 +1,49 @@
+"""
+pytest markers for the internal Matplotlib test suite.
+"""
+
+import logging
+import shutil
+
+import pytest
+
+import matplotlib.testing
+import matplotlib.testing.compare
+from matplotlib import _get_executable_info, ExecutableNotFoundError
+
+
+_log = logging.getLogger(__name__)
+
+
+def _checkdep_usetex():
+    if not shutil.which("tex"):
+        _log.warning("usetex mode requires TeX.")
+        return False
+    try:
+        _get_executable_info("dvipng")
+    except ExecutableNotFoundError:
+        _log.warning("usetex mode requires dvipng.")
+        return False
+    try:
+        _get_executable_info("gs")
+    except ExecutableNotFoundError:
+        _log.warning("usetex mode requires ghostscript.")
+        return False
+    return True
+
+
+needs_ghostscript = pytest.mark.skipif(
+    "eps" not in matplotlib.testing.compare.converter,
+    reason="This test needs a ghostscript installation")
+needs_pgf_lualatex = pytest.mark.skipif(
+    not matplotlib.testing._check_for_pgf('lualatex'),
+    reason='lualatex + pgf is required')
+needs_pgf_pdflatex = pytest.mark.skipif(
+    not matplotlib.testing._check_for_pgf('pdflatex'),
+    reason='pdflatex + pgf is required')
+needs_pgf_xelatex = pytest.mark.skipif(
+    not matplotlib.testing._check_for_pgf('xelatex'),
+    reason='xelatex + pgf is required')
+needs_usetex = pytest.mark.skipif(
+    not _checkdep_usetex(),
+    reason="This test needs a TeX installation")
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
index fb2e55880cde..4c07c7ad7e09 100644
--- a/lib/matplotlib/testing/compare.py
+++ b/lib/matplotlib/testing/compare.py
@@ -8,17 +8,17 @@
 import logging
 import os
 from pathlib import Path
-import re
 import shutil
 import subprocess
 import sys
 from tempfile import TemporaryDirectory, TemporaryFile
+import weakref
 
 import numpy as np
 from PIL import Image
 
 import matplotlib as mpl
-from matplotlib import _api, cbook
+from matplotlib import cbook
 from matplotlib.testing.exceptions import ImageComparisonFailure
 
 _log = logging.getLogger(__name__)
@@ -63,34 +63,6 @@ def get_file_hash(path, block_size=2 ** 20):
     return md5.hexdigest()
 
 
-@_api.deprecated("3.3")
-def make_external_conversion_command(cmd):
-    def convert(old, new):
-        cmdline = cmd(old, new)
-        pipe = subprocess.Popen(cmdline, universal_newlines=True,
-                                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        stdout, stderr = pipe.communicate()
-        errcode = pipe.wait()
-        if not os.path.exists(new) or errcode:
-            msg = "Conversion command failed:\n%s\n" % ' '.join(cmdline)
-            if stdout:
-                msg += "Standard output:\n%s\n" % stdout
-            if stderr:
-                msg += "Standard error:\n%s\n" % stderr
-            raise IOError(msg)
-
-    return convert
-
-
-# Modified from https://bugs.python.org/issue25567.
-_find_unsafe_bytes = re.compile(br'[^a-zA-Z0-9_@%+=:,./-]').search
-
-
-def _shlex_quote_bytes(b):
-    return (b if _find_unsafe_bytes(b) is None
-            else b"'" + b.replace(b"'", b"'\"'\"'") + b"'")
-
-
 class _ConverterError(Exception):
     pass
 
@@ -120,10 +92,10 @@ def _read_until(self, terminator):
         while True:
             c = self._proc.stdout.read(1)
             if not c:
-                raise _ConverterError
+                raise _ConverterError(os.fsdecode(bytes(buf)))
             buf.extend(c)
             if buf.endswith(terminator):
-                return bytes(buf[:-len(terminator)])
+                return bytes(buf)
 
 
 class _GSConverter(_Converter):
@@ -131,13 +103,14 @@ def __call__(self, orig, dest):
         if not self._proc:
             self._proc = subprocess.Popen(
                 [mpl._get_executable_info("gs").executable,
-                 "-dNOSAFER", "-dNOPAUSE", "-sDEVICE=png16m"],
+                 "-dNOSAFER", "-dNOPAUSE", "-dEPSCrop", "-sDEVICE=png16m"],
                 # As far as I can see, ghostscript never outputs to stderr.
                 stdin=subprocess.PIPE, stdout=subprocess.PIPE)
             try:
                 self._read_until(b"\nGS")
             except _ConverterError as err:
-                raise OSError("Failed to start Ghostscript") from err
+                raise OSError(
+                    "Failed to start Ghostscript:\n\n" + err.args[0]) from None
 
         def encode_and_escape(name):
             return (os.fsencode(name)
@@ -153,25 +126,32 @@ def encode_and_escape(name):
             + b") run flush\n")
         self._proc.stdin.flush()
         # GS> if nothing left on the stack; GS<n> if n items left on the stack.
-        err = self._read_until(b"GS")
-        stack = self._read_until(b">")
+        err = self._read_until((b"GS<", b"GS>"))
+        stack = self._read_until(b">") if err.endswith(b"GS<") else b""
         if stack or not os.path.exists(dest):
-            stack_size = int(stack[1:]) if stack else 0
+            stack_size = int(stack[:-1]) if stack else 0
             self._proc.stdin.write(b"pop\n" * stack_size)
             # Using the systemencoding should at least get the filenames right.
             raise ImageComparisonFailure(
-                (err + b"GS" + stack + b">")
-                .decode(sys.getfilesystemencoding(), "replace"))
+                (err + stack).decode(sys.getfilesystemencoding(), "replace"))
 
 
 class _SVGConverter(_Converter):
     def __call__(self, orig, dest):
-        old_inkscape = mpl._get_executable_info("inkscape").version < "1"
+        old_inkscape = mpl._get_executable_info("inkscape").version.major < 1
         terminator = b"\n>" if old_inkscape else b"> "
         if not hasattr(self, "_tmpdir"):
             self._tmpdir = TemporaryDirectory()
+            # On Windows, we must make sure that self._proc has terminated
+            # (which __del__ does) before clearing _tmpdir.
+            weakref.finalize(self._tmpdir, self.__del__)
         if (not self._proc  # First run.
                 or self._proc.poll() is not None):  # Inkscape terminated.
+            if self._proc is not None and self._proc.poll() is not None:
+                for stream in filter(None, [self._proc.stdin,
+                                            self._proc.stdout,
+                                            self._proc.stderr]):
+                    stream.close()
             env = {
                 **os.environ,
                 # If one passes e.g. a png file to Inkscape, it will try to
@@ -181,7 +161,7 @@ def __call__(self, orig, dest):
                 # just be reported as a regular exception below).
                 "DISPLAY": "",
                 # Do not load any user options.
-                "INKSCAPE_PROFILE_DIR": os.devnull,
+                "INKSCAPE_PROFILE_DIR": self._tmpdir.name,
             }
             # Old versions of Inkscape (e.g. 0.48.3.1) seem to sometimes
             # deadlock when stderr is redirected to a pipe, so we redirect it
@@ -198,8 +178,9 @@ def __call__(self, orig, dest):
             try:
                 self._read_until(terminator)
             except _ConverterError as err:
-                raise OSError("Failed to start Inkscape in interactive "
-                              "mode") from err
+                raise OSError(
+                    "Failed to start Inkscape in interactive mode:\n\n"
+                    + err.args[0]) from err
 
         # Inkscape's shell mode does not support escaping metacharacters in the
         # filename ("\n", and ":;" for inkscape>=1).  Avoid any problems by
@@ -233,6 +214,21 @@ def __del__(self):
             self._tmpdir.cleanup()
 
 
+class _SVGWithMatplotlibFontsConverter(_SVGConverter):
+    """
+    A SVG converter which explicitly adds the fonts shipped by Matplotlib to
+    Inkspace's font search path, to better support `svg.fonttype = "none"`
+    (which is in particular used by certain mathtext tests).
+    """
+
+    def __call__(self, orig, dest):
+        if not hasattr(self, "_tmpdir"):
+            self._tmpdir = TemporaryDirectory()
+            shutil.copytree(cbook._get_data_path("fonts/ttf"),
+                            Path(self._tmpdir.name, "fonts"))
+        return super().__call__(orig, dest)
+
+
 def _update_converter():
     try:
         mpl._get_executable_info("gs")
@@ -254,6 +250,7 @@ def _update_converter():
 #: extension to png format.
 converter = {}
 _update_converter()
+_svg_with_matplotlib_fonts_converter = _SVGWithMatplotlibFontsConverter()
 
 
 def comparable_formats():
@@ -303,7 +300,14 @@ def convert(filename, cache):
                 return str(newpath)
 
         _log.debug("For %s: converting to png.", filename)
-        converter[path.suffix[1:]](path, newpath)
+        convert = converter[path.suffix[1:]]
+        if path.suffix == ".svg":
+            contents = path.read_text()
+            if 'style="font:' in contents:
+                # for svg.fonttype = none, we explicitly patch the font search
+                # path so that fonts shipped by Matplotlib are found.
+                convert = _svg_with_matplotlib_fonts_converter
+        convert(path, newpath)
 
         if cache_dir is not None:
             _log.debug("For %s: caching conversion result.", filename)
@@ -367,6 +371,16 @@ def calculate_rms(expected_image, actual_image):
 # 16-bit depth, as Pillow converts these to RGB incorrectly.
 
 
+def _load_image(path):
+    img = Image.open(path)
+    # In an RGBA image, if the smallest value in the alpha channel is 255, all
+    # values in it must be 255, meaning that the image is opaque. If so,
+    # discard the alpha channel so that it may compare equal to an RGB image.
+    if img.mode != "RGBA" or img.getextrema()[3][0] == 255:
+        img = img.convert("RGB")
+    return np.asarray(img)
+
+
 def compare_images(expected, actual, tol, in_decorator=False):
     """
     Compare two "image" files checking differences within a tolerance.
@@ -431,9 +445,9 @@ def compare_images(expected, actual, tol, in_decorator=False):
         actual = convert(actual, cache=True)
         expected = convert(expected, cache=True)
 
-    # open the image files and remove the alpha channel (if it exists)
-    expected_image = np.asarray(Image.open(expected).convert("RGB"))
-    actual_image = np.asarray(Image.open(actual).convert("RGB"))
+    # open the image files
+    expected_image = _load_image(expected)
+    actual_image = _load_image(actual)
 
     actual_image, expected_image = crop_to_same(
         actual, actual_image, expected, expected_image)
@@ -482,9 +496,8 @@ def save_diff_image(expected, actual, output):
     output : str
         File path to save difference image to.
     """
-    # Drop alpha channels, similarly to compare_images.
-    expected_image = np.asarray(Image.open(expected).convert("RGB"))
-    actual_image = np.asarray(Image.open(actual).convert("RGB"))
+    expected_image = _load_image(expected)
+    actual_image = _load_image(actual)
     actual_image, expected_image = crop_to_same(
         actual, actual_image, expected, expected_image)
     expected_image = np.array(expected_image).astype(float)
@@ -493,21 +506,13 @@ def save_diff_image(expected, actual, output):
         raise ImageComparisonFailure(
             "Image sizes do not match expected size: {} "
             "actual size {}".format(expected_image.shape, actual_image.shape))
-    abs_diff_image = np.abs(expected_image - actual_image)
+    abs_diff = np.abs(expected_image - actual_image)
 
     # expand differences in luminance domain
-    abs_diff_image *= 255 * 10
-    save_image_np = np.clip(abs_diff_image, 0, 255).astype(np.uint8)
-    height, width, depth = save_image_np.shape
-
-    # The PDF renderer doesn't produce an alpha channel, but the
-    # matplotlib PNG writer requires one, so expand the array
-    if depth == 3:
-        with_alpha = np.empty((height, width, 4), dtype=np.uint8)
-        with_alpha[:, :, 0:3] = save_image_np
-        save_image_np = with_alpha
+    abs_diff *= 10
+    abs_diff = np.clip(abs_diff, 0, 255).astype(np.uint8)
 
-    # Hard-code the alpha channel to fully solid
-    save_image_np[:, :, 3] = 255
+    if abs_diff.shape[2] == 4:  # Hard-code the alpha channel to fully solid
+        abs_diff[:, :, 3] = 255
 
-    Image.fromarray(save_image_np).save(output, format="png")
+    Image.fromarray(abs_diff).save(output, format="png")
diff --git a/lib/matplotlib/testing/conftest.py b/lib/matplotlib/testing/conftest.py
index 902d8f42bdc7..21f6c707ecf8 100644
--- a/lib/matplotlib/testing/conftest.py
+++ b/lib/matplotlib/testing/conftest.py
@@ -13,11 +13,16 @@ def pytest_configure(config):
         ("markers", "flaky: (Provided by pytest-rerunfailures.)"),
         ("markers", "timeout: (Provided by pytest-timeout.)"),
         ("markers", "backend: Set alternate Matplotlib backend temporarily."),
-        ("markers", "style: Set alternate Matplotlib style temporarily."),
+        ("markers",
+         "style: Set alternate Matplotlib style temporarily (deprecated)."),
         ("markers", "baseline_images: Compare output against references."),
         ("markers", "pytz: Tests that require pytz to be installed."),
-        ("markers", "network: Tests that reach out to the network."),
         ("filterwarnings", "error"),
+        ("filterwarnings",
+         "ignore:.*The py23 module has been deprecated:DeprecationWarning"),
+        ("filterwarnings",
+         r"ignore:DynamicImporter.find_spec\(\) not found; "
+         r"falling back to find_module\(\):ImportWarning"),
     ]:
         config.addinivalue_line(key, value)
 
@@ -38,37 +43,18 @@ def mpl_test_settings(request):
 
         backend = None
         backend_marker = request.node.get_closest_marker('backend')
+        prev_backend = matplotlib.get_backend()
         if backend_marker is not None:
             assert len(backend_marker.args) == 1, \
                 "Marker 'backend' must specify 1 backend."
             backend, = backend_marker.args
             skip_on_importerror = backend_marker.kwargs.get(
                 'skip_on_importerror', False)
-            prev_backend = matplotlib.get_backend()
 
             # special case Qt backend importing to avoid conflicts
-            if backend.lower().startswith('qt4'):
-                if any(k in sys.modules for k in ('PyQt5', 'PySide2')):
-                    pytest.skip('Qt5 binding already imported')
-                try:
-                    import PyQt4
-                # RuntimeError if PyQt5 already imported.
-                except (ImportError, RuntimeError):
-                    try:
-                        import PySide
-                    except ImportError:
-                        pytest.skip("Failed to import a Qt4 binding.")
-            elif backend.lower().startswith('qt5'):
-                if any(k in sys.modules for k in ('PyQt4', 'PySide')):
+            if backend.lower().startswith('qt5'):
+                if any(sys.modules.get(k) for k in ('PyQt4', 'PySide')):
                     pytest.skip('Qt4 binding already imported')
-                try:
-                    import PyQt5
-                # RuntimeError if PyQt4 already imported.
-                except (ImportError, RuntimeError):
-                    try:
-                        import PySide2
-                    except ImportError:
-                        pytest.skip("Failed to import a Qt5 binding.")
 
         # Default of cleanup and image_comparison too.
         style = ["classic", "_classic_test_patch"]
@@ -76,6 +62,8 @@ def mpl_test_settings(request):
         if style_marker is not None:
             assert len(style_marker.args) == 1, \
                 "Marker 'style' must specify 1 style."
+            _api.warn_deprecated("3.5", name="style", obj_type="pytest marker",
+                                 alternative="@mpl.style.context(...)")
             style, = style_marker.args
 
         matplotlib.testing.setup()
@@ -98,11 +86,11 @@ def mpl_test_settings(request):
         try:
             yield
         finally:
-            if backend is not None:
-                plt.switch_backend(prev_backend)
+            matplotlib.use(prev_backend)
 
 
 @pytest.fixture
+@_api.deprecated("3.5", alternative="none")
 def mpl_image_comparison_parameters(request, extension):
     # This fixture is applied automatically by the image_comparison decorator.
     #
@@ -135,3 +123,10 @@ def pd():
     except ImportError:
         pass
     return pd
+
+
+@pytest.fixture
+def xr():
+    """Fixture to import xarray."""
+    xr = pytest.importorskip('xarray')
+    return xr
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
index 6600a4ec6d68..46dfcf992baa 100644
--- a/lib/matplotlib/testing/decorators.py
+++ b/lib/matplotlib/testing/decorators.py
@@ -1,5 +1,4 @@
 import contextlib
-from distutils.version import StrictVersion
 import functools
 import inspect
 import os
@@ -10,14 +9,13 @@
 import unittest
 import warnings
 
+from packaging.version import parse as parse_version
+
 import matplotlib.style
 import matplotlib.units
 import matplotlib.testing
-from matplotlib import cbook
-from matplotlib import ft2font
-from matplotlib import pyplot as plt
-from matplotlib import ticker
-
+from matplotlib import (_api, _pylab_helpers, cbook, ft2font, pyplot as plt,
+                        ticker)
 from .compare import comparable_formats, compare_images, make_test_filename
 from .exceptions import ImageComparisonFailure
 
@@ -34,6 +32,8 @@ def _cleanup_cm():
         plt.close("all")
 
 
+@_api.deprecated("3.6", alternative="a vendored copy of the existing code, "
+                 "including the private function _cleanup_cm")
 class CleanupTestCase(unittest.TestCase):
     """A wrapper for unittest.TestCase that includes cleanup operations."""
     @classmethod
@@ -45,6 +45,8 @@ def tearDownClass(cls):
         cls._cm.__exit__(None, None, None)
 
 
+@_api.deprecated("3.6", alternative="a vendored copy of the existing code, "
+                 "including the private function _cleanup_cm")
 def cleanup(style=None):
     """
     A decorator to ensure that any global state is reset before
@@ -86,26 +88,32 @@ def wrapped_callable(*args, **kwargs):
         return make_cleanup
 
 
+@_api.deprecated("3.6", alternative="a vendored copy of the existing code "
+                 "of _check_freetype_version")
 def check_freetype_version(ver):
+    return _check_freetype_version(ver)
+
+
+def _check_freetype_version(ver):
     if ver is None:
         return True
 
     if isinstance(ver, str):
         ver = (ver, ver)
-    ver = [StrictVersion(x) for x in ver]
-    found = StrictVersion(ft2font.__freetype_version__)
+    ver = [parse_version(x) for x in ver]
+    found = parse_version(ft2font.__freetype_version__)
 
     return ver[0] <= found <= ver[1]
 
 
 def _checked_on_freetype_version(required_freetype_version):
     import pytest
-    reason = ("Mismatched version of freetype. "
-              "Test requires '%s', you have '%s'" %
-              (required_freetype_version, ft2font.__freetype_version__))
     return pytest.mark.xfail(
-        not check_freetype_version(required_freetype_version),
-        reason=reason, raises=ImageComparisonFailure, strict=False)
+        not _check_freetype_version(required_freetype_version),
+        reason=f"Mismatched version of freetype. "
+               f"Test requires '{required_freetype_version}', "
+               f"you have '{ft2font.__freetype_version__}'",
+        raises=ImageComparisonFailure, strict=False)
 
 
 def remove_ticks_and_titles(figure):
@@ -129,6 +137,29 @@ def remove_ticks(ax):
         remove_ticks(ax)
 
 
+@contextlib.contextmanager
+def _collect_new_figures():
+    """
+    After::
+
+        with _collect_new_figures() as figs:
+            some_code()
+
+    the list *figs* contains the figures that have been created during the
+    execution of ``some_code``, sorted by figure number.
+    """
+    managers = _pylab_helpers.Gcf.figs
+    preexisting = [manager for manager in managers.values()]
+    new_figs = []
+    try:
+        yield new_figs
+    finally:
+        new_managers = sorted([manager for manager in managers.values()
+                               if manager not in preexisting],
+                              key=lambda manager: manager.num)
+        new_figs[:] = [manager.canvas.figure for manager in new_managers]
+
+
 def _raise_on_image_difference(expected, actual, tol):
     __tracebackhide__ = True
 
@@ -141,32 +172,6 @@ def _raise_on_image_difference(expected, actual, tol):
                 '\n\t%(actual)s\n\t%(expected)s\n\t%(diff)s') % err)
 
 
-def _skip_if_format_is_uncomparable(extension):
-    import pytest
-    return pytest.mark.skipif(
-        extension not in comparable_formats(),
-        reason='Cannot compare {} files on this system'.format(extension))
-
-
-def _mark_skip_if_format_is_uncomparable(extension):
-    import pytest
-    if isinstance(extension, str):
-        name = extension
-        marks = []
-    elif isinstance(extension, tuple):
-        # Extension might be a pytest ParameterSet instead of a plain string.
-        # Unfortunately, this type is not exposed, so since it's a namedtuple,
-        # check for a tuple instead.
-        name, = extension.values
-        marks = [*extension.marks]
-    else:
-        # Extension might be a pytest marker instead of a plain string.
-        name, = extension.args
-        marks = [extension.mark]
-    return pytest.param(name,
-                        marks=[*marks, _skip_if_format_is_uncomparable(name)])
-
-
 class _ImageComparisonBase:
     """
     Image comparison base class
@@ -204,10 +209,8 @@ def copy_baseline(self, baseline, extension):
                 f"{orig_expected_path}") from err
         return expected_fname
 
-    def compare(self, idx, baseline, extension, *, _lock=False):
+    def compare(self, fig, baseline, extension, *, _lock=False):
         __tracebackhide__ = True
-        fignum = plt.get_fignums()[idx]
-        fig = plt.figure(fignum)
 
         if self.remove_text:
             remove_ticks_and_titles(fig)
@@ -222,7 +225,12 @@ def compare(self, idx, baseline, extension, *, _lock=False):
         lock = (cbook._lock_path(actual_path)
                 if _lock else contextlib.nullcontext())
         with lock:
-            fig.savefig(actual_path, **kwargs)
+            try:
+                fig.savefig(actual_path, **kwargs)
+            finally:
+                # Matplotlib has an autouse fixture to close figures, but this
+                # makes things more convenient for third-party users.
+                plt.close(fig)
             expected_path = self.copy_baseline(baseline, extension)
             _raise_on_image_difference(expected_path, actual_path, self.tol)
 
@@ -238,7 +246,6 @@ def _pytest_image_comparison(baseline_images, extensions, tol,
     """
     import pytest
 
-    extensions = map(_mark_skip_if_format_is_uncomparable, extensions)
     KEYWORD_ONLY = inspect.Parameter.KEYWORD_ONLY
 
     def decorator(func):
@@ -246,7 +253,7 @@ def decorator(func):
 
         @functools.wraps(func)
         @pytest.mark.parametrize('extension', extensions)
-        @pytest.mark.style(style)
+        @matplotlib.style.context(style)
         @_checked_on_freetype_version(freetype_version)
         @functools.wraps(func)
         def wrapper(*args, extension, request, **kwargs):
@@ -256,10 +263,15 @@ def wrapper(*args, extension, request, **kwargs):
             if 'request' in old_sig.parameters:
                 kwargs['request'] = request
 
+            if extension not in comparable_formats():
+                pytest.skip(f"Cannot compare {extension} files on this system")
+
             img = _ImageComparisonBase(func, tol=tol, remove_text=remove_text,
                                        savefig_kwargs=savefig_kwargs)
             matplotlib.testing.set_font_settings_for_testing()
-            func(*args, **kwargs)
+
+            with _collect_new_figures() as figs:
+                func(*args, **kwargs)
 
             # If the test is parametrized in any way other than applied via
             # this decorator, then we need to use a lock to prevent two
@@ -276,11 +288,11 @@ def wrapper(*args, extension, request, **kwargs):
                 our_baseline_images = request.getfixturevalue(
                     'baseline_images')
 
-            assert len(plt.get_fignums()) == len(our_baseline_images), (
+            assert len(figs) == len(our_baseline_images), (
                 "Test generated {} images but there are {} baseline images"
-                .format(len(plt.get_fignums()), len(our_baseline_images)))
-            for idx, baseline in enumerate(our_baseline_images):
-                img.compare(idx, baseline, extension, _lock=needs_lock)
+                .format(len(figs), len(our_baseline_images)))
+            for fig, baseline in zip(figs, our_baseline_images):
+                img.compare(fig, baseline, extension, _lock=needs_lock)
 
         parameters = list(old_sig.parameters.values())
         if 'extension' not in old_sig.parameters:
@@ -451,11 +463,9 @@ def wrapper(*args, ext, request, **kwargs):
             try:
                 fig_test = plt.figure("test")
                 fig_ref = plt.figure("reference")
-                # Keep track of number of open figures, to make sure test
-                # doesn't create any new ones
-                n_figs = len(plt.get_fignums())
-                func(*args, fig_test=fig_test, fig_ref=fig_ref, **kwargs)
-                if len(plt.get_fignums()) > n_figs:
+                with _collect_new_figures() as figs:
+                    func(*args, fig_test=fig_test, fig_ref=fig_ref, **kwargs)
+                if figs:
                     raise RuntimeError('Number of open figures changed during '
                                        'test. Make sure you are plotting to '
                                        'fig_test or fig_ref, or if this is '
@@ -503,7 +513,7 @@ def _image_directories(func):
     ``$(pwd)/result_images/test_baz``.  The result directory is created if it
     doesn't exist.
     """
-    module_path = Path(sys.modules[func.__module__].__file__)
+    module_path = Path(inspect.getfile(func))
     baseline_dir = module_path.parent / "baseline_images" / module_path.stem
     result_dir = Path().resolve() / "result_images" / module_path.stem
     result_dir.mkdir(parents=True, exist_ok=True)
diff --git a/lib/matplotlib/testing/jpl_units/Duration.py b/lib/matplotlib/testing/jpl_units/Duration.py
index 9bd8d9fe71cf..fae4169f9239 100644
--- a/lib/matplotlib/testing/jpl_units/Duration.py
+++ b/lib/matplotlib/testing/jpl_units/Duration.py
@@ -1,5 +1,6 @@
 """Duration module."""
 
+import functools
 import operator
 
 from matplotlib import _api
@@ -44,38 +45,20 @@ def seconds(self):
     def __bool__(self):
         return self._seconds != 0
 
-    def __eq__(self, rhs):
-        return self._cmp(rhs, operator.eq)
-
-    def __ne__(self, rhs):
-        return self._cmp(rhs, operator.ne)
-
-    def __lt__(self, rhs):
-        return self._cmp(rhs, operator.lt)
-
-    def __le__(self, rhs):
-        return self._cmp(rhs, operator.le)
-
-    def __gt__(self, rhs):
-        return self._cmp(rhs, operator.gt)
-
-    def __ge__(self, rhs):
-        return self._cmp(rhs, operator.ge)
-
-    def _cmp(self, rhs, op):
+    def _cmp(self, op, rhs):
         """
-        Compare two Durations.
-
-        = INPUT VARIABLES
-        - rhs     The Duration to compare against.
-        - op      The function to do the comparison
-
-        = RETURN VALUE
-        - Returns op(self, rhs)
+        Check that *self* and *rhs* share frames; compare them using *op*.
         """
         self.checkSameFrame(rhs, "compare")
         return op(self._seconds, rhs._seconds)
 
+    __eq__ = functools.partialmethod(_cmp, operator.eq)
+    __ne__ = functools.partialmethod(_cmp, operator.ne)
+    __lt__ = functools.partialmethod(_cmp, operator.lt)
+    __le__ = functools.partialmethod(_cmp, operator.le)
+    __gt__ = functools.partialmethod(_cmp, operator.gt)
+    __ge__ = functools.partialmethod(_cmp, operator.ge)
+
     def __add__(self, rhs):
         """
         Add two Durations.
@@ -126,17 +109,7 @@ def __mul__(self, rhs):
         """
         return Duration(self._frame, self._seconds * float(rhs))
 
-    def __rmul__(self, lhs):
-        """
-        Scale a Duration by a value.
-
-        = INPUT VARIABLES
-        - lhs     The scalar to multiply by.
-
-        = RETURN VALUE
-        - Returns the scaled Duration.
-        """
-        return Duration(self._frame, self._seconds * float(lhs))
+    __rmul__ = __mul__
 
     def __str__(self):
         """Print the Duration."""
diff --git a/lib/matplotlib/testing/jpl_units/Epoch.py b/lib/matplotlib/testing/jpl_units/Epoch.py
index 25666523fbff..3808663056e7 100644
--- a/lib/matplotlib/testing/jpl_units/Epoch.py
+++ b/lib/matplotlib/testing/jpl_units/Epoch.py
@@ -1,5 +1,6 @@
 """Epoch module."""
 
+import functools
 import operator
 import math
 import datetime as DT
@@ -106,44 +107,22 @@ def secondsPast(self, frame, jd):
         delta = t._jd - jd
         return t._seconds + delta * 86400
 
-    def __eq__(self, rhs):
-        return self._cmp(rhs, operator.eq)
-
-    def __ne__(self, rhs):
-        return self._cmp(rhs, operator.ne)
-
-    def __lt__(self, rhs):
-        return self._cmp(rhs, operator.lt)
-
-    def __le__(self, rhs):
-        return self._cmp(rhs, operator.le)
-
-    def __gt__(self, rhs):
-        return self._cmp(rhs, operator.gt)
-
-    def __ge__(self, rhs):
-        return self._cmp(rhs, operator.ge)
-
-    def _cmp(self, rhs, op):
-        """
-        Compare two Epoch's.
-
-        = INPUT VARIABLES
-        - rhs     The Epoch to compare against.
-        - op      The function to do the comparison
-
-        = RETURN VALUE
-        - Returns op(self, rhs)
-        """
+    def _cmp(self, op, rhs):
+        """Compare Epochs *self* and *rhs* using operator *op*."""
         t = self
         if self._frame != rhs._frame:
             t = self.convert(rhs._frame)
-
         if t._jd != rhs._jd:
             return op(t._jd, rhs._jd)
-
         return op(t._seconds, rhs._seconds)
 
+    __eq__ = functools.partialmethod(_cmp, operator.eq)
+    __ne__ = functools.partialmethod(_cmp, operator.ne)
+    __lt__ = functools.partialmethod(_cmp, operator.lt)
+    __le__ = functools.partialmethod(_cmp, operator.le)
+    __gt__ = functools.partialmethod(_cmp, operator.gt)
+    __ge__ = functools.partialmethod(_cmp, operator.ge)
+
     def __add__(self, rhs):
         """
         Add a duration to an Epoch.
diff --git a/lib/matplotlib/testing/jpl_units/EpochConverter.py b/lib/matplotlib/testing/jpl_units/EpochConverter.py
index 32926b18bbff..f42d7b71d041 100644
--- a/lib/matplotlib/testing/jpl_units/EpochConverter.py
+++ b/lib/matplotlib/testing/jpl_units/EpochConverter.py
@@ -1,7 +1,6 @@
 """EpochConverter module containing class EpochConverter."""
 
-from matplotlib import cbook
-import matplotlib.units as units
+from matplotlib import cbook, units
 import matplotlib.dates as date_ticker
 
 __all__ = ['EpochConverter']
@@ -81,8 +80,6 @@ def convert(value, unit, axis):
 
         if not cbook.is_scalar_or_string(value):
             return [EpochConverter.convert(x, unit, axis) for x in value]
-        if units.ConversionInterface.is_numlike(value):
-            return value
         if unit is None:
             unit = EpochConverter.default_units(value, axis)
         if isinstance(value, U.Duration):
diff --git a/lib/matplotlib/testing/jpl_units/StrConverter.py b/lib/matplotlib/testing/jpl_units/StrConverter.py
index 576aff8935dc..a62d4981dc79 100644
--- a/lib/matplotlib/testing/jpl_units/StrConverter.py
+++ b/lib/matplotlib/testing/jpl_units/StrConverter.py
@@ -27,9 +27,6 @@ def axisinfo(unit, axis):
     def convert(value, unit, axis):
         # docstring inherited
 
-        if units.ConversionInterface.is_numlike(value):
-            return value
-
         if value == []:
             return []
 
diff --git a/lib/matplotlib/testing/jpl_units/UnitDbl.py b/lib/matplotlib/testing/jpl_units/UnitDbl.py
index 68481a80fd57..b713ab3aba67 100644
--- a/lib/matplotlib/testing/jpl_units/UnitDbl.py
+++ b/lib/matplotlib/testing/jpl_units/UnitDbl.py
@@ -1,5 +1,6 @@
 """UnitDbl module."""
 
+import functools
 import operator
 
 from matplotlib import _api
@@ -88,99 +89,32 @@ def __bool__(self):
         """Return the truth value of a UnitDbl."""
         return bool(self._value)
 
-    def __eq__(self, rhs):
-        return self._cmp(rhs, operator.eq)
-
-    def __ne__(self, rhs):
-        return self._cmp(rhs, operator.ne)
-
-    def __lt__(self, rhs):
-        return self._cmp(rhs, operator.lt)
-
-    def __le__(self, rhs):
-        return self._cmp(rhs, operator.le)
-
-    def __gt__(self, rhs):
-        return self._cmp(rhs, operator.gt)
-
-    def __ge__(self, rhs):
-        return self._cmp(rhs, operator.ge)
-
-    def _cmp(self, rhs, op):
-        """
-        Compare two UnitDbl's.
-
-        = ERROR CONDITIONS
-        - If the input rhs units are not the same as our units,
-          an error is thrown.
-
-        = INPUT VARIABLES
-        - rhs     The UnitDbl to compare against.
-        - op      The function to do the comparison
-
-        = RETURN VALUE
-        - Returns op(self, rhs)
-        """
+    def _cmp(self, op, rhs):
+        """Check that *self* and *rhs* share units; compare them using *op*."""
         self.checkSameUnits(rhs, "compare")
         return op(self._value, rhs._value)
 
-    def __add__(self, rhs):
-        """
-        Add two UnitDbl's.
-
-        = ERROR CONDITIONS
-        - If the input rhs units are not the same as our units,
-          an error is thrown.
-
-        = INPUT VARIABLES
-        - rhs     The UnitDbl to add.
-
-        = RETURN VALUE
-        - Returns the sum of ourselves and the input UnitDbl.
-        """
-        self.checkSameUnits(rhs, "add")
-        return UnitDbl(self._value + rhs._value, self._units)
-
-    def __sub__(self, rhs):
-        """
-        Subtract two UnitDbl's.
-
-        = ERROR CONDITIONS
-        - If the input rhs units are not the same as our units,
-          an error is thrown.
-
-        = INPUT VARIABLES
-        - rhs     The UnitDbl to subtract.
-
-        = RETURN VALUE
-        - Returns the difference of ourselves and the input UnitDbl.
-        """
-        self.checkSameUnits(rhs, "subtract")
-        return UnitDbl(self._value - rhs._value, self._units)
+    __eq__ = functools.partialmethod(_cmp, operator.eq)
+    __ne__ = functools.partialmethod(_cmp, operator.ne)
+    __lt__ = functools.partialmethod(_cmp, operator.lt)
+    __le__ = functools.partialmethod(_cmp, operator.le)
+    __gt__ = functools.partialmethod(_cmp, operator.gt)
+    __ge__ = functools.partialmethod(_cmp, operator.ge)
 
-    def __mul__(self, rhs):
-        """
-        Scale a UnitDbl by a value.
+    def _binop_unit_unit(self, op, rhs):
+        """Check that *self* and *rhs* share units; combine them using *op*."""
+        self.checkSameUnits(rhs, op.__name__)
+        return UnitDbl(op(self._value, rhs._value), self._units)
 
-        = INPUT VARIABLES
-        - rhs     The scalar to multiply by.
+    __add__ = functools.partialmethod(_binop_unit_unit, operator.add)
+    __sub__ = functools.partialmethod(_binop_unit_unit, operator.sub)
 
-        = RETURN VALUE
-        - Returns the scaled UnitDbl.
-        """
-        return UnitDbl(self._value * rhs, self._units)
+    def _binop_unit_scalar(self, op, scalar):
+        """Combine *self* and *scalar* using *op*."""
+        return UnitDbl(op(self._value, scalar), self._units)
 
-    def __rmul__(self, lhs):
-        """
-        Scale a UnitDbl by a value.
-
-        = INPUT VARIABLES
-        - lhs     The scalar to multiply by.
-
-        = RETURN VALUE
-        - Returns the scaled UnitDbl.
-        """
-        return UnitDbl(self._value * lhs, self._units)
+    __mul__ = functools.partialmethod(_binop_unit_scalar, operator.mul)
+    __rmul__ = functools.partialmethod(_binop_unit_scalar, operator.mul)
 
     def __str__(self):
         """Print the UnitDbl."""
diff --git a/lib/matplotlib/testing/jpl_units/UnitDblConverter.py b/lib/matplotlib/testing/jpl_units/UnitDblConverter.py
index 37734e5ced60..23065379f581 100644
--- a/lib/matplotlib/testing/jpl_units/UnitDblConverter.py
+++ b/lib/matplotlib/testing/jpl_units/UnitDblConverter.py
@@ -2,8 +2,7 @@
 
 import numpy as np
 
-from matplotlib import cbook
-import matplotlib.units as units
+from matplotlib import cbook, units
 import matplotlib.projections.polar as polar
 
 __all__ = ['UnitDblConverter']
@@ -66,11 +65,6 @@ def convert(value, unit, axis):
         # docstring inherited
         if not cbook.is_scalar_or_string(value):
             return [UnitDblConverter.convert(x, unit, axis) for x in value]
-        # If the incoming value behaves like a number,
-        # then just return it because we don't know how to convert it
-        # (or it is already converted)
-        if units.ConversionInterface.is_numlike(value):
-            return value
         # If no units were specified, then get the default units to use.
         if unit is None:
             unit = UnitDblConverter.default_units(value, axis)
diff --git a/lib/matplotlib/testing/widgets.py b/lib/matplotlib/testing/widgets.py
index 49d5cb7175f9..b8a51b1ac6ca 100644
--- a/lib/matplotlib/testing/widgets.py
+++ b/lib/matplotlib/testing/widgets.py
@@ -2,15 +2,16 @@
 ========================
 Widget testing utilities
 ========================
-Functions that are useful for testing widgets.
-See also matplotlib.tests.test_widgets
+
+See also :mod:`matplotlib.tests.test_widgets`.
 """
+
 import matplotlib.pyplot as plt
 from unittest import mock
 
 
 def get_ax():
-    """Creates plot and returns its axes"""
+    """Create a plot and return its axes."""
     fig, ax = plt.subplots(1, 1)
     ax.plot([0, 200], [0, 200])
     ax.set_aspect(1.0)
@@ -18,6 +19,10 @@ def get_ax():
     return ax
 
 
+def noop(*args, **kwargs):
+    pass
+
+
 def mock_event(ax, button=1, xdata=0, ydata=0, key=None, step=1):
     r"""
     Create a mock event that can stand in for `.Event` and its subclasses.
@@ -82,3 +87,32 @@ def do_event(tool, etype, button=1, xdata=0, ydata=0, key=None, step=1):
     event = mock_event(tool.ax, button, xdata, ydata, key, step)
     func = getattr(tool, etype)
     func(event)
+
+
+def click_and_drag(tool, start, end, key=None):
+    """
+    Helper to simulate a mouse drag operation.
+
+    Parameters
+    ----------
+    tool : `matplotlib.widgets.Widget`
+    start : [float, float]
+        Starting point in data coordinates.
+    end : [float, float]
+        End point in data coordinates.
+    key : None or str
+         An optional key that is pressed during the whole operation
+         (see also `.KeyEvent`).
+    """
+    if key is not None:
+        # Press key
+        do_event(tool, 'on_key_press', xdata=start[0], ydata=start[1],
+                 button=1, key=key)
+    # Click, move, and release mouse
+    do_event(tool, 'press', xdata=start[0], ydata=start[1], button=1)
+    do_event(tool, 'onmove', xdata=end[0], ydata=end[1], button=1)
+    do_event(tool, 'release', xdata=end[0], ydata=end[1], button=1)
+    if key is not None:
+        # Release key
+        do_event(tool, 'on_key_release', xdata=end[0], ydata=end[1],
+                 button=1, key=key)
diff --git a/lib/matplotlib/tests/Courier10PitchBT-Bold.pfb b/lib/matplotlib/tests/Courier10PitchBT-Bold.pfb
new file mode 100644
index 000000000000..88d9af2af701
Binary files /dev/null and b/lib/matplotlib/tests/Courier10PitchBT-Bold.pfb differ
diff --git a/lib/matplotlib/tests/README b/lib/matplotlib/tests/README
index 0f243229a0c6..0613afcc85a3 100644
--- a/lib/matplotlib/tests/README
+++ b/lib/matplotlib/tests/README
@@ -4,6 +4,5 @@ About Matplotlib Testing Infrastructure
 Information on the testing infrastructure is provided in
 the Testing section of the Matplotlib Developers’ Guide:
 
-* http://matplotlib.org/devel/testing.html
+* https://matplotlib.org/devel/testing.html
 * <mpl_source_dir>/doc/devel/coding_guide.rst (equivalent, but in reST format)
-
diff --git a/lib/matplotlib/tests/baseline_images/dviread/test.map b/lib/matplotlib/tests/baseline_images/dviread/test.map
index 96a4ca6f51cb..67ceb014b415 100644
--- a/lib/matplotlib/tests/baseline_images/dviread/test.map
+++ b/lib/matplotlib/tests/baseline_images/dviread/test.map
@@ -1,10 +1,33 @@
 % used by test_dviread.py
-TeXfont1 PSfont1 <font1.pfb "<font1.enc"
-TeXfont2 PSfont2 <font2.enc "<font2.pfa"
-"TeXfont3" PSfont3 "1.23 UnknownEffect" <[enc3.foo <font3.pfa
-TeXfont4 PSfont4 "-0.1 SlantFont 2.2 ExtendFont" <font4.enc <font4.pfa
-TeXfont5 "PSfont5" <encoding1.enc <encoding2.enc <font5.pfb
+TeXfont1 PSfont1 <font1.pfb <font1.enc
+TeXfont2 PSfont2 <font2.enc <font2.pfa
+TeXfont3 PSfont3 "1.23 UnknownEffect" <[enc3.foo < font3.pfa
+TeXfont4 PSfont4 "-0.1 SlantFont 1.2 ExtendFont" <font4.enc <font4.pfa
+TeXfont5 PSfont5 <encoding1.enc <encoding2.enc <font5.pfb
 TeXfont6 PSfont6
-TeXfont7 PSfont7 <font7.enc
-TeXfont8 PSfont8 <font8.pfb
-TeXfont9 PSfont9 </absolute/font9.pfb
\ No newline at end of file
+TeXfont7 PSfont7 < font7.enc
+TeXfont8 PSfont8 <<font8.pfb
+TeXfont9 </absolute/font9.pfb
+% Only the first of a duplicate key is used.
+TeXfontA PSfontA1
+TeXfontA PSfontA2
+%
+% Check SlantFont/ExtendFont
+%
+% Options are only allowed on T1 fonts (3 TrueType, 1 bitmap, and 1 T1 below).
+TeXfontB PSfontB1 "-0.1 SlantFont 1.2 ExtendFont" <fontB1.enc <fontB1.ttf
+TeXfontB PSfontB2 "-0.1 SlantFont" <fontB2.enc <fontB2.ttc
+TeXfontB PSfontB3 "1.2 ExtendFont" <fontB3.enc <fontB3.otf
+TeXfontB "0.1 SlantFont 1.2 ExtendFont"
+% Also, only within range ±1 / ±2.
+TeXfontB PSfontB4 "1.1 SlantFont 1.2 ExtendFont"
+TeXfontB PSfontB5 "0.1 SlantFont 2.2 ExtendFont"
+% This is the only one that works:
+TeXfontB PSfontB6
+%
+% Invalid TrueType entry.
+%
+% Must have encodingfile if subsetted.
+TeXfontC PSfontC1 <fontC1.ttf
+TeXfontC PSfontC2 <fontC2.ttc
+TeXfontC PSfontC3 <fontC3.ttf <8r.enc
diff --git a/lib/matplotlib/tests/baseline_images/test_arrow_patches/arrow_styles.png b/lib/matplotlib/tests/baseline_images/test_arrow_patches/arrow_styles.png
index 63e798799a02..4dcd7535be8f 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_arrow_patches/arrow_styles.png and b/lib/matplotlib/tests/baseline_images/test_arrow_patches/arrow_styles.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/auto_numticks.png b/lib/matplotlib/tests/baseline_images/test_axes/auto_numticks.png
deleted file mode 100644
index 71dfb1aa4a0d..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/auto_numticks.png and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/auto_numticks_log.png b/lib/matplotlib/tests/baseline_images/test_axes/auto_numticks_log.png
deleted file mode 100644
index 7a31434f501f..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/auto_numticks_log.png and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_custom_capwidths.png b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_custom_capwidths.png
new file mode 100644
index 000000000000..7bccd2c18e97
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_custom_capwidths.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_custom_capwidth.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custom_capwidth.png
new file mode 100644
index 000000000000..cf5bc41bdbee
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custom_capwidth.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_custom_capwidths.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custom_capwidths.png
new file mode 100644
index 000000000000..936bd18a2b6c
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custom_capwidths.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_custompatchartist.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custompatchartist.png
index e1aafcd346ed..32c9229da00a 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_custompatchartist.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custompatchartist.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_patchartist.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_patchartist.png
index 8b6a49c84dc4..e41e21f3e50c 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_patchartist.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_patchartist.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.pdf b/lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.pdf
index 8c1f477a66b1..d2c844490174 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.png b/lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.png
index 002557764760..8fd8e5c018d6 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.png and b/lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.svg b/lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.svg
index c5b68c60ecd0..dc5fa1b47ac1 100644
--- a/lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.svg
+++ b/lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.svg
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (https://matplotlib.org/) -->
-<svg height="345.6pt" version="1.1" viewBox="0 0 460.8 345.6" width="460.8pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" width="460.8pt" height="345.6pt" viewBox="0 0 460.8 345.6" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <metadata>
+  <rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+   <cc:Work>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:date>2021-06-30T15:28:43.465638</dc:date>
+    <dc:format>image/svg+xml</dc:format>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Matplotlib v3.4.2.post1146+gc72786d72c.d20210630, https://matplotlib.org/</dc:title>
+     </cc:Agent>
+    </dc:creator>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linejoin: round; stroke-linecap: butt}</style>
  </defs>
  <g id="figure_1">
   <g id="patch_1">
@@ -15,7 +26,7 @@ L 460.8 345.6
 L 460.8 0 
 L 0 0 
 z
-" style="fill:#ffffff;"/>
+" style="fill: #ffffff"/>
   </g>
   <g id="axes_1">
    <g id="patch_2">
@@ -24,10 +35,10 @@ L 343.296 307.584
 L 343.296 41.472 
 L 57.6 41.472 
 z
-" style="fill:#ffffff;"/>
+" style="fill: #ffffff"/>
    </g>
    <g id="PathCollection_1">
-    <path clip-path="url(#p782ac110bd)" d="M 58.117053 280.749176 
+    <path d="M 58.117053 280.749176 
 L 59.517423 280.355448 
 L 61.434846 279.646988 
 L 63.352268 278.771212 
@@ -86,8 +97,8 @@ L 57.6 278.512941
 L 57.6 280.749176 
 L 57.6 280.881538 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 272.351356 280.97998 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 272.351356 280.97998 
 L 274.268779 281.276142 
 L 276.186201 281.415554 
 L 278.103624 281.397816 
@@ -174,8 +185,8 @@ L 268.51651 279.839877
 L 270.433933 280.50617 
 L 271.37239 280.749176 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 59.517423 71.342742 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 59.517423 71.342742 
 L 61.434846 70.665469 
 L 61.715192 70.543059 
 L 63.352268 69.752018 
@@ -223,8 +234,8 @@ L 57.6 68.306824
 L 57.6 70.543059 
 L 57.6 71.858113 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 268.51651 70.849867 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 268.51651 70.849867 
 L 270.433933 71.486829 
 L 272.351356 71.961474 
 L 274.268779 72.272434 
@@ -301,10 +312,10 @@ L 264.681664 68.942565
 L 266.599087 70.000101 
 L 267.778802 70.543059 
 z
-" style="fill:#67001f;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
    </g>
    <g id="PathCollection_2">
-    <path clip-path="url(#p782ac110bd)" d="M 59.517423 290.082595 
+    <path d="M 59.517423 290.082595 
 L 61.0292 289.694118 
 L 61.434846 289.58406 
 L 63.352268 288.940974 
@@ -409,8 +420,8 @@ L 57.6 287.457882
 L 57.6 289.694118 
 L 57.6 290.457526 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 268.51651 289.724029 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 268.51651 289.724029 
 L 270.433933 290.187418 
 L 272.351356 290.532721 
 L 274.268779 290.758944 
@@ -622,8 +633,8 @@ L 276.186201 281.415554
 L 274.268779 281.276142 
 L 272.351356 280.97998 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 274.268779 81.768159 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 274.268779 81.768159 
 L 276.186201 81.872261 
 L 278.103624 81.859015 
 L 280.021047 81.72846 
@@ -762,8 +773,8 @@ L 270.433933 81.182535
 L 272.351356 81.537743 
 L 273.887952 81.724235 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 59.517423 81.074706 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 59.517423 81.074706 
 L 61.434846 80.567858 
 L 63.352268 79.94131 
 L 64.519833 79.488 
@@ -832,10 +843,10 @@ L 57.6 77.251765
 L 57.6 79.488 
 L 57.6 81.460391 
 z
-" style="fill:#67001f;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
    </g>
    <g id="PathCollection_3">
-    <path clip-path="url(#p782ac110bd)" d="M 59.517423 297.904404 
+    <path d="M 59.517423 297.904404 
 L 61.434846 297.468638 
 L 63.352268 296.929959 
 L 64.931451 296.402824 
@@ -972,8 +983,8 @@ L 57.6 294.166588
 L 57.6 296.402824 
 L 57.6 298.236 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 264.681664 296.459335 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 264.681664 296.459335 
 L 266.599087 297.074197 
 L 268.51651 297.587282 
 L 270.433933 297.997111 
@@ -1253,8 +1264,8 @@ L 272.351356 290.532721
 L 270.433933 290.187418 
 L 268.51651 289.724029 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 59.517423 88.902715 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 59.517423 88.902715 
 L 61.434846 88.473095 
 L 61.579818 88.432941 
 L 63.352268 87.925942 
@@ -1339,8 +1350,8 @@ L 57.6 86.196706
 L 57.6 88.432941 
 L 57.6 89.229635 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 268.51651 88.590066 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 268.51651 88.590066 
 L 270.433933 88.994115 
 L 272.351356 89.2952 
 L 274.268779 89.492454 
@@ -1513,10 +1524,10 @@ L 264.681664 87.446767
 L 266.599087 88.072801 
 L 267.920929 88.432941 
 z
-" style="fill:#67001f;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
    </g>
    <g id="PathCollection_4">
-    <path clip-path="url(#p782ac110bd)" d="M 274.268779 305.500923 
+    <path d="M 274.268779 305.500923 
 L 276.186201 305.587291 
 L 278.103624 305.576302 
 L 280.021047 305.467988 
@@ -1856,8 +1867,8 @@ L 268.51651 297.587282
 L 266.599087 297.074197 
 L 264.681664 296.459335 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 59.517423 304.946703 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 59.517423 304.946703 
 L 61.434846 304.541356 
 L 63.352268 304.04028 
 L 65.269691 303.444918 
@@ -2022,8 +2033,8 @@ L 57.6 300.875294
 L 57.6 303.111529 
 L 57.6 305.255151 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 59.517423 95.941701 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 59.517423 95.941701 
 L 61.434846 95.539253 
 L 62.967288 95.141647 
 L 63.352268 95.040067 
@@ -2120,8 +2131,8 @@ L 57.6 92.905412
 L 57.6 95.141647 
 L 57.6 96.247944 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 266.599087 95.17497 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 266.599087 95.17497 
 L 268.51651 95.648826 
 L 270.433933 96.02732 
 L 272.351356 96.309363 
@@ -2320,10 +2331,10 @@ L 262.764242 93.926654
 L 264.681664 94.598057 
 L 266.486567 95.141647 
 z
-" style="fill:#67001f;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
    </g>
    <g id="PathCollection_5">
-    <path clip-path="url(#p782ac110bd)" d="M 59.517423 307.584 
+    <path d="M 59.517423 307.584 
 L 61.434846 307.584 
 L 63.352268 307.584 
 L 65.269691 307.584 
@@ -2513,8 +2524,8 @@ L 57.6 305.255151
 L 57.6 305.347765 
 L 57.6 307.584 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 255.09455 306.231492 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 255.09455 306.231492 
 L 257.011973 307.232427 
 L 257.746053 307.584 
 L 258.929396 307.584 
@@ -2906,8 +2917,8 @@ L 278.103624 305.576302
 L 276.186201 305.587291 
 L 274.268779 305.500923 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 59.517423 102.657541 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 59.517423 102.657541 
 L 61.434846 102.264029 
 L 63.065433 101.850353 
 L 63.352268 101.777371 
@@ -3018,8 +3029,8 @@ L 57.6 99.614118
 L 57.6 101.850353 
 L 57.6 102.956983 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 266.599087 101.907835 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 266.599087 101.907835 
 L 268.51651 102.371169 
 L 270.433933 102.741258 
 L 272.351356 103.017038 
@@ -3244,10 +3255,10 @@ L 262.764242 100.70371
 L 264.681664 101.351142 
 L 266.400582 101.850353 
 z
-" style="fill:#67001f;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
    </g>
    <g id="PathCollection_6">
-    <path clip-path="url(#p782ac110bd)" d="M 72.939383 307.584 
+    <path d="M 72.939383 307.584 
 L 74.856805 307.584 
 L 76.774228 307.584 
 L 78.691651 307.584 
@@ -3444,8 +3455,8 @@ L 74.856805 305.968681
 L 72.939383 306.98983 
 L 71.726389 307.584 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 243.590013 305.425428 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 243.590013 305.425428 
 L 245.507436 306.853802 
 L 246.532159 307.584 
 L 247.424859 307.584 
@@ -3840,8 +3851,8 @@ L 240.68156 303.111529
 L 241.672591 303.918895 
 L 243.489824 305.347765 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 59.517423 109.347237 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 59.517423 109.347237 
 L 61.434846 108.946377 
 L 62.93355 108.559059 
 L 63.352268 108.452003 
@@ -3968,8 +3979,8 @@ L 57.6 106.322824
 L 57.6 108.559059 
 L 57.6 109.652271 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 266.599087 108.583532 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 266.599087 108.583532 
 L 268.51651 109.055517 
 L 270.433933 109.432518 
 L 272.351356 109.713448 
@@ -4222,10 +4233,10 @@ L 262.764242 107.373126
 L 264.681664 108.023704 
 L 266.516125 108.559059 
 z
-" style="fill:#67001f;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
    </g>
    <g id="PathCollection_7">
-    <path clip-path="url(#p782ac110bd)" d="M 84.443919 307.584 
+    <path d="M 84.443919 307.584 
 L 86.361342 307.584 
 L 88.278765 307.584 
 L 90.196188 307.584 
@@ -4432,8 +4443,8 @@ L 85.977861 305.347765
 L 84.443919 306.502368 
 L 82.943462 307.584 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 235.920322 305.933643 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 235.920322 305.933643 
 L 237.837745 307.567466 
 L 237.857694 307.584 
 L 239.755168 307.584 
@@ -4844,8 +4855,8 @@ L 232.749884 303.111529
 L 234.002899 304.244277 
 L 235.249149 305.347765 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 59.517423 116.299684 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 59.517423 116.299684 
 L 61.434846 115.873594 
 L 63.352268 115.346877 
 L 63.594653 115.267765 
@@ -4986,8 +4997,8 @@ L 57.6 113.031529
 L 57.6 115.267765 
 L 57.6 116.623916 
 z
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 266.599087 115.487912 
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
+    <path d="M 266.599087 115.487912 
 L 268.51651 115.989604 
 L 270.433933 116.390332 
 L 272.351356 116.688944 
@@ -5265,10 +5276,10 @@ L 262.764242 114.214715
 L 264.681664 114.896231 
 L 265.896976 115.267765 
 z
-" style="fill:#67001f;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: #67001f"/>
    </g>
    <g id="PathCollection_8">
-    <path clip-path="url(#p782ac110bd)" d="M 92.113611 307.584 
+    <path d="M 92.113611 307.584 
 L 94.031034 307.584 
 L 95.948456 307.584 
 L 97.865879 307.584 
@@ -5491,8 +5502,8 @@ L 94.031034 305.518762
 L 92.113611 307.163013 
 L 91.60935 307.584 
 z
-" style="fill:#a51429;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 228.250631 305.805305 
+" clip-path="url(#pd7e07e7879)" style="fill: #a51429"/>
+    <path d="M 228.250631 305.805305 
 L 230.168054 307.569507 
 L 230.184033 307.584 
 L 232.085477 307.584 
@@ -5833,8 +5844,8 @@ L 225.397693 303.111529
 L 226.333208 304.001976 
 L 227.75895 305.347765 
 z
-" style="fill:#a51429;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 316.452081 307.584 
+" clip-path="url(#pd7e07e7879)" style="fill: #a51429"/>
+    <path d="M 316.452081 307.584 
 L 318.369503 307.584 
 L 320.286926 307.584 
 L 322.204349 307.584 
@@ -5895,8 +5906,8 @@ L 318.369503 305.55924
 L 316.452081 307.202489 
 L 315.994786 307.584 
 z
-" style="fill:#a51429;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 57.954958 124.212706 
+" clip-path="url(#pd7e07e7879)" style="fill: #a51429"/>
+    <path d="M 57.954958 124.212706 
 L 59.517423 123.918001 
 L 61.434846 123.442733 
 L 63.352268 122.855222 
@@ -6053,8 +6064,8 @@ L 57.6 121.976471
 L 57.6 124.212706 
 L 57.6 124.283014 
 z
-" style="fill:#a51429;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 272.351356 124.359185 
+" clip-path="url(#pd7e07e7879)" style="fill: #a51429"/>
+    <path d="M 272.351356 124.359185 
 L 274.268779 124.588342 
 L 276.186201 124.696214 
 L 278.103624 124.682489 
@@ -6329,10 +6340,10 @@ L 268.51651 123.572132
 L 270.433933 124.019112 
 L 271.548394 124.212706 
 z
-" style="fill:#a51429;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: #a51429"/>
    </g>
    <g id="PathCollection_9">
-    <path clip-path="url(#p782ac110bd)" d="M 99.783302 307.584 
+    <path d="M 99.783302 307.584 
 L 101.700725 307.584 
 L 103.618148 307.584 
 L 105.53557 307.584 
@@ -6573,8 +6584,8 @@ L 101.700725 305.360916
 L 99.783302 307.130619 
 L 99.285351 307.584 
 z
-" style="fill:#e48066;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 220.58094 305.356798 
+" clip-path="url(#pd7e07e7879)" style="fill: #e48066"/>
+    <path d="M 220.58094 305.356798 
 L 222.498362 307.17032 
 L 222.936841 307.584 
 L 224.415785 307.584 
@@ -6933,8 +6944,8 @@ L 218.23822 303.111529
 L 218.663517 303.51807 
 L 220.571385 305.347765 
 z
-" style="fill:#e48066;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 324.121772 307.584 
+" clip-path="url(#pd7e07e7879)" style="fill: #e48066"/>
+    <path d="M 324.121772 307.584 
 L 326.039195 307.584 
 L 327.956617 307.584 
 L 329.87404 307.584 
@@ -6977,8 +6988,8 @@ L 326.039195 305.404211
 L 324.121772 307.173392 
 L 323.670632 307.584 
 z
-" style="fill:#e48066;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 59.299221 133.157647 
+" clip-path="url(#pd7e07e7879)" style="fill: #e48066"/>
+    <path d="M 59.299221 133.157647 
 L 59.517423 133.105159 
 L 61.434846 132.499027 
 L 63.352268 131.749746 
@@ -7153,8 +7164,8 @@ L 57.6 130.921412
 L 57.6 133.157647 
 L 57.6 133.602406 
 z
-" style="fill:#e48066;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 270.433933 133.240847 
+" clip-path="url(#pd7e07e7879)" style="fill: #e48066"/>
+    <path d="M 270.433933 133.240847 
 L 272.351356 133.70306 
 L 274.268779 134.005874 
 L 276.186201 134.148419 
@@ -7447,10 +7458,10 @@ L 266.599087 131.950375
 L 268.51651 132.664055 
 L 270.176742 133.157647 
 z
-" style="fill:#e48066;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: #e48066"/>
    </g>
    <g id="PathCollection_10">
-    <path clip-path="url(#p782ac110bd)" d="M 107.452993 307.584 
+    <path d="M 107.452993 307.584 
 L 109.370416 307.584 
 L 111.287839 307.584 
 L 113.205262 307.584 
@@ -7731,8 +7742,8 @@ L 108.900591 305.347765
 L 107.452993 306.717161 
 L 106.535015 307.584 
 z
-" style="fill:#fcdfcf;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 214.828671 306.698732 
+" clip-path="url(#pd7e07e7879)" style="fill: #fcdfcf"/>
+    <path d="M 214.828671 306.698732 
 L 215.77389 307.584 
 L 216.746094 307.584 
 L 218.663517 307.584 
@@ -8135,8 +8146,8 @@ L 210.993826 303.129737
 L 212.911248 304.913065 
 L 213.373008 305.347765 
 z
-" style="fill:#fcdfcf;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 331.791463 307.584 
+" clip-path="url(#pd7e07e7879)" style="fill: #fcdfcf"/>
+    <path d="M 331.791463 307.584 
 L 333.708886 307.584 
 L 335.626309 307.584 
 L 337.543732 307.584 
@@ -8163,8 +8174,8 @@ L 333.285698 305.347765
 L 331.791463 306.761266 
 L 330.920122 307.584 
 z
-" style="fill:#fcdfcf;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 276.186201 155.310259 
+" clip-path="url(#pd7e07e7879)" style="fill: #fcdfcf"/>
+    <path d="M 276.186201 155.310259 
 L 278.103624 154.994222 
 L 279.156474 153.283765 
 L 280.021047 152.809014 
@@ -8499,8 +8510,8 @@ L 272.351356 151.345664
 L 274.268779 153.12917 
 L 274.621853 153.283765 
 z
-" style="fill:#fcdfcf;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 59.517423 149.086365 
+" clip-path="url(#pd7e07e7879)" style="fill: #fcdfcf"/>
+    <path d="M 59.517423 149.086365 
 L 59.742472 148.811294 
 L 61.434846 147.325444 
 L 62.126243 146.575059 
@@ -8713,10 +8724,10 @@ L 57.6 146.575059
 L 57.6 148.811294 
 L 57.6 150.869735 
 z
-" style="fill:#fcdfcf;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: #fcdfcf"/>
    </g>
    <g id="PathCollection_11">
-    <path clip-path="url(#p782ac110bd)" d="M 115.122685 307.584 
+    <path d="M 115.122685 307.584 
 L 117.040107 307.584 
 L 118.95753 307.584 
 L 120.874953 307.584 
@@ -9896,8 +9907,8 @@ L 164.975678 238.650898
 L 163.058255 238.589115 
 L 161.140832 238.362766 
 z
-" style="fill:#d7e8f1;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 339.461154 307.584 
+" clip-path="url(#pd7e07e7879)" style="fill: #d7e8f1"/>
+    <path d="M 339.461154 307.584 
 L 341.378577 307.584 
 L 343.296 307.584 
 L 343.296 305.347765 
@@ -9909,10 +9920,10 @@ L 340.484899 305.347765
 L 339.461154 306.295535 
 L 338.082957 307.584 
 z
-" style="fill:#d7e8f1;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: #d7e8f1"/>
    </g>
    <g id="PathCollection_12">
-    <path clip-path="url(#p782ac110bd)" d="M 122.792376 307.584 
+    <path d="M 122.792376 307.584 
 L 124.709799 307.584 
 L 126.627221 307.584 
 L 128.544644 307.584 
@@ -10043,8 +10054,8 @@ L 123.626633 305.347765
 L 122.792376 306.067364 
 L 121.073157 307.584 
 z
-" style="fill:#6bacd1;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 161.140832 238.362766 
+" clip-path="url(#pd7e07e7879)" style="fill: #6bacd1"/>
+    <path d="M 161.140832 238.362766 
 L 163.058255 238.589115 
 L 164.975678 238.650898 
 L 166.893101 238.547938 
@@ -10678,8 +10689,8 @@ L 157.305987 228.322641
 L 155.388564 227.814235 
 L 153.471141 227.192555 
 z
-" style="fill:#6bacd1;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 343.296 210.579584 
+" clip-path="url(#pd7e07e7879)" style="fill: #6bacd1"/>
+    <path d="M 343.296 210.579584 
 L 343.296 209.189647 
 L 343.296 206.953412 
 L 343.296 204.717176 
@@ -10860,10 +10871,10 @@ L 339.461154 207.101861
 L 341.378577 208.849874 
 L 341.75608 209.189647 
 z
-" style="fill:#6bacd1;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: #6bacd1"/>
    </g>
    <g id="PathCollection_13">
-    <path clip-path="url(#p782ac110bd)" d="M 130.462067 307.584 
+    <path d="M 130.462067 307.584 
 L 132.37949 307.584 
 L 134.296913 307.584 
 L 136.214336 307.584 
@@ -10964,8 +10975,8 @@ L 131.95437 305.347765
 L 130.462067 306.481855 
 L 129.065351 307.584 
 z
-" style="fill:#1c5c9f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 153.471141 227.192555 
+" clip-path="url(#pd7e07e7879)" style="fill: #1c5c9f"/>
+    <path d="M 153.471141 227.192555 
 L 155.388564 227.814235 
 L 157.305987 228.322641 
 L 159.223409 228.716308 
@@ -11529,8 +11540,8 @@ L 161.140832 221.305089
 L 159.223409 221.05723 
 L 157.305987 220.705982 
 z
-" style="fill:#1c5c9f;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 343.296 203.911217 
+" clip-path="url(#pd7e07e7879)" style="fill: #1c5c9f"/>
+    <path d="M 343.296 203.911217 
 L 343.296 202.480941 
 L 343.296 200.244706 
 L 343.296 198.008471 
@@ -11681,10 +11692,10 @@ L 339.461154 200.387208
 L 341.378577 202.168323 
 L 341.719454 202.480941 
 z
-" style="fill:#1c5c9f;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: #1c5c9f"/>
    </g>
    <g id="PathCollection_14">
-    <path clip-path="url(#p782ac110bd)" d="M 140.049181 307.584 
+    <path d="M 140.049181 307.584 
 L 141.966604 307.584 
 L 143.884027 307.584 
 L 145.80145 307.584 
@@ -11751,8 +11762,8 @@ L 141.966604 305.475108
 L 140.049181 306.593563 
 L 138.457961 307.584 
 z
-" style="fill:#053061;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 157.305987 220.705982 
+" clip-path="url(#pd7e07e7879)" style="fill: #053061"/>
+    <path d="M 157.305987 220.705982 
 L 159.223409 221.05723 
 L 161.140832 221.305089 
 L 163.058255 221.448845 
@@ -12258,8 +12269,8 @@ L 161.140832 214.32142
 L 159.223409 214.089172 
 L 157.305987 213.760046 
 z
-" style="fill:#053061;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 343.296 197.079271 
+" clip-path="url(#pd7e07e7879)" style="fill: #053061"/>
+    <path d="M 343.296 197.079271 
 L 343.296 195.772235 
 L 343.296 193.536 
 L 343.296 191.299765 
@@ -12382,10 +12393,10 @@ L 339.649977 193.536
 L 341.378577 195.243254 
 L 341.92107 195.772235 
 z
-" style="fill:#053061;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: #053061"/>
    </g>
    <g id="PathCollection_15">
-    <path clip-path="url(#p782ac110bd)" d="M 153.471141 307.584 
+    <path d="M 153.471141 307.584 
 L 155.388564 307.584 
 L 157.305987 307.584 
 L 159.223409 307.584 
@@ -12414,8 +12425,8 @@ L 155.388564 306.745397
 L 153.471141 307.261629 
 L 152.455838 307.584 
 z
-" style="fill:#053061;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 157.305987 213.760046 
+" clip-path="url(#pd7e07e7879)" style="fill: #053061"/>
+    <path d="M 157.305987 213.760046 
 L 159.223409 214.089172 
 L 161.140832 214.32142 
 L 163.058255 214.456122 
@@ -12867,8 +12878,8 @@ L 161.140832 207.623643
 L 159.223409 207.396493 
 L 157.305987 207.074593 
 z
-" style="fill:#053061;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 343.296 189.734601 
+" clip-path="url(#pd7e07e7879)" style="fill: #053061"/>
+    <path d="M 343.296 189.734601 
 L 343.296 189.063529 
 L 343.296 186.827294 
 L 343.296 184.591059 
@@ -12963,10 +12974,10 @@ L 340.607026 186.827294
 L 341.378577 187.677552 
 L 342.652456 189.063529 
 z
-" style="fill:#053061;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: #053061"/>
    </g>
    <g id="PathCollection_16">
-    <path clip-path="url(#p782ac110bd)" d="M 157.305987 207.074593 
+    <path d="M 157.305987 207.074593 
 L 159.223409 207.396493 
 L 161.140832 207.623643 
 L 163.058255 207.755389 
@@ -13364,8 +13375,8 @@ L 161.140832 200.918871
 L 159.223409 200.68742 
 L 157.305987 200.359423 
 z
-" style="fill:#053061;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 343.296 181.210094 
+" clip-path="url(#pd7e07e7879)" style="fill: #053061"/>
+    <path d="M 343.296 181.210094 
 L 343.296 180.118588 
 L 343.296 177.882353 
 L 343.296 175.646118 
@@ -13428,10 +13439,10 @@ L 340.845862 177.882353
 L 341.378577 178.631525 
 L 342.449606 180.118588 
 z
-" style="fill:#053061;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: #053061"/>
    </g>
    <g id="PathCollection_17">
-    <path clip-path="url(#p782ac110bd)" d="M 157.305987 200.359423 
+    <path d="M 157.305987 200.359423 
 L 159.223409 200.68742 
 L 161.140832 200.918871 
 L 163.058255 201.053111 
@@ -13773,8 +13784,8 @@ L 163.058255 194.057521
 L 161.140832 193.914793 
 L 159.223409 193.668705 
 z
-" style="fill:#053061;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 343.296 169.225299 
+" clip-path="url(#pd7e07e7879)" style="fill: #053061"/>
+    <path d="M 343.296 169.225299 
 L 343.296 168.937412 
 L 343.296 166.701176 
 L 343.296 164.464941 
@@ -13805,10 +13816,10 @@ L 341.525636 164.464941
 L 342.26438 166.701176 
 L 343.160816 168.937412 
 z
-" style="fill:#053061;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: #053061"/>
    </g>
    <g id="PathCollection_18">
-    <path clip-path="url(#p782ac110bd)" d="M 159.223409 193.668705 
+    <path d="M 159.223409 193.668705 
 L 161.140832 193.914793 
 L 163.058255 194.057521 
 L 164.975678 194.09648 
@@ -14090,10 +14101,10 @@ L 159.223409 185.87509
 L 157.305987 185.466403 
 L 155.388564 184.938597 
 z
-" style="fill:#053061;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: #053061"/>
    </g>
    <g id="PathCollection_19">
-    <path clip-path="url(#p782ac110bd)" d="M 155.388564 184.938597 
+    <path d="M 155.388564 184.938597 
 L 157.305987 185.466403 
 L 159.223409 185.87509 
 L 161.140832 186.163482 
@@ -14305,10 +14316,10 @@ L 161.140832 176.638993
 L 159.223409 176.257632 
 L 157.305987 175.717195 
 z
-" style="fill:#053061;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: #053061"/>
    </g>
    <g id="PathCollection_20">
-    <path clip-path="url(#p782ac110bd)" d="M 157.305987 175.717195 
+    <path d="M 157.305987 175.717195 
 L 159.223409 176.257632 
 L 161.140832 176.638993 
 L 163.058255 176.86018 
@@ -14395,280 +14406,285 @@ L 153.471141 174.014249
 L 155.388564 174.955072 
 L 157.110722 175.646118 
 z
-" style="fill:#053061;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: #053061"/>
    </g>
    <g id="matplotlib.axis_1">
     <g id="xtick_1">
      <g id="line2d_1">
       <defs>
-       <path d="M 0 0 
+       <path id="m913aef95ed" d="M 0 0 
 L 0 3.5 
-" id="m4180484e0b" style="stroke:#000000;stroke-width:0.8;"/>
+" style="stroke: #000000; stroke-width: 0.8"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m4180484e0b" y="307.584"/>
+       <use xlink:href="#m913aef95ed" x="57.6" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_1">
       <!-- −3 -->
-      <defs>
-       <path d="M 10.59375 35.5 
-L 73.1875 35.5 
-L 73.1875 27.203125 
-L 10.59375 27.203125 
+      <g transform="translate(50.228906 322.182437)scale(0.1 -0.1)">
+       <defs>
+        <path id="DejaVuSans-2212" d="M 678 2272 
+L 4684 2272 
+L 4684 1741 
+L 678 1741 
+L 678 2272 
 z
-" id="DejaVuSans-8722"/>
-       <path d="M 40.578125 39.3125 
-Q 47.65625 37.796875 51.625 33 
-Q 55.609375 28.21875 55.609375 21.1875 
-Q 55.609375 10.40625 48.1875 4.484375 
-Q 40.765625 -1.421875 27.09375 -1.421875 
-Q 22.515625 -1.421875 17.65625 -0.515625 
-Q 12.796875 0.390625 7.625 2.203125 
-L 7.625 11.71875 
-Q 11.71875 9.328125 16.59375 8.109375 
-Q 21.484375 6.890625 26.8125 6.890625 
-Q 36.078125 6.890625 40.9375 10.546875 
-Q 45.796875 14.203125 45.796875 21.1875 
-Q 45.796875 27.640625 41.28125 31.265625 
-Q 36.765625 34.90625 28.71875 34.90625 
-L 20.21875 34.90625 
-L 20.21875 43.015625 
-L 29.109375 43.015625 
-Q 36.375 43.015625 40.234375 45.921875 
-Q 44.09375 48.828125 44.09375 54.296875 
-Q 44.09375 59.90625 40.109375 62.90625 
-Q 36.140625 65.921875 28.71875 65.921875 
-Q 24.65625 65.921875 20.015625 65.03125 
-Q 15.375 64.15625 9.8125 62.3125 
-L 9.8125 71.09375 
-Q 15.4375 72.65625 20.34375 73.4375 
-Q 25.25 74.21875 29.59375 74.21875 
-Q 40.828125 74.21875 47.359375 69.109375 
-Q 53.90625 64.015625 53.90625 55.328125 
-Q 53.90625 49.265625 50.4375 45.09375 
-Q 46.96875 40.921875 40.578125 39.3125 
+" transform="scale(0.015625)"/>
+        <path id="DejaVuSans-33" d="M 2597 2516 
+Q 3050 2419 3304 2112 
+Q 3559 1806 3559 1356 
+Q 3559 666 3084 287 
+Q 2609 -91 1734 -91 
+Q 1441 -91 1130 -33 
+Q 819 25 488 141 
+L 488 750 
+Q 750 597 1062 519 
+Q 1375 441 1716 441 
+Q 2309 441 2620 675 
+Q 2931 909 2931 1356 
+Q 2931 1769 2642 2001 
+Q 2353 2234 1838 2234 
+L 1294 2234 
+L 1294 2753 
+L 1863 2753 
+Q 2328 2753 2575 2939 
+Q 2822 3125 2822 3475 
+Q 2822 3834 2567 4026 
+Q 2313 4219 1838 4219 
+Q 1578 4219 1281 4162 
+Q 984 4106 628 3988 
+L 628 4550 
+Q 988 4650 1302 4700 
+Q 1616 4750 1894 4750 
+Q 2613 4750 3031 4423 
+Q 3450 4097 3450 3541 
+Q 3450 3153 3228 2886 
+Q 3006 2619 2597 2516 
 z
-" id="DejaVuSans-51"/>
-      </defs>
-      <g transform="translate(50.228906 322.182437)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-8722"/>
-       <use x="83.789062" xlink:href="#DejaVuSans-51"/>
+" transform="scale(0.015625)"/>
+       </defs>
+       <use xlink:href="#DejaVuSans-2212"/>
+       <use xlink:href="#DejaVuSans-33" x="83.789062"/>
       </g>
      </g>
     </g>
     <g id="xtick_2">
      <g id="line2d_2">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="93.312" xlink:href="#m4180484e0b" y="307.584"/>
+       <use xlink:href="#m913aef95ed" x="93.312" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_2">
       <!-- −2 -->
-      <defs>
-       <path d="M 19.1875 8.296875 
-L 53.609375 8.296875 
-L 53.609375 0 
-L 7.328125 0 
-L 7.328125 8.296875 
-Q 12.9375 14.109375 22.625 23.890625 
-Q 32.328125 33.6875 34.8125 36.53125 
-Q 39.546875 41.84375 41.421875 45.53125 
-Q 43.3125 49.21875 43.3125 52.78125 
-Q 43.3125 58.59375 39.234375 62.25 
-Q 35.15625 65.921875 28.609375 65.921875 
-Q 23.96875 65.921875 18.8125 64.3125 
-Q 13.671875 62.703125 7.8125 59.421875 
-L 7.8125 69.390625 
-Q 13.765625 71.78125 18.9375 73 
-Q 24.125 74.21875 28.421875 74.21875 
-Q 39.75 74.21875 46.484375 68.546875 
-Q 53.21875 62.890625 53.21875 53.421875 
-Q 53.21875 48.921875 51.53125 44.890625 
-Q 49.859375 40.875 45.40625 35.40625 
-Q 44.1875 33.984375 37.640625 27.21875 
-Q 31.109375 20.453125 19.1875 8.296875 
-z
-" id="DejaVuSans-50"/>
-      </defs>
       <g transform="translate(85.940906 322.182437)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-8722"/>
-       <use x="83.789062" xlink:href="#DejaVuSans-50"/>
+       <defs>
+        <path id="DejaVuSans-32" d="M 1228 531 
+L 3431 531 
+L 3431 0 
+L 469 0 
+L 469 531 
+Q 828 903 1448 1529 
+Q 2069 2156 2228 2338 
+Q 2531 2678 2651 2914 
+Q 2772 3150 2772 3378 
+Q 2772 3750 2511 3984 
+Q 2250 4219 1831 4219 
+Q 1534 4219 1204 4116 
+Q 875 4013 500 3803 
+L 500 4441 
+Q 881 4594 1212 4672 
+Q 1544 4750 1819 4750 
+Q 2544 4750 2975 4387 
+Q 3406 4025 3406 3419 
+Q 3406 3131 3298 2873 
+Q 3191 2616 2906 2266 
+Q 2828 2175 2409 1742 
+Q 1991 1309 1228 531 
+z
+" transform="scale(0.015625)"/>
+       </defs>
+       <use xlink:href="#DejaVuSans-2212"/>
+       <use xlink:href="#DejaVuSans-32" x="83.789062"/>
       </g>
      </g>
     </g>
     <g id="xtick_3">
      <g id="line2d_3">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="129.024" xlink:href="#m4180484e0b" y="307.584"/>
+       <use xlink:href="#m913aef95ed" x="129.024" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_3">
       <!-- −1 -->
-      <defs>
-       <path d="M 12.40625 8.296875 
-L 28.515625 8.296875 
-L 28.515625 63.921875 
-L 10.984375 60.40625 
-L 10.984375 69.390625 
-L 28.421875 72.90625 
-L 38.28125 72.90625 
-L 38.28125 8.296875 
-L 54.390625 8.296875 
-L 54.390625 0 
-L 12.40625 0 
-z
-" id="DejaVuSans-49"/>
-      </defs>
       <g transform="translate(121.652906 322.182437)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-8722"/>
-       <use x="83.789062" xlink:href="#DejaVuSans-49"/>
+       <defs>
+        <path id="DejaVuSans-31" d="M 794 531 
+L 1825 531 
+L 1825 4091 
+L 703 3866 
+L 703 4441 
+L 1819 4666 
+L 2450 4666 
+L 2450 531 
+L 3481 531 
+L 3481 0 
+L 794 0 
+L 794 531 
+z
+" transform="scale(0.015625)"/>
+       </defs>
+       <use xlink:href="#DejaVuSans-2212"/>
+       <use xlink:href="#DejaVuSans-31" x="83.789062"/>
       </g>
      </g>
     </g>
     <g id="xtick_4">
      <g id="line2d_4">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="164.736" xlink:href="#m4180484e0b" y="307.584"/>
+       <use xlink:href="#m913aef95ed" x="164.736" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_4">
       <!-- 0 -->
-      <defs>
-       <path d="M 31.78125 66.40625 
-Q 24.171875 66.40625 20.328125 58.90625 
-Q 16.5 51.421875 16.5 36.375 
-Q 16.5 21.390625 20.328125 13.890625 
-Q 24.171875 6.390625 31.78125 6.390625 
-Q 39.453125 6.390625 43.28125 13.890625 
-Q 47.125 21.390625 47.125 36.375 
-Q 47.125 51.421875 43.28125 58.90625 
-Q 39.453125 66.40625 31.78125 66.40625 
+      <g transform="translate(161.55475 322.182437)scale(0.1 -0.1)">
+       <defs>
+        <path id="DejaVuSans-30" d="M 2034 4250 
+Q 1547 4250 1301 3770 
+Q 1056 3291 1056 2328 
+Q 1056 1369 1301 889 
+Q 1547 409 2034 409 
+Q 2525 409 2770 889 
+Q 3016 1369 3016 2328 
+Q 3016 3291 2770 3770 
+Q 2525 4250 2034 4250 
 z
-M 31.78125 74.21875 
-Q 44.046875 74.21875 50.515625 64.515625 
-Q 56.984375 54.828125 56.984375 36.375 
-Q 56.984375 17.96875 50.515625 8.265625 
-Q 44.046875 -1.421875 31.78125 -1.421875 
-Q 19.53125 -1.421875 13.0625 8.265625 
-Q 6.59375 17.96875 6.59375 36.375 
-Q 6.59375 54.828125 13.0625 64.515625 
-Q 19.53125 74.21875 31.78125 74.21875 
+M 2034 4750 
+Q 2819 4750 3233 4129 
+Q 3647 3509 3647 2328 
+Q 3647 1150 3233 529 
+Q 2819 -91 2034 -91 
+Q 1250 -91 836 529 
+Q 422 1150 422 2328 
+Q 422 3509 836 4129 
+Q 1250 4750 2034 4750 
 z
-" id="DejaVuSans-48"/>
-      </defs>
-      <g transform="translate(161.55475 322.182437)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-48"/>
+" transform="scale(0.015625)"/>
+       </defs>
+       <use xlink:href="#DejaVuSans-30"/>
       </g>
      </g>
     </g>
     <g id="xtick_5">
      <g id="line2d_5">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="200.448" xlink:href="#m4180484e0b" y="307.584"/>
+       <use xlink:href="#m913aef95ed" x="200.448" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_5">
       <!-- 1 -->
       <g transform="translate(197.26675 322.182437)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-49"/>
+       <use xlink:href="#DejaVuSans-31"/>
       </g>
      </g>
     </g>
     <g id="xtick_6">
      <g id="line2d_6">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="236.16" xlink:href="#m4180484e0b" y="307.584"/>
+       <use xlink:href="#m913aef95ed" x="236.16" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_6">
       <!-- 2 -->
       <g transform="translate(232.97875 322.182437)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-50"/>
+       <use xlink:href="#DejaVuSans-32"/>
       </g>
      </g>
     </g>
     <g id="xtick_7">
      <g id="line2d_7">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="271.872" xlink:href="#m4180484e0b" y="307.584"/>
+       <use xlink:href="#m913aef95ed" x="271.872" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_7">
       <!-- 3 -->
       <g transform="translate(268.69075 322.182437)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-51"/>
+       <use xlink:href="#DejaVuSans-33"/>
       </g>
      </g>
     </g>
     <g id="xtick_8">
      <g id="line2d_8">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="307.584" xlink:href="#m4180484e0b" y="307.584"/>
+       <use xlink:href="#m913aef95ed" x="307.584" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_8">
       <!-- 4 -->
-      <defs>
-       <path d="M 37.796875 64.3125 
-L 12.890625 25.390625 
-L 37.796875 25.390625 
+      <g transform="translate(304.40275 322.182437)scale(0.1 -0.1)">
+       <defs>
+        <path id="DejaVuSans-34" d="M 2419 4116 
+L 825 1625 
+L 2419 1625 
+L 2419 4116 
 z
-M 35.203125 72.90625 
-L 47.609375 72.90625 
-L 47.609375 25.390625 
-L 58.015625 25.390625 
-L 58.015625 17.1875 
-L 47.609375 17.1875 
-L 47.609375 0 
-L 37.796875 0 
-L 37.796875 17.1875 
-L 4.890625 17.1875 
-L 4.890625 26.703125 
+M 2253 4666 
+L 3047 4666 
+L 3047 1625 
+L 3713 1625 
+L 3713 1100 
+L 3047 1100 
+L 3047 0 
+L 2419 0 
+L 2419 1100 
+L 313 1100 
+L 313 1709 
+L 2253 4666 
 z
-" id="DejaVuSans-52"/>
-      </defs>
-      <g transform="translate(304.40275 322.182437)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-52"/>
+" transform="scale(0.015625)"/>
+       </defs>
+       <use xlink:href="#DejaVuSans-34"/>
       </g>
      </g>
     </g>
     <g id="xtick_9">
      <g id="line2d_9">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="343.296" xlink:href="#m4180484e0b" y="307.584"/>
+       <use xlink:href="#m913aef95ed" x="343.296" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_9">
       <!-- 5 -->
-      <defs>
-       <path d="M 10.796875 72.90625 
-L 49.515625 72.90625 
-L 49.515625 64.59375 
-L 19.828125 64.59375 
-L 19.828125 46.734375 
-Q 21.96875 47.46875 24.109375 47.828125 
-Q 26.265625 48.1875 28.421875 48.1875 
-Q 40.625 48.1875 47.75 41.5 
-Q 54.890625 34.8125 54.890625 23.390625 
-Q 54.890625 11.625 47.5625 5.09375 
-Q 40.234375 -1.421875 26.90625 -1.421875 
-Q 22.3125 -1.421875 17.546875 -0.640625 
-Q 12.796875 0.140625 7.71875 1.703125 
-L 7.71875 11.625 
-Q 12.109375 9.234375 16.796875 8.0625 
-Q 21.484375 6.890625 26.703125 6.890625 
-Q 35.15625 6.890625 40.078125 11.328125 
-Q 45.015625 15.765625 45.015625 23.390625 
-Q 45.015625 31 40.078125 35.4375 
-Q 35.15625 39.890625 26.703125 39.890625 
-Q 22.75 39.890625 18.8125 39.015625 
-Q 14.890625 38.140625 10.796875 36.28125 
-z
-" id="DejaVuSans-53"/>
-      </defs>
       <g transform="translate(340.11475 322.182437)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-53"/>
+       <defs>
+        <path id="DejaVuSans-35" d="M 691 4666 
+L 3169 4666 
+L 3169 4134 
+L 1269 4134 
+L 1269 2991 
+Q 1406 3038 1543 3061 
+Q 1681 3084 1819 3084 
+Q 2600 3084 3056 2656 
+Q 3513 2228 3513 1497 
+Q 3513 744 3044 326 
+Q 2575 -91 1722 -91 
+Q 1428 -91 1123 -41 
+Q 819 9 494 109 
+L 494 744 
+Q 775 591 1075 516 
+Q 1375 441 1709 441 
+Q 2250 441 2565 725 
+Q 2881 1009 2881 1497 
+Q 2881 1984 2565 2268 
+Q 2250 2553 1709 2553 
+Q 1456 2553 1204 2497 
+Q 953 2441 691 2322 
+L 691 4666 
+z
+" transform="scale(0.015625)"/>
+       </defs>
+       <use xlink:href="#DejaVuSans-35"/>
       </g>
      </g>
     </g>
@@ -14677,133 +14693,133 @@ z
     <g id="ytick_1">
      <g id="line2d_10">
       <defs>
-       <path d="M 0 0 
+       <path id="m8204a2ca4a" d="M 0 0 
 L -3.5 0 
-" id="mf9bbc8b617" style="stroke:#000000;stroke-width:0.8;"/>
+" style="stroke: #000000; stroke-width: 0.8"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mf9bbc8b617" y="307.584"/>
+       <use xlink:href="#m8204a2ca4a" x="57.6" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_10">
       <!-- −3 -->
       <g transform="translate(35.857813 311.383219)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-8722"/>
-       <use x="83.789062" xlink:href="#DejaVuSans-51"/>
+       <use xlink:href="#DejaVuSans-2212"/>
+       <use xlink:href="#DejaVuSans-33" x="83.789062"/>
       </g>
      </g>
     </g>
     <g id="ytick_2">
      <g id="line2d_11">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mf9bbc8b617" y="274.32"/>
+       <use xlink:href="#m8204a2ca4a" x="57.6" y="274.32" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_11">
       <!-- −2 -->
       <g transform="translate(35.857813 278.119219)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-8722"/>
-       <use x="83.789062" xlink:href="#DejaVuSans-50"/>
+       <use xlink:href="#DejaVuSans-2212"/>
+       <use xlink:href="#DejaVuSans-32" x="83.789062"/>
       </g>
      </g>
     </g>
     <g id="ytick_3">
      <g id="line2d_12">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mf9bbc8b617" y="241.056"/>
+       <use xlink:href="#m8204a2ca4a" x="57.6" y="241.056" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_12">
       <!-- −1 -->
       <g transform="translate(35.857813 244.855219)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-8722"/>
-       <use x="83.789062" xlink:href="#DejaVuSans-49"/>
+       <use xlink:href="#DejaVuSans-2212"/>
+       <use xlink:href="#DejaVuSans-31" x="83.789062"/>
       </g>
      </g>
     </g>
     <g id="ytick_4">
      <g id="line2d_13">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mf9bbc8b617" y="207.792"/>
+       <use xlink:href="#m8204a2ca4a" x="57.6" y="207.792" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_13">
       <!-- 0 -->
       <g transform="translate(44.2375 211.591219)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-48"/>
+       <use xlink:href="#DejaVuSans-30"/>
       </g>
      </g>
     </g>
     <g id="ytick_5">
      <g id="line2d_14">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mf9bbc8b617" y="174.528"/>
+       <use xlink:href="#m8204a2ca4a" x="57.6" y="174.528" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_14">
       <!-- 1 -->
       <g transform="translate(44.2375 178.327219)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-49"/>
+       <use xlink:href="#DejaVuSans-31"/>
       </g>
      </g>
     </g>
     <g id="ytick_6">
      <g id="line2d_15">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mf9bbc8b617" y="141.264"/>
+       <use xlink:href="#m8204a2ca4a" x="57.6" y="141.264" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_15">
       <!-- 2 -->
       <g transform="translate(44.2375 145.063219)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-50"/>
+       <use xlink:href="#DejaVuSans-32"/>
       </g>
      </g>
     </g>
     <g id="ytick_7">
      <g id="line2d_16">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mf9bbc8b617" y="108"/>
+       <use xlink:href="#m8204a2ca4a" x="57.6" y="108" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_16">
       <!-- 3 -->
       <g transform="translate(44.2375 111.799219)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-51"/>
+       <use xlink:href="#DejaVuSans-33"/>
       </g>
      </g>
     </g>
     <g id="ytick_8">
      <g id="line2d_17">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mf9bbc8b617" y="74.736"/>
+       <use xlink:href="#m8204a2ca4a" x="57.6" y="74.736" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_17">
       <!-- 4 -->
       <g transform="translate(44.2375 78.535219)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-52"/>
+       <use xlink:href="#DejaVuSans-34"/>
       </g>
      </g>
     </g>
     <g id="ytick_9">
      <g id="line2d_18">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mf9bbc8b617" y="41.472"/>
+       <use xlink:href="#m8204a2ca4a" x="57.6" y="41.472" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_18">
       <!-- 5 -->
       <g transform="translate(44.2375 45.271219)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-53"/>
+       <use xlink:href="#DejaVuSans-35"/>
       </g>
      </g>
     </g>
    </g>
-   <g id="LineCollection_1"/>
-   <g id="LineCollection_2"/>
-   <g id="LineCollection_3">
-    <path clip-path="url(#p782ac110bd)" d="M 57.6 239.224244 
+   <g id="PathCollection_21"/>
+   <g id="PathCollection_22"/>
+   <g id="PathCollection_23">
+    <path d="M 57.6 239.224244 
 L 59.517423 239.738704 
 L 61.434846 240.41478 
 L 61.623345 240.496941 
@@ -14842,8 +14858,8 @@ L 61.434846 279.646988
 L 59.517423 280.355448 
 L 58.117053 280.749176 
 L 57.6 280.881538 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 72.953263 41.472 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 72.953263 41.472 
 L 74.024773 43.708235 
 L 74.816595 45.944471 
 L 74.856805 46.121285 
@@ -14868,8 +14884,8 @@ L 61.715192 70.543059
 L 61.434846 70.665469 
 L 59.517423 71.342742 
 L 57.6 71.858113 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 297.336595 41.472 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 297.336595 41.472 
 L 298.410164 43.708235 
 L 299.195275 45.921266 
 L 299.202915 45.944471 
@@ -14923,8 +14939,8 @@ L 254.666245 45.944471
 L 255.09455 44.664356 
 L 255.439937 43.708235 
 L 256.533086 41.472 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 272.351356 280.97998 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 272.351356 280.97998 
 L 271.37239 280.749176 
 L 270.433933 280.50617 
 L 268.51651 279.839877 
@@ -15011,10 +15027,11 @@ L 278.103624 281.397816
 L 276.186201 281.415554 
 L 274.268779 281.276142 
 L 272.351356 280.97998 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
+z
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
    </g>
-   <g id="LineCollection_4">
-    <path clip-path="url(#p782ac110bd)" d="M 57.6 229.622509 
+   <g id="PathCollection_24">
+    <path d="M 57.6 229.622509 
 L 59.517423 230.007799 
 L 61.434846 230.514127 
 L 63.352268 231.140034 
@@ -15071,8 +15088,8 @@ L 61.434846 289.58406
 L 61.0292 289.694118 
 L 59.517423 290.082595 
 L 57.6 290.457526 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 83.777959 41.472 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 83.777959 41.472 
 L 84.443919 43.353283 
 L 84.564256 43.708235 
 L 85.124496 45.944471 
@@ -15106,8 +15123,8 @@ L 63.352268 79.94131
 L 61.434846 80.567858 
 L 59.517423 81.074706 
 L 57.6 81.460391 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 308.163413 41.472 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 308.163413 41.472 
 L 308.782389 43.218614 
 L 308.948546 43.708235 
 L 309.509345 45.944471 
@@ -15181,8 +15198,8 @@ L 244.348013 45.944471
 L 244.914089 43.708235 
 L 245.507436 41.976094 
 L 245.687957 41.472 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 268.51651 289.724029 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 268.51651 289.724029 
 L 268.41765 289.694118 
 L 266.599087 289.113168 
 L 264.681664 288.379134 
@@ -15307,10 +15324,11 @@ L 274.268779 290.758944
 L 272.351356 290.532721 
 L 270.433933 290.187418 
 L 268.51651 289.724029 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
+z
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
    </g>
-   <g id="LineCollection_5">
-    <path clip-path="url(#p782ac110bd)" d="M 57.6 221.852222 
+   <g id="PathCollection_25">
+    <path d="M 57.6 221.852222 
 L 59.517423 222.178961 
 L 61.429111 222.607059 
 L 61.434846 222.608385 
@@ -15382,8 +15400,8 @@ L 63.352268 296.929959
 L 61.434846 297.468638 
 L 59.517423 297.904404 
 L 57.6 298.236 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 92.324186 41.472 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 92.324186 41.472 
 L 92.989639 43.708235 
 L 93.481393 45.944471 
 L 93.797228 48.180706 
@@ -15424,8 +15442,8 @@ L 61.579818 88.432941
 L 61.434846 88.473095 
 L 59.517423 88.902715 
 L 57.6 89.229635 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 316.708847 41.472 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 316.708847 41.472 
 L 317.374705 43.708235 
 L 317.86676 45.944471 
 L 318.182787 48.180706 
@@ -15513,62 +15531,112 @@ L 235.920322 46.410586
 L 235.986574 45.944471 
 L 236.481467 43.708235 
 L 237.151167 41.472 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 264.681664 296.459335 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 264.681664 296.459335 
+L 264.530089 296.402824 
 L 262.764242 295.721139 
+L 260.846819 294.879526 
+L 259.393493 294.166588 
 L 258.929396 293.929448 
+L 257.011973 292.849416 
+L 255.51501 291.930353 
 L 255.09455 291.659726 
+L 253.177128 290.32727 
 L 252.326336 289.694118 
+L 251.259705 288.856019 
+L 249.586297 287.457882 
 L 249.342282 287.240912 
+L 247.424859 285.439382 
 L 247.20431 285.221647 
+L 245.507436 283.422753 
 L 245.11282 282.985412 
+L 243.590013 281.154279 
 L 243.266255 280.749176 
+L 241.672591 278.559057 
 L 241.640203 278.512941 
+L 240.231182 276.276706 
 L 239.755168 275.41905 
 L 239.013728 274.040471 
+L 237.97912 271.804235 
 L 237.837745 271.437401 
 L 237.136975 269.568 
 L 236.470537 267.331765 
+L 235.978956 265.095529 
 L 235.920322 264.678621 
 L 235.670556 262.859294 
 L 235.537794 260.623059 
 L 235.579873 258.386824 
+L 235.7966 256.150588 
 L 235.920322 255.441897 
 L 236.193515 253.914353 
 L 236.769562 251.678118 
+L 237.519114 249.441882 
 L 237.837745 248.667112 
 L 238.455667 247.205647 
+L 239.571796 244.969412 
 L 239.755168 244.649478 
+L 240.888611 242.733176 
 L 241.672591 241.554639 
+L 242.401586 240.496941 
 L 243.590013 238.938381 
+L 244.127713 238.260706 
 L 245.507436 236.667717 
+L 246.089871 236.024471 
 L 247.424859 234.65854 
+L 248.318618 233.788235 
 L 249.342282 232.855804 
+L 250.854777 231.552 
 L 251.259705 231.22272 
+L 253.177128 229.756363 
 L 253.794109 229.315765 
+L 255.09455 228.433113 
+L 257.011973 227.227722 
 L 257.268914 227.079529 
+L 258.929396 226.163104 
 L 260.846819 225.203133 
+L 261.65009 224.843294 
 L 262.764242 224.36273 
+L 264.681664 223.635352 
 L 266.599087 223.00973 
+L 268.078004 222.607059 
 L 268.51651 222.491437 
+L 270.433933 222.087611 
 L 272.351356 221.786693 
+L 274.268779 221.589548 
 L 276.186201 221.496746 
+L 278.103624 221.508553 
 L 280.021047 221.624937 
+L 281.93847 221.845561 
 L 283.855893 222.16979 
+L 285.773315 222.596689 
 L 285.81095 222.607059 
+L 287.690738 223.141928 
 L 289.608161 223.790682 
+L 291.525584 224.540744 
 L 292.208711 224.843294 
+L 293.443007 225.411041 
 L 295.36043 226.393438 
+L 296.578516 227.079529 
 L 297.277852 227.491173 
+L 299.195275 228.718548 
 L 300.061097 229.315765 
+L 301.112698 230.078945 
+L 303.011256 231.552 
 L 303.030121 231.567516 
+L 304.947544 233.241942 
 L 305.540347 233.788235 
+L 306.864966 235.0932 
 L 307.765678 236.024471 
+L 308.782389 237.159134 
 L 309.727591 238.260706 
+L 310.699812 239.49755 
 L 311.455515 240.496941 
+L 312.617235 242.196641 
 L 312.9715 242.733176 
+L 314.284371 244.969412 
 L 314.534658 245.458975 
 L 315.40073 247.205647 
+L 316.340039 249.441882 
 L 316.452081 249.769161 
 L 317.088263 251.678118 
 L 317.661005 253.914353 
@@ -15578,31 +15646,52 @@ L 318.32226 260.623059
 L 318.187034 262.859294 
 L 317.874334 265.095529 
 L 317.385573 267.331765 
+L 316.722958 269.568 
 L 316.452081 270.294772 
 L 315.874155 271.804235 
+L 314.846325 274.040471 
 L 314.534658 274.623782 
+L 313.624055 276.276706 
 L 312.617235 277.886548 
 L 312.211713 278.512941 
+L 310.699812 280.608154 
 L 310.594029 280.749176 
+L 308.782389 282.948122 
 L 308.750307 282.985412 
+L 306.864966 285.005102 
 L 306.652819 285.221647 
+L 304.947544 286.842615 
 L 304.264496 287.457882 
+L 303.030121 288.502662 
+L 301.535526 289.694118 
 L 301.112698 290.013361 
+L 299.195275 291.367483 
+L 298.336435 291.930353 
 L 297.277852 292.592125 
+L 295.36043 293.694369 
+L 294.457366 294.166588 
 L 293.443007 294.675813 
+L 291.525584 295.539988 
 L 289.608161 296.30327 
+L 289.319023 296.402824 
 L 287.690738 296.944273 
+L 285.773315 297.480466 
 L 283.855893 297.913711 
+L 281.93847 298.24276 
 L 280.021047 298.466664 
+L 278.103624 298.584778 
 L 276.186201 298.596761 
+L 274.268779 298.502579 
 L 272.351356 298.302504 
+L 270.433933 297.997111 
 L 268.51651 297.587282 
+L 266.599087 297.074197 
 L 264.681664 296.459335 
-L 264.681664 296.459335 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
+z
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
    </g>
-   <g id="LineCollection_6">
-    <path clip-path="url(#p782ac110bd)" d="M 57.6 214.834094 
+   <g id="PathCollection_26">
+    <path d="M 57.6 214.834094 
 L 59.517423 215.140253 
 L 61.434846 215.542592 
 L 62.806379 215.898353 
@@ -15688,8 +15777,8 @@ L 63.352268 304.04028
 L 61.434846 304.541356 
 L 59.517423 304.946703 
 L 57.6 305.255151 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 99.943852 41.472 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 99.943852 41.472 
 L 100.562132 43.708235 
 L 101.019027 45.944471 
 L 101.312472 48.180706 
@@ -15737,8 +15826,8 @@ L 62.967288 95.141647
 L 61.434846 95.539253 
 L 59.517423 95.941701 
 L 57.6 96.247944 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 324.328726 41.472 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 324.328726 41.472 
 L 324.947188 43.708235 
 L 325.404218 45.944471 
 L 325.69775 48.180706 
@@ -15840,72 +15929,139 @@ L 228.250631 47.470237
 L 228.451471 45.944471 
 L 228.90979 43.708235 
 L 229.529997 41.472 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 274.268779 305.500923 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 274.268779 305.500923 
+L 272.668185 305.347765 
+L 272.351356 305.317013 
 L 270.433933 305.032938 
+L 268.51651 304.651718 
 L 266.599087 304.174449 
+L 264.681664 303.602509 
+L 263.265928 303.111529 
 L 262.764242 302.934197 
+L 260.846819 302.163583 
 L 258.929396 301.302329 
+L 258.066958 300.875294 
+L 257.011973 300.34021 
 L 255.09455 299.280202 
+L 254.020375 298.639059 
 L 253.177128 298.120799 
+L 251.259705 296.858796 
+L 250.608182 296.402824 
 L 249.342282 295.485481 
+L 247.619872 294.166588 
 L 247.424859 294.011048 
+L 245.507436 292.404113 
+L 244.966696 291.930353 
 L 243.590013 290.665859 
+L 242.573297 289.694118 
 L 241.672591 288.785188 
+L 240.403121 287.457882 
 L 239.755168 286.736896 
+L 238.435583 285.221647 
 L 237.837745 284.484487 
+L 236.655209 282.985412 
 L 235.920322 281.974628 
+L 235.050617 280.749176 
 L 234.002899 279.127756 
 L 233.613784 278.512941 
+L 232.344018 276.276706 
 L 232.085477 275.759795 
 L 231.240454 274.040471 
+L 230.294996 271.804235 
 L 230.168054 271.443792 
 L 229.516854 269.568 
 L 228.899668 267.331765 
+L 228.444416 265.095529 
 L 228.250631 263.607695 
 L 228.154252 262.859294 
 L 228.029714 260.623059 
 L 228.069186 258.386824 
+L 228.250631 256.391002 
 L 228.272736 256.150588 
 L 228.643118 253.914353 
 L 229.176594 251.678118 
+L 229.870752 249.441882 
 L 230.168054 248.661287 
 L 230.73048 247.205647 
+L 231.750434 244.969412 
 L 232.085477 244.329736 
+L 232.936472 242.733176 
 L 234.002899 240.954229 
 L 234.282779 240.496941 
+L 235.79699 238.260706 
 L 235.920322 238.093848 
+L 237.487276 236.024471 
 L 237.837745 235.595671 
+L 239.356505 233.788235 
 L 239.755168 233.344434 
+L 241.416759 231.552 
 L 241.672591 231.291658 
+L 243.590013 229.408419 
 L 243.688176 229.315765 
+L 245.507436 227.683687 
+L 246.211471 227.079529 
 L 247.424859 226.083151 
+L 249.011386 224.843294 
 L 249.342282 224.594307 
+L 251.259705 223.2289 
+L 252.188248 222.607059 
 L 253.177128 221.965735 
+L 255.09455 220.804551 
+L 255.867803 220.370824 
 L 257.011973 219.745965 
+L 258.929396 218.785251 
+L 260.360935 218.134588 
 L 260.846819 217.918466 
+L 262.764242 217.155349 
 L 264.681664 216.484189 
+L 266.599087 215.906919 
+L 266.633183 215.898353 
 L 268.51651 215.43305 
+L 270.433933 215.054657 
 L 272.351356 214.772691 
+L 274.268779 214.587963 
 L 276.186201 214.501006 
+L 278.103624 214.51207 
 L 280.021047 214.621123 
+L 281.93847 214.827852 
 L 283.855893 215.13166 
+L 285.773315 215.531672 
+L 287.193504 215.898353 
 L 287.690738 216.0289 
+L 289.608161 216.627513 
 L 291.525584 217.319605 
+L 293.443007 218.103179 
+L 293.512009 218.134588 
 L 295.36043 218.99436 
+L 297.277852 219.974831 
+L 297.989962 220.370824 
 L 299.195275 221.059229 
+L 301.112698 222.239295 
+L 301.671634 222.607059 
 L 303.030121 223.530069 
+L 304.850515 224.843294 
+L 304.947544 224.915991 
 L 306.864966 226.431988 
+L 307.645343 227.079529 
 L 308.782389 228.065521 
+L 310.16303 229.315765 
 L 310.699812 229.827193 
+L 312.441295 231.552 
 L 312.617235 231.736721 
+L 314.504897 233.788235 
 L 314.534658 233.822813 
+L 316.372557 236.024471 
 L 316.452081 236.127296 
+L 318.058253 238.260706 
 L 318.369503 238.711994 
+L 319.572138 240.496941 
 L 320.286926 241.670637 
 L 320.921199 242.733176 
+L 322.108122 244.969412 
 L 322.204349 245.177606 
 L 323.126101 247.205647 
+L 323.987102 249.441882 
 L 324.121772 249.871039 
 L 324.681135 251.678118 
 L 325.213109 253.914353 
@@ -15915,31 +16071,55 @@ L 325.827295 260.623059
 L 325.701694 262.859294 
 L 325.411253 265.095529 
 L 324.957282 267.331765 
+L 324.341833 269.568 
 L 324.121772 270.203678 
 L 323.560058 271.804235 
+L 322.617916 274.040471 
 L 322.204349 274.884895 
 L 321.511152 276.276706 
+L 320.286926 278.441878 
 L 320.245934 278.512941 
+L 318.808111 280.749176 
 L 318.369503 281.370275 
+L 317.20196 282.985412 
 L 316.452081 283.941503 
+L 315.420683 285.221647 
 L 314.534658 286.245757 
+L 313.453391 287.457882 
 L 312.617235 288.338662 
+L 311.285234 289.694118 
 L 310.699812 290.258345 
+L 308.896429 291.930353 
 L 308.782389 292.031207 
+L 306.864966 293.655025 
+L 306.231005 294.166588 
 L 304.947544 295.160875 
+L 303.255773 296.402824 
+L 303.030121 296.562808 
 L 301.112698 297.843173 
+L 299.838451 298.639059 
+L 299.195275 299.029193 
 L 297.277852 300.108534 
+L 295.796553 300.875294 
+L 295.36043 301.095681 
 L 293.443007 301.977055 
+L 291.525584 302.768328 
+L 290.584004 303.111529 
 L 289.608161 303.460507 
+L 287.690738 304.053595 
 L 285.773315 304.552358 
+L 283.855893 304.95536 
 L 281.93847 305.261439 
+L 281.143736 305.347765 
+L 280.021047 305.467988 
 L 278.103624 305.576302 
+L 276.186201 305.587291 
 L 274.268779 305.500923 
-L 274.268779 305.500923 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
+z
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
    </g>
-   <g id="LineCollection_7">
-    <path clip-path="url(#p782ac110bd)" d="M 257.746053 307.584 
+   <g id="PathCollection_27">
+    <path d="M 257.746053 307.584 
 L 255.09455 306.231492 
 L 251.259705 303.974085 
 L 247.424859 301.37406 
@@ -16028,8 +16208,8 @@ L 301.112698 304.889746
 L 297.277852 307.013662 
 L 296.110992 307.584 
 L 296.110992 307.584 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 57.6 208.125063 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 57.6 208.125063 
 L 59.517423 208.424502 
 L 61.434846 208.818009 
 L 62.899749 209.189647 
@@ -16120,8 +16300,8 @@ L 75.939005 305.347765
 L 74.856805 305.968681 
 L 72.939383 306.98983 
 L 71.726389 307.584 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 107.172066 41.472 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 107.172066 41.472 
 L 107.452993 42.511559 
 L 107.775802 43.708235 
 L 108.221579 45.944471 
@@ -16177,8 +16357,8 @@ L 63.065433 101.850353
 L 61.434846 102.264029 
 L 59.517423 102.657541 
 L 57.6 102.956983 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 331.557225 41.472 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 331.557225 41.472 
 L 331.791463 42.338722 
 L 332.160899 43.708235 
 L 332.60668 45.944471 
@@ -16293,10 +16473,10 @@ L 220.964166 48.180706
 L 221.250521 45.944471 
 L 221.696376 43.708235 
 L 222.299716 41.472 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
    </g>
-   <g id="LineCollection_8">
-    <path clip-path="url(#p782ac110bd)" d="M 246.532159 307.584 
+   <g id="PathCollection_28">
+    <path d="M 246.532159 307.584 
 L 243.489824 305.347765 
 L 239.755168 302.342306 
 L 235.567982 298.639059 
@@ -16381,8 +16561,8 @@ L 312.617235 303.570974
 L 308.782389 306.536733 
 L 307.327988 307.584 
 L 307.327988 307.584 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 57.6 201.429786 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 57.6 201.429786 
 L 59.517423 201.734896 
 L 61.434846 202.135854 
 L 62.769808 202.480941 
@@ -16478,8 +16658,8 @@ L 86.361342 305.054974
 L 85.977861 305.347765 
 L 84.443919 306.502368 
 L 82.943462 307.584 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 114.341352 41.472 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 114.341352 41.472 
 L 114.951864 43.708235 
 L 115.122685 44.554941 
 L 115.405796 45.944471 
@@ -16542,8 +16722,8 @@ L 62.93355 108.559059
 L 61.434846 108.946377 
 L 59.517423 109.347237 
 L 57.6 109.652271 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 338.726414 41.472 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 338.726414 41.472 
 L 339.461154 44.324737 
 L 339.791078 45.944471 
 L 340.083626 48.180706 
@@ -16602,10 +16782,10 @@ L 214.065118 45.944471
 L 214.828671 42.583778 
 L 215.13159 41.472 
 L 215.13159 41.472 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
    </g>
-   <g id="LineCollection_9">
-    <path clip-path="url(#p782ac110bd)" d="M 237.857694 307.584 
+   <g id="PathCollection_29">
+    <path d="M 237.857694 307.584 
 L 235.249149 305.347765 
 L 230.35349 300.875294 
 L 226.333208 296.888781 
@@ -16665,8 +16845,8 @@ L 339.968345 238.260706
 L 342.703436 242.733176 
 L 343.296 243.87332 
 L 343.296 243.87332 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 343.296 276.24619 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 343.296 276.24619 
 L 343.281118 276.276706 
 L 342.043013 278.512941 
 L 341.378577 279.589618 
@@ -16696,8 +16876,8 @@ L 318.610563 305.347765
 L 318.369503 305.55924 
 L 316.452081 307.202489 
 L 315.994786 307.584 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 57.6 194.458015 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 57.6 194.458015 
 L 59.517423 194.782419 
 L 61.434846 195.208732 
 L 63.352268 195.735727 
@@ -16800,8 +16980,8 @@ L 94.225851 305.347765
 L 94.031034 305.518762 
 L 92.113611 307.163013 
 L 91.60935 307.584 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 343.296 67.208724 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 343.296 67.208724 
 L 342.726651 68.306824 
 L 339.996427 72.779294 
 L 336.791784 77.251765 
@@ -16851,8 +17031,8 @@ L 206.586426 45.944471
 L 207.15898 43.413901 
 L 207.717854 41.472 
 L 207.717854 41.472 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 121.755072 41.472 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 121.755072 41.472 
 L 122.401942 43.708235 
 L 122.792376 45.534722 
 L 122.881955 45.944471 
@@ -16922,10 +17102,10 @@ L 63.352268 115.346877
 L 61.434846 115.873594 
 L 59.517423 116.299684 
 L 57.6 116.623916 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
    </g>
-   <g id="LineCollection_10">
-    <path clip-path="url(#p782ac110bd)" d="M 191.008237 307.584 
+   <g id="PathCollection_30">
+    <path d="M 191.008237 307.584 
 L 189.902174 306.88503 
 L 187.984752 305.747508 
 L 187.261702 305.347765 
@@ -16962,8 +17142,8 @@ L 142.201336 305.347765
 L 141.966604 305.475108 
 L 140.049181 306.593563 
 L 138.457961 307.584 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 343.296 114.002847 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
+    <path d="M 343.296 114.002847 
 L 341.964805 115.267765 
 L 341.378577 115.839091 
 L 339.691964 117.504 
@@ -17028,30 +17208,73 @@ L 339.649977 193.536
 L 341.378577 195.243254 
 L 341.92107 195.772235 
 L 343.296 197.079271 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 157.305987 220.705982 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
+    <path d="M 157.305987 220.705982 
+L 159.223409 221.05723 
 L 161.140832 221.305089 
+L 163.058255 221.448845 
 L 164.975678 221.488085 
+L 166.893101 221.422694 
 L 168.810523 221.252861 
+L 170.727946 220.979076 
 L 172.645369 220.602128 
+L 173.571226 220.370824 
+L 174.562792 220.129634 
 L 176.480215 219.565198 
+L 178.397638 218.904347 
+L 180.31506 218.148985 
 L 180.347626 218.134588 
+L 182.232483 217.319107 
 L 184.149906 216.401569 
+L 185.11203 215.898353 
+L 186.067329 215.406993 
 L 187.984752 214.339695 
+L 189.11914 213.662118 
+L 189.902174 213.199982 
+L 191.819597 211.994548 
 L 192.674283 211.425882 
+L 193.73702 210.723986 
+L 195.654443 209.391444 
 L 195.931841 209.189647 
+L 197.571866 207.999953 
+L 198.956674 206.953412 
 L 199.489289 206.550216 
+L 201.406711 205.044653 
+L 201.810442 204.717176 
+L 203.324134 203.481703 
 L 204.515611 202.480941 
+L 205.241557 201.864555 
+L 207.102114 200.244706 
 L 207.15898 200.194423 
+L 209.076403 198.461869 
+L 209.569059 198.008471 
+L 210.993826 196.670251 
 L 211.935513 195.772235 
+L 212.911248 194.817796 
+L 214.20587 193.536 
+L 214.828671 192.900126 
 L 216.38191 191.299765 
+L 216.746094 190.91063 
+L 218.464126 189.063529 
+L 218.663517 188.839863 
+L 220.451798 186.827294 
 L 220.58094 186.674646 
+L 222.343004 184.591059 
+L 222.498362 184.396699 
+L 224.134599 182.354824 
 L 224.415785 181.980533 
+L 225.822155 180.118588 
+L 226.333208 179.390124 
 L 227.39984 177.882353 
+L 228.250631 176.573448 
+L 228.860259 175.646118 
+L 230.168054 173.453146 
 L 230.194228 173.409882 
+L 231.402526 171.173647 
 L 232.085477 169.730463 
 L 232.467396 168.937412 
 L 233.386756 166.701176 
+L 234.002899 164.882569 
 L 234.147359 164.464941 
 L 234.752274 162.228706 
 L 235.185844 159.992471 
@@ -17060,81 +17283,204 @@ L 235.531901 155.52
 L 235.442824 153.283765 
 L 235.179283 151.047529 
 L 234.742469 148.811294 
+L 234.134356 146.575059 
 L 234.002899 146.19656 
 L 233.370944 144.338824 
+L 232.44858 142.102588 
 L 232.085477 141.350647 
 L 231.381167 139.866353 
+L 230.170097 137.630118 
+L 230.168054 137.626747 
 L 228.833848 135.393882 
+L 228.250631 134.508238 
+L 227.371248 133.157647 
+L 226.333208 131.692469 
 L 225.791471 130.921412 
+L 224.415785 129.102449 
+L 224.101903 128.685176 
+L 222.498362 126.68637 
 L 222.308363 126.448941 
+L 220.58094 124.408333 
+L 220.415274 124.212706 
+L 218.663517 122.242932 
 L 218.425773 121.976471 
+L 216.746094 120.171939 
+L 216.341771 119.740235 
+L 214.828671 118.18221 
 L 214.163986 117.504 
-L 209.076403 112.619946 
-L 204.465761 108.559059 
-L 201.406711 106.037333 
+L 212.911248 116.264325 
+L 211.891916 115.267765 
+L 210.993826 114.411692 
+L 209.523773 113.031529 
+L 209.076403 112.619946 
+L 207.15898 110.887975 
+L 207.054131 110.795294 
+L 205.241557 109.217609 
+L 204.465761 108.559059 
+L 203.324134 107.600321 
+L 201.758705 106.322824 
+L 201.406711 106.037333 
+L 199.489289 104.531882 
+L 198.901021 104.086588 
 L 197.571866 103.082094 
+L 195.873897 101.850353 
+L 195.654443 101.690692 
+L 193.73702 100.358022 
 L 192.610788 99.614118 
+L 191.819597 99.087602 
 L 189.902174 97.881948 
+L 189.048251 97.377882 
+L 187.984752 96.742476 
 L 186.067329 95.67489 
+L 185.030884 95.141647 
+L 184.149906 94.680707 
 L 182.232483 93.762837 
+L 180.31506 92.932968 
+L 180.24361 92.905412 
 L 178.397638 92.177868 
+L 176.480215 91.516716 
 L 174.562792 90.952022 
+L 173.400497 90.669176 
+L 172.645369 90.48042 
 L 170.727946 90.103264 
+L 168.810523 89.829327 
 L 166.893101 89.659401 
+L 164.975678 89.593974 
 L 163.058255 89.633235 
+L 161.140832 89.777071 
 L 159.223409 90.025067 
+L 157.305987 90.376509 
+L 156.069593 90.669176 
 L 155.388564 90.826118 
+L 153.471141 91.366431 
 L 151.553718 92.003636 
+L 149.636295 92.735896 
+L 149.242414 92.905412 
 L 147.718872 93.547022 
+L 145.80145 94.44313 
+L 144.43775 95.141647 
 L 143.884027 95.420548 
+L 141.966604 96.468142 
+L 140.417986 97.377882 
 L 140.049181 97.591936 
+L 138.131758 98.779455 
+L 136.860332 99.614118 
 L 136.214336 100.035047 
+L 134.296913 101.351529 
+L 133.603719 101.850353 
 L 132.37949 102.72875 
+L 130.565072 104.086588 
+L 130.462067 104.163797 
+L 128.544644 105.656138 
 L 127.71626 106.322824 
+L 126.627221 107.20469 
+L 125.003455 108.559059 
 L 124.709799 108.806641 
+L 122.792376 110.465708 
+L 122.41993 110.795294 
+L 120.874953 112.18375 
 L 119.949502 113.031529 
+L 118.95753 113.958862 
+L 117.579564 115.267765 
+L 117.040107 115.793325 
+L 115.306655 117.504 
 L 115.122685 117.6912 
+L 113.205262 119.661606 
+L 113.129273 119.740235 
+L 111.287839 121.716036 
 L 111.046082 121.976471 
+L 109.370416 123.859655 
+L 109.056615 124.212706 
+L 107.452993 126.107401 
 L 107.163406 126.448941 
+L 105.53557 128.479855 
+L 105.370227 128.685176 
+L 103.681703 130.921412 
 L 103.618148 131.012017 
+L 102.101613 133.157647 
+L 101.700725 133.774802 
 L 100.637838 135.393882 
+L 99.783302 136.828452 
+L 99.299232 137.630118 
 L 98.092855 139.866353 
+L 97.865879 140.346553 
 L 97.021868 142.102588 
+L 96.103806 144.338824 
 L 95.948456 144.797641 
 L 95.334529 146.575059 
 L 94.729751 148.811294 
 L 94.295333 151.047529 
+L 94.033238 153.283765 
 L 94.031034 153.339416 
 L 93.942615 155.52 
+L 94.029943 157.756235 
 L 94.031034 157.765438 
 L 94.288808 159.992471 
 L 94.72 162.228706 
 L 95.321597 164.464941 
+L 95.948456 166.287167 
 L 96.088068 166.701176 
 L 97.003139 168.937412 
+L 97.865879 170.737279 
 L 98.071579 171.173647 
+L 99.275195 173.409882 
 L 99.783302 174.253013 
+L 100.611508 175.646118 
 L 101.700725 177.308134 
+L 102.073088 177.882353 
+L 103.618148 180.071585 
 L 103.651069 180.118588 
+L 105.337406 182.354824 
+L 105.53557 182.601181 
 L 107.128709 184.591059 
+L 107.452993 184.973898 
+L 109.020112 186.827294 
+L 109.370416 187.221752 
+L 111.007832 189.063529 
 L 111.287839 189.365392 
+L 113.089331 191.299765 
+L 113.205262 191.4198 
+L 115.122685 193.391446 
 L 115.264656 193.536 
+L 117.040107 195.289044 
+L 117.535814 195.772235 
+L 118.95753 197.123275 
 L 119.904022 198.008471 
+L 120.874953 198.898212 
+L 122.372734 200.244706 
+L 122.792376 200.616149 
 L 124.709799 202.275625 
+L 124.953264 202.480941 
+L 126.627221 203.877398 
+L 127.66412 204.717176 
 L 128.544644 205.425876 
+L 130.462067 206.918327 
+L 130.50887 206.953412 
+L 132.37949 208.353293 
 L 133.545137 209.189647 
+L 134.296913 209.730575 
+L 136.214336 211.04693 
 L 136.795967 211.425882 
+L 138.131758 212.302639 
+L 140.049181 213.489941 
 L 140.345888 213.662118 
+L 141.966604 214.613955 
+L 143.884027 215.661266 
 L 144.354862 215.898353 
+L 145.80145 216.63906 
 L 147.718872 217.534845 
+L 149.143513 218.134588 
+L 149.636295 218.346572 
 L 151.553718 219.078499 
+L 153.471141 219.715414 
 L 155.388564 220.255482 
+L 155.889303 220.370824 
 L 157.305987 220.705982 
-L 157.305987 220.705982 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
+z
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
    </g>
-   <g id="LineCollection_11">
-    <path clip-path="url(#p782ac110bd)" d="M 177.022899 307.584 
+   <g id="PathCollection_31">
+    <path d="M 177.022899 307.584 
 L 176.480215 307.405216 
 L 174.562792 306.86569 
 L 172.645369 306.419879 
@@ -17149,8 +17495,8 @@ L 157.305987 306.323226
 L 155.388564 306.745397 
 L 153.471141 307.261629 
 L 152.455838 307.584 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 343.296 121.3471 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
+    <path d="M 343.296 121.3471 
 L 342.692 121.976471 
 L 341.378577 123.404247 
 L 340.644326 124.212706 
@@ -17201,28 +17547,65 @@ L 340.607026 186.827294
 L 341.378577 187.677552 
 L 342.652456 189.063529 
 L 343.296 189.734601 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 157.305987 213.760046 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
+    <path d="M 157.305987 213.760046 
+L 159.223409 214.089172 
 L 161.140832 214.32142 
+L 163.058255 214.456122 
 L 164.975678 214.49289 
+L 166.893101 214.431618 
 L 168.810523 214.272481 
+L 170.727946 214.01594 
+L 172.645369 213.662733 
 L 172.647998 213.662118 
+L 174.562792 213.219222 
 L 176.480215 212.682489 
+L 178.397638 212.054073 
+L 180.074554 211.425882 
 L 180.31506 211.336448 
+L 182.232483 210.536284 
 L 184.149906 209.651271 
+L 185.064944 209.189647 
+L 186.067329 208.685386 
 L 187.984752 207.641517 
+L 189.162623 206.953412 
+L 189.902174 206.520637 
 L 191.819597 205.325415 
+L 192.741571 204.717176 
+L 193.73702 204.056357 
+L 195.654443 202.716999 
 L 195.977284 202.480941 
+L 197.571866 201.302308 
+L 198.9453 200.244706 
 L 199.489289 199.819257 
+L 201.406711 198.263819 
+L 201.711424 198.008471 
 L 203.324134 196.62921 
+L 204.297844 195.772235 
+L 205.241557 194.920278 
+L 206.736973 193.536 
 L 207.15898 193.133166 
+L 209.038542 191.299765 
+L 209.076403 191.261466 
+L 210.993826 189.285929 
 L 211.20643 189.063529 
+L 212.911248 187.20283 
+L 213.251181 186.827294 
+L 214.828671 184.996938 
 L 215.175304 184.591059 
+L 216.746094 182.645129 
+L 216.978992 182.354824 
+L 218.660873 180.118588 
 L 218.663517 180.114804 
+L 220.217931 177.882353 
+L 220.58094 177.314943 
 L 221.648192 175.646118 
+L 222.498362 174.180658 
 L 222.946642 173.409882 
+L 224.10822 171.173647 
 L 224.415785 170.497572 
 L 225.129393 168.937412 
+L 226.002576 166.701176 
 L 226.333208 165.673676 
 L 226.725415 164.464941 
 L 227.292856 162.228706 
@@ -17232,79 +17615,183 @@ L 228.024186 155.52
 L 227.940627 153.283765 
 L 227.693413 151.047529 
 L 227.283659 148.811294 
+L 226.713217 146.575059 
 L 226.333208 145.408652 
 L 225.987558 144.338824 
+L 225.111522 142.102588 
 L 224.415785 140.585612 
 L 224.087688 139.866353 
+L 222.923444 137.630118 
 L 222.498362 136.900664 
+L 221.622499 135.393882 
 L 220.58094 133.768005 
+L 220.189789 133.157647 
+L 218.663517 130.968863 
 L 218.63032 130.921412 
+L 216.946258 128.685176 
+L 216.746094 128.435956 
 L 215.140322 126.448941 
+L 214.828671 126.084384 
+L 213.213974 124.212706 
 L 212.911248 123.878561 
+L 211.167011 121.976471 
+L 210.993826 121.79544 
+L 209.076403 119.821362 
 L 208.996145 119.740235 
+L 207.15898 117.949317 
+L 206.692175 117.504 
+L 205.241557 116.161898 
 L 204.250605 115.267765 
+L 203.324134 114.452715 
+L 201.661689 113.031529 
 L 201.406711 112.81793 
+L 199.489289 111.263015 
+L 198.891049 110.795294 
 L 197.571866 109.779719 
+L 195.92002 108.559059 
+L 195.654443 108.364904 
 L 193.73702 107.025758 
+L 192.677959 106.322824 
+L 191.819597 105.756592 
 L 189.902174 104.561458 
+L 189.090629 104.086588 
+L 187.984752 103.440534 
 L 186.067329 102.396654 
+L 184.981389 101.850353 
+L 184.149906 101.430841 
 L 182.232483 100.545742 
+L 180.31506 99.7455 
+L 179.96178 99.614118 
 L 178.397638 99.028066 
+L 176.480215 98.399536 
 L 174.562792 97.862705 
+L 172.645369 97.41912 
+L 172.418847 97.377882 
 L 170.727946 97.066318 
+L 168.810523 96.809708 
 L 166.893101 96.650529 
+L 164.975678 96.58924 
 L 163.058255 96.626017 
+L 161.140832 96.760756 
 L 159.223409 96.993067 
+L 157.305987 97.322281 
+L 157.055238 97.377882 
 L 155.388564 97.743012 
+L 153.471141 98.256666 
 L 151.553718 98.862432 
+L 149.636295 99.558562 
+L 149.500508 99.614118 
 L 147.718872 100.337632 
+L 145.80145 101.201746 
+L 144.488307 101.850353 
 L 143.884027 102.14796 
+L 141.966604 103.172292 
+L 140.374886 104.086588 
 L 140.049181 104.273977 
+L 138.131758 105.451134 
+L 136.79224 106.322824 
 L 136.214336 106.701214 
+L 134.296913 108.024092 
+L 133.557088 108.559059 
 L 132.37949 109.419776 
+L 130.575142 110.795294 
+L 130.462067 110.882836 
+L 128.544644 112.424211 
 L 127.814031 113.031529 
+L 126.627221 114.038269 
+L 125.220084 115.267765 
 L 124.709799 115.725063 
+L 122.792376 117.48855 
+L 122.77595 117.504 
+L 120.874953 119.347727 
 L 120.477931 119.740235 
+L 118.95753 121.298866 
+L 118.307013 121.976471 
+L 117.040107 123.353199 
 L 116.259279 124.212706 
+L 115.122685 125.526579 
+L 114.332602 126.448941 
+L 113.205262 127.841147 
 L 112.526509 128.685176 
+L 111.287839 130.327898 
+L 110.84209 130.921412 
+L 109.370416 133.030748 
 L 109.281976 133.157647 
+L 107.849666 135.393882 
+L 107.452993 136.076414 
 L 106.5484 137.630118 
+L 105.53557 139.57727 
 L 105.384496 139.866353 
 L 104.360548 142.102588 
+L 103.618148 144.000777 
 L 103.484925 144.338824 
 L 102.758091 146.575059 
 L 102.188995 148.811294 
+L 101.780208 151.047529 
 L 101.700725 151.76821 
 L 101.5318 153.283765 
 L 101.447553 155.52 
 L 101.528691 157.756235 
+L 101.700725 159.319099 
 L 101.774068 159.992471 
 L 102.17982 162.228706 
 L 102.745922 164.464941 
+L 103.469817 166.701176 
 L 103.618148 167.078789 
 L 104.342706 168.937412 
+L 105.363885 171.173647 
 L 105.53557 171.502922 
+L 106.525223 173.409882 
 L 107.452993 175.006531 
 L 107.823977 175.646118 
+L 109.25385 177.882353 
+L 109.370416 178.049858 
 L 110.81162 180.118588 
+L 111.287839 180.753496 
+L 112.493734 182.354824 
+L 113.205262 183.240612 
 L 114.29755 184.591059 
+L 115.122685 185.555294 
+L 116.221968 186.827294 
+L 117.040107 187.728644 
 L 118.267456 189.063529 
+L 118.95753 189.78287 
+L 120.436125 191.299765 
 L 120.874953 191.733876 
+L 122.731887 193.536 
+L 122.792376 193.592927 
+L 124.709799 195.357342 
 L 125.172522 195.772235 
+L 126.627221 197.043834 
+L 127.76391 198.008471 
 L 128.544644 198.657671 
+L 130.462067 200.199564 
+L 130.520356 200.244706 
 L 132.37949 201.662339 
+L 133.499192 202.480941 
+L 134.296913 203.057864 
+L 136.214336 204.380953 
 L 136.727757 204.717176 
+L 138.131758 205.630896 
+L 140.049181 206.808139 
 L 140.301664 206.953412 
+L 141.966604 207.909757 
+L 143.884027 208.934077 
 L 144.402959 209.189647 
+L 145.80145 209.880343 
 L 147.718872 210.744374 
+L 149.397231 211.425882 
+L 149.636295 211.523675 
 L 151.553718 212.219678 
+L 153.471141 212.825332 
 L 155.388564 213.338893 
+L 156.864229 213.662118 
 L 157.305987 213.760046 
-L 157.305987 213.760046 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
+z
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
    </g>
-   <g id="LineCollection_12">
-    <path clip-path="url(#p782ac110bd)" d="M 343.296 129.87189 
+   <g id="PathCollection_32">
+    <path d="M 343.296 129.87189 
 L 342.481107 130.921412 
 L 341.378577 132.449943 
 L 340.874601 133.157647 
@@ -17339,109 +17826,225 @@ L 340.845862 177.882353
 L 341.378577 178.631525 
 L 342.449606 180.118588 
 L 343.296 181.210094 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 157.305987 207.074593 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
+    <path d="M 157.305987 207.074593 
+L 159.223409 207.396493 
 L 161.140832 207.623643 
+L 163.058255 207.755389 
 L 164.975678 207.791349 
+L 166.893101 207.731422 
 L 168.810523 207.575779 
+L 170.727946 207.324869 
+L 172.645369 206.979416 
 L 172.758948 206.953412 
+L 174.562792 206.539714 
 L 176.480215 206.007528 
+L 178.397638 205.384436 
+L 180.194064 204.717176 
 L 180.31506 204.671953 
+L 182.232483 203.867695 
 L 184.149906 202.978154 
+L 185.130473 202.480941 
+L 186.067329 202.00072 
 L 187.984752 200.937083 
+L 189.147909 200.244706 
+L 189.902174 199.788699 
 L 191.819597 198.553882 
+L 192.619826 198.008471 
+L 193.73702 197.231355 
+L 195.654443 195.827925 
 L 195.727129 195.772235 
+L 197.571866 194.322476 
+L 198.532463 193.536 
 L 199.489289 192.728166 
+L 201.120399 191.299765 
+L 201.406711 191.039745 
+L 203.324134 189.24091 
 L 203.507866 189.063529 
+L 205.241557 187.317178 
+L 205.715853 186.827294 
 L 207.15898 185.261775 
+L 207.764029 184.591059 
+L 209.076403 183.051886 
 L 209.659947 182.354824 
+L 210.993826 180.655224 
 L 211.408642 180.118588 
+L 212.911248 178.02571 
 L 213.012935 177.882353 
+L 214.470389 175.646118 
 L 214.828671 175.040118 
+L 215.783763 173.409882 
 L 216.746094 171.570721 
 L 216.952583 171.173647 
+L 217.971064 168.937412 
 L 218.663517 167.156438 
 L 218.839948 166.701176 
 L 219.554127 164.464941 
 L 220.112631 162.228706 
+L 220.512937 159.992471 
 L 220.58094 159.359638 
 L 220.753171 157.756235 
 L 220.832349 155.52 
 L 220.750137 153.283765 
+L 220.58094 151.728174 
 L 220.50688 151.047529 
 L 220.103579 148.811294 
 L 219.542122 146.575059 
+L 218.825043 144.338824 
 L 218.663517 143.92338 
 L 217.953268 142.102588 
+L 216.932027 139.866353 
 L 216.746094 139.509626 
+L 215.760395 137.630118 
 L 214.828671 136.042893 
 L 214.444204 135.393882 
+L 212.984266 133.157647 
 L 212.911248 133.05486 
+L 211.37724 130.921412 
 L 210.993826 130.426042 
+L 209.625789 128.685176 
 L 209.076403 128.02966 
+L 207.727077 126.448941 
+L 207.15898 125.819809 
 L 205.676057 124.212706 
+L 205.241557 123.764312 
+L 203.465154 121.976471 
 L 203.324134 121.840426 
+L 201.406711 120.04292 
+L 201.073174 119.740235 
 L 199.489289 118.354062 
+L 198.481814 117.504 
+L 197.571866 116.759385 
+L 195.672865 115.267765 
 L 195.654443 115.253657 
+L 193.73702 113.850829 
+L 192.558677 113.031529 
 L 191.819597 112.527965 
+L 189.902174 111.293563 
+L 189.077729 110.795294 
 L 187.984752 110.144852 
+L 186.067329 109.081478 
+L 185.047898 108.559059 
 L 184.149906 108.10379 
+L 182.232483 107.21439 
+L 180.31506 106.410261 
 L 180.081083 106.322824 
+L 178.397638 105.697576 
 L 176.480215 105.07453 
+L 174.562792 104.542383 
+L 172.645369 104.102669 
 L 172.55626 104.086588 
+L 170.727946 103.757185 
 L 168.810523 103.506273 
+L 166.893101 103.350628 
 L 164.975678 103.2907 
+L 163.058255 103.326661 
 L 161.140832 103.458408 
+L 159.223409 103.685561 
 L 157.305987 104.007465 
+L 156.941052 104.086588 
+L 155.388564 104.423735 
 L 153.471141 104.932907 
+L 151.553718 105.533386 
+L 149.636295 106.223442 
 L 149.391252 106.322824 
+L 147.718872 107.005269 
 L 145.80145 107.873582 
+L 144.420371 108.559059 
+L 143.884027 108.82814 
 L 141.966604 109.871601 
+L 140.388006 110.795294 
+L 140.049181 110.996636 
 L 138.131758 112.21247 
+L 136.913157 113.031529 
+L 136.214336 113.510851 
 L 134.296913 114.896638 
+L 133.806967 115.267765 
+L 132.37949 116.376788 
 L 130.988412 117.504 
+L 130.462067 117.94377 
+L 128.544644 119.607233 
 L 128.396384 119.740235 
+L 126.627221 121.385944 
+L 126.01091 121.976471 
 L 124.709799 123.277059 
+L 123.797746 124.212706 
+L 122.792376 125.295816 
 L 121.745802 126.448941 
+L 120.874953 127.463946 
+L 119.847048 128.685176 
 L 118.95753 129.812272 
+L 118.096046 130.921412 
+L 117.040107 132.384839 
 L 116.489618 133.157647 
+L 115.122685 135.245685 
 L 115.026619 135.393882 
+L 113.711287 137.630118 
 L 113.205262 138.593067 
 L 112.540759 139.866353 
+L 111.51822 142.102588 
 L 111.287839 142.692443 
 L 110.647369 144.338824 
 L 109.929899 146.575059 
+L 109.370416 148.802216 
 L 109.368138 148.811294 
 L 108.965061 151.047529 
 L 108.721874 153.283765 
 L 108.639677 155.52 
 L 108.71884 157.756235 
 L 108.959007 159.992471 
+L 109.359091 162.228706 
 L 109.370416 162.274076 
 L 109.917887 164.464941 
+L 110.632456 166.701176 
 L 111.287839 168.391398 
 L 111.500402 168.937412 
+L 112.520176 171.173647 
 L 113.205262 172.489384 
 L 113.687872 173.409882 
+L 115.00062 175.646118 
 L 115.122685 175.834743 
+L 116.46087 177.882353 
 L 117.040107 178.696725 
+L 118.064534 180.118588 
 L 118.95753 181.269789 
+L 119.812743 182.354824 
+L 120.874953 183.618241 
 L 121.708662 184.591059 
+L 122.792376 185.786285 
+L 123.757712 186.827294 
 L 124.709799 187.804849 
+L 125.967906 189.063529 
+L 126.627221 189.695728 
 L 128.350313 191.299765 
+L 128.544644 191.474206 
+L 130.462067 193.138716 
 L 130.937263 193.536 
+L 132.37949 194.705274 
+L 133.752105 195.772235 
 L 134.296913 196.185097 
+L 136.214336 197.571479 
+L 136.85117 198.008471 
 L 138.131758 198.869482 
+L 140.049181 200.085725 
+L 140.316629 200.244706 
 L 141.966604 201.210403 
+L 143.884027 202.254121 
+L 144.336023 202.480941 
 L 145.80145 203.208399 
+L 147.718872 204.07685 
+L 149.287786 204.717176 
 L 149.636295 204.858531 
+L 151.553718 205.548637 
 L 153.471141 206.149161 
+L 155.388564 206.658371 
+L 156.747066 206.953412 
 L 157.305987 207.074593 
-L 157.305987 207.074593 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
+z
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
    </g>
-   <g id="LineCollection_13">
-    <path clip-path="url(#p782ac110bd)" d="M 343.296 141.854446 
+   <g id="PathCollection_33">
+    <path d="M 343.296 141.854446 
 L 343.179163 142.102588 
 L 342.279798 144.338824 
 L 341.538055 146.575059 
@@ -17458,75 +18061,145 @@ L 341.525636 164.464941
 L 342.26438 166.701176 
 L 343.160816 168.937412 
 L 343.296 169.225299 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
-    <path clip-path="url(#p782ac110bd)" d="M 157.305987 200.359423 
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
+    <path d="M 157.305987 200.359423 
+L 159.223409 200.68742 
 L 161.140832 200.918871 
+L 163.058255 201.053111 
 L 164.975678 201.089753 
+L 166.893101 201.028691 
 L 168.810523 200.870101 
+L 170.727946 200.614439 
+L 172.645369 200.262444 
 L 172.721404 200.244706 
+L 174.562792 199.808407 
 L 176.480215 199.258591 
+L 178.397638 198.614857 
+L 179.977832 198.008471 
 L 180.31506 197.876399 
+L 182.232483 197.033668 
 L 184.149906 196.101573 
+L 184.769751 195.772235 
 L 186.067329 195.065053 
+L 187.984752 193.934156 
+L 188.613852 193.536 
 L 189.902174 192.695177 
+L 191.819597 191.362164 
+L 191.904405 191.299765 
 L 193.73702 189.901427 
+L 194.780622 189.063529 
 L 195.654443 188.33152 
+L 197.369859 186.827294 
 L 197.571866 186.641248 
+L 199.489289 184.801516 
 L 199.700759 184.591059 
+L 201.406711 182.794824 
 L 201.81124 182.354824 
+L 203.324134 180.599549 
 L 203.726967 180.118588 
+L 205.241557 178.171635 
 L 205.461028 177.882353 
+L 207.019898 175.646118 
 L 207.15898 175.426178 
+L 208.406732 173.409882 
 L 209.076403 172.198232 
 L 209.632389 171.173647 
+L 210.695172 168.937412 
 L 210.993826 168.201302 
 L 211.593284 166.701176 
 L 212.329701 164.464941 
+L 212.905595 162.228706 
 L 212.911248 162.198081 
 L 213.313465 159.992471 
 L 213.558264 157.756235 
 L 213.638954 155.52 
 L 213.555172 153.283765 
 L 213.307294 151.047529 
+L 212.911248 148.891884 
 L 212.896262 148.811294 
 L 212.317321 146.575059 
+L 211.577915 144.338824 
 L 210.993826 142.88192 
 L 210.676603 142.102588 
+L 209.610939 139.866353 
 L 209.076403 138.883552 
 L 208.382049 137.630118 
+L 207.15898 135.657591 
 L 206.991891 135.393882 
+L 205.430365 133.157647 
 L 205.241557 132.909151 
+L 203.692942 130.921412 
 L 203.324134 130.481644 
+L 201.773726 128.685176 
 L 201.406711 128.286431 
+L 199.6596 126.448941 
 L 199.489289 126.279613 
+L 197.571866 124.441698 
+L 197.322983 124.212706 
 L 195.654443 122.750839 
+L 194.729263 121.976471 
 L 193.73702 121.180396 
+L 191.848197 119.740235 
+L 191.819597 119.719206 
 L 189.902174 118.38703 
+L 188.54833 117.504 
+L 187.984752 117.1475 
 L 186.067329 116.017199 
+L 184.691502 115.267765 
+L 184.149906 114.980125 
 L 182.232483 114.048431 
+L 180.31506 113.206061 
+L 179.869225 113.031529 
 L 178.397638 112.46701 
+L 176.480215 111.823493 
 L 174.562792 111.273861 
+L 172.645369 110.819699 
+L 172.514431 110.795294 
 L 170.727946 110.467417 
+L 168.810523 110.211819 
 L 166.893101 110.053268 
+L 164.975678 109.99222 
 L 163.058255 110.028853 
+L 161.140832 110.16306 
 L 159.223409 110.394455 
+L 157.305987 110.72237 
+L 156.975811 110.795294 
 L 155.388564 111.151314 
+L 153.471141 111.677216 
 L 151.553718 112.297425 
+L 149.636295 113.010154 
+L 149.585268 113.031529 
 L 147.718872 113.829365 
+L 145.80145 114.73897 
+L 144.784415 115.267765 
 L 143.884027 115.747916 
+L 141.966604 116.85705 
+L 140.926429 117.504 
 L 140.049181 118.066584 
+L 138.131758 119.378722 
+L 137.633372 119.740235 
 L 136.214336 120.807576 
+L 134.739486 121.976471 
 L 134.296913 122.342401 
+L 132.37949 124.004005 
 L 132.148586 124.212706 
+L 130.462067 125.813508 
+L 129.817329 126.448941 
 L 128.544644 127.775806 
+L 127.701122 128.685176 
 L 126.627221 129.919901 
+L 125.781563 130.921412 
 L 124.709799 132.287734 
+L 124.044901 133.157647 
 L 122.792376 134.940749 
 L 122.481149 135.393882 
+L 121.087485 137.630118 
 L 120.874953 138.011827 
 L 119.861962 139.866353 
+L 118.95753 141.756135 
 L 118.794347 142.102588 
 L 117.894667 144.338824 
+L 117.152665 146.575059 
 L 117.040107 147.008307 
 L 116.577683 148.811294 
 L 116.165702 151.047529 
@@ -17535,88 +18208,165 @@ L 115.83313 155.52
 L 115.914042 157.756235 
 L 116.159514 159.992471 
 L 116.568436 162.228706 
+L 117.040107 164.077473 
 L 117.140242 164.464941 
 L 117.879244 166.701176 
+L 118.775993 168.937412 
 L 118.95753 169.323877 
 L 119.84042 171.173647 
+L 120.874953 173.071957 
 L 121.062676 173.409882 
+L 122.453602 175.646118 
 L 122.792376 176.1402 
+L 124.014055 177.882353 
 L 124.709799 178.793975 
+L 125.747306 180.118588 
 L 126.627221 181.162021 
+L 127.663317 182.354824 
 L 128.544644 183.306028 
+L 129.775809 184.591059 
 L 130.462067 185.268082 
+L 132.103147 186.827294 
 L 132.37949 187.077279 
+L 134.296913 188.740308 
+L 134.687496 189.063529 
 L 136.214336 190.274523 
+L 137.576394 191.299765 
 L 138.131758 191.702862 
+L 140.049181 193.015824 
+L 140.85979 193.536 
 L 141.966604 194.224759 
+L 143.884027 195.334477 
+L 144.704487 195.772235 
 L 145.80145 196.342832 
+L 147.718872 197.252828 
+L 149.485807 198.008471 
 L 149.636295 198.07153 
+L 151.553718 198.784499 
 L 153.471141 199.404916 
+L 155.388564 199.930995 
+L 156.786712 200.244706 
 L 157.305987 200.359423 
-L 157.305987 200.359423 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
+z
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
    </g>
-   <g id="LineCollection_14">
-    <path clip-path="url(#p782ac110bd)" d="M 159.223409 193.668705 
+   <g id="PathCollection_34">
+    <path d="M 159.223409 193.668705 
+L 161.140832 193.914793 
 L 163.058255 194.057521 
+L 164.975678 194.09648 
 L 166.893101 194.031557 
+L 168.810523 193.862938 
 L 170.727946 193.59111 
+L 171.010291 193.536 
 L 172.645369 193.206896 
+L 174.562792 192.716453 
 L 176.480215 192.122914 
+L 178.397638 191.427988 
 L 178.707163 191.299765 
+L 180.31506 190.609003 
 L 182.232483 189.684576 
+L 183.397142 189.063529 
 L 184.149906 188.644715 
+L 186.067329 187.478716 
+L 187.057193 186.827294 
 L 187.984752 186.186174 
+L 189.902174 184.764026 
 L 190.121102 184.591059 
+L 191.819597 183.171314 
 L 192.742551 182.354824 
+L 193.73702 181.416408 
+L 195.044079 180.118588 
 L 195.654443 179.466084 
+L 197.069707 177.882353 
 L 197.571866 177.270778 
+L 198.852344 175.646118 
 L 199.489289 174.755244 
+L 200.416645 173.409882 
 L 201.406711 171.801658 
 L 201.780975 171.173647 
+L 202.948157 168.937412 
 L 203.324134 168.093606 
 L 203.927031 166.701176 
 L 204.724956 164.464941 
+L 205.241557 162.613577 
 L 205.346293 162.228706 
 L 205.782471 159.992471 
 L 206.044304 157.756235 
 L 206.130609 155.52 
 L 206.040996 153.283765 
 L 205.775871 151.047529 
+L 205.33643 148.811294 
 L 205.241557 148.464501 
 L 204.711542 146.575059 
+L 203.910378 144.338824 
 L 203.324134 142.989265 
 L 202.927764 142.102588 
+L 201.757418 139.866353 
 L 201.406711 139.279218 
+L 200.389151 137.630118 
 L 199.489289 136.327208 
+L 198.820679 135.393882 
 L 197.571866 133.812094 
+L 197.033589 133.157647 
 L 195.654443 131.616621 
+L 195.003166 130.921412 
 L 193.73702 129.665843 
+L 192.696428 128.685176 
 L 191.819597 127.910367 
+L 190.069256 126.448941 
 L 189.902174 126.317066 
+L 187.984752 124.896322 
+L 186.994733 124.212706 
 L 186.067329 123.602912 
+L 184.149906 122.437913 
+L 183.319813 121.976471 
 L 182.232483 121.397087 
+L 180.31506 120.473343 
+L 178.607332 119.740235 
 L 178.397638 119.653422 
+L 176.480215 118.958934 
 L 174.562792 118.365767 
+L 172.645369 117.875633 
+L 170.797834 117.504 
 L 170.727946 117.490366 
+L 168.810523 117.218681 
 L 166.893101 117.050151 
+L 164.975678 116.985261 
 L 163.058255 117.0242 
+L 161.140832 117.166854 
 L 159.223409 117.412812 
+L 158.721776 117.504 
 L 157.305987 117.76937 
+L 155.388564 118.233514 
 L 153.471141 118.801071 
+L 151.553718 119.470406 
 L 150.881085 119.740235 
+L 149.636295 120.258031 
 L 147.718872 121.156859 
+L 146.143352 121.976471 
 L 145.80145 122.162025 
+L 143.884027 123.302549 
+L 142.4734 124.212706 
 L 141.966604 124.556099 
+L 140.049181 125.953029 
 L 139.411282 126.448941 
+L 138.131758 127.501194 
+L 136.773519 128.685176 
 L 136.214336 129.205034 
+L 134.462215 130.921412 
 L 134.296913 131.095721 
+L 132.431243 133.157647 
 L 132.37949 133.219883 
+L 130.646206 135.393882 
 L 130.462067 135.648415 
+L 129.081369 137.630118 
 L 128.544644 138.49238 
 L 127.717558 139.866353 
+L 126.627221 141.933618 
 L 126.540701 142.102588 
 L 125.562639 144.338824 
+L 124.755992 146.575059 
 L 124.709799 146.738613 
 L 124.139395 148.811294 
 L 123.697338 151.047529 
@@ -17625,27 +18375,44 @@ L 123.340487 155.52
 L 123.427306 157.756235 
 L 123.690698 159.992471 
 L 124.129473 162.228706 
+L 124.709799 164.348593 
 L 124.742487 164.464941 
 L 125.545872 166.701176 
+L 126.520748 168.937412 
 L 126.627221 169.145912 
+L 127.693817 171.173647 
 L 128.544644 172.590301 
 L 129.053633 173.409882 
+L 130.462067 175.435372 
 L 130.614229 175.646118 
+L 132.37949 177.863999 
 L 132.394726 177.882353 
+L 134.296913 179.987758 
 L 134.420799 180.118588 
+L 136.214336 181.877815 
 L 136.726764 182.354824 
+L 138.131758 183.580951 
+L 139.358645 184.591059 
 L 140.049181 185.128423 
+L 141.966604 186.526734 
 L 142.409747 186.827294 
+L 143.884027 187.779337 
+L 145.80145 188.920839 
 L 146.064145 189.063529 
+L 147.718872 189.924982 
 L 149.636295 190.824474 
+L 150.778057 191.299765 
 L 151.553718 191.61112 
+L 153.471141 192.280875 
 L 155.388564 192.84879 
+L 157.305987 193.313226 
+L 158.493773 193.536 
 L 159.223409 193.668705 
-L 159.223409 193.668705 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
+z
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
    </g>
-   <g id="LineCollection_15">
-    <path clip-path="url(#p782ac110bd)" d="M 155.388564 184.938597 
+   <g id="PathCollection_35">
+    <path d="M 155.388564 184.938597 
 L 157.305987 185.466403 
 L 159.223409 185.87509 
 L 161.140832 186.163482 
@@ -17770,10 +18537,11 @@ L 151.553718 183.470645
 L 153.471141 184.275922 
 L 154.356062 184.591059 
 L 155.388564 184.938597 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
+z
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
    </g>
-   <g id="LineCollection_16">
-    <path clip-path="url(#p782ac110bd)" d="M 157.305987 175.717195 
+   <g id="PathCollection_36">
+    <path d="M 157.305987 175.717195 
 L 159.223409 176.257632 
 L 161.140832 176.638993 
 L 163.058255 176.86018 
@@ -17860,466 +18628,482 @@ L 153.471141 174.014249
 L 155.388564 174.955072 
 L 157.110722 175.646118 
 L 157.305987 175.717195 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
+z
+" clip-path="url(#pd7e07e7879)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
    </g>
-   <g id="LineCollection_17"/>
+   <g id="PathCollection_37"/>
    <g id="patch_3">
     <path d="M 57.6 307.584 
 L 57.6 41.472 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="patch_4">
     <path d="M 343.296 307.584 
 L 343.296 41.472 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="patch_5">
     <path d="M 57.6 307.584 
 L 343.296 307.584 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="patch_6">
     <path d="M 57.6 41.472 
 L 343.296 41.472 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
   </g>
   <g id="axes_2">
    <g id="patch_7">
-    <path clip-path="url(#pfed1edc026)" d="M 367.2 307.584 
-L 361.152 295.488 
+    <path d="M 361.152 295.488 
+L 374.4576 295.488 
+L 374.4576 53.568 
 L 361.152 53.568 
-L 367.2 41.472 
-L 367.2 41.472 
-L 373.248 53.568 
-L 373.248 295.488 
-L 367.2 307.584 
 z
-" style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:miter;stroke-width:0.01;"/>
+" style="fill: #ffffff"/>
    </g>
-   <g id="QuadMesh_1">
-    <path clip-path="url(#pfed1edc026)" d="M 367.2 307.584 
-L 367.2 307.584 
-L 373.248 295.488 
+   <g id="patch_8">
+    <path clip-path="url(#p1451b0d78d)" style="fill: #ffffff; stroke: #ffffff; stroke-width: 0.01; stroke-linejoin: miter"/>
+   </g>
+   <g id="patch_9">
+    <path d="M 367.8048 307.584 
+L 374.4576 295.488 
 L 361.152 295.488 
-L 367.2 307.584 
-" style="fill:#67001f;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 361.152 295.488 
-L 373.248 295.488 
-L 373.248 282.048 
+" style="fill: #67001f"/>
+   </g>
+   <g id="patch_10">
+    <path d="M 367.8048 41.472 
+L 374.4576 53.568 
+L 361.152 53.568 
+" style="fill: #053061"/>
+   </g>
+   <g id="QuadMesh_1">
+    <path d="M 361.152 295.488 
+L 374.4576 295.488 
+L 374.4576 282.048 
 L 361.152 282.048 
 L 361.152 295.488 
-" style="fill:#67001f;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 361.152 282.048 
-L 373.248 282.048 
-L 373.248 268.608 
+" clip-path="url(#p1451b0d78d)" style="fill: #67001f"/>
+    <path d="M 361.152 282.048 
+L 374.4576 282.048 
+L 374.4576 268.608 
 L 361.152 268.608 
 L 361.152 282.048 
-" style="fill:#67001f;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 361.152 268.608 
-L 373.248 268.608 
-L 373.248 255.168 
+" clip-path="url(#p1451b0d78d)" style="fill: #67001f"/>
+    <path d="M 361.152 268.608 
+L 374.4576 268.608 
+L 374.4576 255.168 
 L 361.152 255.168 
 L 361.152 268.608 
-" style="fill:#67001f;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 361.152 255.168 
-L 373.248 255.168 
-L 373.248 241.728 
+" clip-path="url(#p1451b0d78d)" style="fill: #67001f"/>
+    <path d="M 361.152 255.168 
+L 374.4576 255.168 
+L 374.4576 241.728 
 L 361.152 241.728 
 L 361.152 255.168 
-" style="fill:#67001f;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 361.152 241.728 
-L 373.248 241.728 
-L 373.248 228.288 
+" clip-path="url(#p1451b0d78d)" style="fill: #67001f"/>
+    <path d="M 361.152 241.728 
+L 374.4576 241.728 
+L 374.4576 228.288 
 L 361.152 228.288 
 L 361.152 241.728 
-" style="fill:#67001f;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 361.152 228.288 
-L 373.248 228.288 
-L 373.248 214.848 
+" clip-path="url(#p1451b0d78d)" style="fill: #67001f"/>
+    <path d="M 361.152 228.288 
+L 374.4576 228.288 
+L 374.4576 214.848 
 L 361.152 214.848 
 L 361.152 228.288 
-" style="fill:#67001f;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 361.152 214.848 
-L 373.248 214.848 
-L 373.248 201.408 
+" clip-path="url(#p1451b0d78d)" style="fill: #67001f"/>
+    <path d="M 361.152 214.848 
+L 374.4576 214.848 
+L 374.4576 201.408 
 L 361.152 201.408 
 L 361.152 214.848 
-" style="fill:#a51429;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 361.152 201.408 
-L 373.248 201.408 
-L 373.248 187.968 
+" clip-path="url(#p1451b0d78d)" style="fill: #a51429"/>
+    <path d="M 361.152 201.408 
+L 374.4576 201.408 
+L 374.4576 187.968 
 L 361.152 187.968 
 L 361.152 201.408 
-" style="fill:#e48066;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 361.152 187.968 
-L 373.248 187.968 
-L 373.248 174.528 
+" clip-path="url(#p1451b0d78d)" style="fill: #e48066"/>
+    <path d="M 361.152 187.968 
+L 374.4576 187.968 
+L 374.4576 174.528 
 L 361.152 174.528 
 L 361.152 187.968 
-" style="fill:#fcdfcf;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 361.152 174.528 
-L 373.248 174.528 
-L 373.248 161.088 
+" clip-path="url(#p1451b0d78d)" style="fill: #fcdfcf"/>
+    <path d="M 361.152 174.528 
+L 374.4576 174.528 
+L 374.4576 161.088 
 L 361.152 161.088 
 L 361.152 174.528 
-" style="fill:#d7e8f1;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 361.152 161.088 
-L 373.248 161.088 
-L 373.248 147.648 
+" clip-path="url(#p1451b0d78d)" style="fill: #d7e8f1"/>
+    <path d="M 361.152 161.088 
+L 374.4576 161.088 
+L 374.4576 147.648 
 L 361.152 147.648 
 L 361.152 161.088 
-" style="fill:#6bacd1;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 361.152 147.648 
-L 373.248 147.648 
-L 373.248 134.208 
+" clip-path="url(#p1451b0d78d)" style="fill: #6bacd1"/>
+    <path d="M 361.152 147.648 
+L 374.4576 147.648 
+L 374.4576 134.208 
 L 361.152 134.208 
 L 361.152 147.648 
-" style="fill:#1c5c9f;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 361.152 134.208 
-L 373.248 134.208 
-L 373.248 120.768 
+" clip-path="url(#p1451b0d78d)" style="fill: #1c5c9f"/>
+    <path d="M 361.152 134.208 
+L 374.4576 134.208 
+L 374.4576 120.768 
 L 361.152 120.768 
 L 361.152 134.208 
-" style="fill:#053061;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 361.152 120.768 
-L 373.248 120.768 
-L 373.248 107.328 
+" clip-path="url(#p1451b0d78d)" style="fill: #053061"/>
+    <path d="M 361.152 120.768 
+L 374.4576 120.768 
+L 374.4576 107.328 
 L 361.152 107.328 
 L 361.152 120.768 
-" style="fill:#053061;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 361.152 107.328 
-L 373.248 107.328 
-L 373.248 93.888 
+" clip-path="url(#p1451b0d78d)" style="fill: #053061"/>
+    <path d="M 361.152 107.328 
+L 374.4576 107.328 
+L 374.4576 93.888 
 L 361.152 93.888 
 L 361.152 107.328 
-" style="fill:#053061;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 361.152 93.888 
-L 373.248 93.888 
-L 373.248 80.448 
+" clip-path="url(#p1451b0d78d)" style="fill: #053061"/>
+    <path d="M 361.152 93.888 
+L 374.4576 93.888 
+L 374.4576 80.448 
 L 361.152 80.448 
 L 361.152 93.888 
-" style="fill:#053061;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 361.152 80.448 
-L 373.248 80.448 
-L 373.248 67.008 
+" clip-path="url(#p1451b0d78d)" style="fill: #053061"/>
+    <path d="M 361.152 80.448 
+L 374.4576 80.448 
+L 374.4576 67.008 
 L 361.152 67.008 
 L 361.152 80.448 
-" style="fill:#053061;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 361.152 67.008 
-L 373.248 67.008 
-L 373.248 53.568 
+" clip-path="url(#p1451b0d78d)" style="fill: #053061"/>
+    <path d="M 361.152 67.008 
+L 374.4576 67.008 
+L 374.4576 53.568 
 L 361.152 53.568 
 L 361.152 67.008 
-" style="fill:#053061;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 361.152 53.568 
-L 373.248 53.568 
-L 367.2 41.472 
-L 367.2 41.472 
-L 361.152 53.568 
-" style="fill:#053061;"/>
+" clip-path="url(#p1451b0d78d)" style="fill: #053061"/>
    </g>
-   <g id="matplotlib.axis_3"/>
-   <g id="matplotlib.axis_4">
+   <g id="matplotlib.axis_3">
     <g id="ytick_10">
      <g id="line2d_19">
       <defs>
-       <path d="M 0 0 
+       <path id="m18cb3443cd" d="M 0 0 
 L 3.5 0 
-" id="md8bd0a4895" style="stroke:#000000;stroke-width:0.8;"/>
+" style="stroke: #000000; stroke-width: 0.8"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="373.248" xlink:href="#md8bd0a4895" y="282.048"/>
+       <use xlink:href="#m18cb3443cd" x="374.4576" y="282.048" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_19">
       <!-- −1.6 -->
-      <defs>
-       <path d="M 10.6875 12.40625 
-L 21 12.40625 
-L 21 0 
-L 10.6875 0 
+      <g transform="translate(381.4576 285.847219)scale(0.1 -0.1)">
+       <defs>
+        <path id="DejaVuSans-2e" d="M 684 794 
+L 1344 794 
+L 1344 0 
+L 684 0 
+L 684 794 
 z
-" id="DejaVuSans-46"/>
-       <path d="M 33.015625 40.375 
-Q 26.375 40.375 22.484375 35.828125 
-Q 18.609375 31.296875 18.609375 23.390625 
-Q 18.609375 15.53125 22.484375 10.953125 
-Q 26.375 6.390625 33.015625 6.390625 
-Q 39.65625 6.390625 43.53125 10.953125 
-Q 47.40625 15.53125 47.40625 23.390625 
-Q 47.40625 31.296875 43.53125 35.828125 
-Q 39.65625 40.375 33.015625 40.375 
+" transform="scale(0.015625)"/>
+        <path id="DejaVuSans-36" d="M 2113 2584 
+Q 1688 2584 1439 2293 
+Q 1191 2003 1191 1497 
+Q 1191 994 1439 701 
+Q 1688 409 2113 409 
+Q 2538 409 2786 701 
+Q 3034 994 3034 1497 
+Q 3034 2003 2786 2293 
+Q 2538 2584 2113 2584 
 z
-M 52.59375 71.296875 
-L 52.59375 62.3125 
-Q 48.875 64.0625 45.09375 64.984375 
-Q 41.3125 65.921875 37.59375 65.921875 
-Q 27.828125 65.921875 22.671875 59.328125 
-Q 17.53125 52.734375 16.796875 39.40625 
-Q 19.671875 43.65625 24.015625 45.921875 
-Q 28.375 48.1875 33.59375 48.1875 
-Q 44.578125 48.1875 50.953125 41.515625 
-Q 57.328125 34.859375 57.328125 23.390625 
-Q 57.328125 12.15625 50.6875 5.359375 
-Q 44.046875 -1.421875 33.015625 -1.421875 
-Q 20.359375 -1.421875 13.671875 8.265625 
-Q 6.984375 17.96875 6.984375 36.375 
-Q 6.984375 53.65625 15.1875 63.9375 
-Q 23.390625 74.21875 37.203125 74.21875 
-Q 40.921875 74.21875 44.703125 73.484375 
-Q 48.484375 72.75 52.59375 71.296875 
+M 3366 4563 
+L 3366 3988 
+Q 3128 4100 2886 4159 
+Q 2644 4219 2406 4219 
+Q 1781 4219 1451 3797 
+Q 1122 3375 1075 2522 
+Q 1259 2794 1537 2939 
+Q 1816 3084 2150 3084 
+Q 2853 3084 3261 2657 
+Q 3669 2231 3669 1497 
+Q 3669 778 3244 343 
+Q 2819 -91 2113 -91 
+Q 1303 -91 875 529 
+Q 447 1150 447 2328 
+Q 447 3434 972 4092 
+Q 1497 4750 2381 4750 
+Q 2619 4750 2861 4703 
+Q 3103 4656 3366 4563 
 z
-" id="DejaVuSans-54"/>
-      </defs>
-      <g transform="translate(380.248 285.847219)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-8722"/>
-       <use x="83.789062" xlink:href="#DejaVuSans-49"/>
-       <use x="147.412109" xlink:href="#DejaVuSans-46"/>
-       <use x="179.199219" xlink:href="#DejaVuSans-54"/>
+" transform="scale(0.015625)"/>
+       </defs>
+       <use xlink:href="#DejaVuSans-2212"/>
+       <use xlink:href="#DejaVuSans-31" x="83.789062"/>
+       <use xlink:href="#DejaVuSans-2e" x="147.412109"/>
+       <use xlink:href="#DejaVuSans-36" x="179.199219"/>
       </g>
      </g>
     </g>
     <g id="ytick_11">
      <g id="line2d_20">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="373.248" xlink:href="#md8bd0a4895" y="255.168"/>
+       <use xlink:href="#m18cb3443cd" x="374.4576" y="255.168" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_20">
       <!-- −1.2 -->
-      <g transform="translate(380.248 258.967219)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-8722"/>
-       <use x="83.789062" xlink:href="#DejaVuSans-49"/>
-       <use x="147.412109" xlink:href="#DejaVuSans-46"/>
-       <use x="179.199219" xlink:href="#DejaVuSans-50"/>
+      <g transform="translate(381.4576 258.967219)scale(0.1 -0.1)">
+       <use xlink:href="#DejaVuSans-2212"/>
+       <use xlink:href="#DejaVuSans-31" x="83.789062"/>
+       <use xlink:href="#DejaVuSans-2e" x="147.412109"/>
+       <use xlink:href="#DejaVuSans-32" x="179.199219"/>
       </g>
      </g>
     </g>
     <g id="ytick_12">
      <g id="line2d_21">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="373.248" xlink:href="#md8bd0a4895" y="228.288"/>
+       <use xlink:href="#m18cb3443cd" x="374.4576" y="228.288" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_21">
       <!-- −0.8 -->
-      <defs>
-       <path d="M 31.78125 34.625 
-Q 24.75 34.625 20.71875 30.859375 
-Q 16.703125 27.09375 16.703125 20.515625 
-Q 16.703125 13.921875 20.71875 10.15625 
-Q 24.75 6.390625 31.78125 6.390625 
-Q 38.8125 6.390625 42.859375 10.171875 
-Q 46.921875 13.96875 46.921875 20.515625 
-Q 46.921875 27.09375 42.890625 30.859375 
-Q 38.875 34.625 31.78125 34.625 
+      <g transform="translate(381.4576 232.087219)scale(0.1 -0.1)">
+       <defs>
+        <path id="DejaVuSans-38" d="M 2034 2216 
+Q 1584 2216 1326 1975 
+Q 1069 1734 1069 1313 
+Q 1069 891 1326 650 
+Q 1584 409 2034 409 
+Q 2484 409 2743 651 
+Q 3003 894 3003 1313 
+Q 3003 1734 2745 1975 
+Q 2488 2216 2034 2216 
 z
-M 21.921875 38.8125 
-Q 15.578125 40.375 12.03125 44.71875 
-Q 8.5 49.078125 8.5 55.328125 
-Q 8.5 64.0625 14.71875 69.140625 
-Q 20.953125 74.21875 31.78125 74.21875 
-Q 42.671875 74.21875 48.875 69.140625 
-Q 55.078125 64.0625 55.078125 55.328125 
-Q 55.078125 49.078125 51.53125 44.71875 
-Q 48 40.375 41.703125 38.8125 
-Q 48.828125 37.15625 52.796875 32.3125 
-Q 56.78125 27.484375 56.78125 20.515625 
-Q 56.78125 9.90625 50.3125 4.234375 
-Q 43.84375 -1.421875 31.78125 -1.421875 
-Q 19.734375 -1.421875 13.25 4.234375 
-Q 6.78125 9.90625 6.78125 20.515625 
-Q 6.78125 27.484375 10.78125 32.3125 
-Q 14.796875 37.15625 21.921875 38.8125 
+M 1403 2484 
+Q 997 2584 770 2862 
+Q 544 3141 544 3541 
+Q 544 4100 942 4425 
+Q 1341 4750 2034 4750 
+Q 2731 4750 3128 4425 
+Q 3525 4100 3525 3541 
+Q 3525 3141 3298 2862 
+Q 3072 2584 2669 2484 
+Q 3125 2378 3379 2068 
+Q 3634 1759 3634 1313 
+Q 3634 634 3220 271 
+Q 2806 -91 2034 -91 
+Q 1263 -91 848 271 
+Q 434 634 434 1313 
+Q 434 1759 690 2068 
+Q 947 2378 1403 2484 
 z
-M 18.3125 54.390625 
-Q 18.3125 48.734375 21.84375 45.5625 
-Q 25.390625 42.390625 31.78125 42.390625 
-Q 38.140625 42.390625 41.71875 45.5625 
-Q 45.3125 48.734375 45.3125 54.390625 
-Q 45.3125 60.0625 41.71875 63.234375 
-Q 38.140625 66.40625 31.78125 66.40625 
-Q 25.390625 66.40625 21.84375 63.234375 
-Q 18.3125 60.0625 18.3125 54.390625 
+M 1172 3481 
+Q 1172 3119 1398 2916 
+Q 1625 2713 2034 2713 
+Q 2441 2713 2670 2916 
+Q 2900 3119 2900 3481 
+Q 2900 3844 2670 4047 
+Q 2441 4250 2034 4250 
+Q 1625 4250 1398 4047 
+Q 1172 3844 1172 3481 
 z
-" id="DejaVuSans-56"/>
-      </defs>
-      <g transform="translate(380.248 232.087219)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-8722"/>
-       <use x="83.789062" xlink:href="#DejaVuSans-48"/>
-       <use x="147.412109" xlink:href="#DejaVuSans-46"/>
-       <use x="179.199219" xlink:href="#DejaVuSans-56"/>
+" transform="scale(0.015625)"/>
+       </defs>
+       <use xlink:href="#DejaVuSans-2212"/>
+       <use xlink:href="#DejaVuSans-30" x="83.789062"/>
+       <use xlink:href="#DejaVuSans-2e" x="147.412109"/>
+       <use xlink:href="#DejaVuSans-38" x="179.199219"/>
       </g>
      </g>
     </g>
     <g id="ytick_13">
      <g id="line2d_22">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="373.248" xlink:href="#md8bd0a4895" y="201.408"/>
+       <use xlink:href="#m18cb3443cd" x="374.4576" y="201.408" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_22">
       <!-- −0.4 -->
-      <g transform="translate(380.248 205.207219)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-8722"/>
-       <use x="83.789062" xlink:href="#DejaVuSans-48"/>
-       <use x="147.412109" xlink:href="#DejaVuSans-46"/>
-       <use x="179.199219" xlink:href="#DejaVuSans-52"/>
+      <g transform="translate(381.4576 205.207219)scale(0.1 -0.1)">
+       <use xlink:href="#DejaVuSans-2212"/>
+       <use xlink:href="#DejaVuSans-30" x="83.789062"/>
+       <use xlink:href="#DejaVuSans-2e" x="147.412109"/>
+       <use xlink:href="#DejaVuSans-34" x="179.199219"/>
       </g>
      </g>
     </g>
     <g id="ytick_14">
      <g id="line2d_23">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="373.248" xlink:href="#md8bd0a4895" y="174.528"/>
+       <use xlink:href="#m18cb3443cd" x="374.4576" y="174.528" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_23">
       <!-- 0.0 -->
-      <g transform="translate(380.248 178.327219)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-48"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-46"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-48"/>
+      <g transform="translate(381.4576 178.327219)scale(0.1 -0.1)">
+       <use xlink:href="#DejaVuSans-30"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-30" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_15">
      <g id="line2d_24">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="373.248" xlink:href="#md8bd0a4895" y="147.648"/>
+       <use xlink:href="#m18cb3443cd" x="374.4576" y="147.648" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_24">
       <!-- 0.4 -->
-      <g transform="translate(380.248 151.447219)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-48"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-46"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-52"/>
+      <g transform="translate(381.4576 151.447219)scale(0.1 -0.1)">
+       <use xlink:href="#DejaVuSans-30"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-34" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_16">
      <g id="line2d_25">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="373.248" xlink:href="#md8bd0a4895" y="120.768"/>
+       <use xlink:href="#m18cb3443cd" x="374.4576" y="120.768" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_25">
       <!-- 0.8 -->
-      <g transform="translate(380.248 124.567219)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-48"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-46"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-56"/>
+      <g transform="translate(381.4576 124.567219)scale(0.1 -0.1)">
+       <use xlink:href="#DejaVuSans-30"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-38" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_17">
      <g id="line2d_26">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="373.248" xlink:href="#md8bd0a4895" y="93.888"/>
+       <use xlink:href="#m18cb3443cd" x="374.4576" y="93.888" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_26">
       <!-- 1.2 -->
-      <g transform="translate(380.248 97.687219)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-49"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-46"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-50"/>
+      <g transform="translate(381.4576 97.687219)scale(0.1 -0.1)">
+       <use xlink:href="#DejaVuSans-31"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-32" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_18">
      <g id="line2d_27">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="373.248" xlink:href="#md8bd0a4895" y="67.008"/>
+       <use xlink:href="#m18cb3443cd" x="374.4576" y="67.008" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
      <g id="text_27">
       <!-- 1.6 -->
-      <g transform="translate(380.248 70.807219)scale(0.1 -0.1)">
-       <use xlink:href="#DejaVuSans-49"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-46"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-54"/>
+      <g transform="translate(381.4576 70.807219)scale(0.1 -0.1)">
+       <use xlink:href="#DejaVuSans-31"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-36" x="95.410156"/>
       </g>
      </g>
     </g>
    </g>
-   <g id="LineCollection_18">
-    <path clip-path="url(#pfed1edc026)" d="M 360.5472 295.488 
-L 373.8528 295.488 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 360.5472 295.488 
-L 373.8528 295.488 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 360.5472 295.488 
-L 373.8528 295.488 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 360.5472 282.048 
-L 373.8528 282.048 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 360.5472 268.608 
-L 373.8528 268.608 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 360.5472 255.168 
-L 373.8528 255.168 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 360.5472 241.728 
-L 373.8528 241.728 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 360.5472 228.288 
-L 373.8528 228.288 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 360.5472 214.848 
-L 373.8528 214.848 
-" style="fill:none;stroke:#bfbf00;stroke-width:2;"/>
+   <g id="LineCollection_1"/>
+   <g id="LineCollection_2">
+    <path d="M 361.152 295.488 
+L 374.4576 295.488 
+" clip-path="url(#p822dd55c41)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 361.152 295.488 
+L 374.4576 295.488 
+" clip-path="url(#p822dd55c41)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 361.152 295.488 
+L 374.4576 295.488 
+" clip-path="url(#p822dd55c41)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 361.152 282.048 
+L 374.4576 282.048 
+" clip-path="url(#p822dd55c41)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 361.152 268.608 
+L 374.4576 268.608 
+" clip-path="url(#p822dd55c41)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 361.152 255.168 
+L 374.4576 255.168 
+" clip-path="url(#p822dd55c41)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 361.152 241.728 
+L 374.4576 241.728 
+" clip-path="url(#p822dd55c41)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 361.152 228.288 
+L 374.4576 228.288 
+" clip-path="url(#p822dd55c41)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
+    <path d="M 361.152 214.848 
+L 374.4576 214.848 
+" clip-path="url(#p822dd55c41)" style="fill: none; stroke: #bfbf00; stroke-width: 2"/>
    </g>
-   <g id="LineCollection_19">
-    <path clip-path="url(#pfed1edc026)" d="M 360.5472 134.208 
-L 373.8528 134.208 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 360.5472 120.768 
-L 373.8528 120.768 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 360.5472 107.328 
-L 373.8528 107.328 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 360.5472 93.888 
-L 373.8528 93.888 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 360.5472 80.448 
-L 373.8528 80.448 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 360.5472 67.008 
-L 373.8528 67.008 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 360.5472 53.568 
-L 373.8528 53.568 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
-    <path clip-path="url(#pfed1edc026)" d="M 360.5472 53.568 
-L 373.8528 53.568 
-" style="fill:none;stroke:#00bfbf;stroke-width:2;"/>
+   <g id="LineCollection_3">
+    <path d="M 361.152 134.208 
+L 374.4576 134.208 
+" clip-path="url(#pd5d4338a07)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
+    <path d="M 361.152 120.768 
+L 374.4576 120.768 
+" clip-path="url(#pd5d4338a07)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
+    <path d="M 361.152 107.328 
+L 374.4576 107.328 
+" clip-path="url(#pd5d4338a07)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
+    <path d="M 361.152 93.888 
+L 374.4576 93.888 
+" clip-path="url(#pd5d4338a07)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
+    <path d="M 361.152 80.448 
+L 374.4576 80.448 
+" clip-path="url(#pd5d4338a07)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
+    <path d="M 361.152 67.008 
+L 374.4576 67.008 
+" clip-path="url(#pd5d4338a07)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
+    <path d="M 361.152 53.568 
+L 374.4576 53.568 
+" clip-path="url(#pd5d4338a07)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
+    <path d="M 361.152 53.568 
+L 374.4576 53.568 
+" clip-path="url(#pd5d4338a07)" style="fill: none; stroke: #00bfbf; stroke-width: 2"/>
    </g>
-   <g id="patch_8">
-    <path d="M 367.2 307.584 
-L 361.152 295.488 
+   <g id="patch_11">
+    <path d="M 361.152 295.488 
+L 367.8048 307.584 
+L 374.4576 295.488 
+L 374.4576 53.568 
+L 367.8048 41.472 
 L 361.152 53.568 
-L 367.2 41.472 
-L 367.2 41.472 
-L 373.248 53.568 
-L 373.248 295.488 
-L 367.2 307.584 
+L 361.152 295.488 
 z
-" style="fill:none;stroke:#000000;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
   </g>
  </g>
  <defs>
-  <clipPath id="p782ac110bd">
-   <rect height="266.112" width="285.696" x="57.6" y="41.472"/>
+  <clipPath id="pd7e07e7879">
+   <rect x="57.6" y="41.472" width="285.696" height="266.112"/>
   </clipPath>
-  <clipPath id="pfed1edc026">
-   <rect height="266.112" width="12.096" x="361.152" y="41.472"/>
+  <clipPath id="p1451b0d78d">
+   <rect x="361.152" y="53.568" width="13.3056" height="241.92"/>
+  </clipPath>
+  <clipPath id="p822dd55c41">
+   <path d="M 361.152 297.306182 
+L 374.4576 297.306182 
+L 374.4576 51.749818 
+L 361.152 51.749818 
+z
+"/>
+  </clipPath>
+  <clipPath id="pd5d4338a07">
+   <path d="M 361.152 297.306182 
+L 374.4576 297.306182 
+L 374.4576 51.749818 
+L 361.152 51.749818 
+z
+"/>
   </clipPath>
  </defs>
 </svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.pdf b/lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.pdf
index f4da53e4890f..c145cbbeb74d 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.png b/lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.png
index 91d5a7e89bca..9f3ff4488a99 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.png and b/lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.svg b/lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.svg
index 7302d4e74273..b4d97d7d0e9f 100644
--- a/lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.svg
+++ b/lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.svg
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (https://matplotlib.org/) -->
-<svg height="432pt" version="1.1" viewBox="0 0 576 432" width="576pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" width="576pt" height="432pt" viewBox="0 0 576 432" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <metadata>
+  <rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+   <cc:Work>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:date>2022-01-07T01:42:44.033823</dc:date>
+    <dc:format>image/svg+xml</dc:format>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Matplotlib v3.6.0.dev1138+gd48fca95df.d20220107, https://matplotlib.org/</dc:title>
+     </cc:Agent>
+    </dc:creator>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linejoin: round; stroke-linecap: butt}</style>
  </defs>
  <g id="figure_1">
   <g id="patch_1">
@@ -15,7 +26,7 @@ L 576 432
 L 576 0 
 L 0 0 
 z
-" style="fill:#ffffff;"/>
+" style="fill: #ffffff"/>
   </g>
   <g id="axes_1">
    <g id="patch_2">
@@ -24,66 +35,66 @@ L 274.909091 200.290909
 L 274.909091 43.2 
 L 72 43.2 
 z
-" style="fill:#ffffff;"/>
+" style="fill: #ffffff"/>
    </g>
    <g id="LineCollection_1">
-    <path clip-path="url(#pc7a66a3dce)" d="M 125.263636 102.769512 
+    <path d="M 125.263636 102.769512 
 L 125.263636 77.125119 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pc7a66a3dce)" d="M 137.945455 137.934277 
+" clip-path="url(#p2bb8a737e6)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 137.945455 137.934277 
 L 137.945455 97.888767 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pc7a66a3dce)" d="M 150.627273 159.20305 
+" clip-path="url(#p2bb8a737e6)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 150.627273 159.20305 
 L 150.627273 110.542292 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pc7a66a3dce)" d="M 163.309091 172.885276 
+" clip-path="url(#p2bb8a737e6)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 163.309091 172.885276 
 L 163.309091 117.43498 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pc7a66a3dce)" d="M 175.990909 182.018967 
+" clip-path="url(#p2bb8a737e6)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 175.990909 182.018967 
 L 175.990909 120.780605 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pc7a66a3dce)" d="M 188.672727 188.369023 
+" clip-path="url(#p2bb8a737e6)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 188.672727 188.369023 
 L 188.672727 121.999636 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pc7a66a3dce)" d="M 201.354545 192.993026 
+" clip-path="url(#p2bb8a737e6)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 201.354545 192.993026 
 L 201.354545 121.966518 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pc7a66a3dce)" d="M 214.036364 196.532477 
+" clip-path="url(#p2bb8a737e6)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 214.036364 196.532477 
 L 214.036364 121.211578 
-" style="fill:none;stroke:#0000ff;"/>
+" clip-path="url(#p2bb8a737e6)" style="fill: none; stroke: #0000ff"/>
    </g>
    <g id="line2d_1">
     <defs>
-     <path d="M 3 0 
+     <path id="mb36b1c4c73" d="M 3 0 
 L -3 -0 
-" id="me44e253235" style="stroke:#0000ff;stroke-width:0.5;"/>
+" style="stroke: #0000ff; stroke-width: 0.5"/>
     </defs>
-    <g clip-path="url(#pc7a66a3dce)">
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="125.263636" xlink:href="#me44e253235" y="102.769512"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="137.945455" xlink:href="#me44e253235" y="137.934277"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="150.627273" xlink:href="#me44e253235" y="159.20305"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="163.309091" xlink:href="#me44e253235" y="172.885276"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="175.990909" xlink:href="#me44e253235" y="182.018967"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="188.672727" xlink:href="#me44e253235" y="188.369023"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="201.354545" xlink:href="#me44e253235" y="192.993026"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="214.036364" xlink:href="#me44e253235" y="196.532477"/>
+    <g clip-path="url(#p2bb8a737e6)">
+     <use xlink:href="#mb36b1c4c73" x="125.263636" y="102.769512" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="137.945455" y="137.934277" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="150.627273" y="159.20305" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="163.309091" y="172.885276" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="175.990909" y="182.018967" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="188.672727" y="188.369023" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="201.354545" y="192.993026" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="214.036364" y="196.532477" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
     </g>
    </g>
    <g id="line2d_2">
-    <g clip-path="url(#pc7a66a3dce)">
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="125.263636" xlink:href="#me44e253235" y="77.125119"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="137.945455" xlink:href="#me44e253235" y="97.888767"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="150.627273" xlink:href="#me44e253235" y="110.542292"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="163.309091" xlink:href="#me44e253235" y="117.43498"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="175.990909" xlink:href="#me44e253235" y="120.780605"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="188.672727" xlink:href="#me44e253235" y="121.999636"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="201.354545" xlink:href="#me44e253235" y="121.966518"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="214.036364" xlink:href="#me44e253235" y="121.211578"/>
+    <g clip-path="url(#p2bb8a737e6)">
+     <use xlink:href="#mb36b1c4c73" x="125.263636" y="77.125119" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="137.945455" y="97.888767" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="150.627273" y="110.542292" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="163.309091" y="117.43498" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="175.990909" y="120.780605" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="188.672727" y="121.999636" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="201.354545" y="121.966518" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="214.036364" y="121.211578" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
     </g>
    </g>
    <g id="line2d_3">
     <defs>
-     <path d="M 0 3 
+     <path id="m5fc5ffe7dc" d="M 0 3 
 C 0.795609 3 1.55874 2.683901 2.12132 2.12132 
 C 2.683901 1.55874 3 0.795609 3 0 
 C 3 -0.795609 2.683901 -1.55874 2.12132 -2.12132 
@@ -93,107 +104,107 @@ C -2.683901 -1.55874 -3 -0.795609 -3 0
 C -3 0.795609 -2.683901 1.55874 -2.12132 2.12132 
 C -1.55874 2.683901 -0.795609 3 0 3 
 z
-" id="mbb289507d7" style="stroke:#000000;stroke-width:0.5;"/>
+" style="stroke: #000000; stroke-width: 0.5"/>
     </defs>
-    <g clip-path="url(#pc7a66a3dce)">
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="125.263636" xlink:href="#mbb289507d7" y="89.947316"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="137.945455" xlink:href="#mbb289507d7" y="117.911522"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="150.627273" xlink:href="#mbb289507d7" y="134.872671"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="163.309091" xlink:href="#mbb289507d7" y="145.160128"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="175.990909" xlink:href="#mbb289507d7" y="151.399786"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="188.672727" xlink:href="#mbb289507d7" y="155.18433"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="201.354545" xlink:href="#mbb289507d7" y="157.479772"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="214.036364" xlink:href="#mbb289507d7" y="158.872028"/>
+    <g clip-path="url(#p2bb8a737e6)">
+     <use xlink:href="#m5fc5ffe7dc" x="125.263636" y="89.947316" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="137.945455" y="117.911522" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="150.627273" y="134.872671" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="163.309091" y="145.160128" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="175.990909" y="151.399786" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="188.672727" y="155.18433" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="201.354545" y="157.479772" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="214.036364" y="158.872028" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
     </g>
    </g>
    <g id="patch_3">
     <path d="M 72 200.290909 
 L 72 43.2 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="patch_4">
     <path d="M 274.909091 200.290909 
 L 274.909091 43.2 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="patch_5">
     <path d="M 72 200.290909 
 L 274.909091 200.290909 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="patch_6">
     <path d="M 72 43.2 
 L 274.909091 43.2 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="matplotlib.axis_1">
     <g id="xtick_1">
      <g id="line2d_4">
       <defs>
-       <path d="M 0 0 
+       <path id="m441ccbbe42" d="M 0 0 
 L 0 -4 
-" id="m368fc901b1" style="stroke:#000000;stroke-width:0.5;"/>
+" style="stroke: #000000; stroke-width: 0.5"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m368fc901b1" y="200.290909"/>
+       <use xlink:href="#m441ccbbe42" x="72" y="200.290909" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_5">
       <defs>
-       <path d="M 0 0 
+       <path id="mad5646bafe" d="M 0 0 
 L 0 4 
-" id="mc63e59a608" style="stroke:#000000;stroke-width:0.5;"/>
+" style="stroke: #000000; stroke-width: 0.5"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#mc63e59a608" y="43.2"/>
+       <use xlink:href="#mad5646bafe" x="72" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="xtick_2">
      <g id="line2d_6">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="122.727273" xlink:href="#m368fc901b1" y="200.290909"/>
+       <use xlink:href="#m441ccbbe42" x="122.727273" y="200.290909" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_7">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="122.727273" xlink:href="#mc63e59a608" y="43.2"/>
+       <use xlink:href="#mad5646bafe" x="122.727273" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="xtick_3">
      <g id="line2d_8">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="173.454545" xlink:href="#m368fc901b1" y="200.290909"/>
+       <use xlink:href="#m441ccbbe42" x="173.454545" y="200.290909" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_9">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="173.454545" xlink:href="#mc63e59a608" y="43.2"/>
+       <use xlink:href="#mad5646bafe" x="173.454545" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="xtick_4">
      <g id="line2d_10">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="224.181818" xlink:href="#m368fc901b1" y="200.290909"/>
+       <use xlink:href="#m441ccbbe42" x="224.181818" y="200.290909" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_11">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="224.181818" xlink:href="#mc63e59a608" y="43.2"/>
+       <use xlink:href="#mad5646bafe" x="224.181818" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="xtick_5">
      <g id="line2d_12">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m368fc901b1" y="200.290909"/>
+       <use xlink:href="#m441ccbbe42" x="274.909091" y="200.290909" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_13">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#mc63e59a608" y="43.2"/>
+       <use xlink:href="#mad5646bafe" x="274.909091" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
@@ -202,388 +213,399 @@ L 0 4
     <g id="ytick_1">
      <g id="line2d_14">
       <defs>
-       <path d="M 0 0 
+       <path id="mebf891ec74" d="M 0 0 
 L 4 0 
-" id="m556f96d829" style="stroke:#000000;stroke-width:0.5;"/>
+" style="stroke: #000000; stroke-width: 0.5"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m556f96d829" y="200.290909"/>
+       <use xlink:href="#mebf891ec74" x="72" y="200.290909" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_15">
       <defs>
-       <path d="M 0 0 
+       <path id="m0be78051dd" d="M 0 0 
 L -4 0 
-" id="m27e32ca04a" style="stroke:#000000;stroke-width:0.5;"/>
+" style="stroke: #000000; stroke-width: 0.5"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m27e32ca04a" y="200.290909"/>
+       <use xlink:href="#m0be78051dd" x="274.909091" y="200.290909" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_1">
       <!-- −0.5 -->
-      <defs>
-       <path d="M 10.59375 35.5 
-L 73.1875 35.5 
-L 73.1875 27.203125 
-L 10.59375 27.203125 
+      <g transform="translate(38.860625 204.849972)scale(0.12 -0.12)">
+       <defs>
+        <path id="DejaVuSans-2212" d="M 678 2272 
+L 4684 2272 
+L 4684 1741 
+L 678 1741 
+L 678 2272 
 z
-" id="DejaVuSans-2212"/>
-       <path d="M 31.78125 66.40625 
-Q 24.171875 66.40625 20.328125 58.90625 
-Q 16.5 51.421875 16.5 36.375 
-Q 16.5 21.390625 20.328125 13.890625 
-Q 24.171875 6.390625 31.78125 6.390625 
-Q 39.453125 6.390625 43.28125 13.890625 
-Q 47.125 21.390625 47.125 36.375 
-Q 47.125 51.421875 43.28125 58.90625 
-Q 39.453125 66.40625 31.78125 66.40625 
+" transform="scale(0.015625)"/>
+        <path id="DejaVuSans-30" d="M 2034 4250 
+Q 1547 4250 1301 3770 
+Q 1056 3291 1056 2328 
+Q 1056 1369 1301 889 
+Q 1547 409 2034 409 
+Q 2525 409 2770 889 
+Q 3016 1369 3016 2328 
+Q 3016 3291 2770 3770 
+Q 2525 4250 2034 4250 
 z
-M 31.78125 74.21875 
-Q 44.046875 74.21875 50.515625 64.515625 
-Q 56.984375 54.828125 56.984375 36.375 
-Q 56.984375 17.96875 50.515625 8.265625 
-Q 44.046875 -1.421875 31.78125 -1.421875 
-Q 19.53125 -1.421875 13.0625 8.265625 
-Q 6.59375 17.96875 6.59375 36.375 
-Q 6.59375 54.828125 13.0625 64.515625 
-Q 19.53125 74.21875 31.78125 74.21875 
+M 2034 4750 
+Q 2819 4750 3233 4129 
+Q 3647 3509 3647 2328 
+Q 3647 1150 3233 529 
+Q 2819 -91 2034 -91 
+Q 1250 -91 836 529 
+Q 422 1150 422 2328 
+Q 422 3509 836 4129 
+Q 1250 4750 2034 4750 
 z
-" id="DejaVuSans-30"/>
-       <path d="M 10.6875 12.40625 
-L 21 12.40625 
-L 21 0 
-L 10.6875 0 
+" transform="scale(0.015625)"/>
+        <path id="DejaVuSans-2e" d="M 684 794 
+L 1344 794 
+L 1344 0 
+L 684 0 
+L 684 794 
 z
-" id="DejaVuSans-2e"/>
-       <path d="M 10.796875 72.90625 
-L 49.515625 72.90625 
-L 49.515625 64.59375 
-L 19.828125 64.59375 
-L 19.828125 46.734375 
-Q 21.96875 47.46875 24.109375 47.828125 
-Q 26.265625 48.1875 28.421875 48.1875 
-Q 40.625 48.1875 47.75 41.5 
-Q 54.890625 34.8125 54.890625 23.390625 
-Q 54.890625 11.625 47.5625 5.09375 
-Q 40.234375 -1.421875 26.90625 -1.421875 
-Q 22.3125 -1.421875 17.546875 -0.640625 
-Q 12.796875 0.140625 7.71875 1.703125 
-L 7.71875 11.625 
-Q 12.109375 9.234375 16.796875 8.0625 
-Q 21.484375 6.890625 26.703125 6.890625 
-Q 35.15625 6.890625 40.078125 11.328125 
-Q 45.015625 15.765625 45.015625 23.390625 
-Q 45.015625 31 40.078125 35.4375 
-Q 35.15625 39.890625 26.703125 39.890625 
-Q 22.75 39.890625 18.8125 39.015625 
-Q 14.890625 38.140625 10.796875 36.28125 
+" transform="scale(0.015625)"/>
+        <path id="DejaVuSans-35" d="M 691 4666 
+L 3169 4666 
+L 3169 4134 
+L 1269 4134 
+L 1269 2991 
+Q 1406 3038 1543 3061 
+Q 1681 3084 1819 3084 
+Q 2600 3084 3056 2656 
+Q 3513 2228 3513 1497 
+Q 3513 744 3044 326 
+Q 2575 -91 1722 -91 
+Q 1428 -91 1123 -41 
+Q 819 9 494 109 
+L 494 744 
+Q 775 591 1075 516 
+Q 1375 441 1709 441 
+Q 2250 441 2565 725 
+Q 2881 1009 2881 1497 
+Q 2881 1984 2565 2268 
+Q 2250 2553 1709 2553 
+Q 1456 2553 1204 2497 
+Q 953 2441 691 2322 
+L 691 4666 
 z
-" id="DejaVuSans-35"/>
-      </defs>
-      <g transform="translate(38.860625 204.849972)scale(0.12 -0.12)">
+" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-2212"/>
-       <use x="83.789062" xlink:href="#DejaVuSans-30"/>
-       <use x="147.412109" xlink:href="#DejaVuSans-2e"/>
-       <use x="179.199219" xlink:href="#DejaVuSans-35"/>
+       <use xlink:href="#DejaVuSans-30" x="83.789062"/>
+       <use xlink:href="#DejaVuSans-2e" x="147.412109"/>
+       <use xlink:href="#DejaVuSans-35" x="179.199219"/>
       </g>
      </g>
     </g>
     <g id="ytick_2">
      <g id="line2d_16">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m556f96d829" y="161.018182"/>
+       <use xlink:href="#mebf891ec74" x="72" y="161.018182" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_17">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m27e32ca04a" y="161.018182"/>
+       <use xlink:href="#m0be78051dd" x="274.909091" y="161.018182" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_2">
       <!-- 0.0 -->
       <g transform="translate(48.91625 165.577244)scale(0.12 -0.12)">
        <use xlink:href="#DejaVuSans-30"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-30"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-30" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_3">
      <g id="line2d_18">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m556f96d829" y="121.745455"/>
+       <use xlink:href="#mebf891ec74" x="72" y="121.745455" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_19">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m27e32ca04a" y="121.745455"/>
+       <use xlink:href="#m0be78051dd" x="274.909091" y="121.745455" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_3">
       <!-- 0.5 -->
       <g transform="translate(48.91625 126.304517)scale(0.12 -0.12)">
        <use xlink:href="#DejaVuSans-30"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-35"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-35" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_4">
      <g id="line2d_20">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m556f96d829" y="82.472727"/>
+       <use xlink:href="#mebf891ec74" x="72" y="82.472727" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_21">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m27e32ca04a" y="82.472727"/>
+       <use xlink:href="#m0be78051dd" x="274.909091" y="82.472727" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_4">
       <!-- 1.0 -->
-      <defs>
-       <path d="M 12.40625 8.296875 
-L 28.515625 8.296875 
-L 28.515625 63.921875 
-L 10.984375 60.40625 
-L 10.984375 69.390625 
-L 28.421875 72.90625 
-L 38.28125 72.90625 
-L 38.28125 8.296875 
-L 54.390625 8.296875 
-L 54.390625 0 
-L 12.40625 0 
-z
-" id="DejaVuSans-31"/>
-      </defs>
       <g transform="translate(48.91625 87.03179)scale(0.12 -0.12)">
+       <defs>
+        <path id="DejaVuSans-31" d="M 794 531 
+L 1825 531 
+L 1825 4091 
+L 703 3866 
+L 703 4441 
+L 1819 4666 
+L 2450 4666 
+L 2450 531 
+L 3481 531 
+L 3481 0 
+L 794 0 
+L 794 531 
+z
+" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-31"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-30"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-30" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_5">
      <g id="line2d_22">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m556f96d829" y="43.2"/>
+       <use xlink:href="#mebf891ec74" x="72" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_23">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m27e32ca04a" y="43.2"/>
+       <use xlink:href="#m0be78051dd" x="274.909091" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_5">
       <!-- 1.5 -->
       <g transform="translate(48.91625 47.759062)scale(0.12 -0.12)">
        <use xlink:href="#DejaVuSans-31"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-35"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-35" x="95.410156"/>
       </g>
      </g>
     </g>
    </g>
    <g id="text_6">
     <!-- Vert. symmetric -->
-    <defs>
-     <path d="M 28.609375 0 
-L 0.78125 72.90625 
-L 11.078125 72.90625 
-L 34.1875 11.53125 
-L 57.328125 72.90625 
-L 67.578125 72.90625 
-L 39.796875 0 
+    <g transform="translate(115.537295 38.2)scale(0.144 -0.144)">
+     <defs>
+      <path id="DejaVuSans-56" d="M 1831 0 
+L 50 4666 
+L 709 4666 
+L 2188 738 
+L 3669 4666 
+L 4325 4666 
+L 2547 0 
+L 1831 0 
 z
-" id="DejaVuSans-56"/>
-     <path d="M 56.203125 29.59375 
-L 56.203125 25.203125 
-L 14.890625 25.203125 
-Q 15.484375 15.921875 20.484375 11.0625 
-Q 25.484375 6.203125 34.421875 6.203125 
-Q 39.59375 6.203125 44.453125 7.46875 
-Q 49.3125 8.734375 54.109375 11.28125 
-L 54.109375 2.78125 
-Q 49.265625 0.734375 44.1875 -0.34375 
-Q 39.109375 -1.421875 33.890625 -1.421875 
-Q 20.796875 -1.421875 13.15625 6.1875 
-Q 5.515625 13.8125 5.515625 26.8125 
-Q 5.515625 40.234375 12.765625 48.109375 
-Q 20.015625 56 32.328125 56 
-Q 43.359375 56 49.78125 48.890625 
-Q 56.203125 41.796875 56.203125 29.59375 
+" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-65" d="M 3597 1894 
+L 3597 1613 
+L 953 1613 
+Q 991 1019 1311 708 
+Q 1631 397 2203 397 
+Q 2534 397 2845 478 
+Q 3156 559 3463 722 
+L 3463 178 
+Q 3153 47 2828 -22 
+Q 2503 -91 2169 -91 
+Q 1331 -91 842 396 
+Q 353 884 353 1716 
+Q 353 2575 817 3079 
+Q 1281 3584 2069 3584 
+Q 2775 3584 3186 3129 
+Q 3597 2675 3597 1894 
 z
-M 47.21875 32.234375 
-Q 47.125 39.59375 43.09375 43.984375 
-Q 39.0625 48.390625 32.421875 48.390625 
-Q 24.90625 48.390625 20.390625 44.140625 
-Q 15.875 39.890625 15.1875 32.171875 
+M 3022 2063 
+Q 3016 2534 2758 2815 
+Q 2500 3097 2075 3097 
+Q 1594 3097 1305 2825 
+Q 1016 2553 972 2059 
+L 3022 2063 
 z
-" id="DejaVuSans-65"/>
-     <path d="M 41.109375 46.296875 
-Q 39.59375 47.171875 37.8125 47.578125 
-Q 36.03125 48 33.890625 48 
-Q 26.265625 48 22.1875 43.046875 
-Q 18.109375 38.09375 18.109375 28.8125 
-L 18.109375 0 
-L 9.078125 0 
-L 9.078125 54.6875 
-L 18.109375 54.6875 
-L 18.109375 46.1875 
-Q 20.953125 51.171875 25.484375 53.578125 
-Q 30.03125 56 36.53125 56 
-Q 37.453125 56 38.578125 55.875 
-Q 39.703125 55.765625 41.0625 55.515625 
+" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-72" d="M 2631 2963 
+Q 2534 3019 2420 3045 
+Q 2306 3072 2169 3072 
+Q 1681 3072 1420 2755 
+Q 1159 2438 1159 1844 
+L 1159 0 
+L 581 0 
+L 581 3500 
+L 1159 3500 
+L 1159 2956 
+Q 1341 3275 1631 3429 
+Q 1922 3584 2338 3584 
+Q 2397 3584 2469 3576 
+Q 2541 3569 2628 3553 
+L 2631 2963 
 z
-" id="DejaVuSans-72"/>
-     <path d="M 18.3125 70.21875 
-L 18.3125 54.6875 
-L 36.8125 54.6875 
-L 36.8125 47.703125 
-L 18.3125 47.703125 
-L 18.3125 18.015625 
-Q 18.3125 11.328125 20.140625 9.421875 
-Q 21.96875 7.515625 27.59375 7.515625 
-L 36.8125 7.515625 
-L 36.8125 0 
-L 27.59375 0 
-Q 17.1875 0 13.234375 3.875 
-Q 9.28125 7.765625 9.28125 18.015625 
-L 9.28125 47.703125 
-L 2.6875 47.703125 
-L 2.6875 54.6875 
-L 9.28125 54.6875 
-L 9.28125 70.21875 
+" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-74" d="M 1172 4494 
+L 1172 3500 
+L 2356 3500 
+L 2356 3053 
+L 1172 3053 
+L 1172 1153 
+Q 1172 725 1289 603 
+Q 1406 481 1766 481 
+L 2356 481 
+L 2356 0 
+L 1766 0 
+Q 1100 0 847 248 
+Q 594 497 594 1153 
+L 594 3053 
+L 172 3053 
+L 172 3500 
+L 594 3500 
+L 594 4494 
+L 1172 4494 
 z
-" id="DejaVuSans-74"/>
-     <path id="DejaVuSans-20"/>
-     <path d="M 44.28125 53.078125 
-L 44.28125 44.578125 
-Q 40.484375 46.53125 36.375 47.5 
-Q 32.28125 48.484375 27.875 48.484375 
-Q 21.1875 48.484375 17.84375 46.4375 
-Q 14.5 44.390625 14.5 40.28125 
-Q 14.5 37.15625 16.890625 35.375 
-Q 19.28125 33.59375 26.515625 31.984375 
-L 29.59375 31.296875 
-Q 39.15625 29.25 43.1875 25.515625 
-Q 47.21875 21.78125 47.21875 15.09375 
-Q 47.21875 7.46875 41.1875 3.015625 
-Q 35.15625 -1.421875 24.609375 -1.421875 
-Q 20.21875 -1.421875 15.453125 -0.5625 
-Q 10.6875 0.296875 5.421875 2 
-L 5.421875 11.28125 
-Q 10.40625 8.6875 15.234375 7.390625 
-Q 20.0625 6.109375 24.8125 6.109375 
-Q 31.15625 6.109375 34.5625 8.28125 
-Q 37.984375 10.453125 37.984375 14.40625 
-Q 37.984375 18.0625 35.515625 20.015625 
-Q 33.0625 21.96875 24.703125 23.78125 
-L 21.578125 24.515625 
-Q 13.234375 26.265625 9.515625 29.90625 
-Q 5.8125 33.546875 5.8125 39.890625 
-Q 5.8125 47.609375 11.28125 51.796875 
-Q 16.75 56 26.8125 56 
-Q 31.78125 56 36.171875 55.265625 
-Q 40.578125 54.546875 44.28125 53.078125 
+" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-20" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-73" d="M 2834 3397 
+L 2834 2853 
+Q 2591 2978 2328 3040 
+Q 2066 3103 1784 3103 
+Q 1356 3103 1142 2972 
+Q 928 2841 928 2578 
+Q 928 2378 1081 2264 
+Q 1234 2150 1697 2047 
+L 1894 2003 
+Q 2506 1872 2764 1633 
+Q 3022 1394 3022 966 
+Q 3022 478 2636 193 
+Q 2250 -91 1575 -91 
+Q 1294 -91 989 -36 
+Q 684 19 347 128 
+L 347 722 
+Q 666 556 975 473 
+Q 1284 391 1588 391 
+Q 1994 391 2212 530 
+Q 2431 669 2431 922 
+Q 2431 1156 2273 1281 
+Q 2116 1406 1581 1522 
+L 1381 1569 
+Q 847 1681 609 1914 
+Q 372 2147 372 2553 
+Q 372 3047 722 3315 
+Q 1072 3584 1716 3584 
+Q 2034 3584 2315 3537 
+Q 2597 3491 2834 3397 
 z
-" id="DejaVuSans-73"/>
-     <path d="M 32.171875 -5.078125 
-Q 28.375 -14.84375 24.75 -17.8125 
-Q 21.140625 -20.796875 15.09375 -20.796875 
-L 7.90625 -20.796875 
-L 7.90625 -13.28125 
-L 13.1875 -13.28125 
-Q 16.890625 -13.28125 18.9375 -11.515625 
-Q 21 -9.765625 23.484375 -3.21875 
-L 25.09375 0.875 
-L 2.984375 54.6875 
-L 12.5 54.6875 
-L 29.59375 11.921875 
-L 46.6875 54.6875 
-L 56.203125 54.6875 
+" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-79" d="M 2059 -325 
+Q 1816 -950 1584 -1140 
+Q 1353 -1331 966 -1331 
+L 506 -1331 
+L 506 -850 
+L 844 -850 
+Q 1081 -850 1212 -737 
+Q 1344 -625 1503 -206 
+L 1606 56 
+L 191 3500 
+L 800 3500 
+L 1894 763 
+L 2988 3500 
+L 3597 3500 
+L 2059 -325 
 z
-" id="DejaVuSans-79"/>
-     <path d="M 52 44.1875 
-Q 55.375 50.25 60.0625 53.125 
-Q 64.75 56 71.09375 56 
-Q 79.640625 56 84.28125 50.015625 
-Q 88.921875 44.046875 88.921875 33.015625 
-L 88.921875 0 
-L 79.890625 0 
-L 79.890625 32.71875 
-Q 79.890625 40.578125 77.09375 44.375 
-Q 74.3125 48.1875 68.609375 48.1875 
-Q 61.625 48.1875 57.5625 43.546875 
-Q 53.515625 38.921875 53.515625 30.90625 
-L 53.515625 0 
-L 44.484375 0 
-L 44.484375 32.71875 
-Q 44.484375 40.625 41.703125 44.40625 
-Q 38.921875 48.1875 33.109375 48.1875 
-Q 26.21875 48.1875 22.15625 43.53125 
-Q 18.109375 38.875 18.109375 30.90625 
-L 18.109375 0 
-L 9.078125 0 
-L 9.078125 54.6875 
-L 18.109375 54.6875 
-L 18.109375 46.1875 
-Q 21.1875 51.21875 25.484375 53.609375 
-Q 29.78125 56 35.6875 56 
-Q 41.65625 56 45.828125 52.96875 
-Q 50 49.953125 52 44.1875 
+" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-6d" d="M 3328 2828 
+Q 3544 3216 3844 3400 
+Q 4144 3584 4550 3584 
+Q 5097 3584 5394 3201 
+Q 5691 2819 5691 2113 
+L 5691 0 
+L 5113 0 
+L 5113 2094 
+Q 5113 2597 4934 2840 
+Q 4756 3084 4391 3084 
+Q 3944 3084 3684 2787 
+Q 3425 2491 3425 1978 
+L 3425 0 
+L 2847 0 
+L 2847 2094 
+Q 2847 2600 2669 2842 
+Q 2491 3084 2119 3084 
+Q 1678 3084 1418 2786 
+Q 1159 2488 1159 1978 
+L 1159 0 
+L 581 0 
+L 581 3500 
+L 1159 3500 
+L 1159 2956 
+Q 1356 3278 1631 3431 
+Q 1906 3584 2284 3584 
+Q 2666 3584 2933 3390 
+Q 3200 3197 3328 2828 
 z
-" id="DejaVuSans-6d"/>
-     <path d="M 9.421875 54.6875 
-L 18.40625 54.6875 
-L 18.40625 0 
-L 9.421875 0 
+" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-69" d="M 603 3500 
+L 1178 3500 
+L 1178 0 
+L 603 0 
+L 603 3500 
 z
-M 9.421875 75.984375 
-L 18.40625 75.984375 
-L 18.40625 64.59375 
-L 9.421875 64.59375 
+M 603 4863 
+L 1178 4863 
+L 1178 4134 
+L 603 4134 
+L 603 4863 
 z
-" id="DejaVuSans-69"/>
-     <path d="M 48.78125 52.59375 
-L 48.78125 44.1875 
-Q 44.96875 46.296875 41.140625 47.34375 
-Q 37.3125 48.390625 33.40625 48.390625 
-Q 24.65625 48.390625 19.8125 42.84375 
-Q 14.984375 37.3125 14.984375 27.296875 
-Q 14.984375 17.28125 19.8125 11.734375 
-Q 24.65625 6.203125 33.40625 6.203125 
-Q 37.3125 6.203125 41.140625 7.25 
-Q 44.96875 8.296875 48.78125 10.40625 
-L 48.78125 2.09375 
-Q 45.015625 0.34375 40.984375 -0.53125 
-Q 36.96875 -1.421875 32.421875 -1.421875 
-Q 20.0625 -1.421875 12.78125 6.34375 
-Q 5.515625 14.109375 5.515625 27.296875 
-Q 5.515625 40.671875 12.859375 48.328125 
-Q 20.21875 56 33.015625 56 
-Q 37.15625 56 41.109375 55.140625 
-Q 45.0625 54.296875 48.78125 52.59375 
+" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-63" d="M 3122 3366 
+L 3122 2828 
+Q 2878 2963 2633 3030 
+Q 2388 3097 2138 3097 
+Q 1578 3097 1268 2742 
+Q 959 2388 959 1747 
+Q 959 1106 1268 751 
+Q 1578 397 2138 397 
+Q 2388 397 2633 464 
+Q 2878 531 3122 666 
+L 3122 134 
+Q 2881 22 2623 -34 
+Q 2366 -91 2075 -91 
+Q 1284 -91 818 406 
+Q 353 903 353 1747 
+Q 353 2603 823 3093 
+Q 1294 3584 2113 3584 
+Q 2378 3584 2631 3529 
+Q 2884 3475 3122 3366 
 z
-" id="DejaVuSans-63"/>
-    </defs>
-    <g transform="translate(115.537295 38.2)scale(0.144 -0.144)">
+" transform="scale(0.015625)"/>
+     </defs>
      <use xlink:href="#DejaVuSans-56"/>
-     <use x="68.298828" xlink:href="#DejaVuSans-65"/>
-     <use x="129.822266" xlink:href="#DejaVuSans-72"/>
-     <use x="170.935547" xlink:href="#DejaVuSans-74"/>
-     <use x="210.144531" xlink:href="#DejaVuSans-2e"/>
-     <use x="241.931641" xlink:href="#DejaVuSans-20"/>
-     <use x="273.71875" xlink:href="#DejaVuSans-73"/>
-     <use x="325.818359" xlink:href="#DejaVuSans-79"/>
-     <use x="384.998047" xlink:href="#DejaVuSans-6d"/>
-     <use x="482.410156" xlink:href="#DejaVuSans-6d"/>
-     <use x="579.822266" xlink:href="#DejaVuSans-65"/>
-     <use x="641.345703" xlink:href="#DejaVuSans-74"/>
-     <use x="680.554688" xlink:href="#DejaVuSans-72"/>
-     <use x="721.667969" xlink:href="#DejaVuSans-69"/>
-     <use x="749.451172" xlink:href="#DejaVuSans-63"/>
+     <use xlink:href="#DejaVuSans-65" x="68.298828"/>
+     <use xlink:href="#DejaVuSans-72" x="129.822266"/>
+     <use xlink:href="#DejaVuSans-74" x="170.935547"/>
+     <use xlink:href="#DejaVuSans-2e" x="210.144531"/>
+     <use xlink:href="#DejaVuSans-20" x="241.931641"/>
+     <use xlink:href="#DejaVuSans-73" x="273.71875"/>
+     <use xlink:href="#DejaVuSans-79" x="325.818359"/>
+     <use xlink:href="#DejaVuSans-6d" x="384.998047"/>
+     <use xlink:href="#DejaVuSans-6d" x="482.410156"/>
+     <use xlink:href="#DejaVuSans-65" x="579.822266"/>
+     <use xlink:href="#DejaVuSans-74" x="641.345703"/>
+     <use xlink:href="#DejaVuSans-72" x="680.554688"/>
+     <use xlink:href="#DejaVuSans-69" x="721.667969"/>
+     <use xlink:href="#DejaVuSans-63" x="749.451172"/>
     </g>
    </g>
   </g>
@@ -594,66 +616,66 @@ L 518.4 200.290909
 L 518.4 43.2 
 L 315.490909 43.2 
 z
-" style="fill:#ffffff;"/>
+" style="fill: #ffffff"/>
    </g>
    <g id="LineCollection_2">
-    <path clip-path="url(#p58107b0fbb)" d="M 362.077681 58.149177 
+    <path d="M 362.077681 58.149177 
 L 375.43141 58.149177 
-" style="fill:none;stroke:#0000ff;stroke-opacity:0.4;"/>
-    <path clip-path="url(#p58107b0fbb)" d="M 372.434319 114.07759 
+" clip-path="url(#p06e990243b)" style="fill: none; stroke: #0000ff; stroke-opacity: 0.4"/>
+    <path d="M 372.434319 114.07759 
 L 390.438409 114.07759 
-" style="fill:none;stroke:#0000ff;stroke-opacity:0.4;"/>
-    <path clip-path="url(#p58107b0fbb)" d="M 383.725133 147.999888 
+" clip-path="url(#p06e990243b)" style="fill: none; stroke: #0000ff; stroke-opacity: 0.4"/>
+    <path d="M 383.725133 147.999888 
 L 404.51123 147.999888 
-" style="fill:none;stroke:#0000ff;stroke-opacity:0.4;"/>
-    <path clip-path="url(#p58107b0fbb)" d="M 395.310724 168.574802 
+" clip-path="url(#p06e990243b)" style="fill: none; stroke: #0000ff; stroke-opacity: 0.4"/>
+    <path d="M 395.310724 168.574802 
 L 418.289276 168.574802 
-" style="fill:none;stroke:#0000ff;stroke-opacity:0.4;"/>
-    <path clip-path="url(#p58107b0fbb)" d="M 407.058011 181.054117 
+" clip-path="url(#p06e990243b)" style="fill: none; stroke: #0000ff; stroke-opacity: 0.4"/>
+    <path d="M 407.058011 181.054117 
 L 431.905626 181.054117 
-" style="fill:none;stroke:#0000ff;stroke-opacity:0.4;"/>
-    <path clip-path="url(#p58107b0fbb)" d="M 418.911382 188.623205 
+" clip-path="url(#p06e990243b)" style="fill: none; stroke: #0000ff; stroke-opacity: 0.4"/>
+    <path d="M 418.911382 188.623205 
 L 445.415891 188.623205 
-" style="fill:none;stroke:#0000ff;stroke-opacity:0.4;"/>
-    <path clip-path="url(#p58107b0fbb)" d="M 430.841269 193.214089 
+" clip-path="url(#p06e990243b)" style="fill: none; stroke: #0000ff; stroke-opacity: 0.4"/>
+    <path d="M 430.841269 193.214089 
 L 458.84964 193.214089 
-" style="fill:none;stroke:#0000ff;stroke-opacity:0.4;"/>
-    <path clip-path="url(#p58107b0fbb)" d="M 442.829722 195.998601 
+" clip-path="url(#p06e990243b)" style="fill: none; stroke: #0000ff; stroke-opacity: 0.4"/>
+    <path d="M 442.829722 195.998601 
 L 472.224823 195.998601 
-" style="fill:none;stroke:#0000ff;stroke-opacity:0.4;"/>
+" clip-path="url(#p06e990243b)" style="fill: none; stroke: #0000ff; stroke-opacity: 0.4"/>
    </g>
    <g id="line2d_24">
     <defs>
-     <path d="M 0 3 
+     <path id="mcb660f4b50" d="M 0 3 
 L 0 -3 
-" id="m454add2b76" style="stroke:#0000ff;stroke-opacity:0.4;stroke-width:0.5;"/>
+" style="stroke: #0000ff; stroke-opacity: 0.4; stroke-width: 0.5"/>
     </defs>
-    <g clip-path="url(#p58107b0fbb)">
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#0000ff;stroke-opacity:0.4;stroke-width:0.5;" x="362.077681" xlink:href="#m454add2b76" y="58.149177"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#0000ff;stroke-opacity:0.4;stroke-width:0.5;" x="372.434319" xlink:href="#m454add2b76" y="114.07759"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#0000ff;stroke-opacity:0.4;stroke-width:0.5;" x="383.725133" xlink:href="#m454add2b76" y="147.999888"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#0000ff;stroke-opacity:0.4;stroke-width:0.5;" x="395.310724" xlink:href="#m454add2b76" y="168.574802"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#0000ff;stroke-opacity:0.4;stroke-width:0.5;" x="407.058011" xlink:href="#m454add2b76" y="181.054117"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#0000ff;stroke-opacity:0.4;stroke-width:0.5;" x="418.911382" xlink:href="#m454add2b76" y="188.623205"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#0000ff;stroke-opacity:0.4;stroke-width:0.5;" x="430.841269" xlink:href="#m454add2b76" y="193.214089"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#0000ff;stroke-opacity:0.4;stroke-width:0.5;" x="442.829722" xlink:href="#m454add2b76" y="195.998601"/>
+    <g clip-path="url(#p06e990243b)">
+     <use xlink:href="#mcb660f4b50" x="362.077681" y="58.149177" style="fill: #0000ff; fill-opacity: 0.4; stroke: #0000ff; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#mcb660f4b50" x="372.434319" y="114.07759" style="fill: #0000ff; fill-opacity: 0.4; stroke: #0000ff; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#mcb660f4b50" x="383.725133" y="147.999888" style="fill: #0000ff; fill-opacity: 0.4; stroke: #0000ff; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#mcb660f4b50" x="395.310724" y="168.574802" style="fill: #0000ff; fill-opacity: 0.4; stroke: #0000ff; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#mcb660f4b50" x="407.058011" y="181.054117" style="fill: #0000ff; fill-opacity: 0.4; stroke: #0000ff; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#mcb660f4b50" x="418.911382" y="188.623205" style="fill: #0000ff; fill-opacity: 0.4; stroke: #0000ff; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#mcb660f4b50" x="430.841269" y="193.214089" style="fill: #0000ff; fill-opacity: 0.4; stroke: #0000ff; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#mcb660f4b50" x="442.829722" y="195.998601" style="fill: #0000ff; fill-opacity: 0.4; stroke: #0000ff; stroke-opacity: 0.4; stroke-width: 0.5"/>
     </g>
    </g>
    <g id="line2d_25">
-    <g clip-path="url(#p58107b0fbb)">
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#0000ff;stroke-opacity:0.4;stroke-width:0.5;" x="375.43141" xlink:href="#m454add2b76" y="58.149177"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#0000ff;stroke-opacity:0.4;stroke-width:0.5;" x="390.438409" xlink:href="#m454add2b76" y="114.07759"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#0000ff;stroke-opacity:0.4;stroke-width:0.5;" x="404.51123" xlink:href="#m454add2b76" y="147.999888"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#0000ff;stroke-opacity:0.4;stroke-width:0.5;" x="418.289276" xlink:href="#m454add2b76" y="168.574802"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#0000ff;stroke-opacity:0.4;stroke-width:0.5;" x="431.905626" xlink:href="#m454add2b76" y="181.054117"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#0000ff;stroke-opacity:0.4;stroke-width:0.5;" x="445.415891" xlink:href="#m454add2b76" y="188.623205"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#0000ff;stroke-opacity:0.4;stroke-width:0.5;" x="458.84964" xlink:href="#m454add2b76" y="193.214089"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#0000ff;stroke-opacity:0.4;stroke-width:0.5;" x="472.224823" xlink:href="#m454add2b76" y="195.998601"/>
+    <g clip-path="url(#p06e990243b)">
+     <use xlink:href="#mcb660f4b50" x="375.43141" y="58.149177" style="fill: #0000ff; fill-opacity: 0.4; stroke: #0000ff; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#mcb660f4b50" x="390.438409" y="114.07759" style="fill: #0000ff; fill-opacity: 0.4; stroke: #0000ff; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#mcb660f4b50" x="404.51123" y="147.999888" style="fill: #0000ff; fill-opacity: 0.4; stroke: #0000ff; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#mcb660f4b50" x="418.289276" y="168.574802" style="fill: #0000ff; fill-opacity: 0.4; stroke: #0000ff; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#mcb660f4b50" x="431.905626" y="181.054117" style="fill: #0000ff; fill-opacity: 0.4; stroke: #0000ff; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#mcb660f4b50" x="445.415891" y="188.623205" style="fill: #0000ff; fill-opacity: 0.4; stroke: #0000ff; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#mcb660f4b50" x="458.84964" y="193.214089" style="fill: #0000ff; fill-opacity: 0.4; stroke: #0000ff; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#mcb660f4b50" x="472.224823" y="195.998601" style="fill: #0000ff; fill-opacity: 0.4; stroke: #0000ff; stroke-opacity: 0.4; stroke-width: 0.5"/>
     </g>
    </g>
    <g id="line2d_26">
     <defs>
-     <path d="M 0 3 
+     <path id="m498e668480" d="M 0 3 
 C 0.795609 3 1.55874 2.683901 2.12132 2.12132 
 C 2.683901 1.55874 3 0.795609 3 0 
 C 3 -0.795609 2.683901 -1.55874 2.12132 -2.12132 
@@ -663,97 +685,97 @@ C -2.683901 -1.55874 -3 -0.795609 -3 0
 C -3 0.795609 -2.683901 1.55874 -2.12132 2.12132 
 C -1.55874 2.683901 -0.795609 3 0 3 
 z
-" id="m1bffda5d1f" style="stroke:#000000;stroke-opacity:0.4;stroke-width:0.5;"/>
+" style="stroke: #000000; stroke-opacity: 0.4; stroke-width: 0.5"/>
     </defs>
-    <g clip-path="url(#p58107b0fbb)">
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#000000;stroke-opacity:0.4;stroke-width:0.5;" x="368.754545" xlink:href="#m1bffda5d1f" y="58.149177"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#000000;stroke-opacity:0.4;stroke-width:0.5;" x="381.436364" xlink:href="#m1bffda5d1f" y="114.07759"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#000000;stroke-opacity:0.4;stroke-width:0.5;" x="394.118182" xlink:href="#m1bffda5d1f" y="147.999888"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#000000;stroke-opacity:0.4;stroke-width:0.5;" x="406.8" xlink:href="#m1bffda5d1f" y="168.574802"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#000000;stroke-opacity:0.4;stroke-width:0.5;" x="419.481818" xlink:href="#m1bffda5d1f" y="181.054117"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#000000;stroke-opacity:0.4;stroke-width:0.5;" x="432.163636" xlink:href="#m1bffda5d1f" y="188.623205"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#000000;stroke-opacity:0.4;stroke-width:0.5;" x="444.845455" xlink:href="#m1bffda5d1f" y="193.214089"/>
-     <use style="fill:#0000ff;fill-opacity:0.4;stroke:#000000;stroke-opacity:0.4;stroke-width:0.5;" x="457.527273" xlink:href="#m1bffda5d1f" y="195.998601"/>
+    <g clip-path="url(#p06e990243b)">
+     <use xlink:href="#m498e668480" x="368.754545" y="58.149177" style="fill: #0000ff; fill-opacity: 0.4; stroke: #000000; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#m498e668480" x="381.436364" y="114.07759" style="fill: #0000ff; fill-opacity: 0.4; stroke: #000000; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#m498e668480" x="394.118182" y="147.999888" style="fill: #0000ff; fill-opacity: 0.4; stroke: #000000; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#m498e668480" x="406.8" y="168.574802" style="fill: #0000ff; fill-opacity: 0.4; stroke: #000000; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#m498e668480" x="419.481818" y="181.054117" style="fill: #0000ff; fill-opacity: 0.4; stroke: #000000; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#m498e668480" x="432.163636" y="188.623205" style="fill: #0000ff; fill-opacity: 0.4; stroke: #000000; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#m498e668480" x="444.845455" y="193.214089" style="fill: #0000ff; fill-opacity: 0.4; stroke: #000000; stroke-opacity: 0.4; stroke-width: 0.5"/>
+     <use xlink:href="#m498e668480" x="457.527273" y="195.998601" style="fill: #0000ff; fill-opacity: 0.4; stroke: #000000; stroke-opacity: 0.4; stroke-width: 0.5"/>
     </g>
    </g>
    <g id="patch_8">
     <path d="M 315.490909 200.290909 
 L 315.490909 43.2 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="patch_9">
     <path d="M 518.4 200.290909 
 L 518.4 43.2 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="patch_10">
     <path d="M 315.490909 200.290909 
 L 518.4 200.290909 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="patch_11">
     <path d="M 315.490909 43.2 
 L 518.4 43.2 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="matplotlib.axis_3">
     <g id="xtick_6">
      <g id="line2d_27">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#m368fc901b1" y="200.290909"/>
+       <use xlink:href="#m441ccbbe42" x="315.490909" y="200.290909" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_28">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mc63e59a608" y="43.2"/>
+       <use xlink:href="#mad5646bafe" x="315.490909" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="xtick_7">
      <g id="line2d_29">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="366.218182" xlink:href="#m368fc901b1" y="200.290909"/>
+       <use xlink:href="#m441ccbbe42" x="366.218182" y="200.290909" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_30">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="366.218182" xlink:href="#mc63e59a608" y="43.2"/>
+       <use xlink:href="#mad5646bafe" x="366.218182" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="xtick_8">
      <g id="line2d_31">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="416.945455" xlink:href="#m368fc901b1" y="200.290909"/>
+       <use xlink:href="#m441ccbbe42" x="416.945455" y="200.290909" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_32">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="416.945455" xlink:href="#mc63e59a608" y="43.2"/>
+       <use xlink:href="#mad5646bafe" x="416.945455" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="xtick_9">
      <g id="line2d_33">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="467.672727" xlink:href="#m368fc901b1" y="200.290909"/>
+       <use xlink:href="#m441ccbbe42" x="467.672727" y="200.290909" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_34">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="467.672727" xlink:href="#mc63e59a608" y="43.2"/>
+       <use xlink:href="#mad5646bafe" x="467.672727" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="xtick_10">
      <g id="line2d_35">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m368fc901b1" y="200.290909"/>
+       <use xlink:href="#m441ccbbe42" x="518.4" y="200.290909" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_36">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#mc63e59a608" y="43.2"/>
+       <use xlink:href="#mad5646bafe" x="518.4" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
@@ -762,409 +784,416 @@ L 518.4 43.2
     <g id="ytick_6">
      <g id="line2d_37">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#m556f96d829" y="200.290909"/>
+       <use xlink:href="#mebf891ec74" x="315.490909" y="200.290909" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_38">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m27e32ca04a" y="200.290909"/>
+       <use xlink:href="#m0be78051dd" x="518.4" y="200.290909" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_7">
       <!-- 0.0 -->
       <g transform="translate(292.407159 204.849972)scale(0.12 -0.12)">
        <use xlink:href="#DejaVuSans-30"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-30"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-30" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_7">
      <g id="line2d_39">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#m556f96d829" y="168.872727"/>
+       <use xlink:href="#mebf891ec74" x="315.490909" y="168.872727" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_40">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m27e32ca04a" y="168.872727"/>
+       <use xlink:href="#m0be78051dd" x="518.4" y="168.872727" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_8">
       <!-- 0.2 -->
-      <defs>
-       <path d="M 19.1875 8.296875 
-L 53.609375 8.296875 
-L 53.609375 0 
-L 7.328125 0 
-L 7.328125 8.296875 
-Q 12.9375 14.109375 22.625 23.890625 
-Q 32.328125 33.6875 34.8125 36.53125 
-Q 39.546875 41.84375 41.421875 45.53125 
-Q 43.3125 49.21875 43.3125 52.78125 
-Q 43.3125 58.59375 39.234375 62.25 
-Q 35.15625 65.921875 28.609375 65.921875 
-Q 23.96875 65.921875 18.8125 64.3125 
-Q 13.671875 62.703125 7.8125 59.421875 
-L 7.8125 69.390625 
-Q 13.765625 71.78125 18.9375 73 
-Q 24.125 74.21875 28.421875 74.21875 
-Q 39.75 74.21875 46.484375 68.546875 
-Q 53.21875 62.890625 53.21875 53.421875 
-Q 53.21875 48.921875 51.53125 44.890625 
-Q 49.859375 40.875 45.40625 35.40625 
-Q 44.1875 33.984375 37.640625 27.21875 
-Q 31.109375 20.453125 19.1875 8.296875 
-z
-" id="DejaVuSans-32"/>
-      </defs>
       <g transform="translate(292.407159 173.43179)scale(0.12 -0.12)">
+       <defs>
+        <path id="DejaVuSans-32" d="M 1228 531 
+L 3431 531 
+L 3431 0 
+L 469 0 
+L 469 531 
+Q 828 903 1448 1529 
+Q 2069 2156 2228 2338 
+Q 2531 2678 2651 2914 
+Q 2772 3150 2772 3378 
+Q 2772 3750 2511 3984 
+Q 2250 4219 1831 4219 
+Q 1534 4219 1204 4116 
+Q 875 4013 500 3803 
+L 500 4441 
+Q 881 4594 1212 4672 
+Q 1544 4750 1819 4750 
+Q 2544 4750 2975 4387 
+Q 3406 4025 3406 3419 
+Q 3406 3131 3298 2873 
+Q 3191 2616 2906 2266 
+Q 2828 2175 2409 1742 
+Q 1991 1309 1228 531 
+z
+" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-30"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-32"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-32" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_8">
      <g id="line2d_41">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#m556f96d829" y="137.454545"/>
+       <use xlink:href="#mebf891ec74" x="315.490909" y="137.454545" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_42">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m27e32ca04a" y="137.454545"/>
+       <use xlink:href="#m0be78051dd" x="518.4" y="137.454545" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_9">
       <!-- 0.4 -->
-      <defs>
-       <path d="M 37.796875 64.3125 
-L 12.890625 25.390625 
-L 37.796875 25.390625 
+      <g transform="translate(292.407159 142.013608)scale(0.12 -0.12)">
+       <defs>
+        <path id="DejaVuSans-34" d="M 2419 4116 
+L 825 1625 
+L 2419 1625 
+L 2419 4116 
 z
-M 35.203125 72.90625 
-L 47.609375 72.90625 
-L 47.609375 25.390625 
-L 58.015625 25.390625 
-L 58.015625 17.1875 
-L 47.609375 17.1875 
-L 47.609375 0 
-L 37.796875 0 
-L 37.796875 17.1875 
-L 4.890625 17.1875 
-L 4.890625 26.703125 
+M 2253 4666 
+L 3047 4666 
+L 3047 1625 
+L 3713 1625 
+L 3713 1100 
+L 3047 1100 
+L 3047 0 
+L 2419 0 
+L 2419 1100 
+L 313 1100 
+L 313 1709 
+L 2253 4666 
 z
-" id="DejaVuSans-34"/>
-      </defs>
-      <g transform="translate(292.407159 142.013608)scale(0.12 -0.12)">
+" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-30"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-34"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-34" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_9">
      <g id="line2d_43">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#m556f96d829" y="106.036364"/>
+       <use xlink:href="#mebf891ec74" x="315.490909" y="106.036364" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_44">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m27e32ca04a" y="106.036364"/>
+       <use xlink:href="#m0be78051dd" x="518.4" y="106.036364" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_10">
       <!-- 0.6 -->
-      <defs>
-       <path d="M 33.015625 40.375 
-Q 26.375 40.375 22.484375 35.828125 
-Q 18.609375 31.296875 18.609375 23.390625 
-Q 18.609375 15.53125 22.484375 10.953125 
-Q 26.375 6.390625 33.015625 6.390625 
-Q 39.65625 6.390625 43.53125 10.953125 
-Q 47.40625 15.53125 47.40625 23.390625 
-Q 47.40625 31.296875 43.53125 35.828125 
-Q 39.65625 40.375 33.015625 40.375 
+      <g transform="translate(292.407159 110.595426)scale(0.12 -0.12)">
+       <defs>
+        <path id="DejaVuSans-36" d="M 2113 2584 
+Q 1688 2584 1439 2293 
+Q 1191 2003 1191 1497 
+Q 1191 994 1439 701 
+Q 1688 409 2113 409 
+Q 2538 409 2786 701 
+Q 3034 994 3034 1497 
+Q 3034 2003 2786 2293 
+Q 2538 2584 2113 2584 
 z
-M 52.59375 71.296875 
-L 52.59375 62.3125 
-Q 48.875 64.0625 45.09375 64.984375 
-Q 41.3125 65.921875 37.59375 65.921875 
-Q 27.828125 65.921875 22.671875 59.328125 
-Q 17.53125 52.734375 16.796875 39.40625 
-Q 19.671875 43.65625 24.015625 45.921875 
-Q 28.375 48.1875 33.59375 48.1875 
-Q 44.578125 48.1875 50.953125 41.515625 
-Q 57.328125 34.859375 57.328125 23.390625 
-Q 57.328125 12.15625 50.6875 5.359375 
-Q 44.046875 -1.421875 33.015625 -1.421875 
-Q 20.359375 -1.421875 13.671875 8.265625 
-Q 6.984375 17.96875 6.984375 36.375 
-Q 6.984375 53.65625 15.1875 63.9375 
-Q 23.390625 74.21875 37.203125 74.21875 
-Q 40.921875 74.21875 44.703125 73.484375 
-Q 48.484375 72.75 52.59375 71.296875 
+M 3366 4563 
+L 3366 3988 
+Q 3128 4100 2886 4159 
+Q 2644 4219 2406 4219 
+Q 1781 4219 1451 3797 
+Q 1122 3375 1075 2522 
+Q 1259 2794 1537 2939 
+Q 1816 3084 2150 3084 
+Q 2853 3084 3261 2657 
+Q 3669 2231 3669 1497 
+Q 3669 778 3244 343 
+Q 2819 -91 2113 -91 
+Q 1303 -91 875 529 
+Q 447 1150 447 2328 
+Q 447 3434 972 4092 
+Q 1497 4750 2381 4750 
+Q 2619 4750 2861 4703 
+Q 3103 4656 3366 4563 
 z
-" id="DejaVuSans-36"/>
-      </defs>
-      <g transform="translate(292.407159 110.595426)scale(0.12 -0.12)">
+" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-30"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-36"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-36" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_10">
      <g id="line2d_45">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#m556f96d829" y="74.618182"/>
+       <use xlink:href="#mebf891ec74" x="315.490909" y="74.618182" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_46">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m27e32ca04a" y="74.618182"/>
+       <use xlink:href="#m0be78051dd" x="518.4" y="74.618182" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_11">
       <!-- 0.8 -->
-      <defs>
-       <path d="M 31.78125 34.625 
-Q 24.75 34.625 20.71875 30.859375 
-Q 16.703125 27.09375 16.703125 20.515625 
-Q 16.703125 13.921875 20.71875 10.15625 
-Q 24.75 6.390625 31.78125 6.390625 
-Q 38.8125 6.390625 42.859375 10.171875 
-Q 46.921875 13.96875 46.921875 20.515625 
-Q 46.921875 27.09375 42.890625 30.859375 
-Q 38.875 34.625 31.78125 34.625 
+      <g transform="translate(292.407159 79.177244)scale(0.12 -0.12)">
+       <defs>
+        <path id="DejaVuSans-38" d="M 2034 2216 
+Q 1584 2216 1326 1975 
+Q 1069 1734 1069 1313 
+Q 1069 891 1326 650 
+Q 1584 409 2034 409 
+Q 2484 409 2743 651 
+Q 3003 894 3003 1313 
+Q 3003 1734 2745 1975 
+Q 2488 2216 2034 2216 
 z
-M 21.921875 38.8125 
-Q 15.578125 40.375 12.03125 44.71875 
-Q 8.5 49.078125 8.5 55.328125 
-Q 8.5 64.0625 14.71875 69.140625 
-Q 20.953125 74.21875 31.78125 74.21875 
-Q 42.671875 74.21875 48.875 69.140625 
-Q 55.078125 64.0625 55.078125 55.328125 
-Q 55.078125 49.078125 51.53125 44.71875 
-Q 48 40.375 41.703125 38.8125 
-Q 48.828125 37.15625 52.796875 32.3125 
-Q 56.78125 27.484375 56.78125 20.515625 
-Q 56.78125 9.90625 50.3125 4.234375 
-Q 43.84375 -1.421875 31.78125 -1.421875 
-Q 19.734375 -1.421875 13.25 4.234375 
-Q 6.78125 9.90625 6.78125 20.515625 
-Q 6.78125 27.484375 10.78125 32.3125 
-Q 14.796875 37.15625 21.921875 38.8125 
+M 1403 2484 
+Q 997 2584 770 2862 
+Q 544 3141 544 3541 
+Q 544 4100 942 4425 
+Q 1341 4750 2034 4750 
+Q 2731 4750 3128 4425 
+Q 3525 4100 3525 3541 
+Q 3525 3141 3298 2862 
+Q 3072 2584 2669 2484 
+Q 3125 2378 3379 2068 
+Q 3634 1759 3634 1313 
+Q 3634 634 3220 271 
+Q 2806 -91 2034 -91 
+Q 1263 -91 848 271 
+Q 434 634 434 1313 
+Q 434 1759 690 2068 
+Q 947 2378 1403 2484 
 z
-M 18.3125 54.390625 
-Q 18.3125 48.734375 21.84375 45.5625 
-Q 25.390625 42.390625 31.78125 42.390625 
-Q 38.140625 42.390625 41.71875 45.5625 
-Q 45.3125 48.734375 45.3125 54.390625 
-Q 45.3125 60.0625 41.71875 63.234375 
-Q 38.140625 66.40625 31.78125 66.40625 
-Q 25.390625 66.40625 21.84375 63.234375 
-Q 18.3125 60.0625 18.3125 54.390625 
+M 1172 3481 
+Q 1172 3119 1398 2916 
+Q 1625 2713 2034 2713 
+Q 2441 2713 2670 2916 
+Q 2900 3119 2900 3481 
+Q 2900 3844 2670 4047 
+Q 2441 4250 2034 4250 
+Q 1625 4250 1398 4047 
+Q 1172 3844 1172 3481 
 z
-" id="DejaVuSans-38"/>
-      </defs>
-      <g transform="translate(292.407159 79.177244)scale(0.12 -0.12)">
+" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-30"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-38"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-38" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_11">
      <g id="line2d_47">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#m556f96d829" y="43.2"/>
+       <use xlink:href="#mebf891ec74" x="315.490909" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_48">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m27e32ca04a" y="43.2"/>
+       <use xlink:href="#m0be78051dd" x="518.4" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_12">
       <!-- 1.0 -->
       <g transform="translate(292.407159 47.759062)scale(0.12 -0.12)">
        <use xlink:href="#DejaVuSans-31"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-30"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-30" x="95.410156"/>
       </g>
      </g>
     </g>
    </g>
    <g id="text_13">
     <!-- Hor. symmetric w/ alpha -->
-    <defs>
-     <path d="M 9.8125 72.90625 
-L 19.671875 72.90625 
-L 19.671875 43.015625 
-L 55.515625 43.015625 
-L 55.515625 72.90625 
-L 65.375 72.90625 
-L 65.375 0 
-L 55.515625 0 
-L 55.515625 34.71875 
-L 19.671875 34.71875 
-L 19.671875 0 
-L 9.8125 0 
+    <g transform="translate(328.53958 38.2)scale(0.144 -0.144)">
+     <defs>
+      <path id="DejaVuSans-48" d="M 628 4666 
+L 1259 4666 
+L 1259 2753 
+L 3553 2753 
+L 3553 4666 
+L 4184 4666 
+L 4184 0 
+L 3553 0 
+L 3553 2222 
+L 1259 2222 
+L 1259 0 
+L 628 0 
+L 628 4666 
 z
-" id="DejaVuSans-48"/>
-     <path d="M 30.609375 48.390625 
-Q 23.390625 48.390625 19.1875 42.75 
-Q 14.984375 37.109375 14.984375 27.296875 
-Q 14.984375 17.484375 19.15625 11.84375 
-Q 23.34375 6.203125 30.609375 6.203125 
-Q 37.796875 6.203125 41.984375 11.859375 
-Q 46.1875 17.53125 46.1875 27.296875 
-Q 46.1875 37.015625 41.984375 42.703125 
-Q 37.796875 48.390625 30.609375 48.390625 
+" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-6f" d="M 1959 3097 
+Q 1497 3097 1228 2736 
+Q 959 2375 959 1747 
+Q 959 1119 1226 758 
+Q 1494 397 1959 397 
+Q 2419 397 2687 759 
+Q 2956 1122 2956 1747 
+Q 2956 2369 2687 2733 
+Q 2419 3097 1959 3097 
 z
-M 30.609375 56 
-Q 42.328125 56 49.015625 48.375 
-Q 55.71875 40.765625 55.71875 27.296875 
-Q 55.71875 13.875 49.015625 6.21875 
-Q 42.328125 -1.421875 30.609375 -1.421875 
-Q 18.84375 -1.421875 12.171875 6.21875 
-Q 5.515625 13.875 5.515625 27.296875 
-Q 5.515625 40.765625 12.171875 48.375 
-Q 18.84375 56 30.609375 56 
+M 1959 3584 
+Q 2709 3584 3137 3096 
+Q 3566 2609 3566 1747 
+Q 3566 888 3137 398 
+Q 2709 -91 1959 -91 
+Q 1206 -91 779 398 
+Q 353 888 353 1747 
+Q 353 2609 779 3096 
+Q 1206 3584 1959 3584 
 z
-" id="DejaVuSans-6f"/>
-     <path d="M 4.203125 54.6875 
-L 13.1875 54.6875 
-L 24.421875 12.015625 
-L 35.59375 54.6875 
-L 46.1875 54.6875 
-L 57.421875 12.015625 
-L 68.609375 54.6875 
-L 77.59375 54.6875 
-L 63.28125 0 
-L 52.6875 0 
-L 40.921875 44.828125 
-L 29.109375 0 
-L 18.5 0 
+" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-77" d="M 269 3500 
+L 844 3500 
+L 1563 769 
+L 2278 3500 
+L 2956 3500 
+L 3675 769 
+L 4391 3500 
+L 4966 3500 
+L 4050 0 
+L 3372 0 
+L 2619 2869 
+L 1863 0 
+L 1184 0 
+L 269 3500 
 z
-" id="DejaVuSans-77"/>
-     <path d="M 25.390625 72.90625 
-L 33.6875 72.90625 
-L 8.296875 -9.28125 
-L 0 -9.28125 
+" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-2f" d="M 1625 4666 
+L 2156 4666 
+L 531 -594 
+L 0 -594 
+L 1625 4666 
 z
-" id="DejaVuSans-2f"/>
-     <path d="M 34.28125 27.484375 
-Q 23.390625 27.484375 19.1875 25 
-Q 14.984375 22.515625 14.984375 16.5 
-Q 14.984375 11.71875 18.140625 8.90625 
-Q 21.296875 6.109375 26.703125 6.109375 
-Q 34.1875 6.109375 38.703125 11.40625 
-Q 43.21875 16.703125 43.21875 25.484375 
-L 43.21875 27.484375 
+" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-61" d="M 2194 1759 
+Q 1497 1759 1228 1600 
+Q 959 1441 959 1056 
+Q 959 750 1161 570 
+Q 1363 391 1709 391 
+Q 2188 391 2477 730 
+Q 2766 1069 2766 1631 
+L 2766 1759 
+L 2194 1759 
 z
-M 52.203125 31.203125 
-L 52.203125 0 
-L 43.21875 0 
-L 43.21875 8.296875 
-Q 40.140625 3.328125 35.546875 0.953125 
-Q 30.953125 -1.421875 24.3125 -1.421875 
-Q 15.921875 -1.421875 10.953125 3.296875 
-Q 6 8.015625 6 15.921875 
-Q 6 25.140625 12.171875 29.828125 
-Q 18.359375 34.515625 30.609375 34.515625 
-L 43.21875 34.515625 
-L 43.21875 35.40625 
-Q 43.21875 41.609375 39.140625 45 
-Q 35.0625 48.390625 27.6875 48.390625 
-Q 23 48.390625 18.546875 47.265625 
-Q 14.109375 46.140625 10.015625 43.890625 
-L 10.015625 52.203125 
-Q 14.9375 54.109375 19.578125 55.046875 
-Q 24.21875 56 28.609375 56 
-Q 40.484375 56 46.34375 49.84375 
-Q 52.203125 43.703125 52.203125 31.203125 
+M 3341 1997 
+L 3341 0 
+L 2766 0 
+L 2766 531 
+Q 2569 213 2275 61 
+Q 1981 -91 1556 -91 
+Q 1019 -91 701 211 
+Q 384 513 384 1019 
+Q 384 1609 779 1909 
+Q 1175 2209 1959 2209 
+L 2766 2209 
+L 2766 2266 
+Q 2766 2663 2505 2880 
+Q 2244 3097 1772 3097 
+Q 1472 3097 1187 3025 
+Q 903 2953 641 2809 
+L 641 3341 
+Q 956 3463 1253 3523 
+Q 1550 3584 1831 3584 
+Q 2591 3584 2966 3190 
+Q 3341 2797 3341 1997 
 z
-" id="DejaVuSans-61"/>
-     <path d="M 9.421875 75.984375 
-L 18.40625 75.984375 
-L 18.40625 0 
-L 9.421875 0 
+" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-6c" d="M 603 4863 
+L 1178 4863 
+L 1178 0 
+L 603 0 
+L 603 4863 
 z
-" id="DejaVuSans-6c"/>
-     <path d="M 18.109375 8.203125 
-L 18.109375 -20.796875 
-L 9.078125 -20.796875 
-L 9.078125 54.6875 
-L 18.109375 54.6875 
-L 18.109375 46.390625 
-Q 20.953125 51.265625 25.265625 53.625 
-Q 29.59375 56 35.59375 56 
-Q 45.5625 56 51.78125 48.09375 
-Q 58.015625 40.1875 58.015625 27.296875 
-Q 58.015625 14.40625 51.78125 6.484375 
-Q 45.5625 -1.421875 35.59375 -1.421875 
-Q 29.59375 -1.421875 25.265625 0.953125 
-Q 20.953125 3.328125 18.109375 8.203125 
+" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-70" d="M 1159 525 
+L 1159 -1331 
+L 581 -1331 
+L 581 3500 
+L 1159 3500 
+L 1159 2969 
+Q 1341 3281 1617 3432 
+Q 1894 3584 2278 3584 
+Q 2916 3584 3314 3078 
+Q 3713 2572 3713 1747 
+Q 3713 922 3314 415 
+Q 2916 -91 2278 -91 
+Q 1894 -91 1617 61 
+Q 1341 213 1159 525 
 z
-M 48.6875 27.296875 
-Q 48.6875 37.203125 44.609375 42.84375 
-Q 40.53125 48.484375 33.40625 48.484375 
-Q 26.265625 48.484375 22.1875 42.84375 
-Q 18.109375 37.203125 18.109375 27.296875 
-Q 18.109375 17.390625 22.1875 11.75 
-Q 26.265625 6.109375 33.40625 6.109375 
-Q 40.53125 6.109375 44.609375 11.75 
-Q 48.6875 17.390625 48.6875 27.296875 
+M 3116 1747 
+Q 3116 2381 2855 2742 
+Q 2594 3103 2138 3103 
+Q 1681 3103 1420 2742 
+Q 1159 2381 1159 1747 
+Q 1159 1113 1420 752 
+Q 1681 391 2138 391 
+Q 2594 391 2855 752 
+Q 3116 1113 3116 1747 
 z
-" id="DejaVuSans-70"/>
-     <path d="M 54.890625 33.015625 
-L 54.890625 0 
-L 45.90625 0 
-L 45.90625 32.71875 
-Q 45.90625 40.484375 42.875 44.328125 
-Q 39.84375 48.1875 33.796875 48.1875 
-Q 26.515625 48.1875 22.3125 43.546875 
-Q 18.109375 38.921875 18.109375 30.90625 
-L 18.109375 0 
-L 9.078125 0 
-L 9.078125 75.984375 
-L 18.109375 75.984375 
-L 18.109375 46.1875 
-Q 21.34375 51.125 25.703125 53.5625 
-Q 30.078125 56 35.796875 56 
-Q 45.21875 56 50.046875 50.171875 
-Q 54.890625 44.34375 54.890625 33.015625 
+" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-68" d="M 3513 2113 
+L 3513 0 
+L 2938 0 
+L 2938 2094 
+Q 2938 2591 2744 2837 
+Q 2550 3084 2163 3084 
+Q 1697 3084 1428 2787 
+Q 1159 2491 1159 1978 
+L 1159 0 
+L 581 0 
+L 581 4863 
+L 1159 4863 
+L 1159 2956 
+Q 1366 3272 1645 3428 
+Q 1925 3584 2291 3584 
+Q 2894 3584 3203 3211 
+Q 3513 2838 3513 2113 
 z
-" id="DejaVuSans-68"/>
-    </defs>
-    <g transform="translate(328.53958 38.2)scale(0.144 -0.144)">
+" transform="scale(0.015625)"/>
+     </defs>
      <use xlink:href="#DejaVuSans-48"/>
-     <use x="75.195312" xlink:href="#DejaVuSans-6f"/>
-     <use x="136.376953" xlink:href="#DejaVuSans-72"/>
-     <use x="177.349609" xlink:href="#DejaVuSans-2e"/>
-     <use x="209.136719" xlink:href="#DejaVuSans-20"/>
-     <use x="240.923828" xlink:href="#DejaVuSans-73"/>
-     <use x="293.023438" xlink:href="#DejaVuSans-79"/>
-     <use x="352.203125" xlink:href="#DejaVuSans-6d"/>
-     <use x="449.615234" xlink:href="#DejaVuSans-6d"/>
-     <use x="547.027344" xlink:href="#DejaVuSans-65"/>
-     <use x="608.550781" xlink:href="#DejaVuSans-74"/>
-     <use x="647.759766" xlink:href="#DejaVuSans-72"/>
-     <use x="688.873047" xlink:href="#DejaVuSans-69"/>
-     <use x="716.65625" xlink:href="#DejaVuSans-63"/>
-     <use x="771.636719" xlink:href="#DejaVuSans-20"/>
-     <use x="803.423828" xlink:href="#DejaVuSans-77"/>
-     <use x="885.210938" xlink:href="#DejaVuSans-2f"/>
-     <use x="918.902344" xlink:href="#DejaVuSans-20"/>
-     <use x="950.689453" xlink:href="#DejaVuSans-61"/>
-     <use x="1011.96875" xlink:href="#DejaVuSans-6c"/>
-     <use x="1039.751953" xlink:href="#DejaVuSans-70"/>
-     <use x="1103.228516" xlink:href="#DejaVuSans-68"/>
-     <use x="1166.607422" xlink:href="#DejaVuSans-61"/>
+     <use xlink:href="#DejaVuSans-6f" x="75.195312"/>
+     <use xlink:href="#DejaVuSans-72" x="136.376953"/>
+     <use xlink:href="#DejaVuSans-2e" x="177.349609"/>
+     <use xlink:href="#DejaVuSans-20" x="209.136719"/>
+     <use xlink:href="#DejaVuSans-73" x="240.923828"/>
+     <use xlink:href="#DejaVuSans-79" x="293.023438"/>
+     <use xlink:href="#DejaVuSans-6d" x="352.203125"/>
+     <use xlink:href="#DejaVuSans-6d" x="449.615234"/>
+     <use xlink:href="#DejaVuSans-65" x="547.027344"/>
+     <use xlink:href="#DejaVuSans-74" x="608.550781"/>
+     <use xlink:href="#DejaVuSans-72" x="647.759766"/>
+     <use xlink:href="#DejaVuSans-69" x="688.873047"/>
+     <use xlink:href="#DejaVuSans-63" x="716.65625"/>
+     <use xlink:href="#DejaVuSans-20" x="771.636719"/>
+     <use xlink:href="#DejaVuSans-77" x="803.423828"/>
+     <use xlink:href="#DejaVuSans-2f" x="885.210938"/>
+     <use xlink:href="#DejaVuSans-20" x="918.902344"/>
+     <use xlink:href="#DejaVuSans-61" x="950.689453"/>
+     <use xlink:href="#DejaVuSans-6c" x="1011.96875"/>
+     <use xlink:href="#DejaVuSans-70" x="1039.751953"/>
+     <use xlink:href="#DejaVuSans-68" x="1103.228516"/>
+     <use xlink:href="#DejaVuSans-61" x="1166.607422"/>
     </g>
    </g>
   </g>
@@ -1175,115 +1204,115 @@ L 274.909091 388.8
 L 274.909091 231.709091 
 L 72 231.709091 
 z
-" style="fill:#ffffff;"/>
+" style="fill: #ffffff"/>
    </g>
    <g id="LineCollection_3">
-    <path clip-path="url(#pb43d30e4a6)" d="M 118.586772 278.456406 
+    <path d="M 118.586772 278.456406 
 L 138.617365 278.456406 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pb43d30e4a6)" d="M 128.94341 306.420613 
+" clip-path="url(#p2c9259b7f3)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 128.94341 306.420613 
 L 155.949544 306.420613 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pb43d30e4a6)" d="M 140.234224 323.381762 
+" clip-path="url(#p2c9259b7f3)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 140.234224 323.381762 
 L 171.41337 323.381762 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pb43d30e4a6)" d="M 151.819815 333.669219 
+" clip-path="url(#p2c9259b7f3)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 151.819815 333.669219 
 L 186.287643 333.669219 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pb43d30e4a6)" d="M 163.567102 339.908877 
+" clip-path="url(#p2c9259b7f3)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 163.567102 339.908877 
 L 200.838524 339.908877 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pb43d30e4a6)" d="M 175.420473 343.693421 
+" clip-path="url(#p2c9259b7f3)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 175.420473 343.693421 
 L 215.177236 343.693421 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pb43d30e4a6)" d="M 187.35036 345.988863 
+" clip-path="url(#p2c9259b7f3)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 187.35036 345.988863 
 L 229.362916 345.988863 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pb43d30e4a6)" d="M 199.338813 347.381119 
+" clip-path="url(#p2c9259b7f3)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 199.338813 347.381119 
 L 243.431465 347.381119 
-" style="fill:none;stroke:#0000ff;"/>
+" clip-path="url(#p2c9259b7f3)" style="fill: none; stroke: #0000ff"/>
    </g>
    <g id="LineCollection_4">
-    <path clip-path="url(#pb43d30e4a6)" d="M 125.263636 291.278603 
+    <path d="M 125.263636 291.278603 
 L 125.263636 252.812014 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pb43d30e4a6)" d="M 137.945455 326.443368 
+" clip-path="url(#p2c9259b7f3)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 137.945455 326.443368 
 L 137.945455 266.375103 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pb43d30e4a6)" d="M 150.627273 347.712141 
+" clip-path="url(#p2c9259b7f3)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 150.627273 347.712141 
 L 150.627273 274.721004 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pb43d30e4a6)" d="M 163.309091 361.394367 
+" clip-path="url(#p2c9259b7f3)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 163.309091 361.394367 
 L 163.309091 278.218922 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pb43d30e4a6)" d="M 175.990909 370.528058 
+" clip-path="url(#p2c9259b7f3)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 175.990909 370.528058 
 L 175.990909 278.670515 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pb43d30e4a6)" d="M 188.672727 376.878114 
+" clip-path="url(#p2c9259b7f3)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 188.672727 376.878114 
 L 188.672727 277.324034 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pb43d30e4a6)" d="M 201.354545 381.502117 
+" clip-path="url(#p2c9259b7f3)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 201.354545 381.502117 
 L 201.354545 274.962354 
-" style="fill:none;stroke:#0000ff;"/>
-    <path clip-path="url(#pb43d30e4a6)" d="M 214.036364 385.041568 
+" clip-path="url(#p2c9259b7f3)" style="fill: none; stroke: #0000ff"/>
+    <path d="M 214.036364 385.041568 
 L 214.036364 272.060219 
-" style="fill:none;stroke:#0000ff;"/>
+" clip-path="url(#p2c9259b7f3)" style="fill: none; stroke: #0000ff"/>
    </g>
    <g id="line2d_49">
     <defs>
-     <path d="M 0 3 
+     <path id="mb640623e97" d="M 0 3 
 L 0 -3 
-" id="m1981e1242d" style="stroke:#0000ff;stroke-width:0.5;"/>
+" style="stroke: #0000ff; stroke-width: 0.5"/>
     </defs>
-    <g clip-path="url(#pb43d30e4a6)">
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="118.586772" xlink:href="#m1981e1242d" y="278.456406"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="128.94341" xlink:href="#m1981e1242d" y="306.420613"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="140.234224" xlink:href="#m1981e1242d" y="323.381762"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="151.819815" xlink:href="#m1981e1242d" y="333.669219"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="163.567102" xlink:href="#m1981e1242d" y="339.908877"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="175.420473" xlink:href="#m1981e1242d" y="343.693421"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="187.35036" xlink:href="#m1981e1242d" y="345.988863"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="199.338813" xlink:href="#m1981e1242d" y="347.381119"/>
+    <g clip-path="url(#p2c9259b7f3)">
+     <use xlink:href="#mb640623e97" x="118.586772" y="278.456406" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb640623e97" x="128.94341" y="306.420613" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb640623e97" x="140.234224" y="323.381762" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb640623e97" x="151.819815" y="333.669219" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb640623e97" x="163.567102" y="339.908877" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb640623e97" x="175.420473" y="343.693421" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb640623e97" x="187.35036" y="345.988863" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb640623e97" x="199.338813" y="347.381119" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
     </g>
    </g>
    <g id="line2d_50">
-    <g clip-path="url(#pb43d30e4a6)">
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="138.617365" xlink:href="#m1981e1242d" y="278.456406"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="155.949544" xlink:href="#m1981e1242d" y="306.420613"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="171.41337" xlink:href="#m1981e1242d" y="323.381762"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="186.287643" xlink:href="#m1981e1242d" y="333.669219"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="200.838524" xlink:href="#m1981e1242d" y="339.908877"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="215.177236" xlink:href="#m1981e1242d" y="343.693421"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="229.362916" xlink:href="#m1981e1242d" y="345.988863"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="243.431465" xlink:href="#m1981e1242d" y="347.381119"/>
+    <g clip-path="url(#p2c9259b7f3)">
+     <use xlink:href="#mb640623e97" x="138.617365" y="278.456406" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb640623e97" x="155.949544" y="306.420613" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb640623e97" x="171.41337" y="323.381762" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb640623e97" x="186.287643" y="333.669219" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb640623e97" x="200.838524" y="339.908877" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb640623e97" x="215.177236" y="343.693421" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb640623e97" x="229.362916" y="345.988863" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb640623e97" x="243.431465" y="347.381119" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
     </g>
    </g>
    <g id="line2d_51">
-    <g clip-path="url(#pb43d30e4a6)">
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="125.263636" xlink:href="#me44e253235" y="291.278603"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="137.945455" xlink:href="#me44e253235" y="326.443368"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="150.627273" xlink:href="#me44e253235" y="347.712141"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="163.309091" xlink:href="#me44e253235" y="361.394367"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="175.990909" xlink:href="#me44e253235" y="370.528058"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="188.672727" xlink:href="#me44e253235" y="376.878114"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="201.354545" xlink:href="#me44e253235" y="381.502117"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="214.036364" xlink:href="#me44e253235" y="385.041568"/>
+    <g clip-path="url(#p2c9259b7f3)">
+     <use xlink:href="#mb36b1c4c73" x="125.263636" y="291.278603" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="137.945455" y="326.443368" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="150.627273" y="347.712141" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="163.309091" y="361.394367" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="175.990909" y="370.528058" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="188.672727" y="376.878114" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="201.354545" y="381.502117" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="214.036364" y="385.041568" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
     </g>
    </g>
    <g id="line2d_52">
-    <g clip-path="url(#pb43d30e4a6)">
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="125.263636" xlink:href="#me44e253235" y="252.812014"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="137.945455" xlink:href="#me44e253235" y="266.375103"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="150.627273" xlink:href="#me44e253235" y="274.721004"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="163.309091" xlink:href="#me44e253235" y="278.218922"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="175.990909" xlink:href="#me44e253235" y="278.670515"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="188.672727" xlink:href="#me44e253235" y="277.324034"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="201.354545" xlink:href="#me44e253235" y="274.962354"/>
-     <use style="fill:#0000ff;stroke:#0000ff;stroke-width:0.5;" x="214.036364" xlink:href="#me44e253235" y="272.060219"/>
+    <g clip-path="url(#p2c9259b7f3)">
+     <use xlink:href="#mb36b1c4c73" x="125.263636" y="252.812014" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="137.945455" y="266.375103" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="150.627273" y="274.721004" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="163.309091" y="278.218922" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="175.990909" y="278.670515" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="188.672727" y="277.324034" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="201.354545" y="274.962354" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
+     <use xlink:href="#mb36b1c4c73" x="214.036364" y="272.060219" style="fill: #0000ff; stroke: #0000ff; stroke-width: 0.5"/>
     </g>
    </g>
    <g id="line2d_53">
-    <path clip-path="url(#pb43d30e4a6)" d="M 125.263636 278.456406 
+    <path d="M 125.263636 278.456406 
 L 137.945455 306.420613 
 L 150.627273 323.381762 
 L 163.309091 333.669219 
@@ -1291,67 +1320,67 @@ L 175.990909 339.908877
 L 188.672727 343.693421 
 L 201.354545 345.988863 
 L 214.036364 347.381119 
-" style="fill:none;stroke:#0000ff;stroke-dasharray:6,6;stroke-dashoffset:0;"/>
-    <g clip-path="url(#pb43d30e4a6)">
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="125.263636" xlink:href="#mbb289507d7" y="278.456406"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="137.945455" xlink:href="#mbb289507d7" y="306.420613"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="150.627273" xlink:href="#mbb289507d7" y="323.381762"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="163.309091" xlink:href="#mbb289507d7" y="333.669219"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="175.990909" xlink:href="#mbb289507d7" y="339.908877"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="188.672727" xlink:href="#mbb289507d7" y="343.693421"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="201.354545" xlink:href="#mbb289507d7" y="345.988863"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="214.036364" xlink:href="#mbb289507d7" y="347.381119"/>
+" clip-path="url(#p2c9259b7f3)" style="fill: none; stroke-dasharray: 6,6; stroke-dashoffset: 0; stroke: #0000ff"/>
+    <g clip-path="url(#p2c9259b7f3)">
+     <use xlink:href="#m5fc5ffe7dc" x="125.263636" y="278.456406" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="137.945455" y="306.420613" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="150.627273" y="323.381762" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="163.309091" y="333.669219" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="175.990909" y="339.908877" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="188.672727" y="343.693421" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="201.354545" y="345.988863" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="214.036364" y="347.381119" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
     </g>
    </g>
    <g id="patch_13">
     <path d="M 72 388.8 
 L 72 231.709091 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="patch_14">
     <path d="M 274.909091 388.8 
 L 274.909091 231.709091 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="patch_15">
     <path d="M 72 388.8 
 L 274.909091 388.8 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="patch_16">
     <path d="M 72 231.709091 
 L 274.909091 231.709091 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="matplotlib.axis_5">
     <g id="xtick_11">
      <g id="line2d_54">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m368fc901b1" y="388.8"/>
+       <use xlink:href="#m441ccbbe42" x="72" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_55">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#mc63e59a608" y="231.709091"/>
+       <use xlink:href="#mad5646bafe" x="72" y="231.709091" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_14">
       <!-- −2 -->
       <g transform="translate(63.154688 401.918125)scale(0.12 -0.12)">
        <use xlink:href="#DejaVuSans-2212"/>
-       <use x="83.789062" xlink:href="#DejaVuSans-32"/>
+       <use xlink:href="#DejaVuSans-32" x="83.789062"/>
       </g>
      </g>
     </g>
     <g id="xtick_12">
      <g id="line2d_56">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="122.727273" xlink:href="#m368fc901b1" y="388.8"/>
+       <use xlink:href="#m441ccbbe42" x="122.727273" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_57">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="122.727273" xlink:href="#mc63e59a608" y="231.709091"/>
+       <use xlink:href="#mad5646bafe" x="122.727273" y="231.709091" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_15">
@@ -1364,12 +1393,12 @@ L 274.909091 231.709091
     <g id="xtick_13">
      <g id="line2d_58">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="173.454545" xlink:href="#m368fc901b1" y="388.8"/>
+       <use xlink:href="#m441ccbbe42" x="173.454545" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_59">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="173.454545" xlink:href="#mc63e59a608" y="231.709091"/>
+       <use xlink:href="#mad5646bafe" x="173.454545" y="231.709091" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_16">
@@ -1382,12 +1411,12 @@ L 274.909091 231.709091
     <g id="xtick_14">
      <g id="line2d_60">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="224.181818" xlink:href="#m368fc901b1" y="388.8"/>
+       <use xlink:href="#m441ccbbe42" x="224.181818" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_61">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="224.181818" xlink:href="#mc63e59a608" y="231.709091"/>
+       <use xlink:href="#mad5646bafe" x="224.181818" y="231.709091" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_17">
@@ -1400,12 +1429,12 @@ L 274.909091 231.709091
     <g id="xtick_15">
      <g id="line2d_62">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m368fc901b1" y="388.8"/>
+       <use xlink:href="#m441ccbbe42" x="274.909091" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_63">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#mc63e59a608" y="231.709091"/>
+       <use xlink:href="#mad5646bafe" x="274.909091" y="231.709091" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_18">
@@ -1420,133 +1449,134 @@ L 274.909091 231.709091
     <g id="ytick_12">
      <g id="line2d_64">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m556f96d829" y="388.8"/>
+       <use xlink:href="#mebf891ec74" x="72" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_65">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m27e32ca04a" y="388.8"/>
+       <use xlink:href="#m0be78051dd" x="274.909091" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_19">
       <!-- −0.5 -->
       <g transform="translate(38.860625 393.359062)scale(0.12 -0.12)">
        <use xlink:href="#DejaVuSans-2212"/>
-       <use x="83.789062" xlink:href="#DejaVuSans-30"/>
-       <use x="147.412109" xlink:href="#DejaVuSans-2e"/>
-       <use x="179.199219" xlink:href="#DejaVuSans-35"/>
+       <use xlink:href="#DejaVuSans-30" x="83.789062"/>
+       <use xlink:href="#DejaVuSans-2e" x="147.412109"/>
+       <use xlink:href="#DejaVuSans-35" x="179.199219"/>
       </g>
      </g>
     </g>
     <g id="ytick_13">
      <g id="line2d_66">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m556f96d829" y="349.527273"/>
+       <use xlink:href="#mebf891ec74" x="72" y="349.527273" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_67">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m27e32ca04a" y="349.527273"/>
+       <use xlink:href="#m0be78051dd" x="274.909091" y="349.527273" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_20">
       <!-- 0.0 -->
       <g transform="translate(48.91625 354.086335)scale(0.12 -0.12)">
        <use xlink:href="#DejaVuSans-30"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-30"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-30" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_14">
      <g id="line2d_68">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m556f96d829" y="310.254545"/>
+       <use xlink:href="#mebf891ec74" x="72" y="310.254545" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_69">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m27e32ca04a" y="310.254545"/>
+       <use xlink:href="#m0be78051dd" x="274.909091" y="310.254545" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_21">
       <!-- 0.5 -->
       <g transform="translate(48.91625 314.813608)scale(0.12 -0.12)">
        <use xlink:href="#DejaVuSans-30"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-35"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-35" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_15">
      <g id="line2d_70">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m556f96d829" y="270.981818"/>
+       <use xlink:href="#mebf891ec74" x="72" y="270.981818" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_71">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m27e32ca04a" y="270.981818"/>
+       <use xlink:href="#m0be78051dd" x="274.909091" y="270.981818" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_22">
       <!-- 1.0 -->
       <g transform="translate(48.91625 275.540881)scale(0.12 -0.12)">
        <use xlink:href="#DejaVuSans-31"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-30"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-30" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_16">
      <g id="line2d_72">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m556f96d829" y="231.709091"/>
+       <use xlink:href="#mebf891ec74" x="72" y="231.709091" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_73">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m27e32ca04a" y="231.709091"/>
+       <use xlink:href="#m0be78051dd" x="274.909091" y="231.709091" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_23">
       <!-- 1.5 -->
       <g transform="translate(48.91625 236.268153)scale(0.12 -0.12)">
        <use xlink:href="#DejaVuSans-31"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-35"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-35" x="95.410156"/>
       </g>
      </g>
     </g>
    </g>
    <g id="text_24">
     <!-- H, V asymmetric -->
-    <defs>
-     <path d="M 11.71875 12.40625 
-L 22.015625 12.40625 
-L 22.015625 4 
-L 14.015625 -11.625 
-L 7.71875 -11.625 
-L 11.71875 4 
-z
-" id="DejaVuSans-2c"/>
-    </defs>
     <g transform="translate(113.627045 226.709091)scale(0.144 -0.144)">
+     <defs>
+      <path id="DejaVuSans-2c" d="M 750 794 
+L 1409 794 
+L 1409 256 
+L 897 -744 
+L 494 -744 
+L 750 256 
+L 750 794 
+z
+" transform="scale(0.015625)"/>
+     </defs>
      <use xlink:href="#DejaVuSans-48"/>
-     <use x="75.195312" xlink:href="#DejaVuSans-2c"/>
-     <use x="106.982422" xlink:href="#DejaVuSans-20"/>
-     <use x="138.769531" xlink:href="#DejaVuSans-56"/>
-     <use x="207.177734" xlink:href="#DejaVuSans-20"/>
-     <use x="238.964844" xlink:href="#DejaVuSans-61"/>
-     <use x="300.244141" xlink:href="#DejaVuSans-73"/>
-     <use x="352.34375" xlink:href="#DejaVuSans-79"/>
-     <use x="411.523438" xlink:href="#DejaVuSans-6d"/>
-     <use x="508.935547" xlink:href="#DejaVuSans-6d"/>
-     <use x="606.347656" xlink:href="#DejaVuSans-65"/>
-     <use x="667.871094" xlink:href="#DejaVuSans-74"/>
-     <use x="707.080078" xlink:href="#DejaVuSans-72"/>
-     <use x="748.193359" xlink:href="#DejaVuSans-69"/>
-     <use x="775.976562" xlink:href="#DejaVuSans-63"/>
+     <use xlink:href="#DejaVuSans-2c" x="75.195312"/>
+     <use xlink:href="#DejaVuSans-20" x="106.982422"/>
+     <use xlink:href="#DejaVuSans-56" x="138.769531"/>
+     <use xlink:href="#DejaVuSans-20" x="207.177734"/>
+     <use xlink:href="#DejaVuSans-61" x="238.964844"/>
+     <use xlink:href="#DejaVuSans-73" x="300.244141"/>
+     <use xlink:href="#DejaVuSans-79" x="352.34375"/>
+     <use xlink:href="#DejaVuSans-6d" x="411.523438"/>
+     <use xlink:href="#DejaVuSans-6d" x="508.935547"/>
+     <use xlink:href="#DejaVuSans-65" x="606.347656"/>
+     <use xlink:href="#DejaVuSans-74" x="667.871094"/>
+     <use xlink:href="#DejaVuSans-72" x="707.080078"/>
+     <use xlink:href="#DejaVuSans-69" x="748.193359"/>
+     <use xlink:href="#DejaVuSans-63" x="775.976562"/>
     </g>
    </g>
   </g>
@@ -1557,179 +1587,179 @@ L 518.4 388.8
 L 518.4 231.709091 
 L 315.490909 231.709091 
 z
-" style="fill:#ffffff;"/>
+" style="fill: #ffffff"/>
    </g>
    <g id="LineCollection_5">
-    <path clip-path="url(#p42cc34013b)" d="M 362.077681 286.346851 
+    <path d="M 362.077681 286.346851 
 L 375.43141 286.346851 
-" style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p42cc34013b)" d="M 372.434319 297.71747 
+" clip-path="url(#pc7f973f0cd)" style="fill: none; stroke: #008000"/>
+    <path d="M 372.434319 297.71747 
 L 390.438409 297.71747 
-" style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p42cc34013b)" d="M 383.725133 309.088089 
+" clip-path="url(#pc7f973f0cd)" style="fill: none; stroke: #008000"/>
+    <path d="M 383.725133 309.088089 
 L 404.51123 309.088089 
-" style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p42cc34013b)" d="M 395.310724 320.458709 
+" clip-path="url(#pc7f973f0cd)" style="fill: none; stroke: #008000"/>
+    <path d="M 395.310724 320.458709 
 L 418.289276 320.458709 
-" style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p42cc34013b)" d="M 407.058011 331.829328 
+" clip-path="url(#pc7f973f0cd)" style="fill: none; stroke: #008000"/>
+    <path d="M 407.058011 331.829328 
 L 431.905626 331.829328 
-" style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p42cc34013b)" d="M 418.911382 343.199947 
+" clip-path="url(#pc7f973f0cd)" style="fill: none; stroke: #008000"/>
+    <path d="M 418.911382 343.199947 
 L 445.415891 343.199947 
-" style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p42cc34013b)" d="M 430.841269 354.570566 
+" clip-path="url(#pc7f973f0cd)" style="fill: none; stroke: #008000"/>
+    <path d="M 430.841269 354.570566 
 L 458.84964 354.570566 
-" style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p42cc34013b)" d="M 442.829722 365.941185 
+" clip-path="url(#pc7f973f0cd)" style="fill: none; stroke: #008000"/>
+    <path d="M 442.829722 365.941185 
 L 472.224823 365.941185 
-" style="fill:none;stroke:#008000;"/>
+" clip-path="url(#pc7f973f0cd)" style="fill: none; stroke: #008000"/>
    </g>
    <g id="LineCollection_6">
-    <path clip-path="url(#p42cc34013b)" d="M 368.754545 290.871362 
+    <path d="M 368.754545 290.871362 
 L 368.754545 279.340419 
-" style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p42cc34013b)" d="M 381.436364 311.920326 
+" clip-path="url(#pc7f973f0cd)" style="fill: none; stroke: #008000"/>
+    <path d="M 381.436364 311.920326 
 L 381.436364 282.776595 
-" style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p42cc34013b)" d="M 394.118182 369.750787 
+" clip-path="url(#pc7f973f0cd)" style="fill: none; stroke: #008000"/>
+    <path d="M 394.118182 369.750787 
 L 394.118182 285.18195 
-" style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p42cc34013b)" d="M 406.8 388.8 
+" clip-path="url(#pc7f973f0cd)" style="fill: none; stroke: #008000"/>
+    <path d="M 406.8 388.8 
 L 406.8 286.270988 
-" style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p42cc34013b)" d="M 419.481818 388.8 
+" clip-path="url(#pc7f973f0cd)" style="fill: none; stroke: #008000"/>
+    <path d="M 419.481818 388.8 
 L 419.481818 286.415465 
-" style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p42cc34013b)" d="M 432.163636 388.8 
+" clip-path="url(#pc7f973f0cd)" style="fill: none; stroke: #008000"/>
+    <path d="M 432.163636 388.8 
 L 432.163636 285.987371 
-" style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p42cc34013b)" d="M 444.845455 388.8 
+" clip-path="url(#pc7f973f0cd)" style="fill: none; stroke: #008000"/>
+    <path d="M 444.845455 388.8 
 L 444.845455 285.255439 
-" style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p42cc34013b)" d="M 457.527273 388.8 
+" clip-path="url(#pc7f973f0cd)" style="fill: none; stroke: #008000"/>
+    <path d="M 457.527273 388.8 
 L 457.527273 284.387119 
-" style="fill:none;stroke:#008000;"/>
+" clip-path="url(#pc7f973f0cd)" style="fill: none; stroke: #008000"/>
    </g>
    <g id="line2d_74">
     <defs>
-     <path d="M 0 3 
+     <path id="mca031b6b5e" d="M 0 3 
 L 0 -3 
-" id="mef9c074d9e" style="stroke:#008000;stroke-width:2;"/>
+" style="stroke: #008000; stroke-width: 2"/>
     </defs>
-    <g clip-path="url(#p42cc34013b)">
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="362.077681" xlink:href="#mef9c074d9e" y="286.346851"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="372.434319" xlink:href="#mef9c074d9e" y="297.71747"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="383.725133" xlink:href="#mef9c074d9e" y="309.088089"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="395.310724" xlink:href="#mef9c074d9e" y="320.458709"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="407.058011" xlink:href="#mef9c074d9e" y="331.829328"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="418.911382" xlink:href="#mef9c074d9e" y="343.199947"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="430.841269" xlink:href="#mef9c074d9e" y="354.570566"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="442.829722" xlink:href="#mef9c074d9e" y="365.941185"/>
+    <g clip-path="url(#pc7f973f0cd)">
+     <use xlink:href="#mca031b6b5e" x="362.077681" y="286.346851" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#mca031b6b5e" x="372.434319" y="297.71747" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#mca031b6b5e" x="383.725133" y="309.088089" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#mca031b6b5e" x="395.310724" y="320.458709" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#mca031b6b5e" x="407.058011" y="331.829328" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#mca031b6b5e" x="418.911382" y="343.199947" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#mca031b6b5e" x="430.841269" y="354.570566" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#mca031b6b5e" x="442.829722" y="365.941185" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
     </g>
    </g>
    <g id="line2d_75">
-    <g clip-path="url(#p42cc34013b)">
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="375.43141" xlink:href="#mef9c074d9e" y="286.346851"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="390.438409" xlink:href="#mef9c074d9e" y="297.71747"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="404.51123" xlink:href="#mef9c074d9e" y="309.088089"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="418.289276" xlink:href="#mef9c074d9e" y="320.458709"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="431.905626" xlink:href="#mef9c074d9e" y="331.829328"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="445.415891" xlink:href="#mef9c074d9e" y="343.199947"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="458.84964" xlink:href="#mef9c074d9e" y="354.570566"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="472.224823" xlink:href="#mef9c074d9e" y="365.941185"/>
+    <g clip-path="url(#pc7f973f0cd)">
+     <use xlink:href="#mca031b6b5e" x="375.43141" y="286.346851" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#mca031b6b5e" x="390.438409" y="297.71747" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#mca031b6b5e" x="404.51123" y="309.088089" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#mca031b6b5e" x="418.289276" y="320.458709" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#mca031b6b5e" x="431.905626" y="331.829328" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#mca031b6b5e" x="445.415891" y="343.199947" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#mca031b6b5e" x="458.84964" y="354.570566" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#mca031b6b5e" x="472.224823" y="365.941185" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
     </g>
    </g>
    <g id="line2d_76">
     <defs>
-     <path d="M 3 0 
+     <path id="m26f48b3904" d="M 3 0 
 L -3 -0 
-" id="maff64b0a79" style="stroke:#008000;stroke-width:2;"/>
+" style="stroke: #008000; stroke-width: 2"/>
     </defs>
-    <g clip-path="url(#p42cc34013b)">
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="368.754545" xlink:href="#maff64b0a79" y="290.871362"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="381.436364" xlink:href="#maff64b0a79" y="311.920326"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="394.118182" xlink:href="#maff64b0a79" y="369.750787"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="406.8" xlink:href="#maff64b0a79" y="388.8"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="419.481818" xlink:href="#maff64b0a79" y="388.8"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="432.163636" xlink:href="#maff64b0a79" y="388.8"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="444.845455" xlink:href="#maff64b0a79" y="388.8"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="457.527273" xlink:href="#maff64b0a79" y="388.8"/>
+    <g clip-path="url(#pc7f973f0cd)">
+     <use xlink:href="#m26f48b3904" x="368.754545" y="290.871362" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#m26f48b3904" x="381.436364" y="311.920326" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#m26f48b3904" x="394.118182" y="369.750787" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#m26f48b3904" x="406.8" y="388.8" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#m26f48b3904" x="419.481818" y="388.8" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#m26f48b3904" x="432.163636" y="388.8" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#m26f48b3904" x="444.845455" y="388.8" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#m26f48b3904" x="457.527273" y="388.8" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
     </g>
    </g>
    <g id="line2d_77">
-    <g clip-path="url(#p42cc34013b)">
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="368.754545" xlink:href="#maff64b0a79" y="279.340419"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="381.436364" xlink:href="#maff64b0a79" y="282.776595"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="394.118182" xlink:href="#maff64b0a79" y="285.18195"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="406.8" xlink:href="#maff64b0a79" y="286.270988"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="419.481818" xlink:href="#maff64b0a79" y="286.415465"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="432.163636" xlink:href="#maff64b0a79" y="285.987371"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="444.845455" xlink:href="#maff64b0a79" y="285.255439"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:2;" x="457.527273" xlink:href="#maff64b0a79" y="284.387119"/>
+    <g clip-path="url(#pc7f973f0cd)">
+     <use xlink:href="#m26f48b3904" x="368.754545" y="279.340419" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#m26f48b3904" x="381.436364" y="282.776595" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#m26f48b3904" x="394.118182" y="285.18195" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#m26f48b3904" x="406.8" y="286.270988" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#m26f48b3904" x="419.481818" y="286.415465" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#m26f48b3904" x="432.163636" y="285.987371" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#m26f48b3904" x="444.845455" y="285.255439" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
+     <use xlink:href="#m26f48b3904" x="457.527273" y="284.387119" style="fill: #008000; stroke: #008000; stroke-width: 2"/>
     </g>
    </g>
    <g id="line2d_78">
-    <g clip-path="url(#p42cc34013b)">
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="368.754545" xlink:href="#mbb289507d7" y="286.346851"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="381.436364" xlink:href="#mbb289507d7" y="297.71747"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="394.118182" xlink:href="#mbb289507d7" y="309.088089"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="406.8" xlink:href="#mbb289507d7" y="320.458709"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="419.481818" xlink:href="#mbb289507d7" y="331.829328"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="432.163636" xlink:href="#mbb289507d7" y="343.199947"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="444.845455" xlink:href="#mbb289507d7" y="354.570566"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="457.527273" xlink:href="#mbb289507d7" y="365.941185"/>
+    <g clip-path="url(#pc7f973f0cd)">
+     <use xlink:href="#m5fc5ffe7dc" x="368.754545" y="286.346851" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="381.436364" y="297.71747" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="394.118182" y="309.088089" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="406.8" y="320.458709" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="419.481818" y="331.829328" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="432.163636" y="343.199947" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="444.845455" y="354.570566" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m5fc5ffe7dc" x="457.527273" y="365.941185" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
     </g>
    </g>
    <g id="patch_18">
     <path d="M 315.490909 388.8 
 L 315.490909 231.709091 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="patch_19">
     <path d="M 518.4 388.8 
 L 518.4 231.709091 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="patch_20">
     <path d="M 315.490909 388.8 
 L 518.4 388.8 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="patch_21">
     <path d="M 315.490909 231.709091 
 L 518.4 231.709091 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="matplotlib.axis_7">
     <g id="xtick_16">
      <g id="line2d_79">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#m368fc901b1" y="388.8"/>
+       <use xlink:href="#m441ccbbe42" x="315.490909" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_80">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mc63e59a608" y="231.709091"/>
+       <use xlink:href="#mad5646bafe" x="315.490909" y="231.709091" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_25">
       <!-- −2 -->
       <g transform="translate(306.645597 401.918125)scale(0.12 -0.12)">
        <use xlink:href="#DejaVuSans-2212"/>
-       <use x="83.789062" xlink:href="#DejaVuSans-32"/>
+       <use xlink:href="#DejaVuSans-32" x="83.789062"/>
       </g>
      </g>
     </g>
     <g id="xtick_17">
      <g id="line2d_81">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="366.218182" xlink:href="#m368fc901b1" y="388.8"/>
+       <use xlink:href="#m441ccbbe42" x="366.218182" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_82">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="366.218182" xlink:href="#mc63e59a608" y="231.709091"/>
+       <use xlink:href="#mad5646bafe" x="366.218182" y="231.709091" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_26">
@@ -1742,12 +1772,12 @@ L 518.4 231.709091
     <g id="xtick_18">
      <g id="line2d_83">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="416.945455" xlink:href="#m368fc901b1" y="388.8"/>
+       <use xlink:href="#m441ccbbe42" x="416.945455" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_84">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="416.945455" xlink:href="#mc63e59a608" y="231.709091"/>
+       <use xlink:href="#mad5646bafe" x="416.945455" y="231.709091" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_27">
@@ -1760,12 +1790,12 @@ L 518.4 231.709091
     <g id="xtick_19">
      <g id="line2d_85">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="467.672727" xlink:href="#m368fc901b1" y="388.8"/>
+       <use xlink:href="#m441ccbbe42" x="467.672727" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_86">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="467.672727" xlink:href="#mc63e59a608" y="231.709091"/>
+       <use xlink:href="#mad5646bafe" x="467.672727" y="231.709091" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_28">
@@ -1778,12 +1808,12 @@ L 518.4 231.709091
     <g id="xtick_20">
      <g id="line2d_87">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m368fc901b1" y="388.8"/>
+       <use xlink:href="#m441ccbbe42" x="518.4" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_88">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#mc63e59a608" y="231.709091"/>
+       <use xlink:href="#mad5646bafe" x="518.4" y="231.709091" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_29">
@@ -1798,568 +1828,564 @@ L 518.4 231.709091
     <g id="ytick_17">
      <g id="line2d_89">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#m556f96d829" y="388.8"/>
+       <use xlink:href="#mebf891ec74" x="315.490909" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_90">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m27e32ca04a" y="388.8"/>
+       <use xlink:href="#m0be78051dd" x="518.4" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_30">
-      <!-- $\mathdefault{10^{-2}}$ -->
-      <defs>
-       <path d="M 4.890625 31.390625 
-L 31.203125 31.390625 
-L 31.203125 23.390625 
-L 4.890625 23.390625 
-z
-" id="DejaVuSans-2d"/>
-      </defs>
-      <g transform="translate(287.370909 393.359062)scale(0.12 -0.12)">
-       <use transform="translate(0 0.765625)" xlink:href="#DejaVuSans-31"/>
-       <use transform="translate(63.623047 0.765625)" xlink:href="#DejaVuSans-30"/>
-       <use transform="translate(128.203125 39.046875)scale(0.7)" xlink:href="#DejaVuSans-2d"/>
-       <use transform="translate(153.461914 39.046875)scale(0.7)" xlink:href="#DejaVuSans-32"/>
+      <!-- $\mathdefault{10^{−2}}$ -->
+      <g transform="translate(283.290909 393.359062)scale(0.12 -0.12)">
+       <use xlink:href="#DejaVuSans-31" transform="translate(0 0.765625)"/>
+       <use xlink:href="#DejaVuSans-30" transform="translate(63.623047 0.765625)"/>
+       <use xlink:href="#DejaVuSans-2212" transform="translate(128.203125 39.046875)scale(0.7)"/>
+       <use xlink:href="#DejaVuSans-32" transform="translate(186.855469 39.046875)scale(0.7)"/>
       </g>
      </g>
     </g>
     <g id="ytick_18">
      <g id="line2d_91">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#m556f96d829" y="336.436364"/>
+       <use xlink:href="#mebf891ec74" x="315.490909" y="336.436364" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_92">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m27e32ca04a" y="336.436364"/>
+       <use xlink:href="#m0be78051dd" x="518.4" y="336.436364" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_31">
-      <!-- $\mathdefault{10^{-1}}$ -->
-      <g transform="translate(287.370909 340.995426)scale(0.12 -0.12)">
-       <use transform="translate(0 0.684375)" xlink:href="#DejaVuSans-31"/>
-       <use transform="translate(63.623047 0.684375)" xlink:href="#DejaVuSans-30"/>
-       <use transform="translate(128.203125 38.965625)scale(0.7)" xlink:href="#DejaVuSans-2d"/>
-       <use transform="translate(153.461914 38.965625)scale(0.7)" xlink:href="#DejaVuSans-31"/>
+      <!-- $\mathdefault{10^{−1}}$ -->
+      <g transform="translate(283.290909 340.995426)scale(0.12 -0.12)">
+       <use xlink:href="#DejaVuSans-31" transform="translate(0 0.684375)"/>
+       <use xlink:href="#DejaVuSans-30" transform="translate(63.623047 0.684375)"/>
+       <use xlink:href="#DejaVuSans-2212" transform="translate(128.203125 38.965625)scale(0.7)"/>
+       <use xlink:href="#DejaVuSans-31" transform="translate(186.855469 38.965625)scale(0.7)"/>
       </g>
      </g>
     </g>
     <g id="ytick_19">
      <g id="line2d_93">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#m556f96d829" y="284.072727"/>
+       <use xlink:href="#mebf891ec74" x="315.490909" y="284.072727" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_94">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m27e32ca04a" y="284.072727"/>
+       <use xlink:href="#m0be78051dd" x="518.4" y="284.072727" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_32">
       <!-- $\mathdefault{10^{0}}$ -->
       <g transform="translate(290.370909 288.63179)scale(0.12 -0.12)">
-       <use transform="translate(0 0.765625)" xlink:href="#DejaVuSans-31"/>
-       <use transform="translate(63.623047 0.765625)" xlink:href="#DejaVuSans-30"/>
-       <use transform="translate(128.203125 39.046875)scale(0.7)" xlink:href="#DejaVuSans-30"/>
+       <use xlink:href="#DejaVuSans-31" transform="translate(0 0.765625)"/>
+       <use xlink:href="#DejaVuSans-30" transform="translate(63.623047 0.765625)"/>
+       <use xlink:href="#DejaVuSans-30" transform="translate(128.203125 39.046875)scale(0.7)"/>
       </g>
      </g>
     </g>
     <g id="ytick_20">
      <g id="line2d_95">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#m556f96d829" y="231.709091"/>
+       <use xlink:href="#mebf891ec74" x="315.490909" y="231.709091" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_96">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m27e32ca04a" y="231.709091"/>
+       <use xlink:href="#m0be78051dd" x="518.4" y="231.709091" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_33">
       <!-- $\mathdefault{10^{1}}$ -->
       <g transform="translate(290.370909 236.268153)scale(0.12 -0.12)">
-       <use transform="translate(0 0.684375)" xlink:href="#DejaVuSans-31"/>
-       <use transform="translate(63.623047 0.684375)" xlink:href="#DejaVuSans-30"/>
-       <use transform="translate(128.203125 38.965625)scale(0.7)" xlink:href="#DejaVuSans-31"/>
+       <use xlink:href="#DejaVuSans-31" transform="translate(0 0.684375)"/>
+       <use xlink:href="#DejaVuSans-30" transform="translate(63.623047 0.684375)"/>
+       <use xlink:href="#DejaVuSans-31" transform="translate(128.203125 38.965625)scale(0.7)"/>
       </g>
      </g>
     </g>
     <g id="ytick_21">
      <g id="line2d_97">
       <defs>
-       <path d="M 0 0 
+       <path id="m120f126a94" d="M 0 0 
 L 2 0 
-" id="mb12535d6a8" style="stroke:#000000;stroke-width:0.5;"/>
+" style="stroke: #000000; stroke-width: 0.5"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="373.036975"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="373.036975" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_98">
       <defs>
-       <path d="M 0 0 
+       <path id="mb5855ff236" d="M 0 0 
 L -2 0 
-" id="m8a2e629618" style="stroke:#000000;stroke-width:0.5;"/>
+" style="stroke: #000000; stroke-width: 0.5"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="373.036975"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="373.036975" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_22">
      <g id="line2d_99">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="363.816196"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="363.816196" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_100">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="363.816196"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="363.816196" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_23">
      <g id="line2d_101">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="357.27395"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="357.27395" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_102">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="357.27395"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="357.27395" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_24">
      <g id="line2d_103">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="352.199389"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="352.199389" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_104">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="352.199389"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="352.199389" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_25">
      <g id="line2d_105">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="348.053171"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="348.053171" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_106">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="348.053171"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="348.053171" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_26">
      <g id="line2d_107">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="344.547594"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="344.547594" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_108">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="344.547594"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="344.547594" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_27">
      <g id="line2d_109">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="341.510924"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="341.510924" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_110">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="341.510924"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="341.510924" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_28">
      <g id="line2d_111">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="338.832392"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="338.832392" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_112">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="338.832392"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="338.832392" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_29">
      <g id="line2d_113">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="320.673338"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="320.673338" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_114">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="320.673338"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="320.673338" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_30">
      <g id="line2d_115">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="311.45256"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="311.45256" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_116">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="311.45256"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="311.45256" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_31">
      <g id="line2d_117">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="304.910313"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="304.910313" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_118">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="304.910313"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="304.910313" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_32">
      <g id="line2d_119">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="299.835753"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="299.835753" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_120">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="299.835753"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="299.835753" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_33">
      <g id="line2d_121">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="295.689535"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="295.689535" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_122">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="295.689535"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="295.689535" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_34">
      <g id="line2d_123">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="292.183957"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="292.183957" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_124">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="292.183957"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="292.183957" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_35">
      <g id="line2d_125">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="289.147288"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="289.147288" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_126">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="289.147288"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="289.147288" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_36">
      <g id="line2d_127">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="286.468756"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="286.468756" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_128">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="286.468756"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="286.468756" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_37">
      <g id="line2d_129">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="268.309702"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="268.309702" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_130">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="268.309702"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="268.309702" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_38">
      <g id="line2d_131">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="259.088923"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="259.088923" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_132">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="259.088923"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="259.088923" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_39">
      <g id="line2d_133">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="252.546677"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="252.546677" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_134">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="252.546677"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="252.546677" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_40">
      <g id="line2d_135">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="247.472116"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="247.472116" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_136">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="247.472116"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="247.472116" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_41">
      <g id="line2d_137">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="243.325898"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="243.325898" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_138">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="243.325898"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="243.325898" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_42">
      <g id="line2d_139">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="239.820321"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="239.820321" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_140">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="239.820321"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="239.820321" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_43">
      <g id="line2d_141">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="236.783652"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="236.783652" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_142">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="236.783652"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="236.783652" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
     <g id="ytick_44">
      <g id="line2d_143">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="315.490909" xlink:href="#mb12535d6a8" y="234.10512"/>
+       <use xlink:href="#m120f126a94" x="315.490909" y="234.10512" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_144">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="234.10512"/>
+       <use xlink:href="#mb5855ff236" x="518.4" y="234.10512" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
     </g>
    </g>
    <g id="text_34">
     <!-- Mixed sym., log y -->
-    <defs>
-     <path d="M 9.8125 72.90625 
-L 24.515625 72.90625 
-L 43.109375 23.296875 
-L 61.8125 72.90625 
-L 76.515625 72.90625 
-L 76.515625 0 
-L 66.890625 0 
-L 66.890625 64.015625 
-L 48.09375 14.015625 
-L 38.1875 14.015625 
-L 19.390625 64.015625 
-L 19.390625 0 
-L 9.8125 0 
+    <g transform="translate(353.76883 226.709091)scale(0.144 -0.144)">
+     <defs>
+      <path id="DejaVuSans-4d" d="M 628 4666 
+L 1569 4666 
+L 2759 1491 
+L 3956 4666 
+L 4897 4666 
+L 4897 0 
+L 4281 0 
+L 4281 4097 
+L 3078 897 
+L 2444 897 
+L 1241 4097 
+L 1241 0 
+L 628 0 
+L 628 4666 
 z
-" id="DejaVuSans-4d"/>
-     <path d="M 54.890625 54.6875 
-L 35.109375 28.078125 
-L 55.90625 0 
-L 45.3125 0 
-L 29.390625 21.484375 
-L 13.484375 0 
-L 2.875 0 
-L 24.125 28.609375 
-L 4.6875 54.6875 
-L 15.28125 54.6875 
-L 29.78125 35.203125 
-L 44.28125 54.6875 
+" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-78" d="M 3513 3500 
+L 2247 1797 
+L 3578 0 
+L 2900 0 
+L 1881 1375 
+L 863 0 
+L 184 0 
+L 1544 1831 
+L 300 3500 
+L 978 3500 
+L 1906 2253 
+L 2834 3500 
+L 3513 3500 
 z
-" id="DejaVuSans-78"/>
-     <path d="M 45.40625 46.390625 
-L 45.40625 75.984375 
-L 54.390625 75.984375 
-L 54.390625 0 
-L 45.40625 0 
-L 45.40625 8.203125 
-Q 42.578125 3.328125 38.25 0.953125 
-Q 33.9375 -1.421875 27.875 -1.421875 
-Q 17.96875 -1.421875 11.734375 6.484375 
-Q 5.515625 14.40625 5.515625 27.296875 
-Q 5.515625 40.1875 11.734375 48.09375 
-Q 17.96875 56 27.875 56 
-Q 33.9375 56 38.25 53.625 
-Q 42.578125 51.265625 45.40625 46.390625 
+" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-64" d="M 2906 2969 
+L 2906 4863 
+L 3481 4863 
+L 3481 0 
+L 2906 0 
+L 2906 525 
+Q 2725 213 2448 61 
+Q 2172 -91 1784 -91 
+Q 1150 -91 751 415 
+Q 353 922 353 1747 
+Q 353 2572 751 3078 
+Q 1150 3584 1784 3584 
+Q 2172 3584 2448 3432 
+Q 2725 3281 2906 2969 
 z
-M 14.796875 27.296875 
-Q 14.796875 17.390625 18.875 11.75 
-Q 22.953125 6.109375 30.078125 6.109375 
-Q 37.203125 6.109375 41.296875 11.75 
-Q 45.40625 17.390625 45.40625 27.296875 
-Q 45.40625 37.203125 41.296875 42.84375 
-Q 37.203125 48.484375 30.078125 48.484375 
-Q 22.953125 48.484375 18.875 42.84375 
-Q 14.796875 37.203125 14.796875 27.296875 
+M 947 1747 
+Q 947 1113 1208 752 
+Q 1469 391 1925 391 
+Q 2381 391 2643 752 
+Q 2906 1113 2906 1747 
+Q 2906 2381 2643 2742 
+Q 2381 3103 1925 3103 
+Q 1469 3103 1208 2742 
+Q 947 2381 947 1747 
 z
-" id="DejaVuSans-64"/>
-     <path d="M 45.40625 27.984375 
-Q 45.40625 37.75 41.375 43.109375 
-Q 37.359375 48.484375 30.078125 48.484375 
-Q 22.859375 48.484375 18.828125 43.109375 
-Q 14.796875 37.75 14.796875 27.984375 
-Q 14.796875 18.265625 18.828125 12.890625 
-Q 22.859375 7.515625 30.078125 7.515625 
-Q 37.359375 7.515625 41.375 12.890625 
-Q 45.40625 18.265625 45.40625 27.984375 
+" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-67" d="M 2906 1791 
+Q 2906 2416 2648 2759 
+Q 2391 3103 1925 3103 
+Q 1463 3103 1205 2759 
+Q 947 2416 947 1791 
+Q 947 1169 1205 825 
+Q 1463 481 1925 481 
+Q 2391 481 2648 825 
+Q 2906 1169 2906 1791 
 z
-M 54.390625 6.78125 
-Q 54.390625 -7.171875 48.1875 -13.984375 
-Q 42 -20.796875 29.203125 -20.796875 
-Q 24.46875 -20.796875 20.265625 -20.09375 
-Q 16.0625 -19.390625 12.109375 -17.921875 
-L 12.109375 -9.1875 
-Q 16.0625 -11.328125 19.921875 -12.34375 
-Q 23.78125 -13.375 27.78125 -13.375 
-Q 36.625 -13.375 41.015625 -8.765625 
-Q 45.40625 -4.15625 45.40625 5.171875 
-L 45.40625 9.625 
-Q 42.625 4.78125 38.28125 2.390625 
-Q 33.9375 0 27.875 0 
-Q 17.828125 0 11.671875 7.65625 
-Q 5.515625 15.328125 5.515625 27.984375 
-Q 5.515625 40.671875 11.671875 48.328125 
-Q 17.828125 56 27.875 56 
-Q 33.9375 56 38.28125 53.609375 
-Q 42.625 51.21875 45.40625 46.390625 
-L 45.40625 54.6875 
-L 54.390625 54.6875 
+M 3481 434 
+Q 3481 -459 3084 -895 
+Q 2688 -1331 1869 -1331 
+Q 1566 -1331 1297 -1286 
+Q 1028 -1241 775 -1147 
+L 775 -588 
+Q 1028 -725 1275 -790 
+Q 1522 -856 1778 -856 
+Q 2344 -856 2625 -561 
+Q 2906 -266 2906 331 
+L 2906 616 
+Q 2728 306 2450 153 
+Q 2172 0 1784 0 
+Q 1141 0 747 490 
+Q 353 981 353 1791 
+Q 353 2603 747 3093 
+Q 1141 3584 1784 3584 
+Q 2172 3584 2450 3431 
+Q 2728 3278 2906 2969 
+L 2906 3500 
+L 3481 3500 
+L 3481 434 
 z
-" id="DejaVuSans-67"/>
-    </defs>
-    <g transform="translate(353.76883 226.709091)scale(0.144 -0.144)">
+" transform="scale(0.015625)"/>
+     </defs>
      <use xlink:href="#DejaVuSans-4d"/>
-     <use x="86.279297" xlink:href="#DejaVuSans-69"/>
-     <use x="114.0625" xlink:href="#DejaVuSans-78"/>
-     <use x="173.195312" xlink:href="#DejaVuSans-65"/>
-     <use x="234.71875" xlink:href="#DejaVuSans-64"/>
-     <use x="298.195312" xlink:href="#DejaVuSans-20"/>
-     <use x="329.982422" xlink:href="#DejaVuSans-73"/>
-     <use x="382.082031" xlink:href="#DejaVuSans-79"/>
-     <use x="441.261719" xlink:href="#DejaVuSans-6d"/>
-     <use x="538.673828" xlink:href="#DejaVuSans-2e"/>
-     <use x="570.460938" xlink:href="#DejaVuSans-2c"/>
-     <use x="602.248047" xlink:href="#DejaVuSans-20"/>
-     <use x="634.035156" xlink:href="#DejaVuSans-6c"/>
-     <use x="661.818359" xlink:href="#DejaVuSans-6f"/>
-     <use x="723" xlink:href="#DejaVuSans-67"/>
-     <use x="786.476562" xlink:href="#DejaVuSans-20"/>
-     <use x="818.263672" xlink:href="#DejaVuSans-79"/>
+     <use xlink:href="#DejaVuSans-69" x="86.279297"/>
+     <use xlink:href="#DejaVuSans-78" x="114.0625"/>
+     <use xlink:href="#DejaVuSans-65" x="173.195312"/>
+     <use xlink:href="#DejaVuSans-64" x="234.71875"/>
+     <use xlink:href="#DejaVuSans-20" x="298.195312"/>
+     <use xlink:href="#DejaVuSans-73" x="329.982422"/>
+     <use xlink:href="#DejaVuSans-79" x="382.082031"/>
+     <use xlink:href="#DejaVuSans-6d" x="441.261719"/>
+     <use xlink:href="#DejaVuSans-2e" x="538.673828"/>
+     <use xlink:href="#DejaVuSans-2c" x="570.460938"/>
+     <use xlink:href="#DejaVuSans-20" x="602.248047"/>
+     <use xlink:href="#DejaVuSans-6c" x="634.035156"/>
+     <use xlink:href="#DejaVuSans-6f" x="661.818359"/>
+     <use xlink:href="#DejaVuSans-67" x="723"/>
+     <use xlink:href="#DejaVuSans-20" x="786.476562"/>
+     <use xlink:href="#DejaVuSans-79" x="818.263672"/>
     </g>
    </g>
   </g>
   <g id="text_35">
    <!-- Variable errorbars -->
-   <defs>
-    <path d="M 48.6875 27.296875 
-Q 48.6875 37.203125 44.609375 42.84375 
-Q 40.53125 48.484375 33.40625 48.484375 
-Q 26.265625 48.484375 22.1875 42.84375 
-Q 18.109375 37.203125 18.109375 27.296875 
-Q 18.109375 17.390625 22.1875 11.75 
-Q 26.265625 6.109375 33.40625 6.109375 
-Q 40.53125 6.109375 44.609375 11.75 
-Q 48.6875 17.390625 48.6875 27.296875 
+   <g transform="translate(233.502187 17.758125)scale(0.12 -0.12)">
+    <defs>
+     <path id="DejaVuSans-62" d="M 3116 1747 
+Q 3116 2381 2855 2742 
+Q 2594 3103 2138 3103 
+Q 1681 3103 1420 2742 
+Q 1159 2381 1159 1747 
+Q 1159 1113 1420 752 
+Q 1681 391 2138 391 
+Q 2594 391 2855 752 
+Q 3116 1113 3116 1747 
 z
-M 18.109375 46.390625 
-Q 20.953125 51.265625 25.265625 53.625 
-Q 29.59375 56 35.59375 56 
-Q 45.5625 56 51.78125 48.09375 
-Q 58.015625 40.1875 58.015625 27.296875 
-Q 58.015625 14.40625 51.78125 6.484375 
-Q 45.5625 -1.421875 35.59375 -1.421875 
-Q 29.59375 -1.421875 25.265625 0.953125 
-Q 20.953125 3.328125 18.109375 8.203125 
-L 18.109375 0 
-L 9.078125 0 
-L 9.078125 75.984375 
-L 18.109375 75.984375 
+M 1159 2969 
+Q 1341 3281 1617 3432 
+Q 1894 3584 2278 3584 
+Q 2916 3584 3314 3078 
+Q 3713 2572 3713 1747 
+Q 3713 922 3314 415 
+Q 2916 -91 2278 -91 
+Q 1894 -91 1617 61 
+Q 1341 213 1159 525 
+L 1159 0 
+L 581 0 
+L 581 4863 
+L 1159 4863 
+L 1159 2969 
 z
-" id="DejaVuSans-62"/>
-   </defs>
-   <g transform="translate(233.502187 17.758125)scale(0.12 -0.12)">
+" transform="scale(0.015625)"/>
+    </defs>
     <use xlink:href="#DejaVuSans-56"/>
-    <use x="68.298828" xlink:href="#DejaVuSans-61"/>
-    <use x="129.578125" xlink:href="#DejaVuSans-72"/>
-    <use x="170.691406" xlink:href="#DejaVuSans-69"/>
-    <use x="198.474609" xlink:href="#DejaVuSans-61"/>
-    <use x="259.753906" xlink:href="#DejaVuSans-62"/>
-    <use x="323.230469" xlink:href="#DejaVuSans-6c"/>
-    <use x="351.013672" xlink:href="#DejaVuSans-65"/>
-    <use x="412.537109" xlink:href="#DejaVuSans-20"/>
-    <use x="444.324219" xlink:href="#DejaVuSans-65"/>
-    <use x="505.847656" xlink:href="#DejaVuSans-72"/>
-    <use x="546.945312" xlink:href="#DejaVuSans-72"/>
-    <use x="588.027344" xlink:href="#DejaVuSans-6f"/>
-    <use x="649.208984" xlink:href="#DejaVuSans-72"/>
-    <use x="690.322266" xlink:href="#DejaVuSans-62"/>
-    <use x="753.798828" xlink:href="#DejaVuSans-61"/>
-    <use x="815.078125" xlink:href="#DejaVuSans-72"/>
-    <use x="856.191406" xlink:href="#DejaVuSans-73"/>
+    <use xlink:href="#DejaVuSans-61" x="68.298828"/>
+    <use xlink:href="#DejaVuSans-72" x="129.578125"/>
+    <use xlink:href="#DejaVuSans-69" x="170.691406"/>
+    <use xlink:href="#DejaVuSans-61" x="198.474609"/>
+    <use xlink:href="#DejaVuSans-62" x="259.753906"/>
+    <use xlink:href="#DejaVuSans-6c" x="323.230469"/>
+    <use xlink:href="#DejaVuSans-65" x="351.013672"/>
+    <use xlink:href="#DejaVuSans-20" x="412.537109"/>
+    <use xlink:href="#DejaVuSans-65" x="444.324219"/>
+    <use xlink:href="#DejaVuSans-72" x="505.847656"/>
+    <use xlink:href="#DejaVuSans-72" x="546.945312"/>
+    <use xlink:href="#DejaVuSans-6f" x="588.027344"/>
+    <use xlink:href="#DejaVuSans-72" x="649.208984"/>
+    <use xlink:href="#DejaVuSans-62" x="690.322266"/>
+    <use xlink:href="#DejaVuSans-61" x="753.798828"/>
+    <use xlink:href="#DejaVuSans-72" x="815.078125"/>
+    <use xlink:href="#DejaVuSans-73" x="856.191406"/>
    </g>
   </g>
  </g>
  <defs>
-  <clipPath id="pc7a66a3dce">
-   <rect height="157.090909" width="202.909091" x="72" y="43.2"/>
+  <clipPath id="p2bb8a737e6">
+   <rect x="72" y="43.2" width="202.909091" height="157.090909"/>
   </clipPath>
-  <clipPath id="p58107b0fbb">
-   <rect height="157.090909" width="202.909091" x="315.490909" y="43.2"/>
+  <clipPath id="p06e990243b">
+   <rect x="315.490909" y="43.2" width="202.909091" height="157.090909"/>
   </clipPath>
-  <clipPath id="pb43d30e4a6">
-   <rect height="157.090909" width="202.909091" x="72" y="231.709091"/>
+  <clipPath id="p2c9259b7f3">
+   <rect x="72" y="231.709091" width="202.909091" height="157.090909"/>
   </clipPath>
-  <clipPath id="p42cc34013b">
-   <rect height="157.090909" width="202.909091" x="315.490909" y="231.709091"/>
+  <clipPath id="pc7f973f0cd">
+   <rect x="315.490909" y="231.709091" width="202.909091" height="157.090909"/>
   </clipPath>
  </defs>
 </svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.pdf b/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.pdf
index eeb8969fa702..6a624dea46c8 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.png b/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.png
index 59c32a9084d7..007007ec6ee8 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.png and b/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.svg b/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.svg
index 35a003c97c21..2e77acfd7601 100644
--- a/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.svg
+++ b/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.svg
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (http://matplotlib.org/) -->
 <svg height="432pt" version="1.1" viewBox="0 0 576 432" width="576pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <metadata>
+  <rdf:RDF xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+   <cc:Work>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:date>2021-02-17T21:57:55.184111</dc:date>
+    <dc:format>image/svg+xml</dc:format>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Matplotlib v3.3.4.post2378.dev0+g01d3149b6, https://matplotlib.org/</dc:title>
+     </cc:Agent>
+    </dc:creator>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="patch_1">
@@ -27,7 +38,7 @@ z
 " style="fill:#ffffff;"/>
    </g>
    <g id="PolyCollection_1">
-    <path clip-path="url(#p2a28627d87)" d="M 72 121.745455 
+    <path clip-path="url(#p2336a28681)" d="M 72 121.745455 
 L 72 121.745455 
 L 76.464 115.182551 
 L 80.928 108.723148 
@@ -50,8 +61,8 @@ L 80.928 91.473805
 L 76.464 106.118686 
 L 72 121.745455 
 z
-" style="fill:url(#hd3108e6b65);stroke:#000000;"/>
-    <path clip-path="url(#p2a28627d87)" d="M 183.6 121.745455 
+" style="fill:url(#ha0fdf7a1f0);stroke:#000000;"/>
+    <path clip-path="url(#p2336a28681)" d="M 183.6 121.745455 
 L 188.064 128.308358 
 L 192.528 134.767761 
 L 196.992 141.021795 
@@ -84,8 +95,8 @@ L 196.992 78.731004
 L 192.528 91.473805 
 L 188.064 106.118686 
 z
-" style="fill:url(#hd3108e6b65);stroke:#000000;"/>
-    <path clip-path="url(#p2a28627d87)" d="M 295.2 121.745455 
+" style="fill:url(#ha0fdf7a1f0);stroke:#000000;"/>
+    <path clip-path="url(#p2336a28681)" d="M 295.2 121.745455 
 L 299.664 115.182551 
 L 304.128 108.723148 
 L 308.592 102.469114 
@@ -106,8 +117,8 @@ L 308.592 78.731004
 L 304.128 91.473805 
 L 299.664 106.118686 
 z
-" style="fill:url(#hd3108e6b65);stroke:#000000;"/>
-    <path clip-path="url(#p2a28627d87)" d="M 406.8 121.745455 
+" style="fill:url(#ha0fdf7a1f0);stroke:#000000;"/>
+    <path clip-path="url(#p2336a28681)" d="M 406.8 121.745455 
 L 411.264 128.308358 
 L 415.728 134.767761 
 L 420.192 141.021795 
@@ -140,16 +151,16 @@ L 420.192 78.731004
 L 415.728 91.473805 
 L 411.264 106.118686 
 z
-" style="fill:url(#hd3108e6b65);stroke:#000000;"/>
+" style="fill:url(#ha0fdf7a1f0);stroke:#000000;"/>
    </g>
    <g id="PolyCollection_2">
-    <path clip-path="url(#p2a28627d87)" d="M 72 121.745455 
+    <path clip-path="url(#p2336a28681)" d="M 72 121.745455 
 L 72 121.745455 
 L 72 121.745455 
 L 72 121.745455 
 z
 " style="fill:#ff0000;stroke:#000000;"/>
-    <path clip-path="url(#p2a28627d87)" d="M 112.508717 74.184994 
+    <path clip-path="url(#p2336a28681)" d="M 112.508717 74.184994 
 L 116.64 71.944677 
 L 121.104 70.309322 
 L 125.568 69.485146 
@@ -185,7 +196,7 @@ L 121.104 98.613846
 L 116.64 84.811167 
 z
 " style="fill:#ff0000;stroke:#000000;"/>
-    <path clip-path="url(#p2a28627d87)" d="M 254.691283 169.305915 
+    <path clip-path="url(#p2336a28681)" d="M 254.691283 169.305915 
 L 255.024 169.125489 
 L 259.488 165.957535 
 L 263.952 162.09233 
@@ -209,7 +220,7 @@ L 259.488 178.601496
 L 255.024 170.161705 
 z
 " style="fill:#ff0000;stroke:#000000;"/>
-    <path clip-path="url(#p2a28627d87)" d="M 335.708717 74.184994 
+    <path clip-path="url(#p2336a28681)" d="M 335.708717 74.184994 
 L 339.84 71.944677 
 L 344.304 70.309322 
 L 348.768 69.485146 
@@ -245,7 +256,7 @@ L 344.304 98.613846
 L 339.84 84.811167 
 z
 " style="fill:#ff0000;stroke:#000000;"/>
-    <path clip-path="url(#p2a28627d87)" d="M 477.891283 169.305915 
+    <path clip-path="url(#p2336a28681)" d="M 477.891283 169.305915 
 L 478.224 169.125489 
 L 482.688 165.957535 
 L 487.152 162.09233 
@@ -269,7 +280,7 @@ z
 " style="fill:#ff0000;stroke:#000000;"/>
    </g>
    <g id="line2d_1">
-    <path clip-path="url(#p2a28627d87)" d="M 72 121.745455 
+    <path clip-path="url(#p2336a28681)" d="M 72 121.745455 
 L 76.464 115.182551 
 L 80.928 108.723148 
 L 85.392 102.469114 
@@ -372,7 +383,7 @@ L 513.936 128.308358
 " style="fill:none;stroke:#000000;stroke-linecap:square;"/>
    </g>
    <g id="line2d_2">
-    <path clip-path="url(#p2a28627d87)" d="M 72 121.745455 
+    <path clip-path="url(#p2336a28681)" d="M 72 121.745455 
 L 76.464 106.118686 
 L 80.928 91.473805 
 L 85.392 78.731004 
@@ -500,68 +511,68 @@ L 518.4 43.2
       <defs>
        <path d="M 0 0 
 L 0 -4 
-" id="me5bf4c00e3" style="stroke:#000000;stroke-width:0.5;"/>
+" id="m58dade9745" style="stroke:#000000;stroke-width:0.5;"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#me5bf4c00e3" y="200.290909"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m58dade9745" y="200.290909"/>
       </g>
      </g>
      <g id="line2d_4">
       <defs>
        <path d="M 0 0 
 L 0 4 
-" id="m074e64995f" style="stroke:#000000;stroke-width:0.5;"/>
+" id="mc946a5ae82" style="stroke:#000000;stroke-width:0.5;"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m074e64995f" y="43.2"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#mc946a5ae82" y="43.2"/>
       </g>
      </g>
     </g>
     <g id="xtick_2">
      <g id="line2d_5">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="183.6" xlink:href="#me5bf4c00e3" y="200.290909"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="183.6" xlink:href="#m58dade9745" y="200.290909"/>
       </g>
      </g>
      <g id="line2d_6">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="183.6" xlink:href="#m074e64995f" y="43.2"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="183.6" xlink:href="#mc946a5ae82" y="43.2"/>
       </g>
      </g>
     </g>
     <g id="xtick_3">
      <g id="line2d_7">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="295.2" xlink:href="#me5bf4c00e3" y="200.290909"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="295.2" xlink:href="#m58dade9745" y="200.290909"/>
       </g>
      </g>
      <g id="line2d_8">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="295.2" xlink:href="#m074e64995f" y="43.2"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="295.2" xlink:href="#mc946a5ae82" y="43.2"/>
       </g>
      </g>
     </g>
     <g id="xtick_4">
      <g id="line2d_9">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="406.8" xlink:href="#me5bf4c00e3" y="200.290909"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="406.8" xlink:href="#m58dade9745" y="200.290909"/>
       </g>
      </g>
      <g id="line2d_10">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="406.8" xlink:href="#m074e64995f" y="43.2"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="406.8" xlink:href="#mc946a5ae82" y="43.2"/>
       </g>
      </g>
     </g>
     <g id="xtick_5">
      <g id="line2d_11">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#me5bf4c00e3" y="200.290909"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m58dade9745" y="200.290909"/>
       </g>
      </g>
      <g id="line2d_12">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m074e64995f" y="43.2"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#mc946a5ae82" y="43.2"/>
       </g>
      </g>
     </g>
@@ -572,92 +583,92 @@ L 0 4
       <defs>
        <path d="M 0 0 
 L 4 0 
-" id="m414a7409eb" style="stroke:#000000;stroke-width:0.5;"/>
+" id="m8b2567c4af" style="stroke:#000000;stroke-width:0.5;"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m414a7409eb" y="200.290909"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="200.290909"/>
       </g>
      </g>
      <g id="line2d_14">
       <defs>
        <path d="M 0 0 
 L -4 0 
-" id="ma2b7fc1d98" style="stroke:#000000;stroke-width:0.5;"/>
+" id="m580a4f3bfe" style="stroke:#000000;stroke-width:0.5;"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#ma2b7fc1d98" y="200.290909"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m580a4f3bfe" y="200.290909"/>
       </g>
      </g>
     </g>
     <g id="ytick_2">
      <g id="line2d_15">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m414a7409eb" y="174.109091"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="174.109091"/>
       </g>
      </g>
      <g id="line2d_16">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#ma2b7fc1d98" y="174.109091"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m580a4f3bfe" y="174.109091"/>
       </g>
      </g>
     </g>
     <g id="ytick_3">
      <g id="line2d_17">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m414a7409eb" y="147.927273"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="147.927273"/>
       </g>
      </g>
      <g id="line2d_18">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#ma2b7fc1d98" y="147.927273"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m580a4f3bfe" y="147.927273"/>
       </g>
      </g>
     </g>
     <g id="ytick_4">
      <g id="line2d_19">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m414a7409eb" y="121.745455"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="121.745455"/>
       </g>
      </g>
      <g id="line2d_20">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#ma2b7fc1d98" y="121.745455"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m580a4f3bfe" y="121.745455"/>
       </g>
      </g>
     </g>
     <g id="ytick_5">
      <g id="line2d_21">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m414a7409eb" y="95.563636"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="95.563636"/>
       </g>
      </g>
      <g id="line2d_22">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#ma2b7fc1d98" y="95.563636"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m580a4f3bfe" y="95.563636"/>
       </g>
      </g>
     </g>
     <g id="ytick_6">
      <g id="line2d_23">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m414a7409eb" y="69.381818"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="69.381818"/>
       </g>
      </g>
      <g id="line2d_24">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#ma2b7fc1d98" y="69.381818"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m580a4f3bfe" y="69.381818"/>
       </g>
      </g>
     </g>
     <g id="ytick_7">
      <g id="line2d_25">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m414a7409eb" y="43.2"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="43.2"/>
       </g>
      </g>
      <g id="line2d_26">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#ma2b7fc1d98" y="43.2"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m580a4f3bfe" y="43.2"/>
       </g>
      </g>
     </g>
@@ -673,7 +684,7 @@ z
 " style="fill:#ffffff;"/>
    </g>
    <g id="PolyCollection_3">
-    <path clip-path="url(#pb48d8066ea)" d="M 72 294.545455 
+    <path clip-path="url(#p1465675fce)" d="M 76.464 286.66997 
 L 76.464 286.66997 
 L 80.928 278.918686 
 L 85.392 271.413846 
@@ -683,13 +694,13 @@ L 80.928 258.219476
 L 76.464 275.793333 
 z
 " style="fill:#008000;stroke:#000000;"/>
-    <path clip-path="url(#pb48d8066ea)" d="M 112.176 237.689413 
+    <path clip-path="url(#p1465675fce)" d="M 112.176 237.689413 
 L 112.176 237.689413 
 L 112.508717 237.472901 
 L 112.176 236.445954 
 z
 " style="fill:#008000;stroke:#000000;"/>
-    <path clip-path="url(#pb48d8066ea)" d="M 183.6 294.545455 
+    <path clip-path="url(#p1465675fce)" d="M 183.6 294.545455 
 L 188.064 302.420939 
 L 192.528 310.172223 
 L 196.992 317.677063 
@@ -699,7 +710,7 @@ L 192.528 258.219476
 L 188.064 275.793333 
 z
 " style="fill:#008000;stroke:#000000;"/>
-    <path clip-path="url(#pb48d8066ea)" d="M 223.776 351.401496 
+    <path clip-path="url(#p1465675fce)" d="M 223.776 351.401496 
 L 223.776 351.401496 
 L 228.24 354.306388 
 L 232.704 356.268813 
@@ -717,7 +728,7 @@ L 228.24 250.224309
 L 223.776 236.445954 
 z
 " style="fill:#008000;stroke:#000000;"/>
-    <path clip-path="url(#pb48d8066ea)" d="M 295.2 294.545455 
+    <path clip-path="url(#p1465675fce)" d="M 295.2 294.545455 
 L 299.664 286.66997 
 L 304.128 278.918686 
 L 308.592 271.413846 
@@ -727,13 +738,13 @@ L 304.128 258.219476
 L 299.664 275.793333 
 z
 " style="fill:#008000;stroke:#000000;"/>
-    <path clip-path="url(#pb48d8066ea)" d="M 335.376 237.689413 
+    <path clip-path="url(#p1465675fce)" d="M 335.376 237.689413 
 L 335.376 237.689413 
 L 335.708717 237.472901 
 L 335.376 236.445954 
 z
 " style="fill:#008000;stroke:#000000;"/>
-    <path clip-path="url(#pb48d8066ea)" d="M 406.8 294.545455 
+    <path clip-path="url(#p1465675fce)" d="M 406.8 294.545455 
 L 411.264 302.420939 
 L 415.728 310.172223 
 L 420.192 317.677063 
@@ -743,7 +754,7 @@ L 415.728 258.219476
 L 411.264 275.793333 
 z
 " style="fill:#008000;stroke:#000000;"/>
-    <path clip-path="url(#pb48d8066ea)" d="M 446.976 351.401496 
+    <path clip-path="url(#p1465675fce)" d="M 446.976 351.401496 
 L 446.976 351.401496 
 L 451.44 354.306388 
 L 455.904 356.268813 
@@ -763,7 +774,7 @@ z
 " style="fill:#008000;stroke:#000000;"/>
    </g>
    <g id="PolyCollection_4">
-    <path clip-path="url(#pb48d8066ea)" d="M 112.508717 237.472901 
+    <path clip-path="url(#p1465675fce)" d="M 112.508717 237.472901 
 L 116.64 234.784521 
 L 121.104 232.822096 
 L 125.568 231.833084 
@@ -799,7 +810,7 @@ L 121.104 266.787525
 L 116.64 250.224309 
 z
 " style="fill:#ff0000;stroke:#000000;"/>
-    <path clip-path="url(#pb48d8066ea)" d="M 254.691283 351.618008 
+    <path clip-path="url(#p1465675fce)" d="M 254.691283 351.618008 
 L 255.024 351.401496 
 L 259.488 347.599951 
 L 263.952 342.961705 
@@ -823,7 +834,7 @@ L 259.488 362.772705
 L 255.024 352.644955 
 z
 " style="fill:#ff0000;stroke:#000000;"/>
-    <path clip-path="url(#pb48d8066ea)" d="M 335.708717 237.472901 
+    <path clip-path="url(#p1465675fce)" d="M 335.708717 237.472901 
 L 339.84 234.784521 
 L 344.304 232.822096 
 L 348.768 231.833084 
@@ -859,7 +870,7 @@ L 344.304 266.787525
 L 339.84 250.224309 
 z
 " style="fill:#ff0000;stroke:#000000;"/>
-    <path clip-path="url(#pb48d8066ea)" d="M 477.891283 351.618008 
+    <path clip-path="url(#p1465675fce)" d="M 477.891283 351.618008 
 L 478.224 351.401496 
 L 482.688 347.599951 
 L 487.152 342.961705 
@@ -883,7 +894,7 @@ z
 " style="fill:#ff0000;stroke:#000000;"/>
    </g>
    <g id="line2d_27">
-    <path clip-path="url(#pb48d8066ea)" d="M 72 294.545455 
+    <path clip-path="url(#p1465675fce)" d="M 72 294.545455 
 L 76.464 286.66997 
 L 80.928 278.918686 
 L 85.392 271.413846 
@@ -986,7 +997,7 @@ L 513.936 302.420939
 " style="fill:none;stroke:#000000;stroke-linecap:square;"/>
    </g>
    <g id="line2d_28">
-    <path clip-path="url(#pb48d8066ea)" d="M 76.464 275.793333 
+    <path clip-path="url(#p1465675fce)" d="M 76.464 275.793333 
 L 80.928 258.219476 
 L 85.392 242.928113 
 M 112.176 236.445954 
@@ -1091,60 +1102,60 @@ L 518.4 231.709091
     <g id="xtick_6">
      <g id="line2d_29">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#me5bf4c00e3" y="388.8"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m58dade9745" y="388.8"/>
       </g>
      </g>
      <g id="line2d_30">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m074e64995f" y="231.709091"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#mc946a5ae82" y="231.709091"/>
       </g>
      </g>
     </g>
     <g id="xtick_7">
      <g id="line2d_31">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="183.6" xlink:href="#me5bf4c00e3" y="388.8"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="183.6" xlink:href="#m58dade9745" y="388.8"/>
       </g>
      </g>
      <g id="line2d_32">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="183.6" xlink:href="#m074e64995f" y="231.709091"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="183.6" xlink:href="#mc946a5ae82" y="231.709091"/>
       </g>
      </g>
     </g>
     <g id="xtick_8">
      <g id="line2d_33">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="295.2" xlink:href="#me5bf4c00e3" y="388.8"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="295.2" xlink:href="#m58dade9745" y="388.8"/>
       </g>
      </g>
      <g id="line2d_34">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="295.2" xlink:href="#m074e64995f" y="231.709091"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="295.2" xlink:href="#mc946a5ae82" y="231.709091"/>
       </g>
      </g>
     </g>
     <g id="xtick_9">
      <g id="line2d_35">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="406.8" xlink:href="#me5bf4c00e3" y="388.8"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="406.8" xlink:href="#m58dade9745" y="388.8"/>
       </g>
      </g>
      <g id="line2d_36">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="406.8" xlink:href="#m074e64995f" y="231.709091"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="406.8" xlink:href="#mc946a5ae82" y="231.709091"/>
       </g>
      </g>
     </g>
     <g id="xtick_10">
      <g id="line2d_37">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#me5bf4c00e3" y="388.8"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m58dade9745" y="388.8"/>
       </g>
      </g>
      <g id="line2d_38">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m074e64995f" y="231.709091"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#mc946a5ae82" y="231.709091"/>
       </g>
      </g>
     </g>
@@ -1153,72 +1164,72 @@ L 518.4 231.709091
     <g id="ytick_8">
      <g id="line2d_39">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m414a7409eb" y="388.8"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="388.8"/>
       </g>
      </g>
      <g id="line2d_40">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#ma2b7fc1d98" y="388.8"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m580a4f3bfe" y="388.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_9">
      <g id="line2d_41">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m414a7409eb" y="357.381818"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="357.381818"/>
       </g>
      </g>
      <g id="line2d_42">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#ma2b7fc1d98" y="357.381818"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m580a4f3bfe" y="357.381818"/>
       </g>
      </g>
     </g>
     <g id="ytick_10">
      <g id="line2d_43">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m414a7409eb" y="325.963636"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="325.963636"/>
       </g>
      </g>
      <g id="line2d_44">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#ma2b7fc1d98" y="325.963636"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m580a4f3bfe" y="325.963636"/>
       </g>
      </g>
     </g>
     <g id="ytick_11">
      <g id="line2d_45">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m414a7409eb" y="294.545455"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="294.545455"/>
       </g>
      </g>
      <g id="line2d_46">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#ma2b7fc1d98" y="294.545455"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m580a4f3bfe" y="294.545455"/>
       </g>
      </g>
     </g>
     <g id="ytick_12">
      <g id="line2d_47">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m414a7409eb" y="263.127273"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="263.127273"/>
       </g>
      </g>
      <g id="line2d_48">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#ma2b7fc1d98" y="263.127273"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m580a4f3bfe" y="263.127273"/>
       </g>
      </g>
     </g>
     <g id="ytick_13">
      <g id="line2d_49">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m414a7409eb" y="231.709091"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="231.709091"/>
       </g>
      </g>
      <g id="line2d_50">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#ma2b7fc1d98" y="231.709091"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m580a4f3bfe" y="231.709091"/>
       </g>
      </g>
     </g>
@@ -1226,15 +1237,15 @@ L 518.4 231.709091
   </g>
  </g>
  <defs>
-  <clipPath id="p2a28627d87">
+  <clipPath id="p2336a28681">
    <rect height="157.090909" width="446.4" x="72" y="43.2"/>
   </clipPath>
-  <clipPath id="pb48d8066ea">
+  <clipPath id="p1465675fce">
    <rect height="157.090909" width="446.4" x="72" y="231.709091"/>
   </clipPath>
  </defs>
  <defs>
-  <pattern height="72" id="hd3108e6b65" patternUnits="userSpaceOnUse" width="72" x="0" y="0">
+  <pattern height="72" id="ha0fdf7a1f0" patternUnits="userSpaceOnUse" width="72" x="0" y="0">
    <rect fill="#ffffff" height="73" width="73" x="0" y="0"/>
    <path d="M -36 36 
 L 36 -36 
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate_nan.pdf b/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate_nan.pdf
new file mode 100644
index 000000000000..dffa63bd7972
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate_nan.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate_nan.png b/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate_nan.png
new file mode 100644
index 000000000000..35cf06ee4850
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate_nan.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate_nan.svg b/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate_nan.svg
new file mode 100644
index 000000000000..a200927ef2fe
--- /dev/null
+++ b/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate_nan.svg
@@ -0,0 +1,352 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg height="432pt" version="1.1" viewBox="0 0 576 432" width="576pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <metadata>
+  <rdf:RDF xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+   <cc:Work>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:date>2021-02-17T21:51:47.989640</dc:date>
+    <dc:format>image/svg+xml</dc:format>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Matplotlib v3.3.4.post2378.dev0+g01d3149b6, https://matplotlib.org/</dc:title>
+     </cc:Agent>
+    </dc:creator>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <defs>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
+ </defs>
+ <g id="figure_1">
+  <g id="patch_1">
+   <path d="M 0 432 
+L 576 432 
+L 576 0 
+L 0 0 
+z
+" style="fill:#ffffff;"/>
+  </g>
+  <g id="axes_1">
+   <g id="patch_2">
+    <path d="M 72 388.8 
+L 518.4 388.8 
+L 518.4 43.2 
+L 72 43.2 
+z
+" style="fill:#ffffff;"/>
+   </g>
+   <g id="PolyCollection_1">
+    <path clip-path="url(#pcfdea541ed)" d="M 72 354.24 
+L 72 354.24 
+L 101.176471 286.475294 
+L 72 239.04 
+z
+" style="fill:#008000;fill-opacity:0.5;stroke:#000000;stroke-opacity:0.5;"/>
+    <path clip-path="url(#pcfdea541ed)" d="M 241.223529 286.475294 
+L 270.4 354.24 
+L 320 239.04 
+L 369.6 169.92 
+L 419.2 239.04 
+L 419.2 239.04 
+L 419.2 100.8 
+L 369.6 77.76 
+L 320 146.88 
+L 270.4 239.04 
+z
+" style="fill:#008000;fill-opacity:0.5;stroke:#000000;stroke-opacity:0.5;"/>
+   </g>
+   <g id="PolyCollection_2">
+    <path clip-path="url(#pcfdea541ed)" d="M 101.176471 286.475294 
+L 121.6 239.04 
+L 121.6 239.04 
+L 121.6 319.68 
+z
+" style="fill:#ff0000;fill-opacity:0.5;stroke:#000000;stroke-opacity:0.5;"/>
+    <path clip-path="url(#pcfdea541ed)" d="M 220.8 239.04 
+L 220.8 239.04 
+L 241.223529 286.475294 
+L 220.8 319.68 
+z
+" style="fill:#ff0000;fill-opacity:0.5;stroke:#000000;stroke-opacity:0.5;"/>
+   </g>
+   <g id="line2d_1">
+    <path clip-path="url(#pcfdea541ed)" d="M 72 354.24 
+L 121.6 239.04 
+M 220.8 239.04 
+L 270.4 354.24 
+L 320 239.04 
+L 369.6 169.92 
+L 419.2 239.04 
+L 468.8 354.24 
+L 518.4 239.04 
+" style="fill:none;stroke:#000000;stroke-linecap:square;"/>
+   </g>
+   <g id="line2d_2">
+    <path clip-path="url(#pcfdea541ed)" d="M 72 239.04 
+L 121.6 319.68 
+L 171.2 354.24 
+L 220.8 319.68 
+L 270.4 239.04 
+L 320 146.88 
+L 369.6 77.76 
+L 419.2 100.8 
+" style="fill:none;stroke:#0000ff;stroke-linecap:square;"/>
+   </g>
+   <g id="patch_3">
+    <path d="M 72 388.8 
+L 72 43.2 
+" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+   </g>
+   <g id="patch_4">
+    <path d="M 518.4 388.8 
+L 518.4 43.2 
+" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+   </g>
+   <g id="patch_5">
+    <path d="M 72 388.8 
+L 518.4 388.8 
+" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+   </g>
+   <g id="patch_6">
+    <path d="M 72 43.2 
+L 518.4 43.2 
+" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+   </g>
+   <g id="matplotlib.axis_1">
+    <g id="xtick_1">
+     <g id="line2d_3">
+      <defs>
+       <path d="M 0 0 
+L 0 -4 
+" id="m58dade9745" style="stroke:#000000;stroke-width:0.5;"/>
+      </defs>
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m58dade9745" y="388.8"/>
+      </g>
+     </g>
+     <g id="line2d_4">
+      <defs>
+       <path d="M 0 0 
+L 0 4 
+" id="mc946a5ae82" style="stroke:#000000;stroke-width:0.5;"/>
+      </defs>
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#mc946a5ae82" y="43.2"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_2">
+     <g id="line2d_5">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="121.6" xlink:href="#m58dade9745" y="388.8"/>
+      </g>
+     </g>
+     <g id="line2d_6">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="121.6" xlink:href="#mc946a5ae82" y="43.2"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_3">
+     <g id="line2d_7">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="171.2" xlink:href="#m58dade9745" y="388.8"/>
+      </g>
+     </g>
+     <g id="line2d_8">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="171.2" xlink:href="#mc946a5ae82" y="43.2"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_4">
+     <g id="line2d_9">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="220.8" xlink:href="#m58dade9745" y="388.8"/>
+      </g>
+     </g>
+     <g id="line2d_10">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="220.8" xlink:href="#mc946a5ae82" y="43.2"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_5">
+     <g id="line2d_11">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="270.4" xlink:href="#m58dade9745" y="388.8"/>
+      </g>
+     </g>
+     <g id="line2d_12">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="270.4" xlink:href="#mc946a5ae82" y="43.2"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_6">
+     <g id="line2d_13">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="320" xlink:href="#m58dade9745" y="388.8"/>
+      </g>
+     </g>
+     <g id="line2d_14">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="320" xlink:href="#mc946a5ae82" y="43.2"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_7">
+     <g id="line2d_15">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="369.6" xlink:href="#m58dade9745" y="388.8"/>
+      </g>
+     </g>
+     <g id="line2d_16">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="369.6" xlink:href="#mc946a5ae82" y="43.2"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_8">
+     <g id="line2d_17">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="419.2" xlink:href="#m58dade9745" y="388.8"/>
+      </g>
+     </g>
+     <g id="line2d_18">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="419.2" xlink:href="#mc946a5ae82" y="43.2"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_9">
+     <g id="line2d_19">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="468.8" xlink:href="#m58dade9745" y="388.8"/>
+      </g>
+     </g>
+     <g id="line2d_20">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="468.8" xlink:href="#mc946a5ae82" y="43.2"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_10">
+     <g id="line2d_21">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m58dade9745" y="388.8"/>
+      </g>
+     </g>
+     <g id="line2d_22">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#mc946a5ae82" y="43.2"/>
+      </g>
+     </g>
+    </g>
+   </g>
+   <g id="matplotlib.axis_2">
+    <g id="ytick_1">
+     <g id="line2d_23">
+      <defs>
+       <path d="M 0 0 
+L 4 0 
+" id="m8b2567c4af" style="stroke:#000000;stroke-width:0.5;"/>
+      </defs>
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="388.8"/>
+      </g>
+     </g>
+     <g id="line2d_24">
+      <defs>
+       <path d="M 0 0 
+L -4 0 
+" id="m580a4f3bfe" style="stroke:#000000;stroke-width:0.5;"/>
+      </defs>
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m580a4f3bfe" y="388.8"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_2">
+     <g id="line2d_25">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="331.2"/>
+      </g>
+     </g>
+     <g id="line2d_26">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m580a4f3bfe" y="331.2"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_3">
+     <g id="line2d_27">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="273.6"/>
+      </g>
+     </g>
+     <g id="line2d_28">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m580a4f3bfe" y="273.6"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_4">
+     <g id="line2d_29">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="216"/>
+      </g>
+     </g>
+     <g id="line2d_30">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m580a4f3bfe" y="216"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_5">
+     <g id="line2d_31">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="158.4"/>
+      </g>
+     </g>
+     <g id="line2d_32">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m580a4f3bfe" y="158.4"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_6">
+     <g id="line2d_33">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="100.8"/>
+      </g>
+     </g>
+     <g id="line2d_34">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m580a4f3bfe" y="100.8"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_7">
+     <g id="line2d_35">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="43.2"/>
+      </g>
+     </g>
+     <g id="line2d_36">
+      <g>
+       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m580a4f3bfe" y="43.2"/>
+      </g>
+     </g>
+    </g>
+   </g>
+  </g>
+ </g>
+ <defs>
+  <clipPath id="pcfdea541ed">
+   <rect height="345.6" width="446.4" x="72" y="43.2"/>
+  </clipPath>
+ </defs>
+</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hexbin_linear.png b/lib/matplotlib/tests/baseline_images/test_axes/hexbin_linear.png
new file mode 100644
index 000000000000..824ea49b0599
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_axes/hexbin_linear.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hexbin_log.png b/lib/matplotlib/tests/baseline_images/test_axes/hexbin_log.png
index febefb870918..466519461aac 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/hexbin_log.png and b/lib/matplotlib/tests/baseline_images/test_axes/hexbin_log.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.pdf b/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.pdf
index c33c7c4e29ca..5e2fd6190682 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.png b/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.png
index e68b7c3c0baf..cde64b03c7f6 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.png and b/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.svg b/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.svg
index b5ebff4427b2..d1169e860808 100644
--- a/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.svg
+++ b/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.svg
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (http://matplotlib.org/) -->
 <svg height="345.6pt" version="1.1" viewBox="0 0 460.8 345.6" width="460.8pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <metadata>
+  <rdf:RDF xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+   <cc:Work>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:date>2021-03-02T20:09:49.859581</dc:date>
+    <dc:format>image/svg+xml</dc:format>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Matplotlib v3.3.4.post2495+g8432e3164, https://matplotlib.org/</dc:title>
+     </cc:Agent>
+    </dc:creator>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="patch_1">
@@ -26,9 +37,9 @@ L 103.104 41.472
 z
 " style="fill:#ffffff;"/>
    </g>
-   <g clip-path="url(#pb78ad33f25)">
-    <image height="266.4" id="imagef915458583" transform="scale(1 -1)translate(0 -266.4)" width="266.4" x="103.104" xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAAXIAAAFyCAYAAADoJFEJAAAABHNCSVQICAgIfAhkiAAAIABJREFUeJztnVF2G7mybEGKdp+B3PlP607huG2R74NrXQORRCSzqigbfHt/CQ0UqkRRaCocGXn6/N//ubWOn7fP//v6x+1nG+euw/i/3Xhc2dp/bye59izzH93ch8x9G8b/dvM69/N2mV4b9r1m1/4e/7xeZO24149uXud0/G+/9jrO/ZLXRef/7ca/ruPaX3Kffv4zrB3H/bzu+yk/O93r8/p7/ppc289frzo3jm/dtTddK/vqfLu5OXPtrclaGdu1ch+l+3U56drsvnbt771O7rrqvob0PjvIXsYBt9bMhXvoN1TZN7y9ur3GX4cHe3Vrdd9z8kzd+CRrs9sCAMBfDgc5AMDicJADACzOpdfEWxt1caeJtzbq4qqJ/zfoxqqR9xrzXOduraiRX+caudPEWxt18R9hbq6D/xA9XbXr/tofqpEnmnmvX/+r9wn6tNG9jZYdNfC5Jq7zql1HHXyukauWPWjkQddu07X3zef6ek331vHza4MO3j9zQV8PerQZ79LIw9qKWH0cw10rYnzyuP23cwp682m6Nt7Ha9enc//ey7T3/j/IWn3fGg1d3+N8IgcAWBwOcgCAxbk4i6GTUu7zp+7r56WU+/ylm5tLKTrvpJT7vJNh1EI4n1cpReUTK60EGeY8nfu3ILWoXKLPuNVSqNLJkZbC6yB5jPsG+cRZCIMM0+bzFWlF0b+MSzKMjo1NsCKX7JFllIPsiIdymg5qlkLd1lj99NoovXRrw0OoJNLv45//NtgGk/ep2hH79yL2QwCA94KDHABgcTjIAQAW57Kn7H4ss39eE7/P/9annSau1zpNXK+taOK6t2rM8dq57h3tiHPtOrUU9rq3KbNvrbWfpkTfWQp17khL4dWU3ZfK7Cu6t9PAW6uVzg8WwnHtq3Tvyr5KaiDcqoNXrqu6GI1srPd1S2NJe/feC5q4twluti7qvvJRuf83l1uyNryPe108uRQAABaDgxwAYHE4yAEAFudyVNl9RRNvzZfdu7jZijc8j7Gdx8A6Tby1WjTtv59dFK2558O9nO6tUcHdfSrecJ071Bt+7b/ONPJe5x6nUo3cXLundP5k1r5K9w7ab8H7XYqb/St8457U7+2u7V/TYon+Vg/67azvtbkWfzrr70MifPfTlOgDALwXHOQAAIvDQQ4AsDiXo/JTMk3cauRpC7Zt3vBME3cZKc4L3tqoZce8lLme7qJnH80PunehBduvz/GZnDc808h3ecNdvKzq4E4jT/zeQyZKuNaszaJpj/KRt/lcWLunDZxQ08wPirEt9oVzt7WaeDU/pV+rP+cdHvT+V/ik7z3V4nsvuP5bjmrmIVBoHoHLJ3IAgMXhIAcAWJyL63a/J4o2jaa9mmhaYzGslNlXpBSdVynlx+dcavnXzN3v072mJnpW1+p4T+eez8+5fBKllAMthVvjZZ0c8vDa59c6S2HJfiiX7ivRN2vDfYytMXumLyHLl50P0273Zq2Noi3aGJ11US2Gp+tcQ5OjYCzR15ja5D3vInD5RA4AsDgc5AAAi8NBDgCwOJeog/el89ujaJ0mrntVyu4rlkKd08jY2M6tK6VPy+7nevrPz/m1Lnr20fwQYys6964WbJ9zPf1QS+HWeNmKVbGNWnawgO2xH96enEv2imuNlXGH7v1XaOaZ/lyyGxpBPdHTfRStf6aTeYs4i6Hq3rp2OCpCdEShRF8TbhsAACwNBzkAwOJwkAMALM4lluH37dteE0Wr67Oy+4o3vJ+vaOKtjbp4LLtXvb2PjBXvt9HMXfTsfa+57h1K9IM3fGMLts/tGnnQvQtl9zZe9jrXwO/7tul86iN3enTBc75L967Ez1Zavf2paFpD0J91gdO9zV5ZNO2471w/f3TpUHbvH2mUrq33e1wc9XN9CNHbh2gMSvQBAN4KDnIAgMW5uC70aZn9zdkCt5fdO4uhk1Ja8517nJRyv3ZuP1SppZdT3Nz9OZ4vs3ephSqXuLL7XWX2sm/JUnhUKqHKMBX74Q65xD1Ttbv9y6SVAl8ltVhLYfYMLqXQSSCV9EMnu7TENpiV3fdzTQjv098rwj6qwrgYCpFh+EQOALA4HOQAAIvDQQ4AsDgXp4M7Tby1UQevaOKtva7svo+b1fgBXVvp5FPpbu/K7kOZvXbnMRbDvLv977WHltl/GjEyaNlmLxcRq+Oq/dDYunZ1/Slo7yWNXNiqkZc18K2aeSGZNm00pPPdMwWd2zTJ2RVjqx9h9X17Mlq2K7vXRzAWw5OI4EETDy/k7eGXrfGJHABgeTjIAQAWh4McAGBxLtYbbjTx1kZtu6KJ67V7yu61BVuvi1c0cZ13mnhrvuxeveC9V9zF1LbmveKuzF7ns7L7zWX2rbXT51wjD9p2r+Ul3nDrIy94wyue89TPXdHIhVIErtt3gZL8oXReJ5MI2craoRzeNZnXZ5KPrDd9fwWveKdlSzl80MTnnd5iBG4vcxdrC26D6E+JPgDAW8FBDgCwOMF+aC2FxiaYSSk6v7Xs3kkpurYipbQ2yilOSmltlFOclKJ7XVVaMWX2rY2SiF6rfx7enKVQLYRby+xbK6UUViyFFRnGltIXrIoVCSeVd9z8gSX5ryrn9zfdMb8r0dCM/dt2tETqz1mlFr22j7DIUgmHtbKPuzRYXxM7onkd+UQOALA4HOQAAIvDQQ4AsDgXV1qflc73azNNXPf6irL7iibe2qiD61odb+1un2niV5m/DV1B2jina11k7FFl9jp/oKVw1NP9M5Vsgu6+BZ27pL3rtZXu9ns08i/Cdv2p2A11vhBN6+JkWxOros4VNPP4fpp3AUqjaM2+FTuiruUTOQDA4nCQAwAsDgc5AMDiPPCRz73hpbUFH3nW7X5r2X1FE9f1ThNvbdTFK93tP0PpvG/Jdh3K4bUlm/OGj1O7yuy/yBs+ltknOv2OUvpK5K3TyCuxthWNvKSBv1Ivd+3b9DGMzq1U2re5NmvhZ6fXdmszS7bTzDM9vRntOrz35lX2NV+5rOUTOQDA4nCQAwAsDgc5AMDiXJy2rR7zo9q1tTZq2apd/7jOfeV7omidJq5jp4m3NuriThO/z/de8OezVVoTHdxF0bY2esULeSmnoLXrtWavI73hLop2RyaK08FflcvycN6s9VG1BSG8opln/u5+2xCCIlsVNHKng+ct2eb72JZsWbaKjHtdPHjMnbatOSwv8pXrWj6RAwAsDgc5AMDiXP4N8snv8X9lzpXhZ1LKL5U5rn2MrUoecwmkUnZfkVJa82X3uraXRNKy+0J3e2spdHOtjX96pXJJF/v62WTtH7IU2i4/5hl0/YuklYpVUQnyyIGxti9j6PojVjgrjxRkGLk2SCCmk0+lu3342RWkllInn4o84tNxrR1Rl/KJHABgcTjIAQAWh4McAGBxLqG7fd/qLWnB1lsOo/7sNfMfQ1s1tRs+bz88Koq2tVEXd5p4a6Mu7jTx1lqtu32lJZuz830mOrcrsxfN/MsshZUye/f97NDIS+3arl68LsXlzu65Zf5ZjmzfNtgP/QOG1mn9pUnZvdO9nWauc+Hn4aaTn50rnXd2xIqrNID9EADgveAgBwBYHA5yAIDFCSX6vS7+Qz3mxt+tWnvwkd/mGrpq4s5H7p5BxxVNXNc7TVznnSbe2qiLlzRxHauea64N2q/q3pUy+3DtZJ9He1W84RvXhnG21pbdz/3e5ZL8V2nkr8Jo4jZ6Vq/NWr3pvy0YD7or0a/4yLP3RNDQew/9jtL51FduqJT384kcAGBxOMgBABYnSit92X1qIeyTEkWmkPGPz7nUktkPf17nlkJXhl+RUlo7sOxeLYb9XpXu9q3VOvl0EohNLNT5Qpm9PtMeS6G7NrUFVqyLRj4pRQHskFbSbkKGUseghFBab288+frBuN/Xyi7Z+Dx+s/q7NUgtmf3QSGh2bWtj1582n9NrS5ZC0z3o4X3NJJ/IAQAWh4McAGBxOMgBABbnop19eh3c6ef38TxeNtgERZT6t9PMVRMP2nZvPxRNPHSwN1G0unZX2b2xFN7kvoM+V9HE5dpKJx9day2FFT093Gecq1gKfWyAzFX0dS2LPqpDUMVumFyrlLoA7WCIZ03iZkuWQrM2sy76uNm5Zu662d/Xdvtma93PUp/fJxLL5LxkP92n8JbgEzkAwOJwkAMALA4HOQDA4lgfefSNz9u3qSYeomiNj1w1caeZq879S33kn/O16g3fVXY/RNMaTbw16W7/vCYe5pMS/Yoe3e91Lmjve+5T0cjzEn2jg78oxjbXxAvl/cpXleVvbN8WhO0dJfqVuFmnmd/0d8m0c8vatZXat7nM2yzythl0Mtxn+BeOYYpP5AAAi8NBDgCwOFZa+XXzqYS91BLTDX3J/tDJR+ZUavk5WApVdhH5pPvzI0onf77sPkgpLpWwqU3w+U4+u9IPTdph/T7doGI/rEgp6bUyLtkP57Xa5TREs/bp6xLSEvyjuv6Etaf5nEkwbK3W9cfJGIEd1tGSBLIxbiG9rPAe4RM5AMDicJADACwOBzkAwOJc1FLYl9qHDvUmqvbfT7UfqlVxfq2W3f80nX1UE49RtOeHX7fW2ufnXBNvTS2FLyq7r2jirY1df7Lu9i7G1lgVyzG2FUuheaZ433n58qFxuYNGLtr7Lvuhzs9FziOjaYd99RGsJn6cpbD/hm7n522BrTXf9ce95vKzC/d1FsKW4LR485pWuvocaTnlEzkAwOJwkAMALA4HOQDA4lzUG97r4j8K3e2j51y94M+X3bsWbToXdfBurerce7rd7ym7H3Ti5zVxnS91t3eauF6b+a7dffZE0xpveGlfHWce9M0xts/r6crLSvR3+cZ3eMOdVzzTrp1mviNetkSxZN9R8oa/CD6RAwAsDgc5AMDicJADACzOxXnDVRMP0bR91opq1YX8lNC+TfNTrnON3EXRqiau2SoumjZ4ww/KT6lo4vdrH3/96L6uBZvTgs/hmfy11q/uvOEvirwN9/ljPnKjkP6BmNoHw7G9W8EbHqNoje4dfOJeM7ee7UK8rArqQ8ztQRp4emn6byHzKNqKX13hEzkAwOJwkAMALI61H8Zo2rnFUO2FoSS/UnYvUsu1+3MkRs/KuJNatINIFk07yCdqP3QWw6wLfSWK1nasf95SWCqzz2QYGQ9SzIsshU46Sfc61H5oYmyTa6f7HMhNy+zDjWV8nssltmS/IJekJfmhk9LzEsitIMM4WSyoGObabG0aHfwF8IkcAGBxOMgBABaHgxwAYHEexNh2GnnSrq3XuUNJvna3Nxp5aMGmJftD2X1SZt/r6SGKVsvuzTho2fOS/aBdV6JoU6vfXHvcVTpvI2/9tf33fv702vVWS2FJE5f1u+yHbm3QdpvnoHZuToM9ZRu5XFunn7ei7t29jtZemI136N6VqNqSpXAB+EQOALA4HOQAAIvDQQ4AsDiX6BXv2rcV2rWF0vlKNK2sdV5x1cRju7Z+MtHEnWaetRYzPvJSFO2BZfeltRXPudHB9+n2ezznRtvOfORGi69psl5ZPaqd2572bbr2ZMruH9zp91c7omjzcW/afl5fz17e/t80blm9+xe1ZLMU/Oj6MvGJHABgcTjIAQAW5xLlkrn9cE+Xn5Bo2K1XS6FLNFRr4k3+xOu73Zfshq1ZS2Flret2H+aOLLvfaCmMcyJFlBIZ3drnLYW77IeJDDPaD5vMmTRE3UewUkrlz/M9XX/0o5kpww8d68P3N0/q8wmGSQ37Hvvhs/tka98MPpEDACwOBzkAwOJwkAMALE6Isf016N6v6fLT2mgbDCX6xmJou/roOLMbBpuaK9HXtY+/bu2BxXCjzp3ep6R7u2d6XhOP1/q1fQn/kTq31fXTEv3uPmqttPbDRGh9lQ5r0mVDjK0+o053v6Yat+w1c32I7VG0eyyFy2vdFU+q69gk8IkcAGBxOMgBABaHgxwAYHFCib6Lpj2qXVtr4g0POvc8qla94aqRD+XyWRsv0+ptV7xspV3bV5XdB/+60aMLz5TF2I7Pv8NHnnndhxJ9vdbo4Fk5v9PFEw/6ZlT3dh+3su72ur57LW7jr6jXzHdF0Tp/uszIWltavyNG+K9gT4s4SvQBAN4LDnIAgMV5UKK/LdGw0uXnvn6eaHgLZfjztcFS2I9lH/3TMXaA774Of8rLXqbM25XhV2SY8Ex77IcuwTCRUs5G1shlmLmEE2QZY4mMP6u5fBITJk2Jvv7Zn9kRh3122BFtgqGMNYaib/Ij8kiQe0IXoO4/yPeqUkt/o/A66e9S90KVkwbN6/RXdPKpSCAHyiWVvfhEDgCwOBzkAACLw0EOALA4F1eGX4mmrXT5aa21a6eZZ9G0rrt9GPe6XoiiHYdB974+N3ffe+O+oiln5eSDblyxH2ZWP2NVdJp4fu3z3XhOv+b3yUv0XTRttnaup7uo2qgTH6jYdtq17QDUWjv1a/X1DiX581iKcBtXOr9D1650t1+B7OczMD+e6pwmXzc+kQMALA8HOQDA4nCQAwAsTvSRX42P3ETTxijaJJr21ut8O6JpCyX6WXn8qMXr3Hx8TrT4YSwCYdCjd8XYbiu7r2jiuj5tydb7u9P7mHjZTDPvRdxwbcFHHvbtr8t84044LnirVWQ+z/8NKWjiGkUb/g2gX6vvWxeBu6MLvfBl3vAv8n8PCb6FfdIOePjIAQD+/4GDHABgcTjIAQAW5+LyVFx7ttZGnTvzjdtoWl0ruSylaFqrp8u1pp1bzOtw95G5gs7t8l7CMxXan1XyUyqauK7PdO/zr25c8IZHP3ohEyXse52vVV07aOb9dXvUXMk1CVG13WsahG/Zqs81+TjPpu7z+jr1eSpBq34+MtbGzf6NRvGiBr5V93b7hOc48Jn4RA4AsDgc5AAAi3NxZfjBbljq8rMjmlblh43RtOXI2N6WVuncU+oQ5Nf6aN2sa85834o8UivRN1JKa2LTTDr3DPZJLefPbIJz62K7yovh5BI31p9VBbUFBvnElOif5Xs9d5upxKHvH7Uumkd0pfV/o1pylGXw0XjzcwQppeLLTK49zef4RA4AsDgc5AAAi8NBDgCwONF+2EfTpmX3fYn+vAS/tT8TTWstg81bDKMN0EXeytrSvuNY9emS5r/Rqlgt0e/nVRO3sQGZRv4518hTS2E/H7R37ZVmLJGZZr4V/X0wOrjq57cgsBvdXmNrlX59QRf+Uy3X9kXG7hC+re6djF+1LzG2AADvCwc5AMDicJADACxO0MgH3bvQvs2V4KfjHdG0fm0hXlbGlVZvJR95slaf6Tzoxs/fJ3q23TM9r3O3NuriaTTtr7nuffo117nTdm2iew/zbq61UffO2rft0ch7jVb83NZH/jFOhXL4IYZX95mvvf+HYWcz9zpe5tmu3PNI3dtc5/zqWWxtxevOJ3IAgMXhIAcAWJyLK8PPEw27PwdNCf6j8VGJhiUZY0eioXvGSjeeXB6Zd8YJ++64j5dsfNm9K9HXUvpBLjFSis6naYdqKRy+H50z9sOC3VCfKXTYCReYuDqVVvoUQ/1d0TduPx/m5BmyZ3wF1VsOL9P25y0lDe6QZaxcssNCaEvyFeyHAADvBQc5AMDicJADACyOtx+GuXkZvi3Bz8aVaNqCzp2vnY9LEbhHls5bS6S/T0X3dvG4LopW93Ka+H2+072DJdLYD0VPTy2F/bxq4nrtdZtGroSfleq73Tjo6Wf5DNXH8CYWwn7edvW5LziEl3XJyThKj04oxdpa3TvRuXeV6N+mc3wiBwBYHA5yAIDF4SAHAFiciyvDj77xeRl+7hs349Sz7dZWyvnHoSvD3xNNazXzavs5q5E/r3u7a9WP7mICdO+07L5fq5p4GHd7Bc954g3v5nXf0OptiLHdUZKvmrjq4N38ST4z3YL/e6i7lzkjiIbnPSi6NSH4vZ12ne41f4aKN9x50FMN/CAtO/WcF57JPaO+f/hEDgCwOBzkAACLc/GJhiKXmDJ8W4LfmrVBxQQ3ma/YAl3pfCUNsWBdrCQaZnZDf5/nr3XWxNZaO/1y+xY6+WRl959zySNYCIcSffkGfon+E+yI1+mcLdHXtRWChdCU3Wc2x6M6ESlH2QZ3JRbKuVGQJioyhmKfPxk7m6MdlySbzKoo8+fJ13EIAACrwUEOALA4HOQAAItzCbp3X3Yf5uTqipemYBP0tkCZ26OnFzRmZxusRNOWrIoH3mdXd3ujmZe6/hhN/L62G2eauM5bjXxce3P2Q4d2+dFfiA9p7eMshUdRjX3t11fK0sM+em1h3x3Xbi+df9G+rTVXOn9kiX6wrHbwiRwAYHE4yAEAFoeDHABgcYKPfHP7tkJrtNZE60793YX7OD19lwfd3UfmQuxo4Rkqurcr0c+84S7GNtPIXbd7p5lnZfed7h008MxX3ungt0Qj3+zZ1t8H0cTD92P069g2btsjBUxMwH2+sJfTrnWfghf8MB95+F7n9ylH3ha0bOs5l0sr/vSKB51P5AAAi8NBDgCwOBzkAACLE7NWtrZv07lK+7aKl7rQ6q2q24++eNnXjcMzOe1a177m2iyatqS9h9ZvxhtuWrCV8lMKmnhrrd36+atfu9k77nzirZU+FgV91z6DXDto15pj8vy+Ye1Z9zJrbd7I89kq8drta4Nuf57PhfGOrJWaN9x5zre3ieMTOQDA4nCQAwAszsV2/SmV6Ju5h+PTc3PF+wx/uVTkkeZlDF+i7+Nlt8pI1fv0ckolmlbnojwyj6aNHepNVG3W3b6XRypSSmujnPLz17i2Yj8UWeDUOjlFlJVDMXKJsxCWolzbjlJ6t4/Ml0ryk2trz2TGVfuhiYy9nefW0fAMRtJxUtCj+wwHlszxiRwAYHE4yAEAFoeDHABgcS5BLez/g7Mb6rhgN7zPP/764Xhr+7Y0JmD7M222TxbshjqfX+tibLW1WDcnmnH8twRzn4L90LZna23U0CuaeGuDLn77lWjkhpNaDPdQ0r27f5vK1vZjtTHq+EP+nWu4j3ne1qQcXteOQ2sLPNR+6J7fjCt6uoz33MdaCit2w+Q+fCIHAFgcDnIAgMXhIAcAWJyLi6bVOV+iLzv/qfZtBR/5vhL923Stvbb4TD4KwFyb6d69vp76xo0OnvjIe907aOK6thuHKFqjibc26uKqid9k7fC83y7TuZSgT5/n8yXde5xymrnOWd94a6PuHfRzubbX07V8366dzz2ef26utVYru3eebecb1/kdpfM13T6JjkAjBwB4XzjIAQAW51IrnZ9vdEpbY5hxaW1yn+t8bo9NcJd9slJm/6KuP5US/UwC6eWTKLuYa43sch9/Pv76wTjIJ32HIJVSVJY5G4uhSwTU8v2CXBK72Zhx0tXH2/XmUkq8Nll7NnNGMtjTISgr599adl+xG7ZWk3uGI9OU74f5pERfy/D78YkSfQCA94KDHABgcTjIAQAWx9oP8xL9ydfN2w11Pu/6Y+YKMbYVLT4rU69YFd2+pWvTDkedhpZ+r3P7ZLg23Pf2+OsH40F/T9be3L4ateuiaBXRxHvLoZbkhxL9fuzmWmvtQ+2H58dfP1jbWwFvwcaoa8/dWvn9NSX58T7Nr91oKazYDeO141yMdt22b8lu2JocJNnaJ+dkXLIbhvugkQMAvBUc5AAAi8NBDgCwOJdSWzXhVPGc7/KRm/sY3XhPWzXnG9dxqbv9rhjbZO2n073nJftR/9e1qlfP19qx6tyhDL+gexuysvteBz9dZK1e2+nrp0S7dlp20MTdtapzy3jwtmeauPOZO9+4zO+Joq3EwGaRAxU92kXR7mnJFq+9zdcGL/jk69asb7y10TuOjxwA4M3gIAcAWJxLcHG9qnS+IuEULIV2XJR7vNwwv3ZXgmF2rYkccAmHKsPYhMPM2ueklsq1FctghpbLu84+bq2RUlpr7XRx9kMjpbSW2A+dLVDlhbnc4NINdd/73v3XiSxTshQ6q2JhvMOqaBMOix3rh/vskGHsffSXP5FWhjHphwAA7wUHOQDA4nCQAwAszsWW4Ys45DrWl61+1ib4fBTAvi4/B11bKOfP9fSjogDm+rlSKsnX8ZG6t0M02lMrdLsPneW7a50mrmtl7qZrTRl+1KrnenrU2vX5jZ6e2RF7LVse/yjdu1Jmn92nVKK/w35YK7vXX8Qn59J9ZRjG2A8BAN4WDnIAgMXhIAcAWJwHrd4mXz8cuxL9zFc+n6tE07oI3Eq7Nn2OSgRuzUeeaNdGM49adlJKbzgZnduW5Gf77imzPxtRM3i4C/uq2Phhyu71Pr0OnpXoq4a+0Ueumvjtsj1eNmjMH/O1Nc+285zP93n4jFu17Ezntv70uW9c77vPB28Og4pvvLV26t9OxNgCALwXHOQAAIvDQQ4AsDgPYmyfj6YtaddtPl9qybZDu85zTW7TuaPyU0rZKjpf8WxnXvCDImMV1T+H70e1atGNe23+plp15Xn1GYxGnrZgcxq508Rba+3SecMvsq9tq+a94NfeR26yVPL7ZGufm4trZS6Lm92atVLKQFH9uT0/Tq/t3rdBE3f7ylITW9saPnIAgLeGgxwAYHGi/bDjtMNCeGwE7uQB27Extk/vK9dmkbdby/kzfMRAYaNXltn3sobazozF8KTdgyofOVTiCNLK3BZoo2gLUsp9LyOXGKklLbO30oqubTJv1u6JjN1oVczuUyrR37P2q7r+WD1ahq5EH/shAMB7wUEOALA4HOQAAIvzIMZ28nVrXsuu6twV6+JBVkUX5RrmD7Uf7tCg3fe+cZ9DiULefOy06tZGi6GurTxHKAGf2x6tJi7PWNHEdW+9j9PM4z4Fq6J0rrvaVm9tOhfvk619fF1r7a9o35Zr4s8/U7BP2ozo+TNW7IY6f8Z+CADwXnCQAwAsDgc5AMDiXPQ/nEyJfileNuxrxgeW6Fs9PTyT8XDvKbu395zv8/CZHEeA9iEAAAAWuklEQVTp3kGPTkqSb0aPvs313FMQMYv/iOEwWnzUbLvnSDTyMV5Wy/cT3du1eiv4yFXnHjzbwSeeeLY/nO69R09//HyP1u5q32afqeLv1rG5Vt+XpXL+uc6dauTn8R8pz2jkAADvCwc5AMDiJB2CXlmi/3zKYk9aOu/YI8vsuM8uxeAw+eT5pTeRJjQ98Haaz1mrn34zRkbSTkNBHgkXGJujsT0GS6Hrdp+Vwzu5JJNhLqfpnH7cul7mMkxFLnHWxDDeY1U0MQG696Fl9zYpUd9fMm9sjkd1/TnJvqHrj8onndRyVtmlAQDA0nCQAwAsDgc5AMDieI1c2aNzV6yLR+nglTL7ImMX+sKFL0yMLXE2PzvV9VRg7OdDFK2xGGqXH6ORBx1VCVr88xq5tRQGq5+xECadfIaye6OJ67xqyle3VvXzgu6datkfZu0eq6LTzF1HHRlXdO6SfbK1L+n640rwW3ukkf8efxBjCwDwXnCQAwAsDgc5AMDiXEI7t45SvGzx2s1acUGLL2vgTl8vcJj3O72Rm1OdeBwOP3bV6oxvXOdV79RY5OHfEo58YcIz9rp3srbiDR/awj3fgk3HlZZsThPXtXlJ/ji+2hL9+djFBOjaqh49XJt4zge9Oi2777/Oyuwr5f3OG56V3fdr5yX4D8fd7w8+cgCAN4ODHABgcUL64eay+wNL2kv3KXBox/ovYiiHzxa77ina7aknJBjqvNi8us3Dayov1DCt3agqJHJJP9aIgfinsbEUGlujsww+HHd7Z9LE1ZTou4TDq7EMPn5Gt9aMg81xft96x3qz9mNuMcz3vc3XJlLLcN+QfmjGQUqRpYM8Mi/BfzT+6MYfpB8CALwXHOQAAIvDQQ4AsDgPSvRd2X2ipTrctQda/f7KTvMHEZyi3mForz312q/q56F0WOuOO+1RXzNnP9zxsSHVvV2HIH3rOUuhvogfc+06lMM7i6HRxHVtpnP3+nRl7X3+8dcP9zJWRWs/rGjv2TOZZ3Rae7ZvKZr2w+vptuuPKcPP7IZaht/r4h/YDwEA3gsOcgCAxeEgBwBYnKCRV7rQD7w0MnbjPn+j5p1YqWObtee/ieFa1cRVt/zs4zRlzkXRtjZ40kPEg/rI+wcxsbUPH8TMBS2715izeIJeR0585L6F2fMaudOfde9U5zYl+k4TD9ce6DkvtWvTWIet0bRhH1dmr/vuiKb9GPVpq5GbMnxXgn+fNz5yYmwBAN4LDnIAgMXhIAcAWJyYtWIInm0zV9nry7zfX6SZB9nYLa7Ej2Re6k6DVr1Ts1b6rVSH1J9H8Jl/GN3bZbpUvtng706uHTRyva2Jl9XXKfx7gclAydqfXcycadGWt0YzWSuFtmp5psvz+w7PUWjXdr/2mGja+O8QlX13RNN294k691z3dhr4faw+8t/zF3zkAADvBQc5AMDiPCjRn3xdZE9HoD8VGfsqxm4841wQDEwZflai34+zfXvJIEgpn/qn5FzWCI7CLBLXPNM456UUW0pfsB/G8v3ny+wzacJ346lY/UyJfqVDfROpaJdVcRwP79NKl5/WRvth4dravokf+qho2o/nu/64Evz7WKSWbj0l+gAAbwYHOQDA4nCQAwAsziWKjYY97dyyvY5a+yKspTDTru2+ailUwbrTsoP/02i0n6r5Ge1arYmqUzbh6iZ3cJrr0YorpQ+auNPBwz6ythAv67vDP782xOPuiYwNMQJurbnPnihabdfm7mPatem1pWha/d1RzfxDdfBjomk/VDMfWr0l9sOgoXf2wxMaOQDAW8FBDgCwOBzkAACLE0v0t2qef4GOnZJp1xu17VP2zQ/xskl8phsnra1O17meq5p5v1UoU89+lvYfCHZgtkq94YOPWdcazdlF3DbVZIsl+kY3djp4SbvOdPvStfP7llqwqSZe0dcr1wbt3fxuJXq6K7s/Mpr28vH5f19nvnEtw+/H+MgBAN4MDnIAgMXx6YfBC1TYuWJr/BspySzJtUYeiWNnRxznTtf5n6Gnq/8Te7Qfmq4+LYlMqLwnktfUvmWybvfd6+bKx+/zG0vnC2vjtcnarTJGQUpJ77Mj/bC01kiEeTehvkQ/kSmH9MMkwdCM1SZ4VKLht05maa21b6kdkfRDAIC3hYMcAGBxOMgBABbn8m6RsQNVu6GNVTXjkkau1jiv840aqP6w5pp50Indv3dkr9OL3iNWE1fLYOE1LtkEE0un19MPvLakkW/bV+fzyNjC2k6PTjXxUicfYzGsdPnREnwpnbfRtEnZfT+uRNO6EvzWWvt2HjX0y1CiP87xiRwAYHE4yAEAFoeDHABgcYKPvKSZf5W+XtGuDVrm7Urra97wgu6d7RvK7rtnCi3XjGYeOluJ1jgMfb1AuEvh5+518Ofn8vZt/deFtVmJ/mE+8nEuRq7+/lrL993aim88e6aa53xew5Bp4lHLnu9rS+t1n3BtoV3bWTVzU3avunf3C3FR/bzQrk2jadUr/v38azrHJ3IAgMXhIAcAWBxfor8gt7mzzK7VC0IT98Psh/IMKgNc539ayl9eDySE7lqVP65ePhm38drJ5oDM8KLqjbu1WZm9kVqCDOBe89R+OLkuWRuvzdZ2e4ekxHHc3L4VS2HJqvh8KmEmpVTsh1FqmcslQT7prj2r/dB0+WlNLIWmy09royyTJRj2Zfk6V5Favp+xHwIAvBUc5AAAi8NBDgCwOH+lRu461me2QLd2j+5t75tF0Z7mGmCqe1/n1waxemiTo89klO1gN3xRBHEaY2u06+RnN3zrX2Y/lGcqaeSF+zjdO9PT3fdeKbuvRAFkmnjFfqjv2/7aUHY/171VEz+r7m0shq7LT2tjGX6ly48rwb+PZf40v5ZP5AAAi8NBDgCwOBzkAACLs08jtyXWPnJ1ayu19LKCvzt6kW/TtVZfz+7T66HGJ95aopkHTdzU0ie692Ht2xTzA0q7//XfavLvDk4zf52P/Pm14T5Hes5N6Xz4fvZ4w/v7FMruU03c+cj1jamaue1uP9e5Xef71h5E0xpvuEbT9t7wPe3a+hL8+1g19M6DfqJEHwDgreAgBwBYHA5yAIDF+St85MHv7TTaihd8DwXf8q4o2kQzd7q3bd+W5KV8VQTx5nZuf8xHLvdx2nWWm7M112SHnp5q8c4bblq0VfJTSpp4a+MvfBJje3Lt24Jm3ueleE1cY2x7bXtPNG2lXVvmI//n3Gvx+MgBAN4KDnIAgMU5TlopWMtaO9BSaEjL+Ss2QXNt+PNWLISlKNqCpdCPfWxtPyx1hdJbFn/u9lprP9Rr98TYmn0LMbaVa3PJw8wVyuzjfZwEktxna9l9RUppbZRTVErRbvfGfhjkkT7GNtgPfSm9K7tXi+EQTVvo8vP9Y16C31pr33TcySlqVeQTOQDA4nCQAwAsDgc5AMDiBI3catf6H1wyaqUiP7MQFu6zuV1b8ZluVveWa/v5ShStzjv9/NH4yblDnYgbNfH7/FExtsnakka+rZxfx/sib804xNh6+14tCqDSgs3MZWX3/e+S0cRba9LdPouinbdr+5Bn0rL7S6HsfoiXTXTv0X44zv0juneMse2e6YT9EADgreAgBwBYHA5yAIDF8T7yF0XRtib6ddoCzDxCIV426KyulF431vLfoex+vk+YL3nBZez0cxmeshL9FxFet56C7l3RxMO1BY08/pzdWtn3wGja4fmzFmzDvokmbsvufYyt1b2dZl7QxFsbdfE8mvbafZ1E0XZj1cS17D60bzNl9xov+2F07+8f82jaWL6vJfm/pmM0cgCAN4ODHABgcS67bILdXyt5x/pEpum3dWmIO1IJT/rnoJbS906zsHYutWT2w/75g+JRklaStcPU+Lx7yvDD3pWEya1yyYHSipNPSumHhbU6vytl0Ugg5fTDvpNPIsMMcmJmP6wkGO4ou+/llJhgKFJL90yVBMPWpOw+sR/2colKKaHs3pTZh5J8kU/6scoufCIHAFgcDnIAgMXhIAcAWJxoP6xYCvvLKrqp3CfX1x/fU+f02ixeNsbYmrVOM1cLWEHnVu3aauiZzv1VZfg9O6yjFY28VN7/ohjbaom+1e2tRr69u/2eGNsYVTvXyMN7/jzXyIOlcEfZfa+L61zosNPbD5PY2lBa382rTbDS3f4fo5mrJv7P+aeMRUM/U6IPAPC2cJADACwOBzkAwOIkJfrjcI/nfE/c7BCtm9jRXbxspnG6snunmd+S0vmhbVwW0Ws09KBzb4ytLVOJ+9XHqOje/VzSVu3rYmyfu+fD+5aiaY1n22j+aXd7t1fwpxv/t9PEZa+KJt5arey+n3eaeGtSOp9o5EEzP8995FpK/31Y62Nse91bNXH3DK219s+pK9HHRw4A8F5wkAMALM4laBUVH2GhG4wt2ZfJSlKiVVoKUorOp11/+sdXCUeXqkwwTL6m689L2dgFyCYj6r6Z5HFQ+mHpPlX7YcVSaLr+WAmn0t1enymU2Y9DZykMaaBOWjmw7H7osJOU3V+MtKJ2w5hE+Hu9ltI7++E/SYLhxUg2/xGpJZTod3v954S0AgDwVnCQAwAsDgc5AMDiXGo691xPV6m3YimsdP3JLJDDY1Q698i8i6JtrY0RuEY/f3TtsPRVXX8q+nkxXqHSBWi7ni5zL9LIS9G6le72bbulMC2zd3p61smn30u/d6eDl8rsdU4798w186zbfaXsfiizL2jirY26eGY//Gdj1x8XU3tfO2rmvS7+DY0cAOC94CAHAFgcDnIAgMUJJfpDOXyldL5Sqq3rEy/7cJ+kXVt/ZZCJ93S7tyX6snaHF9zq6ZmJ/igqUcYHaeI6TsvfS63enr+P1eIr2rWO93jD7b6JJu5asiXRtIMOrl5w1ci7fSua+H3++W73lbL7XhevaOI6r3PqFXft20IUbaeDq29cNfGooXc+clnLJ3IAgMXhIAcAWBwOcgCAxYk+8lIGillb8JVn2umgR6ct2KbbpJq5y09xWStp+zb3EEnUitPMvwoXN3uUbzzMFzXyUlyu85G7yNhMj36VN9zlpSTPFN5Apn1bjJ+9dnOy9qSaeSWKdu4Vf1V+SkUT13ltyRZbvz3vDe+17XTtaa6Z0+oNAODN4CAHAFicB9LK7y9L3e2ztYKzLoY/F7uO9WGtPpKTYfQZ9NrhGWTOdbs/MHq2JMscRdE6uvnaPdLKnlL6ilVR33uu9P9PWQpdmf2eTj5h3G0j0kOMpnVRtN4m+NF3/RF5RO2IvXySddRxFsJMaunllH8+NMZ2bilUu6GLpo0l+N5+2O+la/lEDgCwOBzkAACLw0EOALA4oUTfYkv0kzJ7M521YOuFY22bFmyC/VyhnF+vrXS7t7q2/odM5/7b7Yat2ZZsdq9M957d49HaHS3ZxvdTtrbwDBVLodO2DyyzD2X33Tjtbn+a6+muJZtaBuNYy/B/a8FOE29Noml3RNE6Tby1URd3mnhr26NpK1bF+zwxtgAAbwsHOQDA4nCQAwAszuUmmtSpF69lTmNUTwX90/m/g1RqNM7TVXVIeaZuOi3n36N727zc+b5hm+w+T08m7ImmLey1S/feWGYf5vV963TvPS3kKt5w/UEX2sLtKbO3Gnnwgs9177Ts/jTXyLOy+299q7csmnZj2X1FE9f1ThPX+Uo0rXrBnSau6/GRAwC8GRzkAACLY0v045/Qcw+hTUZsuW1wXCt7me72QR/py/kLUkprIstU1lZq/7OlX2Q/TOUTx9aEwwOlFVdKX0lOzDsRza2KaUphIf1wXJuU2fdS44cvnXephdrJx8knOneWN+pgIdR9jJSi89/FUqjXfh+kFU0hnHewd1197tc+X3bvbIJZl59eElHpxEkprbX2vdvrO+mHAADvBQc5AMDicJADACxO0Mhvg4Ymk1oOb6Nox7HaBgd9XR4qSM6mu33s5HObrlVBtBJNu6frj9tH2aVdb6RsN3yZRn4zc3Kt6xhU0OJtWX1YK3NZ3KwrpXd2xB0WQi27Vy37ZCyFle72YW23l5bVp2X3p7n90Onebq61URevaOL3a+f2Q2cxzLv8/N5X93GauM5jPwQAeDM4yAEAFoeDHABgcWKM7dAqzZTvt1aKl40aZ6fzXcdJJyNb/Xx8pAde8KQevhNTrX6uJLr38EzFaw9ja1l9cu2RureNjN3jQS+0b3M+8kp3+0DFG76nzN50t2/Nl93v6W7/McTL+rUX7Urft2+Tue9SOt/PO038/hy9nv68Jq7ze8rugzfctGtzmrjupc/PJ3IAgMXhIAcAWJxL+BOvlzmyP4X7/w0Ye2FrWdm96hhzmSZYFfXP6IqF0EkvaaLhXIYJS79KPqlQshDOv4Ej5ZJhrd6oUEpfKtHP5BG31nX50fk9lsIdZfa27F5+rq6TT5ZKeDEJhlknn14ucVJKa2NKYZgL6Yfbyux1fk/Zve7ryuxTWaa3LiKtAAC8FxzkAACLw0EOALA4D2Jse91MdW7R7oyebte2rOx+HoFbsQVa/fzRfZ11UekW7IqiPbImv3DjSicfN3+k7u33fb6UvmI/LMXLJl1+3PyRlsJKmb2Ln71oKb2Jn610t/84eT3dd/LxcbO9Lu40cZ2vaOL3a48pu6+U2TtN/D5/ffh1a3wiBwBYHg5yAIDF4SAHAFicS9D1BmHZB8yWIm+NVzxG0cpdez26EE2b6dyphj5M6jM9vTTxpL/IZF6Q3lOd2+x9pO5dKtEv+Mh3xctaL7i/9iu84ZUye51XTdzFz+7pbn8Rnfi7ibHN42Z7jXzUmMMzmTJ7p4mHa19Udl/RxO/z/TPJz7UBAMDScJADACwOBzkAwOJEH3mvm11VmNS13ZRG3qpmrtd260MErvOKB636ZtYW9k0Ievp0UKRy7R7LuctWqV77It27tK/LRMnWDnNJvKzRyIM3XFOev8AbXslL0fmYiTKPn9VcE6eZO5/4o716v7d6wVUn7rVs3feovBSdj/uqtv17vpKfUtHE7+PfP8tvbYRP5AAAi8NBDgCwOLUYW7dWLV6iW2iJ/rDeySOt1Tr39C60wr5KuI8umCcZfJ1cUtlrV4egL5JLTJl9qexe2RMvW5BWQgOtL7AUum7297Hp+pN08vGWQpVWnu9urxJCJW52KLsP++4ps5+X8DsppbVRTqmU3VeklNZGOeU/4l/lEzkAwOJwkAMALA4HOQDA4lyCrc7ph0Hn7uvhdWsfgTtq2b68v198Cx4vGboS/cS6OCz9U1G0e6jk55Zavc3HJX29UjqfPkNBXzcaeRovO+jcbTr3cPwFlkLXzb61WKI/WArD2mMshZXu9vdrn9fI+2v/Ufve2enR1VZvvU3wNWX3FU38Pv/7DfgNjRwA4L3gIAcAWBwOcgCAxQkxtqeh7N5o4q2NmrOuTSJwB521Ut6fiNelEv1wsdvY3tXe5yhKUnwhija9j9Ojs323ls5n97Qt2WQqrJ2XzrtrXVl9a1Ej/wpvuGrgmTe817KzaNpeu47t2ubatXrM82jaz4dft+Y1c6eJ39fOW7CV2reVNHKdm3voK5r4/drf439O42o+kQMALA4HOQDA4lz0z8Nb91eR2q2CqjGU6KtukbTfKZT3W6uiYmSYVEopaBelDkEvoia1HCOPxGdI9t1aOl+UVk7mWiefBHlEbtOX1ruy+vszGGnlRZbCTB5xlkJXZp+tdR3sXQn+o2udtOIkkazLz/fBfvi8lKLzeaJhX6Lv4whcgqGTUlob5ZRvp49hjk/kAACLw0EOALA4HOQAAIvz/wCwuUW1/XIjPwAAAABJRU5ErkJggg==" y="-41.184"/>
+   <g clip-path="url(#pfdd2bdd6ec)">
+    <image height="266.4" id="image0c2755b78e" transform="scale(1 -1)translate(0 -266.4)" width="266.4" x="103.104" xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAXIAAAFyCAYAAADoJFEJAAA2uklEQVR4nO2dUXYbubJsQYp2n4Hc+U/rTuG4bZHvg2tdA5FEJLOqKBt8e38JDRSqRFFoKhwZefr83/+5tY6ft8//+/rH7Wcb567D+L/deFzZ2n9vJ7n2LPMf3dyHzH0bxv928zr383aZXhv2vWbX/h7/vF5k7bjXj25e53T8b7/2Os79ktdF5//txr+u49pfcp9+/jOsHcf9vO77KT873evz+nv+mlzbz1+vOjeOb921N10r++p8u7k5c+2tyVoZ27VyH6X7dTnp2uy+du3vvU7uuuq+hvQ+O8hexgG31syFe+g3VNk3vL26vcZfhwd7dWt133PyTN34JGuz2wIAwF8OBzkAwOJwkAMALM6l18RbG3Vxp4m3Nuriqon/N+jGqpH3GvNc526tqJFf5xq508RbG3XxH2FuroP/ED1dtev+2h+qkSeaea9f/6v3Cfq00b2Nlh018LkmrvOqXUcdfK6Rq5Y9aORB127TtffN5/p6TffW8fNrgw7eP3NBXw96tBnv0sjD2opYfRzDXStifPK4/bdzCnrzabo23sdr16dz/97LtPf+P8hafd8aDV3f43wiBwBYHA5yAIDFuTiLoZNS7vOn7uvnpZT7/KWbm0spOu+klPu8k2HUQjifVylF5RMrrQQZ5jyd+7cgtahcos+41VKo0smRlsLrIHmM+wb5xFkIgwzT5vMVaUXRv4xLMoyOjU2wIpfskWWUg+yIh3KaDmqWQt3WWP302ii9dGvDQ6gk0u/jn/822AaT96naEfv3IvZDAID3goMcAGBxOMgBABbnsqfsfiyzf14Tv8//1qedJq7XOk1cr61o4rq3aszx2rnuHe2Ic+06tRT2urcps2+ttZ+mRN9ZCnXuSEvh1ZTdl8rsK7q308Bbq5XODxbCce2rdO/KvkpqINyqg1euq7oYjWys93VLY0l7994Lmri3CW62Luq+8lG5/zeXW7I2vI97XTy5FAAAFoODHABgcTjIAQAW53JU2X1FE2/Nl927uNmKNzyPsZ3HwDpNvLVaNO2/n10Urbnnw72c7q1Rwd19Kt5wnTvUG37tv8408l7nHqdSjdxcu6d0/mTWvkr3Dtpvwftdipv9K3zjntTv7a7tX9Niif5WD/rtrO+1uRZ/OuvvQyJ899OU6AMAvBcc5AAAi8NBDgCwOJej8lMyTdxq5GkLtm3e8EwTdxkpzgve2qhlx7yUuZ7uomcfzQ+6d6EF26/P8ZmcNzzTyHd5w128rOrgTiNP/N5DJkq41qzNommP8pG3+VxYu6cNnFDTzA+KsS32hXO3tZp4NT+lX6s/5x0e9P5X+KTvPdXiey+4/luOauYhUGgegcsncgCAxeEgBwBYnIvrdr8nijaNpr2aaFpjMayU2VekFJ1XKeXH51xq+dfM3e/TvaYmelbX6nhP557Pz7l8EqWUAy2FW+NlnRzy8Nrn1zpLYcl+KJfuK9E3a8N9jK0xe6YvIcuXnQ/TbvdmrY2iLdoYnXVRLYan61xDk6NgLNHXmNrkPe8icPlEDgCwOBzkAACLw0EOALA4l6iD96Xz26NonSaue1XK7iuWQp3TyNjYzq0rpU/L7ud6+s/P+bUuevbR/BBjKzr3rhZsn3M9/VBL4dZ42YpVsY1adrCA7bEf3p6cS/aKa42VcYfu/Vdo5pn+XLIbGkE90dN9FK1/ppN5iziLoereunY4KkJ0RKFEXxNuGwAALA0HOQDA4nCQAwAsziWW4fft214TRavrs7L7ije8n69o4q2Nungsu1e9vY+MFe+30cxd9Ox9r7nuHUr0gzd8Ywu2z+0aedC9C2X3Nl72OtfA7/u26XzqI3d6dMFzvkv3rsTPVlq9/aloWkPQn3WB073NXlk07bjvXD9/dOlQdu8faZSurfd7XBz1c30I0duHaAxK9AEA3goOcgCAxbm4LvRpmf3N2QK3l907i6GTUlrznXuclHK/dm4/VKmll1Pc3P05ni+zd6mFKpe4svtdZfayb8lSeFQqocowFfvhDrnEPVO1u/3LpJUCXyW1WEth9gwupdBJIJX0Qye7tMQ2mJXd93NNCO/T3yvCPqrCuBgKkWH4RA4AsDgc5AAAi8NBDgCwOBengztNvLVRB69o4q29ruy+j5vV+AFdW+nkU+lu78ruQ5m9ducxFsO8u/3vtYeW2X8aMTJo2WYvFxGr46r90Ni6dnX9KWjvJY1c2KqRlzXwrZp5IZk2bTSk890zBZ3bNMnZFWOrH2H1fXsyWrYru9dHMBbDk4jgQRMPL+Tt4Zet8YkcAGB5OMgBABaHgxwAYHEu1htuNPHWRm27oonrtXvK7rUFW6+LVzRxnXeaeGu+7F694L1X3MXUtua94q7MXuezsvvNZfattdPnXCMP2nav5SXecOsjL3jDK57z1M9d0ciFUgSu23eBkvyhdF4nkwjZytqhHN41mddnko+sN31/Ba94p2VLOXzQxOed3mIEbi9zF2sLboPoT4k+AMBbwUEOALA4wX5oLYXGJphJKTq/tezeSSm6tiKltDbKKU5KaW2UU5yUontdVVoxZfatjZKIXqt/Ht6cpVAthFvL7FsrpRRWLIUVGcaW0hesihUJJ5V33PyBJfmvKuf3N90xvyvR0Iz923a0ROrPWaUWvbaPsMhSCYe1so+7NFhfEzuieR35RA4AsDgc5AAAi8NBDgCwOBdXWp+VzvdrM01c9/qKsvuKJt7aqIPrWh1v7W6faeJXmb8NXUHaOKdrXWTsUWX2On+gpXDU0/0zlWyC7r4Fnbukveu1le72ezTyL8J2/anYDXW+EE3r4mRbE6uizhU08/h+mncBSqNozb4VO6Ku5RM5AMDicJADACwOBzkAwOI88JHPveGltQUfedbtfmvZfUUT1/VOE29t1MUr3e0/Q+m8b8l2HcrhtSWb84aPU7vK7L/IGz6W2Sc6/Y5S+krkrdPIK7G2FY28pIG/Ui937dv0MYzOrVTat7k2a+Fnp9d2azNLttPMMz29Ge06vPfmVfY1X7ms5RM5AMDicJADACwOBzkAwOJcnLatHvOj2rW1NmrZql3/uM595XuiaJ0mrmOnibc26uJOE7/P917w57NVWhMd3EXRtjZ6xQt5Kaegteu1Zq8jveEuinZHJorTwV+Vy/Jw3qz1UbUFIbyimWf+7n7bEIIiWxU0cqeD5y3Z5vvYlmxZtoqMe108eMydtq05LC/yletaPpEDACwOBzkAwOJc/g3yye/xf2XOleFnUsovlTmufYytSh5zCaRSdl+RUlrzZfe6tpdE0rL7Qnd7ayl0c62Nf3qlckkX+/rZZO0fshTaLj/mGXT9i6SVilVRCfLIgbG2L2Po+iNWOCuPFGQYuTZIIKaTT6W7ffjZFaSWUiefijzi03GtHVGX8okcAGBxOMgBABaHgxwAYHEuobt93+otacHWWw6j/uw18x9DWzW1Gz5vPzwqira1URd3mnhroy7uNPHWWq27faUlm7PzfSY6tyuzF838yyyFlTJ79/3s0MhL7dquXrwuxeXO7rll/lmObN822A/9A4bWaf2lSdm9072dZq5z4efhppOfnSudd3bEiqs0gP0QAOC94CAHAFgcDnIAgMUJJfq9Lv5DPebG361ae/CR3+YaumrizkfunkHHFU1c1ztNXOedJt7aqIuXNHEdq55rrg3ar+relTL7cO1kn0d7VbzhG9eGcbbWlt3P/d7lkvxXaeSvwmjiNnpWr81avem/LRgPuivRr/jIs/dE0NB7D/2O0vnUV26olPfziRwAYHE4yAEAFidKK33ZfWoh7JMSRaaQ8Y/PudSS2Q9/XueWQleGX5FSWjuw7F4thv1ele72rdU6+XQSiE0s1PlCmb0+0x5Lobs2tQVWrItGPilFAeyQVtJuQoZSx6CEUFpvbzz5+sG439fKLtn4PH6z+rs1SC2Z/dBIaHZta2PXnzaf02tLlkLTPejhfc0kn8gBABaHgxwAYHE4yAEAFueinX16Hdzp5/fxPF422ARFlPq308xVEw/adm8/FE08dLA3UbS6dlfZvbEU3uS+gz5X0cTl2konH11rLYUVPT3cZ5yrWAp9bIDMVfR1LYs+qkNQxW6YXKuUugDtYIhnTeJmS5ZCszazLvq42blm7rrZ39d2+2Zr3c9Sn98nEsvkvGQ/3afwluATOQDA4nCQAwAsDgc5AMDiWB959I3P27epJh6iaI2PXDVxp5mrzv1LfeSf87XqDd9Vdj9E0xpNvDXpbv+8Jh7mkxL9ih7d73UuaO977lPRyPMSfaODvyjGNtfEC+X9yleV5W9s3xaE7R0l+pW4WaeZ3/R3ybRzy9q1ldq3uczbLPK2GXQy3Gf4F45hik/kAACLw0EOALA4Vlr5dfOphL3UEtMNfcn+0MlH5lRq+TlYClV2Efmk+/MjSid/vuw+SCkulbCpTfD5Tj670g9N2mH9Pt2gYj+sSCnptTIu2Q/ntdrlNESz9unrEtIS/KO6/oS1p/mcSTBsrdb1x8kYgR3W0ZIEsjFuIb2s8B7hEzkAwOJwkAMALA4HOQDA4lzUUtiX2ocO9Saq9t9PtR+qVXF+rZbd/zSdfVQTj1G054dft9ba5+dcE29NLYUvKruvaOKtjV1/su72LsbWWBXLMbYVS6F5pnjfefnyoXG5g0Yu2vsu+6HOz0XOI6Nph331EawmfpylsP+GbufnbYGtNd/1x73m8rML93UWwpbgtHjzmla6+hxpOeUTOQDA4nCQAwAsDgc5AMDiXNQb3uviPwrd7aPnXL3gz5fduxZtOhd18G6t6tx7ut3vKbsfdOLnNXGdL3W3d5q4Xpv5rt199kTTGm94aV8dZx70zTG2z+vpystK9Hf5xnd4w51XPNOunWa+I162RLFk31Hyhr8IPpEDACwOBzkAwOJwkAMALM7FecNVEw/RtH3WimrVhfyU0L5N81Ouc43cRdGqJq7ZKi6aNnjDD8pPqWji92sff/3ovq4Fm9OCz+GZ/LXWr+684S+KvA33+WM+cqOQ/oGY2gfDsb1bwRseo2iN7h184l4zt57tQrysCupDzO1BGnh6afpvIfMo2opfXeETOQDA4nCQAwAsjrUfxmjaucVQ7YWhJL9Sdi9Sy7X7cyRGz8q4k1q0g0gWTTvIJ2o/dBbDrAt9JYrWdqx/3lJYKrPPZBgZD1LMiyyFTjpJ9zrUfmhibJNrp/scyE3L7MONZXyeyyW2ZL8gl6Ql+aGT0vMSyK0gwzhZLKgY5tpsbRod/AXwiRwAYHE4yAEAFoeDHABgcR7E2HYaedKurde5Q0m+drc3GnlowaYl+0PZfVJm3+vpIYpWy+7NOGjZ85L9oF1XomhTq99ce9xVOm8jb/21/fd+/vTa9VZLYUkTl/W77IdubdB2m+egdm5Ogz1lG7lcW6eft6Lu3b2O1l6YjXfo3pWo2pKlcAH4RA4AsDgc5AAAi8NBDgCwOJfoFe/atxXatYXS+Uo0rax1XnHVxGO7tn4y0cSdZp61FjM+8lIU7YFl96W1Fc+50cH36fZ7POdG28585EaLr2myXlk9qp3bnvZtuvZkyu4f3On3VzuiaPNxb9p+Xl/PXt7+3zRuWb37F7VksxT86Poy8YkcAGBxOMgBABbnEuWSuf1wT5efkGjYrVdLoUs0VGviTf7E67vdl+yGrVlLYWWt63Yf5o4su99oKYxzIkWUEhnd2ucthbvsh4kMM9oPm8yZNETdR7BSSuXP8z1df/SjmSnDDx3rw/c3T+rzCYZJDfse++Gz+2Rr3ww+kQMALA4HOQDA4nCQAwAsToix/TXo3q/p8tPaaBsMJfrGYmi7+ug4sxsGm5or0de1j79u7YHFcKPOnd6npHu7Z3peE4/X+rV9Cf+ROrfV9dMS/e4+aq209sNEaH2VDmvSZUOMrT6jTne/phq37DVzfYjtUbR7LIXLa90VT6rr2CTwiRwAYHE4yAEAFoeDHABgcUKJvoumPapdW2viDQ869zyqVr3hqpEP5fJZGy/T6m1XvGylXdtXld0H/7rRowvPlMXYjs+/w0eeed2HEn291ujgWTm/08UTD/pmVPd2H7ey7va6vnstbuOvqNfMd0XROn+6zMhaW1q/I0b4r2BPizhK9AEA3gsOcgCAxXlQor8t0bDS5ee+fp5oeAtl+PO1wVLYj2Uf/dMxdoDvvg5/ystepszbleFXZJjwTHvshy7BMJFSzkbWyGWYuYQTZBljiYw/q7l8EhMmTYm+/tmf2RGHfXbYEW2CoYw1hqJv8iPySJB7Qheg7j/I96pSS3+j8Drp71L3QpWTBs3r9Fd08qlIIAfKJZW9+EQOALA4HOQAAIvDQQ4AsDgXV4ZfiaatdPlprbVrp5ln0bSuu30Y97peiKIdh0H3vj43d997476iKWfl5INuXLEfZlY/Y1V0mnh+7fPdeE6/5vfJS/RdNG22dq6nu6jaqBMfqNh22rXtANRaO/Vr9fUOJfnzWIpwG1c6v0PXrnS3X4Hs5zMwP57qnCZfNz6RAwAsDwc5AMDicJADACxO9JFfjY/cRNPGKNokmvbW63w7omkLJfpZefyoxevcfHxOtPhhLAJh0KN3xdhuK7uvaOK6Pm3J1vu70/uYeNlMM+9F3HBtwUce9u2vy3zjTjgueKtVZD7P/w0paOIaRRv+DaBfq+9bF4G7owu98GXe8C/yfw8JvoV90g54+MgBAP7/gYMcAGBxOMgBABbn4vJUXHu21kadO/ON22haXSu5LKVoWquny7WmnVvM63D3kbmCzu3yXsIzFdqfVfJTKpq4rs907/Ovblzwhkc/eiETJex7na9VXTto5v11e9RcyTUJUbXdaxqEb9mqzzX5OM+m7vP6OvV5KkGrfj4y1sbN/o1G8aIGvlX3dvuE5zjwmfhEDgCwOBzkAACLc3Fl+MFuWOrysyOaVuWHjdG05cjY3pZW6dxT6hDk1/po3axrznzfijxSK9E3UkprYtNMOvcM9kkt589sgnPrYrvKi+HkEjfWn1UFtQUG+cSU6J/lez13m6nEoe8ftS6aR3Sl9X+jWnKUZfDRePNzBCml4stMrj3N5/hEDgCwOBzkAACLw0EOALA40X7YR9OmZfd9if68BL+1PxNNay2DzVsMow3QRd7K2tK+41j16ZLmv9GqWC3R7+dVE7exAZlG/jnXyFNLYT8ftHftlWYskZlmvhX9fTA6uOrntyCwG91eY2uVfn1BF/5TLdf2RcbuEL6t7p2MX7UvMbYAAO8LBzkAwOJwkAMALE7QyAfdu9C+zZXgp+Md0bR+bSFeVsaVVm8lH3myVp/pPOjGz98nerbdMz2vc7c26uJpNO2vue59+jXXudN2baJ7D/NurrVR987at+3RyHuNVvzc1kf+MU6Fcvghhlf3ma+9/4dhZzP3Ol7m2a7c80jd21zn/OpZbG3F684ncgCAxeEgBwBYnIsrw88TDbs/B00J/qPxUYmGJRljR6Khe8ZKN55cHpl3xgn77riPl2x82b0r0ddS+kEuMVKKzqdph2opHL4fnTP2w4LdUJ8pdNgJF5i4OpVW+hRD/V3RN24/H+bkGbJnfAXVWw4v0/bnLSUN7pBlrFyyw0JoS/IV7IcAAO8FBzkAwOJwkAMALI63H4a5eRm+LcHPxpVo2oLOna+dj0sRuEeWzltLpL9PRfd28bguilb3cpr4fb7TvYMl0tgPRU9PLYX9vGrieu11m0auhJ+V6rvdOOjpZ/kM1cfwJhbCft529bkvOISXdcnJOEqPTijF2lrdO9G5d5Xo36ZzfCIHAFgcDnIAgMXhIAcAWJyLK8OPvvF5GX7uGzfj1LPt1lbK+cehK8PfE01rNfNq+zmrkT+ve7tr1Y/uYgJ077Tsvl+rmngYd3sFz3niDe/mdd/Q6m2Isd1Rkq+auOrg3fxJPjPdgv97qLuXOSOIhuc9KLo1Ifi9nXad7jV/hoo33HnQUw38IC079ZwXnsk9o75/+EQOALA4HOQAAItz8YmGIpeYMnxbgt+atUHFBDeZr9gCXel8JQ2xYF2sJBpmdkN/n+evddbE1lo7/XL7Fjr5ZGX3n3PJI1gIhxJ9+QZ+if4T7IjX6Zwt0de1FYKF0JTdZzbHozoRKUfZBnclFsq5UZAmKjKGYp8/GTubox2XJJvMqijz58nXcQgAAKvBQQ4AsDgc5AAAi3MJundfdh/m5OqKl6ZgE/S2QJnbo6cXNGZnG6xE05asigfeZ1d3e6OZl7r+GE38vrYbZ5q4zluNfFx7c/ZDh3b50V+ID2nt4yyFR1GNfe3XV8rSwz56bWHfHdduL51/0b6tNVc6f2SJfrCsdvCJHABgcTjIAQAWh4McAGBxgo98c/u2Qmu01kTrTv3dhfs4PX2XB93dR+ZC7GjhGSq6tyvRz7zhLsY208hdt3unmWdl953uHTTwzFfe6eC3RCPf7NnW3wfRxMP3Y/Tr2DZu2yMFTEzAfb6wl9OudZ+CF/wwH3n4Xuf3KUfeFrRs6zmXSyv+9IoHnU/kAACLw0EOALA4HOQAAIsTs1a2tm/TuUr7toqXutDqrarbj7542deNwzM57VrXvubaLJq2pL2H1m/GG25asJXyUwqaeGut3fr5q1+72TvufOKtlT4WBX3XPoNcO2jXmmPy/L5h7Vn3Mmtt3sjz2Srx2u1rg25/ns+F8Y6slZo33HnOt7eJ4xM5AMDicJADACzOxXb9KZXom7mH49Nzc8X7DH+5VOSR5mUMX6Lv42W3ykjV+/RySiWaVueiPDKPpo0d6k1UbdbdvpdHKlJKa6Oc8vPXuLZiPxRZ4NQ6OUWUlUMxcomzEJaiXNuOUnq3j8yXSvKTa2vPZMZV+6GJjL2d59bR8AxG0nFS0KP7DAeWzPGJHABgcTjIAQAWh4McAGBxLkEt7P+DsxvquGA3vM8//vrheGv7tjQmYPszbbZPFuyGOp9f62JstbVYNyeacfy3BHOfgv3QtmdrbdTQK5p4a4MufvuVaOSGk1oM91DSvbt/m8rW9mO1Mer4Q/6da7iPed7WpBxe145Daws81H7ont+MK3q6jPfcx1oKK3bD5D58IgcAWBwOcgCAxeEgBwBYnIuLptU5X6IvO/+p9m0FH/m+Ev3bdK29tvhMPgrAXJvp3r2+nvrGjQ6e+Mh73Tto4rq2G4coWqOJtzbq4qqJ32Tt8LzfLtO5lKBPn+fzJd17nHKauc5Z33hro+4d9HO5ttfTtXzfrp3PPZ5/bq61Viu7d55t5xvX+R2l8zXdPomOQCMHAHhfOMgBABbnUiudn290SltjmHFpbXKf63xuj01wl32yUmb/oq4/lRL9TALp5ZMou5hrjexyH38+/vrBOMgnfYcglVJUljkbi6FLBNTy/YJcErvZmHHS1cfb9eZSSrw2WXs2c0Yy2NMhKCvn31p2X7EbtlaTe4Yj05Tvh/mkRF/L8PvxiRJ9AID3goMcAGBxOMgBABbH2g/zEv3J183bDXU+7/pj5goxthUtPitTr1gV3b6la9MOR52Gln6vc/tkuDbc9/b46wfjQX9P1t7cvhq166JoFdHEe8uhluSHEv1+7OZaa+1D7Yfnx18/WNtbAW/Bxqhrz91a+f01JfnxPs2v3WgprNgN47XjXIx23bZvyW7Ymhwk2don52RcshuG+6CRAwC8FRzkAACLw0EOALA4l1JbNeFU8Zzv8pGb+xjdeE9bNecb13Gpu/2uGNtk7afTvecl+1H/17WqV8/X2rHq3KEMv6B7G7Ky+14HP11krV7b6eunRLt2WnbQxN21qnPLePC2Z5q485k737jM74mircTAZpEDFT3aRdHuackWr73N1wYv+OTr1qxvvLXRO46PHADgzeAgBwBYnEtwcb2qdL4i4RQshXZclHu83DC/dleCYXatiRxwCYcqw9iEw8za56SWyrUVy2CGlsu7zj5urZFSWmvtdHH2QyOltJbYD50tUOWFudzg0g113/ve/deJLFOyFDqrYmG8w6poEw6LHeuH++yQYex99Jc/kVaGMemHAADvBQc5AMDicJADACzOxZbhizjkOtaXrX7WJvh8FMC+Lj8HXVso58/19KOiAOb6uVIqydfxkbq3QzTaUyt0uw+d5btrnSaua2XupmtNGX7Uqud6etTa9fmNnp7ZEXstWx7/KN27Umaf3adUor/Dflgru9dfxCfn0n1lGMbYDwEA3hYOcgCAxeEgBwBYnAet3iZfPxy7Ev3MVz6fq0TTugjcSrs2fY5KBG7NR55o10Yzj1p2UkpvOBmd25bkZ/vuKbM/G1EzeLgL+6rY+GHK7vU+vQ6eleirhr7RR66a+O2yPV42aMwf87U1z7bznM/3efiMW7XsTOe2/vS5b1zvu88Hbw6Dim+8tXbq307E2AIAvBcc5AAAi8NBDgCwOA9ibJ+Ppi1p120+X2rJtkO7znNNbtO5o/JTStkqOl/xbGde8IMiYxXVP4fvR7Vq0Y17bf6mWnXlefUZjEaetmBzGrnTxFtr7dJ5wy+yr22r5r3g195HbrJU8vtka5+bi2tlLoub3Zq1UspAUf25PT9Or+3et0ETd/vKUhNb2xo+cgCAt4aDHABgcaL9sOO0w0J4bATu5AHbsTG2T+8r12aRt1vL+TN8xEBho1eW2feyhtrOjMXwpN2DKh85VOII0srcFmijaAtSyn0vI5cYqSUts7fSiq5tMm/W7omM3WhVzO5TKtHfs/aruv5YPVqGrkQf+yEAwHvBQQ4AsDgc5AAAi/MgxnbydWtey67q3BXr4kFWRRflGuYPtR/u0KDd975xn0OJQt587LTq1kaLoa6tPEcoAZ/bHq0mLs9Y0cR1b72P08zjPgWronSuu9pWb206F++TrX18XWvtr2jflmvizz9TsE/ajOj5M1bshjp/xn4IAPBecJADACwOBzkAwOJc9D+cTIl+KV427GvGB5boWz09PJPxcO8pu7f3nO/z8JkcR+neQY9OSpJvRo++zfXcUxAxi/+I4TBafNRsu+dINPIxXlbL9xPd27V6K/jIVecePNvBJ554tj+c7r1HT3/8fI/W7mrfZp+p4u/WsblW35elcv65zp1q5OfxHynPaOQAAO8LBzkAwOIkHYJeWaL/fMpiT1o679gjy+y4zy7F4DD55PmlN5EmND3wdprPWauffjNGRtJOQ0EeCRcYm6OxPQZLoet2n5XDO7kkk2Eup+mcfty6XuYyTEUucdbEMN5jVTQxAbr3oWX3NilR318yb2yOR3X9Ocm+oeuPyied1HJW2aUBAMDScJADACwOBzkAwOJ4jVzZo3NXrItH6eCVMvsiYxf6woUvTIwtcTY/O9X1VGDs50MUrbEYapcfo5EHHVUJWvzzGrm1FAarn7EQJp18hrJ7o4nrvGrKV7dW9fOC7p1q2R9m7R6rotPMXUcdGVd07pJ9srUv6frjSvBbe6SR/x5/EGMLAPBecJADACwOBzkAwOJcQju3jlK8bPHazVpxQYsva+BOXy9wmPc7vZGbU514HA4/dtXqjG9c51Xv1Fjk4d8SjnxhwjP2uneytuINH9rCPd+CTceVlmxOE9e1eUn+OL7aEv352MUE6NqqHj1cm3jOB706Lbvvv87K7Cvl/c4bnpXd92vnJfgPx93vDz5yAIA3g4McAGBxQvrh5rL7A0vaS/cpcGjH+i9iKIfPFrvuKdrtqSckGOq82Ly6zcNrKi/UMK3dqCokckk/1oiB+KexsRQaW6OzDD4cd3tn0sTVlOi7hMOrsQw+fka31oyDzXF+33rHerP2Y24xzPe9zdcmUstw35B+aMZBSpGlgzwyL8F/NP7oxh+kHwIAvBcc5AAAi8NBDgCwOA9K9F3ZfaKlOty1B1r9/spO8wcRnKLeYWivPfXar+rnoXRY64477VFfM2c/3PGxIdW9XYcgfes5S6G+iB9z7TqUwzuLodHEdW2mc/f6dGXtff7x1w/3MlZFaz+saO/ZM5lndFp7tm8pmvbD6+m2648pw8/shlqG3+viH9gPAQDeCw5yAIDF4SAHAFicoJFXutAPvDQyduM+f6PmnVipY5u157+J4VrVxFW3/OzjNGXORdG2NnjSQ8SD+sj7BzGxtQ8fxMwFLbvXmLN4gl5HTnzkvoXZ8xq5059171TnNiX6ThMP1x7oOS+1a9NYh63RtGEfV2av++6Ipv0Y9WmrkZsyfFeCf583PnJibAEA3gsOcgCAxeEgBwBYnJi1YgiebTNX2evLvN9fpJkH2dgtrsSPZF7qToNWvVOzVvqtVIfUn0fwmX8Y3dtlulS+2eDvTq4dNHK9rYmX1dcp/HuByUDJ2p9dzJxp0Za3RjNZK4W2anmmy/P7Ds9RaNd2v/aYaNr47xCVfXdE03b3iTr3XPd2Gvh9rD7y3/MXfOQAAO8FBzkAwOI8KNGffF1kT0egPxUZ+yrGbjzjXBAMTBl+VqLfj7N9e8kgSCmf+qfkXNYIjsIsEtc80zjnpRRbSl+wH8by/efL7DNpwnfjqVj9TIl+pUN9E6lol1VxHA/v00qXn9ZG+2Hh2tq+iR/6qGjaj+e7/rgS/PtYpJZuPSX6AABvBgc5AMDicJADACzOJYqNhj3t3LK9jlr7IqylMNOu7b5qKVTButOyg//TaLSfqvkZ7VqtiapTNuHqJndwmuvRiiulD5q408HDPrK2EC/ru8M/vzbE4+6JjA0xAm6tuc+eKFpt1+buY9q16bWlaFr93VHN/EN18GOiaT9UMx9avSX2w6Chd/bDExo5AMBbwUEOALA4HOQAAIsTS/S3ap5/gY6dkmnXG7XtU/bND/GySXymGyetrU7XuZ6rmnm/VShTz36W9h8IdmC2Sr3hg49Z1xrN2UXcNtVkiyX6Rjd2OnhJu850+9K18/uWWrCpJl7R1yvXBu3d/G4leroruz8ymvby8fl/X2e+cS3D78f4yAEA3gwOcgCAxfHph8ELVNi5Ymv8GynJLMm1Rh6JY2dHHOdO1/mfoaer/xN7tB+arj4tiUyovCeS19S+ZbJu993r5srH7/MbS+cLa+O1ydqtMkZBSknvsyP9sLTWSIR5N6G+RD+RKYf0wyTB0IzVJnhUouG3TmZprbVvqR2R9EMAgLeFgxwAYHE4yAEAFufybpGxA1W7oY1VNeOSRq7WOK/zjRqo/rDmmnnQid2/d2Sv04veI1YTV8tg4TUu2QQTS6fX0w+8tqSRb9tX5/PI2MLaTo9ONfFSJx9jMax0+dESfCmdt9G0Sdl9P65E07oS/NZa+3YeNfTLUKI/zvGJHABgcTjIAQAWh4McAGBxgo+8pJl/lb5e0a4NWubtSutr3vCC7p3tG8ruu2cKLdeMZh46W4nWOAx9vUC4S+Hn7nXw5+fy9m3914W1WYn+YT7ycS5Grv7+Wsv33dqKbzx7pprnfF7DkGniUcue72tL63WfcG2hXdtZNXNTdq+6d/cLcVH9vNCuTaNp1Sv+/fxrOscncgCAxeEgBwBYHF+ivyC3ubPMrtULQhP3w+yH8gwqA1znf1rKX14PJITuWpU/rl4+Gbfx2snmgMzwouqNu7VZmb2RWoIM4F7z1H44uS5ZG6/N1nZ7h6TEcdzcvhVLYcmq+HwqYSalVOyHUWqZyyVBPumuPav90HT5aU0shabLT2ujLJMlGPZl+TpXkVq+n7EfAgC8FRzkAACLw0EOALA4f6VG7jrWZ7ZAt3aP7m3vm0XRnuYaYKp7X+fXBrF6aJOjz2SU7WA3fFEEcRpja7Tr5Gc3fOtfZj+UZypp5IX7ON0709Pd914pu69EAWSaeMV+qO/b/tpQdj/XvVUTP6vubSyGrstPa2MZfqXLjyvBv49l/jS/lk/kAACLw0EOALA4HOQAAIuzTyO3JdY+cnVrK7X0soK/O3qRb9O1Vl/P7tProcYn3lqimQdN3NTSJ7r3Ye3bFPMDSrv/9d9q8u8OTjN/nY/8+bXhPkd6zk3pfPh+9njD+/sUyu5TTdz5yPWNqZq57W4/17ld5/vWHkTTGm+4RtP23vA97dr6Evz7WDX0zoN+okQfAOCt4CAHAFgcDnIAgMX5K3zkwe/tNNqKF3wPBd/yrijaRDN3urdt35bkpXxVBPHmdm5/zEcu93HadZabszXXZIeenmrxzhtuWrRV8lNKmnhr4y98EmN7cu3bgmbe56V4TVxjbHtte080baVdW+Yj/+fca/H4yAEA3goOcgCAxTlOWilYy1o70FJoSMv5KzZBc23481YshKUo2oKl0I99bG0/LHWF0lsWf+72Wms/1Gv3xNiafQsxtpVrc8nDzBXK7ON9nASS3Gdr2X1FSmltlFNUStFu98Z+GOSRPsY22A99Kb0ru1eL4RBNW+jy8/1jXoLfWmvfdNzJKWpV5BM5AMDicJADACwOBzkAwOIEjdxq1/ofXDJqpSI/sxAW7rO5XVvxmW5W95Zr+/lKFK3OO/380fjJuUOdiBs18fv8UTG2ydqSRr6tnF/H+yJvzTjE2Hr7Xi0KoNKCzcxlZff975LRxFtr0t0+i6Kdt2v7kGfSsvtLoex+iJdNdO/RfjjO/SO6d4yx7Z7phP0QAOCt4CAHAFgcDnIAgMXxPvIXRdG2Jvp12gLMPEIhXjborK6UXjfW8t+h7H6+T5gvecFl7PRzGZ6yEv0XEV63noLuXdHEw7UFjTz+nN1a2ffAaNrh+bMWbMO+iSZuy+59jK3VvZ1mXtDEWxt18Tya9tp9nUTRdmPVxLXsPrRvM2X3Gi/7YXTv7x/zaNpYvq8l+b+mYzRyAIA3g4McAGBxLrtsgt1fK3nH+kSm6bd1aYg7UglP+uegltL3TrOwdi61ZPbD/vmD4lGSVpK1w9T4vHvK8MPelYTJrXLJgdKKk09K6YeFtTq/K2XRSCDl9MO+k08iwwxyYmY/rCQY7ii77+WUmGAoUkv3TJUEw9ak7D6xH/ZyiUopoezelNmHknyRT/qxyi58IgcAWBwOcgCAxeEgBwBYnGg/rFgK+8squqncJ9fXH99T5/TaLF42xtiatU4zVwtYQedW7dpq6JnO/VVl+D07rKMVjbxU3v+iGNtqib7V7a1Gvr27/Z4Y2xhVO9fIw3v+PNfIg6VwR9l9r4vrXOiw09sPk9jaUFrfzatNsNLd/h+jmasm/s/5p4xFQz9Tog8A8LZwkAMALA4HOQDA4iQl+uNwj+d8T9zsEK2b2NFdvGymcbqye6eZ35LS+aFtXBbRazT0oHNvjK0tU4n71ceo6N79XNJW7etibJ+758P7lqJpjWfbaP5pd3u3V/CnG/+308Rlr4om3lqt7L6fd5p4a1I6n2jkQTM/z33kWkr/fVjrY2x73Vs1cfcMrbX2z6kr0cdHDgDwXnCQAwAsziVoFRUfYaEbjC3Zl8lKUqJVWgpSis6nXX/6x1cJR5eqTDBMvqbrz0vZ2AXIJiPqvpnkcVD6Yek+VfthxVJouv5YCafS3V6fKZTZj0NnKQxpoE5aObDsfuiwk5TdX4y0onbDmET4e72W0jv74T9JguHFSDb/EakllOh3e/3nhLQCAPBWcJADACwOBzkAwOJcajr3XE9XqbdiKax0/ckskMNjVDr3yLyLom2tjRG4Rj9/dO2w9FVdfyr6eTFeodIFaLueLnMv0shL0bqV7vZtu6UwLbN3enrWyaffS793p4OXyux1Tjv3zDXzrNt9pex+KLMvaOKtjbp4Zj/8Z2PXHxdTe187aua9Lv4NjRwA4L3gIAcAWBwOcgCAxQkl+kM5fKV0vlKqresTL/twn6RdW39lkIn3dLu3JfqydocX3OrpmYn+KCpRxgdp4jpOy99Lrd6ev4/V4ivatY73eMPtvokm7lqyJdG0gw6uXnDVyLt9K5r4ff75bveVsvteF69o4jqvc+oVd+3bQhRtp4Orb1w18aihdz5yWcsncgCAxeEgBwBYHA5yAIDFiT7yUgaKWVvwlWfa6aBHpy3YptukmrnLT3FZK2n7NvcQSdSK08y/Chc3e5RvPMwXNfJSXK7zkbvI2EyPfpU33OWlJM8U3kCmfVuMn712c7L2pJp5JYp27hV/VX5KRRPXeW3JFlu/Pe8N77XtdO1prpnT6g0A4M3gIAcAWJwH0srvL0vd7bO1grMuhj8Xu471Ya0+kpNh9Bn02uEZZM51uz8werYkyxxF0Tq6+do90sqeUvqKVVHfe670/09ZCl2Z/Z5OPmHcbSPSQ4ymdVG03ib40Xf9EXlE7Yi9fJJ11HEWwkxq6eWUfz40xnZuKVS7oYumjSX43n7Y76Vr+UQOALA4HOQAAIvDQQ4AsDihRN9iS/STMnsznbVg64VjbZsWbIL9XKGcX6+tdLu3urb+h0zn/tvthq3Zlmx2r0z3nt3j0dodLdnG91O2tvAMFUuh07YPLLMPZffdOO1uf5rr6a4lm1oG41jL8H9rwU4Tb02iaXdE0TpNvLVRF3eaeGvbo2krVsX7PDG2AABvCwc5AMDicJADACzO5Saa1KkXr2VOY1RPBf3T+b+DVGo0ztNVdUh5pm46Leffo3vbvNz5vmGb7D5PTybsiaYt7LVL995YZh/m9X3rdO89LeQq3nD9QRfawu0ps7caefCCz3XvtOz+NNfIs7L7b32rtyyadmPZfUUT1/VOE9f5SjStesGdJq7r8ZEDALwZHOQAAItjS/Tjn9BzD6FNRmy5bXBcK3uZ7vZBH+nL+QtSSmsiy1TWVmr/s6VfZD9M5RPH1oTDA6UVV0pfSU7MOxHNrYppSmEh/XBcm5TZ91Ljhy+dd6mF2snHySc6d5Y36mAh1H2MlKLz38VSqNd+H6QVTSGcd7B3XX3u1z5fdu9sglmXn14SUenESSmttfa92+s76YcAAO8FBzkAwOJwkAMALE7QyG+DhiaTWg5vo2jHsdoGB31dHipIzqa7fezkc5uuVUG0Ek27p+uP20fZpV1vpGw3fJlGfjNzcq3rGFTQ4m1ZfVgrc1ncrCuld3bEHRZCLbtXLftkLIWV7vZhbbeXltWnZfenuf3Q6d5urrVRF69o4vdr5/ZDZzHMu/z83lf3cZq4zmM/BAB4MzjIAQAWh4McAGBxYozt0CrNlO+3VoqXjRpnp/Ndx0knI1v9fHykB17wpB6+E1Otfq4kuvfwTMVrD2NrWX1y7ZG6t42M3eNBL7Rvcz7ySnf7QMUbvqfM3nS3b82X3e/pbv8xxMv6tRftSt+3b5O571I63887Tfz+HL2e/rwmrvN7yu6DN9y0a3OauO6lz88ncgCAxeEgBwBYnEv4E6+XObI/hfv/DRh7YWtZ2b3qGHOZJlgV9c/oioXQSS9pouFchglLv0o+qVCyEM6/gSPlkmGt3qhQSl8q0c/kEbfWdfnR+T2Wwh1l9rbsXn6urpNPlkp4MQmGWSefXi5xUkprY0phmAvph9vK7HV+T9m97uvK7FNZprcuIq0AALwXHOQAAIvDQQ4AsDgPYmx73Ux1btHujJ5u17as7H4egVuxBVr9/NF9nXVR6RbsiqI9sia/cONKJx83f6Tu7fd9vpS+Yj8sxcsmXX7c/JGWwkqZvYufvWgpvYmfrXS3/zh5Pd138vFxs70u7jRxna9o4vdrjym7r5TZO038Pn99+HVrfCIHAFgeDnIAgMXhIAcAWJxL0PUGYdkHzJYib41XPEbRyl17PboQTZvp3KmGPkzqMz29NPGkv8hkXpDeU53b7H2k7l0q0S/4yHfFy1ovuL/2K7zhlTJ7nVdN3MXP7ulufxGd+LuJsc3jZnuNfNSYwzOZMnuniYdrX1R2X9HE7/P9M8nPtQEAwNJwkAMALA4HOQDA4kQfea+bXVWY1LXdlEbeqmau13brQwSu84oHrfpm1hb2TQh6+nRQpHLtHsu5y1apXvsi3bu0r8tEydYOc0m8rNHIgzdcU56/wBteyUvR+ZiJMo+f1VwTp5k7n/ijvXq/t3rBVSfutWzd96i8FJ2P+6q2/Xu+kp9S0cTv498/y29thE/kAACLw0EOALA4tRhbt1YtXqJbaIn+sN7JI63VOvf0LrTCvkq4jy6YJxl8nVxS2WtXh6AvkktMmX2p7F7ZEy9bkFZCA60vsBS6bvb3sen6k3Ty8ZZClVae726vEkIlbnYouw/77imzn5fwOymltVFOqZTdV6SU1kY55T/iX+UTOQDA4nCQAwAsDgc5AMDiXIKtzumHQefu6+F1ax+BO2rZvry/X3wLHi8ZuhL9xLo4LP1TUbR7qOTnllq9zcclfb1SOp8+Q0FfNxp5Gi876NxtOvdw/AWWQtfNvrVYoj9YCsPaYyyFle7292uf18j7a/9R+97Z6dHVVm+9TfA1ZfcVTfw+//sN+A2NHADgveAgBwBYHA5yAIDFCTG2p6Hs3mjirY2as65NInAHnbVS3p+I16US/XCx29je1d7nKEpSfCGKNr2P06OzfbeWzmf3tC3ZZCqsnZfOu2tdWX1rUSP/Cm+4auCZN7zXsrNo2l67ju3a5tq1eszzaNrPh1+35jVzp4nf185bsJXat5U0cp2be+grmvj92t/jf07jaj6RAwAsDgc5AMDiXPTPw1v3V5HarYKqMZToq26RtN8plPdbq6JiZJhUSiloF6UOQS+iJrUcI4/EZ0j23Vo6X5RWTuZaJ58EeURu05fWu7L6+zMYaeVFlsJMHnGWQldmn611HexdCf6ja5204iSRrMvP98F++LyUovN5omFfou/jCFyCoZNSWhvllG+nj2GOT+QAAIvDQQ4AsDgc5AAAi/P/ALC5RbVj6YkWAAAAAElFTkSuQmCC" y="-41.184"/>
    </g>
    <g id="matplotlib.axis_1">
     <g id="xtick_1">
@@ -36,38 +47,38 @@ iVBORw0KGgoAAAANSUhEUgAAAXIAAAFyCAYAAADoJFEJAAAABHNCSVQICAgIfAhkiAAAIABJREFUeJzt
       <defs>
        <path d="M 0 0 
 L 0 3.5 
-" id="mc1ef245d8f" style="stroke:#000000;stroke-width:0.8;"/>
+" id="m0bf9183b9d" style="stroke:#000000;stroke-width:0.8;"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="104.43456" xlink:href="#mc1ef245d8f" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="104.43456" xlink:href="#m0bf9183b9d" y="307.584"/>
       </g>
      </g>
      <g id="text_1">
       <!-- 0 -->
-      <defs>
-       <path d="M 31.78125 66.40625 
-Q 24.171875 66.40625 20.328125 58.90625 
-Q 16.5 51.421875 16.5 36.375 
-Q 16.5 21.390625 20.328125 13.890625 
-Q 24.171875 6.390625 31.78125 6.390625 
-Q 39.453125 6.390625 43.28125 13.890625 
-Q 47.125 21.390625 47.125 36.375 
-Q 47.125 51.421875 43.28125 58.90625 
-Q 39.453125 66.40625 31.78125 66.40625 
+      <g transform="translate(101.25331 322.182437)scale(0.1 -0.1)">
+       <defs>
+        <path d="M 2034 4250 
+Q 1547 4250 1301 3770 
+Q 1056 3291 1056 2328 
+Q 1056 1369 1301 889 
+Q 1547 409 2034 409 
+Q 2525 409 2770 889 
+Q 3016 1369 3016 2328 
+Q 3016 3291 2770 3770 
+Q 2525 4250 2034 4250 
 z
-M 31.78125 74.21875 
-Q 44.046875 74.21875 50.515625 64.515625 
-Q 56.984375 54.828125 56.984375 36.375 
-Q 56.984375 17.96875 50.515625 8.265625 
-Q 44.046875 -1.421875 31.78125 -1.421875 
-Q 19.53125 -1.421875 13.0625 8.265625 
-Q 6.59375 17.96875 6.59375 36.375 
-Q 6.59375 54.828125 13.0625 64.515625 
-Q 19.53125 74.21875 31.78125 74.21875 
+M 2034 4750 
+Q 2819 4750 3233 4129 
+Q 3647 3509 3647 2328 
+Q 3647 1150 3233 529 
+Q 2819 -91 2034 -91 
+Q 1250 -91 836 529 
+Q 422 1150 422 2328 
+Q 422 3509 836 4129 
+Q 1250 4750 2034 4750 
 z
-" id="DejaVuSans-30"/>
-      </defs>
-      <g transform="translate(101.25331 322.182437)scale(0.1 -0.1)">
+" id="DejaVuSans-30" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-30"/>
       </g>
      </g>
@@ -75,38 +86,38 @@ z
     <g id="xtick_2">
      <g id="line2d_2">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="157.65696" xlink:href="#mc1ef245d8f" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="157.65696" xlink:href="#m0bf9183b9d" y="307.584"/>
       </g>
      </g>
      <g id="text_2">
       <!-- 20 -->
-      <defs>
-       <path d="M 19.1875 8.296875 
-L 53.609375 8.296875 
-L 53.609375 0 
-L 7.328125 0 
-L 7.328125 8.296875 
-Q 12.9375 14.109375 22.625 23.890625 
-Q 32.328125 33.6875 34.8125 36.53125 
-Q 39.546875 41.84375 41.421875 45.53125 
-Q 43.3125 49.21875 43.3125 52.78125 
-Q 43.3125 58.59375 39.234375 62.25 
-Q 35.15625 65.921875 28.609375 65.921875 
-Q 23.96875 65.921875 18.8125 64.3125 
-Q 13.671875 62.703125 7.8125 59.421875 
-L 7.8125 69.390625 
-Q 13.765625 71.78125 18.9375 73 
-Q 24.125 74.21875 28.421875 74.21875 
-Q 39.75 74.21875 46.484375 68.546875 
-Q 53.21875 62.890625 53.21875 53.421875 
-Q 53.21875 48.921875 51.53125 44.890625 
-Q 49.859375 40.875 45.40625 35.40625 
-Q 44.1875 33.984375 37.640625 27.21875 
-Q 31.109375 20.453125 19.1875 8.296875 
-z
-" id="DejaVuSans-32"/>
-      </defs>
       <g transform="translate(151.29446 322.182437)scale(0.1 -0.1)">
+       <defs>
+        <path d="M 1228 531 
+L 3431 531 
+L 3431 0 
+L 469 0 
+L 469 531 
+Q 828 903 1448 1529 
+Q 2069 2156 2228 2338 
+Q 2531 2678 2651 2914 
+Q 2772 3150 2772 3378 
+Q 2772 3750 2511 3984 
+Q 2250 4219 1831 4219 
+Q 1534 4219 1204 4116 
+Q 875 4013 500 3803 
+L 500 4441 
+Q 881 4594 1212 4672 
+Q 1544 4750 1819 4750 
+Q 2544 4750 2975 4387 
+Q 3406 4025 3406 3419 
+Q 3406 3131 3298 2873 
+Q 3191 2616 2906 2266 
+Q 2828 2175 2409 1742 
+Q 1991 1309 1228 531 
+z
+" id="DejaVuSans-32" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-32"/>
        <use x="63.623047" xlink:href="#DejaVuSans-30"/>
       </g>
@@ -115,31 +126,33 @@ z
     <g id="xtick_3">
      <g id="line2d_3">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="210.87936" xlink:href="#mc1ef245d8f" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="210.87936" xlink:href="#m0bf9183b9d" y="307.584"/>
       </g>
      </g>
      <g id="text_3">
       <!-- 40 -->
-      <defs>
-       <path d="M 37.796875 64.3125 
-L 12.890625 25.390625 
-L 37.796875 25.390625 
+      <g transform="translate(204.51686 322.182437)scale(0.1 -0.1)">
+       <defs>
+        <path d="M 2419 4116 
+L 825 1625 
+L 2419 1625 
+L 2419 4116 
 z
-M 35.203125 72.90625 
-L 47.609375 72.90625 
-L 47.609375 25.390625 
-L 58.015625 25.390625 
-L 58.015625 17.1875 
-L 47.609375 17.1875 
-L 47.609375 0 
-L 37.796875 0 
-L 37.796875 17.1875 
-L 4.890625 17.1875 
-L 4.890625 26.703125 
+M 2253 4666 
+L 3047 4666 
+L 3047 1625 
+L 3713 1625 
+L 3713 1100 
+L 3047 1100 
+L 3047 0 
+L 2419 0 
+L 2419 1100 
+L 313 1100 
+L 313 1709 
+L 2253 4666 
 z
-" id="DejaVuSans-34"/>
-      </defs>
-      <g transform="translate(204.51686 322.182437)scale(0.1 -0.1)">
+" id="DejaVuSans-34" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-34"/>
        <use x="63.623047" xlink:href="#DejaVuSans-30"/>
       </g>
@@ -148,44 +161,44 @@ z
     <g id="xtick_4">
      <g id="line2d_4">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="264.10176" xlink:href="#mc1ef245d8f" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="264.10176" xlink:href="#m0bf9183b9d" y="307.584"/>
       </g>
      </g>
      <g id="text_4">
       <!-- 60 -->
-      <defs>
-       <path d="M 33.015625 40.375 
-Q 26.375 40.375 22.484375 35.828125 
-Q 18.609375 31.296875 18.609375 23.390625 
-Q 18.609375 15.53125 22.484375 10.953125 
-Q 26.375 6.390625 33.015625 6.390625 
-Q 39.65625 6.390625 43.53125 10.953125 
-Q 47.40625 15.53125 47.40625 23.390625 
-Q 47.40625 31.296875 43.53125 35.828125 
-Q 39.65625 40.375 33.015625 40.375 
+      <g transform="translate(257.73926 322.182437)scale(0.1 -0.1)">
+       <defs>
+        <path d="M 2113 2584 
+Q 1688 2584 1439 2293 
+Q 1191 2003 1191 1497 
+Q 1191 994 1439 701 
+Q 1688 409 2113 409 
+Q 2538 409 2786 701 
+Q 3034 994 3034 1497 
+Q 3034 2003 2786 2293 
+Q 2538 2584 2113 2584 
 z
-M 52.59375 71.296875 
-L 52.59375 62.3125 
-Q 48.875 64.0625 45.09375 64.984375 
-Q 41.3125 65.921875 37.59375 65.921875 
-Q 27.828125 65.921875 22.671875 59.328125 
-Q 17.53125 52.734375 16.796875 39.40625 
-Q 19.671875 43.65625 24.015625 45.921875 
-Q 28.375 48.1875 33.59375 48.1875 
-Q 44.578125 48.1875 50.953125 41.515625 
-Q 57.328125 34.859375 57.328125 23.390625 
-Q 57.328125 12.15625 50.6875 5.359375 
-Q 44.046875 -1.421875 33.015625 -1.421875 
-Q 20.359375 -1.421875 13.671875 8.265625 
-Q 6.984375 17.96875 6.984375 36.375 
-Q 6.984375 53.65625 15.1875 63.9375 
-Q 23.390625 74.21875 37.203125 74.21875 
-Q 40.921875 74.21875 44.703125 73.484375 
-Q 48.484375 72.75 52.59375 71.296875 
+M 3366 4563 
+L 3366 3988 
+Q 3128 4100 2886 4159 
+Q 2644 4219 2406 4219 
+Q 1781 4219 1451 3797 
+Q 1122 3375 1075 2522 
+Q 1259 2794 1537 2939 
+Q 1816 3084 2150 3084 
+Q 2853 3084 3261 2657 
+Q 3669 2231 3669 1497 
+Q 3669 778 3244 343 
+Q 2819 -91 2113 -91 
+Q 1303 -91 875 529 
+Q 447 1150 447 2328 
+Q 447 3434 972 4092 
+Q 1497 4750 2381 4750 
+Q 2619 4750 2861 4703 
+Q 3103 4656 3366 4563 
 z
-" id="DejaVuSans-36"/>
-      </defs>
-      <g transform="translate(257.73926 322.182437)scale(0.1 -0.1)">
+" id="DejaVuSans-36" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-36"/>
        <use x="63.623047" xlink:href="#DejaVuSans-30"/>
       </g>
@@ -194,53 +207,53 @@ z
     <g id="xtick_5">
      <g id="line2d_5">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="317.32416" xlink:href="#mc1ef245d8f" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="317.32416" xlink:href="#m0bf9183b9d" y="307.584"/>
       </g>
      </g>
      <g id="text_5">
       <!-- 80 -->
-      <defs>
-       <path d="M 31.78125 34.625 
-Q 24.75 34.625 20.71875 30.859375 
-Q 16.703125 27.09375 16.703125 20.515625 
-Q 16.703125 13.921875 20.71875 10.15625 
-Q 24.75 6.390625 31.78125 6.390625 
-Q 38.8125 6.390625 42.859375 10.171875 
-Q 46.921875 13.96875 46.921875 20.515625 
-Q 46.921875 27.09375 42.890625 30.859375 
-Q 38.875 34.625 31.78125 34.625 
+      <g transform="translate(310.96166 322.182437)scale(0.1 -0.1)">
+       <defs>
+        <path d="M 2034 2216 
+Q 1584 2216 1326 1975 
+Q 1069 1734 1069 1313 
+Q 1069 891 1326 650 
+Q 1584 409 2034 409 
+Q 2484 409 2743 651 
+Q 3003 894 3003 1313 
+Q 3003 1734 2745 1975 
+Q 2488 2216 2034 2216 
 z
-M 21.921875 38.8125 
-Q 15.578125 40.375 12.03125 44.71875 
-Q 8.5 49.078125 8.5 55.328125 
-Q 8.5 64.0625 14.71875 69.140625 
-Q 20.953125 74.21875 31.78125 74.21875 
-Q 42.671875 74.21875 48.875 69.140625 
-Q 55.078125 64.0625 55.078125 55.328125 
-Q 55.078125 49.078125 51.53125 44.71875 
-Q 48 40.375 41.703125 38.8125 
-Q 48.828125 37.15625 52.796875 32.3125 
-Q 56.78125 27.484375 56.78125 20.515625 
-Q 56.78125 9.90625 50.3125 4.234375 
-Q 43.84375 -1.421875 31.78125 -1.421875 
-Q 19.734375 -1.421875 13.25 4.234375 
-Q 6.78125 9.90625 6.78125 20.515625 
-Q 6.78125 27.484375 10.78125 32.3125 
-Q 14.796875 37.15625 21.921875 38.8125 
+M 1403 2484 
+Q 997 2584 770 2862 
+Q 544 3141 544 3541 
+Q 544 4100 942 4425 
+Q 1341 4750 2034 4750 
+Q 2731 4750 3128 4425 
+Q 3525 4100 3525 3541 
+Q 3525 3141 3298 2862 
+Q 3072 2584 2669 2484 
+Q 3125 2378 3379 2068 
+Q 3634 1759 3634 1313 
+Q 3634 634 3220 271 
+Q 2806 -91 2034 -91 
+Q 1263 -91 848 271 
+Q 434 634 434 1313 
+Q 434 1759 690 2068 
+Q 947 2378 1403 2484 
 z
-M 18.3125 54.390625 
-Q 18.3125 48.734375 21.84375 45.5625 
-Q 25.390625 42.390625 31.78125 42.390625 
-Q 38.140625 42.390625 41.71875 45.5625 
-Q 45.3125 48.734375 45.3125 54.390625 
-Q 45.3125 60.0625 41.71875 63.234375 
-Q 38.140625 66.40625 31.78125 66.40625 
-Q 25.390625 66.40625 21.84375 63.234375 
-Q 18.3125 60.0625 18.3125 54.390625 
+M 1172 3481 
+Q 1172 3119 1398 2916 
+Q 1625 2713 2034 2713 
+Q 2441 2713 2670 2916 
+Q 2900 3119 2900 3481 
+Q 2900 3844 2670 4047 
+Q 2441 4250 2034 4250 
+Q 1625 4250 1398 4047 
+Q 1172 3844 1172 3481 
 z
-" id="DejaVuSans-38"/>
-      </defs>
-      <g transform="translate(310.96166 322.182437)scale(0.1 -0.1)">
+" id="DejaVuSans-38" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-38"/>
        <use x="63.623047" xlink:href="#DejaVuSans-30"/>
       </g>
@@ -253,10 +266,10 @@ z
       <defs>
        <path d="M 0 0 
 L -3.5 0 
-" id="m1594da3bf1" style="stroke:#000000;stroke-width:0.8;"/>
+" id="m09e66e4baf" style="stroke:#000000;stroke-width:0.8;"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="103.104" xlink:href="#m1594da3bf1" y="42.80256"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="103.104" xlink:href="#m09e66e4baf" y="42.80256"/>
       </g>
      </g>
      <g id="text_6">
@@ -269,7 +282,7 @@ L -3.5 0
     <g id="ytick_2">
      <g id="line2d_7">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="103.104" xlink:href="#m1594da3bf1" y="96.02496"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="103.104" xlink:href="#m09e66e4baf" y="96.02496"/>
       </g>
      </g>
      <g id="text_7">
@@ -283,7 +296,7 @@ L -3.5 0
     <g id="ytick_3">
      <g id="line2d_8">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="103.104" xlink:href="#m1594da3bf1" y="149.24736"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="103.104" xlink:href="#m09e66e4baf" y="149.24736"/>
       </g>
      </g>
      <g id="text_8">
@@ -297,7 +310,7 @@ L -3.5 0
     <g id="ytick_4">
      <g id="line2d_9">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="103.104" xlink:href="#m1594da3bf1" y="202.46976"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="103.104" xlink:href="#m09e66e4baf" y="202.46976"/>
       </g>
      </g>
      <g id="text_9">
@@ -311,7 +324,7 @@ L -3.5 0
     <g id="ytick_5">
      <g id="line2d_10">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="103.104" xlink:href="#m1594da3bf1" y="255.69216"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="103.104" xlink:href="#m09e66e4baf" y="255.69216"/>
       </g>
      </g>
      <g id="text_10">
@@ -323,17 +336,23 @@ L -3.5 0
      </g>
     </g>
    </g>
-   <g id="LineCollection_1">
-    <path clip-path="url(#p5c0334f2e6)" d="M 184.26816 101.274256 
+   <g id="PathCollection_1">
+    <path clip-path="url(#p0b2fddf6d5)" d="M 184.26816 101.274256 
+L 184.06248 101.3472 
 L 181.60704 102.278119 
+L 178.94592 103.519297 
 L 178.054632 104.00832 
 L 176.2848 105.065085 
+L 174.001086 106.66944 
 L 173.62368 106.962257 
 L 170.96256 109.33056 
+L 168.594257 111.99168 
 L 168.30144 112.369086 
 L 166.697085 114.6528 
+L 165.64032 116.422632 
 L 165.151297 117.31392 
 L 163.910119 119.97504 
+L 162.9792 122.43048 
 L 162.906256 122.63616 
 L 162.130154 125.29728 
 L 161.535958 127.9584 
@@ -342,33 +361,86 @@ L 160.830398 133.28064
 L 160.692698 135.94176 
 L 160.683833 138.60288 
 L 160.794872 141.264 
+L 161.018263 143.92512 
 L 161.347675 146.58624 
+L 161.777845 149.24736 
 L 162.304428 151.90848 
+L 162.923868 154.5696 
+L 162.9792 154.77528 
 L 163.634804 157.23072 
+L 164.43265 159.89184 
 L 165.315448 162.55296 
+L 165.64032 163.444248 
+L 166.282277 165.21408 
 L 167.331239 167.8752 
+L 168.30144 170.158914 
+L 168.461314 170.53632 
 L 169.671945 173.19744 
+L 170.96256 175.85856 
 L 172.333065 178.51968 
+L 173.62368 180.887983 
+L 173.783554 181.1808 
 L 175.314599 183.84192 
+L 176.2848 185.446275 
+L 176.926757 186.50304 
+L 178.621048 189.16416 
 L 178.94592 189.653183 
+L 180.39937 191.82528 
+L 181.60704 193.555481 
 L 182.262644 194.4864 
+L 184.212828 197.14752 
+L 184.26816 197.220464 
 L 186.254508 199.80864 
+L 186.92928 200.657686 
+L 188.389045 202.46976 
+L 189.5904 203.913002 
 L 190.619995 205.13088 
+L 192.25152 207.002665 
+L 192.951703 207.792 
+L 194.91264 209.940802 
 L 195.389432 210.45312 
+L 197.57376 212.739622 
+L 197.939513 213.11424 
+L 200.23488 215.409607 
 L 200.609498 215.77536 
+L 202.896 217.959688 
+L 203.408318 218.43648 
 L 205.55712 220.397417 
+L 206.346455 221.0976 
+L 208.21824 222.729125 
 L 209.436118 223.75872 
+L 210.87936 224.960075 
+L 212.691434 226.41984 
 L 213.54048 227.094612 
+L 216.128656 229.08096 
+L 216.2016 229.136292 
 L 218.86272 231.086476 
+L 219.793639 231.74208 
+L 221.52384 232.94975 
+L 223.695937 234.4032 
 L 224.18496 234.728072 
+L 226.84608 236.422363 
+L 227.902845 237.06432 
 L 229.5072 238.034521 
+L 232.16832 239.565566 
+L 232.461137 239.72544 
 L 234.82944 241.016055 
+L 237.49056 242.38656 
 L 240.15168 243.677175 
+L 242.8128 244.887806 
+L 243.190206 245.04768 
 L 245.47392 246.017881 
+L 248.13504 247.066843 
+L 249.904872 247.7088 
 L 250.79616 248.033672 
+L 253.45728 248.91647 
 L 256.1184 249.714316 
+L 258.57384 250.36992 
+L 258.77952 250.425252 
 L 261.44064 251.044692 
+L 264.10176 251.571275 
 L 266.76288 252.001445 
+L 269.424 252.330857 
 L 272.08512 252.554248 
 L 274.74624 252.665287 
 L 277.40736 252.656422 
@@ -376,16 +448,22 @@ L 280.06848 252.518722
 L 282.7296 252.241705 
 L 285.39072 251.813162 
 L 288.05184 251.218966 
+L 290.71296 250.442864 
 L 290.91864 250.36992 
 L 293.37408 249.439001 
+L 296.0352 248.197823 
 L 296.926488 247.7088 
 L 298.69632 246.652035 
+L 300.980034 245.04768 
 L 301.35744 244.754863 
 L 304.01856 242.38656 
+L 306.386863 239.72544 
 L 306.67968 239.348034 
 L 308.284035 237.06432 
+L 309.3408 235.294488 
 L 309.829823 234.4032 
 L 311.071001 231.74208 
+L 312.00192 229.28664 
 L 312.074864 229.08096 
 L 312.850966 226.41984 
 L 313.445162 223.75872 
@@ -394,33 +472,86 @@ L 314.150722 218.43648
 L 314.288422 215.77536 
 L 314.297287 213.11424 
 L 314.186248 210.45312 
+L 313.962857 207.792 
 L 313.633445 205.13088 
+L 313.203275 202.46976 
 L 312.676692 199.80864 
+L 312.057252 197.14752 
+L 312.00192 196.94184 
 L 311.346316 194.4864 
+L 310.54847 191.82528 
 L 309.665672 189.16416 
+L 309.3408 188.272872 
+L 308.698843 186.50304 
 L 307.649881 183.84192 
+L 306.67968 181.558206 
+L 306.519806 181.1808 
 L 305.309175 178.51968 
+L 304.01856 175.85856 
 L 302.648055 173.19744 
+L 301.35744 170.829137 
+L 301.197566 170.53632 
 L 299.666521 167.8752 
+L 298.69632 166.270845 
+L 298.054363 165.21408 
+L 296.360072 162.55296 
 L 296.0352 162.063937 
+L 294.58175 159.89184 
+L 293.37408 158.161639 
 L 292.718476 157.23072 
+L 290.768292 154.5696 
+L 290.71296 154.496656 
 L 288.726612 151.90848 
+L 288.05184 151.059434 
+L 286.592075 149.24736 
+L 285.39072 147.804118 
 L 284.361125 146.58624 
+L 282.7296 144.714455 
+L 282.029417 143.92512 
+L 280.06848 141.776318 
 L 279.591688 141.264 
+L 277.40736 138.977498 
+L 277.041607 138.60288 
+L 274.74624 136.307513 
 L 274.371622 135.94176 
+L 272.08512 133.757432 
+L 271.572802 133.28064 
 L 269.424 131.319703 
+L 268.634665 130.61952 
+L 266.76288 128.987995 
 L 265.545002 127.9584 
+L 264.10176 126.757045 
+L 262.289686 125.29728 
 L 261.44064 124.622508 
+L 258.852464 122.63616 
+L 258.77952 122.580828 
 L 256.1184 120.630644 
+L 255.187481 119.97504 
+L 253.45728 118.76737 
+L 251.285183 117.31392 
 L 250.79616 116.989048 
+L 248.13504 115.294757 
+L 247.078275 114.6528 
 L 245.47392 113.682599 
+L 242.8128 112.151554 
+L 242.519983 111.99168 
 L 240.15168 110.701065 
+L 237.49056 109.33056 
 L 234.82944 108.039945 
+L 232.16832 106.829314 
+L 231.790914 106.66944 
 L 229.5072 105.699239 
+L 226.84608 104.650277 
+L 225.076248 104.00832 
 L 224.18496 103.683448 
+L 221.52384 102.80065 
 L 218.86272 102.002804 
+L 216.40728 101.3472 
+L 216.2016 101.291868 
 L 213.54048 100.672428 
+L 210.87936 100.145845 
 L 208.21824 99.715675 
+L 205.55712 99.386263 
 L 202.896 99.162872 
 L 200.23488 99.051833 
 L 197.57376 99.060698 
@@ -428,8 +559,7 @@ L 194.91264 99.198398
 L 192.25152 99.475415 
 L 189.5904 99.903958 
 L 186.92928 100.498154 
-L 184.26816 101.274256 
-L 184.26816 101.274256 
+z
 " style="fill:none;stroke:#440154;stroke-width:1.5;"/>
    </g>
    <g id="patch_3">
@@ -455,7 +585,7 @@ L 369.216 41.472
   </g>
  </g>
  <defs>
-  <clipPath id="pb78ad33f25">
+  <clipPath id="pfdd2bdd6ec">
    <path d="M 184.26816 101.274256 
 L 184.06248 101.3472 
 L 181.60704 102.278119 
@@ -678,10 +808,10 @@ L 194.91264 99.198398
 L 192.25152 99.475415 
 L 189.5904 99.903958 
 L 186.92928 100.498154 
-L 184.26816 101.274256 
+z
 "/>
   </clipPath>
-  <clipPath id="p5c0334f2e6">
+  <clipPath id="p0b2fddf6d5">
    <rect height="266.112" width="266.112" x="103.104" y="41.472"/>
   </clipPath>
  </defs>
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/inset_polar.png b/lib/matplotlib/tests/baseline_images/test_axes/inset_polar.png
new file mode 100644
index 000000000000..b7b7faf198ec
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_axes/inset_polar.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/log_scales.pdf b/lib/matplotlib/tests/baseline_images/test_axes/log_scales.pdf
deleted file mode 100644
index c76b653c33fb..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/log_scales.pdf and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/log_scales.png b/lib/matplotlib/tests/baseline_images/test_axes/log_scales.png
deleted file mode 100644
index e305de1d9ac7..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/log_scales.png and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/log_scales.svg b/lib/matplotlib/tests/baseline_images/test_axes/log_scales.svg
deleted file mode 100644
index 0a29c9d0af21..000000000000
--- a/lib/matplotlib/tests/baseline_images/test_axes/log_scales.svg
+++ /dev/null
@@ -1,670 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (http://matplotlib.org/) -->
-<svg height="432pt" version="1.1" viewBox="0 0 576 432" width="576pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
- </defs>
- <g id="figure_1">
-  <g id="patch_1">
-   <path d="M 0 432 
-L 576 432 
-L 576 0 
-L 0 0 
-z
-" style="fill:#ffffff;"/>
-  </g>
-  <g id="axes_1">
-   <g id="patch_2">
-    <path d="M 72 388.8 
-L 518.4 388.8 
-L 518.4 43.2 
-L 72 43.2 
-z
-" style="fill:#ffffff;"/>
-   </g>
-   <g id="line2d_1">
-    <path clip-path="url(#p826a730be7)" d="M -1 131.706091 
-L 72 188.213132 
-L 142.41176 252.235813 
-L 183.6 277.099485 
-L 212.823521 291.727174 
-L 235.491045 301.807927 
-L 254.01176 309.374337 
-L 269.670802 315.366563 
-L 283.235281 320.29036 
-L 295.2 324.446546 
-L 305.902805 328.027404 
-L 315.584671 331.162709 
-L 324.423521 333.943843 
-L 332.554475 336.437397 
-L 340.082563 338.693275 
-L 347.091045 340.749766 
-L 353.647042 342.636842 
-L 359.805455 344.378369 
-L 365.61176 345.993638 
-L 371.104055 347.498445 
-L 376.314566 348.905879 
-L 381.270802 350.226896 
-L 385.996431 351.470752 
-L 390.511961 352.645332 
-L 394.835281 353.757404 
-L 398.98209 354.81282 
-L 402.966236 355.816667 
-L 406.8 356.773397 
-L 410.494323 357.686924 
-L 414.058994 358.560709 
-L 417.502805 359.397823 
-L 420.833684 360.201005 
-L 424.058802 360.972707 
-L 427.184671 361.71513 
-L 430.217215 362.43026 
-L 433.161847 363.119893 
-L 436.023521 363.785659 
-L 438.806783 364.429038 
-L 441.515815 365.051383 
-L 444.154475 365.65393 
-L 446.726326 366.237813 
-L 449.234669 366.804074 
-L 451.682563 367.353671 
-L 454.072854 367.88749 
-L 456.408192 368.406348 
-L 458.691045 368.911005 
-L 460.923722 369.402162 
-L 463.10838 369.880475 
-L 465.247042 370.346551 
-L 467.341605 370.800959 
-" style="fill:none;stroke:#0000ff;stroke-linecap:square;"/>
-   </g>
-   <g id="patch_3">
-    <path d="M 72 388.8 
-L 72 43.2 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
-   </g>
-   <g id="patch_4">
-    <path d="M 518.4 388.8 
-L 518.4 43.2 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
-   </g>
-   <g id="patch_5">
-    <path d="M 72 388.8 
-L 518.4 388.8 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
-   </g>
-   <g id="patch_6">
-    <path d="M 72 43.2 
-L 518.4 43.2 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
-   </g>
-   <g id="matplotlib.axis_1">
-    <g id="xtick_1">
-     <g id="line2d_2">
-      <defs>
-       <path d="M 0 0 
-L 0 -4 
-" id="m368fc901b1" style="stroke:#000000;stroke-width:0.5;"/>
-      </defs>
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m368fc901b1" y="388.8"/>
-      </g>
-     </g>
-     <g id="line2d_3">
-      <defs>
-       <path d="M 0 0 
-L 0 4 
-" id="mc63e59a608" style="stroke:#000000;stroke-width:0.5;"/>
-      </defs>
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#mc63e59a608" y="43.2"/>
-      </g>
-     </g>
-     <g id="text_1">
-      <!-- $\mathdefault{9^{0}}$ -->
-      <defs>
-       <path d="M 10.984375 1.515625 
-L 10.984375 10.5 
-Q 14.703125 8.734375 18.5 7.8125 
-Q 22.3125 6.890625 25.984375 6.890625 
-Q 35.75 6.890625 40.890625 13.453125 
-Q 46.046875 20.015625 46.78125 33.40625 
-Q 43.953125 29.203125 39.59375 26.953125 
-Q 35.25 24.703125 29.984375 24.703125 
-Q 19.046875 24.703125 12.671875 31.3125 
-Q 6.296875 37.9375 6.296875 49.421875 
-Q 6.296875 60.640625 12.9375 67.421875 
-Q 19.578125 74.21875 30.609375 74.21875 
-Q 43.265625 74.21875 49.921875 64.515625 
-Q 56.59375 54.828125 56.59375 36.375 
-Q 56.59375 19.140625 48.40625 8.859375 
-Q 40.234375 -1.421875 26.421875 -1.421875 
-Q 22.703125 -1.421875 18.890625 -0.6875 
-Q 15.09375 0.046875 10.984375 1.515625 
-z
-M 30.609375 32.421875 
-Q 37.25 32.421875 41.125 36.953125 
-Q 45.015625 41.5 45.015625 49.421875 
-Q 45.015625 57.28125 41.125 61.84375 
-Q 37.25 66.40625 30.609375 66.40625 
-Q 23.96875 66.40625 20.09375 61.84375 
-Q 16.21875 57.28125 16.21875 49.421875 
-Q 16.21875 41.5 20.09375 36.953125 
-Q 23.96875 32.421875 30.609375 32.421875 
-z
-" id="DejaVuSans-39"/>
-       <path d="M 31.78125 66.40625 
-Q 24.171875 66.40625 20.328125 58.90625 
-Q 16.5 51.421875 16.5 36.375 
-Q 16.5 21.390625 20.328125 13.890625 
-Q 24.171875 6.390625 31.78125 6.390625 
-Q 39.453125 6.390625 43.28125 13.890625 
-Q 47.125 21.390625 47.125 36.375 
-Q 47.125 51.421875 43.28125 58.90625 
-Q 39.453125 66.40625 31.78125 66.40625 
-z
-M 31.78125 74.21875 
-Q 44.046875 74.21875 50.515625 64.515625 
-Q 56.984375 54.828125 56.984375 36.375 
-Q 56.984375 17.96875 50.515625 8.265625 
-Q 44.046875 -1.421875 31.78125 -1.421875 
-Q 19.53125 -1.421875 13.0625 8.265625 
-Q 6.59375 17.96875 6.59375 36.375 
-Q 6.59375 54.828125 13.0625 64.515625 
-Q 19.53125 74.21875 31.78125 74.21875 
-z
-" id="DejaVuSans-30"/>
-      </defs>
-      <g transform="translate(65.28 401.918125)scale(0.12 -0.12)">
-       <use transform="translate(0 0.765625)" xlink:href="#DejaVuSans-39"/>
-       <use transform="translate(64.580078 39.046875)scale(0.7)" xlink:href="#DejaVuSans-30"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_2">
-     <g id="line2d_4">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="295.2" xlink:href="#m368fc901b1" y="388.8"/>
-      </g>
-     </g>
-     <g id="line2d_5">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="295.2" xlink:href="#mc63e59a608" y="43.2"/>
-      </g>
-     </g>
-     <g id="text_2">
-      <!-- $\mathdefault{9^{1}}$ -->
-      <defs>
-       <path d="M 12.40625 8.296875 
-L 28.515625 8.296875 
-L 28.515625 63.921875 
-L 10.984375 60.40625 
-L 10.984375 69.390625 
-L 28.421875 72.90625 
-L 38.28125 72.90625 
-L 38.28125 8.296875 
-L 54.390625 8.296875 
-L 54.390625 0 
-L 12.40625 0 
-z
-" id="DejaVuSans-31"/>
-      </defs>
-      <g transform="translate(288.48 401.918125)scale(0.12 -0.12)">
-       <use transform="translate(0 0.684375)" xlink:href="#DejaVuSans-39"/>
-       <use transform="translate(64.580078 38.965625)scale(0.7)" xlink:href="#DejaVuSans-31"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_3">
-     <g id="line2d_6">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m368fc901b1" y="388.8"/>
-      </g>
-     </g>
-     <g id="line2d_7">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#mc63e59a608" y="43.2"/>
-      </g>
-     </g>
-     <g id="text_3">
-      <!-- $\mathdefault{9^{2}}$ -->
-      <defs>
-       <path d="M 19.1875 8.296875 
-L 53.609375 8.296875 
-L 53.609375 0 
-L 7.328125 0 
-L 7.328125 8.296875 
-Q 12.9375 14.109375 22.625 23.890625 
-Q 32.328125 33.6875 34.8125 36.53125 
-Q 39.546875 41.84375 41.421875 45.53125 
-Q 43.3125 49.21875 43.3125 52.78125 
-Q 43.3125 58.59375 39.234375 62.25 
-Q 35.15625 65.921875 28.609375 65.921875 
-Q 23.96875 65.921875 18.8125 64.3125 
-Q 13.671875 62.703125 7.8125 59.421875 
-L 7.8125 69.390625 
-Q 13.765625 71.78125 18.9375 73 
-Q 24.125 74.21875 28.421875 74.21875 
-Q 39.75 74.21875 46.484375 68.546875 
-Q 53.21875 62.890625 53.21875 53.421875 
-Q 53.21875 48.921875 51.53125 44.890625 
-Q 49.859375 40.875 45.40625 35.40625 
-Q 44.1875 33.984375 37.640625 27.21875 
-Q 31.109375 20.453125 19.1875 8.296875 
-z
-" id="DejaVuSans-32"/>
-      </defs>
-      <g transform="translate(511.68 401.918125)scale(0.12 -0.12)">
-       <use transform="translate(0 0.765625)" xlink:href="#DejaVuSans-39"/>
-       <use transform="translate(64.580078 39.046875)scale(0.7)" xlink:href="#DejaVuSans-32"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_4">
-     <g id="line2d_8">
-      <defs>
-       <path d="M 0 0 
-L 0 -2 
-" id="mce6b333cae" style="stroke:#000000;stroke-width:0.5;"/>
-      </defs>
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="142.41176" xlink:href="#mce6b333cae" y="388.8"/>
-      </g>
-     </g>
-     <g id="line2d_9">
-      <defs>
-       <path d="M 0 0 
-L 0 2 
-" id="m8d518e7239" style="stroke:#000000;stroke-width:0.5;"/>
-      </defs>
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="142.41176" xlink:href="#m8d518e7239" y="43.2"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_5">
-     <g id="line2d_10">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="183.6" xlink:href="#mce6b333cae" y="388.8"/>
-      </g>
-     </g>
-     <g id="line2d_11">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="183.6" xlink:href="#m8d518e7239" y="43.2"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_6">
-     <g id="line2d_12">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="212.823521" xlink:href="#mce6b333cae" y="388.8"/>
-      </g>
-     </g>
-     <g id="line2d_13">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="212.823521" xlink:href="#m8d518e7239" y="43.2"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_7">
-     <g id="line2d_14">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="235.491045" xlink:href="#mce6b333cae" y="388.8"/>
-      </g>
-     </g>
-     <g id="line2d_15">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="235.491045" xlink:href="#m8d518e7239" y="43.2"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_8">
-     <g id="line2d_16">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="254.01176" xlink:href="#mce6b333cae" y="388.8"/>
-      </g>
-     </g>
-     <g id="line2d_17">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="254.01176" xlink:href="#m8d518e7239" y="43.2"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_9">
-     <g id="line2d_18">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="269.670802" xlink:href="#mce6b333cae" y="388.8"/>
-      </g>
-     </g>
-     <g id="line2d_19">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="269.670802" xlink:href="#m8d518e7239" y="43.2"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_10">
-     <g id="line2d_20">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="283.235281" xlink:href="#mce6b333cae" y="388.8"/>
-      </g>
-     </g>
-     <g id="line2d_21">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="283.235281" xlink:href="#m8d518e7239" y="43.2"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_11">
-     <g id="line2d_22">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="365.61176" xlink:href="#mce6b333cae" y="388.8"/>
-      </g>
-     </g>
-     <g id="line2d_23">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="365.61176" xlink:href="#m8d518e7239" y="43.2"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_12">
-     <g id="line2d_24">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="406.8" xlink:href="#mce6b333cae" y="388.8"/>
-      </g>
-     </g>
-     <g id="line2d_25">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="406.8" xlink:href="#m8d518e7239" y="43.2"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_13">
-     <g id="line2d_26">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="436.023521" xlink:href="#mce6b333cae" y="388.8"/>
-      </g>
-     </g>
-     <g id="line2d_27">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="436.023521" xlink:href="#m8d518e7239" y="43.2"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_14">
-     <g id="line2d_28">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="458.691045" xlink:href="#mce6b333cae" y="388.8"/>
-      </g>
-     </g>
-     <g id="line2d_29">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="458.691045" xlink:href="#m8d518e7239" y="43.2"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_15">
-     <g id="line2d_30">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="477.21176" xlink:href="#mce6b333cae" y="388.8"/>
-      </g>
-     </g>
-     <g id="line2d_31">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="477.21176" xlink:href="#m8d518e7239" y="43.2"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_16">
-     <g id="line2d_32">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="492.870802" xlink:href="#mce6b333cae" y="388.8"/>
-      </g>
-     </g>
-     <g id="line2d_33">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="492.870802" xlink:href="#m8d518e7239" y="43.2"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_17">
-     <g id="line2d_34">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="506.435281" xlink:href="#mce6b333cae" y="388.8"/>
-      </g>
-     </g>
-     <g id="line2d_35">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="506.435281" xlink:href="#m8d518e7239" y="43.2"/>
-      </g>
-     </g>
-    </g>
-   </g>
-   <g id="matplotlib.axis_2">
-    <g id="ytick_1">
-     <g id="line2d_36">
-      <defs>
-       <path d="M 0 0 
-L 4 0 
-" id="m556f96d829" style="stroke:#000000;stroke-width:0.5;"/>
-      </defs>
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m556f96d829" y="43.2"/>
-      </g>
-     </g>
-     <g id="line2d_37">
-      <defs>
-       <path d="M 0 0 
-L -4 0 
-" id="m27e32ca04a" style="stroke:#000000;stroke-width:0.5;"/>
-      </defs>
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m27e32ca04a" y="43.2"/>
-      </g>
-     </g>
-     <g id="text_4">
-      <!-- $\mathdefault{5.5^{-1}}$ -->
-      <defs>
-       <path d="M 10.796875 72.90625 
-L 49.515625 72.90625 
-L 49.515625 64.59375 
-L 19.828125 64.59375 
-L 19.828125 46.734375 
-Q 21.96875 47.46875 24.109375 47.828125 
-Q 26.265625 48.1875 28.421875 48.1875 
-Q 40.625 48.1875 47.75 41.5 
-Q 54.890625 34.8125 54.890625 23.390625 
-Q 54.890625 11.625 47.5625 5.09375 
-Q 40.234375 -1.421875 26.90625 -1.421875 
-Q 22.3125 -1.421875 17.546875 -0.640625 
-Q 12.796875 0.140625 7.71875 1.703125 
-L 7.71875 11.625 
-Q 12.109375 9.234375 16.796875 8.0625 
-Q 21.484375 6.890625 26.703125 6.890625 
-Q 35.15625 6.890625 40.078125 11.328125 
-Q 45.015625 15.765625 45.015625 23.390625 
-Q 45.015625 31 40.078125 35.4375 
-Q 35.15625 39.890625 26.703125 39.890625 
-Q 22.75 39.890625 18.8125 39.015625 
-Q 14.890625 38.140625 10.796875 36.28125 
-z
-" id="DejaVuSans-35"/>
-       <path d="M 10.6875 12.40625 
-L 21 12.40625 
-L 21 0 
-L 10.6875 0 
-z
-" id="DejaVuSans-2e"/>
-       <path d="M 4.890625 31.390625 
-L 31.203125 31.390625 
-L 31.203125 23.390625 
-L 4.890625 23.390625 
-z
-" id="DejaVuSans-2d"/>
-      </defs>
-      <g transform="translate(40.04 47.759062)scale(0.12 -0.12)">
-       <use transform="translate(0 0.684375)" xlink:href="#DejaVuSans-35"/>
-       <use transform="translate(63.623047 0.684375)" xlink:href="#DejaVuSans-2e"/>
-       <use transform="translate(95.410156 0.684375)" xlink:href="#DejaVuSans-35"/>
-       <use transform="translate(159.990234 38.965625)scale(0.7)" xlink:href="#DejaVuSans-2d"/>
-       <use transform="translate(185.249023 38.965625)scale(0.7)" xlink:href="#DejaVuSans-31"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_2">
-     <g id="line2d_38">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m556f96d829" y="216"/>
-      </g>
-     </g>
-     <g id="line2d_39">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m27e32ca04a" y="216"/>
-      </g>
-     </g>
-     <g id="text_5">
-      <!-- $\mathdefault{5.5^{0}}$ -->
-      <g transform="translate(43.04 220.559063)scale(0.12 -0.12)">
-       <use transform="translate(0 0.765625)" xlink:href="#DejaVuSans-35"/>
-       <use transform="translate(63.623047 0.765625)" xlink:href="#DejaVuSans-2e"/>
-       <use transform="translate(95.410156 0.765625)" xlink:href="#DejaVuSans-35"/>
-       <use transform="translate(159.990234 39.046875)scale(0.7)" xlink:href="#DejaVuSans-30"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_3">
-     <g id="line2d_40">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m556f96d829" y="388.8"/>
-      </g>
-     </g>
-     <g id="line2d_41">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m27e32ca04a" y="388.8"/>
-      </g>
-     </g>
-     <g id="text_6">
-      <!-- $\mathdefault{5.5^{1}}$ -->
-      <g transform="translate(43.04 393.359062)scale(0.12 -0.12)">
-       <use transform="translate(0 0.684375)" xlink:href="#DejaVuSans-35"/>
-       <use transform="translate(63.623047 0.684375)" xlink:href="#DejaVuSans-2e"/>
-       <use transform="translate(95.410156 0.684375)" xlink:href="#DejaVuSans-35"/>
-       <use transform="translate(159.990234 38.965625)scale(0.7)" xlink:href="#DejaVuSans-31"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_4">
-     <g id="line2d_42">
-      <defs>
-       <path d="M 0 0 
-L 2 0 
-" id="mb12535d6a8" style="stroke:#000000;stroke-width:0.5;"/>
-      </defs>
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#mb12535d6a8" y="113.460136"/>
-      </g>
-     </g>
-     <g id="line2d_43">
-      <defs>
-       <path d="M 0 0 
-L -2 0 
-" id="m8a2e629618" style="stroke:#000000;stroke-width:0.5;"/>
-      </defs>
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="113.460136"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_5">
-     <g id="line2d_44">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#mb12535d6a8" y="154.559681"/>
-      </g>
-     </g>
-     <g id="line2d_45">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="154.559681"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_6">
-     <g id="line2d_46">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#mb12535d6a8" y="183.720272"/>
-      </g>
-     </g>
-     <g id="line2d_47">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="183.720272"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_7">
-     <g id="line2d_48">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#mb12535d6a8" y="206.338984"/>
-      </g>
-     </g>
-     <g id="line2d_49">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="206.338984"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_8">
-     <g id="line2d_50">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#mb12535d6a8" y="286.260136"/>
-      </g>
-     </g>
-     <g id="line2d_51">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="286.260136"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_9">
-     <g id="line2d_52">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#mb12535d6a8" y="327.359681"/>
-      </g>
-     </g>
-     <g id="line2d_53">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="327.359681"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_10">
-     <g id="line2d_54">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#mb12535d6a8" y="356.520272"/>
-      </g>
-     </g>
-     <g id="line2d_55">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="356.520272"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_11">
-     <g id="line2d_56">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#mb12535d6a8" y="379.138984"/>
-      </g>
-     </g>
-     <g id="line2d_57">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m8a2e629618" y="379.138984"/>
-      </g>
-     </g>
-    </g>
-   </g>
-  </g>
- </g>
- <defs>
-  <clipPath id="p826a730be7">
-   <rect height="345.6" width="446.4" x="72" y="43.2"/>
-  </clipPath>
- </defs>
-</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/markevery_linear_scales_nans.pdf b/lib/matplotlib/tests/baseline_images/test_axes/markevery_linear_scales_nans.pdf
new file mode 100644
index 000000000000..bd4feafd6aa0
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_axes/markevery_linear_scales_nans.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/markevery_linear_scales_nans.png b/lib/matplotlib/tests/baseline_images/test_axes/markevery_linear_scales_nans.png
new file mode 100644
index 000000000000..2eb087944ec4
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_axes/markevery_linear_scales_nans.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/markevery_linear_scales_nans.svg b/lib/matplotlib/tests/baseline_images/test_axes/markevery_linear_scales_nans.svg
new file mode 100644
index 000000000000..c52aaf9de094
--- /dev/null
+++ b/lib/matplotlib/tests/baseline_images/test_axes/markevery_linear_scales_nans.svg
@@ -0,0 +1,3581 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" width="576pt" height="432pt" viewBox="0 0 576 432" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <metadata>
+  <rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+   <cc:Work>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:date>2022-03-28T18:57:12.789026</dc:date>
+    <dc:format>image/svg+xml</dc:format>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Matplotlib v3.6.0.dev1706+g252085fd25, https://matplotlib.org/</dc:title>
+     </cc:Agent>
+    </dc:creator>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <defs>
+  <style type="text/css">*{stroke-linejoin: round; stroke-linecap: butt}</style>
+ </defs>
+ <g id="figure_1">
+  <g id="patch_1">
+   <path d="M 0 432 
+L 576 432 
+L 576 0 
+L 0 0 
+z
+" style="fill: #ffffff"/>
+  </g>
+  <g id="axes_1">
+   <g id="patch_2">
+    <path d="M 72 118.330435 
+L 203.294118 118.330435 
+L 203.294118 43.2 
+L 72 43.2 
+z
+" style="fill: #ffffff"/>
+   </g>
+   <g id="line2d_1">
+    <path d="M 80.7742 67.967661 
+L 82.925049 64.512117 
+L 85.075897 61.500531 
+L 86.509796 59.77216 
+L 87.943695 58.28706 
+L 89.377594 57.059566 
+L 90.811493 56.101528 
+L 92.245392 55.422194 
+L 93.679291 55.028122 
+L 95.113189 54.923117 
+L 96.547088 55.108192 
+L 97.980987 55.58156 
+L 99.414886 56.338651 
+L 100.848785 57.372158 
+L 102.282684 58.672103 
+L 103.716583 60.225938 
+L 105.867431 62.999285 
+L 108.01828 66.249416 
+L 108.735229 67.426826 
+M 123.791168 96.913231 
+L 126.658965 102.069786 
+L 128.809814 105.514974 
+L 130.960662 108.514424 
+L 132.394561 110.233844 
+L 133.82846 111.709405 
+L 135.262359 112.926863 
+L 136.696258 113.874465 
+L 138.130157 114.543065 
+L 139.564056 114.926207 
+L 140.997954 115.020194 
+L 142.431853 114.824117 
+L 143.865752 114.33987 
+L 145.299651 113.572126 
+L 146.73355 112.528299 
+L 148.167449 111.218464 
+L 149.601348 109.655265 
+L 151.752196 106.869053 
+L 153.903045 103.607722 
+L 156.053893 99.942038 
+L 158.921691 94.563991 
+L 163.223388 85.873027 
+L 168.958983 74.296063 
+L 171.826781 69.014836 
+L 173.977629 65.447008 
+L 176.128478 62.302852 
+L 178.279326 59.650591 
+L 179.713225 58.184591 
+L 181.147124 56.977185 
+L 182.581023 56.040031 
+L 184.014922 55.382175 
+L 185.448821 55.009968 
+L 186.882719 54.927002 
+L 188.316618 55.134078 
+L 189.750517 55.629198 
+L 191.184416 56.407582 
+L 192.618315 57.461715 
+L 194.052214 58.781422 
+L 195.486113 60.353964 
+L 197.636961 63.153001 
+L 199.78781 66.425486 
+L 201.938658 70.100412 
+L 201.938658 70.100412 
+" clip-path="url(#p9465a32b5a)" style="fill: none; stroke: #0000ff; stroke-linecap: square"/>
+    <defs>
+     <path id="m3c4034e2a7" d="M 0 2 
+C 0.530406 2 1.03916 1.789267 1.414214 1.414214 
+C 1.789267 1.03916 2 0.530406 2 0 
+C 2 -0.530406 1.789267 -1.03916 1.414214 -1.414214 
+C 1.03916 -1.789267 0.530406 -2 0 -2 
+C -0.530406 -2 -1.03916 -1.789267 -1.414214 -1.414214 
+C -1.789267 -1.03916 -2 -0.530406 -2 0 
+C -2 0.530406 -1.789267 1.03916 -1.414214 1.414214 
+C -1.03916 1.789267 -0.530406 2 0 2 
+z
+" style="stroke: #000000; stroke-width: 0.5"/>
+    </defs>
+    <g clip-path="url(#p9465a32b5a)">
+     <use xlink:href="#m3c4034e2a7" x="80.7742" y="67.967661" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="81.49115" y="66.770931" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="82.208099" y="65.618156" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="82.925049" y="64.512117" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="83.641998" y="63.455487" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="84.358948" y="62.450816" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="85.075897" y="61.500531" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="85.792847" y="60.606926" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="86.509796" y="59.77216" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="87.226745" y="58.998249" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="87.943695" y="58.28706" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="88.660644" y="57.640312" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="89.377594" y="57.059566" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="90.094543" y="56.546225" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="90.811493" y="56.101528" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="91.528442" y="55.726549" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="92.245392" y="55.422194" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="92.962341" y="55.189198" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="93.679291" y="55.028122" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="94.39624" y="54.939357" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="95.113189" y="54.923117" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="95.830139" y="54.97944" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="96.547088" y="55.108192" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="97.264038" y="55.30906" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="97.980987" y="55.58156" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="98.697937" y="55.925033" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="99.414886" y="56.338651" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="100.131836" y="56.821415" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="100.848785" y="57.372158" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="101.565735" y="57.989551" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="102.282684" y="58.672103" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="102.999633" y="59.418166" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="103.716583" y="60.225938" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="104.433532" y="61.093468" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="105.150482" y="62.018662" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="105.867431" y="62.999285" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="106.584381" y="64.03297" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="107.30133" y="65.11722" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="108.01828" y="66.249416" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="108.735229" y="67.426826" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="123.791168" y="96.913231" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="124.508117" y="98.253615" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="125.225067" y="99.561927" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="125.942016" y="100.835009" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="126.658965" y="102.069786" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="127.375915" y="103.263276" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="128.092864" y="104.412597" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="128.809814" y="105.514974" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="129.526763" y="106.567745" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="130.243713" y="107.568367" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="130.960662" y="108.514424" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="131.677612" y="109.403632" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="132.394561" y="110.233844" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="133.11151" y="111.003054" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="133.82846" y="111.709405" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="134.545409" y="112.351191" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="135.262359" y="112.926863" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="135.979308" y="113.43503" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="136.696258" y="113.874465" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="137.413207" y="114.244108" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="138.130157" y="114.543065" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="138.847106" y="114.770615" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="139.564056" y="114.926207" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="140.281005" y="115.009467" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="140.997954" y="115.020194" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="141.714904" y="114.95836" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="142.431853" y="114.824117" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="143.148803" y="114.617787" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="143.865752" y="114.33987" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="144.582702" y="113.991035" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="145.299651" y="113.572126" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="146.016601" y="113.084155" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="146.73355" y="112.528299" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="147.4505" y="111.905901" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="148.167449" y="111.218464" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="148.884398" y="110.467647" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="149.601348" y="109.655265" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="150.318297" y="108.783278" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="151.035247" y="107.853793" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="151.752196" y="106.869053" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="152.469146" y="105.831438" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="153.186095" y="104.743452" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="153.903045" y="103.607722" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="154.619994" y="102.426993" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="155.336944" y="101.204114" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="156.053893" y="99.942038" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="156.770842" y="98.643814" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="157.487792" y="97.312576" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="158.204741" y="95.95154" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="158.921691" y="94.563991" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="159.63864" y="93.15328" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="160.35559" y="91.722814" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="161.072539" y="90.276048" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="161.789489" y="88.816475" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="162.506438" y="87.347619" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="163.223388" y="85.873027" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="163.940337" y="84.396261" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="164.657286" y="82.920887" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="165.374236" y="81.450467" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="166.091185" y="79.988552" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="166.808135" y="78.538673" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="167.525084" y="77.10433" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="168.242034" y="75.688987" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="168.958983" y="74.296063" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="169.675933" y="72.92892" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="170.392882" y="71.59086" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="171.109832" y="70.285114" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="171.826781" y="69.014836" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="172.54373" y="67.783093" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="173.26068" y="66.592859" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="173.977629" y="65.447008" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="174.694579" y="64.348308" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="175.411528" y="63.299412" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="176.128478" y="62.302852" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="176.845427" y="61.361036" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="177.562377" y="60.476237" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="178.279326" y="59.650591" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="178.996275" y="58.886094" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="179.713225" y="58.184591" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="180.430174" y="57.547775" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="181.147124" y="56.977185" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="181.864073" y="56.474199" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="182.581023" y="56.040031" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="183.297972" y="55.67573" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="184.014922" y="55.382175" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="184.731871" y="55.160076" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="185.448821" y="55.009968" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="186.16577" y="54.932214" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="186.882719" y="54.927002" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="187.599669" y="54.994344" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="188.316618" y="55.134078" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="189.033568" y="55.345866" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="189.750517" y="55.629198" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="190.467467" y="55.983388" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="191.184416" y="56.407582" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="191.901366" y="56.900754" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="192.618315" y="57.461715" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="193.335265" y="58.089109" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="194.052214" y="58.781422" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="194.769163" y="59.536982" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="195.486113" y="60.353964" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="196.203062" y="61.230395" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="196.920012" y="62.164159" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="197.636961" y="63.153001" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="198.353911" y="64.194533" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="199.07086" y="65.28624" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="199.78781" y="66.425486" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="200.504759" y="67.609519" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="201.221709" y="68.835481" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="201.938658" y="70.100412" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+    </g>
+   </g>
+   <g id="patch_3">
+    <path d="M 72 118.330435 
+L 72 43.2 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_4">
+    <path d="M 203.294118 118.330435 
+L 203.294118 43.2 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_5">
+    <path d="M 72 118.330435 
+L 203.294118 118.330435 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_6">
+    <path d="M 72 43.2 
+L 203.294118 43.2 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="matplotlib.axis_1">
+    <g id="xtick_1">
+     <g id="line2d_2">
+      <defs>
+       <path id="m441ccbbe42" d="M 0 0 
+L 0 -4 
+" style="stroke: #000000; stroke-width: 0.5"/>
+      </defs>
+      <g>
+       <use xlink:href="#m441ccbbe42" x="72" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_3">
+      <defs>
+       <path id="mad5646bafe" d="M 0 0 
+L 0 4 
+" style="stroke: #000000; stroke-width: 0.5"/>
+      </defs>
+      <g>
+       <use xlink:href="#mad5646bafe" x="72" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_2">
+     <g id="line2d_4">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="86.588235" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_5">
+      <g>
+       <use xlink:href="#mad5646bafe" x="86.588235" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_3">
+     <g id="line2d_6">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="101.176471" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_7">
+      <g>
+       <use xlink:href="#mad5646bafe" x="101.176471" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_4">
+     <g id="line2d_8">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="115.764706" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_9">
+      <g>
+       <use xlink:href="#mad5646bafe" x="115.764706" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_5">
+     <g id="line2d_10">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="130.352941" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_11">
+      <g>
+       <use xlink:href="#mad5646bafe" x="130.352941" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_6">
+     <g id="line2d_12">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="144.941176" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_13">
+      <g>
+       <use xlink:href="#mad5646bafe" x="144.941176" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_7">
+     <g id="line2d_14">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="159.529412" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_15">
+      <g>
+       <use xlink:href="#mad5646bafe" x="159.529412" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_8">
+     <g id="line2d_16">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="174.117647" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_17">
+      <g>
+       <use xlink:href="#mad5646bafe" x="174.117647" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_9">
+     <g id="line2d_18">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="188.705882" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_19">
+      <g>
+       <use xlink:href="#mad5646bafe" x="188.705882" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_10">
+     <g id="line2d_20">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="203.294118" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_21">
+      <g>
+       <use xlink:href="#mad5646bafe" x="203.294118" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+   <g id="matplotlib.axis_2">
+    <g id="ytick_1">
+     <g id="line2d_22">
+      <defs>
+       <path id="mebf891ec74" d="M 0 0 
+L 4 0 
+" style="stroke: #000000; stroke-width: 0.5"/>
+      </defs>
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_23">
+      <defs>
+       <path id="m0be78051dd" d="M 0 0 
+L -4 0 
+" style="stroke: #000000; stroke-width: 0.5"/>
+      </defs>
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_2">
+     <g id="line2d_24">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="103.304348" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_25">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="103.304348" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_3">
+     <g id="line2d_26">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="88.278261" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_27">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="88.278261" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_4">
+     <g id="line2d_28">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="73.252174" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_29">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="73.252174" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_5">
+     <g id="line2d_30">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="58.226087" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_31">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="58.226087" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_6">
+     <g id="line2d_32">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_33">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+  </g>
+  <g id="axes_2">
+   <g id="patch_7">
+    <path d="M 229.552941 118.330435 
+L 360.847059 118.330435 
+L 360.847059 43.2 
+L 229.552941 43.2 
+z
+" style="fill: #ffffff"/>
+   </g>
+   <g id="line2d_34">
+    <path d="M 238.327142 67.967661 
+L 240.47799 64.512117 
+L 242.628838 61.500531 
+L 244.062737 59.77216 
+L 245.496636 58.28706 
+L 246.930535 57.059566 
+L 248.364434 56.101528 
+L 249.798333 55.422194 
+L 251.232232 55.028122 
+L 252.666131 54.923117 
+L 254.10003 55.108192 
+L 255.533928 55.58156 
+L 256.967827 56.338651 
+L 258.401726 57.372158 
+L 259.835625 58.672103 
+L 261.269524 60.225938 
+L 263.420372 62.999285 
+L 265.571221 66.249416 
+L 266.28817 67.426826 
+M 281.344109 96.913231 
+L 284.211907 102.069786 
+L 286.362755 105.514974 
+L 288.513603 108.514424 
+L 289.947502 110.233844 
+L 291.381401 111.709405 
+L 292.8153 112.926863 
+L 294.249199 113.874465 
+L 295.683098 114.543065 
+L 297.116997 114.926207 
+L 298.550896 115.020194 
+L 299.984795 114.824117 
+L 301.418693 114.33987 
+L 302.852592 113.572126 
+L 304.286491 112.528299 
+L 305.72039 111.218464 
+L 307.154289 109.655265 
+L 309.305137 106.869053 
+L 311.455986 103.607722 
+L 313.606834 99.942038 
+L 316.474632 94.563991 
+L 320.776329 85.873027 
+L 326.511924 74.296063 
+L 329.379722 69.014836 
+L 331.53057 65.447008 
+L 333.681419 62.302852 
+L 335.832267 59.650591 
+L 337.266166 58.184591 
+L 338.700065 56.977185 
+L 340.133964 56.040031 
+L 341.567863 55.382175 
+L 343.001762 55.009968 
+L 344.435661 54.927002 
+L 345.86956 55.134078 
+L 347.303458 55.629198 
+L 348.737357 56.407582 
+L 350.171256 57.461715 
+L 351.605155 58.781422 
+L 353.039054 60.353964 
+L 355.189902 63.153001 
+L 357.340751 66.425486 
+L 359.491599 70.100412 
+L 359.491599 70.100412 
+" clip-path="url(#p7c063ba2d8)" style="fill: none; stroke: #0000ff; stroke-linecap: square"/>
+    <g clip-path="url(#p7c063ba2d8)">
+     <use xlink:href="#m3c4034e2a7" x="242.628838" y="61.500531" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="248.364434" y="56.101528" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="254.10003" y="55.108192" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="259.835625" y="58.672103" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="265.571221" y="66.249416" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="282.778008" y="99.561927" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="288.513603" y="108.514424" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="294.249199" y="113.874465" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="299.984795" y="114.824117" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="305.72039" y="111.218464" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="311.455986" y="103.607722" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="317.191581" y="93.15328" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="322.927177" y="81.450467" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="328.662773" y="70.285114" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="334.398368" y="61.361036" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="340.133964" y="56.040031" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="345.86956" y="55.134078" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="351.605155" y="58.781422" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="357.340751" y="66.425486" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+    </g>
+   </g>
+   <g id="patch_8">
+    <path d="M 229.552941 118.330435 
+L 229.552941 43.2 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_9">
+    <path d="M 360.847059 118.330435 
+L 360.847059 43.2 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_10">
+    <path d="M 229.552941 118.330435 
+L 360.847059 118.330435 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_11">
+    <path d="M 229.552941 43.2 
+L 360.847059 43.2 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="matplotlib.axis_3">
+    <g id="xtick_11">
+     <g id="line2d_35">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="229.552941" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_36">
+      <g>
+       <use xlink:href="#mad5646bafe" x="229.552941" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_12">
+     <g id="line2d_37">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="244.141176" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_38">
+      <g>
+       <use xlink:href="#mad5646bafe" x="244.141176" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_13">
+     <g id="line2d_39">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="258.729412" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_40">
+      <g>
+       <use xlink:href="#mad5646bafe" x="258.729412" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_14">
+     <g id="line2d_41">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="273.317647" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_42">
+      <g>
+       <use xlink:href="#mad5646bafe" x="273.317647" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_15">
+     <g id="line2d_43">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="287.905882" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_44">
+      <g>
+       <use xlink:href="#mad5646bafe" x="287.905882" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_16">
+     <g id="line2d_45">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="302.494118" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_46">
+      <g>
+       <use xlink:href="#mad5646bafe" x="302.494118" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_17">
+     <g id="line2d_47">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="317.082353" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_48">
+      <g>
+       <use xlink:href="#mad5646bafe" x="317.082353" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_18">
+     <g id="line2d_49">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="331.670588" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_50">
+      <g>
+       <use xlink:href="#mad5646bafe" x="331.670588" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_19">
+     <g id="line2d_51">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="346.258824" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_52">
+      <g>
+       <use xlink:href="#mad5646bafe" x="346.258824" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_20">
+     <g id="line2d_53">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="360.847059" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_54">
+      <g>
+       <use xlink:href="#mad5646bafe" x="360.847059" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+   <g id="matplotlib.axis_4">
+    <g id="ytick_7">
+     <g id="line2d_55">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_56">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_8">
+     <g id="line2d_57">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="103.304348" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_58">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="103.304348" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_9">
+     <g id="line2d_59">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="88.278261" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_60">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="88.278261" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_10">
+     <g id="line2d_61">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="73.252174" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_62">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="73.252174" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_11">
+     <g id="line2d_63">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="58.226087" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_64">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="58.226087" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_12">
+     <g id="line2d_65">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_66">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+  </g>
+  <g id="axes_3">
+   <g id="patch_12">
+    <path d="M 387.105882 118.330435 
+L 518.4 118.330435 
+L 518.4 43.2 
+L 387.105882 43.2 
+z
+" style="fill: #ffffff"/>
+   </g>
+   <g id="line2d_67">
+    <path d="M 395.880083 67.967661 
+L 398.030931 64.512117 
+L 400.181779 61.500531 
+L 401.615678 59.77216 
+L 403.049577 58.28706 
+L 404.483476 57.059566 
+L 405.917375 56.101528 
+L 407.351274 55.422194 
+L 408.785173 55.028122 
+L 410.219072 54.923117 
+L 411.652971 55.108192 
+L 413.08687 55.58156 
+L 414.520769 56.338651 
+L 415.954667 57.372158 
+L 417.388566 58.672103 
+L 418.822465 60.225938 
+L 420.973314 62.999285 
+L 423.124162 66.249416 
+L 423.841111 67.426826 
+M 438.89705 96.913231 
+L 441.764848 102.069786 
+L 443.915696 105.514974 
+L 446.066544 108.514424 
+L 447.500443 110.233844 
+L 448.934342 111.709405 
+L 450.368241 112.926863 
+L 451.80214 113.874465 
+L 453.236039 114.543065 
+L 454.669938 114.926207 
+L 456.103837 115.020194 
+L 457.537736 114.824117 
+L 458.971635 114.33987 
+L 460.405534 113.572126 
+L 461.839432 112.528299 
+L 463.273331 111.218464 
+L 464.70723 109.655265 
+L 466.858079 106.869053 
+L 469.008927 103.607722 
+L 471.159775 99.942038 
+L 474.027573 94.563991 
+L 478.32927 85.873027 
+L 484.064866 74.296063 
+L 486.932663 69.014836 
+L 489.083512 65.447008 
+L 491.23436 62.302852 
+L 493.385208 59.650591 
+L 494.819107 58.184591 
+L 496.253006 56.977185 
+L 497.686905 56.040031 
+L 499.120804 55.382175 
+L 500.554703 55.009968 
+L 501.988602 54.927002 
+L 503.422501 55.134078 
+L 504.8564 55.629198 
+L 506.290299 56.407582 
+L 507.724197 57.461715 
+L 509.158096 58.781422 
+L 510.591995 60.353964 
+L 512.742844 63.153001 
+L 514.893692 66.425486 
+L 517.04454 70.100412 
+L 517.04454 70.100412 
+" clip-path="url(#p06530ecabb)" style="fill: none; stroke: #0000ff; stroke-linecap: square"/>
+    <g clip-path="url(#p06530ecabb)">
+     <use xlink:href="#m3c4034e2a7" x="410.219072" y="54.923117" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="415.954667" y="57.372158" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="421.690263" y="64.03297" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="438.89705" y="96.913231" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="444.632646" y="106.567745" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="450.368241" y="112.926863" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="456.103837" y="115.020194" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="461.839432" y="112.528299" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="467.575028" y="105.831438" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="473.310624" y="95.95154" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="479.046219" y="84.396261" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="484.781815" y="72.92892" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="490.517411" y="63.299412" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="496.253006" y="56.977185" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="501.988602" y="54.927002" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="507.724197" y="57.461715" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="513.459793" y="64.194533" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+    </g>
+   </g>
+   <g id="patch_13">
+    <path d="M 387.105882 118.330435 
+L 387.105882 43.2 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_14">
+    <path d="M 518.4 118.330435 
+L 518.4 43.2 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_15">
+    <path d="M 387.105882 118.330435 
+L 518.4 118.330435 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_16">
+    <path d="M 387.105882 43.2 
+L 518.4 43.2 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="matplotlib.axis_5">
+    <g id="xtick_21">
+     <g id="line2d_68">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="387.105882" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_69">
+      <g>
+       <use xlink:href="#mad5646bafe" x="387.105882" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_22">
+     <g id="line2d_70">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="401.694118" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_71">
+      <g>
+       <use xlink:href="#mad5646bafe" x="401.694118" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_23">
+     <g id="line2d_72">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="416.282353" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_73">
+      <g>
+       <use xlink:href="#mad5646bafe" x="416.282353" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_24">
+     <g id="line2d_74">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="430.870588" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_75">
+      <g>
+       <use xlink:href="#mad5646bafe" x="430.870588" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_25">
+     <g id="line2d_76">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="445.458824" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_77">
+      <g>
+       <use xlink:href="#mad5646bafe" x="445.458824" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_26">
+     <g id="line2d_78">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="460.047059" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_79">
+      <g>
+       <use xlink:href="#mad5646bafe" x="460.047059" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_27">
+     <g id="line2d_80">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="474.635294" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_81">
+      <g>
+       <use xlink:href="#mad5646bafe" x="474.635294" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_28">
+     <g id="line2d_82">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="489.223529" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_83">
+      <g>
+       <use xlink:href="#mad5646bafe" x="489.223529" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_29">
+     <g id="line2d_84">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="503.811765" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_85">
+      <g>
+       <use xlink:href="#mad5646bafe" x="503.811765" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_30">
+     <g id="line2d_86">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="518.4" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_87">
+      <g>
+       <use xlink:href="#mad5646bafe" x="518.4" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+   <g id="matplotlib.axis_6">
+    <g id="ytick_13">
+     <g id="line2d_88">
+      <g>
+       <use xlink:href="#mebf891ec74" x="387.105882" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_89">
+      <g>
+       <use xlink:href="#m0be78051dd" x="518.4" y="118.330435" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_14">
+     <g id="line2d_90">
+      <g>
+       <use xlink:href="#mebf891ec74" x="387.105882" y="103.304348" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_91">
+      <g>
+       <use xlink:href="#m0be78051dd" x="518.4" y="103.304348" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_15">
+     <g id="line2d_92">
+      <g>
+       <use xlink:href="#mebf891ec74" x="387.105882" y="88.278261" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_93">
+      <g>
+       <use xlink:href="#m0be78051dd" x="518.4" y="88.278261" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_16">
+     <g id="line2d_94">
+      <g>
+       <use xlink:href="#mebf891ec74" x="387.105882" y="73.252174" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_95">
+      <g>
+       <use xlink:href="#m0be78051dd" x="518.4" y="73.252174" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_17">
+     <g id="line2d_96">
+      <g>
+       <use xlink:href="#mebf891ec74" x="387.105882" y="58.226087" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_97">
+      <g>
+       <use xlink:href="#m0be78051dd" x="518.4" y="58.226087" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_18">
+     <g id="line2d_98">
+      <g>
+       <use xlink:href="#mebf891ec74" x="387.105882" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_99">
+      <g>
+       <use xlink:href="#m0be78051dd" x="518.4" y="43.2" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+  </g>
+  <g id="axes_4">
+   <g id="patch_17">
+    <path d="M 72 208.486957 
+L 203.294118 208.486957 
+L 203.294118 133.356522 
+L 72 133.356522 
+z
+" style="fill: #ffffff"/>
+   </g>
+   <g id="line2d_100">
+    <path d="M 80.7742 158.124182 
+L 82.925049 154.668639 
+L 85.075897 151.657052 
+L 86.509796 149.928682 
+L 87.943695 148.443582 
+L 89.377594 147.216088 
+L 90.811493 146.25805 
+L 92.245392 145.578716 
+L 93.679291 145.184644 
+L 95.113189 145.079639 
+L 96.547088 145.264713 
+L 97.980987 145.738081 
+L 99.414886 146.495173 
+L 100.848785 147.52868 
+L 102.282684 148.828625 
+L 103.716583 150.38246 
+L 105.867431 153.155807 
+L 108.01828 156.405938 
+L 108.735229 157.583347 
+M 123.791168 187.069753 
+L 126.658965 192.226308 
+L 128.809814 195.671496 
+L 130.960662 198.670946 
+L 132.394561 200.390365 
+L 133.82846 201.865926 
+L 135.262359 203.083384 
+L 136.696258 204.030987 
+L 138.130157 204.699587 
+L 139.564056 205.082729 
+L 140.997954 205.176715 
+L 142.431853 204.980639 
+L 143.865752 204.496391 
+L 145.299651 203.728648 
+L 146.73355 202.684821 
+L 148.167449 201.374985 
+L 149.601348 199.811786 
+L 151.752196 197.025575 
+L 153.903045 193.764244 
+L 156.053893 190.09856 
+L 158.921691 184.720512 
+L 163.223388 176.029549 
+L 168.958983 164.452584 
+L 171.826781 159.171358 
+L 173.977629 155.60353 
+L 176.128478 152.459374 
+L 178.279326 149.807113 
+L 179.713225 148.341112 
+L 181.147124 147.133707 
+L 182.581023 146.196553 
+L 184.014922 145.538697 
+L 185.448821 145.166489 
+L 186.882719 145.083523 
+L 188.316618 145.2906 
+L 189.750517 145.78572 
+L 191.184416 146.564103 
+L 192.618315 147.618237 
+L 194.052214 148.937944 
+L 195.486113 150.510485 
+L 197.636961 153.309522 
+L 199.78781 156.582008 
+L 201.938658 160.256933 
+L 201.938658 160.256933 
+" clip-path="url(#p7efc8b16c3)" style="fill: none; stroke: #0000ff; stroke-linecap: square"/>
+    <g clip-path="url(#p7efc8b16c3)">
+     <use xlink:href="#m3c4034e2a7" x="85.075897" y="151.657052" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="90.811493" y="146.25805" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="95.113189" y="145.079639" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+    </g>
+   </g>
+   <g id="patch_18">
+    <path d="M 72 208.486957 
+L 72 133.356522 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_19">
+    <path d="M 203.294118 208.486957 
+L 203.294118 133.356522 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_20">
+    <path d="M 72 208.486957 
+L 203.294118 208.486957 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_21">
+    <path d="M 72 133.356522 
+L 203.294118 133.356522 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="matplotlib.axis_7">
+    <g id="xtick_31">
+     <g id="line2d_101">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="72" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_102">
+      <g>
+       <use xlink:href="#mad5646bafe" x="72" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_32">
+     <g id="line2d_103">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="86.588235" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_104">
+      <g>
+       <use xlink:href="#mad5646bafe" x="86.588235" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_33">
+     <g id="line2d_105">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="101.176471" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_106">
+      <g>
+       <use xlink:href="#mad5646bafe" x="101.176471" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_34">
+     <g id="line2d_107">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="115.764706" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_108">
+      <g>
+       <use xlink:href="#mad5646bafe" x="115.764706" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_35">
+     <g id="line2d_109">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="130.352941" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_110">
+      <g>
+       <use xlink:href="#mad5646bafe" x="130.352941" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_36">
+     <g id="line2d_111">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="144.941176" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_112">
+      <g>
+       <use xlink:href="#mad5646bafe" x="144.941176" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_37">
+     <g id="line2d_113">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="159.529412" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_114">
+      <g>
+       <use xlink:href="#mad5646bafe" x="159.529412" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_38">
+     <g id="line2d_115">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="174.117647" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_116">
+      <g>
+       <use xlink:href="#mad5646bafe" x="174.117647" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_39">
+     <g id="line2d_117">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="188.705882" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_118">
+      <g>
+       <use xlink:href="#mad5646bafe" x="188.705882" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_40">
+     <g id="line2d_119">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="203.294118" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_120">
+      <g>
+       <use xlink:href="#mad5646bafe" x="203.294118" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+   <g id="matplotlib.axis_8">
+    <g id="ytick_19">
+     <g id="line2d_121">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_122">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_20">
+     <g id="line2d_123">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="193.46087" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_124">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="193.46087" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_21">
+     <g id="line2d_125">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="178.434783" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_126">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="178.434783" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_22">
+     <g id="line2d_127">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="163.408696" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_128">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="163.408696" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_23">
+     <g id="line2d_129">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="148.382609" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_130">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="148.382609" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_24">
+     <g id="line2d_131">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_132">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+  </g>
+  <g id="axes_5">
+   <g id="patch_22">
+    <path d="M 229.552941 208.486957 
+L 360.847059 208.486957 
+L 360.847059 133.356522 
+L 229.552941 133.356522 
+z
+" style="fill: #ffffff"/>
+   </g>
+   <g id="line2d_133">
+    <path d="M 238.327142 158.124182 
+L 240.47799 154.668639 
+L 242.628838 151.657052 
+L 244.062737 149.928682 
+L 245.496636 148.443582 
+L 246.930535 147.216088 
+L 248.364434 146.25805 
+L 249.798333 145.578716 
+L 251.232232 145.184644 
+L 252.666131 145.079639 
+L 254.10003 145.264713 
+L 255.533928 145.738081 
+L 256.967827 146.495173 
+L 258.401726 147.52868 
+L 259.835625 148.828625 
+L 261.269524 150.38246 
+L 263.420372 153.155807 
+L 265.571221 156.405938 
+L 266.28817 157.583347 
+M 281.344109 187.069753 
+L 284.211907 192.226308 
+L 286.362755 195.671496 
+L 288.513603 198.670946 
+L 289.947502 200.390365 
+L 291.381401 201.865926 
+L 292.8153 203.083384 
+L 294.249199 204.030987 
+L 295.683098 204.699587 
+L 297.116997 205.082729 
+L 298.550896 205.176715 
+L 299.984795 204.980639 
+L 301.418693 204.496391 
+L 302.852592 203.728648 
+L 304.286491 202.684821 
+L 305.72039 201.374985 
+L 307.154289 199.811786 
+L 309.305137 197.025575 
+L 311.455986 193.764244 
+L 313.606834 190.09856 
+L 316.474632 184.720512 
+L 320.776329 176.029549 
+L 326.511924 164.452584 
+L 329.379722 159.171358 
+L 331.53057 155.60353 
+L 333.681419 152.459374 
+L 335.832267 149.807113 
+L 337.266166 148.341112 
+L 338.700065 147.133707 
+L 340.133964 146.196553 
+L 341.567863 145.538697 
+L 343.001762 145.166489 
+L 344.435661 145.083523 
+L 345.86956 145.2906 
+L 347.303458 145.78572 
+L 348.737357 146.564103 
+L 350.171256 147.618237 
+L 351.605155 148.937944 
+L 353.039054 150.510485 
+L 355.189902 153.309522 
+L 357.340751 156.582008 
+L 359.491599 160.256933 
+L 359.491599 160.256933 
+" clip-path="url(#p162a2c8d97)" style="fill: none; stroke: #0000ff; stroke-linecap: square"/>
+    <g clip-path="url(#p162a2c8d97)"/>
+   </g>
+   <g id="patch_23">
+    <path d="M 229.552941 208.486957 
+L 229.552941 133.356522 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_24">
+    <path d="M 360.847059 208.486957 
+L 360.847059 133.356522 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_25">
+    <path d="M 229.552941 208.486957 
+L 360.847059 208.486957 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_26">
+    <path d="M 229.552941 133.356522 
+L 360.847059 133.356522 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="matplotlib.axis_9">
+    <g id="xtick_41">
+     <g id="line2d_134">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="229.552941" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_135">
+      <g>
+       <use xlink:href="#mad5646bafe" x="229.552941" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_42">
+     <g id="line2d_136">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="244.141176" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_137">
+      <g>
+       <use xlink:href="#mad5646bafe" x="244.141176" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_43">
+     <g id="line2d_138">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="258.729412" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_139">
+      <g>
+       <use xlink:href="#mad5646bafe" x="258.729412" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_44">
+     <g id="line2d_140">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="273.317647" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_141">
+      <g>
+       <use xlink:href="#mad5646bafe" x="273.317647" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_45">
+     <g id="line2d_142">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="287.905882" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_143">
+      <g>
+       <use xlink:href="#mad5646bafe" x="287.905882" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_46">
+     <g id="line2d_144">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="302.494118" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_145">
+      <g>
+       <use xlink:href="#mad5646bafe" x="302.494118" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_47">
+     <g id="line2d_146">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="317.082353" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_147">
+      <g>
+       <use xlink:href="#mad5646bafe" x="317.082353" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_48">
+     <g id="line2d_148">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="331.670588" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_149">
+      <g>
+       <use xlink:href="#mad5646bafe" x="331.670588" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_49">
+     <g id="line2d_150">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="346.258824" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_151">
+      <g>
+       <use xlink:href="#mad5646bafe" x="346.258824" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_50">
+     <g id="line2d_152">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="360.847059" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_153">
+      <g>
+       <use xlink:href="#mad5646bafe" x="360.847059" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+   <g id="matplotlib.axis_10">
+    <g id="ytick_25">
+     <g id="line2d_154">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_155">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_26">
+     <g id="line2d_156">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="193.46087" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_157">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="193.46087" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_27">
+     <g id="line2d_158">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="178.434783" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_159">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="178.434783" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_28">
+     <g id="line2d_160">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="163.408696" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_161">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="163.408696" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_29">
+     <g id="line2d_162">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="148.382609" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_163">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="148.382609" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_30">
+     <g id="line2d_164">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_165">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+  </g>
+  <g id="axes_6">
+   <g id="patch_27">
+    <path d="M 387.105882 208.486957 
+L 518.4 208.486957 
+L 518.4 133.356522 
+L 387.105882 133.356522 
+z
+" style="fill: #ffffff"/>
+   </g>
+   <g id="line2d_166">
+    <path d="M 395.880083 158.124182 
+L 398.030931 154.668639 
+L 400.181779 151.657052 
+L 401.615678 149.928682 
+L 403.049577 148.443582 
+L 404.483476 147.216088 
+L 405.917375 146.25805 
+L 407.351274 145.578716 
+L 408.785173 145.184644 
+L 410.219072 145.079639 
+L 411.652971 145.264713 
+L 413.08687 145.738081 
+L 414.520769 146.495173 
+L 415.954667 147.52868 
+L 417.388566 148.828625 
+L 418.822465 150.38246 
+L 420.973314 153.155807 
+L 423.124162 156.405938 
+L 423.841111 157.583347 
+M 438.89705 187.069753 
+L 441.764848 192.226308 
+L 443.915696 195.671496 
+L 446.066544 198.670946 
+L 447.500443 200.390365 
+L 448.934342 201.865926 
+L 450.368241 203.083384 
+L 451.80214 204.030987 
+L 453.236039 204.699587 
+L 454.669938 205.082729 
+L 456.103837 205.176715 
+L 457.537736 204.980639 
+L 458.971635 204.496391 
+L 460.405534 203.728648 
+L 461.839432 202.684821 
+L 463.273331 201.374985 
+L 464.70723 199.811786 
+L 466.858079 197.025575 
+L 469.008927 193.764244 
+L 471.159775 190.09856 
+L 474.027573 184.720512 
+L 478.32927 176.029549 
+L 484.064866 164.452584 
+L 486.932663 159.171358 
+L 489.083512 155.60353 
+L 491.23436 152.459374 
+L 493.385208 149.807113 
+L 494.819107 148.341112 
+L 496.253006 147.133707 
+L 497.686905 146.196553 
+L 499.120804 145.538697 
+L 500.554703 145.166489 
+L 501.988602 145.083523 
+L 503.422501 145.2906 
+L 504.8564 145.78572 
+L 506.290299 146.564103 
+L 507.724197 147.618237 
+L 509.158096 148.937944 
+L 510.591995 150.510485 
+L 512.742844 153.309522 
+L 514.893692 156.582008 
+L 517.04454 160.256933 
+L 517.04454 160.256933 
+" clip-path="url(#pc18bf5fd8c)" style="fill: none; stroke: #0000ff; stroke-linecap: square"/>
+    <g clip-path="url(#pc18bf5fd8c)">
+     <use xlink:href="#m3c4034e2a7" x="460.405534" y="203.728648" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="462.556382" y="202.062423" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="464.70723" y="199.811786" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="466.858079" y="197.025575" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="469.008927" y="193.764244" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="471.159775" y="190.09856" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="473.310624" y="186.108061" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="475.461472" y="181.879336" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="477.61232" y="177.50414" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="479.763169" y="173.077409" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="481.914017" y="168.695195" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="484.064866" y="164.452584" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="486.215714" y="160.441636" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="488.366562" y="156.74938" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="490.517411" y="153.455934" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="492.668259" y="150.632758" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="494.819107" y="148.341112" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="496.969956" y="146.630721" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="499.120804" y="145.538697" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="501.271652" y="145.088735" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="503.422501" y="145.2906" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="505.573349" y="146.13991" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="507.724197" y="147.618237" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="509.875046" y="149.693504" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="512.025894" y="152.32068" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="514.176743" y="155.442762" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="516.327591" y="158.992003" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+    </g>
+   </g>
+   <g id="patch_28">
+    <path d="M 387.105882 208.486957 
+L 387.105882 133.356522 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_29">
+    <path d="M 518.4 208.486957 
+L 518.4 133.356522 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_30">
+    <path d="M 387.105882 208.486957 
+L 518.4 208.486957 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_31">
+    <path d="M 387.105882 133.356522 
+L 518.4 133.356522 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="matplotlib.axis_11">
+    <g id="xtick_51">
+     <g id="line2d_167">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="387.105882" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_168">
+      <g>
+       <use xlink:href="#mad5646bafe" x="387.105882" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_52">
+     <g id="line2d_169">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="401.694118" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_170">
+      <g>
+       <use xlink:href="#mad5646bafe" x="401.694118" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_53">
+     <g id="line2d_171">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="416.282353" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_172">
+      <g>
+       <use xlink:href="#mad5646bafe" x="416.282353" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_54">
+     <g id="line2d_173">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="430.870588" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_174">
+      <g>
+       <use xlink:href="#mad5646bafe" x="430.870588" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_55">
+     <g id="line2d_175">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="445.458824" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_176">
+      <g>
+       <use xlink:href="#mad5646bafe" x="445.458824" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_56">
+     <g id="line2d_177">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="460.047059" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_178">
+      <g>
+       <use xlink:href="#mad5646bafe" x="460.047059" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_57">
+     <g id="line2d_179">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="474.635294" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_180">
+      <g>
+       <use xlink:href="#mad5646bafe" x="474.635294" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_58">
+     <g id="line2d_181">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="489.223529" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_182">
+      <g>
+       <use xlink:href="#mad5646bafe" x="489.223529" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_59">
+     <g id="line2d_183">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="503.811765" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_184">
+      <g>
+       <use xlink:href="#mad5646bafe" x="503.811765" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_60">
+     <g id="line2d_185">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="518.4" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_186">
+      <g>
+       <use xlink:href="#mad5646bafe" x="518.4" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+   <g id="matplotlib.axis_12">
+    <g id="ytick_31">
+     <g id="line2d_187">
+      <g>
+       <use xlink:href="#mebf891ec74" x="387.105882" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_188">
+      <g>
+       <use xlink:href="#m0be78051dd" x="518.4" y="208.486957" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_32">
+     <g id="line2d_189">
+      <g>
+       <use xlink:href="#mebf891ec74" x="387.105882" y="193.46087" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_190">
+      <g>
+       <use xlink:href="#m0be78051dd" x="518.4" y="193.46087" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_33">
+     <g id="line2d_191">
+      <g>
+       <use xlink:href="#mebf891ec74" x="387.105882" y="178.434783" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_192">
+      <g>
+       <use xlink:href="#m0be78051dd" x="518.4" y="178.434783" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_34">
+     <g id="line2d_193">
+      <g>
+       <use xlink:href="#mebf891ec74" x="387.105882" y="163.408696" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_194">
+      <g>
+       <use xlink:href="#m0be78051dd" x="518.4" y="163.408696" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_35">
+     <g id="line2d_195">
+      <g>
+       <use xlink:href="#mebf891ec74" x="387.105882" y="148.382609" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_196">
+      <g>
+       <use xlink:href="#m0be78051dd" x="518.4" y="148.382609" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_36">
+     <g id="line2d_197">
+      <g>
+       <use xlink:href="#mebf891ec74" x="387.105882" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_198">
+      <g>
+       <use xlink:href="#m0be78051dd" x="518.4" y="133.356522" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+  </g>
+  <g id="axes_7">
+   <g id="patch_32">
+    <path d="M 72 298.643478 
+L 203.294118 298.643478 
+L 203.294118 223.513043 
+L 72 223.513043 
+z
+" style="fill: #ffffff"/>
+   </g>
+   <g id="line2d_199">
+    <path d="M 80.7742 248.280704 
+L 82.925049 244.82516 
+L 85.075897 241.813574 
+L 86.509796 240.085204 
+L 87.943695 238.600103 
+L 89.377594 237.372609 
+L 90.811493 236.414571 
+L 92.245392 235.735238 
+L 93.679291 235.341166 
+L 95.113189 235.23616 
+L 96.547088 235.421235 
+L 97.980987 235.894603 
+L 99.414886 236.651695 
+L 100.848785 237.685202 
+L 102.282684 238.985147 
+L 103.716583 240.538981 
+L 105.867431 243.312329 
+L 108.01828 246.56246 
+L 108.735229 247.739869 
+M 123.791168 277.226275 
+L 126.658965 282.382829 
+L 128.809814 285.828018 
+L 130.960662 288.827468 
+L 132.394561 290.546887 
+L 133.82846 292.022448 
+L 135.262359 293.239906 
+L 136.696258 294.187509 
+L 138.130157 294.856108 
+L 139.564056 295.239251 
+L 140.997954 295.333237 
+L 142.431853 295.13716 
+L 143.865752 294.652913 
+L 145.299651 293.88517 
+L 146.73355 292.841342 
+L 148.167449 291.531507 
+L 149.601348 289.968308 
+L 151.752196 287.182097 
+L 153.903045 283.920766 
+L 156.053893 280.255082 
+L 158.921691 274.877034 
+L 163.223388 266.186071 
+L 168.958983 254.609106 
+L 171.826781 249.32788 
+L 173.977629 245.760052 
+L 176.128478 242.615896 
+L 178.279326 239.963635 
+L 179.713225 238.497634 
+L 181.147124 237.290229 
+L 182.581023 236.353075 
+L 184.014922 235.695219 
+L 185.448821 235.323011 
+L 186.882719 235.240045 
+L 188.316618 235.447121 
+L 189.750517 235.942241 
+L 191.184416 236.720625 
+L 192.618315 237.774759 
+L 194.052214 239.094466 
+L 195.486113 240.667007 
+L 197.636961 243.466044 
+L 199.78781 246.738529 
+L 201.938658 250.413455 
+L 201.938658 250.413455 
+" clip-path="url(#pbeb8c57666)" style="fill: none; stroke: #0000ff; stroke-linecap: square"/>
+    <g clip-path="url(#pbeb8c57666)">
+     <use xlink:href="#m3c4034e2a7" x="80.7742" y="248.280704" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="90.094543" y="236.859268" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="103.716583" y="240.538981" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="108.735229" y="247.739869" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="123.791168" y="277.226275" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="125.225067" y="279.874971" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="133.82846" y="292.022448" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="147.4505" y="292.218944" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="156.053893" y="280.255082" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="163.223388" y="266.186071" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="169.675933" y="253.241963" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="178.279326" y="239.963635" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="191.184416" y="236.720625" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="200.504759" y="247.922563" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+    </g>
+   </g>
+   <g id="patch_33">
+    <path d="M 72 298.643478 
+L 72 223.513043 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_34">
+    <path d="M 203.294118 298.643478 
+L 203.294118 223.513043 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_35">
+    <path d="M 72 298.643478 
+L 203.294118 298.643478 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_36">
+    <path d="M 72 223.513043 
+L 203.294118 223.513043 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="matplotlib.axis_13">
+    <g id="xtick_61">
+     <g id="line2d_200">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="72" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_201">
+      <g>
+       <use xlink:href="#mad5646bafe" x="72" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_62">
+     <g id="line2d_202">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="86.588235" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_203">
+      <g>
+       <use xlink:href="#mad5646bafe" x="86.588235" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_63">
+     <g id="line2d_204">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="101.176471" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_205">
+      <g>
+       <use xlink:href="#mad5646bafe" x="101.176471" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_64">
+     <g id="line2d_206">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="115.764706" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_207">
+      <g>
+       <use xlink:href="#mad5646bafe" x="115.764706" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_65">
+     <g id="line2d_208">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="130.352941" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_209">
+      <g>
+       <use xlink:href="#mad5646bafe" x="130.352941" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_66">
+     <g id="line2d_210">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="144.941176" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_211">
+      <g>
+       <use xlink:href="#mad5646bafe" x="144.941176" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_67">
+     <g id="line2d_212">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="159.529412" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_213">
+      <g>
+       <use xlink:href="#mad5646bafe" x="159.529412" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_68">
+     <g id="line2d_214">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="174.117647" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_215">
+      <g>
+       <use xlink:href="#mad5646bafe" x="174.117647" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_69">
+     <g id="line2d_216">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="188.705882" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_217">
+      <g>
+       <use xlink:href="#mad5646bafe" x="188.705882" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_70">
+     <g id="line2d_218">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="203.294118" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_219">
+      <g>
+       <use xlink:href="#mad5646bafe" x="203.294118" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+   <g id="matplotlib.axis_14">
+    <g id="ytick_37">
+     <g id="line2d_220">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_221">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_38">
+     <g id="line2d_222">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="283.617391" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_223">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="283.617391" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_39">
+     <g id="line2d_224">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="268.591304" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_225">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="268.591304" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_40">
+     <g id="line2d_226">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="253.565217" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_227">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="253.565217" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_41">
+     <g id="line2d_228">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="238.53913" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_229">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="238.53913" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_42">
+     <g id="line2d_230">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_231">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+  </g>
+  <g id="axes_8">
+   <g id="patch_37">
+    <path d="M 229.552941 298.643478 
+L 360.847059 298.643478 
+L 360.847059 223.513043 
+L 229.552941 223.513043 
+z
+" style="fill: #ffffff"/>
+   </g>
+   <g id="line2d_232">
+    <path d="M 238.327142 248.280704 
+L 240.47799 244.82516 
+L 242.628838 241.813574 
+L 244.062737 240.085204 
+L 245.496636 238.600103 
+L 246.930535 237.372609 
+L 248.364434 236.414571 
+L 249.798333 235.735238 
+L 251.232232 235.341166 
+L 252.666131 235.23616 
+L 254.10003 235.421235 
+L 255.533928 235.894603 
+L 256.967827 236.651695 
+L 258.401726 237.685202 
+L 259.835625 238.985147 
+L 261.269524 240.538981 
+L 263.420372 243.312329 
+L 265.571221 246.56246 
+L 266.28817 247.739869 
+M 281.344109 277.226275 
+L 284.211907 282.382829 
+L 286.362755 285.828018 
+L 288.513603 288.827468 
+L 289.947502 290.546887 
+L 291.381401 292.022448 
+L 292.8153 293.239906 
+L 294.249199 294.187509 
+L 295.683098 294.856108 
+L 297.116997 295.239251 
+L 298.550896 295.333237 
+L 299.984795 295.13716 
+L 301.418693 294.652913 
+L 302.852592 293.88517 
+L 304.286491 292.841342 
+L 305.72039 291.531507 
+L 307.154289 289.968308 
+L 309.305137 287.182097 
+L 311.455986 283.920766 
+L 313.606834 280.255082 
+L 316.474632 274.877034 
+L 320.776329 266.186071 
+L 326.511924 254.609106 
+L 329.379722 249.32788 
+L 331.53057 245.760052 
+L 333.681419 242.615896 
+L 335.832267 239.963635 
+L 337.266166 238.497634 
+L 338.700065 237.290229 
+L 340.133964 236.353075 
+L 341.567863 235.695219 
+L 343.001762 235.323011 
+L 344.435661 235.240045 
+L 345.86956 235.447121 
+L 347.303458 235.942241 
+L 348.737357 236.720625 
+L 350.171256 237.774759 
+L 351.605155 239.094466 
+L 353.039054 240.667007 
+L 355.189902 243.466044 
+L 357.340751 246.738529 
+L 359.491599 250.413455 
+L 359.491599 250.413455 
+" clip-path="url(#p661f2b1666)" style="fill: none; stroke: #0000ff; stroke-linecap: square"/>
+    <g clip-path="url(#p661f2b1666)">
+     <use xlink:href="#m3c4034e2a7" x="238.327142" y="248.280704" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="266.28817" y="247.739869" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="291.381401" y="292.022448" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="320.776329" y="266.186071" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="348.737357" y="236.720625" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+    </g>
+   </g>
+   <g id="patch_38">
+    <path d="M 229.552941 298.643478 
+L 229.552941 223.513043 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_39">
+    <path d="M 360.847059 298.643478 
+L 360.847059 223.513043 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_40">
+    <path d="M 229.552941 298.643478 
+L 360.847059 298.643478 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_41">
+    <path d="M 229.552941 223.513043 
+L 360.847059 223.513043 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="matplotlib.axis_15">
+    <g id="xtick_71">
+     <g id="line2d_233">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="229.552941" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_234">
+      <g>
+       <use xlink:href="#mad5646bafe" x="229.552941" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_72">
+     <g id="line2d_235">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="244.141176" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_236">
+      <g>
+       <use xlink:href="#mad5646bafe" x="244.141176" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_73">
+     <g id="line2d_237">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="258.729412" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_238">
+      <g>
+       <use xlink:href="#mad5646bafe" x="258.729412" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_74">
+     <g id="line2d_239">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="273.317647" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_240">
+      <g>
+       <use xlink:href="#mad5646bafe" x="273.317647" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_75">
+     <g id="line2d_241">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="287.905882" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_242">
+      <g>
+       <use xlink:href="#mad5646bafe" x="287.905882" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_76">
+     <g id="line2d_243">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="302.494118" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_244">
+      <g>
+       <use xlink:href="#mad5646bafe" x="302.494118" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_77">
+     <g id="line2d_245">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="317.082353" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_246">
+      <g>
+       <use xlink:href="#mad5646bafe" x="317.082353" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_78">
+     <g id="line2d_247">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="331.670588" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_248">
+      <g>
+       <use xlink:href="#mad5646bafe" x="331.670588" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_79">
+     <g id="line2d_249">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="346.258824" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_250">
+      <g>
+       <use xlink:href="#mad5646bafe" x="346.258824" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_80">
+     <g id="line2d_251">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="360.847059" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_252">
+      <g>
+       <use xlink:href="#mad5646bafe" x="360.847059" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+   <g id="matplotlib.axis_16">
+    <g id="ytick_43">
+     <g id="line2d_253">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_254">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_44">
+     <g id="line2d_255">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="283.617391" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_256">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="283.617391" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_45">
+     <g id="line2d_257">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="268.591304" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_258">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="268.591304" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_46">
+     <g id="line2d_259">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="253.565217" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_260">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="253.565217" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_47">
+     <g id="line2d_261">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="238.53913" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_262">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="238.53913" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_48">
+     <g id="line2d_263">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_264">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+  </g>
+  <g id="axes_9">
+   <g id="patch_42">
+    <path d="M 387.105882 298.643478 
+L 518.4 298.643478 
+L 518.4 223.513043 
+L 387.105882 223.513043 
+z
+" style="fill: #ffffff"/>
+   </g>
+   <g id="line2d_265">
+    <path d="M 395.880083 248.280704 
+L 398.030931 244.82516 
+L 400.181779 241.813574 
+L 401.615678 240.085204 
+L 403.049577 238.600103 
+L 404.483476 237.372609 
+L 405.917375 236.414571 
+L 407.351274 235.735238 
+L 408.785173 235.341166 
+L 410.219072 235.23616 
+L 411.652971 235.421235 
+L 413.08687 235.894603 
+L 414.520769 236.651695 
+L 415.954667 237.685202 
+L 417.388566 238.985147 
+L 418.822465 240.538981 
+L 420.973314 243.312329 
+L 423.124162 246.56246 
+L 423.841111 247.739869 
+M 438.89705 277.226275 
+L 441.764848 282.382829 
+L 443.915696 285.828018 
+L 446.066544 288.827468 
+L 447.500443 290.546887 
+L 448.934342 292.022448 
+L 450.368241 293.239906 
+L 451.80214 294.187509 
+L 453.236039 294.856108 
+L 454.669938 295.239251 
+L 456.103837 295.333237 
+L 457.537736 295.13716 
+L 458.971635 294.652913 
+L 460.405534 293.88517 
+L 461.839432 292.841342 
+L 463.273331 291.531507 
+L 464.70723 289.968308 
+L 466.858079 287.182097 
+L 469.008927 283.920766 
+L 471.159775 280.255082 
+L 474.027573 274.877034 
+L 478.32927 266.186071 
+L 484.064866 254.609106 
+L 486.932663 249.32788 
+L 489.083512 245.760052 
+L 491.23436 242.615896 
+L 493.385208 239.963635 
+L 494.819107 238.497634 
+L 496.253006 237.290229 
+L 497.686905 236.353075 
+L 499.120804 235.695219 
+L 500.554703 235.323011 
+L 501.988602 235.240045 
+L 503.422501 235.447121 
+L 504.8564 235.942241 
+L 506.290299 236.720625 
+L 507.724197 237.774759 
+L 509.158096 239.094466 
+L 510.591995 240.667007 
+L 512.742844 243.466044 
+L 514.893692 246.738529 
+L 517.04454 250.413455 
+L 517.04454 250.413455 
+" clip-path="url(#p93b7880e6d)" style="fill: none; stroke: #0000ff; stroke-linecap: square"/>
+    <g clip-path="url(#p93b7880e6d)">
+     <use xlink:href="#m3c4034e2a7" x="395.880083" y="248.280704" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+    </g>
+   </g>
+   <g id="patch_43">
+    <path d="M 387.105882 298.643478 
+L 387.105882 223.513043 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_44">
+    <path d="M 518.4 298.643478 
+L 518.4 223.513043 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_45">
+    <path d="M 387.105882 298.643478 
+L 518.4 298.643478 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_46">
+    <path d="M 387.105882 223.513043 
+L 518.4 223.513043 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="matplotlib.axis_17">
+    <g id="xtick_81">
+     <g id="line2d_266">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="387.105882" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_267">
+      <g>
+       <use xlink:href="#mad5646bafe" x="387.105882" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_82">
+     <g id="line2d_268">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="401.694118" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_269">
+      <g>
+       <use xlink:href="#mad5646bafe" x="401.694118" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_83">
+     <g id="line2d_270">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="416.282353" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_271">
+      <g>
+       <use xlink:href="#mad5646bafe" x="416.282353" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_84">
+     <g id="line2d_272">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="430.870588" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_273">
+      <g>
+       <use xlink:href="#mad5646bafe" x="430.870588" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_85">
+     <g id="line2d_274">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="445.458824" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_275">
+      <g>
+       <use xlink:href="#mad5646bafe" x="445.458824" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_86">
+     <g id="line2d_276">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="460.047059" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_277">
+      <g>
+       <use xlink:href="#mad5646bafe" x="460.047059" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_87">
+     <g id="line2d_278">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="474.635294" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_279">
+      <g>
+       <use xlink:href="#mad5646bafe" x="474.635294" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_88">
+     <g id="line2d_280">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="489.223529" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_281">
+      <g>
+       <use xlink:href="#mad5646bafe" x="489.223529" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_89">
+     <g id="line2d_282">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="503.811765" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_283">
+      <g>
+       <use xlink:href="#mad5646bafe" x="503.811765" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_90">
+     <g id="line2d_284">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="518.4" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_285">
+      <g>
+       <use xlink:href="#mad5646bafe" x="518.4" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+   <g id="matplotlib.axis_18">
+    <g id="ytick_49">
+     <g id="line2d_286">
+      <g>
+       <use xlink:href="#mebf891ec74" x="387.105882" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_287">
+      <g>
+       <use xlink:href="#m0be78051dd" x="518.4" y="298.643478" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_50">
+     <g id="line2d_288">
+      <g>
+       <use xlink:href="#mebf891ec74" x="387.105882" y="283.617391" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_289">
+      <g>
+       <use xlink:href="#m0be78051dd" x="518.4" y="283.617391" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_51">
+     <g id="line2d_290">
+      <g>
+       <use xlink:href="#mebf891ec74" x="387.105882" y="268.591304" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_291">
+      <g>
+       <use xlink:href="#m0be78051dd" x="518.4" y="268.591304" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_52">
+     <g id="line2d_292">
+      <g>
+       <use xlink:href="#mebf891ec74" x="387.105882" y="253.565217" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_293">
+      <g>
+       <use xlink:href="#m0be78051dd" x="518.4" y="253.565217" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_53">
+     <g id="line2d_294">
+      <g>
+       <use xlink:href="#mebf891ec74" x="387.105882" y="238.53913" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_295">
+      <g>
+       <use xlink:href="#m0be78051dd" x="518.4" y="238.53913" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_54">
+     <g id="line2d_296">
+      <g>
+       <use xlink:href="#mebf891ec74" x="387.105882" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_297">
+      <g>
+       <use xlink:href="#m0be78051dd" x="518.4" y="223.513043" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+  </g>
+  <g id="axes_10">
+   <g id="patch_47">
+    <path d="M 72 388.8 
+L 203.294118 388.8 
+L 203.294118 313.669565 
+L 72 313.669565 
+z
+" style="fill: #ffffff"/>
+   </g>
+   <g id="line2d_298">
+    <path d="M 80.7742 338.437226 
+L 82.925049 334.981682 
+L 85.075897 331.970096 
+L 86.509796 330.241726 
+L 87.943695 328.756625 
+L 89.377594 327.529131 
+L 90.811493 326.571093 
+L 92.245392 325.891759 
+L 93.679291 325.497688 
+L 95.113189 325.392682 
+L 96.547088 325.577757 
+L 97.980987 326.051125 
+L 99.414886 326.808217 
+L 100.848785 327.841723 
+L 102.282684 329.141669 
+L 103.716583 330.695503 
+L 105.867431 333.468851 
+L 108.01828 336.718981 
+L 108.735229 337.896391 
+M 123.791168 367.382796 
+L 126.658965 372.539351 
+L 128.809814 375.984539 
+L 130.960662 378.98399 
+L 132.394561 380.703409 
+L 133.82846 382.17897 
+L 135.262359 383.396428 
+L 136.696258 384.344031 
+L 138.130157 385.01263 
+L 139.564056 385.395772 
+L 140.997954 385.489759 
+L 142.431853 385.293682 
+L 143.865752 384.809435 
+L 145.299651 384.041692 
+L 146.73355 382.997864 
+L 148.167449 381.688029 
+L 149.601348 380.12483 
+L 151.752196 377.338618 
+L 153.903045 374.077288 
+L 156.053893 370.411603 
+L 158.921691 365.033556 
+L 163.223388 356.342593 
+L 168.958983 344.765628 
+L 171.826781 339.484401 
+L 173.977629 335.916573 
+L 176.128478 332.772418 
+L 178.279326 330.120157 
+L 179.713225 328.654156 
+L 181.147124 327.446751 
+L 182.581023 326.509597 
+L 184.014922 325.85174 
+L 185.448821 325.479533 
+L 186.882719 325.396567 
+L 188.316618 325.603643 
+L 189.750517 326.098763 
+L 191.184416 326.877147 
+L 192.618315 327.93128 
+L 194.052214 329.250988 
+L 195.486113 330.823529 
+L 197.636961 333.622566 
+L 199.78781 336.895051 
+L 201.938658 340.569977 
+L 201.938658 340.569977 
+" clip-path="url(#p7ba905148f)" style="fill: none; stroke: #0000ff; stroke-linecap: square"/>
+    <g clip-path="url(#p7ba905148f)">
+     <use xlink:href="#m3c4034e2a7" x="80.7742" y="338.437226" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="90.094543" y="327.01579" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="103.716583" y="330.695503" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="108.735229" y="337.896391" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="123.791168" y="367.382796" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="125.225067" y="370.031493" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="133.82846" y="382.17897" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="147.4505" y="382.375466" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="156.053893" y="370.411603" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="163.223388" y="356.342593" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="169.675933" y="343.398485" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="178.279326" y="330.120157" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="191.184416" y="326.877147" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="200.504759" y="338.079085" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+    </g>
+   </g>
+   <g id="patch_48">
+    <path d="M 72 388.8 
+L 72 313.669565 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_49">
+    <path d="M 203.294118 388.8 
+L 203.294118 313.669565 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_50">
+    <path d="M 72 388.8 
+L 203.294118 388.8 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_51">
+    <path d="M 72 313.669565 
+L 203.294118 313.669565 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="matplotlib.axis_19">
+    <g id="xtick_91">
+     <g id="line2d_299">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="72" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_300">
+      <g>
+       <use xlink:href="#mad5646bafe" x="72" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_92">
+     <g id="line2d_301">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="86.588235" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_302">
+      <g>
+       <use xlink:href="#mad5646bafe" x="86.588235" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_93">
+     <g id="line2d_303">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="101.176471" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_304">
+      <g>
+       <use xlink:href="#mad5646bafe" x="101.176471" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_94">
+     <g id="line2d_305">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="115.764706" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_306">
+      <g>
+       <use xlink:href="#mad5646bafe" x="115.764706" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_95">
+     <g id="line2d_307">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="130.352941" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_308">
+      <g>
+       <use xlink:href="#mad5646bafe" x="130.352941" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_96">
+     <g id="line2d_309">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="144.941176" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_310">
+      <g>
+       <use xlink:href="#mad5646bafe" x="144.941176" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_97">
+     <g id="line2d_311">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="159.529412" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_312">
+      <g>
+       <use xlink:href="#mad5646bafe" x="159.529412" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_98">
+     <g id="line2d_313">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="174.117647" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_314">
+      <g>
+       <use xlink:href="#mad5646bafe" x="174.117647" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_99">
+     <g id="line2d_315">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="188.705882" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_316">
+      <g>
+       <use xlink:href="#mad5646bafe" x="188.705882" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_100">
+     <g id="line2d_317">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="203.294118" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_318">
+      <g>
+       <use xlink:href="#mad5646bafe" x="203.294118" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+   <g id="matplotlib.axis_20">
+    <g id="ytick_55">
+     <g id="line2d_319">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_320">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_56">
+     <g id="line2d_321">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="373.773913" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_322">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="373.773913" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_57">
+     <g id="line2d_323">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="358.747826" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_324">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="358.747826" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_58">
+     <g id="line2d_325">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="343.721739" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_326">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="343.721739" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_59">
+     <g id="line2d_327">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="328.695652" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_328">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="328.695652" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_60">
+     <g id="line2d_329">
+      <g>
+       <use xlink:href="#mebf891ec74" x="72" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_330">
+      <g>
+       <use xlink:href="#m0be78051dd" x="203.294118" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+  </g>
+  <g id="axes_11">
+   <g id="patch_52">
+    <path d="M 229.552941 388.8 
+L 360.847059 388.8 
+L 360.847059 313.669565 
+L 229.552941 313.669565 
+z
+" style="fill: #ffffff"/>
+   </g>
+   <g id="line2d_331">
+    <path d="M 238.327142 338.437226 
+L 240.47799 334.981682 
+L 242.628838 331.970096 
+L 244.062737 330.241726 
+L 245.496636 328.756625 
+L 246.930535 327.529131 
+L 248.364434 326.571093 
+L 249.798333 325.891759 
+L 251.232232 325.497688 
+L 252.666131 325.392682 
+L 254.10003 325.577757 
+L 255.533928 326.051125 
+L 256.967827 326.808217 
+L 258.401726 327.841723 
+L 259.835625 329.141669 
+L 261.269524 330.695503 
+L 263.420372 333.468851 
+L 265.571221 336.718981 
+L 266.28817 337.896391 
+M 281.344109 367.382796 
+L 284.211907 372.539351 
+L 286.362755 375.984539 
+L 288.513603 378.98399 
+L 289.947502 380.703409 
+L 291.381401 382.17897 
+L 292.8153 383.396428 
+L 294.249199 384.344031 
+L 295.683098 385.01263 
+L 297.116997 385.395772 
+L 298.550896 385.489759 
+L 299.984795 385.293682 
+L 301.418693 384.809435 
+L 302.852592 384.041692 
+L 304.286491 382.997864 
+L 305.72039 381.688029 
+L 307.154289 380.12483 
+L 309.305137 377.338618 
+L 311.455986 374.077288 
+L 313.606834 370.411603 
+L 316.474632 365.033556 
+L 320.776329 356.342593 
+L 326.511924 344.765628 
+L 329.379722 339.484401 
+L 331.53057 335.916573 
+L 333.681419 332.772418 
+L 335.832267 330.120157 
+L 337.266166 328.654156 
+L 338.700065 327.446751 
+L 340.133964 326.509597 
+L 341.567863 325.85174 
+L 343.001762 325.479533 
+L 344.435661 325.396567 
+L 345.86956 325.603643 
+L 347.303458 326.098763 
+L 348.737357 326.877147 
+L 350.171256 327.93128 
+L 351.605155 329.250988 
+L 353.039054 330.823529 
+L 355.189902 333.622566 
+L 357.340751 336.895051 
+L 359.491599 340.569977 
+L 359.491599 340.569977 
+" clip-path="url(#pf42ed944b5)" style="fill: none; stroke: #0000ff; stroke-linecap: square"/>
+    <g clip-path="url(#pf42ed944b5)">
+     <use xlink:href="#m3c4034e2a7" x="281.344109" y="367.382796" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="287.079704" y="377.03731" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="298.550896" y="385.489759" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="310.022087" y="376.301003" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="317.191581" y="363.622845" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="323.644127" y="350.458118" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="330.813621" y="337.062424" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="341.567863" y="325.85174" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+     <use xlink:href="#m3c4034e2a7" x="353.756004" y="331.69996" style="fill: #0000ff; stroke: #000000; stroke-width: 0.5"/>
+    </g>
+   </g>
+   <g id="patch_53">
+    <path d="M 229.552941 388.8 
+L 229.552941 313.669565 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_54">
+    <path d="M 360.847059 388.8 
+L 360.847059 313.669565 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_55">
+    <path d="M 229.552941 388.8 
+L 360.847059 388.8 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_56">
+    <path d="M 229.552941 313.669565 
+L 360.847059 313.669565 
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="matplotlib.axis_21">
+    <g id="xtick_101">
+     <g id="line2d_332">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="229.552941" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_333">
+      <g>
+       <use xlink:href="#mad5646bafe" x="229.552941" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_102">
+     <g id="line2d_334">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="244.141176" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_335">
+      <g>
+       <use xlink:href="#mad5646bafe" x="244.141176" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_103">
+     <g id="line2d_336">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="258.729412" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_337">
+      <g>
+       <use xlink:href="#mad5646bafe" x="258.729412" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_104">
+     <g id="line2d_338">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="273.317647" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_339">
+      <g>
+       <use xlink:href="#mad5646bafe" x="273.317647" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_105">
+     <g id="line2d_340">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="287.905882" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_341">
+      <g>
+       <use xlink:href="#mad5646bafe" x="287.905882" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_106">
+     <g id="line2d_342">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="302.494118" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_343">
+      <g>
+       <use xlink:href="#mad5646bafe" x="302.494118" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_107">
+     <g id="line2d_344">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="317.082353" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_345">
+      <g>
+       <use xlink:href="#mad5646bafe" x="317.082353" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_108">
+     <g id="line2d_346">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="331.670588" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_347">
+      <g>
+       <use xlink:href="#mad5646bafe" x="331.670588" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_109">
+     <g id="line2d_348">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="346.258824" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_349">
+      <g>
+       <use xlink:href="#mad5646bafe" x="346.258824" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_110">
+     <g id="line2d_350">
+      <g>
+       <use xlink:href="#m441ccbbe42" x="360.847059" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_351">
+      <g>
+       <use xlink:href="#mad5646bafe" x="360.847059" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+   <g id="matplotlib.axis_22">
+    <g id="ytick_61">
+     <g id="line2d_352">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_353">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="388.8" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_62">
+     <g id="line2d_354">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="373.773913" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_355">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="373.773913" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_63">
+     <g id="line2d_356">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="358.747826" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_357">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="358.747826" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_64">
+     <g id="line2d_358">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="343.721739" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_359">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="343.721739" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_65">
+     <g id="line2d_360">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="328.695652" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_361">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="328.695652" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_66">
+     <g id="line2d_362">
+      <g>
+       <use xlink:href="#mebf891ec74" x="229.552941" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+     <g id="line2d_363">
+      <g>
+       <use xlink:href="#m0be78051dd" x="360.847059" y="313.669565" style="stroke: #000000; stroke-width: 0.5"/>
+      </g>
+     </g>
+    </g>
+   </g>
+  </g>
+ </g>
+ <defs>
+  <clipPath id="p9465a32b5a">
+   <rect x="72" y="43.2" width="131.294118" height="75.130435"/>
+  </clipPath>
+  <clipPath id="p7c063ba2d8">
+   <rect x="229.552941" y="43.2" width="131.294118" height="75.130435"/>
+  </clipPath>
+  <clipPath id="p06530ecabb">
+   <rect x="387.105882" y="43.2" width="131.294118" height="75.130435"/>
+  </clipPath>
+  <clipPath id="p7efc8b16c3">
+   <rect x="72" y="133.356522" width="131.294118" height="75.130435"/>
+  </clipPath>
+  <clipPath id="p162a2c8d97">
+   <rect x="229.552941" y="133.356522" width="131.294118" height="75.130435"/>
+  </clipPath>
+  <clipPath id="pc18bf5fd8c">
+   <rect x="387.105882" y="133.356522" width="131.294118" height="75.130435"/>
+  </clipPath>
+  <clipPath id="pbeb8c57666">
+   <rect x="72" y="223.513043" width="131.294118" height="75.130435"/>
+  </clipPath>
+  <clipPath id="p661f2b1666">
+   <rect x="229.552941" y="223.513043" width="131.294118" height="75.130435"/>
+  </clipPath>
+  <clipPath id="p93b7880e6d">
+   <rect x="387.105882" y="223.513043" width="131.294118" height="75.130435"/>
+  </clipPath>
+  <clipPath id="p7ba905148f">
+   <rect x="72" y="313.669565" width="131.294118" height="75.130435"/>
+  </clipPath>
+  <clipPath id="pf42ed944b5">
+   <rect x="229.552941" y="313.669565" width="131.294118" height="75.130435"/>
+  </clipPath>
+ </defs>
+</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pcolormesh_small.eps b/lib/matplotlib/tests/baseline_images/test_axes/pcolormesh_small.eps
new file mode 100644
index 000000000000..c96cc35aea08
--- /dev/null
+++ b/lib/matplotlib/tests/baseline_images/test_axes/pcolormesh_small.eps
@@ -0,0 +1,312 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%Title: pcolormesh_small.eps
+%%Creator: Matplotlib v3.6.0.dev2473+ga4ddf81873.d20220618, https://matplotlib.org/
+%%CreationDate: Sat Jun 18 21:17:11 2022
+%%Orientation: portrait
+%%BoundingBox: 18 180 594 612
+%%HiResBoundingBox: 18.000000 180.000000 594.000000 612.000000
+%%EndComments
+%%BeginProlog
+/mpldict 10 dict def
+mpldict begin
+/_d { bind def } bind def
+/m { moveto } _d
+/l { lineto } _d
+/r { rlineto } _d
+/c { curveto } _d
+/cl { closepath } _d
+/ce { closepath eofill } _d
+/box {
+      m
+      1 index 0 r
+      0 exch r
+      neg 0 r
+      cl
+    } _d
+/clipbox {
+      box
+      clip
+      newpath
+    } _d
+/sc { setcachedevice } _d
+end
+%%EndProlog
+mpldict begin
+18 180 translate
+576 432 0 0 clipbox
+gsave
+0 0 m
+576 0 l
+576 432 l
+0 432 l
+cl
+1.000 setgray
+fill
+grestore
+0.500 setlinewidth
+1 setlinejoin
+0 setlinecap
+[] 0 setdash
+0.000 setgray
+gsave
+131.294 345.6 72 43.2 clipbox
+144.211765 43.632866 m
+83.208395 129.816433 l
+119.371572 148.320555 l
+180.374942 62.136988 l
+144.211765 43.632866 l
+gsave
+0.500 0.000 0.000 setrgbcolor
+fill
+grestore
+stroke
+grestore
+gsave
+131.294 345.6 72 43.2 clipbox
+83.208395 129.816433 m
+144.211765 216 l
+180.374942 234.504122 l
+119.371572 148.320555 l
+83.208395 129.816433 l
+gsave
+0.000 0.000 0.500 setrgbcolor
+fill
+grestore
+stroke
+grestore
+gsave
+131.294 345.6 72 43.2 clipbox
+180.374942 62.136988 m
+119.371572 148.320555 l
+141.279737 190.467054 l
+202.283106 104.283487 l
+180.374942 62.136988 l
+gsave
+0.161 1.000 0.806 setrgbcolor
+fill
+grestore
+stroke
+grestore
+gsave
+131.294 345.6 72 43.2 clipbox
+119.371572 148.320555 m
+180.374942 234.504122 l
+202.283106 276.650621 l
+141.279737 190.467054 l
+119.371572 148.320555 l
+stroke
+grestore
+gsave
+131.294 345.6 72 43.2 clipbox
+202.283106 104.283487 m
+141.279737 190.467054 l
+141.279737 241.532946 l
+202.283106 155.349379 l
+202.283106 104.283487 l
+gsave
+0.000 0.000 0.714 setrgbcolor
+fill
+grestore
+stroke
+grestore
+gsave
+131.294 345.6 72 43.2 clipbox
+141.279737 190.467054 m
+202.283106 276.650621 l
+202.283106 327.716513 l
+141.279737 241.532946 l
+141.279737 190.467054 l
+stroke
+grestore
+gsave
+131.294 345.6 72 43.2 clipbox
+202.283106 155.349379 m
+141.279737 241.532946 l
+119.371572 283.679445 l
+180.374942 197.495878 l
+202.283106 155.349379 l
+stroke
+grestore
+gsave
+131.294 345.6 72 43.2 clipbox
+141.279737 241.532946 m
+202.283106 327.716513 l
+180.374942 369.863012 l
+119.371572 283.679445 l
+141.279737 241.532946 l
+stroke
+grestore
+gsave
+131.294 345.6 72 43.2 clipbox
+180.374942 197.495878 m
+119.371572 283.679445 l
+83.208395 302.183567 l
+144.211765 216 l
+180.374942 197.495878 l
+stroke
+grestore
+gsave
+131.294 345.6 72 43.2 clipbox
+119.371572 283.679445 m
+180.374942 369.863012 l
+144.211765 388.367134 l
+83.208395 302.183567 l
+119.371572 283.679445 l
+stroke
+grestore
+2.000 setlinewidth
+0.000 0.000 1.000 setrgbcolor
+gsave
+131.294 345.6 229.553 43.2 clipbox
+301.764706 43.632866 m
+240.761336 129.816433 l
+276.924513 148.320555 l
+337.927883 62.136988 l
+301.764706 43.632866 l
+gsave
+0.500 0.000 0.000 setrgbcolor
+fill
+grestore
+stroke
+grestore
+1.000 setgray
+gsave
+131.294 345.6 229.553 43.2 clipbox
+240.761336 129.816433 m
+301.764706 216 l
+337.927883 234.504122 l
+276.924513 148.320555 l
+240.761336 129.816433 l
+gsave
+0.000 0.000 0.500 setrgbcolor
+fill
+grestore
+stroke
+grestore
+0.000 0.000 1.000 setrgbcolor
+gsave
+131.294 345.6 229.553 43.2 clipbox
+337.927883 62.136988 m
+276.924513 148.320555 l
+298.832678 190.467054 l
+359.836047 104.283487 l
+337.927883 62.136988 l
+gsave
+0.161 1.000 0.806 setrgbcolor
+fill
+grestore
+stroke
+grestore
+1.000 setgray
+gsave
+131.294 345.6 229.553 43.2 clipbox
+276.924513 148.320555 m
+337.927883 234.504122 l
+359.836047 276.650621 l
+298.832678 190.467054 l
+276.924513 148.320555 l
+stroke
+grestore
+0.000 0.000 1.000 setrgbcolor
+gsave
+131.294 345.6 229.553 43.2 clipbox
+359.836047 104.283487 m
+298.832678 190.467054 l
+298.832678 241.532946 l
+359.836047 155.349379 l
+359.836047 104.283487 l
+gsave
+0.000 0.000 0.714 setrgbcolor
+fill
+grestore
+stroke
+grestore
+1.000 setgray
+gsave
+131.294 345.6 229.553 43.2 clipbox
+298.832678 190.467054 m
+359.836047 276.650621 l
+359.836047 327.716513 l
+298.832678 241.532946 l
+298.832678 190.467054 l
+stroke
+grestore
+0.000 0.000 1.000 setrgbcolor
+gsave
+131.294 345.6 229.553 43.2 clipbox
+359.836047 155.349379 m
+298.832678 241.532946 l
+276.924513 283.679445 l
+337.927883 197.495878 l
+359.836047 155.349379 l
+stroke
+grestore
+1.000 setgray
+gsave
+131.294 345.6 229.553 43.2 clipbox
+298.832678 241.532946 m
+359.836047 327.716513 l
+337.927883 369.863012 l
+276.924513 283.679445 l
+298.832678 241.532946 l
+stroke
+grestore
+0.000 0.000 1.000 setrgbcolor
+gsave
+131.294 345.6 229.553 43.2 clipbox
+337.927883 197.495878 m
+276.924513 283.679445 l
+240.761336 302.183567 l
+301.764706 216 l
+337.927883 197.495878 l
+stroke
+grestore
+1.000 setgray
+gsave
+131.294 345.6 229.553 43.2 clipbox
+276.924513 283.679445 m
+337.927883 369.863012 l
+301.764706 388.367134 l
+240.761336 302.183567 l
+276.924513 283.679445 l
+stroke
+grestore
+gsave
+<< /ShadingType 4
+   /ColorSpace [/DeviceRGB]
+   /BitsPerCoordinate 32
+   /BitsPerComponent 8
+   /BitsPerFlag 8
+   /AntiAlias true
+   /Decode [ -3697.69 4613.39 -4052.37 4484.37 0 1 0 1 0 1 ]
+   /DataSource <
+00800b99127ad4c0007f0000007e2a90007d6a604b00007f007fa9a91e7c6697312a3f53007e2a90007d6a604b00007f007f47b92a7df86e63000000007fa9a9
+1e7c6697312a3f53007f47b92a7df86e63000000008128c23c7b62ce1729ffcd007fa9a91e7c6697312a3f53008128c23c7b62ce1729ffcd00800b99127ad4c0
+007f0000007fa9a91e7c6697312a3f53007e2a90007d6a604b00007f00800b991280000096000000007fa9a91e7efc377d00001f00800b991280000096000000
+008128c23c808e0eae000000007fa9a91e7efc377d00001f008128c23c808e0eae000000007f47b92a7df86e63000000007fa9a91e7efc377d00001f007f47b9
+2a7df86e63000000007e2a90007d6a604b00007f007fa9a91e7efc377d00001f008128c23c7b62ce1729ffcd007f47b92a7df86e6300000000808e9e457d4f65
+6e0a3f60007f47b92a7df86e63000000007ff47a4d7f3bfcc500000000808e9e457d4f656e0a3f60007ff47a4d7f3bfcc50000000081d5835f7ca65c790000b6
+00808e9e457d4f656e0a3f600081d5835f7ca65c790000b6008128c23c7b62ce1729ffcd00808e9e457d4f656e0a3f60007f47b92a7df86e63000000008128c2
+3c808e0eae00000000808e9e457fe505b9000000008128c23c808e0eae0000000081d5835f81d19d1000000000808e9e457fe505b90000000081d5835f81d19d
+10000000007ff47a4d7f3bfcc500000000808e9e457fe505b9000000007ff47a4d7f3bfcc5000000007f47b92a7df86e6300000000808e9e457fe505b9000000
+0081d5835f7ca65c790000b6007ff47a4d7f3bfcc50000000080e4fed67eb5307100002d007ff47a4d7f3bfcc5000000007ff47a4d80c404680000000080e4fe
+d67eb5307100002d007ff47a4d80c404680000000081d5835f7e2e641d0000000080e4fed67eb5307100002d0081d5835f7e2e641d0000000081d5835f7ca65c
+790000b60080e4fed67eb5307100002d007ff47a4d7f3bfcc50000000081d5835f81d19d100000000080e4fed6814ad0bc00002d0081d5835f81d19d10000000
+0081d5835f8359a4b30000b60080e4fed6814ad0bc00002d0081d5835f8359a4b30000b6007ff47a4d80c404680000000080e4fed6814ad0bc00002d007ff47a
+4d80c40468000000007ff47a4d7f3bfcc50000000080e4fed6814ad0bc00002d0081d5835f7e2e641d000000007ff47a4d80c4046800000000808e9e45801afb
+73000000007ff47a4d80c40468000000007f47b92a820792ca00000000808e9e45801afb73000000007f47b92a820792ca000000008128c23c7f71f27f000000
+00808e9e45801afb73000000008128c23c7f71f27f0000000081d5835f7e2e641d00000000808e9e45801afb73000000007ff47a4d80c404680000000081d583
+5f8359a4b30000b600808e9e4582b09bbf0a3f600081d5835f8359a4b30000b6008128c23c849d331529ffcd00808e9e4582b09bbf0a3f60008128c23c849d33
+1529ffcd007f47b92a820792ca00000000808e9e4582b09bbf0a3f60007f47b92a820792ca000000007ff47a4d80c4046800000000808e9e4582b09bbf0a3f60
+008128c23c7f71f27f000000007f47b92a820792ca000000007fa9a91e8103c9b000001f007f47b92a820792ca000000007e2a90008295a0e200007f007fa9a9
+1e8103c9b000001f007e2a90008295a0e200007f00800b991280000096000000007fa9a91e8103c9b000001f00800b991280000096000000008128c23c7f71f2
+7f000000007fa9a91e8103c9b000001f007f47b92a820792ca000000008128c23c849d331529ffcd007fa9a91e839969fc2a3f53008128c23c849d331529ffcd
+00800b9912852b412d7f0000007fa9a91e839969fc2a3f5300800b9912852b412d7f0000007e2a90008295a0e200007f007fa9a91e839969fc2a3f53007e2a90
+008295a0e200007f007f47b92a820792ca000000007fa9a91e839969fc2a3f53
+>
+>>
+shfill
+grestore
+
+end
+showpage
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pie_ccw_true.png b/lib/matplotlib/tests/baseline_images/test_axes/pie_ccw_true.png
index 8af5f62b5526..c5236a34b9e1 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/pie_ccw_true.png and b/lib/matplotlib/tests/baseline_images/test_axes/pie_ccw_true.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pie_center_radius.png b/lib/matplotlib/tests/baseline_images/test_axes/pie_center_radius.png
index 1f925b75d9d3..64b2244711f9 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/pie_center_radius.png and b/lib/matplotlib/tests/baseline_images/test_axes/pie_center_radius.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pie_default.png b/lib/matplotlib/tests/baseline_images/test_axes/pie_default.png
index 1c0c6c2c0577..f3935a9e159a 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/pie_default.png and b/lib/matplotlib/tests/baseline_images/test_axes/pie_default.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pie_frame_grid.png b/lib/matplotlib/tests/baseline_images/test_axes/pie_frame_grid.png
index 4eea9fb7c157..4e4edbeed0ed 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/pie_frame_grid.png and b/lib/matplotlib/tests/baseline_images/test_axes/pie_frame_grid.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pie_linewidth_0.png b/lib/matplotlib/tests/baseline_images/test_axes/pie_linewidth_0.png
index 18acc069100e..e814e061205a 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/pie_linewidth_0.png and b/lib/matplotlib/tests/baseline_images/test_axes/pie_linewidth_0.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pie_linewidth_2.png b/lib/matplotlib/tests/baseline_images/test_axes/pie_linewidth_2.png
index 68fc84a4d596..e12d743fbc45 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/pie_linewidth_2.png and b/lib/matplotlib/tests/baseline_images/test_axes/pie_linewidth_2.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pie_no_label.png b/lib/matplotlib/tests/baseline_images/test_axes/pie_no_label.png
index d2d651e421dc..c6fd5262acce 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/pie_no_label.png and b/lib/matplotlib/tests/baseline_images/test_axes/pie_no_label.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pie_rotatelabels_true.png b/lib/matplotlib/tests/baseline_images/test_axes/pie_rotatelabels_true.png
index 91664207dee7..d5875752c3cd 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_axes/pie_rotatelabels_true.png and b/lib/matplotlib/tests/baseline_images/test_axes/pie_rotatelabels_true.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pdf/multi_font_type3.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pdf/multi_font_type3.pdf
new file mode 100644
index 000000000000..a148a7d571b1
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_backend_pdf/multi_font_type3.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pdf/multi_font_type42.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pdf/multi_font_type42.pdf
new file mode 100644
index 000000000000..e33f8d803b12
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_backend_pdf/multi_font_type42.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_mixedmode.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_mixedmode.pdf
index fdbb20349c42..fd7cf7a5c0d1 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_mixedmode.pdf and b/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_mixedmode.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_pdflatex.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_pdflatex.pdf
index f9418746d453..8b5a2aaca9e6 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_pdflatex.pdf and b/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_pdflatex.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_rcupdate1.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_rcupdate1.pdf
index 02fe1fcef54c..94a41dff6996 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_rcupdate1.pdf and b/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_rcupdate1.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_rcupdate2.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_rcupdate2.pdf
index b5f395422463..d201723e06b9 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_rcupdate2.pdf and b/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_rcupdate2.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_ps/coloredhatcheszerolw.eps b/lib/matplotlib/tests/baseline_images/test_backend_ps/coloredhatcheszerolw.eps
new file mode 100644
index 000000000000..c0994b3116a5
--- /dev/null
+++ b/lib/matplotlib/tests/baseline_images/test_backend_ps/coloredhatcheszerolw.eps
@@ -0,0 +1,216 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%Title: coloredhatcheszerolw.eps
+%%Creator: Matplotlib v3.6.0.dev1993+g86a08ee.d20220407, https://matplotlib.org/
+%%CreationDate: Thu Apr  7 11:52:41 2022
+%%Orientation: portrait
+%%BoundingBox: 18 180 594 612
+%%HiResBoundingBox: 18.000000 180.000000 594.000000 612.000000
+%%EndComments
+%%BeginProlog
+/mpldict 10 dict def
+mpldict begin
+/_d { bind def } bind def
+/m { moveto } _d
+/l { lineto } _d
+/r { rlineto } _d
+/c { curveto } _d
+/cl { closepath } _d
+/ce { closepath eofill } _d
+/box {
+      m
+      1 index 0 r
+      0 exch r
+      neg 0 r
+      cl
+    } _d
+/clipbox {
+      box
+      clip
+      newpath
+    } _d
+/sc { setcachedevice } _d
+end
+%%EndProlog
+mpldict begin
+18 180 translate
+576 432 0 0 clipbox
+gsave
+0 0 m
+576 0 l
+576 432 l
+0 432 l
+cl
+1.000 setgray
+fill
+grestore
+1.000 0.000 0.000 setrgbcolor
+gsave
+446.4 345.6 72 43.2 clipbox
+72 -129.6 m
+131.193332 -129.6 187.970227 -111.392702 229.826234 -78.988052 c
+271.68224 -46.583402 295.2 -2.627096 295.2 43.2 c
+295.2 89.027096 271.68224 132.983402 229.826234 165.388052 c
+187.970227 197.792702 131.193332 216 72 216 c
+12.806668 216 -43.970227 197.792702 -85.826234 165.388052 c
+-127.68224 132.983402 -151.2 89.027096 -151.2 43.2 c
+-151.2 -2.627096 -127.68224 -46.583402 -85.826234 -78.988052 c
+-43.970227 -111.392702 12.806668 -129.6 72 -129.6 c
+cl
+  << /PatternType 1
+     /PaintType 2
+     /TilingType 2
+     /BBox[0 0 72 72]
+     /XStep 72
+     /YStep 72
+
+     /PaintProc {
+        pop
+        1 setlinewidth
+-36 36 m
+36 108 l
+-24 24 m
+48 96 l
+-12 12 m
+60 84 l
+0 0 m
+72 72 l
+12 -12 m
+84 60 l
+24 -24 m
+96 48 l
+36 -36 m
+108 36 l
+
+        gsave
+        fill
+        grestore
+        stroke
+     } bind
+   >>
+   matrix
+   0 432 translate
+   makepattern
+   /H0 exch def
+gsave
+1.000000 0.000000 0.000000 H0 setpattern fill grestore
+grestore
+0.200 setlinewidth
+0 setlinejoin
+0 setlinecap
+[] 0 setdash
+0.000 0.500 0.000 setrgbcolor
+gsave
+446.4 345.6 72 43.2 clipbox
+295.2 129.6 m
+324.796666 129.6 353.185114 138.703649 374.113117 154.905974 c
+395.04112 171.108299 406.8 193.086452 406.8 216 c
+406.8 238.913548 395.04112 260.891701 374.113117 277.094026 c
+353.185114 293.296351 324.796666 302.4 295.2 302.4 c
+265.603334 302.4 237.214886 293.296351 216.286883 277.094026 c
+195.35888 260.891701 183.6 238.913548 183.6 216 c
+183.6 193.086452 195.35888 171.108299 216.286883 154.905974 c
+237.214886 138.703649 265.603334 129.6 295.2 129.6 c
+cl
+  << /PatternType 1
+     /PaintType 2
+     /TilingType 2
+     /BBox[0 0 72 72]
+     /XStep 72
+     /YStep 72
+
+     /PaintProc {
+        pop
+        1 setlinewidth
+0 6 m
+72 6 l
+0 18 m
+72 18 l
+0 30 m
+72 30 l
+0 42 m
+72 42 l
+0 54 m
+72 54 l
+0 66 m
+72 66 l
+6 0 m
+6 72 l
+18 0 m
+18 72 l
+30 0 m
+30 72 l
+42 0 m
+42 72 l
+54 0 m
+54 72 l
+66 0 m
+66 72 l
+
+        gsave
+        fill
+        grestore
+        stroke
+     } bind
+   >>
+   matrix
+   0 432 translate
+   makepattern
+   /H1 exch def
+gsave
+0.000000 0.500000 0.000000 H1 setpattern fill grestore
+stroke
+grestore
+0.000 0.000 1.000 setrgbcolor
+gsave
+446.4 345.6 72 43.2 clipbox
+518.4 250.56 m
+536.158 250.56 553.191068 265.125838 565.74787 291.049559 c
+578.304672 316.973279 585.36 352.138323 585.36 388.8 c
+585.36 425.461677 578.304672 460.626721 565.74787 486.550441 c
+553.191068 512.474162 536.158 527.04 518.4 527.04 c
+500.642 527.04 483.608932 512.474162 471.05213 486.550441 c
+458.495328 460.626721 451.44 425.461677 451.44 388.8 c
+451.44 352.138323 458.495328 316.973279 471.05213 291.049559 c
+483.608932 265.125838 500.642 250.56 518.4 250.56 c
+cl
+  << /PatternType 1
+     /PaintType 2
+     /TilingType 2
+     /BBox[0 0 72 72]
+     /XStep 72
+     /YStep 72
+
+     /PaintProc {
+        pop
+        1 setlinewidth
+-36 36 m
+36 -36 l
+-24 48 m
+48 -24 l
+-12 60 m
+60 -12 l
+0 72 m
+72 0 l
+12 84 m
+84 12 l
+24 96 m
+96 24 l
+36 108 m
+108 36 l
+
+        gsave
+        fill
+        grestore
+        stroke
+     } bind
+   >>
+   matrix
+   0 432 translate
+   makepattern
+   /H2 exch def
+gsave
+0.000000 0.000000 1.000000 H2 setpattern fill grestore
+grestore
+
+end
+showpage
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_ps/multi_font_type3.eps b/lib/matplotlib/tests/baseline_images/test_backend_ps/multi_font_type3.eps
new file mode 100644
index 000000000000..efc8fc9416a7
--- /dev/null
+++ b/lib/matplotlib/tests/baseline_images/test_backend_ps/multi_font_type3.eps
@@ -0,0 +1,521 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%Title: multi_font_type3.eps
+%%Creator: Matplotlib v3.6.0.dev2856+g4848cedd6d.d20220807, https://matplotlib.org/
+%%CreationDate: Sun Aug  7 16:45:01 2022
+%%Orientation: portrait
+%%BoundingBox: 18 180 594 612
+%%HiResBoundingBox: 18.000000 180.000000 594.000000 612.000000
+%%EndComments
+%%BeginProlog
+/mpldict 12 dict def
+mpldict begin
+/_d { bind def } bind def
+/m { moveto } _d
+/l { lineto } _d
+/r { rlineto } _d
+/c { curveto } _d
+/cl { closepath } _d
+/ce { closepath eofill } _d
+/box {
+      m
+      1 index 0 r
+      0 exch r
+      neg 0 r
+      cl
+    } _d
+/clipbox {
+      box
+      clip
+      newpath
+    } _d
+/sc { setcachedevice } _d
+%!PS-Adobe-3.0 Resource-Font
+%%Creator: Converted from TrueType to Type 3 by Matplotlib.
+10 dict begin
+/FontName /DejaVuSans def
+/PaintType 0 def
+/FontMatrix [0.00048828125 0 0 0.00048828125 0 0] def
+/FontBBox [-2090 -948 3673 2524] def
+/FontType 3 def
+/Encoding [/space /exclam /b /a /e /h /i /n /r /T /t /w] def
+/CharStrings 13 dict dup begin
+/.notdef 0 def
+/space{651 0 0 0 0 0 sc
+ce} _d
+/exclam{821 0 309 0 512 1493 sc
+309 254 m
+512 254 l
+512 0 l
+309 0 l
+309 254 l
+
+309 1493 m
+512 1493 l
+512 838 l
+492 481 l
+330 481 l
+309 838 l
+309 1493 l
+
+ce} _d
+/b{1300 0 186 -29 1188 1556 sc
+997 559 m
+997 694 969 800 913 877 c
+858 954 781 993 684 993 c
+587 993 510 954 454 877 c
+399 800 371 694 371 559 c
+371 424 399 317 454 240 c
+510 163 587 125 684 125 c
+781 125 858 163 913 240 c
+969 317 997 424 997 559 c
+
+371 950 m
+410 1017 458 1066 517 1098 c
+576 1131 647 1147 729 1147 c
+865 1147 975 1093 1060 985 c
+1145 877 1188 735 1188 559 c
+1188 383 1145 241 1060 133 c
+975 25 865 -29 729 -29 c
+647 -29 576 -13 517 19 c
+458 52 410 101 371 168 c
+371 0 l
+186 0 l
+186 1556 l
+371 1556 l
+371 950 l
+
+ce} _d
+/a{1255 0 123 -29 1069 1147 sc
+702 563 m
+553 563 450 546 393 512 c
+336 478 307 420 307 338 c
+307 273 328 221 371 182 c
+414 144 473 125 547 125 c
+649 125 731 161 792 233 c
+854 306 885 402 885 522 c
+885 563 l
+702 563 l
+
+1069 639 m
+1069 0 l
+885 0 l
+885 170 l
+843 102 791 52 728 19 c
+665 -13 589 -29 498 -29 c
+383 -29 292 3 224 67 c
+157 132 123 218 123 326 c
+123 452 165 547 249 611 c
+334 675 460 707 627 707 c
+885 707 l
+885 725 l
+885 810 857 875 801 921 c
+746 968 668 991 567 991 c
+503 991 441 983 380 968 c
+319 953 261 930 205 899 c
+205 1069 l
+272 1095 338 1114 401 1127 c
+464 1140 526 1147 586 1147 c
+748 1147 869 1105 949 1021 c
+1029 937 1069 810 1069 639 c
+
+ce} _d
+/e{1260 0 113 -29 1151 1147 sc
+1151 606 m
+1151 516 l
+305 516 l
+313 389 351 293 419 226 c
+488 160 583 127 705 127 c
+776 127 844 136 910 153 c
+977 170 1043 196 1108 231 c
+1108 57 l
+1042 29 974 8 905 -7 c
+836 -22 765 -29 694 -29 c
+515 -29 374 23 269 127 c
+165 231 113 372 113 549 c
+113 732 162 878 261 985 c
+360 1093 494 1147 662 1147 c
+813 1147 932 1098 1019 1001 c
+1107 904 1151 773 1151 606 c
+
+967 660 m
+966 761 937 841 882 901 c
+827 961 755 991 664 991 c
+561 991 479 962 417 904 c
+356 846 320 764 311 659 c
+967 660 l
+
+ce} _d
+/h{1298 0 186 0 1124 1556 sc
+1124 676 m
+1124 0 l
+940 0 l
+940 670 l
+940 776 919 855 878 908 c
+837 961 775 987 692 987 c
+593 987 514 955 457 892 c
+400 829 371 742 371 633 c
+371 0 l
+186 0 l
+186 1556 l
+371 1556 l
+371 946 l
+415 1013 467 1064 526 1097 c
+586 1130 655 1147 733 1147 c
+862 1147 959 1107 1025 1027 c
+1091 948 1124 831 1124 676 c
+
+ce} _d
+/i{569 0 193 0 377 1556 sc
+193 1120 m
+377 1120 l
+377 0 l
+193 0 l
+193 1120 l
+
+193 1556 m
+377 1556 l
+377 1323 l
+193 1323 l
+193 1556 l
+
+ce} _d
+/n{1298 0 186 0 1124 1147 sc
+1124 676 m
+1124 0 l
+940 0 l
+940 670 l
+940 776 919 855 878 908 c
+837 961 775 987 692 987 c
+593 987 514 955 457 892 c
+400 829 371 742 371 633 c
+371 0 l
+186 0 l
+186 1120 l
+371 1120 l
+371 946 l
+415 1013 467 1064 526 1097 c
+586 1130 655 1147 733 1147 c
+862 1147 959 1107 1025 1027 c
+1091 948 1124 831 1124 676 c
+
+ce} _d
+/r{842 0 186 0 842 1147 sc
+842 948 m
+821 960 799 969 774 974 c
+750 980 723 983 694 983 c
+590 983 510 949 454 881 c
+399 814 371 717 371 590 c
+371 0 l
+186 0 l
+186 1120 l
+371 1120 l
+371 946 l
+410 1014 460 1064 522 1097 c
+584 1130 659 1147 748 1147 c
+761 1147 775 1146 790 1144 c
+805 1143 822 1140 841 1137 c
+842 948 l
+
+ce} _d
+/T{1251 0 -6 0 1257 1493 sc
+-6 1493 m
+1257 1493 l
+1257 1323 l
+727 1323 l
+727 0 l
+524 0 l
+524 1323 l
+-6 1323 l
+-6 1493 l
+
+ce} _d
+/t{803 0 55 0 754 1438 sc
+375 1438 m
+375 1120 l
+754 1120 l
+754 977 l
+375 977 l
+375 369 l
+375 278 387 219 412 193 c
+437 167 488 154 565 154 c
+754 154 l
+754 0 l
+565 0 l
+423 0 325 26 271 79 c
+217 132 190 229 190 369 c
+190 977 l
+55 977 l
+55 1120 l
+190 1120 l
+190 1438 l
+375 1438 l
+
+ce} _d
+/w{1675 0 86 0 1589 1120 sc
+86 1120 m
+270 1120 l
+500 246 l
+729 1120 l
+946 1120 l
+1176 246 l
+1405 1120 l
+1589 1120 l
+1296 0 l
+1079 0 l
+838 918 l
+596 0 l
+379 0 l
+86 1120 l
+
+ce} _d
+end readonly def
+
+/BuildGlyph {
+ exch begin
+ CharStrings exch
+ 2 copy known not {pop /.notdef} if
+ true 3 1 roll get exec
+ end
+} _d
+
+/BuildChar {
+ 1 index /Encoding get exch get
+ 1 index /BuildGlyph get exec
+} _d
+
+FontName currentdict end definefont pop
+%!PS-Adobe-3.0 Resource-Font
+%%Creator: Converted from TrueType to Type 3 by Matplotlib.
+10 dict begin
+/FontName /WenQuanYiZenHei def
+/PaintType 0 def
+/FontMatrix [0.0009765625 0 0 0.0009765625 0 0] def
+/FontBBox [-129 -304 1076 986] def
+/FontType 3 def
+/Encoding [/uni51E0 /uni6C49 /uni4E2A /uni5B57] def
+/CharStrings 5 dict dup begin
+/.notdef 0 def
+/uni51E0{1024 0 34 -126 1004 818 sc
+935 257 m
+947 232 970 219 1004 217 c
+974 -26 l
+973 -40 968 -51 960 -60 c
+955 -63 950 -65 943 -65 c
+729 -65 l
+697 -65 670 -55 649 -34 c
+628 -14 617 12 615 43 c
+614 75 613 193 613 397 c
+613 602 614 719 616 748 c
+393 748 l
+394 395 l
+391 256 361 144 302 58 c
+250 -21 184 -82 104 -126 c
+89 -96 66 -77 34 -68 c
+119 -34 188 23 240 103 c
+292 184 318 281 318 395 c
+317 818 l
+692 818 l
+692 55 l
+692 42 695 30 702 20 c
+709 11 719 6 730 6 c
+886 6 l
+898 7 905 12 908 23 c
+911 42 912 62 913 81 c
+935 257 l
+
+ce} _d
+/uni6C49{1024 0 17 -119 990 820 sc
+612 211 m
+536 349 488 512 468 699 c
+447 699 426 698 405 697 c
+407 719 407 741 405 763 c
+445 761 485 760 526 760 c
+871 760 l
+851 534 793 348 696 202 c
+769 91 867 2 990 -65 c
+963 -76 942 -94 928 -119 c
+819 -56 727 31 653 143 c
+561 27 446 -58 307 -112 c
+289 -89 268 -69 243 -53 c
+392 -2 515 86 612 211 c
+
+535 700 m
+552 534 592 391 655 271 c
+735 396 782 539 796 700 c
+535 700 l
+
+151 -118 m
+123 -102 88 -93 47 -92 c
+76 -38 107 24 138 93 c
+169 162 215 283 274 454 c
+315 433 l
+199 54 l
+151 -118 l
+
+230 457 m
+166 408 l
+17 544 l
+80 594 l
+230 457 l
+
+248 626 m
+202 677 152 724 97 768 c
+157 820 l
+214 773 268 723 317 670 c
+248 626 l
+
+ce} _d
+/uni4E2A{1024 0 14 -123 980 833 sc
+547 -123 m
+520 -120 492 -120 464 -123 c
+467 -72 468 -21 468 30 c
+468 362 l
+468 413 467 465 464 516 c
+492 513 520 513 547 516 c
+545 465 544 413 544 362 c
+544 30 l
+544 -21 545 -72 547 -123 c
+
+980 427 m
+955 410 939 387 931 358 c
+846 384 767 429 695 494 c
+624 559 563 631 514 711 c
+383 520 236 378 71 285 c
+59 314 40 337 14 354 c
+113 405 204 471 285 550 c
+367 630 433 724 484 833 c
+499 822 515 813 531 805 c
+537 808 l
+542 800 l
+549 796 557 792 564 789 c
+555 775 l
+614 672 682 590 759 531 c
+824 484 898 450 980 427 c
+
+ce} _d
+/uni5B57{1024 0 32 -132 982 872 sc
+982 285 m
+980 264 980 243 982 222 c
+943 224 904 225 865 225 c
+555 225 l
+555 -29 l
+555 -54 545 -76 525 -95 c
+496 -120 444 -132 368 -131 c
+376 -98 368 -68 344 -43 c
+366 -46 392 -47 422 -47 c
+452 -48 470 -46 475 -42 c
+480 -38 483 -27 483 -9 c
+483 225 l
+148 225 l
+109 225 71 224 32 222 c
+34 243 34 264 32 285 c
+71 283 109 282 148 282 c
+483 282 l
+483 355 l
+648 506 l
+317 506 l
+278 506 239 505 200 503 c
+203 524 203 545 200 566 c
+239 564 278 563 317 563 c
+761 563 l
+769 498 l
+748 493 730 483 714 469 c
+555 323 l
+555 282 l
+865 282 l
+904 282 943 283 982 285 c
+
+131 562 m
+59 562 l
+59 753 l
+468 752 l
+390 807 l
+435 872 l
+542 798 l
+510 752 l
+925 752 l
+925 562 l
+852 562 l
+852 695 l
+131 695 l
+131 562 l
+
+ce} _d
+end readonly def
+
+/BuildGlyph {
+ exch begin
+ CharStrings exch
+ 2 copy known not {pop /.notdef} if
+ true 3 1 roll get exec
+ end
+} _d
+
+/BuildChar {
+ 1 index /Encoding get exch get
+ 1 index /BuildGlyph get exec
+} _d
+
+FontName currentdict end definefont pop
+end
+%%EndProlog
+mpldict begin
+18 180 translate
+576 432 0 0 clipbox
+gsave
+0 0 m
+576 0 l
+576 432 l
+0 432 l
+cl
+1.000 setgray
+fill
+grestore
+0.000 setgray
+/DejaVuSans 27.000 selectfont
+gsave
+
+86.4 205.2 translate
+0 rotate
+0.000000 0 m /T glyphshow
+16.492676 0 m /h glyphshow
+33.604980 0 m /e glyphshow
+50.216309 0 m /r glyphshow
+61.316895 0 m /e glyphshow
+77.928223 0 m /space glyphshow
+86.510742 0 m /a glyphshow
+103.056152 0 m /r glyphshow
+114.156738 0 m /e glyphshow
+130.768066 0 m /space glyphshow
+grestore
+/WenQuanYiZenHei 27.000 selectfont
+gsave
+
+86.4 205.2 translate
+0 rotate
+139.350586 0 m /uni51E0 glyphshow
+166.350586 0 m /uni4E2A glyphshow
+193.350586 0 m /uni6C49 glyphshow
+220.350586 0 m /uni5B57 glyphshow
+grestore
+/DejaVuSans 27.000 selectfont
+gsave
+
+86.4 205.2 translate
+0 rotate
+247.350586 0 m /space glyphshow
+255.933105 0 m /i glyphshow
+263.434570 0 m /n glyphshow
+280.546875 0 m /space glyphshow
+289.129395 0 m /b glyphshow
+306.268066 0 m /e glyphshow
+322.879395 0 m /t glyphshow
+333.465820 0 m /w glyphshow
+355.548340 0 m /e glyphshow
+372.159668 0 m /e glyphshow
+388.770996 0 m /n glyphshow
+405.883301 0 m /exclam glyphshow
+grestore
+
+end
+showpage
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_ps/multi_font_type42.eps b/lib/matplotlib/tests/baseline_images/test_backend_ps/multi_font_type42.eps
new file mode 100644
index 000000000000..472824330da4
--- /dev/null
+++ b/lib/matplotlib/tests/baseline_images/test_backend_ps/multi_font_type42.eps
@@ -0,0 +1,361 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%Title: multi_font_type42.eps
+%%Creator: Matplotlib v3.6.0.dev2856+g4848cedd6d.d20220807, https://matplotlib.org/
+%%CreationDate: Sun Aug  7 16:45:01 2022
+%%Orientation: portrait
+%%BoundingBox: 18 180 594 612
+%%HiResBoundingBox: 18.000000 180.000000 594.000000 612.000000
+%%EndComments
+%%BeginProlog
+/mpldict 12 dict def
+mpldict begin
+/_d { bind def } bind def
+/m { moveto } _d
+/l { lineto } _d
+/r { rlineto } _d
+/c { curveto } _d
+/cl { closepath } _d
+/ce { closepath eofill } _d
+/box {
+      m
+      1 index 0 r
+      0 exch r
+      neg 0 r
+      cl
+    } _d
+/clipbox {
+      box
+      clip
+      newpath
+    } _d
+/sc { setcachedevice } _d
+%!PS-TrueTypeFont-1.0-2.22937
+%%Title: unknown
+%%Creator: Converted from TrueType to type 42 by PPR
+15 dict begin
+/FontName /DejaVuSans def
+/PaintType 0 def
+/FontMatrix[1 0 0 1 0 0]def
+/FontBBox[-1021 -463 1793 1232]def
+/FontType 42 def
+/Encoding StandardEncoding def
+/FontInfo 10 dict dup begin
+/FamilyName (unknown) def
+/FullName (unknown) def
+/Weight (unknown) def
+/Version (unknown) def
+/ItalicAngle 0.0 def
+/isFixedPitch false def
+/UnderlinePosition -130 def
+/UnderlineThickness 90 def
+end readonly def
+/sfnts[<0001000000090080000300106376742000691D390000009C000001FE6670676D
+7134766A0000029C000000AB676C7966118399D500000348000007B668656164085DC286
+00000B0000000036686865610D9F077C00000B3800000024686D74783A5706B700000B5C
+0000003C6C6F636108C30B6500000B98000000206D617870047C067100000BB800000020
+707265703B07F10000000BD800000568013500B800CB00CB00C100AA009C01A600B80066
+0000007100CB00A002B20085007500B800C301CB0189022D00CB00A600F000D300AA0087
+00CB03AA0400014A003300CB000000D9050200F4015400B4009C01390114013907060400
+044E04B4045204B804E704CD0037047304CD04600473013303A2055605A60556053903C5
+021200C9001F00B801DF007300BA03E9033303BC0444040E00DF03CD03AA00E503AA0404
+000000CB008F00A4007B00B80014016F007F027B0252008F00C705CD009A009A006F00CB
+00CD019E01D300F000BA018300D5009803040248009E01D500C100CB00F600830354027F
+00000333026600D300C700A400CD008F009A0073040005D5010A00FE022B00A400B4009C
+00000062009C0000001D032D05D505D505D505F0007F007B005400A406B80614072301D3
+00B800CB00A601C301EC069300A000D3035C037103DB0185042304A80448008F01390114
+01390360008F05D5019A0614072306660179046004600460047B009C00000277046001AA
+00E904600762007B00C5007F027B000000B4025205CD006600BC00660077061000CD013B
+01850389008F007B0000001D00CD074A042F009C009C0000077D006F0000006F0335006A
+006F007B00AE00B2002D0396008F027B00F600830354063705F6008F009C04E10266008F
+018D02F600CD03440029006604EE00730000140000960000B707060504030201002C2010
+B002254964B040515820C859212D2CB002254964B040515820C859212D2C20100720B000
+50B00D7920B8FFFF5058041B0559B0051CB0032508B0042523E120B00050B00D7920B8FF
+FF5058041B0559B0051CB0032508E12D2C4B505820B0FD454459212D2CB002254560442D
+2C4B5358B00225B0022545445921212D2C45442D2CB00225B0022549B00525B005254960
+B0206368208A108A233A8A10653A2D00000201350000020005D5000300090035400F0700
+8304810208070501030400000A10FC4BB00B5458B90000FFC038593CEC32393931002FE4
+FCCC3001B6000B200B500B035D253315231133110323030135CBCBCB14A215FEFE05D5FD
+71FE9B0165000001FFFA000004E905D50007004A400E0602950081040140031C00400508
+10D4E4FCE431002FF4EC3230014BB00A5458BD00080040000100080008FFC03811373859
+401300091F00100110021F071009400970099F09095D03211521112311210604EFFDEECB
+FDEE05D5AAFAD5052B000002007BFFE3042D047B000A002500BC4027191F0B17090E00A9
+1706B90E1120861FBA1CB923B8118C170C001703180D09080B1F030814452610FCECCCD4
+EC323211393931002FC4E4F4FCF4EC10C6EE10EE11391139123930406E301D301E301F30
+20302130223F27401D401E401F402040214022501D501E501F5020502150225027702785
+1D871E871F8720872185229027A027F0271E301E301F30203021401E401F40204021501E
+501F50205021601E601F60206021701E701F70207021801E801F80208021185D015D0122
+061514163332363D01371123350E01232226353436332135342623220607353E01333216
+02BEDFAC816F99B9B8B83FBC88ACCBFDFB0102A79760B65465BE5AF3F00233667B6273D9
+B4294CFD81AA6661C1A2BDC0127F8B2E2EAA2727FC00000200BAFFE304A40614000B001C
+0038401903B90C0F09B918158C0FB81B971900121247180C06081A461D10FCEC3232F4EC
+31002FECE4F4C4EC10C6EE30B6601E801EA01E03015D013426232206151416333236013E
+01333200111002232226271523113303E5A79292A7A79292A7FD8E3AB17BCC00FFFFCC7B
+B13AB9B9022FCBE7E7CBCBE7E702526461FEBCFEF8FEF8FEBC6164A8061400020071FFE3
+047F047B0014001B00704024001501098608880515A90105B90C01BB18B912B80C8C1C1B
+1502081508004B02120F451C10FCECF4ECC4111239310010E4F4ECE410EE10EE10F4EE11
+12393040293F1D701DA01DD01DF01D053F003F013F023F153F1B052C072F082F092C0A6F
+006F016F026F156F1B095D71015D0115211E0133323637150E0123200011100033320007
+2E0123220607047FFCB20CCDB76AC76263D06BFEF4FEC70129FCE20107B802A5889AB90E
+025E5ABEC73434AE2A2C0138010A01130143FEDDC497B4AE9E00000100BA000004640614
+001300344019030900030E0106870E11B80C970A010208004E0D09080B461410FCEC32F4
+EC31002F3CECF4C4EC1112173930B2601501015D0111231134262322061511231133113E
+013332160464B87C7C95ACB9B942B375C1C602A4FD5C029E9F9EBEA4FD870614FD9E6564
+EF00000200C100000179061400030007002B400E06BE04B100BC020501080400460810FC
+3CEC3231002FE4FCEC30400B1009400950096009700905015D1333112311331523C1B8B8
+B8B80460FBA00614E900000100BA00000464047B001300364019030900030E0106870E11
+B80CBC0A010208004E0D09080B461410FCEC32F4EC31002F3CE4F4C4EC1112173930B460
+15CF1502015D0111231134262322061511231133153E013332160464B87C7C95ACB9B942
+B375C1C602A4FD5C029E9F9EBEA4FD870460AE6564EF000100BA0000034A047B00110030
+4014060B0700110B03870EB809BC070A06080008461210FCC4EC3231002FE4F4ECC4D4CC
+11123930B450139F1302015D012E012322061511231133153E0133321617034A1F492C9C
+A7B9B93ABA85132E1C03B41211CBBEFDB20460AE6663050500010037000002F2059E0013
+003840190E05080F03A9001101BC08870A0B08090204000810120E461410FC3CC4FC3CC4
+32393931002FECF43CC4EC3211393930B2AF1501015D01112115211114163B0115232226
+3511233533110177017BFE854B73BDBDD5A28787059EFEC28FFDA0894E9A9FD202608F01
+3E0000010056000006350460000C01EB404905550605090A0904550A0903550A0B0A0255
+01020B0B0A061107080705110405080807021103020C000C011100000C420A0502030603
+00BF0B080C0B0A09080605040302010B07000D10D44BB00A544BB011545B4BB012545B4B
+B013545B4BB00B545B58B9000000403859014BB00C544BB00D545B4BB010545B58B90000
+FFC03859CC173931002F3CEC32321739304B5358071005ED071008ED071008ED071005ED
+071008ED071005ED0705ED071008ED59220140FF050216021605220A350A49024905460A
+400A5B025B05550A500A6E026E05660A79027F0279057F05870299029805940ABC02BC05
+CE02C703CF051D0502090306040B050A080B09040B050C1502190316041A051B081B0914
+0B150C2500250123022703210425052206220725082709240A210B230C39033604360839
+0C300E460248034604400442054006400740084409440A440B400E400E56005601560250
+0451055206520750085309540A550B6300640165026A0365046A056A066A076E09610B67
+0C6F0E7500750179027D0378047D057A067F067A077F07780879097F097B0A760B7D0C87
+0288058F0E97009701940293039C049B05980698079908402F960C9F0EA600A601A402A4
+03AB04AB05A906A907AB08A40CAF0EB502B103BD04BB05B809BF0EC402C303CC04CA0579
+5D005D13331B01331B013301230B012356B8E6E5D9E6E5B8FEDBD9F1F2D90460FC96036A
+FC96036AFBA00396FC6A00000001000000025999D203C60C5F0F3CF5001F080000000000
+D17E0EE400000000D17E0EE4F7D6FC4C0E5909DC00000008000000000000000000010000
+076DFE1D00000EFEF7D6FA510E5900010000000000000000000000000000000F04CD0066
+0000000002AA0000028B00000335013504E3FFFA04E7007B051400BA04EC0071051200BA
+023900C1051200BA034A00BA03230037068B0056000000000000000000000031006900FF
+014B01B501F102190255028C02C903DB00010000000F0354002B0068000C000200100099
+000800000415021600080004B8028040FFFBFE03FA1403F92503F83203F79603F60E03F5
+FE03F4FE03F32503F20E03F19603F02503EF8A4105EFFE03EE9603ED9603ECFA03EBFA03
+EAFE03E93A03E84203E7FE03E63203E5E45305E59603E48A4105E45303E3E22F05E3FA03
+E22F03E1FE03E0FE03DF3203DE1403DD9603DCFE03DB1203DA7D03D9BB03D8FE03D68A41
+05D67D03D5D44705D57D03D44703D3D21B05D3FE03D21B03D1FE03D0FE03CFFE03CEFE03
+CD9603CCCB1E05CCFE03CB1E03CA3203C9FE03C6851105C61C03C51603C4FE03C3FE03C2
+FE03C1FE03C0FE03BFFE03BEFE03BDFE03BCFE03BBFE03BA1103B9862505B9FE03B8B7BB
+05B8FE03B7B65D05B7BB03B78004B6B52505B65D40FF03B64004B52503B4FE03B39603B2
+FE03B1FE03B0FE03AFFE03AE6403AD0E03ACAB2505AC6403ABAA1205AB2503AA1203A98A
+4105A9FA03A8FE03A7FE03A6FE03A51203A4FE03A3A20E05A33203A20E03A16403A08A41
+05A096039FFE039E9D0C059EFE039D0C039C9B19059C64039B9A10059B19039A1003990A
+0398FE0397960D0597FE03960D03958A410595960394930E05942803930E0392FA039190
+BB0591FE03908F5D0590BB039080048F8E25058F5D038F40048E25038DFE038C8B2E058C
+FE038B2E038A8625058A410389880B05891403880B038786250587640386851105862503
+85110384FE038382110583FE0382110381FE0380FE037FFE0340FF7E7D7D057EFE037D7D
+037C64037B5415057B25037AFE0379FE03780E03770C03760A0375FE0374FA0373FA0372
+FA0371FA0370FE036FFE036EFE036C21036BFE036A1142056A530369FE03687D03671142
+0566FE0365FE0364FE0363FE0362FE03613A0360FA035E0C035DFE035BFE035AFE035958
+0A0559FA03580A035716190557320356FE03555415055542035415035301100553180352
+1403514A130551FE03500B034FFE034E4D10054EFE034D10034CFE034B4A13054BFE034A
+4910054A1303491D0D05491003480D0347FE0346960345960344FE0343022D0543FA0342
+BB03414B0340FE033FFE033E3D12053E14033D3C0F053D12033C3B0D053C40FF0F033B0D
+033AFE0339FE033837140538FA033736100537140336350B05361003350B03341E03330D
+0332310B0532FE03310B03302F0B05300D032F0B032E2D09052E10032D09032C32032B2A
+25052B64032A2912052A25032912032827250528410327250326250B05260F03250B0324
+FE0323FE03220F03210110052112032064031FFA031E1D0D051E64031D0D031C1142051C
+FE031BFA031A42031911420519FE031864031716190517FE031601100516190315FE0314
+FE0313FE031211420512FE0311022D05114203107D030F64030EFE030D0C16050DFE030C
+0110050C16030BFE030A100309FE0308022D0508FE030714030664030401100504FE0340
+1503022D0503FE0302011005022D0301100300FE0301B80164858D012B2B2B2B2B2B2B2B
+2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
+2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
+2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
+2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
+2B2B2B2B2B2B2B2B2B2B2B2B2B002B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
+2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
+2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
+2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
+2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B1D00>]def
+/CharStrings 13 dict dup begin
+/.notdef 0 def
+/space 3 def
+/exclam 4 def
+/b 7 def
+/a 6 def
+/e 8 def
+/h 9 def
+/i 10 def
+/n 11 def
+/r 12 def
+/T 5 def
+/t 13 def
+/w 14 def
+end readonly def
+
+systemdict/resourcestatus known
+ {42 /FontType resourcestatus
+   {pop pop false}{true}ifelse}
+ {true}ifelse
+{/TrueDict where{pop}{(%%[ Error: no TrueType rasterizer ]%%)= flush}ifelse
+/FontType 3 def
+ /TrueState 271 string def
+ TrueDict begin sfnts save
+ 72 0 matrix defaultmatrix dtransform dup
+ mul exch dup mul add sqrt cvi 0 72 matrix
+ defaultmatrix dtransform dup mul exch dup
+ mul add sqrt cvi 3 -1 roll restore
+ TrueState initer end
+ /BuildGlyph{exch begin
+  CharStrings dup 2 index known
+    {exch}{exch pop /.notdef}ifelse
+  get dup xcheck
+    {currentdict systemdict begin begin exec end end}
+    {TrueDict begin /bander load cvlit exch TrueState render end}
+    ifelse
+ end}bind def
+ /BuildChar{
+  1 index /Encoding get exch get
+  1 index /BuildGlyph get exec
+ }bind def
+}if
+
+FontName currentdict end definefont pop
+%!PS-TrueTypeFont-1.0-0.58982
+%%Title: unknown
+%%Creator: Converted from TrueType to type 42 by PPR
+15 dict begin
+/FontName /WenQuanYiZenHei def
+/PaintType 0 def
+/FontMatrix[1 0 0 1 0 0]def
+/FontBBox[-126 -297 1051 963]def
+/FontType 42 def
+/Encoding StandardEncoding def
+/FontInfo 10 dict dup begin
+/FamilyName (unknown) def
+/FullName (unknown) def
+/Weight (unknown) def
+/Version (unknown) def
+/ItalicAngle 0.0 def
+/isFixedPitch false def
+/UnderlinePosition -230 def
+/UnderlineThickness 51 def
+end readonly def
+/sfnts[<00010000000700400002003063767420002202880000007C00000004676C7966
+AC20EA39000000800000024A68656164F2831BDF000002CC000000366868656107EC01A3
+0000030400000024686D747805A7004E000003280000001A6C6F636101A0011100000344
+000000126D617870008A02690000035800000020002202880002000DFF8503D50341000D
+0024000005260736351134271637061511140106072E0127020726273E01371617371716
+17071617160223292A04042A290301B4250C80D74AC4F7122795F54C171806050B0B0958
+74627B04044D4C014C4D4D04044D4DFEB44C01D91A2B27C278FEE18B2C194DEFA3100C03
+0806050E9B59460000010021FF8203EC033300230000011617070607062B01222E011037
+23130607060726273E013503211114163B013637363703A712331E020C070AD6303F0503
+DF0104584E781630809C01017715119C1204040101012503F3150D053D5F02652CFE9FD0
+8176422D0D33F1AB01A7FD05141D01101D1D0002001FFF7C03D60369002A003700000106
+17262321151407062736271E01363D012122073627163321353721220736271633211706
+0F011521320123350527371707211523352103D603033A3BFECA1E2B720C24215A10FEB1
+3A3A03033A3A014FA5FEB53A3B04043B3A01BC081F189F01363BFCE74801994E2D6B2001
+9F49FD2F011D1F2003FE261C2501322604010C1BEA03201F03499703201F034108159229
+0118BF0137414A2EBE8500050010FF8803DF03350016001B00230027002D000025260322
+0736271633210207161706072627060726273613161736370126273E011317031307273F
+0126273716170264721E201F03033C3D01591E916EB82915A46F8AD01B25E0441A5E7815
+FD7B2A3E2C5E5929741F40953FA845523C564AD3CF011902212103FEADDBA66510265EA8
+AE5123184D02A4F9B4BBF2FCCE180251D0010115FE850193318832204C42344650000000
+000100000000E666EDAC36235F0F3CF5003F040000000000C7BE78E900000000C7BE78E9
+FF7FFED0043403DA0000000800020000000000000001000003DAFED0005C0455FF7FFE78
+043400010000000000000000000000000000000501760022000000000000000000000000
+0400000D0021001F00100000000000000000000000000040007B00D10125000000010000
+00080165002800D10012000200000001000100000040002E0006000200>]def
+/CharStrings 5 dict dup begin
+/.notdef 0 def
+/uni51E0 5 def
+/uni6C49 7 def
+/uni4E2A 4 def
+/uni5B57 6 def
+end readonly def
+
+systemdict/resourcestatus known
+ {42 /FontType resourcestatus
+   {pop pop false}{true}ifelse}
+ {true}ifelse
+{/TrueDict where{pop}{(%%[ Error: no TrueType rasterizer ]%%)= flush}ifelse
+/FontType 3 def
+ /TrueState 271 string def
+ TrueDict begin sfnts save
+ 72 0 matrix defaultmatrix dtransform dup
+ mul exch dup mul add sqrt cvi 0 72 matrix
+ defaultmatrix dtransform dup mul exch dup
+ mul add sqrt cvi 3 -1 roll restore
+ TrueState initer end
+ /BuildGlyph{exch begin
+  CharStrings dup 2 index known
+    {exch}{exch pop /.notdef}ifelse
+  get dup xcheck
+    {currentdict systemdict begin begin exec end end}
+    {TrueDict begin /bander load cvlit exch TrueState render end}
+    ifelse
+ end}bind def
+ /BuildChar{
+  1 index /Encoding get exch get
+  1 index /BuildGlyph get exec
+ }bind def
+}if
+
+FontName currentdict end definefont pop
+end
+%%EndProlog
+mpldict begin
+18 180 translate
+576 432 0 0 clipbox
+gsave
+0 0 m
+576 0 l
+576 432 l
+0 432 l
+cl
+1.000 setgray
+fill
+grestore
+0.000 setgray
+/DejaVuSans 27.000 selectfont
+gsave
+
+86.4 205.2 translate
+0 rotate
+0.000000 0 m /T glyphshow
+16.492676 0 m /h glyphshow
+33.604980 0 m /e glyphshow
+50.216309 0 m /r glyphshow
+61.316895 0 m /e glyphshow
+77.928223 0 m /space glyphshow
+86.510742 0 m /a glyphshow
+103.056152 0 m /r glyphshow
+114.156738 0 m /e glyphshow
+130.768066 0 m /space glyphshow
+grestore
+/WenQuanYiZenHei 27.000 selectfont
+gsave
+
+86.4 205.2 translate
+0 rotate
+139.350586 0 m /uni51E0 glyphshow
+166.350586 0 m /uni4E2A glyphshow
+193.350586 0 m /uni6C49 glyphshow
+220.350586 0 m /uni5B57 glyphshow
+grestore
+/DejaVuSans 27.000 selectfont
+gsave
+
+86.4 205.2 translate
+0 rotate
+247.350586 0 m /space glyphshow
+255.933105 0 m /i glyphshow
+263.434570 0 m /n glyphshow
+280.546875 0 m /space glyphshow
+289.129395 0 m /b glyphshow
+306.268066 0 m /e glyphshow
+322.879395 0 m /t glyphshow
+333.465820 0 m /w glyphshow
+355.548340 0 m /e glyphshow
+372.159668 0 m /e glyphshow
+388.770996 0 m /n glyphshow
+405.883301 0 m /exclam glyphshow
+grestore
+
+end
+showpage
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_ps/type42_without_prep.eps b/lib/matplotlib/tests/baseline_images/test_backend_ps/type42_without_prep.eps
new file mode 100644
index 000000000000..435e7b456401
--- /dev/null
+++ b/lib/matplotlib/tests/baseline_images/test_backend_ps/type42_without_prep.eps
@@ -0,0 +1,21189 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%Title: type42_without_prep.eps
+%%Creator: Matplotlib v3.5.0.dev1340+g24f1fb772a.d20210713, https://matplotlib.org/
+%%CreationDate: Tue Jul 13 14:52:53 2021
+%%Orientation: portrait
+%%BoundingBox: 75 223 537 569
+%%HiResBoundingBox: 75.600000 223.200000 536.400000 568.800000
+%%EndComments
+%%BeginProlog
+/mpldict 12 dict def
+mpldict begin
+/_d { bind def } bind def
+/m { moveto } _d
+/l { lineto } _d
+/r { rlineto } _d
+/c { curveto } _d
+/cl { closepath } _d
+/ce { closepath eofill } _d
+/box {
+      m
+      1 index 0 r
+      0 exch r
+      neg 0 r
+      cl
+    } _d
+/clipbox {
+      box
+      clip
+      newpath
+    } _d
+/sc { setcachedevice } _d
+%!PS-TrueTypeFont-1.0-2.22937
+%%Title: DejaVu Sans
+%%Copyright: Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. DejaVu changes are in public domain 
+%%Creator: Converted from TrueType to type 42 by PPR
+15 dict begin
+/FontName /DejaVuSans def
+/PaintType 0 def
+/FontMatrix[1 0 0 1 0 0]def
+/FontBBox[-1021 -463 1793 1232]def
+/FontType 42 def
+/Encoding StandardEncoding def
+/FontInfo 10 dict dup begin
+/FamilyName (DejaVu Sans) def
+/FullName (DejaVu Sans) def
+/Notice (Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. DejaVu changes are in public domain ) def
+/Weight (Book) def
+/Version (Version 2.35) def
+/ItalicAngle 0.0 def
+/isFixedPitch false def
+/UnderlinePosition -130 def
+/UnderlineThickness 90 def
+end readonly def
+/sfnts[<0001000000090080000300106376742000691D390000009C000001FE6670676D
+7134766A0000029C000000AB676C796668846831000003480008795C68656164085DC287
+00087CA400000036686865610D9F1FBF00087CDC00000024686D7478C535D8FD00087D00
+000061666C6F63616096C68C0008DE68000061886D6178701CCE067100093FF000000020
+707265703B07F1000009401000000568013500B800CB00CB00C100AA009C01A600B80066
+0000007100CB00A002B20085007500B800C301CB0189022D00CB00A600F000D300AA0087
+00CB03AA0400014A003300CB000000D9050200F4015400B4009C01390114013907060400
+044E04B4045204B804E704CD0037047304CD04600473013303A2055605A60556053903C5
+021200C9001F00B801DF007300BA03E9033303BC0444040E00DF03CD03AA00E503AA0404
+000000CB008F00A4007B00B80014016F007F027B0252008F00C705CD009A009A006F00CB
+00CD019E01D300F000BA018300D5009803040248009E01D500C100CB00F600830354027F
+00000333026600D300C700A400CD008F009A0073040005D5010A00FE022B00A400B4009C
+00000062009C0000001D032D05D505D505D505F0007F007B005400A406B80614072301D3
+00B800CB00A601C301EC069300A000D3035C037103DB0185042304A80448008F01390114
+01390360008F05D5019A0614072306660179046004600460047B009C00000277046001AA
+00E904600762007B00C5007F027B000000B4025205CD006600BC00660077061000CD013B
+01850389008F007B0000001D00CD074A042F009C009C0000077D006F0000006F0335006A
+006F007B00AE00B2002D0396008F027B00F600830354063705F6008F009C04E10266008F
+018D02F600CD03440029006604EE00730000140000960000B707060504030201002C2010
+B002254964B040515820C859212D2CB002254964B040515820C859212D2C20100720B000
+50B00D7920B8FFFF5058041B0559B0051CB0032508B0042523E120B00050B00D7920B8FF
+FF5058041B0559B0051CB0032508E12D2C4B505820B0FD454459212D2CB002254560442D
+2C4B5358B00225B0022545445921212D2C45442D2CB00225B0022549B00525B005254960
+B0206368208A108A233A8A10653A2D0000020066FE96046605A400030007001A400C04FB
+0006FB0108057F0204002FC4D4EC310010D4ECD4EC301311211125211121660400FC7303
+1BFCE5FE96070EF8F2720629000201350000020005D5000300090035400F070083048102
+08070501030400000A10FC4BB00B5458B90000FFC038593CEC32393931002FE4FCCC3001
+B6000B200B500B035D253315231133110323030135CBCBCB14A215FEFE05D5FD71FE9B01
+65000000000200C503AA02E905D5000300070042400F0501840400810804050600050204
+0810FC4BB012544BB013545B58B90002FFC03859FCDCEC310010F43CEC323001400F3009
+4009500960097009A009BF09075D0111231121112311016FAA0224AA05D5FDD5022BFDD5
+022B00000002009E0000061705BE0003001F006040311B0B008707041D0905190D028717
+130F15111F1E1C1B1A17161514131211100E0D0C090807060504030201001A0A18062010
+FCCC173931002F3CD43C3CFC3C3CD43C3CC432EC32323040110B010B020B0C0B0D14041A
+111A12141F08015D012103210B0121133303211521032115210323132103231321352113
+213521130417FEDD5401254468012469A0670138FEA152013EFE9B68A067FEDB67A168FE
+C5016054FEBE0169660385FEB20387FE61019FFE619AFEB299FE62019EFE62019E99014E
+9A019F00000300AAFED3046D061400210028002F00BD405522020A0B0A27012628020B0B
+0A1D011E1C022F292F1B0229292F42131110220A1B29041706092A210502178616068605
+11231A8A168910002A8A0589022D08160A1E07291A1203000922100903010726080D0506
+3010FC4BB0095458B90005FFC038594BB00C544BB010545B4BB00F545B58B90005004038
+593CECF4173CFC173CF4E4EC31002FE4ECC4D4E4EC32C410EE10EE111239113911121739
+111239304B5358071004ED07100EED11173907100EED111739071004ED59220123032E01
+27351E0117112E01353436373533151E0117152E0127111E011514060703110E01151416
+17113E0135342602B4640169D26A66D16FDDC9DACC645DAE5353AF5CE3D6E3D664747A71
+E17F817BFED3012D022D2DB440410101C824AC96A3BC0EEBE8041F1BAF2A2E04FE5523B4
+9CA9C30F0300019A0D6A585660D5FE4F116E5A586800000000050071FFE3072905F0000B
+001700230027003300894036240F252625260F2724274200920C1E922E8D18922406920C
+8D26128C2824913427211B2509030D150E090D0F210D2B0E1B0D0F310B3410FC4BB00954
+4BB00B545B4BB00C545B4BB014545B4BB00E545B4BB00D545B58B90031FFC03859C4ECF4
+EC10EEF6EE1139111239310010E432F43CE4EC10EEF6EE10EE304B5358071005ED071005
+ED5922012206151416333236353426273216151406232226353436012206151416333236
+3534262533012313321615140623222635343605D157636357556363559EBABB9DA0BABB
+FC97566362575763640331A0FC5AA01F9EBCBB9F9FB9BA029194848295958283957FDCBB
+BBDBDBBBBCDB026195828494948481967FF9F3060DDBBBBDDADBBCBADC00000000020081
+FFE305FE05F00009003001CD40960D010E0C861112110B860A0B12121109860009151615
+070106088616161502010301861D1E1D008609001E1E1D201F02211E110A130A17161503
+181411130A07080206091113130A0201020300110A130A171602181511130A141113130A
+42120B090306000A1E0328150E0628270695182B9527942491188C0E130A2E0B0E09002E
+1215270E1E032E1227210E110F132103121B103110FCECC4D4D4EC10C6EE113911123939
+1139391139113931002FC6E4F6E6EE10EE10C6111239111739111739304B5358071005ED
+0705ED111739071005ED111739071005ED1117390705ED111739071005ED111739071008
+ED07100EED11173907100EED111739071008ED071008ED07100EED1117395922B20F3201
+015D40B2070B052209291C001C011F02170B2A002A0126123A003412440B5E0059015A0A
+55125A1A5A1F5930671E7B009B009A0199029708950B931595169522992D1F090B090C08
+110C270C2818021B09190B190C19111C141C15161D1F3227002701290923122A132A1428
+152F323B09341239133F324A094C144B1546194F3256015A09590C551259135C1F5F326A
+0C691160327501790C7A1193009301970295059C079C089F089A099B0B9A0C9032A032B0
+32395D005D010E011514163332363709013E0137330602070123270E0123220035343637
+2E0135343633321617152E0123220615141601F25B55D4A05FA649FE7B01FC3B4206BA0C
+685D0117FC8F68E483F1FECE86863032DEB853A555579E4469833B032351A15892C23F40
+028FFDF859CB7284FEFE7EFEE39359570113D780E1633F7D3CA2C52424B62F316F583367
+000100C503AA016F05D500030037400A0184008104000502040410FC4BB012544BB01354
+5B58B90002FFC03859EC310010F4EC3001400D40055005600570059005A005065D011123
+11016FAA05D5FDD5022B0000000100B0FEF2027B0612000D0037400F069800970E0D0700
+03120600130A0E10DC4BB0135458B9000AFFC038594BB00F5458B9000A00403859E432EC
+113939310010FCEC300106021514121723260235341237027B86828385A0969594970612
+E6FE3EE7E7FE3BE5EB01C6E0DF01C4EC000100A4FEF2026F0612000D001F400F07980097
+0E0701000B12041308000E10DC3CF4EC113939310010FCEC301333161215140207233612
+353402A4A096959596A08583830612ECFE3CDFE0FE3AEBE501C5E7E701C200000001003D
+024A03C305F00011004E402C100D0B00040C090704020408039905110C990A010E911208
+0C0A030906110301030200140F040B09140D061210D43CE432DC3CE43217391112173931
+0010F4D43CEC32C4EC32173912173930010D01072511231105272D0137051133112503C3
+FE9901673AFEB072FEB03A0167FE993A015072015004DFC2C362CBFE870179CB62C3C263
+CB0179FE87CB0000000100D9000005DB0504000B002340110009019C0703050215040017
+0A0615080C10DCFC3CFC3CEC31002FD43CFC3CC43001112115211123112135211103AE02
+2DFDD3A8FDD3022D0504FDD3AAFDD3022DAA022D0001009EFF1201C300FE00050019400C
+039E0083060304011900180610FCECD4CC310010FCEC30373315032313F0D3A48152FEAC
+FEC001400001006401DF027F028300030011B6009C020401000410DCCC310010D4EC3013
+21152164021BFDE50283A400000100DB000001AE00FE00030011B7008302011900180410
+FCEC31002FEC3037331523DBD3D3FEFE00010000FF4202B205D50003002D4014001A0102
+01021A03000342029F008104020001032FC43939310010F4EC304B5358071005ED071005
+ED5922013301230208AAFDF8AA05D5F96D00000000020087FFE3048F05F0000B00170023
+401306A01200A00C91128C18091C0F1E031C151B1810FCECF4EC310010E4F4EC10EE3001
+2202111012333212111002273200111000232200111000028B9C9D9D9C9D9D9D9DFB0109
+FEF7FBFBFEF701090550FECDFECCFECDFECD0133013301340133A0FE73FE86FE87FE7301
+8D0179017A018D00000100E10000045A05D5000A004040154203A00402A005810700A009
+081F061C03001F010B10D44BB00F5458B9000100403859ECC4FCEC31002FEC32F4ECD4EC
+304B5358592201B40F030F04025D3721110535253311211521FE014AFE990165CA014AFC
+A4AA047348B848FAD5AA0000000100960000044A05F0001C009E4027191A1B03181C1105
+0400110505044210A111940DA014910400A00200100A02010A1C171003061D10FC4BB015
+544BB016545B4BB014545B58B90003FFC03859C4D4ECC0C011123931002FEC32F4ECF4EC
+304B5358071005ED0705ED01B01C1011173959220140325504560556077A047A05761B87
+190704000419041A041B051C74007606751A731B741C82008619821A821B821CA800A81B
+115D005D25211521353600373E0135342623220607353E01333204151406070600018902
+C1FC4C73018D33614DA7865FD3787AD458E80114455B19FEF4AAAAAA7701913A6D974977
+964243CC3132E8C25CA5701DFEEB00000001009CFFE3047305F000280070402E0015130A
+86091F862013A0150DA00993061CA020932391068C15A329161C13000314191C2620101C
+03141F09062910FC4BB016544BB014545B58B90009FFC03859C4C4D4ECF4EC1117393931
+0010ECE4F4E4EC10E6EE10EE10EE10EE11123930014009641E611F6120642104005D011E
+0115140421222627351E013332363534262B013533323635342623220607353E01333204
+151406033F91A3FED0FEE85EC76A54C86DBEC7B9A5AEB6959EA39853BE7273C959E6010C
+8E03251FC490DDF22525C33132968F8495A67770737B2426B42020D1B27CAB0000020064
+000004A405D50002000D0081401D010D030D0003030D4200030B07A00501038109010C0A
+001C0608040C0E10DC4BB00B544BB00D545B58B9000CFFC03859D43CC4EC32113931002F
+E4D43CEC321239304B5358071004C9071005C9592201402A0B002A004800590069007700
+8A000716012B0026012B0336014E014F0C4F0D5601660175017A0385010D5D005D090121
+03331133152311231121350306FE0201FE35FED5D5C9FD5E0525FCE303CDFC33A8FEA001
+60C300000001009EFFE3046405D5001D005E4023041A071186101D1AA00714A010890D02
+A000810D8C07A41E171C010A031C000A10061E10FC014BB016544BB014545B58B90010FF
+C038594BB00F5458B9001000403859C4D4EC10C4EE310010E4E4F4EC10E6EE10FEC410EE
+1112393013211521113E0133320015140021222627351E0133323635342623220607DD03
+19FDA02C582CFA0124FED4FEEF5EC3685AC06BADCACAAD51A15405D5AAFE920F0FFEEEEA
+F1FEF52020CB3130B69C9CB6242600000002008FFFE3049605F0000B0024005840241306
+000D860C00A01606A01C16A510A00C8922911C8C250C22091C191E131C03211F1B2510FC
+ECECF4ECE4310010E4F4E4FCE410EE10EE10EE111239304014CB00CB01CD02CD03CD04CB
+05CB0607A41EB21E025D015D01220615141633323635342601152E01232202033E013332
+0015140023200011100021321602A4889F9F88889F9F01094C9B4CC8D30F3BB26BE10105
+FEF0E2FEFDFEEE0150011B4C9B033BBAA2A1BBBBA1A2BA0279B82426FEF2FEEF575DFEEF
+EBE6FEEA018D0179016201A51E000000000100A80000046805D500060063401805110203
+0203110405044205A0008103050301040100060710FCCCC411393931002FF4EC304B5358
+071005ED071005ED5922014BB0165458BD00070040000100070007FFC038113738594012
+58020106031A05390548056703B000B006075D005D13211501230121A803C0FDE2D301FE
+FD3305D556FA81052B0000000003008BFFE3048B05F0000B0023002F00434025180C00A0
+2706A01E2DA012911E8C27A330180C242A1C15241C0F091C151B1E031C0F211B3010FCC4
+ECF4C4EC10EE10EE113939310010ECE4F4EC10EE10EE3939300122061514163332363534
+26252E01353424333216151406071E011514042322243534361314163332363534262322
+06028B90A5A59090A6A5FEA5829100FFDEDFFE918192A3FEF7F7F7FEF7A4489183829393
+82839102C59A87879A9B86879A5620B280B3D0D0B380B22022C68FD9E8E8D98FC6016174
+828274748282000000020081FFE3048705F00018002400584023071F1901860019A00AA5
+04A00089161FA01091168C25071C1C21131E0022221C0D1B2510FCECE4F4ECEC310010E4
+F4EC10E6FEF5EE10EE111239304016C419C21AC01BC01CC01DC21EC41F07AA12BC12E912
+035D015D37351E01333212130E0123220035340033200011100021222601323635342623
+2206151416E14C9C4BC8D30F3AB26CE0FEFB0110E201030111FEB1FEE54C9C013E889F9F
+88889F9F1FB82426010D0112565C010FEBE60116FE73FE86FE9FFE5B1E0297BAA2A1BBBB
+A1A2BA00000200F0000001C3042300030007001C400E068304A600830205010304001808
+10FC3CEC3231002FECF4EC303733152311331523F0D3D3D3D3FEFE0423FE00000002009E
+FF1201C304230003000900254013028300079E048300A60A07080501190400180A10FC3C
+EC32D4CC310010E4FCEC10EE3013331523113315032313F0D3D3D3A481520423FEFDD9AC
+FEC00140000100D9005E05DB04A60006004D402A029C030403019C0001040403019C0201
+050605009C06054205040201000503A806A7070102002404230710FCEC3239310010F4EC
+1739304B53580704ED071008ED071008ED071004ED592209021501350105DBFBF80408FA
+FE050203F0FE91FE93B601D1A601D100000200D9016005DB03A200030007001C400D009C
+02069C040805010400230810FC3CC432310010D4ECD4EC301321152115211521D90502FA
+FE0502FAFE03A2A8F0AA0000000100D9005E05DB04A60006004F402B069C000603040305
+9C040403009C010201069C05060202014206050302000504A801A7070602240400230710
+FC3CEC39310010F4EC1739304B5358071008ED071004ED071004ED071008ED5922133501
+15013501D90502FAFE040603F0B6FE2FA6FE2FB6016D000000020093000003B005F00003
+00240065402B241E0906040A1D13040014861388109517910083021D1A0D0905040A1E01
+0D1C1A041C05010300261A132510DC4BB00C5458B90013FFC03859C4FCECD4EC10EE1139
+3911123911123931002FEEF6FEF4EE10CD11393917393001B679097A0A7A20035D253315
+2313233534363F013E0135342623220607353E013332161514060F010E01070E01150187
+CBCBC5BF385A5A3933836C4FB3615EC167B8DF485A582F27080606FEFE01919A65825659
+355E31596E4643BC3938C29F4C8956562F3519153C34000000020087FE9C077105A2000B
+004C00954032180C0309A919151B03A94C0F34330FAC30A93715AC24A937434D33341E1A
+00281206180C281A2B1E2849122B2A28492C3D4D10DCECFCEC10FEFDFE3CC610EE111239
+39310010D4C4FCEC10FEEDD4C610C5EE3210C4EE11393930004BB009544BB00C545B4BB0
+10545B4BB013545B4BB014545B58BD004DFFC00001004D004D0040381137385940090F4E
+1F4E2F4E3F4E04015D011416333236353426232206010E01232226353436333216173533
+113E01353426272624232206070602151412171604333236371706042322242726023534
+12373624333204171E011510000502FA8E7C7B8D907A798F02213C9B67ACD7D8AB679C3B
+8F92A53F4068FED5B07BE2609DB1736D6901149D81F9685A7DFED998B9FEB8808086887E
+810152BDD4016B7B4B4FFEC2FEE802198FA3A48E8CA5A4FE484D49F9C8C8FA4B4C83FD20
+16DFB16BBC50838B414066FEB5C19FFEEA6A686D57516F6167837D7D0149BDB6014A7D7F
+87AEA062E67BFEF9FED00600000200100000056805D50002000A00C24041001101000405
+04021105050401110A030A0011020003030A0711050406110505040911030A08110A030A
+4200030795010381090509080706040302010009050A0B10D4C4173931002F3CE4D4EC12
+39304B5358071005ED0705ED071005ED0705ED071008ED071005ED071005ED071008ED59
+22B2200C01015D40420F010F020F070F080F005800760070008C00090701080206030904
+1601190256015802500C67016802780176027C0372047707780887018802800C98029903
+9604175D005D090121013301230321032302BCFEEE0225FE7BE50239D288FD5F88D5050E
+FD1903AEFA2B017FFE810000000300C9000004EC05D5000800110020004340231900950A
+0995128101950AAD1F110B080213191F05000E1C1605191C2E09001C12042110FCEC32FC
+ECD4EC111739393931002FECECF4EC10EE3930B20F2201015D0111213236353426230111
+2132363534262325213216151406071E01151404232101930144A39D9DA3FEBC012B9491
+9194FE0B0204E7FA807C95A5FEF0FBFDE802C9FDDD878B8C850266FE3E6F727170A6C0B1
+89A21420CB98C8DA00010073FFE3052705F000190036401A0DA10EAE0A951101A100AE04
+951791118C1A07190D003014101A10FCEC32EC310010E4F4ECF4EC10EEF6EE30B40F1B1F
+1B02015D01152E0123200011100021323637150E01232000111000213216052766E782FF
+00FEF00110010082E7666AED84FEADFE7A0186015386ED0562D55F5EFEC7FED8FED9FEC7
+5E5FD34848019F01670168019F470000000200C9000005B005D500080011002E40150095
+09810195100802100A0005190D32001C09041210FCECF4EC113939393931002FECF4EC30
+B2601301015D0111332000111000212521200011100029010193F40135011FFEE1FECBFE
+42019F01B20196FE68FE50FE61052FFB770118012E012C0117A6FE97FE80FE7EFE960000
+000100C90000048B05D5000B002E401506950402950081089504AD0A05010907031C0004
+0C10FCEC32D4C4C431002FECECF4EC10EE30B21F0D01015D132115211121152111211521
+C903B0FD1A02C7FD3902F8FC3E05D5AAFE46AAFDE3AA0000000100C90000042305D50009
+002940120695040295008104AD08050107031C00040A10FCEC32D4C431002FECF4EC10EE
+30B20F0B01015D13211521112115211123C9035AFD700250FDB0CA05D5AAFE48AAFD3700
+00010073FFE3058B05F0001D0039402000051B0195031B950812A111AE15950E91088C1E
+02001C1134043318190B101E10FCECFCE4FCC4310010E4F4ECF4EC10FED4EE1139393025
+1121352111060423200011100021320417152E0123200011100021323604C3FEB6021275
+FEE6A0FEA2FE75018B015E9201076F70FC8BFEEEFEED011301126BA8D50191A6FD7F5355
+0199016D016E01994846D75F60FECEFED1FED2FECE250000000100C90000053B05D5000B
+002C4014089502AD0400810A0607031C053809011C00040C10FCEC32FCEC3231002F3CE4
+32FCEC30B2500D01015D133311211133112311211123C9CA02DECACAFD22CA05D5FD9C02
+64FA2B02C7FD3900000100C90000019305D50003002EB700AF02011C00040410FC4BB010
+5458B9000000403859EC31002FEC3001400D30054005500560058F059F05065D13331123
+C9CACA05D5FA2B000001FF96FE66019305D5000B004240130B0200079505B000810C0508
+0639011C00040C10FC4BB0105458B9000000403859ECE43939310010E4FCEC1139393001
+400D300D400D500D600D8F0D9F0D065D13331110062B013533323635C9CACDE34D3F866E
+05D5FA93FEF2F4AA96C20000000100C90000056A05D5000A00EF40280811050605071106
+06050311040504021105050442080502030300AF09060501040608011C00040B10FCEC32
+D4C4113931002F3CEC321739304B5358071004ED071005ED071005ED071004ED5922B208
+0301015D4092140201040209081602280528083702360534084702460543085502670276
+027705830288058F0894029B08E702150603090509061B031907050A030A07180328052B
+062A073604360536063507300C41034004450540064007400C6203600468056707770570
+0C8B038B058E068F078F0C9A039D069D07B603B507C503C507D703D607E803E904E805EA
+06F703F805F9062C5D71005D711333110121090121011123C9CA029E0104FD1B031AFEF6
+FD33CA05D5FD890277FD48FCE302CFFD31000000000100C90000046A05D500050025400C
+0295008104011C033A00040610FCECEC31002FE4EC304009300750078003800404015D13
+3311211521C9CA02D7FC5F05D5FAD5AA000100C90000061F05D5000C00BF403403110708
+070211010208080702110302090A0901110A0A09420A070203080300AF080B0509080302
+01050A061C043E0A1C00040D10FCECFCEC11173931002F3CC4EC32111739304B53580710
+05ED071008ED071008ED071005ED5922B2700E01015D405603070F080F09020A15021407
+130A260226072007260A200A3407350A69027C027B07790A80028207820A90021604010B
+0313011B0323012C032708280934013C035608590965086A097608790981018D0395019B
+03145D005D13210901211123110123011123C9012D017D017F012DC5FE7FCBFE7FC405D5
+FC0803F8FA2B051FFC000400FAE10000000100C90000053305D500090079401E07110102
+0102110607064207020300AF0805060107021C0436071C00040A10FCECFCEC1139393100
+2F3CEC323939304B5358071004ED071004ED5922B21F0B01015D40303602380748024707
+690266078002070601090615011A06460149065701580665016906790685018A0695019A
+069F0B105D005D13210111331121011123C901100296C4FEF0FD6AC405D5FB1F04E1FA2B
+04E1FB1F00020073FFE305D905F0000B00170023401306951200950C91128C1809190F33
+031915101810FCECFCEC310010E4F4EC10EE300122001110003332001110002720001110
+002120001110000327DCFEFD0103DCDC0101FEFFDC013A0178FE88FEC6FEC5FE87017905
+4CFEB8FEE5FEE6FEB80148011A011B0148A4FE5BFE9EFE9FFE5B01A40162016201A50000
+000200C90000048D05D500080013003A40180195100095098112100A0802040005190D3F
+11001C09041410FCEC32FCEC11173931002FF4ECD4EC30400B0F151F153F155F15AF1505
+015D011133323635342623252132041514042B0111230193FE8D9A9A8DFE3801C8FB0101
+FEFFFBFECA052FFDCF92878692A6E3DBDDE2FDA800020073FEF805D905F0000B001D0052
+402A1110020F010C0D0C0E010D0D0C420F1E0C06951200951891128C0D1E0D1B0F0C0309
+191B33031915101E10FCECFCEC1139391139310010C4E4F4EC10EE391239304B53580710
+05ED071005ED17395922012200111000333200111000130123270E012320001110002120
+001110020327DCFEFD0103DCDC0101FEFF3F010AF4DD212310FEC5FE870179013B013A01
+78D1054CFEB8FEE5FEE6FEB80148011A011B0148FACFFEDDEF020201A50161016201A5FE
+5BFE9EFEFCFE8E00000200C90000055405D50013001C00B14035090807030A0611030403
+05110404034206040015030415950914950D810B040506031109001C160E050A19190411
+3F140A1C0C041D10FCEC32FCC4EC1117391139393931002F3CF4ECD4EC12391239123930
+4B5358071005ED071005ED1117395922B2401E01015D40427A1301050005010502060307
+041500150114021603170425002501250226032706260726082609201E36013602460146
+02680575047505771388068807980698071F5D005D011E01171323032E012B0111231121
+2016151406011133323635342623038D417B3ECDD9BF4A8B78DCCA01C80100FC83FD89FE
+9295959202BC16907EFE68017F9662FD8905D5D6D88DBA024FFDEE878383850000010087
+FFE304A205F00027007E403C0D0C020E0B021E1F1E080902070A021F1F1E420A0B1E1F04
+15010015A11494189511049500942591118C281E0A0B1F1B0700221B190E2D0719142228
+10DCC4ECFCECE4111239393939310010E4F4E4EC10EEF6EE10C6111739304B535807100E
+ED11173907100EED1117395922B20F2901015DB61F292F294F29035D01152E0123220615
+14161F011E0115140421222627351E013332363534262F012E01353424333216044873CC
+5FA5B377A67AE2D7FEDDFEE76AEF807BEC72ADBC879A7BE2CA0117F569DA05A4C5373680
+7663651F192BD9B6D9E0302FD04546887E6E7C1F182DC0ABC6E426000001FFFA000004E9
+05D50007004A400E0602950081040140031C0040050810D4E4FCE431002FF4EC3230014B
+B00A5458BD00080040000100080008FFC03811373859401300091F00100110021F071009
+400970099F09095D03211521112311210604EFFDEECBFDEE05D5AAFAD5052B00000100B2
+FFE3052905D50011004040160802110B0005950E8C09008112081C0A38011C00411210FC
+4BB0105458B90000FFC03859ECFCEC310010E432F4EC11393939393001B61F138F139F13
+035D133311141633323635113311100021200011B2CBAEC3C2AECBFEDFFEE6FEE5FEDF05
+D5FC75F0D3D3F0038BFC5CFEDCFED6012A012400000100100000056805D5000600B74027
+04110506050311020306060503110403000100021101010042030401AF00060403020005
+05010710D4C4173931002FEC3239304B5358071005ED071008ED071008ED071005ED5922
+B2500801015D406200032A03470447055A037D038303070600070208040906150114021A
+041A052A002601260229042905250620083800330133023C043C05370648004501450249
+0449054706590056066602690469057A0076017602790479057506800898009706295D00
+5D21013309013301024AFDC6D301D901DAD2FDC705D5FB1704E9FA2B00010044000007A6
+05D5000C017B4049051A0605090A09041A0A09031A0A0B0A021A01020B0B0A0611070807
+05110405080807021103020C000C011100000C420A050203060300AF0B080C0B0A090806
+05040302010B07000D10D4CC173931002F3CEC32321739304B5358071005ED071008ED07
+1008ED071005ED071008ED071005ED0705ED071008ED5922B2000E01015D40F206020605
+020A000A000A120A2805240A200A3E023E05340A300A4C024D05420A400A59026A026B05
+670A600A7B027F027C057F05800A960295051D0700090208030004060500050006010704
+08000807090009040A0A0C000E1A0315041508190C100E20042105200620072008230924
+0A250B200E200E3C023A033504330530083609390B3F0C300E460046014A024004450540
+0542064207420840084009440A4D0C400E400E58025608590C500E660267036104620560
+06600760086409640A640B770076017B027803770474057906790777087008780C7F0C7F
+0E860287038804890585098A0B8F0E97049F0EAF0E5B5D005D1333090133090133012309
+012344CC013A0139E3013A0139CDFE89FEFEC5FEC2FE05D5FB1204EEFB1204EEFA2B0510
+FAF000000001003D0000053B05D5000B006640060D0406000A0C10D4C4DCC4C431B48000
+7F0A025D0040050300AF09062F3CEC32304BB04250584014071106060509110A0B0A0311
+0405040111000B00050710EC0710EC0710EC0710EC40140B0A0307000809040700050904
+0601020A0306010F0F0F0F5913330901330901230901230181D901730175D9FE200200D9
+FE5CFE59DA021505D5FDD5022BFD33FCF8027BFD85031D000001FFFC000004E705D50008
+0094402803110405040211010205050402110302080008011100000842020300AF060207
+0440051C0040070910D4E4FCE4123931002FEC3239304B5358071005ED071008ED071008
+ED071005ED5922B2000A01015D403C050214023502300230053008460240024005400851
+02510551086502840293021016011A031F0A2601290337013803400A670168037803700A
+9F0A0D5D005D03330901330111231104D9019E019BD9FDF0CB05D5FD9A0266FCF2FD3902
+C70000000001005C0000051F05D500090090401B03110708070811020302420895008103
+950508030001420400060A10DC4BB009544BB00A545B58B90006FFC03859C4D4E4113939
+31002FECF4EC304B5358071005ED071005ED592201404005020A07180729022607380748
+02470748080905030B08000B16031A08100B2F0B350339083F0B47034A084F0B55035908
+660369086F0B770378087F0B9F0B165D005D13211501211521350121730495FC5003C7FB
+3D03B0FC6705D59AFB6FAA9A04910000000100B0FEF2025806140007003B400F04A906B2
+02A900B10805010343000810DC4BB00C5458B90000004038594BB012544BB013545B58B9
+0000FFC03859FCCC32310010FCECF4EC301321152311331521B001A8F0F0FE5806148FF9
+FC8F000000010000FF4202B205D50003002D4014021A010100001A03030242019F008104
+020001032FC43939310010F4EC304B5358071005ED071005ED592213012301AA0208AAFD
+F805D5F96D069300000100C7FEF2026F061400070030401003A901B205A900B108004304
+0602040810FC4BB00F544BB010545B58B90002004038593CDCEC310010FCECF4EC300111
+213533112335026FFE58EFEF0614F8DE8F06048F000100D903A805DB05D500060018400A
+0304010081070301050710DCCC39310010F4CC3239300901230901230103BC021FC9FE48
+FE48C9021F05D5FDD3018BFE75022D000001FFECFE1D0414FEAC0003000FB500A9010002
+0410C4C43100D4EC30011521350414FBD8FEAC8F8F000000000100AA04F0028906660003
+0031400901B400B3040344010410DCEC310010F4EC30004BB009544BB00E545B58BD0004
+FFC00001000400040040381137385909012301016F011A99FEBA0666FE8A01760002007B
+FFE3042D047B000A002500BC4027191F0B17090E00A91706B90E1120861FBA1CB923B811
+8C170C001703180D09080B1F030814452610FCECCCD4EC323211393931002FC4E4F4FCF4
+EC10C6EE10EE11391139123930406E301D301E301F3020302130223F27401D401E401F40
+2040214022501D501E501F50205021502250277027851D871E871F8720872185229027A0
+27F0271E301E301F30203021401E401F40204021501E501F50205021601E601F60206021
+701E701F70207021801E801F80208021185D015D0122061514163332363D01371123350E
+01232226353436332135342623220607353E0133321602BEDFAC816F99B9B8B83FBC88AC
+CBFDFB0102A79760B65465BE5AF3F00233667B6273D9B4294CFD81AA6661C1A2BDC0127F
+8B2E2EAA2727FC00000200BAFFE304A40614000B001C0038401903B90C0F09B918158C0F
+B81B971900121247180C06081A461D10FCEC3232F4EC31002FECE4F4C4EC10C6EE30B660
+1E801EA01E03015D013426232206151416333236013E0133320011100223222627152311
+3303E5A79292A7A79292A7FD8E3AB17BCC00FFFFCC7BB13AB9B9022FCBE7E7CBCBE7E702
+526461FEBCFEF8FEF8FEBC6164A8061400010071FFE303E7047B0019003F401B00860188
+040E860D880AB91104B917B8118C1A07120D004814451A10FCE432EC310010E4F4EC10FE
+F4EE10F5EE30400B0F1B101B801B901BA01B05015D01152E012322061514163332363715
+0E0123220011100021321603E74E9D50B3C6C6B3509D4E4DA55DFDFED6012D010655A204
+35AC2B2BE3CDCDE32B2BAA2424013E010E0112013A23000000020071FFE3045A06140010
+001C003840191AB9000E14B905088C0EB801970317040008024711120B451D10FCECF4EC
+323231002FECE4F4C4EC10C4EE30B6601E801EA01E03015D0111331123350E0123220211
+100033321601141633323635342623220603A2B8B83AB17CCBFF00FFCB7CB1FDC7A79292
+A8A89292A703B6025EF9ECA86461014401080108014461FE15CBE7E7CBCBE7E700020071
+FFE3047F047B0014001B00704024001501098608880515A90105B90C01BB18B912B80C8C
+1C1B1502081508004B02120F451C10FCECF4ECC4111239310010E4F4ECE410EE10EE10F4
+EE1112393040293F1D701DA01DD01DF01D053F003F013F023F153F1B052C072F082F092C
+0A6F006F016F026F156F1B095D71015D0115211E0133323637150E012320001110003332
+00072E0123220607047FFCB20CCDB76AC76263D06BFEF4FEC70129FCE20107B802A5889A
+B90E025E5ABEC73434AE2A2C0138010A01130143FEDDC497B4AE9E000001002F000002F8
+061400130059401C0510010C08A906018700970E06BC0A02130700070905080D0F0B4C14
+10FC4BB00A5458B9000B004038594BB00E5458B9000BFFC038593CC4FC3CC4C412393931
+002FE432FCEC10EE321239393001B640155015A015035D01152322061D01211521112311
+2335333534363302F8B0634D012FFED1B9B0B0AEBD0614995068638FFC2F03D18F4EBBAB
+00020071FE56045A047B000B0028004A4023190C1D0912861316B90F03B92623B827BC09
+B90FBD1A1D261900080C4706121220452910FCC4ECF4EC323231002FC4E4ECE4F4C4EC10
+FED5EE1112393930B6602A802AA02A03015D013426232206151416333236171002212226
+27351E013332363D010E0123220211101233321617353303A2A59594A5A59495A5B8FEFE
+FA61AC51519E52B5B439B27CCEFCFCCE7CB239B8023DC8DCDCC8C7DCDCEBFEE2FEE91D1E
+B32C2ABDBF5B6362013A01030104013A6263AA00000100BA000004640614001300344019
+030900030E0106870E11B80C970A010208004E0D09080B461410FCEC32F4EC31002F3CEC
+F4C4EC1112173930B2601501015D0111231134262322061511231133113E013332160464
+B87C7C95ACB9B942B375C1C602A4FD5C029E9F9EBEA4FD870614FD9E6564EF00000200C1
+00000179061400030007002B400E06BE04B100BC020501080400460810FC3CEC3231002F
+E4FCEC30400B1009400950096009700905015D1333112311331523C1B8B8B8B80460FBA0
+0614E9000002FFDBFE5601790614000B000F0044401C0B0207000EBE0C078705BD00BC0C
+B110081005064F0D01080C00461010FC3CEC32E4391239310010ECE4F4EC10EE11123939
+30400B1011401150116011701105015D13331114062B01353332363511331523C1B8A3B5
+4631694CB8B80460FB8CD6C09C61990628E90000000100BA0000049C0614000A00BC4029
+0811050605071106060503110405040211050504420805020303BC009709060501040608
+010800460B10FCEC32D4C4113931002F3CECE41739304B5358071004ED071005ED071005
+ED071004ED5922B2100C01015D405F04020A081602270229052B08560266026708730277
+05820289058E08930296059708A3021209050906020B030A072803270428052B062B0740
+0C6803600C8903850489058D068F079A039707AA03A705B607C507D607F703F003F704F0
+041A5D71005D1333110133090123011123BAB90225EBFDAE026BF0FDC7B90614FC6901E3
+FDF4FDAC0223FDDD000100C100000179061400030022B7009702010800460410FCEC3100
+2FEC30400D10054005500560057005F00506015D13331123C1B8B80614F9EC00000100BA
+0000071D047B0022005A4026061209180F00061D07150C871D2003B81BBC19100700110F
+0808065011080F501C18081A462310FCEC32FCFCFCEC11123931002F3C3CE4F43CC4EC32
+111217393040133024502470249024A024A024BF24DF24FF2409015D013E013332161511
+231134262322061511231134262322061511231133153E01333216042945C082AFBEB972
+758FA6B972778DA6B9B93FB0797AAB03897C76F5E2FD5C029EA19CBEA4FD87029EA29BBF
+A3FD870460AE67627C000000000100BA00000464047B001300364019030900030E010687
+0E11B80CBC0A010208004E0D09080B461410FCEC32F4EC31002F3CE4F4C4EC1112173930
+B46015CF1502015D0111231134262322061511231133153E013332160464B87C7C95ACB9
+B942B375C1C602A4FD5C029E9F9EBEA4FD870460AE6564EF00020071FFE30475047B000B
+0017004A401306B91200B90CB8128C1809120F51031215451810FCECF4EC310010E4F4EC
+10EE3040233F197B007B067F077F087F097F0A7F0B7B0C7F0D7F0E7F0F7F107F117B12A0
+19F01911015D012206151416333236353426273200111000232200111000027394ACAB95
+93ACAC93F00112FEEEF0F1FEEF011103DFE7C9C9E7E8C8C7E99CFEC8FEECFEEDFEC70139
+0113011401380000000200BAFE5604A4047B0010001C003E401B1AB9000E14B90508B80E
+8C01BD03BC1D11120B471704000802461D10FCEC3232F4EC310010E4E4E4F4C4EC10C4EE
+304009601E801EA01EE01E04015D2511231133153E013332001110022322260134262322
+061514163332360173B9B93AB17BCC00FFFFCC7BB10238A79292A7A79292A7A8FDAE060A
+AA6461FEBCFEF8FEF8FEBC6101EBCBE7E7CBCBE7E700000000020071FE56045A047B000B
+001C003E401B03B90C0F09B91815B80F8C1BBD19BC1D180C06081A47001212451D10FCEC
+F4EC3232310010E4E4E4F4C4EC10C6EE304009601E801EA01EE01E04015D011416333236
+353426232206010E012322021110003332161735331123012FA79292A8A89292A702733A
+B17CCBFF00FFCB7CB13AB8B8022FCBE7E7CBCBE7E7FDAE646101440108010801446164AA
+F9F60000000100BA0000034A047B001100304014060B0700110B03870EB809BC070A0608
+0008461210FCC4EC3231002FE4F4ECC4D4CC11123930B450139F1302015D012E01232206
+1511231133153E0133321617034A1F492C9CA7B9B93ABA85132E1C03B41211CBBEFDB204
+60AE6663050500000001006FFFE303C7047B002700E7403C0D0C020E0B531F1E08090207
+0A531F1F1E420A0B1E1F041500860189041486158918B91104B925B8118C281E0A0B1F1B
+0700521B080E07081422452810FCC4ECD4ECE4111239393939310010E4F4EC10FEF5EE10
+F5EE121739304B535807100EED111739070EED1117395922B2002701015D406D1C0A1C0B
+1C0C2E092C0A2C0B2C0C3B093B0A3B0B3B0C0B200020012402280A280B2A132F142F152A
+16281E281F292029212427860A860B860C860D12000000010202060A060B030C030D030E
+030F03100319031A031B031C041D09272F293F295F297F2980299029A029F029185D005D
+7101152E012322061514161F011E0115140623222627351E013332363534262F012E0135
+3436333216038B4EA85A898962943FC4A5F7D85AC36C66C661828C65AB40AB98E0CE66B4
+043FAE282854544049210E2A99899CB62323BE353559514B50250F2495829EAC1E000000
+00010037000002F2059E0013003840190E05080F03A9001101BC08870A0B080902040008
+10120E461410FC3CC4FC3CC432393931002FECF43CC4EC3211393930B2AF1501015D0111
+2115211114163B01152322263511233533110177017BFE854B73BDBDD5A28787059EFEC2
+8FFDA0894E9A9FD202608F013E000000000200AEFFE30458047B00130014003B401C0309
+00030E0106870E118C0A01BC14B80C0D0908140B4E020800461510FCECF439EC3231002F
+E4E432F4C4EC1112173930B46F15C01502015D1311331114163332363511331123350E01
+23222601AEB87C7C95ADB8B843B175C1C801CF01BA02A6FD619F9FBEA4027BFBA0AC6663
+F003A8000001003D0000047F0460000600FB402703110405040211010205050402110302
+060006011100000642020300BF0506050302010504000710D44BB00A5458B90000004038
+594BB014544BB015545B58B90000FFC03859C4173931002FEC3239304B5358071005ED07
+1008ED071008ED071005ED592201408E48026A027B027F02860280029102A40208060006
+0109030904150015011A031A0426002601290329042008350035013A033A043008460046
+014903490446054806400856005601590359045008660066016903690467056806600875
+0074017B037B0475057A068500850189038904890586069600960197029A039804980597
+06A805A706B008C008DF08FF083E5D005D133309013301233DC3015E015EC3FE5CFA0460
+FC5403ACFBA0000000010056000006350460000C01EB404905550605090A0904550A0903
+550A0B0A025501020B0B0A061107080705110405080807021103020C000C011100000C42
+0A050203060300BF0B080C0B0A09080605040302010B07000D10D44BB00A544BB011545B
+4BB012545B4BB013545B4BB00B545B58B9000000403859014BB00C544BB00D545B4BB010
+545B58B90000FFC03859CC173931002F3CEC32321739304B5358071005ED071008ED0710
+08ED071005ED071008ED071005ED0705ED071008ED59220140FF050216021605220A350A
+49024905460A400A5B025B05550A500A6E026E05660A79027F0279057F05870299029805
+940ABC02BC05CE02C703CF051D0502090306040B050A080B09040B050C1502190316041A
+051B081B09140B150C2500250123022703210425052206220725082709240A210B230C39
+0336043608390C300E460248034604400442054006400740084409440A440B400E400E56
+0056015602500451055206520750085309540A550B6300640165026A0365046A056A066A
+076E09610B670C6F0E7500750179027D0378047D057A067F067A077F07780879097F097B
+0A760B7D0C870288058F0E97009701940293039C049B05980698079908402F960C9F0EA6
+00A601A402A403AB04AB05A906A907AB08A40CAF0EB502B103BD04BB05B809BF0EC402C3
+03CC04CA05795D005D13331B01331B013301230B012356B8E6E5D9E6E5B8FEDBD9F1F2D9
+0460FC96036AFC96036AFBA00396FC6A0001003B000004790460000B0143404605110607
+06041103040707060411050401020103110202010B110001000A11090A0101000A110B0A
+0708070911080807420A070401040800BF05020A0704010408000208060C10D44BB00A54
+4BB00F545B4BB010545B4BB011545B58B90006004038594BB0145458B90006FFC03859C4
+D4C411173931002F3CEC321739304B5358071005ED071008ED071008ED071005ED071005
+ED071008ED071008ED071005ED59220140980A04040A1A04150A260A3D04310A55045707
+580A660A76017A047607740A8D04820A99049F049707920A900AA601A904AF04A507A30A
+A00A1C0A03040505090A0B1A03150515091A0B2903260525092A0B200D3A013903370534
+073609390B300D4903460545094A0B400D59005601590259035705560659075608560959
+0B500D6F0D78017F0D9B019407AB01A407B00DCF0DDF0DFF0D2F5D005D09022309012309
+013309010464FE6B01AAD9FEBAFEBAD901B3FE72D9012901290460FDDFFDC101B8FE4802
+4A0216FE71018F000001003DFE56047F0460000F018B40430708020911000F0A110B0A00
+000F0E110F000F0D110C0D00000F0D110E0D0A0B0A0C110B0B0A420D0B0910000B058703
+BD0E0BBC100E0D0C0A09060300080F040F0B1010D44BB00A544BB008545B58B9000B0040
+38594BB0145458B9000BFFC03859C4C4111739310010E432F4EC113911391239304B5358
+071005ED071008ED071008ED071005ED071008ED0705ED173259220140F0060005080609
+030D160A170D100D230D350D490A4F0A4E0D5A095A0A6A0A870D800D930D120A000A0906
+0B050C0B0E0B0F1701150210041005170A140B140C1A0E1A0F2700240124022004200529
+082809250A240B240C270D2A0E2A0F201137003501350230043005380A360B360C380D39
+0E390F30114100400140024003400440054006400740084209450A470D490E490F401154
+00510151025503500450055606550756085709570A550B550C590E590F50116601660268
+0A690E690F60117B08780E780F89008A09850B850C890D890E890F9909950B950C9A0E9A
+0FA40BA40CAB0EAB0FB011CF11DF11FF11655D005D050E012B01353332363F0101330901
+3302934E947C936C4C543321FE3BC3015E015EC368C87A9A488654044EFC94036C000000
+00010058000003DB04600009009D401A081102030203110708074208A900BC03A9050803
+01000401060A10DC4BB00B544BB00C545B58B90006FFC038594BB0135458B90006004038
+59C432C411393931002FECF4EC304B5358071005ED071005ED5922014042050216022602
+47024907050B080F0B18031B082B08200B36033908300B40014002450340044005430857
+0359085F0B6001600266036004600562087F0B800BAF0B1B5D005D132115012115213501
+2171036AFD4C02B4FC7D02B4FD650460A8FCDB93A803250000010100FEB2041706140024
+00774034190F150B0625091A10151D0B05202103000BA90900A901C00915A913B1250C09
+0A05241619001D0A05130214002019430A0F052510D44BB00C5458B90005004038593CC4
+FC3CC43239391112391112393911123939310010FCECC4F4EC10EE121739123911393911
+1239111239393001B20026015D05152322263D0134262B01353332363D0134363B011523
+22061D011406071E011D0114163304173EF9A96C8E3D3D8F6BA9F93E448D565B6E6F5A56
+8DBE9094DDEF97748F7395F0DD938F588DF89D8E191B8E9CF88D580000010104FE1D01AE
+061D00030012B70100B1040005020410D4EC310010FCCC300111231101AEAA061DF80008
+0000000000010100FEB2041706140024008740361F251B160C0F081B0B15190F04052003
+0019A91B00A923C01B0FA911B1251C191A150F010400081A15231204001A1F154310000B
+042510D44BB00A5458B90004FFC038594BB00E5458B90004004038593CC432FC3CC41112
+39391112391112393911123939310010FCECC4F4EC10EE12173911123939113911393911
+12393001B20026015D053332363D013436372E013D0134262B01353332161D0114163B01
+152322061D0114062B010100468C555A6F6F5A558C463FF9A76C8E3E3E8E6CA7F93FBE56
+8FF89C8E1B198E9DF88E578F93DDF095738F7497EFDD9400000100D901D305DB0331001D
+0023401001101B0C0013049C1B139C0C1E000F1E10D4C4310010D4FCD4EC10C011123939
+3001150E01232227262726272623220607353E01333217161716171633323605DB69B361
+6E920B05070F9B5E58AC6269B3616E930A05080E9B5E56A90331B24F443B040203053E4D
+53B24F453C040203053E4C0000020135FE8B020004600003000900654011070083048102
+BC0A08070400030501000A10FC3CEC323939310010F4E4FCCC30014BB00B5458BD000A00
+400001000A000AFFC03811373859014BB00F544BB010545B4BB013545B58BD000AFFC000
+01000A000A00403811373859B6000B200B500B035D012335331123111333130200CBCBCB
+15A2140362FEFA2B028F0165FE9B0000000200ACFEC704230598000600210051402B1316
+14000F0C010B078608880B10860F880CB914160BB91D1F1CB8168C221C1500091E130B0F
+070412192210DCECD43CD43C3CEC3232310010E4F43CC4EC10C4FEF4EE10F5EE12391112
+391112393025110E0115141601152E0127033E0137150E01071123112600111000371133
+131E0102A693A4A402104A88440146894841894D66F1FEF70109F16601498983035812E2
+B8B9E203A1AC292A03FCA0052A27AA1E2307FEE4012014013301010102013216011FFEE1
+04210000000100810000046205F0001B00604021071608018600120AA914080C04A00094
+1991100CA00E000D090B071C130F15111C10DC3CCCCCFC3CC4D4C431002FEC32F4E4EC10
+D43CEE3210EE11393930014BB00C5458BD001CFFC00001001C001C00403811373859B436
+01360202005D01152E012322061D0121152111211521353311233533351036333216044E
+4C883D94740187FE79022DFC1FECC7C7D6E83D9705B4B629299BD4D78FFE2FAAAA01D18F
+EE0105F31F0000000002005E005204BC04B20023002F0083404903091B15042D1E00271C
+02211D0C122D140B0A03130F011D2DB913EB0FEC27B91DEB21301E0C0012042A2414301C
+151B2A1D131C180903240B0A0103022428027306742A281C73183010DCE4ECF4E4EC1217
+391239391112393912393911123911121739310010D4E4ECF4E4EC10C011121739123939
+1112393911393912173930013717071E01151406071707270E01232226270727372E0135
+3436372737173E01333216133426232206151416333236037BCF72CE25242628D172CF3B
+743D3A783DCF71CF25252626CF73CF3774403C755C9B72709E9D71719C03E1D173CE3B77
+3E3F7339CF71CF28262525CF73CE3E763A407438CE73CF272524FE7C709A9A70729C9D00
+00010052000004C305D5001800C6404610021116110F020E0F1616110F02100F080D080E
+020D0D08420F0B090400D31706120BD31409100D81020C090E0305160F03151210030011
+66130065011C0D660A056507031910D43CEC32ECFCEC32EC12173912393911173931002F
+E432D43CEC32D43CEC32111239304B5358071005ED071008ED071008ED071005ED592201
+4BB00C5458BD0019FFC0000100190019004038113738594028860F900FA60FA00FB50F05
+270C270D270E291028112812370E3910870C8812A60DA50EAA10A9110E5D005D01211123
+112135213527213521013309013301211521071521048DFE63C9FE6001A054FEB40108FE
+C3BE017B0179BFFEC20108FEB554019F01C7FE3901C77B339B7B024AFD4402BCFDB67B9B
+3300000000020104FEA201AE059800030007001C400D01F50004F5050804000506020810
+DC3CEC32310010D4ECD4EC30011123111311231101AEAAAAAA0198FD0A02F60400FD0A02
+F60000000002005CFF3D03A205F0000B003E0091403C2F302A0600171D3036040D278A26
+0D8A0C2AC626C52310C60CC53C91233F2F0600173004131D2D0936031357392D57200957
+0C221A3926220357333F10DCECE4C4D4E4ECD4EC10EE113911123911173939310010C4F4
+E4EC10E6EE10EE10EE111739393911123930014BB00A544BB00B545B4BB00C545B4BB00E
+545B58BD003F00400001003F003FFFC03811373859010E01151416173E0135342613152E
+0123220615141716171E01151406071E0115140623222627351E0133323635342F012E01
+353436372E01353436333216017B3F3E8BFA3F3E8FCC538F38616CCE1A0ED3835C5D3E39
+CCAD499A5857943A6671DD19D6805D5B3B3BC8A6499903A82E5A2E4C85872D5B2E4B8802
+93A4272750475A730F08779A655A8C35346D408EA81D1DA42727544C667B0E7899665B8F
+312C7045829F1D00000200D7054603290610000300070092400E0602CE0400CD08016400
+0564040810DCFCD4EC310010FC3CEC3230004BB00A544BB00D545B58BD00080040000100
+080008FFC03811373859014BB00C544BB00D545B4BB00E545B4BB017545B58BD0008FFC0
+00010008000800403811373859014BB00F544BB019545B58BD00080040000100080008FF
+C03811373859401160016002600560067001700270057006085D0133152325331523025E
+CBCBFE79CBCB0610CACACA000003011B000006E505CD0017002F0049004340263DCB3E3A
+CC41CA2431CB3034CC47CA18C900C824C90C3761443D305E2A0906445E1E0906124A10DC
+CCFCEC10FEED3210EE31002FEEF6FEFDEED6EE10FDEED6EE300132041716121514020706
+04232224272602353412373624172206070E01151416171E01333236373E01353426272E
+0117152E0123220615141633323637150E0123222635343633321604009801076D6D6C6C
+6D6DFEF99898FEF96D6D6C6C6D6D01079883E25E5E60605E5EE28384E35E5D5D5E5C5EE3
+A742824295A7AB9B407A42438946D8FBFBD8498805CD6E6D6DFEFA9A98FEFB6D6D6E6E6D
+6D0105989A01066D6D6E675E5E5EE58281E35E5E5F5F5E5DE28385E35D5E5EF5812120AF
+9D9FAE1F227F1D1CF4D0D1F21C0000000003007301D5033B05F00003001E0029005F4033
+280725041F12181002E3001FDD1000E125DD050A19DF18DE15DD0AE01C912A00180D1F10
+220602012811066B046C18226B0D2A10DCECCCFCEC3232C0C011123939111239310010F4
+E4FCF4EC10C4EEEDD6EE10EE11123912391139393013211521011123350E012322263534
+363B0135342623220607353E013332160522061514163332363D018B02B0FD5002AE952C
+905D8098BFBCB675753E8844499145B7B3FEECA17E6252688202507B02B8FE40703F4487
+71878A045B5B22227F1C1CB0F0434F404D90721D0002009E008D042504230006000D0086
+404903E804050402E8010205050402E8030206000601E80000060AE80B0C0B09E808090C
+0C0B09E80A090D070D08E807070D4209020B04E70700A60E090C05020703006F050A076F
+0C6E0E10FCFC3CD4EC321139111239310010F43CEC323939304B5358071004ED071008ED
+071008ED071004ED071004ED071008ED071008ED071004ED592201150901150135131509
+011501350425FED3012DFE2B23FED3012DFE2B0423BFFEF4FEF4BF01A25201A2BFFEF4FE
+F4BF01A252000000000100D9011F05DB035E00050017400A049C020006031701000610DC
+D4EC310010D4C4EC30132111231121D90502A8FBA6035EFDC10195000001006401DF027F
+028300030011B6009C020401000410DCCC310010D4EC301321152164021BFDE50283A400
+0004011B000006E505CD0017002F0038004C006040364542433F32C94830C9394A43CA0C
+39CA00C918C80CC924484533300431423C3F39364931604B3660433C5E12091E4B5E0609
+1E5F2A4D10DCE4FCEC10FEFDC4EE10EE32113939123912173931002FEEF6FEED10ED3210
+EED6EE3912393930012206070E01151416171E01333236373E01353426272E0127320417
+161215140207060423222427260235341237362413231133323635342627321615140607
+1E011F0123272E012B01112311040083E25E5E60605E5EE28384E35E5D5D5E5C5EE38498
+01076D6D6C6C6D6DFEF99898FEF96D6D6C6C6D6D01077D7B7B6E575866B0AE696018432E
+89AC813B4936429B05665E5E5EE58281E35E5E5F5F5E5DE28385E35D5E5E676E6D6DFEFA
+9A98FEFB6D6D6E6E6D6D0105989A01066D6D6EFE62FEEC3E4B4C3F677779567011084D49
+DFD16033FE9C0344000100D50562032B05F60003002FB702EF00EE0401000410D4CC3100
+10FCEC30004BB009544BB00E545B58BD0004FFC000010004000400403811373859132115
+21D50256FDAA05F694000000000200C30375033D05F0000B001A0020401106C315C400C3
+0C911B095A125B035A181B10DCECFCEC310010F4ECFCEC30012206151416333236353426
+273216171E011514062322263534360200506E6E50506E6F4F40762B2E2EB98687B4B805
+6F6F504F6D6D4F4F7081312E2D724284B7B48786BA000000000200D9000005DB0504000B
+000F002E401805D007039C00D009010C9C0E0D02150400170C08150A061010D43CEC32FC
+3CEC3231002FECD43CECFC3CEC300111211521112311213521110121152103AE022DFDD3
+A8FDD3022DFDD30502FAFE0504FE7DAAFE7D0183AA0183FBA6AA00000001005E029C02B4
+05F00018004A4024007D060400177D060604420402000EDD0F00DD02F70BDD0F12911900
+0E087E01150E031910DCC4D4C4EC1139310010F4C4ECFCEC10EE111239304B5358071005
+ED17320705ED5922012115213536370035342623220607353E0133321615140106010C01
+A8FDAA223F01586855347A484D853991AEFEB538030E726E1F3801315E425123237B1C1C
+846C8BFEE430000000010062028D02CD05F00028004840270015130ADD091FDD2013DD15
+0DDD09F806F71CDD20F823912916130014197E26107E03141F092910DCC4C4D4ECD4EC11
+393939310010F4E4ECFCE4ECD4EC10EE10EE11123930011E0115140623222627351E0133
+32363534262B013533323635342623220607353E01333216151406020C5C65BEB1397D46
+3477436D786F6C565E5E61645F28665149803790A95A0460126D527C861514791B1A4F46
+4A4C6C3F3C3A3D1217731112766345600001017304EE0352066600030031400902B400B3
+040344010410D4EC310010F4EC30004BB009544BB00E545B58BD0004FFC0000100040004
+0040381137385901330123028BC7FEBA990666FE88000000000100AEFE5604E504600020
+004D402513191F03160603090C0301120F06871C168C0A01BC00BD2119091209080B4E1F
+020800462110FCEC32F4ECC41239310010E4E432F43CECDCC41117391112173930B61F22
+6022CF2203015D13113311141633323635113311141633323637150E01232226270E0123
+22262711AEB88A879495B8232509201C29492345520F329162668F2AFE56060AFD489194
+A8A8028DFCA23C390B0C9417164E504F4F4E4EFDD70000000001009EFF3B043905D5000D
+00254012080204C1008106020E00075D05035D010B0E10D4D4FCDCEC39310010C432F4EC
+1139300121112311231123112E01353424027901C08DBE8ED7EB010405D5F966061FF9E1
+034E11DDB8BEE800000100DB024801AE034600030012B7028300040119000410D4EC3100
+10D4EC3013331523DBD3D30346FE000000010123FE7502C100000013001F400E09060A0D
+F306001300102703091410DCD4ECD4CC31002FD4FCC4123930211E011514062322262735
+1E01333236353426270254373678762E572B224A2F3B3C2B2D3E6930595B0C0C83110F30
+2E1E573D00010089029C02C505DF000A002C40180700DD0903DD0402DD09F705910B087C
+065D037C017C000B10DCF4E4FCE4310010F4ECECD4EC10EE323013331107353733113315
+219CCCDFE689CDFDD7030A0263297427FD2B6E000003006001D5036405F00003000F001B
+002E401902E300E116DD0AE010DD04911C00130D01196B076C136B0D1C10DCECFCEC3911
+1239310010F4ECF4ECFCEC30132115210132161514062322263534361722061514163332
+363534268B02B0FD500158B3CECEB3B3D0D0B3697E7F68697D7C02507B041BDDBFBFDBDC
+BEBFDD73A18885A0A08589A0000200C1008D044804230006000D008640490CE80D0C090A
+090BE80A0A090DE80708070CE80B0C08080705E8060502030204E803030206E800010005
+E80405010100420C050A03E70700A60E0C08010500086F0A07016F0300700E10FC3CFCD4
+3CEC1239111239310010F43CEC323939304B5358071008ED071004ED071004ED071008ED
+071008ED071004ED071004ED071008ED59221301150135090125011501350901C101D5FE
+2B012DFED301B201D5FE2B012DFED30423FE5E52FE5EBF010C010CBFFE5E52FE5EBF010C
+010C0000FFFF0089FFE3077F05F01026007B000010270B4F048BFD6410070B2603350000
+FFFF0089FFE3073F05F01026007B000010270074048BFD6410070B2603350000FFFF0062
+FFE3077F05F010260075000010270B4F048BFD6410070B26033500000002008FFE6E03AC
+0460002000240086402F201A05020406190010860F880C002183230C9513BD23BC250622
+1916090501001A2209001C01221C21260F091C162510DCECD4FCECD4EC11123911123911
+12391239310010E4F4EC10FECD10F4EE123939173930014BB010544BB012545B4BB01354
+5B58BD0025FFC000010025002500403811373859400B7404740574067407761C055D0133
+1514060F010E0115141633323637150E012322263534363F013E01373E01351323353301
+F4BE375A5A3A33836D4EB4605EC067B8E04959583026080706C4CACA02CF9C6582575835
+5E31596E4643BC3938C29F4C8956562F3519153C36010EFEFFFF001000000568076B1226
+002400001007171904BC0175FFFF001000000568076B1226002400001007171704BC0175
+FFFF001000000568076D1226002400001107171A04BC01750010B4050D110A072B40050F
+0D0011025D310000FFFF001000000568075E1226002400001107171804BC01750014B40A
+142305072B400940144F2320142F23045D310000FFFF001000000568074E122600240000
+1107171604BC01750014B40A120D05072B400930123F0D00120F0D045D31000000030010
+00000568076D000B000E002100CB40540C110D0C1B1C1B0E111C1B1E111C1B1D111C1C1B
+0D11210F210C110E0C0F0F2120110F211F11210F21420C1B0F0D0903C115091E950D098E
+201C1E1D1C18201F210D12060E180C061B0056181C0F0656121C212210D4C4D4EC3210D4
+EE32113911391112391139391112393931002F3CE6D6EE10D4EE1112393939304B535807
+1005ED0705ED071008ED071005ED071005ED0705ED0705ED071008ED5922B2202301015D
+40201A0C730C9B0C03070F081B5023660D690E750D7B0E791C791D7620762180230C5D00
+5D013426232206151416333236030121012E013534363332161514060701230321032303
+54593F4057583F3F5998FEF00221FE583D3E9F7372A13F3C0214D288FD5F88D5065A3F59
+57413F5858FEF3FD19034E29734973A0A172467629FA8B017FFE81000002000800000748
+05D5000F00130087403911110E0F0E10110F0F0E0D110F0E0C110E0F0E420595030B9511
+01951095008111079503AD0D0911100F0D0C050E0A00040806021C120A0E1410D4D43CEC
+32D4C4C41112173931002F3CECECC4F4ECEC10EE10EE304B5358071005ED0705ED071005
+ED071005ED5922B2801501015D4013671177107711860C851096119015A015BF15095D01
+152111211521112115211121032301170121110735FD1B02C7FD3902F8FC3DFDF0A0CD02
+718BFEB601CB05D5AAFE46AAFDE3AA017FFE8105D59EFCF003100000FFFF0073FE750527
+05F01226002600001007007A012D0000FFFF00C90000048B076B12260028000010071719
+049E0175FFFF00C90000048B076B12260028000010071717049E0175FFFF00C90000048B
+076D1226002800001107171A049E017500074003400C015D31000000FFFF00C90000048B
+074E12260028000011071716049E017500094005400C4010025D3100FFFF003B000001BA
+076B1226002C000010071719032F0175FFFF00A20000021F076B1226002C000010071717
+032F0175FFFFFFFE00000260076D1226002C00001107171A032F01750008B401060A0007
+2B310000FFFF000600000258074E1226002C000011071716032F01750008B4000A070107
+2B3100000002000A000005BA05D5000C0019006740201009A90B0D95008112950E0B0707
+011913040F0D161904320A110D1C0800791A10F43CEC32C4F4EC10C4173931002FC632EE
+F6EE10EE32304028201B7F1BB01B039F099F0A9F0B9F0C9F0E9F0F9F109F11BF09BF0ABF
+0BBF0CBF0EBF0FBF10BF11105D015D132120001110002901112335331311211521113320
+0011100021D301A001B10196FE69FE50FE60C9C9CB0150FEB0F30135011FFEE1FECB05D5
+FE97FE80FE7EFE9602BC9001E3FE1D90FDEA0118012E012C01170000FFFF00C900000533
+075E1226003100001107171804FE01750014B400132204072B400930133F2210131F2204
+5D310000FFFF0073FFE305D9076B1226003200001007171905270175FFFF0073FFE305D9
+076B1226003200001007171705270175FFFF0073FFE305D9076D1226003200001107171A
+052701750010B40F1A1E15072B40051F1A101E025D310000FFFF0073FFE305D9075E1226
+0032000011071718052701750018B403213009072B400D30213F3020212F3010211F3006
+5D310000FFFF0073FFE305D9074E12260032000011071716052701750014B4031F1A0907
+2B4009401F4F1A101F1F1A045D31000000010119003F059C04C5000B0085404D0A9C0B0A
+070807099C080807049C0304070706059C060706049C0504010201039C0202010B9C0001
+000A9C090A010100420A080706040201000805030B090C0B0A0907050403010802000806
+0C10D43CCC321739310010D43CCC321739304B5358071008ED071005ED071005ED071008
+ED071005ED071008ED071005ED071008ED59220902070901270901370901059CFE3701C9
+77FE35FE357601C8FE387601CB01CB044CFE35FE377901CBFE357901C901CB79FE3501CB
+00030066FFBA05E5061700090013002B009E403C1D1F1A0D2B2C130A0100040D29262014
+0D042A261E1A0495260D951A91268C2C2B2C2A141710201E23130A0100041D2910071F07
+192333101917102C10FCECFCECC0111239391739123939111239391139310010E4F4EC10
+EE10C010C011123939123912173912391112393930402A57005A15571955216A1565217B
+15761C7521094613590056136A006413641C6A287C007313761C7A280B5D015D09011E01
+333200113426272E01232200111416170726023510002132161737170716121510002122
+2627072704B6FD333EA15FDC010127793DA15FDCFEFD2727864E4F0179013B82DD57A266
+AA4E50FE88FEC680DD5BA2670458FCB240430148011A70B8B84043FEB8FEE570BC449E66
+0108A0016201A54D4BBF59C667FEF69EFE9FFE5B4B4BBF58FFFF00B2FFE30529076B1226
+003800001007171904EE0175FFFF00B2FFE30529076B1226003800001007171704EE0175
+FFFF00B2FFE30529076D1226003800001107171A04EE01750014B40A141800072B40092F
+1420181F141018045D310000FFFF00B2FFE30529074E1226003800001107171604EE0175
+001CB401191409072B401150195F1440194F1420192F1410191F14085D310000FFFFFFFC
+000004E7076B1226003C00001007171704730175000200C90000048D05D5000C0015003D
+401B0E95090D9502F600810B150F090304011219063F0D0A011C00041610FCEC3232FCEC
+11173931002FF4FCECD4EC3040090F171F173F175F1704015D1333113332041514042B01
+1123131133323635342623C9CAFEFB0101FEFFFBFECACAFE8D9A998E05D5FEF8E1DCDCE2
+FEAE0427FDD1928686910000000100BAFFE304AC0614002F009A40302D27210C04060D20
+00042A1686171AB9132AB90397138C2E0C090D1D2021270908242708061D082410162D08
+1000463010FCC4FCCC10C6EED4EE10EE1139391239123931002FE4FEEE10FED5EE121739
+17393040400F050F060F070F270F288A0C8A0D070A060A070A0B0A0C0A0D0A1F0D200A21
+0C220426190D191F19203A203A214D1F4D20492149226A1F6A20A506A507A620185D015D
+133436333216170E011514161F011E0115140623222627351E013332363534262F012E01
+353436372E01232206151123BAEFDAD0DB0397A83A4139A660E1D3408849508C4174783B
+655C6057A7970883718288BB0471C8DBE8E00873602F512A256A8E64ACB71918A41E1D5F
+5B3F543E373B875B7FAC1D67708B83FB93000000FFFF007BFFE3042D0666122600440000
+110600435200000B40073F262F261F26035D3100FFFF007BFFE3042D0666122600440000
+110600765200000B40073F262F261F26035D3100FFFF007BFFE3042D0666122600440000
+1106028852000008B40B282C14072B31FFFF007BFFE3042D06371226004400001106029E
+52000014B4142E3C0B072B4009202E2F3C102E1F3C045D31FFFF007BFFE3042D06101226
+004400001106006A52000020B4142D280B072B40157F286F28502D5F28402D4F28302D3F
+28002D0F280A5D31FFFF007BFFE3042D07061226004400001106029C52000025400E262C
+142C260B0732381438320B072B10C42B10C4310040093F353F2F0F350F2F045D30000000
+0003007BFFE3076F047B00060033003E01034043272D253D0E0D0034A925168615881200
+A90E3A12B91C192E862DBA2A03B90EBB07310AB81F198C253F343726060F0025371C0726
+0F1500080D3D26080F2D370822453F10FCECCCD4FC3CD4ECC41112393911391112391112
+39310010C4E432F43CC4E4FC3CF4EC10C4EE3210EE10F4EE10EE11391139111239304081
+302B302C302D302E302F3030402B402C402D402E402F4030502B502C502D502E502F5030
+852B853080409040A040B040C040D040E040E040F0401D3F003F063F0D3F0E3F0F05302C
+302D302E302F402C402D402E402F502C502D502E502F6F006F066F0D6F0E6F0F602C602D
+602E602F702C702D702E702F802C802D802E802F1D5D71015D012E0123220607033E0133
+32001D01211E0133323637150E01232226270E0123222635343633213534262322060735
+3E013332160322061514163332363D0106B601A58999B90E444AD484E20108FCB20CCCB7
+68C86464D06AA7F84D49D88FBDD2FDFB0102A79760B65465BE5A8ED5EFDFAC816F99B902
+9497B4AE9E01305A5EFEDDFA5ABFC83535AE2A2C79777878BBA8BDC0127F8B2E2EAA2727
+60FE18667B6273D9B4290000FFFF0071FE7503E7047B1226004600001007007A008F0000
+FFFF0071FFE3047F066612260048000010070043008B0000FFFF0071FFE3047F06661226
+0048000010070076008B0000FFFF0071FFE3047F066612260048000011070288008B0000
+0008B4151E221B072B310000FFFF0071FFE3047F06101226004800001107006A008B0000
+000740034020015D31000000FFFFFFC7000001A6066610270043FF1D0000120600F30000
+FFFF00900000026F066610270076FF1D0000120600F30000FFFFFFDE0000025C06661226
+00F3000011070288FF1D00000008B401070B00072B310000FFFFFFF40000024606101226
+00F300001107006AFF1D00000008B4000B0801072B31000000020071FFE304750614000E
+00280127405E257B26251E231E247B23231E0F7B231E287B27281E231E26272827252425
+2828272223221F201F2120201F42282726252221201F08231E030F2303B91B09B9158C1B
+23B1292627120C212018282523221F051E0F060C121251061218452910FCECF4EC113939
+173912393911123939310010ECC4F4EC10EE12391239121739304B535807100EC9071008
+C9071008C907100EC9071008ED070EED071005ED071008ED5922B23F2A01015D40761625
+2B1F28222F232F2429252D262D272A283625462558205821602060216622752075217522
+132523252426262627272836243625462445255A205A21622062217F007F017F027A037B
+097F0A7F0B7F0C7F0D7F0E7F0F7F107F117F127F137F147B157A1B7A1C7F1D7F1E762076
+217822A02AF02A275D005D012E0123220615141633323635342613161215140023220011
+340033321617270527252733172517050346325829A7B9AE9291AE36097E72FEE4E6E7FE
+E50114DD12342A9FFEC1210119B5E47F014D21FED903931110D8C3BCDEDEBC7ABC01268F
+FEE0ADFFFEC9013700FFFA01370505B46B635CCC916F6162FFFF00BA0000046406371226
+005100001007029E00980000FFFF0071FFE3047506661226005200001006004373000000
+FFFF0071FFE3047506661226005200001006007673000000FFFF0071FFE3047506661226
+005200001106028873000008B40F1A1E15072B31FFFF0071FFE304750637122600520000
+1106029E73000014B415202E0F072B400920202F2E10201F2E045D31FFFF0071FFE30475
+06101226005200001106006A73000014B4031F1A09072B4009401F4F1A301F3F1A045D31
+000300D9009605DB046F00030007000B0029401400EA0206EA0402089C040A0C09050172
+0400080C10DCD43CFC3CC4310010D4C4FCC410EE10EE3001331523113315230121152102
+DFF6F6F6F6FDFA0502FAFE046FF6FE12F50241AA00030048FFA2049C04BC00090013002B
+00E4403C2B2C261F1D1A130A0100040D292620140D042A261E1A04B9260DB91AB8268C2C
+2B2C2A141710201E23130A01000410071F1D0712235129101217452C10FCEC32F4EC32C0
+11121739123939111239391139310010E4F4EC10EE10C010C01112393912391217391139
+3911123930407028013F2D5914561C551D56206A1566217F007B047F057F067F077F087F
+097F0A7F0B7F0C7B0D7A157B1A7F1B7F1C7F1D7F1E7F1F7F207B217F227F237F247F257B
+269B199525A819A02DF02D2659005613551D5A2869006613651C6A287A007413761C7A28
+891E95189A24A218AD24115D015D09011E01333236353426272E0123220615141617072E
+01351000333216173717071E011510002322262707270389FE1929674193AC145C2A673E
+97A913147D36360111F15D9F438B5F923536FEEEF060A13F8B600321FDB02A28E8C84F75
+9A2929EBD3486E2E974DC577011401383334A84FB34DC678FEEDFEC73433A84EFFFF00AE
+FFE304580666122600580000100600437B000000FFFF00AEFFE304580666122600580000
+100600767B000000FFFF00AEFFE304580666122600580000110602887B000008B40B171B
+01072B31FFFF00AEFFE3045806101226005800001106006A7B000018B4021B180A072B40
+0D401B4F18301B3F18001B0F18065D31FFFF003DFE56047F06661226005C000010060076
+5E000000000200BAFE5604A406140010001C003E401B14B905081AB9000E8C08B801BD03
+971D11120B471704000802461D10FCEC3232F4EC310010ECE4E4F4C4EC10C6EE30400960
+1E801EA01EE01E04015D2511231133113E01333200111002232226013426232206151416
+3332360173B9B93AB17BCC00FFFFCC7BB10238A79292A7A79292A7A8FDAE07BEFDA26461
+FEBCFEF8FEF8FEBC6101EBCBE7E7CBCBE7E70000FFFF003DFE56047F06101226005C0000
+1106006A5E000016B418171219072B400B30173F1220172F121F12055D310000FFFF0010
+0000056807311027007100BC013B1306002400000010B40E030209072B400540034F0202
+5D310000FFFF007BFFE3042D05F6102600714A001306004400000010B41803020F072B40
+056F027F03025D31FFFF00100000056807921027029A00CE014A1306002400000012B418
+000813072B310040056F006F08025D30FFFF007BFFE3042D061F1026029A4FD713060044
+00000008B422000819072B31FFFF0010FE7505A505D51226002400001007029D02E40000
+FFFF007BFE750480047B1226004400001007029D01BF0000FFFF0073FFE30527076B1226
+0026000010071717052D0175FFFF0071FFE303E706661226004600001007007600890000
+FFFF0073FFE30527076D1027171A054C01751306002600000009B204041E103C3D2F3100
+FFFF0071FFE303E706661226004600001007028800A40000FFFF0073FFE3052707501027
+171E054C0175120600260000FFFF0071FFE303E70614102702B804A40000120600460000
+FFFF0073FFE30527076D1226002600001107171B052D0175000740031F1D015D31000000
+FFFF0071FFE303E706661226004600001007028900890000FFFF00C9000005B0076D1027
+171B04EC0175120600270000FFFF0071FFE305DB06141226004700001107171505140000
+000B40075F1D3F1D1F1D035D31000000FFFF000A000005BA05D510060092000000020071
+FFE304F4061400180024004A40240703D30901F922B900161CB90D108C16B805970B021F
+0C04030008080A0647191213452510FCECF43CC4FC173CC431002FECE4F4C4EC10C4EEFD
+3CEE3230B660268026A02603015D01112135213533153315231123350E01232202111000
+33321601141633323635342623220603A2FEBA0146B89A9AB83AB17CCBFF00FFCB7CB1FD
+C7A79292A8A89292A703B6014E7D93937DFAFCA86461014401080108014461FE15CBE7E7
+CBCBE7E7FFFF00C90000048B07331226002800001007007100A1013DFFFF0071FFE3047F
+05F61027007100960000130600480000000740037000015D31000000FFFF00C90000048B
+076D1027171D04A10175130600280000000740034000015D31000000FFFF0071FFE3047F
+06481027029A00960000130600480000000740037000015D31000000FFFF00C90000048B
+07501027171E049E0175120600280000FFFF0071FFE3047F0614102702B8049600001206
+00480000FFFF00C9FE75048D05D51226002800001007029D01CC0000FFFF0071FE75047F
+047B1226004800001007029D01780000FFFF00C90000048B07671226002800001107171B
+04A6016F00074003400C015D31000000FFFF0071FFE3047F066112260048000011070289
+0094FFFB0010B400211D0F072B40050F21001D025D310000FFFF0073FFE3058B076D1027
+171A055C01751306002A00000009B2040415103C3D2F3100FFFF0071FE56045A06661026
+028868001306004A00000009B204040A103C3D2F31000000FFFF0073FFE3058B076D1226
+002A00001007171D051B0175FFFF0071FE56045A06481226004A00001007029A008B0000
+FFFF0073FFE3058B07501027171E055C01751306002A000000080040033F00015D300000
+FFFF0071FE56045A0614102702B8046A00001206004A0000FFFF0073FE01058B05F01027
+02D7055EFFED1206002A0000FFFF0071FE56045A0634102702C303E0010C1206004A0000
+FFFF00C90000053B076D1027171A050201751306002B00000014B40C020607072B40092F
+0220061F021006045D310000FFFFFFE500000464076D1027171A031601751306004B0000
+002AB414020613072B31004BB00E5158BB0014FFC00013FFC0383859400D901490138014
+801340144013065D000200C90000068B05D500130017003A401E060212950914110C9515
+AD0400810E0A070C17041C0538120D14011C001810DCEC3232CCFCEC3232CC31002F3CE4
+32FCECDC3232EC3232300133152135331533152311231121112311233533171521350171
+CA02DECAA8A8CAFD22CAA8A8CA02DE05D5E0E0E0A4FBAF02C7FD390451A4A4E0E0000000
+000100780000049F0614001B003E40210309000316010E12870D1506871619B810970A01
+0208004E130E11150908100B1C10DC32EC3232CCCCF4EC31002F3CECF4C4ECDC32EC3211
+1217393001112311342623220615112311233533353315211521113E01333216049FB87C
+7C95ACB97D7DB90160FEA042B375C1C602A4FD5C029E9F9EBEA4FD8704F6A47A7AA4FEBC
+6564EF00FFFFFFE400000278075E10271718032E01751306002C00000008B41E09181F07
+2B310000FFFFFFD30000026706371027029EFF1D0000130600F300000008B41C08161D07
+2B310000FFFF000300000259073110270071FF2E013B1306002C00000008B40403020507
+2B310000FFFFFFF20000024805F510270071FF1DFFFF130600F300000008B40403020507
+2B310000FFFFFFF500000267076D1027171D032E01751306002C00000008B40E00080F07
+2B310000FFFFFFE40000025606481027029AFF1D0000130600F300000008B40E00080F07
+2B310000FFFF00B0FE75022505D51027029DFF6400001206002C0000FFFF0096FE75020B
+06141027029DFF4A00001206004C0000FFFF00C90000019507501226002C00001107171E
+032F01750013B306010700103C103C3100B43F073F06025D30000000000200C100000179
+047B00030004002C400B04B800BF0204010800460510FCEC3931002FECE4304011040434
+0444041006400650066006700608015D1333112313C1B8B85C0460FBA0047B00FFFF00C9
+FE6603EF05D51027002D025C00001106002C00000008400311040110EC310000FFFF00C1
+FE5603B106141027004D023800001106004C00000008400319460110EC310000FFFFFF96
+FE66025F076D1027171A032E01751306002D00000008B408020607072B310000FFFFFFDB
+FE56025C066610270288FF1D0000130601F900000008B408020607072B310000FFFF00C9
+FE1E056A05D5102702D7051B000A1206002E0000FFFF00BAFE1E049C0614102702D704AC
+000A1206004E0000000100BA0000049C0460000A00BB4028081105060507110606050311
+040504021105050442080502030300BC09060501040608010800460B10FCEC32D4C41139
+31002F3CEC321739304B5358071004ED071005ED071005ED071004ED5922B2100C01015D
+405F04020A081602270229052B0856026602670873027705820289058E08930296059708
+A3021209050906020B030A072803270428052B062B07400C6803600C8903850489058D06
+8F079A039707AA03A705B607C507D607F703F003F704F0041A5D71005D13331101330901
+23011123BAB90225EBFDAE026BF0FDC7B90460FE1B01E5FDF2FDAE0221FDDF00FFFF00C9
+0000046A076C10271717036E01761206002F0000FFFF00C10000024A076C10271717035A
+01761306004F0000001EB10304103C31004BB00E5158B900000040385940079F008F004F
+00035D30FFFF00C9FE1E046A05D5102702D7049B000A1206002F0000FFFF0088FE1E01AD
+0614102702D7031E000A1306004F0000000740034000015D31000000FFFF00C90000046A
+05D510271715029FFFC31206002F0000FFFF00C100000300061410271715023900021106
+004F0000000940058F001F00025D3100FFFF00C90000046A05D510270079023100771206
+002F0000FFFF00C10000028406141027007900D600731106004F000000174BB00D514BB0
+11534BB018515A5B58B9000000403859310000000001FFF20000047505D5000D003F401E
+0C0B0A040302060006950081080304010B0E000405011C0C073A0900790E10F43CECC4FC
+3CC411123911123931002FE4EC11173930B4300F500F02015D1333112517011121152111
+072737D3CB013950FE7702D7FC5E944DE105D5FD98DB6FFEEEFDE3AA023B6A6E9E000000
+00010002000002480614000B005E401A0A090804030206009706030401090A00047A0501
+080A7A07000C10D43CE4FC3CE411123911123931002FEC173930014BB0105458BD000C00
+400001000C000CFFC038113738594013100D400D500D600D73047A0A700DE00DF00D095D
+133311371707112311072737C7B87D4CC9B87B4AC50614FDA65A6A8DFCE3029A586A8D00
+FFFF00C900000533076C1027171704C50176130600310000000740034F00015D31000000
+FFFF00BA00000464066D102600764207130600510000000940053F004F00025D31000000
+FFFF00C9FE1E053305D5102702D70500000A120600310000FFFF00BAFE1E0464047B1027
+02D70490000A120600510000FFFF00C900000533075F1226003100001107171B04F50167
+0014B4040F0B00072B40092F0F200B1F0F100B045D310000FFFF00BA0000046406661226
+0051000011070289008D00000010B40019150C072B40050F190015025D310000FFFF00CD
+000005B905D510270051015500001006027E1B00000100C9FE56051905F0001C003B400D
+191612181C1C120A051C07411D10FC4BB0105458B90007FFC03859EC32D4FCCC11310040
+0C199516B00702950E910881072FE4F4EC10F4EC30011021220615112311331536373633
+321219011407062B0135333236350450FECDB3D7CACA4E696A99E3E95152B55731664F03
+7F01ACFFDEFCB205D5F1864343FEC1FECCFC6FD561609C5AA0000000000100BAFE560464
+047B001F003B401C0D13000318150787061087181CB816BC15070D08004E131708164620
+10FCEC32F4ECC431002FE4F4C4ECD4EC1112173930B46021CF2102015D01111407062B01
+3533323736351134262322061511231133153637363332171604645251B5FEE96926267C
+7C95ACB9B942595A75C1636302A4FD48D660609C30319902B29F9EBEA4FD870460AE6532
+32777800FFFF0073FFE305D90731102700710127013B1306003200000010B40D02030707
+2B40051F021003025D310000FFFF0071FFE3047505F51026007173FF1306005200000008
+B413020319072B31FFFF0073FFE305D9076D1027171D052701751306003200000010B411
+000817072B400510001F08025D310000FFFF0071FFE3047506481026029A730013060052
+00000008B41D080023072B31FFFF0073FFE305D9076B1027171F05270175120600320000
+FFFF0071FFE3047506661027029F00A00000120600520000000200730000080C05D50010
+0019003B401F059503110195008118079503AD091812100A1506021C1100040815190D10
+1A10FCECD4C4C4D4EC32123939393931002FECEC32F4EC3210EE30011521112115211121
+152120001110002117232000111000213307FAFD1A02C7FD3902F8FBD7FE4FFE4101BF01
+B16781FEBFFEC0014001418105D5AAFE46AAFDE3AA017C0170016D017CAAFEE1FEE0FEDF
+FEDF000000030071FFE307C3047B0006002700330084403107080010860F880C00A9082E
+0CB916132803B908BB22251FB819138C340600162231090F0008074B311209512B121C45
+3410FCECF4FCF4ECC4111239391239310010E432F43CC4E4EC3210C4EE3210EE10F4EE11
+12393040253F355F3570359F35CF35D035F035073F003F063F073F083F09056F006F066F
+076F086F09055D71015D012E01232206070515211E0133323637150E01232226270E0123
+2200111000333216173E01333200252206151416333236353426070A02A48999B90E0348
+FCB20CCCB76AC86264D06AA0F25147D18CF1FEEF0111F18CD3424EE88FE20108FAB094AC
+AB9593ACAC029498B3AE9E355ABEC73434AE2A2C6E6D6E6D01390113011401386F6C6B70
+FEDD87E7C9C9E7E8C8C7E900FFFF00C900000554076C1027171704950176120600350000
+FFFF00BA00000394066D1026007642071206005500000000FFFF00C9FE1E055405D51027
+02D70510000A120600350000FFFF0082FE1E034A047B102702D70318000A120600550000
+FFFF00C900000554075F1226003500001107171B047D016700080040035F1D015D300000
+FFFF00BA0000035A0666122600550000110602891B000010B411171309072B40050F1700
+13025D31FFFF0087FFE304A2076C1027171704950176120600360000FFFF006FFFE303C7
+066D1026007642071206005600000000FFFF0087FFE304A2076D1027171A049301751306
+00360000000BB404201529291049633A31000000FFFF006FFFE303C70666102602882500
+130600560000000BB404201529291049633A3100FFFF0087FE7504A205F0122600360000
+1007007A008B0000FFFF006FFE7503C7047B1226005600001006007A17000000FFFF0087
+FFE304A2076D1226003600001107171B048B0175000BB42B200E22221049633A31000000
+FFFF006FFFE303C70666122600560000110702BD04270000000BB42B200E22221049633A
+31000000FFFFFFFAFE7504E905D51026007A50001206003700000000FFFF0037FE7502F2
+059E1026007AE1001206005700000000FFFFFFFA000004E9075F1226003700001107171B
+047301670010B4010D0900072B310040035F08015D300000FFFF0037000002FE06821226
+005700001107171502370070000740038F14015D310000000001FFFA000004E905D5000F
+00464018070B95040C09030F9500810905014007031C0C00400A0E1010D43CE4CCFC3CE4
+CC31002FF4EC3210D43CEC323001401300111F00100110021F0F1011401170119F11095D
+032115211121152111231121352111210604EFFDEE0109FEF7CBFEF70109FDEE05D5AAFD
+C0AAFDBF0241AA024000000000010037000002F2059E001D0043401F0816A90517041AA9
+00011BBC0D8710100D0E020608040008171B15191D461E10FC3C3CC432FC3C3CC4C43239
+3931002FECF43CC4FC3CDC3CEC3230B2AF1F01015D011121152115211521151417163B01
+15232227263D0123353335233533110177017BFE85017BFE85252673BDBDD55151878787
+87059EFEC28FE98EE98927279A504FD2E98EE98F013E0000FFFF00B2FFE30529075E1027
+171804EE01751306003800000010B41F091827072B400510091F18025D310000FFFF00AE
+FFE3045806371027029E008300001306005800000008B41E081626072B310000FFFF00B2
+FFE3052907311027007100EE013B1306003800000014B40503020D072B40092F0220031F
+021003045D310000FFFF00AEFFE3045805F5102700710083FFFF1306005800000008B406
+03020E072B310000FFFF00B2FFE30529076D1027171D04EE01751306003800000010B40F
+000817072B400510001F08025D310000FFFF00AEFFE3045806481027029A008300001306
+005800000008B410000818072B310000FFFF00B2FFE30529076F1226003800001007029C
+00F00069FFFF00AEFFE3045806CA1226005800001106029C7CC40009400540154021025D
+31000000FFFF00B2FFE30529076B1027171F04EE0175120600380000FFFF00AEFFE3045E
+06661027029F00B00000120600580000FFFF00B2FE75052905D51226003800001007029D
+00FA0000FFFF00AEFE7504E8047B1226005800001007029D02270000FFFF0044000007A6
+07741027171A05F5017C1306003A00000008B415020614072B310000FFFF005600000635
+066D10270288014500071306005A00000008B415020614072B310000FFFFFFFC000004E7
+07741027171A0472017C1306003C00000008B40B020607072B310000FFFF003DFE56047F
+066D102602885E071306005C00000008B418020617072B31FFFFFFFC000004E7074E1226
+003C000011071716047301750008B400100B04072B310000FFFF005C0000051F076C1027
+1717049501761206003D0000FFFF0058000003DB066D1026007642071206005D00000000
+FFFF005C0000051F07501027171E04BE01751206003D0000FFFF0058000003DB06141027
+02B8041700001306005D0000000E0140094F0A5F0AAF0ADF0A045D31FFFF005C0000051F
+076D1226003D00001007171B04BE0175FFFF0058000003DB06661226005D000011060289
+1B000010B4010F0B00072B40050F0F000B025D310001002F000002F80614001000234012
+0B870A970102A905BC010A10080406024C1110FC3CCCFCCC31002FF4EC10F4EC30212311
+2335333534363B011523220706150198B9B0B0AEBDAEB063272603D18F4EBBAB99282967
+00020020FFE304A40614000F002C0044402504B910140CB9201C8C14B8222925A92C2427
+97222E45001218472A20062C2808252327462D10FC3CCCEC323232CCF4ECEC31002FF4DC
+3CEC3210E4F4C4EC10C6EE30013427262322070615141716333237360136373633321716
+11100706232227262715231123353335331521152103E5535492925453535492925453FD
+8E3A59587BCC7F80807FCC7B58593AB99A9AB90145FEBB022FCB74737374CBCB74737374
+0252643031A2A2FEF8FEF8A2A2313064A805047D93937D000003FF970000055005D50008
+00110029004340231900950A0995128101950AAD1F110B080213191F05000E1C1605191C
+2E09001C12042A10FCEC32FCECD4EC111739393931002FECECF4EC10EE3930B20F220101
+5D01112132363534262301112132363534262325213216151406071E0115140423211122
+061D012335343601F70144A39D9DA3FEBC012B94919194FE0B0204E7FA807C95A5FEF0FB
+FDE884769CC002C9FDDD878B8C850266FE3E6F727170A6C0B189A21420CB98C8DA05305F
+693146B5A3000000FFFF00C9000004EC05D5120603A50000000200BAFFE304A406140016
+00260038401F1BB9000423B9100C8C04B81216A913971228451417120847101F16081346
+2710FCEC3232F4ECC4EC31002FF4EC10E4F4C4EC10C6EE30013637363332171611100706
+23222726271523112115250134272623220706151417163332373601733A59587BCC7F80
+807FCC7B58593AB9034EFD6B027253549292545353549292545303B6643031A2A2FEF8FE
+F8A2A2313064A80614A601FCC0CB74737374CBCB7473737400020000000004EC05D5000A
+00170033400C170B190019102E050B1C15162FDCEC32FCECC410CC31400905950CAD0B81
+069514002FECE4F4ECB315150B141112392F300134272623211121323736011121320415
+1404232111230104174F4EA3FEBC0144A34E4FFD7C014EFB0110FEF0FBFDE8C9013801B7
+8B4443FDDD444304A8FD9ADADEDDDA044401910000020000FFE304A406150012001E003E
+400D111220131206470D1912080F102FDCEC3232F4ECC410CC31400E0016B903B80E0C1C
+B9098C11970E002FE4F4ECC410F4ECC4B30F0F110E1112392F30013E0133320011100223
+22262715231123013301342623220615141633323601733AB17BCC00FFFFCC7BB13AB9BA
+0122510272A79292A7A79292A703B66461FEBCFEF8FEF8FEBC6164A8044401D1FC1ACBE7
+E7CBCBE7E700000000010073FFE3052705F000190030401B19860088169503911A0D860C
+881095098C1A1B10131906300D001A10DC3CF4ECEC310010F4ECF4EC10F4ECF4EC30133E
+0133200011100021222627351E01332000111000212206077368ED8601530186FE7AFEAD
+84ED6A66E78201000110FEF0FF0082E76605624747FE61FE98FE99FE614848D35F5E0139
+0127012801395E5F00010073FFE3065A0764002400444022219520250DA10EAE0A951101
+A100AE04951791118C25200719141B110D003014102510FCFC32EC10ECC4310010E4F4EC
+F4EC10EEF6EE10DCEC30B40F261F2602015D01152E0123200011100021323637150E0123
+200011100021321716173637363B0115232206052766E782FF00FEF00110010082E7666A
+ED84FEADFE7A01860153609C0D0C105366E34D3F866E0562D55F5EFEC7FED8FED9FEC75E
+5FD34848019F01670168019F240304C3627AAA9600010071FFE304CC06140022004E4024
+00860188040E860D880AB91104B917B8118C2301871E972307121419081E0D0048144523
+10FCF432CCEC10EC310010F4EC10E4F4EC10FEF4EE10F5EE30400B0F24102480249024A0
+2405015D01152E0123220615141633323637150E012322001110002132173534363B0115
+23220603E74E9D50B3C6C6B3509D4E4DA55DFDFED6012D01064746A1B54530694C047EF5
+2B2BE3CDCDE32B2BAA2424013E010E0112013A0C0FD6C09C61000000FFFF000A000005BA
+05D51006009200000002FF970000061405D50008001A002E401500950981019510080210
+0A0005190D32001C09041B10FCECF4EC113939393931002FECF4EC30B2601301015D0111
+332000111000212521200011100029011122061D012335343601F7F40135011FFEE1FECB
+FE42019F01B20196FE68FE50FE6184769CC0052FFB770118012E012C0117A6FE97FE80FE
+7EFE9605305F693146B5A300000200C9000004EC05D500070014002E400C160804131C0A
+2E00190E101510FCECF4EC32C4C431400C139509810A049512AD03950A002FECF4EC10F4
+EC30011029011121220611211121222435342433211121019E01400144FEBCA39D034EFD
+E8FBFEF00110FB014EFD7C01B7FEEF0223870393FA2BDADEDDDA01C000020071FFE3045A
+06140012001E003F401D1CB9110E16B905088C0EB8031287019703190411080247001312
+0B451F10FCECC4F4EC323231002FFCEC10E4F4C4EC10C4EE30B660208020A02003015D01
+35211123350E012322021110003332161711011416333236353426232206010D034DB83A
+B17CCBFF00FFCB7CB13AFD8DA79292A8A89292A7056EA6F9ECA864610144010801080144
+616401B9FCC0CBE7E7CBCBE7E700000000020071FE560474046300190027005440140D0C
+0B202945170B12021A12175106201211452810FCECC4F4B27F17015DECD4EC10EC111239
+3900400E0D0C1D09060709B9041DB914B62810F4ECD4FCD4CC1112393940060025530C0D
+0C070E10EC39313025161510212227351633323534252627261110003332000314020336
+262322061514161716173E01036B9DFE47DD7866F6F6FEF8D0758E0112EFF00113019B27
+01AB9494ACBC7E4033636E424F8DFEF0469946755C30257087010F010F0139FEC7FEED9C
+FEFC01A0CBE5E8C3C2C70B060E2ADC00000100830000044505D5000B002B40090D05091C
+000B07020C10DCC4C4D4EC32C431400C0A950B8102069507AD039502002FECF4EC10F4EC
+300111213521112135211121350445FC3E02F8FD3902C7FD1A05D5FA2BAA021DAA01BAAA
+00020075FFE305D905F00013001A0044402601140008A107AE04009514179511009514AD
+04950B91118C1B01141A1A190F3314190700101B10FCC4ECF4EC111239310010E4F4ECF4
+E410EE10EE10F4EE11123930132110002122060735362433200011100021200037160033
+32003775048FFEEDFEEE8BFC706F010792015E018BFE88FEC6FEB7FE97DC0D00FFCACA00
+FF0D030C010C0132605FD74648FE67FE92FE9FFE5B01B7CCC3FEE4011CC30000000100A4
+FFE3047B05F00028004040240A8609880D9506912900169513AD291F8620881C95238C29
+2A14091F101903191926102910FCECD4ECD4C4C4CC310010F4ECF4EC10F4EC3910F4ECF4
+EC30012E0135342433321617152E012322061514163B011523220615141633323637150E
+0123202435343601D8838E010CE659C97372BE5398A39E95B6AEA5B9C7BE6DC8546AC75E
+FEE8FED0A3032521AB7CB2D12020B426247B737077A695848F963231C32525F2DD90C400
+0001FF96FE66042305D500110041401F1108120D950CB0120695040295008104AD121108
+00070C050107031C00041210FCEC32D4C4C411123939310010ECF4EC10EE10F4EC103939
+30B20F0B01015D13211521112115211110062B013533323635C9035AFD700250FDB0CDE3
+4D3F866E05D5AAFE48AAFD9FFEF2F4AA96C200000001FF7FFE5602F80614001B00654023
+130A0F870DBD1D0518011408A906018700971606BC1C021B0700070905081517134C1C10
+FC4BB00A5458B90013004038594BB0165458B90013FFC038593CC4FC3CC4C41239393100
+10E432FCEC10EE3212393910F4EC39393001B6401D501DA01D035D01152322061D012115
+211114062B013533323635112335333534363302F8B0634D012FFED1AEBDAEB0634DB0B0
+AEBD0614995068638FFBEBBBAB995068042A8F4EBBAB000000010073FFE3069707640026
+004940101502001C04111C1A34043321190B462710FCECFCF4EC10FCC4C4314018169515
+270005240195032495081BA11AAE1E950E91088C270010E4F4ECF4EC10FED4EE11393910
+DCEC3025112135211106042320001110002132161734363B01152322061D012E01232000
+11100021323604C3FEB6021275FEE6A0FEA2FE75018B015E5BA344C9E34D3F866E70FC8B
+FEEEFEED011301126BA8D50191A6FD7F53550199016D016E01991919BCEAAA96C2D75F60
+FECEFED1FED2FECE2500000000020008FE52057605D5000F00250095400D275012011204
+19170C191F242610D4D4ECD4ECD45DC4B510080003040C1112173931400A00951BBD1125
+122481260010E4323232F4ECB31F17081B1112393930400C131111121208232511242408
+070510EC3C0710EC3CB613110812082408070810ECB623110824081208070810ECB41025
+1311230F40101615140317132408222120031F2312080407111217390711121739013237
+363534272627060706151417161301330116171615140706232227263534373637013302
+BF362C1C1F332C2C331F1C2C3601D9DEFDBA68432E4B649B9B644B2E4368FDBADEFEFD20
+14423949795C5C794939421420037A035EFBCFC8AE77428B415757418B4277AEC8043100
+000100BA000007470614002A004F40112C0D120408112A1508264E1F1B081D462B10FCEC
+32F4ECC4C4CCD4EC3931004019088709271426008711151B260320111887200923B81E97
+111C2F3CECF43CC4EC1112173910EC12393910EC30253237363534272627351617161114
+002B012226351134262322061511231133113E013332161511141633054C9554574A3E79
+E06D6FFEE0DD46BB9D7C7C95ACB9B942B375C1C64C699C62659BDE705F21941D8F91FEEC
+F5FEE6C8CE01089F9EBEA4FD870614FD9E6564EFE8FEF29367000000000100C9000002C6
+05D5000B002E40100B02000695008107050806011C00040C10FC4BB0105458B900000040
+3859ECC4393931002FE4EC113939300113331114163B011523222611C9CA6E863F4DE3CD
+05D5FC2DC296AAF4010E00000001000A0000025205D5000B00454011020B95050800AF06
+0305011C0A0800040C10FC3CC44BB0105458BB0008004000000040383859EC32C431002F
+ECDC3CF4323001400D300D400D500D600D8F0D9F0D065D133311331523112311233533C9
+CABFBFCABFBF05D5FD16AAFDBF0241AA000100C9000005F705F000170066400E001C0107
+080F07090B0F1C0E041810FCEC32D4C4113910D4EC00310040250B110809080A11090908
+11110708071011080807420B0810030E0C1702059513910EAF0C092F3CECF4EC39391112
+1739304B5358071004ED071005ED071005ED071004ED5922012335342623220709012101
+11231133110136333217161505F7AA49264625FDDD031AFEF6FD33CACA026C5571885555
+044879365023FDF9FCE302CFFD3105D5FD8902434F5C5B6E000100B90000049C06140012
+00CB400B040D090C0E10090800461310FCEC32D4C41139C43100400F42100D0A030B1106
+9503970BBC110E2F3CE4FCE411121739304B5358401410110D0E0D0F110E0E0D0B110C0D
+0C0A110D0D0C071004ED071005ED071005ED071004ED59B2101401015D40350B0B0A0F28
+0B270C280D2B0E2B0F4014680B6014890B850C890D8D0E8F0F9A0B970FAA0BA70DB60FC5
+0FD60FF70BF00BF70CF00C1A5DB4090D090E0271004025040A0A10160A270A290D2B1056
+0A660A6710730A770D820A890D8E10930A960D9710A30A125D1334363B01152322061511
+0133090123011123B9A3B5BFA8694C0225EBFDAE026BF0FDC7B9047ED6C09C6199FDFF01
+E3FDF4FDAC0223FDDD0000000001000A0000022A0614000B003240070501080800460C10
+FC3CEC3231004008020BA905080097062FECD43CEC3230400D100D400D500D600D700DF0
+0D06015D133311331523112311233533C1B8B1B1B8B7B70614FD3890FD4402BC90000000
+0001003D0000047F0614000F00A0401308020B05010E070D080C06090406110C06001010
+D4C4B28006015DD4C410C4CC11121739B410094009025D3100400F08020B05010E060600
+040906970D002F3CF4C4C4111217393040320A03A902A90BA90508040C0709040F11000E
+11010D060100051102110E110F0E011100010D110C070C0B11081107110D060D070510EC
+ECEC071005EC08EC08EC05ECEC070810EC0510EC0708103C3CECEC0EFC3C330127052725
+273317251705012309013D01EB47FED42101294BC834013A21FEC901EDC3FEC6FE7E0432
+BC656363C58A686168FAD7033CFCC400000100B2FFE3072705D50027004A401200121420
+1D1C291F50121C14500A1C08042810FCECFCFCFCCCFC3C1112393100401607140A1C1100
+0621080E18952103248C28121D0881202FF43C3C10F43CC4EC32111217393039250E0123
+2227263511331114171633323635113311141716333237363511331123350E0123222726
+03A645C082AF5F5FCB2739758FA6CB3939777B5353CBCB3FB0797A5655D57C767B7AE204
+1BFBEFBA354EBEA403ECFBEFA24E4D5F60A303ECFA29AE67623E3E000001FF96FE660533
+05D50011008C402907110102010211060706420811000D950CB01207020300AF05060107
+021C04360B0E0C39071C00041210FCECE43939FCEC11393931002FEC32393910FCEC1139
+39304B5358071004ED071004ED5922B21F0B01015D403036023807480247076902660780
+02070601090615011A06460149065701580665016906790685018A0695019A069F13105D
+005D13210111331121011110062B013533323635C901100296C4FEF0FD6ACDE3473F866E
+05D5FB1F04E1FA2B04E1FB87FEF2F4AA96C20000FFFF00BAFE560464047B1006034B0000
+00030073FFE305D905F0000B001200190031400B19101906330F131900101A10FCEC32F4
+EC323100400F16950913950FAD1A0C950391098C1A10E4F4EC10F4EC10EC301310002120
+0011100021200001220007212602011A0133321213730179013A013B0178FE88FEC5FEC6
+FE8702B5CAFF000C03AC0EFEFD5608FBDCDCF80802E9016201A5FE5BFE9FFE9EFE5B01A4
+03C5FEE4C3C3011CFD7AFEFFFEC2013D01020000FFFF0067FFE3061D061410260032F400
+100702CC05A20134FFFF0076FFE304D304EB102702CC0458000B10060052050000020073
+FFE306CF05F00014001F0033401C049510AF0015950D91001B95078C0021131C001E1C10
+0418190A102010FCECD43CECDCECC431002FF4EC10F4EC10F4EC30211134262311062120
+001110002132172132161901012200111000333237112606056E7ABCFEC5FEC6FE870179
+013B70610127E3CDFC58DCFEFD0103DCAF808A03D3C296FB8BD301A40162016201A51BF4
+FEF2FC2D054CFEB8FEE6FEE5FEB867041846000000020071FE560559047B00160021003A
+4020058711BC2217B90EB8221DB9088C16BD22110105231508011F08051A120B452210FC
+ECD4ECDCECC4111239310010E4F4EC10F4EC10F4EC300111342726231106232200111000
+333217333217161511012206151416333237112604A126266989F0F1FEEF0111F16452D8
+B55251FD1A94ACAB95814054FE560474993130FCBC9D01390113011401381B6060D6FB8C
+0589E7C9C9E73A02F03600000002FF97000004F105D50008001C003A4018019510009509
+8112100A0802040005190D3F11001C09041D10FCEC32FCEC11173931002FF4ECD4EC3040
+0B0F151F153F155F15AF1505015D011133323635342623252132041514042B0111231122
+061D012335343601F7FE8D9A9A8DFE3801C8FB0101FEFFFBFECA84769CC0052FFDCF9287
+8692A6E3DBDDE2FDA805305F693146B5A3000000000200B9FE5604A4061400180024004F
+402423B900171DB90E11B8178C01BD25030C09A90697251A12144706090307200C000802
+462510FCEC3232CC113939F4EC310010F4EC393910E4E4F4C4EC10C4EE30400960268026
+A026E02604015D2511231134363B01152322061D013E0133320011100223222601342623
+22061514163332360173BAA3B5FEE7694C3AB17BCC00FFFFCC7BB10238A79292A7A79292
+A7A8FDAE0628D6C09C6199C86461FEBCFEF8FEF8FEBC6101EBCBE7E7CBCBE7E7000200C9
+FEF8055405D50015001D005640170506031300091D1810050A1A1904133F0E160A120C04
+1E10FCEC3232FCC4EC1117391139393931004010001706030417950916950F81040D810B
+2FECDCF4ECD4EC123939123930014009201F401F75047C05025D011E01171323032E012B
+0111231133113320161514060111333236102623038D417B3ECDD9BF4A8B78DCCACAFE01
+00FC83FD89FE8D9A998E01B416907EFE68017F9662FE9105D5FEF8D6D88DBA024FFDD192
+010C910000010072FFE3048D05F0002100644011071819061D0A0F1D19042D00220A1915
+2210DCECE4FCECC4111239393939310040194219180706040E21000EA10F940C95112095
+00940291118C2210E4F4E4EC10EEF6EE10CE111739304B5358400A180207060719020606
+0707100EED07100EED591336200410060F010E0114163332371504232027263534363F01
+3637363427262007CCE401C60117CAE27B9A87BCADE1F8FEFDD6FEE79291D7E27AA63C3B
+595AFEA1E405A44CE4FE8FC02D181F7CEC888BD05F7070D9B6D92B191F3233D940406D00
+00010064FFE303BC047B002700CF40110A1E1D090D21142108060D0800521A452810FCE4
+ECD4ECC41112393939393140191E1D0A09041300862789241486138910B91724B903B817
+8C280010E4F4EC10FEF5EE10F5EE1217393040121B1C021A1D53090A201F02211E530A0A
+09424B535807100EED111739070EED1117395922B2000101015D40112F293F295F297F29
+80299029A029F029085D4025200020272426281E281D2A152F142F132A12280A28092908
+29072401861E861D861C861B12005D40171C1E1C1D1C1C2E1F2C1E2C1D2C1C3B1F3B1E3B
+1D3B1C0B71133E013332161514060F010E0115141633323637150E012322263534363F01
+3E0135342623220607A04CB466CEE098AB40AB658C8261C6666CC35AD8F7A5C43F946289
+895AA84E043F1E1EAC9E8295240F25504B51593535BE2323B69C89992A0E214940545428
+28000000FFFF00C90000048B05D51006033700000002FEF2FE5602D706140016001F0036
+400C1D0E0A1506140108170A4F2010FC32FC32CCCC10D4CC3100400F141F87000B1B8710
+9720048706BD2010FCEC10F4ECD43CEC3230011114163B01152322263511232035342132
+171617331525262726232207063301774D63B0AEBDAEBEFEF2012FB5523512BFFE860811
+216E7C030377046AFB3D685099ABBB04AED2D860406F9B9A2C1830413300000000010037
+FE5602F2059E001D003F400E0E14080802090400081A1C18461E10FC3CC4FC3CDC3239FC
+CC310040121805081903A9001B01BC08871510870EBD152FFCEC10ECF43CCCEC32113939
+3001112115211114163B011514062B0135333237363D0122263511233533110177017BFE
+854B73BDA4B446306A2626D5A78787059EFEC28FFDA0894EAED6C09C303199149FD20260
+8F013E0000010018000004E905D5000F005840150D0A0C06029500810400070140031C05
+0B1C0D051010D4D4EC10FCE4393931002FF4EC32C4393930014BB00A5458BD0010004000
+0100100010FFC03811373859401300111F00100110021F071011401170119F11095D0121
+15211123112322061D012335343601AE033BFDEECB5E84769CC005D5AAFAD5052B5A6931
+46B5A30000010037000002F20614001B0049401019160B080417090204000810130E461C
+10FC3CC4FC3CC432321739310040131300198716970A0E05080F03A91101BC08870A2FEC
+F43CEC3211393910F4EC393930B2AF1501015D01152115211114163B0115232226351123
+35333534363B01152322060177017BFE854B73BDBDD5A28787AEBDAEB0634D04C3638FFD
+A0894E9A9FD202608F4EBBAB995100000001FFFAFE6604E905D5000F0054401407950ABD
+100E0295008110080140031C00400D1010D4E4FCE4C4310010F4EC3210F4EC30014BB00A
+5458BD00100040000100100010FFC03811373859401300111F00100110021F0F10114011
+70119F11095D032115211114163B01152322261901210604EFFDEE6E863F4EE3CDFDEE05
+D5AAFB3DC296AAF4010E04C3FFFF00ADFFF7065F061410260038FB14100702CC05E40134
+FFFF00B0FFE3056904EB102702CC04EE000B1006005802000001004EFFE305CF05CA001F
+003A40101D1A1921100004330A1114190D0A102010FCC4FCC410F4C4ECFCC43100400E0D
+11011D951E1081201795078C2010F4EC10FC3CEC32323230012116121510002120001134
+123721352115060215140033320035340227352105CFFEC0A18EFE7FFED1FECFFE81919E
+FEC10258B2C70109D8D80108C6B1025805188DFED8C2FECBFE77018A013EB8012A8BB2B2
+61FEB4CAEFFEDD0122F0CA014C61B200000100C9FFE1057605D5001B002D400D10150C07
+0803190C181C15041C10FCECD4EC2F3C111239310040090816811C0095108C1C10F4EC10
+ECC4302532003534272627351716121510070621272627261901331114163302C6D80108
+63416EB3A18EC0BFFECF4DE86167CA6E868D0122F0CAA66D5744018DFED8C2FECBC5C402
+06747A010E03F0FC10C296000001FFFC000005F005F000170064400F131C140C040B0700
+40051C0940071810D4E4FCE41239C4392FEC3100400B12151400950E910B09AF062FEC39
+F4ECCC39393040190C110405040B110A0B0505040B110C0B0809080A11090908424B5358
+071005ED071008ED071008ED071005ED5922012207060701112311013309013633321716
+1D012335342604D739152511FE84CBFDF0D9019E014E5AA3885555AA4905470E1819FDBF
+FD3902C7030EFD9A01F9885C5B6E8379365000000001003DFE5605D8047B001F016A4017
+120E151B1F1808151F0E0D0C0A09060300081F041F0B2010D44BB00A544BB008545B58B9
+000B004038594BB0145458B9000BFFC03859C4C411173910D4EC11391112393100403A07
+08020911001F0A110B0A00001F0E111D001F0D110C0D00001F0D110E0D0A0B0A0C110B0B
+0A420D0B0920000B058703BD201BB912B80BBC172010C4E4F4EC10F4EC11391139123930
+4B5358071005ED071008ED071008ED071005ED071008ED0705ED1732592201408D0A000A
+09060B050C1701150210041005170A140B140C2700240124022004200529082809250A24
+0B240C270D37003501350230043005380A360B360C380D41004001400240034004400540
+06400740084209450A470D5400510151025503500450055606550756085709570A550B55
+0C66016602680A7B0889008A09850B850C890D9909950B950CA40BA40C465D0040250600
+05080609030D160A170D100D230D350D490A4F0A4E0D5A095A0A6A0A870D800D930D125D
+050E012B01353332363F01013309013637363332161D0123353426232207060702934E94
+7C936C4C543321FE3BC3015E011A1530588783B9B251393929140A68C87A9A488654044E
+FC9402C0343360BF8672723A542A14190001005C0000051F05D5001100C0403506030207
+020C0F100B1007110B100B101102070242050D95040E12109500810795090C06030F040E
+04080E00100700014208000A1210DC4BB009544BB00A545B58B9000AFFC03859C4D4E411
+393910C410C411173931002FECF4EC10D43CEC32304B5358071005ED071005ED0710053C
+3C0710053C3C592201404005020A0B180B2902260B380B4802470B48100905070B100013
+16071A1010132F13350739103F1347074A104F1355075911660769106F13770778107F13
+9F13165D005D132115012115210121152135012135210121730495FE700119FE73FE5403
+C7FB3D01B9FED5019F0183FC6705D59AFE1190FDEEAA9A02229001DF00010058000003DB
+0460001100C540310C0F100B100603020702101102070207110B100B4210A900BC09050D
+A9040E07A90910070F03060C0601000E0408010A1210DC4BB00B544BB00C545B58B9000A
+FFC038594BB0135458B9000A00403859C432C4C4C411173931002FECD43CEC3210F4EC30
+4B5358071005ED071005ED0710053C3C0710053C3C59220140420502160226024702490B
+050B100F1318071B102B102013360739103013400140024507400840094310570759105F
+136001600266076008600962107F138013AF131B5D005D13211503331521012115213501
+233521012171036AFBC2FEC2FEC302B4FC7D012BD40150010DFD650460A8FEDC90FE8F93
+A8015C9001390000000100A0FFC104F805D500220070400E0B0E0D080A04190E10160A0D
+1E2310DCC4C4D439C4EC1239B43F0E4F0E025D111239310040130A0995100F0B950D8123
+1FA11EAE00951A8C2310F4ECF4EC10F4EC39D4EC3930400A10110A0B0A0B110F100F0710
+05EC071005EC400E090A370F0205100B0B15103B0B04015D005D25323736353427262B01
+3501213521150132171617161514070621222726273516171602A8C063645C5DA5AE0181
+FCFC0400FE656A806256519898FEE8777D7E866A7F7E6B4B4B8F86494A9801EAAA9AFE16
+382A6D688ADC7A79131225C3311919000001005CFFC104B405D50022005E400F1816151B
+1F130D1916051F19150D2310DCC4B430154015025DECD4C4C41139113911123931004013
+191B951314189516812304A105AE0095098C2310F4ECF4EC10F4EC39D4EC3930400A1311
+1918191811141314071005EC071005EC2532373637150607062320272635343736373633
+01352115210115232207061514171602AC897E7F6A867E7D77FEE89898515662806AFE65
+0400FCFC0181AEA55D5C64636B191931C3251213797ADC8A686D2A3801EA9AAAFE16984A
+49868F4B4B00000000010068FE4C043F0460002000A3400B0006020C121B130306022110
+DCCCC4C4D4EC1112393100401A0C1B0018064200A90707032104A9031386149310B918BD
+03BC2110E4FCECF4EC10EC1112392FECEC111239393040080611000511010702070510EC
+0410EC401B03050500140516002305250037003405460043055B0054057E000D015D401B
+040604011406140125062401350137064501460654015C067F060D005D4009061507161A
+151A12045D09013521152101152322070615141716333236371506070623202435343736
+3736025BFE65036AFD6501AEAEA55D5C6463BE6DC8546A64635EFEE8FED05156628001DC
+01DCA893FE0DA64A4B848F4B4B3231C3251312F2DD8A686D2A38000000010071FE5603E8
+046000200000013237363715060706232011342524353423302101213521150120151005
+061514027F544D4F5157505661FE200196011CEBFEDE01E5FD65036AFE9E016FFE30E2FE
+EE15152CB3200D0E0119EE3525627C023893A8FE64E5FEEC3118618B000100960000044A
+05F00024000025211521350137213521363736353427262322070607353E013332041514
+07060733152307018902C1FC4C013A73FEA701E25F25275354865F696A787AD458E80114
+221F4A68EC30AAAAAA014075906D484C49774B4B212143CC3132E8C25C52496090310000
+0001005DFFC104F905D500190035400E1B0308110A0B080700081907461A10FCD4EC10EC
+D4D4ECCC3100400D169501001A06950D0B9509811A10F4ECD4EC10CCD4EC300110201134
+262321112115211125241716100F010607062024350126030AB9A5FDF703A1FD29017301
+00A2513B1C142D98FDC4FED00190FEDB01258693032CAAFE250101D068FEE056291D2479
+F2DD000000010068FE4C043F0460001A0033400B1C0408120A0C081A08461B10FCC4ECD4
+D4ECCC3100400F0287001A18BD1B07870E0C870ABC1B10F4ECD4EC10FCCC32EC30171633
+201134262321112115211133321E01100F0106070621222768AACE0196B9A5FE9F0319FD
+9FDD69E4A63B1C142D98FEE8BBD4A76301258693032CAAFE2663D4FEE056291D24794A00
+00010058FFE303A5059E0024000001071617161514070621222726273516171633323736
+373427262B01132335331133113315022102AA706C6E89FEED5551514C49544E50B36339
+013A56C03E02E5E5CAE703E67D1E7773AABA7D9D121123AC281816724185624C72010FA4
+0114FEECA4000000000200BAFE5604A4047B000E00170040400B1911080D041700080246
+1810FCEC3232D4ECCC3100400C42158705098C03BC0001BD1810ECC4F4F4CCEC304B5358
+B617050F8700000E070410ED0010CC590511231133153637363332171615100100353427
+262322070173B9B9348751D2B84D4EFCCF0272393878DCAD7AFED0060AAA425231707199
+FE57FEE40190F9854241EF00000100C9FE56019305D500030026400A009702BD04010800
+460410FCEC310010ECEC30400D10054005500560057005F00506015D13331123C9CACA05
+D5F88100FFFF00C9FE56032705D5102701820194000010060182000000010014FE56039C
+05D50013003A401D0C09A90F061302A91005050A00970ABD14070309050108120D0C1000
+1410D43C3CCC32FC3C3CCC32310010ECEC11392F3CEC32DC3CEC32300133112115211521
+1521112311213521352135210173CA015FFEA1015FFEA1CAFEA1015FFEA1015F05D5FD97
+A8F0AAFD2C02D4AAF0A80000FFFF00C90000019405D5100600049400FFFF00C900000AD0
+076D1027013F05B10000100600270000FFFF00C9000009B006661027014005D500001006
+00270000FFFF0071FFE3089106661027014004B60000100600470000FFFF00C9FE660624
+05D51027002D049100001006002F0000FFFF00C9FE5605DE06141027004D046500001006
+002F0000FFFF00C1FE5602EF06141027004D017600001006004F0000FFFF00C9FE6606F2
+05D51027002D055F0000100600310000FFFF00C9FE5606B706141027004D053E00001006
+00310000FFFF00BAFE5605DE06141027004D04650000100600510000FFFF001000000568
+076D1226002400001107171B04BE01750006B10E00103C31FFFF007BFFE3042D06661226
+00440000110602895A000008B40B2B2714072B31FFFFFFFE00000260076D1226002C0000
+1107171B032F0175000BB407200100001049633A31000000FFFFFFE00000025E06661226
+00F3000011070289FF1F0000000BB408200100001049633A31000000FFFF0073FFE305D9
+076D1226003200001007171B05270175FFFF0071FFE30475066612260052000011060289
+76000006B11B0C103C310000FFFF00B2FFE30529076D1226003800001107171B04F60175
+0006B11505103C31FFFF00AEFFE304580666122600580000110602897600000BB418200B
+01011049633A3100FFFF00B2FFE3052908331026174930001206003800000000FFFF00AE
+FFE30458073110270071007B013B120600BE0000FFFF00B2FFE30529085A122600380000
+1006174C36000000FFFF00AEFFE3045807221226005800001007174CFFBEFEC8FFFF00B2
+FFE30529085A1226003800001006175130000000FFFF00AEFFE304580722122600580000
+10071751FFC4FEC8FFFF00B2FFE3052908601226003800001006174D30060000FFFF00AE
+FFE3045807221226005800001007174DFFBEFEC8FFFF0071FFE3047F047B1206021B0000
+FFFF00100000056808331226002400001006174900000000FFFF007BFFE3042D07311226
+00A60000100700710052013BFFFF00100000056808331226002400001006174B00000000
+FFFF007BFFE3042D06F41226004400001007174BFF93FEC1FFFF00080000074807341027
+007102D7013E120600880000FFFF007BFFE3076F05F21027007101E8FFFC120600A80000
+00010073FFE3060405F00025005440102124221E1C11340200043318190B102610FCECFC
+3CCCE4FCC4C431004018041F012200051B2395251B950812A111AE15950E91088C2610E4
+F4ECF4EC10FED4EE113939DCB00B4B5458B1224038593CCC323001113315231506042320
+0011100021320417152E012320001110002132363735233533352135058B797975FEE6A0
+FEA2FE75018B015E9201076F70FC8BFEEEFEED011301126BA843FDFDFEB6030CFED658FF
+53550199016D016E01994846D75F60FECEFED1FED2FECE2527B55884A600000000020071
+FE5604FA047B000B00340058400E0F22322500080C470612182C453510FCC4ECF4EC3232
+C4C43100401B20110E23250C29091886191CB91503B9322FB833BC09B915BD26292FC4E4
+ECE4F4C4EC10FED5EE11123939D43CCC3230B660368036A03603015D0134262322061514
+1633323617140733152306070621222627351E013332373637213521363D010E01232202
+11101233321617353303A2A59594A5A59495A5B813B3C61F3A7FFEFA61AC51519E52B55A
+1511FD84029A1639B27CCEFCFCCE7CB239B8023DC8DCDCC8C7DCDCEB6E58465D408C1D1E
+B32C2A5F171C45475E5B6362013A01030104013A6263AA00FFFF0073FFE3058B076D1226
+002A00001107171B054A01750010B1210E103C4007942154212421035D310000FFFF0071
+FE56045A0663102602894AFD1206004A00000000FFFF00C90000056A076D1027171B04A2
+01751206002E0000FFFFFFE90000049C076D1226004E00001107171B031A0175002AB401
+100C00072B31004BB00E5158BB0001FFC00000FFC0383859400D90019000800180004001
+4000065DFFFF0073FE7505D905F01027029D01340000120600320000FFFF0071FE750475
+047B1027029D00800000120600520000FFFF0073FE7505D90731102700710127013B1206
+01AC0000FFFF0071FE75047505F51026007173FF120601AD00000000FFFF00A0FFC104F8
+076D1027171B04BE0175120601790000FFFF0058FE4C042F0666102602891B0010060254
+00000000FFFFFFDBFE560264066610270289FF250000110601F90000000BB40320080707
+1049633A31000000FFFF00C900000AD005D51027003D05B10000100600270000FFFF00C9
+000009B005D51027005D05D50000100600270000FFFF0071FFE3089106141027005D04B6
+0000100600470000FFFF0073FFE3058B076C10271717051B01761206002A0000FFFF0071
+FE56045A06631226004A0000100600761BFD0000000100C9FFE3082D05D5001D0035400E
+0E1C1119031C06381B011C00041E10FCEC32FCEC32D4EC3100400E0F1A9502AD0400811C
+0A95158C1C2FE4EC10E432FCECC430133311211133111417161732373635113311140706
+212027263511211123C9CA02DECA3E3D9994423ECA6460FEE6FEED6764FD22CA05D5FD9C
+0264FBEC9F504E014F4BA4029FFD5ADF80787876E9010DFD39000000000200C9FE560502
+05F0000E00170040400B19111C0D0417001C02041810FCEC3232D4ECCC3100400C421595
+05098C03810001BD1810ECC4F4F4CCEC304B5358B617050F8700000E070410ED0010CC59
+2511231133153637363332171615100100113427262322030193CACA389157E2C65354FC
+9102A13D3C81EDBA9CFDBA077FB9485735787AA4FE37FECE01AE010C8F4746FEFF000000
+FFFF00C900000533076B10271719051E0175120600310000FFFF00BA0000046406641226
+00510000100700430118FFFEFFFF001000000568077312260087000010071717065C017D
+FFFF007BFFE304DC0773122600A700001007171705EC017DFFFF000800000748076C1027
+1717065C0176120600880000FFFF007BFFE3076F0663122600A80000100700760165FFFD
+FFFF0066FFBA05E5076C1027171704FE01761206009A0000FFFF0048FFA2049C06631226
+00BA0000100600761CFD0000FFFF00100000056807701226002400001007172004E5017A
+FFFF007BFFE3042D0664102702C00498FFFE120600440000FFFF00100000056807361226
+002400001007171C04BC013EFFFF007BFFE3042D0648102702C204650000120600440000
+FFFF00C90000048B07701226002800001007172004A5017AFFFF0071FFE3047F06631027
+02C004BAFFFD120600480000FFFF00C90000048B07361226002800001007171C04A6013E
+FFFF0071FFE3047F0648102702C204A90000120600480000FFFFFFA70000027307701226
+002C0000100717200359017AFFFFFFC3000002810663102702C00366FFFD120600F30000
+FFFF00050000027707361226002C00001007171C033E013EFFFFFFE30000025506481027
+02C203240000120600F30000FFFF0073FFE305D90770122600320000100717200541017A
+FFFF0071FFE304750664102702C0049FFFFE120600520000FFFF0073FFE305D907361226
+003200001007171C051C013EFFFF0071FFE304750648102702C204980000120600520000
+FFFF00C7000005540770122600350000100717200479017AFFFF00820000034A06631027
+02C00425FFFD120600550000FFFF00C90000055407361226003500001007171C0480013E
+FFFF00BA0000035E0648102702C2042D0000120600550000FFFF00B2FFE3052907701226
+00380000100717200515017AFFFF00AEFFE304580664102702C004D4FFFE120600580000
+FFFF00B2FFE3052907361226003800001007171C04EC013EFFFF00AEFFE3045806481027
+02C204AB0000120600580000FFFF0087FE1404A205F0102702D704760000120600360000
+FFFF006FFE1403C7047B102702D7042C0000120600560000FFFFFFFAFE1404E905D51027
+02D704530000120600370000FFFF0037FE1402F2059E102702D704000000120600570000
+0001009CFE52047305F0002E0000010411140E010C01073536243E0135342623220F0135
+373E0335342E03232207353633321E0115140E02033F01346FB9FF00FEEA99C80131B95C
+7D705F73A3F83C66683D23374B4826B8F3EFCE83CB7C173A6E02A243FEDB70CEA0886022
+A0378C999D4F65843348AB6A1A41638B52375633220CB8BEA456B6803C66717400010047
+FE4F03BC047B00340000011E0315140E0507353E0435342623220F0135373E0435342E03
+23220607352433321E0115140602A746703E21426C989DB3954AA2F59E6328765D3B3FD8
+DF2241573F2D1F3143412345A893010A8670B8746701CD08445A58254B8A6C61463D270F
+822E605B625B33587019568B550D203C4566392C462A1B0A3B5A9A854792616E99000000
+FFFF00C90000053B076D1027171B050401751206002B0000FFFFFFF000000464076D1027
+171B032101751306004B0000002AB414050113072B31004BB00E5158BB0014FFC00013FF
+C0383859400D901490138014801340144013065D000100C9FE56051905F00013002E4012
+03950E91098112B008131C120B061C08411410FC4BB0105458B90008FFC03859EC32D4FC
+31002FECE4F4EC300134262322061511231133153E0117321219012304509A99B3D7CACA
+51CC9DE3E9C9037FD7D5FFDEFCB205D5F1878601FEC1FECCFAD9000000030071FF700644
+061400070028003400002516333235342722073633321510212227060723363726350607
+06232227261037363332171617113300101716203736102726200704B61125A03434CA6E
+88F4FEAA49352218C41D43303A58597CCB807F7F80CB7C59583AB8FCD553540124545454
+54FEDC548205AF2D0120B8CEFEBF0F483A45933C24643031A2A20210A2A2313064025EFC
+E6FE6A74737374019674737300020071FFE3052505F0000C003B0057401C240014330418
+103D450A1C28421D181C21383B101C3742041C2F453C10FCECF4ECCCB2203B015DF4ECCC
+F4ECEC11121739310040122433009514AD3C0D3B1C1D913C07082C8C3C10F4EC10F4CCD4
+CC10F4EC39393001220706101716203736353426030E0115141716333237363534272627
+3532171615140607161716151407062027263534373637262726353437362102CBB86A6B
+6B6A01706B6BD4F482AA5F3BCCA85F604C6D82E4968BAA98AC5F609C9BFDBA9B9C6061AB
+AB43558274010102C54D4DFEF24D4D4D4E86879A0227037C4F45482D4141889E2B4D0864
+6861BA80B2202263638FD974747474D98F6363221F46595882534A0000020071FFE30471
+050F000D00340043401636450A0818420E3432081028292B08264204081F453510FCECF4
+ECCC32D4ECCC32F4ECEC3100400E3429142200B92EAD3507B91C8C3510F4EC10F4EC3939
+CC3230012207061017162037363534272613161514070607161716151407062027263534
+363726272635343733061417163332373635342702719053525253012053535352FE3A34
+48829252518584FE128485A492903B343FA12B49488382494A2C02C54D4DFEF24D4D4D4E
+86874D4D024A4062994059202263638FD974747474D98FC62223564B8E594941E8414141
+4174773E0001005CFE56051F05D50015009F400C0F141112420B081506110D1610DC4BB0
+09544BB00A545B58B9000DFFC03859C4C4D4ECE41139393100400C420795050C0F951181
+14950C2FECF4EC10DCEC304B5358400A14110E0F0E0F11131413071005ED071005ED5901
+404005130A0E180E2913260E380E4813470E480F0905140B0F001716141A0F10172F1735
+14390F3F1747144A0F4F175514590F6614690F6F177714780F7F179F17165D005D051007
+062B0135333237363D01213501213521150121051F9E4872FEE9692626FBF503B0FC6704
+95FC5003C714FEDF50259C303199149A0491AA9AFB6F000000010058FE5603DB04600015
+00AC400C0B08150D0F14121112060D1610DC4BB00B544BB00C545B58B9000DFFC038594B
+B0135458B9000D00403859C4C4B440126012025DC411393910D4B440156015025DEC3100
+400C4207A9050C0FA911BC14A90C2FECF4EC10DCEC304B5358400A0F1113141314110E0F
+0E071005ED071005ED590140320513161326134713490E050B0F0F1718141B0F2B0F2017
+3614390F30174514490F5714590F5F176614680F7F178017AF17135D005D051007062B01
+35333237363D0121350121352115012103DB9E4872FEE9692626FD3502B4FD65036AFD4C
+02B414FEDF50259C30319914A8032593A8FCDB00FFFF00100000056807501027171E04BC
+0175120600240000FFFF007BFFE3042D0614102702B8044A0000120600440000FFFF00C9
+FE75048B05D51226002800001007007A00A20000FFFF0071FE75047F047B122600480000
+1006007A7B000000FFFF0073FFE305D908331226003200001006174962000000FFFF0071
+FFE304750731122600B80000100700710073013BFFFF0073FFE305D90833122600320000
+1006175069000000FFFF0071FFE3047506E912260052000010071750FFB5FEB6FFFF0073
+FFE305D907501027171E05270175120600320000FFFF0071FFE304750614102702B80473
+0000120600520000FFFF0073FFE305D908331226003200001006174B6A000000FFFF0071
+FFE304750731122601F10000100700710073013BFFFFFFFC000004E70731102700710072
+013B1206003C0000FFFF003DFE56047F05F5102600715EFF1206005C000000000002008A
+FF70035C060E000700190000251633323534272207363332151021222706072336372637
+113301CE1125A03434CA6E88F4FEAA49352218C41D433101B88205AF2D0120B8CEFEBF0F
+483A45933C5A0530000200BAFF70064E047B0007002B0000251633323534272207363332
+151021222706072336372637113426232206151123113315363736333217161504C01125
+A03434CA6E88F4FEAA49352218C41D4331017C7C95ACB9B942595A75C163638205AF2D01
+20B8CEFEBF0F483A45933C5A01C09F9EBEA4FD870460AE6532327778E800000000020037
+FF700361059E000700210000251633323534272207363332151021222706072336372635
+1123353311331121152101D31125A03434CA6E88F4FEAA49362118C41D43318787B9017B
+FE858205AF2D0120B8CEFEBF0F483A45933C5A02F38F013EFEC28F000001FFDBFE560179
+0460000B003840150B020700078705BD00BC0C080C05064F010800460C10FCECE4391239
+310010E4F4EC1112393930400B100D400D500D600D700D05015D13331114062B01353332
+3635C1B8A3B54631694C0460FB8CD6C09C61990000030071FFE3078C061400090023002F
+00414013314525121447051B0D082B180E47011221453010FCECF43C3CFC3C3CF4ECEC31
+0040102808B90A2E04B9161D8C110AB80D97192FECE432F432EC3210EC32300010171620
+361026200713321711331136333200100223222715233506232227261037360010272620
+07061017162037012F53540124A8A8FEDC54B9F572B972F4CC00FFFFCCF472B972F5CB80
+7F7F80055D5354FEDC5453535401245402FAFE6A7473E70196E773010DC5025EFDA2C5FE
+BCFDF0FEBCC5A8A8C5A2A20210A2A2FCE9019674737374FE6A74737300030071FE56078C
+047B000B0025002F004440133145011224472B111D12070E1E47271217453010FCECF43C
+3CFC3C3CF4ECEC310040120A2AB913042EB9211AB80C138C0FBD1DBC3010E4E4E432F43C
+EC3210EC3230001027262007061017162037032227112311062322272610373633321735
+33153633320010020010171620361026200706CD5354FEDC54535354012454B9F472B972
+F5CB807F7F80CBF572B972F4CC00FFFFFAA253540124A8A8FEDC540164019674737374FE
+6A747373FEF3C5FDAE0252C5A2A20210A2A2C5AAAAC5FEBCFDF0FEBC0317FE6A7473E701
+96E773000003FFFDFFBA057C06170012001600190000013313011709012303210F012307
+272337273709013301032103024AE586016166FE70017CD288FDD6CD32463B520201142F
+0290FEEE16016FBD015D6A05D5FEA101A159FE27FC1B017FF18E464601113804C4FD1901
+B1FE4F011F0000000002000CFFBA058A06170022002C0000172713261110373621321716
+1737170715262701161716213237363715060706232027130123262320070611147266DC
+75C3C3015386763D3A6566632E31FCF4090B880100827473666A777684FEB4C23902D801
+7482FF00888846580105BB01170168CFD024121B785976BB2B21FC660D0C9D2F2F5FD348
+2424C70115035C2F9C9DFED8AD00000000020009FFA2045D04BC0022002B000017273726
+351037362132171617371707152627011617163332373637150607062322271301262322
+070615146960BD559796010655512E2D595F761918FDD3070663B3504E4F4E4D52535DF0
+933701EE4747B363635E4EE68DCC01129D9D110A106C4F8F550E0BFD5E08087115162BAA
+2412129001050256117172CD670000000001000A0000046A05D5000D003B40160C050A95
+020C06950081080305011C073A0C0A00040E10FC3CCCECFC3CCC31002FE4ECD43CEC3230
+400D300F500F800780087F047F0306015D1333113315231121152111233533C9CABFBF02
+D7FC5FBFBF05D5FD7790FDEEAA02BC900002FFB2FFBA05310617000F0012000001152301
+11231101270111213521371709012104E934FE22CBFE0D67025AFDEE04993866FDA6012C
+FED405693EFDCCFD090207FDB35802C70252AA4259FE0B01620000000001006FFE100419
+047B003D0000013427262F0126272635343633321617152E0123220706151417161F0116
+171615140706071F01163315232227262F012627262726273516171633323736030A3233
+AB40AB4C4CE0CE66B44C4EA85A8944453131943FC650537B57849F932A4C2754724759ED
+1E241011616C6663636182464601274B2828250F244A4B829EAC1E1EAE28282A2A544025
+24210E2C4B4C899C5B40139F7E249A3D265BF31E1003021223BE351A1B2D2C0000010058
+FE1004330460001800001321150116170117163B0115232227262F01262B013D01012171
+036AFD4E5C310108932A4C6C9354724759ED3D5A5E02B4FD650460A8FCDD1031FEF87E24
+9A3D265BF33F9C0C03250000000100500000048D05D500180036401112130C0B040F0005
+01081916011C040F1910D4D4ECD4EC1139391117393100400B0095050F95100B95128102
+2FF4ECD4ECD4EC3001231123113332363534262B0122060735363B013204151404029127
+CAF18D9A9A8DFE45AF4F98ABFEF40108FEF7025AFDA603009187888F2A2CB646DCE1D7E7
+000100500000038F047B0018003740100A08060F040C01000412131608000C1910D4D4EC
+D4EC12391217393100400D16B901170C860D8808B90FB8172FF4ECF4EE10D4EC30013332
+36353427262322070607353633321716151406231123012F648D9A4C55864956564E98AB
+FB7D84D4C2CA01A691878D414815152BB6466E74DBD5E5FEFC0000000003000A000004EC
+05D5000C00150028005C401A150F0C06171D230500121C1A0919202E02040D001C262516
+042910FC3CCCEC3232CCFCECD4EC11173939393100401528019525040400051D00950E0D
+95168105950EAD232FECECF4EC10EE391112392F3CEC3230B20F2A01015D011521152115
+2132363534262301112132363534262325213216151406071E0115140423211123353301
+93015BFEA50144A39D9DA3FEBC012B94919194FE0B0204E7FA807C95A5FEF0FBFDE8BFBF
+02C9C990CA878B8C850266FE3E6F727170A6C0B189A21420CB98C8DA017090000002000C
+FFE305CE05D50014001D005F400F15031C0709053816011C131100411E10FC4BB0105458
+B90000FFC038593CCCEC32FC3CCCEC32310040161D17100A000714039511091616001A95
+0D8C0400811E10E432F4EC11392F3C3CEC323211393939393001B61F1F8F1F9F1F035D13
+3311211133113315231510002120001135233533052115141633323635B2CB02E1CBA5A5
+FEDFFEE6FEE5FEDFA6A603ACFD1FAEC3C2AE05D5FD96026AFD96A496FEDCFED6012A0124
+96A4A47DF0D3D3F0FFFF00100000056805D5100603300000000300C9FF42048B06930013
+0017001B00000133073315230321152103211521072337231121011323110113211103B8
+AA41589297010AFEBCB9022EFD9841AA41B002AEFE3CB9D9011397FE560693BEAAFE46AA
+FDE3AABEBE05D5FAD5021DFDE302C701BAFE460000040071FF42047F051E00050026002D
+00310000012627262703051521031633323637150E012322270723132627261110003332
+17373307161716051326232206071B01231603C702530E106F019AFE2B944A616AC76263
+D06B7B6350AA6D211C9D0129FC383147AA5C392F83FDBC8714169AB90E5A6FCF0B029497
+5A100DFEF2365AFE971C3434AE2A2C21C20109171D9C010A0113014309ACE0223292C501
+4A02AE9EFE63010EAC0000000001FF96FE66025205D500130059401F0B02070C010C9512
+0F14079505B010811400110D0508063901111C0C10041410FC4BB0105458B90010004038
+593CEC32E43939C410C4310010E4FCEC10D43CEC32111239393001400D30154015501560
+158F159F15065D01231110062B01353332363511233533113311330252BFCDE34D3F866E
+BFBFCABF0277FDF1FEF2F4AA96C2020FA602B8FD480000000002FFDBFE56021C06140013
+00170053402417BE14B1180F060B000B8709BD180213A9051000BC180C18090A4F150501
+08141000461810FC3C3CEC3232E4391239310010E4DC3CE43210F4EC1112393910F4EC30
+400B1019401950196019701905015D1333113315231114062B0135333236351123353311
+331523C1B8A3A3A3B54631694CB5B5B8B80460FE08A4FE28D6C09C619901D8A403ACE900
+00020073FE6606B005F10018002400434024030C0D069509B025229500161C950D108C16
+9101AF25090608021F0D001C02191913102510FCECD4EC323210CC3939310010ECE4F4C4
+EC10C4EE10E4EC113939300135331114163B011523222611350E01232000111000213216
+01101233321211100223220204B3C46E86454DE3CD4DECA5FEF2FEAC0154010EA5ECFCDF
+EACCCDEBEBCDCCEA04EDE8FA93C296AAF4010E7F848001AB015C015C01AB80FD78FEE3FE
+BB0145011D011D0145FEBB0000020071FE560540047B0018002400484022188700BD2522
+B9110E1CB905088C0EB812BC25011718131F041108134719120B452510FCECF4EC323210
+CC3939310010ECE4F4C4EC10C4EE10F4EC30B660268026A02603015D012322263D010E01
+2322021110003332161735331114163B01011416333236353426232206054046B5A33AB1
+7CCBFF00FFCB7CB13AB84C6931FBEFA79292A8A89292A7FE56C0D6BC6461014401080108
+01446164AAFB8C9961033DCBE7E7CBCBE7E700000002000A0000055405D50017002000BB
+4018050603150900201A12050A1D1904153F180A1C0E110C042110FC3CCCEC32FCC4EC11
+17391139393931004021090807030A06110304030511040403420604001903041019950D
+09189511810B042F3CF4ECD432EC32123912391239304B5358071005ED071005ED111739
+5922B2402201015D40427A17010500050105020603070415001501140216031704250025
+012502260327062607260826092022360136024601460268057504750577178806880798
+0698071F5D005D011E01171323032E012B01112311233533112120161514060111333236
+35342623038D417B3ECDD9BF4A8B78DCCABFBF01C80100FC83FD89FE9295959202BC1690
+7EFE68017F9662FD890277A602B8D6D88DBA024FFDEE8783838500000001000E0000034A
+047B0018003D400A0A18030806120804461910FC3CC4C4FC3C3C3100401012110B15870E
+B8030818A9050209BC032FE4D43CEC3210F4ECC4D4CC30B4501A9F1A02015D0115231123
+112335331133153E013332161F012E0123220615021EABB9ACACB93ABA85132E1C011F49
+2C9CA70268A4FE3C01C4A401F8AE66630505BD1211CEA1000002FFF6000004EC05D50011
+0014000003331721373307331521011123110121353305211704D997020C96D9979CFEF5
+FEF6CBFEF6FEF49D0277FED19805D5E0E0E0A4FE76FD3902C7018AA4A4E200000002000B
+FE5604B504600018001B0000050E012B01353332363F0103213533033313211333033315
+212B011302934E947C936C4C543321CDFED6F0BEC3B8014CB8C3B9EFFED7C1DA6D68C87A
+9A48865401F28F01CDFE3301CDFE338FFEF00000000200AEFFE30460047B000A002500B2
+40101700030A271F030814180A0D080C462610FCEC3232D4ECCCC41112393931401500A9
+170C0E06B911B82620861FBA1CB9238C0CBC260010E4F4ECFCEC10F4ECC410D4E4B6191F
+0B17090E00121139113912393040313F1E3F1F3F203F214F1E4F1F4F204F215F1E5F1F5F
+205F216F1E6F1F6F206F217F1E7F1F7F207F218F1E8F1F8F208F21185D40253F1D3F1E3F
+1F3F203F213F224F1D4F1E4F1F4F204F214F225F1D5F1E5F1F5F205F215F2215015D0132
+363534262322061D01071133153E01333216151406232115141633323637150E01232226
+021DDFAC816F99B9B8B83FBC88ACCBFDFBFEFEA79760B65465BE5AF3F0022B667B6273D9
+B4294C027FAA6661C1A2BDC0127F8B2E2EAA2727FC00000000020071FFE3045A047B0010
+001C003840191AB9000E14B905088C0EB801BC0317040008024711120B451D10FCECF4EC
+323231002FECE4F4C4EC10C4EE30B6601E801EA01E03015D0135331123350E0123220211
+100033321601141633323635342623220603A2B8B83AB17CCBFF00FFCB7CB1FDC7A79292
+A8A89292A703B6AAFBA0A86461014401080108014461FE15CBE7E7CBCBE7E700000200BA
+FFE304A3047B000B001C0038401903B90C0F09B918158C0FB81BBC1900121247180C0608
+1A461D10FCEC3232F4EC31002FECE4F4C4EC10C6EE30B6601E801EA01E03015D01342623
+2206151416333236013E01333200111002232226271523113303E5A79292A8A89292A7FD
+8D3AB17CCB00FFFFCB7CB13AB8B8022FCBE7E7CBCBE7E702526461FEBCFEF8FEF8FEBC61
+64AA0460000200BAFFE304A40614000B00240043401F03B90C0F09B918158C0FB81921A9
+1E9719001212471E211F180C06081A462510FCEC3232C43939F4EC31002FFCEC10E4F4C4
+EC10C6EE30B660268026A02603015D013426232206151416333236013E01333200111002
+2322262715231134363B01152322061503E5A79292A7A79292A7FD8E3AB17BCC00FFFFCC
+7BB13AB9B3A5FEE95A5B022FCBE7E7CBCBE7E702526461FEBCFEF8FEF8FEBC6164A8047E
+C3D39C7D7D0000000001007FFFE303F5047B00190030401B1986008816B903B81A0D860C
+8810B9098C1A1B45131206480D001A10DC3CF4ECEC310010F4ECF4EC10F4ECF4EC30133E
+0133320011100021222627351E01333236353426232206077F4DA55DFD012AFED3FEFA55
+A24C4E9D50B3C6C6B3509D4E04332424FEC2FEF2FEEEFEC62323AC2B2BE3CDCDE32B2B00
+00020071FF7303E7047B0027002F004F400F280B072C2C1213071213004822453010FCE4
+32EC10EC111239393100401300860188040FB92E2AB91704B925B81B178C3010E4CCF4EC
+10FCDCEC10F5EE30400B0F31103180319031A03105015D01152E01232206151417161736
+373633321716151407062322270615233437262726111000213216011633323534232203
+E74E9D50B3C6630706273E496AA34A3F5F539B504906990C392F95012D010655A2FE8A3A
+4D9284650435AC2B2BE3CDCD720806512C33483D597D2F2911394468512333A1010C0112
+013A23FC3A13394B00020071FE560540061400180024004B40240414120518A900BD2522
+B9110E1CB905088C0EB8129725184F1F041208134719120B452510FCECF4EC3232E43100
+10ECE4F4C4EC10C4EE10FCEC1112393930B6601E801EA01E03015D012322263D010E0123
+22021110003332161711331114163B01011416333236353426232206054046B5A33AB17C
+CBFF00FFCB7CB13AB84C6931FBEFA79292A8A89292A7FE56C0D6BC646101440108010801
+446164025EF9D89961033DCBE7E7CBCBE7E7000000020071FFE305B9061400180024003D
+401C22B900161CB90D108C16B82506A90597251F0C00080B47191213452510FCECF4EC32
+32310010FCE410E4F4C4EC10C4EE30B6601E801EA01E03015D013534363B011523220615
+1123350E0123220211100033321601141633323635342623220603A2A3B5BFAA694CB83A
+B17CCBFF00FFCB7CB1FDC7A79292A8A89292A703B6C8D6C09C6199FB82A8646101440108
+0108014461FE15CBE7E7CBCBE7E7000000020071FFE3047F047B001900220072400D1B18
+1A1812084B1A081019452310FCC4ECF4EC111239314017001A190F861088141AA91914B9
+0C19BB1FB904B80C8C230010E4F4ECE410EC10EC10F4EC1112393040293F247024A024D0
+24F024053F003F193F183F1A3F1B052C112F102F0F2C0E6F006F196F186F1A6F1B095D71
+015D13343736333217161110070621222627351617163332373637213705262726232207
+06718384E2FC94959D9CFEF46BD0636264636AB766670CFCB2B802900E5D5C9A88525302
+5EFA9291A1A2FEEDFEF69C9C2C2AAE341A1A6364BE90019E57575A5A00020071FFE3047F
+047B0014001B00414024001501098608880501A91518B91215BB05B90CB8128C1C02151B
+1B080F4B15120801451C10FCC4ECF4EC111239310010E4F4ECE410EE10EE10F4EE111239
+301335212E0123220607353E01332000111000232200371E013332363771034E0CCDB76A
+C76263D06B010C0139FED7FCE2FEF9B802A5889AB90E02005ABEC73434AE2A2CFEC8FEF6
+FEEDFEBD0123C497B4AE9E000002007CFFE30684047B000A003400774010362E28082734
+02120D4B05121F15453510FCC4ECFCECDC3CFCDCC4B626160B0404020D1112173931400F
+2FA92E27221AB922B83509B9118C350010F4EC10F4EC10D4DCECB41F861E881A10F4EC40
+0B05150B0D020426160822111112173930400A340B0405112616152715070E103C3CFC3C
+3C043C25362736270116171633320116151007062322272627012627260706070607353E
+0133201716173733151417163B01152322272635034E6602010AFD971E205288A801601F
+9594FCE4825C1C02FE131B4CD16C61646263D06B010C9C241BCBB82626692B40AF5752D6
+8ACF3E38FE9C45235A02906076FEEDA2A191679C01BB2723640101191A34AE2A2C9C2329
+75949931309C605AC8000000FFFF0085FFE303C8047C120603490000FFFF0085FFE303C8
+047C120603CB000000010085FFE3062A047C003E00694010403630083C2F1E122E131203
+19270B3F10DCC4C4D4ECD4ECDC3CFCDCC43140162686278822B92AB83F18A9193F0B860A
+880FB9068C3F0010F4ECFCEC10D4EC10F4ECFCECB63D2E002A00181911123911123939B4
+37A936302A10D4DCEC30B33C3D2E2F0704103C011E011514042322272627351617163332
+3736353427262B013533323736353427262322070607353E013332171617373315141716
+3B01152322272635050602C27C8AFEFEEE5055545A4755555D9755544E4889949B744344
+4645774751506162AA4CC4715F0FECB82626692B40AF5752FEE040025C18926CADB60E0E
+1CAB25131238385A583833982C2D46402E2E0D0D1DA718184E426A86949931309C605AC8
+A646000000020071FFE304C5047C001A002F003B400D17121F31120C122604122C453010
+FCECD4ECC4C4D4EC31400E00B91BB83011A9123008B9298C300010F4EC10D4EC10F4ECB2
+23121111123930012207061514171633323736353427262B013533323736353427262732
+171615140706071E011514042320001110373602F1FB60636368D29755544E4889949B74
+4344464568C471723C3C707C8AFEFEEEFEC6FED6979703DC6E72CDD06F7438385A583833
+982C2D46402E2EA04E4F8D5D40411818926CADB6013E010E01129D9E0001FFDBFE56021C
+04600013004B401F0F060B000B8709BD140213A9051000BC140C14090A4F020501081310
+00461410FC3C3CEC3232E4391239310010E4DC3CE43210F4EC1112393930400B10154015
+50156015701505015D1333113315231114062B01353332363511233533C1B8A3A3A3B546
+31694CB5B50460FE08A4FE28D6C09C619901D8A400020071FE5605B80614000B00300055
+4029190C1D0912861316B90F03B92623B81D2DA92A9709B90FBD1A1D2A2D2B261900080C
+4706121220453110FCC4ECF4EC3232C4393931002FC4E4ECF4EC10F4C4EC10FED5EE1112
+393930B660328032A03203015D01342623220615141633323617100221222627351E0133
+32363D010E01232202111012333216173534363B01152322061503A2A59594A5A59495A5
+B8FEFEFA61AC51519E52B5B439B27CCEFCFCCE7CB239A3B5BEA9694C023DC8DCDCC8C7DC
+DCEBFEE2FEE91D1EB32C2ABDBF5B6362013A01030104013A6263C8D6C09C619900020071
+FE56045A0460000A00230043401F180B1C0811861215B90E02B923BC08B90EBD191C1800
+080B470512111F452410FCC4ECF4EC3231002FC4E4ECF4EC10FED5EE1112393930B66025
+8025A02503015D011121220615141633323617100221222627351E013332363D010E0123
+2202113412332103A2FEAA8796A59495A5B8FEFEFA61AC51519E52B5B439B27CCEFCFCCE
+021F023D0188CDBBC7DCDCEBFEE2FEE91D1EB32C2ABDBF5B6362013A0103F9012A000000
+00010071FFE3044F047B001D0038401F00051B01A9031BB9081286118815B90EB8088C1E
+02000811340418120B451E10FCECDCE4FCC4310010E4F4ECF4EC10FED4EE113939302511
+233521110E0123220011100021321617152E0123220615141633323603A99B014165D77B
+FDFED6012D010668C55D5FC063B3C6C6B34F7C9E01118CFDF02424013E010E0112013A37
+37AA3E3EE3CDCDE30F00000000020060FE5204640460001300230079400A250218120720
+120D122410D4D4ECD4ECD4C4B5001C140318201112173931400A14B90ABD01130212BC24
+0010E4323232F4ECB30D071C0A1112393930B4131112121C070510ECB31112021C08103C
+B4011102021C070510ECB500010302121C08103C04103CB303001300070E103CB3110001
+00070E103C09013301161716151406232226353437363701330132373635342726270607
+061514171602620142C0FE5F6A263B969696963B266AFE5FC00142431F1C1C283A3A281C
+1C1F01E80278FCDCB153806381828281638053B10324FA8E1B182D45496463636449452D
+181B000000020060FFE304640460001300230079400A250218120720120D122410D4D4EC
+D4ECD4C4B5001C140318201112173931400A14B90A8C01130212BC240010E4323232F4EC
+B30D071C0A1112393930B4131112121C070510ECB31112021C08103CB4011102021C0705
+10ECB500010302121C08103C04103CB303001300070E103CB311000100070E103C090133
+011617161514062322263534373637013301323736353427262706070615141716026201
+29D9FE72472C4596969696452C47FE72D90129431F1C271F38381F271C1F02D1018FFDEA
+624C783E828181823E784C620216FC1F1B182D21403246463240212D181B0000000100AE
+FE560458046000130039401B030900030E0106870E118C0A01BC0CBD140D09080B4E0208
+00461410FCECF4EC32310010E4E432F4C4EC1112173930B46015CF1502015D1311331114
+163332363511331123110E01232226AEB87C7C95ADB8B843B175C1C801BA02A6FD619F9F
+BEA4027BF9F602566663F000000100BA000004640614001B004340210309000316010687
+1619B81C0C1512A90F970A010208004E0F12101509080B461C10FCEC32C43939F4EC3100
+2F3CFCEC393910F4C4EC1112173930B2601D01015D011123113426232206151123113436
+3B01152322061D013E013332160464B87C7C95ACB9A3B5FEE7694D42B375C1C602A4FD5C
+029E9F9EBEA4FD87047ED6C09C6199CC6564EF00000100BAFE56046406140021004A4025
+030900031D010D871D1FB822131C19A916971207870412060A08004E1619171C10081246
+2210FCEC32C43939F4ECC431002FDCEC10FCEC393910F4C4EC1112173930B2602301015D
+011114062B01353332363511102322061511231134363B01152322061D01363332160464
+A3B5FEE9694CF895ACB9A3B5FEE7694D83E7C1C602A4FD48D6C09C619902B2013DBEA4FD
+87047ED6C09C6199CCC9EF000002000E0000021E0614000B000F003E40180EBE0CB10602
+0BA9050800BC0605020D0108080B0C00461010FC3C3C3CEC32323231002FE4DC3CEC3210
+FCEC30400B1011401150116011701105015D13331133152311231123353311331523C2B8
+A4A4B8B4B4B8B80460FE08A4FE3C01C4A403ACE9FFFF00A60000026E04601006034D0000
+00010074000002840460000B0027400A03060804080009080A0C10DCEC32FCEC32310040
+09040BA901BC0509A9082FEC32FCEC3230133521152311331521353311740210A8A8FDF0
+B003BCA4A4FCE8A4A40318000001004B000002DF06140023003C400D250B560A12010800
+131C561D2410DCFCDC3CFC3CDCFCD431401214110223040F2106C30F1D0B21C318009713
+002FE42FEC32D43CEC111217393001331116171633323736373306070623222711231126
+2726232207060723363736333217013DB80201110D261212027D0233335B1413B8060511
+0D261212027D0233335B19160614FCED01010925245287494A04FD850302040309252452
+87494A060002004D000003540614001100180035400B1A04050108120007160D1910DCDC
+D43C32FC3CDCC431400E110FB9140A05A912020207009707002FE411392F3CEC32D4ECC4
+300133113315231123113427232037363332170726232207143301A2B8FAFAB8013DFEE8
+0101F5352A1017374D015C0614FCFEA0FD8E02540F0FBDF619FA844B39000000000100C1
+FE56025F0614000B002840070D0600080B460C10FCFCD4C43100400C0A0105000B970C05
+8706BD0C10F4EC10E41112393930011114163B0115232226351101793D783146BF990614
+F9CE7C749CCCCA0628000000000100C1FE4C05360614002400B2400E1B23151226060E23
+1D220820462510FCFC3CD4C4D4C4EC10CCB200231B1112393140181B4200A91A1A221F1D
+A9220E860D9311B909BD22BC20971F002FE4E4FCECF4EC10EC1112392FECECB315060009
+111239393040081B11001C11241A23070510EC0410EC401B0C1C0A001B1C19002A1C2A00
+38003B1C49004C1C54005B1C71000D015D401B041B0424141B1424251B24243524371B45
+24461B54245C1B7F1B0D005D4009070B060C1A0C1A0F045D013217161716151404212227
+2627351E0133323736353427262B013501211123113311211503436981635551FED0FEE8
+5E63646A54C86DBE63645C5BA7AE01AEFD6AB8B8036501DC382B6C688ADDF2121325C331
+324B4B8F844B4AA601F3FC330614FE4CA8000000000100BAFFE6071D04620026005E4011
+0012141E1B081D50120814500A0808462710FCECFCFCFCFC3C11123931401607140A1A11
+00061F080D17871F04238C271B1208BC270010F43C3C10F43CC4EC321112173930401330
+28502870289028A028A028BF28DF28FF2809015D25060706232226351133111416333237
+363511331114163332363511331123350607062322272603AE43626082AFBEB972758F53
+53B972778DA6B9B93D5A58797A5655D8793D3CF6E202A4FD62A29C605EA4027AFD62A29C
+C0A2027AFB9EB06533323E3E000100BAFE56071D04620026006140110012141E1B081D50
+120814500A0808462710FCECFCFCFCFC3C11123931401807140A1A1100061F080D17871F
+04238C271B1208BC1DBD270010ECF43C3C10F43CC4EC3211121739304013302850287028
+9028A028A028BF28DF28FF2809015D250607062322263511331114163332373635113311
+14163332363511331123110607062322272603AE43626082AFBEB972758F5353B972778D
+A6B9B93D5A58797A5655D8793D3CF6E202A4FD62A29C605EA4027AFD62A29CC0A2027AF9
+F4025A6533323E3E000100BAFE56071D047B0030006340120E00110F130807501C081A50
+29250827463110FCEC32FCFCFCEC111239CC310040180E870D1B071D14251A00062A1B21
+17872A2D03B828BC261B2F3CE4F43CC4EC321112173910D4EC3001401330325032703290
+32A032A032BF32DF32FF32095D013E013332171615111407062B01353332373635033426
+23220615112311342726232207061511231133153E0133321716042945C082AF5F5F5251
+B5FEE96926260172758FA6B93939778D5353B9B93FB0797A555603897C767B7AE2FD48D6
+60609C30319902B2A19CBEA4FD87029EA24E4D5F60A3FD870460AE67623E3E000001FFDB
+FE56046B047B001B0051400F0208004E101C0D0E4F0A150814461C10FCEC32E4391239F4
+EC3100400E03090003160106871619B814BC012FE4F4C4EC111217394009130A0F140F87
+0DBD1C10F4EC1112393930B4601DCF1D02015D011123113426232206151114062B013533
+3236351133153E01333216046BB87C7C95ADA3B54631694CB942B375C1C602A4FD5C029E
+9F9EBEA4FD73D6C09C61990474AE6564EF000000000100BAFE56054A047B001D003B400C
+171A0308154E090D080C461E10FCEC32F4ECDCC431400D06870E11B80CBC0B1AA91BBD0B
+002FFCEC10E4F4C4ECB5090314030E0A1112173930012635113426232206151123113315
+3E0133321615111417163B0115232203FE527C7C95ACB9B942B375C1C62626693146B5FE
+B660D602B29F9EBEA4FD870460AE6564EFE8FD489931309C000100B30000046404600009
+0079401E071101020102110607064207020300BC08050601070208044E070800460A10FC
+ECFCEC11393931002F3CEC323939304B5358071004ED071004ED5922B21F0B01015D4030
+3602380748024707690266078002070601090615011A0646014906570158066501690679
+0685018A0695019A069F0B105D005D13210111331121011123B3011001DDC4FEF0FE23C4
+0460FC790387FBA0036CFC9400030071FFE30475047B0006000D0019002C401804A90B07
+B91400B90EB8148C1A0A041211510B031217451A10FCEC32F4EC32310010E4F4EC10EEDC
+EC3001220607212E01033236352114161332001110002322001110000271939512027412
+959295A8FD86A896F00112FEEEF0F1FEEF011103DFC17F7FC1FCA0E89494E803FCFEC8FE
+ECFEEDFEC70139011301140138000000000200710000062404600012001D0049400D1F04
+00090602081318120E451E10FCECD4EC32D4C4C4C4B30A1202131112393931400A0213A9
+12BC0A1D07A90A002FFC3C10F4FC3C400803A906060E0E130A11123910D02FEC30011521
+112115211121152120272611103736211723220706151417163B010616FDD40215FDEB02
+3AFCE1FEBBA7A8A8A701452A25F078787878F02504609AFEDD9BFE949C8E8F011401128E
+8F826C6BD8D96C6D00020094FFDC053E047C001300240032400D26450712191308000C12
+14452510FCECD4FCD4ECEC3100400D000A8717030F871E238C17B82510E4F43CEC3210EC
+C4300115141632373635100220021114171632363D01051000200011140607062226270E
+0122260348606B2649D0FE6ECA49266B60FE040142022201463A2E61D7A20C129DD6D702
+94C4A3B5305B9D010F0131FED0FEF09D5B30B5A3C4C80154015CFEA4FE806CB23670A375
+799FED00FFFF0070FE5604D1061412060369000000010000FFE502900460000E002F4009
+0702040A0E080D040F102FDCEC321139393100400D0A000B0504000787028C0CBC0D2FEC
+F4ECC4D4CC11123930250621222F0116333236351133112301D772FEF92538013C589CA7
+B9B9AEC90ABD23CBBE024EFBA000000000010000FFE50290060A000E002F40090702040A
+0E080D040F102FDCEC321139393100400D0A000B0504000787028C0C970D2FECF4ECC4D4
+CC11123930250621222F0116333236351133112301D772FEF92538013C589FA4B9B9AEC9
+0ABD23CEBB03F8F9F600000000010000FE560376046000160044400C114F0D0702040A16
+080D040F102FDCEC3211393910E431004016160D0B0011A912BD170A000B050400078702
+8C0CBC1710ECF4ECC4D4CC11123910FCEC1112393930250621222F011633323635113311
+14163B01152322263501D772FEF92538013C589CA7B94C693146B5A3AEC90ABD23CBBE02
+4EFB8C99619CC0D6000100BAFE58034A047B001100334016060B0700110B03870EB809BC
+07BD120A06080008461210FCC4EC32310010ECE4F4ECC4D4CC11123930B450139F130201
+5D012E012322061511231133153E0133321617034A1F492C9CA7B9B93ABA85132E1C03B4
+1211CBBEFC0A0608AE66630505000000000100BAFE56034A047B0019003A401A0613070B
+870CBD1A001913038718B811BC1A0B1206080010461A10FCC4EC32C4310010E4F4ECC4D4
+CC10F4EC11123930B4501B9F1B02015D012E01232206151114163B011523222635113315
+3E0133321617034A1F492C9DA74C69E9FEB5A3B93ABA85132E1C03B41211CBBEFD9E9961
+9CC0D60474AE666305050000000100840000037E047B000F00254007020C000805071010
+DCCCEC32CC3100400A00070C870BBC010687042FEC32FCEC393930011133152135331134
+363B011523220601E0A4FE00A4A3B5FEE9694C02E5FDBFA4A40241D6C09C610000010074
+0000037E047B000F002540070200080C05071010DCCCCCFCCC3100400A00070A870DBC01
+0687042FEC32FCEC393930011133152135331134262B013533321602CAB4FDF0A44C69E9
+FEB5A302E5FDBFA4A4024199619CC000000200BA0000049704600013001C00B040340908
+07030A061103040305110404034206040015030415A90914A90DBC0B040506031109001C
+160E050A19120411140A080C461D10FCEC32DCC4EC1117391139393931002F3CF4ECD4EC
+123912391239304B5358071005ED071005ED1117395922B2401E01015D40427A13010500
+05010502060307041500150114021603170425002501250226032706260726082609201E
+3601360246014602680575047505771388068807980698071F5D005D011E01171323032E
+012B011123112132161514060111333236353426230314307332AEC3A24A7B51A9B90184
+DAD670FDF5C6777F7581020D0A745DFECE011F803AFE2704609EA5698C019DFEAF564E4D
+60000000000200BA0000049704600013001C004540150907060F030C1C16120502191208
+0F01140800461D10FCEC32DCC4EC111739113939393100400F06080C14090803A91415A9
+0800BC132FE432ECD4EC11391139113930133311333236371333030E01071E0115140623
+21131133323635342623BAB9A9517B4AA2C3AE3273306A70D6DAFE7CB9C681757F770460
+FE273A80011FFECE5D740A1B8C69A59E01ECFEAF604D4E560001006FFE5603C7047B0030
+008040430D0C020E0B532827080902070A532728274219A91ABD310A0B2728041F008601
+89041F8921B91104B92EB8118C311A15081E270A0B282407005224080E07081E2B453110
+FCC4ECD4ECE411123939393910ECCC310010E4F4EC10FEF510F5EE12173910FCEC304B53
+5807100EED111739070EED1117395922B2003001015D01152E012322061514161F011E01
+15140623222F011514163B01152322263D01163332363534262F012E0135343633321603
+8B4EA85A898962943FC4A5F7D86458154C69E9FEB5A3CCC1828C65AB40AB98E0CE66B404
+3FAE282854544049210E2A99899CB611040C99619CC0D6FB6A59514B50250F2495829EAC
+1E0000000001FFD9FE5602D7061400130034400D11140E0F4F050B0A080100461410FC3C
+EC3232E43912393100400D10870FBD140A0106068705971410FCEC12393910F4EC301711
+34363B0115232206151114062B0135333236BEAEBDAEB0634DA3B54631694B1404C2BBAB
+995068FB29D6C09C610000000001FFD9FE5602D706140020004F40120D201C0116211314
+4F05100A08191E01462110FC3C3CEC3232E439123910CC32C4310040171EA900BC210C1C
+A90F1B158714BD210A0106068705972110FCEC12393910F4ECD43CEC3210F4EC30133534
+363B01152322061511173315231114062B01353332363511233533112335BEAEBDAEB063
+4D01A2A3A3B54631694BB4B4AF04604EBBAB995068FDA803A4FE28D6C09C619901D8A401
+698F000000010037FE560335046500130022B60F4F0B0801061410D4DCFCEC3100400A0E
+8710BD14048706BC1410F4EC10F4EC30051134262B0135333216151114163B0115232226
+01974D63B0AEBDAE4B693146B5A3140328685099ABBBFCED99619CC00002FEF2FE5602D7
+06140016001F0032400C1A090D0211031608170D4F2010FC32FC32CCCC10D4CC3100400C
+1C0703188700138711970B002F3CF4EC10EC32D4CC302133152306070623203534213311
+34363B0115232206150323221716333237360177B7BF123552B5FED1010EBEAEBDAEB063
+4DC3B37703037C6E21119B6F4060D8D204AEBBAB995068FAA33341301800000000010037
+FEC002F2045E001300334009080B0E1208050109022F3CD43CEC3239393100400C0E0500
+08A90BBC0F03A912022F3CEC32F4ECC439393001B2AF15015D01112135211134262B0135
+33321615113315231101B2FE85017B4B73BDBDD5A28787FEC0013E8F0260894E9A9FD2FD
+A08FFEC200010037FE5602F6059E0013003D401C0E05080F03A9001101BC1408870BBD14
+0B08090204000810120E461410FC3CC4FC3CC4323939310010FCEC10F43CC4EC32113939
+30B2AF1501015D01112115211114163B01152322263511233533110177017BFE854C69CA
+E0B5A38787059EFEC28FFC1B99619CC0D603E58F013E000000020000FFE3051204600016
+001E0043401F0D011C8710000704A90A14170D108C0501BC0B170C0408064E1802080046
+1F10FCEC32F4EC323231002FE432F4C4DC3232EC323210FC111230B46020CF2002015D13
+113311211133113315231123350E012322263D0123350521151416333236AEB8023AB8BA
+BAB843B175C1C8AE039FFDC77C7C8FB2026801F8FE0801F8FE08A4FE3CAC6663F0E70AA4
+A5029F9FBA00000000010071FFE204840460001F0053400D1D1A122100041114120E0A04
+2010FCC4FCC4D4C4CCFCC43100400E111D0D01A91E10BC2017B9078C2010F4EC10FC3CEC
+32323230014019E011E010EF1DEF1ED011D010DF1DDF1E401140104F1D4F1E0C5D01231E
+0115140023220035343637233521150E011514163332363534262737210484EC617FFEE4
+E1E1FEE47F61ED01BA6688B09090B088660101B403BC48EB98EBFEDC0124EB98EB48A4DC
+42D78B9FC2C29F8BD742DC00000100C10000045C0462001E002C400C200012141905100C
+0809461F10FCFCC4C4C4D4EC393100400A11B90418B919B80BBC042FECF4EC10EC300114
+07062B0122272635113311141716373332363534272627351617161716045C8E91DE46B5
+5251B82628673390B04A496E6858A73322020FEE8F926060D602CAFD3699313202C49EE8
+65631E9608305BAB730000000001003D0000047F04600006006840270411030302051106
+0502020305110504010001061100010042050201BF0306050402010503000710D44BB00A
+5458B90000004038594BB014544BB015545B58B90000FFC03859C4173931002FEC323930
+4B5358071005ED071008ED071008ED071005ED592201330133012309013D01A4FA01A4C3
+FEA2FEA20460FBA003ACFC5400010056000006350460000C01EF400F08090A0B0C010203
+0405060B00070D10D44BB00A544BB011545B4BB012545B4BB013545B4BB00B545B58B900
+0700403859014BB00C544BB00D545B4BB010545B58B90007FFC03859CC173931400A0A05
+02030C08BF070300002F3C3CEC321739304030025501020B0A0B03550A0B04550A090A05
+55060509090A0111000C00021103020C0C00051104050807080611070708424B53580710
+05ED071008ED071008ED071005ED071008ED071005ED0705ED071008ED59220140FF0A05
+190519022D0A3A0A46054602490A4F0A540554025A0A5F0A61056102690A760570057602
+70028805960597029B0AB305B302C105C804C0021D0505090406030B020A0C0B0B040905
+081505190416031A021B0C1B0B1409150825072506230527042103250222012200250C27
+0B240A2109230839043603360C3908300E4605480446034003420240014000400C440B44
+0A4409400E400E5607560656055003510252015200500C530B540A55096307640665056A
+0465036A026A016A006E0B610967086F0E7507750679057D0478037D027A017F017A007F
+00780C790B7F0B7B0A76097D08870588028F0E97079706940593049C039B029801980099
+0C402F96089F0EA607A606A405A404AB03AB02A901A900AB0CA408AF0EB505B104BD03BB
+02B80BBF0EC405C304CC03CA02795D005D21230B01230B012301331B01330635B8E6E5D9
+E6E5B80125D9F1F2D9036AFC96036AFC960460FC6A0396000001003D0000047F06140011
+0046B413060E001210D4D4C4C431B507A906970E00002F3CF4EC30B7100D0C1111000100
+070510FC3C3C3CB608090A0B04070C011112173940091011110C0F110E0E0D0710EC08EC
+33013637363B0115232207060F01012309013D01EC50484A7C936C4C2A2E2F2101C5C3FE
+A1FEA304D2C73E3D9A2423875EFBB2036CFC9400000100660000046B046000080038400A
+0208050A04050808000910D4DCFCD4C411123931B30400BC07002FE43230400C03110405
+0402110111000800070510EC04EC070510EC13330901330111231166D90125012ED9FE5D
+CB0460FE3801C8FD90FE1001F000000000010058FE5604BF0460001300AA402212110203
+0203111112114209A90ABD0F12A900BC03A90F0A4F04120301000401101410DC4BB00B54
+4BB00C545B58B90010FFC038594BB0135458B9001000403859C432C411393910EC31002F
+ECF4EC10FCEC304B5358071005ED071005ED592201404205021602260247024911050B12
+0F1518031B122B1220153603391230154001400245034004400F4312570359125F156001
+600266036004600562127F158015AF151B5D005D13211501211514163B01152322263D01
+2135012171036AFD4C02B44C692F46B5A3FD3702B4FD650460A8FCDBA799619CC0D614A8
+0325000000020058FF9103DB0460001A002100B14011160412111B1E120C190301000C01
+01172210DC4B544BB00C545B58B90017FFC038594BB0135458B9001700403859C432C411
+393910ECDC3CEC323100400D19A900BC131708B920031BA9172FFC3CDCEC10CCF4EC3040
+0B19110203020311181918424B5358071005ED071005ED592201403A0502160226024702
+4918050B190F2318031B192B1920233603391930234001400245034319570359195F2360
+016002660362197F238023AF23175D005D132115013336373633321716151607062B0106
+15233437213501210133323534070671036AFD4CAF22544160843A26013E527E69039903
+FE9602B4FD6501FF388A46580460A8FCDBA24737573957602F3D333C3B34A80325FCC636
+5D02020000010058FE4C042F0460002000A9400A1B1F151222061E1F0E2110DCD4C4D4C4
+EC10CCB2001F1B1112393140161B4200A91A1A1E211DA91E0E860D9311B909BD1EBC2100
+10E4FCECF4EC10EC1112392FECECB315060009111239393040081B11001C11201A1F0705
+10EC0410EC401B0C1C0A001B1C19002A1C2A0038003B1C49004C1C54005B1C71000D015D
+401B041B0420141B1420251B24203520371B4520461B54205C1B7F1B0D005D4009070B06
+0C1A0C1A0F045D0132171617161514042122272627351E0133323736353427262B013501
+21352115023C6A80625651FED0FEE85E63646A54C86DBE63645C5DA5AE01AEFD65036A01
+DC382A6D688ADDF2121325C331324B4B8F844B4AA601F393A80000000002006DFE4C046C
+04600024002D00000120373605161736353427262B013501213521150132171617161514
+07161523342730070637262322071433323701E7FEB10202012AF69E0C5C5EA4AE01AEFD
+65036AFE656981645451276499281497097DC583019EBE63FE4CBDFB05043B2A31854A4A
+A601F393A8FE24382B6C678B715565A452381179FA2A4B2F4B00000000010058000003A5
+0612001C003440091E0512161A08000D1D10DCDCFCDCECC431400E0D860E0C1209B91297
+1B1AA9001B002FD4E410F4EC104B5058DC1BD459EC300133323736352627262322070607
+35363736332017161514070607112301543FC0563A013963B3504F4E4E4C51515501138A
+6D6C70AACA031E724C6285417216152BAC2311129D7DBAAA73771EFD7400000000010058
+000003A50612001C0035400A1E10000803181207451D10FCECDCFCDCC431400E10860F0C
+0B14B90B970203A90002002FD4E410F4EC104B5058DC1BD459EC30011123112627263534
+373621321716171526272623220706071417163302A8CAAA706C6E8901135551514C4E4F
+4E50B36339013A56C0031EFCE2028C1E7773AABA7D9D121123AC2B1516724185624C7200
+00010058000003A50612001C003740091E181207030800101D10DCDCFCDCECC431401010
+860F0C0B14B90B8C1D03A90001971D0010F4D4E410F4EC104B5058DC1BD459EC30011333
+1116171615140706212227262735161716333237363734272623015401CAAA706C6D8AFE
+ED5551514C4E4E4F50B36339013A56C002F4031EFD741E7773AABA7D9D121123AC2B1516
+724185624C72000000010058FE4C03A506140023002DB6251A081212002410DCECDC32CC
+310040100987080D870497241A871B16871FBD2410FCECD4EC10F4ECD4EC301334373621
+32171617152627262322070615111417163332373637150607062320272635586E890113
+5551514C49544E50B0663A3A66B0504E4F4E4C515155FEED896E0440BA7D9D121123AC28
+1816724185FBE085417216152BAC2311129D7DBA00030073FFE305D905F0000D00170022
+000001343736333217161514062227260020001110002000111001200011100021200010
+0002B52220302E2220425E2022014EFE48FEFD010301B80101FE23013A0178FE88FEC6FE
+C5FE87017902E92E222222222E2F4221210292FEB8FEE5FEE6FEB80148011A011B01ECFE
+5BFE9EFE9FFE5B01A402C401A5000000FFFF00BA0000043E0460100603C6000000020071
+FFE304C5047C001A002F003D400E3117121F092504122C0F1225453010FCECD4EC10C4D4
+ECC431400E00B91BB8300AA9093013B9228C300010F4EC10D4EC10F4ECB2280A09111239
+3001220706151417163B0115232207061514171633323736353427262520171611100021
+2224353436372627263534373602457745464443749B9489484E545597D268636360FEF6
+01619797FED6FEC6EEFEFE8A7C703C3C727103DC2E2E40462D2C983338585A3838746FD0
+CD726EA09E9DFEEEFEF2FEC2B6AD6C92181841405D8D4F4E00010071FFE305CB06140027
+00474027121B111C18A915972800052501A90325B908111C881FB90EB8088C280200081B
+340422120B452810FCECDCE4FCC4310010E4F4FCEC3910FED4EE11393910FCEC11123939
+302511233521110E01232200111000213216173534363B011523220615112E0123220615
+141633323603A99B014165D77BFDFED6012D0106376931A3B5FEE7694D5FC063B3C6C6B3
+4F7C9E01118CFDF02424013E010E0112013A0F0F21D6C09C6199FEE53E3EE3CDCDE30F00
+FFFF00BA000004810460100603D100000003FEF2FE56022E061400030012001B00394011
+0913050416120F041D070105080004461C10FC3CFC3CDCC410DCEC1112393931400B180D
+BD04BC00B109130612002F3CCC32E4E4FCC4301333152315331133152306070623203534
+2133072322171433323736C1B8B8B8B5BD12374BBCFED1010EC108B875017F5F2B1D0614
+E9CBFBA08B784760DDCD8B4241302000000100BAFE4C049C0460000A0000012311012309
+0133011133049CB9FDDBEB0252FD95F00239B9FE4C0397FE1D020C0254FDDD0223000000
+000100BA000003F104600005001B400D00BF03A906050703010800460610FCFCCCC43100
+2F10ECEC30133311211521BAB8027FFCC90460FC3393000000><00020071FE5605F80612
+000B00240043401E03B90C0F09B91815B80F8C23BD251F871C9725180C06082247001212
+452510FCECF4EC3232310010FCEC10E4E4F4C4EC10C6EE30400960268026A026E0260401
+5D011416333236353426232206010E01232202111000333216173534363B011523220615
+1123012FA79292A8A89292A702733AB17CCBFF00FFCB7CB13AA3B5FEE7694DB9022FCBE7
+E7CBCBE7E7FDAE646101440108010801446164C6D6C09C6199F9DA000000000100580000
+03A506120024004C400B260512161F1A0820000E2510DCDC3CFC3CDCECC4B31C1A230010
+CC10CC3140140D860E0C12241BA9211E1F09B912971F1AA9001F002FD4E410F4EC10DC3C
+EC32104B5058DC1BD459EC30013332373635262726232207060735363736332017161514
+0706071533152311231123353301543FC0563A013963B3504F4E4E4C51515501138A6D6C
+70AAE7E7CAE5E4031E724C6285417216152BAC2311129D7DBAAA73771ED4A4FEEC0114A4
+000000010058000003A506120024004D400C2610221D082303181207452510FCECDC3CFC
+3CDCC4B32022002310CC10CC31401410860F0C0B021EA924212314B90B972303A91D2300
+2FD4E410F4EC10DC3CEC32104B5058DC1BD459EC30133533352627263534373621321716
+171526272623220706071417163B0111331523112311F7E7AA706C6E8901135551514C4E
+4F4E50B36339013A56C03EE5E5CA0114A4D41E7773AABA7D9D121123AC2B151672418562
+4C72FE9AA4FEEC01140000030071FFE307C30614000B0026002900000010171620373610
+27262007251133112115012115212B01350607062322272610373633321716171101012F
+5354012454545454FEDC540220B80369FD4C02B4FC971A9E3A58597CCB807F7F80CB7C59
+58F2029A02FAFE6A74737374019674737348025EFE4CA8FCDB93A8643031A2A20210A2A2
+31304DFCF9030700000000020071FE4C081C061400340040000001112335060706232227
+26103736333217161711331121150132171617161514042122272627351E013332373635
+3427262B013501041017162037361027262007045AB83A58597CCB807F7F80CB7C59583A
+B8036AFE656A80625651FED0FEE85E63646A54C86DBE63645C5DA5AE01AEFA3A53540124
+54545454FEDC5403CDFC33A8643031A2A20210A2A2313064025EFE4CA8FE24382A6D688A
+DDF2121325C331324B4B8F844B4AA601F3D3FE6A7473737401967473730000040071FF91
+07C20614000B000E0033003A000000101716203736102726200725110125211501331233
+321716212306152334372123350607062322272610373633321716171133013332353423
+06012F5354012454545454FEDC5402D80299FD670368FD4CAF3CDBE30101FEB229039903
+FE969D3A58597CCB807F7F80CB7C59583AB801FD14AE465802FAFE6A7473737401967473
+735FFCFA030693A8FCDB0120F6BD333C3B34A8643031A2A20210A2A2313064025EFA7F36
+5B020001003700000640059E0037000001112115211114171633213237363534262F012E
+0135343633321617152E012322061514161F011E01151407062901222726351123353311
+0177017BFE8525267302408246465EB240AB98E0CE66B44C4EA85A898962943FC6A37C4C
+FEF9FDC4D551518787059EFEC28FFDA08927272D2C34494D2A0F2495829EAC1E1EAE2828
+54544049210E2C978992653E504FD202608F013E000000020037FE56050806140026002F
+000001112130353437363B01152322070615131407062B0135333237363D012322272635
+1123353311010211211114171633017701785751C3AEB0632627025152B54631692626BD
+D551518787023302FE88252673059EFEC24EB55B5699282868FB29D660609C3031991450
+4FD202608F013EFAFC01A20195FDA089272700030037FF7005C9059E002D003900440000
+011121153621321716171526272623220706101F01363320171407062322270615073437
+212227263511233533110116333237362726232207060526351037211114171633017701
+7B9500FF5551514C4E4F4E50B3636363084FCE012B01654B9D5449029906FEEBD5515187
+87033B42535F151F010183722805FED6808BFE99252673059EFEC27A95111223AC2B1615
+7172FE667209ABF676291E12324C034F41504FD202608F013EFAF918070B274B560A099D
+F801079BFDA0892727000001002FFE56066F06140035000001111407062B013533323736
+351134262322061511231121112311233533353437363B0115232207061D01213B011536
+373633321716066F5251B5FEE96926267C7C95ACB9FED3B9B0B05757BDAEB0632726012D
+02B742595A75C1636302A4FD48D660609C30319902B29F9EBEA4FD8703D1FC2F03D18F4E
+BB55569928286863AE6532327778000100C1000005410614002700001333112132373635
+34262F012E0135343633321617152E012322061514161F011E01151407062901C1B801FD
+8246465EB240AB98E0CE66B44C4EA85A898962943FC6A37C4CFEF9FD4F0614FA862D2C34
+494D2A0F2495829EAC1E1EAE282854544049210E2C978992653E000200C1000004E20614
+000A000D008E400D0D05030B0603090B010800460E10FCFC3CD4C432111239393100400A
+420DA902BC05A90097072FECECF4EC304B5358400A05110C0D0C0D11040504071005ED07
+1005ED59014042050416041B0C26044704490C060D0D0F0F18051D0D2B0D300F390D4003
+400440064007400F430D45055705590D6003600460066007600F620D6605AF0FBF0FDF0F
+1A5D005D1333112115012115212B01131101C1B80369FD4C02B4FC971A9EB8029A0614FE
+4CA8FCDB9303CDFCF9030700000000020036FFE203E9051F000C0019000013331B01331B
+013303230B012303331B01331B013303230B01233674919089919074B988989988B97491
+9089919074B9889899880255FE1701E9FE1701E9FD8D0202FDFE053DFE1701E9FE1701E9
+FD8D0202FDFE0002003600AD03E9051F0007000F0033400C110C040809010D0508080010
+10DC3CEC32D43CEC32C431400C0B0E0DA90810030605A900100010D4FCCC3210D4FCCC32
+30132111231121112311211123112111233603B38FFD6B8F03B38FFD6B8F0255FE580105
+FEFB0472FE580105FEFB00010000FE4A0490061400190033400C1B001608174E0F080546
+0A1A10D4FCECF4EC32CC3100400F128700028C1A09870B9716BC18BD1A10ECECF4EC10F4
+CCEC302506232226351134262B0135333216151110333236351133112303D783E7C1C64C
+693146B5A3F895ACB9B9ACC9EFE802C499619CC0D6FD42FEC3BEA40279F9EC0000000001
+0000FE56057606140021003A400D1D23001508174E0F0805460A2210D4FCECF4EC32CCCC
+31004012128700028C220A870B97221C871EBD16BC2210ECFCEC10F4EC10F4CCEC302506
+232226351134262B01353332161511103332363511331106163B01152322262703D783E7
+C1C64C693146B5A3F895ACB90450683246B69E05ACC9EFE802C499619CC0D6FD42FEC3BE
+A40279FB8E94669CB9DD00010075029C02C406030013003040071500030E0A0B1410D4DC
+3C2FCCCC4BB00D5158B11540385931B27F15015D00400606110C020B1410D43CC4D4CC30
+0111231134262322061511231133113E0133321602C4744E4E5E6C757529714A797D0417
+FE85017759596B5CFE9E0367FEAB3838860000010075029C02C40603001B003A4BB00E53
+5840081D000310160A0B1C10D4DC3CCC2FCCCC4BB00D5158B11D40385931B27F1D015D00
+40070619110F020B1C10D43CD4CCD4CC30590111231134262322061511231134363B0115
+2322061D013E0133321602C4744E4E5E6C756772A092423029714A797D0417FE85017759
+596B5CFE9E0284786B5736567238388600000002FFE901AD00EE0603000D001100234007
+130F01080E001210DC3CCCDC3CCC310040070E11000807001210D4D4CC10DCCC30133311
+1407062B01353332373635113315237A743433722C1F4218187474050FFD82783636581B
+1B560372820000010075029C0212051E0011001F4005110B07081210DCCC00CC31004007
+001107030E09082FC4D4CC10D4CC30012E012322061511231133153E0133321617021213
+2E1C626975752475540C1D1204AF0A09716BFEB60273613937020300000000010048028D
+01E4050F0011001BB408060B111210DCDC3CCC3100B50011030E07092FCCD4CCD4CC3013
+1E013332363511331123350E012322262748132E1C626974742475540C1D1202FC0A0971
+6B014AFD8D61393702030001004801AD0275050F001B0027B61D0E090615001C10DCDC3C
+DCDC3100400A0D0F14001B03180809142F3CCCD4CCD4CC10DCCC30131E01333236351133
+111514163B01152322263D020E012322262748132E1C62697430421F2C72672475540C1D
+1202FC0A09716B014AFD8D0B5636586C780B613937020300000000020020029C028F050F
+001600210000011E01151407062B01113311333237363F01330706070601333237363534
+27262B01019B4346434489F4746B3D252528667B6E212122FED77D4B272929274B7D03E9
+0F4E3B5B2D2D0273FEF715143FA1AB351E1EFF0017182F2E181900010036029C03E9050F
+000C000013331B01331B013303230B01233674919089919074B988989988050FFE1701E9
+FE1701E9FD8D0202FDFE0001002601AD02D5050F00110000010607062B0135333237363F
+0101331B0133019F312F2E4E5D44301A1B2015FEE27BDDDC7B02627022235714144B2F02
+69FE1601EA00FFFF00A00474019F0666100603120000FFFF00A004740313066610260312
+00001007031201740000FFFF00AE03E901D305D510060AFA0000FFFF00B203FE01D705D5
+10060AFB0000000100C404EE01E906DA00050017400A039E000603020019050610DCFCD4
+CC310010D4EC3001151323033501975281A406DAACFEC00140AC0001007503EF01870614
+000E0031B40007040C0F10DCB43F0C4F0C025DCCDCB6000710072007035D3C3100B60104
+000708970F10F4CCDCB20000015D39CC3013353236353426233532171614070675405858
+4073504F4F5003EF7B58403F587B504FE650500000000001007503EF01870614000E0031
+B400080B040F10D4CCDC400D0004000B1004100B2004200B065D3C3100B60E0B00080797
+0F10F4CCD4B20000015D39CC30012227263437363315220615141633018773504F4F5073
+4058584003EF5050E64F507B583F4058000000010075029C02890602001C002B40090105
+0005161A0E001D10D4C4DCDCCC111239310040091A00120D0E09121C1D10D4D4CCD4CC10
+DCCC30013332373635262726232207060735363736333217161514070607112301142779
+372401233F713232313130333335AE574444466B80045B402A374B24400C0C186014090A
+5846685F404311FE930000010075029C02890602001C002D400A1C00180F00180700031D
+10DCCCDCCC10C41112393100400903000B100F140B021D10D4D4CCD4CC10DCCC30011123
+112627263534373633321716171526272623220706071417163301EA7F6B47444557AD35
+33333031323132713E2401253679045BFE41016D1143405F6846580A091460180C0C4024
+4B372A4000000001010B043202F506B0000600000125150D011525010B01EAFE990167FE
+1605BBF58BB4B48BF5000001010B043202F506B0000600000105352D01350502F5FE1601
+67FE9901EA0527F58BB4B48BF500000100C1047C033F06660006003DB4040275060710DC
+EC393100B504050200B30710F4CC32B410021005025D3930004BB009544BB00E545B58BD
+0007FFC000010007000700403811373859013313230B012301B694F58BB4B48B0666FE16
+0167FE990000000100C1047C033F06660006004CB4030575010710DCEC393100B5030004
+01B30710F43CD4B21000015D3930004BB009544BB00E545B58BD0007FFC0000100070007
+00403811373859400C35003A0635023A04043303015D015D0103331B01330301B6F58BB4
+B48BF5047C01EAFE990167FE1600000100C104EE033F066600060037400C040502B400B3
+07040275060710DCEC39310010F4EC323930004BB009544BB00E545B58BD0007FFC00001
+00070007004038113738590133132327072301B694F58BB4B48B0666FE88F5F500000001
+00C104EE033F066600060037400C0300B40401B307030575010710DCEC39310010F43CEC
+3930004BB009544BB00E545B58BD0007FFC0000100070007004038113738590103331737
+330301B6F58BB4B48BF504EE0178F5F5FE88000100D603E7015E06120003001340040500
+030410DCDCCC3100400203022FC43001112311015E880612FDD5022B0000FFFF00D50562
+032B05F61006007100000001017304EE035206660003000001330123028BC7FEBA990666
+FE88000100AA04F0028906660003000009012301016F011A99FEBA0666FE8A0176000001
+00D6FED1015E00FC0003001340040500030410DCDCCC3100400203022FC4302511231101
+5E88FCFDD5022B000000FFFF00D5FEC0032BFF54100700710000F95E0000000100AAFE1C
+0289FF920003000005012301016F011A99FEBA6EFE8A0176000000010173FE1C0352FF94
+0003000005330123028BC7FEBA996CFE88000002006F000001D40423000200050045400B
+000103050300040205010610D43CC44BB0105058B30740024038385932393931002FC4D4
+C43040090F03000060006F03045D01400D500760076004600264036400065D0103210313
+210121B20165B3B3FE9B02D9014AFD27FEB60001006F02D901D4042300020034B6000103
+0002010310D4C44BB0105058B30440024038385939310010D4C430400500006000025D01
+40095004600460026400045D0103210121B2016502D9014A0000FFFF007501FE01870423
+100702800000FE0F0000FFFF007501FE01870423100702810000FE0F00000001011F01D4
+02E1039600070000011521353311331102E1FE3E9696026A9696012CFED40001011F01D4
+02E10396000700000135211523112311011F01C2969603009696FED4012C0001006400FF
+02BA0355000B0000013533153315231523352335014496E0E096E00275E0E096E0E09600
+00000001006401DF0226027500030000012135210226FE3E01C201DF9600000100C70529
+03390648000D0057400E0BF0040700B30E0756080156000E10DCECD4EC310010F43CD4EC
+30004BB0095458BD000EFFC00001000E000E00403811373859004BB00F544BB010545B4B
+B011545B58BD000E00400001000E000EFFC0381137385913331E0133323637330E012322
+26C7760B615756600D760A9E91919E06484B4B4A4C8F909000000001019A054402660610
+0003004E400902CE00CD040164000410D4EC310010FCEC30004BB00A544BB00D545B58BD
+00040040000100040004FFC0381137385901B00D4B54B00E4B545B58BD00040040000100
+040004FFC0381137385901331523019ACCCC0610CC00000200EE04E103120706000B0017
+0020401103C115F209C10FF11800560C780656121810D4ECF4EC310010F4ECF4EC300134
+26232206151416333236371406232226353436333216029858404157574140587A9F7373
+9F9F73739F05F43F5857404157584073A0A073739F9F0001014CFE7502C1000000130020
+400F0B0E0A07F30EF40001000A0427111410D4ECC4D4CC31002FFCFCC412393021330E01
+15141633323637150E0123222635343601B8772D2B3736203E1F26441E7A73353D581F2E
+2E0F0F850A0A575D3069000100B6051D034A0637001B006340240012070E0B040112070F
+0B0412C3190704C3150BED1C0F010E000715561677075608761C10F4ECFCEC1139393939
+310010FC3CFCD43CEC11123911123911123911123930004BB009544BB00C545B58BD001C
+FFC00001001C001C0040381137385901272E0123220607233E013332161F011E01333236
+37330E0123222601FC3916210D2624027D02665B2640253916210D2624027D02665B2640
+055A371413495287931C21371413495287931C000000000200F004EE03AE066600030007
+004240110602B40400B3080407030005010305070810D4DCD4CC1139111239310010F43C
+EC3230004BB009544BB00E545B58BD0008FFC00001000800080040381137385901330323
+0333032302FCB2F88781AADF890666FE880178FE88000001FFFF01DE02AD0408000F0000
+032533151417163B0115232227263505010116B82626692B40AF5752FEEB0364A4949931
+309C605AC8A2000100EF04EE03100666000B0000012707233727331737330717025C5C5D
+B4B5B5B45D5CB4B6B604EE6161BBBD6060BDBB0000000002007501AB02FD050F000D0015
+0000011615142320353437033317373301061514333235340205B2F2FEF5B5FA89BFB789
+FEBC89888103DCF9B48484BFF2012FE0E0FE8AAE984D4D8900000001007A029C00EE0603
+0003000DB102032FCC3100B100032FC430133311237A74740603FC99000000010075029C
+0290052F00320000011526272623220706151417161F0116171615140706232227262735
+161716333236353427262F012627263534373633321716026A31353439572B2B1F1F5D28
+7D32344E4D88393E3D44403F3E3D5258201C6F286C3030474682403939050D61160B0B17
+182F2414151208182A2B4D5733330A0A136B1E0F0F322D2A1714170815292A4958303109
+080000010075029C0321050F000B00000103012327072301033317370314FF010C89CDCD
+890112FB89BBBB050FFECFFEBEF6F60148012BDFDF00FFFF0075029C0289060210060283
+0000000100D60000031D055800050015400901A90300000804020610C4D4EC31002FD4EC
+302111213521110295FE41024704D088FAA8000100D60000031D05580007002740183F04
+3F012F042F011F041F010601A904050000040806020810C4D4EC3231002FD4DCEC5D3021
+112135211133110295FE4101BF88039C880134FAA800000100D60000031D055800070019
+400B01A904050000040806020810C4D4EC3231002FD4DCEC3021112135211133110295FE
+4101BF880268880268FAA8000000000100D60000031D0558000700274018700470013004
+3001100410010604A901050000040806020810C4D4EC3231002FD4DCEC5D302111213521
+1133110295FE4101BF88013488039CFAA800000100D60000031D05580005001540090100
+A904000802040610C4D4EC31002FECC430251133112135029588FDB98804D0FAA888FFFF
+00C1FDEC033FFFD6100702870000F9700000FFFF00D504E2032B06761227007100000080
+120600710080FFFF00AE03E9036D05D512060AFF0000FFFF00EEFE14031200391007029C
+0000F9330000000100B6FE76034AFF900021005F400E12011100091A561B7709560A7622
+10F4ECFCEC113939393931004015001609110E05011609120E0516C31F0905C31A0E2210
+D43CFCD43CEC11123911123911123911123930004BB0095458BD001CFFC00001001C001C
+0040381137385901272627262322070607233637363332161F0116171633323736373306
+070623222601FC391611100D261212027D0233335B264025391611100D261212027D0233
+335B2640FEB337140A0925245287494A1C2137140A0925245287494A1C000002FCA8047B
+FE870666000300040036400C01B400B304B805040344010510DCEC39310010E4F4EC3000
+4BB009544BB00E545B58BD0004FFC0000100040004004038113738590901230901FD6D01
+1A99FEBA01580666FE8A0176FE150002FD71047BFF500666000300040036400C02B400B3
+04B805040344010510D4EC39310010E4F4EC30004BB009544BB00E545B58BD0004FFC000
+0100040004004038113738590133012317FE89C7FEBA998F0666FE8873000002FCC1047B
+FF3F066600060007003C400F040502B400B307B80807040275060810DCEC3939310010E4
+F4EC323930004BB009544BB00E545B58BD0007FFC0000100070007004038113738590133
+132327072305FDB694F58BB4B48B013F0666FE88F5F573000000FFFFFCB4051DFF480637
+1007029EFBFE00000000FFFFFCD90562FF2F05F610070071FC0400000000FFFFFBEC057C
+0014060B10070B20FC0000000000FFFFFCBF0529FF3106481007029AFBF8000000000002
+FDA2047BFE5A0614000300040025400C02BE00B104B805040108000510D4EC39310010E4
+FCEC3000014007040434044404035D0133152317FDA2B8B85E0614E9B0000003FCD7047B
+FF290610000300070008004940110602CE0400CD08B809016408000564040910DCFCD439
+EC310010E4FC3CEC32300140230408340844086001600260036000600160026005600660
+0870017002700570067008115D013315232533152305FE5ECBCBFE79CBCB01290610CACA
+CACB0001FD3704F2FEF7067B00190022400914564005800C56190D2FCCEC1ADC1AEC3100
+400617C14002C00D2F1ADC1AEC30013633321615140F0106070615233534363F01363534
+26232207FD377069687F582C230407771E332D2E3E475A6406483355433D41201A091020
+0C283625222228152434FFFFFCEC04E1FF1007061007029CFBFE00000000FFFFFCF404EE
+FFB206661007029FFC04000000000002FCC5047BFF43066600060007003C400F0300B404
+01B307B80807030575010810DCEC3939310010E4F43CEC3930004BB009544BB00E545B58
+BD0007FFC0000100070007004038113738590103331737330307FDBAF58BB4B48BF54E04
+EE0178F5F5FE887300000001FDBC04ECFE4406A80003000EB2021B002FEC3100B103012F
+CC3001112311FE448806A8FE4401BC000000FFFFFCF004ECFF1006A8102702BEFF340000
+100702BE00CC000000000002FC5D04EEFF1B066600030007004240110602B40400B30804
+05010007030107050810D4DCD4CC1139111239310010F43CEC3230004BB009544BB00E54
+5B58BD0008FFC0000100080008004038113738590113230321132303FD0FCD87F80200BE
+89DF0666FE880178FE8801780000FFFFFCBF0529FF310756102702B8000001421007029A
+FBF8000000000001FCBF0529FF310648000C0018B50756080156002FECD4EC3100B40AF0
+0400072F3CDCEC3003232E0123220607233E012016CF760B615756600D760A9E01229E05
+294B4B4A4C8F909000000001FE1F03E9FF4405280003000A40030201040010D4CC300123
+1333FEF2D3A48103E9013F0000000001FD9004C2FE8206C1000800000110233516352335
+33FE82F27070F205C3FEFF7B0389FE0000000001FD9004C2FE8206C10008000001353315
+2314371522FD90F16F70F205C3FEFE89037B0001FF79049A008706120003000003330323
+40C775990612FE880000FFFFFCA8FDDFFE87FF5510070043FBFEF8EF0000FFFFFD71FDDD
+FF50FF5510070076FBFEF8EF00000001FD24FE14FE3CFFCE000700000123353335331123
+FDC4A0A07878FEB578A1FE4600000001FDC4FE14FEDCFFCE000700000533153315231523
+FDC478A0A07832A178A10001FE550586003F07700005000003213521112349FE9E01EA88
+06E888FE16000001FEF0036B007B04E000130031400607560E0411002F4BB00C544BB00D
+545B4BB00E545B58B9000000403859DC32DCEC310040050A04C100112FC4FCCC3001351E
+0133323635342627331E01151406232226FEF03D581F2E2E0F0F850A0A575D306903D777
+2D2B3736203E1F26441E7A7335000001FD80FE12FE56FFBE000D001C40060D060A56030E
+10D4FCCC323100400606C1070DC1002FFCDCEC300122263534363315220615141633FE56
+5A7C7C5A28353528FE127D5A597C78352728350000000001FD0BFE14FEF5FF4D00070000
+0133152135333533FE44B1FE16B188FE9C8888B100000001FD0BFE14FEF5FF4D00070000
+0123352115231523FDBCB101EAB188FEC58888B100000001FD24FE14FEDCFFCE000B0000
+012335333533153315231523FDC4A0A078A0A078FEB578A1A178A10000000001FD0BFE88
+FEF5FF100003000001352115FD0B01EAFE88888800000001FD7AFE56FFD00080000D0000
+27151407062B0135333237363D01305251B5FEE96926268094D660609C30319994000001
+FD77FE56FFCD0080000D00002533151417163B01152322272635FD77B8262669E9FEB551
+5280949931309C6060D60001FDA2FE89FE5AFF730003000005331523FDA2B8B88DEAFFFF
+FCD5FE89FF27FF531007006AFBFEF94300000002FD28FE12FED4FFBE000B0017001E4008
+00560C780656121810D4ECF4EC3100400615C10309C10F2FFCDCEC300134262322061514
+16333236371406232226353436333216FE5B3627283535282736797C5A5A7C7C5A5A7CFE
+EA26363527283536265A7D7D5A597C7C00000001FD6AFE14FE8FFF540003000A40030300
+040010D4CC3005330323FDBCD3A481ACFEC0FFFFFD23FE75FEC100001007007AFC000000
+0000FFFFFD4CFE75FEC100001007029DFC00000000000001FDBCFE14FE44FFA00003000E
+B2021B002FEC3100B101032FCC3005112311FE448860FE74018C0001FCF0FE50FF17FF9A
+000700000711233521152311E989FEEB8966FEB6C2C2014A00000001FC63FE39FF98FF58
+00140000010623220334353316333237331617323733020722FDFE3C74DA11750E68650F
+760C69660F760FDC74FE8B52011A02039696950196FEE2010000FFFFFCC5FE14FF43FF8C
+11070289FC04F9260027004BB009544BB00E544BB00B544BB00C545B5B5B58BD00070040
+000100070007FFC0381137385900FFFFFCBFFE14FF3DFF8C11070288FBFEF9260027004B
+B009544BB00E544BB00B544BB00C545B5B5B58BD00070040000100070007FFC038113738
+5900FFFFFCBFFE39FF31FF581007029AFBF8F91000000001FCBFFE36FF31FF55000C0000
+03232E0123220607233E012016CF760B615756600D760A9E01229EFE364B4B4A4C8F9090
+0000FFFFFCB4FE39FF48FF531007029EFBFEF91C0000FFFFFCD9FEC0FF2FFF541007028F
+FC0400000000FFFFFBECFE1D0014FEAC10070042FC0000000000FFFFFBECFE1D0014FFEE
+10070AF9FC00000000000001FB8C01ECFFAD030C001B000003150E0123222726272E0123
+220607353E0133321617161716333236534B8F4F5A71160B4D67334F8D494E925335644A
+0C15745D4689030CAE3B37330A0421183B3FAE3C36161F050A373D0000000001FD7801C4
+FF880268000300000315213578FDF00268A4A40000000001FAED01C4FFFF026800030000
+01352115FAED051201C4A4A400000001FB68FFA2FFBC04BC0003000005270117FBC86003
+F55F5E4E04CC4F0000000001FA12FFBAFF9106170003000005270117FA79670519664658
+0605590000000001FDACFE12FE82FFBE000D001C40060D060A56030E10D4FCCC32310040
+0600C10D07C1062FFCDCEC300532161514062335323635342623FDAC5A7C7C5A28353528
+427D5A597C78352728350001FCF1FE5BFF18FFA5000700000111331521353311FCF18901
+1589FE5B014AC2C2FEB60002FD21FE14FEE3FFD60003000700000511211101352315FEE3
+FE3E014AD22AFE3E01C2FEB6D2D20001FC63FE39FF98FF58001400000536333213141523
+26232207232627220723123732FDFE3B74DA11760D676610760B69660F760FDC74FA52FE
+E602039696950196011E010000000001FD2B04F3FEE506AD000B00000107273727371737
+17071707FE087D607D7D607D7D607D7D6005707D607D7D607D7D607D7D600001FE0604C2
+FF2006D2001D0000012E0135343637150E01151417161F011E0115140607353E01353427
+2627FE43211C93875249090C1237211C93875249090C1205C71C301C5051026E021B1C0A
+0C0F0E2B1C301C5051026E021B1C0A0C0F0EFFFFFBEC043A0014060B10270B20FC000000
+10070B20FC00FEBE0000FFFFFCA804F0FE87066610070043FBFE00000000FFFFFD7104EE
+FF50066610070076FBFE00000000FFFFFCB4051DFF4806371007029EFBFE00000000FFFF
+FD9004C2FE8206C1100602C40000FFFFFCE70546FF6207D21007031CFC1000000000FFFF
+FDC6FE56FEA2FFA410070316FC10000000000001FCD5051DFF2B06490007000003233521
+15231121D596FED6960256051D9696012C000002FD1FFE32FEE1FFB80003000700000121
+352135213521FEE1FE3E01C2FE3E01C2FE32789678000002FD15FE14FEEBFFA000030007
+00000533112301331123FD1596960140969660FE74018CFE74000001FD1FFE14FEE1FFD6
+00050000052111231121FD1F01C296FED42AFE3E012C0001FCB604EEFF4A066600270000
+013733071617163332373637330607062322272627072337262726232207060723363736
+33321716FDFF426D6B0B16100D261212027D0233335B26201E21426E6B0D14100D261212
+027D0233335B26201E05FF67A9090E0A242552874A490E0D1D67A80B0D0A242552874A49
+0E0D0003FCB60489FF4A06CC001D00210025000001272E012322061D012334363332161F
+011E013332363D01330E012322260733152313331523FDFC39191F0C24287D6756243D30
+3917220F20287D026754223BE89696D296960568210E0B322D066576101B1E0D0C332906
+6477102E960243960000FFFFFCB604C5FF4A06901022171800B710031718000000A70001
+FC63FE28FF9DFFC2000D00000137211723273733072127331707FE7084FE19847FAFAF7F
+8401E7847EAFAFFE289B9BCDCD9B9BCDCD000001FD33FE14FECDFFA40008000001233507
+3537171527FE32649BCDCD9BFE14E7847EAFAF7E84000001FD7804E1FE88070600100000
+0106070615141716171526272634373637FE88402A2C2C2A40724E50504E72068B012A2C
+40412B2B017B014F50E6504E0100FFFFFCBF0460FF3106D8102702C200000090100602B8
+00E5FFFFFD2BFE14FEE5FFCE100702EE0000F92100000001FD7804E1FE88070600120000
+01303516171614070607303536373635342726FD78724E50504E72402A2C2C2A068B7B01
+4E50E6504F017B012B2B41402C2AFFFFFF2E0544FFFA06101007029BFD94000000000003
+FC90FE12FF6FFFBF00070015001D00000016323E01262206373632161406222706222634
+36321236342622061416FD09354F3502374F35F73EB57C7CB63D3EB67C7CB6FE36364F35
+35FEC335354D37356D3F7CB37D41407DB37CFECE364D36354F35FFFFFC70FE1B0390FF85
+10070B21FCC900000000FFFFFC70066B039007D510070B21FCC9085000000001FC7006D7
+0390076B0003000001211521FC700720F8E0076B94000001FC70FEC00390FF5400030000
+05211521FC700720F8E0AC9400000001FD2A060D02D60727002300000327262726232207
+060723363736333217161F011617163332373637330607062322272604901C4F2C246535
+4605A2047170C85B3F395A901C4F2C2461394704A2047170C85B3F39064A370B120A2430
+47874A490E0D22370B120A242C4B874A490E0D000000FFFFFC7006040390076E10070B22
+FCC9000000000001FC77FE280393FFC200080000013521273317072337FC770673847EAF
+AF7E84FEC3649BCDCD9BFFFF00C90000047105D5100611F00000FFFF00C1000003D00460
+100611F10000000100C90000061C05D5000B0000132111231121112311211123C90553CA
+FE86CBFE86CA05D5FCF40262FAD5052BFD9E000100C90000046505D5000B000013211123
+1123112311231123C9039CB8B9B9B9B905D5FCF40262FAD5052BFD9E0000000100A00474
+019F066600030011400601000402000410D4CC310010D4CC301B013303A041BE6E047401
+F2FE0E000000000100A0FE56019F004800030011400602030400020410D4CC310010D4CC
+3025032313019F41BE6E48FE0E01F2000000FFFF00C90000053305D5100603AC0000FFFF
+00BA000004790460100603CC0000000101B6FE560292FFA4000D000001232227263D0133
+151417163B010292941A1A14950A0C0E23FE56211A2EE5E50E0C0D000000FFFF007FFFE3
+03F5047B100602160000FFFF0071FFE303E7047B10270079014FFF84100600460000FFFF
+007FFFE303F5047B10270079008EFF84100602160000FFFF009EFF1201C304231206001E
+00000001017304EE0352066600030031400902B400B3040344010410D4EC310010F4EC30
+004BB009544BB00E545B58BD0004FFC00001000400040040381137385901330123028BC7
+FEBA990666FE88000000FFFF00D70546035207D21226006A00001107031B0000016C0014
+004007AF089F085F08035D40055F080F080271300000FFFF00100000056806661027031B
+FEDA0000100603260000FFFF00DB024801AE0346120600790000FFFFFFE7000005750666
+1027031BFE7400001007032A00EA00000000FFFFFFF30000061F06661027031BFE800000
+1007032C00E400000000FFFFFFED0000027D06661027031BFE7A00001007032E00EA0000
+0000FFFFFFF2FFE3060106661027031BFE7F0000100603342800FFFFFFE1000006910666
+1027031BFE6E00001007033901AA00000000FFFFFFDB0000060506661027031BFE680000
+1006033D3600FFFF00050000028007D21027031CFF2E00001206034D0F00FFFF00100000
+056805D5120600240000FFFF00C9000004EC05D5120600250000000100C90000046A05D5
+00050019400C04950181000702041C01040610FCFCCCC431002FF4EC30331121152111C9
+03A1FD2905D5AAFAD500000200100000056805D500020006003D400C4200950481019503
+0806030710D4C4C431002FECF4EC304B5358401200110504030211060605001104011103
+0304050710EC10EC0710EC0810EC590901210501330102BCFE660335FBB9023AE5023905
+0EFB9AA805D5FA2B0000FFFF00C90000048B05D5120600280000FFFF005C0000051F05D5
+1206003D0000FFFF00C90000053B05D51206002B000000030073FFE305D905F000030012
+00210032401C0495139122039500AD220B951A8C222310010F1916330008191E102210FC
+ECC4F4ECC4EC310010F4EC10F4EC10F4EC30012115210122070611100033323736111027
+2627200011100706212027261110373601C502C2FD3E0162DC81820103DCDC81808081DC
+013A0178BCBCFEC6FEC5BCBDBDBC0370AA0286A4A4FEE5FEE6FEB8A4A4011A011BA4A4A4
+FE5BFE9EFE9FD2D3D2D201620162D3D20000FFFF00C90000019305D51206002C0000FFFF
+00C90000056A05D51206002E0000000100100000056805D50006003C400B420695028105
+010804010710D4C4C431002F3CF4EC304B53584012061103020105110404030611020011
+010102050710EC10EC0710EC0810EC5933230133012301E5D5023AE50239D2FE2605D5FA
+2B050E000000FFFF00C90000061F05D5120600300000FFFF00C90000053305D512060031
+0000000300C90000046205D500030007000B002A4016079504810B039500AD08950B0D04
+010905000804040C10FC3CC4D43CC4EC31002FECF4EC10F4EC3001211521032115211121
+1521013202C7FD39690399FC670399FC670371AA030EAAFB7FAAFFFF0073FFE305D905F0
+120600320000FFFF00C90000053B05D5120603B30000FFFF00C90000048D05D512060033
+0000000100C90000048B05D5000B00464011420A06950781000495030D01080407040C10
+FC3CD43CCC31002FEC32F4EC32304B535840120B110505040A110606050B110500110405
+04050710EC10EC0710EC0810EC5925211521350901352115210101B102DAFC3E01DFFE21
+03B0FD3801DFAAAAAA02700211AAAAFDF300FFFFFFFA000004E905D5120600370000FFFF
+FFFC000004E705D51206003C000000030073000005D905D5000800110027003C4010290D
+1921121A001C251D11041916102810FCECD43C3CFC3C3CD4ECC43100400E1100951D1A1B
+81270908952512272FD43CFC3C10F4D43CFC3C3001060706151417161733363736353427
+26270326272611103736373533151617161110070607152302C2966282826296CA966280
+806296CAF49EBDBD9DF5CAF49DBCBC9DF4CA048E155773C6C5735715155773C5C6735715
+FC101686A0010F010FA187169F9F1786A1FEF1FEF2A186179D00FFFF003D0000053B05D5
+1206003B000000010073000005DB05D5001D002E4017100D951B02150E0781001F151C16
+020E1C1B0F081C071E10DCECD43CFC3CD4ECCC31002FE43232DC3CEC3230213627222726
+03113311101716171133113637361901331102070623061702C20101D6BCB805D5826E8A
+CA8A6E82D505B8BCD6010186B0D2CC01680199FE67FEE6A48C0E03F1FC0F0E8CA4011A01
+99FE67FE98CCD248EE000001004E000005CF05E700260033401B0B951E91260312159502
+1403071928100022331A120E19151A102710FCC4FCC410F4C4ECFCC431002F3CEC323232
+F4EC30251521353637363534272623220015141716171521352126272635103736212017
+16111407060705CFFDA8B163638484D8D8FEF76364B2FDA8013F9E4948C0BF0131012FC1
+C04747A1B2B2B261A6A6CAF09191FEDDEFCAA6A661B2B28B9595B8013EC5C5C5C4FECBC2
+94948D000000FFFF000600000258074E10271716032F01751306032E00000008B4090306
+08072B310000FFFFFFFC000004E7074E10271716047101751306033900000008B40C0207
+08072B310000FFFF0071FFE704E406661226034500001006031B6E000000FFFF0085FFE3
+03C806661026031B50001206034900000000FFFF00BAFE56046406661027031B00C60000
+1206034B0000FFFF00A60000029806661226034D00001007031BFF460000FFFF0095FFE3
+042A07D21226035900001006031C1B00000000020071FFE704E40479000D002A00C8400B
+1211072C1017071225452B10FCECD4C4C4123939400A3F102F101F10038F10015D710040
+1112110B03B929B8190BB9218C0FBC1687192FECE4F4EC10F4EC1139390540141D110011
+0E11121111100F110E1100111D11111007103CECECEC0807103CECEC313001400B841286
+118801890D8010055D401349134912491C4A1D4E0D4C004E01490E4B11095D40113A0E39
+123A11381D38113F0D3C003E01085D400B2B0D2B012A00290E2911055D400D190F180E1B
+0D1B011A001911065D0040052B1E2B1F025D01272623220706151417163332371B013303
+171617163B0115232227262706070623222726111037363320034E2C2DB2863D4D4B4C79
+8648A463A4CD2809232920586E5E5429112E5E2C8FEB72757F8DC601370209E7ED6E8AB6
+DC696BD501E70125FDA1DB3129309C542A586F5729989D011301268A9A00000200C0FE56
+04880621000E001C0037400F1812071E4513120B16001C0803461D10FCEC32C4D4ECE4D4
+EC3100400E1AB9050915B91611B90D8C02BD1D10ECF4ECD4FC39D4EC3025112311102120
+111007041110212203163320111005352011342320110179B901AA01B2AC0118FE1ED459
+6FC50120FE30016BEAFEFB45FE11060301C8FE7FFEEE645AFEF5FE26014AAD013A011A16
+AA0140DBFEC800010020FE56047F0460000E0040400710030708040C0F10D4D4FCD4C431
+004007020CBF06BD04072F3CECE432300540120111080702110304030E0D011100110708
+070710ECEC39390710EC08EC011301330111231101262B013533320169F5015EC3FE3BB8
+FEDA2C5F3146C503B0FD4C0364FBA0FE5601AA03447E9E00000000020071FFE3047505F0
+001C002D00544014060528042F451C28120A5112041218211212452E10FCECD4EC10F4B2
+7F0A015DECC4EC1112393900400E060525021C0002B91A25B90E8C2E10F4ECD4FCD4CC11
+1239394006161D53050605070E10EC393130012623221514051617161110070623222726
+1134373637263510213217010607061514171633323635342726272603EC66EFFD0108D0
+758E8989F0EF8A8989354B9C01B9DD78FE1844375655569593AC5B617E40051146755C30
+257087FEEBFEF79C9D9D9C0113CCA540244F8D011046FE281D4971CCCB7273E8BEC76067
+0B0600010085FFE303C8047C0032003D40220C860B8810B908B8331BA918332786288823
+B92C8C3334190B271408041F0830453310FCECD4ECD4C4C4C4310010F4ECF4EC10D4EC10
+F4ECF4EC300126272635343736333216171526272623220706151417163B011523220706
+1514171633323736371506070623222726353436018B703C3C7271C44CAA626150514777
+45464443749B9489484E5455975D5555475A545550EE81818A025C1841405D8D4F4E1818
+A71D0D0D2E2E40462D2C983338585A3838121325AB1C0E0E5B5BAD6C92000001006BFE52
+03F80614001D003E400B0A0E121F0419181C12141E10D4ECD4D4D4C4FCCC4BB0105158B9
+0016004038593100400E08B90A00B9128C1E1A178718971E10F4EC3210F4ECDCEC302516
+1716151407062334351637363534272623200310012135211500111002CA844F544A50A3
+452A20201F3AFDA201023BFDEC0366FD2C7F014B4F787350574B4C052C2325352C2A0233
+01EC0159B9B9FE94FE27FE690000000100BAFE560464047B00150031401606870E12B80C
+BC02BD0B17460308004E090D080C461610FCEC32F4ECEC31002FECE4F4C4EC304005A017
+801702015D011123113426232206151123113315363736333217160464B87C7C95ACB9B9
+42595A75C1636302A4FBB204489F9EBEA4FD870460AE653232777800000000030071FFE9
+04750624000800110021004F401B0DB91297220195112205B91A8C222345000912165101
+11121E452210FCEC32F4B27F16015DEC32EC310010F4EC10D440073F111F110F11035DEC
+10F4EC30400B190616047704A023802305015D0121121716333237361302272623220706
+030132171611100706232227261110373603B1FD830F455695965349091C365693995140
+13013DF089898989F0F18889898802C6FED57F9C9D8A01C9011C649E9C7EFEFC02B4D4D3
+FE8AFE8BD4D5D5D401750176D3D4000100A60000026E0460000D001B40070F0600080D46
+0E10FCFCD4C4310040050DBC0587082FECE43001111417163B0115232227263503016322
+246C596FB45252010460FD2B912E309C6062D402CA00000100BF000004850460000B0049
+40090D06040901080B460C10FCEC32C4D4C4310040050300BC070B2F3CE4323040160811
+0904050711060605080509040311040211090904071004EC1005EC093C3C071005EC1008
+EC133311013309012301071123BFBE01E3E0FE4701FEE1FE6289BE0460FE2F01D1FE5AFD
+46024281FE3F0001003D0000047F0614000D004640050F010B050E10D4C4D4C431004006
+0A870B9702052F3CF4EC3040180311010006041105060507110611031101000002110001
+00071005EC1009ECEC05EC071005EC1008EC0901230901230127262B01351716027A0205
+C3FEC6FE7EC301EB4A2F6B6075E20565FA9B033CFCC40432C67E9E020300FFFF00AEFE56
+04E504601006007700000001004A0000041804600015004240071707121100011610D4C4
+D4ECC43140040B01BC00002FE43230401614131203111511060504030703110100000211
+010100071005EC1009EC12173905EC121739210133013637363736272627333116171615
+1407060701A0FEAAC6012178644C0402181C6ABA452E2A88B17B0460FC547CAC81703564
+7783597C724EC4AFE4740001006BFE520401061400260040400F0A0E122804221D1C2012
+182512142710D4ECD4ECD4D4C4D4C4FCCC31401208B90A00B9128C27162387221E1B871C
+97270010F4FC3CD4EC3910F4ECDCEC302516171615140706233435163736353427262320
+1110252411343723352115201114051524131202DA844F544A50A3452A20201F3AFD9101
+4DFEE8DCD00315FD8B0210FDC602017F014B4F787350574B4C052C2325352C2A01B5012C
+58240104C552B9B9FEDDBF09AA16FEBCFEF1FFFF0071FFE30475047B1206005200000001
+004AFFD9049804600017002F400B190A01120803130800161810DCC4ECD4ECC4C4CC3140
+0C07870E8C150313178700BC15002FF4EC323210F4EC301321152311141633323637150E
+01232226351121112311234A04318D31370F2C07234A25785CFE63BC8F0460B8FD50483F
+0501850D0C83B0029CFC5803A800000200BAFE5604A4047B0011001D0031401915B904B8
+1E1BB90A8C0FBD1E1F45121207510D08181210461E10FCECECF4B27F07015DECEC310010
+ECF4EC10F4EC300136373633320011100223222627112311340534262322061514163332
+3601143D973BB6CC00FFFFCC7BB13AB9032BA79292A7A79292A70398665A23FEBCFEF8FE
+F8FEBC6164FDAE03CFE7DDCBE7E7CBCBE7E700010071FE5203E7047B00240036400C1D21
+1217260948101203452510FCECF4CCD4FCC43140111BB91D13B9008C2509860A880DB906
+B8250010F4FCF4EC10F4ECDCEC3005200011100021321617152E01232206151416333217
+16151407062334351637363534272602A8FEF3FED6012D010655A24C4E9D50B3C6C6AF83
+50544A50A3452A20201F1D013E010E0112013A2323AC2B2BE3CDCDE34C4F787350574B4C
+052C2325352C2A00000000020071FFE304D60460000D001E0031400B200F0A1213510412
+1B451F10FCECF4B27F13015DECD4C431400C07B9178C1F118700B90EBC1F0010F4ECEC10
+F4EC30012207061514163332363534272627211523161510070623222726111037360273
+985256AB9593AC564F9A0263CE6D8989F0F18889897103CE6E73BEC9E7E8C8B77A6E92B8
+9CDDFEED9C9D9D9C011301159B81000100640000046D0460001100234008130D030F080C
+0A1210D4C4FCC4C4C4310040080F0B870CBC02B9052FECF4EC323025163B011523222726
+35112135211521111402E6246C596FB45252FE5C0409FE57CC309C6062D40212B8B8FDE3
+910000010095FFE3042A0460001C002B400A1E4509121300081C461D10FCECD4ECE44007
+3F1E3F093F13035D310040060D1CBC05B9172FECF43C3001111417163332373637362726
+27333116171615140706272227263503015232376B96693B0F081E1C6ABA462D2A809CFE
+B36562010460FD2B874045D076BB668077835A7B739AFDBBE4017876C502CA0000000002
+0070FE5604D10468000A0029003D40102B4507120F1302081E162823121A452A10FCECD4
+3CCCFC3CD4ECEC31004010001FB90B1EB82A03278713168C15BD2A10ECF43CEC3210F43C
+EC3230012215113237363534272627321716111007062311231122272611103736371506
+070615141716331110033D415F5F555646368C7F898981CBB7C786888866A6423A56564D
+7003CB91FD52685DDFD0705B9D848DFED9FEF1A198FE6E0191999C0113011E926D1CA317
+4E73BECA736702AF012E0001003BFE5504640461001700AE400C0410010D04090F140F03
+091810D43CD43C11121739B1190F10C43140130410010D04150F08A90F09BC1814A91502
+BD180010FC3CEC10FC3CEC1112173930B0254B535840120011110C1105030E00050E110F
+021103030E070510EC10EC070810EC10ECB40D0C110E030FB40405000E030FB4100C1102
+0F0FB4010F0200050FB406070505040705111239B417161105040705111239B40B0A0C11
+0C0705111239B4121311110C070511123959050301230103262B01351704171301330113
+163B0115272402DC95FECDD901B2B6319A3146010241940133D9FE4EB6319A3146FEFEFA
+017FFDD0031801D77E9E0207A7FE810230FCE8FE297E9E02070000010070FE5604D10460
+001B0036400D1D130814190D08000C0608051C10DCECD43CFC3CD4ECCC3100400E130C05
+BC1C0E0B8719008C1BBD1C10ECF43CEC3210F43C3C300526272635113311141716171133
+11363736351133111407060711230245E76B83BA554A7CB7834355BA8376DCB719256177
+F30289FD7EB74C420E03D5FC2C0E4254AF0281FD78FC6E6323FE6E00000000010087FFE3
+06270460001A003840141212131C451012150B080C07120205120402451B10FCDCEC10EC
+D4FCD4ECECDCEC310040090B1204BC0E098717002F3CEC32F43CC4300520113413330215
+103332113310333211340333121510212003020226FE619BC68FDECBAACBDE8FC69BFE61
+FEF021291D0252EB0140FEC0F0FE4F021AFDE601B1F00140FEC0EBFDAE012BFED500FFFF
+00050000027D06101226034D0F001007006AFF2E0000FFFF0095FFE3042A06101026006A
+1D001206035900000000FFFF0071FFE3047506661026031B7D001206035300000000FFFF
+0095FFE3042A06661026031B22001206035900000000FFFF0087FFE3062706661226035D
+00001007031B01590000000100C9FE56056A05D5000C0000133311012109022309011123
+C9CA029E0104FD1B031AFE92860110FD0DCA05D5FD890277FD48FCE3FE56018402F5FD31
+0000000300A7FFE9044D0624000A001B00270047400E051C1A2945261C0D001E1C144628
+10FCEC32D4ECECD4B23F1A015DEC310040101C0B00B91E2822B9118C2807B917972810F4
+EC10F4EC10D4B63F1E1F1E0F1E035DEC3939300132363736353623220706011615140706
+202726023736171E0112060706231017163332373E0126016950CB447901CC7A5D3601EE
+F63B7EFE0E8B6F027886D2A4DA025DFB59DF3A50AE8F571801AD0370043D6C93DEBA6CFE
+C7A7E9825FD5D5A8032CBED50101E2FEE5B69614FEEA80B09C2DD19E000000020071FFE9
+04750624000A001F0037400F0B000821451507080F151A0819452010FCECCCDCEC10ECFC
+3C3100400E048712972000870B1D87168C1A2010CCF4ECDCEC10F4EC3001342726232206
+1514171605202726113436333212100020001117151012201203AE3142955378794A0113
+FECC83D3D0AFDAF5FEE4FE23FEF5BCB0012FA50370F67EAA895AAA5A37AA41690136A0DE
+FE64FCFCFE6501B601D201A0FEF3FEBD0142000100570000055105DF0020004940092200
+1B14041C0F072110DCCCFC39DCC4B43F00401B025DCC31004011070414050E950F1F0095
+0D9514181191052FF43CCCECECCCD4EC1112393940096F1F7F1F8F1FCF1F045D30010603
+0615112311342702272622073536321704131225363217161514070623220446A0522ACB
+2A52A04D77281F6F550143486B011F265F2A5311194B85051148FEF38DA5FD76028AA58D
+010D482309AA0A0D30FE72017B430920405B292F4200FFFFFFE1000006A106661027031B
+FE6E000010070366015000000000FFFF005700000551074E1027171604C5017512060366
+000000030070FE5604D106140015001E002700414010291A120609011E080C1420241210
+452810FCECD43C3CFC3C3CD4ECC43140121E20870114B828161F87090C8C15970BBD2800
+10ECE4F43CFC3C10F43CFC3C300111321716111007062311231122272611103736331113
+323736373627262303112207061716171602FCC785898985C7B7C786888886C7B7714D54
+0101564D71B7714C570101554C0614FE63999CFEEDFEED9C99FE6F0191999C011301139C
+99019DFA776773CAC87567FCB803486775C8CA73670000020041FFE3066D04600010001E
+004540160411121004060E2045031D12061808191412010E451F10FCC4ECD4FCD4ECC4EC
+111217393100400F181011038701BC1F1B1687080C8C1F10F43CEC3210F4EC3232CC3013
+35211523161510252403022120113437290106151033320333023736113441062C934DFE
+61FEF12229FEF8FE614D043AFC9247DECF04AA04CFDE03A8B8B8CFA4FDAD0101012AFED5
+0252A4CFD1A7FE4F021AFDE3030301AEA70000010070FE5B04CD04670039000005262726
+343707020706232235340136353427262322073536333217041114073712373633321514
+01061514171633323702070622273516333203F9F6210A0DBD60C837223701243E0E1A8E
+395B405B1A1B011D1DBD60C8372237FEDC3E0E1A8E395B26CD46A25D5F49A40A20F04981
+356CFEF77C224F9A01098A7A3A36686CE0300427FEC35B4D6C01097C224F9AFEF78A7A3A
+36686CFDE0662431A03100020073FE5805D905F00011001F0044400E21101D190E0A001C
+03161907102010FCECDCB6000310033003035DFC39DCB6000E100E300E035DECEC310040
+0C13950A91201A95000301BD2010ECD43CEC10F4EC300511231126272610373621201716
+1110070602200706111017162037361110270384B8FCA0BDBDBC013B013ABCBCBC9F7BFE
+488182828101B881808018FE7001901AB3D202C4D3D2D2D3FE9EFE9FD2B30549A4A4FEE5
+FEE6A4A4A4A4011A011BA400000000020071FE560475047B000D001F003C401021450A12
+1C0019070E1211041215452010FCECDCB23011015DFC393939DCECEC3100400D00B919B8
+2007B90E118C0FBD2010ECF43CEC10F4EC30012207061017163332363534272603112311
+2627261110373633320011100706027394565655569593AC565639AABE6B898988F1F001
+12896A03DF7374FE6E7473E8C8C77475FC09FE6E01921B7D9C011301149C9CFEC8FEECFE
+ED9C7B0000000001008BFE5204AB05D50024002E400A121612260C23041C1E2510DCECCC
+D4CCFCC43100400D10951208951A8C25009522812510F4EC10F4ECDCEC30012007061110
+171633321716151407062334351637363534272623202726111037362901150346FEF360
+7B5B6DC87A59544A50A3452A20201F3AFEC08E95B98A01780165052B7798FECDFEB57F98
+544F787350574B4C052C2325352C2ACBD60165014EEDB1AA000000010071FE5204510460
+00200034400B191D122213070C1203452110FCECCCD4CCFCC4B20F07015D3100400D17B9
+190FB9008C2109B906B82110F4EC10F4ECDCEC3005220011100029011521220615141633
+32171615140706233435163736353427260267CCFED6012D010601ADFE5BB3C6C56F8350
+544A50A3452A2020201D013E010E0112011F9CC7CECDE34C4F787350574B4C052C232535
+2C2AFFFF00C90000042305D51206002900000001FF40FE560346061400270036B7091416
+131220002810DCCCFC3CCCCC310040141687130A8709130E8705972820871F24871BBD28
+10FCECD4EC10F4ECCCD4EC10EC3033113437363332171617152627262322070615112115
+211114070623222726273516171633323736EE8860A9313231332429292C783A4B0141FE
+BF8B62AD3933332E313232305740520482A08E64090912A41C0E0F3E516FFEC98FFD3F92
+A5730A0B16A41F10114B5F000000000100B3FFFC04D405D5001700000103010306171637
+1522272637130113362726073532171602366E030CEA271B4283E6515F139AFD06AC271B
+4283E6515F0487FE5B017EFD2C602A6C23BD4652B601DAFE910290602A6C23BD46520001
+00BF00000488061300070042400A0102060503070600040810DCCC17393100B64203A907
+0597012FE4D4EC304B5358401003110002110100010711040611050405070510EC10EC07
+0510EC10EC5909012313210133030488FEE7B8E2FD260119B8E20370FC9002C6034DFD5D
+000000010072FE56066005F0002100000111231106073536212013121110032300111027
+0607061511233611343F010221220251AACD68D0018201D9EDD6F6E1010452525F40CD02
+B6BBD0FEA430053AFD8C02494B69C6CFFECEFEECFDC2FE58FE92014C01CA01D17D2F4D34
+D0FDC6210214F78F8D010400000000010077FE9004960478001600000103230126270123
+012627262335201716131211231027036EEFB901640E32FE46B9021F622EBCD3012DF2E0
+AC74A8600134FECC01C0234DFDD002B07F2184A4D8C8FE50FEDFFE89015EF60000000001
+0073FE4B070505D5003D0057401C3C0D0110080039123A3F10351C0D00112B1C2C221C19
+1E121D19103E10FCDCEC10ECD4FC39D439ECECDCEC10DC4B5358B0093C595D3100400F09
+083E2B391D813E0D263195158C3E10F4EC323910F43CCC10CC3930011007060706050607
+2736373637262726270607062322272611341336373306030615101716333237363D0133
+151417163332373611342702273316171207053D44DBB4FEEC768C618A79CDA467446427
+27646592D3797B643B5DF954874348497D724847C7464674864147438754FA5F386402E0
+FEEFCBE6A688642A17851830518017415EADAD5E5EB1B40198C9010E9F7F46FEBF9FB7FE
+CD6B6D6968C6F1F1C668696D770127B79F014146829CFEEB000000010087FE5506270460
+002500534019102119161217274514120019020F08100B120609120806452610FCDCEC10
+ECD4FC39D439ECECDCEC10DC4B5358B0223C593100400F2221260F1608BC2600120D8704
+8C2610F4EC323910F43CC410CC3930212403022120113413330215021716033302373611
+34033312151607060706070607273637360488FEED1E23FEF2FE6187DA8F01DFD005AA03
+CEDE8FDA87013969C59AD26B705B518BC701010DFEED023AEB0140FEC0F0FE97010101D4
+FE2B02020168F00140FEC0EBD184F49E7B4925106C0B2B3F000000010073FE56054805F0
+001D002E400A0F1C110C00041C19451E10FCECDCDC3CEC3100400E00951D8C0E811E0895
+158C0FBD1E10ECF4EC10FCF4EC3001060706111417163332373619013311231106070623
+202726111013362502ECB460856E62C3C46263D9D9446868AAFF009CA2BA970128054A12
+84B9FEEEF9AB989899010B02ECF881029084403FD5DD014701360108D50100010071FE56
+048C047B001C002E400A0E08100B1C040818451D10FCECDCDC3CEC3100400E00871C8C0D
+BC1D07A0148C0EBD1D10ECF4EC10FCF4EC30010607061514171620373635113311231106
+0706232227263534373633028B9A50725E53014C5454B8B83A585990DA85899E7FFD03FD
+0E638DD0BD81747374CB0231F9F60252643031A2A8F8ECC8A200000100C9FE4B05E205D5
+00250039400E100D0C151C2745041D211C20042610FCEC32D4ECECDCC44B5358B10D0C10
+3C593100400B199500B81E0D0CBD20811E2FE4FCCC10F4EC300120171611140706070607
+060727363736373637363534272623220706151123113311363736034C0127B1BE3C43AA
+C3F1B94961867DD998882C367E73CDCB7371CACA4E6969047BB3C2FEFDCCA1B280934535
+0C851632577A6D687FC09D9686817EDEFE2705D5FD9A874243000002002DFFE30492049A
+0017004D0000012623220706070607061514171617161716333237363736251615140706
+212227262322072736333217163332373635342706070607062726272627262726353437
+363736373633321736371706032C7F8D1F371D251D100E0C0F181A23201E19473B492401
+0B6C7F6FFEF78D634B35415154875F82523F5B9D4F4B311B1F467566472948324030291E
+1D1F2E3E50655ED290382A8837034498160B211A201B2120151C111406051914311832C0
+D4B09C882E2341934C2E235E597F8C711917342B2602010A07221A4834423B3B3D2F3F22
+2B9F566850920001004FFE56050B05F60021000005042120010037363534272623220706
+07233637362120171615140700011633203704FAFF00FEEDFEAFFEB902BAB36C6C63A4B4
+5E2318F02C56A301180113A1A2A2FEF7FE189CD50129E8ECBE01A301F1DB849C8D655D92
+363FA166C29091F1D8B6FEF2FE85B5B3000000010064FE56046A047B0020000001062320
+0100373635342726232207060723363736333204151407060116333237045CDAEAFEEEFE
+DE0242A75C5C548B99501E14CC25498BEEE801148AAFFE2F91A9FDC5FEEF9901790159C2
+6B7D6F534B752C3281529CE8C2A49CC5FEE0BA90000000020073000005B605EF00020035
+00002521090326272623220F013536373633321716170901363736333217161715272623
+2207060709011617163B011521353332373601DA026EFECDFE140180FEDC131A223F1916
+4521201F1C724B2C2F0102010934274B721D1E20214417183C26131AFED2017406071D45
+47FAC347481A0CAA01CAFE68023D01BB1D1A22040ABB0B0505432846FE81017F4B234305
+050BBB0A04221126FE45FDC3090821AAAA210F00000000020036000004CB047B00020035
+000025210309010326272623220F013536373633321716171B0136373633321716171527
+26232207060703011617163B0115213533323736019A01CCE4FE5B0139EF15111D361513
+3A1C1B1A1883402528C5C528254083181A1B1C3A1315361D1115F6012D0605193A49FB6B
+493A19059E0138FEEE01A4013D1C0E1903078D080404331E35FEFA0106351E330404088D
+0703190E1CFEB8FE670805199E9E1905000000020073FFE305250610001D002B00000124
+070607363736333200100021202726111037362132373637150607061210262322070615
+141716333237032AFED657381651557B82F50132FECEFEF9FECEA4A38B7C01B07395A04B
+5E976C8EC8BABC68696965BFBC62052D02734AA0562231FEBCFDF0FEBC9C9B015001DED2
+BB0A0A27B1240806FC410182E67374C0BD787373000000020071FFE3045B0610001F002F
+000001260706073637363332171610070623222726111037362132373637150607061334
+2726232207061514171633323736029BE3492C1429655B78CC7F80807FDBFF8988746701
+4F5F5C53475D455AA8535492955658585497945253053702784AA9463631A2A2FDF0A2A2
+9C9B015001DED2BB0A0A27A7270506FCF8CD72737374CBC77873737400000001002CFE56
+04B705D5000F0034400D0312000F041C0708120B0C071010DC3CDCEC10FC3CDCEC310040
+0D02090407950F0CBC0D8105BD1010ECECF43CEC32CC3230011123352111231121152311
+2111331104B7CBFEEBCBFEEBCB01E0CB0460FEF264FAA0056064010E0175FE8B00000001
+0037FE55041405CF000F0033400D0308000F04080708080B0C071010DC3CDCEC10FC3CDC
+EC3100400C02090407870F0CBC0D05BD1010ECCCF43CEC32CC3230011123352311231123
+152311211133110414ADE5B9E5AD0192B9045FFF0070FA86057A7001000170FE90000001
+0070FFF204CD046700330000010207062322353401363534272623220735363332170411
+14073712373633321514010615141716333237150623222724113437022860C837223701
+243E0E1A8E395B405B1A1B011D1DBD60C8372237FEDC3E0E1A8E395B405B1A1BFEE31D01
+99FEF77C224F9A01098A7A3A36686CE0300425FEC15B4D6C01097C224F9AFEF78A7A3A36
+686CE0300425013F5B4D000200BAFE5604A4047B00180024003A400E1426451A120A5111
+081F1200462510FCECECF4B27F0A015DECECC43100400F13B9161CB906B82522B90D8C16
+BD2510ECF4EC10F4EC10EC30133437363736333217161007062322272627122901152120
+11241027262007061017162037BA5A369E3BB6CC7F80807FCC785B593A05012001F4FE1C
+FE12032B5354FEDC545353540124540225D0A3625E23A2A2FDF0A2A2313064FE58AA02DA
+34019674737374FE6A7473730000FFFF0071FFE303E7047B120600460000FFFFFFDBFE56
+017906141206004D0000FFFF0073FFE305D905F012060161000000010071FFE303D8047B
+0021000001262726232207060721152116171633323F0115070623202726103736213217
+161703D82525636AB7665F1202A5FD5B125F66B7804D4A4F686BFEF49C9D9D9C010C656E
+282703AE0D0A1A635CA990A95C631A19A712169C9C02289C9C16080C0000000100C4FFE3
+042B047B0021000013353637363320171610070621222F01351716333237363721352126
+272623220706C427286E65010C9C9D9D9CFEF46B684F4A4D80B7665F12FD5B02A5125F66
+B76A632503AEA30C08169C9CFDD89C9C1612A7191A635CA990A95C631A0AFFFF00C90000
+048D05D5120600A00000FFFF00BAFE5604A40614120600C00000FFFF0073FFE3052705F0
+120600260000000100C90000061F05D5000C009440100908030201050A061C043E0A1C00
+040D10FCECFCEC1117393100400C420A070203080300AF080B052F3CC4EC32111739304B
+5358401803110708070211010208080702110302090A0901110A0A09071005ED071008ED
+071008ED071005ED59B2700E01015D401104020607060A36024907490A5907590A084015
+02010D03160819092601290335013A0345084A090A5D005D132109012111231101230111
+23C9012D017D017F012DC5FE7FCBFE7FC405D5FE2101DFFA2B051FFE1901E7FAE1000001
+007FFE5604B30460000C004F40090E460708040A08000D10DCECDCECEC3100400D420A07
+0203090300BC090CBD062FECC4EC32111739304B535840120211080A0903110708070211
+0901110A0A09050710ED10ED0710ED0810ED59132113012111231101230111237F011BFE
+0100011BB9FEEC99FEEBB90460FE7B0185FBA003B2FE6001A0FAA400000000020055FE56
+04A4047B001B002700001711343736373633321716100706232227262711211521152335
+2335001027262007061017162037BA5A3D973BB6CC7F80807FCC7B58593A01E5FE1BB965
+03905354FEDC545353540124549002B5E78C665A23A2A2FDF0A2A2313064FEC8AA7070AA
+01F4019674737374FE6A74737300FFFF0073FFE3052705F0120601480000FFFF0073FFE3
+052705F01226038D00001007007902330000FFFF0073FFE3052705F01027007900E40000
+120603910000FFFF00C90000048B076B122603A900001007171904EE0175FFFF00C90000
+048B074E122603A9000011071716049D01750085B1929742B093B09842B1800442B18100
+427CB000B0012349B013B00E234961B0806268B0134661B0004660B09243B001602342B0
+9243B0016043B0005558B00EB09243B001604338B00E11B0013559B1800042B181004218
+B00010B013B00EB0012349683BB01311B0023500B000B0132349B0405058B013B04038B0
+1311B00235B0013559000001FFFAFE6605AC05D5001B0034400B050A1C1B140E161C1311
+1C10D4CCFC3CCCDCFCCC3100400F059504B0100E9517101611951381102FF4EC3210D4EC
+10F4EC302510062B01353332363511342623211123112135211521112132161505ACCCE4
+4C3E866F7C7CFE88CBFE52048BFDEE01A1BADE68FEF2F4AA96C201229F9EFD39052BAAAA
+FE46E9EE0000FFFF00C90000046A076B122603A700001007171704AE017500010073FFE3
+052705F00018004E40091A120B00111419061910DCEC32D43CCCCC31004017139512AD19
+0CA10BAE0E9509911900A101AE1795038C1910F4ECF4EC10F4ECF4EC10F4ECB1120E49B1
+1713495058B3121340021738593001150621200011100021201715262120020721152116
+1221200527D4FEF5FEB1FE7A0186014F010FD0D3FF00FEF8EE16031EFCE216EE01080100
+0146D390019F01680167019F8ED5BDFEE3EFAAEFFEE4FFFF0087FFE304A205F012060036
+0000FFFF00C90000019305D51206002C0000FFFF000600000258074E100600910000FFFF
+FF96FE66019305D51206002D0000000200540000082F05D50014001C0033400C17191000
+1C1B0B011C0A061D10D4D4ECD43CECDCEC3100400E1B950CAD1401950A811C069505142F
+3CEC32F4EC10FCEC3001211510020535361211352111333204151404232125201134262B
+01110470FE1BC8FE91D9950378EAFB0110FEF0FBFE4C01AA01409DA3E0052BB8FDCAFDFB
+38AA2F01A60258FEFD9ADADDDEDAA601118B87FDDD00000200C9000007CC05D50012001B
+0035400E13190F08001C170A07021C05041C10FCEC32DC3CEC32DCEC3100400D1701950B
+07AD090581189500042F3CECE432FC3CEC32302111211123113311211133113332041514
+04230134262B0111333236040DFD86CACA027ACAEAFB0110FEF0FB01369DA3E0E0A19F02
+C7FD3905D5FD9C0264FD9ADADEDDDA01B78B87FDDD870001FFFA000005AC05D50013002C
+400A061C03100A121C0E0D1410D4CCFC3CCCDCEC3100400B0A95130C120D950F81050C2F
+3CF4EC3210D4EC3001321615112311342623211123112135211521110414BADEC97C7CFE
+88CBFE52048BFDEE0371E9EEFE66018A9F9EFD39052BAAAAFE46FFFF00C900000586076B
+122603AE00001007171704EE0175FFFF00C900000533076B122603AC00001007171904E5
+0175FFFF0023000004BD076D1027171D04720175120603B70000000100C9FEBF053B05D5
+000B0029400D0D04061C070B9509031C02040C10FCECD4FCD4ECEC3100B70B0495060281
+09012F3CE432ECCC3029011133112111331121112302ADFE1CCA02DECAFE1CAA05D5FAD5
+052BFA2BFEBFFFFF00100000056805D5120600240000000200C9000004EC05D500080015
+002E400C17090019102E040B1C15041610FCEC32F4ECC4CC3100400C0B9515811404950C
+AD0595142FECF4EC10F4EC30013426232111213236131521112132041514042901110417
+9DA3FEBC0144A39D6CFD10014EFB0110FEF9FEFCFDE801B78B87FDDD8704A8A6FE40DADE
+DDDA05D50000FFFF00C9000004EC05D5120600250000000100C90000046A05D500050019
+400C04950181000702041C01040610FCFCCCC431002FF4EC30331121152111C903A1FD29
+05D5AAFAD50000020065FEBF05DB05D5000700170034400F021C0E1395191017031C0D14
+95171810DCECD4EC10D4CCFC3CEC3100400B03950D8112160F001795142FEC3232CC32F4
+EC3025211121151003060536371219012111331123112111231101D30294FE1B7017FEB1
+8626610378AAAAFBDEAAAA0481D4FE0DFEB5442B3F7801340226011AFAD5FE150141FEBF
+01EBFFFF00C90000048B05D5120600280000000100280000087605D500130098400B0805
+01040609011C0C001410DC3CEC32D4C411393931004011420D0C10130809050208120300
+AF0F0A062F3C3CEC32321739304B53584016071106081105090406050311040211050809
+090409040907103C3C04ED1005ED070810ED0510ED590140130D01080E01070F01061001
+051101041201030010493A493A493A493A493A493A004008130210050D080C09103C103C
+103C103C013311013309012309011123110901230901330103EACA02AAF5FDDF0244D3FE
+13FEFECAFEFEFE13D30244FDDFF502AA05D5FD1E02E2FDB3FC780301FEE9FE1601EA0117
+FCFF0388024DFD1E000000010087FFE3049A05F00028003F400C1B1F19032A1619092510
+062910FC32D4ECCCD4FCCC310040161A951B0C10A10FAE13950C25A126AE229500910C8C
+2910E4F4ECF4EC10ECF4EC10D4EC30013204151406071E0115140423222427351E013332
+363534262B013533323635342623220607353E010249F601388E8391A3FE9DEE7AFEE42C
+99A97CBCD0B9C3CCD4B39EA3C6865CCD71EC05F0D1B27CAB211FC490E6E9421CD0592B90
+958495A67770737B184DC5282200000100C90000053305D500090079401E031109090808
+110404034208030906AF0205090407031C0036071C06040A10FCECFCEC11393931002F3C
+EC323939304B5358071004ED071004ED5922B21F0B01015D403036083803480847036908
+66038008070604090915041A09460449095704580965046909790985048A0995049A099F
+0B105D005D011123110121113311010533C4FD6AFEF0C4029605D5FA2B04E1FB1F05D5FB
+1F04E1000000FFFF00C900000533076D122603AC00001107171D04F501750023B4060A12
+00072BB00A4B54B00B4B545BB0104B545B58BB00120040000AFFC0383859310000000001
+00C90000058605D5000B0059400B080501040609011C00040C10FCEC32D4C41139393100
+400B4208090502040300AF0A062F3CEC321739304B535840160711060811050904060503
+11040211050809090409040907103C3C04ED1005ED070810ED0510ED5913331101210901
+2309011123C9CA02D20103FDBF025FDCFDFAFEEFCA05D5FD1E02E2FDB2FC790301FEE9FE
+1600000100540000053A05D5000F0025400A11040A1C070B1C06011010D4D4ECD4ECEC31
+0040080B950681019500092F3CECF4EC303335363712113521112311211510030654D93E
+570378CAFE1B6662AA2FA401020258FEFA2B052BB8FDCAFEF8FDFFFF00C90000061F05D5
+120600300000FFFF00C90000053B05D51206002B0000FFFF0073FFE305D905F012060032
+0000000100C90000053B05D50007001F40100495078102060904031C00041C07040810FC
+ECD4ECEC31002F3CF4EC300111231121112311053BCAFD22CA05D5FA2B052BFAD505D500
+0000FFFF00C90000048D05D5120600330000FFFF0073FFE3052705F0120600260000FFFF
+FFFA000004E905D512060037000000010023000004BD05D50011003EB41311060D1210D4
+C4D4C43100B642100D810695052FECEC32304B535840120F11000D0C10111111000F110C
+0E110D0D0C050710EC10EC0710EC0810EC59250607062B0135333237363F010133090133
+028F15204FFB4D3F772E1C122DFE21D901730175D9B532265DAA1B112A6A046BFC94036C
+0000000300790000066A05D50006000D001F003D401121100A191A0E00151C1D0D160319
+11102010FCECD43C3CFC3C3CD4ECEC3100400E0D0095171415811F0705951D0E1F2FDC3C
+EC3210F4DC3CEC3230010E0115141617333E013534262703240011100025353315040011
+1000051523030DD9E6E6D9CBD9E4E4D9CBFEC3FEA90157013DCB013D0155FEABFEC3CB04
+A214CCC5C5CB1414CBC5C5CC14FC1017012B01090109012D178B8B17FED5FEF5FEF7FED5
+17B2FFFF003D0000053B05D51206003B0000000100C9FEBF05E505D5000B0029400C0D09
+9500061C07031C02040C10FCECD4EC3CFCCC310040080602810B080495012FEC32CCF43C
+30290111331121113311331123053BFB8ECA02DECAAAAA05D5FAD5052BFAD5FE15000001
+00AF000004B305D5000F0024400A1104010D1C0E071C061010DCECD4EC32EC3100B70295
+0BAD0D0681002FE432F4EC302111212226351133111416332111331103E8FE5FBADEC97C
+7C0178CB0264E9EE019AFE769F9E02C7FA2B000100C9000007C505D5000B002A400D0D04
+021C030A1C0B071C06040C10FCECD4FCD4ECEC310040080A020681000895052FEC32F43C
+3C3025211133112111331121113304AC024FCAF904CA024FCAAA052BFA2B05D5FAD5052B
+0000000100C9FEBF086F05D5000F0032400F110D95000A1C0B061C07031C02041010FCEC
+D4FCD4EC3CFCCC3100400A060A02810F0C080495012FEC3232CCF43C3C30290111331121
+1133112111331133112307C5F904CA024FCA024FCAAAAA05D5FAD5052BFAD5052BFAD5FE
+15000002003C0000061805D5000C0017002A40160295038100129505AD139500100D1909
+12041C01031810CCDCEC32D4ECCC31002FECF4EC10F4EC30211121352111213204151404
+23013427262321112132373601F5FE470283014EFB0110FEF0FB01364F4EA3FEBC0144A1
+504F052BAAFD9ADADEDDDA01B78B4443FDDD44430000FFFF00C90000064605D5102603C0
+00001007002C04B30000000200C9000004EC05D5000A00150024401305950DAD0B810695
+1517001911050C1C0B041610FCEC32D4ECCC31002FECE4F4EC3001342726232111213237
+36013311213204151404232104174F4EA3FEBC0144A34E4FFCB2CA014EFB0110FEF0FBFD
+E801B78B4443FDDD444304A8FD9ADADEDDDA0001006FFFE3052305F00018004E40091A05
+08191307000E1910DC3CCCD4EC32CC31004017069507AD190DA10EAE0B9510911900A118
+AE0295168C1910F4ECF4EC10F4ECF4EC10F4ECB1070B49B10206495058B3070640021738
+5930131621201237213521260221200735362120001110002120276FD301000108EE16FC
+E2031E16EEFEF8FF00D3D0010F014F0186FE7AFEB1FEF5D40146BD011CEFAAEF011DBDD5
+8EFE61FE99FE98FE6190000200D3FFE3083005F0000F00260038401F009514912708951C
+8C27219526AD248123280C19180419201021251C24042710FCEC32D43CECD4ECCC31002F
+E4F4EC10F4EC10F4EC300122070611101716333237361110272601123736212017161110
+07062120272603211123113311057EDC82818182DCDC80818180FC730EB4B4013B013ABC
+BCBCBCFEC6FEC5B4B40EFED0CACA054CA4A4FEE5FEE6A4A4A4A4011A011BA4A4FDF30118
+CDCCD2D3FE9EFE9FD2D3CDCD0118FD6B05D5FD6A000000020088000004C605D500080016
+0040400B180414051C110019090D1710D4C4ECD4EC32EC3100400C420695108109159503
+AD13092F3CF4EC10F4EC304B5358B715110A1611090A09050710EC10EC59011416332111
+2122060901262435342429011123112101019B9592013AFEC69295FEED019864FF000104
+01020204CAFEF2FE7604278387021285FB56028D1AA9D7CEE0FA2B0277FD89000000FFFF
+007BFFE3042D047B12060044000000020070FFE3047F0637001D0029003A400E13142B45
+271203511C211209452A10FCEC32F4ECECD4C43100401116A911972A24B9061EB9091C00
+B8068C2A10E4F43939EC10EE10F4EC300132001110002322000327263534373624253637
+17060F010607060F0136172206151416333236353426027DF00112FEEEF0F1FEF6070605
+3A5B013B01087A3633312DFA7E4CC7130782D394ACAB9593ACAC047BFEC8FEECFEEDFEC7
+0130011CE57729A076B9A002011192140111092C759938779CE7C9C9E7E8C8C7E9000003
+00BA0000043E0460000800110020002F400D0E12162205121C00090812462110FCEC32D4
+ECCCD4EC3100400B00A90A2009A912BC01A9202FECF4EC10D4EC30011121323635342623
+01113332363534262325213216151406071E011514062321017201067E84847EFEFAF268
+848468FE5601B6C5D46C6A7F8CE7D6FE390204FE8F5F5A5A5E01C9FECA534A4A4F939085
+67790F18987296A40000000100BA000003D0046000050019B60702040801460610FCFCDC
+CC3100B404A901BC002FF4EC30331121152111BA0316FDA3046093FC33000002006BFEE5
+051D0460000600160034400F02080D12A9180F1603080C13A9161710DCECD4EC10D4C4FC
+3CEC3100400B03A90CBC11150E0016A9132FEC3232CC32F4EC3025211121151007053637
+3611352111331123112111231101BB0216FE7D76FED85B286202F59393FC749393033A8C
+FE64DC362855D301A9D4FC33FE52011BFEE501AE0000FFFF0071FFE3047F047B12060048
+000000010046000006EF046000130098400B08050104060901080C001410DC3CEC32D4C4
+11393931004011420D0C10130809050208120300BC0F0A062F3C3CEC32321739304B5358
+4016071106081105090406050311040211050809090409040907103C3C04ED1005ED0708
+10ED0510ED590140130D01080E01070F01061001051101041201030010493A493A493A49
+3A493A493A004008130210050D080C09103C103C103C103C013311013309012301071123
+1127012309013301033FB701E9D6FE6E01CCC5FE87BBB7BBFE87C501CCFE6ED601E90460
+FDF2020EFE51FD4F0236C9FE93016DC9FDCA02B101AFFDF2000000010085FFE303C8047C
+0028004E400B1912262A10120315200A2910DCC4C4D4ECCCD4EC3100401620861F881CB9
+23B82914A9152909860A880DB9068C2910F4FCB00C4B5158FC1BF459EC10D4EC10F4FCB0
+0C4B5158FC1BF459EC30011E0115140423222627351E013332363534262B013533323635
+342623220607353E0133321615140602C27C8AFEFEEE50A95A47AA5D97A99689949B7487
+8B7747A16162AA4CC4E378025C18926CADB61C1CAB2525705A586B985946405C1A1DA718
+189D8D5D8100000100BA0000047904600009003F40154208030906BC02050B4609040703
+0800070806460A10FCECD4EC113939EC31002F3CE4323939304B5358400A031109090808
+110404030710EC0710EC59011123110123113311010479B7FDE4ECB7021B0460FBA00383
+FC7D0460FC7F03810000FFFF00BA000004790614122603CC00001107029A009AFFCC0023
+B4070A1203072BB00E4B54B0104B545BB0154B545B58BB00120040000AFFC03838593100
+0000000100BA000004910460000B0059400B080501040609010800460C10FCEC32D4C411
+39393100400B4208090502040300BC0A062F3CEC321739304B5358401607110608110509
+0406050311040211050809090409040907103C3C04ED1005ED070810ED0510ED59133311
+013309012301071123BAB70207E2FE5401E3CEFE73C5B70460FDF2020EFE4FFD510235C8
+FE930001004C000004730460000F0024400A11460A08070B0806011010D4D4ECD4ECEC31
+00B70BA906BC01A900092F3CECF4EC30333536373611352111231121151007064CB63844
+02F5B8FE7B585E991C7EB101C5B7FBA003CD6FFE50C2CF000000000100BA0000054F0460
+000C004D4016420A070203080300BC09060C0E460708040A0800460D10FCECDCECEC3100
+2F3CC4EC32111739304B535840120211080A09031107080702110901110A0A09050710ED
+10ED0710ED0810ED5913210901211123110123011123BA010D013E013F010BB9FECBB8FE
+CAB90460FD1202EEFBA003B0FD2702D9FC50000100BA000004810460000B0027401409A9
+020400BC070B0D460804080509010800460C10FCEC32DCEC32EC31002F3CE432DCEC3013
+3311211133112311211123BAB90255B9B9FDABB90460FE3701C9FBA00204FDFC0000FFFF
+0071FFE30475047B120600520000000100BA0000048104600007001F401004A907BC0206
+0308094600040807460810FCECD4ECEC31002F3CF4EC3001112311211123110481B9FDAB
+B90460FBA003CDFC330460000000FFFF00BAFE5604A4047B120600530000FFFF0071FFE3
+03E7047B1206004600000001003C0000046D04600007001CB60901030806000810DCD4FC
+DCCC3100B50307A900BC052FF4EC323013211521112311213C0431FE42B5FE42046093FC
+3303CD000000FFFF003DFE56047F04601206005C000000030070FE56066705D5000A0028
+00330042401135452912210C061908272E1A001212453410FCECD43C3CFC3C3CD4ECEC31
+0040122C08B91E15B81997343103B9240F8C0BBD3410ECF43CEC3210E4F43CEC32300114
+16333237112623220601110E01232202111012333216171133113E013332121110022322
+2627110134262322071116333236012F917B627272627B9101E0398353A7E9E9A7538339
+B9398353A7E9E9A753833901E0917B627272627B91022FEBC7A80214A8C7FB3C02395E4E
+013501130113013D4C5E0204FDFC5E4CFEC3FEEDFEEDFECB4E5EFDC703D9EBC7A8FDECA8
+C700FFFF003B0000047904601206005B0000000100BAFEE505140460000B0028400C0D09
+A906080007030802460C10FCECD43CECFCCC3100B70602BC0B0804A9012FEC32CCF43C30
+2901113311211133113311230481FC39B90255B993930460FC3303CDFC33FE5200000001
+00960000040004600011003B401102A90D0F07BC001346010F08100808071210DCECD4EC
+32EC31002FE432D4ECB000B0022349B00DB00F23495258B1020DB8FFC0B0021738593021
+11212227263511331114171633211133110348FEA999665CB83435680129B801D75F56B8
+011CFEF5753B3B01F6FBA0000000000100BA000006980460000B0029400D0D460208030A
+080B070806460C10FCECD4FCD4ECEC3100B70A0206BC0008A9052FEC32F43C3C30252111
+331121113311211133040501DAB9FA22B901D9B99303CDFBA00460FC3303CD0000000001
+00BAFEE5072B0460000F0032400F110DA90A08000B060807030802461010FCECD4FCD43C
+ECFCCC3100400A060A02BC0F0C0804A9012FEC3232CCF43C3C3029011133112111331121
+1133113311230698FA22B901D9B901DAB993930460FC3303CDFC3303CDFC33FE52000002
+003E0000052E0460000C0015002C400B17451312030E0B08080A1610C4DCEC32D4ECEC31
+00400B08A90BBC070EA90C0FA9072FECD4EC10F4EC300132161514062321112135211105
+21112132363534260371D6E7E7D6FE38FE9502240107FEF901077E83830297A3A8A8A403
+CD93FE3793FE8F5F5A5A5E000000FFFF00BA0000059B047B102700F304220000100603E0
+0000000200BA0000043E0460000800130025400B154500120F050B0809461410FCEC32D4
+ECEC3100B704A90B09BC05A9132FECE4D4EC300134262321112132360133112132161514
+062321037A837EFEFA01067E83FD40B9010ED6E7E7D6FE39014C5A5EFE8F5F036EFE37A3
+A8A8A400000000010071FFE303E7047B0018004D40090508121348070E001910DC3CCCF4
+EC32310040170E860D880B1886008802B91607A906BB0BB910B8168C1910E4F4ECF4EE10
+FEF4EE10F5EEB1070B49B10206495058B307064002173859303716333236372135212E01
+2322073536332000111000212227719E9D93D213FDC802320C9FC79AA19DA60106012DFE
+DBFEFFBD93D556ABDA9369DF56AC46FEC3FEF1FEF2FEC2480000000200C1FFE3064C047B
+000B001E003A400F20450912120312180C191D081C461F10FCEC32D43CECD4ECEC310040
+1000B90FB81B06B9158C1B19A91E1CBC1B2FE4D4EC10F4EC10F4EC300122061514163332
+3635342601361233320011100023220027231123113311044A94ACAB9593ACACFD7113F9
+F0F00112FEEEF0F1FEF909D0B8B803DFE7C9C9E7E8C8C7E9FEC2BE011CFEC8FEECFEEDFE
+C7012EF8FDF70460FE410002007400000422046000080016003C4009140508110012090D
+1710D4C4ECD4EC323100400B4206A910BC0915A90313092F3CD4EC10F4EC304B5358B715
+110A1611090A09050710EC10EC590114163B011123220609012E01353436332111231123
+01017A8077F8F87780FEFA0156749AD7D901B6B9E5FEB6031D535E01615CFC8F01EB1A89
+8FA2A1FBA001D9FE2700FFFF0071FFE3047F066B122603C90000100600435A050000FFFF
+0071FFE3047F0610122603C900001107006A009600000085B1929742B093B09842B18004
+42B18100427CB00FB0012349B023B01E234961B0806268B0234661B00F4660B09243B001
+602342B09243B0016043B0005558B01EB09243B001604338B01E11B0023559B1800042B1
+81004218B00F10B023B01EB0012349683BB02311B0033500B012B0232349B0405058B023
+B04038B02311B00335B0023559000001002FFE5604900614001F003F400F141708104E08
+1D090508010300462010FC3CCCEC3232CCF4FCCC3100401114A9131F0801A90702041A87
+0A0D04971E2FECD4C4EC10DC3CEC3210D4EC3013233533113311211521113E0133321611
+140007353612353426232206151123DFB0B0B9021DFDE342B276B6D8FEA9D77AF57C7C9A
+A7B903D18F01B4FE4C8FFE6D6564E9FEEAE2FE59298C16012ED2D09FC49EFEFB0000FFFF
+00BA000003D8066D122603C70000100700760086000700010071FFE303E7047B0018004E
+400A0A0B081210024816451910FCE432FC32CC310040170286038805118610880EB91309
+A90ABB05B900B8138C1910E4F4ECF4EE10FEF4EE10F5EEB1090549B10E0A495058B3090A
+4002173859300132171526232206072115211E01333237150623200011100002A4A69DA1
+9AC79F0C0232FDC813D2939D9E93BDFEFFFEDB012D047B46AC56DF6993DAAB56AA48013E
+010E010F013DFFFF006FFFE303C7047B120600560000FFFF00C10000017906141206004C
+0000FFFFFFF4000002460610100600B10000FFFFFFDBFE56017906141206004D00000002
+004C000006BF04600016001F0036400E21451A120C11081E07120806012010D4D4ECD43C
+ECD4ECEC3100400E1EA9091FA91012A906BC01A900102F3CECF4EC10ECD4EC3033353637
+361135211133321615140623211121151007062532363534262B01114CB6384402D8ABD6
+E8E7D6FE9BFE9A585E03787E84847EA3991C7EB101C5B7FE37A3A8A8A403CD6FFE50C2CF
+765F5A5A5EFE8F000000000200BA000006B704600012001B003840101D451612050A1208
+1A000B0F080D461C10FCEC32DC3CEC32D4EC3100400D13A9091A0BA90110120EBC090D2F
+3CE432DC3CEC3210EC30011133321615140623211121112311331121110132363534262B
+0111044EABD6E8E7D6FE9BFDDEB9B90222015C7E84847EA30460FE37A3A8A8A40204FDFC
+0460FE3701C9FC335F5A5A5EFE8F0001002F000004890614001B003A400F08191308104E
+19090508010300461C10FC3CCCEC3232F4EC10CC3100400E0801A907020416870A0D0497
+121A2F3CECD4C4EC10DC3CEC323013233533113311211521113E01333216151123113426
+232206151123DFB0B0B9021DFDE342B375BDCAB87C7C98A9B903D18F01B4FE4C8FFE6D65
+64EAEDFED0012A9F9EC1A1FEFB00FFFF00BA00000491066D122603CE0000100600766F07
+0000FFFF00BA00000479066B122603CC0000100600435D050000FFFF003DFE56047F0614
+122603D700001006029A5ECC0000000100BAFEE504810460000B0029400D0D460608070B
+A909030802460C10FCECD4FCD4ECEC3100B70B04A90602BC09012F3CE432ECCC30290111
+3311211133112111230254FE66B90255B9FE66930460FC3303CDFBA0FEE500010073FFE3
+070505D50034003840142412253610201C29161C170D1C0409120804103510FCDCEC10EC
+D4FCD4ECECDCEC3100400916240881111C952D002F3CEC32F43CCC300522272611341336
+373306030615101716333237363D01331514171633323736113427022733161712151007
+062322272627060706023AD3797B643B5DF954874348497D724847C74646748641474387
+54FA5F38647B7BD1926564272764651DB1B40198C9010E9F7F46FEBF9FB7FECD6B6D6968
+C6F1F1C668696D770127B79F014146829CFEE7BEFE66B2B15E5EADAD5E5EFFFF0087FFE3
+062704601006035D00000002001E000005B105D50012001D003A400E1F1319050D11190F
+001C0B090D1E10DC3CCCFC3C3CCC10D4ECCC3100400F0A12950C100E8109189501AD1995
+092FECF4EC10F4D43CEC3230011521320415140423211121352135331521150134272623
+2111213237360258014EFB0110FEF0FBFDE8FE900170CA017101134F4EA3FEBC0144A34E
+4F0451E2DADEDDDA0451A4E0E0A4FD668B4443FDDD44430000000002001E000004E70614
+00070019003A400F1B45001217091105130F1C0B090D1A10DC3CCCFC3C3CCC10D4ECEC31
+00400E0911A90B0F0D04A9130D9705A9082FECE4D4EC10D43CEC32302434262321112132
+0511213521113311211521112132161006230423837EFEFA01067EFDC3FEBB0145B901A9
+FE57010ED6E7E7D6F2B45EFE8F9303CD9301B4FE4C93FECAA3FEB0A40000000100D3FFE3
+071B05F0002B000001112311331133123736213217161715262726232007060721152112
+17162132373637150607062320272603019DCACAD21E9DC301538676776866737482FF00
+88671902B2FD4607818900FF827473666A777684FEADC3BA0902C7FD3905D5FD9C0108A7
+D0242347D55F2F2F9C77C6AAFEF3949D2F2F5FD3482424CFC6014F000000000100C1FFE3
+0581047B0023000001321715262322070607211521161716333237150623202726272311
+2311331133363736043EA69DA19AE65C220C01CCFE2C0D9E55789D9E93BCFEF3947B0A93
+B8B898177A97047B46AC56B441578FF45E3356AA48AD90E4FDFC0460FE33CA809E000002
+0010000006F805D5000B000E000021230121112311210123013313090106F8E1FEEAFEE9
+CAFEE7FEEAE10302E5B1FEDCFEDC021BFDE5021BFDE505D5FCF30237FDC9000200330000
+06110460000B000E0000212303231123112303230133130B010611C3ECE3B8E5ECC3028E
+C391F3F30195FE6B0195FE6B0460FDB901A1FE5F0000000200C90000091405D500130016
+000021230121112311210123012111231133112101331309010914E1FEEAFEE9CAFEE7FE
+EAE1016FFDF8CACA025F013CE5B1FEDCFEDC021BFDE5021BFDE502C7FD3905D5FD9C0264
+FCF30237FDC9000200C1000007D004600013001600002123032311231123032301211123
+113311210133130B0107D0C3ECE3B8E5ECC3011CFE6BB8B801E9011EC391F3F30195FE6B
+0195FE6B01E7FE190460FE1701E9FDB901A1FE5F000000020073000005D905D50017001A
+00824014191A0E0D141C0F130E00071C0C080D18001C031B10DCEC39CCDCB40F084F0802
+5D39EC10CCDCB60013400E4013035D39EC111239393100400E420C0F1100031995180D81
+1408022F3C3CF439ECD43CEC32304B5358401418110F1A1819110E0F0E18110C19181A11
+0D0C0D070510ED0810ED070510ED0810ED59B2401C01015D011123110607061123103736
+370121011617161123102726270121038BCA936482D5BD78AAFE510512FE50A474BCD580
+60F8013EFD830259FDA702591C7EA4FEE50162D2863102EAFD133282D2FE9E011EA17ACA
+02280002006B0000047B04600002001A007E40140001031A091C0408030D141C19151A02
+0D1C101B10DCEC39CCDCB28015015D39EC10CCDCB23003015D39EC111239393100400E42
+1904110D100095021ABC09150F2F3C3CF439ECD43CEC32304B5358401402110401020011
+030403021119000201111A191A070510ED0810ED070510ED0810ED59B4701C8F1C02015D
+0121130901161716112334272627112311060706152310373637010345FE5DD10208FEBB
+6B4B89C3563A56B8533856C2894A6CFEBB03B6FE960214FDCC26569CFEECC7744F1AFE5C
+01A21A4B74C901149C5527023400000200C9000007C405D5001E00210000090121011617
+1611231027262711231106070611231037363721112311331105012103EFFE9F0512FE50
+A474BCD5806099CA936482D5BD556EFDB5CACA0384013EFD8303710264FD133282D2FE9E
+011EA17A20FDA702591C7EA4FEE50162D25F34FD3905D5FD9C6E02280000000200C10000
+062E0460001E002100000901210116171611233427262711231106070615231037363721
+11231133110121130337FEE70410FEBB6B4B89C3563A56B8533856C2891B1FFE92B8B803
+7FFE5DD1027701E9FDCC26569CFEECC7744F1AFE5C01A21A4B74C901149C1F18FE190460
+FE17013FFE9600010073FE560473077A0053000001140706232226232215143332373617
+161715262322062322272635343736332132373635342726233532163332373635342122
+0735363703331337363736373633321715272623220F0116171615100516171604737398
+C644BA2360DC41807420625444743BFC3C7D4AA3353F75015F684641BB58F9125617A352
+75FEC5A5DEA0819F73A06A1E0F171723421A23270B0F22325AA66272FEEF8D525501BECF
+67880882720C0B020725A7271B2C61927A515E58526ABD3719A60226368DEE4AB42D0D01
+83FE83DE401827121B0A5705026FCA185764A7FEFD451E5C60000001005BFE7403C80606
+004F00000114070623222623221514171633323633321715262322062322272635103321
+323635342726272223353217323320353427262322073536370333133736373633321715
+2623220F010415140716171603C8766DA244A819506221272CB22D63583B6231D232693F
+89C4012C5A6E4E3C7205B20B21201501355E485C91B87E669F73A06A2F152B511A23320F
+22325B0130E86F475001529E5E560881611B0924278B2217255297010C60594C382B0898
+01A0512A2137A71F0B0183FE83DE6317320A57076FCA2FF2C43216404900000100100000
+06C105D5001C000001272623220706070123112311230133013311331133133637363332
+1706C13A1920251D423CFEE4FACAFAFE5CC3015E7DCA7DE84E6842813338051407031938
+A1FD0AFECA01360460FC5403EBFC130272D45033100000010032FE5606D0061E001C0000
+012726232207060701231123112301330133113311331336373633321706D03A1920251D
+423CFEE4FAB7FAFE5CC3015E7DB77DE84E684281333803DE07031938A1FD0AFE5601AA04
+60FC54056AFA940272D450331000FFFF0073FFE305D905F0120601610000FFFF0071FFE3
+0475047B120602370000000100100000062705F000120000013217152726232207060701
+2301330901123605A93F3F44161949224754FE81E5FDC6D301D9013873AE05F015BB0A04
+2243DDFC1405D5FB17033D013295000100320000051F047B001300000132171527262322
+07060701230133011336373604B433383A1326251D413DFEE4FAFE5CC3015EE850664204
+7B108D07031937A2FD0A0460FC540270D54F33000000FFFF001000000627077010271720
+04E4017A120604080000FFFF00320000051F0666102702C004C200001206040900000003
+0073FE5607B305F00011001E002C000009010607062B013533323736371301331B010110
+0702200326103712201316031027262007061110171620373607B3FE1452464A7C936C4C
+2A26377CFEA2C3FDFDFD3F5F7EFE007F60607F02007E5FD51C38FE983A1C1D390168391B
+0460FB38CB3A3D9A2421890137036BFD8A0276FE8AFEDDD0FEEC0113D10244D10114FEED
+D1FEDE010672EAEA74FEFBFEFC74EAEA720000030071FE5606FF047B0011001F00250000
+09010607062B013533323736371301331B01001007062322272610373633321702102322
+103306FFFE1452464A7C936C4C2A26377CFEA2C3FDFDFD755F73CCCE74606074CECC7364
+DBE0E00460FB38CB3A3D9A2421890137036BFD8A0276FEABFE48A7C9C8A601BCA6C8C9FC
+CD0360FCA00000020073FFE3072D05F00029005200002533323736353427262B01060706
+070622272627262723220706151417163B01363736373632171617160723202726103736
+213336373637363217161716173320171611100706212306070607062227262726045D1E
+EB72808072EB1E0B0F161B1A3E1A1B16100A2EEB72828272EB2E0A10161B1A3E1A1B1610
+FE2EFEA198BDBD98015F2D0B10161B1A3E1A1F12100B1D015E98BCBC98FEA21D0A11161B
+1A3E1A1F1210C291A4F2F3A491140E150C0B0B0C15101291A4F3F2A4911210150C0B0B0C
+1510A1AAD20274D3AA150F150C0B0B0E131113AAD3FEC6FEC7D2AB1311150C0B0B0E1311
+000000020071FFE305A1047B0026005000002533323736353427262B0106070E01222627
+262723220706151417163B0136373E013217161716072320272635343736213336373637
+36321716171617332017161514070621230607060706222726272603722DA14856563FAA
+2D070A122C342C120A072DA347565548A32D070A122C34161B0D09C92EFEFF7889897401
+052E07090D1B1634161B0D09072E010277898974FEFB2E07090D1B1634161B0D09A46074
+B7A783610B0A111414110A0B5F74B8BC705F0B0A11140A0C0F0A93899CEEE9A2880A0A0F
+0C0A0A0C0F0A0A889CEFE8A2890A0A0F0C0A0A0C0F0AFFFF0076FFE308FA0774102612D2
+00001027041A069700001007041806300127FFFF0098FFE307A10610102612D300001027
+041A05FCFE9C100704180595FFC3FFFF0073FFE307050733102717E000630153100603F4
+0000FFFF0087FFE3062705E0102617E00000100603F50000000000010073FE56052705F0
+001D0039400A001C1B0D30161905101E10FCECFCD4B42F1B3F1B025DEC3100400C0EA10D
+AE129509911C1A95002FECCCF4ECF4EC30B40F1F1F1F02015D2123202726111037362132
+1716171526272623200706111017163321112303FAAEFEA5BBC3C3C30153867677686673
+7482FF0088888898F0016BC9C6D001530168CFD0242347D55F2F2F9C9DFED8FED38294FD
+B00000010071FE5603E7047B001D0039400A1D121A0C48151204451E10FCECF4D4EC3100
+400C0C860D8811B908B81C19A9002FECCCF4FCF5EE30400B0F1F101F801F901FA01F0501
+5D212027263510373621321716171526272623220706151417163B011123110298FEFB8D
+95979601065551514C4E4F4E50B363636363B3F5C9969FFA01129D9D111223AC2B161571
+72CDB97271FDC301AA000001003BFFA503CA03A700130000010727071707270727372737
+173727371737170703CA64D869D864D87DAE7DD864D869D864D869AE690211AE7DB57DAE
+7DD864D87DAE7DB57DAE7DB564B50001FBDA04DEFF42067A002F00000121140706070607
+062227262726272635343736373637363321343736373637363217161716171615140706
+07060706FEB9FE330A0B1314191838181914130B0A0A0B131419181C01CD0A0B13141918
+38181914140A0A0A0B1314191805671B191B12130B0A0A0B13121B191B1C191B12130B0A
+1B191B12130B0A0A0B131518191C1B191B12130B0A000001FD0705290009064D000D0000
+1323262322070607353637363320097617A25D5B93888B4A777D012405299B2F4B178627
+2A430001FDB304C2FEA5066100080000012211353315231437FEA5F2F1858604C2010B94
+9E9D030000000001FDB304C2FEA5066100080000011023351635233533FEA5F28685F105
+CDFEF567039D9E0000000001F9CA04D90009064D000D0000011221320504251524272427
+2607F9CA8701AF72014501320120FE5FEFFED966DD980501014C7B740186175C71070CCF
+00000008F7D6FE9003460760000C0019002600330040004D005A0067000001232E012322
+0607233E01201601232E0123220607233E01201605232E0123220607233E01201601232E
+0123220607233E01201605232E0123220607233E01201601232E0123220607233E012016
+05232E0123220607233E01201601232E0123220607233E012016FEC7760B615756600D76
+0A9E01229E0338760B615756600D760A9E01229EF9AE760B615756600D760A9E01229E06
+66760B615756600D760A9E01229EF9AE760B615756600D760A9E01229E07B7760B615756
+600D760A9E01229EF70C760B615756600D760A9E01229E0489760B615756600D760A9E01
+229E06414B4B4A4C8F9090FE514B4B4A4C8F90908F4B4B4A4C8F9090FA014B4B4A4C8F90
+908F4B4B4A4C8F909002294B4B4A4C8F90908F4B4B4A4C8F9090FB984B4B4A4C8F909000
+00000008F858FDC302C2082D0005000B00110017001D00230029002F0000273717130703
+01072703371301273725170501170705272501353305152D01152325350501233513330B
+0133150323136B96796F5CA9FB7796796F5CA9051F967A01565CFEE3FA4C9579FEA95B01
+1C0660AC0140FEC0F8C2ACFEC00140045FD3A48152D3D3A481525A9679FEA95C011D05B5
+967901575CFEE3FEF1957A6E5BA9FB7796796F5CA80218D4A48252D4D4A4825202DFAC01
+40FEC0F8C2ACFEC00140FFFF00C9FE5605FC076D102617E100001007171D04F50175FFFF
+00C1FE5605380614102617E200001007029A00A0FFCC00020021000004EC05D50012001D
+003A400E1F1319050D11190F001C0B090D1E10DC3CCCFC3C3CCC10D4ECCC3100400F0A12
+950C100E8109189501AD1995092FECF4EC10F4D43CEC3230011521320415140423211123
+3533353315331501342726232111213237360193014EFB0110FEF0FBFDE8A8A8CAA801DC
+4F4EA3FEBC0144A34E4F0451E2DADEDDDA0451A4E0E0A4FD668B4443FDDD444300000002
+002600000445059E000A001E0039400F2045001211161E060C1C1C18161A1F10DC3CCCFC
+3C3CCC10D4ECEC3100400D161EA9181C1A05A90C1A06A9152FECC4D4EC10D43CEC323001
+34272623211121323736011121321716100706232111233533113311331503813E4380FE
+F9010781423EFDF8010FD079747473D6FE399B9BB89D014C5E2A2EFE972E2B02DFFECA55
+52FEB0525203D18F013EFEC28F00000200C9000004E105D5000F001C000001170727062B
+0111231121321716151427363734262B0111333237273704558C6A927ED6FECA01C8FB80
+81E20C019A8DFEFE7247D76A0323757E7B53FDA805D57172DB922D2C398692FDCF2FB47E
+0000000200BAFE5604A4047B001000290000252737173635342726200706101716333205
+170727062322272627112311331536373633321716100706032A8C6E8A4F5354FEDC5453
+53549246011B936F95576C7B58593AB9B93A59587BCC7F80800C98A75DA573C5CB747374
+73FE6A747314AE5DB32E303164FDAE060AAA643031A2A2FDF0A20F000000000100C90000
+046A07070007001B400D0306950181000304061C01040810FCFCDCCC31002FF4ECCC3033
+11211133112111C902F7AAFD2905D50132FE24FAD500000100BA000003D0059A0007001D
+B7090304060801460810FCFCDCCCCC3100B50306A901BC002FF4ECCC3033112111331121
+11BA028393FDA20460013AFE33FC3300000000010047000004EF05D5000D00294014010C
+95090408950581000F060A0C091C0204010E10DC3CCCFC3CCCCCC431002FF4FCDC3CEC32
+302111213521112115211121152111014EFEF9010703A1FD290223FDDD0294AA0297AAFE
+13AAFD6C000000010038000004550460000D002B400A0F060A0C09080204010E10DC3CCC
+FC3CCCDCCC3100400A010CA9090408A905BC002FF4FCDC3CEC3230211121352111211521
+1121152111013FFEF901070316FDA201A0FE6001F4AA01C29DFEDBAAFE0C000100C9FE66
+04CC05D5001B0033400C12181C041D0C00061C03041C10FCFC3CDCCCC4FCCC3100400E12
+9511B0020095070206950381022FF4EC10D4EC10F4EC3001112311211521112132171615
+1110062B01353332373635113426230193CA03A1FD2901A1BA716DCCE44C3E8638377C7C
+02C7FD3905D5AAFE467772EEFECEFEF2F4AA4B4BC201229F9E00000100BAFE56040B0460
+001D0033400C131908041F0C00060803461E10FCFC3CDCCCC4FCCC3100400E13A912BD01
+00A9070106A903BC012FF4EC10D4EC10FCEC300111231121152111332017161511140706
+2B0135333237363511342726230172B80316FDA2FA010746525251B5C1AC6E2126263186
+01E7FE190460AAFEC14751E5FEF2D660609C3037930108AA202900010028FEBF089105D5
+0017000001331101330901331123112309011123110901230901330103EACA02AAF5FDDF
+01D788C529FE13FEFECAFEFEFE13D30244FDDFF502AA05D5FD1E02E2FDB3FD22FE150141
+0301FEE9FE1601EA0117FCFF0388024DFD1E00010046FEE5070304600017000001331101
+3309013311231123010711231127012309013301033FB701E9D6FE6E01667AB821FE87BB
+B7BBFE87C501CCFE6ED601E90460FDF2020EFE51FDE8FE4C011B0236C9FE93016DC9FDCA
+02B101AFFDF2FFFF0087FE75049A05F01026007A3900120603AB00000000FFFF0085FE75
+03C8047C1026007ACE00120603CB00000000000100C9FEBF05B405D5000F000013331101
+210901331123112309011123C9CA02D20103FDBF01EDA0C545FDFAFEEFCA05D5FD1E02E2
+FDB2FD23FE1501410301FEE9FE16000100BAFEE504B30460000F00001333110133090133
+1123112301071123BAB70207E2FE5401778EB838FE73C5B70460FDF2020EFE4FFDEAFE4C
+011B0235C8FE93000000000100C90000058605D500120000133311371133150121090123
+01112311071123C9CAAD6401C10103FDBF025FDCFDFA64ADCA05D5FD1EB10154EE01CBFD
+B2FC790301FE250175B1FE160000000100BA000004910460001200001333113735331501
+3309012301112335071123BAB760650142E2FE5401E3CEFE736560B70460FDF261DD7601
+46FE4FFD510235FEC5D461FE9300000100210000058605D5001300001333153315231101
+210901230901112311233533C9CAA8A802D20103FDBF025FDCFDFAFEEFCAA8A805D5E090
+FE8E02E2FDB2FC790301FEE9FE16046590000001003D0000049106140013000013331521
+15211101330901230107112311233533BAB70164FE9C0207E2FE5401E3CEFE73C5B77D7D
+06147A7DFD35020EFE4FFD510235C8FE93051D7D000000010032000006B205D5000D005F
+400B080501040609011C0C000E10D4DCEC32D4C41139393100400E420DA0000809050204
+0300AF0A062F3CEC32173910EC304B535840160711060811050904060503110402110508
+09090409040907103C3C04ED1005ED070810ED0510ED5913211101210901230901112311
+2132028D02D20103FDBF025FDCFDFAFEEFCAFE3D05D5FD1E02E2FDB2FC790301FEE9FE16
+052B0001002A000005820460000D005F400B08050104060901080B000E10D4DCEC32D4C4
+1139393100400E420DA00008090502040300BC0A062F3CEC32173910EC304B5358401607
+1106081105090406050311040211050809090409040907103C3C04ED1005ED070810ED05
+10ED5913211101330901230107112311212A02380207E2FE5401E3CEFE73C5B7FE7F0460
+FDF2020EFE4FFD510235C8FE9303C6000000000100C9FEBF060405D5000F0036401A0C95
+02AD0400810695090E0A07950A0B031C05380D011C00041010FCEC32FCEC323CEC31002F
+3CCCECE432FCEC30B2501101015D13331121113311331123112311211123C9CA02DECAC9
+C9CAFD22CA05D5FD9C0264FAD5FE15014102C7FD3900000100C1FEE505400460000F0031
+401A0DA9020400BC06A9090B0F11460C040807A90A050D010800461010FCEC32DC3CECEC
+32EC31002F3CCCECE432DCEC3013331121113311331123112311211123C1B80257B8B8B8
+B8FDA9B80460FE3301CDFC39FE4C011B0204FDFC0000000100C90000081205D5000D002D
+40180695040A9502AD0400810C080509031C07380B011C00040E10FCEC32FCEC32C43100
+2F3CE432FCEC10EC301333112111211521112311211123C9CA02DE03A1FD29CAFD22CA05
+D5FD9C0264AAFAD502C7FD390000000100C1000006E60460000D002B401606A9040BA902
+0400BC090D050A0408070B010800460E10FCEC32DCEC32C431002F3CE432DCEC10EC3013
+33112111211521112311211123C1B802570316FDA2B8FDA9B80460FE3301CDAAFC4A0204
+FDFC000100C9FE66087405D5001D0038400E1F0F1C131A031C0008041C07041E10FCECD4
+3CECDCCCFCCC3100400F1D950AAD02039507810613951406022F3CDCEC10F4EC10F4EC30
+0111231121112311211121321716151110062B0135333237363511342623053BCAFD22CA
+047201A1BA716DCCE44C3E8638377C7C02C7FD39052BFAD505D5FD9C7772EEFECEFEF2F4
+AA4B4BC201229F9E0000000100C1FE5607210460001F0033400E210F08141B0308000804
+0807462010FCECD43CECDCCCFCCC3100400B1F0903A907BC02131502062F3CDCCC10F4EC
+DCCC30011123112111231121113320171615111407062B01353332373635113427260704
+88B8FDA9B803C7FA010746525251B5C1AC6E212626318601E7FE1903C6FC3A0460FE1747
+51E5FEF2D660609C3037930108A4262E050000020073FFE306F705F1004100590000252E
+0335343E0433321E0415140E02071E0133323637150E0123222E02270E01232224260235
+34123E0137150E0315141E02333236373E0335342E0423220E0415141E02042B396C5232
+132A446181534E7D61462D151A3F6A5126683B3E65332E783D265155572B42C379AAFEF4
+BC635BACF79D73AB70383C7BBE815280B13F5330140B1724303E26314833211207284254
+AE3189AAC46B428A837457323254707B7F3A53B4B2AA4A1A15131AA817120814231B2634
+74CF011DA8A00110CB7D0EA716669ACD7C7DDEA762196D3A868E91452F66635943282B47
+5B605F2662AB8E6E000000020071FFE30578047A003F0050000013343E0237150E031514
+1E02333236372E0335343E0233321E02151406071E0133323E0237150E03232226270E03
+23222E02053E0335342E0223220E021514714B8FD1865D8A5B2D32608A5827561C243F2F
+1B2850744D4270502D5C5F23441E1B2D292A1811252D38253782431E4649471F87D4914C
+0356222D1A0B162128121A2C2113022883D89C58039B064672985862A0723E0B11256778
+82405D9F7341396892599BF15E130A040A130F9D0A110C071C2C121B12095499D6B8265E
+64632B4B69421F26486943F70000FFFF0073FE75052705F01027007A012D0000120603B5
+0000FFFF0071FE7503E7047B1027007A008F0000120603D500000001FFFAFEBF04E905D5
+000B002C400D0D0A40011C040B1C084005080C10C4DCECFC3CECFCC4310040090A069509
+81019503052FCCECF4EC323025331123112311213521152102D7C9C9CBFDEE04EFFDEEAA
+FE150141052BAAAA00000001003CFEE5046D0460000B0028400A0D090108040B0806080C
+10DCDCFC3CECDCCC310040090B07A908BC00A903052FCCECF4EC32302533112311231121
+3521152102AFB8B8B5FE420431FE4299FE4C011B03B6AAAA0000FFFFFFFC000004E705D5
+1206003C00000001003DFE56047F04600008006F40100408BC0209060300080304000803
+040910D44BB00A544BB008545B58B9000B004038594BB0145458B9000BFFC03859D4FC49
+3A111239310010CCE4323040190711080008061105060008000611060703030405110404
+03424B5358071005ED071008ED071008ED071005ED592225112311013309013302C5C3FE
+3BC3015E015EC312FE4401BC044EFC94036C0001FFFC000004E705D50010000001211123
+1121352135013309013301152103DFFEF8CBFEF90107FDF0D9019E019BD9FDF001080173
+FE8D0173AAAA030EFD9A0266FCF2AA0000000001003DFE56047F04600010000009011521
+15211523352135213501330901047FFE460106FEFAC3FEEF0111FE3BC3015E015E0460FB
+B258AABABAAA58044EFC94036C000001003DFEBF053B05D5000F00002533112311230901
+230901330901330104CB70C514FE5CFE59DA0215FE2FD901730175D9FE20AAFE15014102
+7BFD85031D02B8FDD5022BFD33000001003BFEE504790460000F00002533112311230901
+2309013309013301040871B821FEBAFEBAD901B3FE72D901290129D9FE6B99FE4C011B01
+B8FE48024A0216FE71018FFDDF000001FFFAFEBF074705D5000F0035401011059508021C
+030A0D400F1C0C400A1010D4E4FCE410D4EC3CFCCC3100400B0F0A95020C810704009509
+2FEC32CCF43CEC32302521113311331123112111213521152102D602DECAC9C9FB8EFDEE
+04EFFDEEAA052BFAD5FE150141052BAAAA0000010005FEE506420460000F0033400E1105
+A9020808030A0D0F080C0A1010DCC4FCC410D43CECFCCC3100400B0F0BA9020CBC070400
+A9092FEC32CCF43CEC3230252111331133112311211121352115210278025AB8B8B8FC39
+FE420431FE429903C7FC39FE4C011B03B6AAAA000000000100AFFEBF057C05D50014002E
+400C01160406131C04140D1C0C1510DCECD43CEC32EC323100400B079511AD130C810095
+03052FCCECE432F4EC3025331123112311212227263511331114163321113304B3C9C9CB
+FE5FBA716DC97C7C0178CBAAFE15014102C77772EE0137FED99F9E02640000010096FEE5
+04B8046000150046400C01174606140804150D080C1610DCECD43CEC32EC323100400A07
+A912140CBC00A903052FCCECE432D4ECB005B0072349B012B01423495258B10712B8FFC0
+B0021738593025331123112311212227263D013315141716332111330400B8B8B8FEA999
+665CB83435680129B899FE4C011B02095F56B8EAD3753B3B01BE000100AF000004B305D5
+0018000001232227263511331114163B0111331133113311231123112302823BBA716DC9
+7C7C1290D6CBCBD69002C77772EE0137FED99F9E0139FEC70264FA2B02C7FECF00000001
+0096000004000460001800000135331533113311231123152335232227263D0133151417
+1601F9A0AFB8B8AFA00899665CB8342B02A4C2C401BEFBA00209C4C45F56B8EAD3753B30
+0000000100AF000004B305D5000F0024400A11081C060C001C0F041010FCEC32D4ECCC31
+00B702950BAD0F81070E2F3CF4F4EC3001112132161511231134262321112311017A01A1
+BADEC97C7CFE88CB05D5FD9CE9EEFE66018A9F9EFD3905D50000FFFF00BA000004640614
+1206004B000000020014FFE3071405F00022002A004940112324090F241908330919181E
+121D00182B10DC32DCEC10ECF4ECC41112393100401610A10FAE0C1E1808950024AD0C95
+1428950491148C2B10E4F4EC10ECF43CEC32CC10F4EC3001123736212017161321100021
+3236371506070623202726030627263D013315141716252126272620070601B22296BC01
+3A0143B5BB01FB70011201128BFC706F838492FEA2C5BC0AAA767AAA4B42014003AD1862
+82FE488061036D010AA7D2D2DBFE84FEF4FECE605FD7462424CDC2015501676BDF4C3EA0
+413902BF7CA4A47C00000002000FFFE30566047B0025002E006940112E26151D2608134B
+0006120515120B002F10DC32ECDC400B000570307F05B030CF30055DEC10F4ECC4111239
+3100401A1326141E861D8819060B26A91419B9220014BB2AB90FB8228C2F10E4F4ECE4B2
+6F14015D3210EC10FC3CCC10F4B22F1D015DEC11123930012227263D0133151417163336
+3736213217161D0121161716333237363715060706232027260126272623220706070158
+9059609C30394A1A749200FFE28384FCB20C6667B76A64636268636E65FEF39C94034E02
+5253889A5D5C0E0204525AAC4631972126C582A19192FA5ABE64631A1A34AE2C14169C94
+0181975A5A57579E000000020014FE87071405F00007002D000001212627262007060712
+37362120171613211000213236371506070607112311242726030627263D013315141716
+028B03AD186282FE488061F12296BC013A0143B5BB01FB70011201128BFC706F836D77B2
+FEFDA0BC0AAA767AAA4B42036DBF7CA4A47CBF010AA7D2D2DBFE84FEF4FECE605FD74624
+1E05FEA3016320A6C3015401676BDF4C3EA0413900000002000FFEB70566047B00080031
+000001262726232207060F012227263D01331514171633363736213217161D0121161716
+3332373637150607060711231126272604AE025253889A5D5C0EC69059609C30394A1A74
+9200FFE28384FCB20C6667B76A64636268634F4AA6C27B940294975A5A57579E8F525AAC
+4631972126C582A19192FA5ABE64631A1A34AE2C141004FED201331A7B94FFFF00C90000
+019305D51206002C0000FFFF002800000876076D1027171D065B0175120603AA0000FFFF
+0046000006EF06481027029A01A80000120603CA0000000100C9FE66053505D5001C0000
+0133321716151110062B0135333237363511342623211123113311012102A98BBA716DCC
+E44C3E8638377C7CFE88CACA029E010403717772EEFECEFEF2F4AA4B4BC201229F9EFD39
+05D5FD890277000100BFFE5604880460001E0000013320171615111407062B0135333237
+363511342726232111231133110133025E14010548525251B5C1AC6E2126262C8BFEFCB9
+B90225EB02774751E5FEF2D660609C3037930108A62429FE190460FE1D01E30000000001
+0036FE56060305D500140000212311211510030605353637121901211133150123053ACA
+FE1B8462FE91D443750378C9FE9286052BD4FE18FEAAFD38A72EA801250235011AFAD5AA
+FE560001002EFE56052B0460001400002533150123132311211510030605353637361135
+210473B8FEDE7BE5B8FE7B765EFECCB33B6202F59999FE5601AA03C786FE92FEFCCF1D99
+1B7FCF01A7D4000100C9FE66053B05D500140031400E0F08001C16040A3807031C050415
+10FCEC32FCECFC3CCC3100400B0E1004029508AD090681042FE432FCEC10DCCC30251121
+11231133112111331110062B0135333237360471FD22CACA02DECACEE34C3E8638376802
+5FFD3905D5FD9C0264FA93FEF2F4AA4B4B00000100C1FE56048804600015002F400D1008
+000817460A07030805461610FCEC32DCECFC3CCC3100400A0F110402A9080906BC042FF4
+3CDCEC10DCCC300511211123113311211133111407062B01353332373603D0FDA9B8B802
+57B85251B5C1AC6E2126140218FDFC0460FE3301CDFB8CD660609C303700000100C9FE56
+060405D5001000002123112111231133112111331133150123053BCAFD22CACA02DECAC9
+FE928602C7FD3905D5FD9C0264FAD5AAFE56000100C1FE56054004600010000021231121
+112311331121113311331501230488B8FDA9B8B80257B8B8FEDE7B0204FDFC0460FE3301
+CDFC3999FE56000100AFFEBF04B305D50014002F400D141C11010E1C16040F081C071510
+DCECD4ECFC3232EC3100400B02950CAD0E0781009513112FCCECE432F4EC302511212227
+2635113311141633211133112311231103E8FE5FBA716DC97C7C0178CBCBC9AA021D7772
+EE0137FED99F9E0264FA2BFEBF01EB00000000010096FEE50400046000150047400D1508
+12010F081746100808071610DCECD4ECFC3232EC3100400A02A90D0F07BC00A914122FCC
+ECE432D4ECB012B0022349B00DB00F23495258B1020DB8FFC0B002173859302511212227
+263D0133151417163321113311231123110348FEA999665CB83435680129B8B8B8990170
+5F56B8EAD3753B3B01BEFBA0FEE501B40000000100C9FE5606E805D50011000025331501
+2301231101230111231121090121061FC9FE9286012BC5FE7FCBFE7FC4012D017D017F01
+2DAAAAFE5601AA051FFC000400FAE105D5FC0803F800000100C1FE560600046000110000
+2533150123132311012301112311210901210548B8FEDE7BE5B2FECBB8FECAB20106013E
+013F01049999FE5601AA03B0FD2702D9FC500460FD1202EE0000FFFF00C1000001790614
+1206004F0000FFFF00100000056807921027029A00CE014A130603A400000012B4180008
+13072B310040056F006F08025D30FFFF007BFFE3042D061F1026029A4FD7130603C40000
+0008B422000819072B31FFFF001000000568074E122603A400001107171604BC01750014
+B40A120D05072B400930123F0D00120F0D045D310000FFFF007BFFE3042D0610122603C4
+00001106006A52000020B4142D280B072B40157F286F28502D5F28402D4F28302D3F2800
+2D0F280A5D31FFFF00080000074805D5120600880000FFFF007BFFE3076F047B120600A8
+0000FFFF00C90000048B076D1027171D04A10175130603A90000000740034000015D3100
+0000FFFF0071FFE3047F06481027029A00960000130603C90000000740037000015D3100
+0000FFFF0075FFE305D905F0120601510000FFFF0071FFE3047F047B1206021B0000FFFF
+0075FFE305D9074E10271716052001751206046C0000FFFF0071FFE3047F06101026006A
+54001206046D00000000FFFF002800000876074E1027171606510175120603AA0000FFFF
+0046000006EF06101027006A019E0000120603CA0000FFFF0087FFE3049A074E10271716
+04870175120603AB0000FFFF0085FFE303C806101026006A3A00120603CB00000000FFFF
+00A0FFC104F805D5120601790000FFFF0058FE4C042F0460120602540000FFFF00C90000
+053307311027007100F5013B120603AC0000FFFF00BA0000047905F5102700710092FFFF
+120603CC0000FFFF00C900000533074E1027171604F50175120603AC0000FFFF00BA0000
+047906101027006A00920000120603CC0000FFFF0073FFE305D9074E122603B200001107
+1716052701750014B4031F1A09072B4009401F4F1A101F1F1A045D310000FFFF0071FFE3
+04750610122603D200001106006A73000014B4031F1A09072B4009401F4F1A301F3F1A04
+5D31FFFF0073FFE305D905F0120601610000FFFF0071FFE30475047B120602370000FFFF
+0073FFE305D9074E1226047C00001007171605270175FFFF0071FFE3047506101226047D
+00001006006A73000000FFFF006FFFE30523074E1027171604670175120603C10000FFFF
+0071FFE303E706101026006AE200120603E100000000FFFF0023000004BD073110270071
+0072013B120603B70000FFFF003DFE56047F05F5102600715EFF120603D700000000FFFF
+0023000004BD074E1027171604720175120603B70000FFFF003DFE56047F06101026006A
+5E00120603D700000000FFFF0023000004BD076B1027171F04720175120603B70000FFFF
+003DFE56047F06661026029F5E00120603D700000000FFFF00AF000004B3074E10271716
+04CC0175120603BB0000FFFF00960000040006101026006A5E00120603DB000000000001
+00C9FEBF046A05D500090023400A0B02069509041C01040A10FCFC3CECCCC43100B60495
+01810608002FCCCCF4EC3033112115211133112311C903A1FD29C9C905D5AAFB7FFE1501
+4100000100BAFEE503D0046000090023400A0B0206A909040801460A10FCFC3CECDCCC31
+00B604A901BC0608002FCCCCF4EC3033112115211133112311BA0316FDA2B8B80460AAFC
+E3FE4C011B00FFFF00C900000646074E122603BF00001007171605B70175FFFF00BA0000
+059B0610122603DF00001007006A0108000000010047FE5604EF05D500190039400D190E
+1B060A0C091C021504011A10DC3C3CCCFC3CCCCCC4DCCC3100400E14150E00010C950904
+08950581002FF4FCDC3CEC3210CCDCCC3021112135211121152111211521112115140706
+2B013533323635014EFEF9010703A1FD290223FDDD01694752BFFEE9694C0294AA0297AA
+FE13AAFDEC94C8606E9C61AD000000010038FE56045504600019003B400E1B0609190E0A
+0C0908021504011A10DC3CC4CCFC3CCCDCCC10DCCC3100400E14150E00010CA9090408A9
+05BC002FF4ECDC3CFC3C10CCDCCC30211121352111211521112115211121151407062B01
+3533323635013FFEF901070316FDA201A0FE60016E4652C0FEE96A4B01F4AA01C29DFEDB
+AAFE8C94C8606E9C61AD0001003DFE66052A05D5001700002516070607062B0135333237
+363709012309013309013301052A01020F5366E44C3E8737280BFE5EFE59DA0215FE2FD9
+01730175D9FE201A0218BE627AAA4B35730278FD85031D02B8FDD5022BFD330000000001
+003BFE560464046000170000090216151407062B013532373E0135090123090133090104
+64FE6B016B1B4351C4C1C4194F35FEBDFEBAD901B3FE72D9012901290460FDDFFE172639
+CD61739C030A6D9801B4FE48024A0216FE71018F00000001003D0000053B05D500110000
+13330901330121152101230901230121352181D901730175D9FE4E0174FE9001CED9FE5C
+FE59DA01D4FE8C019605D5FDD5022BFD7790FD44027BFD8502BC900000000001003B0000
+047904600011000009013309013301211521012309012301213501B7FEA9D901290129D9
+FEAA010DFEE0017ED9FEBAFEBAD9017FFEDF029401CCFE71018FFE3490FDFC01B8FE4802
+049000020091000004B405D5000A00150026400A170405141C0B0019101610DCECD4EC32
+EC31004009069514AD0B8105950C2FECE4F4EC3001141716332111212207060111212224
+35342433211101664F4EA30144FEBCA34E4F034EFDE8FBFEF00110FB014E01B78A434402
+2343440393FA2BDADDDEDA02660000020071000003F50460000A00160025400B18460515
+080B001211451710FCECD4EC32EC3100B706A9150BBC05A90C2FECE4D4EC300114171633
+21112122070601112122272610373633211101353E42810107FEF980433E02C0FE39D673
+747479D0010F014C5A2B2E01692E2A02B6FBA052520150525501C500000000020091FFE3
+074305D5000C00300039400E3204261C290D1B0C1C1D0519173110DCECD4EC3239D4ECEC
+310040102208951301951AAD2D138C28BC1D813110ECECE432F4EC10EC32300121220706
+101716333237363513060706070623222726353424332111331114171633323736351133
+111407062322272603EAFEBCA34E4F4F5F81B44B56210C0E336A5E6EEE81880110FB014E
+C93F3470693B3FCA6E68D7D9663102C94344FEEA505F6D7D9FFEDD1D1C6036318189CADE
+DA0266FBEC8F5B4A4A4F9B029FFD5AE07F787839000000020071FFE306730460000D0030
+0038400F32462608290E0D1B081E051216453110FCECD4EC3239D4ECEC3100400E2209A9
+3101A91A2D128C281DBC3110ECCCE432D4EC10EC32300121220706151417163332373635
+130607062322272635343736332111331114171633323736351133111407062322272603
+3DFEF980433E41406A945C2D31435D5E88AC66657479D0010FB83E3C6A683C3EB86468CE
+D3641F02022E2A5E5C3A396D349CFEF66C30316160A6AA525501C5FD619F504F4F529D01
+41FEB8EC737878250000000100C9FFE3070305F000370040400F392E1C2C060B191B2C00
+192312063810FCD4ECCCD4FCCC10ECCC310040131F05950627953212A113AE0F9517912D
+328C3810E4CCF4ECF4EC10ECD4EC3930013427262B013533323736353427262322060735
+363736333217161514070607161716151417163332373635113311140706232227262726
+03AA5C5DA5AEB6954F4F51529853BE7273646559E686864747839152513F3470693B3FCA
+6E68D7D966301C2101B2844A4BA63B3C70733D3E2426B42010106869B27C5556211F6262
+90805B4A4A4F9B029FFD5AE07F7878385061000100ABFFE30646047C00350047400E372E
+122C0B121B2C00122306143610DCC4D4ECCCD4EC10ECCC31004013148613880FB917B836
+05A9063627B9328C2C3610CCF4EC10D4EC10F4FCB00C4B5158FC1BF459EC30013427262B
+013533323736353427262322070607353E01333217161514070607161716151417163332
+3736351133111407062322272603134E4889949B7443444645774751506162AA4CC47172
+3C3C708140453E3D69683C3EB86468CEC770620138663833982C2D46402E2E0D0D1DA718
+184E4F8D5D40411819484F485844454F529D0141FEB8EC73787565000000000100C9FE56
+053C05F00029003A400D080D191D271C2B02192514062A10FCD4ECCCECD4FCCC31004012
+210795080014A115AE11951991279528BD002FECECF4ECF4EC10D4EC3930212311342726
+2B0135333237363534272623220607353637363332171615140706071617161511331123
+0473C95C5DA5AEB6954F4F51529853BE7273646559E68686474783915251C9C901B1854A
+4BA63B3C70733D3E2426B42010106869B27C5556211F626192FEF9FDAC00000100ABFE56
+0483047C0029003F400C11122101122B0612290C1A2A10DCC4D4ECCCECD4EC310040111A
+86198815B91DB8040BA90C00A902BD042FECECD4EC10F4FCB00C4B5158FC1BF459EC3025
+3311231123113427262B013533323736353427262322070607353E013332171615140706
+071617161503C8BBB8B84E4889949B7443444645774751506162AA4CC471723C3C707E43
+4599FDBD01AA0146583833982C2D46402E2E0D0D1DA718184E4F8D5D40411818494B6A00
+000000010036FFE307CA05D500210034400D23040B1C0A151C00161C211C2210D4D4ECD4
+ECD4FCEC3100400E16952181220595108C1C951B0A2210CC3CECF4EC10F4EC3001111417
+163332373635113311140706232227263511211510030605353637121901053A3F347069
+3B3FCA6E68D7D6696EFE1B8462FE91D4437505D5FBEC8F5B4A4A4F9B029FFD5AE07F7878
+7DE20371D4FE18FEAAFD38A72EA801250235011A00000001002EFFE306EE046000200034
+400D22460A08091408001508201B2110D4D4ECD4ECD4FCEC3100400E15A920BC2104A90F
+8C1BA91A092110CC3CECF4EC10F4EC300111141633323736351133111407062322272635
+1121151003060535363736113504737A67683C3EB86468CEC77062FE7B765EFECCB33B62
+0460FD04578A4F529D0141FEB8EC737875657B028F86FE92FEFCCF1D991B7FCF01A7D400
+0000FFFF00C9FFE3082D05D5120601B80000000100C1FFE307030460001C0036400F1E46
+0A0809141C080015190818461D10FCEC32DCEC32D4FCEC3100400D15A91A1C18BC1704A9
+0F8C09172FCCF4EC10E432DCEC30011114163332373635113311140706232227263D0121
+1123113311211104887A67683C3EB86468CEC77062FDA9B8B802570460FD04578A4F529D
+0141FEB8EC737875657BCCFDFC0460FE3301CD00000000010073FFE3058905F0001B0030
+400B1D0410191C1B141C0A101C10FCECDCECC4EC3100400E1695061A10950F12950D9106
+8C1C10E4F4ECD4FCCC10EC30011407060706232027261037362120171526212011102132
+363511330589642D897C97FE9BC4C0BFC501650127E1E1FEEAFDDB0225D77BCA01BAE07F
+39211ED2CC02D0CDD28ED7BFFD9FFDA094A401F0000000010071FFE30446047B001B0030
+400B1D45061212140D1200451C10FCECD4ECC4EC3100400E10B9181307B90609B904B818
+8C1C10E4F4ECD4FCCC10EC30131037362132171526232207061017163332113533151406
+23202726719296010BD0BABEC4BD625A5A62BDE2B8C9E5FEFC958E022F010E9DA16EAA7C
+7C72FE7C727C013EBEC5ECE7A69E0001FFFAFFE3056605D50019002F400C091C0B1B1840
+001C1740141A10D4E4FCE4CCDCEC3100400C0595101500951781108C0A1A10CCE4F4EC32
+10EC30011114171633323736351133111407062322272635112135211502D73F346F693B
+3FCA6E68D7D6696EFDEE04EF052BFC968F5B4A4A4F9B029FFD5AE07F78787DE20371AAAA
+000000010005FFE304F6046000190032400A0A080B1B18000815171A10D4DCFCCCCCDCEC
+3100400C05A9108C1A0016A917BC0A1A10CCF4EC3210F4ECB2100A015D30011114171633
+323736351133111407062322272635112135211502783E3D69683C3EB86468CEC77062FE
+42043103B6FDAE5646454F529D0141FEB8EC737875657B027EAAAA000000FFFF00A4FFE3
+047B05F0120601520000FFFF0085FFE303C8047C12060349000000010054FE66053A05D5
+0018002F400B0D1A04131C07141C06011910D4D4ECD4ECECCC3100400D0D950CBD191495
+0681019500191032ECF4EC10F4EC3033353637361135211110062B013533323736351121
+1510030654DD3A570378CDE34D3F863737FE1B6662AA30A3F60264FEFA93FEF2F4AA4B4C
+C104C3B8FDCAFEF8FD000001004CFE56047304600018002F400B0D1A4613080714080601
+1910D4D4ECD4ECECCC3100400D0DA90CBD1914A906BC01A900191032ECF4EC10F4EC3033
+353637361135211114062B013533323736351121151007064CBB334402F5A3B54631612E
+26FE7B585E991D7DA601D0B7FB8CD6C09C3029A103E16FFE50C2CF000000000100540000
+091C05D50017000033353637121135210901330901230901230901211510030654D93E57
+037901730175D9FE200200D9FE5CFE59DA0215FEA0FDB86662AA2FA401020258FEFDD502
+2BFD33FCF8027BFD85031D020EB8FDCAFEF8FD0000000001004C000007B2046000180000
+090223090123090121151007060535363736113521170901079DFE6B01AAD9FEBAFEBAD9
+01B3FEDFFE30585EFECCB6384402F501012701290460FDDFFDC101B8FE48024A01836FFE
+50C2CF1D991C7EB101C5B703FE74018F0000000200C9000006E805D50008001A00000111
+333236353426230106212311231121320415140701330901230193FE8D9A9A8D01957FFE
+EAFECA01C8FB0101060168D9FE200200D9052FFDCF92878692FDB38AFDA805D5E3DB302A
+0218FD33FCF8000200BAFE5606A8047B0018002000000902230106070623222627112311
+33153E0133321716170100102620061016200693FE6B01AAD9FECB1A5C7FCC7BB13AB9B9
+3AB17BCC7F541D0125FE2BA7FEDCA7A701240460FDDFFDC101A1A874A26164FDAE060AAA
+6461A26B970189FD040196E7E7FE6AE7000000020088000007BC05D50015001D00003301
+2624353424290115211121152111211521112101121016332111212288019864FF000104
+010204E8FD1C02C5FD3B02F6FC3EFEF4FE763795920138FEC892028D1AA9D7CEE0AAFE46
+AAFDE3AA0277FD8904AAFEFA87021200000000030074FFE30777047B001F0026002F0000
+0115211E0133323637150E012320272627230123012E01353436332136333200072E0123
+2206072514163B01112322060777FCB20CCDB76AC76263D06BFEF49D9804E5FEB6C60156
+749AD7D902655667E20107B802A5889AB90EFD4B8077F8F87780025E5ABEC73434AE2A2C
+9C98C2FE2701EB1A898FA2A11BFEDDC497B4AE9E8A535E01615CFFFF0073FEF805D905F0
+100600340000FFFF0071FE56045A047B100600540000FFFF0044000007A605D51006003A
+0000FFFF00560000063504601006005A0000000100C90000058605D50014000001331737
+2101172327070123090111231133110127026A8797DD0103FEA3C88E809E025FDCFDFAFE
+EFCACA01AFDB058A97E2FE9BC880A1FC790301FEE9FE1605D5FD1E01B8DC000100BA0000
+0491046000130000013317373307172327070123010711231133110102358C4176E2E693
+8E4C7F01E3CEFE73C5B7B7014B04294077E9934C81FD510235C8FE930460FDF201500001
+0054FE66087305D500250039400E0E1C271319201C1D07211C06012610D4D4ECD43CECDC
+C4CCEC3100400F1395121D95082195068112BD08001F2F3CCCECF4EC10EC10EC30333536
+37121135211121321716151110062B013533323736351134262321112311211510030654
+D93E57037801A1BA716DCCE44C3E8638377C7CFE88CAFE1B6662AA2FA401020258FEFD9C
+7772EEFECEFEF2F4AA4B4BC201229F9EFD39052BB8FDCAFEF8FD0001004CFE56070C0460
+00270039400E0E0829141A22081F07230806012810D4D4ECD43CECDCC4CCEC3100400F14
+A9131FA90823A906BC13BD0800212F3CCCECF4EC10EC10EC303335363736113521113320
+171615111407062B0135333237363511342726232111231121151007064CB6384402F5FA
+010746525251B5C1AC6E2126262C8BFEFCB8FE7B585E991C7EB101C5B7FE174751E5FEF2
+D561609C3037930108A62429FE1903CD6FFE50C2CF00000100C9FE66087405D50021003F
+4011100C1C23171D031C1B05381F011C00042210FCEC32FC3CEC32D4CCECCC3100401012
+9510BD1C1B1E950602AD040081201C2F3CE432FC3CEC3210FCEC30133311211133112132
+1716151110062B013533323736351134262321112311211123C9CA02DECA01A1BA716DCC
+E44C3E8638377C7CFE88CAFD22CA05D5FD9C0264FD9C7772EEFECEFEF2F4AA4B4BC20122
+9F9EFD3902C7FD390000000100BAFE56071A04600023004040100C082512182004081D05
+21010800462410FCEC32DC3CEC32DCC4CCEC3100401112A9111DA90621A9020400BC1F11
+BD06232FCCEC3CE432DCEC10EC10EC30133311211133113320171615111407062B013533
+32373635113427262321112311211123BAB90255B9FA010746525251B5C1AC6E2126262C
+8BFEFCB9FDABB90460FE3701C9FE174751E5FEF2D561609C3037930108A62429FE190204
+FDFC000100C9FEBF060405D5000B00002111211123112111331123110471FD22CA0472C9
+C9052BFAD505D5FAD5FE15014100000100BAFEE505390460000B00000111331123112311
+211123110481B8B8B9FDABB90460FC39FE4C011B03CDFC330460000100B2FFC4057005D5
+00230000011E01173635113311140716170726270E0123200019013311141E0233323637
+2E0127038827552E2CCB614F5946716C45AF6BFEEBFED9CB2A598C623F6629365E2601E3
+345A2965B9038BFC5CE59033279E34482E2F0129012503A4FC7578AB6D3312142D603400
+0000000100B20000053305F2001900003311100021200011152335342E0223220E021511
+21152111B20122011801190124CB2B5A8B60628B5A2A03B6FC4A03A401250129FED9FED9
+392079AB6D32326DAB79FEE7AFFE3D0000000002005D000005D505F20013002300000133
+152311231121222E02343E02332000110311342E0223220E02141E023304DBFAFACBFE91
+8BD8944D4D94D88C01170122CB2A5A8A60698F56252C5B8B5F0272AFFE3D01C3508EC4E8
+C58F51FED6FEDCFECE011979AB6D323A64889E845F350001005A000005CB05F200190000
+2111342E0223220E021D012335100021200019013315231104062A5A8C61608B5A2BCB01
+24011901180122FAFA038B79AB6D32326DAB79203901270127FED7FEDBFECEAFFE3D0001
+00B2FFE3053305D500190000011121152111141E0233323E023D01331510002120001901
+017D03B6FC4A2A5A8B62608B5A2BCBFEDCFEE7FEE8FEDE05D5FE8BAFFE9979AB6D32326D
+AB792039FED9FED90129012503A4000100B20000058A05F30029000001140E0407211521
+11331533323E0435342E02220E021D012335343E02201E02058A33546D716E2C01E4FB64
+CB563D999D97754730669EDC9C632ECB4C99E50132EB9F52038167B4997C5D3D0DAA014C
+A22B537BA2C77567AB794340709756474B79D29A585AA5E70000000100BC000004ED05D5
+0009000025211521113311211521018702DBFC5ACB0366FC9AAFAF05D5FE8BAF00000001
+00B20000053305F2001700003311100021200011152335342E0223220E0215112115B201
+22011801190124CB2B5A8B60628B5A2A03B603A401250129FED9FED9392079AB6D32326D
+AB79FD24AF00000200B2FFE306AE05F200290038000000220E0215112311343E02201E02
+1D0133152311140E0223222E02343E023B0135342E0100141E02323E02351123220E0103
+C3F0AF7136CB5BABF60136F6AB5BCECE4274A15E5F9F744144759F5BEA356FFEC8254158
+68563E22EA395A3E054E326DAB79FC7503A493DD944A4A94DD9334AFFED76BA36E393A73
+AFEAA86C33187AAD6DFCE1A870421C1B416B500123193F0000000002005DFFE305D505D5
+00150023000001140E0223222E02343E02332111331133152321220E02141E0233323635
+1104DB4990D58B8CD8944D4D94D88B016FCBFAFAFDC55F8B5B2C25568F69C0AE025792E9
+A2575D9DD1E8D09E5C0175FE8BAF426E909E947345F7F2014100000100BC0000053305D5
+001800001333113E0133321E021D012335342E02220E02151123BCCB3FBC768AD4924BCB
+2B5A8BC08B5B2BCB05D5FE094D494893DD964B3279AB6D32326CAC79FDF3000100BC0000
+044405D500050000011121152111018702BDFC7805D5FADAAF05D5000000000100BCFFE3
+06CB05D5001D00000111141E02323E0235113311140E02222E02351121112311331103CA
+36546660625133CB4880B0D2B3844BFE88CBCB0460FD314B663E1B1B3E664B02CFFD4977
+AB6F35356FAB770208FC4F05D5FE8B00000000020108FFE6061A05F0002B003E00000133
+15333E0333321E0217152E032322060716041E0115140E0423222E02353436372313141E
+0233323E0235342E01242B010E01010CCB4E4299A3A8523C6458542D356A655C2761B34F
+9B0111CC76274C6F93B46A9FEFA1504C438BCB2A65A67D7CAC6A2F429FFEF6C81D4C5705
+D5F53F65472509121B12D7232F1C0B39340959A1E899539D8B75542F63AEED8980E765FE
+345FAF85504C7FA85C60AE844E61EB000000000100B20000052905D5001800002123110E
+0123222E0235113311141E02323E023D01330529CB45B6768AD4924BCB2B5A8BC08B5B2B
+CB01E33F434893DD960226FDF379AB6D32326CAB7A9800010046FFCA051A05D500190000
+2515012E033E01373624370333010E03070E021617051AFC163E673F0B3B8B779B0138A4
+CFEE010371CBC1BB60675F0D382F98CE014013394C60758A5068A647012FFE892B58616D
+40455C3E260F000200A8FFD0058005F300350043000013343E02333216173E0335342E02
+220E021D012335343E02201E0215140E02071E0117072E01270E0123222E0225220E0215
+1416333236372E01B73B65844878ED7628412F1A2F649FE09D622CCB4E9AE5012CEBA054
+223F5736386D3888366F386EF97E4784663D016C213F311D585856B0515EAF010949724E
+28605032737C864667AE7D4640709756474B79D29A5858A3E79056A59C8E3F2D5F338E34
+65305964244B71DC13243320414F4840425000010064000005D505F20017000025331521
+11342E0223220E021D01233510002120001104DBFAFE3B2B5A8C61628B5929CB0120011C
+011A0121AFAF038B79AB6D32346DAB77203901270127FED6FEDC00020069000005B905E2
+001A0024000001220E0207011521222E023E01373E01370133133E0333010E011E013321
+010E0105262D707C85430274FBC4426E4B2314514D43A159FEE4F3BC509F968838FC9150
+440E594D02F4FDEA4781052923405B39FC72A420456C99C87E6DC9580197FEEE426B4A28
+FC7E85A9602302FB4AA6000100B2FFE3062305D500170000011110002120001901331114
+1E0233323E02351121150529FEDFFEE6FEE4FEE0CB2A598C62618C592A01C50526FD0BFE
+DDFED50127012703A4FC7578AB6D33336DAB78038BAF00010092FFE3055905F100370000
+01140E02202E023533141E0233323E0235342623213521323E0235342620061523343E02
+321E0215140E02071E0305594D99E6FECEE5984CCB2B609B71709B5E2ACAC9FDB0025051
+774D259FFECAA0CB4A88BFEAC0894C2540542E4475573201BC67AD7E474A82AF65417257
+323256703E807FAF27435C357671727B5F9567363566935D3B68533C0F113F5B76000001
+0000FFE3057105D5001700000111141E0233323E023D01331510002120001901233501C5
+295A8C63628B5929CBFEDFFEE5FEE6FEDFFA05D5FC7578AB6D33336EAA782039FEDCFED6
+012D012102F4B0000000000100A0FFE2057905D5002E0000012E012B0135333216170115
+252E0123220E0215141633323E023D013315140E0223222E0235343E02370264388A558D
+DB6AA247026BFE961A402A6FBA874BD0D3699B6532CB529CE49192E9A3584E8ABD6F0500
+1912AA181EFEFED4940B0D4886C079F0F83C6D985C474B80D3975356A5F29C7ED7A56B13
+0000000100B20000052905F2001500003311100021200019012311342E0223220E021511
+B20120011C011A0121CB2B5A8B60628B5A2A03A401270127FED6FEDCFC5C038B79AB6D32
+326DAB79FC7500010078FFC6055005F3002500002517150135171E0133323E0235342623
+220E021D012335343E02201E0215140E02034DC3FCFBED1A4A2A72BB8449D2D0689B6632
+CB529CE30124E9A3574B89BDE955CE0145D4670B0D5694C671DFEF3C6D985C474B80D397
+5353A0E99674DEB67D000001005A000005B505F2001C0000011123110E031D012335343E
+023332041E0115112311342E020367CB568B6234CB66B6F8939D00FFB563CB38668E0547
+FC94036C0C497095582A3982D99C57579CD982FC5C03954F95764F000000000200A80000
+057D05F30022003B000001222E0435263E0233321E0215140E0207211521113315333236
+37362625342E0223220E02171E0333321E02073E0302125678502E1707034F9CE593A0EC
+9C4D4C85B76C01D9FB64CB4E51C35F28A201D530659E6F6B9E652E0603122B4B3B79B16D
+27112B48351D029B2339474740156BC294585EA7E58879DDBC9431AA014CA23F3DB2C3E6
+64AA7B453964874D2637251240729C5B2D6A78870000000100B20000062305F200190000
+2111342E0223220E02151123111000212000190133152311045E2A5A8C61608B5A2BCB01
+24011901180122FAFA038B79AB6D32326DAB79FC7503A401270127FED7FEDBFECEAFFE3D
+0000FFFF00B2FFE3052905D512060038000000010064000005D505D5001A00002901110E
+0123222E023D013315141E02323E02351133113305D5FE3B41BA768AD4924BCB2B5A8BC0
+8B5B2BCBFA01F3484A4893DD96B19879AB6D32326CAB7A020DFADA00000000010096FFE3
+050E05EE003D00001333141E0233323E0235342E02272E0527263E02321E0215232E0323
+220E02171E03171E0315140E02202E0296CB356087525088643836618954437F715F4628
+02024987BFEAC38D4ECB03274E7A564F784F240404264B715088D5944E5296D5FEFCD295
+5001C344745430204469493A553D280D0A1E2D3F58734B5A9A72403D6C91542C54422927
+465F37324935250D174269996E66A4733D4B82AF0000000100B20000052905F200150000
+3311100021200011152335342E0223220E021511B20122011601170128CB2C5C8C60628A
+582903A401250129FEDDFED5392079AB6D32326DAB79FC750000000200A0FFE3056705F1
+00310040000001140E02202E023533141E0233323E02353426232135332E0335343E0232
+1E0215140E02071E0301323E02353426200615141E0205674D99E6FECEE5984CCB2B609B
+71709B5E2ACAC9FDB0E0203728174A88BFEAC0894C2540542E44755732FD9B51774D259F
+FECAA018447C01BC67AD7E474A82AF65417257323256703E807FAF11323F4A295F956736
+3566935D3B68533C0F113F5B76016727435C357673747B26554A30000000000100BC0000
+044D05D5000700000111211521112311018702C6FD3ACB05D5FE8BAFFC4F05D500000003
+00780000060405D50005000F00270000010E01101617333E03342E0227032E03103E0237
+3533151E03100E0207152302D7C1D1D1C1CB5D9568383868955DCB87E0A05858A0E087CB
+87E0A15A5AA1E087CB048E07D9FE76D807043B6B98C4996C3B03FC10065496D5010CD698
+54059F9F055498D6FEF4D59854059D000000000200320000056E05F2001B002B00000122
+2E02271121152115233523353311100021321E02140E0200141E02323E02342E02220E01
+032A3E6E5E4B1A0398FC68CBBEBE012201178BD9944D4D94D8FE0624568DD28E55252657
+8ED08C5601D71525341EFEE6AF9A9AAF0265012401204E8BC2E8C18A4D025A9C815C3232
+5B819E85613637610000FFFF0073FFE305D905F01206003200000003006EFFE605F805D5
+001F00290033000000140E010420242E013D013315141E021711222E023534363B011132
+1E012511220E02141E0200342E0223113E0205F864BAFEF9FEBAFEFAB762CB3C6B945777
+AF7338EDEFC085E0A2FD2E4F663C17173C6602AC3869955C5A95690284FEC98C4B4D8EC8
+7C272756875D340402E62A5070479992FE514B8DD8010B1021334632200FFD8AAA896033
+FD1D04345F000001007503EF01870614000E000001222726343736331522061514163301
+8773504F4F50734058584003EF5050E64F507B583F4058000000000100B203FE01D705D5
+000500000133150323130104D3A4815205D598FEC1013F0000000001000004F501DF066D
+00030000013301230118C7FEBA99066DFE880001000504F102D9072500150000010E0315
+23343E02373E033533140E02016F3A5A3D1F7A335E8653425B391A7A2E5A8805C3052439
+4828407B623F060425394828477B5E3B0000FFFFFFFF04F001DE066610070043FF550000
+00000001000804E8033506ED002900001323263E0233321E0215140E0223222E0227331E
+0333323E0235342E0227260E02756D01477EAE663F7A603C203D5B3C274F433107860313
+1B1E0E1A26190C1C3042264A85653B04F079BE824422466E4C30523E23132B47330F1812
+09131E2512273C2A1803062E63930001005A04F103B20614000500001311331521155A8C
+02CC04F10123A97A0000000100AEFFE407110460002A0000250E0123222E023511331114
+1E0233323E0235113311141633323E023511331123350E0123222603A245BF8357885D31
+B91C3A563B4772512BB971784672502BB9B93FB0797CA8D67E743F78B07102A4FD4E5171
+4820315C8352027AFD62A39B325D8251027AFBA0AE69617A0000000100BAFE560464047B
+00160000013510232206151121152111231133153E013332161D0103ACF895AC02F1FD0F
+B9B942B276C2C501C2DC013DBEA4FE27A0FE56060AAE6663EEE9E200000000020071FE56
+052F047B00100028000000141E02323E0235342E02220E010123110E0123222E02103E02
+33321617353311331523012F2B51749275512B2C51749274510300B83AB07D66A8794343
+79A8667DB03AB8D5D50294CAA1703C3C70A16564A1713C3C70FB2102526461559BD90106
+D99B556164AAFC40A000000100BAFE56053A047B00160000211123111023220615112311
+33153E01333216151133150465B9F895ACB9B942B276C2C6D5FE560448013DBEA4FD8704
+60AE6663EEE9FDFCA000000100AEFFE304620614001A0000131133112115211114171633
+3237363D01331123350E0123222726AEB802FCFD043E3D7D985456B8B843B076C1646401
+BA045AFE4CA0FE019F504F5F62A1EBFD30AC6762787700020071FE56052F047B0015002D
+000001331521110E0123222E02103E0233321617353301141E0233323E0435342E022322
+0E04045AD5FE733AB07D66A879434379A8667DB03AB8FCD5214978573C5D46301E0D214B
+77573C5D45301E0DFEF6A002526461559BD90106D99B556164AAFDCF4E9C7B4D25415561
+66304E9B7C4D2640566066000000000100BA000003EC0614000900002901113311211521
+11210397FD23B8027AFD8602250614FE4CA0FCE00000000100BAFE560464047B00140000
+21111023220615112115211133153E01333216151103ACF895AC02F1FC56B942B276C2C5
+029E013DBEA4FC7DA0060AAE6663EEE9FD5C000200BAFE5605E8047B002C003C00000121
+342E0223220E021511231133153E0333321E04153315230E0323222E02343E020521220E
+0215141E0233323E02036601314876974F528C673BB9B92A636D763D44887E6D512E9296
+1260819446487F6038375A730166FED61A322818172B402919515144022F64A1703D295A
+8E65FBEB060AAA3C4C2C11274868839B57A071A1693124496E946F4925A00F2133241D31
+2615173D690000020071FFE3052F06140010002600000121220E0215141E0233323E0235
+1311140E02222E0235343E023321113311331503A2FEC64974512B2B51744951764D26B8
+427FBAF2BB7F42407FBB7B013CB8D503C03566956165A1703C3C71A0650191FE3972C390
+51569BD88371CB9A5B01B4FE4CA0000100BAFE5604640614001200000111231110232206
+1511231133113E013332160464B8F895ACB9B942B276C2C502A4FD5C029E013DBEA4FBDD
+07BEFD9E6663EE000000000100BAFE56026C0460000500000133152111330172FAFE4EB8
+FEF6A0060A00000100BAFE56071D0614002A00000115141633323E023511331123350E01
+23222E0235111023220E021511231133113E03333216044871784672502BB9B93FB0793D
+816B44F74B6E4824B9B9134157683BC3C402A4E2A39B325D8251027AFBA0AE69612965A9
+810102013D325C8351FBDD07BEFD9E27493722EC000000020071FFE3047406140018002D
+000001133307052115231E0115140E02222E0235343E023703141E0233323E0235342E02
+2723220E020106C2D4A4014201377D433D4483C0F6C082443E6F9A5BE1285177504F7850
+28122B4734874E785129050A010AE2D2A04ED7847ACE97555597CE7A78C6945E10FDC053
+956F41416F95534D7763562C45759A000000000100AEFE56045806140013000013113311
+10333237363511331123110E01232226AEB8F8955657B8B843B076C2C701BA045AFBADFE
+C25F5EA5027BF9F602566762EF00FFFF00BA0000046406141206004B00000002006AFFE2
+04300614002D0042000001150E01071612151123350E0323222E02373E03372E0335343F
+0133070E0107061E02373E0101141E0233323E023D01342E02270E03033C1A341AA9B3B8
+1B485C7043629C6A3703023E6D9A5E445D3B1A2224C72A130F01022E4757281B39FE0A21
+4365444D78522B1E4570513D6C5230052CB110201264FEE5B9FDFFAC2D4A361D4278AA69
+60B7ADA34B0A344753294435393F1D3B172D3F2202111222FCA04573532D375D7B445635
+777568263275879A0000000100BAFE560539047B00140000011521111023220615112311
+33153E0133321615110539FE73F895ACB9B942B276C2C5FEF6A00448013DBEA4FD870460
+AE6663EEE9FC520000000002008CFFE3045A06240028003E00001335333E033332161715
+2623220E020733321E02151123350E0323222E0227261237131E0333323E023D01342E02
+2B010E038CC4378DA7C16B192D163432477F72622A0377D19C5AB818465C744566976635
+0305363856062D4961384673532E2A629F75471D2A1B0A03B6AA60A57A450604BD1D2A4B
+683D4C8AC277FDAFAE2C4A361F41729B5A83011D8BFDFD5875461D335B7C496840866D45
+4187847E0000000100AEFFE3052D061400160000131133111033323E0235112115231123
+350E01232226AEB8F84B77532D018DD5B843B076C3C601BA02A6FD61FEC2325C8351042F
+A0FA8CAC6762EE0000000001FFD4FE5601720460000B000013331114062B013533323635
+BAB8A3B54631694C0460FB8CD6C09C6199000001FFD9FFE3045806140016000003211110
+33323E023511331123350E0123222635112327018DF84B77532DB8B843B076C3C6D50614
+FBADFEC2325C8351027BFBA0AC6762EEE903BA00000000010000FE56037B047B00310000
+17141E0233211521222E0235343E0635342E0223220607353E0333321E0215140E06C104
+0A14110250FD742A44301A3C627D837D623C2D5273475B9A4E264A4F593573B881453C62
+7E827E623CD908110F09A01B2F3F24316A71767C7F83854348694421262AAE0E170F0835
+6CA26D4B9590877C6F5E4A000000FFFF00BA00000464047B1206005100000001000AFE56
+02F604600031000013211521222E0235343E04372E0335343E0237330E0315141E02373E
+0137070E0315141E02FC01FAFDD624463721233C53606A352F6E5F3F0B203B30E73B4D2C
+11263F522D1942230166A97942040B11FEF6A0162E462F3A878E90897D330220446B4C1E
+3F464D2C2548433E1A3044280E05031512B759CBC8B8450C1A140D000000000100AEFE56
+07110460002A0000250E0123222E0235113311141E0233323E0235113311141633323E02
+3511331123110E0123222603A245BF8357885D31B91C3A563B4772512BB971784672502B
+B9B93FB0797CA8D67E743F78B07102A4FD4E51714820315C8352027AFD62A39B325D8251
+027AF9F6025869617A000002006EFE5603F4047C002C0044000001140E06151416332115
+21222E02353436373E03272E0535343E0233321E0225220E0215141E041514073E033534
+2E0203F43C627E837E623C1F150250FD742643311D52481923140406082A363B31204978
+9A506EB07B42FE252B56442A1F2E372E1F323C826C45284B6A02D24E9991897D6E5D4919
+171AA0192B392042904919444C4F242F524B484D54324F8660363A6E9EAA1A344D332142
+44484C532C514F3A7E848A48456948240000000100BA000004E0047B0024000001220E02
+1511231133153E0133321E0215140E0207211521353E0335342E0202C14F7C562DB9B93F
+BD7963A2743F213D56350129FDFD3F60422223476C03DB345A7A46FD730460AC6166467D
+AE67538B7B7139A084346D798A5049816138FFFF00AEFFE30458047B1206005800000001
+00AEFE56052D061400160000131133111033323E0235113311331521110E01232226AEB8
+F84B77532DB8D5FE7343B076C3C601BA02A6FD61FEC2325C8351042FF8E2A002566762EE
+0000000100AEFFE3071C047B00270000011133153E03333216151123111023220E021511
+23350E01232226351133111033323E02038FB8214F575B2CC3C4B8F83C6B502EB843B164
+C3C6B8F83F6F533001E5027BAE334B3219ECEBFD5C029E013D325C8351FD87AC6762EEE9
+02A6FD61FEC22F5B8400000100BAFE560464047B00140000011123111023220E02151123
+1133153E013332160464B8F84B77532CB9B942B276C3C402A4FD5C029E013D325C8351FB
+DD060AAE6762EC000000FFFF006FFE560458047B1006004AFE00000100BA000003980460
+0005000025211521113301720226FD22B8A0A0046000000100AEFE56071C061400270000
+011133113E03333216151123111023220E02151123110E01232226351133111033323E02
+038FB8214F575B2CC3C4B8F8396A5131B843B164C3C6B8F83F6F533001E5042FFD9E334B
+3219ECEBFD5C029E013D2F5A8455FBDD02566762EEE902A6FD61FEC22F5B840000000002
+0029FE5604A4047B001B002C000025112115211523352335331133153E0133321E02100E
+0223222601342E02220E02141E02323E0201730315FCEBB99191B93AB07C66A87A43437A
+A8667CB002382B51749274512B2B51749275502BA8FEA89B5F5F9B0510AA6461569BD8FE
+FAD89B566101EB64A1703D3C70A1CAA1703C3C71A000FFFF006FFFE30473047B10060052
+FE0000030046FE56062106140027002E0038000000100E0223112311222E043D01331514
+1E023311222E0235343E023B0111321E012511220615141600342E022311323E01062167
+B4F38BB857A491785630B45083A95A629C6F3B3B6F9C62B88EF3B2FD157D747B030A457D
+B06A6AB07D02C7FEF8D69752FE5601AA2749678095535D5657987242031A2B4F6E434870
+4D27FE4C4689CF01264F48424DFD80C08F5F2FFCE6396B000000000100AEFFE3067E0614
+0016000025211521350E01232226351133111033323E0237113304580226FD2243B076C3
+C6B8F84975542E02B8A0A0AC6762EEE9045AFBADFEC22F587D4D028C0000000200F00000
+01C303520003000700003733152311331523F0D3D3D3D3FEFE0352FE00000001006401B2
+027F0283000600001304251506242764010F010C88FEF58802835A5AA42D012C00000002
+0244FE4302DAFFD300030007001CB4040305010910DC3CCC323100B60602000402000810
+DCDCDC493A3005331523153315230244969696962D9664960000FFFF00ABFE430382FFD3
+1027051000A8000011070516FEE400000013B0104B5258BB000000040004004038103C31
+5900000300FFFE4303A2FFD300030007000B0025B60003080409050D10DC3CDC3CDCCC31
+0040090A060408060304010C10DC3CDC3CDC493A3005352115373315231533152300FF01
+907D96969696C396969696649600000300FFFE4303A2FFD300030007000F002E40090C0B
+080F040005011110DC3CDC3CDCDCDCCC3100400B070200050A02080B000D1010DC3CDC3C
+3CCCDC493A3005331523153315232715233523352115030C96969696FA967D01902D9664
+96FAC8C8969600010244FEBB02DAFF5100030010B502000400010510DCCC310010DCCC30
+0533152302449696AF96FFFF01C7FEBB0357FF51102605147D00110605148300000FB200
+0005495358B90000004038593100000301C7FE430357FFD300030007000B004F4009040B
+0A0500010B0A0D10D4CCDCCCDC493A31B2000805495358410C000B000A00090008004000
+040007000600050004FFC000041738173859004009030B08000B0708040C10DC3CDC3CDC
+493A30013315230333152337331523024496967D9696FA9696FED9960190969696000001
+0163FEBB03BBFF5100030010B502000400020510DCCC310010DCCC300521152101630258
+FDA8AF96000000010163FE7503BBFFA100070019B4050200060910DCDCDCCC3100B40100
+03050810DCDC3CCC30051523352335211502DA96E10258F5969696960000000100000500
+0096059600030010B501030401030410D4CC310010DCCC3011331523969605969600FFFF
+0000050000960596100605190000FFFF012FFE1B03B9FFDD1027051400DFFF6010260514
+E5F611070514FEEB008C003DB2000A04495358B9000AFFC03859B300040A0510493A3100
+B200090C495358B90009FFC03859B2000409495358B90004FFC03859B30004090410493A
+30000001024E01E502E4027B00030010B501030403010510D4CC310010DCCC3001331523
+024E9696027B9600000000010244FE4302DAFFD300030010B502000400020510DCCC3100
+10DCCC3005331123024496962DFE700000000001006403C6027F046A0003000013211521
+64021BFDE5046AA4000000010163050003BB059600030010B501030403010510D4CC3100
+10DCCC300121152101630258FDA805969600000100D1FF38018B05280003001CB4050208
+000410D4ECCC3100B201020410CCCC30B44005500502015D13331123D1BABA0528FA1000
+000000010519050005AF059600030010B501030401030410D4CC310010DCCC3001331523
+05199696059696000000000100C50500015B059600030010B501030401030410D4CC3100
+10DCCC3013331523C59696059696000200D10000018B0460000300070023B60902060800
+040810D432EC32CC3100B40301BC05072FCCF4CC30B44009500902015D13331523113315
+23D1BABABABA0460CAFD34CA000000010066000002DC0460000D001DB60F050C09080D0E
+10D4ECD4CCCC3100B605A904BC0AA90C2FECF4EC301310363B0115232206151121152166
+CDE39294866E01BCFD8A025E010EF48F96C2FE168F0000010163FE4303BBFFD300070019
+B4050200060910DCDCDCCC3100B4010003050810DCDC3CCC30051523352335211502DA96
+E10258C3FAFA96960000000100BA0000049F04600027006FB729461F081E010802B71608
+150A080B462810FCECD4FCDCB77F027F026F025F02B23F02055DECD44BB01D5358B9001E
+FFC03859FCFCB74A033A0329037A03B24403055D4BB00A5158B90029FFC038593100B41F
+16BC0A012F2FFCC4B73A003A03551D5B09B665176A037909075D30090123010E04151123
+35343E05370133013E0435113315140E050380011DD9FE601C2338211AB8141F322D412C
+1FFEE4D901A01B2338221AB8141F322E402C019BFE6502580E1535416E45FEF4B9518A60
+51322C150D019BFDA80D1536416E45010CB952896151312C150000010058000004480460
+00150036B7171311080008151610DCD4DCFCDCDCB4740A6F07025D314BB00A5158B90017
+FFC0385900B708A909BC11A915A9B0142FECECFCEC302511342E0323213521321E031511
+3315213502E80B26457957FEB6014A7BB174451BA6FC108F01CF4B63663A258F2E558BA6
+72FE558F8F0000010058FFF603110460001F003FB7210308040008161BB10D2010DCD4D4
+ECDCECCCB4741D5C10025D4BB00F514BB00D535A587DB0062F18593100B71BA91CBC2010
+A90BB0032F2FEC10FCEC30011412172326270E03232227351633323E0335342E012B0135
+333216027F454DC73A1921465050372E3322242C4556382833655C5A60DDCB025E90FEC0
+8E8770516736130EA90A0D345BAA7597A13B8FF400000001005800000417046000070028
+B60900010804050810DCDCFCDCDC314BB00A5158B90009FFC0385900B50104A906BC032F
+FCFCC43001231123112135210417C6BAFDC103BF03D1FC2F03D18F000000000200BA0000
+048004600003000F003CB711460408070B0108B202461010FCECD4D4FCFCB4700D6A0A02
+5D4BB00A5158B90011FFC038593100B70BA90CBC02000302B0062F2FD4C410FCFC300111
+23110511231134262321352120160188B903B1B981BAFE2E01D00115E102ACFD54026026
+FDC60260D8998FFA0000000100BA00000174046000030021B60546010802460410FCFCFC
+4BB00A5158B90005FFC038593100B203BC012FE430011123110174BA0460FBA004600001
+00580000026D0460000D0045B60F010508080D0E10DCDCFCDCDC314BB00E534BB010515A
+587CB0022F18B36A035A03B46A0B5A0B045D31594BB00A5158B9000FFFC0385900B5020C
+A90DBC072FFCFCC4300115232206151123113436372335026D505741BA4D38F804608F9B
+BDFD8702797FB2278F00000100BA000004800460000D0037B70F46010802080809B1460E
+10FCFCDCFCFCB2700B015D4BB00A5158B9000FFFC038593100B507A90ABC08022F2FFCEC
+B27400015D003001112311342623211123112120160480BA82B8FEE7B901D00114E2025E
+FDA20279C692FC2F0460F0000000000100B9FFE304BF046B001F005BB72119080A110108
+1EB1462010FCFCDCDCB7741470147F0A2F0AB2A00A055DFCDC314BB00A5158B90021FFC0
+385900B70FA9141FBC2005A9B01C2FEC10FCC4ECB56C0A6E196E1EB55C0A5E195E1EB744
+0A4401340A3401B00A5D300111141E02323E0235342E02232207353633321E0215100220
+02190101722D5974A074592D13305A43425D725766905425FCFDF2FC0460FDB474A25B28
+285BA274719D7D3D1E8F1E519FD28DFED4FEF3010D012C0244000001008801A201420460
+00030023B4050108020410DCFCDC314BB00A5158B90005FFC0385900B4010200BC0410E4
+2FC430011107110142BA0460FD8E4C02BE0000010058FE560392046000100038B6124600
+08030A1110DCDCFCFCB4610C5F09025D4BB00A5158B90012FFC038593100B60AA90BBC01
+BD1110ECFCECB65F034F033F03035D3001112311342E0323213521321E020392BA153258
+7F5DFEFB0101A8D6863501EEFC680398729B75421F8F3D97E80000010058000003CA0460
+00190035B61B0708130E191A10DCD4DCFCDCB74F0F4F183F0F3F18B0045D314BB00A5158
+B9001BFFC0385900B619A900BC0EA90D2FECFCEC301321321E03140E0323213521323E02
+342E02232158015875BB785022225078BB75FEA80158648D4E22224E8D64FEA80460406B
+929DAC9D926B408E3E7591BC91753E00000000010058000003F005D500080036B70A0708
+0108080005B208020910DCFCDCFCD4B27F01015DFCDC314BB00A5158B9000AFFC0385900
+B60702A90405BC002FFCCCFCC43021012111331105070101810194FD43BB02DD03FE5703
+D10204FE8B016EFC0F00000200BA0000049504600008000F0034B7114600080B0A0801B1
+461010FCFCDCFCFC314BB00A5158B90011FFC0385900B609A902BC0AA9012FECF4ECB46F
+0C7E0C025D3029011121321E0215011121113426230495FC2501E38DC07734FCDF026782
+B904603A81BD8A0173FCBE01EAC69200000000010058000004B5047000250064B727460C
+08110E1B08B41C0108002610DCECD4B2701C015DFCDCDCFCFCB74A233A232A231C23B768
+235A234A046804B473040C23085D4BB00A5158B90027FFC038593100B714A90A00BC0FA9
+0EB01B2F2FECFCD4FCB758046C115C117604B27F11055D3013331E01173E043320190121
+3521113426232207060706070323133E0435340258D90442161C4D4C624C330192FDCE01
+787A61B456302A020562BA50030F0507035D04600B9D4E4664361E08FDEEFDA28E01D0C3
+BBA05BCE0E17FE1201A210491B332716400107000000000100BAFE560174046000030024
+B60546010802460410FCFCFC4BB00A5158B90005FFC038593100B402BD03BC0410E4E430
+011123110174BA0460F9F6060A0000010058000002780460000D0031B70F460B0800050D
+0E10DCD4DCFCFC4BB00A5158B9000FFFC038593100B605A906BC0DA90C2FECFCECB4100A
+000A025D30251134262B01353332161511213501BE646A7E7ECDBBFDE08F02587B6F8FB1
+DDFD2E8F0000000200B9FFE304BF046000090013005DB71504080F0C080946B01410FCFC
+DCB27F0F015DFCDCB64A0A3C0A6001035D31B75907540669076406B0045D4BB00A5158B9
+0015FFC0385900B70AA900BC140EA9062FEC10FCFCB7340F340C260F260CB7420F420C52
+036403B0085D3013212004111000200011012111102011342E02B901E7011D0102FF00FD
+FAFF0001E7FED202942D5F7F0460FAFED4FED0FED901270130018DFE6BFE4901BF759C58
+240000010058FF42044804600013004BB715460208010F080CB10E1410DCC4FCDCFCFCB6
+3E0D1D0D0F0D035D314BB00A5158B90015FFC0385900B710A90BA90C01BC0EB1BC1510E4
+E4D4ECE4B414100510025D30B4670D470D025D01113311140E04070535250133013E0112
+0388C013315888C282FE800124FED4C201148490460344011CFEE476B2AF887F6A2F8BA9
+68040DFC323996010800000100BAFE56046404600017005EB719460008030D0808B21346
+1810FCFCD4DCFCFC314BB00A5158B90019FFC0385900B710A90B07A914BC02B1BD1810EC
+FCFCDCB74A131F0B0F0B2F0BB0045D4BB017504BB012535A58B9000B00403859FCB76A03
+5C034A037F04B0045D300111231134262B01151416333237150623222635112120160464
+BA91A9FD474A29435243869B01B60110E4025EFBF8040AD0A1F049450D981094B00164F5
+0000000100BA0000048E0460001C006AB71E03080C16100807B200461D10FCC4FCD4DCB4
+5F0C3F0C025DFCDCB73D0E3D0A4B0E4B0AB0045D314BB00A5158B9001EFFC0385900B719
+A91410A900BC09B1A9062FECFCFC7DDCB25F14017118B6701450144A1C035D4BB019504B
+B012535A58B9001400403859FC301321200010002901352132363534262B010706163332
+37150623222635BA01AA01020128FED7FEFFFE56015EECD1D8E4A50101484A2943524386
+9B0460FEDCFDE8FEDC8EC0EEDBBADE49450D981094B000010058FE5603F9046300160047
+B718080807030E0811B30008161710DCFCD4FCC4DCB27F07015DFCDCB736034403540305
+03B0045D314BB00A5158B90018FFC0385900B50700BC10BD1710ECFCC4B23703015D3001
+1716173E013D013315140E0207112311342E01270301259F663A7568B83D688048BA393D
+31D30463E492992EC39784846FBA7E5312FC86032650AB6A490139000000000100580000
+04050460001A006CB71C46170D080C0208B21A011B10DCC4FCDCB00C4B51B0104B535A58
+B9000C004038B10C002F1059FCC4FCB73C163B033F004803B76C0059005F004A16B66916
+7C003D00095D314BB00A5158B9001CFFC0385900B50C01BC1AA9192FECFCC4B754163803
+54037403B0045D302501330136373E0435113315140E05070115213502F4FD64DA018304
+07181A2C1813B8121A2E263D241E0103FC538E03D2FDC90305111634375A37010CB94A7D
+584D2E2F1510FE8E478E000200BAFE560511045F0003000A0052B007B70C0808050A0804
+01B4080206460B10FCD4FCDCFCD4B74F055F056F057F05B0045DFCCC314BB00A5158B900
+0CFFC0385900B7020106A907BC00BDB0042FECFCFCDCC4B2AF01015DB440095009027130
+0111071109012135211501018CBA01D30194FC810457FE57FE5604564CFBF601AA03D18E
+6EFC0F00000000010058000003CA046000110040B613460108020A1210DCDCFCEC31B00E
+4B54B00F4B545B58B00C2F31594BB00A5158B90013FFC0385900B40AA90BBC022FFCEC30
+4BB0105058B103002F2F305901112311342E0323213521321E0303CABA1533507E52FEB0
+014F7EBF7A4D1F023AFDC6023A49766946298F355D8DA100000000010058000005530460
+002800A2B72A20081F0F080E03B60802160801022910DCD4FC10FCDCB4100E000E025DFC
+DCB748063B062B06101FB7001F500060007000B0085DFCDC4BB00B5058BB0016FFC00001
+FFC0383831B104152F7D2F1859B72000300057155704B0045D31B76613670477047613B2
+8704055D4BB00A5158B9002AFFC0385900B715A9041F0E02BC16B1A9002FECFCC4C4DCB7
+AF041F042F049F04B0045DECB6431D43224825035D3021230333133E0837330207060706
+0713323E0637330E0701AEBC9AB949304B38281D110F080D06A51218296C5FA72B629792
+6B634538220AB9122A3D4B6981ABCB0460FDF1010F212340355D45792BFEFC67AB453D06
+FECD0F28436992C5FA9DA6FCE4A389573D1A00010014FFF804880460001E0049B7204601
+08030A0817B30818111F10DCD4FCFCDCFCFC31B4D019D018025D4BB00A5158B90020FFC0
+385900B713A90E010AA918A9B219BC012FFCECFC10D4FCB67F036A035B03035D30011123
+11342E032B0111140623222735163332363511233521321E020488BA0A24407050F67B98
+354E4126472EAD025D8FC16C2C025EFDA202604A63653A25FDCDD6D0108F0E72A302338F
+438AB4000000FFFF00BA0000030A04601027052B019600001006052B0000FFFF00880000
+02A804601027052B013400001006052F0000FFFF008801A2027F04601027052F013D0000
+1006052F0000000100BA02E40299046000030014400902B400BC040344010410D4EC3100
+10F4EC300133012301D2C7FEBA990460FE84000200BA02E4046E046000030007001D400E
+0307B40105BC080344010744050810D4ECDCEC310010F43CEC3230013301230333012303
+A7C7FEBA99BDC7FEBA990460FE84017CFE8400020000FFD704DC07220025003000000116
+171615233427262733161716373637363533141716171637363533140706232227060706
+250901050727012301233502B10F0A1472171F627B1E190D1D2E050471090E1D26090871
+182D61541520211DFDF602040100011B197DFEC142FDAE73061631326AFFEE7BA2CD4045
+230407241C5D7D0D150101181871AB213C221C070569FA8D02C562502DFC8D0646600002
+0000FFD704DC0729002A0035000001150607061514171617152207061514171617323736
+371506070623222726353437363726272635263736050901050727012301233503A84D40
+563A31313855461E252F3E3750362E4E403F5E473F4429372D1C23018E46FD9602040100
+011B197DFEC142FDAE7307295E0A1D262314201B025C2A24402E2229010D13186E14100D
+463E5D4B482A0E121A21235448239DFA8D02C562502DFC8D064660000000000400850000
+057A051400030007000B000F00002533152325331523013315232533012304C6B4B4FE3E
+B4B4FD8FB4B40294A0FD5EA0FAFAFAFA0514FAFAFAEC000500850000073C051400030007
+000B000F0013000025331523253315232533152301331523253301230688B4B4FE3EB4B4
+FE3EB4B4FD8FB4B40294A0FD5EA0FAFAFAFAFAFA0514FAFAFAEC000100DB0000020001EC
+0005000021233513330301AED3A48152AC0140FEC000000200FC04FD030506F1000A001B
+00000133323736353427260706172B01353311331136373617161514070601CD374E1635
+1E01473418AF70516624683F4641403605620D21152010011C15A865018FFEBF4928181A
+19525B322A00000200DB00000200051100050009000001233513330B0133152301AED3A4
+8152D3D3D30325AC0140FEC0FD2DFE00000000020093000003B005F00003002400002515
+233537353426272E012F012E0135343633321617152E012322061514161F011E011D0102
+BCCB06060608272F585A48DFB867C15E61B34F6C8333395A5A38FEFEFE937B343C151935
+2F5656894C9FC23839BC43466E59315E35595682659A000100A30055031E03DE00220000
+3735363736372627263534373637363332171526070607061714171637363715060706A3
+2F5344348E3335151E6763626E5A644633316001C8393A483A5ACDE755B006191421184C
+4F54414B763F3D16B91F02011A307073320E0F1323B93C505A00FFFFFFB5000002850783
+1027057BFF1D01C2100605540000FFFF006C000001C307FD1027057CFF1D018610060554
+0000FFFFFFABFE0C034004B51027057CFFC2FE3E100605700000FFFF006CFE0C01C30614
+1027057DFF1D0000100605540000FFFF0082FEF305C004B51027057CFFF4FE3E10060571
+0000000100C10000017906140003000013331123C1B8B80614F9EC000000FFFF0082FEA2
+06EB029D1026058E0000100717210339FEA2FFFF008BFFC603A0041A1026056F00001007
+172200FA0384FFFF0082FFEC06EB03201026058E00001007172202BC028AFFFF0082FFEC
+06EB041A1026058E00001007172302BC028AFFFF009DFE0C052803661026055A00001007
+1721030700190001009DFE0C05280366001E000013243320171520070611141716213237
+1506232027263510373637220706079D0114C30124C4FEDAD7E04A7F014BC1D496FAFE5E
+A983D46089659F7E6803273F369AA7AEFEFB8760A476B863C296E00102DF6534130F2D00
+0000FFFF009DFE0C052804B01026055A000010071721023F041A0001007DFFDA031B0352
+0019000025363736353427262733161716151407060506232227351633320187AC23083C
+42ADE37142522050FEFA2E2D66677354219731701B2A4E7481925B7C9869634BC2290726
+B82AFFFF007DFFDA031B04B01026055C0000100717210145041A0001FFABFE0C03620226
+0011000025363534273316151407020504213520373602A30A35B832082EFEDDFEE4FEBE
+0130CBDA9E3A487E887684523EFEA29B97B8808A0000FFFFFFABFE0C036203B61026055E
+0000100717210271032000010082FE0C091A02EE003F0000250607060706232627241134
+3733061716171633323736373627262F0133171617163332373635331417163332190133
+1114070607062322272627060706070604FC185485C15078806DFEED69B86C0101935F51
+625F795E4001011040B824101C3B73522C25B813406E8EB85C4B66252049308A11315F32
+46842CB36BAA3E1A011C470148F6B4CEDCB3261825309E6C8E7D3DEA9C4A3C817A67C2CD
+32A901180126FEAAC7715C180919467B9F1E0F030600FFFF0082FE0C091A04B010260560
+00001007172304E2032000020082FE0C091302E50032003F000005060706232627241134
+373306171617163332373637363534273306171617363736373617161716151407062901
+222726351401220706073332373627262726049058EE5078806DFEED69B86C0101935F51
+665BA22B2127AB010E0A28737B7E814F517D61BAB8CAFEE4FEEC26342D02A14C7EA891BB
+ED81BB01028925F29B4D1A011C470148F6B4CEDCB3261825448A6C7F938A0F372832926C
+6E362201022547E9A96D781E1A10BA02A9516CC23F5B46871305FFFF0082FE0C091303B6
+1026056200001007172104FB032000020090000006DC0614000C001F0000253332373627
+26272623220706132901352111331112253633321716151407060341BBED81BB01028925
+30507AB175FDC1FE91016FB8D901145C447866BAB8CAB83F5D448713055178FE92B8055C
+FB0E013F63212745EBA96D78000000><FFFF0090000006DC061410260564000010071721
+03CF035200010075FE0C04B2042A002A0000051621323715062320272635343736372627
+263534373633152207061514171633323736371504070615140153770153C1D496FAFE5B
+A66257714D332F58CC7CFCC3745D302D2E28299EFEFEEFECD1B19E76B863BC6FC9B16583
+19041E3882D07F4DA94134684B191812451DB81A9583B975FFFF0075FE0C04B205461026
+0566000010071721017704B00001FFEC0000026C00B80003000023352115140280B8B800
+FFFF0082FFA4079E0514102605BA00001007172105F5047EFFFF006BFE48059B05141026
+058F0000100717220352047E00020090FFC905C706140021003D00000115060706151417
+161716151407062322273516333237363534272627263736373601361901331110070607
+06272627243534373306151617163332373603D04A26500E0C446658524E4238442D3C39
+3C4E4A122001024B5501664CB86E95DD8876CF65FEDB10B80E02A0797F8C5998046F5204
+0E1E211C12100A0F586E2A270B580A1A1A1E2611101C2F2E51262BFCAE49010103B1FC4F
+FEB97BA71F1301021E58C34B353A2C5C2E231B2F00010090FEC805180614001B00002536
+351133111007060506232227240326373306151417163332373604124EB86279FEFB8655
+5F49FEDC010140B841A62849506DAE497EE3046AFB96FEC390B14222165C01118A5C7373
+823E1022350000000002008CFE14045E02F30011002E0000011633323736353427262726
+232207061514072607061511231134373633263534373633321716171615140706230602
+627A4C2C153506153B282E3B1B446E324B19C878415A02A24D5C4D4FB61C08627858B201
+272A16393A181458110C1B444428C11C4E1A4FFE1401ECAD66372A2894843F2453A72D38
+92415002FFFF0093FEB5054803B6102605D3000010071721023F03200002008BFFC603A0
+02DE000F001F000001220706171617163332373635342726273217161506070623222726
+3534373601BB42211A01013739395B5D4B427B98C6B68D0193A5846051A72554022A5745
+7B522C2C392E554D4178B3A07C94C84B55234AEFB54EB9000002FFABFE0C03400286000B
+002600000122070615141716333427260110070607062135203736372227262726353437
+3633321716171601EE3F2C18332FC05625012EAC5F5DC0FE93016786A83E762D96287459
+6889594882191101C4392124332F2CB83B19FEF4FECCA0582A56B84C5F940A212262898D
+5767335A8F66000000010082FEF305C0034A003600002506050623222724113437330617
+161716373637363736353427262726272627343736321716172326272627260706151417
+1617161716055666FEA9B1788148FEDB3FB8420102A4613D7E81B1543B7E4272433A4001
+BE5FD0608D1BB80D4228454E3E3C7DF8394D02010CAA49261A68010575718363932D1A06
+0B18215038354A1D0F2E1B333973964A252A3DAD3D21140202272622372A534055594400
+FFFF0082FE0C05C0034A1026057100001007172201F4FE0C000200DC04BA0324069A0003
+000700001335251501352515DC0248FDB8024805AA6E826EFE8E6E826E000000000200DC
+04BA032406FD00260035000001363726272635343736333217161514071633163315222F
+010607062322272635331417163332373637363534262322070615141716020B25152117
+6C451C3F4928370C130E12142F14341A4B555E72380F5A0C2330389F0303092214170B12
+2D140564242A070D395E57341527364F272601016E02053D4E569A2971611A4BEE070715
+18221C090D1C251208000000000200DCFE160324FFF60003000700001335251525352515
+DC0248FDB80248FE166E826E6E6E826E000100DC04BA032405AA0003000013352515DC02
+4804BA6E826E0000000200DC04B9032406FD001E002D0000012627263534373633321716
+1514071E0133152227262706070623353237363736373635342623220706151417160229
+09136C451C3F4928370E11241423201E1C2B45C893988B17560303092214170B122D1405
+BA020A385F57341527364F202D01016E0202033D2A7B6E6D127007071518221C090D1C25
+12080000000100DCFEE80324FFD80003000013352515DC0248FEE86E826E0000000100C8
+04CB033806F4002800000106070623222726353437330615141716373637363533161514
+33323534273316151407060706272602100F2139454F292210610B1913323D0402600359
+470D670C1B2D53471F1B05844C28453F346D6D627D385422191418AA52592436C3AE7339
+49748536590A09211E000000000200EC04E103100706000B001300000134262322061514
+1633323E0114062226343632029658404157574140587A9FE69F9FE605F43F5857404157
+58B3E6A0A0E69F000001009804B9036805C1001300001337161716333237363715060706
+23222726270798A067432A363A296B585A5A4335224C4D44A505367B53150D10294C7D40
+1D16111146800000FFFF014F04BF02A606771007059100D5FF8D0000FFFF014FFE0C02A6
+FFC41007059100D5F8DA0000000200DC04EB0324072F001E002D00000116171615140706
+232227263534372E01233532171617363736331522070607060706151416333237363534
+272601D709136C451C3F4928370E11241423201E1C2B45C893988B17560303092214170B
+122D14062E020A385F57341527364F202D01016E0202033D2A7B6E6D127007071518221C
+090D1C2512080000000100F304EE030D0634000600000103331737330301B6C38B82828B
+C304EE0146C3C3FEBA000000000101B801C2029402BC000300000133152301B8DCDC02BC
+FA00000000010116000002BC0514000900002123102702033312131602BCB425319CC479
+492001A9DC0121016EFEDDFE949B000000010052000003F0051400180000011617161123
+1027020333161716331637363733060702232201A61B1720B425319CC7420352B47B361F
+08B4082963F36F03616A729BFE1601A9DC0121016E9B059802955550796DFEFA0001004C
+000004120514002500000116171611231027020333161716373637363533141716171637
+36353310070623222706070601AB180F20B425319CC42F28142F480806B40E162F3B0F0D
+B427479B852034342E03355759BEFE3901A9DC0121016E727C3E080C4032A6DE19250202
+2C2ACAFECF3B6C3E330C0A00000100AFFFEC03A70520002A000001150607061514171617
+15220706151417161732373637150607062322272635343736372627262726373603237A
+66885C4D4F598770303B4A63587E56497C65659570646B4158482C370102E2700520A811
+34434023393004A44C4072523C4A0117212BC4251C177D70A586804C1820303A3F96803F
+00020087FFEC03C50524000D001C00000022070607061716323736272627031613161510
+070620272611343712026986564E04044729FE294704044E99BF865A5569FE3E69555A87
+0468D4C0AEC773424273C7AEC0019001FEA1EBB3FECB759090750135B3EB016100010055
+000003F2051400110000011013121323020302270623222735163332034E251D62C4551F
+1C02608EB2A7B4A5D20514FEDCFE9FFEEBFE860144014B012A911C32B43200000001003C
+000004100514001200002126030227331213161736371213330203020701CC11629F7EC4
+9A5A300202305A9AC4A578551EF6013A01FEE6FECAFEC5A80B0BA8013B0136FED3FE49FE
+CAFA00000001003C00000410051400120000013316131213230203262706070203233613
+1201CCB41E5578A5C49A5A300202305A9AC47E9F620514FAFECAFE49FED30136013BA80B
+0BA8FEC5FECAE601FE013A0000020064000003F2051E0014002300000122272627263534
+3736333217161716171213230203353427262322070615141716171602BFCE3DAD3A695F
+7B959A5C810D0A12255AC45B2C2C475C4F39383C1B53470255123337657B8F617D5577A6
+8796FECDFEA4019C016E576C3C613736473936181411000000030085000003C705140003
+0007000B00002533152301331523253301230304B4B4FD8FB4B40294A0FD5EA0FAFA0514
+FAFAFAEC00010000FF1F0266028B00110000153637363736353427331615140706070607
+A9706B2F1A1696194C4FA569BD4605716D8F504F60604E6FAAA0A67148060000000100B2
+03FE01D705D5000500000133150323130104D3A4815205D598FEC1013F00000000010057
+00CE0405044C0009000013211B0121051325051357016770700167FEDE6FFEDCFEDC6F02
+F70155FEABD4FEABD3D3015500010082FFEC06EB029D001D000001161514070605042322
+272411343733061514171633322524373635342706DC0F4C80FEC3FEE3B9BF81FEB63FB8
+41CB6897B9010900FF433719029D5A468765AB403A2661010C8A5C5E887D43223936715D
+4B3B3D000002006BFE48059B03D9000F0038000001363534272607060706071417163332
+013237241106232227263534373637363332171617161514070607062526272635343733
+060706171604A829421F2C3428280137282A48FD80F0A2014A3F7A854B620817964E4C63
+396727213C5CF3CEFECED3854D52B75503010C3502192B4D3B331901012A2933502619FD
+0673EA01484B435781342C944524325A7766A0CC8CD5BD9F0101BF6EAEB4D8B99B3C34E5
+000101C904D102370719000300000111331101C96E04D10248FDB8000001007A053201D1
+06EA00180000133726272635343736333217152623220706151417163715057A4E2C1010
+383A5C3E34324042111D5E2178FEA90596121424252D602B2D21642112201A4D1B0A1D66
+4D000000FFFF0082FFEC06EB04991026058E00001007054B0184FDA8FFFF0082FFEC06EB
+041A1026058E00001007172503390384FFFF0082FE0C06EB029D1026058E000010071725
+0339FF06FFFF0082FE9006EB03201026058E00001027172202BC028A1007173202A9FE90
+FFFF0082FFEC06EB03B61026058E00001007172402BC0320FFFF0082FE0C06EB029D1026
+058E00001007172402BCFF06FFFF0082FFEC06EB041A1026058E00001007172602BC0384
+FFFF0082FE0C06EB029D1026058E00001007172602BCFF06FFFF009DFE0C052805AF1026
+055A00001007057C008AFF38FFFF009DFE0C052805AA1026055A000010071725023F0514
+FFFF009DFE0C052803661026055A000010071722028A0019FFFF009DFE0C052803661026
+055A000010071725030700AFFFFF009DFE0C052805AA1026055A00001007172301C2041A
+FFFF009DFE0C052803661026055A00001007172402960096FFFF009DFE0C052803661026
+055A000010071726029600AFFFFF007DFFDA031B05F71026055C00001007054BFFC2FF06
+FFFF007DFE90031B03521026055C0000100717320119FE90FFFF007DFEA2031B03521026
+055C00001007172101A9FEA2FFFF007DFEA2031B05F71027172101A9FEA21026055C0000
+1007054BFFC2FF06FFFF007DFFDA031B04B01026055C00001007172200FA041AFFFF007D
+FED4031B03521026055C000010071722012BFED4FFFF007DFFDA031B05AA1026055C0000
+1007172300FA041AFFFF007DFFDA031B05781026055C00001007172400FA04E2FFFF007D
+FFDA031B05AA1026055C00001007172600FA0514FFFFFFABFE0C03C1052F1027054B00BC
+FE3E1006055E0000FFFFFFABFE0C03C904721027057F00BCFE3E1006055E0000FFFFFFAB
+FE0C040E02261026055E0000100717320258FE0CFFFFFFABFE0C03CA02261026055E0000
+100717210334FE48FFFFFFABFE0C051302261027057F0206F91E1006055E0000FFFFFFAB
+FE0C03CA0226102717210334FE481026055E00001007172100B40028FFFFFFABFE0C0384
+03B61026055E00001007172201F40320FFFFFFABFE0C038404B01026055E000010071723
+01F40320FFFFFFABFE0C038404B01026055E00001007172601F4041AFFFF0082FE0C091A
+03B610260560000010271721055F03201007172105F5FEA2FFFF0082FE0C091A02EE1026
+05600000100717240578FF06FFFF0082FE0C091A04B01026056000001027172304E20320
+100717240578FF06FFFF0082FE0C091302E5102605620000100717220578FEA2FFFF0082
+FE0C091304B010260562000010071723047E0320FFFF0090000006DC0614102605640000
+1007172303840352FFFF0075FE0C04B2064010260566000010071723012C04B000020082
+FFA4079E03D9000F003A0000013635342726070607060714171633321306050421202724
+032637330615141716212037363736370623222726353437363736333217161716070606
+B529421F2C3428280137282A48B36EFEC3FEEFFEE1FED982FEB7010140B841CB5A011801
+41D1D76423143F7A854B620817964E4C5A42602E18010202192B4D3B331901012A293350
+2619FEDAB4463D296401098A5C5E88744C22393B6C264E4B435781342C94452432486636
+89E20000FFFF0082FEA2079E03D9102605BA000010071721036BFEA2FFFF0082FEA2079E
+0514102605BA00001027172105F5047E10071721036BFEA2FFFF0082FFA4079E060E1026
+05BA0000100717230578047EFFFF0082FDA8079E03D9102605BA00001007172402EEFEA2
+FFFF0082FFA4079E060E102605BA00001007172605780578FFFF006BFE48059B05141026
+058F00001007172103CF047EFFFF006BFE48059B060E1026058F0000100717230352047E
+00010082FFA707290614002D000025323736373635342701263534373637011505060706
+1514170116151407060506232227241134373306151417160302B8C29D241036FECA320A
+236402E9FDAD4715061F0113663E35FEF7E3A1C080FEB63FB841CB68585041371A2E4542
+017C3D512321772A0136BAFA1E280B192025FEB67B7B71655655492662010B8A5C5E887E
+4222000000010082FFA708000614002E0000013534373637012101060706171617051615
+14070604232122272411343733061514171633213224363D013427252401C70B11A202B0
+0160FC685F0F090406AE03CAF83E35FE14A1FE0CC080FEB63FB841CB689701F4B8016D2F
+79FC59FE9D036B08053E6261019BFDE837230A23351B9626F87165569E2662010B8A5C5E
+887E4222966A08086A139137FFFF0082FFA707290614102605C200001007173205460384
+FFFF0090FFC905C706141026056B00001007172102EE0546FFFF0090FFC905C706D61026
+056B00001007172302710546FFFF0090FDA805C706141026056B0000100717240258FEA2
+FFFF0082FFA70729072B102605C200001007174503CA0000FFFF0082FFA70729072B1026
+05C800001007173205460384FFFF0082FFA70729073A102605C8000010071722038406A4
+FFFF0082FEA20729072B102605C80000100717220258FEA2FFFF0082FDA80729072B1026
+05C800001007172502D5FEA2FFFF0082FFA707290834102605C8000010071723038406A4
+FFFF0090FEC805C907C41026056C00001007057F02BC0190FFFF0090FEC80518079E1026
+056C000010071721046A0708FFFF0090FEC8057808341026056C00001007172303E806A4
+FFFF0090FCE0051806141026056C0000100717240226FDDAFFFF0093FD76054803B61026
+05D3000010271721023F03201007172102BCFD7600010093FEB5054802EE001D00000114
+070607062322272411343733061514171633323736373635342733160548646EF9615084
+6DFEB82FB831C95D5D4C47C14C2266B8680138ADB2C5441B256A0164EB5190ACED341814
+35DE6260B8DE9C00FFFF0093FEB505480516102605D300001007054B00C8FE25FFFF0093
+FD5D054803B6102605D3000010271721023F0320100717320226FD5DFFFF0093FEB50548
+04B0102605D300001007172301F4032000030090FFBD051B03E5000A0032003F00000134
+232206141716173E01030623222726353437330615141633323637262726353437363332
+17262735161700111407062322131615140F0116333237363426035F5F412D0715442449
+6C966E3965C110B80E7C1B1A382D481D122C2D4307072C51DADD014E284AAF847F06621D
+34317D11073E01ED8758412576331B88FE684F203DAC4A363E2845260921428451484A51
+5301270EB942B5FEEFFEF5673D71023F25279369212E431E5D930000FFFF009DFE0C0528
+04B010271724029600961026055A000010071721023F041AFFFFFFABFE0C034004721027
+057FFFF4FE3E100605700000FFFFFFABFE0C034004D510270577FFA4FDD8100605700000
+FFFFFFABFE0C0340053410270590FFECFE1B100605700000FFFFFFABFE0C034004B01027
+1723012C0320100605700000FFFF0082FEF305C0034A100605710000FFFF0082FEF305C0
+04721026057100001007057FFFF4FE3EFFFF0082FCFE05C0034A10271725028AFDF81006
+05710000FFFF008BFFC603A002DE1006056F0000FFFF01B801C2029402BC100605800000
+FFFF0116000002BC0514100605810000FFFF0052000003F00514100605820000FFFF004C
+00000412051410060583000000010052000003C505250027000001263534373633321715
+26070607061514171637363715062322271617161123102702033316171601C804585C6C
+54585C44381E1F192F30458DC33D8D921B1720B425319CC742031B04140F13783A3D199C
+240201212215341527020211B41A516A729BFE1601A9DC0121016E9B053800000002006A
+FFF503E20524001400280000011633323736353427262322070615141716333237170623
+222726351037123332131611140706232202802D3221131B575A57585A561B0F25322D5A
+2891A02E355FB3AA9FBE5F35329C91015AA14A6B56D7D8E0E0D5DA3C854AA1D0959EB879
+0126C40176FE8ABBFED18BA69E000000000100D000000390051F00200000331237363722
+272635343736333217152623220706151417163332371506070607D0416F44644E2E8662
+708C785857733E3042372C678C60E170863500FFB56F55256D97AE616F1FB4332F41624D
+332929B44998B7E1FFFF003C000004100514100605870000FFFF003C0000041005141006
+05880000FFFF0064000003F2051E10060589000000020087FFE3048F05F0000B00150028
+400B171B091C0F1E031C141B1610FCECF4ECEC3100400A06A01600A00D91128C1610E4F4
+EC10EC3001220211101233321211100224200011100020001110028B9C9D9D9C9D9D9DFE
+6801F60109FEF7FE0AFEF70550FECDFECCFECDFECD0133013301340133A0FE73FE86FE87
+FE73018D0179017A000100E10000045A05D5000A00284009031F051C08001F0A0C10D4EC
+CCFCFC3100400B08A00709A006810400A0022FEC32F4ECD4EC3025152135211133051525
+11043DFCA4014ACA0165FE99AAAAAA052B48B848FB8D0000000100E10000043D05D50009
+001FB7011C0204081C070A10DCEC32D4EC3100B603A009020881062FE432D4EC30011133
+112111231133110375C8FD6CC8C803E701EEFD68FCC305D5FE120000000100E10000043D
+05D50009001FB603071C0905010A10DC32D4EC323100B706A004098103A0012FECF4D4EC
+3029013521112135211133043DFCA40294FD6C0294C8AA01B9AA02C8000100E10000043D
+05D500090020B7051C0107091C030A10DCECD432EC3100B704A008078100A0022FECE4D4
+EC302521152111211133112101A90294FCA40294C8FD6CAAAA030D02C8FC8E00000100E1
+0000043D05D50007001BB50005011C030810DCEC32C43100B60C06A0000481022FE4D4EC
+300121112311331121043DFD6CC8C8029402D6FD2A05D5FDAB000000000100E10000043D
+05D50007001BB6011C07051C030810DCECD4EC3100B506A0020481002FE4D4EC30212311
+2111331121043DC8FD6CC8029402630372FD3800000100D60000044105D500070027B502
+00061C040810DCFCCC393100B401000581032FECDCCC30B607870687010201071004EC05
+EC01150123113311010441FD93FEC902530475C3FC4E05D5FADB03C5000200D600000441
+05D5000200090028B60B0705001C030A10DCFC3CDCCC00B502A0060481092FF4DCECB400
+01070808100705DC043C313025012103331121150123019F01FEFE02C9C902A2FD93FEB0
+031D0208FEA0C3FC4E0000000002009D0000047B05EE000B001E0032400E2045071C1A16
+1E1C0E011C13451F10FCECDCB2400E015DFC39DCECEC3100400903950E1E099516910C2F
+F4ECD43CEC3000141E01323E01342E01220601231126272E01343E0133321E0114060706
+0701395B9CB89D5A5A9DB89C015FC85047728585E48687E4848472454D04BB7060373760
+705F3838FAE6031F0B1E31A7C5A76262A7C5A7311D0C0000000100C10000017905D50003
+0015400A00AF020504020800040410FCFCEC31002FEC3013331123C1B8B805D5FA2B0000
+00020071FFE3042103930007000F002F400A1145051C0D011C09451010F4ECD4B6100D30
+0DA00D035DECEC3100400907A00B1003A00F8C1010F4EC10D4EC30001016203610262000
+10002000100020010DB90106B9B9FEFAFEAB011501860115FEEBFE7A023EFEFAB9B90106
+B9FE0101860115FEEBFE7AFEEB0000000001003D0000032705D90008002B400B00060302
+01031C0708060910DCC432FCC432111239310040090006030304010781042FEC32111739
+3001133301112311013301B2B3C2FEE7B8FEE7C2043601A3FD51FCD6032A02AF0001003D
+0000047F037100060000330133012309013D01A4FA01A4C3FEA2FEA20371FC8F02BDFD43
+000100BA00000481037100070020400A0904071C05041C02040810FCECD4FCEC3100B506
+03A305A0012FECF43C3029011133112111330481FC39B90255B90371FD2202DE000100BA
+0000048103710007002040090904001C050306040810FC3CD4FCEC3100B606A000A304A0
+022FECF4EC3001112135211121350481FC39030EFCF20371FC8F93024B93000000020071
+0000044F05E200150021003E400F2345011D1C11151C06171C040B452210FCC4ECDCB240
+06015DFCDCB24011015DECC4EC3100400C1A95061520950E910005A0022FEC32F4ECD43C
+EC302521152135211126272E01343E01201E01140607060700141E01323E01342E012206
+02BC0187FC3A0187524A728585E4010CE68383734B52FE515B9CB89D5A5A9DB89C939393
+027B0B2031A8C5A96262A9C5A831200B019F70603838607060383800000200BA00000481
+04A60008000C0025400A030600050C040E0B040D10ECDCFCD4CCCC323100B6020306080B
+A0092FECDCDCDCCC30011033152207331523012135210211F2840285F10270FC3903C703
+9C010A669A9EFCF89300000000020071000005E705EE0011001B0032400E1D0308050812
+08060019080D451C10FCECD43CEC32D4FCCC3100400B070905A01B0116A00E91032FF4EC
+D43CEC32CC30011521112311211123112322261036201716033534272622061416330371
+0276B9FE439CF8BCB0B101665E8B9C5D38C66D725E043AC9FC8F02DEFEC4013CD60155E5
+6698FE81C9835D3898C68300000100C10000034405D500090027400A0B05091300061C03
+040A10FCFC3CFC3CCC3100400907A0090106A004AF012FF4EC10DCEC3001112311211521
+1121150179B80283FE3501CB02DFFD2105D593FE2F9200000001003D000002C005D50009
+0027400A0B06071209031301050A10DC3CFC3CFCEC3100400903A0010804A006AF082FF4
+EC10DCEC30012135211121352111230208FE3501CBFE350283B802DF9201D193FA2B0000
+000200BA0000040805D5000A00170025400B191B071C0F17021C15041810FCFC3CD4ECEC
+3100B701A00B168103A0142FECECD4EC3001211121323736353427262732171615140706
+2321113311029CFED0012C52342C2C3D19697F5858586CFDCEB902DEFDB55D4F7A7D495F
+93875FD2AD878505D5FD9C00000100C10000042405D50010003B400A120410061C0C070D
+041110F4DCB25F07015D39FCD4EC004009010C060D00A00E81062FF4EC39113939400701
+1200120C0D0C071005ECEC3130011316171612072334022726270335211501BD9D883442
+0B01B81B354D89C303630541FEEFEAB8E6FEC97199015F96DCDC0139569300000001003D
+0000020C05D500060034B7080302041C00020710D4DCFC1139CC3100400B011200120203
+02020381052FF4CCB21F02015D071004ECECB48D018D00025D30090135013311230154FE
+E90115BAB804DFFEC7F60139FA2B0000000300C1000006EB041A000F00180021002D400D
+23040E1C10161C191F1C01042210FCECD4ECD4FCEC3100400A13A00A1CA0041821A0002F
+EC32D4ECD4EC3033113412333216173E0133321716151103342623220615112101342623
+22061D0121C1F4C67D78352596D3D25E88BAA45A817F01FEFD48A45A6C9401FE01EEA600
+FF4B2D2DD2588068FD26027C8280C595FE6E0163837FA7D2F20000000001003D0000038B
+05D5000B0026400B0D081F0A061C04001F020C10DCFC3CFC3CFCCC3100B6090102060481
+0B2FF4DC3CDC3C300121352111331121152111230188FEB5014BB8014BFEB5B803809401
+C1FE3F94FC8000000001003D0000060805D5001300394010150C1F0A0E1C100806121C00
+041F021410DCFC3CFC3CDC3CFC3CFCCC3100400C01110DA003070B050981130F2F3CF43C
+DC3C3CFC3C3C3021112135211133112111331121152111231121110188FEB5014BB901C3
+B8014CFEB4B8FE3D03819301C1FE3F01C1FE3F93FC7F0381FC7F0000000200BA00000481
+0371000300070021400A0904011C07051C03040810FCECD4FCEC3100B604A000A306A002
+2FECF4EC3001112111171121110481FC39B902550371FC8F037193FDB5024B000002003D
+000004C305D500020006003DB30803060710D4C4C43100B742019506810295052FECF4EC
+304B53584012021104010200110303040211050111060605050710EC10EC0710EC0810EC
+5901210902230103C6FD7401460243FE30E6FE300542FB7E0515FA2B05D50000000300C1
+0000056E05D5000A000E001D0034400F1F1B051C141A001C0F0E0C1C1C041E10FCECDC3C
+FC3CD4ECEC3100400C190BA0011D0AA010810DA01B2FECF4ECDC3CEC3230013332373635
+3427262B01011121190121321716150607062F0111211121036DA85D251F1F1D69A4FE0D
+013B01B084404501445C8CD4FD5401F4037151453D3C645EFD9CFDB5024B02F785907C91
+5B7C0101FD220371000100C10000037D05D5000B0028400C0D04001C0A0208041C06040C
+10FCFC3CDC3CFCEC3100B70503A007090B81012FF4DCCCFCCC3021231121112311331121
+1133037DB8FEB5B9B9014BB80381FEFC029BFEFC01C10000000200700000050A05D5000A
+001B002E400D1D041A1F180B1C0D0107131B1C10FCCCD43CFC3CFCEC3100400A1B0EA000
+1902A017810C2FF4ECD43CEC323001211121220706151417160511231121222726353437
+36332111211501DC0130FED452342C2C3D0227B9FEAB6B7D5858586C0232014C02F7024B
+5D4F7A7D495F93FD9C0264875FD2AD8785FD22930001003D0000038B05D50007001F4009
+09001F021C041F060810DCFCFCFCCC3100B50502A00781032FF4EC323001152111231121
+35038BFEB5B8FEB505D593FABE0542930002003D000004C305D500020006003DB3080304
+0710D4C4C43100B7420195058102A0042FECF4EC304B5358401201110602010011030306
+0111050211040405050710EC10EC0710EC0810EC592509010521013303C6FEBAFEBA0389
+FB7A01D0E6930482FB7E9305D5000000000200710000044F05D5001A0026000001352135
+211116171E01140607060711231126272E01343736373602141E01323E01342E01220602
+04FEB502035845728484724A53B8524A728543456F4AA55B9CB89D5A5A9DB89C044FF393
+FE7B0D1E32A6C6A631200BFE7B01860B1F31A6C653562F1FFEDE705F38385F7060383800
+000100C10000037D05D500070020400A0904031C01051C07040810FCECD4ECEC3100B506
+04A00081022FF4FCCC300111231121112311037DB8FEB5B905D5FA2B0542FEC501CE0000
+000100C10000037D04E600090023400B0B04011C0309051C07040A10FCFC3CDCFCEC3100
+B50800A00604022FD4CCFCCC3001112311211123113311037DB8FEB5B9B903E2FC1E034F
+FEFC029BFEFC0000000200C10000036D05D50003000B002B400C0D040A1C0603011C0408
+040C10FC3CECDC3CFCEC3100400A00A00507A0098102A00B2FECF4ECD4EC300111211125
+21112135211121017A013BFE0C01F4FE0C02ACFD5402DEFDB5024B9301D193FA2B000000
+000200710000044F05D5000B0024003D400F2645071C110C151C2218011C1D452510FCEC
+DCB24018015D3CFC3CDCB24011015DECEC3100400B039518150A950C222381162FECD43C
+ECD43CEC3000141E01323E01342E0122062516171E01140607060711231126272E013437
+363736371133010D5B9CB89D5A5A9DB89C01545845728484724A53B8524A728543456F4A
+52B80322705F38385F70603838CE0D1E32A6C6A631200BFE7B01860B1F31A6C653562F1F
+0B018600000200710000044F05D5001C002800000116171E01140607060711231126272E
+0134373637363735213521152100141E01323E01342E01220602BC5845728484724A53B8
+524A728543456F4A52FEB5034EFEB5FE515B9CB89D5A5A9DB89C04500D1E32A6C6A63120
+0BFE7B01860B1F31A6C653562F1F0BF39393FDE0705F38385F70603838000000000100D9
+0562032F05F600030010B202000410DCCC3100B201A0032FEC3013211521D90256FDAA05
+F69400000001004204E003BE06660013000001030E012322262F0107231333171E013332
+3F0103BEA211453D39511B63B48BF5947405320D2513780666FEBC2220252FAFF50178E0
+0A1C24E2000101A40544027006100003000FB20208002FEC3100B20108032FEC30013315
+2301A4CCCC0610CC000100BF04EE033D066600060037B4040275060710DCEC393100B604
+0502B400B30710F4EC323930004BB009544BB00E545B58BD0007FFC00001000700070040
+38113738590133132327072301B494F58BB4B48B0666FE88F5F500000001005B04EE03A5
+066600060045B30506020710DCCC393100B606000503A0000710DCFCCC113930B703A006
+04A0050605070510EC10EC4009550665067506850604400B290439044904550565050501
+5D005D0121350527330503A5FCB6027BECB6010504EE9402E6E400000001004204E003BE
+066600130000133317163332363F0133132327070E0123222627428B7813250D32057494
+F58BB4631B51393D45110666E2241C0AE0FE88F5AF2F2520220000000001005B04EE03A5
+066600060043B30205010710DCCC393100B601000204A0000710DCFCCC113930B704A001
+03A0020102070510EC10EC40145501650175018501042603360346035A026A0205015D00
+5D133525330725155B0105B6EC027B04EE94E4E6029400000001019AFE870266FF530003
+000FB20208002FEC3100B20308012FEC3005331523019ACCCCADCC00000200D505460327
+0610000300070018B50208000408062FFCDCEC3100B405010807032F3CFC3C3001331523
+25331523025CCBCBFE79CBCB0610CACACA000000000100C8047501BA06140008001CB70A
+0400050307040910FC3CDCDCEC3100B4020308A0062FECDCCC3001102335323723353301
+BAF2840285F10580FEF5679A9E000000000100C8047501BA06140008001CB70A04060305
+08040910FCDCDC3CEC3100B4020307A0052FECDCCC30131033152207331523C8F2840285
+F10509010B679A9E000200640000041703FB00030007001CB60906020800040810DCDCFC
+DCCC3100B501080305A0072FECD4EC30013315230121152101D7CCCCFE8D03B3FC4D03FB
+CCFD6493000300640000041703DE00030007000B002740090D0A0602080400080C10DCDC
+3CFC3CDCCC3100400909A00B0108030508072FECD4ECD4EC300133152315331523012115
+2101D7CCCCCCCCFE8D03B3FC4D0284CCECCC03DE920000000001FFEC000002F700930003
+0012B30205000410C4DCC43100B201A0032FEC302721152114030BFCF5939300000500B0
+FEE60491062700030007001E0027002F0000011133110311331901211121113311161716
+151406071E01151407062711231311363736353427260311363736353426016ECDCDCDFE
+75018B64D1727578748B9B8081F16464783E44443E78984949920489FE76018AFDE7FE21
+01DFFD90051A010DFEF30252549A788E121CB185AF606102FEE605A3FE77042C30646331
+2DFDEBFE21013A3B7A7B740000030082FFEB04DB047B0007000F002A004C400F24082510
+08160E060A02121B14452B10FC3CF43CD43C3CECDCFC4006211F1D031B23111217393100
+400800160487128C242B103CF4ECD4C440090C19088728871DB82B10FCECECD4C4302522
+151433323534032215143332353413142322353421110623223534333217363320190123
+113423220701683F3F41413F3F41B8F9E601272B16E6E6A82C4CBD0196B8E28957F04040
+4040030740404040FCC1CDC9D0017008D8B75151FEBEFCC70339AA8E0002008BFFDD0587
+048C0007002F0040400E311C0F1228062E020A141223453010FCEC3CCCDCCCDCFC3CCC31
+00401319871E1687218C301287250408002A870DB83010FCECCCDCCCDCF410F4ECD4EC30
+01221514333235340322353424332011100D010415142132363332170726232206232035
+342D01363534212207161514016040404043D20176BB0242FE99FEEEFEC4010F89D5A89F
+8A86695576CBABFE3A01D6010ED7FE6B6E4C3F036F40404040FEECE489C4FEABFEEC4E3B
+456A668ED561917FF9EF653A2E9ABA383855D80000030089FFEC04F4048C0007000E0038
+0000011633323726272212323534221D0125343726353437362120171619012311342726
+23200706153633201023222706151417363332151423200169360517304901124B6868FE
+AF2A298593013701218B6FB85E52BFFEFD583B2A3A0104FA39141C1617ABCCCCFE750260
+14121101FE102F272204AD7F80364FD46671B38FFEF7FDBF0241BC8574714C4913FEB60B
+245C392E8DC8B6000002006DFE180351048C001900210036400D0608110D080C0020161C
+00452210FCCCDCCC10D4FCDCFC3100400E1E181A148703B8220D0F8709BD2210FCECCC10
+FCECC4DCC430133436332019011006232226273716333235111023160706272613261706
+371627366DA2DD01659ACDD6740DBD2278AF82030105D8D0D64303024243030103A67175
+FDF4FD8FFEF9F0D08D0AD1F302DF01681521CF010101090141430302424200000002007F
+FFFF0497049A000B00290032400D1012131D09150319231226452A10FCECD4CCD4CCDC3C
+EC3100400B1F870CB82A00251B0617122FD4CCD4C4CC10F4EC3001220615141633323635
+342603201716190107133427142726353433321710050607061D01233534373602B0241C
+2020251B205501257C7BB80165C8D9DAF436FE99E34C11B81E6A02602020251B221E251B
+023A7978FED9FD7E0101298E52A60102B7C06801960604861E864B4BAA3EDC000002008B
+FE200586048C000B00360035400E1F1212242D09330317120C28453710FC3CECCCD4CCD4
+3CFC3C3100400D0635002F8710B8371987268C3710F4EC10F4ECCCD4CC01220615141633
+323635342607343736332011140D0106151421323736333215101307021102212035342D
+0136353421220716070623220160241C2020251B20F5E790BA0242FE99FEADFB010FEF79
+2378979490BE4AFE69FE3A0195014FD7FE6B6E4C49101ABFD2036F2020251B221E251B30
+89794BFEE9FE706A4E6466EF44D7FEFCFE945101630177FEF5F9D87F6943917C383573BD
+00020073FFEF04F40495000B002A003B400E2608250314091D1820080C10452B10FC3CEC
+DCCCCCD4CCDCEC310040102287298C2B1D871C00160612B826BC2B10ECF4CCD4CCD4EC10
+F4EC30013236353426272606151416013437263712051615140706271617163715070615
+1405041901331110252401E6241C211F251B20FEADA5A60101016CDCDD8136025A41908D
+93018B017CB8FDCCFDB303952020241B01012120241CFD988F566DEA012D0101B7C60201
+88BD47340CA1171870A8060601BE023FFDC1FDB401010000000200BAFFE304BC047B0007
+001C0031400B09081C0610020E0814461D10FCECCCDCCCDCEC310040060B8718B8081D10
+3CFCEC4006000E04128C1D10F4C4DCC43025221514333235340511342120151120151423
+2235113424333204151101A5404040021FFEB9FEB50119E6EB011FE4D60129EB40404040
+EB031FC6C6FE50C4C8C8028ECC7676CCFCC7000000020081FFE2048304A1000B002E003C
+400E1012122D1920092203201227452F10FCECCCD4CC10DC3CDCEC31004010002006248C
+2F19872D1D15870E29B8122FF43CEC32DCEC10F4CCD4CC30252206151416333236353426
+013637321901231134232207062322272623220703201514232235111033321716333201
+6C241C2020251B20014C2099F2B8372A3E28807A2A4D233601010119D5FBF29726382224
+F12020251B221E251B03337C01FEA9FCB60330DBAF7169BDE1FE50C4DAD20296015775AB
+00030000FE1404B2047B0007000F002B003F400E2D24082706120217080E2B0A1B2C103C
+CCDCCCFCCCDCCCDCFCCC310040110C190829871D21B82C001005148C26BD2C10ECF4C4DC
+C410FC3CECC4DCC430252215143332353401221514333235341320171623223511062326
+37363736173633201615112311342122070209404040FE99404040AE01170202E4EF211F
+D90101D3A23779C1012D9EB8FEE6B25EF54040404002F640404040FD98DDC3E3021B0702
+D7C701016564D56DFADB0525A38B000000020057FFEF04CB0491000B002C003940102E1D
+122024121909100314120C29452D10FC3CECCCD4CCD4FCDCFCDC3100400D1687278C2D06
+2B0022870E1BB8F43CECCCD4CC10F4EC3001220615141633323635342605343332151407
+06171433323511340504151123113423221511102524111037220140241C2020251B20FE
+F9E6EC908B01B5B601270128B8756AFE91FE92D5D303F82020251B221E251B40D9D5AF8D
+88A8CCB00258FE0101FBFC73038D6768FDA9FEB90101015C011597000002005FFFE304BE
+048C000700220039400D2419081C090D0802140610452310FCCCDCCCFCCCDCECCC310040
+10000E0412B81ABC2317870AA91E088C2310F43CECEC10ECFCC4DCC43001323534232207
+14033533323635112435343736151116373635113311102122270623015740403E02B87A
+5D55FEE8E2EE5D83E3B8FE69B95472D9037340404040FC708F659C016708CCDD0101DBFD
+75A90101B1032FFCD1FEB2737300000000020049FFEF0473047C0007001D0032400C1908
+170610020C131208451E10FCEC3CCCDCCCDCFC3100400D040A000EB818BC1E15871C8C1E
+10F4FC10ECFCC4DCC4300122151433323534013437263736331607060015162120190133
+111025240135404040FED4B6B70101E5ED0101FEEC01014D0167B8FDE1FDF503EE404040
+40FD52DAC426B6C202BC97FED1A8CB012702B4FD4CFE42010100000000020049FFEF0473
+06140007001D0032400C1A08170610020C131208451E10FCEC3CCCDCCCDCFC3100400D04
+0A000EB818971E15871C8C1E10F4FC10ECFCC4DCC4300122151433323534013437263736
+171607060015162120190133111025240135404040FED4B6B70101E5ED0101FEEC01014D
+0167B8FDE1FDF5040440404040FD3CEFC525B7C20101BDADFED2A8CB01270468FB98FE42
+0101000000030059FFEF05CC04E9000B0017004500000122061514163332363534262122
+061514163332363534260126270627222635113617320706051114333235113303143736
+3511243734171617363526273716170607111406041F241C2020251B20FD06241C202025
+1B20024B946667B4A69C01FCD40101FEE9A5A4B801A39BFEE701D3D71B1D0712A81F0501
+C4B203D22020251B221E251B2020251B221E251BFC1D01494B01A39A0262E102EBC705FE
+7684840134FECB8B050582018C08CBEE010198343240372D5D66C56EFE39A599000200BA
+FFE305680614001D0025004140102700081B17081410240D20100808462610FCECCCDCCC
+10DCFCDCFCCC310040081519128702068C2610F43CFC3CCC4008220F1E0BB81C972610EC
+FCC4DCC43001102122270623201901343332151421111433323511331114333235113301
+221514333235340568FEA9946667B4FEBEFDD3FEE8A5A4B8A29BB8FC3E4040400120FEC3
+4A4A013D027CDFEBCCFE5CA4A40140FEBFA6A704F4FDCC404040400000020068FFEF0516
+047D000B002D003F401018081511080E2C0928032C082420452E10FC3CECCCD4CC10D4FC
+D4EC3100401006220026B816BC2E0F130C871A1E8C2E10F43CFC3CC410E4F4CCD4CC3001
+220615141633323635342613323511331114333235113311102122270623201134372635
+3433321514030615140164241C2020251B2041A4B8A29BB8FEA9946667B4FEBE9989E6EC
+E84203D22020251B221E251BFCB3A70134FECBA9AA032FFCD1FEC34A4A013DF0A6259EF8
+DC89FEF14D90A70000020068FFEF05160614000B002D003F401018081511080E2C092803
+2C082420452E10FC3CECCCD4CC10D4FCD4EC3100401006220026B816972E0F130C871A1E
+8C2E10F43CFC3CC410E4F4CCD4CC30012206151416333236353426133235113311143332
+351133111021222706232011343726353433321514030615140164241C2020251B2041A4
+B8A29BB8FEA9946667B4FEBE9989E6ECE84203D22020251B221E251BFCB3A70134FECBA9
+AA04E8FB18FEC34A4A013DF0A6259EF8DC8BFEF34C91A70000010040FFE3051604600017
+002440070608080208001810DCECDCEC3100400A0701BC1804870B0F8C1810F43CFC10FC
+3C300133111021321901331110212027062322353433320732350193B8011AF9B8FE4FFE
+B32933B6C69C9002290460FD2CFEED011302D4FCC5FEBE38389C967B8B00000000020073
+FFEF04F40614000B002A003B400E2608250314091D1820080C10452B10FC3CECDCCCCCD4
+CCDCEC310040102287298C2B1D871C00160612B826972B10ECF4CCD4CCD4EC10F4EC3001
+323635342627260615141601343726371205161514070627161716371507061514050419
+01331110252401E6241C211F251B20FEADA5A60101016CDCDD8136025A41908D93018B01
+7CB8FDCCFDB303952020241B01012120241CFD988F566DEA012D0101B7C6020188BD4734
+0CA1171870A8060601BE03DAFC26FDB4010100000002008BFFEF0512048C000B002C0037
+400C1D120C09271912031023452D10FC3CCCECD4CCD4FC310040102B871F8C2E0600250E
+871B178712B82E10F4FCD4FCD4DCCC10F4EC300122061514163332363534260534212011
+102120170726232015142120111021202726353433321514071633200163241C2020241C
+2002BDFE80FDD402360162E675F8E5FE8C0192021AFDC4FEAB8755D3E0164BB701160158
+2020241C2020241C10E801380124DC7BBB8C9FFE8FFE9B6E457BCBD24E1425000002004F
+FFEF04AA048C000B003000404010322C121E1A120C09122512032616453110FC3CCCECD4
+CCDCECD4ECDC310040110E8725180010061C87142F8C3121872AB8F4EC10F43CECCCD4CC
+D4CCEC302522061514163332363534260526272607160706272635102120131637363511
+10212007060727363736050419011425260134251B2020241C20010B2CAB440CE30202CF
+F90129013C57254476FEA2FEF3271A02B706114701A10226FEBEDEF8211F241C2020241B
+1EF303015401B7D60101EB0189FEB0910102AE01A80118724A63146F3CF90101FE89FDD4
+FA01010000020073FFE50476047B00070021003A40072112080212452210FCC4D4EC4006
+06160C081C2310DCECDCC431004009210014041A870F8C2210F4ECCCDCCCCC40051F870A
+B82210FCFC30012215143332353401122120190110212024353433321514071633203511
+342120070154404040FEF82901CD01F4FE22FF00FEDBE5DD45198F011EFECCFED9180154
+4040404001CE0159FED7FDB8FEDB9D8FD2D73D4908D801C4CCD500000003004FFFEF0581
+056F000B0035003D000025220615141633323635342625110621243736212017363D0126
+273716170607111425262726272607160706272637122120131637360120273421201514
+0134251B2020241C20029646FEEBFDDE0202021E018E72400A5CA0740401D6FEBEDE2B2C
+AB440CE30202CFFA01010128013C57254476FEA5017401FE8DFE89F8211F241C2020241B
+3D01990E01FCE99A361C0254625AAB6495A6FDC3FA0101E9F303015401B7D60101EB0189
+FEB091010202D1456D4D64000003007FFFE8061904990006000D00390000002215063332
+37242215063332370124111037263736171607060706131625243511062B012637361732
+1736171619012311340706070607131001A88001413F0101E08001413F01FEF9FE1CA3C2
+0101E5EE0201758A0C07011C0100141D02E60101D3A2357297FDB8525836262401040440
+404040404040FC2401012D010AD32F99D70101D48B758AFEEA9F0101B501B20906EEC901
+63640102FEC0FCA9035783010137271CFDD6FEB300030073FFE30476047B000700200028
+003C400E21120E081F06180225120A14452910FC3CECC4DCC4DCFCEC31004006041C8711
+8C2910F4ECCC400A001627870823870CB82910FCECDCECDCCC3001221514333235343720
+111021201901142122243534333215140716332035110613342120151421200154404040
+EDFDF2021501EEFDFED2FED1DDED3D414001355355FEBBFEB801480145014740404040CB
+01340135FED0FD91F982AAD6D9472923AF011F3501369B9BA00000000002008BFFEF0578
+04D8000B0034003E400D1A27120E0931231203122D453510FC3CCCECD4CCD4FC3C310040
+130C87298C3606002F1087251D8718218714B83610F4ECDCECD4FCD4DCC410F4EC300122
+061514163332363534260120113425243534213217163332131702232227262322151405
+0411102120272635343332151407160168241C2020251B2001240197FE7BFDDD01A1CB61
+6A6A6840944DF3A7714B9DCD01790229FDABFEC7876DE1D75F9C018B2020251B221E251B
+FEF90100BD3145E6FC596C010430FE9478505E623852FEC2FE73755F7CDEDA5D461C0000
+000200CBFEAD05F004A1000300270000002214320327010027260F010627241312213332
+0706272635343722111433323F0136171615140103418080F181025301323B398AC292A0
+FE6801020168CDD40101D3D404A4DA4E55D77E9CF5FEB1040D80FB2086022B011E3B396A
+9671010101900190CED60101D01421FEFEE642A6610305A6A9FEC800FFFF006FFFE504B6
+04801027063F050FFD751007063F050FFAC900000002FB60051CFFA7070B0013001B002B
+400B0D0B0F0900120F140918052FCCDCCCDCFC111239393100400816071A02110D12022F
+FCCC10CCDCCC300302212026373617320706071633242734273716053407221506171659
+02FDC7FEB6C30101E5F20401232141015B01568AA8FCDE4238013F3C061DFEFFA86BD901
+D850240401552E468A8F4D3F013E3D01010000000002007B000003C9047B00100018002B
+4009030804150B110F451910FCCCDCCCDCEC3100400B130D001709078700B80419103CFC
+ECDCCC10DCCC3001201901231110232207321514232235101314333235342322021201B7
+B8FF6E3DDAE5E1A63B433E40047BFE6AFD1B02CB011956C1C7C701AEFE52373737000000
+FFFFFC9A000003C9067210260656000010060640000000000001FB4004ECFF6A07690011
+001FB7001206020B0E12092FECD4DCD4EC3100B51007020C030B2F3CCC32D4CC30011421
+152011102120111021352037342120FBFE0125FE1D02260204FE3F010102FEBAFE980625
+BB7E013F013EFEC2FEC17EBBC50000000001FB4004EC0000076900140024400900120602
+0E11120C092FCCECD4DCD4EC3100B613070C020F030E2F3CCC3232D4CC30011421152011
+102120111407331521352037362120FBFE0125FE1D022602043ED4FDA901020101FEB9FE
+980625BB7E013F013EFEC2774A7E7EBBC50000000002FB4004ECFF6A076900110015002A
+400A0012061402120C0E12092FECDCC4DCC4DCEC31004009100715A013020C030B2F3CCC
+32DCFCDCCC3001142115201110212011102135203734212005152335FBFE0125FE1D0226
+0204FE3F010102FEBAFE9801DFEE0625BB7E013F013EFEC2FEC17EBBC54EDCDC0002FB40
+04EC0000076900140018002E400B0012061802160E11120C092FCCECD4C4DCC4D4EC3100
+400A130715A0170C020F030E2F3CCC3232DCFCDCCC300114211520111021201114073315
+2135203736212005152335FBFE0125FE1D022602043ED4FDA901020101FEB9FE9801DFEE
+0625BB7E013F013EFEC2774A7E7EBBC554DCDC000002FCFEFD33FEB6FFB2000400150000
+04221433360336353427062322353433321716151407FDEE8241415C90052844B3AA654E
+5BCCBC8101FECF6F5B1110249EBA4E5B8B75D6000002FCA7FD8EFEC8FFAF0007001D0025
+40081B190612020E150A2FCCD4CCDCCCDCCC31004007040C00101A08172FCCCCDCC4DCC4
+30052215143332353413223534372635343332151406151433323511331114FD1E161715
+72F33E4A75756D829E84B216161517FE4092733E0A5B79753F7B4542580146FEBAC30000
+0002FB60051CFFA7070B0014001B00000316072736353625220716070607062726373621
+20003407221714335901A88A5601FEA541212E0A15D9E501017B78011A0239FCE13C3F01
+38060A5F8F8A462E5501044457B00101D9545F60FEAE7E013F3D00000002FB1CFDC7000D
+FFB10007001A00234005061102180D2FCCC4DCC43100400A168708000F040B87131B10DC
+FCC4DCC43CFC30013235342322151405220223161514232235102132123332371706FBDC
+30302B02C9DAACB85CC4B8014CDEDE605DA686BFFE4E302F2E316901332072BFA70143FE
+D0C672F000020081FE1404F405B9000B0032000005323635342623220615141601111021
+201135102132151423222715142120190134003534333204323717022322242322140001
+F2241C2020251B2002B1FE01FDFD016DD9D98E2D01510147FD58F97501095E7C8074BE49
+FEF3544B02B63F2020241C2020241C02B3FD60FE4001117F012CC8D1736B96014502727D
+0133D8D1FDC454FEFBF9AEFE990000000002007AFFE30298047B00150021002A40091900
+1F0B100807462210FCFCCCC4DCC43100400B0E8709B8221C1416048C2210F4CCDCCC10FC
+FC302506070623221901343332170726232215113E013332073236373426232206150616
+028E0143439BF2E8CC6A465088480B4F51B2B5241B01211F251B0121A27027280146026E
+E44A762D4FFD21335DEF2020241C2020241C0000FFFF007AFFE304C8047B1026064B0000
+1007064B023000000002FFD3FFF60330072C000B00280000012206151416333236353426
+012607061317161511332007060723221901342F012635343332170107024E241C202025
+1B20FEA4732024CB8C651701030101D302FB908B71C9987A016D8501122020251B221E25
+1B0518901A1DFEF9B483B5FE1DE7CF0101380232AEBAB49179A69CFE2C7600000002005C
+FFE303EB0723001A00220036400803121007120C452310FCECDCEC400721161D1308000C
+10DCECDCDCCC3100400B05870E98231B141F188C2310F4C4DCC410FCFC30013424353425
+261514170726351021201114041511241514232235372215143332353401C20169FED8F3
+A078DC01AB01E4FE8F0119E2EFEF40404003E7B8DC58BA0101B834A07CEC600150FEB0A4
+D9B3FDF70AE5DCDD3F40404040000000000200BCFFEA03900716000B0022000001220615
+14163332363534260135262737161F0121170615112407062322190134372302AE241C20
+20251B20FE640274A6840404012E3BE0011A0101D5FB9CEF01062020251B221E251B03C8
+889DC45FF87095BDAC98FE890AF1D00138023E997500000000020093FE2504980474002F
+003B00000134232207062322272623221D01240706072326113510333217163332373633
+3219011007062120272635371605041101220615141633323635342603E0223343327F7A
+374A2C22011A0101D302FBB6852F494E5C3D3082B64257FE96FEA1544FBD1501330148FD
+A9241C2020251B200358745C44445C745D0AF1CF01030135F601023C5C5543FEFEFCAAFE
+F766887770760ACA0809016702482020251B221E251B00000001FD1204F1FDC606560003
+000E400502000208002FFC31002FCC3001331123FD12B4B40656FE9B0002FB7F04E0FFA3
+07200007001B002740081B080F021506110C2FD4CCDCCCCCDCCC31004008000F04131B0D
+180C2FDC3CCCDCC4DCC4300116273607221706251402290135363506373417161D011407
+203635FC192B02012A2B010103B5D7FE84FE5590B7019D914701B1F3066D012B2B02292C
+7DE5FEDD852E70079D88010183B75C288DFA00000001FB3E04C8002E06F3003400000122
+111021321637363736333215140716373637330607062123353635342322070627262726
+232215143B01263534331607060706FC2EF00125327E2A26494848DC9D84424F05990267
+28FEE2C5D04C1842435D69253E1792653E2E606802023E3304C801140117820101413FD7
+7E3D040D1068825C24856B62383A3B01012D4690A1025F5A016B6632290000000001FC4E
+04E0FE8C071E000B00214007070508A900020B2F3CCCFC3CDC31004007040205A9090B08
+2F3CCCFC3CDC30013533353315331523152335FC4ED88ED8D88E05B88ED8D88ED8D80000
+FFFFFB1C0517000D0701100706490000075000000002FC9A04F6FE3E06720007000F0017
+40040C0408002FCCDCCC310040040E020A062FCCDCCC3001343332151423223714333235
+342322FC9AD4D0D4D0844C54505005BEB4B4C8C84848480000020087FFE3048F0460000D
+001D0000012207061514171620373635342627201716151407062120272611343736028B
+8F5E4C3A4E016258319D9D011988636F8CFEF7FEED80716F9203C08468B3BD60819957AE
+A3FCA0C492E9FD8EB3A5940105E695C400020063FF6704A8049B00030026000000143234
+033736113427262322070607061736373615142726272635343736052017161510050701
+B6800AF2D27048BC92676301012F3570D8E48649B48D75010B011181A6FECEF602168080
+FDEA877501CB7F704845436C655C670202E2D4020155D4DC9A8973017597C8FDCFA88700
+00020063FF79045C05B10003002400000032342203323706232635343332111407062320
+272635103F012435171001070611141716032B808072D0250F33DDE0ED5D66DCFECD81A6
+CFD3011FB8FE94D97C7048014680FE50B61303C6D8FEE4F0666F7597C80154A2A5E0E901
+FEC7FEE5A961FEFB7F70480000010016FFED058A06A4002F000025321901342724353433
+321716333237170223222726232215140516151110252427062322353433320732351133
+11100311E2B6FEB6EFA1335D4C2F7C8074BE6B5A3184410151BDFE66FEDC2833B6C69C90
+0229B8830144016ABE5297C6E63A6AC454FEFB68384B4FC870C6FE74FE24020236389C96
+7B8B0291FDD6FEED00020063FF5704CE05B1000300250000003234220124050427263510
+3F012435171001070611141716333217262726333207060716170321808001ADFEE2FEF1
+FEBE728ACFD3011FB8FE94D97C5439EF6C63D90202D4EC0C0B7E78A2019880FD3F4C0101
+768FA70154A2A5E0E901FEC7FEE5A961FEFB6D593C18C5D0E4D8C905C74B000000030063
+FF5704CE05B10003002D0032000000323422051237263526333207363517140706070607
+061114171633321726272633320706071617152405042726121433323403218080FD4202
+E59101E4FB0F9CB8B37D62248F7C5439EF6C63D90202D4EC0C0B7E78A2FEE2FEF1FEBE72
+8AF83D43019880CB0168A128AAE7ADADA201BDEBA40C3F6658FEF26D593C18C5D0E4D8C9
+05C74B9D4C0101768F03C8747400000000020059FFEF05F4067F00340040000001140627
+262706272226351134333207060511143332351133031437363511102724353433320432
+371702232224232215140516110122061514163332363534260507B2A5946667B4A69CFD
+D40101FEE9A5A4B801A39BD9FEACFA7501095E7C8075BD49FEF2534C015CDFFC3E241C20
+20251B20012CA5990101494B01A39A0262DFEBC705FE7684840134FECB8B050582016A01
+45619AD8D1FCC354FEFBF95738D28BFEBE011A2020251B221E251B0000030082FE1404DB
+047B0005000B002600002522143332340322143332341314232235342111062322353433
+3217363320190123113423220701683F3F41413F3F41B8F9E601272B16E6E6A82C4CBD01
+96B8E28957F0808003078080FCC1CDC9D0017008D8B75151FEBEFADB0525AA8E00040096
+FE5205700474000B0011004D005500000122061514163332363534260032353422150506
+232637363736372511342322070623222726232215112407060723261901103332171633
+3237363332190137170715361716151407060706270613010617163736370189241C2020
+251B2002E56E6EFEB476708602012B2D95011A223244327F7A374A2C22011A0101D302FB
+B68430494E5C3D3082B68E4AD82512952E333FAD357876FE84270F18AA8151019C202025
+1B221E251BFD9E393333B968016B2F2F3377E102B1745C44445C74FEDF0AF1CF01030135
+01BA01023C5C5543FEFEFDC87254ADAB08010894462D3201036247013BFED01F15228262
+2C00000000020069FFF704F70491001C0020000001241B01141716351133111405043511
+342322151120151423223511101232342201C5016D01017E8DB8FEC0FEC5B6A50118D3FD
+AC8080049101FEB9FDA96503036A038DFC73FB0101FE0258B0A4FE5CCCEBDF027C0139FC
+078000000003007FFFE8079304990006000D004900000022150633323724221506333237
+051116333635113311102522270625353235113407060706071312252411103726373617
+16070607061316252435110623302326373617321736171601A88001413F0101E0800141
+3F0102910B5463B8FEE9622A40FED6DB52583626240101FE48FE1CA3C20101E5EE020175
+8A0C07011C0100141D02E60101D3A2357297FD0404404040404040406DFD6F3604A0034A
+FCB6FEBD012C2F03B8CC01E183010137271CFDD6FEB30101012D010AD32F99D70101D48B
+758AFEEA9F0101B501B20906EEC90163640102000004007FFFE807C904990006000D004C
+005800000022150633323724221506333237051116333235113311102122270627263736
+333217113407060706071312252411103726373617160706070613162524351106233023
+26373617321736171603323635342627260615141601A88001413F0101E08001413F0102
+911A6678B8FED48524389FD90505C4242B52622C13370101FE48FE1CA3C20101E5EE0201
+758A0C07011C0100141D02E60101D3A2357297FDF4241C211F251B200404404040404040
+406DFDD3949E034AFCB6FEBE63650203C6C10801E3931114241033FDD6FEB30101012D01
+0AD32F99D70101D48B758AFEEA9F0101B501B20906EEC90163640102FBEA2020241B0101
+2120241C00010078FFE10686069F00190000011000212000111001213521152104111000
+25360011342737160686FE3BFEB7FEB1FE4F01DCFE74054AFD75FDAF01340111FA015353
+9B760310FE96FE3B01F8015801C20104A8A9E7FE22FEF2FE5D0101017C010C85BF4BC500
+0001006EFFFF05A2069F0015000005110623220035103721041514163332371133112115
+03C1BC96E2FEE1BE010FFEF1CC719EBAB4012D0102C14A014CDF0107F7F7F8BDDD580331
+FA02A2000001006FFED1053206B300170000011121113626232206151417072635263633
+321615112111047EFE8D01706F837E64909101FEB7BDDF0173FED1012E05038D86787367
+647BB28FAEE0EFB0FB8CFE310002006EFFE2063F069F000B001C00000110002322001110
+0033320037100025040011102535213521152115040582FEA2CDD1FEA60149E6EB013CBD
+FE50FECCFED3FE400297FDD00506FDD1029302DE010B013DFEC2FEF7FEFDFEA60160FDFE
+B8FE49020101B40149023D9C3FA9A93CA5000000000100640000046A06B3001300002111
+10262322061514170726113400333200190103B6CE8294B18A79CE0110F2E40120045901
+04B7AB91D3858DBF011DB00134FED4FED3FBA60000010050000105B606B3001900000111
+21112311342623220615141707263534363332161D0121110502FEA8B5925F6B8B588492
+FDB5BAEE020C020801F5FC040523896769924D6B7C90A0AAF4E8AC83FD6C00000002003C
+FFE1058F069F000A001900000121111E01333E0111342601020023220019012135211121
+2000033EFEFE019EB383C0E1019F02FEE7E6EFFEEAFEB302010101010A014603FDFE2BFB
+AC01D4010CFAA1FE57FEDFFEAE0102013503E7A0FDFEFEDE00020079FFE1071406B30008
+00170000251123200011100021011121112104001310002901112111045980FEA2FEBA01
+46015E028AFEACFED6FE65FE2E0101C801A4012A0205810594FE7AFEC0FEE5FE4D016A02
+11FBE50201E1018E018301E2FDE9FD4F0001003C0001031E06FD00070000251121113315
+2111026BFDD1B3022F0105B90143A4F9A8000000000200780000047D069F000B001B0000
+0111342623220711141633361311062326001901331136333200151103CAB49C95BAB09F
+74DCC391F5FEF7B4DE6CF50112020601B57DDF39FE5E9DE401FE44016F55020144010303
+3CFECB4EFEB7EEFC7F0000000002003CFFE1064606A0000B001C00000110262322071110
+16173E0101060019012111231121113633200010000588E4828D99B68E77CFFEC1EBFEED
+FEA6B302C0A48D01050114FEC302380109BB3DFE80FEFAB50202A4FEB9010131013003BF
+FDEB02B5FDC03CFEBFFD9CFEEA00000000020078FFE20697069F000A001F000001220615
+1E01333236351101112111100225220011100033211121352111211102AB82F202BB87B5
+9A0217FE9EF4FEEEC7FEC60135FE011FFD4C0369021803FCC1FEDBE0DFDC01BFFC1903E7
+FE41FEECFEB801012D012A0127013D0158AAFDFEFB7800000001008200010487069F0019
+0000251134262322071123113436332115212606171536333200151103CABD9AB18CB4E5
+F101BFFE15847402A7AAFC0104010277E2A261FC660509CCC9AA0158A5AD50FED2FEFD91
+00020064FEA9067206B3000B002100000110002322001110003320001333102120030720
+001110002120001110000716333605B4FEADFBEFFEAB015FE60103014A0AB4FEBEFED419
+81FEBBFE3F01CB0138013901D2FEE8BE01958C03620113019FFE69FEE5FECAFE5601C9FD
+B5FEA901470E021B0165016A01E7FE18FE96FEEDFE3454F00300000000010032FFE205BD
+06B3001300000116002322003511213521111416333E0135113305BD01FEE6E4E1FED8FE
+7B0239CB898DBEB301FFE0FEC3013DEA040B9FFB52ADD701D5AE04AE0001005000010487
+06A0001600002511062322003534372335211506031E0133323711331103D4A2ADF2FEF0
+A5D801D8E80101B29391BEB30102CA56012DE79FD8A09376FEE6B9AF560334F962000000
+0001006EFFE206D306A0001900002511211110002322003510371706151E013332363511
+331121110621FE49FEE6DCE3FEDDBC737202C780AE94B40269830379FE38FED2FEDC012F
+D3011C8F7175C59AC8DFD3046CFDFBFBE800000000010082FFE2048906A0001300000102
+00232000351133111E01333E013534273716048902FED0BFFEF4FEF6B301C2A081B1975F
+F6022AFEF5FEC3016AEB0469FB94C5EE01DDDBD18E90C10000020082FFFF048806B30008
+00150000013626232111213E013714002901112115211121200003CA02DB9CFEE001209D
+D9BDFED1FEFCFEE002C2FC8B01D301000133048BBECBFD0101B6BFDAFEC4FE2BA106B4FE
+C100000000020064FE8B067206B3000B0021000001100023220011100033320013102135
+32372627062120001110002120001110031605B4FEB0F8FAFEB00161E7F50155BEFE6DE6
+02027DD8FEFCFEB3FE4501C20149013D01C6C9C90361011301A0FE5DFEF1FED3FE4D01B8
+FDA8FEA99EBC7638B102220160015F01F0FE12FE9CFEC8FED88000000003006400010689
+06AC0008001100220000012311333212372602252306021514003B010110002123112311
+23040010002901200004376262B4DC0102D4FE3665B3EE00FFA2650361FEB1FEFD62AD65
+FEFCFEA5015E010101740104014E0617FC340120CAD2010F0102FEF1D0CEFEE301EBFECB
+FEB4FE4C01B401014E02680142FEC4000001005A0001057006A0000F0000011121112311
+2111331121113311211104B4FE88B3FDD1BD0172B3023402660151FC4A03B501D9FED002
+41FDC1FE0500000000010083FFE1048806B3001100000523113426072206151123112600
+333200170488B4BF8B8ACBB2010128E1E50117011F04ACACDC01DBACFB5404A8E90141FE
+B8D800000001006E0001047506A000110000251106232202351133110616333237113311
+03C1D290FCF5B40296A0B8B3B40102C24D0112DB023DFDC5B19E550335F9610000010078
+FFE1047E06A0001F00000114020526243D01331514163332363D0106232202351133111E
+013332371133047EF4FEEAD1FED5BDB6878ECBB6A9F6FEB401A7A6A4ADB301CEB8FECD02
+02F0E0242190A4A5A7FB530139B90238FDC897BB580332000001008200010487069F0011
+000025113626232207112311331136333204190103D40199CF87B0B4B3AE9CD9012F0102
+AB93BD30FC35069EFDCD30FFFED8FD8C00010079FFE1061D06B300190000053506232400
+11020021041707262320001110002516371133110567F6A3FE75FE360101DF01770105F6
+66DBC0FEFCFE7201800114A0FDB601617F010207016E018701D502A5B0B8FE91FEB2FED1
+FE5802019E01F7FCE900000000020078FFE2067B06A0000A001D00000122021514163332
+3635110111211110002320001110002133113311211102C7C7CAC79B88A0020AFEABFEF5
+CFFEFBFEE201470108F9B5020603FCFEF49EDAF6C7D701DCFC1703E9FE24FEDAFEE80150
+0120010F013B0204FDFCFB7700020082FFFF0488069F000800190000013426232111213E
+01371406232115211123352111231121321603CA705DFE3901C7507EBDD2B9FE39021BB3
+FE98B4027BB9D20512816DFE14027F80AAF7FFFE7BE7FE2806A0E20000010064FFE20498
+06B300200000011400232000353306123332363534252411341233321215233626232206
+1714000498FEEBE4FEF4FED1BF01CDACA49AFE5DFE60FED4E2EEBA01AA79808A02034401
+D1D3FEE40165FCB5FEF4A99AC8AAAA011FA00113FEE1D1C68B9676CEFEA2000000010082
+FFFF0488069F0013000001100023222711211521113311163332361901330488FEDEF0A5
+9B02CCFC80B48DBE84CFB404D2FECCFED817FE1EAC06A0FC8D16A0010601E3000002003C
+00010590069F0002000D00000121090123030123090123352101047AFD9E011301AED7EB
+FE6BDC021AFE7BFF0554FDEF05F6FDF8FCCE01F6FD4F035F0296A9FC9C0000000001003C
+FFE2064706A00015000001160023200035112111231121111E01333236351133064702FE
+D5D0FEFFFEF3FEB0B402B702B3A881C3B3020CF3FEC9015AD003F4FE890217FB5E8BF1D1
+AB029E00000100820001048806A000110000013534262B0111231133112132161D013315
+030F5884FDB4B40100BDD7BE02379F9B8BFC05069FFDFCBDA762A0000001006FFFE20514
+06B300210000011000232200112637170615141633323635120035343633321615232623
+220716000514FE98F4F3FEAA01B78981E6A8D3C702FCFAC37D91C3C201917D0202030002
+35FEE7FEC6013A0123E6C383899FE4D7E7CC011C014CF6819F9F8E8E7DB8FEC50001003C
+0001044206A00011000025112326023D012335211506163B01113311038FEED6D1BE0176
+0D5A9FF1B3010274010105B4149F6D66F9038AF9610000000001006E0001045206A00015
+0000011004071123112624190133111E013B013E013511330452FEC24CBB5BFEBCB401A3
+61835E95B50487FED9E101FD83027D01E501230219FDE5C7A901A4CB021B000000030050
+FFE1059806B3000A00150033000001232206071416333236350134262322061715333236
+370E012B0111211521150E01072E013534363B0111213521353E01333216029CC2458502
+7F485077023D7858636101B36878BF01DEC0B3015AFEA602D694B0DAD5B5C2FE82017E02
+B8A1BEE202395D7E7D5F6860040D6459875AB579649FD3FEE797EF9CCB0202C7B293E101
+1995B5BEC2BC000000010064FFE203AC04BD001100000110212011373307103332112600
+3533160003ACFE5BFE5D26B022F2EF01FE7ABB01017E01AAFE3801D2CFCFFEBA013CD401
+6BD4A4FE9600000000020064FFE303C006B30012001A0000011021201110253736272635
+331417160F0104031027061110213203C0FE59FE4B018B132F9393B781823013013EB4F6
+FE0101F30221FDC2023C02084143A7696A8E418885B4497BFE3201B71514FE48FE500000
+0002005AFE1E044C046900180024000025140023220035102536373423221F0107271021
+2003140704033426270602151416333236044CFEFFF3E8FEEA01D2AB01B39C0206A00F01
+45015302A9017DB491A7A9AAB79184BF2AD7FECB0136D601A68D778293863128570108FE
+E47F82A9FE8795F61D1CFEFF89AED4D500020064FE2806130461001F0027000001022120
+113437262322111005041723262506072736372411102132173621200310232011102132
+061301FE5EFE4E1C5775F60165022B05C70BFE6896747A6B9CFE9E0185B36F6600FF01A3
+B4EFFEF5010BEF0250FDE302288E42A4FEADFE0BC1CAD49E6303A26C712FFD01E301ECAC
+B1FDF9017AFE87FE6200000000010064FE1D039804600017000005102120113733071033
+32190110232215172327102120110398FE74FE5821AC19F4E2E1C837AC31016E018B3FFE
+5C01A6E1E3FEE8011603130102F4E2DC0186FE6F00010064FE1D03AC0460002200000510
+21201137330710211611353427233533363534232215172327102120111407161503ACFE
+6FFE4925AE200104DDAAA681C8EBC816B0170179019FD3DA3DFE5A01A0E5E5FEEC02011A
+86D81A985CD9CFBFA59B0154FEA2D28568FE000000030029FFE3039D06B4000F0017001F
+00000110212011103726131025041106070403100726111033320336232217021736039D
+FE5CFE5AC1EC01015B01460178014CB4F2F1F3EEBC01ABB10101AFAE020DFDD6022A0171
+6171010E01451111FEACB17444FE2701A50101FE5CFE6104C9FADCFEE501010000020064
+FFE3060404600016001E0000131021321736332011020323001112232207161502212001
+102322111033326401A4F5687E92018F02E5E0011302E8656F171CFE73FE600294F2EEEC
+F4020B0255BCB7FDECFEC0FEE601150140018EBA4ABDFDD4022801CAFE36FE6400010064
+000003C00460000F00000110032312111020111013230211102003C08FB792FE0C91B88D
+035C0244FEF4FEC9012001230190FE6DFEE0FEDF0138010F021900000001005AFE1D03A5
+0456001C000005122120113733071021161135342B013533243534273316151407041103
+A502FE6DFE4632AA280109DAE8B4670129B6E979EF01033EFE5B0198EFE6FEEB02011B9D
+FE9446C0B3ACA8B7CF615BFEF300000000010064FE280820046A00300000010603231235
+102322030723271023221107232710232211100504132326250407273637241110213217
+36333217363320082001C7D7ECDBD8020B970CCAC50A960ADEDB030801B243AF31FE43FE
+B0846D82E6FDC5018FD55C60BCCD585ECE018F02AAECFEF40104F4012BFEF9E1E1010CFE
+F4E1E10107FEA3FE3EE066FEB8E7541E98806F27E501D501E3CBD5D9CF00000000020064
+FFE203AC06B30014001D0000011021201110211617113423221D01233510212011032627
+20111021321103ACFE6FFE4901BA7F65D0D9B70190017AAA4496FEF00107E301BCFE2602
+3F02210B31014ED3C82F2F0154FEA0FE2D2C0AFE6AFE4E015900000000020082FFE103CA
+06A9001000190000011021201901102901152122151136372003102306071110333203CA
+FE52FE66014E01A2FE30768B920181B4FB7B74EDFD0219FDC801F1037B015C928EFE6E40
+0BFDD7019D0A3BFE6BFE910000010064FFFF05E50460001C000001120123001102232211
+1523351023221102012300111021321736332005E501FEEDD1012F01D2E7A5E7D3010138
+D1FEE60188E15761DC01850256FED2FED801160140017EFEA7D2D20159FE82FECEFEDB01
+240133020AE3E30000010064FFE203AC06A9001C0000011021201137330710333211102B
+01353332373424353314041514071603ACFE5BFE5D12B210EFF1C7AE81C21CFEAFC1012D
+B4E10201FDE101D9C8C6FEB10193016D96AB9F99C264C8A8AF48940000010064FE1D03AB
+0469001800000512212003373307103332190105161510053520273625352503AB01FE63
+FE570214B414F2F7FE64E3FE3901290101FED7032A40FE5D01A29494FEEA011903F74F87
+72FEDC02A496754776B2000000010064000005FA06A90023000001100123001102232211
+152335122322111001230011101312251504011537321736332005FAFEE2E5014F02E4DE
+A701DCE80150EEFEEAFEFE01A8FE76FEC4B6D95B60DC0192024BFEDBFEDB010801420189
+FE9EC3C30162FE77FEBEFEF7012B0120018D0149014840A717FE51294DFDFD0000010082
+FFE203CA069E00130000011021201901331110213211360235373307141203CAFE66FE52
+AA0104E601C806B61BDA01E3FDFF021004ACFB54FE7C0175A901107FAAA45DFECC000000
+0002005AFE1D04E20570000C001900001310250333030411100021200013021233321211
+1025132313045A020517B21701FFFEC5FEFBFEF8FEC0B401DCB8ADE6FEAF17B116FEAF01
+3A02C85F010FFEED5CFD32FEC1FE2901D2014BFED2FE9D015B0136023092FD81027E9000
+0001000AFE1D03B60492002000000510212011373307102132190126232215032303342B
+012737173332173633201103B6FE6EFE4719B2170105E802877B0A8F0A9C526D1457508F
+4F43A0013040FE5D01A3E3E3FEE901170367B68CFEA5015B7828A132BBBBFEC700020064
+FE1D062104600032003A00001310212017363320031407161D0106042120243D01343616
+1D0114163332363D01342B013533323627102322071E0115102120011023221110333264
+01A101035D78BC018901FBDF01FED8FEEAFEE2FEE8636499D6EBA0B7501B53B903D49F61
+0A0AFE5DFE590296F5EDEDF5026501FBC6C1FE52FAA36A985CB4E1BC771D1F43441E1D34
+739A6F58A797B59B0137AE3C5C22FE1701E50171FE91FEA600010064FE1D0398069F0019
+000005102120113733071033321901262722151723271021161711330398FE77FE5521B6
+23F7DF67ADA432B12A013EA77CAA3FFE5C01A4E1E1FEE8011803BE4B0BC9F6CE017C0A50
+0299000000010064FE2905E6045F00250000053637001110213217363320111407231235
+0223221107232710232211100504152334272607011050B3FE51018CD8605BCA0199A8C9
+C002E0DB039E05E0DA0202016EB3E6BFC2B33C350129019501E3E7E7FE35D9FA0103D001
+41FEE9C4C40117FEA7FE29E1AAF1A7712BAD000000010064FE1D03AC044E001B00000510
+212011373307103332190106072011343733061510333637113303ACFE67FE5112B816FD
+ED7C80FE7AAFCFCBD3916BAA42FE5F01A09693FEE9011901763F0A01ADDCD6E0D2FEDE0B
+3E028A000002003CFFE203A206B3001E00280000011021201110211617113423221D0114
+06263D01362307353332173633201103112E0127221110333203A2FE83FE3501A2877AA4
+80474E017E8B865A5852A40138AA367A48F2FEEC01A9FE390221023F0A2C01998C965635
+272735588034CAB8B8FEEEFBE40206111505FE4DFE6B000000010082000003CA06B3001B
+000001373423221511363320111003231211102322071123111021201507025A16A0A494
+740196ADD3CBEF8476AA014E01411105259874CFFE9947FE34FEDBFEB00153011E014439
+FC8305530160F5990001005AFE1D04380441002000000114071611022120113510133302
+111510212011022B0135333227362627331E01041AC7E501FE14FE0F74BB7B013E014002
+D7ADA6C70202D70ABA0AC402ABA76057FECCFE04031EA30128013BFECCFEC698FD6E016C
+013D87CE578DB6849500000000020064FFE303AB069F000A001300000112212011102136
+17113303112623221110333203AB01FE5BFE5D01A35C9FA9A98478EEEFFB01F7FDEC0234
+022B014702A3FB2E01A742FE61FE580000020083FFE203E806B3001E0027000013022132
+17363B0115272217151406263D0134232215113633201110212011171033201110232607
+83010139A452585A858A7E014E47809F7F7D01A2FE2BFE8DAAE20108F27F7905A10112B8
+B8CA34805835272834569696FE6047FDD5FDCB01F924FEB701A9019F013E000000010064
+FE1D03C5069E002500000133112115211516001510212003373307103332133400033523
+2215143B0115230411102133020AA80113FEED02010CFE5EFE5B0120AF1BF2EE01FF0003
+56BE9A2F2FFED4015551069EFDA4824BFAFE11CEFE5F01A1E5EFFEF50118A6020C01024B
+B7A68601012B013B00020082FFE203CA069E000A00130000011021201901331136332003
+102322071110333203CAFE62FE56AA897F0196B4EF609BFEEC0228FDBA022F048DFD833F
+FDC801AC3BFE4CFE8900000000010014FE1E038E04930023000001072503041706042335
+323635262F011325370537363534262B01353332171615140F01038E51FEE88F01090101
+FEB3EEA0E601C073D6FE8851016656133F4C4544914F52235C01D580B0FED278B5BCD096
+737098324501A0BA8CC29A22252D34872E2D8C55419C000000010064FFE203AC06B30027
+000001102120113733071033321134272335333235362B01353332373424353314041514
+07161514071603ACFE61FE5728B428EFF171A3A3650267A3A25A02FE82A70181A3B7B1BD
+0181FE6101B39494FED9010BDC02829C8085926D95A5568AB7A03D458891487100010078
+FFE203C006B300270000011021201901331110333211342B0135333235362B0135333237
+342635331416171407161514071603C0FE5BFE5DAAF3F777B7B76F0271B7B66402FCBAEF
+04ADB7B1BC0181FE6101EF04B8FB48FE9D010BE378978F7BBF6D51C18859A2B33E459287
+4871000000020064FEE003AA046000110019000017323724111021201112051633152627
+060713101736111023228D9746FEFA01A601A002FEED5291E1919EDF8BF2ECEEF05473B2
+015F0230FDD0FEA2B373CC49D1CF4B0353FE9D7A79016401A100000000010064FE1D03AC
+045F001D0000051021201137330712333211351007233533243D01051523112510050411
+03ACFE59FE5F1FBB2701F2EFDDB56F0123FE42AE031FFEDA01263DFE5A01A4E2DDFEE301
+1FA4011E02835AF47913F401751FFDD33F80FEF400010064FE1D03AB06B3002500000510
+2120113733071033321135342B0135332411062324111021152015143732371112050415
+03ABFE5FFE5A20B420F2ECF29D43014D5C8EFE5701A9FF00FDC4DD01FEE4011B41FE5E01
+A8DEE2FEDD0121D1FD8A1101B529020187017684F2FC01B0FEE5FE805477FC0000030064
+FFE2041F06B30017001F0027000001151021201110252111212011102120111533152311
+33150521221514333235011433213534232203ADFE59FE5E019F010AFEF6FE6101A601A3
+727272FEE9FEFBEBF6FAFE10EB0105FAF60236EEFE9A0166017701011301770169FE97EF
+88FEED8A01E6E2ED03EEEDEFDD00000000020064FE1D06390460001B0024000001122122
+271510213532351110232211102115241110213217363320031023221115103732063902
+FE598860FE5EF8F8F20104FE4801A6E75D59ED01A7B5F7E3E8F20227FDBB88C7FE7A8CF8
+029301A1FE53FE658A0302220238ECECFDC701AEFEC5E7FEB90100000001005AFE1D0410
+0460001F0000051021201110252435342322071723271021201314050415102120113427
+33160410FE14FE36013701369FBF02059C0A0162014F02FECBFECA011A013460BE5619FE
+3601CA0139BCBD8DAFAA3C2F0142FECFDEB9B8F0FEB9014C81989E0000010064FE1D03AC
+044E001B00001333111617321134273316151021222711103332112733171021201164AA
+6C90D3DFD9B9FE7A827AFBEF1DB41DFE5FFE59044DFD6C3E010122B5FDD7DBFE532BFEAE
+FEE1011B8D90FE5C01A7000000020050FE1D044204680018002400001334123320121510
+0506071433322F0137171021201334372413141233321235342623220650F5FD0108F8FE
+048301B39C0206A00FFEBBFEAD0295FE99B493A8C28E98B28DB40248E3013DFEBEDEFE46
+6577829386312857FEF8011C7E83AA016480FEF601097FBADCDD000000010064FF6303AC
+0461001B00000535342726232207273637241110252011072337102322111005161702E9
+3B3B5F8343834388FECE01AF01990BC31AE2FE01428D7C9D01034D4B904F6D30C1018401
+BF02FE54CBC70124FEBCFEA9972C9D000003006EFFEC032703E000030007000B00001333
+152305331523053315236ECDCD01F2C7C7FE0ECACA03E0BDCABAF8BB00020064035C0228
+06B3000F001700000132031007221901343B011521221D011734232207143332014ADF01
+E4E0C6FBFEEC41EA7B6E01747605B2FEDCFECF0101320163C2604CA9D0B7BDC300020010
+0003056805D800020006003D400C42009506810195050803060710D4C4C431002FECF4EC
+304B53584012011104060502110304030111050011060506050710EC10EC0710EC0810EC
+5909022501230101230199019C0110FDC7E5FDC6052EFB9C0464AAFA2B05D500FFFF0010
+00000568084B1027029C00C00145120606B80000FFFF00100000056805D5120603290000
+FFFF001000000568074F1027171E04C00174120606B80000000200C9000005B005D50002
+00060040B7021C05001C03040710FCECD4EC3100B542000104AF032FEC3939304B535840
+12021105040601110306030211050011040504040710ED10ED0710ED1008ED5901110901
+110115017303A3FBB304E704C2FC4E01DAFD1605D5FD87E4FFFF00C9000005B0074F1027
+171E04290174120606BA0000FFFF00C9000005B0074E1027171604290175120606BA0000
+FFFF00C9000005B005D5102706DA01650000120606BA0000000200770000055E05D50002
+0006003FB6021C03011C040710DCECD4EC3100B542000206AF032FEC3939304B53584012
+011105060402110304030111050011060506040710ED10ED0710ED1008ED590902130135
+0104B4FC5D03A3AAFB1904E704C2FE28FE26FEF00278E40279000000FFFF00770000055E
+074F1027171E05310174120606BE0000FFFF00C90003069D05D8102706B6013500001006
+06DA0000FFFF00100003063605D8102706DA04A10000100606B60000FFFF00C90000069D
+05D5102606DA0000100706B801350000FFFF00100000063605D5102706DA04A100001006
+06B80000FFFF00C90000069D074F102706B901350000100606DA0000FFFF001000000636
+074F102606B90000100706DA04A10000FFFF00C90000074505D5102706BA019500001006
+06DA0000FFFF00C90000074505D5102706DA05B00000100606BA0000FFFF00C900000745
+074F102706BB01950000100606DA0000FFFF00C900000745074F102606BB0000100706DA
+05B00000FFFF00C9000005B0074F1027171E06C90030120606BB0000FFFF00C9000006F3
+05D5102706BE01950000100606DA0000FFFF00770000074505D5102606BE0000100706DA
+05B00000FFFF00C9000006F3074F102706BF01950000100606DA0000FFFF007700000745
+074F102606BF0000100706DA05B00000FFFF00770000055E074F1027171E033F00301206
+06BF0000000100C90509019505D50003000013331523C9CCCC05D5CC00020089029C03E7
+05DF000200060000010321050133010238F601EEFD5901679001670560FDAA6E0343FCBD
+0001005E02DA02E505B700030000130117015E02196EFDE7033702805DFD80000001005E
+02DA02E505B7000300000107013702E56EFDE76E03375D02805D000000010089033002AD
+05640011000001140622263511331114163332363534353302AD9FE69F7A574140587A04
+4373A0A0730121FEDF415758402BF60000010089032102AD055500110000011123343534
+26232206151123113436321602AD7A584041577A9FE69F0442FEDFF62B40585741FEDF01
+2173A0A000010089033002B5055500100000012135213236353426232135213216140601
+A3FEE6011A40585840FEE6011A739F9F03307B58403F587B9FE6A00000020089033002AD
+0555000B0013000001342623220615141633323E01140622263436320233584041575741
+40587A9FE69F9FE604433F585740415758B3E6A0A0E69F0000020048029D033E05DE0003
+0007000009011701250117010199011E87FEE3FE27011D87FEE302CE031031FCF0310310
+31FCF00000020089029C02A505DF00030007001FB709035D00075D040810DCECDCECC431
+00B60304F70105910810F43CEC32300111331121113311021590FDE490029C0343FCBD03
+43FCBD00000100C9027E0195034B0003000013331523C9CCCC034BCD00010089040602AD
+0481000300000121352102ADFDDC022404067B0000010089033102AD0556000B00000115
+2335233533353315331501D87AD5D57AD50406D5D57BD5D57B00000000010089033102AD
+058700070000011123112335211501D87AD50224050CFE2501DB7B7BFFFF00100003083A
+05D8102706D305550000100606B60000FFFF0010000006C705D5102706D303E200001006
+06B80000FFFF00C90000072205D5102706D3043D0000100606BA0000FFFF007700000871
+05D5102706D3058C0000100606BE0000FFFF00100000056805D5120600390000FFFF0010
+00000568084B1027029C00C00145120606E40000FFFF00100000056805D5120603300000
+FFFF001000000568074F1027171E04C00174120606E40000000100770000055E05D50006
+003AB5011C0403000710DC3CD4EC3100B34203AF062FEC304B5358401201110304050011
+0606050111040211030304040710ED10ED0710ED1008ED593709013501150177044DFBB3
+04E7FB19B602340230BBFD87E4FD8800FFFF00770000055E074F1027171E042901741206
+06E60000FFFF00770000055E074E1027171604290175120606E60000FFFF00770000055E
+05D5102706DA00B60000120606E60000000100770000055E05D50006003AB50500061C03
+0710DCECCC323100B34204AF012FEC304B53584012061104030200110101020611030511
+040403040710ED10ED0710ED1008ED5925150135011501055EFB1904E7FBB3B6B60278E4
+0279BBFDD0000000FFFF00770000055E074F1027171E05310174120606EA0000FFFF00C9
+0000069D05D5102706E201350000100606DA0000FFFF00100000063605D5122600390000
+100706DA04A10000FFFF00C90000069D05D5102706E401350000100606DA0000FFFF0010
+0000063605D5102606E40000100706DA04A10000FFFF00C90000069D074F102706E50135
+0000100606DA0000FFFF001000000636074F102606E50000100706DA04A10000FFFF00C9
+000006F305D5102706E601950000100606DA0000FFFF00770000074505D5102606E60000
+100706DA05B00000FFFF00C9000006F3074F102706E701950000100606DA0000FFFF0077
+00000745074F102606E70000100706DA05B00000FFFF00C9000006F305D5102706EA0195
+0000100606DA0000FFFF00770000074505D5102606EA0000100706DA05B00000FFFF00C9
+000006F3074F102706EB01950000100606DA0000FFFF007700000745074F102606EB0000
+100706DA05B00000FFFF00770000055E074E1027171605310175120606EA000000010089
+029B03A005DF0006003CB4010500030710DCCC32393100B54201F704910710F4E4304B53
+584012067D040302007D010102067D03057D040403040710ED10ED0710ED1008ED590115
+013501150103A0FCE90317FD60030E73016280016273FED100010089029C011905DF0003
+0014B3025D000410DCEC3100B403F701910410F4EC30131133118990029C0343FCBD0000
+FFFF00B2FFE3052905D5120600380000FFFF00B200000529084B1027029C00F001451206
+06FF0000000100B20000052905F20011002A40090A1C0838111C00411210FC4BB0105458
+B90000FFC03859ECFCEC3100B50D95049109002F3CF4EC30331110002120001901231134
+262322061511B20121011B011A0121CBAEC2C3AE03A40124012AFED6FEDCFC5C038BF0D3
+D3F0FC75FFFF00B200000529074F1027171E04E70174120606FF0000000100770000055E
+05D50011001CB604190D3200091210DC3CF4EC3100B6079509810195102FECF4EC303721
+200011100029013521200011100029017701BE0135011FFEE1FECBFE42019F01B20196FE
+68FE50FE61A60118012E012C0117A6FE97FE80FE7EFE9600FFFF00770000055E074F1027
+171E04C70174120607010000FFFF00770000055E074E1027171604C70175120607010000
+FFFF00770000055E05D5102706DA00B60000120607010000000100790000056005D50011
+001DB70009320E1905101210FCECF43C3100B60B9508811195022FECF4EC302515212000
+111000290115212000111000210560FE61FE50FE68019601B2019FFE42FECBFEE1011F01
+35A6A6016A018201800169A6FEE9FED4FED2FEE8FFFF007900000560074F1027171E0522
+0174120607050000FFFF00C9FFE306AC05D5102606DA0000100706FD01830000FFFF00B2
+FFE306A505D5102706DA05100000100606FD0000FFFF00C9000006AC05F2102706FF0183
+0000100606DA0000FFFF00B2000006A505F2102606FF0000100706DA05100000FFFF00C9
+000006AC074F1027070001830000100606DA0000FFFF00B2000006A5074F102607000000
+100706DA05100000FFFF00C9000006F305D51027070101950000100606DA0000FFFF0077
+000006BD05D5102706DA05280000100607010000FFFF00C9000006F3074F102707020195
+0000100606DA0000FFFF0077000006BD074F102607020000100706DA05280000FFFF00C9
+0000071D05D51027070501BD0000100606DA0000FFFF0079000006BD05D5102706DA0528
+0000100607050000FFFF00C90000071D074F1027070601BD0000100606DA0000FFFF0079
+000006BD074F102607060000100706DA05280000FFFF00F00000071D05D51027070501BD
+000010061772000000010089029C030805DF0011001FB509000E7E051210DCECCC323100
+400911DD01F70BDD08911210F4ECF4EC3001152320243534242133152322061514163303
+086EFEF0FEFF010001116E81CD99BEA8030A6ECBD7D7CA6E93A0B97BFFFF00B2FFE30695
+05DF102706FC057C0000100606FD0000FFFF00B20000069505F2102706FC057C00001006
+06FF0000FFFF00770000067D05DF102706FC05640000100607010000FFFF0079000006AF
+05DF102706FC05960000100607050000000200460000043E05F2000B0019002540090C09
+1C17031911101A10FCECDCEC323100400906950C0E00951491182FF4ECDC39EE30012206
+151416333236353426130607222435342433320415112302427AADC85F80B2CCCC80B2EB
+FEEF0123D9EC0110CA0552A497A894A993A497FD334901F0ECFAE1F0ECFBEA00FFFF00C9
+000004C1084B1027029C00C001451206071D0000000200C9000004C105F2000B00190025
+40090919150D031C0F041A10FCEC32DCEC3100400906950C18009512910E2FF4ECDC39EE
+30012206151416333236353426011123113424333204151404232602C566CCB2805FC8AD
+FE54CA0110ECD90123FEEFEBB2055297A493A994A897A4FD33FD7B0416ECF0E1FAECF001
+FFFF00C9000004C1074F1027171E04C001741206071D000000020046FFE3043E05D5000B
+0019002840090C031C0F091915101A10FCECDCEC323100400B06950C180095128C0E911A
+10ECF4EED439EC3025323635342623220615141601113311140423222435342433160242
+66CCB2805FC8AD01ACCAFEF0ECD9FEDD0111EBB28397A493A994A897A402CD0285FBEAEC
+F0E1FAECF0010000FFFF0046FFE3043E074F1027171E05D301741206071F0000FFFF0046
+FFE304FC074E1027171605D301751206071F0000000200C9FFE304C105D5000B00190028
+400903191119091C17041A10FCEC32DCEC3100400B06950C0E0095148C18911A10ECF4EE
+D439EC30253236353426232206151416033637320415140423222435113302C57AADC85F
+80B2CCCC80B2EB0111FEDDD9ECFEF0CA83A497A894A993A49702CD4901F0ECFAE1F0EC04
+16000000FFFF00C9FFE304C1074F1027171E03350174120607220000FFFF00C900000618
+05F21027071B01DA0000100606DA0000FFFF0046000005B305F2102706DA041E00001006
+071B0000FFFF00C90000063F05F21027071D017E0000100606DA0000FFFF00C900000611
+05F2102706DA047C00001006071D0000FFFF00C90000063F074F102606DA00001007071E
+017E0000FFFF00C900000611074F1026071E0000100706DA047C0000FFFF00C9FFE30618
+05D51027071F01DA0000100606DA0000FFFF0046FFE305B305D51026071F0000100706DA
+041E0000FFFF00C9FFE30618074F1027072001DA0000100606DA0000FFFF0046FFE305B3
+074F102607200000100706DA041E0000FFFF00C9FFE3063F05D510270722017E00001006
+06DA0000FFFF00C9FFE3061105D5102607220000100706DA047C0000FFFF00C9FFE3063F
+074F10270723017E0000100606DA0000FFFF00C9FFE30611074F102607230000100706DA
+047C0000FFFF00F0FFE3063F05D510261772000010070722017E000000020089028B0309
+05DF000B00190024B7037E1109195D181A10DCEC32D4EC3100400A06DD0E00DD14F71891
+1A10F4F4FCD4EC30013236353426232206151416033633321615140623222635113301C9
+58505E4A5C546161515F94ACB78995AB9002F9564654485547514B017D2986848C7E8684
+024A000000020038028B02B805DF000B001A000001323635342623220615141601301133
+111406232226353436333201784F61545C4A5E50010890AB9589B7AC945F02F94B514755
+48544656017D0169FDB684867E8C8486FFFF00460000059105F2102706FC047800001006
+071B0000FFFF00C9000005C305F2102706FC04AA00001006071D0000FFFF0046FFE30591
+05DF102706FC047800001006071F0000FFFF00C9FFE305C305DF102706FC04AA00001006
+07220000000100460000043E05F2000F001BB60A1C07001C011010DCECDCEC3100B5000D
+950491082FF4ECCC30012334243332041511231134262322060110CA0123D9EC0110CACC
+6680B20417FAE1F0ECFBEA0417A497A9FFFF00C9000004C1084B1027029C00C001451206
+073B0000000100C9000004C105F2000F001CB7001C0F061C09041010FCECDCEC3100B50F
+03950C91082FF4ECCC300134262322061511231134243332041503F7B28066CCCA0110EC
+D90123041792A997A4FBE90416ECF0E1FA000000FFFF00C9000004C1074F1027171E04C0
+01741206073B000000010046FFE3043E05D5000F001EB6061C09001C0F1010DCECDCEC31
+00B70003950C8C07911010E4F4EECC30011416333236351133111404232224350110B280
+66CCCAFEF0ECD9FEDD01BE92A997A40417FBEAECF0E1FA00FFFF0046FFE3043E074F1027
+171E05D301741206073D0000FFFF0046FFE304FC074E1027171605D301751206073D0000
+000100C9FFE304C105D5000F001FB7001C010A1C07041010FCECDCEC3100B7000D95048C
+08911010E4F4EECC300133140423222435113311141633323603F7CAFEDDD9ECFEF0CACC
+6680B201BEFAE1F0EC0416FBE9A497A9FFFF00C9FFE304C1074F1027171E033501741006
+07400000FFFF00C90000061805F21027073901DA0000100606DA0000FFFF0046000005B3
+05F2102607390000100706DA041E0000FFFF00C90000063F05F21027073B017E00001006
+06DA0000FFFF00C90000061105F21026073B0000100706DA047C0000FFFF00C90000063F
+074F1027073C017E0000100606DA0000FFFF00C900000611074F1026073C0000100706DA
+047C0000FFFF00C9FFE3061805D51027073D01DA0000100606DA0000FFFF0046FFE305B3
+05D51026073D0000100706DA041E0000FFFF00C9FFE30618074F1027073E01DA00001006
+06DA0000FFFF0046FFE305B3074F1026073E0000100706DA041E0000FFFF00C9FFE3063F
+05D510270740017E0000100606DA0000FFFF00C9FFE3061105D5102607400000100706DA
+047C0000FFFF00C9FFE3063F074F10270741017E0000100606DA0000FFFF00C9FFE30611
+074F102607410000100706DA047C0000FFFF00F0FFE3063F05D510261772000010070740
+017E000000010089028B030905DF000F001EB6005D010A5D071010DCECD4EC3100B7000D
+DD04F708911010F4F4FCCC3001331406232226351133111416333236027990B78995AB90
+614F5C5403958C7E8684024AFDB6504D4C00000000010089028B030905DF000F00000114
+16333236351133111406232226350119545C4F6190AB9589B70395514C4D50024AFDB684
+867E8C00000100770000041805D500050017B5021C003A030610DCFCEC3100B403950481
+012FF4EC302123112135210418CAFD2903A1052BAA000000FFFF00C90000046A084B1027
+029C00A90145120607550000000100C90000046A05D500050018400C0495018100041C02
+3A00040610FCECEC31002FF4EC30331121152111C903A1FD2905D5AAFAD50000FFFF00C9
+0000046A074F1027171E04A90174120607550000000100770000041805D500050017B504
+1C013A030610DCFCEC3100B403950081022FE4EC300111213521110418FC5F02D705D5FA
+2BAA052BFFFF007700000419074F1027171E05B30174120607570000FFFF0077000004DC
+074E1027171605B30175120607570000FFFF00C90000046A05D51206002F0000FFFF00C9
+0000046A074F1027171E033501741206075A0000FFFF00C90000053505D5102606DA0000
+10070753011D0000FFFF0077000005AF05D5102706DA041A0000100607530000FFFF00C9
+000005ED05D5102606DA00001007075501830000FFFF00C9000005A505D5102706DA0410
+0000100607550000FFFF00C9000005ED074F1027075601830000100606DA0000FFFF00C9
+000005A5074F102607560000100706DA04100000FFFF00C90000053505D510270757011D
+0000100606DA0000FFFF0077000005AF05D5102607570000100706DA041A0000FFFF00C9
+00000536074F10270758011D0000100606DA0000FFFF0077000005AF074F102607580000
+100706DA041A0000FFFF00C9000005ED05D51027075A01830000100606DA0000FFFF00C9
+000005A505D51026075A0000100706DA04100000FFFF00C9000005ED074F1027075B0183
+0000100606DA0000FFFF00C9000005A5074F1026075B0000100706DA04100000FFFF00F0
+000005ED05D51026177200001007075A0183000000010089029C02A505DF00050019B401
+005D030610DCECCC3100B600DD02F704910610F4F4EC300121152111330119018CFDE490
+030A6E034300000000010089029C03A005DF0011001FB509000E7E051210DCECCC323100
+400911DD01F70BDD08911210F4ECF4EC3001152120243534242901152122061514163303
+A0FEFAFEF0FEFF010001110106FEE7CD99BEA8030A6ECBD7D7CA6E93A0B97B0000010089
+029C02A505DF00050000011133112135021590FDE4030A02D5FCBD6E00020077FFE3068A
+037D000B0019002840090319171509190F191A10DCD4ECD439EC3100400A0695128C1A17
+00950C1A10D4EC3210F4EE30012206151416333236353426273204151404232224353437
+2135048D9C8BC85F5FC8988FFA0103FEEFECEBFEEF4CFD9A02D3A66EA89494A88391AAE1
+DDECF0F0ECAA6AAAFFFF0046FFE30659060A1027029C0069FF0412060770000000020046
+FFE30659037D000B00190029400A09190F1103190D17101A10FCC4ECD439EC3100400A06
+95148C1A0F00950C1A10D4EC3210F4EE3001220615141633323635342627211521161514
+0423222435342402438F99C8605EC88B9B0416FD994DFEEFEBECFEEF010302D39183A894
+94A86EA6AAAA6AAAECF0F0ECDDE10000FFFF000BFFE3061E05171027171E0469FF3C1206
+0770C500000200770000068A039A000B00190022400909190F110319170D1A10DCD4ECD4
+39EC3100B6069513000F950C2FEC32D4EC30253236353426232206151416172135212635
+3424333204151404048D8F98C85F5FC88B9CFBEA02664C0111EBEC0111FEFDAA9183A894
+94A86EA6AAAA6AAAECF0F0ECDDE10000FFFF00770000068A05171027171E06AAFF3C1206
+07720000FFFF00770000068A05151027171606AAFF3C1206077200000002004600000659
+039A000B00190023400A031917150919180F101A10FCC4ECD439EC3100B6069512001895
+0C2FEC32D4EC30253236353426232206151416172224353424333204151407211502439B
+8BC85E60C8998FFAFEFD0111ECEB01114D0267AAA66EA89494A88391AAE1DDECF0F0ECAA
+6AAA0000FFFF00460000065905171027171E0454FF3C120607750000FFFF00C9FFE30848
+037D1027076E01BE0000100606DA0000FFFF0077FFE307D0037D102706DA063B00001006
+076E0000FFFF00C900000833039A1027077501DA0000100606DA0000FFFF004600000659
+039A102706DA04790000120607750000FFFF00C90000083305171027077601DA00001006
+06DA0000FFFF0046000006590517122607760000100706DA04790000FFFF004600000659
+0515102717160454FF3C1206077500000002008903DF045C05E4000B0018000001323635
+34262322061514161722263534362016151407211501C96A3E5F494563495F9DA3AC0128
+AC300183044D4A42534B465843496E7E7C84878784513B6E00010089028B032E05DF0011
+000001222635113311141633323635113311140601DCA8AB906162616190AB028B868402
+4AFDB6504D4D50024AFDB684860000000002008903DF045C05E4000B0019000001323635
+34262322061514161730213521263534362016151406031C5F496345495F3E6AFD6D0183
+30AC0128ACA3044D494358464B53424A6E6E3B51848787847C7E0000000100770000068A
+039A000F001AB50003190C081010DCD4ECCC3100B506950900950F2FECD4EC3025323635
+342623213521320415140423048D62C5988FFBEA0416FA0103FEEFECA592A58391AAE1DD
+ECF00000FFFF004600000659060A1027029C00A4FF041206078300000001004600000659
+039A000F001BB6000D190804101010FCC4ECCC3100B50A95070095012FECD4EC30251522
+243534243321152122061514160243ECFEEF0103FA0416FBEA8F99C6A5A5F0ECDDE1AA91
+83A59200FFFF00460000065905171027171E04A4FF3C120607830000000100770000068A
+039A000F001AB5000D1904091010DCD4ECCC3100B50095010A95072FECD4EC3001353204
+151404232135213236353426048DEC0111FEFDFAFBEA04168F98C502F5A5F0ECDDE1AA91
+83A59200FFFF00770000068A05171027171E06AAFF3C120607850000FFFF00770000068A
+05151027171606AAFF3C1206078500000001004600000659039A000F001BB6000319080C
+101010FCC4ECCC3100B500950F0695092FECD4EC30012206151416332115212224353424
+33024362C6998F0416FBEAFAFEFD0111EC02F592A58391AAE1DDECF0FFFF004600000659
+05171027171E04A4FF3C120607880000FFFF00C900000848039A1027078101BE00001006
+06DA0000FFFF0077000007D0039A102607810000100706DA063B0000FFFF00C900000833
+039A1027078301DA0000100606DA0000FFFF0046000007C6039A102607830000100706DA
+06310000FFFF00C90000083305171027078401DA0000100606DA0000FFFF0046000007C6
+0517102607840000100706DA06310000FFFF00C900000848039A1027078501BE00001006
+06DA0000FFFF0077000007D0039A102607850000100706DA063B0000FFFF00C900000848
+05171027078601BE0000100606DA0000FFFF0077000007D00517102607860000100706DA
+063B0000FFFF00C900000833039A1027078801DA0000100606DA0000FFFF0046000007C6
+039A102607880000100706DA06310000FFFF00C90000083305171027078901DA00001006
+06DA0000FFFF0046000007C60517102607890000100706DA063100000001008903DF045C
+05E4000F00000122061514163321152122263534363301DC526950590292FD6E9EA3ACA7
+0576445A48436E7E837D8700000100770000055E05D5000C0000251501352D013501150D
+011505055EFB19036AFC9604E7FC1403ECFC14B6B60132E4D4D5E40132BBE9ECB8E90000
+000100460000040A05D5000C001CB7071C043F001C0B0D10DCECFCEC3100B50395070B81
+062FF4D4EC300110002133112311240011353301100154014363CAFEFAFE0CCA05A8FE99
+FEBDFD02025803016F019D6EFFFF00C900000532084B1027029C022001451206079C0000
+000100C90000048D05D5000C001E4009011C023F061C08040D10FCECFCEC3100B50A9506
+0181082FF4D4EC300135331510000511231133200003C3CAFE0CFEFACA630143015405A8
+2D6EFE63FE9103FDA802FE0143000000FFFF00C90000048D074F1027171E062001741206
+079C0000000100460000040A05D5000C001CB7061C093F001C030D10DCECFCEC3100B50A
+95060781022FE4D4EC30251523351000251133112320000110CA01F40106CA63FEBDFEAC
+2D2D6E019D016F030258FD02FEBD0000FFFF00460000040A074F1027171E05A301741206
+079E0000FFFF0046000004CC074E1027171605A301751206079E0000000100C90000048D
+05D5000C001E4009001C0A3F061C05040D10FCECFCEC3100B503950705810B2FE4D4EC30
+2510002123113311040011152303C3FEACFEBD63CA010601F4CA2D0167014302FEFDA803
+FE91FE636E000000FFFF00C90000048D074F1027171E03330174120607A10000FFFF00C9
+000005E405D51027079A01DA0000100606DA0000FFFF00460000059105D5102706DA03FC
+00001006079A0000FFFF00C90000061005D51027079C01830000100606DA0000FFFF00C9
+000005B405D5102706DA041F00001006079C0000FFFF00C900000610074F1027079D0183
+0000100606DA0000FFFF00C9000005B4074F1026079D0000100706DA041F0000FFFF00C9
+000005E405D51027079E01DA0000100606DA0000FFFF00460000059105D51026079E0000
+100706DA03FC0000FFFF00C9000005E4074F1027079F01DA0000100606DA0000FFFF0046
+00000591074F1026079F0000100706DA03FC0000FFFF00C90000061005D5102707A10183
+0000100606DA0000FFFF00C9000005B405D5102607A10000100706DA041F0000FFFF00C9
+00000610074F102707A201830000100606DA0000FFFF00C9000005B4074F102607A20000
+100706DA041F0000FFFF00F00000061005D5102617720000100707A10183000000010089
+029C02E805DF000C001EB60C5D0B075D040D10DCECD4EC3100B707DD040CF705910D10F4
+F4DCEC300134262B011133111E011D01230258B8CF4890E3EC9002C6C79C01B6FEB915E5
+AC56000000010089028B02EC05EE002B000001152E01232206151417161F011617161514
+0623222627351E01333236353427262F0126272635343633321602B84377374268232D38
+477F433EA9A43D8B4A478942416D272E2F477F3F3BA28F3D7E05C3871F1E482940131C0F
+0E18403C66797E1B1A8427274C383D2328090D173B365F6F8016000000010089029C02E8
+05DF000E0000013015233534363730113311232206011990ECE39048CFB802C62A56ACE5
+150147FE4A9C000000010046FFE3056C05F2001B00000114163332363533100623222619
+0134262322061523103633321611033E565C6052CABAC2AAD2565C6052CABAC2AAD201BE
+D3685AE1FEE7C2B701250258D3685AE10119C2B7FEDB000000010046FFE3056C05F2001B
+0000011110363332161123342623220615111006232226113314163332360274D2AAC2BA
+CA52605C56D2AAC2BACA52605C5601BE02580125B7C2FEE7E15A68D3FDA8FEDBB7C20119
+E15A6800FFFF0046FFE3056C074F1027171E05F30174100607B6000000010046FFE306DC
+03B700270000011E01333236353426233520121506022122022F012E0123220615141633
+1522023534122132121703FA2184727A7C4BAB0103C801A3FED9ACD734322084737F7755
+A1F9D2A40127ADD63401B058CBA77C60E5A5FEC3AD95FEC801197E7058CBA77C60E5A501
+4AA09A0133FEE77EFFFF0046FFE306DC05171027171E058BFF3C100607B8000000010046
+FFE306DC03B70027000001373612332012171402233532363534262322060F0106022320
+022734122115220615141633323603283234D7AC0127A301D2F9A15576807284213234D6
+ADFED9A301C80103AB4B7C7A738401B0707E0119FEC895A6FEBCA5E5607CA7CB58707EFE
+E7013895AD013DA5E5607CA7CB000000FFFF0046FFE306DC05171027171E058BFF3C1006
+07BA0000FFFF00C9FFE3070105F2102606DA0000100707B501950000FFFF0046FFE30683
+05F2102607B50000100706DA04EE0000FFFF00C9FFE3070105F2102707B6019500001006
+06DA0000FFFF0046FFE3068305F2102607B60000100706DA04EE0000FFFF00C9FFE30701
+074F102707B701950000100606DA0000FFFF0046FFE30683074F102607B70000100706DA
+04EE0000FFFF00C9FFE308D903B7102707B801FD0000100606DA0000FFFF0046FFE30855
+03B7102706DA06C00000100607B80000FFFF00C9FFE308D90517102707B901FD00001006
+06DA0000FFFF0046FFE308550517102607B90000100706DA06C00000FFFF00C9FFE308D9
+03B7102707BA01FD0000100606DA0000FFFF0046FFE3085503B7102607BA0000100706DA
+06C00000FFFF00C9FFE308D90517102707BB01FD0000100606DA0000FFFF0046FFE30855
+0517102607BB0000100706DA06C000000001008903CF04AF05E600270000013E02373216
+171406233532363534262322060F010E0123222627343633152206151416333236025B2A
+27736FBE6201849D493D4A3C4B3217410B9173BA66017EA34D384B3A424504CC463D9601
+A84D5DB56E772D1B6C41237615BAAE5461B16B792E31654D000100770000043B05D50008
+002EB5021C0806040910DCCCD4EC3100B6420895020681002FF4D4EC304B5358B7061105
+0711040405050710ED10ED59212311213501330121043BCAFD06023DCAFDC302FA0258AD
+02D0FD2DFFFF00C90000048D084B1027029CFFE20145120607CD0000000100C90000048D
+05D50008002FB60405071C00040910FCECD4CC3100B6420195070381002FF4D4EC304B53
+58B70211050311040405050710ED10ED59331121013301152111C902FAFDC3CA023DFD06
+030202D3FD30ADFDA8000000FFFF00C90000048D074F1027171E03E20174120607CD0000
+000100770000043B05D50008002EB5071C0103060910DCCCD4EC3100B642029507008104
+2FE4D4EC304B5358B70211050311040405050710ED10ED59011121012301352111043BFD
+06023DCAFDC302FA05D5FCFEFD2D02D0AD025800FFFF007700000440074F1027171E05DA
+0174120607CF0000FFFF007700000503074E1027171605DA0175120607CF0000000100C9
+0000048D05D50008002FB60504011C00040910FCECD4CC3100B6420795030081062FE4D4
+EC304B5358B70611050711040405050710ED10ED59133311211501230121C9CA02FAFDC3
+CA023DFD0605D5FDA8ADFD3002D30000FFFF00C90000048D074F1027171E033501741206
+07D20000FFFF00C9000005F805D5102707CB01BD0000100606DA0000FFFF0077000005C8
+05D5102706DA04330000100607CB0000FFFF00C90000061005D5102707CD018300001006
+06DA0000FFFF00C90000061505D5102706DA04800000100607CD0000FFFF00C900000610
+074F102707CE01830000100606DA0000FFFF00C900000615074F102607CE0000100706DA
+04800000FFFF00C9000005F805D5102707CF01BD0000100606DA0000FFFF0077000005C8
+05D5102607CF0000100706DA04330000FFFF00C9000005FD074F102707D001BD00001006
+06DA0000FFFF0077000005C8074F102607D00000100706DA04330000FFFF00C900000610
+05D5102707D201830000100606DA0000FFFF00C90000061505D5102607D20000100706DA
+04800000FFFF00C900000610074F102707D301830000100606DA0000FFFF00C900000615
+074F102607D30000100706DA04800000FFFF00F00000061005D5102617720000100707D2
+0183000000010089029B02E805DF00080034B6050703025D080910DCECD439CC31004009
+4202DD0805F700910910F4F4DCEC304B5358B7067D05077D040405071005ED10ED591333
+11211501230121899001CFFEA591016DFE2005DFFEB779FE7E018D00FFFF0089033102AD
+0556120606DC000000010089029C036F05DF000B000013331B01330901230B012301B091
+C5C691FEED012591E1E391012F05DFFEDE0122FE79FE440152FEAE01BC000000000100C9
+FFE306DC037D001300274009091C0C011C0A00041410FCC4ECD4EC3100400A0595108C14
+0C9509001410D43CEC10F4EE301333111416333236351121152111140423222435C9CACE
+655ED402E4FDE6FEEFEBECFEEF037DFE42A49894A801BEAAFEECECF0F0EC000000010077
+FFE3068A037D00130025B70B1C08131C000A1410DCD4ECD4EC3100400A0F95048C140895
+0A001410D43CEC10F4EE300111140423222435112135211114163332363511068AFEEFEC
+EBFEEFFDE602E4D35F65CE037DFE42ECF0F0EC0114AAFE42A89498A401BE000000010077
+0000068A039A0013001FB7091C0D011C000A1410DCD4ECD4EC3100B60595100C950A002F
+3CECD4EC302123113426232206151121352111342433320415068ACACE655FD3FD1C021A
+0111EBEC011101BEA49894A8FE42AA0114ECF0F0EC000000FFFF00C9000006DC060A1027
+029C00C0FF04100607EA0000000100C9000006DC039A0013002140090B1C07131C090004
+1410FCC4ECD4EC3100B60F950408950A002F3CECD4EC3033113424333204151121152111
+34262322061511C90111ECEB0111021AFD1CD45E65CE01BEECF0F0ECFEECAA01BEA89498
+A4FE4200FFFF00C9000006DC05171027171E04C0FF3C120607EA0000000100C90000048D
+05D500130023400A1019053F0A1C000B041410FC3CECFCEC3100B70D9508009501810B2F
+F4ECD4EC3013352132041514042B0111231121323635342623C901C8FB0101FEFFFBFECA
+01C88D9A9A8D052FA6E3DBDDE2FDA802FE92878692000000FFFF00C90000048D074F1027
+171E04160174120607EC0000000100C90000048D05D500130023400A04190F3F0A1C0009
+041410FC3CECFCEC3100B707950B00950981132FE4ECD4EC303721323635342623211133
+113332041514042321C901C88D9A9A8DFE38CAFEFB0101FEFFFBFE38A69286879202FEFD
+A8E2DDDBE3000000000100460000040A05D50013002240090B1C13083F04190F1410DCEC
+FC3CEC3100B707950B009513810A2FF4ECD4EC3001212206151416332111231123222435
+34243321040AFE388D9A9A8D01C8CAFEFBFEFF0101FB01C8052F92868792FD020258E2DD
+DBE30000FFFF00460000040A074F1027171E04840174120607EF0000000100460000040A
+05D5001300224009091C0C003F1019051410DCECFC3CEC3100B70D950900950A81012FE4
+ECD4EC3025152122243534243B0111331121220615141633040AFE38FBFEFF0101FBFECA
+FE388D9A9A8DA6A6E3DBDDE20258FD0292878692FFFF00C9000005E4074F102707F001DA
+0000100606DA0000FFFF004600000591074F102706DA03FC0000100607F0000000010089
+029B02E805DF00140024B70B5D0800047E101510DCECD43CEC3100400A08DD0B00DD09F7
+14911510F4E4FCD4EC3001212206151416332111231123222726353436332102E8FEE156
+525850011F908F945B51A29E011F05714550424AFE4B0148473F7C7B7F00000000010077
+0000055E05D5000C0000372D01352D013501150D0115017703ECFC1403ECFC1404E7FC96
+036AFB19B6EEE9B8ECE9BBFECEE4D5D4E4FECE00000200960000056805F3000B001C0050
+B6091714031A0E1D10D4C4CCD439CC3100400942061700111819AF1C2FFC39D4CCD4CC30
+4B535840161615171418111B0C1C19111A1B1A18111C17110C0C1C050710ED10ED0710ED
+0810ED111239395901220615141633323635342601263534361732161514060709013301
+2301A6343C3C322C423AFEE729B0606AA79F7E012201DAD2FDC7E5054E2F30402E422C22
+3DFEBE6A79699C019173669C08FCE2050EFA2B00FFFF0096FFE20568084B1027029C00C0
+0145120607F8000000020096FFE2056805D5000B001C0050B6090315090F1B1D10D4C4CC
+D439CC310040094206120018110DAF102FEC39D4CCD4CC304B5358401614131C1511110E
+0C0D10110F0F0E11110D12110C0C0D050710ED10ED0710ED0810ED111239395925323635
+3426232206151416030133012309011E01151406230626353401A6323A422C323C3CB301
+8BE50239D2FE26FEDE7E9FA76A60B0873D222C422E40302F0142040CFA2B050EFCE2089C
+667391019C697900FFFF0096FFE20568074F1027171E04C00174120607F800000002004D
+00000558054B000B001C0054400A030C09121C1C19121B1D10DCC4D4EC10CCD4CC3100B7
+42000C0F061C151A2FDC39CCD439CC304B535840160E0D0F0C1C11191A180C111718171C
+11191B111A191A040710ED10ED0710ED1008ED1112393959013236353426232206151416
+250E012322263534363332170115013501015D323A422C323C3C01440CA4606DA3AE4741
+4A038BFB19044D03DD3D222C422E40302F3B617FA1638E8125FE36E4FD88B60234000000
+FFFF004D00000558074F1027171E04AE0174120607FA00000002007700000582054B000B
+001C00524009090C03170F0D1C101D10DCECD4D4CCD4CC3100B742000C1A060D140F2FDC
+39CCD439CC304B535840161C1B1A0C0D11100F110C111211120D11100E110F100F040710
+ED10ED0710ED1008ED111239395901323635342623220615141627090115013501363332
+161514062322260472343C3C322C423ADEFDAF044DFB19038B4A4147AEB45A6E9903DD2F
+30402E422C223D3BFED2FDCCB60278E401CA25818E6D9787FFFF007700000582074F1027
+171E05310174120607FC0000FFFF00C900000717074F102707FD01950000100606DA0000
+FFFF007700000745074F102607FD0000100706DA05B0000000020089029B03B20590000B
+002000000132363534262322061514162705011501352536333217161514070623222322
+2603062126261F1C2A2588FEA102A0FCE902372E292C27483230470102406204C21B1B24
+1925181323199EFED173016280FE14192F4F3B2C2B490000000200B2FFE3052905F2000A
+002700000132363534262206151416071114163332363511331110002120001901343633
+321615140706232201EB28423A643A4242AEC3C2AECBFEDFFEE6FEE5FEDFAD8A6AA7494A
+7E3C0480422C223E3E222C4288FE52F0D3D3F0038BFC5CFEDCFED6012A012402B26AA590
+745F5556000200B2FFE3052905F2000A0027000001323635342622061514161706232227
+26353436333216151110002120001901331114163332363503F02C423A643A4296303C7E
+4A49A76A8AADFEDFFEE5FEE6FEDFCBAEC2C3AE0480422C223E3E222C42881456555F7490
+A56AFD4EFEDCFED6012A012403A4FC75F0D3D3F0000200B2FFE3052905F2000A00270000
+012206151416323635342627363332171615140623222635111000212000190123113426
+2322061501EB2C423A643A4296303C7E4A49A76A8AAD0121011B011A0121CBAEC2C3AE01
+55422C223E3E222C42881456555F7490A56A02B20124012AFED6FEDCFC5C038BF0D3D3F0
+000200B2FFE3052905F2000A002700000122061514163236353426371134262322061511
+231110002120001901140623222635343736333203F028423A643A4242AEC3C2AECB0121
+011A011B0121AD8A6AA7494A7E3C0155422C223E3E222C428801AEF0D3D3F0FC7503A401
+24012AFED6FEDCFD4E6AA590745F5556FFFF00B2FFE30529074F1027171E04E701741206
+08030000FFFF00B2FFE30529074F1027171E04E70174120608040000000200530000055E
+05D500080024000012141632363426072205161514060706263534363B01200011100029
+013521200011102726F33C683C3B35350131148B85739DA36DB301B20196FE68FE50FE61
+01BE0135011F8F860501602F2F602F01012C316A970303977063A1FE97FE80FE7EFE96A6
+0118012E012C8C81FFFF00530000055E074F1027171E04C7017412060807000000020079
+0000058405D5000800240000003426232606141632250407061110002901152120001110
+0021333216151406272E01353404E43B35353B3C68FED0FEEB8590011F013501BEFE61FE
+50FE68019601B2B36DA39D73858B04A1602E012F602FBC09818CFED4FED2FEE8A6016A01
+8201800169A16370970303976A310000FFFF007900000584074F1027171E052201741206
+08090000FFFF00C900000741074F1027080A01BD0000100606DA0000FFFF0079000006BD
+074F1026080A0000100706DA0528000000020089029C03BD05DF000B0026000001220615
+141633323635342607222635343706070615141633211521202410242133321615140603
+151F2626211B26261E46630DC1494DBEA80119FEFAFEF0FEFF0100011172525F62057119
+241B1B1B1B2419CF563C211C03464AA0B97B6ECB01AECA59523B5700000200460000062E
+05F2000B001C000001220615141633323635342613110607222435342433320415110117
+0102427AADC85F80B2CCCC80B2EBFEEF0123D9EC011001569AFE680552A497A894A993A4
+97FAAE02854901F0ECFAE1F0ECFCA8020C66FD9C000200770000065F05F2000B001C0000
+0122061514163332363534260121013701113424333204151404232627046366CCB2805F
+C8ADFE54FEDEFE689A01560110ECD90123FEEFEBB280055297A493A994A897A4FAAE0264
+66FDF40358ECF0E1FAECF00149000000FFFF00770000065F074F1027171E065E01741206
+080F000000020046FFE3062E05D5000B001C000025323635342623220615141601210107
+01111404232224353424331617024266CCB2805FC8AD01AC012201989AFEAAFEF0ECD9FE
+DD0111EBB2808397A493A994A897A40552FD9C66020CFCA8ECF0E1FAECF00149FFFF0046
+FFE3062E074F1027171E05D3017412060811000000020077FFE3065F05D5000B001C0000
+253236353426232206151416031136373204151404232224351101270104637AADC85F80
+B2CCCC80B2EB0111FEDDD9ECFEF0FEAA9A019883A497A894A993A4970552FD7B4901F0EC
+FAE1F0EC0358FDF466026400FFFF0077FFE3065F074F1027171E04D30174120608130000
+00020089028B041105DF0010001C00000111032713331136333216151406232226053236
+3534262322061514160191C642F7A1515F94ACB78995AB014058505E4A5C5461039501C0
+FEFE3D014FFE972986848C7E8618564654485547514B0000FFFF00C90000053B05D51206
+002B0000FFFF0089029C036F05DF120607E50000FFFF00890000081A084B1027071C0359
+0000100607F40000FFFF00890000081A05F2102607F400001007071D03590000FFFF0089
+0000081A074F102607F400001007071E03590000FFFF0089FFE3079705DF102607F40000
+1007071F03590000FFFF0089FFE30797074F102607F400001007072003590000FFFF0089
+FFE3081A05DF102607F400001007072203590000FFFF0089FFE3081A074F102607F40000
+1007072303590000FFFF0089028B066205DF1027073303590000100607F4000000010046
+0000062E05F20012003A40090302051C120B1C0C1310DCECDCECCC3931004009420B0895
+000F9101042FCCF439ECCC304B5358B70111020011030302040710ED100EED5925011701
+211134262322061523342433320415043E01569AFE68FEDECC6680B2CA0123D9EC0110BE
+020C66FD9C0417A497A992FAE1F0EC00000100770000065F05F20012003A4009081C070F
+1C1000111310DCDC39ECDCEC3100400942070B95000491120F2FCCF439ECCC304B5358B7
+1211110011101110040710ED100EED592511342433320415233426232206151121013702
+670110ECD90123CAB28066CCFEDEFE689ABE0358ECF0E1FA92A997A4FBE9026466000000
+00010046FFE3062E05D50012003D400910110E1C01081C071310DCECDCEC3100400C4212
+0F070B95048C000F911310E439F4EECC10CC304B5358B71211110011101110040710ED10
+0EED5901111404232224353314163332363511210107043EFEF0ECD9FEDDCAB28066CC01
+2201989A0517FCA8ECF0E1FA92A997A40417FD9C6600000000010077FFE3065F05D50012
+003F40090B1C0C051C0300021310DCDC39ECDCEC3100400C4201040C08950F8C00049113
+10E439F4EECC10CC304B5358B70111020011030302040710ED100EED5909012701211114
+1633323635331404232224350267FEAA9A01980122CC6680B2CAFEDDD9ECFEF00517FDF4
+660264FBE9A497A992FAE1F0EC000000FFFF0089000009CD084B1027073A050C00001006
+082B0000FFFF0089000009CD05F21027073B050C00001006082B0000FFFF0089000009CD
+074F1027073C050C00001006082B0000FFFF0089FFE3073B05E41027073D02FD00001006
+082B0000FFFF0089FFE3073B074F1027073E02FD00001006082B0000FFFF0089FFE309CD
+05E410270740050C00001006082B0000FFFF0089FFE309CD074F10270741050C00001006
+082B00000002008902A8052805E4000A0028000001323635342622061514161722263534
+36333216151407331514163332363D01331514062322263D0101C962466E746E505894AC
+AC9495AB2FB9512C434590AB6D61AC045A543A4B4D4D4B46486E857C70878770583BA76F
+42476AA7A7848788833900000003008902A8082405E4000A0033003E0000013236353426
+22061514162126353436333216151407331514163332363D01331514062322263D012122
+26353436333216151407213236353426220615141601C962466E746E50023F2BAC9495AB
+2FB9512C434590AB6D61ACFBCA94ACAC9495AB2F01EB62466E746E50045A543A4B4D4D4B
+46483B5870878770583BA76F42476AA7A78487888339857C70878770583B543A4B4D4D4B
+46480000000100460000065905890012003C400A101201090519010C101310FCC4ECCC10
+CC393100B7421202950F0895092FECD4ECCC304B5358400A111111121210110012000507
+10ED1008ED59011121220615141633152224353424332101370659FBEA8F99C662ECFEEF
+0103FA0358FDF26803F2FEFE9183A592A5F0ECDDE101559AFFFF00460000065905891027
+171E04A4FF3C1206082D000000010077FE11068A039A00120038B70905190C1012001310
+CC39DCD4ECCC3100B742089509019512102FCCECD4EC304B5358400A1111111212101100
+1200050710ED1008ED59171121323635342623353204151404232101077704168F99C662
+EC0111FEFDFAFCA8020D675801029183A592A5F0ECDDE1FEAB9A0000FFFF0077FE11068A
+05171027171E065CFF3C1206082F000000010046FE110659039A0012003A40090301120E
+190A07101310FCCCECD4CC393100B7420B950A119501032FCCECD4EC304B5358400A0211
+0101010311000100050710ED1008ED590501270121222435342433152206151416332106
+59FD9C68020EFCA8FAFEFD0111EC62C6998F041658FE699A0155E1DDECF0A592A5839100
+FFFF0046FE11065905171027171E0469FF3C1206083100000001008902B5045C05E40012
+000001052725212226353436331522061514163321045CFEB13D012EFDCC9EA3ACA75269
+5059029203ACF742E87E837D876E445A48430000000100770000050405D5001000002523
+3533352135013301211133152315230371C9C9FD06023DCAFDC302FAC9C9CAE0A4D4AD02
+D0FD2DFE82A4E00000010021000004AE05D5001000002515233523353311210133011521
+15331501B4CAC9C902FAFDC3CA023DFD06C9E0E0E0A4017E02D3FD30ADD4A400FFFF0021
+000004AE074F1027171E04030174120608350000000100770000050405D5001000000135
+3315331523112101230135213523350371CAC9C9FD06023DCAFDC302FAC904F5E0E0A4FE
+82FD2D02D0ADD4A4FFFF007700000504074F1027171E05DA017412060837000000010021
+000004AE05D500100000013315231521150123012111233533353301B4C9C902FAFDC3CA
+023DFD06C9C9CA04F5A4D4ADFD3002D3017EA4E0FFFF0021000004AE074F1027171E0356
+01741206083900000001000A029B02E805DF001000001333153315231521150123012135
+23353389907F7F01CFFEA591016DFE207F7F05DF756E6679FE7E018DD46E0000000200C9
+FFE304C105D5000B001B002C400A031911161B091C19041C10FCEC3232DCEC3100400C06
+95160C0E0095148C1A91192FECF4EED43939EC3025323635342623220615141603363732
+04151404232227152223113302C57AADC85F80B2CCCC80B2EB0111FEDDD9B77B4F7BCA83
+A497A894A993A49702CD4901F0ECFAE1482B05D5FFFF00C9000005B005D5120600270000
+000200730000055A05D500080011001F4009001C0A3204190E101210FCECF4EC3100B600
+95098107950B2FECF4EC300123200011100021331311212000111000210490F4FECBFEE1
+011F0135F4CAFE61FE50FE68019601B2052FFEE9FED4FED2FEE8052FFA2B016A01820180
+0169000000010089029C034E05DF00090000132115012115213501219702A9FDF90215FD
+3B0208FE0605DF56FD816E56027F00000003008901EC034E068F00130016001900000115
+233521350111213521353315211501112115011537033507022469FECE0132FEDC012469
+011CFEE4012AFED66DD682029CB0B056017801076EB0B056FEA2FEDF6E02D58686FD99A0
+A000000000010075000003210273000B00000103012327072301033317370314FF010C89
+CDCD890112FB89BBBB0273FECFFEBEF6F60148012BDFDF00FFFF00890000079705F21027
+071B03590000100607F40000FFFF0089000009B105F21026082B00001007073905730000
+FFFF008900000CC905F21026082C00001007073B08080000FFFF008900000CC9074F1026
+082C00001007073C08080000FFFF0089FFE30A3705E41026082C00001007073D05F90000
+FFFF0089FFE30A37074F1026082C00001007073E05F90000FFFF0089FFE30CC905E41026
+082C00001007074008080000FFFF0089FFE30CC9074F1026082C00001007074108080000
+0001FFEC01F703E5029F00030000032115211403F9FC07029FA800000001FFECFF010405
+029F000700000321152111231121140419FE59CAFE58029FA8FD0A02F60000000001FFEC
+FF0105C6029F000B00000321152111231123112311211405DAFE59CAF7CAFE58029FA8FD
+0A02F6FD0A02F6000001FFECFF010787029F000F00000321152111231123112311231123
+112114079BFE59CAF7CAF7CAFE58029FA8FD0A02F6FD0A02F6FD0A02F60000000001FFEC
+FF010948029F00130000032115211123112311231123112311231123112114095CFE59CA
+F7CAF7CAF7CAFE58029FA8FD0A02F6FD0A02F6FD0A02F6FD0A02F6000001FFECFF010B09
+029F00170000032115211123112311231123112311231123112311231121140B1DFE59CA
+F7CAF7CAF7CAF7CAFE58029FA8FD0A02F6FD0A02F6FD0A02F6FD0A02F6FD0A02F6000000
+0001FFEC01F7040505940007000003211133112115211401A8CA01A7FBE7029F02F5FD0B
+A80000000001FFEC01F705C60594000B00000321113311331133112115211401A8CAF7CA
+01A7FA26029F02F5FD0B02F5FD0BA8000001FFEC01F707870594000F0000032111331133
+113311331133112115211401A8CAF7CAF7CA01A7F865029F02F5FD0B02F5FD0B02F5FD0B
+A80000000001FFEC01F70947059400130000032111331133113311331133113311331121
+15211401A8CAF7CAF7CAF7CA01A6F6A5029F02F5FD0B02F5FD0B02F5FD0B02F5FD0BA800
+0001FFEC01F70B0905940017000003211133113311331133113311331133113311331121
+15211401A8CAF7CAF7CAF7CAF7CA01A7F4E3029F02F5FD0B02F5FD0B02F5FD0B02F5FD0B
+02F5FD0BA80000000001FFECFF0104100594000B00000321133303211521032313211401
+C2EAD5EA018DFE3FEAD5EAFE72029F02F5FD0BA8FD0A02F60001FFECFF0105D305940013
+000003211333033313330321152103231323032313211401C2EAD5EAEEEAD5EA018DFE3F
+EAD5EAEEEAD5EAFE72029F02F5FD0B02F5FD0BA8FD0A02F6FD0A02F60001FFECFF010796
+0594001B0000032113330333133303331333032115210323132303231323032313211401
+C2EAD5EAEEEAD5EAEEEAD5EA018DFE3FEAD5EAEEEAD5EAEEEAD5EAFE72029F02F5FD0B02
+F5FD0B02F5FD0BA8FD0A02F6FD0A02F6FD0A02F60001FFECFF0109590594002300000321
+133303331333033313330333133303211521032313230323132303231323032313211401
+C2EAD5EAEEEAD5EAEEEAD5EAEEEAD5EA018DFE3FEAD5EAEEEAD5EAEEEAD5EAEEEAD5EAFE
+72029F02F5FD0B02F5FD0B02F5FD0B02F5FD0BA8FD0A02F6FD0A02F6FD0A02F6FD0A02F6
+0001FFECFF010B1C0594002B000003211333033313330333133303331333033313330321
+152103231323032313230323132303231323032313211401C2EAD5EAEEEAD5EAEEEAD5EA
+EEEAD5EAEEEAD5EA018DFE3FEAD5EAEEEAD5EAEEEAD5EAEEEAD5EAEEEAD5EAFE72029F02
+F5FD0B02F5FD0B02F5FD0B02F5FD0B02F5FD0BA8FD0A02F6FD0A02F6FD0A02F6FD0A02F6
+FD0A02F60001FFEC005304050443000B00000321113311211521112311211401A8CA01A7
+FE59CAFE58029F01A4FE5CA8FE5C01A40001FFEC005305C6044300130000032111331133
+11331121152111231123112311211401A8CAF6CA01A8FE58CAF6CAFE58029F01A4FE5C01
+A4FE5CA8FE5C01A4FE5C01A40001FFEC005307840443001B000003211133113311331133
+1133112115211123112311231123112311211401A8CAF6CAF8CA01A4FE5CCAF8CAF6CAFE
+58029F01A4FE5C01A4FE5C01A4FE5CA8FE5C01A4FE5C01A4FE5C01A40001FFEC00530946
+044300230000032111331133113311331133113311331121152111231123112311231123
+1123112311211401A8CAF6CAF8CAF6CA01A6FE5ACAF6CAF8CAF6CAFE58029F01A4FE5C01
+A4FE5C01A4FE5C01A4FE5CA8FE5C01A4FE5C01A4FE5C01A4FE5C01A40001FFEC00530B09
+0443002B0000032111331133113311331133113311331133113311211521112311231123
+11231123112311231123112311211401A8CAF6CAF8CAF6CAF8CA01A7FE59CAF8CAF6CAF8
+CAF6CAFE58029F01A4FE5C01A4FE5C01A4FE5C01A4FE5C01A4FE5CA8FE5C01A4FE5C01A4
+FE5C01A4FE5C01A4FE5C01A40001FFECFF010410059400110000032103331B0133032115
+2113230B0123132114018DEAD59A9AD5EA018DFE72EAD59999D5EAFE72029F02F5FE0E01
+F2FD0BA8FD0A01EFFE1102F60003FFECFF01061905940002000E00110000011B01252101
+3301211521012301210103210232D0D1FC19015E0144E90144015EFEA3FEBBE9FEBBFEA3
+0316CF019F01F7FE1A01E6A802F5FD0BA8FD0A02F6028DFE1B0000000001FFECFF570663
+029F000D00000321152111213521352111211121140677FBFB01F9FED101F9FC73FE5802
+9FA8FE08A8A8FE0802A000000005FFECFE1509B7029F00140018001B001F002300000335
+211521090121010705212707212527012109012101372521173701173727371701211409
+CBFEBAFDF4020CFEFAFE77830106FEFA8383FEFA010683FE77FEFA020CFDF40106018983
+FEFA01068383FEFA83838383830189FEFA01F7A8A8FE0FFE0F01757CF97C7CF97CFE8B01
+F101F1FE8B7CF97C7CFE0F7C7C7C7C7C01750000000AFFEC01F709470737002B002F0033
+0037003B003F00430047004B004F00000321352335333523353335233533353315333533
+153335331533353315331523153315231533152315211521012315332523153325231533
+0523153325231533252315330523153325231533252315331401A8CACACACACACACAF7CA
+F7CAF7CACACACACACACA01A6F6A506EBF7F7FE3FF7F7FE3FF7F70382F7F7FE3FF7F7FE3F
+F7F70382F7F7FE3FF7F7FE3FF7F7029FA8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8
+A803F0A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A80002FFEC00A7058B029F000300070000
+1321152103211521B603F8FC08CA059FFA61014FA801F8A800010071003A0423045B0008
+00000115210127090137010423FE7DFE4372019FFE617201BC029FA8FE4372019F019E72
+FE4400000001FFEC003A039E045B0008000003210117090107012114018401BC72FE6101
+9F72FE43FE7D029F01BC72FE62FE617201BD00000002003D0000047F04600007000A0000
+2123032103230133012103047FC366FE1066C301A4FAFEC30180C00113FEED0460FD4702
+050000000002000B0000055B0460000F0013000033012115211121152111211521112103
+010321110B01D9036AFDF601F3FE0D0217FD2FFEBE74019AE80104046094FED394FE8893
+0113FEED03CDFDDA022600000003007BFFE3076F047B0034003D004A0000250E01232227
+263D01212E012322070607353E0133321716173E01333217161514070623211514171633
+323637150607062322272601161716333237363725323635342726232207061D0104074A
+D484E28484034E0CCCB76864646464D06AA77C7C4D49D88FBD69697F7EFBFEFE53549760
+B654655F5F5A8E6A6BFCF701535289995C5D0E0169DFAC41406F995C5D9B5A5E9192FA5A
+BFC81B1A35AE2A2C3D3C7778785D5EA8BD6060127F46452E2EAA27141330300187975A5A
+57579E60667B623A396D6CB4290000000003003E0000043E0460000A0011002300002520
+35342901153315231501342B011133323714071E01151406232135233533112132160278
+0102FEFEFEFADCDC01DEECF2F2ECB9D67F8CE7D6FE397C7C01B6C5D499B5B466A45F029D
+91FEDAAAD01F18987296A4F8A402C490FFFF0071FFE303E7047B100600460000000200BA
+00000467046000080011000001113332363534262325212000111000290101738DD9CBCB
+D9FEBA013701460130FECEFEBCFEC903CDFCC7C7D6D5C793FEF1FEE0FEDFFEF000020024
+000004670460000C0019000013212000111000290111233533211523113332363534262B
+0111BA013701460130FECEFEBCFEC99696017AC18DD9CBCBD98D0460FEF1FEE0FEDFFEF0
+01F5A4A4FE9FC7D6D5C7FECC000100BA0000038B0460000B000013211521112115211121
+1521BA02C4FDF601F3FE0D0217FD2F046094FED394FE889300010082FFE303C5047C0031
+00000116171615140706232226273516171633323736353427262B013533323736353427
+2623220706073536373633320415140602BF703C3C7271C44CAA62615051477745464443
+749B9489484E5455975D5555475A545550EE01028A02031841405D8D4F4E1818A71D0D0D
+2E2E40462D2C983338585A3838121325AB1C0E0EB6AD6C92000200C1FE4C017904600003
+000700001333112311353315C1B8B8B80460FBA0FE4CE9E900010000FFE3027B04600010
+00003D011E013332373635113311100623222644924E672E2B979EBA478F3DB93C3D4D46
+D70279FD87FEE6EA2C000000FFFF00BA0000049C0460100600FA000000010002000003FC
+047B000D00001333113717071121152111072737BAB9894CD50289FCBE6E4AB8047BFE64
+616A97FE6BAA01BC4E6A8300FFFF00BA0000054F0460100603D00000FFFF00BA00000479
+0460100603CC0000FFFF0071FFE30475047B100600520000FFFF007FFFE303F5047B1006
+0216000000020071002D05090431000A0016000001342620061514163332363714002120
+00353400212000046DE7FE6EE7E8C8C7E99CFEC8FEECFEEDFEC70139011301140138022F
+94ACAB9593ACAC93F0FEEE0112F0F10111FEEF00000100710074050903EA001800002523
+3E01353426200615141617232E0135340021200011140604C3AC2B2BE3FE66E32B2BAA24
+24013E010E0112013A23744E9D50B3C6C6B3509D4E4DA55DFD012AFED3FEFA55A2000000
+000300330005054D045900090013002B000009010E01151416333236373E013534262322
+0607273E01332000151406071707270E0123200035343637273703B2FDB02A28E8C84F75
+9A2929EBD3486E2E974DC577011401383334A84FB34DC678FEEDFEC73433A84E011801E7
+29674193AC145C2A673E97A913147D3636FEEFF15D9F438B5F9235360112F060A13F8B60
+00030071FFE307C3047B0026002F003D000013352126272623220607353E013332161736
+3736333217161110070623222726270E0123222726371617163332373637013237361027
+262322061514171671034E0C6666B76AC86264D06AA0F2514768698CF188898988F18C69
+6A424EE88FE28484B902525289995C5D0E020894565655569593AC565602005ABE646334
+34AE2A2C6E6D6E36379D9CFEEDFEEC9C9C37386C6B709192C4985A5957579EFEB4737401
+927473E8C8C7747500010071022F0475047B000D00000134262322061523100033320011
+03B2AC9394ACC20111F1F00112022FC7E9E7C901140138FEC8FEEC0000010071FFE30475
+022F000D000001141633323635331000232200110134AC9394ACC2FEEFF1F0FEEE022FC7
+E9E7C9FEECFEC8013801140000020097000003CC04600007001100000111213236342623
+25213216100623211123014E01015B63635BFE4801B8BCC1C1BCFEFFB703C5FE985EAC5E
+9BAAFEB6AAFE3E00000200320000040F0460001600210000012E01353437363321112311
+23220706070323133637360123220706151417163B0101B56A706B6CD90184B9A9613B3B
+3FA2C3AE35343501D8C6773F40403F77C6020D1B8C69A25150FBA001D9252471FEE10132
+5E363601C92A2A54532B2B00000200320000040F04600016002100000126272627033313
+1617163B0111331121222726353436011123220706151417163301B537353435AEC3A23F
+3B3B61A9B9FE7CD96C6B70020BC6773F40403F7702531136365E0132FEE171242501D9FB
+A05051A2698CFE6301512B2B53542A2AFFFF003C0000046D0460100603D60000000100BA
+FFE004140460000F00002420363511331114062026351133111401E6010273B9D9FE58D9
+B97D8EA202B3FD3BDBE0E0DB02C5FD4DA2000000000100AE004C052B03F6001300002521
+352132363534262321352115231E011514060354FD5A029F9F9FBEA4FD850460AC6663F0
+4CB87C7C96ACB8B842B274C2C8000000000300AE004E06DB03F800030007001B00001335
+3315033533150521352132363534262321352115231E01151406AECACACA038CFD5A029F
+9F9FBEA4FD850460AC6663F00278CCCCFE7ACACAA4B87C7C94AEB8B844B076C0C8000000
+0001002FFE1804AA047B00260000011E0115140706232135213236353426232135213237
+36353427262321352115231E011514070603B87C767A7BE2FD5C029EA19CBEA4FD87029E
+A24D4E605FA3FD870460AE67623E3E010C45C082AF5F5FB972758FA6B93939778D5353B9
+B93FB0797A565500FFFF003D0000047F0460100600590000FFFF00560000063504601006
+005A0000FFFF0058000003DB04601006005D000000010078FFE303BA0460001700003716
+33323634262B0135012535211501321E0115140620278AA1D380847B6E7F010AFDD40300
+FEF646976FE4FE7DC9BD4264BB6490013E019393FEC24A9F6DA0B637000100B3000003FC
+047B00050000331121152111B30349FD81047BAAFC2F0000FFFF003D0000047F04601006
+024E000000010097000003EC046000070000011123112111231103ECB6FE17B60460FBA0
+03B7FC4904600000FFFF0097000003CC04601006087E00000001005A0000045E0460001B
+0000013311363736351133111007060715233526272619013311141716170200B8553956
+C2886DB1B8AF6D8AC45639530460FD311A4D73C9012CFED4FEEC9C7D19EEEE197D9C0114
+012CFED4C7754D1AFFFF004C000004730460100603CF00000002000A029C036805E00002
+000A0000010321033301232721072301B9AD015AF59001678456FE5856860571FE60020F
+FCBCD6D600020005029C049605E0000F0013000001152115211521112115213521072301
+17032111048AFE2E01BFFE4101DEFDA2FEB36581018A57D0012205E05FF85FFED15FD6D6
+034458FE4901B7000003007F029C031A05E0000A00150026000013113332373635342726
+230315333237363534272623252132171615140706071E011514062321FECC6731323231
+67CCBC5E2D2E2E2D5EFEC50145914F4F29284E5E68AC9EFEAF042BFECE26264D4F252501
+58FC1F1F403F201F5D3635644C2E2D0B127255707A0000000002007F029C039505E0000A
+0015000013113332373635342726232521201716151407062901FE9AC25B5A5A5BC2FEE7
+010501127F808081FEF0FEFB0583FD764E4FA9A84E4E5D6565D7D866650000000001007F
+029C02DD05E0000B00001321152115211521112115217F0252FE2D01C0FE4001DFFDA205
+E05FF85FFED15F0000010053029C02B105E0000B000001112135211121352135213502B1
+FDA201DEFE4001C0FE2D05E0FCBC5F012F5FF85F00010048028C037E05EF002400000135
+233521110607062322272635343736333217161715262726232207061514171633323603
+00D0014E4A595865DD7C7D7D7CDD5C53524646504F57AD57565657AD436A0313E15DFE99
+2F17187273CCCD737214142779351B1B5556AAA9565514000001007F029C034C05E0000B
+00001333112111331123112111237F7F01CE8080FE327F05E0FEA90157FCBC018EFE7200
+0001007F029C00FE05E000030000133311237F7F7F05E0FCBC0000000001FFBD01B600FE
+05E0000C00001333111407062B0135333236357F7F41408F3128544605E0FCF697444560
+546C00000001007F029C036905E0000A000013331101330901230111237F7F01A6A4FE2D
+01F4A7FE3C7F05E0FE9F0161FE7AFE420193FE6D0001007F029C02C805E0000500001333
+112115217F7F01CAFDB705E0FD1B5F000001007F029C03DB05E0000C000013331B013311
+231103230311237FBDF0F2BD7CF280F37B05E0FDC70239FCBC02DEFDC3023DFD22000000
+0001007F029C034705E000090000133301113311230111237FAB01A17CACFE5F7B05E0FD
+4502BBFCBC02BBFD450000000001007F029C034705E00009000001112311012311331101
+03477CFE5FAB7B01A105E0FCBC02BBFD450344FD4502BB0000020048028C03AF05EF000F
+001B00000122070615141716333237363534272624201716151407062027261001FC8A52
+5151528A8B51515151FEAF018C77767677FE74777705935B5C9F9E5C5B5B5C9E9F5C5B5C
+7676C6C576767576018C000000020047028C033E05EF000F004000000122070615141716
+333237363534272603060706151417163332373635342726273532171615140706071617
+16151407062322263534373637262726353437363301C273434444437374444343429A52
+36353C25806A3C3D304552905E583635606C3C3D6361B8B7C43D3D6C6C2A365249A20429
+2B2B4C4B2C2B2B2C4B4C2B2B01350223232C26291924254C59182B04383A366947323212
+1337385079414182795038371312273231492E2A0002007F029C02DE05E0000900150000
+1311333237363427262325213217161407062B011123FEA0593031313059FEE1011F9E51
+5151519EA07F0583FEC629299629295D3F40F6403FFEB0000002007F029C035B05E00017
+00200000011617161F0123272627262B0111231121321716151407060111333236353426
+23023D292627278188792E2C2C4C8A7F011FA1504F292AFE73A05C5E5E5C04240C292847
+E4D6541C1BFE9F03443C3C794F3434014BFED74C494A4A000001FFFC029C031805E00007
+0000032115211123112104031CFEB280FEB205E05FFD1B02E500000000010070028C0340
+05E000130000133311141633323736351133111407062027263570806E7A7B3736805B5B
+FE9C5B5B05E0FE0486763B3B8601FCFDF6A354535354A3000001002B029C04D205E0000C
+000013331B01331B013303230B01232B80C6C58FC6C582EDA0C6C9A005E0FD3D02C3FD3D
+02C3FCBC02D6FD2A0002004D028C02A1051E000C002B000001220706151416333237363D
+01371123350607062322263534363B013534262322070607353637363332171601BA8C36
+375246603A3B7373283B3C556D80A09EA36A5F3C3A3935403C3B39994C4B03D71C1D4537
+403D3D64172BFE9A5F391B1B6C5B696C0A474E0D0D1A60150B0B46470002004D028C02A1
+051E000C002D000001323736353426232207061D01071133153637363332171615140706
+2B011514163332373637150607062322272601358C36375246603A3B7474283B3C556D40
+3F504F9EA36A5F3C3A3935403C3C38994C4C03D31C1D4537403D3C65172B01665F391B1B
+36365A6A36360A474E0D0D1A60150C0A4647000000020047028C02BE051E0013001F0000
+0135331123350607062322272610373633321716041417163237363427262207024A7474
+2537384E8051505051804E3837FE9A3435B835353535B83504B05FFD8D5E381B1B5A5B01
+285B5A1B1BA1E441404041E4414040000003004D028C04AF051E0033003C004A0000010E
+01232227263D012126272623220607353637363332171617363736333216151407062B01
+1514171633323637150E0123222625161716333237363F0132373635342726232207061D
+01028A2F86538E5354021507404173417E3F3F4142426A4E4E302E44445B7784504F9FA2
+34355F3D72353F78395986FE1601343456603B3A09E38D3636292846613A3A02F3333451
+528C326B38381E1D61180C0C222143432221685E6A36360A4727271A1A60151636DA5432
+33313158361C1D453720203D3C65170000020075028C02EC0603000B001D000000342726
+2207061417163237013E0133321716100706232226271523113302743435B835343435B8
+35FEAA24704D8150505050814D702475750363E440414140E4404141018D38365A5BFED8
+5B5A36385E03670000020047028C02BE06030013001F0000011133112335060706232227
+2610373633321716041417163237363427262207024A74742537384E8050515150804E38
+37FE9A3435B835353535B83504B00153FC995E381B1B5A5B01285B5A1B1BA1E440414140
+E440414100020047028C02D5051E001A0023000001152116171633323736371506070623
+222726353437363332171607262726232207060702D5FDEB08404173433F3E3E3E424144
+A962635E5D9F8E53537401343456613A3A0903EF326A38380F0E1D61180C0C5757959A5B
+5A51526D543332313058000000020047028C02D5051E0014001B004D4BB00C5358400702
+1B0F0915001C10D4CCC4D4CC324BB015534BB018515A4BB011545B58BD0002FFC0000FFF
+C0001BFFC0383838593100400903091502050C18121C10D4CC2FCCD4CCD4CC3059133521
+2E0123220607353E01333216151406232226371E0133323637470215078273437D3E3F83
+43A9C5BB9F8EA67401685661750803BB326B6F1D1D611818AE959AB5A36D546562580000
+00010054028C0262051F0032000013262726353437363332171617152E01232207061514
+17163B0115232207061514171633323736371506070623222635343736F947262548477B
+3036353E3D662C4B2C2C2B2A49625D572D3135355F3B36352D3935353396A22B2C03EE0E
+2424344F2C2C07070D5E110E191A24271919551D1F31331F200B0A156010070866613C29
+2900000000010052028C0260051F00310000011E01151407062322272627351617163332
+36353427262B013533323736353427262322070607353E01333217161514070601BB464C
+48477B3036353E3D32332D4B582B2A49625D562E3135365F3A36352D396A329652512C2B
+03BC0D48344F2D2B06070E5D1007083424271919551C203132201F0A0B14600F10333361
+3C2929000002004701AD02BE051E000D0031000000342726232207061417163332371714
+0706232227262735161716333237363D010607062322272610373633321716173533024A
+34345E5D343434345D5E34A85050A53D373633333232337239392438384E824F50504F82
+4E38382474036DE03D3E3E3DE03D3E3E46A04E4F09081065190C0B34356B33371C1B5858
+012258581B1C375F0002007A01A800EE050F00030007000013331123153533157A747474
+050FFD8DF482820000010075029C02E70603000A00001333110133090123011123757501
+5A94FE89018697FE9A750603FDFE010EFEDBFEB20132FECE00010075029C047B051E0022
+0034400A241B1C1400030E0A0B2310D4DC3C2FCC392FDCCC31B27F24015D00400A20060C
+1711231C020B2310D43C3C10D43CC4CC32300111231134262322061511231133153E0133
+3216173E0133321615112311342623220602B274484B59687575276F4D4C6C1A2B79526F
+7774484A5A6903FEFE9E01775B576B5CFE9E027361393745424542897EFE8501775A586B
+0001007501AD02C4051E001E0034400707000C1713141F10D4DC3C2FCCCC4BB00D5158B1
+2040385931B27F20015D0040080F151B1F0706141F10D4D4CC10D4C4CC3001111407062B
+0135333236351134262322061511231133153637363332171602C4343372A09342304E4E
+5E6C75752938394A793F3E0417FE7A783636583656018259596B5CFE9E027361381C1C42
+4400000000020047028C02CF051E000B001700364005090F03151810D4CCD4CC4BB01553
+4BB018515A4BB011545B58BB000FFFC00009FFC038385931004005000C06121810D4CC2F
+CC30012206151416333236353426273216151406232226353436018B5D6D6C5E5D6C6C5D
+97ADAD9798ACAC04C78171718182706F8357AE9B9AAFAF9A9BAE000000010047028C0275
+051E00200000133637363332171615140706232227262735161716333237363427262322
+0706074730333336A55E5F5D5EA03A35333131323133703F3E3E3F703331323104F7140A
+095858999759590A0A145F180C0C3F40E6403F0C0C1800000001004703D502CF051E0010
+0000013427262207061523343633321716153002543636BA36377AAC9897575603D56F42
+414140719BAE57579B00000000010047028C02CF03D50010000013141716323736353314
+06232227263530C23636BA36377AAC9897565703D56F42414140719BAE57579B00020075
+01AD02EC051E0011001D00001311231133153E0133321716100706232226243427262207
+061417163237EA757524704D8150505050814D7001663435B835343435B83502FAFEB303
+625F38365A5BFED85B5A36A1E440414140E440414100000000010023029C01DB05C10014
+000013153315231114163B011523222726351123353335ECEFEF30487777863333555505
+C1B250FEAC4D2C562D2C76015450B2000001006E028C02BD050F00160000131133111417
+16333237363511331123350607062322266E7427274E5E363774742B37384A797E039401
+7BFE88592C2D36355C0163FD8D60391C1B8600000001006E02C7034104D4001600000121
+3521323736353427262321352115231E01151407060219FE5501A66532323C3C67FE7002
+C16C403E4B4C02C76723224653313067672564416C38380000010075028D047B05100028
+000001060706232226351133111417163332373635113311141716333237363511331123
+3506070623222602512B3C3D526E78752424495A35347424244B59343574742837384C4D
+6C03154521228A7F017AFE895B2B2C36345C0163FE895B2B2C36365A0163FD8D623B1B1C
+4600000000010026029C02D5050F0006000013331B01330123267BDDDC7BFEF89E050FFD
+F2020EFD8D0000000002007901AD02DB060B000E001C0000131123111021201716071617
+1221262716333235340535163534232215ED74010C011101016EB00101FECF8539467DB5
+FEDBE694A502C3FEEA035E0100D899383395FEF601B861B09E0C5F04B77BAF0000010014
+01AD02D5050F000E00001B02330115233503262B01353332E39BDC7BFEE374B91C3C1F2C
+7C04ADFE7C01E6FD8DEFEF01D447580000020047028C02CF05EF001B002B000001262322
+151417161716151407062027263534373637263534213217010607061417163332363534
+2726272602794196A0A7824A5A5657FED2565757212F6201168B4CFECC2B223736365E5D
+6C393D502805722842341A153F4B9C94575858579A725D24142C4F9827FEF8112840E43F
+41826A70363906040002004701AD03090514000A00290000012215113237363534272627
+321716151407062315233522272635343736371506070615141716331134020A293D3B36
+372D21585156565181737E535656406829253636314604BC51FE7F3A357D743F33584A4F
+A5985A55E2E155589AA0523D105C0C2C416A71403A0181A90001002501AD02C405100017
+0000012703230103262B013517161F0113330113163B0115272601CD5EC1890112731F61
+1F2CA3285EC189FEEF721F611F2CA30210D7FEC601BC0107475801045DD7013AFE44FEF8
+46590204FFFF007A000000EE036712070B4E0000FD640000FFFF00750000021202821207
+02750000FD640000FFFF006EFFF002BD0273120708BB0000FD640000FFFF0026000002D5
+0273120708BE0000FD640000FFFF0079FF1102DB036F120708BF0000FD640000FFFF0014
+FF1102D50273120708C00000FD64000000020079FF1102EF02820010001C000013363736
+33321610062322262711231134053426232206151416333236B2265F257380A0A0804E6F
+257401FE695C5B6A6A5B5C690203393214B5FED8B63738FEB30222817B71828271728181
+FFFF0047FF1103090278120708C20000FD640000FFFF0025FF1102C40274120708C30000
+FD640000000200BAFE5604A3047B001C0028000013101221321617152E012322061D013E
+01333212111002232226271523131416333236353426232206BAFE010661AC51519E52B5
+B439B27CCEFCFCCE7CB239B8B8A59594A5A59495A50246011E01171D1EB32C2ABDBF5B63
+62FEC6FEFDFEFCFEC66263AA0223C8DCDCC8C7DCDC000000FFFF007F029C034C05E01006
+089700000001007400000284046000130000133521152311331523113315213533112335
+3311740210A8A8A8A8FDF0B0B0B003BCA4A4FEACA4FEE0A4A40120A40154000000030032
+FE560524047B00190022002B0000251123112335331133153E0133321716173315230607
+062322260121161716333237360121262726232207060173B98888B93AB17BCB80661585
+810B7480CB7BB10237FD90084A549292544AFD9D02660F3E549292543EA8FDAE03AE9001
+CCAA6461A282C390EA95A26101C0AE66747466013E8456747456000000010091FE56022F
+061400100000251514062B013533323736273723113311022FA4B446306A262A0402B8B8
+9AAED6C09C303694140614FA8600000000020047028C02BE051E0013001F000013152311
+33153637363332171610070623222726243427262207061417163237BB74742538374E80
+50515150804E373801663534B835353535B83402FA5F02735E381B1B5A5BFED85B5A1B1B
+A1E441404041E4414040000000010047028C0275051E001D000001152627262322070614
+17163332373637150E0123222635343633321716027531313232713E3F3F3E7132323131
+30683B9FBCBEA535333304F760180C0C403FE63F400C0C185F1414B29799B0090A000000
+00020047024B0275051E0007002B00000116333235262322070615073437262726353436
+333217161715262726232207061417161736333217162322015A25305C01524035046008
+241E5EBEA5343431322F343132713E3F3F0206357BBC0101D23302EE0B202A9A2026023B
+2F131D5A9699B0090A1460170D0C3F40E6400205628A690000020047028C02CF06030011
+002E00000126272623220706151416333236353427263716171615140706232226353436
+3332171617270727372733173717070210201B1C1A693A3B6E5C5B6E1111064F24245A59
+9192B2AE8B0C10101B64C915B1729050D115BA049C0A04053D3C6D6A7C7C6A443534A550
+5150618F5757AE8F8CAE020103653C383372513E3637000000010054028C0262051F0031
+0000011617161514070623222726273516171633323736353427262B0135333236353427
+262322070607353E013332171615140601BD4E2B2C515296323635382D35363A5F363531
+2E565D6149562D2B4B2D33323D3D6C2F7C47484C03EE0D29293C61333308071060150A0B
+201F33311F1D553227241A190707115E0D0E2C2C4F3448000001001E029C01DF06030015
+00000115232207061D01331523112311233533353437363301DF6F3E1918BFBF756E6E37
+377706035517163A3850FDDD0223502C692F30000001FFE901AD015C050F001500001315
+1407062B0135333237363D012335331133113315EE3433722C1F4218187272746E029C0B
+783636581B1C550B500223FDDD5000000002004701AD02BE050F000C002C000001352322
+0706141716333237361311140706232227262735161716333237363D0106070623222726
+3534373633024AC65D343434345D5E3434745050A53D373633333232337239392438384E
+824F50504F8203DDEB3E3DE03D3E3E3D01A2FDDBA04E4F08091065190C0B34356B33371C
+1B585891825858000001006E01AD02BD050F001600001311331114171633323736351133
+1123110607062322266E7427274E5E363774742B38374A797E0394017BFE88592C2D3635
+5C0163FC9E014F391C1B860000020049029C01960603000B000F00001335331133113315
+2315233511331523497274676774747403995C011AFEE65CFDFD026A820000000001007A
+029C017E050F000C000013111417163B01152322263511EE1718431E2C7266050FFE7055
+1C1B576C7701900000010049029C0196050F000B00001335211523113315213533114901
+4D6A6AFEB36F04B35C5CFE455C5C01BB00010049029C0196050F00130000133521152315
+331523153315213533352335333549014D6A6A6A6AFEB36F6F6F04B35C5CBE5CA15C5CA1
+5CBE00000003FF5601AD0160060300030012001B000013331523032235343B0111331133
+15230607062723221716333237367A747465BFAA7A7472790B223314724B02024E42180B
+060382FC2C7C730273FD8D573F2335981D241B0D0001007A01AD017E0603000E00001311
+3311151417163B0115232226357A741718431E2C726602E4031FFCE153561B1B586C7800
+0001005B01AD016006030011000001151407062B01353332373627372311331101603334
+722C1F42181B0302747402F261783636581B1E530B0367FCEF00000000010071029C0283
+051E00050000133311211521717F0193FDEE051EFDDD5F000001007501AD047B051E0034
+00000136373633321716151114062B013533323635263734353426232207061511231134
+27262322070615112311331536373633321716029F2B3D3C526F3B3C6672A19342300101
+484A5A34357424244B59343475752738374D4C3636049745212145447EFE7A786C583656
+30E83D2D5A5835365CFE9E01775B2C2B35365CFE9E027361391C1B222300000000010075
+01AD047B0510002800000106070623222635113311141716333237363511331114171633
+32373635113311231106070623222602512B3C3D526E78752424495A35347424244B5934
+3574742837384C4D6C03154522218A7E017BFE895B2B2C35355C0163FE895B2B2C36355B
+0163FC9D01513A1B1C4600000001FFE901AD02C9051E001F0000131407062B0135333236
+351133153E0133321716151123113427262322070615EE3433722C1F4230742A704A7A3E
+3F7427284E5E36360291783636583656027E613838424481FE850177592C2D35365C0000
+0001007501AD0355051E0020000001342726232207061511231133153637363332171615
+1114163B01152322272635025027274E5E363675752938394A793F3E30421F2C72333404
+13592C2D35365CFE9E027361381C1C424481FE7A563658363678000000010071029C02C4
+051E000900001333011133112301112371AB012D7BABFED37B051EFE0701F9FD7E01FAFE
+0600000000030047028C02CF051E000F0017002000000132171615140706232227263534
+37361622070607212627172116171633323736018B9757565657979855575755F5BA362F
+070191062F31FE770B26365E5D3626051E57579B9A575858579A9B57575740395C5B38EF
+452D41412E0000000003004701AE02CF0603001D0026002E000001233521152315161716
+151407060715331521353335262726353437363717113637363534272603110607061417
+16014F9701A29770465656467097FE5E976E435757436E743625363625AA342337362405
+A75C5C8C0E46579B9A57470E855C5C860E46579A9B57450F5BFE2A0E2C41706F412DFE39
+01D40E2A41E2402B0001004601AD0261051E003A000001152E0123220706151417161F01
+1617161514070623222F011514163B0115232227263D02161716333236353427262F012E
+0135343736333216023B316A38572A2C1F1F5D287B34344D4E88393E0D304293A0723334
+403F3E3D52581F206C296B60474682407204FD62171617182F2415141208182B2A4D5733
+33090307563658363678226A1D0F0F322D2A17161508145449583030100000000001FFE9
+01AD01CA0603001700001302033437363B01152322070615131407062B01353332367A01
+0137337A6E6F3E1819023433722C1F42300291015D014D6533305517163AFD4A78363658
+360000000001002301AD01DB05C1001F000013153315231114163B01151407062B013533
+32363D0123222726351123353335ECEFEF3048773433722C1F423003863333555505C1B2
+50FEAC4D2C617836365836560B2D2C76015450B20002005E028C0390050F001700210000
+133533113311211133113315231523350607062322263D01290115141716333237365E6E
+740167747575742B38374A797E01DAFE9A27274E5E363103995C011AFEE6011AFEE65CFD
+60391C1B86820502592C2D362F00000000010047028B02D8050F00260000133521150607
+061514171633323736353427262735211523161716151407062027263534373637470117
+45282937385A5B37382A2C3F0112944724225A59FEE4595A21224A04B35C7B273A3F4B59
+373636375952383E237B5C383F3E4C835252515280523C3D3A00000000010075028A0292
+050F00130000013236351133111407062322272635113311141601845148754445858645
+44754802E2505A0183FE737B3E3F3F3E7B018DFE7D5A50000001007A029C02BF050F001E
+00000133161716151407062B012226351133111417163F013237363534272627260167CB
+482322595A8E2C726674171A41205A383729323A3004C4383F3E4C8352526C770190FE70
+551C1C01013637595138431F1800000000010026029C02D5050F0006000001230B012301
+3302D57BDCDD7B01099E029C020EFDF20273000000010037029C026E050F000900001321
+1501211521350121470227FE4C01B4FDC901B4FE5C050F5EFE3D525E01C3000000010037
+01AD02FD050F0016000013211501211523151417163B01152322263D0121350121470227
+FE4C01B4011718431E2C7266FE3E01B4FE5C050F5EFE3D520B561B1B586C780B5E01C300
+00020037025E026E050F0014001B00000106152334372335012135211501333633321714
+2327333235342306017C026002E501B4FE5C0227FE4C6E268A8F01D20D0D6D2C37029C1D
+21211D5E01C3525EFE3DA28A6A521F33010000000001003701A802A3050F002100000132
+17161716151407062322272627351E0133323736353427262B0135012135211501684351
+3E36336060B03B3F3F43357E45783E3F3A3A686E010FFE5C022603A720173D3B4D7C4344
+0A0B146D1B1C2A2A504A2A295D0118525E00000000030047028F02CF060C00080010001D
+00000121161716333237363726272622070607133217161007062322261037360253FE6F
+062F365E5D362F05092B36BA362C08C797575656579798AC5656042A804D57584DDE6D47
+5958466F01837677FE5E7777EE01A277760000000001FC5B04EEFFA50666000500000121
+35213733FEB0FDAB0217A88B04EE94E40001FC5B04EEFFA5066600050000010333172115
+FD50F58BA8021704EE0178E4940000000001FC5B04EEFFA5066600050000011323272135
+FEB0F58BA8FDE90666FE88E4940000000001FC5B04EEFFA5066600050000012115210723
+FD500255FDE9A88B066694E40001FC4204EEFFBE06660009000001331323270723033317
+FE3594F58BB4B494F58BB40666FE88F5F50178F50001FC4204EEFFBE0666000900000117
+3733032327072313FDCBB4B48BF594B4B48BF50666F5F5FE88F5F50178000000FFFF0010
+FE13056805D5102702D604BC0001120600240000FFFF007BFE13042D047B102702D60454
+0001120600440000FFFF00C9000004EC07501027171E04BC0175120600250000FFFF00B8
+FFE304A40752102702B80316013E120600450000FFFF00C9FE8904EC05D5122600250000
+100702D404A50000FFFF00BAFE8904A40614122600450000100702D4049A0000FFFF00C9
+FEC004EC05D51226002500001007028F00970000FFFF00BAFEC004A40614122600450000
+1007028F008F0000FFFF0073FE750527076C10271717054C0176120600890000FFFF0071
+FE7503E70666122600A900001006007643000000FFFF00C9000005B007501027171E04EC
+0175120600270000FFFF0071FFE3045A0789102702B805FE0175120600470000FFFF00C9
+FE8A05B005D5102702D404EC0001120600270000FFFF0071FE8A045A0614102702D40466
+0001120600470000FFFF00C9FEC105B005D5102702E204EC0001120600270000FFFF0071
+FEC1045A0614102702E204660001120600470000FFFF00C9FE7705B005D5122600270000
+1006007A5B020000FFFF0071FE75045A06141226004700001006007AF6000000FFFF00C9
+FE1505B005D5102702DE04EC0001120600270000FFFF0071FE15045A0614102702DE0466
+0001120600470000FFFF00C90000048B085A1226002800001006174FEE000000FFFF0071
+FFE3047F075E1027174FFFD9FF04120600480000FFFF00C90000048B085A122600280000
+1006174EEC000000FFFF0071FFE3047F075E1226004800001007174EFFD7FF04FFFF00C9
+FE4B048B05D5122600280000100702DE04B10037FFFF0071FE4B047F047B122600480000
+100702DE04B00037FFFF00C9FE76048B05D5122600280000100702B000B30000FFFF0071
+FE76047F047B122600480000100702B0009B0000FFFF00C9FE75048B076D1027171D04A1
+01751226002800001007007A00BE0000FFFF0071FE75047F06481226004800001027029A
+008700001006007A4B000000FFFF00C900000423074F1027171E04760174120600290000
+FFFF002F000002F80789102702B803E00175120600490000FFFF0073FFE3058B07181226
+002A00001007028B01320122FFFF0071FE56045A05F61226004A00001006028B49000000
+FFFF00C90000053B074E1027171E051401731206002B0000FFFF00B80000046407521027
+02B80316013E1206004B0000FFFF00C9FE89053B05D5102702D4050200001206002B0000
+FFFF00BAFE8904640614102702D4048F00001206004B0000FFFF00C90000053B07501226
+002B00001007006A01080140FFFFFFED00000464074E102702B90316013E1206004B0000
+FFFF0011FE74053B05D51226002B00001007007AFEEEFFFFFFFF0002FE74046406141226
+004B00001007007AFEDFFFFFFFFF00C9FE39053B05D51226002B0000100702DF050A0000
+FFFF00BAFE39046406141226004B0000100702DF04950000FFFF0000FE76029405D51226
+002C0000100702B0FF4A0000FFFFFFD3FE7602670614102702B0FF1D00001206004C0000
+FFFF000700000259085A1226002C00001007174CFE740000FFFFFFF40000024607161226
+00F300001007174CFE61FEBCFFFF00C90000056A076C1027171704E201761206002E0000
+FFFF00BA0000049C076C10271717035A01761206004E0000FFFF00C9FE89056A05D51226
+002E0000100702D404DC0000FFFF00BAFE89049C06141226004E0000100702D404910000
+FFFF00C9FEC0056A05D51226002E00001007028F010D0000FFFF00BAFEC0049C06141226
+004E00001006028F76000000FFFF00C9FE89046A05D5102702D4049A00001006002F0000
+FFFF00C9FE8901840614102702D4032700001006004F0B00FFFF0003FE8A046A076B1027
+02B5032A0175102702D4049900011206002F0000FFFFFFFDFE890253073110270071FF28
+013B100609340000FFFF00C9FEC0046A05D51226002F00001007028F008E0000FFFFFFF4
+FEC0024A06141027028FFF1F00001206004F0000FFFF00C9FE14046A05D5102702880097
+F9261206002F0000FFFFFFDEFE14025C061410270288FF1DF9261206004F0000FFFF00C9
+0000061F076C1027171705730176120600300000FFFF00BA0000071D0666122600500000
+1007007601940000FFFF00C90000061F074F1027171E05770174120600300000FFFF00BA
+0000071D0614102702B805E90000120600500000FFFF00C9FE89061F05D5102702D40574
+0000100600300000FFFF00BAFE89071D047B102702D405E60000100600500000FFFF00C9
+0000053307501027171E04F50175120600310000FFFF00BA000004640614102702B80489
+0000120600510000FFFF00C9FE89053305D5102702D404FE0000100600310000FFFF00BA
+FE890464047B102702D4048F0000100600510000FFFF00C9FEC0053305D5122600310000
+1007028F00F70000FFFF00BAFEC00464047B1226005100001007028F008C0000FFFF00C9
+FE14053305D51027028800FEF926120600310000FFFF00BAFE140464047B102702880095
+F926120600510000FFFF0073FFE305D9085A1226003200001006175466000000FFFF0071
+FFE30475070C12260052000010071754FFB2FEB2FFFF0073FFE305D90856122600320000
+100617526C000000FFFF0071FFE30475070F1226005200001027006A006F00FF10071718
+04720012FFFF0073FFE305D9085A1226003200001006174F6A000000FFFF0071FFE30475
+075E1026005200001007174FFFB5FF04FFFF0073FFE305D9085A1226003200001006174E
+68000000FFFF0071FFE30475075E1027174EFFB9FF04100600520000FFFF00C90000048D
+076C10271717049E0176120600330000FFFF00BAFE5604A4066612260053000010060076
+32000000FFFF00C90000048D074F1027171E04840174120600330000FFFF00BAFE5604A4
+0614102702B804A60000120600530000FFFF00C900000554074E1027171E048301731206
+00350000FFFF00BA0000034A0614102702B804170000120600550000FFFF00C9FE890554
+05D5102702D4047D0000100600350000FFFF00BAFE89034A047B102702D4032000001006
+00550000FFFF00C9FE890554073110270071007D013B100609570000FFFF00BAFE89034A
+05F51026007118FF1006095800000000FFFF00C9FEC0055405D51226003500001007028F
+00E50000FFFF0054FEC0034A047B1226005500001007028FFF7F0000FFFF0087FFE304A2
+074F1027171E04B80174120600360000FFFF006FFFE303C70614102702B8042700001206
+00560000FFFF0087FE8904A205F0102702D4048A0000100600360000FFFF006FFE8A03C7
+047B102702D404250001120600560000FFFF0087FFE304A2076D1027171704E201761027
+171E03A40192120600360000FFFF006FFFE303E206661226005600001026029B8C561007
+0076009000000000FFFF0087FFE304A2085710261753E4001206003600000000FFFF006F
+FFE303C707C9102702B8042D01B5120601230000FFFF0087FE8904A2074F1027171E049B
+01741206095F0000FFFF006FFE8A03C705DE102702B80427FFCA120609600000FFFFFFFA
+000004E9074F1027171E04720174120600370000FFFF0037000002F20789102702B8031A
+0175120600570000FFFFFFFAFE8904E905D5102702D404710000100600370000FFFF0037
+FE8902F2059E102702D403E80000100600570000FFFFFFFAFEC004E905D5122600370000
+1006028F62000000FFFF0037FEC0031F059E1026028FF4001206005700000000FFFFFFFA
+FE1404E905D5102702880072F926120600370000FFFF0037FE140327059E10270288FFE8
+F926120600570000FFFF00B2FE89052905D5102702D504F00000120600380000FFFF00AE
+FE890458047B102702D5047B0000120600580000FFFF00B2FE76052905D5122600380000
+100702B000F20000FFFF00AEFE760458047B122600580000100702B0008F0000FFFF00B2
+FE4B052905D5122600380000100702DE04E00037FFFF00AEFE4B0458047B122600580000
+100702DE04750037FFFF00B2FFE30529085A102617542E001206003800000000FFFF00AE
+FFE3045807EC1026012B00001007007600960186FFFF00B2FFE3052908341026174A3200
+1206003800000000FFFF00AEFFE3045806F41027174AFFC8FEC0120600580000FFFF0010
+00000568077D1226003900001007029E00ED0146FFFF003D0000047F0637122600590000
+1006029E6D000000FFFF0010FE89056805D5102600390000100702D404BC0000FFFF003D
+FE89047F0460102600590000100702D4045E0000FFFF0044000007A607721027171905F5
+017C1206003A0000FFFF005600000635066B10270043010900051206005A0000FFFF0044
+000007A607721027171705F5017C1206003A0000FFFF005600000635066D102700760186
+00071206005A0000FFFF0044000007A6074E1027006A01F5013E1206003A0000FFFF0056
+0000063506101027006A014500001206005A0000FFFF0044000007A6074E1027171E05F5
+01731206003A0000FFFF0056000006350614102702B8054700001206005A0000FFFF0044
+FE8907A605D51226003A0000100702D405FB0000FFFF0056FE89063504601226005A0000
+100702D4054A0000FFFF003D0000053B074F1027171E04CA01731206003B0000FFFF003B
+000004790614102702B8046200001206005B0000FFFF003D0000053B074E1226003B0000
+1007006A00CA013EFFFF003B0000047906101226005B00001006006A66000000FFFFFFFC
+000004E707501027171E047201751206003C0000FFFF003DFE56047F0614102702B80460
+00001206005C0000FFFF005C0000051F076D1027171A04BE01751206003D0000FFFF0058
+000003DB06661226005D0000100602881A000000FFFF005CFE89051F05D51226003D0000
+100702D404D90000FFFF0058FE8903DB04601226005D0000100702D404310000FFFF005C
+FEC0051F05D51226003D00001007028F00C70000FFFF0058FEC003DB04601226005D0000
+1006028F1B000000FFFF00BAFEC0046406141226004B00001006028F66000000FFFF0004
+000002F2074E1226005700001007006AFF2D013EFFFF00560000063507061226005A0000
+1007029C0142000000><FFFF003DFE56047F07061226005C00001007029C00810000FFFF
+007BFFE3056106141226004400001007028003DA0000FFFF002F000002F80789102702B8
+03E0017512060141000000010002000002F8061400180000212311072737112335333534
+363B01152322070615113717050198B9934ADDB0B0AEBDAEB0642626D64BFEDF0214686A
+9D011E8F4EBBAB99282967FE749869CF00000001002F000002F806140017000021231123
+3533352335333637363B011523220706073315230198B9B0B0B0B30D4757BDAEB064261E
+06FDFF03458F8C8F894656992820448F0000000100B2FFE305B405F20037000001262322
+0E0315112311343E0333320417220415141E05151404232227351E0133323635342E0735
+343604036DAE40665F4026CB396490A663D9013037CFFEFF436A81816A43FEF7D3B4C96D
+B16F629729465B64645B4629DF04F45A184068A76FFC88039183CF8B5C28C5BD7D5F2D43
+2D2D3E548C5CA4C95FD045467658355033292024324267438FBBFFFF0071FFE3047505F0
+100603480000FFFF0010FE89056805D5102702D404B70000120600240000FFFF007BFE89
+042D047B102702D404210000120600440000FFFF00100000056807F01226002400001007
+02BA04BC0175FFFF007BFFE3042D067B122600440000100702BA04540000FFFF00100000
+0568083A1226002400001006175500000000FFFF007BFFE304AF06C510271755FF97FE8B
+100600440000FFFF001000000568083A1226002400001006175600000000FFFF007BFFE3
+042D06C610260044000010071756FF94FE8CFFFF001000000568085B1226002400001006
+175C00000000FFFF007BFFE3049D06E61027175CFF96FE8B100600440000FFFF00100000
+056808751226002400001006175700000000FFFF007BFFE3042D070010271757FF96FE8B
+100600440000FFFF0010FE890568076D122600840000100702D404AF0000FFFF007BFE89
+042D0666122600A40000100702D404220000FFFF001000000568085A1226002400001006
+175900000000FFFF007BFFE3042D070410271759FF91FEAA100600440000FFFF00100000
+0568085A1226002400001006175A00000000FFFF007BFFE3042D07041027175AFF92FEAA
+100600440000FFFF001000000568088B1226002400001006175B00000000FFFF007BFFE3
+042D07351027175BFF94FEAA100600440000FFFF00100000056808591226002400001006
+175800000000FFFF007BFFE3042D070310260044000010071758FF92FEAAFFFF0010FE89
+05680792122600C40000100702D404C00000FFFF007BFE89042D061F122600C500001007
+02D404330000FFFF00C9FE89048B05D5102600280000100702D4049E0000FFFF0071FE89
+047F047B102600480000100702D4048B0000FFFF00C90000048B07F01226002800001007
+02BA049E0175FFFF0071FFE3047F067B122600480000100702BA048D0000FFFF00C90000
+048B075E10271718049E0175120600280000FFFF0071FFE3047F06371027029E00970000
+120600480000FFFF00C900000518083A1226002800001006175500000000FFFF0071FFE3
+04E806C510271755FFD0FE8B100600480000FFFF00C90000048B083A1226002800001006
+1756EE000000FFFF0071FFE3047F06C610271756FFD0FE8C100600480000FFFF00C90000
+04F5085B1226002800001006175CEE000000FFFF0071FFE304D706E61026004800001007
+175CFFD0FE8BFFFF00C90000048B087512260028000010061757EA000000FFFF0071FFE3
+047F070010271757FFD1FE8B100600480000FFFF00C9FE89048B076D1226008C00001007
+02D4049E0000FFFF0071FE89047F0666102702D4048B0000102609B6000010070288008B
+0000FFFF005A0000021A07F01226002C0000100702BA03230175FFFF004400000204067C
+122600F30000100702BA030D0001FFFF00C9FE89019305D51026002C0000100702D4032E
+0000FFFF00BFFE89017906141026004C0000100702D4031D0000FFFF0073FE8905D905F0
+102600320000100702D405270000FFFF0071FE890475047B102600520000100702D40473
+0000FFFF0073FFE305D907F0122600320000100702BA05270175FFFF0071FFE30475067B
+122600520000100702BA047D0000FFFF0073FFE305D9083A122600320000100617556C00
+0000FFFF0071FFE304CE06C510271755FFB6FE8B100600520000FFFF0073FFE305D9083A
+122600320000100617566A000000FFFF0071FFE3047506C610271756FFB5FE8C10060052
+0000FFFF0073FFE305D9085B1226003200001006175C6A000000FFFF0071FFE304BD06E6
+1027175CFFB6FE8B100600520000FFFF0073FFE305D90875122600320000100617576500
+0000FFFF0071FFE30475070010271757FFB6FE8B100600520000FFFF0073FE8905D9076D
+122600960000100702D405270000FFFF0071FE8904750666102702D404730000102609CA
+00001006028873000000FFFF0067FFE3061D076B1027171705270175120601620000FFFF
+0076FFE304D306661026007673001206016300000000FFFF0067FFE3061D076B10271719
+05270175120601620000FFFF0076FFE304D306661026004373001206016300000000FFFF
+0067FFE3061D07F0122601620000100702BA05270175FFFF0076FFE304D3067B12260163
+0000100702BA047D0000FFFF0067FFE3061D075E1027171805270175120601620000FFFF
+0076FFE304D306371026029E73001206016300000000FFFF0067FE89061D061412260162
+0000100702D405270000FFFF0076FE8904D304EB122601630000100702D404730000FFFF
+00B2FE89052905D5102600380000100702D404F50000FFFF00AEFE890458047B10260058
+0000100702D4047B0000FFFF00B2FFE3052907F0122600380000100702BA04EE0175FFFF
+00AEFFE30458067B122600580000100702BA047D0000FFFF00ADFFF7065F076B10271717
+04EE0175120601710000FFFF00B0FFE305690666102600767B001206017200000000FFFF
+00ADFFF7065F076B1027171904EE0175120601710000FFFF00B0FFE30569066610260043
+7B001206017200000000FFFF00ADFFF7065F07F0122601710000100702BA04EE0175FFFF
+00B0FFE30569067B122601720000100702BA047D0000FFFF00ADFFF7065F075E10271718
+04EE0175120601710000FFFF00B0FFE3056906371027029E00800000120601720000FFFF
+00ADFE89065F0614122601710000100702D404F50000FFFF00B0FE89056904EB12260172
+0000100702D4047B0000FFFFFFFC000004E707721226003C0000100717190472017CFFFF
+003DFE56047F066B1226005C00001006004321050000FFFFFFFCFE8904E705D5102702D4
+047600001206003C0000FFFF003DFE56047F0460102702D4057400001206005C0000FFFF
+FFFC000004E707F71226003C0000100702BA0472017CFFFF003DFE56047F06821226005C
+0000100702BA04600007FFFFFFFC000004E7075E10271718047201751206003C0000FFFF
+003DFE56047F06371026029E77001206005C00000000000100C90000061C05D500090000
+13331133113311211521C9CAE8CA02D7FAAD05D5FAD5052BFAD5AA000000000100200000
+03B20614001300001333153335331533152311231123112311233533C1B8E0B8A1A1B8E0
+B8A1A106149393937DFAFC0504FAFC05047DFFFF0071FFE704E406611026034500001006
+0AA970000000FFFF0071FFE704E4066110260345000010060AE148000000FFFF0071FFE7
+04E4066610260345000010070AB600940000FFFF0071FFE704E406661026034500001007
+0AC300840000FFFF0071FFE704E4066610260345000010070AB700840000FFFF0071FFE7
+04E4066610260345000010070AC400A00000FFFF0071FFE704E4076D1026034500001006
+0AB876000000FFFF0071FFE704E4076D10260345000010060AC544000000FFFF00100000
+0568066110260326000010070AA9FF230000FFFF00100000056806611026032600001007
+0AE1FEF30000FFFF0005000006F4066610270326018C000010070AB6FF7C00000000FFFF
+0006000006F4066610270326018C000010060AC38800FFFF000700000616066610270326
+00AE000010070AB7FF5300000000FFFF00040000065806661027032600F0000010070AC4
+FF6F00000000FFFF000700000599076D10260326310010070AB8FF510000FFFF00040000
+05E0076D10260326780010070AC5FF4E0000FFFF0085FFE303C806611026034900001006
+0AA944000000FFFF0085FFE303C8066110260349000010060AE139000000FFFF0085FFE3
+03C8066610260349000010060AB620000000FFFF0085FFE303C806661026034900001006
+0AC325000000FFFF0085FFE303E3066610260349000010060AB74F000000FFFF0085FFE3
+0403066610260349000010060AC452000000FFFF00070000052D06611027032A00A20000
+10070AA9FE8100000000FFFF00070000052D06611027032A00A2000010070AE1FE810000
+0000FFFF00050000073706661027032A02AC000010070AB6FF7C00000000FFFF00060000
+074906661027032A02BE000010060AC38800FFFF0007000006AD06661027032A02220000
+10070AB7FF5300000000FFFF0004000006E906661027032A025E000010070AC4FF6F0000
+0000FFFF00BAFE56046406611026034B000010070AA900A60000FFFF00BAFE5604640661
+1026034B000010070AE100A20000FFFF00BAFE56046406661026034B000010070AB60080
+0000FFFF00BAFE56046406661026034B000010060AC370000000FFFF00BAFE5604640666
+1026034B000010070AB700840000FFFF00BAFE56046406661026034B000010070AC400AE
+0000FFFF00BAFE560464076D1026034B000010070AB8009C0000FFFF00BAFE560464076D
+1026034B000010070AC500870000FFFF0007000005E906611027032C00AE000010070AA9
+FE8100000000FFFF0007000005E606611027032C00AB000010070AE1FE8100000000FFFF
+0005000007E706661027032C02AC000010070AB6FF7C00000000FFFF0006000007ED0666
+1027032C02B2000010060AC38800FFFF00070000076E06661027032C0233000010070AB7
+FF5300000000FFFF00040000079F06661027032C0264000010070AC4FF6F00000000FFFF
+0007000006AF076D1027032C0174000010070AB8FF5100000000FFFF0004000006CA076D
+1027032C018F000010070AC5FF4E00000000FFFF009B0000026E06611026034D00001007
+0AA9FF150000FFFF00910000026E06611026034D000010070AE1FF0B0000FFFFFFB00000
+02B906661026034D000010070AB6FF270000FFFFFFBA000002C706661026034D00001007
+0AC3FF3C0000FFFF0005000002E506661026034D000010070AB7FF510000FFFFFFD20000
+02EE06661026034D000010070AC4FF3D0000FFFFFFCB0000026E076D1026034D00001007
+0AB8FF150000FFFFFFC60000026E076D1026034D000010070AC5FF100000FFFF00070000
+024106611027032E00AE000010070AA9FE8100000000FFFF00070000023506611027032E
+00A2000010070AE1FE8100000000FFFF00050000044B06661027032E02B8000010070AB6
+FF7C00000000FFFF00060000044B06661027032E02B8000010060AC38800FFFF00070000
+03C706661027032E0234000010070AB7FF5300000000FFFF00040000040306661027032E
+0270000010070AC4FF6F00000000FFFF000700000322076D1027032E018F000010070AB8
+FF5100000000FFFF000400000329076D1027032E0196000010070AC5FF4E00000000FFFF
+0071FFE30475066110260353000010060AA978000000FFFF0071FFE30475066110260353
+000010060AE16E000000FFFF0071FFE30475066610260353000010060AB665000000FFFF
+0071FFE30475066610260353000010060AC354000000FFFF0071FFE30475066610260353
+000010070AB700880000FFFF0071FFE30475066610260353000010070AC400910000FFFF
+0007FFE305FC066110260334230010070AA9FE810000FFFF0007FFE30656066110260334
+7D0010070AE1FE810000FFFF0005FFE3084F0666102703340276000010070AB6FF7C0000
+0000FFFF0006FFE308590666102703340280000010060AC38800FFFF0007FFE3070F0666
+102703340136000010070AB7FF5300000000FFFF0004FFE3075006661027033401770000
+10070AC4FF6F00000000FFFF0095FFE3042A066110260359000010060AA93D000000FFFF
+0095FFE3042A066110260359000010060AE11B000000FFFF0095FFE3042A066610260359
+000010060AB627000000FFFF0095FFE3042A066610260359000010060AC321000000FFFF
+0095FFE3042A066610260359000010060AB760000000FFFF0095FFE3042A066610260359
+000010060AC457000000FFFF0095FFE3042A076D10260359000010060AB838000000FFFF
+0095FFE3042A076D10260359000010060AC518000000FFFF000700000649066110270339
+0162000010070AE1FE8100000000FFFF0006000007FF0666102703390318000010060AC3
+8800FFFF00040000081D0666102703390336000010070AC4FF6F00000000FFFF00040000
+0733076D10270339024C000010070AC5FF4E00000000FFFF0087FFE3062706611026035D
+000010070AA9015E0000FFFF0087FFE3062706611026035D000010070AE101540000FFFF
+0087FFE3062706661026035D000010070AB601590000FFFF0087FFE3062706661026035D
+000010070AC3015E0000FFFF0087FFE3062706661026035D000010070AB701A40000FFFF
+0087FFE3062706661026035D000010070AC4018B0000FFFF0087FFE30627076D1026035D
+000010070AB801630000FFFF0087FFE30627076D1026035D000010070AC5015E0000FFFF
+00070000061D06611026033D4E0010070AA9FE810000FFFF00070000067106611027033D
+00A2000010070AE1FE8100000000FFFF00050000086906661027033D029A000010070AB6
+FF7C00000000FFFF00060000087506661027033D02A6000010060AC38800FFFF00070000
+074306661027033D0174000010070AB7FF5300000000FFFF00040000077906661027033D
+01AA000010070AC4FF6F00000000FFFF000700000711076D1027033D0142000010070AB8
+FF5100000000FFFF000400000750076D1027033D0181000010070AC5FF4E00000000FFFF
+0071FFE704E4066610260345000010060AD574000000FFFF0071FFE704E4066610060340
+0000FFFF0085FFE303C8066610260349000010060AD554000000FFFF0085FFE303C80666
+100603410000FFFF00BAFE56046406661026034B000010070AD500C60000FFFF00BAFE56
+04640666100603420000FFFFFF8D0000026E06661026034D000010070AD5FEE30000FFFF
+00A6000002980666100603430000FFFF0071FFE30475066610260353000010060AD57B00
+0000FFFF0071FFE304750666100603600000FFFF0095FFE3042A06661026035900001006
+0AD530000000FFFF0095FFE3042A0666100603610000FFFF0087FFE3062706661026035D
+000010070AD5014D0000FFFF0087FFE306270666100603620000FFFF0071FE5604E40661
+102609F900001006031648000000FFFF0071FE5604E40661102609FA0000100603164800
+0000FFFF0071FE5604E40666102609FB00001006031648000000FFFF0071FE5604E40666
+102609FC00001006031648000000FFFF0071FE5604E40666102609FD0000100603164800
+0000FFFF0071FE5604E40666102609FE00001006031648000000FFFF0071FE5604E4076D
+102609FF00001006031648000000FFFF0071FE5604E4076D10260A000000100603164800
+0000FFFF0010FE560568066110260A01000010070AA800BA0000FFFF0010FE5605680661
+10260A02000010070AA800BA0000FFFF0005FE5606F4066610260A03000010070AA80246
+0000FFFF0006FE5606F4066610260A04000010070AA802460000FFFF0007FE5606160666
+10260A05000010070AA801680000FFFF0004FE560658066610260A06000010070AA801AA
+0000FFFF0007FE560599076D10260A07000010070AA800EB0000FFFF0004FE5605E0076D
+10260A08000010070AA801320000FFFF00BAFE560464066110260A15000010070316FF38
+0000FFFF00BAFE560464066110260A16000010070316FF380000FFFF00BAFE5604640666
+10260A17000010070316FF380000FFFF00BAFE560464066610260A18000010070316FF38
+0000FFFF00BAFE560464066610260A19000010070316FF380000FFFF00BAFE5604640666
+10260A1A000010070316FF380000FFFF00BAFE560464076D10260A1B000010070316FF38
+0000FFFF00BAFE560464076D10260A1C000010070316FF380000FFFF0007FE5605E90661
+10260A1D000010070AA8019E0000FFFF0007FE5605E6066110260A1E000010070AA8019B
+0000FFFF0005FE5607E7066610260A1F000010070AA8039C0000FFFF0006FE5607ED0666
+10260A20000010070AA803A20000FFFF0007FE56076E066610260A21000010070AA80323
+0000FFFF0004FE56079F066610260A22000010070AA803540000FFFF0007FE5606AF076D
+10260A23000010070AA802640000FFFF0004FE5606CA076D10260A24000010070AA8027F
+0000FFFF0087FE560627066110260A4D00001007031601590000FFFF0087FE5606270661
+10260A4E00001007031601590000FFFF0087FE560627066610260A4F0000100703160159
+0000FFFF0087FE560627066610260A5000001007031601590000FFFF0087FE5606270666
+10260A5100001007031601590000FFFF0087FE560627066610260A520000100703160159
+0000FFFF0087FE560627076D10260A5300001007031601590000FFFF0087FE560627076D
+10260A5400001007031601590000FFFF0007FE56061D066110260A55000010070AA8015C
+0000FFFF0007FE560671066110260A56000010070AA801B00000FFFF0005FE5608690666
+10260A57000010070AA803A80000FFFF0006FE560875066610260A58000010070AA803B4
+0000FFFF0007FE560743066610260A59000010070AA802820000FFFF0004FE5607790666
+10260A5A000010070AA802B80000FFFF0007FE560711076D10260A5B000010070AA80250
+0000FFFF0004FE560750076D10260A5C000010070AA8028F0000FFFF0071FFE704E40648
+1026034500001006029A7A000000FFFF0071FFE704E405F6102603450000100600717900
+0000FFFF0071FE5604E4066610260A5D00001006031648000000FFFF0071FE5604E40479
+1026034500001006031648000000FFFF0071FE5604E40666102603400000100603164800
+0000FFFF0071FFE704E4063710260345000010060AAA6E000000FFFF0071FE5604E40637
+10260AA000001006031648000000FFFF001000000568076D1026032600001007171D04BA
+0175FFFF00100000056807311026032600001007007100BC013BFFFFFFFC000005AA0666
+10260326420010070AD5FF520000FFFF00100000056806661006031D0000FFFF0010FE56
+056805D510260326000010070AA800BA0000FFFF018604C20278066110060AA90000FFFF
+01B6FE560292FFA41006031600000001018604C20278066100080048B4050807020910D4
+3CDCB23F08015DC031B6000607060302090010D4B43F025F02025DB0114B5058CC1BC059
+CCCCB23F07015D113930B1060349B10706495058B3054006403838590110233516352335
+330278F28685F105CDFEF567039D9E000000FFFF00B6051D034A06371006029E0000FFFF
+00B60546034A076D10271718040001841206006A0000FFFF00BAFE560464066610260A61
+000010070316FF380000FFFF00BAFE560464047B1026034B000010070316FF380000FFFF
+00BAFE560464066610260342000010070316FF380000FFFF00BAFE56046406371026034B
+000010070AAA00900000FFFF00BAFE560464063710260AAF000010070316FF380000FFFF
+FFFC000005ED06661027032A0162000010070AD5FF5200000000FFFFFFE7000005750666
+1006031F0000FFFFFFFC000006A906661027032C016E000010070AD5FF5200000000FFFF
+FFF30000061F0666100603200000FFFF00C9FE56053B05D51026032C000010070AA800FF
+0000FFFF008904C20392066610270AA9FF03000010070AD5010900000000FFFF00B404C2
+0394066610270AA9FF2E000010060AE04200FFFF00B604C2034A076D1027171804000184
+10060AA90000FFFFFFEB0000026E06481026034D00001007029AFF240000FFFFFFE30000
+026E05F61026034D000010070071FF0E0000FFFFFFD80000026E07D21026034D00001007
+0AD3FF2E0000FFFF00050000028007D2100603250000FFFFFFE40000027806371026034D
+000010070AAAFF2E0000FFFFFFE60000027A076D1026034D000010070AABFF300000FFFF
+FFF500000267076D1026032E00001007171D032E0175FFFF00030000025907311026032E
+000010070071FF2E013BFFFFFFFC0000030406661027032E0171000010070AD5FF520000
+0000FFFFFFED0000027D0666100603210000FFFF007E04C2038B066610270AE1FEF80000
+10070AD5010200000000FFFF009504C203B1066610270AE1FF0F000010060AE05F00FFFF
+00B604C2034A076D102717180400018410060AE10000FFFF0095FFE3042A064810260359
+00001006029A27000000FFFF0095FFE3042A05F61026035900001006007124000000FFFF
+0095FFE3042A07D210260359000010060AD31B000000FFFF0095FFE3042A07D210060344
+0000FFFF00BAFE5604A4066110260355000010070AA900BB0000FFFF00BAFE5604A40661
+10260355000010070AE100B10000FFFF0095FFE3042A063710260359000010060AAA2700
+0000FFFF0095FFE3042A076D10260359000010060AAB1A000000FFFFFFFC000004E7076D
+1026033900001007171D04760175FFFFFFFC000004E70731102603390000100700710080
+013BFFFFFFFC000006C706661027033901E0000010070AD5FF5200000000FFFFFFE10000
+06910666100603230000FFFF00070000053506611027033600A8000010070AE1FE810000
+0000FFFF00AA0546032907D21226006A000010070AD50000016CFFFF00D70546035207D2
+1006031C0000FFFF00AA04F002890666100600430000FFFF0087FE560627066610260A69
+00001007031601590000FFFF0087FE56062704601026035D00001007031601590000FFFF
+0087FE56062706661026036200001007031601590000FFFF0087FFE3062706371026035D
+000010070AAA014F0000FFFF0087FE560627063710260AD900001007031601590000FFFF
+FFFCFFE30714066610270334013B000010070AD5FF5200000000FFFFFFF2FFE306010666
+100603220000FFFFFFFC0000071306661027033D0144000010070AD5FF5200000000FFFF
+FFDB000006050666100603240000FFFF004EFE5605CF05E71026033D000010070AA8010E
+0000FFFF017304EE035206661006007600000001018604C20278066100080048B4020704
+000910D4C0DCB23F07015D3C31B6000302030607090010D4B43F075F07025DB0114B5058
+CC1BC059CCCCB23F02015D113930B1030649B10203495058B30340044038385901353315
+23143715220186F28686F205CD949E9D03670001006401DF027F028300030011B6009C02
+0401000410DCCC310010D4EC301321152164021BFDE50283A400FFFF006401DF027F0283
+12060AF200000001006401E904B3027900030010B602A900E90401002FC6310010FCEC30
+1321152164044FFBB102799000000001006401E9039C027900030010B602A900E9040100
+2FC6310010FCEC3013211521640338FCC802799000000001006401E9079C02790003000F
+B502A9000401002FCC310010D4EC3013211521640738F8C80279900000000001000001E9
+080002790003000FB502A9000401002FCC310010D4EC30112115210800F800027990FFFF
+0104FE1D02F8061D1026005F00001007005F014A0000FFFFFFECFE1D0414FFEE10260042
+00001007004200000142000100AE03E901D305D500050018400B009E0381060304001901
+0610DCFCD4CC310010F4EC300123351333030181D3A4815203E9AD013FFEC10000000001
+00B203FE01D705D500050018400B039E00810603040119000610DCECD4CC310010F4EC30
+0133150323130104D3A4815205D598FEC1013F000000000100AEFF1201D300FE00050018
+400B039E00830603040119000610D4ECD4CC310010FCEC302533150323130100D3A48152
+FEACFEC00140000100B203FE01D705D50005000001151323033501855281A405D598FEC1
+013F98000000000200AE03E9036D05D50005000B0027401306009E0903810C090A061907
+0304070019010C10DCFCCCD4CC10FED4CE310010F43CEC32300123351333030523351333
+030181D3A48152019AD3A4815203E9AD013FFEC1ADAD013FFEC1000200AE03E9036D05D5
+0005000B0027401309039E0600810C090A0719060103040119000C10DCECD4CC10DCEED4
+CE310010F43CEC32300133150323132533150323130100D3A48152019AD3A4815205D5AC
+FEC00140ACACFEC00140000200AEFF12036D00FE0005000B0027401309039E0600830C03
+0401190007090A0719060C10DCECD4CC10DCEED4CE310010FC3CEC323025331503231325
+3315032313029AD3A48152FE66D3A48152FEACFEC00140ACACFEC0014000000200AE03E9
+036D05D50005000B000001151323033521151323033501815281A4026D5281A405D5ADFE
+C1013FADADFEC1013FAD00010039FF3B03C705D5000B002740140804B90A02008106C20C
+0359050157095907000C10D43CECFC3CEC310010E4F4D43CEC3230013311211521112311
+21352101A8B0016FFE91B0FE91016F05D5FE5C99FBA3045D990000010039FF3B03C705D5
+0013003E40201206B9001008B90A0400020E0A0C8102C2140F0059110D01570905590B07
+031410D43C3CEC32FC3C3CEC32310010E4F4C43210C43210EE3210EE3230252111231121
+352111213521113311211521112103C7FE91B0FE91016FFE91016FB0016FFE91016FDFFE
+5C01A49A021F9901A4FE5C99FDE10001013301D103850421000B0012B709C7030C065C00
+0C10D4EC310010D4EC300134363332161514062322260133AD7E7CABAC7D7DAC02FA7CAB
+AB7C7DACAC0000010133018103D5047100020000011101013302A2018102F0FE88000001
+00EC000001C100FE00030011B30119000410D4EC3100B20083022FEC3037331523ECD5D5
+FEFE000200EC0000046B00FE00030007001AB60019010519040810D4FCD4EC3100B40400
+8306022F3CEC323025331523253315230396D5D5FD56D5D5FEFEFEFE0000000300EC0000
+071400FE00030007000B00234011080400830A06020419050019010919080C10D4FCD4EC
+D4EC31002F3C3CEC3232302533152325331523253315230396D4D402A9D5D5FAADD5D5FE
+FEFEFEFEFE00000100DC026B01AF03690003000013331523DCD3D30369FE00070071FFE3
+0A4C05F0000B0017002300270033003F004B00AE4044240F252625260F27242742400092
+0C2E921E8D289218460692340C8D3A26128C2418914C25494327312B430D3D090D0F0E03
+0D15310D1B3D0E490D15372B0D1B0E210B4C10FCE4ECD4C4ECE410EE10EEF6EE10EE1112
+39111239310010E432F43C3CE432EC3210EEF6EE10EE32304B5358071005ED071005ED59
+22014BB014544BB009545B4BB00B545B4BB00C545B4BB00D545B4BB00E545B58BD004C00
+400001004C004CFFC0381137385901220615141633323635342627321615140623222635
+343601321615140623222635343621330123132206151416333236353426013216151406
+23222635343617220615141633323635342608F457646457556363559EBABB9DA0BABBF9
+749EBCBB9F9FB9BA0425A0FC5AA01F5663625757636403B29EBABB9DA0BABB9F57636357
+556363029194848295958283957FDCBBBBDBDBBBBCDB02E0DBBBBDDADBBCBADCF9F3058E
+9582849494848196FD9FDCBBBBDBDBBBBCDB7F948482959582839500000000090071FFE3
+0D7205F0000B00160022002D0037003B00450050005C0000012206151416333236353426
+273216100623222635343605220615141633323635342627321610062322263534360020
+161514062026353425330123122206151416323635340132161006232226353436172206
+1514163332363534260C1A57646457556363559EBABB9DA0BABBFD795764645755636355
+9EBABB9DA0BABBF8D6013CBCBBFEC2B904DFA0FC5AA075AC6362AE63034E9EBABB9DA0BA
+BB9F57636357556363029194848295958283957FDCFE8ADBDBBBBCDB7F94848295958283
+957FDCFE8ADBDBBBBCDB02E0DBBBBDDADBBCBADCF9F3058E95828494948481FE35DCFE8A
+DBDBBBBCDB7F948482959582839500010028046001A005D5000300001B01330128ADCBFE
+DF04600175FE8B000000FFFF0028046002CC05D510260B14000010070B14012C0000FFFF
+0028046003F805D510270B14012C000010260B14000010070B1402580000000100280460
+01A005D5000300000123013301A057FEDFCB04600175FFFF0028046002CC05D510260B17
+000010070B17012C0000FFFF0028046003F805D510260B17000010270B17025800001007
+0B17012C00000001000BFE1D02ABFFC30005000001232707230102AB94BBBC950152FE1D
+F9F901A600000001009E008D0273042300060047402503E804050402E8010205050402E8
+030206000601E80006420204E700A6070203006F056E0710FCEC3239310010F4EC39304B
+53580704ED071008ED071008ED071004ED5922011509011501350273FED3012DFE2B0423
+BFFEF4FEF4BF01A25200000100C1008D0296042300060049402605E8060502030204E803
+030206E800010005E80405010100420503E700A60705016F0300700710FC3CEC39310010
+F4EC39304B5358071008ED071004ED071004ED071008ED592213011501350901C101D5FE
+2B012DFED30423FE5E52FE5EBF010C010C00FFFF00C3000405EB05CC12260099004B1027
+0011FFE8024E102700110216000410270011043D024E10070011021604CEFFFF00930000
+034F05D510270004FF5E000010070004014F0000000000030093000003B005F00017001B
+0024000001231106070607353E013332161514060F010E01070E0115033315231311373E
+0135342726024CBF1F205A615EC167B8DF485A582F27080606C5CBCBC52D393341250191
+03AD080D2343BC3938C29F4C8956562F3519153C34FEF2FE0542FE522D355E3159371F00
+0000FFFFFFEC057C0414060B100700420000075F00000001FFA7FE1B06C7FF85000D0025
+B3040F0A0E10C4D4C4B307000F0E111239393140070B030A0407000E0010D4DCDC3CCC32
+3001322437150604232224273516040336E701C5E5EBFE3AE0DFFE3CECE601C2FEB56868
+7E767675777E696700000001FFA7060406C7076E000D0025B3040F0A0E10C4D4C4B30700
+0F0E111239393140070A040B0300070E0010D4DCDC3CCC32300132041715262423220407
+3536240336E001C6EBE5FE3BE7E7FE3EE6EC01C4076E76767E686867697E777500000001
+FFAAFE1D024901D50007000001330901230B012301E762FEE2011E62EDED6301D5FE24FE
+24018AFE7600FFFF003DFFC507C306831027000D0000FD7B1027000D0400FD7B1007000D
+020000930000000100DD02810333035F0003000013211521DD0256FDAA035FDE00000001
+FE89FFE302CD05F00003002B4013000F010201020F03000342028C00910401030410D4CC
+310010E4E4304B5358071005ED071005ED592201330123022DA0FC5CA005F0F9F3000001
+00B0FEF202580614000B00000111331521112115231133150168F0FE5801A8F0F0025EFD
+238F07228FFD234A0000000100B0FEF202580614000B0000133533112335211121353311
+B0F0F001A8FE58F0025E4A02DD8FF8DE8F02DD000000FFFF004A0000071705F010260022
+B7001007002203670000FFFF00930000054A05F010260022000010070004034A0000FFFF
+00930000054A05F010270004FF5E000010070022019A0000000000010064FF050396045D
+000B0037B7050607080404000C10DCD417393100400A420B08A9020400BC060C10CCF43C
+C4EC32304B5358B70811050711060506070510EC10EC5913163332370701230106202764
+9AEAFBB308FEE098010875FEC3C8045D101080FB2804AE0F0F00000100ECFF3B048705D5
+000D0000013204151406071123112311231102ACD70104EBD78EBE8D05D5E8BEB8DD11FC
+B2061FF9E1069A000000000200D801C2032804120003000B0000013311072B0122263534
+36330279AFAF76027DACAD7E0412FDB101AC7D7CAB00000200D801C2032804120003000B
+00000127113B0132161514062B010187AFAF767EADAC7D0201C201024FAB7C7DAC00FFFF
+003DFFC503C3036B1207000D0000FD7B00000002011DFF12024204230003000900000115
+233513151323033501F0D3D35281A40423FEFEFCDBACFEC00140AC000000FFFFFFA7FE1B
+06C7076E10260B21000010060B2200000000FFFF003DFFF203C3076F1227000D0000FDA8
+1007000D0000017F0000FFFF0091FF42034305D5102700120091000010270011018E0000
+10070011FFD9044800000001006401D3079C0331001D000001150E012322272627262726
+23220607353E013332171617161716333236079C9EE69294EC10080A17E98C84DC949EE6
+92B0D20E080C15E98C82D70331B24F443B040202063E4D53B24F453C040203053E4CFFFF
+FFA7FE1406C7FF7E10070B220000F81000000001013800C8057C050D0017000001112311
+072737213521273717113311371707211521170703AAA0F971F9FE9F0161FA71FAA0FA71
+FA0161FE9FFA710229FE9F0160F972F9A0FA72FB0162FE9EFA71FAA0F972000300FA0132
+03B604B600030007000B0000133533150135331503353315FAC8012CC8C8C80290C8C8FE
+A2C8C802BCC8C8000000FFFF00280460052405D510270B14012C000010260B1400001027
+0B140384000010070B1402580000000401660100054E04E800030007000B000F00000135
+33152135331501353315033533150166C80258C8FDA8C8C8C80290C8C8C8C8FE70C8C803
+20C8C80000000005016600F6054E04DE00030007000B000F001300000135331513353315
+03353315013533150335331502F6C8C8C8C8C8FC2CC8DCC80286C8C8FE70C8C80320C8C8
+FCF4C8C8030CC8C80000000200DB000001AE05D50003000700001333152311331523DBD3
+D3D3D305D5FEFC27FE0000040064FEE505FD06EF00030007000B000F0000133315232533
+1523013315231133152364D3D304C6D3D3FD9DD3D3D3D30369FEFEFE0484FEF9F2FE0005
+00700000064405D500030007000B000F001B000025353315033533150135331503353315
+0111231121352111331121150486C8C8C8FC2CC8DCC8017CA0FD66029AA0029AF6C8C803
+20C8C8FCF4C8C8030CC8C8FE84FD66029AA0029BFD65A0000000000300DB005001AE053E
+00030007000B0000133315231133152311331523DBD3D3D3D3D3D3053EFEFD0EFE02F6FE
+0000000400DB001101AE057700030007000B000F00001333152311331523113315231133
+1523DBD3D3D3D3D3D3D3D30289FE03ECFEFC96FE03F0FE00000000020057028D02EE05F0
+000D00190000002207061514171632373635342F0132161514062322263534360208CA32
+333332CA32333397A1AAAAA1A2AAAA05975656ACAD56565656ADAC56AFDED3D4DEDED4D3
+DE000002007A029C00EE060300030007001F400609050104000810DC3CDC3CCC31004006
+04070003000810D4C410DCCC3013331123113315237A74747474050FFD8D036782000002
+003F029C02F405DF0002000D00D4401600030B07DD050109F703910E010C0A005D060804
+0C0E10DCD43CC4EC321139310010F4FCD43CEC32123930014BB00E544BB00F545B4BB010
+545B4BB011545B4BB00B545B4BB00A545B58BD000E00400001000E000EFFC03811373859
+004BB011544BB00E545B58BD000EFFC00001000E000E0040381137385940540B011D012F
+01390149014603590369038B03AB03BB030B01000F010F020F050F060F070F080F0B0F0C
+0F0D13001F011F021F051F061F071F081F0B1F0C1F0D2200350047004B0D53005B0D6500
+8400A500B5001E5D015D090121033311331523152335213501DDFECB013516A6878790FE
+620566FE5D021CFDE46DBABA790000010066028D02D305DF002000001321152115363736
+333217161514070623222627351617163332363426232206078E01FEFE791C1D1C1CA15E
+5E6160B03C7E42393E3E456F82826F34683605DF5FCC0904044D4C83874B4A1212711B0E
+0D66AE6614150002005C028D02F305F0000F002F00000122070615141716333237363534
+2726131526272623220706073637363332171615140706232226353437363332171601B3
+5833333333585733333333AB313232318044440A26393A44915454585791A7B06C6CB631
+3232046D34355B5A343535345A5B3534016267140A0B4B4C99311A1A4C4D847F4F4EDED4
+C675760809000001006C029C02D505DF00060000132115012301216C0269FEA4880148FE
+3305DF30FCED02E4000000030059028D02EC05F0000C002A003A00000022070615141633
+323736342725262726353436201716151407060716171615140706232227263534373637
+1417163332373635342726232207060200BA35356A5D5C363535FEEC542E2FA4011E5251
+2E2F535A383555569E9F555635362D2F2E55513130302F5353302F042A2C2B4B4C562C2B
+962B5D1231324864743A3A644A303112123A37507941414141794E3938C63F2625252441
+3F262525240000020053028D02E905F0001F002E00001335161716333237363706070623
+222635343736333217161514070623222726133236353427262322070615141716913132
+32308144430A233C394590A8575891A757586B6CB6313232CC5866333358553534343302
+AE67140B0A4B4B9A2F1B1A9884814D4E6F6FD4C6757608090172685C5A343535345A5C34
+340000010089029C03B0056B000B00000111211521112311213521110251015FFEA169FE
+A1015F056BFEC85FFEC801385F01380000000001008903D403B004330003000013211521
+890327FCD904335F000000020089036103B004A500030007000013211521152115218903
+27FCD90327FCD904A55E875F00000001006F020501900602000D0000010E011016172326
+272634373637019054525254655E2F2F2F2E5F060281FCFEFEFE8083807FFA7F7E840001
+0067020501880602000F00001333161716140706072336373610272667655F2F2E2E2F5F
+6554292A2A290602847E7FFA7F8083807F7F01027E7E00010075029C02C4051E00130030
+40071500030E0A0B1410D4DC3C2FCCCC4BB00D5158B11540385931B27F15015D00400606
+110C020B1410D43CC4D4CC300111231134262322061511231133153E0133321602C4744E
+4E5E6C757529714A797D0417FE85017759596B5CFE9E0273613838860000FFFF0057FFF1
+02EE035412070B4D0000FD640000FFFF0089000002C503431207007B0000FD640000FFFF
+005E000002B40354120700740000FD640000FFFF0062FFF102CD0354120700750000FD64
+0000FFFF003F000002F4034312070B4F0000FD640000FFFF0066FFF102D3034312070B50
+0000FD640000FFFF005CFFF102F3035412070B510000FD640000FFFF006C000002D50343
+12070B520000FD640000FFFF0059FFF102EC035412070B530000FD640000FFFF0053FFF1
+02E9035412070B540000FD640000FFFF0089000003B002CF12070B550000FD640000FFFF
+0089013803B0019712070B560000FD640000FFFF008900C503B0020912070B570000FD64
+0000FFFF006FFF690190036612070B580000FD640000FFFF0067FF690188036612070B59
+0000FD640000FFFF004DFFF002A10282120708A60000FD640000FFFF0047FFF002D50282
+120708AC0000FD640000FFFF0047FFF002CF0282120708B50000FD640000FFFF00750000
+03210273120702A50000FD640000FFFF0047FFF002D50282120708AD0000FD640000FFFF
+0075000002C40367120702720000FD640000FFFF0075000002E70367120708B20000FD64
+0000FFFF007A000000EE0367120702A30000FD640000FFFF00750000047B0282120708B3
+0000FD640000FFFF0075000002C4028212070B5A0000FD640000FFFF0075FF1102EC0282
+120708B90000FD640000FFFF0075000002900293120702A40000FD640000FFFF00230000
+01DB0325120708BA0000FD64000000010056000006AE05D600230000010E012322001000
+33321617152E0123220610163332363711211521112115211121152103DD4FB263FEFEDB
+0125FE65B14E4CAD62C0CCCCC062AD4C02C4FDD30216FDEA023AFD2F01B836360137021C
+013735369F4746EAFE44EA4647020A80FEB580FE6B8000030073FFA604BE06390027002E
+0034000001161737330716171526270133323637150E0123222707233726270723372627
+2611103736253733070607061114170126270116170368413E1E9B2F28253A40FEC11277
+D35D61D8791B1A129B194139269B411311B2B2A00108159CE391587D5202343E43FEC135
+4105EB081369A5161CD53C29FB975E5FD34848023F57121E87E61215CF01670168D0B914
+4BFC1F709DFED8EE9403CB1304FB9528150000010060FFE404B305F0002C000025363736
+37150E0123200011100021321617152E0123220211101716171133153E013332161F012E
+0123220615032E61586A5D61D979FECAFE9B016501367BD95F5DD477EAF97C5E9998309A
+6E0F2617011A3C24808B8A07272F5FD34847019E01670168019F4747D55F5EFEC7FED8FE
+D99C751E035D9D5C590405AA100FB6AB000000010085000004CB05D50011000001112115
+21112115211133152311231123350171035AFD700250FDB0FAFACAEC017E0457AAFE48AA
+FEB545FEC70139450000000100810000046205F000230000011121152135331123353335
+23353335103633321617152E012322061D012115211521150235022DFC1FECBFBFC7C7D6
+E83D974F4C883D94740187FE79018F01ECFEBEAAAA01428F8F8F5F0105F31F1DB629299B
+D4488F8F8F00000100BAFF42071D051E002B000005230126272623220706151123113315
+3637363332171617133307363332161511231134262322061511231102CCAA016D053439
+778D5353B9B93E5958797A55362585AA585C78AFBEB972758FA6B9BE03788D474D5F61A2
+FD870460AE6632313E263E0145D633F6E1FD5C029EA19CBEA4FD87011D00000500220000
+04F405D50002000600220026002900000127151327231503211333113311331523153315
+2311210323112311233533352335330517333503173501D850B7387FC40110D4E6C4A2A2
+A2A2FEF0D4E6C4A2A2A2A20213387F505003AFCECEFEF293930334FDDA0226FDDA7B937B
+FDDA0226FDDA02267B937B7B9393FEF2CECE000200C9FFE309CE05D50008005000000111
+33323635342623010607062B011123112132171617331133112115211114163B01351E01
+3332363534262F012E0135343633321617152E012322061514161F011E01151406232226
+273523222635110187EF8591918501DD06717AECEFBE01ADEC7A571851AE0165FE9B476C
+AB60BB5B7A845FA13CA18FD3C260A9484A9E5581815D8B3BB99BE9CB55B766ABC998052F
+FDCF92878692FECCC86A71FDA805D5715288013EFEC28FFDA0894E23353559514B50250F
+2495829EAC1E1EAE282854544049210E2A99899CB62323019FD202600000000200C9FFE3
+083305D50007004500000111333236102623011723032E012B0111231121201615140607
+1E011F011617163332363534262F012E0135343633321617152E012322061514161F011E
+01151406232227260193FE9295959202BF04D9BF4A8B78DCCA01C80100FC837D417B3E5B
+62606361828C65AB40AB98E0CE66B44C4EA85A898962943FC4A5F7D85A612C052FFDEE87
+010685FAD807017F9662FD8905D5D6D88DBA2416907EB433191B59514B50250F2495829E
+AC1E1EAE282854544049210E2A99899CB612080000000006003B000007AE05D5001F0022
+00260029002D003100001327233533273317213733172137330733152307331523032303
+230323032335051B0101172137011B0207332721172137B61E5D3A31CC30021330E33002
+1330CD31395D1D7A9EE1FEDAC3DCFEE09F04C0A5A5FE751D01911DFB20A5A5E51D7D1CFD
+4C1D01911D040F758FC2C2C2C2C2C28F758FFC800380FC8003808F8FFD67029901047575
+FEFCFD67029901047575757500000002005FFFE305F105D5000D001B0000132520001901
+231134262321112329012200190133111416332103335F020700FF0106B89DB0FEB1B805
+8EFDFDFFFEFAB89DB0015304B805D203FED6FEDCFE910156F0D3FAB2012A0124016FFEAA
+F0D3054E0000FFFF0071FEC004F40614102600D300001007028F008A000000010000FFE3
+048F05F00031011C403A2012D322102B07D30919A11AAE16951D01A100AE04952F911D8C
+2909322B222129232612100A030D0911082C202613071108110D1C1900262A212F3CD4C4
+32FCC4C4123939123939111239111739123939113939310010C432E4F4ECF4EC10EEF6EE
+10EE32DD3CEE3230014BB009544BB00C545B4BB00D545B4BB00F545B4BB017545B4BB018
+545B58BD0032FFC000010032003200403811373859407A0E000E010B020B315414690C6C
+0E6E0F6F106F116F126F1369146B1F6F206F216F226F236E246C256927692D9F079F089F
+099F0A9F0B9F0C9F0D9F0E9F0F9F109F119F129F13961F9F209F219F229F239F249F259F
+269F279F289F299F2A9F2B9F2C9D2D320008000910081009200820095515531E6A15671F
+0A5D005D01152E01232206072107210E01151416172107211E0133323637150E01232200
+032337333426353436352337331200333216048F5BA9669DCA20024137FDE60201010201
+BE38FE8A20CA9D66A95B59B960EDFECB28D3378B0101C2379C280136EC62B90562D5695A
+C8BB7B182E23202E187BBBCA5A69D34848012201037B172F20232F177B01010122470001
+00280000051605D500110000131133110133012115210123011123112335BFBD0275F3FD
+8001AAFE5802B0F9FD5FBD9703540281FD890277FD7F73FD1F02CFFD3102E17300000001
+00140000050305D500170000011121352115211137170515371705112311072725350727
+0226FDEE04EFFDEEE550FECBE650FECACBE74D0134E84D038D019EAAAAFEF1A16FD888A2
+6FD9FDB801BAA16ED988A26E0000000500D0FE3909A405F00016002D0062007700830000
+01271336373E013332161716151407060706232227262713220706070615141716333236
+3736373635342726272605363713060706070607273E013736333204171E011514070607
+0E01070607062322272E0127262F01060706232227263534363332010306071716171633
+3236373637363534272627260126232207061514171633320708B9A2223E3196614A7B25
+413031515B57373E2F1EF757310C100A17203E243C181413111D0C1814F9B90C0BB42E20
+23181511AE1A644377AFCB012D5E55521C1A4224603E444C5F4B3E2E336220400F0F1215
+4E5C754C4D84694901E4B1191528533339356C9A392C1C181E1F3884FD47282F260E0D17
+17202DFE392902D09769526D3A335892776467373F20173201F86A1A37233D3528362420
+1B363239542F140C0BB72832034D0A1416211D3A35537D24407B6D62F581718C827E4573
+2F34181D090A2D13260A0A2217544142605D850392FC9B7C401B381619866E52806B6364
+5D61439CFBA0220E0E0F180F0E000002002EFFE3048E05F0002900350000132736333217
+163332372635343736333217161514071615140706233532373635342706232227262322
+253635342726232207061514B98B936F7C4058223037E35059887461546BB57E6AFC865B
+4977896D714A3235330230441B2332342119020460F04E6B42B1FEAC58606053B1E3ABA3
+BFC28671A24A3C9358727E6846D96CAF56313F3F3057A600000000040044000004A205D5
+001D0024002B0031000013352335331121321716173315231614073315230607062B0111
+231123350521153332373601212627262B0105211521363497525201C8FB814C1F5C4801
+01475A1F4D81FBFECA53031CFE01FE8D4D17FE1101FF10174D8DFE0223FDDD02230203EC
+5674011F71446A74152C15746B4471FDA8037874747A491601591B1549ED56152C000002
+005DFF5B04B106780024002D000005233526272611103736373533151617161715262726
+27113637363711233521110607060727110607061110171602F98CDF89A8A889DF8C6960
+705E5F6B626B4E3F4839780122637868758C854F6F6F4FA58F1FA7CC016D016ECDA61F8F
+89041F2446D75F302C04FB3F021112270191A6FD7F532A2505B204A7206C99FED1FED299
+6C00000300100000050505D50017001B001E000013352113331321152117331523132303
+21032313233533373307212F013303330131B5E5B50130FEFB47BE93B5D2AAFE06AAD5B5
+92BD49C14301A944FAD26903527B0208FDF87BCF7BFDF80208FDF802087BCFCFCF7B0141
+000000010075FFE305BC05F000360000013637363721352136373635342623220607353E
+01333204151407331521060F012115210615141633323637150E01232024353437233501
+5C04164A80FE3503920C0D3BB3A55FCC7372DA69F5011719AFFEFD67D8430285FC5331BC
+AD72EC7B80EF6AFEE7FEDD12A802A107164A2C7B08092B6B76803637C52626E4C655427B
+5C2A0D7B3B5E7E884645D02F30E0D94B3F7B000200A5FED304720614001F002A00000115
+2E0123113236371506070607112311262726133510373637353315161716010306070607
+061716171604725CA86565A85C5A5C585B64B974D401D479B2655D585CFE8B015B43760F
+0E0E196C4304A4D5695AFBF15A69D348242202FEF001151676D60139110142CB7417E8E2
+022224FBA403F9164375AAA166B46C430000000200140000050305D50003000B00001321
+152115211521112311211404EFFB1104EFFDEECBFDEE05D5AA78AAFBF704090000000001
+006A000004AF05D500260000133721072116172107230607060716171617132303262726
+2B01353332373637213721262726236A37040E37FE9E4F15013537F6053D417D413D3B41
+CDD9BF4B444678DCFE924A4406FDBE370200122D4A92055A7B7B4E817B7E555D24164844
+82FE68017F973031A6433E727B43345800000001000A000504E205DA001A000001100021
+231107272535072725113311371705153717051132001104E2FE68FEA0ACE64E0134E84C
+0134CAE650FECAE850FEC8E5011F02F1FE7EFE96021EA16ED889A26ED901E4FEAAA26FD9
+88A36FDAFDFB0118012E00020043000004D105D50016001F0000012132041514042B0115
+2115211123112335333523353B0232363534262B01010D01C8FB0101FEFFFBFE022AFDD6
+CACACACACACAFE8D9A9A8DFE05D5E3DBDDE2A6A6FEF4010CA6A6A6928786920000000001
+FC120515FFCB061400050000011333072115FC12DA7E8402E5051500FF9B640000000001
+FC3D0515FFF60614000500000321352127330AFC4702E5847E0515649B000001FC3D047A
+FFCB06140008000003211723273733072135FD1B847EAFAF7E8402E505159BCDCD9B0001
+FC3D047AFFCB061400080000013521273317072337FC3D02E5847EAFAF7E840515649BCD
+CD9B0004FC13047BFFEC061000030007000B000C000001331523253315232533152317FC
+13CBCB030ECBCBFE79CBCB660610CACACACACACB00000005FB50047B00B0061000030007
+000B000F0010000003331523253315232533152325331523051BCBCBFB6BCBCB030ECBCB
+FE79CBCB01290610CACACACACACACACB00000001FC3D047AFFCB0614000D000001172327
+37330721273317072337FCE6847EAFAF7E84023C847EAFAF7E8405159BCDCD9B9BCDCD9B
+000000040043FFCF07D80604000A00240028004200000122061514163332363D01371123
+350E012322263534363317342623220607353E013332162533012301152E012322061514
+1633323637150E01232226353436333216020FA0705348667FBCBC03996D8DA6CDC6A96F
+674481635C9447C2C102B0D8FC44D805A95E6F3879898979386F5E498249CAECEED14380
+03F64252434994820A4DFE0D3E054F9E81969B06575C2037B2241ECAFAF9CB0384B2341E
+9C94939D1F34B1221BFAD1D4F91B00040043FFCF07FE06040020002B004500490000012E
+013436041715272623221514161F011E0114062326273517163332353426270122061514
+163332363D01371123350E012322263534363317342623220607353E0133321625330123
+0656877FB9014E7A247081B43B69309989CAAAAF9125938BB13D7BFB89A0705348667FBC
+BC03996D8DA6CDC6A96F674481635C9447C2C102B0D8FC44D8017D1C7CEF8E0134BC1239
+64242C180A217FF3950635CA134C662C311B02844252434994820A4DFE0D3E054F9E8196
+9B06575C2037B2241ECAFAF9CB0000020073FFE3052705F000180021000001152E012322
+07111633323637150E01232000111000213216011106070611101716052759E897A37979
+A397E8596AED84FEADFE7A0186015386EDFD0B231F9D9D1F056276415A34FB2D345A4275
+4848019F01670168019F47FB13045B1B21ACFEBAFEBBAC210000FFFF00C3FFE3086D05F0
+10260072000010070026034600000002FFD60000051805D50008002B0099B8002C2FB800
+2D2FB80015DCB80000DCB8002C10B80028D0B800282FB80004DC411B0016000400260004
+0036000400460004005600040066000400760004008600040096000400A6000400B60004
+00C6000400D60004000D5D410500E5000400F5000400025DB8000010B80009D0B8001510
+B8000BD0B8001510B8001FD0B8000010B80023D000B8000A2FBA0021002200032BB80021
+103031010607061514171617113533151617161715262726271136373637150607060715
+21152135262726111037360177493363633349CA3836514C4E4E373838374E4E4D523438
+02D7FC5FA16B95976904B31D3A72CDCD713B1D03D47A6E040B1223AC2B160F04FCA40410
+152BAA24120B042AAADE20729F010E01129D6E0000000004003CFFCF07E506040019001D
+00280032000001152E0123220615141633323637150E0123222635343633321625330123
+01220615141633323610262420161514062026353403065E6F3879898979386F5E498249
+CAECEED1438002DDD8FC44D8046B61767661607777FEDF0182DADAFE7ED90597B2341E9C
+94939D1F34B1221DFCD1D4F91B4BF9CB03049E92919FA00120A09DF8D5D4F8F8D4D50003
+003CFFCF084D06040013002D003100000111331114163332363511331123350E01232226
+01152E0123220615141633323637150E0123222635343633321625330123055CBC515063
+75BCBC0690609EA1FDAA5E6F3879898979386F5E498249CAECEED1438002DDD8FC44D801
+4C0210FDF57269817501F0FC90440950C104FFB2341E9C94939D1F34B1221DFCD1D4F91B
+4BF9CB000000FFFF00A4FFE3047B05F0100601520000FFFF006FFED6052304E3100703C1
+0000FEF30000FFFF00C30000072605F0102600720000100700290303000000010049FFE3
+078C05FB006F0000010F0111213637363736333217161514070623222726232207060706
+070611141716171633323736371706070623222726272635343721140706070623222726
+353436333217161716171633323736373619012207060706151417161F01140706232227
+26272635343736373633321603BF026C01F82839424B637B3D14261B2514161D25303321
+281A161A281A212C16371D33391F25371D606C473B371D1C0DFE1332355DADB96842342C
+27350F120B160927425B51462425885D63274709020909122521181D1409087D4B727E93
+2CA705EA1F31FDBCD18C98496714291D2A1A211C262128443B77D6FEBDA5827D2C163735
+3B215F275D373A797DA95BB4CF9EA35CAE40343E232C0F12212C0B275146AAA700FF026A
+161A284A471F341024242C102A1D12292F3984794B232506000000010002FEF9058B05D9
+005000000537163332373637363736353427262726232206071617160702072627262207
+2736333217363534272627263534373637161716373637150E0223222726270607061514
+173637321716151007002322032A692858251F231B1A120D1B1C31468253B0452F0B0D18
+CB4F2E3535467516BD50555B51465B3030726CD37E9C1B2205914B497D213B4946733B1F
+1F6EA1EDF29D3B5FFEE9545ECD8C511F1F37397D77B2965E6C2E478979725C5B34FEFA4F
+3925236923DE5E4D583B80A5797640638D84937D07011A02652E49445C1A1637493B3E32
+56E7A78975D3B0FEA2D3FEFE0000000300C90000060305D5000300070013000001113311
+2111331125211121112111211121112104D5CAFB8ECAFED2019202160192FE6EFDEAFE6E
+0571FAF3050DFAF3050D64FD880278FA2B02DBFD25000001004800000487061400190000
+010323133E013534262322060703230133033E01333216151406047583B983090A6A5F94
+D92079B8012FB87746DA7894A30902A4FD5C029D2F4815545EC8A6FD930614FD9C5E6DA0
+9124520000000001005A0000048706140019000001330725170503363332160703231312
+232206070323130727370188B92D018D0EFE5034AAE7C1972D83B8823EF895D1207BB9DF
+D10EF50614EA7C6188FEF5C9EFE8FD5C029E013DBEA4FD87047F42634C000001003BFFE1
+037405F000390000010F0111100706232227263534373633321716171617163332373637
+36351122070607061514171416151407062322272635343736373633321603741E68C182
+8F6E3C37101A231B1F080B0B1B143B4B513E211F7C5A612C3406141F16181A1628584D8B
+95B5217D05E32C16FCFEFE86C2823C3744390F1B2307372E1B134D3D8684BE03111A1D2E
+313F1B16044009271F1216284D7F584928270D0000000002006AFFE3054605F000210032
+00003F013633321716333237363534272635343F01061514171615140706232227262322
+13363332171633323707062322262322076A8C6F75398490217964473E5050D5505035CA
+BAF2368185385E6E6D8D7B7F7A807D7DC88B6F8FD68F7A805AA527505689614B7E70926D
+64A08C8B796B9462BC5EF2DE4F50053638312F3AAA3A623A000000010044FFE3056E05F2
+004A00000105161716333237363534273716151407062322272627242335220706072734
+373637363736133637363736333217161514070623222726272627262322070E01070607
+0607060717333201DB01026E5A533C675642092C186E79793466588FFEFB524437350D35
+491A312530370B0523214063D17247420E291F2C1D0D0B072933394B2E23240404141626
+3742030F3E015F6E30181956429A521E0E840EE46E79231F488908423F8418C158212418
+3942017FA984804D773E376C1A102E1B0B3B37252C3B28D3A7BD75792C44300300000002
+FFE4FFE302D205F0001C0026000001163332373306070623222707233637263534371237
+3633321506070201121336353423060306013029573A4B853C464C469C3F4B9C6C500A1F
+7568487B7D011248FEB8BB391E196D611B010CC8736635398B6E93894E559898023B7551
+AD4E5DFE83FEF7015C011693264557FDFA9100020020FFE3061B0614001F002700001333
+1533353315211521113E0133320010022322262715231123112311233533001026200610
+1620C1B8B8B902B1FD4F3AB17BCC00FFFFCC7BB13AB9B8B8A1A1049BA7FEDCA7A7012406
+149393937DFEB26461FEBCFDF0FEBC6164A80504FAFC05047DFBE30196E7E7FE6AE70002
+00C6000005A205D50003000D000025012309012101113311210111230520FD16EE02EAFC
+9401A802D064FE58FD306464050DFAF30571FB1F04E1FA2B04E1FB1F0000000400360000
+07C105D50013001F002B002F0216B1929742B093B0984200B0002FB30E0F2C2FB004173C
+B10195EDB000B02DDDB02E3CB02DB01DDEB023CD1010B104813FB1050AB002173CB10B95
+EDB02311B00B12B01739B01720466848B01710B029B023B01D2349693BB1800242B18100
+423DB01DB0172349B0806269B01D4660B0144661B09243B001602342B09243B0016043B0
+005558B014B09243B00160433859B01410B21A2620B003173CB1800042B1810042183001
+B03010B10304FEB0043CB000C4B003B1111CFDB0103C10B003B10D36FCB00E3CB00DB106
+1CFDB0073CB00F39B00F2046684810B00DB00AB000B0032349683BB00B3C10B00DB014D6
+B014B020DDB02C39B02C20466848B020B026D6B026B01AB014B0202349693BB02FB02CB0
+142349683A1010101010B01AB0312349B09243B001602342B09243B0016043B0005058B5
+261A14202C2FB09243B0016043B00617384BB00A5258B00DB0142349B09243B001602342
+B09243B0016043B0405058B09243B0016043B04061B09243B001602342B406070D0E0FB0
+9243B0016043B0051738595959B1800242B18100423DB014B01A2349B0806269B0144660
+B0174661B09243B001602342B09243B0016043B0005558B017B09243B00160433859B017
+10B21D2329B003173CB1800042B18100421831B004B0072349B00052580CB1100F07B00F
+10B10611EDB01010B10511FD0A0C020DB1050608B00410B0053C0B0A0C030DB1050608B0
+0710B0063C0B0A5933353235112101113436331522151121011114060134363332161514
+06232226371416333236353426232206033521153693011002969DBA93FEF0FD6A9D04E3
+90676790906767908C39323239393232398C01EEAA6B04C0FB1F03CC8095AA6BFB4004E1
+FC348095026E8ABFBF8A8ABFBF8A4E67674E4E6767FD447B7B000004011B000006E505CA
+000C00190022002D00000116111000212000031000212006212000111200212000111027
+051133323635342623252132161514062B011123060BDAFE4AFED1FECFFE520601B40131
+013229FEF7FEFAFE86050175010601070179BBFDD3B2636B6B63FEC1013FB0B4B4B0B28D
+04F1DBFECEFED0FE4C01B40130013001B665FE85FEF9FEFBFE87017901050109BB77FEAF
+585150586489838587FE980000000002006EFE3B054303F60030003C0000010615141736
+373633321716151407062322273637163332373635342726232201121514070623222726
+351037263534370306151417161732373635340235881F5BABDB848346499C79AE654C12
+0929717A5D4526204ABDFE9F87455983713A3FDF2EE894811F302E411C2003C682BE4D6B
+6594BD4C50ABDAD7A73C2B1D288C68C37C483DFE79FEDE7C9D6E8E3D4286010BFC9E7FEE
+A4FCEFC67B752E46012F345F4E00000400C80000055405D50003000B0016001F00000111
+33113311213237112623252132041514042B011121011136373635342726012CCA64012E
+18171718FD400291FA0101FEFFFBFEFE6E03583C2D5D5C2C0571FAF3050DFD6A02029202
+64DBD3D5DAFD88055AFD991629569F9E562900040073FEF805D905F00011001900210029
+000025012327070623200011100021200011100225162037112620070311060706101716
+01113637361027260442010AF4DD331110FEC5FE870179013B013A0178D1FD2B6C01106C
+6CFEF06C6924209B9B2002DE231F9B9B1F1BFEDDEF030101A50161016201A5FE5BFE9EFE
+FCFE8E0B323204D73232FB6A04541D25B6FD9CB5250435FBAF1D24B60263B62400000002
+0042FFEE061C0632000C005F000001111633323736353427262726130327060706070623
+22272635343736333217161716171633323736373635112207061514171E011514070622
+27263534373621363F011532171617161514070607171617163332373637170607062322
+272603421F3D8F5D69531B5C5A97CE561F3330469FB96E373B1A19231A161B1116101A46
+6653392121E7813C0902101D23351D2C68BD01221D3B3CB6898432586E679A5A527B1A2C
+1D1F23111F23393E3B4B215105A1FD49076167C2A3531B140FFB1601E609C0888944A335
+40372A1A18161A1F27101A533A797D9E032A823748193009350F23211F182C49916CBB0D
+1D1C401C1F3358A7BF6E6830DECD7B1F1F283218723A3D1F4F0000020053FFE3066C05F1
+00490058000005263534272623220F011514070623222726351617141716323736351134
+272623220706141716331722272635343736333217161737363332171615140706073217
+161716151417371701161511373637363534272623220705025216284F2A5C7867678C8D
+66672D2E4040903F40403F5C51414040405336976667676697A2651E10D3BB702F247E41
+427D3A31241B202D902AFCA4159A904D4A4A181F40661DB79F8C5BA62B38C7CE76757576
+B00C0C7A5657575796029B9558575756CA56575C75769C9D757575232062570E31B1577B
+7C5E3124687B838076435B04534B5CFE95474368667997200A2F000500C80000063205D5
+0009001E0026002E00320000012627262B0116171333011E01171321032E012B01112111
+21201615140706011121323711262317113637361027262511331104FB4C4445782D4D65
+8FC7FEF835713ECDFE48BF4A8B7814FE6E02A70100FC7531FD9501451817171898412B5A
+592AFCB2CA017F9730312FC9FEE5024F19847EFE68017F9662FD8905D5D6D8D0622902A5
+FD6A0202920217FD99162956013E55292DFAF3050D00000200A90000068305D50008001F
+00A7B800202FB800212FB8002010B8000ED0B8000E2FB8000DDCB80000D0B8002110B800
+13DCB80005DC410500EA000500FA000500025D411B001900050029000500390005004900
+05005900050069000500790005008900050099000500A9000500B9000500C9000500D900
+05000D5DB80009D0B800092FBA001E000E001311123900B8000D2FB8001A2FB8001D2FBA
+000F000000032BB8000F10BA0002000B00032BB800021030310111333236353426230106
+2B011123112132041514071737330901230B0123010173FE8D9A9A8D012073ADFECA01C8
+FB01014EAEBEE8FECD0143E9CFD4E80149052FFDCF92878692FD5F36FDA805D5E3DBAC6B
+DBEAFE86FE6B0104FEFC01950000000400C9FF25055406C700050024002B002E00000111
+33132623131617161713230326272627012737231121321737253705071617161514060B
+0136373635340113230193D1C83F5CFC413E3A41CDD9BF4B453654FEAE6F465E01C87E5F
+0BFEBA2C01B6381B177E837CA754334AFDDB8F8F052FFDEE01F81AFD8D16484482FE6801
+7F97302609FCB02CAF05D51A1B826FAE8C10136BD88DBA01E7FE5D0F2D448362FC870167
+000000020103038B062805D800270034000001152E012322061514161F011E0115140623
+222627351E013332363534262F012E0135343633321637331B0133112311032303112302
+E655572741472F45387069908C3473475B642F454B373F3870638A7C3369D0B8A1A2B88A
+8C878D8905B75922132A2F28200B091256414F5B1315602A182C322C2A0A09124D3D485C
+0F05FEAC0154FDC80194FED80128FE6C00000003FFFC0000083004600007001300190000
+03211521112311210521152111211521112115210133112115210403B3FE7298FE7302E0
+026FFE1601D5FE2B01F6FD8502EF8501E0FD9B046080FC2003E06066FEF766FEBB660380
+FCE666000000000201270393064605D5000C0014003E4021010607100A04120E090306C9
+0D02008115010905620309620B0D630F621363111510D4E4FCE4D4ECD4EC1139310010F4
+3C3CEC1732D43C3CC4113930011B01331123110323031123112315231123112335044AAE
+A4AA71C337CB7271CB72C905D5FF000100FDBE01E4FED1012FFE1C02425EFE1C01E45E00
+000000010010FF22056806C40010000009012537050113013301230B012709013301D701
+01FEBA2C01B6FEA2A601DAD2FDC7E59EFD6F012DFEA3D3034D0286826FAEFC90FE4604E9
+FA2B019EFD842C02F503920000000002005C0000059905D50003000D0000250123010321
+150121152135012101C80338EAFCC86B050FFCC8034FFAC30338FCDF64050DFAF3057164
+FAF36464050D00010058FE4C042F0614001F000017162036353426232135012135012135
+211501211501321E011510070621222758AA01A3C1B9A5FEF001F7FE0901F7FDC40324FE
+2701D9FE27ACDFA68DB9FEFEBBD4A763A3CC8693A6016593016593A8FEB0A8FEB061D48A
+FED366864A00FFFF004E000005CF05E71006033D0000FFFF004EFFE305CF05CA10060173
+000000010018FECE04950644005500000137363736353427262322070623222726353733
+061716333237323633321617161514070607173633321716151003062122273427262726
+232207273637363332171615141716333237363736353427262726232207018E5F7D796A
+2331511880961A5C24189823232323822C54114711475C183C82846C024732FB6524B0F2
+FED7736102041018233045184B58513C4D110B191E4098754A262711142167B06C5D02A8
+8A09796A8D2E232E0B0B231921D33C2321050616183B47A3818442030E987780FEEBFEFA
+C818871C2C10183C243D2C2323167755191E744B797998563F40216A2E00000100440000
+020A0460000D000021113427262B0135333217161511014E22246C586EB6505202D5912E
+309C6062D4FD36000000FFFF00C90000056A05D51006002E0000FFFF001000000568076D
+1006008700000003005C000005DF062E0032003F00520000011732171615140706290137
+323736373635112207061514171416151407062322272635343736253717321716171615
+140706053237363534272627262311140105323736373635342726272623220706070604
+7107A95F5F79DCFEB3FD733B9686391D1FB9824D0B0D13212C19112671A001089809C691
+8F3049674BFE8ACC7153462A656C86FEE8015C886C683058562E544D764B491F2E580354
+10615E80AE7DDA75863B8B84D3028382494D0B3D052C0D33132116235686749F2749401C
+1F33486C9A684A3370528175462A1B18FDC21DFD28021A1D3058B972562C181806EC6ECE
+000000010082FFE8053705F0003D0000011736251E011716171637150607262706070615
+141716171E011514070607273637363534272637220706151017162D0115060706242726
+272635343736024B4798012F0B280B111016698C683B75291D180B030F0F0F4673C61A5A
+49232E21137D4969B0DE016B0101D765C0FE8F825D2E305EC00535236C721C771F280F16
+212E440E24BB0D221C3942471633324B258D466E1F231649237433B974525D86DAFEB9B0
+E1267F39884B2856825C8F91B5D1BD9300000002007DFFE70659052D001A002900002516
+171620373637330607062024023534122433320412152122153514332132351126272623
+220706070190435D96014A986A4D6F5F8EB3FE7AFE9BC6C90167BEBD0167CAFB4A131303
+9014465F989FA0985F44E44D3354543C6078475AB30141AFB00145AEAEFEBBB013491313
+017050335251344F000000020057FFE304600444001C0025000001061514171633323736
+37330607062027263534373600332011140706373635342322060320012C04223B9E7439
+661887289568FE646F4E0F310152F00187CDD16B70E386BA390141019826225E3E6E233F
+517F593E996B9B444DFD0134FEEBC76769E04D71ABCCFEED0000000100A2FFE3048605F0
+004500000117060706232227262726353437363F01262726353437363332171615140706
+232227263534373635342726232207061514171617163315220706070615141716333237
+363704275F1F10B2FB8F696C455F866DB2026C3D4F637BF18854332D322229170D1C1A25
+2B66614061502F5A5F7CAB7B773A6D615AC281753E0D0149684111AC2225405FA9AE8A6C
+1815243D50948B637A5332564E2D32160E211C242B1F25242B4065977D4E30171A361E1D
+396E99A6615B753E5F0000010054FFDF0611060B004D0000011707062322272627112107
+23151407060706212227263534373633321716171617163332373637363D012137211126
+2322070615141F011407062322272635343736213217371516171633323705EE2358273A
+2737E13F013C3DFF2A2A4DC6FEF4805F341E1B2E1F0D1216131B425E6C7B3E1D21FE9727
+0142613EC16E47071419231A26231F77A7013424429ABB8F3016302105F213A34B143D19
+FDDC44639884804BCA5F3442281F1A0B1430331A427B3E636582B9440249186E46543D1F
+492C1A1F1F1F46B477A708374B2E16093000000100C90000042305D50009000029013521
+1121352111330423FCA60290FDB00250CAAA01B8AA02C900000000010039FFC708420602
+006B00000111141716171633323736371706070622272627261134023706030203072702
+03262726271114070607062322272635343736333217163332363736351126232207060F
+013637363736333217331613121317123712373633321716151407062322272627262726
+2322070606D716162C1B1C35282E272A2745609F393712060705AE797B3761143B66373B
+3E46332E5E50654D442A1D1823371D1C402C6A211C4868483C3D142E0F181B255F798F69
+07A57070330B547D809C98B242271D121E2C240816070B04191A1D1A2A051DFD35DC8081
+2F162C2C40213B446139379E5402011E01911FB3FEC4FEC9FE564D0F01E6013BA96E7746
+FE0FEDBBB35E4F3F2F2C2521183B3E6A79749F02D6583C3B7D03663F45275F6EA5FEFAFE
+F4FEB10B0148F401029798271D1D27102309160D1D0418162E0000020068FFE7034A0329
+000B0017000001342623220215141633321203321615140223222635341202A9574F6D8D
+56506D8DC298CBDDA298CBDD01F7747DFEFECF747B010401FDD8A3C6FEFFD8A3C6010100
+000000010067FFE305B205F00034000009011615140734270107061F01161407062B0135
+3635342F0126343F012726353437141709012726353437141F0116151407342F0103C401
+8B639032FCFB9B3E42AC643D5645F5C42F62358C9AF1639032026C011974639032B66390
+321202D0FE756331824C533203059C3F42AC64D62C3E383F5D1D2F6336BC8D9BF1633182
+4C5332FD960119746331824C5332B66331824C5332120001FFFBFFE3053905F100300000
+0111331615140F010E012321222E0135343F013E0133211134272E012321222E0335343E
+013332171E023321321604BE4F2C1E87111422FBF41618182285111424038414142540FD
+7F3B35481D16041014190C0C2A1F1C02D6595B04B6FC230424141B871206021412102286
+10060378320D10060418315B47282014201E1F0457000001001BFFB8034105F0002C0000
+0121321716140E01071E01121007062322262F010E0123212235343F013E013321112122
+263534363217161716015401506C1E130C302502023D0A182D1612060E64122CFE6D4622
+851114240185FEBA6D47142D0C172E10058F37232A282F0A1A82FD24FEFB22531E1F6165
+0E28102187100603CD717E42191E3B06020000010056FFB804BA05F00026000001212226
+35343E013332171E023321321E0215140E01071E01171215140706232226272635040AFD
+006D47041014190C0C2A1F1C030A35471A060C3025020204390A172E18110C0C04A6717E
+281F141F1E20041F301A0B10282F0A1A8226FD4A93732153274451490000000200460000
+02D70614000B0015000013343633321615140623222601331521353311233521BC70514F
+6F6F4F5170018398FD6F979701F90554516F6F514F6F6EFB7579790335790002005AFFD5
+0752053B0009001B000012100021200010002120050115071E0115100021200011100021
+2004FE0148011B011A0148FEB8FEE6FEE503E90123EF0202FE5BFE9FFE9EFE5B01A50162
+010401720365FE48FEFD010301B80101C2010AF4DD212310FEC5FE870179013B013A0178
+D100000400970000094C04600009000C0014002000001321152111211521112301032101
+3301232721072301331B013309012309012301970283FE1401BCFE44970383B5016AFF00
+9701778A5AFE445A8C03D68FF5F690FEC3015290FEEBFEE9900160046080FEB67FFDE903
+08FE430235FC80E6E60380FEB3014DFE52FE2E017DFE8301DE0000030024FFF0057A0460
+000F002D0031000025352227262726351123111416171632031633323715062322272635
+112311211123220615233436332115231114013311230516892C1A090E86171439E15908
+6C28487484FD2A15A7FEB23D5A326472A5040FB6FD2186865A3440272138A2020CFDD6A6
+7A19450142AF0AF110CA62FD01E3FC0403FC4C73A87B64FE1259FEAF039800020000FE73
+055A047B0008001D00000116131211331003020310030223220723343736332013121333
+0203021101D7AE554582456C34468CC5A918644751F501B4896EA082CB4346041DC1FE5C
+FEA7FE78019F014201FDFABE021B012A02579F624F5AFD3D019A010EFE8FFEC9FEBEFDFD
+0000000200C80000053005D500030009000001113311251521112111012CCA033AFD2AFE
+6E0571FAF3050D6464FA8F05D500000300C90000060105D500030007000F000001113311
+21113311012111211121112104D3CAFB90CA040AFE6EFDECFE6E05380571FAF3050DFAF3
+050DFA8F0571FA8F05D500020019FE77065305C100050011000009022109021521090121
+15213509013501A60310FD06FEFC02FAFCF00597FC1902FAFCF00417F9C60307FD17FEDA
+0359032AFCD6FCA706E764FCD6FCA76363035303157F000100A3FFE305BB05F0001D0000
+011121152111362433200011100021222427351E01332000111000212206016B014AFDEE
+75011AA0015E018BFE75FEA292FEF96F70FC8B01120113FEEDFEEE6BA804FEFE6FA60281
+5355FE67FE93FE92FE674846D75F600132012F012E013225000000010008000003A905D5
+00050017B5021C003A030610DCFCEC3100B403950481012FF4EC3021231121352103A9CA
+FD2903A1052BAA00000000010007000003A805D500050017B5041C013A030610DCFCEC31
+00B403950081022FE4EC3001112135211103A8FC5F02D705D5FA2BAA052B0001FFFC0000
+04E705D50008000021230901230111331104E7D9FE62FE65D90210CB0266FD9A030E02C7
+FD39000400570000064A05D5000B00130017002200000120171615140702002901010503
+333237132623210333130503363736133635342726037C01B2A874174BFE22FE50FDFD01
+22017FFB63F5ADE293F6FE6FFBCAFB02AFCD1B19D04114661205D5B57CDF6376FE7EFE96
+05D564FAF341048B41FAF3050D78FBE310139D01506655C26D130004005AFFE305AD0614
+000A001F0023003200001306151417161713060706012137060706232202353437360033
+32171617132107013309010316333237363736353427262322E71F2A2036AF4238770378
+FEB2214E62627CCB9E2223013ECB7C4F4F2776014EFEFEF7860109FD32BD181AA577781F
+1F3837A51A02749E4B734F3D200386203D82FCEDA8643031010C9450B2B2014431306402
+5E64FAAC0554FE64FC360382829F9E4A7468690000000003005BFFE30493047B000A0028
+003200001306151417161713060706131633323736370706070623202726353437123736
+3332171615140F012137213635342726232207DA0C4E161EA12623A0A8475F797F5A5C17
+6B6C6D6BFEF47D5A0F35B5B3FCE466461012FD8F1402010A394EA94A4302303C378D681D
+16033A151C82FD4A151F1628752A16169C6FA6444D0113A2A191639346505A6438327652
+73110003004F00000281061400030007000B000001330723033313231321132101C9B82E
+B8D486B28624FEB2DA014E0614E9FB390398FC0404600003FF16FE56028106140003000C
+001A000001330723031323030607363736052337333237363713210306070601C9B82EB8
+66CA86D0233548324BFEDCDC143169302F1DE9014EDE2964650614E9FABF0412FBD0B554
+0F3048F46430319904ACFB8CD660600000000002003BFFE305B805F00026003000000901
+0E0115233412370133173E01333200151406071E0115140623222627351E013332363534
+26373E013534262322060703BAFE043B48BA745DFEE9FC8F68E483F1013286863032DEB8
+53A555579E4469833B325B55D4A05FA6490240020859CB728401027E011F955957FEEDD7
+80E1633F7D3CA2C52424B62F316F583367CE51A15892C23F400000010051000003880460
+0009002440090509080B460006020A10C4C4D4ECEC3231004008078706038700BC022FE4
+ECD4EC30011121352111213521110388FCC9027FFE0701F90460FBA093016F9301CBFFFF
+0089FFE3076005F010270B26033500001026007B000010070B52048BFD64FFFF0089FFE3
+077405F010270B26033500001026007B000010070B54048BFD64FFFF0089FFE30AAE05F0
+10270B26033500001026007B00001027007B048BFD6410070B4D07C0FD64FFFF0089FFE3
+075805F01026007B000010270B260335000010070075048BFD64FFFF005EFFE3075805F0
+10260074000010270B260335000010070075048BFD64FFFF0089FFE3075E05F01026007B
+000010270B260335000010070B50048BFD64FFFF005EFFE3075E05F01026007400001027
+0B260335000010070B50048BFD64FFFF0062FFE3075E05F010260075000010270B260335
+000010070B50048BFD64FFFF003FFFE3075E05F010260B4F000010270B26033500001007
+0B50048BFD64FFFF0089FFE3077E05F01026007B000010270B260335000010070B51048B
+FD64FFFF0066FFE3077E05F010260B50000010270B260335000010070B51048BFD64FFFF
+0089FFE3077705F01026007B000010270B260335000010070B53048BFD64FFFF0062FFE3
+077705F010260075000010270B260335000010070B53048BFD64FFFF0066FFE3077705F0
+10260B50000010270B260335000010070B53048BFD64FFFF006CFFE3077705F010260B52
+000010270B260335000010070B53048BFD64FFFF0089FFE3060205F01026007B00001007
+0B2603350000FFFF00C90000019305D51006002C0000FFFF00C90000032705D51026002C
+00001007002C01940000FFFF00C9000004BB05D51026002C00001027002C019400001007
+002C03280000FFFF00C90000075105D51026002C00001007003901E90000FFFF00100000
+056805D5100600390000FFFF00100000069805D51026003900001007002C05050000FFFF
+00100000082C05D51026003900001027002C050500001007002C06990000FFFF00100000
+09C005D51026003900001027002C050500001027002C069900001007002C082D0000FFFF
+00C90000071705D51026002C00001007003B01DC0000FFFF003D0000053B05D51006003B
+0000FFFF003D000006AE05D51026003B00001007002C051B0000FFFF003D0000084205D5
+1026003B00001027002C051B00001007002C06AF0000FFFF00C90000046A05D51006002F
+0000FFFF0073FFE3052705F0100600260000FFFF00C9000005B005D5100600270000FFFF
+00C90000061F05D5100600300000FFFF00C10000017906141006004C0000FFFF00C10000
+02E906141026004C00001007004C01700000FFFF00C10000045906141026004C00001027
+004C017000001007004C02E00000FFFF00C10000064106141026004C00001007005901C2
+0000FFFF003D0000047F0460100600590000FFFF003D000005BD06141026005900001007
+004C04440000FFFF003D0000072D06141026005900001027004C044400001007004C05B4
+0000FFFF003D0000089D06141026005900001027004C044400001027004C05B400001007
+004C07240000FFFF00C10000064A06141026004C00001007005B01D10000FFFF003B0000
+047904601006005B0000FFFF003B000005D406141026005B00001007004C045B0000FFFF
+003B0000074406141026005B00001027004C045B00001007004C05CB0000FFFF00C10000
+017906141006004F0000FFFF0071FFE303E7047B100600460000FFFF0071FFE3045A0614
+100600470000FFFF00BA0000071D047B100600500000000300790000097D05D5000D0016
+001F00000120001110002901200011100021013320001110002123031123200011100021
+063501B20196FE68FE50FD8CFE50FE68019601B2019FF40135011FFEE1FECBF4CAF4FECB
+FEE1011F013505D5FE97FE80FE7EFE96016A018201800169FAD10118012E012C0117FB77
+0489FEE9FED4FED2FEE8000300C9000005B005D50011001A002300FBBA0009001B00032B
+B8000910BA000E001700032BB8000E10BA001F000500032BB8001F10B8000910B80000D0
+410500EA000500FA000500025D411B001900050029000500390005004900050059000500
+69000500790005008900050099000500A9000500B9000500C9000500D90005000D5DB800
+0910B80012D0410500EA001700FA001700025D411B001900170029001700390017004900
+17005900170069001700790017008900170099001700A9001700B9001700C9001700D900
+17000D5DB8001F10B80025DC00BA0002002200032BB8000210BA001C000800032BB8001C
+10BA0013000000032BB8001310BA000A001200032BB8000A103031011533200011100021
+2315332016151406230311333236353426230121200011100029010193F40135011FFEE1
+FECBF4480100F0F1FF484E9F93939FFEE8019F01B20196FE68FE50FE610159B30118012E
+012C0117B2C2CFD0C3029EFDE8818C8A8101DEFE97FE80FE7EFE96000000000500790000
+097D05D50011001A002800310043000001153320161514062B0115332000111000210333
+32363534262B011321200011100029012000111000011123220615141633133523200011
+1000213335232226353436210560480100F0F1FF48F40135011FFEE1FECBF44E9F93939F
+4ED5FD8CFE50FE68019601B2027401B20196FE68FCB14E9F93939F4EF4FECBFEE1011F01
+35F448FFF1F00100052FB2C2CFD0C3B30118012E012C0117FCB0818C8A81FC09016A0182
+01800169FE97FE80FE7EFE9601DF0218818A8C81029EB2FEE9FED4FED2FEE8B3C3D0CFC2
+0000FFFF0073FFE3052705F0100601480000FFFF007FFFE303F5047B1006021600000001
+0073FE56052705F0001C000001152E012320001110002132363711231106070623200011
+1000213216052766E782FF00FEF00110010082E766C90C0C7684FEADFE7A0186015386ED
+0562D55F5EFEC7FED8FED9FEC75E5FFD1001B9040424019F01670168019F47000000FFFF
+0057FFE3075805F010270B260335000010270075048BFD6410060B4D00000001006400CC
+063F043800090081B4020906000A10D4D4CC3240094002400930023009045D31400A0205
+09010006059C060A0010D4EC113939CC10CC30400C08090900080708079C000900070510
+FC3C0806103C400C03020201030403049C010201070510FC3C0806103CB0104B535800B3
+03020809103C103CB4089C090900070510ECB4039C020201070510EC5913350117072115
+21170764018978E904C3FB3DE97802555A018978E9AAE9780000000101A30000050F05DC
+00090081400A020509010006059C060A10D4EC113939CC10CC3100B4020906000A10D4D4
+CC3240094F024F093F023F09045D30400C08090900080708079C000900070410FC3C0806
+103C400C03020201030403049C010201070410FC3C0806103CB0104B535801B303020809
+103C103CB4089C090900070410ECB4039C020201070410EC590133010727112311072703
+2D5A018878E8AAEA7805DCFE7678EAFB3C04C4EA78000001007500CC0650043800090081
+B4020900060A10D4D4CC3240094F024F095F025F09045D31400A090602010005069C050A
+0010D4EC113939CC10CC30400C08090900080708079C000900070510FC3C0806103C400C
+03020201030403049C010201070510FC3C0806103CB0104B535800B303020809103C103C
+B4089C090900070510ECB4039C020201070510EC59011501273721352127370650FE7778
+E9FB3D04C3E97802AF5AFE7778E9AAE97800000101A3FFF9050F05D500090081400A0906
+02010005069C050A10D4EC113939CC10CC3100B4020900060A10D4D4CC32400940024009
+50025009045D30400C08090900080708079C000900070410FC3C0806103C400C03020201
+030403049C010201070410FC3C0806103CB0104B535801B303020809103C103CB4089C09
+0900070410ECB4039C020201070410EC590523013717113311371703875AFE7678EAAAE8
+7807018A78EA04C4FB3CEA7800000001006400CC06500438000F00DAB6070A09020F0010
+10D4CC32D4CC32400D5002500F5F0A5F074F0A4F07065D3100400F0702040A0F00010809
+040D049C0D1010D4EC111739CC3210CC3230400C0E0F0F000E0D0E0D9C000F00070510FC
+3C0806103C400C03020201030403049C010201070510FC3C0806103C400C0B0A0A090B0C
+0B0C9C09090A070510FC3C0806103C400C06070708060506059C080708070510FC3C0806
+103CB0104B535800B70B0A060703020E0F103C103C103C103CB40E9C0F0F00070510ECB4
+039C020201070510ECB40B9C0A0A09070510ECB4069C070708070510EC59133501170721
+2737011501273721170764018978E903BCE9780189FE7778E9FC44E97802555A018978E9
+E978FE775AFE7778E9E978000000000101A3FFEF050F05DC000F00DE400F0702040A0F00
+010809040D049C0D1010D4EC111739CC3210CC323100B6070A09020F001010D4CC32D4CC
+3240115F025F0F500A50074F024F0F400A4007085D30400C0E0F0F000E0D0E0D9C000F00
+070410FC3C0806103C400C03020201030403049C010201070410FC3C0806103C400C0B0A
+0A090B0C0B0C9C09090A070410FC3C0806103C400C06070708060506059C080708070410
+FC3C0806103CB0104B535801B70B0A060703020E0F103C103C103C103CB40E9C0F0F0007
+0410ECB4039C020201070410ECB40B9C0A0A09070410ECB4069C070708070410EC590133
+0107271137170123013717110727032D5A018878E8E878FE785AFE7678EAEA7805DCFE76
+78EAFC43EA78FE76018A78EA03BDEA780000000101200034059F04B30009000001372115
+21010701112301203F022CFEB6035E78FCA2A904743FA9FCA278035EFEB6000101200034
+059F04B3000900000117112311012701213505603FA9FCA278035EFEB604B33FFDD4014A
+FCA278035EA9000101200034059F04B30009000025072135210137011133059F3FFDD401
+4AFCA278035EA9733FA9035E78FCA2014A00000101200034059F04B30009000025271133
+110117012115015F3FA9035E78FCA2014A343F022CFEB6035E78FCA2A9000001006400CC
+063F0438001100000103271321170701350117072113170321150442C89497FDFFE978FE
+77018978E90264C89497019A022DFEA5550106E97801895A018978E9015B55FEFAAA0001
+007500CC06500438001100000113170321273701150127372103271321350272C8949702
+01E9780189FE7778E9FD9CC89497FE6602D7015B55FEFAE978FE775AFE7778E9FEA55501
+06AA0001002C00D3069E035000340000011617163332373E013736373637363332171617
+1617072627262726232207060706070607060706232227262F011123113721150501ED23
+2F2938352C304615223C3B4E4A585B4752373C229D152321322938352C2F2423151F3F32
+57475B584A4E3BA0A93F022CFEB601F4211513131546304F3C3A22202025373C4F413023
+2117131314242330494235272020223AA0FEB6022C3FA90100000001001600D306880350
+003400000137253521171123110706070623222726272627262726272623220706070607
+273637363736333217161716171E0117163332373604C7A0FEB6022C3FA9A03B4E4A585B
+4757323F1F1523242F2C353829322123159D223C3752475B584A4E3B3C221546302C3538
+292F01F4A001A93FFDD4014AA03A2220202735424930232414131317212330414F3C3725
+2020223A3C4F30461513131500000001006400CC063F0438001100001301170733011707
+2115211707012317070164018978E9F0016178E902E3FD1DE978FE9FF0E978FE7702AF01
+8978E9016178E9AAE9780161E97801890000000101A50000051105DC0011000009010727
+15010727112311072701350727010387018A78EA016278EAAAE8780160E878018805DCFE
+7678EAF0FE9E78EAFD1C02E4EA780162F0EA78018A000001007500CC0650043800110000
+0901273723012737213521273701332737010650FE7778E9F0FE9F78E9FD1D02E3E97801
+61F0E97801890255FE7778E9FE9F78E9AAE978FE9FE978FE7700000101A5FFF9051105D5
+00110000050137173501371711331137170115371701032FFE7678EAFE9E78EAAAE878FE
+A0E878FE7807018A78EAF0016278EA02E4FD1CEA78FE9EF0EA78FE7600000001006400CC
+063F0438000E000013350117072101170901070121170764018978E902EA016178FEC201
+3E78FE9FFD16E97802555A018978E9016178FEC2FEC2780161E9780000000001007500CC
+06500438000E00000901273721012709013701212737010650FE7778E9FD16FE9F78013E
+FEC278016102EAE97801890255FE7778E9FE9F78013E013E78FE9FE978FE770000000001
+006400CC063F0438000D000001211707013501170721113311230595FBE7E978FE770189
+78E90419AAAA022DE97801895A018978E90159FCA400000101A50000050F05DC000D0000
+25110727013301072711211521350305E87801885A018878E8015AFCA4AA041AEA78018A
+FE7678EAFBE6AAAA00000001007500CC06500438000D0086B70C090A06029C040E10D4EC
+32D4CC3240094F094F0C5F095F0C045D31400A09050B0A069C0C03010E0010D4CCCCFC39
+39CCCC30400C0809090A080708079C0A090A070510FC3C0806103C400C0D0C0C0B0D000D
+009C0B0C0B070510FC3C0806103CB0104B535800B30D0C0809103C103CB4089C09090A07
+0510ECB40D9C0C0C0B070510EC5901211123113311212737011501270538FBE7AAAA0419
+E9780189FE7778022DFEA7035CFEA7E978FE775AFE7778000000000101A5FFF9050F05D5
+000D000001213521152111371701230137170305FEA8035CFEA6E878FE785AFE7878E805
+2BAAAAFBE6EA78FE76018A78EA00000101A50000050F05DC001300000137170121152135
+21013717110727013301072703AFE878FE780182FCA40180FE7878E8E87801885A018878
+E801C2EA78FE76AAAA018A78EA0302EA78018AFE7678EA0000000001006400CC063E0486
+002500000135321716171E011514060706070623211707013501170721203736373E0135
+34262726272605133E34322F2B2D2B2D273A3120FC48E978FE77018978E901D901D91618
+131214131313181603DCAA16152D296F3D3C6A2E281A16E97801895A018978E90A0A1211
+311A1B2E14120A0A00000001007600CC0650048600290000012207060706070615141716
+17161716332127370115012737212227262726272635343736373637363301A11B161813
+120A0A0A0C101318161B0397E9780189FE7778E9FC6941313A272D151616172B2F32343E
+03DC0A0A12111A171B1A171C0F120A0AE978FE775AFE7778E9161A282E34363C3D363929
+2D15160000000002006400CC063E04860018003E00000133323736373637363534272627
+262726220706070607061507353437363736373633321716171617161514070607060706
+2B0115233521170701350117070491821B161813120A0A0A0A1213181636161813100C0A
+A916172B2F32343E41313A272D151616172B2F32343E82A9FD94E978FE77018978E902D7
+0A0A12111A171A1B171A11120A0A0A0A120F1C171B82823D3639292D1516161A282E3436
+3D3C3639292D1516DCDCE97801895A018978E90000000002007600CC065004860018003E
+000001353427262726272622070607060706151417161716171633290127370115012737
+211523352322272627262726353437363736373633321716171617161502230A0C101318
+1636161813120A0A0A0A121318161B012B026CE9780189FE7778E9FD94A9823E34322F2B
+171616152D273A31413E34322F2B171602D7821B171C0F120A0A0A0A12111A171B1A171A
+11120A0AE978FE775AFE7778E9DCDC16152D2939363C3D36342E281A1616152D2939363D
+00000001006400CC065004380058000001231707013501170733321716171E0132363736
+3736373637363332171617161716171E013236373637363B012737011501273723220706
+07060706222726272627262726272622070607060706070607062227262726272601860A
+E978FE77018978E90A302423240A181B180A0A0510202225272D30242720210F050A0A18
+1B180A2720272D0AE9780189FE7778E90A0E0B0D0A1F28275A26281F220F040A0A0D0B1C
+0B0D0A09050F221F28265A27281F0A0D0B022DE97801895A018978E91212240A0C0C0A0C
+0D2D23251112121422262A0D0C0A0C0C0A270F12E978FE775AFE7778E906060A22141212
+1422262A0D0C0A060606060A09102A262214121214220A0606000001006400BE06500446
+001700002527132117070135011707211317032127370115012737210310A070FE9CE978
+FE77018978E901A286A0700164E9780189FE7778E9FE5EBE3A0135E97801895A018978E9
+016F3AFECBE978FE775AFE7778E90001012AFFFC059D05D8000D00000901131703010325
+1701270137130409FD219DA75E02DFC1010D62FE3959FEC18BBE0408FE5803781DFDEE01
+A8FBB8BE8BFEC01001C862FEF1000001015A0000050905F2000B00000111231121170701
+350117070509AAFE13E978FE77018978E90491FB6F03E7E97801895A018978E900000001
+01AC0000055B05F2000B000001212737011501273721112301AC0297E9780189FE7778E9
+FE13AA0491E978FE775AFE7778E9FC1900000001015AFFE3050905D5000B000001211707
+01350117072111330509FD69E978FE77018978E901EDAA0144E97801895A018978E903E7
+0000000101ACFFE3055B05D5000B000001113311212737011501273701ACAA01EDE97801
+89FE7778E901440491FC19E978FE775AFE7778E90000000101DDFFF9061404D4000B0000
+01113717012301371711213504B3E978FE775AFE7778E9FDD404D4FC3DE978FE77018978
+E90319AA00000001006400CC053F0503000B0000012117070135011707211133053FFC3D
+E978FE77018978E90319AA022DE97801895A018978E9022C00000001002D01A006650558
+002600000137170123013717353437363736373620171617161716152334262726272622
+070607060706150239E878FE785AFE7678EA2E2D5C5A6E6C01006C6E5A5C2D2EAA42423C
+564ABE4E524040232102B8EA78FE76018A78EA327F706B5F56312E2E31565F6B707F5DA2
+423B272121233F4053515D0000000001004F01A006870558002600000135342726272627
+26220706070E01152334373637363736201716171617161D01371701230137047B212340
+40524EBE4A563C4242AA2E2D5C5A6E6C01006C6E5A5C2D2EEA78FE765AFE787802B8325D
+5153403F232121273B42A25D7F706B5F56312E2E31565F6B707F32EA78FE76018A780002
+00DE0034064D05D50003000D00001335211505372115210107011123DE056FFAD33F022C
+FEB6035E78FCA2A905726363FE3FA9FCA278035EFEB600020070FFA106440563000D001B
+000013352127370111331123110127370121170701112311331101170721700412EA7801
+8AAAAAFE7678EA01C2FBEEEA78FE76AAAA018A78EA04120101AAE878FE78014EFD080150
+FE7878E80258E8780188FEB002F8FEB2018878E80000000100D3007F0619057000360000
+0106070615141617161716323736373E01353427262F0111231137211521171617161514
+07060706070623222726272627263534373637020244202142423C564ABE4E5240424221
+224223AA40022CFEB6235A2F2E2E305954746785806C705859302E2E2D5C042B4251515D
+5AA2423B272121233F42A25A5D51514223FEB6022C40AA235A70707F7C70715953342E2E
+30575971707C7F706B5F0001009D007F05E3057000360000013716171615140706070607
+062322272627262726353437363F01213521171123110706070615141617161716323736
+373E013534272604B4785C2D2E2E305958706C808567745459302E2E2F5A23FEB6022C40
+AA23422221424240524EBE4A563C42422120042B785F6B707F7C70715957302E2E345359
+71707C7F70705A23AA40FDD4014A234251515D5AA2423F232121273B42A25A5D51510001
+0064022D063F04380006004BB30206000710D4CCCCB440055005025D31B50201059C0607
+0010D4FC39CC30400C03020201030403049C010201070510FC3C0806103CB0104B535800
+B6039C0202010302103C070510EC591335011707211564018978E904C3022D82018978E9
+AA000001006400CC063F02D70006004BB30502000710D4CCCCB440055005025D31B50506
+019C02070010D4EC39CC30400C04050506040304039C060506070510FC3C0806103CB010
+4B535800B6049C0505060405103C070510EC59132115211707016405DBFB3DE978FE7702
+D7AAE9780189000103050000050F05DC0006000001330107271123030582018878E8AA05
+DCFE7678EAFB3C000000000101A3000003AF05DC000600000111231107270103AFAAEA78
+018A05DCFA2404C4EA78018A000000010075022D065004380006004BB30506020710D4D4
+CCB44F055F05025D31B50506029C01070010D4FC39CC30400C04050506040304039C0605
+06070510FC3C0806103CB0104B535800B6049C0505060405103C070510EC590121352127
+37010650FA2504C3E9780189022DAAE978FE770000000001007500CC065002D70006004B
+B30200060710D4D4CCB44F055F05025D31B50201069C05070010D4EC39CC30400C030202
+01030403049C010201070510FC3C0907103CB0104B535800B6039C0202010302103C0705
+10EC59011501273721350650FE7778E9FB3D02D782FE7778E9AA000103050000050F05DC
+00060000211133113717010305AAE878FE7805DCFB3CEA78FE76000101A3000003AF05DC
+000600002123013717113303AF82FE7678EAAA018A78EA04C400FFFF0064FFA006500564
+10270C1A0000FED410070C1C0000012C0000FFFF0077FFF9063B05DC10270C1D012C0000
+10070C1BFED400000000FFFF0064FFA00650056410270C1C0000FED410070C1A0000012C
+000000010064FFA0063F0564001100000103350117072115211707211521170701350163
+FF018978E904C3FB3DD7D704C3FB3DE978FE77028200FF5A018978E9AAD7D7AAE9780189
+5A00000100780000063C05DC00110000011333010727112311072711231107270133035A
+FE5A018A78EAAAD6D8AAE87801885A04DC0100FE7678EAFB3C04C4D8D8FB3C04C4EA7801
+8A0000010076FFA006510564001100000105150127372135212737213521273701150552
+00FFFE7778E9FB3D04C3D7D7FB3D04C3E97801890282FF5AFE7778E9AAD7D7AAE978FE77
+5A0000010078FFF9063C05D500110000250123013717113311371711331137170123035A
+FF005AFE7878E8AAD8D6AAEA78FE765AF9FF00018A78EA04C4FB3CD8D804C4FB3CEA78FE
+7600FFFF0064000E065004F610270C4B0000FF4210070C46000000BE0000FFFF0064000E
+065004F610270C470000FF4210070C4A000000BE00000002006400CC063F04380004001A
+000001210717212507211521072737211707013501170721371707211503F7FD99696901
+EE0126790214FDA7758249FED05D78FE770189785D0234758249015502EB6969D2D278CA
+4B7F5D7801895A0189785DCA4B7F780000000003006400C1065004430017001C00210000
+252737231707013501170721371707332737011501273721130721372729010717210307
+8D3EB05D78FE770189785D0154518D3EB05D780189FE77785DFEAC784C01A06969FE0CFE
+6069690154C134AC5D7801895A0189785DE034AC5D78FE775AFE77785D014AD269696969
+00000002007500CC065004380004001A0000012137272105372135213717072127370115
+01273721072737213502BD02676969FE12FEDA79FDEC025975824901305D780189FE7778
+5DFDCC758249FEAB02196969D2D278CA4B7F5D78FE775AFE77785DCA4B7F780000000001
+006400CC063F0438000E0000012115211707013501170721152107019004AFFBC95D78FE
+770189785D0437FB51690219785D7801895A0189785D78690000000101A50000051105DC
+000E000001112311072701330107271123112702F1785C7801885A018A785E786804B0FB
+5004385E78018AFE76785EFBC804B06800000001007500CC06500438000E000001372721
+352127370115012737213505246969FB5104375D780189FE77785DFBC902196969785D78
+FE775AFE77785D780000000101A5FFF9051105D5000E0000011737113311371701230137
+17113302F16A68785E78FE765AFE78785C780125686804B0FBC85E78FE76018A785E0438
+00000002006400CC06500438000500150000012137272107052117070135011707212737
+01150127019003946969FC6C690385FD5C5D78FE770189785D02A45D780189FE77780219
+696969E15D7801895A0189785D5D78FE775AFE777800000201A4FFF0051005DC00050015
+00000111173711270311072701330107271137170123013702F1696969E15D7801895A01
+89785D5D78FE775AFE777804B0FC6C6969039469FC7B02A45D780189FE77785DFD5C5D78
+FE770189780000010120FFD1060304B3000E000009010701152311372115230107012301
+C9035055FD05A93F022C8302FB55FCB0950376FCB05502FB84022C3FA9FD055503500001
+00BCFFD1059F04B3000E000001352301270123352117112335012704F695FCB05502FB83
+022C3FA9FD0555037694FCB05502FBA93FFDD484FD0555000000000100BC0034059F0516
+000E000009013701353311072135330137013304F6FCB05502FBA93FFDD483FD05550350
+950171035055FD0584FDD43FA902FB55FCB000010120003406030516000E000001153301
+170133152127113315011701C995035055FD0583FDD43FA902FB55017194035055FD05A9
+3F022C8402FB550000000001006400CC063F0438000F0000012115211721152107013501
+17211521016304DCFB248A0452FC2678FE7701897803DAFBAE02BE788A787801895A0189
+78780001007500CC06500438000F0000012135212721352137011501272135210551FB24
+04DC8AFBAE03DA780189FE7778FC2604520246788A7878FE775AFE7778780001006400CC
+063F04380018000001232707270727072723170701350117073317371737173717063F28
+46B4B4B4B4B46E63E978FE77018978E98B46B4B4B4B4B46E022D46B4B4B4B4B46EE97801
+895A018978E946B4B4B4B4B46E000001007500CC06500438001800001335371737173717
+3733273701150127372307270727072707756EB4B4B4B4B4468BE9780189FE7778E9636E
+B4B4B4B4B446022DAA6EB4B4B4B4B446E978FE775AFE7778E96EB4B4B4B4B44600000001
+01A30000050F05DC00190000013301072711211521152115211123112135213521352111
+0727032D5A018878E80128FED80128FED8AAFEDA0126FEDA0126EA7805DCFE7678EAFE8E
+AAAAAAFEAC0154AAAAAA0172EA78000101A3FFF9050F05D5001900000523013717112135
+21352135211133112115211521152111371703855AFE7878E8FED80128FED80128AA0126
+FEDA0126FEDAEA7807018A78EA0172AAAAAA0154FEACAAAAAAFE8EEA78000003006400CC
+063F04380009000D0011000013350117072115211707013521153335211564018978E901
+71FE8FE97801AA00FFAA00FF02555A018978E9AAE9780161AAAAAAAA0000000301A30000
+051105DC0009000D00110000013301072711231107270133152315331123032D5A018A78
+EAAAEA780162AAAAAAAA05DCFE7678EAFE8E0172EA78FE56FEAAFF0000000003007500CC
+065004380009000D001100000901273721352127370125211523271523350650FE7778E9
+FE8F0171E9780189FBCE00FFFFAAFF0255FE7778E9AAE978FE7728AAAAAAAA0000000003
+01A3FFF9051105D50009000D00110000050137171133113717010335331503113311032D
+FE7678EAAAEA78FE7682AAAAAA07018A78EA0172FE8EEA78FE760334FEFE01A80100FF00
+00000001006B00CB063F0439000D00000115211707011123113311011707063FFBEEEA78
+FE76AAAA018A78EA02D7AAEA78018AFE7E035CFE80018A78EA000001007500CB06490439
+000D00001321273701113311231101273721750412EA78018AAAAAFE7678EAFBEE02D7EA
+78FE760180FCA40182FE7678EA00000200370086063F047E0006000D0000090235211121
+1309011121112101CFFEF6010A040CFBF464FE0401FC040CFBF4038CFEF6FEF683010EFD
+7D01FC01FCFEEFFE2A000002015E0000055606080006000D000009023311211105090121
+1121110464FEF6FEF683010EFD7D01FC01FCFEEFFE2A0470010AFEF6FBF4040C6401FCFE
+04FBF4040C000002004800860650047E0006000D00000115211121150901112111211101
+04B8FBF4040C010AFE92FBF4040C01FC038C83FEF283010AFE04011101D60111FE040002
+015EFFCD055605D50006000D00000123112111230901211121112101046483FEF283010A
+FE04011101D60111FE040165040CFBF4FEF6016E040CFBF4FE040004015E000005560608
+0006000D001100150000012111210901210311330901331101112111052115210445FE2A
+FEEF01FC01FCFEEF6483FEF6FEF6830172FE2A0172FEF2010E022401E801FCFE04FE7C01
+E8010AFEF6FE18FED4FEA4015C64940000000002015E000005560608000A001500002901
+1133112109012111330523152135231133090133050DFC9AC8FEEF01FC01FCFEEFC8FDC6
+C8029EC883FEF6FEF683015C02B001FCFE04FD506494940378010AFEF600000301400000
+05740608000B001600190000252315213523113327210733012111331121090121113301
+332702D3C8029EC8A164FE7864A1023AFC9AC8FED1021A021AFED1C8FDD9E874F8949403
+5A6464FBAE015C0292021AFDE6FD6E03AA740003015E0000055606080006001100180000
+2523152111073301211133112109012111330111213523113302C4B9011DD8740249FC9A
+B9FEFE01FC01FCFEFEB9FE7F011DB974F89404E4D8FB90015C02B001FCFE04FD5003ECFB
+1C94037800000003015E0000055606080006001100170000251133090133110521112101
+21090121012103330901333703E183FEF6FEF6830172FE2AFEEF0118FEE801FC01FCFEE8
+0118FEEF6B8AFEF6FEF68A806402F4010AFEF6FD0C6402F4011801FCFE04FEE8017C010A
+FEF6800000000003015E000005560608000A0019001F0000252315213523113309013301
+211133112101210901210121113301330901333702D3C8029EC883FEF6FEF683023AFC9A
+C8FEEF0118FEE801FC01FCFEE80118FEEFC8FECD8AFEF6FEF68A80F894940260010AFEF6
+FCA8015C0198011801FCFE04FEE8FE680314010AFEF680000000000200750086067D047E
+000A001500003711211521110901112115033523113335211509011575015C02B001FCFE
+04FD506494940378010AFEF6CF0366C80111FE04FE040111C8023AC8FD62C883010A010A
+83000002007A0000064D05D50005000F000001152111231101372115210107011123064D
+FA906301223F022CFEB6035E78FCA2A905D563FA8E05D5FE9F3FA9FCA278035EFEB60002
+007A0000064D05D50005000F0000333521113311010721352101370111337A057063FEDE
+3FFDD4014AFCA278035EA9630572FA2B01613FA9035E78FCA2014A0000000002015EFFCD
+05560608000900130000011133090133112309012721090121112109012103E183FEF6FE
+F68383010A010A1F0111FE04FE040111FEEF01FC01FCFEEF0165030B010AFEF6FCF5FEF6
+010A64FE0401FC024301FCFE04000003007500CC06500438002900350041000009012737
+210607060706070622272627262726272335333637363736373632171617161716172127
+37012422070607060721262726271321161716171632373637360650FE7778E9FEA1060A
+1B3231403D933A432E321B0A06BEBE060A1B3231403D933A432E321B0A06015FE9780189
+FC5F522329181A0F016C11181D2468FE980E191D24235223241D190255FE7778E9181840
+32311B1A1A1E2E32401818AA1A194032311B1A1A1E2E3240191AE978FE779D0F121A1C1E
+23171C10FEF01D1A1C100F0F101C1A000000FFFF0077FFF9063B05DC10270C1B012C0000
+10070C1DFED40000000000010075FE740650069000190000010705150127372135212737
+21352127372135212737011507050650FF00FFFE7778E9FB3D04C3D7D7FB3D04C3D7D7FB
+3D04C3E9780189FF00FF0255FFFF5AFE7778E9AAD7D7AAD7D7AAE978FE775AFFFF000001
+006400C0063F04440011000013350117072111331121152111231121170764018978E902
+33AA01E6FE1AAAFDCDE97802555A018978E9016DFE93AAFE93016DE978000001007500C0
+06500444001100000901273721112311213521113311212737010650FE7778E9FDCDAAFE
+1A01E6AA0233E97801890255FE7778E9FE93016DAA016DFE93E978FE77000001006400C0
+06500444001700000111331121273701150127372111231121170701350117070305AA01
+89E9780189FE7778E9FE77AAFE77E978FE77018978E902D7016DFE93E978FE775AFE7778
+E9FE93016DE97801895A018978E90001006400C0063F0444001900001335011707211133
+11331133112115211123112311231121170764018978E901A7AAAAAA011EFEE2AAAAAAFE
+59E97802555A018978E9016DFE93016DFE93AAFE93016DFE93016DE978000001007500C0
+065004440019000009012737211123112311231121352111331133113311212737010650
+FE7778E9FE59AAAAAAFEE2011EAAAAAA01A7E97801890255FE7778E9FE93016DFE93016D
+AA016DFE93016DFE93E978FE77000001006400C006500444001F00000111331133113311
+212737011501273721112311231123112117070135011707029C8C648C0120E9780189FE
+7778E9FEE08C648CFEE0E978FE77018978E902D7016DFE93016DFE93E978FE775AFE7778
+E9FE93016DFE93016DE97801895A018978E90002003700C4063F04400002000900000111
+070511090111211501A5FA014AFE4201BE044A018801F4FA41FE8301BE01BEFE83820002
+007500C4067D044000020009000001372703213521110901050FFAFA50FBB6044A01BEFE
+420188FAFAFEC582017DFE42FE420003003700C4067D044000020005000F000001372701
+110705211109011121110901050FFAFAFC96FA0414FD36FE4201BE02CA01BEFE420188FA
+FAFE0C01F4FA41FE8301BE01BEFE83017DFE42FE4200000200100000056805D50002000A
+0000250121130133132113330102BC0113FDDBA0FDC6D58802A188D2FDC7C702E7FC5205
+D5FE81017FFA2B00000000010087FFE3046E05F0001D006DBA000F000000032BB8000F10
+411B0016000F0026000F0036000F0046000F0056000F0066000F0076000F0086000F0096
+000F00A6000F00B6000F00C6000F00D6000F000D5D410500E5000F00F5000F00025D00BA
+0012001B00032BB8001210BA0003000C00032BB800031030311310003332171617232627
+26232202111012333237363733060706232200870109FBFB854221CA121B4F9D9C9D9D9C
+9D4F1B12CA214285FBFBFEF702E9017A018DC66390493799FECDFECCFECCFECD99374990
+63C5018C00000002005FFFE303C4054C0020003000000522272635343736333217161736
+353427262322073536332017161514070207060114171633323736373637262322070601
+B58D5C6D6063B2755C36250D2047BC476E7468010C7235193FA380FEC12C2F4840334835
+2C16599A843A241D5565B7BE9498492B48515C874EAD2CA81FF674AD7183FEB89C7A0153
+6436392D3E655359D7AE6C000000000100C90000048B05D5000B00000111213521112135
+21112135048BFC3E02F8FD0802F8FD0805D5FA2BAA01ECAA01EBAA000000000300C9FFA2
+048B063500130017001B0000011121072337233533132135211321352137330F01033311
+01032111048BFD4B1DAA1D639898FED0016498FE0402301EAA1E3498EAFEE29801B605D5
+FA2B5E5EAA01ECAA01EBAA6060AAFE1501EBFD6BFE1401EC00000003009BFFEC065D05AE
+001B00280036000001373307161716100204232227262707233726272610122433321716
+0901272623220407060716171609011617163332243736372627260508596A80694564C8
+FEA0B9BBB038307E69AA3F2F63C60160BBB9B012FCC902F40E91999AFEDD525101015124
+0367FD05272D919A99012253520101523A053B6E9D537AB2FE80FE9DBE5F1E279CD24254
+B101800163BE5F0AFBE903A5084E9D93919B9B91400344FC521F184F9D93919B9B916700
+00000002FFFA0000056005C1000200060038400F00030103050403020100050705060710
+D4CC11173931002FC4CC113930401463016D02700178027F0279057606076E007F00025D
+015D0901210133012102ACFE5E0344FDEFE00243FA9A04EEFBC4050FFA3F0002FFFA0000
+056005C10002000600002501210901210102AC01A2FCBC0133FDBD0566FDBDD3043CFAF1
+05C1FA3F0000000100AFFFEC064905AE001C000001161716171617211521222402353412
+243321152106070607060721150157073F4A8C899402B9FD47C0FE9DBEBE0163C002B9FD
+4794898B4B400904F502734A788B4E4C019FC60160BBB90160C89F014D4F8A785DA00003
+00AFFEE5064906AF001E0026002F00000117072115210321152103163321152122270327
+1326272602353412243B01011417161716171337132322070607061504D896490124FEA2
+B90217FDAFB0242402B9FD47413F6496602C2CB1BEBE0163C0EAFCDD4655811D1DA03BB8
+B0938A7D594906AF37CA9FFE04A0FE1D059F0BFEEE3701081318630160BBB90160C8FCC5
+4A789148100D01B8A001FC4E4792785D0000000100D9009B04E504670016000025202435
+34242901150506070607211521161716332115032BFED8FED6012A012801BAFE46E8694E
+1D0376FC8A254672DF01BA9BF6F0F0F68E01014F3A858E9130518E000000000100AFFFEC
+064905AE001C000001262726272627213521320412151402042321352136373637363721
+3505A1073F4A8C8994FD4702B9C00163BEBEFE9DC0FD4702B994898B4B4009FB0B03274A
+788B4E4C019FC6FEA0BBB9FEA0C89F014D4F8A785DA0000300AFFEE5064906AF001E0026
+002F000001273721352113213521132623213521321713170316171612151402042B0101
+3427262726270307033332373637363502209649FEDC015EB9FDE90251B02424FD4702B9
+413F6496602C2CB1BEBEFE9DC0EA03234654821D1DA03BB8B0938A7D5949FEE537CA9F01
+FCA001E3059F0B011237FEF8131863FEA0BBB9FEA0C8033B4A789148100DFE48A0FE044E
+4792785D0000000100D9009B04E504670016000001200415140429013525323736372135
+0526272607213502930128012AFED6FED8FE4601BAE8694E1DFC8A0376254674DDFE4604
+67F6F1EFF68E01503A858E01913152018E000001012C000003EB03E20003000B00B80001
+2FB800002F303121112111012C02BF03E2FC1E0000000001009CFE77057105C10007001E
+400F0602D704D600AF080367010567000810D4ECD4EC310010FCECEC3230132111231121
+11239C04D5F0FD0AEF05C1F8B6067DF983000001009CFE77057105C10007001E400F03D6
+07D70501AF080567070367010810D4ECD4EC310010FC3CFCFC3013113311211133119CEF
+02F6F0FE77074AF983067DF8B60000010019FE77053B05C1000B005D40140A040C020507
+0200070C0A05040301000606080C10D4C41739310010C4D4CC10CE111239393040305103
+560550055A0A730370037604750570057A0A800380050C5A097F027F03700570067B0974
+0B8F028F03800580060B5D015D1321152109012115213509013704EAFC4102A0FD4A03EF
+FADE02D5FD4905C1C1FD33FD04C095032102E3000000000100D9022D05DB02D700030011
+B6009C020401000410D4C4310010D4EC3013211521D90502FAFE02D7AA00000200D90000
+05DB0504000B000F00002123112135211133112115210135211503AEA8FDD3022DA8022D
+FDD3FD2B05020183AA0183FE7DAA02D7AAAA000200D9000005DB05D5000B000F0057BA00
+05000600032BB8000510B80000D0B8000610B8000AD0B8000610B8000CD0B8000510B800
+0DD000B800052FBA000D000E00032BB8000D10BA0002000300032BB8000210B8000310B8
+0007D0B8000210B80009D030310111211521112311213521190133152303AE022DFDD3A8
+FDD3022DA8A804A0FE05AAFE0501FBAA01FB0135CC00FFFF0000FF4202B205D510060012
+0000FFFF018AFF92043C06251007003F018A0050000000010105000005AF050400110000
+0125370511331125170D010725112311052702B1FE545501ACA801AC55FE5401AC55FE54
+A8FE54550282F793F701EFFE11F793F7F793F7FE1101EFF79300FFFF0144014703BE03C2
+100700720081FDD20000FFFF0158015903AA03A910060B0425880001003DFFD70519067D
+000A002A40180A09080706050B020402000B0A090706050403000801080B10D4CC173931
+0010D4CCC411121739300133152301230107272501045CBD73FDAE42FEC17D19011B0100
+067D60F9BA03732D5062FD3B0000FFFF003DFFD70519077612260CA40000100700750073
+0186FFFF003DFFD70519076512260CA4000010070B4F00730186000200DC00E504DB03E5
+000B00310000013237022322070615141716051523222726272627060706232227263534
+3736333217161716173637363B01152322071233020FA5637F896433363638032B4D4936
+36341F31433B497487595E5E538F49363F2B2828433B49744B4094747F89016BF0010648
+4D6670454602841E1B3F2454783540656AAFA872651E2139334578354083F0FEFA000003
+00DC00E505CE03E50023002F003B00000126270607062322272635343736333217161716
+173637363332171615140706232227262532370223220706151417160122071233323736
+3534272603A51F31433B4A7387595E5E548E49363F2B2828433B4A7387595E5E548E4936
+36FE36A5637F89643337373802EB95737E8A6433373738015D2454783540656AAFA87265
+1E21393345783540656AAFA872651E1B4DF00106484D6670454601F4F0FEFA484D667045
+46000001011B00CB05990549000500002521113311210599FB82AA03D4CB047EFC2C0001
+00AF0000064905D5000500002515210133010649FA6603B9F2FCCBCACA05D5FAF5000002
+00AFFF94064905D50005001B004100B800072FB800122FBA000E000F00032BB8000E10B8
+0000D0BA000400120007111239BA000500120007111239B8000F10B80015D0BA00160012
+000711123930312526272627011301330116171617211521161523342721012627371604
+60274A4157FECEE30160F2FE4C71525D2B0158FEC9048C05FC2A020D1E1F501DCA8B8673
+5EFE1E02E30228FD527393A7B0CA353737350336151475130000000200EDFFFA05DC05D1
+0017001D0035BA000D001C00032BB8000D1000B800092FB800122FBA0005001200091112
+39BA001600120009111239BA001900120009111239303109013701262737161725150516
+07150607051525060727361309013637360372FD7B02028E191D8B1D1901D4FE8A450607
+470185FE251C1E861F79FDDD021A34040701340152C00157211E4C2124EED2BEB3C609A1
+93BFD2F126214C2002E9FEE7FEF07B819E00000101B0FE4A0250062B0003000001331123
+01B0A0A0062BF81F000000010066FE4A039B062B000B0037BA0006000000032BB8000610
+B80002D0B8000010B80008D000B800012FB800072FBA000300070001111239BA00090007
+0001111239303101113311371705112311072701B0A0FB50FEB5A0FD4D025603D5FC9CB0
+6FE7FC290367B16E000000020110FE4A02F0062B00030007000001331123013311230110
+A0A00140A0A0062BF81F07E1F81F00010066FE4A039B062B0013007BB800142FB800152F
+B8001410B80000D0B800002FB8000EDCB80002D0B8001510B8000ADCB80004DCB8000A10
+B80006D0B8000410B8000CD0B8000010B80010D000B800012FB800052FB8000B2FB8000F
+2FBA0003000B0001111239BA0007000B0001111239BA000D000B0001111239BA0011000B
+0001111239303101113311371133113717071123110711231107270110A0A0A05B50ABA0
+A0A05D4D01E60445FC2B710364FD0C406F78FBBA03D770FC9902F7416E00000101080000
+04D304A2000600002101330123090101080169FA0168C3FEDEFEDD04A2FB5E03ACFC5400
+000000010108000004D304A200060000013309013301230108C301230122C3FE98FA04A2
+FC5403ACFB5E00010108000004D304A20011000001101233321219012311342623220615
+11230108F5F1F0F5AC94A5A694AC02500128012AFED6FED8FDB00237F4D3D3F4FDC90001
+0108000004D304A2001100000111331114163332363511331110022322020108AC94A6A5
+94ACF5F0F1F502520250FDC9F4D3D3F40237FDB0FED8FED6012A00010075FE4D03B6060E
+00150000013E013216170726232207030E01222627371633323701E308A2977E14941139
+47084108A2977E14941139470804E2A7857D8C0F82AFFAB0A7857D8C0F82AF000000FFFF
+0075FE4D05DB060E10260CB5000010070CB502250000FFFF0075FE4D0800060E10260CB5
+000010270CB50225000010070CB5044A000000030075FE4D03B6060E002D0036003F0000
+013637363332171617072623220703161716151407060703060706232227262737163332
+3713262726353437363713363736353427262703130607061514171601E308534F4A4D47
+371494113947080E63426E6E56730F08534F4A4D47371494113947080F5D496E6F53758A
+3D2C4547252CBD163D2C484B2504E2A7444146378C0F82AFFED6184B7C929C6F5513FEBE
+A7444146378C0F82AF013118496F9B9C735613FD9B102F48676A472412FE3401D6112E4A
+68674824000000040075FE4D05DB060E004D0051005A0063000001363736333217161707
+262322070321133637363332171617072623220703161716151407060703060706232227
+262737163332371321030607062322272627371633323713262726353437363713211321
+03130607061514171601033637363534272601E308534F4A4D47371494113947080E017E
+0F08534F4A4D47371494113947080E63426E6E56730F08534F4A4D47371494113947080E
+FE820F08534F4A4D47371494113947080F5D496E6F537589017E18FE82BE163D2C484B25
+030D163D2C45472504E2A7444146378C0F82AFFEE20137A7444146378C0F82AFFED6184B
+7C929C6F5513FEBEA7444146378C0F82AF0124FEC3A7444146378C0F82AF013019496F9B
+9C735613FD9201F1FE2101D6112E4A6867482401BAFE2B102F48676A472400050075FE4D
+0800060E006D00710075007E008700000136373633321716170726232207032113363736
+333217161707262322070321133637363332171617072623220703161716151407060703
+060706232227262737163332371321030607062322272627371633323713210306070623
+222726273716333237132627263534373637011321032901132103130607061514171601
+033637363534272601E308534F4A4D47371494113947080E017E0F08534F4A4D47371494
+113947080E017E0F08534F4A4D47371494113947080E63426E6E56730F08534F4A4D4737
+1494113947080EFE820F08534F4A4D47371494113947080EFE820F08534F4A4D47371494
+113947080F5D496E6F5375042C18FE8218FDDB017E18FE82BE163D2C484B250532163D2C
+45472504E2A7444146378C0F82AFFEE20137A7444146378C0F82AFFEE20137A744414637
+8C0F82AFFED6184B7C929C6F5513FEBEA7444146378C0F82AF0124FEC3A7444146378C0F
+82AF0124FEC3A7444146378C0F82AF013019496F9B9C735613FD9201F1FE0F01F1FE2101
+D6112E4A6867482401BAFE2B102F48676A472400000000010075FE4C042E060F00330000
+0126232207031617161D01371707232737173534272627030E0123222627371633323713
+060706152334373637133E01333216170322113B450810593F775E48BE36BC485C4F332C
+2C08A0484F801494113B45082B402F56666D566D1108A0484F801404F682AFFEB3183F75
+9C1E5D48BDBD485D1E734D330BFC67A5877A8F0F82AF0388102E56729B6D5611015FA587
+7A8F00030075FE4D041D060E00080011003C0000011306070615141716253427033E0137
+27371326232207031617161537170706070607030E012226273716333237132627263534
+373637133E0132161701B7163D2C484B25018098163D510987486C113B45080E594C6D48
+48A71A3C56730F089F98801494113B45080F5D496E6F53750F089F988014014A01D6112E
+4A67684824E6993BFE2B1065138848025D82AFFED6164D6F7C4848A7433F5A13FEBEA587
+7A8F0F82AF013118496F9B9C735613013CA4887A8F0000030075FE4D041F060E00080012
+003B0000011306070615141716012E0127033E013707271326232207031E011F01072714
+0607030E012226273716333237132627263534373637133E0132161701B7163D2C484B25
+016D23362C163D69075348B2113B45080E638B12A4484BC2730F089F98801494113B4508
+0F5D496E6F53750F089F988014014A01D6112E4A676848240136423012FE2B1082405448
+02EF82AFFED6189D3FA4484B7CC013FEBEA5877A8F0F82AF013118496F9B9C735613013C
+A4887A8F0000FFFF007900CD049E04D510270D4FFF9EFE8510270D4F02F0FE8510070D4F
+0147018F0000FFFF007900CD049E04D510270D4F0147FE8510270D4F02F0018F10070D4F
+FF9E018F0000FFFF00A100CD017404D610270D4FFFC6019010070D4FFFC6FE850000FFFF
+007900CD049E04D510270D4F02F0018F10270D4FFF9E018F10270D4F02F0FE8510070D4F
+FF9EFE850000FFFF00D9022D05DB046A10270D4F0214012410060C9C0000000300D9009F
+05DC046A00030007000B00000133152313331523052115210508D3D301D3D3FBD00358FC
+A8019DFE03CBFE95AA00FFFF00D8009F05DC046A10260C9C000010270D4FFFFDFE571027
+0D4FFFFE012410270D4F042DFE5710070D4F042E0124FFFF00D9009F05DB046A10260CC6
+000010270D4F0213FE5710070D4F02140124000100D901D305DB0332001D000001150E01
+232227262726272623220607353E01333217161716171633323605DB69B3616E920A0706
+0F9B5E58AC6269B3616E930B05060F9B5E56A90332B34E453B040302063D4C54B34E453B
+050202063D4B000100D901D305DB0332001D0000131E0133323736373637363332161715
+2E01232207060706070623222627D967A9565E9B0F06050B936E61B36962AC585E9B0F06
+070A926E61B3690332554B3D060202053B454EB3544C3D060203043B454E000100A20131
+061203D400290000012E01232206151E013307222E0135343E01333216171E0133323635
+2E012337321E0115140E01232226033A519F48526402684E01699C5C648E6E78C23E40B0
+48526402684E01699C5C648E6E78C4022E74746C483D599B4F9A484CA25C7D585B8D6C48
+3D599B4F9A484CA25C7D000100D9005705DB04AD00110000010223220302272203231233
+32131217321305DB7BFBE66466667458AA7BFBE6646666745802D7FD8001D601DC01FE23
+0280FE2AFE240101DD00000100D0000002300502001D000021232E013534373637363736
+35342627331E0115140706070607061514160230B44E443A040402063C4C54B44E443A06
+0202063C4A68B4606E920A08060E9C5E58AC626AB2626E920C0406109A5E56AA00000001
+00D9009D05DB046C001B0000012623220607353E013332171317031633323637150E0123
+2227032702E6634458AC6269B3615D79AC9BA8654556A96769B3616079AB9B0253204C54
+B34E452B017E46FE8C204B55B34E452CFE8546000000000200D9011005DB03A2001C0020
+000001150E0123222F0126272623220607353E0133321716171617163332360121152105
+DB69B3616E9211060F9B5E58AC6269B3616E930B05060F9B5E56A9FB650502FAFE026FB3
+4E453B0702063D4C54B34E453B050202063D4B0188A8000200D9016005DB03F4001A001E
+000001150E0123222F0126272623220607353E0133321F02163332360121152105DB69B3
+616E9211060F9B5E58AC6269B3616E930F169B5E56A9FB650502FAFE03F4B24F453B0702
+063D4C53B24E453B06093D4BFE6BAA000000000200D9006205DB04D30025002600000103
+163332373637150E0123222707211521072737213521372623220607353E0133321F0113
+010503CB1F25485CAF0C69B361425090029FFCEFB9896CFEE50199B8915A58AC6269B361
+6E9333EFFD7D046FFEE90B2D5822B24F4516BAAAFE649AAAF3384C53B24E453B160149FC
+8D00000300D900B805DB04C1001A001E0022000001150E0123222F012627262322060735
+3E0133321F0216333236012115211521152105DB69B3616E9211060F9B5E58AC6269B361
+6E930F169B5E56A9FB650502FAFE0502FAFE04C1B24F453B0702063D4C53B24E453B0607
+3F4BFE6BAACBAA000000000200D9001805DB04C1001A002E000001150E0123222F012627
+2623220607353E0133321F02163332360123352137213521371707211521072115210727
+05DB69B3616E9211060F9B5E58AC6269B3616E930F169B5E56A9FC4CE70195D1FD9A0319
+8C6F130101FE4BD00285FCC9A66F04C1B24F453B0702063D4C53B24E453B06073F4BFC4C
+AACBAA8A7317AACBAAA073000000000100D9FFF605DB0542002E00000116333237363715
+0E0123222707211521072115210727372335213721352137272623220607353E0133321F
+01371704620A094B604A7169B361272B5C022BFD7A6C02F2FCB368923EF901546DFE3F02
+1C75329B5E58AC6269B3616E93638692042201251E5DB24F4507ABAACBAAC24E74AACBAA
+DA143D4C53B24E453B25FA4E0000000200D9011005DB03F4001D003B003F401F2E1F392A
+002D221301101B0C1E2A9C31399C22049C1B0C9C133C1E002D0F3C10D43CC432310010D4
+ECD4ECDCFCD4ECC01112393911123939111239393001150E012322272627262726232206
+07353E01333217161716171633323613150E01232227262726272623220607353E013332
+17161716171633323605DB69B3616E920A07060F9B5E58AC6269B3616E930B05060F9B5E
+56A96769B3616E920A07060F9B5E58AC6269B3616E930A05070F9B5E56A9026FB34E453B
+040302063D4C54B34E453B050202063D4B01DAB24F453B040302063D4C53B24E453B0402
+03063D4B0000000100D9000505DB04FF00340000011633323637150E0123222707163332
+3637150E0123222F010327132623220607353E01333217372623220607353E01321F0113
+170411392B56A96769B361404C4A935A56A96769B361837D138DA489392B58AC6269B361
+404D48925A58AC6269B3C2A0128DA403610D4B55B24F4514BB384B55B34E453B09FE9840
+015E0D4C54B34E4514BB384C53B24E453B0701664000000300D900B805DB04C9001A0035
+0039000001150E0123222F0126272623220607353E0133321F021633323613150E012322
+2F0126272623220607353E0133321F02163332360121152105DB69B3616E9211060F9B5E
+58AC6269B3616E930F169B5E56A96769B361718F11060F9B5E58AC6269B3616E930F16C6
+3356A9FB650502FAFE034CB24F453B0702063D4C53B24E453B06073F4B01D2B24F453B07
+02063D4C53B24E453B06073F4BFCEEAA0000000300D9007905DB04D1001A003500500000
+01150E0123222F0126272623220607353E0133321F021633323613150E0123222F012627
+2623220607353E0133321F021633323613150E0123222F0126272623220607353E013332
+1F021633323605DB69B3616E9211060F9B5E58AC6269B3616E930F169B5E56A96769B361
+6E9211060F9B5E58AC6269B3616E930F169B5E56A96769B361718F11060F9B5E58AC6269
+B3616E930F16C63356A901D7B24F453B0702063D4C53B24E453B06073F4B01D2B24F453B
+0702063D4C53B24E453B06073F4B01D2B24F453B0702063D4C53B24E453B06073F4B0003
+00D900B805DB04C1001A001E00220000131E0133323F023633321617152E01232207060F
+0106232226270115213501152135D967A9565E9B160F936E61B36962AC585E9B0F061192
+6E61B3690502FAFE0502FAFE04C1554B3F07063B454EB2534C3D0602073B454FFEC8AAAA
+FE8BAAAA0000000200D800D705DB042B0009001300000120253504052025150405200515
+242504053524035BFEE1FE9C0167011C01260159FEA2FEE00125015AFEA3FEDEFEE0FE9D
+016802D3A6B29511A6B297B3A6B2970F02A4B2970000000200D9003605DB04CE001C0039
+000025363736373637211521060706070622272627262721352116171617161306070607
+060721352136373637363217161716172115212627262726035B432D381E1B04019BFEF6
+0E1C375659CE5957361E0CFEF6019C041B1E382E43432E381E1B04FE64010A0C1E365759
+CE5956371C0E010AFE65041B1E382DD9041E2C43455BA83C305B323333325B3339A85C44
+442B1E034E041E2B44445CA839335B323333325B303CA85B45432C1E0000000200D90160
+05DB04CE001C002000000106070607060721352136373637363217161716172115212627
+26272601211521035B432E381E1B04FE64010A0C1E365759CE5956371C0E010AFE65041B
+1E382DFD3B0502FAFE042B041E2B44445CA839335B323333325B303CA85B45432C1EFDE3
+AA00FFFF00D9016005DB04FF10270D4F021501B9100600200000FFFF00D9000205DB04FF
+10270D4F0213FDBA10260020000010070D4F021401B9FFFF00D9000505DE04FF10270D4F
+FFFE01B910260020000010070D4F0430FDBDFFFF00D9000505DD04FF10270D4FFFFEFDBD
+10260020020010070D4F042E01B9FFFF00CF0136073203CF10270D4FFFF4FEEE10270D4F
+FFF4008910070020015700000000FFFF00CD0136073303CC10260020F40010270D4F0585
+008610070D4F0585FEEE000200D9016005DB03A20009001B000001061514173336353427
+17211521352126353437213521152116171402E63434F233348D0177FAFE017E191BFE80
+0502FE891A0102FA3049473030474732F0AAAA3F383E3BA8A81A5F380000000400D90160
+05DB06150003000700110020000013211521152115210122061514163236342627321617
+1E01151406232226353436D90502FAFE0502FAFE0285486464916465483B6B272A2AA87A
+7BA4A703A2A8F0AA044462464560608B62712B2828643A73A19E7676A300000300D90160
+05DB054B0003000700110000132115211521152101201715262106073536D90502FAFE05
+02FAFE02820100E1E0FEFFFEE6E903A2A8F0AA03EB97B2970295B2970000000300D90160
+05DB067F00030007000E0000132115211521152109013301230B01D90502FAFE0502FAFE
+01240104B401039FBEB803A2A8F0AA0282029DFD6301D9FE2700000300D9016005DB067F
+00030007000E0000132115211521152101331B01330123D90502FAFE0502FAFE0124A6B8
+BE9FFEFDB403A2A8F0AA051FFE2701D9FD63000300D9016005DB06CA0003000700110000
+132115211521152113211B01210713270713D90502FAFE0502FAFEFA012B5D5E012AF25E
+F4F35D03A2A8F0AA044E011CFEE4B0FEE4B0B0011C00000400D9016005DB06D400030007
+000A000E0000132115211521152101032103330121D90502FAFE0502FAFE0282A6014EDF
+700121FD4E03A2A8F0AA04C0FE4E0266FD1F000700D9016005DB061C00030007001B0030
+00370047004F0000132115211521152101152322061D0133152311231123353335343633
+031521141633323637150E01232226353436333216073426232206152735331123350E01
+23222634363332160614163236342622D90502FAFE0502FAFE04A43F241B6D6D433F3F3F
+44EDFECF4E42264823244A2760716B5B515F433C313748C6424215402C495C5C492C40CD
+3C693D3D6903A2A8F0AA04BC371E242433FEA00160331C443DFEAA20444813123E0F1070
+606374694736423F3969DAFDD03D242374BE7523679353539353000300D9016005DB0614
+00030007002A00001321152115211521013E013332161511231134262322061511231134
+262322061511231133153E01333216D90502FAFE0502FAFE029F215D3F555C5A37394550
+5A373A44505A5A1E563A3B5303A2A8F0AA043D3D3A786FFEB501484F4D5D51FECA014850
+4C5E50FECA02255532303D000000000400D9016005DB06DA00030007000B002C00001321
+1521152115210133152337233534363F013E0135342623220607353E013332161514060F
+010E01070E0115D90502FAFE0502FAFE02346565625F1C2D2D1C1A4236275A302F60345C
+6F242D2C171404030303A2A8F0AA03017FC84E32412B2C1B2F182D3723215E1C1C614F26
+452B2B171B0D0A1E1A00000100D9002705DB04DD0013003E40220D0C0A0302CF04009C06
+0CCF0E0A9C1206100814120E0D0C080403020809050F001410DC3CC4321739310010D43C
+CC32FC3CEC10FE3CEC39111239301321011707211521072115210127372135213721D903
+0401007DAE012FFE48C3027BFCFAFEFE7DAEFED501B6C3FD8703A2013B66D5A8F0AAFEC7
+66D3AAF00000000300D900B805DB044C00030007000B0021400E04060002080A0C0A0602
+0804000C10DC3C3CDC3C3C310010D4DCDCDCDCDC30132115211121152111211521D90502
+FAFE0502FAFE0502FAFE02D7AA021FAAFDC0AA000000000100D9FFCE05DB0534001B0000
+012135213717072115210721152107211521072737213521372135210395FD4403188099
+510122FE817201F1FDB56E02B9FCE9819952FEDD01816FFE10024C03A2AAE85494AACBAA
+CBAAEA5496AACBAA0000000400D9000005DB050900030007000B000F0029401404060002
+0C0E080A100E0A0603020C080403001010DC173CDC173C310010D4DCDCDCDCDCDCDC3013
+211521112115211121152111211521D90502FAFE0502FAFE0502FAFE0502FAFE0394AA02
+1FAAFC4BAA021FAA0000000200D9000005DB04A80006000A0054402E029C030403019C00
+01040403019C0201050605009C06054205040201000503D106A7079C0901080200240704
+230B10FC3CEC32323931002FECF4EC1739304B53580704ED071008ED071008ED071004ED
+59220902150135090121152105DBFC4003C0FAFE0502FAFE0502FAFE03F8FEEBFEEEB201
+70AA016FFC02AA000000000200D9000005DB04A80006000A0056402F069C000603040305
+9C040403009C010201069C05060202014206050302000504D101A7079C08060702240904
+00230B10FC3C3CEC323931002FECF4EC1739304B5358071008ED071004ED071004ED0710
+08ED59221335011501350901152135D90502FAFE03C10141FAFE03F8B0FE91AAFE90B201
+12FDC7AAAA00000300DAFF5605DC051B0003000A000E0000332115210902150135090121
+1521DA0502FAFE0502FC4003C0FAFE0502FAFE0502FAFEAA0515FEEBFEEEB20170AA016F
+FC02AA000000000300DAFF5605DC051B0003000A000E0000211521351135011501350901
+15213505DCFAFE0502FAFE03C00142FAFEAAAA046BB0FE91AAFE90B20112FDC7AAAA0002
+00DAFEB105DC051B0013001A000005213521372135213717072115210721152107270902
+150135010227FEB301DA60FDC602C8898A290150FE225F023DFD368A8A03DEFC4003C0FA
+FE0502AAAA73AAA47331AA73AAA5740546FEEBFEEEB20170AA016F000000000200DAFEB1
+05DC051B0013001A00000521352137213521371707211521072115210727013501150135
+010227FEB301DA60FDC602C8898A290150FE225F023DFD368A8AFEDC0502FAFE03C0AAAA
+73AAA47331AA73AAA5740546B0FE91AAFE90B201120000020094002E07CC04DF0006000D
+00000902150135010509011501350107CCFCC6033AFBCA0436FCFEFCC6033AFBCA043604
+11FE70FE72C502089F020ACEFE70FE72C502089F020A00020094002E07CC04DF0006000D
+00001335011501350103350115013501940436FBCA033A380436FBCA033A0411CEFDF69F
+FDF8C5018E0190CEFDF69FFDF8C5018E0000000200B0FEF2030606120019002700000106
+071617161514070607161721363726272635343736372627133637361027262706070610
+1716027B292359344A4A34592329FEC0292359344A4A34592329A0161141411116161141
+411106124746A39EE2DFE0E39EA247474747A29EE3E0DFE29EA34647FA323B3BE201CEE1
+3B3C3C3BE1FE32E23B00000100D8001A05DC04E8001B000001060735243F012425350425
+131707363715040F01040515240503270257B4C90109DF65FEF6FEBB01B20100C49487B7
+C8FEFBE4640110013FFE4EFF00C494015D295DB26F26B60E97B2AF0A016252F42960B271
+25B50D98B2AF0BFE9F52000200D9000505DB0564000F0012000001051525032713253501
+131707251505070D01039D023EFD7A998793FE11031BAD886D011FFE7AC8FE46013C01DF
+CBB6EAFEBD400136B4A60120016F40E668B68B479D70000200D9FFA005DB04FF000F0012
+000001253505131703051501032737053525372D010317FDC2028699879301EFFCE5AD88
+6DFEE10186C801BAFEC40325CBB6EA014340FECAB4A6FEE0FE9140E668B68B479D700002
+00D9FF2F05DB05560002001A0000010D0103213521132535251317072515050305152503
+21152107270392FE89012FF4FE8301BD78FDCB030376A448012DFE897201E9FDDB66028B
+FD354CA4034F6C55FD72AA0143A2AADD01403DC756B06CFED18CB29EFEEDAAD13D000002
+00D9FF2F05DB05560002001A000001252701213521370535253725350513170305150503
+211521072703910109D6FE1DFEF8014757FE6201E85BFDBD027F84A47F01DAFD6D6D0300
+FCC14EA402974C3EFCDFAAEC77B28BF5A7B0B701653DFEA888AABDFED8AAD13D00000002
+00D9FF9005DC04A8001D0024000025150E01232227262726272623220607353E01333217
+16171617163332361309011501350105DC6AB2626E920A0606109A5E58AC6268B4606E94
+0A06060E9C5E56A867FC4003C0FAFE0502F0B44E443A040402063C4C54B44E443A060202
+063C4A035EFEEBFEEEB20170AA016F000000000200DAFFB005DC04A8001B002200000115
+0E012322272E01272623220607353E013332171E0117163332360135011501350105DC6A
+B2626E920A0C109A5E58AC6268B4606E940A0C0E9C5E56A8FB660502FAFE03C1010EB24E
+463C0404063E4C54B24E463C0404063E4C033EB0FE91AAFE90B201120000000200D9FF29
+05DC0550003100340000252623220607353E013332171325352513170725150503051525
+0317161716171633323637150E012322272627262F010727010D01026B1E0D58AC6268B4
+60272B6BFDC6030875A5450125FE8F7301E4FDE16B070A06060E9C5E56A8686AB2626E92
+0A0606102250A50176FE8401312D034C54B44E4407011DA3AADE013941BB54B06AFECD8A
+B29CFEE302060202063C4A56B44E443A040402060DD83C03EC6E57000000000200D9FF2F
+05DC055600310034000001051505071617161716171633323637150E0123222726272627
+262703273706070607353637363F01053525372535051317032527040801D3FD755E3036
+0A06060E9C5E56A8686AB2626E920A060610473B68A45638365662685A4D533CFE6101E9
+5EFDB9028380A4E80102CE03BF86AABBF70D16040202063E4C54B24E463C040202061D0F
+FEF13DDF09182654B24E231E04A177B28BF4A8B0B801663DFD804A3B0000000200D0FF4E
+05DC057D0006000D0000133501150135090315013501DA0502FAFE03C00138FC4003C0FA
+FE05020227B0FE91AAFE90B2011203BBFEEBFEEEB20170AA016F000200D0FF4E05DC057D
+0006000D00000902150135090135011501350105D2FC4003C0FAFE0502FB080502FAFE03
+C00227FEEBFEEEB20170AA016F01F6B0FE91AAFE90B201120000000300D0FE6D05DC0660
+0002001E002100002D020325352513170325150503051525070515050327130535251325
+3505130D01034D014DFEDC60FDBA02C25AA6440184FE4F4101F2FDE81E0240FD465AA644
+FE7401B840FE08021F6DFEAC012AB35F540157A7AACA018826FED46FB07DFEE48EB29A81
+A5AAC8FE7726012D72B27E011891B09B01DE62550000000300D0FE6D05DC066000020005
+0021000001071701372F0125350513170305150507251505070515250327132535253705
+352502C0AE98014AA692A4FD7602B161A66401AEFDEC22022CFDA92C0283FD5660A662FE
+4C021C22FDCC025F0144322C02A32F2A2FBCB0C501A826FE4F7BAA98949FB0ADC2B8B2C4
+FE5B2601AE7DAA9A94A2B2AD0000000100D9FFB205DB0550000A00000100050401150025
+35240105DBFE72FDF302090192FE6FFC8F0373018F0461FE81615EFE7EEF02007CA67C02
+0000000100D9FFB205DB0550000A00001335000515040135002524D9018F0373FC8FFE6F
+01920209FDF30461EFFE007CA67CFE00EF01825E6100000200D9FF2905DB055700050010
+0000211500253504010005040115002535240105DBFE67FC97035601ACFE81FE2401DC01
+7FFE81FC7D0383017FD701BE91AE8502DFFEE55D5DFEE5D7017884A67C01800000000002
+00D9FF2905DB05570005001000003300251504011135000515040135002524D901AC0356
+FC97FE67017F0383FC7DFE81017F01DCFE2401A185AE91FE420557D7FE807CA684FE88D7
+011B5D5D0000000200D9FF5205DB0557001D0028000025150E0123222726272627262322
+0607353E013332171617161716333236130005040115002535240105DB69B3616E920A07
+060F9B5E58AC6269B3616E930B05060F9B5E56A967FE81FE2401DC017FFE81FC7D038301
+7FB1B34E453B040302063D4C54B34E453B050202063D4B0424FEE55D5DFEE5D7017884A6
+7C0180000000000200D9FF5205DB0557001D0028000025150E0123222726272627262322
+0607353E013332171617161716333236013500051504013500252405DB69B3616E920A07
+060F9B5E58AC6269B3616E930B05060F9B5E56A9FB65017F0383FC7DFE81017F01DCFE24
+B1B34E453B040302063D4C54B34E453B050202063D4B0424D7FE807CA684FE88D7011B5D
+5D00000200D9FF8305DB061D0015001A0000012625352425011703363715060703041715
+02250327010607161702EEF0FEDB01C30145011E83B99E74BAD68B0124F7E3FE82EB8201
+6B97A17D7501B05529A63FA502654BFE747595EFB375FED47FEDEF0122A6FE094B030A39
+1E1727000000000200D9FEE505DB057F0015001A00000116051504050127130607353637
+1324273512051317013637262703C6F00125FE3DFEBBFEE283B99E74BAD68BFEDCF7E301
+7EEB82FE9597A17D7503525529A63FA5FD9B4B018C7595EFB375012C7FEDEFFEDEA601F7
+4BFCF6391E1727000000000100CC00A305E8045F00130000252122003534373633211521
+220615141716332105E8FCC2CAFEEC8A8AC80340FCC088BE5E60880340A30116C8C68D8B
+96C0888A5E60000100CC00A305E8045F0013000037352132373635342623213521321716
+15140023CC034088605EBE88FCC00340C88A8AFEECCAA396605E8A88C0968B8DC6C8FEEA
+0000000200CCFF3B05E805CF0009001E000001232206151417163B011B01330321152103
+2115210323132200353437363303A2FA88BE5E608830F872AA72016EFE64CA0266FD6C70
+AA70C8FEEA8A8AC803C9C0888A5E6003260170FE9096FD7096FE9801680116C8C68D8B00
+0000000200CCFF3305E805C70009001E000001333236353427262B010B01231321352113
+213521133303320015140706230312FA88BE5E608830F872AA72FE92019CCAFD9A029470
+AA70C801168A8AC80139C0888A5E60FCDAFE900170960290960168FE98FEEAC8C68D8B00
+0000000200BE000005DB04E8000300180000372115210121222726353437363321152122
+06151417163321F204E9FB1704E9FCC1C98A8B8B8AC80340FCC089BE5F60880340969601
+2C8B8BC8C68D8B96C0888A5E6000000200D9000005F604E8000300180000372115211135
+21323736353426232135213217161514070623D904E9FB17034088605FBE89FCC00340C8
+8A8B8B8AC99696012C96605E8A88C0968B8DC6C88B8B000200BEFF1305DB05D700090027
+000001212206151417163B02211521072115210727372135213726272635343736332137
+170721152103D1FECA89BE5F6088279C027DFD453D02F8FCC961864CFEE901543EB9828B
+8B8AC8017363864C0130FE920452C0888A5E60969696ED35B8969608838BC8C68D8BEF37
+B896000200D9FF1305F605D70009002700000133323736353427262F0121352137170716
+1716151407062B010721152107273721352137213521035EBB88605F5F425699FD090335
+63865470588B8B8AC9F73F02E0FCE362864CFED0016D3EFE5501E901C2605E8A88604314
+0996EF37CB20588DC6C88B8B9696ED35B89696960000000200BEFF6A05DB04E9000B0020
+000029013521371707211521072701212227263534373633211521220615141716332102
+C4FE2E024271782D01EBFDA571780344FCC1C98A8B8B8AC80340FCC089BE5F6088034096
+965A3C96965A01698B8BC8C68D8B96C0888A5E600000000200BEFF6A05DB04E9000B0020
+000029013521371707211521072701352132373635342623213521321716151407062302
+C4FE2E024271782D01EBFDA57178FE27034088605FBE89FCC00340C88A8B8B8AC996965A
+3C96965A016996605E8A88C0968B8DC6C88B8B00000000020108000004D304A20011001B
+0000011133111416333236351133111002232202373537170721152117070108AC94A6A5
+94ACF5F0F1F5EEC43C740163FE9D743C02520250FDC9F4D3D3F40237FDB0FED8FED6012A
+CA2DC53C7555743C0000FFFF0108000004D304A210260CB4000010070D4F01A9FF330002
+0108000504D304A70011001D000001113311141633323635113311100223220201153315
+23152335233533350108AC94A6A594ACF5F0F1F50218AAAA65AAAA02570250FDC9F4D3D3
+F40237FDB0FED8FED6012A01E1AB64ABAB64AB000000000100D9000005DB048B0007001B
+4005010503070810DCDCDC3C31004005010305070810D4DCDCDC301321152111211521D9
+0502FBA80458FAFE048BAAFCC9AA000100D9000005DB048B0007001B4005010503070810
+DC3CDCDC31004005070503010810D4DCDCDC30011121352111213505DBFAFE0458FBA804
+8BFB75AA0337AA000000000200D9FF5605DB050B0007000B000013211521112115211521
+1521D90502FBA80458FAFE0502FAFE050BAAFCC9AA80AA000000000200D9FF5605DB050B
+0007000B000001112135211121350115213505DBFAFE0458FBA80502FAFE050BFB75AA03
+37AAFAF5AAAA000100D90000056505020007000001112311211123110565AAFCC8AA0502
+FAFE0458FBA805020000000100D9000005650502000700003311331121113311D9AA0338
+AA0502FBA80458FAFE00000300BBFFE305F9052400190033003F000000220706070E0115
+141617161716323736373E013534262726272420161716171615140706070E0120262726
+272635343736373605112115211123112135211103C5D65D5C4C4D4C4C4D4C5C5DD65D5C
+4C4D4C4C4D4C5CFEAE0114EE6263313131316362EEFEECEE626331313131636201CD0164
+FE9CAAFE9C0164048E27274C4DB86D6AB84D4C272727274C4DB86A6DB84D4C27BD646263
+77768C8977766362646462637677898C7677636284FE9BAAFE9B0165AA01650000000003
+00BBFFE305F905240003001D003700000121152100220706070E01151416171617163237
+36373E013534262726272420161716171615140706070E01202627262726353437363736
+01A10372FC8E0224D65D5C4C4D4C4C4D4C5C5DD65D5C4C4D4C4C4D4C5CFEAE0114EE6263
+313131316362EEFEECEE626331313131636202D7AA026127274C4DB86D6AB84D4C272727
+274C4DB86A6DB84D4C27BD64626377768C8977766362646462637677898C767763620003
+00BBFFE305F9052400190033003F000000220706070E0115141617161716323736373E01
+3534262726272420161716171615140706070E0120262726272635343736373601071707
+270727372737173703C5D65D5C4C4D4C4C4D4C5C5DD65D5C4C4D4C4C4D4C5CFEAE0114EE
+6263313131316362EEFEECEE626331313131636202EDFDFC78FCFC79FDFC78FCFC048E27
+274C4DB86D6AB84D4C272727274C4DB86A6DB84D4C27BD64626377768C89777663626464
+62637677898C76776362FEBEFCFC78FCFD79FCFC78FCFD000000000300BBFFE305F90524
+0003001D003700000901170100220706070E0115141617161716323736373E0135342627
+26272420161716171615140706070E0120262726272635343736373601E6027078FD9001
+67D65D5C4C4D4C4C4D4C5C5DD65D5C4C4D4C4C4D4C5CFEAE0114EE6263313131316362EE
+FEECEE62633131313163620186027078FD90038027274C4DB86D6AB84D4C272727274C4D
+B86A6DB84D4C27BD64626377768C8977766362646462637677898C767763620000000003
+00BBFFE305F905240003001D003700000133152312220706070E01151416171617163237
+36373E013534262726272420161716171615140706070E01202627262726353437363736
+02F0D4D4D5D65D5C4C4D4C4C4D4C5C5DD65D5C4C4D4C4C4D4C5CFEAE0114EE6263313131
+316362EEFEECEE62633131313163620301FE028B27274C4DB86D6AB84D4C272727274C4D
+B86A6DB84D4C27BD64626377768C8977766362646462637677898C767763620000000004
+00BBFFE305F90524000900180032004C000001220615141632363426273216171E011514
+0623222635343E01220706070E0115141617161716323736373E01353426272627242016
+1716171615140706070E01202627262726353437363736035A506E6EA06E6F4F40762B2E
+2EB98687B4B8F0D65D5C4C4D4C4C4D4C5C5DD65D5C4C4D4C4C4D4C5CFEAE0114EE626331
+3131316362EEFEECEE626331313131636203416F504F6D6D9E7081312E2D724284B7B487
+86BACC27274C4DB86D6AB84D4C272727274C4DB86A6DB84D4C27BD64626377768C897776
+6362646462637677898C76776362000300BBFFE305F905240011002B00450000010D0107
+2511231105272D0137051133112502220706070E0115141617161716323736373E013534
+262726272420161716171615140706070E0120262726272635343736373604F0FEBD0143
+34FED166FED1340143FEBD34012F66012FF7D65D5C4C4D4C4C4D4C5C5DD65D5C4C4D4C4C
+4D4C5CFEAE0114EE6263313131316362EEFEECEE62633131313163620331AFB058B7FEAD
+0153B758B0AF59B70153FEADB7010427274C4DB86D6AB84D4C272727274C4DB86A6DB84D
+4C27BD64626377768C8977766362646462637677898C76776362000400BBFFE305F90524
+000300070021003B0000012115211521152100220706070E011514161716171632373637
+3E013534262726272420161716171615140706070E01202627262726353437363736021A
+0280FD800280FD8001ABD65D5C4C4D4C4C4D4C5C5DD65D5C4C4D4C4C4D4C5CFEAE0114EE
+6263313131316362EEFEECEE6263313131316362036A88C08802F427274C4DB86D6AB84D
+4C272727274C4DB86A6DB84D4C27BD64626377768C8977766362646462637677898C7677
+6362000300BBFFE305F90524001900330037000000220706070E01151416171617163237
+36373E013534262726272420161716171615140706070E01202627262726353437363736
+1321152103C5D65D5C4C4D4C4C4D4C5C5DD65D5C4C4D4C4C4D4C5CFEAE0114EE62633131
+31316362EEFEECEE6263313131316362380280FD80048E27274C4DB86D6AB84D4C272727
+274C4DB86A6DB84D4C27BD64626377768C8977766362646462637677898C76776362FE17
+AA00000300BBFFE305F90524000300070013000001112111252111210111211521112311
+2135211101510412FB58053EFAC202F40164FE9CAAFE9C01640489FBF004109BFABF0459
+FE9BAAFE9B0165AA0165000300BBFFE305F9052400030007000B00000121152103112111
+2521112101A10372FC8E500412FB58053EFAC202D7AA025CFBF004109BFABF0000000003
+00BBFFE305F90524000B000F001300000902070901270901370901251121112521112105
+3DFE95016B79FE96FE9679016BFE9579016A016AFC8D0412FB58053EFAC203ECFE96FE96
+78016AFE9579016A016A79FE95016B24FBF004109BFABF000000000300BBFFE305F90524
+00030007000B000001331523011121112521112102F0D4D4FE610412FB58053EFAC20301
+FE0286FBF004109BFABF000100AF0000064A059A00070019400A02040600080406020008
+10DCDC3CDC3100103CDCDCDC303311331121152111AF7F051CFAE4059AFD757FFD700001
+00AF0000064A059A000700002123112135211133064A7FFAE4051C7F02907F028B000001
+00AF00000649059A0007000001152111231121350649FD7380FD73059A7FFAE5051B7F00
+0000000100AF00000649059A000700003335211133112115AF028D80028D7F051BFAE57F
+0000000100AF0000037C059A000700003311331121152111AF7F024EFDB2059AFD757FFD
+7000000100AF0000037C059A000B0000212311331121152115211521012E7F7F024EFDB2
+024EFDB2059AFE247FE47F000000000100AF0000064A059A000B00002123113311211521
+15211521012E7F7F051CFAE4051CFAE4059AFE247FE47F000000000200AF0000064A059A
+0007000B000021113311211521112123113302127F03B9FC47FE9D7F7F059AFD757FFD70
+059A000300AF0000064A059A0003000B000F000021231133011133112115211121231133
+012E7F7F02477F0256FDAAFE9D7F7F059AFA66059AFD757FFD70059A0000000200AF0000
+064A059A0003000F000021231133012311331121152115211521012E7F7F01637F7F03B9
+FC4703B9FC47059AFA66059AFE247FE47F00000100AFFFAF064A05EB000F000033113311
+210117012115210127012111AF7F0227015373FEC5026AFD5CFEAA73013DFE14059AFD75
+02DC35FD597FFD1F3602ABFD7000000200AFFFAF064A05EB001300170000011703211521
+07211521012713211123113311210337211504A873EA0219FDAD6A02BDFD08FEFE73E9FE
+687F7F0278A56AFDC305EB35FE087FE47FFDD33601F7FE24059AFE24FE9DE4E400000002
+00AFFFAF064A05EB000F0013000001170121152101270121112311331121012311330582
+73FEC50190FE36FEAA73013DFE9D7F7F019EFCFF7F7F05EB35FD597FFD1F3602ABFD7005
+9AFD75FCF1059A000000000300AFFFAF064A05EB00130017001B00002123113311210117
+032115210721152101271321012311330137211502917F7F01F4010273EA013AFE8C6A01
+DEFDE7FEFE73E9FEECFE9D7F7F02B26AFE47059AFE24022D35FE087FE47FFDD33601F7FE
+24059AFCC1E4E4000000000100D9FFA705CB055D002A0000133524253637363534262322
+07273633321615140706050417161514062322273716333236353427262724D9019B0140
+C8653D4D3E5037735AA088B094E3FE890177E394B088A05A7337503E4D3D65C8FEC0022E
+A82859374F303C303A3E7E6AA0799F5B8C3C3C8C5B9F79A06A7E3E3A303C304F37590001
+00D9FFA705CB055D002A0000010405060706151416333237170623222635343736252427
+2635343633321707262322061514171617040505CBFE65FEC0C8653D4D3E5037735AA088
+B094E30177FE89E394B088A05A7337503E4D3D65C80140019B022E2859374F303C303A3E
+7E6AA0799F5B8C3C3C8C5B9F79A06A7E3E3A303C304F37592800000200D9001E05DB04E6
+0002000600000111090235010531FCA20408FAFE0502012002C4FE9EFD9C0211A6021100
+0000000200D9001E05DB04E60002000600000902031101150183035EFCA2AA0502012001
+620162FC3A04C8FDEFA6000300D9FF9E05DB056400030006000A00001735211503110902
+3501D90502AAFCA20408FAFE050262AAAA020002C4FE9EFD9C0211A60211000300D9FF9E
+05DB056400030006000A000017352115090203110115D90502FBA8035EFCA2AA050262AA
+AA020001620162FC3A04C8FDEFA6000200790167078703A20017001F0000013632161406
+2227262721060706222634363217161721360422061416323634059F53EBAAA7F2513313
+FD51143354F2A2A6EB57341302AF14FC64724F4F734F034F53A8EFA4513343423352A2F2
+A7553443440E50724F4F71000000000200790167078703A20017001F0000010622263436
+3217161721363736321614062227262721062432363426220614026153EBAAA7F2513313
+02AF143354F2A2A6EB573413FD5114039C724F4F734F01BA53A8EFA4513343423352A2F2
+A7553443440E50724F4F71000000000200620167065203A2000D00150000133721363736
+32161406222726272426220614163236620103C013315BEBA5A2F2533413019A4F73504F
+744F022EA8442F59A7F2A25233428E5051714F4F000000040079FFA0063B056400030007
+000B000F0000013311230521152103231133252135210306A8A80128020DFDF380A8A8FE
+D8FDF3020D0564FDF380AAFD73020D80AA00000100EE0000033C059B0007000021231123
+3521152302547EE8024EE8051C7F7F000000000200C80000051305EC0003000A00003335
+211501330901330123C8044BFBF5C301230122C3FE98FAAAAA05ECFC5403ACFB5E000002
+00C80000051305EC0003000A00001321152113013301230901C8044BFBB5400169FA0168
+C3FEDEFEDD05ECAAFABE04A2FB5E03ACFC54000200C80000051305EC0003000A00001321
+152117330901330123C8044BFBB540C301230122C3FE98FA05ECAAA0FC5403ACFB5E0002
+011B00000599047E000C00150000290111331116171E011716172101112126272E012726
+0599FB82AA5A56A5EE4625120114FC2C02450F1B3DCE8F3F047EFEEB122546EEA4565A02
+44FDBC413F8FCE3D1B000002011B00000599047E000200070000090121053501331104EF
+FCD6032AFC2C03D4AA03D4FCD6AAAA03D4FB820000000001FFFAFE77069605C100060000
+0901230901230103B702DFCBFD7DFD7DCB02DD05C1F8B60677F989074A000001FFFAFE77
+069605C1000600000901330901330102D9FD21CB02830283CBFD23FE77074AF9890677F8
+B6000001008CFE77060405C10010001D40060C0E1205031110DCDC10DCDC310040050D12
+08001110DCCC10CC3001220415112311100020001901231134240348DBFECCAD01BD01FE
+01BDADFECF051DE3FCFB3904E001420128FED8FEBEFB2004C7FAE50000000001008CFE77
+060405C10010001D40060C0E1105031210DCDC10DCDC310040050D1208001110DCCC10CC
+3005322435113311100020001901331114040348DB0134ADFE43FE02FE43AD0131E5E3FC
+04C7FB20FEBEFED80128014204E0FB39FAE5000200820082048004800003000700000907
+01720110010EFEF0FE0201FE0200FE020282FEF0010E0110FEF201FEFE00FE0200000001
+00DB024801AE034600030012B7028300040119000410D4EC310010D4EC3013331523DBD3
+D30346FE0000000100F90131040904190009000013211B01210713270713F9012B5D5E01
+2AF25EF4F35D02FD011CFEE4B0FEE4B0B0011C000000000300D9001E05DB04E700030007
+00190000013315231133152303213521013709011701211521010709012702DFF6F6F6F6
+52FE4C01B4FE8B7801CA01CA78FE8B01B4FE4C017578FE36FE36780113F504C9F6FE3CAA
+017578FE3601CA78FE8BAAFE8B7801CAFE3678000000000300D9FFC20727054200050008
+000B0000171109011101270111090111D903270327FCD99BFE1E031801E23E0580FDB002
+50FA80024E71015EFD44015EFEA202C60000000200D9FFC2072705420008000B00002515
+090111090115012101110727FCD9FCD903270327FD74FECAFE1EA2E0024EFDB20580FDB0
+0250DDFE1C015EFD4400000200D9FFC2072705420008000B000013350901110901350121
+0111D903270327FCD9FCD9028C013601E20462E0FDB2024EFA800250FDB0DD01E4FEA202
+BC00000100D9FFC207270542000700001735090135011501D9028CFD74064EFCD93EE001
+E101E2DDFB5DDD025000000100D9FFC2072705420007000005090135011509010727FCD9
+FCD9064EFD74028C3E0250FDB0DD04A3DDFE1EFE1F00000200D9016005DB03F4001A001E
+0000131E0133323F023633321617152E01232207060F01062322262701152135D967A956
+5E9B160F936E61B36962AC585E9B0F0611926E61B3690502FAFE03F4554B3D09063B454E
+B2534C3D0602073B454FFEC8AAAA000100630000057904A2000A00001333001312013300
+03230263D701753F49016BD7FE3866BA6604A2FE90FE2501DA0171FE81FCDD0323000001
+00630000057904A2000A000033001333120123000302016301C866BA6601C8D7FE95493F
+FE8B017F0323FCDDFE81017101DAFE25FE90000200BEFFFA05DB050A0013002900000121
+220706151416332115212227263534363321112120272611103736290115212207061514
+1716332105DBFD6B3A2828503A0295FD6A805A59B2810296FD6BFEF1BCBDBDBA010F0297
+FD6AC88A8B8B8AC90295030C2829393A50AA5A588280B4FC44BDBE010D010CBFBDAA8B8D
+C6C88B8B0000000200D9FFFA05F6050A0013002900001335213216151407062321352132
+36353427262301352132373635342726232135212017161110070621D9029681B2595A80
+FD6A02953A5028283AFD6B0295C98A8B8B8AC8FD6A0297010FBABDBDBCFEF1030CAAB480
+82585AAA503A392928FCEEAA8B8BC8C68D8BAABDBFFEF4FEF3BEBD000000000200D20000
+05E2054E0011002400002111342622061511231134373633321615112111100020171619
+012311342726200706151103E4507450AA5A588280B4FC44017C0218C0BCAA8A8CFE708A
+8C02C63A50503AFD3A02C8805A58B280FD3802C601100178BCBAFEF0FD3802C8C88A8A8A
+8ACAFD3A0000000200D2FFE305E205310011002400000111141632363511331114070623
+222635112111100020272619013311141716203736351102D0507450AA5A588280B403BC
+FE84FDE8C0BCAA8A8C01908A8C0531FD3A3A50503A02C6FD38805A58B28002C8FD3AFEF0
+FE88BCBA011002C8FD38C88A8A8A8ACA02C60001017C0000053805D5001B000001342726
+271123110607061511231134373637113311161716151123048E5A3A4BAA4B3A5AAA8C6C
+91AA936C8AAA029F80593A14FC3A03C6133A5A80FD61029DC88C6C170161FE9F176C8AC8
+FD61000200D9FF3405DB05D5001B001F0000052311231123112135213521352111331133
+11331121152115211521273523150459AAAAAAFE7E0182FE7E0182AAAAAA0182FE7E0182
+FE7EAAAACC022CFDD4022CAAF0A80233FDCD0233FDCDA8F0AAAAF0F00000000200D9005E
+05DB04A60003000A00000133152309021501350104A4D3D30137FBF80408FAFE05020300
+FE01EEFE91FE93B601D1A601D100000200D9005E05DB04A60003000A0000013315230335
+0115013501013DD3D3640502FAFE04060300FE01EEB6FE2FA6FE2FB6016D00030094002E
+0ACC04DF0006000D0014000009021501350105090115013501050901150135010ACCFCC6
+033AFBCA0436FD00FCC6033AFBCA0436FCFEFCC6033AFBCA04360411FE70FE72C502089F
+020ACEFE70FE72C502089F020ACEFE70FE72C502089F020A000000030094002E0ACC04DF
+0006000D00140000133501150135010335011501350103350115013501940436FBCA033A
+380436FBCA033A3A0436FBCA033A0411CEFDF69FFDF8C5018E0190CEFDF69FFDF8C5018E
+0190CEFDF69FFDF8C5018E000000000300D9FE2E05DB06D40006000A0011000013090135
+0115090121352111090115013501D903C1FC3F0502FAFE0502FAFE0502FC4003C0FAFE05
+02FEDE01150112B2FE90AAFE9103FEAA034EFEEBFEEEB20170AA016F0000000300D9FE2E
+05DB06D40006000A0011000001150135011509013521150135011501350105DBFAFE0502
+FC3FFEBF0502FAFE0502FAFE03C0FEDEB0016FAA0170B2FEEE0239AAAA03F8B0FE91AAFE
+90B201120000000200D9000005DB04A80006000A0000251501350115090135211505DBFA
+FE0502FC40FEBE0502B0B0016FAA0170B2FEEE0239AAAA000000000200D9000005DB04A8
+0006000A00003709013501150901213521D903C1FC3F0502FAFE0502FAFE0502B0011501
+12B2FE90AAFE9103FEAA000200D9FF2905DB055700050010000001000535240111150025
+3524011500050405DBFE54FCAA03690199FE81FC7D0383017FFE81FE2401DC0480FE5F85
+AE9101BEFAA9D701807CA6840178D7FEE55D5D000000000200D9FF2905DB055700050010
+00001335000515240100252401350005150401D901990369FCAAFE54017F01DCFE24FE81
+017F0383FC7DFE810480D7FE4291AE85FD21011B5D5D011BD7FE8884A67CFE8000000002
+00D9FE9305DB061D00210026000021150025012701262735041737262535242513170336
+3715060F0104171526250704013706071605DBFEF3FE2AFEE382010FBAD500FFDA3FF0FE
+D801B5013BF683A6BD82C8E269011DF6DAFE8040019AFE5D3071775ED70125A4FDA14B02
+413623AE284187462BA63C7A020C4BFE9F6482D79460DF67B6D7D687889401E266231712
+0000000200D9FE9305DB061D002100260000133516050117011617150405072425150405
+032713060735363F01040735242537240507363726D9FA01D8011483FEFCBFDEFEB8FEFC
+580127017DFE38FEB6EE828F9A75A6E663FECCBB0112014238FE9E01F60D23251E0480D7
+FB8C024D4BFDD62E1FA63051BD743BAE4C9EFE054B0131677FD7A276D57DB7D7CB697769
+901B08070600000200D9FEDF05DB06230017001B00000117072115210321152107211521
+0327372135213721112101132111044DA0580146FE7DDD0260FD632E02CBFCF86DA058FE
+BB01822EFE500307FEE6DDFDE006233AF5AAFD98AA80AAFED13AF5AA8003BCFCEE0268FD
+9800000200D9FEDF05DB06230017001B0000011707211121072115210327372135213721
+35211321352117032111044DA0580146FD632E02CBFCF86DA058FEBB01822EFE5001EDDD
+FD36030778DD01B606233AF5FC4480AAFED13AF5AA80AA0268AAAAFD9802680000000001
+00D9FF3F05DB04F400140000132115211121152117072115210727372135213721D90502
+FBA80458FE551B4D01DDFDAB928B4DFE2302555AFD5104F4AAFD98AA136DAACF626DAA80
+0000000100D9FF3F05DB04F4001400002515210727372135213721352111213521112117
+0705DBFDAB928B4DFE2302555AFD510458FBA80502FE551B4DB8AACF626DAA80AA0268AA
+FC44136D0000000200D9FEE505DC04A8001B00220000252623220607353E013332173717
+071633323637150E01232227072709021501350102E6634358AC6268B4605E786E9B6965
+4556A8686AB2625F7A6C9B035DFC4003C0FAFE0502111F4C54B44E442AF346E9204A56B4
+4E442BF04604CDFEEBFEEEB20170AA016F00000200D9FEE505DC04A8001B002200002526
+23220607353E013332173717071633323637150E0123222707270135011501350102E663
+4358AC6268B4605E786E9B69654556A8686AB2625F7A6C9BFE5B0502FAFE03C0111F4C54
+B44E442AF346E9204A56B44E442BF04604CDB0FE91AAFE90B20112000000000200D9FEA6
+05DB0557001B00260000052623220607353E013332173717071633323637150E01232227
+0727010005040115002535240102E6634458AC6269B3615D796D9B69654556A96769B361
+60796C9B035DFE81FE2401DC017FFE81FC7D0383017F2E204C54B34E452BF346E9204B55
+B34E452CF1460594FEE55D5DFEE5D7017884A67C0180000200E1FEA205E30557001B0026
+0000052623220607353E013332173717071633323637150E012322270727013500051504
+013500252402EE634458AC6269B3615D796D9B69654556A96769B36160796C9BFE5B017F
+0383FC7DFE81017F01DCFE2433204C54B34E452BF446EA204B55B34E452CF0460598D7FE
+807CA684FE88D7011B5D5D000000000300D9FEF605DB060C000B000F0012000001170337
+11250327132535090111070327130504E79E83D9FDB9DB9EDCFDE2034C010C8BD09E91FE
+0A060C40FEC159FB38F0FDE8400219E0A6015CFCEF02C439FE04400161CE000300D9FEF6
+05DB060C000B000F001200000127130711051317030515090111371317032501CD9E83D9
+0247DB9EDC021EFCB4FEF48BD09E9101F6FEF640013F5904C8F0021840FDE7E0A6FEA403
+11FD3C3901FC40FE9FCE000300D9FE7D05DB068500030017001A00000111070301352113
+2535011317033711250321152103273701130505318ECFFD05017CA0FDE40349C19E81DB
+FDB78502CEFCEC769E5C012790FE0D019E02C43AFE05FD71AA0186DFA6015B01D740FEC5
+5AFB38F1FEBBAAFEDF40E102D0015FCD0000000300D5FE7D05D7068500130017001A0000
+371101131703051501032115210327372335213701251125010325D502A5E99EE901BFFD
+3983034AFC70769E5CBA01005D0107FE46011001476A01719C04C8FEE9023840FDC7B9A6
+FEDBFEC0AAFEDF40E1AAE40281B5FD3C70015EFEFC98FFFF0396FF42046905B810270D4F
+02BBFCFA10270D4F02BB027210070D4F02BBFFB60000FFFF00EC01FE071302FC10260D4F
+11B610270D4F02BBFFB610070D4F0565FFB6FFFF00ECFF42071305B810270D4F0011FCFA
+10270D4F0565027210070D4F02BBFFB60000FFFF00ECFF42071305B810270D4F0565FCFA
+10270D4F0011027210070D4F02BBFFB6000000010058FFEC07A805AE0021000001213521
+3637362433211521060706070607211521161716171617211521222427260214FE4401BA
+0F4D5E0164C002B8FD47938A8A4B410804F4FB0E07404A8B8A9302B9FD48C0FE9C5E4802
+73A0948FB0C89F014D4F8A785DA04A788B4E4C019FC6B0850000000100AFFFEC064905AE
+001B00000116120417211521222402101224332115210604020721113311231101570789
+01169302B9FD47C0FE9DBEBE0163C002B9FD4793FEEB8B090455A0A002734AFEFD9A019F
+C6016001740160C89F019CFEFE5D0110FD4001100000000100D9009B04E5046700190000
+2520241024290115212207060721353311233521161716332115032BFED8FED6012A0128
+01BAFE46E66B4E1D02E88E8EFD18254672DF01BA9BF601E0F68E513B84ACFE1AAC913051
+8E00FFFF00AFFFEC0649074810260C92000010070D4F02380402000200AFFFEC064906D2
+001C00200000011617161716172115212224023534122433211521060706070607211511
+2135210157073F4A8C899402B9FD47C0FE9DBEBE0163C002B9FD4794898B4B400904F5FA
+A5055B02734A788B4E4C019FC60160BBB90160C89F014D4F8A785DA003BFA00000000002
+00D9009B04E5057D0016001A000025202435342429011505060706072115211617163321
+1511213521032BFED8FED6012A012801BAFE46E8694E1D0376FC8A254672DF01BAFC1B03
+E59BF6F0F0F68E01014F3A858E9130518E04568C0000000200AFFEDA064905AE001C0020
+000001161716171617211521222402353412243321152106070607060721151121352101
+57073F4A8C899402B9FD47C0FE9DBEBE0163C002B9FD4794898B4B400904F5FAA5055B02
+734A788B4E4C019FC60160BBB90160C89F014D4F8A785DA0FC67A000000000><000100AF
+FFEC064905AE001F00000121152117161716172115212224023534122433211521060706
+070607211521015704F2FB43114A8C8A9302B9FD47C0FE9DBEBE0163C002B9FD47938A8B
+4B0E0C04C6FB0E0273A0228B4E4C019FC60160BBB90160C89F014D4F8A1B1AA000010058
+FFEC07A805AE002100000121152106070604232135213637363736372135212627262726
+272135213204171605EC01BCFE460F4D5EFE9CC0FD4802B9938A8A4B4108FB0C04F20740
+4A8B8A93FD4702B8C001645E480327A0948FB0C89F014D4F8A785DA04A788B4E4C019FC6
+B0850000000100AFFFEC064905AE001B0000012602242721352132041210020423213521
+3624123721112311331105A10789FEEA93FD4702B9C00163BEBEFE9DC0FD4702B9930115
+8B09FBABA0A003274A01039A019FC6FEA0FE8CFEA0C89F019C01025DFEF002C0FEF00000
+000100D9009B04E504670019000001200410042901352132373637211523113315212627
+2623253502930128012AFED6FED8FE4601BAE66B4E1DFD188E8E02E8254672DFFE460467
+F6FE20F68E513A85AC01E6AC913050018E000000000200AFFFEC064906D2001C00200000
+01262726272627213521320412151402042321352136373637363721350121352105A107
+3F4A8C8994FD4702B9C00163BEBEFE9DC0FD4702B994898B4B4009FB0B055BFAA5055B03
+274A788B4E4C019FC6FEA0BBB9FEA0C89F014D4F8A785DA0030BA000000200D9009B04E5
+057D0016001A000001200415140429013525323736372135052627260721352521352102
+930128012AFED6FED8FE4601BAE8694E1DFC8A0376254674DDFE4603E5FC1B03E50467F6
+F1EFF68E01503A858E01913152018E8A8C000000000100D90000061F05C2000B00000121
+11211521112115211121061FFB64049CFABA0546FB64049C0282FE28AA05C2AAFE140000
+0003004AFFDC0489041C0013001B00230000013217371707161514002322270727372635
+3400052623220615141F01163332363534270268BA8F7563766EFEC4DDB88D7663756F01
+3C01C06480A2E94763637EA3E9450417717663768DBADDFEC46F7663768DBADF013CD548
+E9A580636247E9A38062000000010072014C0452038C00070000011101350511011502A2
+FDD001B00230027AFED2014AC2FA012EFEB6C200000200920000048204C4000400090000
+331109011125211109019201F801F8FCB602A4FEAEFEAE02A00224FDDCFD60AA01D50179
+FE870000000101A303DA050F05DC000700000901270133010701032DFEEE78018A5A0188
+78FEF004EAFEF078018AFE7678011000000101A30000050F020200070000253301170123
+0137032D5A011078FE785AFE7678F2011078FE76018A7800FFFF01A30000050F033F1026
+1774000010070D8D0000FC26FFFF01A30000050F041B10271774000000DC1026177400D7
+10070D8D0000FC260001013BFFC502AD064E001900000117061417161407061417161407
+27363427263437363427263401B77A4C4C7C7C4C4C7C7C7A4C4C7C7C4C4C7C064E764F70
+5081F881506F5081F981764F705081F88150705081F80000000100B0FEF2025806140005
+0000132115231123B001A8F0B806148FF96D0000000100C7FEF2026F0614000500000111
+23112335026FB8F00614F8DE06938F00000100B0FEF20258061400050000131133113315
+B0B8F0FEF20722F96D8F0000000100C7FEF2026F061400050000012135331133026FFE58
+F0B8FEF28F069300000202F4FF6206130282000300070000013311231335211502F49090
+C8025701BAFDA8029090900000020064FF62038402820003000700000115213505331123
+02BCFDA80290909002829090C8FDA800000202F401F20613051200030007000001352115
+2523113303BC0257FD71909001F29090C80258000002006401F203840512000300070000
+011521352523113302BCFDA8032090900282909038025800000100D9011F05DB035E0005
+000001152111231105DBFBA6A8035EAAFE6B023F000200060102041505120007000F0000
+132405021304251201120304250213248C018101818989FE7FFE7F89FEF1B8B802070208
+B8B8FDF8018A8989018001828A8AFE7EFDF801F4021CB1B1FE0CFDE5B1000000000600F7
+00010709061300030031003B0046004F00590000012111211115140620263534363B0111
+23222635343620161D01213534363332161514062B01113332161514062322263D010135
+342623220614163313232206151416333236350133323634262206151115141632363534
+2623036C0128FED8B9FEFCB8B87FAAAA7FB8B80104B90128B98283B7B780AAAA80B7B783
+82B9FE44624544626245A6A64562624544620250A74462618A62628A61624402760128FE
+44AA80B7B88380BA0128BA8182B8B780AAAA80B7B88281BAFED8BA8083B8B780AA0250A7
+4561618A62FDB062444562624402F7628A616145FD09A7446262454462000000000100D9
+011F05DB035E0005000001211133112105DBFAFEA8045A011F023FFE6B000000000100B0
+0367033A061400050000012111231121033AFE0690028A0584FDE302AD00000000010086
+0367031006140005000013352111231186028A90058490FD53021D00000100B0FF70033A
+021D00050000211521113311033AFD76909002ADFDE3000000010086FF700310021D0005
+00003321113311218601FA90FD76021DFD530000000101AFFE0003FA076C001900000111
+34371A0133321615140623222726272E012322030215301101AF030CBECA506440372B1C
+180F060910681108FE0005082481020301BC5441363F1310260F48FD95FED302FA980000
+0001002AFE1A0275078900190000011114070A0123222635343633321716171E01333213
+123530110275030CBECA506440372B1C180F0609106811080789FAF52481FDFDFE445441
+363F1310260F48026B012D02056B00000003009C01D0089C049A0007000B000F00000901
+27013301070125213529021521046FFE267802525A025078FE28FE8DFD4602BA028A02BC
+FD4403A8FE28780252FDAE7801D848AAAA0000000002009C0000089C049A0007000B0000
+1321012115210121252115219C02BA02E40262FD46FD1CFD9E054402BCFD44049AFC10AA
+03F0AAAA0005009C00000B4F061400040009000C000F0015000033112109021133090129
+0109012109033309019C07A9030AFCF6F8EB8D0276FD8A04EDFBE6020DFDF3041AFDF302
+DDFD8A02768E0276FD8A0614FCF6FCF60580FB1402760276FDF3FD21020D02DFFD8AFD8A
+027402780005009C0000089C061400030008000B000E0013000033112111011133090129
+01090121090333119C0800F8948D0276FD8A04EDFBE6020DFDF3041AFDF302DDFD8A0276
+8E0614F9EC0580FB1402760276FDF3FD21020D02DFFD8AFD8A04EC00002B007800000B14
+05D5000B00170023002F003B00470053005F006B00770083008F009B00A700B300BF00CB
+00D700E300EF00FB01070113011F012B01370143014F015B01670173017F018B019701A3
+01AF01BB01C701D301E401F001FC02080000012132151114232122351134171114332132
+3511342321220115142B01223D01343B01321715142B01223D01343B01322515142B0122
+3D01343B01320515142B01223D01343B01321715142B01223D01343B01320515142B0122
+3D01343B01321715142B01223D01343B01321715142B01223D01343B01321715142B0122
+3D01343B01321715142B01223D01343B01320515142B01223D01343B01322515142B0122
+3D01343B01321715142B01223D01343B01321715142B01223D01343B01321715142B0122
+3D01343B01321715142B01223D01343B01321715142B01223D01343B01321715142B0122
+3D01343B01321715142B01223D01343B01322715142B01223D01343B01320715142B0122
+3D01343B01320715142B01223D01343B01320715142B01223D01343B01320715142B0122
+3D01343B01320715142B01223D01343B01320715142B01223D01343B01320715142B0122
+3D01343B01322715142B01223D01343B01321715142B01223D01343B01321715142B0122
+3D01343B01321715142B01223D01343B01321715142B01223D01343B01321715142B0122
+3D01343B01321715142B01223D01343B01321715142B01223D01343B01321715142B0122
+3D01343B01320515142B01223D01343B013207321511142B01223D013423223D01343313
+15142B01223D01343B01321715142B01223D01343B013205223D01343321321D01142301
+5508E2DDDDF71EDD934A08E24949F71E4A0103254A25254A25DF254B24244B25014A254A
+25254A25FE46254A25254A25DD254A25254A2501B9254A25254A25DD254A25254A25DD25
+4A25254A25DD254A25254A25DD254A25254A25018E25FB2525FB25F843254A25254A25DD
+254A25254A25DD254A25254A25DC254A25254A25DD254A25254A25DD254A25254A25DD25
+4A25254A25DD254A25254A2524254A25254A25DD254A25254A25DD254A25254A25DD254A
+25254A25DC254A25254A25DD254A25254A25DD254A25254A25DD254A25254A2524254A25
+254A25DD254A25254A25DD254A25254A25DD254A25254A25DC254A25254A25DD254A2525
+4A25DD254A25254A25DD254A25254A25DD254A25254A25011E258B25258B25252525F62A
+24252594254A25254A25DF254B24244B25F9A525250404252505D5DDFBE5DDDD041BDDDD
+FBE54A4A041B4AFC1C4925254926254A25254A25B74A25254A25254A25254A25254A2525
+4A25254A25254A25254A25254A25254A25254A25254A25254A25254A25254A25254A2525
+4A25B74A25254A25254A25254A25254A25254A25254A25254A25254A25254A25254A2525
+4A25254A25254A25254A25254A25B74A25254A25254A25254A25254A25254A25254A2525
+4A25254A25254A25254A25254A25254A25254A25254A25254A25B44A25254A25254A2525
+4A25254A25254A25254A25254A25254A25254A25254A25254A25254A25254A25254A2525
+4A25254A25254A25254A25254A25DB25FEDE25259520254925FD484A25254A25254A2525
+4A2594254A25254A250000000005000100000AB4061400040009000C000F001500002901
+090121072309013309021109010323090133010AB4F857FCF6030A07A9948DFD8A02768D
+FA86020D020DFDF3FDF3D08EFD8A02768E0276030A030A94FD8AFD8A04ECFDF3020DFB14
+020DFDF304ECFD88FD8C027600050096FF46066605FC0005000B000F0013001700000902
+110901031109011101033701071117012701331123010802760276FD8AFD8A7202E802E8
+FD18263901DE3939FE2239FE2272720135FE95016B02D8016BFE95FCE6035C01ADFE53FC
+A4FE53054163FEEC63FE5C63FEEC6302FAFDD800FFFF00A60000026E04601006034D0000
+FFFF00BAFE5604A4047B100603550000FFFF0087FFE3062704601006035D0000FFFF0071
+FFE704E404791006034500000001001AFE2E05F500D0000B000001211121152311211123
+352101B802A0019DF5FC10F6019EFED801F8AAFE0801F8AA0002009C000008C505FB000D
+0011000001212737011501273721012135210535211505E201CBE9780189FE7778E9FE8D
+FD1CFD46026202E202BC049AE978FE775AFE7778E9FC10AAAAAAAA0000020023000006D9
+05D00005000B000025210901210903210901021202D8016CFE94FD28FE94012BFE5201AD
+035B01AEFE537202760276FD8AFD1802E802E8FD18FD1800000100B0FDFC03500792000B
+00000123351013121333000302110173C3A0BAA6A0FEFC5A7FFDFCEA039701E202300103
+FDF3FE86FDEEFCED000100B0FDFC017307890003000013331123B0C3C30789F673000000
+000100B0FE1403500789000B000001151013121323020302113501737F93CBA0D090A007
+89EAFCA5FE57FE14FE65014501EE02260332EA00000100B0FDFC03500792000B00000135
+10030201331213121115028D7F5AFEFCA0A6BAA0FDFCEA031302120179020EFEFDFDD0FE
+1EFC69EA0001028DFDFC035007890004000001112311300350C30789F673098D000100B0
+FE1403500789000B0000013315100302032312131211028DC3A090D0A0CB937F0789EAFC
+CDFDDBFE12FEBB019B01EC01A9035B00000100B0FDFC0350076D00050000012311211521
+0173C302A0FE23FDFC0971C3000100B0FDFC017307890003000013331123B0C3C30789F6
+73000000000100B0FE140350078900050000011121152111017301DDFD600789F74EC309
+75000000000100B0FDFC0350076D00050000011121352111028DFE2302A0FDFC08AEC3F6
+8F0000000001028DFDFC0350077A0003000001331123028DC3C3077AF6820000000100B0
+FE140350077A00050000013311213521028DC3FD6001DD077AF69AC3000102A3FDEA0558
+076D000D00000123113437363321152122070615035DBA6F79BA0113FEE7654439FDEA07
+75DF919EB0665799000100A8FDFC035D0786001800000116171619012311102726252735
+332037361901331110070602943A2A65BA6E4BFEFB3D3D01034D6EBA652802C1203D93FE
+43FDE8020C01B75F410401BB456301B3020CFDE8FE48983C000102A3FE1405580786000D
+00000111141716332115212227263511035D3944650119FEEDB87B6F0786F8949A5666B0
+9E8FE10764000000000102A3FDF4035D078C0003000001231133035DBABAFDF409980000
+000100A8FDEA035D076D000D0000011134272623213521321716151102A3394465FEE701
+13BA796FFDEA077D995766B09E91DFF88B000000000102A3FDFC05580786001800000126
+2726190133111017162133150704070619012311103736036C3C2865BA6E4D01033D3DFE
+FB4B6EBA652A02C1213C9801B80218FDF4FE4D6345BB0104415FFE49FDF4021801BD933D
+000100A8FE14035D0786000D0000013311140706232135213237363502A3BA6F7BB8FEED
+01196544390786F89CE18F9EB066569A000101AFFE0002750789000300000111331101AF
+C6FE000989F67700000200370086064005D5000800110000250901112111210321033509
+0135211321030233FE0401FC023701D601FBF464FEF6010A040C01FEF2018601FC01FCFE
+EF0268FBC2017283FEF6FEF6830376FD98000000000200BA000006D504C4000200060000
+0121090121112106D5F9E5030D030EF9E5061B02A00224FB3C01F80000040096FF460666
+05FC0005000B001F002B0000090211090103110901110100141716171632373637363427
+2627262207060702103E01201E01100E012026010802760276FD8AFD8A7202E802E8FD18
+FE6E36365C5DDA5D5C363636365C5DDA5D5C36A88AEE0118EE8A8AEEFEE8EE0135FE9501
+6B02D8016BFE95FCE6035C01ADFE53FCA4FE5303C8DA5D5C363636365C5DDA5D5C363636
+365CFEAA0118EE8A8AEEFEE8EE8A8A00FFFF0006009A0621038E10060E88000000030059
+FEF704CF025A000D001900200000002207061514171632373635342F0132161514062322
+263534360111073537331103E9CA32333332CA32333397A1AAAAA1A2AAAAFE56DFE68902
+015656ACAD56565656ADAC56AFDED3D4DEDED4D3DEFCAC02D1297427FCBD00000002FF82
+FFE304A406140017001F0000013E01333200100223222627152311052725353315251705
+001026200610162001733AB17BCC00FFFFCC7BB13AB9FEE9210138B9012321FEBC0272A7
+FEDCA7A7012403B66461FEBCFDF0FEBC6164A804E65D6368C08361616DFC400196E7E7FE
+6AE7000000010092FE2E048200D0000700000121113311211133013A02A0A8FC10A8FED8
+01F8FD5E02A2000000030098FFEC069405E8000D001B002600DBBA000E000600032BB800
+0E10BA0023001D00032BB8002310BA0000001400032BB8000010411B0016000E0026000E
+0036000E0046000E0056000E0066000E0076000E0086000E0096000E00A6000E00B6000E
+00C6000E00D6000E000D5D410500E5000E00F5000E00025D410500EA001400FA00140002
+5D411B001900140029001400390014004900140059001400690014007900140089001400
+99001400A9001400B9001400C9001400D90014000D5D00BA0011000300032BB8001110BA
+000A001800032BB8000A10BA0024002500032BB8002410B8001CD0303101100021200011
+34122433320412051000212000113402242322040201331107352533113315210694FE3F
+FEC2FEC4FE3FCE0171BEC10171CDFA57018F011C011C018FB6FEB8ADADFEB8B6017CD9EC
+0101A1DAFD9702EAFEC1FE4101BF013FC60172C6C6FE90C8FEE4FE700190011CB30147B1
+B1FEB9FDFF027E2B982FFCE68E00000000030098FFEC069405E8000D001B0038013FBA00
+0E000600032BB8000E10BA0033002600032BB8003310BA0000001400032BB8000010411B
+0016000E0026000E0036000E0046000E0056000E0066000E0076000E0086000E0096000E
+00A6000E00B6000E00C6000E00D6000E000D5D410500E5000E00F5000E00025D410500EA
+001400FA001400025D411B00190014002900140039001400490014005900140069001400
+790014008900140099001400A9001400B9001400C9001400D90014000D5DB8003310B800
+1DD0B8001D2F410500EA002600FA002600025D411B001900260029002600390026004900
+26005900260069002600790026008900260099002600A9002600B9002600C9002600D900
+26000D5DBA002C0006000011123900BA0011000300032BB8001110BA000A001800032BB8
+000A10BA001D001E00032BB8001D10BA0030002900032BB8003010303101100021200011
+34122433320412051000212000113402242322040201211521353624373E013534262322
+0607353E01333216151406070E010694FE3FFEC2FEC4FE3FCE0171BEC10171CDFA57018F
+011C011C018FB6FEB8ADADFEB8B6024F01B4FD5C520106213E2F5F4E3B847361913DA3C5
+303E11B202EAFEC1FE4101BF013FC60172C6C6FE90C8FEE4FE700190011CB30147B1B1FE
+B9FDFF8E814DF1223F55283F4E263AAB241F977D3A694612A700000000030098FFEC0694
+05E8000D001B004401B5BA000E000600032BB8000E10BA0042003500032BB8004210BA00
+00001400032BB8000010411B0016000E0026000E0036000E0046000E0056000E0066000E
+0076000E0086000E0096000E00A6000E00B6000E00C6000E00D6000E000D5D410500E500
+0E00F5000E00025D410500EA001400FA001400025D411B00190014002900140039001400
+490014005900140069001400790014008900140099001400A9001400B9001400C9001400
+D90014000D5D410500EA003500FA003500025D411B001900350029003500390035004900
+35005900350069003500790035008900350099003500A9003500B9003500C9003500D900
+35000D5DBA001C00350042111239BA002C00350042111239B8002C2F410500EA002C00FA
+002C00025D411B0019002C0029002C0039002C0049002C0059002C0069002C0079002C00
+89002C0099002C00A9002C00B9002C00C9002C00D9002C000D5DB8001FDCBA0026000600
+00111239BA003B0006000011123900BA0011000300032BB8001110BA000A001800032BB8
+000A10BA0029002200032BB8002910BA003F003800032BB8003F10BA0032002F00032BB8
+003210BA001C002F00321112393031011000212000113412243332041205100021200011
+34022423220402051E0115140623222627351E013332363534262B013533323635342623
+220607353E013332161514060694FE3FFEC2FEC4FE3FCE0171BEC10171CDFA57018F011C
+011C018FB6FEB8ADADFEB8B603B90D76D8C34088585B7D4475736B638C915A585C5B3479
+6B5F883DA1C16802EAFEC1FE4101BF013FC60172C6C6FE90C8FEE4FE700190011CB30147
+B1B1FEB99603815D8D9C171BA8301C4F4C474E8C3C3A3C3F152097181489735172000000
+00040098FFEC069405E8000D001B001E002900F3BA000E000600032BB8000E10BA002000
+1C00032BB8002010BA0000001400032BB8000010411B0016000E0026000E0036000E0046
+000E0056000E0066000E0076000E0086000E0096000E00A6000E00B6000E00C6000E00D6
+000E000D5D410500E5000E00F5000E00025D410500EA001400FA001400025D411B001900
+14002900140039001400490014005900140069001400790014008900140099001400A900
+1400B9001400C9001400D90014000D5DB8002010B80024D0B8001C10B80026D000BA0011
+000300032BB8001110BA000A001800032BB8000A10BA0022002300032BB8002210B8001D
+D0B8002310B80027D0303101100021200011341224333204120510002120001134022423
+22040225012103331133152315233521350694FE3FFEC2FEC4FE3FCE0171BEC10171CDFA
+57018F011C011C018FB6FEB8ADADFEB8B602BFFEF3010D18CE8D8DB6FE4302EAFEC1FE41
+01BF013FC60172C6C6FE90C8FEE4FE700190011CB30147B1B1FEB94FFE820248FDB88DD3
+D38E000000030098FFEC069405E8000D001B0039014BBA000E000600032BB8000E10BA00
+1F001C00032BB8001F10BA0026003300032BB8002610BA0000001400032BB8000010411B
+0016000E0026000E0036000E0046000E0056000E0066000E0076000E0086000E0096000E
+00A6000E00B6000E00C6000E00D6000E000D5D410500E5000E00F5000E00025D410500EA
+001400FA001400025D411B00190014002900140039001400490014005900140069001400
+790014008900140099001400A9001400B9001400C9001400D90014000D5DBA002D000600
+00111239410500EA003300FA003300025D411B0019003300290033003900330049003300
+5900330069003300790033008900330099003300A9003300B9003300C9003300D9003300
+0D5D00BA0011000300032BB8001110BA000A001800032BB8000A10BA0030002900032BB8
+003010BA001D001E00032BB8001D10BA0023003600032BB8002310303101100021200011
+341224333204120510002120001134022423220402012115211506363332161514062322
+2627351E01333236353426232206070694FE3FFEC2FEC4FE3FCE0171BEC10171CDFA5701
+8F011C011C018FB6FEB8ADADFEB8B60198023DFE6F033F1FB0CFD5BE4085585F77446876
+766832655902EAFEC1FE4101BF013FC60172C6C6FE90C8FEE4FE700190011CB30147B1B1
+FEB901198EAB010AB09598AC1418AC2F1B6155566114250000040098FFEC069405E8000D
+001B002700400191BA000E000600032BB8000E10BA001F003B00032BB8001F10BA003500
+2500032BB8003510BA0000001400032BB8000010411B0016000E0026000E0036000E0046
+000E0056000E0066000E0076000E0086000E0096000E00A6000E00B6000E00C6000E00D6
+000E000D5D410500E5000E00F5000E00025D410500EA001400FA001400025D411B001900
+14002900140039001400490014005900140069001400790014008900140099001400A900
+1400B9001400C9001400D90014000D5D411B0016001F0026001F0036001F0046001F0056
+001F0066001F0076001F0086001F0096001F00A6001F00B6001F00C6001F00D6001F000D
+5D410500E5001F00F5001F00025D410500EA002500FA002500025D411B00190025002900
+250039002500490025005900250069002500790025008900250099002500A9002500B900
+2500C9002500D90025000D5DBA00290025003511123900BA0011000300032BB8001110BA
+000A001800032BB8000A10BA0022003800032BB8002210BA003E002C00032BB8003E10BA
+0032001C00032BB800321030310110002120001134122433320412051000212000113402
+242322040205220615141633323635342613152E01232206070636333216151406232226
+3534123332160694FE3FFEC2FEC4FE3FCE0171BEC10171CDFA57018F011C011C018FB6FE
+B8ADADFEB8B602A14E5C5C4E4E5C5CD454612F777F0509804EA0BAC2A0B9C0EAC8356A02
+EAFEC1FE4101BF013FC60172C6C6FE90C8FEE4FE700190011CB30147B1B1FEB99F625B5A
+62625A5B62019D9C231694500B3DB19491B3FDE7DA010B1300030098FFEC069405E8000D
+001B002200EBB800232FB800242FB80000DCB8002310B80006D0B800062FB8000EDC411B
+0016000E0026000E0036000E0046000E0056000E0066000E0076000E0086000E0096000E
+00A6000E00B6000E00C6000E00D6000E000D5D410500E5000E00F5000E00025DB8000010
+B80014DC410500EA001400FA001400025D411B0019001400290014003900140049001400
+5900140069001400790014008900140099001400A9001400B9001400C9001400D9001400
+0D5DBA002000060000111239BA00210006000011123900BA0011000300032BB8001110BA
+000A001800032BB8000A10BA001D002100032BB8001D1030310110002120001134122433
+3204120510002120001134022423220402012115012301210694FE3FFEC2FEC4FE3FCE01
+71BEC10171CDFA57018F011C011C018FB6FEB8ADADFEB8B6016B02ABFE94C10151FE3102
+EAFEC1FE4101BF013FC60172C6C6FE90C8FEE4FE700190011CB30147B1B1FEB901194BFC
+A3031A0000050098FFEC069405E8000D001B0027003F004B020DBA000E000600032BB800
+0E10BA001F003D00032BB8001F10BA0031004600032BB8003110BA0000001400032BB800
+0010411B0016000E0026000E0036000E0046000E0056000E0066000E0076000E0086000E
+0096000E00A6000E00B6000E00C6000E00D6000E000D5D410500E5000E00F5000E00025D
+410500EA001400FA001400025D411B001900140029001400390014004900140059001400
+69001400790014008900140099001400A9001400B9001400C9001400D90014000D5D411B
+0016001F0026001F0036001F0046001F0056001F0066001F0076001F0086001F0096001F
+00A6001F00B6001F00C6001F00D6001F000D5D410500E5001F00F5001F00025D410500EA
+004600FA004600025D411B00190046002900460039004600490046005900460069004600
+790046008900460099004600A9004600B9004600C9004600D90046000D5DBA0025004600
+31111239B800252F410500EA002500FA002500025D411B00190025002900250039002500
+490025005900250069002500790025008900250099002500A9002500B9002500C9002500
+D90025000D5DBA002B003D001F111239B8002B2FBA003400460031111239B8002510B800
+37DCB8002B10B80040DC00BA0011000300032BB8001110BA000A001800032BB8000A10BA
+0022003A00032BB8002210BA002E004900032BB8002E10BA0043001C00032BB8004310BA
+0034001C0043111239303101100021200011341224333204120510002120001134022423
+220402052206151416333236353426252E01353436333216151406071E01151406232226
+3534363714163332363534262322060694FE3FFEC2FEC4FE3FCE0171BEC10171CDFA5701
+8F011C011C018FB6FEB8ADADFEB8B602AF545F5F54545F5FFEC6046AB79D9DB669040F76
+BEADADBE7657514D4B52524B4D5102EAFEC1FE4101BF013FC60172C6C6FE90C8FEE4FE70
+0190011CB30147B1B1FEB9E65049495051484950490176537488887453760103835C8A97
+978A5C83C13D42423D3E424200040098FFEC069405E8000D001B003400400191BA000E00
+0600032BB8000E10BA003E002900032BB8003E10BA0000001400032BB8000010BA002F00
+3800032BB8002F10411B0016000E0026000E0036000E0046000E0056000E0066000E0076
+000E0086000E0096000E00A6000E00B6000E00C6000E00D6000E000D5D410500E5000E00
+F5000E00025D410500EA001400FA001400025D411B001900140029001400390014004900
+14005900140069001400790014008900140099001400A9001400B9001400C9001400D900
+14000D5D411B0016003E0026003E0036003E0046003E0056003E0066003E0076003E0086
+003E0096003E00A6003E00B6003E00C6003E00D6003E000D5D410500E5003E00F5003E00
+025DBA001D0029003E111239410500EA003800FA003800025D411B001900380029003800
+39003800490038005900380069003800790038008900380099003800A9003800B9003800
+C9003800D90038000D5D00BA0011000300032BB8001110BA000A001800032BB8000A10BA
+0020003200032BB8002010BA002C003B00032BB8002C10BA0035002600032BB800351030
+310110002120001134122433320412051000212000113402242322040201351E01333236
+3736062322263534363332161514022322261332363534262322061514160694FE3FFEC2
+FEC4FE3FCE0171BEC10171CDFA57018F011C011C018FB6FEB8ADADFEB8B6019055612E77
+7F050A804F9FBAC2A0B9BFE9C8356BD94E5B5B4E4E5C5C02EAFEC1FE4101BF013FC60172
+C6C6FE90C8FEE4FE700190011CB30147B1B1FEB9FD8B9C2415934F0D3CAF9491B4FDE8DA
+FEF61301B4625B5B62625B5B6200000000050098FFEC069405E8000D001B00260032003E
+019BBA000E000600032BB8000E10BA0023001D00032BB8002310BA002A003C00032BB800
+2A10BA0036003000032BB8003610BA0000001400032BB8000010411B0016000E0026000E
+0036000E0046000E0056000E0066000E0076000E0086000E0096000E00A6000E00B6000E
+00C6000E00D6000E000D5D410500E5000E00F5000E00025D410500EA001400FA00140002
+5D411B001900140029001400390014004900140059001400690014007900140089001400
+99001400A9001400B9001400C9001400D90014000D5D410500EA003000FA003000025D41
+1B0019003000290030003900300049003000590030006900300079003000890030009900
+3000A9003000B9003000C9003000D90030000D5D410500EA003C00FA003C00025D411B00
+19003C0029003C0039003C0049003C0059003C0069003C0079003C0089003C0099003C00
+A9003C00B9003C00C9003C00D9003C000D5D00BA0011000300032BB8001110BA000A0018
+00032BB8000A10BA002D003900032BB8002D10BA0024002500032BB8002410BA00330027
+00032BB8003310B8002410B8001CD0303101100021200011341224333204120510002120
+001134022423220402133311073537331133152101220615141633323635342627321615
+14062322263534360694FE3FFEC2FEC4FE3FCE0171BEC10171CDFA57018F011C011C018F
+B6FEB8ADADFEB8B6CD9EACBC759FFE3E0304404545403F46463F8288888283888802EAFE
+C1FE4101BF013FC60172C6C6FE90C8FEE4FE700190011CB30147B1B1FEB9FE3E023E2789
+2AFD368002DE97A3A29797A2A3977BE4D1D0E4E4D0D1E4000001FFEC026A04E503160003
+0000033521151404F9026AACAC0000000001FFEC021404E5036C00030000031121111404
+F902140158FEA80000010218FE0002B8078100030000011133110218A0FE000981F67F00
+000101C8FE0003080781000300000111211101C80140FE000981F67F0003003C026A0495
+031600030007000B000001352115213521152135211503720123FD420123FD420123026A
+ACACACACACAC00000003003C02140495036C00030007000B000001112111211121112111
+211103720123FD420123FD42012302140158FEA80158FEA80158FEA800030218FE6D02B8
+071300030007000B00000111331103113311031133110218A0A0A0A0A0FE6D026AFD9603
+1E026AFD96031E026AFD9600000301C8FE6D0308071300030007000B0000011121110111
+21110111211101C80140FEC00140FEC00140FE6D026AFD96031E026AFD96031E026AFD96
+0004003C026A0495031600030007000B000F000013353315333533153335331533353315
+3CBC78BC78BC78BD026AACACACACACACACAC00000004003C02140495036C00030007000B
+000F0000131133113311331133113311331133113CBC78BC78BC78BD02140158FEA80158
+FEA80158FEA80158FEA8000000040218FE6E02B8071200030007000B000F000001113311
+0311331103113311031133110218A0A0A0A0A0A0A0057001A2FE5EF8FE01A2FE5E04AC01
+A2FE5EFDAA01A2FE5E000000000401C8FE6E0308071200030007000B000F000001112111
+01112111011121110111211101C80140FEC00140FEC00140FEC00140057001A2FE5EF8FE
+01A2FE5E04AC01A2FE5EFDAA01A2FE5E00010218FE0004E5031600050000011121152111
+021802CDFDD3FE000516ACFB9600000000010218FE0004E5036C00050000011121112111
+021802CDFDD3FE00056CFEA8FBEC0000000101C8FE0004E5031600050000011121152111
+01C8031DFE23FE000516ACFB96000000000101C8FE0004E5036C00050000011121112111
+01C8031DFE23FE00056CFEA8FBEC00000001FFECFE0002B8031600050000011121352111
+0218FDD402CCFE00046AACFAEA0000000001FFECFE0002B8036C00050000011121112111
+0218FDD402CCFE0004140158FA9400000001FFECFE000308031600050000011121352111
+01C8FE24031CFE00046AACFAEA0000000001FFECFE000308036C00050000011121112111
+01C8FE24031CFE0004140158FA94000000010218026A04E5078100050000011133112115
+0218A0022D026A0517FB95AC00010218021404E50781000500000111331121110218A002
+2D0214056DFBEBFEA8000000000101C8026A04E507810005000001112111211501C80140
+01DD026A0517FB95AC000000000101C8021404E507810005000001112111211101C80140
+01DD0214056DFBEBFEA800000001FFEC026A02B807810005000003352111331114022CA0
+026AAC046BFAE9000001FFEC021402B807810005000003112111331114022CA002140158
+0415FA930001FFEC026A03080781000500000335211121111401DC0140026AAC046BFAE9
+0001FFEC021403080781000500000311211121111401DC0140021401580415FA93000000
+00010218FE0004E507810007000001113311211521110218A0022DFDD3FE000981FB95AC
+FB96000000010218FE0004E507810007000001113311211121110218A0022DFDD3FE0009
+81FBEBFEA8FBEC00000101C8FE0004E50781000900000111231121112115211102185001
+4001DDFDD3FE00046A0517FB95ACFB96000101C8FE0004E5078100090000011133113311
+2115211101C850A0022DFE23FE000516046BFB95ACFB9600000101C8FE0004E507810007
+0000011121112115211101C8014001DDFE23FE000981FB95ACFB9600000101C8FE0004E5
+07810009000001112311211121112111021850014001DDFDD3FE000414056DFBEBFEA8FB
+EC000000000101C8FE0004E50781000900000111331133112111211101C850A0022DFE23
+FE00056C0415FBEBFEA8FBEC000101C8FE0004E5078100070000011121112111211101C8
+014001DDFE23FE000981FBEBFEA8FBEC0001FFECFE0002B8078100070000011121352111
+33110218FDD4022CA0FE00046AAC046BF67F00000001FFECFE0002B80781000700000111
+2111211133110218FDD4022CA0FE00041401580415F67F000001FFECFE00030807810009
+0000011121352111211123110218FDD401DC014050FE00046AAC046BFAE9FB960001FFEC
+FE0003080781000900000111213521113311331101C8FE24022CA050FE00046AAC046BFB
+95FAEA000001FFECFE000308078100070000011121352111211101C8FE2401DC0140FE00
+046AAC046BF67F000001FFECFE000308078100090000011121112111211123110218FDD4
+01DC014050FE00041401580415FA93FBEC0000000001FFECFE0003080781000900000111
+211121113311331101C8FE24022CA050FE00041401580415FBEBFA940001FFECFE000308
+078100070000011121112111211101C8FE2401DC0140FE00041401580415F67F0001FFEC
+FE0004E503160007000001112135211521110218FDD404F9FDD3FE00046AACACFB960000
+0001FFECFE0004E5036C00090000011121112115211521110218FDD402CC022DFDD3FE00
+0414015856ACFB960001FFECFE0004E5036C00090000011121352135211121110218FDD4
+022C02CDFDD3FE00046AAC56FEA8FBEC0001FFECFE0004E5036C00070000011121112111
+21110218FDD404F9FDD3FE0004140158FEA8FBEC0001FFECFE0004E50316000700000111
+21352115211101C8FE2404F9FE23FE00046AACACFB9600000001FFECFE0004E5036C0009
+00000111211121152115211101C8FE24031C01DDFE23FE000414015856ACFB960001FFEC
+FE0004E5036C000900000111213521352111211101C8FE2401DC031DFE23FE00046AAC56
+FEA8FBEC0001FFECFE0004E5036C00070000011121112111211101C8FE2404F9FE23FE00
+04140158FEA8FBEC0001FFEC026A04E5078100070000033521113311211514022CA0022D
+026AAC046BFB95AC0001FFEC021404E50781000900000311211133112115211514022CA0
+022DFDD3021401580415FB95AC5600000001FFEC021404E5078100090000033521113311
+2111213514022CA0022DFD33026AAC046BFBEBFEA85600000001FFEC021404E507810007
+0000031121113311211114022CA0022D021401580415FBEBFEA800000001FFEC026A04E5
+07810007000003352111211121151401DC014001DD026AAC046BFB95AC0000000001FFEC
+021404E5078100090000031121112111211521151401DC014001DDFE23021401580415FB
+95AC56000001FFEC021404E5078100090000033521112111211121351401DC014001DDFC
+E3026AAC046BFBEBFEA856000001FFEC021404E507810007000003112111211121111401
+DC014001DD021401580415FBEBFEA8000001FFECFE0004E50781000B0000011123112135
+21113311211502B8A0FDD4022CA0022D026AFB96046AAC046BFB95AC0001FFECFE0004E5
+0781000B00000111211121113311211521110218FDD4022CA0022DFDD3FE000414015804
+15FB95ACFB9600000001FFECFE0004E50781000B00000111213521113311211121110218
+FDD4022CA0022DFDD3FE00046AAC046BFBEBFEA8FBEC00000001FFECFE0004E50781000B
+00000111211121113311211121110218FDD4022CA0022DFDD3FE00041401580415FBEBFE
+A8FBEC000001FFECFE0004E50781000B00000111213521112111211521110218FDD401DC
+014001DDFDD3FE00046AAC046BFB95ACFB9600000001FFECFE0004E50781000B00000111
+2135211133112115211101C8FE24022CA0022DFE23FE00046AAC046BFB95ACFB96000000
+0001FFECFE0004E50781000B000001112135211121112115211101C8FE2401DC014001DD
+FE23FE00046AAC046BFB95ACFB9600000001FFECFE0004E50781000D0000011121112111
+21112115211523110218FDD401DC014001DDFE2350FE00041401580415FB95AC56FBEC00
+0001FFECFE0004E50781000D00000111233521352111211121112111021850FE2401DC01
+4001DDFDD3FE00041456AC046BFBEBFEA8FBEC000001FFECFE0004E50781000D00000111
+21112111331133152115211101C8FE24022CA05001DDFE23FE00041401580415FBEB56AC
+FB9600000001FFECFE0004E50781000D0000011121352135331133112111211101C8FE24
+01DC50A0022DFE23FE00046AAC560415FBEBFEA8FBEC00000001FFECFE0004E50781000B
+00000111211121112111211121110218FDD401DC014001DDFDD3FE00041401580415FBEB
+FEA8FBEC0001FFECFE0004E50781000B000001112111211133112111211101C8FE24022C
+A0022DFE23FE00041401580415FBEBFEA8FBEC000001FFECFE0004E50781000B00000111
+2111211121112115211101C8FE2401DC014001DDFE23FE00041401580415FB95ACFB9600
+0001FFECFE0004E50781000B000001112135211121112111211101C8FE2401DC014001DD
+FE23FE00046AAC046BFBEBFEA8FBEC000001FFECFE0004E50781000B0000011121112111
+21112111211101C8FE2401DC014001DDFE23FE00041401580415FBEBFEA8FBEC0002003C
+026A0495031600030007000013352115333521153C01F07901F0026AACACACAC0002003C
+02140495036C000300070000011121112111211102A501F0FBA701F002140158FEA80158
+FEA8000000020218FEC002B806C100030007000001113311031133110218A0A0A0036C03
+55FCABFB540354FCAC000000000201C8FEC0030806C10003000700000111211101112111
+01C80140FEC00140036C0355FCABFB540354FCAC0002FFEC01BE04E503C2000300070000
+03352115013521151404F9FB0704F90316ACACFEA8ACAC0000020178FE00035807810003
+0007000001113311331133110178A0A0A0FE000981F67F0981F67F0000010218FE0004E5
+03C20009000001112115211521152111021802CDFDD3022DFDD3FE0005C2ACACACFC4200
+00010178FE0004E5031600090000011121152111231123110178036DFE73A0A0FE000516
+ACFB96046AFB960000020178FE0004E503C20005000B0000011121152111331121152111
+0178036DFD33A0022DFE73FE0005C2ACFAEA046AACFC42000001FFECFE0002B803C20009
+0000011121352135213521110218FDD4022CFDD402CCFE0003BEACACACFA3E000001FFEC
+FE0003580316000900000335211123112311231114036CA0A0A0026AACFAEA046AFB9604
+6A0000000002FFECFE00035803C20005000B000001112135211121112135211102B8FD34
+036CFE20FE74022CFE000516ACFA3E03BEACFB960001021801BE04E50781000900000111
+33112115211521150218A0022DFDD3022D01BE05C3FC41ACACAC000000010178026A04E5
+078100090000011133113311331121150178A0A0A0018D026A0517FB95046BFB95AC0000
+0002017801BE04E507810005000B000001113311211501113311211502B8A0018DFC93A0
+02CD0316046BFC41ACFEA805C3FAE9AC0001FFEC01BE02B8078100090000033521352135
+2111331114022CFDD4022CA001BEACACAC03BFFA3D0000000001FFEC026A035807810009
+00000335211133113311331114018CA0A0A0026AAC046BFB95046BFAE90000000002FFEC
+01BE035807810005000B000003352111331101352111331114018CA0FDD402CCA00316AC
+03BFFB95FEA8AC0517FA3D0000010218FE0004E50781000B000001113311211521152115
+21110218A0022DFDD3022DFDD3FE000981FC41ACACACFC4200020178FE0004E507810003
+000B00000111331133113311211521110178A0A0A0018DFE73FE000981F67F0981FB95AC
+FB96000000030178FE0004E5078100050009000F00000111331121150111331133112115
+211102B8A0018DFC93A0A0022DFE730316046BFC41ACFAEA0981F67F046AACFC42000000
+0001FFECFE0002B80781000B00000111213521352135211133110218FDD4022CFDD4022C
+A0FE0003BEACACAC03BFF67F0002FFECFE00035807810007000B00000111213521113311
+331133110178FE74018CA0A0A0FE00046AAC046BF67F0981F67F00000003FFECFE000358
+07810005000B000F00000335211133110311213521113311331114018CA0A0FE74022CA0
+A00316AC03BFFB95FAEA03BEACFB960981F67F000002FFECFE0004E503C20007000B0000
+0111213521152111013521150218FDD404F9FDD3FD3404F9FE0003BEACACFC420516ACAC
+0001FFECFE0004E50316000B00000335211521112311231123111404F9FE73A0A0A0026A
+ACACFB96046AFB96046A00000003FFECFE0004E503C200030009000F0000033521150111
+213521113311211521111404F9FC93FE74022CA0022DFE730316ACACFAEA03BEACFB9604
+6AACFC420002FFEC01BE04E507810003000B00000335211501352111331121151404F9FB
+07022CA0022D01BEACAC0158AC03BFFC41AC00000001FFEC026A04E50781000B00000335
+2111331133113311211514018CA0A0A0018D026AAC046BFB95046BFB95AC00000003FFEC
+01BE04E5078100030009000F0000033521150135211133113311331121151404F9FB0701
+8CA0A0A0018D01BEACAC0158AC03BFFB95046BFC41AC00000001FFECFE0004E507810013
+000001112135213521352111331121152115211521110218FDD4022CFDD4022CA0022DFD
+D3022DFDD3FE0003BEACACAC03BFFC41ACACACFC420000000001FFECFE0004E507810013
+0000033521113311331133112115211123112311231114018CA0A0A0018DFE73A0A0A002
+6AAC046BFB95046BFB95ACFB96046AFB96046A000004FFECFE0004E507810005000B0011
+0017000001112115211121112135211101352111331133113311211502B8022DFE73FE20
+FE74022CFDD4018CA0A0A0018DFE00046AACFC4203BEACFB960516AC03BFFB95046BFC41
+AC00000000010218FE0004E50316000B00000111341233211521220615110218AAAA0179
+FE87595BFE000370A50101AC7E7CFC900001FFECFE0002B80316000B0000011134262321
+35213216151102185B59FE880178A8ACFE0003707E7CACFEA8FC90000001FFEC026A02B8
+0781000B0000033521323635113311140623140178595BA0ACA8026AAC7E7C0371FC8FA8
+FE00000000010218026A04E50781000B000001212226351133111416332104E5FE87A8AC
+A05B590179026AFEA80371FC8F7C7E000001FFA7FE14052A076D00030000030133015904
+D1B2FB2FFE140959F6A700000001FFA7FE14052A076D0003000001230133052AB2FB2FB2
+FE1409590001FFA7FE14052A076D000B0000012309012309013309013301052AB2FDF0FD
+F1B20269FD97B2020F0210B2FD98FE140400FC0004AC04ADFC000400FB5300000001FFEC
+026A02680316000300000335211514027C026AACAC0000000001021802C002B807810003
+0000011133110218A002C004C1FB3F0000010268026A04E5031600030000013521150268
+027D026AACAC000000010218FE0002B802C000030000011133110218A0FE0004C0FB4000
+0001FFEC02130268036C000300000311051114027C0214015801FEA8000101C802C00308
+0781000300000111211101C8014002C004C1FB3F00010268021404E5036C000300000111
+21110268027D02140158FEA8000101C8FE00030802C0000300000111211101C80140FE00
+04C0FB400001FFEC021404E5036C0007000003352135211121351402900269FD97026AAC
+56FEA856000101C8FE000308078100070000011133113311331101C850A050FE0004C004
+C1FB3FFB400000000001FFEC021404E5036C0007000003112115211521151402900269FD
+970214015856AC56000101C8FE0003080781000700000111231121112311021850014050
+FE0004C004C1FB3FFB400000FFFFFFEC0214063B062810070E5B0000041400000001FFEC
+FE00063BFF05000300000311211114064FFE000105FEFB000001FFECFE00063BFFF60003
+00000311211114064FFE0001F6FE0A000001FFECFE00063B010F00030000031121111406
+4FFE00030FFCF1000001FFECFE00063B0214000300000311211114064FFE000414FBEC00
+0001FFECFE00063B0319000300000311211114064FFE000519FAE7000001FFECFE00063B
+041E000300000311211114064FFE00061EF9E2000001FFECFE00063B0523000300000311
+211114064FFE000723F8DD000001FFECFE00063B0628000300000311211114064FFE0008
+28F7D8000001FFECFE00057106280003000003112111140585FE000828F7D8000001FFEC
+FE0004A7062800030000031121111404BBFE000828F7D8000001FFECFE0003DD06280003
+0000031121111403F1FE000828F7D8000001FFECFE000313062800030000031121111403
+27FE000828F7D8000001FFECFE0002490628000300000311211114025DFE000828F7D800
+0001FFECFE00017F06280003000003112111140193FE000828F7D8000001FFECFE0000B5
+0628000300000311331114C9FE000828F7D80000FFFF0313FE00063A062810070E630327
+00000000000CFFECFE000571062800030007000B000F00130017001B001F00230027002B
+002F00000111331121113311131133112111331101113311211133111311331121113311
+0111331121113311131133112111331104A7CAFC0ECACACAFC0FC903F2CAFC0ECACACAFC
+0FC903F2CAFC0ECACACAFC0FC9FE000105FEFB0105FEFB016D0105FEFB0105FEFB016E01
+05FEFB0105FEFB016D0105FEFB0105FEFB016E0105FEFB0105FEFB016D0105FEFB0105FE
+FB0000000020FFECFE00063406280007000F0017001F0027002F0037003F0047004F0057
+005F0067006F0077007F0087008F0097009F00A700AF00B700BF00C700CF00D700DF00E7
+00EF00F700FF000013072327353733170507232735373317050723273537331705072327
+353733170107232735373317050723273537331705072327353733170507232735373317
+010723273537331705072327353733170507232735373317050723273537331701072327
+353733170507232735373317050723273537331705072327353733170107232735373317
+050723273537331705072327353733170507232735373317010723273537331705072327
+353733170507232735373317050723273537331701072327353733170507232735373317
+050723273537331705072327353733170107232735373317050723273537331705072327
+353733170507232735373317B505BF0505BF05019205BF0505BF05019205BF0505BF0501
+9205BF0505BF05FC1305BF0505BF05019205BF0505BF05019205BF0505BF05019205BF05
+05BF05FA8105BF0505BF05019205BF0505BF05019205BF0505BF05019205BF0505BF05FC
+1305BF0505BF05019205BF0505BF05019205BF0505BF05019205BF0505BF05FA8105BF05
+05BF05019205BF0505BF05019205BF0505BF05019205BF0505BF05FC1305BF0505BF0501
+9205BF0505BF05019205BF0505BF05019205BF0505BF05FA8105BF0505BF05019205BF05
+05BF05019205BF0505BF05019205BF0505BF05FC1305BF0505BF05019205BF0505BF0501
+9205BF0505BF05019205BF0505BF0505280505FB0505FB0505FB0505FB0505FB0505FB05
+05FB0505FE000505FB0505FB0505FB0505FB0505FB0505FB0505FB0505FE000505FB0505
+FB0505FB0505FB0505FB0505FB0505FB0505FE000505FB0505FB0505FB0505FB0505FB05
+05FB0505FB0505FE000505FB0505FB0505FB0505FB0505FB0505FB0505FB0505FE000505
+FB0505FB0505FB0505FB0505FB0505FB0505FB0505FE000505FB0505FB0505FB0505FB05
+05FB0505FB0505FB0505FE000505FB0505FB0505FB0505FB0505FB0505FB0505FB050500
+0007FFECFE00063B06280019001D002100250029002D0031000003113311231133112311
+331121113311211123112311211123190133112301331123013311230133112301331123
+0133112314C9C9C9C9C9025ECA025ECACAFDA2CACACA0328CACAFE6CCACAFE6CCACA0328
+CACAFE6CCACAFE00016D010501D6010501D60105FEFB0105F7D80105FEFB0105FEFB05B6
+0105FEFB0105FD8D0105FD8E0105FEFB0105FD8D01050000FFFFFFEC0523063B06281007
+0E58000007230000FFFF0571FE00063A062810070E660585000000000001FFECFE000314
+02140003000003112111140328FE000414FBEC0000010313FE00063B0214000300000111
+211103130328FE000414FBEC0001FFEC0214031406280003000003112111140328021404
+14FBEC000001FFECFE00063B062800050000012111211121063BF9B103280327FE000828
+FBEC00000001FFECFE00063B06280007000003112111211121111403280327FCD8021404
+14FBECFBEC0414000001FFECFE00063B062800050000011121112111063BFCD9FCD80628
+FBECFBEC082800000001FFECFE00063B06280005000003211121112114064FFCD8FCD906
+28F7D80414000000000103130214063B062800030000011121110313032802140414FBEC
+0001FFECFE00063B06280007000003211121112111211403270328FCD9FCD802140414FB
+ECFBEC000001FFECFE00063B0628000500000311211121111403270328FE0004140414F7
+D8000000000100BAFF0406D505240003000017112111BA061BFC0620F9E00000000200BA
+FF0406D505240003000700000521112103112111012C0537FAC972061B8A053CFA520620
+F9E00000000200BAFF0406D50524000B0017000025143321323511342321221503111029
+0120190110290120012CE4036FE4E4FC91E4720156036F0156FEAAFC91FEAA5AE4E40374
+E4E4FC8C03740156FEAAFC8CFEAA0000FFFF00BAFF0406D5052410270E81011100001006
+0E780000000600BAFF0406D5052400030007000B000F0013001700001711211125213521
+35213521352135213521352135213521BA061BFA570537FAC90537FAC90537FAC90537FA
+C90537FAC9FC0620F9E072B072B272B072B272B0000600BAFF0406D5052400030007000B
+000F001300170000171121112533112301331123013311230133112301331123BA061BFE
+E1B0B0FEDCB2B2FEDEB0B0FEDCB2B2FEDEB0B0FC0620F9E0740538FAC80538FAC80538FA
+C80538FAC8053800001A00BAFF0406D5052400030007000B000F00130017001B001F0023
+0027002B002F00330037003B003F00430047004B004F00530057005B005F006300670000
+053335230533352305333523013335231133352311333523113335231133352301333523
+113335231133352311333523013335231133352311333523113335230133352311333523
+1133352311333523013335231133352311333523113335231133352301112111024CB2B2
+0124B0B00122B2B2FC9AAEAEAEAEAEAEAEAEAEAE0120B2B2B2B2B2B2B2B20124B0B0B0B0
+B0B0B0B00122B2B2B2B2B2B2B2B20124ADADADADADADADADADADFB04061B88AEAEAEAEAE
+03DCAEFE2EB2FE2CB0FE2CB2FE2EAE03DCAEFE2EB2FE2CB0FE2CB202B8AEFE2EB2FE2CB0
+FE2CB202B8AEFE2EB2FE2CB0FE2CB202B8AEFE2EB2FE2CB0FE2CB2FE2EAEFEDE0620F9E0
+000800BAFF0406D5052400030006000A000E00140018001C001F00001711211101153303
+150133011501370115013735013301350133013501331735BA061BFA57E2E20184FBFD81
+0321FBFBE404BE79FB42A2041CFCDFA2027FFE7CA2E2FC0620F9E00154E2027FFCFE7D04
+1CFCFCDF01053C7FFB42017F04BDFBE4FC0320FD81FC0183E2E20000000800BAFF0406D5
+052400030006000A000E00140018001C001F000017112111253335053301350117013501
+17013523013501230135012301353723BA061BFEACE2FD81FB0184FBE4FB0321FAC97904
+BE79FB42041CFBFCDF027FFBFE7CE2E2FC0620F9E072E2E20183FCFD81010321FCFBE401
+04BE7FFB43A1041CFCE0A1027FFE7DA1E2000000001A00BAFF0406D5052400040009000E
+00120017001C002000240028002D003100350039003D00410046004B004F00530057005C
+00610065006A006F00730000011737272311173727070117372723011737270317372707
+011737272301173727011737270117372701173735230117372701173727011737270117
+372701173727013337270701173735270117372701173727011737270117333727011737
+3527011737270117333727051733352701112111012C327C3579327E7E32014F7E7E3592
+FEFE7E7C7EFE327E7E3202EC7E7E3592FEFD7E7D7DFEB57D7D7EFEB57E7E7E03897D3179
+FEFD7C7E7CFEB37C7E7CFEB57D7C7CFEB57C7E7CFEB37D7D7CFF007A347C3204887E3132
+FEB47E7E7EFEB57E7C7EFEB67E7E7EFEB33593347E02BB7D3232FEB57E7D7EFEB5349335
+7E011F347A32FA89061B0433317C34FDE4327E7E31014F7E7E34FEFF7E7C7EFCCC317E7D
+3102EC7E7E34FEFD7D7D7EFEB57E7D7DFEB67E7E7E01EC7C317FFEFD7C7E7CFEB47D7E7C
+FEB67C7C7CFEB57C7E7CFEB47C7D7DFE81347C3102ED7E329931FEB47E7E7EFEB57E7C7E
+FEB57E7E7EFEB434347E011E7E319931FEB57D7C7EFEB534347E7E347F31FEDE0620F9E0
+000100BA001604B204120003000037112111BA03F81603FCFC040000000200BA001604B2
+04120003000700002521112103112111012C0314FCEC7203F8880318FC7603FCFC040000
+000100BA009A06D5038E000300002521112106D5F9E5061B9A02F400000200BA009A06D5
+038E00030007000001112111052111210663FAC905A9F9E5061B010C0210FDF07202F400
+000100BAFF0603AD05220003000017112111BA02F3FA061CF9E40000000200BAFF0603AD
+05220003000700000521112103112111012C020FFDF17202F3880538FA56061CF9E40000
+00010006009A0621038E00030000252101210498FB6E018A04919A02F400000000020006
+009A0621038E000300070000090121010521012104620110FC53FEEF03E4FB6E018A0491
+010C0210FDF07202F400000000010006FF04062105240002000017090106030D030EFC06
+20F9E00000020006FF040621052400020005000017210903B104C5FD9DFCF3030D030E8A
+04CAFAC40620F9E000010006001603FE0412000200003709010601FC01FC1603FCFC0400
+00020006001603FE041200020005000037210903B102A2FEAFFE0401FC01FC8802A6FCE8
+03FCFC0400010006FF04062105240002000017110106061BFC0620FCF000000000020006
+FF04062105240002000500001709010311017804C5FB3B72061B5202660266FA8A0620FC
+F000000000010006001603FE0412000200003711010603F81603FCFE0200000000020006
+001603FE04120002000500003709010311017802A2FD5E7203F8C101530153FCAF03FCFE
+02000000000100060016062104120002000037110106061B1603FCFE0200000000020006
+00160621041200020005000037090103110178048CFB7472061BC101530153FCAF03FCFE
+0200000000010006FF04062105240002000013210106061BFCF20524F9E0000000020006
+FF0406210524000200050000130901252101B102620263FA90061BFCF204B2FB3604CA72
+F9E0000000010006001603FE0412000200001321010603F8FE040412FC04000000020006
+001603FE0412000200050000130901252101B101510151FCB303F8FE0403A0FD5A02A672
+FC04000000010006FF04062105240002000013011106061B02140310F9E0000000020006
+FF0406210524000200050000130111090111EA04C5FA57061B0214FD9A04CCFD9A0310F9
+E000000000010006001603FE0412000200001301110603F8021401FEFC04000000020006
+001603FE0412000200050000130111090111EA02A2FC7A03F80214FEAD02A6FEAD01FEFC
+04000000000100060016062104120002000013011106061B021401FEFC04000000020006
+0016062104120002000500000901110901110123048CFA57061B0214FEAD02A6FEAD01FE
+FC04000000010006FF04062105240003000013090206030D030EFCF202140310FCF0FCF0
+00020006FF04062105240003000700001309069E02750276FD8AFCF3030D030EFCF20214
+FD8802780278FD880310FCF0FCF0000000030006FF040621052400030007000B0000090B
+013E01D501D5FE2BFD8B02750276FD8AFCF3030D030EFCF2021401D7FE29FE2901D7FD88
+02780278FD880310FCF0FCF000030070FEFF068B0529000D001B00290000241037363332
+171610070623222700100516333237241025262322070010253633321704100506232227
+0182FE7E7F807EFEFE7E807F7EFE65014DA5A6A7A5014DFEB3A5A7A6A5FE3E0187C3C3C4
+C30187FE79C3C4C3C3EF024A924A4A92FDB6924A4A0336FD02C06060C002FEC06060FBFF
+0384E27171E2FC7CE271710000020006FE2303EE06750003000700224011020600080406
+080604030201000605070810D4CC1739310010D4CC1139123930090701FAFE7F01810181
+FE7F01F4FE0CFE0C0581FCCFFCC703390425FBDBFBD3042D00020070FEFF068B0529000D
+001B000012100516333237241025262322070010253633321704100506232227E5014DA5
+A6A7A5014DFEB3A5A7A6A5FE3E0187C3C3C4C30187FE79C3C4C3C30393FD02C06060C002
+FEC06060FBFF0384E27171E2FC7CE2717100000000080072FF010689052700090013001D
+0027002F0037003F00470000251617161707262726270536373637170607060713262726
+273716171617250607060727363736371316323717062227013634273716140701262207
+273632170106141707263437015C2B3B2E383146394B3503DA382E3432643B4539479C2C
+3A2E383047394A36FC26382E3B2B64314F3946ED4C9A4C265FC060034A10106E1414FDA1
+4C9A4C2760C05FFCB810106E14148F3C3126206A28303D4A7520262C413D4E3A30280427
+3C3126206A28303D4A752026313C3E45423028FAD416166E1B1B025F49A049275BCA5B03
+4A16166E1B1BFDA149A049275BCA5B0000060070FEFF068B0529000D0017001B0025002F
+003300003610253633321704100506232227131116171617110607060706101701111633
+3237112623221711363736371126272617113610700187C3C3C4C30187FE79C3C4C3C30B
+1719414141411989ABAB01962C2B2D2C2C2D2BF641401A17171A40E3AA520384E27171E2
+FC7CE2717104C5FBBE0F0F251704F617250F6DB1FDDCB1045BFAD0070705300724FB0A17
+250F100440100F25A2FC7CB10222000000040070FEFF068B0529000D001B002900370000
+001017163332373610272623220702103736333217161007062322270010051633323724
+102526232207001025363332170410050623222702997239393A397272393A3939EDB058
+575858B0B058585758FE17014DA5A6A7A5014DFEB3A5A7A6A5FE3E0187C3C3C4C30187FE
+79C3C4C3C30298FEF8422121420108422121FE6F019665333365FE6A65333302AFFD02C0
+6060C002FEC06060FBFF0384E27171E2FC7CE2717100000000010070FF04068B05200017
+00134007061218190C001810DCD4CC310010D4C430133437363736333217161716151407
+060706232227262726706968B6B5D2D1B5B668696968B6B5D1D2B5B668690212D1B6B569
+696969B5B6D1D1B6B569696969B5B60000020070FF04068B0520000D0015000012101224
+33320412100204232224053237241025262370D1016BD2D1016BD1D1FE95D1D2FE95023C
+A7A5014DFEB3A5A7014101A2016BD2D2FE95FE5EFE95D2D26160C002FEC0600000020070
+FF04068B0520000D001500001210122433320412100204232224012207041005163370D1
+016BD2D1016BD1D1FE95D1D2FE95023CA6A5FEB3014DA5A6014101A2016BD2D2FE95FE5E
+FE95D2D204DD60C0FD02C06000020070FF04068B0520000D001600001210122433320412
+10020423222401102526232207041170D1016BD2D1016BD1D1FE95D1D2FE9504D5FEB3A5
+A7A6A5FEB3014101A2016BD2D2FE95FE5EFE95D2D2023E017FC06060C0FE810000020070
+FF04068B0520000D00160000121012243332041210020423222403100516333237241170
+D1016BD2D1016BD1D1FE95D1D2FE955C014DA5A6A7A5014D014101A2016BD2D2FE95FE5E
+FE95D2D2023EFE81C06060C0017F000000020070FF04068B0520000B0018000012101224
+20041210020420240122070410051633323724112170D1016B01A3016BD1D1FE95FE5DFE
+95023CA6A5FEB3014DA5A6A7A5014DFD67014101A2016BD2D2FE95FE5EFE95D2D204DD60
+C0FD02C06060C0017F00000000020070FF04068B0520000B001100001210122420041210
+0204202401220704112170D1016B01A3016BD1D1FE95FE5DFE95023CA6A5FEB302980141
+01A2016BD2D2FE95FE5EFE95D2D204DD60C0FE8100010070FEFF037D0529000700003610
+253633112227700187C3C3C3C3520384E271F9D671000000000100BAFEFF03C705290007
+0000001005062311321703C7FE79C3C3C3C303D6FC7CE271062A7100000200BAFFEC059A
+0628000A000E00000114163236353426232206011121110201ACFAACAB7C7EADFEB904E0
+02FA7DACAC7D7CABABFC76063CF9C400000300BAFE0007090628000D001B001F00002410
+2536333217041005062322270010051633323724102526232207011121110149014DA5A6
+A7A5014DFEB3A5A7A6A5FE3E0187C3C3C4C30187FE79C3C4C3C3FE5F064F9502FEC06060
+C0FD02C060600401FC7CE27171E20384E27171F9480828F7D8000000000200BA02140709
+0628000C0015000013112111231025262322070411290110253633321704BA064F1AFE79
+C3C4C3C3FE7905A6FACF014DA6A5A6A6014D02140414FBEC01C2E27171E2FE3E017EC160
+60C10000000200BAFE0007090214000C0015000013113310051633323724113311012110
+050623222724BA1A0187C3C3C4C301871AFA400531FEB3A6A6A5A6FEB3FE000414FE3EE2
+7171E201C2FBEC0414FE82C16060C1000001000602140313052900090000131025363315
+22070411060187C3C3A6A5FEB3021401C2E2717660C0FE81000100060214031305290009
+00001332170411231025262306C3C3018775FEB3A5A6052971E2FE3E017FC06000010006
+FEFF03130214000900001335323724113310050606A6A5014D75FE79C3FEFF7660C0017F
+FE3EE27100010006FEFF0313021400090000012227241133100516330313C3C3FE797501
+4DA5A6FEFF71E201C2FE81C060000000000100700214068B052900110000131025363332
+170411231025262322070411700187C3C3C4C3018775FEB3A5A7A6A5FEB3021401C2E271
+71E2FE3E017FC06060C0FE8100010070FEFF068B02140012000013303310051633323724
+1133100506232227247075014DA5A6A7A5014D75FE79C3C4C3C3FE790214FE81C06060C0
+017FFE3EE27171E200010006FF04062105240002000017011106061BFC0620F9E0000000
+00010006FF04062105240002000017110106061BFC0620F9E000000000010006FF040621
+05240002000017112106061BFC06200000010006FF04062105240002000013211106061B
+0524F9E00002013301D103850421000A0015000001141632363534262322060734363332
+161514062226016E8AC88A8963658B3BAD7E7CABACFAAC02FA648A8A64638989637CABAB
+7C7DACAC000200BAFF0406D505240003000700001711211125211121BA061BFCF2029CFD
+64FC0620F9E072053C000000000200BAFF0406D505240003000700001711211125211121
+BA061BFA57029BFD65FC0620F9E072053C000000000200BAFF0406D50524000300060000
+17112111252111BA061BFA570537FC0620F9E072053C0000000200BAFF0406D505240003
+0006000017112111250121BA061BFA570537FAC9FC0620F9E072053C000300BAFF0406D5
+052400030007000B0000171121112521112101211121BA061BFD2B0263FD9DFD2C0262FD
+9EFC0620F9E072053CFAC4053C00000000030006FF04062105240007000A000D00000034
+36321614062201210903027F577C56567DFDDC04C5FD9DFCF3030D030E012C7C56567C56
+FEA004CAFAC40620F9E0000000020006FF04062105240002000500000521090303130263
+FD9DFCF3030D030E8A04CAFAC40620F9E000000000020006FF0406210524000200050000
+1721110902B10262FCF3030D030E8A04CAFAC40620F9E00000020070FE0008840628000B
+00170000121001162037001001262007001001242005001001042025F101C5E201C4E201
+C5FE3BE2FE3CE2FDBA02050103020401030205FDFBFEFDFDFCFEFD041EFBECFEFB838301
+05041401058383FA9D04A8012A9696FED6FB58FED6969600000300BAFF0406D505240005
+0009000D00000521112111210311211101211121012C0537FD9DFD2C72061BFA570262FD
+9E8A053CFD29FD290620F9E003490265000300BAFF0406D5052400050009000D00000121
+112111210311211125211121012C02D40263FAC972061BFA570262FD9E024DFD29053CFA
+520620F9E0720265000300BAFF0406D5052400050009000D000005211121112103112111
+25211121012C026202D5FAC972061BFD2B0263FD9D8A02D70265FA520620F9E072026500
+000300BAFF0406D5052400050009000D00000521112111210311211101211121012C0537
+FD2BFD9E72061BFD2B0263FD9D8A026502D7FA520620F9E00349026500030070FF04068B
+0520000D0013002000001210122433320412100204232224010607040321051205163332
+3724102526271170D1016BD2D1016BD1D1FE95D1D2FE9502038989FECC17025DFDA31701
+34A6A5A6A6014DFEB3898A014101A2016BD2D2FE95FE5EFE95D2D204DA0E4FB2FEAC72FE
+ACB26060C102FCC14F0EFD2B00030070FF04068B0520000D001A00200000121012243332
+04121002042322240536372410252623220704032105120516171170D1016BD2D1016BD1
+D1FE95D1D2FE9502758A89014DFEB3A6A6A5A6FECC1702CFFD311701348989014101A201
+6BD2D2FE95FE5EFE95D2D25E0E4FC102FCC16060B2FEAC72FEACB24F0E02630000030070
+FF04068B0520000D001A0020000012101224333204121002042322240210051617112102
+252623220701363724132170D1016BD2D1016BD1D1FE95D1D2FE955C014D898902D017FE
+CCA6A6A5A601848A89013417FDA2014101A2016BD2D2FE95FE5EFE95D2D203BCFD04C14F
+0E02D50154B26060FB250E4FB201540000030070FF04068B0520000D001A002000001210
+1224333204121002042322240210051633323724132111060701022526271170D1016BD2
+D1016BD1D1FE95D1D2FE955C014DA6A5A6A6013417FD30898903E217FECC898A014101A2
+016BD2D2FE95FE5EFE95D2D203BCFD04C16060B2015402D50E4FFDFA0154B24F0EFD9D00
+00020006FF040621052400020005000037012103112178048CFB7472061B200492FA5206
+2000000000020006FF04062105240002000500000901112521110123048CFA57061B04B2
+FB6E049272F9E00000020006FF040621052400020005000017210103110178048CFB7472
+061B8A0492FAFC0620F9E000000200BAFF7905EA04AF0003000700000521112103112111
+012C044CFBB4720530150452FB3C0536FACA0000000100BAFF7905EA04AF000300001711
+2111BA0530870536FACA0000000200BAFFDD0522044B0003000700002521112103112111
+012C0384FC7C7204684F038AFC04046EFB920000000100BAFFDD0522044B000300001711
+2111BA046823046EFB92000000020006FF04062105240002000500000521110901110123
+048CFA57061B8A0492FAFC0620F9E000000900AB0000068005D50007000C00130022002A
+0032003A004100490000013317110723271105171507272517072326273505321F011407
+062322272635343736012117150721273525211715072127350333161715072735253317
+15072735253317110723271103734D06064D0602373AF83DFCFDFC3D03C82D0230D0590D
+BE472EAF6223B743FD4B01530606FEAD06047501590707FEA706470386723DF8FDB5033B
+F63E021B4D06064D0605D506FEA20606015E9B3F03FE3FEEFE40C73704B5E160BD6417A7
+3F5CB5671BFEED064F06064F06064F06064FFEE88279033EFD042A3C03FE3F047606FEA2
+0606015E00010068FFFB079702E1002200000133321F01363316151407161D0106232135
+3237363B0127343F011727343F0132173604F516D9751527368722671250F93339862E34
+210CA0272A05CC43302E7802E1E856231B6D313417481A6509AE27316C3104040C935A08
+2B64000000010064000006C805D5003F000001331715332001161D01232627262B012207
+15140727262311140F01222F013537331715163B01323F01112207062327353723262723
+220F0123353637362135038B3A060201B801182B02161323392C9670082197886A1E5B25
+02062B050B3E0A371406D356110E07070443C543632214033AC0EF013805D5067DFE1A56
+0D080F2E1865330F02423DFD53651802601C1A06060C65392A02A43D39060C33401B3D12
+0290DADF7D000000001A00AAFFFF0682076B000D0015001D002500430060008C00B700E3
+010E013A0164019001BB01E6020F023B0265026D0275027D02A902D302FD032703530000
+011633323733060726273316333237262736371617060526273637161706032627363716
+170627061514163332363534272627323332373635342623220615141716330613363732
+1F0116140706071617161514042024353437363726272634370117272633320F01373633
+3215140F011716151423222F011716232235370706232235343F01272635343332011727
+26320F013736333215140F011716151423222F011716232235370706232235343F012726
+353433320517272633320F013736333215140F011716151423222F011716232235370706
+232235343F0127263534333213172726320F013736333215140F011716151423222F0117
+16232235370706232235343F012726353433320117272633320F013736333215140F0117
+16151423222F011714232235370706232235343F0127263534333201172726320F013736
+333215140F011716151423222F0117142235370706232235343F01272635343332051727
+34333215073736333215140F011716151423222F011716232235370706232235343F0127
+263534333203172726320F013736333215140F011716151423222F011716232235370706
+232235343F0127263534333205172726320F013736333215140F011716151423222F0117
+16232235370706232235343F012726353433321F012726320F013736333215140F011716
+1423222F0117142322353707062322343F012726353433323717273433320F0137363332
+15140F011716151423222F011716232235370706232235343F0127263534333237172726
+320F013736333215140F011716151423222F0117162235370706232235343F0127263534
+33321326273637161706052627363716170617262736371617060117272633320F013736
+333215140F011716151423222F011716232235370706232235343F012726353433320117
+2726320F013736333215140F011716151423222F0117142235370706232235343F012726
+3534333205172726320F013736333215140F011716151423222F01171622353707062322
+35343F0127263534333201172726320F013736333215140F011716151423222F01171622
+35370706232235343F012726353433320117272633320F013736333215140F0117161514
+23222F011716232235370706232235343F0127263534333203FC080842191905807E0918
+253C077A2A01032B270303FEEB2903032B2803034026020327240202CA7CF7AFAEF87C65
+8B02033C2D417D5D5C8A422D3790151A93843102534C14186F578EFEE4FE6AFEE38F5C76
+15134C4CFDA92906010F1102062804041008302F09100404280601100E052803050E092E
+31070F0501282506021E02062504040E072C2A070C05032304010E0D052403040D08292A
+080E0403662405020E1002062503050D072B29080C06022405010F0C042304030E082A2B
+080F03662506021E02062504040E072C2A070C06022405010E0D052403040D08292A080E
+04FBCB130201070801031401020803181704080201130207060213020306041718030801
+031715030112010416020209041A1805080202160410031502020804191A040902FCBB13
+040708041303020805161604070203130301080704130302070416160508025C14040110
+0103130302070417160507020313030108070313020208051616050802011C1302011001
+031301030804171605080301130301080702130201080516170408016F13020210010314
+01020804171704080201130207060213020306041617030603F715030709010316010408
+051A1906080402140201090703150302080518190408025B16030112010416020208031A
+180508020216030110021501030805191A040902AE25020229230303FEB7260203272501
+01FC2602022923030301602305010E0F01062403050D072A29080D05032404020E0D0523
+04040E082B2C070E04FC5515030112010415030209051918050802031504100315020208
+04191A040902FE5117040112010315020208031A19040802021502011004170102090618
+1A040902043017040112010315020208031A190408020215020110031601030806181905
+0902FC452505020E1003052503050D072B29080C06022404020F0C042403030E082A2B08
+0F0303890126450507432656022A2C0303292D0402292D03032A2CFE1202252602022526
+9E669391D0D09193665520334868666565666848321E01D9701875135EE85118101C4673
+A5A3E6E6A3A5734B1A0F1651E847FD6821390F0F392104110B031516030C0F0221371010
+3721020F0C031615030B1101D11F340D0D341F03100705141303090E021E320F0F321E02
+0E090313140507104B1F340E0E341F03100703151304090E021E320E0E321E020E090413
+15030710011B1E320E0E321E020E0904131403090F031D310E0E311D030F090314130409
+0E029A101C06061C1001070602090B020408020E190707190E020804020B09020607FEE3
+111D0A0A1D11030A05010D0A03060701111E07071E11010706030A0D01050AA8101C0707
+1C1002070602090B020508020F1A08081A0F020805020B090206070118101C06061C1002
+0804030A0A020507010F190808190F010705020A0A030408180F1B07071B0F020805010A
+0B01060701101B08081B10010706010B0A010607A10F1B07071B0F010704010C0A010C01
+0F1B07071B0F010C010A0C01040737121F07071F12010805020C0C02050801121D0A0A1D
+12010805020C0C020508D9121F07071F12010805020B0C02050A03101C09091C10030A05
+020C0B020607FAE002252602022526E202252702032526020225270203252601811D320E
+0E321D030F09031314030A0E041B2F0F0F2F1B040E0A03141303090F0267121E08081E12
+010A04020B0C02060802111D09091D11020806020C0B02040AFB121F07071F1201080503
+0B0C02050901121C0A0A1C12010905020C0B0305080182111E08081E11020807010B0C02
+050901111C09091C11010905020C0B010708FD7F1F340E0E341F031007041413030A0E03
+1D320E0E321D030E0A03131404071000000F0083000006A9070B0017002D003E004F0060
+00710082009300A400B500C600D700E800F9010A00000116151407060F01062B01262726
+35343F0236333233160506151417161F011633323F013635342F0126232207133217161D
+0114070623222F0135343736133217161D0114070623222F0135343736133217161D0114
+070623222F0135343736133217161D0114070623222F0135343736133217161D01140706
+23222F0135343736033217161D0114070623222F0135343736013217161D011407062322
+2F0135343736373217161D0114070623222F0135343736133217161D0114070623222F01
+35343736013217161D0114070623222F0135343736253217161D0114070623222F013534
+3736253217161D0114070623222F0135343736253217161D0114070623222F0135343736
+02442E1A143215607B1634262F3C290C658804033EFEFA4F09050E0E1E2C344833520420
+2030374BF71D0F071A0B0D240D011A0DA81D0F071A0B0D240D011A0D8A1C0F071A0A0E23
+0E011A0D9B1C0F071A0A0E230E011A0D031C0F071A0A0E230E011A0DBD1D0F071A0B0D24
+0D011A0D018A1C0F071A0A0E230E011A0DC21D0F071A0B0D240D011A0DC21D0F071A0B0D
+240D011A0DFD551D0F071A0B0D240D011A0D01121C0F071A0A0E230E011A0D01221D0F07
+1A0B0D240D011A0D01031C0F071A0A0E230E011A0D022037513D4B473C1A73072D38505A
+79390E7A0C805F652222161012232F3264741A1B302632016A1F0C0F061F12072C0E031F
+1408013A1E0C0F071E13082E0C051E140801341F0C0E071E14072E0C051E1408013D1F0C
+0F061F12072C0D041F1408FD021F0C0F061F12072C0E03201308FEFC1F0C0E062012072D
+0D041F130802071E0C0F071E13072D0C051E1507FA1E0C0F071E13072D0C051E15070104
+200C0E061F12082D0D041F1309FB0C1E0C0F071E13082E0C051E1408D31E0C0E071E1407
+2E0C051E1407E71F0C0E062012072C0E03201308CA1F0C0E062012072D0D032013080000
+00010085FFF706A705C90009000013211B01210113090113850257BABB0256FE1CBAFE19
+FE1AB903900239FDC7FE9FFDC80160FEA002380000020085FFF706A705C9000900130000
+13211B01210113090113370309010301210B0121850257BABB0256FE1CBAFE19FE1AB944
+8C0175018098018FFE1A918EFE1803900239FDC7FE9FFDC80160FEA0023815FE4E010CFE
+E601C2011801B7FE49000000000100AA000403EB05D50011000001161714070901371325
+370126353437013603B0390209FD7D01EE5626FE37E0FDDD134102930B05D50236240CFD
+85FDF4E6FE38275E023417171B3F02860A000000000100AA0000068105D9001900001321
+321514070901371325370126353437012111060726271136ED0549401BFDC101E75925FE
+31E7FDEF0F3401E5FBA8014846010105D953221BFDC5FE1BD5FE3D226C0216102D1C3201
+DFFAFC44010143055B390000000300AA0000068205D8000D001900260000011000212000
+113412243332041205100020001134022420040205140623222635343E01321E010682FE
+4AFEC9FECBFE4AC90168BABD0168C8FA71018A0230018AB4FEBCFEACFEBCB4035E6D4E4D
+6E325A5E5A3202ECFEC9FE4B01B50137C20169C1C1FE99C4FEE8FE7701890118B10142AE
+AEFEBEB14E6D6D4E315A30305A0000000003007D0000069F05D1000A0016004300000022
+061514163332363534252206151416333236353426251617161514062322263534373637
+36353424200415141716171610062322261037363726353400212000151405B19467674A
+4968FB9C496868494A6767041719165BB68281B65A516F79FEB1FE20FEB1797D575AB682
+80B75B12137A01C00141014401C001E9674A496767494A67674A496868494A675511165C
+8281B7B781825C51097399B4FDFDB4997204575CFEFCB7B701045C110F8EB6F8015EFEA2
+F8B100000003007D0000069F05C9000A0016004100000134262322061514163236253426
+232206151416333236011400212000353437262726103633321610070607061514042024
+35342726272610363332161007060716061868494A67679467FC4D674A496868494A6704
+23FE40FEBCFEBFFE407A13125BB78082B65A577D79014F01E0014F796F515AB68182B65B
+1619730491496868494A67674A4A67674A496767FE0CF7FEA3015DF7B48D0F125B0102B6
+B6FEFE5B58037297B4FBFBB4987109515C0102B6B6FEFE5C16118B000002007DFFFD04E2
+05C6000B001B000001220615141633323635342637161716100023220010003332170117
+02868FC9C98F8EC9C7BE131298FECED9D7FECE012FDA6054010E9A035FC8908EC9C98E90
+C83B101399FE50FECF013101B001321D01D359000003007D0001079E05C9000800110031
+000001220614163236342600220614163332363401161514002322003534003332171617
+37263534003332001514002322272627023378A9A9F0A9A803B3F2A8A87978A9FCBE26FE
+FFB7B5FEFF00FFB7B9800202DC1C00FFB7B80100FEFFB7B5810B0B02DAA9F0A9A9F0A902
+5AA9F0A9A9F0FDE45464B5FEFF0101B5B70101800302894955B70101FEFFB7B5FEFF810B
+0C000000000E008C0000096B05D5002300350041004D0059006500720080008D009A00A7
+00B500C500D9000001330405041506232227252635343736353427210615141716151407
+050623222734252401353315141716190121111037363D01331503141633323635342623
+220605140623222635343633321627140623222635343633321611140623222635343633
+3216021606070626272636373633320116060706232226272636373616011E010E01272E
+013534373E01041E011514070E01272E0137362436161716060706262726353425361617
+16151406070626272636013E01171E01070E012322272E013534013E013332171E011514
+070E012322272E01353404F709025B0101010F24670607FE693C0C4422FB9C22440C3DFE
+690706662501100100034C90F1E7F957E8F091ABECA5A8EAE9A9A7EA0272835E5D83835D
+5E839F20181721211718202018172121171820D11A0613132E0E0E08130F1105019B0F07
+140F11051B0F0D0713132EFE0C18140E2A16161203082902582C110308291616150708FD
+AF2C2A0707141618290803027F162908031116162B060715FE150E2E1313080F0D1C0511
+0F1305017D0F1B05110F14040C0D1B05120F130405D5119BA4AA99018C122B1319472017
+030317204718142B128C0199AAA499FE764B984B395FFEE2FE1601EA011E5F394B984BFD
+DDA7EAEAA7A6ECECA55D84845D5F8383DE16222216182222FD7318212118172222025726
+2E0D0F0713142D0F0AFDEC132E0F0A0414132D0E0D06016108292C150607220D09091615
+C30E220D080916150807291716060E141618290806151609080DEC07151609080D210807
+15161629FE9412070D0E2F1114040A0F1C0511020C13040A0F1B04121013040C0D1C0511
+001000910000097005D50011001D0025002D00350041004D005900640070007C00880094
+00A600CA00F0000001352315060706151121113427262735231505321615140623222635
+3436042206141632363402220614163236340222061416323634010E01171E01373E0127
+2E01010E01171E01373E01272E0101061617163637362627260605061617163E01262726
+06051E01373E01272E01070E01251E01373E01272E01070E010116363736262726060706
+1601163637362627260607061613353315141716190121111037363D0133152506151417
+16151407052322273637362516323704171617062B012526353437363534273716151407
+06151417051633323726272425271523040506071633323725363534272635343703EC31
+0FCBC3059DC4CA0838FEFAA6E5E6A5A3E7E60100B88181B881BC2E20202E20202E20202E
+20FEF212080D0F2D1312060D0D2D015913070D0E2D1313070E0D2DFDFC07161516290707
+14171629024707141615290E14161529FDAB07291716140707291615160255062A151614
+070729151614FE3E132D0D0F0812132D0F0D08017E132D0D0E0713132D0E0D075686E1D8
+F9C9D8E186FEA91A4B1C3BFE8A0A79410DF8F802431830180242F8F80D41780AFE893B1C
+4B191927361F1F01460F0F4A3E0AECFEC7FE243036FE23FEC7EB0A3E4A0F0F01461F1F36
+2603C2408E403141F1FE65019BF14131408E4048E7A3A4E6E6A4A3E7AD81B88080B80114
+202E20202EFDB5202E20202E02450D2D1312080D0F2D131107FDFF0E2D1313070F0D2C13
+130701311629070714171629070716D515290707152C2808071439171407072915161607
+0828A91516070729161516070729FE750F0713132D0D0E0713132C01E60D0812132D0D0F
+0812132D0120479C373757FEF5FE3601CA010B5737379C47E506122044261A260BA5CBC7
+658B110101118B65C7CBA50B261A26442012061C1222283D161514138806979D70811901
+011981709D970688131415163D282212000200B80000067505D50007000B000013211711
+0721271117112111BE05B00707FA50066E04E005D507FA38060605C868FB0804F8000000
+000300B70000067605D50007000B00220000132117110721271117112111071506070003
+06230623022B0135373217333637363736BD05B30606FA4D066F04E0874C29FEB93E0610
+750D65CD17A2974906333F629B6105D506FA38070705C868FB0804F89E06413AFE46FEBD
+3B2F0102074983A674B3BB78000300B70000067605D50007000B001A0000132117110721
+271117112111050901170901150701230123270901BD05B30606FA4D066F04E0FBF7019B
+01975FFE6801985BFE6504FE69045B0197FE6905D506FA38070705C868FB0804F886FE69
+01975BFE65FE66035B0197FE6C5B019A019B00000001009A00A003A70540001400001333
+01360132373317090115070123012327010035F10501290B011A04060455FED2012E57FE
+D402FED203570131FECF0540FE0B0801DE0F55FE04FE07035301F7FE0B5601F901F50700
+00080064000006F5077600080011001A0023002C0035003E007E00000133062B01263D01
+340133062B01263D01342533062B01263D01341733062B01263D01340133062B01263D01
+340533062B01263D01341733062B01263D013425331715332001161D01232627262B0122
+0715140727262311140F01222F013537331715163B01323F011122070623273537232627
+23220F012335363736213501D6031E5C063A0256021D5C0739021E031E5C063AF7041E5C
+063A021E031D5D063A0126021C5D07395B031E5C063AFDAB3A060201B801182B02161323
+392C9670082197886A1E5B2502062B050B3E0A371406D356110E07070443C54363221403
+3AC0EF01380601CF0A2302380164CF08230337E3CF08240336B9CF08240238013BCE0724
+033769CF07240337EBCF092302399A0570FE504C0C070D29165A2E0D023B36FD9F5A1502
+56181706060A5A332502593633050B2E381937100280C2C6700000000009009800000693
+05D9000B0011001C00330044004D0079007F008F00000114151417213637342321061316
+1721363F0106073637363534352623270607333215140706070607333237363736373635
+342301331406071416172326272627343534360116333237363721160536373217151405
+0717140721263D013735242F0135363316172611343321161533321514070607062B0127
+0116172136370106070607233E0135342635331E011501230F04810B031EFBA01C3F0510
+03F40D0949093A57301D0120390201363B452C512032073A26136C361D1878FD30096201
+880408136D210A6FFEDBB8BDAEB1225CFC3E250345FE661206FE997E0210FDF11104FE65
+3203041255D6C936046721368F56237035430711FC2B060A04430B04FE9806133F0B0603
+5039050A4002B40607374834581604FECD1A121616C76D86014D3752060511561C202F82
+4D28013D483A0D1F2C714C55440329388857716BB192652D5005066578FAF30D0B10974E
+57180A0A0A103D240A0F08071006020255120D040B0914FE012F300218639B9929164804
+013F1A12131901F5321C405B6E44463854242E4A3F000000000200AC0001068105D90007
+000C000009011307212713090103210301039E028F5403FA3406580297FDCD4B04F347FD
+CF05D9FE77FBB40306044C0186FE35FC5F03A1014B000000000100AC0000068105D00009
+000009011317072127130037039B028C570303FA34065A027E1405D0FE77FBBF03030604
+440180060001009F0000068D05D400530000010326353437363332163236333217161514
+070325363332171617161514070E01151416151407060706232227262703161510072336
+1134270306070623222726272635343635342627263534373637363332170378D84A5825
+2658412C423A5C380D5BC701454D48393523234607126C250C0B21394021236A4CCF0970
+5F9207CE4D6923223F38220C0B256C12074623233538484E03080134686F6B4016525272
+2A257F74FEEB651C110C1B4242151539271D11372A1F24251B290C226601165853FEDDE7
+F201354549FEEA66220C291B25231E2C37111D2739151443421B0C111C000000000200AB
+011E06810498003E00450000011617140706070413331707230607222734331633323332
+372427232207161506052403343716171507141732371225161D01140736373235363736
+3534260306151417352605A76F144AB0140100371B132E031198621914103902014D0DFE
+FA070383448609FEB2FD992C4233080D71590D35012AC42A5D643D484E39258701E52004
+9805735719242C1BFEF04A0DAE095D542D4D4DF16D4065F6100301643A09032C17275A0C
+4D01DE1406A00827634D1426542924240D3CFEA50809844903B50000000100AC00E70681
+048D003200002521222635343637363733372326272635343E013B013721222635343637
+3637213721222635343E01332136373633213216150636FD502B3D1C1912133604882F19
+1F1D321AB401FEFF443E1D191416015202FD032B3E1D321A032C08101F2B01762A3EE73E
+2B1B320D0A030C021A1E2C1B321C0A3D2C1A320E0B020A3D2C1B331A16111F3E2C000000
+000100AC00E70681048D0032000013343633213217161721321E01151406232117211617
+1E0115140623211733321E01151407060723173316171E011514062321AC3E2A01762B1E
+1108032C1A311E3E2BFD030201521614191C3D44FEFF01B31B321C1E1930870436131218
+1D3D2BFD5004232C3E1F11161A331B2C3D0A020B0E321A2C3D0A1C321B2C1E1A020C030A
+0D321B2B3E000000000200B200D4067B048D002200440000251334262321220721302322
+1433210721221514332107232215143B0107232215143307262736373337232627363733
+3721222736372137212627363321363721321615030608493021FE9F3617FCD9044F5302
+FF0DFE9E5353013A09DD5353AE133E53531C5D01015D4A04AB5D01015DE402FEC65D0101
+5D016804FD045C01015C032C204201762A3E4BF10315253339924C4B494F4B484C4B491D
+016867010E01686701136867010F01686745023F2DFCB300000200930000044C05CA0021
+0044000037053236351134271136232215112711342322151127353423221D0127353423
+221527363716171517353637161715171134371617111711363716151116171114062325
+13B1031524343A024A494C4C484F4B484C4B491D016867010E01686701126967010F0168
+6744023E2DFCB201734A31200162361603275353FD020D01635252FEC409DF5353AE123F
+53531C5C01015C4B04AC5C01015CE403013B5C01015CFE960402FD5D01015DFCD42141FE
+8A2A3E4B029B0000000200B100D3067B048D002100430000253235342B0127333235342B
+0127213235342321272132342B0121262321220615130703343633211617213217060721
+172116170623211733161706072317331617060703C153533F12AE5353DF09013C5252FE
+9D0D02FE534F04FCD91636FE9E20314A284B3E2A01764121032C5D01015DFD0304016A5C
+01015CFEC503E45C01015CAC044B5C01015CF1494B4C484B4F494B4C92393325FCEB1E03
+4E2D3F02456768010F01676813016768010E01676901000000020093FFF9044C05C20021
+00430000131433323D0137151433323D0137111433323511371114333227113635113426
+230527253216151106071114072627110711060726351107150607262735071506072627
+B1494B4C484B4F484C4C494A023A3424FCEB1E034E2D3E02446768010F01676912016768
+010E0167680102B353533D14AE5353DD09FEC6535301620DFD0153530327173601612130
+4A294B3E2AFE8A4220FCD45C01015C02FC04FE985D01015D013A02E45D01015DAB044A5D
+01015D00001D007D000006AF05D8004F0080008B009500A400B300BA00C100D600DC00E3
+00E700EB00EF00F300F700FB00FF01030107010B011A0126012A012E01320136013A013E
+0000012017161D01140717151407333635363B013215161D010623270607151737161514
+07142B01222F01062322270615062B0122352635343717373525072227353437363B0132
+1F01352737263536253601141733352635363B011707171507151417161D011733373437
+36352737352737161D010717363D013427262B012007060516151407062B012227342116
+170623222734353413332433173635263526230607061525062306151737161735342726
+352605171507263534371615140727350116333637263534370607062B01262726271615
+143716173335260515323F01220705151735251537350515173533153727071537270715
+333533153335071517351715333507153335052707151615163332373637263506250716
+151417323F0126230725071735071517352715173517153735371537353715373503A701
+31923A65061906A02C24083F461A3F59F83EEA465F4C41063345BE4CACAF48D1332C0E38
+4C594CE4FED06C450746042721303C85190C6B23010767FE9A46071F0B0D0D130D201399
+4565597FC4211A210D1F191F0647E0807026FEAD691401712E02385A064E2401CFCB0625
+604243EB0601181866204607141C34F9FC22110E342E5F3FF165CB1902650E33267B4528
+31FEF52DD6D92B011C241C4B7438BF0C072D16101419060901870F03190D18FE96120124
+1AFED619CC1B0247170373201419A51973194D20FDF9720745060E13469B2213BA030F12
+E332150C3E061F5FFDA3031D19197019CC1B0F19141A05D8C16C544572665E06352E3E3D
+397C3522182D076C2912640D122C263E76765D636363195770432D2B0D0D64129507380D
+1B4270703E06575D6FD8E6611DFE78767550703832132C8E44A80C5E1E382C180D1A5E42
+244BBB9C122B140B2231AE18525B2BD2652AF13BD00D320B0D9B9B570A51979B030250FE
+128205080A49263F09677013EB6F25190B0512770D5E195341240D079F320C39692D356E
+300832A2FE86C70EBF0A0C416926AE4916595E505D44139B25885C3F3F5C4F57430D2C05
+2C05310A2F0F32053131082F063D023B06373737373D3305320E31380731317B05051339
+3038684E1D251E625C44682C0F29683F1205CC3106374932063121310732183206320432
+05330A3207310000000100AC0000068105D8002600000132171615140701071417253217
+151423052227263D013437003736353427230522273534373304428F71347CFD6C0B6103
+6E4E0969FCA1A16C1B8B026D140B620BFCB5390B620E05D88D4D4F8A62FDA03E591AD161
+0359C6AE3538188A6C02371B1B165020CC501E400C000000000600AA0000068205D80011
+00240030003C00460058000001200116151005062B012001263D01100136052623200306
+15100516332013363D010225260123222713163B013237130601061D0121351025363713
+062516172126272627131601321716151407062B012227263D013437360389017F010872
+FEC3C2D420FE84FEFA630152B9021EA6A7FED4EB7E0117B2DF0155EA5901FEAD05FED41C
+A88DD1303808322ED48DFEE05FFE57011F1213D20702865F03FE56011F222BD27DFE4952
+381944292E07503914482705D8FE8DAFD6FEB0FD930183AEB21C0153010284AC5DFED9B1
+C2FEC4E28A015A96A60F0159E004FB4859016F1F1DFE92580328495F05100120DB0D0CFE
+92048F91B03B2E3219016C4FFECF50252E47361F5225260549381C0000060064000006C8
+05D8000F001D0029004E006C008D0000013E013534273637161514060726353403262322
+060726273633321617060114161706072E01353437160106232227262707060706232227
+163332363736353427371633323717061514171E01333201161716151407331617161115
+2E012306072736353427353637363534260126353437363B0127262712250E0115141716
+1F010615141707262B0122232206043844480124240279550A0E3F4C075B3E2115577407
+854A19FE285B460310686F022A03C16DA62E32A45C013D775C607C80555037B83A2F1B45
+22201F1D401A373FA04550FEA6A25D1045046978C30DD270B782460140B6543518FB8604
+796DB412022C02110114B1222665BF0142024071A60E030480B20191288B410C0C0E0513
+125FC32518190E020D23042B161C42053721FEEA4E8F2026222ECB4F100F06FDB2530624
+AA0258452F4B2841615D644C502A18172746436159723D05A043D934346D6F0A4382FEFF
+0A9DB60A9328070746194B1F9C57591A8EFC46181995A176026289010E7068B427554498
+27521D3C090A24889300000000170064FFFC04F605D10007001D0023002B003F0056006D
+008300A200AD00B200B700BC00C100C900D000D500DA00DF00E500ED00F4012300000106
+151433323726172207062322273727363332171617060726272435340106072326370316
+333235342726131506232227352635363716170615140407232627152735242736371617
+061514041514072736353427360315273524273637161706151417060417060727363534
+072427363716170615140417060726273635342715271315273524353637333217071706
+232227262322151404170607262724273601141E0133263437220E010516173726271617
+372627161737262716073726271415140717353427060717363534051736370607173637
+0607173637061F013534370617372635343506153F012627061514171527352623220720
+273625161716333526272E0135343E01321E011514060706073314231536370417062126
+23220357040B0C190A4F0708423719165B6C233E0B0DCC0D028D469D0112FE885F1F0F01
+56681B0D0A0522EF0B1A2203AE04402E2C3D0136020F1A744AFEE80402803456AE01B670
+31450201514AFE930305714D69CE010A027602059668A3FDFEF30501704849A302150304
+AE213AAFBD4A4A4AFE810DCD083D346D5C1718384208072A02D20607AE3F6F0107020CFE
+761221120F0F11221201BA742C1B609773262A5F7E5011313E8135013D2767163D3E3234
+3C2BFD131B2D735B2C2A2673641431115054103E334A403D1627683C343201E54A2D4823
+2AFEF55954015F175902010302141717292A29171614030301015818015E5459FEF52A24
+4404200804090A143F02180517193E02047D3E201109142A30FC74223C482303A60B0805
+0909FC2D381A38291E3631180D06151529366638AD5A0D5C2B48442013091A272A3E4A2E
+0E0B111D05051701998C0D892662351614070F1D020234435545201B271A27A42160391E
+0C07212C284D5445150F0B1E2A211D850C02047F087D15717E043D18170518022F2B2966
+5B14100F1C341F026612201121422211203C4030263915633F22562B8047136F4D934B08
+7E61110F843F0B0C7D62893919655C0D50263040116B223F632A89134780458908064A8E
+588D0B3F840F11657D041939890D0D5CABCE06C2340CA55C06361E011801020A27161527
+1616271516270A020101161E36065CA50D000000000200AA0000054E05D9000800280000
+0126270607161736350326273637161715140733323711262B02111417213635112B0122
+0711163303790279790208737BC5770C03CACA0383A3B5AEA9B306A463FEA663A806B3A9
+AEB504DEB10202B18E71589FFEF165B8F30202F30EB75863FEF736FE0CB5AEAEB501F436
+01096300000300AAFFFD048805D900030020002C00000115333527353315331523153305
+15211117152703230327351711213521352335133311213521352315211521022DCAB7AB
+7D7D090194FE638F8801B1018686FE6B019676A447010CFEF447FEF5010B05403C3C3366
+66A25801AFFDE88B9C85FEEE01BC869B820171B058A2FCCF01BB476363470000000200AA
+0000059B074A000700200000011133323610262301112132161514062B01113733090123
+0311231103230901330328D1747F7F74FE8A0176CED4D4CED1DADCFE6701AEDBEFA6FEDB
+01B7FE6EDC06A7FDD890010890FC04049FDFD8D9DEFECDEDFE42FE280106FEFA0117FEE9
+01E101B5000100AA000003B205D7001F0000013317153317150723152117150721110723
+271121273537213523273537333501D7AB06A50505A501240606FEDC06AB06FEDE050501
+22A30505A305D7059B06940671069805FC820505037E059806710694069B0000000100AA
+FFFD068205D5002B00000121171507231121353733171107232735211133171507212735
+37331121150723271137331715211123273502BB01B60606A0023B066A06066A06FDC5A0
+0606FE4A0606AAFDC4067306067306023CAA0605D5067706FDD1A10606FE4906069EFDC8
+066A06066A0602389E060601B70606A1022F0677000200B20000067B05D8001B002C0000
+013332172327200306151005163325150607062B01200326351025360133321733150716
+152707233537273533039C15DDD206EFFEA9D15E0156889C0101A08A51361CFE91EE8401
+86AC027F03063ED1A841B1A90342ACD505D89236FECA9EB9FE92D64732066B1A0B013EC0
+E901AAEE59FE33C9037EBB117C7C03C97E030000000400AA0000068305D90016004F0062
+0073000001163332371633323735331715140F0122270623222734173316173215033324
+113427351611151007060715163B0115062B012207272322273533323735272627263510
+3F011506151005350335373225150607061514171523262726351025363334251617161D
+01140706073437363D01102502EA1B402E21252C42150502451E2C23212D5110B2023222
+080A0201246EDEE04C2F50A51A7548811645449038883C7956587D2463C7217501261203
+23FF005F418692029E5D26010C7923027B8482B0A6591F365CFED605D94B303044072805
+3B1B042C2C652287400B05FC20E40170C2CF03D7FEEB24FEF1DD42160528052163631C05
+2A0340724AB1B10101E61F05C0E2FEA7F502032616A92A064563CCEFE9D6024AE96B6701
+0CCD4604021E70B7D82FD4B651060752AFBF02016DF40000000300AA0000050505D9005B
+0066006E00000132170F0116171615140717231532373635342737331611100326232215
+1417161514150623062322272627151415141714232235363D010615062B012227343635
+34232207021134373317061514171617352335263534372F013603141733363534270607
+06250615141736353402D84252130F7F3338CD0178798E877D1505EA95784F38781E0D2A
+0C092C063B5E50686F509A073906290E962E52749AE405157DD63F7977CCEE181057CE87
+04461D593328017022419005D94B0F7C2E505155C7624B78819DC6B07213A5FEFEFEE0FE
+C9AE2D1C93262A02033B0222EE3196030446713B3C744D925DBF233B40A4222BAD012101
+4DE9A61379AEFBA32F12784B5CCCBE677C1248FDFF924A698B537E194A3FA2736389663D
+A8980000000100AB0000068105D700320000013217161514071707232706232227150123
+26273601363316333237270723262713041507161735363D013427262B0122073603E8ED
+D1967DC28C03B9A5D9AA8FFEFC03CC041A01591807719EBF97D96C06BB09E9011B7EE61D
+42FB8977256278AA05D7BD9BD7C98A9483AA6E5803FE318D071901981D5568C673740C01
+020E059FAF0E025A7C24FE6545378F00000500AA0000068205D8000B00120016001A0021
+0000131000212000111000212000131417010306001316171B0136370901363534002711
+AA01B60136013701B5FE4BFEC9FECAFE4A987901AA02C4FEA3ADB0C0025FCDAAFE8901BB
+71FEA1D302EA013701B7FE49FEC9FECAFE4C01B40136E57801F501C204FEA3FD62B10602
+68FD9608A401B6FE9770F5F9015D04FE42000000000400AA0000068205D80012001E0028
+0034000001151E01333236351000212000033E0133321605140623222635343633321605
+34262206151416323625100021200011100021200003960AC59092C9FE62FEE4FEDEFE7B
+1418B1958FC601CA3D262A3C3C2A283BFD453B523A3A523B03E5FE4BFEC9FECAFE4A01B6
+0136013701B502F81A8EC1CF9A01160198FE7BFEC9ACB2C09E293A3A292A3C3C2A2A3C3C
+2A293A3C27FECAFE4C01B40136013701B7FE4900FFFF00AA0000068205D512260F610000
+10270F610000028610070F610000050DFFFF00AA0000068305D412260F61000010270F61
+0001028510070F620000050CFFFF00AA0000068205D512260F61000010270F6200000285
+10070F610000050DFFFF00AA0000068205D512260F61000010270F620000028510070F62
+0000050DFFFF00AA0000068205D512260F62000010270F610000028510070F610000050D
+FFFF00AA0000068205D512260F62000010270F610000028510070F620000050DFFFF00AA
+0000068205D512260F62000010270F620000028510070F610000050DFFFF00AA00000682
+05D512260F62000010270F620000028510070F620000050D000A0087FFEA06A505E1000C
+00400046004C00520058005E0064006A0070000000141716333236342726232207052634
+373336372736371736373536321715161737161707161733161407230607170607270607
+150623273526270726273726270136370306070516173726270136372706072516172526
+2701262705161725060717363705060713363725262707161702F4302F43425E302F4143
+2FFD7F1C1C701B6B540F63527CC2274E28B6894F661155691C701C1C7014715511664F8A
+B627274EB58A51611151681B01FB21240C8E620180291DB7648CFEAF0816CB4C1702F718
+0601121351FD6B140AFEF0164B02B40816CC5211FE7421250C8D63FE7F1D27B8648D0326
+842F2F5E84303030C3274E27B77C505F1050661E701C1C70166F510F605179B9274E27B0
+83505C0B51671D701C1C70176D510B5C5079BA012C130A010D164DAA0A13C64E15FE3E26
+1AAB6082371E220A7F62FE4B1E2A118C56F42622AC677B89120BFEF01E4DA50914C24D1E
+000500AAFF6A07AD066E000A00150021002D003D00000134363332161406232226253436
+321615140623222605100021200011100021200013100021200011100021200013363736
+2017161707262726200706070282513B3A52523A3B510242527453533A3B51FBE6020E01
+740175020CFDF4FE8BFE8CFDF28701BF013C013D01BDFE43FEC3FEC4FE41EC2433B60204
+B63225731D278EFE6C8E281C03FD3B51517652533A3B51513B3A5353D90175020FFDF1FE
+8BFE8CFDF4020C0174FEC4FE4301BD013C013D01C0FE40FD253833B5B53338482C278E8D
+282B0000000500AAFF6A07AD066E000A00150021002D003D000001343633321614062322
+262534363216151406232226051000212000111000212000131000212000111000212000
+133716171620373637170607062027260282513B3A52523A3B510242527453533A3B51FB
+E6020E01740175020CFDF4FE8BFE8CFDF28701BF013C013D01BDFE43FEC3FEC4FE41EC73
+1C288E01948E271D732532B6FDFCB63303FD3B51517652533A3B51513B3A5353D9017502
+0FFDF1FE8BFE8CFDF4020C0174FEC4FE4301BD013C013D01C0FE40FDAA472B278E8E272C
+483833B5B5330000000400AAFF6A07AD066E000A00150021003100000114163332363426
+232206051416333236353426220601100021200011100021200025161716203736372706
+0706202726270282513B3A52523A3B510242513B3A53537452FBE6020E01740175020CFD
+F4FE8BFE8CFDF201732433B60204B63225731D278EFE6C8E281C03FD3A53527651513B3A
+53533A3B5151FEB20175020FFDF1FE8BFE8CFDF4020C5B3833B5B53338482C278E8E272B
+000A00AA0000068205D80007000C00130022002A0032003A004100490058000001331711
+0723271105171507272517072326273505321F0114070623222726353437360121171507
+212735252117150721273503331617150727352533171507273525331711072327110306
+1514171633323736352726232203734E06064E06023939F83DFCFBFD3E03C82D0231D75C
+0DC44830B56525BD46FD4B01530606FEAD060477015A0707FEA606470386723DF8FDB403
+3BF73D021B4E06064E06248219457C203186093F922705D806FEA10606015F9C3E03FF3F
+EEFE40C73704B5E260BD6418A8405CB4681BFEED0650060650060650060650FEE7827903
+3FFD042B3C03FE3E047706FEA10606015F0256477B3F2C72114382419A000000000202DD
+0000068305D70017002B000001200116151001062B012227352437361110252627353437
+17150411100507153332373637363D0110012623037E018B01106AFE74B3B0312F510115
+7D9BFEB2885D952801C9FEAF2B06569EE9521DFEA5A39E05D7FE87ADC6FE78FEFF620F06
+4FB1CA010C0190E05010030B0E3E03C5FE14FE6EE818045398F45D5D09013D0105660000
+000200AA0000045005D80017002B000021200126351001363B0132171504070611100516
+1715140727352411102537352322070607061D011001163303AFFE75FEEF69018CB3B131
+2E50FEEC7E9A014E885D9528FE3701502C06569FE8531C015AA49E0179ADC60188010163
+0F074FB1CBFEF5FE70E14F10040A0E3E03C501ED0191E818035396F55C5E09FEC2FEFC66
+000200AFFF30043A05DB0031003E00000116171615140706071537150717232723353327
+26272635343736372627263D01331514171617333637363D013315140706052306070610
+163332361027260369282485846C8FD8DC018101CACA02936D858524282824858E5B5575
+2674555B8E8524FEF72675555BB7827FB75B5504561A2483BDBC7C640ED1026401CACB62
+D10D657CBCBD83241A192583BC080A825A530707535A820A08BC83255F065459FEFCAAAA
+01045954000200AFFEFF052D05DA000B0023000001220615141633323635342601263534
+003332001007060711211521112311213521112602EEA4E7E7A4A1EAEAFDC9A90150EFEC
+0153A988B40110FEF0B4FEF00110B50527E4A4A3D8D8A3A4E4FCED9DEEEF014CFEB4FE22
+9C7E12FEF87CFEFF01017C0109110000000200AFFFE3052D06BE000B0023000025323635
+342623220615141601161514002322001037363711213521113311211521111602EEA4E7
+E7A4A1EAEA0237A9FEB0EFECFEADA988B4FEF1010FB40110FEF0B596E4A4A3D8D8A3A4E4
+03139DEEEFFEB4014C01DE9C7E1201087C0101FEFF7CFEF711000000000200A2FFE306A5
+05C30009001E000001220610163332361026130623220010001716170121372111071101
+16151402E1A4E7E7A4A1EAEAFBA8F4EBFEAC0159E6E4700169FE8D8C01EE8FFE9A700396
+E4FEB8D8D80148E4FCF1A4013D01DC0155090867015C8EFE148F0175FEA492C1E8000000
+00010153000005D705D8001B00000135323634262322061D012334003332001514073311
+331123112135030D7AAAA97B79AB960102B8BB01026DE39797FC13021301ABF2ABAB7902
+B90104FEFCB9A87B03C5FA28017C9700000101C00000056A05D8001F0000012335333533
+1533152311363332121514061D01233436353426232206151123022A6A6A98B2B26F98B2
+EF8C978D9B6F6E9A98048D97B4B497FE7D6DFEFEBB5AE5790284EE487BA9AA7AFE460000
+000200F80000063205D8000A003100000022061514163332363534271617161406232226
+34373637112111213533112335211121113311211121152311331521112103CD704F4F38
+374F3A3D304C986D6B994C2F3EFEE0FECE9B9B0132012097012001319999FECFFEE0018C
+4F37394E4E3937C212304CD89999D84C3111018CFE4B9702D398FE4A01B6FE4A01B698FD
+2D9701B5000101040000062705D8003C0000251523352335333526272627350727373317
+152715331523161716171107273733171527113637363D01333507273733171527153315
+0607060715331503E297B0B0A57A9601900191989090020201684E67910192979191654D
+6A019001919890900101967AA5AFBBBBBB978B167A96D7548E8C99998C8E540297684F14
+02CA8D8B9A9A8B8DFD37144E6A9601598E8C99998C8E5904D39679178B970000000201EC
+0000053F05D80012001D0000012120171615100706232111211715072127111711213237
+36373427262301F40199012E6420FB3B36FEAA027A0808FCFD0891014682481008A22551
+05D8D04D5FFEF65C11FDAD0882080805C783FE24821A50A43C1000000001005D000006CE
+05DA00240000211000232206151417232635343633201316173637122132161514072336
+353426232200110356FEE2A9812254865DA3920174830805040884017393A25D86552282
+A8FEE202580305C522808084A184BBFCFB312828310305BB84A184808122C4FCFBFDA800
+000200B70000067505D80008002E00000122061016203610262736373E02331522020706
+071617161514002322003534373637262726022335321E011716039593CECE0126CFCD95
+834C5661A1B97BA78315172E2B92FED9D3D0FED8942930181581AB7AB9BA48554D035CCF
+FEDACECE0126CF96053D42B4AE6CFEC86C130F1E2995D2D1FED90127D1D2952A1E0E136C
+01386CAEB4423D00000200C00000066A05DA0013001B0000012627350420251506071116
+171524200535363F01363317110623270212A8AA015B02F80157B0A6A6B0FEA9FD08FEA5
+AAA8987475E97475E904FC1634945A5A972F18FBE2172F985B5B9435150C0D0D04070D0D
+000400E700400645056F0008001D0026003C0000002206141633323634012C0127351604
+3332272635343633321610070E01013236342622061416010C0117152624232217161514
+062322263534373E010542BE84845F5E85FE5EFEC8FE9499FD016C3B820883CD9395CE68
+49F6FDAB5E8585BC8685011D0139016C99FDFE963A850883CD9395CE6849F502B884BE85
+85BEFE0C02282B7C54161A6CA793CFCFFEDA674D4C02B684BE8484BE84027802292B7B54
+151A6CA694CFCF9492674D4D0002011E0000060D05D80013004D0000013E013534272E01
+2322070E011514171E013332133436333216151400151617323717062322263534003534
+26232206151416171E011514070607062322262726353437363736333217323534260294
+4B320E1D712724234B310E1E6F272330DFB4ACDAFEDE04864764417F6F6390011FA4847F
+962E19250920337438383CAD2F161B337537374C4A084D018C1D712723234B320E1E6F27
+23244C3102F0A1C9DDB0BBFE0AB47C03584877796FC701E1C286A59B813C913E62801157
+44732D164B7836383C3C722E15290D1AB80000000002006DFE8F06BE05D8003A00440000
+013216153E013332161D013E01333216111001161723262706073536372711343510270E
+010711231110262B0222060711231134273316173E010111241334262B01220602A83F77
+28C64B3E523083443C64FE830192A82E4AA7AFBF7C092E3A853F971F23010129B3139598
+8E762417B702C40102182D1C041E8F05D8C68077CFA7DBCA7D77E8FEEFFE68FEBF5EC129
+A16507741C57D90357121101190101D9C8FC61039A01416AE2D7FC740441BEBF4FB05DBC
+FC92FDD0FA0152C18BCE0000000200AB006B068105390003002300001321152101213521
+26353400333200151407211521352336373635342622061514171617AB05D6FA2A022DFD
+D30162430101B9BA0103440184FDAF01121156AAF4AA551013010398018F986883B90103
+FEFDB9836898980D1155797AAAAA7A7955110D0000010045FF3C06E805D8003800000114
+161733353317072735232227262703343510270E010711231110262B0222060711231134
+273316173E01333216153E013332161D0113050067595904CBCB0459CB442C08152E3A85
+3F971F23010129B31395988E762417B7453F7728C64B3E5201010F6F7D0176ADAF047678
+4A760316121101190101D9C8FC61039A01416AE2D7FC740441BEBF4FB05DBCC68077CFA7
+DBCAFD84000100A9FFFF068205D800140000011109010709012F0209013F020901213521
+1105EAFD3F013D6CFEC3FE58016A0101A8FEC3016A01013D02C1FE04030002D801FCFD3F
+FEC36C013DFE58016A0101A8013D016A01FEC302C198FD00000200C00000066A05D80029
+0031000001321237363332161514062322270E0107233537361326022322021514150734
+02273532161336373E01011633323726272203536B51196DC379998F8E9B7A2C7E8AA89A
+7A6932403A249A9E8D8493A1282E2D297A01575D82A109079F9805D8FC9E04DDBE6791AB
+85A0D7047601040178100315FE2DC30F0E02FD01F00661DEFEEDC9585B96FC2691C59D13
+000200B00139067B04A20027005100001300333217163236333217163237363332130726
+232207062227262322070623222726232204232711003332171633323736321716333237
+3633321307262322070623222726232207062322272622042327B00145732D0D1870AC38
+36181A72562B297C6D5E3F5F333C5670191C3B375357373819183637FEFE05350144742C
+0E18383756576E171B3839562B297D6D5E3F5F333C5737381A1B3B375456383719186EFE
+FF0535019D010F28478E47474724FEC433B9354C4B4E43474846D56201D9010D27464648
+48464623FEC532B9364D4C4E44474848D561000000010141000005EA05D8001C00000107
+020107001321352102011700133312013700032107211201270003040EF120FEEAA50133
+1BFED801281CFECDA6011620F21F0117A5FECD1B012701FED81D0133A6FEE91F029903FE
+AEFEBF03015F0137AC0136016003FEC0FEAD0153014003FEA0FECAACFEC9FEA103014101
+52000000000500C90000066305D8000F00200024005400640000013637262726220E0115
+141617161721332136373E0135342E012322070607161701112111011126272E0135343E
+01333217353436373637352335333533153315231516171E011D013633321E0115140607
+06071101141E0133323E0135342E0123220E010350010223334A9C9354524A161701578D
+015618164A5153934F4D4A34220201FE3F02F5FCB92A26456C6EC668504C24200D106C6C
+696C6C100D1F254C4F68C66E6C442729FDD6192D17182D18182D18172D1903C703032B1C
+295195505192280E08080E289251509551291C2B0303FDB8FED1012FFE81017F0D1636C4
+6B6CC56A1F02243F1207043646575746360407123F24021F6AC56C6BC436160DFE81047D
+192B19192B19182D17172D00000800E20000064A05D80048004E00520068007C009000A5
+00BB0000012627343E0133321E0115060713032227343E0133321E011506071B01262734
+3E0133321E011506071B012635343E0133321E0115060703012635343E0133321E011506
+230311211101350721271D02213501170336373E0135342E0123220E0115141E01333237
+01170336373E01342E0123220E01141E013332370137131633323E01342E0123220E0114
+1617161701330332373E0135342E0123220E011514161716170137131633323E0135342E
+0123220E01151416171617014D5F0C1D361D1C361C0439EF3453121D351F1C351D022EBD
+2B43021E351B1D351E034326B92E1D361B1E361D0B565C01012B1D351C1E351D0D63A0FC
+A30324B5FE95B702D7FCFF4DE7070712141423141223151424120709013688BB06051113
+132412132314132413070801AD7360050513251315231312241414120807FE9A64301310
+111516221312251313130E0F012968A60B0B1323141522131423131312040303FB025F1C
+331C1C331C4016FE0602BE5D1C321C1C321C2D22FD1403341E301C341A1A341C3618FCCA
+02E42F2A1B331C1C331B5510FD4A0203222B1C331B1B331C5EFE31FDD1022FFEDFE14B3D
+D330A4A401542A020E03040A231314231414231413231401FDF82002F902030A23262413
+132426231401FD131B02D1011423262413132426230A0502FD0A03420A0A231413231414
+231314230A0802FCDA2A01EA0315221413241313241314220B02020000050155FFFE05D6
+05D6001D00210027002D0032000001211533352115231507111715331521353335373311
+232735233521153301352115013735211517110715213527351137211103080115AB010E
+735C5C73FB7F735D01015D730109AA0297FBEE034A52FCDA524903144A01FD7E05D69B9B
+A29096FDB7958FA3A38F9802459790A29BFAFB373703EA835F5F83FD7674808074340221
+02FDDD00000401B60000057605D8003700430051005E0000012635343736372627262735
+36373637363726272635343E0133321E0115140706071617161716171506070607161716
+1514070607012109013533352335231523153315133635342E01220E0115141703210014
+1E01323E01342E0123220602CB1F20080B3C24290101292B4E1C1E1A11162D4E2A294E2D
+15101A1C1D4D2C2A01012A253A0B081F200202011AFC40010F010CACAC76ACACA23C2D4D
+544D2D3FDE028AFE4B1D353A361D1E361C1D34019435393C35110E263F48500450494B2A
+0E0A121D27292B4B2A2A4B2B29271D13090E2A4B49500450483E260F11353C3A360304FE
+750194014E7C6C7C7C6C7CFEB22D492B4E29294E2B4036FEAC05193A351C1C353A351B1B
+00040151000005DB05D800290035003E006F000001363534263534371615140700132126
+3534003D0106070607270726273635342736372E01353437161703363B010615142B0122
+27350317140723223D013613262706151416151407060716151407161737073637363716
+151400151417250201323523363534262706151416151407031E0416467A0801EA2DFC36
+0D018A5A382E9E092C8B1F4E0230481507216836A22560062B451508040607480A1C29D8
+234D191D0B3B2C044A19676123871D69520BFE820C036B27FE1201041F0D4D1F120804E8
+080B152B0E315E68671A1BFEBDFC6F383AA00128400673038E12161E2E50F9C01E1C6D7A
+2013051B6E1B78FEEB3F2E23311E0FFE7023340F1E173102A760263E251B2112100F6163
+2C2CC5C04C18484A0A9004AD1E1E78FEEC7D3634010337017C010A2B0C4F4A4A29132113
+110F000000040130FFFF05FB05D7000D001D0050005B000000141E0133323E01342E0123
+220613141E0133323E0135342E0123220E01011521350726353412373637262726353436
+373637262726343E0133321E011407060716171E01151407060716171612151407272627
+2E0123220607060702BF3A6537396538396637366560101C0F101C10101D0F0E1D10025B
+FBD9530BA59226281E152A554D1B1D1A0F172C4E29284E2D1511191B1E4B5629161E2626
+93A60C5C044045F58081F543410403C1706438386470673636010E101B0F0F1B100F1C10
+101CFABB010101393AA001254E150F1D264B5253972A0E0A131D27544D2A2A4D54271D14
+090E2A9753524B261D10144EFEDBA03A39847D7179838379717D0000000800C900000663
+05D8000F002000240054006400680079008A0000013637262726220E0115141617161721
+332136373E0135342E012322070607161701112111011126272E0135343E013332173534
+36373637352335333533153315231516171E011D013633321E011514060706071101141E
+0133323E0135342E0123220E0101152135372126272E0135343E01333217161706153334
+2736373633321E01151406070607210350010223334A9C9354524A161701578D01561816
+4A5153934F4D4A34220201FE3F02F5FCB92A26456C6EC668504C24200D106C6C696C6C10
+0D1F254C4F68C66E6C442729FDD6192D17182D18182D18172D1901A4FD73CEFEE812113D
+424477403E3D291D02F1021D293D3D417744423D1212FEE903C703032B1C295195505192
+280E08080E289251509551291C2B0303FDB8FED1012FFE81017F0D1636C46B6CC56A1F02
+243F1207043646575746360407123F24021F6AC56C6BC436160DFE81047D192B19192B19
+182D17172DFCB6C8C8CE070C217943427B4321172403020203241721437B424379210C07
+000300E20000064A05D80048004C00500000012627343E0133321E011506071303222734
+3E0133321E011506071B012627343E0133321E011506071B012635343E0133321E011506
+0703012635343E0133321E01150623031121110535211501352115014D5F0C1D361D1C36
+1C0439EF3453121D351F1C351D022EBD2B43021E351B1D351E034326B92E1D361B1E361D
+0B565C01012B1D351C1E351D0D63A0FCA30324FD2902D7FD2903FB025F1C331C1C331C40
+16FE0602BE5D1C321C1C321C2D22FD1403341E301C341A1A341C3618FCCA02E42F2A1B33
+1C1C331B5510FD4A0203222B1C331B1B331C5EFE31FDD1022FCB4E4EFED64F4F00040155
+FFFE05D605D6000300070025002900000135211501352115132115333521152315071117
+1533152135333537331123273523352115330135211504D6FD8002CAFCECFC0115AB010E
+735C5C73FB7F735D01015D730109AA0297FBEE04845E5EFC2F6F6F05239B9BA29096FDB7
+958FA3A38F9802459790A29BFAFB3737000201B60000057605D800340040000001343736
+37262726273536373637363726272635343E0133321E0115140706071617161716171506
+0706071617161514070121012601353335233523152315331502AC20080B3C2429010129
+2B4E1C1E1A11162D4E2A294E2D15101A1C1D4D2C2A01012A253A0B081F200116FC40010F
+190125ACAC76ACAC02023C35110E263F48500450494B2A0E0A121D27292B4B2A2A4B2B29
+271D13090E2A4B49500450483E260F11353C3A36FE6E01943501197C6C7C7C6C7C000000
+0004014C000005E005D80033003F0048004E000001363534263534371E01151407331423
+00132126353400353427062B010623222337072627363534273637363534263534371617
+0715163B01323534372322070315143B01363527220117001333020316251E3A550F2204
+0202182DFC360D01950142750A5A670403306B721B58023063032D146838AA040815452B
+066025731C0A48073E01C9340177064D2D04E617271939162E1E51590D2F0C01FEACFC6F
+383AA0011B710807A79268501C53E5BE1B1A6D680A091C1A2325421B7AFF101E31223040
+FE29181D0F3522024059FEF3FD04035200010130FFFF05FB05D7002E0000052635341237
+3637262726353436373637262726343E0133321E011407060716171E0115140706071617
+1612151407013B0BA59226281E152A554D1B1D1A0F172C4E29284E2D1511191B1E4B5629
+161E262693A60C01393AA001254E150F1D264B5253972A0E0A131D27544D2A2A4D54271D
+14090E2A9753524B261D10144EFEDBA03A39000000010143000005E805D4002300000116
+131217161D0114070623222723151017233536112723070623222F01353437003F010398
+5ED8ED0627A235409A5F2A53D75503262F557FBB4C09BB013B590305D4A7FEECFEEA3955
+5028A76016DD0CFEE5960697011D035885D1492EB7CB0182A5030000000200B900010673
+05D10018003200000132131615323712333217161D011007000723012635343736031514
+17013301363D0134272623200306152334272623220706022ADA741C060D70EBD17A26DD
+FE3D3C06FDA078C751E5D001DB03023E68BD473AFEF8560A064865BDAE6B2505D1FEED50
+18460135D34E500DFEFEE7FDD94202EDB2B6D27C2DFE8F10DBE4FDBC02BBA19726AC701C
+FE41261A4ED1E0B14600000000020158000005D205D40008000D00000901150007260126
+3509040396023CFDE31F0FFE1746023AFE0302010201FE5E05D4FD1A07FD3B220B028056
+0D0296FD67FD64029C021E00000100E40000064705D4003700000132171617140F013336
+3B013217161514070607220323151017152327361135230223222726353437363B013217
+33352627263D013437360397D6650D03783C034A5413EE6017D12847F2650352D0065503
+64F5BF6619F6423309564E03541D3CD74705D4E3343875A03C1CCA423CCD680C06011209
+FEA96D060680014D03FEEBC9443AE9530C1C0347456E510EC968130000030142000105EA
+05D50022003C00420000011601161D011407062B01222723151017233536112307062B01
+22272635373534370037060106151617163B013237333217163B013237363D0134270203
+332627220703977E017F56B522301691622A53D7562A38556916A0511903CE01225F7CFE
+AE510A941629107760B7071F53671389410ACBE68E3F0D0F061005D5E1FE368B8603D14E
+10DA0DFEE89B069701236575AE423F0D03C8D4016749C7FE6F8285BB3509DA4694A7281E
+1FB0CF011FFB70175A520000000100B60000067705D40017000001321716173336373633
+32171615140701230126353437360228CB742A0203235C6C87D17E20D0FDEF06FDCEA8C7
+5405D4EB5D31A26B6CE05349FAE3FD8502B1CDDAD37C2D0000010158000005D205D40008
+0000090116150126013437039601F745FDC40CFDCE6F05D4FD73550DFD1B0802DD0E8A00
+000300E40000064805DC00320060006700000132171615140F01363B0132171615140706
+07220323151017152327361135230223222726353437363B01321726273534373603141F
+0115262B01220F01141716333213363733161716333237363D01342F0123220735363736
+3534272623220701140733352635039BCB681972161F3D29F85C10D22249F1660352D106
+550364F6C06719F74333263D1F631CD847F0A90C6B7609F33D07883D4ED2721016072553
+5A9EA8550CFD3606766B81201ABB3629B85301071C3C1C05DCCE463984A61706D7383AD3
+640C07011409FEA76D060680014F04FEE8CB453AEB520C0670B126CB6913FEB39BCC0C03
+09D443945D2601271B41788685BE2E2B06DE30030903896E4D2CB65710C8FBCE1C600363
+16000000000400D8FFFE065405D4001000210031004D0000013314060714161723262726
+273035343625331406071416132326272627343534360533140607141617232627262735
+3436131E011514060420242635343637330607061416042024363427262702760D9102CC
+070D1DA3300FA501410D9202CD060D1DA2310FA601590D9202CD060D1CA3310FA62CA8BE
+B9FEB1FE94FEB1B9BDA803834B56A7012E014A012FA6564C8305393F9B638279C9A67433
+5A0E7288ED60ED97C5BBFECEFBB24E8B0809B1D15B4FC47DA19AFDD09142720E91ADFE1E
+31B16160B06262B06061B13129454DA898555598A84D4529000100ACFFF602B705D50011
+000001331711140F0123222F01343F013217331102684807C43023D41C04D321635A0405
+D508FAFDA32D04851F8218054004D400000100ACFFF6046F05D5001D0000013317151617
+161514072327363534272627111407232235343733321711025857081BADF07A041E3DE4
+5C19E039F2D417605905D50727363F468A926020315446472A1AFBD6992DA883174004D6
+00010178FF2F05B305D5001E000001051711140723223D01343F013217112511140F0123
+223D01343F0132171102FD02B303C036D5B1275651FDDC96431AD8AA2B595005D5CA04FA
+ED9B2AA4047E16033A040BA9FBDB8938089B077A22044304D3000000000200BCFFF6066F
+05D50018001C000001171114052227343732173311211106072320353437321711171521
+35066B04FEFBE912E96D4F03FCA508F204FEFEEC645858035B05D504FB12D515A48A0E3B
+0295FD5ACF24B17D104004E1CF9C9C00000200B5FFFA032205D9000C0015000013331711
+333633161302052711131124113635342722BB2D0503AA91E3141DFDB3033801A2019577
+05D906FC3FED03FEFFFE57580305D6FBD4FE9D6301310D0C94080000000200AC00000230
+05D9000D001300001333171125171107232711052311131133251123B12906014E020428
+05FEAF023402011D0205D905FE2FA102FB63050501E5A0048AFD99FE7D90017F000200AD
+0000033405D90028002C0000013317113717150607113715060711072327110511072327
+11073534371123073537113733171125110111251102872E05770303777A0179052E05FE
+E0052A058181027F81052A050120FEE0012005D905FED03C028D073CFE8B37870443FED7
+040401118CFEA6040401413C8E063C017B388B41011F0404FEFA86014DFD96FE878B0174
+000100AC0000055005D900480000012330232207232227353635342735363733163B0135
+34273536373316323733161715061D01333237331617150615141715062B01262B021114
+171506072326220723262735363502B6A804B35038180B636302203953B5A783031D3A2D
+8C2D3A1D0383A3B55338210263630B193750B304A483031D3A2D8C2D3A1D038303115A23
+3B3137462D3A1D0383AFB553382102636302213853B5AF83031D3A2D4637313B235AFE52
+B553392002636302203953B5000600840000059C05D90006000D0014001B003B00470000
+010607161737350515173637262701262706071733032307161736370333371617060727
+23111706072627371123072627363717333527363716170F011523153311331133352335
+013B16302F175F02ED5E172F2F17FE862C2F2C2D442D012D432D2C2E2D07E4D00A7A7A0A
+D0E47E6A6968687EE4D00B7A7A0BD0E47E6869686A7E6E747436747403B42D2E2C2D432E
+012E432E2C2E2D016E172F2F175FFC525F172F2F1702F77E696A68687EFE4ED00B79790B
+D001B27E686969697ED6D10B7A7A0BD1739F2EFE8001802E9F000000000C00AC00000681
+05AC00140023002E00360043004D00680077008C009700A600AF00000121321F01373332
+15032127353637350227263D010733321716150207232427351237360515130715333707
+262F01011713262B01220701161317151407062B01260335171333323F01342F01062533
+32171615072327020F011707232603263D01343F01232735371715173315140715161713
+33173527013317152132373317150603062B01150723023D012717110721222F01353437
+0507173335343B01323F0121263D0105060715141F0121110328018B3A1D4D620805ADFE
+A4051252BB102E711770371EB01003FED3049E112C0112CA16CA5F1C711014FD1EF0A03E
+4D1C542C039B129505501724920CB4369C85362402305FE4FD1314097533050564B40F03
+05070316AD14551402640580120374019CC8021C5F027D050501732A24020506C41922C3
+0508AC520805FED67430065802585F5F0508E7162F69FE6B08FDB83D065A1E010E05AC47
+863807FED40505112A050146141604050D80310AFEC611AC0802011A082E1702FE9D0F03
+AD0DC50D05FED18A01179066FEF511FEEF29144D43120B013D050FFEEA671A3945A2816B
+D74F0D0539FECB211528051B012D1A1F071C83293B050526050D0208C60A1AFE015D0803
+ACFED4057421050215FEB11D790501220D03B307FEA50586260D327C0CACAA081C62B301
+14081D61240A552B060115000004009C0020068F05D9000A00230038004D000001331107
+35373311331521052635343F012737132707061514171633323721152122272625060723
+152737153336373635342703371316151401161F01370327372726232207060703271336
+373602D5ABBACA7FABFE1BFDF32C26543EEB183D630717235D0F100196FE1C4B392E058B
+55AFA7D2D2C63A190731CA88F325FCE6A960543F19EA3C63223407073F35CC88F127382F
+01EA019A1A611EFE015CB84D4F484B92246BFEFF24AC141323202C019F211B61930A4997
+95460B371113344801604FFE5D424136049E01929124FEFF6B23AC2801096BFEA14E01A4
+41211B000004009C0020068F05D9001C0035004A005F000001211521353E01373E013534
+2623220607353E01333216151406070E01012635343F0127371327070615141716333237
+21152122272625060723152737153336373635342703371316151401161F013703273727
+262322070607032713363736035D0154FDF140CD1931244A3C2F67594C70307F9A26300E
+8BFD0A2C26543EEB183D630717235D0F100196FE1C4B392E058B55AFA7D2D2C63A190731
+CA88F325FCE6A960543F19EA3C63223407073F35CC88F127382F01D25D55319E1529381A
+283318266E1914635126442D0D6DFEBA4D4F484B92246BFEFF24AC141323202C019F211B
+61930A499795460B371113344801604FFE5D424136049E01929124FEFF6B23AC2801096B
+FEA14E01A441211B0004009C0020068F05D9002800410056006B0000011E011514062322
+2627351E013332363534262B013533323635342623220607353E01333216151406012635
+343F01273713270706151417163332372115212227262506072315273715333637363534
+2703371316151401161F013703273727262322070607032713363736045A0B5FAD9D336C
+464865355E5C564F6F7348474A492960564B6D31819A53FC6A2C26543EEB183D63071723
+5D0F100196FE1C4B392E058B55AFA7D2D2C63A190731CA88F325FCE6A960543F19EA3C63
+223407073F35CC88F127382F02BE02533C5C650E126C1E1232332D325B272627290E1462
+0F0D594B344AFE184D4F484B92246BFEFF24AC141323202C019F211B61930A499795460B
+371113344801604FFE5D424136049E01929124FEFF6B23AC2801096BFEA14E01A441211B
+0005009C0020068F05D90002000D0026003B005000000103330333113315231523352135
+012635343F01273713270706151417163332372115212227262506072315273715333637
+3635342703371316151401161F01370327372726232207060703271336373603B6E6E614
+B179799DFE82FE902C26543EEB183D630717235D0F100196FE1C4B392E058B55AFA7D2D2
+C63A190731CA88F325FCE6A960543F19EA3C63223407073F35CC88F127382F0352FEFF01
+8AFE765F8E8E60FE844D4F484B92246BFEFF24AC141323202C019F211B61930A49979546
+0B371113344801604FFE5D424136049E01929124FEFF6B23AC2801096BFEA14E01A44121
+1B0000000004009C0020068F05D9001D0036004B00600000012115211506363332161514
+0623222627351E0133323635342623220607012635343F01273713270706151417163332
+3721152122272625060723152737153336373635342703371316151401161F0137032737
+2726232207060703271336373602BB01C3FEC50231188BA2A7963268464C5D35525D5D52
+275046FE0D2C26543EEB183D630717235D0F100196FE1C4B392E058B55AFA7D2D2C63A19
+0731CA88F325FCE6A960543F19EA3C63223407073F35CC88F127382F03D05F7001077463
+64720E0F721F12403839400D19FE534D4F484B92246BFEFF24AC141323202C019F211B61
+930A499795460B371113344801604FFE5D424136049E01929124FEFF6B23AC2801096BFE
+A14E01A441211B000005009C0020068F05D900090022003B005000650000012206141633
+3236342613152E01232206070636333216151406232226353436333216012635343F0127
+371327070615141716333237211521222726250607231527371533363736353427033713
+16151401161F0137032737272623220706070327133637360386374444373A4242993D46
+22575C03075D3875878D75858CA992264DFCA52C26543EEB183D630717235D0F100196FE
+1C4B392E058B55AFA7D2D2C63A190731CA88F325FCE6A960543F19EA3C63223407073F35
+CC88F127382F02BC417640407641010E66160E6035072873615F74A5968FAE0CFCFD4D4F
+484B92246BFEFF24AC141323202C019F211B61930A499795460B371113344801604FFE5D
+424136049E01929124FEFF6B23AC2801096BFEA14E01A441211B00000004009C0020068F
+05D90006001F00340049000001211501231321012635343F012737132707061514171633
+323721152122272625060723152737153336373635342703371316151401161F01370327
+372726232207060703271336373602A20202FEF093FEFEA3FE262C26543EEB183D630717
+235D0F100196FE1C4B392E058B55AFA7D2D2C63A190731CA88F325FCE6A960543F19EA3C
+63223407073F35CC88F127382F03BA32FDB9021AFD7B4D4F484B92246BFEFF24AC141323
+202C019F211B61930A499795460B371113344801604FFE5D424136049E01929124FEFF6B
+23AC2801096BFEA14E01A441211B00000003009C0020068F05D90018002D004200003726
+35343F012737132707061514171633323721152122272625060723152737153336373635
+342703371316151401161F013703273727262322070607032713363736C82C26543EEB18
+3D630717235D0F100196FE1C4B392E058B55AFA7D2D2C63A190731CA88F325FCE6A96054
+3F19EA3C63223407073F35CC88F127382FD64D4F484B92246BFEFF24AC141323202C019F
+211B61930A499795460B371113344801604FFE5D424136049E01929124FEFF6B23AC2801
+096BFEA14E01A441211B0000000600AC0000067F05A10010001A00270039004800520000
+0121321F0137331502072135363703262307321F01032427123736011215171407062B01
+2603363705121727020F011723032736373635273533013315213237331403062B011523
+032717110721222F013437032A01863A214A63069D10FEA96105C6230D66692A31C1FEF5
+1B951631035AA602610F287D0EAF18C9FC79AB0270C004030505C90804501A64E402D802
+018A211E03C9181FCC05A85E0505FEDE742F055405A1547D3702FEED1505350901621A05
+5C56FEB69A1301041C2FFE56FEEA1727663A080F013A17701BFEE00D3FFEB610291D015C
+201F80290B3903FEA5731A09FEA417730125B006FEA9058030308200000700AA00000683
+05D9001300250032003C004A005C0065000001332013161D011005062B012003263D0110
+25361715321F011506071521363723072627262301163336132623262322070607051513
+333237342F012205170607141F0133343F013317270107161733353733323F0135230623
+21273505061D01141F01331103891B018BF361FE6FA3B703FE50E853013CBE892633791B
+3A01180A8403534F12151AFD88F209049542171D325F354E0D02819976621A65290EFBCD
+504B0B8B1D031B8E094C8B01F98706810306AC243D6A031622FEC406FDEA416A1AFC05D9
+FE92AECF06FE4FEB4C0186A8A335015FF18393036BCE03161F0308F02C89160CFEDF8B0F
+01017E12797D1FDE03FEF48A2F9D4D3C347B3116E83B4319F82CF1FEE5FB03EC5B0680B1
+0310065F6569270C5B29040124000000000800AA0000068305D9000F0020002F003A0042
+00520060006A000001201316151005062320032635102536011005163B01201336351025
+26232003060121321F0137150607213537262F0123321F010323262736373601161D0106
+2B0103252117072327230207152603273437270133152132371503072307152327252117
+110723222F013603980197ED67FE84A4D1FE5EE75F0188AAFDF901629DAA300168E55CFE
+96A0B8FE7BDF5C025B013A35183A516D1BFEF04D921A1B4D5B1E2D9A03E312771C2C02A3
+89156C649CFCD801149103034E03A6060C9C02564E02FD0601471418AD17A9060687FE8A
+012B0606F55127060105D9FE97B2D4FE58E9590174A2DB01A9EB54FD12FE70D8580159A5
+C5018CE053FEA69F016D45622C03CC230334FE270C4656FEFE7F10D51A20FEA7E2211782
+010959F40331FEEA151A0B0112111C8D31FEEC5F1406FEDC090655EE8C05FEEB05672C31
+000500AA0000068305D900070017001F0041005200000116173237262706012013161510
+050623200326351025360106071633363726011523062B012E0135343734353436373217
+36331E01151415161514060723222723251005163B01201336351025262320030601C202
+B7906157A2AF01D40197ED67FE84A4D1FE5EE75F0188AA01E1A2576190B70202FE2B0376
+B20E8C7A019B879D7F809E879B017A8C0EB27702FD3C01629DAA300168E55CFE96A0B8FE
+7BDF5C02F4CD02CBC204030226FE97B2D4FE58E9590174A2DB01A9EB54FDDD04C2CB02CD
+BFFEF31CBD0FB95007080405749901AAAA0199740504080750B90FBD61FE70D8580159A5
+C5018CE053FEA69F00020131000205FA05D90018002E0000013215060717213217072117
+21161337170605260321220334010623222E013534373637170607141E01323637170602
+9A9901801801130C1004FEED0C01BD0C8D863005FEEE1095FE230C5501F8717B7CE27D40
+212F2819025398A6972A452E05D98EA302E692046506FE72288D08591801AD032485FA68
+3F7DE17D7C723C2ED93C43539853534CA9320000000300960000066005CD0016001A001E
+00000134373637363332171617161514070607062227262726011121112521112102EF13
+141F1B2B2A1C1E151313141F1C541C1E1513FDA705CAFADB0480FB8002E92A1C1E151313
+141F1B2B2A1C1E151313141F1BFD4205CDFA33A504830000000400960000066005CD0016
+002D00310035000001343736373632171617161514070607062322272627260134373637
+363332171617161514070607062227262726011121112521112101B913141F1C541C1E15
+1313141F1B2B2A1C1E1513026C13141F1B2B2A1C1E151313141F1C541C1E1513FC7105CA
+FADB0480FB8001AE2A1C1E151313141F1B2B2A1C1E151313141F1B029C2A1C1E15131314
+1F1B2B2A1C1E151313141F1BFC0C05CDFA33A50483000000000500960000066005CD0016
+002D00440048004C00000134373637363217161716151407060706232227262726013437
+363736333217161716151407060706222726272601343736373633321716171615140706
+07062227262726011121112521112101B913141F1C541C1E151313141F1B2B2A1C1E1513
+013613141F1B2B2A1C1E151313141F1C541C1E1513013613141F1B2B2A1C1E151313141F
+1C541C1E1513FC7105CAFADB0480FB8001AE2A1C1E151313141F1B2B2A1C1E151313141F
+1B01662A1C1E151313141F1B2B2A1C1E151313141F1B01612A1C1E151313141F1B2B2A1C
+1E151313141F1BFC0C05CDFA33A50483000600960000066005CD0016002D0044005B005F
+006300000134373637363217161716151407060706232227262726013437363736333217
+161716151407060706222726272625343736373632171617161514070607062322272627
+260134373637363332171617161514070607062227262726011121112521112101B91314
+1F1C541C1E151313141F1B2B2A1C1E1513026C13141F1B2B2A1C1E151313141F1C541C1E
+1513FD9413141F1C541C1E151313141F1B2B2A1C1E1513026C13141F1B2B2A1C1E151313
+141F1C541C1E1513FC7105CAFADB0480FB80041F2A1C1E151313141F1B2B2A1C1E151313
+141F1BFDBA2A1C1E151313141F1B2B2A1C1E151313141F1B2B2A1C1E151313141F1B2B2A
+1C1E151313141F1B029C2A1C1E151313141F1B2B2A1C1E151313141F1BFC0C05CDFA33A5
+04830000000700960000066005CD0016002D0044005B00720076007A0000013437363736
+321716171615140706070623222726272601343736373633321716171615140706070622
+272627262534373637363217161716151407060706232227262726013437363736333217
+161716151407060706222726272601343736373633321716171615140706070622272627
+26011121112521112101B913141F1C541C1E151313141F1B2B2A1C1E1513026C13141F1B
+2B2A1C1E151313141F1C541C1E1513FD9413141F1C541C1E151313141F1B2B2A1C1E1513
+026C13141F1B2B2A1C1E151313141F1C541C1E1513FECA13141F1B2B2A1C1E151313141F
+1C541C1E1513FDA705CAFADB0480FB80041F2A1C1E151313141F1B2B2A1C1E151313141F
+1BFDBA2A1C1E151313141F1B2B2A1C1E151313141F1B2B2A1C1E151313141F1B2B2A1C1E
+151313141F1B029C2A1C1E151313141F1B2B2A1C1E151313141F1BFEF52A1C1E15131314
+1F1B2B2A1C1E151313141F1BFD4205CDFA33A50483000000000800960000066005CD0017
+002F0046005D0074008B008F009300000134373637363332171617161514070607062322
+272627262534373637363332171617161514070607062322272627261134373637363217
+161716151407060706232227262726013437363736333217161716151407060706222726
+272625343736373632171617161514070607062322272627260134373637363332171617
+1615140706070622272627260111211125211121042413141F1B2B2A1C1E151313141F1B
+2B2A1C1E1513FD9513141F1B2B2A1C1E151313141F1B2B2A1C1E151313141F1C541C1E15
+1313141F1B2B2A1C1E1513026C13141F1B2B2A1C1E151313141F1C541C1E1513FD941314
+1F1C541C1E151313141F1B2B2A1C1E1513026C13141F1B2B2A1C1E151313141F1C541C1E
+1513FC7105CAFADB0480FB8002E92A1C1E151313141F1B2B2A1C1E151313141F1B2B2A1C
+1E151313141F1B2B2A1C1E151313141F1B01932A1C1E151313141F1B2B2A1C1E15131314
+1F1BFD562A1C1E151313141F1B2B2A1C1E151313141F1B2B2A1C1E151313141F1B2B2A1C
+1E151313141F1B03002A1C1E151313141F1B2B2A1C1E151313141F1BFBDA05CDFA33A504
+83000000000300AA0001068205D9000C001B002900000132041210020420240210122401
+141204202412353402242322040204343E0133321E01140E012322260396BC0165CBC5FE
+9BFE7CFE9BC5C90165FE28AE013C0158013CAEB3FEC4A7A8FEC3B10393223C21203C2223
+3C1F213B05D9C1FE98FE7AFE9DC6C6016301860168C1FD14ADFEC5AEAE013BADAC013FAB
+ABFEC1CD423C21213C423D2020000000000400AA0001068205D9000C001B002900360000
+0132041210020420240210122401141204202412353402242322040204343E0133321E01
+140E0123222624321E01140E0123222E0134360396BC0165CBC5FE9BFE7CFE9BC5C90165
+FE28AE013C0158013CAEB3FEC4A7A8FEC3B10393223C21203C22233C1F213BFD3E403C23
+223C21203C222305D9C1FE98FE7AFE9DC6C6016301860168C1FD14ADFEC5AEAE013BADAC
+013FABABFEC1CD423C21213C423D2020DC203D423C21213C423D0000000200AA00010682
+05D9000C001A00000132041210020420240210122401323E01342E0123220E01141E0103
+96BC0165CBC5FE9BFE7CFE9BC5C90165023A1F3C23223C20213C22233B05D9C1FE98FE7A
+FE9DC6C6016301860168C1FC96203D423C21213C423D2000000300AA0001068205D9000C
+001A002700000132041210020420240210122401323E01342E0123220E01141E0124141E
+0133323E01342E0122060396BC0165CBC5FE9BFE7CFE9BC5C90165023A1F3C23223C2021
+3C22233BFCA5223C20213C22233C403B05D9C1FE98FE7AFE9DC6C6016301860168C1FC96
+203D423C21213C423D209F423C21213C423D2020000100AA0000068200C8000300003721
+1521AA05D8FA28C8C8000000000200AA0000068200C80003000700003721152125211521
+AA0260FDA003780260FDA0C8C8C8C800FFFF00AA00000682034D12260F61000010070F61
+00000285FFFF00AA00000682034D12260F61000010070F6200000285FFFF00AA00000682
+034E12260F62000010070F6100000286FFFF00AA00000682034E12260F62000010070F62
+0000028600020158000605D205D90011002A000001363332043332371106232227262322
+072F012327211523153633321716333237110623222423220711230207343C80014EBB46
+483435A7B18BBF323614634B01010E4C3533C2ABA9A14E4B6A66ABFEC380504660029F11
+A30C02620A5F7E09025D35351A08785C15FD0D1C9A1EFDC600010158000605D205D90018
+00000123272115231536333217163332371106232224232207112301A44B01010E4C3533
+C2ABA9A14E4B6A66ABFEC38050466005A435351A08785C15FD0D1C9A1EFDC6000001006A
+000106C105DA001F00000901072737273717371707090127371737170716130901170107
+0127070127010336FEB3B9C6BA2E8A2BB9C5B8014D014DB8C6B82C882C4523FED3FEB3B2
+013FB9FEF2B3B2FEF2B8013D027E0151BBC7BB2C8A2CBAC8BAFEB0014FBBC8BB2D8A2C71
+FE740135FEAFB3FEF0B90140B4B4FEC0B9011000000200C6FFEC066505DB000F00520000
+01141E0133323E0135342E0123220E011315230623222735231523222427262707030507
+301716171617112135213526272E01343E0133321E011406070607152115211136373637
+36372725032706070607060310274826284728294727254828E308252703030707A9FECB
+56100D571D0133570649846D75FE8901771A193E44457D41427C47453D1B1A016DFE9364
+5E844A02035701341E570C11569B7304D62748272748272848272748FAF2010301020260
+58111041014B7C40065831280702D48133080E227C887D44447D887C220E093281FD2F0A
+2231580303407CFEB5411011583123000001010D0000061F05D6002F0000090136373306
+071716170E0107262F0106072736370B011617072627070607222627363F012627331617
+09012709010703E201164B1B5B195D9C3E02063C2B47049D675B276642F4F24265265C68
+9C013F284B04013F9C5D1A5C1B4B0116FDE3200288028A2102BDFED03B3C7549B603402A
+2201044FA838084211310122FEDE3111420838A8480B1D244C03B649753C3B0130028495
+FD3A02C6950000000005007DFFEC03D505DB0007001A002E004F00600000011633323534
+272613150623222735263534371706151404072326032435342515061514041706052736
+353427112713112711242736373233321707170623222726232215140417060535242736
+35342527032E0135343E0133321E011514060701541C0D0B0524F90C1B2303B5A4014101
+43020F1CC5FEE2010EAB022C0304FEED01B6C54D4D4DFE76040DD504034135705F181A39
+4408072D02EF0607FE9601120201FEE34D051518182A16172A18171504A40C09060A0BFB
+94421D40302240521A2F18182F3E774101B7266F632F4426332E5961512F3522312722FE
+B4130301FE81100175138A9005451E19061B0236322F758A103D203D0102216D07012D0B
+2E18192E18182E19182E0B0000030079FFEC06B205DB0004000900370000250901162025
+090116200133321D01142B010106070E0123222E013D0101210115140E01222627262701
+23263D01343B013717331B013337065FFEECFEEC8B0114FD25FEEDFEEC8A01140309D638
+29C2011402302FAD5F5EAB5E0110FD4D01125EACBCAD312F010113CC2039D73533FC8181
+FC34ED033CFCC42626033CFCC42603D12A1928FCC7443E3F47477A42080336FCCA06437B
+47473F3E440339111C0F2F9B9B0143FEBD9B00000002007D000006AE05DB001A00260000
+0136333217161716151407060706232226272E0123220706032712011323032111230321
+03231302D2B89E3632C94B23112B7E4B46309D522139272F4EA3C778E504ED5F7F54FEE2
+8A01FEE3567F5F0587540927A64E51393B8D3A2338B3484C2243FEDF440199FD7CFDA601
+D7FE2901D7FE29025A000000000201290000060105DB000D0035000000141E0133323E01
+342E0123220613153B01323637140407060723263D012624031E01333237333526272E01
+343E01321E011406070602E6325B30325B32345A312F5BBB060396E1ADFE292735022A2B
+05FE0F58C7EB810D0E06413C4E57589DA69E5A584E3904C46459323259645B3030FE2D9C
+BF26E79A9788F5A89A14848F013102E9019B07232B9CAC9E55559EAC9C2B2000000300C2
+FFDD066A05D0003F0047004F000000321F01161737161707161737161707161407170607
+27060717060727060F0106222F0126270726273726270726273726343727363717363727
+363717363F0100200010002000100414062226343632036A582B1A43407E4C40542F21A5
+2510940404941025A5212F54404C7E40431A2B582B1A43407E4C40542F21A52510940404
+941025A5212F54404C7E40431A010DFE94FEFE0102016C0102FEE35B805B5B8005D005BB
+0D1E842D409C323C1F545C45234423465B541F3C339B402E841D0EBA0606BA0E1D842E40
+9B323D1F545B46234423455C541F3C339B402D831D0DBBFEC4FEFDFE95FEFE0102016B75
+805B5B805B000000000F0106FFED062505DD0009000E00130018001D0025002C00310036
+003B00400048004F005B009F000000141E01332634372206051617372627161737262716
+173726271607372627141514071735342706071736353405173637060717363706071736
+37061F0126370617372635343706153F0126270615140522061514163332363534262735
+26272E01343E0133321E0114060706073314231516171617363704170623262207161514
+07060703150623222F0103262726353437262322072227362516173637360356111F120E
+0E112001F36E2A1A5B916E25275A784C10303C7B32013B2662153B3C2F323A28FC731A2A
+6E572927246F601430104C500F3B0132463C3B160126633A322F01011C374C4C37354D4C
+5A03021315152715142616151302030101342903035016014E5055FE28441C0434283401
+0B1719080102332834031F292228FE5550014E155207092805A0221F1220422211763E30
+263814613E21552A7E45136D4C914B087D601110813F0A0C7B6188371A635B0D4F26303E
+106A213E61298613457E4388084B91578B0A3D7B1415647B031A37880E0D5B2B4D35374C
+4C37354D2D5A01020A272A271515272A270A02010159092803048035065BA30C0C14154A
+352809FCD65C161C64031C0928354A1211110CA35B06348C0A092700000F010500000627
+05D3000F001F002F0037004F005F009F00AB00B300BB00CB00D300DB00E300EF00000132
+1E0115140E0123222E0135343E0107262706070615141716333233363726250607161732
+333237363534272627062716151407363726272627262706070607061514171617161736
+3736373635341316171617363736353427262322070605373E0133321617153633323316
+17161514070607171617161514070E012322272306070623222726270623222627263534
+373637262726353437363732333205262726232207060716173617060716171617262506
+073637363726272627262322070615141716173637360706071617263534171617363726
+2726171617363706070607060716171633323736372603961324141424131424141424E1
+4F477F3325081756080963980E01E2060E9963090856170825347F474C02023934346D2F
+3132323130322F02022E3330333131322E03190F064F467D3626081756090B65FDB40122
+773F3E7622A470030474200C233888018A37210C1F76066EA401223A3B40413C3A22A26E
+06781F0B21368A8836230B207304037002251B2E2F31332F2E1B5556545C3C3E22242121
+05FE950905212223223E6B95630B0956160926367C464F060939333339013905093C3E23
+2223D63E3C09052022245A54551A2E2F34332E2E1A560335132415142314142314152413
+D9353967543B26120E2704395A5E5E5A3904270E12273A546739A727282727262829491E
+1C1C1A1A1C1C1E383A39381E1C1D1A1A1D1C1E38393A010C5A5F353965553B27130E2801
+050902B3C0C0B3023A0238141B2E3E65750176633E2D1B1437033AB062636362B03B0437
+141A2D3F637775643F2F1A1438024BA2575A5A57A2202A2A10191D121415144440404414
+1514121D2B380501280F13273A546539355E9D26292826272728D64441191D1214143A1D
+1941441514142E2A219E595B5B599E21000701050000062605D6000B00140021002D0078
+008600940000011417363726273637262706053426150615161736250615141736372E01
+270615142534270607161706071617360126232207060726273637161736372635343F01
+15161514071E011736371617060726272623220716171614070607161706232627060706
+0723262735262706072227363726272634373606141E0133323E01342E0123220625321E
+01140E0123222E01343E0103CE27372C33090333252F30FEDC292C08371501DF01113D03
+032A0123FED7302A2B33030E2E323227FEF738200E092059660202B7A9542C3127A501A4
+27292E0555A8B80102665920060E1D3E1A14393818202232010D42323B465F1920205842
+3F32430D01332220173839143469BC6867BC696BBE6365BD0122539F5B589F56579F585A
+9F0284A3A70F23658DAA6A1C0F70CD4D63014E54764A4B721B195A31566C4C57024D4909
+11A9700D1E6AAA856B250FA7016E410D5602027B7702067719115B3187F40101F487315B
+0D1A03770602777B0202560D401E2366DC642D234A4D0C37422F15228989220114304337
+0C4E4B222C64DC662388CEBD6868BDCEBF67675155A0AE9D58589DAEA0550000000300ED
+005305E8059E00030007000B00000901070103211521130117010159048F2CFB714004B7
+FB4940048F2CFB71059EFEC8A40137FE54AAFE550137A4FEC8000000000300ED005305E8
+059E00030007000B0000011701270115213501070137057C2CFB712C04FBFB4904772CFB
+712C059EA5FEC9A4FEE7AAAAFDABA50138A4000000040064000006C805D40007000D0015
+002500000133011521272300170115213500073215022322033613321E0115140E012322
+2E0135343E01039F070322F9AD0809031B17FD680539FD7C144D34191736193313251514
+2613142415152405D4FA35090905AA9BFB4F1109049DC244FD9B026E3BFD0D1424151424
+1414241415241400000100AA000404F405D8001300000133171501143304151701273500
+353423242F0104D10E15FD8E5B018307FC510E028777FE93100705D81507FDE247530E47
+FD55150702570D474A114700000500AFFEFF075A05DA001E002A0031003D004300000126
+100033321736333200100706071121152111231121112311213521112601220610163332
+3726103726130607112111263716333236102623220716100536102706100158A90150EF
+997D7D9BEC0152A888B40110FEF0B4FE86B4FEF00110B5010FA4E7E7A43F398A8B39D758
+65017A6648393FA0EAEAA0413A8CFED775757402149D01DD014C4646FEB4FE229C7E12FE
+F87CFEFF0101FEFF01017C0109110391E4FEB9D8119501AE9D12FC942D0AFEF801090AA5
+10D80147E4129DFE50386C01477272FEB9000000000500A2FE5B083005C3000B0024002C
+0038003E0000012620061017161736003726011400202726272627261000041701213721
+11211107110116030116171617012103060007161716203610272601323635220603F775
+FEBBE7742E37100137CC1C0285FEB5FE21AA7524866CAA015901CB6F0169FE8D8C01EE01
+8B8FFE9A7095FE9A401B71440169FEEDF70EFED0DE1D34740145EA752EFD8DA1EAA4E303
+2472E4FEB86C2C1ACE01330736FD90E8FEBD9F6C9225659E01DC01551167015C8EFE78FE
+148F0175FEA4920376FEA453631B3F015CFE37CCFED70B3D316CD80148722DFEC9D8A4E0
+000400AFFE8308DF06D90005002D00390045000000021736102701140023222706071121
+152111231121352111262726100033321736171617012137211107110116252206101633
+3237261037260116333236102623220716100392017375750357FEB3F39A7E57640110FE
+F0B4FEF00110B587A90150EF977C809AE56F016AFE8C8C01EE8EFE9A70FB93A4E7E7A43F
+39898B3A0176383FA2EAEAA2413A8D03C8FEB86C6C014772FEEBE7FEBC452C0AFEF87CFE
+FF01017C0109117E9D01DD014C444A060867015C8EFE148F0175FEA492C6E4FEB9D81195
+01AC9F12FD0D10D80148E4129DFE4F00000200AFFEFF06B2075500070028000000262006
+101620360526100033321701213721110711011615140706071121152111231121352111
+260479EAFEBBE7E70145EAFCDFA90150EFC0950168FE8D8C01EE8FFE9A70A988B40110FE
+F0B4FEF00110B50443E4E4FEB9D8D8E89D01DD014C6E015B8EFE148F0175FEA492C2EF9C
+7E12FEF87CFEFF01017C0109110000000002010DFFE305D006F4002B0044000001071617
+16171614070E010706232227262726272634373E01373633321737273717130727251307
+27031707011632373E013736342726272E0122070E010706141716171604284633224422
+2625237D6256605A5A5E3B4422262624835B585D3A3347FE39FE86E13A01CEC08B5D86FE
+3AFD463D7E3D3C5A1A1919172F2A7E7A3F3C591B1918182E280400AA212448535CB45B56
+832A2525273E48535DB35E588226250CAB698A6901445E8BBFFE3239E1FEBD698BFCFC1A
+19195C3D3C803C39322D311919583F3A843C39312A000000000200CFFEA305EE0712003D
+0058000001363217130727251307270316171E0115140607060706071521152115233521
+352135262726272E0135343637363727072737270727130507271737170717220706070E
+0115141617161716323736373E013534262726272602EE347036B3E23901CEC08C5DB32E
+2845474745405A2D3C0113FEED96FEED0113383156444547464627311FFE39FE545D8CC0
+01CE39E254FE3AFE8A47353E2B2E31312E2F3A398A353E2B2E31312E2F3A3904870C0C01
+9E5C8ABFFE323AE2FE611D2845AB625FAB454028140AB896F0F096B80915254345AB5F62
+A947281E48698A6ACBE23A01CEBF8A5CCB698A6AD3181C2B2E774241772E2F1818181C2B
+2E774142772E2F181800000000020180FFE3053406F4002B004600000111211521151617
+16171E011514060706070623222726272E01353436373637363735213521110727090107
+03323736373E0135342627262726220706070E011514161716171603A50113FEED3C2D5A
+404547474544565262664E5A404547474544563138FEED0113AC6B016201626AF843393A
+2F2E31312E2B3E358A393A2F2E31312E2B3E3505D5FEE796910A14284045AB5F62AB4543
+252323284045AB625FAB454325150991960119AD6B0161FE9F6AFB5018182F2E77424177
+2E2B1C1818182F2E774142772E2B1C1800020009011006A104C4002B0046000001231123
+1123060706070E012322262726272635343736373E013332161716171617331133113327
+3709012725141716171E0133323637363736342726272E01232206070607060582DC9655
+0A14284045AB5F62AB4543252323284045AB625FAB45432515095596DCAD6B0161FE9F6A
+FBC918182F2E774241772E2B1C1818182F2E774142772E2B1C18029FFEED01133C2D5A40
+4547474544565262664E5A4045474745445631380113FEEDAC6BFE9EFE9E6AF843393A2F
+2E31312E2B3E358A393A2F2E31312E2B3E3500000002017F0110053504C5000B0017001F
+400F1512030F120918191212060C12001810DCECD4ECC4310010D4ECD4EC300134003332
+00151400232200371416333236353426232206017F0117C4C40117FEE9C4C4FEE999BD85
+85BDBD8585BD02EBC40116FEEAC4C5FEEA0116C285BDBD8586BDBD000001017F01100535
+04C5000B0013400703090C0D06000C10DCD4CC310010D4C4300134003332001514002322
+00017F0117C4C40117FEE9C4C4FEE902EBC40116FEEAC4C5FEEA0116000201FA018D04BA
+044B000B0017002B400F156B030F6B091819126B060C6B001810DCECD44BB0105458B900
+06FFC03859ECC4310010D4ECD4EC30013436333216151406232226371416333236353426
+23220601FACF9191CFCF9191CF98755353757553537502EC92CDCD9291CECE9053757553
+5376760000040164018D0550044B001300210029003700654BB00B5258401F03070D111D
+2A192E081B2C0F2622050428240A6B332C6B28246B1B146B003810D4ECD4ECD4ECD4EC11
+12173911121739310040152622171F05031F0F17111F366B070330176B0D113810D43CEC
+32D43CEC3211123911123911123939305901343633321736333216151406232227062322
+263714163332332635343726232206250615141736353437161514073233323635342623
+220164CF915244445291CFCF915244445291CF98755306053F3E05055375015E3232325A
+3E3F0506537575530502EC92CD2020CD9291CE2121CE90537558717057017632384D4C38
+384C4D7B577071587553537600050054015A0660047A0003001D00380052006D00000133
+112300220706070E0115141617161716323736373E0135342627262F01321716171E0115
+140607060706222726272E013534363736373604220706070E0115141617161716323736
+373E0135342627262F01321716171E0115140607060706222726272E0135343637363736
+030F9696021D522329181D1E1F1C1D24235223241D1D1E201B1D244C4B3A432E32353532
+31403D933A432E3235353231403DFD1F522329181D1E1F1C1D24235223241D1D1E201B1D
+244C4B3A432E3235353231403D933A432E3235353231403D047AFCE0025A0F121A1F4629
+284A1B1C100F0F101C1E4728294B1A1C10A51A1E2E327F49467F32311B1A1A1E2E327F46
+497F32311B1A960F121A1F4629284A1B1C100F0F101C1E4728294B1A1C10A51A1E2E327F
+49467F32311B1A1A1E2E327F46497F32311B1A000003000A018D06AA044A00370051006B
+0000013E013736373633321716171E0115140607060706222726272E0127210E01070607
+06222726272E013534363736373633321716171E011724220706070E0115141617161716
+323736373E0135342627262724220706070E0115141617161716323736373E0135342627
+262703F707233631403D484B3A432E3235353231403D933A432E352506FEC50627323140
+3D933A432E3235353231403D484B3A432E36230702B95223241D1D1E1E1D1D2423522324
+1D1D1E1E1D1D24FBF7522329181D1E1F1C1D24235223241D1D1E201B1D2403351F5B3531
+1B1A1A1E2E327F49467F32311B1A1A1E2E3460181D5D32311B1A1A1E2E327F46497F3231
+1B1A1A1E2E355B1F7F0F101C1F462928471E1C100F0F101C1E472829461F1C100F0F121A
+1F4629284A1B1C100F0F101C1E4728294B1A1C10000200D201E6060E04520005000B0000
+0135250715170125051105250578FCCCDCDCFE8E017203CAFC36FE8E02D78A654DBA4D01
+5E8278FE84788200000201B1005605030596001500290000013736353427262735373523
+15171506070615141F022103263534373637273521150716171615140703735F7652244E
+3AC83A4E2452765FA3FEECA47B61542C580240582C54617B0111B4DF34625C2931A2253D
+3D25A231295C6234DFB4BB013AEA60BE5C4B1944FAFA44194B5CBE60EA000000000200AF
+FEFF052D05DA000700150000002620061016203605261000200010070607112311260479
+EAFEBBE7E70145EAFCDFA9015001DB0153A988B4B4B50443E4E4FEB9D8D8E89D01DD014C
+FEB4FE229C7E12FD7B02861100010159FEFF052C05DA001A000021112311213521111633
+32361026200727362000100706071121150349B5FEF001102834A1E8E8FEBB7E75A801DB
+0150A789B3010FFEFF01017C01B207D80147E46A74A6FEB4FE209A7E12FEF87C000200B0
+FEFF052C05DA00130017000013090211323315222311222311222335323311370902B002
+3E023EFE21878888875B5A8888888856014CFEB4FEB4039F023BFDC5FDE9FEF47CFEFF01
+017C010CA8016F014AFEB600000100B0FEFF052C05DA001F000001371711331137170121
+15210107271121152111231121352111072701213521011D7BFDB3FC7BFEE40189FE7E01
+157AFD0110FEF0B4FEF00110FD7A0115FE7E018904F97AFD0164FE9DFC7AFEE47CFEEB7B
+FDFDAE7CFEFF01017C0252FD7B01157C00030078FF0F065405250009000D001700000115
+210901213521090103112311012117372115230901230654FED3FE3FFE3FFED301A2014C
+014CF1ACFE770104D6D601048EFEB4FEB48E014A7CFE4101BF7CFEB6014A03DBFDA6025A
+FD74D5D57CFEB6014A0000000002018EFF2C04C205AF0007001C00002414163236342622
+02261037363711331125170D010725111617161006022675A67575A63ECF68485DAC0125
+56FE99016756FEDB594668CFDDA67575A676FDD9CE012367471603CEFECEAD94D1D294AE
+FED2164567FEDDCE00010144FEFF045805DA001E00002111231121352111262726351025
+36373617060706151017161706271521150348B4FEF001109C664E01295DAE483BCB6274
+FA57554A6E0110FEFF01017C01334C9875A1012EB93A1007173B859DC4FECDA2380F2513
+FF7C0000000300560008065E046D000F001D0033000013151417162037363D0106070620
+27260020070615141716203736353427371E011511140607062120272E01351134363736
+2120BAABCE024ECEAB2E38F0FD6CED3F039DFDB2CEABABCE024ECEABAB2C73707070E6FE
+C2FEC7E873707070E6013E0139021D9360566868566092221C787820020B685663605668
+685660635659398851FEA24E8839737339884E015E51883973000000000400560008065E
+05CB000D001D002D00450000002007061514171620373635342701151417162037363D01
+06070620272603151417162037363D01060706202726011E01151901140607062120272E
+013519013436373621200481FDB2CEABABCE024ECEABABFB6BABCE024ECEAB2E38F0FD6C
+ED3F2AABCE024ECEAB2E38F0FD6CED3F049773707070E6FEC2FEC7E873707070E6013E01
+3905676856636056686856606356FE7C9360566868566092221C787820FEC19360566868
+566092221C787820035A398851FEA2FEA24E8839737339884E015E015E51883973000000
+000500560008065E046D000B00210031003F005500000106070621202726271621200020
+171617161506070607062027262726373637363703151417162037363D01060706202726
+0020070615141716203736353427371E011511140607062120272E013511343637362120
+05781F38B8FEF1FEEFB63B1EEC01340131FDC00220B63A1F1C021A1F3AB8FDE0B63B1E1D
+01011B2039D9ABCE024ECEAB2E38F0FD6CED3F039DFDB2CEABABCE024ECEABAB2C737070
+70E6FEC2FEC7E873707070E6013E013901641B1C5D5D1E1A6302A35D1D1C190E0E161C1D
+5D5D1E1B180C0F181C1DFED59360566868566092221C787820020B685663605668685660
+635659398851FEA24E8839737339884E015E518839730000000700560008065E05CB0015
+0021002D003B004B005B0073000000201716171615060706070620272627263736373637
+010607062120272627162120170607062120272627162120022007061514171620373635
+342701151417162037363D0106070620272603151417162037363D01060706202726011E
+01151901140607062120272E01351901343637362120024B0220B63A1F1C021A1F3AB8FD
+E0B63B1E1D01011B203903E51F38B8FEF1FEEFB63B1EEC01340131ED1F38B8FEF1FEEFB6
+3B1EEC013401310AFDB2CEABABCE024ECEABABFB6BABCE024ECEAB2E38F0FD6CED3F2AAB
+CE024ECEAB2E38F0FD6CED3F049773707070E6FEC2FEC7E873707070E6013E013905035D
+1D1C190E0E161C1D5D5D1E1B180C0F181C1DFE1C1B1C5D5D1E1A63FC1B1C5D5D1E1A6304
+656856636056686856606356FE7C9360566868566092221C787820FEC193605668685660
+92221C787820035A398851FEA2FEA24E8839737339884E015E015E5188397300000300AF
+FFE3052D06BE000B0020002C000001222635343633321615140613161716151400232200
+103736370301270901150103323635342623220615141602EE40615E43465B5E17B587A9
+FEB0EFECFEADA988B401FEF90101630163FEF75AA4E7E7A4A1EAEA017D5B443E58554142
+5D02BB117E9DEEEFFEB4014C01DE9C7E120167FEFAC7015DFEA3C70105FAF7E4A4A3D8D8
+A3A4E400000300160185066C05140050006A00850000012723222726070614070E010706
+232227262726272634373E01373633321F01163332373E01373626272627262F01262726
+272634373E01373632161716171614070E01070617161F01213217161721172516333237
+3E013736342726272E012322070E01070614171E0101262322070E010706141716171E01
+3332373E013736342726272603CDD673AE1C2A0302090D30241C2B2424241A1517120C0D
+31231D2A23095A615A250E16250303070D0C164E543132191C0F130C0D34202348481A1F
+0D120C091E030522296D52018BE84F6511FD62D5FC0D15141810151D05050C0A0F112C11
+1414151A07060D0A1E013012171C0C151E04050C0A0F0F2B141711151C05060D0A0F0B01
+85CD06080D082917202E0D0B0F0E1915241D4A1E202E0D0B03252703051C07082E131313
+44221414181B1E26421D20310A0B1E181E1C24431E171D070D161A6D5220294BCF790905
+071810111F17120D101006061711112016121C02B5090507190F112115120E0D12050719
+0E122016120E0900000300560121064504B500150064007A0000123236373E0135342627
+2E012206070E01151416171601050623222725070E011514161514060706070622272627
+2E01353436373637363B0132373E02342E0127262B01222726272E013534363736373632
+1716171E011514061514161F012536333217242206070E01151416171E013236373E0135
+34262726FD2E26101110101110262E261011101011100301026D2C6D51DBFE916A965011
+1C1C1628214E21221C1A1E1C1C162821096156661B261818261B625A35352128161C1C1E
+1A1C22214E2128161C1C1150966A016FDB516D2CFAE62E26101110101110262E26101110
+10111001710E0D0E1F13121F0E0D0E0E0D0E1F12131F0E0D016CFC3F57922C3E0E0E0826
+19233C1A15100D0D0E17154123223C1A15100D22091A2810281A09220D10151A3C222341
+15170E0D0D10151A3C231926080E0E3E2C92573F7E0E0D0E1F13121F0E0D0E0E0D0E1F12
+131F0E0D00><0003001600C0066C044F004F006A00850000013307210607062321070607
+061514161716140706070E0122272E01272634373637363F01363736373E01272E012726
+23220F01062322272E01272634373E0137363332171E01171614171637363B0125060706
+070614171E0117163332363736373634272E012726232201363736373634272E01272623
+22060706070614171E011716333203CDD6D5029E11654FE8FE755264321D21090C120D1F
+1A48482320370A0C130C1F19095A544E160C0D0703031D1E082B5A613231232B1C24300D
+0C1212342424242B1C24300D0902062719B173FDB9150F09100D060717181117152A0F0F
+0A0D0607161A1117140106150F09100D06071C131216152A0F0F0A0C05071E1214140E04
+4FCF4B2920526423140F061E17213E261C1E181E0B0A331E22392A1B1E18042422441313
+132E0807160B032714140B0E2D2020442120320E0F0B0D2E20172C050E090654080E0818
+13250F11150806120E0D1216230E12150805FD3A090D081813260F10190505120D0E1213
+280C111905050009004900F4069804E8005A0078009600B400D200FE012D013401480000
+01363726272627262B012227262726272634373637363736333217161716171615140716
+1F012536333217161514070D011615140706232227250706071615140706070607062322
+27262726272635343736373637363B013237360032373637363736353427262726272622
+070607060706151417161716171232373637363736353427262726272622070607060706
+151417161716171222272627262726353437363736373632171617161716151407060706
+070222272627262726353437363736373632171617161716151407060706070527262726
+27263534373635342726272627262207060706070615141716171617163B013217161716
+173736032D012623220705060706070607062B0122070607060706151417161716171632
+373637363736353427263534373625051633323725261407060706222726272634373637
+363217161702490B07070B0919515C432D2D25282213121210281B2F2A302E2C2B22280D
+12062F8E58015DE25C8839081EFE0201FE1E083C855CE2FEA3588E2F061213222429302A
+332729222A0D121210251C312A3043525B17FEEB1C0B0C090A030303030A090C0B1C0B0C
+090A030303030A090C0B1C0B0C090A030303030A090C0B1C0B0C090A030303030A090C32
+321515111309090909131115153215151113090909091311151532151511130909090913
+1115153215151113090909091311150186259527160B100B060D0D1B14261F4A1F201B18
+0F0D0D0D1B14261F25435C641E121707231CBD01ED025F2A5D4FD9FE9194121117141C68
+5843251F26141B0D0D0D0F181B201F4A1F26141B0D0D060B100C0193011FD94F5D2AFDDD
+D9050609091609090605050609091609090602D9080D0E07060A20100D221C2926602622
+271A121010101F24222F271D12093C258B5A530D111F0CCFCF0C250D0B535A8B253C0918
+172F272A1D200E1010111C222535222D2824231B13102009FED204050807070408070506
+0807050404050807070407080506080705023B0405080707040708050608070504040508
+07070408070506080705FD8207080E10111216151211100E080707080E10111215161211
+100E08023807080E10111215161211100E080707080E10111216151211100E085C0F3D07
+0406080E0A180E17211C1B1913100C0C0E1613201C21201C1B1913100C220A0E11081811
+FEF2C2F72F5692431E1E0F0E0A220C1013191B1C20211C2013160E0C0C1013191B1C2117
+0D190A1402025B75562FE12B16090906050506090916090906050506090000030056FFE3
+065E05F00061007500870000010E0115141617161716203736373E013534262726272623
+220706070E01151416171526023534123736373633321716171612151402070607062027
+2E0235343637263534371233321716151407062322070607061514171615140706070623
+221736373637363716171607060706070623222726011617161514070607062322273637
+3635340213030C151314186F011B7A776264615F665F7A788A867C776264614D2C6B726E
+756C8D8C9C9A8E867370736E756E8B8DFEC78A2A4424201C046CB5A9510610242209362A
+1F443F10121622352712104B1828321917032D0612020A131B23201303031B019E3E1610
+150D1E0A1C0A3A111D1E0137061E1B1C3212130B3333316364ED888DE869603433333163
+64ED8D87BC3E986D01109C9D0110776E3C3B3B38726FFEECA198FEF077703A3B3B124256
+302F4D1F100FCDEF01900814383A44402A1F7C736120161B1E092D46281C370C222A3D38
+192608150F3021321D1C0106042016110C312D3524260C0A12363A42340000060056FFE3
+065E05F0000D001A00280042005C00770000012E01272506151416171617161713262726
+22070607133633321713050E010725363736373E01353424321716171E01151406070607
+06222726272E0135343637363713220706070E01151416171E01203736373E0135342627
+26272627321716171612151402070607062027262726023534123736373601A93F270501
+2A08262420311408F3242D2B682B2D24463337383288012A022A3FFE920E0E31202426FE
+E73E1A1B1616161616161B1A3E1A1B1616161616161B39867C77626461626360F201117A
+776264615F665F7A788A9A8E867370736E756E8B8DFECB8E867370736E756C8D8C017749
+5F0FFD1E22325B242016090101A322141313142201830909FE0BFD076749830406162024
+5B3221760B0C1517351F1E3517150C0B0B0C1517351E1F3517150C021533316364ED8D85
+F163616633316364ED888DE869603433643B38726FFEECA198FEF077703A3B3B38726F01
+149C9D0110776E3C3B0000010078002C064105AA002D0000133537273317362502033317
+331523173315231721321716140706232107331523073315230723121324270723379424
+40649292011E35AB7B739456649A5D980108463020203046FEF8985D9A645694737BAB35
+FEE29292644002D72805DAC90D0A0114016A96508250C61A112C111AC650825096016001
+1E0B0CC9DA000005008400DC063004F9000D001400220029002D00000901210136373637
+363217161716170111011615140501210106070607062227262726270111012635340111
+211103F601B8FB5801B807081D242352232B16082F01AEFE5203FE9FFE4604A8FE460607
+1D24235223241D0731FE5301AD03FDF205AC0368012CFED409081C100F0F131909AAFEDE
+028DFEDD1112136BFED3012D08071C100F0F101C07AA0122FD730121131312FDDF041DFB
+E300000401B30000047C05EF005000D000E300F30000013437363F013637363317262726
+2726353437363332171617161F0116173637363736373635342726353437363332171617
+16151407031415141F0116151407171607061D012135342726272635342726012623220F
+01060F01060F0127262F01262726272623220706151417161F0216171615140706232227
+2627262F0126272623220706071617161716171617140706071514171617161716151407
+26272627263F0136272627062322272627262322171617161F0116150721273437363D01
+273635342726353435133435342701071617161716171633323736353427262726070607
+16171633323736353427262F0101B3251711340E2D0202041A291E1422171B2410123011
+4A4B260F0E1207050A050C0501011F1B29371D0D010A01090202040103011603FDDF0509
+25301B1202870327230405010A2305163619092B112D4C1A14110E1108071D0D135F885F
+5E04140504161206032F7334072A1E130C0705030831280D082E3201150F013617183609
+031C7C2F06070E02070207070F1C280E0F1811310904020A07040A5C010101AB010C0D02
+0309050C02FDFE11233A37110401110A0B04020C05066C800F0353260F0B1008040C080B
+7802EB3731071F5D181701012F7E5B233C241C1B20050C1A6FBB5F251510402C1F10863A
+060B0A060624221E3B1A1276521512FED40709181D162458242B7C1989138D89B6122135
+44582650593B02B639446F1E36C21D060F0B0D62276E95320F0C0B060B1F381A33FE6546
+5D0C08130401140607345426031F160A070C162620120C2F3530243F2D200231401B1126
+1106051009336C0F0A17174B0F0B0A051903050D430422503116D6090B9FB73A30333C08
+443A3558492E290607014404071326FE5B142B2D313A0D0C11100909151709057112142F
+413809120A0A12110B06670000000008002B00A9066A056C00060039004C0070007B007F
+0089008D00001316373635342701222726232207062B0122270705132635343F01363736
+373637363332173736333217161507171633323733161514072335062536373637012726
+232207060F01161514073601222F01071407363716151407062322071615140732373633
+321716333237363534270637161514071533363534270536370F01061514171617363534
+05073726D81B140F1003702F6C301D26964A2163532559FEF881060E451C195D7B404322
+24343E992D3B251E0DBECC2C283606E1593EF86DFCBC211E0805014E24111F58EC362214
+2F2C2803AB3419F273533F580F2455813E182214734A3F4B28602E2F34892B32194B322E
+9E303EFCB0530DA25A70301F2B17FEA0315E0701F003271F1F2010FEC70E0510083B6373
+010C12201A2FE85E227C592F1A0D34AB3238191DDB871D1E83B4CF956C25E9256F1D0F01
+741E0EE9356F413D275924090161109D85A354022A0D161210270127472B2D0D0B0C0625
+5F6B6A7E071D728D7D6A4C60D0867CEF5C67C34B1A402F1E14032E383596632824000007
+00B6009A05CB05AF00130019002000280032004C00530000013E0135342F010623140706
+2314071716333236013F010F021325011325011305013332353427010036353427010701
+1633013E0137363332161514070E01070E0107062322263534373E011707011633322705
+25080C023B171E36364916ED08070A1AFC80990D92990D830109027DB8FD67FD841101BD
+020D023F02FDC201A43606FDFB710205110FFD6E0D1F100D0A0E110506130E0E1D110E09
+0E100405142D7F023E0B0A39010140081C0A0508EE174836371C183B020B02F998920D98
+92017A12FD83FD68B8027C010914FDF3380A0C023EFCB636210F11020671FDFA0602EA0D
+150504110D0A0E101F0D0E1405040E100B0D101EF40EFDC20242000700350196068E043E
+00110017001E0025002B003F0046000000342627262F0114071614071615373637360535
+270715170337210901212701213635342721003427211521243436373E013216171E0114
+06070E01222627261707213635342705A30707050AD215333315D20A0507FBA65E5E5EAF
+AF03520258FDA8FCAEAF014902B41923FD06034A32FD5602AAFC6C070807121412070807
+0708071214120708C55002FA231902DE18150907067E211438903814217E0607094BD870
+70D8700168C8FEACFEACC8012C19171B19FEC47018A03C28230F0E10100E0F2328230F0E
+10100E0F6964191B1719000700B6009A05CB05AF00130019002000280032004C00530000
+012E0123220F011615321716153217373635342601271F02270727030125030127170136
+35342B012E012322070117013635012E0127263534363332171E01171E01171615140623
+22272E01130136232207010525091A0A0708ED164936361E173B020CFC6F920D99920DA8
+C611027C0299B8FD83120E023E023F022536210F11FDFB71020506FD170E140504100E09
+0E111D0E0E130605110E0A0D101F12020C01390A0BFDC20509090B023B181C37364817EE
+08050A1CFD180D92980D92D5C60109027CB8FD68FD83EC7F023E0C0A38883606FDFA7102
+06110FFD6D0E1E100D0B100E0405140E0D1F100E0A0D11040515010F020C4202FDC20002
+0058017B060E045B002500470000121027323320250115252E012726220706070E011416
+1716171632373E013725150124212223121407323332052505060706222726272E013436
+37363736321716170525042322238A32080701250217026BFDBF050E120D1E0D0E0B0A0C
+0E080B0E0D1E0D120E050241FD95FDE9FEDB070899170405B1020F01B7FE9C161B1A3E1A
+1B1616161616161B1A3E1A1B160164FE49FDF1B1050402490144606EFEED531C08100806
+06060A091D201F070A0606060810081C53FEED6E01478A596EB918150C0B0B0C1517353E
+3517150C0B0B0C1518B96E0000000001008A01AD060E0429002800000125150124232223
+363427323332250115252627262726220706070E0115141617161716323736373603E802
+26FD95FDECF8070632320607F80214026BFDDA070F0E12112A11120E0F0F0F0F0E12112A
+11120E0F02C51C21FEED6E60E0606EFEED211D110F0E080808080E0F231514230F0E0808
+08080E0F00000001013300C60557050A001C000001321716333237001336333216151407
+0001062322272627263534373601C5271428110D0E0119EF3E87201621FE7EFEB6174748
+0D222E34462B028E40781401C20116480C090E29FE30FDFC24060F8A99272A2718000001
+00ED00B205C5050C001E0000013217163332370037363332171615140700070623222726
+2726353437363301C5271428110D0E0119EF65607F1A0B17FD7D7B2A9832371739484660
+30031A407814019DAF4A080316121BFD1EDE4C1A0C8DB28631202C000000000101030094
+05B10541000B000009010709012709013709011703E701C98EFE38FE378E01C9FE378E01
+C901C98E02EAFE378D01C9FE378D01C901C98DFE3801C98D0000000100AF003F06050596
+000B0000090B04910174FEC9FE8CFE8CFEC90174FE8C013701740174013702EAFE8CFEC9
+0174FE8C0137017401740137FE8C0175FEC9000100F1FFEE059C05DC0042000001321716
+173633321716151407060316171615140F01161514070623222726270603062322272635
+34373637121302272635343736333217363736333217161736373604F80A1011121D110F
+1A1016D0C4518F0C1E2004161A0C1A147880ACDE204C2404330B051BCCE47A2809121310
+0F17090D121C200A36588ECC1805DC10101A331B11151B17E2FEF1C6EF140C1719160C14
+1E10121A9AD0E0FE8A362A1C3D501F0E2A013E010A01229D230A0E1A1A1D110C101EA898
+B8CC18000000000100FC0000060805EA0052000001321716173617161716151407060316
+1716151407060706070623222706070623222726270207062B0122272627062322272635
+3437262726353437363726032635343736333217363736333217161712373605541D1B14
+081A0A200E0E10F1EB9494111E1425020E1820241E080E241B171A5979E6581115021211
+0F021412191D241E0909121882C47A63161710161A30010B17112B0D6A96E7F90C05EA1E
+163A01050C0E0D152810DBFEC7CCA21218311A110211233A18120B1B1C5FBFFEFB871A24
+1F0D0C1E23111B2D030D1818151FB0D4BD010B3D1C1A3120270E19321AC4BA0108DA0C00
+0000000300700000064405D5000B00170023000001112111211121112111211125211121
+11211121112111210321152111231121352111330436FE48FE5601AA01B801AAFEA601BE
+FE42FDA8FE4201BE0258C801BEFE42C8FE4201BEC803C601ABFE55FE48FE5601AA01B850
+FDA8FE4201BE025801BFFD79C8FE4201BEC801BF0000000100700000064405D5000B0000
+01211121112111211121112104220222FDDEFE70FDDE0222019003B2FE70FDDE02220190
+0223000200700000064405D50003000F00000133352337211521112311213521113302E3
+EEEEEF0272FD8EF0FD8E0272F00273EE01F0FD8E0272F0027300000200700000064405D5
+0003000F0000012111212521112111211121112111210293018EFE72018F0222FDDEFE70
+FDDE022201900223018E01FE70FDDE02220190022300000101520000056205D5000B0000
+01211521112311213521113303D20190FE70F0FE700190F00445F0FCAB0355F001900002
+010C0000056C05D5000F001B000001331711211121271123271121112117071123112115
+21113311213504409696FED4FE8E969696012C017296C8DCFED4012CDC012C04A996FE8E
+FD5F96020B960172012C96FA012CFED4DCFD5F02A1DC0003013E0000057605D5000B0017
+002300000111211121112111211121112721112111211121112111210321152111231121
+35211133040EFE98FEE8011801680118C80118FEE8FDF8FEE801180208A00118FEE8C8FE
+E80118C8046D0118FEE8FE84FD5F02A1017C50FDE4FD5F02A1021C0118FE48DCFD5F02A1
+DC0118000000000100700000064405D5004B000001232206070607061507111716171617
+1E013B013534262726272623272107060706070E011D0133323637363736353711272627
+26272E012B011514161716171633172137363736373E0135030F7B64B349422C24321919
+242A4445B3687B4C47435F521B51047C3636525F43494A7B68B345442A24321919242C42
+46B6647B4C47435F521B51FB843636525F43494A02A04B4942604F1B54047C38374F5C46
+474B7A64B647422B25321919252B4249B4647A4B47465C4F1B54FB8438374F6042484C7B
+64B647422B25321919252B4249B464000000000800BBFFE505F905F3000B001100140017
+001A001D0020002300000113210313210B012113032117031321130B0107331F01370307
+33052317012707133723035AE001BFE0E0FE41E0E0FE41E0E001BF3AA6A6014CA6A6A66C
+D8AD6D6C6C6DD9FE7AD86CFEE76D6C6C6DD905F3FE7CFE7DFE7DFE7C01840183018364FE
+E1FEE00120011F011FBB64BBBBFE7DBC63BC011FBCBC0184BB0000010054FFE3066005F0
+00430000013534272635343736321716151407061D013332373633321716140706232227
+262B011514171615140706222726353437363D0123220706232227263437363332171633
+03284C2C36387838362C4C20BA7A467664303030306476467ABA204C2C36387838362C4C
+20BA7A467664303030306476467ABA031C20BA7A467664303030306476467ABA204C2C36
+387838362C4C20BB794676643031313064764679BB204C2C36387838362C4C0000000001
+0056FFE7065E05F00083000001262723060706070E0123222627262726343736373E0133
+32161716171617333637363735262726272E0135343637363736321716171E0115140607
+06070607151617161733363736373E0133321617161716140706070E0123222627262726
+27230607060715161716171E0115140607060706222726272E0135343637363736373526
+0302100AD4020A141D20522E2D52201F121111121F20522D2E5220220F0903D40A101115
+10142A1E212222212028285C282820212222212325170D1511100AD403090F2220522E2D
+52201F121111121F20522D2E52201D140A02D40A1011150D172523212222212028285C28
+2820212222211E2A1410150293111510142A1E212222212028285C282820212222212325
+170D1511100AD5020A141D20522E2D52201F121111121F20522D2E5220220F0903D50A10
+11150D172523212222212028285C282820212222211E2A14101511100AD403090F222052
+2E2D52201F121111121F20522D2E52201D140A02D40A00010053FFE3066105F000830000
+01342627262726272E0135343637363736321716171E0115140607060706070E01153236
+37363736373E0133321617161716140706070E0123222627262726272E01231416171617
+16171E0115140607060706222726272E0135343637363736373E0135220607060706070E
+0123222627262726343736373E0133321617161716171E0103282C240E10180A28282A26
+203A2E72303624262A2A260A1A081429274465210D0C120A2764383A6226241815151824
+26623A3864270A120C0D2961402F210D10190A27292A2624362F722F3624262A29270A19
+100D27293F63270E0C120A2664383A6226211B1616182426623A3D5F260A120614286203
+1C4363220E0C120A2664383A6226201C1616182426623A3D5F260A12061428613F2F210D
+10190A27292A2624362F722F3624262A29270A19100D27294465210D0C120A2764383A62
+2624181515182426623A3864270A120C0D29614029270E10180A28282A26203A2E723036
+24262A2A260A1A0814282800000000010054FFE5066005F2013000000132171617161716
+151407060736373633321716171617161514070E01070623222726272627112126272627
+263534363736373633321716171617161514070607363736333217161716171615140706
+070607062322272627161716151406070607062322272627262726353437363736372111
+363736373633321716171617161514070607060706232227262716171615140706070607
+062227262726272635343736370607062322272627262726353437363736373633321617
+161711211617161716151407060706070623222726272627263534373637060706232227
+262726272634373637363736333217161726272635343736373637363332171617161716
+15140706070607211106070607062322272E012726353437363736373633321716172627
+263534373637363736035A1E171B12140B0A0A0B140B14191C1E181A13140B0A0A0B2819
+191D1E1719140E0A0126110E130B0B1613141A191C1D191A14130B0B0B08091419191C20
+171914130C0A0A0C1316171A1D1C19191409080B1613111D191D181D1A14130B0B0B0B13
+0E11FEDB090E111D171E1D181A13140B0A0A0B14121B171E191C140B130B0B0B0B14121B
+173C171B12140B0B0B0B130B14181D1E171B12140B0A0A0B14131A181D1B34140E09FEDB
+110D16090A0A0B1416171A1B1E191914130C0A0A080A16171A1C1D191A14120C0A0A0C12
+111D191D1C1A19140A080A0A0C13131A191E1B1A1914140B0A0A0C130D1101250A0E1419
+171E1D181A280A0B0B0A14131B171E1D18140B140B0A0A0B14131A1705F20B0C12141A19
+1D1C191A140A080A0A0C12141A191D1F1719280B0A0A0C130D11FEDB0A0E1419171E1D32
+14140B0A0A0B14131A181E1C19140B140B0A0A0B14121B181D1E181B1216090A0A0B140B
+14191C1A3613110D0B0B0A14141A181D1E1719140E0AFEDA120D100E0B0B0B13141A191C
+1D191A14120C0B0B0809131A191C1D1A1914130C0A0A0C1314191A1D1C191A1309080B0B
+0C12141A191D1C191A14130B0B16130D120125090E1716181E1C191A1316090A0A0B1412
+1B171E1D19130C16090A0A0B14121B173C171B13110D0B0B0A140B14181D1E171B12140B
+0B0B0B14131A181D1E171A130E0A0125110D130C0A0A0B28191A1C191D1A14120C0A0A08
+0A141A191C1D191A14120C0B000000010057FFE3065F05F5001B00001332373637361235
+1412171617163322070607060215340227262726579B8D867370736E756C8D8C9C9C8C8D
+6C756E737073868D02EC3B38726F0114A19DFEF0776E3C3B3B3C6E77FEF09DA101146F72
+383B00020057FFE3065F05F5001B0037000001321716171E011534363736373633222726
+272E01351406070607062132373637361235141217161716332207060706021534022726
+27260165655C574A494B474D465B5B66665B5B464D474B494A575CFE8D9B8D867370736E
+756C8D8C9C9C8C8D6C756E737073868D02EC26254A48B36966B14D4827262627484DB166
+69B3484A25263B38726F0114A19DFEF0776E3C3B3B3C6E77FEF09DA101146F72383B0002
+002FFFEC068505F300090013000013250901050113250513010321010309010301212F02
+0D011E011E020DFEA625FE0AFE0A2501D1BFFD9501F4BF01F501F5BF01F4FD9503A58301
+CBFE3583FE61FDE6CACA021A03ECFDB3FE94FDB4016CFE94024C016C000000020056FFE3
+065E05F00009002400000103210103090103012103321716171612151402070607062027
+2627260235341237363736035AACFDD301C2AC01C301C3AC01C2FDD3AC9A8E867370736E
+756E8B8DFECB8E867370736E756C8D8C05EAFDEEFEB8FDEF0148FEB80211014802183B38
+726FFEECA198FEF077703A3B3B38726F01149C9D0110776E3C3B00020030FFED068405F2
+001D00270000002207060706070615141716171617163237363736373635342726272627
+03132101130901130121039D863939303017181817303039398639393030171818173030
+397CBF026BFE0CBFFE0BFE0BBFFE0C026B03E4181A2D32383B42413B38322D1A18181A2D
+32383B41423B38322D1A0226FDB3FE94FDB4016BFE95024C016C0003002FFFEC068505F3
+000900270031000013250901050113250513003217161716171615140706070607062227
+262726272635343736373637130321010309010301212F020D011E011E020DFEA625FE0A
+FE0A25018E863939303017181817303039398639393030171818173030397CBFFD9501F4
+BF01F501F5BF01F4FD9503A58301CBFE3583FE61FDE6CACA021A01DE181A2D32383B4241
+3B38322D1A18181A2D32383B41423B38322D1A0226FDB3FE94FDB4016BFE95024C016C00
+000000030030FFED068405F200090013001D000001132107132707132721130321010309
+0103012103132101130901130121035A600135FA5FFAFA5FFA0135608FFE2F0178900178
+0178900178FE2F8FBF026BFE0CBFFE0BFE0BBFFE0C026B0449FED9B6FEDAB6B60126B601
+FBFE47FEEFFE470111FEEF01B90111028EFDB3FE94FDB4016CFE94024C016C0000000003
+0030FFED068405F200090013001D0000011733071727073727331B012101130901130121
+37032105032505032521035A267C6426646426647C26BF026BFE0CBFFE0BFE0BBFFE0C02
+6BBF73FE8A012F75012F012F75012FFE8A034976497649497649031FFDB3FE94FDB4016C
+FE94024C016CFBFE9DDBFE9DDBDB0163DB0000060030FFED068405F2000200050008000B
+000E001800002501352501370103272521070B01171113210113090113012101E10178FD
+A00178E8017A90E80260FE2F8F018F8FBF026BFE0CBFFE0BFE0BBFFE0C026B990111F3C7
+FEEF4BFDFB01B94BC7C60280FE47C60353FDB3FE94FDB4016CFE94024C016C0000000002
+00320018068605B7000D0017000009011327250127130121131713210103210503010503
+01210686FE3EACA2FEB2FE6AA2ACFE3E022DACA29B019CFD2786FE4F015E86015F015F86
+015EFE4F0371FEB8FDEF34F3FED93402110148021234FE220168FE64FFFE6400FFFF019C
+00FF000100840000063005D5001100000111211125130D01032511211105032D011302BA
+01400196A0FE6A0196A0FE6AFEC0FE6AA00195FE6BA0040001D5FE2AEBFEEBEAEBFEEBEB
+FE2A01D6EB0115EBEA0115000000000200980000061C05D5000500170000010717333727
+05013701113311011709010701112311012702E37878EE7878FE99FE2E7801D2F001D278
+FE2E01D278FE2EF0FE2E7803B9CED0D0CECE010DD0FEF2021BFDE5010ED0FEF3FEF2D001
+0DFDE6021AFEF3D00000000100700000064405D500170000090107011123110127012135
+21013701113311011701211503D401B947FE4664FE464701BAFD8F0272FE454701BA6401
+BA47FE45027202B8FE464701BBFD8E0271FE464701BA6401BB47FE460271FD8F01BA47FE
+456400010040FFE3064C05F0000F0000011309010D0109010B0109012D01090103464F01
+D4FE9D0246FDBA0163FE2C4F4FFE2C0163FDBA0246FE9D01D405F0FDB90164FE2C504FFE
+2C0164FDB90247FE9C01D44F5001D4FE9C0000090054FFE3066005F0000200050008000B
+000E00110014001700270000010503052505010325031303012513250525011305130313
+111325030D0113250B0105132D01030504F5FEDD770244FEDBFEE1019A7BFEE1017777FE
+65012377FDBC0125011FFE667B011F0177779F0184A40187FE79A4FE7C9F9FFE7CA4FE79
+0187A4018404857BFEE0017878FE65012377FDBC0125011FFE667B011F017777019CFEDD
+780245FEDBFEE00306FE79A4FE7CA09FFE7CA4FE790187A401849FA00184A40000000001
+00BBFFE305F905F0000B00000113250901250B0105090105035A70022FFE4101BFFDD170
+70FDD101BFFE41022F05F0FDBCC1FE7DFE7DC1FDBB0245C101830183C10000010054FFE3
+066005F0000F0000011309010D0109010B0109012D010901035A7101B2FEEF01F4FE0C01
+11FE4E7171FE4E0111FE0C01F4FEEF01B205F0FE0B0112FE4E7271FE4E0112FE0B01F5FE
+EE01B2717201B2FEEE0000010054FFE3066005F0000F0000011325030D0113250B010513
+2D010305035AAA017989016CFE9489FE87AAAAFE8789FE94016C89017905F0FE9489FE87
+ABAAFE8789FE94016C890179AAAB0179890000010054FFE3066005F00017000001132503
+25030D01132513250B01051305132D0103050305035A74010F470163EF0156FEAAEFFE9D
+47FEF17474FEF147FE9DEFFEAA0156EF016347010F05F0FEA9EFFE9D47FEF17374FEF147
+FE9DEFFEA90157EF016347010F7473010F470163EF00000100700000064405D5002F0000
+011133111317030117012517052115210507250107011307031123110327130127010527
+252135212537050137010337031E78AA6FAA013A55FEC5019C2EFE6301BEFE4601992EFE
+64013B55FEC7A96FAA78AA6FAAFEC655013AFE652E019AFE4501BEFE632E0199FEC85501
+39A96F041701BEFE4501992EFE66013A55FEC5AB6FAB78AA6FACFEC4550139FE672E0198
+FE4601BCFE662E019BFEC555013AAA6FAA78AB6FA9013955FEC701992E00000100A7FFE3
+060D05F0009B0000013534272635343736321716151407061D0117161737363736373633
+32171617161514070607062B012223220F0116151407171633323B013217161716151407
+0607062322272627262F01060F011514171615140706222726353437363D012627262707
+06070607062322272627263534373637363B013233323F0126353437272623222B012227
+2627263534373637363332171617161F0136373603274B2C36387838362C4C101F180A71
+4127433C341615471E14050E573E4C0C0B0A83640C04050C66820B0A0C4C3E570E05141E
+471516343C4327436E0E1B19104C2C36387838362C4D09081D170E6E4327433C34161547
+1E14050E573E4C0C0B0A84640C05040C64830A0B0C4C3E570E05141E471516343C432745
+6C0B1A1D0803940C8077464E6430313130644E46797E0C060E1706447A49272307183423
+2C16184732243A0713141514073B24324718162C233418072327497E3F081909060F7F79
+464E6430313130644E46797F0F03030D15083F7E492723071834232C16184732243A0714
+161413073A24324718162C23341807232749823B06190B030000000200A7FFE3060D05F0
+001900B5000000220706070E0115141617161716323736373E0135342627262F01353427
+2635343736321716151407061D011716173736373637363332171617161514070607062B
+012223220F0116151407171633323B0132171617161514070607062322272627262F0106
+0F011514171615140706222726353437363D012627262707060706070623222726272635
+34373637363B013233323F0126353437272623222B012227262726353437363736333217
+1617161F01363736036F2A11120E0F0F0F0F0E12112A11120E0F0F0F0F0E12594B2C3638
+7838362C4C101F180A714127433C341615471E14050E573E4C0C0B0A83640C04050C6682
+0B0A0C4C3E570E05141E471516343C4327436E0E1B19104C2C36387838362C4D09081D17
+0E6E4327433C341615471E14050E573E4C0C0B0A84640C05040C64830A0B0C4C3E570E05
+141E471516343C4327456C0B1A1D08035008080E0F231514230F0E080808080E0F231415
+230F0E084C0C8077464E6430313130644E46797E0C060E1706447A492723071834232C16
+184732243A0713141514073B24324718162C233418072327497E3F081909060F7F79464E
+6430313130644E46797F0F03030D15083F7E492723071834232C16184732243A07141614
+13073A24324718162C23341807232749823B06190B03000100A1FFE3061205F000680000
+0117323F0127262307222627263437363736321617161F01353427263437363217161407
+061D013736373E013217161514070E012327220F01171633373216171614070607062227
+2627262F01151417161407062227263437363D010706070E012227263534373E0101B59F
+51212F2F1F56965AA2120B192A6E144E992B4738306A403652A85236406A302F5031934E
+14B10B12A2549E502330301F56965AA2120B192C6C154F40572B4738306A403652AC4E36
+406A30334C2F954E14B20C13A102C40A141C1B12075D482C602C4820065963A2211C3737
+995CCA344F4F34D0568F41371C1CA7675506339A272C485E0A141B1C12075D482C602C4C
+1C06263363A2211C3737995CCA344F4F37CD568F41371C1EA5665606349A262C485E0004
+00A1FFE3061205F0000E009900B100C90000013637363534272622070615141716131716
+333237363332171617161514070607062322272627262F01151417161514070623222726
+353437363D010706070607062322272627263534373637363332171633323F0127262322
+07062322272627263534373637363332171617161F013534272635343736321716151407
+061D01373637363736333217161716151407060706232227262322070506232227262322
+070607061514171617163332373637362516171617163332373637363534272627262322
+07062322035A1C38251E3154311E2538A8123565202512105A465C120B192B6D14163842
+532F3F4A125640365254584E3640561247423151423816146E2A190B125C465A10122520
+653512123365212612105A465A140C1A2A6E14163842532F3F4A1256403652A852364056
+1247423151423816146D2B190B125C465A101226216533FE9844411E1D090A353C3B0705
+0D153E0A0C1F2B46192401DC482419462B1F0C0A3E150D05073B3C350A091D1E4103D363
+4A3251441A2B2B1A4451324AFEB40B2003012835482C27392C4A1E0626306689290A1454
+7C5C606A344F4F3767605C7C54140A278B672F260620482C39272C4934280103200B0B1F
+030128334A2C26392D48200626306689290A14547C5C606A344F4F346A605C7C54140A27
+8B672F26061E4A2C39272C48352801031F801204012222271815211724150419283A554A
+4A553A2819041524172115182722220104000002006E0000064605AD0019007700000022
+0706070E0115141617161716323736373E013534262726273736373633321716171E0115
+140607060706222716171E0115140607060706222726272E01270E010706070622272627
+2E0135343637363706222726272E013534363736373633321716172E0135343637363736
+33321716171E0115140603A2903D3E3334333334333E3D903D3E3334333334333E783E25
+38353637302D292C282D25382F5B1B30212D282C292D3032792F3825301D050525292D30
+32792F38252D282E27262417572F3A232D282C292D30323B3E2F3B29081B2C292D30323B
+3E2F38252D281B040B1A1C30367B49467B36301C1A1A1C30367B46497B36301C13351017
+17142B27673E3A632E2619150517222E633B3D67272B1415151926314E252657272B1415
+1519262E633A3E6B23221504151B242E633A3E67272B141515192C0E423A3E67272B1415
+1519262E633B3D3F00000006006E0000064605AD005C0076008D00A600BD00D60000250E
+0107060706222726272E0135343637363706222726272E01353436373637363332171617
+2E0135343637363736321716171E011514060736373633321716171E0115140607060706
+222716171E0115140607060706222726272E010232171617373635342627262726220706
+070E0115141F01363713262726272627070E011514161716171632373637363703263534
+36372726272623220706070E01151416171617163301171617161716323736373E013534
+262F0106070607061337363736373E0135342627262726232207060F011E011514035A05
+1D3025382F7932302D292C282D21301B5B2F38252D282C29302D3C313A33253E071B282D
+25382F7C2F38252D281B073E2538353637302D292C282D25382F5B1B30212D282C292D30
+32792F3825301D4D903D08070E0D191B19201E481E20191B1903180708432320422F1E1B
+67181C191B19201E481E20191804D6032F2A780807231F241E2019181C191B1920150402
+3823231819201E481E20191B191C18671B1E2F4220F550501520191B191C1819201E241F
+230708782A2FF8254E3126191515142B27673D3B632E2217051519262E633A3E67272E11
+171710350D3F3D3B632E2619151519262E633B3D3F0D35101717142B27673E3A632E2619
+150517222E633B3D67272B1415151926314E03381A0304474714243E1B180E0D0D0E181B
+3E24140C820403FD63060E1E2E1E2C62174224233E1B180E0D0D0E18180901BA16174972
+304304030D0D0E18183E27233E1B180E09FEC24C4D18180E0D0D0E181B3E23244217622C
+1E2E1E0E01240A0A090E181B3E23273E18180E0D0D030443307249170000000A0054FFE3
+066005F00029005400BD00E60111013A0165017F01A901D3000001262707062322262726
+2726343736373E0133321F013637272623220607060706141716171E0133323725060717
+1633323637363736342726272E0123220F01161737363332161716171615140706070E01
+232223012E013437363736373633321617343637363736321716171E01153E0133321716
+171617161514060732161716171615140706070E01231E011514070E0107062322262714
+0607060706222726272E01350E012322272E012726343637222627262726343736373E01
+0126270706070E010726272E012726273E0137363F0126270706070E011516171E023332
+363736370116173736373E0135262726272E0123220607060F0116173736373E01371617
+1617161716170E010706070306071716171E011706070E010706072E0127262F01060717
+16171E0133323E0137363734262726270136372726272E01232206070607060714161716
+1F0136372726272E012736373637363736371E0117161704220706070E01151416171617
+16323736373E01353426272627130607171615140607060706222726272E0135343F0126
+27070615141617161716323736373E01353427031617373635342627262726220706070E
+0115141F013637272635343637363736321716171E01151407023A0602E411090A1A0A08
+06040406080A180C0911E40206CE24141C3416140C0A0A0C1416341C1424031A02067777
+121E3416140C0A0A0C1416341E1209E5060278790710160A0806040406080C180C0705FB
+CA25221110202128292D2B552422212028285C282820212226532B2D2928211C14112027
+374D22230F101012201C5632252011104128292D2E522422212028285C2828202122284F
+2D2C2A284110112223325022230F10101220224D01C114108E0B0607190E0D0B0C130504
+01010909060EB40E0BB8210E1515010A0A2A341D2032150E1301EB0F0A6B6B0D1615010A
+0A1515341D2032160D057514114B4B050A170E0D0B0C0A09050401010B080503A60B0EB4
+0E06070B01010405130C0B0D0E1709060B8E111369130E1532201D342A0A0A0115150E21
+FD8912133D3D0D1632201D3415150A0A0115160D09CD0B0E605F050A0901010405090A0C
+0B0D111608050301775223241D1D1E1E1D1D24235223241D1D1E1E1D1D240316151B020A
+090A0B0C1A0C0B0A090A021B1615380A1516151A193C191A1516150A6317152021151615
+1A193C191A151615033E16160E0F0A090A0B0C1A0C0B0A0B0801029A16161C020A0A0A0A
+0C1A0C0C0A080A021A1614380A1416161A183C1A1A1416160A64181421211616141A1A3C
+181A161614023E17150E0E0A080A0C0C0C0E0C0A0A0C0801222555562A29202110102124
+3352201F121111121F205233261F1010211C2D282D255A2620222325282E322428201E26
+26532B2C292941101021243352201F121111121F205233271E1010412929585424222223
+2528602428202220FE1C0B0DB40D06080A01010405120C0C0D0D1809060A8E111369130E
+14331F1D1B192B1415140E21027812133D3D0D15331F1D1B1916151415150D09CD0C0E5F
+60050B080101040509090C0C0D1016090502FE1D13118E0A0608190D0D0C0C1205040101
+0909060DB40E0AB9210E1415142B191B1D1F33140E1301EB0F0B6B6B0D1515141516191B
+1D1F33150D057513124B4A050B170D0D0C0C0909050401010A090503DF0F101C1F462928
+471E1C100F0F101C1E472829461F1C10FE240602E411080B190A0905050505090A170D08
+11E40206CD25131D3316140C0B0B0C1416331D1325031A02067777121E3316140C0B0B0C
+1416331E1209E506027879070F160A0905050505090C170C070500040056FFE3065E05F0
+00190033004E005E000000220706070E0115141617161716323736373E0135342627262F
+01321716171E0115140607060706222726272E0134363736373613321716171612151402
+0706070620272627260235341237363736170325130D0103251B0105032D01130503977A
+33352B2B2B2B2B2B35337A33352B2B2B2B2B2B357057444D36393F3D3B394A48AA444D36
+393F3D3B394A48539A8E867370736E756E8B8DFECB8E867370736E756C8D8C9C9DFE7FA3
+FE7D0183A301819D9D0181A30183FE7DA3FE7F04131618282E683C3B682E281816161828
+2E683B3C682E2818861F22363896544E963B391F1F1F22363896A2963B391F1F016D3B38
+726FFEECA198FEF077703A3B3B38726F01149C9D0110776E3C3B08FE7DA3FE7F9E9DFE7F
+A3FE7D0183A301819D9E0181A300000700A1FFE3061205F000080093009C00A700B200C1
+00D000000111220706151417161317163332373633321716171615140706070623222726
+27262F01151417161514070623222726353437363D010706070607062322272627263534
+373637363332171633323F01272623220706232227262726353437363736333217161716
+1F013534272635343736321716151407061D013736373637363332171617161514070607
+062322272623220F01113237363534272613252627262322070607060105161716333237
+3637361325061514171617163332373633320D0136353427262726232207062322035A2A
+311E2538A8123565202512105A465C120B192B6D14163842532F3F4A125640365254584E
+3640561247423151423816146E2A190B125C465A10122520653512123365212612105A46
+5A140C1A2A6E14163842532F3F4A1256403652A8523640561247423151423816146D2B19
+0B125C465A1012262165339E2A311E2538AE017E153E0A0C1F2B461924FE24FE82153E0A
+0C1F2B46192448FE820D05073B3C350A091D1E4101D8017E0D05073B3C350A091D1E4103
+D301B92B1A4451324AFEB40B2003012835482C27392C4A1E0626306689290A14547C5C60
+6A344F4F3767605C7C54140A278B672F260620482C39272C4934280103200B0B1F030128
+334A2C26392D48200626306689290A14547C5C606A344F4F346A605C7C54140A278B672F
+26061E4A2C39272C48352801031FF5FE472B1A4451324A01C1DD24150419283A55FECDDD
+24150419283A550133DD172115182722220104FBDD172115182722220104000100B60000
+05FE05D50041000001270727372737173533151711273717353315371707113735331537
+170717072707173717071707271523352711170727152335072737110715233507273727
+371702E2F0C23C86C43CC478F0C23C8678863CC2F078C43CC4863CC2F0F0C23C86C43CC4
+78F0C23C8678863CC2F078C43CC4863CC202EB8A70684D7268729BE08B01166F684DE3E3
+4D686FFEEB8AE09B7268724D68708A8B70684D7268729BE08BFEEA6F684DE3E34D686F01
+168BE09B7268724D68700007009C0000061805D5001D002100250029002D003100350000
+013311251125170D0307251125112311051105272D033705110507151735250715370507
+1737250717370507153F01151735031E78012301093CFEF60124FEDD01093CFEF7FEDD78
+FEDDFEF73C0109FEDD0124FEF63C01090123ABAB0123ABABFDF7ACABAB019AAAABABFDF6
+ABAB78AB05D5FECCA9FEB09A689AA8A899689AFEAFA9FECD0133A901519A6899A8A89A68
+9A0150A927C563C56363C56368636262636362626763C663C6C663C60000000100820004
+063005D50041000001331537170711251133153717071707270D01371707170727152311
+251117072715233507273711051123350727372737172D01072737273717353311051127
+3717031E788C64F0010CC8583C5B8C64F0FEF6010BF0648C593C5CC8FEF9F0648C788C64
+F0FEF7C85B3C588C64F0010BFEF7F0648C5C3C59C8010DF0648C05D56851AD8BFECE9B01
+15A234683551AD8A999B8BAD51346835A1011598FED08BAD51686551AD8B013599FEEBA1
+35683351AE8B9A998BAD51356833A1FEEB9B01368BAD51000000000100A1FFE5061305F0
+008700000116151407060706232227262707173637363332171617161514070607062322
+27262726353437271116171E01140E01222E013436373637110716151407060706232227
+26272635343736373632171617372706070623222E013437363736333217161716151407
+171126272E013436373633321E0114060706071137263534373637363332171605F81B1B
+1B2E2F35362E1311F1F111132E36352F2E1B1B1B1C2D2F3533312F1B1A04F115132E3636
+5C6C5C36362E1315F1041A1B2F2F35362E2E1B1B1B1B2E2F6A2F1311F1F110143133365C
+361B1B2E2F3533312F1B1A04F115132E36362E2F35365C36362E1315F1041A1A302E3635
+2F33046D362E352F2E1B1B1B0B0F8B8C0F0B1B1B1B2E2F35342F2F1B1B1B1A2F2E361615
+8CFEE9070B1B5C6C5C36365C6C5C1B0B0701178C1516362E2F1A1B1B1A2F2E36352F2E1B
+1B1B0B0F8C8B0F0B1B365C6C2E2F1A1B1B1A2F2E3616158C0117070B1B5C6C5C1B1B365C
+6C5C1B0B07FEE98C1516362E2D1C1B1B1E0000090061FFE5065305D70007000B000F0013
+0017002E0045005C00730000001406222634363209013709023709022709022701132627
+262726353437363736321716171615140706070603161716171615140706070622272627
+263534373637360306070607062322272627263437363736333217161716053637363736
+333217161716140706070623222726272603F0587C58587C01A7FE7D550183FD0DFE7F55
+0181029EFE7D550183FDB7FE7F550181B9390F17040102030F1772170F03020104170F39
+390F17040102030F1772170F03020104170F9F3C1825441D52451E4120313120411E4552
+1D44251801EC3C1825441D52451E4120313120411E45521D442518032C7C58587C58FD2E
+018455FE7C024A018155FE7E012DFE7C550184FD0DFE7E550181012E3C1825441D52451E
+4120313120411E45521D442518FE143C1825441D52451E4120313120411E45521D442518
+0114390F17040102030F1772170F03020104170F39390F17040102030F1772170F030201
+04170F00000000090061FFE5065305D70007000B000F00130017002B003F005300670000
+001406222634363209011709021709020709020701021407060706222726272634373637
+363217161712140706070622272627263437363736321716170032171617161407060706
+2227262726343736372432171617161407060706222726272634373637043B84BA8484BA
+FD69012955FED702A1012955FED7FD0A012955FED7034B012955FED7081315272E6E2E27
+15131315272E6E2E2715131315272E6E2E2715131315272E6E2E2715FD19703137232828
+2337317031372328282337044D7031372328282337317031372328282337034BBA8484BA
+84FD38012955FED7034C012955FED7017EFED7550129FD5EFED755012903497031372328
+282337317031372328282337FBB370313723282823373170313723282823370259131527
+2E6E2E2715131315272E6E2E2715131315272E6E2E2715131315272E6E2E271500000009
+0054FFE5066005F2000C001800250032003F004B0057005F006B0000011407062B012535
+25333217160534363B0105150523222726011615140F0101270137363332012635343F01
+01170107062322033633321F01010701272635340106222F010137011716151400321716
+1D010323033534371214062226343632022227263D0113331315140706601C1C280AFE60
+01A00A261E1CF9F438280A01A0FE600A261E1C052A1D1B07FEB7470102071C292AFBD51D
+1B07014947FEFE071C29281F1D2A281D07010247FEB7071B04651E521C07FEFE47014907
+1BFD96521E1D3264321DDD587C58587C15521E1D3264321D02EC2A1E1C3264321E1E2828
+3C3264321C1E024D1D2A271D07FEFE460149071CFB9B1D2A271D07010246FEB7071C0465
+1E1C07FEB7460102071B292AFBD61E1C07014946FEFE071B292A050D1D1C280AFE61019F
+0A271DFD557C58587C58FC631D1C280A019FFE610A271D00000000010054FFE5066005F2
+006C00000132171615140703013637363332171615140706070125363332171614070623
+222725011617161514070623222726270113161514070622272635343713010607062322
+272635343736370105062322272634373633321705012627263534373633161716170103
+2635343736035A2B2F23054E011C15023432421F1E340A19FE7B01DF190C4C222E2E244A
+0725FE28018A1C02341E1F422B3B0A12FEE94E05232F562F23054EFEE9120A3432421F1E
+34021C018AFE2825074A242E2E224C0C1901DFFE7B190A341E1F4224420215011C4E0523
+2E05F22F234A071FFE2201891D01351F1E43372F0912FEE94E04222E582E24064DFEE516
+013531431E1F3509190185FE221F074A232F2F234A0E1E01D8FE7B1909351F1E434C1A01
+16011B4D06242E582E22044E011712093531431E1F1421011DFE7701D81E0E4A232F0002
+0066FFEC06C605E8000D002300E7BA0000001300032BBA001F000600032BB8001F10411B
+001600000026000000360000004600000056000000660000007600000086000000960000
+00A6000000B6000000C6000000D60000000D5D410500E5000000F5000000025D410500EA
+000600FA000600025D411B00190006002900060039000600490006005900060069000600
+790006008900060099000600A9000600B9000600C9000600D90006000D5DB80025DC00BA
+0003001000032BB8000310BA0017000A00032BB8001710B8001010B8000ED0B8000E2FB8
+001710B80019D0B800192FB8001710B8001BD0B8001010B80022D0303113100021200011
+3402242322040201062320001134122433321736333204121510002122B9018F011C011C
+018FB6FEB8ADADFEB8B602DC1919FEC4FE3FCE0171BE19191919C10171CDFE3FFEC21902
+EAFEE4FE700190011CB30147B1B1FEB9FC510201BF013FC60172C60202C6FE90C8FEC1FE
+41000002007AFF9C06B205D40003000B0037BA0003000500032BB8000310BA000A000000
+032BB8000A10B8000DDC00BA0000000A00032BB8000010BA0007000100032BB800071030
+3125112111172311211533112105FBFAD2116405D464FA2C53052EFAD25305D464FA2C00
+00000002007A000006B206380003000B0037BA0003000600032BB8000310BA000B000000
+032BB8000B10B8000DDC00BA0000000500032BB8000010BA000A000100032BB8000A1030
+3125112111251521113335211105FBFAD20581FA2C6405D453052EFAD2116405D464FA2C
+00000002007AFF9C06B205D4000300090037BA0003000400032BB8000310BA0008000000
+032BB8000810B8000BDC00BA0000000800032BB8000010BA0006000100032BB800061030
+312511211107112117112105FBFAD25305D464FA4A53052EFAD25305D482FA4A00000002
+007A000006B20638000300090037BA0003000500032BB8000310BA0009000000032BB800
+0910B8000BDC00BA0000000400032BB8000010BA0008000100032BB80008103031251121
+1105211137211105FBFAD20581FA2C8205B653052EFAD25305D464FA4A00000400AAFFFB
+068205D300030007000B000F000B00B800092FB8000F2F303113090EAA01530153FEAD01
+DF01540152FEAEFD1501530153FEADFEAD01530153FEAD02E90153FEADFEAD01530152FE
+AEFEAB02EA0155FEABFEAEFE220153FEADFEAD00000000010305FE1403AF061400030000
+0111231103AFAA0614F800080000000102B0FE140404061400030000011121110404FEAC
+0614F800080000010206FE1404AE0614000300000111211104AEFD580614F80008000001
+00AE0328021C05D50006001BBA0000000100032B00B800032FBA0006000000032BB80006
+10303101211113330333021CFE92A481529B0328016E013FFEC100010078032801E605D5
+00060027BA0001000000032BB800011000B800032FBA0001000200032BB8000110B80002
+10B80005D030311321110323132378016EA481529B05D5FE92FEC1013F00FFFF00AE0328
+03D605D510260FE4000010070FE401BA0000FFFF0078032803A005D510260FE500001007
+0FE501BA00000002013EFF42062D06CF00440048000001321716171E0115140607060706
+23220706070E01141617161716323736373E013511212226353424332135371521072311
+140607060706222726272E01353436373637360111231102DD1F1A1B1615171715161B1A
+1A1C131310111013101410185F3E492D3734FECDDEFD0104D701338D01548CC8503E4350
+4EB144472D322E312F26443901A8BE01D00B0C1514381F1E3814150C0B09081010272E2A
+0E1206091B212D388144015FEEB8BEE8C832FA7BFBDB6AB740462725191A2E3372404D64
+372B1D1801340256FDAA0002019EFFDD051605F00015002F000001321716171E01151407
+06072627263534363736373612321716171E0115140607060706222726272E0135343637
+3637035AA0792A2C262788B28286AE88272625315D7E7C34352C2D2B2B2D2C35347C3435
+2C2D2B2B2D2C3505F0280E2B2661347C6483CECE83667A346126241528FC4616182A2E6A
+3D3C6A2E2A181616182A2E6A3C3D6A2E2A180002014EFFDD056605F00021003B00000126
+252635343637363736321716171E0115343637363736321716171E011514070402321716
+171E0115140607060706222726272E01353436373637035A7BFEF788272625312D6C2E2F
+2625282825262F2E6C2D3125262788FEF6B87C34352C2D2B2B2D2C35347C34352C2D2B2B
+2D2C3502ADC4A153833461262415141414252560363660252514141415242661348452A1
+FEC516182A2E6A3D3C6A2E2A181616182A2E6A3C3D6A2E2A18000001006E00AB06460528
+002100002526252635343637363736321716171E0115343637363736321716171E011514
+0704035A89FE5FC237373545419A414436353939353644419A4145353737C2FE5FABEFF2
+71B24B8A36341E1C1C1D3534894E4E8934351D1C1C1E34368A4BB46FF20000010158FFFE
+05D405D600230000010603062322262726272635343736373E0133222627262726353437
+36373E013332171205D4EEF272B24A8A36341E1C1C1C3634884E4E8834361C1C1C1E3436
+8A4AB470F202EA8AFE60C236383446404E4C424436343A38363644404E4C4244363638C2
+FE5E0002007E002A05CB059E000D00690000013635342726232207061514171617060736
+333217161514050615143332373633321514212227263510213217363726272623220706
+15141615140706232227263534373633321F013437363332171615140716333237363534
+2726353437363332171615140706232203970A1D18361E16132B4A6F152E5E567C3B2DFE
+CB9969741033363FFEC5CCBAC6010566514D1065E6454A533F282A1A241420190E735D76
+68324B292A4E4C3133103C564C2A2D152A151F38412A148F5F78410467302C3F2921120F
+1B3A22398C4A4F43513E5EDA763A4D632A845A9C99A3FE01658D974330AA334E33352526
+1D17141C2D194B745C4B2539531F203E42574E3D1121241F3F122415381C284621357B5E
+3F00000200A0015A06130484000900510000010607060736373635340120353437262726
+2B0116070607163332371615142322272335333637363726272627263534330615141716
+1732171617263534373633321316333235342726353433321514070601DF3F2D421B4F3E
+3D01FEFE8B763036262504024B606419432B2808916B1424271E654D3F0F24233D48620C
+8F42043D292B381F3D2E6DD8391865620C0B5042F7B0033E0E2433671D3A383404FE21FE
+4542371C145750660F472B1E314BAB488E503C021212120E1146661D2326542719131430
+502B41271DFE939A3C1E12111B3C51AD624600010191FEE4052F06270020000001222726
+2726272635343736373637363315220706020706151417161716171633052FBAA9A18A86
+464444408C84A7A9BA6D6860A628282828534E656372FEE447438985A7A4BBBDA99D8F86
+46472F433EFEFA9B9CB8B19C9B837D44430000010191FEE4052F06270022000001303532
+373637363736353427260227262330353217161716171615140706070607060191726365
+4E5328282828A660686DBAA9A7848C40444446868AA1A9FEE42F43447D839B9CB1B89C9B
+01063E432F4746868F9DA9BDBBA4A7858943470000000001021DFEF104980611000C0000
+01060210121721260235341237049886828385FEB0969594970611E6FE3EFE32FE3BE5EB
+01C6E0DF01C4EC0000000001021DFEF104980611000D0000013021161215140207213612
+1002021D015097949596FEB08583820611ECFE3CDFE0FE3AEBE501C501CE01C200000001
+01B9FE1404DB06140005000001210901210104DBFEDCFE0201FE0124FE00FE1404000400
+FC00000101DBFE1404FC061400050000090221090101DB01FFFE02012201FEFE02FE1404
+000400FC00FC0000000000010123FE14057B061400050000012109012101057BFE3CFD6C
+029401C4FD60FE1404000400FC0000010139FE1405910614000500000902210901013902
+A0FD6001C40294FD6CFE1404000400FC00FC0000000000010155FE14053F061400050000
+012109012101053FFE14FE0201FE01ECFE00FE1404000400FC0000010177FE1405600614
+000500000902210901017701FFFE0201EA01FEFE02FE1404000400FC00FC000000000001
+02C4FE1304480614000700000517070111011707035AEE6AFEE6011A6AEE95EE6A011A05
+CD011A6AEE000001026CFE1303F00614000700000127370111012737035AEE6A011AFEE6
+6AEE04BCEE6AFEE6FA33FEE66AEE00010166FEB2051306140024000005152322263D0134
+262B01353332363D0134363B01152322061D011406071E011D011416330513D4F9A96C8E
+3D3D8F6BA9F9D4448D565B6E6F5A568DBE9094DDEF97748F7395F0DD938F588DF89D8E19
+1B8E9CF88D58000101A1FEB2054E061400240000053332363D013436372E013D0134262B
+01353332161D0114163B01152322061D0114062B0101A1448D565A6F6E5B568D44D4F9A9
+6B8F3D3D8E6CA9F9D4BE588DF89C8E1B198E9DF88D588F93DDF095738F7497EFDD940002
+0098FFEC069405E8000D0018001B00BA000E000300032BB8000E10BA000A001300032BB8
+000A103031011000212000113412243332041201213523112305153711230694FE3FFEC2
+FEC4FE3FCE0171BEC10171CDFBD30269DAA1FEFFECD902EAFEC1FE4101BF013FC60172C6
+C6FE90FD5C8E031A2F982BFD820000020098FFEC069405E8000D002A001B00BA00250003
+00032BB8002510BA000A001400032BB8000A103031011000212000113412243332041205
+3E0135342623220607153E0133321615140607060407152135213E010694FE3FFEC2FEC4
+FE3FCE0171BEC10171CDFDE63E30C5A33D916173843B4E5F2F3E21FEFA5202A4FE4C7DB2
+02EAFEC1FE4101BF013FC60172C6C6FE90E946693A7D971F24AB3A264E3F28553F22F14D
+818E74A7000000020098FFEC069405E8000D00360099BA0000000E00032B410500EA000E
+00FA000E00025D411B0019000E0029000E0039000E0049000E0059000E0069000E007900
+0E0089000E0099000E00A9000E00B9000E00C9000E00D9000E000D5DB80031DC00BA002E
+000300032BB8002E10BA000A001100032BB8000A10BA0021002700032BB8002110BA0018
+001E00032BB8001810BA0015001E0018111239BA002A0027002111123930310110002120
+00113412243332041225342623220607153E013332161514062B01153332161514062322
+2627151E013332363534262732360694FE3FFEC2FEC4FE3FCE0171BEC10171CDFE7CC1A1
+3D885F6B79345B5C585A918C636B7375447D5B588840C3D8760D046802EAFEC1FE4101BF
+013FC60172C6C6FE9018738914189720153F3C3A3C8C4E474C4F1C30A81B179C8D5D8103
+720000030098FFEC069405E8000D0010001B001B00BA0014000300032BB8001410BA000A
+001B00032BB8000A10303101100021200011341224333204120121090115211533353335
+2311230694FE3FFEC2FEC4FE3FCE0171BEC10171CDFD16FEF3010DFE4301BDB68D8DCE02
+EAFEC1FE4101BF013FC60172C6C6FE90FEBC017EFE838ED3D38D0248000000020098FFEC
+069405E8000D002B008BBA0000002100032B410500EA002100FA002100025D411B001900
+21002900210039002100490021005900210069002100790021008900210099002100A900
+2100B9002100C9002100D90021000D5D00BA001E000300032BB8001E10BA000A002B0003
+2BB8000A10BA0011001700032BB8001110BA0028002400032BB8002810BA001A00170011
+11123930310110002120001134122433320412053E0133321615140623222627151E0133
+323635342623220637352135210694FE3FFEC2FEC4FE3FCE0171BEC10171CDFBEF596532
+6876766844775F588540BED5CFB01F3F030191FDC302EAFEC1FE4101BF013FC60172C6C6
+FE90F32514615655611B2FAC1814AC9895B00A01AB8E00030098FFEC069405E8000D0019
+003200F1B800332FB800342FB8003310B80006D0B800062FB8003410B8000EDCB80014DC
+410500EA001400FA001400025D411B001900140029001400390014004900140059001400
+69001400790014008900140099001400A9001400B9001400C9001400D90014000D5DB800
+0610B8001DDC411B0016001D0026001D0036001D0046001D0056001D0066001D0076001D
+0086001D0096001D00A6001D00B6001D00C6001D00D6001D000D5D410500E5001D00F500
+1D00025D00BA0020000300032BB8002010BA000A001A00032BB8000A10BA001700110003
+2BB8001710BA002C002600032BB8002C10BA002F0026002C111239303101100021200011
+34122433320412011406232226353436333216032202151416333236353426232206373E
+0133321617352E010694FE3FFEC2FEC4FE3FCE0171BEC10171CDFDA25C4E4E5C5C4E4E5C
+71C8EAC0B9A0C2BAA04E8009057F772F61544A6A02EAFEC1FE4101BF013FC60172C6C6FE
+90FE8F5A62625A5B6262022AFEF5DAE7FDB39194B13D0B509416239C181300020098FFEC
+069405E8000D0014001B00BA0011000300032BB8001110BA000A001400032BB8000A1030
+310110002120001134122433320412252101330135210694FE3FFEC2FEC4FE3FCE0171BE
+C10171CDFBC201CFFEAFC1016CFD5502EAFEC1FE4101BF013FC60172C6C6FE9076FCE603
+5D4B00040098FFEC069405E8000D00190031003D018BBA001A000600032BB8001A10BA00
+0E001400032BB8000E10BA0000002000032BB8000010410500EA001400FA001400025D41
+1B0019001400290014003900140049001400590014006900140079001400890014009900
+1400A9001400B9001400C9001400D90014000D5D411B0016001A0026001A0036001A0046
+001A0056001A0066001A0076001A0086001A0096001A00A6001A00B6001A00C6001A00D6
+001A000D5D410500E5001A00F5001A00025D410500EA002000FA002000025D411B001900
+20002900200039002000490020005900200069002000790020008900200099002000A900
+2000B9002000C9002000D90020000D5DBA002F00060000111239BA003B0014000E111239
+B8003B2F410500EA003B00FA003B00025D411B0019003B0029003B0039003B0049003B00
+59003B0069003B0079003B0089003B0099003B00A9003B00B9003B00C9003B00D9003B00
+0D5DB80035DC00BA001D000300032BB8001D10BA000A002900032BB8000A10BA00170011
+00032BB8001710BA0032003800032BB80032103031011000212000113412243332041201
+1406232226353436333216051416333236353426273E01353426232206151416170E0101
+32161514062322263534360694FE3FFEC2FEC4FE3FCE0171BEC10171CDFDB95F54545F5F
+54545FFDE2BEADADBE760F0469B69D9DB76A040F76016B4B52524B4D515102EAFEC1FE41
+01BF013FC60172C6C6FE90FE6C48515049495050498A97978A5C83030176537488887453
+7601038301C4423E3D42423D3E4200030098FFEC069405E8000D0026003200E9B800332F
+B800342FB80000DCB80011DC410500EA001100FA001100025D411B001900110029001100
+39001100490011005900110069001100790011008900110099001100A9001100B9001100
+C9001100D90011000D5DB8003310B80027D0B800272FB8002DDC411B0016002D0026002D
+0036002D0046002D0056002D0066002D0076002D0086002D0096002D00A6002D00B6002D
+00C6002D00D6002D000D5D410500E5002D00F5002D00025D00BA000E000300032BB8000E
+10BA000A001400032BB8000A10BA001A002000032BB8001A10BA002A003000032BB8002A
+10BA00230020001A11123930310110002120001134122433320412013212353426232206
+151416333236070E0123222627151E010334363332161514062322260694FE3FFEC2FEC4
+FE3FCE0171BEC10171CDFCD1C8E9BFB9A0C2BA9F4F800A057F772E61554A6B3C5C4E4E5B
+5B4E4E5C02EAFEC1FE4101BF013FC60172C6C6FE90FD4B010ADAE8FDB49194AF3C0D4F93
+15249C181302845B62625B5B626200040098FFEC069405E8000D00180024003000D3BA00
+25001100032BB8002510BA0019001F00032BB8001910BA0000002B00032BB80000104105
+00EA001F00FA001F00025D411B0019001F0029001F0039001F0049001F0059001F006900
+1F0079001F0089001F0099001F00A9001F00B9001F00C9001F00D9001F000D5D410500EA
+002B00FA002B00025D411B0019002B0029002B0039002B0049002B0059002B0069002B00
+79002B0089002B0099002B00A9002B00B9002B00C9002B00D9002B000D5D00BA000F0003
+00032BB8000F10BA000A002E00032BB8000A10B8000310B80028DC303101100021200011
+341224333204120121352311230715371123011406232226353436333216051416333236
+3534262322060694FE3FFEC2FEC4FE3FCE0171BEC10171CDFB2401C29F75BCAC9E038946
+3F404545403F46FE70888382888882838802EAFEC1FE4101BF013FC60172C6C6FE90FDA9
+8002CA2A8927FDC20124A29797A2A39797A3D0E4E4D0D1E4E40000030009FF9606AB063D
+00190024003E000000200706070602151412171617162037363736123534022726270121
+110535253311211521122017161716121514020706070620272627260235341237363703
+F4FECC86846D6F6D6D6F6D8486013486846D6F6D6D6F6D84FDA50108FEE1011EA10108FD
+508D015C98967C7E7B7B7E7C9698FEA498967C7E7B7B7E7C9605D939366F6FFEF79C97FE
+F76F6F363939366F6F0109979C01096F6F36FB7D038F39933AFBDD8805A8403E7D7EFED4
+B1ACFED47E7D3E40403E7D7E012CACB1012C7E7D3E0000030009FF9606AB063D00190036
+005000000020070607060215141217161716203736373612353402272627012115213536
+00373E0135342623220607353E01333216151406070E0102201716171612151402070607
+0620272627260235341237363703F4FECC86846D6F6D6D6F6D8486013486846D6F6D6D6F
+6D84FE290234FD0A5C013D294E3D856B50A56061AA46BADD374914D7BA015C98967C7E7B
+7B7E7C9698FEA498967C7E7B7B7E7C9605D939366F6FFEF79C97FEF76F6F363939366F6F
+0109979C01096F6F36FB8088885F01412E58783B5F783535A32728BA9B49845A17DE0456
+403E7D7EFED4B1ACFED47E7D3E40403E7D7E012CACB1012C7E7D3E00000000030009FF96
+06AB063D00190042005C0000002007060706021514121716171620373637361235340227
+2627031E0115140623222627351E013332363534262B013533323635342623220607353E
+01333216151406002017161716121514020706070620272627260235341237363703F4FE
+CC86846D6F6D6D6F6D8486013486846D6F6D6D6F6D84747483F3E04C9F5544A057989F94
+848B91787E827A42985C52AB47BAD572FE3D015C98967C7E7B7B7E7C9698FEA498967C7E
+7B7B7E7C9605D939366F6FFEF79C97FEF76F6F363939366F6F0109979C01096F6F36FD79
+199C74B0C21E1D9C272878726A77855F5A5C621D1E90171CA78E64880309403E7D7EFED4
+B1ACFED47E7D3E40403E7D7E012CACB1012C7E7D3E0000040009FF9606AB063D0019001C
+002700410000002007060706021514121716171620373637361235340227262707012103
+331133152311231121350020171617161215140207060706202726272602353412373637
+03F4FECC86846D6F6D6D6F6D8486013486846D6F6D6D6F6D84DEFE6801982ACBAAAAA1FD
+E5012B015C98967C7E7B7B7E7C9698FEA498967C7E7B7B7E7C9605D939366F6FFEF79C97
+FEF76F6F363939366F6F0109979C01096F6F36EDFD82030BFCF586FEE6011A9C03F2403E
+7D7EFED4B1ACFED47E7D3E40403E7D7E012CACB1012C7E7D3E0000030009FF9606AB063D
+001900370051000000200706070602151412171617162037363736123534022726270521
+1521113E0133321615140623222627351E01333236353426232206071220171617161215
+14020706070620272627260235341237363703F4FECC86846D6F6D6D6F6D848601348684
+6D6F6D6D6F6D84FDA3027AFE1A234723C8E9F0DA4B9C534C95568AA2A28A4181438F015C
+98967C7E7B7B7E7C9698FEA498967C7E7B7B7E7C9605D939366F6FFEF79C97FEF76F6F36
+3939366F6F0109979C01096F6F366388FEDB0C0CDBBBC1D61A19A32925927D7C921D1E03
+58403E7D7EFED4B1ACFED47E7D3E40403E7D7E012CACB1012C7E7D3E000000040009FF96
+06AB063D00190025003E0058000000200706070602151412171617162037363736123534
+0227262701220615141633323635342613152E01232206073E0133321615140623220211
+1000333216002017161716121514020706070620272627260235341237363703F4FECC86
+846D6F6D6D6F6D8486013486846D6F6D6D6F6D84FED66C80806C6D7F7FD43D7C3CA0A90C
+2F8E56B4D1DAB5CFDB010DE23D7CFE5E015C98967C7E7B7B7E7C9698FEA498967C7E7B7B
+7E7C9605D939366F6FFEF79C97FEF76F6F363939366F6F0109979C01096F6F36FD8B9582
+80969680829501FA931D1ED8DA454BDBBCB8DE013E012D011D014F180100403E7D7EFED4
+B1ACFED47E7D3E40403E7D7E012CACB1012C7E7D3E0000030009FF9606AB063D00190020
+003A00000020070607060215141217161716203736373612353402272627052115012301
+21122017161716121514020706070620272627260235341237363703F4FECC86846D6F6D
+6D6F6D8486013486846D6F6D6D6F6D84FD5C0300FE4EA80198FDC2D6015C98967C7E7B7B
+7E7C9698FEA498967C7E7B7B7E7C9605D939366F6FFEF79C97FEF76F6F363939366F6F01
+09979C01096F6F366045FB9A04230185403E7D7EFED4B1ACFED47E7D3E40403E7D7E012C
+ACB1012C7E7D3E00000000050009FF9606AB063D0019002300390045005F000000200706
+0706021514121716171620373637361235340227262701220614163236353426252E0135
+34362016151406071E011514062026353436131416333236353426232206122017161716
+121514020706070620272627260235341237363703F4FECC86846D6F6D6D6F6D84860134
+86846D6F6D6D6F6D84FEDF738484E68584FEEA6874CC0164CC74687583D4FE74D4843974
+6968767668697430015C98967C7E7B7B7E7C9698FEA498967C7E7B7B7E7C9605D939366F
+6FFEF79C97FEF76F6F363939366F6F0109979C01096F6F36FD2C7BD87B7C6B6C7B451A8E
+678FA6A68F678E1A1B9E73ADBABAAD739E011A5C68685C5D686801D0403E7D7EFED4B1AC
+FED47E7D3E40403E7D7E012CACB1012C7E7D3E00000000040009FF9606AB063D00190032
+003E00580000002007060706021514121716171620373637361235340227262701351E01
+333236370E01232226353436333212111000232226133236353426232206151416022017
+161716121514020706070620272627260235341237363703F4FECC86846D6F6D6D6F6D84
+86013486846D6F6D6D6F6D84FDA73D7C3CA0A90C2E8F56B5CFDAB4D0DAFEF4E23D7DFE6D
+7F7F6D6C80804A015C98967C7E7B7B7E7C9698FEA498967C7E7B7B7E7C9605D939366F6F
+FEF79C97FEF76F6F363939366F6F0109979C01096F6F36FB0E931D1ED7DB444AD9BCB8DE
+FEC3FED1FEE6FEAF18021295828195958182950395403E7D7EFED4B1ACFED47E7D3E4040
+3E7D7E012CACB1012C7E7D3E000000050009FF9606AB063D001D002B0038004300610000
+002007060706070615141716171617162037363736373635342726272627072207061514
+163332363534272E01201716111007062002111037013311073537331133152100201716
+171617161514070607060706202726272627263534373637363703F4FECC86846D6F3538
+38356F6D8486013486846D6F353838356F6D841D542C2B565556562B2BEF013251505051
+FECEA050FE338D96958183FE700105015C98967C7E3C3F3F3C7E7C9698FEA498967C7E3C
+3F3F3C7E7C9605D939366F6F83869C9786836F6F363939366F6F8386979C86836F6F36CB
+7B7AF7F5F6F6F5F37E7B809F9EFED1FED39F9F013E012D012CA1FC67038F259326FBDD88
+05A8403E7D7E9597B1AC97957E7D3E40403E7D7E9597ACB197957E7D3E0000020009FF96
+06AB063D000A002400000115213521112305152511022017161716121514020706070620
+2726272602353412373637021F02B0FEF8A1FEE2011F7B015C98967C7E7B7B7E7C9698FE
+A498967C7E7B7B7E7C96011D888804233A9339FC710520403E7D7EFED4B1ACFED47E7D3E
+40403E7D7E012CACB1012C7E7D3E00020009FF9606AB063D001C00360000013E01373E01
+35342623220607153E013332161514060706000715213500201716171612151402070607
+0620272627260235341237363702A3C3D7144937DDBA46AA6160A94C6B853D4E29FEC35C
+02F6FDD5015C98967C7E7B7B7E7C9698FEA498967C7E7B7B7E7C960120C7DE175A84499B
+BA2827A33535785F3B78582EFEBF5F8888051D403E7D7EFED4B1ACFED47E7D3E40403E7D
+7E012CACB1012C7E7D3E00020009FF9606AB063D002800420000013E0135342623220607
+153E013332161514062B011533321615140623222627151E013332363534260020171617
+16121514020706070620272627260235341237363704066972D7B847A15C5C98427A827E
+78918B84949F9857A044559F4CE0F383FE32015C98967C7E7B7B7E7C9698FEA498967C7E
+7B7B7E7C9603191B88648EA7191A901E1D625C5A5F85776A727828279C1D1EC2B0749C03
+3D403E7D7EFED4B1ACFED47E7D3E40403E7D7E012CACB1012C7E7D3E000000030009FF96
+06AB063D0002000D00270000011121090115211133113335231124201716171612151402
+07060706202726272602353412373637039CFE68016EFE0F021BA1AAAAFE6F015C98967C
+7E7B7B7E7C9698FEA498967C7E7B7B7E7C9604B3FD82030BFD0B9CFEE6011A86030BFD40
+3E7D7EFED4B1ACFED47E7D3E40403E7D7E012CACB1012C7E7D3E00020009FF9606AB063D
+001D0037000001113E0133321615140623222627151E0133323635342623220607112135
+0020171617161215140207060706202726272602353412373637021D4381418AA2A28A56
+9948539C4BDAF0E9C823472301E6FE15015C98967C7E7B7B7E7C9698FEA498967C7E7B7B
+7E7C96053DFDA81E1D927C7D922727A3191AD6C1BBDB0C0C0125880100403E7D7EFED4B1
+ACFED47E7D3E40403E7D7E012CACB1012C7E7D3E000000030009FF9606AB063D000B0024
+003E0000013216151406232226353436012E01232200111012333236353426232206073E
+0133321617002017161716121514020706070620272627260235341237363703506D7F7F
+6D6C808001AD437C3DE2FEF3DBCFB5DAD1B4568E2F0CA9A03C7C3DFE1B015C98967C7E7B
+7B7E7C9698FEA498967C7E7B7B7E7C96032B958280969680829501FA1818FEAFFEE5FED3
+FEC2DEB8BCDB4B45DAD81E1D01AB403E7D7EFED4B1ACFED47E7D3E40403E7D7E012CACB1
+012C7E7D3E0000020009FF9606AB063D0006002000000115210133013524201716171612
+1514020706070620272627260235341237363701D6023EFE68A801B2FDD6015C98967C7E
+7B7B7E7C9698FEA498967C7E7B7B7E7C96054088FBDD046645FD403E7D7EFED4B1ACFED4
+7E7D3E40403E7D7E012CACB1012C7E7D3E0000040009FF9606AB063D0009001F002B0045
+000001321615140622263436270E011514162036353426273E0135342620061514163734
+363332161514062322261220171617161215140207060706202726272602353412373637
+0359748485E684842F7484D4018CD483756874CCFE9CCC742D746968767668697430015C
+98967C7E7B7B7E7C9698FEA498967C7E7B7B7E7C9602CC7B6C6B7C7BD87B451B9E73ADBA
+BAAD739E1B1A8E678FA6A68F678EE55D68685D5C68680289403E7D7EFED4B1ACFED47E7D
+3E40403E7D7E012CACB1012C7E7D3E00000000030009FF9606AB063D00180024003E0000
+251E01333200111002232206151416333236370E01232226270122263534363332161514
+0600201716171612151402070607062027262726023534123736370221437D3DE2010CDA
+D0B4DAD1B3568F2E0CA9A03C7C3D01416C80806C6D7F7FFEDD015C98967C7E7B7B7E7C96
+98FEA498967C7E7B7B7E7C96AE18180151011A012F013DDEB8BCD94A44DBD71E1D016795
+828195958182950395403E7D7EFED4B1ACFED47E7D3E40403E7D7E012CACB1012C7E7D3E
+000000040009FF9606AB063D000B00150020003A00000132161514062322263534362420
+021110122012111001152135231123071537111220171617161215140207060706202726
+2726023534123736370499656464656464640105FEBEA9A90142AAFB9101C2A181B3B496
+015C98967C7E7B7B7E7C9698FEA498967C7E7B7B7E7C9604D5F5F7F5F6F6F5F7F580FEC3
+FED1FED3FEC2013E012D012FFD0588880423269325FC710520403E7D7EFED4B1ACFED47E
+7D3E40403E7D7E012CACB1012C7E7D3E000000010075009A0650046A0008000009012101
+21352101210650FE18FEC00170FBDD0423FE9001400282FE180170F00170000100FC0070
+057404E900060000090137011B012503F7FD05A902B5D446FD4E018B02B4AAFD050134FD
+4E470001007500CC065004380006000001053505030901047AFBFB040544021AFDE6023C
+32F0320170FE4AFE4A00000100FC001B0574049400060000090127012D0103045AFD4BA9
+02FBFECB02B2460316FD05AA02B4D447FD4E000100750108065003FC0008000013210304
+05040513217502BBA8015C026CFD94FEA4A8FD4502BE013EFC7E7EFC013E000100750075
+061D048F002B000000140607010607062226272E013534363F0121222E02343E02332127
+2E01353436373E01321716170116061D1411FE70101816342C1212131411BAFC801A2C24
+1313242C1A0380BA11141312122C34161810019013029B322E11FE70100B0A1411132C19
+1A2E11BA14222E322E2214BA112E1A192C1311140A0B10FE70130001007500CC06500438
+0006000001213521110901049AFBDB042501B6FE4A025A50018EFE4AFE4A0001007500CC
+065004380006000001213521110901049AFBDB042501B6FE4A0214DC0148FE4AFE4A0004
+007500CC0650043800030007000B00120000012311330123113303231133012111213509
+0102B9F0F0FEC07878C83C3C03E9FE6F019101B6FE4A01BA0190FE700190FE700190FE70
+0190EEFE4AFE4A0000000004007500CC065004380008000C001000140000013512170603
+352111032311330123113303231133049AB8FEFEB8FE6F50F0F0FEC07878C83C3C03AE8A
+FECE8484FECE8A0258FDA80258FDA80258FDA8025800000100750086067D047E00060000
+090211211121048101FCFE04FBF4040C047EFE04FE04011101D6000200E400C006500444
+000200060000012101130902031E0236FCBC96FE3E056CFA940282010FFEF101C2FE3EFE
+3E00000200E400C0065004440002000600000902210902031EFEF20344FD52FE3E056CFA
+940282FEF1010F01C2FE3EFE3E00000100E4FFF80650050C0003000009030242FEA2056C
+FA940282028AFD76FD760001007500CC0650046200140000131114161716171633213509
+013521202726272E01752423232B2A0C035A01B6FE4AFE4DFE4D2A2B232324028201E030
+5525211312C6FE4AFE4AC6121321255500000001007500A2065004380014000013343637
+36373633213509013521200706070E0115752423232B2A0C035A01B6FE4AFE4DFE4D2A2B
+2323240282305525211312C6FE4AFE4AC6121321255530000000000101ECFFF104D90513
+0006000001211121110901035EFE8E0172017BFE85015602580165FD6FFD6F0000000001
+007500CC065004380008000001351205040335211104049001BCFE4490FC71039A9EFECE
+8484FECE9E023000000000020075009A061E046A0008000F000025352111213533090103
+150901152111033CFD3902C7FA01E8FE18AA0198FE68FD399AEE01F4EEFE18FE18013EEE
+01980198EEFEAC00000000020075009A061E046A0008000F000025352111213533090103
+150901152111033CFD3902C7FA01E8FE18140198FE68FD399AEE01F4EEFE18FE18013EEE
+01980198EEFEAC0000000002002B0018065A04B0000B0012000013012137331315012335
+3721010701030721032B012003498A64D8FD269616FD2B03D18A0284AC8AFCB7C401CE01
+F4EEFDFEC8FE32C8260118EE01980198EEFEAC0000000002002B0018065A04B0000B0012
+0000133521273533011503232721012113211713012B02D5169602DAD8648AFCB702B1FC
+B7C403498AACFD7C02FAC826C8FE32C8FDFEEE01A4FEACEE019801980000000201150000
+06320498000A0011000021272127112135330117010315090115211103DC4FFDEC640263
+6E01E864FE18820198FE68FD9D9EC802949EFE18C8FE1801B69E019801989EFE0C000002
+0115000006320498000A0011000001330107012335211137211321112115090103DC6E01
+E864FE186EFD9D6402143BFD9D02630198FE680498FE18C8FE189E0294C8FEE8FE0C9E01
+9801980000000002007F006406640498000C001400000103213533011701232735212713
+07211509011521011596035D6E01E832FE186E32FCD532F272032D0198FE68FCD302B001
+4A9EFE1864FE18633B64014AFA9E019801989E0000000002007F006406640498000C0014
+000001033721353733010701233521130721150901152101159632032B326E01E832FE18
+6EFCA3F272032D0198FE68FCD3024C014A643B63FE1864FE189E014AFA9E019801989E00
+00000001013CFFD805C404AF001E000001363736373633321716171E0115140607060706
+2227262726272115090115013C27435A6D6F7E7974695E5A5C585E56716FF774695E3F29
+025801CAFE36036E47435A2E2F2F2B5D59DD807ADA5F58302F2F2B5D3E499E01CA01CA9E
+0000000900820142065003C200030007000B000F001E00220026002A002E000001073337
+230733372307333723073337233503211321111617060711210321013327231733272317
+3327231733272302E1A03CA0B4A03CA0B4A03CA0B4A03CA078BB021CBB0187ADC3C3ADFE
+79BBFDE4025F3CA03C283CA03C283CA03C283CA03C025AF0F0F0F0F0F0F0F0500118FEE8
+0116BC8282BC0116FEE80168F0F0F0F0F0F0F0000000000300A500700574053E000C0010
+0014000001370615141726232207372737090121012511011104A2AF072A8EA44246AFFE
+38FE1D01A9FEE5FE57015501A8017BB04643A38F2A07B0FE39016FFE5801A83A011BFE57
+FEE6000300750162065003A20008000C0010000001351617060735213505210721132721
+1704FE9AB8B89AFE98FDA70258C8FDA8C8C80258C802AAF8BC6464BCF85052C8011AC8C8
+0000000300A7FFC505740494000C00100014000001271633323706151417270727090111
+01032101210469AF4642A48E2A07AFFF38FE9101A8FE583AFEE501A8011B03C1B0072A90
+A24346B0FF39FE1D01A8FEE5FE58015501A8000100A700700574053E002A000025262322
+073E013727262726220607013E0133321F01372635343637010E011514171617013E0137
+06151405748FA54245488018A6A623264E4B1CFE5824572F2C30150513242201A820190E
+0F07014404354807702A07473603A6A60E0F1E1C01A82422120821302C305922FE572146
+2627262307FEBB1781474743A300000100750161065003A3002700000106073436372322
+0706070E011521343637363F012726272E01352114161716171633212E0135160650B79B
+350EEBEA23241D1C1FFDA825221F2F15152F1F222502581F1C1D24230A01CB0E359B0282
+65BC6581130F101C1B4A283059211F15091B151F225830284A1B1C100F138165BC000001
+00A7FFC605740494002A000001061514172E01270706070615141617012E0135343F0127
+0623222627011E0132373637012E012716333205742907483504A7A70C0E1D1CFE582224
+130923302C30582201A81C4B4E26230701451880484542A504948EA34347478117A8A81F
+2627264B1CFE572259302C30150412242201A81C1E0F0E070145033647070003007300AC
+0650045800140027003C000001362506030607060706222726272E013534363736243436
+373637363217040504050622272627260126272E01353436373637363217161716171217
+24042FF6012BE37A0C15161B1A3E1A1B161517171516FC5F201B1D2423522301610366FC
+82FEB723522329181D039E1B1615171715161B1A3E1A1B16120F78E5FE9401CE625175FE
+FD1D14150C0B0B0C1514381F1E38141597524B1A1C100F0E853638830E0F121A1F01230C
+1514381E1F3814150C0B0B0C151120FEFE766300000000020096011F063C03E5001A002A
+000013363736373637363332171617160504070E012322272627262726252E0135343637
+161706072E0135343696411E201427272B2F35343C33A20191FE6FA2386E32332739151D
+171D04062525252562FCFC622525250282263A3F13241213131620664C4C662326131D19
+232F3A26275832335827F17272F12758333258000000000100A20156063203AE00630000
+0014060F01060706222726272E0135343F013635342627262726232122070607060F0106
+070607062321222E02343F0136342F0126343637363736332132171617161F0116171617
+163321323736373E0135342F0126353436373637363217161F011606320606F004090710
+0707060606031B03060605080807FEE60807070605045A050306080608FD9C080E0C0603
+3B3A01740306060607070802640806090503055A040506070708011A070808050606031B
+03060606070710070904F006028B120E06F0040503030405060E09040B630B05070F0605
+03040304050508B40A03050403060C0E120675751402E806120E06050403030306030AB4
+0805050403040305060F07050B630B04090E06050403030504F006000000000100A200F1
+06320413006300000014060701060706222726272E0135343F0136353426272627262B01
+22070607060F0106070607062321222E02343F0136342703263436373637363321321716
+1716171316171617163B01323736373E0135342F01263534363736373632171617011606
+320606FE700508071007070606060357030606050808075C080707060504780503060806
+08FD6A080E0C0603494A019C030606060707080296080609050305820405060707085C07
+0808050606035703060606070710070805019006028B120F05FE98050403030405060E09
+0708DB0808070F060503040304050508F00A03050403060C0E120693931402013806120E
+06050403030306030AFEFC0805050403040305060F070808DB0807090E06050403030405
+FE98050000000003007500A60650045E0013001D00270000010607060723373637363726
+27262F013316171601233E01372135210E01031E01172135212E0127065088538C4A6C2E
+2EA026474726A015476C488E53FDCC6913372AFCD603E56E4B0D0D4B6EFC1B032A2A3713
+02824F558FA96E6DA427363627A431AAA49455FDD53D8548648EB7038F29B78E6448853D
+00000001006EFEB202D0062600190000012A012724032600272623220727363736151400
+07060516363702D0096837FE480201016D04035E3A2D8833D5DEFEB0070C011C524514FE
+B20B530152AE03F5514F8931D80101CCA1FC4C8FDC48150102000001004FFEB202B10626
+0019000013351E01372427260035341716170726232207060007020506224F144552011C
+0C07FEB0DED533882D3A5E0304016D0102FE483768FEB28F02011548DC8F03B4A1CC0101
+D831894F51FC0BAEFEAE530B000000030006FE2303EE0675000300060009000009052109
+012101F901F5FE0BFE0D01F3FE9802D2FE96016AFD2E0675FBDBFBD3042D0331FD08FC8E
+0300000200B0FEF2033006140003000B00000111331125211523113315210114C8FED402
+80F0F0FD8005B0F9A6065A6464F9A6640000000200AFFEF2032F06140003000B00000123
+1133131121353311233502CBC8C864FD80F0F005B0F9A606BEF8DE64065A640000000001
+00B7FEF2027B061200050000130133090123B7011AAAFEE6011AAA02820390FC70FC7000
+0000000100A4FEF202680612000500000901230901330268FEE6AA011AFEE6AA0282FC70
+039003900000FFFF00B7FEF203CF06121026104700001007104701540000FFFF00A4FEF2
+03BC061210261048000010071048015400000001005B0000065B05DC0016000009010727
+11231127112311270711231107112311072701038902D2785C78D2786A6A78D2785C7802
+D205DCFD2C785CFD140365D3FBC804B06868FB500438D3FC9B02EC5C7802D40000000001
+0059FFF9065905D500160000050137171133111711331117371133113711331137170103
+2BFD2E785C78D2786A6A78D2785C78FD2E0702D4785C02ECFC9BD30438FB50686804B0FB
+C8D30365FD145C78FD2C0001004F006C06840544003D0000013037161716323736373E01
+353427262726272622070607060706073717012301371736373637363736333217161716
+171615140706070607062322272602657740524EBE4A563C424221234040524EBE4A563C
+42211707E878FE785AFE7678E90824305954746785806C71575A2F2E2E2F5A5375678580
+6C6A0121783F232121273B42A25D595153403F232121273B4251393FEA78FE76018A78E9
+6058715953342E2E30575971707B7F70715953342E2E2D0000000001004F007C06840554
+003C00000106070623222726272627263534373637363736333217161716171617371701
+2301371726272627262726220706070607061514161716171632373637046E5E6A6C8085
+67745459302E2E305958706C808567745459302408E978FE765AFE7878E8071721423C56
+4ABE4E524040232142423C564ABE4E524001315A2D2E2E34535971707F7B70715957302E
+2E345359715860E978FE76018A78EA3F3951423B272121233F405351595DA2423B272121
+233F00030075FFE308DE052400250039004D0000011501273721060706070E0120262726
+272627233533363736373E01201617161716172127372422070607060706072111331121
+262726272627012111231121161716171617163237363736373608DEFE7778E9FEA00B21
+316362EEFEECEE626331210BBDBD0A22316362EE0114EE626331220A0160E978FCE2D65D
+5C4C4D26170901AEAA01AE0917264D4C5C013BFE52AAFE520A16264D4C5C5DD65D5C4C4D
+261602AF5AFE7778E95A517663626464626376515AAA5B527763626464626377525BE978
+5627274C4D5C373D0165FE9B3D375C4D4C27FDC6FE9B01653B365C4D4C272727274C4D5C
+36000001006400CC0B03043800090081B4020906000A10D4D4CC32400940024009300230
+09045D31400A020509010006059C060A0010D4EC113939CC10CC30400C08090900080708
+079C000900070510FC3C0806103C400C03020201030403049C010201070510FC3C080610
+3CB0104B535800B303020809103C103CB4089C090900070510ECB4039C020201070510EC
+591335011707211521170764018978E90987F679E97802555A018978E9AAE97800000001
+007500CC0B14043800090081B4020900060A10D4D4CC3240094F024F095F025F09045D31
+400A090602010005069C050A0010D4EC113939CC10CC30400C08090900080708079C0009
+00070510FC3C0806103C400C03020201030403049C010201070510FC3C0806103CB0104B
+535800B303020809103C103CB4089C090900070510ECB4039C020201070510EC59011501
+273721352127370B14FE7778E9F6790987E97802AF5AFE7778E9AAE978000001006400CC
+0B140438000F00DAB6070A09020F001010D4CC32D4CC32400D5002500F5F0A5F074F0A4F
+07065D3100400F0702040A0F00010809040D049C0D1010D4EC111739CC3210CC3230400C
+0E0F0F000E0D0E0D9C000F00070510FC3C0806103C400C03020201030403049C01020107
+0510FC3C0806103C400C0B0A0A090B0C0B0C9C09090A070510FC3C0806103C400C060707
+08060506059C080708070510FC3C0806103CB0104B535800B70B0A060703020E0F103C10
+3C103C103CB40E9C0F0F00070510ECB4039C020201070510ECB40B9C0A0A09070510ECB4
+069C070708070510EC591335011707212737011501273721170764018978E90880E97801
+89FE7778E9F780E97802555A018978E9E978FE775AFE7778E9E9780000000001006400CC
+0B030438000E000001211521170701350117072115210701900973F7055D78FE77018978
+5D08FBF68D690219785D7801895A0189785D786900000001007500CC0B140438000E0000
+01372721352127370115012737213509E86969F68D08FB5D780189FE77785DF705021969
+69785D78FE775AFE77785D7800000002006400CC0B140438000500150000012137272107
+05211707013501170721273701150127019008586969F7A8690849F8985D78FE77018978
+5D07685D780189FE77780219696969E15D7801895A0189785D5D78FE775AFE7778000001
+006400CC0B030438000D000001211707013501170721113311230A59F723E978FE770189
+78E908DDAAAA022DE97801895A018978E90159FCA4000001007500CC0B140438000D0000
+0111231133112127370115012737011FAAAA08DDE9780189FE7778E9022DFEA7035CFEA7
+E978FE775AFE7778E9000002006400CC0B030438000D0012000001211707013501170721
+3533112311352107170A59F7AF5D78FE770189785D0851AAAAF737696901A15D7801895A
+0189785DCDFCA40145D2696900000002007500CC0B140438000D00120000012127370115
+01273721152311331115213727011F08515D780189FE77785DF7AFAAAA08C9696903635D
+78FE775AFE77785DCD035CFEBBD2696900000001007500CC0B1404380025000013173717
+371737173717371737173733273701150127372307270727072707270727072707277546
+B4B4B4B4B4B4B4B4B4B4B4B4468BE9780189FE7778E9636EB4B4B4B4B4B4B4B4B4B4B4B4
+4602D746B4B4B4B4B4B4B4B4B4B4B4B446E978FE775AFE7778E96EB4B4B4B4B4B4B4B4B4
+B4B4B4460000FFFF012C0514025806401007175E012C05140000FFFF012C02DD02580409
+1007175E012C02DD0000FFFF012C02DD025806401027175E012C05141007175E012C02DD
+0000FFFF012C00A7025801D31007175E012C00A70000FFFF012C00A7025806401027175E
+012C05141007175E012C00A70000FFFF012C00A7025804091027175E012C02DD1007175E
+012C00A70000FFFF012C00A7025806401027175E012C05141027175E012C02DD1007175E
+012C00A70000FFFF0384051404B006401007175E038405140000FFFF012C051404B00640
+1027175E012C05141007175E038405140000FFFF012C02DD04B006401027175E012C02DD
+1007175E038405140000FFFF012C02DD04B006401027175E012C05141027175E012C02DD
+1007175E038405140000FFFF012C00A704B006401027175E012C00A71007175E03840514
+0000FFFF012C00A704B006401027175E012C05141027175E012C00A71007175E03840514
+0000FFFF012C00A704B006401027175E012C02DD1027175E012C00A71007175E03840514
+0000FFFF012C00A704B006401027175E012C05141027175E012C02DD1027175E012C00A7
+1007175E038405140000FFFF038402DD04B004091007175E038402DD0000FFFF012C02DD
+04B006401027175E012C05141007175E038402DD0000FFFF012C02DD04B004091027175E
+012C02DD1007175E038402DD0000FFFF012C02DD04B006401027175E012C05141027175E
+012C02DD1007175E038402DD0000FFFF012C00A704B004091027175E012C00A71007175E
+038402DD0000FFFF012C00A704B006401027175E012C05141027175E012C00A71007175E
+038402DD0000FFFF012C00A704B004091027175E012C02DD1027175E012C00A71007175E
+038402DD0000FFFF012C00A704B006401027175E012C05141027175E012C02DD1027175E
+012C00A71007175E038402DD0000FFFF038402DD04B006401027175E038405141007175E
+038402DD0000FFFF012C02DD04B006401027175E012C05141027175E038405141007175E
+038402DD0000FFFF012C02DD04B006401027175E012C02DD1027175E038405141007175E
+038402DD0000FFFF012C02DD04B006401027175E012C05141027175E012C02DD1027175E
+038405141007175E038402DD0000FFFF012C00A704B006401027175E012C00A71027175E
+038405141007175E038402DD0000FFFF012C00A704B006401027175E012C05141027175E
+012C00A71027175E038405141007175E038402DD0000FFFF012C00A704B006401027175E
+012C02DD1027175E012C00A71027175E038405141007175E038402DD0000FFFF012C00A7
+04B006401027175E012C05141027175E012C02DD1027175E012C00A71027175E03840514
+1007175E038402DD0000FFFF038400A704B001D31007175E038400A70000FFFF012C00A7
+04B006401027175E012C05141007175E038400A70000FFFF012C00A704B004091027175E
+012C02DD1007175E038400A70000FFFF012C00A704B006401027175E012C05141027175E
+012C02DD1007175E038400A70000FFFF012C00A704B001D31027175E012C00A71007175E
+038400A70000FFFF012C00A704B006401027175E012C05141027175E012C00A71007175E
+038400A70000FFFF012C00A704B004091027175E012C02DD1027175E012C00A71007175E
+038400A70000FFFF012C00A704B006401027175E012C05141027175E012C02DD1027175E
+012C00A71007175E038400A70000FFFF038400A704B006401027175E038405141007175E
+038400A70000FFFF012C00A704B006401027175E012C05141027175E038405141007175E
+038400A70000FFFF012C00A704B006401027175E012C02DD1027175E038405141007175E
+038400A70000FFFF012C00A704B006401027175E012C05141027175E012C02DD1027175E
+038405141007175E038400A70000FFFF012C00A704B006401027175E012C00A71027175E
+038405141007175E038400A70000FFFF012C00A704B006401027175E012C05141027175E
+012C00A71027175E038405141007175E038400A70000FFFF012C00A704B006401027175E
+012C02DD1027175E012C00A71027175E038405141007175E038400A70000FFFF012C00A7
+04B006401027175E012C05141027175E012C02DD1027175E012C00A71027175E03840514
+1007175E038400A70000FFFF038400A704B004091027175E038402DD1007175E038400A7
+0000FFFF012C00A704B006401027175E012C05141027175E038402DD1007175E038400A7
+0000FFFF012C00A704B004091027175E012C02DD1027175E038402DD1007175E038400A7
+0000FFFF012C00A704B006401027175E012C05141027175E012C02DD1027175E038402DD
+1007175E038400A70000FFFF012C00A704B004091027175E012C00A71027175E038402DD
+1007175E038400A70000FFFF012C00A704B006401027175E012C05141027175E012C00A7
+1027175E038402DD1007175E038400A70000FFFF012C00A704B004091027175E012C02DD
+1027175E012C00A71027175E038402DD1007175E038400A70000FFFF012C00A704B00640
+1027175E012C05141027175E012C02DD1027175E012C00A71027175E038402DD1007175E
+038400A70000FFFF038400A704B006401027175E038405141027175E038402DD1007175E
+038400A70000FFFF012C00A704B006401027175E012C05141027175E038405141027175E
+038402DD1007175E038400A70000FFFF012C00A704B006401027175E012C02DD1027175E
+038405141027175E038402DD1007175E038400A70000FFFF012C00A704B006401027175E
+012C05141027175E012C02DD1027175E038405141027175E038402DD1007175E038400A7
+0000FFFF012C00A704B006401027175E012C00A71027175E038405141027175E038402DD
+1007175E038400A70000FFFF012C00A704B006401027175E012C05141027175E012C00A7
+1027175E038405141027175E038402DD1007175E038400A70000FFFF012C00A704B00640
+1027175E012C02DD1027175E012C00A71027175E038405141027175E038402DD1007175E
+038400A70000FFFF012C00A704B006401027175E012C05141027175E012C02DD1027175E
+012C00A71027175E038405141027175E038402DD1007175E038400A70000FFFF012CFE70
+0258FF9C1007175E012CFE700000FFFF012CFE70025806401027175E012C05141007175E
+012CFE700000FFFF012CFE70025804091027175E012C02DD1007175E012CFE700000FFFF
+012CFE70025806401027175E012C05141027175E012C02DD1007175E012CFE700000FFFF
+012CFE70025801D31027175E012C00A71007175E012CFE700000FFFF012CFE7002580640
+1027175E012C05141027175E012C00A71007175E012CFE700000FFFF012CFE7002580409
+1027175E012C02DD1027175E012C00A71007175E012CFE700000FFFF012CFE7002580640
+1027175E012C05141027175E012C02DD1027175E012C00A71007175E012CFE700000FFFF
+012CFE7004B006401027175E038405141007175E012CFE700000FFFF012CFE7004B00640
+1027175E012C05141027175E038405141007175E012CFE700000FFFF012CFE7004B00640
+1027175E012C02DD1027175E038405141007175E012CFE700000FFFF012CFE7004B00640
+1027175E012C05141027175E012C02DD1027175E038405141007175E012CFE700000FFFF
+012CFE7004B006401027175E012C00A71027175E038405141007175E012CFE700000FFFF
+012CFE7004B006401027175E012C05141027175E012C00A71027175E038405141007175E
+012CFE700000FFFF012CFE7004B006401027175E012C02DD1027175E012C00A71027175E
+038405141007175E012CFE700000FFFF012CFE7004B006401027175E012C05141027175E
+012C02DD1027175E012C00A71027175E038405141007175E012CFE700000FFFF012CFE70
+04B004091027175E038402DD1007175E012CFE700000FFFF012CFE7004B006401027175E
+012C05141027175E038402DD1007175E012CFE700000FFFF012CFE7004B004091027175E
+012C02DD1027175E038402DD1007175E012CFE700000FFFF012CFE7004B006401027175E
+012C05141027175E012C02DD1027175E038402DD1007175E012CFE700000FFFF012CFE70
+04B004091027175E012C00A71027175E038402DD1007175E012CFE700000FFFF012CFE70
+04B006401027175E012C05141027175E012C00A71027175E038402DD1007175E012CFE70
+0000FFFF012CFE7004B004091027175E012C02DD1027175E012C00A71027175E038402DD
+1007175E012CFE700000FFFF012CFE7004B006401027175E012C05141027175E012C02DD
+1027175E012C00A71027175E038402DD1007175E012CFE700000FFFF012CFE7004B00640
+1027175E038405141027175E038402DD1007175E012CFE700000FFFF012CFE7004B00640
+1027175E012C05141027175E038405141027175E038402DD1007175E012CFE700000FFFF
+012CFE7004B006401027175E012C02DD1027175E038405141027175E038402DD1007175E
+012CFE700000FFFF012CFE7004B006401027175E012C05141027175E012C02DD1027175E
+038405141027175E038402DD1007175E012CFE700000FFFF012CFE7004B006401027175E
+012C00A71027175E038405141027175E038402DD1007175E012CFE700000FFFF012CFE70
+04B006401027175E012C05141027175E012C00A71027175E038405141027175E038402DD
+1007175E012CFE700000FFFF012CFE7004B006401027175E012C02DD1027175E012C00A7
+1027175E038405141027175E038402DD1007175E012CFE700000FFFF012CFE7004B00640
+1027175E012C05141027175E012C02DD1027175E012C00A71027175E038405141027175E
+038402DD1007175E012CFE700000FFFF012CFE7004B001D31027175E038400A71007175E
+012CFE700000FFFF012CFE7004B006401027175E012C05141027175E038400A71007175E
+012CFE700000FFFF012CFE7004B004091027175E012C02DD1027175E038400A71007175E
+012CFE700000FFFF012CFE7004B006401027175E012C05141027175E012C02DD1027175E
+038400A71007175E012CFE700000FFFF012CFE7004B001D31027175E012C00A71027175E
+038400A71007175E012CFE700000FFFF012CFE7004B006401027175E012C05141027175E
+012C00A71027175E038400A71007175E012CFE700000FFFF012CFE7004B004091027175E
+012C02DD1027175E012C00A71027175E038400A71007175E012CFE700000FFFF012CFE70
+04B006401027175E012C05141027175E012C02DD1027175E012C00A71027175E038400A7
+1007175E012CFE700000FFFF012CFE7004B006401027175E038405141027175E038400A7
+1007175E012CFE700000FFFF012CFE7004B006401027175E012C05141027175E03840514
+1027175E038400A71007175E012CFE700000FFFF012CFE7004B006401027175E012C02DD
+1027175E038405141027175E038400A71007175E012CFE700000FFFF012CFE7004B00640
+1027175E012C05141027175E012C02DD1027175E038405141027175E038400A71007175E
+012CFE700000FFFF012CFE7004B006401027175E012C00A71027175E038405141027175E
+038400A71007175E012CFE700000FFFF012CFE7004B006401027175E012C05141027175E
+012C00A71027175E038405141027175E038400A71007175E012CFE700000FFFF012CFE70
+04B006401027175E012C02DD1027175E012C00A71027175E038405141027175E038400A7
+1007175E012CFE700000FFFF012CFE7004B006401027175E012C05141027175E012C02DD
+1027175E012C00A71027175E038405141027175E038400A71007175E012CFE700000FFFF
+012CFE7004B004091027175E038402DD1027175E038400A71007175E012CFE700000FFFF
+012CFE7004B006401027175E012C05141027175E038402DD1027175E038400A71007175E
+012CFE700000FFFF012CFE7004B004091027175E012C02DD1027175E038402DD1027175E
+038400A71007175E012CFE700000FFFF012CFE7004B006401027175E012C05141027175E
+012C02DD1027175E038402DD1027175E038400A71007175E012CFE700000FFFF012CFE70
+04B004091027175E012C00A71027175E038402DD1027175E038400A71007175E012CFE70
+0000FFFF012CFE7004B006401027175E012C05141027175E012C00A71027175E038402DD
+1027175E038400A71007175E012CFE700000FFFF012CFE7004B004091027175E012C02DD
+1027175E012C00A71027175E038402DD1027175E038400A71007175E012CFE700000FFFF
+012CFE7004B006401027175E012C05141027175E012C02DD1027175E012C00A71027175E
+038402DD1027175E038400A71007175E012CFE700000FFFF012CFE7004B006401027175E
+038405141027175E038402DD1027175E038400A71007175E012CFE700000FFFF012CFE70
+04B006401027175E012C05141027175E038405141027175E038402DD1027175E038400A7
+1007175E012CFE700000FFFF012CFE7004B006401027175E012C02DD1027175E03840514
+1027175E038402DD1027175E038400A71007175E012CFE700000FFFF012CFE7004B00640
+1027175E012C05141027175E012C02DD1027175E038405141027175E038402DD1027175E
+038400A71007175E012CFE700000FFFF012CFE7004B006401027175E012C00A71027175E
+038405141027175E038402DD1027175E038400A71007175E012CFE700000FFFF012CFE70
+04B006401027175E012C05141027175E012C00A71027175E038405141027175E038402DD
+1027175E038400A71007175E012CFE700000FFFF012CFE7004B006401027175E012C02DD
+1027175E012C00A71027175E038405141027175E038402DD1027175E038400A71007175E
+012CFE700000FFFF012CFE7004B006401027175E012C05141027175E012C02DD1027175E
+012C00A71027175E038405141027175E038402DD1027175E038400A71007175E012CFE70
+0000FFFF0384FE7004B0FF9C1007175E0384FE700000FFFF012CFE7004B006401027175E
+012C05141007175E0384FE700000FFFF012CFE7004B004091027175E012C02DD1007175E
+0384FE700000FFFF012CFE7004B006401027175E012C05141027175E012C02DD1007175E
+0384FE700000FFFF012CFE7004B001D31027175E012C00A71007175E0384FE700000FFFF
+012CFE7004B006401027175E012C05141027175E012C00A71007175E0384FE700000FFFF
+012CFE7004B004091027175E012C02DD1027175E012C00A71007175E0384FE700000FFFF
+012CFE7004B006401027175E012C05141027175E012C02DD1027175E012C00A71007175E
+0384FE700000FFFF0384FE7004B006401027175E038405141007175E0384FE700000FFFF
+012CFE7004B006401027175E012C05141027175E038405141007175E0384FE700000FFFF
+012CFE7004B006401027175E012C02DD1027175E038405141007175E0384FE700000FFFF
+012CFE7004B006401027175E012C05141027175E012C02DD1027175E038405141007175E
+0384FE700000FFFF012CFE7004B006401027175E012C00A71027175E038405141007175E
+0384FE700000FFFF012CFE7004B006401027175E012C05141027175E012C00A71027175E
+038405141007175E0384FE700000FFFF012CFE7004B006401027175E012C02DD1027175E
+012C00A71027175E038405141007175E0384FE700000FFFF012CFE7004B006401027175E
+012C05141027175E012C02DD1027175E012C00A71027175E038405141007175E0384FE70
+0000FFFF0384FE7004B004091027175E038402DD1007175E0384FE700000FFFF012CFE70
+04B006401027175E012C05141027175E038402DD1007175E0384FE700000FFFF012CFE70
+04B004091027175E012C02DD1027175E038402DD1007175E0384FE700000FFFF012CFE70
+04B006401027175E012C05141027175E012C02DD1027175E038402DD1007175E0384FE70
+0000FFFF012CFE7004B004091027175E012C00A71027175E038402DD1007175E0384FE70
+0000FFFF012CFE7004B006401027175E012C05141027175E012C00A71027175E038402DD
+1007175E0384FE700000FFFF012CFE7004B004091027175E012C02DD1027175E012C00A7
+1027175E038402DD1007175E0384FE700000FFFF012CFE7004B006401027175E012C0514
+1027175E012C02DD1027175E012C00A71027175E038402DD1007175E0384FE700000FFFF
+0384FE7004B006401027175E038405141027175E038402DD1007175E0384FE700000FFFF
+012CFE7004B006401027175E012C05141027175E038405141027175E038402DD1007175E
+0384FE700000FFFF012CFE7004B006401027175E012C02DD1027175E038405141027175E
+038402DD1007175E0384FE700000FFFF012CFE7004B006401027175E012C05141027175E
+012C02DD1027175E038405141027175E038402DD1007175E0384FE700000FFFF012CFE70
+04B006401027175E012C00A71027175E038405141027175E038402DD1007175E0384FE70
+0000FFFF012CFE7004B006401027175E012C05141027175E012C00A71027175E03840514
+1027175E038402DD1007175E0384FE700000FFFF012CFE7004B006401027175E012C02DD
+1027175E012C00A71027175E038405141027175E038402DD1007175E0384FE700000FFFF
+012CFE7004B006401027175E012C05141027175E012C02DD1027175E012C00A71027175E
+038405141027175E038402DD1007175E0384FE700000FFFF0384FE7004B001D31027175E
+038400A71007175E0384FE700000FFFF012CFE7004B006401027175E012C05141027175E
+038400A71007175E0384FE700000FFFF012CFE7004B004091027175E012C02DD1027175E
+038400A71007175E0384FE700000FFFF012CFE7004B006401027175E012C05141027175E
+012C02DD1027175E038400A71007175E0384FE700000FFFF012CFE7004B001D31027175E
+012C00A71027175E038400A71007175E0384FE700000FFFF012CFE7004B006401027175E
+012C05141027175E012C00A71027175E038400A71007175E0384FE700000FFFF012CFE70
+04B004091027175E012C02DD1027175E012C00A71027175E038400A71007175E0384FE70
+0000FFFF012CFE7004B006401027175E012C05141027175E012C02DD1027175E012C00A7
+1027175E038400A71007175E0384FE700000FFFF0384FE7004B006401027175E03840514
+1027175E038400A71007175E0384FE700000FFFF012CFE7004B006401027175E012C0514
+1027175E038405141027175E038400A71007175E0384FE700000FFFF012CFE7004B00640
+1027175E012C02DD1027175E038405141027175E038400A71007175E0384FE700000FFFF
+012CFE7004B006401027175E012C05141027175E012C02DD1027175E038405141027175E
+038400A71007175E0384FE700000FFFF012CFE7004B006401027175E012C00A71027175E
+038405141027175E038400A71007175E0384FE700000FFFF012CFE7004B006401027175E
+012C05141027175E012C00A71027175E038405141027175E038400A71007175E0384FE70
+0000FFFF012CFE7004B006401027175E012C02DD1027175E012C00A71027175E03840514
+1027175E038400A71007175E0384FE700000FFFF012CFE7004B006401027175E012C0514
+1027175E012C02DD1027175E012C00A71027175E038405141027175E038400A71007175E
+0384FE700000FFFF0384FE7004B004091027175E038402DD1027175E038400A71007175E
+0384FE700000FFFF012CFE7004B006401027175E012C05141027175E038402DD1027175E
+038400A71007175E0384FE700000FFFF012CFE7004B004091027175E012C02DD1027175E
+038402DD1027175E038400A71007175E0384FE700000FFFF012CFE7004B006401027175E
+012C05141027175E012C02DD1027175E038402DD1027175E038400A71007175E0384FE70
+0000FFFF012CFE7004B004091027175E012C00A71027175E038402DD1027175E038400A7
+1007175E0384FE700000FFFF012CFE7004B006401027175E012C05141027175E012C00A7
+1027175E038402DD1027175E038400A71007175E0384FE700000FFFF012CFE7004B00409
+1027175E012C02DD1027175E012C00A71027175E038402DD1027175E038400A71007175E
+0384FE700000FFFF012CFE7004B006401027175E012C05141027175E012C02DD1027175E
+012C00A71027175E038402DD1027175E038400A71007175E0384FE700000FFFF0384FE70
+04B006401027175E038405141027175E038402DD1027175E038400A71007175E0384FE70
+0000FFFF012CFE7004B006401027175E012C05141027175E038405141027175E038402DD
+1027175E038400A71007175E0384FE700000FFFF012CFE7004B006401027175E012C02DD
+1027175E038405141027175E038402DD1027175E038400A71007175E0384FE700000FFFF
+012CFE7004B006401027175E012C05141027175E012C02DD1027175E038405141027175E
+038402DD1027175E038400A71007175E0384FE700000FFFF012CFE7004B006401027175E
+012C00A71027175E038405141027175E038402DD1027175E038400A71007175E0384FE70
+0000FFFF012CFE7004B006401027175E012C05141027175E012C00A71027175E03840514
+1027175E038402DD1027175E038400A71007175E0384FE700000FFFF012CFE7004B00640
+1027175E012C02DD1027175E012C00A71027175E038405141027175E038402DD1027175E
+038400A71007175E0384FE700000FFFF012CFE7004B006401027175E012C05141027175E
+012C02DD1027175E012C00A71027175E038405141027175E038402DD1027175E038400A7
+1007175E0384FE700000FFFF012CFE7004B0FF9C1027175E012CFE701007175E0384FE70
+0000FFFF012CFE7004B006401027175E012C05141027175E012CFE701007175E0384FE70
+0000FFFF012CFE7004B004091027175E012C02DD1027175E012CFE701007175E0384FE70
+0000FFFF012CFE7004B006401027175E012C05141027175E012C02DD1027175E012CFE70
+1007175E0384FE700000FFFF012CFE7004B001D31027175E012C00A71027175E012CFE70
+1007175E0384FE700000FFFF012CFE7004B006401027175E012C05141027175E012C00A7
+1027175E012CFE701007175E0384FE700000FFFF012CFE7004B004091027175E012C02DD
+1027175E012C00A71027175E012CFE701007175E0384FE700000FFFF012CFE7004B00640
+1027175E012C05141027175E012C02DD1027175E012C00A71027175E012CFE701007175E
+0384FE700000FFFF012CFE7004B006401027175E038405141027175E012CFE701007175E
+0384FE700000FFFF012CFE7004B006401027175E012C05141027175E038405141027175E
+012CFE701007175E0384FE700000FFFF012CFE7004B006401027175E012C02DD1027175E
+038405141027175E012CFE701007175E0384FE700000FFFF012CFE7004B006401027175E
+012C05141027175E012C02DD1027175E038405141027175E012CFE701007175E0384FE70
+0000FFFF012CFE7004B006401027175E012C00A71027175E038405141027175E012CFE70
+1007175E0384FE700000FFFF012CFE7004B006401027175E012C05141027175E012C00A7
+1027175E038405141027175E012CFE701007175E0384FE700000FFFF012CFE7004B00640
+1027175E012C02DD1027175E012C00A71027175E038405141027175E012CFE701007175E
+0384FE700000FFFF012CFE7004B006401027175E012C05141027175E012C02DD1027175E
+012C00A71027175E038405141027175E012CFE701007175E0384FE700000FFFF012CFE70
+04B004091027175E038402DD1027175E012CFE701007175E0384FE700000FFFF012CFE70
+04B006401027175E012C05141027175E038402DD1027175E012CFE701007175E0384FE70
+0000FFFF012CFE7004B004091027175E012C02DD1027175E038402DD1027175E012CFE70
+1007175E0384FE700000FFFF012CFE7004B006401027175E012C05141027175E012C02DD
+1027175E038402DD1027175E012CFE701007175E0384FE700000FFFF012CFE7004B00409
+1027175E012C00A71027175E038402DD1027175E012CFE701007175E0384FE700000FFFF
+012CFE7004B006401027175E012C05141027175E012C00A71027175E038402DD1027175E
+012CFE701007175E0384FE700000FFFF012CFE7004B004091027175E012C02DD1027175E
+012C00A71027175E038402DD1027175E012CFE701007175E0384FE700000FFFF012CFE70
+04B006401027175E012C05141027175E012C02DD1027175E012C00A71027175E038402DD
+1027175E012CFE701007175E0384FE700000FFFF012CFE7004B006401027175E03840514
+1027175E038402DD1027175E012CFE701007175E0384FE700000FFFF012CFE7004B00640
+1027175E012C05141027175E038405141027175E038402DD1027175E012CFE701007175E
+0384FE700000FFFF012CFE7004B006401027175E012C02DD1027175E038405141027175E
+038402DD1027175E012CFE701007175E0384FE700000FFFF012CFE7004B006401027175E
+012C05141027175E012C02DD1027175E038405141027175E038402DD1027175E012CFE70
+1007175E0384FE700000FFFF012CFE7004B006401027175E012C00A71027175E03840514
+1027175E038402DD1027175E012CFE701007175E0384FE700000FFFF012CFE7004B00640
+1027175E012C05141027175E012C00A71027175E038405141027175E038402DD1027175E
+012CFE701007175E0384FE700000FFFF012CFE7004B006401027175E012C02DD1027175E
+012C00A71027175E038405141027175E038402DD1027175E012CFE701007175E0384FE70
+0000FFFF012CFE7004B006401027175E012C05141027175E012C02DD1027175E012C00A7
+1027175E038405141027175E038402DD1027175E012CFE701007175E0384FE700000FFFF
+012CFE7004B001D31027175E038400A71027175E012CFE701007175E0384FE700000FFFF
+012CFE7004B006401027175E012C05141027175E038400A71027175E012CFE701007175E
+0384FE700000FFFF012CFE7004B004091027175E012C02DD1027175E038400A71027175E
+012CFE701007175E0384FE700000FFFF012CFE7004B006401027175E012C05141027175E
+012C02DD1027175E038400A71027175E012CFE701007175E0384FE700000FFFF012CFE70
+04B001D31027175E012C00A71027175E038400A71027175E012CFE701007175E0384FE70
+0000FFFF012CFE7004B006401027175E012C05141027175E012C00A71027175E038400A7
+1027175E012CFE701007175E0384FE700000FFFF012CFE7004B004091027175E012C02DD
+1027175E012C00A71027175E038400A71027175E012CFE701007175E0384FE700000FFFF
+012CFE7004B006401027175E012C05141027175E012C02DD1027175E012C00A71027175E
+038400A71027175E012CFE701007175E0384FE700000FFFF012CFE7004B006401027175E
+038405141027175E038400A71027175E012CFE701007175E0384FE700000FFFF012CFE70
+04B006401027175E012C05141027175E038405141027175E038400A71027175E012CFE70
+1007175E0384FE700000FFFF012CFE7004B006401027175E012C02DD1027175E03840514
+1027175E038400A71027175E012CFE701007175E0384FE700000FFFF012CFE7004B00640
+1027175E012C05141027175E012C02DD1027175E038405141027175E038400A71027175E
+012CFE701007175E0384FE700000FFFF012CFE7004B006401027175E012C00A71027175E
+038405141027175E038400A71027175E012CFE701007175E0384FE700000FFFF012CFE70
+04B006401027175E012C05141027175E012C00A71027175E038405141027175E038400A7
+1027175E012CFE701007175E0384FE700000FFFF012CFE7004B006401027175E012C02DD
+1027175E012C00A71027175E038405141027175E038400A71027175E012CFE701007175E
+0384FE700000FFFF012CFE7004B006401027175E012C05141027175E012C02DD1027175E
+012C00A71027175E038405141027175E038400A71027175E012CFE701007175E0384FE70
+0000FFFF012CFE7004B004091027175E038402DD1027175E038400A71027175E012CFE70
+1007175E0384FE700000FFFF012CFE7004B006401027175E012C05141027175E038402DD
+1027175E038400A71027175E012CFE701007175E0384FE700000FFFF012CFE7004B00409
+1027175E012C02DD1027175E038402DD1027175E038400A71027175E012CFE701007175E
+0384FE700000FFFF012CFE7004B006401027175E012C05141027175E012C02DD1027175E
+038402DD1027175E038400A71027175E012CFE701007175E0384FE700000FFFF012CFE70
+04B004091027175E012C00A71027175E038402DD1027175E038400A71027175E012CFE70
+1007175E0384FE700000FFFF012CFE7004B006401027175E012C05141027175E012C00A7
+1027175E038402DD1027175E038400A71027175E012CFE701007175E0384FE700000FFFF
+012CFE7004B004091027175E012C02DD1027175E012C00A71027175E038402DD1027175E
+038400A71027175E012CFE701007175E0384FE700000FFFF012CFE7004B006401027175E
+012C05141027175E012C02DD1027175E012C00A71027175E038402DD1027175E038400A7
+1027175E012CFE701007175E0384FE700000FFFF012CFE7004B006401027175E03840514
+1027175E038402DD1027175E038400A71027175E012CFE701007175E0384FE700000FFFF
+012CFE7004B006401027175E012C05141027175E038405141027175E038402DD1027175E
+038400A71027175E012CFE701007175E0384FE700000FFFF012CFE7004B006401027175E
+012C02DD1027175E038405141027175E038402DD1027175E038400A71027175E012CFE70
+1007175E0384FE700000FFFF012CFE7004B006401027175E012C05141027175E012C02DD
+1027175E038405141027175E038402DD1027175E038400A71027175E012CFE701007175E
+0384FE700000FFFF012CFE7004B006401027175E012C00A71027175E038405141027175E
+038402DD1027175E038400A71027175E012CFE701007175E0384FE700000FFFF012CFE70
+04B006401027175E012C05141027175E012C00A71027175E038405141027175E038402DD
+1027175E038400A71027175E012CFE701007175E0384FE700000FFFF012CFE7004B00640
+1027175E012C02DD1027175E012C00A71027175E038405141027175E038402DD1027175E
+038400A71027175E012CFE701007175E0384FE700000FFFF012CFE7004B006401027175E
+012C05141027175E012C02DD1027175E012C00A71027175E038405141027175E038402DD
+1027175E038400A71027175E012CFE701007175E0384FE7000000002006400CC063F0438
+000D00120000012117070135011707213533112311352107170595FC735D78FE77018978
+5D038DAAAAFBFB696901A15D7801895A0189785DCDFCA40145D2696900000002007500CC
+06500438000D0012000001212737011501273721152311331115213727011F038D5D7801
+89FE77785DFC73AAAA0405696903635D78FE775AFE77785DCD035CFEBBD2696900000001
+0100000005B405DC001100000901330107271123112711231107112311070100022D5A02
+2D785C78D278D2785C03AE022EFDD2785CFC6E040AD3FB2304DDD3FBF603925C00000001
+0100FFF905B405D5001100000137171133111711331137113311371701230100785C78D2
+78D2785C78FDD35A0227785C0392FBF6D304DDFB23D3040AFC6E5C78FDD20002004F0080
+052706B5001E003D00002522272627262726103736373637011707161716171617161007
+060706070603301707010607060706141716171E01333237363736373634272627262726
+02BD7F706B5F56312E2E31566272018978E960586B5F56312E2E31565F6B7049EA78FEB8
+58453F232121273B42A25D595153403F232121273B425139802E2D5C5A6E6C01006C6E5A
+5F2E018978E908242D5C5A6E6CFF006C6E5A5C2D2E0429E8780146214640524EBE4A563C
+424221234040524EBE4A563C4221170000000002004F0080052706B5001E003C00002522
+272627262726103736373637363727370116171617161007060706070603060706070607
+061417161716171633323637363736342726272627012702B97B706B5F56312E2E31565F
+6B5860E9780189726256312E2E31565F6B70B13F3951423B272121233F405351595DA242
+3B272121233F4558FEB878802E2D5C5A6E6C01006C6E5A5C2D2408E978FE772E5F5A6E6C
+FF006C6E5A5C2D2E0429071721423C564ABE4E524040232142423C564ABE4E52404621FE
+BA7800020100FEB204DF06140010002E005C40122E1D20131A111B16060D0027240F252B
+202F10DCB20020015D4BB00C5458B90020004038593CCC393939CC32DCB40F061F06025D
+DCCC3239391139393100400E0F27A925041A1CC025091311B12F10F4CC32C4F4CC3210EC
+3930011514161726351134370E011D011007160115232206151114163B01152122263D01
+34262B01353332363D01343633029C4BB03230B049ADAD0243358C55558C35FEF9F9A76C
+8E3E3E8E6CA7F90112EF986D07479D04D0A142076B98F0FEEE3E4403F464578EFB308D58
+6494DDEF97748F7395F0DD93000000020100FEB204DF06140010002E0057401212232E1C
+19021B162005000A2D262E25292F10DC4BB00A5458B90029FFC03859CC323939CCDCB40F
+001F00025D3CDC3CCC3939391139393100400E0219A91B0D2624C01B082D11B12F10F4CC
+32C4F4CC3210EC393001103726113534262716151114073E0135012132161D0114163B01
+152322061D011406232135333236351134262B010343ADAD49B03032B04BFDBD0107F9A7
+6C8E3E3E8E6CA7F9FEF9358C55558C350112010E443E0112F0986B0742A1FB309D47076D
+9805F193DDF095738F7497EFDD9464588D04D08E5700000400D9FE3205DB05F900020006
+0009000D0000051109023501050901031101150531FCAA0400FAFE0502FBA80356FCAAAA
+0502CC0264FECEFDCC01E1A601E10701320132FC9A0468FE1FA6000300D9001E072704E6
+00030006000A0000252311330111090235010727AAAAFE0AFCA20408FAFE05021E04C8FC
+3A02C4FE9EFD9C0211A602110000000300D9001E072704E600030006000A000037113311
+090203110115D9AA014C035EFCA2AA05021E04C8FB38010201620162FC3A04C8FDEFA600
+0000000200D9FFC207270542000500080000171109011101370111D903270327FCD99B01
+E23E0580FDB00250FA80024E71FEA202C600000200D9FFC2072705420005000800001711
+09011101270111D903270327FCD99BFE1E3E0580FDB00250FA80024E71015EFD44000001
+00D9FFC20727054200050000171109011101D903270327FCD93E0580FDB00250FA80024E
+0000000100D9FFC207270542000800002515090111090115010727FCD9FCD903270327FD
+74A2E0024EFDB20580FDB00250DDFE1C0000000100D9FFC2072705420008000013350901
+1109013501D903270327FCD9FCD9028C0462E0FDB2024EFA800250FDB0DD01E400000001
+0006FE2303EE067500030000090301FA01F4FE0CFE0C0675FBDBFBD3042D000100D90000
+05DB0504001300000111331121113311211521112311211123112135020CA8014CA80133
+FECDA8FEB4A8FECD02D7022DFDD3022DFDD3AAFDD3022DFDD3022DAA0000000100D90000
+05DB0504001B000001113311331133113311331133152311231123112311231123112335
+01A8A8B6A8B6A8CFCFA8B6A8B6A8CF02D7022DFDD3022DFDD3022DFDD3AAFDD3022DFDD3
+022DFDD3022DAA0000000003003AFE6B07C605FB0003001D003700000121112100200706
+070602151412171617162037363736123534022726272420041716171615140706070604
+20242726272635343736373603680130FED00138FEC08C89727472727472898C01408C89
+72747272747289FE0D018E01568E8E474646478E8EFEAAFE72FEAA8E8E474646478E8E02
+E8FE9203C83B3A7273FEECA39FFEEC73723A3B3B3A727301149FA3011473723AF4908D8E
+ACAAC9C5ACAA8E8D90908D8EAAACC5C9AAAC8E8D00000003003AFE6B07C605FB00190033
+003F00000020070607060215141217161716203736373612353402272627242004171617
+161514070607060420242726272635343736373605112115211123112135211104A0FEC0
+8C89727472727472898C01408C8972747272747289FE0D018E01568E8E474646478E8EFE
+AAFE72FEAA8E8E474646478E80027F028DFD73A8FD73028D05423B3A7273FEECA39FFEEC
+73723A3B3B3A727301149FA3011473723AF4908D8EACAAC9C5ACAA8E8D90908D8EAAACC5
+C9AAAC8E804BFD73AAFD73028DAA028D00000003003AFE6B07C605FB00190033003F0000
+002007060706021514121716171620373637361235340227262724200417161716151407
+0607060420242726272635343736373617090117090107090127090104A0FEC08C897274
+72727472898C01408C8972747272747289FE0D018E01568E8E474646478E8EFEAAFE72FE
+AA8E8E474646478E805D01CD01CE78FE3301CD77FE33FE327801CDFE3305423B3A7273FE
+ECA39FFEEC73723A3B3B3A727301149FA3011473723AF4908D8EACAAC9C5ACAA8E8D9090
+8D8EAAACC5C9AAAC8E80E8FE3301CD78FE32FE337701CDFE337801CE01CDFFFF0075FE4D
+0A25060E10270CB5066F000010260CB5000010270CB50225000010070CB5044A00000001
+0075FE4D03B6060E001D0000051633323713213521133E01321617072623220703211521
+030E012226270109113B450820FEEE011A19089F98801494103C4508180112FEE621089F
+9880149B82AF029AAA020CA5877A8F0F82AFFE0DAAFD4DA5877A8F00000000010075FE4D
+03B6060E0025000005163332371321352137213521133E01321617072623220703211521
+07211521030E012226270109113B450816FEF801100CFEE401240F089F98801494113B45
+080E0108FEF00C011CFEDC17089F9880149B82AF01CEAAF0A80140A5877A8F0F82AFFED9
+A8F0AAFE19A5877A8F0000010075FE4D03B6060E001D0000012623220703251505030E01
+222627371633323713053525133E013216170322113B45081A0143FEB51F089F98801494
+113B45081AFEBE014A1F089F98801404F682AFFDE7B6A0BAFD6DA5877A8F0F82AF0219B6
+A0BA0293A5877A8F000000020075FE4D03B6060E002A0033000001262322070316170726
+27033637170607030E012226273716333237132627263534373637133E01321617011306
+0706151417160322113B45080E99497128501620153E36440F089F98801494113B45080F
+5D496E6F53750F089F988014FE01163D2C484B2504F682AFFED62988414821FE2B061170
+2409FEBEA5877A8F0F82AF013118496F9B9C735613013CA4887A8FFC4501D6112E4A6768
+482400010075FE4D042D060E003200000126232207033637363D01072737331707271514
+070607030E01222627371633323713262726353314171617133E01321716170322113B45
+082B402F565D48BD36BC485C6E556D1108A097801494113B4409105B3E776650332C2C08
+A09749361504F682AFFC78102F55721E5D48BDBD485D1E9C6C5611FEA1A5877A8F0F82AF
+014D193E779A724E330B0399A58746348F0000020075FE4D03B6060E0003002100000133
+15230313211121133E01321617072623220703211121030E012226273716333201B2D3D3
+10110177FEA51408A2977E1494113946090E0139FEA10D08A9917D149411394702A6FEFD
+EA0172023001AEA7857D8C0F82AFFEF5FCBCFEFFAD7F7D8C0F8200020075FE4D03B6060E
+0003002B000001331523130607133E0132161707262322070316171610070607030E0122
+262737163332371316333236342601B2D3D363291F1608A2977E1494113947080E63426E
+6E56730F08A2977E1494113946091628366F879402A6FE017E020501C3A7857C8D0F82AF
+FED6184B7CFED26F5513FEBEA7857D8C0F82AF01B61093D87F0000020075FE4D0470060E
+0003002E00000133152301163332371316171632363426232207133E0132161707262322
+0703363332161006232227030E01222627028FD3D3FE7A113B45081B2D3870C6968A71D5
+531806A297801494113B45080F3B44A9CEDC9B57491108A097801402AEFEFDB582AF0233
+3E1C3691D18FA1025DA4887A8F0F82AFFECB13E9FED2DB21FEA3A5877A8F00030075FE4D
+03B6060E0003000B00310000013315231636342622061416031633323713262726103736
+37133E0132161707262322070316171610070607030E0122262701ADD3D3CB948AD6908F
+A2113B45080F5D496E6F53750F089F98801494113B45080E63426E6E56730F089F988014
+02B0FE7A90D18F91CF90FE2D82AF013118496F0137735613013CA4887A8F0F82AFFED618
+4B7CFED26F5513FEBEA5877A8F0000030075FE4D03B6060E001D00210025000037112113
+3E01321617072623220703211121030E0122262737163332371B01033311212311339801
+3B1008A2977E1494113947080F0118FEC40E08A98F7F1494113947080DC518ACFEC5AB93
+9B02FE0149A7857D8C0F82AFFED0FD02FEDEAD7F7B8E0F82AF01090274FE1601EAFE1600
+00000001FFBEFE4D046D060E002D0000012623220703213216140623353637262721030E
+01222627371633323713211707013501170721133E01321716170322113B450819010E64
+8B905F60080860FEEB21089F98801494113B440920FEDCBB60FEC5013B60BB012A1B089F
+9849361504F682AFFDEF8FC68C8804656206FD49A5877A8F0F82AF029EBA60013A48013A
+60BA022AA58746348F0000010075FE4D03B6060E00230000012623220703371707170727
+030E01222627371633323713072737273717133E013216170322113B4508149D78FCFC78
+B119089F98801494113B4508179F7AFEFC78B217089F98801404F682AFFE589D79FCFC78
+B0FDF4A5877A8F0F82AF01E2A079FCFC78B301D8A5877A8F000000010075FE4D03B6060E
+002A000005163332371306070615112311343637133E0132161707262322070316171615
+1123113427030E012226270109113B45082D412034799B790E089F98801494113B45080D
+5A3E56797C2D089F9880149B82AF03A61032509CFEC80149CFBC11012BA5877A8F0F82AF
+FEE6184561D6FEB70138F332FC4AA5877A8F00010075FE4D03B6060E0027000001262322
+070336190133111005030E01222627371633323713262726351133111417133E01321617
+0322113B45082A9279FEEF11089F98801494113B4508105C3F56797E2B089F98801404F6
+82AFFC8D2601070138FEB7FE8C27FEA2A5877A8F0F82AF014C174661D60149FEC8F53103
+85A5877A8F0000020075FE4D03C006F90017001B0000013E01333216170726232207030E
+012322262737163332370115213501E308A24B4C7E1494113947084108A24C4B7E149411
+394708021EFCEF04E2A7857D8C0F82AFFAB0A7857D8C0F82AF0767A0A0000002006BFD62
+03B6060E0017001B0000013E01333216170726232207030E012322262737163332370135
+211501E308A24B4C7E1494113947084108A24C4B7E149411394708FEC9031104E2A7857D
+8C0F82AFFAB0A7857D8C0F82AFFDD0A0A000FFFF0119003F059C04C5100600990000FFFF
+00D901D305DB046A10260CC6000010070D4F02140124FFFF00D9009F05DB046A10260CC6
+000010270D4F00E7FE5710070D4F03400124000200D9FF0405DB04A60003000A00000515
+013509021501350105DBFAFE0502FBF80408FAFE050246B601D1B60265FE91FE93B601D1
+A601D1000000000200D9FF0405DB04A60003000A00001701150111350115013501D90502
+FAFE0502FAFE04084601D1B6FE2F04ECB6FE2FA6FE2FB6016D00FFFF00D9FF0405DD04A6
+10270D4F042FFFBB100611850000FFFF00D9FF0405DB04A610260D4FFEBB100611860000
+0000FFFF00D9FF0405DB052710270D4F010F01E1100611850000FFFF00D9FF0405DB0527
+10270D4F031D01E1100611860000FFFF00D9FF0405DD061210270D4F042F02CC10061185
+0000FFFF00D9FF0405DB060D10270D4FFFFE02C7100611860000000300D9FEF105DC054E
+001C003A0041000025150E01232227262726272623220607353E013332171E0117163332
+3613150E01232227262726272623220607353E0133321716171617163332361309011501
+350105DC6AB2626E920A0606109A5E58AC6268B4606E940A0C0E9C5E56A8686AB2626E92
+0A0606109A5E58AC6268B4606E940A04080E9C5E56A867FC4003C0FAFE050250B34E453B
+040302063D4C54B34E453B0504063D4B019BB250443A040402063C4C52B24E443A040204
+063C4A035EFEEBFEEEB20170AA016F000000000300D9FEF105DC054E001C003A00410000
+25150E01232227262726272623220607353E013332171E01171633323613150E01232227
+262726272623220607353E0133321716171617163332360135011501350105DC6AB2626E
+920A0606109A5E58AC6268B4606E940A0C0E9C5E56A8686AB2626E920A0606109A5E58AC
+6268B4606E940A04080E9C5E56A8FB650502FAFE03C050B34E453B040302063D4C54B34E
+453B0504063D4B019BB250443A040402063C4C52B24E443A040204063C4A035EB0FE91AA
+FE90B2011200000200D9FF0805DB04A8000B001200000117072115210727372135210902
+1501350103AC965A01F3FDB285965AFE0D024E02B4FC4003C0FAFE050201A250A8AAF850
+A8AA034EFEEBFEEEB20170AA016F000200D9FF0805DB04A8000B00120000011707211521
+0727372135210135011501350103AC965A01F3FDB285965AFE0D024EFDB20502FAFE03C0
+01A250A8AAF850A8AA034EB0FE91AAFE90B201120000000200D9FE5F05DC054E0036003D
+000001150E01232227071633323637150E0123222F010727372623220607353E01333217
+3726232206073536373617161F01371707163332361309011501350105DC6AB262445334
+8C5756A8686AB2626D93085CA459402F58AC6268B4604553338B5658AC62685A6D4D9270
+075BA459403156A867FC4003C0FAFE05020196B250441783344B55B34E453B03E940E210
+4C54B34E451782344C52B24E222A080E2C03E940E30F4A035EFEEBFEEEB20170AA016F00
+0000000200D9FE5F05DC054E0035003C000001150E01232227071633323637150E012322
+2F010727372623220607353E01333217372623220607353E0133321F0137170716333236
+0135011501350105DC6AB2624453348C5756A8686AB2626D93085CA459402F58AC6268B4
+604553338B5658AC6268B4606E94075BA459403156A8FB650502FAFE03C00196B2504417
+83344B55B34E453B03E940E2104C54B34E451782344C52B24E443A03E940E30F4A035EB0
+FE91AAFE90B201120000000400D9FD8405DB06540006000A001100150000011501350115
+0501213521012D01350115090121352105DBFAFE0502FC8B0375FAFE0502FAFE0375FC8B
+0502FAFE0502FAFE050203FBB0012FAA0130B2D2FD5CAAFB5ED5D2B2FED0AAFED1037EAA
+0000000400D9FD8405DB06540006000A001100150000132D013501150111352115111501
+3501150501352115D90375FC8B0502FAFE0502FAFE0502FC8BFE73050203FBD5D2B2FED0
+AAFED1FEE1AAAAFC08B0012FAA0130B2D201F9AAAA00000300D9FF0205DC054E001A001E
+0025000001150E0123222F0126272623220607353E0133321F0216333236012115210902
+1501350105DC6AB3616E921006109A5E58AC6268B4606E940E169C5E56A8FB660502FAFE
+0501FC4003C0FAFE05020196B250443A0802063C4B53B24E443A060A3C4AFE6CAA059CFE
+EBFEEEB20170AA016F00000300D9FF0205DC054E001A001E0025000001150E0123222F01
+26272623220607353E0133321F0216333236012115210335011501350105DC6AB3616E92
+1006109A5E58AC6268B4606E940E169C5E56A8FB660502FAFE010502FAFE03C00196B250
+443A0802063C4B53B24E443A060A3C4AFE6CAA059CB0FE91AAFE90B20112000300D9FE12
+05DB060C001A00210028000001150E0123222F0126272623220607353E0133321F021633
+323613150135011505012D013501150105DB69B3616E9211060F9B5E58AC6269B3616E93
+0F169B5E56A967FAFE0502FC8BFE730375FC8B0502FAFE02BEB24F453B0702063D4C53B2
+4E453B06093D4B014AB0012FAA0130B2D2FA3AD5D2B2FED0AAFED1000000000300D9FE12
+05DB060C001A00210028000001150E0123222F0126272623220607353E0133321F021633
+3236012D01350115090115013501150505DB69B3616E9211060F9B5E58AC6269B3616E93
+0F169B5E56A9FB650375FC8B0502FAFE0502FAFE0502FC8B02BEB24F453B0702063D4C53
+B24E453B06093D4B014AD5D2B2FED0AAFED1FBBFB0012FAA0130B2D20000000400D9FE2C
+05DB05D70006000A001100150000132D0135011501113521151115013501150501352115
+D90375FC8B0502FAFE0502FAFE0502FC8BFE7305020125D5D2B2FED0AAFED1FEE1AAAA04
+28B0012FAA0130B2D2F9D9AAAA00000400D9FE2C05DB05D70006000A0011001500000115
+013501150501213521012D01350115090121352105DBFAFE0502FC8B0375FAFE0502FAFE
+0375FC8B0502FAFE0502FAFE05020125B0012FAA0130B2D2FD5CAA037ED5D2B2FED0AAFE
+D1FB5EAA0000000400D9FE3605DB05EE0006000A00110015000001150135011505090135
+09012D01350115011135011505DBFAFE0502FC8B0375FAFE0502FAFE0375FC8B0502FAFE
+05020395B0012FAA0130B2D2FD56012FB0FED1FDA6D5D2B2FED0AAFED1FED0B0012FB000
+0000000400D9FE3605DB05EE0006000A001100150000132D013501150111350115111501
+3501150509013501D90375FC8B0502FAFE0502FAFE0502FC8B0375FAFE05020395D5D2B2
+FED0AAFED1FEDBB0012FB0FD27B0012FAA0130B2D2FD4B012FB0FED10000000200D9FF84
+05DB05260003000A0000090135011115013501150105DBFAFE0502FAFE0502FBF80470FE
+2FB601D1FB14B601D1A601D1B6FE93000000000200D9FF8405DB05260003000A00001335
+0115090235011501D90502FAFE0408FBF80502FAFE0470B6FE2FB6FD9B016F016DB6FE2F
+A6FE2F000000FFFF00D9FF8405DD052610270D4F042FFEEE1006119D0000FFFF00D9FF84
+05DB052610270D4FFFFEFEE41006119E0000000300DAFFB605DC057B0003000A000E0000
+133521151115013501150901352115DA0502FAFE0502FC40FEBE050204D1AAAAFB95B001
+6FAA0170B2FEEE0239AAAA000000000300DAFFB605DC057B0003000A000E000001213521
+0902350115090121352105DCFAFE0502FAFE03C0FC400502FAFE0502FAFE050204D1AAFA
+EB01150112B2FE90AAFE9103FEAA000300D9FFC005DB05CD00030007000E000013350115
+0135011511150135011501D90502FAFE0502FAFE0502FC4003ABB20170B2FD4EB20170B2
+FC97B0016FAA0170B2FEEE000000000300D9FFC005DB05CD00030007000E000009013501
+11013509033501150105DBFAFE0502FAFE0502FAFE03C0FC400502FAFE03AB0170B2FE90
+FE0C0170B2FE90FD5501150112B2FE90AAFE91000000000200D9001105DC0528001B0022
+0000012E012322070E01070623222627351E013332373E01373633321617031501350115
+0105DC68A8565E9C0E0C0A946E60B46862AC585E9A100C0A926E62B26A01FAFE0502FC40
+03CA544C3E0604043C464EB2544C3E0604043C464EFC45B0016FAA0170B2FEEE00000002
+00D9003005DC0528001B00220000012E012322070E01070623222627351E013332373E01
+37363332161709023501150105DC68A8565E9C0E0C0A946E60B46862AC585E9A100C0A92
+6E62B26AFAFD03C1FC3F0502FAFE03CA544C3E0604043C464EB2544C3E0604043C464EFC
+6401150112B2FE90AAFE91000000000400D9FE9805DC05D4000300070024002B00001735
+211501352115132E012322070E01070623222627351E0133323736373637363332161703
+150135011501D90502FAFE05020168A8565E9C0E0C0A946E60B46862AC585E9A1006060A
+926E62B26A01FAFE0502FC403EAAAAFED6AAAA05DC564A3C0604063A444EB4544C3C0602
+04043A444EFC44B0016FAA0170B2FEEE0000000400D9FE9805DC05D4000300070024002B
+00001735211501352115132E012322070E01070623222627351E01333237363736373633
+321617090235011501D90502FAFE05020168A8565E9C0E0C0A946E60B46862AC585E9A10
+06060A926E62B26AFAFD03C0FC400502FAFE3EAAAAFED6AAAA05DC564A3C0604063A444E
+B4544C3C060204043A444EFC4401150112B2FE90AAFE91000000000300D9006605DB04CE
+000300200024000013211521010607060706072135213637363736321716171617211521
+262726272601211521D90502FAFE0282432E381E1B04FE64010A0C1E365759CE5956371C
+0E010AFE65041B1E382DFD3B0502FAFE025AAA027B041E2B44445CA839335B323333325B
+303CA85B45432C1EFCE9AA000000000200D9FFCF05DB05570003000E0000372115210100
+050401150025352401D90502FAFE0502FE81FE2401DC017FFE81FC7D0383017F79AA04B1
+FEE55D5DFEE5D7017884A67C0180000200D9FFCF05DB05570003000F0000251521351135
+0005301504013500252405DBFAFE017F0383FC7DFE81017F01DCFE2479AAAA0407D7FE80
+7CA684FE88D7011B5D5D000200D9FED705DB0557000B0016000001170721152107273721
+3521010005040115002535240103AC965A01F3FDB285965AFE0D024E02B4FE81FE2401DC
+017FFE81FC7D0383017F017150A8AAF850A8AA0407FEE55D5DFEE5D7017884A67C018000
+0000000200D9FED705DB0557000B00160000011707211521072737213521013500051504
+013500252403AC965A01F3FDB285965AFE0D024EFDB2017F0383FC7DFE81017F01DCFE24
+017150A8AAF850A8AA0407D7FE807CA684FE88D7011B5D5D0000000300D9FF0905DB054B
+000300070012000037352115013521151100050405150025352401D90502FAFE0502FECD
+FDD80221013AFEA3FC5B03A5015D33AAAAFED6AAAA056BFEE52D51F7D7017458A6560176
+0000000300D9FF0905DB054B000300070012000037352115013521150135000515040135
+242524D90502FAFE0502FAFE015D03A5FC5BFEA3013A0221FDD833AAAAFED6AAAA056BD7
+FE8A56A658FE8CD7F7512D000000000200D9FE7105DB054B0013001E0000052135213721
+352137170721152107211521072701000504051500253524010226FEB301DA60FDC602C8
+898A290150FE225F023DFD368A8A03DEFECDFDD80221013AFEA3FC5B03A5015DEAAA73AA
+A47331AA73AAA574058FFEE52D51F7D7017458A6560176000000000200D9FE7105DB054B
+0013001E0000052135213721352137170721152107211521072701350005150401352425
+240226FEB301DA60FDC602C8898A290150FE225F023DFD368A8AFEDC015D03A5FC5BFEA3
+013A0221FDD8EAAA73AAA47331AA73AAA574058FD7FE8A56A658FE8CD7F7512D00000003
+00D9FE7905DB058B001D003A0045000005150E01232227262726272623220607353E0137
+3617161716171633323613150E01232227262726272623220607353E0133321716171617
+163E01130005040515002535240105DB69B3616E920A07060F9B5E58AC6269B26260A10B
+05060F9B5E56A96769B3616E920A07060F9B5E58AC6269B3616E930A05070FAA9EB067FE
+CDFDD80221013AFEA3FC5B03A5015D28B34E453B040302063D4C54B34E390C0641050202
+063D4B019AB24F453B040302063D4C53B24E453B04020306430C4503ECFEE52D51F7D701
+7458A6560176000300D9FE7905DB058B001D003A0045000005150E012322272627262726
+23220607353E01373617161716171633323613150E01232227262726272623220607353E
+0133321716171617163E01013500051504013524252405DB69B3616E920A07060F9B5E58
+AC6269B26260A10B05060F9B5E56A96769B3616E920A07060F9B5E58AC6269B3616E930A
+05070FAA9EB0FB65015D03A5FC5BFEA3013A0221FDD828B34E453B040302063D4C54B34E
+390C0641050202063D4B019AB24F453B040302063D4C53B24E453B04020306430C4503EC
+D7FE8A56A658FE8CD7F7512D0000000200D9FDED05DC058B00360041000001150E012322
+27071633323637150E0123222F010727372623220607353E013332173726232206073536
+373617161F0137170716333236130005040515002535240105DC6AB2624453348C5756A8
+686AB2626D93085CA459402F58AC6268B4604553338B5658AC62685A6D4D9270075BA459
+403156A867FECDFDD80221013AFEA3FC5B03A5015D0124B250441783344B55B34E453B03
+E940E2104C54B34E451782344C52B24E222A080E2C03E940E30F4A03E6FEE52D51F7D701
+7458A6560176000200D9FDED05DC058B00360041000001150E0123222707163332363715
+0E0123222F010727372623220607353E013332173726232206073536373617161F013717
+0716333236013500051504013524252405DC6AB2624453348C5756A8686AB2626D93085C
+A459402F58AC6268B4604553338B5658AC62685A6D4D9270075BA459403156A8FB65015D
+03A5FC5BFEA3013A0221FDD80124B250441783344B55B34E453B03E940E2104C54B34E45
+1782344C52B24E222A080E2C03E940E30F4A03E6D7FE8A56A658FE8CD7F7512D00000003
+00D9FEA105DB04AE00030007000E000037011501110115090315013501D90502FAFE0502
+FAFE0502FC4003C0FAFE0502C3FE90B2017001F4FE90B2017002ABFEEBFEEEB20170AA01
+6F00000300D9FEA105DB04AE00030007000E000025150135011501351135011501350105
+DBFAFE0502FAFE0502FAFE03C0C3B2FE90B202B2B2FE90B20369B0FE91AAFE90B2011200
+0000000200B5FFC9059F04B30006000D00000117011701171113270902272103C25DFD23
+BF02DD5C65C1FD23FEB402DDC202CF044E5CFD23BF02DD5D0178FD96C2FD23014C02DDC1
+000000020120FFC9060A04B30006000D00000121113701370901112107090202FDFE885C
+02DDBFFD23FE8002CFC202DDFEB4FD23044EFE885DFD23BF02DDFDF202CFC1FD23FEB402
+DD00000200B50034059F051E0006000D000001070107010721053709023711053A5CFD23
+BF02DD5D0178FD96C2FD23014C02DDC102115D02DDBFFD235C65C102DD014CFD23C2FD31
+0000000201200034060A051E0006000D00002527012701271103170902172102FD5D02DD
+BFFD235C65C102DD014CFD23C2FD31995C02DDBFFD235DFE88026AC202DDFEB4FD23C100
+00000002003700860650047E000900130000250901112111090111210115213509013521
+15010233FE0401FC022101FCFE04FDDF0285FD17FEF6010A02E9010A8601FC01FCFEEF01
+11FE04FE04011101F58383FEF6FEF68383010A000000000100370086063F047E00060000
+250901112111210233FE0401FC040CFBF48601FC01FCFEEFFE2A0001015E000005560608
+00060000090221112111015E01FC01FCFEEFFE2A040C01FCFE04FBF4040C0001015EFFCD
+055605D50006000001211121112101015E011101D60111FE0401C9040CFBF4FE04000001
+00B5FFC9059F04B300060000012709022721059FC1FD23FEB402DDC202CF01E4C2FD2301
+4C02DDC1000000010120FFC9060A04B300060000011121070902012002CFC202DDFEB4FD
+2301E402CFC1FD23FEB402DD0000000100B50034059F051E0006000025370902371102D0
+C2FD23014C02DDC134C102DD014CFD23C2FD31000000000101200034060A051E00060000
+0117090217210120C102DD014CFD23C2FD310303C202DDFEB4FD23C10000000100370086
+0650047E00090000250901112111090111210233FE0401FC022101FCFE04FDDF8601FC01
+FCFEEF0111FE04FE0401110000000001015EFFCD05560608000900000121090121112109
+012104450111FE04FE040111FEEF01FC01FCFEEF01C9FE0401FC024301FCFE0400000001
+0075FFF9065202D7000B000005230137171121352111371704C85AFE7878E8FC2F047BEA
+7807018A78EA011CAAFE3AEA780000010075022D0652050B000B00000901072711213521
+1107270104C8018A78EAFB8503D1E8780188050BFE7678EAFE3AAA011CEA78018A000001
+0048FFF9062502D7000B000005013717112115211137170101D2FE7678EA047BFC2FE878
+FE7807018A78EA01C6AAFEE4EA78FE76000000010048022D0625050B000B000001330107
+271121152111072701D25A018878E803D1FB85EA78050BFE7678EAFEE4AA01C6EA780002
+00BAFF0406D505240003000700001711211125211121BA061BFA570537FAC9FC0620F9E0
+72029E000000000200BAFF0406D505240003000700001711211101211121BA061BFA5705
+37FAC9FC0620F9E00310029E0000000200BAFF0406D50524000200060000052101031121
+11012C0537FAC972061B8A053CFA520620F9E0000000000200BAFF0406D5052400020006
+0000051121031121110663FAC972061B8A053CFA520620F9E00000020006FF0406210524
+00020006000005090503130276FD8AFCF3030D030EFCF26402780278FD880310FCF0FCF0
+000000020006FF040621052400020006000013011109039E0275FCF3030D030EFCF20214
+FD8804F0FD880310FCF0FCF0000000020006FF0406210524000200060000130901210902
+9E02750276FA7D030D030EFCF20214FD8802780310FCF0FCF00000020006FF0406210524
+000200060000132109049E04EBFD8AFCF3030D030EFCF202140278FD880310FCF0FCF000
+0000000C00BAFF0406D5052400050009000D00110015001B001F00230029002D00310037
+000005152335333513152335131523350115233523152335011523352335231523352315
+2335011533152335131523351315233513152315233506D5E37172727272FEA5CCEACA04
+4D7271EACCEACAFEA472E472727272E4727216E6747201B6CCCC01B4CACAFC2474747474
+05ACE6727474747474FAC67274E601B6CCCC01B4CACA01D07472E600000000010024FFCA
+06D0062300040000130902212403560356FEBAFBE003B6026DFD93FC140000020024FFCA
+06D00623000400090000130121090521AA0113037A0113FD30FCAA03560356FEBAFBE003
+8BFCB1034F020CFE1F026DFD93FC1400000000020096FF46066605FC0005000B00000902
+110901031109011101010802760276FD8AFD8A7202E802E8FD180135FE95016B02D8016B
+FE95FCE6035C01ADFE53FCA4FE5300010096FF46066605FC000500003711090111019602
+E802E8FD18F3035C01ADFE53FCA4FE53000000010022FFB906D905890005000005090121
+090101D0FE5201AE035B01AEFE524702E802E8FD18FD1800000000010070FE0008840628
+000B00001610012420050010010420257002050103020401030205FDFBFEFDFDFCFEFD40
+04A8012A9696FED6FB58FED696960001004DFFA006A7064D00040000090311043A026CFD
+94FC14064CFCAAFCAA01460420000002004DFFA006A7064D000400090000090111090511
+040EFCB2034E020CFE20026CFD94FC1405C6FEEEFC86FEEC02D00356FCAAFCAA01460420
+00000001000A0000046A05D5001500001333112115211521152111211521112335333523
+3533C9CA015BFEA5015BFEA502D7FC5FBFBFBFBF05D5FE07909090FE7EAA022C90909000
+00000001000A0000022A0614001300000133152311231123353335233533113311331523
+0179B1B1B8B7B7B7B7B8B1B102BC90FDD4022C9090900238FDC8900000000001FFD70000
+046A05D5002300001333111617163332373637330E012322271121152111262726232207
+0607233E01333217C9CA0201110D261212027D02665B141302D7FC5F0605110D26121202
+7D02665B191605D5FD2C010109252452869404FE2FAA0302040309252452869406000002
+000A0000048D05D50010001D00001321321716151407062B011123112335331715333236
+3534262B01152115C901C8FB80818180FBFECABFBFCAFE8D9A9A8DFE015B05D57172DBDD
+7171FDA803CF9090D192878692D090000000000200C9FE66055405D5001B002400C7401A
+110E0F0B050603190900241E16050A211904193F1C0A1C14042510FCEC32FCC4EC111739
+1139393910CC393931004026090807030A0611030403051104040342140B0A0E9511B004
+0604001D03041D950924951581042FF4ECD4EC12391239123910F4EC113939304B535807
+1005ED071005ED1117395922B2402601015D40427A1B0105000501050206030704150015
+011402160317042500250125022603270626072608260920263601360246014602680575
+047505771B88068807980698071F5D005D011E01171323032E012B011114163B01152322
+261901212016151406011133323635342623038D417B3ECDD9BF4A8B78DC6E863F4DE3CD
+01C80100FC83FD89FE9295959202BC16907EFE68017F9662FDF1C296AAF4010E056DD6D8
+8DBA024FFDEE8783838500040048FFA2049C04BC00230028003000370000011123350E01
+232227072737263534363B013726272623220607353E01333217371707160F0133353407
+01163332363D0101130607061514042DB83FBC88875C67606E3BFDFB299E0B0D549760B6
+5465BE5AE778945FA839BB3538AFFEBC3E6399B9FDC5E5633356027FFD81AA66613C7D4E
+85567BBDC0BF0C0C452E2EAA272772B34FCB732B411218BAFE782ED9B429FEE201150C1E
+337B200000000001FFE8FF4203120693001C0000011133133303331523031514163B0115
+23222726270323131123353311017731C0AAC0A0D1AA4B73BDBDD5510D0A66AAD6878705
+9EFEC20233FDCD8FFE0F6F894E9A500C10FED60272021D8F013EFFFF00C9FEBF060405D5
+100604360000000100BAFEE5051C06140019000021231134262322061511231133113637
+363332171615113311230464B87C7C95ACB9B942595A75C16363B8B8029E9F9EBEA4FD87
+0614FD9E6532327778E8FDF5FE4C000100C9FEBF056A05D5000E00002533112311230111
+2311331101210104C1A9C545FD33CACA029E0104FD1BAAFE15014102CFFD3105D5FD8902
+77FD48000000000100BAFEE5049C0614000E0000133311013309013311231123011123BA
+B90225EBFDAE01CC9FB838FDC7B90614FC6901E3FDF4FE45FE4C011B0223FDDD00000001
+005CFEBF05E805D5000B0000132115012111231121350121730495FC500490C9FB3D03B0
+FC6705D59AFB6FFE1501419A049100010058FEE504930460000B00001321150121112311
+2135012171036AFD4C036CB8FC7D02B4FD650460A8FCDBFE52011BA8032500020073FFE3
+057705F10010001C002D40181A95000E149505088C0E9101AF031704001C0211190B101D
+10FCECD4EC323231002FECE4F4C4EC10C4EE300135331123350E01232000111000213216
+01101233321211100223220204B3C4C44DECA5FEF2FEAC0154010EA5ECFCDFEACCCDEBEB
+CDCCEA04EDE8FA2BE7848001AB015C015C01AB80FD78FEE3FEBB0145011D011D0145FEBB
+0000000100C9FE66061F05D50014000013210901211110062B0135333236351101230111
+23C9012D017D017F012DCDE34D44866EFE7FCBFE7FC405D5FC0803F8FA93FEF2F4AA96C2
+04B7FC000400FAE10000000200100000056805D50002000A000025012101230133132113
+3302BC0112FDDB0185E5FDC7D28802A188D5C702E7FC5205D5FE81017F0000020073FFE3
+057705F1000F001800002515231133153E01332000100021222600100223220210122001
+37C4C44DECA5010E0154FEACFEF2A5EC0321EACCCDEBEB019AE7E805D5E78480FE55FD48
+FE5580016B023A0145FEBBFDC6FEBB0000000001003D000005E0047B0014000001300123
+01330901363332161D01233534262207060424FEB7FAFE5CC3015E011454DE83B9B25172
+2915036DFC930460FC5402E6E1BF8672723A542A1500000100440000090605F0001D0000
+09012309012301330901330901363736333217161D0123353426232207060766FEC9FEFE
+C5FEC2FEFE8ACC013A0139E3013A0107123C5689885555AA512E2A281C04E1FB1F0510FA
+F005D5FB1204EEFB12042647405C5C5B6E83793650281C00000000010056000007B1047B
+001B0000013637363332161D01233534262207060703230B012301331B01331305461739
+5B8483B9B25172291806E5D9F1F2D9FEDBB8E6E5D9E60388563D60BF8672723A542A1914
+FC930396FC6A0460FC96036AFC96000200680000047F04B30013001B0000131025363332
+15140F011301330123030735363F0136352623221514C801541412A8B87FAB015EC3FE5C
+FAD1A8313CA5D8012DAF034D01323103F8995D40FE2F03ACFBA0023255C4141C506E3434
+A025000100C90000047105D50007000001211123113311210471FD22CACA02DE02C7FD39
+05D5FD9C0000000100C1000003D0046000070000012111231133112103D0FDA9B8B80257
+0204FDFC0460FE33000000020070FFE704D10468000A0027000001221511323736353427
+262732171611100706230722272611103736371506070615141716331110033D415F5F55
+5646368B80898981CBB7C885888865A7423A56564D7003CB91FD52685DDFD0705B9D848D
+FED9FEF1A19801999C0113011E926D1CA3174E73BECA736702AF012E000000010000FFE5
+029006140017000021350621222F0116333236351134262B013533321716151101D772FE
+F92538013C589CA74D69E7FEB74F52AEC90ABD23CBBE026C99619C6062D4FB8200000003
+0071FFE30475047B0007000F002000000026220614163236080120001000200801262006
+1514173637363332171617363503165E875D5D885DFD5B011101E10112FEEEFE1FFEEF03
+41ACFED9AC1416375C85885933171201615F5E875C5C02680138FEC8FDD9FEC7013901DA
+E9E7C9604D47385D5F3242495B0000010062000003330460000B00000111213521112135
+211121350333FD2F0217FE0D01F3FDF60460FBA093017894012D94000000FFFFFFE9FF11
+00EE0367120702740000FD6400000001000A029C036805E0000600000901330901330101
+71FE9985012A012B84FE99029C0344FD4002C0FCBC0000010087FE1004C805F0003A0000
+01152E01232206151417161F011617161514070607171E013B011523222E022F01262726
+272627351E013332363534262F012E01353424333216044873CC5FA5B33C36AB7AE6676C
+9273C9877C9346183F224E677B3CDF310E322777807BEC72ADBC879A7BE2CA0117F569DA
+05A4C53736807663332E23192F696CB6D9705912776E49AA10274F38CE2D0A2107182FD0
+4546887E6E7C1F182DC0ABC6E4260001005CFE10051F05D50018000001331523222E0227
+25262B0135012135211501161F011E0104B36C932759768C45FED34E717D03B0FC670495
+FC557275FC889FFEBAAA10274F38F33F9A0491AA9AFB6F0D5FCD6E4900000001007BFF7E
+045B0460001F000001233736232205030633323633320307233736230E0123221B013307
+243332070438C013196A90FED6451B7380DC5AB72B12BF12133459F596C02A74BF18017A
+92D21902AD81ACACFE04AE9AFEE282828401830131032FB1B1B100010032FE1E0472045F
+0020000001061607060423202437330616333E0137362637042322371333030633162513
+3303FA0F681A1BFEF4D2FEFFFEDD16BA0B93D96BC019136A08FE7794D31998BC8418729D
+011071BF012D78D19E87A1AB96447C01487660D351B0AF037EFD05AE02B002FB00000001
+0050FE1E0448045F00230000010616151404232224273533151E01333236353426371336
+23220703231333072433320703A81FBFFEBED2B0FED80CBB079F9495B7C7245A196891FC
+39BE64BD1701528FD41801998DB6B0BDCB9FAC59505B79818384E8B80166AEAEFDE30350
+B0B0B00000000002007FFFEB049406750009002E00000136070407030633203F01060706
+23201B013625130E0123223F013307063332373633321D012335260F011337240303AA1B
+F9FED427451B9E018B20C218DBDBACFE9C3939200185045A852EA4020AC40A0A4942CAD1
+61A1750279A407680124340351B41820CAFE28BCD70CA06463018E017FE15A016514157E
+885041343547783D251327FE94091BFE830000010069FE1E044B045F0011000001230313
+36232205032313330724333207030434D15268196987FED146C475BF19017E8FD21875FE
+1E026602A8AEAEFD8303B0B0B0B0FCD5000000010050FE1D06E5045F001C000001230313
+362322050323133307243332072433320703231336232205030412CB556C196892FEE251
+BE74C01401788DCA17016C93D5179EC189196F91FEEC6BFE1D026702A8AEAEFCD4045FB0
+B0B0B0B0FC51032CAEAEFD58000000020000FFEF049A0687000B00240000013623220503
+063732373637170605042322371B01232227353315163B013733032433320703C9196990
+FED94F155FD47B6B14BF27FECDFEF888D3186A68B6B011C6096A570FB07A017B90D31903
+2BAEAEFDCE860138427E03F74241AF02D60144E6E9FD6B36FE59B1B100000002006C0000
+0734045F0009002200000136232205030633162501243332070323133623220503233704
+23223713330724333203A91C658FFEBB521A728D013B012701698ED4189BBE87186890FE
+EC82B81EFE7BABDA2490BF1B01998FD6032CAEB2FE0AAE02B0027DB0B0FC51032CAEAEFC
+D4C8C8AF03B0B4B400000001008E00000457045F000F0000212313362322050323133307
+2433320703BEBF88196893FEDC35BE5EC017018189D820032CAEAEFE9102A2B0B0C00002
+0068FE1E047306870009001A000001362322050306333225171323030423223713033313
+072433320703A11F6F90FEC74E1871AF0116AA6DCD5DFE8AACD3189049D3341D01928DD3
+18032CAEAEFDF5AEBF9DFD890291C0AF03E30206FDEFC7B0B0000002005000000739045F
+000900220000013623220503063332251323370423223713362306050323133307243332
+07243336070665196F82FEB44E1A6D88014990C11CFE79BBB7185B196679FEB85FBF88C1
+1901908EC8170196B0C21E032CAE9DFDF5AEAEFECEBFBFAF027DAE02ACFCD4045FB0B0B3
+B301B10000000002006DFFEF04C306870009002900000104070306333237363701030607
+06072437133625032623220623223D0133151433323633321713331503A2FDEF14451DB6
+7379780D011F6318C0BBD2FEB71D561902CF26144A5DD57A81C33753B272AC23315803DB
+2D83FE1BF53B3D6D02A4FD3BA040400606FB025DA66B0101728195A2773F7CC0FED38600
+0000000100500000045B0687001B00002123133623220503231327102120171523352623
+221513072433360703B6C093186990FEDA73BF992201A0018502BC02ADFE2011017E8EDB
+20032CAEAEFCD40438D3017CA17B6141A3FEB974B001B10000000001006800000719045F
+001A0000250423223713330306333225133303063332251333032337042322032CFE929C
+D218A6BE931A729D010787C08A155C9D011A69C093C119FE808ABEAFAFAF03B0FCD3AEAE
+032DFCD3AEAE032DFBA1AFAF00000001006800000472045F000F00002504232237133303
+0633322513330323032CFE929CD2189AC0891A729D011173C09CC2AFAFAF03B0FCD3AEAE
+032DFBA100000001008EFE1E06230687001E000001230337042322371304232237133303
+0633323733030633322513033313030602D24C0FFEBD90CA1C42FEEC7FA9165CCE4E1E74
+32D6BE510D427F0117697ACC687FFE1E02184E84C101BA889701D7FEBA8F73FDE35E7902
+DC02AEFD27FC8E000000000100680000070B0687001D0000011303331307243332070323
+13362322050323370423223713330306333203356D54CD400C01728DD5189CBE87186890
+FEE673C017FE9C9CD21898C38A1A729D013203000255FDA179B0B0FC51032CAEAEFCD4AF
+AFAF03B0FCD3AE000000000100680000045D068700110000130333130306333225133303
+233704232237ED4DDC37701A689D01075ECA88CA17FE9C9CD21804610226FDD7FCD4AEAE
+032DFBA1AFAFAF00000000020066FE1E044A045F0007001C000001362322050324371706
+05061633323717062120021B0133072433360303881B6A8FFED96501FC17BC21FD441B75
+988ECE63C2FEE0FEFAA5328ABD15017891D62D032BAEAEFD394B9E1BEC469BC6BA85B601
+46013403C7B1B101FECB00010068FE1E0713054A001D0000250423223704232237133303
+06333225133303063332251327331303132305DEFE808AC816FE9C9CD218A4C0931A729D
+010787C08A155C9D011A6824CB14786DD0AFAFAFAFAF03B0FCD3AEAE032DFCD3AEAE032C
+ECFEE7FC69FD840000000003007BFE1E0722045F00090013002D00000136072605030633
+32250136230605030617322513233704232707132303370421221B013307243332072433
+3203039D0E6F9EFEE7471A70AF010A0315197D59FEAF48188D95010395B71AFED6967409
+55CE401AFEFDFEF1D42C74BF180153D4C0180150D7C32D036D6E0201B0FE07ADAE01FAAF
+01AFFE06AE01AFFECFAFAF2D3BFE2C01CCC5AF0131032EB1B1B1B1FECD0000010064FE1E
+0645068700170000251323031305072313330325130333130325373303231305036D67CE
+5136FE5A1DC47BC74F01A64255C2453301A01CCB7BCC50FE5C6FFDAF025201847BED036F
+FDF88601BB0253FD7BFEAB78C0FC9F021C7E000100500000045C045F000F000001243332
+0703231336232205032313330196017B8ED5189BC987185E90FED971C19EBF03AFB0B0FC
+51032CAEAEFCD4045F0000010068FE1E0472046000100000250423223713330306333237
+1333031323030EFEAF9BD21894BE811A729DF388C99C83DAAFAFAF03B0FCD3AEAE032EFC
+40FD7E00000000010068FE1E0468045F0016000025042322371333030633322513330302
+00212335333224031FFE9C99D21898C2891A729D011169C0723BFE2EFEDB5549E70159A5
+A5AF03B0FCD3AEAE032DFC91FE57FED78BDF00010050FE1E045406870013000001031323
+03130333130724333207032313362322017C6A63DA4B974AC43D0F017B8DD5188BBD7418
+6890032CFD1AFDD802150438021CFDB38BB0B0FC51032CAE000000010056FE1E04410460
+001900000132371706230600371333072433320B01231336232205030616025B77CB58D0
+DAFBFEE22492BD1B0128E6D42B82BE7E19A373FEF7651EA1FE9DAD7AB2020133F6041BB1
+B0FECDFD1A02E6AEAEFD19CEDA000002007AFFEE04C50687000700150000010407030633
+20370123030205201B011225033313330396FDFC18431FCD013819018F69642CFDDBFEA9
+2A3E2702C26AD24B7003F027B5FE32D6B202B7FD5CFEE62D015801BA011B430229FDD900
+000000010050FE1E06F60460001C00002113362322050313230313330724333207243332
+07032313362322050302F4731B5F91FEE0605CDA4488C014017590C916016996D1169BC2
+891B7190FEEB74032CAEAEFCF5FDFD01E20460B1B1B1B1B1FC51032CAEAEFCD400000001
+003CFE1E045C045F00200000012313362322050336172011102506273716332011262122
+0723133307241736030422C029156790FEDC5DEA9701B3FDB4E9EB1EDDE501A007FED8B3
+C5C59DC61D012CDFD02A02230108AEB1FD977301FE8DFE5E020151BE7A0114DF6E0428B1
+B20101FECB0000010060FE1E0461045F000E000001041B01330320371333030205022102
+C8FD386094BE8B02052154C05E24FD393701E7FE1E01024303FFFC25F002EBFCD3FEFF1D
+FE8B00010046FE1E04600489001E000001161724130423202F0133171633203733020116
+17072427061323122526270152247701AD01FECBF2FEE81006D80806A1016191A115FDF5
+D6B03BFEFFB9CB22C20201149B2C0283ABD8DC01D264ED526D5194FD72FEBEAE3C897AB0
+BEFE9601D7BFCBF800000001005000000700045F001B00002123370423221B0136232205
+032313330724333207030633322513330678C218FE969FCA2C49176B83FEE066C38EBF16
+0120E4D0195A18676901435EBFAFAF013201F9AEAEFCD6045EB1B1B1FD84AEAE032D0001
+0064FE1E045B068700170000013623220503012301131221331523220703243716070323
+03881B697CFEC65D0202F6FE31B32A0170AEEA911B3201789ACB195EC0032CAEAAFD7FFD
+6F026604C001438AB9FE78A30102AFFDE0000001007A0000044E05020018000001022120
+1B013303063320371336043735331506373633320703FF2CFDACFED12A23CB261AC50138
+1B4F16FD7C01D002868586F1240132FECE01320108FEF7ADB902329AC2E7D4A4763B3CFC
+00000001007CFE1E046D06870013000025132303370423221B0133030633162513033313
+03E36EDC4F02FE909BCD2C8ABE8C178768012A734ED33B84FD9A02256CAF0131032EFCD2
+AD02AF03210235FDCD0000010068FE1E04D2045F00130000252337071323030623223713
+33030633322513330445BD08D46DCB4AC540BF1890C286148F7F01726FC3465F45FDBE02
+1533AF03B0FCB48F9903420000000002007AFFEF06BB0688000700250000010407030633
+2037052313360705030221201B013625110221041715233526072217112520030395FDFE
+1A4218AB01471C0317BD731C65FE9F6629FDB9FED62A491C02C402018D015701CA01A9C0
+02015E01332A03D92BBDFE30B2B2B302BDCA0915FD4AFECE01320219C1390152010202BE
+4D3F5B0196FEBA27FEE000020071FFE304BB030B000B00170024400A194509120F031215
+451810FCECD4ECEC3100400800B90C06B9128C1810F4ECD4EC3001220615141633323635
+3426273204151404232224353424029699B7B79999B7B799F9012CFED4F9F9FED4012C02
+677D73737D7D73737DA4D3C1C1D3D3C1C1D300030073FFE306A705F00013001F002B0032
+400D2D102114190A9120151900102C10FCEC32F4EC32EC3100400E159520AD1A950F2695
+05910F8C2C10E4F4EC10ECF4EC3013341236243332041612151402060423222426022521
+16171E01333237363736252126272E01232207060706737ED40126A2A20126D47E7ED4FE
+DAA2A2FEDAD47E0559FB811B8A4ED677776BD85D1EFB8C047E1A8A4ED677776BD85D1E02
+EA9D011ED17A7AD1FEE29D9EFEE2D17A7AD1011E49CA9153603061E44AF9C99252603061
+E54900050073FFE306A705F000130018001D00220027004940151A22951824241E232910
+1E19190A9123141900102810FCEC32F4EC32EC1112392F3CEC32310040121A14952223AD
+1B17950F21259505910F8C2810E4F4EC3210EC32F43CEC32301334123624333204161215
+1402060423222426023716001711290111360013260027112901110600737ED40126A2A2
+0126D47E7ED4FEDAA2A2FEDAD47EDB1A010BB502A4FE26B5010B1A1AFEF5B5FD5C01DAB5
+FEF502EA9D011ED17A7AD1FEE29D9EFEE2D17A7AD1011E49C9FEE6210204FDFB21011A01
+74C9011A21FDFC020421FEE60000000200400000053505D5000A000D0063400D03000C95
+01810609030500090E10DCC4D4C431002F3CF4EC39393040150D110006000611050D050C
+110308030811090A09424B5358071001ED071001ED071001ED071001ED40140B090C0D05
+0A090C000607000608030403080D050F0F0F0F5922133521150901230901230137012176
+0495FE280202F0FE76FE75F00202790154FD57052BAA9AFD7FFD460217FDE902BAA301CE
+000000><000200430000053805D5000A000D0063400D03000C9507058102000703050E10
+DCC4D4C431002FE432EC39393040150D110006000611050D050C110308030811090A0942
+4B5358071001ED071001ED071001ED071001ED40140B090C0D050A090C00060700060803
+0403080D050F0F0F0F59222515213509013309013301070121050EFB6B01CCFDFEF0018B
+018AF0FDFE78FEAB02A99A9AAA027102BAFDE90217FD46A3FE32000000030040000004D5
+05D500020005000F006A40110C0F01950D810A07039509110F070A0C1010DC3CD43CCC31
+002FEC3939F4EC393930401500110F030F01110C040C041107010703110A000A424B5358
+071001ED071001ED071001ED071001ED40140201070A000601070F0305030F040C0B0C04
+0A000F0F0F0F59220121090121013701152135090135211503D9FD570158FEB402A9FEA8
+7701D1FB6B01D1FE2F0495052BFE57FD2801A996FDC1AAA0024C023FAAA0000000030096
+000003E805D500030007000B002340110307000804910B011C00091C08051C040C10DCFC
+DCFCDCEC31002FF43C3CCC3230013315230133152301331123031CCCCCFD7ACCCC0144CA
+CA05D5FF00FFFF00FFFA2B00FFFF00100000056805D5100603300000FFFF001000000568
+05D5100600390000FFFF00C90000048B05D5100600280000FFFF00830000044505D51006
+0150000000050096FFE304E005F0000B00170023002F003300484010354531031B12152D
+300921120F27453410FC3CEC32C4D43CEC32C4EC3100401633B930302A0C00B90C06B912
+91341EB92A18B9248C3410F4ECD4EC10F4ECD4EC1112392FEC3001323635342623220615
+141617222435342433320415140403323635342623220615141617222435342433320415
+14040121152102BB99B9B99999B9B999F9FED4012CF9F9012CFED4F999B9B99999B9B999
+F9FED4012CF9F9012CFED4FD3703A0FC6004733934343838343439A48E83828E8E82838E
+FCB83934343838343439A48E83828E8E82838E035CAA0000000100DB0000067D05D50013
+003A400D05090C031C070D021C0010121410DCCC32EC32DCEC32CC323100401007129500
+0D9502AD0004911108950B0F2F3CEC32E432F4EC10EC3230132111211121152111211521
+1121112135211121DB020B018B020BFEBF0141FDF5FE75FDF50141FEBF05D5FD9C0264AA
+FB7FAA02C7FD39AA048100000002005C0000055205D50008000B005440100B9502810700
+0A020406000B1C02040C10F4EC32D4C4113931002F3CF4EC304019051100040807080911
+000400071106050605080A11040004424B5358071005ED3C3C071005ED00071004ED0710
+08ED59222123112115090123010501210126CA04ACFE1E022CEFFE50FE7302E6FD1A05D5
+9AFD76FD4F0217D303E70000000300960000037E05D500030007000B002D40130B9508AF
+07039500AD0495070100090508040C10DC3CCC32DCCCB43F0D3F01025D31002FECFCEC10
+FCEC300133152301331523113315230280FEFEFE16FEFEFEFE0351CDFE49CD05D5CD0000
+0002005C0000055205D50008000B005440100006810B95050B060401070A1C06040C10F4
+EC32D4C4113931002FECF43C304019021107030800080911070307001101020102080B11
+030703424B5358071005ED3C3C071005ED00071004ED071008ED59220133090115211133
+012511210463EFFDD401E2FB54CA018DFE7302E605D5FD4FFD769A05D5FDE9D3FC190000
+00030073FFE306A705F00013001F002B0037401120951B1B14262D1026190A9114190010
+2C10FCECF4ECEC1112392FEC3100400C1A21950F1B209505910F8C2C10E4F4EC3210EC32
+301334123624333204161215140206042322242602371417161716171106070E01011136
+373E01353427262726737ED40126A2A20126D47E7ED4FEDAA2A2FEDAD47ED52E5DD83D40
+B5814E5C02AAB5814E5C2E5DD83D02EA9D011ED17A7AD1FEE29D9EFEE2D17A7AD1011E9E
+7D71E4611B0C04B3218853E101DDFB4D218952E17D7C70E5611B000000030073FF9506A7
+063F00190023002D006E401E162E1517001A0A080D1C1D27260714061A24092F1024190D
+911A1900102E10FCECF4ECECC4111217391239391112393911393100401E0709051F162E
+1C1D2726041F14120A171F29150A2995121F950591128C2E10E4F4EC10EC2FC411123939
+123912173912391112393930133412362433321737170716121514020604232227072737
+2602371417012623220E02053427011633323E02737ED40126A2E3C4A0829D6E807ED4FE
+DAA2E4C4A0819C6E7FD59102EA8FA777D69C5C048A91FD1590A777D69C5C02EA9D011ED1
+7A76C469C26AFEDE9D9EFEE2D17A77C56BC16A01219EE6AE03985E60A5E17CE5AFFC675E
+60A5E100000400960000019405D500030007000B000F002E401707950403950008950B0C
+9500AF0F0D0905010C0804001010DC3C3C3CCC32323231002FE4ECDCEC10ECDCEC301333
+152315331523153315231533152396FEFEFEFEFEFEFEFE05D5CDDFCDE1CDE1CD00010029
+000004E105D50007003A400907AF0105090701050810DCDCC4CC31002F3CE43040140311
+000704021101000100030711060411050605070110ED10ED32320710ED0810ED09012309
+0123013302B2022EE8FE5DFEBAE6037FE802BAFD46021EFDE205D500000100C90000053B
+05D5000B002D400D0D04031C06021C0B071C0A040C10FCFCDCFCDCFCFC3100400A009105
+0795020BAD09052F3CF43CEC10E430013311211123112111231121029DCA01D4CAFD22CA
+01D405D5FD9CFC8F02C7FD39037100000001003E0000053C05D5000E0081400C031C0404
+07000F0709000D0F10D4C4DCC4C41112392FEC31B480007F0D025D004006060300AF0C09
+2F3CEC3232304BB042505840140A110908090C110D0E0D06110708070111000E00050710
+EC0710EC0710EC0710EC400F0801090C070B0C070A000E0D06000A0F0F0F400A05110808
+0702110E000E070010ED070010ED5913330111331101330901230901230182DA0113CA01
+0BD8FE200200D8FE5CFE58DA021605D5FE64019CFE73018DFD33FCF8027BFD85031D0000
+00040096000003A205D500030007000B000F003140140F07950C04AF0800950B03050104
+000D090C081010DC3CCC32DC3CCC32B43F053F01025D31002F3CEC32F43CEC3230253315
+2311331523013315231133152302A4FEFEFEFEFDF2FEFEFEFECDCD05D5CDFBC5CD05D5CD
+0002005C0000050805D500020009003740100295058108950401050906001C05040A10F4
+ECD4C4113931002FECF4EC3040090011080111070807424B5358071005ED0410ED592209
+012101211121150121012602E6FD1A03E2FB5404ACFC9C0364014403E7FAD505D59AFB6F
+0003009602680492036800030007000B0024401103070B0004080D011C00051C04091C08
+0C10DCECDCECDCECCC31002F3C3CCC32323001331123013311230133112303C6CCCCFE68
+CCCCFE68CCCC0368FF000100FF000100FF000000FFFF00C90000048B05D5100603370000
+0001006F0000039605D5000B002140100B039500AF040895070501031C0008092FCC32FC
+CC3231002FEC32F4EC32301321152111211521352111216F0326FED3012EFCDA012DFED2
+05D5AAFB7FAAAA04810000000001006FFFE2073105F0002F002C40160F2195141C910927
+952C048C30311E2A24190C12063010CC32DCECDC32CC310010E432EC32F43CEC32300106
+070621222735163320001110002122073536332017161736373621321715262320001110
+0021323715062320272603D02534C2FEAC80726D7901000110FEF0FF00796D7280014FC7
+34252534C2015480726D79FF00FEF001100100796D7280FEB2C834012A4236D021AF2A01
+3A01270128013829AF20CF36414236CF20AF29FEC8FED8FED9FEC62AAF21D0360002006F
+000005CC05D5001B001F005040130B07090D051C101F04111D011C161A1814002010D43C
+3CCC32EC3232D43C3CFC3C3CCC3231004014091C189506021B000A1D17950D11140400AF
+0F132F3CE432DC3C3CEC323210DC3C3CEC32323001331121113311211521112115211123
+112111231121352111213521171121110191CA0192CA0115FEEB0115FEEBCAFE6ECAFEDE
+0122FEDE0122CA019205D5FE780188FE78AAFE8EAAFE790187FE790187AA0172AAAAFE8E
+01720000FFFF00C90000053305D5100603AC0000000100CC0000048805D50007001C400E
+049501AF0595000602051C00040810FCECC43231002FECFCEC303311211521112115CC03
+BCFD0E02F205D5AAFB7FAA00FFFF00C90000019305D51006002C00000001006F000005CC
+05D500130037400C07030509011C120E0C100014102F3C3CCC32FC3C3CCC323100400E10
+0595021300060F95090C00AF0B2FE4DC3CEC3210DC3CEC32300133112115211121152111
+23112135211121352102BFCA0243FDBD0243FDBDCAFDB00250FDB0025005D5FE78AAFE8E
+AAFE790187AA0172AA000000000200C90000019505D5000300070037400C070004AF0205
+011C0400040810FC4BB0105458B900000040385932EC3231002FECCCCC3001400D300940
+09500960098F099F09065D3733152313331123C9CCCC02CACACDCD05D5FBA6000001009F
+FFE305A405D5001C003E4018150F951A049507911A8C1D141915121907170C190600101D
+10FCC4ECD4C4ECD4EC310010E4F4EC10ECC43040060411080908424B5358071001ED5922
+133412370121352115010E0115141633323635342733161514042120249FBEBB0210FCA4
+04ACFD78B7C5DBC9E2D5CBBFE1FEBBFEB9FECEFEB901C39F010477014EAAAAFE6574E477
+96A48888B3CEE0A1CEE6F90000040063FFE304AD05F0000B00170023002F0039400E3145
+031B12152D0921120F27453010FC3CEC32D43CEC32EC3100401000B90C06B91291301EB9
+2A18B9248C3010F4ECD4EC10F4ECD4EC3001323635342623220615141617222435342433
+3204151404033236353426232206151416172224353424333204151404028899B7B79999
+B7B799F9FED4012CF9F9012CFED4F999B7B79999B7B799F9FED4012CF9F9012CFED4041A
+5049495050494950A4A59897A6A69798A5FD115049495050494950A4A69798A5A59897A6
+00020073FFE306A705F0001300270028400B29101E190A91141900102810FCECF4ECEC31
+00400A19950F239505910F8C2810E4F4EC10EC3013341236243332041612151402060423
+2224260237141E0233323E0235342E0223220E02737ED40126A2A20126D47E7ED4FEDAA2
+A2FEDAD47ED55C9CD67777D69C5C5C9CD67777D69C5C02EA9D011ED17A7AD1FEE29D9EFE
+E2D17A7AD1011E9E7DE1A56060A5E17D7CE1A56060A5E10000020073FF9106A705F00016
+002C005040180F0E0A1F20211E0D100617230E2E1023190A91171900102D10FCECF4ECEC
+C411121739123939310040160F12201F211E100D06281C0F1C951228950591128C2D10E4
+F4EC10ECC011121739123930133412362433320416121514020717072706232224260237
+141E023332370137013635342E0223220E02737ED40126A2A20126D47E7F6CA281A7C4E5
+A2FEDAD47ED55C9CD677A790FE9183016A905C9CD67777D69C5C02EA9E011ED07A7AD0FE
+E29E9EFEE069C76BCA777AD0011E9E7CE2A4605E01BE6AFE49AEE57CE2A46060A4E20000
+000100C90000053B05D5000B002D400D0D04061C04081C0B021C00040C10FCFCDCFCDCFC
+FC3100400A0501910A0B089503AD0A2FF4EC3210E43230131133112111331121112311C9
+CA02DECAFE2CCA02640371FD3902C7FC8FFD9C0264000000000300C9000001C705D50003
+0007000B002840140B9508AF07039500AD0495070D0901050004080C10DC3C3CDC3C3CCC
+31002FECFCEC10FCEC30133315231133152311331523C9FEFEFEFEFEFE0351CDFE49CD05
+D5CD0000000500960000056805D500030007000B000F0013003F401B1301950210AF0F0B
+9508AD0C0695050F0307020609080D110C101410DC3CCC32DCCCDC3CCC32B63F073F033F
+09035D31002F3CEC32FCEC10FC3CEC323001233533112335330133152301331523113315
+230568FEFEFEFEFD18FEFEFE16FEFEFEFE0508CDFA2BCD0284CDFE49CD05D5CD00030073
+FFE306A705F000130027002B003E40102D100A292828141E190A91141900102C10FCECF4
+EC11392FCC10ECB22F29015D3100400E2BCE28AD19950F239505910F8C2C10E4F4EC10EC
+F4EC3001133412362433320416121514020604232224260237141E0233323E0235342E02
+23220E0205331523737ED40126A2A20126D47E7ED4FEDAA2A2FEDAD47ED55C9CD67777D6
+9C5C5C9CD67777D69C5C01C6FEFE02EA9D011ED17A7AD1FEE29D9EFEE2D17A7AD1011E9E
+7DE1A56060A5E17D7CE1A56060A5E115CD00000000020073FFE406A7063E0016002C0050
+401809080D252423260A07061721082E1021190D91171900102D10FCECF4ECECC4111217
+391239393100401608050A072326242506281C081C951228950591128C2D10E4F4EC10EC
+C411121739123930133412362433321737170716121514020604232224260237141E0233
+323E023534270127012623220E02737ED40126A2E4C4A0839E6E7F7ED4FEDAA2A2FEDAD4
+7ED55C9CD67777D69C5C90FE9482017090A777D69C5C02EA9E011ED07A76C469C26BFEE0
+9E9EFEE2D07A7AD0011E9E7CE2A46060A4E27CE5AEFE3F6C01C65E60A4E2000000030073
+FFE3057205EF00250031003D004740103826190E181E08192C3230131900103E10FCECF4
+3CEC32DC3CEC32310040172F951B3B950B350B1B2904161016952310950391238C3E10E4
+F4EC10EC111217392FEC2FEC301310002120171E01151406232226353437200011100021
+263534363332161514060706212000051416333236353426232206133426232206151416
+333236730186015301935F20149985849918FEFEFEFB01050102189984859914205FFE6D
+FEADFE7A03992C1C1C2C2C1C1C2C902C1C1C2C2C1C1C2C02E90167019F73274F3B819191
+814836FEBEFEE2FEE2FEBE3648819191813B4F2773019F7A3C31313C3B323203873C3131
+3C3B2F2F00010064000005C005D5000B00234011050895020BAD00AF070305021C0A080B
+0C10D43CC4FC3CC431002FE4F43CEC323001331121152111231121352102ADCA0249FDB7
+CAFDB7024905D5FD6AAAFD6B0295AA00FFFF003D0000053B05D51006003B000000030073
+FFE3057205EF0033003F004B0066401919181B95151E1E1F4634190E252B0819363A301F
+141900104C10FCEC32F43CEC32DC3CEC3211392F3CFC3CCC3100401F171C1418951E1A3D
+952849950B1A430B283705231023953110950391318C4C10E4F4EC10EC111217392FEC2F
+EC2F3CEC32CCC4301310002120171E011514062322263534372207061533113315331523
+15231123141716332635343633321615140E010706212000051416333236353426232206
+133426232206151416333236730186015301935F20149985849918EE977FBBCCE9E9CCBB
+7F97EE189984859914413B85FEEFFEADFE7A03992C1C1C2C2C1C1C2C902C1C1C2C2C1C1C
+2C02E90167019F73274F3B819191814836A28ADF00FFFFAAFF00FFDF8AA2364881919181
+3B4F4F1734019F7A3C31313C3B323203873C31313C3B2F2F000100C90000048B05D50013
+003B401C0E0B95040295008110950804AD12050E950B080901110F031C00041410FCEC32
+D4C4C4DC3CEC3231002FEC32ECF4EC10EE3230B21F1401015D1321152111211133153315
+231523112111211521C903B0FD1A0111CCEAEACCFEEF02F8FC3E05D5AAFE4600FFFFAAFF
+00FFFDE3AA000000FFFF00100000056805D5100603290000000100C90000053B05D50007
+001F40100602810495000904051C00041C01040810FCECD4ECEC31002FECF43C30290111
+3311211133053BFB8ECA02DECA05D5FAD5052B00000100C90000047905D50008003D400C
+42070395048101050104040910FC3CD431002FF4EC32304B535840120811020201071103
+03020811020011010201050710EC10EC0710EC0810EC5921230901352115210101B1E801
+DFFE2103B0FD3801DF02C0026BAAAAFD9A00000000010073000005DB05D50023004F4016
+2510060F19070E0224102118192019130A021C141D012F3C3CEC3232D43CEC32EC10D43C
+EC32EC310040120003951D0A200106810F1512951C0B19140F2F3C3CD43CEC3210F43C3C
+D43CEC323001113311323635331000231132001123342623112311220615231000331122
+001133141602C2CA8AF2D3FE87D6D60179D3F28ACA8AF2D30179D6D6FE87D3F2042B01AA
+FE56E2C8FEEEFEBAFEDBFEBAFEEEC8E2FE5601AAE2C801120146012501460112C8E20000
+000100C9000003F605D50006002E400B0300AF060103041C00040710FC4BB0105458B900
+0000403859ECC4C431002FECC430B40211030304070110ED13210123011123C9011A0213
+DEFE75C405D5FD2D021DFAE100010073000005DB05D5002B0066401A162D101D10191C11
+0C2C100107261906272018140C1C232B030B2F3C3C3CEC323232D43CEC32C4EC10D43CEC
+32ECC43100401A182BB91501012A030D0A951403100B06811D202395192A27221D2F3C3C
+D43CEC3210F43C3CD43CEC321112392F3CEC323001352135220011331416331133113236
+35331000231521152115320011233426231123112206152310003335010101C1D6FE87D3
+F28ACA8AF2D3FE87D601BFFE41D60179D3F28ACA8AF2D30179D60295AA3E01460112C8E2
+01AAFE56E2C8FEEEFEBA3EAA3DFEBAFEEEC8E2FE5601AAE2C8011201463D000000010036
+042D03E905D500070017400906020401000504010810DCCCDCCC31002FCCC43230012111
+331121113303E9FC4D8F02958F042D01A8FEFB01050000000003008FFE6E03AC045E0017
+001B0024000001331136373637150E012322263534363F013E01373E0135132335330311
+070E011514171601F3BF202059615EC167B8DF485A582F27080606C5CBCBC52D39334224
+02CDFC53080D2343BC3938C29F4C8956562F3519153C34010EFEFABE01AE2D355E315937
+1F000000FFFF00D9009F05DB033210260CC6000010070D4F0213FE57000100B0033A0258
+061400050000132115231123B001A8F0B806148FFDB50000000100C7033A026F06140005
+000001233521112301B6EF01A8B905858FFD2600000100B0FEF2025801CC000500000533
+152111330168F0FE58B87F8F02DA0000000100C7FEF2026F01CC00050000012135331133
+026FFE58EFB9FEF28F024B00FFFF0093000003B005F01006054D0000FFFF00AAFEBC0682
+05D5102717D80000FC36100617D80000FFFF00AAFEBC068205D5102717DF0000FC361006
+17DF0000FFFF00AAFEBC068205D5102717DB0000FC36100617DD0000FFFF00AAFEBC0682
+05D5102717DD0000FC36100617DE0000FFFF00AAFEBC068205D5102717D80000FC361006
+17DD0000FFFF00AAFEBC068205D5102617D80000100717DD0000FC36FFFF00AAFEBC0682
+05D5102717DD0000FC36100617DF0000FFFF00AAFEBC068205D5102617DD0000100717DF
+0000FC36FFFF00AAFEBC068205D5102717D80000FC36100617DC0000FFFF00AAFEBC0683
+05D5102617D80000100717D90000FC36FFFF00AAFEBC068205D5102617DF0000100717D8
+0000FC36FFFF00AAFEBC068205D5102717DF0000FC36100617D80000FFFF00AAFEBC0682
+05D5102617D80000100717DA0000FC36FFFF00AAFEBC068205D5102717D80000FC361006
+17DA0000FFFF00AAFEBC068205D5102617DF0000100717DE0000FC36FFFF00AAFEBC0682
+05D5102617DB0000100717DF0000FC36FFFF00AAFEBC068305D5102717DB0000FC361006
+17D90000FFFF00AAFEBC068205D5102717DC0000FC36100617DE0000FFFF00AAFEBC0683
+05D5102717D90000FC36100617DF0000FFFF00AAFEBC068205D5102617DC0000100717DF
+0000FC36FFFF00AAFEBC068205D5102717DB0000FC36100617DA0000FFFF00AAFEBC0682
+05D5102617DE0000100717DA0000FC36FFFF00AAFEBC068205D5102617DE0000100717DF
+0000FC36FFFF00AAFEBC068205D5102717DB0000FC36100617DF0000FFFF00AAFEBC0682
+05D5102717DB0000FC36100617D80000FFFF00AAFEBC068205D5102617DE0000100717D8
+0000FC36FFFF00AAFEBC068205D5102617DE0000100717DB0000FC36FFFF00AAFEBC0683
+05D5102617D90000100717DC0000FC36FFFF00AAFEBC068205D5102617DD0000100717DD
+0000FC36FFFF00AAFEBC068205D5102617DA0000100717DA0000FC36FFFF00AAFEBC0683
+05D5102617D90000100717DE0000FC36FFFF00AAFEBC068205D5102617DB0000100717DC
+0000FC36FFFF00AAFEBC068205D5102717DE0000FC36100617D80000FFFF00AAFEBC0682
+05D5102617DB0000100717D80000FC36FFFF00AAFEBC068205D5102717DF0000FC361006
+17DA0000FFFF00AAFEBC068205D5102617DF0000100717DA0000FC36FFFF00AAFEBC0682
+05D5102617DC0000100717DA0000FC36FFFF00AAFEBC068305D5102617DA0000100717D9
+0000FC36FFFF00AAFEBC068205D5102617DD0000100717DE0000FC36FFFF00AAFEBC0682
+05D5102717DD0000FC36100617DB0000FFFF00AAFEBC068305D5102617DE0000100717D9
+0000FC36FFFF00AAFEBC068205D5102617DC0000100717DB0000FC36FFFF00AAFEBC0683
+05D5102617D90000100717D80000FC36FFFF00AAFEBC068205D5102617D80000100717DC
+0000FC36FFFF00AAFEBC068305D5102617D90000100717DF0000FC36FFFF00AAFEBC0682
+05D5102617DF0000100717DC0000FC36FFFF00AAFEBC068305D5102717DD0000FC361006
+17D90000FFFF00AAFEBC068205D5102617DD0000100717DC0000FC36FFFF00AAFEBC0683
+05D5102617D90000100717DA0000FC36FFFF00AAFEBC068205D5102617DA0000100717DC
+0000FC36FFFF00AAFEBC068205D5102617DB0000100717DB0000FC36FFFF00AAFEBC0682
+05D5102617DE0000100717DE0000FC36FFFF00AAFEBC068205D5102617DC0000100717DE
+0000FC36FFFF00AAFEBC068305D5102617DB0000100717D90000FC36FFFF00AAFEBC0682
+05D5102617DB0000100717DA0000FC36FFFF00AAFEBC068205D5102617DA0000100717DE
+0000FC36FFFF00AAFEBC068205D5102617DC0000100717DC0000FC36FFFF00AAFEBC0683
+05D5102617D90000100717D90000FC36FFFF00AAFEBC068205D5102617DC0000100717DD
+0000FC36FFFF00AAFEBC068305D5102617DD0000100717D90000FC36FFFF00AAFEBC0683
+05D5102617DC0000100717D90000FC36FFFF00AAFEBC068205D5102617DB0000100717DE
+0000FC36FFFF00AAFEBC068205D5102617DD0000100717DA0000FC36FFFF00AAFEBC0682
+05D5102717DD0000FC36100617DA0000FFFF00C9000004EC05D5120600250000FFFF00C9
+0000048D05D5120600330000000200460000040A05D50008001300002511232206151416
+33052122243534243B0111330340FE8D9A9A8D01C8FE38FBFEFF0101FBFECAA602319287
+8692A6E3DBDDE20258000000FFFF00C9000005B005D5120600270000FFFFFFFA000004E9
+05D51206003700000001FFFA000004E905D500070000290135211133112104E9FB110212
+CB0212AA052BFAD5FFFF0073FFE3058B05F01206002A0000FFFF00C90000056A05D51206
+002E00000001FFD50000047605D5000A000021231101210901210111330476CAFD62FEFC
+02E5FCE6010A02CDCA0277FD8902B8031DFD3102CF000000FFFF0000FFE3034F05D51206
+175F0000FFFF0073FFE3052705F0120600260000FFFF0073FFE3052705F0120601480000
+FFFF005C0000051F05D51206003D0000FFFF00C90000042305D5120600290000FFFF00C9
+0000042305D512060BC90000FFFF00C90000061F05D5120600300000FFFF00C900000533
+05D5120600310000FFFF00C90000046A05D51206002F0000FFFF0087FFE304A205F01206
+00360000FFFF00C90000055405D51206003500000002003B000004C605D50013001B0000
+012E01270333131E013B0111331121202635343601112322061016330202417B3ECDD9BF
+4A8B78DCCAFE38FF00FC830277FE92959592031916907E0198FE8196620277FA2BD6D88D
+BAFDB1021287FEFA85000000FFFF00100000056805D5120602070000FFFF001000000568
+05D5120600390000FFFF00C90000053B05D51206002B0000FFFF00A3FFE305BB05F01206
+0BD80000000100C90000041805F2000F000001152E012322061511231110363332160418
+5BC2688F71CAD3F760BE0598EC515195CBFC1203EE011AEA2C000000FFFF0044000007A6
+05D51206003A0000FFFF003D0000053B05D51206003B0000FFFFFFFC000004E705D51206
+003C000000030091000004B405D500080011002000000111212206151416330111212206
+1514163305212226353436372E01353424332103EAFEBCA39D9DA30144FED59491919401
+F5FDFCE7FA807C95A50110FB0218030C0223878B8C85FD9A01C26F727170A6C0B189A214
+20CB98C8DA000000FFFF00100000056805D5120600240000FFFF00100000056805D51206
+11EA0000FFFF00C90000048B05D5120600280000000100830000044505D5000B00002901
+352111213521112135210445FC5002E6FD3902C7FD0803C2AA01BAAA021DAA00FFFF00C9
+0000019305D51206002C0000FFFF0073FFE305D905F0120600320000FFFF00B2FFE30529
+05D5120600380000000100B20000052905F20011002A40090A1C0838111C00411210FC4B
+B0105458B90000FFC03859ECFCEC3100B50D95049109002F3CF4EC303311100021200019
+01231134262322061511B20121011B011A0121CBAEC2C3AE03A40124012AFED6FEDCFC5C
+038BF0D3D3F0FC75FFFF0008000003A905D512060BD90000000200730000055A05D50008
+0011001F4009001C0A3204190E101210FCECF4EC3100B60095098107950B2FECF4EC3001
+23200011100021331311212000111000210490F4FECBFEE1011F0135F4CAFE61FE50FE68
+019601B2052FFEE9FED4FED2FEE8052FFA2B016A0182018001690000000100AF000001B7
+013E0003000013211121AF0108FEF8013EFEC20000010092FEC001B7013E000600001321
+1103231323AF0108A481A487013EFEC2FEC00140FFFF00AF00000416013E102712C6025F
+0000100612C60000FFFF00AFFEC00416013E102712C7025F0000100612C6000000020092
+FEC001B704230006000A00001321110323132311211121AF0108A481A4870108FEF8013E
+FEC2FEC001400423FEC20000000200AF000001B704230003000700001321112111211121
+AF0108FEF80108FEF8013EFEC20423FEC2000000000200AF0000040502D6000300070000
+012111210121152102FD0108FEF8FDB20356FCAA013EFEC202D6A800000200AF01600405
+03A20003000700001321152115211521AF0356FCAA0356FCAA03A2A8F0AA0000FFFF0072
+FFE3048D05F0100601690000FFFF0064FFE303BC047B1006016A0000FFFF00C9000002C6
+05D5100601580000FFFF00A60000026E04601006022B000000010076FFE308FA05290034
+003E401530312C1C001817040A0F2A241E0600361C1C13453510FCECCCCC1739D4CC10EC
+D4CC3100400C24950A2A1E95040F8C30173510CC32F432EC32DCEC300114070623222726
+272623220F01062322272635343736373306070615102132373637363332171617163320
+11342726273316171608FA6674EA5B6E61607A787A7BC26E5BEA746643476FF97E5B5501
+008A5D4C4B669D9B644B4A5D8A0100555B7EFA6F464301FEF28B9E444040444480449D8B
+F2C6E2EC986BF3E2B6FEBA36333336363333360146B6E2F36B98ECE200010098FFE307A1
+03C50021003C401321001F08020E0D04091D1204022310080B452210FCECCCCC1739D4CC
+10ECD4CC3100400C17A9071D12A904098C210D2210CC32F432EC32DCEC30011211102122
+2422042320111013330215103332373637363217161716333211340307178AFE7254FED5
+F0FED452FE728AC692D03E49781564FC641479493FD09203C5FEE3FEEBFE50E2E201B101
+14011DFEB9FAFEFB385B0C37370C5B380107F80147000000FFFF003C0000077205D51026
+03BE00001007002C05DF0000FFFF003E0000068A047B102603DE0000100700F305110000
+00020073FFE307D005F00009001C00000020001110002000111017211133112311210200
+2120001110002120000401FE48FEFF010101B80103D20130CACAFED00EFE98FEC5FEC6FE
+880178013A013B0168054CFEB8FEE5FEE6FEB80148011A011BC50296FA2B0295FEE8FE66
+01A50161016201A5FE67000000020070FFE305FB047B000A001C00000122061514163332
+361026013311331123112306002322001110002012027293ACAC9395ABAC0168D5B8B8D0
+09FEF9F1F0FEEE011201E0F903DFE9C7C8E8E70192E7FEC201BFFBA00209F8FED2013901
+1301140138FEE400000200D3000007BF05D5000F00120000013301230321032313211123
+1133112109012104A1E50239D288FD5F88D5FCFE3ACACA0207016FFEEE022505D5FA2B01
+7FFE810295FD6B05D5FD6A01CFFD1900000200C1FFE30604047B0022002D000001112335
+0E012322263534372111231133112136332135342623220607353E013332160122061514
+163332363D010604B83FBC88ACCB2FFEF8B8B801D26A950102A79760B65465BE5AF3F0FE
+91DFAC816F99B9027FFD81AA6661C1A27350FDF70460FE4122127F8B2E2EAA2727FCFEB4
+667B6273D9B4290000020065FEBF080805D50012001A0000373637121901211521113311
+231123211123110121151003060721AC862661064FFD29AAAACAFCA8AA0402FE1B701728
+0294AA3F7801340226011AAAFB7FFE150141FEBF01EB0481D4FE0DFEB5442B000002006B
+FEE506E7046000120019000037363736113521152111331123112321112311012115100F
+0121B05B28620552FDA39393B9FD2D930366FE7D761D0216932855D301A9D493FCC6FE52
+011BFEE501AE033A8CFE64DC36000000000100540000081105D500110000333536373611
+35211521112311211510030654DD3A57064FFD29CAFE1B6662AA30A3F60264FEAAFAD505
+2BB8FDCAFEF8FD000001004C000006D104600012000033353637361135211521112B0111
+21151007064CBB33440553FDA301B8FE7B585E991D7DA601D0B793FC3303CD6FFE50C2CF
+000100C9000008F605D5000F000013210901211521112B01110123011123C9012D017D01
+7F0404FD29C505FE84CBFE7FC405D5FC0803F8AAFAD50512FC0D0400FAE10000000100BA
+000007AC0460000E0000132109012115211123110123011123BA010D013E013F0368FDA3
+B9FECBB8FECAB90460FD1202EE93FC3303B0FD2702D9FC50FFFF0073FFE305D905F01027
+007901E20000100600320000FFFF0071FFE30475047B10260052000010070079012EFF84
+00040073FFE3066505F0000300070013001D000001331523253315231220272610373620
+17161007002000111000200011100231D3D301A4D3D3F1FD4CD0CFCFD002B4D0CFCFFEC8
+FE1AFEE0012001E601200346FEFEFEFD9BD2D202C4D3D2D2D3FD3CD20497FEB8FEE5FEE6
+FEB80148011A011B00040071FFE30543047B000300070012001E00000133152325331523
+032206101633323635342627200011100021200011100001BCD3D30168D3D34AC3E3E1C5
+C2E3E3C201200149FEB7FEE0FEDFFEB8014802CAFEFEFE0213E7FE6EE7E8C8C7E99CFEC8
+FEECFEEDFEC701390113011401380000FFFF0073FFE30A6A05F010261323000010270079
+067200001007007901E20000FFFF0071FFE307B6047B10270079046FFF8410270079012E
+FF84100613240000000F003AFE5706CE05F100030007000B000F00130017001F0027002F
+0037003F0047004F00800084000025331523253315230133152325331523013315232533
+152300220614163236341222061416323634242206141632363412220614163236342422
+061416323634002206141632363424220614163236341332161514062B01161514062027
+26270607062026353437222322263534363B012635343620171617363736201615140701
+331523044A8686FDEF868602118686FDEF8686FEF8868604228686FC7BB46969B468A0B4
+6969B46801A9B46969B468A1B46969B468FD86B46969B468FE90B46969B46801A9B46969
+B468478DABAB8D0434ABFEE355160F0F1555FEE2A93302018FABAB8F0232A9011E55150F
+0F1655011DAB34FDAF8686169C9C9C05499C9C9CFE469C9C9C015D8EF78E8EF702E48FF6
+8E8EF68F8FF68E8EF6FE398EF78E8EF78E8EF78E8EF7FE378EF78E8EF78E8EF78E8EF703
+52CCACA9CC5C85ABCB641B1D1D1966CAAC855CCAABACCC5A85ABCC651A1D1D1A65CCAB85
+5AFED29C0001FFFAFE66061005D5001D0000032115211121321716151110062B01353332
+3736351134262321112311210604EFFDEE01A1BA716DCCE44C3E8638377C7CFE88CBFDEE
+05D5AAFE467772EEFECEFEF2F4AA4B4BC201229F9EFD39052B0000000001003CFE560548
+0460001F000013211521113320171615111407062B013533323736351134272623211123
+11213C0431FE42FA010746525251B5C1AC6E2126262C8BFEFCB5FE42046093FEAA4751E5
+FEF2D561609C3037930108A62429FE1903CD00000001FFFA000004E905D5000F00000321
+15211114163B01152322261901210604EFFDEE6D863F4DE3CDFDEE05D5AAFCD7C296AAF4
+010E03290001003C0000046D04600011000013211521111417163B011523222726351121
+3C0431FE4623236D586EB65053FE45046093FDBE912E309C6062D40237000000000100AF
+000004B305D50017002A400B19081C06130C001C0F041810FCEC32CCD4ECCC3100400A02
+950BAD15951281070E2F3CF4ECF4EC300115213216151123113426232111231134363321
+15232206017A01A1BADEC97C7CFE88CBA3B50109E0694D043FCEE9EEFE66018A9F9EFD39
+043FD6C09C610000FFFF00BA000004640614100602280000000200D60000031D05580003
+000700001333152301113311D6AAAA01BF88055888FB300558FAA800000200D60000031D
+05580003000700001333152301113311D6AAAA01BF88042488FC640558FAA800000200D6
+0000031D05580003000700001333152301113311D6AAAA01BF8802F088FD980558FAA800
+000200D60000031D05580003000700001333152301113311D6AAAA01BF8801BC88FECC05
+58FAA800000200D60000031D05580003000700003733152301331123D6AAAA01BF888888
+880558FAA8000000000200D60000031D055800030007000001331523012311330273AAAA
+FEEB8888055888FB30055800000200D60000031D05580003000700000133152301231133
+0273AAAAFEEB8888042488FC64055800000200D60000031D055800030007000001331523
+012311330273AAAAFEEB888802F088FD98055800000200D60000031D0558000300070000
+01331523012311330273AAAAFEEB888801BC88FECC055800000200D60000031D05580003
+0007000025331523212311330273AAAAFEEB888888880558000100D60000031D05580005
+0000212311211521015E880247FE410558880000000100D60000031D0558000700002123
+113311211521015E888801BFFE410558FECC8800000100D60000031D0558000700002123
+113311211521015E888801BFFE410558FD988800000100D60000031D0558000700002123
+113311211521015E888801BFFE410558FC648800000100D60000031D0558000500002521
+15211133015E01BFFDB988888805580000010066029C028E05E400090000013317072711
+23110727015E39F74C926B934C05E4DD4383FD5502AB8343000100660298028E05E00009
+000001232737171133113717019739F84C936B924C0298DD438302ABFD558343000200C3
+029C014305E000030009000013331523113311072327C38080800D660D032A8E0344FE91
+C8C80000000200C3029C014305E00003000900000123353311231137331701438080800C
+660E05528EFCBC016FC8C800FFFF00C3000001430344100712FF0000FD64000000010089
+000002CD05D4001000003335200221352002213520131607161312CF014A14FEB6014A1E
+FEA2021D0E09AEB8060AA30227A301C5A2FE8CE5636DFEFBFE5A00000001008900000291
+0460001000003335200221352002213520131607161712BB012C14FED4012C1EFED401E1
+0E08848F060A99017C99011A98FEE89E4D59BCFEB80000000001007301CB034A05F00009
+000001101707023510211520012D75A48B02D7FDE303CDFEFED22E0131D40220DB000000
+000100730056034A047B0009000001101707023510211520012D75A48B02D7FDE30258FE
+FED22E0131D40220BD000000000100C9FE66053B05D5001300001333112111331110062B
+01353332363511211123C9CA02DECACDE34D3F866EFD22CA05D5FD9C0264FA93FEF2F4AA
+96C2025FFD390000000100BAFE5604640614001C00000134262322061511231133113E01
+333216151114062B0135333237363503AC7C7C95ACB9B942B375C1C6A3B546316E212602
+9E9F9EBEA4FD870614FD9E6564EFE8FD48D6C09C303892000001FFFAFE4C068D05D5002A
+000003211521152115013217161716151407062122272627351617163332373635342726
+2B01350121112311210604EFFDEE035EFE6569816355519898FEE8738182826A7F7E89C0
+63645C5DA5AE0181FD9ECBFDEE05D5AACB9AFE16382B6C688ADC7A79131324C33119194B
+4B8F86494A9801EAFC4A052B00010037FE4C0534059E0030000001321716171615140421
+22272627351E0133323736353427262B013501211114163B011523222635112335331133
+11211503416981635551FED0FEE85E63646A54C86DBE63645C5BA7AE01AEFD6A4B73BDBD
+D5A28787B9036501DC382B6C688ADDF2121325C331324B4B8F844B4AA601F3FDA4894E9A
+9FD202608F013EFEC2A80000FFFF00A4FFE3047B05F010060152000000010085FE6703C8
+047C003100000126272635343736333216171526272623220706151417163B0115232207
+0615141716333237363715060706232224353436018B703C3C7271C44CAA626150514781
+3B464443749B9489484E545597615155475A545550EEFEFE8A01AC2056557BBA68681A26
+B62D14153E486D6D4645984D55858855551C1C38BE251312F0E58FC1000100BA0000037E
+04600009000013211521112115211123BA02C4FDF601D5FE2BBA046094FED394FDF50000
+FFFF006FFFE303C7047B10060056000000030010000009EE05D5000F0012001500000133
+09013301230321032B0103210323090121090121024AE501D001D1E50239D288FD5F8803
+D288FD5F88D502ACFEEE02250373FEEE022505D5FB3E04C2FA2B017FFE81017FFE81050E
+FD1902E7FD1900000004007BFFE30727047B000A00350040004D00000122061514163332
+363D01251123350E012322271523350E01232226353436332135342623220607353E0133
+32173017353E013332160122061514163332363D010116173633213534262322070602BE
+DFAC816F99B903B2B83FBC886E51B83FBC88ACCBFDFB0102A79760B65465BE5AF3781265
+BE5AF3F0FE91DFAC816F99B9FD88350179C70102A797605B410233667B6273D9B4294CFD
+81AA6661270AAA6661C1A2BDC0127F8B2E2EAA27277E14442727FCFEB4667B6273D9B429
+01686EA63C127F8B1710000000030010FFE3092D05F00013001600200000013313363736
+212000111000212027262721032309012100200011100020001110024AE5B82D70BC013B
+013A0178FE88FEC6FEC5BC502EFD6788D502ACFEEE02250388FE48FEFD010301B8010105
+D5FE1EAE7DD2FE5BFE9EFE9FFE5BD25872FE81050EFD190325FEB8FEE5FEE6FEB8014801
+1A011B000003007BFFE3077B047B0022002D00380000013200111000202726270E022322
+26353436332135342623220607353E01332017360122061514163332363D010122061016
+3332363534260579F00112FEEEFE1F88372112608CB2B1CCFDFB0102A79760B65465BE5A
+012A718AFE4FDFAC816F99B9020494ACAB9593ACAC047BFEC8FEECFEEDFEC79D3E524587
+61C1A2BDC0127F8B2E2EAA2727BDBDFDB8667B6273D9B42901ACE7FE6EE7E8C8C7E90000
+00020010FFE3087105D50002001600000901210133011621323635113311100021200327
+21032302BCFEEE0225FE7BE501BC4A0101C2AECBFEDFFEE6FE737625FD5F88D5050EFD19
+03AEFB72C0D3F0038BFC5CFEDCFED6013468FE810002007BFFE3071F047B002800330000
+250E01232226353436332135342623220607353E01333216111514163332363511331123
+350E0123200122061514163332363D01039348A2B2B1CBFDFB0102A79760B65465BE5AF3
+F07C7C95ADB8B843B175FEE5FEDBDFAC816F99B9DF8D6FC1A2BDC0127F8B2E2EAA2727FC
+FF00BE9F9FBEA4027BFBA0AC66630250667B6273D9B4290000020010000007B405D50002
+000D0000090121130321032301330901330102BCFEEE0225C788FD5F88D5023AE501DC01
+D7D2FDC7050EFD19FDD9017FFE8105D5FB1F04E1FA2B00000002007BFFE3064E047B000A
+002800000122061514163332363D0111350E01232226353436332135342623220607353E
+01333216190101330102BEDFAC816F99B93FBC88ACCBFDFB0102A79760B65465BE5AF3F0
+015EC3FE5C0233667B6273D9B429FDCDAA6661C1A2BDC0127F8B2E2EAA2727FCFF00FE35
+03ACFBA000030010000007B405D500020012001500000901290215210323032103230133
+0133013301231702BCFEEE0225027E0167FE5992E588FD5F88D5023AE50167E90163D2FD
+8B6935050EFD19A8FE81017FFE8105D5FC5203AEFBAA8B000003007BFFE3064E047B0022
+002D0030000021350E01232226353436332135342623220607353E013332171617331333
+03331523030122061514163332363D0121231103753FBC88ACCBFDFB0102A79760B65465
+BE5AF378670FC69AC39B9BD1D3FE14DFAC816F99B901478FAA6661C1A2BDC0127F8B2E2E
+AA27277E6DCD019DFE6390FDCD0233667B6273D9B429FE8100020010FE56079B05D50002
+00180000090121010607062B0135333237363F0103210323013309013302BCFEEE022501
+6C4B4D4A7CD8AB4C2A2B321388FD5F88D5023AE501CF01CBD2050EFD19FD71C63F3DAA24
+258532017FFE8105D5FB4004C00000000002007BFE56064E047B00270032000021350E01
+232226353436332135342623220607353E0133321619010133010E012B01353332363F01
+0122061514163332363D0103753FBC88ACCBFDFB0102A79760B65465BE5AF3F0015EC3FE
+144E947C936C4C54331AFEF4DFAC816F99B9AA6661C1A2BDC0127F8B2E2EAA2727FCFF00
+FE77036AFB38C87A9A4886420233667B6273D9B429000000FFFF0073FFE3052705F01006
+03930000FFFF007FFFE303F5047B1006031900000001000A0000056A05D5001200001333
+1533152311012109012101112311233533C9CABFBF029E0104FD1B031AFEF6FD33CABFBF
+05D5B9AAFEEC0277FD48FCE302CFFD310472AA000001000E000004A40614001200001333
+1521152111013309012301112311233533C2B90122FEDE0225EBFDAE026BF0FDC7B9B4B4
+0614ACA4FDB901E3FDF4FDAC0223FDDD04C4A400000100C90000056605D5000900001311
+3311371121152111C9CAFC02D7FC5F02AD0328FD5E4DFD2AAA02FA00000100C100000263
+0614000700001311331137112311C1B8EAB8029C0378FD0549FC9E02E500000000010053
+0000049C05D5000D00001333153315231121152111233533FBCAA8A802D7FC5FA8A805D5
+E0A4FC59AA0451A400010078000002F20614000B00000133113315231123112335330159
+B8E1E1B8E1E10614FEE2A4FBAE0452A40003000AFFE3066A05F00015001D002500000120
+171613331523020706212027260323353312373604200706072126271321161716203736
+033B013ABCA117817E0BB0BCFEC6FEC5BCB10B7E8117A2BC0217FE48816A1403B413697F
+FC460A778101B8817605F0D2B5FEE390FEBEC4D3D2C4014390011DB5D2A4A486D6D686FE
+14FA97A4A49700000003000AFFE3058E047B0015001E0027000001321716173315230607
+06232227262723353336373617220706072126272613211617163332373602CDF0896F15
+C4C00A7E89F0F1887E0AC2C6156F88F194563F110273113F56ABFD83084C569593564D04
+7B9C7ECD90F4909D9D90F490CD7E9C9C735583815575FE25AB6773746700000000030073
+FFE30A6A05F0001A0024002E000001201716173637362120001110002120272627060706
+212000100004200011100020001110002000111000200011100327013ABC2F23232EBD01
+3B013A0178FE88FEC6FEC5BD2E24232EBCFEC6FEC5FE8701790217FE48FEFD010301B801
+010390FE48FEFD010301B8010105F0D2353D3D35D2FE5BFE9EFE9FFE5BD2343D3C34D301
+A402C401A5A4FEB8FEE5FEE6FEB80148011A011B0148FEB8FEE5FEE6FEB80148011A011B
+00030071FFE307B6047B000A001500310000012206101633323635342621220610163332
+363534262732171617363736333200111000232227262706070623220011100005B494AC
+AB9593ACACFC2C94ACAB9593ACAC93F0891512121589F1F00112FEEEF0F1891512121589
+F0F1FEEF011103DFE7FE6EE7E8C8C7E9E7FE6EE7E8C8C7E99C9C181B1B189CFEC8FEECFE
+EDFEC79D181B1B189D01390113011401380000000002000A0000048D05D50008001D0000
+0111333236353426232521321716151407062B01153315231123112335330193FE8D9A9A
+8DFE3801C8FB80818180FBFEEDEDCABFBF052FFDCF92878692A67172DBDD7171C490FEFC
+010490000002FFFBFE5604A4047B0007001F000000102620061016200135331133153E01
+3332001002232226271133152315233503E5A7FEDCA7A70124FCBDBFB93AB17BCC00FFFF
+CC7BB13AFEFEB901640196E7E7FE6AE7FE679004ECAA6461FEBCFDF0FEBC6164FECC908E
+8E000000000200320000059905D5001E00270000012132041514042B0111231123220706
+151617161707262726353437363B0332363534262B0101D501C8FB0101FEFFFBFECA2D5C
+303A011A173C444F45467F61A221CAFE8D9A9A8DFE05D5E3DBDDE2FDA80258181F3D3527
+20189417494B7D934C3B92878692000000020032FE5605C2047B000C0031000001171633
+323736353426200615032623220706151417161707262726353437363332171133153E01
+3332001002232227112302910A9D928E5853A7FEDCA7B933292C343A1B173C444F45467F
+54673537B93AB17BCC00FFFFCAC0A8B901320BAA7370CFCBE7E7CBFEE319181B41342820
+189417494B7D86593B1702A6AA6461FEBCFDF0FEBCA2FDD100020073FE9405D905F00009
+002300000020001110002000111001273727070623200011100021200011100207173717
+071723270403FE48FEFD010301B80101FE8048AA6B33120FFEC5FE870179013B013A0178
+D1C645D748BC62F40E054CFEB8FEE5FEE6FEB80148011A011BFA907D6274030101A50161
+016201A5FE5BFE9EFEFCFE8E584B7C7D6C6B0F0000020071FE560519047B0017001F0000
+250E01232202100033321617353311331523152335233521001016203610262003A23AB1
+7CCBFF00FFCB7CB13AB8BFBFB8FF00FFFD8DA70124A8A8FEDCA864610144021001446164
+AAFB14908E8E900386FE6AE7E70196E70002000A0000048D05D50007001B000001113332
+361026230133153315231533320410042B011123112335330193FE8D9A998EFE38CAEDED
+FEFB0101FEFFFBFECABFBF0427FDD192010C9101AE2D904BE1FE48E2FEAE051890000000
+0002FFFBFE5604A406140007001F00000010262006101620251123112335333533153315
+23113E01333200100223222603E5A7FEDCA7A70124FE35B9BFBFB9FEFE3AB17BCC00FFFF
+CC7BB101640196E7E7FE6AE72BFDAE069B90939390FEC56461FEBCFDF0FEBC610002000A
+0000048D05D50007001B0000011133323610262301331133320410042B01153315231523
+352335330193FE8D9A998EFE38CAFEFB0101FEFFFBFEEDEDCABFBF0427FDD192010C9101
+AEFEF8E1FE48E25E906464900002FFFBFE5604A406140007001F00000010262006101620
+0135331133113E013332001002232226271133152315233503E5A7FEDCA7A70124FCBDBF
+B93AB17BCC00FFFFCC7BB13AFEFEB901640196E7E7FE6AE7FE679006A0FDA26461FEBCFD
+F0FEBC6164FECC908E8E00000001000B000003AC05D50005000021231121352103ACCAFD
+2903A1052BAA0000000200C1FE560179047B0000000400000107331123011D5CB8B8047B
+1BF9F600000100C9FE56060E05F0001A0000011114163315222619013426232206151123
+11331536373633321205196F86F1CD9A99B3D7CACA5166659EE3E9037DFE85C296AAF401
+0E017DD7D5FFDEFB08077FF1874342FEC1000000000100BAFE56051A047B001900000111
+141633152226271134262322061511231133153E0133321604644A6CCAA3017C7C95ACB9
+B942B375C1C602A4FEE78E619CC1D501089F9EBEA4FBDD060AAE6564EF000000FFFF00F0
+000001C304231206001D0000000200A001490262030B0003000700000121352135213521
+0262FE3E01C2FE3E01C20149969696000001013501E1020005D50005003A400B03008106
+0403010300000610FC4BB00B5458B90000FFC03859EC3939310010E4CC400920035F03B0
+03EF03045D3001B6000720075007035D0133110323030135CB14A21505D5FD71FE9B0165
+000100C503AA016F05D500030037400A0184008104000502040410FC4BB012544BB01354
+5B58B90002FFC03859EC310010F4EC3001400D40055005600570059005A005065D011123
+11016FAA05D5FDD5022B0000FFFF00AF000004B305D5120603BB00000002004DFE560354
+06140006001F000001262322071433371133113315231114163B01152322263530032320
+37363332019217374D015C50B8FAFA3D783146BF99023CFEE80101F5350312844B39FA02
+08FCFEA0FD707C749CCCCA0286BDF600000100C9FEBF05DD05D5000D0000132101113311
+3311231121011123C901100296C4AAAAFEF0FD6AC405D5FB1F04E1FAD5FE15014104E1FB
+1F000000000100BAFEE504F7047B00170000011133112311231134262322061511231133
+153E0133321604649393B87C7C95ACB9B942B375C1C602A4FDEFFE52011B029E9F9EBEA4
+FD870460AE6564EF00010004FFE3063905F0002800002511213521110604232427262707
+27372635100021320417152E01232007060301170116171621323604C3FEB6021275FEE6
+A0FEA2C68D28542B7001018B015E9201076F70FC8BFEEF8A870304C62BFB16196A8A0111
+6BA8D50191A6FD7F535501CC92E21C7F251E1F016E01994846D75F609997FED901957FFE
+5FCF77992500000000030004FE560510047B00260030003A000025100221222627351E01
+3332363D010E012322272627072737263510123332161735331137170F01051617163332
+36353427262726232206151417045AFEFEFA61AC51519E52B5B439B27CCE7E431F682174
+07FCCE7CB239B89521B6B9FD9F142E529495A50D1332529694A5028BFEE2FEE91D1EB32C
+2ABDBF5B63629D5370236327383E0104013A6263AAFEB132633D3DCB573C6EDCC7157E62
+416EDCC81D1C0000000200040000056A05D5001300160000133311012101172517050121
+0107112311072737252715C9CA029E0104FD1B7902522BFDED0237FEF6FE0BD8CA9A2BC5
+01386E05D5FD890277FD487AC57FB0FDC701F748FE51016C337F41686E93000000020004
+0000049E06140013001600001333110133011725170501230107112335072737252715BA
+B90225EBFDAE5E01EE21FE4601B8F0FE85BEB99521B60122690614FC6901E3FDF45BA462
+93FE58016C3FFED3F032633C6165880000030004000005F805D500130016001900001321
+012511331137170711210105112311072737250311251311C90110015E0138C49A2BC5FE
+F0FEA6FEC4C49A2BC501C0FC01EAF805D5FD6B67022EFE13337F41FCA5028E69FDDB01E4
+337F419501DBFDD116FE2C02260000000002000400000510047B00170020000001112311
+051123110727371133153E013336171617371707272627262322061D010464B8FDC7B995
+21B6B942B375C1634A139121ACBA09333E7C95AC02A4FD5C026ABEFE54016F32633D0283
+AE6564017859993163393075404FBEA45F000000000300040000058B05D5001D0024002B
+0000011E01171323032E012B01112311072737112120171617371707161514062D012627
+26272311153316373637038D417B3ECDD9BF4A8B78DCCA9A2BC501C801007E491FE92BFF
+0183FD890219122C4A93FEFE934A3D0B02BC16907EFE68017F9662FD890301337F420246
+6B3E644E7F550D0E8DBAF2B33F284201FE16280144386300000100040000034A047B0019
+0000012E012322061D012517051123110727371133153E0133321617034A1F492C9CA701
+B221FE2DB99521B6B93ABA85132E1C03B41211CBBE3490629CFE54016F32633C0284AE66
+6305050000010004FFE3051005F0002F000001152E012322061514161F01251705161716
+15140421222627351E013332363534262F01052725262726353424333216044873CC5FA5
+B377A65402222BFE9957366CFEDDFEE76AEF807BEC72ADBC879A61FDE22B01654D306501
+17F569DA05A4C53736807663651F11B57F7727386CB6D9E0302FD04546887E6E7C1F13B4
+7F77222E60ABC6E42600000000010004FFE30427047B002F000001152E01232206151416
+1F0125170516171617140623222627351E013332363534262F0105272526272635343633
+3216038B4EA85A898962942D01BA21FED64B2C5201F7D85AC36C66C661828C65AB24FE4F
+2101233E264CE0CE66B4043FAE282854544049210A93636320284C899CB62323BE353559
+514B5025089063611B264A839EAC1E000001FF970000059F05D500140000010E011D0123
+3534363B0111211133112311211123012D84769CC0D6CA02DECACAFD22CA0530015E6931
+46B5A3FD9C0264FA2B02C7FD390000000002007F029C041F05E000130017000013331521
+3533153315231123112111231123353317152135E88001CE7F6A6A7FFE328069698001CE
+05E07D7D7D5CFD95018EFE72026B5C5C7E7E000000030047028C04E4051E000600270031
+0000012E01232206070515211E0133323637150E01232226270E01232226353436333216
+173E0133321624220614163332363534046F0167576075080211FDEB088073437E3E3F83
+436598332D845898ACAC9858852A31925A8EA7FD04BA6D6C5E5D6C040E556461591E326A
+701D1D6118183D3D3E3CAF9A9BAE3E3C3C3EA34C81E28182706F0000FFFF00BA00000698
+0460120603DC000000010077000003D105D5000900000111231121352111213503D1CAFD
+B00250FD7005D5FA2B02C9AA01B8AA00000200460000040A05D500080013000001232206
+1514163B0113112311232224353424330340FE8D9A9A8DFECACAFEFBFEFF0101FB052F92
+86879202D7FA2B0258E2DDDBE3000000000100C90000061F05D5000C0000331133110133
+01113311210901C9C40181CB0181C5FED3FE81FE8305D5FAE10400FC00051FFA2B03F8FC
+08000000000100C900000193076D0003000013331123C9CACA076DF89300000000010044
+0000095505D5000F00002501330901330123090123090123013303F4013EE3013A0139CD
+FE89FEFEC5FEC2E3FEC6FEC7CD0177FEC50510FB1204EEFA2B0510FAF004EEFB1205D500
+000100C204D00295055800030011B601A9020403010410C4D4310010D4EC300121352102
+95FE2D01D304D0880001008D039C02BD0558000400001327013315D649020828039C7301
+498800000001006E026802E405580005000001230127013302E410FE026802274F04D0FD
+9857029900010060013402F205580005000001230127013302F20EFDF27602355D04D0FC
+644403E00001005A000002F905580005000001230127013302F90BFDE87C023B6404D0FB
+303705210001008D039C02BD0558000400001301152301D601E728FDF80558FECC880149
+FFFF00C2039C029504241007134E0000FECC0000FFFF008D026802BD04241007134F0000
+FECC0000FFFF006E013402E40424100713500000FECC0000FFFF0060000002F204241007
+13510000FECC00000001006E026802E405580005000001152301370102E44FFDD96801FE
+02F088029957FD98FFFF008D026802BD0424100713530000FECC0000FFFF00C202680295
+02F01007134E0000FD980000FFFF008D013402BD02F01007134F0000FD980000FFFF006E
+000002E402F0100713500000FD98000000010060013402F2055800050000011523013701
+02F25DFDCB76020E01BC8803E044FC64FFFF006E013402E40424100713580000FECC0000
+FFFF008D013402BD02F0100713530000FD980000FFFF00C20134029501BC1007134E0000
+FC640000FFFF008D000002BD01BC1007134F0000FC6400000001005A000002F905580005
+000025152301370102F964FDC57C02188888052137FB3000FFFF0060000002F204241007
+135D0000FECC0000FFFF006E000002E402F0100713580000FD980000FFFF008D000002BD
+01BC100713530000FC640000FFFF00C20000029500881107134E0000FB300007B1000400
+103C3000000100D60000015E05580003000EB502010008030410D4EC3100C4C433113311
+D6880558FAA80000000E00960000073A05DC00030007000B000F00130017001B001F0023
+0027002B002F0033003701DAB72F243028372C343810DC3CDC3C3C3C3CB61F232B20331C
+27DC3C3C3C3CDC3CB6140C1B13081018DC3CDC3C3C3C3CB603070F0417000BDC3C3C3C3C
+DC3CB039CCB0584B5258B038104BB00A626620B0005458B133303C3C5920B0405458400A
+33302F2C37342B2827243C3C3C3C3C3C3C3C3C3C5920B0805458B323202F2C3C3C3C3C59
+20B0C05458B337342F2C3C3C3C3C5920B801005458B52B28272437343C3C3C3C3C3C5920
+B801405458B337341F1C3C3C3C3C5920B801805458B11F1C3C3C5920B801C05458B72B28
+333037342F2C3C3C3C3C3C3C3C3C59B8100062B80280634B236120B0005458B117143C3C
+5920B0015458400A0F0C1B18171413100B083C3C3C3C3C3C3C3C3C3C5920B0025458B307
+0413103C3C3C3C5920B0035458B313101B183C3C3C3C5920B0045458B51B180B080F0C3C
+3C3C3C3C3C5920B0055458B303001B183C3C3C3C5920B0065458B103003C3C5920B00754
+58B7131017141B180F0C3C3C3C3C3C3C3C3C59B0095458B11B183C3C591BB60F0C2B2827
+2438103C3C3C3C3C3CB7070403000B0817143C3C3C3C3C3C3C3C593100B7040D18203429
+0C282F3CDC3C3C3C3C3CB5051419213035DC3C3C3C3C3CB50015101C312CDC3C3C3C3C3C
+B709250108111D242DDC3C3C3C3C3CDC3C30011133110311331101352115013521150111
+331115352115011133110111331103113311013521150135211501113311153521150111
+331106D6646464FD760226FDDA0226FD76640226FD7664FE70646464FD760226FDDA0226
+FD76640226FD76640325024EFDB2FD44024EFDB2050F6464FA8864640325024EFDB26964
+64FDAD024EFDB202BC024EFDB2FD44024EFDB2050F6464FA8864640325024EFDB2696464
+FDAD024EFDB20000000E00960000073A05DC00030007000B000F00130017001B001F0023
+0027002B002F0033003701E0B72F243028372C343810DC3CDC3C3C3C3CB61F232B20331C
+27DC3C3C3C3CDC3CB6140C1B13081018DC3CDC3C3C3C3CB603070F0417000BDC3C3C3C3C
+DC3CB039CCB058004B015258B03810004B01B00A626620B0005458B133303C3C5920B040
+5458400A33302F2C37342B2827243C3C3C3C3C3C3C3C3C3C5920B0805458B323202F2C3C
+3C3C3C5920B0C05458B337342F2C3C3C3C3C5920B801005458B52B28272437343C3C3C3C
+3C3C5920B801405458B337341F1C3C3C3C3C5920B801805458B11F1C3C3C5920B801C054
+58B72B28333037342F2C3C3C3C3C3C3C3C3C59B8100062B8028063004B01236120B00054
+58B117143C3C5920B0015458400A0F0C1B18171413100B083C3C3C3C3C3C3C3C3C3C5920
+B0025458B3070413103C3C3C3C5920B0035458B313101B183C3C3C3C5920B0045458B51B
+180B080F0C3C3C3C3C3C3C5920B0055458B303001B183C3C3C3C5920B0065458B103003C
+3C5920B0075458B7131017141B180F0C3C3C3C3C3C3C3C3C59B0095458B11B183C3C591B
+B60F0C2B28272438103C3C3C3C3C3CB7070403000B0817143C3C3C3C3C3C3C3C593100B7
+040D182034290C282F3CDC3C3C3C3C3CB5051419213035DC3C3C3C3C3CB50015101C312C
+DC3C3C3C3C3CB709250108111D242DDC3C3C3C3C3CDC3C30011133110311331101352115
+013521150111331115352115011133110111331103113311013521150135211501113311
+153521150111331106D6646464FD760226FDDA0226FD76640226FD7664FE70646464FD76
+0226FDDA0226FD76640226FD7664031B0258FDA8FD440258FDA805196464FA886464031B
+0258FDA85F6464FDA30258FDA802BC0258FDA8FD440258FDA805196464FA886464031B02
+58FDA85F6464FDA30258FDA8000E00960000073A05DC00030007000B000F00130017001B
+001F00230027002B002F0033003701DAB72F243028372C343810DC3CDC3C3C3C3CB61F23
+2B20331C27DC3C3C3C3CDC3CB6140C1B13081018DC3CDC3C3C3C3CB603070F0417000BDC
+3C3C3C3CDC3CB039CCB0584C5258B038104CB00A626620B0005458B133303C3C5920B040
+5458400A33302F2C37342B2827243C3C3C3C3C3C3C3C3C3C5920B0805458B323202F2C3C
+3C3C3C5920B0C05458B337342F2C3C3C3C3C5920B801005458B52B28272437343C3C3C3C
+3C3C5920B801405458B337341F1C3C3C3C3C5920B801805458B11F1C3C3C5920B801C054
+58B72B28333037342F2C3C3C3C3C3C3C3C3C59B8100062B80280634C236120B0005458B1
+17143C3C5920B0015458400A0F0C1B18171413100B083C3C3C3C3C3C3C3C3C3C5920B002
+5458B3070413103C3C3C3C5920B0035458B313101B183C3C3C3C5920B0045458B51B180B
+080F0C3C3C3C3C3C3C5920B0055458B303001B183C3C3C3C5920B0065458B103003C3C59
+20B0075458B7131017141B180F0C3C3C3C3C3C3C3C3C59B0095458B11B183C3C591BB60F
+0C2B28272438103C3C3C3C3C3CB7070403000B0817143C3C3C3C3C3C3C3C593100B7040D
+182034290C282F3CDC3C3C3C3C3CB5051419213035DC3C3C3C3C3CB50015101C312CDC3C
+3C3C3C3CB709250108111D242DDC3C3C3C3C3CDC3C300111331103113311013521150135
+211501113311153521150111331101113311031133110135211501352115011133111535
+21150111331106D6646464FD760226FDDA0226FD76640226FD7664FE70646464FD760226
+FDDA0226FD76640226FD76640325024EFDB2FD44024EFDB2050F6464FA8864640325024E
+FDB2696464FDAD024EFDB202BC024EFDB2FD44024EFDB2050F6464FA8864640325024EFD
+B2696464FDAD024EFDB20000000E00960000073A05DC00030007000B000F00130017001B
+001F00230027002B002F0033003701E0B72F243028372C343810DC3CDC3C3C3C3CB61F23
+2B20331C27DC3C3C3C3CDC3CB6140C1B13081018DC3CDC3C3C3C3CB603070F0417000BDC
+3C3C3C3CDC3CB039CCB058004C015258B03810004C01B00A626620B0005458B133303C3C
+5920B0405458400A33302F2C37342B2827243C3C3C3C3C3C3C3C3C3C5920B0805458B323
+202F2C3C3C3C3C5920B0C05458B337342F2C3C3C3C3C5920B801005458B52B2827243734
+3C3C3C3C3C3C5920B801405458B337341F1C3C3C3C3C5920B801805458B11F1C3C3C5920
+B801C05458B72B28333037342F2C3C3C3C3C3C3C3C3C59B8100062B8028063004C012361
+20B0005458B117143C3C5920B0015458400A0F0C1B18171413100B083C3C3C3C3C3C3C3C
+3C3C5920B0025458B3070413103C3C3C3C5920B0035458B313101B183C3C3C3C5920B004
+5458B51B180B080F0C3C3C3C3C3C3C5920B0055458B303001B183C3C3C3C5920B0065458
+B103003C3C5920B0075458B7131017141B180F0C3C3C3C3C3C3C3C3C59B0095458B11B18
+3C3C591BB60F0C2B28272438103C3C3C3C3C3CB7070403000B0817143C3C3C3C3C3C3C3C
+593100B7040D182034290C282F3CDC3C3C3C3C3CB5051419213035DC3C3C3C3C3CB50015
+101C312CDC3C3C3C3C3CB709250108111D242DDC3C3C3C3C3CDC3C300111331103113311
+013521150135211501113311153521150111331101113311031133110135211501352115
+01113311153521150111331106D6646464FD760226FDDA0226FD76640226FD7664FE7064
+6464FD760226FDDA0226FD76640226FD7664031B0258FDA8FD440258FDA805196464FA88
+6464031B0258FDA85F6464FDA30258FDA802BC0258FDA8FD440258FDA805196464FA8864
+64031B0258FDA85F6464FDA30258FDA80001006EFFE20436069F00150000011510212011
+351333031510212011353400113316000436FE26FE123BC84501300126FE0FB50101EF02
+A19FFDE002258B0109FEDA73FE80018AB8F901CB0117C5FE070000000002006EFFE20436
+069F0009001C000001122504031510212011371510201135102533362726273314160733
+04038201FEC9FEE10101260130B4FC3801931434868502CFDA25140160029D01670B08FE
+8255FE4E01AD4B37FD9F02613C01EB3DA35152B26C9EF3450002006EFFE2048F06B30009
+002100000110212011151021201137151021201135102533362736232215231021200306
+070403D2FEB7FEA30158014EBDFDF1FDEE02075E4D0201BEB6A40157015C010C44012602
+7E01A4FE625FFE5D01A36157FDB3023E7801D64E5C619AC40164FEC18B5572000002006E
+000006AF06B30024002E0000253637001135102132173621201115100524113534372623
+2011151001170417212627240701102120031502052413010D637FFE7F01B9A99F650102
+01D9FE27FE342754ADFEFB01A8D4018738FEF80DEEFEFEF50485FEE5FEEF01010113011A
+01C34E21015601C66D01F8B3A9FDFF95FDD21E1C0230775F8C9AFEB763FE2DFEB11853D6
+524040B4045D018FFE9E9AFE771D1C016C0000000001006FFFE2043606B3001700000110
+21201B013303102104190134212211172303102120110436FE16FE22015AD06E0127013A
+FEE4F353BE4501B201B701C8FE1A01E9012FFED1FEB701014F0373D1FEFFF6010D0189FE
+8B0000000001006EFFE2043606B300210000010607161D01102011133303102120113534
+27233533360334230407172327102120040E05CDFAFC3835C43C01270130BEAA5BDC02FC
+FEFE0325BA1901B301BB051BE67C73FE7DFE1702010117FEE0FEA8014E73CD28A950010A
+DA01F59A9E0190000003006EFFE204CB06B3000900130026000001120722151417363733
+011021201115102120113715102120113534372635102120111407330402D102D6D16866
+C012013DFEC8FEB40147013DC2FDFFFDFD65BE018501910C0B014804DE013601DFB45F63
+09FDE50188FE764BFE5D019B584BFDB80252468DBC94CE018EFE2E25407F00000002006E
+FFE206A006B3000900220000011021201901102120112502032124131110232203111021
+20190110213617363320130349FEF3FEED0113010D03570ACCFEF7010817F2D713FE2EFE
+3C01CEE09573F701830204920182FE7EFD93FE5C01A49BFE46FEFAE501DB01D20179FEED
+FD2DFDBD0243026D022102E6DAFDE9000001006E0000040306B300150000011003231219
+0110232019011013230219011021201104039BC6A4F5FEDBAEC8A401E301B202FBFE8AFE
+7B014301B8019A017EFE82FE66FE53FEB201790182019A021EFDE2000001006EFFE20436
+06A0001C000001022120111333031005201135102B013533243534272116151007161104
+3601FE1DFE1C2BCE3C01270130D2DCAF00FFC8011864FAFA01C6FE1C01F30124FEDCFEAE
+01014478013CA881AF95B9BE6DFEF76463FE9E000001006E000008EB06B3003500002536
+37240335102132173620173633201115140323123D011223201511231110230615112311
+26212211151205361704012126252401015D7391FE3D3001B7E87064019E6D5EF301AEDF
+CDFC01FDFF00ACE3DBAD02FEFEF82D01B27A90020E0112FED028FE99FE9BFEC9A67843F3
+01F07B01EBB2BBBBB2FE1F67BAFE6401B1C83F0147E7FE5A01A6010002FEFE5A01A6E7FE
+B779FE41E9170B23FE76A55C5BFEC3000002006EFFE2043406B30009001E000001112627
+201115100520131021201135102532173534212206072310212011038B6AB8FEC3013A01
+25A9FE32FE0801E39E9DFEE1997B01B201BA01D401DA01CB3F01FEC1B8FE95010162FDFE
+0202AE01EE144AD1F9716C017CFE630000020082FFE2044A06A00009001B000001102122
+071110212011371510212019011029011521221D013633200396FEC9A8810135012BB4FE
+15FE2301510203FE02ACA98C01E902AB014F4BFE26FEAD0144FEFAFE1801E803540182A0
+E6C755000001006E0000068606B300200000011001230019011021221901231110212219
+0110012300190110213217363320110686FEC7E0015EFEF2E5B7FEF7EB013ED7FEDA01BE
+DE7882B901C902C2FE66FED8016E015501CF0183FECFFD8202870128FE7DFE31FEA7FE96
+0128019B01CF0221F0F0FDDF0001006EFFE20436069F001E000001151021201137330710
+2120113534272335332435342435331404151407040436FE30FE0814C71D01350121B0DA
+730103FE5DDC017BEB00FF01D725FE3001DFB3B3FEC1013F43C02DB63FB0A372F4968EDD
+B2796E000001006EFFE2043506C100160000011025201133102120190105041510253504
+27362535250435FE18FE21BE01210133FDD70160FDB801A20102FE5D03C601D1FE0F0202
+4AFE56014F043B3278D6FE7D02B202CEB05FA7820001006E000006E106B3002600000115
+100123001135102520031123111021201115100123001135102524211524033720173633
+2006E1FEA2EF0187FEFBFEF501C0FEE6FEFC0194EBFE990114011502CAFCF2B07D010A8A
+75DB01DC031E7CFE62FEFC016201498C014B02FED7FEA2015E0128FEB495FEC1FE9D0104
+019E7701A3FCFBA001FED834F4F4000000010082FFE2044A069F00150000011510212019
+01331110212011353402273733071400044AFE15FE23B4012B0135FC032DC84A01080207
+2DFE080252046BFB6DFE7601494BB3012699D9E67CFEFB000001006EFFE2056A06B30024
+0000010E0107111612333212351134022723132313353315330412071116002120003511
+341237020A84580201D1F1EFCDD6921214BB149312012EFA0101FED7FEA9FEBCFEC7C0DC
+05A72FF0B3FEBD98FE880177990140B6014402FCED0311E7445CFE75B1FEB6D1FE2601D6
+D50149B0018D520000010032FFE1042706B3001E00000112212003133303102120190126
+2322171123112627233533321736332011042701FE34FE080438CB440142011D01C2A702
+9F149E938C9B4B69A9017101EEFDF301EA012EFED7FEB2013503B4A954FE68014D8C139F
+9F9FFE860002006EFFE2068C06B300090037000001102120111510212011010600212322
+24353314163B01323635102B013537363510212207160715102504113510213217363320
+111007160346FEEFFEF701160104033201FEBFFEE964CFFEB5CBDA824AC6E87F7C3BD4FE
+F7856F2603FE49FE2B01C3FD6D8CBB01AAECD8049E0176FE8F8BFE790187FDC0D4FEDED9
+813B80CD890101970289DF013580709472FDD7010102298B0210C7C1FE5AFEE5927B0000
+0001006EFFE20435069F0019000001102120113733071021201901022706071323271005
+321311330435FE16FE2337CC450121013FD0B4C40142B33C016DACDDA901CAFE1801E8DD
+DCFEB7014E022401B20201A8FEFFF9015E02FEAA01A200000001006EFFE206BB06B3002A
+0000373637001135102132131233201315060323123D0110212019012311102013150201
+161704172126272405FC789AFE6001C6D98978E601C60102AFE5D6FEFDFEF1ABFDEC0201
+01B3765301A538FEF803FDFEEFFEDFB16222011C02204B01F7FEF90107FE2061EBFE9401
+60F2540154FE72FEC00140018DFEA86DFE4DFEAD041270E1526345BE0001006EFFE20434
+06A1001D0000011021201113330310212019010607041135343733061D01100536371133
+0434FE19FE211EC2220121013FA590FE3590E1B30103A49BA801C5FE1D01BB0109FEF3FE
+E9014401F8630B0201B928A9C9D49428FEDA010A740239000002006EFFE2043406B30008
+0023000001112623201115022013102120113512211617113423221D0123353421352017
+36332011038C73C7FEDB010260A8FE31FE090101E388B2AEB3A4FEE7011C3655D4014B01
+CB01C649FE9072FE8A015DFE03020C9001F9023D01607CB43A3AB49FC0C0FEB300010083
+0000044A06B3001D0000013734232211153617040315100323123D011005260711231102
+21201307028F10A5C4AE9B01CC01C0DCE8FEDA81B9B3010155017F0114050E9275FEE6E1
+680401FE3D5EFEFDFEA70175B0AE0113010162FC7C04F001C3FEED9200010070FFE204C3
+06A00023000001160704111000200019010213330215111A0117321235262B0135332435
+342437331404049102F80128FEE5FE02FEC60272D78601CCABAFAC03C0D25A0109FEE301
+B801240507AE8C7BFEF6FEE2FEB801480170019D012C013DFE8BF4FE63FEF6FEF201010F
+ADFBA365C281918C548800000002006EFFE20434069F0009001500000111262320111510
+2120131021201135102136171133038C7ACAFEE4011C0144A8FE1EFE1C01E4A694A80207
+01A350FE7059FE71016CFDF4023E4A023D0152024900000000020083FFE2044906B3001A
+002400001310213217362115201D01233534232215113637201315102120133310212011
+351021220783015BC86025011EFEE7A4A7AFA68A01E102FE09FE3002B301170149FECF89
+A60579013ABDBD9FA04444A09BFE9E5501FE1177FDDB021BFE8501718B0152600002006E
+FFE2045C06A0001C00230000012313331523131021201137330710212011032320111021
+332733173301143B01032322045BDC3F9E7E57FE16FE233BCC48012001355EE1FE67019C
+5E25C822F2FCEEF2D5448EF50569FEB98DFE35FE1801E8DDDCFEB7014E01C5012D0136A8
+A8FECFA50147000000020082FFE2044A069F000900150000011021060711102120113715
+102120190133113633040396FECBA28801390126B4FE26FE12B5A18901E9028D017F0355
+FE58FE7601806E5FFDD102250498FDBC4E01000000010032FFE203EF06B3002100000107
+2503041706042135203635262527132537053736342623073533321716140F0103EF4DFE
+A79101500101FEC9FE990117C901FEFA73E9FE795001816A134A40829C844A4B1E7003CC
+8AABFEEB6EDCC6E6A07F7AC028450195BE8CC5C21C5338139B4B4AB237C400000001006E
+FFE2043506B30026000001102120113310212011342B0135333235342723353332353421
+233533201114073316151607160435FE18FE21BE0121012D9AE7D39A9AE7E783FE6D7676
+02519702A90183960199FE490204FE9C0117C5B3847901B599B89EFEAA9B614E8794476E
+00010078FFE2043E06B2002600000520190133111021201134272335333237262B013533
+3635342135201106072316170607161510025CFE1CB50130012783A9A96C050583A6A66F
+FED701E7019F02B60101ADC01E01E6044DFBB3FEBA0112E002B1837DB701B4819EFED2A5
+53677E805C56E1FE4E0000000002006EFF5F043606B30009001F00000110052419011021
+201103323723001901102120190110011633152225230427012C0124012AFED7FEDBBED9
+3F02FEEA01E201E4FEE52EEFC3FEE715FEEEC502D2FE687878019801A201A0FE60FBA953
+0104015E01A6023BFDC1FE5EFEA2FEF84FBEE6E7010000000001006EFFE2043406B5001C
+000001102120113533151021201135102B01353324110515231125100504110434FE17FE
+25BD01250128F2E47B015BFDB5C103C6FEBA01460196FE4C01D4D3DDFED601149B011AA4
+AD017817EC018F15FDBF9E71FED200000001006EFFE2044206B400200000011021201135
+3315102120111021233533240306230411331421323733150205040435FE18FE21BF0120
+012DFEEAC06E016702A783FE21BE0121DE7D9A0BFED5012901C8FE1A01E68E8EFEBA0146
+0160AD1E01BB6F020177C6C5E1FE80A69C0000000003006EFFE204C106B30007000F0025
+000001212411102120350110290111342120011510212011102523241110212011153315
+231133150384FEC7FEE101260132FDA8011F0139FECEFEDA0309FE16FE23010C01FEF501
+E401E38C8C8C02DE02FECEFED4F40362FEBA019FE3FBDA78FE6C01CC01216A60013F01DB
+FE7E97BEFECAB8000002006EFFE2073606B4000A002C0000011134262320131110052013
+1021222715102135203511102122061D0110211520033510243720173621041215067C81
+A6FEDE0201200127BAFE18809AFE2F0114FEDA8B990125FE1D010118CB01048976010101
+27BA03B50103C39AFED9FE6BFED4010184FDDD879EFE6CA0F4037801279BC2FDFEAFA501
+F6FD0101FA01D8D801FEC4BF0003007AFE1E06F906870007000F00230000010407030633
+322517243713362322050106051323030423221B01362503331324333203039AFDFC1B42
+177072012EAB02040E481B8F5AFEE3026420FD445DCF5DFEC7A9D32A482402BC4FBE4801
+35C1D42A03FC4EA8FE2CAEAEAE466801FAAE49FDA1E028FDF40291AF013201F9FA3A0228
+FD6A6EFECD00000000020064FE28061306D30030003C0000011600151407041102052403
+343727262706111005041723262506072736372411102526353717071416333236352600
+35011023220706070615120536036B0101561E016F15FE72FE62143C466A55DD0165022B
+05DB0BFE7C96747A6B9CFE9E013A2426A01897616F8001FEAC02A5EF1F1B3658430A0101
+E506D3A4FEE6AB664514FE2CFE20141401EB668E0A095C37FEB9FEACADC0DEA85903986C
+672FE9014201BF384D75B138798E90898B7A011BD4FB0E015205341A5DA1FE950A0A0000
+00020064FFE203AC061E0003001600001321152101102120113733071033321126243533
+161716D90256FDAA02D3FE5BFE5D27B023F2EF01FE7ABB02BEBF061E94FC20FE3801BED0
+D0FECE013CDDFEDDAD7E7E0000030064FFE203AC063800030007001A0000013315232533
+152301102120113733071033321126243533161716024CCBCBFE79CBCB02E7FE5BFE5D27
+B023F2EF01FE7ABB02BEBF0638CACACAFC3CFE3801BED0D0FECE013CDDFEDDAD7E7E0000
+00040064FFE203AC070000120016001A001E000001102120113733071033321126243533
+16171601211521013315232533152303ACFE5BFE5D27B023F2EF01FE7ABB02BEBFFD0D02
+56FDAA0189CBCBFE79CBCB01AAFE3801BED0D0FECE013CDDFEDDAD7E7E02B6940225CACA
+CA00000000020064FFE203AC068C00030016000001330123011021201137330710333211
+262435331617160227EBFEFEAD0249FE5BFE5D27B023F2EF01FE7ABB02BEBF068CFEF8FC
+26FE3801BED0D0FECE013CDDFEDDAD7E7E00000000030064FFE203AC071800030007001A
+00000133032307211521011021201137330710333211262435331617160227B9E4999602
+56FDAA02DFFE5BFE5D27B023F2EF01FE7ABB02BEBF0718FEF87994FCA7FE3801BED0D0FE
+CE013CDDFEDDAD7E7E00000000020064FFE203AC06790008001B00000102200333163332
+3713102120113733071033321126243533161716032813FDB4137619AAAC17FAFE5BFE5D
+27B023F2EF01FE7ABB02BEBF0679FEE1011F9696FB31FE3801BED0D0FECE013CDDFEDDAD
+7E7E000000020064FE1D0398061E0003001B000001211521011021201137330710333219
+011023221517232710212011010B0256FDAA028DFE74FE5821AC19F4E2E1C837AC31016E
+018B061E94FA37FE5C01A6E1E3FEE8011603130102F4E2DC0186FE6F00020064FE1D0398
+06640003001B000001330123011021201137330710333219011023221517232710212011
+026DEBFEFEAD01EFFE74FE5821AC19F4E2E1C837AC31016E018B0664FEF8FA65FE5C01A6
+E1E3FEE8011603130102F4E2DC0186FE6F00000000030064FE1D0398073600030007001F
+000001330323072115210110212011373307103332190110232215172327102120110259
+D7E4B7960256FDAA0299FE74FE5821AC19F4E2E1C837AC31016E018B0736FEF87994FAA0
+FE5C01A6E1E3FEE8011603130102F4E2DC0186FE6F00000000020064FE1D039806790008
+002000000102200333163332371310212011373307103332190110232215172327102120
+11035013FDB4137619AAAC17BEFE74FE5821AC19F4E2E1C837AC31016E018B0679FEE101
+1F9696F948FE5C01A6E1E3FEE8011603130102F4E2DC0186FE6F000000020064000003C0
+061E0011001500000110032312111023221110132302111021200121152103C099AD92F6
+FE91AE9701B201AAFD370256FDAA0244FEF4FEC8012101230190FE6DFEE0FEDF013A010D
+021901BE9400000000020064000003C00664001100150000011003231211102322111013
+2302111021200133012303C099AD92F6FE91AE9701B201AAFEB7E1FEFEA30244FEF4FEC9
+012001230190FE6DFEE0FEDF013A010D02190204FEF8000000020064000003C006790011
+001A000001100323121110232211101323021110212003022003331633323703C099AD92
+F6FE91AE9701B201AA7013FDB4137619AAAC170244FEF4FEC9012001230190FE6DFEE0FE
+DF013A010D02190219FEE1011F96960000020064FFFF05E6061E001C0020000001120123
+001102232211152335102322110201230011102132173633200121152105E601FEEDD101
+2F01D2E7A6E7D3010138D1FEE60188E15762DC0185FC140256FDAA0256FED1FED9011601
+40017EFEA7D2D20159FE82FECDFEDC01240133020AE3E301BE94000000030064FFFF05E6
+0638001C0020002400000112012300110223221115233510232211020123001110213217
+363320013315232533152305E601FEEDD1012F01D2E7A6E7D3010138D1FEE60188E15762
+DC0185FD9BCBCBFE79CBCB0256FED1FED901160140017EFEA7D2D20159FE82FECDFEDC01
+240133020AE3E301D8CACACA00040064FFFF05E60728001C002000240028000001120123
+001102232211152335102322110201230011102132173633200121152101331523253315
+2305E601FEEDD1012F01D2E7A6E7D3010138D1FEE60188E15762DC0185FC120256FDAA01
+89CBCBFE79CBCB0256FED1FED901160140017EFEA7D2D20159FE82FECDFEDC0124013302
+0AE3E30137940225CACACA0000020064FFFF05E60664001C002000000112012300110223
+2211152335102322110201230011102132173633200133012305E601FEEDD1012F01D2E7
+A6E7D3010138D1FEE60188E15762DC0185FD76E1FEFEA30256FED1FED901160140017EFE
+A7D2D20159FE82FECDFEDC01240133020AE3E30204FEF80000020064FFFF05E60679001C
+002500000112012300110223221115233510232211020123001110213217363320010220
+03331633323705E601FEEDD1012F01D2E7A6E7D3010138D1FEE60188E15762DC0185FE8B
+13FDB4137619AAAC170256FED1FED901160140017EFEA7D2D20159FE82FECDFEDC012401
+33020AE3E30219FEE1011F96960000000002003CFE1D03E8061E00030024000013211521
+0110212011373307102132190126232215032303342B0127371733321736332011ED0256
+FDAA02FBFE6EFE4719B2170105E802877B0A8F0A9C526D1457508F4F43A00130061E94FA
+36FE5D01A3E3E3FEE901170367B68CFEA5015B7828A132BBBBFEC7000003003CFE1D03E8
+063800030007002800000133152325331523011021201137330710213219012623221503
+2303342B01273717333217363320110274CBCBFE79CBCB02FBFE6EFE4719B2170105E802
+877B0A8F0A9C526D1457508F4F43A001300638CACACAFA52FE5D01A3E3E3FEE901170367
+B68CFEA5015B7828A132BBBBFEC700000004003CFE1D03E8073C00030007000B002C0000
+1321152101331523253315230110212011373307102132190126232215032303342B0127
+371733321736332011EB0256FDAA0189CBCBFE79CBCB02FBFE6EFE4719B2170105E80287
+7B0A8F0A9C526D1457508F4F43A0013005AB940225CACACAF94EFE5D01A3E3E3FEE90117
+0367B68CFEA5015B7828A132BBBBFEC70002003CFE1D03E8066400030024000001330323
+0110212011373307102132190126232215032303342B01273717333217363320110259D7
+F8A30253FE6EFE4719B2170105E802877B0A8F0A9C526D1457508F4F43A001300664FEF8
+FA64FE5D01A3E3E3FEE901170367B68CFEA5015B7828A132BBBBFEC70002003CFE1D03E8
+067900080029000001022003331633323701102120113733071021321901262322150323
+03342B0127371733321736332011034613FDB4137619AAAC170118FE6EFE4719B2170105
+E802877B0A8F0A9C526D1457508F4F43A001300679FEE1011F9696F947FE5D01A3E3E3FE
+E901170367B68CFEA5015B7828A132BBBBFEC7000002003CFE1D03E806D1000600270000
+011323270723130110212011373307102132190126232215032303342B01273717333217
+363320110258F58BB4B48BF50224FE6EFE4719B2170105E802877B0A8F0A9C526D145750
+8F4F43A0013006D1FE88F5F50178F8EFFE5D01A3E3E3FEE901170367B68CFEA5015B7828
+A132BBBBFEC7000000020071FFE304750614000900200000012206101620363534260110
+372E01353436332115212215141633320010002000027293ACAB0128ACACFD6BC34F41C2
+9E01FCFE28BC7592ED0115FEEDFE20FEEF03DFE7FE6EE7E8C7C8E9FE50014D9B2F8D317C
+9493894934FEC8FDDAFEC601390000000001002F000005AA061400240048401326000709
+05080C21180D1E08110C2110144C2510FC3CC432C4FC3CC4103CFC3CC4C4C43100401109
+0D11A912021A87001897061F12BC0B0F2F3CE63232FE3CEE3210EE32323001152322061D
+01211521112311211123112335333534363B0115232207061D01213534363305AAB0634D
+012FFED1B9FE07B9B0B0AEBDAEB063272601F9AEBD0614995068638FFC2F03D1FC2F03D1
+8F4EBBAB99282868634EBBAB0002002F0000044A061400150019005240111B4600170816
+0F1404080803160A064C1A10FC3CC432C4FC3CC410FE3CEC310040120803A90010870E18
+BE16B10E970900BC05012F3CE632EEFEEE10EE10EE3230400BFF1BA01B901B801B101B05
+015D01112311211123112335333534363B01152322061D0101331523044AB9FE07B9B0B0
+ADB3B9B0634D01F9B9B90460FBA003D1FC2F03D18F4EB7AF9950686301B2E9000001002F
+0000044A061400150037400F17460108040A0C08081004120E4C1610FC3CC4C4FC3CC410
+FEEC3100400D0F0BA909048700971109BC0D022F3CE632FEEE10EE323001211123112122
+061D01211521112311233533353436024A0200B9FEB7634D012FFED1B9B0B0AE0614F9EC
+057B5068638FFC2F03D18F4EBBAB00000002002F000006FC06140029002D005A40182F46
+172B082A101B15081A2A09001F0608241E0922264C2E10FC3CC432C4FC3CC410C432FC3C
+C410FC3CEC310040171B1F23A924110187002DBE2AB1100097160724BC191D212F3C3CE4
+3232E432F4EC10EC3210EC3232300115232207061D01213534373637363B01152322061D
+01211123112111231121112311233533353436330533152302F8B063272601F9571C274E
+83AEB0634D02B2B9FE07B9FE07B9B0B0AEBD03F9B9B9061499282868634EBB551C132799
+506863FBA003D1FC2F03D1FC2F03D18F4EBBAB02E90000000001002F000006FC06140026
+004E401628460D0810161814081009001C0608211B091F234C2710FC3CC432C4FC3CC410
+C4FC3CC410FCEC31004012181C20A9211102870C2697150721BC0F1A1E2F3C3CE43232F4
+3CEC3210EC3232300115232207061D012135343633211123112122061D01211521112311
+211123112335333534363302F8B063272601F9AEBD0200B9FEB7634D012FFED1B9FE07B9
+B0B0AEBD061499282868634EBBABF9EC057B5068638FFC2F03D1FC2F03D18F4EBBAB0000
+0001002F0000054C0614002D000001353427262B0122070615112311233533353437363B
+013217161D01211521111417163B01152322272635112335031824256522632726B9B0B0
+5757BD1EBD5755017BFE85252673BDBDD5515187046063682828282868FB3D03D18F4EBB
+55565653BD4E8FFDA08927279A504FD202608F000001006FFFE306B205F0005900000115
+26272623220706151417161F011E01151407062322272627351617163332373635342726
+2F01262726353437363332172635343736373217161D01211521111417163B0115232227
+26351123353335342726072207061514035156495446753F3B3131943FC3A67B7CD8605C
+616C66636361824646322DB140AB4C4C6670B5484D055C5BA28C625E017BFE85252673BD
+BDD551518787303644453634043FAE2B11142A2757402524210E2B98899C5B5B111223BE
+351A1B2D2C514B28232A0F244A4B82A64E560B1D1F875F5D01605C884C8FFDA08927279A
+504FD202608F4E412B32013130403D00000100ABFFE308E30614004B0000011615112335
+0E012322263511331114163332363511342721222726353437363B011523221514332127
+26353437363B0115232215141F01210314163332363511331123350E012322263511044F
+09B843B175C1C8B87C7C95AD05FE53985B505A777259598383016C17360937D1ECDE600E
+3B01DD017C7C95ADB8B843B175C1C803B62521FC90AC6663F0E70166FEA19F9FBEA40191
+241C5E5391834257AF7B8A38834B1F157AAF2B292091FD61A09EBEA4027BFBA0AC6663F0
+E701FC00000100AEFFE308E30614003A000001212615141F0116151123350E0123222635
+11331114163332363511342F01263736332111211521111416333237363511331123350E
+01232226350539FEF3600E4D31B843B175C1C8B87C7C95AD104D4D2037D101D302F2FD0E
+7C7C985357B8B843B175C1C80565012C2722BC784DFC90AC6663F0E702A6FD619F9FBEA4
+01913F27BCBB477AFE4CAAFE0B9F9F5F62A1013BFCE0AC6663F0E700000100AEFE5608E3
+06140035000001212615141F0116151123350E012322263511331114163332363511342F
+012637363321113E013332161511231134262322061511230539FEF3600E4D31B843B175
+C1C8B87C7C95AD104D4D2037D101D442B375C1C6B87C7C95ACB90565012C2722BC784DFC
+90AC6663F0E702A6FD619F9FBEA401913F27BCBB477AFD9E6564EFE8FD5C029E9F9EBEA4
+FBDD0000000200AEFE5608E306140035003C000001212227263736373633211121111416
+3332363511331123350E0123222635112311331521110E01232226351133111416333237
+36351901212215143303A0FEDB955E53030357737601DD01997C7C95ADB8B843B175C1C8
+E1D5FE7343B175C1C8B87C7C955756FEDB838303B65E5391834257FE4CFD619F9FBEA402
+7BFBA0AC6663F0E701FCFB42A202566663F0E70166FEA19F9F5F5FA4027B01057B8A0000
+000100AEFE560B9B06140048000001212615141F0116151123350E012322263511331114
+163332363511342F012637363321113637363332161D011417163332363511331123350E
+01232227263D0134262322061511230539FEF3600E4D31B843B175C1C8B87C7C95AD104D
+4D2037D101D463255A6BC1C63E386E8CADB8B843B16CAF62647C7C78ACB90565012C2722
+BC784DFC90AC6663F0E702A6FD619F9FBEA401913F27BCBB477AFD9E811632EFE8E39758
+4FBEA4027BFBA0AC6663787BE4E49F9EBEA4FBDDFFFF0088005B014204601226052F0000
+10070514FE4E01A000010156050003C8061F000C000001331E0133323637330E01202601
+56760B615756600D760A9EFEDE9E061F4B4B4A4C8F909000FFFF004A005B02A204601226
+0543000010070517FEE701A00001004E0000047E046000160000011332373637363D0133
+11140E0523213521030163C1FA5C400802BA0E2640658BBE78FE6A0114C10460FC51A371
+F23C76F7FED674B6B0816F4527B103AF000100AE0000062D046000200000090123010E03
+15112311343E02370133013E0335113315140E0304B3017AEDFD4B2D625B3BB849777A3F
+FE87ED02B42D625C3BB8324E68600169FE97029706385E9758FEF4010A64AD774E16016A
+FD6906385E9758010CF6569A6E5A370000010058000005BD046000070000012311231121
+352105BDCABAFC1F056503D1FC2F03D18F000000000200BA0000061D0460001300170000
+01112311342E0423213521321E0425112311061DB90D273E6E8C69FD2B02D585C4945E3B
+18FB6BB901EDFE1301ED6A8B74402C0F8F1A3F5D91B245FD5402600000010058000005BB
+0460001B00001321321E03140E0323213521323E03342E0323215802D796E88F5C23235C
+8FE796FD2802D871A8663D16163D66A871FD28046041699599B0999569418E2A486E759A
+756E482A00010058000005BB06140008000021012111331121150102A0025CFB5CBB04A8
+FDA403D10243FE4C84FC2400000200BA0000061D046000080013000029011121321E0215
+01112111342E0423061DFA9D0335A3D38335FB5703EF0C2133576D4F04603C90D9A701BD
+FCBE01855E82683D290F000000010058000005BB0460000F000001112311342E02232135
+21321E0205BBBA1D548C74FCC80337A2D382350214FDEC021486A16D298F3C90D9000000
+00010060FFF805BA0460001E000001112311342E03232111140623222735163332363511
+233521321E0205BABA0A24407050FE247B98354E4126472EAD03438FC16C2C025EFDA202
+604A63653A25FDCDD6D0108F0E72A302338F438AB4000000000100D9022D05DB05040007
+0000012135211133112105DBFAFE022DA8022D022DAA022DFDD30000FFFF005800000553
+059610260521A1001206053F00000000FFFF004E000005530596102605194E001206053F
+00000000FFFF0058000005530596102705190258FC0F1026052197001206053F00000000
+FFFF0058000005530596102705190258FC0F10270521FB4C00001206053F0000FFFF00BA
+FEBB049F04601026051700001206052600000000FFFF00BAFE75049F0460102605180000
+1206052600000000FFFF00BAFEBB049F04601026051400001206052600000000FFFF0058
+0000044804601027051CFEE10000120605270000FFFF0058FFF6031104601027051CFE21
+0000120605280000FFFF00580000041704601027051CFE810000120605290000FFFF00BA
+0000048004601026051C00001206052A00000000FFFF00590000021E04601027051CFE0B
+00001007052B00AA00000000FFFF0059000002E704601027051CFE0B00001006052C7A00
+FFFF00B9FFE304BF046B1026051C00001206052E00000000FFFF005901A2021C04601027
+051CFE0B00A01007052F00DA00000000FFFF0058FE56039204601027051CFEB100001206
+05300000FFFF0058000003CA04601027051CFEB10000120605310000FFFF0058000003F0
+05D51027051CFE510000120605320000FFFF0058000004B504701026051C300012060534
+00000000FFFF00580000027804601027051CFE210000100605360000FFFF00B9FFE304BF
+04601026051C00001206053700000000FFFF00BAFE56046404601026051C710012060539
+00000000FFFF00BA0000048E04601026051C7C001206053A00000000FFFF005800000405
+04601027051CFE5100001206053C0000FFFF00BAFE560511045F1026051CD1001206053D
+00000000FFFF0058000003CA04601027051CFEB100001206053E0000FFFF005800000553
+0460102705190239FC0D1206053F0000FFFF0014FFF8048804601026051C000012060540
+00000000FFFF00BA00000174059610270521FBB400001206052B0000FFFF005800000448
+05961027051FFF710000120605270000FFFF0058000003CA05961027051FFF4100001206
+05310000FFFF00BA0000048E05961026051F00001206053A000000000001005800000491
+0614002C0000090123010E0415112335343E053703231133113307013E0435113315140E
+050372011DD9FE601C2338211AB8141F322D412C1FBAB8BB7802019E1B2338221AB8141F
+322E402C019BFE6502580E1535416E45FEF4B9518A6051322C150D010D0242FE4C03FDAB
+0D1536416E45010CB952896151312C15FFFF0082FE0C06EB029D102717250339FF061006
+058E0000FFFF0082FE0C07EF029D102717250339FF06100617270000FFFFFFECFE0C0187
+02581026172800001007172500E0FF06FFFFFFECFE0C027E02581027172500E0FF061006
+17290000FFFF0082FE0C06EB029D1027172402BCFF061006058E0000FFFF0082FE0C07EF
+029D1027172402BCFF06100617270000FFFFFFECFE0C01F3025810261728000010071724
+0063FF06FFFFFFECFE0C027E0258102617290000100717240063FF06FFFF0082FE0C06EB
+029D1027172602BCFF061006058E0000FFFF0082FE0C07EF029D1027172602BCFF061006
+17270000FFFFFFECFE0C01F30258102617280000100717260063FF06FFFFFFECFE0C027E
+0258102617290000100717260063FF06FFFF0082FFEC06EB041A10271725033903841006
+058E0000FFFF0082FFEC07EF041A1027172503390384100617270000FFFFFFEC00000187
+04E21026172800001007172500E0044CFFFFFFEC0000027E04E210261729000010071725
+00E0044CFFFF0082FFEC06EB041A1027172602BC03841006058E0000FFFF0082FFEC07EF
+041A1026172700001007172602BC0384FFFFFFEC000001F304E210261728000010071726
+0063044CFFFFFFEC0000027E04E2102617290000100717260063044CFFFF0082FFEC06EB
+04991027054B0184FDA81006058E0000FFFF0082FFEC07EF04991026172700001007054B
+0184FDA8FFFFFFEC0000023005611026172800001007054BFF2BFE70FFFFFFEC0000027E
+05611026172900001007054BFF2BFE70FFFF0082FFA4079E060E102717230578047E1006
+05BA0000FFFF0082FFA5085C05461026172A000010071723057803B6FFFFFFEC0000033F
+060E1026172B000010071723012C047EFFFFFFEC0000042005781026172C000010071723
+013E03E8FFFF0082FFA4079E060E1027172605780578100605BA0000FFFF0082FFA5085C
+05461026172A000010071726057804B0FFFFFFEC0000033F060E1026172B000010071726
+012C0578FFFFFFEC0000042005781026172C000010071726013E04E2FFFF009DFE0C0528
+036610271725030700AF1006055A0000FFFF009DFE0C053E03661027172502A3007D1006
+14990000FFFFFFECFE3E045C032F1026149A000010071725020DFF38FFFFFFECFE3E053E
+032F1026149B000010071725020DFF38FFFF009DFE0C0528036610271722028A00191006
+055A0000FFFF009DFE0C053E0366102717220226FFE7100614990000FFFFFFECFF38045C
+032F1026149A0000100717220190FF38FFFFFFECFF38053E032F1026149B000010071722
+0190FF38FFFF009DFE0C0528036610271724029600961006055A0000FFFF009DFE0C053E
+03661027172402190032100614990000FFFFFFECFE3E045C032F1026149A000010071724
+0190FF38FFFFFFECFE3E053E032F1026149B0000100717240190FF38FFFF009DFE0C0528
+036610271726029600AF1006055A0000FFFF009DFE0C053E036610271726021900321006
+14990000FFFFFFECFE3E045C032F1026149A0000100717260190FF38FFFFFFECFE3E053E
+032F1026149B0000100717260190FF38FFFF007DFED4031B035210271722012BFED41006
+055C0000FFFF007DFED40447035210271722012BFED4100614A10000FFFF007DFFDA031B
+04B01027172200FA041A1006055C0000FFFF007DFFDA044704B01027172200FA041A1006
+14A10000FFFF007DFFDA031B05AA1027172300FA041A1006055C0000FFFF007DFFDA0447
+05AA1027172300FA041A100614A10000FFFF007DFFDA031B05F71027054BFFC2FF061006
+055C0000FFFF007DFFDA044705F71027054BFFC2FF06100614A10000FFFFFFABFE0C0384
+04B01027172301F403201006055E0000FFFFFFABFE0C047E04B0102614A5000010071723
+01F40320FFFFFFABFE0C03C1052F1026055E00001007054B00BCFE3EFFFFFFABFE0C047E
+052F102614A500001007054B00BCFE3EFFFF0082FFA707290614100605C2000000010082
+FFA707D90614003700002506070623222724113437330615141716333237363736353427
+01263534373637011505060706151417011617163B0115232227262F0106059C63A9CDB7
+C080FEB63FB841CB6897B8C29E231036FECA320A236402E9FDAD4715061F024716262B40
+5884413A67216119784C3C492662010B8A5C5E887E42225041371A2E4542017C3D512321
+772A0136BAFA1E280B192025FD3F1A0E10B8182B29784000FFFFFFEC000003CF06141006
+14D20000FFFFFFEC0000047F0614100614D30000FFFF0082FFA70729072B1027174503CA
+0000100605C20000FFFF0082FFA707D9072B1026142500001007174503CA0000FFFFFFEC
+000003CF072B1026142600001006174570000000FFFFFFEC0000047F072B102614270000
+1006174570000000FFFF0082FDA80729072B1027172502D5FEA2100605C80000FFFF0082
+FDA807D9072B1026142900001007172502D5FEA2FFFFFFECFDDA03CF072B1026142A0000
+100717250145FED4FFFFFFECFDDA047F072B1026142B0000100717250145FED4FFFF0082
+FFA70729073A10271722038406A4100605C80000FFFF0082FFA707D9073A102614290000
+10071722038406A4FFFFFFEC000003CF073A1026142A000010071722004B06A4FFFFFFEC
+0000047F073A1026142B000010071722004B06A4FFFF0093FEB5054802EE100605D30000
+00010093FE0C062B0245002600000116171617163B011523222706070607062322272411
+343733061514171633323736373635342704E02C1B1632353C4B824722035978EF615C74
+71FEB82FB831C95A4C584FC24B216502456160503C40B8306D93C7421B256B0163AF8D89
+B3EC35181430E36570B8CB00FFFF0093FEB5054805161027054B00C8FE25100605D30000
+FFFF0093FE0C062B041C1026143500001007054B00C8FD2BFFFFFFEC0000023005611026
+172800001007054BFF2BFE70FFFFFFEC0000027E05611026172900001007054BFF2BFE70
+FFFF0090FFBD051B03E5100605D7000000030090FE0D052202AB0009002B00360000253E
+013534232207061525343733061514163330333510373620171615060721152116140706
+202635222726051417163332353426270602B13FD0544B4A26FDDF10B80E7C141F8A7401
+04442E155E0128FEA8A32E45FEF4F23A71C1022126504554BF2A139F1BA434708D48751A
+4A363E2845263701097F6B6343727962B86CE24263DEDF1F352F69438D7034970C070000
+FFFFFFECFFBD03BD03E5100614E20000FFFFFFECFE0D03C402AB100614E30000FFFF0090
+FFC905C706D610271723027105461006056B0000FFFF0090FFC906D206D6102614D10000
+1007172302710546FFFFFFEC000003CF076C102614D2000010071723004B05DCFFFFFFEC
+0000047F076C102614D3000010071723004B05DCFFFFFFABFE0C034004D5102605700000
+10070577FFA4FDD8FFFFFFABFE0C043604D5102614E5000010070577FFA4FDD8FFFFFFAB
+FE0C034004721027057FFFF4FE3E100605700000FFFFFFABFE0C043604721027057FFFF4
+FE3E100614E50000FFFFFFABFE0C0340053410260570000010070590FFECFE1BFFFFFFAB
+FE0C04360534102614E5000010070590FFECFE1BFFFFFFABFE0C034004B0102605700000
+10071723012C0320FFFFFFABFE0C043604B0102614E5000010071723012C0320FFFF0082
+FCFE05C0034A10260571000010071725028AFDF8FFFF0082FCFE06BF020210271725028A
+FDF8100614E70000FFFFFFECFE0C018702581027172500E0FF06100617280000FFFFFFEC
+FE0C027E02581026172900001007172500E0FF060001FFEC000001870258000D00002506
+2B0135333237363D01331514012B489D5A23632C31B85656B82C316AD9D9BB000001FFEC
+0000027E02580014000025062B0135333237363D0133151417163B01152322012B4D985A
+23632C31B8312C63376E965656B82C316AD9D96A312CB800FFFF0082FEF305C0034A1006
+05710000FFFF0082FEF006BF0202100614E70000FFFFFFECFED401F302581026144E0000
+100717220063FED4FFFFFFECFED4027E02581026144F0000100717220063FED40001FC70
+06040000076E000700001122040735362433E7FE3DE6EC01C5DF06D467697E7775000000
+0001000006040390076E000700001135320417152624DF01C5ECE6FE3D06D49A75777E69
+670000000001FD2A060D0000072700130000112F01262726232207060723363736333217
+161704901C4F2C2465354605A2047170C85B3F3857064802370B120A243047874A490E0D
+2000000000010000060D02D6072700130000111F01161716333237363733060706232227
+262704901C4F2C2461394704A2047170C85B3F385706EC02370B120A242C4B874A490E0D
+20000000FFFF000804BA0250069A10070573FF2C00000000FFFFFFEC0000026C069A1026
+0568000010070573FF2C0000FFFF000804BA025006FD10070574FF2C0000000000010069
+0000022C016B000D0000011417163B0115232227263D01330121312C634B828E5C57B801
+4C37312CB85C578D2B000000FFFF0008FE160250FFF610070575FF2C00000000FFFF0008
+04BA025005AA10070576FF2C00000000FFFFFFEC0000026C05AA10270576FF2C00001006
+05680000FFFF000804B9025006FD10070577FF2C00000000FFFFFFEC0000026C06FD1027
+0577FF2C0000100605680000FFFF0008FEE80250FFD810070578FF2C00000000FFFFFFEC
+FEE8026C00B810270578FF2C0000100605680000FFFFFFF404CB026406F410070579FF2C
+00000000FFFFFFEC0000026C06F410270579FF2C0000100605680000FFFF001804E1023C
+07061007057AFF2C00000000FFFFFFEC0000026C07061026056800001007057AFF2C0000
+FFFF00A30055031E03DE1006054E0000FFFFFFB50000028507831027057BFF1D01C21006
+05540000FFFFFFB50000028507831026148500001007057BFF1D01C2FFFF006C000001C3
+08391027057CFF1D01C2100605540000FFFF006C0000028408391026148500001007057C
+FF1D01C2FFFFFFABFE0C034004B51027057CFFC2FE3E100605700000FFFFFFABFE0C0436
+04B5102614E500001007057CFFC2FE3EFFFF006CFE0C01C306141027057DFF1D00001006
+05540000FFFF006CFE0C028406141026148500001007057DFF1D0000FFFF0082FEF305C0
+04B51027057CFFF4FE3E100605710000FFFF0082FEF006BF03BB102614E700001007057C
+0058FD44FFFFFFEC000001D104E71026144E00001007057CFF2BFE70FFFFFFEC0000027E
+04E71026144F00001007057CFF2BFE70FFFF00C1000001790614100605540000000100C1
+000002840614000D0000131133111417163B011523222726C1B8312C634B829A50570173
+04A1FB6B6A312CB85C650000FFFF0082FEA206EB029D102717210339FEA21006058E0000
+FFFF0082FEA207EF029D102617270000100717210339FEA2FFFFFFECFED4018702581026
+172800001007172100E0FED4FFFFFFECFED4027E02581026172900001007172100E0FED4
+FFFF008BFFC603A0041A1027172200FA03841006056F0000FFFF00910000045E041A1026
+14E1000010071722015E0384FFFF0082FFEC06EB03201027172202BC028A1006058E0000
+FFFF0082FFEC07EF03201026172700001007172202BC028AFFFFFFEC000001F303E81026
+172800001007172200630352FFFFFFEC0000027E03E81026172900001007172200630352
+FFFF0082FFEC06EB041A1027172302BC028A1006058E0000FFFF0082FFEC07EF041A1026
+172700001007172302BC028AFFFFFFEC000001F304E21026172800001007172300630352
+FFFFFFEC0000027E04E21026172900001007172300630352FFFF009DFE0C052803661027
+1721030700191006055A0000FFFF009DFE0C053E03661026149900001007172102BCFFCE
+FFFFFFECFED4045C032F1026149A000010071721020DFED4FFFFFFECFED4053E032F1026
+149B000010071721020DFED4FFFF009DFE0C052803661006055A00000001009DFE0C053E
+036600300000253315232227262726270607061514171621323715062320272635103736
+3722232207060735243320171522071716171605162831817B523D06497262E04A810149
+C1D496FAFE5EA983D460890C0D5F8C875F0110C10126C86D1F1D33485AB8B896649C0FB2
+1850B7FC895EA476B863C296E00102DF6534131329B83F369A0D5BA05F7700000001FFEC
+0000045C032F001E0000012627262726073536373217041715060706070607062B013533
+32373637360353536755B452A1484BA2AC0102DC4C58A64A914BDDA38064E38168745E02
+1D171713100706B807012334629A18346242811B50B8483A6A5600000001FFEC0000053E
+032F002900000104171506071617163B0115232227262706070607062B01353332373637
+363726272627260735363732027E0102DC4149321E68724256D17E283B4529914BDDA380
+64E38168745E65536755B452A1484BA2030C34629A14294E2277B8A836612E25811B50B8
+483A6A5623171713100706B807010000FFFF009DFE0C052804B010271721023F041A1006
+055A0000FFFF009DFE0C053E04B010261499000010071721023F041AFFFFFFEC0000045C
+044C1026149A000010071721020D03B6FFFFFFEC0000053E044C1026149B000010071721
+020D03B6FFFF007DFFDA031B03521006055C00000001007DFFDA04470352002000000126
+2733161716151417163B011523222706070623222735163332373637363534022239B6E3
+615251532C634B8293615DCF2E2D666773542122AC2308023F7A994E89867549532CB882
+80210726B82A0931701B2A44FFFF007DFFDA031B04B0102717210145041A1006055C0000
+FFFF007DFFDA044704B0102614A10000100717210145041AFFFFFFABFE0C036202261006
+055E00000001FFABFE0C047E022600180000013316171617163B01152322270207042135
+203736373635340278B81E030A492A654B82823244FBFEE4FEBE0130CBDA230A0226701E
+674D2CB83EFEEA8597B8808AD03A487EFFFFFFABFE0C036203B610271721027103201006
+055E0000FFFFFFABFE0C047E03B6102614A500001007172102710320FFFF0082FE0C091A
+02EE10060560000000010082FE0C0A4702EE004600002516373635331417163332190133
+111417163B01152322270607062322272627060706272627060706070623262724113437
+33061716171633323736373627262F01331716171605B84E3025B813406E8EB8532C634B
+829176446D252049308A11315F40388927185485C15078806DFEED69B86C0101935F5162
+5F795E4001011040B824101C3AB5027C5FCACD32A901180126FEAA61532CB8605B190919
+467B9F1E1402023CB36BAA3E1A011C470148F6B4CEDCB3261825309E6C8E7D3DEA9C4A3C
+7E0000000001FFECFFE3060A02EE00310000250607062B0135333237363D013315141716
+333237363533141716373619013311140706070623222726270607062322272601802B38
+4C63824B632C50B82C2B686D2C25B813406E8EB85C4B6625233F3789123060444162483C
+8A3B212EB82C5064C09C4064637A67C2CD32AA010201160126FEAAC7715C1809193D849C
+211831280001FFECFFE3073702EE00380000050623222726270607062322272627060706
+2B0135333237363D0133151417163332373635331417163736190133111417163B011523
+22270604FD25233F3789123060444162483C292B384C63824B632C50B82C2B686D2C25B8
+13406E8EB8532C634B829176441409193D849C21183128493B212EB82C5064C09C406463
+7A67C2CD32AA010201160126FEAA61532CB8605AFFFF0082FE0C091A04B01027172304E2
+0320100605600000FFFF0082FE0C0A4704B0102614A900001007172304E20320FFFFFFEC
+FFE3060A04B0102614AA000010071723028A0320FFFFFFECFFE3073704B0102614AB0000
+10071723028A0320FFFF0082FE0C091302E510060562000000020082FE0C09E102E5003C
+004900002901222726351407060706232627241134373306171617163332373637363534
+2733061716173637363736171617161514071617163B011523222F010603220706073332
+3736272627260675FEEC26342D4A58EE5078806DFEED69B86C0101935F51665BA22B2127
+AB010E0A28737B6C9348587D61BA2A0E103D524B8283671CCC124C7EA891BBED81BB0102
+89251E1A10BA809B4D1A011C470148F6B4CEDCB3261825448A6C7F938A0F372832926C5E
+462201022547E94D460C0B2CB85C1A760237516CC23F5B46871305000002FFEC00000632
+02E5000C002E000001060733323736353427262322032122272627062B0135333237363D
+0133151416173637363736333217161514070603D0A891BBED81BA8B25304CBAFEEC4A4E
+412766AC824B632C50B8122D655F99904B55736BBAB8CA01E66CC23F5B46871305FDC92A
+233D8AB82C5064724E1850328654893F212744ECA96D78000002FFEC0000070402E5002B
+00380000290122272627062B0135333237363D0133151416173637363736333217161514
+071617163B011523222F0106030607333237363534272623220398FEE84A4E412766AC82
+4B632C50B8122D655F99904B55716DBE2A0E103D524B8283671CCCE0A891BBED81BA8B25
+304C2A233D8AB82C5064724E1850328654893F212744EC4B480C0B2CB85C1A7601E66CC2
+3F5B468713050000FFFF0082FE0C091303B61027172104FB0320100605620000FFFF0082
+FE0C09E103B6102614B100001007172104FB0320FFFFFFEC0000063203B6102614B20000
+1007172101DB0320FFFFFFEC0000070403B6102614B300001007172101DB0320FFFF0090
+000006DC061410060564000000020090000007AC0614001C002900002902352111331112
+2536333217161514071617163B011523222F0106253332373627262726232207060440FD
+BFFE91016FB8D901145C447569BC2A0E103D524B8283671CCCFDE9BBED81BB0102892530
+507AB1B8055CFB0E013F63212745EB4D460C0B2CB85C1A76B83F5D448713055178000000
+0002FFEC000005D40614000C001F00002533323736272627262322070613290135211133
+1112253633321716151407060239BBED81BB0102892530507AB175FDC1FEF5010BB8D901
+145C447569BAB8CAB83F5D448713055178FE92B8055CFB0E013F63212745EBA96D780000
+0002FFEC000006A40614001C002900002902352111331112253633321716151407161716
+3B011523222F0106253332373627262726232207060338FDBFFEF5010BB8D901145C4475
+69BC2A0E103D524B8283671CCCFDE9BBED81BB0102892530507AB1B8055CFB0E013F6321
+2745EB4D460C0B2CB85C1A76B83F5D448713055178000000FFFF0090000006DC06141027
+172103CF0352100605640000FFFF0090000007AC0614102614B900001007172103CF0352
+FFFFFFEC000005D40614102614BA00001007172102C70352FFFFFFEC000006A406141026
+14BB00001007172102C70352FFFF0075FE0C04B2042A10060566000000020075FE0C04B2
+030E0025002B000001062120272610372E013534373632171615140706071E013B011523
+2027061514171621323701363422151404B298FEFFFE5B9D62BB3D447D61EE5F7F5B395E
+44B655A090FEF6F89A296B015FC1D4FD3188CEFE6F63BC7A01928C32742A6E4030304070
+5B432B20404DB8E4816B6C3D9E760296386033240001FFEC000003F8042A001A00003732
+372627263510373633152206141716333237251505042B01353CA1CA4B3458CC7DFBDABA
+3E5346374A0120FE5CFEA2B258B85D183B648C01087D4DA989FF34462181B8C5A4B80000
+0002FFEC000003F0030E0024002F000025062B0135333237363726272635343736373632
+1716171615140706071617163B01152322022207061514173635342701EEC2CA76606B42
+3B2861441E0D106859EE5968100D1E4D581F443D706076CAA8341E2F67672FB9B9B82824
+27555A272D1F2937342D2D3437291F2D27624D1F2C28B80255070C201D5F5F1D200C0000
+FFFF0075FE0C04B2054610271721017704B0100605660000FFFF0075FE0C04B2044C1026
+14C100001007172101A903B6FFFFFFEC000003F80546102614C2000010071721017704B0
+FFFFFFEC000003F0044C102614C300001007172101A303B6FFFF0082FFA4079E05141027
+172105F5047E100605BA0000FFFF0082FFA5085C044C1026172A00001007172105F503B6
+FFFFFFEC0000033F05141026172B00001007172101A9047EFFFFFFEC00000420047E1026
+172C00001007172101BB03E8FFFF006BFE48059B0514102717220352047E1006058F0000
+FFFF006BFE0C06C004011026172D0000100717220384036BFFFFFFEC0000033F05141026
+172E000010071722012C047EFFFFFFEC00000420047E1026172F000010071722013803E8
+FFFF0090FFC905C706141006056B000000020090FFC906D2061400210044000001150607
+061514171617161514070623222735163332373635342726272637363736130627262724
+353437330615161716333237363736190133111417163B01152322270603D04A26500E0C
+446658524E4238442D3C393C4E4A122001024B558A6D91CF65FEDB10B80E02A0797F8C59
+98624CB8312C634B8299719E046F52040E1E211C12100A0F586E2A270B580A1A1A1E2611
+101C2F2E51262BFB701402021E58C34B353A2C5C2E231B2F5E49010103B1FB6B6A312CB8
+7B7E00000001FFEC000003CF0614001F0000290135213237363534270126353437363701
+15050607061514170116151407060136FEB60136942D1036FECA320A1F6802E9FDAD4715
+061F0113663E5FB86824244542017C3D512321762B0136BAFA1E280B192025FEB67B7B71
+659B00000001FFEC0000047F061400290000290135213237363534270126353437363701
+1505060706151417011617163B0115232227262F010607060136FEB60136942D1036FECA
+320A1F6802E9FDAD4715061F024716262B405884413A67216115115FB86824244542017C
+3D512321762B0136BAFA1E280B192025FD3F1A0E10B8182B29782E1B9B000000FFFF0090
+FEC8051806141006056C000000010090FEC806230614002400002536351133111417163B
+01152322270607060506232227240326373306151417163332373604124EB8312C634B82
+704E121B79FEFB86556345FEDC010140B841A62849506DAE497EE3046AFB6B6A312CB833
+2E28B14222165B01128A5C73737E4210223500000001FFEC000001AF0614000D00000114
+07062B01353332373635113301AF57509A824B632C31B80173B2655CB82C316A04950000
+0001FFEC000002BA06140014000025062B013533323736351133111417163B0115232201
+534D98824B632C31B8312C634B82965656B82C316A0495FB6B6A312CB8000000FFFF008C
+FE14045E02F31006056D00000002008CFE14056702740011003500002516333237363534
+272627262322070615140506070623222726070615112311343736332635343736333217
+16171617163B0115232202627A4C2C153506153B282E3B1B4401C00F0D854BB58D324B19
+C878415A02A24D5C4854AA280F2826694B82AFA82A16393A181458110C1B444428A90E08
+504E1C4E1A4FFE93016DAD66372A2894843F2447B3432C2CB80000000002FFECFFCD03A6
+026D0015002400002506232227062B013533323637363736333217161514251633323736
+35342726232206070603646193CE6E4068A07434570514875E51B05B61FDF03E9F2F1334
+282A582E5B0F0734666230B84731B550385459B88F4E451235454B26293C61250002FFEC
+FFCE04B4026D001D002F00002506232227062B0135333237363736373633321716171617
+163B011523222516333237363534272627262322070607060364618BD66E4068A074342C
+2B0514875E5D4842C1110533246B4B82B0FE143E9F2F133405163A27273529320F073466
+6230B8242331B550381D53A7313E2CB8C445123545131258110C1B2161250000FFFF0093
+FEB5054803B610271721023F0320100605D30000FFFF0093FE0C062B02BC102614350000
+10071721023F0226FFFFFFEC0000018703E81027172100E00352100617280000FFFFFFEC
+0000027E03E81027172100E00352100617290000FFFF008BFFC603A002DE1006056F0000
+000200910000045E02EE000A002400000126272627060706171E01132627331617161716
+3B0115232227262706232227263534373602A40F0D0D0C78526F0201B4740403B8012415
+381F704B825A492D268A9C383ABDCC6D011A2A3132650C43593E293201D1272BA8AE654F
+2CB8331F3B490F309AAD7F440003FFECFFBD03BD03E5000F002D003D0000013637363534
+272623220706151417160732372627263534373617262735161704171615140706232227
+062B01350116151407060716333237363534272601942422270F163A4117160715F9344E
+2D0F122D304D2C51DFD80100400E284AAF839A78928902AB06620C1134317D1107211D01
+0D1B40483D2E25342D2B231E2576880B69454E4054535A09270EB944B3D1DE3439673D71
+6C29B80144252793690E132E431E213C4E4500000003FFECFE0D03C402AB000A0024002F
+000025333237363534232207060712373633321716151407211521161514070623222726
+03233505141716333235342726230153132A6072544B4A26B809816C818A452EA30158FE
+A8A32E458A816C8109AF0167264A4B5472602AB84C5A34708D4875010A7E6B6343726F6C
+B86C6F7243636B800108B8B875488D70345A4C00FFFFFFABFE0C03400286100605700000
+0002FFABFE0C04360286000B002C00002534272627260706070617160533152327060706
+07062135203736372627262726272637363736171617161716028D10182E3C3C430D1140
+2F0173F6C24619815369C0FE93016984A83E762D8B336A0A020A1BB03B41574585160DB8
+4C39501E291A1D384B362804B8019C81532F56B84C5F940307182B59871F399B4B190102
+315C8D53FFFF0082FEF305C0034A10060571000000010082FEF006BF0202003700000536
+352627262726353437363736333217163B01152322272623220706151417161716070607
+062322272411343733061514171633323736044C5B012F1D1E2C3450541E2A7557802023
+2372706C1A240F2D414903037180DA5968BC75FEDB3FB841A642B35B4D952133212B0D08
+283B3D413C5E0E0686C4B8ACA5061123301B1E7B6256601F0C29670106995A5A99724E1F
+080F0000FFFF0082FE0C05C0034A1027172201F4FE0C100605710000FFFF0082FE0C06BF
+02021027172201F4FE0C100614E70000FFFFFFECFED401F302581026144E000010071722
+0063FED4FFFFFFECFED4027E02581026144F0000100717220063FED4FFFFFF2EFFEC03BF
+06ED102614F200001007057BFE96012CFFFFFF2EFFEC04DA06ED102614F300001007057B
+FE96012CFFFFFFE5FFEC03BF07A3102614F200001007057CFE96012CFFFFFFE5FFEC04DA
+07A3102614F300001007057CFE96012CFFFF0017FE0C03BF0614102614F200001007057D
+FEC80000FFFF0017FE0C04DA0614102614F300001007057DFEC8000000010054FFEC03BF
+061400160000011007060706232227351633323701330136373635113303BF8B374DCD9E
+6A4B60557188FE16B301AA1D1425B80342FED4DA5547B420B820980446FC412B3789B802
+AE00000000010054FFEC04DA0614001F0000010607062322273516333237013301363736
+351133111417163B01152322272603343B49CAA16A4B60557188FE16B301AA1D1425B822
+40506981AF6611013C5B41B420B820980446FC412B3789B802AEFC44AE549EB8F3290000
+0003001EFF540816074C00030007002A0000090415333527353436373637363F01363736
+35342623220607153E013332161514060F010E011D01041A03FCFC04FC040396CB060606
+0813172C585C2224DFB867C15E61B34F6C8333395A5A38074CFC04FC0403FCFDAEFEFE93
+7B343C15191A1F2B565A40454C9FC23839BC43466E59315E35595682659A000000020064
+FFE305AA05D50007000A00003701330107032103012103640230E60230A8C1FD8CC10106
+01EAF52305B2FA4E4001F6FE0A02AA027C000000000300C8FFED041405E80009001A0024
+000001113332373635342623013633321716151407161514070621222713113332373635
+342623017C34FB773DC6AFFEDE8864F0A2CED7D675ABFEBD6484B46FEA5E2CECBF027EFE
+23723B425995035713617BD0D57A7AE48E70A4130534FE15803D38688E00000000010064
+FFE303EA05F300050000050901170901036BFCF903077FFD7802881D030803087FFD77FD
+77000000000200C80000040605D2000C0015000033113320171617161007060421373E02
+10272E0127C85A01849E9F190A2738FEB9FEC25ACEC7410A12BCFE05D2787AF965FE627F
+B8ADC00863D4017A5CAC910A000100C80000039C05F2000D000001112311050725110507
+25110507017CB402D41CFDFC02201CFDFC02201C0136FECA05F275B253FEC358B253FEC3
+58B20000000100C80000039C05F20009000001112311050725110507017CB402D41CFDFC
+02201C032AFCD605F275B253FEC358B200010096000002EE05D5000B0000132115231133
+152135331123960258D2D2FDA8D2D205D5B4FB93B4B4046D000300C80000043805D50003
+0007000B0000132111210111211105211121C80370FC9002BCFDF80208FDF8020805D5FA
+2B034501DCFE24B4FE23000000050096FFE306A405F3000F00140019001E002300000002
+0604202426021012362420041612013600372103112116000121110600011121260006A4
+7AD0FEE0FEC6FEE0D07A7AD00120013A0120D07AFD53C201121EFE0EB4FE0E1E0112FED0
+01F2C2FEEE028801F21EFEEE024EFEE0D07B7BD00120013A0120D07B7BD0FEE0FD161E01
+12C3FE0D01F3C3FEEE028901F31EFEEE0130FE0DC3011200000100C80000017C05D50003
+000013331123C8B4B405D5FA2B000000000100C8FFE3048305F3000A0000212311331101
+1709010701017CB4B4028878FD2E02D978FD7105D5FDE1023D86FD81FD7B860243000000
+000100C8000003FB05D50006000009011701231133017C01FF80FD4D80B40133020080FD
+4D05D500000100C800000AD405F3000C0000133309031709031123C87402830238022F02
+2E80FD52FDD2FDD1FDB3B405D5FDE50239FDD1022F80FD53022EFDD201EEFB4C000100C8
+0000067705F300080000133309011709011123C8740283023880FD52FDB3B405D5FDE502
+3980FD5301EEFB4C000500C80000069C05D500030007000B000F00130000011121110121
+1121011121112111211113112111017C01DCFD7005D4FA2C034401DCFB9401DCB401DC02
+90FE2401DC0345FA2B0521FE2401DCFE2401DCFD6FFE2401DC00000000030096FFE306A4
+05F3000F001F002700000036342E02220E02141E02323600020604202426021012362420
+041612040622263436321605925E5E9FDEF0DE9F5E5E9FDEF0DE01B17AD0FEE0FEC6FEE0
+D07A7AD00120013A0120D07AFD855274525274520194DFF0DF9E5F5F9EDFF0DF9E5F5F01
+58FEE0D07B7BD00120013A0120D07B7BD0FEE0D75252745252000000000100C8000004E7
+05E8001100000124353424212207112311363320001110050328010BFED3FEE23537B4A2
+7E0162019DFE81025966D4B6F906FAC405D414FEBFFEECFEB0920000000100C80000062A
+05D5000B0000331133090133112311090111C8B401FD01FDB4B4FE03FE0305D5FDA2025E
+FA2B04BDFDA1025FFB430000000200960000041A05F2000B001D000000342E01220E0114
+1E01323E010607060711231126272E01343E01321E010366487D927D48487D927DFC7A66
+4048B44741687879CFF4CF7903E7937C48487C937D48484CD13B250EFD8902770E253CD0
+F4CF7979CF000000000200C80000044405E9000C00170000080115140207062311231136
+33032037363534272623220702D8016CC8FF768BB4A27E6C010985868B72BE2B2E05E9FE
+E5FC8DFED14E24FE5C05D514FC6F7372969E6C580400000000010096FFF202F205EA0009
+00000903070903170194015EFEA2011F80FE63015EFEA2019D80044CFEA2FEA2FEE28001
+9E015E015E019E8000010064000004FC05F200070000010725112311253704FC38FE32B4
+FE2238048AAC95FB8D04AD99AC000000000100C8000004B405EA00070000011701112311
+3311043480FCC8B4B405EA80FCC9FDCD05D5FD5C00010096FFE304E705F2000B00000901
+370901170901070901270251FE45960192019396FE4501BB96FE6DFE6E9602ED02A362FD
+A1025F62FD5DFD58620264FD9C62000000030096000004E205D50013001B002400002123
+352627261037363735331516171610070607190136373610272601110607061514171603
+16B4AA81A1A180ABB4AA81A1A180AB604B6D6D4BFEEC604B6D6D4BCC1A80A101C7A2801A
+CBCB1A80A1FE39A2801A0387FD30174C6C01326C4BFD4802D0174C6E98966E4C00010064
+0000061605F2000B00002123110137011133110117010397B4FD818001FFB401FF80FD81
+02F4027E80FE0001E3FE1D020080FD8200030096FFF103A205B90007001D002500000034
+262206141632240620261037363726272610362016100706071617160234262206141632
+02EE7BAE7B7BAE012FE5FEBEE5722F37372F72E50142E5722F37372F72B47BAE7B7BAE01
+20AE7B7BAE7B31E5E50142732F1B1C2E720143E5E5FEBE732F1B1C2E7201C3AE7B7BAE7B
+000200C8000003E005E8000A001300003311363332041514042119013236353426232207
+C88481F30120FEA9FEF3CAE6B4A22A3005D513E6BDD0DCFD67034E7F76639C06000200C8
+FFED03E005D5000A00140000133311200415140423222713301116333236353426C8B401
+0D0157FEE0F38184B4302AA2B4E605D5FD67DCD0BDE6130287FE12069C63767F00010064
+000002BC05D50007000013352111331123116401A4B4B40291B40290FA2B029100020064
+000005AA05F20006000E000009012301370901000622263436321605AAFDD0E6FDD0A801
+FB01FBFE9152745252745205B2FA4E05B240FADA0526FDD85252745252000000FFFF00C8
+0000017C05D512061503000000010064FFE305AA05D50006000037013301070901640230
+E60230A8FE05FE052305B2FA4E400526FADA0000FFFF0096FFE304E705F2120615110000
+000100640000062705F3000800001309010701112311016402C802FB7AFDDBB4FE10032C
+02C7FD3B8401FEFB58049DFE0F000000000300AA01E0068202A800030007000B00000121
+3521053521152901352101FDFEAD015303320153FDBDFEAE015201E0C8C8C8C8C8000000
+FFFF00AA013D0682040B10270F61000003431007151D0000FF5D0000FFFF00AA01370682
+040E1027151D0000FF5810070F62000003460000FFFF00AA013A0682040A1027151D0000
+016210070F610000013A0000FFFF00AA013B0682040A10270F620000013C1007151D0000
+01620000FFFF00AA013D0682040A1027151D0000FF5D1007151D000001620000FFFF00AA
+00000682054810270F610000048010260F61000010270F610000018010070F6100000300
+FFFF00AA00000682054810270F610000048010270F610000018010270F61000003001006
+0F620000FFFF00AA0000068205481027151D0000FE2010270F610000048010270F610000
+018010070F61000003000000FFFF00AA00000682054810270F610000048010260F610000
+10270F610000030010070F6200000180FFFF00AA00000682054810270F62000001801027
+0F610000048010270F610000030010060F620000FFFF00AA00000682054810270F620000
+018010270F610000030010270F61000004801007151D0000FE200000FFFF00AA00000682
+054810260F6100001026151D00A010270F610000048010070F61000003000000FFFF00AA
+00000682054810260F6200001026151D00A010270F610000048010070F61000003000000
+FFFF00AA0000068205481027151D0000FE2010270F610000030010270F61000004801006
+151D00A0FFFF00AA00000682054810270F620000030010270F610000018010260F610000
+10070F6100000480FFFF00AA00000682054810270F620000030010270F61000004801027
+0F610000018010060F620000FFFF00AA0000068205481027151D0000FE2010270F610000
+018010270F610000048010070F62000003000000FFFF00AA00000682054810260F610000
+10270F620000018010270F620000030010070F6100000480FFFF00AA0000068205481026
+0F62000010270F610000048010270F620000030010070F6200000180FFFF00AA00000682
+05481027151D0000FE2010270F620000018010270F620000030010070F61000004800000
+FFFF00AA0000068205481026151D00A010270F610000048010270F620000030010060F61
+00000000FFFF00AA0000068205481026151D00A010260F62000010270F61000004801007
+0F62000003000000FFFF00AA0000068205481026151D00A010270F610000048010270F62
+000003001007151D0000FE20FFFF00AA0000068205481027151D0000012010270F610000
+018010260F61000010070F6100000480FFFF00AA00000682054810260F62000010270F61
+0000048010270F61000001801007151D00000120FFFF00AA0000068205481027151D0000
+FE201027151D0000012010270F610000018010070F61000004800000FFFF00AA00000682
+054810270F620000018010270F610000048010260F6100001007151D00000120FFFF00AA
+0000068205481027151D0000012010260F62000010270F610000048010070F6200000180
+FFFF00AA0000068205481027151D000001201027151D0000FE2010270F61000004801007
+0F62000001800000FFFF00AA0000068205481027151D0000012010270F61000004801026
+151D00A010060F6100000000FFFF00AA0000068205481027151D0000012010270F610000
+04801026151D00A010060F6200000000FFFF00AA0000068205481027151D000001201026
+151D00A010270F61000004801007151D0000FE20FFFF00AA00000682054810270F620000
+048010270F610000030010270F610000018010060F610000FFFF00AA0000068205481027
+0F620000048010260F62000010270F610000030010070F6100000180FFFF00AA00000682
+054810270F620000048010270F610000030010270F61000001801007151D0000FE200000
+FFFF00AA00000682054810270F620000048010270F620000018010270F61000003001006
+0F610000FFFF00AA00000682054810270F620000048010260F62000010270F6100000300
+10070F6200000180FFFF00AA00000682054810270F62000004801027151D0000FE201027
+0F610000030010070F62000001800000FFFF00AA00000682054810270F62000004801027
+0F61000003001026151D00A010060F6100000000FFFF00AA00000682054810270F620000
+048010270F61000003001026151D00A010060F6200000000FFFF00AA0000068205481027
+0F62000004801026151D00A010270F61000003001007151D0000FE20FFFF00AA00000682
+054810270F620000048010260F61000010270F610000018010070F6200000300FFFF00AA
+00000682054810270F620000048010260F62000010270F610000018010070F6200000300
+FFFF00AA00000682054810270F620000048010270F620000030010270F61000001801007
+151D0000FE200000FFFF00AA00000682054810270F620000048010270F62000003001027
+0F620000018010060F610000FFFF00AA00000682054810270F620000048010270F620000
+018010270F620000030010060F620000FFFF00AA00000682054810270F62000004801027
+0F620000030010270F62000001801007151D0000FE200000FFFF00AA0000068205481027
+0F620000048010260F61000010270F62000003001006151D00A00000FFFF00AA00000682
+054810270F620000048010270F620000030010260F6200001006151D00A00000FFFF00AA
+00000682054810270F62000004801027151D0000FE2010270F62000003001006151D00A0
+FFFF00AA00000682054810270F620000048010260F61000010270F61000001801007151D
+00000120FFFF00AA00000682054810270F62000004801027151D0000012010270F610000
+018010060F620000FFFF00AA00000682054810270F620000048010270F61000001801027
+151D000001201007151D0000FE200000FFFF00AA00000682054810270F62000004801027
+151D0000012010260F61000010070F6200000180FFFF00AA00000682054810270F620000
+048010270F620000018010260F6200001007151D00000120FFFF00AA0000068205481027
+0F620000048010270F62000001801027151D0000FE201007151D000001200000FFFF00AA
+00000682054810270F620000048010260F6100001026151D00A01007151D000001200000
+FFFF00AA00000682054810270F620000048010260F6200001026151D00A01007151D0000
+01200000FFFF00AA00000682054810270F62000004801027151D0000FE201026151D00A0
+1007151D00000120FFFF00AA0000068205481027151D000002A010260F61000010270F61
+0000018010070F6100000300FFFF00AA0000068205481027151D000002A010270F610000
+018010270F610000030010060F620000FFFF00AA0000068205481027151D000002A01027
+151D0000FE2010270F610000018010070F61000003000000FFFF00AA0000068205481027
+151D000002A010260F61000010270F610000030010070F6200000180FFFF00AA00000682
+05481027151D000002A010270F620000018010270F610000030010060F620000FFFF00AA
+0000068205481027151D000002A010270F620000018010270F61000003001007151D0000
+FE200000FFFF00AA0000068205481027151D000002A010260F6100001026151D00A01007
+0F61000003000000FFFF00AA0000068205481027151D000002A010260F6200001026151D
+00A010070F61000003000000FFFF00AA0000068205481027151D000002A01027151D0000
+FE2010270F61000003001006151D00A0FFFF00AA0000068205481027151D000002A01027
+0F620000030010270F610000018010060F610000FFFF00AA0000068205481027151D0000
+02A010270F620000030010270F610000018010060F620000FFFF00AA0000068205481027
+151D000002A01027151D0000FE2010270F610000018010070F62000003000000FFFF00AA
+0000068205481027151D000002A010260F61000010270F620000018010070F6200000300
+FFFF00AA0000068205481027151D000002A010260F62000010270F620000030010070F62
+00000180FFFF00AA0000068205481027151D000002A01027151D0000FE2010270F620000
+018010070F62000003000000FFFF00AA0000068205481027151D000002A01026151D00A0
+10270F620000030010060F6100000000FFFF00AA0000068205481027151D000002A01026
+151D00A010260F62000010070F62000003000000FFFF00AA0000068205481027151D0000
+02A01026151D00A010270F62000003001007151D0000FE20FFFF00AA0000068205481027
+151D000002A01027151D0000012010270F610000018010060F610000FFFF00AA00000682
+05481027151D000002A010260F62000010270F61000001801007151D00000120FFFF00AA
+0000068205481027151D000002A01027151D0000FE201027151D0000012010070F610000
+01800000FFFF00AA0000068205481027151D000002A010270F620000018010260F610000
+1007151D00000120FFFF00AA0000068205481027151D000002A01027151D000001201026
+0F62000010070F6200000180FFFF00AA0000068205481027151D000002A01027151D0000
+01201027151D0000FE2010070F62000001800000FFFF00AA0000068205481027151D0000
+02A01027151D000001201026151D00A010060F6100000000FFFF00AA0000068205481027
+151D000002A01027151D000001201026151D00A010060F6200000000FFFF00AA00000682
+05481027151D000002A01027151D000001201026151D00A01007151D0000FE2000030010
+000005DC05D50003000B000E0000012301330901210321032301170121035DCD01EECDFE
+57023AFE5C98FD809977023918FEE302380571FAF30571FA2B01A1FE5F05D5C7FCF70000
+000600C90000054E05D5000C0014001C00200025002A0000132132161514071611140423
+210111333237112623031133363311262321113311013635342F0136353427C90266E7FA
+C0FEFEF0FBFD860190EA3B33333BEAD624202024FDFECA0223D0D03ED0D005D5C0B1E55D
+61FEE1C8DA02E9FD7B070277070288FDDC03021F02FAF3050DFB1144DCE5449636CDC436
+000400E80000063305D50008001000140019000013212000111000290101133332371126
+23211133030136111027E8020301B20196FE68FE50FDFD01920163F5A0A0F6FE70CA0102
+C6DFDF05D5FE97FE80FE7EFE960571FAF341048B41FAF3050DFB6B95017B01719C000000
+000200C90000055305D50003000F000001113311252115211121152111211521012DCAFE
+D20478FD1A02C7FD3902F8FB760571FAF3050D6464FDE464FD736400000200C9000004EC
+05D50009000D00001321152111211521112101231133C90423FD6F0251FDAFFE6E012ECA
+CA05D564FDE464FD0F0571FAF300000000020073FFE3058B05F0001D0026000001262423
+220711163332373637112135211106042320001110002132041701110607061110171605
+647FFEFC85BB8787BB917F6556FE52021275FEE6A0FEA2FE75018B015E9201076FFC521C
+1AA9A91A04E4614740FB3B40261F3501E764FD7F53550199016D016E01994846FB630449
+161AAFFEBAFEBBAF1A00000000020066000002BE05D50003000F00000111331125211523
+1133152135331123012ECAFE6E02586464FDA864640571FAF3050D6464FAF36464050D00
+0002FF96FE66025905D50008001400000111140736373635112521111006232135333236
+35012D56903F4FFED40190CDE3FEED3F866E0571FAB1F2640A4A5EEA050964FA93FEF2F4
+6496C200000200C90000063005D5000A000E0000132111013309012301112113113311C9
+019003039FFCA3039299FCC2FE7064CA05D5FD890277FD40FCEB02CFFD310571FAF3050D
+000200C90000053205D500050009000013211121152113113311C9019202D7FB9764CA05
+D5FA8F64056FFAF3050D0000000300C40000076F05D5000C001000140000211101230103
+21112109012111011133112111331105DDFE5F47FE6201FE6E01D8017D017F01D7FED2CA
+FA1DCA0571FBAE0452FA8F05D5FC0803F8FA2B0571FAF3050DFAF3050D00000000050072
+FFE305DA05F0000F0017001F002700280000012017161110070621202726111037361316
+20371126200703110607061017160111363736102726010326013ABCBEBDBDFEC6FEC5BC
+BDBDBC476C01106C6CFEF06C6924209B9B2002DE231F9B9B1FFBCC05F0D2D5FEA0FEA1D4
+D3D3D201610162D3D2FA8E323204D73232FB6A04541D25B6FD9CB5250435FBAF1D24B602
+63B624FDF400000000020088FFDC049F05F60011002D0000010610161F011E0110073610
+262F012E0134251526200614161F011E01100420253516203634262F012E011024200150
+6488AC6FA9A826819CAA6EB09E030FCEFEC5A26D946ECAC9FEE0FE13FEFBDF0167A97A8A
+6FCAB7011601C6052D5BFECA9A291A27B9FEFF4E580164BB271B279DE3B4707589E96924
+1B32EBFE58EE667C9592FD86201A2FCF018CF4000002FFFA000005B005D50003000B0000
+0111331125211521112111210272C8FCC005B6FDEEFE70FDEC0571FAF3050D6464FA8F05
+71000000000300B1FFE305F305D50006000D001D00000111100724190121111005261311
+2521111416203635112111100020001104C6580121FB8601215901FED301918001208001
+91FEACFD66FEAC0571FC99FEE6826201610340FCC0FE9E607C011F036764FC35F0D3D3F0
+03CBFC5CFEDCFED6012A012400020010000005B705D50003000A00001301330125210901
+3301219A01EEC8FE12FEAE019001D901DA64FDC7FECC0571FAF3050D64FB1704E9FA2B00
+00030044000008AE05D50003000700140000090133012101330125210901210901330121
+09012104C40144C8FEBCFB350144C8FEBCFEBB0190013A01390190013A013964FE89FE7C
+FEC5FEC2FE800571FAF3050DFAF3050D64FB1204EEFB1204EEFA2B0510FAF0000002006C
+0000060605D50003000F0000090133012521090133090121090123010128035CC6FCA4FE
+7E01B80176018462FE4C023AFE48FE8AFE7C6401B60571FAF3050D64FDCE0232FD84FCA7
+0232FDCE027B00000002FFFC000005AC05D50008000E0000090133011121110121090123
+011133036E01DA64FDF0FE70FDF0019401AAFE32C801CCCA031302C2FCF2FD3902C7030E
+FCF202AAFD56FD9D0004007BFFE30493047B00070022002C003300000134262716151133
+131121350E012322263534363B0135342623220607353E013320040135232207113E0137
+3605110E01151416042F963D4B8864FEB03FBC56ACCBFDFBD0759760B65477DF38011E01
+1AFEB0D0362F5E623B3AFE6743887A027FD386185D88FD59021BFD81AA6661C1A2BDC048
+7F8B2E2E742727FCFE8B5504FDED044E4847DC01FD12678B7774000000040094FFE30513
+0614000F001A001E002D00001321113E0133320010022322262715210134272627113637
+3637360111331101262322070607061514171633323794014E3AB17CCB00FFFFCB7CB13A
+FEB204125E2C3C3C2C39160FFC528601F9191AA54B4D160E5F5DA51A190614FDA26461FE
+BCFDF0FEBC6164A802749F823D20FC7A203D4F734B03DAFAAC0554FE64036968744A9E9F
+8282030000020071FFE303E7047B001A0023000025150E01232200111000213216171526
+272623220711163332373625110607061514171603E74DA55DFDFED6012D010655A24C45
+6D474A58484351524856FE182C247B7A248F642424013E010E0112013A2323641F180F14
+FC571310131B03531A2580EAE683260000040094FFE305130614000F001A001E002D0000
+0111211121350E0123220210003332160114171617161711060706011133110111163332
+3736353427262726232203C5014EFEB23AB17CCBFF00FFCB7CB1FD760F16392C3C3C2C5E
+032886FD81191AA55D5F0E164D4BA51A03B6025EF9ECA8646101440210014461FE5A9E4B
+734F3D200386203D82029DFAAC0554FE64FC360382829F9E4A7468690003006FFFE3047D
+047B00130018001F000001211316333237150E0123200011100033320015010611121713
+212E01232207047DFD8B014B5FD9C36DC36BFEF4FEC70129FCE50104FD23C601C5690201
+03CCA94A400204FE62155D752D290138010A01130143FEDAF701717AFEDBFEF38E01D3BE
+E71100000002002F000003E30614000A0020000001060706151133113437362515232207
+061D0121152111211123353335343736330211672E3987161201F1AE943A390184FE7CFE
+B1B0B05758BC05AE0A2D3891FBB6044A5F44388B643937926464FC1A03E66464BC545600
+00040071FE5604F0047B00070023002E003D0000011114071636190101351E013332363D
+010E01232202100033321617352111100021222603141716171106070607060116333237
+3637363534272623220704066A05EBFC6C519E52B5B43AB17CCBFF00FFCB7CB13A014EFE
+D6FECD72CA795E2C3C3C2C39160F012F191AA54B4D160E5F5DA51A1903FAFC3DCA8C059D
+0112036FFA97802C2ABDBF7164610144021001446164A8FC2DFEE2FEE91D03779F823D20
+0386203D4F734BFDC2036968744A9E9F82820300000300BA000005480614000A000E0022
+00000116171615113311342726011133112721113E013332161511211134262322061511
+2104000908478C5335FCC287EB014F49C681D4DBFEAC6B6B8095FEB1040D0B0C68BEFD94
+0240C15B3A01B6FAB4054C64FD9E6564EFE8FD5C02D09F9EBEA4FD55000300E600000235
+061400030007000B0000011133110333152307211121014A87A0B9B94B014FFEB103FCFC
+6803980218E9CBFBA00000000003FFD7FE56020C061400080016001A0000051123111407
+36373607233533323736351121111407060333152301A8872547283DF4DD316C2425014F
+515261B8B8160412FBD0B5540F3048F46430319904ACFB8CD6606007BEE90000000200BA
+000005320614000A000E0000132111013309012301112113113311BA014F02848CFD4802
+D196FD6DFEB164870614FC6901E3FDF6FDAA0223FDDD05B0FAB4054C000200E6000002EA
+0614000800140000011417161726351123132227263511211114163315014A3D28472587
+F5B65251014F4C690194A048300F54B50430FA5A6060D6047EFB4A9C5E640000000400BA
+00000887047B002200260031003C00001321153E01333216173E01333216151121113426
+232206151121113426232206151121131133112516171615113311342726251617161511
+3311342726BA014F49C681D49D1B54DE81D4DBFEAC6B6B8095FEAC6B6B8095FEB1648702
+5B0908478C533502E30908478C53350460AE6564AC4A8076EFE8FD5C02D09F9EBEABFD5C
+02D09F9EBEA4FD5503FCFC680398110B0C68BEFD940240C15B3A130B0C68BEFD940240C1
+5B3A0000000300BA00000548047B000A000E002200000116171615113311342726251133
+112721153E0133321615112111342623220615112104000908478C5335FCC287EB014F49
+C681D4DBFEAC6B6B8095FEB1040D0B0C68BEFD940240C15B3A02FC68039864AE6564EFE8
+FD5C02D09F9EBEA4FD55000000040071FFE30475047B000B0013001B0023000001320011
+10002322001110001316323711262207031106070610171601113637361027260273F001
+12FEEEF0F1FEEF01118233783333783364342770702701DA3328707028047BFEC8FEECFE
+EDFEC70139011301140138FBD70B0B03BA0B0BFC6B03701D2D80FE24802D0352FC921C2D
+8101DB802D00000000040071FE5604F0047B000F001A001E002D00002511211121153E01
+333200100223222601342726272627113637360111231101112623220706151417161716
+333201BFFEB2014E3AB17CCB00FFFFCB7CB1028A0F16392C3C3C2C5EFCD886027F191AA5
+5D5F0E164D4BA51AA8FDAE0608A86461FEBCFDF0FEBC6101A69E4B734F3D20FC7A203D82
+FD6F0548FAB8019003CA0382829F9E4A7468690000040071FE5604F0047B000F001A001E
+002D0000250E012322021000333216173521112101141716171106070607060133112301
+163332373637363534272623220703A23AB17CCBFF00FFCB7CB13A014EFEB2FD3C5E2C3C
+3C2C39160F03288686FE07191AA54B4D160E5F5DA51A19A864610144021001446164A8F9
+F803949F823D200386203D4F734BFC320548FC48036968744A9E9F8282030000000200BA
+000003DF047B000300150000011133112721153E0133321F01152E01232206151121011E
+86EA014E3ABA851B0F341F492C9CA7FEB203FCFC68039864AE66630307851211CBBEFD7A
+0002006FFFE303C7047B001D0045000001060706151417161F0116171615140736373635
+3427262F012627263534031E013332363534262F012E0135343633321617152E01232206
+1514161F011E01151406232226270169271C4B26277134A53D4225251D552B2E84339039
+47D353A04F6A714C91348F76E0CE66B44C4A5C5F6F70507833A184F7D85AC36C03F90F17
+3D766630332210333B407B523F101742736C3337270F2A37436F54FCFE37385E554E4F2C
+102C9788A6B5201F7A31245958444C230F2F9E90A4C025250002003700000388059E0007
+001B0000252637112311061613112115211114163B011521222635112335331101D02A03
+87015C90017BFE854B73BDFEADD5A287876A557C03FFFC37AD4E0528FEAC64FD55894E64
+9FD2027564015400000300B1FFE505440460000A000E0022000025262726351123111417
+16051123111721350E0123222635112111141633323635112101F90908478C5335034387
+EBFEAC49C681D4DB01546B6B80950154530B0C68BE026CFDC0C15B3A020398FC6864AE65
+64EFE802A4FD309F9EBEA402AB0000000002003D000004B104600003000A000013013301
+25210901330121CD015983FEA3FEF10154015E015E64FE5CFED403FCFC68039864FC5403
+ACFBA00000030056000006F204600003000700140000011333032113330325211B01211B
+013301210B012103F1F087F2FC62F087F2FEF90154E6E5014EE6E564FEDBFECAF1F2FEC7
+03FCFC680398FC68039864FC96036AFC96036AFBA00396FC6A0000000002004C0000051C
+04600003000F000009013301252109013309012109012301011302AB97FD55FEA2019001
+1D011D7CFEA501E5FE70FEE3FEE37C015B03FCFC68039864FE81017FFE2DFD73017FFE81
+01D300000002003DFE5604C30460000300120000130137012521090133010E012B013533
+323637D201B23EFE95FEE6015E015D015F6CFE1450927C939358512B03FCFBDB99038C64
+FC970369FB38C77B64435900000200580000046204600003000D00000901330125211501
+211521350121035CFD768C028AFC8903F1FD770289FBF60289FD9003FCFC6803986464FC
+6864640398000000FFFF00100000056805D5100600240000FFFF00C9000004EC05D51006
+00250000FFFF0073FFE3052705F0100600260000FFFF00C9000005B005D5100600270000
+FFFF00C90000048B05D5100600280000FFFF00C90000042305D5100600290000FFFF0073
+FFE3058B05F01006002A0000FFFF00C90000053B05D51006002B0000FFFF0097000002F6
+05D5100617730000FFFFFF96FE66019305D51006002D0000FFFF00C90000056A05D51006
+002E0000FFFF00C90000046A05D51006002F0000FFFF00C90000061F05D5100600300000
+FFFF00C90000053305D5100600310000FFFF0073FFE305D905F0100600320000FFFF00C9
+0000048D05D5100600330000FFFF0073FEF805D905F0100600340000FFFF00C900000554
+05D5100600350000FFFF0087FFE304A205F0100600360000FFFFFFFA000004E905D51006
+00370000FFFF00B2FFE3052905D5100600380000FFFF00100000056805D5100600390000
+FFFF0044000007A605D51006003A0000FFFF003D0000053B05D51006003B0000FFFFFFFC
+000004E705D51006003C0000FFFF005C0000051F05D51006003D0000FFFF007BFFE3042D
+047B100600440000FFFF00BAFFE304A40614100600450000FFFF0071FFE303E7047B1006
+00460000FFFF0071FFE3045A0614100600470000FFFF0071FFE3047F047B100600480000
+FFFF002F000002F80614100600490000FFFF0071FE56045A047B1006004A0000FFFF00BA
+0000046406141006004B0000FFFF00C10000017906141006004C0000FFFFFFDBFE560179
+06141006004D0000FFFF00BA0000049C06141006004E0000FFFF00C10000023906141006
+17690000FFFF00BA0000071D047B100600500000FFFF00BA00000464047B100600510000
+FFFF0071FFE30475047B100600520000FFFF00BAFE5604A4047B100600530000FFFF0071
+FE56045A047B100600540000FFFF00BA0000034A047B100600550000FFFF006FFFE303C7
+047B100600560000FFFF0037000002F2059E100600570000FFFF00AEFFE30458047B1006
+00580000FFFF003D0000047F0460100600590000FFFF00560000063504601006005A0000
+FFFF003B0000047904601006005B0000FFFF003DFE56047F04601006005C0000FFFF0058
+000003DB04601006005D000000040088FFE3049005F00007000C00140019000000200010
+00200010013611102F01262207111632370106111017019001F6010AFEF6FE0AFEF802D8
+CCCC64337B34347B33FEBACACA05F0FE73FD0DFE73018D02F3FC238F01D401D58F300F0F
+FAD90F0F04F790FE2CFE2D900002006B000004AC05D50003000E00000111331137112115
+213521110535250236CA62014AFBDC014AFE9901670571FAF3050D64FA8F6464050D4864
+48000000000200820000049A05F000100028000037210136373610272627171615140E01
+03012433320415140E01070121152137360037361026232207FB0100012960224C6C4462
+035A4582D1FEE70103B5F3011F30515DFEFA0228FBE80102019E3D79876D98C16401CD95
+408F01395C39180470A864BACFFEDD043968F4CC62AC9691FE69646405024162BF0119A8
+950000000003009CFFE3047305F00024002A0030000005222735171633323711262B0135
+333237112623220F013536333204151406071E0115140435363534262719013E01353402
+2BBBD421C4AA654F363FCCD43B323A4C9CD91BE6AFE6010C8D808EA2FED0CC755745641D
+4A6A0C441002950A640802200A3C086840D1B27CAA211FC590DDF29255E86C8D240296FE
+1A1D7958AC0000000003005A000004B805D5000300060011000001231333090121032111
+331523112111213503A7CB03C8FED4FE5101AF030193ADADFE70FDDF0571FAF304C1FCE3
+03CDFC3364FE5C01A47F000000030094FFE3048C05D500040008001E0000011123113601
+36102703112623220711211521110C0110042122273516333201FFC86701B6CCCC64316A
+B4CE034BFE4501110118FED4FEBDB9D0BDDC81039101E0FDFD1BFCE65C01DC60FD4902D7
+0A4B02EF64FE2309F5FE46F93C88640000040071FFE304AA05F000040009001100250000
+2536111027010611101F0116323711262207133217152726200711363332001000232000
+1000037CCACAFE26CDCD643AAB2D28AB3FF4A7A82299FED65E4268F50105FEF0F6FEDFFE
+EE01507063010C01185C01CAB3FE91FE239532100803220613028C3C6A0C362DFE6616FE
+EFFE2FFEEA018D02DB01A50000020041000004D605D50003000A00000901330125211501
+2101210395FE0DD601F3FBD60495FDE7FE53021AFD170571FAF3050D6464FA8F05710000
+0007008BFFE3048B05F00004000C00240029003100390041000025362726270010171617
+11060713352E01353424201615140607151E011514042024353436131106070605163237
+11262207190116323711262205113637361027260358D10707C3FDBA5F212C2C204C8090
+00FF01BDFE908091A2FEF7FE12FEF7A390C307070135317031317031307230307201062C
+20605F21644AEAE44E0227FEF84D1B1201FC121BFDDC0220B180B3D0D0B380B1200123C5
+8FD9E8E8D98FC5FD6C02664EE4EA6106060296070702A2FDD0070702300721FE04121B4D
+01084D1B0004006AFFE304A305F0000400090011002500000106111017013611102F0126
+22071116323703222735171620371106232200100033200010000198CACA01DACDCD643A
+AB2D28AB3FF4A7A82299012A5E4268F5FEFB0110F601210112FEB0056363FEF4FEE85CFE
+36B3016F01DD95321008FCDE0613FD743C6A0C362D019A16011101D10116FE73FD25FE5B
+FFFF0087FFE3048F05F0100600130000FFFF00E10000045A05D5100600140000FFFF0096
+0000044A05F0100600150000FFFF009CFFE3047305F0100600160000FFFF0064000004A4
+05D5100600170000FFFF009EFFE3046405D5100600180000FFFF008FFFE3049605F01006
+00190000FFFF00A80000046805D51006001A0000FFFF008BFFE3048B05F01006001B0000
+FFFF0081FFE3048705F01006001C0000FFFF00C1000001790614100605540000FFFF0082
+FEA206EB029D100605550000FFFF009DFE0C05280366100605590000FFFF007DFFDA031B
+03521006055C0000FFFFFFABFE0C03400286100605700000FFFFFFABFE0C036203B61006
+055F0000FFFF009DFE0C052803661006055A0000FFFF0090000006DC0614100605640000
+FFFF0082FE0C05C0034A100605720000FFFF0090FFC905C706141006056B0000FFFF0090
+FEC8051806141006056C0000FFFF008CFE14045E02F31006056D0000FFFF0093FEB50548
+03B61006056E0000FFFF0082FE0C091A02EE100605600000FFFF0075FE0C04B2042A1006
+05660000FFFF0082FFA4079E0514100605690000FFFF0082FE0C091302E5100605620000
+FFFF006BFE48059B05141006056A0000FFFFFFABFE0C036202261006055E0000FFFF0082
+FE0C091A04B0100605610000FFFF0082FFEC06EB0320100605570000FFFF0082FFEC06EB
+041A100605580000FFFF009DFE0C052804B01006055B0000FFFF007DFFDA031B04B01006
+055D0000FFFF0082FE0C091303B6100605630000FFFF0090000006DC0614100605650000
+FFFF0075FE0C04B20546100605670000FFFF0082FFEC06EB029D1006058E0000FFFF0093
+FEB5054802EE100605D30000FFFF0082FFA4079E03D9100605BA0000FFFF006BFE48059B
+03D91006058F0000FFFFFFECFED4028102581226183C00001007172101DAFED4FFFFFFEC
+FED404C0032F1226160B0000100717210271FED40003FFECFFBD045303E5000F002D003D
+000001363736353427262322070615141716073237262726353437361726273516170417
+16151407062322270623213501161514070607163332373635342726022A2422270F163A
+4117160715F9344E2D0F122D304D2C51DBDC01053B0E284AAF839A7892FEE1034106620C
+1134317E1007211D010D1B40483D2E25342D2B231E2576880B69454E4054535A09270EB9
+43B4D6D93439673D716C29B8014425278A720E132E431E213C4E45000001FFEC000004C0
+032F001E0000012627262726073536373217041715060706070607062B01353332373637
+3603B7536755B452A1484BA2AC0102DC4C58A64A914BDDA3E4C8E38168745E021D171713
+100706B807012334629A18346242811B50B8483A6A560000FFFFFFECFED402ED02581027
+1722015DFED41206183C00000001FFEC000004C90614001F000029013521323736353427
+012635343736370115050607061514170116151407060230FDBC0230932E1036FECA320A
+1F6802E9FDAD4715061F0113663E5FB86824244542017C3D511E26762B0136BAFA1E280B
+192025FEB67A7C71659B00000001FFEC000002A90614000D000001140706232135213237
+3635113302A957509AFE840145632C31B80173B2655CB82C316A04950002FFECFFCE043C
+026D00150025000025062322270623213521323637363736333217161514251633323736
+3534272623220706070603FA6193CE6E4068FECA010A34570514875E51B05B61FDF03E9F
+2F1334282A582D2E2A130734666230B84731B550385459B88F4E451235454B26291E1B64
+25000000FFFFFFEC0000028103E81226183C00001007172101DA03520001FFECFFE3066E
+02EE00310000250607062B0135333237363D013315141716333237363533141716373619
+013311140706070623222726270607062322272601E42B384C63E6AF632C50B82C2B686D
+2C25B813406E8EB85C4B6625233F3789123060444162483C8A3B212EB82C5064C09C4064
+637A67C2CD32AA010201160126FEAAC7715C1809193D849C21183128FFFFFFEC000003F8
+042A100614C20000FFFFFFEC0000033F05141027172101A9047E1006172B00000002FFEC
+0000069602E5000C002E000001060733323736353427262322032122272627062B013533
+3237363D013315141617363736373633321716151407060434A891BBED81BA8B25304CBA
+FEEC4A4E412766ACE6AF632C50B8122D655F99904B55736BBAB8CA01E66CC23F5B468713
+05FDC92A233D8AB82C5064724E1850328654893F212744ECA96D7800FFFFFFEC0000033F
+0514100614CE0000FFFFFFECFFE3066E04B01226161100001007172302EE0320FFFFFFEC
+000002ED03E81226183C000010071722015D0352FFFFFFEC000002ED04E210271723015D
+03521206183C0000FFFFFFEC000004C0044C1226160B000010071721027103B6FFFFFFEC
+0000069603B610271721023F0320120616140000FFFFFFEC000003F80546100614C60000
+FFFF00C1FED4048D06141027172103E6FED4120616310000FFFF00C1FED406CC06141027
+1721047DFED41206161F0000000300C1FFBD062D06140027003700470000131133111417
+163B0132372627263534373617262735161704171615140706232227062B012227260116
+151407060716333237363534272605363736353427262322070615141716C1B8312C638E
+344E2D0F122D304D2C51DFD80100400E284AAF839A7892E39A5057044606620C1134317D
+1107211DFEBA2422270F163A4117160715017304A1FB6B6A312C0B69454E4054535A0927
+0EB944B3D1DE3439673D716C295C65013B252793690E132E431E213C4E45A91B40483D2E
+25342D2B231E2576000100C1000006CC061400280000131133111417163B013237363736
+372627262726073536373217041715060706070607062B01222726C1B8312C6387E38168
+745E65536755B452A1484BA2AC0102DC4C58A64A914BDDA3DA9A5057017304A1FB6B6A31
+2C483A6A5623171713100706B807012334629A18346242811B505C65000200C100000844
+0614000C0028000025333237362726272623220706251133111417163321113311122536
+3332171615140706290122272604A9BBED81BB01028925305377B1FB90B8312C63012EB8
+D901145C447569BAB8CAFEE4FC5C9A5057B83F5D4487130551780504A1FB6B6A312C055C
+FB0E013F63212745EBA96D785C650000FFFF00C1FED404F90614102717220369FED41206
+16310000000100C10000063F061400290000131133111417163321323736353427012635
+343736370115050607061514170116151407062321222726C1B8312C630159932E1036FE
+CA320A1F6802E9FDAD4715061F0113663E5FDFFE5C9A5057017304A1FB6B6A312C682424
+4542017C3D511E26762B0136BAFA1E280B192025FEB67A7C71659B5C65000000000200C1
+FFCE06160614000F002F0000251633323736353427262322070607060506232227062B01
+222726351133111417163B0132363736373633321716151404063E9F2F1334282A582D2E
+2A130701C46193CE6E4068FA9A5057B8312C639734570514875E51B05B61C7451235454B
+26291E1B6425B26662305C65B204A1FB6B6A312C4731B550385459B88F000000FFFF00C1
+0000048D06141027172103E60352120616310000000100C1FFE3087A0614003B00001311
+33111417163B013237363D01331514171633323736353314171637361901331114070607
+06232227262706070623222726270607062B01222726C1B8312C636E632C50B82C2B686D
+2C25B813406E8EB85C4B6625233F3789123060444162483C292B384C63DC9A5057017304
+A1FB6B6A312C2C5064C09C4064637A67C2CD32AA010201160126FEAAC7715C1809193D84
+9C21183128493B212E5C6500000100C100000668061400240000131133111417163B0132
+372627263510373633152206141716333237251505042B01222726C1B8312C6373A1CA4B
+3458CC7DFBDABA3E5346374A0120FE5CFEA2B2B29A5057017304A1FB6B6A312C5D183B64
+8C01087D4DA989FF34462181B8C5A45C65000000FFFF00C1000005AF0614102717210419
+047E120616320000000200C1000008A20614002B00380000131133111417163B01323736
+3D01331514161736373637363332171615140706290122272627062B0122272601060733
+323736353427262322C1B8312C636E632C50B8122D655F99904B55736BBAB8CAFEE4FEEC
+4A4E412766ACDC9A5057057FA891BBED81BA8B25304C017304A1FB6B6A312C2C5064724E
+1850328654893F212744ECA96D782A233D8A5C6501256CC23F5B468713050000FFFF00C1
+000005AF061410271722039C047E120616320000FFFF00C1FFE3087A06141027172304FA
+0320120616250000FFFF00C1000004F906141027172203690352120616310000FFFF00C1
+000004F906141027172303690352120616310000FFFF00C1000006CC061410271721047D
+03B61206161F0000FFFF00C1000008A2061410271721044B0320120616280000FFFF00C1
+0000084406141027172105370352120616200000FFFF00C10000066806141027172103E7
+04B0120616260000000100C10000048D0614001700002506232122272635113311141716
+3B013237363D013315140431489DFEB69A5057B8312C63DC632C31B856565C65B204A1FB
+6B6A312C2C316AD9D9BB0000000200C1000005AF0614002A003A00001311331114171633
+213237363736370607062726353437363736333217161716151407060706232122272601
+363534272607060706071417163332C1B8312C63011454974F3C1F0F3F61824E62081796
+4E4C5A42602E174E4A7C6D91FE659A5057040529421F2C3428280137282A48017304A1FB
+6B6A312C170C5D30323702024557812D33944524324866338CD08F882C275C6501582B4D
+3B331901012A293350261900000200C800460A21053B0003000700000133112301112111
+052E8D8DFB9A0959015F02C3FC2404F5FB0B0000000300C800460A21053B00030007000B
+0000371121112711211125113311C809598DF7C103D98D4604F5FB0B8D03DBFC258C02C3
+FD3D0000000400C800460A21053B0016001A001E00220000013437363736333217161716
+1514070607062227262726011121112711211125113311073010111A172624181A111010
+111A184918191210F99809598DF7C103D98D02C324171A121010101C1724251819121010
+111A18FDA804F5FB0B8D03DBFC258C02C3FD3D00000500C800460A21053B0016002C0030
+003400380000012227262726343736373633321716171615140706070601222726272634
+37363736333217161716140706070601112111271121112511331108B124171A12101010
+1C1724251819121010111A18FDC524181A120F0F111B172524181A121010111B17FA0809
+598DF7C103D98D013F10101B18481819131010111B172524181A1110021110111C174818
+1A121010111B1847181A1310FCF604F5FB0B8D03DBFC258C02C3FD3D000600C800460A21
+053B0016002B004100450049004D00000122272627263437363736333217161716151407
+060706012227262726343736373632171617161407060706012227262726343736373633
+3217161716140706070601112111271121112511331108B124171A121010101C17242518
+19121010111A18FECE24171A131010111C1748181A121010111B17FED224181A120F0F11
+1B172524181A121010111B17FA0809598DF7C103D98D013F10101B18481819131010111B
+172524181A111001090F111B174A171A121010111B1748191A120F010810111C1748181A
+121010111B1847181A1310FCF604F5FB0B8D03DBFC258C02C3FD3D00000700C800460A21
+053B0015002B00410057005B005F00630000013437363736321716171614070607062322
+272627260034373637363332171617161514070607062227262724343736373632171617
+161514070607062322272627013437363736333217161716140706070622272627260111
+21112711211125113311062710111A1848181A121010101C17242518191210021210111B
+1724251819121010111A1848181A12FDDE10111A1848181A121010101C17242518191202
+0210111B1724251819121010111A1848181A1210F88F09598DF7C103D98D03CC24181A11
+1010101B174A1719131010111B17FDE94A1719131010111B172524181A111010101B174A
+1719131010111B172524181A111010101B025324181A111010101B174A1719131010111B
+17FC9F04F5FB0B8D03DBFC258C02C3FD3D000000000800C800460A21053B0015002B0041
+0057006E00720076007A0000013437363736321716171614070607062322272627260034
+373637363332171617161514070607062227262724343736373632171617161514070607
+062322272627013437363736333217161716140706070622272627260534373637363332
+171617161514070607062227262726011121112711211125113311062710111A1848181A
+121010101C17242518191210021210111B1724251819121010111A1848181A12FDDE1011
+1A1848181A121010101C172425181912020210111B1724251819121010111A1848181A12
+10FEF710111A172624181A111010111A184918191210F99809598DF7C103D98D03CC2418
+1A111010101B174A1719131010111B17FDE94A1719131010111B172524181A111010101B
+174A1719131010111B172524181A111010101B025324181A111010101B174A1719131010
+111B17E424171A121010101C1724251819121010111A18FDA804F5FB0B8D03DBFC258C02
+C3FD3D00000900C800460A21053B0014002A004000550069007F00830087008B00000122
+272627263437363736321716171614070607060322272627263534373637363217161716
+140706070620222726272634373637363332171617161714070607002227262726273437
+36373632171617161407060702222726272E013736373632171617161407060700222726
+272635343736373633321716171E0107060701112111271121112511331107A424171A13
+1010111C1748181A121010111B172524171A131010111C1748181A121010111B17FECD4A
+1819121010111A172624171A11100111111A02554A161A12100111111B1748181A120F0F
+111B174A161A12100111111B1748181A120F0F111BFD7E4A1819121010111A172624171A
+11100111111AFA1C09598DF7C103D98D035210111C1748181A120F0F111B174A161A1310
+FDEF10111B172524171A131010111C1748181A121010111B1847181A131010111C172424
+181A12020210111B172524181A111010101B1848181913FDDE10111B1847181A13101011
+1C1748181A12020210111B172524181A111010101B1848181913FCE304F5FB0B8D03DBFC
+258C02C3FD3D0000000400C800460A21053B00150019001D002100000134373637363217
+161716151407060706222726272601112111271121112511331102CA10111A174A181912
+1010111A1848191A1110FDFE09598DF7C103D98D02C324171A121010101C172425181912
+1010111A18FDA804F5FB0B8D03DBFC258C02C3FD3D000000000500C800460A21053B0015
+002C00300034003800000134373637363217161716151407060706222726272625343736
+3736333217161716151407060706222726272601112111271121112511331102CC10101B
+174A1719131010111B1848181A1110046410111A172624181A111010111A184918191210
+F99809598DF7C103D98D02C324171A121010101C1724251819121010111A182524171A12
+1010101C1724251819121010111A18FDA804F5FB0B8D03DBFC258C02C3FD3D00000600C8
+00460A21053B0015002C00420046004A004E000001343736373632171617161514070607
+062227262726012227262726343736373633321716171615140706070601222726272634
+37363736333217161716140706070601112111271121112511331102CA10111A174A1819
+121010111A1848191A111005E724171A121010101C1724251819121010111A18FDC52418
+1A120F0F111B172524181A121010111B17FA0809598DF7C103D98D02C324171A12101010
+1C1724251819121010111A18FEA110101B18481819131010111B172524181A1110021110
+111C1748181A121010111B1847181A1310FCF604F5FB0B8D03DBFC258C02C3FD3D000000
+000700C800460A21053B0015002C00410057005B005F0063000001343736373632171617
+161514070607062227262726012227262726343736373633321716171615140706070601
+222726272634373637363217161716140706070601222726272634373637363332171617
+16140706070601112111271121112511331102CA10111A174A1819121010111A1848191A
+111005E724171A121010101C1724251819121010111A18FECE24171A131010111C174818
+1A121010111B17FED224181A120F0F111B172524181A121010111B17FA0809598DF7C103
+D98D02C324171A121010101C1724251819121010111A18FEA110101B1848181913101011
+1B172524181A111001090F111B174A171A121010111B1748191A120F010810111C174818
+1A121010111B1847181A1310FCF604F5FB0B8D03DBFC258C02C3FD3D000800C800460A21
+053B0015002B00410057006D007100750079000001343736373632171617161514070607
+062227262726013437363736321716171614070607062322272627260034373637363332
+171617161514070607062227262724343736373632171617161514070607062322272627
+0134373637363332171617161407060706222726272601112111271121112511331102CA
+10111A174A1819121010111A1848191A1110035D10111A1848181A121010101C17242518
+191210021210111B1724251819121010111A1848181A12FDDE10111A1848181A12101010
+1C172425181912020210111B1724251819121010111A1848181A1210F88F09598DF7C103
+D98D02C324171A121010101C1724251819121010111A18012E24181A111010101B174A17
+19131010111B17FDE94A1719131010111B172524181A111010101B174A1719131010111B
+172524181A111010101B025324181A111010101B174A1719131010111B17FC9F04F5FB0B
+8D03DBFC258C02C3FD3D0000000900C800460A21053B0015002B00410057006D00840088
+008C00900000013437363736321716171615140706070622272627260134373637363217
+161716140706070623222726272600343736373633321716171615140706070622272627
+243437363736321716171615140706070623222726270134373637363332171617161407
+060706222726272605343736373633321716171615140706070622272627260111211127
+1121112511331102CA10111A174A1819121010111A1848191A1110035D10111A1848181A
+121010101C17242518191210021210111B1724251819121010111A1848181A12FDDE1011
+1A1848181A121010101C172425181912020210111B1724251819121010111A1848181A12
+10FEF710111A172624181A111010111A184918191210F99809598DF7C103D98D02C32417
+1A121010101C1724251819121010111A18012E24181A111010101B174A1719131010111B
+17FDE94A1719131010111B172524181A111010101B174A1719131010111B172524181A11
+1010101B025324181A111010101B174A1719131010111B17E424171A121010101C172425
+1819121010111A18FDA804F5FB0B8D03DBFC258C02C3FD3D00><000A00C800460A21053B
+0015002A00400056006B007F00950099009D00A100000134373637363217161716151407
+060706222726272625222726272634373637363217161716140706070603222726272635
+343736373632171617161407060706202227262726343736373633321716171617140706
+0700222726272627343736373632171617161407060702222726272E0137363736321716
+17161407060700222726272635343736373633321716171E010706070111211127112111
+2511331102CA10111A174A1819121010111A1848191A111004DA24171A131010111C1748
+181A121010111B172524171A131010111C1748181A121010111B17FECD4A181912101011
+1A172624171A11100111111A02554A161A12100111111B1748181A120F0F111B174A161A
+12100111111B1748181A120F0F111BFD7E4A1819121010111A172624171A11100111111A
+FA1C09598DF7C103D98D02C324171A121010101C1724251819121010111A18B410111C17
+48181A120F0F111B174A161A1310FDEF10111B172524171A131010111C1748181A121010
+111B1847181A131010111C172424181A12020210111B172524181A111010101B18481819
+13FDDE10111B1847181A131010111C1748181A12020210111B172524181A111010101B18
+48181913FCE304F5FB0B8D03DBFC258C02C3FD3D0000000500C800460A21053B0015002B
+002F00330037000000222726272634373637363332171617161514070607012227262726
+3534373637363217161716140706070601112111271121112511331104724A1719131010
+111B172524181A111010111AFDAD24181A111010101B174A1719131010111B17FE6D0959
+8DF7C103D98D014010111A1848181A121010111B172425181912020210111B1724251819
+121010111A1848181A1210FCF404F5FB0B8D03DBFC258C02C3FD3D000000000600C80046
+0A21053B0016001A001E00220038004E0000013437363736333217161716151407060706
+222726272601112111271121112511331104222726272634373637363332171617161514
+07060701222726272635343736373632171617161407060706073010111A172624181A11
+1010111A184918191210F99809598DF7C103D98DFEB74A1719131010111B172524181A11
+1010111AFDAD24181A111010101B174A1719131010111B1702C324171A121010101C1724
+251819121010111A18FDA804F5FB0B8D03DBFC258C02C3FD3D1F10111A1848181A121010
+111B172425181912020210111B1724251819121010111A1848181A121000000700C80046
+0A21053B0016002C003000340038004E0064000001222726272634373637363332171617
+161514070607060122272627263437363736333217161716140706070601112111271121
+112511331104222726272634373637363332171617161514070607012227262726353437
+3637363217161716140706070608B124171A121010101C1724251819121010111A18FDC5
+24181A120F0F111B172524181A121010111B17FA0809598DF7C103D98DFEB74A17191310
+10111B172524181A111010111AFDAD24181A111010101B174A1719131010111B17013F10
+101B18481819131010111B172524181A1110021110111C1748181A121010111B1847181A
+1310FCF604F5FB0B8D03DBFC258C02C3FD3D1F10111A1848181A121010111B1724251819
+12020210111B1724251819121010111A1848181A1210000800C800460A21053B0016002B
+004100450049004D00630079000001222726272634373637363332171617161514070607
+060122272627263437363736321716171614070607060122272627263437363736333217
+161716140706070601112111271121112511331104222726272634373637363332171617
+1615140706070122272627263534373637363217161716140706070608B124171A121010
+101C1724251819121010111A18FECE24171A131010111C1748181A121010111B17FED224
+181A120F0F111B172524181A121010111B17FA0809598DF7C103D98DFEB74A1719131010
+111B172524181A111010111AFDAD24181A111010101B174A1719131010111B17013F1010
+1B18481819131010111B172524181A111001090F111B174A171A121010111B1748191A12
+0F010810111C1748181A121010111B1847181A1310FCF604F5FB0B8D03DBFC258C02C3FD
+3D1F10111A1848181A121010111B172425181912020210111B1724251819121010111A18
+48181A121000000900C800460A21053B00140029003E00530057005B005F007400890000
+013437363736321716171614070607062227262726003437363736321716171615140706
+070622272627243437363736321716171615140706070622272627013437363736321716
+171614070607062227262726011121112711211125113311042227262726343736373633
+321716171614070607012227262726343736373632171617161407060706062710111A18
+48181A121010101C174918191210021210111B17491819121010111A1848181A12FDDE10
+111A1848181A121010101C1749181912020210111B17491819121010111A1848181A1210
+F88F09598DF7C103D98DFEB7491819131010111B172524181A111010111AFDAD24181A11
+1010101B17491819131010111B1703CC24181A111010101B17491819131010111B17FDE9
+491819131010111B172524181A111010101B17491819131010111B172524181A11101010
+1B025324181A111010101B17491819131010111B17FC9F04F5FB0B8D03DBFC258C02C3FD
+3D1F10111A1848181A121010111B1749181912020210111B17491819121010111A184818
+1A1210000000000A00C800460A21053B0015002B00410057006E00720076007A009000A6
+000001343736373632171617161407060706232227262726003437363736333217161716
+151407060706222726272434373637363217161716151407060706232227262701343736
+373633321716171614070607062227262726053437363736333217161716151407060706
+222726272601112111271121112511331104222726272634373637363332171617161514
+07060701222726272635343736373632171617161407060706062710111A1848181A1210
+10101C17242518191210021210111B1724251819121010111A1848181A12FDDE10111A18
+48181A121010101C172425181912020210111B1724251819121010111A1848181A1210FE
+F710111A172624181A111010111A184918191210F99809598DF7C103D98DFEB74A171913
+1010111B172524181A111010111AFDAD24181A111010101B174A1719131010111B1703CC
+24181A111010101B174A1719131010111B17FDE94A1719131010111B172524181A111010
+101B174A1719131010111B172524181A111010101B025324181A111010101B174A171913
+1010111B17E424171A121010101C1724251819121010111A18FDA804F5FB0B8D03DBFC25
+8C02C3FD3D1F10111A1848181A121010111B172425181912020210111B17242518191210
+10111A1848181A121000000B00C800460A21053B0014002A004000550069007F00830087
+008B00A100B7000001222726272634373637363217161716140706070603222726272635
+343736373632171617161407060706202227262726343736373633321716171617140706
+0700222726272627343736373632171617161407060702222726272E0137363736321716
+17161407060700222726272635343736373633321716171E010706070111211127112111
+251133110422272627263437363736333217161716151407060701222726272635343736
+37363217161716140706070607A424171A131010111C1748181A121010111B172524171A
+131010111C1748181A121010111B17FECD4A1819121010111A172624171A11100111111A
+02554A161A12100111111B1748181A120F0F111B174A161A12100111111B1748181A120F
+0F111BFD7E4A1819121010111A172624171A11100111111AFA1C09598DF7C103D98DFEB7
+4A1719131010111B172524181A111010111AFDAD24181A111010101B174A171913101011
+1B17035210111C1748181A120F0F111B174A161A1310FDEF10111B172524171A13101011
+1C1748181A121010111B1847181A131010111C172424181A12020210111B172524181A11
+1010101B1848181913FDDE10111B1847181A131010111C1748181A12020210111B172524
+181A111010101B1848181913FCE304F5FB0B8D03DBFC258C02C3FD3D1F10111A1848181A
+121010111B172425181912020210111B1724251819121010111A1848181A121000000006
+00C800460A21053B0015002B004100450049004D00000022272627263437363736333217
+161716151407060725222726272634373637363332171617161407060706012227262726
+3534373637363217161716140706070601112111271121112511331104724A1719131010
+111B172524181A111010111AFEB624171A121010101C1724251819121010111A18FED224
+181A111010101B174A1719131010111B17FE6D09598DF7C103D98D014010111A1848181A
+121010111B172425181912F910111A174A181A111010111A184918191210010910111B17
+24251819121010111A1848181A1210FCF404F5FB0B8D03DBFC258C02C3FD3D0000000007
+00C800460A21053B0015002B00410058005C006000640000002227262726343736373633
+321716171615140706072522272627263437363736333217161716140706070601222726
+272635343736373632171617161407060706053437363736333217161716151407060706
+222726272601112111271121112511331104724A1719131010111B172524181A11101011
+1AFEB624171A121010101C1724251819121010111A18FED224181A111010101B174A1719
+131010111B1704D510111A172624181A111010111A184918191210F99809598DF7C103D9
+8D014010111A1848181A121010111B172425181912F910111A174A181A111010111A1849
+18191210010910111B1724251819121010111A1848181A12108F24171A121010101C1724
+251819121010111A18FDA804F5FB0B8D03DBFC258C02C3FD3D00000800C800460A21053B
+0015002B00410058006E00720076007A0000002227262726343736373633321716171615
+140706072522272627263437363736333217161716140706070601222726272635343736
+373632171617161407060706012227262726343736373633321716171615140706070601
+22272627263437363736333217161716140706070601112111271121112511331104724A
+1719131010111B172524181A111010111AFEB624171A121010101C172425181912101011
+1A18FED224181A111010101B174A1719131010111B17065624171A121010101C17242518
+19121010111A18FDC524181A120F0F111B172524181A121010111B17FA0809598DF7C103
+D98D014010111A1848181A121010111B172425181912F910111A174A181A111010111A18
+4918191210010910111B1724251819121010111A1848181A1210FDED10101B1848181913
+1010111B172524181A1110021110111C1748181A121010111B1847181A1310FCF604F5FB
+0B8D03DBFC258C02C3FD3D000000000900C800460A21053B0015002B00410058006D0083
+0087008B008F000000222726272634373637363332171617161514070607252227262726
+343736373633321716171614070607060122272627263534373637363217161716140706
+070601222726272634373637363332171617161514070607060122272627263437363736
+321716171614070607060122272627263437363736333217161716140706070601112111
+271121112511331104724A1719131010111B172524181A111010111AFEB624171A121010
+101C1724251819121010111A18FED224181A111010101B174A1719131010111B17065624
+171A121010101C1724251819121010111A18FECE24171A131010111C1748181A12101011
+1B17FED224181A120F0F111B172524181A121010111B17FA0809598DF7C103D98D014010
+111A1848181A121010111B172425181912F910111A174A181A111010111A184918191210
+010910111B1724251819121010111A1848181A1210FDED10101B18481819131010111B17
+2524181A111001090F111B174A171A121010111B1748191A120F010810111C1748181A12
+1010111B1847181A1310FCF604F5FB0B8D03DBFC258C02C3FD3D000A00C800460A21053B
+0015002B00410057006D00830099009D00A100A500000022272627263437363736333217
+161716151407060725222726272634373637363332171617161407060706012227262726
+353437363736321716171614070607062534373637363217161716140706070623222726
+272600343736373633321716171615140706070622272627243437363736321716171615
+140706070623222726270134373637363332171617161407060706222726272601112111
+271121112511331104724A1719131010111B172524181A111010111AFEB624171A121010
+101C1724251819121010111A18FED224181A111010101B174A1719131010111B1703CC10
+111A1848181A121010101C17242518191210021210111B1724251819121010111A184818
+1A12FDDE10111A1848181A121010101C172425181912020210111B172425181912101011
+1A1848181A1210F88F09598DF7C103D98D014010111A1848181A121010111B1724251819
+12F910111A174A181A111010111A184918191210010910111B1724251819121010111A18
+48181A12107A24181A111010101B174A1719131010111B17FDE94A1719131010111B1725
+24181A111010101B174A1719131010111B172524181A111010101B025324181A11101010
+1B174A1719131010111B17FC9F04F5FB0B8D03DBFC258C02C3FD3D000000000B00C80046
+0A21053B0015002B00410057006D0083009900B000B400B800BC00000022272627263437
+363736333217161716151407060725222726272634373637363332171617161407060706
+012227262726353437363736321716171614070607062534373637363217161716140706
+070623222726272600343736373633321716171615140706070622272627243437363736
+321716171615140706070623222726270134373637363332171617161407060706222726
+272605343736373633321716171615140706070622272627260111211127112111251133
+1104724A1719131010111B172524181A111010111AFEB624171A121010101C1724251819
+121010111A18FED224181A111010101B174A1719131010111B1703CC10111A1848181A12
+1010101C17242518191210021210111B1724251819121010111A1848181A12FDDE10111A
+1848181A121010101C172425181912020210111B1724251819121010111A1848181A1210
+FEF710111A172624181A111010111A184918191210F99809598DF7C103D98D014010111A
+1848181A121010111B172425181912F910111A174A181A111010111A1849181912100109
+10111B1724251819121010111A1848181A12107A24181A111010101B174A171913101011
+1B17FDE94A1719131010111B172524181A111010101B174A1719131010111B172524181A
+111010101B025324181A111010101B174A1719131010111B17E424171A121010101C1724
+251819121010111A18FDA804F5FB0B8D03DBFC258C02C3FD3D00000C00C800460A21053B
+0015002B00410056006C0082009700AB00C100C500C900CD000000222726272634373637
+363332171617161514070607252227262726343736373633321716171614070607060122
+272627263534373637363217161716140706070621222726272634373637363217161716
+140706070603222726272635343736373632171617161407060706202227262726343736
+373633321716171617140706070022272627262734373637363217161716140706070222
+2726272E013736373632171617161407060700222726272635343736373633321716171E
+0107060701112111271121112511331104724A1719131010111B172524181A111010111A
+FEB624171A121010101C1724251819121010111A18FED224181A111010101B174A171913
+1010111B17054924171A131010111C1748181A121010111B172524171A131010111C1748
+181A121010111B17FECD4A1819121010111A172624171A11100111111A02554A161A1210
+0111111B1748181A120F0F111B174A161A12100111111B1748181A120F0F111BFD7E4A18
+19121010111A172624171A11100111111AFA1C09598DF7C103D98D014010111A1848181A
+121010111B172425181912F910111A174A181A111010111A184918191210010910111B17
+24251819121010111A1848181A121010111C1748181A120F0F111B174A161A1310FDEF10
+111B172524171A131010111C1748181A121010111B1847181A131010111C172424181A12
+020210111B172524181A111010101B1848181913FDDE10111B1847181A131010111C1748
+181A12020210111B172524181A111010101B1848181913FCE304F5FB0B8D03DBFC258C02
+C3FD3D000000000700C800460A21053B00140029003E00530057005B005F000001343736
+373632171617161407060706222726272600343736373632171617161514070607062227
+262724343736373632171617161514070607062227262701343736373632171617161407
+060706222726272601112111271121112511331101C110111A1848181A121010111B1749
+18191210021210101C17491819121010111A1848181A12FDDE10111A1848181A12101011
+1B1749181912020210101C17491819121010111A1848181A1210FCF509598DF7C103D98D
+03CC24181A111010101B17491819131010111B17FDE9491819131010111B172524181A11
+1010101B17491819131010111B172524181A111010101B025324181A111010101B174918
+19131010111B17FC9F04F5FB0B8D03DBFC258C02C3FD3D000000000800C800460A21053B
+00150019001D00210036004B006000750000013437363736333217161716140706070622
+272627260111211127112111251133110134373637363217161716140706070622272627
+260034373637363217161716151407060706222726272434373637363217161716151407
+06070622272627013437363736321716171614070607062227262726073010111A172624
+181A111010111A184918191210F99809598DF7C103D98DFC0610111A1848181A12101011
+1B174918191210021210101C17491819121010111A1848181A12FDDE10111A1848181A12
+1010111B1749181912020210101C17491819121010111A1848181A121002C324171A1210
+10101C17491819121010111A18FDA804F5FB0B8D03DBFC258C02C3FD3D026D24181A1110
+10101B17491819131010111B17FDE9491819131010111B172524181A111010101B174918
+19131010111B172524181A111010101B025324181A111010101B17491819131010111B17
+0000000900C800460A21053B0016002C003000340038004E0064007A0090000001222726
+272634373637363332171617161514070607060122272627263437363736333217161716
+140706070601112111271121112511331101343736373632171617161407060706232227
+262726003437363736333217161716151407060706222726272434373637363217161716
+15140706070623222726270134373637363332171617161407060706222726272608B124
+171A121010101C1724251819121010111A18FDC524181A120F0F111B172524181A121010
+111B17FA0809598DF7C103D98DFC0610111A1848181A121010111B172425181912100212
+10101C1724251819121010111A1848181A12FDDE10111A1848181A121010111B17242518
+1912020210101C1724251819121010111A1848181A1210013F10101B1848181913101011
+1B172524181A1110021110111C1748181A121010111B1847181A1310FCF604F5FB0B8D03
+DBFC258C02C3FD3D026D24181A111010101B174A1719131010111B17FDE94A1719131010
+111B172524181A111010101B174A1719131010111B172524181A111010101B025324181A
+111010101B174A1719131010111B17000000000A00C800460A21053B0016002B00410045
+0049004D00630079008F00A5000001222726272634373637363332171617161514070607
+060122272627263437363736321716171614070607060122272627263437363736333217
+161716140706070601112111271121112511331101343736373632171617161407060706
+232227262726003437363736333217161716151407060706222726272434373637363217
+161716151407060706232227262701343736373633321716171614070607062227262726
+08B124171A121010101C1724251819121010111A18FECE24171A131010111C1748181A12
+1010111B17FED224181A120F0F111B172524181A121010111B17FA0809598DF7C103D98D
+FC0610111A1848181A121010111B17242518191210021210101C1724251819121010111A
+1848181A12FDDE10111A1848181A121010111B172425181912020210101C172425181912
+1010111A1848181A1210013F10101B18481819131010111B172524181A111001090F111B
+174A171A121010111B1748191A120F010810111C1748181A121010111B1847181A1310FC
+F604F5FB0B8D03DBFC258C02C3FD3D026D24181A111010101B174A1719131010111B17FD
+E94A1719131010111B172524181A111010101B174A1719131010111B172524181A111010
+101B025324181A111010101B174A1719131010111B17000B00C800460A21053B0015002B
+00410057005B005F00630079008F00A500BB000001343736373632171617161407060706
+232227262726003437363736333217161716151407060706222726272434373637363217
+161716151407060706232227262701343736373633321716171614070607062227262726
+011121112711211125113311013437363736321716171614070607062322272627260034
+373637363332171617161514070607062227262724343736373632171617161514070607
+06232227262701343736373633321716171614070607062227262726062710111A184818
+1A121010101C17242518191210021210111B1724251819121010111A1848181A12FDDE10
+111A1848181A121010101C172425181912020210111B1724251819121010111A1848181A
+1210F88F09598DF7C103D98DFC0610111A1848181A121010111B17242518191210021210
+101C1724251819121010111A1848181A12FDDE10111A1848181A121010111B1724251819
+12020210101C1724251819121010111A1848181A121003CC24181A111010101B174A1719
+131010111B17FDE94A1719131010111B172524181A111010101B174A1719131010111B17
+2524181A111010101B025324181A111010101B174A1719131010111B17FC9F04F5FB0B8D
+03DBFC258C02C3FD3D026D24181A111010101B174A1719131010111B17FDE94A17191310
+10111B172524181A111010101B174A1719131010111B172524181A111010101B02532418
+1A111010101B174A1719131010111B170000000C00C800460A21053B0015002B00410057
+006E00720076007A009000A600BC00D20000013437363736321716171614070607062322
+272627260034373637363332171617161514070607062227262724343736373632171617
+161514070607062322272627013437363736333217161716140706070622272627260534
+373637363332171617161514070607062227262726011121112711211125113311013437
+363736321716171614070607062322272627260034373637363332171617161514070607
+062227262724343736373632171617161514070607062322272627013437363736333217
+16171614070607062227262726062710111A1848181A121010101C172425181912100212
+10111B1724251819121010111A1848181A12FDDE10111A1848181A121010101C17242518
+1912020210111B1724251819121010111A1848181A1210FEF710111A172624181A111010
+111A184918191210F99809598DF7C103D98DFC0610111A1848181A121010111B17242518
+191210021210101C1724251819121010111A1848181A12FDDE10111A1848181A12101011
+1B172425181912020210101C1724251819121010111A1848181A121003CC24181A111010
+101B174A1719131010111B17FDE94A1719131010111B172524181A111010101B174A1719
+131010111B172524181A111010101B025324181A111010101B174A1719131010111B17E4
+24171A121010101C1724251819121010111A18FDA804F5FB0B8D03DBFC258C02C3FD3D02
+6D24181A111010101B174A1719131010111B17FDE94A1719131010111B172524181A1110
+10101B174A1719131010111B172524181A111010101B025324181A111010101B174A1719
+131010111B17000D00C800460A21053B0014002A004000550069007F00830087008B00A1
+00B700CD00E3000001222726272634373637363217161716140706070603222726272635
+343736373632171617161407060706202227262726343736373633321716171617140706
+0700222726272627343736373632171617161407060702222726272E0137363736321716
+17161407060700222726272635343736373633321716171E010706070111211127112111
+251133110134373637363217161716140706070623222726272600343736373633321716
+171615140706070622272627243437363736321716171615140706070623222726270134
+373637363332171617161407060706222726272607A424171A131010111C1748181A1210
+10111B172524171A131010111C1748181A121010111B17FECD4A1819121010111A172624
+171A11100111111A02554A161A12100111111B1748181A120F0F111B174A161A12100111
+111B1748181A120F0F111BFD7E4A1819121010111A172624171A11100111111AFA1C0959
+8DF7C103D98DFC0610111A1848181A121010111B17242518191210021210101C17242518
+19121010111A1848181A12FDDE10111A1848181A121010111B172425181912020210101C
+1724251819121010111A1848181A1210035210111C1748181A120F0F111B174A161A1310
+FDEF10111B172524171A131010111C1748181A121010111B1847181A131010111C172424
+181A12020210111B172524181A111010101B1848181913FDDE10111B1847181A13101011
+1C1748181A12020210111B172524181A111010101B1848181913FCE304F5FB0B8D03DBFC
+258C02C3FD3D026D24181A111010101B174A1719131010111B17FDE94A1719131010111B
+172524181A111010101B174A1719131010111B172524181A111010101B025324181A1110
+10101B174A1719131010111B1700000800C800460A21053B00030007000B00210037004D
+006300790000371121112711211125113311013437363736321716171614070607062322
+272627260034373637363332171617161514070607062227262724343736373632171617
+161514070607062322272627013437363736333217161716140706070622272627260534
+3736373632171617161514070607062227262726C809598DF7C103D98DFC0610111A1848
+181A121010111B17242518191210021210101C1724251819121010111A1848181A12FDDE
+10111A1848181A121010111B172425181912020210101C1724251819121010111A184818
+1A1210FEF710111A174A1819121010111A1848191A11104604F5FB0B8D03DBFC258C02C3
+FD3D026D24181A111010101B174A1719131010111B17FDE94A1719131010111B17252418
+1A111010101B174A1719131010111B172524181A111010101B025324181A111010101B17
+4A1719131010111B17E424171A121010101C1724251819121010111A1800000900C80046
+0A21053B0016001A001E00220038004E0064007A00900000013437363736333217161716
+151407060706222726272601112111271121112511331101343736373632171617161407
+060706232227262726003437363736333217161716151407060706222726272434373637
+363217161716151407060706232227262701343736373633321716171614070607062227
+26272605343736373632171617161514070607062227262726073010111A172624181A11
+1010111A184918191210F99809598DF7C103D98DFC0610111A1848181A121010111B1724
+2518191210021210101C1724251819121010111A1848181A12FDDE10111A1848181A1210
+10111B172425181912020210101C1724251819121010111A1848181A1210FEF710111A17
+4A1819121010111A1848191A111002C324171A121010101C1724251819121010111A18FD
+A804F5FB0B8D03DBFC258C02C3FD3D026D24181A111010101B174A1719131010111B17FD
+E94A1719131010111B172524181A111010101B174A1719131010111B172524181A111010
+101B025324181A111010101B174A1719131010111B17E424171A121010101C1724251819
+121010111A18000A00C800460A21053B0016002C003000340038004E0064007A009000A6
+000001222726272634373637363332171617161514070607060122272627263437363736
+333217161716140706070601112111271121112511331101343736373632171617161407
+060706232227262726003437363736333217161716151407060706222726272434373637
+363217161716151407060706232227262701343736373633321716171614070607062227
+2627260534373637363217161716151407060706222726272608B124171A121010101C17
+24251819121010111A18FDC524181A120F0F111B172524181A121010111B17FA0809598D
+F7C103D98DFC0610111A1848181A121010111B17242518191210021210101C1724251819
+121010111A1848181A12FDDE10111A1848181A121010111B172425181912020210101C17
+24251819121010111A1848181A1210FEF710111A174A1819121010111A1848191A111001
+3F10101B18481819131010111B172524181A1110021110111C1748181A121010111B1847
+181A1310FCF604F5FB0B8D03DBFC258C02C3FD3D026D24181A111010101B174A17191310
+10111B17FDE94A1719131010111B172524181A111010101B174A1719131010111B172524
+181A111010101B025324181A111010101B174A1719131010111B17E424171A121010101C
+1724251819121010111A18000000000B00C800460A21053B0016002B004100450049004D
+00630079008F00A500BB0000012227262726343736373633321716171615140706070601
+222726272634373637363217161716140706070601222726272634373637363332171617
+161407060706011121112711211125113311013437363736321716171614070607062322
+272627260034373637363332171617161514070607062227262724343736373632171617
+161514070607062322272627013437363736333217161716140706070622272627260534
+373637363217161716151407060706222726272608B124171A121010101C172425181912
+1010111A18FECE24171A131010111C1748181A121010111B17FED224181A120F0F111B17
+2524181A121010111B17FA0809598DF7C103D98DFC0610111A1848181A121010111B1724
+2518191210021210101C1724251819121010111A1848181A12FDDE10111A1848181A1210
+10111B172425181912020210101C1724251819121010111A1848181A1210FEF710111A17
+4A1819121010111A1848191A1110013F10101B18481819131010111B172524181A111001
+090F111B174A171A121010111B1748191A120F010810111C1748181A121010111B184718
+1A1310FCF604F5FB0B8D03DBFC258C02C3FD3D026D24181A111010101B174A1719131010
+111B17FDE94A1719131010111B172524181A111010101B174A1719131010111B17252418
+1A111010101B025324181A111010101B174A1719131010111B17E424171A121010101C17
+24251819121010111A18000C00C800460A21053B0015002B00410057005B005F00630079
+008F00A500BB00D100000134373637363217161716140706070623222726272600343736
+373633321716171615140706070622272627243437363736321716171615140706070623
+222726270134373637363332171617161407060706222726272601112111271121112511
+331101343736373632171617161407060706232227262726003437363736333217161716
+151407060706222726272434373637363217161716151407060706232227262701343736
+373633321716171614070607062227262726053437363736321716171615140706070622
+27262726062710111A1848181A121010101C17242518191210021210111B172425181912
+1010111A1848181A12FDDE10111A1848181A121010101C172425181912020210111B1724
+251819121010111A1848181A1210F88F09598DF7C103D98DFC0610111A1848181A121010
+111B17242518191210021210101C1724251819121010111A1848181A12FDDE10111A1848
+181A121010111B172425181912020210101C1724251819121010111A1848181A1210FEF7
+10111A174A1819121010111A1848191A111003CC24181A111010101B174A171913101011
+1B17FDE94A1719131010111B172524181A111010101B174A1719131010111B172524181A
+111010101B025324181A111010101B174A1719131010111B17FC9F04F5FB0B8D03DBFC25
+8C02C3FD3D026D24181A111010101B174A1719131010111B17FDE94A1719131010111B17
+2524181A111010101B174A1719131010111B172524181A111010101B025324181A111010
+101B174A1719131010111B17E424171A121010101C1724251819121010111A180000000D
+00C800460A21053B0015002B00410057006E00720076007A009000A600BC00D200E80000
+013437363736321716171614070607062322272627260034373637363332171617161514
+070607062227262724343736373632171617161514070607062322272627013437363736
+333217161716140706070622272627260534373637363332171617161514070607062227
+262726011121112711211125113311013437363736321716171614070607062322272627
+260034373637363332171617161514070607062227262724343736373632171617161514
+070607062322272627013437363736333217161716140706070622272627260534373637
+3632171617161514070607062227262726062710111A1848181A121010101C1724251819
+1210021210111B1724251819121010111A1848181A12FDDE10111A1848181A121010101C
+172425181912020210111B1724251819121010111A1848181A1210FEF710111A17262418
+1A111010111A184918191210F99809598DF7C103D98DFC0610111A1848181A121010111B
+17242518191210021210101C1724251819121010111A1848181A12FDDE10111A1848181A
+121010111B172425181912020210101C1724251819121010111A1848181A1210FEF71011
+1A174A1819121010111A1848191A111003CC24181A111010101B174A1719131010111B17
+FDE94A1719131010111B172524181A111010101B174A1719131010111B172524181A1110
+10101B025324181A111010101B174A1719131010111B17E424171A121010101C17242518
+19121010111A18FDA804F5FB0B8D03DBFC258C02C3FD3D026D24181A111010101B174A17
+19131010111B17FDE94A1719131010111B172524181A111010101B174A1719131010111B
+172524181A111010101B025324181A111010101B174A1719131010111B17E424171A1210
+10101C1724251819121010111A18000E00C800460A21053B0014002A004000550069007F
+00830087008B00A100B700CD00E300F90000012227262726343736373632171617161407
+060706032227262726353437363736321716171614070607062022272627263437363736
+333217161716171407060700222726272627343736373632171617161407060702222726
+272E013736373632171617161407060700222726272635343736373633321716171E0107
+060701112111271121112511331101343736373632171617161407060706232227262726
+003437363736333217161716151407060706222726272434373637363217161716151407
+060706232227262701343736373633321716171614070607062227262726053437363736
+3217161716151407060706222726272607A424171A131010111C1748181A121010111B17
+2524171A131010111C1748181A121010111B17FECD4A1819121010111A172624171A1110
+0111111A02554A161A12100111111B1748181A120F0F111B174A161A12100111111B1748
+181A120F0F111BFD7E4A1819121010111A172624171A11100111111AFA1C09598DF7C103
+D98DFC0610111A1848181A121010111B17242518191210021210101C1724251819121010
+111A1848181A12FDDE10111A1848181A121010111B172425181912020210101C17242518
+19121010111A1848181A1210FEF710111A174A1819121010111A1848191A111003521011
+1C1748181A120F0F111B174A161A1310FDEF10111B172524171A131010111C1748181A12
+1010111B1847181A131010111C172424181A12020210111B172524181A111010101B1848
+181913FDDE10111B1847181A131010111C1748181A12020210111B172524181A11101010
+1B1848181913FCE304F5FB0B8D03DBFC258C02C3FD3D026D24181A111010101B174A1719
+131010111B17FDE94A1719131010111B172524181A111010101B174A1719131010111B17
+2524181A111010101B025324181A111010101B174A1719131010111B17E424171A121010
+101C1724251819121010111A1800000900C800460A21053B00030007000B0022003A0050
+0066007C0092000037112111271121112511331101222726272635343736373633321716
+171614070607060322272627263534373637363332171617161514070607062022272627
+263437363736333217161716171407060701222726272627343736373632171617161407
+06070603222726272E013736373632171617161514070607060022272627263534373637
+3633321716171E01070607C809598DF7C103D98DFD8424171A121010101C172425181912
+1010111A182524171A121010101C1724251819121010111A18FECD4A171A121010111B17
+2524171A11100111101B023024171A12100111111B1748181A121010111B172524171A12
+100111111B1748181A121010111B17FD954A171A121010111B172524171A11100111101B
+4604F5FB0B8D03DBFC258C02C3FD3D01F210111B172524181A111010111A174A17191310
+FDEF10111A172624171A121010111B1724251819121010111A1848181A121010111B1724
+25181912020210111B1724251819121010111A1848181A1210FDEE10111A1848181A1210
+10111B17242518191210021210111B1724251819121010111A1848181A12000A00C80046
+0A21053B0016001A001E0022003900510067007D009300A9000001343736373633321716
+171615140706070622272627260111211127112111251133110122272627263534373637
+363332171617161407060706032227262726353437363736333217161716151407060706
+202227262726343736373633321716171617140706070122272627262734373637363217
+161716140706070603222726272E01373637363217161716151407060706002227262726
+35343736373633321716171E01070607073010111A172624181A111010111A1849181912
+10F99809598DF7C103D98DFD8424171A121010101C1724251819121010111A182524171A
+121010101C1724251819121010111A18FECD4A171A121010111B172524171A1110011110
+1B023024171A12100111111B1748181A121010111B172524171A12100111111B1748181A
+121010111B17FD954A171A121010111B172524171A11100111101B02C324171A12101010
+1C1724251819121010111A18FDA804F5FB0B8D03DBFC258C02C3FD3D01F210111B172524
+181A111010111A174A17191310FDEF10111A172624171A121010111B1724251819121010
+111A1848181A121010111B172425181912020210111B1724251819121010111A1848181A
+1210FDEE10111A1848181A121010111B17242518191210021210111B1724251819121010
+111A1848181A12000000000B00C800460A21053B0016002C003000340038004F0067007D
+009300A900BF000001222726272634373637363332171617161514070607060122272627
+263437363736333217161716140706070601112111271121112511331101222726272635
+343736373633321716171614070607060322272627263534373637363332171617161514
+070607062022272627263437363736333217161716171407060701222726272627343736
+37363217161716140706070603222726272E013736373632171617161514070607060022
+2726272635343736373633321716171E0107060708B124171A121010101C172425181912
+1010111A18FDC524181A120F0F111B172524181A121010111B17FA0809598DF7C103D98D
+FD8424171A121010101C1724251819121010111A182524171A121010101C172425181912
+1010111A18FECD4A171A121010111B172524171A11100111101B023024171A1210011111
+1B1748181A121010111B172524171A12100111111B1748181A121010111B17FD954A171A
+121010111B172524171A11100111101B013F10101B18481819131010111B172524181A11
+10021110111C1748181A121010111B1847181A1310FCF604F5FB0B8D03DBFC258C02C3FD
+3D01F210111B172524181A111010111A174A17191310FDEF10111A172624171A12101011
+1B1724251819121010111A1848181A121010111B172425181912020210111B1724251819
+121010111A1848181A1210FDEE10111A1848181A121010111B1724251819121002121011
+1B1724251819121010111A1848181A120000000C00C800460A21053B0016002B00410045
+0049004D0064007C009200A800BE00D40000012227262726343736373633321716171615
+140706070601222726272634373637363217161716140706070601222726272634373637
+363332171617161407060706011121112711211125113311012227262726353437363736
+333217161716140706070603222726272635343736373633321716171615140706070620
+222726272634373637363332171617161714070607012227262726273437363736321716
+1716140706070603222726272E0137363736321716171615140706070600222726272635
+343736373633321716171E0107060708B124171A121010101C1724251819121010111A18
+FECE24171A131010111C1748181A121010111B17FED224181A120F0F111B172524181A12
+1010111B17FA0809598DF7C103D98DFD8424171A121010101C1724251819121010111A18
+2524171A121010101C1724251819121010111A18FECD4A171A121010111B172524171A11
+100111101B023024171A12100111111B1748181A121010111B172524171A12100111111B
+1748181A121010111B17FD954A171A121010111B172524171A11100111101B013F10101B
+18481819131010111B172524181A111001090F111B174A171A121010111B1748191A120F
+010810111C1748181A121010111B1847181A1310FCF604F5FB0B8D03DBFC258C02C3FD3D
+01F210111B172524181A111010111A174A17191310FDEF10111A172624171A121010111B
+1724251819121010111A1848181A121010111B172425181912020210111B172425181912
+1010111A1848181A1210FDEE10111A1848181A121010111B17242518191210021210111B
+1724251819121010111A1848181A12000000000D00C800460A21053B0015002B00410057
+005B005F0063007A009200A800BE00D400EA000001343736373632171617161407060706
+232227262726003437363736333217161716151407060706222726272434373637363217
+161716151407060706232227262701343736373633321716171614070607062227262726
+011121112711211125113311012227262726353437363736333217161716140706070603
+222726272635343736373633321716171615140706070620222726272634373637363332
+171617161714070607012227262726273437363736321716171614070607060322272627
+2E0137363736321716171615140706070600222726272635343736373633321716171E01
+070607062710111A1848181A121010101C17242518191210021210111B17242518191210
+10111A1848181A12FDDE10111A1848181A121010101C172425181912020210111B172425
+1819121010111A1848181A1210F88F09598DF7C103D98DFD8424171A121010101C172425
+1819121010111A182524171A121010101C1724251819121010111A18FECD4A171A121010
+111B172524171A11100111101B023024171A12100111111B1748181A121010111B172524
+171A12100111111B1748181A121010111B17FD954A171A121010111B172524171A111001
+11101B03CC24181A111010101B174A1719131010111B17FDE94A1719131010111B172524
+181A111010101B174A1719131010111B172524181A111010101B025324181A111010101B
+174A1719131010111B17FC9F04F5FB0B8D03DBFC258C02C3FD3D01F210111B172524181A
+111010111A174A17191310FDEF10111A172624171A121010111B1724251819121010111A
+1848181A121010111B172425181912020210111B1724251819121010111A1848181A1210
+FDEE10111A1848181A121010111B17242518191210021210111B1724251819121010111A
+1848181A1200000E00C800460A21053B0015002B00410057006E00720076007A009100A9
+00BF00D500EB010100000134373637363217161716140706070623222726272600343736
+373633321716171615140706070622272627243437363736321716171615140706070623
+222726270134373637363332171617161407060706222726272605343736373633321716
+171615140706070622272627260111211127112111251133110122272627263534373637
+363332171617161407060706032227262726353437363736333217161716151407060706
+202227262726343736373633321716171617140706070122272627262734373637363217
+161716140706070603222726272E01373637363217161716151407060706002227262726
+35343736373633321716171E01070607062710111A1848181A121010101C172425181912
+10021210111B1724251819121010111A1848181A12FDDE10111A1848181A121010101C17
+2425181912020210111B1724251819121010111A1848181A1210FEF710111A172624181A
+111010111A184918191210F99809598DF7C103D98DFD8424171A121010101C1724251819
+121010111A182524171A121010101C1724251819121010111A18FECD4A171A121010111B
+172524171A11100111101B023024171A12100111111B1748181A121010111B172524171A
+12100111111B1748181A121010111B17FD954A171A121010111B172524171A1110011110
+1B03CC24181A111010101B174A1719131010111B17FDE94A1719131010111B172524181A
+111010101B174A1719131010111B172524181A111010101B025324181A111010101B174A
+1719131010111B17E424171A121010101C1724251819121010111A18FDA804F5FB0B8D03
+DBFC258C02C3FD3D01F210111B172524181A111010111A174A17191310FDEF10111A1726
+24171A121010111B1724251819121010111A1848181A121010111B172425181912020210
+111B1724251819121010111A1848181A1210FDEE10111A1848181A121010111B17242518
+191210021210111B1724251819121010111A1848181A12000000000F00C800460A21053B
+0014002A004000550069007F00830087008B00A100B700CC00E100F6010B000001222726
+272634373637363217161716140706070603222726272635343736373632171617161407
+060706202227262726343736373633321716171617140706070022272627262734373637
+3632171617161407060702222726272E0137363736321716171614070607002227262726
+35343736373633321716171E010706070111211127112111251133110122272627263534
+373637363217161716140706070603222726272635343736373632171617161407060706
+202227262726343736373633321716171E0107060701222726272E013736373632171617
+16140706070603222726272E013736373632171617161407060706002227262726343736
+373633321716171E0107060707A424171A131010111C1748181A121010111B172524171A
+131010111C1748181A121010111B17FECC491819121010111A172624171A11100111111A
+025549171A12100111111B1748181A120F0F111B1749171A12100111111B1748181A120F
+0F111BFD7D491819121010111A172624171A11100111111AFA1C09598DF7C103D98DFD84
+24171A121010101C17491819121010111A182524171A121010101C17491819121010111A
+18FECC49171A121010111B172524171A11100111101B023024171A12100111111B174818
+1A121010111B172524171A12100111111B1748181A121010111B17FD9449171A12101011
+1B172524171A11100111101B035210111C1748181A120F0F111B1749171A1310FDEF1011
+1B172524171A131010111C1748181A121010111B1847181A131010111C172424181A1202
+0210111B172524181A111010101B1848181913FDDE10111B1847181A131010111C174818
+1A12020210111B172524181A111010101B1848181913FCE304F5FB0B8D03DBFC258C02C3
+FD3D01F210111B172524181A111010111A174918191310FDEF10111A172624171A121010
+111B17491819121010111A1848181A121010111B1749181912020210111B174918191210
+10111A1848181A1210FDEE10111A1848181A121010111B174918191210021210111B1749
+1819121010111A1848181A120000000200C8FE1405BD076D000300070000011521350121
+112101E102C3FC2404F5FB0B03078D8D0466F6A70000000300C8FE1405BD076D00030007
+000B0000132111213721112113211521C804F5FB0B8D03DBFC258C02C3FD3D076DF6A78D
+083FFC278D00000400C8FE1405BD076D0016001A001E0022000001321716171615140706
+07062322272627263437363736012111213721112113211521034524171A121010101C17
+24251819121010111A18FDA804F5FB0B8D03DBFC258C02C3FD3D010510111A172624181A
+111010111A1849181912100668F6A78D083FFC278D00000500C8FE1405BD076D0015002B
+002F00330037000005343736373632171617161407060706232227262726013437363736
+3217161716151407060706222726272601211121372111211321152101C110101B184818
+19131010111B172524181A1110021110111C1748181A121010111B1847181A1310FCF604
+F5FB0B8D03DBFC258C02C3FD3D7C24171A121010101C17491819121010111A18023B2418
+1A120F0F111B172524181A121010111B1705F8F6A78D083FFC278D000000000600C8FE14
+05BD076D0016002B004100450049004D0000053437363736321716171615140706070623
+222726272601343736373632171617161407060706222726272601343736373632171617
+16151407060706222726272601211121372111211321152101C110101B18481819131010
+111B172524181A111001090F111B174A171A121010111B1748191A120F010810111C1748
+181A121010111B1847181A1310FCF604F5FB0B8D03DBFC258C02C3FD3D7C24171A121010
+101C1724251819121010111A18013224171A131010111C1748181A121010111B17012E24
+181A120F0F111B172524181A121010111B1705F8F6A78D083FFC278D0000000700C8FE14
+05BD076D0015002B00410057005B005F0063000001321716171614070607062227262726
+353437363736003217161716151407060706232227262726343736371232171617161407
+060706232227262726353437363701321716171615140706070622272627263437363736
+012111213721112113211521044E24181A111010101B174A1719131010111B17FDE94A17
+19131010111B172524181A111010101B174A1719131010111B172524181A111010101B02
+5324181A111010101B174A1719131010111B17FC9F04F5FB0B8D03DBFC258C02C3FD3D02
+0E10111A1848181A121010101C17242518191210FDEE10111B1724251819121010111A18
+48181A12022210111A1848181A121010101C172425181912FDFE10111B17242518191210
+10111A1848181A12100771F6A78D083FFC278D000000000800C8FE1405BD076D0015002B
+00410057006E00720076007A000001321716171614070607062227262726353437363736
+003217161716151407060706232227262726343736371232171617161407060706232227
+262726353437363701321716171615140706070622272627263437363736033217161716
+1514070607062322272627263437363736012111213721112113211521044E24181A1110
+10101B174A1719131010111B17FDE94A1719131010111B172524181A111010101B174A17
+19131010111B172524181A111010101B025324181A111010101B174A1719131010111B17
+E424171A121010101C1724251819121010111A18FDA804F5FB0B8D03DBFC258C02C3FD3D
+020E10111A1848181A121010101C17242518191210FDEE10111B1724251819121010111A
+1848181A12022210111A1848181A121010101C172425181912FDFE10111B172425181912
+1010111A1848181A1210010910111A172624181A111010111A1849181912100668F6A78D
+083FFC278D00000900C8FE1405BD076D0014002A004000550069007F00830087008B0000
+253437363736321716171614070607062227262726253437363736333217161716140706
+070622272627261034373637363217161716151407060706072227262700343736373637
+321716171614070607062227262724343736373E01171617161407060706222726270034
+3736373633321716171615140706070E0127262701211121372111211321152103D41011
+1C1748181A120F0F111B174A161A1310FDEF10111B172524171A131010111C1748181A12
+1010111B1847181A131010111C172424181A12020210111B172524181A111010101B1848
+181913FDDE10111B1847181A131010111C1748181A12020210111B172524181A11101010
+1B1848181913FCE304F5FB0B8D03DBFC258C02C3FD3D9124171A131010111C1748181A12
+1010111B172524171A131010111C1748181A121010111B1701334A1819121010111A1726
+24171A11100111111AFDAB4A161A12100111111B1748181A120F0F111B174A161A121001
+11111B1748181A120F0F111B02824A1819121010111A172624171A11100111111A05E4F6
+A78D083FFC278D000000000400C8FE1405BD076D00150019001D00210000013217161716
+14070607062322272627263437363736012111213721112113211521034524171A121010
+101C1724251819121010111A18FDA804F5FB0B8D03DBFC258C02C3FD3D056B10111A174A
+1819121010111A1848191A11100202F6A78D083FFC278D000000000500C8FE1405BD076D
+0015002C0030003400380000013217161716140706070623222726272634373637361332
+171617161514070607062322272627263437363736012111213721112113211521034524
+171A121010101C1724251819121010111A182524171A121010101C172425181912101011
+1A18FDA804F5FB0B8D03DBFC258C02C3FD3D056910101B174A1719131010111B1848181A
+1110FB9C10111A172624181A111010111A1849181912100668F6A78D083FFC278D000006
+00C8FE1405BD076D0015002C00420046004A004E00000132171617161407060706232227
+262726343736373601343736373632171617161514070607062322272627260134373637
+3632171617161514070607062227262726012111213721112113211521034524171A1210
+10101C1724251819121010111A18FEA110101B18481819131010111B172524181A111002
+1110111C1748181A121010111B1847181A1310FCF604F5FB0B8D03DBFC258C02C3FD3D05
+6B10111A174A1819121010111A1848191A1110FA1924171A121010101C17242518191210
+10111A18023B24181A120F0F111B172524181A121010111B1705F8F6A78D083FFC278D00
+0000000700C8FE1405BD076D0015002C00410057005B005F006300000132171617161407
+060706232227262726343736373601343736373632171617161514070607062322272627
+260134373637363217161716140706070622272627260134373637363217161716151407
+0607062227262726012111213721112113211521034524171A121010101C172425181912
+1010111A18FEA110101B18481819131010111B172524181A111001090F111B174A171A12
+1010111B1748191A120F010810111C1748181A121010111B1847181A1310FCF604F5FB0B
+8D03DBFC258C02C3FD3D056B10111A174A1819121010111A1848191A1110FA1924171A12
+1010101C1724251819121010111A18013224171A131010111C1748181A121010111B1701
+2E24181A120F0F111B172524181A121010111B1705F8F6A78D083FFC278D000800C8FE14
+05BD076D0015002B00410057006D00710075007900000132171617161407060706232227
+262726343736373601321716171614070607062227262726353437363736003217161716
+151407060706232227262726343736371232171617161407060706232227262726353437
+363701321716171615140706070622272627263437363736012111213721112113211521
+034524171A121010101C1724251819121010111A18012E24181A111010101B174A171913
+1010111B17FDE94A1719131010111B172524181A111010101B174A1719131010111B1725
+24181A111010101B025324181A111010101B174A1719131010111B17FC9F04F5FB0B8D03
+DBFC258C02C3FD3D056B10111A174A1819121010111A1848191A1110FCA310111A184818
+1A121010101C17242518191210FDEE10111B1724251819121010111A1848181A12022210
+111A1848181A121010101C172425181912FDFE10111B1724251819121010111A1848181A
+12100771F6A78D083FFC278D0000000900C8FE1405BD076D0015002B00410057006D0084
+0088008C0090000001321716171614070607062322272627263437363736013217161716
+140706070622272627263534373637360032171617161514070607062322272627263437
+363712321716171614070607062322272627263534373637013217161716151407060706
+222726272634373637360332171617161514070607062322272627263437363736012111
+213721112113211521034524171A121010101C1724251819121010111A18012E24181A11
+1010101B174A1719131010111B17FDE94A1719131010111B172524181A111010101B174A
+1719131010111B172524181A111010101B025324181A111010101B174A1719131010111B
+17E424171A121010101C1724251819121010111A18FDA804F5FB0B8D03DBFC258C02C3FD
+3D056B10111A174A1819121010111A1848191A1110FCA310111A1848181A121010101C17
+242518191210FDEE10111B1724251819121010111A1848181A12022210111A1848181A12
+1010101C172425181912FDFE10111B1724251819121010111A1848181A1210010910111A
+172624181A111010111A1849181912100668F6A78D083FFC278D000A00C8FE1405BD076D
+0015002A00400056006B007F00950099009D00A100000132171617161407060706232227
+262726343736373613343736373632171617161407060706222726272625343736373633
+321716171614070607062227262726103437363736321716171615140706070607222726
+2700343736373637321716171614070607062227262724343736373E0117161716140706
+07062227262700343736373633321716171615140706070E012726270121112137211121
+13211521034524171A121010101C1724251819121010111A18B410111C1748181A120F0F
+111B174A161A1310FDEF10111B172524171A131010111C1748181A121010111B1847181A
+131010111C172424181A12020210111B172524181A111010101B1848181913FDDE10111B
+1847181A131010111C1748181A12020210111B172524181A111010101B1848181913FCE3
+04F5FB0B8D03DBFC258C02C3FD3D056B10111A174A1819121010111A1848191A1110FB26
+24171A131010111C1748181A121010111B172524171A131010111C1748181A121010111B
+1701334A1819121010111A172624171A11100111111AFDAB4A161A12100111111B174818
+1A120F0F111B174A161A12100111111B1748181A120F0F111B02824A1819121010111A17
+2624171A11100111111A05E4F6A78D083FFC278D0000000500C8FE1405BD076D0015002B
+002F00330037000000343736373632171617161514070607062322272627013437363736
+3332171617161407060706222726272601211121372111211321152101C210111A184818
+1A121010111B172425181912020210111B1724251819121010111A1848181A1210FCF404
+F5FB0B8D03DBFC258C02C3FD3D03C34A1719131010111B172524181A111010111A025324
+181A111010101B174A1719131010111B170193F6A78D083FFC278D000000000600C8FE14
+05BD076D0016001A001E00220038004E0000013217161716151407060706232227262726
+343736373601211121372111211321152102343736373632171617161514070607062322
+27262701343736373633321716171614070607062227262726034524171A121010101C17
+24251819121010111A18FDA804F5FB0B8D03DBFC258C02C3FD3D1F10111A1848181A1210
+10111B172425181912020210111B1724251819121010111A1848181A1210010510111A17
+2624181A111010111A1849181912100668F6A78D083FFC278D01494A1719131010111B17
+2524181A111010111A025324181A111010101B174A1719131010111B1700000700C8FE14
+05BD076D0016002C003000340038004E0064000005343736373632171617161514070607
+062322272627260134373637363217161716151407060706222726272601211121372111
+211321152102343736373632171617161514070607062322272627013437363736333217
+1617161407060706222726272601C110101B18481819131010111B172524181A11100211
+10111C1748181A121010111B1847181A1310FCF604F5FB0B8D03DBFC258C02C3FD3D1F10
+111A1848181A121010111B172425181912020210111B1724251819121010111A1848181A
+12107C24171A121010101C1724251819121010111A18023B24181A120F0F111B17252418
+1A121010111B1705F8F6A78D083FFC278D01494A1719131010111B172524181A11101011
+1A025324181A111010101B174A1719131010111B1700000800C8FE1405BD076D0016002B
+004100450049004D00630079000005343736373632171617161514070607062322272627
+260134373637363217161716140706070622272627260134373637363217161716151407
+060706222726272601211121372111211321152102343736373632171617161514070607
+0623222726270134373637363332171617161407060706222726272601C110101B184818
+19131010111B172524181A111001090F111B174A171A121010111B1748191A120F010810
+111C1748181A121010111B1847181A1310FCF604F5FB0B8D03DBFC258C02C3FD3D1F1011
+1A1848181A121010111B172425181912020210111B1724251819121010111A1848181A12
+107C24171A121010101C1724251819121010111A18013224171A131010111C1748181A12
+1010111B17012E24181A120F0F111B172524181A121010111B1705F8F6A78D083FFC278D
+01494A1719131010111B172524181A111010111A025324181A111010101B174A17191310
+10111B170000000900C8FE1405BD076D0015002B00410057005B005F00630079008F0000
+013217161716140706070622272627263534373637360032171617161514070607062322
+272627263437363712321716171614070607062322272627263534373637013217161716
+151407060706222726272634373637360121112137211121132115210234373637363217
+161716151407060706232227262701343736373633321716171614070607062227262726
+044E24181A111010101B174A1719131010111B17FDE94A1719131010111B172524181A11
+1010101B174A1719131010111B172524181A111010101B025324181A111010101B174A17
+19131010111B17FC9F04F5FB0B8D03DBFC258C02C3FD3D1F10111A1848181A121010111B
+172425181912020210111B1724251819121010111A1848181A1210020E10111A1848181A
+121010101C17242518191210FDEE10111B1724251819121010111A1848181A1202221011
+1A1848181A121010101C172425181912FDFE10111B1724251819121010111A1848181A12
+100771F6A78D083FFC278D01494A1719131010111B172524181A111010111A025324181A
+111010101B174A1719131010111B17000000000A00C8FE1405BD076D0015002B00410057
+006E00720076007A009000A6000001321716171614070607062227262726353437363736
+003217161716151407060706232227262726343736371232171617161407060706232227
+262726353437363701321716171615140706070622272627263437363736033217161716
+151407060706232227262726343736373601211121372111211321152102343736373632
+171617161514070607062322272627013437363736333217161716140706070622272627
+26044E24181A111010101B174A1719131010111B17FDE94A1719131010111B172524181A
+111010101B174A1719131010111B172524181A111010101B025324181A111010101B174A
+1719131010111B17E424171A121010101C1724251819121010111A18FDA804F5FB0B8D03
+DBFC258C02C3FD3D1F10111A1848181A121010111B172425181912020210111B17242518
+19121010111A1848181A1210020E10111A1848181A121010101C17242518191210FDEE10
+111B1724251819121010111A1848181A12022210111A1848181A121010101C1724251819
+12FDFE10111B1724251819121010111A1848181A1210010910111A172624181A11101011
+1A1849181912100668F6A78D083FFC278D01494A1719131010111B172524181A11101011
+1A025324181A111010101B174A1719131010111B1700000B00C8FE1405BD076D0014002A
+004000550069007F00830087008B00A100B7000025343736373632171617161407060706
+222726272625343736373633321716171614070607062227262726103437363736321716
+171615140706070607222726270034373637363732171617161407060706222726272434
+3736373E011716171614070607062227262700343736373633321716171615140706070E
+012726270121112137211121132115210234373637363217161716151407060706232227
+26270134373637363332171617161407060706222726272603D410111C1748181A120F0F
+111B174A161A1310FDEF10111B172524171A131010111C1748181A121010111B1847181A
+131010111C172424181A12020210111B172524181A111010101B1848181913FDDE10111B
+1847181A131010111C1748181A12020210111B172524181A111010101B1848181913FCE3
+04F5FB0B8D03DBFC258C02C3FD3D1F10111A1848181A121010111B172425181912020210
+111B1724251819121010111A1848181A12109124171A131010111C1748181A121010111B
+172524171A131010111C1748181A121010111B1701334A1819121010111A172624171A11
+100111111AFDAB4A161A12100111111B1748181A120F0F111B174A161A12100111111B17
+48181A120F0F111B02824A1819121010111A172624171A11100111111A05E4F6A78D083F
+FC278D01494A1719131010111B172524181A111010111A025324181A111010101B174A17
+19131010111B17000000000600C8FE1405BD076D0015002B004100450049004D00000034
+373637363217161716151407060706232227262713343736373632171617161514070607
+062227262726013437363736333217161716140706070622272627260121112137211121
+1321152101C210111A1848181A121010111B172425181912F910111A174A181A11101011
+1A184918191210010910111B1724251819121010111A1848181A1210FCF404F5FB0B8D03
+DBFC258C02C3FD3D03C34A1719131010111B172524181A111010111A014A24171A121010
+101C1724251819121010111A18012E24181A111010101B174A1719131010111B170193F6
+A78D083FFC278D000000000700C8FE1405BD076D0015002B00410058005C006000640000
+003437363736321716171615140706070623222726271334373637363217161716151407
+060706222726272601343736373633321716171614070607062227262726033217161716
+151407060706232227262726343736373601211121372111211321152101C210111A1848
+181A121010111B172425181912F910111A174A181A111010111A18491819121001091011
+1B1724251819121010111A1848181A12108F24171A121010101C1724251819121010111A
+18FDA804F5FB0B8D03DBFC258C02C3FD3D03C34A1719131010111B172524181A11101011
+1A014A24171A121010101C1724251819121010111A18012E24181A111010101B174A1719
+131010111B17FB2B10111A172624181A111010111A1849181912100668F6A78D083FFC27
+8D00000800C8FE1405BD076D0015002B00410058006E00720076007A0000003437363736
+321716171615140706070623222726271334373637363217161716151407060706222726
+272601343736373633321716171614070607062227262726013437363736321716171615
+140706070623222726272601343736373632171617161514070607062227262726012111
+21372111211321152101C210111A1848181A121010111B172425181912F910111A174A18
+1A111010111A184918191210010910111B1724251819121010111A1848181A1210FDED10
+101B18481819131010111B172524181A1110021110111C1748181A121010111B1847181A
+1310FCF604F5FB0B8D03DBFC258C02C3FD3D03C34A1719131010111B172524181A111010
+111A014A24171A121010101C1724251819121010111A18012E24181A111010101B174A17
+19131010111B17F9AA24171A121010101C1724251819121010111A18023B24181A120F0F
+111B172524181A121010111B1705F8F6A78D083FFC278D000000000900C8FE1405BD076D
+0015002B00410058006D00830087008B008F000000343736373632171617161514070607
+062322272627133437363736321716171615140706070622272627260134373637363332
+171617161407060706222726272601343736373632171617161514070607062322272627
+260134373637363217161716140706070622272627260134373637363217161716151407
+060706222726272601211121372111211321152101C210111A1848181A121010111B1724
+25181912F910111A174A181A111010111A184918191210010910111B1724251819121010
+111A1848181A1210FDED10101B18481819131010111B172524181A111001090F111B174A
+171A121010111B1748191A120F010810111C1748181A121010111B1847181A1310FCF604
+F5FB0B8D03DBFC258C02C3FD3D03C34A1719131010111B172524181A111010111A014A24
+171A121010101C1724251819121010111A18012E24181A111010101B174A171913101011
+1B17F9AA24171A121010101C1724251819121010111A18013224171A131010111C174818
+1A121010111B17012E24181A120F0F111B172524181A121010111B1705F8F6A78D083FFC
+278D000A00C8FE1405BD076D0015002B00410057006D00830099009D00A100A500000034
+373637363217161716151407060706232227262713343736373632171617161514070607
+062227262726013437363736333217161716140706070622272627261332171617161407
+060706222726272635343736373600321716171615140706070623222726272634373637
+123217161716140706070623222726272635343736370132171617161514070607062227
+262726343736373601211121372111211321152101C210111A1848181A121010111B1724
+25181912F910111A174A181A111010111A184918191210010910111B1724251819121010
+111A1848181A12107A24181A111010101B174A1719131010111B17FDE94A171913101011
+1B172524181A111010101B174A1719131010111B172524181A111010101B025324181A11
+1010101B174A1719131010111B17FC9F04F5FB0B8D03DBFC258C02C3FD3D03C34A171913
+1010111B172524181A111010111A014A24171A121010101C1724251819121010111A1801
+2E24181A111010101B174A1719131010111B17FC3410111A1848181A121010101C172425
+18191210FDEE10111B1724251819121010111A1848181A12022210111A1848181A121010
+101C172425181912FDFE10111B1724251819121010111A1848181A12100771F6A78D083F
+FC278D000000000B00C8FE1405BD076D0015002B00410057006D0083009900B000B400B8
+00BC00000034373637363217161716151407060706232227262713343736373632171617
+161514070607062227262726013437363736333217161716140706070622272627261332
+171617161407060706222726272635343736373600321716171615140706070623222726
+272634373637123217161716140706070623222726272635343736370132171617161514
+070607062227262726343736373603321716171615140706070623222726272634373637
+3601211121372111211321152101C210111A1848181A121010111B172425181912F91011
+1A174A181A111010111A184918191210010910111B1724251819121010111A1848181A12
+107A24181A111010101B174A1719131010111B17FDE94A1719131010111B172524181A11
+1010101B174A1719131010111B172524181A111010101B025324181A111010101B174A17
+19131010111B17E424171A121010101C1724251819121010111A18FDA804F5FB0B8D03DB
+FC258C02C3FD3D03C34A1719131010111B172524181A111010111A014A24171A12101010
+1C1724251819121010111A18012E24181A111010101B174A1719131010111B17FC341011
+1A1848181A121010101C17242518191210FDEE10111B1724251819121010111A1848181A
+12022210111A1848181A121010101C172425181912FDFE10111B1724251819121010111A
+1848181A1210010910111A172624181A111010111A1849181912100668F6A78D083FFC27
+8D00000C00C8FE1405BD076D0015002B00410056006C0082009700AB00C100C500C900CD
+000000343736373632171617161514070607062322272627133437363736321716171615
+140706070622272627260134373637363332171617161407060706222726272611343736
+373632171617161407060706222726272625343736373633321716171614070607062227
+262726103437363736321716171615140706070607222726270034373637363732171617
+1614070607062227262724343736373E0117161716140706070622272627003437363736
+33321716171615140706070E0127262701211121372111211321152101C210111A184818
+1A121010111B172425181912F910111A174A181A111010111A184918191210010910111B
+1724251819121010111A1848181A121010111C1748181A120F0F111B174A161A1310FDEF
+10111B172524171A131010111C1748181A121010111B1847181A131010111C172424181A
+12020210111B172524181A111010101B1848181913FDDE10111B1847181A131010111C17
+48181A12020210111B172524181A111010101B1848181913FCE304F5FB0B8D03DBFC258C
+02C3FD3D03C34A1719131010111B172524181A111010111A014A24171A121010101C1724
+251819121010111A18012E24181A111010101B174A1719131010111B17FAB724171A1310
+10111C1748181A121010111B172524171A131010111C1748181A121010111B1701334A18
+19121010111A172624171A11100111111AFDAB4A161A12100111111B1748181A120F0F11
+1B174A161A12100111111B1748181A120F0F111B02824A1819121010111A172624171A11
+100111111A05E4F6A78D083FFC278D000000000700C8FE1405BD076D00140029003E0053
+0057005B005F000001321716171614070607062227262726343736373600321716171614
+070607062322272627263437363712321716171614070607062322272627263437363701
+3217161716140706070622272627263437363736012111213721112113211521044E2418
+1A111010101B17491819131010111B17FDE9491819131010111B172524181A111010101B
+17491819131010111B172524181A111010101B025324181A111010101B17491819131010
+111B17FC9F04F5FB0B8D03DBFC258C02C3FD3D067410111A1848181A121010111B174918
+191210FDEE10101C17491819121010111A1848181A12022210111A1848181A121010111B
+1749181912FDFE10101C17491819121010111A1848181A1210030BF6A78D083FFC278D00
+0000000800C8FE1405BD076D00150019001D00210036004B006000750000013217161716
+151407060706222726272634373637360121112137211121132115210132171617161407
+060706222726272634373637360032171617161407060706232227262726343736371232
+171617161407060706232227262726343736370132171617161407060706222726272634
+37363736034524171A121010101C17491819121010111A18FDA804F5FB0B8D03DBFC258C
+02C3FD3D026D24181A111010101B17491819131010111B17FDE9491819131010111B1725
+24181A111010101B17491819131010111B172524181A111010101B025324181A11101010
+1B17491819131010111B17010510111A172624181A111010111A1849181912100668F6A7
+8D083FFC278D03FA10111A1848181A121010111B174918191210FDEE10101C1749181912
+1010111A1848181A12022210111A1848181A121010111B1749181912FDFE10101C174918
+19121010111A1848181A12100000000900C8FE1405BD076D0016002C003000340038004E
+0064007A0090000005343736373632171617161514070607062322272627260134373637
+363217161716151407060706222726272601211121372111211321152101321716171614
+070607062227262726353437363736003217161716151407060706232227262726343736
+371232171617161407060706232227262726353437363701321716171615140706070622
+27262726343736373601C110101B18481819131010111B172524181A1110021110111C17
+48181A121010111B1847181A1310FCF604F5FB0B8D03DBFC258C02C3FD3D026D24181A11
+1010101B174A1719131010111B17FDE94A1719131010111B172524181A111010101B174A
+1719131010111B172524181A111010101B025324181A111010101B174A1719131010111B
+177C24171A121010101C1724251819121010111A18023B24181A120F0F111B172524181A
+121010111B1705F8F6A78D083FFC278D03FA10111A1848181A121010111B172425181912
+10FDEE10101C1724251819121010111A1848181A12022210111A1848181A121010111B17
+2425181912FDFE10101C1724251819121010111A1848181A1210000A00C8FE1405BD076D
+0016002B004100450049004D00630079008F00A500000534373637363217161716151407
+060706232227262726013437363736321716171614070607062227262726013437363736
+321716171615140706070622272627260121112137211121132115210132171617161407
+060706222726272635343736373600321716171615140706070623222726272634373637
+123217161716140706070623222726272635343736370132171617161514070607062227
+262726343736373601C110101B18481819131010111B172524181A111001090F111B174A
+171A121010111B1748191A120F010810111C1748181A121010111B1847181A1310FCF604
+F5FB0B8D03DBFC258C02C3FD3D026D24181A111010101B174A1719131010111B17FDE94A
+1719131010111B172524181A111010101B174A1719131010111B172524181A111010101B
+025324181A111010101B174A1719131010111B177C24171A121010101C17242518191210
+10111A18013224171A131010111C1748181A121010111B17012E24181A120F0F111B1725
+24181A121010111B1705F8F6A78D083FFC278D03FA10111A1848181A121010111B172425
+18191210FDEE10101C1724251819121010111A1848181A12022210111A1848181A121010
+111B172425181912FDFE10101C1724251819121010111A1848181A121000000B00C8FE14
+05BD076D0015002B00410057005B005F00630079008F00A500BB00000132171617161407
+060706222726272635343736373600321716171615140706070623222726272634373637
+123217161716140706070623222726272635343736370132171617161514070607062227
+262726343736373601211121372111211321152101321716171614070607062227262726
+353437363736003217161716151407060706232227262726343736371232171617161407
+060706232227262726353437363701321716171615140706070622272627263437363736
+044E24181A111010101B174A1719131010111B17FDE94A1719131010111B172524181A11
+1010101B174A1719131010111B172524181A111010101B025324181A111010101B174A17
+19131010111B17FC9F04F5FB0B8D03DBFC258C02C3FD3D026D24181A111010101B174A17
+19131010111B17FDE94A1719131010111B172524181A111010101B174A1719131010111B
+172524181A111010101B025324181A111010101B174A1719131010111B17020E10111A18
+48181A121010101C17242518191210FDEE10111B1724251819121010111A1848181A1202
+2210111A1848181A121010101C172425181912FDFE10111B1724251819121010111A1848
+181A12100771F6A78D083FFC278D03FA10111A1848181A121010111B17242518191210FD
+EE10101C1724251819121010111A1848181A12022210111A1848181A121010111B172425
+181912FDFE10101C1724251819121010111A1848181A12100000000C00C8FE1405BD076D
+00140029003E00530069006D00710075008A009F00B400C9000001321716171614070607
+062227262726343736373600321716171614070607062322272627263437363712321716
+171614070607062322272627263437363701321716171614070607062227262726343736
+373603321716171615140706070622272627263437363736012111213721112113211521
+013217161716140706070622272627263437363736003217161716140706070623222726
+272634373637123217161716140706070623222726272634373637013217161716140706
+070622272627263437363736044E24181A111010101B17491819131010111B17FDE94918
+19131010111B172524181A111010101B17491819131010111B172524181A111010101B02
+5324181A111010101B17491819131010111B17E424171A121010101C1749181912101011
+1A18FDA804F5FB0B8D03DBFC258C02C3FD3D026D24181A111010101B1749181913101011
+1B17FDE9491819131010111B172524181A111010101B17491819131010111B172524181A
+111010101B025324181A111010101B17491819131010111B17020E10111A1848181A1210
+10101C174918191210FDEE10111B17491819121010111A1848181A12022210111A184818
+1A121010101C1749181912FDFE10111B17491819121010111A1848181A1210010910111A
+172624181A111010111A1849181912100668F6A78D083FFC278D03FA10111A1848181A12
+1010111B174918191210FDEE10101C17491819121010111A1848181A12022210111A1848
+181A121010111B1749181912FDFE10101C17491819121010111A1848181A12100000000D
+00C8FE1405BD076D0014002A004000550069007F00830087008B00A100B700CD00E30000
+253437363736321716171614070607062227262726253437363736333217161716140706
+070622272627261034373637363217161716151407060706072227262700343736373637
+321716171614070607062227262724343736373E01171617161407060706222726270034
+3736373633321716171615140706070E0127262701211121372111211321152101321716
+171614070607062227262726353437363736003217161716151407060706232227262726
+343736371232171617161407060706232227262726353437363701321716171615140706
+07062227262726343736373603D410111C1748181A120F0F111B174A161A1310FDEF1011
+1B172524171A131010111C1748181A121010111B1847181A131010111C172424181A1202
+0210111B172524181A111010101B1848181913FDDE10111B1847181A131010111C174818
+1A12020210111B172524181A111010101B1848181913FCE304F5FB0B8D03DBFC258C02C3
+FD3D026D24181A111010101B174A1719131010111B17FDE94A1719131010111B17252418
+1A111010101B174A1719131010111B172524181A111010101B025324181A111010101B17
+4A1719131010111B179124171A131010111C1748181A121010111B172524171A13101011
+1C1748181A121010111B1701334A1819121010111A172624171A11100111111AFDAB4A16
+1A12100111111B1748181A120F0F111B174A161A12100111111B1748181A120F0F111B02
+824A1819121010111A172624171A11100111111A05E4F6A78D083FFC278D03FA10111A18
+48181A121010111B17242518191210FDEE10101C1724251819121010111A1848181A1202
+2210111A1848181A121010111B172425181912FDFE10101C1724251819121010111A1848
+181A12100000000800C8FE1405BD076D00030007000B00210037004D0063007900001321
+112137211121132115210132171617161407060706222726272635343736373600321716
+171615140706070623222726272634373637123217161716140706070623222726272635
+343736370132171617161514070607062227262726343736373603321716171614070607
+062322272627263437363736C804F5FB0B8D03DBFC258C02C3FD3D026D24181A11101010
+1B174A1719131010111B17FDE94A1719131010111B172524181A111010101B174A171913
+1010111B172524181A111010101B025324181A111010101B174A1719131010111B17E424
+171A121010101C1724251819121010111A18076DF6A78D083FFC278D03FA10111A184818
+1A121010111B17242518191210FDEE10101C1724251819121010111A1848181A12022210
+111A1848181A121010111B172425181912FDFE10101C1724251819121010111A1848181A
+1210010910111A174A1819121010111A1848191A1110000900C8FE1405BD076D0016001A
+001E00220038004E0064007A009000000132171617161514070607062322272627263437
+363736012111213721112113211521013217161716140706070622272627263534373637
+360032171617161514070607062322272627263437363712321716171614070607062322
+272627263534373637013217161716151407060706222726272634373637360332171617
+1614070607062322272627263437363736034524171A121010101C172425181912101011
+1A18FDA804F5FB0B8D03DBFC258C02C3FD3D026D24181A111010101B174A171913101011
+1B17FDE94A1719131010111B172524181A111010101B174A1719131010111B172524181A
+111010101B025324181A111010101B174A1719131010111B17E424171A121010101C1724
+251819121010111A18010510111A172624181A111010111A1849181912100668F6A78D08
+3FFC278D03FA10111A1848181A121010111B17242518191210FDEE10101C172425181912
+1010111A1848181A12022210111A1848181A121010111B172425181912FDFE10101C1724
+251819121010111A1848181A1210010910111A174A1819121010111A1848191A1110000A
+00C8FE1405BD076D0015002B002F00330037004C00610076008B00A00000053437363736
+321716171614070607062322272627260134373637363217161716151407060706222726
+272601211121372111211321152101321716171614070607062227262726343736373600
+321716171614070607062322272627263437363712321716171614070607062322272627
+263437363701321716171614070607062227262726343736373603321716171614070607
+062227262726343736373601C110101B18481819131010111B172524181A111002111011
+1C1748181A121010111B1847181A1310FCF604F5FB0B8D03DBFC258C02C3FD3D026D2418
+1A111010101B17491819131010111B17FDE9491819131010111B172524181A111010101B
+17491819131010111B172524181A111010101B025324181A111010101B17491819131010
+111B17E424171A121010101C17491819121010111A187C24171A121010101C1749181912
+1010111A18023B24181A120F0F111B172524181A121010111B1705F8F6A78D083FFC278D
+03FA10111A1848181A121010111B174918191210FDEE10101C17491819121010111A1848
+181A12022210111A1848181A121010111B1749181912FDFE10101C17491819121010111A
+1848181A1210010910111A174A1819121010111A1848191A1110000B00C8FE1405BD076D
+0016002B004100450049004D00630079008F00A500BB0000053437363736321716171615
+140706070623222726272601343736373632171617161407060706222726272601343736
+373632171617161514070607062227262726012111213721112113211521013217161716
+140706070622272627263534373637360032171617161514070607062322272627263437
+363712321716171614070607062322272627263534373637013217161716151407060706
+222726272634373637360332171617161407060706232227262726343736373601C11010
+1B18481819131010111B172524181A111001090F111B174A171A121010111B1748191A12
+0F010810111C1748181A121010111B1847181A1310FCF604F5FB0B8D03DBFC258C02C3FD
+3D026D24181A111010101B174A1719131010111B17FDE94A1719131010111B172524181A
+111010101B174A1719131010111B172524181A111010101B025324181A111010101B174A
+1719131010111B17E424171A121010101C1724251819121010111A187C24171A12101010
+1C1724251819121010111A18013224171A131010111C1748181A121010111B17012E2418
+1A120F0F111B172524181A121010111B1705F8F6A78D083FFC278D03FA10111A1848181A
+121010111B17242518191210FDEE10101C1724251819121010111A1848181A1202221011
+1A1848181A121010111B172425181912FDFE10101C1724251819121010111A1848181A12
+10010910111A174A1819121010111A1848191A111000000C00C8FE1405BD076D0015002B
+00410057005B005F00630079008F00A500BB00D100000132171617161407060706222726
+272635343736373600321716171615140706070623222726272634373637123217161716
+140706070623222726272635343736370132171617161514070607062227262726343736
+373601211121372111211321152101321716171614070607062227262726353437363736
+003217161716151407060706232227262726343736371232171617161407060706232227
+262726353437363701321716171615140706070622272627263437363736033217161716
+14070607062322272627263437363736044E24181A111010101B174A1719131010111B17
+FDE94A1719131010111B172524181A111010101B174A1719131010111B172524181A1110
+10101B025324181A111010101B174A1719131010111B17FC9F04F5FB0B8D03DBFC258C02
+C3FD3D026D24181A111010101B174A1719131010111B17FDE94A1719131010111B172524
+181A111010101B174A1719131010111B172524181A111010101B025324181A111010101B
+174A1719131010111B17E424171A121010101C1724251819121010111A18020E10111A18
+48181A121010101C17242518191210FDEE10111B1724251819121010111A1848181A1202
+2210111A1848181A121010101C172425181912FDFE10111B1724251819121010111A1848
+181A12100771F6A78D083FFC278D03FA10111A1848181A121010111B17242518191210FD
+EE10101C1724251819121010111A1848181A12022210111A1848181A121010111B172425
+181912FDFE10101C1724251819121010111A1848181A1210010910111A174A1819121010
+111A1848191A11100000000D00C8FE1405BD076D0015002B00410057006E00720076007A
+009000A600BC00D200E80000013217161716140706070622272627263534373637360032
+171617161514070607062322272627263437363712321716171614070607062322272627
+263534373637013217161716151407060706222726272634373637360332171617161514
+070607062322272627263437363736012111213721112113211521013217161716140706
+070622272627263534373637360032171617161514070607062322272627263437363712
+321716171614070607062322272627263534373637013217161716151407060706222726
+2726343736373603321716171614070607062322272627263437363736044E24181A1110
+10101B174A1719131010111B17FDE94A1719131010111B172524181A111010101B174A17
+19131010111B172524181A111010101B025324181A111010101B174A1719131010111B17
+E424171A121010101C1724251819121010111A18FDA804F5FB0B8D03DBFC258C02C3FD3D
+026D24181A111010101B174A1719131010111B17FDE94A1719131010111B172524181A11
+1010101B174A1719131010111B172524181A111010101B025324181A111010101B174A17
+19131010111B17E424171A121010101C1724251819121010111A18020E10111A1848181A
+121010101C17242518191210FDEE10111B1724251819121010111A1848181A1202221011
+1A1848181A121010101C172425181912FDFE10111B1724251819121010111A1848181A12
+10010910111A172624181A111010111A1849181912100668F6A78D083FFC278D03FA1011
+1A1848181A121010111B17242518191210FDEE10101C1724251819121010111A1848181A
+12022210111A1848181A121010111B172425181912FDFE10101C1724251819121010111A
+1848181A1210010910111A174A1819121010111A1848191A1110000E00C8FE1405BD076D
+0014002A004000550069007F00830087008B00A100B700CD00E300F90000253437363736
+321716171614070607062227262726253437363736333217161716140706070622272627
+261034373637363217161716151407060706072227262700343736373637321716171614
+070607062227262724343736373E01171617161407060706222726270034373637363332
+1716171615140706070E0127262701211121372111211321152101321716171614070607
+062227262726353437363736003217161716151407060706232227262726343736371232
+171617161407060706232227262726353437363701321716171615140706070622272627
+2634373637360332171617161407060706232227262726343736373603D410111C174818
+1A120F0F111B174A161A1310FDEF10111B172524171A131010111C1748181A121010111B
+1847181A131010111C172424181A12020210111B172524181A111010101B1848181913FD
+DE10111B1847181A131010111C1748181A12020210111B172524181A111010101B184818
+1913FCE304F5FB0B8D03DBFC258C02C3FD3D026D24181A111010101B174A171913101011
+1B17FDE94A1719131010111B172524181A111010101B174A1719131010111B172524181A
+111010101B025324181A111010101B174A1719131010111B17E424171A121010101C1724
+251819121010111A189124171A131010111C1748181A121010111B172524171A13101011
+1C1748181A121010111B1701334A1819121010111A172624171A11100111111AFDAB4A16
+1A12100111111B1748181A120F0F111B174A161A12100111111B1748181A120F0F111B02
+824A1819121010111A172624171A11100111111A05E4F6A78D083FFC278D03FA10111A18
+48181A121010111B17242518191210FDEE10101C1724251819121010111A1848181A1202
+2210111A1848181A121010111B172425181912FDFE10101C1724251819121010111A1848
+181A1210010910111A174A1819121010111A1848191A11100000000900C8FE1405BD076D
+00030007000B0022003A00500066007C0092000013211121372111211321152101343736
+373633321716171615140706070622272627262534373637363332171617161514070607
+062322272627261034373637363217161716151407060706072227262701343736373637
+32171617161407060706222726272625343736373E011716171614070607062322272627
+2600343736373633321716171615140706070E01272627C804F5FB0B8D03DBFC258C02C3
+FD3D01F210111B172524181A111010111A174A17191310FDEF10111A172624171A121010
+111B1724251819121010111A1848181A121010111B172425181912020210111B17242518
+19121010111A1848181A1210FDEE10111A1848181A121010111B17242518191210021210
+111B1724251819121010111A1848181A12076DF6A78D083FFC278D027C24171A12101010
+1C1724251819121010111A182524171A121010101C1724251819121010111A1801334A17
+1A121010111B172524171A11100111101BFDD024171A12100111111B1748181A12101011
+1B172524171A12100111111B1748181A121010111B17026B4A171A121010111B17252417
+1A11100111101B000000000A00C8FE1405BD076D0016001A001E0022003900510067007D
+009300A90000013217161716151407060706232227262726343736373601211121372111
+211321152101343736373633321716171615140706070622272627262534373637363332
+171617161514070607062322272627261034373637363217161716151407060706072227
+26270134373637363732171617161407060706222726272625343736373E011716171614
+0706070623222726272600343736373633321716171615140706070E0127262703452417
+1A121010101C1724251819121010111A18FDA804F5FB0B8D03DBFC258C02C3FD3D01F210
+111B172524181A111010111A174A17191310FDEF10111A172624171A121010111B172425
+1819121010111A1848181A121010111B172425181912020210111B172425181912101011
+1A1848181A1210FDEE10111A1848181A121010111B17242518191210021210111B172425
+1819121010111A1848181A12010510111A172624181A111010111A1849181912100668F6
+A78D083FFC278D027C24171A121010101C1724251819121010111A182524171A12101010
+1C1724251819121010111A1801334A171A121010111B172524171A11100111101BFDD024
+171A12100111111B1748181A121010111B172524171A12100111111B1748181A12101011
+1B17026B4A171A121010111B172524171A11100111101B000000000B00C8FE1405BD076D
+0016002C003000340038004F0067007D009300A900BF0000053437363736321716171615
+140706070623222726272601343736373632171617161514070607062227262726012111
+213721112113211521013437363736333217161716151407060706222726272625343736
+373633321716171615140706070623222726272610343736373632171617161514070607
+0607222726270134373637363732171617161407060706222726272625343736373E0117
+161716140706070623222726272600343736373633321716171615140706070E01272627
+01C110101B18481819131010111B172524181A1110021110111C1748181A121010111B18
+47181A1310FCF604F5FB0B8D03DBFC258C02C3FD3D01F210111B172524181A111010111A
+174A17191310FDEF10111A172624171A121010111B1724251819121010111A1848181A12
+1010111B172425181912020210111B1724251819121010111A1848181A1210FDEE10111A
+1848181A121010111B17242518191210021210111B1724251819121010111A1848181A12
+7C24171A121010101C1724251819121010111A18023B24181A120F0F111B172524181A12
+1010111B1705F8F6A78D083FFC278D027C24171A121010101C1724251819121010111A18
+2524171A121010101C1724251819121010111A1801334A171A121010111B172524171A11
+100111101BFDD024171A12100111111B1748181A121010111B172524171A12100111111B
+1748181A121010111B17026B4A171A121010111B172524171A11100111101B000000000C
+00C8FE1405BD076D0016002B004100450049004D0064007C009200A800BE00D400000534
+373637363217161716151407060706232227262726013437363736321716171614070607
+062227262726013437363736321716171615140706070622272627260121112137211121
+132115210134373637363332171617161514070607062227262726253437363736333217
+161716151407060706232227262726103437363736321716171615140706070607222726
+270134373637363732171617161407060706222726272625343736373E01171617161407
+06070623222726272600343736373633321716171615140706070E0127262701C110101B
+18481819131010111B172524181A111001090F111B174A171A121010111B1748191A120F
+010810111C1748181A121010111B1847181A1310FCF604F5FB0B8D03DBFC258C02C3FD3D
+01F210111B172524181A111010111A174A17191310FDEF10111A172624171A121010111B
+1724251819121010111A1848181A121010111B172425181912020210111B172425181912
+1010111A1848181A1210FDEE10111A1848181A121010111B17242518191210021210111B
+1724251819121010111A1848181A127C24171A121010101C1724251819121010111A1801
+3224171A131010111C1748181A121010111B17012E24181A120F0F111B172524181A1210
+10111B1705F8F6A78D083FFC278D027C24171A121010101C1724251819121010111A1825
+24171A121010101C1724251819121010111A1801334A171A121010111B172524171A1110
+0111101BFDD024171A12100111111B1748181A121010111B172524171A12100111111B17
+48181A121010111B17026B4A171A121010111B172524171A11100111101B000D00C8FE14
+05BD076D0015002B00410057005B005F0063007A009200A800BE00D400EA000001321716
+171614070607062227262726353437363736003217161716151407060706232227262726
+343736371232171617161407060706232227262726353437363701321716171615140706
+070622272627263437363736012111213721112113211521013437363736333217161716
+151407060706222726272625343736373633321716171615140706070623222726272610
+343736373632171617161514070607060722272627013437363736373217161716140706
+0706222726272625343736373E0117161716140706070623222726272600343736373633
+321716171615140706070E01272627044E24181A111010101B174A1719131010111B17FD
+E94A1719131010111B172524181A111010101B174A1719131010111B172524181A111010
+101B025324181A111010101B174A1719131010111B17FC9F04F5FB0B8D03DBFC258C02C3
+FD3D01F210111B172524181A111010111A174A17191310FDEF10111A172624171A121010
+111B1724251819121010111A1848181A121010111B172425181912020210111B17242518
+19121010111A1848181A1210FDEE10111A1848181A121010111B17242518191210021210
+111B1724251819121010111A1848181A12020E10111A1848181A121010101C1724251819
+1210FDEE10111B1724251819121010111A1848181A12022210111A1848181A121010101C
+172425181912FDFE10111B1724251819121010111A1848181A12100771F6A78D083FFC27
+8D027C24171A121010101C1724251819121010111A182524171A121010101C1724251819
+121010111A1801334A171A121010111B172524171A11100111101BFDD024171A12100111
+111B1748181A121010111B172524171A12100111111B1748181A121010111B17026B4A17
+1A121010111B172524171A11100111101B00000E00C8FE1405BD076D00140029003E0053
+0069006D00710075008B00A100B600CB00E000F500000132171617161407060706222726
+272634373637360032171617161407060706232227262726343736371232171617161407
+060706232227262726343736370132171617161407060706222726272634373637360332
+171617161514070607062227262726343736373601211121372111211321152101343736
+373633321716171614070607062227262726253437363736333217161716140706070622
+27262726103437363736321716171615140706070E0127262701343736373E0117161716
+1407060706222726272625343736373E0117161716140706070622272627260034373637
+36321716171615140706070E01272627044E24181A111010101B17491819131010111B17
+FDE9491819131010111B172524181A111010101B17491819131010111B172524181A1110
+10101B025324181A111010101B17491819131010111B17E424171A121010101C17491819
+121010111A18FDA804F5FB0B8D03DBFC258C02C3FD3D01F210111B172524181A11101011
+1A174918191310FDEF10111A172624171A121010111B17491819121010111A1848181A12
+1010111B1749181912020210111B17491819121010111A1848181A1210FDEE10111A1848
+181A121010111B174918191210021210111B17491819121010111A1848181A12020E1011
+1A1848181A121010101C174918191210FDEE10111B17491819121010111A1848181A1202
+2210111A1848181A121010101C1749181912FDFE10111B17491819121010111A1848181A
+1210010910111A172624181A111010111A1849181912100668F6A78D083FFC278D027C24
+171A121010101C17491819121010111A182524171A121010101C17491819121010111A18
+013449171A121010111B172524171A11100111101BFDD024171A12100111111B1748181A
+121010111B172524171A12100111111B1748181A121010111B17026C49171A121010111B
+172524171A11100111101B000000000F00C8FE1405BD076D0014002A004000550069007F
+00830087008B00A100B700CC00E100F6010B000025343736373632171617161407060706
+222726272625343736373633321716171614070607062227262726103437363736321716
+171615140706070607222726270034373637363732171617161407060706222726272434
+3736373E011716171614070607062227262700343736373633321716171615140706070E
+012726270121112137211121132115210134373637363332171617161407060706222726
+272625343736373633321716171614070607062227262726103437363736321716171615
+140706070E0127262701343736373E01171617161407060706222726272625343736373E
+011716171614070607062227262726003437363736321716171615140706070E01272627
+03D410111C1748181A120F0F111B1749171A1310FDEF10111B172524171A131010111C17
+48181A121010111B1847181A131010111C172424181A12020210111B172524181A111010
+101B1848181913FDDE10111B1847181A131010111C1748181A12020210111B172524181A
+111010101B1848181913FCE304F5FB0B8D03DBFC258C02C3FD3D01F210111B172524181A
+111010111A174918191310FDEF10111A172624171A121010111B17491819121010111A18
+48181A121010111B1749181912020210111B17491819121010111A1848181A1210FDEE10
+111A1848181A121010111B174918191210021210111B17491819121010111A1848181A12
+9124171A131010111C1748181A121010111B172524171A131010111C1748181A12101011
+1B170134491819121010111A172624171A11100111111AFDAB49171A12100111111B1748
+181A120F0F111B1749171A12100111111B1748181A120F0F111B0283491819121010111A
+172624171A11100111111A05E4F6A78D083FFC278D027C24171A121010101C1749181912
+1010111A182524171A121010101C17491819121010111A18013449171A121010111B1725
+24171A11100111101BFDD024171A12100111111B1748181A121010111B172524171A1210
+0111111B1748181A121010111B17026C49171A121010111B172524171A11100111101B00
+0000000300C8FE140767076D000B0017001B000001221511143321323511342325213215
+11142321223511340111211101B8787804BF7878FB4104BFF0F0FB41F0012C044706F578
+F887787807797878F0F887F0F00779F0F7D30701F8FF000500C8FE140767076D00180024
+00300033003B000001160017161514232227231417233635230623223534373600012215
+111433213235113423252132151114232122351134010321033301232721072304D74101
+3B091BC36C421E3B983B1E426CC31B09013BFD22787804BF7878FB4104BFF0F0FB41F002
+4B86010CD29A01208444FEB64484031879FE7E26254EE49BCC6B6BCC9BE44E2526018204
+5678F887787807797878F0F887F0F00779F0FEACFE55020FFCBCDADA0000000400C8FE14
+0767076D0018002400300049000001160017161514232227231417233635230623223534
+373600012215111433213235113423252132151114232122351134012115213536370035
+342623220607353E013332161514010604D741013B091BC36C421E3B983B1E426CC31B09
+013BFD22787804BF7878FB4104BFF0F0FB41F0019E01A8FDAA223F01586855347A484D85
+3991AEFEB538031879FE7E26254EE49BCC6B6BCC9BE44E25260182045678F88778780779
+7878F0F887F0F00779F0FC3F726E1F3801315E425123237B1C1C846C8BFEE43000000004
+00C8FE140767076D00180024003000590000011600171615142322272314172336352306
+23223534373600012215111433213235113423252132151114232122351134011E011514
+0623222627351E013332363534262B013533323635342623220607353E01333216151406
+04D741013B091BC36C421E3B983B1E426CC31B09013BFD22787804BF7878FB4104BFF0F0
+FB41F0029A5C65BEB1397D463477436D786F6C565E5E61645F28665149803790A95A0318
+79FE7E26254EE49BCC6B6BCC9BE44E25260182045678F887787807797878F0F887F0F007
+79F0FD91126D527C861514791B1A4F464A4C6C3F3C3A3D12177311127663456000000005
+00C8FE140767076D0018002400300033003E000001160017161514232227231417233635
+230623223534373600012215111433213235113423252132151114232122351134090121
+033311331523152335213504D741013B091BC36C421E3B983B1E426CC31B09013BFD2278
+7804BF7878FB4104BFF0F0FB41F0028EFECB013516A6878790FE62031879FE7E26254EE4
+9BCC6B6BCC9BE44E25260182045678F887787807797878F0F887F0F00779F0FE97FE5D02
+1CFDE46DBABA79000000000400C8FE140767076D00180024003000510000011600171615
+142322272314172336352306232235343736000122151114332132351134232521321511
+142321223511340521152115363736333217161514070623222627351617163332363426
+2322060704D741013B091BC36C421E3B983B1E426CC31B09013BFD22787804BF7878FB41
+04BFF0F0FB41F0011801FEFE791C1D1C1CA15E5E6160B03C7E42393E3E456F82826F3468
+36031879FE7E26254EE49BCC6B6BCC9BE44E25260182045678F887787807797878F0F887
+F0F00779F0F05FCC0904044D4C83874B4A1212711B0E0D66AE6614150000000500C8FE14
+0767076D0018002400300040006000000116001716151423222723141723363523062322
+353437360001221511143321323511342325213215111423212235113401220706151417
+163332373635342726131526272623220706073637363332171615140706232226353437
+363332171604D741013B091BC36C421E3B983B1E426CC31B09013BFD22787804BF7878FB
+4104BFF0F0FB41F002475833333333585733333333AB313232318044440A26393A449154
+54585791A7B06C6CB6313232031879FE7E26254EE49BCC6B6BCC9BE44E25260182045678
+F887787807797878F0F887F0F00779F0FD9E34355B5A343535345A5B3534016267140A0B
+4B4C99311A1A4C4D847F4F4EDED4C675760809000000000400C8FE140767076D00180024
+003000370000011600171615142322272314172336352306232235343736000122151114
+332132351134232521321511142321223511341721150123012104D741013B091BC36C42
+1E3B983B1E426CC31B09013BFD22787804BF7878FB4104BFF0F0FB41F0F00269FEA48801
+48FE33031879FE7E26254EE49BCC6B6BCC9BE44E25260182045678F887787807797878F0
+F887F0F00779F0F030FCED02E400000600C8FE140767076D001800240030003D005B006A
+000001160017161514232227231417233635230623223534373600012215111433213235
+113423252132151114232122351134002207061514163332373634272526272635343620
+171615140706071617161514070623222726353437363714171633323736353427262207
+0604D741013B091BC36C421E3B983B1E426CC31B09013BFD22787804BF7878FB4104BFF0
+F0FB41F00297BA35356A5D5C363535FEEC542E2FA4011E52512E2F535A383555569E9F55
+5635362D2F2E55513130302FA6302F031879FE7E26254EE49BCC6B6BCC9BE44E25260182
+045678F887787807797878F0F887F0F00779F0FD5B2C2B4B4C562C2B962B5D1231324864
+743A3A644A303112123A37507941414141794E3938C63F26252524413F26252524000005
+00C8FE140767076D0018002400300050005F000001160017161514232227231417233635
+230623223534373600012215111433213235113423252132151114232122351134013516
+171633323736370607062322263534373633321716151407062322272613323635342726
+232207061514171604D741013B091BC36C421E3B983B1E426CC31B09013BFD22787804BF
+7878FB4104BFF0F0FB41F0012E313232308144430A233C394590A8575891A757586B6CB6
+313232CC58663333585535343433031879FE7E26254EE49BCC6B6BCC9BE44E2526018204
+5678F887787807797878F0F887F0F00779F0FBDF67140B0A4B4B9A2F1B1A9884814D4E6F
+6FD4C6757608090172685C5A343535345A5C34340000000600C8FE140767076D00180024
+0030003E004A005100000116001716151423222723141723363523062322353437360001
+221511143321323511342325213215111423212235113400220706151417163237363534
+2F0132161514062322263534360111073537331104D741013B091BC36C421E3B983B1E42
+6CC31B09013BFD22787804BF7878FB4104BFF0F0FB41F003EA8E323333328E3233337983
+AAAA83A28C8CFE74858C89031879FE7E26254EE49BCC6B6BCC9BE44E25260182045678F8
+87787807797878F0F887F0F00779F0FEC85656ACAD56565656ADAC56AFDED3D4DEDED4D3
+DEFCAC02D1297427FCBD000400C8FE140767076D001800240030003D0000011600171615
+142322272314172336352306232235343736000122151114332132351134232521321511
+142321223511340533111407062B01353332363504D741013B091BC36C421E3B983B1E42
+6CC31B09013BFD22787804BF7878FB4104BFF0F0FB41F001B27F41408F31285446031879
+FE7E26254EE49BCC6B6BCC9BE44E25260182045678F887787807797878F0F887F0F00779
+F0F0FDDC95464560546C000400C8FE140767076D001800240030004A0000011600171615
+142322272314172336352306232235343736000122151114332132351134232521321511
+14232122351134010E0123222635343633321617152E012322061514163332363704D741
+013B091BC36C421E3B983B1E426CC31B09013BFD22787804BF7878FB4104BFF0F0FB41F0
+033C316539B5C8C9B43966302F6A367C7C7B7D376A2E031879FE7E26254EE49BCC6B6BCC
+9BE44E25260182045678F887787807797878F0F887F0F00779F0FBEB1716E3CECDE51717
+742224AAACABAB242200000500C8FE140767076D0011001B00340040004C000001220623
+222635343633321615140607170712102623220610163332051600171615142322272314
+172336352306232235343736000122151114332132351134232521321511142321223511
+3402FB0411059E9B9C9E9F9C56587E5F0A55616055556061019441013B091BC36C421E3B
+983B1E426CC31B09013BFD22787804BF7878FB4104BFF0F0FB41F0032C01D7DADBD7D7DB
+A5C9286A38018001709E9EFE909E6E79FE7E26254EE49BCC6B6BCC9BE44E252601820456
+78F887787807797878F0F887F0F00779F000000400C8FE140767076D001800240030003B
+000001160017161514232227231417233635230623223534373600012215111433213235
+113423252132151114232122351134173311013309012301112304D741013B091BC36C42
+1E3B983B1E426CC31B09013BFD22787804BF7878FB4104BFF0F0FB41F0F07F016AA4FE69
+01B8A7FE787F031879FE7E26254EE49BCC6B6BCC9BE44E25260182045678F88778780779
+7878F0F887F0F00779F0F0FE9F0161FE7AFE420193FE6D000000000500C8FE140767076D
+00150021002D003000380000013637363332171615140709012635343736333217160122
+15111433213235113423252132151114232122351134010321033301232721072304CC16
+373E548B3E137DFEC4FEC07D133F8A563C37FD02787804BF7878FB4104BFF0F0FB41F002
+4B86010CD29A01208444FEB6448401B6763E47952D3B9E9FFE6E01929DA03B2D95474104
+CC78F887787807797878F0F887F0F00779F0FEACFE55020FFCBCDADA0000000400C8FE14
+0767076D00150021002D0046000001363736333217161514070901263534373633321716
+012215111433213235113423252132151114232122351134012115213536370035342623
+220607353E013332161514010604CC16373E548B3E137DFEC4FEC07D133F8A563C37FD02
+787804BF7878FB4104BFF0F0FB41F0019E01A8FDAA223F01586855347A484D853991AEFE
+B53801B6763E47952D3B9E9FFE6E01929DA03B2D95474104CC78F887787807797878F0F8
+87F0F00779F0FC3F726E1F3801315E425123237B1C1C846C8BFEE4300000000400C8FE14
+0767076D00150021002D0056000001363736333217161514070901263534373633321716
+012215111433213235113423252132151114232122351134011E0115140623222627351E
+013332363534262B013533323635342623220607353E0133321615140604CC16373E548B
+3E137DFEC4FEC07D133F8A563C37FD02787804BF7878FB4104BFF0F0FB41F0029A5C65BE
+B1397D463477436D786F6C565E5E61645F28665149803790A95A01B6763E47952D3B9E9F
+FE6E01929DA03B2D95474104CC78F887787807797878F0F887F0F00779F0FD91126D527C
+861514791B1A4F464A4C6C3F3C3A3D1217731112766345600000000500C8FE140767076D
+00150021002D0030003B0000013637363332171615140709012635343736333217160122
+151114332132351134232521321511142321223511340901210333113315231523352135
+04CC16373E548B3E137DFEC4FEC07D133F8A563C37FD02787804BF7878FB4104BFF0F0FB
+41F0028EFECB013516A6878790FE6201B6763E47952D3B9E9FFE6E01929DA03B2D954741
+04CC78F887787807797878F0F887F0F00779F0FE97FE5D021CFDE46DBABA790000000004
+00C8FE140767076D00150021002D004E0000013637363332171615140709012635343736
+333217160122151114332132351134232521321511142321223511340521152115363736
+3332171615140706232226273516171633323634262322060704CC16373E548B3E137DFE
+C4FEC07D133F8A563C37FD02787804BF7878FB4104BFF0F0FB41F0011801FEFE791C1D1C
+1CA15E5E6160B03C7E42393E3E456F82826F34683601B6763E47952D3B9E9FFE6E01929D
+A03B2D95474104CC78F887787807797878F0F887F0F00779F0F05FCC0904044D4C83874B
+4A1212711B0E0D66AE6614150000000500C8FE140767076D00150021002D003D005D0000
+013637363332171615140709012635343736333217160122151114332132351134232521
+321511142321223511340122070615141716333237363534272613152627262322070607
+3637363332171615140706232226353437363332171604CC16373E548B3E137DFEC4FEC0
+7D133F8A563C37FD02787804BF7878FB4104BFF0F0FB41F0024758333333335857333333
+33AB313232318044440A26393A44915454585791A7B06C6CB631323201B6763E47952D3B
+9E9FFE6E01929DA03B2D95474104CC78F887787807797878F0F887F0F00779F0FD9E3435
+5B5A343535345A5B3534016267140A0B4B4C99311A1A4C4D847F4F4EDED4C67576080900
+0000000400C8FE140767076D00150021002D003400000136373633321716151407090126
+353437363332171601221511143321323511342325213215111423212235113417211501
+23012104CC16373E548B3E137DFEC4FEC07D133F8A563C37FD02787804BF7878FB4104BF
+F0F0FB41F0F00269FEA4880148FE3301B6763E47952D3B9E9FFE6E01929DA03B2D954741
+04CC78F887787807797878F0F887F0F00779F0F030FCED02E400000600C8FE140767076D
+00150021002D003A00580067000001363736333217161514070901263534373633321716
+012215111433213235113423252132151114232122351134002207061514163332373634
+272526272635343620171615140706071617161514070623222726353437363714171633
+3237363534272622070604CC16373E548B3E137DFEC4FEC07D133F8A563C37FD02787804
+BF7878FB4104BFF0F0FB41F00297BA35356A5D5C363535FEEC542E2FA4011E52512E2F53
+5A383555569E9F555635362D2F2E55513130302FA6302F01B6763E47952D3B9E9FFE6E01
+929DA03B2D95474104CC78F887787807797878F0F887F0F00779F0FD5B2C2B4B4C562C2B
+962B5D1231324864743A3A644A303112123A37507941414141794E3938C63F2625252441
+3F2625252400000500C8FE140767076D00150021002D004D005C00000136373633321716
+151407090126353437363332171601221511143321323511342325213215111423212235
+113401351617163332373637060706232226353437363332171615140706232227261332
+3635342726232207061514171604CC16373E548B3E137DFEC4FEC07D133F8A563C37FD02
+787804BF7878FB4104BFF0F0FB41F0012E313232308144430A233C394590A8575891A757
+586B6CB6313232CC5866333358553534343301B6763E47952D3B9E9FFE6E01929DA03B2D
+95474104CC78F887787807797878F0F887F0F00779F0FBDF67140B0A4B4B9A2F1B1A9884
+814D4E6F6FD4C6757608090172685C5A343535345A5C34340000000600C8FE140767076D
+00150021002D003B0047004E000001363736333217161514070901263534373633321716
+012215111433213235113423252132151114232122351134002207061514171632373635
+342F0132161514062322263534360111073537331104CC16373E548B3E137DFEC4FEC07D
+133F8A563C37FD02787804BF7878FB4104BFF0F0FB41F003EA8E323333328E3233337983
+AAAA83A28C8CFE74858C8901B6763E47952D3B9E9FFE6E01929DA03B2D95474104CC78F8
+87787807797878F0F887F0F00779F0FEC85656ACAD56565656ADAC56AFDED3D4DEDED4D3
+DEFCAC02D1297427FCBD000400C8FE140767076D00150021002D003A0000013637363332
+171615140709012635343736333217160122151114332132351134232521321511142321
+223511340533111407062B01353332363504CC16373E548B3E137DFEC4FEC07D133F8A56
+3C37FD02787804BF7878FB4104BFF0F0FB41F001B27F41408F3128544601B6763E47952D
+3B9E9FFE6E01929DA03B2D95474104CC78F887787807797878F0F887F0F00779F0F0FDDC
+95464560546C000400C8FE140767076D00150021002D0047000001363736333217161514
+070901263534373633321716012215111433213235113423252132151114232122351134
+010E0123222635343633321617152E012322061514163332363704CC16373E548B3E137D
+FEC4FEC07D133F8A563C37FD02787804BF7878FB4104BFF0F0FB41F0033C316539B5C8C9
+B43966302F6A367C7C7B7D376A2E01B6763E47952D3B9E9FFE6E01929DA03B2D95474104
+CC78F887787807797878F0F887F0F00779F0FBEB1716E3CECDE51717742224AAACABAB24
+2200000500D9FE140778076D0011001B0031003D00490000012206232226353436333216
+151406071707121026232206101633320136373633321716151407090126353437363332
+171601221511143321323511342325213215111423212235113402FB0411059E9B9C9E9F
+9C56587E5F0A55616055556061018916373E548B3E137DFEC4FEC07D133F8A563C37FD13
+787804BF7878FB4104BFF0F0FB41F0032C01D7DADBD7D7DBA5C9286A38018001709E9EFE
+909EFE30763E47952D3B9E9FFE6E01929DA03B2D95474104CC78F887787807797878F0F8
+87F0F00779F0000400C8FE140767076D00150021002D0038000001363736333217161514
+070901263534373633321716012215111433213235113423252132151114232122351134
+173311013309012301112304CC16373E548B3E137DFEC4FEC07D133F8A563C37FD027878
+04BF7878FB4104BFF0F0FB41F0F07F016AA4FE6901B8A7FE787F01B6763E47952D3B9E9F
+FE6E01929DA03B2D95474104CC78F887787807797878F0F887F0F00779F0F0FE9F0161FE
+7AFE420193FE6D000000000500C8FE140767076D00060012001E00210029000001300901
+300130012215111433213235113423252132151114232122351134010321033301232721
+072304CA0198FE68FE66FE88787804BF7878FB4104BFF0F0FB41F0024B86010CD29A0120
+8444FEB6448402F9FDF2FDFA0206060A78F887787807797878F0F887F0F00779F0FEACFE
+55020FFCBCDADA000000000400C8FE140767076D00060012001E00370000013009013001
+300122151114332132351134232521321511142321223511340121152135363700353426
+23220607353E013332161514010604CA0198FE68FE66FE88787804BF7878FB4104BFF0F0
+FB41F0019E01A8FDAA223F01586855347A484D853991AEFEB53802F9FDF2FDFA0206060A
+78F887787807797878F0F887F0F00779F0FC3F726E1F3801315E425123237B1C1C846C8B
+FEE430000000000400C8FE140767076D00060012001E0047000001300901300130012215
+111433213235113423252132151114232122351134011E0115140623222627351E013332
+363534262B013533323635342623220607353E0133321615140604CA0198FE68FE66FE88
+787804BF7878FB4104BFF0F0FB41F0029A5C65BEB1397D463477436D786F6C565E5E6164
+5F28665149803790A95A02F9FDF2FDFA0206060A78F887787807797878F0F887F0F00779
+F0FD91126D527C861514791B1A4F464A4C6C3F3C3A3D1217731112766345600000000005
+00C8FE140767076D00060012001E0021002C000001300901300130012215111433213235
+113423252132151114232122351134090121033311331523152335213504CA0198FE68FE
+66FE88787804BF7878FB4104BFF0F0FB41F0028EFECB013516A6878790FE6202F9FDF2FD
+FA0206060A78F887787807797878F0F887F0F00779F0FE97FE5D021CFDE46DBABA790004
+00C8FE140767076D00060012001E003F0000013009013001300122151114332132351134
+232521321511142321223511340521152115363736333217161514070623222627351617
+1633323634262322060704CA0198FE68FE66FE88787804BF7878FB4104BFF0F0FB41F001
+1801FEFE791C1D1C1CA15E5E6160B03C7E42393E3E456F82826F34683602F9FDF2FDFA02
+06060A78F887787807797878F0F887F0F00779F0F05FCC0904044D4C83874B4A1212711B
+0E0D66AE661415000000000500C8FE140767076D00060012001E002E004E000001300901
+300130012215111433213235113423252132151114232122351134012207061514171633
+323736353427261315262726232207060736373633321716151407062322263534373633
+32171604CA0198FE68FE66FE88787804BF7878FB4104BFF0F0FB41F00247583333333358
+5733333333AB313232318044440A26393A44915454585791A7B06C6CB631323202F9FDF2
+FDFA0206060A78F887787807797878F0F887F0F00779F0FD9E34355B5A343535345A5B35
+34016267140A0B4B4C99311A1A4C4D847F4F4EDED4C675760809000400C8FE140767076D
+00060012001E002500000130090130013001221511143321323511342325213215111423
+21223511341721150123012104CA0198FE68FE66FE88787804BF7878FB4104BFF0F0FB41
+F0F00269FEA4880148FE3302F9FDF2FDFA0206060A78F887787807797878F0F887F0F007
+79F0F030FCED02E40000000600C8FE140767076D00060012001E002B0049005800000130
+090130013001221511143321323511342325213215111423212235113400220706151416
+333237363427252627263534362017161514070607161716151407062322272635343736
+37141716333237363534272622070604CA0198FE68FE66FE88787804BF7878FB4104BFF0
+F0FB41F00297BA35356A5D5C363535FEEC542E2FA4011E52512E2F535A383555569E9F55
+5635362D2F2E55513130302FA6302F02F9FDF2FDFA0206060A78F887787807797878F0F8
+87F0F00779F0FD5B2C2B4B4C562C2B962B5D1231324864743A3A644A303112123A375079
+41414141794E3938C63F26252524413F262525240000000500C8FE140767076D00060012
+001E003E004D000001300901300130012215111433213235113423252132151114232122
+351134013516171633323736370607062322263534373633321716151407062322272613
+323635342726232207061514171604CA0198FE68FE66FE88787804BF7878FB4104BFF0F0
+FB41F0012E313232308144430A233C394590A8575891A757586B6CB6313232CC58663333
+58553534343302F9FDF2FDFA0206060A78F887787807797878F0F887F0F00779F0FBDF67
+140B0A4B4B9A2F1B1A9884814D4E6F6FD4C6757608090172685C5A343535345A5C343400
+0000000600C8FE140767076D00060012001E002C0038003F000001300901300130012215
+111433213235113423252132151114232122351134002207061514171632373635342F01
+32161514062322263534360111073537331104CA0198FE68FE66FE88787804BF7878FB41
+04BFF0F0FB41F003EA8E323333328E3233337983AAAA83A28C8CFE74858C8902F9FDF2FD
+FA0206060A78F887787807797878F0F887F0F00779F0FEC85656ACAD56565656ADAC56AF
+DED3D4DEDED4D3DEFCAC02D1297427FCBD00000400C8FE140767076D00060012001E002B
+000001300901300130012215111433213235113423252132151114232122351134053311
+1407062B01353332363504CA0198FE68FE66FE88787804BF7878FB4104BFF0F0FB41F001
+B27F41408F3128544602F9FDF2FDFA0206060A78F887787807797878F0F887F0F00779F0
+F0FDDC95464560546C00000400C8FE140767076D00060012001E00380000013009013001
+30012215111433213235113423252132151114232122351134010E012322263534363332
+1617152E012322061514163332363704CA0198FE68FE66FE88787804BF7878FB4104BFF0
+F0FB41F0033C316539B5C8C9B43966302F6A367C7C7B7D376A2E02F9FDF2FDFA0206060A
+78F887787807797878F0F887F0F00779F0FBEB1716E3CECDE51717742224AAACABAB2422
+0000000500C8FE140767076D000600180022002E003A0000013009013001300322062322
+263534363332161514060717071210262322061016333201221511143321323511342325
+213215111423212235113404CA0198FE68FE66350411059E9B9C9E9F9C56587E5F0A5561
+6055556061FE75787804BF7878FB4104BFF0F0FB41F002F9FDF2FDFA0206024101D7DADB
+D7D7DBA5C9286A38018001709E9EFE909E036F78F887787807797878F0F887F0F00779F0
+0000000400C8FE140767076D00060012001E002900000130090130013001221511143321
+3235113423252132151114232122351134173311013309012301112304CA0198FE68FE66
+FE88787804BF7878FB4104BFF0F0FB41F0F07F016AA4FE6901B8A7FE787F02F9FDF2FDFA
+0206060A78F887787807797878F0F887F0F00779F0F0FE9F0161FE7AFE420193FE6D0003
+00C8FE140767076D00090015002100000113210113090113012101221511143321323511
+342325213215111423212235113404188E01D1FE898FFE89FE8790FE8901D0FE30787804
+BF7878FB4104BFF0F0FB41F00531FE47FEEFFE470111FEEF01B90111037D78F887787807
+797878F0F887F0F00779F0000000000500C8FE140767076D0023002F003B003E00460000
+053635062726272635343736333217263534201514073633321716151407060706271417
+012215111433213235113423252132151114232122351134010321033301232721072304
+553948AA351992103FAB4B317C01D87C314BAB3F10921935A94939FCC9787804BF7878FB
+4104BFF0F0FB41F0024B86010CD29A01208444FEB64484FC4CFBC303010C439534248D13
+826AEAEA6A82138D243492460C0105C5FB4C07F178F887787807797878F0F887F0F00779
+F0FEACFE55020FFCBCDADA000000000400C8FE140767076D0023002F003B005400000536
+350627262726353437363332172635342015140736333217161514070607062714170122
+151114332132351134232521321511142321223511340121152135363700353426232206
+07353E013332161514010604553948AA351992103FAB4B317C01D87C314BAB3F10921935
+A94939FCC9787804BF7878FB4104BFF0F0FB41F0019E01A8FDAA223F01586855347A484D
+853991AEFEB538FC4CFBC303010C439534248D13826AEAEA6A82138D243492460C0105C5
+FB4C07F178F887787807797878F0F887F0F00779F0FC3F726E1F3801315E425123237B1C
+1C846C8BFEE430000000000400C8FE140767076D0023002F003B00640000053635062726
+272635343736333217263534201514073633321716151407060706271417012215111433
+213235113423252132151114232122351134011E0115140623222627351E013332363534
+262B013533323635342623220607353E0133321615140604553948AA351992103FAB4B31
+7C01D87C314BAB3F10921935A94939FCC9787804BF7878FB4104BFF0F0FB41F0029A5C65
+BEB1397D463477436D786F6C565E5E61645F28665149803790A95AFC4CFBC303010C4395
+34248D13826AEAEA6A82138D243492460C0105C5FB4C07F178F887787807797878F0F887
+F0F00779F0FD91126D527C861514791B1A4F464A4C6C3F3C3A3D12177311127663456000
+0000000500C8FE140767076D0023002F003B003E00490000053635062726272635343736
+333217263534201514073633321716151407060706271417012215111433213235113423
+252132151114232122351134090121033311331523152335213504553948AA351992103F
+AB4B317C01D87C314BAB3F10921935A94939FCC9787804BF7878FB4104BFF0F0FB41F002
+8EFECB013516A6878790FE62FC4CFBC303010C439534248D13826AEAEA6A82138D243492
+460C0105C5FB4C07F178F887787807797878F0F887F0F00779F0FE97FE5D021CFDE46DBA
+BA79000400C8FE140767076D0023002F003B005C00000536350627262726353437363332
+172635342015140736333217161514070607062714170122151114332132351134232521
+321511142321223511340521152115363736333217161514070623222627351617163332
+3634262322060704553948AA351992103FAB4B317C01D87C314BAB3F10921935A94939FC
+C9787804BF7878FB4104BFF0F0FB41F0011801FEFE791C1D1C1CA15E5E6160B03C7E4239
+3E3E456F82826F346836FC4CFBC303010C439534248D13826AEAEA6A82138D243492460C
+0105C5FB4C07F178F887787807797878F0F887F0F00779F0F05FCC0904044D4C83874B4A
+1212711B0E0D66AE661415000000000500C8FE140767076D0023002F003B004B006B0000
+053635062726272635343736333217263534201514073633321716151407060706271417
+012215111433213235113423252132151114232122351134012207061514171633323736
+353427261315262726232207060736373633321716151407062322263534373633321716
+04553948AA351992103FAB4B317C01D87C314BAB3F10921935A94939FCC9787804BF7878
+FB4104BFF0F0FB41F002475833333333585733333333AB313232318044440A26393A4491
+5454585791A7B06C6CB6313232FC4CFBC303010C439534248D13826AEAEA6A82138D2434
+92460C0105C5FB4C07F178F887787807797878F0F887F0F00779F0FD9E34355B5A343535
+345A5B3534016267140A0B4B4C99311A1A4C4D847F4F4EDED4C675760809000400C8FE14
+0767076D0023002F003B0042000005363506272627263534373633321726353420151407
+363332171615140706070627141701221511143321323511342325213215111423212235
+11341721150123012104553948AA351992103FAB4B317C01D87C314BAB3F10921935A949
+39FCC9787804BF7878FB4104BFF0F0FB41F0F00269FEA4880148FE33FC4CFBC303010C43
+9534248D13826AEAEA6A82138D243492460C0105C5FB4C07F178F887787807797878F0F8
+87F0F00779F0F030FCED02E40000000600C8FE140767076D0023002F003B004800660075
+000005363506272627263534373633321726353420151407363332171615140706070627
+141701221511143321323511342325213215111423212235113400220706151416333237
+363427252627263534362017161514070607161716151407062322272635343736371417
+16333237363534272622070604553948AA351992103FAB4B317C01D87C314BAB3F109219
+35A94939FCC9787804BF7878FB4104BFF0F0FB41F00297BA35356A5D5C363535FEEC542E
+2FA4011E52512E2F535A383555569E9F555635362D2F2E55513130302FA6302FFC4CFBC3
+03010C439534248D13826AEAEA6A82138D243492460C0105C5FB4C07F178F88778780779
+7878F0F887F0F00779F0FD5B2C2B4B4C562C2B962B5D1231324864743A3A644A30311212
+3A37507941414141794E3938C63F26252524413F262525240000000500C8FE140767076D
+0023002F003B005B006A0000053635062726272635343736333217263534201514073633
+321716151407060706271417012215111433213235113423252132151114232122351134
+013516171633323736370607062322263534373633321716151407062322272613323635
+342726232207061514171604553948AA351992103FAB4B317C01D87C314BAB3F10921935
+A94939FCC9787804BF7878FB4104BFF0F0FB41F0012E313232308144430A233C394590A8
+575891A757586B6CB6313232CC58663333585535343433FC4CFBC303010C439534248D13
+826AEAEA6A82138D243492460C0105C5FB4C07F178F887787807797878F0F887F0F00779
+F0FBDF67140B0A4B4B9A2F1B1A9884814D4E6F6FD4C6757608090172685C5A343535345A
+5C3434000000000600C8FE140767076D0023002F003B00490055005C0000053635062726
+272635343736333217263534201514073633321716151407060706271417012215111433
+213235113423252132151114232122351134002207061514171632373635342F01321615
+14062322263534360111073537331104553948AA351992103FAB4B317C01D87C314BAB3F
+10921935A94939FCC9787804BF7878FB4104BFF0F0FB41F003EA8E323333328E32333379
+83AAAA83A28C8CFE74858C89FC4CFBC303010C439534248D13826AEAEA6A82138D243492
+460C0105C5FB4C07F178F887787807797878F0F887F0F00779F0FEC85656ACAD56565656
+ADAC56AFDED3D4DEDED4D3DEFCAC02D1297427FCBD00000400C8FE140767076D0023002F
+003B00480000053635062726272635343736333217263534201514073633321716151407
+060706271417012215111433213235113423252132151114232122351134053311140706
+2B01353332363504553948AA351992103FAB4B317C01D87C314BAB3F10921935A94939FC
+C9787804BF7878FB4104BFF0F0FB41F001B27F41408F31285446FC4CFBC303010C439534
+248D13826AEAEA6A82138D243492460C0105C5FB4C07F178F887787807797878F0F887F0
+F00779F0F0FDDC95464560546C00000400C8FE140767076D0023002F003B005500000536
+350627262726353437363332172635342015140736333217161514070607062714170122
+15111433213235113423252132151114232122351134010E012322263534363332161715
+2E012322061514163332363704553948AA351992103FAB4B317C01D87C314BAB3F109219
+35A94939FCC9787804BF7878FB4104BFF0F0FB41F0033C316539B5C8C9B43966302F6A36
+7C7C7B7D376A2EFC4CFBC303010C439534248D13826AEAEA6A82138D243492460C0105C5
+FB4C07F178F887787807797878F0F887F0F00779F0FBEB1716E3CECDE51717742224AAAC
+ABAB24220000000500C8FE140767076D0023002F003B004D005700000536350627262726
+353437363332172635342015140736333217161514070607062714170122151114332132
+351134232521321511142321223511340122062322263534363332161514060717071210
+262322061016333204553948AA351992103FAB4B317C01D87C314BAB3F10921935A94939
+FCC9787804BF7878FB4104BFF0F0FB41F002330411059E9B9C9E9F9C56587E5F0A556160
+55556061FC4CFBC303010C439534248D13826AEAEA6A82138D243492460C0105C5FB4C07
+F178F887787807797878F0F887F0F00779F0FBBF01D7DADBD7D7DBA5C9286A3801800170
+9E9EFE909E00000400C8FE140767076D0023002F003B0046000005363506272627263534
+373633321726353420151407363332171615140706070627141701221511143321323511
+3423252132151114232122351134173311013309012301112304553948AA351992103FAB
+4B317C01D87C314BAB3F10921935A94939FCC9787804BF7878FB4104BFF0F0FB41F0F07F
+016AA4FE6901B8A7FE787FFC4CFBC303010C439534248D13826AEAEA6A82138D24349246
+0C0105C5FB4C07F178F887787807797878F0F887F0F00779F0F0FE9F0161FE7AFE420193
+FE6D000400C8FE140767076D00090013001F002B00000103210503250503252103130501
+132505130125012215111433213235113423252132151114232122351134041864FEBC01
+066501070105630105FEBB62AD01B2FEB860FE89FE8762FEB701B3FE4D787804BF7878FB
+4104BFF0F0FB41F0046EFECEBEFECDBEBE0133BE01F5FE6F28FEE2FE54DFDF01A8012228
+035578F887787807797878F0F887F0F00779F000000000080099FF6A07BF075600070011
+00190023002B0033007F00B7000000343632161406223722061514333236353424140622
+26343632172206151433323635340034363216140622361406222634363206323E033713
+17073E043534262726273E0135342623220E011514170726353437262207161514072736
+35342E012322061514161706070E0115141E03172737131E031232173E01333216151407
+1615140E02070507250706070507250E01222627052725262F010527252E033534372635
+34363332161702E6425C42425C74112D0D112E01AF425C42425C17112C0D112DFE6F1620
+161620EC1620161620A16C4E2E1B090210860C3B71735636433730414962624F53824312
+8217012AA82A011782124382534F62624941303743365673713B0C861002091B2E38984C
+2BCA8F8BAD5D9C4B839859019F04FDEC01020401FB16FE0D20A9FAA920FE0D1601FB0402
+01FDEC04019F5998834B9C5DAD8B8FCA2B03389067679067823D18123E18117590676790
+67DC3D18123E1811FD2236272736275D3627273627E024395D573E013A06FB1F4C6B7493
+4C4A9837332823835851696BA45C423F2653541B0E03030E1B5453263F425CA46B695158
+8323283337984A4C93746B4C1FFB06FEC63E575D3906020686BEB78C8A72ACC86CC8A17E
+331A4423011F1FAE40AC6D8A8A6DAC40AE1F1F0123441A337EA1C86CC8AC728A8CB7BE86
+0000000B004BFF6A092D068A00090014001800220028002C008E0099009F00FD01070000
+012226343633321614062732363534232207061514173315230122263436333216140601
+37170727370115233525170607061514171E0133323736373635342726273716173E0437
+1633323E04373E013534272E0423220E020F0106072624200407262F012E0323220E0307
+06151416171E053332371E04173625323635342322070615140107170727370134372726
+2723222E06272E0135343E01373E0133321E0217161F01363736201716173736373E0333
+3216171E02151406070E072B01060F01161514070607060706070E012226272627262726
+2726010620271617163332360379323E3D33323E3D1E122D0E111716356E6E0249333D3E
+32333D3EFB5333C5393F2A03946EFDD2423F11053934B18B694580423905113F42181205
+1E0D140A0152272038252F16360C312E3402261E2B2B121120231013133F593DFEF7FEBE
+FEF73D593F131310232011122B2B1E2602342E310C36162F2538202752010A140D1E0512
+0306122D0E11171601EDAA2A3F39C5FACB0D1539100A213B2B351B37133F0A423A292C23
+3387411D333219172511412837A401A4A43728411125171932331D418733232C293A420A
+3F13371B352B3B210A1039150D0D2260091620423688C48836422016095F230D033461FE
+BA61111F379D6B7E02D16E826E6E826E1B4115111F1D1912D4D2018B6E826E6E826E02B5
+2DDABA1894FD4DD2D29376244411194B3B3722080D443B4B19114424760D0F136835574D
+27140B0C2011310A2A4C372E3402281A23130E221119194E83656D6D65834E191911220E
+13231A2802342E374C2A0A3111200C0B14274D573568130F4E4115111F1D1912029ABB94
+18BADAFBEF2A2C50DD4909081B0D2C0F39093A6B52345F35223253122718192715521D1B
+4E4E1B1D52152719182712533222355F34526B3A09390F2C0D1B080949DD502C2A302873
+424430482E261B1B262E483044427328FEE016162415272600000008003DFF6A081D0714
+00110019002800320041004E007F00B80000013716333237163332371706232227062322
+01170622273716320106070623222726353437363332160722061514173E013726053E01
+33321716151407062322272617163332373635342726232206053635342E022726270607
+26232207262706070E031514172517051617251705161716203736372537053637253705
+2635343E0337363F01171E01173632173E013F011716171E041514071707270607170727
+02070621202726030727372627072702A65C455B3A54543A5B455C6C904A4445499001B8
+3E7AC27A3E5A86FEFC2B512028463615352F4146654E2430052B45121601B8056446422F
+35153646282051790C1A302810040C0D2C400193120A0A16041B2AF399749B9D7499F32A
+1B05150B0A1201420AFEBF0E17011E1AFEE167A4B501EAB5A467FEE11A011E150FFEC00A
+FAC01107130C1F0517260F3C8FFD5D69E2695DFD8F3B102617051F0C1307116C0A6D0F20
+6E1A6D75C3D9FEE0FEDFD9C1766D1A6D1E106D0A018C62402C2C4062641C1C01A8783D3D
+782E01064C1C0B23242D47302C612630240E0F073425111D43612C30472D24230B1C0403
+16181C0E0C033BA782742E663E7619A1A73AC41515C43AA7A11B7241652E74822B422C45
+40793E7AE777848477E77A3E79394C2C423D7C8F396A77419318758C3A091689610D0D61
+8916093A8C75189341776A398F7C0F420E51572E3E2EFEF78E9E9E8C010B2E3E2E51570E
+4200000B00AAFF6A0896070B00070011001D00250031003B00470068009800AA00BC0000
+003436321614062237220615143332363534032235343736333215140706001406222634
+363201343332171615142322272601220615143332363534013716333236371706212226
+122037363534273E0235342726232206072E012322070615141E01170615141712200417
+16173633321615140706070E012B0106070E01070620272E012726272322262726272635
+343633321736373603262322070E011514171617163B0136372625060716173332373637
+36353426272623220319527452527491163710163810182C251E182C25020D5274525274
+FEFF181F252C181F252C011E1637101638FCE36A82CE60B43B6AA8FEEE80EA8A01C0A57C
+541E1D1F565A8247711F1C7047825A561F1D1E547CD0016A0137616910191D6A90080D1C
+228659070F3A38AB6D94FEE0946DAB383A0F075986221C0D08906A1D19106961D618200D
+15282B0717471F2604083C35057410353C0804261F4717072B28150D2004087452527452
+6831130E31130EFE521520241F1520241F020C7452527452FE05151F2420151F24016B31
+130E31130EFDA854A4584C54D672FEDECB9AB886952C305E318A696F453535456F698A31
+5E302C9586B89A0600A47C889B06A4872C365B3F4B697B706EAD374C4C37AD6E707B694B
+3F5B362C87A4069B887CFDCC15070F523A1E33972F15877B576060577B87152F97331E3A
+520F07000000000900AAFF6A07AD066E000B00160022002E00340039003E004200460000
+013436333216151406232226253436321615140623222605100021200011100021200003
+100021200011100021200001211000200005363711230311231116253637230535231602
+82513B3A52523A3B510242527453533A3B51FC6D01BF013C013D01BDFE43FEC3FEC4FE41
+87020E01740175020CFDF4FE8BFE8CFDF2011404DBFE95FDFCFE9402B2584CA488A44C02
+0C481C64FD20651C03FF3B51513B3A53533A3B51513B3A5353DBFEC4FE4301BD013C013D
+01C0FE40FEC30175020FFDF1FE8BFE8CFDF4020C016AFEFEFE96016ADF0B2A0125FEA601
+5AFEDB2A995264B8B866000900AAFF6A07AD066E000B00170023002F0035003A003F0043
+004700000110002120001110002120000310002120001110002120000134363216152334
+262206152134363216152334262206150721100020000536371123031123111625363723
+05352316013101BF013C013D01BDFE43FEC3FEC4FE4187020E01740175020CFDF4FE8BFE
+8CFDF203BC8CC48C873D543DFD298CC48C873D543DDF04DBFE95FDFCFE9402B2584CA488
+A44C020C481C64FD20651C02EAFEC4FE4301BD013C013D01C0FE40FEC30175020FFDF1FE
+8BFE8CFDF4020C02168BC5C58B537777538BC5C58B53777753ACFEFEFE96016ADF0B2A01
+25FEA6015AFEDB2A995264B8B8660009005FFF6A08F9066E00030007000C001100170023
+002F0059007E000001352316053637230111231116173637112325211000200013343632
+161523342622061521343632161523342622061505100021200011140717161716151406
+2227262F010207002120012603070607062226353437363F012637100021200011342706
+232227262F011716172627262120070607363F0107060706222706033C651C0329481C64
+FE4CA44CE0584CA4FD4E04DBFE95FDFCFE94588CC48C873D543D01C98CC48C873D543DFB
+BD020E01740175020C025D3B181E364C1F19120B2AD1FEFAFE8BFE8CFEF9D12B0A12191F
+4C361E173C5C028701BF013C013D01BD011B25261F19122D8829182F9ADEFEC2FEC4E09A
+2F1829882D12191F4C1B0101A1B866505264FEA6015AFEDB2A0B0B2A012587FEFEFE9601
+6A01AE8BC5C58B537777538BC5C58B53777753A20175020FFDF1FE8B1D1B1F14181F2526
+361F193920FEE9D1FEFA0106D001161E39191F3626251F19131E1C1DFEC4FE4301BD013C
+14131A1F1939882D0E0FC79AE0E09BC6100D2D8839191F1B1400000600AAFF6A07AD066E
+000B00160022002E0034003C000001343633321615140623222625343632161514062322
+260510002120001110002120001310002120001110002120001321100020002521161716
+2437360282513B3A52523A3B510242527453533A3B51FBE6020E01740175020CFDF4FE8B
+FE8CFDF28701BF013C013D01BDFE43FEC3FEC4FE418D04DBFE95FDFCFE940442FC57215C
+8E01948E5C03FF3B51513B3A53533A3B51513B3A5353DB0175020FFDF1FE8BFE8CFDF402
+0C0174FEC4FE4301BD013C013D01C0FE40FEB9FEFEFE96016A7B755C8E018E5C00000006
+00AAFF6A07AD066E000B00170023002F0035003E00000134363216152334262206152134
+363216152334262206150510002120001110002120001310002120001110002120001321
+1000200025211617163732373602168CC48C873D543D01C98CC48C873D543DFBBD020E01
+740175020CFDF4FE8BFE8CFDF28701BF013C013D01BDFE43FEC3FEC4FE418D04DBFE95FD
+FCFE940442FC57215C8ECACA8E5C038C8BC5C58B537777538BC5C58B53777753A2017502
+0FFDF1FE8BFE8CFDF4020C0174FEC4FE4301BD013C013D01C0FE40FEB9FEFEFE96016A7B
+755C8E018E5C000700AAFF6A07AD066E000B00170023002F003B0041004A000001171607
+060706222635343705343632161523342622061521343632161523342622061505100021
+200011100021200013100021200011100021200013211000200025211617163732373606
+A8411C01011A1B4C361BFBAF8CC48C873D543D01C98CC48C873D543DFBBD020E01740175
+020CFDF4FE8BFE8CFDF28701BF013C013D01BDFE43FEC3FEC4FE418D04DBFE95FDFCFE94
+0442FC57215C8ECACA8E5C042C8038222B1A1B362C2335208BC5C58B537777538BC5C58B
+53777753A20175020FFDF1FE8BFE8CFDF4020C0174FEC4FE4301BD013C013D01C0FE40FE
+B9FEFEFE96016A7B755C8E018E5C000600AAFF6A07AD066E0006000D00190025002B0033
+000001251707170725271505273727370110002120001110002120001310002120001110
+002120001321100020002521161716243736047C01274DC6C64DFED9A0FED94DC6C64DFD
+F5020E01740175020CFDF4FE8BFE8CFDF28701BF013C013D01BDFE43FEC3FEC4FE418D04
+DBFE95FDFCFE940442FC57215C8E01948E5C0427CE6E8B8A6ECE5555CE6E8A8B6EFDF501
+75020FFDF1FE8BFE8CFDF4020C0174FEC4FE4301BD013C013D01C0FE40FEB9FEFEFE9601
+6A7B755C8E018E5C00000007008FFF6A07C80763000F001F002A003500490057005F0000
+0137161716043736371706070620272601100021200011102F0106212027070605343632
+161514062322262534363332161406232226013424212004151407161110002120001110
+372625363534242120041514173621201726232207163332021D731C288F01938E271D73
+2532B6FDFCB632FEEF01BF013C013D01BDDE0EE5FED7FED8E60EE00394527453533A3B51
+FDBE513B3A52523A3B51FE0D021E017F0180021CFDE2FDF4FE8BFE8CFDF2E3FE05DBBCFE
+43FEC3FEC4FE41BDF4014A014B43B0DEDDB0B0DDDE01D1472C268D018E272C483932B5B5
+330151FEC4FE4301BD013C013DE00E39390EE02A3B51513B3A53533A3B5151765253025C
+86BEBE86825CFCFEA5FE8CFDF4020C0174015BFC5C02364A517272514A36CFF56E6E1C00
+0000000700AAFF6A07AD07300003000E0019001D002D0039004A00000105072501343632
+161514062322262534363332161406232226011705270137161716203736371706070620
+2726011000212000111000212000013620172511161110002120001110371102D2012F4D
+FED1023F527453533A3B51FDBE513B3A52523A3B5103044DFED14DFDC6731C288E01948E
+271D732532B6FDFCB632FEEF01BF013C013D01BDFE43FEC3FEC4FE4101E284012A8401BB
+ADFDF4FE8BFE8CFDF2AE0567D46FD5FEBC3B51513B3A53533A3B515176525301EC6ED56F
+FD3E472C268E8E272C483932B5B5330151FEC4FE4301BD013C013D01C0FE40021D2A2AEC
+FDD0E7FED1FE8CFDF4020C0174012FE70230000500AAFF6A07AD066E000F001B00270032
+003900000137161716203736371706070620272601100021200011100021200003100021
+200011100021200001343633321614062322262D011707170725021D731C288E01948E27
+1D732532B6FDFCB632FEEF01BF013C013D01BDFE43FEC3FEC4FE4187020E01740175020C
+FDF4FE8BFE8CFDF201D8513B3A52523A3B5101FA01274DC6C64DFED901D1472C268E8E27
+2C483932B5B5330151FEC4FE4301BD013C013D01C0FE40FEC30175020FFDF1FE8BFE8CFD
+F4020C02873B515176525364CE6E8B8A6ECE000500AAFF6A07AD066E000F001B00270033
+003F00000137161716203736371706070620272603343632161523342622061521343632
+1615233426220615051000212000111000212000131000212000111000212000021D731C
+288E01948E271D732532B6FDFCB6322C8CC48C873D543D01C98CC48C873D543DFBBD020E
+01740175020CFDF4FE8BFE8CFDF28701BF013C013D01BDFE43FEC3FEC4FE4101D1472C26
+8E8E272C483932B5B53301F38BC5C58B537777538BC5C58B53777753A20175020FFDF1FE
+8BFE8CFDF4020C0174FEC4FE4301BD013C013D01C0FE40000000000500AAFF6A07AD066E
+000B00170037004300510000013436321615233426220615213436321615233426220615
+05100021323726270623200011331400200035331407161D013611100021200003100021
+2000111000212000050607161716333237363734272604668CC48C873D543DFD298CC48C
+873D543DFE9401BF013C887665412B2DFEFEFE9487011D0194011C877B37D1FE43FEC3FE
+C4FE4187020E01740175020CFDF4FE8BFE8CFDF205104F5C1F26241B100D21010102038C
+8BC5C58B537777538BC5C58B53777753A2FEC4FE4329306C05016A0102CAFEE5011CC9D5
+A0646304DA0133013D01C0FE40FEC30175020FFDF1FE8BFE8CFDF4020C36432428181708
+133905062E00000500AAFF6A07AD066E000F001B00270033003F00000137161716203736
+371706070620272601140622263533141632363521140622263533141632363501100021
+2000111000212000131000212000111000212000021D731C288E01948E271D732532B6FD
+FCB63204008CC48C873D543DFE378CC48C873D543DFD3F020E01740175020CFDF4FE8BFE
+8CFDF28701BF013C013D01BDFE43FEC3FEC4FE4101D1472C268E8E272C483932B5B53302
+EF8BC5C58B537777538BC5C58B53777753FE620175020FFDF1FE8BFE8CFDF4020C0174FE
+C4FE4301BD013C013D01C0FE4000000500AAFF6A07AD066E0017002F003B004700570000
+0132171615060F0123272635263736331617161733343736213217161533363736373217
+1607140F0123272627343736011000212000111000212000131000212000111000212000
+1337161716203736371706070620272605A61A193C0132A8029F3E010A263F29201C0A01
+0D23FD493D230D010A1C20293F260A013E9F02A832013C19FE12020E01740175020CFDF4
+FE8BFE8CFDF28701BF013C013D01BDFE43FEC3FEC4FE41EC731C288E01948E271D732532
+B6FDFCB63204C00E253F413ECFBE444C151944012020310E1D47471D0E31202001441915
+4C44BECF3E413F250EFE2A0175020FFDF1FE8BFE8CFDF4020C0174FEC4FE4301BD013C01
+3D01C0FE40FDAA472C268E8E272C483932B5B5330000000400AAFF6A07AD066E00170023
+0033003C000001100021200011342723151406222635140622263D012306071000212000
+11100021200025371617160437363717060706202726032126272621200706013101BF01
+3C013D01BD546EA6ECA6A6ECA66E5587020E01740175020CFDF4FE8BFE8CFDF20173731C
+288F01938E271D732532B6FDFCB6326004941618DEFEC2FEC4E01802EAFEC4FE4301BD01
+3CC3A04F648E8E64648E8E644FA0C30175020FFDF1FE8BFE8CFDF4020C5B472C268D018E
+272C483932B5B533033B1A19E0E019000000000500AAFF6A07AD066E000300070011001D
+002900000135211521352115133237363717060706210110002120001110002120001310
+00212000111000212000049801AAFBD401AA6CCA8E271D732532B6FEFEFC7E020E017401
+75020CFDF4FE8BFE8CFDF28701BF013C013D01BDFE43FEC3FEC4FE41038C87878787FDAC
+8E272C483932B502390175020FFDF1FE8BFE8CFDF4020C0174FEC4FE4301BD013C013D01
+C0FE40000000000500AAFF6A07AD066E0003000E00190025003100000135211501343633
+321614062322262534363216151406232226051000212000111000212000131000212000
+111000212000024C03C0FC76513B3A52523A3B510242527453533A3B51FBE6020E017401
+75020CFDF4FE8BFE8CFDF28701BF013C013D01BDFE43FEC3FEC4FE4101718787028C3B51
+517652533A3B51513B3A5353D90175020FFDF1FE8BFE8CFDF4020C0174FEC4FE4301BD01
+3C013D01C0FE40000000000500AAFF6A07AD066E00030007000B00170023000001352115
+2135211501352115011000212000111000212000131000212000111000212000049801AA
+FBD401AAFE8C03C0FA9E020E01740175020CFDF4FE8BFE8CFDF28701BF013C013D01BDFE
+43FEC3FEC4FE41038C87878787FDE5878701790175020FFDF1FE8BFE8CFDF4020C0174FE
+C4FE4301BD013C013D01C0FE4000000500AAFF6A07AD066E000B0017001B002900370000
+011000212000111000212000031000212000111000212000053521150135213216151406
+2322263534352135213216151406232226353435013101BF013C013D01BDFE43FEC3FEC4
+FE4187020E01740175020CFDF4FE8BFE8CFDF201A203C0FC0201783A52523A3B51015601
+783A53533A3B5102EAFEC4FE4301BD013C013D01C0FE40FEC30175020FFDF1FE8BFE8CFD
+F4020C058787022D87513B3A53533A030287513B3A53533A0302000800AAFF6A07AD066E
+0008000C00100014001F002A003600420000011716140622263437013521151325370D01
+272517013436333216140623222625343632161514062322260510002120001110002120
+001310002120001110002120000650411B364C361BFC3D03C00BFEA84D0158FBDD4D0158
+4DFEE9513B3A52523A3B510242527453533A3B51FBE6020E01740175020CFDF4FE8BFE8C
+FDF28701BF013C013D01BDFE43FEC3FEC4FE4103AC80354F36364F35FE45878702A5F06F
+F16E6EF16FFEAF3B51517652533A3B51513B3A5353910175020FFDF1FE8BFE8CFDF4020C
+0174FEC4FE4301BD013C013D01C0FE400000000500AAFF6A07AD066E0003000F001B0027
+003300000135211513140622263533141632363521140622263533141632363501100021
+2000111000212000131000212000111000212000024C03C0368CC48C873D543DFE378CC4
+8C873D543DFD3F020E01740175020CFDF4FE8BFE8CFDF28701BF013C013D01BDFE43FEC3
+FEC4FE410171878703178BC5C58B537777538BC5C58B53777753FE620175020FFDF1FE8B
+FE8CFDF4020C0174FEC4FE4301BD013C013D01C0FE40000500AAFF6A07AD066E0003000E
+001900250031000025270117013436333216140623222625343632161514062322260510
+00212000111000212000131000212000111000212000029539036739FC86513B3A52523A
+3B510242527453533A3B51FBE6020E01740175020CFDF4FE8BFE8CFDF28701BF013C013D
+01BDFE43FEC3FEC4FE41AC7B01967B01BB3B51517652533A3B51513B3A5353D90175020F
+FDF1FE8BFE8CFDF4020C0174FEC4FE4301BD013C013D01C0FE40000500AAFF6A07AD066E
+0003000F001B001F00420000012701170110002120001110002120000310002120001110
+002120000901370103220706070E01272627262322072736373632171617163332373637
+3632171617072602C95F010E5FFD5A01BF013C013D01BDFE43FEC3FEC4FE4187020E0174
+0175020CFDF4FE8BFE8CFDF204E5FEF25F010E9A34290B1846C4461C0C22353820791019
+46C4461C0C223534280C1846C4461810791F035C5F010E5FFE80FEC4FE4301BD013C013D
+01C0FE40FEC30175020FFDF1FE8BFE8CFDF4020C01E6010E5FFEF2FE57691D2262016328
+215F5F392822626228225F691E2262622228395F0000000500AAFF6A07AD066E000B0016
+0023002F003B000001343633321615140623222625343632161514062322260337273705
+15071715052737270110002120001110002120001310002120001110002120000282513B
+3A52523A3B510242527453533A3B51CE50904101033C3CFEFD419050FCB4020E01740175
+020CFDF4FE8BFE8CFDF28701BF013C013D01BDFE43FEC3FEC4FE4103FF3B51513B3A5353
+3A3B51513B3A5353FE243E4E768D582E2E588D764E3E01230175020FFDF1FE8BFE8CFDF4
+020C0174FEC4FE4301BD013C013D01C0FE40000600AAFF6A07AD066E0017002200290036
+0042004E00000132171615060F0123272635263736331617161733343736013436333216
+14062322262D011707170725033727370515071715052737270110002120001110002120
+00131000212000111000212000066A1A1A3C0232A8029E3E020A264028201C0A020C22FC
+56513B3A52523A3B5101FA01274DC6C64DFED98650904101033C3CFEFD419050FCB4020E
+01740175020CFDF4FE8BFE8CFDF28701BF013C013D01BDFE43FEC3FEC4FE4102AF0E253F
+413ECFBE444C151944012020310E1D47014E3B515176525364CE6E8B8A6ECEFE173E4E76
+8D582E2E588D764E3E01230175020FFDF1FE8BFE8CFDF4020C0174FEC4FE4301BD013C01
+3D01C0FE4000000500AAFF6A07AD066E000B001700240030003C00000134363216152334
+262206152134363216152334262206150337273705150717150527372701100021200011
+100021200013100021200011100021200002168CC48C873D543D01C98CC48C873D543DF7
+50904101033C3CFEFD419050FCB4020E01740175020CFDF4FE8BFE8CFDF28701BF013C01
+3D01BDFE43FEC3FEC4FE41038C8BC5C58B537777538BC5C58B53777753FE5D3E4E768D58
+2E2E588D764E3E01230175020FFDF1FE8BFE8CFDF4020C0174FEC4FE4301BD013C013D01
+C0FE40000000000500AAFF6A07AD066E000C001800240030003C00000137273705150717
+150527372701140622263533141632363521140622263533141632363501100021200011
+100021200013100021200011100021200003F650904101033C3CFEFD419050024C8CC48C
+873D543DFE378CC48C873D543DFD3F020E01740175020CFDF4FE8BFE8CFDF28701BF013C
+013D01BDFE43FEC3FEC4FE4101E93E4E768D582E2E588D764E3E02C18BC5C58B53777753
+8BC5C58B53777753FE620175020FFDF1FE8BFE8CFDF4020C0174FEC4FE4301BD013C013D
+01C0FE400000000600AAFF6A07AD066E000B00160022002E0038003E0000013436333216
+151406232226253436321615140623222605100021200011100021200003100021200011
+1000212000253521152314062226352123141632360282513B3A52523A3B510242527453
+533A3B51FC6D01BF013C013D01BDFE43FEC3FEC4FE4187020E01740175020CFDF4FE8BFE
+8CFDF201A203C0F28CC48C0155CE3D543D03FF3B51513B3A53533A3B51513B3A5353DBFE
+C4FE4301BD013C013D01C0FE40FEC30175020FFDF1FE8BFE8CFDF4020C6387878BC5C58B
+537777000000000600AAFF6A07AD066E000A0011001D0029003300390000013436333216
+14062322262D011707170725051000212000111000212000031000212000111000212000
+253521152314062226352123141632360282513B3A52523A3B5101FA01274DC6C64DFED9
+FCB501BF013C013D01BDFE43FEC3FEC4FE4187020E01740175020CFDF4FE8BFE8CFDF201
+A203C0F28CC48C0155CE3D543D03FD3B515176525364CE6E8B8A6ECEE8FEC4FE4301BD01
+3C013D01C0FE40FEC30175020FFDF1FE8BFE8CFDF4020C6387878BC5C58B537777000006
+00AAFF6A07AD066E000B0017001E0025002F003500000110002120001110002120000310
+002120001110002120000115052737273705251707170725013521152314062226352123
+14163236013101BF013C013D01BDFE43FEC3FEC4FE4187020E01740175020CFDF4FE8BFE
+8CFDF20332FED94DC6C64D01C701274DC6C64DFED9FDD003C0F28CC48C0155CE3D543D02
+EAFEC4FE4301BD013C013D01C0FE40FEC30175020FFDF1FE8BFE8CFDF4020C02B155CE6E
+8A8B6ECECE6E8B8A6ECEFE0787878BC5C58B53777700000700AAFF6A07AD066E00030007
+0012001D00290035004600000125370D0127251701343633321614062322262534363216
+151406232226051000212000111000212000131000212000111000212000133637362017
+16170726272623260706070617FEA84D0158FBDD4D01584DFEE9513B3A52523A3B510242
+527453533A3B51FBE6020E01740175020CFDF4FE8BFE8CFDF28701BF013C013D01BDFE43
+FEC3FEC4FE41EC2532B60204B63324731C288ECACA8E271D0416F06FF16E6EF16FFEAF3B
+51517652533A3B51513B3A5353910175020FFDF1FE8BFE8CFDF4020C0174FEC4FE4301BD
+013C013D01C0FE40FD253833B5B53338482C278E018E272C0000000800AAFF6A07AD066E
+000F001300170022002D0039004500560000252736373632171617072627262207060125
+370D01272517013436333216140623222625343632161514062322260510002120001110
+00212000131000212000111000212000133637362017161707262726232607060703D579
+101846C44618107907081E541E08023BFEA84D0158FBDD4D01584DFEE9513B3A52523A3B
+510242527453533A3B51FBE6020E01740175020CFDF4FE8BFE8CFDF28701BF013C013D01
+BDFE43FEC3FEC4FE41EC2532B60204B63324731C288ECACA8E271D9F3928226262222839
+13103C3C100364F06FF16E6EF16FFEAF3B51517652533A3B51513B3A5353910175020FFD
+F1FE8BFE8CFDF4020C0174FEC4FE4301BD013C013D01C0FE40FD253833B5B53338482C27
+8E018E272C00000700AAFF6A07AD066E0003000E0019001D002900350046000001170527
+053436333216140623222625343632161514062322260105072501100021200011100021
+2000131000212000111000212000133637362017161707262726232607060705864DFED1
+4DFE2B513B3A52523A3B510242527453533A3B51FE0E012F4DFED1FE25020E0174017502
+0CFDF4FE8BFE8CFDF28701BF013C013D01BDFE43FEC3FEC4FE41EC2532B60204B6332473
+1C288ECACA8E271D05676ED56FDE3B51517652533A3B51513B3A535301ECD46FD5FDF101
+75020FFDF1FE8BFE8CFDF4020C0174FEC4FE4301BD013C013D01C0FE40FD253833B5B533
+38482C278E018E272C00000800AAFF6A07AD066E0010001C0028002C0037004200460056
+000001363736201716170726272623260706070110002120001110002120000310002120
+001110002120000105072501343632161514062322262534363332161406232226011705
+2703273637363217161707262726220706021D2532B60204B63324731C288ECACA8E271D
+FEA101BF013C013D01BDFE43FEC3FEC4FE4187020E01740175020CFDF4FE8BFE8CFDF202
+28012F4DFED1023F527453533A3B51FDBE513B3A52523A3B5103044DFED14D8279101846
+C44618107907081E541E08014C3833B5B53338482C278E018E272C01E5FEC4FE4301BD01
+3C013D01C0FE40FEC30175020FFDF1FE8BFE8CFDF4020C03F1D46FD5FEBC3B51513B3A53
+533A3B515176525301EC6ED56FFC0C392822626222283913103C3C100000000500AAFF6A
+07AD066E000B001700230034004F00000110002120001110002120000310002120001110
+002120000114062226353314163236350136373620171617072627262326070607011407
+0607171607060706222635343F0126272635331416323635013101BF013C013D01BDFE43
+FEC3FEC4FE4187020E01740175020CFDF4FE8BFE8CFDF203488CC48C873D543DFEB22532
+B60204B63324731C288ECACA8E271D03B2463A4D201C01011A1B4C361B204D3A46873D54
+3D02EAFEC4FE4301BD013C013D01C0FE40FEC30175020FFDF1FE8BFE8CFDF4020C03128B
+C5C58B53777753FCC43833B5B53338482C278E018E272C03838C62510E3F37232B1A1B36
+2C23353F0D52628C537777530000000500AAFF6A07AD066E00100017001E002A00360000
+013637362017161707262726232607060701251707170725271505273727370110002120
+00111000212000131000212000111000212000021D2532B60204B63324731C288ECACA8E
+271D01EC01274DC6C64DFED9A0FED94DC6C64DFDF5020E01740175020CFDF4FE8BFE8CFD
+F28701BF013C013D01BDFE43FEC3FEC4FE41014C3833B5B53338482C278E018E272C0322
+CE6E8B8A6ECE5555CE6E8A8B6EFDF50175020FFDF1FE8BFE8CFDF4020C0174FEC4FE4301
+BD013C013D01C0FE4000000600AAFF6A07AD066E0003000700180021002D003900000127
+01170901370901363736201716170726272623260706070117160E012226343705100021
+200011100021200003100021200011100021200002C95F010E5F01B8FEF25F010EFC2F25
+32B60204B63324731C288ECACA8E271D03DA421B01364C361CFB0701BF013C013D01BDFE
+43FEC3FEC4FE4187020E01740175020CFDF4FE8BFE8CFDF2035C5F010E5FFEF2010E5FFE
+F2FD913833B5B53338482C278E018E272C032380354F36364F35BEFEC4FE4301BD013C01
+3D01C0FE40FEC30175020FFDF1FE8BFE8CFDF4020C00000600AAFF6A07AD066E000B0016
+0022002E0034003C00000134363332161514062322262534363216151406232226051000
+212000111000212000131000212000111000212000012134002000052126272620070602
+82513B3A52523A3B510242527453533A3B51FBE6020E01740175020CFDF4FE8BFE8CFDF2
+8701BF013C013D01BDFE43FEC3FEC4FE4104F3FC0F012701A30127FCA902BD18456BFED2
+6A4503FF3B51513B3A53533A3B51513B3A5353DB0175020FFDF1FE8BFE8CFDF4020C0174
+FEC4FE4301BD013C013D01C0FE40FCA4E80146FEBA61604C74754C000000000800AAFF6A
+07AD066E000300070012001D00290035003B004300000125370D01272517013436333216
+140623222625343632161514062322260510002120001110002120001310002120001110
+0021200001213400200005212627262007060617FEA84D0158FBDD4D01584DFEE9513B3A
+52523A3B510242527453533A3B51FBE6020E01740175020CFDF4FE8BFE8CFDF28701BF01
+3C013D01BDFE43FEC3FEC4FE4104F3FC0F012701A30127FCA902BD18456BFED26A450416
+F06FF16E6EF16FFEAF3B51517652533A3B51513B3A5353910175020FFDF1FE8BFE8CFDF4
+020C0174FEC4FE4301BD013C013D01C0FE40FCA4E80146FEBA61604C74754C000000000E
+00AAFF6A07AD066E000B00130019004E005A0066006C00780084008A00900096009C00A2
+000001141633323635342623220601212627262007060521340020000110002120001134
+2715231126271123350E0122272335263437112627112311060711161407152306222627
+152311060711233506071000212000111000212000013436333216151406232226253637
+350607013426232206151416333236271406232226353436333216011516173526272627
+1536372526271516172506071536372506071516170496744A55696F4F4C72FE3702BD18
+456BFED26A45033FFC0F012701A30127FB0D01BF013C013D01BD35441E25441E6D8E3844
+2B2B21224422212B2B44388E6E1D44251E443687020E01740175020CFDF4FE8BFE8CFDF2
+0471221718211F1A1623FD9E202323200109724C4F6F69554A748523161A1F2118172202
+1F241F206721221F24010E21222B18FC4F2320192A010E2221241F041A526C75494F6F6F
+FCE9604C74754CE6E80146FEBA0137FEC4FE4301BD013C9B85BA013B2E29FE6E59364724
+403C9C3C013D0401FD6A02960104FEC33C9C3C402446375901932A2EFEC5BC869C017502
+0FFDF1FE8BFE8CFDF4020C02A418212118162320FC0A01A20F12FE914F6F6F4F49756C52
+192023161821210179A3010A8C13280A08F21409261E1884212DD2191D9C2D21FD070BC3
+0914000800AAFF6A07AD066E00030007000B000F001B0027002D00350000012701170901
+370901270117090137010510002120001110002120001310002120001110002120000121
+34002000052126272620070602C95F010E5F01B8FEF25F010EFCDB5F010E5F01B8FEF25F
+010EFABC020E01740175020CFDF4FE8BFE8CFDF28701BF013C013D01BDFE43FEC3FEC4FE
+4104F3FC0F012701A30127FCA902BD18456BFED26A4504135F010E5FFEF2010E5FFEF2FE
+585F010E5FFEF2010E5FFEF23F0175020FFDF1FE8BFE8CFDF4020C0174FEC4FE4301BD01
+3C013D01C0FE40FCA4E80146FEBA61604C74754C0000000700AAFF6A07AD066E0011001D
+0029003500410047004F0000013736373633321716171615140706070623031406222635
+331416323635211406222635331416323635011000212000111000212000131000212000
+111000212000012134002000052126272620070605C455251F19160D0D24120A050C271F
+3B128CC48C873D543DFE378CC48C873D543DFD3F020E01740175020CFDF4FE8BFE8CFDF2
+8701BF013C013D01BDFE43FEC3FEC4FE4104F3FC0F012701A30127FCA902BD18456BFED2
+6A4502C874320F0B040C2214150E0F24141001C08BC5C58B537777538BC5C58B53777753
+FE620175020FFDF1FE8BFE8CFDF4020C0174FEC4FE4301BD013C013D01C0FE40FCA4E801
+46FEBA61604C74754C0000><000600AAFF6A07AD066E0006000D00190025002B00330000
+012517071707252715052737273701100021200011100021200013100021200011100021
+20000121340020000521262726200706047C01274DC6C64DFED9A0FED94DC6C64DFDF502
+0E01740175020CFDF4FE8BFE8CFDF28701BF013C013D01BDFE43FEC3FEC4FE4104F3FC0F
+012701A30127FCA902BD18456BFED26A450427CE6E8B8A6ECE5555CE6E8A8B6EFDF50175
+020FFDF1FE8BFE8CFDF4020C0174FEC4FE4301BD013C013D01C0FE40FCA4E80146FEBA61
+604C74754C0000000005005FFF6A08F9066E0005000C0013003D00620000252134002000
+0115052737273705251707170725051000212000111407171617161514062227262F0102
+07002120012603070607062226353437363F012637100021200011342706232227262F01
+1716172627262120070607363F010706070622270606A4FC0F012701A30127FDB8FED94D
+C6C64D01C701274DC6C64DFED9FC2E020E01740175020C025D3B181E364C1F19120B2AD1
+FEFAFE8BFE8CFEF9D12B0A12191F4C361E173C5C028701BF013C013D01BD011B25261F19
+122D8829182F9ADEFEC2FEC4E09A2F1829882D12191F4C1B01CBE80146FEBA027455CE6E
+8A8B6ECECE6E8B8A6ECEE80175020FFDF1FE8B1D1B1F14181F2526361F193920FEE9D1FE
+FA0106D001161E39191F3626251F19131E1C1DFEC4FE4301BD013C14131A1F1939882D0E
+0FC79AE0E09BC6100D2D8839191F1B14000500AAFF6A07AD066E00070013001E002A0036
+000000343632161406220134363332161514062322262534363216151406232226051000
+212000111000212000131000212000111000212000032C96D49696D4FEC0513B3A52523A
+3B510242527453533A3B51FBE6020E01740175020CFDF4FE8BFE8CFDF28701BF013C013D
+01BDFE43FEC3FEC4FE41015AD49696D496033B3B51513B3A53533A3B51513B3A5353DB01
+75020FFDF1FE8BFE8CFDF4020C0174FEC4FE4301BD013C013D01C0FE40000000000700AA
+FF6A07AD066E000300070012001D00250031003D00000125370D01272517013436333216
+140623222625343632161514062322260034363216140622011000212000111000212000
+1310002120001110002120000617FEA84D0158FBDD4D01584DFEE9513B3A52523A3B5102
+42527453533A3B51FEE84B6A4B4B6AFCB3020E01740175020CFDF4FE8BFE8CFDF28701BF
+013C013D01BDFE43FEC3FEC4FE410416F06FF16E6EF16FFEAF3B51517652533A3B51513B
+3A5353FE146A4B4B6A4B01A60175020FFDF1FE8BFE8CFDF4020C0174FEC4FE4301BD013C
+013D01C0FE400000000800AAFF6A07AD066E00080010001400180023002E003A00460000
+01171614062226343700343632161406220125370D012725170134363332161406232226
+253436321615140623222605100021200011100021200013100021200011100021200006
+50411B364C361BFD1D96D49696D40255FEA84D0158FBDD4D01584DFEE9513B3A52523A3B
+510242527453533A3B51FBE6020E01740175020CFDF4FE8BFE8CFDF28701BF013C013D01
+BDFE43FEC3FEC4FE4103AC80354F36364F35FE2ED49696D4960352F06FF16E6EF16FFEAF
+3B51517652533A3B51513B3A5353910175020FFDF1FE8BFE8CFDF4020C0174FEC4FE4301
+BD013C013D01C0FE4000000000070023FF3C0835066E0007000F00130017001F006B0094
+000000263436321614062026343632161406252725170525370500343632161406220135
+2E01270211343637363700200116171E011510030E010715233534373637361334262206
+070607060F010E011D01233506202715233534262F01262726272E012206151217161716
+1D01251620373534373637363736373E0137363736372627262007060716171E02171617
+16171617161505155152745353FD495151755252FEF94D01584D027EFEA84D0158FCC896
+D49696D4FDA14856188A683D3BAE010702E90106AE3B3D688A1856488726811D7A02273A
+25060E6929385E271B886EFEFB79881B275E3829690E06253A27027A1D8126014C770109
+6C1B309138113C1102080C0C330F11328FDEFD86E08F33120F33180802113C113891301B
+0328537551517553537551517652EE6EF16FF0F06FF1FCD6D49696D496FE78CB3E5B3101
+170127536B0ADFB00108FEF8AFE00A6B53FED9FEE9315B3ECBE7241F6E39F001121C2823
+6DF3712C25401C3C3FFB4C1E204EFB3F3C1C40252C71F36D23281CFEEEF0396E1F24E7DB
+262521593B6556221344780F863836300E0AB590E0E08FB50B0E306E860F784413225665
+3B590000000900AAFF6A07AD066E000B00170023002F003B0047004F005B006700000114
+062322263534363332161734363332161514062322263714163332363534262322061734
+363332161514062322262534262322061514163332362714062322263534363332160234
+36321614062201100021200011100021200013100021200011100021200003F2925C6A84
+8B635F8F748F5F638B846A5C9230744A55696F4F4C7285221718211F1A1623FEA7724C4F
+6F69554A748523161A1F211817221196D49696D4FCE8020E01740175020CFDF4FE8BFE8C
+FDF28701BF013C013D01BDFE43FEC3FEC4FE41041A6688935B638B8B63638B8B635B9388
+66526C75494F6F6F4F18212118162320194F6F6F4F49756C5219202316182121FD28D496
+96D49602260175020FFDF1FE8BFE8CFDF4020C0174FEC4FE4301BD013C013D01C0FE4000
+000A00AAFF6A07AD066E004A0056005E00620066006B007000740079007E000001100021
+200011342711231126271517071123352315233523152335231523113311331127371735
+262007153717071133113311233523152335231523352315231127373506071123110607
+100021200011100021200024343632161406221311331101333527173335072711151735
+260135071503060715371135072715013101BF013C013D01BD40441E2606064434444444
+444444445B4D96A7FE62A7964D5B4444444444444434440606251F444187020E01740175
+020CFDF4FE8BFE8CFDF203024B6A4B4B6A134401104444883403313419FCF944441B1934
+310302EAFEC4FE4301BD013CAA8FFE8501F32C28670409FE2D8888888888880238FED701
+103F6F697B60607B696F3FFEF00129FDC888888888888801D3090468282CFE0C017D90AB
+0175020FFDF1FE8BFE8CFDF4020C196A4B4B6A4B01640238FDC8010FB12FE06304220123
+7F247A16FE6FE02FB101A413177924FEDB81220463000000000800AAFF6A0C71076C0009
+0013001D00250031003D0049005500000121150333152135132325211503331521351323
+252115033315213513230034363216140622011406222635331416323635211406222635
+3314163236350110002120001110002120001310002120001110002120000AF6017BF8F8
+FE7BF8EEFE17017BF8F8FE7BF8EEFE17017BF8F8FE7BF8EEFC884B6A4B4B6A024B8CC48C
+873D543DFE378CC48C873D543DFD3F020E01740175020CFDF4FE8BFE8CFDF28701BF013C
+013D01BDFE43FEC3FEC4FE41076C68FEF45C68010C5C68FEF45C68010C5C68FEF45C6801
+0CFA7F6A4B4B6A4B03448BC5C58B537777538BC5C58B53777753FE620175020FFDF1FE8B
+FE8CFDF4020C0174FEC4FE4301BD013C013D01C0FE400000000500AAFF6A07AD066E000B
+00170023002B003700000127372737173717071707270510002120001110002120000310
+00212000111000212000043436321614062201273727371737170717072702955F71715F
+71725F71715F72FE2B01BF013C013D01BDFE43FEC3FEC4FE4187020E01740175020CFDF4
+FE8BFE8CFDF2028296D49696D4011E5F71715F71725F71715F7203285F71725F71715F72
+715F71AFFEC4FE4301BD013C013D01C0FE40FEC30175020FFDF1FE8BFE8CFDF4020C1CD4
+9696D49602645F71725F71715F72715F71000000000400AAFF6A07AD066E000A00150021
+002D00000134363332161406232226253436321615140623222605100021200011100021
+20001310002120001110002120000282513B3A52523A3B510242527453533A3B51FBE602
+0E01740175020CFDF4FE8BFE8CFDF28701BF013C013D01BDFE43FEC3FEC4FE4103FD3B51
+517652533A3B51513B3A5353D90175020FFDF1FE8BFE8CFDF4020C0174FEC4FE4301BD01
+3C013D01C0FE4000000A00AAFF6A07AD066E000B000F00130017001B001F00240028002C
+003700001310002120001110002120000135211533352115252725170525370501211121
+012116212025361307011127120102272621200706031721AA020E01740175020CFDF4FE
+8BFE8CFDF2016C01AAD801AAFBFF4D01584D027EFEA84D0158FC39031EFCE20354FC76C4
+010101020114CB16E1FBD4E21605D71BBEDEFEC2FEC4E0BE1CE0042C02EA0175020FFDF1
+FE8BFE8CFDF4020C01BA87878787E66EF16FF0F06FF1FC870118FE6193D9C901119EFEC4
+013C9EFEEF01B30102BFE0E0BFFEFF9D0009003AFF6A082607140008001D0052008F009D
+00AB00B500BB00C100000032371706232227371716333237161514070604202427263534
+371633320114172517051617251705161716171620373637363725370536372537053635
+342E02272627060726232207262706070E03072635343E0337363F01171E01173632173E
+013F011716171E0415140717072706071707270607020706212027260326270727372627
+072725342E01220E011523343632161521342E01220E0115233436321615012627060715
+1633323F01153637062305352322271603EC825C3E786365763EA072749E92051D36FEED
+FE9CFEEC3B230395A079FD5D07014D05FEB4080E013416FEC8121666A3B501EAB5A1671A
+10FECD16012E0E08FEBA050147060A0A16041B2AF399749B9D7499F32A1B05150B0A8005
+07130C1F0517260F3C8FFD5D69E2695DFD8F3B102617051F0C13070569046B0815681664
+131B74C0D9FEE0FEDFD9C0741D105E16621409650403311531423115878CC48C01C91531
+423115878CC48CFE3A24281A322B242920886033483AFE47153F3F3402FC2E783D3D78FC
+25422019444781938F7D4B5317174201C724621543164A41693F6C3A31E277848476E338
+356A3F673E4C15431552342E663E7619A1A73AC41515C43AA7A11B724165BD4D45396A77
+419318758C3A091689610D0D618916093A8C75189341776A39444D07440756572440223C
+3CFEFD8C9E9E8C010340362040224F600744512B5A4545592C8CC4C48C2B5A4545592C8C
+C4C48CFE03070B070A910504846327460A6161094300000000090060FF6A08F80714003F
+0048005D00A800B600C400CE00D400DA0000013635342E02272627060726200726270607
+0E03151417363F01070E0123222716172517051617161716203736373637253705363706
+2322262F0117160432371706232227371716333237161514070604202427263534371633
+320522263534363F0134270727372635343E0337363F01171E01173632173E013F011716
+171E041514071707270607171E011514062322262F010607020706202726032627070601
+342E01220E011523343632161521342E01220E0115233436321615012627060715163332
+3F01153637062305352322271607BA020A0A16041A2AF29A74FEC87498F42A1C05150A0A
+021850882C11332C301C0810013416FEC8121666A4B501E9B6A2661A10FECC16012E1008
+1C302C34102E8A52FCC8825C3E786266763EA072749E92061E36FEEEFE9CFEEC3C220296
+A078FC7C25373E345A086604640608120C200418260E3C8FFD5E69E16A5DFD8E3C102616
+051F0C14060468046A06045A343C36242C34120E182C74C0D8FDC0DAC0742A1A102402E4
+1630423214888CC48C01CA1630423214888CC48CFE3A24281A322C242820886034483AFE
+46143E4034037C282C2E663E7619A1A73AC41515C43AA7A11B7241652E2A272C192C8833
+3C25574C693F6C3A31E277848476E338356A3F674460283C33882C19AF2E783D3D78FC25
+422019444781938F7D4B531717424136252C34111D034A0744064D45396A77419318758C
+3A091689610D0D618916093A8C75189341776A39444D07440734191D11342C25363C332A
+6862FEFD8C9E9E8C01035D702D6F01C42B5A4545592C8CC4C48C2B5A4545592C8CC4C48C
+FE03070B070A910504846327460A6161094300000009003AFF6A082607140008001D002A
+005F009C00AA00B400C300D0000000323717062322273717163332371615140706042024
+272635343716333217062322271E01323637062322011417251705161725170516171617
+1620373637363725370536372537053635342E02272627060726232207262706070E0307
+2635343E0337363F01171E01173632173E013F011716171E041514071707270607170727
+060702070621202726032627072737262707272534363332161706070623222726372206
+1514173E0137260514070623222726273637363332160716333237363534272623220603
+EC825C3E786365763EA072749E92051D36FEEDFE9CFEEC3B230395A0797072773F3F35C0
+EABD32483A75FC7D07014D05FEB4080E013416FEC8121666A3B501EAB5A1671A10FECD16
+012E0E08FEBA050147060A0A16041B2AF399749B9D7499F32A1B05150B0A800507130C1F
+0517260F3C8FFD5D69E2695DFD8F3B102617051F0C13070569046B0815681664131B74C0
+D9FEE0FEDFD9C0741D105E16621409650401E263433E5D07304C2128433808FD2430052B
+45121502FF08384325244D2F08322D3B4363A40C1A2E2A10040C0D2C4002FC2E783D3D78
+FC25422019444781938F7D4B53171742681F09454C4D450A024E24621543164A41693F6C
+3A31E277848476E338356A3F673E4C15431552342E663E7619A1A73AC41515C43AA7A11B
+724165BD4D45396A77419318758C3A091689610D0D618916093A8C75189341776A39444D
+07440756572440223C3CFEFD8C9E9E8C010340362040224F6007449F465F573B45180B21
+17492B200D0D062F210F2D1D17210C1943422A265F7A031415190C0B033500000006003D
+FF6A081D071400110019004A0083009800AD000001371633323716333237170623222706
+23220117062227371632253635342E02272627060726232207262706070E031514172517
+0516172517051617162037363725370536372537052635343E0337363F01171E01173632
+173E013F011716171E041514071707270607170727020706212027260307273726270727
+013E0133321615140F012327262734363332171615253216173334373633321615060F01
+23272635343602A65C455B3A54543A5B455C6C904A4445499001B83E7AC27A3E5A8602BA
+120A0A16041B2AF399749B9D7499F32A1B05150B0A1201420AFEBF0E17011E1AFEE167A4
+B501EAB5A467FEE11A011E150FFEC00AFAC01107130C1F0517260F3C8FFD5D69E2695DFD
+8F3B102617051F0C1307116C0A6D0F206E1A6D75C3D9FEE0FEDFD9C1766D1A6D1E106D0A
+02E30A3A2D2E3E3E9F02A83102402F3D230D01A82D3A0A010D233D2F400231A8029F3E3E
+018C62402C2C4062641C1C01A8783D3D782E3882742E663E7619A1A73AC41515C43AA7A1
+1B7241652E74822B422C4540793E7AE777848477E77A3E79394C2C423D7C8F396A774193
+18758C3A091689610D0D618916093A8C75189341776A398F7C0F420E51572E3E2EFEF78E
+9E9E8C010B2E3E2E51570E42019530423D314A4ABECF3D422A48471B10724230101B4748
+2A423DCFBE4A4A313D000000000A003DFF6A081D071400030007000F001E002800370044
+007500AE00B800000105072D011705271317062227371632010607062322272635343736
+3332160722061514173E013726053E013332171615140706232227261716333237363534
+2726232206053635342E02272627060726232207262706070E0315141725170516172517
+051617162037363725370536372537052635343E0337363F01171E01173632173E013F01
+1716171E0415140717072706071707270207062120272603072737262707270132373637
+170607062102D2012F4DFED103014DFED14D733E7AC27A3E5A86FEFC2B51202846361535
+2F4146654E2430052B45121601B8056446422F35153646282051790C1A302810040C0D2C
+400193120A0A16041B2AF399749B9D7499F32A1B05150B0A1201420AFEBF0E17011E1AFE
+E167A4B501EAB5A467FEE11A011E150FFEC00AFAC01107130C1F0517260F3C8FFD5D69E2
+695DFD8F3B102617051F0C1307116C0A6D0F206E1A6D75C3D9FEE0FEDFD9C1766D1A6D1E
+106D0A03EFCA8E281C732235B5FEFD0567D46FD56E6ED56FFE3D783D3D782E01064C1C0B
+23242D47302C612630240E0F073425111D43612C30472D24230B1C040316181C0E0C033B
+A782742E663E7619A1A73AC41515C43AA7A11B7241652E74822B422C4540793E7AE77784
+8477E77A3E79394C2C423D7C8F396A77419318758C3A091689610D0D618916093A8C7518
+9341776A398F7C0F420E51572E3E2EFEF78E9E9E8C010B2E3E2E51570E42FE7F8E282B48
+3635B5000008003DFF6A081D0714000E001800270034006900A800B500BE000001060706
+23222726353437363332160722061514173E013726053E01333217161514070623222726
+17163332373635342726232206053635342E02272627060726232207262706070E031514
+1716172517051617251705171617162037363F01253705363725370032173E013F011716
+171E04151406150607170727060717072707020706212027260327072737262707273726
+2735343E0337363F01171E01171337273705150717150527372702323717062322273703
+6C2B512028463615352F4146654E2430052B45121601B8056446422F3515364628205179
+0C1A302810040C0D2C400193120A0A16041B2AF399749B9D7499F32A1B05150B0A020709
+01420AFEBF0E17011E1AFEE10266A3B501EAB5A16703FEE11A011E150FFEC00AFDD3E269
+5DFD8F3B102617051F0C130701030D6C0A6D0F206E1A6D0474C0D9FEE0FEDFD9C074036D
+1A6D1E106D0A6C0E0307130C1F0517260F3C8FFD5DA350904101033C3CFEFD4190500B84
+5B3E776465763E03A84C1C0B23242D47302C612630240E0F073425111D43612C30472D24
+230B1C040316181C0E0C033BA783732E663E7619A1A73AC41515C43AA7A11B7241652E0F
+2482412B422C4540793E7A05E277848476E3057A3E79394C2C4203130D618916093A8C75
+189341776A39071C078A570F420E51572E3E2E08FEFD8C9E9E8C0103082E3E2E51570E42
+0F60812A396A77419318758C3A09168961FB3A3D4E778D592E2D598D774E3D01DA2E783D
+3D780000000B003DFF6A081D0714000E0018002700340065009E00A600AF00B800BC00C0
+00000106070623222726353437363332160722061514173E013726053E01333217161514
+07062322272617163332373635342726232206053635342E022726270607262322072627
+06070E0315141725170516172517051617162037363725370536372537052635343E0337
+363F01171E01173632173E013F011716171E041514071707270607170727020706212027
+260307273726270727013632170726220725362017072623220700323717062322273701
+17052725050725036C2B512028463615352F4146654E2430052B45121601B8056446422F
+35153646282051790C1A302810040C0D2C400193120A0A16041B2AF399749B9D7499F32A
+1B05150B0A1201420AFEBF0E17011E1AFEE167A4B501EAB5A467FEE11A011E150FFEC00A
+FAC01107130C1F0517260F3C8FFD5D69E2695DFD8F3B102617051F0C1307116C0A6D0F20
+6E1A6D75C3D9FEE0FEDFD9C1766D1A6D1E106D0A034746C446601E541EFE90B50206B560
+8ECAC8900117845B3E776465763E01F64DFED14DFE7B012F4DFED103A84C1C0B23242D47
+302C612630240E0F073425111D43612C30472D24230B1C040316181C0E0C033BA782742E
+663E7619A1A73AC41515C43AA7A11B7241652E74822B422C4540793E7AE777848477E77A
+3E79394C2C423D7C8F396A77419318758C3A091689610D0D618916093A8C75189341776A
+398F7C0F420E51572E3E2EFEF78E9E9E8C010B2E3E2E51570E42FE1363635F3C3CF5B5B5
+608E8E01FA2E783D3D78023D6ED56FD4D46FD5000005003DFF6A081D07140020002C0034
+0064008E0000011406071716140622263534350622273716323717363F012E0135331416
+3236352114062226353314163236350336201707262007012610363F01363F01171E0117
+3632173E013F0117161F011E011407170727060717072702002000030727372627072705
+122132243725370536372537053635342F01262706072620072627060F01061514172517
+05161725170642804D201B364C366EC2763E5B845B33070F204D80873D543DFE378CC48C
+873D543DF7B50206B5608EFE6E90FDD51120161417260F3C8FFD5D69E2695DFD8F3B1026
+17142B0B116C0A6D0F206E1A6D75FE64FDBFFE66766D1A6D1E106D0A013BD701DEF50159
+67FEE11A011E150FFEC00A0141121A1E102BF39974FEC87499F32A1B10201301420AFEBF
+0E17011E1A04888BB40E3F354F36362C0303353D782E2E63181D3F0EB48B537777538BC5
+C58B53777753FCDAB5B5608E8E01C67C0106C46A61758C3A091689610D0D618916093A8C
+7561CCA0C87C0F420E51572E3E2EFEF7FED4012A010B2E3E2E51570E42E6FE1EFBE77A3E
+79394C2C422B8251888DAE62A73AC41515C43AA7A154A86E6B822B422C4540793E000000
+0006003DFF6A081D071400340073007B00830087008B0000013635342E02272627060726
+232207262706070E0315141716172517051617251705171617162037363F012537053637
+25370032173E013F011716171E0415140615060717072706071707270702070621202726
+03270727372627072737262735343E0337363F01171E0117032126272620070605213437
+363332000301370105270117072A120A0A16041B2AF399749B9D7499F32A1B05150B0A02
+070901420AFEBF0E17011E1AFEE10266A3B501EAB5A16703FEE11A011E150FFEC00AFDD3
+E2695DFD8F3B102617051F0C130701030D6C0A6D0F206E1A6D0474C0D9FEE0FEDFD9C074
+036D1A6D1E106D0A6C0E0307130C1F0517260F3C8FFD5D8602BD18456BFED26A45033FFC
+0F9393D2D1012895FEF25F010EFCDB5F010E5F02DA83732E663E7619A1A73AC41515C43A
+A7A11B7241652E0F2482412B422C4540793E7A05E277848476E3057A3E79394C2C420313
+0D618916093A8C75189341776A39071C078A570F420E51572E3E2E08FEFD8C9E9E8C0103
+082E3E2E51570E420F60812A396A77419318758C3A09168961FB47614B74754BE7E7A4A3
+FEBA017E010E5FFEF25F5F010E5F00000001FFB9049A00C706120003000A400300030400
+10D4CC3011330323C775990612FE88000002FCD7050EFF2905D90003000700A5400D0400
+CE0602080164000564040810D4FCDCEC310010D43CEC3230004BB00E544BB011545B58BD
+00080040000100080008FFC03811373859014BB00E544BB00D545B4BB017545B58BD0008
+FFC000010008000800403811373859014BB011544BB019545B58BD000800400001000800
+08FFC03811373859004BB0185458BD0008FFC00001000800080040381137385940116001
+600260056006700170027005700608015D0133152325331523FE5ECBCBFE79CBCB05D9CB
+CBCB00000001FD7304EEFEF005F60003007F40110203000301000003420002FA04010303
+0410C410C0310010F4CC304B5358071005C9071005C95922004BB00C5458BD0004FFC000
+010004000400403811373859004BB00E5458BD00040040000100040004FFC03811373859
+402006021502250125023602460256026A016702090F000F011F001F012F002F01065D01
+5D01330323FE37B9E49905F6FEF800000001FCB6050EFF4A05E9001D0075402116100F03
+130C0701000308170CC30413C31B08FA1E10010F00071656180756091E10D4ECD4EC1139
+393939310010F43CECD4EC321217391112173930004BB00C5458BD001EFFC00001001E00
+1E00403811373859004BB00E5458BD001E00400001001E001EFFC03811373859B4100B1F
+1A025D01272E012322061D012334363332161F011E013332363D01330E01232226FDFC39
+191F0C24287D6756243D303917220F20287D026754223B0539210E0B322D066576101B1E
+0D0C3329066477100001FD0C04EEFE8B05F60003008940110102030200030302420001FA
+040103030410C410C0310010F4CC304B5358071005C9071005C95922004BB00C5458BD00
+04FFC000010004000400403811373859004BB00E5458BD00040040000100040004FFC038
+11373859402A06000601160012012400240135014301550055019F009F01AF00AF010E0F
+000F031F001F032F002F03065D015D01132303FDC7C499E605F6FEF8010800000001FCCF
+04EEFF3105F800060077400A04000502FA070402060710D4C439310010F43CC43930004B
+B00C5458BD0007FFC000010007000700403811373859004BB00E5458BD00070040000100
+070007FFC03811373859014BB00E5458BD0007FFC0000100070007004038113738594013
+0F000F010C041F001F011D042F002F012D0409005D01331323270723FDA2BCD38BA6A68B
+05F8FEF6B2B200000001FCCF04EEFF3105F800060086400A03040100FA070305010710D4
+C439310010F4C4323930004BB00C544BB009545B4BB00A545B4BB00B545B58BD0007FFC0
+00010007000700403811373859004BB00E5458BD00070040000100070007FFC038113738
+59014BB00E5458BD0007FFC0000100070007004038113738594013000003030006100012
+03100620002203200609005D01033317373303FDA2D38BA6A68BD304EE010AB2B2FEF600
+0001FCC70506FF3905F8000D000003232E0123220607233E01333216C7760D6353526110
+760AA08F909F050636393738777B7A000001FCC70506FF3905F8000D006A400E070004C3
+0BFA0E0756080156000E10D4ECD4EC310010F4FCCC3230004BB00C5458BD000EFFC00001
+000E000E00403811373859004BB00E5458BD000E00400001000E000EFFC0381137385901
+4BB00E544BB00F545B58BD000EFFC00001000E000E0040381137385901331E0133323637
+330E01232226FCC7760D6353526110760AA08F909F05F836393738777B7A00000001FD9A
+050EFE6605DB00030047B700CE02040164000410D4EC310010D4EC30004BB00E544BB011
+545B58BD00040040000100040004FFC03811373859004BB0185458BD0004FFC000010004
+00040040381137385901331523FD9ACCCC05DBCD0002FCE604EEFFB205F6000300070013
+40070004030708000410CC310010D43CCC32300133032303330323FEF9B9E4998BB9E499
+05F6FEF80108FEF80002FC4E04EEFF1A05F60003000700000113230321132303FD07C499
+E40208C499E405F6FEF80108FEF801080001000000000096009600030000353315239696
+96960000000200000000019000960003000700003733152327331523FA9696FA96969696
+969600000003000000000190019000030007000B00001333152317331523273315237D96
+967D9696FA969601909664969696000000030000FF060190009600030007000B00001733
+152313331523273315237D96967D9696FA969664960190969696000000020000FF060096
+0096000300070000153315231133152396969696649601909600000000040000FF060190
+009600030007000B000F000017331523113315230733152311331523FA96969696FA9696
+96966496019096649601909600010082FFEC07EF029D00260000011417163B0115232227
+262706070423222724032637330615141716332437363736353427331606EF463F3F3C66
+744750189BE9FEFDD3C47CFEB7010140B841CB68970104BEC77B3B1DB81301F8D03B35B8
+49534283353A266501088A5C5E887D432202373A6D34773E374B0000FFFFFFEC00000187
+02581006144E0000FFFFFFEC0000027E02581006144F000000020082FFA5085C0311002C
+003E00002506070421242724032637330615141716213225372627263534373637363332
+171617161514071633211521222736353427262726232207060706151417160678686EFE
+E8FEF0FECF7DFEB7010140B841CB51012BE8011D1C221D520416BC3A3452518912045009
+070107FEF4696F68050E34222818163D13062931242B183C01276701068A5C5E88734D1F
+36041B2C7C791F249B4B17325396251E906A01B8DF417A141B4727190A193C131238424E
+0002FFEC0000033F03D9000F003000000136353427260706070607141716333201333237
+3637363706070627263534373637363332171617161514070607062321025629421F2C34
+28280137282A48FDAEF154974F3C1F0F3F61824E620817964E4C5A42602E174E4A7C6D91
+FEBF02192B4D3B331901012A2933502619FEB7170C5D3032370202455781342C94452432
+4866338CD08F882C270000000002FFEC0000042003080021003500000116171615140706
+07163B0115232227062B0135333237262726353437363736333207220706070615141716
+173637363534272627260266B71808151D2427937FD988B9B988D97F93271D24150817B9
+1E413F3F0F1238180A181F443F24190B17391302FA5096322A4931433211B83939B81128
+4D2E4C2C308F570EB80A2035151D2B3544161545322E181A34210A000002006BFE0C06C0
+02E4002E0040000025262726272635343736373633321716171617163321152123060706
+070627242726353437330615141716213237361336272627262322070607061514171617
+1604B8422E79399306289329577038633214061A040107FEF4302D3D809EAFCDFE8E5E45
+3EB83E1B3C01068C96D56C0416132F2227221533150A394C642F0A050D232B6DB93D1AA5
+45133258913AD601B87A46914E560102BE8A7DA6606B9B4C3A824462015A7A574B23190A
+1B3A1E193C2C3B1409000000FFFFFFEC0000033F03D91006172B0000FFFFFFEC00000420
+03081006172C0000FFFFFFEC0000018703E81026172800001007172100E00352FFFFFFEC
+0000027E03E81026172900001007172100E0035200020000000001B601B7000B00170000
+25342726220615141716323E011407062227263437363217013C1C1C52381C1C52387A3F
+40B83F40403FB840DC281C1D38292A1C1B3885B840404040B8403F3FFFFF0082FE9007EF
+03201027172202BC028A1027173202A9FE90100617270000FFFFFFECFEF4020603E81026
+172800001027172200630352100717320050FEF4FFFFFFECFEF4027E03E8102617290000
+1027172200630352100717320050FEF4FFFF0082FFEC07EF03B61027172402BC03201006
+17270000FFFFFFEC000001F304E2102617280000100717240063044CFFFFFFEC0000027E
+04E2102617290000100717240063044CFFFF009DFE0C053E05AF1026149900001007057C
+008AFF38FFFFFFEC0000045C054B1026149A00001007057C0058FED4FFFFFFEC0000053E
+054B1026149B00001007057C0058FED4FFFF009DFE0C053E05AA10261499000010071725
+023F0514FFFFFFEC0000045C05461026149A000010071725020D04B0FFFFFFEC0000053E
+05461026149B000010071725020D04B0FFFF009DFE0C053E05AA10261499000010071723
+01C2041AFFFFFFEC0000045C05461026149A000010071723019003B6FFFFFFEC0000053E
+05461026149B000010071723019003B6FFFF009DFE0C053E04B010261499000010271721
+023F041A1007172401E70019FFFFFFECFE3E045C044C1026149A0000102717240190FF38
+10071721020D03B6FFFFFFECFE3E053E044C1026149B000010271724019CFF3810071721
+020D03B6000100000533035F072B0003000009013501035FFCA1035F0695FE9E96016200
+000100D5FE56052705D50013004A402111110102010211101110420B950A11020300AF10
+130B100111021C0436111C001410DCECFCEC113939CC31002F3CEC323939DCEC304B5358
+071004ED071004ED5922B21F1501015D1333011133111407062B01353332373635011123
+D5B802E2B85251B5FEE9692626FD1EB805D5FB83047DFA17D660609C3031AD047DFB8300
+0001000F0000021F0460000B00324011020BA9050800BC0605020108080B00460C10FC3C
+3CEC323231002FE4DC3CEC3230400B100D400D500D600D700D05015D1333113315231123
+11233533C3B8A4A4B8B4B40460FE08A4FE3C01C4A40000000002FEF2FE56022E0460000E
+0017000013203534213311331133152306070603232217163332373621FED1010EC1B8B5
+BF12355220B57703047B692612FE56DDCD0460FBA09B703F6001103341301700FFFF0192
+066303E808331027007100BD023D1007171604BC01550000FFFF0192066103E808341027
+007100BD00FF1007171604BC025B0000FFFF0192065E03E808331027171E04BC01501007
+007100BD023D0000FFFF0193066303E5085A1027171704F002641007171604BC01550000
+FFFF0193066303E5085A10271719048C02641007171604BC01550000FFFF0192066103E8
+085A1027171704F002641007007100BD00FF0000FFFF0192066103E8085A10271719048C
+02641007007100BD00FF0000FFFF0176066A040A08331027171804C0015C1007007100BD
+023D0000FFFF018B066303ED085A1027171B04BC02621007171604BC01550000FFFF0176
+066A040A08561027171604BC027D1007171804C0015C0000FFFF018B066303ED08571027
+171B04BC01751007171E04BC027C0000FFFF0176066A0430085A10271717054002641007
+171804C0015C0000FFFF018B06630518083A1027171A04BC017510071717062802440000
+FFFF018B0663046D083A1027171905E202441007171A04BC01750000FFFF01760663040A
+08751027171A04BC01751007171804C0028C0000FFFF01760656040A08591027171D04BC
+01501007171804C002700000FFFF0183065603F5085A1027171D04BC01501007171704F0
+02640000FFFF0183065603F5085A1027171D04BC015010071719048C02640000FFFF0183
+065603F5088B102702BA04AB02101007171D04BC01500000FFFF018B06630507085B1027
+02BA061001E01007171A04BC01750000FFFFFC9A047BFF50066E102602B20000100702B8
+FEF8005A000100000000012C012C0003000011211121012CFED4012CFED4000000010000
+FFE3034F05D5000F00003D011E013332363511331110062322265BC2688F71CAD3F760BE
+3DEC515195CB03EEFC12FEE6EA2C0000FFFFFFABFE0C051302261026176100001007057F
+0206F91E0001FFABFE0C04F6022600180000013316171617163B01152322270207042135
+203736373635340278B81E030A492A65C3FA823244FBFEE4FEBE0130CBDA230A0226701E
+674D2CB83EFEEA8597B8808AD03A487EFFFF0090FEC8062307C41027057F02BC01901006
+14D50000FFFFFFEC0000026007C41027057FFF530190100614D60000FFFFFFEC000002BA
+07C41027057FFF530190100614D70000FFFF0082FEF006BF03461027057F00BCFD121006
+14E70000FFFFFFECFED4023804401027057FFF2BFE0C102717220063FED41006144E0000
+FFFFFFECFED4027E04401027057FFF2BFE0C102717220063FED41006144F0000FFFFFFAB
+FE0C047E04721027057F00BCFE3E100614A50000000100C1000002390614000B0039B506
+020800460C10FCECC44BB00E534BB010515A58B90006FFC038593100B400970687072FEC
+E430400D100D400D500D600D700DF00D06015D13331114163B011523222635C1B84C690B
+20B5A30614FB8299619CC0D6FFFF00910000045E02EE100614E10000FFFF0071FFE30525
+05F0100601E40000FFFF0071FFE30471050F100601E50000FFFF0096FE75020B047B1026
+00F300001007029DFF4A00000002004F0000027704600003000700003733132313211321
+C786B28624FEB2DA014E640398FC0404600000000002FF16FE5602770460000800160000
+05132303060736373605233733323736371321030607060135CA86D0233548324BFEDCDC
+143169302F1DE9014EDE296465160412FBD0B5540F3048F46430319904ACFB8CD6606000
+FFFFFFD3FE760267047B102702B0FF1D0000100600F30000FFFF00BFFE890179047B1026
+00F30000100702D4031D0000000200F000D801C304FB0003000700001333152311331523
+F0D3D3D3D301D6FE0423FE0000010097000002F605D5000B002B40160A02950181090495
+0605021C04031C0A080B1C090A0C10D432EC3210FC32EC3231002FEC32F4EC3230132115
+23113315213533112397025ECACBFDA2C9CA05D5AAFB7FAAAA048100000101AD02950509
+033F00030000011521350509FCA4033FAAAA0000FFFF00C804CB033808F2102705730000
+0258100605790000FFFF00C804CB033809551027057400000258100605790000FFFF00C8
+04BA033808E810270579000001F4100605730000FFFF00C804CB03380802102705760000
+0258100605790000FFFF00C804CB033809551027057700000258100605790000FFFF00C8
+04BA03380820102705790000012C100605760000FFFF00DC04BF0324079E102705760000
+01F41006057C0000FFFF00DC04BF032408F110270577000001F41006057C0000000100C1
+0000024E05D50005001A400D045402AF00040704030801040610FCFCFCC431002FECEC30
+331133113315C1B8D505D5FABE9300000001FFEC0000024E05D50007001E400F01045407
+AF0201090400080604040810C4FCFCFCC431002FECEC323025331521353311330179D5FD
+9ED5B893939305420001FFEC0000017905D50005001A400D025404AF0007040008040402
+0610C4FCFCEC31002FECEC302901353311330179FE73D5B89305420000020071FFE304A6
+0393000700150038400D151745051C081311011C0D451610F4ECD4B610113011A011035D
+3939ECFCC43100400B07A00F0803A00A8C13A0082FECF4EC10D4EC300010162036102620
+0106232200100020001514073315010DB90106B9B9FEFA012A4E59C3FEEB011501860115
+68ED023EFEFAB9B90106B9FD091D011501860115FEEBC3A97F9300000002FFECFFE304A6
+03930007001900414011181B45051C0E0B08170415011C10450D1A10C4F4ECD4B6101530
+15A015035D1739ECFCC43100400D07A0130C03A00A8C0E17A0190C2F3CEC32F4EC10D4EC
+300010162036102620010622272135332635340020001514073315010DB90106B9B9FEFA
+012A4EB24EFE4AED6801150186011568ED023EFEFAB9B90106B9FD091D1D937FA9C30115
+FEEBC3A97F9300000002FFECFFE304210393000700150038400D1745051C13080F011C0A
+45151610C4F4ECD4B6100F300FA00F035D3939ECEC3100400B07A00D1303A0118C08A013
+2FECF4EC10D4EC3000101620361026200326353400200010002322272135010DB90106B9
+B9FEFAED68011501860115FEEBC3594EFE4A023EFEFAB9B90106B9FD9C7FA9C30115FEEB
+FE7AFEEB1D9300000001003D0000037805D9000A0034400D0508020A0C0706081C030402
+0B10DCC432FCC432DCC41112393100400C0502080303010603810A87012FECEC32111217
+393029011101331B01330111210378FDDEFEE7C2B3B3C2FEE7016A032A02AFFE5D01A3FD
+51FD69000001FFEC0000037805D9000C0036400E080B05000E0A090B1C060705030D10C4
+DCC432FCC432DCC41112393100400C08050B03010906810C0387012FEC32EC3211173930
+25152135211101331B013301110378FC74016AFEE7C2B3B3C2FEE7939393029702AFFE5D
+01A3FD51FD6900000001FFEC0000032705D9000A0034400D0609030C0807091C04050301
+0B10C4DCC432FCC432CC1112393100400C06030903040A07048101870A2FECEC32111217
+39302335211101331B0133011114016AFEE7C2B3B3C2FEE793029702AFFE5D01A3FD51FC
+D60000000001003D000004D003710008000029010901230133013304D0FEECFEA2FEA2C3
+01A4FA016D8802BDFD430371FD2200000001FFEC000004D00371000A0000290135330133
+01331521010100FEEC88016DFA016D88FEECFEA29302DEFD229302BD0001FFEC0000047F
+0371000800002901353301330123010100FEEC88016DFA01A4C3FEA29302DEFC8F02BD00
+000100BA0000054F037100090024400B090B04071C05041C02040A10FCECD4FCFCC43100
+B60603A3080587012FEC32F43C3029011133112111331133054FFB6BB90255B9CE0371FD
+2202DEFD220000000001FFEC0000054F0371000B0028400C0B0D040A1C08061C0404020C
+10C4FCECD4FCFCC43100B70805A303060A87012FEC3232F43C3029013533113311211133
+1133054FFA9DCEB90255B9CE9302DEFD2202DEFD220000000001FFEC0000048103710009
+0024400B0B04001C08061C0404020A10C4FCECD4FCEC3100B60805A3030687002FEC32F4
+3C30290135331133112111330481FB6BCEB90255B99302DEFD2202DE000100BA0000054F
+037100090024400A080B04061C020104040A10FC3CD4FCFCC43100B704A006A30702A000
+2FEC32F4EC3033352111213521113315BA030EFCF203C7CE93024B93FD2293000001FFEC
+0000054F037100090024400A080B04061C020404010A10C4FCD4FCFCC43100B704A006A3
+0702A0002FEC32F4EC30233521112135211133151403DCFCF203C7CE93024B93FD229300
+0001FFEC0000048103710007002040090904001C040604030810C4FCD4FCEC3100B606A0
+00A304A0022FECF4EC3001112135211121350481FB6B03DCFCF20371FC8F93024B930000
+00020071000004D405E20013001F003A400E1221451B1C0C101C01151C06452010FCECDC
+B24001015DFCDCB2400C015DECFCC43100400B189501101E95099111A0002FECF4ECD43C
+EC30211126272E01343E01201E01140607060711211500141E01323E01342E0122060204
+524A728585E4010CE68383734B520218FC395B9CB89D5A5A9DB89C030E0B2031A8C5A962
+62A9C5A831200BFD859304AD7060383860706038380000000002FFEC000004D405E20015
+0021003E400F0123451D1C11151C06171C0B45042210C4FCECDCB24006015DFCDCB24011
+015DECFCC43100400C1A95061520950E910005A0022FEC32F4ECD43CEC30252115213521
+1126272E01343E01201E01140607060700141E01323E01342E01220602BC0218FB180218
+524A728585E4010CE68383734B52FE515B9CB89D5A5A9DB89C939393027B0B2031A8C5A9
+6262A9C5A831200B019F706038386070603838000002FFEC0000044F05E20013001F003A
+400E21451B1C0E121C03151C0845012010C4FCECDCB24006015DFCDCB24011015DECEC31
+00400B189503121E950B9102A0132FECF4ECD43CEC302335211126272E01343E01201E01
+14060706071100141E01323E01342E012206140218524A728585E4010CE68383734B52FE
+515B9CB89D5A5A9DB89C93027B0B2031A8C5A96262A9C5A831200BFCF204AD7060383860
+70603838000200BA0000054F04A60008000C0026400A020600050B040D0C0E0D10D4C410
+FCDCCCCC323100B6020305070BA0092FECDCDCDCCC300110331522073315230121352102
+11F2840285F1033EFB6B0495039C010A669A9EFCF89300000002FFEC0000054F04A60008
+000C0022B7030600050C0E0B0D10C4D4C4DCCCCC323100B6020305070BA0092FECDCDCDC
+CC30011033152207331523012135210211F2840285F1033EFA9D0563039C010A669A9EFC
+F89300000002FFEC0000048104A60008000C00244009020600050C040E0B0D10C4DCFCDC
+CCCC323100B6020305070BA0092FECDCDCDCCC30011033152207331523012135210211F2
+840285F10270FB6B0495039C010A669A9EFCF89300020071000006B505EE0013001D0037
+400F121F110801041408020E1B0809451E10FCECD43CEC32D4FCDCC43100400D030501A0
+1D0F18A00A9111A0002FECF4ECD43CEC32CC3021112111231123222610362017161D0121
+11331501353427262206141633052EFE439CF8BCB0B101665E8B0276CEFC205D38C66D72
+5E02DEFEC4013CD60155E56698B6C9FD22930371C9835D3898C683000002FFEC000006B5
+05EE0015001F003B40101221110801041608020E1D080945152010C4FCECD43CEC32D4FC
+DCC43100400E030501A01F0F1AA00A910011A0132FEC32F4ECD43CEC32CC302511211123
+1123222610362017161D0121113315213501353427262206141633052EFE439CF8BCB0B1
+01665E8B0276CEF93702E95D38C66D725E93024BFEC4013CD60155E56698B6C9FD229393
+02DEC9835D3898C6830000000002FFEC000005E705EE0013001D0037400F1F1108010414
+08020E1B080945131E10C4FCECD43CEC32D4FCCC3100400D030501A01D0F18A00A9100A0
+112FECF4ECD43CEC32CC3025112111231123222610362017161D01211121350135342726
+2206141633052EFE439CF8BCB0B101665E8B0276FA0502E95D38C66D725E93024BFEC401
+3CD60155E56698B6C9FC8F9302DEC9835D3898C683000000000100C10000039505D5000B
+002C400B0A0D07031305091C01040C10FCFC3CFC3CDCC43100400B05A0070004A002AF0A
+A0002FECF4EC10DCEC30331121152111211521112115C10283FE3501CBFE35021C05D593
+FE2F92FDB49300000001FFEC0000039505D5000D0030400C0C0F090513070B1C0304010E
+10C4FCFC3CFC3CDCC43100400C07A0090006A004AF020CA0002FEC32F4EC10DCEC302335
+33112115211121152111211514D50283FE3501CBFE35021C93054293FE2F92FDB4930000
+0001FFEC0000034405D5000B002C400B0D060913070B1C0404020C10C4FCFC3CFC3CCC31
+00400B08A00A0007A005AF02A0002FECF4EC10DCEC302901353311211521112115210179
+FE73D50283FE3501CBFE3593054293FE2F9200000001003D0000039505D5000B002C400B
+0A0D04081200041302060C10DC3CFC3CFCFCC43100400B04A0020005A007AF0AA0002FEC
+F4EC10DCEC302111213521112135211133150208FE3501CBFE350283D502DF9201D193FA
+BE9300000001FFEC0000039505D5000D0030400C0C0F040A120602130408010E10C4DC3C
+FC3CFCFCC43100400C05A0030008A00AAF0C02A0002FEC32F4EC10DCEC30233521112135
+211121352111331514021CFE3501CBFE350283D593024C9201D193FABE9300000001FFEC
+000002C005D5000B002C400B0D040B120307130509020C10C4DC3CFC3CFCEC3100400B07
+A0050008A00AAF02A0002FECF4EC10DCEC3029013521112135211121352102C0FD2C021C
+FE3501CBFE35028393024C9201D19300000200BA0000048C05D5000A0017002A400C1619
+1B071C130E021C0C041810FCFC3CD4ECFCC43100400901A00F0D810316A00B10EC32ECD4
+EC30012111213237363534272601113311213217161514073315029CFED0012C52342C2C
+3DFDD9B90155697F584FD302DEFDB55D4F7A7D495FFD2205D5FD9C875FD2A48293000000
+0002FFEC0000048C05D5000E0019002E400D0D1B1B161C0A05111C0304011A10C4FCFC3C
+D4ECFCC43100400A10A006048102120DA0002FEC3232ECD4EC3023353311331121321716
+1514073315012111213237363534272614CEB90155697F584FD3FE10FED0012C52342C2C
+3D930542FD9C875FD2A4829302DEFDB55D4F7A7D495F00000002FFEC0000040805D5000A
+0019002A400C1B1B071C1510021C0E040C1A10C4FCFC3CD4ECEC3100400901A0110F810D
+03A00B2FEC32ECD4EC300121112132373635342726013533113311213217161514070623
+029CFED0012C52342C2C3DFD0BCEB90155697F5858586C02DEFDB55D4F7A7D495FFD2293
+0542FD9C875FD2AD87850000000100C1000004F905D500130040400B12150409111C0500
+06041410F4DCB25F00015D39FCD4FCC400400B0B0500060AA0078111A0002FECF4EC3911
+393940070B120A12050605071005ECEC3130213402272627033521150513161716171617
+211502AA1B354D89C30363FD999D883442060201019899015F96DCDC0139569301FEEFEA
+B8E69C40399300000001FFEC000004F905D500160044400C1518040C141C080209040117
+10C4F4DCB25F02015D39FCD4FCC400400C0E0800090DA00A811402A0002FEC32F4EC3911
+393940070E120D12080908071005ECEC3130233521262726272627033521150513161716
+17161721151402BB03080D354D89C30363FD999D883442060201019893585DB096DCDC01
+39569301FEEFEAB8E69C4039930000000001FFEC0000042405D500130040400B15040C13
+1C08020904011410C4F4DCB25F02015D39FCD4EC00400B0E0800090DA00A8102A0002FEC
+F4EC3911393940070E120D12080908071005ECEC31302335212627262726270335211505
+1316171612071402BB03080D354D89C30363FD999D8834420B0193585DB096DCDC013956
+9301FEEFEAB8E6FEC97100000001003D000002E105D50008003A4009070A0403051C0103
+0910D4DCFC1139DCC43100400D0212011203040303048106A0082FECF4CCB21F03015D07
+1004ECECB48D028D01025D302111013501331133150154FEE90115BAD504DFFEC7F60139
+FABE93000001FFEC000002E105D5000A003E400A090C0605071C0305010B10C4D4DCFC11
+39DCC43100400E041203120506050506810802A00A2FEC32F4CCB21F05015D071004ECEC
+B48D048D03025D302335211101350133113315140168FEE90115BAD593044CFEC7F60139
+FABE93000001FFEC0000020C05D50008003A40090A0605071C0305010910C4D4DCFC1139
+CC3100400D0412031205060505068102A0082FECF4CCB21F05015D071004ECECB48D048D
+03025D30233521110135013311140168FEE90115BA93044CFEC7F60139FA2B00000300C1
+000007C0041A0011001A00230031400E10251C0E1C12181C1B211C01042410FCECD4ECD4
+FCFCC43100400B15A00A1EA004101A23A0002FEC3232D4ECD4EC3033113412333216173E
+0133321716151133150134262322061511210134262322061D0121C1F4C67D78352596D3
+D25E88D5FE71A45A817F01FEFD48A45A6C9401FE01EEA600FF4B2D2DD2588068FDB99302
+7C8280C595FE6E0163837FA7D2F200000003FFEC000007C0041A0013001C00250035400F
+122704101C141A1C1D231C0304012610C4FCECD4ECD4FCFCC43100400C17A00C20A00611
+1B2402A0132FEC323232D4ECD4EC30233533113412333216173E01333217161511331501
+34262322061511210134262322061D012114D5F4C67D78352596D3D25E88D5FE71A45A81
+7F01FEFD48A45A6C9401FE93015BA600FF4B2D2DD2588068FDB993027C8280C595FE6E01
+63837FA7D2F200000003FFEC000006EB041A0011001A00230031400E2504101C12181C1B
+211C0304012410C4FCECD4ECD4FCEC3100400B15A00C1EA006022219A0112FEC3232D4EC
+D4EC30233533113412333216173E01333217161511033426232206151121013426232206
+1D012114D5F4C67D78352596D3D25E88BAA45A817F01FEFD48A45A6C9401FE93015BA600
+FF4B2D2DD2588068FD26027C8280C595FE6E0163837FA7D2F20000000001003D000003DC
+05D5000D002D400C0C0F091F0B071C05011F030E10DCFC3CFC3CFCDCC43100400A0901A0
+030706810CA0002FECFCDC3CFC3C3021112135211133112115211121150188FEB5014BB8
+014BFEB5019C03819301C1FE3F93FD12930000000001FFEC000003DC05D5000F0031400D
+0E110B1F0D091C07031F05011010C4DCFC3CFC3CFCCCC43100400B0B03A005090881020E
+A0002FEC32F4DC3CFC3C302335211121352111331121152111211514019CFEB5014BB801
+4BFEB5019C9302EE9301C1FE3F93FD12930000000001FFEC0000038B05D5000D002D400C
+0F0C1F000A1C08041F06020E10C4DCFC3CFC3CFCCC3100400A0C04A0060A088102A0002F
+ECF4DC3CFC3C3029013521112135211133112115210240FDAC019CFEB5014BB8014BFEB5
+9302EE9301C1FE3F930000000002003D0000065805D500030015003E40111417101F0E12
+1C000C0A021C04081F061610DCFC3CFC3CDC3CFC3CFCDCC43100400E050111A0070B0F09
+0D810313A0042FEC32F43CDC3C3CEC323230251121110711213521113311211133112115
+211121150404FE3DB9FEB5014BB901C3B8014CFEB4019C9302EEFD129303819301C1FE3F
+01C1FE3F93FD12930002FFEC0000065805D5001300170042401212190E1F0C101C140A08
+161C02061F04001810C4DCFC3CFC3CDC3CFC3CFCDCC43100400F0F1503A005090D070B81
+111701A0132FEC3232F43CDC3C3CEC323230233521112135211133112111331121152111
+21152511211114019CFEB5014BB901C3B8014CFEB4019CFDACFE3D9302EE9301C1FE3F01
+C1FE3F93FD12939302EEFD120002FFEC0000060805D500110015003E4011170F1F0D1112
+120B09141C03071F05011610C4DCFC3CFC3CDC3CFC3CFCCC3100400E101304A0060A0E0C
+08811502A0002FEC32F43CDC3C3CFC3C3C30290135211121352111331121113311211521
+0311211104BCFB30019CFEB5014BB901C3B8014CFEB4B8FE3D9302EE9301C1FE3F01C1FE
+3F93FD1202EEFD12000200BA0000054F0371000500090025400B040B04021C08071C0104
+0A10FCECD4FCFCC43100B706A002A30308A0002FEC32F4EC3033112111331501112111BA
+03C7CEFC2402550371FD229302DEFDB5024B00000002FFEC0000054F03710007000B002A
+400C060D04041C0A091C0304010C10C4FCECD4FCFCC43100400908A004A3020905A0002F
+EC3232F4EC3023353311211133150111211114CE03C7CEFC2402559302DEFD229302DEFD
+B5024B000002FFEC000004810371000500090025400B0B04051C08071C0404020A10C4FC
+ECD4FCEC3100B709A004A30307A0002FEC32F4EC30290135331121051121110481FB6BCE
+03C7FCF202559302DE93FDB5024B00000002003D0000051405D5000200080043B4070A05
+040910D4C4C4C43100400A4201950481029507A0032FECECF4EC304B5358401202110601
+0200110505060211030111040403050710EC10EC0710EC0810EC59012101070121012115
+03C6FD74014673FE300486FE6801E90542FB7EC005D5FABE930000000002FFEC00000514
+05D50002000A0046B5090C0706040B10C4D4C4C43100400B420195068102950409A0032F
+EC32ECF4EC304B53584012021108010200110707080211050111060605050710EC10EC07
+10EC0810EC59012101053521012101211503C6FD740146FD6C01E9FE680486FE6801E905
+42FB7EC0930542FABE9300000002FFEC000004C305D5000200080043B40A0706040910C4
+D4C4C43100400A4201950681029504A0032FECECF4EC304B535840120211080102001107
+07080211050111060605050710EC10EC0710EC0810EC5901210105352101210103C6FD74
+0146FD6C01E9FE680486FE300542FB7EC0930542FA2B0000000300C1000005F305D5000A
+000E001F003840101E2104051C171D001C120E0C1C10042010FCECD43CFC3CD4ECFCC431
+00400D1C0BA001110AA013810D1EA00F2FEC32F4ECDC3CEC32300133323736353427262B
+01011121110111211121321716150607062F01112115036DA85D251F1F1D69A4FE0D013B
+FE0C01F401B084404501445C8CD40286037151453D3C645EFD9CFDB5024BFD2203710264
+85907C915B7C0101FDB593000003FFEC000005F305D5000A000E0021003C401120230405
+1C191F001C140E0C1C1204102210C4FCECD43CFC3CD4ECFCC43100400E1E0BA001130AA0
+1581110D20A00F2FEC3232F4ECDC3CEC32300133323736353427262B0101112111013533
+11211121321716150607062F01112115036DA85D251F1F1D69A4FE0D013BFD37D501F401
+B084404501445C8CD40286037151453D3C645EFD9CFDB5024BFD229302DE026485907C91
+5B7C0101FDB593000003FFEC0000056E05D5000A000E001F003840102104051C1A0F001C
+150E0C1C1304112010C4FCECD43CFC3CD4ECEC3100400D1F0BA001140AA01681120DA010
+2FEC32F4ECDC3CEC32300133323736353427262B01011121111321353311211121321716
+150607062F01036DA85D251F1F1D69A4FE0D013BB8FC7FD501F401B084404501445C8CD4
+037151453D3C645EFD9CFDB5024BFD229302DE026485907C915B7C0101000000000100C1
+0000045105D5000D002E400D0C0F040B1C090107031C05040E10FCFC3CDC3CFCFCC43100
+400A0402A006080A810CA0002FECF4DCCCFCCC30211121112311331121113311331502C5
+FEB5B9B9014BB8D40381FEFC029BFEFC01C1FABE930000000001FFEC0000045105D5000F
+0032400E0E11040D1C0B0309051C0704011010C4FCFC3CDC3CFCFCC43100400B0604A008
+0A0C81020EA0002FEC32F4DCCCFCCC30233521112111231133112111331133151402D9FE
+B5B9B9014BB8D49302EEFEFC029BFEFC01C1FABE930000000001FFEC0000037D05D5000D
+002E400D0F040C1C0B0309051C0704010E10C4FCFC3CDC3CFCEC3100400A0604A0080A0C
+8102A0002FECF4DCCCFCCC3023352111211123113311211133111402D9FEB5B9B9014BB8
+9302EEFEFC029BFEFC01C1FA2B00000000020070000005DF05D5000A001D0033400E1C1F
+04181F161A1C0B0107111B1E10FCCCD43CFC3CFCFCC43100400C190CA0001702A015811B
+A01D2FECF4ECD43CEC323001211121220706151417160111212227263534373633211121
+152111211501DC0130FED452342C2C3D016EFEAB6B7D5858586C0232014CFEB4022102F7
+024B5D4F7A7D495FFD090264875FD2AD8785FD2293FE2F930002FFEC000005DF05D5000A
+001F0037400F1E21041A1F181C1C0D0107131B0C2010C4FCCCD43CFC3CFCFCC43100400D
+1B0EA0001902A017811D0DA01F2FEC32F4ECD43CEC323001211121220706151417160135
+2111212227263534373633211121152111211501DC0130FED452342C2C3DFE550319FEAB
+6B7D5858586C0232014CFEB4022102F7024B5D4F7A7D495FFD099301D1875FD2AD8785FD
+2293FE2F930000000002FFEC0000050A05D5000A001D0033400E1F041A1F181C1C0D0107
+131B0C1E10C4FCCCD43CFC3CFCEC3100400C1B0EA0001902A017810DA01D2FECF4ECD43C
+EC323001211121220706151417160135211121222726353437363321112115211101DC01
+30FED452342C2C3DFE550319FEAB6B7D5858586C0232014CFEB402F7024B5D4F7A7D495F
+FD099301D1875FD2AD8785FD2293FD9C0001003D000003DC05D500090024400A080B041F
+061C001F020A10DCFCFCFCDCC43100B70106A0038107A0092FECF4EC3230211121352115
+211121150188FEB5034EFEB5019C05429393FB51930000000001FFEC000003DC05D5000B
+0029400B0A0D061F081C021F04010C10C4DCFCFCFCDCC4310040090803A006810209A000
+2FEC32F4EC323023352111213521152111211514019CFEB5034EFEB5019C9304AF9393FB
+519300000001FFEC0000038B05D500090024400A0B071F091C031F05020A10C4DCFCFCFC
+CC3100B70904A0068103A0002FECF4EC3230290135211121352115210240FDAC019CFEB5
+034EFEB59304AF93930000000002003D0000051405D5000200080040B3080A030910D4C4
+C43100400942019505810602A0032FEC32F4EC304B535840120111050201001106060501
+11040211030304050710EC10EC0710EC0810EC5925090107013301331503C6FEBAFEBAFD
+01D0E6019889930482FB7E9305D5FABE930000000002FFEC0000051405D50002000A0042
+B3090C040B10C4C4C43100400A4201950681080402A0032FEC3232F4EC304B5358401201
+1107020100110808070111060211050506050710EC10EC0710EC0810EC59250901053533
+013301331503C6FEBAFEBAFEB2890198E6019889930482FB7E93930542FABE930002FFEC
+000004C305D5000200080040B30A08040910C4C4C43100400942019506810402A0032FEC
+32F4EC304B53584012011107020100110808070111060211050506050710EC10EC0710EC
+0810EC5925090105353301330103C6FEBAFEBAFEB2890198E601D0930482FB7E93930542
+FA2B000000020071000004D405D5001C00280000211126272E0134373637363735213521
+1116171E01140607060715211500141E01323E01342E0122060204524A728543456F4A52
+FEB502035845728484724A530218FC395B9CB89D5A5A9DB89C01860B1F31A6C653562F1F
+0BF393FE7B0D1E32A6C6A631200BF2930322705F38385F70603838000002FFEC000004D4
+05D5001E002A00002335213526272E01343736373637352135211116171E011406070607
+15211500141E01323E01342E012206140218524A728543456F4A52FEB502035845728484
+724A530218FC395B9CB89D5A5A9DB89C93F30B1F31A6C653562F1F0BF393FE7B0D1E32A6
+C6A631200BF2930322705F38385F7060383800000002FFEC0000044F05D5001C00280000
+2335213526272E01343736373637352135211116171E0114060706071100141E01323E01
+342E012206140218524A728543456F4A52FEB502035845728484724A53FE515B9CB89D5A
+5A9DB89C93F30B1F31A6C653562F1F0BF393FE7B0D1E32A6C6A631200BFE7B0322705F38
+385F706038380000000100C10000045105D500090025400B080B04011C07031C05040A10
+FCECD4ECFCC43100B70402A0058107A0002FECF4FCCC302111211123112111331502C5FE
+B5B902BCD40542FEC501CEFABE9300000001FFEC0000045105D5000B002A400C0A0D0402
+1C08041C0604010C10C4FCECD4ECFCC4310040090504A008810209A0002FEC32F4FCCC30
+2335211121112311211133151402D9FEB5B902BCD49304AFFEC501CEFABE93000001FFEC
+0000037D05D500090025400B0B04031C09051C0704010A10C4FCECD4ECEC3100B70604A0
+088102A0002FECF4FCCC30233521112111231121111402D9FEB5B902BC9304AFFEC501CE
+FA2B0000000100C10000045104E6000B0028400C0B0D04091C0107031C05040C10FCFC3C
+DCFCFCC43100B70608A004020AA0002FECD4CCFCCC3021112111231133112111331502C5
+FEB5B9B90203D4034FFEFC029BFEFCFCB19300000001FFEC0000045104E6000D002D400D
+0D0F040B1C0309051C0704010E10C4FCFC3CDCFCFCC431004009080AA00604020CA0002F
+EC32D4CCFCCC3023352111211123113311211133151402D9FEB5B9B90203D49302BCFEFC
+029BFEFCFCB193000001FFEC0000037D04E6000B0028400C0D040B1C0309051C0704010C
+10C4FCFC3CDCFCEC3100B7080AA0060402A0002FECD4CCFCCC3023352111211123113311
+21111402D9FEB5B9B902039302BCFEFC029BFEFCFC1E0000000200C10000044205D50003
+000D002F400D0D0F040B1C0703011C0509040E10FC3CECDC3CFCFCC43100400B00A00608
+A00A81020CA0042FEC32F4ECD4EC300111211101112111213521113315017A013BFE0C01
+F4FE0C02ACD502DEFDB5024BFD22037101D193FABE9300000002FFEC0000044205D50003
+000F0033400E0F11040D1C0903011C070B04051010C4FC3CECDC3CFCFCC43100400C00A0
+080AA00C8106020EA0042FEC3232F4ECD4EC300111211101353311211121352111331501
+7A013BFD37D501F4FE0C02ACD502DEFDB5024BFD229302DE01D193FABE9300000002FFEC
+0000036D05D50003000D002F400D0F040D1C0903011C070B04050E10C4FC3CECDC3CFCEC
+3100400B00A0080AA00C810602A0042FEC32F4ECD4EC3001112111013533112111213521
+11017A013BFD37D501F4FE0C02AC02DEFDB5024BFD229302DE01D193FA2B000000020071
+000004D405D5000B002600424010252845071C1F1A231C170D011C12452710FCECDCB240
+0D015D3CFC3CDCB2401F015DECFCC43100400D0495230D0A951A17198124A00C2FECECD4
+3CECD43CEC3000141E01323E01342E012206131126272E0134373637363711331116171E
+011406070607152115010D5B9CB89D5A5A9DB89C9C524A728543456F4A52B85845728484
+724A5302180322705F38385F70603838FC7E01860B1F31A6C653562F1F0B0186FE7B0D1E
+32A6C6A631200BF2930000000002FFEC000004D405D5000B0028004640110C2A45071C23
+1E271C1B11011C16450F2910C4FCECDCB24011015D3CFC3CDCB24023015DECFCC4310040
+0E049527110A951E1B1D812810A00E2FEC32ECD43CECD43CEC3000141E01323E01342E01
+220601152135213526272E0134373637363711331116171E01140607060715010D5B9CB8
+9D5A5A9DB89C036CFB180218524A728543456F4A52B85845728484724A530322705F3838
+5F70603838FD119393F30B1F31A6C653562F1F0B0186FE7B0D1E32A6C6A631200BF20000
+0002FFEC0000044F05D5000B0026004240102845071C1F1A231C170D011C1245262710C4
+FCECDCB2400D015D3CFC3CDCB2401F015DECEC3100400D0495230D0A951A1719810CA025
+2FECECD43CECD43CEC3000141E01323E01342E012206133526272E013437363736371133
+1116171E011406070607112135010D5B9CB89D5A5A9DB89C9C524A728543456F4A52B858
+45728484724A53FD300322705F38385F70603838FD11F30B1F31A6C653562F1F0B0186FE
+7B0D1E32A6C6A631200BFE7B9300000000020071000004D405D5001E002A000021112627
+2E013437363736373521352115211516171E01140607060715211500141E01323E01342E
+0122060204524A728543456F4A52FEB5034EFEB55845728484724A530218FC395B9CB89D
+5A5A9DB89C01860B1F31A6C653562F1F0BF39393F20D1E32A6C6A631200BF2930322705F
+38385F70603838000002FFEC000004D405D50020002C000025152135213526272E013437
+363736373521352115211516171E0114060706071500141E01323E01342E01220604D4FB
+180218524A728543456F4A52FEB5034EFEB55845728484724A53FE515B9CB89D5A5A9DB8
+9C939393F30B1F31A6C653562F1F0BF39393F20D1E32A6C6A631200BF2028F705F38385F
+706038380002FFEC0000044F05D5001E002A0000290135213526272E0134373637363735
+21352115211516171E01140607060700141E01323E01342E01220602BCFD300218524A72
+8543456F4A52FEB5034EFEB55845728484724A53FE515B9CB89D5A5A9DB89C93F30B1F31
+A6C653562F1F0BF39393F20D1E32A6C6A631200B019D705F38385F7060383800FFFFFCEC
+03FBFF1006201007029CFBFEFF1A0000FFFF00AA0286068205D512270F61000002861027
+0F61000003CA10070F610000050D0000FFFF00AA0286068305D512270F61000002861027
+0F61000103C910070F620000050D0000FFFF00AA0286068205D512270F61000002861027
+0F62000003C910070F610000050D0000FFFF00AA0286068205D512270F61000002861027
+0F62000003C910070F620000050D0000FFFF00AA0286068205D512270F62000002861027
+0F61000003C910070F610000050D0000FFFF00AA0286068205D512270F62000002861027
+0F61000003C910070F620000050D0000FFFF00AA0286068205D512270F62000002861027
+0F62000003C910070F610000050D0000FFFF00AA0286068205D512270F62000002861027
+0F62000003C910070F620000050D0000000101970518051B05E0000B003A400D02010003
+060504070A09080B0C10D440093F0B6F0B8F0B900B045DDC3939D4DC3939D4CC39393100
+B6050407010A0B0C10D4CC32DC3CCC30010723272307232723072327051B643232AF3232
+32AF32326405E0C864646464C8000000000100C9FE5605FC05D5000E0000212311012111
+3311012111331501230533C4FD6AFEF0C402960110C9FE928604E1FB1F05D5FB1F04E1FA
+D5AAFE56000100C1FE5605380460000E00002123110123113311013311331501230480B7
+FDE4ECB7021BEDB8FEDE7B0383FC7D0460FC7F0381FC3999FE560000000200AEFE560458
+047B001F0020000025350E0123222635113311141633323635113311100221222627351E
+013332360103A043B175C1C8B87C7C95ADB8FEFEFA61AC51519E52B5B4FEDD6A426663F0
+E702A6FD619F9FBEA4027BFC2BFEE2FEE91D1EB32C2ABD04D0000000FFFF007DFE900447
+0352102717320119FE90100614A10000FFFF007DFEA2044703521027172101A9FEA21006
+14A10000FFFF007DFEA2044705F71027054BFFC2FF061027172101A9FEA2100614A10000
+FFFF007DFFDA044705781027172400FA04E2100614A10000FFFF007DFFDA044705AA1027
+172600FA0514100614A10000FFFFFFABFE0C047E0226102717320258FE0C100614A50000
+FFFFFFABFE0C047E0226102717210334FE48100614A50000FFFFFFABFE0C047E02261027
+172100B40028102717210334FE48100614A50000FFFFFFABFE0C047E03B61027172201F4
+0320100614A50000FFFFFFABFE0C047E04B01027172601F4041A100614A50000FFFF0082
+FE0C0A4703B6102614A9000010271721055F03201007172105F5FEA2FFFFFFECFEA2060A
+03E8102614AA0000102717210307035210071721039DFEA2FFFFFFECFEA2073703E81026
+14AB0000102717210307035210071721039DFEA2FFFF0082FE0C0A4702EE102614A90000
+100717240578FF06FFFFFFECFE0C060A02EE102614AA0000100717240320FF06FFFFFFEC
+FE0C073702EE102614AB0000100717240320FF06FFFF0082FE0C0A4704B0102614A90000
+1027172304E20320100717240578FF06FFFFFFECFE0C060A04B0102614AA000010271723
+028A0320100717240320FF06FFFFFFECFE0C073704B0102614AB000010271723028A0320
+100717240320FF06FFFF0082FE0C09E102E5102614B10000100717220578FEA2FFFFFFEC
+FEA2063202E5102614B20000100717220258FEA2FFFFFFECFEA2070402E5102614B30000
+100717220258FEA2FFFF0082FE0C09E104B0102614B1000010071723047E0320FFFFFFEC
+0000063204B0102614B200001007172301900320FFFFFFEC0000070404B0102614B30000
+1007172301900320FFFF0090000007AC0614102614B900001007172303840352FFFFFFEC
+000005D40614102614BA000010071723027C0352FFFFFFEC000006A40614102614BB0000
+10071723027C0352FFFF0075FE0C04B20546102614C1000010071723012C03B6FFFFFFEC
+000003F80640102614C2000010071723012C04B0FFFFFFEC000003F00546102614C30000
+10071723012C03B6FFFF0082FEA2085C03111026172A000010071721036BFEA2FFFFFFEC
+FED4033F03D91026172B00001007172101A8FED4FFFFFFECFED4042003081026172C0000
+1007172101A8FED4FFFF0082FEA2085C044C1026172A00001027172105F503B610071721
+036BFEA2FFFFFFECFED4033F05141026172B00001027172101A9047E1007172101A8FED4
+FFFFFFECFED40420047E1026172C00001027172101BB03E81007172101A8FED4FFFF0082
+FDA8085C03111026172A00001007172402EEFEA2FFFFFFECFDDA033F03D91026172B0000
+10071724012CFED4FFFFFFECFDDA042003081026172C000010071724012CFED4FFFF006B
+FE0C06C004011026172D0000100717210401036BFFFFFFEC0000033F05141026172E0000
+1007172101A9047EFFFFFFEC00000420047E1026172F00001007172101BB03E8FFFF006B
+FE0C06C004FB1026172D0000100717230384036BFFFFFFEC0000033F060E1026172E0000
+10071723012C047EFFFFFFEC0000042005781026172F000010071723013E03E800010082
+FFA70882061400370000253224363D01342725243D013437363701210106070617161705
+161D011417163B011523222627060423212227241134373306151417163304F6B8016B31
+79FC59FE9D0B13A002B00160FC685F0F090406AE03CAF82F0F162E5A5C390B53FE6CA1FE
+0CC080FEB63FB841CB689758966C05096B129137BE07063E6360019BFDE837230A23351B
+9626F8455E1105B8323039822662010B8A5C5E887E4222000001FFEC0000068406140020
+000023352132373627262725243D01343736370121010607061716170516151407062314
+0508932E13030D63FC59FE9D0B11A202B00160FC685F0F090406AE03CAF83E5FDFB8682C
+1C6E0F9137BE08053E6261019BFDE837230A23351B9626F871659B000001FFEC00000706
+06140029000023352132373635342725243D013437363701210106070617161705161D01
+1417163B011523222627062314050888391070FC59FE9D0B11A202B00160FC685F0F0904
+06AE03CAF82F0F162E5A5A380B60A7B8681D187F119137BE08043F6261019BFDE837230A
+23351B9626F8455F1005B82F28570000FFFF0082FFA707D9061410261425000010071732
+05460384FFFFFFEC000003CF0614102614D200001007173201F40384FFFFFFEC0000047F
+0614102614D300001007173201F40384FFFF0090FFC906D20614102614D1000010071721
+02EE0546FFFFFFEC000003CF0672102614D200001007172100C805DCFFFFFFEC0000047F
+0672102614D300001007172100C805DCFFFF0090FDA806D20614102614D1000010071724
+0258FEA2FFFFFFECFDDA03CF0614102614D200001007172400C8FED4FFFFFFECFDDA047F
+0614102614D300001007172400C8FED4FFFF0082FFA707D9072B10261429000010071732
+05460384FFFFFFEC000003CF072B1026142A00001007173201F40384FFFFFFEC0000047F
+072B1026142B00001007173201F40384FFFF0082FEA207D9072B10261429000010071722
+0258FEA2FFFFFFECFED403CF072B1026142A00001007172200C8FED4FFFFFFECFED4047F
+072B1026142B00001007172200C8FED4FFFF0082FFA707D9083410261429000010071723
+038406A4FFFFFFEC000003CF08341026142A000010071723004B06A4FFFFFFEC0000047F
+08341026142B000010071723004B06A4FFFF0090FEC80623079E102614D5000010071721
+046A0708FFFFFFEC000001AF079E102614D600001007172101010708FFFFFFEC000002BA
+079E102614D700001007172101010708FFFF0090FEC806230834102614D5000010071723
+03E806A4FFFFFFEC0000020F0834102614D6000010071723007F06A4FFFFFFEC000002BA
+0834102614D7000010071723007F06A4FFFF0090FCE006230614102614D5000010071724
+0226FDDAFFFFFFECFE0C01F30614102614D60000100717240063FF06FFFFFFECFE0C02BA
+0614102614D70000100717240081FF06FFFF0093FCC7062B02BC10261435000010271721
+023F02261007172102BCFCC7FFFFFFECFED4018703E81027172100E00352102617280000
+1007172100E0FED4FFFFFFECFED4027E03E81027172100E0035210261729000010071721
+00E0FED4FFFF0093FCAE062B02BC10261435000010271721023F0226100717320226FCAE
+FFFFFFECFEF4020603E81027172100E00352102617280000100717320050FEF4FFFFFFEC
+FEF4027E03E81027172100E00352102617290000100717320050FEF4FFFF0093FE0C062B
+03B61026143500001007172301F40226FFFFFFEC000001F304E210261728000010071723
+00630352FFFFFFEC0000027E04E210261729000010071723006303520002013500000200
+05D5000300090062400F07008302810408070400030501000A10FC3CEC32393931002FF4
+FCCC30014BB00B5458BD000A00400001000A000AFFC03811373859014BB00F544BB01054
+5B4BB013545B58BD000AFFC00001000A000A00403811373859B6000B200B500B035D0123
+35331123111333130200CBCBCB15A21404D7FEFA2B028F0165FE9B000002008FFFE303AC
+05D5002000240086402F201A05020406190010860F880C002183230C95138C2381250622
+1916090501001A2209001C01221C21260F091C162510DCECD4FCECD4EC11123911123911
+12391239310010E4F4EC10FECD10F4EE123939173930014BB010544BB012545B4BB01354
+5B58BD0025FFC000010025002500403811373859400B7404740574067407761C055D0133
+1514060F010E0115141633323637150E012322263534363F013E01373E01351323353301
+F4BE375A5A3A33836D4EB4605EC067B8E04959583026080706C4CACA04449C6582575835
+5E31596E4643BC3938C29F4C8956562F3519153C36010EFEFFFF008FFFE303AC05D31207
+12570000017500000001FFEC000002810258000D00002506232135213237363D01331514
+0225489DFEAC011D632C31B85656B82C316AD9D9BB000000000100DDFDD407B208230007
+00001321112111211121DD06D5FEADFBD0FEAE0823F5B1092DF6D300000100DDFDD407B2
+0823000700001311211121112111DD015204300153FDD40A4FF6D3092DF5B10000010023
+FDD407660823000B00001321112109012111213509014E06F3FAB403B6FC2B0590F8BD04
+02FC290823FEEFFC0AFBC8FEF0D3046D04150000000100A5FD990540089000160000013E
+013216170726232207030E0123222627371633323702AB0CE4D6B31CD21850640C5C0BE6
+6A6BB31CD21850640C06E8ECBCB0C715B8F8F87DECBCB0C715B8F700FFFF00A5FD990848
+08901026184000001007184003080000FFFF00A5FD990B51089010271840061100001027
+184003080000100618400000000300A5FD9905400890002D0036003F0000013637363332
+171617072623220703161716151407060703060706232227262737163332371326272635
+3437363713363736273427262701130607061714171602AB0C7570686D644E1DD2185064
+0C148C5D9C9C7AA2150B7670686D644E1DD21850640C1584669C9D75A6C3563F62016434
+3FFEF51F563F66016A3406E8EC605C634DC715B8F8FE5B226AAFCFDD9C781CFE39EC605C
+634DC715B8F701B022679DDBDDA27A1BFC9D1742669296643319FD760298184169929266
+33000000000400A5FD9908480890004D0051005A00630000013637363332171617072623
+220703211336373633321716170726232207031617160714070607030607062322272627
+371633323713210306070623222726273716333237132627263534373637132113210113
+0607061714171601033637362734272602AB0C7570686D644E1DD21850640C14021C150C
+7570696D644E1CD11851640C148C5E9C019B7AA2160B7570696D644E1CD11851640C13FD
+E4150B7670686D644E1DD21850640C1584669C9D75A6C2021C22FDE4FEF31F563F66016A
+34045120563F6201643406E8EC605C634DC715B8F8FE6C01B8EC605C634DC715B8F8FE5B
+226AAFCFDD9C781CFE39EC605C634DC715B8F7019DFE40EC605C634DC715B8F701AE2368
+9DDBDDA27A1BFC9002BFFD5B0298184169929266330271FD6917426692966433000500A5
+FD990B500890006D00710075007E00870000013637363332171617072623220703211336
+373633321716170726232207032113363736333217161707262322070316171615140706
+070306070623222726273716333237132103060706232227262737163332371321030607
+062322272627371633323713262726353437363701132103290113210113060706171417
+1601033637363534272602AB0C7570686D644E1DD21850640C14021C150C7570696D644E
+1CD11851640C14021D150C7570686D644E1CD11851640B148C5D9C9C7AA2150B7670686D
+654E1CD21850640C14FDE4160B7570696D644E1CD11851640C13FDE4150B7670686D644E
+1DD21850640C1584669C9D75A605E622FDE422FCF8021C22FDE4FEF31F563F66016A3407
+591F563E62653406E8EC605C634DC715B8F8FE6C01B8EC605C634DC715B8F8FE6C01B8EC
+605C634DC715B8F8FE5B226AAFCFDD9C781CFE39EC605C634DC715B8F7019DFE40EC605C
+634DC715B8F7019DFE40EC605C634DC715B8F701AE23689DDBDDA27A1BFC9002BFFD4102
+BFFD5B0298184169929266330271FD691742669296643300000100A5FD9905E908900033
+00000126232207031617161D01371701230137173534272627030E012322262737163332
+3713060706152334373637133E0133321617046E1853620B177E59A88566FEF44DFEF666
+8270483E3E0BE26670B51DD21853620B3D5B427A909A7A9A180BE26670B51D0704B8F8FE
+292258A7DC2A8365FEF4010C65832AA36D4810FAE9E9BFACCB15B8F704FF174278A2DB9B
+7A1701F1E9BFADCA000300A5FD9905D1089000080011003E000001130607061714171601
+3427033E013727371326232207031617161737170706070607030E012322262737163332
+37132627263534373637133E0133321617026D1F563F66016A34021FD71F56730DBF6599
+1853620B147E6B9A016566EC25557AA2150BE16C6BB51DD21853620B1584669C9D75A615
+0BE16C6BB51D01D30298184169919366330145D854FD69178E1BC1650358B8F8FE5B1F6D
+9DAF6565ED5F587F1CFE39E9BFACCB15B8F701B022679DDBDDA27A1B01BFE8C0ADCA0000
+000300A5FD9905D4089000080012003D0000011306070617141716012E0127033E013707
+271326232207031E011F010727140007030E012322262737163332371326272635343736
+37133E0133321617026D1F563F66016A340204314D3E1F56950A7666FC1853620B148CC5
+19E8666AFEEEA3150BE16C6BB51DD21853620B1584669C9D75A6150BE16C6BB51D01D302
+981841699193663301B75D4419FD6917B75B77660426B8F8FE5B22DE59E8666AAFFEF01B
+FE39E9BFACCB15B8F701B022679DDBDDA27A1B01BFE8C0ADCA0000000001FFF8FDD40950
+082300060000090121090121010541040FFEE1FC73FC73FEE1040C0823F5B10925F6DB0A
+4F0000000001FFF8FDD40950082300060000090121090121010407FBF1011F038D038D01
+1FFBF4FDD40A4FF6DC0924F5B1000000000100C6FDD40882082300100000012000190123
+111000200019012311100004A4FECBFE4BF4027502D20275F4FE4F073BFEC0FE9BF93E06
+E501C801A2FE5EFE38F91B06C201620143000000000100C6FDD408820823001000000120
+00190133111000200019013311100004A4013501B5F4FD8BFD2EFD8BF401B1FEBC014101
+6506C1F91BFE38FE5E01A301C706E5F93FFE9EFEBC00000000030052FDC30AFE08750003
+001D00370000012111210020070607060215141217161716203736373612353402272627
+002004171617161110070607060420242726272611103736373604D101AEFE5201B9FE3C
+C6C2A1A4A1A1A4A1C2C601C4C6C2A1A4A2A2A4A1C2FD3F023301E3C9C964636364C9C9FE
+1DFDCDFE1CC9C964636364C9C9041CFDFB05595452A1A3FE7AE7E1FE7AA2A153535352A2
+A30186E0E70186A3A1520159CBC8C9F3F0FEE3FEE9F2F0CAC7CCCCC7C9F1F30116011CF1
+F3C9C70000030052FDC30AFE087500190033003F00000020070607060215141217161716
+203736373612353402272627002004171617161110070607060420242726272611103736
+3736051121152111231121352111068AFE3CC6C2A1A4A1A1A4A1C2C601C4C6C2A1A4A2A2
+A4A1C2FD3F023301E3C9C964636364C9C9FE1DFDCDFE1CC9C964636364C9B50388039BFC
+65EEFC65039B07705452A1A3FE7AE7E1FE7AA2A153535352A2A30186E0E70186A3A15201
+59CBC8C9F3F0FEE3FEE9F2F0CAC7CCCCC7C9F1F30116011CF1F3C9B56AFC65F1FC65039B
+F1039B0000030052FDC30AFE087500190033003F00000020070607060215141217161716
+203736373612353402272627002004171617161110070607060420242726272611103736
+3736130901170901070901270901068AFE3CC6C2A1A4A1A1A4A1C2C601C4C6C2A1A4A2A2
+A4A1C2FD3F023301E3C9C964636364C9C9FE1DFDCDFE1CC9C964636364C9B583028D028D
+AAFD73028DA8FD73FD73AA028DFD7307705452A1A3FE7AE7E1FE7AA2A153535352A2A301
+86E0E70186A3A1520159CBC8C9F3F0FEE3FEE9F2F0CAC7CCCCC7C9F1F30116011CF1F3C9
+B5FEB8FD73028DAAFD73FD73A8028DFD73AA028D028D0000FFFF00A5FD990E5908901026
+18400000102718400611000010271840091900001007184003080000000100A5FD990540
+0890001F0000051633323713213521133E0133321617072623220703211521030E012322
+262701771853620B2DFE7D018F230BE16C6BB51DD21754620B220183FE722F0BE16C6BB5
+1DDBB8F703AEF102E5E9BFADCA15B8F8FD3FF1FC2FE9BFACCB000000000100A5FD990540
+08900027000005163332371321352113213521133E013332161707262322070321152103
+211521030E012322262701771853620B1FFE8B018111FE6E019D150BE16C6BB51DD21853
+620B140175FE80110191FE63200BE16C6BB51DDBB8F7028EF00154ED01C5E9BFADCA15B8
+F8FE5FEDFEACF0FD4FE9BFACCB000000000100A5FD9905400890001F0000012623220703
+011501030E0123222627371633323713013501133E0133321617046E1853620B2501C9FE
+2C2C0BE16C6BB51DD21853620B25FE3901D22C0BE16C6BB51D0704B8F8FD090101E2FEF9
+FC5CE9BFACCB15B8F702F8FEFEE3010703A4E9BFADCA0000000200A5FD9905400890002C
+003500000126232207031617072627033637170607030E01232226273716333237132627
+263534373637133E0133321617011306070617141716046E1853620B14D868A039711F2D
+1E584C61150BE16C6BB51DD21853620B1584669C9D75A6150BE16C6BB51DFD2D1F563F66
+016A340704B8F8FE5B3AC05C662EFD6908189E330DFE39E9BFACCB15B8F701B022679DDB
+DDA27A1B01BFE8C0ADCAFABA029818416991936633000000000100A5FD9905E808900034
+00000126232207033637363D01072701330107271514070607030E012322262737163332
+3713262726353314171617133E013332171617046E1853620B3D5B427A8466010C4C010A
+66829C789A180BE36A6BB51DD21853600D178158A89071483F3E0BE36A6B674C1F0704B8
+F8FB02174278A12B8466010CFEF466842BDD987A18FE10E9BFACCB15B8F701D72358A8DA
+A16E48100517E9BF634ACA00000200A5FD99054008900003002100000121112103132111
+21133E01321617072623220703211121030E01222627371633320266012AFED617180213
+FE151C0BE5D6B21DD21850630D1401BBFE0F120BEFCEB01DD218506503BFFE99FD0C020C
+03180260ECBCB1C615B8F8FE87FB62FE94F5B3B1C615B800000200A5FD99054008900003
+002C000001211121130607133E0132161707262322070316171610070607030E01232226
+273716333237131633323610260266012AFED68C3A2C1F0BE5D6B21DD21850640C148C5D
+9C9C7AA2150BE66A6BB21DD21850630D1F394C9DBFD103BFFE99021C0307027EECBCAFC8
+15B8F8FE5B226AAFFE559D781CFE39ECBCB1C615B8F7026C17D00132B3000000000200A5
+FD9906470890000300310000012111210116333237131617163332361026232007133E01
+33321617072623220703363332001000232227030E0123222627039E012BFED5FDD91853
+620B26404F9E8D8CD4C3A0FED3762208E66A6BB51DD21853620B155360EF0124FEC8DB7B
+67180BE36A6BB51D03CAFE99FCC2B8F7031D58284CCD0128CAE40358E8C0ADCA15B8F8FE
+4B1BFEB7FE54FECB2FFE12E9BFACCB00000300A5FD99054008900003000C003400000121
+112104361026200615141603163332371326272610373637133E01333216170726232207
+0316171610070607030E0123222627025F012AFED6011FD1C3FED2CCCAE51853620B1584
+669C9D75A6150BE16C6BB51DD21853620B148C5D9C9C7AA2150BE16C6BB51D03CDFE99AD
+CC0128CACD9392CCFD6CB8F701B022679D01B8A27A1B01BFE8C0ADCA15B8F8FE5B226AAF
+FE549C781CFE39E9BFACCB00000300A5FD9905400890001E002200260000371121133E01
+321617072623220703211121030E01232226273716333237130103331121231133D701BD
+170BE5D6B21DD21850640C15018CFE41140BEF6665B31DD21850640C13011622F3FE43F2
+D0DB043B01D2ECBCB1C615B8F8FE52FBC5FE66F5B3AEC915B8F701770378FD4B02B5FD4B
+0001FFA3FD9906420890002F0000012623220703213216100623353637262721030E0123
+222627371633323713210107013501170121133E013332171617046E1853620B24017E8D
+C5CB87880B0B88FE792F0BE16C6BB51DD21853600D2DFE63010988FE4301BD88FEF701A6
+260BE16C6B674C1F0704B8F8FD14CAFEE8C6C0068F8B08FC29E9BFACCB15B8F703B4FEF9
+8801BC6601BC88FEF90310E9BF634ACA000100A5FD990540089000250000012623220703
+371709010727030E0123222627371633323713072709013717133E0133321617046E1853
+620B1CDEA9FE9C0164A9FB230BE16C6BB51DD21853620B21E1AD0167FE9CAAFC200BE16C
+6BB51D0704B8F8FDA9DEABFE9BFE9CAAF9FD1BE9BFACCB15B8F702AAE2AB01640165A9FD
+029CE9BFADCA0000000100A5FD9905400890002C00000516333237130607061511231110
+1237133E0133321617072623220703161716190123111027030E01232226270177185362
+0B405C2D4AABDBAB140BE16C6BB51DD21853620B137F587AABAF400BE16C6BB51DDBB8F7
+0529174671DDFE4701D10125010A1801A7E9BFADCA15B8F8FE72226289FED1FE2F01B901
+5847FAC0E9BFACCB000100A5FD9905400890002900000126232207033613113311100503
+0E0123222627371633323713262726190133111017133E0133321617046E1853620B3CCE
+01ABFE7E180BE16C6BB51DD21853620B1782597AABB23D0BE16C6BB51D0704B8F8FB2036
+017301BAFE2EFDF237FE11E9BFACCB15B8F701D6216289012F01D2FE46FEA64504FAE9BF
+ADCA0000000200A5FD99054E09DC0016001A0000013E013216170726232207030E012322
+262737163332370115213502AB0BE5D6B21DD21850640C5C0BE66B6AB21DD21850640C02
+FFFBA906E8ECBCB1C615B8F8F87DECBCB1C615B8F70A78E2E200000000020097FC4C0540
+08900016001A0000013E013216170726232207030E012322262737163332370135211502
+AB0BE5D6B21DD21850640C5C0BE66B6AB21DD21850640CFE48045606E8ECBCB1C615B8F8
+F87DECBCB1C615B8F7FCE8E3E30000000001000000025999F5875B945F0F3CF5001F0800
+00000000D17E0EE400000000D17E0EE4F7D6FC4C0E5909DC000000080000000100000000
+00010000076DFE1D00000EFEF7D6FA510E59000100000000000000000000000000001852
+04CD00660000000002AA0000028B00000335013503AE00C506B4009E051700AA079A0071
+063D0081023300C5031F00B0031F00A40400003D06B400D9028B009E02E30064028B00DB
+02B2000005170087051700E1051700960517009C051700640517009E0517008F051700A8
+0517008B0517008102B200F002B2009E06B400D906B400D906B400D9043F009308000087
+05790010057D00C905960073062900C9050E00C9049A00C906330073060400C9025C00C9
+025CFF96053F00C9047500C906E700C905FC00C9064C007304D300C9064C0073058F00C9
+0514008704E3FFFA05DB00B20579001007E90044057B003D04E3FFFC057B005C031F00B0
+02B20000031F00C706B400D90400FFEC040000AA04E7007B051400BA0466007105140071
+04EC007102D1002F05140071051200BA023900C10239FFDB04A200BA023900C107CB00BA
+051200BA04E50071051400BA05140071034A00BA042B006F03230037051200AE04BC003D
+068B005604BC003B04BC003D043300580517010002B201040517010006B400D9028B0000
+03350135051700AC051700810517005E0517005202B201040400005C040000D70800011B
+03C5007304E5009E06B400D902E300640800011B040000D5040000C306B400D90335005E
+0335006204000173051700AE0517009E028B00DB040001230335008903C5006004E500C1
+07C1008907C1008907C10062043F008F0579001005790010057900100579001005790010
+0579001007CB000805960073050E00C9050E00C9050E00C9050E00C9025C003B025C00A2
+025CFFFE025C00060633000A05FC00C9064C0073064C0073064C0073064C0073064C0073
+06B40119064C006605DB00B205DB00B205DB00B205DB00B204E3FFFC04D700C9050A00BA
+04E7007B04E7007B04E7007B04E7007B04E7007B04E7007B07DB007B0466007104EC0071
+04EC007104EC007104EC00710239FFC7023900900239FFDE0239FFF404E50071051200BA
+04E5007104E5007104E5007104E5007104E5007106B400D904E50048051200AE051200AE
+051200AE051200AE04BC003D051400BA04BC003D0579001004E7007B0579001004E7007B
+0579001004E7007B05960073046600710596007304660071059600730466007105960073
+04660071062900C9051400710633000A05140071050E00C904EC0071050E00C904EC0071
+050E00C904EC0071050E00C904EC0071050E00C904EC0071063300730514007106330073
+0514007106330073051400710633007305140071060400C90512FFE5075400C9058F0078
+025CFFE40239FFD3025C00030239FFF2025CFFF50239FFE4025C00B002390096025C00C9
+023900C104B800C9047200C1025CFF960239FFDB053F00C904A200BA04A200BA047500C9
+023900C1047500C902390088047500C9030000C1047500C902BC00C1047FFFF202460002
+05FC00C9051200BA05FC00C9051200BA05FC00C9051200BA068200CD05FC00C9051200BA
+064C007304E50071064C007304E50071064C007304E50071088F0073082F0071058F00C9
+034A00BA058F00C9034A0082058F00C9034A00BA05140087042B006F05140087042B006F
+05140087042B006F05140087042B006F04E3FFFA0323003704E3FFFA0323003704E3FFFA
+0323003705DB00B2051200AE05DB00B2051200AE05DB00B2051200AE05DB00B2051200AE
+05DB00B2051200AE05DB00B2051200AE07E90044068B005604E3FFFC04BC003D04E3FFFC
+057B005C04330058057B005C04330058057B005C0433005802D1002F0514002005E1FF97
+057D00C9051400BA057D00000514000005A0007305960073046600710633000A068DFF97
+057D00C90514007104E50071050E0083064C007504EA00A4049AFF9602D1FF7F06330073
+057E000807DF00BA02D400C9025C000A05F700C904A200B90239000A04BC003D07CB00B2
+05FCFF96051200BA064C0073074E006704E5007607970073061300710537FF97051400B9
+058F00C905140072042B0064050E00C902B0FEF20323003704E300180323003704E3FFFA
+06DD00AD051200B0061D004E05C400C905F3FFFC05D8003D057B005C04330058055400A0
+0554005C049F006804330071051700960554005D049F006804150058051400BA025C00C9
+03F000C903AC0014025D00C90B6000C90A6400C9093C007106AF00C9064B00C903A700C1
+077300C9076400C9066100BA0579001004E7007B025CFFFE0239FFE0064C007304E50071
+05DB00B2051200AE05DB00B2051200AE05DB00B2051200AE05DB00B2051200AE05DB00B2
+051200AE04EC00710579001004E7007B0579001004E7007B07CB000807DB007B06330073
+051400710633007305140071053F00C904A2FFE9064C007304E50071064C007304E50071
+055400A0049F00580239FFDB0B6000C90A6400C9093C0071063300730514007108E700C9
+057500C905FC00C9051200BA0579001004E7007B07CB000807DB007B064C006604E50048
+0579001004E7007B0579001004E7007B050E00C904EC0071050E00C904EC0071025CFFA7
+0239FFC3025C00050239FFE3064C007304E50071064C007304E50071058F00C7034A0082
+058F00C9034A00BA05DB00B2051200AE05DB00B2051200AE05140087042B006F04E3FFFA
+032300370504009C042C0047060400C90512FFF005E200C906B400710596007104E20071
+057B005C043300580579001004E7007B050E00C904EC0071064C007304E50071064C0073
+04E50071064C007304E50071064C007304E5007104E3FFFC04BC003D03CC008A06BE00BA
+03D100370239FFDB07FC007107FC00710579FFFD0596000C046600090475000A04E3FFB2
+042B006F0433005804D3005003D50050057D000A05DB000C05790010050E00C904EC0071
+025CFF960239FFDB0640007305140071058F000A034A000E04E3FFF604BC000B04CD00AE
+05140071051400BA051400BA0465007F04660071051400710592007104EC007104EC0071
+068E007C045300850441008506340085055000710239FFDB059100710514007105090071
+04C4006004C40060051200AE051200BA051200BA0239000E02B500A602F90074032A004B
+03E6004D023A00C105A600C107CB00BA07CB00BA07CB00BA052BFFDB052300BA051200B3
+04E5007106DD007105D30094054700700350000003500000034F0000034A00BA034900BA
+043E0084043E007404D400BA04D400BA042B006F02B0FFD902B0FFD903B1003702B0FEF2
+03230037032300370512000004F1007104C900C104BC003D068B005604BC003D04E30066
+0433005804330058049F0058049F006D04150058041500580415005804150058064C0073
+04A300BA0550007105AA0071053B00BA0256FEF2055600BA040E00BA05D1007104150058
+04150058081D007108760071081A007106A4003704E10037063A003706C9002F05A500C1
+053C00C1041F0036041F0036054A0000054F0000033C0075033100750166FFE902120075
+025D0048025E004803080020041F003602FB0026023A00A003AE00A0028B00AE028B00B2
+028B00C4027500750275007502F5007502F500750400010B0400010B040000C1040000C1
+040000C1040000C1023300D6040000D504000173040000AA023300D6040000D5040000AA
+0400017302B2006F02B2006F02750075027500750400011F0400011F031E0064028A0064
+040000C70400019A040000EE0400014C040000B6040000F00286FFFF040000EF03680075
+0154007A02FC0075038D007502F5007503F200D603F200D603F200D603F200D603F200D6
+040000C1040000D5042500AE040000EE040000B60000FCA80000FD710000FCC10000FCB4
+0000FCD90000FBEC0000FCBF0000FDA20000FCD70000FD370000FCEC0000FCF40000FCC5
+0000FDBC0000FCF00000FC5D0000FCBF0000FCBF0000FE1F0000FD900000FD900000FF79
+0000FCA80000FD710000FD240000FDC40000FE550000FEF00000FD800000FD0B0000FD0B
+0000FD240000FD0B0000FD7A0000FD770000FDA20000FCD50000FD280000FD6A0000FD23
+0000FD4C0000FDBC0000FCF00000FC630000FCC50000FCBF0000FCBF0000FCBF0000FCB4
+0000FCD90000FBEC0000FBEC0000FB8C0000FD780000FAED0000FB680000FA120000FDAC
+0000FCF10000FD210000FC630000FD2B0000FE060000FBEC0000FCA80000FD710000FCB4
+0000FD900000FCE70000FDC60000FCD50000FD1F0000FD150000FD1F0000FCB60000FCB6
+0000FCB60000FC630000FD33000000000000FD780000FCBF0000FD2B0000FD780000FF2E
+0000FC900000FC700000FC700000FC700000FC700000FD2A0000FC700000FC77053C00C9
+048B00C106E500C9052E00C9023A00A0023A00A005FC00C9053300BA040001B60465007F
+046600710465007F02B2009E04000173040000D7058A0010028B00DB05F8FFE706F8FFF3
+0344FFED0680FFF20699FFE1069BFFDB02B5000505790010057D00C9047500C905790010
+050E00C9057B005C060400C9064C0073025C00C9053F00C90579001006E700C905FC00C9
+050E00C9064C0073060400C904D300C9050E00C904E3FFFA04E3FFFC064C0073057B003D
+064C0073061D004E025C000604E3FFFC0546007104530085051200BA02B500A604A10095
+05460071051B00C004BC002004E5007104530085045A006B051200BA04E5007102B500A6
+04B700BF04BC003D051700AE0478004A0476006B04E5007104D1004A051400BA04B20071
+0512007104D1006404A1009505470070049F003B0547007006B3008702B5000504A10095
+04E5007104A1009506B30087053F00C904EA00A704F400710597005706BDFFE105970057
+0547007006B30041054F0070064C007304E500710530008B04B20071049A00C903ABFF40
+054700B3054700BF06EC0072050500770778007306B300870611007305460071065500C9
+04EB002D057E004F04DB006406240073050000360598007304E5007104E3002C044A0037
+054F0070051400BA046600710239FFDB064C007304EC007104EC00C404D700C9051400BA
+0596007306E700C90535007F0514005505A000730596007305A00073050E00C9050E00C9
+064AFFFA04E100C90596007305140087025C00C9025C0006025CFF9608C00054085C00C9
+064AFFFA05AE00C905FC00C904E00023060400C905790010057D00C9057D00C904E100C9
+06400065050E00C9089E00280521008705FC00C905FC00C905AE00C90604005406E700C9
+060400C9064C0073060400C904D300C90596007304E3FFFA04E0002306E30079057B003D
+063600C9057C00AF088E00C908C000C906A9003C070F00C9057D00C90596006F08A300D3
+058F008804E7007B04EF007004B700BA043400BA0588006B04EC00710735004604410085
+053300BA053300BA04D500BA051D004C060900BA053B00BA04E50071053B00BA051400BA
+0466007104A9003C04BC003D06D7007004BC003B057200BA04BA0096075200BA078900BA
+05A7003E065100BA04B700BA0464007106BC00C104D0007404EC007104EC00710500002F
+043400BA04640071042B006F023900C10239FFF40239FFDB0738004C073000BA0537002F
+04D500BA053300BA04BC003D053B00BA0778007306B30087062A001E0560001E078A00D3
+05FE00C10709001006440033094700C9080300C1064C007304E5006B083700C9069800C1
+051700730453005B06DA001007030032064C007304E50071064000100552003206400010
+0552003207F00073073C007107A000730611007109700076083900980778007306B30087
+05960073046600710405003B0000FBDA0000FD070000FDB30000FDB30000F9CA0358F7D6
+0358F858062E00C9056A00C1057D002104B7002604D300C9051400BA04E100C9043400BA
+0566004704B9003804FE00C9043D00BA089E002807350046052100870441008505AE00C9
+04D500BA05AE00C904D500BA05AE002104D5003D06DA003206A7002A060400C9054900C1
+081D00C9070400C108A600C9075300C107060073058B0071059600730466007104E3FFFA
+04A9003C04E3FFFC04BC003D04E3FFFC04BC003D057B003D04BC003B0779FFFA06740005
+057C00AF04BA0096057C00AF04BA0096057C00AF051200BA0787001405D3000F07870014
+05D3000F025C00C9089E002807350046053F00C904D500BF06350036055D002E060400C9
+054900C1063600C9057200C1057C00AF04BA0096071A00C9063200C1023900C105790010
+04E7007B0579001004E7007B07CB000807DB007B050E00C904EC0071064C007504EC0071
+064C007504EC0071089E0028073500460521008704410085055400A0049F005805FC00C9
+053300BA05FC00C9053300BA064C007304E50071064C007304E50071064C007304E50071
+0596006F0464007104E0002304BC003D04E0002304BC003D04E0002304BC003D057C00AF
+04BA009604E100C9043400BA070F00C9065100BA0566004704B90038057B003D04BC003B
+057B003D04BC003B057D009104B70071080C0091072D007107CC00C906F400AB056E00C9
+04B500AB0893003607A8002E08E700C907BD00C10633007305470071062FFFFA05B00005
+04EA00A40453008506040054051D004C095A005407F3004C072700C906EA00BA08410088
+07E30074064C00730514007107E90044068B005605AE00C904D500BA08A50054073E004C
+08A600C9074C00BA065800C9057600BA062100B205DB00B20607005D0607005A05DB00B2
+062D00B2051F00BC05DB00B206E000B20607005D058700BC044400BC076000BC06E80108
+05DB00B205BA0046062000A80607006406230069065500B205D2009205D50000060F00A0
+05DB00B205B400780667005A062500A8065500B205DB00B20607006405A40096058D00B2
+05F300A0044D00BC067C0078060E0032064C00730652006E02750075028B00B201E00000
+02E4000501E7FFFF033E00080400005A07CB00AE051200BA05430071054E00BA051200AE
+05140071041E00BA051200BA05E800BA05430071051200BA022C00BA07D700BA04FB0071
+051200AE051200BA04DD006A051300BA0508008C051200AE022CFFD40512FFD903FD0000
+051200BA033C000A07CB00AE047B006E053000BA051200AE051200AE07CA00AE051200BA
+0511006F037A00BA07CA00AE0517002904E0006F06710046067E00AE02B200F002E30064
+00000244000000AB000000FF000000FF00000244000001C7000001C70000016300000163
+00000000000000000000012F0000024E0000024402E3006400000163025C00D100000519
+000000C5025C00D10388006600000163055900BA04A00058034C0058045E0058053A00BA
+022E00BA02C50058053A00BA053000B901CA0088044C0058043B0058048C0058054F00BA
+056F0058022E00BA03340058053100B905020058051E00BA04FF00BA0451005804BF0058
+05AD00BA0484005805AB00580542001403C400BA0362008802A50088035300BA052800BA
+0519000005190000060E008507D00085029500DB000000FC028B00DB043F009303C300A3
+0239FFB50239006C03DDFFAB0239006C06430082023900C1078800820431008B07880082
+07880082052A009D052A009D052A009D0390007D0390007D03DDFFAB03DDFFAB09C40082
+09C4008209AC008209AC0082076600900766009004C6007504C600750258FFEC084B0082
+0635006B0698009005D0009004F4008C05E000930431008B03DDFFAB0643008206430082
+000000DC000000DC000000DC000000DC000000DC000000DC000000C8000000EC00000098
+0000014F0000014F000000DC040000F3044C01B8044C0116044C0052044C004C044C00AF
+044C0087044C0055044C003C044C003C044C0064044C008502990000028B00B2045C0057
+078800820635006B000001C90256007A0788008207880082078800820788008207880082
+078800820788008207880082052A009D052A009D052A009D052A009D052A009D052A009D
+052A009D0390007D0390007D0390007D0390007D0390007D0390007D0390007D0390007D
+0390007D03DDFFAB03DDFFAB03FCFFAB043DFFAB04E2FFAB043DFFAB03DDFFAB03DDFFAB
+03DDFFAB09C4008209C4008209C4008209AC008209AC00820766009004C60075084B0082
+084B0082084B0082084B0082084B0082084B00820635006B0635006B07290082086E0082
+072900820698009006980090069800900729008207290082072900820729008207290082
+0729008205D0009005D0009005D0009005D0009005E0009305E0009305E0009305E00093
+05E0009305960090052A009D03DDFFAB03DDFFAB03DDFFAB03DDFFAB0643008206430082
+064300820431008B044C01B8044C0116044C0052044C004C044C0052044C006A044C00D0
+044C003C044C003C044C006405170087051700E1051700E1051700E1051700E1051700E1
+051700E1051700D6051700D60517009D023900C1049200710364003D04BC003D053B00BA
+053B00BA04C00071053B00BA06A10071038100C10381003D047800BA04E500C102CD003D
+07AC00C103C8003D0644003D053B00BA0500003D05DF00C1043D00C105CB007003C8003D
+0500003D04C00071043D00C1043D00C1042E00C104C0007104C00071000000D900000042
+000001A4000000BF0000005B000000420000005B0000019A000000D5028200C8028200C8
+047B0064047B006402E3FFEC051700B0055D00820578008B0581008903DC006D0506007F
+0578008B05800073055B00BA0522008105290000053E00570545005F0500004905000049
+05F60059062200BA057E0068057E0068059D0040058000730578008B0532004F050F0073
+05A0004F068D007F051000730578008B064D00CB050F006F0000FB600450007B0450FC9A
+0000FB400000FB400000FB400000FB400000FCFE0000FCA70000FB600000FB1C054E0081
+0300007A0542007A03AEFFD30461005C03EE00BC056400930000FD120000FB7F0000FB3E
+0000FC4E0000FB1C0000FC9A051700870520006305200063055D00160500006305000063
+05A00059055D008205640096056A0069083A007F083A007F06FE007805DE006E056E006F
+06AD006E04EC0064062400500607003C0750007903A0003C04F5007806BE003C070F0078
+04FF008206D600640640003205090050074B006E04F7008204F6008206D6006406ED0064
+05CA005A050A008304F7006E0500007804F50082068B007906FD007804EC008204FC0064
+0500008205CC003C06C1003C04C400820582006F04C4003C04C0006E05E8005004100064
+0424006404A6005A068B006404100064041A00640401002906680064042400640415005A
+08840064042E0064042E0082064A00640410006404240064065E0064042E0082053C005A
+042E000A069A0064041A0064064A0064042400640424003C042E00820492005A042E0064
+0424008304290064042E008203A200140410006404240078041000640410006404240064
+046F0064069F0064046A005A0410006404920050041000640395006E0297006405790010
+057900100579001005790010062700C9062700C9062700C9062700C90627007706270077
+06AE00C906AD001006AE00C906AD001006AE00C906AD001007BC00C9080E00C907BC00C9
+080E00C9062700C907BC00C9080E007707BC00C9080E007706270077020C00C904580089
+0363005E0363005E031D0089031D008903250089031D008903BA004803150089020C00C9
+031D0089031D0089031D008908B800100745001007A000C908EF00770579001005790010
+057900100579001005D5007705D5007705D5007705D5007705D5007705D5007706AE00C9
+0579001006AE00C906AD001006AE00C906AD001007BC00C9080E007707BC00C9080E0077
+07BC00C9080E007707BC00C9080E007705D50077041100890189008905DB00B205DB00B2
+05DB00B205DB00B205D7007705D7007705D7007705D7007705D7007905D70079075E00C9
+071C00B2075E00C9071C00B2075E00C9071C00B2076C00C907340077076C00C907340077
+079400C907340079079400C907340079079400F003790089070500B2070500B206ED0077
+071F007905070046050700C9050700C9050700C9050700460507004605070046050700C9
+050700C906E100C9062A0046068500C9068700C9068500C9068700C906E100C9062A0046
+06E100C9062A0046068500C9068700C9068500C9068700C9068500F00341008903410038
+06010046063300C906010046063300C905070046050700C9050700C9050700C905070046
+0507004605070046050700C9050700C906E100C9062A0046068500C9068700C9068500C9
+068700C906E100C9062A004606E100C9062A0046068500C9068700C9068500C9068700C9
+068500F0037A0089037A008904E10077047500C9047500C9047500C904E1007704E10077
+04E10077047500C9047500C905FE00C90626007705F800C9061C00C905F800C9061C00C9
+05FE00C90626007705FE00C90626007705F800C9061C00C905F800C9061C00C905F800F0
+03160089041100890316008906D0007706D0004606D0004606D0000B06D0007706D00077
+06D0007706D0004606D00046088E00C908470077087900C906D00046087900C906D00046
+06D0004604CD0089039F008904CD008906D0007706D0004606D0004606D0004606D00077
+06D0007706D0007706D0004606D00046088E00C908470077087900C9083D0046087900C9
+083D0046088E00C908470077088E00C90847007708AA00C9083D004608AA00C9083D0046
+04CD008905D5007704D3004604D300C904D300C904D300C904D3004604D3004604D30046
+04D300C904D300C906AD00C906080046065600C9062B00C9065600C9062B00C906AD00C9
+0608004606AD00C906080046065600C9062B00C9065600C9062B00C9065600F003590089
+035D00890359008905B2004605B2004605B2004607220046072200460722004607220046
+074700C906FA0046074700C906FA0046074700C906FA0046091F00C908CC0046091F00C9
+08CC0046091F00C908CC0046091F00C908CC00460520008905040077050400C9050400C9
+050400C9050400770504007705040077050400C9050400C906C100C9063F0077068700C9
+068C00C9068700C9068C00C906C100C9063F007706C100C9063F0077068700C9068C00C9
+068700C9068C00C9068700F003590089031D008903E00089075300C90753007707530077
+075300C9075300C9075300C904D300C904D300C904D300C904D3004604D3004604D30046
+06AD00C9060800460359008905D500770579009605790096057900960579009605CF004D
+05CF004D05CF007705CF0077076400C9080E00770411008905DB00B205DB00B205DB00B2
+05DB00B205DB00B205DB00B205D7005305D7005305D7007905D70079079400C907340079
+0411008906A5004606A5007706A5007706A5004606A5004606A5007706A5007704820089
+060400C903E0008908600089086000890860008908600089086000890860008908600089
+069A008906A5004606A5007706A5004606A500770A1300890A1300890A13008908040089
+080400890A1300890A130089059900890895008906D0004606D0004606D0007706D00077
+06D0004606D0004604CD0089052500770525002105250021052500770525007705250021
+052500210359000A050700C9062900C90623007303BF008903BF0089038D007508600089
+0A7A00890D0F00890D0F00890B0000890B0000890D0F00890D0F008903D1FFEC03F1FFEC
+05B2FFEC0773FFEC0934FFEC0AF5FFEC03F1FFEC05B2FFEC0773FFEC0933FFEC0AF5FFEC
+03FCFFEC05BFFFEC0782FFEC0945FFEC0B08FFEC03F1FFEC05B2FFEC0770FFEC0932FFEC
+0AF5FFEC03FCFFEC0605FFEC064FFFEC09A3FFEC0933FFEC0577FFEC040F0071040EFFEC
+04BC003D05BD000B07DB007B04B0003E0466007104D700BA04D7002403ED00BA04530082
+023900C10328000004A200BA04AA0002060900BA053300BA04E500710466007F05790071
+0579007105790033082F007104E5007104E500710432009704D0003204D0003204A9003C
+049800BA05E500AE079500AE051A002F04BC003D068B0056043300580435007804AA00B3
+04BC003D048300970432009704B9005A051D004C0372000A04E800050375007F03E1007F
+032F007F032F005303E7004803CA007F017C007F017CFFBD034E007F02CE007F0459007F
+03C5007F03C5007F03F7004803840047030A007F0380007F0314FFFC03B0007004FB002B
+0322004D0322004D033E0047052F004D036D0075033E0047035600470356004702E20054
+02E00052033E0047016E007A0368007504FC007503450075034F004702F60047034F0047
+034F0047036D0075025C0023033D006E03C2006E04FC0075035600260337007902FB0014
+031500470353004702E90025016E007A02120075033D006E035600260337007902FB0014
+034B00790353004702E90025051400BA03CA007F02F900740556003202390091033E0047
+02F6004702F60047034F004702E20054025F001E01DDFFE9033E0047033D006E02170049
+01FF007A021600490217004901E0FF5601FF007A01E1005B0303007104FC007504FC0075
+0349FFE903D6007503450071034F0047034F004702E20046024BFFE9025C00230410005E
+0359004702E400750340007A0356002602EE0037037E003702EE003703230037034F0047
+0000FC5B0000FC5B0000FC5B0000FC5B0000FC420000FC420579001004E7007B057D00C9
+051400B8057D00C9051400BA057D00C9051400BA0596007304660071062900C905140071
+062900C905140071062900C905140071062900C905140071062900C905140071050E00C9
+04EC0071050E00C904EC0071050E00C904EC0071050E00C904EC0071050E00C904EC0071
+049A00C902D1002F0633007305140071060400C9051200B8060400C9051200BA060400C9
+0512FFED0604001105120002060400C9051200BA025C00000239FFD3025C00070239FFF4
+053F00C904A200BA053F00C904A200BA053F00C904A200BA047500C9024D00C904750003
+024DFFFD047500C90239FFF4047500C90239FFDE06E700C907CB00BA06E700C907CB00BA
+06E700C907CB00BA05FC00C9051200BA05FC00C9051200BA05FC00C9051200BA05FC00C9
+051200BA064C007304E50071064C007304E50071064C007304E50071064C007304E50071
+04D300C9051400BA04D300C9051400BA058F00C9034A00BA058F00C9034A00BA058F00C9
+034A00BA058F00C9034A005405140087042B006F05140087042B006F05140087042B006F
+05140087042B006F05140087042B006F04E3FFFA0323003704E3FFFA0323003704E3FFFA
+0323003704E3FFFA0323003705DB00B2051200AE05DB00B2051200AE05DB00B2051200AE
+05DB00B2051200AE05DB00B2051200AE0579001004BC003D0579001004BC003D07E90044
+068B005607E90044068B005607E90044068B005607E90044068B005607E90044068B0056
+057B003D04BC003B057B003D04BC003B04E3FFFC04BC003D057B005C04330058057B005C
+04330058057B005C04330058051200BA03230004068B005604BC003D04E7007B02D1002F
+02D1000202D1002F062600B204E500710579001004E7007B0579001004E7007B05790010
+04E7007B0579001004E7007B0579001004E7007B0579001004E7007B0579001004E7007B
+0579001004E7007B0579001004E7007B0579001004E7007B0579001004E7007B05790010
+04E7007B050E00C904EC0071050E00C904EC0071050E00C904EC0071050E00C904EC0071
+050E00C904EC0071050E00C904EC0071050E00C904EC0071050E00C904EC0071025C005A
+02390044025C00C9023900BF064C007304E50071064C007304E50071064C007304E50071
+064C007304E50071064C007304E50071064C007304E50071064C007304E50071074E0067
+04E50076074E006704E50076074E006704E50076074E006704E50076074E006704E50076
+05DB00B2051200AE05DB00B2051200AE06DD00AD051200B006DD00AD051200B006DD00AD
+051200B006DD00AD051200B006DD00AD051200B004E3FFFC04BC003D04E3FFFC04BC003D
+04E3FFFC04BC003D04E3FFFC04BC003D062700C903D10020054600710546007105460071
+054600710546007105460071054600710546007105790010057900100705000507050006
+062700070669000405AA000705F100040453008504530085045300850453008504530085
+0453008505B0000705B0000707BA000507CC000607300007076C0004051200BA051200BA
+051200BA051200BA051200BA051200BA051200BA051200BA06B2000706AF000708B00005
+08B600060837000708680004077800070793000402B5009B02B5009102B5FFB102B5FFBB
+02B5000502B5FFD302B5FFCB02B5FFC6030A000702FE0007051400050514000604900007
+04CC000403EA000703F1000404E5007104E5007104E5007104E5007104E5007104E50071
+066F000706C9000708C2000508CC00060782000707C3000404A1009504A1009504A10095
+04A1009504A1009504A1009504A1009504A100950645000707FB000608190004072E0004
+06B3008706B3008706B3008706B3008706B3008706B3008706B3008706B30087066B0007
+06BF000708B7000508C300060791000707C70004075F0007079E00040546007105460071
+0453008504630085051200BA053C00BA02B5FF8D02B500A604E5007104E5007104A10095
+04A1009506B3008706B30087054600710546007105460071054600710546007105460071
+054600710546007105790010057900100705000507050006062700070669000405AA0007
+05F10004051200BA051200BA051200BA051200BA051200BA051200BA051200BA051200BA
+06B2000706AF000708B0000508B600060837000708680004077800070793000406B30087
+06B3008706B3008706B3008706B3008706B3008706B3008706B30087066B000706BF0007
+08B7000508C300060791000707C70004075F0007079E0004054600710546007105460071
+05460071054600710546007105460071057900100579001005BBFFFC058A001005790010
+04000186040001B604000186040000B6040000B6051200BA051200BA053C00BA051200BA
+051200BA0670FFFC05F8FFE70772FFFC06F8FFF3060400C904000089040000B4040000B6
+02B5FFEB02B5FFE302B5FFD802B5000502B5FFE402B5FFE6025CFFF5025C000303CDFFFC
+0344FFED0400007E04000095040000B604A1009504A1009504A1009504A10095051400BA
+051400BA04A1009504A1009504E3FFFC04E3FFFC06C3FFFC0699FFE1057B0007040000AA
+040000D7040000AA06B3008706B3008706B3008706B3008706B300870787FFFC0680FFF2
+0761FFFC069BFFDB061D004E040001730400018604000000080000000400000008000000
+02A30000020000000156000005170000028B00000199000000CC00000000000000000000
+00000000000000000000000002E3006402E3006405170064040000640800006408000000
+040001040400FFEC028B00AE028B00B2028B00AE028B00B2042500AE042500AE042500AE
+042500AE040000390400003904B8013304B8013302AD00EC055700EC080000EC028B00DC
+00000000000000000000000000000000000000000000000000000000019900000ABC0071
+0DE2007101D1002802FD00280429002801D1002802FD00280429002802B6000B0333009E
+033300C106B400C303E20093043F00930400FFEC066EFFA7066EFFA70200FFAA0800003D
+040000DD0156FE89031F00B0031F00B00760004A05DD009305DD009303FA0064051700EC
+040000D8040000D80400003D02B2011D066EFFA70400003D0399009108000064066EFFA7
+06B4013804B000FA054E002806B4016606B40166028B00DB0661006406B40070028B00DB
+028B00DB01C7000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000003350057016E007A0335003F033500660335005C
+0335006C033500590335005304390089043900890439008901F7006F01F7006703300075
+03350057033500890335005E033500620335003F033500660335005C0335006C03350059
+0335005304390089043900890439008901F7006F01F700670322004D03560047034F0047
+038D007503560047033C0075036800750154007A04FC007503300075036D007502FC0075
+025C0023070400560517007305170060051700850517008107CB00BA051700220A2E00C9
+089700C907E9003B0646005F051700710517000005170028051700140A2E00D00517002E
+051700440517005D0517001006310075051700A5051700140517006A0517000A05170043
+0000FC130000FC3D0000FC3D0000FC3D0000FC130000FB500000FC3D0826004308260043
+0596007308FC00C30523FFD60826003C0889003C04EA00A40596006F079D00C307E80049
+0609000206CC00C9051200480512005A03C2003B0594006A05C30044034EFFE4068B0020
+066800C6085200360800011B0594006E059C00C8064C00730662004206830053065600C8
+072C00A9057900C9082801030898FFFC080001270579001005F5005C049F0058061D004E
+061D004E04EE001802B50044053F00C905790010064A005C05A0008206D6007D04BC0057
+04D800A2064A0054049A00C9088E003903B2006805F600670564FFFB03BA001B05280056
+030A00460768005A098D0097059E002405D20000053C00C806CA00C9067C0019063300A3
+047500080475000704E3FFFC068D005705AA005A04EC005B02CF004F02CFFF16063D003B
+0436005107C1008907C100890AF6008907C1008907C1005E07C1008907C1005E07C10062
+07C1003F07C1008907C1006607C1008907C1006207C1006607C1006C048B0089025C00C9
+03F000C9058400C9076200C9057900100761001008F500100A890010075700C9057B003D
+0777003D090D003D047500C905960073062900C906E700C9023900C103A900C1051900C1
+067E00C104BC003D067D003D07ED003D095D003D068D00C104BC003B0694003B0804003B
+023900C1046600710514007107CB00BA09F60079062900C909F6007905A000730465007F
+0596007307C1005706B4006406B401A306B4007506B401A306B4006406B401A306B40120
+06B4012006B4012006B4012006B4006406B4007506B4002C06B4001606B4006406B401A5
+06B4007506B401A506B4006406B4007506B4006406B401A506B4007506B401A506B401A5
+06B4006406B4007606B4006406B4007606B4006406B4006406B4012A06B4015A06B401AC
+06B4015A06B401AC06B401DD06B4006406B4002D06B4004F06B400DE06B4007006B400D3
+06B4009D06B4006406B4006406B4030506B401A306B4007506B4007506B4030506B401A3
+06B4006406B4007706B4006406B4006406B4007806B4007606B4007806B4006406B40064
+06B4006406B4006406B4007506B4006406B401A506B4007506B401A506B4006406B401A4
+06B4012006B400BC06B400BC06B4012006B4006406B4007506B4006406B4007506B401A3
+06B401A306B4006406B401A306B4007506B401A306B4006B06B4007506B4003706B4015E
+06B4004806B4015E06B4015E06B4015E06B4014006B4015E06B4015E06B4015E06B40075
+06B4007A06B4007A06B4015E06B4007506B4007706B4007506B4006406B4007506B40064
+06B4006406B4007506B4006406B4003706B4007506B4003705790010051700870423005F
+050E00C9050E00C906F8009B055AFFFA055AFFFA06F800AF06F800AF05BE00D906F800AF
+06F800AF05BE00D90517012C060E009C060E009C0564001906B400D906B400D906B400D9
+02B200000518018A06B4010505020144050201580519003D0519003D0519003D05B700DC
+06AA00DC06B4011B072C00AF072C00AF06B400ED040001B0040000660400011004000066
+05DB010805DB010805DB010805DB0108042B00750650007508750075042B007506500075
+08750075042B0075042B0075042B00750517007905170079021500A10517007906B400D9
+06B400D906B400D806B400D906B400D906B400D906B400A206B400D9030000D006B400D9
+06B400D906B400D906B400D906B400D906B400D906B400D906B400D906B400D906B400D9
+06B400D906B400D906B400D806B400D906B400D906B400D906B400D906B600D906B600D9
+080000CF080000CD06B400D906B400D906B400D906B400D906B400D906B400D906B400D9
+06B400D906B400D906B400D906B400D906B400D906B400D906B400D906B400D906B400D9
+06B400DA06B400DA06B400DA06B400DA086000940860009403B600B006B400D806B400D9
+06B400D906B400D906B400D906B400D906B400DA06B400D906B400D906B400D006B400D0
+06B400D006B400D006B400D906B400D906B400D906B400D906B400D906B400D906B400D9
+06B400D906B400CC06B400CC06B400CC06B400CC06B400BE06B400D906B400BE06B400D9
+06B400BE06B400BE05DB010805DB010805DB010806B400D906B400D906B400D906B400D9
+063E00D9063E00D906B400BB06B400BB06B400BB06B400BB06B400BB06B400BB06B400BB
+06B400BB06B400BB06B400BB06B400BB06B400BB06B400BB06F800AF06F800AF06F800AF
+06F800AF042A00AF042A00AF06F800AF06F800AF06F800AF06F800AF06F800AF06F800AF
+06F800AF06F800AF06B400D906B400D906B400D906B400D906B400D906B400D908000079
+0800007906B4006206B40079042A00EE05DB00C805DB00C805DB00C806B4011B06B4011B
+0690FFFA0690FFFA0690008C0690008C05020082028B00DB050200F906B400D9080000D9
+080000D9080000D9080000D9080000D906B400D905DC006305DC006306B400BE06B400D9
+06B400D206B400D206B4017C06B400D906B400D906B400D90B6100940B61009406B400D9
+06B400D906B400D906B400D906B400D906B400D906B400D906B400D906B400D906B400D9
+06B400D906B400D906B400D906B400D906B400D906B400E106B400D906B400D906B400D9
+06B400D508000396080000EC080000EC080000EC0800005806F800AF05BE00D906F800AF
+06F800AF05BE00D906F800AF06F800AF0800005806F800AF05BE00D906F800AF05BE00D9
+06F800D904D1004A04D100720514009206B401A306B401A306B401A306B401A303E8013B
+031F00B0031F00C7031F00B0031F00C7067802F406780064067802F40678006406B400D9
+041B0006080000F706B400D903C000B003C0008603C000B003C00086042B01AF042B002A
+0938009C0938009C0B50009C0938009C0B8C00780B50000106FC009602B500A6051400BA
+06B3008705460071060F001A0938009C06FC0023040000B0040000B0040000B0040000B0
+0400028D040000B0040000B0040000B0040000B0040000B00400028D040000B0060002A3
+060000A8060002A3060002A3060000A8060002A3060000A8042B01AF06B40037078F00BA
+06FC009606270006051700590514FF8305140092072C0098072C0098072C0098072C0098
+072C0098072C0098072C0098072C0098072C0098072C009804D1FFEC04D1FFEC04D10218
+04D101C804D1003C04D1003C04D1021804D101C804D1003C04D1003C04D1021804D101C8
+04D1021804D1021804D101C804D101C804D1FFEC04D1FFEC04D1FFEC04D1FFEC04D10218
+04D1021804D101C804D101C804D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1021804D10218
+04D101C804D101C804D101C804D101C804D101C804D101C804D1FFEC04D1FFEC04D1FFEC
+04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC
+04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC
+04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC
+04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC
+04D1FFEC04D1003C04D1003C04D1021804D101C804D1FFEC04D1017804D1021804D10178
+04D1017804D1FFEC04D1FFEC04D1FFEC04D1021804D1017804D1017804D1FFEC04D1FFEC
+04D1FFEC04D1021804D1017804D1017804D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC
+04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1FFEC04D1021804D1FFEC
+04D1FFEC04D1021804D1FFA704D1FFA704D1FFA704D1FFEC04D1021804D1026804D10218
+04D1FFEC04D101C804D1026804D101C804D1FFEC04D101C804D1FFEC04D101C80627FFEC
+0627FFEC0627FFEC0627FFEC0627FFEC0627FFEC0627FFEC0627FFEC0627FFEC0627FFEC
+0627FFEC0627FFEC0627FFEC0627FFEC0627FFEC0627FFEC062703130627FFEC0627FFEC
+0627FFEC0627FFEC062705710627FFEC062703130627FFEC0627FFEC0627FFEC0627FFEC
+0627FFEC062703130627FFEC0627FFEC078F00BA078F00BA078F00BA078F00BA078F00BA
+078F00BA078F00BA078F00BA078F00BA078F00BA056C00BA056C00BA078F00BA078F00BA
+046700BA046700BA06270006062700060627000606270006040400060404000606270006
+062700060404000604040006062700060627000606270006062700060404000604040006
+062700060627000604040006040400060627000606270006062700060627000606270006
+06FB007003F4000606FB007006FB007206FB007006FB007006FB007006FB007006FB0070
+06FB007006FB007006FB007006FB007004370070043700BA065400BA07C300BA07C300BA
+07C300BA0319000603190006031900060319000606FB007006FB00700627000606270006
+062700060627000604B80133078F00BA078F00BA078F00BA078F00BA078F00BA06270006
+062700060627000608F40070078F00BA078F00BA078F00BA078F00BA06FB007006FB0070
+06FB007006FB007006270006062700060627000606A400BA06A400BA05DC00BA05DC00BA
+06270006072C00AB08000068072C0064072C00AA072C0083072C0085072C0085049500AA
+072B00AA072C00AA071B007D071B007D055F007D081A007D09F7008C0A010091072C00B8
+072C00B7072C00B70442009A072C0064072C0098072C00AC072C00AC072C009F072C00AB
+072C00AC072C00AC072C00B204DF0093072C00B104DF0093072C007D072C00AC072C00AA
+072C0064055A006405F800AA053200AA064500AA045C00AA072C00AA072C00B2072C00AA
+05AF00AA072C00AB072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA
+072C00AA072C00AA072C00AA072C0087085700AA085700AA085700AA072C00AA072C02DD
+072C00AA04E900AF05DC00AF05DC00AF072C00A2072C0153072C01C0072C00F8072C0104
+072C01EC072C005D072C00B7072C00C0072C00E7072C011E072C006D072C00AB072C0045
+072C00A9072C00C0072C00B0072C0141072C00C9072C00E2072C0155072C01B6072C0151
+072C0130072C00C9072C00E2072C0155072C01B6072C014C072C0130072C0143072C00B9
+072C0158072C00E4072C0142072C00B6072C0158072C00E4072C00D803C600AC051B00AC
+072C0178072C00BC03C600B502DC00AC03DF00AD05FC00AC06200084072C00AC072C009C
+072C009C072C009C072C009C072C009C072C009C072C009C072C009C072C00AC072C00AA
+072C00AA072C00AA072C013106F4009606F4009606F4009606F4009606F4009606F40096
+072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA
+072C00AA072C0158072C0158072C006A072C00C6072C010D0454007D072C0079072C007D
+072C0129072C00C2072C0106072C0105072C0105072C00ED072C00ED072C0064059E00AA
+080900AF08B700A2096600AF073900AF06B4010D06B400CF06B4018006B4000906B4017F
+06B4017F06B401FA06B4016406B4005406B4000A06C000D206B401B105DC00AF05DC0159
+05DC00B005DC00B006CC007805DC018E05DC014406B4005606B4005606B4005606B40056
+05DC00AF06B4001606B4005606B4001606B4004906B4005606B4005606B4007806B40084
+06B401B306B4002B06B400B606B4003506B400B606B4005806B4008A06B4013306B400ED
+06B4010306B400AF06B400F106B400FC06B4007006B4007006B4007006B4007006B40152
+06B4010C06B4013E06B4007006B400BB06B4005406B4005606B4005306B4005406B40057
+06B4005706B4002F06B4005606B4003006B4002F06B4003006B4003006B4003006B40032
+06B4008406B4009806B4007006B4004006B4005406B400BB06B4005406B4005406B40054
+06B4007006B400A706B400A706B400A106B400A106B4006E06B4006E06B4005406B40056
+06B400A106B400B606B4009C06B4008206B400A106B4006106B4006106B4005406B40054
+072C0066072C007A072C007A072C007A072C007A072C00AA06B4030506B402B006B40206
+029400AE02940078044E00AE044E007806B4013E06B4019E06B4014E06B4006E06B40158
+06B4007E06B400A006B4019106B4019106B4021D06B4021D06B401B906B401DB06B40123
+06B4013906B4015506B4017706B402C406B4026C06B4016606B401A1072C0098072C0098
+072C0098072C0098072C0098072C0098072C0098072C0098072C0098072C009806B40009
+06B4000906B4000906B4000906B4000906B4000906B4000906B4000906B4000906B40009
+06B4000906B4000906B4000906B4000906B4000906B4000906B4000906B4000906B40009
+06B4000906B4007506B400FC06B4007506B400FC06B4007506B4007506B4007506B40075
+06B4007506B4007506B4007506B400E406B400E406B400E406B4007506B4007506B401EC
+06B4007506B4007506B4007506B4002B06B4002B06B4011506B4011506B4007F06B4007F
+06B4013C06B4008206B400A506B4007506B400A706B400A706B4007506B400A706B40073
+06B4009606B400A206B400A206B40075031F006E031F004F03F4000603F600B003F600AF
+031F00B7031F00A4047300B7047300A406B4005B06B4005906B4004F06B4004F09420075
+0B7800640B7800750B7800640B7800640B7800750B7800640B7800640B7800750B780064
+0B7800750B78007505DC000005DC012C05DC012C05DC012C05DC012C05DC012C05DC012C
+05DC012C05DC038405DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C
+05DC038405DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC0384
+05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC038405DC012C
+05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC038405DC012C05DC012C
+05DC012C05DC012C05DC012C05DC012C05DC012C05DC038405DC012C05DC012C05DC012C
+05DC012C05DC012C05DC012C05DC012C05DC038405DC012C05DC012C05DC012C05DC012C
+05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C
+05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C
+05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C
+05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C
+05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C
+05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C
+05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C
+05DC012C05DC012C05DC012C05DC012C05DC038405DC012C05DC012C05DC012C05DC012C
+05DC012C05DC012C05DC012C05DC038405DC012C05DC012C05DC012C05DC012C05DC012C
+05DC012C05DC012C05DC038405DC012C05DC012C05DC012C05DC012C05DC012C05DC012C
+05DC012C05DC038405DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C
+05DC038405DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC0384
+05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC038405DC012C
+05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC038405DC012C05DC012C
+05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C
+05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C
+05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C
+05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C
+05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C
+05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C
+05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C
+05DC012C05DC012C05DC012C05DC012C05DC012C05DC012C06B4006406B4007506B40100
+06B401000577004F0577004F05DF010005DF010006B400D9080000D9080000D9080000D9
+080000D9080000D9080000D9080000D903F4000606B400D906B400D90800003A0800003A
+0800003A0A9A0075042B0075042B0075042B0075042B0075042B0075042B0075042B0075
+042B0075042B0075042B0075042BFFBE042B0075042B0075042B0075042B0075042B006B
+06B4011906B400D906B400D906B400D906B400D906B400D906B400D906B400D906B400D9
+06B400D906B400D906B400D906B400D906B400D906B400D906B400D906B400D906B400D9
+06B400D906B400D906B400D906B400D906B400D906B400D906B400D906B400D906B400D9
+06B400D906B400D906B400D906B400D906B400DA06B400DA06B400D906B400D906B400D9
+06B400D906B400D906B400D906B400D906B400D906B400D906B400D906B400D906B400D9
+06B400D906B400D906B400D906B400D906B400D906B400D906B400D906B400D906B400D9
+06B400B506B4012006B400B506B4012006B4003706B4003706B4015E06B4015E06B400B5
+06B4012006B400B506B4012006B4003706B4015E06B0007506B0007506B0004806B00048
+078F00BA078F00BA078F00BA078F00BA06270006062700060627000606270006078F00BA
+06F4002406F4002406FC009606FC009606FC002208F4007006F4004D06F4004D0475000A
+0239000A0475FFD704D3000A058F00C904E700480323FFE8060400C9051200BA053F00C9
+04A200BA057B005C043300580640007306E700C9057900100640007305E0003D09060044
+07B1005604BC0068053C00C9048B00C1054700700350000004E5007103ED00620166FFE9
+0372000A05140087057B005C04BA007B04C200320484005004D0007F04B3006907490050
+05030000079D006C04C3008E04DB006807A1005004F5006D04C300500769006804C20068
+0673008E0773006804AD006804BD006607630068079F007B069F006404C4005004C20068
+04B8006804BC005004BC005604F7007A075D005004B7003C04B1006004A6004607500050
+04C4006404C2007A04BD007C052200680735007A052C0071071A0073071A007305750040
+0578004305150040047E00960579001005790010050E00C9050E00830576009606FF00DB
+057B005C03ED0096057B005C071A0073071A00730267009605040029060400C9053F003E
+04380096057B005C05280096050E00C90405006F079F006F063A006F05FC00C904F700CC
+025C00C9063A006F025C00C90604009F05100063071A0073071A0073060400C9029000C9
+05FE0096071A0073071A00730596007306240064057B003D0596007304FA00C905790010
+060400C9050E00C9064E0073048900C9064E0073041F0036043F008F06B400D9031F00B0
+031F00C7031F00B0031F00C7043F0093072C00AA072C00AA072C00AA072C00AA072C00AA
+072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA
+072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA
+072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA
+072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA
+072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA
+072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA
+072C00AA072C00AA072C00AA072C00AA072C00AA057D00C904D300C904D30046062900C9
+04E3FFFA04E3FFFA06330073053F00C9053FFFD5041800000596007305A00073057B005C
+049A00C9049A00C906E700C905FC00C9047500C905140087058F00C9058F003B05790010
+05790010060400C9063300A3041800C907E90044057B003D04E3FFFC057D009105790010
+05790010050E00C9050E0083025C00C9064C007305DB00B205DB00B20475000806230073
+026600AF0266009204C500AF04C500AF02660092026600AF04B400AF04B400AF05140072
+042B006402D400C902B500A60970007608390098083B003C0740003E08A3007306BC0070
+07D000D306BE00C1087F0065074B006B088800540735004C096D00C9081000BA064C0073
+04E5007106D8007305B300710ADD0073082600710708003A0642FFFA057A003C04E3FFFA
+04A9003C057C00AF051200BA03F200D603F200D603F200D603F200D603F200D603F200D6
+03F200D603F200D603F200D603F200D603F200D603F200D603F200D603F200D603F200D6
+02F4006602F40066020500C3020500C3020500C30315008902D9008903C6007303C60073
+060400C9051200BA0706FFFA05AD003704EA00A40453008503ED00BA042B006F09FF0010
+07E1007B09A0001007EB007B0923001007D9007B07C50010068B007B07C50010068B007B
+07AC0010068B007B05A000730465007F053F000A04AA000E057100C9032300C104A70053
+036A00780674000A05A2000A0ADD00730826007104D3000A0514FFFB05DF003206320032
+064C00730514007104D7000A0514FFFB04D7000A0514FFFB0475000B023900C105E200C9
+051200BA02B200F0030200A003350135023300C5057C00AF03E6004D062E00C9055500BA
+0633000405140004053F000404A2000405FC000405120004058F0004034A000405140004
+042B00040668FF97049D007F05270047075200BA049A007704D3004606E700C9025C00C9
+0998004401B500C201E7008D020E006E021C00600223005A01E7008D01B500C201E7008D
+020E006E021C0060020E006E01E7008D01B500C201E7008D020E006E021C0060020E006E
+01E7008D01B500C201E7008D0223005A021C0060020E006E01E7008D01B500C2023300D6
+07D0009607D0009607D0009607D0009604A4006E04A4006E04FD006E071D006E04AE006F
+04A4006E0539006E070E006E0471006E04A4006E0959006E04B6006E04B8008206F4006E
+04A4006E04B7006E074F006E04B8008205D9006E04AA003206FA006E04B7006E0729006E
+04B6006E04B6006E04B900830531007004B6006E04B7008304CA006E04B8008204210032
+04A3006E04AC007804A4006E04A4006E04A5006E051B006E07A4006E0773007A06770064
+041000640410006404100064041000640410006404100064041000640410006404100064
+04100064042400640424006404240064064B0064064B0064064B0064064B0064064B0064
+045F003C045F003C045F003C045F003C045F003C045F003C04E500710583002F050A002F
+050A002F07BC002F07BC002F057D002F06E3006F099D00AB099D00AE099100AE097D00AE
+0C3C00AE01CA00880000015602A5004A0516004E06D900AE06310058073F00BA062C0058
+06BF005806D700BA067500580701006006B400D905AB005805AB004E05AB005805AB0058
+055900BA055900BA055900BA04A00058034C0058045E0058053A00BA02D80059033F0059
+053000B902A40059044C0058043B0058048C0058056F005803320058053100B9051E00BA
+04FF00BA04BF005805AD00BA0484005805AB005805420014022E00BA04A00058043B0058
+04FF00BA050800580788008207DB0082023AFFEC026AFFEC0788008207DB0082023AFFEC
+026AFFEC0788008207DB0082023AFFEC026AFFEC0788008207DB0082023AFFEC026AFFEC
+0788008207DB0082023AFFEC026AFFEC0788008207DB0082023AFFEC026AFFEC084B0082
+0848008203D3FFEC040CFFEC084B00820848008203D3FFEC040CFFEC052A009D052A009D
+04F2FFEC052AFFEC052A009D052A009D04F2FFEC052AFFEC052A009D052A009D04F2FFEC
+052AFFEC052A009D052A009D04F2FFEC052AFFEC0390007D0433007D0390007D0433007D
+0390007D0433007D0390007D0433007D03DDFFAB046AFFAB03DDFFAB046AFFAB07290082
+0729008203CFFFEC046BFFEC072900820729008203CFFFEC046BFFEC0729008207290082
+03CFFFEC046BFFEC072900820729008203CFFFEC046BFFEC05E000930617009305E00093
+06170093023AFFEC026AFFEC05960090050E00900438FFEC03B0FFEC0698009006BE0090
+03CFFFEC046BFFEC03DDFFAB0422FFAB03DDFFAB0422FFAB03DDFFAB0422FFAB03DDFFAB
+0422FFAB0643008206AB0082023AFFEC026AFFEC023AFFEC026AFFEC0643008206AB0082
+023AFFEC026AFFEC00000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+0000FC70000000000000FD2A00000000025800080258FFEC025800080218006902580008
+025800080258FFEC025800080258FFEC025800080258FFEC0258FFF40258FFEC02580018
+0258FFEC03C300A30239FFB50270FFB50239006C0270006C03DDFFAB0422FFAB0239006C
+0270006C0643008206AB0082023AFFEC026AFFEC023900C1027000C10788008207DB0082
+023AFFEC026AFFEC0431008B044A00910788008207DB0082023AFFEC026AFFEC07880082
+07DB0082023AFFEC026AFFEC052A009D052A009D04F2FFEC052AFFEC052A009D052A009D
+04F2FFEC052AFFEC052A009D052A009D04F2FFEC052AFFEC0390007D0433007D0390007D
+0433007D03DDFFAB046AFFAB03DDFFAB046AFFAB09C400820A33008206B4FFEC0723FFEC
+09C400820A33008206B4FFEC0723FFEC09AC008209CD008206CBFFEC06F0FFEC09AC0082
+09CD008206CBFFEC06F0FFEC0766009007980090065EFFEC0690FFEC0766009007980090
+065EFFEC0690FFEC04C600750442007504C6FFEC03DCFFEC04C6007504420075042FFFEC
+03DCFFEC084B00820848008203D3FFEC040CFFEC0635006B06AC006B03D3FFEC040CFFEC
+0698009006BE009003CFFFEC046BFFEC05D00090060F00900270FFEC02A6FFEC04F4008C
+0553008C0449FFEC04A0FFEC05E0009306170093023AFFEC026AFFEC0431008B044A0091
+0438FFEC03B0FFEC03DDFFAB0422FFAB0643008206AB00820643008206AB0082023AFFEC
+026AFFEC0490FF2E04C6FF2E0490FFE504C6FFE50490001704C600170490005404C60054
+00000000000000000000000000000000000000000834001E060E006404DC00C804800064
+04CE00C8046400C8046400C803840096050000C8073A0096024400C8051900C8045F00C8
+0B6A00C8070D00C8076400C8073A0096057D00C806F200C804B0009604DA00C803880096
+05920064051800C8057D009605780096067A006404380096047600C8047600C803840064
+060E0064024400C8060E0064057D0096068B0064072C00AA072C00AA072C00AA072C00AA
+072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA
+072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA
+072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA
+072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA
+072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA
+072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA
+072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA
+072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA
+072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA
+072C00AA072C00AA05ED001005D900C9068D00E805D600C9056300C90633007303240066
+0322FF96060500C9053D00C9083300C4064C00720514008805AAFFFA06A400B105C80010
+08DD00440672006C05A8FFFC054B007B05AA00940466007105AA009404EC006F03B9002F
+05AA007105E500BA02CF00E602CFFFD7053500BA02CF00E6092200BA05E500BA04E50071
+05AA007105AA007103DF00BA042B006F03B9003705EA00B104DC003D074800560568004C
+04FF003D04B8005805790010057D00C905960073062900C9050E00C9049A00C906330073
+060400C9038C0097025CFF96053F00C9047500C906E700C905FC00C9064C007304D300C9
+064C0073058F00C90514008704E3FFFA05DB00B20579001007E90044057B003D04E3FFFC
+057B005C04E7007B051400BA046600710514007104EC007102D1002F05140071051200BA
+023900C10239FFDB04A200BA023900C107CB00BA051200BA04E50071051400BA05140071
+034A00BA042B006F03230037051200AE04BC003D068B005604BC003B04BC003D04330058
+051700880517006B051700820517009C0517005A0517009405170071051700410517008B
+0514006A05170087051700E1051700960517009C051700640517009E0517008F051700A8
+0517008B05170081023900C107880082052A009D0390007D03DDFFAB03DDFFAB052A009D
+07660090064300820698009005D0009004F4008C05E0009309C4008204C60075084B0082
+09AC00820635006B03DDFFAB09C400820788008207880082052A009D0390007D09AC0082
+0766009004C600750788008205E00093084B00820635006B0334FFEC0556FFEC04CEFFEC
+0556FFEC0334FFEC04C9FFEC036AFFEC04DFFFEC0334FFEC0718FFEC04C6FFEC03D3FFEC
+072FFFEC03D3FFEC0718FFEC0334FFEC0334FFEC0556FFEC072FFFEC042FFFEC054000C1
+076200C106A800C1076200C108CD00C1054000C1063F00C106B900C1054000C1092400C1
+073600C1064300C1093B00C1064300C1092400C1054000C1054000C1076200C1093B00C1
+08CD00C1073600C1054000C1064300C10AE900C80AE900C80AE900C80AE900C80AE900C8
+0AE900C80AE900C80AE900C80AE900C80AE900C80AE900C80AE900C80AE900C80AE900C8
+0AE900C80AE900C80AE900C80AE900C80AE900C80AE900C80AE900C80AE900C80AE900C8
+0AE900C80AE900C80AE900C80AE900C80AE900C80AE900C80AE900C80AE900C80AE900C8
+0AE900C80AE900C80AE900C80AE900C80AE900C80AE900C80AE900C80AE900C80AE900C8
+0AE900C80AE900C80AE900C80AE900C80AE900C80AE900C80AE900C80AE900C80AE900C8
+068500C8068500C8068500C8068500C8068500C8068500C8068500C8068500C8068500C8
+068500C8068500C8068500C8068500C8068500C8068500C8068500C8068500C8068500C8
+068500C8068500C8068500C8068500C8068500C8068500C8068500C8068500C8068500C8
+068500C8068500C8068500C8068500C8068500C8068500C8068500C8068500C8068500C8
+068500C8068500C8068500C8068500C8068500C8068500C8068500C8068500C8068500C8
+068500C8068500C8068500C8068500C8068500C8082F00C8082F00C8082F00C8082F00C8
+082F00C8082F00C8082F00C8082F00C8082F00C8082F00C8082F00C8082F00C8082F00C8
+082F00C8082F00C8082F00C8082F00C8082F00C8082F00C8082F00C8082F00C8082F00C8
+082F00C8082F00C8082F00C8082F00C8082F00C8084000D9082F00C8082F00C8082F00C8
+082F00C8082F00C8082F00C8082F00C8082F00C8082F00C8082F00C8082F00C8082F00C8
+082F00C8082F00C8082F00C8082F00C8082F00C8082F00C8082F00C8082F00C8082F00C8
+082F00C8082F00C8082F00C8082F00C8082F00C8082F00C8082F00C8082F00C8082F00C8
+082F00C8085800990978004B0857003D094000AA085700AA085700AA0959005F085700AA
+085700AA085700AA085700AA0857008F085700AA085700AA085700AA085700AA085700AA
+085700AA085700AA085700AA085700AA085700AA085700AA085700AA085700AA085700AA
+085700AA085700AA085700AA085700AA085700AA085700AA085700AA085700AA085700AA
+085700AA085700AA085700AA085700AA085700AA085700AA085700AA085700AA085700AA
+085700AA085700AA085700AA0959005F085700AA085700AA085700AA08570023085700AA
+085700AA0CD500AA085700AA085700AA085700AA0857003A095900600857003A0857003D
+0857003D0857003D0857003D0857003D0857003D0000FFB90000FCD70000FD730000FCB6
+0000FD0C0000FCCF0000FCCF0000FCC70000FCC70000FD9A0000FCE60000FC4E00960000
+019000000190000001900000009600000190000007DB0082023AFFEC026AFFEC08480082
+03D3FFEC040CFFEC06AC006B03D3FFEC040CFFEC023AFFEC026AFFEC01B6000007DB0082
+023AFFEC026AFFEC07DB0082023AFFEC026AFFEC052A009D04F2FFEC052AFFEC052A009D
+04F2FFEC052AFFEC052A009D04F2FFEC052AFFEC052A009D04F2FFEC052AFFEC035F0000
+05FC00D50239000F02EEFEF2057801920578019205780192057801930578019305780192
+05780192057801760578018B057801760578018B057801760578018B0578018B05780176
+057801760578018305780183057801830578018B0000FC9A012C00000418000004E2FFAB
+04E2FFAB060F00900270FFEC02A6FFEC06AB0082023AFFEC026AFFEC046AFFAB023900C1
+044A00910596007104E200710239009602CF004F02CFFF160239FFD3023900BF02B200F0
+038C009706B401AD000000C8000000C8000000C8000000C8000000C8000000C8000000DC
+000000DC023A00C1023AFFEC023AFFEC049200710492FFEC0492FFEC0364003D0364FFEC
+0364FFEC04BC003D04BCFFEC04BCFFEC053B00BA053BFFEC053BFFEC053B00BA053BFFEC
+053BFFEC04C0007104C0FFEC04C0FFEC053B00BA053BFFEC053BFFEC06A1007106A1FFEC
+06A1FFEC038100C10381FFEC0381FFEC0381003D0381FFEC0381FFEC047800BA0478FFEC
+0478FFEC04E500C104E5FFEC04E5FFEC02CD003D02CDFFEC02CDFFEC07AC00C107ACFFEC
+07ACFFEC03C8003D03C8FFEC03C8FFEC0644003D0644FFEC0644FFEC053B00BA053BFFEC
+053BFFEC0500003D0500FFEC0500FFEC05DF00C105DFFFEC05DFFFEC043D00C1043DFFEC
+043DFFEC05CB007005CBFFEC05CBFFEC03C8003D03C8FFEC03C8FFEC0500003D0500FFEC
+0500FFEC04C0007104C0FFEC04C0FFEC043D00C1043DFFEC043DFFEC043D00C1043DFFEC
+043DFFEC042E00C1042EFFEC042EFFEC04C0007104C0FFEC04C0FFEC04C0007104C0FFEC
+04C0FFEC0000FCEC072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA072C00AA
+072C00AA06B30197062E00C9056A00C1051200AE0433007D0433007D0433007D0433007D
+0433007D046AFFAB046AFFAB046AFFAB046AFFAB046AFFAB0A33008206B4FFEC0723FFEC
+0A33008206B4FFEC0723FFEC0A33008206B4FFEC0723FFEC09CD008206CBFFEC06F0FFEC
+09CD008206CBFFEC06F0FFEC07980090065EFFEC0690FFEC0442007504C6FFEC03DCFFEC
+0848008203D3FFEC040CFFEC0848008203D3FFEC040CFFEC0848008203D3FFEC040CFFEC
+06AC006B03D3FFEC040CFFEC06AC006B03D3FFEC040CFFEC086E008206F2FFEC06F2FFEC
+0729008203CFFFEC046BFFEC06BE009003CFFFEC046BFFEC06BE009003CFFFEC046BFFEC
+0729008203CFFFEC046BFFEC0729008203CFFFEC046BFFEC0729008203CFFFEC046BFFEC
+060F00900270FFEC02A6FFEC060F00900270FFEC02A6FFEC060F00900270FFEC02A6FFEC
+06170093023AFFEC026AFFEC06170093023AFFEC026AFFEC06170093023AFFEC026AFFEC
+03350135043F008F043F008F0334FFEC089000DD089000DD079F002305E400A508ED00A5
+0BF500A505E400A508ED00A50BF500A505E400A505E400A505E400A50947FFF80947FFF8
+094700C6094700C60B5000520B5000520B5000520EFE00A505E400A500A500A500A500A5
+00A500A500A500A500A5FFA300A500A500A500A50097000000><00000000000000440000
+00440000004400000044000000A800000114000001EC000003440000046C000006D40000
+072800000798000007F00000088C000008E000000918000009440000096C000009B80000
+0A3C00000AAC00000BAC00000C9400000D5000000E1000000EE800000F74000010480000
+111C0000115C000011AC0000122400001268000012E0000013B800001538000016340000
+16E40000177C000017FC0000185C000018B000001958000019B4000019FC00001A6C0000
+1B9400001BD800001CD400001D7C00001E0800001E8800001F5400002068000021600000
+21D00000225400002334000024F000002594000026580000271800002778000027C40000
+28180000285C00002888000028D800002A0400002A9C00002B3400002BCC00002CA00000
+2D3800002E0000002E7800002EC800002F44000030340000307000003134000031AC0000
+3250000032F0000033900000340000003560000035DC0000366000003784000039A80000
+3B2C00003CF800003DC400003EA000003ED000003FBC0000404000004040000040D40000
+41A0000042580000437000004494000044DC00004624000046DC00004800000048DC0000
+49A8000049E000004A0C00004B5800004BA400004C1C00004C8C00004D2C00004DE80000
+4E3800004EEC00004F4800004F7400004FD40000502C000050B400005184000051A40000
+51C4000051E4000052DC000052F40000530C000053380000536800005398000054D80000
+55B0000055C8000055E0000055F80000561C000056400000565800005670000056940000
+56B800005784000057B4000057CC000057E40000581000005844000058740000593C0000
+5A7400005A8C00005AA400005AD400005B0C00005B2400005BAC00005CD400005CF80000
+5D1C00005D3C00005D6800005DA000005DE000005F9C00005FB400005FCC00005FE40000
+60080000602C000060440000605C00006080000060A4000062540000626C000062840000
+629C000062BC000062E80000631400006370000064E4000064FC00006514000065340000
+65640000657C0000661C0000664C00006678000066A0000066CC000066EC000067040000
+671C000067340000674C0000677000006788000067A0000067B8000067DC000067F40000
+680C000068340000684400006900000069180000693C00006960000069840000699C0000
+69B4000069CC000069E400006A0800006A3400006A5800006A7C00006A9400006AAC0000
+6AD000006AE800006B0000006B1800006B4800006B8C00006C1400006CA800006CCC0000
+6CF000006D1400006D3800006D5C00006D8000006D9800006DB000006DE000006E2C0000
+6E5000006E7400006E9800006EBC00006ED400006EEC00006FDC00006FF40000702C0000
+70440000706800007080000070A4000070BC000070F00000716C000071FC000072200000
+72440000725C00007274000072A4000072D0000072E8000073800000741C000074480000
+746800007494000074B4000074CC000074E400007584000076AC000076C4000076DC0000
+76F40000770C00007730000077580000777000007788000077B0000077D4000077EC0000
+78040000782C000078540000786C00007884000078B0000078D400007958000079F40000
+7A2000007A4400007A7400007A9800007AC400007AE800007B0000007B2400007B3C0000
+7B5400007B6C00007B8400007BA800007BCC00007BF000007C1000007C3400007C4C0000
+7C6400007C7C00007CA400007CBC00007CE400007D3C00007E0800007ED000007EE00000
+7F9400008020000080C80000815800008218000082D4000082E400008378000083F40000
+849C00008574000085D00000868000008738000087B8000088700000893C00008A500000
+8B2000008B7C00008BEC00008CA800008DBC00008E1C00008F0400008FC4000090940000
+90A400009148000091600000917800009220000092CC0000936400009424000094E00000
+95B4000096FC0000970C000097A800009840000098D00000996C000099F800009A100000
+9A2800009AD400009B6000009C1C00009DEC00009EF40000A0000000A0E00000A1B00000
+A2C00000A32C0000A3A00000A4340000A4C00000A5340000A5C80000A6080000A6200000
+A6A00000A6B00000A6C80000A6E00000A6F80000A7100000A7280000A7400000A7580000
+A7700000A7880000A7A80000A7C80000A7F00000A8180000A8300000A8500000A8700000
+A8940000A8AC0000A8C40000A8DC0000A8F40000A90C0000A9240000A93C0000A9540000
+A9640000A97C0000A9940000A9AC0000A9C40000A9DC0000A9F40000AAC80000ABBC0000
+ABE80000AC000000AC180000AC5C0000AC740000AC8C0000ACA40000ACBC0000ACD40000
+ACEC0000AD140000AD2C0000AD440000AD5C0000AD740000AD8C0000AE240000AEBC0000
+AED40000AEEC0000AF040000AF1C0000AF340000AF4C0000AF640000AF7C0000AF940000
+AFAC0000AFC40000AFDC0000AFF40000B00C0000B0240000B03C0000B0540000B06C0000
+B0840000B09C0000B0B40000B0CC0000B0E40000B0FC0000B1140000B12C0000B1440000
+B15C0000B1740000B18C0000B1A40000B1BC0000B1D40000B1EC0000B2040000B21C0000
+B2A80000B33C0000B3540000B3980000B40C0000B4B00000B5BC0000B6A00000B78C0000
+B8840000B89C0000B8B40000B8CC0000B8E40000B8FC0000B9140000B92C0000B9440000
+B95C0000B9740000B98C0000B9A40000B9BC0000B9D40000BA280000BAAC0000BB140000
+BB780000BC580000BD3C0000BDAC0000BE440000BED40000BF400000BF940000C04C0000
+C0A40000C1280000C1B00000C28C0000C34C0000C35C0000C3C40000C4700000C50C0000
+C5A80000C6680000C7240000C84C0000C8D80000C9280000C9880000CAAC0000CB440000
+CBDC0000CC940000CD1C0000CDFC0000CEBC0000CF6C0000D0500000D0F40000D2140000
+D2240000D2340000D3500000D41C0000D4A40000D5880000D6400000D6DC0000D7D00000
+D8C40000D9400000D9D80000DA840000DAF80000DB080000DB5C0000DC080000DC900000
+DCE80000DE100000DEE00000DFB40000E0A40000E14C0000E1E00000E2880000E31C0000
+E3C80000E4780000E4880000E4F00000E5580000E5E40000E6580000E6E40000E7400000
+E79C0000E8B00000E9540000EA600000EAD40000EB800000EBE00000EC740000ECE80000
+ED680000EE0C0000EEC40000EF540000EFE40000F20C0000F2980000F3000000F3F00000
+F5100000F6240000F6B40000F7480000F7DC0000F8740000F9100000F99C0000F9AC0000
+FA7C0000FB3C0000FB4C0000FBDC0000FC140000FC500000FD080000FDC40000FE800000
+FF100000FFD80001009400010138000101C40001029400010328000103A00001046C0001
+04D000010540000105C400010660000106D400010764000107C4000108240001087C0001
+08F8000109640001099C000109E0000109F000010A0800010A1800010A2800010A600001
+0AC800010B3000010BB800010C4400010C6C00010C9400010CF800010D6C00010DC80001
+0E2400010E5400010E6400010E8000010EA000010ED000010EE400010F0400010F200001
+0F8C00010FDC00010FF000011004000110280001104C0001107800011094000111200001
+1188000111F4000112540001131400011380000113B8000113EC00011438000114600001
+14F8000115300001154000011574000115C0000116000001164C00011680000116940001
+16AC000116BC000116D00001179C000117F800011850000118B8000118CC000118E00001
+18F4000119080001194C000119C000011A3400011A4800011A5C00011AC400011AF00001
+1B0C00011B7C00011B9800011BE400011C0C00011C3400011C5800011C7400011C880001
+1C9C00011CC000011CE000011D0000011D7400011DC400011DE800011E0C00011E380001
+1E5400011E8400011EB400011ECC00011EE000011F4C00011F7000011F8400011F980001
+1FC000011FE40001202C00012068000120A4000120B8000120EC00012100000121140001
+21280001213C00012198000121B4000121D0000121F0000122100001225C000122800001
+22A8000122F00001232400012384000123A0000123B4000123C8000123DC000123EC0001
+240000012414000124380001246000012488000124A80001252400012598000125B00001
+25E8000126100001261000012650000126680001267C000126BC000126D0000127340001
+27480001275C0001277800012794000128080001281C0001284400012854000128640001
+2894000128C4000128F40001292400012934000129440001297800012988000129A00001
+29B8000129C800012A1800012A4800012A6000012A7000012A8C00012AA800012AC40001
+2ADC00012AF800012B1000012B2800012B3800012B4800012B8000012BEC00012BFC0001
+2C0C00012C1C00012CCC00012CDC00012CEC00012D5000012D6000012D7000012DD00001
+2DE000012DF000012E0000012E7C00012E8C00012E9C00012F5C00012F6C000130000001
+30B0000130D4000130F80001311000013128000131400001315800013170000132C00001
+335C000133DC000134C00001359000013634000136B000013778000137C8000138480001
+38CC000138DC0001396C00013A2800013A3800013AB400013B4800013BF400013C880001
+3CE800013D7400013E3400013F4000013FD4000140680001408000014098000140B00001
+40C8000140E000014120000141F000014298000143500001436C000143840001444C0001
+44FC000145A8000146600001470C000147B00001484C0001485C0001490C000149680001
+49D800014A5000014AAC00014BC400014C9C00014D3000014DBC00014E7000014F580001
+4FD000015040000150F4000151A400015238000152D000015340000153AC000154480001
+5500000155100001552000015530000155A00001560C0001561C0001562C0001563C0001
+570C000157980001581800015828000158400001585800015870000159100001599C0001
+59B400015A6000015A7000015A8000015A9000015AA000015B3800015BC800015C380001
+5C5000015C6800015C8000015CD800015CE800015D6800015D7800015DB000015E3C0001
+5E4C00015F4000015FF8000160A4000160E400016178000161D8000161E8000161F80001
+62080001625000016260000162700001628000016304000163B8000163C8000164200001
+647C000164D800016544000165C4000165DC00016650000166FC000167BC000168580001
+686800016930000169CC00016A0400016A8C00016A9C00016B8C00016C5000016CC00001
+6D0000016D9000016DF000016E7800016ED000016EE000016F2800016F3800016F480001
+6F8C00016F9C0001708400017094000170EC00017168000171C400017230000172AC0001
+72C400017334000173D80001747C0001750C00017524000175C400017668000176800001
+7724000177340001774400017754000177640001780000017894000179240001793C0001
+79540001796C000179C400017A9C00017AAC00017B4C00017BE000017C7000017CE00001
+7D2400017D6400017DC000017E1800017F0000017FE400018060000180D8000181C40001
+82A000018304000183680001837800018388000183D4000184240001843C000184540001
+84F80001857C000186740001876000018780000187A0000187B8000187D00001886C0001
+890400018950000189E800018A1C00018A4400018A6C00018AAC00018BF000018CAC0001
+8CC400018CDC00018D7800018E1800018E7800018F0000018F4000018F8400018FE40001
+9044000190D000019160000191C4000192240001923C0001925400019298000192DC0001
+932800019370000193BC00019408000194A800019548000195B800019624000196880001
+96E800019780000198180001990C000199E800019A0000019A1800019A7400019ACC0001
+9ADC00019B7800019BC000019C0400019C4C00019C9400019D0400019D7400019DE80001
+9E7400019EC400019F1000019F7000019F800001A05C0001A1580001A1F40001A28C0001
+A29C0001A2B40001A2CC0001A3280001A38C0001A3D80001A4240001A49C0001A5140001
+A5500001A58C0001A6040001A6940001A6E00001A72C0001A73C0001A7680001A7880001
+A7B80001A7F00001A8000001A8100001A8340001A8580001A8680001A8780001A8900001
+A8A80001A8C00001A8D80001A8F00001A9080001A9180001A9280001A9400001A9580001
+A9700001A9880001A9B80001A9E40001A9F40001AA040001AA1C0001AA340001AA4C0001
+AA640001AA7C0001AA940001AAAC0001AAC40001AADC0001AAF40001AB0C0001AB240001
+AB700001ABBC0001ABD40001ABEC0001AC780001AD040001AD640001ADC40001AE140001
+AE640001AEDC0001AF580001B0280001B0F40001B1D40001B2B80001B36C0001B4280001
+B4CC0001B56C0001B57C0001B6100001B6A00001B7280001B7AC0001B8340001B8440001
+B8540001B8D40001B9540001B9B80001BA200001BA800001BAF80001BB640001BBFC0001
+BC0C0001BC1C0001BC2C0001BC3C0001BC900001BCDC0001BD880001BE380001BEE00001
+BF8C0001BFBC0001BFEC0001C0640001C0BC0001C12C0001C1800001C1D80001C2500001
+C27C0001C2CC0001C3700001C3DC0001C4280001C44C0001C4AC0001C5600001C5AC0001
+C6080001C6C80001C7180001C7980001C7EC0001C8880001C8DC0001C9640001C9B00001
+CA200001CA7C0001CB280001CB800001CB900001CBE40001CC900001CCDC0001CD940001
+CDBC0001CE3C0001CEC40001CED40001CF740001CFAC0001CFD00001CFEC0001D0340001
+D0480001D0C00001D0E00001D15C0001D1A80001D2240001D26C0001D2C00001D3480001
+D3740001D3B80001D4600001D4D40001D5180001D5380001D5B40001D6400001D6840001
+D6940001D7580001D7A00001D8500001D89C0001D8C80001D9140001D99C0001D9AC0001
+DA3C0001DAB80001DB740001DBE00001DBF00001DC3C0001DCB00001DCF80001DD080001
+DD280001DDA00001DE240001DE340001DEDC0001DF280001DF4C0001DF740001DFB40001
+DFE40001E0380001E09C0001E0C40001E0EC0001E16C0001E1980001E1D40001E1FC0001
+E20C0001E26C0001E2980001E2C40001E2E00001E30C0001E3440001E3700001E3980001
+E3E00001E4300001E46C0001E5540001E5D00001E6700001E6C00001E73C0001E7780001
+E7F00001E8600001E9200001E9600001E9D40001EA5C0001EAC00001EB340001EC100001
+EC500001ECB40001ED640001EDFC0001EEA80001EF700001F0080001F0CC0001F1580001
+F1D80001F2F00001F3980001F3B00001F3C80001F3E00001F4100001F4580001F4F80001
+F5A80001F5E80001F6340001F6540001F6B00001F6E00001F7500001F7C00001F7D80001
+F7F00001F8080001F8200001F8380001F8540001F86C0001F8840001F89C0001F8B40001
+F8CC0001F9340001F94C0001F9A00001F9B80001F9FC0001FA140001FAD40001FAEC0001
+FBB00001FBC80001FC340001FC4C0001FCCC0001FCE40001FCFC0001FD140001FD2C0001
+FDE80001FE480001FED40001FEEC0001FF540001FFD40002008000020098000200C40002
+01640002018C000201A80002023400020250000202CC00020310000203580002036C0002
+03800002040C000204340002045000020480000204D800020554000205D8000206400002
+0688000206D800020728000207A0000207D400020814000208380002086C000208D00002
+09800002099C000209F000020A0800020A2000020A3800020A5800020A7000020A880002
+0AA000020AB800020AD000020AE800020B0000020B1800020B3000020B4800020B600002
+0B7800020B9000020BA800020BC800020BE000020BF800020C1000020C2800020C400002
+0C5800020C7000020C8800020CA000020CB800020CD800020CF000020D0800020D200002
+0D4000020D5800020D7800020D9000020DA800020DC000020DD800020E9400020EAC0002
+0ECC00020EE400020EFC00020F1400020F2C00020F4400020FD800021070000210880002
+10A0000210B8000210D0000210E800021100000211180002113000021148000211600002
+117800021190000211A8000211C0000211E0000212400002125800021278000212900002
+13500002137000021388000213A0000213B8000213D0000213E0000213F8000214100002
+142000021430000214400002145000021460000214E000021560000215C4000215D40002
+15E4000215F400021678000216D00002171C00021764000217B0000217F4000218340002
+1884000218E00002197C000219AC00021A2800021A8000021AA800021AEC00021B340002
+1BE400021C4000021CD000021D2400021D7800021DF000021E7000021ECC00021F680002
+1FC0000220400002208C000220F800022194000221EC00022278000222BC000223280002
+23A8000223F000022440000224A40002255C000225E40002261000022658000226800002
+26DC0002274800022790000227F80002282000022860000228A4000228E4000229280002
+2984000229B000022A5000022B1400022BE400022C8C00022D3400022DE800022EC40002
+2F900002301C000230E0000231A4000232640002330C000233A800023444000235140002
+35C4000236880002374C000237C00002388C0002394C00023A2C00023AD400023B9C0002
+3C5800023D1400023DF400023E7C00023E9800023F2800023FA400023FBC000240200002
+4090000241080002418C000241D400024250000242B40002432C000243C80002445C0002
+4474000244F80002459C00024610000246C4000246EC00024774000248100002485C0002
+4870000248BC00024920000249A000024A1800024AA400024B2800024BCC00024C8C0002
+4CFC00024E0000024E6C00024F5400025064000250CC0002511800025168000251DC0002
+522400025278000252DC0002534000025368000253CC0002543C000254B0000255040002
+558C000255D40002562400025680000256CC00025724000257A80002582C0002586C0002
+58B0000258F00002595400025994000259FC00025A6800025AC000025B3000025B780002
+5BC000025C1000025C4C00025CBC00025CFC00025D4C00025DE800025E3000025E940002
+5F1000025F9C00025FEC00026058000260D00002613C00026180000261E0000262800002
+62E800026344000263AC0002640800026464000264E4000265300002659C000266040002
+66B00002670800026784000267E000026860000268BC0002692C00026978000269F40002
+6A6C00026AB800026B3000026BA400026C1800026C7800026CDC00026D5400026DD40002
+6E4C00026EB800026F1400026F9000026FF0000270200002706C000270D8000270F00002
+710000027118000271840002719C000271B4000271CC0002723C000272540002726C0002
+72840002729C000272B4000272CC000272E4000272FC000273140002732C000273440002
+735C000273740002738C000273A4000273BC000273D4000273EC00027418000274380002
+745800027494000274D00002750C0002755000027584000275CC000275E4000276000002
+762C00027650000276680002768000027698000276B0000276C0000276D8000276E80002
+7700000277640002777C00027794000277AC000278100002782800027840000278580002
+787000027888000278A0000278B8000278D0000278E80002790000027918000279300002
+7948000279600002797800027990000279F400027A2400027A3400027A4C00027AB80002
+7AD000027B3800027B5000027B6800027B8000027BE800027C0000027C1800027C300002
+7C4800027C6000027C7800027C9000027CA800027CC000027CD800027CF000027D080002
+7D2000027D3800027D5000027D6800027DC400027DDC00027DF400027E0C00027E240002
+7EA000027EB800027F3400027F4C00027FCC00027FE400027FFC0002807C000280940002
+80AC000280C4000280DC000280F40002810C000281240002813C000281540002816C0002
+81840002819C000281B4000281CC000281E4000281FC00028274000282C8000282E00002
+82F800028310000283280002837C00028394000283EC000284040002845C000284740002
+848C000284E4000284FC000285140002852C000285440002855C000285740002858C0002
+85A4000285BC000285D4000285EC000286040002861C000286340002864C000286640002
+86BC000286F40002872C000287440002877C00028794000287CC000287E4000287FC0002
+880C000288240002883C000288540002886C000288840002889C000288B4000288CC0002
+88E4000288FC000289140002892C000289440002895C000289740002898C000289C80002
+8A2800028A4800028AC400028ADC00028B5C00028B7400028BEC00028C0400028C1C0002
+8C9400028CAC00028CC400028CDC00028CF400028D0C00028D2400028D3C00028D540002
+8DA400028DE400028E3800028E8C00028EA400028EF800028F1000028F6400028F7C0002
+8F9400028FE8000290000002901800029030000290480002906000029078000290900002
+90A8000290C0000290D8000290F000029108000291200002913800029150000291880002
+91C4000292180002923000029288000292A0000292F40002930C000293240002937C0002
+9394000293AC000293C4000293DC000293F40002940C000294240002943C000294540002
+946C000294840002949C000294B4000294CC000294E4000294FC0002954C000295D00002
+96040002965C000296B4000296CC0002974800029760000297E0000297F8000298100002
+982800029840000298580002987000029888000298A0000298B8000298D0000298E80002
+9900000299180002993000029948000299BC00029A1400029A2C00029A8800029AA00002
+9AFC00029B1400029B2C00029B8800029BA000029BB800029BD000029BE800029C000002
+9C1800029C3000029C4800029C6000029C7800029C9000029CA800029CC000029CD80002
+9CF000029D0800029D6800029D7800029DB400029E2000029E8C00029EF000029F080002
+9F6C00029F8400029FEC0002A0040002A06C0002A0D40002A0EC0002A1500002A1680002
+A1800002A1EC0002A2280002A2DC0002A2F40002A3A80002A3C00002A4780002A4900002
+A5440002A55C0002A5740002A58C0002A5F80002A6740002A6F00002A76C0002A7E80002
+A8000002A8180002A8940002A8AC0002A92C0002A9440002A95C0002A9740002A9EC0002
+AA500002AAB80002AAD00002AB340002AB4C0002ABB00002ABC80002AC280002AC380002
+AC480002AC600002AC780002AC900002ACA80002ACC00002ACD80002ACF00002AD080002
+AD880002AE080002AE8C0002AF140002AF2C0002AF440002AF5C0002AF740002AF8C0002
+AFA40002AFBC0002B0300002B0DC0002B15C0002B1740002B1F00002B2080002B2880002
+B2A00002B2E40002B3200002B35C0002B3740002B3B00002B3C80002B4040002B41C0002
+B4580002B4DC0002B4EC0002B55C0002B58C0002B5EC0002B6240002B63C0002B6540002
+B66C0002B6840002B69C0002B6B40002B6CC0002B6E40002B7000002B7280002B7580002
+B7940002B7D80002B8280002B8500002B8800002B8BC0002B9000002B9500002B9840002
+B9D00002BA340002BAB00002BB440002BB740002BBB80002BC100002BC7C0002BCFC0002
+BD440002BD9C0002BDD40002BE6C0002BF440002BF6C0002BFA00002BFD40002C00C0002
+C05C0002C1380002C1A40002C1B40002C1FC0002C2540002C2840002C3140002C3380002
+C3740002C3840002C3BC0002C3CC0002C3DC0002C3EC0002C3FC0002C4540002C4AC0002
+C53C0002C5F80002C6300002C6680002C6AC0002C71C0002C78C0002C79C0002C7D80002
+C81C0002C8780002C8EC0002C8FC0002C90C0002C91C0002C96C0002C98C0002C99C0002
+C9C40002C9D40002CA300002CA400002CA740002CAC00002CB3C0002CB8C0002CBBC0002
+CBEC0002CC5C0002CC8C0002CCA80002CCD80002CD0C0002CD2C0002CD640002CD940002
+CDC40002CE240002CEE00002CF2C0002CF980002CFC00002D0040002D03C0002D0BC0002
+D1440002D1AC0002D2840002D2E80002D3500002D3C40002D46C0002D5000002D5900002
+D6240002D6480002D67C0002D7180002D7AC0002D8300002D8980002D8D40002D90C0002
+D9700002D9B00002D9FC0002DA480002DAC40002DAEC0002DB4C0002DB840002DC0C0002
+DC880002DCE00002DCF40002DD080002DD1C0002DD300002DD440002DD580002DDB40002
+DDC80002DDDC0002DE5C0002DE6C0002DEAC0002DF380002DF740002DFDC0002E03C0002
+E0C00002E1500002E1E00002E2240002E2680002E2F00002E33C0002E3740002E3A40002
+E3D00002E40C0002E4640002E4980002E4D80002E4F80002E5900002E60C0002E66C0002
+E6D00002E7000002E7700002E8000002E8A80002E8F80002E9500002E9B80002EA300002
+EA740002EAD80002EB000002EB300002EB7C0002EBD80002EC440002ECB00002ECD00002
+ECF40002ED180002ED380002ED640002ED940002EDAC0002EDC40002EDDC0002EDF40002
+EE0C0002EE240002EE3C0002EE540002EE6C0002EE840002EE9C0002EEB40002EECC0002
+EEE40002EEFC0002EF140002EF2C0002EF440002EF5C0002EF740002EF8C0002EFA40002
+EFBC0002EFD40002EFEC0002F0040002F01C0002F0340002F0540002F0740002F08C0002
+F0A40002F0BC0002F0D40002F0EC0002F1040002F11C0002F1340002F14C0002F1640002
+F17C0002F1940002F1AC0002F1C40002F1DC0002F1F40002F20C0002F2240002F23C0002
+F2540002F26C0002F2840002F29C0002F2B40002F2CC0002F2E40002F3040002F31C0002
+F3340002F34C0002F3640002F37C0002F3940002F3AC0002F3C40002F3DC0002F3F40002
+F40C0002F4240002F43C0002F4540002F46C0002F4840002F49C0002F4B40002F4CC0002
+F4E40002F4FC0002F5140002F5340002F54C0002F5640002F57C0002F5940002F5AC0002
+F5C40002F5DC0002F5F40002F60C0002F6240002F63C0002F6540002F66C0002F6840002
+F69C0002F6B40002F6CC0002F6E40002F6FC0002F7140002F7340002F7540002F76C0002
+F7840002F79C0002F7B40002F7CC0002F7E40002F7FC0002F8140002F82C0002F8440002
+F85C0002F8740002F88C0002F8A40002F8BC0002F8D40002F8EC0002F9040002F91C0002
+F9340002F94C0002F9640002F97C0002F9940002F9AC0002F9C40002F9DC0002F9F40002
+FA0C0002FA240002FA3C0002FA540002FA6C0002FA840002FA9C0002FAB40002FACC0002
+FAE40002FAFC0002FB140002FB2C0002FB440002FB5C0002FB740002FB8C0002FBA40002
+FBBC0002FBD40002FBEC0002FC040002FC1C0002FC340002FC4C0002FC640002FCB40002
+FCFC0002FD940002FDA40002FDBC0002FDD40002FDEC0002FE040002FE1C0002FE340002
+FE4C0002FE640002FE7C0002FE940002FEAC0002FEC40002FEDC0002FEF40002FF0C0002
+FF240002FF3C0002FF540002FF6C0002FF840002FF9C0002FFB40002FFCC0002FFE40002
+FFFC000300140003002C000300440003005C000300740003008C000300A4000300BC0003
+00D4000300EC000301040003011C000301340003014C0003016C000301840003019C0003
+01B4000301CC000301E4000301FC000302140003022C000302440003025C000302740003
+028C000302A4000302BC000302D4000302EC00030304000303240003033C000303540003
+036C000303840003039C000303B4000303CC000303E4000303FC000304140003042C0003
+04440003045C000304740003048C000304A4000304BC000304D4000304EC000305040003
+051C000305340003054C000305640003057C00030594000305AC000305C4000305DC0003
+05F40003060C00030624000306500003068C000306A4000306BC000306D4000306EC0003
+07040003071C000307340003074C000307640003077C00030798000307B0000307CC0003
+07E800030800000308180003083000030848000308600003087800030890000308A80003
+08C4000308E0000308FC00030914000309300003094C000309640003097C000309940003
+09AC000309C4000309DC000309F400030A0C00030A2800030A4400030A6000030A780003
+0A9400030AB000030ACC00030AE800030B0000030B1800030B3000030B4800030B600003
+0B7800030B9000030BA800030BC400030BE000030BFC00030C1400030C3000030C4C0003
+0C6800030C8400030C9C00030CB400030CCC00030CE400030CFC00030D1400030D2C0003
+0D4400030D6000030D7800030D9400030DB000030DC800030DE000030DF800030E100003
+0E2800030E4000030E5800030E7000030E8C00030EA400030EC000030EDC00030EF40003
+0F0C00030F2400030F3C00030F5400030F6C00030F8400030F9C00030FB400030FD00003
+0FEC00031004000310200003103C00031058000310740003108C0003109C000310B40003
+10C4000310DC000310EC00031104000311140003112C0003113C00031154000311640003
+117C0003118C000311A4000311BC000311D4000311EC000312040003121C000312340003
+124C000312640003127C00031294000312AC000312C4000312DC000312F40003130C0003
+13240003133C000313540003136C000313840003139C000313B4000313CC000313E40003
+13FC000314140003142C000314440003145C000314740003148C000314A4000314BC0003
+14D4000314EC000315040003151C000315340003154C000315640003157C000315940003
+15AC000315C4000315DC000315F40003160C000316240003163C000316540003166C0003
+16840003169C000316B4000316CC000316E4000316FC0003170C00031724000317340003
+1744000317B4000317C4000317DC000317F40003180C000318240003183C000318540003
+1870000318800003189C000318AC000318C4000318E0000318F800031910000319280003
+194000031958000319680003198000031998000319B0000319C8000319E4000319F40003
+1A1000031A2800031A4000031A5800031A7000031A8800031A9800031AB000031AC80003
+1AE000031AF800031B1000031B2800031B4400031B5400031B7000031B8800031B980003
+1BA800031BC000031BD800031BF000031C0800031C2000031C3C00031C4C00031C680003
+1C7800031C9000031CA000031D0C00031D0C00031D0C00031D0C00031D0C00031D0C0003
+1D0C00031D0C00031D0C00031D0C00031D0C00031D0C00031D0C00031D0C00031D0C0003
+1D0C00031D0C00031D3800031D4800031D7400031DA000031DCC00031DF400031E0C0003
+1E2400031E6000031E9C00031ED400031EF800031F5400031FB00003200C000320400003
+20980003211C0003215C00032178000321A0000321E0000322340003224C0003224C0003
+224C0003224C0003224C0003224C0003224C0003224C0003224C000323D8000324E80003
+250800032520000325400003255C0003257400032594000325B8000326280003269C0003
+26CC000326E80003276400032778000327D8000328380003286400032888000328A40003
+28EC0003291C0003294C000329640003297C0003299800032A0400032A3C00032A6C0003
+2A9C00032AB000032AE000032AF800032B1400032B3800032B9800032BAC00032C000003
+2C3400032C5C00032C9C00032CE800032D0C00032D4800032DAC00032DDC00032E180003
+2E1800032E1800032E1800032E1800032E1800032E1800032E1800032E1800032E180003
+2E1800032E1800032E1800032E6C00032EB000032FBC00033020000330B0000330D80003
+31880003321400033248000332640003328C000332C40003330000033374000333880003
+339C000333B0000333C4000333D8000333EC0003340000033414000334280003343C0003
+345000033464000334780003348C000334A0000334B4000334C8000334DC000334F00003
+3504000335180003352C0003354000033554000335680003357C00033590000335A40003
+3618000336C80003375800033798000338000003388400033908000339EC00033ABC0003
+3B6800033BCC00033BE400033D9800033DE000033E3800033FC400034060000340F80003
+418C000341F800034298000343280003435C000343DC00034440000344A0000344C40003
+44E40003450C000345340003456C000345B0000345E8000346A800034780000347F80003
+481000034938000349D400034A6C00034A7C00034A9000034AA800034BE800034CD80003
+4D2800034D8400034DE400034E9000034F24000350040003508400035100000351440003
+53EC0003549400035548000355B800035658000357700003586C0003591C00035A340003
+5ADC00035B7C00035BDC00035C6800035CBC00035CFC00035D6800035D7800035D880003
+5E7C00035EB000035EC000035ED000035FC80003608C0003611400036190000362580003
+633800036364000364A8000364FC000365A000036630000366BC000367340003677C0003
+67F000036874000369080003697C000369AC000369F000036A4400036AB400036AEC0003
+6B2400036B5000036BD400036C8400036D2400036D5C00036DC400036E5C00036EAC0003
+6ECC00036EEC00036F1400036F3400036F5400036F7400036F9400036FB400036FD40003
+6FF40003701400037034000370540003707400037094000370AC000370BC000370D40003
+70F40003710C0003711C00037134000371540003717C00037194000371A4000371BC0003
+71DC000371EC000371FC0003720C0003721C0003722C00037244000372640003727C0003
+728C000372A4000372C4000372EC00037304000373140003732C0003734C0003735C0003
+736C0003737C0003738C000374100003758C0003766C0003767C0003768C000376F80003
+7718000377C80003787800037928000379D800037AF800037C1C00037C4C00037C7C0003
+7CAC00037CDC00037D2800037D7400037E1C00037EC400037F1000037F5C00037FA80003
+7FF40003803C00038088000380C400038100000381C40003820000038254000382D40003
+836000038424000384E8000385FC0003865C000386A4000386DC000387140003874C0003
+8784000387BC000387F400038878000388F800038934000389A000038A4800038AF00003
+8B6000038BD000038BF800038C2000038C9400038D0400038D2800038D4C00038D680003
+8D8400038DA000038DE800038E3000038E7800038EC000038EDC00038EF800038F600003
+8FE00003904800039088000390C80003910800039148000391A400039200000392400003
+9280000392C0000393000003934000039380000393DC0003943800039490000394E80003
+953000039578000395C4000396100003964C00039688000396CC00039710000397500003
+9790000397F400039848000398A80003990800039974000399F400039A4800039A8C0003
+9AD000039B2C00039C0800039C2400039C8400039CC800039D1000039D6C00039DC40003
+9E2000039E9000039EC400039EF800039F4800039F840003A0580003A0F00003A1240003
+A18C0003A24C0003A2B00003A2E00003A3440003A3E80003A43C0003A4A00003A5440003
+A5980003A5C00003A6040003A6480003A6E00003A70C0003A7480003A7DC0003A7EC0003
+A8000003A84C0003A8600003A8700003A8D00003A8E80003A9000003A9980003AA500003
+AA700003AA940003AB400003ABEC0003AC080003AC740003AC9C0003AD600003AD8C0003
+ADB40003ADF40003AE340003AE840003AE9C0003AEBC0003AF880003B0C00003B2680003
+B3080003B3D00003B4980003B4BC0003B4E00003B4FC0003B5280003B5400003B5740003
+B5A40003B5C40003B6240003B6840003B7000003B7480003B7A80003B8080003B8740003
+B8DC0003B95C0003B9D00003BA640003BAF40003BBE80003BC880003BD380003BE200003
+BE940003BEEC0003BFA80003C01C0003C0340003C0540003C0740003C0940003C0B80003
+C0D80003C1340003C1A00003C1E80003C22C0003C26C0003C2B80003C2FC0003C3DC0003
+C4600003C4EC0003C5780003C5D00003C6300003C69C0003C72C0003C7B80003C8000003
+C8400003C8A80003C90C0003C9540003C9980003CA200003CA8C0003CAE00003CB340003
+CBA00003CC0C0003CC8C0003CD040003CDB80003CE6C0003CEB00003CEF80003CF840003
+D00C0003D0480003D0800003D0D40003D1240003D1B40003D2400003D2B00003D3200003
+D3640003D3A80003D4140003D4800003D4D40003D5240003D5A00003D6200003D68C0003
+D6F80003D7580003D7700003D7D00003D8100003D8540003D8880003D8BC0003D8E40003
+D9080003D9D40003DA880003DB580003DC140003DCC80003DDB00003DE940003DF540003
+E0080003E0580003E0940003E0F80003E1300003E16C0003E1900003E1B80003E1DC0003
+E2000003E2300003E2600003E2900003E2D00003E30C0003E3500003E3AC0003E4000003
+E46C0003E4F00003E5780003E5A80003E5D40003E60C0003E6440003E6B00003E71C0003
+E76C0003E7B00003E7D40003E8080003E8400003E8740003E8C80003E8F80003E9240003
+E9500003E9B40003EA140003EA480003EA740003EAA80003EB140003EB580003EB980003
+EBD80003EC040003EC340003EC980003ECD00003ED080003ED8C0003EE100003EE880003
+EF000003EF5C0003EFC00003EFF80003F02C0003F0940003F0F40003F14C0003F1A00003
+F1D80003F2100003F2640003F2B80003F34C0003F3E00003F4480003F4B00003F4FC0003
+F5480003F5C00003F6380003F6C00003F7480003F7A00003F7F80003F86C0003F8DC0003
+F9000003F9200003F9440003F9680003F9DC0003FA440003FA9C0003FAB40003FB280003
+FB880003FBFC0003FC680003FCDC0003FD440003FDA00003FE140003FE780003FEAC0003
+FF240003FF500003FF880003FFB80003FFE40003FFFC0004001C00040074000400940004
+00B4000400D4000400F40004011C000401440004016C00040194000401B4000402080004
+0304000403280004034C0004036C0004038C000403AC000404040004045C000404A80004
+04E00004054C000405AC00040A6400040AD000040B4400040B5400040B6400040B740004
+0B8400040BB400040C0000040C4400040C7C00040C9800040CD000040D0800040D240004
+0D5C00040D7C00040D9800040DBC00040DE000040DFC00040E1C00040E5000040EA80004
+0EE000040EFC00040F3400040F8C00040FC000040FDC000410300004105C000411040004
+111400041180000411F40004121C0004138C0004159000041820000419B000041BBC0004
+1E2000041F9800042294000424FC0004276800042784000427A0000427BC000427D80004
+280C000428440004287C000428B8000428F00004293000042978000429C4000429E80004
+2A0C00042A3000042A5400042A7800042A9C00042AC000042AE400042B0400042B280004
+2B4C00042B7000042B9000042BB000042BD000042BF400042C1C00042C4400042C700004
+2C9C00042CC400042CF400042D2000042D4800042D7000042D9800042DC400042DF00004
+2E1800042E4800042E7400042E9C00042EC400042EF000042F1C00042F4400042F6C0004
+2F9800042FC400042FEC000430100004303C0004306800043090000430B8000430E40004
+311000043138000431680004319C000431D000043204000432380004326C000432A00004
+32D8000433100004334800043380000433B4000433E80004341C00043450000434840004
+34A8000434D4000435000004352C000435540004357C000435A8000435D4000436080004
+36340004366000043694000436C0000436EC000437200004374C00043778000437AC0004
+37DC000438100004385400043884000438B8000438F80004392C0004395C0004399C0004
+39D000043A0000043A4000043A8800043ACC00043B2800043B5800043B8800043BB80004
+3BE800043C0800043C2400043C6400043C8000043C9C00043CB800043CD400043CF00004
+3D0C00043D2800043D4400043D6800043D9000043DB400043DDC00043DF000043E0C0004
+3E2800043E4400043E6000043E7C00043E9800043EB400043ED000043EEC00043F080004
+3F2400043F4000043F5C00043F7800043F9400043FA80004405C00044370000444180004
+442C000444400004445C0004447800044494000444B8000444E000044504000445280004
+45440004456C00044590000445AC000445D80004462C000446440004469C000446FC0004
+4838000448C00004494800044B0800044B2400044B5000044B6C00044B9800044BB40004
+4BE000044C0000044C3400044C5000044C7800044C9400044CBC00044CD800044D040004
+4D2000044D4C00044D6800044D9400044DB000044DDC00044DF800044E2400044E400004
+4E6C00044E8800044EB400044ED000044EFC00044F1C00044F5000044F94000450240004
+5078000450E0000451D80004528C00045348000453AC000454040004545C000454B80004
+55140004557C000455CC000455F40004561C00045658000456D000045724000457780004
+57A4000457D0000457FC0004582C00045870000458B4000458D0000458EC000459040004
+591C0004596400045990000459BC000459E400045A0C00045A4800045A8C00045AB80004
+5AE000045B4C00045B8C00045BCC00045C0C00045C4C00045CCC00045D4C00045DCC0004
+5E4C00045E7400045E9C00045EC400045EF000045F0C00045F3800045F5400045F7C0004
+606C000460D80004619000046A7400046D5800046D9000046DF400046E4400046EA80004
+6F3C00047008000470D400047138000471DC000474600004774000047778000477F00004
+7864000478BC00047A1C00047BC800047C1000047C4400047D3800047E0C00047EA40004
+7F3C00048000000480C80004818C00048250000485D80004865400048778000489180004
+8C8000048D0000048D8800048DFC00048E6000048EE400048F74000490BC000491EC0004
+92880004931C000493D0000493F000049410000494300004945000049470000494900004
+94B0000494D00004964400049720000497FC000498A8000499C400049A5800049AE80004
+9BA000049C1800049C9000049D0400049D5C00049DB800049E4C00049EF800049F600004
+9FD40004A06C0004A0D00004A1900004A2700004A3400004A3B40004A4580004A4B40004
+A5500004A63C0004A6BC0004A7E40004AA100004AAAC0004ABC80004AD100004AE240004
+AFB80004B0B00004B1300004B1F80004B2E00004B3740004B3E80004B48C0004B4D40004
+B5740004B63C0004B6900004B6C00004B7E40004B8D00004B9100004B96C0004B9D00004
+BA300004BA840004BAD00004BB640004BC240004BD0C0004BF180004C00C0004C1300004
+C26C0004C36C0004C4900004C5C40004C6B40004C7880004C8940004C9CC0004CB240004
+CC280004CCC40004CD340004CDE80004CEDC0004D0140004D1900004D3500004D3EC0004
+D4AC0004D5140004D5A00004D5BC0004D5E40004D5FC0004D6140004D62C0004D6440004
+D6C40004D7140004D7980004D8900004D93C0004DA600004DB1C0004DBA40004DC480004
+DD500004DF380004E1FC0004E3BC0004E4000004E4400004E4C40004E5100004E5F00004
+E6D80004E7C00004E8500004E9300004EA440004EB200004EBFC0004EC700004ECB80004
+ED300004EE340004EF800004F0C40004F1000004F1840004F1DC0004F2380004F2900004
+F3000004F3680004F3D00004F4380004F4E00004F5C00004F6D40004F8440004F8DC0004
+FA6C0004FBD00004FD5C0005011C000502A800050420000504AC0005055C000508140005
+09B400050ACC00050BB800050CCC00050DB400050E3C00050EA000050F0800050F4C0005
+0F8C0005105800051150000511D0000512040005124000051284000512B4000513140005
+13940005147800051510000515CC0005174C000518D000051C3000051C9000051D400005
+1DA800051E3400051EC400051F8400052010000520900005210C0005217C000521D00005
+22380005229C000522F4000523B8000523FC00052454000524A400052514000525D00005
+277C0005297000052A9C00052CCC00052E2C000530A4000535F800053730000539800005
+3A4400053B0C00053BE000053D6400053EE400054044000541A4000542F00005445C0005
+44C8000545340005459C000546040005466800054684000546A0000546BC000546FC0005
+4748000547600005477800054854000548EC000549A800054A1800054A8C00054BAC0005
+4C9400054D0000054D7000054DAC00054DE800054E1000054E3C00054E6400054E900005
+4EB800054EE400054F1000054F3C00054FA000055004000550800005512C0005526C0005
+52F40005540C000555A00005561400055860000559EC00055B6000055C3400055D380005
+5E5000055F2C0005602C00056144000562100005633C0005645400056584000566040005
+66B40005677C00056808000568B800056980000569F800056AD000056B9800056C5C0005
+6C8C00056CB800056CE400056D1000056D4000056DCC00056DF400056E1C00056E700005
+6EC400056EEC00056F1C00056F4C00056F6C00056FBC0005700C00057038000570680005
+70B0000570F80005714C0005719C000571E80005723800057290000572E8000573540005
+73F80005745000057498000574F00005757C000575FC0005768800057758000577E80005
+791000057A3C00057AC800057B2800057B8800057BC400057BF800057C2C00057C540005
+7C7C00057C9400057CAC00057D0400057D5800057E1C00057EDC00057FD8000580880005
+81380005825800058298000582D80005833400058370000583AC000583F8000584440005
+84C8000584C8000584DC000584F00005850C000585200005853C000585580005857C0005
+8590000585AC000585C8000585EC000586080005862C000586500005867C000586900005
+86AC000586C8000586EC000587080005872C000587500005877C00058798000587BC0005
+87E00005880C000588300005885C00058888000588BC000588D0000588EC000589080005
+892C000589480005896C00058990000589BC000589D8000589FC00058A2000058A4C0005
+8A7000058A9C00058AC800058AFC00058B1800058B3C00058B6000058B8C00058BB00005
+8BDC00058C0800058C3C00058C6000058C8C00058CB800058CEC00058D1800058D4C0005
+8D8000058DBC00058DD000058DEC00058E0800058E2C00058E4800058E6C00058E900005
+8EBC00058ED800058EFC00058F2000058F4C00058F7000058F9C00058FC800058FFC0005
+90180005903C000590600005908C000590B0000590DC000591080005913C000591600005
+918C000591B8000591EC000592180005924C00059280000592BC000592D8000592FC0005
+93200005934C000593700005939C000593C8000593FC000594200005944C000594780005
+94AC000594D80005950C000595400005957C000595A0000595CC000595F80005962C0005
+96580005968C000596C0000596FC000597280005975C00059790000597CC000598000005
+983C00059878000598BC000598D0000598EC000599080005992C000599480005996C0005
+9990000599BC000599D8000599FC00059A2000059A4C00059A7000059A9C00059AC80005
+9AFC00059B1800059B3C00059B6000059B8C00059BB000059BDC00059C0800059C3C0005
+9C6000059C8C00059CB800059CEC00059D1800059D4C00059D8000059DBC00059DD80005
+9DFC00059E2000059E4C00059E7000059E9C00059EC800059EFC00059F2000059F4C0005
+9F7800059FAC00059FD80005A00C0005A0400005A07C0005A0A00005A0CC0005A0F80005
+A12C0005A1580005A18C0005A1C00005A1FC0005A2280005A25C0005A2900005A2CC0005
+A3000005A33C0005A3780005A3BC0005A3D80005A3FC0005A4200005A44C0005A4700005
+A49C0005A4C80005A4FC0005A5200005A54C0005A5780005A5AC0005A5D80005A60C0005
+A6400005A67C0005A6A00005A6CC0005A6F80005A72C0005A7580005A78C0005A7C00005
+A7FC0005A8280005A85C0005A8900005A8CC0005A9000005A93C0005A9780005A9BC0005
+A9E00005AA0C0005AA380005AA6C0005AA980005AACC0005AB000005AB3C0005AB680005
+AB9C0005ABD00005AC0C0005AC400005AC7C0005ACB80005ACFC0005AD280005AD5C0005
+AD900005ADCC0005AE000005AE3C0005AE780005AEBC0005AEF00005AF2C0005AF680005
+AFAC0005AFE80005B02C0005B0700005B0BC0005B1080005B1540005B19C0005B1E00005
+B2AC0005B3740005B4580005B5380005B5840005B5C00005B5FC0005B6300005B6640005
+B68C0005B6C00005B6F40005B7140005B75C0005B7B40005B8740005B9480005BA2C0005
+BA540005BABC0005BB380005BBA40005BC500005BCF00005BD640005BDF40005BE880005
+BF2C0005BFB00005C0480005C0C40005C14C0005C1D00005C2300005C2900005C2A00005
+C2B80005C2D80005C3140005C34C0005C3640005C37C0005C3940005C3AC0005C3C40005
+C3DC0005C4AC0005C5780005C5C80005C6180005C6DC0005C7980005C7FC0005C8580005
+C8DC0005C95C0005C9EC0005CA7C0005CAD80005CB3C0005CBA40005CC080005CC440005
+CC800005CC980005CCB00005CCF40005CD3C0005CD840005CDD40005CE4C0005CEC80005
+CF5C0005CFF40005D0780005D0C00005D1040005D1680005D1C80005D21C0005D2700005
+D2E80005D35C0005D43C0005D51C0005D5EC0005D6BC0005D7080005D7500005D7980005
+D7E00005D8280005D8700005D8CC0005D8F40005D91C0005D9440005D9700005D99C0005
+D9C80005D9F40005DA2C0005DA640005DA980005DAD00005DB080005DB3C0005DB680005
+DB940005DBC00005DBE80005DC180005DC480005DC780005DCA80005DD540005DD780005
+DDB40005DDF80005DE200005DE4C0005DE880005DEAC0005DEE80005DF300005DF700005
+DFE00005E03C0005E1780005E2280005E2840005E2940005E2E40005E3240005E3640005
+E3980005E3CC0005E4640005E4B40005E4EC0005E54C0005E5980005E6080005E6680005
+E6C80005E6F00005E7180005E7980005E7E40005E8600005E8940005E8A80005E8D40005
+E9800005E9D80005EA400005EAB40005EB280005EBC40005EC0C0005EC740005ECF00005
+ED6C0005EDA80005EE0C0005EE880005EF140005EF740005EFD40005F0140005F0840005
+F0F00005F1380005F1A40005F2100005F2B40005F3140005F3540005F3980005F3EC0005
+F43C0005F49C0005F4FC0005F5640005F5D80005F61C0005F6900005F6F00005F74C0005
+F7A80005F7F80005F8440005F8D00005F9440005FA0C0005FAF00005FB980005FC400005
+FCF80005FD500005FD600005FD700005FD800005FD900005FE7C0005FF000005FF900005
+FFF0000600800006015000060258000602BC00060324000603840006044C000604B80006
+05240006058000060590000605E4000606AC0006076800060778000607B8000607C80006
+0848000608A40006094400060A1000060AB800060B9C00060BFC00060C5400060CDC0006
+0DA800060E8C00060F9000060FE400060FF400061130000611B0000611C0000612040006
+1270000613340006138800061474000614B4000615300006154800061568000615880006
+15A8000615C8000615D8000615F000061608000616200006163800061650000616680006
+168000061698000616B0000616C8000616E0000616F80006171000061728000617400006
+17580006177000061788000617A0000617B8000617D0000617E800061800000618180006
+183000061848000618600006187800061890000618A8000618C0000618D8000618F00006
+1908000619200006193800061950000619680006198000061998000619B0000619C80006
+19E0000619F800061A1000061A2800061A4000061A5800061A7000061A8800061AA00006
+1AB800061AD000061AE800061B0000061B1800061B3000061B4800061B6000061B780006
+1B9000061BA800061BC000061BD800061BE800061BF800061C4000061C5000061C600006
+1C8400061C9400061CA400061CDC00061CEC00061CFC00061D0C00061D1C00061D2C0006
+1D3C00061D4C00061D5C00061D6C00061D7C00061D8C00061DF000061E0000061E100006
+1E2000061E3000061E6C00061E7C00061E8C00061E9C00061F0C00061F1C00061F2C0006
+1F3C00061F6C00061F7C00061F8C00061F9C000620080006201800062088000620A40006
+20C8000620E0000620F80006212C0006215800062184000621AC000621BC000621CC0006
+21DC000621EC000622C80006237800062390000623A80006242000062488000624D80006
+2560000625C00006261C0006265C0006269C000626E00006272000062738000627500006
+27C400062838000628580006287800062A0000062A6000062AC400062AFC00062B3C0006
+2BB400062BC400062BEC00062C1400062C3C00062C6400062C8C00062CB400062CDC0006
+2D0400062D2C00062D5000062D7000062D9400062DB800062DDC00062DFC00062E280006
+2E5400062E8000062EAC00062EC000062F0400062F4800062F7800062FA800062FEC0006
+3044000630C80006315800063168000631F8000632240006323400063298000633740006
+33FC000634AC000635080006359C000635E400063660000636BC0006374C000637B00006
+38480006385800063868000638B0000638F8000639240006394C0006397C000639A80006
+3A3000063AB400063B6C00063C1000063C6C00063CD800063D5000063DE800063E740006
+3EDC00063F3800063FA000063FF80006406400064084000640A4000640FC000641500006
+416000064188000641E40006423800064248000642A8000642E400064330000643C00006
+4474000644D4000645300006459C0006460C000646A0000646F800064790000648240006
+486C000648B800064950000649600006498C000649D400064A1000064A2C00064A780006
+4AA400064AC400064AE800064B0C00064B3000064B5000064B6400064B7800064B8C0006
+4BA000064BC400064BD800064BEC00064C0000064C1400064C3800064C4C00064C600006
+4C7400064C8800064CAC00064CC000064CD400064CE800064D0400064D2C00064FD80006
+528800065534000657E400065838000658A000065914000659BC00065A1800065A880006
+5B0C00065B8C00065BE000065C4400065CF400065D6000065DC000065E3400065E980006
+5EF000065F7C00065FCC0006604C000660B400066164000661C400066258000662C00006
+63340006639C0006641C00066470000664E40006655C000665B000066628000666980006
+671000066788000667EC0006685C000668E00006697400066A0000066AD000066B240006
+6B8400066BF400066C4C00066CB000066D1400066D7400066DD800066E4800066EB80006
+6F1000066F6800066FCC00067044000670C400067154000671CC00067254000672CC0006
+7350000673E000067458000674E000067564000675D8000676880006772C000677AC0006
+788C0006794C000679CC00067AC400067B9000067C3800067CD400067D8400067E4C0006
+7E6400067E9800067EB000067EFC00067F6800067F9000067FE000068034000680600006
+80A8000680E4000681440006816C000681840006819C000681BC000681DC000681F40006
+820C000682240006823C000682540006826C00068284000682A0000682B8000682D00006
+82EC000683040006831C000683340006834C000683640006837C00068394000683AC0006
+83C4000683DC000683F40006840C000684240006843C000684540006846C000684840006
+8508000685200006853800068550000685680006858000068598000685B0000685C80006
+85E0000685F8000686100006862800068640000686580006867000068688000686A00006
+86B8000686D0000686E80006870000068718000687300006874800068760000687780006
+8790000687A8000687C0000687D8000687F0000688080006882000068838000688500006
+88680006888000068898000688B0000688C8000688E0000688F800068910000689280006
+8940000689580006897000068988000689A0000689B8000689D0000689E800068A000006
+8A1800068A3000068A4800068A6000068A7800068A9000068AA800068AB800068B640006
+8B7400068B8400068B9C00068BB400068BCC00068BE400068BFC00068C1400068C2C0006
+8C4400068C5C00068C7400068C8C00068CA400068CB400068D2C00068D4400068D5C0006
+8D7400068D8C00068D9C00068E4000068E5000068E6000068E7800068E9000068EA80006
+8EC000068ED800068EF000068F0800068F2000068F3800068F5000068F6800068F800006
+8F9800068FB000068FC800068FE000069010000690500006906000069070000690880006
+90A0000690A0000690A0000690A0000690A0000690A0000690A0000690A0000690A00006
+90A0000690A0000690A0000690A0000690A0000690A0000690A0000690A0000690C80006
+90F0000691380006918000069194000691AC000691C0000691F4000692080006921C0006
+92340006924800069260000692740006928C000692A0000692B8000692CC000692E40006
+92F40006930C000693240006933C000693540006936C000693840006939C000693B40006
+93CC000693E4000693FC0006941400069424000694580006947000069488000694A00006
+94B8000694D0000694E80006950000069518000695300006954800069560000695780006
+9590000695A8000695C0000695D8000695F00006960800069618000696AC000697140006
+9798000697B0000697C8000697E0000697F8000698080006986C000698840006989C0006
+98AC0006990000069918000699300006994000069A1400069AA400069B4400069B5C0006
+9B7400069B8C00069BA400069BB400069C9000069D1C00069DC000069DD800069DF00006
+9E0800069E2000069E3000069EB400069F2000069FA400069FBC00069FD400069FEC0006
+A0040006A0140006A09C0006A0F40006A1840006A19C0006A1B40006A1CC0006A1E40006
+A1FC0006A2140006A22C0006A2440006A25C0006A2740006A28C0006A2A40006A2B40006
+A3800006A3EC0006A4740006A4840006A4F80006A52C0006A5700006A5800006A6200006
+A6900006A7200006A7380006A7500006A7680006A7800006A7900006A8080006A8C40006
+A9540006A9640006A9F80006AA080006AAAC0006AAC40006AADC0006AAF40006AB0C0006
+AB240006AB3C0006AB540006AB6C0006AB840006AB9C0006ABF00006AC580006AC580006
+AC580006AC580006AC580006AC580006ACE40006AD200006AD980006ADC40006AE140006
+AE540006AE840006AEB00006AEEC0006AF880006AFA40006AFDC0006B0040006B0440006
+B0740006B0D00006B1600006B1A80006B1E00006B2480006B2A00006B2D80006B3040006
+B32C0006B3700006B3EC0006B4240006B4A40006B4E80006B5300006B5540006B59C0006
+B5AC0006B5D80006B5E80006B61C0006B6540006B6700006B68C0006B6A80006B6C40006
+B6E00006B7080006B7300006B75C0006B7840006B7AC0006B7D80006B8000006B8280006
+B8500006B8780006B8A00006B8CC0006B8F40006B91C0006B9480006B9700006B9980006
+B9C00006B9E80006BA100006BA3C0006BA640006BA8C0006BAB80006BAE00006BB080006
+BB300006BB580006BB800006BBAC0006BBD40006BBFC0006BC280006BC500006BC780006
+BCA00006BCC80006BCF00006BD1C0006BD440006BD6C0006BD980006BDC00006BDE80006
+BE100006BE380006BE600006BE8C0006BEB40006BEDC0006BF080006BF300006BF580006
+BF800006BFA80006BFD00006BFFC0006C0240006C04C0006C0780006C0A00006C0C80006
+C0F00006C1180006C1400006C16C0006C1940006C1BC0006C1E80006C2100006C2380006
+C2600006C2880006C2B00006C2DC0006C3040006C32C0006C3580006C3800006C3A80006
+C3D00006C41C0006C4AC0006C5180006C5580006C5940006C6200006C65C0006C6A80006
+C6EC0006C71C0006C7780006C8140006C8B00006C8E80006C95C0006C9980006CA000006
+CA540006CA9C0006CB400006CBDC0006CC540006CCF00006CD680006CDD00006CE980006
+CF0C0006CF440006CFA00006CFE40006D0300006D0EC0006D1600006D1EC0006D2880006
+D3240006D3700006D43C0006D4980006D50C0006D5480006D5A80006D5FC0006D64C0006
+D6900006D6A00006D6B00006D6C00006D6D00006D6E00006D6F00006D7000006D7100006
+D7200006D7300006D7400006D7500006D7600006D7700006D7800006D7900006D7A00006
+D7B00006D7C00006D7D00006D7E00006D7F00006D8000006D8100006D8200006D8300006
+D8400006D8500006D8600006D8700006D8800006D8900006D8A00006D8B00006D8C00006
+D8D00006D8E00006D8F00006D9000006D9100006D9200006D9300006D9400006D9500006
+D9600006D9700006D9800006D9900006D9A00006D9B00006D9C00006D9D00006DA3C0006
+DA7C0006DB0C0006DBA00006DBEC0006DC5C0006DCE80006DD240006DE000006DE8C0006
+DE9C0006DEAC0006DEBC0006DECC0006DEDC0006DEEC0006DEFC0006DF0C0006DF1C0006
+DF2C0006DF3C0006DF4C0006DF5C0006DF6C0006DF7C0006DF8C0006DF9C0006DFAC0006
+DFBC0006DFCC0006DFDC0006DFEC0006DFFC0006E00C0006E01C0006E02C0006E03C0006
+E04C0006E05C0006E06C0006E07C0006E08C0006E09C0006E0AC0006E0BC0006E0CC0006
+E0DC0006E0EC0006E0FC0006E10C0006E11C0006E1340006E14C0006E2080006E2700006
+E2880006E2F40006E3280006E3A00006E3B80006E4480006E4580006E4700006E4FC0006
+E50C0006E5240006E53C0006E5540006E56C0006E5840006E5940006E5AC0006E5C40006
+E6980006E7180006E79C0006E7B40006E83C0006E8CC0006E8E40006E9900006EA040006
+EA1C0006EAC40006EADC0006EAF40006EB0C0006EB240006EB3C0006EB540006EB6C0006
+EB840006EBD00006EC840006ECB00006ECE80006ED640006EE200006EF1C0006F0580006
+F1D40006F3880006F4040006F4C00006F5C00006F6FC0006F8780006FA340006FC280006
+FCE40006FDE00006FF1C0007009800070248000704440007067800070774000708B00007
+0A3000070BEC00070DE80007102400071298000713CC0007154000071700000718FC0007
+1B3800071DB400072068000721E00007239C0007259C000727D800072A5400072D100007
+3004000731C4000733CC000736140007389C00073B6000073E6800074198000741C40007
+41FC0007427800074334000744300007456C000746E80007489C00074918000749D40007
+4AD400074C1000074D8C00074F480007513C000751F8000752F400075430000755AC0007
+57680007596400075B9800075C9400075DD000075F500007610C00076308000765440007
+67B8000768EC00076A6000076C1C00076E1800077054000772C000077574000776EC0007
+78A800077A9800077CD400077F500007820C00078500000786C4000788CC00078B140007
+8D980007905C0007934C0007967C000796D800079794000798700007996C00079A2C0007
+9B1800079C3000079CDC00079E1000079F240007A0140007A0C80007A1A00007A2800007
+A33C0007A3F40007A4CC0007A5C40007A6800007A7680007A87C0007A9240007AA540007
+AB640007AC500007AD000007ADD40007AEB00007AF680007AFF80007B0A80007B1780007
+B2080007B2C80007B3B00007B4300007B5380007B6200007B6E40007B76C0007B8180007
+B8CC0007B9580007B9D40007BAAC0007BBA40007BCBC0007BD940007BE9C0007BFCC0007
+C0940007C1E40007C3140007C4200007C4F00007C5E40007C6E00007C7B40007C8580007
+CA600007CD480007CF700007D1900007D2900007D3900007D5280007D6080007D6E80007
+D7EC0007D8C00007D9FC0007DB080007DBE00007DCC00007DDCC0007DEAC0007DFD40007
+E0A80007E1500007E2080007E29C0007E35C0007E4500007E5080007E5C00007E6B80007
+E78C0007E8A00007E9780007EA500007EB280007EBF80007ECC40007EDC40007EEF40007
+EFF40007F1280007F2380007F30C0007F3F00007F4D00007F5D00007F7CC0007F8B80007
+F9CC0007FAA00007FBEC0007FCB00007FD940007FE9400080060000801A0000803200008
+044000080514000805BC0008069C000808E400080B6800080DD800080FE0000812180008
+1458000816A80008186800081A2800081A4C00081B1800081BB400081C8400081D2C0008
+1DC800081E7400081EA800081F4800081FA800081FE400082010000820280008204C0008
+207C000820AC000820D0000821080008218400082194000821A400082264000823000008
+23A0000824680008247800082488000824A0000824B80008250800082528000825480008
+25680008258000082598000825B0000825C8000825E0000825F800082610000826280008
+2640000826580008267000082688000826A8000826C8000826E800082708000827980008
+27F80008284800082864000828800008289C000828B8000828D4000828F00008290C0008
+292800082944000829600008297C00082998000829B4000829D0000829EC00082A080008
+2A2400082A4000082A5C00082A7800082A9000082AAC00082AE400082AFC00082B500008
+2B6800082B8000082B9800082BB000082BD000082BF000082C0800082C6C00082C7C0008
+2C8C00082C9C00082CB400082CE000082D3800082D5000082D6800082D8C00082DE40008
+2E0000082E1800082E3000082E4800082E6000082E7800082E9000082EA800082EC00008
+2EF800082F3800082F7000083000000830A0000831300008319800083208000832700008
+32A0000832D0000832FC0008334C000833A4000833F00008343C00083488000834D00008
+357800083628000836CC0008372800083780000837D80008387000083914000839B00008
+3A0C00083A7000083ACC00083B2800083B8C00083BE800083C6800083CEC00083D700008
+3DFC00083E9400083F2000083F8400083FF000084054000840F8000841A4000842480008
+42AC000843180008437C000844080008449C000845280008457C000845D80008462C0008
+46A4000847240008479C00084844000848F40008499C00084A0000084A6C00084AD00008
+4B6800084C0C00084CA400084CF400084D4C00084D9C00084E1000084E8800084EFC0008
+4F80000850080008508C000850DC0008513400085184000851DC0008523C000852940008
+530000085374000853E0000854A40008557000085634000856BC00085748000857D00008
+57E4000858080008582C000858500008587400085898000858BC000858E0000859040008
+5970000859AC000859E800085A5400085A6C00085A8400085AA400085ABC00085AD40008
+5AEC00085B0400085B2400085B3C00085B5400085B7400085B9400085BB400085BCC0008
+5BE400085BFC00085C1C00085C3C00085C5C00085C7400085C8C00085CA400085CBC0008
+5CD400085CEC00085D0400085D1C00085D3400085D4C00085D6400085D7C00085D940008
+5DAC00085DC400085DE400085E0400085E2400085E3C00085E5400085E6C00085E840008
+5E9C00085EB400085ECC00085EE400085EFC00085FA8000860180008609C000860B40008
+60CC000860E4000860FC000861140008612C000861440008615C000861740008618C0008
+61A4000861BC000861D4000861EC000862040008621C000862340008624C000862640008
+627C00086294000862AC000862C4000862DC000862F40008630C00086324000863440008
+636400086384000863A4000863C4000863E4000863FC000864140008642C000864BC0008
+65B4000865C8000865FC000866240008664C00086688000866D8000866F0000867100008
+67E00008691C00086AC400086B6800086C3800086D0800086D3800086D6800086DB40008
+6E0000086EC400086F9C00087088000870B00008711C000871A000087214000872C80008
+7370000873E80008748000087524000875D400087658000876F800087780000878100008
+789C000878FC0008795C0001000018610354002B0068000C000200100099000800000415
+021600080004B8028040FFFBFE03FA1403F92503F83203F79603F60E03F5FE03F4FE03F3
+2503F20E03F19603F02503EF8A4105EFFE03EE9603ED9603ECFA03EBFA03EAFE03E93A03
+E84203E7FE03E63203E5E45305E59603E48A4105E45303E3E22F05E3FA03E22F03E1FE03
+E0FE03DF3203DE1403DD9603DCFE03DB1203DA7D03D9BB03D8FE03D68A4105D67D03D5D4
+4705D57D03D44703D3D21B05D3FE03D21B03D1FE03D0FE03CFFE03CEFE03CD9603CCCB1E
+05CCFE03CB1E03CA3203C9FE03C6851105C61C03C51603C4FE03C3FE03C2FE03C1FE03C0
+FE03BFFE03BEFE03BDFE03BCFE03BBFE03BA1103B9862505B9FE03B8B7BB05B8FE03B7B6
+5D05B7BB03B78004B6B52505B65D40FF03B64004B52503B4FE03B39603B2FE03B1FE03B0
+FE03AFFE03AE6403AD0E03ACAB2505AC6403ABAA1205AB2503AA1203A98A4105A9FA03A8
+FE03A7FE03A6FE03A51203A4FE03A3A20E05A33203A20E03A16403A08A4105A096039FFE
+039E9D0C059EFE039D0C039C9B19059C64039B9A10059B19039A1003990A0398FE039796
+0D0597FE03960D03958A410595960394930E05942803930E0392FA039190BB0591FE0390
+8F5D0590BB039080048F8E25058F5D038F40048E25038DFE038C8B2E058CFE038B2E038A
+8625058A410389880B05891403880B03878625058764038685110586250385110384FE03
+8382110583FE0382110381FE0380FE037FFE0340FF7E7D7D057EFE037D7D037C64037B54
+15057B25037AFE0379FE03780E03770C03760A0375FE0374FA0373FA0372FA0371FA0370
+FE036FFE036EFE036C21036BFE036A1142056A530369FE03687D036711420566FE0365FE
+0364FE0363FE0362FE03613A0360FA035E0C035DFE035BFE035AFE0359580A0559FA0358
+0A035716190557320356FE035554150555420354150353011005531803521403514A1305
+51FE03500B034FFE034E4D10054EFE034D10034CFE034B4A13054BFE034A4910054A1303
+491D0D05491003480D0347FE0346960345960344FE0343022D0543FA0342BB03414B0340
+FE033FFE033E3D12053E14033D3C0F053D12033C3B0D053C40FF0F033B0D033AFE0339FE
+033837140538FA033736100537140336350B05361003350B03341E03330D0332310B0532
+FE03310B03302F0B05300D032F0B032E2D09052E10032D09032C32032B2A25052B64032A
+2912052A25032912032827250528410327250326250B05260F03250B0324FE0323FE0322
+0F03210110052112032064031FFA031E1D0D051E64031D0D031C1142051CFE031BFA031A
+42031911420519FE031864031716190517FE031601100516190315FE0314FE0313FE0312
+11420512FE0311022D05114203107D030F64030EFE030D0C16050DFE030C0110050C1603
+0BFE030A100309FE0308022D0508FE030714030664030401100504FE03401503022D0503
+FE0302011005022D0301100300FE0301B80164858D012B2B2B2B2B2B2B2B2B2B2B2B2B2B
+2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
+2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
+2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
+2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
+2B2B2B2B2B2B2B002B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
+2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
+2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
+2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
+2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B1D00>]def
+/CharStrings 5 dict dup begin
+/.notdef 0 def
+/space 3 def
+/a 68 def
+/s 86 def
+/M 48 def
+end readonly def
+
+systemdict/resourcestatus known
+ {42 /FontType resourcestatus
+   {pop pop false}{true}ifelse}
+ {true}ifelse
+{/TrueDict where{pop}{(%%[ Error: no TrueType rasterizer ]%%)= flush}ifelse
+/FontType 3 def
+ /TrueState 271 string def
+ TrueDict begin sfnts save
+ 72 0 matrix defaultmatrix dtransform dup
+ mul exch dup mul add sqrt cvi 0 72 matrix
+ defaultmatrix dtransform dup mul exch dup
+ mul add sqrt cvi 3 -1 roll restore
+ TrueState initer end
+ /BuildGlyph{exch begin
+  CharStrings dup 2 index known
+    {exch}{exch pop /.notdef}ifelse
+  get dup xcheck
+    {currentdict systemdict begin begin exec end end}
+    {TrueDict begin /bander load cvlit exch TrueState render end}
+    ifelse
+ end}bind def
+ /BuildChar{
+  1 index /Encoding get exch get
+  1 index /BuildGlyph get exec
+ }bind def
+}if
+
+FontName currentdict end definefont pop
+%!PS-TrueTypeFont-1.0-1.0
+%%Title: STIXGeneral-Italic
+%%Copyright: Copyright (c) 2001-2010 by the STI Pub Companies, consisting of the American Chemical Society, the American Institute of Physics, the American Mathematical Society, the American Physical Society, Elsevier, Inc., and The Institute of Electrical and Electronic Engineers, Inc. Portions copyright (c) 1998-2003 by MicroPress, Inc. Portions copyright (c) 1990 by Elsevier, Inc. All rights reserved.
+%%Creator: Converted from TrueType to type 42 by PPR
+15 dict begin
+/FontName /STIXGeneral-Italic def
+/PaintType 0 def
+/FontMatrix[1 0 0 1 0 0]def
+/FontBBox[-970 -305 1429 1023]def
+/FontType 42 def
+/Encoding StandardEncoding def
+/FontInfo 10 dict dup begin
+/FamilyName (STIXGeneral) def
+/FullName (STIXGeneral-Italic) def
+/Notice (Copyright (c) 2001-2010 by the STI Pub Companies, consisting of the American Chemical Society, the American Institute of Physics, the American Mathematical Society, the American Physical Society, Elsevier, Inc., and The Institute of Electrical and Electronic Engineers, Inc. Portions copyright (c) 1998-2003 by MicroPress, Inc. Portions copyright (c) 1990 by Elsevier, Inc. All rights reserved. STIX Fonts(TM) is a trademark of The Institute of Electrical and Electronics Engineers, Inc.) def
+/Weight (Italic) def
+/Version (Version 1.0.0) def
+/ItalicAngle -17.43909 def
+/isFixedPitch false def
+/UnderlinePosition -75 def
+/UnderlineThickness 50 def
+end readonly def
+/sfnts[<000100000006004000020020676C79668E0E8F5C0000006C0002228468656164
+F159E6C6000222F00000003668686561060A06A20002232800000024686D74780116464A
+0002234C000010A06C6F6361047A369C000233EC000010A46D6178700472008900024490
+0000002000020027FFF50130029B000B00170000372736373E0133321514070603140623
+2226353436333216891131160A1F1C2C2738402117161C2115171DB105E38E4034332853
+78FEB4151F1E18151F2000000002009001A501B0029A000A00150000012336373E013332
+161514052336373E013332161514015A170D09041F130D14FEF7170D09041F140D1301A5
+9E2D1416100C1EBB9E2D1416100C2000000200020000021C02A4001B001F000001072307
+33072307233723072337233733372337333733073337330F01230733021C0B68365E0B68
+4F3E50824F3E50600B6A36610B6A503D5082503D505182368201D0368F36D5D5D5D5368F
+36D4D4D4D4368F0000030020FFA701F102DB0026002E003500000107272E0127071E0115
+14070E012307233726273F011E0117132E013534373E013B013733071607232206151416
+1F0103363534262701F11C0F02252E385836432841441523165F361A1004323D454C3B2A
+1E463A121122104870103542232D08449F1F3602637202393C11ED414E3F5C331E11595B
+12307B034C43130129314B373D2D20163F441105412C23341B70FEE70D832A2E2C000000
+00040050FFED02C102C2000B001900360046000025140623222635343633321607342623
+22070E01151416333236030123010E012322271615140607062322263534363332171633
+3236370534262726270E01070615141633323602C16440334675482E3217231C1D14212D
+201834522AFE522F018A1C35282329042C2426303244744D1A222F312E3445FF00091017
+151F1A0F301F1A354FD55B8D503A50833D362730172375331D277F023BFD2C029220190E
+1715346822254F3A55801C271E43891610080B170F17194C571F27820003004CFFEE02D3
+029A002F0039004300002517062322270E01232226353437363726353436333216151407
+060716173E01353426273533150E010706071E01333203342322061514173E010326270E
+01151416333202C80B2A5A4A3C395B3354624B258F0756492D3A3822521B3C2E21151EBC
+25232714421E392325A2272029053D2E5131364A59453B3D3F0B464F2D2251485A3D1E3E
+2A34586A362837301E2A8E5F343C1B110D021311041D391E58322C021D3E424026262642
+FE493EBE1D633938460000000001008401A500F1029A0009000013233637363332161514
+9B170D0A092A101301A5A82627120D1D0001002AFF4B013B029D000E0000011706021514
+161707263534373E01012E0D6B61141C12634A1B50029D0F65FED4A8496F4C069FCAA979
+2C53000000010010FF4C0121029D0011000013371E0117161514070607273E0137363534
+AB1323200D134E34820D3E431A310298053F4F37594F948659710F417451989991000000
+0001008000FF01EC029A004F0000011716171615142322272E042F011617161514223534
+37363506070E0107062322263534373E0137272627263534363332171617342726353433
+321615140706153E0137363332161514070E01014825201F4026141A080C10061A031201
+13084A0A12030D191A141B180F143E2324210C2D303D130E161B2A3112082311130B1021
+1A291313111239222701CB131004092325200A0D0E0512020D4035180A28260B1E323E02
+080F171921110F260A060E14071A06072510171F2F1D303B1B0F2A17120A26333516172B
+1516112407041000000100560000024E01FA000B0000252315233523353335331533024E
+DB42DBDB42DBDCDCDC42DCDC0001FFFBFF7F00870065000E000017273635342726353436
+3332161514050A4C14191D161A20811231290E0F131E121A2B1F58000001003100C0011A
+00FF0003000001072337011A0DDC0E00FF3F3F000001001BFFF5008A0064000A00003714
+0623222635343632168A22181520202E212B162020161821220000000001FFBFFFEE0182
+029A00030000090123010182FE8649017A029AFD5402AC0000020020FFF901F102A4000D
+001C0000011406070623222635343E01321607342322070E011514163332373E0101F168
+4D3D414C52578E9A524F54433527402C2549382B3601A96EE0372B766973D683821C825F
+47F6503F48644CDF000100320000019902A4001D0000013332151407030615143B011521
+353E0137133635342B01220735373E0101910305068F124215FEE93B2D08880823031526
+17305702A4070815FDF9400A200F0F04161D01E81E061F020F050A100001000C000001C4
+02A4001E000013273637363332161514060F011533323637170721353736373635342623
+22651522303749475B3B5ABCB52B2A121132FE9ED26225093E396001FB0753252A614832
+5C5CC0051B26078611E068531422364300010010FFF901D102A4002C0000132736333216
+15140607151E011514070623222635343633321716333237363534262B01353637363534
+262322B210307B3A4A4556322D5D4772353A18131E222423342926554B1877383E30283D
+02370568443637441E0313453875523E201913181E202E2D514F4F1015272B3F29320000
+00020001000001DF02A4000A000F00000103330723072337213701072301153301DF7960
+0E652E4F31FEFA1401A14104FED0D402A4FE4D3FB2B24301AF71FEC2040000000001000F
+FFF901EB029A001D000001072307161514062322263534363332171E0233323635342726
+27353701EB17E627DCAE7C2F3B171116220F0F140E446B35376F68029A47582AB57BA81C
+1D11191C0D09078053522B2D1010DA000002001EFFF9020902AE00140024000001150E01
+0717363332161514062322263436373E010334262322070E011514163332373E0102095A
+B43404223A46619569585A615746822941343E24171D372B402F1A2002AE100C875F0215
+644C72A472CABF443732FE803644382373373C47452770000001004BFFF80219029A000B
+00000901230127232206072737210219FE7C46016F02D73036250F5201750290FD680256
+031D2C0A880000000003001EFFF901ED02A4001900240030000013352E01353436333216
+15140607151E011514062322263534362534262206151416173E01033426270E01151416
+333236E132256452505D4A5A4132795E54736701243B6036263940323827534451553639
+4B01680138432847514B3D3B481B013C5636536954544567C536453B31213C351E3BFEB3
+2B3C561A68413B4B5600000000020017FFEF01EC02A40019002800000127062322263534
+3637363216151406070E0107353E01373E01133426232207061514163332373E01016004
+48394254322B3FAC5F645C3C75643B56382E454E342F3E2E3534304329151F0110022D64
+4F3B712739756568BF472E2E11130D2C2E265D011A3E463D466943482E16770000020032
+FFF5010501B9000A00150000011406232226353436321602140623222635343633320105
+21181620202E2164211816202117160180171F2016182121FEAA2E1F201617220002001A
+FF7F010501B9000A00190000011406232226353436321603273635342726353436333216
+1514010521181620202E21E10A4C14191D161A200180171F2016182121FDE71231290E0F
+131E121A2B1F580000010054FFF6025002040006000005253525150D010250FE0401FCFE
+5C01A40AE642E648BFBF0000000200560078024E01820003000700000121352111213521
+024EFE0801F8FE0801F8014042FEF64200010054FFF602500204000600002505352D0135
+050250FE0401A4FE5C01FCDCE648BFBF48E6000000020084FFF401D802980020002B0000
+37273E0137363534262322061514171615140623223534363332151406070E0107171406
+2322263534363216D8120E273F542B25212508061911244C3B99305337340B0E2015171D
+1E2C1FAE034F4D3F5450232F19170A110D0C0D1731303D7C31493E29452CA4151D1C1618
+1F21000000020076FFEE0326029A0030003D000025170623222635343633321615140623
+22270623222635343E013332173733070615143332363534262322061514163332033423
+2206070615141633323602AE0C7A6696CED39891B46E4A4910344526352F5E3932120A45
+3D07282F51AA757B9B9D80610D281434132F1F1C2B4C441D39C38E91CAAE77608B48473B
+2E3675563425EC1B0C287A4F6B9CB08D83A601753E1E193E4A272D880002FFCD00000234
+029C001A001D00002123353E0135342F012307061514171523353E01370133131E011727
+0B010234F52D200214DC3B163EBA222B39011D1A5C0A1C28C32D951002181B0812836F29
+191E03101007326301F0FDD73E2203F60107FEF90003FFF80000024C028D001800240031
+0000133332151407060715161514062321353E0137133635342627133332363534262322
+0E01070307061514333236353426272682FAD040224D7E957EFEF0291D0D790B1E2F7626
+6267383D17110E05492023435869261D22028D96462B1710012670626610061C2E01B427
+19160F04FEEE4E4A3834030F12FF007785072A58522D400A0C00000000010042FFEE02B1
+029A00200000010727262322070E01151433323637170E01232226353436373633321716
+33323702B1251212836D5A3537AF3E67401243814D759066556675453014151B0B0298C8
+03A36138A055CD34430F4F468B7A67BB3C491107160000000002FFF8000002BC028D0013
+0024000013213216151407062321353E013713363534262717030615143332373E013534
+2726232206830115869EA06AB9FEFF2B1B0C7A0B202CB3761644945D343A4E2F54201F02
+8D8C81B17C531008182C01BD271415130135FE5A500F255A329F4F793B230F000001FFFF
+0000027A028D00300000010727363534262322060F013332363717072736353427262B01
+070615143332373637170721353E013713363534262735027A1F16034A762A1A05424E42
+2C1D1244140707113D4E20244F814A2638103EFE052B1A0C7B0B1F2E028D9A0219152D1C
+0911E9204104E8051F1518070F707F132227144E08A21008172B01BA251B141104100000
+0001000800000285028D003000000107273635342E012322060F0136323E033717072736
+3534262322270706151416171523353E01371336353426273502852015031C505B231C05
+40312D34111C0C0D124C110823281C373B0E222BFB291E0C7B0A1B31028D9A02160B2721
+0E0D13E30109071B171B05EB0529141C1003D5320A121203101003202B01BA2419150F04
+1000000000010034FFEE02D2029A0031000001150E010F01062322272E01353436373633
+3217163332371707272627262322070E011514163332373E01373635342F013502D23125
+0B316F7E894C232764536874483E1A1224180F31120322305D754E32386A604722090E10
+1A2F20013F10031B2ABB3E4C236A3467B63A48180A2205C503402A3B633FA052636E2209
+2339571A1D0403100001FFF800000301028D0033000001150E0107030615141617152135
+3E013F01210706151416171523353E01371336353426273521150E010F01213736353426
+273503012C1C0C84031E31FEEE33290A40FEE34203192DF5291F0E760C1D30010F2D2D0A
+36011D2E0E2028028D1008182AFE1F0C0C1510051010042227E9F40A0C16100610100420
+3201AE2E12150F051010032024C6A4340B131403100000000001FFF800000180028D0017
+000001150E01070306151416171523353E01371336353426273501802A1B0D780F192CF4
+2A1F0B780D2028028D10051A2EFE533517140E051010081A2901B92E1014150210000000
+0001FFFAFFEE01EB028D001C000001150E0107030E012322263534363216151406151432
+3713363426273501EB2B1A0D671D5452354019281F0346127F0C1E2F028D1006172DFE91
+686E302818201B13061104274001C62C2811041000010007000002D2028D003500000115
+220705131E0117152135373635342E032F010706151416171523353E0137133635342627
+3521150E010F01373635342F013502D21C31FED6A817222FFEED1D2E030A0610027B410B
+1D2AF72B1A0C7C0E222D010E2A2E0B35998F2418028D1025E1FEDB281505101003041C06
+0E130B1C04D7ED260D171104101005182A01BD320C1514021010031F28C26D65240F0403
+100000000001FFF80000022F028D001D0000250721353E01371336353426273521150E01
+070306151416333236373637022F3AFE032A1A0E7A0B1F2E01112E2B0C780A2C3D4D4324
+2929B4B410041A3001B62519161203101003202AFE53261017120E181B5500000001FFEE
+00000368028D0028000001150E01070306151416170721353E01371301230B0106151417
+1523353E01371336353427353313010368291D0B7B0E242D01FEF131280D7EFE88113E76
+0946C5282517720C4AB538014F028D10071B28FE45320C141501101005222F01CBFDCF02
+22FE5420162B051010052F520191290B1E0410FE1401EC000001FFECFFF102D7028D0022
+000001150E030703230B0106151416171523353E013713262335331B0136353426273502
+D71B15190D109212E672091F27C62B241B75173FA0CF6A081B2A028D100607232A37FE05
+0226FE5A1F17151303101006335F019F3610FE0D01841C101B1404100002003CFFEE02BB
+029A000F001F0000011406070623222635343637363336160734262322070E0115141633
+32373E0102BB735C696D6377624F707D6B7669453C6357353D433F5C4E3B4601A26BC43E
+477C6E5BC1456101863447517548B64E52575F4AD6000000000200000000025D028D001C
+0027000013333215140607062322270706151416171523353E0137133635342627170716
+333237363534232292F1DA251F45883723350E1E27F42B1B0E74111C2BAE451D17572947
+822C028D94284D1A3908C136091213041010061B31019E3D161411052DF50518285E7B00
+0002003BFF4A02BB029A00270037000017273E01372E0135343637363332161514060706
+0F013332171633323637170607062322272623220134262322070E011514163332373E01
+450A3A3344555B5C516F82657C8E72446036192358561936482A10181C536C425237263B
+01D5453C6E542D3D443872542E3DA91029283C117B615DB8465E866775E13C2506391415
+212C0B22194B1A12026A47527D43B9494B5B7C46C00000000002FFF30000024C028D0023
+002E0000133332161514070607171E0133152303270706151416171523353E0137133635
+34272627170716333236353426232284FC616B42275C59112521937B42370D1A29F32821
+0C770C0E0C2DAE3F1F1459643E3A31028D4C414E321E15EB2E2410014405CB2E11171404
+101005222E01AF2E11120A08062CE3055046343C00010011FFEE01FC029B003500000107
+273426232206151416171E0115140623222726232207233717061514163332363534262F
+012E01272E013534363332171632363701FC28123245343C2043432E73572642200F210A
+12221402513F3A491A2227031C082D1E674B34211D22120A029BC8035350352F26334344
+5232556E170C20E002090E495E47392135252A031F08303D294C580E0B0A10000001003B
+00000279028D001A00000107273635342B0103061514161F011521353E01371322060727
+3702792C1103653A890E161F23FEE0342C0B8F775324122A028DA402191551FE16311117
+1103031010051E28020F2B51049B000000010066FFEE02FD028D002C000001150E040703
+060706222635343F0136353426273521150E010F01061514163332363F01363534262735
+02FD1515140F0E0D53223F3CC47B2C3409232D011033270E3F284F3B54662240171E2802
+8D1005090D242A2CFEE37435345C4837A1BD200D1414011010052234E28D2635416C7CE9
+55121614041000000001004CFFEE02B0028D00180000011506070123032E01273533150E
+011514171B01363534273502B02018FE8B135211172AF02F1D0141D2313E028D100127FD
+9901F7692A05101005141A0A05FE450168541F1B0710000000010047FFEE038A028D002E
+000001150E0107012303230323032E012726273533150E011514171B01272E0127353315
+0E01151416151B013635342735038A1D1B15FED3143205DE133D080A0B0A29EB291F012C
+AC08041B2CEC271D0228BC1743028D10091A28FDBC01C5FE3B0202462D0B0A0510100414
+1B0D07FE6C015C412616021010041418030B01FE64016D2C182901100001FFE30000028F
+028D0031000001150E010F01171E01171521353E0135342F0107061514331523353E013F
+01032E01273521150E0115141F01373635342735028F213725A965122433FEF12B220E43
+971742D528486C53670F252B0107291E103B91153D028D100B292BC2FF2D1A0610100111
+131023A5AC1A1621101007437E6100FF251C041010051113112793A718131F0310000000
+0001004E00000279028D0026000001150E01070307061514161F011521353E013F01032E
+01273533150E01141F01373635342F0135027915161BDB241E171E24FEDF332B0D3B4C0B
+1929EF2C1C241F2795281D028D10071521FEF27B6718131002031010031F2FCD010B2816
+061010040F227F6E2EB02518040310000001FFFA0000025E028D00150000090133323637
+363717072135012322070E0107273721025EFE1DA1474B1B29241336FE0701DFAB662816
+1517132D01E6027FFDA50C141E4A03A90E025B1B0F1F2B059300000000010015FF670187
+0297000E0000010723220607030615143B010723130187073E1515059E06313807BCC502
+971B1214FD6518051C1B03300001FFD7FFEE013F029A0003000005230133013F47FEDF48
+1202AC000001000CFF67017E0297000E00000103233733323637133635342B0137017EC5
+AD073E161405A0043139070297FCD01B1217029E10091A1B00010000012D01A6029A0007
+0000012303230323133301A6448F018E44B53C012D0121FEDF016D0000010000FF8301F4
+FFB5000300000521352101F4FE0C01F47D3200000001007801EC01370298000900000123
+27263534363332170137208C131410161201EC6A0F1110121700000000020011FFF501DC
+01B90020002E000025170E0123223534370E0123222635343E013332173F021706070215
+143332370334262322070E0115143332373601CF0D38351E2817385E352C38578641430D
+0B033D070105590E0F25471E1A443F212C3C3B444D6F0B442A29195A54493D374C9E663A
+300307030411FEBC270D2901171A205C31782E4A626F000000020017FFF501D902AB001A
+0028000013333E0133321615140E012322263D0113363534262735363717071334232207
+0E0115143332373E01A30132593634405E974B2E548E09132D4B4E05158D46454420282E
+42392E400122534440384D9C63201506020B240B10070211090E0552FEDE567336832E22
+3B3085000001001EFFF501A901B90022000025170E012322263534363736333216151406
+2226353436353423220706151416333236015E102E5738474C44374D5A2E3B1C28130F25
+3F2E5B2E2B27406B0A3A324E4C437D2D3D2E23141C1711091D0A14306089363C26000000
+0002000FFFF3020F02AB00270036000001170F010615143332363717062322263534370E
+01232226353436333216173337363534262735360334262322070E0115141633323E0102
+0906273C41120D1D280C4D4613160D2B53343239C1631F1D05012D0E162A4D591D122F2C
+32421F1B2D5C3B02AB0698DBEF0714192E0A7218151E3B493B3D3877D81C1EA331161008
+021107FECE1A1F2E35933E22276298000002001FFFF5019C01B90015001F000025170623
+2226353436333216151406070614163332362707363736353423220601660C58743D4ABB
+70272B99830A332A213C9811703132232A5B6D0C6C4B3E75C624204268111452321FBB2C
+1B2F3031276100000001FF6DFF3101A802A6002E00001333363736333216151406232226
+353436353423220607330723030223222635343633321615140615143332371323295D27
+21364E253119110E170A162A3A166B066C484088222D1610111509143E23585B01AC7E2F
+4D231B111A16110A12030D6D7720FEC0FEE5231A1119151007110510A201A40000030008
+FF3201D701B9002800350044000001231615140623222726232206151417161514062322
+26353436372635343726353436333217163B010734262322061514163332373603342627
+262722060706151433323601D731097346120D03040D17478E70624E592D481B4D4F7A4F
+3A280B053C771B1D304A201C3223211B3F50180A072F0B147F3B4C016E12213F6503011A
+0F1812225D4354373527372B101730241C504A611C08392720644823283B38FE87232F19
+0704260E1921663700010013FFF701DE02AB002D000025170E0123222635343F01363534
+232206070E010723133634262B0135363717033633321615140706151433323601D10D2E
+3E2614181437071C1B55281F241D4B920D1A0F1B4C510779826421203021100C1D760D41
+311713114BCF1C0519503C305B6F022A32180D0F091206FE41D3251E2B966518121D0000
+00020031FFF50108028E000A00230000011406232226353436321603170E01232235343F
+0136353426273536371703061514333201081D14161A1B281E2A0D2A3A25311630091729
+2E72045E0A0E190257151E1D18171E21FE050B4131371D52B1200C0F080110041503FEA9
+220A0F000002FF84FF310117028C000B002A000001140623222635343633321607030E01
+232226353436333215140615143332363713363534262B0135363701171E14171F201514
+1F21681F5B41232C1811270C121E291A4810151B1A2D7C0256141E1D17161E21B5FE6679
+72221B121A250C0F070C4E680124410F110E1003160000000001000EFFF501CD02AB0029
+000001150E010717163332373637170E012322262726270F0123133637262B0135363717
+03373635342B013501CD24506D25371A1518050A0F232E1E1623181E1E28304B8D0E0403
+30124B5206782B8F250E01AC1002376158812A08120B3F2E232F3A5320B4021032261810
+091206FE38216E1E1210000000010029FFF5011702AB00190000010306151433323F0117
+0E012322353437133635342B0135363701179908111B28190E2D41293104890331124655
+02A6FDB71D0E1239230A473638110D020C0A0916100813000001000CFFF702C001B90042
+0000250706232235343F01363534262322070E01072337363534232206070E0107233736
+35342B0135371707363332161514073E01373633321615140F0106151433323F0102C005
+4D43280D3A070C082F54252A1D4B1B441619522A1923244B2B372919A2033A825A1D1F28
+354724201F1B1F03440A0C162B1569076B2E0F33E31C0A090C753469735DEB24194F4027
+587790B72D16101F02D1D3201C267254551714231C0D0FFB260710351A0000000001000E
+FFF701DA01B90031000025170E0123222635343F01363534232206070E01072313363534
+2627353E013717073E0133321615140F010615143332373601CC0E333623141B102C0E18
+1D4532211F244B60021B2627601B04434A6C311F220A380E10132A07750D462B1B1B103B
+A236191D4549314E79015E0A070F0B011008110602DA7666211C1923CB320B1235080000
+0002001BFFF501D401B9000F001E00000114060706232226353436373633321607342623
+2207061514163332373E0101D439315369464D654F38403E4F542621433D4A2A243D3C22
+28012D397B31534942539E2A1E4B282D315B71732C2F532E810000000002FFB5FF3301D8
+01B900210031000013073633321615140623222706151416331523353E0137133635342B
+012737321506173426232206070E0115141633323736D71D4B60373CBB6E2421281B23CB
+201B0973102C16029C0501A61D21274E12162B1B154E434501AC6471423B7BCC11A50110
+0D1010011A2401B03A0D1B0F160405772C29442E399C1911155F600000020019FF2F01E4
+01B9001A0029000001030615143B011523353E0137130E0123222635343E013332173707
+34262322070E0115143332373E0101E4A502390FED2E24095A3B5A3B2F355989433F0E10
+1F221929343342352929335301ACFDBD08031F101003181D01225E463E364D9E653E3145
+192331318C3E4D242CAF00000001002D0000019C01B9001E00003F013637363332161406
+232227262322070E01072313363534232207353717B010223C2B24151A1916131008081B
+372229244C51102608179B03DF234B3F2D1C2E1F1A0E5E3A677901243B171A03111B0200
+00010010FFF3016E01BA0029000001072326232206151417161514062322272623220723
+3733163332363534272635343633321716333237016E14100E4B1B203644513F1D1A1517
+140910141014502428383F42371424160E140A01BA8C741E1B26404F393D490A09159F88
+28252D464F34323A0A07120000010026FFF5012802220021000001072303061514333236
+37170E01232235343713232734373E013736333215140F010128055457020F0C20250D2E
+3B262E104E4B012119521A060809011C01AC20FEB80806101F30074633250A4001280612
+0706412709080502670000000001002AFFF501DB01B9002A000025170E0123223534370E
+012235343F01363534262335363717030615143332373E0137330306151433323601CD0E
+303624302D59616A1B230E16274551045903142D612125284A4F130B0C227709492E302D
+98926535126E8B3A090C0C0E081303FE9D0907199332536EFED548061120000000010014
+FFEE01AA01B9002D00003F013E013534272635343633321615140706070E0623223D0134
+272E01232207353637363332161716CF1F36531219161018203F3740091A0C13090C0804
+09180A171C140B37390B09060711124620378D230C1116170F1325163A615544091C0E13
+090A031B188A8C3924010D090C041A585B0000000001000FFFEE028801B9003500000113
+3E0135342726353436333216151403070623222703070607062322262F0126272E012B01
+3536373E0233321617161713363332019320634216151710161ED409230A08031D591720
+310F0704020408130711171C4F10050D08030806051907C006070801AAFEA07B69200E15
+14150C1320185BFEFE0B2B23013698263D5E121D5BA44E1B0F0D0D040104020A1878A101
+300A00000001FFE5FFF501BF01B9003F000013173E013332161406232226232207141F01
+163332373E0237170E012322262F01070E012322263534363332171633323F01272E0123
+220F01273736333216F30C3541211217130F091E0D1D4508200A14101F030806040F2B32
+1D181A091D581F2719171B130F0C140F0B1122521C0A11130C1B12030B50251316016339
+513E15201411790D20862928040B090409432F1E2677772A1A16140F150B0931747C2C18
+070510041D2400000001FFE8FF3201AA01B90033000037173E0135342726353436333216
+1514070E012322263534363332163332373E013736353426272E01232207353637363733
+3216F31543371A1A1711161E834E932B171C1710131E0C121E0D33070A3E140E211E100F
+160A2942040B3DBA6E6E7320101011161015201757DA819E181311171C210D430B140F1E
+FB33251B04110402080ABA000001FFFEFFAF017C01AC0024000009011E01171633323534
+2726353E0133321615140623222726232207270123220607273721017CFEDF2E2D1D2224
+1B050801140C101334292A47442517160901368828240F1020011B01A1FEA80A1E2B320F
+050A100C0D1514111F2D2C2A120901741725047400010033FF4F019702AF002200000107
+0E010F010E0107161514070615141617072E0135343736353426273E013F013E01019703
+2F2E102D103131382C16181D0345382022171E302B0F30165202AF0B0C353BA83E360D18
+271F9F54121C1E080B022329216F742516180B0D2E37B24F3D00000000010069FFEE00AB
+029A0003000017231133AB42421202AC0001FFF9FF4F015D02AF0021000013371E011514
+0706151416170E010F010E0123373E013F013E013726353437363534DD0345382022171E
+302B0F30165354032F2E102D103032382C1602A40B022329236D752416180B0D2E37B24F
+3D0B0C353BA83E360D18271F9F5015340001002800B701F601430017000001170E012322
+27262322060727363332171E0333323601D2242139232E393B36192F0D242C4E2F43041D
+181E0A1D2301433230262123252332561F020E0B0A1D00000002003BFF33014101DA000A
+001600000114062322263534363216071706070E01232235343736014120141620212C1D
+61112E1A0A211B28263201A3141F2016151F1F9E04CCA63E363229536C0000000002004D
+FF7101D80230002A00320000010716171615140623222635343736353427031633323637
+170E0123222707233726272635343637363F01031306070E011514019E2A2D191E1B1512
+15090623890B0D26402B102D583606052F1F3025153251472A472AB6842F26292D023078
+04121723141C16120C110D051401FE7904252E0A3A33018588081127534D8E2C1A0B78FD
+F901780A262A7C3D440000000002000AFFF80205029E002F003A000013333E0137363332
+161514232226232206073307230E01071633323F011706232226270E0123222635343633
+321737231726232206151416333236526D0F2B2639502934271E0C222A2D237C077F1317
+1F5A4627280A0B29652539321C291B1F223028221C197049231A171E191214280169576D
+2D442A2229586AAE2A514244261C0709641A27251A221E1C280BCCF61919141015200000
+0002FFEAFFF6020A0216001B002700002507270623222707273726353437273717363332
+1737170716151407273426232206151416333236020A30623B42443B6032622929623260
+3C43453862306027271D553B3E58563E3D5528326229296232603B434539623060272760
+30623944433C7F3E58573E40595800000001001C0000025D028D0037000001150E010F01
+3307230F013307230615141F011521373E013F012337333727233733272E01273533150E
+0115141F0136373E0137342F0135025D191B17B5950CA80618B20CB21F3624FEE504362C
+0D19A40CA31703A20C8B3F0C1C30ED2E1B271D13095D44012A19028D100B151DE0280852
+285E18290403101005202D5428500A28D82817061010040E101B8164150C6C5D19180403
+1000000000020069FFEE00AB029A0003000700001323113311231133AB42424242018701
+13FD54011300000000020035FF5E01CD029A00450053000013372E013534363332161514
+0623222634373635342623220615141F0116151406232227071E01151406232226353436
+33321514070615141633323635342F012635343633321734262726232206151416333236
+F902261D534039491C18141A150D23192B311A7B294135130E0227185943394F1E1A2F1B
+0F2B1C2D39324C473E2C199C192039321C26792C1B26018E032F3C213746382B191E1928
+120C070D122D2628209632403945070332311E3B4E3E2E1A1E2B1E100A070F163228273A
+5752473348D919342B4C261C35942A000002006B01FC0195025E000B0017000001140623
+222635343633321607140623222635343633321601951D14151C1D15131DC81D14151C1D
+15131D022D141D1D15141C1E13141D1D15141C1E00030029FFEE02CF029A001D00280034
+000025070E010706232226353436333217161D0123262322061514163332363F01140623
+2226103633321607342623220615141633323602210F01080C402F5F7079612E3515100F
+5C434749442B3815BEC58C8FC6C68D90C337A57674A9A97473A8F044080604126655596F
+12060F45585953545B282C4E8BC5C6011EC8C8937FB2B27B7AB1B0000002002A01960160
+02A4001F002C00000137060F0106151433323F01170E0123223534370E01232226353436
+3332173707342722061514163332373E01012B35300603010407180E072521141F112633
+25242A7B423209071C13285F120B2728141A02A102A8230F030407180F0A291919132B33
+2425214682231E3324027B3710183C1D4500000000020035002501BD01930016002C0000
+373536373633321514070607161716151423222E01272627353637363332151407060716
+17161514222E012726D767185809065B1F22060E3E07061C27092CB967185809065B1928
+060E3E0E1C250A2CD80950154D071D531C270E1A74110721340A32220950154D071D5317
+2C0E1A74110721330B32000000010056006C024E018200050000252335213521024E42FE
+4A01F86CD44200000001003100C0011A00FF0003000001072337011A0DDC0E00FF3F3F00
+00040029FFEE02CF029A001F00260031003D00002523222627262723151416171523353E
+013D013426273533321615140717161727333235342B0105140623222610363332160734
+2623220615141633323602333F0D1E1A151E2F0C24A0240C0C24AF353D4F392E1DE62A44
+45290182C58C8FC6C68D90C337A57674A9A97473A892222D252D61200D040F0F040D20ED
+210C040F312A47204E3E16AA594EAE8BC5C6011EC8C8937FB2B27B7AB1B0000000010063
+0214019B02470003000001072137019B0BFED30B02473333000200650186018302A4000A
+00150000011406232226353436321607342622061514163332360183533E3A5353785327
+3D563D3D2A2B3E02153D52543B3C53533C2C41402D2C4140000200560000024E0238000B
+000F000001231523352335333533153311213521024EDB42DBDB42DBFE0801F8011AA0A0
+42DCDCFEA442000000010021010F014402A4001C000013273637363332161514060F0117
+3332363717072335373635342623225B0D121927352E41224172026C1B1A0C0B21E7855D
+2E2032023C082A15213B2A1A2F3F6E050E14084F12825B301C2700000001002B010C0153
+02A400280000132736333216151406071716171615140623223534363332171633323635
+34262B0135363534262322950A224728372B3A041C0A15685149110D0E181C0F2430352F
+0D931D15220260073D2C201D2614020E0A18264558270C10111335282E33091C42161E00
+000100B401EE0193029800080000133736321615140F01B4A20A1E1511AB01EEA00A150F
+120A6A000001FFE2FF2F01F101AC002B00000103061514333237070E0123223534370623
+222706151416151406232234373637133303061514163332371301F14E061A172103202E
+1D39044D4D4C1B0202272022261A0855584303252044364901ACFEB01B071C1A0920193B
+0C135A4C151B19221A414D5A4942220176FEE40A14202546013900000002003CFF85026D
+028D0022002C000001070E0107030615141F010723132303233736373637363F01262726
+353436373E0133031306070E0115141716026D06382009A00B31170594C83AC894053A10
+0A0312321E47252D201B22614D684F3E271C24210F028D15041422FDA82A081404021502
+F3FD0D150508060933C27003191F3D2F5F202824FEA30148042D20632E351E0F00010046
+00C700B50136000A00003714062322263534363216B522171620202E21FD162020161821
+220000000001FFE2FF2700B6000000170000330736333216151406232227371633323534
+262322072737772C0F0A262C4334263711291B351A140C14093C4203251F2630151D0F29
+13190708600000000001002B010F011C02A4001800000133321407030615141617152335
+3E0137133635342B013536010E0905045613141DB5231A045A0515222102A40A0BFEEE3A
+100B08011010040A0B011D0F06111305000200430196016A02A4000B0018000001140623
+222635343633321607342326061514163332373E01016A7D492C357A4C2B36491F294D15
+111D141B23025045752D2648732F162F01743F1519161D5700020037002501BF01930015
+002B000025070607062322353437363727263534321E011716170F01060706232235343F
+012726353433321E0117161701BF242F2C570A065B231E143E0E1B27093112A2242F2C57
+0A065B41143E07061C260A3112D71B23274D071D531F242872130720350A391B091B2327
+4D07135D432872130721330B391B000000040021FFF602E002A4000A000D0011002C0000
+01033307230723372337010F013313012301053536373633321514070306151416171523
+353E0137133635342302E04F37093A1E3F20A80D010F2FBD8138FE393301C7FE34093D34
+0805035613141DB5231A045A05190196FEFD2B68692A010349BA0211FD5202AE2913010B
+0A050709FEEE3A100B08011010040A0B011D0F061100000000030022FFF602ED02A4001C
+0020003B000001273637363332161514060F011733323637170723353736353426232213
+012301053536373633321514070306151416171523353E0137133635342302040D121928
+352D41224172026C1B1A0C0B21E7855D2E20324FFE393301C7FE43083E34080503561314
+1DB5231A045A0518012D082A15223C2A1A2F3F6E050E14084F12825B301C270142FD5202
+AE2913010B0A050709FEEE3C0E0B08011010040A0B011D0F0710000000040017FFF602E0
+02A4000A000D0011003B000001033307230723372337010F01331301230105273E013332
+1615140607151617161514062322353436333217163332363534262B0135363534262322
+02E04F37093A1E3F20A80D010F2FBD8139FE393301C7FE2A0A0F382228372B3A1B0F1568
+5149110D0E181C0F2430352F0D931D15220196FEFD2B68692A010349BA0211FD5202AE44
+071C212C201D261403071018264558270C10111335282E33091C42161E0000000002001C
+FF33016F01D9000A002C0000001406232226353436333207170E01070E01151416333236
+3534263534363216151406232226353436373E0137016F1E16171E1F151634110D243F31
+262A2620260F1624154F3E454E335336330A01BB2C1F1F16151FBC024B4548394627282C
+1A16081E0D11151B17303D3D3C2F4A442B422A000003FFCD000002340392001A001D0027
+00002123353E0135342F012307061514171523353E01370133131E0117270B0101232726
+3534363332170234F52D200214DC3B163EBA222B39011D1A5C0A1C28C32D950145208C13
+141016121002181B0812836F29191E03101007326301F0FDD73E2203F60107FEF901E06A
+0F111012170000000003FFCD000002340392001A001D002600002123353E0135342F0123
+07061514171523353E01370133131E0117270B01133736321615140F010234F52D200214
+DC3B163EBA222B39011D1A5C0A1C28C32D9575A20A1E1511AB1002181B0812836F29191E
+03101007326301F0FDD73E2203F60107FEF901E2A00A150F120A6A000003FFCD00000234
+038F001A001D002400002123353E0135342F012307061514171523353E01370133131E01
+17270B01012327072337330234F52D200214DC3B163EBA222B39011D1A5C0A1C28C32D95
+0175245289279D311002181B0812836F29191E03101007326301F0FDD73E2203F60107FE
+F901E06868A900000003FFCD0000023C036A001A001D003100002123353E0135342F0123
+07061514171523353E01370133131E0117270B0101330623222726232207233E01333217
+163332360234F52D200214DC3B163EBA222B39011D1A5C0A1C28C32D9501711C16491227
+4718240F1D0F2E272036291514171002181B0812836F29191E03101007326301F0FDD73E
+2203F60107FEF90264680F1D2F3A3018131300000004FFCD000002340358001A001D0029
+003500002123353E0135342F012307061514171523353E01370133131E0117270B010114
+062322263534363332160714062322263534363332160234F52D200214DC3B163EBA222B
+39011D1A5C0A1C28C32D95017B1D14151C1D15131DC81D14151C1D15131D1002181B0812
+836F29191E03101007326301F0FDD73E2203F60107FEF90221141D1D15141C1E13141D1D
+15141C1E0004FFCD0000023403BD001A001D0028003300002123353E0135342F01230706
+1514171523353E01370133131E0117270B01001406232226353436333216342623220615
+141633320234F52D200214DC3B163EBA222B39011D1A5C0A1C28C32D95014A3B292B393B
+282A19271C1A27251C1D1002181B0812836F29191E03101007326301F0FDD73E2203F601
+07FEF9027C523A3A2A283B803826271A1C2600000002FFE50000038F028D004000430000
+010727363534262322060F01323E0337170727363534262B010615143B01323637170721
+353E013F0123060706151416171523353E0137013E0135342F0135170133038F21110145
+7B2316073D36342F19130E124511062D492847331E706F391240FE0E2C1D0731BE140564
+1828BB131D2401711709261A7BFEF4AD028D99020D17351D0D18DE0408191D1F04E80424
+101F13FD0D1D365205A410041319AA190578250F0B051010041B2D01D11D0F091703020F
+28FEAA0000010042FF2702B1029A00380000010727262322060706151433323637170E01
+23222707363332161514062322273716333235342623220727372E0135343E0133321716
+33323702B125120C8D31672B6CAF3E65431143814D1A18230F0A262C4334263711291B35
+1A140C140938516171BC6931441D0C1B0B0298C803A3352D72BACD34420E4F4604340325
+1F2630151D0F29131907085A12895E6DC4761107160000000002FFFF0000027A03920030
+003A0000010727363534262322060F013332363717072736353427262B01070615143332
+373637170721353E01371336353426273525232726353436333217027A1F16034A762A1A
+05424E422C1D1244140707113D4E20244F814A2638103EFE052B1A0C7B0B1F2E0185208C
+1314101612028D9A0219152D1C0911E9204104E8051F1518070F707F132227144E08A210
+08172B01BA251B14110410596A0F1110121700000002FFFF0000027A0392003000390000
+010727363534262322060F013332363717072736353427262B0107061514333237363717
+0721353E0137133635342627353F0136321615140F01027A1F16034A762A1A05424E422C
+1D1244140707113D4E20244F814A2638103EFE052B1A0C7B0B1F2EB9A20A1E1511AB028D
+9A0219152D1C0911E9204104E8051F1518070F707F132227144E08A21008172B01BA251B
+141104105BA00A150F120A6A0002FFFF0000027A038F0030003700000107273635342623
+22060F013332363717072736353427262B01070615143332373637170721353E01371336
+353426273525232707233733027A1F16034A762A1A05424E422C1D1244140707113D4E20
+244F814A2638103EFE052B1A0C7B0B1F2E01B8245289279D31028D9A0219152D1C0911E9
+204104E8051F1518070F707F132227144E08A21008172B01BA251B14110410596868A900
+0003FFFF0000027A03580030003C00480000010727363534262322060F01333236371707
+2736353427262B01070615143332373637170721353E0137133635342627352514062322
+26353436333216071406232226353436333216027A1F16034A762A1A05424E422C1D1244
+140707113D4E20244F814A2638103EFE052B1A0C7B0B1F2E01C01D14151C1D15131DC81D
+14151C1D15131D028D9A0219152D1C0911E9204104E8051F1518070F707F132227144E08
+A21008172B01BA251B141104109A141D1D15141C1E13141D1D15141C1E0000000002FFF8
+0000018E039200170021000001150E01070306151416171523353E013713363534262735
+2523272635343633321701802A1B0D780F192CF42A1F0B780D20280105208C1314101612
+028D10051A2EFE533517140E051010081A2901B92E1014150210596A0F11101217000000
+0002FFF80000019E039200170020000001150E01070306151416171523353E0137133635
+342627353F0136321615140F0101802A1B0D780F192CF42A1F0B780D202836A20A1E1511
+AB028D10051A2EFE533517140E051010081A2901B92E10141502105BA00A150F120A6A00
+0002FFF8000001C2038F0017001E000001150E01070306151416171523353E0137133635
+342627352523270723373301802A1B0D780F192CF42A1F0B780D20280139245289279D31
+028D10051A2EFE533517140E051010081A2901B92E1014150210596868A900000003FFF8
+000001C9035800170023002F000001150E01070306151416171523353E01371336353426
+273525140623222635343633321607140623222635343633321601802A1B0D780F192CF4
+2A1F0B780D202801401D14151C1D15131DC81D14151C1D15131D028D10051A2EFE533517
+140E051010081A2901B92E10141502109A141D1D15141C1E13141D1D15141C1E0002FFF8
+000002BC028D0018002C00001321321615140607062B01353E013F012337333736353426
+2713070615143332373E013534262322060F0133078201148B9B564A6EC1F52B1A0C415A
+0C5A2E0B1E2F6C2E16459759333B6C6A2019053F990C028D8984579E38531008172BEC2A
+A42719141104FEC9A4500F255A3398516C6F0C11E22A00000002FFECFFF102D7036A0022
+0036000001150E030703230B0106151416171523353E013713262335331B013635342627
+3537330623222726232207233E013332171633323602D71B15190D109212E672091F27C6
+2B241B75173FA0CF6A081B2A501C164912274718240F1D0F2E27203629151417028D1006
+07232A37FE050226FE5A1F17151303101006335F019F3610FE0D01841C101B140410DD68
+0F1D2F3A301813130003003CFFEE02BB0392000F001F0029000001140607062322263534
+3637363336160734262322070E011514163332373E010323272635343633321702BB735C
+696D6377624F707D6B7669453C6357353D433F5C4E3B4607208C131410161201A26BC43E
+477C6E5BC1456101863447517548B64E52575F4AD601586A0F111012170000000003003C
+FFEE02BB0392000F001F0028000001140607062322263534363736333616073426232207
+0E011514163332373E01033736321615140F0102BB735C696D6377624F707D6B7669453C
+6357353D433F5C4E3B46D3A20A1E1511AB01A26BC43E477C6E5BC1456101863447517548
+B64E52575F4AD6015AA00A150F120A6A0003003CFFEE02BB038F000F001F002600000114
+06070623222635343637363336160734262322070E011514163332373E01132327072337
+3302BB735C696D6377624F707D6B7669453C6357353D433F5C4E3B462C245289279D3101
+A26BC43E477C6E5BC1456101863447517548B64E52575F4AD601586868A900000003003C
+FFEE02BB036A000F001F0033000001140607062322263534363736333616073426232207
+0E011514163332373E0113330623222726232207233E013332171633323602BB735C696D
+6377624F707D6B7669453C6357353D433F5C4E3B46281C164912274718240F1D0F2E2720
+362915141701A26BC43E477C6E5BC1456101863447517548B64E52575F4AD601DC680F1D
+2F3A3018131300000004003CFFEE02BB0358000F001F002B003700000114060706232226
+35343637363336160734262322070E011514163332373E01131406232226353436333216
+07140623222635343633321602BB735C696D6377624F707D6B7669453C6357353D433F5C
+4E3B46311D14151C1D15131DC81D14151C1D15131D01A26BC43E477C6E5BC14561018634
+47517548B64E52575F4AD60199141D1D15141C1E13141D1D15141C1E0001005D00080246
+01F1000B0000250727072737273717371707024630C5C430C4C430C4C530C53830C5C530
+C5C430C5C530C4000003003CFF9702BB02D200190023002D0000010716171615140E0223
+2227072337263534363736333217370901262322070E0115140901163332373E01353402
+9D402B141F4874994D29354A2C565F5C527872353434FE4D016422306E532E3C0195FE9D
+20306D532E3D02D2602223384653A57C4D156C7F45835BB64665164EFD7802151A7D44BC
+4C3701C5FDEE1D7B45C04C3A00020066FFEE02FD0392002C0036000001150E0407030607
+06222635343F0136353426273521150E010F01061514163332363F013635342627353723
+272635343633321702FD1515140F0E0D53223F3CC47B2C3409232D011033270E3F284F3B
+54662240171E2815208C1314101612028D1005090D242A2CFEE37435345C4837A1BD200D
+1414011010052234E28D2635416C7CE9551216140410596A0F1110121700000000020066
+FFEE02FD0392002C0035000001150E040703060706222635343F0136353426273521150E
+010F01061514163332363F01363534262735273736321615140F0102FD1515140F0E0D53
+223F3CC47B2C3409232D011033270E3F284F3B54662240171E28B8A20A1E1511AB028D10
+05090D242A2CFEE37435345C4837A1BD200D1414011010052234E28D2635416C7CE95512
+161404105BA00A150F120A6A00020066FFEE02FD038F002C0033000001150E0407030607
+06222635343F0136353426273521150E010F01061514163332363F013635342627353723
+270723373302FD1515140F0E0D53223F3CC47B2C3409232D011033270E3F284F3B546622
+40171E2844245289279D31028D1005090D242A2CFEE37435345C4837A1BD200D14140110
+10052234E28D2635416C7CE9551216140410596868A9000000030066FFEE02FD0358002C
+00380044000001150E040703060706222635343F0136353426273521150E010F01061514
+163332363F01363534262735371406232226353436333216071406232226353436333216
+02FD1515140F0E0D53223F3CC47B2C3409232D011033270E3F284F3B54662240171E284E
+1D14151C1D15131DC81D14151C1D15131D028D1005090D242A2CFEE37435345C4837A1BD
+200D1414011010052234E28D2635416C7CE95512161404109A141D1D15141C1E13141D1D
+15141C1E0002004E0000027903920026002F000001150E01070307061514161F01152135
+3E013F01032E01273533150E01141F01373635342F0135273736321615140F0102791516
+1BDB241E171E24FEDF332B0D3B4C0B1929EF2C1C241F2795281D8FA20A1E1511AB028D10
+071521FEF27B6718131002031010031F2FCD010B2816061010040F227F6E2EB025180403
+105BA00A150F120A6A0000000002000000000239028D0022002C00000133321514060706
+2322270706151416171523353E01371336353426273533150E010F021633323635342322
+012E38D32C2640803A1F110C132FF32B1A0D7611192AEB1F190724471E16616686260206
+902E551B2E0A3C2A0F1A0E07101006172D01A93F11151005101004111984F8054E5A7200
+0001FF58FF3101ED02A7004A000017133E013332161514060F011516171E011514060706
+2322263534363332161514070615143332373635342726353433323634232207030E0123
+222635343633321615140706151433323617482C795E3E4D4853082B181A1F2E26364B24
+2C18141115080412281F2F511A113C4C3E573A6F1B623C232B15121117080411262F0401
+3FC0AC483B374B1F03030511123F22346C2839251D161916120E0D08030D365671680301
+0E0D659EDAFE566774221C131714100C0E0505084E00000000030011FFF501DC02980020
+002E0038000025170E0123223534370E0123222635343E013332173F0217060702151433
+32370334262322070E011514333237363723272635343633321701CF0D38351E2817385E
+352C38578641430D0B033D070105590E0F25471E1A443F212C3C3B444D51208C13141016
+126F0B442A29195A54493D374C9E663A300307030411FEBC270D2901171A205C31782E4A
+626FF56A0F1110121700000000030011FFF501DC02980020002E0037000025170E012322
+3534370E0123222635343E013332173F021706070215143332370334262322070E011514
+33323736273736321615140F0101CF0D38351E2817385E352C38578641430D0B033D0701
+05590E0F25471E1A443F212C3C3B444D7AA20A1E1511AB6F0B442A29195A54493D374C9E
+663A300307030411FEBC270D2901171A205C31782E4A626FF7A00A150F120A6A00030011
+FFF501F102950020002E0035000025170E0123223534370E0123222635343E013332173F
+021706070215143332370334262322070E011514333237363723270723373301CF0D3835
+1E2817385E352C38578641430D0B033D070105590E0F25471E1A443F212C3C3B444D8424
+5289279D316F0B442A29195A54493D374C9E663A300307030411FEBC270D2901171A205C
+31782E4A626FF56868A9000000030011FFF5020902700020002E0042000025170E012322
+3534370E0123222635343E013332173F021706070215143332370334262322070E011514
+3332373613330623222726232207233E013332171633323601CF0D38351E2817385E352C
+38578641430D0B033D070105590E0F25471E1A443F212C3C3B444D801C16491227471824
+0F1D0F2E272036291514176F0B442A29195A54493D374C9E663A300307030411FEBC270D
+2901171A205C31782E4A626F0179680F1D2F3A301813130000040011FFF501F7025E0020
+002E003A0046000025170E0123223534370E0123222635343E013332173F021706070215
+143332370334262322070E01151433323736131406232226353436333216071406232226
+35343633321601CF0D38351E2817385E352C38578641430D0B033D070105590E0F25471E
+1A443F212C3C3B444D8A1D14151C1D15131DC81D14151C1D15131D6F0B442A29195A5449
+3D374C9E663A300307030411FEBC270D2901171A205C31782E4A626F0136141D1D15141C
+1E13141D1D15141C1E00000000040011FFF501DC02C50020002E00390044000025170E01
+23223534370E0123222635343E013332173F021706070215143332370334262322070E01
+1514333237361214062322263534363332163426232206151416333201CF0D38351E2817
+385E352C38578641430D0B033D070105590E0F25471E1A443F212C3C3B444D583B292B39
+3B282A19271C1A27251C1D6F0B442A29195A54493D374C9E663A300307030411FEBC270D
+2901171A205C31782E4A626F0193523A3A2A283B803826271A1C260000030017FFF50280
+01B90026003100400000010736333216151407060706151416333237170E012226353437
+0E0123222635343E013332173716342322070E01073E01372734262326070E0115143332
+373E0101CB163B3F252C42348A0821253C520A2A6D5E39063B5731262E59843B360C13BA
+2321201C2216444919CE1914353C252E222A26364901B73E4026203A2B2127221A372F4D
+0C333D423814145C46332F4FA86B2F2D5F48231E4040142C2132171C01573680363C293A
+A70000000001001AFF2701A901B900390000173726353436333216151406232235343736
+35342322070E0115141633323637170E012B010736333216151406232227371633323534
+262322074D3867B2702E3B1B15270906253F2E2A31302B254129102E573908250F0A262C
+4334263711291B351A140C14605A197875B92E23141A260C110B0814302B7E40363C252C
+0A3A313703251F2630151D0F291319070003001FFFF5019E02980015001F002900002517
+062322263534363332161514060706141633323627073637363534232206372327263534
+3633321701660C58743D4ABB70272B99830A332A213C9811703132232A5BEC208C131410
+16126D0C6C4B3E75C624204268111452321FBB2C1B2F30312761AB6A0F11101217000000
+0003001FFFF501AF02980015001F00280000251706232226353436333216151406070614
+16333236270736373635342322063F0136321615140F0101660C58743D4ABB70272B9983
+0A332A213C9811703132232A5B1EA20A1E1511AB6D0C6C4B3E75C624204268111452321F
+BB2C1B2F30312761ADA00A150F120A6A0003001FFFF501D202950015001F002600002517
+062322263534363332161514060706141633323627073637363534232206252327072337
+3301660C58743D4ABB70272B99830A332A213C9811703132232A5B0120245289279D316D
+0C6C4B3E75C624204268111452321FBB2C1B2F30312761AB6868A9000004001FFFF501DB
+025E0015001F002B00370000251706232226353436333216151406070614163332362707
+363736353423220625140623222635343633321607140623222635343633321601660C58
+743D4ABB70272B99830A332A213C9811703132232A5B01291D14151C1D15131DC81D1415
+1C1D15131D6D0C6C4B3E75C624204268111452321FBB2C1B2F30312761EC141D1D15141C
+1E13141D1D15141C1E0000000002002FFFF5012E0298001A0024000037170E0123223534
+3F01363534262735363717030615141633323613232726353436333217DD0E293C253218
+300916292C730560090A060C2472208C1314101612730C3F3339145AAF220B0F08011003
+1603FEAA220B06092301A56A0F111012170000000002002FFFF5013E0298001A00230000
+37170E01232235343F013635342627353637170306151416333236033736321615140F01
+DD0E293C253218300916292C730560090A060C245DA20A1E1511AB730C3F3339145AAF22
+0B0F080110031603FEAA220B06092301A7A00A150F120A6A0002002FFFF5015F0295001A
+0021000037170E01232235343F0136353426273536371703061514163332361323270723
+3733DD0E293C253218300916292C730560090A060C24A3245289279D31730C3F3339145A
+AF220B0F080110031603FEAA220B06092301A56868A900000003002FFFF50169025E001A
+00260032000037170E01232235343F013635342627353637170306151416333236131406
+232226353436333216071406232226353436333216DD0E293C253218300916292C730560
+090A060C24AD1D14151C1D15131DC81D14151C1D15131D730C3F3339145AAF220B0F0801
+10031603FEAA220B06092301E6141D1D15141C1E13141D1D15141C1E0002001BFFF501E2
+02AB001B002A000001071615140E01232226353436333217372627072737262737161737
+033426232207061514163332373E0101E265564C8851464DAD6B3B1C020E3A75217B2F38
+23423863422720453F462B2346362027027D2D628761AA67474573C53101634B331D362C
+17110F2E2BFEAD2B3359617F2A37522F840000000002000EFFF701E80270003100450000
+25170E0123222635343F01363534232206070E010723133635342627353E013717073E01
+33321615140F010615143332373613330623222726232207233E013332171633323601CC
+0E333623141B102C0E181D4532211F244B60021B2627601B04434A6C311F220A380E1013
+2A070E1C164912274718240F1D0F2E27203629151417750D462B1B1B103BA236191D4549
+314E79015E0A070F0B011008110602DA7666211C1923CB320B123508020D680F1D2F3A30
+181313000003001BFFF501D40298000F001E002800000114060706232226353436373633
+3216073426232207061514163332373E013723272635343633321701D439315369464D65
+4F38403E4F542621433D4A2A243D3C222822208C1314101612012D397B31534942539E2A
+1E4B282D315B71732C2F532E81E06A0F111012170003001BFFF501D40298000F001E0027
+000001140607062322263534363736333216073426232207061514163332373E01273736
+321615140F0101D439315369464D654F38403E4F542621433D4A2A243D3C2228A9A20A1E
+1511AB012D397B31534942539E2A1E4B282D315B71732C2F532E81E2A00A150F120A6A00
+0003001BFFF501D40295000F001E00250000011406070623222635343637363332160734
+26232207061514163332373E013723270723373301D439315369464D654F38403E4F5426
+21433D4A2A243D3C222854245289279D31012D397B31534942539E2A1E4B282D315B7173
+2C2F532E81E06868A90000000003001BFFF501EE0270000F001E00320000011406070623
+22263534363736333216073426232207061514163332373E011333062322272623220723
+3E013332171633323601D439315369464D654F38403E4F542621433D4A2A243D3C222852
+1C164912274718240F1D0F2E27203629151417012D397B31534942539E2A1E4B282D315B
+71732C2F532E810164680F1D2F3A3018131300000004001BFFF501DA025E000F001E002A
+0036000001140607062322263534363736333216073426232207061514163332373E0113
+140623222635343633321607140623222635343633321601D439315369464D654F38403E
+4F542621433D4A2A243D3C22285A1D14151C1D15131DC81D14151C1D15131D012D397B31
+534942539E2A1E4B282D315B71732C2F532E810121141D1D15141C1E13141D1D15141C1E
+00030056FFF5024E0205000A000E00190000011406232226353436321613213521071406
+2322263534363216018A22171620202E21C4FE0801F8C422181520202E2101CC16202016
+182122FEF942F31620201618212200000003001CFF7901D5022A001A0024002E00000107
+1E0117161514060706232227072337262726353436333217370703163332373E01353403
+13263122070E01151401AC3A1F230D1444385356080C3D2340271425BA6C0B063725BE0B
+0B4238202AF5BC0A342B313E022A77091A18232B3C823047027E830D15273D73C4017294
+FE78045231823632FEA60185022E3599472800000002002AFFF501DB0298002A00340000
+25170E0123223534370E012235343F01363534262335363717030615143332373E013733
+030615143332360323272635343633321701CD0E303624302D59616A1B230E1627455104
+5903142D612125284A4F130B0C2209208C13141016127709492E302D98926535126E8B3A
+090C0C0E081303FE9D0907199332536EFED54806112001A66A0F1110121700000002002A
+FFF501DB0298002A0033000025170E0123223534370E012235343F013635342623353637
+17030615143332373E01373303061514333236033736321615140F0101CD0E303624302D
+59616A1B230E16274551045903142D612125284A4F130B0C22D6A20A1E1511AB7709492E
+302D98926535126E8B3A090C0C0E081303FE9D0907199332536EFED54806112001A8A00A
+150F120A6A0000000002002AFFF501DB0295002A0031000025170E0123223534370E0122
+35343F01363534262335363717030615143332373E013733030615143332361323270723
+373301CD0E303624302D59616A1B230E16274551045903142D612125284A4F130B0C2229
+245289279D317709492E302D98926535126E8B3A090C0C0E081303FE9D0907199332536E
+FED54806112001A66868A9000003002AFFF501DB025E002A00360042000025170E012322
+3534370E012235343F01363534262335363717030615143332373E013733030615143332
+3613140623222635343633321607140623222635343633321601CD0E303624302D59616A
+1B230E16274551045903142D612125284A4F130B0C222D1D14151C1D15131DC81D14151C
+1D15131D7709492E302D98926535126E8B3A090C0C0E081303FE9D0907199332536EFED5
+4806112001E7141D1D15141C1E13141D1D15141C1E0000000002FFE8FF3201AA02980033
+003C000037173E01353427263534363332161514070E012322263534363332163332373E
+013736353426272E012322073536373637333216273736321615140F01F31543371A1A17
+11161E834E932B171C1710131E0C121E0D33070A3E140E211E100F160A2942040B3D34A2
+0A1E1511ABBA6E6E7320101011161015201757DA819E181311171C210D430B140F1EFB33
+251B04110402080ABAEFA00A150F120A6A0000000002FFB5FF3301D502AB002400340000
+13173633321615140E0123222706151416331523353E0137133F01363534262735363717
+021734232206070E011514163332373E01BD02445E373D588D472121251D23CD201A0972
+440509152C4D4B0547AA3E284B14162B1B15523F1F26014F026C433B4E9860118F16110E
+0F1001182201B2FA13230811090111090E05FEED5A553F33389D1A10155F2E720003FFE8
+FF3201BA025E0033003F004B000037173E01353427263534363332161514070E01232226
+3534363332163332373E013736353426272E012322073536373637333216131406232226
+353436333216071406232226353436333216F31543371A1A1711161E834E932B171C1710
+131E0C121E0D33070A3E140E211E100F160A2942040B3DD41D14151C1D15131DC81D1415
+1C1D15131DBA6E6E7320101011161015201757DA819E181311171C210D430B140F1EFB33
+251B04110402080ABA012E141D1D15141C1E13141D1D15141C1E00000003FFCD00000234
+02F50003001E00210000010721370123353E0135342F012307061514171523353E013701
+33131E0117270B0102180BFED30B0149F52D200214DC3B163EBA222B39011D1A5C0A1C28
+C32D9502F53333FD0B1002181B0812836F29191E03101007326301F0FDD73E2203F60107
+FEF9000000030011FFF501E1021F00030024003200000107213701170E0123223534370E
+0123222635343E013332173F021706070215143332370334262322070E01151433323736
+01E10BFED30B011B0D38351E2817385E352C38578641430D0B033D070105590E0F25471E
+1A443F212C3C3B444D021F3333FE500B442A29195A54493D374C9E663A300307030411FE
+BC270D2901171A205C31782E4A626F000003FFCD00000234035E000C0027002A00000133
+0E012322263533163332361323353E0135342F012307061514171523353E01370133131E
+0117270B0101F61D0B6240433D1D08632E4A4EF52D200214DC3B163EBA222B39011D1A5C
+0A1C28C32D95035E435B4F4F6335FCD01002181B0812836F29191E03101007326301F0FD
+D73E2203F60107FEF900000000030011FFF501E1028A000C002D003B000001330E012322
+2635331633323613170E0123223534370E0123222635343E013332173F02170607021514
+3332370334262322070E0115143332373601C41D0B6240433D1D08632E4A1B0D38351E28
+17385E352C38578641430D0B033D070105590E0F25471E1A443F212C3C3B444D028A435B
+4F4F6335FE130B442A29195A54493D374C9E663A300307030411FEBC270D2901171A205C
+31782E4A626F00000002FFCDFF570272029C002A002D00002123353E0135342F01230706
+1514171523353E01370133131E0117152306151416333237170623222635340B0201B172
+2D200214DC3B163EBA222B39011D1A5C0A1C28570A211A2F241134492837252D95100218
+1B0812836F29191E03101007326301F0FDD73E2203101A1B171E20124D352A2901270107
+FEF9000000020011FF57021101B9002E003C0000051706232226353437263534370E0123
+222635343E013332173F0217060702151433323F01170607061514163332033426232207
+0E0115143332373602001134492837142017385E352C38578641430D0B033D070105590E
+0F251B0D411E0B211A2F6F1E1A443F212C3C3B444D4A124D352A251B0425195A54493D37
+4C9E663A300307030411FEBC270D291D0B50121A1D171E01D31A205C31782E4A626F0000
+00020042FFEE02B1036C000800290000013736321615140F01050727262322070E011514
+33323637170E012322263534363736333217163332370185A20A1E1511AB010925121283
+6D5A3537AF3E67401243814D759066556675453014151B0B02C2A00A150F120A6A2AC803
+A36138A055CD34430F4F468B7A67BB3C491107160002001EFFF501AF02980008002B0000
+133736321615140F0113170E012322263534363736333216151406222635343635342322
+0706151416333236D0A20A1E1511AB6B102E5738474C44374D5A2E3B1C28130F253F2E5B
+2E2B274001EEA00A150F120A6AFE7D0A3A324E4C437D2D3D2E23141C1711091D0A143060
+89363C2600020042FFEE02B1036B00060027000001232707233733170727262322070E01
+151433323637170E012322263534363736333217163332370287245289279D3182251212
+836D5A3537AF3E67401243814D759066556675453014151B0B02C26868A9D3C803A36138
+A055CD34430F4F468B7A67BB3C491107160000000002001EFFF501AB0295000600290000
+0123270723373313170E0123222635343637363332161514062226353436353423220706
+15141633323601AB245289279D310B102E5738474C44374D5A2E3B1C28130F253F2E5B2E
+2B274001EC6868A9FDD60A3A324E4C437D2D3D2E23141C1711091D0A14306089363C2600
+00020042FFEE02B10332000B002C0000011406232226353436333216170727262322070E
+01151433323637170E0123222635343637363332171633323702251D14151C1D15131D8C
+251212836D5A3537AF3E67401243814D759066556675453014151B0B0301141D1D15141C
+1E7CC803A36138A055CD34430F4F468B7A67BB3C491107160002001EFFF501A9025E000B
+002E000001140623222635343633321603170E0123222635343637363332161514062226
+35343635342322070615141633323601711D14151C1D15131D13102E5738474C44374D5A
+2E3B1C28130F253F2E5B2E2B2740022D141D1D15141C1EFE2B0A3A324E4C437D2D3D2E23
+141C1711091D0A14306089363C26000000020042FFEE02B1036B00060027000001072327
+331737170727262322070E01151433323637170E01232226353436373633321716333237
+0287A2305F26598D4F251212836D5A3537AF3E67401243814D759066556675453014151B
+0B036BA9A96969D3C803A36138A055CD34430F4F468B7A67BB3C4911071600000002001E
+FFF501D902950006002900000107232733173703170E0123222635343637363332161514
+06222635343635342322070615141633323601D9A2305F26598D56102E5738474C44374D
+5A2E3B1C28130F253F2E5B2E2B27400295A9A96969FDD60A3A324E4C437D2D3D2E23141C
+1711091D0A14306089363C260003FFF8000002BC036B0006001A002B0000010723273317
+3705213216151407062321353E013713363534262717030615143332373E013534272623
+2206025BA2305F26598DFE4D0115869EA06AB9FEFF2B1B0C7A0B202CB3761644945D343A
+4E2F54201F036BA9A96969DE8C81B17C531008182C01BD271415130135FE5A500F255A32
+9F4F793B230F00000003000FFFF302B902B3000E00360045000001273635342726353436
+333216151427170F010615143332363717062322263534370E0123222635343633321617
+3337363534262735360334262322070E0115141633323E010237094B14191D161921B006
+273C41120D1D280C4D4613160D2B53343239C1631F1D05012D0E162A4D591D122F2C3242
+1F1B2D5C3B01CD1132260E131618141A291E56950698DBEF0714192E0A7218151E3B493B
+3D3877D81C1EA331161008021107FECE1A1F2E35933E2227629800000002FFF8000002BC
+028D0018002C00001321321615140607062B01353E013F01233733373635342627130706
+15143332373E013534262322060F0133078201148B9B564A6EC1F52B1A0C415A0C5A2E0B
+1E2F6C2E16459759333B6C6A2019053F990C028D8984579E38531008172BEC2AA4271914
+1104FEC9A4500F255A3398516C6F0C11E22A00000002000FFFF3024402AB002D003C0000
+010723070615143332363717062322263534370E01232226353436333216173337233733
+3635342627353637170F0134262322070E0115141633323E0102440A543A41120D1D280C
+4D4613160D2B53343239C1631F1D050125B607BB0A162A4D4C061E8D1D122F2C32421F1B
+2D5C3B023027D7EF0714192E0A7218151E3B493B3D3877D81C1E8A272811100802110710
+0675C71A1F2E35933E222762980000000002FFFF0000027A02F500030034000001072137
+050727363534262322060F013332363717072736353427262B0107061514333237363717
+0721353E01371336353426273502540BFED30B01531F16034A762A1A05424E422C1D1244
+140707113D4E20244F814A2638103EFE052B1A0C7B0B1F2E02F53333689A0219152D1C09
+11E9204104E8051F1518070F707F132227144E08A21008172B01BA251B14110410000000
+0003001FFFF501D2021E0003001900230000010721371317062322263534363332161514
+06070614163332362707363736353423220601D20BFED30BC10C58743D4ABB70272B9983
+0A332A213C9811703132232A5B021E3333FE4F0C6C4B3E75C624204268111452321FBB2C
+1B2F3031276100000002FFFF0000027A0362000C003D000001330E012322263533163332
+36170727363534262322060F013332363717072736353427262B01070615143332373637
+170721353E013713363534262735023C1D0B6240433D1D08632E4A4E1F16034A762A1A05
+424E422C1D1244140707113D4E20244F814A2638103EFE052B1A0C7B0B1F2E0362435B4F
+4F6335A79A0219152D1C0911E9204104E8051F1518070F707F132227144E08A21008172B
+01BA251B141104100003001FFFF501D7028A000C0022002C000001330E01232226353316
+333236031706232226353436333216151406070614163332362707363736353423220601
+BA1D0B6240433D1D08632E4A440C58743D4ABB70272B99830A332A213C9811703132232A
+5B028A435B4F4F6335FE110C6C4B3E75C624204268111452321FBB2C1B2F303127610000
+0002FFFF0000027A0332000B003C00000114062322263534363332161707273635342623
+22060F013332363717072736353427262B01070615143332373637170721353E01371336
+353426273501F31D14151C1D15131D871F16034A762A1A05424E422C1D1244140707113D
+4E20244F814A2638103EFE052B1A0C7B0B1F2E0301141D1D15141C1E879A0219152D1C09
+11E9204104E8051F1518070F707F132227144E08A21008172B01BA251B14110410000000
+0003001FFFF5019C025E000B0021002B0000011406232226353436333216031706232226
+353436333216151406070614163332362707363736353423220601671D14151C1D15131D
+010C58743D4ABB70272B99830A332A213C9811703132232A5B022D141D1D15141C1EFE2D
+0C6C4B3E75C624204268111452321FBB2C1B2F30312761000001FFFFFF51027A028D0040
+00002901353E013713363534262735210727363534262322060F01333236371707273635
+3427262B010706151433323736371707230615141633323717062322263534012BFED42B
+1A0C7B0B1F2E01F11F16034A762A1A05424E422C1D1244140707113D4E20244F814A2638
+103EA50D211A2F2411344928371008172B01BA251B141104109A0219152D1C0911E92041
+04E8051F1518070F707F132227144E08A21D1E171E20124D352A2C000002001FFF51019C
+01B90024002E00000517062322263534372E013534363332161514060706141633323637
+1706070615141633320307363736353423220601571134492837173B49BB70272B99830A
+332A213C360C47580A211A2F9B11703132232A5B50124D352A271E014B3D75C624204268
+111452321F2C0C58101A1A171E016C2C1B2F3031276100000002FFFF0000027A036B0006
+0037000001072327331737170727363534262322060F013332363717072736353427262B
+01070615143332373637170721353E013713363534262735025BA2305F26598D441F1603
+4A762A1A05424E422C1D1244140707113D4E20244F814A2638103EFE052B1A0C7B0B1F2E
+036BA9A96969DE9A0219152D1C0911E9204104E8051F1518070F707F132227144E08A210
+08172B01BA251B14110410000003001FFFF501F602950006001C00260000010723273317
+37031706232226353436333216151406070614163332362707363736353423220601F6A2
+305F26598D6B0C58743D4ABB70272B99830A332A213C9811703132232A5B0295A9A96969
+FDD80C6C4B3E75C624204268111452321FBB2C1B2F3031276100000000020034FFEE02D2
+036D0006003800000123270723373313150E010F01062322272E01353436373633321716
+3332371707272627262322070E011514163332373E01373635342F0135028D245289279D
+319D31250B316F7E894C232764536874483E1A1224180F31120322305D754E32386A6047
+22090E101A2F2002C46868A9FDD210031B2ABB3E4C236A3467B63A48180A2205C503402A
+3B633FA052636E22092339571A1D04031000000000040008FF3201D702950006002F003C
+004B00000123270723373313231615140623222726232206151417161514062322263534
+36372635343726353436333217163B010734262322061514163332373603342627262722
+060706151433323601BF245289279D317031097346120D03040D17478E70624E592D481B
+4D4F7A4F3A280B053C771B1D304A201C3223211B3F50180A072F0B147F3B4C01EC6868A9
+FED912213F6503011A0F1812225D4354373527372B101730241C504A611C083927206448
+23283B38FE87232F190704260E1921663700000000020034FFEE02D20362000C003E0000
+01330E0123222635331633323613150E010F01062322272E013534363736333217163332
+371707272627262322070E011514163332373E01373635342F013502781D0B6240433D1D
+08632E4A6A31250B316F7E894C232764536874483E1A1224180F31120322305D754E3238
+6A604722090E101A2F200362435B4F4F6335FE0B10031B2ABB3E4C236A3467B63A48180A
+2205C503402A3B633FA052636E22092339571A1D0403100000040008FF3201DC028A000C
+003500420051000001330E01232226353316333236172316151406232227262322061514
+1716151406232226353436372635343726353436333217163B0107342623220615141633
+32373603342627262722060706151433323601BF1D0B6240433D1D08632E4A2831097346
+120D03040D17478E70624E592D481B4D4F7A4F3A280B053C771B1D304A201C3223211B3F
+50180A072F0B147F3B4C028A435B4F4F6335EE12213F6503011A0F1812225D4354373527
+372B101730241C504A611C08392720644823283B38FE87232F190704260E192166370000
+00020034FFEE02D20332000B003D000001140623222635343633321613150E010F010623
+22272E013534363736333217163332371707272627262322070E011514163332373E0137
+3635342F0135021B1D14151C1D15131DB731250B316F7E894C232764536874483E1A1224
+180F31120322305D754E32386A604722090E101A2F200301141D1D15141C1EFE2B10031B
+2ABB3E4C236A3467B63A48180A2205C503402A3B633FA052636E22092339571A1D040310
+00040008FF3201D7025E000B003400410050000001140623222635343633321617231615
+14062322272623220615141716151406232226353436372635343726353436333217163B
+0107342623220615141633323736033426272627220607061514333236015E1D14151C1D
+15131D7931097346120D03040D17478E70624E592D481B4D4F7A4F3A280B053C771B1D30
+4A201C3223211B3F50180A072F0B147F3B4C022D141D1D15141C1ED212213F6503011A0F
+1812225D4354373527372B101730241C504A611C08392720644823283B38FE87232F1907
+04260E192166370000020034FEF502D2029A00310040000001150E010F01062322272E01
+3534363736333217163332371707272627262322070E011514163332373E01373635342F
+013503273635342726353436333216151402D231250B316F7E894C232764536874483E1A
+1224180F31120322305D754E32386A604722090E101A2F20C4094B15181D161921013F10
+031B2ABB3E4C236A3467B63A48180A2205C503402A3B633FA052636E22092339571A1D04
+0310FDB61232260B14151A141A291E5700040008FF3201D702D4000E0037004400530000
+011706151417161514062322263534132316151406232227262322061514171615140623
+2226353436372635343726353436333217163B0107342623220615141633323736033426
+2726272206070615143332360182094B14191D161921D731097346120D03040D17478E70
+624E592D481B4D4F7A4F3A280B053C771B1D304A201C3223211B3F50180A072F0B147F3B
+4C02D41132270D131617141B281F57FEE212213F6503011A0F1812225D4354373527372B
+101730241C504A611C08392720644823283B38FE87232F190704260E192166370002FFF8
+00000301036B0006003A00000123270723373317150E01070306151416171521353E013F
+01210706151416171523353E01371336353426273521150E010F01213736353426273502
+73245289279D31E62C1C0C84031E31FEEE33290A40FEE34203192DF5291F0E760C1D3001
+0F2D2D0A36011D2E0E202802C26868A9DE1008182AFE1F0C0C1510051010042227E9F40A
+0C161006101004203201AE2E12150F051010032024C6A4340B1314031000000000020013
+FFF701DE036B0006003400000123270723373313170E0123222635343F01363534232206
+070E010723133634262B0135363717033633321615140706151433323601BF245289279D
+316A0D2E3E2614181437071C1B55281F241D4B920D1A0F1B4C510779826421203021100C
+1D02C26868A9FD0B0D41311713114BCF1C0519503C305B6F022A32180D0F091206FE41D3
+251E2B966518121D0002FFF800000301028D0039003D000001150E010F01330723030615
+1416171521353E013F01210706151416171523353E01371323373336353426273521150E
+010F01213635342627351721072103012C1C0C0C580C586C031E31FEEE33290A40FEE342
+03192DF5291F0E66670C67101D30010F2D2C0B0D011E1220282AFEE21D011D028D100818
+2A2B2CFE760C0C1510051010042227E9F40A0C161006101004203201762C3913150F0510
+100320242E3E0D13140310B16C00000000010013FFF701DE02AB0034000025170E012322
+2635343F01363534232206070E010723132337333634262B013536371707330723033633
+321615140706151433323601D10D2E3E2614181437071C1B55281F241D4B843F0F3E0D1A
+0F1B4C5107219F0F9F49826421203021100C1D760D41311713114BCF1C0519503C305B6F
+01F43632180D0F0912067B36FEF2D3251E2B966518121D000002FFF8000001BC03440013
+002B000001330623222726232207233E013332171633323607150E010703061514161715
+23353E01371336353426273501A01C164912274718240F1D0F2E27203629151417182A1B
+0D780F192CF42A1F0B780D20280344680F1D2F3A301813139E10051A2EFE533517140E05
+1010081A2901B92E10141502100000000002001EFFF5016502700013002D000001330623
+222726232207233E013332171633323603170E01232235343F0136353426273536371703
+06151433323601491C164912274718240F1D0F2E27203629151417640E293C2532183009
+16292C73056009100C240270680F1D2F3A30181313FE1C0C3F3339145AAF220B0F080110
+031603FEAA220B0F230000000002FFF8000001B702F50003001B00000107213717150E01
+070306151416171523353E01371336353426273501B70BFED30BF62A1B0D780F192CF42A
+1F0B780D202802F533336810051A2EFE533517140E051010081A2901B92E101415021000
+0002001DFFF50155021F0003001D00000107213713170E01232235343F01363534262735
+3637170306151433323601550BFED30BB50E293C253218300916292C73056009100C2402
+1F3333FE540C3F3339145AAF220B0F080110031603FEAA220B0F23000002FFF8000001C0
+0362000C0024000001330E0123222635331633323607150E01070306151416171523353E
+01371336353426273501A31D0B6240433D1D08632E4A132A1B0D780F192CF42A1F0B780D
+20280362435B4F4F6335A710051A2EFE533517140E051010081A2901B92E101415021000
+0002002EFFF5015B028A000C0026000001330E0123222635331633323603170E01232235
+343F0136353426273536371703061514333236013E1D0B6240433D1D08632E4A510E293C
+253218300916292C73056009100C24028A435B4F4F6335FE170C3F3339145AAF220B0F08
+0110031603FEAA220B0F23000001FFF8FF570180028D002700003323353E013713363534
+26273533150E0107030615141617152306151416333237170623222635345E662A1F0B78
+0D2028F72A1B0D780F192C620A211A2F24113449283710081A2901B92E10141502101005
+1A2EFE533517140E05101A1B171E20124D352A2900020031FF57012F028E002700320000
+17232235343F013635342627353637170306151433323717060706151416333237170623
+22263534131406232226353436321666043116300917292E72045E0A0E193B0D2E1E0F21
+1A2F241134492837B51D14161A1B281E0B371D52B1200C0F080110041503FEA9220A0F4E
+0B47161E21171E20124D352A23027E151E1D18171E2100000002FFF8000001800332000B
+0023000001140623222635343633321617150E01070306151416171523353E0137133635
+3426273501581D14151C1D15131D282A1B0D780F192CF42A1F0B780D20280301141D1D15
+141C1E8710051A2EFE533517140E051010081A2901B92E10141502100001002FFFF500EB
+01B90019000037170E01232235343F0136353426273536371703061514333236DD0E293C
+253218300916292C73056009100C24730C3F3339145AAF220B0F080110031603FEAA220B
+0F2300000002FFF8FFEE030F028D001D0035000001150E0107030E012322263534363216
+151406151432371336353426273523150E01070306151416171523353E01371336353426
+2735030F2B1A0D671D5452354019281F0346127F0C1E2F912A1B0D780F192CF42A1F0B78
+0D2028028D1006172DFE91686E302818201B13061104274001C62B151411041010051A2E
+FE533517140E051010081A2901B92E101415021000040031FF3101F4028E000B00160035
+004E0000011406232226353436333216071406232226353436321617030E012322263534
+36333215140615143332363713363534262B0135363703170E01232235343F0136353426
+273536371703061514333201F41E14171F2015141FEC1D14161A1B281ECB681F5B41232C
+1811270C121E291A4810151B1A2D7CF10D2A3A253116300917292E72045E0A0E19025614
+1E1D17161E2114151E1D18171E21B7FE667972221B121A250C0F070C4E680124410F110E
+100316FEB90B4131371D52B1200C0F080110041503FEA9220A0F00000002FFFAFFEE0218
+036D0006002300000123270723373317150E0107030E0123222635343632161514061514
+32371336342627350218245289279D312B2B1A0D671D5452354019281F0346127F0C1E2F
+02C46868A9E01006172DFE91686E302818201B13061104274001C62C281104100002FF84
+FF31016102950006002500000123270723373307030E0123222635343633321514061514
+3332363713363534262B013536370161245289279D3113681F5B41232C1811270C121E29
+1A4810151B1A2D7C01EC6868A9DFFE667972221B121A250C0F070C4E680124410F110E10
+0316000000020007FEF502D2028D0035004400000115220705131E011715213537363534
+2E032F010706151416171523353E01371336353426273521150E010F01373635342F0135
+01273635342726353436333216151402D21C31FED6A817222FFEED1D2E030A0610027B41
+0B1D2AF72B1A0C7C0E222D010E2A2E0B35998F2418FEDE094B15181D161921028D1025E1
+FEDB281505101003041C060E130B1C04D7ED260D171104101005182A01BD320C15140210
+10031F28C26D65240F040310FC681232260B14151A141A291E5700000002000EFEF501CD
+02AB00290038000001150E010717163332373637170E012322262726270F012313363726
+2B013536371703373635342B013503273635342726353436333216151401CD24506D2537
+1A1518050A0F232E1E1623181E1E28304B8D0E040330124B5206782B8F250EC5094B1518
+1D16192101AC1002376158812A08120B3F2E232F3A5320B4021032261810091206FE3821
+6E1E1210FD491232260B14151A141A291E570000000100050000025901CB004800001337
+363736373E01333216151406222E01232207060716171E01171E0117072326272E012726
+27062307061514161707233732373637133635342E062337330706070607F32A23222526
+1824281A2E1E26170D0815102A380F0B0A23040D3C22048226130915030F09280E2B0421
+1F05F1052E11140A5004030308060E07130504F1042E10130B01140403191A3E27181C18
+121714131E4A2306100F7A09202B080F192F16520C300602A20D0E140E0110100B0B2701
+310F0D0609070403020101101002090B280000000002FFF80000022F036C000800260000
+013736321615140F01010721353E01371336353426273521150E01070306151416333236
+3736370104A20A1E1511AB01083AFE032A1A0E7A0B1F2E01112E2B0C780A2C3D4D432429
+2902C2A00A150F120A6AFDF2B410041A3001B62519161203101003202AFE53261017120E
+181B550000020029FFF5015C036C000800220000133736321615140F0117030615143332
+3F01170E012322353437133635342B013536377DA20A1E1511AB779908111B28190E2D41
+29310489033112465502C2A00A150F120A6A1CFDB71D0E1239230A473638110D020C0A09
+161008130002FFF8FEF5022F028D001D002C0000250721353E0137133635342627352115
+0E01070306151416333236373637012736353427263534363332161514022F3AFE032A1A
+0E7A0B1F2E01112E2B0C780A2C3D4D43242929FE85094B15181D161921B4B410041A3001
+B62519161203101003202AFE53261017120E181B55FE3B1232260B14151A141A291E5700
+00020007FEF5011702AB001900280000010306151433323F01170E012322353437133635
+342B0135363701273635342726353436333216151401179908111B28190E2D4129310489
+0331124655FEFF094B15181D16192102A6FDB71D0E1239230A473638110D020C0A091610
+0813FC4A1232260B14151A141A291E570002FFF800000253029A000E002C000001273635
+3427263534363332161514030721353E01371336353426273521150E0107030615141633
+323637363701D1094B14191D161921243AFE032A1A0E7A0B1F2E01112E2B0C780A2C3D4D
+4324292901B41132260E131618141A291E56FEB7B410041A3001B6251916120310100320
+2AFE53261017120E181B550000020029FFF501C002B5000E002800000127363534272635
+34363332161514270306151433323F01170E012322353437133635342B01353637013E09
+4B14191D161921A99908111B28190E2D4129310489033112465501CF1132260E13161814
+1A291E568EFDB71D0E1239230A473638110D020C0A091610081300000002FFF80000022F
+028D000A002800000114062322263534363216170721353E01371336353426273521150E
+0107030615141633323637363701CB22171620202E21643AFE032A1A0E7A0B1F2E01112E
+2B0C780A2C3D4D43242929015116202016182122B4B410041A3001B62519161203101003
+202AFE53261017120E181B5500020029FFF5018202AB000A002400000114062322263534
+3632160B0106151433323F01170E012322353437133635342B0135363701822217162020
+2E216B9908111B28190E2D41293104890331124655015116202016182122013EFDB71D0E
+1239230A473638110D020C0A09161008130000000001FFF80000022F028D002500002507
+21353E013F01073F02363534262735211522060F01370F0206151416333236373637022F
+3BFE04291E0C34630D63380B1F2F01112C2C0A338F0E8E36112E345049232A2AB4B41005
+1C2CBF3B303BC8251916100510102123B5553153C33B0F13110D171B5700000000010025
+FFF5013302AB00200000010F010306151433323F01170E01232235343F01073F01363534
+2B01353637170301330C6248070F1A2B1A0D313F27311034480C484131144953064601CC
+2E32FEED180E13392209493438103BC2242E24F20E1810091206FEF50002FFECFFF102D7
+036C0008002B0000013736321615140F0105150E030703230B0106151416171523353E01
+3713262335331B013635342627350169A20A1E1511AB014B1B15190D109212E672091F27
+C62B241B75173FA0CF6A081B2A02C2A00A150F120A6A35100607232A37FE050226FE5A1F
+17151303101006335F019F3610FE0D01841C101B140410000002000EFFF701DA02980008
+003A0000133736321615140F0113170E0123222635343F01363534232206070E01072313
+3635342627353E013717073E0133321615140F0106151433323736B4A20A1E1511ABF50E
+333623141B102C0E181D4532211F244B60021B2627601B04434A6C311F220A380E10132A
+0701EEA00A150F120A6AFE870D462B1B1B103BA236191D4549314E79015E0A070F0B0110
+08110602DA7666211C1923CB320B1235080000000002FFECFEF502D7028D002200310000
+01150E030703230B0106151416171523353E013713262335331B01363534262735012736
+35342726353436333216151402D71B15190D109212E672091F27C62B241B75173FA0CF6A
+081B2AFEA5094B15181D161921028D100607232A37FE050226FE5A1F1715130310100633
+5F019F3610FE0D01841C101B140410FC681232260B14151A141A291E570000000002000E
+FEF501DA01B900310040000025170E0123222635343F01363534232206070E0107231336
+35342627353E013717073E0133321615140F010615143332373601273635342726353436
+333216151401CC0E333623141B102C0E181D4532211F244B60021B2627601B04434A6C31
+1F220A380E10132A07FEAD094B15181D161921750D462B1B1B103BA236191D4549314E79
+015E0A070F0B011008110602DA7666211C1923CB320B123508FE921232260B14151A141A
+291E57000002FFECFFF102D7036B0006002900000107232733173717150E030703230B01
+06151416171523353E013713262335331B01363534262735027BA2305F26598D811B1519
+0D109212E672091F27C62B241B75173FA0CF6A081B2A036BA9A96969DE100607232A37FE
+050226FE5A1F17151303101006335F019F3610FE0D01841C101B1404100000000002000E
+FFF701DB02950006003800000107232733173713170E0123222635343F01363534232206
+070E010723133635342627353E013717073E0133321615140F010615143332373601DBA2
+305F26598D160E333623141B102C0E181D4532211F244B60021B2627601B04434A6C311F
+220A380E10132A070295A9A96969FDE00D462B1B1B103BA236191D4549314E79015E0A07
+0F0B011008110602DA7666211C1923CB320B1235080000000002003AFFF7021C02B3000E
+0040000013273635342726353436333216151401170E0123222635343F01363534232206
+070E010723133635342627353E013717073E0133321615140F010615143332373643094B
+14191D16192101490E333623141B102C0E181D4532211F244B60021B2627601B04434A6C
+311F220A380E10132A0701CD1132260E131618141A291E56FE5F0D462B1B1B103BA23619
+1D4549314E79015E0A070F0B011008110602DA7666211C1923CB320B123508000001FFF8
+FFEE02BC029A0039000001073E0133321615140E03232226353436333216151406151432
+3E043534232207030615143B011523353E013713363534262B01350149223B6F3E545916
+364D7A4A282F2D22161F0E18202E2B27176665765A0B370EF42B1B0C7B0A1E2806028D78
+4A3B7B6039797E623F2A2024312415092204120B1C3A508350D5BBFEBE25112910100818
+2C01BE26151414100001000EFF3001BA01B90033000013073E01333216151407030E0123
+2226353436333215140615143332363713363534232206070E010723133635342627353E
+0137D5434A6C311F220A4D205A41222D1811270C121E291A4811181D45322120234B6002
+1B2627601B01B7DA7666211C1923FEDC7B71231B121A250C0F070D4F68012544031D4549
+324F77015E050C0F0B011008110600000003003CFFEE02BB02F500030013002300000107
+2137011406070623222635343637363336160734262322070E011514163332373E01029A
+0BFED30B014E735C696D6377624F707D6B7669453C6357353D433F5C4E3B4602F53333FE
+AD6BC43E477C6E5BC1456101863447517548B64E52575F4AD60000000003001BFFF501FF
+021F00030013002200000107213705140607062322263534363736333216073426232207
+061514163332373E0101FF0BFED30B010239315369464D654F38403E4F542621433D4A2A
+243D3C2228021F3333F2397B31534942539E2A1E4B282D315B71732C2F532E810003003C
+FFEE02C50362000C001C002C000001330E01232226353316333236131406070623222635
+343637363336160734262322070E011514163332373E0102A81D0B6240433D1D08632E4A
+23735C696D6377624F707D6B7669453C6357353D433F5C4E3B460362435B4F4F6335FE6E
+6BC43E477C6E5BC1456101863447517548B64E52575F4AD60003001BFFF50215028A000C
+001C002B000001330E012322263533163332360314060706232226353436373633321607
+3426232207061514163332373E0101F81D0B6240433D1D08632E4A1439315369464D654F
+38403E4F542621433D4A2A243D3C2228028A435B4F4F6335FED1397B31534942539E2A1E
+4B282D315B71732C2F532E810004003CFFEE02D0036C0009001300230033000001373633
+321615140F0123373633321615140F010114060706232226353436373633361607342623
+22070E011514163332373E0101F1A00A110F1511ABCDA00A110F1511A9014F735C696D63
+77624F707D6B7669453C6357353D433F5C4E3B4602C2A00A150F140A68A00A150F140A68
+FEE06BC43E477C6E5BC1456101863447517548B64E52575F4AD600000004001BFFF5021D
+02980009001300230032000001373633321615140F0123373633321615140F0105140607
+062322263534363736333216073426232207061514163332373E01013EA00A110F1511AB
+CDA00A110F1511A9011B39315369464D654F38403E4F542621433D4A2A243D3C222801EE
+A00A150F140A68A00A150F140A68C1397B31534942539E2A1E4B282D315B71732C2F532E
+8100000000020031FFF803C4029A0033004400000107233427262B01220F01323E013717
+0727372E012F01070615141633323637170721220623220623222635343E013332171633
+0313363534262322070E0115143332373603C41F100C125A601C09405342281512421406
+0125393E380B202B6D733C1041FEA60C433413360862816DB766243E25118949153B2D4A
+3E445790441F1F028D9641142020E30B243004E6022A22160303CC2B0C1410385306A605
+03856472CD7A0805FE3A010C4D0B222D363BD56AB227250000030014FFF4028601B90026
+0033004300002517062322270E0123222635343E01333216173E013332161514070E0107
+0607061514163332361334262322070E01073E0137362734262322070E01151416333237
+3E0102510B6B5A4523263D273F5252813F283B0D344229262B461E5F201F050A2A211C3A
+2E121022241D2413412F1735ED201B2821303C241F31281D37690B6A44261D524046905C
+2B252F2124203D3015250302112224252F1E013E11152720433F141614301B1E2423349D
+4A2B303C2BB900000003FFF30000024C036C0008002C00370000013736321615140F0233
+32161514070607171E0133152303270706151416171523353E0137133635342726271707
+1633323635342623220121A20A1E1511ABC0FC616B42275C59112521937B42370D1A29F3
+28210C770C0E0C2DAE3F1F1459643E3A3102C2A00A150F120A6A354C414E321E15EB2E24
+10014405CB2E11171404101005222E01AF2E11120A08062CE3055046343C00000002002D
+0000019C0298000800270000133736321615140F01033736373633321614062322272623
+22070E01072313363534232207353717B4A20A1E1511AB2710223C2B24151A1916131008
+081B372229244C51102608179B0301EEA00A150F120A6AFEF1234B3F2D1C2E1F1A0E5E3A
+677901243B171A03111B02000003FFF3FEF5024C028D0023002E003D0000133332161514
+070607171E0133152303270706151416171523353E013713363534272627170716333236
+353426232203273635342726353436333216151484FC616B42275C59112521937B42370D
+1A29F328210C770C0E0C2DAE3F1F1459643E3A3189094B15181D161921028D4C414E321E
+15EB2E2410014405CB2E11171404101005222E01AF2E11120A08062CE3055046343CFC86
+1232260B14151A141A291E570002FFFEFEF5019C01B9001E002D00003F01363736333216
+1406232227262322070E0107231336353423220735371703273635342726353436333216
+1514B010223C2B24151A1916131008081B372229244C51102608179B03E0094B15181D16
+1921DF234B3F2D1C2E1F1A0E5E3A677901243B171A03111B02FD3E1232260B14151A141A
+291E57000003FFF30000024C036B0006002A003500000107232733173705333216151407
+0607171E0133152303270706151416171523353E01371336353427262717071633323635
+34262322023EA2305F26598DFE6BFC616B42275C59112521937B42370D1A29F328210C77
+0C0E0C2DAE3F1F1459643E3A31036BA9A96969DE4C414E321E15EB2E2410014405CB2E11
+171404101005222E01AF2E11120A08062CE3055046343C000002002D000001AA02970006
+002500000107232733173703373637363332161406232227262322070E01072313363534
+23220735371701AAA2305F26598DD510223C2B24151A1916131008081B372229244C5110
+2608179B030297A9A96969FE48234B3F2D1C2E1F1A0E5E3A677901243B171A03111B0200
+00020011FFEE01FC036C0008003E0000133736321615140F011707273426232206151416
+171E0115140623222726232207233717061514163332363534262F012E01272E01353436
+33321716323637ECA20A1E1511ABED28123245343C2043432E73572642200F210A122214
+02513F3A491A2227031C082D1E674B34211D22120A02C2A00A150F120A6A27C803535035
+2F263343445232556E170C20E002090E495E47392135252A031F08303D294C580E0B0A10
+00020010FFF301930298000800320000133736321615140F011707232623220615141716
+15140623222726232207233733163332363534272635343633321716333237B4A20A1E15
+11AB9714100E4B1B203644513F1D1A1517140910141014502428383F42371424160E140A
+01EEA00A150F120A6A348C741E1B26404F393D490A09159F8828252D464F34323A0A0712
+00020011FFEE01FC036D0006003C0000012327072337331707273426232206151416171E
+0115140623222726232207233717061514163332363534262F012E01272E013534363332
+171632363701E4245289279D317028123245343C2043432E73572642200F210A12221402
+513F3A491A2227031C082D1E674B34211D22120A02C46868A9D2C8035350352F26334344
+5232556E170C20E002090E495E47392135252A031F08303D294C580E0B0A100000020010
+FFF301810295000600300000012327072337331707232623220615141716151406232227
+262322072337331633323635342726353436333217163332370181245289279D31451410
+0E4B1B203644513F1D1A1517140910141014502428383F42371424160E140A01EC6868A9
+DB8C741E1B26404F393D490A09159F8828252D464F34323A0A07120000010011FF2701FC
+029B004C00001737262726232207233717061514163332363534262F012E01272E013534
+36333217163236373307273426232206151416171E011514060F01363332161514062322
+27371633323534262322079D321D35200F210A12221402513F3A491A2227031C082D1E67
+4B34211D22120A1728123245343C2043432E6A52200F0A262C4334263711291B351A140C
+14604F04120C20E002090E495E47392135252A031F08303D294C580E0B0A10C803535035
+2F263343445232516C053103251F2630151D0F291319070000010010FF27016E01BA0040
+000017372627262322072337331633323635342726353436333217163332373307232623
+2206151417161514060F01363332161514062322273716333235342623220750360B1215
+17140910141014502428383F42371424160E140A0E14100E4B1B2036444A3B250F0A262C
+4334263711291B351A140C146057010709159F8828252D464F34323A0A07128C741E1B26
+404F393A48043703251F2630151D0F291319070000020011FFEE0214036B0006003C0000
+010723273317371707273426232206151416171E01151406232227262322072337170615
+14163332363534262F012E01272E01353436333217163236370214A2305F26598D0D2812
+3245343C2043432E73572642200F210A12221402513F3A491A2227031C082D1E674B3421
+1D22120A036BA9A96969D0C8035350352F263343445232556E170C20E002090E495E4739
+2135252A031F08303D294C580E0B0A1000020010FFF301AA029700060030000001072327
+3317370F0123262322061514171615140623222726232207233733163332363534272635
+34363332171633323701AAA2305F26598D1714100E4B1B203644513F1D1A151714091014
+1014502428383F42371424160E140A0297A9A96969DD8C741E1B26404F393D490A09159F
+8828252D464F34323A0A07120001003BFF270279028D003200003323353E013713220607
+27372107273635342B0103061514161F0115230736333216151406232227371633323534
+2623220727B372342C0B8F775324122A02142C1103653A890E161F23882C0F0A262C4334
+263711291B351A140C140910051E28020F2B51049BA402191551FE163111171103031042
+03251F2630151D0F29131907080000000002FFDAFF270128022200210039000001072303
+06151433323637170E01232235343713232734373E013736333215140F01030736333216
+1514062322273716333235342623220727370128055457020F0C20250D2E3B262E104E4B
+012119521A060809011C692C0F0A262C4334263711291B351A140C14093C01AC20FEB808
+06101F30074633250A4001280612070641270908050267FE544203251F2630151D0F2913
+190708600002003B00000279036B000600210000010723273317371707273635342B0103
+061514161F011521353E01371322060727370235A2305F26598D692C1103653A890E161F
+23FEE0342C0B8F775324122A036BA9A96969DEA402191551FE163111171103031010051E
+28020F2B51049B0000020026FFF501C502B5000E00300000012736353427263534363332
+1615140F01230306151433323637170E01232235343713232734373E013736333215140F
+010143094B14191D1619219D055457020F0C20250D2E3B262E104E4B012119521A060809
+011C01CF1132260E131618141A291E566C20FEB80806101F30074633250A400128061207
+06412709080502670001003B00000279028D002200000107273635342B01033307230706
+1514161F011521353E013F0123373313220607273702792C1103653A4C820C82310E161F
+23FEE0342C0B39730C734A775324122A028DA402191551FEF12CAF311117110303101005
+1E28D42C010F2B51049B00000001001CFFF5012802220029000001072307330723070615
+1433323637170E01232235343F0123373337232734373E013736333215140F0101280554
+24620C6128020F0C20250D2E3B262E101F390C38244B012119521A060809011C01AC2086
+2C960806101F30074633250A40762C8606120706412709080502670000020066FFEE02FD
+034400130040000001330623222726232207233E013332171633323617150E0407030607
+06222635343F0136353426273521150E010F01061514163332363F013635342627350271
+1C164912274718240F1D0F2E27203629151417941515140F0E0D53223F3CC47B2C340923
+2D011033270E3F284F3B54662240171E280344680F1D2F3A301813139E1005090D242A2C
+FEE37435345C4837A1BD200D1414011010052234E28D2635416C7CE95512161404100000
+0002002AFFF501DB02700013003E000001330623222726232207233E0133321716333236
+13170E0123223534370E012235343F01363534262335363717030615143332373E013733
+0306151433323601BC1C164912274718240F1D0F2E27203629151417190E303624302D59
+616A1B230E16274551045903142D612125284A4F130B0C220270680F1D2F3A30181313FE
+2009492E302D98926535126E8B3A090C0C0E081303FE9D0907199332536EFED548061120
+00020066FFEE02FD02F50003003000000107213705150E040703060706222635343F0136
+353426273521150E010F01061514163332363F01363534262735028B0BFED30B019F1515
+140F0E0D53223F3CC47B2C3409232D011033270E3F284F3B54662240171E2802F5333368
+1005090D242A2CFEE37435345C4837A1BD200D1414011010052234E28D2635416C7CE955
+12161404100000000002002AFFF501DB021F0003002E00000107213701170E0123223534
+370E012235343F01363534262335363717030615143332373E0137330306151433323601
+C80BFED30B01320E303624302D59616A1B230E16274551045903142D612125284A4F130B
+0C22021F3333FE5809492E302D98926535126E8B3A090C0C0E081303FE9D090719933253
+6EFED5480611200000020066FFEE02FD0362000C0039000001330E012322263533163332
+3617150E040703060706222635343F0136353426273521150E010F01061514163332363F
+0136353426273502811D0B6240433D1D08632E4A8C1515140F0E0D53223F3CC47B2C3409
+232D011033270E3F284F3B54662240171E280362435B4F4F6335A71005090D242A2CFEE3
+7435345C4837A1BD200D1414011010052234E28D2635416C7CE95512161404100002002A
+FFF501E0028A000C0037000001330E0123222635331633323613170E0123223534370E01
+2235343F01363534262335363717030615143332373E0137330306151433323601C31D0B
+6240433D1D08632E4A1A0E303624302D59616A1B230E16274551045903142D612125284A
+4F130B0C22028A435B4F4F6335FE1B09492E302D98926535126E8B3A090C0C0E081303FE
+9D0907199332536EFED548061120000000030066FFEE02FD038B000A0015004200000014
+062322263534363332163426232206151416333217150E040703060706222635343F0136
+353426273521150E010F01061514163332363F01363534262735024E3B292B393A292A19
+271C1A27251C1DF71515140F0E0D53223F3CC47B2C3409232D011033270E3F284F3B5466
+2240171E280350523A3A2A283B803826271A1C26591005090D242A2CFEE37435345C4837
+A1BD200D1414011010052234E28D2635416C7CE955121614041000000003002AFFF501DB
+02B3000A0015004000000014062322263534363332163426232206151416333213170E01
+23223534370E012235343F01363534262335363717030615143332373E01373303061514
+333236019A3B292B393A292A19271C1A27251C1D7B0E303624302D59616A1B230E162745
+51045903142D612125284A4F130B0C220278523A3A2A283B803826271A1C26FE6909492E
+302D98926535126E8B3A090C0C0E081303FE9D0907199332536EFED54806112000030066
+FFEE02FD036C000900130040000001373633321615140F0123373633321615140F010515
+0E040703060706222635343F0136353426273521150E010F01061514163332363F013635
+3426273501CDA00A110F1511ABCDA00A110F1511A901B51515140F0E0D53223F3CC47B2C
+3409232D011033270E3F284F3B54662240171E2802C2A00A150F140A68A00A150F140A68
+351005090D242A2CFEE37435345C4837A1BD200D1414011010052234E28D2635416C7CE9
+55121614041000000003002AFFF501FF029800090013003E000001373633321615140F01
+23373633321615140F0101170E0123223534370E012235343F0136353426233536371703
+0615143332373E013733030615143332360120A00A110F1511ABCDA00A110F1511A90132
+0E303624302D59616A1B230E16274551045903142D612125284A4F130B0C2201EEA00A15
+0F140A68A00A150F140A68FE8909492E302D98926535126E8B3A090C0C0E081303FE9D09
+07199332536EFED54806112000010066FF5702FD028D003D000005170623222635343706
+23222635343F0136353426273521150E010F01061514163332363F013635342627353315
+0E040703060706070614163332022411344928370F180D627B2C3409232D011033270E3F
+284F3B54662240171E28C61515140F0E0D53223F1F2309211A2F4A124D352A1F1B025C48
+37A1BD200D1414011010052234E28D2635416C7CE95512161404101005090D242A2CFEE3
+74351A0C1A2E1E000001002AFF57021A01B9003900000523223534370E012235343F0136
+3534262335363717030615143332373E0137330306151433323637170607061514163332
+3717062322263534015201302D59616A1B230E16274551045903142D612125284A4F130B
+0C22250E331F0E211A2F24113449283709302D98926535126E8B3A090C0C0E081303FE9D
+0907199332536EFED54806112031094E181D20171E20124D352A240000020047FFEE038A
+036D0006003500000123270723373305150E0107012303230323032E012726273533150E
+011514171B01272E01273533150E01151416151B0136353427350283245289279D31015F
+1D1B15FED3143205DE133D080A0B0A29EB291F012CAC08041B2CEC271D0228BC174302C4
+6868A9E010091A28FDBC01C5FE3B0202462D0B0A05101004141B0D07FE6C015C41261602
+1010041418030B01FE64016D2C182901100000000002000FFFEE028802950006003C0000
+0123270723373307133E0135342726353436333216151403070623222703070607062322
+262F0126272E012B013536373E02333216171617133633320219245289279D312E206342
+16151710161ED409230A08031D591720310F0704020408130711171C4F10050D08030806
+051907C006070801EC6868A9EBFEA07B69200E1514150C1320185BFEFE0B2B2301369826
+3D5E121D5BA44E1B0F0D0D040104020A1878A101300A00000002004E00000279036D0006
+002D00000123270723373317150E01070307061514161F011521353E013F01032E012735
+33150E01141F01373635342F01350219245289279D31B815161BDB241E171E24FEDF332B
+0D3B4C0B1929EF2C1C241F2795281D02C46868A9E010071521FEF27B6718131002031010
+031F2FCD010B2816061010040F227F6E2EB02518040310000002FFE8FF3201AA02950006
+003A00000123270723373303173E01353427263534363332161514070E01232226353436
+3332163332373E013736353426272E012322073536373637333216018E245289279D3143
+1543371A1A1711161E834E932B171C1710131E0C121E0D33070A3E140E211E100F160A29
+42040B3D01EC6868A9FE256E6E7320101011161015201757DA819E181311171C210D430B
+140F1EFB33251B04110402080ABA00000003004E000002790332000B0017003E00000114
+0623222635343633321607140623222635343633321605150E01070307061514161F0115
+21353E013F01032E01273533150E01141F01373635342F0135021B1D14151C1D15131DC8
+1D14151C1D15131D012615161BDB241E171E24FEDF332B0D3B4C0B1929EF2C1C241F2795
+281D0301141D1D15141C1E13141D1D15141C1E8710071521FEF27B671813100203101003
+1F2FCD010B2816061010040F227F6E2EB0251804031000000002FFFA0000025E036C0008
+001E0000013736321615140F01050133323637363717072135012322070E010727372101
+29A20A1E1511AB0112FE1DA1474B1B29241336FE0701DFAB6628161517132D01E602C2A0
+0A150F120A6A43FDA50C141E4A03A90E025B1B0F1F2B05930002FFFEFFAF018602980008
+002D0000133736321615140F0117011E011716333235342726353E013332161514062322
+2726232207270123220607273721A7A20A1E1511ABB2FEDF2E2D1D22241B050801140C10
+1334292A47442517160901368828240F1020011B01EEA00A150F120A6A4DFEA80A1E2B32
+0F050A100C0D1514111F2D2C2A12090174172504740000000002FFFA0000025E0332000B
+00210000011406232226353436333216170133323637363717072135012322070E010727
+3721018F1D14151C1D15131DCFFE1DA1474B1B29241336FE0701DFAB6628161517132D01
+E60301141D1D15141C1E95FDA50C141E4A03A90E025B1B0F1F2B05930002FFFEFFAF017C
+025E000B0030000001140623222635343633321617011E011716333235342726353E0133
+32161514062322272623220727012322060727372101211D14151C1D15131D5BFEDF2E2D
+1D22241B050801140C101334292A47442517160901368828240F1020011B022D141D1D15
+141C1E9FFEA80A1E2B320F050A100C0D1514111F2D2C2A1209017417250474000002FFFA
+0000025E036B0006001C000001072327331737170133323637363717072135012322070E
+01072737210201A2305F26598D82FE1DA1474B1B29241336FE0701DFAB6628161517132D
+01E6036BA9A96969ECFDA50C141E4A03A90E025B1B0F1F2B059300000002FFFEFFAF01AA
+02970006002B00000107232733173707011E011716333235342726353E01333216151406
+2322272623220727012322060727372101AAA2305F26598D09FEDF2E2D1D22241B050801
+140C101334292A47442517160901368828240F1020011B0297A9A96969F6FEA80A1E2B32
+0F050A100C0D1514111F2D2C2A12090174172504740000000001000D0000020102AB0021
+000013333637363332161514062322272623220703061514171617072137363736371323
+A41B0C103F7F284018101C11181D39136403090D3A03FEFC0332131509451B01C239258B
+1F200F19212A5BFE24100D14090D020F0F030D0F2C01480000020017FFF501D902AB0022
+0030000013073E0133321615140E012322263D01132337333736342627353637170E010F
+01330717342322070E0115143332373E01DF3C33593634405E974B2E547D7B0D76090913
+2D4B4E05030E0410A2080346454420282E42392E4001FDDB534440384D9C6320150601CD
+1F1F1F20070211090E050B3A0D381FCB567336832E223B30850000000001001EFFF50241
+02240033000025170E0123222635343637363332173E01333216151423222E0223220F01
+161514062226353436353423220706151416333236015E102E5738474C44374D5A1C150F
+49321B2B190E1006110E29140A0B1C28130F253F2E5B2E2B27406B0A3A324E4C437D2D3D
+09353F201A1C131713532B1015141C1711091D0A14306089363C260000010042FFFA029F
+02AC003A000025170E0223222E01353436372E0135343E023332171E011514062322272E
+0123220615141633323633321615140623222623220615143332360233220F65783E3B63
+4B714A312E3C5F69323634253C1A152D13073E17547A283709530B101F35150842064A6D
+A5595EA809364E211841324A840D1A2D263758341C100B3D211725511A1E695825210B0F
+0E121805634C5D2B0001FFC2FF6101EE02C2003300001333123332161514062322263436
+353423220706070E010733072306020706232226353436333216151406151433323F0136
+3723646B458D202D1E140E1511131B112317020A037E0680155B1A374D202A1E170E1213
+1244211B131C6701B5010D22191521121819050C12276B09340F1F76FECE2C61211A181F
+160E1316010CAE9E636E000000010013FFF6028E02AB003F0000010706151433323E0135
+34272E01353436333216171615140E0223222E0235343F01363534232206070E01072313
+3634262B01353637170336333216151401BC4509113E6D3B05022F160E161E05022A4A72
+411012190C1437071C1B55281F241D4B920D1A0F1B4C510779826421200157F71F071456
+7C3C100D052B1610121B1709153F836C450207130F114BCF1C0519503C305B6F022A3218
+0D0F091206FE41D3251E0F000001000EFFF501EA02AB002F000033133E01333216151406
+2322262322060703373635342B013533150E010717163332373637170E01232226272627
+0F010E7C188E5D2637190F16321126530E4F2B8F250EB324506D25371A1518050A0F232E
+1E1623181E1E283001D15B7F1E1A10163C4A36FED4216E1E12101002376158812A08120B
+3F2E232F3A5320B400010029FFF5011702AB0021000001033307230706151433323F0117
+0E01232235343713233733373635342B0135363701174F4E084E4208111B28190E2D4129
+3104474A084A3A033112465502A6FED41FFE1D0E1239230A473638110D01101FDD0A0916
+100813000001001E000001DE029C001C0000010713230B01231336373427073537262322
+062322263534363332173701DE663A2C22E85EF5310C01ACA5111C0A2D12141C2620691F
+6E023F4BFE0C014DFEB3015543181C0B7F36774314181619217C55000001000EFF1701BA
+01B90022000013073E0133321615140703231336353426232206070E0107231336353426
+27353E0137D5434A6C311F220A995195110F0C1D4631211F244B60021B2627601B01B7DA
+7666211C1923FDD702033C130D0F4449314E79015E0A070F0B011008110600000002003C
+FFEE030F02B3002400340000011407062322271615140607062322263534363736333217
+1633323635342E0134363332160734262322070E011514163332373E01030F4218090B09
+23735C696D6377624F707F693B151A111311121B13151CBD453C6357353D433F5C4E3B46
+027B370D03023D576BC43E477C6E5BC1456143120C09010B161E191EB447517548B64E52
+575F4AD60002001BFFF5024701D300240033000001140706222716151406070623222635
+343637363332161716333235272E01353436333216073426232207061514163332373E01
+02474218140A0539315369464D654F38402D43100F11240909111B13151CC72621433D4A
+2A243D3C2228019B370D03021613397B31534942539E2A1E282507160606160E0F191E6F
+2D315B71732C2F532E8100000002FFB5FF3301D8029D0028003800001307363332161514
+062322270706151416331523353E0137133E043332161514062322262322133426232206
+070E0115141633323736ED334B60373CBB6E242124041B23CB201B09940B1423293E2526
+37190F16321032781D21274E12162B1B154E43450217CF71423B7BCC1187100F100D1010
+011A24022E283D422A1C1E1A10163CFEBE2C29442E399C1911155F600002001FFF17013F
+02AC0020002D000037130623222635343633361615140703061514333236333216151406
+232226353413342322061514163332363736419E2328262F5934393A08B81C2413321610
+183B21434CD82E2840221A172E0E072D01BA1830243455014B392516FDED5227293C1610
+1D1B45393A028635362A19201B1528000001FFCAFF260128022200340000010723030615
+143332363717060F01062322263534363332163332363F01363706232235343713232734
+373E013736333215140F010128055457020F0C20250D230C1D1B552637190F1632110C1B
+071E0307222B2E104E4B012119521A060809011C01AC20FEB80806101F3007572E665D1E
+1A10163C2117630B2922250A4001280612070641270908050267000000010026FFF501C4
+02AB002A0000132327343736373E0133321615140623222623220E010F01330723030615
+1433323637170E012322353437844B012116241B6257223B180F16321115210D08215005
+5457020F0C20250D2E3B262E10018C061207051B6C741B1D0F173C24231D7920FEB80806
+101F30074633250A4000000000010066FFEE037102FD003B00000133323E0135342E0134
+36333216151406070E01070E010703060706222635343F0136353426273521150E010F01
+061514163332363F0136353426270237C7151A0711111A13151D241F07290C23201A5322
+3F3CC47B2C3409232D011033270E3F284F3B54662240171E28028D090905020A161E191E
+191B250601040104325CFEE37435345C4837A1BD200D1414011010052234E28D2635416C
+7CE95512161404000001002AFFF5025F021F003B000001333235342E0134363332161514
+0607062B010306151433323637170E0123223534370E012235343F013635342623353637
+17030615143332373E0101874A5211121A13141E241E2129074A130B0C22250E30362430
+2D59616A1B230E16274551045903142D61212501B015020B161E1920191B240506FEE948
+0611203109492E302D98926535126E8B3A090C0C0E081303FE9D09071993325300010008
+FF1601CE01C20031000001073633321615140F0106151433323637363332161406070623
+22263534363F01363534232206072627252322060723372101CEED291D2E345CC536411C
+2B050D27161A1B1C363B3043392A96384B2632240B050108A22E2413123D014001ADBA11
+30285D30651C37361E19401A242E0D19352C2E4A164C1D2C32141C0B07D4263096000000
+0001000C000001F402A40024000001072306071533323637170721353736372337213635
+3426232207273E013332161514060701F409941DC7B52B2A121132FE9ED2380AF8090112
+2B3F386032151B6A4D485A232201682E20C9051B26078611E03D0C2E403A384160074B57
+61482942280000000001002FFFF401C5021B002400000107363332161514062322263534
+3633321E023332363534262B0137233733373307330701290C0710444D916C32671B1317
+1A0A221D3354453414254D084D0F2F0C4E0801BF3E0157426F86392E13192830288A342F
+36951F3D3D1F00000001000F0000010202E000030000010323130102C033C002E0FD2002
+E00000000002000F0000017B02E00003000700000103231323032313017BC133C145C133
+C102E0FD2002E0FD2002E0000001000F000001AD02E00013000001072307330723032313
+2337333723373313330301AD0D9D169D0D9D4A33499D0D9E169E0D9F47334801D0335A33
+FEF00110335A330110FEF00000020027FFF50130029B000B00170000372736373E013332
+15140706031406232226353436333216891131160A1F1C2C2738402117161C2115171DB1
+05E38E403433285378FEB4151F1E18151F2000000002FF84FF31018D0295000600250000
+0107232733173707030E01232226353436333215140615143332363713363534262B0135
+3637018DA2305F26598D72681F5B41232C1811270C121E291A4810151B1A2D7C0295A9A9
+6969DFFE667972221B121A250C0F070C4E680124410F110E100316000004FFCD00000234
+03B6002500280034003E000001131E01171523353E0135342F012307061514171523353E
+0137012E013534363332161514060B0201342623220615141633323627373E0133321514
+0F01018C5A0A1C28F52D200214DC3B163EBA222B390117181F2F22202E28392D9501021C
+14111C1B12151B958D0E0D0D19208D0290FDE33E2203101002181B0812836F29191E0310
+1007326301E6082A1B212E2F211D2DFE720107FEF901DA131A1B12141C1C5E790C071A10
+134F000000050011FFF501DC035C00080013001E003F004D0000133736321615140F0116
+14062322263534363332163426232206151416333213170E0123223534370E0123222635
+343E013332173F021706070215143332370334262322070E01151433323736D1A20A1E15
+11ABB03B292B393A292A19271C1A27251C1D730D38351E2817385E352C38578641430D0B
+033D070105590E0F25471E1A443F212C3C3B444D02B2A00A150F120A6A3A523A3A2A283B
+803826271A1C26FE610B442A29195A54493D374C9E663A300307030411FEBC270D290117
+1A205C31782E4A626F0000000003FFE50000038F036C00080049004C0000013736321615
+140F01050727363534262322060F01323E0337170727363534262B01070615143B013236
+37170721353E013F01230706151416171523353E0137013E0135342F0135170133022FA2
+0A1E1511AB013D211101457B2316073D36342F19130E124511062D49283E09331E706F39
+1240FE0E2C1D0731BE65181828BB131D2401711709261A7BFEF4AD02C2A00A150F120A6A
+3599020D17351D0D18DE0408191D1F04E80424101F13D920111D365205A410041319AA83
+20180F0B051010041B2D01D11D0F091901011028FEAA000000040017FFF5028002980008
+002F003A00490000013736321615140F0117073633321615140706070615141633323717
+0E0122263534370E0123222635343E013332173716342322070E01073E01372734262326
+070E0115143332373E010133A20A1E1511AB75163B3F252C42348A0821253C520A2A6D5E
+39063B5731262E59843B360C13BA2321201C2216444919CE1914353C252E222A26364901
+EEA00A150F120A6A373E4026203A2B2127221A372F4D0C333D423814145C46332F4FA86B
+2F2D5F48231E4040142C2132171C01573680363C293AA7000004003CFF9702BB036C0008
+0020002900330000013736321615140F0125071E0115140E012322270723372635343E02
+3332173709012623220E01151409011633323E0235340163A20A1E1511AB01173D2F2C7E
+C0603A2E442C5059446E9A50353331FE4B016522324E8D4D0196FE9A20324377482902C2
+A00A150F120A6A105E24654D6DCB7812697C3C8849A18356144CFD7802151A9ACC554901
+CAFDED1D6593993B3D0000000004001CFF7901D5029800080021002B0035000013373632
+1615140F0137071E01151406070623222707233726272635343633321737070316333237
+3E0135340313263122070E011514B4A20A1E1511ABD53A303344385356080C3D23402714
+25BA6C0B063725BE0B0B4238202AF5BC0A342B313E01EEA00A150F120A6A3C770B4B333C
+823047027E830D15273D73C4017294FE78045231823632FEA60185022E35994728000000
+0001FF84FF3100F601B9001E000013030E01232226353436333215140615143332363713
+363534262B01353637F6681F5B41232C1811270C121E291A4810151B1A2D7C01B6FE6679
+72221B121A250C0F070C4E680124410F110E10031600000000020013FFF601A501CC0030
+003A00001333363332161514070607061514333236353426353436333216151407062322
+2635343F013635342322073736333215140F013637363534232206AD015351272C673891
+123C2137061B13111A41354738400C300514151A0731352F1024632E3936274101834926
+23583C20314A0D391C1509160B0F1A1A142E231D2C2C162EBF170D1D121C303010498D20
+222A3E322E00000000020011FFF601E701CC00180027000001030615143332370F012737
+0623222E023534363332173703373635342623220615141633323601E75706290B07049F
+040F3E5411263320AF6938274A993A022E22417D3E2C224001CCFEA61A0718011034033D
+400A1A3E2D77D02B2BFE9AE6070D262AA0683F3F2200000000020011FFF601E701CC0018
+0027000013073633321E021514062322270723133635342322073F010F01061514163332
+36353426232206DA0F3E5411263320AF6938274A155706290B07049F173A022E22417D3E
+2C224001C93D400A1A3E2D77D02B2B015A1A071801103470E6070D262AA0683F3F220000
+00020017FFF501E802AB001F002D000037133E013332161514062322262322060F01333E
+0133321615140E012322263501342322070E0115143332373E0117721987652337190F16
+321026520F3E0132593634405E974B2E54016D46454420282E42392E403001A55D791E1A
+10163C4C37E4534440384D9C6320150108567336832E223B308500000001001EFFF501A9
+01B90022000013273E013332161514060706232226353436321615140615143332373635
+342623220669102E5738474C44374D5A2E3B1C28130F253F2E5B2E2B274001430A3A324E
+4C437D2D3D2E23141C1711091D0A14306089363C260000000002FFFDFF6001A901B90029
+00380000073726353436373633321615140622263534363534232207061514173E023332
+161514062B0122270725342623220E04071633323603775644374D5A2E3B1C28130F253F
+2E5B222322341C22324843162A1D76013D20150C150F170B1E07222C3529A09E1F72437D
+2D3D2E23141C1711091D0A14306089451A28231E251B31340797F00F150707150B21080C
+260000000002000FFF17020F02AB002B003A000001170703061516333236333216151406
+23222635343F010E01232226353436333216173337363534262735360334262322070E01
+15141633323E0102090627A60A022A11321512173C2243480D232B53343239C1631F1D05
+012D0E162A4D591D122F2C32421F1B2D5C3B02AB0698FDA22719363C170F1E1A413B2734
+8B493B3D3877D81C1EA331161008021107FECE1A1F2E35933E222762980000000002000F
+FFF302EC02AB002A0039000001373E013332161514062322262322060702151433323637
+17062322263534370E012322263534363332160734262322070E0115141633323E010174
+1D1987612337190F16321025520E7C120D1D280C4D4613160D2B53343239C1631F1D0B1D
+122F2C32421F1B2D5C3B017F6557701E1A10163C4936FE390714192E0A7218151E3B493B
+3D3877D81C341A1F2E35933E222762980002001FFFF501A001B90014002100003F011E01
+333236372E0135343633321615140623220134262322061514171E0117361F12202C213A
+5E0762684A364F5E8B607301072B241F26100F363807610C2C1F5C3D0D493233436A5065
+A50128394C3322171C1B1F10400000000002001FFFF5019C01B90015001F000013273633
+32161514062322263534363736342623220617370607061514333236550C58743D4ABB70
+272B99830A332A213C9811703132232A5B01410C6C4B3E75C624204268111452321FBB2C
+1B2F3031276100000002001FFFF5027F01B9002C0038000001170E01232235343F010716
+15140623222635343E023F01262322060727363332161737170706151416333225070E01
+151416333236373602641B10381D410A105B04BB70272B1D342E1E751138213C360C5874
+2D410F86052006161524FEEC622A450F142A591C0F01250C1D2A3A0E2A3D2F0F1375C624
+20243F30201040501F2C0C6C2A25440477180218113139185B4115135F4726000001001F
+FFF201D301DB002E000037352634363332171E011514062322272E012322061514163B01
+152322061514163332371706232227263534363736D15D74503B2E161C1A16230E0A1214
+2E482E26060B3F5F2D274F5D095C6C4C2F24312821F902157C4F1A0C2B13121A34241743
+2D21221E4D38242A3E0C562219302849131000000001001FFFF201BF01DB002E00003735
+363736353426232206070E01232226353436373633321615140715161514060706232227
+371633323635342623DF341C38282112120A051912161A18182E3E41528E7135253F4C6D
+310F3E4E36542E2CE91E011426351E251B23131E1A12102C0D1B342B621F020E58244714
+22560C3E503723290001001FFFF2029A01DB0043000001170E01232235343F0107060715
+1E01151406070623222737163332363534262B0135363736353426232206070623222635
+343637363332161D01371707061514163332027F1B12371C410B0F551771343D35253F4C
+6D310F3E4E36542E2C0B341C3828201312090E25131B1A182E3D40527405240215162201
+250C1E293B0D2E392C42180206342C24471422560C3E503723291E011426351E251A2035
+1911142B0D1A352A093B0485080518100002001EFFF201CA01DB0013002B000025151615
+1406070623222635343E013332161514073532373E0135342623220E0115141633323736
+35342726013C71321F415057564484533958E027181E2B281F3B602D2E2F3626333312FB
+020E5923431327544B549660303160311E0B0E371F1E26667E353A51202A3B3910050000
+0001FF9CFF31015401B90027000001150E010F01330723070E0123222635343633321514
+0615143332363F012337333736353426233501542F220C1C4107422D1F5B41232C181127
+0C121E291A338A078B1E041F2401B910021E2D701FB17972221B121A250C0F070C4E68D0
+1F7B12081711100000020008FF2C031F02AB002A00390000013736333216151406232226
+23220607030E01232226353436321E023332363F01062322263534363332033736353426
+23220E01151416333201E40838A02536190F16321022211286179D5D337815201E183220
+3E5C1017514D464EBD72382C3804302A365C2F3C383501B21FDA1F1A10153C404BFDE75A
+5F272810151C201C523E5D43664973C7FE7DE10F122938557132405700020008FF2C0243
+01E200220030000001030E01232226353436321E023332363F0106232226353436333217
+3E0437033736353426232206151416333202437F179D5D337815201E1832203E5C101751
+4D464EBD723B30080C0C051003973804302A50713A3A3501E2FE03596027280F161C201C
+523E5D43664973C73306090D061503FE76E10F122938A9503E58000000010034FFF50232
+01B90030000025150E010F010E0123222635343637363332171E02333237330723262726
+2322070E0114163332363F0136353426273502321F1B0720039F216278463D5568223A05
+120C02190C101D100E1421424F352E3E4F472348041A05181FE70B02151F820D22525446
+7928370D010403158B35172529227E7E49141268170C100B010B00000002000FFF1601AA
+01B90034003E000037173E01353427263534363332161514070607171615140623222635
+343E05372E01272E01232207353E02373633321603270615143332363534F31543371A1A
+1711161E2C28450D083E372323030A0A140F200B053D130E211E100F0F27281D080C0B3D
+05094B1E1A20BA6E6E73201010111610152017325E566F492B233D43211C060E14101F15
+2D1034F430251B04110309070302BAFEAD2D621B25271E1B00020004FFF601DB01C20032
+0040000013373E0237363332161514072E0123220E040F011E03151406232235343F0127
+2E01232207343633321E02170F010615141633323635342E02E83F07251B0E1813181C0B
+06251708110B120612014903110708552F4E2F393B071E112B0F3929131B150B08032E21
+1911182606050D010746092B1E0D1623181D28172006071006160152082E1725112F453E
+2B313C881013352B550C1C1514C232251A101128180A180E1F00000000010013FF0E01DE
+01C2002E000001030614163B011506072713062322263534373635342623220607273E01
+33321615140F01061514333236373E013701DE920D1A0F1B4C5107798264212030220A07
+0C1D290D2E3E2614181437071C1B55281F241D01B9FDD632180D0F09120601BFD3251E2B
+966815070B1D330D41311713114BCF1C0519503C305B6F0000010013FFF701EE02AB0034
+000033133E01333216151406232226232206070336333216151407061514163332363717
+0E0123222635343F01363534232206070E0107137C1987652337190F16321025530E4F82
+64212030220A070C1D290D2E3E2614181437071C1B55281F241D01D65D781E1A10163C49
+36FEDCD3251E2B966815070B1D330D41311713114BCF1C0519503C305B6F00000001FFFA
+FF1701EE02AB0033000033133E0133321615140623222623220607033633321615140703
+0E012322263534363332163332363713363534232206070E0107137C1987652337190F16
+321025530E4F82642120095E1987652337190F16321025530E6B071C1B55281F241D01D6
+5D781E1A10163C4936FEDCD3251E0F21FEA65D781E1A10163C493601941C0519503C305B
+6F00000000020010FFF50108028E000A002B000001140623222635343632160307230706
+1514333237170E01232235343F01233733373635342627353637170701081D14161A1B28
+1E0B084A250A0E193B0D2A3A253116144B094B130917292E7204310257151E1D18171E21
+FE981F87220A0F4E0B4131371D524B1F47200C0F080110041503B10000010033FFF6010A
+01C6001D0000371706232235343F01363534262322073537363332151407030615143332
+FD0D4E41480C38081010110E75200A050654042C20500C4E41172ED11A0B0F0904132409
+0B0515FECC1009280001FFF80000012A01B90017000001150E0107030615141617152335
+3E013713363534262735012A2C1B0B4106171DCD2C1C0A4208181E01B911021C2AFEFD18
+101211011111011D29010D20060E0D021100000000010004FFF5014B02AB002E00000133
+062322270706151433323F01170E0123223534371326232207233E01333217373635342B
+013536371703163236012F1C16490F213E08111B28190E2D4129310449160C250E1D0F2E
+2709162F0331124655064B1C281701A7680BED1D0E1239230A473638110D0119062E3A30
+04B50A091610081305FEE10C130000000002000CFFF5016E02AB002D003800000117060F
+0206151433323F01170E01232235343F0106232226353436333217373635342B01353637
+1703373E0107372623220615141633320166083A5F092A08111B28190E2D412931042B10
+0D252E56320A142803311246550666082152CB2508081E3A1C160D01680D3A2003A11D0E
+1239230A473638110DA4022D233451059A0A091610081305FE7A02082C438E03391E1823
+00010008FF17011702AB001C000001030615143332363332161514062322263534371336
+35342B013536370117C10F271132160F193425543A0BA3033112465502A6FD1E3C1D323C
+1610191F423F242C026F0A091610081300020029FF17021902AB00340040000001073633
+32161514062322272E013534363332171E0133323635342E0223220F0106232226353437
+133635342B01353637170721072322060F010615143332370219CE0B0D3645AE74392F14
+171A17240D091B263C7A162423130D18581D241717077910370C4853063C013833CA2F27
+0C310D0E080D0190CC03463F85A61F0D2811121A3A261480691E2D150A1B5A1D2015131B
+01CE3D051810091206E340282EBB3405100D00000001000CFFF702C001B9004200000103
+0615143B0115072737062322263534370E01070623222635343F0136353423220F012737
+36333215140F01061514163332373E01373303061514333236373E013702C0580A2919A2
+033A825A1D1F28354724201F1B1F03440A0C162B150F054D432A0D3C080D082F54252A1D
+4B56081519522A19232401B0FEC2261016101F02D1D3201C267254551714231C0D0FFB25
+0810351A0C076B2E0F33E32006090C75346973FEC21E10194F402758770000000001000C
+FF1702C001B9003B000001032313062322263534370E01070623222635343F0136353423
+220F01273736333215140F01061514163332373E01373307061514333236373E013702C0
+B05479825A1D1F28354724201F1B1F03440A0C162B150F054D432A0D3D070D082F54252A
+1D4B1B431519522A19232401B0FD6701B3D3201C267254551714231C0D0FFB260710351A
+0C076B2E0F33E31C0A090C753469735DE728194F402758770001000CFF1702A001B90043
+00001307363332161514073E013736333216151407030E01232226353436333216333236
+371336353426232206070E01072337363534232206070E010723133635342B013537D13A
+825A1D1F28354724201F1B1F03721474512537190F1632132335106A070C08164826252A
+1D4B1B431519522A1923244B5A082919A201B7D1D3201C267254551714231C0D0FFE5949
+571E1A10163C463C018F1C0A090C40353469735DE728194F4027587701451E1116101F00
+0001FF92FF17024401B90043000025170E0123222635343F013635342623220607060F01
+0623222635343633321633323E0437133635342627353E013717073E0133321615140F01
+0615143332373602360E333623151D102F110F0C1E4A332D29182D982536190F1632100C
+13100A0E060871021B2627601B04434A6C311F220A380E10132A07750D462B1B1B1239A2
+3C130D0F4C4B429558A81F1910163C0716102A141D019D0A070F0B011008110602DA7666
+211C1923CB320B12350800000001000EFF1701E701B90032000001030615143332363332
+1615140623222635343713363534232206070E010723133635342627353E013717073E01
+333216151401B0690D2C1132160F19372545480A5311191E4731211F244B60021B262760
+1B04434A6C311F220140FE85311F3C3C16101A1E4A3C3B2101213C111E4449314E79015E
+0A070F0B011008110602DA7666211C190001FFECFFF8025701B900230000011506070607
+0323030706151416171523353E0137132E01233533133736353427262735025725101B0E
+540EEA3F08181FB132220D4710161C86CC360705082E01B9110408143BFEAB016AFB220E
+140F031111041E34011D160E11FEC1DA1B120B0A0E0411000003001BFFF501D401B9000F
+001900230000011406070623222635343637363332160533363534262322070617230615
+14163332373601D439315369464D654F38403E4FFEB6EB0B2621433D1FD3EE102A243D3C
+23012D397B31534942539E2A1E4B7E2E282D315B2F4B33372C2F533000020031FFFA02E2
+01B90032003E0000010723363534262B01220F01333236373307233534262B0107061514
+3B0132363733072122062322263534363736333217163303133635342322061514333202
+E21812012B42293506244C3D2F101027101D266527022659274126123CFEF7196511515D
+564443570B241C3D9D40043A577F6F4C01B55E060C2013179419289B121B149D05091626
+2F6E04514A508B25240202FEA101040F0D2AA66F780000000002001EFFFC027E01DB0011
+00340000011406232226270623222635343E013332160734262322061514333236373635
+343E03333216151406070615141633323E02027E8C63283006394F424978AB5363875952
+4467AA3D2038070502080E1D14171C3F0402211A263C2111010665A52D2754503F5E9F53
+753B4D4FBF8A582C201A39151C2718111A1223770E070C19203C57530003001EFF170276
+02AB0027002E0035000001071E0115140E010F0106151416171523353E013F012E013534
+3E013F0136353426273533150E0107033E0137362603130E0115141601D82B577261904D
+27061C23EC2E270B26576F648C4B2B051C22EC2F253E665D74020237F2665679350257A4
+0852494B7E450592150D130E020F0F031C298F055D494E7B3D05A1160B1411020F0F0219
+EAFE820E9B5E343FFE86017E04965D36490000000001FFD30000014201B9001E00000103
+06151433323715072737070607062322263436333217163332373E013701425110260916
+9B033710223C2B24151A1916131008081B3722292401B9FEDC3B171A03111B02D8234B3F
+2D1C2E1F1A0E5E3A677900000001FFD30000018002AB0027000001030615141716171523
+37070607062322263436333217163332373637363F013635342B0135363701809F022309
+1B9E3710223C2B24151A1916131008081B372B16230C1E0D3112445702A6FDA00A081A07
+02020FDA234B3F2D1C2E1F1A0E5E4841672E743006191008130000000001FFD3FF170156
+01B90028000001030615141633323633321615140623222635343F010706070623222634
+36333217163332373E013701427B1E1814113215111838263F4C223010223C2B24151A19
+16131008081B3722292401B9FE456A221C1D3C16111B1C3E3D1C7FAD234B3F2D1C2E1F1A
+0E5E3A67790000000001FFECFF17019C01B9001F00003F01363736333216140623222726
+232206070607032313363534232207353717B010223C2B24151A191613100809185A121B
+14514992102608179B03DF234B3F2D1C2E1F1A0E932F4743FEEB020D3B171A03111B0200
+00010018FF17019C01B9002F00003F013637363332161406232227262322070607061514
+1633323633321615140623222635343713363534232207353717B010223C2B24151A1916
+131008081A38251D521814113215111838263F4C1551102608179B03DF234B3F2D1C2E1F
+1A0E5E3E4EDD3F1C1D3C16111B1C3E3D244A01243B171A03111B02000001002D000001A8
+01D60011000033373E0133321615140623222623220607032D451E615A2637190F163210
+22281451F96A731E1A10163C4348FED7000100420000012501D600140000331336353423
+220623222635343633321615140F0186530D231132160F19372644420E4501292D312D3C
+16101A1E463E2932F700000000020019000001F501D0001F002900001333321615140717
+163B01152327230706151416171523353E013713363534271733323635342623220784E3
+424C9A480E1F0A7C5C251A07191CD82A220B41083561113F632B28151D01D0342C652DAA
+2212D16A1E0D161301121204202C01011D112805CC44391E230700000002001900000245
+01D0001E002800000123220F01161514062B01353637363713363534273533150E010F01
+3337330507163332363534262302450A1F1F9D5E7853DA2615130C400736D827270B1A25
+C473FE9B2D1915354B403001BE22AA1D424053120414113201011B0D2602121202242F6A
+D1F2B7073F31292500010009FF26017801BA003A00000107232623220615141716151406
+2322272623220F0106151433323633321615140623223534371333163332363534272635
+343633321716333237017814100E4B1B203644513F1D1A1517030813011A1132160F1937
+265D02231014502428383F42371424160E140A01BA8C741E1B26404F393D490A09028A08
+0C203C16101A1E410A0A01178828252D464F34323A0A07120001FF92FF17024102AB001D
+000017133E01333216151406232226232207030E012322263534363332163332708C187B
+592534190F1632103E2488187A592436190F1632103C4802195E7C1F1910163C8CFDF45E
+7C1F1811163C00000001FF92FF17025302AB0025000037133E0133321615140623222623
+220607033307230E012322263534363332163332363723378974148B5D2337190F163210
+2847107F5005541F754B2338180F1732101B3E1750071F01D1506B1E1A10163C353FFE0A
+1F6E7B1E1911163C6C5B1F000001004FFF17016301D60023000025030615143332363332
+161514062322353437133635342322062322263534363332151401294E171E1132160F19
+3726810D4E12221132160F19372685FCFEC85C101F3C16101A1E8127320138481B283C16
+101A1E86360000000002FFC2FF0D025A02AB002700340000371336373633321615140623
+222623220E0207031615140723363534270E012322263534363332172623220615141633
+323637369F741E473B4E2039180F17321016221B0D0A832C171A141A275549263572401A
+0B1718305F2A201B2B090D0E01BA753C321C1D0F163C1E3D2A26FE072C493B2838253624
+5A523324445F1F0652341C26251C250000010026FF9F012801CC0021000013273E013332
+15140703331714070E010706232235343F0123373313363534232206780D2E3B262E104E
+4B012119521A060809011C50055457020F0C20014C074633250A40FED806120706412709
+080502672001480806101F0000010006FF17013402220024000001072303061514333236
+33321615140623222635343713232734373E013736333215140F01013405548A07161232
+161018382938430C7E4B012119521A060809011C01AC20FDF81A10213C16111A1D312215
+2E01DF0612070641270908050267000000020009FFF501DF01B9002D0036000001072307
+06151433323637170E0123223534370E01232235343F0123373337363534262335363717
+07333637330F01230706151433323701DF053F19130B0C22250E303624302B586134351B
+0F4B074C0C0E16274551042D9D152F4A2E70942403132D6101051F61480611203109492E
+302D928E6335126E3C1F303A090C0C0E081303B12A81AB1F930907199300000000010031
+FFF6022801C200280000012322061514161514062322263534373637363534262B013533
+060706151416333236373635342733022826151F27B4644D5F06145512130D2691541B0D
+332D465B1411068701AE2013074A2C67A160481A19514910150D11148B6B34262D3B744F
+46492E3800010034FFF601DB01B90029000013030615141633323E013534272E01353436
+333216171615140E02232235343F013635342623353637D34B062C203D6D3A05022F160E
+161E0502294A73427F0735061627455101B6FEC918081C245D7F39100D052B1610121B17
+09153F816E455A161CD4180A0C0C0E081300000000010014FFEE01AA01B9002D00002515
+060706232226272627070E011514171615140623222635343736373E0633321D0114171E
+01333201AA37390B0906071112071F36531219161018203F3740091A0C13090C08040918
+0A171C14140D090C041A585BA620378D230C1116170F1325163A615544091C0E13090A03
+1B188A8C392400000001000FFFEE028801B900350000251506070E022322262726270306
+232235030E0115141716151406232226353413373633321713373637363332161F011617
+1E013302884F10050D08030806051907C006070820634216151710161ED409230A08031D
+591720310F070402040813071117130D0D040104020A1878A1FECF0A0E01617B69200E15
+14150C1320185B01020B2B23FECA98263D5E121D5BA44E1B0F0000000001000A000001CC
+02870033000013270E01151417161514062322263534373E013332161514062322262322
+070E010706151416171E013332371506070607232226C11543371A1A1711161E834E932B
+171C1710131E0C121E0D33070A3E140E211E100F160A2942040B3D00FF6E6E7320101011
+161015201757DA819E181311171C210D430B140F1EFB33251B04110402080ABA0001003E
+0000025B01D00026000001150E010F0206151433152335323E023F01272E01273533150E
+0115141F01373635342735025B2428339E1B0735D817211308041B4624241FD222140B4E
+99162501D012031A329B6A1C112B12120E1A16106E854524021212010A0B071697971612
+0A01120000010011FF2601AD01AC00240000250706151416333236333216151406232226
+35343F01213501232206072737211501333237015C3E09090E1132160F1937262D291019
+FEEE01238828240F1020011BFED4D1191260CE1D0F100E3C16101A1E251C0F365412015E
+172504740BFE9B2800020011FFD1017C01AC001A002300000901333633321615142B0106
+07233E013723350123220607273721033332363534262322017CFED47432371F26774212
+07180113059001238828240F1020011B9F4A16191A0F2401A1FE9B54201C54200F012608
+12015E17250474FE90100B0F1500000000010015FF17020501C200280000010736333216
+1514062322272E013534363332171E01333236353426232207270123220E010723372102
+05D710113645AE74392F14171A17240D091B263C7A40370B2E0B0116C7232A100C123D01
+380190CC03463F85A61F0D2811121A3A261480693634130B0103181D2196000000020007
+FECF022001C2002900340000010703323633321615140607172327062322263534363332
+16173E013534262322072701232206072337132E012322061514163332022004F4020804
+345677501925181F2F3A463E312B321A314442360B310B01088A32261212210719211713
+1C341D2301C20FFEF40141445C841B594E062924293337441B6C443D3A130B0125273176
+FD753E292015191C00010037000001FD02AB002500003F013E0135342322060706232226
+35343637363332161514060F01061514161715233536373698444F733B1426051027121C
+171A303E554A894A3E091C25ED2D111466FE0189525A2418441A10112C0F1B47365A7F05
+EA2012160D020F0F030C0E0000010037000001EF02AB002800003F012E0135343E023332
+161716151406232226272E01232206151416330706151416171523353E019B3E33451B37
+623F1F4513241A16131B0504241A3258423043081A23ED312566EA0A3C37264B432A150F
+1C25121A211B172D87393145FE1C151311020F0F021E00000001FFE7FFF2019D02960028
+000001150E010F011E0115140E022322262726353436333216171E013332363534262337
+363534262735019D31250E3C33451B37623F1F4513241A16131B0504241A325842304108
+1A2302960F021E37E30A3C37264B432A150F1D24121A211B172D87393145F7220F131102
+0F00000000010018FF1201CB01B9002A000017133E013332161514062322263534363534
+2623220607030615141633323637363733070E0123222635341C5C127C47354915130B12
+0E271A26510961032F26364B0D02021909106E4D374C54016F475743321627110B092008
+1D253926FE7D0D0F26324534081026415846341100030016FFEF02C002A7000A00180027
+0000011406232226353436321625140E0123222635343E0133321607342623220E021514
+1633323E0101A5231C1827253425011B72C672738D78C77077845D57543C775A38555550
+995D014C1B25241B1A25244A73CF7F877276CF7A88625E704977A1535C6B81C800030013
+000001F901D00016001F002D000013333215140607161514062B01353236371336353426
+2717333235342B01220F0206151433323635342E02237ED0AB4B3C6D815FEC2C29094604
+1B226F3588701012062E28022B445C152B2C2001D05C383F081548465212212601190F0E
+151604BA6C4016B8A20804143C40171D0E04000000020014FFF201D601DB0015002B0000
+373526353436373633321615140623222635343637361723220615141633323E01353426
+2322061514163B01C65D302734355459AA7A3965322923890D3A622E273962322D312D48
+2E2507F902153E273D12175B4C83BF32372D4614110A4B39252A698232394E432E1F2300
+0001001DFFF5028A02030037000025070E0123222635343633321E02173E013332161423
+222E0223220F01232E012322061514163332363F013635342E01273533150E0101D92003
+A21B6676C4791127182E080D3C281623140C0E050D0B220F1A100A413C63894E471D4D05
+1A050E1217BD1F1BA7830E2152547AA405040A022A351A2C0F130F437C3937A166404912
+156A16070C0C03020D0D0213000100190000029F01D00033000001150E01070306151416
+171523353E013F01230706151416171523353E01371336353426273533150E010F013337
+363534262735029F2D1E0A4805191ED82E1C0C20F22006181ED72E1D0C46061820D72B1F
+0A1FF21F06172101D012031828FEDF160C1411011212021B2F7E7E170F1312011212031C
+30011A170D110C0212120317297E7E180D100B03120000000003FFB0FF17018A028C000B
+002800360000011406232226353436333216070306071617232627062322263534363332
+1713363534262B01353637032E0123220615141633323E02018A1E14171F2015141F2168
+0D0F362E28183345792C3C663835264D10151B1A2D7CC4103A0E284E33261A261B0E0256
+141E1D17161E21B5FE663820436A3E4B8935293A51170138410F110E100316FE10080C3D
+291F1E142F2600000001001AFF0101D901B70029000001030615143B0115060727130706
+15143B011523353E013727262322070607273E013332161716173F0101D98D1233124B52
+06782B8F250EB324506D25371A1518050A0F232E1E1623181E1E283001ACFDF042161810
+09120601C8216E1E12101002376158812A08120B3F2E232F3A5320B400010019000001D9
+01D0001D0000250721353E01371336353426273533150E010703061514163B0132373637
+01D943FE83261E094907151DC12A1A094C03182232582E0E1D7F7F12011B2501261C0B0F
+0D021212021D27FECD09090C072B0F2500020019FF2F029A0246002A0039000001373E01
+333217161514062322272623220607030615143B011523353E0137130E0123222635343E
+0133320734262322070E0115143332373E01018B1B12432835202211101F10101613170F
+AC02390FED2E24095A3B5A3B2F355989433F012219293433423529293353017B54383F12
+13220C151E1F2037FDA508031F101003181D01225E463E364D9E6552192331318C3E4D24
+2CAF000000010037000001FD02AB002C00003F013E013534232206070623222635343637
+363332161514060F0133072307061416171523353637363F012337B02C4F733B14260510
+27121C171A303E554A894A274D084D10081B25EC2C11150F104E08C1A30189525A241844
+1A10112C0F1B47365A7F058F1F3C1C2C0D020F0F030C0F393C1F000000010037000001EF
+02AB003000003F012E0135343E023332161716151406232226272E012322061514163307
+3307230706151416171523353E013F012337B32633451B37623F1F4513241A16131B0504
+241A325842302B4B084B10081A23ED31250E104F08C18F0A3C37264B432A150F1C25121A
+211B172D87393145A31F3C1C151311020F0F021E373C1F000003000FFFF302E502AB0027
+0034004300000901333237170721062322263534370E0123222635343633321617373635
+342627353637170F0121072322060727070615143332370334262322070E011514163332
+3E0102E5FED4D11A11101DFED2181A13160D2B53343239C1631F1C072D0E162A4D4C0627
+1B0118488828240F0C3C07120F0A321D122F2C32421F1B2D5C3B01A1FE9B2804600D1815
+1E3B493B3D3877D81A20A331161008021107100697623C172503D81A09140C01351A1F2E
+35933E22276298000003000FFF17030C02AB003F004B005A000001073633321615140623
+22272E013534363332171E0133323635342623220F01062322263534370E012322263534
+363332161733373635342627353637170721072322060F01061514333237033426232207
+0E0115141633323E01030CCE0B0D3645AE74392F14171A17240D091B263C7A442C0D1858
+1E2B13160D2B53343239C1631F1D05012D0E162A4D4C063B013833CA2F290D360912080D
+2E1D122F2C32421F1B2D5C3B0190CC03463F85A61F0D2811121A3A2614806939311B5A1F
+18151E3B493B3D3877D81C1EA3311610080211071006E3402A2EC32407140D01341A1F2E
+35933E22276298000004000FFFD102E502AB0031003A0047005600000901333633321615
+142B010607233E013723062322263534370E012322263534363332161737363534262735
+3637170F0121033332363534262322372322060727070615143332370334262322070E01
+15141633323E0102E5FED47432371F267742120718011305901E1413160D2B53343239C1
+631F1E052D0E162A4D4C06271B01189F4A16191A0F242B8828240F0C3C07120E0D341D12
+2F2C32421F1B2D5C3B01A1FE9B54201C54200F0126080D18151E3B493B3D3877D81C1EA3
+3116100802110710069861FE90100B0F15F5172503D7180C140F01321A1F2E35933E2227
+6298000000020026FFF5020B022200310048000001072326232206151417161514062322
+2726270E01232235343713232734373E013736333215140F013336333217163332370117
+060716333236353427263534372303061514333236020B14100E4B1B203644513F1D1A2D
+19133E1B2E104E4B012119521A060809011C6B1D231424160E140AFED90D06031A412329
+383F134E57020F0C2001BA8C741E1B26404F393D490A12231D22250A4001280612070641
+2709080502670D0A0712FEBB070A045628252D464F34241BFEB80806101F00000002FFE0
+FF17028F02AB0035003E000001373E01333216151406232226232207030E012322263534
+3633321633323F010E01232235343713232734373E013736333215140F01172303061514
+33323701400A197A592534190F1632103E2488187A592436190F1632103C2226323F1F2E
+104E4B012119521A060809011C606957020F155501AC255E7C1F1910163C8CFDF45E7C1F
+1811163C7F922E27250A400128061207064127090805026720FEB80806104F0000020026
+FFF002640222004400500000130306151433323726353436373633321615140622263534
+3635342322070615141736333216151406232226270623222635343713232734373E0137
+36333215140F0133071334262322071E02333236CF57021E20340F44374D5A2E3B1C2813
+0F253F2E5B04674B2233444958500F6043111C104E4B012119521A060809011C5005F620
+194A5B093D28122F2F018CFEB808090E192130437D2D3D2E23141C1711091D0A14306089
+1A0E32251C2D371E183111140A400128061207064127090805026720FEC311142D171B04
+2300000000010007014601870346002F000001170E0123222635343F0136353423220607
+0E01072313363534262B0135363717033633321615140F01061514333236017C0B263520
+1014112E06191548211A1E183F780D160D16434106666C541B1C043C050E0A1A01A40931
+24110E0C389A1602133C2C2343530194290B080A0B080C04FEB59C1B160B0CBC12070D16
+000100070146019E0346003A00001B013E0133321615140623222E0427262322060F0136
+33321615140F010615141633323637170E01232235343F01363534232206070E01070770
+115D39354B100C05090509030A021A1C21390B456C541C1B043C0509050A19220B263420
+25112E06181648211A1E18014D017937491F180B10030208040D021F3724E19C1B160B0C
+BC0F0A050815260931241F0C389A1602133C2C23435300000002002C00C7015E0353000A
+00290000001406232226353436333207030E01232226353436333215140615143332363F
+01363534262B01353637015E16101217171110024F1745321A22120D1E090D171F14370C
+1015131F61033A201616121017A3FEC95C561A140E141C090C05083A4FDD310C0D0A0D01
+11000000000100020159014002B2001F000013373637363332161406232227262322070E
+0107233736353423220735363717740D1A38251F13161613110D0707182F1D232042460E
+210E0D1B6C0202071C373523162418140B492D5060E42C1514020D041102000000010000
+0159013E02B2001F00000107061514333237150607273707060706232226343633321716
+3332373E0137013E460E21011A1B6C022F0D1A38251F13161613110D0707182F1D232002
+B2E42C1514020D041102A91C373523162418140B492D50600001000000A3014F02B20028
+000001030615141633323633321615140623222635343F01070607062322263436333217
+163332373E0137013E6B1A15110F2B120F15302138411E290E2031251F131616130F0F07
+0717301E231F02B2FEA5521B16172F100E151630301663871B3D2F23162418140B492D50
+6000000000020006015901CE02AC001D002800000123220F01161514062B01353E013F01
+363534273533150E010F01333733050716333236353427262301CE09191A7F526344B823
+1C0A2F052FB6211F09141FA161FED92114142C3C20152B029F197C15332F3A0D041A25BB
+16061C030D0D021A224E99B186052D241E110B000001000F0147020302B2003200000113
+3E01353427263534363332161514070623222F010706070623222726272E012B01353637
+3E023332161716173736333201411A4E341111120D1118A82109060317462B01260C0901
+0A0F050E12162D1E040A070206040513069805050602A6FEEA6153190B1110100A0F1A13
+40D42A1BF6794C024A25CF38160C09080701020208134E90F00800000001001000CA0165
+02B5003100001317363534263534363332161514070E012322263534363332163332373E
+013736353426272E012322073536373236333216DA105D28110D1117633C6F211115110C
+0E18090E160A2705072F0F0B19160B0D411D010A04082E01F3539B280B1A110C10191143
+A56277120E0D1216190B3308100A17BF261C15030C0D05018D0000000001004F01BB00EC
+02AE0017000013170E01151433323633321615140623222E013534373E01E80433330A02
+1106151D30180D1C1B040F6302AE131C41110A0419191D1D081E19140D3754000001001E
+0127013302B2001C00001333323635342322060706232226353436373633321514062322
+270723430C44552F111D040C1E1115141426327C794B0D051A2501BE5A424B1E1137150E
+0D230B156353840152000000000100170127015702B2001E00001337062322263D013E01
+333217161514062322272E012322061514163B01078D0E050D3141045E6334252215111E
+0B041E11294A3B2E0C2501275201403206536F1916210E1534131F692D232E970001005B
+01EC0181029500060000012327072337330181245289279D3101EC6868A9000000010079
+01EC01AA0295000600000107232733173701AAA2305F26598D0295A9A969690000010075
+01EC01A2028A000C000001330E0123222635331633323601851D0B6240433D1D08632E4A
+028A435B4F4F6335000100CF01FC0131025E000B00000114062322263534363332160131
+1D14151C1D15131D022D141D1D15141C1E0000000002009B01FC016302C3000A00150000
+0014062322263534363332163426232206151416333201633B292B393B282A19271C1A27
+251C1D0288523A3A2A283B803826271A1C2600000001FFECFF5700C80028000F00001F01
+0623222635343733061514163332B71134492837461821211A2F4A124D352A3D352D3017
+1E00000000010064020501AB02700013000001330623222726232207233E013332171633
+3236018F1C164912274718240F1D0F2E272036291514170270680F1D2F3A301813130000
+0002005D01EE01E6029800090013000001373633321615140F0123373633321615140F01
+0107A00A110F1511ABCDA00A110F1511A901EEA00A150F140A68A00A150F140A68000000
+0002001700DA014F02AC0029003500000115220E040F01171615140623222635343F0127
+26272623353315230615141F01373635342335030706151416333236353427014F070D08
+0C040C017D0E042E281A2415381A080B0619850B1A031868111B862C0C0E0C12190502AC
+0B07050F051401BF4B160C2C3A1916201C499D3627190B0B031A0D159BA31C0A110BFEC8
+3D18130C101B140D1900000000010029014D00D6034500190000130306151433323F0117
+0E012322353437133635342B01353637D66F060C141D120A20301E23036302230D2C4403
+41FE58150B0D2A19073427290A0B017D0707100B050F000000010010014F012202B30029
+000001072326232206151417161514062322272623220723373316333236353427263534
+36333217163332370122100D0A3B151A2B353F32161511110F080C0F0D103E1C1F2B3234
+2B111B13090F0902B36E5B18151D323F2C30390807107C691F1C24363E29262E08050E00
+00010004014D017B02B3003C000013173E013332161406232226232207141F0116333237
+3E0237170E012322262F01070E0123223534363332171633323F01272E01232207273633
+3216D90A29341A0E130F0C07180A1737061A07100F17030704020C232716131408174619
+1E14270F0C0A0F0E060D1C4117080D0F092402471E0F10026F2D4031101A100E600D176A
+2020040A0602073625181E5E5E2214220C100907275C6224120A0D1A1B00000000010008
+014D0159034F00230000133726353436333217161514062322272E012322061514163307
+06151416171523353E0157295D5F5E2D252715111E0A051D11274332252D07141BB8271D
+019CA6134D426B1517220E1532151D692D2635B520070F0B020C0C02160000000001000F
+FF6D0131004600060000250723273317370131841A84454C4C46D9D9787800000002000A
+01FB018B02990003000700000121352115213521018BFE7F0181FE7F01810263369E3600
+000100A001EE014202890009000013373633321615140F01A05E111A0910285801EE8417
+0C0A0F25510000000003004601EE01830289000B00150021000001140623222635343633
+321607373633321615140F0127140623222635343633321601831D14151C1D15131DE35E
+111A091028581A1D14151C1D15131D021F141D1D15141C1E4484170C0A0F255131141D1D
+15141C1E0003FFCD0000023402A6000900240027000013373633321615140F010123353E
+0135342F012307061514171523353E01370133131E0117270B018B5E111A091028580187
+F52D200214DC3B163EBA222B39011D1A5C0A1C28C32D95020B84170C0A0F2551FDF51002
+181B0812836F29191E03101007326301F0FDD73E2203F60107FEF90000010096014A0105
+01B9000A00000114062322263534363216010521181620202E210180171F201618212100
+00020007000002A702A60009003A000013373633321615140F0125072736353426232206
+0F013332363717072736353427262B01070615143332373637170721353E013713363534
+262735075E111A09102858027E1F16034A762A1A05424E422C1D1244140707113D4E2024
+4F814A2638103EFE052B1A0C7B0B1F2E020B84170C0A0F2551829A0219152D1C0911E920
+4104E8051F1518070F707F132227144E08A21008172B01BA251B14110410000000020004
+0000033502A60033003D000001150E01070306151416171521353E013F01210706151416
+171523353E01371336353426273521150E010F0121373635342627350537363332161514
+0F0103352C1C0C84031E31FEEE33290A40FEE34203192DF5291F0E760C1D30010F2D2D0A
+36011D2E0E2028FDC75E111A09102858028D1008182AFE1F0C0C1510051010042227E9F4
+0A0C161006101004203201AE2E12150F051010032024C6A4340B131403108284170C0A0F
+2551000000020003000001AD02A600090021000013373633321615140F0125150E010703
+06151416171523353E013713363534262735035E111A0910285801882A1B0D780F192CF4
+2A1F0B780D2028020B84170C0A0F25518210051A2EFE533517140E051010081A2901B92E
+10141502100000000003003AFFEE02BB02A6000900190029000013373633321615140F01
+051406070623222635343637363336160734262322070E011514163332373E013A5E111A
+09102858025F735C696D6377624F707D6B7669453C6357353D433F5C4E3B46020B84170C
+0A0F2551696BC43E477C6E5BC1456101863447517548B64E52575F4AD600000000020008
+000002D502A6002D0037000001072623220E020F01061514161F011521353E013F013635
+3426232207273E01333215140733353E013332171605373633321615140F0102D5101117
+2F5B432C0F280A171E24FEDF332B0D380A313C141A072433208F0203257F3A1C1412FD3B
+5E111A09102858025C0719517F6F348C221513100203101003202FC5423E69580B0E1A17
+CF1E100165950E0E7384170C0A0F25510002FFFA000002E302A600090039000013373633
+321615140F0113372635343637363332161514060F01333E0437170721373E0135342322
+070615141617072137170615141633325E111A091028589E0593473D6DA4767499810780
+1814221317081238FEE82857778C6C54612A2A18FEF12A1104201E020B84170C0A0F2551
+FE5325309B418032597C6A6BAC1A2502030B101F1605AEA613A962B55766723D590EA6B3
+0514101A1200000000040031FFF501830289000B00150021003A00000114062322263534
+3633321607373633321615140F0127140623222635343633321613170E01232235343F01
+36353426273536371703061514333201831D14151C1D15131DE35E111A091028581A1D14
+151C1D15131D360D2A3A253116300917292E72045E0A0E19021F141D1D15141C1E448417
+0C0A0F255131141D1D15141C1EFE400B4131371D52B1200C0F080110041503FEA9220A0F
+0002FFCD00000234029C001A001D00002123353E0135342F012307061514171523353E01
+370133131E0117270B010234F52D200214DC3B163EBA222B39011D1A5C0A1C28C32D9510
+02181B0812836F29191E03101007326301F0FDD73E2203F60107FEF90003FFF80000024C
+028D0018002400310000133332151407060715161514062321353E013713363534262713
+33323635342623220E01070307061514333236353426272682FAD040224D7E957EFEF029
+1D0D790B1E2F76266267383D17110E05492023435869261D22028D96462B171001267062
+6610061C2E01B42719160F04FEEE4E4A3834030F12FF007785072A58522D400A0C000000
+0001000800000285028D001E00000107273635342E01232206070306151416171523353E
+01371336353426273502852015031C505B231C05840E222BFB291E0C7B0A1B31028D9A02
+160B27210E0D13FE27320A121203101003202B01BA2419150F0410000002FFE00000020E
+029C00030006000029010133130B01020EFDD201901A1157FF029CFDC201B0FE50000000
+0001FFFF0000027A028D00300000010727363534262322060F0133323637170727363534
+27262B01070615143332373637170721353E013713363534262735027A1F16034A762A1A
+05424E422C1D1244140707113D4E20244F814A2638103EFE052B1A0C7B0B1F2E028D9A02
+19152D1C0911E9204104E8051F1518070F707F132227144E08A21008172B01BA251B1411
+041000000001FFFA0000025E028D00150000090133323637363717072135012322070E01
+07273721025EFE1DA1474B1B29241336FE0701DFAB6628161517132D01E6027FFDA50C14
+1E4A03A90E025B1B0F1F2B05930000000001FFF800000301028D0033000001150E010703
+06151416171521353E013F01210706151416171523353E01371336353426273521150E01
+0F01213736353426273503012C1C0C84031E31FEEE33290A40FEE34203192DF5291F0E76
+0C1D30010F2D2D0A36011D2E0E2028028D1008182AFE1F0C0C1510051010042227E9F40A
+0C161006101004203201AE2E12150F051010032024C6A4340B131403100000000003003C
+FFEE02BB029A0014002400340000013306152334262B012207233635331E013B01323637
+1406070623222635343637363336160734262322070E011514163332373E01020C133513
+151A693C1813351306141A621D32B6735C69716373624F707D6B7669453C6357353D433F
+5C4E3B4601AD8948201A3A815023161E106BC43E477B6F5BC1456101863447517548B64E
+52575F4AD60000000001FFF800000180028D0017000001150E0107030615141617152335
+3E01371336353426273501802A1B0D780F192CF42A1F0B780D2028028D10051A2EFE5335
+17140E051010081A2901B92E101415021000000000010007000002D2028D003500000115
+220705131E0117152135373635342E032F010706151416171523353E0137133635342627
+3521150E010F01373635342F013502D21C31FED6A817222FFEED1D2E030A0610027B410B
+1D2AF72B1A0C7C0E222D010E2A2E0B35998F2418028D1025E1FEDB281505101003041C06
+0E130B1C04D7ED260D171104101005182A01BD320C1514021010031F28C26D65240F0403
+100000000001FFCD00000234029C001900002123353E013534270B01061514171523353E
+01370133131E01170234F52D200246E5163EBA222B39011D1A5C0A1C281002181B081201
+AEFE6629191E03101007326301F0FDD73E22030000><0001FFEE00000368028D00280000
+01150E01070306151416170721353E01371301230B01061514171523353E013713363534
+27353313010368291D0B7B0E242D01FEF131280D7EFE88113E760946C5282517720C4AB5
+38014F028D10071B28FE45320C141501101005222F01CBFDCF0222FE5420162B05101005
+2F520191290B1E0410FE1401EC000001FFECFFF102D7028D0022000001150E030703230B
+0106151416171523353E013713262335331B0136353426273502D71B15190D109212E672
+091F27C62B241B75173FA0CF6A081B2A028D100607232A37FE050226FE5A1F1715130310
+1006335F019F3610FE0D01841C101B1404100003FFFA000002A8028D000D002600330000
+0107273635342623212206072737050727363534262B01220607273717061514163B0132
+3E01371307213717061514332132363702A82C11021C2CFEE3292F0F122A01703B110215
+289621290F123813031D218F21250E0D3438FDE72C11043E013F344015028DA40212051C
+151D28049BC5DA020C0F1510182504D1040B12160B11161EFEE3AEB30513112C20350002
+003CFFEE02BB029A000F001F000001140607062322263534363736333616073426232207
+0E011514163332373E0102BB735C696D6377624F707D6B7669453C6357353D433F5C4E3B
+4601A26BC43E477C6E5BC1456101863447517548B64E52575F4AD60000000001FFF80000
+0301028D0025000001150E01070306151416171521353E01371321030615141617152335
+3E01371336353426273503012C1C0C84031E31FEEE32290B91FEE39303192DF5291F0E76
+0C1D30028D1008182AFE1F0C0C15100510100421280208FDED0A0C161006101004203201
+AE2E12150F0510000000000200000000025D028D001C0027000013333215140607062322
+270706151416171523353E0137133635342627170716333237363534232292F1DA251F45
+883723350E1E27F42B1B0E74111C2BAE451D17572947822C028D94284D1A3908C1360912
+13041010061B31019E3D161411052DF50518285E7B000001FFFA00000293028D00150000
+010727363534262B011301213236371707213501033502931F1603415AB2A0FED4013139
+421B1342FDDA015EC1028D9A020F1C2D1CFEFAFEFB2F3A03C40F0136013A0E0000000001
+003B00000279028D001A00000107273635342B0103061514161F011521353E0137132206
+07273702792C1103653A890E161F23FEE0342C0B8F775324122A028DA402191551FE1631
+11171103031010051E28020F2B51049B00000001004E00000288029C002D000001072623
+220E020F01061514161F011521353E013F0136353426232207273E01333215140733353E
+013332171602881011172F5B432C0F280A171E24FEDF332B0D380A313C141A072433208F
+0203257F3A1C1412025C0719517F6F348C221513100203101003202FC5423E69580B0E1A
+17CF1E100165950E0E0000030032000002DB028D0025002D0035000001071E0115140706
+070615141633152135333236372E01353437363736353426233521152322070332373635
+3426011322070E01151401FE0C65845B55AF0B2A33FED7092E300C62845856AF0E192D01
+1F11582563783B3C47FEF6637143201902462A045659604D48031D1B1712101029380159
+585F4C4A04310F130E10107FFE973F405A3F4BFE9D0169462245318100000001FFE30000
+028F028D0031000001150E010F01171E01171521353E0135342F0107061514331523353E
+013F01032E01273521150E0115141F01373635342735028F213725A965122433FEF12B22
+0E43971742D528486C53670F252B0107291E103B91153D028D100B292BC2FF2D1A061010
+0111131023A5AC1A1621101007437E6100FF251C041010051113112793A718131F031000
+00000001004D0000030A029B0043000001150E04070E032307061514163315213532363F
+0122353436353423353332161514061514163337363534262B0135211523220F013E0337
+3E0333030A11190F070A021346595C343B062535FEDF312F0B3BC5222A1D2F35153A313B
+0A16270B0116114D10430F303E360B0C1529412E029B1004101C132908415D3316D21808
+181610102228D6921E660F361038361152132F33D92509130E101037F101101F3D272B34
+381B0001FFFA000002E3029A002F00003F012635343637363332161514060F01333E0437
+170721373E0135342322070615141617072137170615141633F20593473D6DA476749981
+07801814221317081238FEE82857778C6C54612A2A18FEF12A1104201E5E25309B418032
+597C6A6BAC1A2502030B101F1605AEA613A962B55766723D590EA6B30514101A12000003
+FFF8000001CC0358000B0017002F00000114062322263534363332160714062322263534
+3633321617150E01070306151416171523353E01371336353426273501CC1D14151C1D15
+131DC81D14151C1D15131D7C2A1B0D780F192CF42A1F0B780D20280327141D1D15141C1E
+13141D1D15141C1EAD10051A2EFE533517140E051010081A2901B92E1014150210000003
+004E000002880358000B0017004500000114062322263534363332160714062322263534
+3633321605072623220E020F01061514161F011521353E013F0136353426232207273E01
+333215140733353E013332171602401D14151C1D15131DC81D14151C1D15131D01101011
+172F5B432C0F280A171E24FEDF332B0D380A313C141A072433208F0203257F3A1C141203
+27141D1D15141C1E13141D1D15141C1EDE0719517F6F348C221513100203101003202FC5
+423E69580B0E1A17CF1E100165950E0E00000003001BFFF5022502890009002500330000
+01373633321615140F011703151416333237170623222706232226353436373E01333216
+153707342322061514163332373E02012C5E111A09102858D78E1210171C102540310358
+6A4541312A225D2E3C422E684D34792223495C01090601EE84170C0A0F255142FEFB1227
+3C4A077E696B54443D772B222B47306A9C94B86F3043BF061B1A0002001EFFF501A90289
+0009003D000013373633321615140F011317062322353436372E01353E01333216151406
+2322263534363534232206151416333236321615142322262322061514163332F85E111A
+091028584E104E79934232191C017B64303C201012150F253558292103241C142D091A0B
+2C5534255701EE84170C0A0F2551FE740A636F2D480D0425173C572F24141A16120A1D09
+143C3E1A1B070C091B0938332A270002000EFF3301BA02890009003B0000133736333216
+15140F0103173633321615140703061514172326353437133635342322060F0123133635
+3423220E05072736373633321514E75E111A09102858750285581F280A571E08490B214B
+0E1928921D204B520E0E04090A090B070B020C0D1031302801EE84170C0A0F2551FEF601
+D61D1C1827FEBF6D3E0F130D1F327801122F1923BB616A0131320C110409080D090D020A
+16133D2D290000020031FFF50120028900090022000013373633321615140F0113170E01
+232235343F013635342627353637170306151433327E5E111A091028583E0D2A3A253116
+300917292E72045E0A0E1901EE84170C0A0F2551FE840B4131371D52B1200C0F08011004
+1503FEA9220A0F00000000040013FFF601BE0289000B0015002100480000011406232226
+35343633321607373633321615140F012714062322263534363332161735321615140E02
+232235343F013635342322072736333215140F0106151433323E0135342601B21D14151C
+1D15131DE35E111A091028581A1D14151C1D15131D3D55552B46653586201C080C162F0D
+463D2C08320B3932572B28021F141D1D15141C1E4484170C0A0F255131141D1D15141C1E
+880F3B4F2F6D5E3F682A685D1D0A0E3C096A2D191BB527234E77903536280002001BFFF5
+022501B9001B002900000103151416333237170623222706232226353436373E01333216
+153707342322061514163332373E0202258E1210171C1025403103586A4541312A225D2E
+3C422E684D34792223495C01090601ACFEFB12273C4A077E696B54443D772B222B47306A
+9C94B86F3043BF061B1A0002FFD8FF33020202A6001D003A000007133E04333216151406
+07151E011514060706232227070607233601031416333236353423220623222635343332
+1633323635342623220609890D1D2E364E2D2F4A4F3121376A4735471D25260E114E1001
+01721B155288280921080D112C0320081F3B241F32497F01EF304D573B27313439661601
+033B31459D271E1185311D180292FE501015CC693B080D091806702E35266A0000000001
+0013FF3201B601B30020000009010E05232235343E013736353423220607233633321615
+140E01071301B6FEEE0202080C131D132621360A0F300F240D10253E241C060B01B201AC
+FE7B222147272F1532184A62168C298126268B3D391C44530B012D00000000020018FFF5
+01CC029C00260033000001140623222E03232206141E01171E0115140623222635343637
+2E0335343E0133321603342623220615141633323E0101CC131412160B0E1F19203E345B
+17231E9772474D9860083314163C49242C4C68261D42732B232B522D025C131D0F15150F
+2034303B16213D3669AD4A4460A50908301729132D3D1621FE8F3C36B067293260760001
+001EFFF501A901B9003300002517062322353436372E01353E0133321615140623222635
+343635342322061514163332363216151423222623220615141633320168104E79934232
+191C017B64303C201012150F253558292103241C142D091A0B2C55342557620A636F2D48
+0D0425173C572F24141A16120A1D09143C3E1A1B070C091B0938332A27000001001EFF47
+01DB02AB003A000001170E011514173E013332151406070E011514163332363332161514
+070E01232226353436333216333236353423220623223534372722263534360122052326
+301E6C241F7B4347853736071C033F441C164E221C27181310250C21304C0D3F0F7AD401
+1A2C3D02AB0F0D2613280824471921490630D95C312C01322A2D28222D1A1A11191D271E
+320A76D0CF011F1B20370001000EFF3301BA01B900310000371736333216151407030615
+14172326353437133635342322060F01231336353423220E050727363736333215149402
+85581F280A571E08490B214B0E1928921D204B520E0E04090A090B070B020C0D10313028
+E401D61D1C1827FEBF6D3E0F130D1F327801122F1923BB616A0131320C110409080D090D
+020A16133D2D290000000003001BFFF501EE02A6000F0018002200000114060706232226
+3534123736333216053336353423220E01172306151433323E0201EE4A3C58753C44835B
+38423843FEA5E91E35285E3DD3E91D382246352701FF73D250755C509700FF452A52F966
+67697A87554C598C42646200000000010031FFF500EB01B90018000037170E0123223534
+3F01363534262735363717030615143332DE0D2A3A253116300917292E72045E0A0E1972
+0B4131371D52B1200C0F080110041503FEA9220A0F000001000EFFF301D101B900270000
+3F0136373633321615140623222623220607171E0133150623222F010723133635342B01
+35363717990385600D0D1A1C1A140C200A1A383E62192220271E3E245D3C4C560E211C35
+6203E101AB27051B141519132D41AC2C19100D40A0D30135350E180E0714030000000001
+FFF4FFF001AF02A60021000025330623222635343E013703230136353423220607233633
+32161514021514163332019F101F46171E050902D160013604310E260D1021441C241413
+161E7B8B2F2F1B446A24FEC501AC242B6C242689464144FEF73F352F00000001FFDFFF33
+01E301AC002B000025170E0123222635343F01230E012322270E04072336371333030615
+1432363F01330306151433323601D50E2E3922151C0F2101445B2C1C080915090C0A0647
+1814834B4B0450820F214D4F130B0C217509473018151F2D6879661C245325281408234D
+0209FED6120930C13A7AFED44C010F1F000000010014FFEE01CB01B90016000001170E04
+0722353437133635342627353717033601BB100B244357834F1C035C021E23A30369E801
+B204407478573A03160607014D0A07100A01101F02FE861600000001001EFF4701BE02AB
+004B000001170615141736333215140623220615141736333215140E022322270E010714
+163332363332161514070E0123222635343633321633323635342322062322353E013726
+35343722263534012804491D5B342F4F4D25301A3B4F351A28220F1D2B3663013736071C
+033F441C164E221C27181310250C21304C0D3F0F7A01614D253A0D2202AB10183018053D
+1F1E23441B2213291E12190C050D127234312C01322A2D28222D1A1A11191D271E320A76
+528A2619263B301B12490002001BFFF501D401B9000F001E000001140607062322263534
+363736333216073426232207061514163332373E0101D439315369464D654F38403E4F54
+2621433D4A2A243D3C2228012D397B31534942539E2A1E4B282D315B71732C2F532E8100
+000000010013FFEE021801AC002B00000107230E021514333237330E0123222635343F01
+230E020706232226353437363F0123220607233E01330218156603261A1F2C1B100D4933
+1E1D114C680C3434241113141E1E321652062D301E102A5B4A01AC4A0B815D092A3D3757
+2B20222ED220B9721D0C1A1229080D39D11225463B000002FFD8FF3301D701B900140023
+000007133E0133321E0315140623222707060723360134262322060706151416333E0209
+4B228A51171C311D17BF6B261E240A154E140192231F2B56162E1C153E663287011E849E
+020E1B372773C8118D291D1F01E62E3E664FA61C1015016889000001001EFF4701C501B9
+002F000001142322262322061514163332363332161514070E0123222635343633321633
+32363534232206232235343E0133321601C5320C40115A8B3736071C033F441C164E221C
+27181310250C21304C0D3F0F7A6A9C4C1F360182360B674D312C01322A2D28222D1A1A11
+191D271E320A76589D591C0000000002001BFFF5021301AC0010001C00000107231E0215
+140623222635343E0133173426272206151416333236021312AA0F341DA367464C4A925A
+1221193A802A24436301AC4A1829272154904B4245875ECF2E480F9B632C2E9000000001
+000CFFF501AA01AC0018000001072306151433323637330E012322353437232207233E01
+3301AA15854624122C0D1012512E40623D50311019684301AC4A9F4F33291C3D54474FD7
+583D6500000000010013FFF601BE01B9002600000135321615140E02232235343F013635
+342322072736333215140F0106151433323E01353426011455552B46653586201C080C16
+2F0D463D2C08320B3932572B2801AA0F3B4F2F6D5E3F682A685D1D0A0E3C096A2D191BB5
+27234E779035362800000002001BFF33024E01B90021002E00003F013E03333215140E01
+070623072337222726353436373633150E02151416370732373E0135342E01232206DB2F
+0E202F42277E2F6643272E354D36531D4A6349392A33583038C040291C38560E100D2131
+0AA7334F502C7F35776D160CC2C20B1D624DA32A20100D6F8B3E3228EFEF0F1EC1502426
+08510001FF94FF3101F201B9002900000901061514163332363733062322263534370723
+0135342623220607233E0333321615140E01073701F2FEE30115180C200D101B42201F08
+C55D011F131A0D230D10080E1720151D1D010201C401ACFE9F1A2B593D25258949374A32
+F40159594C4323261E282C1640500314392BFE0000000001000FFF33029C01B9002D0000
+01150E040706230723372322272635343635342737333215140615141633133303323736
+373E0433029C1C2C1A18090932D1364C3609451D352638013553232929734C73251F4B1E
+0A0E1F26402901B910052224442426DBC2C2152657258221540610661CA21D3A3401A2FE
+5E1535862B3243241B000001001BFFF5028E01B70041000001333217161514070E012322
+2E01270E012322263534373E013B011522070E01151433323637263534373E0133321514
+070607061514163332373E013534272E012301D81250272D2B2668342431130A1F413335
+4C0A1A9665125135263139214A0F030C0B2C1A232A120D02231E462F161A0508302501B7
+21265349514648171A16252248452A27608410412F913E5E452A161D292D2A3A2E49491F
+14070E2232582A75332A1320160000030031FFF50167025E000B00170030000001140623
+222635343633321607140623222635343633321613170E01232235343F01363534262735
+36371703061514333201671D14151C1D15131DC81D14151C1D15131D3F0D2A3A25311630
+0917292E72045E0A0E19022D141D1D15141C1E13141D1D15141C1EFE320B4131371D52B1
+200C0F080110041503FEA9220A0F00030013FFF601BE025E000B0017003E000001140623
+22263534363332160714062322263534363332161735321615140E02232235343F013635
+342322072736333215140F0106151433323E0135342601A51D14151C1D15131DC81D1415
+1C1D15131D3755552B46653586201C080C162F0D463D2C08320B3932572B28022D141D1D
+15141C1E13141D1D15141C1E960F3B4F2F6D5E3F682A685D1D0A0E3C096A2D191BB52723
+4E77903536280003001BFFF501D40289000900190028000001373633321615140F011714
+0607062322263534363736333216073426232207061514163332373E0101075E111A0910
+2858AB39315369464D654F38403E4F542621433D4A2A243D3C222801EE84170C0A0F2551
+C1397B31534942539E2A1E4B282D315B71732C2F532E8100000000020013FFF601BE0289
+00090030000013373633321615140F011735321615140E02232235343F01363534232207
+2736333215140F0106151433323E01353426D85E111A091028581A55552B46653586201C
+080C162F0D463D2C08320B3932572B2801EE84170C0A0F2551440F3B4F2F6D5E3F682A68
+5D1D0A0E3C096A2D191BB527234E77903536280000000002001BFFF5028E02890009004B
+000001373633321615140F0117333217161514070E0123222E01270E012322263534373E
+013B011522070E01151433323637263534373E0133321514070607061514163332373E01
+3534272E012301635E111A09102858531250272D2B2668342431130A1F4133354C0A1A96
+65125135263139214A0F030C0B2C1A232A120D02231E462F161A0508302501EE84170C0A
+0F25513721265349514648171A16252248452A27608410412F913E5E452A161D292D2A3A
+2E49491F14070E2232582A75332A132016000003002DFFF601B402B6001F002B00380000
+011406070623222706073E0233321615140623222E023534363736333216073332363736
+35342623220613342623220E0115141633323601B42C21386A14093E221D2A4C2B3C4070
+532B3C1E0D595E3C2C2A3EFD073C4B2327120E306782221D265939201C3586026921360F
+1A01579C2B332D654056912844472884F0452C268D132225230E1466FED01E2D576E251E
+31B600020013FFF6020E02A6002D00380000250726270E01232235343F01363534232207
+2736333215140F010615143332372E013534373633321E0115140716033423220615141E
+011736020E052522277850860715080C162F0D463D2C08120B396B3D5C7437314936491C
+2F2A4F4F292C1240341ECE1303095C75681E1741180F0E3C096A2D191B3C27234ED42890
+5558342E3D553381800E0112A1573C264C611F7900000001004E000002B5029C00330000
+013312333216151423222635343E01353423220E020F01061514161F011521353E013F01
+36353426232207273E013332161514015B036F94262E3E141A1312142F5E47300E290917
+1E24FEDF332B0D380A313C141A072433204A45019801042D204C1914121607020D537F70
+318C1E1913100203101003202FC5423E69580B0E1A1762641F000003001BFF33025302AB
+001A0024002D0000010732171615140E032307233722272635343E033B0137130332373E
+01353427260313220E011514171601E143461F501934476539364E3649224D1A33456134
+0F4304712520395A2D0CED7238683C301502ABF20C1F5F245254452BC2C20B19671F5055
+472EF2FEF9FE66101DCA463A1C07FE66019A659446401308000000020011FFF5034001AC
+001E003B0000010723161514070E01232226270E01232226353437363723220607233E01
+3305210E0115143332363726343633321514070615141633323E02353403401640082B26
+6834332F101F4034354C0A1539232E42231018714001BEFE8E233039234D0A022E212039
+02231E2C45231101AC4A2025495146482424272148452A274C43332F3C704A2F903B5E4A
+250F58542E3B58070E223243645D261400000002003CFF3302BB029A001C002C00001737
+2E01353436373633361615140607060F0106151416171523353E010134262322070E0115
+14163332373E01D21B525F624F707D6B76735C4C53110F192CF42A1F018B453C6357353D
+433F5C4E3B4672630C79625BC145610186736BC43E330F3D3517140E051010081A027C47
+517548B64E52575F4AD60002001BFF3301D401B900120021000017372E01353436373633
+321615140607060F01133426232207061514163332373E015C36393E654F38403E4F3931
+3D4A38D52621433D4A2A243D3C2228CDC407473B539E2A1E4B41397B313D10C802132D31
+5B71732C2F532E81000000010037FF310299029A0030000017371E013332363534272627
+2E0335343E02333215140623222E0223220E0115141E03171E0115140623228D12125428
+4A65202A842F454122598AA84F881B1A111B122C204B966628494B622034319666767C10
+191D48392C1A22100513243E2B549D6C4145191C1418144C8A4F2834180D120D1448286E
+78000001001EFF4701E201CA002E0000013306070623220615143332363332161514070E
+01232226353436333216333236353423220623222635343736373601D30F0E5626624E57
+4D0B3D0E3C371C164E221C27181310250C21304C0D3F0F304A4048848501CAA62F142636
+41123D2E2D28222D1A1A11191D271E320A3636513B42090900000001000800000285028D
+002200000107273635342E012322060F013307230706151416171523353E013713363534
+26273502852015031C505B231C0540CD0BCC3A0E222BFB291E0C7B0A1B31028D9A02160B
+27210E0D13E324D2320A121203101003202B01BA2419150F041000010020FF4201D801B1
+000900000107230733072303231301D80DDB3CB409B4404B9201B138FF25FEED026F0001
+0013FFEE02A3030500270000090106151433323717062322263534363F01052701363534
+26232207273E013332161514060F012502A3FEF52623302B08553D28282440A2FE010A01
+1626140F302B082E422229272A47A2020301F2FE9E331625230F482A1D223B45AC900D01
+632E1D1013230F2622261C203D4BAC9100000001001F000001BD02AB0007000009012301
+2101330101BDFEDA640122FECA012664FEDE017DFE8301330178FED2000000010007FF31
+029C029A0025000013273E0133321615140007353E023534270E0307233E03372E012322
+070323130617105FAC6181A8FEF8BC61A0540D396648300D5E0E415D85461A814F18154B
+2B486301F7124E43B293D7FEC41117159BCB643F390A5C827D3A3B8A88670F475404FEE8
+010E1A0000000001005DFF2E01C00228001900001337041716151407273E023736353427
+0727372627072737265D0A010540146912040E0904150BB409B70A16B809B5430214144F
+D44148BA940B0A21190D4E4E343F5A1B5C30385C1C5A8F0000000001FFF0FFF3022F01B9
+002A000001070E011514333216151406232226353437270723373E0135342623222E0235
+34363332161514071725022F9C142B31191A201B23303001FC6D940D2A0C0E0C0E140922
+131F252D01010C01AC911F6B20291610131C2F283C5E01E588168226110B0207120F1419
+2825486D01F60002001BFF3301E401B90020002F000005233635342E033534373E013332
+161514060706232227071E041514133426232207061514163332373E0101391003385051
+3856297D403E4F393153694D2102043B4D4C34362621433D4A2A243D3C2228CD06061118
+1A27533B957036474B41397B315339012F34100B1F1F2101F62D315B71732C2F532E8100
+00000003003CFFEE02BB029A000F00190023000001140607062322263534363736333616
+052136353426232207060521061514163332373602BB735C696D6377624F707D6B76FE0A
+017D10453C6357310151FE8113433F5C4E4001A26BC43E477C6E5BC145610186AE403A47
+51754186454052575F4F0001001EFFF501A401B900220000010723262322060733072306
+15141633323637170E0123222635343E0133321633323701A412101053305D0DB306B40A
+2E2B283D2E102F53464248477C441B340B0F0601B9816B733B201F253840242E0A3A3256
+41478B5B111100010018FFF5019E01B90022000013273E0133321615140E012322262322
+072337331633323637233733363534262322065C102F53464248477C441B340B0F061012
+101053305D0DB306B40A2E2B283D01430A3A325641478B5B1111816B733B201F25384024
+000000030001000002770358000B00170046000001140623222635343633321607140623
+2226353436333216170727363534262322060F0133323637170727363534262B01070615
+143332373637170721353E013713363426273502491D14151C1D15131DC81D14151C1D15
+131DF61F16034B762A1A053F4E422C1D1244140723324E1F234F7F4A2638103EFE082B1A
+0C770B1F2E0327141D1D15141C1E13141D1D15141C1EAD9A0219152D1C0911E9204104E8
+051F15200E707E142227144E08A21008172B01BA2C281104100000010046FF300297028D
+003C000001333633321514020706232226353436333216151406151433323E0135342623
+22060F01061514171521353E0137132322060727372107273635342B010155015E667D65
+3E3C412734201E151E1C171F54381A27284B362D1046FEF4362A0B8C334D4420122A0200
+2B120366320150586C61FED5413F3121202A1A17121D0413CBDA252931272CA63E082901
+1010051C2A020E3249049B9F0211185000000002FFDC0000025B03920008002300000137
+36321615140F011707273635342B010306151416171523353E0137133635342623350163
+A20A1E1511ABD52C1103659E840F212BFB2A1D0C7B0A1B2202E8A00A150F120A6A5BA402
+121E4EFE173A0F1212031010031F2C01BA241915131000010043FFEE02A8029A002F0000
+0107272E0123220706072107210615141633323635342635343633321615140706232226
+35343637363332171633323702A825120942406D5A421B010A0DFEFB07624D33490B241D
+161C2844927590665566753B3014151B0B0298C60153506146692A272D65701B1B05180D
+1E241E132C26448B7A67BB3C49110716000000010007FFEE01F2029B0035000001072734
+26232206151416171E0115140623222726232207233717061514163332363534262F012E
+01272E013534363332171632363701F228123245343C2043432E73572642200F210A1222
+1402513F3A491A2227031C082D1E674B34211D22120A029BC8035350352F263343445232
+556E170C20E002090E495E47392135252A031F08303D294C580E0B0A10000001FFF90000
+017E028D0017000001150E01070306151416171523353E013713363534262735017E2A1B
+0D740F192CF52A1F0B750D2028028D10051A2EFE533517140E051010081A2901B92E1014
+1502100000000003FFE1000001B10358000B0017002F0000011406232226353436333216
+07140623222635343633321617150E01070306151416171523353E013713363534262735
+01B11D14151C1D15131DC81D14151C1D15131D7D2A1B0D740F192CF52A1F0B750D202803
+27141D1D15141C1E13141D1D15141C1EAD10051A2EFE533517140E051010081A2901B92E
+1014150210000001FFDEFFEE01CF028D001C000001150E0107030E012322263534363216
+1514061514323713363426273501CF2B1A0D671D5452354019281F0346127F0C1E2F028D
+1006172DFE91686E302818201B13061104274001C62C281104100002FFDDFFF00385028D
+0031003C00000133321514062321353E0137133635342B01220607030607062322263534
+33321E0233323637133635342627372115060F02061514333236353423024C57E2A278FE
+E2291E0C81041A77141305592F362C462437351316061311293C2346081E210501D03F0C
+44320F435D748C016C84688010061D2D01E01006131115FEBDAB372E2D2137181E187680
+0103200F1A13011010082FFEBA2D132A5B63660000000002FFE40000038A028D00350040
+0000013332171E011514062321353E013F01210706151416171523353E01371336353426
+273521150E010F0121373635342627353315060F02061514333236353423024F59702C1F
+27A278FEE2291E0C3FFEF54303192DF529200E750C1D30010F2D2D0A37010B2C0C1C2BF7
+3F0D43330E425D758A016C150F3C28677D10061D2DE8F60A0C161006101004213101AE2E
+12150F051010032024CAA82C121511051010082FFEBA2A162A5B63660000000100460000
+02BD028D003700002901353E013F013635342322060F0106151416171521353E01371323
+22060727372107273635342B0103333633321615140F01061514161702BDFEF332260B15
+164C284B36330A1F27FEF435280C8F334E4420122A02002B120365324B015A6A3E4A0C22
+06202F100421284D502659272CB7260E1612031010051B2B020E3249049B9F02111850FE
+E7583736312C80180F12100500000002FFE4000002910392000800520000013736321615
+140F010333323637363736333216151423222623220E04070E0107151E011F011E011715
+23272E082726230706151416171523353E01371336353426273521150E01070154A20A1E
+1511AB961C4D5428201B2331172532121F06070E0B0D0709012A46371E21154317222FA5
+72030903080307040808050E0D390B1D2AF52B1C0A760E222D010E2A2E0B02E8A00A150F
+120A6AFE8A4E52421C251F1436280A0E150E1401504E1002122B2E9728150510F8061507
+0F050A0306030103D92C071711041010051A2801BD320C1514021010031F280000000002
+006EFFF202CC0377001B0045000001140623222635343633321614061514163236353426
+35343633321617150E0107030623222635343633321E0233323637032E0127353315070E
+011514171B01363534233502755A35345C2213101811234222111A11131F57283524DD51
+5C2231211415180406071C4A1E541E1C29EF1A1B16054F91143C033F2D37372D1C1C1522
+1406111A191206151110151CCE10042A41FE7692241E1F1E181E1862440119662C091010
+030310130F12FEFB0106260A19100001FFE7FF4D02EB028D0036000001150E0107030615
+141617072322070607233635342B01353E01371336353426273521150E0107030615143B
+013236371336353426273502EB2C1C0B750E1C2B04B648361515130954B52A1F0D730C1C
+31010F2E2C0A83041CD614130784031F28028D1008182AFE46310E151005104B1D4B2927
+631004213101AE2D13150F051010041F24FE15120312101801EF0B0B1415031000000002
+FFCF00000236029C001A001D00002123353E0135342F012307061514171523353E013701
+33131E0117270B010236F52D200214DC3B163EBA222B39011D1A5C0A1C28C32D95100218
+1B0812836F29191E03101007326301F0FDD73E2203F60107FEF90002FFE40000025B028D
+001D002A00000107273635342B0122060F0133321514062321353E013713363534262735
+13070615143332363736353423025B2C1103675D201A063A57E2A278FEE229210C750C1B
+2B64330D42565D17078C028DA503210E4F0C17DA84688010061F2C01B32C1215110510FE
+BBBB27182A39541918660003FFE90000023B028D00180023003000001333321615140607
+15161514062321353E013713363534262713333235342623220E010F0206151433323635
+3426272671FA666A634C80957EFEF02B200C730B1E2F7725C9373E171210054520204359
+66271E1D028D453D4A550D01276F626610061D2D01B42719160F04FEF096372F030F12FC
+7574122A53512D400A0A0001FFDC0000025B028D001A00000107273635342B0103061514
+16171523353E013713363534262335025B2C1103659E840F212BFB2A1D0C7B0A1B22028D
+A402121E4EFE173A0F1212031010031F2C01BA241915131000000002FF99FF4D02B8028D
+001F002E000001150E010703061514330723363534262321220723373332361336353426
+27371B013635342B012206070E0107333202B82B1D0C780943341309332EFECE63461335
+134C7C50081E2205BD86031C97141106435D36FB24028D1006192CFE4024102EC33F113A
+29B3C3EC01241B141A130110FDC401F50A08111013F3F43B00000001000100000277028D
+002E0000010727363534262322060F0133323637170727363534262B0107061514333237
+3637170721353E013713363426273502771F16034B762A1A053F4E422C1D124414072332
+4E1F234F7F4A2638103EFE082B1A0C770B1F2E028D9A0219152D1C0911E9204104E8051F
+15200E707E142227144E08A21008172B01BA2C281104100000000001FFC9000003CC0295
+0067000001333237363736373E01333216151423222623220E01070607151E011F011E01
+171523272E012726230706151416171523353E013F0122060F0123353E013F0136373526
+353436353423220623222635343633321514061514163B013736353426273521150E0107
+0224113E2E3B312414131E1A17252E1217061325381F2F321E21154317222FA572141415
+0E02390B1728FB2E250A41233528CCA3311E2492404C490513062A121617302158053F41
+0A2C0E222D010E2A2E0B01721A23634A1514101F14362841661D2B0F02122B2E97281505
+10F82C1B0603D92C071810041010051B27F11D31FA1005112CB44E030224530D380F352C
+1C111724600D440B3D2AA2320C1514021010031F280000010009FFF00224029C003D0000
+131514333237363332161514070607151E0115140607062322263534363332161514070E
+021514163332363534262B01373332363534262322060F0137B82211242E365C552F373D
+2A4C5C494057565C1D1E1A1A10030D05402D5B70413A2D09284C5F362D4960241225029B
+0312090D553F3D2F37060206413A4D6E1A17483F1F291C161115040D0805161E70593338
+2457462D414E5701C9000001FFE7000002ED028D0031000001150E010703061514161715
+21353E0137130106151416171523353E01371336353426273521150E0107030136353426
+273502ED2B1D0C790A1A33FEF334260B6DFE71062125F22F1A126E0C1C31010B2B2F0E65
+018C061E24028D1007192AFE3B220A1D100510100322280195FE6D130E17150210100720
+42019C2E11160E051010032536FE830191180D121003100000000002FFE7000002ED0377
+001B004D0000011406232226353436333216140615141632363534263534363332161715
+0E01070306151416171521353E0137130106151416171523353E01371336353426273521
+150E0107030136353426273502655A35345C2213101811234222111A11131F882B1D0C79
+0A1A33FEF334260B6DFE71062125F22F1A126E0C1C31010B2B2F0E65018C061E24033F2D
+37372D1C1C15221406111A191206151110151CCE1007192AFE3B220A1D10051010032228
+0195FE6D130E1715021010072042019C2E11160E051010032536FE830191180D12100310
+00000001FFE4000002910295004900001333323637363736333216151423222623220E04
+070E0107151E011F011E01171523272E082726230706151416171523353E013713363534
+26273521150E0107E11C4D5428201B2331172532121F06070E0B0D0709012A46371E2115
+4317222FA572030903080307040808050E0D390B1D2AF52B1C0A760E222D010E2A2E0B01
+724E52421C251F1436280A0E150E1401504E1002122B2E9728150510F80615070F050A03
+06030103D92C071711041010051A2801BD320C1514021010031F280000000001FFDDFFF0
+02E4028D0033000001150E01070306151416171521353E0137133635342B012206070306
+070623222635343633321E02333236371336353426273702E42C1C0C81032629FEF13826
+1179031A89141305592F362C4626351D18121708130F293D2246081E2105028D1007182B
+FE1F0C0C151203101004274101C70B08131115FEBDAB372E28231B1F191F197B7E010320
+0F1A130110000001FFDF00000357028D0028000001150E01070306151416170721353E01
+371301230B01061514171523353E01371336353427353313010357291D0B760E242D01FE
+F231280D7BFE87113E760946C5282517720C4AB538014F028D10071B28FE45320C141501
+101005222F01CBFDCF0222FE5420162B051010052F520191290B1E0410FE1401EC000001
+FFE6000002ED028D0033000001150E01070306151416171521353E013F01210706151416
+171523373E01371336353426273521150E010F01213736353426273502ED2C1D0B80031E
+31FEF033290A3FFEE14203192DF6022A1F0D730C1C30010F2D2F0A34011E2D0E2028028D
+1008182AFE1F0C0C1510051010042227E9F40A0C161006101004213101AE2E12160E0510
+10032024C6A4340B1314031000000002003CFFEE02BB029A000F001F0000011406070623
+222635343637363336160734262322070E011514163332373E0102BB735C696D6377624F
+707D6B7669453C6357353D433F5C4E3B4601A26BC43E477C6E5BC1456101863447517548
+B64E52575F4AD60000000001FFE3000002E9028D002C000001150E010703061514161715
+21353E0137133635342B012206070306151416171523353E01371336353426273502E92C
+1D0B80031E31FEF133290A80041CD71513078503192DF52A210D720C1D30028D1008182A
+FE1F0C0C151005101004222701E51203121018FE110A0C161006101004213101AE2E1215
+0F05100000000002FFE800000242028D001B002700001333321514060706232227070615
+1416171523353E0137133634262717071633323736353426232277F1DA251F4588322733
+0E1E27F42B1B0E71111C2BAC421D16552B4743412C028D94284D1A3909C2360912130410
+10061B31019E3F28110533F00519285E403500010043FFEE02B2029A0020000001072726
+2322070E01151433323637170E0123222635343637363332171633323702B2251212836D
+5A3537AF3E67401243814D759066556675453014151B0B0298C803A36138A055CD34430F
+4F468B7A67BB3C491107160000000001004600000284028D001A00000107273635342B01
+0306151416331521353E01371323220607273702842B1203653E820E2236FEE0342D0A8C
+3C4E4420122A028D9F02111850FE17311119151010051E28020E3249049B0001006EFFF2
+02CC028D0029000001150E0107030623222635343633321E0233323637032E0127353315
+070E011514171B01363534233502CC283524DD515C2231211415180406071C481E521D1D
+29EF1A1B16054D93143C028D10042A41FE7692241E1F1E181E1861450119652D09101003
+0310130F12FEFB0106260A19100000030049000002F6028D0025002C0034000001071E01
+15140706070615141633152135333236372E013534373637363534262335211523220703
+3237363534011322070E01151402130C66895B55B10B2B32FED7092F310C63875856B10E
+222E01190558255F783B3CFEAF60743D201902462A045758604D48031D16181610102938
+0159585F4C4A04310F120F101085FE9D3F405A7EFEA901634022453181000001FFBD0000
+0269028D0031000001150E010F01171E01171521353E0135342F0107061514331523353E
+013F01032E01273521150E0115141F013736353427350269213725A965122433FEF12B22
+0E43971742D528486C53670F252B0107291E103B91153D028D100B292BC2FF2D1A061010
+0111131023A5AC1A1621101007437E6100FF251C041010051113112793A718131F031000
+00000001FFE7FF4D02EB028D0033000001150E010703061514161707233E013534262321
+353E01371336353426273521150E0107030615143B013236371336353426273502EB2C1D
+0C760E1E2C34130207312DFE272A1F0D730C1C31010F2E2C0A83041CD614130784031F28
+028D1008182AFE46310E141105C3063D0C3A2A1004213101AE2D13150F051010041F24FE
+15120312101801EF0B0B141503100001003600000297028D0032000001150E0107030615
+1416171521353E013F010623222635343F0136353426273521150E010F0106151433323F
+0136353426273502972C1D0B80031D31FEF033290A3C5C62454F0A24081E30010F2D2D0A
+250A66474A320D1E28028D1008182AFE1F0C0C1510051010042227DB2E25331C2586200B
+150F0510100220258A26133D25B9320D1314031000000001FFF2000003D1028D00400000
+01150E01070306151416170721353E01371336353426273521150E0107030615143B0132
+371336353426273533150E0107030615143B013236371336353426273503D12C1D0B750E
+222D01FCAA2A1F0D73081A3001052D230A83041C8A200D83031526E82B1A0C84041D8414
+140784031D28028D1008182AFE46310E141006101004213101AE1E22150F051010041D26
+FE170C09143001E70B0B161303101008172BFE1A0C0914121801ED0B0B15140310000001
+FFF2FF4D03D1028D0047000001150E010703061514161707233E013534262321353E0137
+1336353426273521150E0107030615143B0132371336353426273533150E010703061514
+3B013236371336353426273503D12C1D0B750E1E2C34130207312DFD4A2A1F0D73081A30
+01052D230A83041C8A200D83031526E82B1A0C84041D8414140784031D28028D1008182A
+FE46310E141105C3063D0C3A2A1004213101AE1E22150F051010041D26FE170C09143001
+E70B0B161303101008172BFE1A0C0914121801ED0B0B151403100002003F0000028C028D
+001A002500000133321514062321353E01371336353423220607273721150E010F020615
+14333236353423015357E2A278FEE6291E0C7B022A4E3C23122A016D1F230744330E435D
+748C016C84688010061D2D01D00811212E4E049B1004181BFEBA2A162A5B636600000003
+FFE40000037D028D0017002E0039000001150E01070306151416171523353E0137133635
+342627350133321514062321353E0137133635342627353315060F020615143332363534
+23037D2A1C0C720F192CF62A1F0B750D2028FE5857E2A278FEE6291E0C740C1C2BF23D0C
+44310F435D738C028D10051B2DFE533517140E051010081A2901B92E1014150210FEDF84
+688010061D2D01B42C121511051010082FFEBA2D132A5B6366000002FFE400000219028D
+00180023000013333217161514062321353E0137133635342627353315060F0206151433
+3236353423E0577D3332A377FEE5291E0C750C1C2BF43D0D45310F435D738C016C272541
+617E10061D2D01B42C121511051010082FFEBA2D132A5B6366000001000FFFEE027C029A
+002B00001333163332373633321615140706232226353436333216140615141633323736
+372137213635342322060F019D1604192228285462848C73B055691D1E191B254134785A
+4919FEF10B010A049B547023120299160C0B9073B0897044441E291D2A2807161E5F4E7C
+2A1B21D44E55010000000002FFE0FFEE0352029A002B003A000013333637363332161514
+060706232226353437230706151416171523353E01371336353426273521150E01070534
+262322070E0115143332373E01DE552E5966705E646D575F61576512524003192DF52A20
+0D720C1D3001102D2D0A01E039345752333B6D544738440170755461787173CA3F477669
+3D3CF40A0C1610061010051E3301AE2E12150F0510100320244C434C754AB8569D5F4BD9
+00000002FFCF000002A4028D0020002E000001150E01070306151416171521353E013F01
+23012335363F013522263534373633033736353426232206151416333202A42C1D0B750B
+222BFEEE33290A3A1FFEDB98322EF0425E3551C212330D0F1563884D4233028D0F09182A
+FE4628121716021010042227D4FECF10032EF5024F3C4A334DFECEB92B140F0D575B3137
+000000020017FFF501E201B90021002F000025170E0123223534370E0123222635343637
+363332173F021706070215143332370334262322070E0115143332373601D50D38351E28
+17385E352C3844375350430D0B033D070105590E0F25471E1A443F212C3C3B444D6F0B44
+2A29195A54493D37438B344E3A300307030411FEBC270D2901171A205C31782E4A626F00
+000000020024FFF5021702AB002600350000013306070E01070E02071736373633321615
+140607062322263534373E053B013236033426232207061514163332373E010207101C42
+15570B2E583A11023B2A38403E4F39315369464D0F0B18293540552F3C2422712621433D
+4A2A243D3C222802AB5018080101064F63340139161E4B41397B315349423A3927486350
+48280DFEB42D315B71732C2F532E810000000003001FFFF501A701B900170021002C0000
+2515321E0315140623222635343E023332161514063734232206073E0307342322070615
+1433323601141217281813845157451F3F734A303D52103F30631831464B282C4237490C
+503945F502010A12251A426054492D605E3C282B2D39683C5D680A14212DB7491A213266
+550000010001FFF5018001B90023000013273633321615140E03151433323637170E0123
+222635343E03353426232206650A5462323D3E58583E4F223C2D0C38512F3D443E59583E
+26212739015C0D50322926392525362337131F0C3323302B223B2B28331C192114000002
+001EFFF501D602AB00130022000013371E0115140E01232226353436333217372E011334
+26232207061514163332373E01D30D6B8B4C8851464DAD6B3B1C020A65632720453F462B
+2346362027029A1118BB7161AA67474573C5310153A3FEC72B3359617F2A37522F840002
+0022FFF501A601B90014001F000025170623222635343633321615140607061416333227
+173E013736353423220601700C58743E50C171272BA1850A332A4A9701444C1B32232977
+6D0C6C4C3D74C72420416911145232AF011120193031278A000000010000FFF5031701B9
+004D000025333E0133321615140623222E022322070E01151416333237170E0123222635
+343723072337230E01232227263534363332160616333236373E01353426232207273E01
+33321615140733373301B63A1B794B2523160E1313030E0E191F242C2720372F0D253E2E
+323E0A383D493D3918754D27131B1B0D120F020A0F0E260E242A2720372F0D253E2E333D
+043A3449F252751F18151414191422288F36383B46093729504A2825DCDC588F0B101B14
+1B161A16130F279036383B4609372945492613BE00000001FFEEFFF5016501B900360000
+1333143332363332161514060F011E011514070623222635343633321615140615141633
+32363534262322073733323635342623220723650E0D0A3C1C453E503401303223377240
+481A141215101C1841432E280E08071E3144241F55301001B91111372A323A07010B3223
+32233A31281A1A17130B1A0C0A134A35262B0117422724276C000001001DFFF501EF01B9
+002E000025170E0123223534370E012235343F01363534232207273E01333215140F0106
+15143332373E01373303061433323601E10E303624302D59616A1B23110A1A3E0E2F3B25
+2E163603142D612125284A530F0B0C2277094A2D302D989265351E6281410D11520A482F
+30214FC60907199332536EFED139222000000002001DFFF501EF029B0014004300000133
+0E01232226353436333216140615141633323613170E0123223534370E012235343F0136
+3534232207273E01333215140F010615143332373E01373303061433323601CA12084F3F
+30511F12101811241D303E250E303624302D59616A1B23110A1A3E0E2F3B252E16360314
+2D612125284A530F0B0C22029B3D5F392E191C15221406101B45FE13094A2D302D989265
+351E6281410D11520A482F30214FC60907199332536EFED139222000000000010012FFF5
+01E501B9003A00003733323E0333321615140623222623220E02071516171E0233323736
+37170E01232226272E0427072313363534262B01353637179F0B23392727372217211B13
+111E100C201E331C391F0B120D0A1918050A0F1E361F26260E06060F0F1A103C4B4E1318
+1E0B5B4504F2293B3A291F121718252833340902053A1642242A08120B3C313732161526
+141504DC012449080F0C0F0D0D020001FFD4FFF401BA01B9003C000025170E0123222635
+343F01363534232207060F01140E0407062322263534363332171E0233323E023F013E01
+33321615140F01061433323701AC0E313C25141B102C0F1D1B1F221E120D050E0A11081D
+2C19221A12170B030202040E17170F0E0E21633C1D230A380C0F1929730D432C1B1B103B
+A23A19211D21653D012C0E28141B091F1A1917171806140B16362F2F307255221B1923CB
+2B24330000000001FFD3FFF4025901B0002E000025170E01232226353437032303070607
+0E012322263534363332171E023332363F0133133313330E011514333237024B0E333623
+141B3AD3082730231E13232019231912170B030102041B2F1A4B3B2702CD3C1C4110122B
+740D462B1B1B59B3FEC80147966D241715191917171706140B5753EEFECC013455FC2713
+350000010014FFF701D801B90023000025170E0123222635343F01230723133635342627
+3536371707333733030615143332373601CA0E333623141B1018AE3A495D021B264F5204
+3AAD3649530E10132A07750D462B1B1B103B5BD3015E0A0D0F0B010F091102CEC7FEC538
+0512350800000002001DFFF501D601B9000F001E00000114060706232226353436373633
+3216073426232207061514163332373E0101D639315369464D654F38403E4F542621433D
+4A2A243D3C2228012D397B31534942539E2A1E4B282D315B71732C2F532E810000000001
+0013FFF701DF01B90030000025170E0123222635343F01363534232206070E0107231336
+3534262735363717073E0133321615140F010615143332373601D10E333623141B102C0E
+181D4532211F244B60021B26683A04434A6C311F220A380E10132A07750D462B1B1B103B
+A236191D4549314E7901610A0A0F0B010F0E0C02DA7666211C1923CB320B123508000002
+FFB3FF3301D001B9001E002E0000130736333215140E0123222706151416331523353E01
+37133635342B013537173426232206070E0115141633323736D71F4B606D548847242128
+1B23CB201B09730F2C189DAA1D21274E12162B1B154E434501B56D717D51985E11A50110
+0D1010011A2401B0370C1B0F1A802C29442E399C1911155F60000001001BFFF501A601B9
+0022000025170E0123222635343637363332161514062226353436353423220706151416
+333236015B102E5738474C44374D5A2E3B1C28130F253F2E5B2E2B27406B0A3A324E4C43
+7D2D3D2E23141C1711091D0A14306089363C2600000000010011FFF702C501B900430000
+250706232235343F01363534262322070E01072337363534232206070E01072313363534
+2B013536371707363332161514073E01373633321615140F0106151433323F0102C5054D
+43280D3A070C082F54252A1D4B1B441619522A1923244B491929196939033A825A1D1F28
+354724201F1B1F0D3A0A0C162B1569076B2E0F33E31C0A090C753469735DEB24194F4027
+587701065B19160F0F0B02D1D3201C267254551714211A1330D8260710351A0000000001
+FFC3FF32018501B90031000037173E01353427263534363332161514070E012322263534
+363332163332363736353426272E012322073536373637333216CE1543371A1A1711161E
+834E932B171C171013190C194C170A3E140E211E100F160A2942040B3DBA6E6E73201010
+11161015201757DA819E181311171C5626140F1EFB33251B04110402080ABA0000000003
+001DFF3302A502AB003100410051000001333E0133321615140E01232226270706151416
+331523353E013F01230E0123222635343E013332173635262B0135363717133426232206
+070615141633323E022535342623220E021514163332363701A6022240322C3D3B6D412E
+2F0229101B23CB201B0930011F3925353B3B6E4047153C01281B603D0760272124420B36
+2D182C462513FEF52E18294427152720254409015F32284E3A4A9062361D9F3C0D100D10
+10011A24B6281B5A3F43886045DC161B0F0D0E06FE892C3C40209C2F242F3B5A5A380424
+2F3C585A242D3F411F000001FFDDFFF501B701B9003C000013173E013332161406232226
+232207141F011633323F01170E012322262F01070E012322263534363332171633323F01
+272E0123220F01273736333216EB0C3541211217130F091E0D1D4508200A14101F150F2B
+321D181A091D581F2719171B130F0C140F0B1122521C0A11130C1B12030B502513160163
+39513E15201411790D208629281C09432F1E2677772A1A16140F150B0931747C2C180705
+10041D2400000001001DFF4A01EF01B90040000025070615141615140607273E01353426
+353437270623223534370E012235343F01363534232207273E01333215140F0106151433
+32373E0137330306143332363701EF221707243C0917120329011A23302D59616A1B2311
+0A1A3E0E2F3B252E163603142D612125284A530F0B0C22256E3423210D250B23321A120B
+1919041A0222300115302D989265351E6281410D11520A482F30214FC60907199332536E
+FED1392220310001002AFFF701C201B90028000025170E01232235343F01062322353437
+363534262335363717070615141633323F013303061514333201B40E303A242F160D4537
+681C0716274254042F041B222C353B4A4F130B177A094931300E56322048106619040C0C
+0F071303AC101217161CD9FED549051100000001001FFFF502F101B90044000025170E01
+2322353437230E012235343F0123070E012235343F01363534232207273E01333215140F
+010615143332373E013733030615143332373E0137330306151433323602E30E30362430
+2F0259616A1F1D02155A616A1B23110A1A3E0E2F3B252E163603142D612226274A580314
+2D612125284A4F130B0C227709492E3024A1926535186B61229265351E6281410D11520A
+482F30214FC60907199333556BFEA30907199332536EFED54806112000000001001FFF4A
+02F101B9005600002517070615141615140607273E013534263534372706232235343723
+0E012235343F0123070E012235343F01363534232207273E01333215140F010615143332
+373E013733030615143332373E0137330306151433323602E30E221707243C0917120329
+011924302F0259616A1F1D02155A616A1B23110A1A3E0E2F3B252E163603142D61222627
+4A5803142D612125284A4F130B0C22770934261C0D270B23321A120B1919041A02223001
+153024A1926535186B61229265351E6281410D11520A482F30214FC60907199333556BFE
+A30907199332536EFED5480611200002000CFFF5021001B90023002F0000373336333216
+151406232226353436372706232226232207273E01333216333237170E01173423220706
+151416333236F5034C513D3E93634C415137011F2B1041192B1D0C1B2F301B521C2C1B0A
+2C3CC2483134332520415AD548392D4D75403C459630020D0E35063B2E1717092B894944
+292765171E7000030032FFF5029101B90013002C0038000025170E012322263534371333
+030615143332363725173633321615140623222635343F01363534262335363717133423
+22070615141633323602830E2B3C25141B105249520E100B1A18FE29014C513D3F94634C
+3C11230E16274E48048A493134332520415B750945301B1B103B0138FEC5380512171E7B
+0148392D4D752E2A19448B3A090C0C0F0A1003FEFD44292765171E70000000020032FFF5
+01B101B900180024000037173633321615140623222635343F0136353426233536371713
+342322070615141633323697014C513D3F94634C3C11230E16274E48048A493134332520
+415BD60148392D4D752E2A17468B3A090C0C0F0A1003FEFD44292765171E700000000001
+0007FFF5018701B9002A0000133314333236333216151406232226353436333216151406
+15141633323736372337333635342623220723690E0D0B3C1B4F52A06F343D1A14121510
+1A1353371B0C8905870426275A341001B91111594A77AA32251B1B17130B1A0C0D10582E
+47161C1A3B466C00000000020015FFF5028F01B90020002F000037333E01373633321615
+14060706232226353437230723133635342B013536371705342623220706151416333237
+3E01A04B17533538403E4F39315369464D0D483A4C4F13291969390301612621433D4A2A
+243D3C2228E9385E1C1E4B41397B315349422A29D30124460A1C0F0F0B02712D315B7173
+2C2F532E81000002FFE7FFF701C101B00032003D000025170E01232235343723220E0207
+0E012322263534373306151416333236373E013F012E0135343E013B0103061514333236
+273736353423221514163301B30E30362430241F0E162223101332261C25081004120E12
+170D103629012F37485B388150120B0C225E29021797392C7709492E30336F0615362931
+2726291711140818191F29332C0502042D20374415FED648071120999D08031376202500
+000000040022FFF501DB025E000B0017002C003700000114062322263534363332160714
+0623222635343633321613170623222635343633321615140607061416333227173E0137
+36353423220601DB1D14151C1D15131DC81D14151C1D15131D5D0C58743E50C171272BA1
+850A332A4A9701444C1B32232977022D141D1D15141C1E13141D1D15141C1EFE2D0C6C4C
+3D74C72420416911145232AF011120193031278A000000010014FF3001C002AB003C0000
+37333E01333216151407030E012322263534363332151406151433323637133635342322
+06070E0107231323373337363534262B0135363717073307239A01476D301F220A4D205A
+41222D1811270C121E291A4811181A58271E1C254B81670C65070D1A0F1B4C510728A90C
+A8E77062211C1923FEDC7B71231B121A250C0F070D4F68012544031D513D2F4C7D01EB26
+192D110C0D0F091206942600000000020001FFF501C702980008002C0000133736321615
+140F02273633321615140E03151433323637170E0123222635343E03353426232206E8A2
+0A1E1511ABA60A5462323D3E58583E4F223C2D0C38512F3D443E59583E2621273901EEA0
+0A150F120A6A920D50322926392525362337131F0C3323302B223B2B28331C1921140001
+001AFFF501B901B900260000010723342322060733072306151416333235343633321615
+14070623222635343633321633323701B924103F397719A105A1082D2A431E180F143F36
+3B4950B76F1B2E0B0F0601B9816C6A4D161D2B3F4644171D150D2E211C4A4B70BF111100
+00000001FFF7FFF3015501BA002900000107232623220615141716151406232227262322
+07233733163332363534272635343633321716333237015514100E4B1B203644513F1D1A
+1517140910141014502329383F42371424160E140A01BA8C741E1B26404F393D490A0915
+9F8828252D464F34323A0A0712000002002BFFF50102028E000A00230000011406232226
+353436321603170E01232235343F0136353426273536371703061514333201021D14161A
+1B281E2A0D2A3A25311630091729415F045E0A0E190257151E1D18171E21FE050B413137
+1D52B1200C0F08010F051503FEA9220A0F000003002BFFF50165025E000B001700320000
+01140623222635343633321607140623222635343633321613170E01232235343F013635
+34262735363717030615141633323601651D14151C1D15131DC81D14151C1D15131D3C0E
+293C2532183009162937680560090A060C24022D141D1D15141C1E13141D1D15141C1EFE
+330C3F3339145AAF220B0F08010F041603FEAA220B06092300000002FF54FF3100E7028C
+000B002A000013140623222635343633321607030E012322263534363332151406151433
+32363713363534262B01353637E71E14171F2015141F21681F5B41232C1811270C121E29
+1A4810151B1A24850256141E1D17161E21B5FE667972221B121A250C0F070C4E68012441
+0F110E0F02180002FFD4FFF4027701B9003B004700002533363332161514062322263534
+3F01363534232207060F01140E0407062322263534363332171E0233323E023F013E0133
+3216151407173423220706151416333236016C01444F3D3A8D5B4C3C111D0F1D1B1F211F
+120D050E0A11081D2C19221A12170B030202040E17170F0E0E21633C1D230A9744322933
+1F1F4153D548382E4D752E2A1F3E703A19211D20663D012C0E28141B091F1A1917171806
+140B16362F2F307255221B19238D44293359171E6F0000020015FFF5028901B900280034
+000001073633321615140623222635343F01230723133635342627353637170733373635
+3427262335363713342322070615141633323601BA3B444F3D3A8D5B4C3C110A9A394C5F
+011B264F52043A9A160E0B0D2552447D443229331F1F415301B6E148382E4D752E2A1746
+29D3015E05120F0B010F091102CE4C32110C06060F0A10FEFA44293359171E6F00000001
+0014FFF701DF02AB0036000025170E0123222635343F01363534232206070E0107231323
+373337363534262B013536371707330723033633321615140706151433323601D20D2E3E
+2614181437071C1B55281F241D4B81670C65070D1A0F1B4C510728A90CA8468264212030
+21100C1D760D41311713114BCF1C0519503C305B6F01EB26192D110C0D0F0912069426FE
+FBD3251E2B966518121D00020012FFF501E50298000800430000133736321615140F0233
+323E0333321615140623222623220E02071516171E023332373637170E01232226272E04
+27072313363534262B0135363717BDA20A1E1511AB410B23392727372217211B13111E10
+0C201E331C391F0B120D0A1918050A0F1E361F26260E06060F0F1A103C4B4E13181E0B5B
+450401EEA00A150F120A6AFC293B3A291F121718252833340902053A1642242A08120B3C
+313732161526141504DC012449080F0C0F0D0D0200000002FFC3FF3201A1029B00140048
+000001330E01232226353436333216140615141633323603173E01353427263534363332
+161514070E012322263534363332163332373E013736353426272E012322073536373637
+333216018F12084F3F30511F12101811241D303EB31543371A1A1711161E834E932B171C
+1710131E0C121E0D33070A3E140E211E100F160A2942040B3D029B3D5F392E191C152214
+06101B45FE566E6E7320101011161015201757DA819E181311171C210D430B140F1EFB33
+251B04110402080ABA000001001DFF4A01EF01B90046000025170E012322353437060706
+15141615140607273E0135342635343E03373506232235343F01363534232207273E0133
+3215140F010615143332373E01373303061433323601E10E303624302D63330D08253B09
+171203040A0512011A1D351B23110A1A3E0E2F3B252E163603142D612125284A530F0B0C
+2277094A2D302D98A22F250E0D1A0B1F331A120B1919041902090F12081502010D351E62
+81410D11520A482F30214FC60907199332536EFED13922200000000200130000026D028D
+002A003500000133321514062321373E01371323220E0307273733363534262735331506
+0F01330727363534262B010F01061514333236353423013457E2A278FEE203291E0C6E2C
+211E29161C0E1220D00A1C2BF33D0D0CCC25120336353630320F425D758C016C84688010
+061D2D0197020916271F0487280F1511051010082F2B8B021A0A251CAFBA2D132A5B6366
+00000002000DFFF501F802AB002B0038000037173633321615140623222635343F012322
+060723373337363534262B013536371707330723363534262B0117342322070E01151416
+333236DD014C523D3F91644C3C113D3739211A111FA5200E190F1C54490744A51A120125
+2C318F4932341A1625204258CC0148392D4D6B2E2A1C41E815336677360A0C0E0F0A1106
+F5660B0A1C17E94429143836171E670000000002FFC90000037D028D0032003500002901
+35363534272E01270706151416171523353E013F010E0107061514171521353E01373E03
+3703210316171E0317032113037DFEE8470C18492C340B1227E428180C3C307835362BFF
+0025331E283A586B415501E1FC5F431220163529A0FEDF4710044B1B23424E03C1260D19
+0F04101005182AD903453F40391D031010032A2A39444D26030133FECD045D1958403503
+0253FEF8000000020000FFF502AE01B00035003800002517062322272E0427072337230E
+0423222635343633321E023332373E02373637272107151E011514061514333203231702
+A10D35543F0E0108060E171137473701213220243B2B25291B0E1212020D0E120B081619
+152746600185BD393F021F354EDB4C5E09604D043610241306C9C90C363936231F171417
+151815150F392D152705D1CF02064131031A042E017A9E0000000003003CFFEE02BB029A
+000F0022003400000114060706232226353436373633361607342623220706073E013332
+1E0233323736070623222E02232207061514163332373602BB735C696D6377624F707D6B
+7669453C6357321E2E3823162B1E2E181F2A14233D47192F1E2C171E2C13433F5C4E3801
+A26BC43E477C6E5BC1456101863447517544551F122025201C50802D2025201E45405257
+5F440003001DFFF501D601B9000F001E0030000001140607062322263534363736333216
+063426232207060736333216333237070623222E02232207061514163332373601D63931
+5369464D654F383F3E50542621433D201232221B3A16131808312B131C0E160E151A0E2A
+243D3C21012D397B31534942539E2A1E4B555A315B3130263F111D261417141333312C2F
+532E0001004CFFEE02E602960020000025133E033332161514232226232206070123032E
+01273533150E01151417130132D51218272E1C242032111F090E150FFEBA135211172AF0
+2F1D013F8D018220252D1520133628111AFDC401F7692A05101005141A0A05FE52000001
+0022FFEE021001B9002600003733363736333216151423222623220E0307062322352627
+2E012B01353637363332171E01ED0146582E2A121A300B1707193D3033170A0913100A24
+11181A1E4825140304061B2073C3562D19122E134457773D1D191CAC7D38260F0B090510
+44AF0001FFE20000026E030F001B00000107210306151416171523353E01371336353426
+233521323E0237026E31FEE68310222BFB2A1D0C770A1B22013C20272F220C030FA6FE17
+3E0B1212031010031F2C01BA24191513100618372D000001002AFFF5019401FB001E0000
+010723220703061514333237170E01232235343F013635342627353332363701941D861B
+0750080C193B0D2A3A2531163A041520BA42281601FB6119FEDE1E0E0F4E0B4131371D52
+D70D0B0D08020F16350000020047FFEE038A0370002E00380000052303230323032E0127
+26273533150E011514171B01272E01273533150E01151416151B01363534273533150E01
+0725272635343633321F010210143205DE133D080A0B0A29EB291F012CAC08041B2CEC27
+1D0228BC1743B81D1B15FEE38C1314101612731201C5FE3B0202462D0B0A05101004141B
+0D07FE6C015C412616021010041418030B01FE64016D2C1829011010091A28926A0F1110
+1217950000000002000FFFEE028802980035003F0000133536373E023332161716171336
+333215133E0135342726353436333216151403070623222703070607062322262F012627
+2E012325272635343633321F010F4F10050D08030806051907C006070820634216151710
+161ED409230A08031D591720310F07040204081307111701878C13141016127301940D0D
+040104020A1878A101300A0EFEA07B69200E1514150C1320185BFEFE0B2B23013698263D
+5E121D5BA44E1B0F586A0F1110121795000000020047FFEE038A036C002E003700000523
+03230323032E012726273533150E011514171B01272E01273533150E01151416151B0136
+3534273533150E0107253736321615140F010210143205DE133D080A0B0A29EB291F012C
+AC08041B2CEC271D0228BC1743B81D1B15FE48A20A1E1511AB1201C5FE3B0202462D0B0A
+05101004141B0D07FE6C015C412616021010041418030B01FE64016D2C1829011010091A
+2890A00A150F120A6A000002000FFFEE028802980035003E0000133536373E0233321617
+16171336333215133E013534272635343633321615140307062322270307060706232226
+2F0126272E01233F0136321615140F010F4F10050D08030806051907C006070820634216
+151710161ED409230A08031D591720310F070402040813071117E2A20A1E1511AB01940D
+0D040104020A1878A101300A0EFEA07B69200E1514150C1320185BFEFE0B2B2301369826
+3D5E121D5BA44E1B0F5AA00A150F120A6A0000030047FFEE038A0332002E003A00460000
+052303230323032E012726273533150E011514171B01272E01273533150E01151416151B
+01363534273533150E010701321615140623222635343633321615140623222635343602
+10143205DE133D080A0B0A29EB291F012CAC08041B2CEC271D0228BC1743B81D1B15FE4A
+131D1D14151C1DDD131D1D14151C1D1201C5FE3B0202462D0B0A05101004141B0D07FE6C
+015C412616021010041418030B01FE64016D2C1829011010091A2801001E13141D1D1514
+1C1E13141D1D15141C000003000FFFEE0288025E00350041004D0000133536373E023332
+161716171336333215133E01353427263534363332161514030706232227030706070623
+22262F0126272E01233732161514062322263534363332161514062322263534360F4F10
+050D08030806051907C006070820634216151710161ED409230A08031D591720310F0704
+02040813071117EE131D1D14151C1DDD131D1D14151C1D01940D0D040104020A1878A101
+300A0EFEA07B69200E1514150C1320185BFEFE0B2B23013698263D5E121D5BA44E1B0FCA
+1E13141D1D15141C1E13141D1D15141C00000002004E0000027903700026003000000115
+0E01141F01373635342F013533150E01070307061514161F011521353E013F01032E0127
+3525272635343633321F01014A2C1C241F2795281DBD15161BDB241E171E24FEDF332B0D
+3B4C0B192901578C131410161273028D10040F227F6E2EB0251804031010071521FEF27B
+6718131002031010031F2FCD010B28160610376A0F11101217950002FFE8FF3201AA0298
+0033003D00001335363736373332161F013E01353427263534363332161514070E012322
+263534363332163332373E013736353426272E01232237272635343633321F010F160A29
+42040B3D0D1543371A1A1711161E834E932B171C1710131E0C121E0D33070A3E140E211E
+10F98C1314101612730190110402080ABA456E6E7320101011161015201757DA819E1813
+11171C210D430B140F1EFB33251B586A0F11101217950001003100BF011A010100030000
+01072337011A0DDC0E01014242000001003100BF011A01010003000001072337011A0DDC
+0E01014242000001FFF800C001FC0102000300000107213701FC08FE0408010242420001
+FFFA00C501F900F3000300002507213701F908FE0908F32E2E000001FFFA00C5037E00F3
+0003000025072137037E08FC8408F32E2E00000100AB01B40136029A000E000001170615
+1417161514062322263534012D094B14191D161921029A1132270D131617141B281F5700
+00000001009701B40122029A000E0000132736353427263534363332161514A0094B1419
+1D16192101B41132260E131618141A291E560001002CFF7F00B70065000E000017273635
+342726353436333216151435094B15181D161921811232260B14151A141A291E57000001
+00A901B40122029A00100000010726353436333216151406070E011514010C0D56262219
+181A15111101C7132F54273C1B14131B0101130B2C00000200A601B40202029A000E001D
+000001170615141716151406232226353427170615141716151406232226353401F9094B
+14191D1619214F094B14191D161921029A1132270D131617141B281F57481132270D1316
+17141B281F570002009701B401F3029A000E001D00000127363534272635343633321615
+140527363534272635343633321615140171094B14191D161921FEAD094B14191D161921
+01B41132260E131618141A291E56491132260E131618141A291E5600000000020039FF7F
+01950065000E001D00000527363534272635343633321615140527363534272635343633
+321615140113094B14191D161921FEAD094B14191D161921811132270D131618141A291E
+57481132270D131618141A291E57000200A901B401F3029A001000210000010726353436
+333216151406070E0115140F0126353436333216151406070E01151401DD0D5626221918
+1A151111960D56262219181A15111101C7132F54273C1B14131B0101130B2C2A132F5427
+3C1B14131B0101130B2C00010065FF6101E8029A00380000172336373635342726353637
+220706232235343332171617363534272635343332151407060736373633321514232227
+2623061514170E0107B316070D22030238122F31180F2C30111D2A300A05042F2A18230C
+302A1C132F2C0E183138091014310C9F283DAC500D1C100B3E66140B2A280C1101371F11
+18170C392D13293C3601110C282A0A152D26361F1D7D3500000000010016FF7101EB029A
+006800000123220706232226353436333217161736353427263534363332161514070607
+363736333216151406232227262B01061514170E01073332373633321614062322272627
+061514171615140622263534373637060706232226353436333217163B013635342F013E
+01011A1219272211151B191510202D2E0906031D1312171A23082E2D211014191B151122
+27191A0B101C220E1319272211151B19160F202C2F0A06031D26161A23082F2C1E131419
+1B15112227191A0B0E021C2201AB110E171312160C11012E1E1C22110916201914182838
+3501110C161213170E1132231B381B493F110E1824160C11012E1E1B23100A1620191518
+28383401110C161213170E1134220C3D091B4900000000010046003B01C701BC000B0000
+25140623222635343633321601C7724F5070714F546DFC4F7271504E727000030039FFF5
+02FA0064000A001500200000251406232226353436321605140623222635343632160514
+06232226353436321602FA22181520202E21FED722181520202E21FED722181520202E21
+2B1620201618212217162020161821221716202016182122000000060050FFED042B02C2
+000B0019002500330050006000002514062322263534363332160734262322070E011514
+163332362514062322263534363332160734262322070E01151416333236030123010E01
+23222716151406070623222635343633321716333236370534262726270E010706151416
+333236042B6340344675482E3217231C231F18251F193452FEAD6440334675482E321723
+1C1D14212D201834522AFE522F018A1C35282329042C2426303244744D1A222F312E3445
+FF00091017151F1A0F301F1A354FD55B8D503B50823D3627302B206D281F277F4E5B8D50
+3A50833D362730172375331D277F023BFD2C029220190E1715346822254F3A55801C271E
+43891610080B170F17194C571F278200000000080050FFED059502C2000B001900250033
+003F004D006A007A00002514062322263534363332160734262322070E01151416333236
+2514062322263534363332160734262322070E0115141633323625140623222635343633
+32160734262322070E01151416333236030123010E012322271615140607062322263534
+3633321716333236370534262726270E01070615141633323605956340344675482E3217
+231C231F18251F193452FEAD6340344675482E3217231C231F18251F193452FEAD644033
+4675482E3217231C1D14212D201834522AFE522F018A1C35282329042C2426303244744D
+1A222F312E3445FF00091017151F1A0F301F1A354FD55B8D503B50823D3627302B206D28
+1F277F4E5B8D503B50823D3627302B206D281F277F4E5B8D503A50833D36273017237533
+1D277F023BFD2C029220190E1715346822254F3A55801C271E43891610080B170F17194C
+571F278200000001003300250119019300180000373536373633321514070E0107161716
+15142322272E0127263367185809061B0F5F13060E3E070413144D0C10D80950154D0711
+1E105C180E1A7411071516630E14000100340025011A0193001500002507060706232235
+343F012726353433321716171617011A242F2C570A065B41143E07102D080D3112D71B23
+274D07125E4328721307440C0F391B00000000010000021401F402460003000001213521
+01F4FE0C01F4021432000001FF57FFF6015102A400030000090123010151FE393301C702
+A4FD5202AE000001000800000285028D002E000013333723373337363534262735210727
+3635342E012322060F01330723073307230706151416171523353E013F01233359195908
+59290A1B3101F12015031C505B231C0537A808A919A908A9230E222BFB291F0B2858010E
+5A1E922419150F04109A02160B27210E0D13C61E5A1E7D320A121203101003202B920002
+000AFFF80205029E00370042000013333637233733363736333216151423222623220607
+330723060733072306071633323F011706232226270E0123222635343633321737231726
+2322061514163332363C7808056D086B1B3D39502934271E0C22272D1D84088201148008
+8010295A4627280A0B29652539321C291B1F223028221C117D5E231A171E19121428011D
+41191E7C49442A2229585D8F1E03571E3C5B261C0709641A27251A221E1C280B8CB61919
+14101520000000040000FFF30466028D001C002F0059007B000013070615141617152335
+3E013713363534262735333216151407062322130716333236373635342623220E050133
+163332363534272635343633321716333237330723262322061514171615140623222726
+232207231307230306151433323637170E01232235343713232734373E01373633321514
+0F01F2350E1E27F42B1B0E74111C2BDD6C614145742D2B4516142C271944373E06080703
+03010301DB1014502428383F42371424160E140A0E14100E4B1B203644513F1D1A151714
+091031055457020F0C20250D2E3B262E104E4B012119521A060809011C0139C136091213
+041010061B31019E3D16141105104A4A593639011FF505090F275F423901030207030CFE
+3F8828252D464F34323A0A07128C741E1B26404F393D490A091501B920FEB80806101F30
+074633250A400128061207064127090805026700000000010010FFF4021A0298002F0000
+133336372337333E01333216170723373534262322060733072306073307230615143332
+3637170E012322263534372318210A0F22082631A3552957131E0F013D31346829D008D2
+0F0BD508D40B4D30453B0A405D38424C0A2301222F2B1E718D1B1A6F0F0A313F796A1E30
+2A1E392A8529410A4D3B5E52263A0001FE3B0273FFEF02F8000800000321371706151433
+2111FE4C841224290119027385081E1613000001FE560273000A02F80008000013213521
+32353427370AFE4C011929241202733613161E0800000001FED4FF64FF16029600030000
+07231133EA42429C03320001FE3B0224FFEF02F80011000003212215141E031707273717
+0614332111FEE231040B091406128584123131011E02730F03070B0A1306086A6A08291E
+00000001FE3B0224FFEF02F80011000001213235342E03273717072736342321FE3B011E
+31040B091406128584123131FEE202A90F03070B0A1306086A6A08291E000003FE3B020B
+002C026E00090013001D0000023216140623222635343632161406232226353424321614
+062322263534E1281E1E15141CE4281E1E15141CFE8F281E1E15141C026E1E281D1D1514
+1D1E281D1D15141D1E281D1D15140004FDBA020B0072026E00090013001D002700001232
+161406232226353426321614062322263534263216140623222635342632161406232226
+35342C281E1E15141CAA281E1E15141CAA281E1E15141CAA281E1E15141C026E1E281D1D
+15141D1E281D1D15141D1E281D1D15141D1E281D1D15140000000002FD2DFF2300DF02D5
+000B0013000024103E01201E01100E0120260210162036102620FD2D7FDA0100DA7F7FDA
+FF00DA3DEE0152EEEEFEAE7C0100DA7F7FDAFF00DA7F7F0203FEAEEEEE0152EE00000001
+FE3B0224001902F8001F0000032736342B012215141E03170727371706143B013235342E
+032737176B123131B132040B091406128584123131B231040B0914061285022408291E0F
+03070B0A1306086A6A08291E0F03070B0A1306086A000002FC36FF6501EA03FF00020005
+000005210901210101EAFA4C02D1FDB204AEFDA09B049AFBA803C40000000001FE52FF64
+FFE8029600030000072301331847FEB1479C033200000002FEA1FF64FFAA029600030007
+00000523113313231133FEE34242C742429C0332FCCE033200000001FDADFF4E00DD02D5
+00050000013521112311FDAD033042029342FC7903450003FE32FF260023FF8900090013
+001D0000063216140623222635343632161406232226353424321614062322263534EA28
+1E1E15141CE4281E1E15141CFE8F281E1E15141C771E281D1D15141D1E281D1D15141D1E
+281D1D1514000001FE22021A003702A9000700000135211523352115FE22021536FE5702
+1A8F8F5959000001FCE70057009901A3001D000001211521221514171617072E0127353E
+0137170E050706151416FDA202F7FD0A1A0E151F1436574343573614030C0409070B070E
+12011E42140E0E162C133F451D0A1C463F130512060C080B070E0B070F000001FE3B0224
+FFEF02A9000800000307273635342321351184122429FEE702A985081E16133600000001
+FE3B0224FFEF02A900080000012115212215141707FE3B01B4FEE729241202A93613161E
+08000001FE3BFF04FFEFFFD80011000007212215141E0317072737170614332111FEE231
+040B091406128584123131011EAD0F03070B0A1306086A6A08291E0000000001FE3BFF04
+FFEFFFD80011000007213521323427371707273E043534A7FEE2011E3131128485120614
+090B04AD361E29086A6A0806130A0B07030F00020023FFEE02BE029A001E002400000107
+2E06232207031633323E03371706232226353412333201130E01151402BE1909280F2017
+25291A764484465B2B462D411D2B1577CB768AEAB5A6FE027B4A53021215092A0E1C090E
+0434FE0B390D0E2C18241A8E8175B700FFFDCD01CB3AA95D5F000004002FFFF2032802A4
+000F001B001F004100002514060706232226353436373633321607342322070615143332
+37360301230901170E012322263534373633321615140622263534363534232207061514
+1633323603282D274353393D513F2D33313F46363530393C2C303C5CFE3E3101C5FED60C
+24452C383E4F414D28361620100C1D332446281D2033EA2D6227423A35427E22173C264C
+4856564841530208FD4E02B2FEF7092E28453E62483B2B1C1017130E0717081026496528
+331A0003001EFF2502A601B90030003D0048000009011633323717062322270623222635
+34373633321737270E012322263534370623222737163332373E01333216173337073423
+22070615141633323E01032726232206151416333202A6FEF32C2F3B290C363F3D294D7E
+2F33362C473B205701366138262E171E28271F0A1F1A404139953C243004021C3C365F6E
+5618113D9360D5011D3739451F195D01A8FE0E171E1A2216722B1C30201A0D9C013A373A
+2F303314111A0D4F455A2120303C2A9F7D3E131681A3FE73010D2820121700030035FFF1
+03DF02AF0055005C00630000010706073E013F013E01333215140E020706151416333237
+1706232226353437070E0107062322263534253E06370623222726232206151416333236
+37170623222635343633321617163332373E013705342322060736010E011514173202CA
+127C6C16500D2164AF2F39335D613FAE130F37701578522730686B3996461E1A1920011B
+04200D2019252B19070D2C503F272F452B2D26381B1236573B44644B1D3A373C1A29270E
+39040100181B7546EEFD756974184302980E60D60919052B7D8C32274A3F3119FB530F14
+810D92302965A1296FA41B0B211B80770734152F1F2C2A16012C223D282A342B2B096B46
+383B5C151C1F13072A032B167E6169FED6306035190400030011000002FF028D000B000F
+00130000010323132103231333032113172303330123033302FFAF9A53FEF6549AAF9A51
+010A526A4E9B4EFEF64E9B4E028DFD730135FECB028DFECD013325FDBD0243FDBD000001
+002DFFF501E3029C0031000025170E0422263437363534220607060F0123133635342322
+07273703333E0333321615140F011407061514333201D50E022113201F20194007304E20
+3A09204E98021F0D10029F6D040C3D2C43201D1C0B3A01010D166A0B0329121E0E142CF5
+181423553058227A0258080216020E18FE600E4E342D281E122EE6020303020E00000002
+001AFFF1037802A3003200400000372314163332363736372E0135343736333217363332
+161514230E0107363717060706070623222635343633321615140623220135262322070E
+01151416173E013F0247316690420F0C3844564176334328240C116D24422C4A3310336A
+4F3675A84D602219161D17141702930F266436243132312D595F17386B9423180C48395B
+3628081B0B09341A725F144F0A6418AA397947331F291B15141C0206020118103F27223C
+06577000000000030021FFF103A302AF003E004800510000010726232206151416333237
+3E02373E01333216151406070E010716333237170623222706232235343633321E02173E
+01370623222E02353436333205342322060736373E0101352623221514333202600C375A
+5688856D19260B25190D2A81392A29AE822F904045228D7C138396545046557E3B311532
+1C41092A732F1A1B325D5333936C63015C31376B242D3B3E51FD904A3343574202831321
+54494A540514492E143F642D2544972366A719178B0E9C1E183D17220B0A1A031B8E5703
+152A4E334E69632CA0670C21225CFE07012B1921000000020030FFF5023B02AF001E0028
+0000133716333E0133321514060706151433323637170E0123222635343736372637173E
+013534232207064D0E243A55B33A40C1818F2421574F1555612D25324D0C1C319801759B
+23252D3A01851A197DAC4351A013E7432B4C5B1163512D2A5486162C0222011A83481F2F
+3B0000020019000002F3028D000B00110000010323012303231333013313030123070133
+02F3AE6FFEFA048E25AF700106028E9DFEF13F0701113B028DFD730210FDF0028DFDF102
+0FFDB902221CFDD9000000040013FFF10407029C000B0019001D004D0000011406232226
+35343633321607342623220E0115141633323E010307213727133E01333216151406222E
+0123220E050703230323030623222635343633321E0233323713260737331304077D5534
+397F53313C3D181729492418182748261911FEE813836B0C34271E2C1C2A170D07050808
+05050403019B13A2027B224E1F2D1B161418050807181D7F173F05A38C0163568A483553
+86440A181D596B28191E5B6DFECC3C3C8601822A39261E151B1919060A0B100A0E02FDDC
+0226FE53792D1F161C1419146501C1290212FE2A000000040011000002AE028D000B0011
+0019001D000013213216151407062B01072301033E0135340313262B0103333203230333
+C0014D4958384897AA429A024C513944A3551723B1599F35A14E9B4E028D59495F4154F7
+0253FED811703E42FEF901390AFEB4014CFDBD00000000050023FFB902C9029A0017001D
+002D0033003B00000517062322262706232226343E013332161514060716333213033E01
+353403132E0123220703161736333216173625130E0115140526232207163332025E0825
+2D213C113C40798E67C078798E86771E2F2543794B51C7881C592A6F4789171F33502933
+1B15FE9F794B51014720323624232331132113281F127FEEC8777F7786DE3230023FFE3A
+36AA5F49FE5D02001B1E28FDFE160C3E1B22083A01C638A95F508424260900020022FFF1
+036C02AF0052006200000117060716151406071516151406151433323717062322263534
+3E0135342322270E01232226353436333216151406232227231416333236373E01372623
+2206151416333237330E01232226353436333217361734270E070732173E010354072220
+536153364C20345D11654B25382A2A211E1152C1794D602219161D171417070246325D77
+554E6B434C7495CA3C2B9F2E14077B613F4FDEAB7D60240A300B1410150B16091A04221A
+3947029D130E183556405E0302282C257811226510732F23213D371A300BA99648331F28
+1B15141C0C1C3368978B96313096632937F56BA8473B6BA83B17A540260A1A1423132C12
+35091106580000050011000002AE028D000D0013001B0023002700001321321615140607
+13230323032301033E0135340713262B01033332132706232226231703230333C0014D49
+58675B89AC7D5A479A024B4A3B3C9E4F1F18B3549F3369720B17081F076BB64E9B4E028D
+59495C7310FEF40108FEF80255FEE7135C3F46FB01280BFEC5FEF8E40201E30243FDBD00
+00000002001E00F703BD028D0023003B000001150E011D011416171523353E013D010323
+03151416171523353E013D01262735331B0105232E012B01111416171523353E01351123
+22060723352103BD20180D25AA250C9A0B9715208320141530799AA0FE21140B1E1A320D
+25AB250D311B1F0A140159028D1402181DFE240F041414040F24EBFEC80136DF24190414
+14041924F9300214FECB013558251FFECB240F041414040F2401351F2558000200070000
+02EE028D000B000F00000901152107213501352137210723013302EEFDEA01AD09FD8B02
+1BFE6C0902573464FDE7670268FDC00325250241022525FDBD0000020022FFF1038602AF
+005E006A0000011706071615140607151E01151406070623222635343637170E01151416
+3332373E013534270623222702212226353436333216151406232227231416333236373E
+01372623220E011514163332363733140623222635343E02333217360734270E01073633
+32173E01037F072A1E4859402D2D332D313F2C324842042A3F1D152419242A2E18192609
+9DFEFF4D602219161D171417070246325F8554477F4D51815DA96E3C3354780514806A3F
+54507D8C4290642201282D492C07101B1C3C4002941313153B4F325708021348272C5A1E
+21301E32470B17053821141C0F155530451A0613FEBA47331F291B15141C0C1C336B947D
+9C31383F7A4C2F3B96797DB04A454270442643149B352A266D55040E05580002001EFFF5
+022A01B9001E0027000025170E012322263534372E01273716173E013332161514060706
+151416333227173E0135342322060216145C9C4C343612223E10171D482CB1582027AB8B
+2A1E18776E016999242F76C4145D5E3B342E2E04271D1139055B831C1B387515492D1A1D
+D0010F632C1B5D00000000020064FFF102DE02AF0045004E000001072623220615141633
+3E02333215140607161716142322270E011514163332373635342623220607273E013332
+1615140623222635343637352E02232E013534363332053426232206073E0101A50A2C42
+48586E510664853F64C38801034B2A1C19586B4E425E37233027355D1215146D4942449C
+665B7D7E6F020403026B8169544B01491E16489C0A76AC029212113E31353D416A37493E
+710A060603380E17784231463C262F22284F3F0652603F34446C59504F7B1702020A0802
+4F433951630F127C4307650000000002002B0000038B02A8001D00570000011706232226
+23220615141633323637170623222635343736333216333207170E010736373E01333215
+1406070615141707353437060702232226353436333216151406232227231E0133323637
+06072736373E01373E0103800B595739F72D5D6E3F2C47571C1427AA3B56404C9738F931
+2FAD0E222E1B4534122C1017291F08033B0B3E3569F93B5A211B141E1814150802043B2B
+4C714061500D3A9E030A011E5402960F493C4E413838575901CD4A3D4E364038380E2164
+540E011B1E160F2D0F16260C0E141221250309FEE6393620251D14151D0D1B2460811F36
+0F46360617024566000000010026FFF1042002A200590000011706021514333237170623
+2226353401270E01070607062322263534373637270E01070E0823222635343633321615
+14062322272316333236373E0133321F01060207061514333236373E0537320418088EB1
+2137731378532531013401429D6B51202E36191F8F7E4201358337153D21301E281E2524
+13222E2318161E1813080703031C32604F91BB56070A0F64B727110D12251F145038594C
+61301002A00DE1FEB02D238410922C2695019E0219BEBD8F2636262058DBC44A01168A57
+2263354B293219190A2D211C252014121A04156685F2B6020C8DFEC8592D10122E312089
+607D513F06000002001EFFF502A801B9001F003000002517062322270623222635343706
+232227371633323E01333216151407163332272623220E01151416333236372635343602
+9C0C1F2C291C7796333A121D35211F0A1F1A446E97472730221922245B0532358A5C1C1C
+387C361026DF191512CE3B3A2E2D18111A0D905E31263E441194337D9A2C1B255C641922
+1D3400030028FFF4027601AC0023002D0031000001230306151417323E0237170E082322
+26353437132303231323352107230706151417373437032303330276774A0E041728142B
+081B0522071B0918101B1B112C3C0947546A8D6C5F02419B44410E38020D934263420187
+FEF4341B0B08101028071A041F0616030E030601332B161F0100FE7901872525F1331131
+08022A2F0113FE9E00000003001E0000030C028D0007000B000F00000103231321032313
+0523033301230333030CAD9BA5FEF6A69BB0020F4F9A4FFEF54E9C50028DFD730268FD98
+028D25FDBD0243FDBD0000040011000002BF028D0008000E0016001A0000133332161514
+06232101033E0135340313262B0103333203230333C0FB7490EAB7FEF3026672474EC481
+2E6E6C996E5F594E9C50028D8073B7E3021BFE5229A75856FE6B01D939FDBD0243FDBD00
+000000040028FFF5027A02AB00110015002300290000010323370623222635343E013332
+1617331317230333273736353426232207031633323607130E011514027ABC890A365641
+4A37734A25480F02535E43A843491D0A2E252B16620E2A3356E15A393F02ABFD55303B56
+4248875D1E1E012E25FD9F71662315263A0AFE9C0C4A2C01461F8546250000040028FFF5
+01E501B90016001C00230029000025170E0123222635343633321615140721071633323E
+0127333635342707372623220F02130E01151401981C2E64465460A172466416FEE6251E
+2F2D442405470C284F2F241E2A1E2F5159324880153C3A585272A850442E408C111C2185
+2221381E99A90F0DABA40144178D3B3100000004001B0000015A028D00030007000B000F
+000001072337172307331703231317230333015A248E255E43114402768C755E43614302
+8D8787253D7FFE5401AC25FE9E000004FF98FF27018A028D000300070014001A00000107
+23371723073307030E012322273716333237131723033E0137018A248E255E431144027D
+157E522B241922231B0FA0583C981D3308028D8787253D7FFE2B4F6110210D07025A25FD
+C80E3C1E000000020028FFF501D7029C001900260000132736333211140E032322263534
+3633321736353426232213342623220615143332363736C30A263CBC102A406A43454397
+6A451B073D46218325184970433657170F02711417FEFC3168745B3B5C466DAF30271F4D
+68FEC12C2AB56B627654370000000001005600DC024E011E0003000025213521024EFE08
+01F8DC42000000010028FF8801CC001000070000052135331521353301CCFE5C1E01681E
+78884C4C000000030000FFF202AC02A4001A00260030000001353E023332151407030615
+143B011523353E0137133734232205140623222635343633321607342622061514163236
+01301A39240107074C07220FAD231B044B041405015BC68F90C7C9938BC52AACFAB2B2FA
+AC01D9190109090B021CFEF61C02131414020B0D0103140A9291C7C89092C8CB8F7FB1B2
+7E7DB1B0000000030000FFF202AC02A4001B0027003100001327363332161514060F0133
+32363717072335373E023534262322051406232226353436333216073426220615141632
+36FB14245E2D3B2633655F1A190B1320DA7C1E1A1A24213A0194C68F90C7C9938BC52AAC
+FAB2B2FAAC019D0662392B1D352F5D0E150653137A1E1B2D151B218791C7C89092C8CB8F
+7FB1B27E7DB1B000000000030000FFF202AC02A400280034003E00000127363332161514
+071615140623222734363332171633323635342B01353E05353426232205140623222635
+343633321607342622061514163236012214204D25314E2E644546020F0D121814162328
+61120A2C1722120D1D1720016AC68F90C7C9938BC52AACFAB2B2FAAC01BB064429204113
+1738444F260D10120F2F2354150209060C0E180F14189791C7C89092C8CB8F7FB1B27E7D
+B1B000040000FFF202AC02A4000A000D0019002300000107330723072337233F010F0133
+2514062322263534363332160734262206151416323601CE443A0A3E19361A9F0FF92EA4
+74015AC68F90C7C9938BC52AACFAB2B2FAAC0205EA305F5F30EA4E9C2F91C7C89092C8CB
+8F7FB1B27E7DB1B0000000030000FFF202AC02A4001C002800320000010723071E011514
+062322263534363332171633323635342726273537051406232226353436333216073426
+2206151416323601E7138E113F496A4D1F260F0B0E181312283F22204940016AC68F90C7
+C9938BC52AACFAB2B2FAAC020534250A4137475D14130C11110F412A2C161709137BBB91
+C7C89092C8CB8F7FB1B27E7DB1B000040000FFF202AC02A400140020002C003600000115
+0E010736333216151406232226353436373E010734262322061514163332362514062322
+263534363332160734262206151416323601DF346520131C2D3F5A41373C39332A511726
+1F2C2921192C340129C68F90C7C9938BC52AACFAB2B2FAAC020C15073E2E063B2E415A44
+3C3967251E1BDB1E204C342125575291C7C89092C8CB8F7FB1B27E7DB1B000030000FFF2
+02AC02A4000A001600200000010323132322060727373317140623222635343633321607
+34262206151416323601EFEB36DA7B1D22161236E9C7C68F90C7C9938BC52AACFAB2B2FA
+AC01FAFE8C014B11180954BB91C7C89092C8CB8F7FB1B27E7DB1B000000000050000FFF2
+02AC02A400160022002C003800420000011406071E011514062322263534372E01353436
+333216073426232206151416173E01073426270E01141632362514062322263534363332
+160734262206151416323601E42931231D4939354A6C1B153C33323E30251C1B1E172125
+1D1F1830262E3242280117C68F90C7C9938BC52AACFAB2B2FAAC01B422290E1D301E303B
+33314E201B24162B2E2D2A1B231C1710201B0F1EBB16222B0D343E26268691C7C89092C8
+CB8F7FB1B27E7DB1B00000040000FFF202AC02A40015001E002A0034000037353E013736
+37062322263534363332161514070E011334232206151433322514062322263534363332
+1607342622061514163236C82433212E181F2A2939553D363F712347A53A2A2F3A590100
+C68F90C7C9938BC52AACFAB2B2FAAC86150619192428153B2C3E56443975511A18011743
+462C4B1D91C7C89092C8CB8F7FB1B27E7DB1B000000000040000FFF202AC02A40019001C
+0028003200002523353635342F012307061514171523353E01371333131E01172F010725
+1406232226353436333216073426220615141632360220A432021085220F287C171D1FA9
+134B0714198C1E4B0181C68F90C7C9938BC52AACFAB2B2FAAC8D160311050A43381A080B
+011616041F320114FECA1E1401887C7C1F91C7C89092C8CB8F7FB1B27E7DB1B000000005
+0000FFF202AC02A40015001F002A003600400000133332151407161514062B01353E013F
+0136353426271733323534262322060F0314333236353427262514062322263534363332
+1607342622061514163236EE9882503A584BA51A10063F05131D5412722124110B032912
+0E27323A290F0138C68F90C7C9938BC52AACFAB2B2FAAC02055C40141A3B393A16050D16
+F211100807028A481F1B040B954B3C112B29300F050791C7C89092C8CB8F7FB1B27E7DB1
+B00000030000FFF202AC02A4001B00270031000001072326232206151433323637170623
+222635343633321716333237171406232226353436333216073426220615141632360220
+151409554F6A7328422712565D4E639B642C1D100C0E099FC68F90C7C9938BC52AACFAB2
+B2FAAC020C7D5C7C50731D250E5A5349638709050EC291C7C89092C8CB8F7FB1B27E7DB1
+B00000040000FFF202AC02A40011001F002B00350000133332161514062B01353E013F01
+363534271707061514333236353427262322051406232226353436333216073426220615
+14163236D3A04D60916994190F053C042C6B3C072555672F1C2D22016AC68F90C7C9938B
+C52AACFAB2B2FAAC0205554B647416050C14F8110D100119F61D0A0E6D544920129D91C7
+C89092C8CB8F7FB1B27E7DB1B00000030000FFF202AC02A4002B00370041000001072336
+352E0123220F01333236373307233635342B01070615163332373637330721353E013F01
+363427350514062322263534363332160734262206151416323602081111010128412402
+1E24251A0E1025110421360E12012A482519171524FEE0190D053E042D01C2C68F90C7C9
+938BC52AACFAB2B2FAAC0205630D14150D097910228D1410153948070C150E226516040C
+14FB0F1A0416BB91C7C89092C8CB8F7FB1B27E7DB1B000030000FFF202AC02A400290035
+003F000001072337342623220F01333236373307233635342E012B010706151417152335
+3E013F013635342627350514062322263534363332160734262206151416323602081112
+0224491F041E2524190F112711040A0D0F301C052B911810053C04101C01C1C68F90C7C9
+938BC52AACFAB2B2FAAC020563161E0F0C76111F8F14110C0A027614050C031616011114
+F6130D08060216BB91C7C89092C8CB8F7FB1B27E7DB1B000000000030000FFF202AC02A4
+00290035003F000001150E010F0106232226353436333217163332373307232627262322
+061514163332363F01363534273505140623222635343633321607342622061514163236
+02201E150519434A4C64885E2A26110815100C1B1303131C354C59403818270416043001
+2FC68F90C7C9938BC52AACFAB2B2FAAC014D16020C156B23564B5F860D06137D28161F81
+51373C120D490F0A0B04160391C7C89092C8CB8F7FB1B27E7DB1B000000000030000FFF2
+02AC02A4002E003A0044000001150E01070306151417152335363F012307061514171523
+353E013F013635342627353315060F013337363526273505140623222635343633321607
+3426220615141632360219130E0445051C8F30081F7D1F0519851516063F050F16902508
+197E19030221011AC68F90C7C9938BC52AACFAB2B2FAAC020516040F11FEFE1702090416
+160422797914050B021616021316EF130E0807021616031F675E09110F0216BB91C7C890
+92C8CB8F7FB1B27E7DB1B000000000030000FFF202AC02A400150021002B000001150E01
+0F0106151433152335363F01363534262735051406232226353436333216073426220615
+1416323601C01911073C071985270A3E071115017CC68F90C7C9938BC52AACFAB2B2FAAC
+02051603121DEB190A0C16160427EB1A090A070216BB91C7C89092C8CB8F7FB1B27E7DB1
+B00000030000FFF202AC02A4001F002B0035000001150E020F010E012322263534363216
+151406151433323F01363534262735051406232226353436333216073426220615141632
+3601E01114050334112E37242D151C140315180A3F050E17015CC68F90C7C9938BC52AAC
+FAB2B2FAAC020516020C0B0CCA413920181015100E0509030F29EF140C09070216BB91C7
+C89092C8CB8F7FB1B27E7DB1B00000030000FFF202AC02A4002E003A004400000115220F
+01171E01171523353635342F010706151416171523353E01371336353427353315060F01
+373635342F01350514062322263534363332160734262206151416323602201318A2640D
+131CA129114C1E061218951A10053E042FA33008164E4B1111010FC68F90C7C9938BC52A
+ACFAB2B2FAAC02051612799F150B021616020B071A7B7A16070907021616030C13010214
+020F03161603216038360C06020216BB91C7C89092C8CB8F7FB1B27E7DB1B00000000003
+0000FFF202AC02A4001B00270031000025072135363F01363534273533150E010F010615
+141633323637363F0114062322263534363332160734262206151416323601EC22FEEC26
+09410626901513053C06151E2725101611CFC68F90C7C9938BC52AACFAB2B2FAACFD7016
+0422F4170910021616011312E918080B07080D11294D91C7C89092C8CB8F7FB1B27E7DB1
+B00000030000FFF202AC02A400270033003D000001150E0107030615141617152335363F
+0103230307061514171523353E013F013635342735331B01171406232226353436333216
+07342622061514163236023B1710054305111996260C3DB90B133804276A15130A370527
+6010ABD6C68F90C7C9938BC52AACFAB2B2FAAC020516040E12FEFF16040705011616032C
+E7FED40127E1140712031616021A2ADE13080A0316FEEF0111BB91C7C89092C8CB8F7FB1
+B27E7DB1B00000030000FFF202AC02A40022002E0038000001150E010703230307061514
+171523353E013F0136353426233533133337363534273505140623222635343633321607
+3426220615141632360208170F0A3C0B762F04256315110A2A0417114F6A012B04240107
+C68F90C7C9938BC52AACFAB2B2FAAC020516081730FEE6012DDE160611031616031C32C2
+18050A1016FEEECA100C120416BB91C7C89092C8CB8F7FB1B27E7DB1B00000040000FFF2
+02AC02A4000B00190025002F000001140623222635343633321607342623220615141633
+323E0217140623222635343633321607342622061514163236021F9C633F4F9A60444F46
+2D254A652C2728442A18D3C68F90C7C9938BC52AACFAB2B2FAAC017A62924B415D9D5025
+292C9E4A2F2F334C512C91C7C89092C8CB8F7FB1B27E7DB1B00000040000FFF202AC02A4
+00180023002F0039000013333215140623222707061516331523353E013F013635342717
+0716333236373626232205140623222635343633321607342622061514163236F98B8458
+4424111E040228961814073A092666200D0D333901012625180148C68F90C7C9938BC52A
+ACFAB2B2FAAC02055C3B38067510060E161603151BDB210B1002197C011F2C23209D91C7
+C89092C8CB8F7FB1B27E7DB1B00000040000FFF202AC02A4001F002B0037004100003727
+36372E013534363332161514062307321716333236371706232227262322013426232206
+15141633323617140623222635343633321607342622061514163236A20D3C2931369861
+4151986512213A2317212B1B1144582C3225132401122C254A642C224D64D4C68F90C7C9
+938BC52AACFAB2B2FAAC741227210C47356099503E6098120E0813190D530F0A01532A2C
+9A4F2B329E3D91C7C89092C8CB8F7FB1B27E7DB1B00000040000FFF202AC02A4001F0029
+0035003F000025232F0107061514171523353E013F01363534262735333216151407171E
+013303071633323635342322051406232226353436333216073426220615141632360208
+5B52231B082A961814073D060F179137466C370A1616A91E0B0F3338481A0148C68F90C7
+C9938BC52AACFAB2B2FAAC8DB5026C1C0A0E01161603161BE4160A0B0603162D2A55127A
+18120133720124223E9D91C7C89092C8CB8F7FB1B27E7DB1B00000030000FFF202AC02A4
+00350041004B00000107232E01232206151416171E011514062322272623220723373306
+15141633323635342E032F012E0135343633321716333237171406232226353436333216
+0734262206151416323601EC1612021B271C22132B2A1E4834202413081206101215032E
+2520280B0C180C0D0E1D13422D231611091109D2C68F90C7C9938BC52AACFAB2B2FAAC02
+0B7A2F2B191612192626311F313E0D0714890911232C221C0916121A0C0D0C1A26192C32
+08050DC191C7C89092C8CB8F7FB1B27E7DB1B000000000030000FFF202AC02A400190025
+002F0000010723363534262B0103061514331523353E0137132206072337051406232226
+3534363332160734262206151416323602131C14021A1E24430A27A021170847452C1516
+1C01E2C68F90C7C9938BC52AACFAB2B2FAAC02046712091714FEFD260A0D161601151C01
+0E192D67BA91C7C89092C8CB8F7FB1B27E7DB1B0000000030000FFF202AC02A400260032
+003C000001150E010F010E0123222635343F01363534273533150E010F01061514163332
+363F013634273505140623222635343633321607342622061514163236021A180D0D280F
+4936384C0929082B9B1A15072F05271F2C3314210A260100C68F90C7C9938BC52AACFAB2
+B2FAAC0205160614339E3A44332A17209C1B0D1001161601131AB91417191A2D4E80281E
+0416BB91C7C89092C8CB8F7FB1B27E7DB1B000030000FFF202AC02A400180024002E0000
+011506070323032E01273533150E0115141F013736353427350514062322263534363332
+16073426220615141632360220150CD60D3D0C0F1A961B11022C7619270102C68F90C7C9
+938BC52AACFAB2B2FAAC0205160112FEB1011236170316160308090A0ADABD260D0F0316
+BB91C7C89092C8CB8F7FB1B27E7DB1B0000000030000FFF202AC02A4002A003600400000
+01150E0107032327072303262726273533150E0115141F0137272E01273533150615141F
+01373635342735171406232226353436333216073426220615141632360239100F09970C
+236E0C2A08090419821510021C5005020F1883220517590A24DAC68F90C7C9938BC52AAC
+FAB2B2FAAC020515050E13FEC3F5F5011C36090403161602090A0C08C7B3211109021616
+040D0928AEBD170B100116BB91C7C89092C8CB8F7FB1B27E7DB1B000000000030000FFF2
+02AC02A4002E003A004400000115060F01171E01171523353235342F0107061514331523
+353E013F01272E01273533150615141F0137363534273505140623222635343633321607
+3426220615141632360208261C513909141C93280926470B247518263326390714188F25
+0A1F4808220116C68F90C7C9938BC52AACFAB2B2FAAC0205151123678B160E0316160D07
+14585E0F060D1616052543318C110F021616050A07174D5A0B080C0116BB91C7C89092C8
+CB8F7FB1B27E7DB1B00000030000FFF202AC02A40021002D003700000115060F02061514
+33152335323F01272E01273533150615141F013736353427350514062322263534363332
+160734262206151416323602182014801A0829A5360A1E3607111A9C2D0826511E2E0112
+C68F90C7C9938BC52AACFAB2B2FAAC0205150A1795651D070E1616287092130C03161604
+090815695B21090A0416BB91C7C89092C8CB8F7FB1B27E7DB1B000030000FFF202AC02A4
+0013001F0029000009013332373637330721350123220706072337211714062322263534
+36333216073426220615141632360208FEFC524C181515121CFED00105593B1614121219
+0122A4C68F90C7C9938BC52AACFAB2B2FAAC01F4FEBA1210276A1101460E0D2662BB91C7
+C89092C8CB8F7FB1B27E7DB1B00000040000FFF202AC02A4001F002B0037004100000117
+0E012322353437062322263534363332173F0217140E0115061516333227342322070615
+14333237360514062322263534363332160734262206151416323601E2102825141E073B
+3E1E28754125100504280802033203030A20222E232E2726272D0114C68F90C7C9938BC5
+2AACFAB2B2FAAC01080C2B1B1F101B49262243771B1403040302080901B10E03A41C2F3B
+3226333A0191C7C89092C8CB8F7FB1B27E7DB1B0000000040000FFF202AC02A400180025
+0031003B0000010736333216151406232226353437133635342735363717061734232207
+0615143332373E012514062322263534363332160734262206151416323601512A323E22
+2E7F491F3A014F052A35320608552C282A291B2A221B250101C68F90C7C9938BC52AACFA
+B2B2FAAC01D591452823447415100302011B110408011505090720AF2B3C3D3A0F1F1844
+3091C7C89092C8CB8F7FB1B27E7DB1B0000000030000FFF202AC02A4001C002800320000
+011706232226353436333216151406232235343635342322061514333225140623222635
+34363332160734262206151416323601AC0F3D4330367346202A140E1D091637443C2B01
+34C68F90C7C9938BC52AACFAB2B2FAAC01060C44302E45601E150E121C0712010459333D
+7391C7C89092C8CB8F7FB1B27E7DB1B0000000040000FFF202AC02A40025002F003B0045
+00000117060F010E02151433323717062322263534370623222635343633321737363534
+273536073423220615143332362514062322263534363332160734262206151416323601
+F008020F3B020A070A0C270F31330D12042D3B2327773F200B17072A34351C304B252A48
+0124C68F90C7C9938BC52AACFAB2B2FAAC020C070730D30824190205270B45120D0C123B
+252344751C50170E07011503AE1B6D2E25683391C7C89092C8CB8F7FB1B27E7DB1B00004
+0000FFF202AC02A40015001D002900330000011706232226353436333216151406070615
+141633323734232206073E010514062322263534363332160734262206151416323601B1
+103B4F2935774A1B1E625504221B2825151B3814324A010AC68F90C7C9938BC52AACFAB2
+B2FAAC01050C432E26426D1814273B0A09101418B310352E062C2491C7C89092C8CB8F7F
+B1B27E7DB1B000030000FFF202AC02A4002B003700410000013336373633321615140623
+22353436353423220733072307062322263534363332161514071633323F012305140623
+2226353436333216073426220615141632360116380E05273D17200F0D1B080A2E134106
+41232055161E0F0C0B0E06020725102A36019CC68F90C7C9938BC52AACFAB2B2FAAC01B0
+2C084C19110C1217060D0106691CA09516100C100D0A0708054ED04A91C7C89092C8CB8F
+7FB1B27E7DB1B000000000050000FFF202AC02A400250030003D00490053000001231615
+140623222623220615141716151406232226353436372635343726353436333217330734
+2322061514333237360734272E0227061514333236251406232226353436333216073426
+2206151416323601F41E034D300C0E01070C2E674D4338421C2A0B242A533629262E5825
+1E2F2821151408210F202406355726320118C68F90C7C9938BC52AACFAB2B2FAAC01D307
+11293C030B060909163E29332523172116090D1E1115302D39152B263425291F1FDF150E
+070A0902181E381C8E91C7C89092C8CB8F7FB1B27E7DB1B0000000030000FFF202AC02A4
+002C00380042000025170E01232235343F01363534232206070E010723133635342B0135
+363717073633321615140F01061514323637140623222635343633321607342622061514
+16323601E010212919200A21030F11351814160F38570519143E2A083F4B3C1618062205
+1012E5C68F90C7C9938BC52AACFAB2B2FAACD60B281E1E1221710B07062A201B323E0142
+12020915060807E26519140718751205040F8F91C7C89092C8CB8F7FB1B27E7DB1B00004
+0000FFF202AC02A4000B00240030003A000001140623222635343633321603170E012322
+2635343F0136353423353637170706151433322514062322263534363332160734262206
+15141632360196130E0F16150E0F14130F1B28180F140D1A05293E270A3902070E014CC6
+8F90C7C9938BC52AACFAB2B2FAAC01D90F14150E0F1415FEEF0B271F13120D315F110706
+15020D08C40605069E91C7C89092C8CB8F7FB1B27E7DB1B0000000040000FFF202AC02A4
+000900250031003B00000014062322263436333217070623222635343632161514071633
+32363F013635342B013536371714062322263534363332160734262206151416323601CE
+140E0F15140E0F04362054171E12160F07020712160D26081B143B2FF7C68F90C7C9938B
+C52AACFAB2B2FAAC021D1C14151C1578DB8116110C120F09040C0527359B20080B14030A
+7891C7C89092C8CB8F7FB1B27E7DB1B0000000030000FFF202AC02A400260032003C0000
+01150E01071716333237170E0123222726270F0123133635342B01353637170737363534
+2B01350514062322263534363332160734262206151416323601E51932401623110D1911
+191F141F1C0A1C161B37510A1F0F254407412843150C0140C68F90C7C9938BC52AACFAB2
+B2FAAC018116011C322B43260A281D3011381063012827080615020D07F11D3007031637
+91C7C89092C8CB8F7FB1B27E7DB1B000000000030000FFF202AC02A400170023002D0000
+0103061514333237170E0123223534371337342B01353637051406232226353436333216
+07342622061514163236019F5306090F27111E2C1A230547021C0E2F340116C68F90C7C9
+938BC52AACFAB2B2FAAC0206FEC414080432092C21240914010D0F0515050AC291C7C890
+92C8CB8F7FB1B27E7DB1B000000000030000FFF202AC02A4003E004A0054000001170623
+2235343F013635342206070E0107233736353423220607060723373635342B0135363717
+073633321614073E0233321617140F0106151433323F0114062322263534363332160734
+2622061514163236022F1235331D0723031A2F151719123912280C1135181A22381C1F19
+135B12081C483A15170D191B331C121601042504050E198CC68F90C7C9938BC52AACFAB2
+B2FAAC01070948220D177A0A0907221B1D3A413B850E072A22246557601B06150E030360
+63162427221F2017120816830806041A5391C7C89092C8CB8F7FB1B27E7DB1B000000003
+0000FFF202AC02A4002A00360040000001170E0123222635343F0136342322070E010723
+373635342B01353637170736333215140F01061514333237140623222635343633321607
+34262206151416323601E2102425170F14081B0811243A11131538370318141F4F08214D
+3B2D042007080CF1C68F90C7C9938BC52AACFAB2B2FAAC01070B2B1B1212101B571C1850
+182C41BD0A090815040D0363662A130D6F150A046D91C7C89092C8CB8F7FB1B27E7DB1B0
+000000040000FFF202AC02A4000B00140020002A00000114062322263534363332160734
+232206151432362514062322263534363332160734262206151416323601E677452F3676
+4A2A373C2E304B64450102C68F90C7C9938BC52AACFAB2B2FAAC016344692D2746692E1D
+326E32316A1191C7C89092C8CB8F7FB1B27E7DB1B00000040000FFF202AC02A4001E002C
+00380042000001170607363332161514062322270F01143315233532363F013635342B01
+35173426232206070E011514333236171406232226353436333216073426220615141632
+36015706020A2E39282C7A4A181612042C8F15110543091A13DE13161A300B0E181E3551
+E3C68F90C7C9938BC52AACFAB2B2FAAC020B080A23352B264A740941170A16160D13F61D
+0A08164A1B1624192154100F693391C7C89092C8CB8F7FB1B27E7DB1B00000040000FFF2
+02AC02A4001A00270033003D000001030E0215143B01152335363F010E01232226353436
+3332173707342623220615143332373E0105140623222635343633321607342622061514
+16323601F060010302230EA534092B21382421297D45280D09151710324F201B1B1F3301
+0AC68F90C7C9938BC52AACFAB2B2FAAC0204FEC0040B06010B1616021C882A212823477B
+1F18300C1170302813185E6891C7C89092C8CB8F7FB1B27E7DB1B000000000030000FFF2
+02AC02A4001C002800320000010736373633321615142322262322070E01072337363534
+2B01353637051406232226353436333216073426220615141632360157191A1D20171017
+21111204112117181639310A18183B2F015CC68F90C7C9938BC52AACFAB2B2FAAC01B55C
+2D181B140E251632213946AB23050C1606086F91C7C89092C8CB8F7FB1B27E7DB1B00003
+0000FFF202AC02A400260032003C00000107232623221514171615140623222726232207
+233733163332353427263534333217163332371714062322263534363332160734262206
+151416323601C70D12072F22242F322A160F0D0E0F030F0B110C332C252E50131310050D
+06F4C68F90C7C9938BC52AACFAB2B2FAAC01B8583F1712212E22262805050A6148201726
+2E1D400504096E91C7C89092C8CB8F7FB1B27E7DB1B000030000FFF202AC02A40020002C
+0036000001072307061433323637170E01232227343F01232734373E013736333215140F
+010514062322263534363332160734262206151416323601BA064334070A09171D142731
+1E29010B3135031C153C1207080B030E012FC68F90C7C9938BC52AACFAB2B2FAAC01BE26
+BE180A16220D362721062EBD0D1206042A19080C050C317491C7C89092C8CB8F7FB1B27E
+7DB1B000000000030000FFF202AC02A400280034003E000001170E0123223534370E0123
+2235343F013635342B01353637170F011433323736373307061514333237140623222635
+34363332160734262206151416323601D6112028182311303A21260F1108181044210731
+040B1C3B241F373407060DFDC68F90C7C9938BC52AACFAB2B2FAAC01090A2C1C21193A44
+31241536401C0D0815070704BE10074E2F57B61706036C91C7C89092C8CB8F7FB1B27E7D
+B1B000030000FFF202AC02A40022002E0038000013353E0133321716173E013534272635
+343633321615140706070623223534272E01230514062322263534363332160734262206
+1514163236CF183C05111305042B370B13100C1117262E3322070917070E1101C5C68F90
+C7C9938BC52AACFAB2B2FAAC019615020C7B1C3124501303080E0F0B0E161127303A2E1D
+15425E1B104C91C7C89092C8CB8F7FB1B27E7DB1B00000030000FFF202AC02A40031003D
+004700000117363534272635343633321615140706222F01070E042322353426272E012B
+01353E023332161716173736333205140623222635343633321607342622061514163236
+01841B610F0F110B10188A180E04182F0314101410040C110A040B0D160B281D02070604
+100970070408012AC68F90C7C9938BC52AACFAB2B2FAAC01ACB86420010C0D0F0A0E1610
+3F87171E964A0421181D101F1A771F0B061502070507113C519C096F91C7C89092C8CB8F
+7FB1B27E7DB1B000000000030000FFF202AC02A400370043004D000001173E0133321615
+142322262322071716323F01170E012322262F01070E0123222635343633321633323F01
+272E0123220727373633321605140623222635343633321607342622061514163236016B
+06212A150D111805130A13281D06181011101F2314101308143316181011150E0B081707
+0C133113070C0B1015060A35180D120149C68F90C7C9938BC52AACFAB2B2FAAC0184172B
+210F0B1B0A415A1213140B2A1D12183B3D190F110E0B0E0B183C3E150E06130410175891
+C7C89092C8CB8F7FB1B27E7DB1B000030000FFF202AC02A4002E003A0044000001173635
+342726353436333216151407060706232226273436333216333237363534262726232207
+353E023332160514062322263534363332160734262206151416323601760D4B1313100D
+1117524B361B17111701110D0B18040F12333010102108121E3212030734013FC68F90C7
+C9938BC52AACFAB2B2FAAC0171366823040A0B120C0F1711397A702714120E0D11101233
+100E9120210216040803764C91C7C89092C8CB8F7FB1B27E7DB1B000000000030000FFF2
+02AC02A400240030003A000001071E01171E013332353426353436333216151406232227
+262322072737232206072737331714062322263534363332160734262206151416323601
+D9B8171D170E110F0D09100A0B0F241C19352A1A0D110EC54B1917091517C2D3C68F90C7
+C9938BC52AACFAB2B2FAAC01A9C00413180F0B07010D080A0E110D141C1A150B0ED20E15
+044D6F91C7C89092C8CB8F7FB1B27E7DB1B000040000FFF202AC02A4000B001A00260030
+0000011406232226353436333216073423220E0215141633323E02171406232226353436
+3332160734262206151416323601E86B50313770493139393220341C0F191622361C0EFD
+C68F90C7C9938BC52AACFAB2B2FAAC01785999484065994F17493C57521E23263A57513B
+91C7C89092C8CB8F7FB1B27E7DB1B00000000001FFF5010B02CF01540003000001213521
+02CFFD2602DA010B49000001013DFED10186038E000300000123113301864949FED104BD
+00000001013DFED102D001540005000001211123112102D0FEB6490193010BFDC6028300
+00000001FFF5FED10186015400050000012311213521018649FEB80191FED1023A490001
+013D010B02D0038E0005000001211133112102D0FE6D49014A010B0283FDC60000000001
+FFF5010B0186038E000500000121352111330186FE6F014849010B49023A0001013DFED1
+02CF038E00070000012111231133112102CFFEB749490149010BFDC604BDFDC600000001
+FFF5FED10186038E000700000123112135211133018649FEB8014849FED1023A49023A00
+00000001FFF5FED102CF015400070000012111231121352102CFFEB749FEB802DA010BFD
+C6023A4900000001FFF5010B02CF038E00070000012135211133112102CFFD2601484901
+49010B49023AFDC600000001FFF5FED102CF038E000B0000012111231121352111331121
+02CFFEB749FEB80148490149010BFDC6023A49023AFDC60000000002FFF500AE02CF01B1
+000300070000012135211121352102CFFD2602DAFD2602DA016849FEFD49000200E1FED1
+01E3038E000300070000012311330323113301E34949B94949FED104BDFB4304BD000001
+013DFED102D001B1000900002521112311211521152102D0FEB6490193FEB6014AAEFE23
+02E049710000000100E1FED102D00154000900000123112311231123112102D0ED497049
+01EF010BFDC60232FDCE02830000000200E1FED102CF01B10005000B0000012111231121
+11231123112102CFFE5B4901EEEC4901350168FD6902E0FEFDFE230226000001FFF5FED1
+018601B10009000001231121352135213521018649FEB80148FEB80191FED101DD497149
+00000001FFF5FED101E30154000900000123112311231123352101E3497049EC01EEFED1
+023AFDC6023A490000000002FFF5FED101E301B10005000B000001231121352103231123
+352101E349FE5B01EEB949EC0135FED1029749FD2001DD4900000001013D00AE02D0038E
+000900002521113311211521152102D0FE6D49014AFEB6014AAE02E0FE23497100000001
+00E1010B02D0038E000900000121113311331133113302D0FE11497049ED010B0283FDC6
+023AFDC60000000200E100AE02CF038E0005000B000001211133113311211133112102CF
+FECB49ECFE124901A501680226FE23FEFD02E0FD69000001FFF500AE0186038E00090000
+252135213521352111330186FE6F0148FEB8014849AE49714901DD0000000001FFF5010B
+01E3038E000900000121353311331133113301E3FE12EC497049010B49023AFDC6023A00
+00000002FFF500AE01E3038E0005000B0000012135331133132135211133012AFECBEC49
+B9FE1201A54901684901DDFD2049029700000001013DFED102D0038E000B000025211123
+113311211521152102D0FEB64949014AFEB6014AAEFE2304BDFE23497100000200E1FED1
+02D0038E0007000B000001231123113311330123113302D0ED4949EDFE5A4949010BFDC6
+04BDFDC6FD7D04BD0000000300E1FED102D0038E00050009000F00000121113311330123
+113301231123112102D0FECA49EDFE5A494901A6ED49013601680226FE23FD2004BDFD20
+FE23022600000001FFF5FED10186038E000B0000012311213521352135211133018649FE
+B80148FEB8014849FED101DD49714901DD000002FFF5FED101E3038E0003000B00000123
+1133032311233533113301E34949B949ECEC49FED104BDFB43023A49023A0003FFF5FED1
+01E3038E00050009000F000001213533113313231133032311233521012AFECBEC49B949
+49B949EC013501684901DDFB4304BDFB4301DD4900000002FFF5FED102CF01B10003000B
+000001213521112111231121352102CFFD2602DAFEB749FEB802DA016849FEFDFE2301DD
+49000001FFF5FED102CF0154000B000001231123112311231123352102CFEC497049EC02
+DA010BFDC6023AFDC6023A4900000003FFF5FED102CF01B100030009000F000001213521
+11231123112101231123352102CFFD2602DAEC490135FE5B49EC0135016849FEFDFE2302
+26FDDA01DD490002FFF500AE02CF038E0007000B000001213521113311211121352102CF
+FD260148490149FD2602DA01684901DDFE23FEFD49000001FFF5010B02CF038E000B0000
+01213533113311331133113302CFFD26EC497049EC010B49023AFDC6023AFDC600000003
+FFF500AE02CF038E0005000B000F00000121113311330521353311330121352102CFFECB
+49ECFE5BFECBEC4901A5FD2602DA01680226FE23494901DDFD20490000000001FFF5FED1
+02CF038E00130000252111231121352135213521113311211521152102CFFEB749FEB801
+48FEB80148490149FEB70149AEFE2301DD49714901DDFE2349710001FFF5FED102CF038E
+00130000012311231123112311233533113311331133113302CFEC497049ECEC497049EC
+010BFDC6023AFDC6023A49023AFDC6023AFDC60000000004FFF5FED102CF038E0005000B
+00110017000001211133113305213533113301231123112101231123352102CFFECB49EC
+FE5BFECBEC4901A5EC490135FE5B49EC013501680226FE23494901DDFD20FE230226FDDA
+01DD490000000001FF6DFF3102A102A60059000013333637363332161514062322263534
+363534232206073307230302232226353436333216151406151433323713230302232226
+353436333216151406151433323713233733363736333216151406232226353436353423
+2206D3AC2721364D253219110E170A162A3A166B066C484088222D1610111509143E2358
+AA484088222D1610111509143E23585B075D2721364E253119110E170A162A3A01AC7E2F
+4D231B111A16110A12030D6D7720FEC0FEE5231A1119151007110510A201A4FEC0FEE523
+1A1119151007110510A201A4207E2F4D231B111A16110A12030D6D0000000001FF73FF31
+01E102A90059000013333E0137363332161514062322263534373635342322070E010733
+3237323E01331715140F010E01070607021514333237170E0123223534133635342B0103
+060706232226353436333216151407061514333237363736372333581B2628384E2D3A18
+1213160904223620191C1696282904080402050501020C010106480B1538102B3C1E2E4A
+0C109B482B4A272D222C160F101705041425181C1E2D165801AC5C4A2433271D131A1813
+0E090504102A20475606010103030712040A27040515FEF90C0A46093A30321D010B2A06
+0AFEC2BB4121211B121A1810070907040D2F34ACFD370002FF73FF34020602AA003D004F
+000013333E02373633321716333237363332140706021514333237170E01232226343F01
+230302232226353436333216151407061514333237363736133723253734272635343736
+353426232207060F012E5C1514251D404A201D1C030418060405151E610B123C102D381F
+161A2F21A645418C222A150F10180504141D120D0516451C5A015725050508041A113726
+251B0601AC40343B193607040803124F73FE650C0B45093D2C1B2EC28AFECAFEDE231B11
+19180F080907030D18110E3A014A842094050A0C050A0B0504090D33336A180000000001
+FF6DFF3102D502A90085000013333E013736333216151406232226353437363534232206
+070E0107333237323E01331715140F010E01070607021514333237170E01232235341336
+35342B010306070623222635343633321615140706151433323736371237230302232226
+353436333216151406151433323713233733363736333216151406232226353436353423
+2206D3AC1B2628384E2D3A181213160904221D2712191C1696282904080402050501020C
+010106480B1538102B3C1E2E4A0C109B482B4A272D222C160F101705041425181C1E3111
+AB484088222D1610111509143E23585B075D2721364E253119110E170A162A3A01AC5C4A
+2433271D131A18130E0905040D0F1820475606010103030712040A27040515FEF90C0A46
+093A30321D010B2A060AFEC2BB4121211B121A1810070907040D2F34AC011420FEC0FEE5
+231A1119151007110510A201A4207E2F4D231B111A16110A12030D6D00000002FF6DFF31
+02FB02AA0069007B000013333E0237363332171633323736333214070602151433323717
+0E01232226343F0123030E01232226353436333216151407061514333237363736133723
+030223222635343633321615140615143332371323373336373633321615140623222635
+34363534232206053734272635343736353426232207060F01D3AC1514251D404A201D1C
+030418060405151E610B123C102D381F161A2F21A645206944222A150F10180504141718
+0D0516451CAB484088222D1610111509143E23585B075D2721364E253119110E170A162A
+3A018B25050508041A113726251B0601AC40343B193607040803124F73FE650C0B45093D
+2C1B2EC28AFECA9095251C1119180F08090703141F110E3A014A84FEC0FEE5231A111915
+1007110510A201A4207E2F4D231B111A16110A12030D6D7794050A0C050A0B0504090D33
+336A1800000000020023000002AD029B001B001F000029013533323635342F0123070615
+163B011523353637013313163B012F01230702ADFEE3102820020DC6540A02291DDA4329
+0164124E0A4010DB19068B101D20070E718C0B0F1D101008420241FDBB46E8E3E3000003
+0026000002AE028D001A0025003000001333321514070607171E01151406232137333236
+37133635342B0117071633323635342623220B01163332363534262322C6FCEC5B1C2E03
+344B9091FEBC0414342C077B024E13D53B1E17525646311758442027506E503E24028D91
+662D0E0C0409463B526F10211E01EF0A0B2A1AFC06584B342EFED4FEF509525A34380001
+0032FFF402C70293002300000107233635342623220E0215141633323736371706070623
+222635343E01333216323702C73510014652487C4F2C63607E5A0A07142336576A8A9678
+CB781B6934100293DF08223B55446C83415B7B620A0A0D35273DA07670B6631B1B000002
+0026000002FD028D00120023000013213216151406232137333237133635342B01170306
+151433323E0235342E022322C2011A8C95E7BEFECE04125A0F7A044D19D87A055F456C3E
+2010254B3423028D9182A2D8103E01F110082518FE0813082B3D626E3830524D2D000001
+0026000002DE028D002D00000107233635262B010733323637330723343635342B010306
+15143B013236373307213733323713363534262B013702DE2A10020469A03C50333C0F10
+3A1106485A42023F43736C221042FDC50413590F7805202B1304028D9E1A0957F82639F2
+02300A33FEFE08021B4858C6103E01E8160E1310100000010026000002D3028D002A0000
+0107233635262B010733323E01373307233635342B0107140615143B0107213733323637
+133635342B013702D3281001036B933E53242B280A103C100546613E044F2004FEAA0412
+342E087C044C1304028DA0081C57F80B2B29F2172632FE011004291010201E01F1100827
+0F0000010032FFF402DE029C00350000011522060F010E0223222635343E013332171E01
+333236373307233635342623220E0315141E0233323F01363534262B013702DE3B2D093E
+2556332B7FA56ECB7A3532062C0D0F1A02102D1002514F426D48311610264B3439283903
+202B13040149101F1FD81616037F7F6AC27E100213180DDF140C3E5C3758717338223A37
+2019C90C0D1213100000000100260000039B028D00360000010723220607030615143B01
+0721373332363F0121070615143B01072137333237133635342B013721072322060F0121
+373635342B0137039B0412342E087B044E1304FEB70412332F073DFEE83D044D1404FEB6
+04125B0F7B044E1404014A0412362C0734011635044C1404028D10211EFE10120A221010
+201EF2F20C0C2610103E01F00C0C271010201FD9D914042710000001002600000212028D
+00190000010723220607030615143B0107213733323637133635342B013702120413352D
+087B034E1104FEB80413342E077B044D1204028D10201EFE0F0C11211010211D01F11008
+26100001003CFFF4026C028D001F00000107232207030607062322263534363332161514
+0615143332371235342B0137026C04125C106719432C413549232319271B183119754B14
+04028D103FFE63642D1C352C1E291D16111D0D156001C71627100001002600000322028D
+00390000010722060705131E013307213733323635342E022F0123070615143B01072137
+333237133635342B013721072322060F01332536352E012337032204233025FEF1BB1A39
+2C04FEE1040B1817030407029C043E034E1104FED004124410750A4C12040138040B3326
+083505011A1201141E04028D10181DD3FEEA262910100D14060A050B03EDF30C0A281010
+3E01D8270A2610101F1FD1DD0E0F0B0A1000000100260000029C028D001E000025072137
+333237133635342B0137210723220607030615143B013236373637029C3DFDC704115C0F
+76074C120401470412342D087A05287A4F57210908BEBE103E01DD1C11251010201FFE1F
+130C182F440E17000000000100260000041F028D00300000010723220607030615143B01
+07213733323637132301230323030615143B0107213733323637133635342B0137331333
+01041F0411372A087F024D1304FEB60411362C077006FEA7195E036D054C1404FEF50413
+362D0977054D1304D55904014D028D101E1FFE0E0715221010211D01B7FDFB0205FE5416
+12211010262301DB15112310FE1301ED00000001002600000385028D0024000001072322
+060703230123030615143B0107213733323713262B0137331333133635342B0137038504
+12352F079018FEEE066C034C1304FEF604125B0F7E16461304C8EC0561044C1404028D10
+201FFDC2020EFE400C0F2310103E01FD3210FE2F01821208251000020032FFF502C8029D
+000F0020000001140E0223222635343E0233321607342623220E03151416323E0302C83A
+669E5B708D3B679F5C768374454842683D270E4F7A643F2B1201A44B987D4F82674D9D83
+52934F56674465826C3046503C5B7369000000020026000002C0028D001E002900001321
+32161514062322272227070615143B0107213733323637133635342B0117031633323635
+34262322C9010F75738F8E2C1E040838034D2004FEAB0411352D087D044E13D644201C4E
+683B4218028D604052750502DF0C0B271010201E01F110092518FEEE08604C323F000002
+0032FF6802DB029B00250035000017372E0135343E0233321615140E0123071736333216
+333237170E012322272E02232207013423220E0315141633323E0253A4586D4472A85C6E
+8170CB76400415161EA92E4A3E0D307354444A0D44270E15250206823F6C463215463D4D
+7D4726736B0D79604C9F8052837466C6822B050422420B3B3C10031008120252A344687E
+702C484D5C8C9100000000020026000002D5028D00250030000025072303062322270706
+15143B0107213733323637133635342B013721321615140607171E010103163332363534
+26232202D502A99614090A1C3E034C1304FEBB0410342D087C054D1404010F7167615173
+122EFEEB40110F605F4439121010013B0204EF0C0B271010201E01F11405251052453E5D
+10E5252E0252FEFC044C4249340000010032FFF602A8029C003800000107233635342623
+220615141E05171E011514062322262322072337331416151E0133323534272E01272635
+34363332163332363702A8351001514F295006100C1C0D2406373F83713174242017103C
+1001034E5A9C2E10511149716E2E78110E1403029CDD0810445C31300E1B1A121B0C1E05
+2E593B4F702626EC051505466188322E104610493A456A25180D000100190000029E028D
+001D00000107233635342E012B01030615143B010721373332363713232206072337029E
+2E100523251B6285054C1504FEB70412362D07855B3E5F0E102E028DB32A1D1F2107FDE6
+1603251010201E021A513DB3000000010041FFF30307028D002F0000010723220607030E
+0423222635343637133635342B013721072322060703061514163332371336352E012B01
+3703070410342F085709162B3758376F6F0C024C014B120401480411362C085A074C4495
+2E56040121291304028D10211EFE9C243A412B1D6E4D065108014A02051F1010201FFE98
+1A2A2D43BD015F0E0C13121000000001003CFFF002F8028D001800000107060701231134
+23372107232206151117013635342B013702F8044D37FE47186304012604132C1A040118
+26341404028D100548FDC0023B5210102620FE7901016E301A16100000000001003CFFF0
+044D028D002D0000010706070123112301231134262B0137210723220E02151133133534
+2B013721072322151133013635342B0137044D044E38FE4A1D0BFED71D2F2A0A04012004
+0713141A0B05E2520804011D04124706011628361104028D100449FDC001BAFE46023929
+2B1010030C1F19FE87014C3D37101048FE750172341419100000000100190000032A028D
+003A0000010723220E010F01131E013B0107213733323635342F01070615143B01072337
+363F01272E032B0137210723220615141F01373635262B0137032A040421331C17BB600B
+22220E04FEE7040B22210445B50C381604F9044E3ED055060917261A0904011B04131A1A
+063CA40F022B0904028D1016191BD5FEF62024101010190D0DC2C90D0F2010100A43E6E7
+1212200F10100E150C10B3B812101810000000010023000002B7028D0027000001070607
+03070615143B010721373332363F01272E012337210723220615141F0133373635342337
+02B7044834D13B034C1404FEB80411352D073D590E373604012B04132317074B04AE104F
+04028D100540FF00EA0D0D241010201EF6ED2527101013150318CFD4140E1C1000000001
+003C00000322028D00130000090133323E02373307210123220E020723370322FDCADA2A
+383F2B0D102EFDBB023DCA2C37422C0E1130028DFD99081A3C2EB20268061634299E0002
+0028FFF601D801B9001E002C00000103061514333237170E012322353437230623222635
+343E01333216173337073423220607061514333236373601D85B010E18280C1C48212A0B
+04525B2D2C4C84441E2202010919322F561D1C3A3160160F01ACFEA7020911360C2A4137
+0F23694334439A6F1C122157476447463642734B31000002002DFFF501C2029C00170025
+000013173633321615140E022322271336352E0123220727370307141633323E01353426
+232206D6044138333C284367384348900201120A130B039E6C372611395A292A1D2F3A01
+7E043F57402E685B3C3002330803090C041018FE60D7050E627B37302C5500010028FFF5
+019001B9001F0000251706232226353436333216151406232226353436353423220E0115
+14163332016B0C5D6944459F6828391B1B12141D223755243628496F0D6D5B406CBD2923
+1F27180E0C230B1563732D3C310000020028FFF4020F029C002500340000010306151433
+3237170E012322353437230623222635343E013332161733373635342322072703342623
+220E011514163332363736020F95020F19250B1C4620280A05545731273E7C4728280102
+350221061504081A1E2E572F2018325B1710029CFDAA060609380C2940291B25694C3338
+947A1E14D1080414030FFED024236D89322220704A3300020028FFF5019A01B900180022
+00002517062322263534373E0133321615140E0207151416333227333236353426232206
+016B0E5A6E44450614975B283E37585F30422F4CBD094F7719133256700D6E5E3E201C59
+93222A2D472917021C2F3CA35C4113187A0000010028FF450267029C003800001333323E
+013736333216151406232235343635342322060F01330723030607062322263534363332
+16151406151433323E05371323F8251C1D1D0F3B5B252A181123090F243A1013500C4C4F
+140A4768232517141312100F0D1914100F080B02574D01B52750165A201B141419081A03
+08473D4626FECE4E18B21E18141D140D0A110509112120321E2F0601560000030014FF45
+01EC01B9002400300040000001072316151406070E01141E021514062322263534372635
+343633352E01353436333217073426232206151433323E0113342E02270E010706151416
+33323601EC0D51114C412A2E4957496F685E5A751833222F2F624C3C1C1E171F273B3821
+2E110D2D374C100114053048433F40019D2D141E395308062028180D312A3C5B42314626
+101F1E39040B3C263E601C401F1F5734513A44FE7E1B230D0E06010B042325273A350002
+0032FFF50101026800090025000000140623222634363332070306151433323E04371706
+2322353413363534262322072701011C14151B1B1513015C010D0609060C0613060D5234
+284F020E110E0E030249261B1A281EAFFE9406080A03030A0814070A692E1F013304080D
+0904100000000002FFF0FF45017402680009002700000014062322263436333217030E03
+23222635343633321615140615141633323713342322072701741C14151B1B1513086C09
+1D2C4226252417180F141006043C2B5C200F0C030249261B1A281EAFFE5724423F262518
+142015110713080307AC016B1605110000000001002DFFF5020F029C0031000001070E01
+0F01171E0133323E033717140E04222E022F010F01231336353423220727370337363534
+262B0137020F042F36206A400D16120910100B12040F110D191721201B1408073F382D4C
+9403201308039E71A71511090C0401AC0C051A1B5C981F1C09110F1A060B011F16231611
+0F1F11109331A6024D090B16020E19FE38951311080B0C0000000001002DFFF60116029C
+001B0000010306151433323637170E0423223534371336353423220727011694010C0F25
+0A10032311201F11270680031F031803029CFDB104070D26110C042B121D0C33101401FE
+0D0B16030F000001001EFFF802A801B9003E000025170E01232235343F01363534232206
+0F0123133635342322060F01231334232207273707333633321615140F01333E01373633
+3215140F01061514333236029B0D1A4821270638061825810D224F4D051724800E234E5F
+210B10029D2C066F511B1C090A05174724201D36073D020F0E236B0B2C3C310D18DD1513
+26BC3687012B171126BC368701761F020E18A9A92E23161E242952181647211CE706060C
+1B000001001EFFF801D301B90039000025070E09232235343F01363534232207060F0123
+13342E0123220727370733323736333215140F0106151633323E033701D305010F061009
+100B110D100829073907182C583A0A214D5F030E0D0715029F330307315D43380B3B0102
+0D070E0F091001600601130712090F090B05042E0E1ADD1C0E268557237C01760A0D0903
+0F17BD49743E1A2CE702080E070F0914020000020028FFF501B601B9000B001700000114
+06232226343E01333216073426232206151433323E0101B6996E45423E77464053511F24
+3D6C3B31562A011F6EBC6282845C4D2E2439B7666B78880000000002FFE2FF4901DA01B9
+002300300000133736333215140E01232227070615143B010723373E033713342E012322
+0727370F021633323E01353426232206FD0E3D345E417845251818053D1003EA03161D11
+070675030E0E0C10029E12242E121C30542C1F14284601720D3A9B4189601364160D2B0C
+0C010A1A131701D00C0B0A0410184586C81561823A2B2853000000020028FF4901CF01B9
+001F002D00000103061514163B010723373332363F012306232226353436373633321617
+333707342322070E0115143332373E0101CF83031A170E03FA03132E26092C064A592D2C
+63463229222402030718311B22304B342218324901ACFDF60A13161A0C0C2A24B8674330
+59A92E221E16275A4A1B27A8423F11239B000001001E0000018901B9001F000013173637
+3633321615140623222E0223220E010F0123133635342322072737AF050A164B3E151724
+1D0D100507061B4D2A07154D5C04210912029D010B011424771B151F330C0E0C8A6E194C
+016C0F0813030F17000000010032FFF5018601B9002A0000010723342623220615141E01
+151406232226232207233733141633323635342E023534363332163332370186180F3329
+151E4343493E1457030F0F1119103B2D2821293029432F17380D0E1001B99232461D1D16
+526129324B14159C325035241B3B2D4221373414140000010028FFF7011B0237001D0000
+01072303061514333637170E06232235343713233736373307011B0A464E021017250D02
+130B171217190C2705514D057B360D1F01B626FEC006050C02320B021B0D1A0E11083413
+1201401D1773810000000001001EFFF701BC01B900360000010306151433323E053F0117
+0E02232235343F01230E020706232235343F01363534232207273703061514333237363F
+0101BC59010E040909070A050B02050D131B3C1A28041A010234411226223D083B062110
+0A039D54031A293B4D201501ACFEA404050E0306050B060D02060B1B232D3415105F0142
+4C0D1C4A1D1EE7170217030F1AFEBA0D0B224D66754B00010048FFF701DF01CA00270000
+130306151416333236373635342E02353433321514070E01232235343F0136353423353E
+0237F759041F1D496C1D0F131713362F61216A3774093A05390E45331601C6FEBA0D131E
+2479522D1D19220E160E2A5392862E3A5D201ED21405140F040E0E0A000000010048FFF7
+02EC01CC0039000001030615143332373635342E02272636333215140E0323223534370E
+03232235343F013635342335363717030615143336373E01370213500C3B7B480F131613
+010120172F1830415A316F17112B3B4B284E132F0536544704510B1C3861252F1A01C2FE
+DF2E183DCB2D1D19220E160E1812532C676653346429542746482C57154AB10F0E160F0E
+1E03FECD30192F019638785D00000001001EFFF701FE01B9003900000137363332151406
+23222623220E010F011E02333237170E0323222F01070E0223222635343633321633323F
+0127262322072737161701312D37383115120C18080E150B093709232214211C0E021A19
+2A142D1C283F14192E1A191B15110D160C1F2741212042170F0384311A0120455421101A
+090B0D0E55146E43390A022A23204D71621F201D1C130E17143B655C590612211B470001
+001EFF4901F001B800320000011736373635342E01353436333216151402070E06232226
+343633321633323637032E0223220E012327371E01010E1C472F1C1A1A1A1519209A320A
+291523191F1D0E1A1E1B0D191B050C4315260309201A050D0F030296110F0133EB615734
+1708131A101117211D33FEFF3F0D341B2A16180A2328151F4620013A1E26250103101918
+35000001002AFFF201D301C200260000011501173633321E023332353426353436333216
+15140623222726232207270123220607273701D3FEBE031C271F2E151B0F1B0C180E1216
+4327093B323143370B0148832E2A10122401C210FE9801151B201B1805150C0E18181225
+2B0E0E180A0172162704890000000004001FFFF1034E02A2003100390042004B00000117
+0603363717060F0123372627062322263534363332161514062322272314163332363726
+3534363332173E03333207230E0107161712033427060716173736272623220615141736
+03450967A23C2B092A521161125A485C51303B241A151D1714160702241D29422B7A7249
+663B2B41514D2510390138714C1F0281981D703C435431012C325D39596B3F02A00ECAFE
+7D0C16101F0E2A2706225E342820281C14121E0C1121232A458A5362523E55562B241484
+733D53011BFEC9543DAC4320066D08BC4B543E76404500020025FFF1030D02AF003A0045
+000001072623220E0115141617362433321615140E012306151416333236353426232206
+0727343633321615140607062322263534372E013534363332031732373E013534232206
+01C10C3751356347564151010F682E3285DD73453E37507A291E366107167550373F362A
+4E6055703047638F715B35017B79495B3248CB0285131F214A313E47077DB727243C7E54
+6463313D643A25256A4E025B863532294E1D365D50515A0C56484B71FEB4013E25602B28
+9E0000030024FFF1033202AF00370044004C000001170E01071615140623222706232226
+353436333217363736372E0123220615141633323637331615140E022322263534363332
+161736073427060706070607163332360526232215143332032A081B151739C57D46564B
+563D443C2F4763527953602C9A5290A15C4860770113022E494F255976C39060A7362708
+25293E4B7921143A3572A4FE204B39435742024B140C101959658CC7211B221D191E3432
+C487513D4B80693C5581840F1C3F64381D65526E934E421CEB4C44377B9753160A14AF98
+28192100000000020053FFF102E402AF0044004E0000010726232206151416173E013332
+1615140E0123061514163332363717060706232226353436333216151406232227231E01
+3332363727062322263534372E01353436333205342623220607323E0101A109313E4C61
+4A4145D8592C3B73B961292220367F580F222052F84861211A141F181415080205492E57
+75320142483C4D1A4E597659460153201941A830539F60028D121644302C3C096D842923
+325F3A3C441D264750102257E0432B1E271C13151E0D18276060012C453A37330D49393D
+556114167F55344F000000030009FF4F031802A20029003600420000251706070E012322
+2635343736373E01372E0135343E023217363332161514230607363717060F0136133526
+2322070E011514161736030E02070615141633323602280F475035B85C242A7D239B1443
+10374233525B5A52241E090F6842564D3610356D5744891A1152303146392751DE114D31
+145814103D67C1103F1D66A0241D4B3B103027AC220B4337314F2D1706140B09302FC112
+530B6715D01A01C701021112482F2634019FFE210617110A2B360F16620000010028FFF1
+03EC02AF0075000001170E050732173E01373E01333216140623222627230E02070E0107
+15161514061514333237170623222635343635342322270E032322263534363332161514
+06232227231E01333236373E043727062322272623220614163332371706232226353436
+333216171633323603030D1A2F2129142A081B0F20382C4C6325161D1614101C01010815
+1C0A316141304C203970137555253855281A082E5E5C53303F50221D141B181415080203
+3C2B3C5A3C0D3E19343624010F152C503F273046362E4D361236613C4F664B1D3A373C1A
+2255029D101430273F224B0E0E0735416F69152819171607263D12595915023029257E11
+22810F902F2329861E1F0F6589461C402A1E2C1C16141D0D1926586A18712A4C381D0305
+2C223D503656096B47373B5C151C1F26000000010026FFF103BC02AF003C000025333637
+3637363332161406232226352306070E020723363736372706070E012322263534363332
+16151406232227231E0133323637123717060706023901235752382228171D1912101F03
+30672433562B141A060516013C535B7640222E2219161E171309070301130B356F4A9D5F
+0D0E0C088336D1C43C25192A19171619FC59718A2468CEBC4D0151A7B6942D201D251F14
+121B040A0C9496013E270B30DBA500010052FFF1029702A8002E000001072623220E0115
+14163332373E01353426232206151417072635343633321615140E0223222635343E0133
+3216029714205E51B3733A3871642A4B3725334D1B1623614037553D648E4C535D77CC74
+404E02250262ABEA5A3A4D672C9456343A564935340A39494D6749494893764A75567EE4
+8A4C00010026FFF1037602AF005200000117060716151406232226353436371706151416
+3332363534270E03070E01232226353436333216151406232227231416333236373E0337
+26232206151416333237330E0123222635343633321736035807222059573E2325201A0A
+241210293537182B1C311054C2794D602219161D171417070246325E7C542B2A423D234C
+7495CA3C2B9E2F140876653F4FDEAB7D6024029D130E184362446B261C162B0E1215210D
+10563F4B301744386A21A99448331F281B15141C0C1C3369964D48643F1A3096632937F9
+71A6473B6BA83B17000000010052FFDA029702A80043000001072623220E011514163332
+3726232207273633321736373E0135342623220615141707263534363332161514060716
+3332371706232226270623222635343E01333216029714205E51B3733A38473F1B212626
+0D3E2E35211C062A4B3725334D1B16236140375565521A2435310F4441212813494D535D
+77CC743F4F02250262ABEA5A3A4D262B1D113A3819072C9456343A564935340A39494D67
+49495FBE3B2A300E52201D2675567EE48A4C00010043FFF102BD02A80037000025072E01
+232206141633323635342E0335343E0133321615140623353E0135342623220615141E03
+151406232226353436333216018D141542312848533C4C75202F2E20546F3A3854593530
+3D3F2D3F7021303021A477517465423D5D8F04472E4368465E521D372F30422443632A3A
+3A354C1505382E2A2759401E393032422463784E4F47564F00000002002BFFF1038B02AF
+001D003D000001170623222623220615141633323637330E012322263534363332163332
+07170E01070E0107062322263534363332161406232227231E01333236373E0103800B59
+5739F82C5C794431475B1C141470554057AF8838EF3134B10D263319175D3F5A613D5722
+1B141D191415070203392E537744305A02A31249395F4239405D59656F4F41607635510E
+256E585189293C3D2D23271D281D0C1B24729367750000010024FFF1032502AF00400000
+09010615143332371706232226353437270E0123222635343F0136353426232206151416
+333237330E012322263534363332161514070306151433323E023F010325FED811213870
+15785325311103356D2B242D4691244C2D547A27226229140C563C33409D63496A26BA27
+1D276D674D18820292FDDA201723810D922B2321260148513028396EE3382D2430634F25
+2F77385D3F335A7B4D45423AFEE13D1A1C5F8C782DF300010023FFF1039A02AF00460000
+37173E03373E03333216151406232226352306070607062322273E01373E013727062322
+2623220614163332371706232226353436333216171633323F01170E010706D602366163
+533A343C48371A151D19121418013494926775570E21293733235846030F15349E1F3046
+372D4D3610365F3C4F6F481C313B3C1A413B1B0F4849285815020B3C6A7158505459251A
+1512191A171EE7E4505C062666835880430305533D503656096B4737395E131E1F31160F
+4D8165DB000000010023FFF1042E02AF0060000025173E01373E01333216151406232235
+230E01070223222736373E0137270603022322273E023736372706232226232206141633
+32363717062322263534363332171E0433323F011706070607173E0237123332170E0407
+0601C702447C4B7E7337151D19122B011B6A71AF90210D55382C6F520161A5B195131C1F
+38211B3888020F1531981E2F3D302A26381B10365538495D46316107180A100D06413B1B
+0F754F4F7502326C4429B77E12211524281333065B18021B9181DB911916121932089FC2
+FED30450997AB8570111FED9FEC1061A5C4E4896890205533C52352B2B096B47373B5C31
+040C06060331161073CECD69031270694901440B0F2A4D26770FCE00000000010024FFF1
+036902AF0050000001333633321615140623222635343722060706151433323637170E01
+232226353437230E01232226353436333216151406232227163332363736353423220615
+1416333237170E01232226353436333216023B02707221292016151D1135854443321B48
+39143E573830350902367349353D201A141F1B140F0A1846377E3B587C445D2D2A582613
+114F3439447756596C01E9C61F201A1E18161711B19A974D413A420F5049333120174D4F
+41291E2A1C131520063683679B669458452A356A053D46443A506D7100000002005BFF1E
+039402AF004800550000013302033637170E02070E01232226343E04373637270E012322
+26353436373E01353426232206151416333237330E012322263534363332161514060706
+15141633323637030E0515141633323603395BF2804B3E0F1F40232535B65C242D212C4E
+355B10491E0333722B272E2F3C472B4F2F5B752D22672E14155F3B30429B654B683A5256
+0F0E339670DF32284C20290F17103C680292FEBCFEFF1C340F1C2A121066A2243A332123
+111B059034044753312C24564E5B4C1B21325A4D202B7D4E4D3D2E5771533F2D65676C2B
+0C118E99FE67100E1D131E1F120F166400000003003BFFF1039002AF0053005C00650000
+01170E0123222635343633321E0117363332161514062322270607163336371706232227
+06071633323637170E012322262706232235343633321736372623220727363332173637
+2E02232206151416333236253423220716333236012623220615143332019712193F3233
+4D685D32754639484E39374232374E383C05063C210E373F0E0436686A334F6A13140E73
+5D244F524B577042322D613B3D0408352A113C420B064459393D6E32404733242A3501E9
+473E2C442C1B26FDB44C2A1B264741020708303240333B641A1A172E221A18221A40AC01
+0219113B018F4E24494201555C151C2B3C18221F389F0120104101A54C1614174F29282D
+23781E211911FDE81C110B1E00000001001EFFF502F601B9003A00002517062322263534
+372706232226353437062322273716333237153E0133321707262322070E01151433323E
+01373E01333215140706151433323602E1158D6A252704016E572C30162324271F0A1F1A
+3E433895435B1B151C38494641602722513523093B2A1B6E0B371F71C211B93025130D01
+793B322D3214111A0D4F01465A470A334642A82B2D33352934651C2C6627183A51000002
+002FFFF4022F02AF0032003A0000133716173E01333216151406230E0115143332363726
+353436333216151407163332371706232227230E01232226353436372625342322060732
+367F142035428C3C1D209B713F7B243A7F3D0A381E090F37132C120C071016332101428C
+3F29346343370173231F5543578301ED1626095C7F1F184B7D5EE0342C6D631D1B395011
+0C435B20051A0920686E332A40D0580EA91F5E6369000001001EFFF5024D01B9002C0000
+25170E012322263534370623222737163332373E013332151406232235343E0235342322
+0E0115141633323602371659A9462F38121E2E271F0A1F1A3D3B34984258241928131813
+22378B5C1E18349FE1116E6D3F362E2D18111A0D4549604F1A27210F12050C0A1582A12E
+1A1D650000000002001EFFF5033B02AF002B003900000901061514333237170E01232226
+353437230E01232226353437062322273716333237153E01333216153313033423220607
+0615143316373E01033BFEBF0E1C478D174B7334252409023B61352B30181F28271F0A1F
+1A3E43389442242A02ACCC302971325729404F405B02AFFDB218181BAC115F5A281F1718
+3D3C38312E3514111A0D4F01465A27270144FEBE2954497D4029014A3C9E0002001BFF2F
+02A102AF001D002800001713263534373E06333216151405071633323717062322270301
+3423220E020F013E011BC20D751B1D2D1D2A242B172327FEF1732130453C1149503326A6
+02192A122521130D3E5789D101761921573C353551283217112B1B916BDD1236173D13FE
+BC032F311930201978216C00000000020026FFF502B202AF0031003B0000251706232226
+35343F013635342322060F01231326273716173E0133321615140E022307173633321615
+140F010614333203173236353426232206029D15A06820262E6A111944CF521C4DED502E
+142E4C455D391F20344B4C1C4E03866721282A67181758A001368113111E42C311BD2523
+3C449D1A0D1ACA9C3501B80E371536077B5F28192A492C1999029E211D3043A4272A01C5
+02593D0F145000020053FFF501E4028D000B002800000114062322263534363332160317
+0E0123222635343F0106232227371633323733030615141633323601E41E15131B21160F
+1B43154E6B2D242C393C25342A1F0A1F1D454349A016120F235A0260141E1A1114201CFE
+4B115F572B273F666D1E111A0D4FFED928260E124E0000030009FF2502CE028D000B002E
+0039000001140623222635343633321607011633323717062322270E0123222635343736
+3332171306232227371633323E0137012726232206151416333202CE1E15131B21160F1B
+7AFEF82A2B3B290C363F34302B633F2F33362A493A21D12C462A1A0A1A221F3F2718FEF3
+011D3739451F195D0260141E1A1114201CC9FE0D161E1A22163F332B1C30201A0D018A2B
+101A0C22241CFE02010D2820121700020028FFF5029A02AF003C0046000025170E012322
+26343635342623373E0135342322060F01231326273716173E0133321615140E02230717
+363332161514060F01161514061514333236031732363534262322060283174B74332331
+2B1E1F0B4C852141DE4E1B4DED502E142E4C455D391F20344B4C1C580295771E26825201
+36211F216BD401368113111E42BB115D58203E4811121D1E04522A22CE983501B80E3715
+36077B5F28192B492B19A801AC241930590A0320321C3E0C1B51017402593D0F14500002
+0030FFF5023B02AF001E00280000133716333E0133321514060706151433323637170E01
+23222635343736372637173E013534232207064D0E243A55B33A40C1818F2421574F1555
+612D25324D0C1C319801759B23252D3A01851A197DAC4351A013E7432B4C5B1163512D2A
+5486162C0222011A83481F2F3B0000010031FFF503D201B9003C00002517062322263534
+3F0136353423220607231336353423220607231306232227371633323733071736333216
+151407173633321615140F01061514333203BD1599701E272D68131B4ADE584BBE141C4A
+DF554DB83449201A0A1919505744460386681F291102746722263160171757C310BE2622
+3F41981D0F1AEAB10151240B1BECAF01562E101A0C628B029E211D23270189211D314E98
+26151600000000010031FFF502BD01B9002C000025170623222635343F01363534262322
+060F0123130623222737163332373307173633321615140F010614333202A8159B6D1F27
+2E6A110F0D43CD521C4DB73449201A0A1A185057484903866721282A67181758C311BD25
+233C449D1A0D0A10CA9C3501562E101A0C628B029E211D3043A4272A000000010017FF2F
+02B601B9002E0000011736333216151406071617072E0127062322263534363332173E01
+35342322060703230106232227371633323F01016A03866726366846462316283123312C
+2424332724152E7C2443CB548D4D01282D50201A0A1919515648011D029E303347B22F1C
+2F14231C031C120E121E041AD54328C99DFEFA02272E101A0C61010000000002001EFF2F
+02E701B9002800350000251706070E02072313270E012322263534370623222737163332
+373E01333216173337330117362427342322070615141633323E0102D512439830532606
+4EA902366138262E171E28271F0A1F1A404139953C243004021C44FEE7031F010E97365F
+6E5618113D9360CA12468B2B582C090136013A373A2F303314111A0D4F455A212030FDF3
+0222F7BA2A9F7D3E131681A30000000100300000023C01BC002000000117062322270507
+231306232227371633323733071737343633321615071633320239030E124215FEFC4749
+B73549201A0A1A185057487802D62B22131754112D0D01371B0730C085015A32101A0C62
+E401A0293012094A24000001003EFFF5019C0213002C0000372736372635343633321615
+1407161514070623222635343633321615140E02151416333236353427230E0181096F59
+0525100B112A3A4D4667293B2517121812161222144A7010023059F31B266F0F0C253010
+10302A5F5665474327241F2C131211120309090B1092712C3E383B0000000001001EFFF5
+0214029200250000010723030615141633323637170E0123222635343F01062322273716
+33323F0123373337330702140D92D10E120F245754154F6C32212B3932373E201A0A1921
+485627660D67474F48020E1EFE7D1B1F0E124D601162582A273B695C32101A0C75491E84
+84000001001EFFF502B501A8002D000025170E01232226353437270623222635343F0106
+2322273716333237330306151416333236373303061514333236029E174B713524220803
+755E222B2E443944201A0A191950574B9F16120F47C7554EA0171D2261BE115D5827201B
+2001862D2B35567E2E101A0C62FED927270D13E4B1FED72A201F4F0000000001001EFFF5
+024601B9002E00002517062322270E0123222635343F0106232227371633323733030615
+14163332363726353436333215140607163332023F07151A2B2043804825363933354520
+1A0A191950574B9E141B15338037102D201D1D12192511D21B091D6C6A322F3C665C2C10
+1A0C62FED9242211176869242438553224601A1D00000001001EFFF5035401B900400000
+2517062322270E01232226353437230623222635343F0106232227371633323733030615
+141633323F013303061514163332363726353436333215140607163332034D07151A2B20
+438048253601025959253639333743201A0A191950574B9E141B156380624B9E141B1533
+8037102D201D1D12192510D21B091D6C6A322F0B0773322F3C665C2C101A0C62FED92422
+1117E5B0FED9242211176869242438553224601A1D0000010041FFF502A301B900410000
+251706232226352306232226353436333215140E02151433323E02353423220607273633
+32161533363332151406232235343E02353423220E011514163332028D16987826340257
+49272F25172A121612242B5D432C25297B4E169D7227310244445225182812151222256C
+4C181259CB11C2292C5827241C2C241013050B091559766E1830525D11BC2D27574C1A2A
+211012040B0A1688A52C141800000002001EFF25026901A80033003E0000010306071633
+32371706232227062322263534373633321737270623222635343F010623222737163332
+3733030615143332363701272623220615141633320269AB352C2C2E3B290C363F36304D
+7E2F33362A493A216303755E222B2E443746201A0A191950574B9F162147C755FEF9011D
+3739451F195D01A8FEB86743171E1A2216722B1C30201A0DB101862D2B35567E2E101A0C
+62FED9272720E4B1FE02010D28201217000000010034FFF5026901DE0046000025170E01
+2322353436342623220706232235343F0127062322270E01232227371633323726353436
+333216151407163332373E01333215140F01173633321615140615141633320252174976
+3B3C14120B413E372A167FE7011219372C18441F231A0C19173A2C1A1B1413151219342A
+222241161F78DF011F292426110B0659B21066472E10271610473F14313BBC020722191E
+101A0C2C1F2017221D15172620112E2B173227BA011021170F230A0608000002001F0000
+027B02A20007000A00002123272307230133032707027B6021F9826001C91A132597C8C8
+02A2FE70E5E50003004A000002810296000C0013001C000013333215140607161514062B
+0113333235342B01033332363534262B01EFCDC543405BA877F0B95AC87082807E606F55
+6C4F029675395F1B2159668E018A833FFDFE5A42342300010060FFF202F302A4001A0000
+0107232E02232206151416333237170623222635343E0133321602F31A1308424D2E85C1
+655E7B7B2688AA808877C9734B7B022A65374517D48D57626C3385836F77CF7A3B000002
+004A000002EF029600090014000013332015140E022B0137333236373E0135342123EFA6
+015A3E71B36CD769315E6A365061FEDC3C0296E94D977C4D4A0F1925A161B30000000001
+004A000002A60296000B000001072107210721072107211302A613FEA032013113FECF3B
+017B23FE3FA502964ACA4BED4A02960000000001004A000002A702960009000001072107
+21072103231302A70AFE9632012813FED84D57A502964ACA4BFEC902960000010061FFF2
+02F302A4002000000107232623220E011514163332363F01233533030E0223222635343E
+02333202F31913209D5E9B5368645357062859C34B2D306D4481914979A456A50235678A
+659A53577124199E4CFED61A1619877157A3784800000001004A000002ED0296000B0000
+01032313210323133303211302EDA5574BFEB04B57A557480150480296FD6A012DFED302
+96FEE1011F000001003B000002000296000B000001072303330721373313233702000A6F
+806F1BFEE0046F806F2102964AFDFE4A4A02024A000000010016FFF201D6029600110000
+01030E0123222737331E0133323E02371301D6711B645B4C2926110E2F171926190C0872
+0296FE3E6B77384C17211933242001C800000001004A000002D90296000C000001070901
+23030703231333030102D905FE86011C77F12A4357A55748017C029611FEE0FE9B012E21
+FEF30296FEE1011F00000001004A00000234029600050000250721133303023424FE3AA5
+57934A4A0296FDB400000001004B000003A50296000C00000103231301230B0123133313
+0103A5A55587FE7E15758655A57B6801570296FD6A021FFDE1021DFDE30296FE1E01E200
+00000001004AFFF202FE0296000900000103270B012313331B0102FEA941E78C57A579C6
+790296FD5C0E0234FDCC0296FE1C01E4000000020063FFF2030B02A4000D001D00000114
+0E0123222635343E0133321607342623220607061514163332363736030B7FC368748A7F
+C269748A5A5F586EA41F0C5F586EA41F0C01AE7BD07185717CD070857A555E917C312955
+5E917C3200000002004A0000027E02960009001100001333321514062B01032313333236
+35342B01EFB8D7A27C784757B05869689D53029685668EFEE3016751445000020063FF51
+030B02A4001E002E00000507222E06272E0135343E0133321615140E02071E0333133426
+23220607061514163332363736028B04272845273823271C0A5A677FC269748A416A8847
+0B27382C23675F586EA41F0C5F586EA41F0C9D120103090F1923301F1180607CCF708571
+559D714B0A1F261105020A555E917C3129555E917C320002004A0000027F0296000C0014
+0000133332151406071323032303231333323534262B01EFB9D78263AB67AD464A57B359
+CF4C5353029682587E0FFED1012BFED501758D2723000001003EFFF2025502A400240000
+0107232E012322061514171E0115140623222737331E01333236353426272E0135343633
+3202551E1309503A3351704F45A56E912F15120E61394A5C2F34524B95617C0254773C3F
+462A3B33234A326881548749464735213117254D335E7E000000000100A1000002EC0296
+00070000010723032313233702EC09F5935792F51D02964AFDB4024C4A0000010075FFF2
+02F502960016000001030E012322353437133303061514163332363736371302F56920A5
+81D10C6957660E4A42375E1D1918620296FE5D7E83A8283101A3FE6A371C343B2B241F61
+0189000100C4FFF50314029600060000090123033313010314FE3D1A735F4D01440296FD
+5F02A1FE0E01F2000000000100C2FFF504210296000D0000090123030123033313350113
+35010421FE741C43FEE41C3C5F22012D4101110296FD5F01BEFE4202A1FE240201DAFE24
+0201DA0000000001001F000003260296000B00000901132303012301033317370326FEC3
+B46991FEE5690160A26A7DF70296FEC7FEA3011BFEE5015D0139F8F80000000100BA0000
+03060296000800000901032313033313010306FEA84857479C5F7C01120296FE8AFEE001
+200176FED4012C0000000001001C000002FB0296000900000107012107213701213702FB
+06FDC701B11AFDC9060236FE781B029615FDC94A1902334A000000020037FFF601D301CF
+001D0024000013273E0133321615140F0106152337062322263534253736353426232207
+17370615143332A9291E6F413F46053F085505485A2C320140080227204C369617DA3044
+012E1F443E35300E16FA1D2F2C362725A83C210A05171B5AAA5A235B23000002004AFFF6
+021702AC000D001900000103363332161514062322271337030716333236353426232206
+01374243494650BE786730994C56341F3448843331244902A7FEF731514583C039026518
+FE82D0217E6530382F0000010043FFF601F701CF00170000010723262322061514163332
+37170623222635343633321601F739100E514079392E514A38608B4A58B86A374F017336
+4B7A65333969228E544C82B72E0000020048FFF5025802AC0012001E00000103060F0127
+37062322263534363332173F0103372623220615141633323602588A10064E080A455141
+4DB868372B3A4CC92B1B3D417E352C234C02A7FDD942311805323651497DC225EA18FDF2
+AB3F835D35363500000000020045FFF601E701CF00180020000025170E0123222635343E
+0133321615140F0121061514163332273336353423220601933938694849555B80414046
+070EFECB07392E4F90D70450284EA7234C42534B609447453C1D1C371C1A3338E8101142
+3200000100650000020E02AB00180000010F012E012322060F0133072303231323373337
+3637363332020E2611181B131F330D0E7211725F4F5F5111510B1C3832364402793B0116
+1132353847FE82017E472965302800><0003FFF9FF28023F01CF00290034003F00000107
+23161514062322270615141716171615140E022322263534363726353436372635343633
+321633073423220615141633323603230E0115143332363534023F104E0484511F1C3628
+902B3D3B5E6734434F362E1727321C89591D5A1F674731482A253140CF142E3759517501
+B443140A5376081C1B1A01050E1438314B29142C2C294B16121B1C342B212D507F1B6B3F
+492C1E2449FED70D2C1A2F2D302500000001003F000001FE02AC0017000001033E013332
+1615140703231336353423220607032313370137452C492E313806504F4B05411D59194B
+4FA44C02A7FEEE2317322F1518FEBF0130160C363228FED2029418000002004500000145
+02A70003000800000107233717032313370145175C172172536D5002A75D5DDCFE3501B8
+180000000002FF8AFF28016202A70003001200000107233717030E012322273733163332
+3713370162175D17217918644332322B1024163F19784F02A75D5DDCFE1B5D6124401C66
+01E119000001003F0000022C02AC000C000001070517232707231337170337022C03FEDC
+BF679C334FA44C085EEB01C50EB8FFCFCF02941805FE88960001003D0000013902AC0004
+000001032313370139A953A45002A7FD59029418000100410000030701D0002400001307
+3633321736333216151407032313363534232206070323133635342322060703231337FD
+0E405A581B4A54313C064E4D49063D1B5A174B4D47073B1B5B184B4D6D4701CB393D4141
+34321519FEC501251812393327FED20122200D393228FED201B818000001003F000001FE
+01D00017000013073E013332161514070323133635342322060703231337FB0C2D4C2D2F
+3A06504F4B05411D59194B4F6D4701CB3924193328181BFEBF0130160D353228FED201B8
+180000000002004CFFF6021801CF000D001B000001140E02232226353436333216073426
+23220615141633323E020218294871414F5AA973525E513B354B6F3932304E2B16012C31
+6C5D3C5E4C73BC565F343A8651353F344A4600000002000EFF28021A01D00010001C0000
+0107363332161514062322270F012713370F011633323635342623220601000B4552414D
+B967382A364C08A2491E2B17414C73322F234C01CB323653497BC224DA1805028B18A9AC
+3E8758303C35000000020048FF28022501D0000F001C0000010307273706232226353436
+3332173703372E012322061514163332360225A70A403A43514250B96742274A902B0C33
+1D417E322F235101CAFD630518EA34534A7BC12324FECEAB1E21835D303B36000001003F
+000001B701D0001100000107232E012322060F01231337170736333201B712140318082B
+58233A4F6D4C080E40502501BF460708544AEA01B8180540440000000001003DFFF601B0
+01CF002300000107232E0122061416171E0115140623222627373316333236353426272E
+01353436333201B0160F11324E2722213C2F70572D361A190F125B223A20263731684D57
+019A592C1C2B281D101D2D2144641A1D675723200F1B131B35223E6200010060FFF60178
+0244001B00000107230706151433323733070623222635343713233F01333F0133070178
+11683D062624220C1E223B292B054650043A23104D122001C547F5180F251A4B1629240F
+1601161136403F7F00010059FFF5021801C5001900000103060F0127370E012322263534
+37133303061514333236371302185110064D080E255C272F3A06504F4B05411C5D194801
+C5FEBB42311805412025332819190142FED01310353B2901240000000001008FFFF2022B
+01C50006000009012303331B01022BFEC9164F5530C201C5FE2D01D3FED5012B0001008C
+FFF2031301C5000F0000090123270723033313372E0127331B010313FEC81625B7154854
+2F81030F015430BD01C5FE2DF4F401D3FED0B0196106FEDA012600000001001E00000220
+01C5000B00000107172327072337273317370220C86C5E4F9B5EDC605E448601C5D9ECAF
+AFEFD697970000000001FFEDFF28023501C50016000009010E0123222737331633323637
+3E0137260227331B010235FED3366140301412101A1C204A22020E030E3E06563BBD01C5
+FE0F59531848184D3D04170651013821FEBD0143000100190000020501C5000900000107
+0121072137012337020505FEAA01081BFE82040156E31D01C514FE964714016A47000000
+0001002FFFF500EB01B90019000037170E01232235343F01363534262735363717030615
+14333236DD0E293C253218300916292C73056009100C24730C3F3339145AAF220B0F0801
+10031603FEAA220B0F2300000001FF84FF3100F601B9001E000013030E01232226353436
+333215140615143332363713363534262B01353637F6681F5B41232C1811270C121E291A
+4810151B1A2D7C01B6FE667972221B121A250C0F070C4E680124410F110E100316000000
+00020023000002AD029B001B001F000029013533323635342F0123070615163B01152335
+3637013313163B012F01230702ADFEE3102820020DC6540A02291DDA43290164124E0A40
+10DB19068B101D20070E718C0B0F1D101008420241FDBB46E8E3E30000030026000002AE
+028D001A0025003000001333321514070607171E0115140623213733323637133635342B
+0117071633323635342623220B01163332363534262322C6FCEC5B1C2E03344B9091FEBC
+0414342C077B024E13D53B1E17525646311758442027506E503E24028D91662D0E0C0409
+463B526F10211E01EF0A0B2A1AFC06584B342EFED4FEF509525A343800010026000002D1
+028D001B00000107233635262B01030615143B0107213733323637133635342B013702D1
+27110501719285044F2004FEAA0412352D077B044C1304028DAF2D0558FDE61206261010
+201E01F11008270F0002001E0000022C029B000300070000290101330B012303022CFDF2
+019C13202D06F1029BFDB70189FE770000010026000002DE028D002D0000010723363526
+2B010733323637330723343635342B01030615143B013236373307213733323713363534
+262B013702DE2A10020469A03C50333C0F103A1106485A42023F43736C221042FDC50413
+590F7805202B1304028D9E1A0957F82639F202300A33FEFE08021B4858C6103E01E8160E
+131010000001003C00000322028D00130000090133323E02373307210123220E02072337
+0322FDCADA2A383F2B0D102EFDBB023DCA2C37422C0E1130028DFD99081A3C2EB2026806
+1634299E000100260000039B028D00360000010723220607030615143B01072137333236
+3F0121070615143B01072137333237133635342B013721072322060F0121373635342B01
+37039B0412342E087B044E1304FEB70412332F073DFEE83D044D1404FEB604125B0F7B04
+4E1404014A0412362C0734011635044C1404028D10211EFE10120A221010201EF2F20C0C
+2610103E01F00C0C271010201FD9D9140427100000030032FFF502C8029D001600280039
+00000133061D01232E012B0122060723363D01331E013B013237140E0123222635343E03
+33321E0207342623220E0315141633323E020208101E1001181A751C1E10101E1006161C
+7630D465C174708C244861854A4263391C74454942693C270D4E3D4B743F2001A94D561B
+1F1A18214B650E22171B60B97D82673D7E745A362E4F5F0555674565826C30484D568588
+0001002600000212028D00190000010723220607030615143B0107213733323637133635
+342B013702120413352D087B034E1104FEB80413342E077B044D1204028D10201EFE0F0C
+11211010211D01F1100826100001002600000322028D00390000010722060705131E0133
+07213733323635342E022F0123070615143B01072137333237133635342B013721072322
+060F01332536352E012337032204233025FEF1BB1A392C04FEE1040B1817030407029C04
+3E034E1104FED004124410750A4C12040138040B3326083505011A1201141E04028D1018
+1DD3FEEA262910100D14060A050B03EDF30C0A2810103E01D8270A2610101F1FD1DD0E0F
+0B0A100000010023000002AE029B001B000029013733323534270323030615143B011523
+3536370133131E013B0102AEFEE1020F46012C05F50A2B1DDA43290165114E0624201110
+3D0E07017AFE6B0F0B1D101008420241FDC72E24000100260000041F028D003000000107
+23220607030615143B0107213733323637132301230323030615143B0107213733323637
+133635342B013733133301041F0411372A087F024D1304FEB60411362C077006FEA7195E
+036D054C1404FEF50413362D0977054D1304D55904014D028D101E1FFE0E071522101021
+1D01B7FDFB0205FE541612211010262301DB15112310FE1301ED00000001002600000385
+028D0024000001072322060703230123030615143B0107213733323713262B0137331333
+133635342B013703850412352F079018FEEE066C034C1304FEF604125B0F7E16461304C8
+EC0561044C1404028D10201FFDC2020EFE400C0F2310103E01FD3210FE2F018212082510
+00030034000002E5028D000F0026003500000107233635342E0223212206072337050723
+3734262B01220607233733061514163B0132363713072137331D0114163321323E013702
+E523100309171214FED5282D0B10250168340F021611B91B2B0910341003201F9132220B
+2428FDE7280D21200153221D1D0C028D980D1410120702232998CBD11A1217281BD10F0A
+18111C26FEDC9E9E0E1518110621250000020032FFF502C8029D000F0020000001140E02
+23222635343E0233321607342623220E03151416323E0302C83A669E5B708D3B679F5C76
+8374454842683D270E4F7A643F2B1201A44B987D4F82674D9D8352934F56674465826C30
+46503C5B73690000000100260000039B028D002A000001072322060703061514163B0107
+213733323637132103061514163B0107213733323713363534262B0137039B0413352C08
+7B03212C1404FEB50412362B0984FEEA850323281304FEB704125B0F7A03222A1404028D
+101F1EFE0E0B10121110101B23021AFDE60F0B160E10103E01F20C0C1312100000020026
+000002C0028D001E00290000132132161514062322272227070615143B01072137333236
+37133635342B011703163332363534262322C9010F75738F8E2C1E040838034D2004FEAB
+0411352D087D044E13D644201C4E683B4218028D604052750502DF0C0B271010201E01F1
+10092518FEEE08604C323F0000030032FFF502C8029D0011001C0025000001140E012322
+2635343E0333321E0205213635342623220E0205210615141633323602C865C174708C24
+4861854A4263391CFDFB018B06454936593D29016EFE75094E3D6785018B60B97D82673D
+7E745A362E4F5F51282455672C4F5881393B484D980000000001003A000002F8028D0016
+00000107233635342E032B01170121323637330721010302F82810031015271D18CDA1FE
+C3013B394B1B1053FDCA017AD2028D9F07161A25120A02FFFEE93439BF01470146000000
+000100190000029E028D001D00000107233635342E012B01030615143B01072137333236
+3713232206072337029E2E100523251B6285054C1504FEB70412362D07855B3E5F0E102E
+028DB32A1D1F2107FDE61603251010201E021A513DB300000001001C000002AF029C0027
+00000115220F020615143B010721373332363F01272E0123373633321E031F0133373E02
+333202AF3A44D439044D1504FEB80411352C073D4E1738370435201F301B1809094005B0
+1B1E341C1A02951051FBEB0E0C241010201EF7D03D3510050F11271719B9CF211E1D0000
+00030019000002EB028D002A0031003900000107321615140E032B01070615143B010721
+3732363723222635343E02333635342B013721072322070332363534260113220E011514
+1601FC096692304A5D5927130702491A04FEB60342320D0D717A426C7B400A4B13040141
+041052235F5C8D45FEEC5D3F6E3B4602421F5858385E3E2C141F0A052110101E315D414C
+7543221D162710107FFE8780713A4EFE8701795276383445000100190000032A028D003A
+0000010723220E010F01131E013B0107213733323635342F01070615143B01072337363F
+01272E032B0137210723220615141F01373635262B0137032A040421331C17BB600B2222
+0E04FEE7040B22210445B50C381604F9044E3ED055060917261A0904011B04131A1A063C
+A40F022B0904028D1016191BD5FEF62024101010190D0DC2C90D0F2010100A43E6E71212
+200F10100E150C10B3B81210181000000001001C000002E7029B00480000010706070607
+06070E0123070615143332370721373237363F01222E0135343635342737333216151406
+151433373635342E042223372107220E0107033236373E0237363302E704261105061213
+2B8C692B084D100504FEB80442121E0C2A32574222260412313F297C3611070F0E160D14
+03040141041D272A06444E4D1A030D0B082F67029B10082B0D1C5626594CB525061F0110
+10080E33B51844331F7A1F32041042311F721F45DA4706080C070502011010051A19FEEE
+4B510A30230F60000001002000000309029A003100002537263534373637363332171615
+1407060F0133363736371707213736373635342322070615141716170721371706151433
+011805932924376BA67E3C30544C7A078038171F121238FEE8285E3D338C6C5461171726
+18FEF12A11043E5E25309B45463B2D59493B6273574F1825060D132F05AEA6155E4F5CB5
+576573412C2B0CA6B30511132C0000000002002AFFF10258028D00030006000009012303
+0521130258FE701A8401C9FEAA57028DFD64029C5EFE500000020028FFF6021101B9001D
+002E00000107151416333237170E012322262723062322263534373E0133321615370734
+2E0223220615141633323E01373602118B1111141A0F0E31201A2602023B5E3D4407167D
+4E373B4080030C1A152E5A14221D3E240C0501ACF125283B4A073A463423575E43251D5C
+844F397B9B1F282D16AD713435484A241900000000020019FF490206029C001B003C0000
+17133E0137363332161514060715161514060706232227070607233613031633323E0135
+3423220623222635343633321633323635342623220E032F7419303C403B2A39372D3825
+1A4B75261A1C080F4F08E966161B365525150A17090D1317180321081D1F1F1E16231614
+0B6901DF675434374032396614010F57306B2160157A2521110271FE5D17657C353F080D
+090A11055C20283C121A2E2600010023FF4501CA01B9001B000009010607062322263534
+3E013736353423220723363332151406071301CAFEF60808183B11131D360C0D3A1D1B10
+273F420D01B301ACFE8D5729741913243F4D185C5A8A4A8A802586080126000000020028
+FFF501C3029C002500310000011406222E02220615141E031514070E0123222635343637
+2E0335343E0133321603342623220615141633323601C3182C14021D3E3B2E42422E121D
+7951464C8A650C2E19153A49242B42641B1B3D76271F3F640260121C141914281B1A3631
+354827422E4660523F5DA20A0C271825132D421B1EFE8F273DB1482B3BAC000000010019
+FFF501BC01B9002E000001072E0123220615141633323633321514232226232206151416
+33323637170E01232226353436372635343633321601BC0E12382E33582C220A270D262B
+032E0C2D5848352A55180D23624D565040343A7A672E500174081A154031181B09141F06
+37302A2427220A32363A2C35470D142E3F542A0000010028FF4901E0029C003A00000117
+0E011514173E013332151406070E0115143B013236333216151406232226353436333216
+3332363534232206232226353436373522263534360122042426311F7024207F4548725C
+0606170C3F3D763F181D19170B2109243D52053E0937486D5B1B2E40029C100D2914230A
+24461822490632BB5C5B012E353E69221412181E271D31094E406EB45101201B203A0000
+0001001EFF4901C701B9003000003733373E013332151407030615141723263534361336
+3534262322060F0123133635342322072736373E01333215140E01AD02392D4D293C0F4B
+17054C0B2142080F0D1F93161F4E4D0D0D16260D1E10133110290B13FB493A3B360D41FE
+C7612F190A0D211E8E01081B150D10C44B69013036050D320A2A10131C29133545000000
+00030028FFF501DA029C000E00160021000001140E0123222635343E0233321605333635
+342322061723061514333236373E0101DA528E4947422B4C78433947FEC5CE1933326CAF
+CF193A2D551C040B01D862E1A0585B44A89D6B64E0753181C2894E577D8B5B0D2B000000
+00010032FFF500E301B9001B0000130306151433323E0437170623223534133635342623
+220727E35C010D0609070A0811070D5234284F020E110E0E0301B9FE9406080B03030B08
+14070A692E1B013304080D0904100000000100320000022501B9002500003F013E013332
+15140623222623220F01171E01170723373235342F0107231335342322072737C1B72C34
+1E2F15150F1C111A1A8F7011243001EB013A0D5A394E5E200C1002A1FB8821152910161B
+1571BB1D1205101011101199DB01730914030F1B00010032FFF001FF029C001E00002533
+0623222635343E0137032301363534272623220723363332151114333201EF1026421620
+050803DA65013F02010731191C1025433726197C8C36291B3C5C27FED701AF100F230B60
+4A8A88FE816500000001001EFF49022501AC002700000103061514333237170E01232235
+34370E0123222627060706072336371333030615143332363F0102255608111E1B0F0C55
+2229214757240D1804270C06094A1A137D4F4704362590101001ACFEAE20070E30062248
+2925866B540F0A9B180D0A254D01F1FED612092DE645470000010032FFF701CE01BE000E
+000001170E01072303262B01353637133601BC120E8B74153E07251039473C8801BE0586
+ED4F01712A100215FEA2670000010019FF4901BB029C004C000001170E02151416333633
+3215140623220614173633321615140E012322270E011514163332363332161514062322
+263534363332163332363534232206232635343637263736372E01353436012504202507
+101058382E633925311F4646181F323217251F4258303D0C20053F3D773E181D19170B21
+09243D520A3709935E4C1E010336151D3C029C10092114080C1343221F283238182E100D
+181E080919653C2C22012F353E69221412181E271D3109027452842A1A2B3326051E1022
+3200000000020028FFF501B601B9000B00170000011406232226343E0133321607342623
+2206151433323E0101B6996E45423E77464053511F243D6C3B31562A011F6EBC6282845C
+4D2E2439B7666B788800000000010023FFF3023801AC002F00000107230E031514163332
+37330E012322263534373E0137230E030706232226353437363F01220E01072336330238
+1770031A141216102C1D10114E311C1D0909370E5E0C291C331D0D19141F1F3119592423
+2F1510458F01AC49084A3A4B17121E423B532B20221C1B972F2081535B160B1A1228080E
+38CE0418197E00000002001EFF4901D801B9000E001B00001713363736333215140E0123
+22270713071633323E013534262322061E5432743A285E41784525182C632E121C30542C
+1F142944B70150CA391D9B41896012BD01A5C81561823A2B284E000000010023FF4901D0
+01EA002E0000011423222623220E01151416333236333215140623222635343633321633
+3236353407220623222635343E0133321601D03014181337775623380D1E037E6F46181D
+19170B2109233E520A3A122F4669A04C203801B62B253E74433235015C4A662414121820
+2A1D310109504550A4681A0000020028FFF5022301AC000F001D00000107231E02151406
+2322263534363307230E0115141E01333236353426022314AD092B20966A47479D670E02
+396A091F1945672B01AC49192A2C205689613F7A9D49058362142A288C432C430001001E
+FFFB01D801AC0020000001072306070615141633323637330E01232235343E023F012322
+0607233E013301D8169B1B21071014132D0D101253304005060B01423327481910197442
+01AC49427B19151A17281B3C53430C1C121F04C831273A670001001EFFF501BD01B70025
+000001371615140623222635343F0136353423220607273E013332161514070615143332
+3E0135340125029693673E4C1329090F0D191E0D234A1F1816440D3F375A2A01A90E1890
+65B53A2E1B438D1D0A0E13250933360F1513DD29214761793578000000020032FF490277
+01B9001A002400003F011233321615140E012307233722263534363B01070E0115141637
+073236353426232206F7224BAA2F3A49925C28532B536BA2751905568142B43549931814
+2448138201214D4E488559ACAC594D70AE10099F623B51DBDBAE6037265300000001001E
+FF36028501B9002000000901141633323733062322353437072301353426232207233E01
+333215140F01370285FEDE12171D191022443707B9650128181C211810102E28380104BF
+01ACFEA9835C438370225BDA015D4E463F423B478A150A48E40000000001001EFF4902C7
+01B90032000001150E05070E012307233723222635343635342737363332161514061514
+16171333033E01373E073302C717261C1312080716995D2A512B0A4257203D051324292F
+1F2C276451643A5E120806100D181A242F1C01B7100314262138211E607DACAC4F561B79
+2350061002412E1C801D3742050199FE670B624E22173B172B13170900010014FFF50295
+01B900310000013732151406232226270623222E013534363B0117220615141633323637
+2635343E01333216151407141633323E0135342601D106BEA0552C39034951304119A783
+10035D8E2420294B0B03112F210E134E212529502C3701A910A178AB3227593645267BA8
+10BB7E25384425161D2950411C1352712B39667E2D45390000020028FFF501D7029C0019
+00260000132736333211140E032322263534363332173635342623221334262322061514
+3332363736C30A263CBC102A406A434543976A451B073D46218325184970433657170F02
+711417FEFC3168745B3B5C466DAF30271F4D68FEC12C2AB56B6276543700000000010028
+FFF501AE01B900210000010723262322060733072306151416333237170E012322263534
+3E0133321633323701AE130F104D385514B505B907322A4A460C2E5B394349447F4A1B2D
+0B0E0901B98469674024142E2F36440E3439564248895B141400000000020014FFF601FB
+02A6002B00360000372736333215140615143332372E0135343633321615140716170726
+2706232235343E03373635342322253423220E011514161736210D483B2C25396B3D5878
+61504E4D2F280505141D5798860307050B02080C1501564F1F290D473F1ECD096A2D1E77
+254ED4268F585169735281800D01130107D1680C171C0F2206180F0EDBA1363E1F4B8126
+7B0000000001000CFFF3024B01B9002B0000010706070615143332151407062322272635
+3437270723373637363534232227263534373633321514071725024B9C16141531331110
+1A2518163001FC6D941013141A1B0B11150E12442D01010C01AC912432361E2926140E0D
+1A17263C5E01E5881A4042221C060B19160D0A4D486D01F600030028FF49026C029C0015
+001C002300000107321615140706230723372226353437363B0136371303323635342603
+13220615141601E037566D50558D30512E556A54537A1020151461568038EF635D7A4202
+9CE4495276565CACAC58536E56547F65FEFFFE78AC593F45FE7701889E5F335800020028
+FF4501E901B90021002F000017273635342E0227263534373E0132161514062322263523
+0615141E03151413342623220615141633323E02DD0E041E27320F255229758849937935
+4202061D29291DAF1F21407D23232C4A2A17BB0707090D17111F112B4F6C7D3E57544673
+B63D2D1616222F1A1622181701E22236B7662745486662000002001EFFF5036201AC001A
+003400000107231615140E022322262706232226353437232207233E0133052106151416
+333236372635343332161514071433323E01353403621650122F4956272C390347534644
+5A324C3B1016744501C5FE8D602420294C0A04451216384629502C01AC4922313D6D472A
+302656613D7B55573F61495D99253541251E15951D1B445161627A2D2A0000000001FF73
+FF3101F802A90066000013333E0137363332171E01151406232227263534373635342322
+070E0107333237323E01331715140F010E010706070E02150E0123222635343633321514
+06151433323637133635342B010306070623222635343633321615140706151433323736
+3736372333581B2628384E371E11181D14280A070904223620191C169628290408040205
+0501020C0101061223131F5B41232C1811270C121E291A530B109B482B4A272D222C160F
+101705041425181C1E2D165801AC5C4A24331C041F13151E250A100E090504102A204756
+06010103030712040A27040515438D52047972221B121A250C0F070C4E6801552E020AFE
+C2BB4121211B121A1810070907040D2F34ACFD37000100000001000035A55AAF5F0F3CF5
+000B03E800000000C836D18900000000C836D189FC36FECF059503FF0002000800020001
+0000000000010000041FFE39000005C7FC36FE1605950064001D00000000000000000000
+0000042800FA000000000000014D000000FA0000014D002701A4009001F5000201F40020
+02F30050030A004C00D60084014D002A014D001001F4008002A3005600FAFFFB014D0031
+00FA001B0116FFBF01F4002001F4003201F4000C01F4001001F4000101F4000F01F4001E
+01F4004B01F4001E01F40017014D0032014D001A02A3005402A3005602A3005401F40084
+039800760263FFCD0263FFF8029B004202D2FFF80263FFFF0263000802D2003402D2FFF8
+014DFFF801BCFFFA029B0007022CFFF80341FFEE029BFFEC02D2003C0263000002D2003B
+0263FFF301F40011022C003B02D200660263004C034100470263FFE3022C004E022CFFFA
+018500150116FFD70185000C01A6000001F40000014D007801F5001101F4001701BC001E
+01F4000F01BC001F0116FF6D01F4000801F40013011600310116FF8401BC000E01160029
+02D2000C01F4000E01F4001B01F8FFB501F400190185002D018500100116002601F4002A
+01BC0014029B000F01BCFFE501BCFFE80185FFFE01900033011300690190FFF9021D0028
+00FA00000185003B01F4004D01F4000A01F4FFEA01F4001C0113006901F40035014D006B
+02F800290114002A01F4003502A30056014D003102F80029014D00630190006502A30056
+012C0021012C002B014D00B401F4FFE2022F003C00FA0046014DFFE2012C002B01360043
+01F4003702EE002102EE002202EE001701F4001C0263FFCD0263FFCD0263FFCD0263FFCD
+0263FFCD0263FFCD0379FFE5029B00420263FFFF0263FFFF0263FFFF0263FFFF014DFFF8
+014DFFF8014DFFF8014DFFF802D2FFF8029BFFEC02D2003C02D2003C02D2003C02D2003C
+02D2003C02A3005D02D2003C02D2006602D2006602D2006602D20066022C004E02630000
+01F4FF5801F5001101F5001101F5001101F5001101F5001101F50011029B001701BC001A
+01BC001F01BC001F01BC001F01BC001F0116002F0116002F0116002F0116002F01F4001B
+01F4000E01F4001B01F4001B01F4001B01F4001B01F4001B02A3005601F4001C01F4002A
+01F4002A01F4002A01F4002A01BCFFE801F4FFB501BCFFE80263FFCD01F500110263FFCD
+01F500110263FFCD01F50011029B004201BC001E029B004201BC001E029B004201BC001E
+029B004201BC001E02D2FFF80261000F02D2FFF801F4000F0263FFFF01BC001F0263FFFF
+01BC001F0263FFFF01BC001F0263FFFF01BC001F0263FFFF01BC001F02D2003401F40008
+02D2003401F4000802D2003401F4000802D2003401F4000802D2FFF801F4001302D2FFF8
+01F40013014DFFF80116001E014DFFF80116001D014DFFF80116002E014DFFF801160031
+014DFFF80116002F02EEFFF801F4003101BCFFFA0116FF84029B000701BC000E021E0005
+022CFFF801160029022CFFF801160007022CFFF801160029022CFFF801430029022CFFF8
+01160025029BFFEC01F4000E029BFFEC01F4000E029BFFEC01F4000E0241003A02D2FFF8
+01F4000E02D2003C01F4001B02D2003C01F4001B02D2003C01F4001B03B00031029B0014
+0263FFF30185002D0263FFF30185FFFE0263FFF30185002D01F400110185001001F40011
+0185001001F400110185001001F4001101850010022C003B0116FFDA022C003B01160026
+022C003B0116001C02D2006601F4002A02D2006601F4002A02D2006601F4002A02D20066
+01F4002A02D2006601F4002A02D2006601F4002A03410047029B000F022C004E01BCFFE8
+022C004E022CFFFA0185FFFE022CFFFA0185FFFE022CFFFA0185FFFE017F000D01F40017
+01F4001E029B004201D8FFC202A0001301F4000E0116002901EA001E01F4000E02D2003C
+0216001B01F8FFB50154001F0116FFCA0136002602F20066023D002A01F4000801F4000C
+01F4002F00AA000F0122000F0154000F014D00270116FF840263FFCD01F500110379FFE5
+029B001702D2003C01F4001C0116FF8401BC001301FF001101FF001101F4001701BC001E
+01BCFFFD01F4000F01F4000F01BC001F01BC001F027F001F01BC001F01E0001F029A001F
+01EA001E0165FF9C02CA0008025300080232003401BC000F01E0000401F4001301F40013
+01F4FFFA01160010014D003300F7FFF8011600040177000C00FC0008023F002902D2000C
+02D2000C02B2000C025EFF9201F2000E021BFFEC01F4001B02CE0031029C001E0294001E
+0192FFD3017FFFD30161FFD3014DFFEC018600180191002D0152004201DB001901DB0019
+01850009019FFF9201C5FF920153004F01B7FFC2014A00260116000601F4000902190031
+01F4003401BC0014029B000F01BC000A0279003E0195001101890011019D001501C90007
+01F4003701F400370189FFE701C2001802D3001601CC001301DF0014023A001D023C0019
+0193FFB001CF001A01D6001901E0001901F4003701F4003702E7000F02E7000F02F2000F
+01F400260205FFE002780026017A0007017A0007012C002C014000020140000001400000
+0186000601F4000F014A0010014D004F0146001E01460017014D005B014D0079014D0075
+014D00CF014D009B014DFFEC014D0064014D005D013B001700DC0029012C0010017C0004
+013E00080140000F0195000A012100A0014D00460263FFCD014D00960276000702E40004
+015E000302D2003A0244000802FAFFFA011600310263FFCD0263FFF8026300080263FFE0
+0263FFFF022CFFFA02D2FFF802D2003C014DFFF8029B00070263FFCD0341FFEE029BFFEC
+028BFFFA02D2003C02D2FFF802630000026CFFFA022C003B022C004E02E500320263FFE3
+02A3004D02FAFFFA014DFFF8022C004E0228001B01BC001E01DA000E0116003101DE0013
+0228001B01FAFFD8019A001301CC001801BC001E01C6001E01DA000E01E0001B01160031
+01BC000E01CAFFF4020EFFDF01D6001401C6001E01F4001B01F8001301F8FFD801C6001E
+01F2001B019A000C01DE0013026E001B01C9FF940248000F02AE001B0116003101DE0013
+01F4001B01DE001302AE001B01C8002D022C00130254004E0273001B0318001102D2003C
+01F4001B02A1003701BC001E022D000801E700200285001301C9001F02C400070210005D
+0215FFF00204001B02D2003C01BC001E01BC00180263000102D300460239FFDC02910043
+01F40007014DFFF9014DFFE101BCFFDE03C1FFDD03C6FFE403120046026DFFE40290006E
+02D2FFE70263FFCF024EFFE40255FFE90239FFDC028FFF990263000103BCFFC902340009
+02C4FFE702C4FFE7026DFFE402BBFFDD032EFFDF02C4FFE602C8003C02C0FFE30238FFE8
+029B0043022C00460290006E03040049023FFFBD02C2FFE7026E003603A8FFF203A8FFF2
+02B7003F0354FFE40255FFE40292000F036DFFE0027BFFCF0202001701F2002401BA001F
+0186000101E9001E01B80022031F00000178FFEE020F001D020F001D01EB001201DAFFD4
+0279FFD301F8001401E9001D01FF001301E3FFB301B9001B02E5001101A5FFC302BE001D
+01BCFFDD020F001D01E2002A0311001F0311001F0237000C02B1003201D7003201980007
+02A2001501E1FFE701B8002201DF00140186000101AC001A0185FFF70116002B0116002B
+0116FF5402A7FFD402B9001501FF001401EB001201A5FFC3020F001D02A90013021E000D
+03B9FFC902E5000002C8003C01E9001D0286004C01D00022020CFFE20151002A03410047
+029B000F03410047029B000F03410047029B000F022C004E01BCFFE8014D0031014D0031
+01F4FFF801F4FFFA0379FFFA014D00AB014D0097014D002C014D00A9022C00A6022C0097
+022C0039022C00A901F4006501F40016020B004603790039045D005005C70050014D0033
+014D003401F4000000A7FF570263000801F4000A047D000001F400100000FE3B0000FE56
+0000FED40000FE3B0000FE3B0000FE3B0000FDBA0000FD2D0000FE3B0000FC360000FE52
+0000FEA10000FDAD0000FE320000FE220000FCE70000FE3B0000FE3B0000FE3B0000FE3B
+02BE00230357002F02E2001E03E5003502DC00110201002D0381001A03B2002102430030
+02D700190416001302AF001102D3002303B0002202AF001103D4001E02F2000703B60022
+0273001E02EE00640397002B0430002602B9001E027B002802EE001E02C9001102450028
+020300280125001B0155FF9801D7002802A3005601F4002802AC000002AC000002AC0000
+02AC000002AC000002AC000002AC000002AC000002AC000002AC000002AC000002AC0000
+02AC000002AC000002AC000002AC000002AC000002AC000002AC000002AC000002AC0000
+02AC000002AC000002AC000002AC000002AC000002AC000002AC000002AC000002AC0000
+02AC000002AC000002AC000002AC000002AC000002AC000002AC000002AC000002AC0000
+02AC000002AC000002AC000002AC000002AC000002AC000002AC000002AC000002AC0000
+02AC000002AC000002AC000002AC000002AC000002AC000002AC000002AC000002AC0000
+02AC000002AC000002AC000002AC000002AC000002C4FFF502C4013D02C4013D02C4FFF5
+02C4013D02C4FFF502C4013D02C4FFF502C4FFF502C4FFF502C4FFF502C4FFF502C400E1
+02C4013D02C400E102C400E102C4FFF502C4FFF502C4FFF502C4013D02C400E102C400E1
+02C4FFF502C4FFF502C4FFF502C4013D02C400E102C400E102C4FFF502C4FFF502C4FFF5
+02C4FFF502C4FFF502C4FFF502C4FFF502C4FFF502C4FFF502C4FFF502C4FFF502C4FFF5
+020FFF6D01F4FF7301F4FF7302E8FF6D02E9FF6D02CD002302B80026029F003203160026
+02CA0026026A002602DE00320369002601E00026021C003C02FA002602C4002603ED0026
+0353002602DC003202520026030D003202E40026028A00320226001902C10041023F003C
+0394003C03160019021700230304003C01F6002801D6002D019F00280214002801BD0028
+022B002801EC0014013700320185FFF0021E002D013E002D02C6001E01F1001E01CA0028
+01E9FFE201CA00280198001E01B800320139002801DA001E01FA0048030700480226001E
+01F0001E01F3002A0357001F031D002503750024030500530322000903F1002803CA0026
+02B40052038E002602B4005202E700430390002B034A002403A4002304360023037B0024
+039E005B03A4003B0333001E0244002F0296001E034D001E02AD001B02F1002601F00053
+02DA000902D6002802430030040E003102F9003103050017030C001E024400300203003E
+0227001E02F1001E026A001E0378001E02F000410292001E02B30034029A001F025C004A
+029F006002B4004A0247004A0217004A02B700610292004A0191003B018E0016027A004A
+022F004A034B004B02A3004A02CA0063020D004A02CC0063024D004A021D003E026000A1
+02950075028E00C4039900C202BC001F027600BA027D001C01C0003701F0004A01C80043
+01EE004801BC00450150006501F0FFF901E7003F00DC004500FEFF8A01C5003F00CD003D
+02F4004101E7003F01F3004C01F2000E01F200480150003F0185003D0123006001EB0059
+01DA008F02BE008C01E2001E01E4FFED01BF00190116002F0116FF8402CD002302B80026
+026800260254001E02CA00260304003C0369002602E1003201E0002602FA002602CE0023
+03ED00260353002602C2003402DC0032036900260252002602E1003202DF003A02260019
+0237001C0304001903160019029E001C032000200273002A020C002801ED001901AC0023
+01CF002801E4001901B3002801CC001E01E40028010B003202160032021D00320243001E
+01C4003201B1001901CA0028022E002301F6001E01B700230219002801BA001E01CC001E
+029A00320253001E0295001E02A9001401D7002801AE0028022A00140231000C02850028
+01FD00280358001E01F4FF73000000000000000000000000000000000000000000000050
+0000009C00000100000001AC0000027C000003440000036C000003A8000003EC000004CC
+000004F400000528000005440000057000000590000005EC00000648000006A800000728
+0000076C000007C80000083C000008740000090800000988000009D000000A2400000A4C
+00000A7400000A9C00000B1C00000BC400000C2800000CC000000D2800000D9C00000E30
+00000EC400000F5800000FF80000104C000010A80000114C000011B000001238000012A8
+000013100000138800001430000014BC00001558000015B40000163C0000169400001728
+000017C00000183C00001890000018C8000018E40000191C00001944000019600000198C
+00001A1800001A9400001AFC00001B9C00001C0000001C8400001D4400001DCC00001E3C
+00001EBC00001F4000001F9400002050000020E400002148000021D800002258000022B8
+000023300000239C0000241C000024A000002544000025FC000026900000270400002778
+00002790000027FC0000284C0000284C0000289C0000293C000029E400002A6000002B08
+00002B3000002C1000002C5C00002CF400002D7C00002E0400002E2400002E4000002EF0
+00002F0C00002F5400002F8C00002FE80000305C00003084000031080000319C000031C8
+0000321400003264000032B40000333C000033D40000348C00003544000035C80000364C
+000036CC00003748000037E40000388800003928000039F000003A9400003B4400003BF0
+00003C9800003D6C00003DDC00003E4800003EB000003F4000003FC80000406C000040F0
+00004170000041EC000042880000432C00004360000043F40000449800004538000045D4
+0000469800004730000047B40000488000004928000049CC00004A6C00004B2C00004BF8
+00004CBC00004D7C00004E1800004E9800004F1400004F8C00005030000050A400005114
+00005180000052140000529C00005364000053E00000545C000054D40000556C0000560C
+00005664000056F80000579400005830000058C40000598400005A3400005AD000005BA4
+00005C1C00005CB800005D4400005DF400005E8000005F3000005FB000006030000060AC
+00006128000061AC00006234000062B00000632C000063B80000648000006508000065B8
+0000665C000066D0000067840000680C000068C000006944000069FC00006A8800006B30
+00006BAC00006C5800006D3000006DE800006ECC00006F80000070600000711C00007204
+000072B80000735400007410000074A800007530000075BC0000761C00007680000076F4
+0000776C000077E000007874000078E400007938000079D800007AB800007B2800007B9C
+00007C6800007D1400007DEC00007E6C00007ED800007F6400007FE00000806C000080E8
+00008168000081DC00008254000082BC00008348000083F80000849400008550000085D8
+0000868400008740000087DC00008874000088EC0000895C000089E400008A6800008B08
+00008BA400008C6C00008D3400008DDC00008E5800008F0C00008F9400009038000090B0
+00009164000091F4000092A40000933000009404000094B400009564000095F000009684
+0000972C0000979C0000982C0000989C00009918000099D400009A8800009B2000009BB0
+00009C5800009CFC00009DBC00009E7400009F3400009FEC0000A09C0000A1400000A1EC
+0000A2A40000A3340000A3E00000A49C0000A5080000A5980000A6080000A69C0000A704
+0000A7900000A7FC0000A8900000A9200000A9C00000AA540000AB080000AB940000ABFC
+0000AC5C0000ACCC0000AD640000ADFC0000AE9C0000AF200000AFBC0000B03C0000B0EC
+0000B1940000B2280000B29C0000B3080000B3280000B3540000B39C0000B3EC0000B460
+0000B5200000B6000000B6E40000B7BC0000B8640000B90C0000B96C0000BA100000BA8C
+0000BB040000BB8C0000BBF40000BC940000BD400000BDE40000BE500000BEB40000BF5C
+0000BFE00000C0640000C1200000C1A00000C2140000C2B80000C3480000C3D80000C488
+0000C5400000C5CC0000C6640000C6FC0000C7800000C7D80000C82C0000C8B80000C95C
+0000C9B40000CA6C0000CB2C0000CBD80000CC980000CD580000CDEC0000CE600000CED0
+0000CF800000D0140000D0C00000D1240000D1A00000D21C0000D2800000D3080000D344
+0000D3880000D4040000D4800000D5200000D57C0000D5EC0000D6540000D6EC0000D754
+0000D7C40000D8640000D8D80000D9540000D9D80000DA7C0000DB100000DB840000DBF4
+0000DC680000DCE40000DD800000DDF00000DE680000DEE40000DF600000DFD80000E05C
+0000E0D80000E1740000E2100000E2B40000E3340000E3940000E43C0000E4C00000E54C
+0000E6140000E7100000E8080000E8D80000E98C0000EA6C0000EAF80000EBA00000EC1C
+0000EC800000ECE40000ED600000EDDC0000EE740000EF040000EF500000EFA80000F004
+0000F0280000F04C0000F07C0000F0AC0000F0F40000F12C0000F1700000F1B80000F254
+0000F2A80000F3200000F3D00000F43C0000F4600000F4880000F4B40000F51C0000F5A0
+0000F5CC0000F67C0000F7380000F7A80000F82C0000F8D00000F97C0000FA280000FA8C
+0000FB240000FB880000FBB40000FC480000FC9C0000FD3C0000FDD80000FE2C0000FED0
+0000FF280000FFB000010020000100C000010128000101A40001021C00010270000102CC
+00010354000103F80001049000010544000105D00001066000010728000107C000010868
+000109140001098400010A4C00010AC800010B7000010BD800010C6C00010CF800010D98
+00010E2800010E9800010EE800010F6000010FC80001104C0001109C00011164000111C8
+00011248000112B80001133C00011398000113E800011458000114E000011560000115E4
+0001169C0001172C000117D800011858000118E4000119B800011A5C00011B0000011B94
+00011C2400011CD000011D5800011DC400011E4C00011ED000011F3C00011F6800011FE8
+0001201800012090000120EC00012168000121F400012268000122D00001233800012404
+000124B000012520000125AC000126480001269C0001272C0001278800012838000128F4
+0001299800012A8400012B4800012BEC00012C5000012CD000012D6000012DB800012E48
+00012ED800012FF40001309C0001313C00013220000132F00001338C00013414000134B4
+0001351C000135A80001362000013688000136E000013760000138000001389800013934
+000139CC00013A8C00013B5C00013BD000013C7C00013CE800013D6800013E1400013EA4
+00013F3400013FD400014054000140BC000141280001418C00014260000142F40001437C
+0001443C000144E00001458C0001461800014688000146EC0001477C000148040001486C
+0001492C000149BC00014AA000014B5000014C0400014C7C00014D3C00014E2800014EB0
+00014F5800014FC800015040000150CC0001517C00015220000152CC0001534C000153BC
+00015434000154A40001553C000155B80001567C00015718000157B40001587400015940
+00015A0400015AA000015B4000015BE800015C8C00015D2800015DB800015E2000015E90
+00015EEC00015F4C00015FFC000160BC0001616800016224000162F4000163D40001646C
+0001651C0001653800016554000165700001658C000165A8000165E00001661400016648
+00016684000166E0000167400001679C00016804000168A4000169C0000169EC00016A54
+00016B6C00016CC800016D1800016D6400016D8000016DA000016E2800016EE400017038
+000170C0000170E8000171100001712800017168000171A8000172040001727C000172CC
+0001732C00017358000173740001739C000173BC000174180001743C0001749C000174C4
+000174EC0001752C00017568000175DC0001769C0001776C00017884000178D800017968
+00017A2400017B0C00017B8800017BD800017CBC00017D2800017DE400017EEC00017F78
+00018024000180680001818C00018208000182E4000183DC000184D400018560000185F8
+00018640000186A40001872C000187B0000187F400018858000188CC000188E80001890C
+0001899C00018A3000018ADC00018B5000018BE400018C8400018CF000018DB400018E50
+00018EEC00018FA400019034000190D00001918C00019244000192FC000193C400019448
+000194E4000195AC00019640000196F8000197A00001982C000198D40001999000019A48
+00019B1C00019BAC00019C5C00019CEC00019DAC00019E7000019F1000019F940001A050
+0001A1000001A1900001A2540001A2EC0001A3A40001A48C0001A5480001A5F40001A6A0
+0001A7540001A7E00001A8CC0001A9840001AA040001AAC00001AB740001AC080001ACB0
+0001AD540001AE040001AEA80001AF740001B0500001B1140001B1BC0001B24C0001B268
+0001B2840001B2A80001B2C80001B2EC0001B30C0001B3340001B35C0001B3840001B3AC
+0001B3E00001B4080001B4300001B45C0001B4880001B4BC0001B4E80001B5140001B548
+0001B5740001B5A00001B5D40001B6000001B62C0001B6600001B6900001B6C40001B708
+0001B7380001B7680001B7A80001B7DC0001B80C0001B84C0001B8800001B8B00001B8F4
+0001B9380001B97C0001B9D80001BAC80001BBBC0001BCA00001BE040001BF540001BFB8
+0001C0480001C0B40001C1200001C1A40001C2200001C2B80001C3580001C3AC0001C40C
+0001C4B80001C51C0001C5B40001C6280001C68C0001C7080001C7A40001C8380001C8D4
+0001C9340001C9C40001CA1C0001CAA80001CB540001CBD00001CC180001CC9C0001CD10
+0001CD6C0001CE040001CE6C0001CF080001CFC00001D0340001D0AC0001D1440001D19C
+0001D24C0001D2EC0001D33C0001D3CC0001D4540001D4B80001D5300001D5900001D62C
+0001D6A00001D7440001D7E80001D87C0001D8F40001D9D40001DA980001DB740001DC50
+0001DD180001DE500001DF000001DF840001E0640001E1200001E1B80001E2680001E31C
+0001E3E40001E4F80001E5D00001E6C00001E7DC0001E8800001E9280001E9A80001EA50
+0001EAD00001EB7C0001EBF80001ECA40001ED6C0001EDE80001EE940001EF180001EFA8
+0001F04C0001F0B40001F1340001F1A80001F2300001F2B80001F36C0001F4180001F4D0
+0001F5900001F5C00001F6180001F66C0001F6B40001F6EC0001F71C0001F7800001F7B8
+0001F7EC0001F8300001F8700001F8940001F8D40001F9080001F9680001F9A40001FA2C
+0001FA740001FAE40001FB0C0001FB5C0001FB880001FBCC0001FC080001FC3C0001FC70
+0001FCE00001FD380001FD840001FDEC0001FE500001FEA40001FF580001FFAC0001FFDC
+000200240002005C0002007C000200F0000201440002019C000201FC0002025C000202A0
+0002030C00020364000203C0000203E80002042C00020460000204B4000204E80002053C
+0002059C0002060000020690000206E80002071400020798000207E00002088000020920
+0002097400020A2000020A7800020B1000020B8400020C2400020C8800020D0C00020D88
+00020E0000020E5400020EB400020F2C00020FD40002108000021150000211E800021214
+000212A00002134C000213A800021438000214BC0002155C000215EC00021658000216B0
+0002172000021780000217FC000218380002190800021958000219E400021A4000021AC0
+00021B1C00021B8000021BF000021C6000021CC800021D5800021DE400021E5800021EC0
+00021F5C00021FDC00022050000220D80002217000022284000100000428008600080000
+000000020000000100010000004000000000000000>]def
+/CharStrings 2 dict dup begin
+/.notdef 0 def
+/m 80 def
+end readonly def
+
+systemdict/resourcestatus known
+ {42 /FontType resourcestatus
+   {pop pop false}{true}ifelse}
+ {true}ifelse
+{/TrueDict where{pop}{(%%[ Error: no TrueType rasterizer ]%%)= flush}ifelse
+/FontType 3 def
+ /TrueState 271 string def
+ TrueDict begin sfnts save
+ 72 0 matrix defaultmatrix dtransform dup
+ mul exch dup mul add sqrt cvi 0 72 matrix
+ defaultmatrix dtransform dup mul exch dup
+ mul add sqrt cvi 3 -1 roll restore
+ TrueState initer end
+ /BuildGlyph{exch begin
+  CharStrings dup 2 index known
+    {exch}{exch pop /.notdef}ifelse
+  get dup xcheck
+    {currentdict systemdict begin begin exec end end}
+    {TrueDict begin /bander load cvlit exch TrueState render end}
+    ifelse
+ end}bind def
+ /BuildChar{
+  1 index /Encoding get exch get
+  1 index /BuildGlyph get exec
+ }bind def
+}if
+
+FontName currentdict end definefont pop
+end
+%%EndProlog
+mpldict begin
+75.6 223.2 translate
+460.8 345.6 0 0 clipbox
+gsave
+0 0 m
+460.8 0 l
+460.8 345.6 l
+0 345.6 l
+cl
+1.000 setgray
+fill
+grestore
+0.000 setgray
+gsave
+230.400000 172.800000 translate
+0.000000 rotate
+/DejaVuSans 10.0 selectfont
+0.000000 0.703125 moveto
+/M glyphshow
+8.627930 0.703125 moveto
+/a glyphshow
+14.755859 0.703125 moveto
+/s glyphshow
+19.965820 0.703125 moveto
+/s glyphshow
+25.175781 0.703125 moveto
+/space glyphshow
+/STIXGeneral-Italic 10.0 selectfont
+28.354492 0.703125 moveto
+/m glyphshow
+grestore
+
+end
+showpage
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_svg/bold_font_output_with_none_fonttype.svg b/lib/matplotlib/tests/baseline_images/test_backend_svg/bold_font_output_with_none_fonttype.svg
index 20526ec9476e..af3d2e7a8f3c 100644
--- a/lib/matplotlib/tests/baseline_images/test_backend_svg/bold_font_output_with_none_fonttype.svg
+++ b/lib/matplotlib/tests/baseline_images/test_backend_svg/bold_font_output_with_none_fonttype.svg
@@ -10,61 +10,61 @@
  </defs>
  <g id="figure_1">
   <g id="patch_1">
-   <path d="M 0 432 
-L 576 432 
-L 576 0 
-L 0 0 
+   <path d="M 0 432
+L 576 432
+L 576 0
+L 0 0
 z
 " style="fill:#ffffff;"/>
   </g>
   <g id="axes_1">
    <g id="patch_2">
-    <path d="M 72 388.8 
-L 518.4 388.8 
-L 518.4 43.2 
-L 72 43.2 
+    <path d="M 72 388.8
+L 518.4 388.8
+L 518.4 43.2
+L 72 43.2
 z
 " style="fill:#ffffff;"/>
    </g>
    <g id="line2d_1">
-    <path clip-path="url(#pce7a3954ac)" d="M 72 388.8 
-L 121.6 350.4 
-L 171.2 312 
-L 220.8 273.6 
-L 270.4 235.2 
-L 320 196.8 
-L 369.6 158.4 
-L 419.2 120 
-L 468.8 81.6 
-L 518.4 43.2 
+    <path clip-path="url(#pce7a3954ac)" d="M 72 388.8
+L 121.6 350.4
+L 171.2 312
+L 220.8 273.6
+L 270.4 235.2
+L 320 196.8
+L 369.6 158.4
+L 419.2 120
+L 468.8 81.6
+L 518.4 43.2
 " style="fill:none;stroke:#0000ff;stroke-linecap:square;"/>
    </g>
    <g id="patch_3">
-    <path d="M 72 388.8 
-L 72 43.2 
+    <path d="M 72 388.8
+L 72 43.2
 " style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
    </g>
    <g id="patch_4">
-    <path d="M 518.4 388.8 
-L 518.4 43.2 
+    <path d="M 518.4 388.8
+L 518.4 43.2
 " style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
    </g>
    <g id="patch_5">
-    <path d="M 72 388.8 
-L 518.4 388.8 
+    <path d="M 72 388.8
+L 518.4 388.8
 " style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
    </g>
    <g id="patch_6">
-    <path d="M 72 43.2 
-L 518.4 43.2 
+    <path d="M 72 43.2
+L 518.4 43.2
 " style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
    </g>
    <g id="matplotlib.axis_1">
     <g id="xtick_1">
      <g id="line2d_2">
       <defs>
-       <path d="M 0 0 
-L 0 -4 
+       <path d="M 0 0
+L 0 -4
 " id="md5e7837e7e" style="stroke:#000000;stroke-width:0.5;"/>
       </defs>
       <g>
@@ -73,8 +73,8 @@ L 0 -4
      </g>
      <g id="line2d_3">
       <defs>
-       <path d="M 0 0 
-L 0 4 
+       <path d="M 0 0
+L 0 4
 " id="m5bbd032ef7" style="stroke:#000000;stroke-width:0.5;"/>
       </defs>
       <g>
@@ -82,7 +82,7 @@ L 0 4
       </g>
      </g>
      <g id="text_1">
-      <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 72, 401.918125)" x="72" y="401.918125">0</text>
+      <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 72, 401.918125)" x="72" y="401.918125">0</text>
      </g>
     </g>
     <g id="xtick_2">
@@ -97,7 +97,7 @@ L 0 4
       </g>
      </g>
      <g id="text_2">
-      <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 121.6, 401.918125)" x="121.6" y="401.918125">1</text>
+      <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 121.6, 401.918125)" x="121.6" y="401.918125">1</text>
      </g>
     </g>
     <g id="xtick_3">
@@ -112,7 +112,7 @@ L 0 4
       </g>
      </g>
      <g id="text_3">
-      <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 171.2, 401.918125)" x="171.2" y="401.918125">2</text>
+      <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 171.2, 401.918125)" x="171.2" y="401.918125">2</text>
      </g>
     </g>
     <g id="xtick_4">
@@ -127,7 +127,7 @@ L 0 4
       </g>
      </g>
      <g id="text_4">
-      <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 220.8, 401.918125)" x="220.8" y="401.918125">3</text>
+      <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 220.8, 401.918125)" x="220.8" y="401.918125">3</text>
      </g>
     </g>
     <g id="xtick_5">
@@ -142,7 +142,7 @@ L 0 4
       </g>
      </g>
      <g id="text_5">
-      <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 270.4, 401.918125)" x="270.4" y="401.918125">4</text>
+      <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 270.4, 401.918125)" x="270.4" y="401.918125">4</text>
      </g>
     </g>
     <g id="xtick_6">
@@ -157,7 +157,7 @@ L 0 4
       </g>
      </g>
      <g id="text_6">
-      <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 320, 401.918125)" x="320" y="401.918125">5</text>
+      <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 320, 401.918125)" x="320" y="401.918125">5</text>
      </g>
     </g>
     <g id="xtick_7">
@@ -172,7 +172,7 @@ L 0 4
       </g>
      </g>
      <g id="text_7">
-      <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 369.6, 401.918125)" x="369.6" y="401.918125">6</text>
+      <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 369.6, 401.918125)" x="369.6" y="401.918125">6</text>
      </g>
     </g>
     <g id="xtick_8">
@@ -187,7 +187,7 @@ L 0 4
       </g>
      </g>
      <g id="text_8">
-      <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 419.2, 401.918125)" x="419.2" y="401.918125">7</text>
+      <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 419.2, 401.918125)" x="419.2" y="401.918125">7</text>
      </g>
     </g>
     <g id="xtick_9">
@@ -202,7 +202,7 @@ L 0 4
       </g>
      </g>
      <g id="text_9">
-      <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 468.8, 401.918125)" x="468.8" y="401.918125">8</text>
+      <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 468.8, 401.918125)" x="468.8" y="401.918125">8</text>
      </g>
     </g>
     <g id="xtick_10">
@@ -217,19 +217,19 @@ L 0 4
       </g>
      </g>
      <g id="text_10">
-      <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 518.4, 401.918125)" x="518.4" y="401.918125">9</text>
+      <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 518.4, 401.918125)" x="518.4" y="401.918125">9</text>
      </g>
     </g>
     <g id="text_11">
-     <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 295.2, 418.531875)" x="295.2" y="418.531875">nonbold-xlabel</text>
+     <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:middle;" transform="rotate(-0, 295.2, 418.531875)" x="295.2" y="418.531875">nonbold-xlabel</text>
     </g>
    </g>
    <g id="matplotlib.axis_2">
     <g id="ytick_1">
      <g id="line2d_22">
       <defs>
-       <path d="M 0 0 
-L 4 0 
+       <path d="M 0 0
+L 4 0
 " id="m4e6950a5ab" style="stroke:#000000;stroke-width:0.5;"/>
       </defs>
       <g>
@@ -238,8 +238,8 @@ L 4 0
      </g>
      <g id="line2d_23">
       <defs>
-       <path d="M 0 0 
-L -4 0 
+       <path d="M 0 0
+L -4 0
 " id="m7c8df72a26" style="stroke:#000000;stroke-width:0.5;"/>
       </defs>
       <g>
@@ -247,7 +247,7 @@ L -4 0
       </g>
      </g>
      <g id="text_12">
-      <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:end;" transform="rotate(-0, 68, 393.359062)" x="68" y="393.359062">0</text>
+      <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:end;" transform="rotate(-0, 68, 393.359062)" x="68" y="393.359062">0</text>
      </g>
     </g>
     <g id="ytick_2">
@@ -262,7 +262,7 @@ L -4 0
       </g>
      </g>
      <g id="text_13">
-      <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:end;" transform="rotate(-0, 68, 354.959063)" x="68" y="354.959063">1</text>
+      <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:end;" transform="rotate(-0, 68, 354.959063)" x="68" y="354.959063">1</text>
      </g>
     </g>
     <g id="ytick_3">
@@ -277,7 +277,7 @@ L -4 0
       </g>
      </g>
      <g id="text_14">
-      <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:end;" transform="rotate(-0, 68, 316.559062)" x="68" y="316.559062">2</text>
+      <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:end;" transform="rotate(-0, 68, 316.559062)" x="68" y="316.559062">2</text>
      </g>
     </g>
     <g id="ytick_4">
@@ -292,7 +292,7 @@ L -4 0
       </g>
      </g>
      <g id="text_15">
-      <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:end;" transform="rotate(-0, 68, 278.159063)" x="68" y="278.159063">3</text>
+      <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:end;" transform="rotate(-0, 68, 278.159063)" x="68" y="278.159063">3</text>
      </g>
     </g>
     <g id="ytick_5">
@@ -307,7 +307,7 @@ L -4 0
       </g>
      </g>
      <g id="text_16">
-      <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:end;" transform="rotate(-0, 68, 239.759063)" x="68" y="239.759063">4</text>
+      <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:end;" transform="rotate(-0, 68, 239.759063)" x="68" y="239.759063">4</text>
      </g>
     </g>
     <g id="ytick_6">
@@ -322,7 +322,7 @@ L -4 0
       </g>
      </g>
      <g id="text_17">
-      <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:end;" transform="rotate(-0, 68, 201.359063)" x="68" y="201.359063">5</text>
+      <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:end;" transform="rotate(-0, 68, 201.359063)" x="68" y="201.359063">5</text>
      </g>
     </g>
     <g id="ytick_7">
@@ -337,7 +337,7 @@ L -4 0
       </g>
      </g>
      <g id="text_18">
-      <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:end;" transform="rotate(-0, 68, 162.959063)" x="68" y="162.959063">6</text>
+      <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:end;" transform="rotate(-0, 68, 162.959063)" x="68" y="162.959063">6</text>
      </g>
     </g>
     <g id="ytick_8">
@@ -352,7 +352,7 @@ L -4 0
       </g>
      </g>
      <g id="text_19">
-      <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:end;" transform="rotate(-0, 68, 124.559062)" x="68" y="124.559062">7</text>
+      <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:end;" transform="rotate(-0, 68, 124.559062)" x="68" y="124.559062">7</text>
      </g>
     </g>
     <g id="ytick_9">
@@ -367,7 +367,7 @@ L -4 0
       </g>
      </g>
      <g id="text_20">
-      <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:end;" transform="rotate(-0, 68, 86.159063)" x="68" y="86.159063">8</text>
+      <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:end;" transform="rotate(-0, 68, 86.159063)" x="68" y="86.159063">8</text>
      </g>
     </g>
     <g id="ytick_10">
@@ -382,15 +382,15 @@ L -4 0
       </g>
      </g>
      <g id="text_21">
-      <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:400;text-anchor:end;" transform="rotate(-0, 68, 47.759063)" x="68" y="47.759063">9</text>
+      <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:400;text-anchor:end;" transform="rotate(-0, 68, 47.759063)" x="68" y="47.759063">9</text>
      </g>
     </g>
     <g id="text_22">
-     <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:700;text-anchor:middle;" transform="rotate(-90, 52.775625, 216)" x="52.775625" y="216">bold-ylabel</text>
+     <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:700;text-anchor:middle;" transform="rotate(-90, 52.775625, 216)" x="52.775625" y="216">bold-ylabel</text>
     </g>
    </g>
    <g id="text_23">
-    <text style="font-family:DejaVu Sans;font-size:14.4px;font-style:normal;font-weight:700;text-anchor:middle;" transform="rotate(-0, 295.2, 38.2)" x="295.2" y="38.2">bold-title</text>
+    <text style="font-family:'DejaVu Sans';font-size:14.4px;font-style:normal;font-weight:700;text-anchor:middle;" transform="rotate(-0, 295.2, 38.2)" x="295.2" y="38.2">bold-title</text>
    </g>
   </g>
  </g>
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_svg/multi_font_aspath.svg b/lib/matplotlib/tests/baseline_images/test_backend_svg/multi_font_aspath.svg
new file mode 100644
index 000000000000..7184700caf17
--- /dev/null
+++ b/lib/matplotlib/tests/baseline_images/test_backend_svg/multi_font_aspath.svg
@@ -0,0 +1,423 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" width="576pt" height="432pt" viewBox="0 0 576 432" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <metadata>
+  <rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+   <cc:Work>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:date>2022-08-09T18:12:28.920123</dc:date>
+    <dc:format>image/svg+xml</dc:format>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Matplotlib v3.6.0.dev2839+gb0bf8fb1de.d20220809, https://matplotlib.org/</dc:title>
+     </cc:Agent>
+    </dc:creator>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <defs>
+  <style type="text/css">*{stroke-linejoin: round; stroke-linecap: butt}</style>
+ </defs>
+ <g id="figure_1">
+  <g id="patch_1">
+   <path d="M 0 432 
+L 576 432 
+L 576 0 
+L 0 0 
+z
+" style="fill: #ffffff"/>
+  </g>
+  <g id="text_1">
+   <!-- There are 几个汉字 in between! -->
+   <g transform="translate(86.4 226.8) scale(0.27 -0.27)">
+    <defs>
+     <path id="DejaVuSans-54" d="M -19 4666 
+L 3928 4666 
+L 3928 4134 
+L 2272 4134 
+L 2272 0 
+L 1638 0 
+L 1638 4134 
+L -19 4134 
+L -19 4666 
+z
+" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-68" d="M 3513 2113 
+L 3513 0 
+L 2938 0 
+L 2938 2094 
+Q 2938 2591 2744 2837 
+Q 2550 3084 2163 3084 
+Q 1697 3084 1428 2787 
+Q 1159 2491 1159 1978 
+L 1159 0 
+L 581 0 
+L 581 4863 
+L 1159 4863 
+L 1159 2956 
+Q 1366 3272 1645 3428 
+Q 1925 3584 2291 3584 
+Q 2894 3584 3203 3211 
+Q 3513 2838 3513 2113 
+z
+" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-65" d="M 3597 1894 
+L 3597 1613 
+L 953 1613 
+Q 991 1019 1311 708 
+Q 1631 397 2203 397 
+Q 2534 397 2845 478 
+Q 3156 559 3463 722 
+L 3463 178 
+Q 3153 47 2828 -22 
+Q 2503 -91 2169 -91 
+Q 1331 -91 842 396 
+Q 353 884 353 1716 
+Q 353 2575 817 3079 
+Q 1281 3584 2069 3584 
+Q 2775 3584 3186 3129 
+Q 3597 2675 3597 1894 
+z
+M 3022 2063 
+Q 3016 2534 2758 2815 
+Q 2500 3097 2075 3097 
+Q 1594 3097 1305 2825 
+Q 1016 2553 972 2059 
+L 3022 2063 
+z
+" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-72" d="M 2631 2963 
+Q 2534 3019 2420 3045 
+Q 2306 3072 2169 3072 
+Q 1681 3072 1420 2755 
+Q 1159 2438 1159 1844 
+L 1159 0 
+L 581 0 
+L 581 3500 
+L 1159 3500 
+L 1159 2956 
+Q 1341 3275 1631 3429 
+Q 1922 3584 2338 3584 
+Q 2397 3584 2469 3576 
+Q 2541 3569 2628 3553 
+L 2631 2963 
+z
+" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-20" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-61" d="M 2194 1759 
+Q 1497 1759 1228 1600 
+Q 959 1441 959 1056 
+Q 959 750 1161 570 
+Q 1363 391 1709 391 
+Q 2188 391 2477 730 
+Q 2766 1069 2766 1631 
+L 2766 1759 
+L 2194 1759 
+z
+M 3341 1997 
+L 3341 0 
+L 2766 0 
+L 2766 531 
+Q 2569 213 2275 61 
+Q 1981 -91 1556 -91 
+Q 1019 -91 701 211 
+Q 384 513 384 1019 
+Q 384 1609 779 1909 
+Q 1175 2209 1959 2209 
+L 2766 2209 
+L 2766 2266 
+Q 2766 2663 2505 2880 
+Q 2244 3097 1772 3097 
+Q 1472 3097 1187 3025 
+Q 903 2953 641 2809 
+L 641 3341 
+Q 956 3463 1253 3523 
+Q 1550 3584 1831 3584 
+Q 2591 3584 2966 3190 
+Q 3341 2797 3341 1997 
+z
+" transform="scale(0.015625)"/>
+     <path id="WenQuanYiZenHei-51e0" d="M 5844 1606 
+Q 5956 1375 6275 1356 
+L 6088 -163 
+Q 6075 -294 6000 -375 
+Q 5956 -406 5894 -406 
+L 4556 -406 
+Q 4256 -406 4059 -215 
+Q 3863 -25 3847 272 
+Q 3831 569 3831 2484 
+Q 3831 4400 3850 4675 
+L 2456 4675 
+L 2463 2469 
+Q 2438 1169 1888 363 
+Q 1400 -375 650 -788 
+Q 513 -506 213 -425 
+Q 1013 -106 1500 647 
+Q 1988 1400 1988 2469 
+L 1981 5113 
+L 4325 5113 
+L 4325 344 
+Q 4325 219 4390 128 
+Q 4456 38 4563 38 
+L 5538 38 
+Q 5650 44 5675 144 
+Q 5700 325 5706 506 
+L 5844 1606 
+z
+" transform="scale(0.015625)"/>
+     <path id="WenQuanYiZenHei-4e2a" d="M 3419 -769 
+Q 3163 -744 2900 -769 
+Q 2925 -288 2925 188 
+L 2925 2263 
+Q 2925 2744 2900 3225 
+Q 3163 3200 3419 3225 
+Q 3400 2744 3400 2263 
+L 3400 188 
+Q 3400 -288 3419 -769 
+z
+M 6125 2669 
+Q 5894 2506 5819 2238 
+Q 5019 2481 4347 3087 
+Q 3675 3694 3213 4444 
+Q 1988 2650 444 1781 
+Q 331 2056 88 2213 
+Q 1019 2694 1784 3441 
+Q 2550 4188 3025 5206 
+Q 3169 5106 3319 5031 
+L 3356 5050 
+L 3388 5000 
+Q 3456 4963 3525 4931 
+L 3469 4844 
+Q 4019 3875 4744 3319 
+Q 5356 2881 6125 2669 
+z
+" transform="scale(0.015625)"/>
+     <path id="WenQuanYiZenHei-6c49" d="M 3825 1319 
+Q 3113 2613 2925 4369 
+Q 2725 4369 2531 4356 
+Q 2550 4563 2531 4769 
+Q 2906 4750 3288 4750 
+L 5444 4750 
+Q 5256 2631 4350 1263 
+Q 5038 225 6188 -406 
+Q 5931 -506 5800 -744 
+Q 4775 -156 4081 894 
+Q 3219 -194 1919 -700 
+Q 1750 -481 1519 -331 
+Q 2919 150 3825 1319 
+z
+M 3344 4375 
+Q 3506 2819 4094 1694 
+Q 4844 2863 4975 4375 
+L 3344 4375 
+z
+M 944 -738 
+Q 681 -588 294 -575 
+Q 569 -69 862 581 
+Q 1156 1231 1713 2838 
+L 1969 2706 
+L 1244 338 
+L 944 -738 
+z
+M 1438 2856 
+L 1038 2550 
+L 106 3400 
+L 500 3713 
+L 1438 2856 
+z
+M 1550 3913 
+Q 1119 4388 606 4800 
+L 981 5125 
+Q 1519 4688 1981 4188 
+L 1550 3913 
+z
+" transform="scale(0.015625)"/>
+     <path id="WenQuanYiZenHei-5b57" d="M 6138 1781 
+Q 6119 1588 6138 1388 
+Q 5775 1406 5406 1406 
+L 3469 1406 
+L 3469 -181 
+Q 3469 -419 3281 -594 
+Q 3013 -825 2300 -819 
+Q 2375 -506 2150 -269 
+Q 2356 -294 2637 -297 
+Q 2919 -300 2969 -262 
+Q 3019 -225 3019 -56 
+L 3019 1406 
+L 925 1406 
+Q 563 1406 200 1388 
+Q 219 1588 200 1781 
+Q 563 1763 925 1763 
+L 3019 1763 
+L 3019 2219 
+L 4050 3163 
+L 1981 3163 
+Q 1619 3163 1250 3144 
+Q 1275 3344 1250 3538 
+Q 1619 3519 1981 3519 
+L 4756 3519 
+L 4806 3113 
+Q 4613 3063 4463 2931 
+L 3469 2019 
+L 3469 1763 
+L 5406 1763 
+Q 5775 1763 6138 1781 
+z
+M 819 3513 
+L 369 3513 
+L 369 4706 
+L 2925 4700 
+L 2438 5044 
+L 2719 5450 
+L 3388 4988 
+L 3188 4700 
+L 5781 4700 
+L 5781 3513 
+L 5325 3513 
+L 5325 4344 
+L 819 4344 
+L 819 3513 
+z
+" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-69" d="M 603 3500 
+L 1178 3500 
+L 1178 0 
+L 603 0 
+L 603 3500 
+z
+M 603 4863 
+L 1178 4863 
+L 1178 4134 
+L 603 4134 
+L 603 4863 
+z
+" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-6e" d="M 3513 2113 
+L 3513 0 
+L 2938 0 
+L 2938 2094 
+Q 2938 2591 2744 2837 
+Q 2550 3084 2163 3084 
+Q 1697 3084 1428 2787 
+Q 1159 2491 1159 1978 
+L 1159 0 
+L 581 0 
+L 581 3500 
+L 1159 3500 
+L 1159 2956 
+Q 1366 3272 1645 3428 
+Q 1925 3584 2291 3584 
+Q 2894 3584 3203 3211 
+Q 3513 2838 3513 2113 
+z
+" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-62" d="M 3116 1747 
+Q 3116 2381 2855 2742 
+Q 2594 3103 2138 3103 
+Q 1681 3103 1420 2742 
+Q 1159 2381 1159 1747 
+Q 1159 1113 1420 752 
+Q 1681 391 2138 391 
+Q 2594 391 2855 752 
+Q 3116 1113 3116 1747 
+z
+M 1159 2969 
+Q 1341 3281 1617 3432 
+Q 1894 3584 2278 3584 
+Q 2916 3584 3314 3078 
+Q 3713 2572 3713 1747 
+Q 3713 922 3314 415 
+Q 2916 -91 2278 -91 
+Q 1894 -91 1617 61 
+Q 1341 213 1159 525 
+L 1159 0 
+L 581 0 
+L 581 4863 
+L 1159 4863 
+L 1159 2969 
+z
+" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-74" d="M 1172 4494 
+L 1172 3500 
+L 2356 3500 
+L 2356 3053 
+L 1172 3053 
+L 1172 1153 
+Q 1172 725 1289 603 
+Q 1406 481 1766 481 
+L 2356 481 
+L 2356 0 
+L 1766 0 
+Q 1100 0 847 248 
+Q 594 497 594 1153 
+L 594 3053 
+L 172 3053 
+L 172 3500 
+L 594 3500 
+L 594 4494 
+L 1172 4494 
+z
+" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-77" d="M 269 3500 
+L 844 3500 
+L 1563 769 
+L 2278 3500 
+L 2956 3500 
+L 3675 769 
+L 4391 3500 
+L 4966 3500 
+L 4050 0 
+L 3372 0 
+L 2619 2869 
+L 1863 0 
+L 1184 0 
+L 269 3500 
+z
+" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-21" d="M 966 794 
+L 1600 794 
+L 1600 0 
+L 966 0 
+L 966 794 
+z
+M 966 4666 
+L 1600 4666 
+L 1600 2619 
+L 1538 1503 
+L 1031 1503 
+L 966 2619 
+L 966 4666 
+z
+" transform="scale(0.015625)"/>
+    </defs>
+    <use xlink:href="#DejaVuSans-54"/>
+    <use xlink:href="#DejaVuSans-68" x="61.083984"/>
+    <use xlink:href="#DejaVuSans-65" x="124.462891"/>
+    <use xlink:href="#DejaVuSans-72" x="185.986328"/>
+    <use xlink:href="#DejaVuSans-65" x="227.068359"/>
+    <use xlink:href="#DejaVuSans-20" x="288.591797"/>
+    <use xlink:href="#DejaVuSans-61" x="320.378906"/>
+    <use xlink:href="#DejaVuSans-72" x="381.658203"/>
+    <use xlink:href="#DejaVuSans-65" x="422.740234"/>
+    <use xlink:href="#DejaVuSans-20" x="484.263672"/>
+    <use xlink:href="#WenQuanYiZenHei-51e0" x="516.050781"/>
+    <use xlink:href="#WenQuanYiZenHei-4e2a" x="616.050781"/>
+    <use xlink:href="#WenQuanYiZenHei-6c49" x="716.050781"/>
+    <use xlink:href="#WenQuanYiZenHei-5b57" x="816.050781"/>
+    <use xlink:href="#DejaVuSans-20" x="916.050781"/>
+    <use xlink:href="#DejaVuSans-69" x="947.837891"/>
+    <use xlink:href="#DejaVuSans-6e" x="975.621094"/>
+    <use xlink:href="#DejaVuSans-20" x="1039"/>
+    <use xlink:href="#DejaVuSans-62" x="1070.787109"/>
+    <use xlink:href="#DejaVuSans-65" x="1134.263672"/>
+    <use xlink:href="#DejaVuSans-74" x="1195.787109"/>
+    <use xlink:href="#DejaVuSans-77" x="1234.996094"/>
+    <use xlink:href="#DejaVuSans-65" x="1316.783203"/>
+    <use xlink:href="#DejaVuSans-65" x="1378.306641"/>
+    <use xlink:href="#DejaVuSans-6e" x="1439.830078"/>
+    <use xlink:href="#DejaVuSans-21" x="1503.208984"/>
+   </g>
+  </g>
+ </g>
+</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_svg/multi_font_astext.svg b/lib/matplotlib/tests/baseline_images/test_backend_svg/multi_font_astext.svg
new file mode 100644
index 000000000000..373103f61b9f
--- /dev/null
+++ b/lib/matplotlib/tests/baseline_images/test_backend_svg/multi_font_astext.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" width="576pt" height="432pt" viewBox="0 0 576 432" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <metadata>
+  <rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+   <cc:Work>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:date>2022-08-09T18:42:37.025191</dc:date>
+    <dc:format>image/svg+xml</dc:format>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Matplotlib v3.6.0.dev2840+g372782e258.d20220809, https://matplotlib.org/</dc:title>
+     </cc:Agent>
+    </dc:creator>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <defs>
+  <style type="text/css">*{stroke-linejoin: round; stroke-linecap: butt}</style>
+ </defs>
+ <g id="figure_1">
+  <g id="patch_1">
+   <path d="M 0 432 
+L 576 432 
+L 576 0 
+L 0 0 
+z
+" style="fill: #ffffff"/>
+  </g>
+  <g id="text_1">
+   <text style="font: 27px 'DejaVu Sans', 'WenQuanYi Zen Hei'; text-anchor: start" x="86.4" y="226.8" transform="rotate(-0 86.4 226.8)">There are 几个汉字 in between!</text>
+  </g>
+ </g>
+</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_fixed_aspect.png b/lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_fixed_aspect.png
new file mode 100644
index 000000000000..0fd7a35e3303
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_fixed_aspect.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_suptile_legend.svg b/lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_suptile_legend.svg
index c99489ca7dfb..5cf932d60cb7 100644
--- a/lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_suptile_legend.svg
+++ b/lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_suptile_legend.svg
@@ -1,21 +1,32 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (http://matplotlib.org/) -->
-<svg height="426.7875pt" version="1.1" viewBox="0 0 663.383875 426.7875" width="663.383875pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" width="663.383875pt" height="426.7875pt" viewBox="0 0 663.383875 426.7875" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <metadata>
+  <rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+   <cc:Work>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:date>2022-07-07T13:08:55.409721</dc:date>
+    <dc:format>image/svg+xml</dc:format>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Matplotlib v3.5.0.dev5238+g5d127c48a6.d20220707, https://matplotlib.org/</dc:title>
+     </cc:Agent>
+    </dc:creator>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linejoin: round; stroke-linecap: butt}</style>
  </defs>
  <g id="figure_1">
   <g id="patch_1">
    <path d="M 0 426.7875 
-L 663.255 426.7875 
-L 663.255 0 
+L 663.383875 426.7875 
+L 663.383875 0 
 L 0 0 
 z
-" style="fill:#ffffff;"/>
+" style="fill: #ffffff"/>
   </g>
   <g id="axes_1">
    <g id="patch_2">
@@ -24,10 +35,10 @@ L 542.014375 387.36
 L 542.014375 41.76 
 L 95.614375 41.76 
 z
-" style="fill:#ffffff;"/>
+" style="fill: #ffffff"/>
    </g>
    <g id="line2d_1">
-    <path clip-path="url(#pc8d0fee012)" d="M 95.614375 387.36 
+    <path d="M 95.614375 387.36 
 L 145.214375 348.96 
 L 194.814375 310.56 
 L 244.414375 272.16 
@@ -37,74 +48,76 @@ L 393.214375 156.96
 L 442.814375 118.56 
 L 492.414375 80.16 
 L 542.014375 41.76 
-" style="fill:none;stroke:#0000ff;stroke-linecap:square;"/>
+" clip-path="url(#p602791bb46)" style="fill: none; stroke: #0000ff; stroke-linecap: square"/>
    </g>
    <g id="patch_3">
     <path d="M 95.614375 387.36 
 L 95.614375 41.76 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="patch_4">
     <path d="M 542.014375 387.36 
 L 542.014375 41.76 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="patch_5">
     <path d="M 95.614375 387.36 
 L 542.014375 387.36 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="patch_6">
     <path d="M 95.614375 41.76 
 L 542.014375 41.76 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
+" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
    <g id="matplotlib.axis_1">
     <g id="xtick_1">
      <g id="line2d_2">
       <defs>
-       <path d="M 0 0 
+       <path id="m441ccbbe42" d="M 0 0 
 L 0 -4 
-" id="m74fd9eab78" style="stroke:#000000;stroke-width:0.5;"/>
+" style="stroke: #000000; stroke-width: 0.5"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="95.614375" xlink:href="#m74fd9eab78" y="387.36"/>
+       <use xlink:href="#m441ccbbe42" x="95.614375" y="387.36" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_3">
       <defs>
-       <path d="M 0 0 
+       <path id="mad5646bafe" d="M 0 0 
 L 0 4 
-" id="m677ef88c78" style="stroke:#000000;stroke-width:0.5;"/>
+" style="stroke: #000000; stroke-width: 0.5"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="95.614375" xlink:href="#m677ef88c78" y="41.76"/>
+       <use xlink:href="#mad5646bafe" x="95.614375" y="41.76" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_1">
       <!-- 0 -->
-      <defs>
-       <path d="M 31.78125 66.40625 
-Q 24.171875 66.40625 20.328125 58.90625 
-Q 16.5 51.421875 16.5 36.375 
-Q 16.5 21.390625 20.328125 13.890625 
-Q 24.171875 6.390625 31.78125 6.390625 
-Q 39.453125 6.390625 43.28125 13.890625 
-Q 47.125 21.390625 47.125 36.375 
-Q 47.125 51.421875 43.28125 58.90625 
-Q 39.453125 66.40625 31.78125 66.40625 
-M 31.78125 74.21875 
-Q 44.046875 74.21875 50.515625 64.515625 
-Q 56.984375 54.828125 56.984375 36.375 
-Q 56.984375 17.96875 50.515625 8.265625 
-Q 44.046875 -1.421875 31.78125 -1.421875 
-Q 19.53125 -1.421875 13.0625 8.265625 
-Q 6.59375 17.96875 6.59375 36.375 
-Q 6.59375 54.828125 13.0625 64.515625 
-Q 19.53125 74.21875 31.78125 74.21875 
-" id="DejaVuSans-30"/>
-      </defs>
-      <g transform="translate(91.796875 400.478125)scale(0.12 -0.12)">
+      <g transform="translate(91.796875 400.478125) scale(0.12 -0.12)">
+       <defs>
+        <path id="DejaVuSans-30" d="M 2034 4250 
+Q 1547 4250 1301 3770 
+Q 1056 3291 1056 2328 
+Q 1056 1369 1301 889 
+Q 1547 409 2034 409 
+Q 2525 409 2770 889 
+Q 3016 1369 3016 2328 
+Q 3016 3291 2770 3770 
+Q 2525 4250 2034 4250 
+z
+M 2034 4750 
+Q 2819 4750 3233 4129 
+Q 3647 3509 3647 2328 
+Q 3647 1150 3233 529 
+Q 2819 -91 2034 -91 
+Q 1250 -91 836 529 
+Q 422 1150 422 2328 
+Q 422 3509 836 4129 
+Q 1250 4750 2034 4750 
+z
+" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-30"/>
       </g>
      </g>
@@ -112,32 +125,33 @@ Q 19.53125 74.21875 31.78125 74.21875
     <g id="xtick_2">
      <g id="line2d_4">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="145.214375" xlink:href="#m74fd9eab78" y="387.36"/>
+       <use xlink:href="#m441ccbbe42" x="145.214375" y="387.36" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_5">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="145.214375" xlink:href="#m677ef88c78" y="41.76"/>
+       <use xlink:href="#mad5646bafe" x="145.214375" y="41.76" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_2">
       <!-- 1 -->
-      <defs>
-       <path d="M 12.40625 8.296875 
-L 28.515625 8.296875 
-L 28.515625 63.921875 
-L 10.984375 60.40625 
-L 10.984375 69.390625 
-L 28.421875 72.90625 
-L 38.28125 72.90625 
-L 38.28125 8.296875 
-L 54.390625 8.296875 
-L 54.390625 0 
-L 12.40625 0 
+      <g transform="translate(141.396875 400.478125) scale(0.12 -0.12)">
+       <defs>
+        <path id="DejaVuSans-31" d="M 794 531 
+L 1825 531 
+L 1825 4091 
+L 703 3866 
+L 703 4441 
+L 1819 4666 
+L 2450 4666 
+L 2450 531 
+L 3481 531 
+L 3481 0 
+L 794 0 
+L 794 531 
 z
-" id="DejaVuSans-31"/>
-      </defs>
-      <g transform="translate(141.396875 400.478125)scale(0.12 -0.12)">
+" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-31"/>
       </g>
      </g>
@@ -145,42 +159,43 @@ z
     <g id="xtick_3">
      <g id="line2d_6">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="194.814375" xlink:href="#m74fd9eab78" y="387.36"/>
+       <use xlink:href="#m441ccbbe42" x="194.814375" y="387.36" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_7">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="194.814375" xlink:href="#m677ef88c78" y="41.76"/>
+       <use xlink:href="#mad5646bafe" x="194.814375" y="41.76" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_3">
       <!-- 2 -->
-      <defs>
-       <path d="M 19.1875 8.296875 
-L 53.609375 8.296875 
-L 53.609375 0 
-L 7.328125 0 
-L 7.328125 8.296875 
-Q 12.9375 14.109375 22.625 23.890625 
-Q 32.328125 33.6875 34.8125 36.53125 
-Q 39.546875 41.84375 41.421875 45.53125 
-Q 43.3125 49.21875 43.3125 52.78125 
-Q 43.3125 58.59375 39.234375 62.25 
-Q 35.15625 65.921875 28.609375 65.921875 
-Q 23.96875 65.921875 18.8125 64.3125 
-Q 13.671875 62.703125 7.8125 59.421875 
-L 7.8125 69.390625 
-Q 13.765625 71.78125 18.9375 73 
-Q 24.125 74.21875 28.421875 74.21875 
-Q 39.75 74.21875 46.484375 68.546875 
-Q 53.21875 62.890625 53.21875 53.421875 
-Q 53.21875 48.921875 51.53125 44.890625 
-Q 49.859375 40.875 45.40625 35.40625 
-Q 44.1875 33.984375 37.640625 27.21875 
-Q 31.109375 20.453125 19.1875 8.296875 
-" id="DejaVuSans-32"/>
-      </defs>
-      <g transform="translate(190.996875 400.478125)scale(0.12 -0.12)">
+      <g transform="translate(190.996875 400.478125) scale(0.12 -0.12)">
+       <defs>
+        <path id="DejaVuSans-32" d="M 1228 531 
+L 3431 531 
+L 3431 0 
+L 469 0 
+L 469 531 
+Q 828 903 1448 1529 
+Q 2069 2156 2228 2338 
+Q 2531 2678 2651 2914 
+Q 2772 3150 2772 3378 
+Q 2772 3750 2511 3984 
+Q 2250 4219 1831 4219 
+Q 1534 4219 1204 4116 
+Q 875 4013 500 3803 
+L 500 4441 
+Q 881 4594 1212 4672 
+Q 1544 4750 1819 4750 
+Q 2544 4750 2975 4387 
+Q 3406 4025 3406 3419 
+Q 3406 3131 3298 2873 
+Q 3191 2616 2906 2266 
+Q 2828 2175 2409 1742 
+Q 1991 1309 1228 531 
+z
+" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-32"/>
       </g>
      </g>
@@ -188,50 +203,51 @@ Q 31.109375 20.453125 19.1875 8.296875
     <g id="xtick_4">
      <g id="line2d_8">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="244.414375" xlink:href="#m74fd9eab78" y="387.36"/>
+       <use xlink:href="#m441ccbbe42" x="244.414375" y="387.36" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_9">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="244.414375" xlink:href="#m677ef88c78" y="41.76"/>
+       <use xlink:href="#mad5646bafe" x="244.414375" y="41.76" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_4">
       <!-- 3 -->
-      <defs>
-       <path d="M 40.578125 39.3125 
-Q 47.65625 37.796875 51.625 33 
-Q 55.609375 28.21875 55.609375 21.1875 
-Q 55.609375 10.40625 48.1875 4.484375 
-Q 40.765625 -1.421875 27.09375 -1.421875 
-Q 22.515625 -1.421875 17.65625 -0.515625 
-Q 12.796875 0.390625 7.625 2.203125 
-L 7.625 11.71875 
-Q 11.71875 9.328125 16.59375 8.109375 
-Q 21.484375 6.890625 26.8125 6.890625 
-Q 36.078125 6.890625 40.9375 10.546875 
-Q 45.796875 14.203125 45.796875 21.1875 
-Q 45.796875 27.640625 41.28125 31.265625 
-Q 36.765625 34.90625 28.71875 34.90625 
-L 20.21875 34.90625 
-L 20.21875 43.015625 
-L 29.109375 43.015625 
-Q 36.375 43.015625 40.234375 45.921875 
-Q 44.09375 48.828125 44.09375 54.296875 
-Q 44.09375 59.90625 40.109375 62.90625 
-Q 36.140625 65.921875 28.71875 65.921875 
-Q 24.65625 65.921875 20.015625 65.03125 
-Q 15.375 64.15625 9.8125 62.3125 
-L 9.8125 71.09375 
-Q 15.4375 72.65625 20.34375 73.4375 
-Q 25.25 74.21875 29.59375 74.21875 
-Q 40.828125 74.21875 47.359375 69.109375 
-Q 53.90625 64.015625 53.90625 55.328125 
-Q 53.90625 49.265625 50.4375 45.09375 
-Q 46.96875 40.921875 40.578125 39.3125 
-" id="DejaVuSans-33"/>
-      </defs>
-      <g transform="translate(240.596875 400.478125)scale(0.12 -0.12)">
+      <g transform="translate(240.596875 400.478125) scale(0.12 -0.12)">
+       <defs>
+        <path id="DejaVuSans-33" d="M 2597 2516 
+Q 3050 2419 3304 2112 
+Q 3559 1806 3559 1356 
+Q 3559 666 3084 287 
+Q 2609 -91 1734 -91 
+Q 1441 -91 1130 -33 
+Q 819 25 488 141 
+L 488 750 
+Q 750 597 1062 519 
+Q 1375 441 1716 441 
+Q 2309 441 2620 675 
+Q 2931 909 2931 1356 
+Q 2931 1769 2642 2001 
+Q 2353 2234 1838 2234 
+L 1294 2234 
+L 1294 2753 
+L 1863 2753 
+Q 2328 2753 2575 2939 
+Q 2822 3125 2822 3475 
+Q 2822 3834 2567 4026 
+Q 2313 4219 1838 4219 
+Q 1578 4219 1281 4162 
+Q 984 4106 628 3988 
+L 628 4550 
+Q 988 4650 1302 4700 
+Q 1616 4750 1894 4750 
+Q 2613 4750 3031 4423 
+Q 3450 4097 3450 3541 
+Q 3450 3153 3228 2886 
+Q 3006 2619 2597 2516 
+z
+" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-33"/>
       </g>
      </g>
@@ -239,36 +255,38 @@ Q 46.96875 40.921875 40.578125 39.3125
     <g id="xtick_5">
      <g id="line2d_10">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="294.014375" xlink:href="#m74fd9eab78" y="387.36"/>
+       <use xlink:href="#m441ccbbe42" x="294.014375" y="387.36" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_11">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="294.014375" xlink:href="#m677ef88c78" y="41.76"/>
+       <use xlink:href="#mad5646bafe" x="294.014375" y="41.76" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_5">
       <!-- 4 -->
-      <defs>
-       <path d="M 37.796875 64.3125 
-L 12.890625 25.390625 
-L 37.796875 25.390625 
+      <g transform="translate(290.196875 400.478125) scale(0.12 -0.12)">
+       <defs>
+        <path id="DejaVuSans-34" d="M 2419 4116 
+L 825 1625 
+L 2419 1625 
+L 2419 4116 
 z
-M 35.203125 72.90625 
-L 47.609375 72.90625 
-L 47.609375 25.390625 
-L 58.015625 25.390625 
-L 58.015625 17.1875 
-L 47.609375 17.1875 
-L 47.609375 0 
-L 37.796875 0 
-L 37.796875 17.1875 
-L 4.890625 17.1875 
-L 4.890625 26.703125 
+M 2253 4666 
+L 3047 4666 
+L 3047 1625 
+L 3713 1625 
+L 3713 1100 
+L 3047 1100 
+L 3047 0 
+L 2419 0 
+L 2419 1100 
+L 313 1100 
+L 313 1709 
+L 2253 4666 
 z
-" id="DejaVuSans-34"/>
-      </defs>
-      <g transform="translate(290.196875 400.478125)scale(0.12 -0.12)">
+" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-34"/>
       </g>
      </g>
@@ -276,43 +294,44 @@ z
     <g id="xtick_6">
      <g id="line2d_12">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="343.614375" xlink:href="#m74fd9eab78" y="387.36"/>
+       <use xlink:href="#m441ccbbe42" x="343.614375" y="387.36" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_13">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="343.614375" xlink:href="#m677ef88c78" y="41.76"/>
+       <use xlink:href="#mad5646bafe" x="343.614375" y="41.76" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_6">
       <!-- 5 -->
-      <defs>
-       <path d="M 10.796875 72.90625 
-L 49.515625 72.90625 
-L 49.515625 64.59375 
-L 19.828125 64.59375 
-L 19.828125 46.734375 
-Q 21.96875 47.46875 24.109375 47.828125 
-Q 26.265625 48.1875 28.421875 48.1875 
-Q 40.625 48.1875 47.75 41.5 
-Q 54.890625 34.8125 54.890625 23.390625 
-Q 54.890625 11.625 47.5625 5.09375 
-Q 40.234375 -1.421875 26.90625 -1.421875 
-Q 22.3125 -1.421875 17.546875 -0.640625 
-Q 12.796875 0.140625 7.71875 1.703125 
-L 7.71875 11.625 
-Q 12.109375 9.234375 16.796875 8.0625 
-Q 21.484375 6.890625 26.703125 6.890625 
-Q 35.15625 6.890625 40.078125 11.328125 
-Q 45.015625 15.765625 45.015625 23.390625 
-Q 45.015625 31 40.078125 35.4375 
-Q 35.15625 39.890625 26.703125 39.890625 
-Q 22.75 39.890625 18.8125 39.015625 
-Q 14.890625 38.140625 10.796875 36.28125 
+      <g transform="translate(339.796875 400.478125) scale(0.12 -0.12)">
+       <defs>
+        <path id="DejaVuSans-35" d="M 691 4666 
+L 3169 4666 
+L 3169 4134 
+L 1269 4134 
+L 1269 2991 
+Q 1406 3038 1543 3061 
+Q 1681 3084 1819 3084 
+Q 2600 3084 3056 2656 
+Q 3513 2228 3513 1497 
+Q 3513 744 3044 326 
+Q 2575 -91 1722 -91 
+Q 1428 -91 1123 -41 
+Q 819 9 494 109 
+L 494 744 
+Q 775 591 1075 516 
+Q 1375 441 1709 441 
+Q 2250 441 2565 725 
+Q 2881 1009 2881 1497 
+Q 2881 1984 2565 2268 
+Q 2250 2553 1709 2553 
+Q 1456 2553 1204 2497 
+Q 953 2441 691 2322 
+L 691 4666 
 z
-" id="DejaVuSans-35"/>
-      </defs>
-      <g transform="translate(339.796875 400.478125)scale(0.12 -0.12)">
+" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-35"/>
       </g>
      </g>
@@ -320,47 +339,49 @@ z
     <g id="xtick_7">
      <g id="line2d_14">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="393.214375" xlink:href="#m74fd9eab78" y="387.36"/>
+       <use xlink:href="#m441ccbbe42" x="393.214375" y="387.36" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_15">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="393.214375" xlink:href="#m677ef88c78" y="41.76"/>
+       <use xlink:href="#mad5646bafe" x="393.214375" y="41.76" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_7">
       <!-- 6 -->
-      <defs>
-       <path d="M 33.015625 40.375 
-Q 26.375 40.375 22.484375 35.828125 
-Q 18.609375 31.296875 18.609375 23.390625 
-Q 18.609375 15.53125 22.484375 10.953125 
-Q 26.375 6.390625 33.015625 6.390625 
-Q 39.65625 6.390625 43.53125 10.953125 
-Q 47.40625 15.53125 47.40625 23.390625 
-Q 47.40625 31.296875 43.53125 35.828125 
-Q 39.65625 40.375 33.015625 40.375 
-M 52.59375 71.296875 
-L 52.59375 62.3125 
-Q 48.875 64.0625 45.09375 64.984375 
-Q 41.3125 65.921875 37.59375 65.921875 
-Q 27.828125 65.921875 22.671875 59.328125 
-Q 17.53125 52.734375 16.796875 39.40625 
-Q 19.671875 43.65625 24.015625 45.921875 
-Q 28.375 48.1875 33.59375 48.1875 
-Q 44.578125 48.1875 50.953125 41.515625 
-Q 57.328125 34.859375 57.328125 23.390625 
-Q 57.328125 12.15625 50.6875 5.359375 
-Q 44.046875 -1.421875 33.015625 -1.421875 
-Q 20.359375 -1.421875 13.671875 8.265625 
-Q 6.984375 17.96875 6.984375 36.375 
-Q 6.984375 53.65625 15.1875 63.9375 
-Q 23.390625 74.21875 37.203125 74.21875 
-Q 40.921875 74.21875 44.703125 73.484375 
-Q 48.484375 72.75 52.59375 71.296875 
-" id="DejaVuSans-36"/>
-      </defs>
-      <g transform="translate(389.396875 400.478125)scale(0.12 -0.12)">
+      <g transform="translate(389.396875 400.478125) scale(0.12 -0.12)">
+       <defs>
+        <path id="DejaVuSans-36" d="M 2113 2584 
+Q 1688 2584 1439 2293 
+Q 1191 2003 1191 1497 
+Q 1191 994 1439 701 
+Q 1688 409 2113 409 
+Q 2538 409 2786 701 
+Q 3034 994 3034 1497 
+Q 3034 2003 2786 2293 
+Q 2538 2584 2113 2584 
+z
+M 3366 4563 
+L 3366 3988 
+Q 3128 4100 2886 4159 
+Q 2644 4219 2406 4219 
+Q 1781 4219 1451 3797 
+Q 1122 3375 1075 2522 
+Q 1259 2794 1537 2939 
+Q 1816 3084 2150 3084 
+Q 2853 3084 3261 2657 
+Q 3669 2231 3669 1497 
+Q 3669 778 3244 343 
+Q 2819 -91 2113 -91 
+Q 1303 -91 875 529 
+Q 447 1150 447 2328 
+Q 447 3434 972 4092 
+Q 1497 4750 2381 4750 
+Q 2619 4750 2861 4703 
+Q 3103 4656 3366 4563 
+z
+" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-36"/>
       </g>
      </g>
@@ -368,28 +389,29 @@ Q 48.484375 72.75 52.59375 71.296875
     <g id="xtick_8">
      <g id="line2d_16">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="442.814375" xlink:href="#m74fd9eab78" y="387.36"/>
+       <use xlink:href="#m441ccbbe42" x="442.814375" y="387.36" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_17">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="442.814375" xlink:href="#m677ef88c78" y="41.76"/>
+       <use xlink:href="#mad5646bafe" x="442.814375" y="41.76" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_8">
       <!-- 7 -->
-      <defs>
-       <path d="M 8.203125 72.90625 
-L 55.078125 72.90625 
-L 55.078125 68.703125 
-L 28.609375 0 
-L 18.3125 0 
-L 43.21875 64.59375 
-L 8.203125 64.59375 
+      <g transform="translate(438.996875 400.478125) scale(0.12 -0.12)">
+       <defs>
+        <path id="DejaVuSans-37" d="M 525 4666 
+L 3525 4666 
+L 3525 4397 
+L 1831 0 
+L 1172 0 
+L 2766 4134 
+L 525 4134 
+L 525 4666 
 z
-" id="DejaVuSans-37"/>
-      </defs>
-      <g transform="translate(438.996875 400.478125)scale(0.12 -0.12)">
+" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-37"/>
       </g>
      </g>
@@ -397,55 +419,58 @@ z
     <g id="xtick_9">
      <g id="line2d_18">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="492.414375" xlink:href="#m74fd9eab78" y="387.36"/>
+       <use xlink:href="#m441ccbbe42" x="492.414375" y="387.36" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_19">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="492.414375" xlink:href="#m677ef88c78" y="41.76"/>
+       <use xlink:href="#mad5646bafe" x="492.414375" y="41.76" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_9">
       <!-- 8 -->
-      <defs>
-       <path d="M 31.78125 34.625 
-Q 24.75 34.625 20.71875 30.859375 
-Q 16.703125 27.09375 16.703125 20.515625 
-Q 16.703125 13.921875 20.71875 10.15625 
-Q 24.75 6.390625 31.78125 6.390625 
-Q 38.8125 6.390625 42.859375 10.171875 
-Q 46.921875 13.96875 46.921875 20.515625 
-Q 46.921875 27.09375 42.890625 30.859375 
-Q 38.875 34.625 31.78125 34.625 
-M 21.921875 38.8125 
-Q 15.578125 40.375 12.03125 44.71875 
-Q 8.5 49.078125 8.5 55.328125 
-Q 8.5 64.0625 14.71875 69.140625 
-Q 20.953125 74.21875 31.78125 74.21875 
-Q 42.671875 74.21875 48.875 69.140625 
-Q 55.078125 64.0625 55.078125 55.328125 
-Q 55.078125 49.078125 51.53125 44.71875 
-Q 48 40.375 41.703125 38.8125 
-Q 48.828125 37.15625 52.796875 32.3125 
-Q 56.78125 27.484375 56.78125 20.515625 
-Q 56.78125 9.90625 50.3125 4.234375 
-Q 43.84375 -1.421875 31.78125 -1.421875 
-Q 19.734375 -1.421875 13.25 4.234375 
-Q 6.78125 9.90625 6.78125 20.515625 
-Q 6.78125 27.484375 10.78125 32.3125 
-Q 14.796875 37.15625 21.921875 38.8125 
-M 18.3125 54.390625 
-Q 18.3125 48.734375 21.84375 45.5625 
-Q 25.390625 42.390625 31.78125 42.390625 
-Q 38.140625 42.390625 41.71875 45.5625 
-Q 45.3125 48.734375 45.3125 54.390625 
-Q 45.3125 60.0625 41.71875 63.234375 
-Q 38.140625 66.40625 31.78125 66.40625 
-Q 25.390625 66.40625 21.84375 63.234375 
-Q 18.3125 60.0625 18.3125 54.390625 
-" id="DejaVuSans-38"/>
-      </defs>
-      <g transform="translate(488.596875 400.478125)scale(0.12 -0.12)">
+      <g transform="translate(488.596875 400.478125) scale(0.12 -0.12)">
+       <defs>
+        <path id="DejaVuSans-38" d="M 2034 2216 
+Q 1584 2216 1326 1975 
+Q 1069 1734 1069 1313 
+Q 1069 891 1326 650 
+Q 1584 409 2034 409 
+Q 2484 409 2743 651 
+Q 3003 894 3003 1313 
+Q 3003 1734 2745 1975 
+Q 2488 2216 2034 2216 
+z
+M 1403 2484 
+Q 997 2584 770 2862 
+Q 544 3141 544 3541 
+Q 544 4100 942 4425 
+Q 1341 4750 2034 4750 
+Q 2731 4750 3128 4425 
+Q 3525 4100 3525 3541 
+Q 3525 3141 3298 2862 
+Q 3072 2584 2669 2484 
+Q 3125 2378 3379 2068 
+Q 3634 1759 3634 1313 
+Q 3634 634 3220 271 
+Q 2806 -91 2034 -91 
+Q 1263 -91 848 271 
+Q 434 634 434 1313 
+Q 434 1759 690 2068 
+Q 947 2378 1403 2484 
+z
+M 1172 3481 
+Q 1172 3119 1398 2916 
+Q 1625 2713 2034 2713 
+Q 2441 2713 2670 2916 
+Q 2900 3119 2900 3481 
+Q 2900 3844 2670 4047 
+Q 2441 4250 2034 4250 
+Q 1625 4250 1398 4047 
+Q 1172 3844 1172 3481 
+z
+" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-38"/>
       </g>
      </g>
@@ -453,163 +478,172 @@ Q 18.3125 60.0625 18.3125 54.390625
     <g id="xtick_10">
      <g id="line2d_20">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="542.014375" xlink:href="#m74fd9eab78" y="387.36"/>
+       <use xlink:href="#m441ccbbe42" x="542.014375" y="387.36" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_21">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="542.014375" xlink:href="#m677ef88c78" y="41.76"/>
+       <use xlink:href="#mad5646bafe" x="542.014375" y="41.76" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_10">
       <!-- 9 -->
-      <defs>
-       <path d="M 10.984375 1.515625 
-L 10.984375 10.5 
-Q 14.703125 8.734375 18.5 7.8125 
-Q 22.3125 6.890625 25.984375 6.890625 
-Q 35.75 6.890625 40.890625 13.453125 
-Q 46.046875 20.015625 46.78125 33.40625 
-Q 43.953125 29.203125 39.59375 26.953125 
-Q 35.25 24.703125 29.984375 24.703125 
-Q 19.046875 24.703125 12.671875 31.3125 
-Q 6.296875 37.9375 6.296875 49.421875 
-Q 6.296875 60.640625 12.9375 67.421875 
-Q 19.578125 74.21875 30.609375 74.21875 
-Q 43.265625 74.21875 49.921875 64.515625 
-Q 56.59375 54.828125 56.59375 36.375 
-Q 56.59375 19.140625 48.40625 8.859375 
-Q 40.234375 -1.421875 26.421875 -1.421875 
-Q 22.703125 -1.421875 18.890625 -0.6875 
-Q 15.09375 0.046875 10.984375 1.515625 
-M 30.609375 32.421875 
-Q 37.25 32.421875 41.125 36.953125 
-Q 45.015625 41.5 45.015625 49.421875 
-Q 45.015625 57.28125 41.125 61.84375 
-Q 37.25 66.40625 30.609375 66.40625 
-Q 23.96875 66.40625 20.09375 61.84375 
-Q 16.21875 57.28125 16.21875 49.421875 
-Q 16.21875 41.5 20.09375 36.953125 
-Q 23.96875 32.421875 30.609375 32.421875 
-" id="DejaVuSans-39"/>
-      </defs>
-      <g transform="translate(538.196875 400.478125)scale(0.12 -0.12)">
+      <g transform="translate(538.196875 400.478125) scale(0.12 -0.12)">
+       <defs>
+        <path id="DejaVuSans-39" d="M 703 97 
+L 703 672 
+Q 941 559 1184 500 
+Q 1428 441 1663 441 
+Q 2288 441 2617 861 
+Q 2947 1281 2994 2138 
+Q 2813 1869 2534 1725 
+Q 2256 1581 1919 1581 
+Q 1219 1581 811 2004 
+Q 403 2428 403 3163 
+Q 403 3881 828 4315 
+Q 1253 4750 1959 4750 
+Q 2769 4750 3195 4129 
+Q 3622 3509 3622 2328 
+Q 3622 1225 3098 567 
+Q 2575 -91 1691 -91 
+Q 1453 -91 1209 -44 
+Q 966 3 703 97 
+z
+M 1959 2075 
+Q 2384 2075 2632 2365 
+Q 2881 2656 2881 3163 
+Q 2881 3666 2632 3958 
+Q 2384 4250 1959 4250 
+Q 1534 4250 1286 3958 
+Q 1038 3666 1038 3163 
+Q 1038 2656 1286 2365 
+Q 1534 2075 1959 2075 
+z
+" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-39"/>
       </g>
      </g>
     </g>
     <g id="text_11">
      <!-- X axis -->
-     <defs>
-      <path d="M 6.296875 72.90625 
-L 16.890625 72.90625 
-L 35.015625 45.796875 
-L 53.21875 72.90625 
-L 63.8125 72.90625 
-L 40.375 37.890625 
-L 65.375 0 
-L 54.78125 0 
-L 34.28125 31 
-L 13.625 0 
-L 2.984375 0 
-L 29 38.921875 
+     <g transform="translate(300.776875 417.091875) scale(0.12 -0.12)">
+      <defs>
+       <path id="DejaVuSans-58" d="M 403 4666 
+L 1081 4666 
+L 2241 2931 
+L 3406 4666 
+L 4084 4666 
+L 2584 2425 
+L 4184 0 
+L 3506 0 
+L 2194 1984 
+L 872 0 
+L 191 0 
+L 1856 2491 
+L 403 4666 
 z
-" id="DejaVuSans-58"/>
-      <path id="DejaVuSans-20"/>
-      <path d="M 34.28125 27.484375 
-Q 23.390625 27.484375 19.1875 25 
-Q 14.984375 22.515625 14.984375 16.5 
-Q 14.984375 11.71875 18.140625 8.90625 
-Q 21.296875 6.109375 26.703125 6.109375 
-Q 34.1875 6.109375 38.703125 11.40625 
-Q 43.21875 16.703125 43.21875 25.484375 
-L 43.21875 27.484375 
+" transform="scale(0.015625)"/>
+       <path id="DejaVuSans-20" transform="scale(0.015625)"/>
+       <path id="DejaVuSans-61" d="M 2194 1759 
+Q 1497 1759 1228 1600 
+Q 959 1441 959 1056 
+Q 959 750 1161 570 
+Q 1363 391 1709 391 
+Q 2188 391 2477 730 
+Q 2766 1069 2766 1631 
+L 2766 1759 
+L 2194 1759 
 z
-M 52.203125 31.203125 
-L 52.203125 0 
-L 43.21875 0 
-L 43.21875 8.296875 
-Q 40.140625 3.328125 35.546875 0.953125 
-Q 30.953125 -1.421875 24.3125 -1.421875 
-Q 15.921875 -1.421875 10.953125 3.296875 
-Q 6 8.015625 6 15.921875 
-Q 6 25.140625 12.171875 29.828125 
-Q 18.359375 34.515625 30.609375 34.515625 
-L 43.21875 34.515625 
-L 43.21875 35.40625 
-Q 43.21875 41.609375 39.140625 45 
-Q 35.0625 48.390625 27.6875 48.390625 
-Q 23 48.390625 18.546875 47.265625 
-Q 14.109375 46.140625 10.015625 43.890625 
-L 10.015625 52.203125 
-Q 14.9375 54.109375 19.578125 55.046875 
-Q 24.21875 56 28.609375 56 
-Q 40.484375 56 46.34375 49.84375 
-Q 52.203125 43.703125 52.203125 31.203125 
-" id="DejaVuSans-61"/>
-      <path d="M 54.890625 54.6875 
-L 35.109375 28.078125 
-L 55.90625 0 
-L 45.3125 0 
-L 29.390625 21.484375 
-L 13.484375 0 
-L 2.875 0 
-L 24.125 28.609375 
-L 4.6875 54.6875 
-L 15.28125 54.6875 
-L 29.78125 35.203125 
-L 44.28125 54.6875 
+M 3341 1997 
+L 3341 0 
+L 2766 0 
+L 2766 531 
+Q 2569 213 2275 61 
+Q 1981 -91 1556 -91 
+Q 1019 -91 701 211 
+Q 384 513 384 1019 
+Q 384 1609 779 1909 
+Q 1175 2209 1959 2209 
+L 2766 2209 
+L 2766 2266 
+Q 2766 2663 2505 2880 
+Q 2244 3097 1772 3097 
+Q 1472 3097 1187 3025 
+Q 903 2953 641 2809 
+L 641 3341 
+Q 956 3463 1253 3523 
+Q 1550 3584 1831 3584 
+Q 2591 3584 2966 3190 
+Q 3341 2797 3341 1997 
 z
-" id="DejaVuSans-78"/>
-      <path d="M 9.421875 54.6875 
-L 18.40625 54.6875 
-L 18.40625 0 
-L 9.421875 0 
+" transform="scale(0.015625)"/>
+       <path id="DejaVuSans-78" d="M 3513 3500 
+L 2247 1797 
+L 3578 0 
+L 2900 0 
+L 1881 1375 
+L 863 0 
+L 184 0 
+L 1544 1831 
+L 300 3500 
+L 978 3500 
+L 1906 2253 
+L 2834 3500 
+L 3513 3500 
 z
-M 9.421875 75.984375 
-L 18.40625 75.984375 
-L 18.40625 64.59375 
-L 9.421875 64.59375 
+" transform="scale(0.015625)"/>
+       <path id="DejaVuSans-69" d="M 603 3500 
+L 1178 3500 
+L 1178 0 
+L 603 0 
+L 603 3500 
 z
-" id="DejaVuSans-69"/>
-      <path d="M 44.28125 53.078125 
-L 44.28125 44.578125 
-Q 40.484375 46.53125 36.375 47.5 
-Q 32.28125 48.484375 27.875 48.484375 
-Q 21.1875 48.484375 17.84375 46.4375 
-Q 14.5 44.390625 14.5 40.28125 
-Q 14.5 37.15625 16.890625 35.375 
-Q 19.28125 33.59375 26.515625 31.984375 
-L 29.59375 31.296875 
-Q 39.15625 29.25 43.1875 25.515625 
-Q 47.21875 21.78125 47.21875 15.09375 
-Q 47.21875 7.46875 41.1875 3.015625 
-Q 35.15625 -1.421875 24.609375 -1.421875 
-Q 20.21875 -1.421875 15.453125 -0.5625 
-Q 10.6875 0.296875 5.421875 2 
-L 5.421875 11.28125 
-Q 10.40625 8.6875 15.234375 7.390625 
-Q 20.0625 6.109375 24.8125 6.109375 
-Q 31.15625 6.109375 34.5625 8.28125 
-Q 37.984375 10.453125 37.984375 14.40625 
-Q 37.984375 18.0625 35.515625 20.015625 
-Q 33.0625 21.96875 24.703125 23.78125 
-L 21.578125 24.515625 
-Q 13.234375 26.265625 9.515625 29.90625 
-Q 5.8125 33.546875 5.8125 39.890625 
-Q 5.8125 47.609375 11.28125 51.796875 
-Q 16.75 56 26.8125 56 
-Q 31.78125 56 36.171875 55.265625 
-Q 40.578125 54.546875 44.28125 53.078125 
-" id="DejaVuSans-73"/>
-     </defs>
-     <g transform="translate(300.776875 417.091875)scale(0.12 -0.12)">
+M 603 4863 
+L 1178 4863 
+L 1178 4134 
+L 603 4134 
+L 603 4863 
+z
+" transform="scale(0.015625)"/>
+       <path id="DejaVuSans-73" d="M 2834 3397 
+L 2834 2853 
+Q 2591 2978 2328 3040 
+Q 2066 3103 1784 3103 
+Q 1356 3103 1142 2972 
+Q 928 2841 928 2578 
+Q 928 2378 1081 2264 
+Q 1234 2150 1697 2047 
+L 1894 2003 
+Q 2506 1872 2764 1633 
+Q 3022 1394 3022 966 
+Q 3022 478 2636 193 
+Q 2250 -91 1575 -91 
+Q 1294 -91 989 -36 
+Q 684 19 347 128 
+L 347 722 
+Q 666 556 975 473 
+Q 1284 391 1588 391 
+Q 1994 391 2212 530 
+Q 2431 669 2431 922 
+Q 2431 1156 2273 1281 
+Q 2116 1406 1581 1522 
+L 1381 1569 
+Q 847 1681 609 1914 
+Q 372 2147 372 2553 
+Q 372 3047 722 3315 
+Q 1072 3584 1716 3584 
+Q 2034 3584 2315 3537 
+Q 2597 3491 2834 3397 
+z
+" transform="scale(0.015625)"/>
+      </defs>
       <use xlink:href="#DejaVuSans-58"/>
-      <use x="68.505859" xlink:href="#DejaVuSans-20"/>
-      <use x="100.292969" xlink:href="#DejaVuSans-61"/>
-      <use x="161.572266" xlink:href="#DejaVuSans-78"/>
-      <use x="220.751953" xlink:href="#DejaVuSans-69"/>
-      <use x="248.535156" xlink:href="#DejaVuSans-73"/>
+      <use xlink:href="#DejaVuSans-20" x="68.505859"/>
+      <use xlink:href="#DejaVuSans-61" x="100.292969"/>
+      <use xlink:href="#DejaVuSans-78" x="161.572266"/>
+      <use xlink:href="#DejaVuSans-69" x="220.751953"/>
+      <use xlink:href="#DejaVuSans-73" x="248.535156"/>
      </g>
     </g>
    </g>
@@ -617,446 +651,462 @@ Q 40.578125 54.546875 44.28125 53.078125
     <g id="ytick_1">
      <g id="line2d_22">
       <defs>
-       <path d="M 0 0 
+       <path id="mebf891ec74" d="M 0 0 
 L 4 0 
-" id="m5c789e5488" style="stroke:#000000;stroke-width:0.5;"/>
+" style="stroke: #000000; stroke-width: 0.5"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="95.614375" xlink:href="#m5c789e5488" y="387.36"/>
+       <use xlink:href="#mebf891ec74" x="95.614375" y="387.36" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_23">
       <defs>
-       <path d="M 0 0 
+       <path id="m0be78051dd" d="M 0 0 
 L -4 0 
-" id="m48a1e7f2da" style="stroke:#000000;stroke-width:0.5;"/>
+" style="stroke: #000000; stroke-width: 0.5"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="542.014375" xlink:href="#m48a1e7f2da" y="387.36"/>
+       <use xlink:href="#m0be78051dd" x="542.014375" y="387.36" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_12">
       <!-- 0.0 -->
-      <defs>
-       <path d="M 10.6875 12.40625 
-L 21 12.40625 
-L 21 0 
-L 10.6875 0 
+      <g transform="translate(72.530625 391.919062) scale(0.12 -0.12)">
+       <defs>
+        <path id="DejaVuSans-2e" d="M 684 794 
+L 1344 794 
+L 1344 0 
+L 684 0 
+L 684 794 
 z
-" id="DejaVuSans-2e"/>
-      </defs>
-      <g transform="translate(72.530625 391.919062)scale(0.12 -0.12)">
+" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-30"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-30"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-30" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_2">
      <g id="line2d_24">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="95.614375" xlink:href="#m5c789e5488" y="348.96"/>
+       <use xlink:href="#mebf891ec74" x="95.614375" y="348.96" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_25">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="542.014375" xlink:href="#m48a1e7f2da" y="348.96"/>
+       <use xlink:href="#m0be78051dd" x="542.014375" y="348.96" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_13">
       <!-- 1.0 -->
-      <g transform="translate(72.530625 353.519063)scale(0.12 -0.12)">
+      <g transform="translate(72.530625 353.519063) scale(0.12 -0.12)">
        <use xlink:href="#DejaVuSans-31"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-30"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-30" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_3">
      <g id="line2d_26">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="95.614375" xlink:href="#m5c789e5488" y="310.56"/>
+       <use xlink:href="#mebf891ec74" x="95.614375" y="310.56" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_27">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="542.014375" xlink:href="#m48a1e7f2da" y="310.56"/>
+       <use xlink:href="#m0be78051dd" x="542.014375" y="310.56" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_14">
       <!-- 2.0 -->
-      <g transform="translate(72.530625 315.119063)scale(0.12 -0.12)">
+      <g transform="translate(72.530625 315.119063) scale(0.12 -0.12)">
        <use xlink:href="#DejaVuSans-32"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-30"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-30" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_4">
      <g id="line2d_28">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="95.614375" xlink:href="#m5c789e5488" y="272.16"/>
+       <use xlink:href="#mebf891ec74" x="95.614375" y="272.16" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_29">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="542.014375" xlink:href="#m48a1e7f2da" y="272.16"/>
+       <use xlink:href="#m0be78051dd" x="542.014375" y="272.16" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_15">
       <!-- 3.0 -->
-      <g transform="translate(72.530625 276.719063)scale(0.12 -0.12)">
+      <g transform="translate(72.530625 276.719063) scale(0.12 -0.12)">
        <use xlink:href="#DejaVuSans-33"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-30"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-30" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_5">
      <g id="line2d_30">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="95.614375" xlink:href="#m5c789e5488" y="233.76"/>
+       <use xlink:href="#mebf891ec74" x="95.614375" y="233.76" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_31">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="542.014375" xlink:href="#m48a1e7f2da" y="233.76"/>
+       <use xlink:href="#m0be78051dd" x="542.014375" y="233.76" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_16">
       <!-- The number 4 -->
-      <defs>
-       <path d="M -0.296875 72.90625 
-L 61.375 72.90625 
-L 61.375 64.59375 
-L 35.5 64.59375 
-L 35.5 0 
-L 25.59375 0 
-L 25.59375 64.59375 
-L -0.296875 64.59375 
+      <g transform="translate(7.2 238.319063) scale(0.12 -0.12)">
+       <defs>
+        <path id="DejaVuSans-54" d="M -19 4666 
+L 3928 4666 
+L 3928 4134 
+L 2272 4134 
+L 2272 0 
+L 1638 0 
+L 1638 4134 
+L -19 4134 
+L -19 4666 
 z
-" id="DejaVuSans-54"/>
-       <path d="M 54.890625 33.015625 
-L 54.890625 0 
-L 45.90625 0 
-L 45.90625 32.71875 
-Q 45.90625 40.484375 42.875 44.328125 
-Q 39.84375 48.1875 33.796875 48.1875 
-Q 26.515625 48.1875 22.3125 43.546875 
-Q 18.109375 38.921875 18.109375 30.90625 
-L 18.109375 0 
-L 9.078125 0 
-L 9.078125 75.984375 
-L 18.109375 75.984375 
-L 18.109375 46.1875 
-Q 21.34375 51.125 25.703125 53.5625 
-Q 30.078125 56 35.796875 56 
-Q 45.21875 56 50.046875 50.171875 
-Q 54.890625 44.34375 54.890625 33.015625 
-" id="DejaVuSans-68"/>
-       <path d="M 56.203125 29.59375 
-L 56.203125 25.203125 
-L 14.890625 25.203125 
-Q 15.484375 15.921875 20.484375 11.0625 
-Q 25.484375 6.203125 34.421875 6.203125 
-Q 39.59375 6.203125 44.453125 7.46875 
-Q 49.3125 8.734375 54.109375 11.28125 
-L 54.109375 2.78125 
-Q 49.265625 0.734375 44.1875 -0.34375 
-Q 39.109375 -1.421875 33.890625 -1.421875 
-Q 20.796875 -1.421875 13.15625 6.1875 
-Q 5.515625 13.8125 5.515625 26.8125 
-Q 5.515625 40.234375 12.765625 48.109375 
-Q 20.015625 56 32.328125 56 
-Q 43.359375 56 49.78125 48.890625 
-Q 56.203125 41.796875 56.203125 29.59375 
-M 47.21875 32.234375 
-Q 47.125 39.59375 43.09375 43.984375 
-Q 39.0625 48.390625 32.421875 48.390625 
-Q 24.90625 48.390625 20.390625 44.140625 
-Q 15.875 39.890625 15.1875 32.171875 
+" transform="scale(0.015625)"/>
+        <path id="DejaVuSans-68" d="M 3513 2113 
+L 3513 0 
+L 2938 0 
+L 2938 2094 
+Q 2938 2591 2744 2837 
+Q 2550 3084 2163 3084 
+Q 1697 3084 1428 2787 
+Q 1159 2491 1159 1978 
+L 1159 0 
+L 581 0 
+L 581 4863 
+L 1159 4863 
+L 1159 2956 
+Q 1366 3272 1645 3428 
+Q 1925 3584 2291 3584 
+Q 2894 3584 3203 3211 
+Q 3513 2838 3513 2113 
 z
-" id="DejaVuSans-65"/>
-       <path d="M 54.890625 33.015625 
-L 54.890625 0 
-L 45.90625 0 
-L 45.90625 32.71875 
-Q 45.90625 40.484375 42.875 44.328125 
-Q 39.84375 48.1875 33.796875 48.1875 
-Q 26.515625 48.1875 22.3125 43.546875 
-Q 18.109375 38.921875 18.109375 30.90625 
-L 18.109375 0 
-L 9.078125 0 
-L 9.078125 54.6875 
-L 18.109375 54.6875 
-L 18.109375 46.1875 
-Q 21.34375 51.125 25.703125 53.5625 
-Q 30.078125 56 35.796875 56 
-Q 45.21875 56 50.046875 50.171875 
-Q 54.890625 44.34375 54.890625 33.015625 
-" id="DejaVuSans-6e"/>
-       <path d="M 8.5 21.578125 
-L 8.5 54.6875 
-L 17.484375 54.6875 
-L 17.484375 21.921875 
-Q 17.484375 14.15625 20.5 10.265625 
-Q 23.53125 6.390625 29.59375 6.390625 
-Q 36.859375 6.390625 41.078125 11.03125 
-Q 45.3125 15.671875 45.3125 23.6875 
-L 45.3125 54.6875 
-L 54.296875 54.6875 
-L 54.296875 0 
-L 45.3125 0 
-L 45.3125 8.40625 
-Q 42.046875 3.421875 37.71875 1 
-Q 33.40625 -1.421875 27.6875 -1.421875 
-Q 18.265625 -1.421875 13.375 4.4375 
-Q 8.5 10.296875 8.5 21.578125 
-M 31.109375 56 
+" transform="scale(0.015625)"/>
+        <path id="DejaVuSans-65" d="M 3597 1894 
+L 3597 1613 
+L 953 1613 
+Q 991 1019 1311 708 
+Q 1631 397 2203 397 
+Q 2534 397 2845 478 
+Q 3156 559 3463 722 
+L 3463 178 
+Q 3153 47 2828 -22 
+Q 2503 -91 2169 -91 
+Q 1331 -91 842 396 
+Q 353 884 353 1716 
+Q 353 2575 817 3079 
+Q 1281 3584 2069 3584 
+Q 2775 3584 3186 3129 
+Q 3597 2675 3597 1894 
 z
-" id="DejaVuSans-75"/>
-       <path d="M 52 44.1875 
-Q 55.375 50.25 60.0625 53.125 
-Q 64.75 56 71.09375 56 
-Q 79.640625 56 84.28125 50.015625 
-Q 88.921875 44.046875 88.921875 33.015625 
-L 88.921875 0 
-L 79.890625 0 
-L 79.890625 32.71875 
-Q 79.890625 40.578125 77.09375 44.375 
-Q 74.3125 48.1875 68.609375 48.1875 
-Q 61.625 48.1875 57.5625 43.546875 
-Q 53.515625 38.921875 53.515625 30.90625 
-L 53.515625 0 
-L 44.484375 0 
-L 44.484375 32.71875 
-Q 44.484375 40.625 41.703125 44.40625 
-Q 38.921875 48.1875 33.109375 48.1875 
-Q 26.21875 48.1875 22.15625 43.53125 
-Q 18.109375 38.875 18.109375 30.90625 
-L 18.109375 0 
-L 9.078125 0 
-L 9.078125 54.6875 
-L 18.109375 54.6875 
-L 18.109375 46.1875 
-Q 21.1875 51.21875 25.484375 53.609375 
-Q 29.78125 56 35.6875 56 
-Q 41.65625 56 45.828125 52.96875 
-Q 50 49.953125 52 44.1875 
-" id="DejaVuSans-6d"/>
-       <path d="M 48.6875 27.296875 
-Q 48.6875 37.203125 44.609375 42.84375 
-Q 40.53125 48.484375 33.40625 48.484375 
-Q 26.265625 48.484375 22.1875 42.84375 
-Q 18.109375 37.203125 18.109375 27.296875 
-Q 18.109375 17.390625 22.1875 11.75 
-Q 26.265625 6.109375 33.40625 6.109375 
-Q 40.53125 6.109375 44.609375 11.75 
-Q 48.6875 17.390625 48.6875 27.296875 
-M 18.109375 46.390625 
-Q 20.953125 51.265625 25.265625 53.625 
-Q 29.59375 56 35.59375 56 
-Q 45.5625 56 51.78125 48.09375 
-Q 58.015625 40.1875 58.015625 27.296875 
-Q 58.015625 14.40625 51.78125 6.484375 
-Q 45.5625 -1.421875 35.59375 -1.421875 
-Q 29.59375 -1.421875 25.265625 0.953125 
-Q 20.953125 3.328125 18.109375 8.203125 
-L 18.109375 0 
-L 9.078125 0 
-L 9.078125 75.984375 
-L 18.109375 75.984375 
+M 3022 2063 
+Q 3016 2534 2758 2815 
+Q 2500 3097 2075 3097 
+Q 1594 3097 1305 2825 
+Q 1016 2553 972 2059 
+L 3022 2063 
 z
-" id="DejaVuSans-62"/>
-       <path d="M 41.109375 46.296875 
-Q 39.59375 47.171875 37.8125 47.578125 
-Q 36.03125 48 33.890625 48 
-Q 26.265625 48 22.1875 43.046875 
-Q 18.109375 38.09375 18.109375 28.8125 
-L 18.109375 0 
-L 9.078125 0 
-L 9.078125 54.6875 
-L 18.109375 54.6875 
-L 18.109375 46.1875 
-Q 20.953125 51.171875 25.484375 53.578125 
-Q 30.03125 56 36.53125 56 
-Q 37.453125 56 38.578125 55.875 
-Q 39.703125 55.765625 41.0625 55.515625 
+" transform="scale(0.015625)"/>
+        <path id="DejaVuSans-6e" d="M 3513 2113 
+L 3513 0 
+L 2938 0 
+L 2938 2094 
+Q 2938 2591 2744 2837 
+Q 2550 3084 2163 3084 
+Q 1697 3084 1428 2787 
+Q 1159 2491 1159 1978 
+L 1159 0 
+L 581 0 
+L 581 3500 
+L 1159 3500 
+L 1159 2956 
+Q 1366 3272 1645 3428 
+Q 1925 3584 2291 3584 
+Q 2894 3584 3203 3211 
+Q 3513 2838 3513 2113 
 z
-" id="DejaVuSans-72"/>
-      </defs>
-      <g transform="translate(7.2 238.319063)scale(0.12 -0.12)">
+" transform="scale(0.015625)"/>
+        <path id="DejaVuSans-75" d="M 544 1381 
+L 544 3500 
+L 1119 3500 
+L 1119 1403 
+Q 1119 906 1312 657 
+Q 1506 409 1894 409 
+Q 2359 409 2629 706 
+Q 2900 1003 2900 1516 
+L 2900 3500 
+L 3475 3500 
+L 3475 0 
+L 2900 0 
+L 2900 538 
+Q 2691 219 2414 64 
+Q 2138 -91 1772 -91 
+Q 1169 -91 856 284 
+Q 544 659 544 1381 
+z
+M 1991 3584 
+L 1991 3584 
+z
+" transform="scale(0.015625)"/>
+        <path id="DejaVuSans-6d" d="M 3328 2828 
+Q 3544 3216 3844 3400 
+Q 4144 3584 4550 3584 
+Q 5097 3584 5394 3201 
+Q 5691 2819 5691 2113 
+L 5691 0 
+L 5113 0 
+L 5113 2094 
+Q 5113 2597 4934 2840 
+Q 4756 3084 4391 3084 
+Q 3944 3084 3684 2787 
+Q 3425 2491 3425 1978 
+L 3425 0 
+L 2847 0 
+L 2847 2094 
+Q 2847 2600 2669 2842 
+Q 2491 3084 2119 3084 
+Q 1678 3084 1418 2786 
+Q 1159 2488 1159 1978 
+L 1159 0 
+L 581 0 
+L 581 3500 
+L 1159 3500 
+L 1159 2956 
+Q 1356 3278 1631 3431 
+Q 1906 3584 2284 3584 
+Q 2666 3584 2933 3390 
+Q 3200 3197 3328 2828 
+z
+" transform="scale(0.015625)"/>
+        <path id="DejaVuSans-62" d="M 3116 1747 
+Q 3116 2381 2855 2742 
+Q 2594 3103 2138 3103 
+Q 1681 3103 1420 2742 
+Q 1159 2381 1159 1747 
+Q 1159 1113 1420 752 
+Q 1681 391 2138 391 
+Q 2594 391 2855 752 
+Q 3116 1113 3116 1747 
+z
+M 1159 2969 
+Q 1341 3281 1617 3432 
+Q 1894 3584 2278 3584 
+Q 2916 3584 3314 3078 
+Q 3713 2572 3713 1747 
+Q 3713 922 3314 415 
+Q 2916 -91 2278 -91 
+Q 1894 -91 1617 61 
+Q 1341 213 1159 525 
+L 1159 0 
+L 581 0 
+L 581 4863 
+L 1159 4863 
+L 1159 2969 
+z
+" transform="scale(0.015625)"/>
+        <path id="DejaVuSans-72" d="M 2631 2963 
+Q 2534 3019 2420 3045 
+Q 2306 3072 2169 3072 
+Q 1681 3072 1420 2755 
+Q 1159 2438 1159 1844 
+L 1159 0 
+L 581 0 
+L 581 3500 
+L 1159 3500 
+L 1159 2956 
+Q 1341 3275 1631 3429 
+Q 1922 3584 2338 3584 
+Q 2397 3584 2469 3576 
+Q 2541 3569 2628 3553 
+L 2631 2963 
+z
+" transform="scale(0.015625)"/>
+       </defs>
        <use xlink:href="#DejaVuSans-54"/>
-       <use x="61.083984" xlink:href="#DejaVuSans-68"/>
-       <use x="124.462891" xlink:href="#DejaVuSans-65"/>
-       <use x="185.986328" xlink:href="#DejaVuSans-20"/>
-       <use x="217.773438" xlink:href="#DejaVuSans-6e"/>
-       <use x="281.152344" xlink:href="#DejaVuSans-75"/>
-       <use x="344.53125" xlink:href="#DejaVuSans-6d"/>
-       <use x="441.943359" xlink:href="#DejaVuSans-62"/>
-       <use x="505.419922" xlink:href="#DejaVuSans-65"/>
-       <use x="566.943359" xlink:href="#DejaVuSans-72"/>
-       <use x="608.056641" xlink:href="#DejaVuSans-20"/>
-       <use x="639.84375" xlink:href="#DejaVuSans-34"/>
+       <use xlink:href="#DejaVuSans-68" x="61.083984"/>
+       <use xlink:href="#DejaVuSans-65" x="124.462891"/>
+       <use xlink:href="#DejaVuSans-20" x="185.986328"/>
+       <use xlink:href="#DejaVuSans-6e" x="217.773438"/>
+       <use xlink:href="#DejaVuSans-75" x="281.152344"/>
+       <use xlink:href="#DejaVuSans-6d" x="344.53125"/>
+       <use xlink:href="#DejaVuSans-62" x="441.943359"/>
+       <use xlink:href="#DejaVuSans-65" x="505.419922"/>
+       <use xlink:href="#DejaVuSans-72" x="566.943359"/>
+       <use xlink:href="#DejaVuSans-20" x="608.056641"/>
+       <use xlink:href="#DejaVuSans-34" x="639.84375"/>
       </g>
      </g>
     </g>
     <g id="ytick_6">
      <g id="line2d_32">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="95.614375" xlink:href="#m5c789e5488" y="195.36"/>
+       <use xlink:href="#mebf891ec74" x="95.614375" y="195.36" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_33">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="542.014375" xlink:href="#m48a1e7f2da" y="195.36"/>
+       <use xlink:href="#m0be78051dd" x="542.014375" y="195.36" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_17">
       <!-- 5.0 -->
-      <g transform="translate(72.530625 199.919063)scale(0.12 -0.12)">
+      <g transform="translate(72.530625 199.919063) scale(0.12 -0.12)">
        <use xlink:href="#DejaVuSans-35"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-30"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-30" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_7">
      <g id="line2d_34">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="95.614375" xlink:href="#m5c789e5488" y="156.96"/>
+       <use xlink:href="#mebf891ec74" x="95.614375" y="156.96" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_35">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="542.014375" xlink:href="#m48a1e7f2da" y="156.96"/>
+       <use xlink:href="#m0be78051dd" x="542.014375" y="156.96" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_18">
       <!-- 6.0 -->
-      <g transform="translate(72.530625 161.519063)scale(0.12 -0.12)">
+      <g transform="translate(72.530625 161.519063) scale(0.12 -0.12)">
        <use xlink:href="#DejaVuSans-36"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-30"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-30" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_8">
      <g id="line2d_36">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="95.614375" xlink:href="#m5c789e5488" y="118.56"/>
+       <use xlink:href="#mebf891ec74" x="95.614375" y="118.56" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_37">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="542.014375" xlink:href="#m48a1e7f2da" y="118.56"/>
+       <use xlink:href="#m0be78051dd" x="542.014375" y="118.56" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_19">
       <!-- 7.0 -->
-      <g transform="translate(72.530625 123.119062)scale(0.12 -0.12)">
+      <g transform="translate(72.530625 123.119062) scale(0.12 -0.12)">
        <use xlink:href="#DejaVuSans-37"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-30"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-30" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_9">
      <g id="line2d_38">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="95.614375" xlink:href="#m5c789e5488" y="80.16"/>
+       <use xlink:href="#mebf891ec74" x="95.614375" y="80.16" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_39">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="542.014375" xlink:href="#m48a1e7f2da" y="80.16"/>
+       <use xlink:href="#m0be78051dd" x="542.014375" y="80.16" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_20">
       <!-- 8.0 -->
-      <g transform="translate(72.530625 84.719063)scale(0.12 -0.12)">
+      <g transform="translate(72.530625 84.719063) scale(0.12 -0.12)">
        <use xlink:href="#DejaVuSans-38"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-30"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-30" x="95.410156"/>
       </g>
      </g>
     </g>
     <g id="ytick_10">
      <g id="line2d_40">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="95.614375" xlink:href="#m5c789e5488" y="41.76"/>
+       <use xlink:href="#mebf891ec74" x="95.614375" y="41.76" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="line2d_41">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="542.014375" xlink:href="#m48a1e7f2da" y="41.76"/>
+       <use xlink:href="#m0be78051dd" x="542.014375" y="41.76" style="stroke: #000000; stroke-width: 0.5"/>
       </g>
      </g>
      <g id="text_21">
       <!-- 9.0 -->
-      <g transform="translate(72.530625 46.319063)scale(0.12 -0.12)">
+      <g transform="translate(72.530625 46.319063) scale(0.12 -0.12)">
        <use xlink:href="#DejaVuSans-39"/>
-       <use x="63.623047" xlink:href="#DejaVuSans-2e"/>
-       <use x="95.410156" xlink:href="#DejaVuSans-30"/>
+       <use xlink:href="#DejaVuSans-2e" x="63.623047"/>
+       <use xlink:href="#DejaVuSans-30" x="95.410156"/>
       </g>
      </g>
     </g>
    </g>
    <g id="text_22">
     <!-- Axis title -->
-    <defs>
-     <path d="M 34.1875 63.1875 
-L 20.796875 26.90625 
-L 47.609375 26.90625 
+    <g transform="translate(287.512375 36.76) scale(0.144 -0.144)">
+     <defs>
+      <path id="DejaVuSans-41" d="M 2188 4044 
+L 1331 1722 
+L 3047 1722 
+L 2188 4044 
 z
-M 28.609375 72.90625 
-L 39.796875 72.90625 
-L 67.578125 0 
-L 57.328125 0 
-L 50.6875 18.703125 
-L 17.828125 18.703125 
-L 11.1875 0 
-L 0.78125 0 
+M 1831 4666 
+L 2547 4666 
+L 4325 0 
+L 3669 0 
+L 3244 1197 
+L 1141 1197 
+L 716 0 
+L 50 0 
+L 1831 4666 
 z
-" id="DejaVuSans-41"/>
-     <path d="M 18.3125 70.21875 
-L 18.3125 54.6875 
-L 36.8125 54.6875 
-L 36.8125 47.703125 
-L 18.3125 47.703125 
-L 18.3125 18.015625 
-Q 18.3125 11.328125 20.140625 9.421875 
-Q 21.96875 7.515625 27.59375 7.515625 
-L 36.8125 7.515625 
-L 36.8125 0 
-L 27.59375 0 
-Q 17.1875 0 13.234375 3.875 
-Q 9.28125 7.765625 9.28125 18.015625 
-L 9.28125 47.703125 
-L 2.6875 47.703125 
-L 2.6875 54.6875 
-L 9.28125 54.6875 
-L 9.28125 70.21875 
+" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-74" d="M 1172 4494 
+L 1172 3500 
+L 2356 3500 
+L 2356 3053 
+L 1172 3053 
+L 1172 1153 
+Q 1172 725 1289 603 
+Q 1406 481 1766 481 
+L 2356 481 
+L 2356 0 
+L 1766 0 
+Q 1100 0 847 248 
+Q 594 497 594 1153 
+L 594 3053 
+L 172 3053 
+L 172 3500 
+L 594 3500 
+L 594 4494 
+L 1172 4494 
 z
-" id="DejaVuSans-74"/>
-     <path d="M 9.421875 75.984375 
-L 18.40625 75.984375 
-L 18.40625 0 
-L 9.421875 0 
+" transform="scale(0.015625)"/>
+      <path id="DejaVuSans-6c" d="M 603 4863 
+L 1178 4863 
+L 1178 0 
+L 603 0 
+L 603 4863 
 z
-" id="DejaVuSans-6c"/>
-    </defs>
-    <g transform="translate(287.512375 36.76)scale(0.144 -0.144)">
+" transform="scale(0.015625)"/>
+     </defs>
      <use xlink:href="#DejaVuSans-41"/>
-     <use x="68.408203" xlink:href="#DejaVuSans-78"/>
-     <use x="127.587891" xlink:href="#DejaVuSans-69"/>
-     <use x="155.371094" xlink:href="#DejaVuSans-73"/>
-     <use x="207.470703" xlink:href="#DejaVuSans-20"/>
-     <use x="239.257812" xlink:href="#DejaVuSans-74"/>
-     <use x="278.466797" xlink:href="#DejaVuSans-69"/>
-     <use x="306.25" xlink:href="#DejaVuSans-74"/>
-     <use x="345.458984" xlink:href="#DejaVuSans-6c"/>
-     <use x="373.242188" xlink:href="#DejaVuSans-65"/>
+     <use xlink:href="#DejaVuSans-78" x="68.408203"/>
+     <use xlink:href="#DejaVuSans-69" x="127.587891"/>
+     <use xlink:href="#DejaVuSans-73" x="155.371094"/>
+     <use xlink:href="#DejaVuSans-20" x="207.470703"/>
+     <use xlink:href="#DejaVuSans-74" x="239.257812"/>
+     <use xlink:href="#DejaVuSans-69" x="278.466797"/>
+     <use xlink:href="#DejaVuSans-74" x="306.25"/>
+     <use xlink:href="#DejaVuSans-6c" x="345.458984"/>
+     <use xlink:href="#DejaVuSans-65" x="373.242188"/>
     </g>
    </g>
    <g id="legend_1">
@@ -1066,105 +1116,107 @@ L 656.183875 74.4165
 L 656.183875 48.96 
 L 504.574375 48.96 
 z
-" style="fill:#ffffff;stroke:#000000;stroke-linejoin:miter;"/>
+" style="fill: #ffffff; stroke: #000000; stroke-linejoin: miter"/>
     </g>
     <g id="line2d_42">
      <path d="M 514.654375 60.62175 
 L 534.814375 60.62175 
-" style="fill:none;stroke:#0000ff;stroke-linecap:square;"/>
+" style="fill: none; stroke: #0000ff; stroke-linecap: square"/>
     </g>
-    <g id="line2d_43"/>
     <g id="text_23">
      <!-- a straight line -->
-     <defs>
-      <path d="M 45.40625 27.984375 
-Q 45.40625 37.75 41.375 43.109375 
-Q 37.359375 48.484375 30.078125 48.484375 
-Q 22.859375 48.484375 18.828125 43.109375 
-Q 14.796875 37.75 14.796875 27.984375 
-Q 14.796875 18.265625 18.828125 12.890625 
-Q 22.859375 7.515625 30.078125 7.515625 
-Q 37.359375 7.515625 41.375 12.890625 
-Q 45.40625 18.265625 45.40625 27.984375 
-M 54.390625 6.78125 
-Q 54.390625 -7.171875 48.1875 -13.984375 
-Q 42 -20.796875 29.203125 -20.796875 
-Q 24.46875 -20.796875 20.265625 -20.09375 
-Q 16.0625 -19.390625 12.109375 -17.921875 
-L 12.109375 -9.1875 
-Q 16.0625 -11.328125 19.921875 -12.34375 
-Q 23.78125 -13.375 27.78125 -13.375 
-Q 36.625 -13.375 41.015625 -8.765625 
-Q 45.40625 -4.15625 45.40625 5.171875 
-L 45.40625 9.625 
-Q 42.625 4.78125 38.28125 2.390625 
-Q 33.9375 0 27.875 0 
-Q 17.828125 0 11.671875 7.65625 
-Q 5.515625 15.328125 5.515625 27.984375 
-Q 5.515625 40.671875 11.671875 48.328125 
-Q 17.828125 56 27.875 56 
-Q 33.9375 56 38.28125 53.609375 
-Q 42.625 51.21875 45.40625 46.390625 
-L 45.40625 54.6875 
-L 54.390625 54.6875 
+     <g transform="translate(550.654375 65.66175) scale(0.144 -0.144)">
+      <defs>
+       <path id="DejaVuSans-67" d="M 2906 1791 
+Q 2906 2416 2648 2759 
+Q 2391 3103 1925 3103 
+Q 1463 3103 1205 2759 
+Q 947 2416 947 1791 
+Q 947 1169 1205 825 
+Q 1463 481 1925 481 
+Q 2391 481 2648 825 
+Q 2906 1169 2906 1791 
 z
-" id="DejaVuSans-67"/>
-     </defs>
-     <g transform="translate(550.654375 65.66175)scale(0.144 -0.144)">
+M 3481 434 
+Q 3481 -459 3084 -895 
+Q 2688 -1331 1869 -1331 
+Q 1566 -1331 1297 -1286 
+Q 1028 -1241 775 -1147 
+L 775 -588 
+Q 1028 -725 1275 -790 
+Q 1522 -856 1778 -856 
+Q 2344 -856 2625 -561 
+Q 2906 -266 2906 331 
+L 2906 616 
+Q 2728 306 2450 153 
+Q 2172 0 1784 0 
+Q 1141 0 747 490 
+Q 353 981 353 1791 
+Q 353 2603 747 3093 
+Q 1141 3584 1784 3584 
+Q 2172 3584 2450 3431 
+Q 2728 3278 2906 2969 
+L 2906 3500 
+L 3481 3500 
+L 3481 434 
+z
+" transform="scale(0.015625)"/>
+      </defs>
       <use xlink:href="#DejaVuSans-61"/>
-      <use x="61.279297" xlink:href="#DejaVuSans-20"/>
-      <use x="93.066406" xlink:href="#DejaVuSans-73"/>
-      <use x="145.166016" xlink:href="#DejaVuSans-74"/>
-      <use x="184.375" xlink:href="#DejaVuSans-72"/>
-      <use x="225.488281" xlink:href="#DejaVuSans-61"/>
-      <use x="286.767578" xlink:href="#DejaVuSans-69"/>
-      <use x="314.550781" xlink:href="#DejaVuSans-67"/>
-      <use x="378.027344" xlink:href="#DejaVuSans-68"/>
-      <use x="441.40625" xlink:href="#DejaVuSans-74"/>
-      <use x="480.615234" xlink:href="#DejaVuSans-20"/>
-      <use x="512.402344" xlink:href="#DejaVuSans-6c"/>
-      <use x="540.185547" xlink:href="#DejaVuSans-69"/>
-      <use x="567.96875" xlink:href="#DejaVuSans-6e"/>
-      <use x="631.347656" xlink:href="#DejaVuSans-65"/>
+      <use xlink:href="#DejaVuSans-20" x="61.279297"/>
+      <use xlink:href="#DejaVuSans-73" x="93.066406"/>
+      <use xlink:href="#DejaVuSans-74" x="145.166016"/>
+      <use xlink:href="#DejaVuSans-72" x="184.375"/>
+      <use xlink:href="#DejaVuSans-61" x="225.488281"/>
+      <use xlink:href="#DejaVuSans-69" x="286.767578"/>
+      <use xlink:href="#DejaVuSans-67" x="314.550781"/>
+      <use xlink:href="#DejaVuSans-68" x="378.027344"/>
+      <use xlink:href="#DejaVuSans-74" x="441.40625"/>
+      <use xlink:href="#DejaVuSans-20" x="480.615234"/>
+      <use xlink:href="#DejaVuSans-6c" x="512.402344"/>
+      <use xlink:href="#DejaVuSans-69" x="540.185547"/>
+      <use xlink:href="#DejaVuSans-6e" x="567.96875"/>
+      <use xlink:href="#DejaVuSans-65" x="631.347656"/>
      </g>
     </g>
    </g>
   </g>
   <g id="text_24">
    <!-- Figure title -->
-   <defs>
-    <path d="M 9.8125 72.90625 
-L 51.703125 72.90625 
-L 51.703125 64.59375 
-L 19.671875 64.59375 
-L 19.671875 43.109375 
-L 48.578125 43.109375 
-L 48.578125 34.8125 
-L 19.671875 34.8125 
-L 19.671875 0 
-L 9.8125 0 
+   <g transform="translate(279.098125 16.318125) scale(0.12 -0.12)">
+    <defs>
+     <path id="DejaVuSans-46" d="M 628 4666 
+L 3309 4666 
+L 3309 4134 
+L 1259 4134 
+L 1259 2759 
+L 3109 2759 
+L 3109 2228 
+L 1259 2228 
+L 1259 0 
+L 628 0 
+L 628 4666 
 z
-" id="DejaVuSans-46"/>
-   </defs>
-   <g transform="translate(279.098125 16.318125)scale(0.12 -0.12)">
+" transform="scale(0.015625)"/>
+    </defs>
     <use xlink:href="#DejaVuSans-46"/>
-    <use x="57.410156" xlink:href="#DejaVuSans-69"/>
-    <use x="85.193359" xlink:href="#DejaVuSans-67"/>
-    <use x="148.669922" xlink:href="#DejaVuSans-75"/>
-    <use x="212.048828" xlink:href="#DejaVuSans-72"/>
-    <use x="253.130859" xlink:href="#DejaVuSans-65"/>
-    <use x="314.654297" xlink:href="#DejaVuSans-20"/>
-    <use x="346.441406" xlink:href="#DejaVuSans-74"/>
-    <use x="385.650391" xlink:href="#DejaVuSans-69"/>
-    <use x="413.433594" xlink:href="#DejaVuSans-74"/>
-    <use x="452.642578" xlink:href="#DejaVuSans-6c"/>
-    <use x="480.425781" xlink:href="#DejaVuSans-65"/>
+    <use xlink:href="#DejaVuSans-69" x="57.410156"/>
+    <use xlink:href="#DejaVuSans-67" x="85.193359"/>
+    <use xlink:href="#DejaVuSans-75" x="148.669922"/>
+    <use xlink:href="#DejaVuSans-72" x="212.048828"/>
+    <use xlink:href="#DejaVuSans-65" x="253.130859"/>
+    <use xlink:href="#DejaVuSans-20" x="314.654297"/>
+    <use xlink:href="#DejaVuSans-74" x="346.441406"/>
+    <use xlink:href="#DejaVuSans-69" x="385.650391"/>
+    <use xlink:href="#DejaVuSans-74" x="413.433594"/>
+    <use xlink:href="#DejaVuSans-6c" x="452.642578"/>
+    <use xlink:href="#DejaVuSans-65" x="480.425781"/>
    </g>
   </g>
  </g>
  <defs>
-  <clipPath id="pc8d0fee012">
-   <rect height="345.6" width="446.4" x="95.614375" y="41.76"/>
+  <clipPath id="p602791bb46">
+   <rect x="95.614375" y="41.76" width="446.4" height="345.6"/>
   </clipPath>
  </defs>
 </svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_suptile_non_default.png b/lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_suptile_non_default.png
new file mode 100644
index 000000000000..453ea566804d
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_suptile_non_default.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_change_lim_scale.png b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_change_lim_scale.png
new file mode 100644
index 000000000000..2dfb3b0366da
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_change_lim_scale.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_closed_patch.pdf b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_closed_patch.pdf
deleted file mode 100644
index 81271ec29c81..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_closed_patch.pdf and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_closed_patch.png b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_closed_patch.png
index bb41d922189f..b4abeda53746 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_closed_patch.png and b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_closed_patch.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_closed_patch.svg b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_closed_patch.svg
deleted file mode 100644
index 5e205feadc5e..000000000000
--- a/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_closed_patch.svg
+++ /dev/null
@@ -1,650 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (http://matplotlib.org/) -->
-<svg height="432pt" version="1.1" viewBox="0 0 576 432" width="576pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
- </defs>
- <g id="figure_1">
-  <g id="patch_1">
-   <path d="M 0 432 
-L 576 432 
-L 576 0 
-L 0 0 
-z
-" style="fill:#ffffff;"/>
-  </g>
-  <g id="axes_1">
-   <g id="patch_2">
-    <path d="M 28.8 64.8 
-L 547.2 64.8 
-L 547.2 21.6 
-L 28.8 21.6 
-z
-" style="fill:#ffffff;"/>
-   </g>
-   <g id="QuadMesh_1">
-    <path clip-path="url(#p3d4ec13d54)" d="M 28.8 64.8 
-L 158.4 64.8 
-L 158.4 54 
-L 28.8 54 
-L 28.8 64.8 
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p3d4ec13d54)" d="M 158.4 64.8 
-L 288 64.8 
-L 288 54 
-L 158.4 54 
-L 158.4 64.8 
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p3d4ec13d54)" d="M 288 64.8 
-L 417.6 64.8 
-L 417.6 54 
-L 288 54 
-L 288 64.8 
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p3d4ec13d54)" d="M 417.6 64.8 
-L 547.2 64.8 
-L 547.2 54 
-L 417.6 54 
-L 417.6 64.8 
-" style="fill:#e58267;"/>
-    <path clip-path="url(#p3d4ec13d54)" d="M 28.8 54 
-L 158.4 54 
-L 158.4 43.2 
-L 28.8 43.2 
-L 28.8 54 
-" style="fill:#e58267;"/>
-    <path clip-path="url(#p3d4ec13d54)" d="M 158.4 54 
-L 288 54 
-L 288 43.2 
-L 158.4 43.2 
-L 158.4 54 
-" style="fill:#e58267;"/>
-    <path clip-path="url(#p3d4ec13d54)" d="M 288 54 
-L 417.6 54 
-L 417.6 43.2 
-L 288 43.2 
-L 288 54 
-" style="fill:#f7f7f7;"/>
-    <path clip-path="url(#p3d4ec13d54)" d="M 417.6 54 
-L 547.2 54 
-L 547.2 43.2 
-L 417.6 43.2 
-L 417.6 54 
-" style="fill:#f7f7f7;"/>
-    <path clip-path="url(#p3d4ec13d54)" d="M 28.8 43.2 
-L 158.4 43.2 
-L 158.4 32.4 
-L 28.8 32.4 
-L 28.8 43.2 
-" style="fill:#f7f7f7;"/>
-    <path clip-path="url(#p3d4ec13d54)" d="M 158.4 43.2 
-L 288 43.2 
-L 288 32.4 
-L 158.4 32.4 
-L 158.4 43.2 
-" style="fill:#6bacd0;"/>
-    <path clip-path="url(#p3d4ec13d54)" d="M 288 43.2 
-L 417.6 43.2 
-L 417.6 32.4 
-L 288 32.4 
-L 288 43.2 
-" style="fill:#6bacd0;"/>
-    <path clip-path="url(#p3d4ec13d54)" d="M 417.6 43.2 
-L 547.2 43.2 
-L 547.2 32.4 
-L 417.6 32.4 
-L 417.6 43.2 
-" style="fill:#6bacd0;"/>
-    <path clip-path="url(#p3d4ec13d54)" d="M 28.8 32.4 
-L 158.4 32.4 
-L 158.4 21.6 
-L 28.8 21.6 
-L 28.8 32.4 
-" style="fill:#053061;"/>
-    <path clip-path="url(#p3d4ec13d54)" d="M 158.4 32.4 
-L 288 32.4 
-L 288 21.6 
-L 158.4 21.6 
-L 158.4 32.4 
-" style="fill:#053061;"/>
-    <path clip-path="url(#p3d4ec13d54)" d="M 288 32.4 
-L 417.6 32.4 
-L 417.6 21.6 
-L 288 21.6 
-L 288 32.4 
-" style="fill:#053061;"/>
-    <path clip-path="url(#p3d4ec13d54)" d="M 417.6 32.4 
-L 547.2 32.4 
-L 547.2 21.6 
-L 417.6 21.6 
-L 417.6 32.4 
-" style="fill:#053061;"/>
-   </g>
-   <g id="patch_3">
-    <path d="M 28.8 64.8 
-L 28.8 21.6 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
-   </g>
-   <g id="patch_4">
-    <path d="M 547.2 64.8 
-L 547.2 21.6 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
-   </g>
-   <g id="patch_5">
-    <path d="M 28.8 64.8 
-L 547.2 64.8 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
-   </g>
-   <g id="patch_6">
-    <path d="M 28.8 21.6 
-L 547.2 21.6 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
-   </g>
-   <g id="matplotlib.axis_1">
-    <g id="xtick_1">
-     <g id="line2d_1">
-      <defs>
-       <path d="M 0 0 
-L 0 -4 
-" id="m95e439c71b" style="stroke:#000000;stroke-width:0.5;"/>
-      </defs>
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="28.8" xlink:href="#m95e439c71b" y="64.8"/>
-      </g>
-     </g>
-     <g id="line2d_2">
-      <defs>
-       <path d="M 0 0 
-L 0 4 
-" id="macf5089065" style="stroke:#000000;stroke-width:0.5;"/>
-      </defs>
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="28.8" xlink:href="#macf5089065" y="21.6"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_2">
-     <g id="line2d_3">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="93.6" xlink:href="#m95e439c71b" y="64.8"/>
-      </g>
-     </g>
-     <g id="line2d_4">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="93.6" xlink:href="#macf5089065" y="21.6"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_3">
-     <g id="line2d_5">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="158.4" xlink:href="#m95e439c71b" y="64.8"/>
-      </g>
-     </g>
-     <g id="line2d_6">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="158.4" xlink:href="#macf5089065" y="21.6"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_4">
-     <g id="line2d_7">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="223.2" xlink:href="#m95e439c71b" y="64.8"/>
-      </g>
-     </g>
-     <g id="line2d_8">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="223.2" xlink:href="#macf5089065" y="21.6"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_5">
-     <g id="line2d_9">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="288" xlink:href="#m95e439c71b" y="64.8"/>
-      </g>
-     </g>
-     <g id="line2d_10">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="288" xlink:href="#macf5089065" y="21.6"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_6">
-     <g id="line2d_11">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="352.8" xlink:href="#m95e439c71b" y="64.8"/>
-      </g>
-     </g>
-     <g id="line2d_12">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="352.8" xlink:href="#macf5089065" y="21.6"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_7">
-     <g id="line2d_13">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="417.6" xlink:href="#m95e439c71b" y="64.8"/>
-      </g>
-     </g>
-     <g id="line2d_14">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="417.6" xlink:href="#macf5089065" y="21.6"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_8">
-     <g id="line2d_15">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="482.4" xlink:href="#m95e439c71b" y="64.8"/>
-      </g>
-     </g>
-     <g id="line2d_16">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="482.4" xlink:href="#macf5089065" y="21.6"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_9">
-     <g id="line2d_17">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="547.2" xlink:href="#m95e439c71b" y="64.8"/>
-      </g>
-     </g>
-     <g id="line2d_18">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="547.2" xlink:href="#macf5089065" y="21.6"/>
-      </g>
-     </g>
-    </g>
-   </g>
-   <g id="matplotlib.axis_2">
-    <g id="ytick_1">
-     <g id="line2d_19">
-      <defs>
-       <path d="M 0 0 
-L 4 0 
-" id="mbbe5a955aa" style="stroke:#000000;stroke-width:0.5;"/>
-      </defs>
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="28.8" xlink:href="#mbbe5a955aa" y="64.8"/>
-      </g>
-     </g>
-     <g id="line2d_20">
-      <defs>
-       <path d="M 0 0 
-L -4 0 
-" id="m9b3b62e745" style="stroke:#000000;stroke-width:0.5;"/>
-      </defs>
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="547.2" xlink:href="#m9b3b62e745" y="64.8"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_2">
-     <g id="line2d_21">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="28.8" xlink:href="#mbbe5a955aa" y="59.4"/>
-      </g>
-     </g>
-     <g id="line2d_22">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="547.2" xlink:href="#m9b3b62e745" y="59.4"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_3">
-     <g id="line2d_23">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="28.8" xlink:href="#mbbe5a955aa" y="54"/>
-      </g>
-     </g>
-     <g id="line2d_24">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="547.2" xlink:href="#m9b3b62e745" y="54"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_4">
-     <g id="line2d_25">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="28.8" xlink:href="#mbbe5a955aa" y="48.6"/>
-      </g>
-     </g>
-     <g id="line2d_26">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="547.2" xlink:href="#m9b3b62e745" y="48.6"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_5">
-     <g id="line2d_27">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="28.8" xlink:href="#mbbe5a955aa" y="43.2"/>
-      </g>
-     </g>
-     <g id="line2d_28">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="547.2" xlink:href="#m9b3b62e745" y="43.2"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_6">
-     <g id="line2d_29">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="28.8" xlink:href="#mbbe5a955aa" y="37.8"/>
-      </g>
-     </g>
-     <g id="line2d_30">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="547.2" xlink:href="#m9b3b62e745" y="37.8"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_7">
-     <g id="line2d_31">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="28.8" xlink:href="#mbbe5a955aa" y="32.4"/>
-      </g>
-     </g>
-     <g id="line2d_32">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="547.2" xlink:href="#m9b3b62e745" y="32.4"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_8">
-     <g id="line2d_33">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="28.8" xlink:href="#mbbe5a955aa" y="27"/>
-      </g>
-     </g>
-     <g id="line2d_34">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="547.2" xlink:href="#m9b3b62e745" y="27"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_9">
-     <g id="line2d_35">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="28.8" xlink:href="#mbbe5a955aa" y="21.6"/>
-      </g>
-     </g>
-     <g id="line2d_36">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="547.2" xlink:href="#m9b3b62e745" y="21.6"/>
-      </g>
-     </g>
-    </g>
-   </g>
-  </g>
-  <g id="axes_2">
-   <g id="patch_7">
-    <path clip-path="url(#p1884bf2a6f)" d="M 57.6 129.6 
-L 165.6 151.2 
-L 381.6 151.2 
-L 489.6 129.6 
-L 489.6 129.6 
-L 381.6 108 
-L 165.6 108 
-L 57.6 129.6 
-z
-" style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:miter;stroke-width:0.01;"/>
-   </g>
-   <g id="QuadMesh_2">
-    <path clip-path="url(#p1884bf2a6f)" d="M 57.6 129.6 
-L 165.6 151.2 
-L 165.6 108 
-L 57.6 129.6 
-L 57.6 129.6 
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p1884bf2a6f)" d="M 165.6 151.2 
-L 237.6 151.2 
-L 237.6 108 
-L 165.6 108 
-L 165.6 151.2 
-" style="fill:#e58267;"/>
-    <path clip-path="url(#p1884bf2a6f)" d="M 237.6 151.2 
-L 309.6 151.2 
-L 309.6 108 
-L 237.6 108 
-L 237.6 151.2 
-" style="fill:#f7f7f7;"/>
-    <path clip-path="url(#p1884bf2a6f)" d="M 309.6 151.2 
-L 381.6 151.2 
-L 381.6 108 
-L 309.6 108 
-L 309.6 151.2 
-" style="fill:#6bacd0;"/>
-    <path clip-path="url(#p1884bf2a6f)" d="M 381.6 151.2 
-L 489.6 129.6 
-L 489.6 129.6 
-L 381.6 108 
-L 381.6 151.2 
-" style="fill:#053061;"/>
-   </g>
-   <g id="patch_8">
-    <path d="M 57.6 129.6 
-L 165.6 151.2 
-L 381.6 151.2 
-L 489.6 129.6 
-L 489.6 129.6 
-L 381.6 108 
-L 165.6 108 
-L 57.6 129.6 
-L 57.6 129.6 
-z
-" style="fill:none;stroke:#000000;stroke-linejoin:miter;stroke-width:16;"/>
-   </g>
-   <g id="matplotlib.axis_3"/>
-   <g id="matplotlib.axis_4"/>
-  </g>
-  <g id="axes_3">
-   <g id="patch_9">
-    <path clip-path="url(#pf26cb61cd5)" d="M 28.8 216 
-L 52.363636 237.6 
-L 523.636364 237.6 
-L 547.2 216 
-L 547.2 216 
-L 523.636364 194.4 
-L 52.363636 194.4 
-L 28.8 216 
-z
-" style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:miter;stroke-width:0.01;"/>
-   </g>
-   <g id="QuadMesh_3">
-    <path clip-path="url(#pf26cb61cd5)" d="M 28.8 216 
-L 52.363636 237.6 
-L 52.363636 194.4 
-L 28.8 216 
-L 28.8 216 
-" style="fill:#67001f;"/>
-    <path clip-path="url(#pf26cb61cd5)" d="M 52.363636 237.6 
-L 209.454545 237.6 
-L 209.454545 194.4 
-L 52.363636 194.4 
-L 52.363636 237.6 
-" style="fill:#e58267;"/>
-    <path clip-path="url(#pf26cb61cd5)" d="M 209.454545 237.6 
-L 366.545455 237.6 
-L 366.545455 194.4 
-L 209.454545 194.4 
-L 209.454545 237.6 
-" style="fill:#f7f7f7;"/>
-    <path clip-path="url(#pf26cb61cd5)" d="M 366.545455 237.6 
-L 523.636364 237.6 
-L 523.636364 194.4 
-L 366.545455 194.4 
-L 366.545455 237.6 
-" style="fill:#6bacd0;"/>
-    <path clip-path="url(#pf26cb61cd5)" d="M 523.636364 237.6 
-L 547.2 216 
-L 547.2 216 
-L 523.636364 194.4 
-L 523.636364 237.6 
-" style="fill:#053061;"/>
-   </g>
-   <g id="patch_10">
-    <path d="M 28.8 216 
-L 52.363636 237.6 
-L 523.636364 237.6 
-L 547.2 216 
-L 547.2 216 
-L 523.636364 194.4 
-L 52.363636 194.4 
-L 28.8 216 
-L 28.8 216 
-z
-" style="fill:none;stroke:#000000;stroke-linejoin:miter;stroke-width:16;"/>
-   </g>
-   <g id="matplotlib.axis_5"/>
-   <g id="matplotlib.axis_6"/>
-  </g>
-  <g id="axes_4">
-   <g id="patch_11">
-    <path clip-path="url(#p7dd4feaa2e)" d="M 28.8 324 
-L 52.363636 324 
-L 523.636364 324 
-L 547.2 324 
-L 547.2 280.8 
-L 523.636364 280.8 
-L 52.363636 280.8 
-L 28.8 280.8 
-z
-" style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:miter;stroke-width:0.01;"/>
-   </g>
-   <g id="QuadMesh_4">
-    <path clip-path="url(#p7dd4feaa2e)" d="M 28.8 324 
-L 52.363636 324 
-L 52.363636 280.8 
-L 28.8 280.8 
-L 28.8 324 
-" style="fill:#67001f;"/>
-    <path clip-path="url(#p7dd4feaa2e)" d="M 52.363636 324 
-L 209.454545 324 
-L 209.454545 280.8 
-L 52.363636 280.8 
-L 52.363636 324 
-" style="fill:#e58267;"/>
-    <path clip-path="url(#p7dd4feaa2e)" d="M 209.454545 324 
-L 366.545455 324 
-L 366.545455 280.8 
-L 209.454545 280.8 
-L 209.454545 324 
-" style="fill:#f7f7f7;"/>
-    <path clip-path="url(#p7dd4feaa2e)" d="M 366.545455 324 
-L 523.636364 324 
-L 523.636364 280.8 
-L 366.545455 280.8 
-L 366.545455 324 
-" style="fill:#6bacd0;"/>
-    <path clip-path="url(#p7dd4feaa2e)" d="M 523.636364 324 
-L 547.2 324 
-L 547.2 280.8 
-L 523.636364 280.8 
-L 523.636364 324 
-" style="fill:#053061;"/>
-   </g>
-   <g id="patch_12">
-    <path d="M 28.8 324 
-L 52.363636 324 
-L 523.636364 324 
-L 547.2 324 
-L 547.2 280.8 
-L 523.636364 280.8 
-L 52.363636 280.8 
-L 28.8 280.8 
-L 28.8 324 
-z
-" style="fill:none;stroke:#000000;stroke-linejoin:miter;stroke-width:16;"/>
-   </g>
-   <g id="matplotlib.axis_7"/>
-   <g id="matplotlib.axis_8"/>
-  </g>
-  <g id="axes_5">
-   <g id="patch_13">
-    <path clip-path="url(#pd759a2c3ef)" d="M 28.8 410.4 
-L 132.48 410.4 
-L 443.52 410.4 
-L 547.2 410.4 
-L 547.2 367.2 
-L 443.52 367.2 
-L 132.48 367.2 
-L 28.8 367.2 
-z
-" style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:miter;stroke-width:0.01;"/>
-   </g>
-   <g id="QuadMesh_5">
-    <path clip-path="url(#pd759a2c3ef)" d="M 28.8 410.4 
-L 132.48 410.4 
-L 132.48 367.2 
-L 28.8 367.2 
-L 28.8 410.4 
-" style="fill:#67001f;"/>
-    <path clip-path="url(#pd759a2c3ef)" d="M 132.48 410.4 
-L 236.16 410.4 
-L 236.16 367.2 
-L 132.48 367.2 
-L 132.48 410.4 
-" style="fill:#e58267;"/>
-    <path clip-path="url(#pd759a2c3ef)" d="M 236.16 410.4 
-L 339.84 410.4 
-L 339.84 367.2 
-L 236.16 367.2 
-L 236.16 410.4 
-" style="fill:#f7f7f7;"/>
-    <path clip-path="url(#pd759a2c3ef)" d="M 339.84 410.4 
-L 443.52 410.4 
-L 443.52 367.2 
-L 339.84 367.2 
-L 339.84 410.4 
-" style="fill:#6bacd0;"/>
-    <path clip-path="url(#pd759a2c3ef)" d="M 443.52 410.4 
-L 547.2 410.4 
-L 547.2 367.2 
-L 443.52 367.2 
-L 443.52 410.4 
-" style="fill:#053061;"/>
-   </g>
-   <g id="patch_14">
-    <path d="M 28.8 410.4 
-L 132.48 410.4 
-L 443.52 410.4 
-L 547.2 410.4 
-L 547.2 367.2 
-L 443.52 367.2 
-L 132.48 367.2 
-L 28.8 367.2 
-L 28.8 410.4 
-z
-" style="fill:none;stroke:#000000;stroke-linejoin:miter;stroke-width:16;"/>
-   </g>
-   <g id="matplotlib.axis_9"/>
-   <g id="matplotlib.axis_10"/>
-  </g>
- </g>
- <defs>
-  <clipPath id="p3d4ec13d54">
-   <rect height="43.2" width="518.4" x="28.8" y="21.6"/>
-  </clipPath>
-  <clipPath id="p1884bf2a6f">
-   <rect height="43.2" width="432" x="57.6" y="108"/>
-  </clipPath>
-  <clipPath id="pf26cb61cd5">
-   <rect height="43.2" width="518.4" x="28.8" y="194.4"/>
-  </clipPath>
-  <clipPath id="p7dd4feaa2e">
-   <rect height="43.2" width="518.4" x="28.8" y="280.8"/>
-  </clipPath>
-  <clipPath id="pd759a2c3ef">
-   <rect height="43.2" width="518.4" x="28.8" y="367.2"/>
-  </clipPath>
- </defs>
-</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_extensions_proportional.png b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_extensions_proportional.png
index 9f2067a45a40..230f8d7332ba 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_extensions_proportional.png and b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_extensions_proportional.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_extensions_shape_proportional.png b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_extensions_shape_proportional.png
index d68d71bb2d0e..7dbdbbd9b767 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_extensions_shape_proportional.png and b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_extensions_shape_proportional.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_extensions_shape_uniform.png b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_extensions_shape_uniform.png
index c4e72454cd4f..eb1e8b82bf02 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_extensions_shape_uniform.png and b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_extensions_shape_uniform.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_extensions_uniform.png b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_extensions_uniform.png
index 4a10633a6253..86e4094208d6 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_extensions_uniform.png and b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_extensions_uniform.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_keeping_xlabel.png b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_keeping_xlabel.png
new file mode 100644
index 000000000000..382e3f04c819
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_keeping_xlabel.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_single_scatter.png b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_single_scatter.png
index 63a58245f7e0..18d9cf02add0 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_single_scatter.png and b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_single_scatter.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_twoslope.png b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_twoslope.png
new file mode 100644
index 000000000000..b92103ae1347
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_colorbar/colorbar_twoslope.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/contour_colorbar.png b/lib/matplotlib/tests/baseline_images/test_colorbar/contour_colorbar.png
new file mode 100644
index 000000000000..bf084c30ddad
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_colorbar/contour_colorbar.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/contourf_extend_patches.png b/lib/matplotlib/tests/baseline_images/test_colorbar/contourf_extend_patches.png
new file mode 100644
index 000000000000..0e5ef52cf549
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_colorbar/contourf_extend_patches.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/double_cbar.png b/lib/matplotlib/tests/baseline_images/test_colorbar/double_cbar.png
index 2ddb219eda3a..b139a4664c17 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_colorbar/double_cbar.png and b/lib/matplotlib/tests/baseline_images/test_colorbar/double_cbar.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/extend_drawedges.png b/lib/matplotlib/tests/baseline_images/test_colorbar/extend_drawedges.png
new file mode 100644
index 000000000000..864eeefbae10
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_colorbar/extend_drawedges.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/nonorm_colorbars.svg b/lib/matplotlib/tests/baseline_images/test_colorbar/nonorm_colorbars.svg
new file mode 100644
index 000000000000..85f92c3c8d64
--- /dev/null
+++ b/lib/matplotlib/tests/baseline_images/test_colorbar/nonorm_colorbars.svg
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" width="432pt" height="72pt" viewBox="0 0 432 72" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <metadata>
+  <rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+   <cc:Work>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:date>2021-12-06T14:23:33.155376</dc:date>
+    <dc:format>image/svg+xml</dc:format>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Matplotlib v3.6.0.dev954+ged9e9c2ef2.d20211206, https://matplotlib.org/</dc:title>
+     </cc:Agent>
+    </dc:creator>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <defs>
+  <style type="text/css">*{stroke-linejoin: round; stroke-linecap: butt}</style>
+ </defs>
+ <g id="figure_1">
+  <g id="patch_1">
+   <path d="M 0 72 
+L 432 72 
+L 432 0 
+L 0 0 
+z
+" style="fill: #ffffff"/>
+  </g>
+  <g id="axes_1">
+   <g id="patch_2">
+    <path d="M 54 36 
+L 388.8 36 
+L 388.8 8.64 
+L 54 8.64 
+z
+" style="fill: #ffffff"/>
+   </g>
+   <g id="patch_3">
+    <path clip-path="url(#pb535666b66)" style="fill: #ffffff; stroke: #ffffff; stroke-width: 0.01; stroke-linejoin: miter"/>
+   </g>
+   <g id="QuadMesh_1">
+    <path d="M 54 36 
+L 54 8.64 
+L 120.96 8.64 
+L 120.96 36 
+L 54 36 
+" clip-path="url(#pb535666b66)" style="fill: #440154"/>
+    <path d="M 120.96 36 
+L 120.96 8.64 
+L 187.92 8.64 
+L 187.92 36 
+L 120.96 36 
+" clip-path="url(#pb535666b66)" style="fill: #3b528b"/>
+    <path d="M 187.92 36 
+L 187.92 8.64 
+L 254.88 8.64 
+L 254.88 36 
+L 187.92 36 
+" clip-path="url(#pb535666b66)" style="fill: #21918c"/>
+    <path d="M 254.88 36 
+L 254.88 8.64 
+L 321.84 8.64 
+L 321.84 36 
+L 254.88 36 
+" clip-path="url(#pb535666b66)" style="fill: #5ec962"/>
+    <path d="M 321.84 36 
+L 321.84 8.64 
+L 388.8 8.64 
+L 388.8 36 
+L 321.84 36 
+" clip-path="url(#pb535666b66)" style="fill: #fde725"/>
+   </g>
+   <g id="matplotlib.axis_1">
+    <g id="xtick_1">
+     <g id="line2d_1">
+      <defs>
+       <path id="m11ebc9ebd0" d="M 0 0 
+L 0 3.5 
+" style="stroke: #000000; stroke-width: 0.8"/>
+      </defs>
+      <g>
+       <use xlink:href="#m11ebc9ebd0" x="87.48" y="36" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+     <g id="text_1">
+      <text style="font: 10px 'DejaVu Sans'; text-anchor: middle" x="87.48" y="50.598438" transform="rotate(-0 87.48 50.598438)">0</text>
+     </g>
+    </g>
+    <g id="xtick_2">
+     <g id="line2d_2">
+      <g>
+       <use xlink:href="#m11ebc9ebd0" x="154.44" y="36" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+     <g id="text_2">
+      <text style="font: 10px 'DejaVu Sans'; text-anchor: middle" x="154.44" y="50.598438" transform="rotate(-0 154.44 50.598438)">1</text>
+     </g>
+    </g>
+    <g id="xtick_3">
+     <g id="line2d_3">
+      <g>
+       <use xlink:href="#m11ebc9ebd0" x="221.4" y="36" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+     <g id="text_3">
+      <text style="font: 10px 'DejaVu Sans'; text-anchor: middle" x="221.4" y="50.598438" transform="rotate(-0 221.4 50.598438)">2</text>
+     </g>
+    </g>
+    <g id="xtick_4">
+     <g id="line2d_4">
+      <g>
+       <use xlink:href="#m11ebc9ebd0" x="288.36" y="36" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+     <g id="text_4">
+      <text style="font: 10px 'DejaVu Sans'; text-anchor: middle" x="288.36" y="50.598438" transform="rotate(-0 288.36 50.598438)">3</text>
+     </g>
+    </g>
+    <g id="xtick_5">
+     <g id="line2d_5">
+      <g>
+       <use xlink:href="#m11ebc9ebd0" x="355.32" y="36" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+     <g id="text_5">
+      <text style="font: 10px 'DejaVu Sans'; text-anchor: middle" x="355.32" y="50.598438" transform="rotate(-0 355.32 50.598438)">4</text>
+     </g>
+    </g>
+   </g>
+   <g id="LineCollection_1"/>
+   <g id="patch_4">
+    <path d="M 54 36 
+L 54 22.32 
+L 54 8.64 
+L 388.8 8.64 
+L 388.8 22.32 
+L 388.8 36 
+L 54 36 
+z
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+  </g>
+ </g>
+ <defs>
+  <clipPath id="pb535666b66">
+   <rect x="54" y="8.64" width="334.8" height="27.36"/>
+  </clipPath>
+ </defs>
+</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/proportional_colorbars.png b/lib/matplotlib/tests/baseline_images/test_colorbar/proportional_colorbars.png
new file mode 100644
index 000000000000..a1f9745230ba
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_colorbar/proportional_colorbars.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/test_boundaries.png b/lib/matplotlib/tests/baseline_images/test_colorbar/test_boundaries.png
new file mode 100644
index 000000000000..e2e05a375742
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_colorbar/test_boundaries.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_colors/levels_and_colors.png b/lib/matplotlib/tests/baseline_images/test_colors/levels_and_colors.png
index bb759674e557..bb0e9a2538da 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_colors/levels_and_colors.png and b/lib/matplotlib/tests/baseline_images/test_colors/levels_and_colors.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout11.png b/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout11.png
index 514bf02ce13c..f337d370dc33 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout11.png and b/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout11.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout11rat.png b/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout11rat.png
index b674803ba2e8..534903300f7a 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout11rat.png and b/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout11rat.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout13.png b/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout13.png
index 5889b0583432..4233f58a8ce4 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout13.png and b/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout13.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout14.png b/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout14.png
index e030c3c9f6c1..cfe9dca14c88 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout14.png and b/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout14.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout3.png b/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout3.png
index c679609be54e..ae6420dd04e9 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout3.png and b/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout3.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout4.png b/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout4.png
index 2a6e55c08f64..ef6d9e417f91 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout4.png and b/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout4.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout5.png b/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout5.png
index af691c44867d..89e71b765154 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout5.png and b/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout5.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout8.png b/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout8.png
index 757230e25363..a239947ca46c 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout8.png and b/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout8.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout9.png b/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout9.png
index 59fd2c76c5bc..2ac44b8a18ac 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout9.png and b/lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout9.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_contour/contour_addlines.png b/lib/matplotlib/tests/baseline_images/test_contour/contour_addlines.png
index 2115054d13b2..07a442841e95 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_contour/contour_addlines.png and b/lib/matplotlib/tests/baseline_images/test_contour/contour_addlines.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_contour/contour_all_algorithms.png b/lib/matplotlib/tests/baseline_images/test_contour/contour_all_algorithms.png
new file mode 100644
index 000000000000..1ef0c15a678f
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_contour/contour_all_algorithms.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_contour/contour_closed_line_loop.png b/lib/matplotlib/tests/baseline_images/test_contour/contour_closed_line_loop.png
new file mode 100644
index 000000000000..2e8e73a8f1a1
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_contour/contour_closed_line_loop.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_contour/contour_line_start_on_corner_edge.png b/lib/matplotlib/tests/baseline_images/test_contour/contour_line_start_on_corner_edge.png
new file mode 100644
index 000000000000..d8af58f80eaf
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_contour/contour_line_start_on_corner_edge.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_contour/contour_log_extension.png b/lib/matplotlib/tests/baseline_images/test_contour/contour_log_extension.png
index c1feda1e9cba..316b6370edca 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_contour/contour_log_extension.png and b/lib/matplotlib/tests/baseline_images/test_contour/contour_log_extension.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_contour/contour_manual.png b/lib/matplotlib/tests/baseline_images/test_contour/contour_manual.png
new file mode 100644
index 000000000000..c98879360c45
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_contour/contour_manual.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_contour/contour_manual_colors_and_levels.png b/lib/matplotlib/tests/baseline_images/test_contour/contour_manual_colors_and_levels.png
index 632d1f7e7594..b01bcb239535 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_contour/contour_manual_colors_and_levels.png and b/lib/matplotlib/tests/baseline_images/test_contour/contour_manual_colors_and_levels.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_dates/date_empty.png b/lib/matplotlib/tests/baseline_images/test_dates/date_empty.png
deleted file mode 100644
index 4bb9efcba428..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_dates/date_empty.png and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_figure/test_subfigure_double.png b/lib/matplotlib/tests/baseline_images/test_figure/test_subfigure_double.png
index 1a1ac9fd74f7..594ce7d4e72f 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_figure/test_subfigure_double.png and b/lib/matplotlib/tests/baseline_images/test_figure/test_subfigure_double.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_figure/test_subfigure_scatter_size.png b/lib/matplotlib/tests/baseline_images/test_figure/test_subfigure_scatter_size.png
new file mode 100644
index 000000000000..c193b5d0ec22
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_figure/test_subfigure_scatter_size.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_image/mask_image_over_under.png b/lib/matplotlib/tests/baseline_images/test_image/mask_image_over_under.png
index 904e0c3d44a0..f416faa96d5f 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_image/mask_image_over_under.png and b/lib/matplotlib/tests/baseline_images/test_image/mask_image_over_under.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_image/nonuniform_and_pcolor.png b/lib/matplotlib/tests/baseline_images/test_image/nonuniform_and_pcolor.png
new file mode 100644
index 000000000000..cb0aa4815c4e
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_image/nonuniform_and_pcolor.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_image/rgba_antialias.png b/lib/matplotlib/tests/baseline_images/test_image/rgba_antialias.png
new file mode 100644
index 000000000000..65476dc9a595
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_image/rgba_antialias.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_legend/fancy.pdf b/lib/matplotlib/tests/baseline_images/test_legend/fancy.pdf
index 7930f6d68249..b0fb8a4af7f2 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_legend/fancy.pdf and b/lib/matplotlib/tests/baseline_images/test_legend/fancy.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_legend/fancy.png b/lib/matplotlib/tests/baseline_images/test_legend/fancy.png
index aba46e19e727..fbb827bbefa5 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_legend/fancy.png and b/lib/matplotlib/tests/baseline_images/test_legend/fancy.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_legend/fancy.svg b/lib/matplotlib/tests/baseline_images/test_legend/fancy.svg
index 427ab827f4a1..9e56f5ed36bb 100644
--- a/lib/matplotlib/tests/baseline_images/test_legend/fancy.svg
+++ b/lib/matplotlib/tests/baseline_images/test_legend/fancy.svg
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (http://matplotlib.org/) -->
 <svg height="432pt" version="1.1" viewBox="0 0 576 432" width="576pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <metadata>
+  <rdf:RDF xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+   <cc:Work>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:date>2020-08-07T20:03:21.839839</dc:date>
+    <dc:format>image/svg+xml</dc:format>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Matplotlib v3.3.0rc1.post625.dev0+gf3ab37aad, https://matplotlib.org/</dc:title>
+     </cc:Agent>
+    </dc:creator>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="patch_1">
@@ -38,191 +49,191 @@ C -2.000462 -1.161816 -2.236068 -0.593012 -2.236068 0
 C -2.236068 0.593012 -2.000462 1.161816 -1.581139 1.581139 
 C -1.161816 2.000462 -0.593012 2.236068 0 2.236068 
 z
-" id="m27675ac663" style="stroke:#000000;"/>
+" id="ma203e0a9bc" style="stroke:#000000;"/>
     </defs>
-    <g clip-path="url(#p99d3117ecb)">
-     <use style="fill:#0000ff;stroke:#000000;" x="105.818182" xlink:href="#m27675ac663" y="92.571429"/>
-     <use style="fill:#0000ff;stroke:#000000;" x="122.727273" xlink:href="#m27675ac663" y="117.257143"/>
-     <use style="fill:#0000ff;stroke:#000000;" x="139.636364" xlink:href="#m27675ac663" y="141.942857"/>
-     <use style="fill:#0000ff;stroke:#000000;" x="156.545455" xlink:href="#m27675ac663" y="166.628571"/>
-     <use style="fill:#0000ff;stroke:#000000;" x="173.454545" xlink:href="#m27675ac663" y="191.314286"/>
-     <use style="fill:#0000ff;stroke:#000000;" x="190.363636" xlink:href="#m27675ac663" y="216"/>
-     <use style="fill:#0000ff;stroke:#000000;" x="207.272727" xlink:href="#m27675ac663" y="240.685714"/>
-     <use style="fill:#0000ff;stroke:#000000;" x="224.181818" xlink:href="#m27675ac663" y="265.371429"/>
-     <use style="fill:#0000ff;stroke:#000000;" x="241.090909" xlink:href="#m27675ac663" y="290.057143"/>
-     <use style="fill:#0000ff;stroke:#000000;" x="258" xlink:href="#m27675ac663" y="314.742857"/>
+    <g clip-path="url(#p2af230b5c1)">
+     <use style="fill:#0000ff;stroke:#000000;" x="105.818182" xlink:href="#ma203e0a9bc" y="92.571429"/>
+     <use style="fill:#0000ff;stroke:#000000;" x="122.727273" xlink:href="#ma203e0a9bc" y="117.257143"/>
+     <use style="fill:#0000ff;stroke:#000000;" x="139.636364" xlink:href="#ma203e0a9bc" y="141.942857"/>
+     <use style="fill:#0000ff;stroke:#000000;" x="156.545455" xlink:href="#ma203e0a9bc" y="166.628571"/>
+     <use style="fill:#0000ff;stroke:#000000;" x="173.454545" xlink:href="#ma203e0a9bc" y="191.314286"/>
+     <use style="fill:#0000ff;stroke:#000000;" x="190.363636" xlink:href="#ma203e0a9bc" y="216"/>
+     <use style="fill:#0000ff;stroke:#000000;" x="207.272727" xlink:href="#ma203e0a9bc" y="240.685714"/>
+     <use style="fill:#0000ff;stroke:#000000;" x="224.181818" xlink:href="#ma203e0a9bc" y="265.371429"/>
+     <use style="fill:#0000ff;stroke:#000000;" x="241.090909" xlink:href="#ma203e0a9bc" y="290.057143"/>
+     <use style="fill:#0000ff;stroke:#000000;" x="258" xlink:href="#ma203e0a9bc" y="314.742857"/>
+    </g>
+   </g>
+   <g id="line2d_1">
+    <path clip-path="url(#p2af230b5c1)" d="M 105.818182 216 
+L 122.727273 216 
+L 139.636364 216 
+L 156.545455 216 
+L 173.454545 216 
+L 190.363636 216 
+L 207.272727 216 
+L 224.181818 216 
+L 241.090909 216 
+L 258 216 
+" style="fill:none;stroke:#0000ff;stroke-dasharray:6,6;stroke-dashoffset:0;"/>
+    <defs>
+     <path d="M 0 3 
+C 0.795609 3 1.55874 2.683901 2.12132 2.12132 
+C 2.683901 1.55874 3 0.795609 3 0 
+C 3 -0.795609 2.683901 -1.55874 2.12132 -2.12132 
+C 1.55874 -2.683901 0.795609 -3 0 -3 
+C -0.795609 -3 -1.55874 -2.683901 -2.12132 -2.12132 
+C -2.683901 -1.55874 -3 -0.795609 -3 0 
+C -3 0.795609 -2.683901 1.55874 -2.12132 2.12132 
+C -1.55874 2.683901 -0.795609 3 0 3 
+z
+" id="m7cc53e241f" style="stroke:#000000;stroke-width:0.5;"/>
+    </defs>
+    <g clip-path="url(#p2af230b5c1)">
+     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="105.818182" xlink:href="#m7cc53e241f" y="216"/>
+     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="122.727273" xlink:href="#m7cc53e241f" y="216"/>
+     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="139.636364" xlink:href="#m7cc53e241f" y="216"/>
+     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="156.545455" xlink:href="#m7cc53e241f" y="216"/>
+     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="173.454545" xlink:href="#m7cc53e241f" y="216"/>
+     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="190.363636" xlink:href="#m7cc53e241f" y="216"/>
+     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="207.272727" xlink:href="#m7cc53e241f" y="216"/>
+     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="224.181818" xlink:href="#m7cc53e241f" y="216"/>
+     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="241.090909" xlink:href="#m7cc53e241f" y="216"/>
+     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="258" xlink:href="#m7cc53e241f" y="216"/>
     </g>
    </g>
    <g id="LineCollection_1">
-    <path clip-path="url(#p99d3117ecb)" d="M 97.363636 339.428571 
+    <path clip-path="url(#p2af230b5c1)" d="M 97.363636 339.428571 
 L 114.272727 339.428571 
 " style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p99d3117ecb)" d="M 114.272727 314.742857 
+    <path clip-path="url(#p2af230b5c1)" d="M 114.272727 314.742857 
 L 131.181818 314.742857 
 " style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p99d3117ecb)" d="M 131.181818 290.057143 
+    <path clip-path="url(#p2af230b5c1)" d="M 131.181818 290.057143 
 L 148.090909 290.057143 
 " style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p99d3117ecb)" d="M 148.090909 265.371429 
+    <path clip-path="url(#p2af230b5c1)" d="M 148.090909 265.371429 
 L 165 265.371429 
 " style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p99d3117ecb)" d="M 165 240.685714 
+    <path clip-path="url(#p2af230b5c1)" d="M 165 240.685714 
 L 181.909091 240.685714 
 " style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p99d3117ecb)" d="M 181.909091 216 
+    <path clip-path="url(#p2af230b5c1)" d="M 181.909091 216 
 L 198.818182 216 
 " style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p99d3117ecb)" d="M 198.818182 191.314286 
+    <path clip-path="url(#p2af230b5c1)" d="M 198.818182 191.314286 
 L 215.727273 191.314286 
 " style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p99d3117ecb)" d="M 215.727273 166.628571 
+    <path clip-path="url(#p2af230b5c1)" d="M 215.727273 166.628571 
 L 232.636364 166.628571 
 " style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p99d3117ecb)" d="M 232.636364 141.942857 
+    <path clip-path="url(#p2af230b5c1)" d="M 232.636364 141.942857 
 L 249.545455 141.942857 
 " style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p99d3117ecb)" d="M 249.545455 117.257143 
+    <path clip-path="url(#p2af230b5c1)" d="M 249.545455 117.257143 
 L 266.454545 117.257143 
 " style="fill:none;stroke:#008000;"/>
    </g>
    <g id="LineCollection_2">
-    <path clip-path="url(#p99d3117ecb)" d="M 105.818182 351.771429 
+    <path clip-path="url(#p2af230b5c1)" d="M 105.818182 351.771429 
 L 105.818182 327.085714 
 " style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p99d3117ecb)" d="M 122.727273 327.085714 
+    <path clip-path="url(#p2af230b5c1)" d="M 122.727273 327.085714 
 L 122.727273 302.4 
 " style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p99d3117ecb)" d="M 139.636364 302.4 
+    <path clip-path="url(#p2af230b5c1)" d="M 139.636364 302.4 
 L 139.636364 277.714286 
 " style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p99d3117ecb)" d="M 156.545455 277.714286 
+    <path clip-path="url(#p2af230b5c1)" d="M 156.545455 277.714286 
 L 156.545455 253.028571 
 " style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p99d3117ecb)" d="M 173.454545 253.028571 
+    <path clip-path="url(#p2af230b5c1)" d="M 173.454545 253.028571 
 L 173.454545 228.342857 
 " style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p99d3117ecb)" d="M 190.363636 228.342857 
+    <path clip-path="url(#p2af230b5c1)" d="M 190.363636 228.342857 
 L 190.363636 203.657143 
 " style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p99d3117ecb)" d="M 207.272727 203.657143 
+    <path clip-path="url(#p2af230b5c1)" d="M 207.272727 203.657143 
 L 207.272727 178.971429 
 " style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p99d3117ecb)" d="M 224.181818 178.971429 
+    <path clip-path="url(#p2af230b5c1)" d="M 224.181818 178.971429 
 L 224.181818 154.285714 
 " style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p99d3117ecb)" d="M 241.090909 154.285714 
+    <path clip-path="url(#p2af230b5c1)" d="M 241.090909 154.285714 
 L 241.090909 129.6 
 " style="fill:none;stroke:#008000;"/>
-    <path clip-path="url(#p99d3117ecb)" d="M 258 129.6 
+    <path clip-path="url(#p2af230b5c1)" d="M 258 129.6 
 L 258 104.914286 
 " style="fill:none;stroke:#008000;"/>
    </g>
-   <g id="line2d_1">
-    <path clip-path="url(#p99d3117ecb)" d="M 105.818182 216 
-L 122.727273 216 
-L 139.636364 216 
-L 156.545455 216 
-L 173.454545 216 
-L 190.363636 216 
-L 207.272727 216 
-L 224.181818 216 
-L 241.090909 216 
-L 258 216 
-" style="fill:none;stroke:#0000ff;stroke-dasharray:6,6;stroke-dashoffset:0;"/>
-    <defs>
-     <path d="M 0 3 
-C 0.795609 3 1.55874 2.683901 2.12132 2.12132 
-C 2.683901 1.55874 3 0.795609 3 0 
-C 3 -0.795609 2.683901 -1.55874 2.12132 -2.12132 
-C 1.55874 -2.683901 0.795609 -3 0 -3 
-C -0.795609 -3 -1.55874 -2.683901 -2.12132 -2.12132 
-C -2.683901 -1.55874 -3 -0.795609 -3 0 
-C -3 0.795609 -2.683901 1.55874 -2.12132 2.12132 
-C -1.55874 2.683901 -0.795609 3 0 3 
-z
-" id="m83e9afba35" style="stroke:#000000;stroke-width:0.5;"/>
-    </defs>
-    <g clip-path="url(#p99d3117ecb)">
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="105.818182" xlink:href="#m83e9afba35" y="216"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="122.727273" xlink:href="#m83e9afba35" y="216"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="139.636364" xlink:href="#m83e9afba35" y="216"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="156.545455" xlink:href="#m83e9afba35" y="216"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="173.454545" xlink:href="#m83e9afba35" y="216"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="190.363636" xlink:href="#m83e9afba35" y="216"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="207.272727" xlink:href="#m83e9afba35" y="216"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="224.181818" xlink:href="#m83e9afba35" y="216"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="241.090909" xlink:href="#m83e9afba35" y="216"/>
-     <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="258" xlink:href="#m83e9afba35" y="216"/>
-    </g>
-   </g>
    <g id="line2d_2">
     <defs>
      <path d="M 0 3 
 L 0 -3 
-" id="m632805ea67" style="stroke:#008000;stroke-width:0.5;"/>
+" id="m8863516224" style="stroke:#008000;stroke-width:0.5;"/>
     </defs>
-    <g clip-path="url(#p99d3117ecb)">
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="97.363636" xlink:href="#m632805ea67" y="339.428571"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="114.272727" xlink:href="#m632805ea67" y="314.742857"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="131.181818" xlink:href="#m632805ea67" y="290.057143"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="148.090909" xlink:href="#m632805ea67" y="265.371429"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="165" xlink:href="#m632805ea67" y="240.685714"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="181.909091" xlink:href="#m632805ea67" y="216"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="198.818182" xlink:href="#m632805ea67" y="191.314286"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="215.727273" xlink:href="#m632805ea67" y="166.628571"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="232.636364" xlink:href="#m632805ea67" y="141.942857"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="249.545455" xlink:href="#m632805ea67" y="117.257143"/>
+    <g clip-path="url(#p2af230b5c1)">
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="97.363636" xlink:href="#m8863516224" y="339.428571"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="114.272727" xlink:href="#m8863516224" y="314.742857"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="131.181818" xlink:href="#m8863516224" y="290.057143"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="148.090909" xlink:href="#m8863516224" y="265.371429"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="165" xlink:href="#m8863516224" y="240.685714"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="181.909091" xlink:href="#m8863516224" y="216"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="198.818182" xlink:href="#m8863516224" y="191.314286"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="215.727273" xlink:href="#m8863516224" y="166.628571"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="232.636364" xlink:href="#m8863516224" y="141.942857"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="249.545455" xlink:href="#m8863516224" y="117.257143"/>
     </g>
    </g>
    <g id="line2d_3">
-    <g clip-path="url(#p99d3117ecb)">
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="114.272727" xlink:href="#m632805ea67" y="339.428571"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="131.181818" xlink:href="#m632805ea67" y="314.742857"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="148.090909" xlink:href="#m632805ea67" y="290.057143"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="165" xlink:href="#m632805ea67" y="265.371429"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="181.909091" xlink:href="#m632805ea67" y="240.685714"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="198.818182" xlink:href="#m632805ea67" y="216"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="215.727273" xlink:href="#m632805ea67" y="191.314286"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="232.636364" xlink:href="#m632805ea67" y="166.628571"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="249.545455" xlink:href="#m632805ea67" y="141.942857"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="266.454545" xlink:href="#m632805ea67" y="117.257143"/>
+    <g clip-path="url(#p2af230b5c1)">
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="114.272727" xlink:href="#m8863516224" y="339.428571"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="131.181818" xlink:href="#m8863516224" y="314.742857"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="148.090909" xlink:href="#m8863516224" y="290.057143"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="165" xlink:href="#m8863516224" y="265.371429"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="181.909091" xlink:href="#m8863516224" y="240.685714"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="198.818182" xlink:href="#m8863516224" y="216"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="215.727273" xlink:href="#m8863516224" y="191.314286"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="232.636364" xlink:href="#m8863516224" y="166.628571"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="249.545455" xlink:href="#m8863516224" y="141.942857"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="266.454545" xlink:href="#m8863516224" y="117.257143"/>
     </g>
    </g>
    <g id="line2d_4">
     <defs>
      <path d="M 3 0 
 L -3 -0 
-" id="mf2f92b29a1" style="stroke:#008000;stroke-width:0.5;"/>
+" id="m6db69444d4" style="stroke:#008000;stroke-width:0.5;"/>
     </defs>
-    <g clip-path="url(#p99d3117ecb)">
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="105.818182" xlink:href="#mf2f92b29a1" y="351.771429"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="122.727273" xlink:href="#mf2f92b29a1" y="327.085714"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="139.636364" xlink:href="#mf2f92b29a1" y="302.4"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="156.545455" xlink:href="#mf2f92b29a1" y="277.714286"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="173.454545" xlink:href="#mf2f92b29a1" y="253.028571"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="190.363636" xlink:href="#mf2f92b29a1" y="228.342857"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="207.272727" xlink:href="#mf2f92b29a1" y="203.657143"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="224.181818" xlink:href="#mf2f92b29a1" y="178.971429"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="241.090909" xlink:href="#mf2f92b29a1" y="154.285714"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="258" xlink:href="#mf2f92b29a1" y="129.6"/>
+    <g clip-path="url(#p2af230b5c1)">
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="105.818182" xlink:href="#m6db69444d4" y="351.771429"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="122.727273" xlink:href="#m6db69444d4" y="327.085714"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="139.636364" xlink:href="#m6db69444d4" y="302.4"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="156.545455" xlink:href="#m6db69444d4" y="277.714286"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="173.454545" xlink:href="#m6db69444d4" y="253.028571"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="190.363636" xlink:href="#m6db69444d4" y="228.342857"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="207.272727" xlink:href="#m6db69444d4" y="203.657143"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="224.181818" xlink:href="#m6db69444d4" y="178.971429"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="241.090909" xlink:href="#m6db69444d4" y="154.285714"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="258" xlink:href="#m6db69444d4" y="129.6"/>
     </g>
    </g>
    <g id="line2d_5">
-    <g clip-path="url(#p99d3117ecb)">
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="105.818182" xlink:href="#mf2f92b29a1" y="327.085714"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="122.727273" xlink:href="#mf2f92b29a1" y="302.4"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="139.636364" xlink:href="#mf2f92b29a1" y="277.714286"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="156.545455" xlink:href="#mf2f92b29a1" y="253.028571"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="173.454545" xlink:href="#mf2f92b29a1" y="228.342857"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="190.363636" xlink:href="#mf2f92b29a1" y="203.657143"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="207.272727" xlink:href="#mf2f92b29a1" y="178.971429"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="224.181818" xlink:href="#mf2f92b29a1" y="154.285714"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="241.090909" xlink:href="#mf2f92b29a1" y="129.6"/>
-     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="258" xlink:href="#mf2f92b29a1" y="104.914286"/>
+    <g clip-path="url(#p2af230b5c1)">
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="105.818182" xlink:href="#m6db69444d4" y="327.085714"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="122.727273" xlink:href="#m6db69444d4" y="302.4"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="139.636364" xlink:href="#m6db69444d4" y="277.714286"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="156.545455" xlink:href="#m6db69444d4" y="253.028571"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="173.454545" xlink:href="#m6db69444d4" y="228.342857"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="190.363636" xlink:href="#m6db69444d4" y="203.657143"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="207.272727" xlink:href="#m6db69444d4" y="178.971429"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="224.181818" xlink:href="#m6db69444d4" y="154.285714"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="241.090909" xlink:href="#m6db69444d4" y="129.6"/>
+     <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="258" xlink:href="#m6db69444d4" y="104.914286"/>
     </g>
    </g>
    <g id="line2d_6">
-    <path clip-path="url(#p99d3117ecb)" d="M 105.818182 339.428571 
+    <path clip-path="url(#p2af230b5c1)" d="M 105.818182 339.428571 
 L 122.727273 314.742857 
 L 139.636364 290.057143 
 L 156.545455 265.371429 
@@ -260,92 +271,92 @@ L 274.909091 43.2
       <defs>
        <path d="M 0 0 
 L 0 -4 
-" id="m32de9dd134" style="stroke:#000000;stroke-width:0.5;"/>
+" id="m58dade9745" style="stroke:#000000;stroke-width:0.5;"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m32de9dd134" y="388.8"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m58dade9745" y="388.8"/>
       </g>
      </g>
      <g id="line2d_8">
       <defs>
        <path d="M 0 0 
 L 0 4 
-" id="m8a9609bd6e" style="stroke:#000000;stroke-width:0.5;"/>
+" id="mc946a5ae82" style="stroke:#000000;stroke-width:0.5;"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8a9609bd6e" y="43.2"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#mc946a5ae82" y="43.2"/>
       </g>
      </g>
     </g>
     <g id="xtick_2">
      <g id="line2d_9">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="105.818182" xlink:href="#m32de9dd134" y="388.8"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="105.818182" xlink:href="#m58dade9745" y="388.8"/>
       </g>
      </g>
      <g id="line2d_10">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="105.818182" xlink:href="#m8a9609bd6e" y="43.2"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="105.818182" xlink:href="#mc946a5ae82" y="43.2"/>
       </g>
      </g>
     </g>
     <g id="xtick_3">
      <g id="line2d_11">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="139.636364" xlink:href="#m32de9dd134" y="388.8"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="139.636364" xlink:href="#m58dade9745" y="388.8"/>
       </g>
      </g>
      <g id="line2d_12">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="139.636364" xlink:href="#m8a9609bd6e" y="43.2"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="139.636364" xlink:href="#mc946a5ae82" y="43.2"/>
       </g>
      </g>
     </g>
     <g id="xtick_4">
      <g id="line2d_13">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="173.454545" xlink:href="#m32de9dd134" y="388.8"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="173.454545" xlink:href="#m58dade9745" y="388.8"/>
       </g>
      </g>
      <g id="line2d_14">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="173.454545" xlink:href="#m8a9609bd6e" y="43.2"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="173.454545" xlink:href="#mc946a5ae82" y="43.2"/>
       </g>
      </g>
     </g>
     <g id="xtick_5">
      <g id="line2d_15">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="207.272727" xlink:href="#m32de9dd134" y="388.8"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="207.272727" xlink:href="#m58dade9745" y="388.8"/>
       </g>
      </g>
      <g id="line2d_16">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="207.272727" xlink:href="#m8a9609bd6e" y="43.2"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="207.272727" xlink:href="#mc946a5ae82" y="43.2"/>
       </g>
      </g>
     </g>
     <g id="xtick_6">
      <g id="line2d_17">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="241.090909" xlink:href="#m32de9dd134" y="388.8"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="241.090909" xlink:href="#m58dade9745" y="388.8"/>
       </g>
      </g>
      <g id="line2d_18">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="241.090909" xlink:href="#m8a9609bd6e" y="43.2"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="241.090909" xlink:href="#mc946a5ae82" y="43.2"/>
       </g>
      </g>
     </g>
     <g id="xtick_7">
      <g id="line2d_19">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m32de9dd134" y="388.8"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m58dade9745" y="388.8"/>
       </g>
      </g>
      <g id="line2d_20">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m8a9609bd6e" y="43.2"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#mc946a5ae82" y="43.2"/>
       </g>
      </g>
     </g>
@@ -356,104 +367,104 @@ L 0 4
       <defs>
        <path d="M 0 0 
 L 4 0 
-" id="m00cc0744e5" style="stroke:#000000;stroke-width:0.5;"/>
+" id="m8b2567c4af" style="stroke:#000000;stroke-width:0.5;"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m00cc0744e5" y="388.8"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="388.8"/>
       </g>
      </g>
      <g id="line2d_22">
       <defs>
        <path d="M 0 0 
 L -4 0 
-" id="m76ad6f44c1" style="stroke:#000000;stroke-width:0.5;"/>
+" id="m580a4f3bfe" style="stroke:#000000;stroke-width:0.5;"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m76ad6f44c1" y="388.8"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m580a4f3bfe" y="388.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_2">
      <g id="line2d_23">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m00cc0744e5" y="339.428571"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="339.428571"/>
       </g>
      </g>
      <g id="line2d_24">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m76ad6f44c1" y="339.428571"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m580a4f3bfe" y="339.428571"/>
       </g>
      </g>
     </g>
     <g id="ytick_3">
      <g id="line2d_25">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m00cc0744e5" y="290.057143"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="290.057143"/>
       </g>
      </g>
      <g id="line2d_26">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m76ad6f44c1" y="290.057143"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m580a4f3bfe" y="290.057143"/>
       </g>
      </g>
     </g>
     <g id="ytick_4">
      <g id="line2d_27">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m00cc0744e5" y="240.685714"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="240.685714"/>
       </g>
      </g>
      <g id="line2d_28">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m76ad6f44c1" y="240.685714"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m580a4f3bfe" y="240.685714"/>
       </g>
      </g>
     </g>
     <g id="ytick_5">
      <g id="line2d_29">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m00cc0744e5" y="191.314286"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="191.314286"/>
       </g>
      </g>
      <g id="line2d_30">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m76ad6f44c1" y="191.314286"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m580a4f3bfe" y="191.314286"/>
       </g>
      </g>
     </g>
     <g id="ytick_6">
      <g id="line2d_31">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m00cc0744e5" y="141.942857"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="141.942857"/>
       </g>
      </g>
      <g id="line2d_32">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m76ad6f44c1" y="141.942857"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m580a4f3bfe" y="141.942857"/>
       </g>
      </g>
     </g>
     <g id="ytick_7">
      <g id="line2d_33">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m00cc0744e5" y="92.571429"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="92.571429"/>
       </g>
      </g>
      <g id="line2d_34">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m76ad6f44c1" y="92.571429"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m580a4f3bfe" y="92.571429"/>
       </g>
      </g>
     </g>
     <g id="ytick_8">
      <g id="line2d_35">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m00cc0744e5" y="43.2"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="72" xlink:href="#m8b2567c4af" y="43.2"/>
       </g>
      </g>
      <g id="line2d_36">
       <g>
-       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m76ad6f44c1" y="43.2"/>
+       <use style="stroke:#000000;stroke-width:0.5;" x="274.909091" xlink:href="#m580a4f3bfe" y="43.2"/>
       </g>
      </g>
     </g>
@@ -477,144 +488,149 @@ z
     </g>
     <g id="text_1">
      <!-- My legend -->
-     <defs>
-      <path d="M 9.8125 72.90625 
-L 24.515625 72.90625 
-L 43.109375 23.296875 
-L 61.8125 72.90625 
-L 76.515625 72.90625 
-L 76.515625 0 
-L 66.890625 0 
-L 66.890625 64.015625 
-L 48.09375 14.015625 
-L 38.1875 14.015625 
-L 19.390625 64.015625 
-L 19.390625 0 
-L 9.8125 0 
+     <g transform="translate(331.210841 190.112325)scale(0.12 -0.12)">
+      <defs>
+       <path d="M 628 4666 
+L 1569 4666 
+L 2759 1491 
+L 3956 4666 
+L 4897 4666 
+L 4897 0 
+L 4281 0 
+L 4281 4097 
+L 3078 897 
+L 2444 897 
+L 1241 4097 
+L 1241 0 
+L 628 0 
 z
-" id="DejaVuSans-4d"/>
-      <path d="M 32.171875 -5.078125 
-Q 28.375 -14.84375 24.75 -17.8125 
-Q 21.140625 -20.796875 15.09375 -20.796875 
-L 7.90625 -20.796875 
-L 7.90625 -13.28125 
-L 13.1875 -13.28125 
-Q 16.890625 -13.28125 18.9375 -11.515625 
-Q 21 -9.765625 23.484375 -3.21875 
-L 25.09375 0.875 
-L 2.984375 54.6875 
-L 12.5 54.6875 
-L 29.59375 11.921875 
-L 46.6875 54.6875 
-L 56.203125 54.6875 
+" id="DejaVuSans-4d" transform="scale(0.015625)"/>
+       <path d="M 2059 -325 
+Q 1816 -950 1584 -1140 
+Q 1353 -1331 966 -1331 
+L 506 -1331 
+L 506 -850 
+L 844 -850 
+Q 1081 -850 1212 -737 
+Q 1344 -625 1503 -206 
+L 1606 56 
+L 191 3500 
+L 800 3500 
+L 1894 763 
+L 2988 3500 
+L 3597 3500 
 z
-" id="DejaVuSans-79"/>
-      <path id="DejaVuSans-20"/>
-      <path d="M 9.421875 75.984375 
-L 18.40625 75.984375 
-L 18.40625 0 
-L 9.421875 0 
+" id="DejaVuSans-79" transform="scale(0.015625)"/>
+       <path id="DejaVuSans-20" transform="scale(0.015625)"/>
+       <path d="M 603 4863 
+L 1178 4863 
+L 1178 0 
+L 603 0 
 z
-" id="DejaVuSans-6c"/>
-      <path d="M 56.203125 29.59375 
-L 56.203125 25.203125 
-L 14.890625 25.203125 
-Q 15.484375 15.921875 20.484375 11.0625 
-Q 25.484375 6.203125 34.421875 6.203125 
-Q 39.59375 6.203125 44.453125 7.46875 
-Q 49.3125 8.734375 54.109375 11.28125 
-L 54.109375 2.78125 
-Q 49.265625 0.734375 44.1875 -0.34375 
-Q 39.109375 -1.421875 33.890625 -1.421875 
-Q 20.796875 -1.421875 13.15625 6.1875 
-Q 5.515625 13.8125 5.515625 26.8125 
-Q 5.515625 40.234375 12.765625 48.109375 
-Q 20.015625 56 32.328125 56 
-Q 43.359375 56 49.78125 48.890625 
-Q 56.203125 41.796875 56.203125 29.59375 
-M 47.21875 32.234375 
-Q 47.125 39.59375 43.09375 43.984375 
-Q 39.0625 48.390625 32.421875 48.390625 
-Q 24.90625 48.390625 20.390625 44.140625 
-Q 15.875 39.890625 15.1875 32.171875 
+" id="DejaVuSans-6c" transform="scale(0.015625)"/>
+       <path d="M 3597 1894 
+L 3597 1613 
+L 953 1613 
+Q 991 1019 1311 708 
+Q 1631 397 2203 397 
+Q 2534 397 2845 478 
+Q 3156 559 3463 722 
+L 3463 178 
+Q 3153 47 2828 -22 
+Q 2503 -91 2169 -91 
+Q 1331 -91 842 396 
+Q 353 884 353 1716 
+Q 353 2575 817 3079 
+Q 1281 3584 2069 3584 
+Q 2775 3584 3186 3129 
+Q 3597 2675 3597 1894 
 z
-" id="DejaVuSans-65"/>
-      <path d="M 45.40625 27.984375 
-Q 45.40625 37.75 41.375 43.109375 
-Q 37.359375 48.484375 30.078125 48.484375 
-Q 22.859375 48.484375 18.828125 43.109375 
-Q 14.796875 37.75 14.796875 27.984375 
-Q 14.796875 18.265625 18.828125 12.890625 
-Q 22.859375 7.515625 30.078125 7.515625 
-Q 37.359375 7.515625 41.375 12.890625 
-Q 45.40625 18.265625 45.40625 27.984375 
-M 54.390625 6.78125 
-Q 54.390625 -7.171875 48.1875 -13.984375 
-Q 42 -20.796875 29.203125 -20.796875 
-Q 24.46875 -20.796875 20.265625 -20.09375 
-Q 16.0625 -19.390625 12.109375 -17.921875 
-L 12.109375 -9.1875 
-Q 16.0625 -11.328125 19.921875 -12.34375 
-Q 23.78125 -13.375 27.78125 -13.375 
-Q 36.625 -13.375 41.015625 -8.765625 
-Q 45.40625 -4.15625 45.40625 5.171875 
-L 45.40625 9.625 
-Q 42.625 4.78125 38.28125 2.390625 
-Q 33.9375 0 27.875 0 
-Q 17.828125 0 11.671875 7.65625 
-Q 5.515625 15.328125 5.515625 27.984375 
-Q 5.515625 40.671875 11.671875 48.328125 
-Q 17.828125 56 27.875 56 
-Q 33.9375 56 38.28125 53.609375 
-Q 42.625 51.21875 45.40625 46.390625 
-L 45.40625 54.6875 
-L 54.390625 54.6875 
+M 3022 2063 
+Q 3016 2534 2758 2815 
+Q 2500 3097 2075 3097 
+Q 1594 3097 1305 2825 
+Q 1016 2553 972 2059 
 z
-" id="DejaVuSans-67"/>
-      <path d="M 54.890625 33.015625 
-L 54.890625 0 
-L 45.90625 0 
-L 45.90625 32.71875 
-Q 45.90625 40.484375 42.875 44.328125 
-Q 39.84375 48.1875 33.796875 48.1875 
-Q 26.515625 48.1875 22.3125 43.546875 
-Q 18.109375 38.921875 18.109375 30.90625 
-L 18.109375 0 
-L 9.078125 0 
-L 9.078125 54.6875 
-L 18.109375 54.6875 
-L 18.109375 46.1875 
-Q 21.34375 51.125 25.703125 53.5625 
-Q 30.078125 56 35.796875 56 
-Q 45.21875 56 50.046875 50.171875 
-Q 54.890625 44.34375 54.890625 33.015625 
-" id="DejaVuSans-6e"/>
-      <path d="M 45.40625 46.390625 
-L 45.40625 75.984375 
-L 54.390625 75.984375 
-L 54.390625 0 
-L 45.40625 0 
-L 45.40625 8.203125 
-Q 42.578125 3.328125 38.25 0.953125 
-Q 33.9375 -1.421875 27.875 -1.421875 
-Q 17.96875 -1.421875 11.734375 6.484375 
-Q 5.515625 14.40625 5.515625 27.296875 
-Q 5.515625 40.1875 11.734375 48.09375 
-Q 17.96875 56 27.875 56 
-Q 33.9375 56 38.25 53.625 
-Q 42.578125 51.265625 45.40625 46.390625 
-M 14.796875 27.296875 
-Q 14.796875 17.390625 18.875 11.75 
-Q 22.953125 6.109375 30.078125 6.109375 
-Q 37.203125 6.109375 41.296875 11.75 
-Q 45.40625 17.390625 45.40625 27.296875 
-Q 45.40625 37.203125 41.296875 42.84375 
-Q 37.203125 48.484375 30.078125 48.484375 
-Q 22.953125 48.484375 18.875 42.84375 
-Q 14.796875 37.203125 14.796875 27.296875 
-" id="DejaVuSans-64"/>
-     </defs>
-     <g transform="translate(331.210841 190.112325)scale(0.12 -0.12)">
+" id="DejaVuSans-65" transform="scale(0.015625)"/>
+       <path d="M 2906 1791 
+Q 2906 2416 2648 2759 
+Q 2391 3103 1925 3103 
+Q 1463 3103 1205 2759 
+Q 947 2416 947 1791 
+Q 947 1169 1205 825 
+Q 1463 481 1925 481 
+Q 2391 481 2648 825 
+Q 2906 1169 2906 1791 
+z
+M 3481 434 
+Q 3481 -459 3084 -895 
+Q 2688 -1331 1869 -1331 
+Q 1566 -1331 1297 -1286 
+Q 1028 -1241 775 -1147 
+L 775 -588 
+Q 1028 -725 1275 -790 
+Q 1522 -856 1778 -856 
+Q 2344 -856 2625 -561 
+Q 2906 -266 2906 331 
+L 2906 616 
+Q 2728 306 2450 153 
+Q 2172 0 1784 0 
+Q 1141 0 747 490 
+Q 353 981 353 1791 
+Q 353 2603 747 3093 
+Q 1141 3584 1784 3584 
+Q 2172 3584 2450 3431 
+Q 2728 3278 2906 2969 
+L 2906 3500 
+L 3481 3500 
+z
+" id="DejaVuSans-67" transform="scale(0.015625)"/>
+       <path d="M 3513 2113 
+L 3513 0 
+L 2938 0 
+L 2938 2094 
+Q 2938 2591 2744 2837 
+Q 2550 3084 2163 3084 
+Q 1697 3084 1428 2787 
+Q 1159 2491 1159 1978 
+L 1159 0 
+L 581 0 
+L 581 3500 
+L 1159 3500 
+L 1159 2956 
+Q 1366 3272 1645 3428 
+Q 1925 3584 2291 3584 
+Q 2894 3584 3203 3211 
+Q 3513 2838 3513 2113 
+z
+" id="DejaVuSans-6e" transform="scale(0.015625)"/>
+       <path d="M 2906 2969 
+L 2906 4863 
+L 3481 4863 
+L 3481 0 
+L 2906 0 
+L 2906 525 
+Q 2725 213 2448 61 
+Q 2172 -91 1784 -91 
+Q 1150 -91 751 415 
+Q 353 922 353 1747 
+Q 353 2572 751 3078 
+Q 1150 3584 1784 3584 
+Q 2172 3584 2448 3432 
+Q 2725 3281 2906 2969 
+z
+M 947 1747 
+Q 947 1113 1208 752 
+Q 1469 391 1925 391 
+Q 2381 391 2643 752 
+Q 2906 1113 2906 1747 
+Q 2906 2381 2643 2742 
+Q 2381 3103 1925 3103 
+Q 1469 3103 1208 2742 
+Q 947 2381 947 1747 
+z
+" id="DejaVuSans-64" transform="scale(0.015625)"/>
+      </defs>
       <use xlink:href="#DejaVuSans-4d"/>
       <use x="86.279297" xlink:href="#DejaVuSans-79"/>
       <use x="145.458984" xlink:href="#DejaVuSans-20"/>
@@ -633,28 +649,28 @@ L 316.669091 205.7097
     </g>
     <g id="line2d_38">
      <g>
-      <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="302.269091" xlink:href="#m83e9afba35" y="205.7097"/>
+      <use style="fill:#0000ff;stroke:#000000;stroke-width:0.5;" x="302.269091" xlink:href="#m7cc53e241f" y="205.7097"/>
      </g>
     </g>
     <g id="text_2">
      <!-- XX -->
-     <defs>
-      <path d="M 6.296875 72.90625 
-L 16.890625 72.90625 
-L 35.015625 45.796875 
-L 53.21875 72.90625 
-L 63.8125 72.90625 
-L 40.375 37.890625 
-L 65.375 0 
-L 54.78125 0 
-L 34.28125 31 
-L 13.625 0 
-L 2.984375 0 
-L 29 38.921875 
-z
-" id="DejaVuSans-58"/>
-     </defs>
      <g transform="translate(328.189091 210.7497)scale(0.144 -0.144)">
+      <defs>
+       <path d="M 403 4666 
+L 1081 4666 
+L 2241 2931 
+L 3406 4666 
+L 4084 4666 
+L 2584 2425 
+L 4184 0 
+L 3506 0 
+L 2194 1984 
+L 872 0 
+L 191 0 
+L 1856 2491 
+z
+" id="DejaVuSans-58" transform="scale(0.015625)"/>
+      </defs>
       <use xlink:href="#DejaVuSans-58"/>
       <use x="68.505859" xlink:href="#DejaVuSans-58"/>
      </g>
@@ -718,22 +734,22 @@ L 391.117091 198.5097
     </g>
     <g id="line2d_39">
      <g>
-      <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="383.917091" xlink:href="#m632805ea67" y="205.7097"/>
+      <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="383.917091" xlink:href="#m8863516224" y="205.7097"/>
      </g>
     </g>
     <g id="line2d_40">
      <g>
-      <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="398.317091" xlink:href="#m632805ea67" y="205.7097"/>
+      <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="398.317091" xlink:href="#m8863516224" y="205.7097"/>
      </g>
     </g>
     <g id="line2d_41">
      <g>
-      <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="391.117091" xlink:href="#mf2f92b29a1" y="212.9097"/>
+      <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="391.117091" xlink:href="#m6db69444d4" y="212.9097"/>
      </g>
     </g>
     <g id="line2d_42">
      <g>
-      <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="391.117091" xlink:href="#mf2f92b29a1" y="198.5097"/>
+      <use style="fill:#008000;stroke:#008000;stroke-width:0.5;" x="391.117091" xlink:href="#m6db69444d4" y="198.5097"/>
      </g>
     </g>
     <g id="line2d_43">
@@ -753,7 +769,7 @@ L 405.517091 205.7097
   </g>
  </g>
  <defs>
-  <clipPath id="p99d3117ecb">
+  <clipPath id="p2af230b5c1">
    <rect height="345.6" width="202.909091" x="72" y="43.2"/>
   </clipPath>
  </defs>
diff --git a/lib/matplotlib/tests/baseline_images/test_lines/line_collection_dashes.pdf b/lib/matplotlib/tests/baseline_images/test_lines/line_collection_dashes.pdf
index 18b2e46e0f11..44b45f925bd3 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_lines/line_collection_dashes.pdf and b/lib/matplotlib/tests/baseline_images/test_lines/line_collection_dashes.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_lines/line_collection_dashes.svg b/lib/matplotlib/tests/baseline_images/test_lines/line_collection_dashes.svg
index c12572fa9384..ddc7b3c04a69 100644
--- a/lib/matplotlib/tests/baseline_images/test_lines/line_collection_dashes.svg
+++ b/lib/matplotlib/tests/baseline_images/test_lines/line_collection_dashes.svg
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (https://matplotlib.org/) -->
 <svg height="345.6pt" version="1.1" viewBox="0 0 460.8 345.6" width="460.8pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <metadata>
+  <rdf:RDF xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+   <cc:Work>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:date>2021-03-02T20:44:16.197962</dc:date>
+    <dc:format>image/svg+xml</dc:format>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Matplotlib v3.3.4.post2496+g7299993ff, https://matplotlib.org/</dc:title>
+     </cc:Agent>
+    </dc:creator>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="patch_1">
@@ -32,45 +43,45 @@ z
       <defs>
        <path d="M 0 0 
 L 0 3.5 
-" id="m3c049a1f51" style="stroke:#000000;stroke-width:0.8;"/>
+" id="m1794ba8a41" style="stroke:#000000;stroke-width:0.8;"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m3c049a1f51" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m1794ba8a41" y="307.584"/>
       </g>
      </g>
     </g>
     <g id="xtick_2">
      <g id="line2d_2">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="119.172414" xlink:href="#m3c049a1f51" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="119.172414" xlink:href="#m1794ba8a41" y="307.584"/>
       </g>
      </g>
     </g>
     <g id="xtick_3">
      <g id="line2d_3">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="180.744828" xlink:href="#m3c049a1f51" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="180.744828" xlink:href="#m1794ba8a41" y="307.584"/>
       </g>
      </g>
     </g>
     <g id="xtick_4">
      <g id="line2d_4">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="242.317241" xlink:href="#m3c049a1f51" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="242.317241" xlink:href="#m1794ba8a41" y="307.584"/>
       </g>
      </g>
     </g>
     <g id="xtick_5">
      <g id="line2d_5">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="303.889655" xlink:href="#m3c049a1f51" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="303.889655" xlink:href="#m1794ba8a41" y="307.584"/>
       </g>
      </g>
     </g>
     <g id="xtick_6">
      <g id="line2d_6">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="365.462069" xlink:href="#m3c049a1f51" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="365.462069" xlink:href="#m1794ba8a41" y="307.584"/>
       </g>
      </g>
     </g>
@@ -81,250 +92,250 @@ L 0 3.5
       <defs>
        <path d="M 0 0 
 L -3.5 0 
-" id="mee99decfa6" style="stroke:#000000;stroke-width:0.8;"/>
+" id="mccea692670" style="stroke:#000000;stroke-width:0.8;"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mee99decfa6" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mccea692670" y="307.584"/>
       </g>
      </g>
     </g>
     <g id="ytick_2">
      <g id="line2d_8">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mee99decfa6" y="272.569263"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mccea692670" y="272.569263"/>
       </g>
      </g>
     </g>
     <g id="ytick_3">
      <g id="line2d_9">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mee99decfa6" y="237.554526"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mccea692670" y="237.554526"/>
       </g>
      </g>
     </g>
     <g id="ytick_4">
      <g id="line2d_10">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mee99decfa6" y="202.539789"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mccea692670" y="202.539789"/>
       </g>
      </g>
     </g>
     <g id="ytick_5">
      <g id="line2d_11">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mee99decfa6" y="167.525053"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mccea692670" y="167.525053"/>
       </g>
      </g>
     </g>
     <g id="ytick_6">
      <g id="line2d_12">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mee99decfa6" y="132.510316"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mccea692670" y="132.510316"/>
       </g>
      </g>
     </g>
     <g id="ytick_7">
      <g id="line2d_13">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mee99decfa6" y="97.495579"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mccea692670" y="97.495579"/>
       </g>
      </g>
     </g>
     <g id="ytick_8">
      <g id="line2d_14">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mee99decfa6" y="62.480842"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mccea692670" y="62.480842"/>
       </g>
      </g>
     </g>
    </g>
-   <g id="LineCollection_1"/>
-   <g id="LineCollection_2">
-    <path clip-path="url(#pd19901ac8d)" d="M 302.780704 307.584 
+   <g id="PathCollection_1"/>
+   <g id="PathCollection_2">
+    <path clip-path="url(#p9defebae56)" d="M 302.780704 307.584 
 L 303.889655 306.291252 
 L 304.477189 307.584 
 " style="fill:none;stroke:#472c7a;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 293.791921 41.472 
+    <path clip-path="url(#p9defebae56)" d="M 293.791921 41.472 
 L 291.575172 45.433276 
 L 288.57681 41.472 
 " style="fill:none;stroke:#472c7a;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 69.914483 183.727912 
+    <path clip-path="url(#p9defebae56)" d="M 69.914483 183.727912 
 L 68.467822 181.530947 
 L 69.914483 180.35315 
 L 70.884829 181.530947 
-L 69.914483 183.727912 
+z
 " style="fill:none;stroke:#472c7a;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 106.857931 154.610687 
+    <path clip-path="url(#p9defebae56)" d="M 106.857931 154.610687 
 L 104.694581 153.519158 
 L 106.857931 152.145996 
 L 107.835294 153.519158 
-L 106.857931 154.610687 
+z
 " style="fill:none;stroke:#472c7a;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 143.801379 112.727383 
+    <path clip-path="url(#p9defebae56)" d="M 143.801379 112.727383 
 L 142.665549 111.501474 
 L 143.801379 102.662445 
 L 145.728681 111.501474 
 L 143.801379 112.727383 
 " style="fill:none;stroke:#472c7a;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 119.172414 84.255225 
+    <path clip-path="url(#p9defebae56)" d="M 119.172414 84.255225 
 L 118.277694 83.489684 
 L 119.172414 82.225248 
 L 119.927477 83.489684 
-L 119.172414 84.255225 
+z
 " style="fill:none;stroke:#472c7a;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 143.801379 56.095978 
+    <path clip-path="url(#p9defebae56)" d="M 143.801379 56.095978 
 L 143.262454 55.477895 
 L 143.801379 53.930552 
 L 144.325439 55.477895 
 L 143.801379 56.095978 
 " style="fill:none;stroke:#472c7a;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
    </g>
-   <g id="LineCollection_3">
-    <path clip-path="url(#pd19901ac8d)" d="M 296.981881 307.584 
+   <g id="PathCollection_3">
+    <path clip-path="url(#p9defebae56)" d="M 296.981881 307.584 
 L 303.889655 299.531338 
 L 307.549465 307.584 
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 71.430026 41.472 
+    <path clip-path="url(#p9defebae56)" d="M 71.430026 41.472 
 L 69.914483 46.652123 
 L 68.675548 41.472 
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 184.098217 41.472 
+    <path clip-path="url(#p9defebae56)" d="M 184.098217 41.472 
 L 180.744828 43.800901 
 L 179.340468 41.472 
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 296.536512 41.472 
+    <path clip-path="url(#p9defebae56)" d="M 296.536512 41.472 
 L 291.575172 50.337795 
 L 284.864489 41.472 
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 94.543448 294.841437 
+    <path clip-path="url(#p9defebae56)" d="M 94.543448 294.841437 
 L 90.253178 293.578105 
 L 92.840411 279.572211 
 L 94.543448 278.917844 
 L 95.36033 279.572211 
 L 97.415245 293.578105 
-L 94.543448 294.841437 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 205.373793 294.181358 
+    <path clip-path="url(#p9defebae56)" d="M 205.373793 294.181358 
 L 200.802083 293.578105 
 L 205.373793 293.055062 
 L 205.73164 293.578105 
-L 205.373793 294.181358 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 279.26069 293.67912 
+    <path clip-path="url(#p9defebae56)" d="M 279.26069 293.67912 
 L 279.189123 293.578105 
 L 279.26069 293.428643 
 L 279.382835 293.578105 
-L 279.26069 293.67912 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 131.486897 279.720072 
+    <path clip-path="url(#p9defebae56)" d="M 131.486897 279.720072 
 L 131.184168 279.572211 
 L 131.486897 279.314421 
 L 131.664575 279.572211 
-L 131.486897 279.720072 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 94.543448 229.798839 
+    <path clip-path="url(#p9defebae56)" d="M 94.543448 229.798839 
 L 89.683997 223.548632 
 L 94.543448 218.579139 
 L 97.238384 223.548632 
 L 94.543448 229.798839 
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 119.172414 223.579337 
+    <path clip-path="url(#p9defebae56)" d="M 119.172414 223.579337 
 L 119.161037 223.548632 
 L 119.172414 223.524454 
 L 119.223329 223.548632 
-L 119.172414 223.579337 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 365.462069 223.651951 
+    <path clip-path="url(#p9defebae56)" d="M 365.462069 223.651951 
 L 365.369558 223.548632 
 L 365.462069 223.449604 
 L 365.593176 223.548632 
 L 365.462069 223.651951 
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 390.091034 214.48477 
+    <path clip-path="url(#p9defebae56)" d="M 390.091034 214.48477 
 L 388.467336 209.542737 
 L 390.091034 206.493006 
 L 392.409567 209.542737 
-L 390.091034 214.48477 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 119.172414 196.377711 
+    <path clip-path="url(#p9defebae56)" d="M 119.172414 196.377711 
 L 118.487737 195.536842 
 L 119.172414 194.708469 
 L 119.503332 195.536842 
 L 119.172414 196.377711 
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 353.147586 201.574421 
+    <path clip-path="url(#p9defebae56)" d="M 353.147586 201.574421 
 L 350.949208 195.536842 
 L 353.147586 192.920711 
 L 355.096291 195.536842 
 L 353.147586 201.574421 
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 69.914483 188.445049 
+    <path clip-path="url(#p9defebae56)" d="M 69.914483 188.445049 
 L 65.361672 181.530947 
 L 69.914483 177.824282 
 L 72.968275 181.530947 
-L 69.914483 188.445049 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 156.115862 186.486194 
+    <path clip-path="url(#p9defebae56)" d="M 156.115862 186.486194 
 L 153.345722 181.530947 
 L 156.115862 179.316884 
 L 157.41096 181.530947 
 L 156.115862 186.486194 
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 106.857931 157.979963 
+    <path clip-path="url(#p9defebae56)" d="M 106.857931 157.979963 
 L 98.01686 153.519158 
 L 106.857931 147.907389 
 L 110.852171 153.519158 
 L 106.857931 157.979963 
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 131.486897 158.697575 
+    <path clip-path="url(#p9defebae56)" d="M 131.486897 158.697575 
 L 130.67422 153.519158 
 L 131.486897 152.124234 
 L 132.356794 153.519158 
-L 131.486897 158.697575 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 377.776552 155.539095 
+    <path clip-path="url(#p9defebae56)" d="M 377.776552 155.539095 
 L 375.512144 153.519158 
 L 377.776552 149.549277 
 L 379.969274 153.519158 
 L 377.776552 155.539095 
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 303.889655 140.984479 
+    <path clip-path="url(#p9defebae56)" d="M 303.889655 140.984479 
 L 303.421079 139.513263 
 L 303.889655 134.051349 
 L 304.468983 139.513263 
-L 303.889655 140.984479 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 328.518621 142.049595 
+    <path clip-path="url(#p9defebae56)" d="M 328.518621 142.049595 
 L 325.463982 139.513263 
 L 328.518621 134.796078 
 L 335.065708 139.513263 
-L 328.518621 142.049595 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 365.462069 140.212803 
+    <path clip-path="url(#p9defebae56)" d="M 365.462069 140.212803 
 L 365.050107 139.513263 
 L 365.462069 139.173976 
 L 366.502612 139.513263 
-L 365.462069 140.212803 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 94.543448 125.625305 
+    <path clip-path="url(#p9defebae56)" d="M 94.543448 125.625305 
 L 94.382827 125.507368 
 L 94.543448 125.374777 
 L 94.696601 125.507368 
-L 94.543448 125.625305 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 230.002759 126.805767 
+    <path clip-path="url(#p9defebae56)" d="M 230.002759 126.805767 
 L 229.025992 125.507368 
 L 230.002759 122.547209 
 L 230.979898 125.507368 
-L 230.002759 126.805767 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 82.228966 115.480036 
+    <path clip-path="url(#p9defebae56)" d="M 82.228966 115.480036 
 L 79.953593 111.501474 
 L 82.228966 108.793076 
 L 84.974632 111.501474 
-L 82.228966 115.480036 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 143.801379 115.614617 
+    <path clip-path="url(#p9defebae56)" d="M 143.801379 115.614617 
 L 139.990467 111.501474 
 L 139.526569 97.495579 
 L 143.801379 94.437493 
@@ -332,79 +343,79 @@ L 146.886442 97.495579
 L 150.267819 111.501474 
 L 143.801379 115.614617 
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 279.26069 100.617678 
+    <path clip-path="url(#p9defebae56)" d="M 279.26069 100.617678 
 L 273.590356 97.495579 
 L 279.26069 89.904751 
 L 282.599135 97.495579 
-L 279.26069 100.617678 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 303.889655 101.093055 
+    <path clip-path="url(#p9defebae56)" d="M 303.889655 101.093055 
 L 301.628598 97.495579 
 L 303.889655 95.064645 
 L 307.361557 97.495579 
-L 303.889655 101.093055 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 119.172414 86.651103 
+    <path clip-path="url(#p9defebae56)" d="M 119.172414 86.651103 
 L 115.477528 83.489684 
 L 119.172414 78.267995 
 L 122.290564 83.489684 
-L 119.172414 86.651103 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 377.776552 83.644532 
+    <path clip-path="url(#p9defebae56)" d="M 377.776552 83.644532 
 L 377.394309 83.489684 
 L 377.776552 83.156293 
 L 383.971975 83.489684 
 L 377.776552 83.644532 
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 94.543448 72.826984 
+    <path clip-path="url(#p9defebae56)" d="M 94.543448 72.826984 
 L 87.410624 69.483789 
 L 94.543448 68.003122 
 L 98.012447 69.483789 
-L 94.543448 72.826984 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 205.373793 69.892753 
+    <path clip-path="url(#p9defebae56)" d="M 205.373793 69.892753 
 L 204.071737 69.483789 
 L 205.373793 69.050226 
 L 206.636228 69.483789 
 L 205.373793 69.892753 
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 279.26069 77.458924 
+    <path clip-path="url(#p9defebae56)" d="M 279.26069 77.458924 
 L 276.754799 69.483789 
 L 279.26069 58.93357 
 L 282.191463 69.483789 
-L 279.26069 77.458924 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 303.889655 72.899914 
+    <path clip-path="url(#p9defebae56)" d="M 303.889655 72.899914 
 L 301.351876 69.483789 
 L 303.889655 67.376398 
 L 306.871891 69.483789 
-L 303.889655 72.899914 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 143.801379 59.202224 
+    <path clip-path="url(#p9defebae56)" d="M 143.801379 59.202224 
 L 140.554026 55.477895 
 L 143.801379 46.154213 
 L 146.959156 55.477895 
-L 143.801379 59.202224 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 254.631724 58.720309 
+    <path clip-path="url(#p9defebae56)" d="M 254.631724 58.720309 
 L 252.061993 55.477895 
 L 254.631724 50.493349 
 L 258.578201 55.477895 
-L 254.631724 58.720309 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 340.833103 56.855128 
+    <path clip-path="url(#p9defebae56)" d="M 340.833103 56.855128 
 L 339.701961 55.477895 
 L 340.833103 51.832225 
 L 342.957392 55.477895 
-L 340.833103 56.855128 
+z
 " style="fill:none;stroke:#3b528b;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
    </g>
-   <g id="LineCollection_4">
-    <path clip-path="url(#pd19901ac8d)" d="M 118.405028 307.584 
+   <g id="PathCollection_4">
+    <path clip-path="url(#p9defebae56)" d="M 118.405028 307.584 
 L 119.172414 305.393742 
 L 120.305092 307.584 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 291.00442 307.584 
+    <path clip-path="url(#p9defebae56)" d="M 291.00442 307.584 
 L 291.575172 306.402659 
 L 302.167704 293.578105 
 L 300.207861 279.572211 
@@ -413,40 +424,40 @@ L 306.066172 279.572211
 L 304.806413 293.578105 
 L 310.621741 307.584 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 363.29829 307.584 
+    <path clip-path="url(#p9defebae56)" d="M 363.29829 307.584 
 L 365.462069 302.715997 
 L 370.833741 307.584 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 57.6 164.070649 
+    <path clip-path="url(#p9defebae56)" d="M 57.6 164.070649 
 L 59.703992 167.525053 
 L 57.6 171.68457 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 57.6 95.542549 
+    <path clip-path="url(#p9defebae56)" d="M 57.6 95.542549 
 L 59.27244 97.495579 
 L 57.6 99.292988 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 76.707437 41.472 
+    <path clip-path="url(#p9defebae56)" d="M 76.707437 41.472 
 L 75.119959 55.477895 
 L 69.914483 57.692857 
 L 66.376379 55.477895 
 L 64.361342 41.472 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 147.771818 41.472 
+    <path clip-path="url(#p9defebae56)" d="M 147.771818 41.472 
 L 149.592873 55.477895 
 L 143.801379 62.30847 
 L 137.845599 55.477895 
 L 131.486897 41.513832 
 L 131.330055 41.472 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 191.723801 41.472 
+    <path clip-path="url(#p9defebae56)" d="M 191.723801 41.472 
 L 180.744828 49.096804 
 L 176.146965 41.472 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 207.547826 41.472 
+    <path clip-path="url(#p9defebae56)" d="M 207.547826 41.472 
 L 205.373793 43.7576 
 L 196.654481 41.472 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 299.281103 41.472 
+    <path clip-path="url(#p9defebae56)" d="M 299.281103 41.472 
 L 291.575172 55.242315 
 L 290.768142 55.477895 
 L 285.238057 69.483789 
@@ -460,7 +471,7 @@ L 274.329302 55.477895
 L 279.26069 47.446609 
 L 281.152168 41.472 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 343.269183 41.472 
+    <path clip-path="url(#p9defebae56)" d="M 343.269183 41.472 
 L 352.317407 55.477895 
 L 353.147586 57.282676 
 L 361.65613 69.483789 
@@ -470,11 +481,11 @@ L 340.833103 62.923478
 L 334.717936 55.477895 
 L 336.787086 41.472 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 404.53814 41.472 
+    <path clip-path="url(#p9defebae56)" d="M 404.53814 41.472 
 L 402.405517 43.413828 
 L 400.158876 41.472 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 82.228966 294.236826 
+    <path clip-path="url(#p9defebae56)" d="M 82.228966 294.236826 
 L 81.375032 293.578105 
 L 81.87206 279.572211 
 L 82.228966 279.391947 
@@ -484,7 +495,7 @@ L 103.448487 293.578105
 L 94.543448 297.49552 
 L 82.228966 294.236826 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 180.744828 296.49712 
+    <path clip-path="url(#p9defebae56)" d="M 180.744828 296.49712 
 L 176.643253 293.578105 
 L 180.744828 291.619779 
 L 193.05931 287.971971 
@@ -494,7 +505,7 @@ L 205.373793 298.722629
 L 193.05931 296.599339 
 L 180.744828 296.49712 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 254.631724 295.88684 
+    <path clip-path="url(#p9defebae56)" d="M 254.631724 295.88684 
 L 247.787737 293.578105 
 L 249.944138 279.572211 
 L 254.631724 277.403302 
@@ -502,13 +513,13 @@ L 257.617981 279.572211
 L 257.378106 293.578105 
 L 254.631724 295.88684 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 279.26069 299.493814 
+    <path clip-path="url(#p9defebae56)" d="M 279.26069 299.493814 
 L 275.069513 293.578105 
 L 279.26069 284.825152 
 L 286.413869 293.578105 
-L 279.26069 299.493814 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 340.833103 305.736585 
+    <path clip-path="url(#p9defebae56)" d="M 340.833103 305.736585 
 L 333.835344 293.578105 
 L 336.30419 279.572211 
 L 340.833103 276.580096 
@@ -516,31 +527,31 @@ L 343.83078 279.572211
 L 344.900342 293.578105 
 L 340.833103 305.736585 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 131.486897 283.637135 
+    <path clip-path="url(#p9defebae56)" d="M 131.486897 283.637135 
 L 123.16443 279.572211 
 L 131.486897 272.485185 
 L 136.37154 279.572211 
-L 131.486897 283.637135 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 156.115862 282.462387 
+    <path clip-path="url(#p9defebae56)" d="M 156.115862 282.462387 
 L 155.151449 279.572211 
 L 156.115862 278.119112 
 L 157.493326 279.572211 
-L 156.115862 282.462387 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 217.688276 281.483977 
+    <path clip-path="url(#p9defebae56)" d="M 217.688276 281.483977 
 L 215.43295 279.572211 
 L 217.688276 276.809275 
 L 220.958958 279.572211 
 L 217.688276 281.483977 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 402.405517 288.261183 
+    <path clip-path="url(#p9defebae56)" d="M 402.405517 288.261183 
 L 398.66273 279.572211 
 L 402.405517 277.321462 
 L 403.974392 279.572211 
-L 402.405517 288.261183 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 193.05931 270.761438 
+    <path clip-path="url(#p9defebae56)" d="M 193.05931 270.761438 
 L 190.971549 265.566316 
 L 193.05931 261.500697 
 L 205.373793 254.512827 
@@ -548,55 +559,55 @@ L 207.960438 265.566316
 L 205.373793 268.300704 
 L 193.05931 270.761438 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 230.002759 268.883385 
+    <path clip-path="url(#p9defebae56)" d="M 230.002759 268.883385 
 L 227.858171 265.566316 
 L 230.002759 255.839631 
 L 231.476996 265.566316 
-L 230.002759 268.883385 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 328.518621 266.21258 
+    <path clip-path="url(#p9defebae56)" d="M 328.518621 266.21258 
 L 328.091995 265.566316 
 L 328.518621 264.73207 
 L 328.790683 265.566316 
-L 328.518621 266.21258 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 69.914483 253.366474 
+    <path clip-path="url(#p9defebae56)" d="M 69.914483 253.366474 
 L 67.416244 251.560421 
 L 69.914483 250.069572 
 L 72.552479 251.560421 
-L 69.914483 253.366474 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 291.575172 253.155318 
+    <path clip-path="url(#p9defebae56)" d="M 291.575172 253.155318 
 L 289.151576 251.560421 
 L 291.575172 248.649374 
 L 303.889655 247.546651 
 L 308.298783 251.560421 
 L 303.889655 254.442889 
-L 291.575172 253.155318 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 377.776552 252.409944 
+    <path clip-path="url(#p9defebae56)" d="M 377.776552 252.409944 
 L 377.028506 251.560421 
 L 377.748277 237.554526 
 L 377.776552 237.493229 
 L 378.145323 237.554526 
 L 378.461014 251.560421 
-L 377.776552 252.409944 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 402.405517 255.304356 
+    <path clip-path="url(#p9defebae56)" d="M 402.405517 255.304356 
 L 399.794201 251.560421 
 L 402.405517 243.162053 
 L 409.841972 251.560421 
-L 402.405517 255.304356 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 94.543448 237.726531 
+    <path clip-path="url(#p9defebae56)" d="M 94.543448 237.726531 
 L 90.557624 237.554526 
 L 83.447966 223.548632 
 L 94.543448 212.201895 
 L 100.696738 223.548632 
 L 94.990678 237.554526 
-L 94.543448 237.726531 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 143.801379 238.893014 
+    <path clip-path="url(#p9defebae56)" d="M 143.801379 238.893014 
 L 142.239129 237.554526 
 L 143.801379 234.091314 
 L 156.115862 225.623803 
@@ -604,61 +615,61 @@ L 162.145461 237.554526
 L 156.115862 240.228835 
 L 143.801379 238.893014 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 230.002759 247.66089 
+    <path clip-path="url(#p9defebae56)" d="M 230.002759 247.66089 
 L 226.012605 237.554526 
 L 230.002759 234.147102 
 L 232.533932 237.554526 
-L 230.002759 247.66089 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 254.631724 239.332928 
+    <path clip-path="url(#p9defebae56)" d="M 254.631724 239.332928 
 L 253.295078 237.554526 
 L 254.631724 235.972029 
 L 266.946207 233.149977 
 L 270.302277 237.554526 
 L 266.946207 245.359541 
-L 254.631724 239.332928 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 353.147586 238.514552 
+    <path clip-path="url(#p9defebae56)" d="M 353.147586 238.514552 
 L 345.620317 237.554526 
 L 353.147586 235.595119 
 L 354.828736 237.554526 
 L 353.147586 238.514552 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 69.914483 226.156125 
+    <path clip-path="url(#p9defebae56)" d="M 69.914483 226.156125 
 L 62.979592 223.548632 
 L 69.914483 218.789825 
 L 79.595748 223.548632 
-L 69.914483 226.156125 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 119.172414 235.517289 
+    <path clip-path="url(#p9defebae56)" d="M 119.172414 235.517289 
 L 114.737909 223.548632 
 L 119.172414 214.124588 
 L 131.486897 219.627989 
 L 134.727853 223.548632 
 L 131.486897 225.45949 
-L 119.172414 235.517289 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 180.744828 232.233445 
+    <path clip-path="url(#p9defebae56)" d="M 180.744828 232.233445 
 L 178.604647 223.548632 
 L 178.643035 209.542737 
 L 180.744828 208.063973 
 L 183.893185 209.542737 
 L 184.63562 223.548632 
-L 180.744828 232.233445 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 217.688276 227.654473 
+    <path clip-path="url(#p9defebae56)" d="M 217.688276 227.654473 
 L 213.67265 223.548632 
 L 217.688276 220.423294 
 L 220.368281 223.548632 
-L 217.688276 227.654473 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 365.462069 228.526638 
+    <path clip-path="url(#p9defebae56)" d="M 365.462069 228.526638 
 L 361.004824 223.548632 
 L 365.462069 218.777378 
 L 371.778911 223.548632 
 L 365.462069 228.526638 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 106.857931 210.8316 
+    <path clip-path="url(#p9defebae56)" d="M 106.857931 210.8316 
 L 103.136843 209.542737 
 L 106.857931 206.358927 
 L 111.280968 195.536842 
@@ -668,13 +679,13 @@ L 119.172414 205.228518
 L 110.18651 209.542737 
 L 106.857931 210.8316 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 230.002759 214.569459 
+    <path clip-path="url(#p9defebae56)" d="M 230.002759 214.569459 
 L 225.491742 209.542737 
 L 230.002759 204.894903 
 L 235.689914 209.542737 
 L 230.002759 214.569459 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 303.889655 217.82855 
+    <path clip-path="url(#p9defebae56)" d="M 303.889655 217.82855 
 L 297.410662 209.542737 
 L 301.228196 195.536842 
 L 303.889655 185.824651 
@@ -682,7 +693,7 @@ L 310.910622 195.536842
 L 312.146503 209.542737 
 L 303.889655 217.82855 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 353.147586 212.319898 
+    <path clip-path="url(#p9defebae56)" d="M 353.147586 212.319898 
 L 350.357794 209.542737 
 L 345.719331 195.536842 
 L 353.147586 186.69701 
@@ -690,13 +701,13 @@ L 359.732204 195.536842
 L 355.411572 209.542737 
 L 353.147586 212.319898 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 390.091034 222.897008 
+    <path clip-path="url(#p9defebae56)" d="M 390.091034 222.897008 
 L 385.703507 209.542737 
 L 390.091034 201.301809 
 L 396.356131 209.542737 
 L 390.091034 222.897008 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 156.115862 195.597759 
+    <path clip-path="url(#p9defebae56)" d="M 156.115862 195.597759 
 L 156.028923 195.536842 
 L 148.200163 181.530947 
 L 156.115862 175.204243 
@@ -704,29 +715,29 @@ L 159.816616 181.530947
 L 168.430345 192.893373 
 L 172.55951 195.536842 
 L 168.430345 202.090756 
-L 156.115862 195.597759 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 266.946207 200.59429 
+    <path clip-path="url(#p9defebae56)" d="M 266.946207 200.59429 
 L 256.024665 195.536842 
 L 266.946207 192.387678 
 L 279.26069 190.711973 
 L 283.656533 195.536842 
 L 279.26069 206.662557 
-L 266.946207 200.59429 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 69.914483 193.162187 
+    <path clip-path="url(#p9defebae56)" d="M 69.914483 193.162187 
 L 62.255522 181.530947 
 L 69.914483 175.295413 
 L 75.051722 181.530947 
-L 69.914483 193.162187 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 254.631724 192.276852 
+    <path clip-path="url(#p9defebae56)" d="M 254.631724 192.276852 
 L 252.805853 181.530947 
 L 254.631724 178.106508 
 L 255.970215 181.530947 
-L 254.631724 192.276852 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 340.833103 185.145776 
+    <path clip-path="url(#p9defebae56)" d="M 340.833103 185.145776 
 L 339.881253 181.530947 
 L 339.872453 167.525053 
 L 340.833103 161.204643 
@@ -734,9 +745,9 @@ L 353.147586 157.615213
 L 358.355062 167.525053 
 L 353.147586 172.425241 
 L 344.298181 181.530947 
-L 340.833103 185.145776 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 131.486897 171.61847 
+    <path clip-path="url(#p9defebae56)" d="M 131.486897 171.61847 
 L 123.955328 167.525053 
 L 126.503725 153.519158 
 L 131.486897 144.965755 
@@ -744,9 +755,9 @@ L 136.820939 153.519158
 L 143.801379 163.265458 
 L 147.100852 167.525053 
 L 143.801379 173.74737 
-L 131.486897 171.61847 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 205.373793 178.053436 
+    <path clip-path="url(#p9defebae56)" d="M 205.373793 178.053436 
 L 203.54818 167.525053 
 L 205.373793 157.097693 
 L 207.998494 153.519158 
@@ -756,7 +767,7 @@ L 217.688276 165.516528
 L 215.533355 167.525053 
 L 205.373793 178.053436 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 316.204138 168.073237 
+    <path clip-path="url(#p9defebae56)" d="M 316.204138 168.073237 
 L 314.490846 167.525053 
 L 304.545115 153.519158 
 L 303.889655 152.981452 
@@ -770,23 +781,23 @@ L 309.193089 139.513263
 L 316.204138 148.624644 
 L 319.006838 153.519158 
 L 316.351265 167.525053 
-L 316.204138 168.073237 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 69.914483 155.432532 
+    <path clip-path="url(#p9defebae56)" d="M 69.914483 155.432532 
 L 67.440657 153.519158 
 L 69.914483 148.951832 
 L 72.355447 153.519158 
-L 69.914483 155.432532 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 94.543448 164.193301 
+    <path clip-path="url(#p9defebae56)" d="M 94.543448 164.193301 
 L 92.128032 153.519158 
 L 94.543448 149.990853 
 L 106.857931 143.668782 
 L 113.869048 153.519158 
 L 106.857931 161.34924 
-L 94.543448 164.193301 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 377.776552 162.187189 
+    <path clip-path="url(#p9defebae56)" d="M 377.776552 162.187189 
 L 368.059437 153.519158 
 L 365.462069 150.080228 
 L 359.239147 139.513263 
@@ -798,13 +809,13 @@ L 390.091034 148.981036
 L 387.186048 153.519158 
 L 377.776552 162.187189 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 168.430345 141.161331 
+    <path clip-path="url(#p9defebae56)" d="M 168.430345 141.161331 
 L 163.735013 139.513263 
 L 168.430345 137.193674 
 L 171.298236 139.513263 
-L 168.430345 141.161331 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 193.05931 144.524713 
+    <path clip-path="url(#p9defebae56)" d="M 193.05931 144.524713 
 L 191.191941 139.513263 
 L 185.538459 125.507368 
 L 185.063105 111.501474 
@@ -814,23 +825,23 @@ L 197.140171 97.495579
 L 196.382719 111.501474 
 L 195.125703 125.507368 
 L 194.355515 139.513263 
-L 193.05931 144.524713 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 266.946207 145.761801 
+    <path clip-path="url(#p9defebae56)" d="M 266.946207 145.761801 
 L 262.659804 139.513263 
 L 266.946207 132.889792 
 L 273.904989 139.513263 
-L 266.946207 145.761801 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 328.518621 145.144738 
+    <path clip-path="url(#p9defebae56)" d="M 328.518621 145.144738 
 L 321.736338 139.513263 
 L 328.518621 129.03959 
 L 340.833103 135.563645 
 L 343.415292 139.513263 
 L 340.833103 148.870224 
-L 328.518621 145.144738 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 94.543448 131.352401 
+    <path clip-path="url(#p9defebae56)" d="M 94.543448 131.352401 
 L 86.582942 125.507368 
 L 82.228966 121.915196 
 L 76.273271 111.501474 
@@ -840,7 +851,7 @@ L 94.543448 118.93601
 L 102.133798 125.507368 
 L 94.543448 131.352401 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 230.002759 132.968864 
+    <path clip-path="url(#p9defebae56)" d="M 230.002759 132.968864 
 L 224.389583 125.507368 
 L 228.314374 111.501474 
 L 230.002759 106.383954 
@@ -848,15 +859,15 @@ L 231.641322 111.501474
 L 235.618077 125.507368 
 L 230.002759 132.968864 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 143.801379 118.50185 
+    <path clip-path="url(#p9defebae56)" d="M 143.801379 118.50185 
 L 137.315385 111.501474 
 L 133.840481 97.495579 
 L 143.801379 90.369815 
 L 150.990002 97.495579 
 L 154.806957 111.501474 
-L 143.801379 118.50185 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 316.204138 114.070213 
+    <path clip-path="url(#p9defebae56)" d="M 316.204138 114.070213 
 L 310.412294 111.501474 
 L 303.889655 108.004522 
 L 297.284656 97.495579 
@@ -864,9 +875,9 @@ L 303.889655 90.394339
 L 314.031771 97.495579 
 L 316.204138 103.381662 
 L 320.327212 111.501474 
-L 316.204138 114.070213 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 390.091034 113.584778 
+    <path clip-path="url(#p9defebae56)" d="M 390.091034 113.584778 
 L 388.665526 111.501474 
 L 389.630022 97.495579 
 L 377.776552 87.440462 
@@ -880,13 +891,13 @@ L 390.595728 97.495579
 L 401.230061 111.501474 
 L 390.091034 113.584778 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 254.631724 98.757023 
+    <path clip-path="url(#p9defebae56)" d="M 254.631724 98.757023 
 L 254.045732 97.495579 
 L 254.631724 90.050648 
 L 266.439859 97.495579 
-L 254.631724 98.757023 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 82.228966 84.600067 
+    <path clip-path="url(#p9defebae56)" d="M 82.228966 84.600067 
 L 81.537932 83.489684 
 L 79.808025 69.483789 
 L 82.228966 62.646369 
@@ -896,19 +907,19 @@ L 94.543448 80.082481
 L 84.993699 83.489684 
 L 82.228966 84.600067 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 119.172414 89.046982 
+    <path clip-path="url(#p9defebae56)" d="M 119.172414 89.046982 
 L 112.677362 83.489684 
 L 119.172414 74.310742 
 L 124.653651 83.489684 
 L 119.172414 89.046982 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 180.744828 89.774515 
+    <path clip-path="url(#p9defebae56)" d="M 180.744828 89.774515 
 L 178.480403 83.489684 
 L 180.744828 79.50067 
 L 184.908898 83.489684 
-L 180.744828 89.774515 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 193.05931 72.296211 
+    <path clip-path="url(#p9defebae56)" d="M 193.05931 72.296211 
 L 191.042561 69.483789 
 L 193.05931 67.914764 
 L 205.373793 64.779626 
@@ -916,33 +927,33 @@ L 217.688276 67.478366
 L 218.656932 69.483789 
 L 217.688276 70.053578 
 L 205.373793 73.921049 
-L 193.05931 72.296211 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 242.317241 71.008843 
+    <path clip-path="url(#p9defebae56)" d="M 242.317241 71.008843 
 L 241.351105 69.483789 
 L 242.317241 68.915498 
 L 242.915744 69.483789 
 L 242.317241 71.008843 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 303.889655 77.172712 
+    <path clip-path="url(#p9defebae56)" d="M 303.889655 77.172712 
 L 298.177689 69.483789 
 L 303.889655 64.740528 
 L 310.601994 69.483789 
-L 303.889655 77.172712 
+z
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 254.631724 62.114735 
+    <path clip-path="url(#p9defebae56)" d="M 254.631724 62.114735 
 L 249.371787 55.477895 
 L 254.631724 45.275116 
 L 262.709697 55.477895 
 L 254.631724 62.114735 
 " style="fill:none;stroke:#2c728e;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
    </g>
-   <g id="LineCollection_5">
-    <path clip-path="url(#pd19901ac8d)" d="M 114.942057 307.584 
+   <g id="PathCollection_5">
+    <path clip-path="url(#p9defebae56)" d="M 114.942057 307.584 
 L 119.172414 295.509788 
 L 125.416516 307.584 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 142.109162 307.584 
+    <path clip-path="url(#p9defebae56)" d="M 142.109162 307.584 
 L 143.801379 306.018044 
 L 153.115479 293.578105 
 L 147.960933 279.572211 
@@ -959,7 +970,7 @@ L 180.744828 305.892347
 L 168.430345 299.517245 
 L 158.589673 307.584 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 265.459412 307.584 
+    <path clip-path="url(#p9defebae56)" d="M 265.459412 307.584 
 L 266.946207 304.659837 
 L 270.949903 293.578105 
 L 266.946207 285.549552 
@@ -990,11 +1001,11 @@ L 310.834661 279.572211
 L 312.488746 293.578105 
 L 313.694017 307.584 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 282.563798 307.584 
+    <path clip-path="url(#p9defebae56)" d="M 282.563798 307.584 
 L 279.26069 305.308509 
 L 271.821335 307.584 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 335.144462 307.584 
+    <path clip-path="url(#p9defebae56)" d="M 335.144462 307.584 
 L 328.518621 298.780307 
 L 321.51155 293.578105 
 L 328.518621 286.251407 
@@ -1010,15 +1021,15 @@ L 353.907803 293.578105
 L 353.147586 293.749876 
 L 343.867507 307.584 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 360.652944 307.584 
+    <path clip-path="url(#p9defebae56)" d="M 360.652944 307.584 
 L 365.462069 296.764582 
 L 377.400921 307.584 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 380.195573 307.584 
+    <path clip-path="url(#p9defebae56)" d="M 380.195573 307.584 
 L 390.091034 302.229877 
 L 391.431222 307.584 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 414.72 296.351161 
+    <path clip-path="url(#p9defebae56)" d="M 414.72 296.351161 
 L 402.405517 297.677705 
 L 394.067133 293.578105 
 L 390.091034 284.796144 
@@ -1030,7 +1041,7 @@ L 402.405517 270.671116
 L 408.609986 279.572211 
 L 414.72 289.993191 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 57.6 258.323068 
+    <path clip-path="url(#p9defebae56)" d="M 57.6 258.323068 
 L 60.654164 265.566316 
 L 69.914483 276.388981 
 L 82.228966 268.422216 
@@ -1051,7 +1062,7 @@ L 73.59305 293.578105
 L 69.914483 286.398504 
 L 57.6 290.955242 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 414.72 256.2323 
+    <path clip-path="url(#p9defebae56)" d="M 414.72 256.2323 
 L 402.405517 261.109948 
 L 395.744922 251.560421 
 L 390.091034 242.900448 
@@ -1147,11 +1158,11 @@ L 69.914483 229.78425
 L 58.071693 237.554526 
 L 57.6 239.703965 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 414.72 235.437323 
+    <path clip-path="url(#p9defebae56)" d="M 414.72 235.437323 
 L 414.264944 237.554526 
 L 414.72 238.065547 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 57.6 219.626698 
+    <path clip-path="url(#p9defebae56)" d="M 57.6 219.626698 
 L 69.914483 212.168316 
 L 82.228966 217.244583 
 L 89.958556 209.542737 
@@ -1159,11 +1170,11 @@ L 82.228966 197.561531
 L 69.914483 203.324421 
 L 57.6 201.305635 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 57.6 186.92322 
+    <path clip-path="url(#p9defebae56)" d="M 57.6 186.92322 
 L 59.149372 181.530947 
 L 57.6 178.254043 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 57.6 158.614821 
+    <path clip-path="url(#p9defebae56)" d="M 57.6 158.614821 
 L 62.352378 153.519158 
 L 69.914483 139.557544 
 L 77.376137 153.519158 
@@ -1233,7 +1244,7 @@ L 214.965036 55.477895
 L 217.688276 51.917118 
 L 224.905914 41.472 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 414.72 112.346347 
+    <path clip-path="url(#p9defebae56)" d="M 414.72 112.346347 
 L 402.405517 116.261878 
 L 390.091034 123.709456 
 L 381.737682 111.501474 
@@ -1265,18 +1276,18 @@ L 402.405517 228.879458
 L 411.523091 223.548632 
 L 414.72 221.774979 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 57.6 89.406457 
+    <path clip-path="url(#p9defebae56)" d="M 57.6 89.406457 
 L 64.526966 97.495579 
 L 57.6 104.940146 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 414.72 70.57427 
+    <path clip-path="url(#p9defebae56)" d="M 414.72 70.57427 
 L 408.259263 83.489684 
 L 402.405517 90.646069 
 L 395.494546 97.495579 
 L 402.405517 105.766183 
 L 414.72 108.951794 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 81.984848 41.472 
+    <path clip-path="url(#p9defebae56)" d="M 81.984848 41.472 
 L 82.228966 43.32953 
 L 83.922075 55.477895 
 L 94.543448 61.576347 
@@ -1284,7 +1295,7 @@ L 104.368734 55.477895
 L 106.857931 49.949764 
 L 114.474341 41.472 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 157.392517 41.472 
+    <path clip-path="url(#p9defebae56)" d="M 157.392517 41.472 
 L 156.115862 42.87057 
 L 152.22659 55.477895 
 L 143.801379 65.414716 
@@ -1307,7 +1318,7 @@ L 69.914483 62.029824
 L 59.448662 55.477895 
 L 60.047136 41.472 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 212.666171 41.472 
+    <path clip-path="url(#p9defebae56)" d="M 212.666171 41.472 
 L 205.373793 49.138608 
 L 193.05931 53.693918 
 L 180.744828 54.392707 
@@ -1317,7 +1328,7 @@ L 164.138918 55.477895
 L 168.430345 50.46347 
 L 172.953462 41.472 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 258.665318 41.472 
+    <path clip-path="url(#p9defebae56)" d="M 258.665318 41.472 
 L 266.841194 55.477895 
 L 254.631724 65.509161 
 L 248.312505 69.483789 
@@ -1327,7 +1338,7 @@ L 271.544958 69.483789
 L 267.129217 55.477895 
 L 273.493001 41.472 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 302.025694 41.472 
+    <path clip-path="url(#p9defebae56)" d="M 302.025694 41.472 
 L 294.957414 55.477895 
 L 303.889655 62.104658 
 L 314.332097 69.483789 
@@ -1342,7 +1353,7 @@ L 329.733911 55.477895
 L 328.518621 48.888278 
 L 324.413549 41.472 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 350.130495 41.472 
+    <path clip-path="url(#p9defebae56)" d="M 350.130495 41.472 
 L 353.147586 46.030551 
 L 362.847011 55.477895 
 L 365.462069 58.998358 
@@ -1351,25 +1362,25 @@ L 390.091034 66.289695
 L 402.405517 56.049182 
 L 414.72 67.067338 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 414.72 45.01696 
+    <path clip-path="url(#p9defebae56)" d="M 414.72 45.01696 
 L 402.405517 55.349174 
 L 390.091034 45.113378 
 L 377.776552 49.4537 
 L 370.961025 41.472 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 353.147586 267.703606 
+    <path clip-path="url(#p9defebae56)" d="M 353.147586 267.703606 
 L 351.632334 265.566316 
 L 353.147586 264.150466 
 L 356.230675 265.566316 
 L 353.147586 267.703606 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 69.914483 258.192253 
+    <path clip-path="url(#p9defebae56)" d="M 69.914483 258.192253 
 L 60.740943 251.560421 
 L 69.914483 246.086018 
 L 79.601213 251.560421 
-L 69.914483 258.192253 
+z
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 291.575172 257.509071 
+    <path clip-path="url(#p9defebae56)" d="M 291.575172 257.509071 
 L 282.535636 251.560421 
 L 291.575172 240.70279 
 L 303.889655 242.90147 
@@ -1377,13 +1388,13 @@ L 313.401515 251.560421
 L 303.889655 257.778801 
 L 291.575172 257.509071 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 106.857931 235.649115 
+    <path clip-path="url(#p9defebae56)" d="M 106.857931 235.649115 
 L 110.31478 223.548632 
 L 106.857931 217.969827 
 L 104.155092 223.548632 
-L 106.857931 235.649115 
+z
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 143.801379 224.193999 
+    <path clip-path="url(#p9defebae56)" d="M 143.801379 224.193999 
 L 144.612751 223.548632 
 L 156.115862 220.094586 
 L 160.105797 223.548632 
@@ -1401,21 +1412,21 @@ L 126.469681 195.536842
 L 131.486897 209.338875 
 L 132.015953 209.542737 
 L 143.245946 223.548632 
-L 143.801379 224.193999 
+z
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 230.002759 227.739692 
+    <path clip-path="url(#p9defebae56)" d="M 230.002759 227.739692 
 L 239.276892 223.548632 
 L 230.002759 219.997907 
 L 226.1929 223.548632 
-L 230.002759 227.739692 
+z
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 217.688276 213.630807 
+    <path clip-path="url(#p9defebae56)" d="M 217.688276 213.630807 
 L 220.620214 209.542737 
 L 217.688276 201.121788 
 L 211.414509 209.542737 
-L 217.688276 213.630807 
+z
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 365.462069 214.105153 
+    <path clip-path="url(#p9defebae56)" d="M 365.462069 214.105153 
 L 377.776552 223.324305 
 L 382.939677 209.542737 
 L 390.091034 196.110613 
@@ -1429,9 +1440,9 @@ L 365.462069 170.543257
 L 354.462872 181.530947 
 L 364.368117 195.536842 
 L 360.496575 209.542737 
-L 365.462069 214.105153 
+z
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 180.744828 200.477892 
+    <path clip-path="url(#p9defebae56)" d="M 180.744828 200.477892 
 L 186.594878 195.536842 
 L 193.05931 190.483819 
 L 200.396499 181.530947 
@@ -1449,9 +1460,9 @@ L 156.115862 171.091602
 L 162.222271 181.530947 
 L 168.430345 189.720057 
 L 177.51631 195.536842 
-L 180.744828 200.477892 
+z
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 291.575172 205.614525 
+    <path clip-path="url(#p9defebae56)" d="M 291.575172 205.614525 
 L 295.752776 195.536842 
 L 299.881967 181.530947 
 L 291.575172 168.591586 
@@ -1461,9 +1472,9 @@ L 260.336281 181.530947
 L 266.946207 188.069052 
 L 279.26069 185.781962 
 L 288.14817 195.536842 
-L 291.575172 205.614525 
+z
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 180.744828 183.982194 
+    <path clip-path="url(#p9defebae56)" d="M 180.744828 183.982194 
 L 180.118975 181.530947 
 L 168.430345 168.529955 
 L 166.127571 167.525053 
@@ -1471,9 +1482,9 @@ L 168.430345 166.296457
 L 180.744828 165.967414 
 L 182.103919 167.525053 
 L 181.948714 181.530947 
-L 180.744828 183.982194 
+z
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 328.518621 192.657102 
+    <path clip-path="url(#p9defebae56)" d="M 328.518621 192.657102 
 L 336.952661 181.530947 
 L 331.419286 167.525053 
 L 336.699565 153.519158 
@@ -1481,21 +1492,21 @@ L 328.518621 148.239881
 L 322.522345 153.519158 
 L 325.410117 167.525053 
 L 318.331147 181.530947 
-L 328.518621 192.657102 
+z
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 106.857931 174.602206 
+    <path clip-path="url(#p9defebae56)" d="M 106.857931 174.602206 
 L 114.138689 167.525053 
 L 106.857931 164.718516 
 L 100.763769 167.525053 
-L 106.857931 174.602206 
+z
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 143.801379 157.032486 
+    <path clip-path="url(#p9defebae56)" d="M 143.801379 157.032486 
 L 148.694148 153.519158 
 L 143.801379 146.051837 
 L 141.285083 153.519158 
-L 143.801379 157.032486 
+z
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 266.946207 158.466908 
+    <path clip-path="url(#p9defebae56)" d="M 266.946207 158.466908 
 L 279.26069 166.176719 
 L 291.575172 164.236127 
 L 295.441055 153.519158 
@@ -1505,9 +1516,9 @@ L 281.604497 139.513263
 L 279.26069 143.20282 
 L 266.946207 152.248537 
 L 263.245139 153.519158 
-L 266.946207 158.466908 
+z
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 205.373793 147.220382 
+    <path clip-path="url(#p9defebae56)" d="M 205.373793 147.220382 
 L 214.872785 139.513263 
 L 217.688276 133.745401 
 L 219.753175 125.507368 
@@ -1549,58 +1560,58 @@ L 205.373793 102.197813
 L 200.692496 111.501474 
 L 200.358782 125.507368 
 L 199.724944 139.513263 
-L 205.373793 147.220382 
+z
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 316.204138 142.485316 
+    <path clip-path="url(#p9defebae56)" d="M 316.204138 142.485316 
 L 318.008693 139.513263 
 L 325.087449 125.507368 
 L 316.204138 119.787726 
 L 311.81785 125.507368 
 L 313.917195 139.513263 
-L 316.204138 142.485316 
+z
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 365.462069 113.517689 
+    <path clip-path="url(#p9defebae56)" d="M 365.462069 113.517689 
 L 364.03162 111.501474 
 L 365.462069 110.048404 
 L 367.937932 111.501474 
-L 365.462069 113.517689 
+z
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 303.889655 85.724032 
+    <path clip-path="url(#p9defebae56)" d="M 303.889655 85.724032 
 L 315.192863 83.489684 
 L 303.889655 81.445511 
 L 293.656735 83.489684 
-L 303.889655 85.724032 
+z
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 291.575172 82.332006 
+    <path clip-path="url(#p9defebae56)" d="M 291.575172 82.332006 
 L 295.003502 69.483789 
 L 291.575172 62.039379 
 L 288.284652 69.483789 
-L 291.575172 82.332006 
+z
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 242.317241 63.791154 
+    <path clip-path="url(#p9defebae56)" d="M 242.317241 63.791154 
 L 246.681582 55.477895 
 L 242.317241 45.199319 
 L 234.228507 55.477895 
-L 242.317241 63.791154 
+z
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 316.204138 56.878044 
+    <path clip-path="url(#p9defebae56)" d="M 316.204138 56.878044 
 L 315.937013 55.477895 
 L 316.204138 54.186436 
 L 318.495542 55.477895 
 L 316.204138 56.878044 
 " style="fill:none;stroke:#21918c;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
    </g>
-   <g id="LineCollection_6">
-    <path clip-path="url(#pd19901ac8d)" d="M 66.304339 307.584 
+   <g id="PathCollection_6">
+    <path clip-path="url(#p9defebae56)" d="M 66.304339 307.584 
 L 57.6 299.192741 
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 111.479085 307.584 
+    <path clip-path="url(#p9defebae56)" d="M 111.479085 307.584 
 L 106.857931 300.835047 
 L 94.543448 302.803687 
 L 82.228966 306.242798 
 L 78.424716 307.584 
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 133.164929 307.584 
+    <path clip-path="url(#p9defebae56)" d="M 133.164929 307.584 
 L 143.801379 297.741166 
 L 146.918369 293.578105 
 L 143.801379 285.958165 
@@ -1608,44 +1619,44 @@ L 131.486897 291.471261
 L 126.552916 293.578105 
 L 130.52794 307.584 
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 204.681676 307.584 
+    <path clip-path="url(#p9defebae56)" d="M 204.681676 307.584 
 L 193.05931 304.395845 
 L 186.909978 307.584 
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 259.66176 307.584 
+    <path clip-path="url(#p9defebae56)" d="M 259.66176 307.584 
 L 254.631724 304.044996 
 L 247.265997 307.584 
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 329.01252 307.584 
+    <path clip-path="url(#p9defebae56)" d="M 329.01252 307.584 
 L 328.518621 306.927761 
 L 324.754711 307.584 
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 358.007598 307.584 
+    <path clip-path="url(#p9defebae56)" d="M 358.007598 307.584 
 L 353.147586 298.625865 
 L 347.138373 307.584 
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 414.72 302.466938 
+    <path clip-path="url(#p9defebae56)" d="M 414.72 302.466938 
 L 402.405517 302.848075 
 L 397.159011 307.584 
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 414.72 264.329414 
+    <path clip-path="url(#p9defebae56)" d="M 414.72 264.329414 
 L 409.835941 265.566316 
 L 413.245581 279.572211 
 L 414.72 282.086917 
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 57.6 210.76342 
+    <path clip-path="url(#p9defebae56)" d="M 57.6 210.76342 
 L 59.888172 209.542737 
 L 57.6 208.54562 
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 414.72 161.311118 
+    <path clip-path="url(#p9defebae56)" d="M 414.72 161.311118 
 L 413.649476 167.525053 
 L 414.72 171.025537 
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 57.6 116.509096 
+    <path clip-path="url(#p9defebae56)" d="M 57.6 116.509096 
 L 62.19222 111.501474 
 L 57.6 110.587304 
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 414.72 118.469215 
+    <path clip-path="url(#p9defebae56)" d="M 414.72 118.469215 
 L 402.405517 121.127942 
 L 395.970978 125.507368 
 L 399.057939 139.513263 
@@ -1653,7 +1664,7 @@ L 402.405517 145.095997
 L 409.443924 139.513263 
 L 414.72 133.78819 
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 57.6 80.256166 
+    <path clip-path="url(#p9defebae56)" d="M 57.6 80.256166 
 L 58.964636 83.489684 
 L 69.781492 97.495579 
 L 69.914483 98.687013 
@@ -1663,27 +1674,27 @@ L 72.529897 69.483789
 L 69.914483 66.36679 
 L 57.6 67.526846 
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 414.72 78.513496 
+    <path clip-path="url(#p9defebae56)" d="M 414.72 78.513496 
 L 412.230738 83.489684 
 L 414.72 92.209218 
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 165.185668 41.472 
+    <path clip-path="url(#p9defebae56)" d="M 165.185668 41.472 
 L 168.430345 44.11513 
 L 169.759959 41.472 
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 217.688276 302.38989 
+    <path clip-path="url(#p9defebae56)" d="M 217.688276 302.38989 
 L 223.447927 293.578105 
 L 217.688276 288.518577 
 L 213.813234 293.578105 
-L 217.688276 302.38989 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 205.373793 281.242681 
+    <path clip-path="url(#p9defebae56)" d="M 205.373793 281.242681 
 L 207.134174 279.572211 
 L 205.373793 277.599665 
 L 201.237342 279.572211 
-L 205.373793 281.242681 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 316.204138 282.32002 
+    <path clip-path="url(#p9defebae56)" d="M 316.204138 282.32002 
 L 319.057375 279.572211 
 L 316.943066 265.566316 
 L 316.204138 262.383543 
@@ -1695,9 +1706,9 @@ L 279.26069 272.604958
 L 291.575172 272.257945 
 L 303.889655 270.496601 
 L 315.60315 279.572211 
-L 316.204138 282.32002 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 353.147586 285.928956 
+    <path clip-path="url(#p9defebae56)" d="M 353.147586 285.928956 
 L 365.462069 290.031024 
 L 377.776552 284.341901 
 L 381.209583 279.572211 
@@ -1715,81 +1726,81 @@ L 353.147586 259.924103
 L 365.433811 265.566316 
 L 353.147586 274.083495 
 L 350.345311 279.572211 
-L 353.147586 285.928956 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 69.914483 269.306346 
+    <path clip-path="url(#p9defebae56)" d="M 69.914483 269.306346 
 L 75.04399 265.566316 
 L 69.914483 263.018032 
 L 66.714358 265.566316 
-L 69.914483 269.306346 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 94.543448 266.481617 
+    <path clip-path="url(#p9defebae56)" d="M 94.543448 266.481617 
 L 98.050323 265.566316 
 L 97.750929 251.560421 
 L 94.543448 248.135848 
 L 88.238741 251.560421 
 L 91.712475 265.566316 
-L 94.543448 266.481617 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 143.801379 276.002504 
+    <path clip-path="url(#p9defebae56)" d="M 143.801379 276.002504 
 L 151.119517 265.566316 
 L 154.779698 251.560421 
 L 143.801379 246.543385 
 L 138.145171 251.560421 
 L 136.963097 265.566316 
-L 143.801379 276.002504 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 180.744828 278.71164 
+    <path clip-path="url(#p9defebae56)" d="M 180.744828 278.71164 
 L 184.873213 265.566316 
 L 180.744828 259.848218 
 L 171.739434 265.566316 
-L 180.744828 278.71164 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 217.688276 266.642683 
+    <path clip-path="url(#p9defebae56)" d="M 217.688276 266.642683 
 L 218.661911 265.566316 
 L 217.688276 263.035772 
 L 216.756962 265.566316 
-L 217.688276 266.642683 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 242.317241 271.660231 
+    <path clip-path="url(#p9defebae56)" d="M 242.317241 271.660231 
 L 248.291645 265.566316 
 L 242.317241 252.926171 
 L 237.798712 265.566316 
-L 242.317241 271.660231 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 390.091034 255.050991 
+    <path clip-path="url(#p9defebae56)" d="M 390.091034 255.050991 
 L 391.695644 251.560421 
 L 390.091034 249.102666 
 L 388.167782 251.560421 
-L 390.091034 255.050991 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 69.914483 242.102464 
+    <path clip-path="url(#p9defebae56)" d="M 69.914483 242.102464 
 L 74.490112 237.554526 
 L 69.914483 233.412375 
 L 63.60137 237.554526 
-L 69.914483 242.102464 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 131.486897 240.483748 
+    <path clip-path="url(#p9defebae56)" d="M 131.486897 240.483748 
 L 133.309797 237.554526 
 L 131.486897 235.503971 
 L 129.239916 237.554526 
-L 131.486897 240.483748 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 193.05931 248.933583 
+    <path clip-path="url(#p9defebae56)" d="M 193.05931 248.933583 
 L 205.373793 238.843375 
 L 207.508733 237.554526 
 L 205.373793 235.437843 
 L 193.05931 228.038565 
 L 187.329451 237.554526 
-L 193.05931 248.933583 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 242.317241 241.254546 
+    <path clip-path="url(#p9defebae56)" d="M 242.317241 241.254546 
 L 242.61341 237.554526 
 L 242.317241 236.942913 
 L 242.053299 237.554526 
-L 242.317241 241.254546 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 279.26069 244.416327 
+    <path clip-path="url(#p9defebae56)" d="M 279.26069 244.416327 
 L 284.746233 237.554526 
 L 291.575172 230.918838 
 L 295.448671 223.548632 
@@ -1799,143 +1810,143 @@ L 266.946207 222.99192
 L 261.349198 223.548632 
 L 266.946207 223.687634 
 L 277.512159 237.554526 
-L 279.26069 244.416327 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 303.889655 238.25629 
+    <path clip-path="url(#p9defebae56)" d="M 303.889655 238.25629 
 L 306.361399 237.554526 
 L 303.889655 236.242369 
 L 301.425217 237.554526 
-L 303.889655 238.25629 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 328.518621 238.707834 
+    <path clip-path="url(#p9defebae56)" d="M 328.518621 238.707834 
 L 328.98275 237.554526 
 L 336.822372 223.548632 
 L 328.518621 220.993413 
 L 325.762798 223.548632 
 L 327.218053 237.554526 
-L 328.518621 238.707834 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 168.430345 228.802268 
+    <path clip-path="url(#p9defebae56)" d="M 168.430345 228.802268 
 L 171.65681 223.548632 
 L 168.430345 216.984089 
 L 164.421789 223.548632 
-L 168.430345 228.802268 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 156.115862 216.358275 
+    <path clip-path="url(#p9defebae56)" d="M 156.115862 216.358275 
 L 163.923865 209.542737 
 L 156.115862 202.890898 
 L 146.557813 209.542737 
-L 156.115862 216.358275 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 377.776552 215.947009 
+    <path clip-path="url(#p9defebae56)" d="M 377.776552 215.947009 
 L 380.175848 209.542737 
 L 377.776552 199.52116 
 L 365.786673 209.542737 
-L 377.776552 215.947009 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 131.486897 199.756888 
+    <path clip-path="url(#p9defebae56)" d="M 131.486897 199.756888 
 L 143.801379 201.12784 
 L 145.620391 195.536842 
 L 143.801379 192.261577 
 L 131.486897 188.043986 
 L 129.952856 195.536842 
-L 131.486897 199.756888 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 82.228966 189.281637 
+    <path clip-path="url(#p9defebae56)" d="M 82.228966 189.281637 
 L 91.319711 181.530947 
 L 82.228966 173.725263 
 L 79.218614 181.530947 
-L 82.228966 189.281637 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 168.430345 186.546742 
+    <path clip-path="url(#p9defebae56)" d="M 168.430345 186.546742 
 L 175.58958 181.530947 
 L 168.430345 173.567896 
 L 164.627927 181.530947 
-L 168.430345 186.546742 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 193.05931 183.463148 
+    <path clip-path="url(#p9defebae56)" d="M 193.05931 183.463148 
 L 194.642815 181.530947 
 L 194.610757 167.525053 
 L 193.05931 164.984412 
 L 190.236012 167.525053 
 L 190.661432 181.530947 
-L 193.05931 183.463148 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 217.688276 187.088736 
+    <path clip-path="url(#p9defebae56)" d="M 217.688276 187.088736 
 L 224.942564 181.530947 
 L 217.688276 176.9816 
 L 213.618992 181.530947 
-L 217.688276 187.088736 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 266.946207 183.750426 
+    <path clip-path="url(#p9defebae56)" d="M 266.946207 183.750426 
 L 276.658039 181.530947 
 L 266.946207 177.686933 
 L 264.702347 181.530947 
-L 266.946207 183.750426 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 291.575172 191.696012 
+    <path clip-path="url(#p9defebae56)" d="M 291.575172 191.696012 
 L 294.777343 181.530947 
 L 291.575172 176.542977 
 L 281.477634 181.530947 
-L 291.575172 191.696012 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 328.518621 188.793714 
+    <path clip-path="url(#p9defebae56)" d="M 328.518621 188.793714 
 L 334.024069 181.530947 
 L 328.518621 171.151675 
 L 321.868592 181.530947 
-L 328.518621 188.793714 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 365.462069 186.507639 
+    <path clip-path="url(#p9defebae56)" d="M 365.462069 186.507639 
 L 369.454349 181.530947 
 L 365.462069 178.275 
 L 362.202712 181.530947 
-L 365.462069 186.507639 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 69.914483 170.237677 
+    <path clip-path="url(#p9defebae56)" d="M 69.914483 170.237677 
 L 75.863628 167.525053 
 L 69.914483 163.303567 
 L 66.350012 167.525053 
-L 69.914483 170.237677 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 390.091034 179.714731 
+    <path clip-path="url(#p9defebae56)" d="M 390.091034 179.714731 
 L 396.148525 167.525053 
 L 390.091034 160.064368 
 L 382.661086 167.525053 
-L 390.091034 179.714731 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 168.430345 160.137056 
+    <path clip-path="url(#p9defebae56)" d="M 168.430345 160.137056 
 L 180.744828 156.647323 
 L 182.917483 153.519158 
 L 180.744828 148.747088 
 L 168.430345 149.20041 
 L 163.913748 153.519158 
-L 168.430345 160.137056 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 328.518621 160.772976 
+    <path clip-path="url(#p9defebae56)" d="M 328.518621 160.772976 
 L 331.903227 153.519158 
 L 328.518621 151.335024 
 L 326.037851 153.519158 
-L 328.518621 160.772976 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 82.228966 151.157072 
+    <path clip-path="url(#p9defebae56)" d="M 82.228966 151.157072 
 L 84.972149 139.513263 
 L 82.228966 138.076491 
 L 80.479495 139.513263 
-L 82.228966 151.157072 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 205.373793 139.894496 
+    <path clip-path="url(#p9defebae56)" d="M 205.373793 139.894496 
 L 205.84366 139.513263 
 L 205.373793 131.735512 
 L 205.094373 139.513263 
-L 205.373793 139.894496 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 291.575172 141.629994 
+    <path clip-path="url(#p9defebae56)" d="M 291.575172 141.629994 
 L 291.958125 139.513263 
 L 291.575172 138.847924 
 L 290.666905 139.513263 
-L 291.575172 141.629994 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 131.486897 126.281061 
+    <path clip-path="url(#p9defebae56)" d="M 131.486897 126.281061 
 L 143.801379 128.617777 
 L 156.115862 130.8905 
 L 168.430345 125.878999 
@@ -1947,23 +1958,23 @@ L 131.965222 111.501474
 L 131.486897 110.082482 
 L 129.412284 111.501474 
 L 131.046427 125.507368 
-L 131.486897 126.281061 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 254.631724 126.6952 
+    <path clip-path="url(#p9defebae56)" d="M 254.631724 126.6952 
 L 254.868365 125.507368 
 L 254.957363 111.501474 
 L 254.631724 111.331826 
 L 254.107191 111.501474 
 L 254.242205 125.507368 
-L 254.631724 126.6952 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 316.204138 125.517472 
+    <path clip-path="url(#p9defebae56)" d="M 316.204138 125.517472 
 L 316.207445 125.507368 
 L 316.204138 125.505239 
 L 316.202505 125.507368 
-L 316.204138 125.517472 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 353.147586 133.218641 
+    <path clip-path="url(#p9defebae56)" d="M 353.147586 133.218641 
 L 364.105189 125.507368 
 L 354.089965 111.501474 
 L 365.462069 99.949534 
@@ -1975,27 +1986,27 @@ L 353.147586 91.192744
 L 348.425815 97.495579 
 L 351.777393 111.501474 
 L 347.305836 125.507368 
-L 353.147586 133.218641 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 205.373793 120.943238 
+    <path clip-path="url(#p9defebae56)" d="M 205.373793 120.943238 
 L 206.808115 111.501474 
 L 205.373793 110.763108 
 L 205.002272 111.501474 
-L 205.373793 120.943238 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 279.26069 111.5095 
+    <path clip-path="url(#p9defebae56)" d="M 279.26069 111.5095 
 L 279.270319 111.501474 
 L 279.26069 111.498913 
 L 279.251944 111.501474 
-L 279.26069 111.5095 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 119.172414 106.369998 
+    <path clip-path="url(#p9defebae56)" d="M 119.172414 106.369998 
 L 125.211401 97.495579 
 L 119.172414 93.838739 
 L 110.233488 97.495579 
-L 119.172414 106.369998 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 242.317241 108.261914 
+    <path clip-path="url(#p9defebae56)" d="M 242.317241 108.261914 
 L 248.20422 97.495579 
 L 242.317241 88.412546 
 L 238.432277 83.489684 
@@ -2007,21 +2018,21 @@ L 205.373793 86.221625
 L 217.688276 89.736076 
 L 230.002759 91.791646 
 L 235.506026 97.495579 
-L 242.317241 108.261914 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 402.405517 99.903594 
+    <path clip-path="url(#p9defebae56)" d="M 402.405517 99.903594 
 L 408.80215 97.495579 
 L 402.405517 95.501321 
 L 400.393364 97.495579 
-L 402.405517 99.903594 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 106.857931 85.163785 
+    <path clip-path="url(#p9defebae56)" d="M 106.857931 85.163785 
 L 107.07703 83.489684 
 L 106.857931 82.913904 
 L 106.258949 83.489684 
-L 106.857931 85.163785 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 131.486897 88.529961 
+    <path clip-path="url(#p9defebae56)" d="M 131.486897 88.529961 
 L 140.635306 83.489684 
 L 143.801379 76.502364 
 L 147.799911 69.483789 
@@ -2029,270 +2040,270 @@ L 143.801379 68.520961
 L 138.242032 69.483789 
 L 131.486897 73.64302 
 L 129.379826 83.489684 
-L 131.486897 88.529961 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 328.518621 86.514867 
+    <path clip-path="url(#p9defebae56)" d="M 328.518621 86.514867 
 L 331.261339 83.489684 
 L 333.028962 69.483789 
 L 328.518621 63.705301 
 L 322.164185 69.483789 
 L 325.290783 83.489684 
-L 328.518621 86.514867 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 168.430345 78.157589 
+    <path clip-path="url(#p9defebae56)" d="M 168.430345 78.157589 
 L 174.337142 69.483789 
 L 168.430345 63.923665 
 L 160.47055 69.483789 
-L 168.430345 78.157589 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 254.631724 70.68432 
+    <path clip-path="url(#p9defebae56)" d="M 254.631724 70.68432 
 L 266.946207 73.935346 
 L 268.940038 69.483789 
 L 266.946207 63.322699 
 L 254.631724 68.903587 
 L 253.709266 69.483789 
-L 254.631724 70.68432 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 291.575172 70.436229 
+    <path clip-path="url(#p9defebae56)" d="M 291.575172 70.436229 
 L 291.829315 69.483789 
 L 291.575172 68.931934 
 L 291.331246 69.483789 
-L 291.575172 70.436229 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 94.543448 58.362959 
+    <path clip-path="url(#p9defebae56)" d="M 94.543448 58.362959 
 L 99.191609 55.477895 
 L 94.543448 42.071121 
 L 89.518674 55.477895 
-L 94.543448 58.362959 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 131.486897 62.201544 
+    <path clip-path="url(#p9defebae56)" d="M 131.486897 62.201544 
 L 132.428743 55.477895 
 L 131.486897 53.409547 
 L 129.236055 55.477895 
-L 131.486897 62.201544 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 156.115862 61.432142 
+    <path clip-path="url(#p9defebae56)" d="M 156.115862 61.432142 
 L 158.705906 55.477895 
 L 156.115862 51.407935 
 L 154.860308 55.477895 
-L 156.115862 61.432142 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 205.373793 56.238425 
+    <path clip-path="url(#p9defebae56)" d="M 205.373793 56.238425 
 L 206.823653 55.477895 
 L 205.373793 54.519617 
 L 203.300369 55.477895 
-L 205.373793 56.238425 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 242.317241 58.666811 
+    <path clip-path="url(#p9defebae56)" d="M 242.317241 58.666811 
 L 243.991376 55.477895 
 L 242.317241 51.535095 
 L 239.214452 55.477895 
-L 242.317241 58.666811 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 303.889655 59.468788 
+    <path clip-path="url(#p9defebae56)" d="M 303.889655 59.468788 
 L 311.145041 55.477895 
 L 303.889655 43.921102 
 L 298.510314 55.477895 
-L 303.889655 59.468788 
+z
 " style="fill:none;stroke:#28ae80;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
    </g>
-   <g id="LineCollection_7">
-    <path clip-path="url(#pd19901ac8d)" d="M 59.081213 307.584 
+   <g id="PathCollection_7">
+    <path clip-path="url(#p9defebae56)" d="M 59.081213 307.584 
 L 57.6 306.156063 
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 108.016113 307.584 
+    <path clip-path="url(#p9defebae56)" d="M 108.016113 307.584 
 L 106.857931 305.892536 
 L 94.543448 305.45777 
 L 88.290439 307.584 
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 355.362252 307.584 
+    <path clip-path="url(#p9defebae56)" d="M 355.362252 307.584 
 L 353.147586 303.501854 
 L 350.409239 307.584 
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 414.72 124.592082 
+    <path clip-path="url(#p9defebae56)" d="M 414.72 124.592082 
 L 407.341636 125.507368 
 L 414.72 126.58426 
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 217.688276 296.264083 
+    <path clip-path="url(#p9defebae56)" d="M 217.688276 296.264083 
 L 219.443913 293.578105 
 L 217.688276 292.035877 
 L 216.507099 293.578105 
-L 217.688276 296.264083 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 365.462069 282.396082 
+    <path clip-path="url(#p9defebae56)" d="M 365.462069 282.396082 
 L 370.543192 279.572211 
 L 365.462069 275.782135 
 L 356.523424 279.572211 
-L 365.462069 282.396082 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 143.801379 267.533896 
+    <path clip-path="url(#p9defebae56)" d="M 143.801379 267.533896 
 L 145.1811 265.566316 
 L 146.409395 251.560421 
 L 143.801379 250.368571 
 L 142.457687 251.560421 
 L 142.512128 265.566316 
-L 143.801379 267.533896 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 180.744828 269.002687 
+    <path clip-path="url(#p9defebae56)" d="M 180.744828 269.002687 
 L 181.824045 265.566316 
 L 180.744828 264.071525 
 L 178.390692 265.566316 
-L 180.744828 269.002687 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 242.317241 267.39734 
+    <path clip-path="url(#p9defebae56)" d="M 242.317241 267.39734 
 L 244.112356 265.566316 
 L 242.317241 261.768361 
 L 240.959569 265.566316 
-L 242.317241 267.39734 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 279.26069 267.590528 
+    <path clip-path="url(#p9defebae56)" d="M 279.26069 267.590528 
 L 288.249431 265.566316 
 L 279.26069 262.604113 
 L 277.771449 265.566316 
-L 279.26069 267.590528 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 303.889655 266.801978 
+    <path clip-path="url(#p9defebae56)" d="M 303.889655 266.801978 
 L 307.316385 265.566316 
 L 303.889655 264.450624 
 L 295.376802 265.566316 
-L 303.889655 266.801978 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 340.833103 266.826428 
+    <path clip-path="url(#p9defebae56)" d="M 340.833103 266.826428 
 L 342.586166 265.566316 
 L 340.833103 262.160337 
 L 339.455302 265.566316 
-L 340.833103 266.826428 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 353.147586 255.697739 
+    <path clip-path="url(#p9defebae56)" d="M 353.147586 255.697739 
 L 359.851038 251.560421 
 L 353.147586 248.350764 
 L 347.630768 251.560421 
-L 353.147586 255.697739 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 69.914483 238.11891 
+    <path clip-path="url(#p9defebae56)" d="M 69.914483 238.11891 
 L 70.482303 237.554526 
 L 69.914483 237.040499 
 L 69.131047 237.554526 
-L 69.914483 238.11891 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 193.05931 240.874276 
+    <path clip-path="url(#p9defebae56)" d="M 193.05931 240.874276 
 L 197.199674 237.554526 
 L 193.05931 234.77832 
 L 191.387669 237.554526 
-L 193.05931 240.874276 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 279.26069 231.637817 
+    <path clip-path="url(#p9defebae56)" d="M 279.26069 231.637817 
 L 287.650544 223.548632 
 L 279.26069 220.691006 
 L 274.083564 223.548632 
-L 279.26069 231.637817 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 156.115862 212.621965 
+    <path clip-path="url(#p9defebae56)" d="M 156.115862 212.621965 
 L 159.643481 209.542737 
 L 156.115862 206.537467 
 L 151.79758 209.542737 
-L 156.115862 212.621965 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 82.228966 183.917431 
+    <path clip-path="url(#p9defebae56)" d="M 82.228966 183.917431 
 L 85.02806 181.530947 
 L 82.228966 179.12753 
 L 81.30206 181.530947 
-L 82.228966 183.917431 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 168.430345 183.373426 
+    <path clip-path="url(#p9defebae56)" d="M 168.430345 183.373426 
 L 171.060184 181.530947 
 L 168.430345 178.605838 
 L 167.033583 181.530947 
-L 168.430345 183.373426 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 328.518621 184.930326 
+    <path clip-path="url(#p9defebae56)" d="M 328.518621 184.930326 
 L 331.095477 181.530947 
 L 328.518621 176.67287 
 L 325.406037 181.530947 
-L 328.518621 184.930326 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 69.914483 167.708809 
+    <path clip-path="url(#p9defebae56)" d="M 69.914483 167.708809 
 L 70.317484 167.525053 
 L 69.914483 167.239085 
 L 69.673022 167.525053 
-L 69.914483 167.708809 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 390.091034 173.020432 
+    <path clip-path="url(#p9defebae56)" d="M 390.091034 173.020432 
 L 392.821887 167.525053 
 L 390.091034 164.161609 
 L 386.741448 167.525053 
-L 390.091034 173.020432 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 168.430345 153.977654 
+    <path clip-path="url(#p9defebae56)" d="M 168.430345 153.977654 
 L 169.671099 153.519158 
 L 168.430345 153.219949 
 L 168.117429 153.519158 
-L 168.430345 153.977654 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 402.405517 139.830105 
+    <path clip-path="url(#p9defebae56)" d="M 402.405517 139.830105 
 L 402.804974 139.513263 
 L 402.405517 134.252046 
 L 402.215529 139.513263 
-L 402.405517 139.830105 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 353.147586 126.604641 
+    <path clip-path="url(#p9defebae56)" d="M 353.147586 126.604641 
 L 354.706794 125.507368 
 L 353.147586 123.338032 
 L 352.316337 125.507368 
-L 353.147586 126.604641 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 119.172414 100.55568 
+    <path clip-path="url(#p9defebae56)" d="M 119.172414 100.55568 
 L 121.254794 97.495579 
 L 119.172414 96.234617 
 L 116.090069 97.495579 
-L 119.172414 100.55568 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 242.317241 102.920323 
+    <path clip-path="url(#p9defebae56)" d="M 242.317241 102.920323 
 L 245.283465 97.495579 
 L 242.317241 92.918986 
 L 238.885331 97.495579 
-L 242.317241 102.920323 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 353.147586 99.749282 
+    <path clip-path="url(#p9defebae56)" d="M 353.147586 99.749282 
 L 355.444692 97.495579 
 L 353.147586 96.5633 
 L 352.449169 97.495579 
-L 353.147586 99.749282 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 230.002759 88.289123 
+    <path clip-path="url(#p9defebae56)" d="M 230.002759 88.289123 
 L 234.875938 83.489684 
 L 230.002759 77.233395 
 L 220.347908 83.489684 
-L 230.002759 88.289123 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 168.430345 70.796531 
+    <path clip-path="url(#p9defebae56)" d="M 168.430345 70.796531 
 L 169.324313 69.483789 
 L 168.430345 68.642289 
 L 167.225665 69.483789 
-L 168.430345 70.796531 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 303.889655 56.832919 
+    <path clip-path="url(#p9defebae56)" d="M 303.889655 56.832919 
 L 306.353068 55.477895 
 L 303.889655 51.554029 
 L 302.063213 55.477895 
-L 303.889655 56.832919 
+z
 " style="fill:none;stroke:#5ec962;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
    </g>
-   <g id="LineCollection_8">
-    <path clip-path="url(#pd19901ac8d)" d="M 242.317241 97.578732 
+   <g id="PathCollection_8">
+    <path clip-path="url(#p9defebae56)" d="M 242.317241 97.578732 
 L 242.362709 97.495579 
 L 242.317241 97.425427 
 L 242.264635 97.495579 
-L 242.317241 97.578732 
+z
 " style="fill:none;stroke:#addc30;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
-    <path clip-path="url(#pd19901ac8d)" d="M 230.002759 84.786599 
+    <path clip-path="url(#p9defebae56)" d="M 230.002759 84.786599 
 L 231.3196 83.489684 
 L 230.002759 81.799096 
 L 227.393804 83.489684 
-L 230.002759 84.786599 
+z
 " style="fill:none;stroke:#addc30;stroke-dasharray:4.5,4.5;stroke-dashoffset:0;stroke-width:1.5;"/>
    </g>
-   <g id="LineCollection_9"/>
+   <g id="PathCollection_9"/>
    <g id="patch_3">
     <path d="M 57.6 307.584 
 L 57.6 41.472 
@@ -2316,7 +2327,7 @@ L 414.72 41.472
   </g>
  </g>
  <defs>
-  <clipPath id="pd19901ac8d">
+  <clipPath id="p9defebae56">
    <rect height="266.112" width="357.12" x="57.6" y="41.472"/>
   </clipPath>
  </defs>
diff --git a/lib/matplotlib/tests/baseline_images/test_lines/striped_line.png b/lib/matplotlib/tests/baseline_images/test_lines/striped_line.png
new file mode 100644
index 000000000000..957129cb981f
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_lines/striped_line.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext0_cm_00.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext0_cm_00.svg
new file mode 100644
index 000000000000..619549bbbe68
--- /dev/null
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext0_cm_00.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" width="378pt" height="54pt" viewBox="0 0 378 54" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <defs>
+  <style type="text/css">*{stroke-linejoin: round; stroke-linecap: butt}</style>
+ </defs>
+ <g id="figure_1">
+  <g id="text_1">
+   <!-- $-$- -->
+   <g transform="translate(182.16 30.31125)">
+    <text>
+     <tspan style="font: 12px 'cmsy10'" x="0" y="-0.234375">¡</tspan>
+     <tspan style="font: 12px 'DejaVu Sans'" x="9.322266" y="-0.234375">-</tspan>
+    </text>
+   </g>
+  </g>
+ </g>
+</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext0_dejavusans_00.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext0_dejavusans_00.svg
new file mode 100644
index 000000000000..72ba7d0a32cc
--- /dev/null
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext0_dejavusans_00.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" width="378pt" height="54pt" viewBox="0 0 378 54" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <defs>
+  <style type="text/css">*{stroke-linejoin: round; stroke-linecap: butt}</style>
+ </defs>
+ <g id="figure_1">
+  <g id="text_1">
+   <!-- $-$- -->
+   <g transform="translate(181.8 30.31125)">
+    <text>
+     <tspan style="font: 12px 'DejaVu Sans'" x="0 10.054688" y="-0.734375">−-</tspan>
+    </text>
+   </g>
+  </g>
+ </g>
+</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext1_dejavusans_02.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext1_dejavusans_02.png
new file mode 100644
index 000000000000..b37505cc62b0
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext1_dejavusans_02.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext1_dejavusans_03.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext1_dejavusans_03.png
new file mode 100644
index 000000000000..f28fb31c542f
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext1_dejavusans_03.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_30.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_30.pdf
deleted file mode 100644
index 503cd69d37ec..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_30.pdf and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_30.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_30.png
deleted file mode 100644
index c160c75b2d2c..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_30.png and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_30.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_30.svg
deleted file mode 100644
index c0d0e3b91162..000000000000
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_30.svg
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (http://matplotlib.org/) -->
-<svg height="54pt" version="1.1" viewBox="0 0 378 54" width="378pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
- </defs>
- <g id="figure_1">
-  <g id="patch_1">
-   <path d="M 0 54 
-L 378 54 
-L 378 0 
-L 0 0 
-z
-" style="fill:#ffffff;"/>
-  </g>
-  <g id="text_1">
-   <!-- $\oint^\infty_0$ -->
-   <defs>
-    <path d="M 25 -2.203125 
-Q 12.75 -2.203125 8.328125 7.875 
-Q 3.90625 17.96875 3.90625 31.890625 
-Q 3.90625 40.578125 5.484375 48.234375 
-Q 7.078125 55.90625 11.78125 61.25 
-Q 16.5 66.609375 25 66.609375 
-Q 31.59375 66.609375 35.78125 63.375 
-Q 39.984375 60.15625 42.1875 55.046875 
-Q 44.390625 49.953125 45.1875 44.109375 
-Q 46 38.28125 46 31.890625 
-Q 46 23.296875 44.40625 15.796875 
-Q 42.828125 8.296875 38.1875 3.046875 
-Q 33.546875 -2.203125 25 -2.203125 
-M 25 0.390625 
-Q 30.5625 0.390625 33.296875 6.09375 
-Q 36.03125 11.8125 36.671875 18.75 
-Q 37.3125 25.6875 37.3125 33.5 
-Q 37.3125 41.015625 36.671875 47.359375 
-Q 36.03125 53.71875 33.3125 58.859375 
-Q 30.609375 64.015625 25 64.015625 
-Q 19.34375 64.015625 16.609375 58.828125 
-Q 13.875 53.65625 13.234375 47.328125 
-Q 12.59375 41.015625 12.59375 33.5 
-Q 12.59375 27.9375 12.859375 23 
-Q 13.140625 18.0625 14.3125 12.8125 
-Q 15.484375 7.5625 18.09375 3.96875 
-Q 20.703125 0.390625 25 0.390625 
-" id="Cmr10-30"/>
-    <path d="M 24.609375 -1.125 
-Q 18.953125 -1.125 14.578125 2.1875 
-Q 10.203125 5.515625 7.90625 10.78125 
-Q 5.609375 16.0625 5.609375 21.578125 
-Q 5.609375 25.828125 6.953125 29.875 
-Q 8.296875 33.9375 10.828125 37.15625 
-Q 13.375 40.375 16.96875 42.28125 
-Q 20.5625 44.1875 24.90625 44.1875 
-Q 29.390625 44.1875 33.59375 42.46875 
-Q 37.796875 40.765625 41.28125 37.9375 
-Q 44.78125 35.109375 47.796875 31.390625 
-L 50.78125 27.390625 
-Q 53.765625 32.125 57.375 35.859375 
-Q 60.984375 39.59375 65.546875 41.890625 
-Q 70.125 44.1875 75.296875 44.1875 
-Q 79.640625 44.1875 83.203125 42.25 
-Q 86.765625 40.328125 89.25 37 
-Q 91.75 33.6875 93.015625 29.65625 
-Q 94.28125 25.640625 94.28125 21.578125 
-Q 94.28125 15.921875 91.90625 10.671875 
-Q 89.546875 5.421875 85.171875 2.140625 
-Q 80.8125 -1.125 75 -1.125 
-Q 68.453125 -1.125 62.5625 2.390625 
-Q 56.6875 5.90625 52.09375 11.71875 
-L 49.125 15.71875 
-Q 44.53125 8.25 38.296875 3.5625 
-Q 32.078125 -1.125 24.609375 -1.125 
-M 23.578125 2.390625 
-Q 36.28125 2.390625 46.296875 19.390625 
-L 41.015625 26.125 
-Q 36.421875 32.171875 32.46875 35.59375 
-Q 28.515625 39.015625 23.296875 39.015625 
-Q 18.84375 39.015625 15.40625 36.5 
-Q 11.96875 33.984375 10.078125 29.921875 
-Q 8.203125 25.875 8.203125 21.484375 
-Q 8.203125 18.109375 9.25 14.71875 
-Q 10.296875 11.328125 12.296875 8.546875 
-Q 14.3125 5.765625 17.15625 4.078125 
-Q 20.015625 2.390625 23.578125 2.390625 
-M 58.890625 17 
-Q 63.484375 10.9375 67.4375 7.515625 
-Q 71.390625 4.109375 76.609375 4.109375 
-Q 79.9375 4.109375 82.71875 5.5625 
-Q 85.5 7.03125 87.515625 9.515625 
-Q 89.546875 12.015625 90.625 15.140625 
-Q 91.703125 18.265625 91.703125 21.578125 
-Q 91.703125 26.21875 89.84375 30.640625 
-Q 87.984375 35.0625 84.484375 37.890625 
-Q 81 40.71875 76.3125 40.71875 
-Q 63.625 40.71875 53.609375 23.6875 
-z
-" id="Cmsy10-31"/>
-    <path d="M 10.59375 -217.09375 
-Q 13.09375 -219.578125 16.703125 -219.578125 
-Q 20.3125 -219.578125 23.28125 -214.625 
-Q 26.265625 -209.671875 28.515625 -202.25 
-Q 30.765625 -194.828125 31.8125 -189.8125 
-Q 32.859375 -184.8125 34.421875 -176.90625 
-Q 36.28125 -167.53125 38.328125 -155.34375 
-Q 40.375 -143.171875 41.609375 -135.984375 
-Q 36.671875 -133.84375 32.9375 -130.078125 
-Q 29.203125 -126.3125 27.140625 -121.328125 
-Q 25.09375 -116.359375 25.09375 -111.078125 
-Q 25.09375 -103.90625 28.6875 -97.671875 
-Q 32.28125 -91.453125 38.46875 -87.765625 
-Q 44.671875 -84.078125 51.90625 -84.078125 
-Q 53.171875 -78.5625 54 -74.78125 
-Q 54.828125 -71 55.6875 -67.265625 
-Q 56.546875 -63.53125 58.6875 -54.59375 
-Q 60.84375 -45.65625 60.984375 -45.125 
-L 62.3125 -39.890625 
-Q 64.546875 -31.109375 65.765625 -26.59375 
-Q 67 -22.078125 69.5625 -15.546875 
-Q 72.125 -9.03125 75.578125 -4.515625 
-Q 79.046875 0 83.203125 0 
-Q 86.140625 0 88.640625 -1.3125 
-Q 91.15625 -2.640625 92.71875 -4.9375 
-Q 94.28125 -7.234375 94.28125 -10.203125 
-Q 94.28125 -12.359375 92.859375 -13.765625 
-Q 91.453125 -15.1875 89.3125 -15.1875 
-Q 87.109375 -15.1875 85.640625 -13.765625 
-Q 84.1875 -12.359375 84.1875 -10.203125 
-Q 84.1875 -8.015625 85.640625 -6.546875 
-Q 87.109375 -5.078125 89.3125 -5.078125 
-Q 86.71875 -2.59375 83.296875 -2.59375 
-Q 80.671875 -2.59375 77.46875 -12.8125 
-Q 74.265625 -23.046875 71.546875 -36.296875 
-Q 68.84375 -49.5625 66.328125 -63.9375 
-Q 63.8125 -78.328125 62.5 -86.1875 
-Q 66.21875 -87.703125 69.28125 -90.28125 
-Q 72.359375 -92.875 74.484375 -96.09375 
-Q 76.609375 -99.3125 77.796875 -103.125 
-Q 79 -106.9375 79 -111.078125 
-Q 79 -116.546875 76.90625 -121.484375 
-Q 74.8125 -126.421875 71.140625 -130.109375 
-Q 67.484375 -133.796875 62.515625 -135.9375 
-Q 57.5625 -138.09375 52.203125 -138.09375 
-Q 48.484375 -155.171875 43.109375 -177.09375 
-L 41.890625 -181.6875 
-Q 39.3125 -192.28125 36.6875 -200.3125 
-Q 34.078125 -208.34375 29.015625 -215.28125 
-Q 23.96875 -222.21875 16.703125 -222.21875 
-Q 12.359375 -222.21875 8.984375 -219.28125 
-Q 5.609375 -216.359375 5.609375 -212.109375 
-Q 5.609375 -209.90625 7.078125 -208.4375 
-Q 8.546875 -206.984375 10.6875 -206.984375 
-Q 12.109375 -206.984375 13.25 -207.65625 
-Q 14.40625 -208.34375 15.0625 -209.515625 
-Q 15.71875 -210.6875 15.71875 -212.109375 
-Q 15.71875 -214.265625 14.25 -215.671875 
-Q 12.796875 -217.09375 10.59375 -217.09375 
-M 52.984375 -134.078125 
-Q 58.9375 -134.078125 64.015625 -130.828125 
-Q 69.09375 -127.59375 72.046875 -122.296875 
-Q 75 -117 75 -111.078125 
-Q 75 -106.84375 73.390625 -102.6875 
-Q 71.78125 -98.53125 68.796875 -95.328125 
-Q 65.828125 -92.140625 61.8125 -90.28125 
-Q 60.796875 -96.046875 59.234375 -104.03125 
-Q 57.671875 -112.015625 55.734375 -121.140625 
-Q 53.8125 -130.28125 52.984375 -134.078125 
-M 42.28125 -131.984375 
-Q 46 -111.375 51.125 -88.09375 
-Q 45.125 -88.09375 40.09375 -91.328125 
-Q 35.0625 -94.578125 32.078125 -99.875 
-Q 29.109375 -105.171875 29.109375 -111.078125 
-Q 29.109375 -117.671875 32.6875 -123.40625 
-Q 36.28125 -129.15625 42.28125 -131.984375 
-" id="Cmex10-49"/>
-   </defs>
-   <g transform="translate(178.260000 30.720000)scale(0.120000 -0.120000)">
-    <use transform="translate(0.000000 145.075000)" xlink:href="#Cmex10-49"/>
-    <use transform="translate(108.600273 128.068750)scale(0.700000)" xlink:href="#Cmsy10-31"/>
-    <use transform="translate(47.934336 -94.150000)scale(0.700000)" xlink:href="#Cmr10-30"/>
-   </g>
-  </g>
- </g>
-</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_77.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_77.pdf
deleted file mode 100644
index 8b8bc68dfd5b..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_77.pdf and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_77.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_77.png
deleted file mode 100644
index 9ed5a18bf57b..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_77.png and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_77.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_77.svg
deleted file mode 100644
index f423ee824f38..000000000000
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_77.svg
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (http://matplotlib.org/) -->
-<svg height="54pt" version="1.1" viewBox="0 0 378 54" width="378pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
- </defs>
- <g id="figure_1">
-  <g id="patch_1">
-   <path d="M 0 54 
-L 378 54 
-L 378 0 
-L 0 0 
-z
-" style="fill:#ffffff;"/>
-  </g>
-  <g id="text_1">
-   <!-- $\barleftarrow$ $\barwedge$ $\ddots$ $\doteq$ $\doteqdot$ $\dotminus$ $\dotplus$ $\dots$ -->
-   <defs>
-    <path d="M 40.5 67.796875 
-Q 40.5 65.203125 38.75 63.296875 
-Q 37 61.40625 34.203125 61.40625 
-Q 31.296875 61.40625 29.546875 63.15625 
-Q 27.796875 64.90625 27.796875 67.796875 
-Q 27.796875 70.5 29.75 72.296875 
-Q 31.703125 74.09375 34.203125 74.09375 
-Q 36.703125 74.09375 38.59375 72.296875 
-Q 40.5 70.5 40.5 67.796875 
-M 63.59375 22 
-L 37.5 22 
-L 37.5 -4.09375 
-L 30.90625 -4.09375 
-L 30.90625 22 
-L 4.796875 22 
-L 4.796875 28.59375 
-L 30.90625 28.59375 
-L 30.90625 54.703125 
-L 37.5 54.703125 
-L 37.5 28.59375 
-L 63.59375 28.59375 
-z
-" id="STIXGeneral-Regular-2214"/>
-    <path d="M 57.203125 58 
-L 4.796875 58 
-L 4.796875 64.59375 
-L 57.203125 64.59375 
-z
-M 59 -2.90625 
-L 52.703125 -2.90625 
-L 31.203125 40.296875 
-L 9.703125 -2.90625 
-L 3.203125 -2.90625 
-L 30.703125 53.59375 
-L 31.703125 53.59375 
-z
-" id="STIXGeneral-Regular-22bc"/>
-    <path d="M 86.59375 22 
-L 29.703125 22 
-Q 28.90625 22 28 21.25 
-Q 27.09375 20.5 27.09375 19.796875 
-Q 27.09375 18.703125 28.5 17.296875 
-Q 33.59375 12.40625 36.703125 7.703125 
-L 34.703125 5.796875 
-Q 22.296875 20.09375 11 24.796875 
-L 11 5.796875 
-L 6 5.796875 
-L 6 45 
-L 11 45 
-L 11 25.796875 
-Q 22.296875 30.59375 34.796875 45 
-L 36.796875 43.09375 
-Q 33.703125 38.703125 28.59375 33.40625 
-Q 27.203125 32 27.203125 30.59375 
-Q 27.203125 28.59375 29.796875 28.59375 
-L 86.59375 28.59375 
-z
-" id="STIXGeneral-Regular-21e4"/>
-    <path d="M 32.09375 45.703125 
-Q 32.09375 43.09375 30.34375 41.1875 
-Q 28.59375 39.296875 25.796875 39.296875 
-Q 22.90625 39.296875 21.15625 41.046875 
-Q 19.40625 42.796875 19.40625 45.703125 
-Q 19.40625 48.40625 21.34375 50.203125 
-Q 23.296875 52 25.796875 52 
-Q 28.296875 52 30.1875 50.203125 
-Q 32.09375 48.40625 32.09375 45.703125 
-M 73.203125 4.59375 
-Q 73.203125 2 71.453125 0.09375 
-Q 69.703125 -1.796875 66.90625 -1.796875 
-Q 64 -1.796875 62.25 -0.046875 
-Q 60.5 1.703125 60.5 4.59375 
-Q 60.5 7.296875 62.453125 9.09375 
-Q 64.40625 10.90625 66.90625 10.90625 
-Q 69.40625 10.90625 71.296875 9.09375 
-Q 73.203125 7.296875 73.203125 4.59375 
-M 52.5 25.203125 
-Q 52.5 22.59375 50.75 20.6875 
-Q 49 18.796875 46.203125 18.796875 
-Q 43.296875 18.796875 41.546875 20.546875 
-Q 39.796875 22.296875 39.796875 25.203125 
-Q 39.796875 27.90625 41.75 29.703125 
-Q 43.703125 31.5 46.203125 31.5 
-Q 48.703125 31.5 50.59375 29.703125 
-Q 52.5 27.90625 52.5 25.203125 
-" id="STIXGeneral-Regular-22f1"/>
-    <path d="M 40.5 54.796875 
-Q 40.5 52.203125 38.75 50.296875 
-Q 37 48.40625 34.203125 48.40625 
-Q 31.296875 48.40625 29.546875 50.15625 
-Q 27.796875 51.90625 27.796875 54.796875 
-Q 27.796875 57.5 29.75 59.296875 
-Q 31.703125 61.09375 34.203125 61.09375 
-Q 36.703125 61.09375 38.59375 59.296875 
-Q 40.5 57.5 40.5 54.796875 
-M 63.703125 32 
-L 4.796875 32 
-L 4.796875 38.59375 
-L 63.703125 38.59375 
-z
-M 63.703125 12 
-L 4.796875 12 
-L 4.796875 18.59375 
-L 63.703125 18.59375 
-z
-" id="STIXGeneral-Regular-2250"/>
-    <path d="M 88.796875 4.296875 
-Q 88.796875 2.09375 87.140625 0.5 
-Q 85.5 -1.09375 83.203125 -1.09375 
-Q 80.90625 -1.09375 79.296875 0.5 
-Q 77.703125 2.09375 77.703125 4.390625 
-Q 77.703125 6.703125 79.34375 8.34375 
-Q 81 10 83.296875 10 
-Q 85.5 10 87.140625 8.296875 
-Q 88.796875 6.59375 88.796875 4.296875 
-M 55.5 4.296875 
-Q 55.5 2.09375 53.84375 0.5 
-Q 52.203125 -1.09375 49.890625 -1.09375 
-Q 47.59375 -1.09375 46 0.5 
-Q 44.40625 2.09375 44.40625 4.390625 
-Q 44.40625 6.703125 46.046875 8.34375 
-Q 47.703125 10 50 10 
-Q 52.203125 10 53.84375 8.296875 
-Q 55.5 6.59375 55.5 4.296875 
-M 22.203125 4.296875 
-Q 22.203125 2.09375 20.546875 0.5 
-Q 18.90625 -1.09375 16.59375 -1.09375 
-Q 14.296875 -1.09375 12.6875 0.5 
-Q 11.09375 2.09375 11.09375 4.390625 
-Q 11.09375 6.703125 12.75 8.34375 
-Q 14.40625 10 16.703125 10 
-Q 18.90625 10 20.546875 8.296875 
-Q 22.203125 6.59375 22.203125 4.296875 
-" id="STIXGeneral-Regular-2026"/>
-    <path d="M 40.5 44.796875 
-Q 40.5 42.203125 38.75 40.296875 
-Q 37 38.40625 34.203125 38.40625 
-Q 31.296875 38.40625 29.546875 40.15625 
-Q 27.796875 41.90625 27.796875 44.796875 
-Q 27.796875 47.5 29.75 49.296875 
-Q 31.703125 51.09375 34.203125 51.09375 
-Q 36.703125 51.09375 38.59375 49.296875 
-Q 40.5 47.5 40.5 44.796875 
-M 63.703125 22 
-L 4.796875 22 
-L 4.796875 28.59375 
-L 63.703125 28.59375 
-z
-" id="STIXGeneral-Regular-2238"/>
-    <path id="DejaVuSans-20"/>
-    <path d="M 40.5 54.796875 
-Q 40.5 52.203125 38.75 50.296875 
-Q 37 48.40625 34.203125 48.40625 
-Q 31.296875 48.40625 29.546875 50.15625 
-Q 27.796875 51.90625 27.796875 54.796875 
-Q 27.796875 57.5 29.75 59.296875 
-Q 31.703125 61.09375 34.203125 61.09375 
-Q 36.703125 61.09375 38.59375 59.296875 
-Q 40.5 57.5 40.5 54.796875 
-M 63.703125 32 
-L 4.796875 32 
-L 4.796875 38.59375 
-L 63.703125 38.59375 
-z
-M 63.703125 12 
-L 4.796875 12 
-L 4.796875 18.59375 
-L 63.703125 18.59375 
-z
-M 40.5 -4.203125 
-Q 40.5 -6.796875 38.59375 -8.6875 
-Q 36.703125 -10.59375 34.09375 -10.59375 
-Q 31.59375 -10.59375 29.6875 -8.640625 
-Q 27.796875 -6.703125 27.796875 -4.203125 
-Q 27.796875 -1.296875 29.640625 0.390625 
-Q 31.5 2.09375 34.09375 2.09375 
-Q 36.796875 2.09375 38.640625 0.4375 
-Q 40.5 -1.203125 40.5 -4.203125 
-" id="STIXGeneral-Regular-2251"/>
-   </defs>
-   <g transform="translate(138.360000 30.311250)scale(0.120000 -0.120000)">
-    <use transform="translate(0.000000 0.906250)" xlink:href="#STIXGeneral-Regular-21e4"/>
-    <use transform="translate(92.599991 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(124.387100 0.906250)" xlink:href="#STIXGeneral-Regular-22bc"/>
-    <use transform="translate(186.387085 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(218.174194 0.906250)" xlink:href="#STIXGeneral-Regular-22f1"/>
-    <use transform="translate(310.774185 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(342.561295 0.906250)" xlink:href="#STIXGeneral-Regular-2250"/>
-    <use transform="translate(411.061279 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(442.848389 0.906250)" xlink:href="#STIXGeneral-Regular-2251"/>
-    <use transform="translate(511.348373 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(543.135483 0.906250)" xlink:href="#STIXGeneral-Regular-2238"/>
-    <use transform="translate(611.635468 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(643.422577 0.906250)" xlink:href="#STIXGeneral-Regular-2214"/>
-    <use transform="translate(711.922562 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(743.709671 0.906250)" xlink:href="#STIXGeneral-Regular-2026"/>
-   </g>
-  </g>
- </g>
-</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.pdf
deleted file mode 100644
index 1783edfa14e6..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.pdf and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.png
deleted file mode 100644
index 05b1e65e1419..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.png and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.svg
deleted file mode 100644
index 13ba043bf787..000000000000
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.svg
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (http://matplotlib.org/) -->
-<svg height="54pt" version="1.1" viewBox="0 0 378 54" width="378pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
- </defs>
- <g id="figure_1">
-  <g id="patch_1">
-   <path d="M 0 54 
-L 378 54 
-L 378 0 
-L 0 0 
-z
-" style="fill:#ffffff;"/>
-  </g>
-  <g id="text_1">
-   <!-- $\oint^\infty_0$ -->
-   <defs>
-    <path d="M 33.34375 86.328125 
-Q 33.9375 97.859375 39.65625 102.546875 
-Q 45.125 107.03125 50.203125 107.03125 
-Q 55.515625 107.03125 60.40625 102.203125 
-Q 64.203125 98.4375 65.625 88.71875 
-L 55.375 87.703125 
-Q 54.203125 96.6875 50.296875 96.6875 
-Q 45.40625 96.6875 44.828125 84.578125 
-L 43.84375 64.015625 
-Q 50.6875 62.359375 55.21875 57.171875 
-Q 62.84375 48.640625 62.84375 38.53125 
-Q 62.84375 27.734375 55.21875 20.125 
-Q 49.265625 14.265625 41.359375 12.890625 
-L 40.328125 -9.328125 
-Q 39.796875 -20.84375 34.03125 -25.53125 
-Q 28.5625 -30.03125 23.484375 -30.03125 
-Q 18.171875 -30.03125 13.28125 -25.203125 
-Q 9.46875 -21.4375 8.0625 -11.71875 
-L 18.3125 -10.6875 
-Q 19.484375 -19.671875 23.390625 -19.671875 
-Q 28.265625 -19.671875 28.859375 -7.625 
-L 29.890625 13.484375 
-Q 23.4375 15.140625 18.453125 20.171875 
-Q 10.84375 27.828125 10.84375 38.53125 
-Q 10.84375 49.3125 18.5 57.234375 
-Q 24.21875 63.1875 32.328125 64.5 
-z
-M 41.84375 22.171875 
-Q 46.046875 23.296875 49.125 26.515625 
-Q 53.90625 31.5 53.859375 38.625 
-Q 53.859375 45.953125 48.96875 50.828125 
-Q 46.4375 53.328125 43.359375 54.546875 
-z
-M 30.328125 22.796875 
-L 31.84375 55.21875 
-Q 27.640625 54.046875 24.5625 50.875 
-Q 19.578125 45.75 19.625 38.625 
-Q 19.625 31.5 24.8125 26.515625 
-Q 27.34375 24.03125 30.328125 22.796875 
-" id="DejaVuSansDisplay-222e"/>
-    <path d="M 45.5625 17.046875 
-Q 44.046875 18.796875 41.65625 22.90625 
-Q 38.375 17.046875 35.5 14.453125 
-Q 31.890625 11.328125 26.265625 11.328125 
-Q 19.671875 11.328125 15.328125 16.265625 
-Q 10.75 21.4375 10.75 29.984375 
-Q 10.75 38.1875 15.328125 43.75 
-Q 19.4375 48.6875 26.375 48.6875 
-Q 29.9375 48.6875 32.5625 47.21875 
-Q 35.640625 45.609375 37.75 42.828125 
-Q 39.703125 40.328125 41.65625 36.96875 
-Q 44.921875 42.828125 47.796875 45.40625 
-Q 51.421875 48.53125 57.03125 48.53125 
-Q 63.625 48.53125 67.96875 43.609375 
-Q 72.5625 38.421875 72.5625 29.890625 
-Q 72.5625 21.6875 67.96875 16.109375 
-Q 63.875 11.1875 56.9375 11.1875 
-Q 53.375 11.1875 50.734375 12.640625 
-Q 48.09375 13.96875 45.5625 17.046875 
-M 25.734375 17.71875 
-Q 33.796875 17.71875 38.625 29.4375 
-Q 32.421875 42.234375 25.734375 42.234375 
-Q 20.84375 42.234375 18.359375 38.71875 
-Q 15.671875 34.96875 15.671875 29.984375 
-Q 15.671875 24.515625 18.359375 21.140625 
-Q 21.09375 17.71875 25.734375 17.71875 
-M 57.5625 42.140625 
-Q 50.296875 42.140625 44.671875 30.421875 
-Q 50.828125 17.625 57.5625 17.625 
-Q 62.453125 17.625 64.9375 21.140625 
-Q 67.625 24.90625 67.625 29.890625 
-Q 67.625 35.359375 64.9375 38.71875 
-Q 62.203125 42.140625 57.5625 42.140625 
-" id="DejaVuSans-221e"/>
-    <path d="M 31.78125 66.40625 
-Q 24.171875 66.40625 20.328125 58.90625 
-Q 16.5 51.421875 16.5 36.375 
-Q 16.5 21.390625 20.328125 13.890625 
-Q 24.171875 6.390625 31.78125 6.390625 
-Q 39.453125 6.390625 43.28125 13.890625 
-Q 47.125 21.390625 47.125 36.375 
-Q 47.125 51.421875 43.28125 58.90625 
-Q 39.453125 66.40625 31.78125 66.40625 
-M 31.78125 74.21875 
-Q 44.046875 74.21875 50.515625 64.515625 
-Q 56.984375 54.828125 56.984375 36.375 
-Q 56.984375 17.96875 50.515625 8.265625 
-Q 44.046875 -1.421875 31.78125 -1.421875 
-Q 19.53125 -1.421875 13.0625 8.265625 
-Q 6.59375 17.96875 6.59375 36.375 
-Q 6.59375 54.828125 13.0625 64.515625 
-Q 19.53125 74.21875 31.78125 74.21875 
-" id="DejaVuSans-30"/>
-   </defs>
-   <g transform="translate(180.240000 31.020000)scale(0.120000 -0.120000)">
-    <use transform="translate(0.000000 0.762500)" xlink:href="#DejaVuSansDisplay-222e"/>
-    <use transform="translate(86.744141 85.918750)scale(0.700000)" xlink:href="#DejaVuSans-221e"/>
-    <use transform="translate(71.759766 -51.143750)scale(0.700000)" xlink:href="#DejaVuSans-30"/>
-   </g>
-  </g>
- </g>
-</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_71.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_71.pdf
index 9f4e5515c4c1..4e348e9ba03e 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_71.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_71.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_71.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_71.png
index 3b0aa1e7d159..53c8295911ae 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_71.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_71.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_71.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_71.svg
index 4134153405c0..33dc31b427a0 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_71.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_71.svg
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (http://matplotlib.org/) -->
-<svg height="54pt" version="1.1" viewBox="0 0 378 54" width="378pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" width="378pt" height="54pt" viewBox="0 0 378 54" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <metadata>
+  <rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+   <cc:Work>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:date>2021-08-10T16:39:40.187285</dc:date>
+    <dc:format>image/svg+xml</dc:format>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Matplotlib v3.4.2.post1645+ge771650c3a.d20210810, https://matplotlib.org/</dc:title>
+     </cc:Agent>
+    </dc:creator>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linejoin: round; stroke-linecap: butt}</style>
  </defs>
  <g id="figure_1">
   <g id="patch_1">
@@ -15,117 +26,125 @@ L 378 54
 L 378 0 
 L 0 0 
 z
-" style="fill:#ffffff;"/>
+" style="fill: #ffffff"/>
   </g>
   <g id="text_1">
-   <!-- $\Cup$ $\Cap$ $\leftharpoonup$ $\barwedge$ $\rightharpoonup$ -->
-   <defs>
-    <path d="M 9.765625 74.03125 
-L 63.421875 74.03125 
-L 63.421875 65.71875 
-L 9.765625 65.71875 
+   <!-- $\Cap$ $\Cup$ $\leftharpoonup$ $\barwedge$ $\rightharpoonup$ -->
+   <g transform="translate(152.16 30.31125)scale(0.12 -0.12)">
+    <defs>
+     <path id="DejaVuSans-22d2" d="M 3113 0 
+L 3113 2219 
+Q 3113 2400 2988 2525 
+Q 2863 2650 2681 2650 
+Q 2500 2650 2375 2525 
+Q 2250 2400 2250 2219 
+L 2250 0 
+L 1719 0 
+L 1719 2225 
+Q 1719 2625 2000 2906 
+Q 2275 3181 2681 3181 
+Q 3081 3181 3362 2903 
+Q 3644 2625 3644 2225 
+L 3644 0 
+L 3113 0 
 z
-M 12.890625 0 
-L 30.515625 57.90625 
-L 42.71875 57.90625 
-L 60.296875 0 
-L 50.78125 0 
-L 36.625 45.90625 
-L 22.40625 0 
+M 656 0 
+L 656 2219 
+Q 656 3069 1250 3656 
+Q 1844 4244 2681 4244 
+Q 3519 4244 4119 3656 
+Q 4706 3075 4706 2225 
+L 4706 0 
+L 4175 0 
+L 4175 2225 
+Q 4175 2850 3744 3281 
+Q 3306 3713 2681 3713 
+Q 2056 3713 1625 3281 
+Q 1188 2850 1188 2219 
+L 1188 0 
+L 656 0 
 z
-" id="DejaVuSans-22bc"/>
-    <path d="M 48.640625 0 
-L 48.640625 34.671875 
-Q 48.640625 37.5 46.6875 39.453125 
-Q 44.734375 41.40625 41.890625 41.40625 
-Q 39.0625 41.40625 37.109375 39.453125 
-Q 35.15625 37.5 35.15625 34.671875 
-L 35.15625 0 
-L 26.859375 0 
-L 26.859375 34.765625 
-Q 26.859375 41.015625 31.25 45.40625 
-Q 35.546875 49.703125 41.890625 49.703125 
-Q 48.140625 49.703125 52.53125 45.359375 
-Q 56.9375 41.015625 56.9375 34.765625 
-L 56.9375 0 
+" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-20" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-22d3" d="M 2250 4153 
+L 2250 1934 
+Q 2250 1753 2375 1628 
+Q 2500 1503 2681 1503 
+Q 2863 1503 2988 1628 
+Q 3113 1753 3113 1934 
+L 3113 4153 
+L 3644 4153 
+L 3644 1928 
+Q 3644 1528 3363 1247 
+Q 3088 972 2681 972 
+Q 2281 972 2000 1250 
+Q 1719 1528 1719 1928 
+L 1719 4153 
+L 2250 4153 
 z
-M 10.25 0 
-L 10.25 34.671875 
-Q 10.25 47.953125 19.53125 57.125 
-Q 28.8125 66.3125 41.890625 66.3125 
-Q 54.984375 66.3125 64.359375 57.125 
-Q 73.53125 48.046875 73.53125 34.765625 
-L 73.53125 0 
-L 65.234375 0 
-L 65.234375 34.765625 
-Q 65.234375 44.53125 58.5 51.265625 
-Q 51.65625 58.015625 41.890625 58.015625 
-Q 32.125 58.015625 25.390625 51.265625 
-Q 18.5625 44.53125 18.5625 34.671875 
-L 18.5625 0 
+M 4706 4153 
+L 4706 1934 
+Q 4706 1084 4112 496 
+Q 3519 -91 2681 -91 
+Q 1844 -91 1244 497 
+Q 656 1078 656 1928 
+L 656 4153 
+L 1188 4153 
+L 1188 1928 
+Q 1188 1303 1619 872 
+Q 2056 441 2681 441 
+Q 3306 441 3738 872 
+Q 4175 1303 4175 1934 
+L 4175 4153 
+L 4706 4153 
 z
-" id="DejaVuSans-22d2"/>
-    <path d="M 78.90625 27.203125 
-L 5.71875 27.203125 
-L 5.71875 35.5 
-L 65.234375 35.5 
-L 53.859375 46.875 
-L 59.71875 52.734375 
-L 78.90625 33.546875 
+" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-21bc" d="M 313 1741 
+L 313 2147 
+L 1541 3375 
+L 1916 3000 
+L 1188 2272 
+L 4997 2272 
+L 4997 1741 
+L 313 1741 
 z
-" id="DejaVuSans-21c0"/>
-    <path d="M 35.15625 64.890625 
-L 35.15625 30.21875 
-Q 35.15625 27.390625 37.109375 25.4375 
-Q 39.0625 23.484375 41.890625 23.484375 
-Q 44.734375 23.484375 46.6875 25.4375 
-Q 48.640625 27.390625 48.640625 30.21875 
-L 48.640625 64.890625 
-L 56.9375 64.890625 
-L 56.9375 30.125 
-Q 56.9375 23.875 52.546875 19.484375 
-Q 48.25 15.1875 41.890625 15.1875 
-Q 35.640625 15.1875 31.25 19.53125 
-Q 26.859375 23.875 26.859375 30.125 
-L 26.859375 64.890625 
+" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-22bc" d="M 625 4738 
+L 4059 4738 
+L 4059 4206 
+L 625 4206 
+L 625 4738 
 z
-M 73.53125 64.890625 
-L 73.53125 30.21875 
-Q 73.53125 16.9375 64.25 7.75 
-Q 54.984375 -1.421875 41.890625 -1.421875 
-Q 28.8125 -1.421875 19.4375 7.765625 
-Q 10.25 16.84375 10.25 30.125 
-L 10.25 64.890625 
-L 18.5625 64.890625 
-L 18.5625 30.125 
-Q 18.5625 20.359375 25.296875 13.625 
-Q 32.125 6.890625 41.890625 6.890625 
-Q 51.65625 6.890625 58.40625 13.625 
-Q 65.234375 20.359375 65.234375 30.21875 
-L 65.234375 64.890625 
+M 825 0 
+L 1953 3706 
+L 2734 3706 
+L 3859 0 
+L 3250 0 
+L 2344 2938 
+L 1434 0 
+L 825 0 
 z
-" id="DejaVuSans-22d3"/>
-    <path d="M 4.890625 27.203125 
-L 4.890625 33.546875 
-L 24.078125 52.734375 
-L 29.9375 46.875 
-L 18.5625 35.5 
-L 78.078125 35.5 
-L 78.078125 27.203125 
+" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-21c0" d="M 5050 1741 
+L 366 1741 
+L 366 2272 
+L 4175 2272 
+L 3447 3000 
+L 3822 3375 
+L 5050 2147 
+L 5050 1741 
 z
-" id="DejaVuSans-21bc"/>
-    <path id="DejaVuSans-20"/>
-   </defs>
-   <g transform="translate(152.160000 30.311250)scale(0.120000 -0.120000)">
-    <use transform="translate(0.000000 0.968750)" xlink:href="#DejaVuSans-22d3"/>
-    <use transform="translate(83.789062 0.968750)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(115.576172 0.968750)" xlink:href="#DejaVuSans-22d2"/>
-    <use transform="translate(199.365234 0.968750)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(250.634766 0.968750)" xlink:href="#DejaVuSans-21bc"/>
-    <use transform="translate(353.906250 0.968750)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(385.693359 0.968750)" xlink:href="#DejaVuSans-22bc"/>
-    <use transform="translate(458.886719 0.968750)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(510.156250 0.968750)" xlink:href="#DejaVuSans-21c0"/>
+" transform="scale(0.015625)"/>
+    </defs>
+    <use xlink:href="#DejaVuSans-22d2" transform="translate(0 0.96875)"/>
+    <use xlink:href="#DejaVuSans-20" transform="translate(83.789062 0.96875)"/>
+    <use xlink:href="#DejaVuSans-22d3" transform="translate(115.576172 0.96875)"/>
+    <use xlink:href="#DejaVuSans-20" transform="translate(199.365234 0.96875)"/>
+    <use xlink:href="#DejaVuSans-21bc" transform="translate(250.634766 0.96875)"/>
+    <use xlink:href="#DejaVuSans-20" transform="translate(353.90625 0.96875)"/>
+    <use xlink:href="#DejaVuSans-22bc" transform="translate(385.693359 0.96875)"/>
+    <use xlink:href="#DejaVuSans-20" transform="translate(458.886719 0.96875)"/>
+    <use xlink:href="#DejaVuSans-21c0" transform="translate(510.15625 0.96875)"/>
    </g>
   </g>
  </g>
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_77.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_77.pdf
deleted file mode 100644
index 94ca3d3c6d94..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_77.pdf and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_77.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_77.png
deleted file mode 100644
index 82e0821cd3ea..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_77.png and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_77.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_77.svg
deleted file mode 100644
index 98902d769804..000000000000
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_77.svg
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (http://matplotlib.org/) -->
-<svg height="54pt" version="1.1" viewBox="0 0 378 54" width="378pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
- </defs>
- <g id="figure_1">
-  <g id="patch_1">
-   <path d="M 0 54 
-L 378 54 
-L 378 0 
-L 0 0 
-z
-" style="fill:#ffffff;"/>
-  </g>
-  <g id="text_1">
-   <!-- $\barleftarrow$ $\barwedge$ $\ddots$ $\doteq$ $\doteqdot$ $\dotminus$ $\dotplus$ $\dots$ -->
-   <defs>
-    <path d="M 9.765625 74.03125 
-L 63.421875 74.03125 
-L 63.421875 65.71875 
-L 9.765625 65.71875 
-z
-M 12.890625 0 
-L 30.515625 57.90625 
-L 42.71875 57.90625 
-L 60.296875 0 
-L 50.78125 0 
-L 36.625 45.90625 
-L 22.40625 0 
-z
-" id="DejaVuSans-22bc"/>
-    <path d="M 78.0625 2.921875 
-L 88.375 2.921875 
-L 88.375 -9.484375 
-L 78.0625 -9.484375 
-z
-M 11.5625 71.921875 
-L 21.875 71.921875 
-L 21.875 59.515625 
-L 11.5625 59.515625 
-z
-M 44.8125 36.921875 
-L 55.125 36.921875 
-L 55.125 24.515625 
-L 44.8125 24.515625 
-z
-" id="DejaVuSans-22f1"/>
-    <path d="M 78.078125 35.5 
-L 78.078125 27.203125 
-L 27.203125 27.203125 
-L 38.625 15.765625 
-L 32.765625 9.90625 
-L 13.53125 29.15625 
-L 13.53125 10.296875 
-L 5.21875 10.296875 
-L 5.21875 52.296875 
-L 13.53125 52.296875 
-L 13.53125 33.546875 
-L 32.765625 52.78125 
-L 38.625 46.921875 
-L 27.203125 35.5 
-z
-" id="DejaVuSans-21e4"/>
-    <path d="M 36.5625 12.921875 
-L 46.875 12.921875 
-L 46.875 0.515625 
-L 36.5625 0.515625 
-z
-M 10.59375 45.40625 
-L 73.1875 45.40625 
-L 73.1875 37.203125 
-L 10.59375 37.203125 
-z
-M 10.59375 25.484375 
-L 73.1875 25.484375 
-L 73.1875 17.1875 
-L 10.59375 17.1875 
-z
-M 36.6875 62.921875 
-L 47 62.921875 
-L 47 50.515625 
-L 36.6875 50.515625 
-z
-" id="DejaVuSans-2251"/>
-    <path d="M 46 57.8125 
-L 46 33.0625 
-L 73.1875 33.0625 
-L 73.1875 24.75 
-L 46 24.75 
-L 46 0 
-L 37.796875 0 
-L 37.796875 24.75 
-L 10.59375 24.75 
-L 10.59375 33.0625 
-L 37.796875 33.0625 
-L 37.796875 57.8125 
-z
-M 37.796875 72.90625 
-L 46 72.90625 
-L 46 62.9375 
-L 37.796875 62.9375 
-z
-" id="DejaVuSans-2214"/>
-    <path d="M 36.6875 54.921875 
-L 47 54.921875 
-L 47 42.515625 
-L 36.6875 42.515625 
-z
-M 10.59375 35.5 
-L 73.1875 35.5 
-L 73.1875 27.203125 
-L 10.59375 27.203125 
-z
-" id="DejaVuSans-2238"/>
-    <path d="M 44.828125 12.40625 
-L 55.171875 12.40625 
-L 55.171875 0 
-L 44.828125 0 
-z
-M 78.078125 12.40625 
-L 88.484375 12.40625 
-L 88.484375 0 
-L 78.078125 0 
-z
-M 11.53125 12.40625 
-L 21.921875 12.40625 
-L 21.921875 0 
-L 11.53125 0 
-z
-" id="DejaVuSans-2026"/>
-    <path id="DejaVuSans-20"/>
-    <path d="M 36.6875 62.921875 
-L 47 62.921875 
-L 47 50.515625 
-L 36.6875 50.515625 
-z
-M 10.59375 45.40625 
-L 73.1875 45.40625 
-L 73.1875 37.203125 
-L 10.59375 37.203125 
-z
-M 10.59375 25.484375 
-L 73.1875 25.484375 
-L 73.1875 17.1875 
-L 10.59375 17.1875 
-z
-" id="DejaVuSans-2250"/>
-   </defs>
-   <g transform="translate(134.100000 30.311250)scale(0.120000 -0.120000)">
-    <use transform="translate(0.000000 0.968750)" xlink:href="#DejaVuSans-21e4"/>
-    <use transform="translate(83.789062 0.968750)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(115.576172 0.968750)" xlink:href="#DejaVuSans-22bc"/>
-    <use transform="translate(188.769531 0.968750)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(220.556641 0.968750)" xlink:href="#DejaVuSans-22f1"/>
-    <use transform="translate(320.556641 0.968750)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(352.343750 0.968750)" xlink:href="#DejaVuSans-2250"/>
-    <use transform="translate(436.132812 0.968750)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(467.919922 0.968750)" xlink:href="#DejaVuSans-2251"/>
-    <use transform="translate(551.708984 0.968750)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(583.496094 0.968750)" xlink:href="#DejaVuSans-2238"/>
-    <use transform="translate(667.285156 0.968750)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(699.072266 0.968750)" xlink:href="#DejaVuSans-2214"/>
-    <use transform="translate(782.861328 0.968750)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(814.648438 0.968750)" xlink:href="#DejaVuSans-2026"/>
-   </g>
-  </g>
- </g>
-</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_30.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_30.pdf
deleted file mode 100644
index 35697c58a00e..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_30.pdf and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_30.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_30.png
deleted file mode 100644
index 718302dfb8ca..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_30.png and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_30.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_30.svg
deleted file mode 100644
index eb8e7376d155..000000000000
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_30.svg
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (http://matplotlib.org/) -->
-<svg height="54pt" version="1.1" viewBox="0 0 378 54" width="378pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
- </defs>
- <g id="figure_1">
-  <g id="patch_1">
-   <path d="M 0 54 
-L 378 54 
-L 378 0 
-L 0 0 
-z
-" style="fill:#ffffff;"/>
-  </g>
-  <g id="text_1">
-   <!-- $\oint^\infty_0$ -->
-   <defs>
-    <path d="M 35.296875 47.59375 
-L 38.59375 60.59375 
-Q 44 82.40625 57.40625 82.40625 
-Q 60.296875 82.40625 62.09375 81.09375 
-Q 63.90625 79.796875 63.90625 77.90625 
-Q 63.90625 75.40625 62.34375 73.703125 
-Q 60.796875 72 58.703125 72 
-Q 55.59375 72 55.59375 74.40625 
-Q 55.59375 75.90625 56.5 77.09375 
-Q 57.40625 78.296875 57.40625 78.5 
-Q 57.40625 79.296875 56.296875 79.296875 
-Q 52.796875 79.296875 50.59375 74.9375 
-Q 48.40625 70.59375 46.203125 61.59375 
-L 42.296875 45.796875 
-Q 48.40625 43.203125 52.15625 37.59375 
-Q 55.90625 32 55.90625 25.09375 
-Q 55.90625 15.796875 49.296875 9.1875 
-Q 42.703125 2.59375 33.40625 2.59375 
-Q 32.09375 2.59375 31.5 2.703125 
-L 27.90625 -11.796875 
-Q 27 -15.296875 25.703125 -18.4375 
-Q 24.40625 -21.59375 22.296875 -24.84375 
-Q 20.203125 -28.09375 16.953125 -30.046875 
-Q 13.703125 -32 9.703125 -32 
-Q 6.796875 -32 5 -30.703125 
-Q 3.203125 -29.40625 3.203125 -27.5 
-Q 3.203125 -25 4.75 -23.296875 
-Q 6.296875 -21.59375 8.40625 -21.59375 
-Q 9.59375 -21.59375 10.546875 -22.296875 
-Q 11.5 -23 11.5 -24.203125 
-Q 11.5 -25.90625 10.59375 -26.84375 
-Q 9.703125 -27.796875 9.703125 -28.09375 
-Q 9.703125 -28.90625 10.796875 -28.90625 
-Q 14.09375 -28.90625 16.1875 -24.84375 
-Q 18.296875 -20.796875 20.40625 -12.40625 
-L 24.59375 4.40625 
-Q 18.40625 7.09375 14.65625 12.640625 
-Q 10.90625 18.203125 10.90625 25.09375 
-Q 10.90625 34.40625 17.5 41 
-Q 24.09375 47.59375 33.40625 47.59375 
-z
-M 32.40625 6.40625 
-L 33.40625 6.40625 
-Q 41.09375 6.40625 46.59375 11.90625 
-Q 52.09375 17.40625 52.09375 25.09375 
-Q 52.09375 30.59375 49.140625 35.1875 
-Q 46.203125 39.796875 41.296875 42.09375 
-z
-M 34.40625 43.796875 
-L 33.40625 43.796875 
-Q 25.703125 43.796875 20.203125 38.296875 
-Q 14.703125 32.796875 14.703125 25.09375 
-Q 14.703125 19.59375 17.640625 15 
-Q 20.59375 10.40625 25.5 8.09375 
-z
-" id="STIXGeneral-Regular-222e"/>
-    <path d="M 44.671875 27.296875 
-Q 47.125 22.953125 50.359375 20.78125 
-Q 53.609375 18.609375 57.71875 18.609375 
-Q 62.640625 18.609375 65.765625 21.90625 
-Q 68.890625 25.203125 68.890625 30.328125 
-Q 68.890625 35.25 66.015625 38.515625 
-Q 63.140625 41.796875 58.796875 41.796875 
-Q 54.828125 41.796875 51.625 38.546875 
-Q 48.4375 35.296875 44.671875 27.296875 
-M 38.71875 32.515625 
-Q 36.328125 36.8125 33.078125 38.953125 
-Q 29.828125 41.109375 25.6875 41.109375 
-Q 20.75 41.109375 17.625 37.859375 
-Q 14.5 34.625 14.5 29.5 
-Q 14.5 24.5625 17.375 21.28125 
-Q 20.265625 18.015625 24.609375 18.015625 
-Q 28.5625 18.015625 31.765625 21.234375 
-Q 34.96875 24.46875 38.71875 32.515625 
-M 42.1875 23.578125 
-Q 38.71875 16.9375 34.9375 13.859375 
-Q 31.15625 10.796875 26.515625 10.796875 
-Q 19.921875 10.796875 15.359375 16.265625 
-Q 10.796875 21.734375 10.796875 29.78125 
-Q 10.796875 38.328125 14.875 43.59375 
-Q 18.953125 48.875 25.484375 48.875 
-Q 30.125 48.875 33.78125 45.875 
-Q 37.453125 42.875 41.109375 35.984375 
-Q 44.4375 42.71875 48.296875 45.921875 
-Q 52.15625 49.125 56.890625 49.125 
-Q 63.375 49.125 67.984375 43.609375 
-Q 72.609375 38.09375 72.609375 29.984375 
-Q 72.609375 21.484375 68.53125 16.234375 
-Q 64.453125 10.984375 57.90625 10.984375 
-Q 53.265625 10.984375 49.671875 13.84375 
-Q 46.09375 16.703125 42.1875 23.578125 
-" id="DejaVuSerif-221e"/>
-    <path d="M 31.78125 3.421875 
-Q 39.265625 3.421875 42.96875 11.625 
-Q 46.6875 19.828125 46.6875 36.375 
-Q 46.6875 52.984375 42.96875 61.1875 
-Q 39.265625 69.390625 31.78125 69.390625 
-Q 24.3125 69.390625 20.59375 61.1875 
-Q 16.890625 52.984375 16.890625 36.375 
-Q 16.890625 19.828125 20.59375 11.625 
-Q 24.3125 3.421875 31.78125 3.421875 
-M 31.78125 -1.421875 
-Q 19.921875 -1.421875 13.25 8.53125 
-Q 6.59375 18.5 6.59375 36.375 
-Q 6.59375 54.296875 13.25 64.25 
-Q 19.921875 74.21875 31.78125 74.21875 
-Q 43.703125 74.21875 50.34375 64.25 
-Q 56.984375 54.296875 56.984375 36.375 
-Q 56.984375 18.5 50.34375 8.53125 
-Q 43.703125 -1.421875 31.78125 -1.421875 
-" id="DejaVuSerif-30"/>
-   </defs>
-   <g transform="translate(181.860000 29.580000)scale(0.120000 -0.120000)">
-    <use transform="translate(0.000000 0.968750)" xlink:href="#STIXGeneral-Regular-222e"/>
-    <use transform="translate(59.994760 62.612500)scale(0.700000)" xlink:href="#DejaVuSerif-221e"/>
-    <use transform="translate(48.457885 -51.793750)scale(0.700000)" xlink:href="#DejaVuSerif-30"/>
-   </g>
-  </g>
- </g>
-</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_77.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_77.pdf
deleted file mode 100644
index d6fc89ad9f25..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_77.pdf and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_77.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_77.png
deleted file mode 100644
index b3892b25c4ee..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_77.png and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_77.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_77.svg
deleted file mode 100644
index 3c9961669b69..000000000000
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_77.svg
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (http://matplotlib.org/) -->
-<svg height="54pt" version="1.1" viewBox="0 0 378 54" width="378pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
- </defs>
- <g id="figure_1">
-  <g id="patch_1">
-   <path d="M 0 54 
-L 378 54 
-L 378 0 
-L 0 0 
-z
-" style="fill:#ffffff;"/>
-  </g>
-  <g id="text_1">
-   <!-- $\barleftarrow$ $\barwedge$ $\ddots$ $\doteq$ $\doteqdot$ $\dotminus$ $\dotplus$ $\dots$ -->
-   <defs>
-    <path d="M 35.359375 59.328125 
-Q 35.359375 62.0625 37.234375 63.9375 
-Q 39.109375 65.828125 41.890625 65.828125 
-Q 44.578125 65.828125 46.484375 63.921875 
-Q 48.390625 62.015625 48.390625 59.328125 
-Q 48.390625 56.59375 46.484375 54.703125 
-Q 44.578125 52.828125 41.890625 52.828125 
-Q 39.109375 52.828125 37.234375 54.6875 
-Q 35.359375 56.546875 35.359375 59.328125 
-M 10.59375 45.21875 
-L 73.1875 45.21875 
-L 73.1875 37.40625 
-L 10.59375 37.40625 
-z
-M 10.59375 25.296875 
-L 73.1875 25.296875 
-L 73.1875 17.484375 
-L 10.59375 17.484375 
-z
-" id="DejaVuSerif-2250"/>
-    <path d="M 35.359375 3.421875 
-Q 35.359375 6.15625 37.234375 8.03125 
-Q 39.109375 9.90625 41.890625 9.90625 
-Q 44.578125 9.90625 46.484375 8 
-Q 48.390625 6.109375 48.390625 3.421875 
-Q 48.390625 0.6875 46.484375 -1.1875 
-Q 44.578125 -3.078125 41.890625 -3.078125 
-Q 39.109375 -3.078125 37.234375 -1.21875 
-Q 35.359375 0.640625 35.359375 3.421875 
-M 35.359375 59.328125 
-Q 35.359375 62.0625 37.234375 63.9375 
-Q 39.109375 65.828125 41.890625 65.828125 
-Q 44.578125 65.828125 46.484375 63.921875 
-Q 48.390625 62.015625 48.390625 59.328125 
-Q 48.390625 56.59375 46.484375 54.703125 
-Q 44.578125 52.828125 41.890625 52.828125 
-Q 39.109375 52.828125 37.234375 54.6875 
-Q 35.359375 56.546875 35.359375 59.328125 
-M 10.59375 45.21875 
-L 73.1875 45.21875 
-L 73.1875 37.40625 
-L 10.59375 37.40625 
-z
-M 10.59375 25.296875 
-L 73.1875 25.296875 
-L 73.1875 17.484375 
-L 10.59375 17.484375 
-z
-" id="DejaVuSerif-2251"/>
-    <path d="M 57.203125 58 
-L 4.796875 58 
-L 4.796875 64.59375 
-L 57.203125 64.59375 
-z
-M 59 -2.90625 
-L 52.703125 -2.90625 
-L 31.203125 40.296875 
-L 9.703125 -2.90625 
-L 3.203125 -2.90625 
-L 30.703125 53.59375 
-L 31.703125 53.59375 
-z
-" id="STIXGeneral-Regular-22bc"/>
-    <path d="M 32.09375 45.703125 
-Q 32.09375 43.09375 30.34375 41.1875 
-Q 28.59375 39.296875 25.796875 39.296875 
-Q 22.90625 39.296875 21.15625 41.046875 
-Q 19.40625 42.796875 19.40625 45.703125 
-Q 19.40625 48.40625 21.34375 50.203125 
-Q 23.296875 52 25.796875 52 
-Q 28.296875 52 30.1875 50.203125 
-Q 32.09375 48.40625 32.09375 45.703125 
-M 73.203125 4.59375 
-Q 73.203125 2 71.453125 0.09375 
-Q 69.703125 -1.796875 66.90625 -1.796875 
-Q 64 -1.796875 62.25 -0.046875 
-Q 60.5 1.703125 60.5 4.59375 
-Q 60.5 7.296875 62.453125 9.09375 
-Q 64.40625 10.90625 66.90625 10.90625 
-Q 69.40625 10.90625 71.296875 9.09375 
-Q 73.203125 7.296875 73.203125 4.59375 
-M 52.5 25.203125 
-Q 52.5 22.59375 50.75 20.6875 
-Q 49 18.796875 46.203125 18.796875 
-Q 43.296875 18.796875 41.546875 20.546875 
-Q 39.796875 22.296875 39.796875 25.203125 
-Q 39.796875 27.90625 41.75 29.703125 
-Q 43.703125 31.5 46.203125 31.5 
-Q 48.703125 31.5 50.59375 29.703125 
-Q 52.5 27.90625 52.5 25.203125 
-" id="STIXGeneral-Regular-22f1"/>
-    <path d="M 35.359375 59.421875 
-Q 35.359375 62.15625 37.234375 64.03125 
-Q 39.109375 65.921875 41.890625 65.921875 
-Q 44.578125 65.921875 46.484375 64.015625 
-Q 48.390625 62.109375 48.390625 59.421875 
-Q 48.390625 56.6875 46.484375 54.8125 
-Q 44.578125 52.9375 41.890625 52.9375 
-Q 39.109375 52.9375 37.234375 54.78125 
-Q 35.359375 56.640625 35.359375 59.421875 
-M 45.796875 46.09375 
-L 45.796875 27 
-L 73.1875 27 
-L 73.1875 19.09375 
-L 45.796875 19.09375 
-L 45.796875 0 
-L 37.984375 0 
-L 37.984375 19.09375 
-L 10.59375 19.09375 
-L 10.59375 27 
-L 37.984375 27 
-L 37.984375 46.09375 
-z
-" id="DejaVuSerif-2214"/>
-    <path d="M 78.078125 28.375 
-L 21.96875 28.375 
-L 31.390625 11.921875 
-L 30.859375 11.921875 
-L 13.625 29 
-L 13.625 13.140625 
-L 5.71875 13.140625 
-L 5.71875 51.515625 
-L 13.625 51.515625 
-L 13.625 35.640625 
-L 30.859375 52.734375 
-L 31.390625 52.734375 
-L 21.96875 36.28125 
-L 78.078125 36.28125 
-z
-" id="DejaVuSerif-21e4"/>
-    <path d="M 76.8125 5.078125 
-Q 76.8125 7.8125 78.6875 9.71875 
-Q 80.5625 11.625 83.296875 11.625 
-Q 85.984375 11.625 87.890625 9.71875 
-Q 89.796875 7.8125 89.796875 5.078125 
-Q 89.796875 2.390625 87.890625 0.484375 
-Q 85.984375 -1.421875 83.296875 -1.421875 
-Q 80.515625 -1.421875 78.65625 0.453125 
-Q 76.8125 2.34375 76.8125 5.078125 
-M 43.5 5.078125 
-Q 43.5 7.8125 45.375 9.71875 
-Q 47.265625 11.625 50 11.625 
-Q 52.6875 11.625 54.59375 9.71875 
-Q 56.5 7.8125 56.5 5.078125 
-Q 56.5 2.390625 54.59375 0.484375 
-Q 52.6875 -1.421875 50 -1.421875 
-Q 47.21875 -1.421875 45.359375 0.453125 
-Q 43.5 2.34375 43.5 5.078125 
-M 10.203125 5.078125 
-Q 10.203125 7.8125 12.078125 9.71875 
-Q 13.96875 11.625 16.703125 11.625 
-Q 19.390625 11.625 21.28125 9.71875 
-Q 23.1875 7.8125 23.1875 5.078125 
-Q 23.1875 2.390625 21.28125 0.484375 
-Q 19.390625 -1.421875 16.703125 -1.421875 
-Q 13.921875 -1.421875 12.0625 0.453125 
-Q 10.203125 2.34375 10.203125 5.078125 
-" id="DejaVuSerif-2026"/>
-    <path d="M 35.40625 49.421875 
-Q 35.40625 52.15625 37.28125 54.03125 
-Q 39.15625 55.90625 41.890625 55.90625 
-Q 44.578125 55.90625 46.484375 54 
-Q 48.390625 52.09375 48.390625 49.421875 
-Q 48.390625 46.6875 46.484375 44.796875 
-Q 44.578125 42.921875 41.890625 42.921875 
-Q 39.109375 42.921875 37.25 44.765625 
-Q 35.40625 46.625 35.40625 49.421875 
-M 10.59375 35.296875 
-L 73.1875 35.296875 
-L 73.1875 27.390625 
-L 10.59375 27.390625 
-z
-" id="DejaVuSerif-2238"/>
-    <path id="DejaVuSans-20"/>
-   </defs>
-   <g transform="translate(135.180000 30.311250)scale(0.120000 -0.120000)">
-    <use transform="translate(0.000000 0.078125)" xlink:href="#DejaVuSerif-21e4"/>
-    <use transform="translate(83.789062 0.078125)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(115.576172 0.078125)" xlink:href="#STIXGeneral-Regular-22bc"/>
-    <use transform="translate(177.576157 0.078125)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(209.363266 0.078125)" xlink:href="#STIXGeneral-Regular-22f1"/>
-    <use transform="translate(301.963257 0.078125)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(333.750366 0.078125)" xlink:href="#DejaVuSerif-2250"/>
-    <use transform="translate(417.539429 0.078125)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(449.326538 0.078125)" xlink:href="#DejaVuSerif-2251"/>
-    <use transform="translate(533.115601 0.078125)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(564.902710 0.078125)" xlink:href="#DejaVuSerif-2238"/>
-    <use transform="translate(648.691772 0.078125)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(680.478882 0.078125)" xlink:href="#DejaVuSerif-2214"/>
-    <use transform="translate(764.267944 0.078125)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(796.055054 0.078125)" xlink:href="#DejaVuSerif-2026"/>
-   </g>
-  </g>
- </g>
-</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_30.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_30.pdf
deleted file mode 100644
index 49ad0e80b04a..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_30.pdf and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_30.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_30.png
deleted file mode 100644
index 7001c4f0e3dd..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_30.png and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_30.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_30.svg
deleted file mode 100644
index 70746902f681..000000000000
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_30.svg
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (http://matplotlib.org/) -->
-<svg height="54pt" version="1.1" viewBox="0 0 378 54" width="378pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
- </defs>
- <g id="figure_1">
-  <g id="patch_1">
-   <path d="M 0 54 
-L 378 54 
-L 378 0 
-L 0 0 
-z
-" style="fill:#ffffff;"/>
-  </g>
-  <g id="text_1">
-   <!-- $\oint^\infty_0$ -->
-   <defs>
-    <path d="M 35.296875 47.59375 
-L 38.59375 60.59375 
-Q 44 82.40625 57.40625 82.40625 
-Q 60.296875 82.40625 62.09375 81.09375 
-Q 63.90625 79.796875 63.90625 77.90625 
-Q 63.90625 75.40625 62.34375 73.703125 
-Q 60.796875 72 58.703125 72 
-Q 55.59375 72 55.59375 74.40625 
-Q 55.59375 75.90625 56.5 77.09375 
-Q 57.40625 78.296875 57.40625 78.5 
-Q 57.40625 79.296875 56.296875 79.296875 
-Q 52.796875 79.296875 50.59375 74.9375 
-Q 48.40625 70.59375 46.203125 61.59375 
-L 42.296875 45.796875 
-Q 48.40625 43.203125 52.15625 37.59375 
-Q 55.90625 32 55.90625 25.09375 
-Q 55.90625 15.796875 49.296875 9.1875 
-Q 42.703125 2.59375 33.40625 2.59375 
-Q 32.09375 2.59375 31.5 2.703125 
-L 27.90625 -11.796875 
-Q 27 -15.296875 25.703125 -18.4375 
-Q 24.40625 -21.59375 22.296875 -24.84375 
-Q 20.203125 -28.09375 16.953125 -30.046875 
-Q 13.703125 -32 9.703125 -32 
-Q 6.796875 -32 5 -30.703125 
-Q 3.203125 -29.40625 3.203125 -27.5 
-Q 3.203125 -25 4.75 -23.296875 
-Q 6.296875 -21.59375 8.40625 -21.59375 
-Q 9.59375 -21.59375 10.546875 -22.296875 
-Q 11.5 -23 11.5 -24.203125 
-Q 11.5 -25.90625 10.59375 -26.84375 
-Q 9.703125 -27.796875 9.703125 -28.09375 
-Q 9.703125 -28.90625 10.796875 -28.90625 
-Q 14.09375 -28.90625 16.1875 -24.84375 
-Q 18.296875 -20.796875 20.40625 -12.40625 
-L 24.59375 4.40625 
-Q 18.40625 7.09375 14.65625 12.640625 
-Q 10.90625 18.203125 10.90625 25.09375 
-Q 10.90625 34.40625 17.5 41 
-Q 24.09375 47.59375 33.40625 47.59375 
-z
-M 32.40625 6.40625 
-L 33.40625 6.40625 
-Q 41.09375 6.40625 46.59375 11.90625 
-Q 52.09375 17.40625 52.09375 25.09375 
-Q 52.09375 30.59375 49.140625 35.1875 
-Q 46.203125 39.796875 41.296875 42.09375 
-z
-M 34.40625 43.796875 
-L 33.40625 43.796875 
-Q 25.703125 43.796875 20.203125 38.296875 
-Q 14.703125 32.796875 14.703125 25.09375 
-Q 14.703125 19.59375 17.640625 15 
-Q 20.59375 10.40625 25.5 8.09375 
-z
-" id="STIXGeneral-Regular-222e"/>
-    <path d="M 47.59375 33 
-Q 47.59375 26.296875 46.296875 20.34375 
-Q 45 14.40625 42.453125 9.40625 
-Q 39.90625 4.40625 35.40625 1.5 
-Q 30.90625 -1.40625 25 -1.40625 
-Q 18.90625 -1.40625 14.296875 1.6875 
-Q 9.703125 4.796875 7.203125 10 
-Q 4.703125 15.203125 3.546875 21.09375 
-Q 2.40625 27 2.40625 33.59375 
-Q 2.40625 42.90625 4.703125 50.34375 
-Q 7 57.796875 12.34375 62.6875 
-Q 17.703125 67.59375 25.40625 67.59375 
-Q 35.203125 67.59375 41.390625 58 
-Q 47.59375 48.40625 47.59375 33 
-M 38 32.5 
-Q 38 48.296875 34.640625 56.640625 
-Q 31.296875 65 24.796875 65 
-Q 18.59375 65 15.296875 56.59375 
-Q 12 48.203125 12 32.90625 
-Q 12 17.5 15.296875 9.34375 
-Q 18.59375 1.203125 25 1.203125 
-Q 31.296875 1.203125 34.640625 9.34375 
-Q 38 17.5 38 32.5 
-" id="STIXGeneral-Regular-30"/>
-    <path d="M 85.40625 22.203125 
-Q 85.40625 14.09375 79.90625 7.046875 
-Q 74.40625 0 65.59375 0 
-Q 59.796875 0 55.140625 3.546875 
-Q 50.5 7.09375 45.5 14.5 
-Q 38.296875 0 24.59375 0 
-Q 17.5 0 12.25 5.140625 
-Q 7 10.296875 7 20 
-Q 7 25.203125 8.453125 29.390625 
-Q 9.90625 33.59375 12.046875 36.046875 
-Q 14.203125 38.5 16.890625 40.140625 
-Q 19.59375 41.796875 21.84375 42.390625 
-Q 24.09375 43 26.09375 43 
-Q 32.09375 43 36.640625 40.140625 
-Q 41.203125 37.296875 47.90625 28.296875 
-Q 52 35.703125 56.140625 39.34375 
-Q 60.296875 43 67.203125 43 
-Q 74.5 43 79.953125 37.34375 
-Q 85.40625 31.703125 85.40625 22.203125 
-M 49.90625 24.5 
-L 49.90625 24.203125 
-Q 55.703125 14.703125 60.09375 10.296875 
-Q 64.5 5.90625 69.40625 5.90625 
-Q 73.59375 5.90625 76.5 9.453125 
-Q 79.40625 13 79.40625 17.796875 
-Q 79.40625 24.90625 75.65625 29.75 
-Q 71.90625 34.59375 65.5 34.59375 
-Q 62.40625 34.59375 59.84375 33.75 
-Q 57.296875 32.90625 55.296875 31 
-Q 53.296875 29.09375 52.390625 28 
-Q 51.5 26.90625 49.90625 24.5 
-M 43.296875 18.09375 
-L 43.296875 18.40625 
-Q 37.59375 27.796875 32.75 32.4375 
-Q 27.90625 37.09375 23 37.09375 
-Q 18.796875 37.09375 15.890625 33.546875 
-Q 13 30 13 25.203125 
-Q 13 18.40625 16.796875 13.40625 
-Q 20.59375 8.40625 26.90625 8.40625 
-Q 30 8.40625 32.703125 9.296875 
-Q 35.40625 10.203125 37.5 11.953125 
-Q 39.59375 13.703125 40.75 14.953125 
-Q 41.90625 16.203125 43.296875 18.09375 
-" id="STIXGeneral-Regular-221e"/>
-   </defs>
-   <g transform="translate(180.540000 29.640000)scale(0.120000 -0.120000)">
-    <use transform="translate(0.000000 0.131250)" xlink:href="#STIXGeneral-Regular-222e"/>
-    <use transform="translate(75.857963 64.900000)scale(0.700000)" xlink:href="#STIXGeneral-Regular-221e"/>
-    <use transform="translate(41.247338 -49.506250)scale(0.700000)" xlink:href="#STIXGeneral-Regular-30"/>
-   </g>
-  </g>
- </g>
-</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_77.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_77.pdf
deleted file mode 100644
index 3966ee6ddd59..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_77.pdf and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_77.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_77.png
deleted file mode 100644
index 9ed5a18bf57b..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_77.png and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_77.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_77.svg
deleted file mode 100644
index f423ee824f38..000000000000
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_77.svg
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (http://matplotlib.org/) -->
-<svg height="54pt" version="1.1" viewBox="0 0 378 54" width="378pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
- </defs>
- <g id="figure_1">
-  <g id="patch_1">
-   <path d="M 0 54 
-L 378 54 
-L 378 0 
-L 0 0 
-z
-" style="fill:#ffffff;"/>
-  </g>
-  <g id="text_1">
-   <!-- $\barleftarrow$ $\barwedge$ $\ddots$ $\doteq$ $\doteqdot$ $\dotminus$ $\dotplus$ $\dots$ -->
-   <defs>
-    <path d="M 40.5 67.796875 
-Q 40.5 65.203125 38.75 63.296875 
-Q 37 61.40625 34.203125 61.40625 
-Q 31.296875 61.40625 29.546875 63.15625 
-Q 27.796875 64.90625 27.796875 67.796875 
-Q 27.796875 70.5 29.75 72.296875 
-Q 31.703125 74.09375 34.203125 74.09375 
-Q 36.703125 74.09375 38.59375 72.296875 
-Q 40.5 70.5 40.5 67.796875 
-M 63.59375 22 
-L 37.5 22 
-L 37.5 -4.09375 
-L 30.90625 -4.09375 
-L 30.90625 22 
-L 4.796875 22 
-L 4.796875 28.59375 
-L 30.90625 28.59375 
-L 30.90625 54.703125 
-L 37.5 54.703125 
-L 37.5 28.59375 
-L 63.59375 28.59375 
-z
-" id="STIXGeneral-Regular-2214"/>
-    <path d="M 57.203125 58 
-L 4.796875 58 
-L 4.796875 64.59375 
-L 57.203125 64.59375 
-z
-M 59 -2.90625 
-L 52.703125 -2.90625 
-L 31.203125 40.296875 
-L 9.703125 -2.90625 
-L 3.203125 -2.90625 
-L 30.703125 53.59375 
-L 31.703125 53.59375 
-z
-" id="STIXGeneral-Regular-22bc"/>
-    <path d="M 86.59375 22 
-L 29.703125 22 
-Q 28.90625 22 28 21.25 
-Q 27.09375 20.5 27.09375 19.796875 
-Q 27.09375 18.703125 28.5 17.296875 
-Q 33.59375 12.40625 36.703125 7.703125 
-L 34.703125 5.796875 
-Q 22.296875 20.09375 11 24.796875 
-L 11 5.796875 
-L 6 5.796875 
-L 6 45 
-L 11 45 
-L 11 25.796875 
-Q 22.296875 30.59375 34.796875 45 
-L 36.796875 43.09375 
-Q 33.703125 38.703125 28.59375 33.40625 
-Q 27.203125 32 27.203125 30.59375 
-Q 27.203125 28.59375 29.796875 28.59375 
-L 86.59375 28.59375 
-z
-" id="STIXGeneral-Regular-21e4"/>
-    <path d="M 32.09375 45.703125 
-Q 32.09375 43.09375 30.34375 41.1875 
-Q 28.59375 39.296875 25.796875 39.296875 
-Q 22.90625 39.296875 21.15625 41.046875 
-Q 19.40625 42.796875 19.40625 45.703125 
-Q 19.40625 48.40625 21.34375 50.203125 
-Q 23.296875 52 25.796875 52 
-Q 28.296875 52 30.1875 50.203125 
-Q 32.09375 48.40625 32.09375 45.703125 
-M 73.203125 4.59375 
-Q 73.203125 2 71.453125 0.09375 
-Q 69.703125 -1.796875 66.90625 -1.796875 
-Q 64 -1.796875 62.25 -0.046875 
-Q 60.5 1.703125 60.5 4.59375 
-Q 60.5 7.296875 62.453125 9.09375 
-Q 64.40625 10.90625 66.90625 10.90625 
-Q 69.40625 10.90625 71.296875 9.09375 
-Q 73.203125 7.296875 73.203125 4.59375 
-M 52.5 25.203125 
-Q 52.5 22.59375 50.75 20.6875 
-Q 49 18.796875 46.203125 18.796875 
-Q 43.296875 18.796875 41.546875 20.546875 
-Q 39.796875 22.296875 39.796875 25.203125 
-Q 39.796875 27.90625 41.75 29.703125 
-Q 43.703125 31.5 46.203125 31.5 
-Q 48.703125 31.5 50.59375 29.703125 
-Q 52.5 27.90625 52.5 25.203125 
-" id="STIXGeneral-Regular-22f1"/>
-    <path d="M 40.5 54.796875 
-Q 40.5 52.203125 38.75 50.296875 
-Q 37 48.40625 34.203125 48.40625 
-Q 31.296875 48.40625 29.546875 50.15625 
-Q 27.796875 51.90625 27.796875 54.796875 
-Q 27.796875 57.5 29.75 59.296875 
-Q 31.703125 61.09375 34.203125 61.09375 
-Q 36.703125 61.09375 38.59375 59.296875 
-Q 40.5 57.5 40.5 54.796875 
-M 63.703125 32 
-L 4.796875 32 
-L 4.796875 38.59375 
-L 63.703125 38.59375 
-z
-M 63.703125 12 
-L 4.796875 12 
-L 4.796875 18.59375 
-L 63.703125 18.59375 
-z
-" id="STIXGeneral-Regular-2250"/>
-    <path d="M 88.796875 4.296875 
-Q 88.796875 2.09375 87.140625 0.5 
-Q 85.5 -1.09375 83.203125 -1.09375 
-Q 80.90625 -1.09375 79.296875 0.5 
-Q 77.703125 2.09375 77.703125 4.390625 
-Q 77.703125 6.703125 79.34375 8.34375 
-Q 81 10 83.296875 10 
-Q 85.5 10 87.140625 8.296875 
-Q 88.796875 6.59375 88.796875 4.296875 
-M 55.5 4.296875 
-Q 55.5 2.09375 53.84375 0.5 
-Q 52.203125 -1.09375 49.890625 -1.09375 
-Q 47.59375 -1.09375 46 0.5 
-Q 44.40625 2.09375 44.40625 4.390625 
-Q 44.40625 6.703125 46.046875 8.34375 
-Q 47.703125 10 50 10 
-Q 52.203125 10 53.84375 8.296875 
-Q 55.5 6.59375 55.5 4.296875 
-M 22.203125 4.296875 
-Q 22.203125 2.09375 20.546875 0.5 
-Q 18.90625 -1.09375 16.59375 -1.09375 
-Q 14.296875 -1.09375 12.6875 0.5 
-Q 11.09375 2.09375 11.09375 4.390625 
-Q 11.09375 6.703125 12.75 8.34375 
-Q 14.40625 10 16.703125 10 
-Q 18.90625 10 20.546875 8.296875 
-Q 22.203125 6.59375 22.203125 4.296875 
-" id="STIXGeneral-Regular-2026"/>
-    <path d="M 40.5 44.796875 
-Q 40.5 42.203125 38.75 40.296875 
-Q 37 38.40625 34.203125 38.40625 
-Q 31.296875 38.40625 29.546875 40.15625 
-Q 27.796875 41.90625 27.796875 44.796875 
-Q 27.796875 47.5 29.75 49.296875 
-Q 31.703125 51.09375 34.203125 51.09375 
-Q 36.703125 51.09375 38.59375 49.296875 
-Q 40.5 47.5 40.5 44.796875 
-M 63.703125 22 
-L 4.796875 22 
-L 4.796875 28.59375 
-L 63.703125 28.59375 
-z
-" id="STIXGeneral-Regular-2238"/>
-    <path id="DejaVuSans-20"/>
-    <path d="M 40.5 54.796875 
-Q 40.5 52.203125 38.75 50.296875 
-Q 37 48.40625 34.203125 48.40625 
-Q 31.296875 48.40625 29.546875 50.15625 
-Q 27.796875 51.90625 27.796875 54.796875 
-Q 27.796875 57.5 29.75 59.296875 
-Q 31.703125 61.09375 34.203125 61.09375 
-Q 36.703125 61.09375 38.59375 59.296875 
-Q 40.5 57.5 40.5 54.796875 
-M 63.703125 32 
-L 4.796875 32 
-L 4.796875 38.59375 
-L 63.703125 38.59375 
-z
-M 63.703125 12 
-L 4.796875 12 
-L 4.796875 18.59375 
-L 63.703125 18.59375 
-z
-M 40.5 -4.203125 
-Q 40.5 -6.796875 38.59375 -8.6875 
-Q 36.703125 -10.59375 34.09375 -10.59375 
-Q 31.59375 -10.59375 29.6875 -8.640625 
-Q 27.796875 -6.703125 27.796875 -4.203125 
-Q 27.796875 -1.296875 29.640625 0.390625 
-Q 31.5 2.09375 34.09375 2.09375 
-Q 36.796875 2.09375 38.640625 0.4375 
-Q 40.5 -1.203125 40.5 -4.203125 
-" id="STIXGeneral-Regular-2251"/>
-   </defs>
-   <g transform="translate(138.360000 30.311250)scale(0.120000 -0.120000)">
-    <use transform="translate(0.000000 0.906250)" xlink:href="#STIXGeneral-Regular-21e4"/>
-    <use transform="translate(92.599991 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(124.387100 0.906250)" xlink:href="#STIXGeneral-Regular-22bc"/>
-    <use transform="translate(186.387085 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(218.174194 0.906250)" xlink:href="#STIXGeneral-Regular-22f1"/>
-    <use transform="translate(310.774185 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(342.561295 0.906250)" xlink:href="#STIXGeneral-Regular-2250"/>
-    <use transform="translate(411.061279 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(442.848389 0.906250)" xlink:href="#STIXGeneral-Regular-2251"/>
-    <use transform="translate(511.348373 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(543.135483 0.906250)" xlink:href="#STIXGeneral-Regular-2238"/>
-    <use transform="translate(611.635468 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(643.422577 0.906250)" xlink:href="#STIXGeneral-Regular-2214"/>
-    <use transform="translate(711.922562 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(743.709671 0.906250)" xlink:href="#STIXGeneral-Regular-2026"/>
-   </g>
-  </g>
- </g>
-</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_30.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_30.pdf
deleted file mode 100644
index ab1a2ee082ae..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_30.pdf and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_30.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_30.png
deleted file mode 100644
index 58bb828044e7..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_30.png and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_30.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_30.svg
deleted file mode 100644
index 7bc674a36430..000000000000
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_30.svg
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (http://matplotlib.org/) -->
-<svg height="54pt" version="1.1" viewBox="0 0 378 54" width="378pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
- </defs>
- <g id="figure_1">
-  <g id="patch_1">
-   <path d="M 0 54 
-L 378 54 
-L 378 0 
-L 0 0 
-z
-" style="fill:#ffffff;"/>
-  </g>
-  <g id="text_1">
-   <!-- $\oint^\infty_0$ -->
-   <defs>
-    <path d="M 47.703125 33 
-Q 47.703125 23.796875 45.546875 16.34375 
-Q 43.40625 8.90625 38.09375 3.75 
-Q 32.796875 -1.40625 25 -1.40625 
-Q 18.796875 -1.40625 14.25 1.6875 
-Q 9.703125 4.796875 7.203125 10.046875 
-Q 4.703125 15.296875 3.5 21.140625 
-Q 2.296875 27 2.296875 33.59375 
-Q 2.296875 42.90625 4.59375 50.34375 
-Q 6.90625 57.796875 12.296875 62.6875 
-Q 17.703125 67.59375 25.40625 67.59375 
-Q 35.203125 67.59375 41.453125 57.9375 
-Q 47.703125 48.296875 47.703125 33 
-M 39.796875 33 
-Q 39.796875 45.203125 35.75 52.84375 
-Q 31.703125 60.5 25.203125 60.5 
-Q 17.796875 60.5 14 52.75 
-Q 10.203125 45 10.203125 33.40625 
-Q 10.203125 28.203125 10.953125 23.546875 
-Q 11.703125 18.90625 13.34375 14.75 
-Q 15 10.59375 18 8.140625 
-Q 21 5.703125 25 5.703125 
-Q 30.09375 5.703125 33.546875 9.796875 
-Q 37 13.90625 38.390625 19.84375 
-Q 39.796875 25.796875 39.796875 33 
-" id="STIXGeneral-Regular-1d7e2"/>
-    <path d="M 35.296875 47.59375 
-L 38.59375 60.59375 
-Q 44 82.40625 57.40625 82.40625 
-Q 60.296875 82.40625 62.09375 81.09375 
-Q 63.90625 79.796875 63.90625 77.90625 
-Q 63.90625 75.40625 62.34375 73.703125 
-Q 60.796875 72 58.703125 72 
-Q 55.59375 72 55.59375 74.40625 
-Q 55.59375 75.90625 56.5 77.09375 
-Q 57.40625 78.296875 57.40625 78.5 
-Q 57.40625 79.296875 56.296875 79.296875 
-Q 52.796875 79.296875 50.59375 74.9375 
-Q 48.40625 70.59375 46.203125 61.59375 
-L 42.296875 45.796875 
-Q 48.40625 43.203125 52.15625 37.59375 
-Q 55.90625 32 55.90625 25.09375 
-Q 55.90625 15.796875 49.296875 9.1875 
-Q 42.703125 2.59375 33.40625 2.59375 
-Q 32.09375 2.59375 31.5 2.703125 
-L 27.90625 -11.796875 
-Q 27 -15.296875 25.703125 -18.4375 
-Q 24.40625 -21.59375 22.296875 -24.84375 
-Q 20.203125 -28.09375 16.953125 -30.046875 
-Q 13.703125 -32 9.703125 -32 
-Q 6.796875 -32 5 -30.703125 
-Q 3.203125 -29.40625 3.203125 -27.5 
-Q 3.203125 -25 4.75 -23.296875 
-Q 6.296875 -21.59375 8.40625 -21.59375 
-Q 9.59375 -21.59375 10.546875 -22.296875 
-Q 11.5 -23 11.5 -24.203125 
-Q 11.5 -25.90625 10.59375 -26.84375 
-Q 9.703125 -27.796875 9.703125 -28.09375 
-Q 9.703125 -28.90625 10.796875 -28.90625 
-Q 14.09375 -28.90625 16.1875 -24.84375 
-Q 18.296875 -20.796875 20.40625 -12.40625 
-L 24.59375 4.40625 
-Q 18.40625 7.09375 14.65625 12.640625 
-Q 10.90625 18.203125 10.90625 25.09375 
-Q 10.90625 34.40625 17.5 41 
-Q 24.09375 47.59375 33.40625 47.59375 
-z
-M 32.40625 6.40625 
-L 33.40625 6.40625 
-Q 41.09375 6.40625 46.59375 11.90625 
-Q 52.09375 17.40625 52.09375 25.09375 
-Q 52.09375 30.59375 49.140625 35.1875 
-Q 46.203125 39.796875 41.296875 42.09375 
-z
-M 34.40625 43.796875 
-L 33.40625 43.796875 
-Q 25.703125 43.796875 20.203125 38.296875 
-Q 14.703125 32.796875 14.703125 25.09375 
-Q 14.703125 19.59375 17.640625 15 
-Q 20.59375 10.40625 25.5 8.09375 
-z
-" id="STIXGeneral-Regular-222e"/>
-    <path d="M 85.40625 22.203125 
-Q 85.40625 14.09375 79.90625 7.046875 
-Q 74.40625 0 65.59375 0 
-Q 59.796875 0 55.140625 3.546875 
-Q 50.5 7.09375 45.5 14.5 
-Q 38.296875 0 24.59375 0 
-Q 17.5 0 12.25 5.140625 
-Q 7 10.296875 7 20 
-Q 7 25.203125 8.453125 29.390625 
-Q 9.90625 33.59375 12.046875 36.046875 
-Q 14.203125 38.5 16.890625 40.140625 
-Q 19.59375 41.796875 21.84375 42.390625 
-Q 24.09375 43 26.09375 43 
-Q 32.09375 43 36.640625 40.140625 
-Q 41.203125 37.296875 47.90625 28.296875 
-Q 52 35.703125 56.140625 39.34375 
-Q 60.296875 43 67.203125 43 
-Q 74.5 43 79.953125 37.34375 
-Q 85.40625 31.703125 85.40625 22.203125 
-M 49.90625 24.5 
-L 49.90625 24.203125 
-Q 55.703125 14.703125 60.09375 10.296875 
-Q 64.5 5.90625 69.40625 5.90625 
-Q 73.59375 5.90625 76.5 9.453125 
-Q 79.40625 13 79.40625 17.796875 
-Q 79.40625 24.90625 75.65625 29.75 
-Q 71.90625 34.59375 65.5 34.59375 
-Q 62.40625 34.59375 59.84375 33.75 
-Q 57.296875 32.90625 55.296875 31 
-Q 53.296875 29.09375 52.390625 28 
-Q 51.5 26.90625 49.90625 24.5 
-M 43.296875 18.09375 
-L 43.296875 18.40625 
-Q 37.59375 27.796875 32.75 32.4375 
-Q 27.90625 37.09375 23 37.09375 
-Q 18.796875 37.09375 15.890625 33.546875 
-Q 13 30 13 25.203125 
-Q 13 18.40625 16.796875 13.40625 
-Q 20.59375 8.40625 26.90625 8.40625 
-Q 30 8.40625 32.703125 9.296875 
-Q 35.40625 10.203125 37.5 11.953125 
-Q 39.59375 13.703125 40.75 14.953125 
-Q 41.90625 16.203125 43.296875 18.09375 
-" id="STIXGeneral-Regular-221e"/>
-   </defs>
-   <g transform="translate(180.780000 29.580000)scale(0.120000 -0.120000)">
-    <use transform="translate(0.000000 0.612500)" xlink:href="#STIXGeneral-Regular-222e"/>
-    <use transform="translate(71.531635 64.900000)scale(0.700000)" xlink:href="#STIXGeneral-Regular-221e"/>
-    <use transform="translate(36.921010 -49.506250)scale(0.700000)" xlink:href="#STIXGeneral-Regular-1d7e2"/>
-   </g>
-  </g>
- </g>
-</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_77.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_77.pdf
deleted file mode 100644
index 98512f54330d..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_77.pdf and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_77.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_77.png
deleted file mode 100644
index 9ed5a18bf57b..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_77.png and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_77.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_77.svg
deleted file mode 100644
index f423ee824f38..000000000000
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_77.svg
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (http://matplotlib.org/) -->
-<svg height="54pt" version="1.1" viewBox="0 0 378 54" width="378pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
- </defs>
- <g id="figure_1">
-  <g id="patch_1">
-   <path d="M 0 54 
-L 378 54 
-L 378 0 
-L 0 0 
-z
-" style="fill:#ffffff;"/>
-  </g>
-  <g id="text_1">
-   <!-- $\barleftarrow$ $\barwedge$ $\ddots$ $\doteq$ $\doteqdot$ $\dotminus$ $\dotplus$ $\dots$ -->
-   <defs>
-    <path d="M 40.5 67.796875 
-Q 40.5 65.203125 38.75 63.296875 
-Q 37 61.40625 34.203125 61.40625 
-Q 31.296875 61.40625 29.546875 63.15625 
-Q 27.796875 64.90625 27.796875 67.796875 
-Q 27.796875 70.5 29.75 72.296875 
-Q 31.703125 74.09375 34.203125 74.09375 
-Q 36.703125 74.09375 38.59375 72.296875 
-Q 40.5 70.5 40.5 67.796875 
-M 63.59375 22 
-L 37.5 22 
-L 37.5 -4.09375 
-L 30.90625 -4.09375 
-L 30.90625 22 
-L 4.796875 22 
-L 4.796875 28.59375 
-L 30.90625 28.59375 
-L 30.90625 54.703125 
-L 37.5 54.703125 
-L 37.5 28.59375 
-L 63.59375 28.59375 
-z
-" id="STIXGeneral-Regular-2214"/>
-    <path d="M 57.203125 58 
-L 4.796875 58 
-L 4.796875 64.59375 
-L 57.203125 64.59375 
-z
-M 59 -2.90625 
-L 52.703125 -2.90625 
-L 31.203125 40.296875 
-L 9.703125 -2.90625 
-L 3.203125 -2.90625 
-L 30.703125 53.59375 
-L 31.703125 53.59375 
-z
-" id="STIXGeneral-Regular-22bc"/>
-    <path d="M 86.59375 22 
-L 29.703125 22 
-Q 28.90625 22 28 21.25 
-Q 27.09375 20.5 27.09375 19.796875 
-Q 27.09375 18.703125 28.5 17.296875 
-Q 33.59375 12.40625 36.703125 7.703125 
-L 34.703125 5.796875 
-Q 22.296875 20.09375 11 24.796875 
-L 11 5.796875 
-L 6 5.796875 
-L 6 45 
-L 11 45 
-L 11 25.796875 
-Q 22.296875 30.59375 34.796875 45 
-L 36.796875 43.09375 
-Q 33.703125 38.703125 28.59375 33.40625 
-Q 27.203125 32 27.203125 30.59375 
-Q 27.203125 28.59375 29.796875 28.59375 
-L 86.59375 28.59375 
-z
-" id="STIXGeneral-Regular-21e4"/>
-    <path d="M 32.09375 45.703125 
-Q 32.09375 43.09375 30.34375 41.1875 
-Q 28.59375 39.296875 25.796875 39.296875 
-Q 22.90625 39.296875 21.15625 41.046875 
-Q 19.40625 42.796875 19.40625 45.703125 
-Q 19.40625 48.40625 21.34375 50.203125 
-Q 23.296875 52 25.796875 52 
-Q 28.296875 52 30.1875 50.203125 
-Q 32.09375 48.40625 32.09375 45.703125 
-M 73.203125 4.59375 
-Q 73.203125 2 71.453125 0.09375 
-Q 69.703125 -1.796875 66.90625 -1.796875 
-Q 64 -1.796875 62.25 -0.046875 
-Q 60.5 1.703125 60.5 4.59375 
-Q 60.5 7.296875 62.453125 9.09375 
-Q 64.40625 10.90625 66.90625 10.90625 
-Q 69.40625 10.90625 71.296875 9.09375 
-Q 73.203125 7.296875 73.203125 4.59375 
-M 52.5 25.203125 
-Q 52.5 22.59375 50.75 20.6875 
-Q 49 18.796875 46.203125 18.796875 
-Q 43.296875 18.796875 41.546875 20.546875 
-Q 39.796875 22.296875 39.796875 25.203125 
-Q 39.796875 27.90625 41.75 29.703125 
-Q 43.703125 31.5 46.203125 31.5 
-Q 48.703125 31.5 50.59375 29.703125 
-Q 52.5 27.90625 52.5 25.203125 
-" id="STIXGeneral-Regular-22f1"/>
-    <path d="M 40.5 54.796875 
-Q 40.5 52.203125 38.75 50.296875 
-Q 37 48.40625 34.203125 48.40625 
-Q 31.296875 48.40625 29.546875 50.15625 
-Q 27.796875 51.90625 27.796875 54.796875 
-Q 27.796875 57.5 29.75 59.296875 
-Q 31.703125 61.09375 34.203125 61.09375 
-Q 36.703125 61.09375 38.59375 59.296875 
-Q 40.5 57.5 40.5 54.796875 
-M 63.703125 32 
-L 4.796875 32 
-L 4.796875 38.59375 
-L 63.703125 38.59375 
-z
-M 63.703125 12 
-L 4.796875 12 
-L 4.796875 18.59375 
-L 63.703125 18.59375 
-z
-" id="STIXGeneral-Regular-2250"/>
-    <path d="M 88.796875 4.296875 
-Q 88.796875 2.09375 87.140625 0.5 
-Q 85.5 -1.09375 83.203125 -1.09375 
-Q 80.90625 -1.09375 79.296875 0.5 
-Q 77.703125 2.09375 77.703125 4.390625 
-Q 77.703125 6.703125 79.34375 8.34375 
-Q 81 10 83.296875 10 
-Q 85.5 10 87.140625 8.296875 
-Q 88.796875 6.59375 88.796875 4.296875 
-M 55.5 4.296875 
-Q 55.5 2.09375 53.84375 0.5 
-Q 52.203125 -1.09375 49.890625 -1.09375 
-Q 47.59375 -1.09375 46 0.5 
-Q 44.40625 2.09375 44.40625 4.390625 
-Q 44.40625 6.703125 46.046875 8.34375 
-Q 47.703125 10 50 10 
-Q 52.203125 10 53.84375 8.296875 
-Q 55.5 6.59375 55.5 4.296875 
-M 22.203125 4.296875 
-Q 22.203125 2.09375 20.546875 0.5 
-Q 18.90625 -1.09375 16.59375 -1.09375 
-Q 14.296875 -1.09375 12.6875 0.5 
-Q 11.09375 2.09375 11.09375 4.390625 
-Q 11.09375 6.703125 12.75 8.34375 
-Q 14.40625 10 16.703125 10 
-Q 18.90625 10 20.546875 8.296875 
-Q 22.203125 6.59375 22.203125 4.296875 
-" id="STIXGeneral-Regular-2026"/>
-    <path d="M 40.5 44.796875 
-Q 40.5 42.203125 38.75 40.296875 
-Q 37 38.40625 34.203125 38.40625 
-Q 31.296875 38.40625 29.546875 40.15625 
-Q 27.796875 41.90625 27.796875 44.796875 
-Q 27.796875 47.5 29.75 49.296875 
-Q 31.703125 51.09375 34.203125 51.09375 
-Q 36.703125 51.09375 38.59375 49.296875 
-Q 40.5 47.5 40.5 44.796875 
-M 63.703125 22 
-L 4.796875 22 
-L 4.796875 28.59375 
-L 63.703125 28.59375 
-z
-" id="STIXGeneral-Regular-2238"/>
-    <path id="DejaVuSans-20"/>
-    <path d="M 40.5 54.796875 
-Q 40.5 52.203125 38.75 50.296875 
-Q 37 48.40625 34.203125 48.40625 
-Q 31.296875 48.40625 29.546875 50.15625 
-Q 27.796875 51.90625 27.796875 54.796875 
-Q 27.796875 57.5 29.75 59.296875 
-Q 31.703125 61.09375 34.203125 61.09375 
-Q 36.703125 61.09375 38.59375 59.296875 
-Q 40.5 57.5 40.5 54.796875 
-M 63.703125 32 
-L 4.796875 32 
-L 4.796875 38.59375 
-L 63.703125 38.59375 
-z
-M 63.703125 12 
-L 4.796875 12 
-L 4.796875 18.59375 
-L 63.703125 18.59375 
-z
-M 40.5 -4.203125 
-Q 40.5 -6.796875 38.59375 -8.6875 
-Q 36.703125 -10.59375 34.09375 -10.59375 
-Q 31.59375 -10.59375 29.6875 -8.640625 
-Q 27.796875 -6.703125 27.796875 -4.203125 
-Q 27.796875 -1.296875 29.640625 0.390625 
-Q 31.5 2.09375 34.09375 2.09375 
-Q 36.796875 2.09375 38.640625 0.4375 
-Q 40.5 -1.203125 40.5 -4.203125 
-" id="STIXGeneral-Regular-2251"/>
-   </defs>
-   <g transform="translate(138.360000 30.311250)scale(0.120000 -0.120000)">
-    <use transform="translate(0.000000 0.906250)" xlink:href="#STIXGeneral-Regular-21e4"/>
-    <use transform="translate(92.599991 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(124.387100 0.906250)" xlink:href="#STIXGeneral-Regular-22bc"/>
-    <use transform="translate(186.387085 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(218.174194 0.906250)" xlink:href="#STIXGeneral-Regular-22f1"/>
-    <use transform="translate(310.774185 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(342.561295 0.906250)" xlink:href="#STIXGeneral-Regular-2250"/>
-    <use transform="translate(411.061279 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(442.848389 0.906250)" xlink:href="#STIXGeneral-Regular-2251"/>
-    <use transform="translate(511.348373 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(543.135483 0.906250)" xlink:href="#STIXGeneral-Regular-2238"/>
-    <use transform="translate(611.635468 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(643.422577 0.906250)" xlink:href="#STIXGeneral-Regular-2214"/>
-    <use transform="translate(711.922562 0.906250)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(743.709671 0.906250)" xlink:href="#STIXGeneral-Regular-2026"/>
-   </g>
-  </g>
- </g>
-</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_patches/annulus.png b/lib/matplotlib/tests/baseline_images/test_patches/annulus.png
new file mode 100644
index 000000000000..549443f523cf
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_patches/annulus.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_patches/autoscale_arc.png b/lib/matplotlib/tests/baseline_images/test_patches/autoscale_arc.png
new file mode 100644
index 000000000000..3a6d3324e9d8
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_patches/autoscale_arc.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_patches/autoscale_arc.svg b/lib/matplotlib/tests/baseline_images/test_patches/autoscale_arc.svg
new file mode 100644
index 000000000000..dca6c1f226b3
--- /dev/null
+++ b/lib/matplotlib/tests/baseline_images/test_patches/autoscale_arc.svg
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" width="288pt" height="72pt" viewBox="0 0 288 72" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <metadata>
+  <rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+   <cc:Work>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:date>2022-07-01T10:48:08.014263</dc:date>
+    <dc:format>image/svg+xml</dc:format>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Matplotlib v3.6.0.dev2827+g83cb036.d20220701, https://matplotlib.org/</dc:title>
+     </cc:Agent>
+    </dc:creator>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <defs>
+  <style type="text/css">*{stroke-linejoin: round; stroke-linecap: butt}</style>
+ </defs>
+ <g id="figure_1">
+  <g id="patch_1">
+   <path d="M 0 72 
+L 288 72 
+L 288 0 
+L 0 0 
+z
+" style="fill: #ffffff"/>
+  </g>
+  <g id="axes_1">
+   <g id="patch_2">
+    <path d="M 36 64.08 
+L 101.647059 64.08 
+L 101.647059 8.64 
+L 36 8.64 
+z
+" style="fill: #ffffff"/>
+   </g>
+   <g id="patch_3">
+    <path d="M 98.663102 61.56 
+C 98.663102 48.198215 92.371203 35.370027 81.183485 25.921818 
+C 69.995767 16.47361 54.80578 11.16 38.983957 11.16 
+" clip-path="url(#p7878c1354b)" style="fill: none; stroke: #000000; stroke-linejoin: miter"/>
+   </g>
+   <g id="matplotlib.axis_1">
+    <g id="xtick_1">
+     <g id="line2d_1">
+      <defs>
+       <path id="m543adbc8dd" d="M 0 0 
+L 0 3.5 
+" style="stroke: #000000; stroke-width: 0.8"/>
+      </defs>
+      <g>
+       <use xlink:href="#m543adbc8dd" x="38.983957" y="64.08" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_2">
+     <g id="line2d_2">
+      <g>
+       <use xlink:href="#m543adbc8dd" x="98.663102" y="64.08" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+    </g>
+   </g>
+   <g id="matplotlib.axis_2">
+    <g id="ytick_1">
+     <g id="line2d_3">
+      <defs>
+       <path id="me7f7280197" d="M 0 0 
+L -3.5 0 
+" style="stroke: #000000; stroke-width: 0.8"/>
+      </defs>
+      <g>
+       <use xlink:href="#me7f7280197" x="36" y="61.56" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_2">
+     <g id="line2d_4">
+      <g>
+       <use xlink:href="#me7f7280197" x="36" y="11.16" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+    </g>
+   </g>
+   <g id="patch_4">
+    <path d="M 36 64.08 
+L 36 8.64 
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_5">
+    <path d="M 101.647059 64.08 
+L 101.647059 8.64 
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_6">
+    <path d="M 36 64.08 
+L 101.647059 64.08 
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_7">
+    <path d="M 36 8.64 
+L 101.647059 8.64 
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+  </g>
+  <g id="axes_2">
+   <g id="patch_8">
+    <path d="M 114.776471 64.08 
+L 180.423529 64.08 
+L 180.423529 8.64 
+L 114.776471 8.64 
+z
+" style="fill: #ffffff"/>
+   </g>
+   <g id="patch_9">
+    <path d="M 177.439572 61.56 
+C 169.79162 52.124163 160.918135 43.133627 150.916646 34.687208 
+C 140.915158 26.24079 129.822444 18.369549 117.760428 11.16 
+" clip-path="url(#p551f899eab)" style="fill: none; stroke: #000000; stroke-linejoin: miter"/>
+   </g>
+   <g id="matplotlib.axis_3">
+    <g id="xtick_3">
+     <g id="line2d_5">
+      <g>
+       <use xlink:href="#m543adbc8dd" x="115.264919" y="64.08" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_4">
+     <g id="line2d_6">
+      <g>
+       <use xlink:href="#m543adbc8dd" x="153.418474" y="64.08" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+    </g>
+   </g>
+   <g id="matplotlib.axis_4">
+    <g id="ytick_3">
+     <g id="line2d_7">
+      <g>
+       <use xlink:href="#me7f7280197" x="114.776471" y="55.507324" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_4">
+     <g id="line2d_8">
+      <g>
+       <use xlink:href="#me7f7280197" x="114.776471" y="36.831853" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_5">
+     <g id="line2d_9">
+      <g>
+       <use xlink:href="#me7f7280197" x="114.776471" y="18.156382" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+    </g>
+   </g>
+   <g id="patch_10">
+    <path d="M 114.776471 64.08 
+L 114.776471 8.64 
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_11">
+    <path d="M 180.423529 64.08 
+L 180.423529 8.64 
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_12">
+    <path d="M 114.776471 64.08 
+L 180.423529 64.08 
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_13">
+    <path d="M 114.776471 8.64 
+L 180.423529 8.64 
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+  </g>
+  <g id="axes_3">
+   <g id="patch_14">
+    <path d="M 193.552941 64.08 
+L 259.2 64.08 
+L 259.2 8.64 
+L 193.552941 8.64 
+z
+" style="fill: #ffffff"/>
+   </g>
+   <g id="patch_15">
+    <path d="M 256.216043 24.556825 
+C 255.111746 23.279143 253.830493 22.061758 252.386366 20.91805 
+C 250.942239 19.774343 249.340549 18.708519 247.5989 17.732293 
+" clip-path="url(#pfb9d651471)" style="fill: none; stroke: #000000; stroke-linejoin: miter"/>
+   </g>
+   <g id="patch_16">
+    <path d="M 214.693801 11.16 
+C 214.209651 11.172942 213.725887 11.187764 213.24259 11.204462 
+C 212.759293 11.221161 212.27649 11.239736 211.794263 11.260184 
+" clip-path="url(#pfb9d651471)" style="fill: none; stroke: #000000; stroke-linejoin: miter"/>
+   </g>
+   <g id="patch_17">
+    <path d="M 196.536898 60.928899 
+C 197.690069 61.003743 198.848414 61.07299 200.011342 61.136604 
+C 201.174269 61.200218 202.34158 61.258189 203.512676 61.310486 
+" clip-path="url(#pfb9d651471)" style="fill: none; stroke: #000000; stroke-linejoin: miter"/>
+   </g>
+   <g id="patch_18">
+    <path d="M 231.200061 61.56 
+C 231.995838 61.544864 232.79088 61.528158 233.585073 61.509884 
+C 234.379267 61.491611 235.172576 61.47177 235.964888 61.450366 
+" clip-path="url(#pfb9d651471)" style="fill: none; stroke: #000000; stroke-linejoin: miter"/>
+   </g>
+   <g id="matplotlib.axis_5">
+    <g id="xtick_5">
+     <g id="line2d_10">
+      <g>
+       <use xlink:href="#m543adbc8dd" x="219.693386" y="64.08" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_6">
+     <g id="line2d_11">
+      <g>
+       <use xlink:href="#m543adbc8dd" x="247.238571" y="64.08" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+    </g>
+   </g>
+   <g id="matplotlib.axis_6">
+    <g id="ytick_6">
+     <g id="line2d_12">
+      <g>
+       <use xlink:href="#me7f7280197" x="193.552941" y="61.669196" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_7">
+     <g id="line2d_13">
+      <g>
+       <use xlink:href="#me7f7280197" x="193.552941" y="36.38123" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+    </g>
+    <g id="ytick_8">
+     <g id="line2d_14">
+      <g>
+       <use xlink:href="#me7f7280197" x="193.552941" y="11.093265" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+    </g>
+   </g>
+   <g id="patch_19">
+    <path d="M 193.552941 64.08 
+L 193.552941 8.64 
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_20">
+    <path d="M 259.2 64.08 
+L 259.2 8.64 
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_21">
+    <path d="M 193.552941 64.08 
+L 259.2 64.08 
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+   <g id="patch_22">
+    <path d="M 193.552941 8.64 
+L 259.2 8.64 
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
+   </g>
+  </g>
+ </g>
+ <defs>
+  <clipPath id="p7878c1354b">
+   <rect x="36" y="8.64" width="65.647059" height="55.44"/>
+  </clipPath>
+  <clipPath id="p551f899eab">
+   <rect x="114.776471" y="8.64" width="65.647059" height="55.44"/>
+  </clipPath>
+  <clipPath id="pfb9d651471">
+   <rect x="193.552941" y="8.64" width="65.647059" height="55.44"/>
+  </clipPath>
+ </defs>
+</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_path/arrow_contains_point.png b/lib/matplotlib/tests/baseline_images/test_path/arrow_contains_point.png
index 4e871e6cd02c..989b84092300 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_path/arrow_contains_point.png and b/lib/matplotlib/tests/baseline_images/test_path/arrow_contains_point.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect2.pdf b/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect2.pdf
index 8d0cc584e567..ba027d57a34b 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect2.pdf and b/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect2.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect2.png b/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect2.png
index ebd8d95dc0ab..af91778e7d80 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect2.png and b/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect2.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect2.svg b/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect2.svg
index e067b3ed266d..a075b6c60e54 100644
--- a/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect2.svg
+++ b/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect2.svg
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg height="345.6pt" version="1.1" viewBox="0 0 460.8 345.6" width="460.8pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" width="460.8pt" height="345.6pt" viewBox="0 0 460.8 345.6" xmlns="http://www.w3.org/2000/svg" version="1.1">
  <metadata>
-  <rdf:RDF xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
    <cc:Work>
     <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:date>2020-11-06T19:00:51.436188</dc:date>
+    <dc:date>2022-02-19T11:16:23.155823</dc:date>
     <dc:format>image/svg+xml</dc:format>
     <dc:creator>
      <cc:Agent>
-      <dc:title>Matplotlib v3.3.2.post1573+gcdb08ceb8, https://matplotlib.org/</dc:title>
+      <dc:title>Matplotlib v3.6.0.dev1697+g00762ef54b, https://matplotlib.org/</dc:title>
      </cc:Agent>
     </dc:creator>
    </cc:Work>
   </rdf:RDF>
  </metadata>
  <defs>
-  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
+  <style type="text/css">*{stroke-linejoin: round; stroke-linecap: butt}</style>
  </defs>
  <g id="figure_1">
   <g id="patch_1">
@@ -26,7 +26,7 @@ L 460.8 345.6
 L 460.8 0 
 L 0 0 
 z
-" style="fill:#ffffff;"/>
+" style="fill: #ffffff"/>
   </g>
   <g id="axes_1">
    <g id="patch_2">
@@ -35,50 +35,50 @@ L 369.216 307.584
 L 369.216 41.472 
 L 103.104 41.472 
 z
-" style="fill:#ffffff;"/>
+" style="fill: #ffffff"/>
    </g>
-   <g clip-path="url(#p0c68c26a30)">
-    <image height="266.4" id="image0b5926c014" transform="scale(1 -1)translate(0 -266.4)" width="266.4" x="103.104" xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAAXIAAAFyCAYAAADoJFEJAAAF00lEQVR4nO3WQWpTURiG4aa9WtNrUnBgUehOnLlBhy7GFQidavcg0oEghKhxCQYc/LzwPCv4OHBe/s2HL+9PF/zT/fPv0xMS3i5P0xMS7q8O0xMS3iwvpyckXE4PAOD/CDlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPELR8f301vSNhtD9MTEl5tf05PSLjb/piekPD62judw0UOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOELdcPNxOb0h4Wk/TExK+3Xinc3zd/pmekHC5HqcnJLjIAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKWu8+H6Q0Jx90yPSHheLOZnpBwXK+mJyT8Wv27c7jIAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKWZ58epjckvNjvpyckbG690zlO+3V6QsLv3fX0hAQXOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUDcX6FgIIrSnXdPAAAAAElFTkSuQmCC" y="-41.184"/>
+   <g clip-path="url(#p9eb69e71cc)">
+    <image xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAXIAAAFyCAYAAADoJFEJAAAF00lEQVR4nO3WQWpTURiG4aa9WtNrUnBgUehOnLlBhy7GFQidavcg0oEghKhxCQYc/LzwPCv4OHBe/s2HL+9PF/zT/fPv0xMS3i5P0xMS7q8O0xMS3iwvpyckXE4PAOD/CDlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPELR8f301vSNhtD9MTEl5tf05PSLjb/piekPD62judw0UOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOECfkAHFCDhAn5ABxQg4QJ+QAcUIOELdcPNxOb0h4Wk/TExK+3Xinc3zd/pmekHC5HqcnJLjIAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKWu8+H6Q0Jx90yPSHheLOZnpBwXK+mJyT8Wv27c7jIAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKEHCBOyAHihBwgTsgB4oQcIE7IAeKWZ58epjckvNjvpyckbG690zlO+3V6QsLv3fX0hAQXOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUCckAPECTlAnJADxAk5QJyQA8QJOUDcX6FgIIrSnXdPAAAAAElFTkSuQmCC" id="imagea9ef1b54bc" transform="scale(1 -1)translate(0 -266.4)" x="103.104" y="-41.184" width="266.4" height="266.4"/>
    </g>
    <g id="matplotlib.axis_1">
     <g id="xtick_1">
      <g id="line2d_1">
       <defs>
-       <path d="M 0 0 
+       <path id="me072a90f64" d="M 0 0 
 L 0 3.5 
-" id="ma6b8906a8c" style="stroke:#000000;stroke-width:0.8;"/>
+" style="stroke: #000000; stroke-width: 0.8"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="129.7152" xlink:href="#ma6b8906a8c" y="307.584"/>
+       <use xlink:href="#me072a90f64" x="129.7152" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_2">
      <g id="line2d_2">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="182.9376" xlink:href="#ma6b8906a8c" y="307.584"/>
+       <use xlink:href="#me072a90f64" x="182.9376" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_3">
      <g id="line2d_3">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="236.16" xlink:href="#ma6b8906a8c" y="307.584"/>
+       <use xlink:href="#me072a90f64" x="236.16" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_4">
      <g id="line2d_4">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="289.3824" xlink:href="#ma6b8906a8c" y="307.584"/>
+       <use xlink:href="#me072a90f64" x="289.3824" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_5">
      <g id="line2d_5">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="342.6048" xlink:href="#ma6b8906a8c" y="307.584"/>
+       <use xlink:href="#me072a90f64" x="342.6048" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
@@ -87,187 +87,197 @@ L 0 3.5
     <g id="ytick_1">
      <g id="line2d_6">
       <defs>
-       <path d="M 0 0 
+       <path id="m842279e563" d="M 0 0 
 L -3.5 0 
-" id="ma7f3c1a8f9" style="stroke:#000000;stroke-width:0.8;"/>
+" style="stroke: #000000; stroke-width: 0.8"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="103.104" xlink:href="#ma7f3c1a8f9" y="68.0832"/>
+       <use xlink:href="#m842279e563" x="103.104" y="68.0832" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_2">
      <g id="line2d_7">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="103.104" xlink:href="#ma7f3c1a8f9" y="121.3056"/>
+       <use xlink:href="#m842279e563" x="103.104" y="121.3056" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_3">
      <g id="line2d_8">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="103.104" xlink:href="#ma7f3c1a8f9" y="174.528"/>
+       <use xlink:href="#m842279e563" x="103.104" y="174.528" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_4">
      <g id="line2d_9">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="103.104" xlink:href="#ma7f3c1a8f9" y="227.7504"/>
+       <use xlink:href="#m842279e563" x="103.104" y="227.7504" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_5">
      <g id="line2d_10">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="103.104" xlink:href="#ma7f3c1a8f9" y="280.9728"/>
+       <use xlink:href="#m842279e563" x="103.104" y="280.9728" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
    </g>
-   <g id="LineCollection_1">
-    <path clip-path="url(#p0c68c26a30)" d="M 129.7152 68.0832 
-" style="fill:none;stroke:#ffffff;stroke-width:3;"/>
-    <path clip-path="url(#p0c68c26a30)" d="M 129.7152 68.0832 
-" style="fill:none;stroke:#000000;stroke-width:1.5;"/>
-    <g id="LineCollection_2">
-     <path clip-path="url(#p0c68c26a30)" d="M 129.7152 100.01664 
+   <g id="PathCollection_1">
+    <path d="M 129.7152 68.0832 
+L 129.7152 68.0832 
+z
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #ffffff; stroke-width: 3"/>
+    <path d="M 129.7152 68.0832 
+L 129.7152 68.0832 
+z
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #000000; stroke-width: 1.5"/>
+    <g id="PathCollection_2">
+     <path d="M 129.7152 100.01664 
 L 182.9376 89.37216 
 L 229.995277 79.960625 
-" style="fill:none;stroke:#ffffff;stroke-width:3;"/>
-     <path clip-path="url(#p0c68c26a30)" d="M 129.7152 100.01664 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #ffffff; stroke-width: 3"/>
+     <path d="M 129.7152 100.01664 
 L 182.9376 89.37216 
 L 229.995277 79.960625 
-" style="fill:none;stroke:#000000;stroke-width:1.5;"/>
-     <path clip-path="url(#p0c68c26a30)" d="M 242.324723 77.494735 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #000000; stroke-width: 1.5"/>
+     <path d="M 242.324723 77.494735 
+L 289.3824 68.0832 
 L 289.3824 68.0832 
-" style="fill:none;stroke:#ffffff;stroke-width:3;"/>
-     <path clip-path="url(#p0c68c26a30)" d="M 242.324723 77.494735 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #ffffff; stroke-width: 3"/>
+     <path d="M 242.324723 77.494735 
 L 289.3824 68.0832 
-" style="fill:none;stroke:#000000;stroke-width:1.5;"/>
-     <g id="LineCollection_3">
-      <path clip-path="url(#p0c68c26a30)" d="M 129.7152 131.95008 
+L 289.3824 68.0832 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #000000; stroke-width: 1.5"/>
+     <g id="PathCollection_3">
+      <path d="M 129.7152 131.95008 
+L 182.9376 121.3056 
 L 182.9376 121.3056 
 L 229.995277 111.894065 
-" style="fill:none;stroke:#ffffff;stroke-width:3;"/>
-      <path clip-path="url(#p0c68c26a30)" d="M 129.7152 131.95008 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #ffffff; stroke-width: 3"/>
+      <path d="M 129.7152 131.95008 
+L 182.9376 121.3056 
 L 182.9376 121.3056 
 L 229.995277 111.894065 
-" style="fill:none;stroke:#000000;stroke-width:1.5;"/>
-      <path clip-path="url(#p0c68c26a30)" d="M 242.324723 109.428175 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #000000; stroke-width: 1.5"/>
+      <path d="M 242.324723 109.428175 
 L 289.3824 100.01664 
 L 342.6048 89.37216 
-" style="fill:none;stroke:#ffffff;stroke-width:3;"/>
-      <path clip-path="url(#p0c68c26a30)" d="M 242.324723 109.428175 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #ffffff; stroke-width: 3"/>
+      <path d="M 242.324723 109.428175 
 L 289.3824 100.01664 
 L 342.6048 89.37216 
-" style="fill:none;stroke:#000000;stroke-width:1.5;"/>
-      <g id="LineCollection_4">
-       <path clip-path="url(#p0c68c26a30)" d="M 129.7152 163.88352 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #000000; stroke-width: 1.5"/>
+      <g id="PathCollection_4">
+       <path d="M 129.7152 163.88352 
 L 182.9376 153.23904 
 L 229.995277 143.827505 
-" style="fill:none;stroke:#ffffff;stroke-width:3;"/>
-       <path clip-path="url(#p0c68c26a30)" d="M 129.7152 163.88352 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #ffffff; stroke-width: 3"/>
+       <path d="M 129.7152 163.88352 
 L 182.9376 153.23904 
 L 229.995277 143.827505 
-" style="fill:none;stroke:#000000;stroke-width:1.5;"/>
-       <path clip-path="url(#p0c68c26a30)" d="M 242.324723 141.361615 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #000000; stroke-width: 1.5"/>
+       <path d="M 242.324723 141.361615 
 L 289.3824 131.95008 
 L 342.6048 121.3056 
-" style="fill:none;stroke:#ffffff;stroke-width:3;"/>
-       <path clip-path="url(#p0c68c26a30)" d="M 242.324723 141.361615 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #ffffff; stroke-width: 3"/>
+       <path d="M 242.324723 141.361615 
 L 289.3824 131.95008 
 L 342.6048 121.3056 
-" style="fill:none;stroke:#000000;stroke-width:1.5;"/>
-       <g id="LineCollection_5">
-        <path clip-path="url(#p0c68c26a30)" d="M 129.7152 195.81696 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #000000; stroke-width: 1.5"/>
+       <g id="PathCollection_5">
+        <path d="M 129.7152 195.81696 
 L 182.9376 185.17248 
 L 228.822031 175.995594 
-" style="fill:none;stroke:#ffffff;stroke-width:3;"/>
-        <path clip-path="url(#p0c68c26a30)" d="M 129.7152 195.81696 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #ffffff; stroke-width: 3"/>
+        <path d="M 129.7152 195.81696 
 L 182.9376 185.17248 
 L 228.822031 175.995594 
-" style="fill:none;stroke:#000000;stroke-width:1.5;"/>
-        <path clip-path="url(#p0c68c26a30)" d="M 243.497969 173.060406 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #000000; stroke-width: 1.5"/>
+        <path d="M 243.497969 173.060406 
 L 289.3824 163.88352 
 L 342.6048 153.23904 
-" style="fill:none;stroke:#ffffff;stroke-width:3;"/>
-        <path clip-path="url(#p0c68c26a30)" d="M 243.497969 173.060406 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #ffffff; stroke-width: 3"/>
+        <path d="M 243.497969 173.060406 
 L 289.3824 163.88352 
 L 342.6048 153.23904 
-" style="fill:none;stroke:#000000;stroke-width:1.5;"/>
-        <g id="LineCollection_6">
-         <path clip-path="url(#p0c68c26a30)" d="M 129.7152 227.7504 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #000000; stroke-width: 1.5"/>
+        <g id="PathCollection_6">
+         <path d="M 129.7152 227.7504 
+L 129.7152 227.7504 
 L 182.9376 217.10592 
 L 228.822031 207.929034 
-" style="fill:none;stroke:#ffffff;stroke-width:3;"/>
-         <path clip-path="url(#p0c68c26a30)" d="M 129.7152 227.7504 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #ffffff; stroke-width: 3"/>
+         <path d="M 129.7152 227.7504 
+L 129.7152 227.7504 
 L 182.9376 217.10592 
 L 228.822031 207.929034 
-" style="fill:none;stroke:#000000;stroke-width:1.5;"/>
-         <path clip-path="url(#p0c68c26a30)" d="M 243.497969 204.993846 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #000000; stroke-width: 1.5"/>
+         <path d="M 243.497969 204.993846 
 L 289.3824 195.81696 
 L 342.6048 185.17248 
-" style="fill:none;stroke:#ffffff;stroke-width:3;"/>
-         <path clip-path="url(#p0c68c26a30)" d="M 243.497969 204.993846 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #ffffff; stroke-width: 3"/>
+         <path d="M 243.497969 204.993846 
 L 289.3824 195.81696 
 L 342.6048 185.17248 
-" style="fill:none;stroke:#000000;stroke-width:1.5;"/>
-         <g id="LineCollection_7">
-          <path clip-path="url(#p0c68c26a30)" d="M 129.7152 259.68384 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #000000; stroke-width: 1.5"/>
+         <g id="PathCollection_7">
+          <path d="M 129.7152 259.68384 
 L 182.9376 249.03936 
-L 228.822031 239.862474 
-" style="fill:none;stroke:#ffffff;stroke-width:3;"/>
-          <path clip-path="url(#p0c68c26a30)" d="M 129.7152 259.68384 
+L 236.16 238.39488 
+L 282.044431 229.217994 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #ffffff; stroke-width: 3"/>
+          <path d="M 129.7152 259.68384 
 L 182.9376 249.03936 
-L 228.822031 239.862474 
-" style="fill:none;stroke:#000000;stroke-width:1.5;"/>
-          <path clip-path="url(#p0c68c26a30)" d="M 243.497969 236.927286 
-L 289.3824 227.7504 
+L 236.16 238.39488 
+L 282.044431 229.217994 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #000000; stroke-width: 1.5"/>
+          <path d="M 296.720369 226.282806 
 L 342.6048 217.10592 
-" style="fill:none;stroke:#ffffff;stroke-width:3;"/>
-          <path clip-path="url(#p0c68c26a30)" d="M 243.497969 236.927286 
-L 289.3824 227.7504 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #ffffff; stroke-width: 3"/>
+          <path d="M 296.720369 226.282806 
 L 342.6048 217.10592 
-" style="fill:none;stroke:#000000;stroke-width:1.5;"/>
-          <g id="LineCollection_8">
-           <path clip-path="url(#p0c68c26a30)" d="M 182.9376 280.9728 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #000000; stroke-width: 1.5"/>
+          <g id="PathCollection_8">
+           <path d="M 182.9376 280.9728 
 L 236.16 270.32832 
 L 282.044431 261.151434 
-" style="fill:none;stroke:#ffffff;stroke-width:3;"/>
-           <path clip-path="url(#p0c68c26a30)" d="M 182.9376 280.9728 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #ffffff; stroke-width: 3"/>
+           <path d="M 182.9376 280.9728 
 L 236.16 270.32832 
 L 282.044431 261.151434 
-" style="fill:none;stroke:#000000;stroke-width:1.5;"/>
-           <path clip-path="url(#p0c68c26a30)" d="M 296.720369 258.216246 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #000000; stroke-width: 1.5"/>
+           <path d="M 296.720369 258.216246 
 L 342.6048 249.03936 
-" style="fill:none;stroke:#ffffff;stroke-width:3;"/>
-           <path clip-path="url(#p0c68c26a30)" d="M 296.720369 258.216246 
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #ffffff; stroke-width: 3"/>
+           <path d="M 296.720369 258.216246 
 L 342.6048 249.03936 
-" style="fill:none;stroke:#000000;stroke-width:1.5;"/>
-           <g id="LineCollection_9">
+" clip-path="url(#p9eb69e71cc)" style="fill: none; stroke: #000000; stroke-width: 1.5"/>
+           <g id="PathCollection_9">
             <g id="patch_3">
              <path d="M 103.104 307.584 
 L 103.104 41.472 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
             </g>
             <g id="patch_4">
              <path d="M 369.216 307.584 
 L 369.216 41.472 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
             </g>
             <g id="patch_5">
              <path d="M 103.104 307.584 
 L 369.216 307.584 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
             </g>
             <g id="patch_6">
              <path d="M 103.104 41.472 
 L 369.216 41.472 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
             </g>
             <g id="text_1">
-             <path clip-path="url(#p0c68c26a30)" d="M 238.348495 77.094898 
+             <path d="M 238.348495 77.094898 
 Q 239.072286 77.104704 239.555529 77.497243 
 Q 240.039997 77.887943 240.177891 78.577414 
 Q 240.389329 79.634602 239.777692 80.360845 
@@ -298,8 +308,8 @@ Q 239.170957 74.411172 239.341333 75.263051
 Q 239.460229 75.857528 239.201907 76.334642 
 Q 238.943585 76.811756 238.348495 77.094898 
 z
-" style="stroke:#ffffff;stroke-width:3;"/>
-             <path clip-path="url(#p0c68c26a30)" d="M 238.348495 77.094898 
+" clip-path="url(#p9eb69e71cc)" style="stroke: #ffffff; stroke-width: 3"/>
+             <path d="M 238.348495 77.094898 
 Q 239.072286 77.104704 239.555529 77.497243 
 Q 240.039997 77.887943 240.177891 78.577414 
 Q 240.389329 79.634602 239.777692 80.360845 
@@ -330,10 +340,10 @@ Q 239.170957 74.411172 239.341333 75.263051
 Q 239.460229 75.857528 239.201907 76.334642 
 Q 238.943585 76.811756 238.348495 77.094898 
 z
-"/>
+" clip-path="url(#p9eb69e71cc)"/>
             </g>
             <g id="text_2">
-             <path clip-path="url(#p0c68c26a30)" d="M 237.586094 109.072464 
+             <path d="M 237.586094 109.072464 
 Q 236.934927 109.202698 236.642591 109.724857 
 Q 236.351481 110.245178 236.506536 111.020449 
 Q 236.660671 111.791124 237.13043 112.164051 
@@ -362,8 +372,8 @@ Q 235.978554 105.942573 237.332981 105.671688
 Q 237.697635 105.598757 238.082819 105.596612 
 Q 238.468003 105.594467 238.899459 105.656366 
 z
-" style="stroke:#ffffff;stroke-width:3;"/>
-             <path clip-path="url(#p0c68c26a30)" d="M 237.586094 109.072464 
+" clip-path="url(#p9eb69e71cc)" style="stroke: #ffffff; stroke-width: 3"/>
+             <path d="M 237.586094 109.072464 
 Q 236.934927 109.202698 236.642591 109.724857 
 Q 236.351481 110.245178 236.506536 111.020449 
 Q 236.660671 111.791124 237.13043 112.164051 
@@ -392,10 +402,10 @@ Q 235.978554 105.942573 237.332981 105.671688
 Q 237.697635 105.598757 238.082819 105.596612 
 Q 238.468003 105.594467 238.899459 105.656366 
 z
-"/>
+" clip-path="url(#p9eb69e71cc)"/>
             </g>
             <g id="text_3">
-             <path clip-path="url(#p0c68c26a30)" d="M 236.187847 145.248448 
+             <path d="M 236.187847 145.248448 
 L 236.011649 144.367458 
 Q 236.410929 144.467661 236.801323 144.483595 
 Q 237.193249 144.499223 237.553306 144.427212 
@@ -424,8 +434,8 @@ Q 235.607466 139.677524 235.761601 140.448199
 Q 235.916962 141.225003 236.386108 141.594866 
 Q 236.854948 141.963196 237.506115 141.832963 
 z
-" style="stroke:#ffffff;stroke-width:3;"/>
-             <path clip-path="url(#p0c68c26a30)" d="M 236.187847 145.248448 
+" clip-path="url(#p9eb69e71cc)" style="stroke: #ffffff; stroke-width: 3"/>
+             <path d="M 236.187847 145.248448 
 L 236.011649 144.367458 
 Q 236.410929 144.467661 236.801323 144.483595 
 Q 237.193249 144.499223 237.553306 144.427212 
@@ -454,10 +464,10 @@ Q 235.607466 139.677524 235.761601 140.448199
 Q 235.916962 141.225003 236.386108 141.594866 
 Q 236.854948 141.963196 237.506115 141.832963 
 z
-"/>
+" clip-path="url(#p9eb69e71cc)"/>
             </g>
             <g id="text_4">
-             <path clip-path="url(#p0c68c26a30)" d="M 231.516031 177.424697 
+             <path d="M 231.516031 177.424697 
 L 233.095685 177.108766 
 L 232.004789 171.654286 
 L 230.354656 172.342837 
@@ -493,8 +503,8 @@ Q 240.788456 172.247882 240.459042 172.87147
 Q 240.367419 173.034798 239.85813 173.826617 
 Q 239.350373 174.618129 238.419741 176.043955 
 z
-" style="stroke:#ffffff;stroke-width:3;"/>
-             <path clip-path="url(#p0c68c26a30)" d="M 231.516031 177.424697 
+" clip-path="url(#p9eb69e71cc)" style="stroke: #ffffff; stroke-width: 3"/>
+             <path d="M 231.516031 177.424697 
 L 233.095685 177.108766 
 L 232.004789 171.654286 
 L 230.354656 172.342837 
@@ -530,10 +540,10 @@ Q 240.788456 172.247882 240.459042 172.87147
 Q 240.367419 173.034798 239.85813 173.826617 
 Q 239.350373 174.618129 238.419741 176.043955 
 z
-"/>
+" clip-path="url(#p9eb69e71cc)"/>
             </g>
             <g id="text_5">
-             <path clip-path="url(#p0c68c26a30)" d="M 231.516031 209.358137 
+             <path d="M 231.516031 209.358137 
 L 233.095685 209.042206 
 L 232.004789 203.587726 
 L 230.354656 204.276277 
@@ -570,8 +580,8 @@ Q 238.149468 204.809506 237.780524 204.972528
 Q 237.413113 205.135243 237.048153 205.397855 
 L 236.329878 201.806478 
 z
-" style="stroke:#ffffff;stroke-width:3;"/>
-             <path clip-path="url(#p0c68c26a30)" d="M 231.516031 209.358137 
+" clip-path="url(#p9eb69e71cc)" style="stroke: #ffffff; stroke-width: 3"/>
+             <path d="M 231.516031 209.358137 
 L 233.095685 209.042206 
 L 232.004789 203.587726 
 L 230.354656 204.276277 
@@ -608,116 +618,116 @@ Q 238.149468 204.809506 237.780524 204.972528
 Q 237.413113 205.135243 237.048153 205.397855 
 L 236.329878 201.806478 
 z
-"/>
+" clip-path="url(#p9eb69e71cc)"/>
             </g>
             <g id="text_6">
-             <path clip-path="url(#p0c68c26a30)" d="M 231.516031 241.291577 
-L 233.095685 240.975646 
-L 232.004789 235.521166 
-L 230.354656 236.209717 
-L 230.178458 235.328727 
-L 231.819398 234.642014 
-L 232.78619 234.448656 
-L 234.053284 240.784126 
-L 235.632938 240.468195 
-L 235.795653 241.281771 
-L 231.678746 242.105152 
-L 231.516031 241.291577 
-z
-M 239.138322 237.082166 
-Q 238.448851 237.22006 238.127405 237.668369 
-Q 237.80749 238.116372 237.936498 238.76141 
-Q 238.065812 239.407981 238.533427 239.698478 
-Q 239.002573 239.988668 239.692044 239.850774 
-Q 240.381515 239.71288 240.704187 239.262732 
-Q 241.028085 238.810746 240.89969 238.168772 
-Q 240.770683 237.523734 240.301536 237.233543 
-Q 239.833922 236.943046 239.138322 237.082166 
-z
-M 238.089407 236.864906 
-Q 237.436708 236.836101 237.003721 236.479722 
-Q 236.571959 236.121503 236.449386 235.50864 
-Q 236.278091 234.652164 236.788299 234.032254 
-Q 237.30004 233.412036 238.361825 233.199679 
-Q 239.429739 232.986097 240.137595 233.362394 
-Q 240.845452 233.738692 241.016747 234.595168 
-Q 241.13932 235.208031 240.877014 235.705063 
-Q 240.615935 236.200256 240.029119 236.476964 
-Q 240.760264 236.49964 241.244426 236.896775 
-Q 241.729813 237.292071 241.866482 237.975414 
-Q 242.074549 239.015748 241.55147 239.698784 
-Q 241.028085 240.380288 239.84526 240.616853 
-Q 238.663966 240.853111 237.917193 240.42564 
-Q 237.171645 239.996329 236.963578 238.955994 
-Q 236.82691 238.272652 237.124455 237.720769 
-Q 237.423225 237.167047 238.089407 236.864906 
-z
-M 237.429967 235.408131 
-Q 237.540895 235.962772 237.949368 236.204546 
-Q 238.359374 236.446014 238.986026 236.320684 
-Q 239.609614 236.195966 239.898272 235.814765 
-Q 240.188463 235.433258 240.077535 234.878617 
-Q 239.9663 234.322444 239.551698 234.081895 
-Q 239.138629 233.84104 238.515041 233.965758 
-Q 237.888388 234.091088 237.602794 234.471676 
-Q 237.318732 234.851958 237.429967 235.408131 
-z
-" style="stroke:#ffffff;stroke-width:3;"/>
-             <path clip-path="url(#p0c68c26a30)" d="M 231.516031 241.291577 
-L 233.095685 240.975646 
-L 232.004789 235.521166 
-L 230.354656 236.209717 
-L 230.178458 235.328727 
-L 231.819398 234.642014 
-L 232.78619 234.448656 
-L 234.053284 240.784126 
-L 235.632938 240.468195 
-L 235.795653 241.281771 
-L 231.678746 242.105152 
-L 231.516031 241.291577 
-z
-M 239.138322 237.082166 
-Q 238.448851 237.22006 238.127405 237.668369 
-Q 237.80749 238.116372 237.936498 238.76141 
-Q 238.065812 239.407981 238.533427 239.698478 
-Q 239.002573 239.988668 239.692044 239.850774 
-Q 240.381515 239.71288 240.704187 239.262732 
-Q 241.028085 238.810746 240.89969 238.168772 
-Q 240.770683 237.523734 240.301536 237.233543 
-Q 239.833922 236.943046 239.138322 237.082166 
-z
-M 238.089407 236.864906 
-Q 237.436708 236.836101 237.003721 236.479722 
-Q 236.571959 236.121503 236.449386 235.50864 
-Q 236.278091 234.652164 236.788299 234.032254 
-Q 237.30004 233.412036 238.361825 233.199679 
-Q 239.429739 232.986097 240.137595 233.362394 
-Q 240.845452 233.738692 241.016747 234.595168 
-Q 241.13932 235.208031 240.877014 235.705063 
-Q 240.615935 236.200256 240.029119 236.476964 
-Q 240.760264 236.49964 241.244426 236.896775 
-Q 241.729813 237.292071 241.866482 237.975414 
-Q 242.074549 239.015748 241.55147 239.698784 
-Q 241.028085 240.380288 239.84526 240.616853 
-Q 238.663966 240.853111 237.917193 240.42564 
-Q 237.171645 239.996329 236.963578 238.955994 
-Q 236.82691 238.272652 237.124455 237.720769 
-Q 237.423225 237.167047 238.089407 236.864906 
-z
-M 237.429967 235.408131 
-Q 237.540895 235.962772 237.949368 236.204546 
-Q 238.359374 236.446014 238.986026 236.320684 
-Q 239.609614 236.195966 239.898272 235.814765 
-Q 240.188463 235.433258 240.077535 234.878617 
-Q 239.9663 234.322444 239.551698 234.081895 
-Q 239.138629 233.84104 238.515041 233.965758 
-Q 237.888388 234.091088 237.602794 234.471676 
-Q 237.318732 234.851958 237.429967 235.408131 
-z
-"/>
+             <path d="M 284.738431 230.647097 
+L 286.318085 230.331166 
+L 285.227189 224.876686 
+L 283.577056 225.565237 
+L 283.400858 224.684247 
+L 285.041798 223.997534 
+L 286.00859 223.804176 
+L 287.275684 230.139646 
+L 288.855338 229.823715 
+L 289.018053 230.637291 
+L 284.901146 231.460672 
+L 284.738431 230.647097 
+z
+M 292.360722 226.437686 
+Q 291.671251 226.57558 291.349805 227.023889 
+Q 291.02989 227.471892 291.158898 228.11693 
+Q 291.288212 228.763501 291.755827 229.053998 
+Q 292.224973 229.344188 292.914444 229.206294 
+Q 293.603915 229.0684 293.926587 228.618252 
+Q 294.250485 228.166266 294.12209 227.524292 
+Q 293.993083 226.879254 293.523936 226.589063 
+Q 293.056322 226.298566 292.360722 226.437686 
+z
+M 291.311807 226.220426 
+Q 290.659108 226.191621 290.226121 225.835242 
+Q 289.794359 225.477023 289.671786 224.86416 
+Q 289.500491 224.007684 290.010699 223.387774 
+Q 290.52244 222.767556 291.584225 222.555199 
+Q 292.652139 222.341617 293.359995 222.717914 
+Q 294.067852 223.094212 294.239147 223.950688 
+Q 294.36172 224.563551 294.099414 225.060583 
+Q 293.838335 225.555776 293.251519 225.832484 
+Q 293.982664 225.85516 294.466826 226.252295 
+Q 294.952213 226.647591 295.088882 227.330934 
+Q 295.296949 228.371268 294.77387 229.054304 
+Q 294.250485 229.735808 293.06766 229.972373 
+Q 291.886366 230.208631 291.139593 229.78116 
+Q 290.394045 229.351849 290.185978 228.311514 
+Q 290.04931 227.628172 290.346855 227.076289 
+Q 290.645625 226.522567 291.311807 226.220426 
+z
+M 290.652367 224.763651 
+Q 290.763295 225.318292 291.171768 225.560066 
+Q 291.581774 225.801534 292.208426 225.676204 
+Q 292.832014 225.551486 293.120672 225.170285 
+Q 293.410863 224.788778 293.299935 224.234137 
+Q 293.1887 223.677964 292.774098 223.437415 
+Q 292.361029 223.19656 291.737441 223.321278 
+Q 291.110788 223.446608 290.825194 223.827196 
+Q 290.541132 224.207478 290.652367 224.763651 
+z
+" clip-path="url(#p9eb69e71cc)" style="stroke: #ffffff; stroke-width: 3"/>
+             <path d="M 284.738431 230.647097 
+L 286.318085 230.331166 
+L 285.227189 224.876686 
+L 283.577056 225.565237 
+L 283.400858 224.684247 
+L 285.041798 223.997534 
+L 286.00859 223.804176 
+L 287.275684 230.139646 
+L 288.855338 229.823715 
+L 289.018053 230.637291 
+L 284.901146 231.460672 
+L 284.738431 230.647097 
+z
+M 292.360722 226.437686 
+Q 291.671251 226.57558 291.349805 227.023889 
+Q 291.02989 227.471892 291.158898 228.11693 
+Q 291.288212 228.763501 291.755827 229.053998 
+Q 292.224973 229.344188 292.914444 229.206294 
+Q 293.603915 229.0684 293.926587 228.618252 
+Q 294.250485 228.166266 294.12209 227.524292 
+Q 293.993083 226.879254 293.523936 226.589063 
+Q 293.056322 226.298566 292.360722 226.437686 
+z
+M 291.311807 226.220426 
+Q 290.659108 226.191621 290.226121 225.835242 
+Q 289.794359 225.477023 289.671786 224.86416 
+Q 289.500491 224.007684 290.010699 223.387774 
+Q 290.52244 222.767556 291.584225 222.555199 
+Q 292.652139 222.341617 293.359995 222.717914 
+Q 294.067852 223.094212 294.239147 223.950688 
+Q 294.36172 224.563551 294.099414 225.060583 
+Q 293.838335 225.555776 293.251519 225.832484 
+Q 293.982664 225.85516 294.466826 226.252295 
+Q 294.952213 226.647591 295.088882 227.330934 
+Q 295.296949 228.371268 294.77387 229.054304 
+Q 294.250485 229.735808 293.06766 229.972373 
+Q 291.886366 230.208631 291.139593 229.78116 
+Q 290.394045 229.351849 290.185978 228.311514 
+Q 290.04931 227.628172 290.346855 227.076289 
+Q 290.645625 226.522567 291.311807 226.220426 
+z
+M 290.652367 224.763651 
+Q 290.763295 225.318292 291.171768 225.560066 
+Q 291.581774 225.801534 292.208426 225.676204 
+Q 292.832014 225.551486 293.120672 225.170285 
+Q 293.410863 224.788778 293.299935 224.234137 
+Q 293.1887 223.677964 292.774098 223.437415 
+Q 292.361029 223.19656 291.737441 223.321278 
+Q 291.110788 223.446608 290.825194 223.827196 
+Q 290.541132 224.207478 290.652367 224.763651 
+z
+" clip-path="url(#p9eb69e71cc)"/>
             </g>
             <g id="text_7">
-             <path clip-path="url(#p0c68c26a30)" d="M 285.403387 262.447545 
+             <path d="M 285.403387 262.447545 
 L 288.77873 261.772477 
 L 288.941445 262.586052 
 L 284.403195 263.493702 
@@ -753,8 +763,8 @@ L 295.256806 261.32298
 L 291.139899 262.146362 
 L 290.977184 261.332786 
 z
-" style="stroke:#ffffff;stroke-width:3;"/>
-             <path clip-path="url(#p0c68c26a30)" d="M 285.403387 262.447545 
+" clip-path="url(#p9eb69e71cc)" style="stroke: #ffffff; stroke-width: 3"/>
+             <path d="M 285.403387 262.447545 
 L 288.77873 261.772477 
 L 288.941445 262.586052 
 L 284.403195 263.493702 
@@ -790,13 +800,13 @@ L 295.256806 261.32298
 L 291.139899 262.146362 
 L 290.977184 261.332786 
 z
-"/>
+" clip-path="url(#p9eb69e71cc)"/>
             </g>
            </g>
           </g>
           <defs>
-           <clipPath id="p0c68c26a30">
-            <rect height="266.112" width="266.112" x="103.104" y="41.472"/>
+           <clipPath id="p9eb69e71cc">
+            <rect x="103.104" y="41.472" width="266.112" height="266.112"/>
            </clipPath>
           </defs>
          </g>
diff --git a/lib/matplotlib/tests/baseline_images/test_patheffects/spaces_and_newlines.png b/lib/matplotlib/tests/baseline_images/test_patheffects/spaces_and_newlines.png
new file mode 100644
index 000000000000..9dd4c1e8d7ff
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_patheffects/spaces_and_newlines.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_patheffects/tickedstroke.png b/lib/matplotlib/tests/baseline_images/test_patheffects/tickedstroke.png
index 60af86eaadcb..5884d46dc1ce 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_patheffects/tickedstroke.png and b/lib/matplotlib/tests/baseline_images/test_patheffects/tickedstroke.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_pickle/multi_pickle.png b/lib/matplotlib/tests/baseline_images/test_pickle/multi_pickle.png
deleted file mode 100644
index 3a6f41fa2948..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_pickle/multi_pickle.png and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_colormap.pdf b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_colormap.pdf
index 7f29b4a9eabf..f13892ba2bc5 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_colormap.pdf and b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_colormap.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_colormap.png b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_colormap.png
index 99d7e1d44cd8..21f202e5edec 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_colormap.png and b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_colormap.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_colormap.svg b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_colormap.svg
index 869361f76dd0..a95118c95d97 100644
--- a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_colormap.svg
+++ b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_colormap.svg
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (https://matplotlib.org/) -->
-<svg height="345.6pt" version="1.1" viewBox="0 0 460.8 345.6" width="460.8pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" width="460.8pt" height="345.6pt" viewBox="0 0 460.8 345.6" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <metadata>
+  <rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+   <cc:Work>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:date>2021-08-18T03:11:20.912289</dc:date>
+    <dc:format>image/svg+xml</dc:format>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Matplotlib v3.4.2.post1692+gb0554f4824.d20210818, https://matplotlib.org/</dc:title>
+     </cc:Agent>
+    </dc:creator>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linejoin: round; stroke-linecap: butt}</style>
  </defs>
  <g id="figure_1">
   <g id="patch_1">
@@ -15,7 +26,7 @@ L 460.8 345.6
 L 460.8 0 
 L 0 0 
 z
-" style="fill:#ffffff;"/>
+" style="fill: #ffffff"/>
   </g>
   <g id="axes_1">
    <g id="patch_2">
@@ -24,60 +35,60 @@ L 343.296 307.584
 L 343.296 41.472 
 L 57.6 41.472 
 z
-" style="fill:#ffffff;"/>
+" style="fill: #ffffff"/>
    </g>
    <g id="matplotlib.axis_1">
     <g id="xtick_1">
      <g id="line2d_1">
       <defs>
-       <path d="M 0 0 
+       <path id="me889d2e962" d="M 0 0 
 L 0 3.5 
-" id="mb2750bda3d" style="stroke:#000000;stroke-width:0.8;"/>
+" style="stroke: #000000; stroke-width: 0.8"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mb2750bda3d" y="307.584"/>
+       <use xlink:href="#me889d2e962" x="57.6" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_2">
      <g id="line2d_2">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="105.216" xlink:href="#mb2750bda3d" y="307.584"/>
+       <use xlink:href="#me889d2e962" x="105.216" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_3">
      <g id="line2d_3">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="152.832" xlink:href="#mb2750bda3d" y="307.584"/>
+       <use xlink:href="#me889d2e962" x="152.832" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_4">
      <g id="line2d_4">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="200.448" xlink:href="#mb2750bda3d" y="307.584"/>
+       <use xlink:href="#me889d2e962" x="200.448" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_5">
      <g id="line2d_5">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="248.064" xlink:href="#mb2750bda3d" y="307.584"/>
+       <use xlink:href="#me889d2e962" x="248.064" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_6">
      <g id="line2d_6">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="295.68" xlink:href="#mb2750bda3d" y="307.584"/>
+       <use xlink:href="#me889d2e962" x="295.68" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_7">
      <g id="line2d_7">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="343.296" xlink:href="#mb2750bda3d" y="307.584"/>
+       <use xlink:href="#me889d2e962" x="343.296" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
@@ -86,2474 +97,2551 @@ L 0 3.5
     <g id="ytick_1">
      <g id="line2d_8">
       <defs>
-       <path d="M 0 0 
+       <path id="m14927f31a7" d="M 0 0 
 L -3.5 0 
-" id="m3bf521d46f" style="stroke:#000000;stroke-width:0.8;"/>
+" style="stroke: #000000; stroke-width: 0.8"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m3bf521d46f" y="307.584"/>
+       <use xlink:href="#m14927f31a7" x="57.6" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_2">
      <g id="line2d_9">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m3bf521d46f" y="263.232"/>
+       <use xlink:href="#m14927f31a7" x="57.6" y="263.232" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_3">
      <g id="line2d_10">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m3bf521d46f" y="218.88"/>
+       <use xlink:href="#m14927f31a7" x="57.6" y="218.88" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_4">
      <g id="line2d_11">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m3bf521d46f" y="174.528"/>
+       <use xlink:href="#m14927f31a7" x="57.6" y="174.528" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_5">
      <g id="line2d_12">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m3bf521d46f" y="130.176"/>
+       <use xlink:href="#m14927f31a7" x="57.6" y="130.176" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_6">
      <g id="line2d_13">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m3bf521d46f" y="85.824"/>
+       <use xlink:href="#m14927f31a7" x="57.6" y="85.824" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_7">
      <g id="line2d_14">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m3bf521d46f" y="41.472"/>
+       <use xlink:href="#m14927f31a7" x="57.6" y="41.472" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
    </g>
    <g id="LineCollection_1">
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 242.394488 
-L 341.093532 242.096863 
-" style="fill:none;stroke:#ff1900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 341.093532 242.096863 
-L 325.397298 239.906999 
-" style="fill:none;stroke:#ff1d00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 325.397298 239.906999 
-L 309.725276 237.570673 
-" style="fill:none;stroke:#ff3e00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 309.725276 237.570673 
-L 294.080575 235.079732 
-" style="fill:none;stroke:#ff5a00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 294.080575 235.079732 
-L 278.464359 232.439388 
-" style="fill:none;stroke:#ff7300;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 278.464359 232.439388 
-L 262.870782 229.684921 
-" style="fill:none;stroke:#ff8800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 262.870782 229.684921 
-L 247.278517 226.923032 
-" style="fill:none;stroke:#ff9a00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 247.278517 226.923032 
-L 232.302426 224.50999 
-" style="fill:none;stroke:#ffa800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 232.302426 224.50999 
-L 220.523878 223.083607 
-" style="fill:none;stroke:#ffb100;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 220.523878 223.083607 
-L 210.316932 222.490175 
-" style="fill:none;stroke:#ffb700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 210.316932 222.490175 
-L 200.681535 222.739595 
-" style="fill:none;stroke:#ffb900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 200.681535 222.739595 
-L 190.822695 224.017404 
-" style="fill:none;stroke:#ffba00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 190.822695 224.017404 
-L 180.020528 226.716397 
-" style="fill:none;stroke:#ffb900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 180.020528 226.716397 
-L 169.822412 230.495438 
-" style="fill:none;stroke:#ffb500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 169.822412 230.495438 
-L 169.822412 230.495438 
-" style="fill:none;stroke:#ffb000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 169.822412 230.495438 
-L 158.394997 235.927116 
-" style="fill:none;stroke:#ffb000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 158.394997 235.927116 
-L 158.394997 235.927116 
-" style="fill:none;stroke:#ffa700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 158.394997 235.927116 
-L 144.858386 243.625688 
-" style="fill:none;stroke:#ffa700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 144.858386 243.625688 
-L 131.79975 252.021044 
-" style="fill:none;stroke:#ff9a00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 131.79975 252.021044 
-L 119.065269 260.841346 
-" style="fill:none;stroke:#ff8b00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 119.065269 260.841346 
-L 106.550055 269.931969 
-" style="fill:none;stroke:#ff7900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 106.550055 269.931969 
-L 94.185413 279.200277 
-" style="fill:none;stroke:#ff6500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 94.185413 279.200277 
-L 81.925144 288.588207 
-" style="fill:none;stroke:#ff4f00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 81.925144 288.588207 
-L 69.737443 298.058008 
-" style="fill:none;stroke:#ff3700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 69.737443 298.058008 
+    <path d="M 343.296 242.395131 
+L 341.088778 242.096854 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff1900; stroke-width: 2"/>
+    <path d="M 341.088778 242.096854 
+L 325.392554 239.906927 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff1d00; stroke-width: 2"/>
+    <path d="M 325.392554 239.906927 
+L 309.720549 237.570483 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff3e00; stroke-width: 2"/>
+    <path d="M 309.720549 237.570483 
+L 294.07586 235.079463 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5a00; stroke-width: 2"/>
+    <path d="M 294.07586 235.079463 
+L 278.459659 232.438949 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7300; stroke-width: 2"/>
+    <path d="M 278.459659 232.438949 
+L 262.866109 229.684142 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8800; stroke-width: 2"/>
+    <path d="M 262.866109 229.684142 
+L 247.273808 226.921834 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9a00; stroke-width: 2"/>
+    <path d="M 247.273808 226.921834 
+L 232.298693 224.508327 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa800; stroke-width: 2"/>
+    <path d="M 232.298693 224.508327 
+L 220.521375 223.081482 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb100; stroke-width: 2"/>
+    <path d="M 220.521375 223.081482 
+L 210.31593 222.487616 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb700; stroke-width: 2"/>
+    <path d="M 210.31593 222.487616 
+L 200.680844 222.736644 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb900; stroke-width: 2"/>
+    <path d="M 200.680844 222.736644 
+L 190.825353 224.01358 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffba00; stroke-width: 2"/>
+    <path d="M 190.825353 224.01358 
+L 180.02042 226.712879 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb900; stroke-width: 2"/>
+    <path d="M 180.02042 226.712879 
+L 169.824731 230.491061 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb500; stroke-width: 2"/>
+    <path d="M 169.824731 230.491061 
+L 169.824731 230.491061 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb000; stroke-width: 2"/>
+    <path d="M 169.824731 230.491061 
+L 158.393802 235.92436 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb000; stroke-width: 2"/>
+    <path d="M 158.393802 235.92436 
+L 158.393802 235.92436 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa700; stroke-width: 2"/>
+    <path d="M 158.393802 235.92436 
+L 144.857478 243.623409 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa700; stroke-width: 2"/>
+    <path d="M 144.857478 243.623409 
+L 131.798993 252.019061 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9a00; stroke-width: 2"/>
+    <path d="M 131.798993 252.019061 
+L 119.064782 260.839902 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8b00; stroke-width: 2"/>
+    <path d="M 119.064782 260.839902 
+L 106.54965 269.930735 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7900; stroke-width: 2"/>
+    <path d="M 106.54965 269.930735 
+L 94.185055 279.199252 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6500; stroke-width: 2"/>
+    <path d="M 94.185055 279.199252 
+L 81.924956 288.587678 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4f00; stroke-width: 2"/>
+    <path d="M 81.924956 288.587678 
+L 69.737401 298.057889 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff3700; stroke-width: 2"/>
+    <path d="M 69.737401 298.057889 
 L 57.6 307.584 
-" style="fill:none;stroke:#ff1c00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 57.6 307.584 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff1c00; stroke-width: 2"/>
+    <path d="M 57.6 307.584 
 L 57.6 307.584 
-" style="fill:none;stroke:#ff0000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 97.445819 287.24689 
-L 85.867823 297.358253 
-" style="fill:none;stroke:#ff5100;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 85.867823 297.358253 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff0000; stroke-width: 2"/>
+    <path d="M 97.445577 287.246316 
+L 85.867709 297.357983 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5100; stroke-width: 2"/>
+    <path d="M 85.867709 297.357983 
 L 74.405647 307.584 
-" style="fill:none;stroke:#ff3a00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 74.405647 307.584 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff3a00; stroke-width: 2"/>
+    <path d="M 74.405647 307.584 
 L 74.405647 307.584 
-" style="fill:none;stroke:#ff2200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 170.880561 239.386247 
-L 170.880561 239.386247 
-" style="fill:none;stroke:#ffad00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 170.880561 239.386247 
-L 159.834817 246.306884 
-" style="fill:none;stroke:#ffad00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 159.834817 246.306884 
-L 159.834817 246.306884 
-" style="fill:none;stroke:#ffa400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 159.834817 246.306884 
-L 147.373057 255.446575 
-" style="fill:none;stroke:#ffa400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 147.373057 255.446575 
-L 135.48129 265.230505 
-" style="fill:none;stroke:#ff9800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 135.48129 265.230505 
-L 124.003964 275.43861 
-" style="fill:none;stroke:#ff8a00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 124.003964 275.43861 
-L 112.840574 285.945989 
-" style="fill:none;stroke:#ff7900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 112.840574 285.945989 
-L 101.924822 296.677143 
-" style="fill:none;stroke:#ff6800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 101.924822 296.677143 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff2200; stroke-width: 2"/>
+    <path d="M 170.876361 239.386245 
+L 170.876361 239.386245 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffad00; stroke-width: 2"/>
+    <path d="M 170.876361 239.386245 
+L 159.834138 246.30568 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffad00; stroke-width: 2"/>
+    <path d="M 159.834138 246.30568 
+L 159.834138 246.30568 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa400; stroke-width: 2"/>
+    <path d="M 159.834138 246.30568 
+L 147.372883 255.446028 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa400; stroke-width: 2"/>
+    <path d="M 147.372883 255.446028 
+L 135.480914 265.229713 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9800; stroke-width: 2"/>
+    <path d="M 135.480914 265.229713 
+L 124.003541 275.43778 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8a00; stroke-width: 2"/>
+    <path d="M 124.003541 275.43778 
+L 112.840144 285.945198 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7900; stroke-width: 2"/>
+    <path d="M 112.840144 285.945198 
+L 101.924544 296.676652 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6800; stroke-width: 2"/>
+    <path d="M 101.924544 296.676652 
 L 91.211294 307.584 
-" style="fill:none;stroke:#ff5400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 91.211294 307.584 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5400; stroke-width: 2"/>
+    <path d="M 91.211294 307.584 
 L 91.211294 307.584 
-" style="fill:none;stroke:#ff3f00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 138.76294 273.741733 
-L 128.163228 284.74144 
-" style="fill:none;stroke:#ff8900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 128.163228 284.74144 
-L 117.936698 296.044878 
-" style="fill:none;stroke:#ff7b00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 117.936698 296.044878 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff3f00; stroke-width: 2"/>
+    <path d="M 138.762036 273.740503 
+L 128.162486 284.74046 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8900; stroke-width: 2"/>
+    <path d="M 128.162486 284.74046 
+L 117.936352 296.044408 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7b00; stroke-width: 2"/>
+    <path d="M 117.936352 296.044408 
 L 108.016941 307.584 
-" style="fill:none;stroke:#ff6a00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 108.016941 307.584 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6a00; stroke-width: 2"/>
+    <path d="M 108.016941 307.584 
 L 108.016941 307.584 
-" style="fill:none;stroke:#ff5900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 215.698788 238.578458 
-L 206.991466 241.574482 
-" style="fill:none;stroke:#ffb200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 206.991466 241.574482 
-L 197.856276 246.123468 
-" style="fill:none;stroke:#ffb200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 197.856276 246.123468 
-L 188.060777 252.739023 
-" style="fill:none;stroke:#ffb100;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 188.060777 252.739023 
-L 179.330751 260.207321 
-" style="fill:none;stroke:#ffad00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 179.330751 260.207321 
-L 179.330751 260.207321 
-" style="fill:none;stroke:#ffa800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 179.330751 260.207321 
-L 168.700688 271.162217 
-" style="fill:none;stroke:#ffa800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 168.700688 271.162217 
-L 159.011971 282.861121 
-" style="fill:none;stroke:#ffa000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 159.011971 282.861121 
-L 150.038647 295.049691 
-" style="fill:none;stroke:#ff9600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 150.038647 295.049691 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5900; stroke-width: 2"/>
+    <path d="M 215.695916 238.575643 
+L 206.989353 241.571866 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb200; stroke-width: 2"/>
+    <path d="M 206.989353 241.571866 
+L 197.853599 246.122102 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb200; stroke-width: 2"/>
+    <path d="M 197.853599 246.122102 
+L 188.061983 252.736208 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb100; stroke-width: 2"/>
+    <path d="M 188.061983 252.736208 
+L 179.329716 260.206535 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffad00; stroke-width: 2"/>
+    <path d="M 179.329716 260.206535 
+L 179.329716 260.206535 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa800; stroke-width: 2"/>
+    <path d="M 179.329716 260.206535 
+L 168.699955 271.16164 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa800; stroke-width: 2"/>
+    <path d="M 168.699955 271.16164 
+L 159.012014 282.861153 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa000; stroke-width: 2"/>
+    <path d="M 159.012014 282.861153 
+L 150.038546 295.049615 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9600; stroke-width: 2"/>
+    <path d="M 150.038546 295.049615 
 L 141.628235 307.584 
-" style="fill:none;stroke:#ff8b00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 141.628235 307.584 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8b00; stroke-width: 2"/>
+    <path d="M 141.628235 307.584 
 L 141.628235 307.584 
-" style="fill:none;stroke:#ff7f00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 285.980961 244.55848 
-L 271.463379 244.139437 
-" style="fill:none;stroke:#ff7a00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 271.463379 244.139437 
-L 259.587734 244.399631 
-" style="fill:none;stroke:#ff8c00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 259.587734 244.399631 
-L 249.427786 245.313507 
-" style="fill:none;stroke:#ff9700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 249.427786 245.313507 
-L 240.348104 246.924318 
-" style="fill:none;stroke:#ff9f00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 240.348104 246.924318 
-L 231.877587 249.356058 
-" style="fill:none;stroke:#ffa400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 231.877587 249.356058 
-L 223.616878 252.852286 
-" style="fill:none;stroke:#ffa800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 223.616878 252.852286 
-L 215.232649 257.810723 
-" style="fill:none;stroke:#ffaa00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 215.232649 257.810723 
-L 206.587056 264.682956 
-" style="fill:none;stroke:#ffab00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 206.587056 264.682956 
-L 199.005798 272.385661 
-" style="fill:none;stroke:#ffa900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 199.005798 272.385661 
-L 199.005798 272.385661 
-" style="fill:none;stroke:#ffa700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 199.005798 272.385661 
-L 191.195594 282.063032 
-" style="fill:none;stroke:#ffa700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 191.195594 282.063032 
-L 191.195594 282.063032 
-" style="fill:none;stroke:#ffa200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 191.195594 282.063032 
-L 182.759286 294.571485 
-" style="fill:none;stroke:#ffa200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 182.759286 294.571485 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7f00; stroke-width: 2"/>
+    <path d="M 285.985101 244.556256 
+L 271.464884 244.136501 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7a00; stroke-width: 2"/>
+    <path d="M 271.464884 244.136501 
+L 259.590104 244.395979 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8c00; stroke-width: 2"/>
+    <path d="M 259.590104 244.395979 
+L 249.430344 245.309127 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9700; stroke-width: 2"/>
+    <path d="M 249.430344 245.309127 
+L 240.351349 246.919127 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9f00; stroke-width: 2"/>
+    <path d="M 240.351349 246.919127 
+L 231.881908 249.349803 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa400; stroke-width: 2"/>
+    <path d="M 231.881908 249.349803 
+L 223.622178 252.844836 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa800; stroke-width: 2"/>
+    <path d="M 223.622178 252.844836 
+L 215.238465 257.802252 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffaa00; stroke-width: 2"/>
+    <path d="M 215.238465 257.802252 
+L 206.586917 264.679283 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffab00; stroke-width: 2"/>
+    <path d="M 206.586917 264.679283 
+L 199.004311 272.38355 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa900; stroke-width: 2"/>
+    <path d="M 199.004311 272.38355 
+L 199.004311 272.38355 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa700; stroke-width: 2"/>
+    <path d="M 199.004311 272.38355 
+L 191.194123 282.06225 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa700; stroke-width: 2"/>
+    <path d="M 191.194123 282.06225 
+L 191.194123 282.06225 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa200; stroke-width: 2"/>
+    <path d="M 191.194123 282.06225 
+L 182.758459 294.571061 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa200; stroke-width: 2"/>
+    <path d="M 182.758459 294.571061 
 L 175.239529 307.584 
-" style="fill:none;stroke:#ff9c00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 175.239529 307.584 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9c00; stroke-width: 2"/>
+    <path d="M 175.239529 307.584 
 L 175.239529 307.584 
-" style="fill:none;stroke:#ff9400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 215.504749 273.924167 
-L 208.254105 282.227692 
-" style="fill:none;stroke:#ffa400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 208.254105 282.227692 
-L 208.254105 282.227692 
-" style="fill:none;stroke:#ffa200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 208.254105 282.227692 
-L 199.563803 294.574728 
-" style="fill:none;stroke:#ffa200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 199.563803 294.574728 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9400; stroke-width: 2"/>
+    <path d="M 215.500837 273.925807 
+L 208.253482 282.22741 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa400; stroke-width: 2"/>
+    <path d="M 208.253482 282.22741 
+L 208.253482 282.22741 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa200; stroke-width: 2"/>
+    <path d="M 208.253482 282.22741 
+L 199.563456 294.574581 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa200; stroke-width: 2"/>
+    <path d="M 199.563456 294.574581 
 L 192.045176 307.584 
-" style="fill:none;stroke:#ff9e00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 192.045176 307.584 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9e00; stroke-width: 2"/>
+    <path d="M 192.045176 307.584 
 L 192.045176 307.584 
-" style="fill:none;stroke:#ff9900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 256.015682 
-L 330.991769 255.570405 
-" style="fill:none;stroke:#ff1300;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 330.991769 255.570405 
-L 315.127981 255.1847 
-" style="fill:none;stroke:#ff2d00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 315.127981 255.1847 
-L 299.350134 255.323384 
-" style="fill:none;stroke:#ff4a00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 299.350134 255.323384 
-L 286.374337 256.072763 
-" style="fill:none;stroke:#ff6400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 286.374337 256.072763 
-L 275.319984 257.417954 
-" style="fill:none;stroke:#ff7500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 275.319984 257.417954 
-L 265.588461 259.391296 
-" style="fill:none;stroke:#ff8200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 265.588461 259.391296 
-L 256.73422 262.08619 
-" style="fill:none;stroke:#ff8c00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 256.73422 262.08619 
-L 248.388858 265.68391 
-" style="fill:none;stroke:#ff9300;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 248.388858 265.68391 
-L 240.253746 270.480754 
-" style="fill:none;stroke:#ff9800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 240.253746 270.480754 
-L 232.071077 276.936029 
-" style="fill:none;stroke:#ff9b00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 232.071077 276.936029 
-L 223.803343 285.510908 
-" style="fill:none;stroke:#ff9d00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 223.803343 285.510908 
-L 216.751792 294.779949 
-" style="fill:none;stroke:#ff9d00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 216.751792 294.779949 
-L 216.751792 294.779949 
-" style="fill:none;stroke:#ff9c00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 216.751792 294.779949 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9900; stroke-width: 2"/>
+    <path d="M 343.296 256.014291 
+L 330.980224 255.568623 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff1300; stroke-width: 2"/>
+    <path d="M 330.980224 255.568623 
+L 315.116403 255.183001 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff2d00; stroke-width: 2"/>
+    <path d="M 315.116403 255.183001 
+L 299.340762 255.321851 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4a00; stroke-width: 2"/>
+    <path d="M 299.340762 255.321851 
+L 286.367377 256.071315 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6400; stroke-width: 2"/>
+    <path d="M 286.367377 256.071315 
+L 275.313066 257.41684 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7500; stroke-width: 2"/>
+    <path d="M 275.313066 257.41684 
+L 265.581381 259.390649 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8200; stroke-width: 2"/>
+    <path d="M 265.581381 259.390649 
+L 256.728431 262.085406 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8c00; stroke-width: 2"/>
+    <path d="M 256.728431 262.085406 
+L 248.3862 265.682082 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9300; stroke-width: 2"/>
+    <path d="M 248.3862 265.682082 
+L 240.253067 270.477843 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9800; stroke-width: 2"/>
+    <path d="M 240.253067 270.477843 
+L 232.071143 276.932912 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9b00; stroke-width: 2"/>
+    <path d="M 232.071143 276.932912 
+L 223.801984 285.510488 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9d00; stroke-width: 2"/>
+    <path d="M 223.801984 285.510488 
+L 216.751306 294.779693 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9d00; stroke-width: 2"/>
+    <path d="M 216.751306 294.779693 
+L 216.751306 294.779693 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9c00; stroke-width: 2"/>
+    <path d="M 216.751306 294.779693 
 L 208.850824 307.584 
-" style="fill:none;stroke:#ff9c00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 208.850824 307.584 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9c00; stroke-width: 2"/>
+    <path d="M 208.850824 307.584 
 L 208.850824 307.584 
-" style="fill:none;stroke:#ff9900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 315.427607 268.907005 
-L 303.281519 270.698867 
-" style="fill:none;stroke:#ff4400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 303.281519 270.698867 
-L 292.633531 273.0704 
-" style="fill:none;stroke:#ff5800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 292.633531 273.0704 
-L 283.046653 276.098676 
-" style="fill:none;stroke:#ff6600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 283.046653 276.098676 
-L 274.178765 279.922704 
-" style="fill:none;stroke:#ff7200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 274.178765 279.922704 
-L 265.745634 284.769916 
-" style="fill:none;stroke:#ff7b00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 265.745634 284.769916 
-L 257.511568 290.986974 
-" style="fill:none;stroke:#ff8200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 257.511568 290.986974 
-L 249.391475 298.961375 
-" style="fill:none;stroke:#ff8700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 249.391475 298.961375 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9900; stroke-width: 2"/>
+    <path d="M 315.422208 268.906473 
+L 303.278231 270.698252 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4400; stroke-width: 2"/>
+    <path d="M 303.278231 270.698252 
+L 292.630452 273.070024 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5800; stroke-width: 2"/>
+    <path d="M 292.630452 273.070024 
+L 283.043727 276.098637 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6600; stroke-width: 2"/>
+    <path d="M 283.043727 276.098637 
+L 274.177265 279.922209 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7200; stroke-width: 2"/>
+    <path d="M 274.177265 279.922209 
+L 265.74646 284.768163 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7b00; stroke-width: 2"/>
+    <path d="M 265.74646 284.768163 
+L 257.514298 290.983552 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8200; stroke-width: 2"/>
+    <path d="M 257.514298 290.983552 
+L 249.392031 298.960225 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8700; stroke-width: 2"/>
+    <path d="M 249.392031 298.960225 
 L 242.462118 307.584 
-" style="fill:none;stroke:#ff8a00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 242.462118 307.584 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8a00; stroke-width: 2"/>
+    <path d="M 242.462118 307.584 
 L 242.462118 307.584 
-" style="fill:none;stroke:#ff8c00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 242.462118 307.584 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8c00; stroke-width: 2"/>
+    <path d="M 242.462118 307.584 
 L 242.462118 307.584 
-" style="fill:none;stroke:#ff8c00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 283.341357 288.27208 
-L 274.791167 293.560869 
-" style="fill:none;stroke:#ff6d00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 274.791167 293.560869 
-L 266.512932 300.201592 
-" style="fill:none;stroke:#ff7500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 266.512932 300.201592 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8c00; stroke-width: 2"/>
+    <path d="M 283.341931 288.270679 
+L 274.792993 293.55873 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6d00; stroke-width: 2"/>
+    <path d="M 274.792993 293.55873 
+L 266.51361 300.200568 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7500; stroke-width: 2"/>
+    <path d="M 266.51361 300.200568 
 L 259.267765 307.584 
-" style="fill:none;stroke:#ff7b00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 259.267765 307.584 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7b00; stroke-width: 2"/>
+    <path d="M 259.267765 307.584 
 L 259.267765 307.584 
-" style="fill:none;stroke:#ff7f00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 259.267765 307.584 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7f00; stroke-width: 2"/>
+    <path d="M 259.267765 307.584 
 L 259.267765 307.584 
-" style="fill:none;stroke:#ff7f00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 280.486806 
-L 334.829875 281.899283 
-" style="fill:none;stroke:#ff0a00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 334.829875 281.899283 
-L 322.56818 284.35606 
-" style="fill:none;stroke:#ff1b00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 322.56818 284.35606 
-L 311.675749 287.394379 
-" style="fill:none;stroke:#ff3200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 311.675749 287.394379 
-L 301.797156 291.099881 
-" style="fill:none;stroke:#ff4400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 301.797156 291.099881 
-L 292.63051 295.620465 
-" style="fill:none;stroke:#ff5200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 292.63051 295.620465 
-L 283.935628 301.17782 
-" style="fill:none;stroke:#ff5e00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 283.935628 301.17782 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7f00; stroke-width: 2"/>
+    <path d="M 343.296 280.485524 
+L 334.824996 281.898952 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff0a00; stroke-width: 2"/>
+    <path d="M 334.824996 281.898952 
+L 322.563283 284.355997 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff1b00; stroke-width: 2"/>
+    <path d="M 322.563283 284.355997 
+L 311.673396 287.393857 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff3200; stroke-width: 2"/>
+    <path d="M 311.673396 287.393857 
+L 301.795413 291.099386 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4400; stroke-width: 2"/>
+    <path d="M 301.795413 291.099386 
+L 292.629609 295.620042 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5200; stroke-width: 2"/>
+    <path d="M 292.629609 295.620042 
+L 283.935356 301.17749 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5e00; stroke-width: 2"/>
+    <path d="M 283.935356 301.17749 
 L 276.073412 307.584 
-" style="fill:none;stroke:#ff6700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 276.073412 307.584 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6700; stroke-width: 2"/>
+    <path d="M 276.073412 307.584 
 L 276.073412 307.584 
-" style="fill:none;stroke:#ff6e00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 276.073412 307.584 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6e00; stroke-width: 2"/>
+    <path d="M 276.073412 307.584 
 L 276.073412 307.584 
-" style="fill:none;stroke:#ff6e00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 229.315765 
-L 343.296 229.315765 
-" style="fill:none;stroke:#ff1e00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 229.315765 
-L 327.844981 225.94056 
-" style="fill:none;stroke:#ff1e00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 327.844981 225.94056 
-L 312.519705 222.104195 
-" style="fill:none;stroke:#ff3e00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 312.519705 222.104195 
-L 297.380606 217.677921 
-" style="fill:none;stroke:#ff5b00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 297.380606 217.677921 
-L 282.52425 212.494612 
-" style="fill:none;stroke:#ff7500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 282.52425 212.494612 
-L 268.102726 206.348525 
-" style="fill:none;stroke:#ff8b00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 268.102726 206.348525 
-L 254.34104 199.018495 
-" style="fill:none;stroke:#ff9e00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 254.34104 199.018495 
-L 242.723499 191.239596 
-" style="fill:none;stroke:#ffad00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 242.723499 191.239596 
-L 232.873921 183.060617 
-" style="fill:none;stroke:#ffb800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 232.873921 183.060617 
-L 224.212827 174.273167 
-" style="fill:none;stroke:#ffc100;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 224.212827 174.273167 
-L 216.332479 164.63034 
-" style="fill:none;stroke:#ffc800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 216.332479 164.63034 
-L 208.881128 153.821137 
-" style="fill:none;stroke:#ffce00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 208.881128 153.821137 
-L 201.043644 141.137567 
-" style="fill:none;stroke:#ffd400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 201.043644 141.137567 
-L 201.043644 141.137567 
-" style="fill:none;stroke:#ffd900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 201.043644 141.137567 
-L 199.465453 138.573173 
-" style="fill:none;stroke:#ffd900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 199.465453 138.573173 
-L 199.465453 138.573173 
-" style="fill:none;stroke:#ffda00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 199.465453 138.573173 
-L 197.941095 136.350946 
-" style="fill:none;stroke:#ffda00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 197.941095 136.350946 
-L 197.941095 136.350946 
-" style="fill:none;stroke:#ffdb00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 197.941095 136.350946 
-L 196.503849 134.730954 
-" style="fill:none;stroke:#ffdb00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 196.503849 134.730954 
-L 196.503849 134.730954 
-" style="fill:none;stroke:#ffdc00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 196.503849 134.730954 
-L 194.955449 133.813841 
-" style="fill:none;stroke:#ffdc00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 194.955449 133.813841 
-L 192.910408 133.780267 
-" style="fill:none;stroke:#ffdc00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 192.910408 133.780267 
-L 191.106057 134.074355 
-" style="fill:none;stroke:#ffdc00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 191.106057 134.074355 
-L 188.335566 134.857422 
-" style="fill:none;stroke:#ffdb00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 188.335566 134.857422 
-L 183.401545 136.457465 
-" style="fill:none;stroke:#ffda00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 183.401545 136.457465 
-L 173.085772 139.79133 
-" style="fill:none;stroke:#ffd900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 173.085772 139.79133 
-L 158.042035 144.375288 
-" style="fill:none;stroke:#ffd400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 158.042035 144.375288 
-L 142.859543 148.661791 
-" style="fill:none;stroke:#ffca00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 142.859543 148.661791 
-L 127.58278 152.664365 
-" style="fill:none;stroke:#ffbd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 127.58278 152.664365 
-L 112.230951 156.413296 
-" style="fill:none;stroke:#ffad00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 112.230951 156.413296 
-L 96.81671 159.935614 
-" style="fill:none;stroke:#ff9900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 96.81671 159.935614 
-L 81.350736 163.25649 
-" style="fill:none;stroke:#ff8100;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 81.350736 163.25649 
-L 65.841505 166.397806 
-" style="fill:none;stroke:#ff6600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 65.841505 166.397806 
-L 57.6 168.020019 
-" style="fill:none;stroke:#ff4700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 213.662118 
-L 343.296 213.662118 
-" style="fill:none;stroke:#ff2400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 213.662118 
-L 328.175038 209.178884 
-" style="fill:none;stroke:#ff2400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 328.175038 209.178884 
-L 313.298836 204.039498 
-" style="fill:none;stroke:#ff4400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 313.298836 204.039498 
-L 298.77536 198.095802 
-" style="fill:none;stroke:#ff6100;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 298.77536 198.095802 
-L 284.758359 191.185312 
-" style="fill:none;stroke:#ff7a00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 284.758359 191.185312 
-L 271.501392 183.19459 
-" style="fill:none;stroke:#ff9000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 271.501392 183.19459 
-L 260.16967 174.832665 
-" style="fill:none;stroke:#ffa300;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 260.16967 174.832665 
-L 250.331444 166.028993 
-" style="fill:none;stroke:#ffb100;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 250.331444 166.028993 
-L 241.617376 156.639356 
-" style="fill:none;stroke:#ffbd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 241.617376 156.639356 
-L 233.798376 146.538666 
-" style="fill:none;stroke:#ffc600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 233.798376 146.538666 
-L 226.764751 135.603403 
-" style="fill:none;stroke:#ffcf00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 226.764751 135.603403 
-L 226.764751 135.603403 
-" style="fill:none;stroke:#ffd600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 226.764751 135.603403 
-L 222.753853 128.165512 
-" style="fill:none;stroke:#ffd600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.753853 128.165512 
-L 222.753853 128.165512 
-" style="fill:none;stroke:#ffda00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.753853 128.165512 
-L 221.63129 125.802051 
-" style="fill:none;stroke:#ffda00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 221.63129 125.802051 
-L 221.63129 125.802051 
-" style="fill:none;stroke:#ffdc00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 221.63129 125.802051 
-L 220.814989 123.763665 
-" style="fill:none;stroke:#ffdc00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 220.814989 123.763665 
-L 220.814989 123.763665 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 220.814989 123.763665 
-L 220.65463 122.51401 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 220.65463 122.51401 
-L 220.65463 122.51401 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 220.65463 122.51401 
-L 220.755016 122.103775 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 220.755016 122.103775 
-L 220.908505 121.834358 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 220.908505 121.834358 
-L 221.046974 121.660026 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 221.046974 121.660026 
-L 221.256891 121.555822 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 221.256891 121.555822 
-L 221.532915 121.557593 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 221.532915 121.557593 
-L 221.532915 121.557593 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 221.532915 121.557593 
-L 221.691366 121.541918 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 221.691366 121.541918 
-L 221.805274 121.525426 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 221.805274 121.525426 
-L 221.866001 121.474104 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 221.866001 121.474104 
-L 221.898732 121.410554 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 221.898732 121.410554 
-L 221.932144 121.370907 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 221.932144 121.370907 
-L 221.977821 121.370442 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 221.977821 121.370442 
-L 222.030748 121.400877 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.030748 121.400877 
-L 222.068132 121.419884 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.068132 121.419884 
-L 222.073093 121.391711 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.073093 121.391711 
-L 222.062514 121.343077 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.062514 121.343077 
-L 222.06017 121.315304 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.06017 121.315304 
-L 222.075908 121.325662 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.075908 121.325662 
-L 222.105676 121.36668 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.105676 121.36668 
-L 222.126591 121.395795 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.126591 121.395795 
-L 222.119036 121.374755 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.119036 121.374755 
-L 222.098703 121.330358 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.098703 121.330358 
-L 222.088413 121.304941 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.088413 121.304941 
-L 222.096973 121.316085 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.096973 121.316085 
-L 222.120393 121.357104 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.120393 121.357104 
-L 222.137218 121.388038 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.137218 121.388038 
-L 222.128479 121.371375 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.128479 121.371375 
-L 222.107122 121.329932 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.107122 121.329932 
-L 222.094931 121.30484 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.094931 121.30484 
-L 222.101068 121.314385 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.101068 121.314385 
-L 222.121891 121.352951 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.121891 121.352951 
-L 222.137845 121.383926 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.137845 121.383926 
-L 222.130225 121.370587 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.130225 121.370587 
-L 222.109681 121.331655 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.109681 121.331655 
-L 222.097071 121.306578 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.097071 121.306578 
-L 222.101855 121.3142 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.101855 121.3142 
-L 222.121053 121.350102 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.121053 121.350102 
-L 222.136693 121.3807 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.136693 121.3807 
-L 222.130477 121.370204 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.130477 121.370204 
-L 222.111051 121.333612 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.111051 121.333612 
-L 222.098341 121.308568 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.098341 121.308568 
-L 222.10208 121.31437 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.10208 121.31437 
-L 222.119908 121.347723 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.119908 121.347723 
-L 222.13529 121.37779 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.13529 121.37779 
-L 222.130407 121.369813 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.130407 121.369813 
-L 222.112123 121.335464 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.112123 121.335464 
-L 222.099416 121.310534 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.099416 121.310534 
-L 222.102238 121.314673 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.102238 121.314673 
-L 222.118813 121.345634 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.118813 121.345634 
-L 222.133911 121.375078 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.133911 121.375078 
-L 222.130237 121.36935 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.130237 121.36935 
-L 222.113069 121.337164 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.113069 121.337164 
-L 222.100421 121.312429 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.100421 121.312429 
-L 222.102415 121.315055 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.102415 121.315055 
-L 222.117821 121.343778 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.117821 121.343778 
-L 222.1326 121.372532 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.1326 121.372532 
-L 222.130014 121.368815 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.130014 121.368815 
-L 222.113925 121.338711 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.113925 121.338711 
-L 222.10138 121.314246 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.10138 121.314246 
-L 222.102623 121.315499 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.102623 121.315499 
-L 222.116932 121.342123 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.116932 121.342123 
-L 222.131363 121.370137 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.131363 121.370137 
-L 222.12975 121.368216 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.12975 121.368216 
-L 222.114704 121.340117 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.114704 121.340117 
-L 222.102298 121.315988 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.102298 121.315988 
-L 222.102858 121.315995 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.102858 121.315995 
-L 222.116135 121.340647 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.116135 121.340647 
-L 222.130195 121.367882 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.130195 121.367882 
-L 222.129455 121.367564 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.129455 121.367564 
-L 222.115411 121.341391 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.115411 121.341391 
-L 222.103179 121.317656 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.103179 121.317656 
-L 222.103117 121.316534 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.103117 121.316534 
-L 222.115423 121.339332 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.115423 121.339332 
-L 222.129093 121.365759 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.129093 121.365759 
-L 222.129132 121.366868 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.129132 121.366868 
-L 222.116051 121.342543 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.116051 121.342543 
-L 222.104022 121.319252 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.104022 121.319252 
-L 222.103397 121.317109 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.103397 121.317109 
-L 222.114787 121.338161 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.114787 121.338161 
-L 222.128053 121.363759 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.128053 121.363759 
-L 222.128786 121.366135 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.128786 121.366135 
-L 222.116631 121.343581 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.116631 121.343581 
-L 222.104831 121.32078 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.104831 121.32078 
-L 222.103694 121.317715 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.103694 121.317715 
-L 222.11422 121.337122 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.11422 121.337122 
-L 222.127071 121.361874 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.127071 121.361874 
-L 222.128422 121.365373 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.128422 121.365373 
-L 222.117154 121.344513 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.117154 121.344513 
-L 222.105604 121.322242 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.105604 121.322242 
-L 222.104005 121.318345 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.104005 121.318345 
-L 222.113715 121.336201 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.113715 121.336201 
-L 222.126145 121.360099 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.126145 121.360099 
-L 222.128043 121.364588 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.128043 121.364588 
-L 222.117623 121.345346 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.117623 121.345346 
-L 222.106344 121.323638 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.106344 121.323638 
-L 222.104329 121.318995 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.104329 121.318995 
-L 222.113268 121.335389 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.113268 121.335389 
-L 222.125271 121.358427 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.125271 121.358427 
-L 222.127652 121.363785 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.127652 121.363785 
-L 222.118043 121.346088 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.118043 121.346088 
-L 222.107051 121.324971 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.107051 121.324971 
-L 222.104662 121.319661 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.104662 121.319661 
-L 222.112872 121.334675 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.112872 121.334675 
-L 222.124446 121.356852 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.124446 121.356852 
-L 222.127251 121.36297 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.127251 121.36297 
-L 222.118416 121.346744 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.118416 121.346744 
-L 222.107727 121.326243 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.107727 121.326243 
-L 222.105003 121.32034 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.105003 121.32034 
-L 222.112525 121.33405 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.112525 121.33405 
-L 222.123669 121.35537 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.123669 121.35537 
-L 222.126844 121.362146 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.126844 121.362146 
-L 222.118747 121.34732 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.118747 121.34732 
-L 222.108371 121.327454 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.108371 121.327454 
-L 222.105349 121.321027 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.105349 121.321027 
-L 222.112221 121.333508 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.112221 121.333508 
-L 222.122936 121.353976 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.122936 121.353976 
-L 222.126433 121.361318 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.126433 121.361318 
-L 222.119037 121.347821 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.119037 121.347821 
-L 222.108985 121.328608 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.108985 121.328608 
-L 222.1057 121.321721 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.1057 121.321721 
-L 222.111957 121.333042 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.111957 121.333042 
-L 222.122246 121.352665 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.122246 121.352665 
-L 222.126019 121.360489 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.126019 121.360489 
-L 222.119289 121.348253 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.119289 121.348253 
-L 222.10957 121.329704 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.10957 121.329704 
-L 222.106054 121.322417 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.106054 121.322417 
-L 222.11173 121.332644 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.11173 121.332644 
-L 222.121596 121.351433 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.121596 121.351433 
-L 222.125605 121.359662 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.125605 121.359662 
-L 222.119507 121.348621 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.119507 121.348621 
-L 222.110126 121.330746 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.110126 121.330746 
-L 222.106409 121.323114 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.106409 121.323114 
-L 222.111537 121.33231 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.111537 121.33231 
-L 222.120985 121.350276 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.120985 121.350276 
-L 222.125191 121.35884 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.125191 121.35884 
-L 222.119691 121.348929 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.119691 121.348929 
-L 222.110654 121.331733 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.110654 121.331733 
-L 222.106764 121.32381 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.106764 121.32381 
-L 222.111375 121.332035 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.111375 121.332035 
-L 222.120411 121.349191 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.120411 121.349191 
-L 222.12478 121.358026 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.12478 121.358026 
-L 222.119846 121.34918 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.119846 121.34918 
-L 222.111154 121.332668 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.111154 121.332668 
-L 222.107118 121.324502 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.107118 121.324502 
-L 222.111241 121.331812 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.111241 121.331812 
-L 222.119872 121.348174 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.119872 121.348174 
-L 222.124372 121.357222 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.124372 121.357222 
-L 222.119973 121.349381 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.119973 121.349381 
-L 222.111628 121.333552 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.111628 121.333552 
-L 222.107471 121.325189 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.107471 121.325189 
-L 222.111134 121.331639 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.111134 121.331639 
-L 222.119367 121.347222 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.119367 121.347222 
-L 222.123969 121.356429 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.123969 121.356429 
-L 222.120073 121.349533 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.120073 121.349533 
-L 222.112076 121.334387 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.112076 121.334387 
-L 222.10782 121.325869 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.10782 121.325869 
-L 222.111051 121.33151 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.111051 121.33151 
-L 222.118893 121.346331 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.118893 121.346331 
-L 222.123572 121.35565 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.123572 121.35565 
-L 222.120149 121.349642 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.120149 121.349642 
-L 222.112499 121.335174 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.112499 121.335174 
-L 222.108166 121.32654 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.108166 121.32654 
-L 222.110991 121.331423 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 222.110991 121.331423 
-L 222.11845 121.3455 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 198.008471 
-L 343.296 198.008471 
-" style="fill:none;stroke:#ff2a00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 198.008471 
-L 328.461632 192.762412 
-" style="fill:none;stroke:#ff2a00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 328.461632 192.762412 
-L 313.942305 186.805149 
-" style="fill:none;stroke:#ff4a00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 313.942305 186.805149 
-L 299.850445 180.020682 
-" style="fill:none;stroke:#ff6700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 299.850445 180.020682 
-L 286.325151 172.305807 
-" style="fill:none;stroke:#ff8000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 286.325151 172.305807 
-L 273.518173 163.596701 
-" style="fill:none;stroke:#ff9600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 273.518173 163.596701 
-L 262.099736 154.371913 
-" style="fill:none;stroke:#ffa800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 262.099736 154.371913 
-L 251.701185 144.521958 
-" style="fill:none;stroke:#ffb700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 251.701185 144.521958 
-L 241.761452 133.757289 
-" style="fill:none;stroke:#ffc400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 182.354824 
-L 343.296 182.354824 
-" style="fill:none;stroke:#ff3000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 182.354824 
-L 328.650724 176.666274 
-" style="fill:none;stroke:#ff3000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 328.650724 176.666274 
-L 314.332371 170.299665 
-" style="fill:none;stroke:#ff5000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 166.701176 
-L 343.296 166.701176 
-" style="fill:none;stroke:#ff3600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 166.701176 
-L 328.709572 160.880833 
-" style="fill:none;stroke:#ff3600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 328.709572 160.880833 
-L 314.407985 154.478117 
-" style="fill:none;stroke:#ff5600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 314.407985 154.478117 
-L 300.438767 147.468503 
-" style="fill:none;stroke:#ff7200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 300.438767 147.468503 
-L 286.8264 139.87416 
-" style="fill:none;stroke:#ff8b00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 286.8264 139.87416 
-L 273.527432 131.809988 
-" style="fill:none;stroke:#ffa100;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 273.527432 131.809988 
-L 260.297152 123.649005 
-" style="fill:none;stroke:#ffb500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 260.297152 123.649005 
-L 260.297152 123.649005 
-" style="fill:none;stroke:#ffc500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 260.297152 123.649005 
-L 252.849724 119.428166 
-" style="fill:none;stroke:#ffc500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 252.849724 119.428166 
-L 252.849724 119.428166 
-" style="fill:none;stroke:#ffcd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 252.849724 119.428166 
-L 248.149223 117.191758 
-" style="fill:none;stroke:#ffcd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 248.149223 117.191758 
-L 248.149223 117.191758 
-" style="fill:none;stroke:#ffd100;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 248.149223 117.191758 
-L 243.848239 115.735848 
-" style="fill:none;stroke:#ffd100;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 243.848239 115.735848 
-L 243.848239 115.735848 
-" style="fill:none;stroke:#ffd500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 243.848239 115.735848 
-L 240.123015 115.146259 
-" style="fill:none;stroke:#ffd500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 240.123015 115.146259 
-L 240.123015 115.146259 
-" style="fill:none;stroke:#ffd700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 240.123015 115.146259 
-L 236.802304 115.310714 
-" style="fill:none;stroke:#ffd700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 151.047529 
-L 343.296 151.047529 
-" style="fill:none;stroke:#ff3c00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 151.047529 
-L 328.620015 145.422629 
-" style="fill:none;stroke:#ff3c00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 328.620015 145.422629 
-L 314.14127 139.3707 
-" style="fill:none;stroke:#ff5c00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 135.393882 
-L 343.296 135.393882 
-" style="fill:none;stroke:#ff4200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 135.393882 
-L 328.379596 130.343598 
-" style="fill:none;stroke:#ff4200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 328.379596 130.343598 
-L 313.541911 125.095414 
-" style="fill:none;stroke:#ff6200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 313.541911 125.095414 
-L 298.725653 119.795039 
-" style="fill:none;stroke:#ff7f00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 298.725653 119.795039 
-L 283.798543 114.782837 
-" style="fill:none;stroke:#ff9900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 283.798543 114.782837 
-L 283.798543 114.782837 
-" style="fill:none;stroke:#ffaf00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 283.798543 114.782837 
-L 272.324285 111.598666 
-" style="fill:none;stroke:#ffaf00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 272.324285 111.598666 
-L 272.324285 111.598666 
-" style="fill:none;stroke:#ffbe00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 272.324285 111.598666 
-L 264.299769 110.047573 
-" style="fill:none;stroke:#ffbe00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 264.299769 110.047573 
-L 264.299769 110.047573 
-" style="fill:none;stroke:#ffc600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 264.299769 110.047573 
-L 257.455195 109.46863 
-" style="fill:none;stroke:#ffc600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 257.455195 109.46863 
-L 257.455195 109.46863 
-" style="fill:none;stroke:#ffcd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 257.455195 109.46863 
-L 251.531938 109.734169 
-" style="fill:none;stroke:#ffcd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 251.531938 109.734169 
-L 245.530316 110.968345 
-" style="fill:none;stroke:#ffd200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 119.740235 
-L 343.296 119.740235 
-" style="fill:none;stroke:#ff4800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 119.740235 
-L 328.017185 115.737838 
-" style="fill:none;stroke:#ff4800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 328.017185 115.737838 
-L 312.701722 111.86173 
-" style="fill:none;stroke:#ff6800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 312.701722 111.86173 
-L 297.27541 108.406128 
-" style="fill:none;stroke:#ff8600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 88.432941 
-L 343.296 88.432941 
-" style="fill:none;stroke:#ff5400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 88.432941 
-L 327.43148 88.388233 
-" style="fill:none;stroke:#ff5400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 327.43148 88.388233 
-L 311.598696 89.196052 
-" style="fill:none;stroke:#ff7400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 311.598696 89.196052 
-L 311.598696 89.196052 
-" style="fill:none;stroke:#ff9000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 311.598696 89.196052 
-L 298.241987 90.754775 
-" style="fill:none;stroke:#ff9000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 298.241987 90.754775 
-L 284.728936 93.47469 
-" style="fill:none;stroke:#ffa500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 72.779294 
-L 343.296 72.779294 
-" style="fill:none;stroke:#ff5a00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 72.779294 
-L 327.732013 75.622802 
-" style="fill:none;stroke:#ff5a00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 327.732013 75.622802 
-L 312.386549 79.341149 
-" style="fill:none;stroke:#ff7800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 41.472 
-L 343.296 41.472 
-" style="fill:none;stroke:#ff6600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.296 41.472 
-L 330.446132 50.145611 
-" style="fill:none;stroke:#ff6600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 330.446132 50.145611 
-L 317.699163 58.944732 
-" style="fill:none;stroke:#ff7d00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 292.879059 41.472 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6e00; stroke-width: 2"/>
+    <path d="M 326.490353 41.472 
+L 326.490353 41.472 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8800; stroke-width: 2"/>
+    <path d="M 326.490353 41.472 
+L 315.514253 52.148657 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8800; stroke-width: 2"/>
+    <path d="M 315.514253 52.148657 
+L 304.300194 62.606775 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9800; stroke-width: 2"/>
+    <path d="M 304.300194 62.606775 
+L 292.823659 72.808193 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa600; stroke-width: 2"/>
+    <path d="M 292.823659 72.808193 
+L 281.047364 82.694818 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb300; stroke-width: 2"/>
+    <path d="M 281.047364 82.694818 
+L 268.898779 92.181092 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbf00; stroke-width: 2"/>
+    <path d="M 268.898779 92.181092 
+L 256.318221 101.080431 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc900; stroke-width: 2"/>
+    <path d="M 256.318221 101.080431 
+L 256.318221 101.080431 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd100; stroke-width: 2"/>
+    <path d="M 256.318221 101.080431 
+L 248.093118 106.574462 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd100; stroke-width: 2"/>
+    <path d="M 248.093118 106.574462 
+L 248.093118 106.574462 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd500; stroke-width: 2"/>
+    <path d="M 248.093118 106.574462 
+L 241.052076 110.861213 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd500; stroke-width: 2"/>
+    <path d="M 241.052076 110.861213 
+L 241.052076 110.861213 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd800; stroke-width: 2"/>
+    <path d="M 241.052076 110.861213 
+L 235.712123 113.89443 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd800; stroke-width: 2"/>
+    <path d="M 235.712123 113.89443 
+L 235.712123 113.89443 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffda00; stroke-width: 2"/>
+    <path d="M 235.712123 113.89443 
+L 231.872593 115.968827 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffda00; stroke-width: 2"/>
+    <path d="M 231.872593 115.968827 
+L 231.872593 115.968827 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdb00; stroke-width: 2"/>
+    <path d="M 231.872593 115.968827 
+L 229.050901 117.413372 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdb00; stroke-width: 2"/>
+    <path d="M 229.050901 117.413372 
+L 229.050901 117.413372 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdc00; stroke-width: 2"/>
+    <path d="M 229.050901 117.413372 
+L 227.01336 118.414028 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdc00; stroke-width: 2"/>
+    <path d="M 227.01336 118.414028 
+L 227.01336 118.414028 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdd00; stroke-width: 2"/>
+    <path d="M 227.01336 118.414028 
+L 225.161527 119.12519 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdd00; stroke-width: 2"/>
+    <path d="M 225.161527 119.12519 
+L 225.161527 119.12519 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdd00; stroke-width: 2"/>
+    <path d="M 225.161527 119.12519 
+L 224.477507 119.599894 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdd00; stroke-width: 2"/>
+    <path d="M 224.477507 119.599894 
+L 223.969629 119.962418 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdd00; stroke-width: 2"/>
+    <path d="M 223.969629 119.962418 
+L 223.588329 120.218976 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdd00; stroke-width: 2"/>
+    <path d="M 223.588329 120.218976 
+L 223.1517 120.414512 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdd00; stroke-width: 2"/>
+    <path d="M 223.1517 120.414512 
+L 222.669582 120.463029 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdd00; stroke-width: 2"/>
+    <path d="M 222.669582 120.463029 
+L 222.669582 120.463029 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdd00; stroke-width: 2"/>
+    <path d="M 222.669582 120.463029 
+L 222.466009 120.549516 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdd00; stroke-width: 2"/>
+    <path d="M 222.466009 120.549516 
+L 222.310867 120.613023 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdd00; stroke-width: 2"/>
+    <path d="M 222.310867 120.613023 
+L 222.19312 120.66017 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdd00; stroke-width: 2"/>
+    <path d="M 222.19312 120.66017 
+L 222.105831 120.698163 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdd00; stroke-width: 2"/>
+    <path d="M 222.105831 120.698163 
+L 222.04215 120.730729 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdd00; stroke-width: 2"/>
+    <path d="M 222.04215 120.730729 
+L 221.994702 120.7571 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdd00; stroke-width: 2"/>
+    <path d="M 221.994702 120.7571 
+L 221.957489 120.775411 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdd00; stroke-width: 2"/>
+    <path d="M 221.957489 120.775411 
+L 221.927432 120.786297 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.927432 120.786297 
+L 221.904007 120.793408 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.904007 120.793408 
+L 221.887328 120.800662 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.887328 120.800662 
+L 221.876236 120.80898 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.876236 120.80898 
+L 221.868274 120.816171 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.868274 120.816171 
+L 221.861275 120.819922 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.861275 120.819922 
+L 221.854652 120.820363 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.854652 120.820363 
+L 221.849263 120.82001 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.849263 120.82001 
+L 221.846046 120.82135 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.846046 120.82135 
+L 221.844735 120.824473 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.844735 120.824473 
+L 221.843988 120.827311 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.843988 120.827311 
+L 221.842637 120.828008 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.842637 120.828008 
+L 221.840651 120.82674 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.840651 120.82674 
+L 221.83896 120.825431 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.83896 120.825431 
+L 221.838395 120.825781 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.838395 120.825781 
+L 221.838791 120.827595 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.838791 120.827595 
+L 221.839201 120.829176 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.839201 120.829176 
+L 221.838869 120.829172 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.838869 120.829172 
+L 221.837915 120.827851 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837915 120.827851 
+L 221.837125 120.826723 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837125 120.826723 
+L 221.83711 120.826965 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.83711 120.826965 
+L 221.837697 120.828273 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837697 120.828273 
+L 221.838164 120.829305 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.838164 120.829305 
+L 221.837997 120.82911 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837997 120.82911 
+L 221.837363 120.828008 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837363 120.828008 
+L 221.836886 120.827181 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.836886 120.827181 
+L 221.836995 120.827438 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.836995 120.827438 
+L 221.837507 120.828439 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837507 120.828439 
+L 221.837865 120.829141 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837865 120.829141 
+L 221.837719 120.828889 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837719 120.828889 
+L 221.837246 120.828017 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837246 120.828017 
+L 221.836932 120.827441 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.836932 120.827441 
+L 221.837068 120.827708 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837068 120.827708 
+L 221.837476 120.82848 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837476 120.82848 
+L 221.837726 120.828956 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837726 120.828956 
+L 221.837585 120.828695 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837585 120.828695 
+L 221.837223 120.828019 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837223 120.828019 
+L 221.837015 120.82763 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837015 120.82763 
+L 221.837151 120.827888 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837151 120.827888 
+L 221.837466 120.828481 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837466 120.828481 
+L 221.837634 120.828797 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837634 120.828797 
+L 221.837502 120.82855 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837502 120.82855 
+L 221.837226 120.828032 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837226 120.828032 
+L 221.837089 120.827776 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837089 120.827776 
+L 221.837215 120.828013 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837215 120.828013 
+L 221.837456 120.828465 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837456 120.828465 
+L 221.837564 120.828669 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837564 120.828669 
+L 221.837445 120.828446 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837445 120.828446 
+L 221.837236 120.828053 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837236 120.828053 
+L 221.83715 120.827892 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.83715 120.827892 
+L 221.837262 120.828101 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837262 120.828101 
+L 221.837443 120.828442 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837443 120.828442 
+L 221.83751 120.828567 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.83751 120.828567 
+L 221.837406 120.828373 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837406 120.828373 
+L 221.837249 120.828078 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837249 120.828078 
+L 221.837198 120.827982 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837198 120.827982 
+L 221.837294 120.828162 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837294 120.828162 
+L 221.837429 120.828416 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837429 120.828416 
+L 221.837468 120.828489 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837468 120.828489 
+L 221.83738 120.828323 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.83738 120.828323 
+L 221.837263 120.828104 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837263 120.828104 
+L 221.837235 120.828051 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837235 120.828051 
+L 221.837315 120.828202 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837315 120.828202 
+L 221.837416 120.828391 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837416 120.828391 
+L 221.837435 120.828428 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837435 120.828428 
+L 221.837362 120.82829 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837362 120.82829 
+L 221.837276 120.828129 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837276 120.828129 
+L 221.837263 120.828104 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837263 120.828104 
+L 221.83733 120.828229 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.83733 120.828229 
+L 221.837403 120.828367 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837403 120.828367 
+L 221.837411 120.828381 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837411 120.828381 
+L 221.837351 120.828269 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837351 120.828269 
+L 221.837288 120.828151 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837288 120.828151 
+L 221.837285 120.828145 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837285 120.828145 
+L 221.837339 120.828246 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837339 120.828246 
+L 221.837392 120.828346 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837392 120.828346 
+L 221.837392 120.828346 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837392 120.828346 
+L 221.837344 120.828255 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837344 120.828255 
+L 221.837299 120.828171 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837299 120.828171 
+L 221.837301 120.828175 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837301 120.828175 
+L 221.837344 120.828257 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837344 120.828257 
+L 221.837382 120.828328 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837382 120.828328 
+L 221.837378 120.82832 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837378 120.82832 
+L 221.837339 120.828247 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837339 120.828247 
+L 221.837307 120.828187 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837307 120.828187 
+L 221.837313 120.828198 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837313 120.828198 
+L 221.837347 120.828262 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837347 120.828262 
+L 221.837374 120.828313 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837374 120.828313 
+L 221.837368 120.8283 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837368 120.8283 
+L 221.837337 120.828243 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837337 120.828243 
+L 221.837315 120.828201 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837315 120.828201 
+L 221.837322 120.828215 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837322 120.828215 
+L 221.837349 120.828265 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837349 120.828265 
+L 221.837367 120.8283 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837367 120.8283 
+L 221.83736 120.828286 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.83736 120.828286 
+L 221.837336 120.828242 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837336 120.828242 
+L 221.837321 120.828213 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837321 120.828213 
+L 221.837329 120.828227 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837329 120.828227 
+L 221.837349 120.828266 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837349 120.828266 
+L 221.837362 120.82829 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837362 120.82829 
+L 221.837355 120.828276 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837355 120.828276 
+L 221.837336 120.828241 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837336 120.828241 
+L 221.837326 120.828222 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837326 120.828222 
+L 221.837333 120.828236 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837333 120.828236 
+L 221.837349 120.828266 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837349 120.828266 
+L 221.837358 120.828281 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837358 120.828281 
+L 221.837351 120.828268 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837351 120.828268 
+L 221.837337 120.828242 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837337 120.828242 
+L 221.83733 120.82823 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.83733 120.82823 
+L 221.837336 120.828242 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837336 120.828242 
+L 221.837349 120.828265 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837349 120.828265 
+L 221.837354 120.828275 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837354 120.828275 
+L 221.837348 120.828263 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837348 120.828263 
+L 221.837337 120.828243 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837337 120.828243 
+L 221.837333 120.828235 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837333 120.828235 
+L 221.837339 120.828246 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837339 120.828246 
+L 221.837348 120.828264 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837348 120.828264 
+L 221.837351 120.82827 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837351 120.82827 
+L 221.837346 120.82826 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837346 120.82826 
+L 221.837338 120.828245 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837338 120.828245 
+L 221.837335 120.82824 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837335 120.82824 
+L 221.83734 120.828249 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.83734 120.828249 
+L 221.837347 120.828262 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837347 120.828262 
+L 221.837349 120.828266 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837349 120.828266 
+L 221.837345 120.828257 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837345 120.828257 
+L 221.837339 120.828246 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837339 120.828246 
+L 221.837337 120.828244 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837337 120.828244 
+L 221.837342 120.828251 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837342 120.828251 
+L 221.837347 120.828261 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837347 120.828261 
+L 221.837347 120.828263 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837347 120.828263 
+L 221.837344 120.828255 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837344 120.828255 
+L 221.837339 120.828247 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837339 120.828247 
+L 221.837339 120.828246 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837339 120.828246 
+L 221.837342 120.828253 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837342 120.828253 
+L 221.837346 120.82826 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837346 120.82826 
+L 221.837346 120.82826 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837346 120.82826 
+L 221.837343 120.828254 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837343 120.828254 
+L 221.83734 120.828248 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.83734 120.828248 
+L 221.83734 120.828248 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.83734 120.828248 
+L 221.837343 120.828253 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837343 120.828253 
+L 221.837345 120.828258 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837345 120.828258 
+L 221.837345 120.828258 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837345 120.828258 
+L 221.837343 120.828254 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837343 120.828254 
+L 221.837341 120.828249 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837341 120.828249 
+L 221.837341 120.82825 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837341 120.82825 
+L 221.837343 120.828254 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837343 120.828254 
+L 221.837345 120.828258 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837345 120.828258 
+L 221.837345 120.828257 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837345 120.828257 
+L 221.837343 120.828253 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837343 120.828253 
+L 221.837341 120.82825 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837341 120.82825 
+L 221.837341 120.828251 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837341 120.828251 
+L 221.837343 120.828254 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837343 120.828254 
+L 221.837344 120.828257 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837344 120.828257 
+L 221.837344 120.828256 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837344 120.828256 
+L 221.837342 120.828253 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837342 120.828253 
+L 221.837341 120.828251 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837341 120.828251 
+L 221.837342 120.828252 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837342 120.828252 
+L 221.837343 120.828254 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837343 120.828254 
+L 221.837344 120.828256 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837344 120.828256 
+L 221.837344 120.828255 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837344 120.828255 
+L 221.837342 120.828253 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837342 120.828253 
+L 221.837342 120.828252 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837342 120.828252 
+L 221.837342 120.828252 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 221.837342 120.828252 
+L 221.837343 120.828254 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 292.879059 41.472 
 L 292.879059 41.472 
-" style="fill:none;stroke:#ffbf00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 292.879059 41.472 
-L 287.708475 55.428676 
-" style="fill:none;stroke:#ffbf00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 287.708475 55.428676 
-L 281.896018 67.556311 
-" style="fill:none;stroke:#ffc100;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 281.896018 67.556311 
-L 275.675528 77.847457 
-" style="fill:none;stroke:#ffc400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 275.675528 77.847457 
-L 269.10477 86.635665 
-" style="fill:none;stroke:#ffc700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 269.10477 86.635665 
-L 262.260669 94.15213 
-" style="fill:none;stroke:#ffcb00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 259.267765 41.472 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbf00; stroke-width: 2"/>
+    <path d="M 292.879059 41.472 
+L 287.708562 55.429628 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbf00; stroke-width: 2"/>
+    <path d="M 287.708562 55.429628 
+L 281.903208 67.545061 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc100; stroke-width: 2"/>
+    <path d="M 281.903208 67.545061 
+L 275.687851 77.833058 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc400; stroke-width: 2"/>
+    <path d="M 259.267765 41.472 
 L 259.267765 41.472 
-" style="fill:none;stroke:#ffe500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 259.267765 41.472 
-L 259.957234 56.235863 
-" style="fill:none;stroke:#ffe500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 259.957234 56.235863 
-L 259.516366 70.993955 
-" style="fill:none;stroke:#ffdf00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 259.516366 70.993955 
-L 259.516366 70.993955 
-" style="fill:none;stroke:#ffda00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 259.516366 70.993955 
-L 258.332934 80.445716 
-" style="fill:none;stroke:#ffda00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 258.332934 80.445716 
-L 258.332934 80.445716 
-" style="fill:none;stroke:#ffd700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 242.462118 41.472 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe500; stroke-width: 2"/>
+    <path d="M 259.267765 41.472 
+L 259.958294 56.236458 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe500; stroke-width: 2"/>
+    <path d="M 259.958294 56.236458 
+L 259.518724 70.996281 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdf00; stroke-width: 2"/>
+    <path d="M 259.518724 70.996281 
+L 259.518724 70.996281 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffda00; stroke-width: 2"/>
+    <path d="M 259.518724 70.996281 
+L 258.333487 80.459104 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffda00; stroke-width: 2"/>
+    <path d="M 258.333487 80.459104 
+L 258.333487 80.459104 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd700; stroke-width: 2"/>
+    <path d="M 258.333487 80.459104 
+L 256.470937 88.201764 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd700; stroke-width: 2"/>
+    <path d="M 256.470937 88.201764 
+L 256.470937 88.201764 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd600; stroke-width: 2"/>
+    <path d="M 256.470937 88.201764 
+L 254.016284 94.590632 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd600; stroke-width: 2"/>
+    <path d="M 242.462118 41.472 
 L 242.462118 41.472 
-" style="fill:none;stroke:#fff200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 242.462118 41.472 
-L 244.996724 56.06554 
-" style="fill:none;stroke:#fff200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 244.996724 56.06554 
-L 247.028752 70.723042 
-" style="fill:none;stroke:#ffeb00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 247.028752 70.723042 
-L 247.028752 70.723042 
-" style="fill:none;stroke:#ffe400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 247.028752 70.723042 
-L 247.885882 82.654588 
-" style="fill:none;stroke:#ffe400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 247.885882 82.654588 
-L 247.885882 82.654588 
-" style="fill:none;stroke:#ffdf00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 247.885882 82.654588 
-L 247.717049 90.703206 
-" style="fill:none;stroke:#ffdf00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 247.717049 90.703206 
-L 247.717049 90.703206 
-" style="fill:none;stroke:#ffdc00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 225.656471 41.472 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #fff200; stroke-width: 2"/>
+    <path d="M 242.462118 41.472 
+L 244.996501 56.065514 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #fff200; stroke-width: 2"/>
+    <path d="M 244.996501 56.065514 
+L 247.029731 70.723379 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffeb00; stroke-width: 2"/>
+    <path d="M 247.029731 70.723379 
+L 247.029731 70.723379 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe400; stroke-width: 2"/>
+    <path d="M 247.029731 70.723379 
+L 247.888732 82.652307 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe400; stroke-width: 2"/>
+    <path d="M 247.888732 82.652307 
+L 247.888732 82.652307 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdf00; stroke-width: 2"/>
+    <path d="M 247.888732 82.652307 
+L 247.71895 90.706596 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdf00; stroke-width: 2"/>
+    <path d="M 247.71895 90.706596 
+L 247.71895 90.706596 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdc00; stroke-width: 2"/>
+    <path d="M 225.656471 41.472 
 L 225.656471 41.472 
-" style="fill:none;stroke:#fffb00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 225.656471 41.472 
-L 229.257181 55.870357 
-" style="fill:none;stroke:#fffb00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 229.257181 55.870357 
-L 232.858166 70.268496 
-" style="fill:none;stroke:#fff400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 208.850824 41.472 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #fffb00; stroke-width: 2"/>
+    <path d="M 225.656471 41.472 
+L 229.258679 55.870133 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #fffb00; stroke-width: 2"/>
+    <path d="M 229.258679 55.870133 
+L 232.861616 70.268089 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #fff400; stroke-width: 2"/>
+    <path d="M 208.850824 41.472 
 L 208.850824 41.472 
-" style="fill:none;stroke:#ffff00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 208.850824 41.472 
-L 212.872868 55.772704 
-" style="fill:none;stroke:#ffff00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 212.872868 55.772704 
-L 217.193082 69.997696 
-" style="fill:none;stroke:#fff900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 217.193082 69.997696 
-L 221.774886 84.151735 
-" style="fill:none;stroke:#fff200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 221.774886 84.151735 
-L 226.384659 98.297246 
-" style="fill:none;stroke:#ffec00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 226.384659 98.297246 
-L 226.384659 98.297246 
-" style="fill:none;stroke:#ffe500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 226.384659 98.297246 
-L 228.449107 105.32959 
-" style="fill:none;stroke:#ffe500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 228.449107 105.32959 
-L 228.449107 105.32959 
-" style="fill:none;stroke:#ffe100;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 228.449107 105.32959 
-L 229.170201 108.281764 
-" style="fill:none;stroke:#ffe100;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 229.170201 108.281764 
-L 229.170201 108.281764 
-" style="fill:none;stroke:#ffe000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 229.170201 108.281764 
-L 229.658657 111.131049 
-" style="fill:none;stroke:#ffe000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 229.658657 111.131049 
-L 229.658657 111.131049 
-" style="fill:none;stroke:#ffde00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 192.045176 41.472 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffff00; stroke-width: 2"/>
+    <path d="M 208.850824 41.472 
+L 212.874259 55.772366 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffff00; stroke-width: 2"/>
+    <path d="M 212.874259 55.772366 
+L 217.196037 69.996965 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #fff900; stroke-width: 2"/>
+    <path d="M 217.196037 69.996965 
+L 221.779443 84.15061 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #fff200; stroke-width: 2"/>
+    <path d="M 221.779443 84.15061 
+L 226.392731 98.295887 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffec00; stroke-width: 2"/>
+    <path d="M 226.392731 98.295887 
+L 226.392731 98.295887 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe500; stroke-width: 2"/>
+    <path d="M 226.392731 98.295887 
+L 228.456759 105.312987 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe500; stroke-width: 2"/>
+    <path d="M 228.456759 105.312987 
+L 228.456759 105.312987 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe100; stroke-width: 2"/>
+    <path d="M 228.456759 105.312987 
+L 229.179402 108.26027 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe100; stroke-width: 2"/>
+    <path d="M 229.179402 108.26027 
+L 229.179402 108.26027 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe000; stroke-width: 2"/>
+    <path d="M 229.179402 108.26027 
+L 229.670832 111.094286 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe000; stroke-width: 2"/>
+    <path d="M 229.670832 111.094286 
+L 229.670832 111.094286 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 192.045176 41.472 
 L 192.045176 41.472 
-" style="fill:none;stroke:#ffff00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 192.045176 41.472 
-L 195.943064 55.802124 
-" style="fill:none;stroke:#ffff00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 195.943064 55.802124 
-L 200.246839 70.030629 
-" style="fill:none;stroke:#fffa00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 200.246839 70.030629 
-L 205.039362 84.122099 
-" style="fill:none;stroke:#fff500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 205.039362 84.122099 
-L 210.42625 98.024747 
-" style="fill:none;stroke:#ffef00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 210.42625 98.024747 
-L 216.569542 111.64909 
-" style="fill:none;stroke:#ffe900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 216.569542 111.64909 
-L 216.569542 111.64909 
-" style="fill:none;stroke:#ffe300;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 175.239529 41.472 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffff00; stroke-width: 2"/>
+    <path d="M 192.045176 41.472 
+L 195.94396 55.801935 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffff00; stroke-width: 2"/>
+    <path d="M 195.94396 55.801935 
+L 200.248813 70.030152 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #fffa00; stroke-width: 2"/>
+    <path d="M 200.248813 70.030152 
+L 205.041931 84.121483 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #fff500; stroke-width: 2"/>
+    <path d="M 205.041931 84.121483 
+L 210.430235 98.023632 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffef00; stroke-width: 2"/>
+    <path d="M 210.430235 98.023632 
+L 216.572989 111.648151 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe900; stroke-width: 2"/>
+    <path d="M 216.572989 111.648151 
+L 216.572989 111.648151 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe300; stroke-width: 2"/>
+    <path d="M 175.239529 41.472 
 L 175.239529 41.472 
-" style="fill:none;stroke:#fffb00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 175.239529 41.472 
-L 178.516555 55.93673 
-" style="fill:none;stroke:#fffb00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 178.516555 55.93673 
-L 182.111278 70.335587 
-" style="fill:none;stroke:#fff600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 182.111278 70.335587 
-L 186.088937 84.646193 
-" style="fill:none;stroke:#fff200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 186.088937 84.646193 
-L 190.543152 98.833667 
-" style="fill:none;stroke:#ffed00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 190.543152 98.833667 
-L 195.614511 112.837946 
-" style="fill:none;stroke:#ffe900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 195.614511 112.837946 
-L 195.614511 112.837946 
-" style="fill:none;stroke:#ffe400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 195.614511 112.837946 
-L 200.34556 123.687372 
-" style="fill:none;stroke:#ffe400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 200.34556 123.687372 
-L 200.34556 123.687372 
-" style="fill:none;stroke:#ffe000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 200.34556 123.687372 
-L 201.708879 126.224962 
-" style="fill:none;stroke:#ffe000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 201.708879 126.224962 
-L 201.708879 126.224962 
-" style="fill:none;stroke:#ffdf00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 158.433882 41.472 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #fffb00; stroke-width: 2"/>
+    <path d="M 175.239529 41.472 
+L 178.517546 55.936627 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #fffb00; stroke-width: 2"/>
+    <path d="M 178.517546 55.936627 
+L 182.112653 70.335429 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #fff600; stroke-width: 2"/>
+    <path d="M 182.112653 70.335429 
+L 186.092372 84.645713 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #fff200; stroke-width: 2"/>
+    <path d="M 186.092372 84.645713 
+L 190.548037 98.832922 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffed00; stroke-width: 2"/>
+    <path d="M 190.548037 98.832922 
+L 195.624657 112.836131 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe900; stroke-width: 2"/>
+    <path d="M 195.624657 112.836131 
+L 195.624657 112.836131 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe400; stroke-width: 2"/>
+    <path d="M 195.624657 112.836131 
+L 200.281431 123.50653 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe400; stroke-width: 2"/>
+    <path d="M 200.281431 123.50653 
+L 200.281431 123.50653 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe000; stroke-width: 2"/>
+    <path d="M 200.281431 123.50653 
+L 201.632529 126.042087 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe000; stroke-width: 2"/>
+    <path d="M 201.632529 126.042087 
+L 201.632529 126.042087 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdf00; stroke-width: 2"/>
+    <path d="M 201.632529 126.042087 
+L 202.764774 127.637539 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdf00; stroke-width: 2"/>
+    <path d="M 202.764774 127.637539 
+L 202.764774 127.637539 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 202.764774 127.637539 
+L 203.513471 128.177193 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 203.513471 128.177193 
+L 204.200682 128.310653 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 204.200682 128.310653 
+L 205.004185 128.173704 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 205.004185 128.173704 
+L 206.239331 127.687965 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffde00; stroke-width: 2"/>
+    <path d="M 158.433882 41.472 
 L 158.433882 41.472 
-" style="fill:none;stroke:#fff200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 158.433882 41.472 
-L 160.607736 56.116441 
-" style="fill:none;stroke:#fff200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 160.607736 56.116441 
-L 162.766701 70.76246 
-" style="fill:none;stroke:#ffee00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 162.766701 70.76246 
-L 164.770205 85.426987 
-" style="fill:none;stroke:#ffea00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 164.770205 85.426987 
-L 166.242798 100.141387 
-" style="fill:none;stroke:#ffe500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 166.242798 100.141387 
-L 166.242798 100.141387 
-" style="fill:none;stroke:#ffe000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 166.242798 100.141387 
-L 166.431377 110.554746 
-" style="fill:none;stroke:#ffe000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 166.431377 110.554746 
-L 166.431377 110.554746 
-" style="fill:none;stroke:#ffdc00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 166.431377 110.554746 
-L 165.610739 117.704054 
-" style="fill:none;stroke:#ffdc00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 165.610739 117.704054 
-L 165.610739 117.704054 
-" style="fill:none;stroke:#ffd900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 165.610739 117.704054 
-L 163.900348 123.312665 
-" style="fill:none;stroke:#ffd900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 163.900348 123.312665 
-L 160.809081 128.54265 
-" style="fill:none;stroke:#ffd600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 160.809081 128.54265 
-L 157.079983 132.414281 
-" style="fill:none;stroke:#ffd200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 157.079983 132.414281 
-L 152.566877 135.718147 
-" style="fill:none;stroke:#ffce00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 152.566877 135.718147 
-L 146.804193 138.91157 
-" style="fill:none;stroke:#ffca00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 146.804193 138.91157 
-L 139.258829 142.221693 
-" style="fill:none;stroke:#ffc400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 141.628235 41.472 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #fff200; stroke-width: 2"/>
+    <path d="M 158.433882 41.472 
+L 160.608473 56.116507 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #fff200; stroke-width: 2"/>
+    <path d="M 160.608473 56.116507 
+L 162.769388 70.762706 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffee00; stroke-width: 2"/>
+    <path d="M 162.769388 70.762706 
+L 164.775278 85.427455 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffea00; stroke-width: 2"/>
+    <path d="M 164.775278 85.427455 
+L 166.251199 100.142511 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe500; stroke-width: 2"/>
+    <path d="M 166.251199 100.142511 
+L 166.251199 100.142511 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe000; stroke-width: 2"/>
+    <path d="M 166.251199 100.142511 
+L 166.443879 110.547711 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe000; stroke-width: 2"/>
+    <path d="M 166.443879 110.547711 
+L 166.443879 110.547711 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdc00; stroke-width: 2"/>
+    <path d="M 166.443879 110.547711 
+L 165.627866 117.704984 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdc00; stroke-width: 2"/>
+    <path d="M 165.627866 117.704984 
+L 165.627866 117.704984 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd900; stroke-width: 2"/>
+    <path d="M 165.627866 117.704984 
+L 163.922624 123.310031 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd900; stroke-width: 2"/>
+    <path d="M 163.922624 123.310031 
+L 160.840612 128.534082 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd600; stroke-width: 2"/>
+    <path d="M 160.840612 128.534082 
+L 157.120577 132.405352 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd200; stroke-width: 2"/>
+    <path d="M 157.120577 132.405352 
+L 152.614544 135.709158 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffce00; stroke-width: 2"/>
+    <path d="M 152.614544 135.709158 
+L 146.869731 138.896532 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffca00; stroke-width: 2"/>
+    <path d="M 146.869731 138.896532 
+L 139.339988 142.204505 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc400; stroke-width: 2"/>
+    <path d="M 139.339988 142.204505 
+L 129.29756 145.819901 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbd00; stroke-width: 2"/>
+    <path d="M 129.29756 145.819901 
+L 115.80398 149.915078 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb100; stroke-width: 2"/>
+    <path d="M 115.80398 149.915078 
+L 100.534329 153.939912 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa000; stroke-width: 2"/>
+    <path d="M 100.534329 153.939912 
+L 85.151 157.575497 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8900; stroke-width: 2"/>
+    <path d="M 85.151 157.575497 
+L 69.692397 160.92481 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6f00; stroke-width: 2"/>
+    <path d="M 69.692397 160.92481 
+L 57.6 163.443102 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5100; stroke-width: 2"/>
+    <path d="M 141.628235 41.472 
 L 141.628235 41.472 
-" style="fill:none;stroke:#ffe500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 141.628235 41.472 
-L 142.231808 56.243505 
-" style="fill:none;stroke:#ffe500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 142.231808 56.243505 
-L 142.216702 71.022143 
-" style="fill:none;stroke:#ffe000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 142.216702 71.022143 
-L 141.024125 85.74676 
-" style="fill:none;stroke:#ffdb00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 141.024125 85.74676 
-L 141.024125 85.74676 
-" style="fill:none;stroke:#ffd400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 141.024125 85.74676 
-L 139.093917 95.344799 
-" style="fill:none;stroke:#ffd400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 139.093917 95.344799 
-L 139.093917 95.344799 
-" style="fill:none;stroke:#ffce00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 139.093917 95.344799 
-L 136.359627 103.155868 
-" style="fill:none;stroke:#ffce00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 136.359627 103.155868 
-L 132.264836 110.529742 
-" style="fill:none;stroke:#ffc900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 132.264836 110.529742 
-L 127.469724 116.370377 
-" style="fill:none;stroke:#ffc200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 127.469724 116.370377 
-L 121.954958 121.277535 
-" style="fill:none;stroke:#ffbb00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 121.954958 121.277535 
-L 115.453561 125.710813 
-" style="fill:none;stroke:#ffb200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 115.453561 125.710813 
-L 107.629378 129.922513 
-" style="fill:none;stroke:#ffa900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 107.629378 129.922513 
-L 98.082697 134.069306 
-" style="fill:none;stroke:#ff9d00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 98.082697 134.069306 
-L 86.247233 138.290889 
-" style="fill:none;stroke:#ff8d00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 86.247233 138.290889 
-L 71.507246 142.671185 
-" style="fill:none;stroke:#ff7800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 71.507246 142.671185 
-L 57.6 146.45553 
-" style="fill:none;stroke:#ff5b00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 124.822588 41.472 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe500; stroke-width: 2"/>
+    <path d="M 141.628235 41.472 
+L 142.232833 56.243848 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe500; stroke-width: 2"/>
+    <path d="M 142.232833 56.243848 
+L 142.219828 71.023316 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe000; stroke-width: 2"/>
+    <path d="M 142.219828 71.023316 
+L 141.029321 85.748867 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdb00; stroke-width: 2"/>
+    <path d="M 141.029321 85.748867 
+L 141.029321 85.748867 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd400; stroke-width: 2"/>
+    <path d="M 141.029321 85.748867 
+L 139.099791 95.351587 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd400; stroke-width: 2"/>
+    <path d="M 139.099791 95.351587 
+L 139.099791 95.351587 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffce00; stroke-width: 2"/>
+    <path d="M 139.099791 95.351587 
+L 136.366395 103.164383 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffce00; stroke-width: 2"/>
+    <path d="M 136.366395 103.164383 
+L 132.271027 110.540128 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc900; stroke-width: 2"/>
+    <path d="M 132.271027 110.540128 
+L 127.478859 116.378218 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc200; stroke-width: 2"/>
+    <path d="M 127.478859 116.378218 
+L 121.963289 121.286715 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbb00; stroke-width: 2"/>
+    <path d="M 121.963289 121.286715 
+L 115.460979 125.720499 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb200; stroke-width: 2"/>
+    <path d="M 115.460979 125.720499 
+L 107.63972 129.93041 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa900; stroke-width: 2"/>
+    <path d="M 107.63972 129.93041 
+L 98.087549 134.07933 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9d00; stroke-width: 2"/>
+    <path d="M 98.087549 134.07933 
+L 86.255942 138.298839 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8d00; stroke-width: 2"/>
+    <path d="M 86.255942 138.298839 
+L 71.512841 142.679719 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7800; stroke-width: 2"/>
+    <path d="M 71.512841 142.679719 
+L 57.6 146.465305 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5b00; stroke-width: 2"/>
+    <path d="M 124.822588 41.472 
 L 124.822588 41.472 
-" style="fill:none;stroke:#ffd400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 124.822588 41.472 
-L 123.457904 56.193383 
-" style="fill:none;stroke:#ffd400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 123.457904 56.193383 
-L 120.712199 70.732975 
-" style="fill:none;stroke:#ffcd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 120.712199 70.732975 
-L 120.712199 70.732975 
-" style="fill:none;stroke:#ffc400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 120.712199 70.732975 
-L 117.611679 80.45264 
-" style="fill:none;stroke:#ffc400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 117.611679 80.45264 
-L 113.08227 89.82743 
-" style="fill:none;stroke:#ffbd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 113.08227 89.82743 
-L 107.847789 97.324297 
-" style="fill:none;stroke:#ffb300;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 107.847789 97.324297 
-L 101.965173 103.535016 
-" style="fill:none;stroke:#ffa900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 101.965173 103.535016 
-L 95.267914 108.972114 
-" style="fill:none;stroke:#ff9f00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 95.267914 108.972114 
-L 87.513511 113.946396 
-" style="fill:none;stroke:#ff9200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 87.513511 113.946396 
-L 78.408218 118.648647 
-" style="fill:none;stroke:#ff8400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 78.408218 118.648647 
-L 67.56408 123.221665 
-" style="fill:none;stroke:#ff7200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 67.56408 123.221665 
-L 57.6 127.027571 
-" style="fill:none;stroke:#ff5b00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 108.016941 41.472 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd400; stroke-width: 2"/>
+    <path d="M 124.822588 41.472 
+L 123.458328 56.193563 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd400; stroke-width: 2"/>
+    <path d="M 123.458328 56.193563 
+L 120.713355 70.733741 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffcd00; stroke-width: 2"/>
+    <path d="M 120.713355 70.733741 
+L 120.713355 70.733741 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc400; stroke-width: 2"/>
+    <path d="M 120.713355 70.733741 
+L 117.612844 80.454175 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc400; stroke-width: 2"/>
+    <path d="M 117.612844 80.454175 
+L 113.086012 89.826863 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbd00; stroke-width: 2"/>
+    <path d="M 113.086012 89.826863 
+L 107.851358 97.325975 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb300; stroke-width: 2"/>
+    <path d="M 107.851358 97.325975 
+L 101.968891 103.53812 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa900; stroke-width: 2"/>
+    <path d="M 101.968891 103.53812 
+L 95.273441 108.974545 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9f00; stroke-width: 2"/>
+    <path d="M 95.273441 108.974545 
+L 87.522161 113.9475 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9200; stroke-width: 2"/>
+    <path d="M 87.522161 113.9475 
+L 78.414476 118.651709 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8400; stroke-width: 2"/>
+    <path d="M 78.414476 118.651709 
+L 67.573009 123.224054 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7200; stroke-width: 2"/>
+    <path d="M 67.573009 123.224054 
+L 57.6 127.033918 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5b00; stroke-width: 2"/>
+    <path d="M 108.016941 41.472 
 L 108.016941 41.472 
-" style="fill:none;stroke:#ffbf00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 108.016941 41.472 
-L 104.445057 55.855538 
-" style="fill:none;stroke:#ffbf00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 104.445057 55.855538 
-L 104.445057 55.855538 
-" style="fill:none;stroke:#ffb500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 104.445057 55.855538 
-L 100.641007 65.963019 
-" style="fill:none;stroke:#ffb500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 100.641007 65.963019 
-L 95.482823 75.639048 
-" style="fill:none;stroke:#ffab00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 95.482823 75.639048 
-L 89.648374 83.598001 
-" style="fill:none;stroke:#ff9f00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 89.648374 83.598001 
-L 83.151837 90.33321 
-" style="fill:none;stroke:#ff9300;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 83.151837 90.33321 
-L 75.838397 96.27601 
-" style="fill:none;stroke:#ff8500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 75.838397 96.27601 
-L 67.495053 101.702994 
-" style="fill:none;stroke:#ff7600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 67.495053 101.702994 
-L 57.849205 106.799629 
-" style="fill:none;stroke:#ff6300;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 57.849205 106.799629 
-L 57.6 106.91862 
-" style="fill:none;stroke:#ff4d00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 91.211294 41.472 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbf00; stroke-width: 2"/>
+    <path d="M 108.016941 41.472 
+L 104.44616 55.856714 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbf00; stroke-width: 2"/>
+    <path d="M 104.44616 55.856714 
+L 104.44616 55.856714 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb500; stroke-width: 2"/>
+    <path d="M 104.44616 55.856714 
+L 100.642741 65.963842 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb500; stroke-width: 2"/>
+    <path d="M 100.642741 65.963842 
+L 95.485952 75.639213 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffab00; stroke-width: 2"/>
+    <path d="M 95.485952 75.639213 
+L 89.650661 83.600307 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9f00; stroke-width: 2"/>
+    <path d="M 89.650661 83.600307 
+L 83.153187 90.336385 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9300; stroke-width: 2"/>
+    <path d="M 83.153187 90.336385 
+L 75.840406 96.279019 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8500; stroke-width: 2"/>
+    <path d="M 75.840406 96.279019 
+L 67.495795 101.707124 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7600; stroke-width: 2"/>
+    <path d="M 67.495795 101.707124 
+L 57.849875 106.803822 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6300; stroke-width: 2"/>
+    <path d="M 57.849875 106.803822 
+L 57.6 106.923126 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4d00; stroke-width: 2"/>
+    <path d="M 91.211294 41.472 
 L 91.211294 41.472 
-" style="fill:none;stroke:#ffa600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 91.211294 41.472 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa600; stroke-width: 2"/>
+    <path d="M 91.211294 41.472 
 L 91.211294 41.472 
-" style="fill:none;stroke:#ffa600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 91.211294 41.472 
-L 86.98113 52.039772 
-" style="fill:none;stroke:#ffa600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 86.98113 52.039772 
-L 81.408464 62.201056 
-" style="fill:none;stroke:#ff9b00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 81.408464 62.201056 
-L 75.168777 70.682413 
-" style="fill:none;stroke:#ff8d00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 75.168777 70.682413 
-L 68.271741 77.923724 
-" style="fill:none;stroke:#ff7e00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 68.271741 77.923724 
-L 60.577084 84.32656 
-" style="fill:none;stroke:#ff6e00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 60.577084 84.32656 
-L 57.6 86.544152 
-" style="fill:none;stroke:#ff5c00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 88.202079 143.223356 
-L 72.975253 147.384372 
-" style="fill:none;stroke:#ff7a00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 72.975253 147.384372 
-L 57.6 151.047529 
-" style="fill:none;stroke:#ff5c00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 57.6 151.047529 
-L 57.6 151.047529 
-" style="fill:none;stroke:#ff3c00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 266.029465 218.917086 
-L 251.87671 213.846217 
-" style="fill:none;stroke:#ff9b00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 251.87671 213.846217 
-L 238.761422 208.201614 
-" style="fill:none;stroke:#ffa900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 238.761422 208.201614 
-L 225.167333 201.146685 
-" style="fill:none;stroke:#ffb400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 225.167333 201.146685 
-L 211.95718 192.979584 
-" style="fill:none;stroke:#ffbd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 211.95718 192.979584 
-L 199.195978 184.195279 
-" style="fill:none;stroke:#ffc400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 199.195978 184.195279 
-L 190.624787 178.362824 
-" style="fill:none;stroke:#ffc900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 190.624787 178.362824 
-L 183.462706 174.105142 
-" style="fill:none;stroke:#ffca00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 183.462706 174.105142 
-L 176.499196 170.867601 
-" style="fill:none;stroke:#ffca00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 176.499196 170.867601 
-L 168.68497 168.461587 
-" style="fill:none;stroke:#ffc900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 168.68497 168.461587 
-L 160.647999 167.231516 
-" style="fill:none;stroke:#ffc700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 160.647999 167.231516 
-L 160.647999 167.231516 
-" style="fill:none;stroke:#ffc300;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 160.647999 167.231516 
-L 151.287216 166.995585 
-" style="fill:none;stroke:#ffc300;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 151.287216 166.995585 
-L 151.287216 166.995585 
-" style="fill:none;stroke:#ffbd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 151.287216 166.995585 
-L 135.499747 168.30328 
-" style="fill:none;stroke:#ffbd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 135.499747 168.30328 
-L 119.840043 170.692981 
-" style="fill:none;stroke:#ffaf00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 119.840043 170.692981 
-L 104.258216 173.504409 
-" style="fill:none;stroke:#ff9d00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 104.258216 173.504409 
-L 88.706299 176.458318 
-" style="fill:none;stroke:#ff8700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 88.706299 176.458318 
-L 73.157894 179.428363 
-" style="fill:none;stroke:#ff6e00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 73.157894 179.428363 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa600; stroke-width: 2"/>
+    <path d="M 91.211294 41.472 
+L 86.982675 52.038296 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa600; stroke-width: 2"/>
+    <path d="M 86.982675 52.038296 
+L 81.410208 62.201099 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9b00; stroke-width: 2"/>
+    <path d="M 81.410208 62.201099 
+L 75.169508 70.684674 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8d00; stroke-width: 2"/>
+    <path d="M 75.169508 70.684674 
+L 68.272527 77.925946 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7e00; stroke-width: 2"/>
+    <path d="M 68.272527 77.925946 
+L 60.577593 84.329185 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6e00; stroke-width: 2"/>
+    <path d="M 60.577593 84.329185 
+L 57.6 86.547079 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5c00; stroke-width: 2"/>
+    <path d="M 266.005438 218.914337 
+L 251.857363 213.843943 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9b00; stroke-width: 2"/>
+    <path d="M 251.857363 213.843943 
+L 238.732458 208.19336 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa900; stroke-width: 2"/>
+    <path d="M 238.732458 208.19336 
+L 225.160094 201.147803 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb400; stroke-width: 2"/>
+    <path d="M 225.160094 201.147803 
+L 211.950249 192.980019 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbd00; stroke-width: 2"/>
+    <path d="M 211.950249 192.980019 
+L 199.189527 184.19473 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc400; stroke-width: 2"/>
+    <path d="M 199.189527 184.19473 
+L 190.615713 178.360824 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc900; stroke-width: 2"/>
+    <path d="M 190.615713 178.360824 
+L 183.45754 174.104635 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffca00; stroke-width: 2"/>
+    <path d="M 183.45754 174.104635 
+L 176.496875 170.867407 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffca00; stroke-width: 2"/>
+    <path d="M 176.496875 170.867407 
+L 168.684096 168.460711 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc900; stroke-width: 2"/>
+    <path d="M 168.684096 168.460711 
+L 160.646218 167.230093 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc700; stroke-width: 2"/>
+    <path d="M 160.646218 167.230093 
+L 160.646218 167.230093 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc300; stroke-width: 2"/>
+    <path d="M 160.646218 167.230093 
+L 151.287706 166.994281 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc300; stroke-width: 2"/>
+    <path d="M 151.287706 166.994281 
+L 151.287706 166.994281 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbd00; stroke-width: 2"/>
+    <path d="M 151.287706 166.994281 
+L 135.499547 168.30214 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbd00; stroke-width: 2"/>
+    <path d="M 135.499547 168.30214 
+L 119.839886 170.692109 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffaf00; stroke-width: 2"/>
+    <path d="M 119.839886 170.692109 
+L 104.258102 173.503878 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9d00; stroke-width: 2"/>
+    <path d="M 104.258102 173.503878 
+L 88.706222 176.457965 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8700; stroke-width: 2"/>
+    <path d="M 88.706222 176.457965 
+L 73.157866 179.428233 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6e00; stroke-width: 2"/>
+    <path d="M 73.157866 179.428233 
 L 57.6 182.354824 
-" style="fill:none;stroke:#ff5000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 57.6 182.354824 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5000; stroke-width: 2"/>
+    <path d="M 57.6 182.354824 
 L 57.6 182.354824 
-" style="fill:none;stroke:#ff3000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 180.969583 186.579293 
-L 172.014601 184.104861 
-" style="fill:none;stroke:#ffc500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 172.014601 184.104861 
-L 161.50832 182.571204 
-" style="fill:none;stroke:#ffc300;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 161.50832 182.571204 
-L 151.187406 182.312993 
-" style="fill:none;stroke:#ffbe00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 151.187406 182.312993 
-L 151.187406 182.312993 
-" style="fill:none;stroke:#ffb700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 151.187406 182.312993 
-L 135.388196 183.489194 
-" style="fill:none;stroke:#ffb700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 135.388196 183.489194 
-L 119.716378 185.799302 
-" style="fill:none;stroke:#ffa900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 119.716378 185.799302 
-L 104.141613 188.641672 
-" style="fill:none;stroke:#ff9700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 104.141613 188.641672 
-L 88.616306 191.713975 
-" style="fill:none;stroke:#ff8100;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 88.616306 191.713975 
-L 73.108512 194.862787 
-" style="fill:none;stroke:#ff6800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 73.108512 194.862787 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff3000; stroke-width: 2"/>
+    <path d="M 180.966455 186.578543 
+L 172.013113 184.103895 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc500; stroke-width: 2"/>
+    <path d="M 172.013113 184.103895 
+L 161.506675 182.569938 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc300; stroke-width: 2"/>
+    <path d="M 161.506675 182.569938 
+L 151.187806 182.311898 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbe00; stroke-width: 2"/>
+    <path d="M 151.187806 182.311898 
+L 151.187806 182.311898 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb700; stroke-width: 2"/>
+    <path d="M 151.187806 182.311898 
+L 135.388043 183.488167 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb700; stroke-width: 2"/>
+    <path d="M 135.388043 183.488167 
+L 119.716234 185.798533 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa900; stroke-width: 2"/>
+    <path d="M 119.716234 185.798533 
+L 104.141502 188.641182 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9700; stroke-width: 2"/>
+    <path d="M 104.141502 188.641182 
+L 88.616226 191.713626 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8100; stroke-width: 2"/>
+    <path d="M 88.616226 191.713626 
+L 73.108483 194.862661 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6800; stroke-width: 2"/>
+    <path d="M 73.108483 194.862661 
 L 57.6 198.008471 
-" style="fill:none;stroke:#ff4a00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 57.6 198.008471 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4a00; stroke-width: 2"/>
+    <path d="M 57.6 198.008471 
 L 57.6 198.008471 
-" style="fill:none;stroke:#ff2a00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 193.132582 199.02755 
-L 183.500942 196.334552 
-" style="fill:none;stroke:#ffc200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 183.500942 196.334552 
-L 173.502634 194.526153 
-" style="fill:none;stroke:#ffc200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 173.502634 194.526153 
-L 161.774335 193.764923 
-" style="fill:none;stroke:#ffbf00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 161.774335 193.764923 
-L 150.421218 194.25843 
-" style="fill:none;stroke:#ffba00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 150.421218 194.25843 
-L 150.421218 194.25843 
-" style="fill:none;stroke:#ffb200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 150.421218 194.25843 
-L 134.71455 196.281787 
-" style="fill:none;stroke:#ffb200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 134.71455 196.281787 
-L 119.16873 199.24395 
-" style="fill:none;stroke:#ffa300;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 119.16873 199.24395 
-L 103.728919 202.66652 
-" style="fill:none;stroke:#ff9100;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 103.728919 202.66652 
-L 88.341954 206.292551 
-" style="fill:none;stroke:#ff7b00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 88.341954 206.292551 
-L 72.97273 209.983585 
-" style="fill:none;stroke:#ff6100;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 72.97273 209.983585 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff2a00; stroke-width: 2"/>
+    <path d="M 193.127224 199.025795 
+L 183.498738 196.333772 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc200; stroke-width: 2"/>
+    <path d="M 183.498738 196.333772 
+L 173.500752 194.524951 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc200; stroke-width: 2"/>
+    <path d="M 173.500752 194.524951 
+L 161.772759 193.763649 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbf00; stroke-width: 2"/>
+    <path d="M 161.772759 193.763649 
+L 150.421103 194.257136 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffba00; stroke-width: 2"/>
+    <path d="M 150.421103 194.257136 
+L 150.421103 194.257136 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb200; stroke-width: 2"/>
+    <path d="M 150.421103 194.257136 
+L 134.714342 196.280672 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb200; stroke-width: 2"/>
+    <path d="M 134.714342 196.280672 
+L 119.168564 199.243257 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa300; stroke-width: 2"/>
+    <path d="M 119.168564 199.243257 
+L 103.728795 202.66603 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9100; stroke-width: 2"/>
+    <path d="M 103.728795 202.66603 
+L 88.34186 206.292174 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7b00; stroke-width: 2"/>
+    <path d="M 88.34186 206.292174 
+L 72.9727 209.983464 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6100; stroke-width: 2"/>
+    <path d="M 72.9727 209.983464 
 L 57.6 213.662118 
-" style="fill:none;stroke:#ff4400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 57.6 213.662118 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4400; stroke-width: 2"/>
+    <path d="M 57.6 213.662118 
 L 57.6 213.662118 
-" style="fill:none;stroke:#ff2400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 232.053969 218.191252 
-L 216.771197 214.221292 
-" style="fill:none;stroke:#ffb400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 216.771197 214.221292 
-L 205.004147 211.519457 
-" style="fill:none;stroke:#ffbb00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 205.004147 211.519457 
-L 194.634599 209.768169 
-" style="fill:none;stroke:#ffbe00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 194.634599 209.768169 
-L 184.406122 208.910807 
-" style="fill:none;stroke:#ffbe00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 184.406122 208.910807 
-L 173.108829 209.126459 
-" style="fill:none;stroke:#ffbd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 173.108829 209.126459 
-L 162.164024 210.48245 
-" style="fill:none;stroke:#ffb900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 162.164024 210.48245 
-L 162.164024 210.48245 
-" style="fill:none;stroke:#ffb300;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 162.164024 210.48245 
-L 146.73095 213.8418 
-" style="fill:none;stroke:#ffb300;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 146.73095 213.8418 
-L 131.605503 218.301384 
-" style="fill:none;stroke:#ffa700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 131.605503 218.301384 
-L 116.687707 223.343714 
-" style="fill:none;stroke:#ff9800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 116.687707 223.343714 
-L 101.881914 228.668434 
-" style="fill:none;stroke:#ff8500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 101.881914 228.668434 
-L 87.123183 234.106372 
-" style="fill:none;stroke:#ff6e00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 87.123183 234.106372 
-L 72.370786 239.559511 
-" style="fill:none;stroke:#ff5500;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 72.370786 239.559511 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff2400; stroke-width: 2"/>
+    <path d="M 232.048345 218.190531 
+L 216.765455 214.219761 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb400; stroke-width: 2"/>
+    <path d="M 216.765455 214.219761 
+L 204.997345 211.517426 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbb00; stroke-width: 2"/>
+    <path d="M 204.997345 211.517426 
+L 194.630218 209.766437 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbe00; stroke-width: 2"/>
+    <path d="M 194.630218 209.766437 
+L 184.400715 208.908866 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbe00; stroke-width: 2"/>
+    <path d="M 184.400715 208.908866 
+L 173.10633 209.124563 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbd00; stroke-width: 2"/>
+    <path d="M 173.10633 209.124563 
+L 162.163436 210.480312 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb900; stroke-width: 2"/>
+    <path d="M 162.163436 210.480312 
+L 162.163436 210.480312 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb300; stroke-width: 2"/>
+    <path d="M 162.163436 210.480312 
+L 146.730256 213.839728 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb300; stroke-width: 2"/>
+    <path d="M 146.730256 213.839728 
+L 131.604929 218.299712 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa700; stroke-width: 2"/>
+    <path d="M 131.604929 218.299712 
+L 116.687336 223.342584 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9800; stroke-width: 2"/>
+    <path d="M 116.687336 223.342584 
+L 101.881736 228.667847 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8500; stroke-width: 2"/>
+    <path d="M 101.881736 228.667847 
+L 87.12312 234.106144 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6e00; stroke-width: 2"/>
+    <path d="M 87.12312 234.106144 
+L 72.370772 239.559458 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5500; stroke-width: 2"/>
+    <path d="M 72.370772 239.559458 
 L 57.6 244.969412 
-" style="fill:none;stroke:#ff3800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 57.6 244.969412 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff3800; stroke-width: 2"/>
+    <path d="M 57.6 244.969412 
 L 57.6 244.969412 
-" style="fill:none;stroke:#ff1800;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 100.399429 241.187852 
-L 86.134058 247.668092 
-" style="fill:none;stroke:#ff6700;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 86.134058 247.668092 
-L 71.876222 254.163137 
-" style="fill:none;stroke:#ff4e00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 71.876222 254.163137 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff1800; stroke-width: 2"/>
+    <path d="M 100.399316 241.187472 
+L 86.134014 247.667933 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6700; stroke-width: 2"/>
+    <path d="M 86.134014 247.667933 
+L 71.876212 254.1631 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4e00; stroke-width: 2"/>
+    <path d="M 71.876212 254.1631 
 L 57.6 260.623059 
-" style="fill:none;stroke:#ff3100;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 57.6 260.623059 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff3100; stroke-width: 2"/>
+    <path d="M 57.6 260.623059 
 L 57.6 260.623059 
-" style="fill:none;stroke:#ff1200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 98.57308 253.683756 
-L 84.904184 261.197212 
-" style="fill:none;stroke:#ff6000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 84.904184 261.197212 
-L 71.255401 268.742067 
-" style="fill:none;stroke:#ff4600;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 71.255401 268.742067 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff1200; stroke-width: 2"/>
+    <path d="M 98.572802 253.682768 
+L 84.904012 261.196607 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6000; stroke-width: 2"/>
+    <path d="M 84.904012 261.196607 
+L 71.255359 268.741914 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4600; stroke-width: 2"/>
+    <path d="M 71.255359 268.741914 
 L 57.6 276.276706 
-" style="fill:none;stroke:#ff2a00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 57.6 276.276706 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff2a00; stroke-width: 2"/>
+    <path d="M 57.6 276.276706 
 L 57.6 276.276706 
-" style="fill:none;stroke:#ff0c00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 175.239529 88.432941 
-L 178.297063 102.939 
-" style="fill:none;stroke:#ffe900;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 178.297063 102.939 
-L 180.717153 117.537146 
-" style="fill:none;stroke:#ffe400;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 180.717153 117.537146 
-L 180.717153 117.537146 
-" style="fill:none;stroke:#ffdf00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 180.717153 117.537146 
-L 181.034128 122.559402 
-" style="fill:none;stroke:#ffdf00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 181.034128 122.559402 
-L 181.034128 122.559402 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 181.034128 122.559402 
-L 180.594315 127.20429 
-" style="fill:none;stroke:#ffdd00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 180.594315 127.20429 
-L 180.594315 127.20429 
-" style="fill:none;stroke:#ffdc00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 276.073412 151.047529 
-L 263.841175 141.641118 
-" style="fill:none;stroke:#ffaa00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 263.841175 141.641118 
-L 252.141728 131.658414 
-" style="fill:none;stroke:#ffbb00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 148.072032 114.742255 
-L 144.596067 120.468764 
-" style="fill:none;stroke:#ffcf00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 144.596067 120.468764 
-L 139.256183 126.208974 
-" style="fill:none;stroke:#ffca00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 139.256183 126.208974 
-L 132.978451 130.886489 
-" style="fill:none;stroke:#ffc300;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 132.978451 130.886489 
-L 132.978451 130.886489 
-" style="fill:none;stroke:#ffbb00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 132.978451 130.886489 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff0c00; stroke-width: 2"/>
+    <path d="M 343.296 232.680792 
+L 342.003328 232.435735 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff1c00; stroke-width: 2"/>
+    <path d="M 342.003328 232.435735 
+L 326.490353 229.315765 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff1f00; stroke-width: 2"/>
+    <path d="M 326.490353 229.315765 
+L 311.077668 225.793651 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4000; stroke-width: 2"/>
+    <path d="M 343.296 218.329369 
+L 341.688946 217.91148 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff2200; stroke-width: 2"/>
+    <path d="M 341.688946 217.91148 
+L 326.490353 213.662118 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff2500; stroke-width: 2"/>
+    <path d="M 326.490353 213.662118 
+L 311.513229 208.782096 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4600; stroke-width: 2"/>
+    <path d="M 311.513229 208.782096 
+L 296.860933 203.11797 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6200; stroke-width: 2"/>
+    <path d="M 296.860933 203.11797 
+L 282.685409 196.492979 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7b00; stroke-width: 2"/>
+    <path d="M 282.685409 196.492979 
+L 269.195549 188.734782 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9100; stroke-width: 2"/>
+    <path d="M 269.195549 188.734782 
+L 257.735235 180.594888 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa300; stroke-width: 2"/>
+    <path d="M 257.735235 180.594888 
+L 247.897194 172.048158 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb100; stroke-width: 2"/>
+    <path d="M 247.897194 172.048158 
+L 239.26866 162.953181 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbc00; stroke-width: 2"/>
+    <path d="M 239.26866 162.953181 
+L 231.589349 153.169972 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc500; stroke-width: 2"/>
+    <path d="M 231.589349 153.169972 
+L 224.746461 142.582182 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffcd00; stroke-width: 2"/>
+    <path d="M 224.746461 142.582182 
+L 219.059384 131.266977 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd400; stroke-width: 2"/>
+    <path d="M 219.059384 131.266977 
+L 219.059384 131.266977 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffda00; stroke-width: 2"/>
+    <path d="M 219.059384 131.266977 
+L 218.108327 128.914679 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffda00; stroke-width: 2"/>
+    <path d="M 218.108327 128.914679 
+L 218.108327 128.914679 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdc00; stroke-width: 2"/>
+    <path d="M 343.296 203.703307 
+L 341.387263 203.097676 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff2700; stroke-width: 2"/>
+    <path d="M 341.387263 203.097676 
+L 326.490353 198.008471 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff2c00; stroke-width: 2"/>
+    <path d="M 326.490353 198.008471 
+L 311.902336 192.198839 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4c00; stroke-width: 2"/>
+    <path d="M 311.902336 192.198839 
+L 297.742816 185.538563 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6800; stroke-width: 2"/>
+    <path d="M 343.296 188.760945 
+L 341.156999 187.99428 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff2d00; stroke-width: 2"/>
+    <path d="M 341.156999 187.99428 
+L 326.490353 182.354824 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff3200; stroke-width: 2"/>
+    <path d="M 326.490353 182.354824 
+L 312.166196 176.00095 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5200; stroke-width: 2"/>
+    <path d="M 312.166196 176.00095 
+L 298.287438 168.844591 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6e00; stroke-width: 2"/>
+    <path d="M 298.287438 168.844591 
+L 284.968349 160.821834 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8600; stroke-width: 2"/>
+    <path d="M 284.968349 160.821834 
+L 272.312967 151.917239 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9c00; stroke-width: 2"/>
+    <path d="M 272.312967 151.917239 
+L 260.368199 142.196427 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffae00; stroke-width: 2"/>
+    <path d="M 260.368199 142.196427 
+L 249.016684 131.870675 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbe00; stroke-width: 2"/>
+    <path d="M 343.296 173.452097 
+L 341.042191 172.594972 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff3300; stroke-width: 2"/>
+    <path d="M 341.042191 172.594972 
+L 326.490353 166.701176 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff3800; stroke-width: 2"/>
+    <path d="M 326.490353 166.701176 
+L 312.258172 160.167627 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5800; stroke-width: 2"/>
+    <path d="M 312.258172 160.167627 
+L 298.411589 152.952665 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7400; stroke-width: 2"/>
+    <path d="M 298.411589 152.952665 
+L 285.002645 145.05343 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8c00; stroke-width: 2"/>
+    <path d="M 285.002645 145.05343 
+L 272.029689 136.543887 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa200; stroke-width: 2"/>
+    <path d="M 343.296 157.713139 
+L 341.075996 156.87163 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff3900; stroke-width: 2"/>
+    <path d="M 341.075996 156.87163 
+L 326.490353 151.047529 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff3e00; stroke-width: 2"/>
+    <path d="M 326.490353 151.047529 
+L 312.149 144.719955 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5e00; stroke-width: 2"/>
+    <path d="M 312.149 144.719955 
+L 298.066427 137.906268 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7a00; stroke-width: 2"/>
+    <path d="M 343.296 141.465305 
+L 341.279104 140.759186 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff3f00; stroke-width: 2"/>
+    <path d="M 341.279104 140.759186 
+L 326.490353 135.393882 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4400; stroke-width: 2"/>
+    <path d="M 326.490353 135.393882 
+L 311.82675 129.738023 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6400; stroke-width: 2"/>
+    <path d="M 311.82675 129.738023 
+L 297.242384 123.90677 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8000; stroke-width: 2"/>
+    <path d="M 297.242384 123.90677 
+L 282.612895 118.180181 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9900; stroke-width: 2"/>
+    <path d="M 282.612895 118.180181 
+L 282.612895 118.180181 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffaf00; stroke-width: 2"/>
+    <path d="M 282.612895 118.180181 
+L 269.97437 113.889499 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffaf00; stroke-width: 2"/>
+    <path d="M 269.97437 113.889499 
+L 269.97437 113.889499 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbf00; stroke-width: 2"/>
+    <path d="M 269.97437 113.889499 
+L 262.413182 111.923872 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbf00; stroke-width: 2"/>
+    <path d="M 262.413182 111.923872 
+L 262.413182 111.923872 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc700; stroke-width: 2"/>
+    <path d="M 343.296 124.606225 
+L 341.645733 124.131518 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4600; stroke-width: 2"/>
+    <path d="M 341.645733 124.131518 
+L 326.490353 119.740235 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4a00; stroke-width: 2"/>
+    <path d="M 326.490353 119.740235 
+L 311.324442 115.382681 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff6a00; stroke-width: 2"/>
+    <path d="M 311.324442 115.382681 
+L 296.065959 111.324613 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8700; stroke-width: 2"/>
+    <path d="M 296.065959 111.324613 
+L 280.588777 108.146721 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa000; stroke-width: 2"/>
+    <path d="M 280.588777 108.146721 
+L 280.588777 108.146721 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb500; stroke-width: 2"/>
+    <path d="M 280.588777 108.146721 
+L 271.372041 106.981695 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb500; stroke-width: 2"/>
+    <path d="M 271.372041 106.981695 
+L 271.372041 106.981695 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc000; stroke-width: 2"/>
+    <path d="M 343.296 107.003992 
+L 342.094332 106.783285 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4d00; stroke-width: 2"/>
+    <path d="M 342.094332 106.783285 
+L 326.490353 104.086588 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4f00; stroke-width: 2"/>
+    <path d="M 326.490353 104.086588 
+L 310.804305 101.867517 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7000; stroke-width: 2"/>
+    <path d="M 343.296 88.480269 
+L 342.356265 88.456763 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5400; stroke-width: 2"/>
+    <path d="M 342.356265 88.456763 
+L 326.490353 88.432941 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5600; stroke-width: 2"/>
+    <path d="M 326.490353 88.432941 
+L 310.66152 89.295856 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7600; stroke-width: 2"/>
+    <path d="M 310.66152 89.295856 
+L 310.66152 89.295856 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9200; stroke-width: 2"/>
+    <path d="M 310.66152 89.295856 
+L 297.458182 90.89166 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9200; stroke-width: 2"/>
+    <path d="M 343.296 68.794776 
+L 341.854659 69.098146 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5b00; stroke-width: 2"/>
+    <path d="M 341.854659 69.098146 
+L 326.490353 72.779294 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5e00; stroke-width: 2"/>
+    <path d="M 326.490353 72.779294 
+L 311.399146 77.314711 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7c00; stroke-width: 2"/>
+    <path d="M 292.879059 213.662118 
+L 278.266353 207.913681 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7d00; stroke-width: 2"/>
+    <path d="M 278.266353 207.913681 
+L 264.206258 201.085632 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9200; stroke-width: 2"/>
+    <path d="M 264.206258 201.085632 
+L 251.623385 193.433999 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa300; stroke-width: 2"/>
+    <path d="M 251.623385 193.433999 
+L 241.057231 185.420429 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb100; stroke-width: 2"/>
+    <path d="M 241.057231 185.420429 
+L 231.96196 176.929894 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbc00; stroke-width: 2"/>
+    <path d="M 231.96196 176.929894 
+L 223.899677 167.767179 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc400; stroke-width: 2"/>
+    <path d="M 223.899677 167.767179 
+L 216.577303 157.717065 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffcb00; stroke-width: 2"/>
+    <path d="M 216.577303 157.717065 
+L 209.776284 146.492083 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd100; stroke-width: 2"/>
+    <path d="M 175.239529 88.432941 
+L 178.300269 102.939173 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe900; stroke-width: 2"/>
+    <path d="M 178.300269 102.939173 
+L 180.72591 117.538047 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe400; stroke-width: 2"/>
+    <path d="M 180.72591 117.538047 
+L 180.72591 117.538047 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdf00; stroke-width: 2"/>
+    <path d="M 180.72591 117.538047 
+L 181.046745 122.562165 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdf00; stroke-width: 2"/>
+    <path d="M 181.046745 122.562165 
+L 181.046745 122.562165 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdd00; stroke-width: 2"/>
+    <path d="M 181.046745 122.562165 
+L 180.612193 127.21026 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdd00; stroke-width: 2"/>
+    <path d="M 180.612193 127.21026 
+L 180.612193 127.21026 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdc00; stroke-width: 2"/>
+    <path d="M 180.612193 127.21026 
+L 179.308316 130.745597 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdc00; stroke-width: 2"/>
+    <path d="M 179.308316 130.745597 
+L 176.837407 133.847823 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffda00; stroke-width: 2"/>
+    <path d="M 176.837407 133.847823 
+L 173.856821 136.130952 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd800; stroke-width: 2"/>
+    <path d="M 173.856821 136.130952 
+L 169.836252 138.333813 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd600; stroke-width: 2"/>
+    <path d="M 276.073412 166.701176 
+L 263.922257 157.213679 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa400; stroke-width: 2"/>
+    <path d="M 263.922257 157.213679 
+L 253.467744 147.557437 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb500; stroke-width: 2"/>
+    <path d="M 148.064985 114.743229 
+L 144.590797 120.468206 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffcf00; stroke-width: 2"/>
+    <path d="M 144.590797 120.468206 
+L 139.256147 126.206094 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffca00; stroke-width: 2"/>
+    <path d="M 139.256147 126.206094 
+L 132.977478 130.88599 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc300; stroke-width: 2"/>
+    <path d="M 132.977478 130.88599 
+L 132.977478 130.88599 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbb00; stroke-width: 2"/>
+    <path d="M 132.977478 130.88599 
 L 124.822588 135.393882 
-" style="fill:none;stroke:#ffbb00;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 124.822588 135.393882 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbb00; stroke-width: 2"/>
+    <path d="M 124.822588 135.393882 
 L 124.822588 135.393882 
-" style="fill:none;stroke:#ffb000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 124.822588 135.393882 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb000; stroke-width: 2"/>
+    <path d="M 124.822588 135.393882 
 L 124.822588 135.393882 
-" style="fill:none;stroke:#ffb000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 196.094704 165.061688 
-L 190.472717 159.704826 
-" style="fill:none;stroke:#ffd000;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 190.472717 159.704826 
-L 185.700886 155.892923 
-" style="fill:none;stroke:#ffd100;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 185.700886 155.892923 
-L 180.893649 153.046322 
-" style="fill:none;stroke:#ffd200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 180.893649 153.046322 
-L 175.239529 151.047529 
-" style="fill:none;stroke:#ffd200;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 175.239529 151.047529 
-L 175.239529 151.047529 
-" style="fill:none;stroke:#ffd100;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 175.239529 151.047529 
-L 175.239529 151.047529 
-" style="fill:none;stroke:#ffd100;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 175.239529 151.047529 
-L 168.687619 150.229907 
-" style="fill:none;stroke:#ffd100;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb000; stroke-width: 2"/>
+    <path d="M 259.267765 166.701176 
+L 248.289179 156.052764 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb500; stroke-width: 2"/>
+    <path d="M 248.289179 156.052764 
+L 239.753314 146.085827 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc200; stroke-width: 2"/>
+    <path d="M 216.935388 180.757805 
+L 216.935388 180.757805 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc800; stroke-width: 2"/>
+    <path d="M 216.935388 180.757805 
+L 206.422408 169.699302 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc800; stroke-width: 2"/>
+    <path d="M 206.422408 169.699302 
+L 198.188754 160.217248 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffce00; stroke-width: 2"/>
+    <path d="M 198.188754 160.217248 
+L 193.057492 154.553524 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd200; stroke-width: 2"/>
+    <path d="M 193.057492 154.553524 
+L 188.969621 150.708519 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd400; stroke-width: 2"/>
+    <path d="M 188.969621 150.708519 
+L 185.056438 147.936991 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd400; stroke-width: 2"/>
+    <path d="M 185.056438 147.936991 
+L 180.179528 145.892542 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd500; stroke-width: 2"/>
+    <path d="M 180.179528 145.892542 
+L 174.98858 145.14363 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd400; stroke-width: 2"/>
+    <path d="M 174.98858 145.14363 
+L 174.98858 145.14363 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd300; stroke-width: 2"/>
+    <path d="M 174.98858 145.14363 
+L 168.571898 145.459852 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd300; stroke-width: 2"/>
+    <path d="M 168.571898 145.459852 
+L 168.571898 145.459852 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd000; stroke-width: 2"/>
+    <path d="M 168.571898 145.459852 
+L 157.028482 147.494544 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd000; stroke-width: 2"/>
+    <path d="M 157.028482 147.494544 
+L 157.028482 147.494544 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc900; stroke-width: 2"/>
+    <path d="M 157.028482 147.494544 
+L 141.628235 151.047529 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc900; stroke-width: 2"/>
    </g>
    <g id="patch_3">
-    <path clip-path="url(#pedeb97e0d8)" d="M 188.884318 224.50172 
-Q 188.121779 224.692246 189.528617 224.340738 
-" style="fill:none;stroke:#ffb900;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 193.894128 225.31147 
-L 189.528617 224.340738 
-L 192.924509 221.430769 
-L 193.894128 225.31147 
+    <path d="M 188.886479 224.497951 
+Q 188.123745 224.688498 189.530406 224.337085 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb900; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 193.895884 225.307963 
+L 189.530406 224.337085 
+L 192.926395 221.42723 
+L 193.895884 225.307963 
 z
-" style="fill:#ffb900;stroke:#ffb900;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ffb900; stroke: #ffb900; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_4">
-    <path clip-path="url(#pedeb97e0d8)" d="M 84.376285 298.688899 
-Q 83.002779 299.914245 83.297842 299.651009 
-" style="fill:none;stroke:#ff3a00;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 87.614099 298.48057 
-L 83.297842 299.651009 
-L 84.951244 295.49574 
-L 87.614099 298.48057 
+    <path d="M 84.376186 298.688663 
+Q 83.002693 299.914042 83.297743 299.650809 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff3a00; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 87.613979 298.480291 
+L 83.297743 299.650809 
+L 84.95107 295.49551 
+L 87.613979 298.480291 
 z
-" style="fill:#ff3a00;stroke:#ff3a00;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff3a00; stroke: #ff3a00; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_5">
-    <path clip-path="url(#pedeb97e0d8)" d="M 133.987781 266.558854 
-Q 132.612459 267.782086 132.907958 267.519265 
-" style="fill:none;stroke:#ff8a00;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 137.225982 266.355359 
-L 132.907958 267.519265 
-L 134.567648 263.366503 
-L 137.225982 266.355359 
+    <path d="M 133.987399 266.558058 
+Q 132.612071 267.781285 132.907571 267.518465 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8a00; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 137.225598 266.354577 
+L 132.907571 267.518465 
+L 134.567277 263.36571 
+L 137.225598 266.354577 
 z
-" style="fill:#ff8a00;stroke:#ff8a00;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff8a00; stroke: #ff8a00; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_6">
-    <path clip-path="url(#pedeb97e0d8)" d="M 126.822494 286.223361 
-Q 125.607658 287.566125 125.892998 287.250737 
-" style="fill:none;stroke:#ff7b00;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 130.059692 285.626342 
-L 125.892998 287.250737 
-L 127.093498 282.942745 
-L 130.059692 285.626342 
+    <path d="M 126.821804 286.222448 
+Q 125.607015 287.565273 125.892333 287.249883 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7b00; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 130.058959 285.625314 
+L 125.892333 287.249883 
+L 127.092653 282.94184 
+L 130.058959 285.625314 
 z
-" style="fill:#ff7b00;stroke:#ff7b00;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff7b00; stroke: #ff7b00; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_7">
-    <path clip-path="url(#pedeb97e0d8)" d="M 177.937112 261.643547 
-Q 176.672425 262.946881 176.964905 262.645462 
-" style="fill:none;stroke:#ffa800;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 181.185785 261.167568 
-L 176.964905 262.645462 
-L 178.315118 258.382022 
-L 181.185785 261.167568 
+    <path d="M 177.936117 261.642788 
+Q 176.671465 262.946146 176.963944 262.644716 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa800; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 181.184789 261.166722 
+L 176.963944 262.644716 
+L 178.314056 258.381244 
+L 181.184789 261.166722 
 z
-" style="fill:#ffa800;stroke:#ffa800;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ffa800; stroke: #ffa800; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_8">
-    <path clip-path="url(#pedeb97e0d8)" d="M 221.893362 253.871574 
-Q 221.520903 254.091847 223.073119 253.173865 
-" style="fill:none;stroke:#ffaa00;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 227.53417 252.859176 
-L 223.073119 253.173865 
-L 225.497999 249.416211 
-L 227.53417 252.859176 
+    <path d="M 221.898768 253.863914 
+Q 221.526332 254.084142 223.078643 253.166236 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffaa00; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 227.539714 252.85183 
+L 223.078643 253.166236 
+L 225.50376 249.408736 
+L 227.539714 252.85183 
 z
-" style="fill:#ffaa00;stroke:#ffaa00;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ffaa00; stroke: #ffaa00; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_9">
-    <path clip-path="url(#pedeb97e0d8)" d="M 207.102046 283.864518 
-Q 206.081598 285.314354 206.348155 284.935635 
-" style="fill:none;stroke:#ffa200;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 210.28593 282.815747 
-L 206.348155 284.935635 
-L 207.01491 280.513482 
-L 210.28593 282.815747 
+    <path d="M 207.101459 283.864255 
+Q 206.081043 285.314107 206.347596 284.935377 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa200; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 210.285329 282.81541 
+L 206.347596 284.935377 
+L 207.014262 280.51321 
+L 210.285329 282.81541 
 z
-" style="fill:#ffa200;stroke:#ffa200;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ffa200; stroke: #ffa200; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_10">
-    <path clip-path="url(#pedeb97e0d8)" d="M 263.673213 259.974225 
-Q 263.375173 260.064937 265.216313 259.504564 
-" style="fill:none;stroke:#ff8c00;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 269.625341 260.253208 
-L 265.216313 259.504564 
-L 268.460645 256.426527 
-L 269.625341 260.253208 
+    <path d="M 263.666412 259.973548 
+Q 263.368416 260.064256 265.209582 259.503821 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8c00; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 269.61863 260.252349 
+L 265.209582 259.503821 
+L 268.453833 256.425699 
+L 269.61863 260.252349 
 z
-" style="fill:#ff8c00;stroke:#ff8c00;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff8c00; stroke: #ff8c00; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_11">
-    <path clip-path="url(#pedeb97e0d8)" d="M 272.445197 280.919128 
-Q 272.070565 281.134459 273.634577 280.235493 
-" style="fill:none;stroke:#ff7b00;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 278.099187 279.976153 
-L 273.634577 280.235493 
-L 276.10587 276.508201 
-L 278.099187 279.976153 
+    <path d="M 272.444175 280.918374 
+Q 272.069647 281.13365 273.633754 280.234614 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7b00; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 278.098362 279.975243 
+L 273.633754 280.234614 
+L 276.105022 276.507305 
+L 278.098362 279.975243 
 z
-" style="fill:#ff7b00;stroke:#ff7b00;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff7b00; stroke: #ff7b00; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_12">
-    <path clip-path="url(#pedeb97e0d8)" d="M 273.232935 294.810868 
-Q 272.722555 295.22029 273.956385 294.230523 
-" style="fill:none;stroke:#ff7500;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 278.327996 293.287647 
-L 273.956385 294.230523 
-L 275.82505 290.167509 
-L 278.327996 293.287647 
+    <path d="M 273.234545 294.80894 
+Q 272.724094 295.218431 273.957833 294.228707 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7500; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 278.329431 293.285769 
+L 273.957833 294.228707 
+L 275.826441 290.165666 
+L 278.329431 293.285769 
 z
-" style="fill:#ff7500;stroke:#ff7500;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff7500; stroke: #ff7500; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_13">
-    <path clip-path="url(#pedeb97e0d8)" d="M 309.801807 288.097303 
-Q 309.204602 288.321317 310.701021 287.760004 
-" style="fill:none;stroke:#ff4400;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 315.148627 288.227762 
-L 310.701021 287.760004 
-L 313.743791 284.482574 
-L 315.148627 288.227762 
+    <path d="M 309.79957 288.096786 
+Q 309.202401 288.320802 310.698839 287.759443 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4400; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 315.146456 288.2271 
+L 310.698839 287.759443 
+L 313.741535 284.481944 
+L 315.146456 288.2271 
 z
-" style="fill:#ff4400;stroke:#ff4400;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff4400; stroke: #ff4400; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_14">
-    <path clip-path="url(#pedeb97e0d8)" d="M 207.830645 152.121117 
-Q 206.92241 150.651301 207.189594 151.08369 
-" style="fill:none;stroke:#ffd400;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 207.590862 155.537788 
-L 207.189594 151.08369 
-L 210.993633 153.435134 
-L 207.590862 155.537788 
+    <path d="M 279.472438 83.924606 
+Q 278.010363 85.066273 278.310703 84.831751 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffbf00; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 282.694307 83.946301 
+L 278.310703 84.831751 
+L 280.232505 80.793598 
+L 282.694307 83.946301 
 z
-" style="fill:#ffd400;stroke:#ffd400;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ffbf00; stroke: #ffbf00; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_15">
-    <path clip-path="url(#pedeb97e0d8)" d="M 269.894036 182.008487 
-Q 268.671332 181.106227 269.24786 181.53166 
-" style="fill:none;stroke:#ffa300;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 271.278899 185.515989 
-L 269.24786 181.53166 
-L 273.653946 182.297426 
-L 271.278899 185.515989 
+    <path d="M 286.845413 57.23097 
+Q 286.256857 58.45925 286.634558 57.671011 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc100; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 290.166679 54.927997 
+L 286.634558 57.671011 
+L 286.559419 53.199506 
+L 290.166679 54.927997 
 z
-" style="fill:#ffa300;stroke:#ffa300;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ffc100; stroke: #ffc100; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_16">
-    <path clip-path="url(#pedeb97e0d8)" d="M 298.110252 179.02807 
-Q 296.46839 178.091546 296.768836 178.262921 
-" style="fill:none;stroke:#ff8000;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 299.252407 181.982044 
-L 296.768836 178.262921 
-L 301.234277 178.507539 
-L 299.252407 181.982044 
+    <path d="M 259.898733 58.236385 
+Q 259.848389 59.926825 259.864609 59.382187 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffdf00; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 261.982796 55.443496 
+L 259.864609 59.382187 
+L 257.984569 55.324423 
+L 261.982796 55.443496 
 z
-" style="fill:#ff8000;stroke:#ff8000;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ffdf00; stroke: #ffdf00; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_17">
-    <path clip-path="url(#pedeb97e0d8)" d="M 341.433161 181.631256 
-Q 339.635 180.93281 339.921193 181.043974 
-" style="fill:none;stroke:#ff3000;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 342.925662 184.35655 
-L 339.921193 181.043974 
-L 344.373935 180.627944 
-L 342.925662 184.35655 
+    <path d="M 245.271007 58.044468 
+Q 245.504546 59.728092 245.430857 59.196854 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffeb00; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 246.862301 54.959996 
+L 245.430857 59.196854 
+L 242.900237 55.509584 
+L 246.862301 54.959996 
 z
-" style="fill:#ff3000;stroke:#ff3000;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ffeb00; stroke: #ffeb00; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_18">
-    <path clip-path="url(#pedeb97e0d8)" d="M 298.694018 146.495107 
-Q 297.036942 145.570624 297.332594 145.735568 
-" style="fill:none;stroke:#ff8b00;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 299.851327 149.430968 
-L 297.332594 145.735568 
-L 301.800154 145.937822 
-L 299.851327 149.430968 
+    <path d="M 226.141045 43.408858 
+Q 226.556639 45.07 226.429527 44.561931 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #fffb00; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 227.398907 40.19612 
+L 226.429527 44.561931 
+L 223.518506 41.166941 
+L 227.398907 40.19612 
 z
-" style="fill:#ff8b00;stroke:#ff8b00;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #fffb00; stroke: #fffb00; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_19">
-    <path clip-path="url(#pedeb97e0d8)" d="M 341.429255 150.332058 
-Q 339.627323 149.641427 339.913354 149.751054 
-" style="fill:none;stroke:#ff3c00;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 342.932641 153.05013 
-L 339.913354 149.751054 
-L 344.364187 149.31507 
-L 342.932641 153.05013 
+    <path d="M 217.812604 71.900934 
+Q 218.342218 73.536395 218.182943 73.044549 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #fff200; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 218.853339 68.622946 
+L 218.182943 73.044549 
+L 215.047898 69.85527 
+L 218.853339 68.622946 
 z
-" style="fill:#ff3c00;stroke:#ff3c00;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #fff200; stroke: #fff200; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_20">
-    <path clip-path="url(#pedeb97e0d8)" d="M 296.826966 119.1575 
-Q 294.991483 118.541185 295.275761 118.636639 
-" style="fill:none;stroke:#ff9900;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 298.431078 121.805863 
-L 295.275761 118.636639 
-L 299.70433 118.013921 
-L 298.431078 121.805863 
+    <path d="M 200.89359 71.925739 
+Q 201.447437 73.553999 201.281209 73.065305 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #fff500; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 201.886562 68.634329 
+L 201.281209 73.065305 
+L 198.09964 69.922437 
+L 201.886562 68.634329 
 z
-" style="fill:#ff9900;stroke:#ff9900;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #fff500; stroke: #fff500; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_21">
-    <path clip-path="url(#pedeb97e0d8)" d="M 326.076578 115.246701 
-Q 324.188085 114.768752 324.467313 114.83942 
-" style="fill:none;stroke:#ff6800;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 327.854355 117.759686 
-L 324.467313 114.83942 
-L 328.835751 113.881947 
-L 327.854355 117.759686 
+    <path d="M 186.691754 86.554197 
+Q 187.206609 88.193536 187.051464 87.699543 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffed00; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 187.761044 83.284059 
+L 187.051464 87.699543 
+L 183.944825 84.482589 
+L 187.761044 83.284059 
 z
-" style="fill:#ff6800;stroke:#ff6800;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ffed00; stroke: #ffed00; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_22">
-    <path clip-path="url(#pedeb97e0d8)" d="M 325.433055 88.490196 
-Q 323.47244 88.590231 323.744987 88.576325 
-" style="fill:none;stroke:#ff7400;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 327.841702 90.369904 
-L 323.744987 88.576325 
-L 327.63788 86.375101 
-L 327.841702 90.369904 
+    <path d="M 155.507822 133.587817 
+Q 155.187692 133.822536 156.670855 132.735086 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffce00; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 161.07927 131.982835 
+L 156.670855 132.735086 
+L 158.714103 128.757004 
+L 161.07927 131.982835 
 z
-" style="fill:#ff7400;stroke:#ff7400;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ffce00; stroke: #ffce00; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_23">
-    <path clip-path="url(#pedeb97e0d8)" d="M 341.331503 73.138204 
-Q 339.407014 73.489804 339.682183 73.439531 
-" style="fill:none;stroke:#ff5a00;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 343.976498 74.688073 
-L 339.682183 73.439531 
-L 343.257606 70.753204 
-L 343.976498 74.688073 
+    <path d="M 131.000447 112.08802 
+Q 130.437695 112.773596 131.293662 111.73081 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc200; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 135.377437 109.907961 
+L 131.293662 111.73081 
+L 132.285647 107.37008 
+L 135.377437 109.907961 
 z
-" style="fill:#ff5a00;stroke:#ff5a00;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ffc200; stroke: #ffc200; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_24">
-    <path clip-path="url(#pedeb97e0d8)" d="M 341.636434 42.5922 
-Q 340.083269 43.640581 340.383468 43.437948 
-" style="fill:none;stroke:#ff6600;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 344.81781 42.857765 
-L 340.383468 43.437948 
-L 342.579928 39.542365 
-L 344.81781 42.857765 
+    <path d="M 111.943487 91.463632 
+Q 111.77858 91.699877 112.893556 90.102573 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb300; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 116.823057 87.967385 
+L 112.893556 90.102573 
+L 113.543106 85.67786 
+L 116.823057 87.967385 
 z
-" style="fill:#ff6600;stroke:#ff6600;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ffb300; stroke: #ffb300; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_25">
-    <path clip-path="url(#pedeb97e0d8)" d="M 280.861801 69.267315 
-Q 280.34178 70.127634 280.978464 69.074309 
-" style="fill:none;stroke:#ffc400;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 284.759254 66.685664 
-L 280.978464 69.074309 
-L 281.336022 64.616489 
-L 284.759254 66.685664 
+    <path d="M 94.303508 77.252423 
+Q 94.026452 77.630411 95.071306 76.204915 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9f00; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 99.049096 74.161098 
+L 95.071306 76.204915 
+L 95.822927 71.796393 
+L 99.049096 74.161098 
 z
-" style="fill:#ffc400;stroke:#ffc400;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff9f00; stroke: #ff9f00; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_26">
-    <path clip-path="url(#pedeb97e0d8)" d="M 259.897497 58.235556 
-Q 259.847005 59.925797 259.86328 59.380967 
-" style="fill:none;stroke:#ffdf00;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 261.981827 55.44247 
-L 259.86328 59.380967 
-L 257.983611 55.323032 
-L 261.981827 55.44247 
+    <path d="M 80.226365 63.81041 
+Q 79.850977 64.320709 80.800598 63.0298 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8d00; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 84.781895 60.992823 
+L 80.800598 63.0298 
+L 81.559795 58.622576 
+L 84.781895 60.992823 
 z
-" style="fill:#ffdf00;stroke:#ffdf00;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff8d00; stroke: #ff8d00; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_27">
-    <path clip-path="url(#pedeb97e0d8)" d="M 245.271067 58.044446 
-Q 245.504469 59.728027 245.430812 59.196724 
-" style="fill:none;stroke:#ffeb00;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 246.862583 54.959976 
-L 245.430812 59.196724 
-L 242.900476 55.509259 
-L 246.862583 54.959976 
+    <path d="M 166.709949 168.158464 
+Q 166.676002 168.153267 168.852368 168.486474 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc700; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 172.503618 171.068793 
+L 168.852368 168.486474 
+L 173.108974 167.114865 
+L 172.503618 171.068793 
 z
-" style="fill:#ffeb00;stroke:#ffeb00;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ffc700; stroke: #ffc700; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_28">
-    <path clip-path="url(#pedeb97e0d8)" d="M 226.140843 43.408888 
-Q 226.556265 45.070056 226.429201 44.561958 
-" style="fill:none;stroke:#fffb00;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 227.399023 40.196246 
-L 226.429201 44.561958 
-L 223.518524 41.166673 
-L 227.399023 40.196246 
+    <path d="M 117.75038 186.157335 
+Q 115.824563 186.508828 116.098474 186.458835 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff9700; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 120.39257 187.70813 
+L 116.098474 186.458835 
+L 119.674368 183.773135 
+L 120.39257 187.70813 
 z
-" style="fill:#fffb00;stroke:#fffb00;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff9700; stroke: #ff9700; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_29">
-    <path clip-path="url(#pedeb97e0d8)" d="M 217.809433 71.901718 
-Q 218.338863 73.537224 218.179638 73.045347 
-" style="fill:none;stroke:#fff200;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 218.850523 68.623819 
-L 218.179638 73.045347 
-L 215.044946 69.855722 
-L 218.850523 68.623819 
+    <path d="M 132.752143 196.654612 
+Q 130.829906 197.020936 131.104205 196.968662 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa300; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 135.407896 198.184494 
+L 131.104205 196.968662 
+L 134.659086 194.255209 
+L 135.407896 198.184494 
 z
-" style="fill:#fff200;stroke:#fff200;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ffa300; stroke: #ffa300; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_30">
-    <path clip-path="url(#pedeb97e0d8)" d="M 200.891536 71.926234 
-Q 201.445315 73.55451 201.279105 73.065803 
-" style="fill:none;stroke:#fff500;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 201.884638 68.634852 
-L 201.279105 73.065803 
-L 198.097664 69.922805 
-L 201.884638 68.634852 
+    <path d="M 144.813741 214.404848 
+Q 142.948693 214.954793 143.228414 214.872311 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa700; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 147.630753 215.659335 
+L 143.228414 214.872311 
+L 146.499437 211.822654 
+L 147.630753 215.659335 
 z
-" style="fill:#fff500;stroke:#fff500;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ffa700; stroke: #ffa700; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_31">
-    <path clip-path="url(#pedeb97e0d8)" d="M 182.646359 72.260671 
-Q 183.105269 73.911714 182.965362 73.408363 
-" style="fill:none;stroke:#fff200;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 183.821113 69.018865 
-L 182.965362 73.408363 
-L 179.967214 70.090063 
-L 183.821113 69.018865 
+    <path d="M 84.313499 248.497272 
+Q 82.570389 249.291349 82.862148 249.158438 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4e00; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 87.331356 249.320233 
+L 82.862148 249.158438 
+L 85.673109 245.680148 
+L 87.331356 249.320233 
 z
-" style="fill:#fff200;stroke:#fff200;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff4e00; stroke: #ff4e00; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_32">
-    <path clip-path="url(#pedeb97e0d8)" d="M 164.96902 87.413575 
-Q 165.138164 89.103692 165.084638 88.568855 
-" style="fill:none;stroke:#ffe500;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 166.676374 84.389576 
-L 165.084638 88.568855 
-L 162.696256 84.787899 
-L 166.676374 84.389576 
+    <path d="M 83.154612 262.163718 
+Q 81.493119 263.082231 81.788565 262.918901 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4600; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 86.256876 262.73398 
+L 81.788565 262.918901 
+L 84.321615 259.2333 
+L 86.256876 262.73398 
 z
-" style="fill:#ffe500;stroke:#ffe500;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff4600; stroke: #ff4600; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_33">
-    <path clip-path="url(#pedeb97e0d8)" d="M 130.993476 112.078309 
-Q 130.430378 112.764184 131.286149 111.721821 
-" style="fill:none;stroke:#ffc200;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 135.370084 109.899329 
-L 131.286149 111.721821 
-L 132.278516 107.361178 
-L 135.370084 109.899329 
+    <path d="M 340.04527 232.04193 
+Q 338.127088 231.656145 338.401078 231.71125 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff1f00; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 341.928211 234.460675 
+L 338.401078 231.71125 
+L 342.716898 230.539199 
+L 341.928211 234.460675 
 z
-" style="fill:#ffc200;stroke:#ffc200;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff1f00; stroke: #ff1f00; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_34">
-    <path clip-path="url(#pedeb97e0d8)" d="M 111.939783 91.463709 
-Q 111.774881 91.699883 112.890092 90.102668 
-" style="fill:none;stroke:#ffb300;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 116.819859 87.967972 
-L 112.890092 90.102668 
-L 113.540195 85.678037 
-L 116.819859 87.967972 
+    <path d="M 267.564357 187.576199 
+Q 266.329464 186.699094 266.917592 187.116822 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa300; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 269.020577 191.06365 
+L 266.917592 187.116822 
+L 271.336845 187.802531 
+L 269.020577 191.06365 
 z
-" style="fill:#ffb300;stroke:#ffb300;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ffa300; stroke: #ffa300; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_35">
-    <path clip-path="url(#pedeb97e0d8)" d="M 94.300549 77.251824 
-Q 94.023533 77.62971 95.068535 76.204191 
-" style="fill:none;stroke:#ff9f00;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 99.046446 74.160611 
-L 95.068535 76.204191 
-L 95.820417 71.795714 
-L 99.046446 74.160611 
+    <path d="M 324.634797 197.269501 
+Q 322.843666 196.556189 323.129926 196.670191 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4c00; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 326.106102 200.00821 
+L 323.129926 196.670191 
+L 327.586047 196.292061 
+L 326.106102 200.00821 
 z
-" style="fill:#ff9f00;stroke:#ff9f00;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff4c00; stroke: #ff4c00; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_36">
-    <path clip-path="url(#pedeb97e0d8)" d="M 80.221766 63.814087 
-Q 79.84703 64.32345 80.797388 63.031667 
-" style="fill:none;stroke:#ff8d00;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 84.778781 60.994879 
-L 80.797388 63.031667 
-L 81.556793 58.62448 
-L 84.778781 60.994879 
+    <path d="M 296.573776 167.812367 
+Q 294.956946 166.838468 295.255539 167.018326 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8600; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 297.650002 170.795434 
+L 295.255539 167.018326 
+L 299.713903 167.369021 
+L 297.650002 170.795434 
 z
-" style="fill:#ff8d00;stroke:#ff8d00;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff8600; stroke: #ff8600; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_37">
-    <path clip-path="url(#pedeb97e0d8)" d="M 71.02707 147.848527 
-Q 69.131204 148.300217 69.410523 148.233669 
-" style="fill:none;stroke:#ff5c00;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 73.765138 149.252161 
-L 69.410523 148.233669 
-L 72.838085 145.361072 
-L 73.765138 149.252161 
+    <path d="M 310.483402 159.242858 
+Q 308.795301 158.363248 309.090211 158.516915 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7400; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 311.71334 162.138958 
+L 309.090211 158.516915 
+L 313.561723 158.591638 
+L 311.71334 162.138958 
 z
-" style="fill:#ff5c00;stroke:#ff5c00;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff7400; stroke: #ff7400; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_38">
-    <path clip-path="url(#pedeb97e0d8)" d="M 166.711046 168.159475 
-Q 166.677103 168.15428 168.85349 168.48738 
-" style="fill:none;stroke:#ffc700;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 172.504868 171.069518 
-L 168.85349 168.48738 
-L 173.110027 167.11556 
-L 172.504868 171.069518 
+    <path d="M 324.659169 150.23959 
+Q 322.903238 149.464852 323.193097 149.592741 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5e00; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 326.045386 153.037222 
+L 323.193097 149.592741 
+L 327.660055 149.377599 
+L 326.045386 153.037222 
 z
-" style="fill:#ffc700;stroke:#ffc700;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff5e00; stroke: #ff5e00; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_39">
-    <path clip-path="url(#pedeb97e0d8)" d="M 117.75052 186.158068 
-Q 115.824698 186.509527 116.098613 186.459538 
-" style="fill:none;stroke:#ff9700;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 120.392687 187.70891 
-L 116.098613 186.459538 
-L 119.674554 183.773902 
-L 120.392687 187.70891 
+    <path d="M 309.971658 128.996304 
+Q 308.180976 128.280337 308.466552 128.394518 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8000; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 311.43817 131.736597 
+L 308.466552 128.394518 
+L 312.923186 128.022471 
+L 311.43817 131.736597 
 z
-" style="fill:#ff9700;stroke:#ff9700;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff8000; stroke: #ff8000; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_40">
-    <path clip-path="url(#pedeb97e0d8)" d="M 132.752346 196.655673 
-Q 130.830103 197.021945 131.104409 196.969678 
-" style="fill:none;stroke:#ffa300;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 135.408067 198.185625 
-L 131.104409 196.969678 
-L 134.659361 194.25632 
-L 135.408067 198.185625 
+    <path d="M 309.391055 114.868487 
+Q 307.509587 114.368102 307.789069 114.442431 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff8700; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 311.140652 117.403325 
+L 307.789069 114.442431 
+L 312.168734 113.537701 
+L 311.140652 117.403325 
 z
-" style="fill:#ffa300;stroke:#ffa300;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff8700; stroke: #ff8700; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_41">
-    <path clip-path="url(#pedeb97e0d8)" d="M 144.81442 214.406869 
-Q 142.949357 214.956764 143.22908 214.874291 
-" style="fill:none;stroke:#ffa700;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 147.631399 215.661431 
-L 143.22908 214.874291 
-L 146.500183 211.82472 
-L 147.631399 215.661431 
+    <path d="M 340.124787 106.442906 
+Q 338.195353 106.109459 338.469324 106.156808 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff4f00; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 342.070302 108.80878 
+L 338.469324 106.156808 
+L 342.751489 104.867209 
+L 342.070302 108.80878 
 z
-" style="fill:#ffa700;stroke:#ffa700;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff4f00; stroke: #ff4f00; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_42">
-    <path clip-path="url(#pedeb97e0d8)" d="M 84.313538 248.497416 
-Q 82.570424 249.291478 82.862186 249.158568 
-" style="fill:none;stroke:#ff4e00;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 87.331393 249.320399 
-L 82.862186 249.158568 
-L 85.673176 245.680301 
-L 87.331393 249.320399 
+    <path d="M 324.492426 88.541859 
+Q 322.5323 88.648716 322.804927 88.633853 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff7600; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 326.907865 90.41315 
+L 322.804927 88.633853 
+L 326.690127 86.419081 
+L 326.907865 90.41315 
 z
-" style="fill:#ff4e00;stroke:#ff4e00;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff7600; stroke: #ff7600; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_43">
-    <path clip-path="url(#pedeb97e0d8)" d="M 83.154767 262.164265 
-Q 81.493258 263.082723 81.788721 262.919396 
-" style="fill:none;stroke:#ff4600;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 86.257037 262.734606 
-L 81.788721 262.919396 
-L 84.321879 259.233869 
-L 86.257037 262.734606 
+    <path d="M 339.907863 69.56458 
+Q 338.013347 70.018489 338.293357 69.951401 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ff5e00; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 342.64926 70.964369 
+L 338.293357 69.951401 
+L 341.717273 67.074459 
+L 342.64926 70.964369 
 z
-" style="fill:#ff4600;stroke:#ff4600;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ff5e00; stroke: #ff5e00; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_44">
-    <path clip-path="url(#pedeb97e0d8)" d="M 178.623798 104.909892 
-Q 178.901773 106.586656 178.814043 106.05746 
-" style="fill:none;stroke:#ffe400;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 180.13292 101.784222 
-L 178.814043 106.05746 
-L 176.186778 102.438416 
-L 180.13292 101.784222 
+    <path d="M 250.031755 192.226877 
+Q 248.984523 191.432637 249.71892 191.989618 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb100; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 251.697426 196.000293 
+L 249.71892 191.989618 
+L 254.114564 192.813218 
+L 251.697426 196.000293 
 z
-" style="fill:#ffe400;stroke:#ffe400;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ffb100; stroke: #ffb100; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_45">
-    <path clip-path="url(#pedeb97e0d8)" d="M 262.318761 140.342099 
-Q 260.916823 139.145877 261.21589 139.40106 
-" style="fill:none;stroke:#ffbb00;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 262.960566 143.518839 
-L 261.21589 139.40106 
-L 265.556919 140.475987 
-L 262.960566 143.518839 
+    <path d="M 178.627754 104.910164 
+Q 178.906367 106.587011 178.818475 106.058031 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffe400; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 180.135805 101.784316 
+L 178.818475 106.058031 
+L 176.189901 102.439939 
+L 180.135805 101.784316 
 z
-" style="fill:#ffbb00;stroke:#ffbb00;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ffe400; stroke: #ffe400; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_46">
-    <path clip-path="url(#pedeb97e0d8)" d="M 137.653031 127.403476 
-Q 136.885174 127.975604 137.910383 127.211725 
-" style="fill:none;stroke:#ffc300;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 142.312878 126.42557 
-L 137.910383 127.211725 
-L 139.922956 123.218036 
-L 142.312878 126.42557 
+    <path d="M 274.498152 165.47123 
+Q 273.035769 164.329416 273.335855 164.56372 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffa400; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 275.257818 168.601796 
+L 273.335855 164.56372 
+L 277.719494 165.448994 
+L 275.257818 168.601796 
 z
-" style="fill:#ffc300;stroke:#ffc300;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ffa400; stroke: #ffa400; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_47">
-    <path clip-path="url(#pedeb97e0d8)" d="M 183.980327 154.874095 
-Q 183.638797 154.671859 185.221312 155.608943 
-" style="fill:none;stroke:#ffd200;stroke-linecap:round;stroke-width:2;"/>
-    <path clip-path="url(#pedeb97e0d8)" d="M 187.644108 159.367941 
-L 185.221312 155.608943 
-L 189.682187 155.926105 
-L 187.644108 159.367941 
+    <path d="M 137.652757 127.401204 
+Q 136.884785 127.973623 137.909648 127.209726 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffc300; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 142.312008 126.422813 
+L 137.909648 127.209726 
+L 139.921533 123.215691 
+L 142.312008 126.422813 
 z
-" style="fill:#ffd200;stroke:#ffd200;stroke-linecap:round;stroke-width:2;"/>
+" clip-path="url(#p3b712018f5)" style="fill: #ffc300; stroke: #ffc300; stroke-width: 2; stroke-linecap: round"/>
    </g>
    <g id="patch_48">
+    <path d="M 257.833794 165.310332 
+Q 256.523933 164.039864 256.819162 164.326214 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffb500; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 258.297975 168.546773 
+L 256.819162 164.326214 
+L 261.082897 165.675499 
+L 258.297975 168.546773 
+z
+" clip-path="url(#p3b712018f5)" style="fill: #ffb500; stroke: #ffb500; stroke-width: 2; stroke-linecap: round"/>
+   </g>
+   <g id="patch_49">
+    <path d="M 187.337854 149.552814 
+Q 187.175442 149.437784 188.837784 150.615145 
+" clip-path="url(#p3b712018f5)" style="fill: none; stroke: #ffd400; stroke-width: 2; stroke-linecap: round"/>
+    <path d="M 190.946055 154.559152 
+L 188.837784 150.615145 
+L 193.257952 151.294932 
+L 190.946055 154.559152 
+z
+" clip-path="url(#p3b712018f5)" style="fill: #ffd400; stroke: #ffd400; stroke-width: 2; stroke-linecap: round"/>
+   </g>
+   <g id="patch_50">
     <path d="M 57.6 307.584 
 L 57.6 41.472 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
-   <g id="patch_49">
+   <g id="patch_51">
     <path d="M 343.296 307.584 
 L 343.296 41.472 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
-   <g id="patch_50">
+   <g id="patch_52">
     <path d="M 57.6 307.584 
 L 343.296 307.584 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
-   <g id="patch_51">
+   <g id="patch_53">
     <path d="M 57.6 41.472 
 L 343.296 41.472 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
   </g>
   <g id="axes_2">
-   <g id="patch_52">
-    <path clip-path="url(#p80582897cf)" d="M 361.152 307.584 
-L 361.152 306.5445 
-L 361.152 42.5115 
-L 361.152 41.472 
-L 374.4576 41.472 
-L 374.4576 42.5115 
-L 374.4576 306.5445 
+   <g id="patch_54">
+    <path d="M 361.152 307.584 
 L 374.4576 307.584 
+L 374.4576 41.472 
+L 361.152 41.472 
 z
-" style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:miter;stroke-width:0.01;"/>
+" style="fill: #ffffff"/>
    </g>
-   <image height="265.68" id="imagef720fe4209" transform="scale(1 -1)translate(0 -265.68)" width="12.96" x="361.44" xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAABIAAAFxCAYAAAB+2fgXAAAABHNCSVQICAgIfAhkiAAAAPdJREFUeJztkMENwzAAhJyq+6/cjsDHj3CCAZDg+Z3zOxf4nueG5qLoc0dTmlM0/Kg0pjSjaPhRaUxpRtHwo9KY0oyi4UelMe9L6xFTGlOaUTT8qDSmNKNo+FFpTGlG0fCj0pjSjKLhR6UxpRlFw49KY0ozioYflcaUZhQNPyqNKc0oGn5UGlOaUTT8qDSmNKNo+FFpTGlG0fCj0pjSjKLhR6UxpRlFw49KY0ozioYflcaUZhQNPyqNKc0oGn5UGlOaUTT8qDTmfWk9YkpjSjOKhh+VxpRmFA0/Ko0pzSgaflQaU5pRNPyoNKY0o2j4UWlMaUbRtUd/Wd8H3aIvcBQAAAAASUVORK5CYII=" y="-41.76"/>
-   <g id="matplotlib.axis_3"/>
-   <g id="matplotlib.axis_4">
+   <g id="patch_55">
+    <path clip-path="url(#p82470987e8)" style="fill: #ffffff; stroke: #ffffff; stroke-width: 0.01; stroke-linejoin: miter"/>
+   </g>
+   <image xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAABIAAAFxCAYAAAB+2fgXAAAA/UlEQVR4nO3QwQ3DUADC0J+q+6+cjsAligp6HsDCXPc593mA77me0JzzeUbz4CJpL4qGP5KWkdYoGv5IWkZao2j4I2kZaY2i4Y+kZaQ1ioY/kpaR1iga/khaRlqjaPgjaRlpjaLhj6RlpDWKhj+SlpHWKBr+SFpGWqNo+CNpGWmNouGPpGX+L81HGWkZaY2i4Y+kZaQ1ioY/kpaR1iga/khaRlqjaPgjaRlpjaLhj6RlpDWKhj+SlpHWKBr+SFpGWqNo+CNpGWmNouGPpGWkNYqGP5KWkdYoGv5IWkZao2j4I2kZaY2i4Y+kZaQ1ioY/kpaR1iga/khaRtqLoh/sUAfds8BDJgAAAABJRU5ErkJggg==" id="image022c70b86f" transform="scale(1 -1)translate(0 -265.68)" x="361.44" y="-41.76" width="12.96" height="265.68"/>
+   <g id="matplotlib.axis_3">
     <g id="ytick_8">
      <g id="line2d_15">
       <defs>
-       <path d="M 0 0 
+       <path id="m0e892eab4f" d="M 0 0 
 L 3.5 0 
-" id="mf4df04ec05" style="stroke:#000000;stroke-width:0.8;"/>
+" style="stroke: #000000; stroke-width: 0.8"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="374.4576" xlink:href="#mf4df04ec05" y="289.842114"/>
+       <use xlink:href="#m0e892eab4f" x="374.4576" y="289.842931" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_9">
      <g id="line2d_16">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="374.4576" xlink:href="#mf4df04ec05" y="254.358342"/>
+       <use xlink:href="#m0e892eab4f" x="374.4576" y="254.360794" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_10">
      <g id="line2d_17">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="374.4576" xlink:href="#mf4df04ec05" y="218.874569"/>
+       <use xlink:href="#m0e892eab4f" x="374.4576" y="218.878656" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_11">
      <g id="line2d_18">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="374.4576" xlink:href="#mf4df04ec05" y="183.390797"/>
+       <use xlink:href="#m0e892eab4f" x="374.4576" y="183.396518" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_12">
      <g id="line2d_19">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="374.4576" xlink:href="#mf4df04ec05" y="147.907025"/>
+       <use xlink:href="#m0e892eab4f" x="374.4576" y="147.914381" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_13">
      <g id="line2d_20">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="374.4576" xlink:href="#mf4df04ec05" y="112.423253"/>
+       <use xlink:href="#m0e892eab4f" x="374.4576" y="112.432243" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_14">
      <g id="line2d_21">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="374.4576" xlink:href="#mf4df04ec05" y="76.93948"/>
+       <use xlink:href="#m0e892eab4f" x="374.4576" y="76.950106" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
    </g>
-   <g id="patch_53">
+   <g id="LineCollection_2"/>
+   <g id="patch_56">
     <path d="M 361.152 307.584 
-L 361.152 306.5445 
-L 361.152 42.5115 
-L 361.152 41.472 
-L 374.4576 41.472 
-L 374.4576 42.5115 
-L 374.4576 306.5445 
+L 367.8048 307.584 
 L 374.4576 307.584 
+L 374.4576 41.472 
+L 367.8048 41.472 
+L 361.152 41.472 
+L 361.152 307.584 
 z
-" style="fill:none;stroke:#000000;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
   </g>
  </g>
  <defs>
-  <clipPath id="pedeb97e0d8">
-   <rect height="266.112" width="285.696" x="57.6" y="41.472"/>
+  <clipPath id="p3b712018f5">
+   <rect x="57.6" y="41.472" width="285.696" height="266.112"/>
   </clipPath>
-  <clipPath id="p80582897cf">
-   <rect height="266.112" width="13.3056" x="361.152" y="41.472"/>
+  <clipPath id="p82470987e8">
+   <rect x="361.152" y="41.472" width="13.3056" height="266.112"/>
   </clipPath>
  </defs>
 </svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_linewidth.pdf b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_linewidth.pdf
index f1644d5b613c..1b14d45c3059 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_linewidth.pdf and b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_linewidth.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_linewidth.png b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_linewidth.png
index 51e4e5d859c6..b928223c3206 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_linewidth.png and b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_linewidth.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_linewidth.svg b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_linewidth.svg
index ba0baa1da49e..2a2bec622027 100644
--- a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_linewidth.svg
+++ b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_linewidth.svg
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (https://matplotlib.org/) -->
-<svg height="345.6pt" version="1.1" viewBox="0 0 460.8 345.6" width="460.8pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" width="460.8pt" height="345.6pt" viewBox="0 0 460.8 345.6" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <metadata>
+  <rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+   <cc:Work>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:date>2021-08-18T03:24:40.872884</dc:date>
+    <dc:format>image/svg+xml</dc:format>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Matplotlib v3.4.2.post1692+gb0554f4824.d20210818, https://matplotlib.org/</dc:title>
+     </cc:Agent>
+    </dc:creator>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linejoin: round; stroke-linecap: butt}</style>
  </defs>
  <g id="figure_1">
   <g id="patch_1">
@@ -15,7 +26,7 @@ L 460.8 345.6
 L 460.8 0 
 L 0 0 
 z
-" style="fill:#ffffff;"/>
+" style="fill: #ffffff"/>
   </g>
   <g id="axes_1">
    <g id="patch_2">
@@ -24,60 +35,60 @@ L 414.72 307.584
 L 414.72 41.472 
 L 57.6 41.472 
 z
-" style="fill:#ffffff;"/>
+" style="fill: #ffffff"/>
    </g>
    <g id="matplotlib.axis_1">
     <g id="xtick_1">
      <g id="line2d_1">
       <defs>
-       <path d="M 0 0 
+       <path id="m5256a459e1" d="M 0 0 
 L 0 3.5 
-" id="ma91ea6e729" style="stroke:#000000;stroke-width:0.8;"/>
+" style="stroke: #000000; stroke-width: 0.8"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#ma91ea6e729" y="307.584"/>
+       <use xlink:href="#m5256a459e1" x="57.6" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_2">
      <g id="line2d_2">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="117.12" xlink:href="#ma91ea6e729" y="307.584"/>
+       <use xlink:href="#m5256a459e1" x="117.12" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_3">
      <g id="line2d_3">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="176.64" xlink:href="#ma91ea6e729" y="307.584"/>
+       <use xlink:href="#m5256a459e1" x="176.64" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_4">
      <g id="line2d_4">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="236.16" xlink:href="#ma91ea6e729" y="307.584"/>
+       <use xlink:href="#m5256a459e1" x="236.16" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_5">
      <g id="line2d_5">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="295.68" xlink:href="#ma91ea6e729" y="307.584"/>
+       <use xlink:href="#m5256a459e1" x="295.68" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_6">
      <g id="line2d_6">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="355.2" xlink:href="#ma91ea6e729" y="307.584"/>
+       <use xlink:href="#m5256a459e1" x="355.2" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_7">
      <g id="line2d_7">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="414.72" xlink:href="#ma91ea6e729" y="307.584"/>
+       <use xlink:href="#m5256a459e1" x="414.72" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
@@ -86,2462 +97,3002 @@ L 0 3.5
     <g id="ytick_1">
      <g id="line2d_8">
       <defs>
-       <path d="M 0 0 
+       <path id="mfa69605036" d="M 0 0 
 L -3.5 0 
-" id="mb520385715" style="stroke:#000000;stroke-width:0.8;"/>
+" style="stroke: #000000; stroke-width: 0.8"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mb520385715" y="307.584"/>
+       <use xlink:href="#mfa69605036" x="57.6" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_2">
      <g id="line2d_9">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mb520385715" y="263.232"/>
+       <use xlink:href="#mfa69605036" x="57.6" y="263.232" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_3">
      <g id="line2d_10">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mb520385715" y="218.88"/>
+       <use xlink:href="#mfa69605036" x="57.6" y="218.88" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_4">
      <g id="line2d_11">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mb520385715" y="174.528"/>
+       <use xlink:href="#mfa69605036" x="57.6" y="174.528" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_5">
      <g id="line2d_12">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mb520385715" y="130.176"/>
+       <use xlink:href="#mfa69605036" x="57.6" y="130.176" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_6">
      <g id="line2d_13">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mb520385715" y="85.824"/>
+       <use xlink:href="#mfa69605036" x="57.6" y="85.824" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_7">
      <g id="line2d_14">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mb520385715" y="41.472"/>
+       <use xlink:href="#mfa69605036" x="57.6" y="41.472" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
    </g>
    <g id="LineCollection_1">
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 242.39704 
-L 413.543653 242.270544 
-" style="fill:none;stroke:#000000;stroke-width:3.420288;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 413.543653 242.270544 
-L 399.41255 240.715443 
-" style="fill:none;stroke:#000000;stroke-width:3.384891;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 399.41255 240.715443 
-L 385.296611 239.086693 
-" style="fill:none;stroke:#000000;stroke-width:2.974339;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 385.296611 239.086693 
-L 371.197364 237.379832 
-" style="fill:none;stroke:#000000;stroke-width:2.596732;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 371.197364 237.379832 
-L 357.116243 235.591947 
-" style="fill:none;stroke:#000000;stroke-width:2.251734;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 357.116243 235.591947 
-L 343.054389 233.724519 
-" style="fill:none;stroke:#000000;stroke-width:1.939457;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 343.054389 233.724519 
-L 329.010496 231.784245 
-" style="fill:none;stroke:#000000;stroke-width:1.659717;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 329.010496 231.784245 
-L 314.979766 229.789697 
-" style="fill:none;stroke:#000000;stroke-width:1.412045;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 314.979766 229.789697 
-L 300.952899 227.783885 
-" style="fill:none;stroke:#000000;stroke-width:1.196286;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 300.952899 227.783885 
-L 286.9104 225.849177 
-" style="fill:none;stroke:#000000;stroke-width:1.01253;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 286.9104 225.849177 
-L 272.818526 224.130253 
-" style="fill:none;stroke:#000000;stroke-width:0.860649;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 272.818526 224.130253 
-L 258.648007 222.872354 
-" style="fill:none;stroke:#000000;stroke-width:0.741464;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 258.648007 222.872354 
-L 246.112523 222.430413 
-" style="fill:none;stroke:#000000;stroke-width:0.658459;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 246.112523 222.430413 
-L 234.081726 222.85247 
-" style="fill:none;stroke:#000000;stroke-width:0.619452;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 234.081726 222.85247 
-L 221.596792 224.36088 
-" style="fill:none;stroke:#000000;stroke-width:0.617722;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 221.596792 224.36088 
-L 207.924436 227.347446 
-" style="fill:none;stroke:#000000;stroke-width:0.658494;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 207.924436 227.347446 
-L 194.783802 231.480575 
-" style="fill:none;stroke:#000000;stroke-width:0.756605;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 194.783802 231.480575 
-L 182.160632 236.443806 
-" style="fill:none;stroke:#000000;stroke-width:0.903552;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 182.160632 236.443806 
-L 169.963657 241.975261 
-" style="fill:none;stroke:#000000;stroke-width:1.091518;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 169.963657 241.975261 
-L 158.096423 247.895597 
-" style="fill:none;stroke:#000000;stroke-width:1.313423;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 158.096423 247.895597 
-L 146.477752 254.085675 
-" style="fill:none;stroke:#000000;stroke-width:1.565683;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 146.477752 254.085675 
-L 135.046833 260.467627 
-" style="fill:none;stroke:#000000;stroke-width:1.846007;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 135.046833 260.467627 
-L 123.758279 266.989122 
-" style="fill:none;stroke:#000000;stroke-width:2.153048;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 123.758279 266.989122 
-L 112.578003 273.613695 
-" style="fill:none;stroke:#000000;stroke-width:2.485387;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 112.578003 273.613695 
-L 101.480854 280.315596 
-" style="fill:none;stroke:#000000;stroke-width:2.843202;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 101.480854 280.315596 
-L 90.447603 287.075973 
-" style="fill:none;stroke:#000000;stroke-width:3.225553;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 90.447603 287.075973 
-L 79.463552 293.880843 
-" style="fill:none;stroke:#000000;stroke-width:3.632749;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 79.463552 293.880843 
-L 68.517361 300.719585 
-" style="fill:none;stroke:#000000;stroke-width:4.064099;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 68.517361 300.719585 
+    <path d="M 414.72 242.393203 
+L 411.926812 242.091173 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.420274"/>
+    <path d="M 411.926812 242.091173 
+L 400.151373 240.792952 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.336096"/>
+    <path d="M 400.151373 240.792952 
+L 388.386395 239.443559 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.994813"/>
+    <path d="M 388.386395 239.443559 
+L 376.632801 238.040319 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.6765"/>
+    <path d="M 376.632801 238.040319 
+L 364.891617 236.581357 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.380827"/>
+    <path d="M 364.891617 236.581357 
+L 353.16329 235.065481 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.107942"/>
+    <path d="M 353.16329 235.065481 
+L 341.448355 233.494272 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.857469"/>
+    <path d="M 341.448355 233.494272 
+L 329.746114 231.872971 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.629656"/>
+    <path d="M 329.746114 231.872971 
+L 318.053884 230.212128 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.424033"/>
+    <path d="M 318.053884 230.212128 
+L 306.366946 228.533984 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.240648"/>
+    <path d="M 306.366946 228.533984 
+L 294.674434 226.875443 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.079463"/>
+    <path d="M 294.674434 226.875443 
+L 282.962077 225.301614 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.940073"/>
+    <path d="M 282.962077 225.301614 
+L 271.208762 223.916013 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.82351"/>
+    <path d="M 271.208762 223.916013 
+L 259.396493 222.874183 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.729715"/>
+    <path d="M 259.396493 222.874183 
+L 247.526846 222.384551 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.661442"/>
+    <path d="M 247.526846 222.384551 
+L 235.652553 222.676388 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.621478"/>
+    <path d="M 235.652553 222.676388 
+L 223.893422 223.922486 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.61518"/>
+    <path d="M 223.893422 223.922486 
+L 212.397214 226.153308 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.646693"/>
+    <path d="M 212.397214 226.153308 
+L 201.260045 229.250232 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.717491"/>
+    <path d="M 201.260045 229.250232 
+L 190.500906 233.02806 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.823998"/>
+    <path d="M 190.500906 233.02806 
+L 180.082173 237.309973 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.961725"/>
+    <path d="M 180.082173 237.309973 
+L 169.948105 241.958655 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.12581"/>
+    <path d="M 169.948105 241.958655 
+L 160.042489 246.874713 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.313273"/>
+    <path d="M 160.042489 246.874713 
+L 150.317277 251.987972 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.521565"/>
+    <path d="M 150.317277 251.987972 
+L 140.734354 257.248936 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.749499"/>
+    <path d="M 140.734354 257.248936 
+L 131.264174 262.622444 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.996095"/>
+    <path d="M 131.264174 262.622444 
+L 121.883647 268.082771 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.260761"/>
+    <path d="M 121.883647 268.082771 
+L 112.574684 273.610758 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.543202"/>
+    <path d="M 112.574684 273.610758 
+L 103.323109 279.192034 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.843068"/>
+    <path d="M 103.323109 279.192034 
+L 94.117658 284.815554 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.160144"/>
+    <path d="M 94.117658 284.815554 
+L 84.949293 290.472694 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.494296"/>
+    <path d="M 84.949293 290.472694 
+L 75.810699 296.156626 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.845422"/>
+    <path d="M 75.810699 296.156626 
+L 66.695905 301.861874 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 4.213449"/>
+    <path d="M 66.695905 301.861874 
 L 57.6 307.584 
-" style="fill:none;stroke:#000000;stroke-width:4.520151;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 57.6 307.584 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 4.598322"/>
+    <path d="M 57.6 307.584 
 L 57.6 307.584 
-" style="fill:none;stroke:#000000;stroke-width:5;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 189.688152 252.56177 
-L 179.06477 259.670748 
-" style="fill:none;stroke:#000000;stroke-width:1.301147;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 179.06477 259.670748 
-L 168.896606 267.143319 
-" style="fill:none;stroke:#000000;stroke-width:1.554749;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 168.896606 267.143319 
-L 159.097871 274.886284 
-" style="fill:none;stroke:#000000;stroke-width:1.838952;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 159.097871 274.886284 
-L 149.603892 282.837821 
-" style="fill:none;stroke:#000000;stroke-width:2.152148;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 149.603892 282.837821 
-L 140.366912 290.956124 
-" style="fill:none;stroke:#000000;stroke-width:2.492939;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 140.366912 290.956124 
-L 131.351495 299.211884 
-" style="fill:none;stroke:#000000;stroke-width:2.860307;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 131.351495 299.211884 
-L 122.530909 307.584 
-" style="fill:none;stroke:#000000;stroke-width:3.254509;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 122.530909 307.584 
-L 122.530909 307.584 
-" style="fill:none;stroke:#000000;stroke-width:3.674591;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 320.425913 240.472116 
-L 306.15107 240.232085 
-" style="fill:none;stroke:#000000;stroke-width:1.320212;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 306.15107 240.232085 
-L 292.788791 240.616866 
-" style="fill:none;stroke:#000000;stroke-width:1.13476;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 292.788791 240.616866 
-L 281.018588 241.694565 
-" style="fill:none;stroke:#000000;stroke-width:1.000337;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 281.018588 241.694565 
-L 270.173696 243.55075 
-" style="fill:none;stroke:#000000;stroke-width:0.919266;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 270.173696 243.55075 
-L 259.677634 246.38259 
-" style="fill:none;stroke:#000000;stroke-width:0.882813;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 259.677634 246.38259 
-L 249.034085 250.542245 
-" style="fill:none;stroke:#000000;stroke-width:0.891806;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 249.034085 250.542245 
-L 237.951067 256.487333 
-" style="fill:none;stroke:#000000;stroke-width:0.955513;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 237.951067 256.487333 
-L 227.53727 263.744888 
-" style="fill:none;stroke:#000000;stroke-width:1.090843;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 227.53727 263.744888 
-L 218.146477 271.751277 
-" style="fill:none;stroke:#000000;stroke-width:1.292921;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 218.146477 271.751277 
-L 209.588151 280.266003 
-" style="fill:none;stroke:#000000;stroke-width:1.544541;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 209.588151 280.266003 
-L 201.700023 289.135932 
-" style="fill:none;stroke:#000000;stroke-width:1.837574;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 201.700023 289.135932 
-L 194.35573 298.263004 
-" style="fill:none;stroke:#000000;stroke-width:2.167755;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 194.35573 298.263004 
-L 187.461818 307.584 
-" style="fill:none;stroke:#000000;stroke-width:2.532526;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 187.461818 307.584 
-L 187.461818 307.584 
-" style="fill:none;stroke:#000000;stroke-width:2.929691;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 257.284793 
-L 400.460367 256.97635 
-" style="fill:none;stroke:#000000;stroke-width:3.487398;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 400.460367 256.97635 
-L 386.179446 256.769799 
-" style="fill:none;stroke:#000000;stroke-width:3.078158;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 386.179446 256.769799 
-L 371.896883 256.821982 
-" style="fill:none;stroke:#000000;stroke-width:2.703583;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 371.896883 256.821982 
-L 357.627922 257.247591 
-" style="fill:none;stroke:#000000;stroke-width:2.366109;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 357.627922 257.247591 
-L 343.410978 258.21132 
-" style="fill:none;stroke:#000000;stroke-width:2.068437;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 343.410978 258.21132 
-L 330.070245 259.826176 
-" style="fill:none;stroke:#000000;stroke-width:1.815153;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 330.070245 259.826176 
-L 318.207364 262.085039 
-" style="fill:none;stroke:#000000;stroke-width:1.623516;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 318.207364 262.085039 
-L 307.314974 265.103156 
-" style="fill:none;stroke:#000000;stroke-width:1.499382;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 307.314974 265.103156 
-L 296.961345 269.090695 
-" style="fill:none;stroke:#000000;stroke-width:1.43571;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 296.961345 269.090695 
-L 286.800832 274.381765 
-" style="fill:none;stroke:#000000;stroke-width:1.433283;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 286.800832 274.381765 
-L 276.640068 281.399657 
-" style="fill:none;stroke:#000000;stroke-width:1.50232;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 276.640068 281.399657 
-L 267.483069 289.545683 
-" style="fill:none;stroke:#000000;stroke-width:1.661876;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 267.483069 289.545683 
-L 259.470864 298.34526 
-" style="fill:none;stroke:#000000;stroke-width:1.903369;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 259.470864 298.34526 
-L 252.392727 307.584 
-" style="fill:none;stroke:#000000;stroke-width:2.208231;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 252.392727 307.584 
-L 252.392727 307.584 
-" style="fill:none;stroke:#000000;stroke-width:2.564871;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 265.797021 
-L 401.414339 266.258882 
-" style="fill:none;stroke:#000000;stroke-width:3.541164;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 401.414339 266.258882 
-L 387.162927 266.945745 
-" style="fill:none;stroke:#000000;stroke-width:3.168088;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 387.162927 266.945745 
-L 372.969729 268.104892 
-" style="fill:none;stroke:#000000;stroke-width:2.805568;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 372.969729 268.104892 
-L 358.902328 269.907454 
-" style="fill:none;stroke:#000000;stroke-width:2.488032;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 358.902328 269.907454 
-L 345.980403 272.366469 
-" style="fill:none;stroke:#000000;stroke-width:2.221882;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 345.980403 272.366469 
-L 334.289406 275.506677 
-" style="fill:none;stroke:#000000;stroke-width:2.029769;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 334.289406 275.506677 
-L 323.405098 279.485997 
-" style="fill:none;stroke:#000000;stroke-width:1.911448;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 323.405098 279.485997 
-L 312.98403 284.557179 
-" style="fill:none;stroke:#000000;stroke-width:1.863238;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 312.98403 284.557179 
-L 302.768507 291.082178 
-" style="fill:none;stroke:#000000;stroke-width:1.890183;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 302.768507 291.082178 
-L 293.208234 298.963481 
-" style="fill:none;stroke:#000000;stroke-width:2.007367;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 293.208234 298.963481 
-L 284.858182 307.584 
-" style="fill:none;stroke:#000000;stroke-width:2.222662;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 284.858182 307.584 
-L 284.858182 307.584 
-" style="fill:none;stroke:#000000;stroke-width:2.515161;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 287.081466 
-L 413.269895 287.298505 
-" style="fill:none;stroke:#000000;stroke-width:3.750548;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 413.269895 287.298505 
-L 399.369606 289.720731 
-" style="fill:none;stroke:#000000;stroke-width:3.713148;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 399.369606 289.720731 
-L 385.752448 292.901007 
-" style="fill:none;stroke:#000000;stroke-width:3.381464;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 385.752448 292.901007 
-L 373.153053 296.796297 
-" style="fill:none;stroke:#000000;stroke-width:3.118013;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 373.153053 296.796297 
-L 361.472589 301.496844 
-" style="fill:none;stroke:#000000;stroke-width:2.943133;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 361.472589 301.496844 
-L 349.789091 307.584 
-" style="fill:none;stroke:#000000;stroke-width:2.858136;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 349.789091 307.584 
-L 349.789091 307.584 
-" style="fill:none;stroke:#000000;stroke-width:2.869872;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 296.496 
-L 414.72 296.496 
-" style="fill:none;stroke:#000000;stroke-width:3.887057;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 296.496 
-L 401.125052 299.738688 
-" style="fill:none;stroke:#000000;stroke-width:3.887057;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 401.125052 299.738688 
-L 387.955558 303.831745 
-" style="fill:none;stroke:#000000;stroke-width:3.596175;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 387.955558 303.831745 
-L 377.355319 307.584 
-" style="fill:none;stroke:#000000;stroke-width:3.387588;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 274.32 
-L 414.72 274.32 
-" style="fill:none;stroke:#000000;stroke-width:3.610447;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 274.32 
-L 400.520323 275.456515 
-" style="fill:none;stroke:#000000;stroke-width:3.610447;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 400.520323 275.456515 
-L 386.416116 277.114851 
-" style="fill:none;stroke:#000000;stroke-width:3.22773;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 386.416116 277.114851 
-L 372.493184 279.459596 
-" style="fill:none;stroke:#000000;stroke-width:2.894399;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 372.493184 279.459596 
-L 358.897588 282.68361 
-" style="fill:none;stroke:#000000;stroke-width:2.618471;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 358.897588 282.68361 
-L 345.852244 286.975281 
-" style="fill:none;stroke:#000000;stroke-width:2.412375;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 229.968 
-L 414.72 229.968 
-" style="fill:none;stroke:#000000;stroke-width:3.379768;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 229.968 
-L 400.788749 227.617415 
-" style="fill:none;stroke:#000000;stroke-width:3.379768;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 400.788749 227.617415 
-L 386.927165 225.049526 
-" style="fill:none;stroke:#000000;stroke-width:2.971493;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 386.927165 225.049526 
-L 373.156974 222.22308 
-" style="fill:none;stroke:#000000;stroke-width:2.596542;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 373.156974 222.22308 
-L 359.508616 219.086948 
-" style="fill:none;stroke:#000000;stroke-width:2.254889;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 359.508616 219.086948 
-L 346.025064 215.578991 
-" style="fill:none;stroke:#000000;stroke-width:1.946472;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 346.025064 215.578991 
-L 332.766447 211.626999 
-" style="fill:none;stroke:#000000;stroke-width:1.671173;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 332.766447 211.626999 
-L 319.815212 207.148018 
-" style="fill:none;stroke:#000000;stroke-width:1.429225;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 319.815212 207.148018 
-L 307.2805 202.056896 
-" style="fill:none;stroke:#000000;stroke-width:1.219552;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 307.2805 202.056896 
-L 295.294446 196.282146 
-" style="fill:none;stroke:#000000;stroke-width:1.041015;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 295.294446 196.282146 
-L 283.99769 189.784114 
-" style="fill:none;stroke:#000000;stroke-width:0.891121;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 283.99769 189.784114 
-L 273.511092 182.571763 
-" style="fill:none;stroke:#000000;stroke-width:0.765763;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 273.511092 182.571763 
-L 263.903386 174.707893 
-" style="fill:none;stroke:#000000;stroke-width:0.658069;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.903386 174.707893 
-L 255.16433 166.297545 
-" style="fill:none;stroke:#000000;stroke-width:0.560201;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 255.16433 166.297545 
-L 247.202775 157.465712 
-" style="fill:none;stroke:#000000;stroke-width:0.463291;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 247.202775 157.465712 
-L 239.801418 148.364098 
-" style="fill:none;stroke:#000000;stroke-width:0.359471;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 239.801418 148.364098 
-L 232.192448 139.373931 
-" style="fill:none;stroke:#000000;stroke-width:0.242098;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 232.192448 139.373931 
-L 232.192448 139.373931 
-" style="fill:none;stroke:#000000;stroke-width:0.109148;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 232.192448 139.373931 
-L 230.020308 137.32129 
-" style="fill:none;stroke:#000000;stroke-width:0.109148;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 230.020308 137.32129 
-L 230.020308 137.32129 
-" style="fill:none;stroke:#000000;stroke-width:0.076185;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 230.020308 137.32129 
-L 227.616669 135.808087 
-" style="fill:none;stroke:#000000;stroke-width:0.076185;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 227.616669 135.808087 
-L 227.616669 135.808087 
-" style="fill:none;stroke:#000000;stroke-width:0.051938;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 227.616669 135.808087 
-L 225.049155 135.184709 
-" style="fill:none;stroke:#000000;stroke-width:0.051938;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 225.049155 135.184709 
-L 222.257236 135.235081 
-" style="fill:none;stroke:#000000;stroke-width:0.046725;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 218.88 
-L 414.72 218.88 
-" style="fill:none;stroke:#000000;stroke-width:3.34767;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 218.88 
-L 400.990103 215.945383 
-" style="fill:none;stroke:#000000;stroke-width:3.34767;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 400.990103 215.945383 
-L 387.381232 212.714438 
-" style="fill:none;stroke:#000000;stroke-width:2.945222;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 387.381232 212.714438 
-L 373.930955 209.135613 
-" style="fill:none;stroke:#000000;stroke-width:2.576533;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 373.930955 209.135613 
-L 360.69026 205.148101 
-" style="fill:none;stroke:#000000;stroke-width:2.241541;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 360.69026 205.148101 
-L 347.726343 200.686607 
-" style="fill:none;stroke:#000000;stroke-width:1.94006;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 347.726343 200.686607 
-L 335.126265 195.682698 
-" style="fill:none;stroke:#000000;stroke-width:1.672166;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 335.126265 195.682698 
-L 322.996849 190.073008 
-" style="fill:none;stroke:#000000;stroke-width:1.436038;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 322.996849 190.073008 
-L 311.459193 183.81092 
-" style="fill:none;stroke:#000000;stroke-width:1.230553;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 311.459193 183.81092 
-L 300.633764 176.880257 
-" style="fill:none;stroke:#000000;stroke-width:1.051842;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 300.633764 176.880257 
-L 290.621752 169.30187 
-" style="fill:none;stroke:#000000;stroke-width:0.894732;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 290.621752 169.30187 
-L 281.491656 161.1279 
-" style="fill:none;stroke:#000000;stroke-width:0.75264;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 281.491656 161.1279 
-L 273.271715 152.433108 
-" style="fill:none;stroke:#000000;stroke-width:0.617344;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 273.271715 152.433108 
-L 265.980895 143.28947 
-" style="fill:none;stroke:#000000;stroke-width:0.48102;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 265.980895 143.28947 
-L 259.754029 133.723586 
-" style="fill:none;stroke:#000000;stroke-width:0.3359;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 259.754029 133.723586 
-L 259.754029 133.723586 
-" style="fill:none;stroke:#000000;stroke-width:0.175663;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 259.754029 133.723586 
-L 258.220069 130.919714 
-" style="fill:none;stroke:#000000;stroke-width:0.175663;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 258.220069 130.919714 
-L 258.220069 130.919714 
-" style="fill:none;stroke:#000000;stroke-width:0.126863;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 258.220069 130.919714 
-L 257.168905 128.702149 
-" style="fill:none;stroke:#000000;stroke-width:0.126863;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 257.168905 128.702149 
-L 257.168905 128.702149 
-" style="fill:none;stroke:#000000;stroke-width:0.087912;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 257.168905 128.702149 
-L 256.463223 126.743097 
-" style="fill:none;stroke:#000000;stroke-width:0.087912;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 256.463223 126.743097 
-L 256.463223 126.743097 
-" style="fill:none;stroke:#000000;stroke-width:0.054375;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 256.463223 126.743097 
-L 256.267169 125.079036 
-" style="fill:none;stroke:#000000;stroke-width:0.054375;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 256.267169 125.079036 
-L 256.267169 125.079036 
-" style="fill:none;stroke:#000000;stroke-width:0.028176;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 256.267169 125.079036 
-L 256.615657 124.195956 
-" style="fill:none;stroke:#000000;stroke-width:0.028176;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 256.615657 124.195956 
-L 257.161919 123.622822 
-" style="fill:none;stroke:#000000;stroke-width:0.025488;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 257.161919 123.622822 
-L 257.972153 123.170148 
-" style="fill:none;stroke:#000000;stroke-width:0.025479;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 257.972153 123.170148 
-L 259.440441 122.770331 
-" style="fill:none;stroke:#000000;stroke-width:0.023204;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 259.440441 122.770331 
-L 259.440441 122.770331 
-" style="fill:none;stroke:#000000;stroke-width:0.016559;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 259.440441 122.770331 
-L 260.453304 122.503463 
-" style="fill:none;stroke:#000000;stroke-width:0.016559;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 260.453304 122.503463 
-L 260.987568 122.227119 
-" style="fill:none;stroke:#000000;stroke-width:0.015615;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 260.987568 122.227119 
-L 261.36519 121.975695 
-" style="fill:none;stroke:#000000;stroke-width:0.013543;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 261.36519 121.975695 
-L 261.660214 121.781335 
-" style="fill:none;stroke:#000000;stroke-width:0.014394;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 261.660214 121.781335 
-L 261.951034 121.645602 
-" style="fill:none;stroke:#000000;stroke-width:0.016863;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 261.951034 121.645602 
-L 262.29019 121.584221 
-" style="fill:none;stroke:#000000;stroke-width:0.018468;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 262.29019 121.584221 
-L 262.649362 121.649636 
-" style="fill:none;stroke:#000000;stroke-width:0.01934;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 262.649362 121.649636 
-L 262.649362 121.649636 
-" style="fill:none;stroke:#000000;stroke-width:0.019383;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 262.649362 121.649636 
-L 262.731607 121.533683 
-" style="fill:none;stroke:#000000;stroke-width:0.019383;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 262.731607 121.533683 
-L 262.786862 121.431388 
-" style="fill:none;stroke:#000000;stroke-width:0.020106;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 262.786862 121.431388 
-L 262.867005 121.384986 
-" style="fill:none;stroke:#000000;stroke-width:0.020678;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 262.867005 121.384986 
-L 262.981416 121.407109 
-" style="fill:none;stroke:#000000;stroke-width:0.02095;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 262.981416 121.407109 
-L 263.107577 121.480202 
-" style="fill:none;stroke:#000000;stroke-width:0.020904;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.107577 121.480202 
-L 263.107577 121.480202 
-" style="fill:none;stroke:#000000;stroke-width:0.020679;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.107577 121.480202 
-L 263.100283 121.398897 
-" style="fill:none;stroke:#000000;stroke-width:0.020679;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.100283 121.398897 
-L 263.092203 121.330861 
-" style="fill:none;stroke:#000000;stroke-width:0.020999;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.092203 121.330861 
-L 263.113638 121.314001 
-" style="fill:none;stroke:#000000;stroke-width:0.021269;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.113638 121.314001 
-L 263.169853 121.35655 
-" style="fill:none;stroke:#000000;stroke-width:0.021341;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.169853 121.35655 
-L 263.238606 121.428319 
-" style="fill:none;stroke:#000000;stroke-width:0.021192;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.238606 121.428319 
-L 263.256399 121.433841 
-" style="fill:none;stroke:#000000;stroke-width:0.021039;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.256399 121.433841 
-L 263.220208 121.364097 
-" style="fill:none;stroke:#000000;stroke-width:0.021087;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.220208 121.364097 
-L 263.18841 121.302381 
-" style="fill:none;stroke:#000000;stroke-width:0.021201;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.18841 121.302381 
-L 263.18737 121.289046 
-" style="fill:none;stroke:#000000;stroke-width:0.021399;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.18737 121.289046 
-L 263.222667 121.332913 
-" style="fill:none;stroke:#000000;stroke-width:0.021449;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.222667 121.332913 
-L 263.275941 121.407124 
-" style="fill:none;stroke:#000000;stroke-width:0.021321;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.275941 121.407124 
-L 263.28677 121.421362 
-" style="fill:none;stroke:#000000;stroke-width:0.02125;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.28677 121.421362 
-L 263.247496 121.359937 
-" style="fill:none;stroke:#000000;stroke-width:0.021243;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.247496 121.359937 
-L 263.210681 121.300686 
-" style="fill:none;stroke:#000000;stroke-width:0.02131;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.210681 121.300686 
-L 263.203933 121.286271 
-" style="fill:none;stroke:#000000;stroke-width:0.021409;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.203933 121.286271 
-L 263.231975 121.325781 
-" style="fill:none;stroke:#000000;stroke-width:0.021461;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.231975 121.325781 
-L 263.278649 121.395646 
-" style="fill:none;stroke:#000000;stroke-width:0.021377;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.278649 121.395646 
-L 263.290354 121.414863 
-" style="fill:none;stroke:#000000;stroke-width:0.021298;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.290354 121.414863 
-L 263.254444 121.361172 
-" style="fill:none;stroke:#000000;stroke-width:0.021277;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.254444 121.361172 
-L 263.217707 121.304191 
-" style="fill:none;stroke:#000000;stroke-width:0.021329;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.217707 121.304191 
-L 263.208628 121.28791 
-" style="fill:none;stroke:#000000;stroke-width:0.021407;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.208628 121.28791 
-L 263.232562 121.322451 
-" style="fill:none;stroke:#000000;stroke-width:0.021455;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.232562 121.322451 
-L 263.275282 121.387311 
-" style="fill:none;stroke:#000000;stroke-width:0.021391;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.275282 121.387311 
-L 263.288785 121.409823 
-" style="fill:none;stroke:#000000;stroke-width:0.021314;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.288785 121.409823 
-L 263.257046 121.363007 
-" style="fill:none;stroke:#000000;stroke-width:0.021288;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.257046 121.363007 
-L 263.221449 121.30832 
-" style="fill:none;stroke:#000000;stroke-width:0.021332;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.221449 121.30832 
-L 263.210917 121.290341 
-" style="fill:none;stroke:#000000;stroke-width:0.021405;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.210917 121.290341 
-L 263.231732 121.320364 
-" style="fill:none;stroke:#000000;stroke-width:0.021447;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.231732 121.320364 
-L 263.271286 121.380516 
-" style="fill:none;stroke:#000000;stroke-width:0.021395;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.271286 121.380516 
-L 263.286319 121.405312 
-" style="fill:none;stroke:#000000;stroke-width:0.021323;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.286319 121.405312 
-L 263.258512 121.364577 
-" style="fill:none;stroke:#000000;stroke-width:0.021294;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.258512 121.364577 
-L 263.224303 121.312224 
-" style="fill:none;stroke:#000000;stroke-width:0.021332;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.224303 121.312224 
-L 263.212704 121.292853 
-" style="fill:none;stroke:#000000;stroke-width:0.0214;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.212704 121.292853 
-L 263.230876 121.318884 
-" style="fill:none;stroke:#000000;stroke-width:0.021438;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.230876 121.318884 
-L 263.26762 121.374717 
-" style="fill:none;stroke:#000000;stroke-width:0.021398;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.26762 121.374717 
-L 263.283787 121.401096 
-" style="fill:none;stroke:#000000;stroke-width:0.021329;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.283787 121.401096 
-L 263.25954 121.365784 
-" style="fill:none;stroke:#000000;stroke-width:0.021299;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.25954 121.365784 
-L 263.226793 121.315799 
-" style="fill:none;stroke:#000000;stroke-width:0.021331;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.226793 121.315799 
-L 263.214357 121.29532 
-" style="fill:none;stroke:#000000;stroke-width:0.021395;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.214357 121.29532 
-L 263.230207 121.317816 
-" style="fill:none;stroke:#000000;stroke-width:0.021429;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.230207 121.317816 
-L 263.264381 121.369677 
-" style="fill:none;stroke:#000000;stroke-width:0.021399;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.264381 121.369677 
-L 263.281339 121.397113 
-" style="fill:none;stroke:#000000;stroke-width:0.021335;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.281339 121.397113 
-L 263.260298 121.366658 
-" style="fill:none;stroke:#000000;stroke-width:0.021303;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.260298 121.366658 
-L 263.229044 121.319062 
-" style="fill:none;stroke:#000000;stroke-width:0.021331;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.229044 121.319062 
-L 263.215946 121.297721 
-" style="fill:none;stroke:#000000;stroke-width:0.021391;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.215946 121.297721 
-L 263.229677 121.317056 
-" style="fill:none;stroke:#000000;stroke-width:0.021425;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.229677 121.317056 
-L 263.261511 121.365285 
-" style="fill:none;stroke:#000000;stroke-width:0.0214;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.261511 121.365285 
-L 263.279008 121.39339 
-" style="fill:none;stroke:#000000;stroke-width:0.02134;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.279008 121.39339 
-L 263.260845 121.367278 
-" style="fill:none;stroke:#000000;stroke-width:0.021307;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.260845 121.367278 
-L 263.231078 121.322038 
-" style="fill:none;stroke:#000000;stroke-width:0.021331;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.231078 121.322038 
-L 263.21746 121.30003 
-" style="fill:none;stroke:#000000;stroke-width:0.021387;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.21746 121.30003 
-L 263.229288 121.316535 
-" style="fill:none;stroke:#000000;stroke-width:0.021422;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.229288 121.316535 
-L 263.258972 121.361427 
-" style="fill:none;stroke:#000000;stroke-width:0.021401;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.258972 121.361427 
-L 263.276807 121.389904 
-" style="fill:none;stroke:#000000;stroke-width:0.021344;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.276807 121.389904 
-L 263.26123 121.367682 
-" style="fill:none;stroke:#000000;stroke-width:0.021311;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.26123 121.367682 
-L 263.232931 121.324754 
-" style="fill:none;stroke:#000000;stroke-width:0.021331;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.232931 121.324754 
-L 263.21891 121.302247 
-" style="fill:none;stroke:#000000;stroke-width:0.021384;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.21891 121.302247 
-L 263.229024 121.316206 
-" style="fill:none;stroke:#000000;stroke-width:0.021418;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.229024 121.316206 
-L 263.256721 121.358017 
-" style="fill:none;stroke:#000000;stroke-width:0.021401;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.256721 121.358017 
-L 263.274731 121.386632 
-" style="fill:none;stroke:#000000;stroke-width:0.021348;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.274731 121.386632 
-L 263.261482 121.367903 
-" style="fill:none;stroke:#000000;stroke-width:0.021314;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.261482 121.367903 
-L 263.234624 121.327237 
-" style="fill:none;stroke:#000000;stroke-width:0.021331;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.234624 121.327237 
-L 263.220302 121.304376 
-" style="fill:none;stroke:#000000;stroke-width:0.021381;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.220302 121.304376 
-L 263.228866 121.316036 
-" style="fill:none;stroke:#000000;stroke-width:0.021415;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.228866 121.316036 
-L 263.254717 121.35499 
-" style="fill:none;stroke:#000000;stroke-width:0.021401;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.254717 121.35499 
-L 263.272773 121.383554 
-" style="fill:none;stroke:#000000;stroke-width:0.021352;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.272773 121.383554 
-L 263.261621 121.367967 
-" style="fill:none;stroke:#000000;stroke-width:0.021318;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.261621 121.367967 
-L 263.236175 121.329509 
-" style="fill:none;stroke:#000000;stroke-width:0.021331;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.236175 121.329509 
-L 263.221641 121.306421 
-" style="fill:none;stroke:#000000;stroke-width:0.021378;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.221641 121.306421 
-L 263.228798 121.315998 
-" style="fill:none;stroke:#000000;stroke-width:0.021412;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.228798 121.315998 
-L 263.252928 121.352294 
-" style="fill:none;stroke:#000000;stroke-width:0.021401;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.252928 121.352294 
-L 263.270923 121.380655 
-" style="fill:none;stroke:#000000;stroke-width:0.021355;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.270923 121.380655 
-L 263.261663 121.367897 
-" style="fill:none;stroke:#000000;stroke-width:0.021321;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.261663 121.367897 
-L 263.237597 121.331589 
-" style="fill:none;stroke:#000000;stroke-width:0.021332;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.237597 121.331589 
-L 263.222929 121.308387 
-" style="fill:none;stroke:#000000;stroke-width:0.021375;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.222929 121.308387 
-L 263.228805 121.316073 
-" style="fill:none;stroke:#000000;stroke-width:0.021409;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.228805 121.316073 
-L 263.251325 121.349885 
-" style="fill:none;stroke:#000000;stroke-width:0.021401;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.251325 121.349885 
-L 263.269173 121.377922 
-" style="fill:none;stroke:#000000;stroke-width:0.021358;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.269173 121.377922 
-L 263.261621 121.367711 
-" style="fill:none;stroke:#000000;stroke-width:0.021324;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.261621 121.367711 
-L 263.2389 121.333493 
-" style="fill:none;stroke:#000000;stroke-width:0.021332;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.2389 121.333493 
-L 263.224168 121.310277 
-" style="fill:none;stroke:#000000;stroke-width:0.021373;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.224168 121.310277 
-L 263.228877 121.316241 
-" style="fill:none;stroke:#000000;stroke-width:0.021406;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.228877 121.316241 
-L 263.249888 121.34773 
-" style="fill:none;stroke:#000000;stroke-width:0.021401;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.249888 121.34773 
-L 263.267518 121.375342 
-" style="fill:none;stroke:#000000;stroke-width:0.02136;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.267518 121.375342 
-L 263.261509 121.367426 
-" style="fill:none;stroke:#000000;stroke-width:0.021327;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.261509 121.367426 
-L 263.240094 121.335235 
-" style="fill:none;stroke:#000000;stroke-width:0.021333;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.240094 121.335235 
-L 263.22536 121.312094 
-" style="fill:none;stroke:#000000;stroke-width:0.021371;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.22536 121.312094 
-L 263.229004 121.316491 
-" style="fill:none;stroke:#000000;stroke-width:0.021404;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.229004 121.316491 
-L 263.248597 121.345799 
-" style="fill:none;stroke:#000000;stroke-width:0.0214;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.248597 121.345799 
-L 263.265951 121.372906 
-" style="fill:none;stroke:#000000;stroke-width:0.021363;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.265951 121.372906 
-L 263.261334 121.367056 
-" style="fill:none;stroke:#000000;stroke-width:0.02133;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.261334 121.367056 
-L 263.241189 121.336828 
-" style="fill:none;stroke:#000000;stroke-width:0.021333;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.241189 121.336828 
-L 263.226507 121.313841 
-" style="fill:none;stroke:#000000;stroke-width:0.021369;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.226507 121.313841 
-L 263.229178 121.31681 
-" style="fill:none;stroke:#000000;stroke-width:0.021401;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.229178 121.31681 
-L 263.247436 121.344068 
-" style="fill:none;stroke:#000000;stroke-width:0.021399;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.247436 121.344068 
-L 263.264467 121.370603 
-" style="fill:none;stroke:#000000;stroke-width:0.021365;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.264467 121.370603 
-L 263.261106 121.366614 
-" style="fill:none;stroke:#000000;stroke-width:0.021332;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.261106 121.366614 
-L 263.24219 121.338283 
-" style="fill:none;stroke:#000000;stroke-width:0.021334;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.24219 121.338283 
-L 263.227611 121.31552 
-" style="fill:none;stroke:#000000;stroke-width:0.021367;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.227611 121.31552 
-L 263.229393 121.317188 
-" style="fill:none;stroke:#000000;stroke-width:0.021399;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.229393 121.317188 
-L 263.246392 121.342515 
-" style="fill:none;stroke:#000000;stroke-width:0.021399;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.246392 121.342515 
-L 263.263061 121.368427 
-" style="fill:none;stroke:#000000;stroke-width:0.021366;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.263061 121.368427 
-L 263.260832 121.366108 
-" style="fill:none;stroke:#000000;stroke-width:0.021335;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.260832 121.366108 
-L 263.243105 121.339609 
-" style="fill:none;stroke:#000000;stroke-width:0.021335;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.243105 121.339609 
-L 263.228673 121.317133 
-" style="fill:none;stroke:#000000;stroke-width:0.021365;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.228673 121.317133 
-L 263.229644 121.317616 
-" style="fill:none;stroke:#000000;stroke-width:0.021397;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.229644 121.317616 
-L 263.245453 121.341123 
-" style="fill:none;stroke:#000000;stroke-width:0.021398;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.245453 121.341123 
-L 263.261729 121.36637 
-" style="fill:none;stroke:#000000;stroke-width:0.021368;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.261729 121.36637 
-L 263.260519 121.36555 
-" style="fill:none;stroke:#000000;stroke-width:0.021337;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.260519 121.36555 
-L 263.24394 121.340816 
-" style="fill:none;stroke:#000000;stroke-width:0.021336;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.24394 121.340816 
-L 263.229693 121.318682 
-" style="fill:none;stroke:#000000;stroke-width:0.021364;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.229693 121.318682 
-L 263.229924 121.318087 
-" style="fill:none;stroke:#000000;stroke-width:0.021395;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.229924 121.318087 
-L 263.244609 121.339876 
-" style="fill:none;stroke:#000000;stroke-width:0.021397;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.244609 121.339876 
-L 263.260468 121.364425 
-" style="fill:none;stroke:#000000;stroke-width:0.02137;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.260468 121.364425 
-L 263.260172 121.364948 
-" style="fill:none;stroke:#000000;stroke-width:0.021339;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.260172 121.364948 
-L 263.244699 121.341911 
-" style="fill:none;stroke:#000000;stroke-width:0.021336;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.244699 121.341911 
-L 263.230673 121.320168 
-" style="fill:none;stroke:#000000;stroke-width:0.021363;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.230673 121.320168 
-L 263.23023 121.318595 
-" style="fill:none;stroke:#000000;stroke-width:0.021392;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.23023 121.318595 
-L 263.243852 121.338761 
-" style="fill:none;stroke:#000000;stroke-width:0.021397;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.243852 121.338761 
-L 263.259273 121.362586 
-" style="fill:none;stroke:#000000;stroke-width:0.021371;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.259273 121.362586 
-L 263.259797 121.364308 
-" style="fill:none;stroke:#000000;stroke-width:0.021341;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.259797 121.364308 
-L 263.245389 121.342902 
-" style="fill:none;stroke:#000000;stroke-width:0.021337;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.245389 121.342902 
-L 263.231614 121.321594 
-" style="fill:none;stroke:#000000;stroke-width:0.021362;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.231614 121.321594 
-L 263.230559 121.319133 
-" style="fill:none;stroke:#000000;stroke-width:0.021391;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.230559 121.319133 
-L 263.243174 121.337766 
-" style="fill:none;stroke:#000000;stroke-width:0.021396;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.243174 121.337766 
-L 263.258141 121.360847 
-" style="fill:none;stroke:#000000;stroke-width:0.021372;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.258141 121.360847 
-L 263.259399 121.363637 
-" style="fill:none;stroke:#000000;stroke-width:0.021343;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.259399 121.363637 
-L 263.246013 121.343796 
-" style="fill:none;stroke:#000000;stroke-width:0.021338;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.246013 121.343796 
-L 263.232517 121.32296 
-" style="fill:none;stroke:#000000;stroke-width:0.021361;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.232517 121.32296 
-L 263.230906 121.319697 
-" style="fill:none;stroke:#000000;stroke-width:0.021389;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.230906 121.319697 
-L 263.242568 121.33688 
-" style="fill:none;stroke:#000000;stroke-width:0.021395;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.242568 121.33688 
-L 263.25707 121.359204 
-" style="fill:none;stroke:#000000;stroke-width:0.021373;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.25707 121.359204 
-L 263.258981 121.362941 
-" style="fill:none;stroke:#000000;stroke-width:0.021345;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.258981 121.362941 
-L 263.246577 121.344599 
-" style="fill:none;stroke:#000000;stroke-width:0.021339;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.246577 121.344599 
-L 263.233382 121.324267 
-" style="fill:none;stroke:#000000;stroke-width:0.02136;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.233382 121.324267 
-L 263.231268 121.320283 
-" style="fill:none;stroke:#000000;stroke-width:0.021387;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.231268 121.320283 
-L 263.242029 121.336094 
-" style="fill:none;stroke:#000000;stroke-width:0.021394;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.242029 121.336094 
-L 263.256056 121.357652 
-" style="fill:none;stroke:#000000;stroke-width:0.021374;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.256056 121.357652 
-L 263.258547 121.362226 
-" style="fill:none;stroke:#000000;stroke-width:0.021347;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.258547 121.362226 
-L 263.247082 121.345317 
-" style="fill:none;stroke:#000000;stroke-width:0.02134;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.247082 121.345317 
-L 263.234211 121.325518 
-" style="fill:none;stroke:#000000;stroke-width:0.021359;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.234211 121.325518 
-L 263.231644 121.320886 
-" style="fill:none;stroke:#000000;stroke-width:0.021385;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.231644 121.320886 
-L 263.241549 121.3354 
-" style="fill:none;stroke:#000000;stroke-width:0.021393;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.241549 121.3354 
-L 263.255097 121.356187 
-" style="fill:none;stroke:#000000;stroke-width:0.021375;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.255097 121.356187 
-L 263.2581 121.361496 
-" style="fill:none;stroke:#000000;stroke-width:0.021349;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.2581 121.361496 
-L 263.247534 121.345954 
-" style="fill:none;stroke:#000000;stroke-width:0.021341;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 207.792 
-L 414.72 207.792 
-" style="fill:none;stroke:#000000;stroke-width:3.313729;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 207.792 
-L 401.183921 204.395316 
-" style="fill:none;stroke:#000000;stroke-width:3.313729;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 401.183921 204.395316 
-L 387.809978 200.660476 
-" style="fill:none;stroke:#000000;stroke-width:2.916174;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 387.809978 200.660476 
-L 374.644004 196.537219 
-" style="fill:none;stroke:#000000;stroke-width:2.552191;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 196.704 
-L 414.72 196.704 
-" style="fill:none;stroke:#000000;stroke-width:3.273567;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 196.704 
-L 401.34994 192.960456 
-" style="fill:none;stroke:#000000;stroke-width:3.273567;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 401.34994 192.960456 
-L 388.167762 188.864851 
-" style="fill:none;stroke:#000000;stroke-width:2.878753;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 388.167762 188.864851 
-L 375.219719 184.374874 
-" style="fill:none;stroke:#000000;stroke-width:2.516558;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 375.219719 184.374874 
-L 362.561223 179.449222 
-" style="fill:none;stroke:#000000;stroke-width:2.186051;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 362.561223 179.449222 
-L 350.256273 174.050462 
-" style="fill:none;stroke:#000000;stroke-width:1.886491;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 350.256273 174.050462 
-L 338.374121 168.150476 
-" style="fill:none;stroke:#000000;stroke-width:1.615116;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 338.374121 168.150476 
-L 326.98213 161.737092 
-" style="fill:none;stroke:#000000;stroke-width:1.36946;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 326.98213 161.737092 
-L 316.134475 154.819988 
-" style="fill:none;stroke:#000000;stroke-width:1.14512;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 316.134475 154.819988 
-L 305.860325 147.432267 
-" style="fill:none;stroke:#000000;stroke-width:0.93695;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 305.860325 147.432267 
-L 296.141628 139.636768 
-" style="fill:none;stroke:#000000;stroke-width:0.738729;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 296.141628 139.636768 
-L 286.859194 131.549955 
-" style="fill:none;stroke:#000000;stroke-width:0.544405;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 286.859194 131.549955 
-L 277.490602 123.528531 
-" style="fill:none;stroke:#000000;stroke-width:0.348131;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 277.490602 123.528531 
-L 277.490602 123.528531 
-" style="fill:none;stroke:#000000;stroke-width:0.146504;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 277.490602 123.528531 
-L 275.147572 121.703598 
-" style="fill:none;stroke:#000000;stroke-width:0.146504;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 275.147572 121.703598 
-L 275.147572 121.703598 
-" style="fill:none;stroke:#000000;stroke-width:0.098922;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 275.147572 121.703598 
-L 273.046075 120.35136 
-" style="fill:none;stroke:#000000;stroke-width:0.098922;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 273.046075 120.35136 
-L 273.046075 120.35136 
-" style="fill:none;stroke:#000000;stroke-width:0.061663;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 273.046075 120.35136 
-L 271.038759 119.528483 
-" style="fill:none;stroke:#000000;stroke-width:0.061663;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 271.038759 119.528483 
-L 271.038759 119.528483 
-" style="fill:none;stroke:#000000;stroke-width:0.033976;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 271.038759 119.528483 
-L 269.496073 119.371405 
-" style="fill:none;stroke:#000000;stroke-width:0.033976;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 185.616 
-L 414.72 185.616 
-" style="fill:none;stroke:#000000;stroke-width:3.223836;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 185.616 
-L 401.473394 181.636192 
-" style="fill:none;stroke:#000000;stroke-width:3.223836;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 401.473394 181.636192 
-L 388.423329 177.311856 
-" style="fill:none;stroke:#000000;stroke-width:2.829099;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 388.423329 177.311856 
-L 375.611071 172.610183 
-" style="fill:none;stroke:#000000;stroke-width:2.465398;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 174.528 
-L 414.72 174.528 
-" style="fill:none;stroke:#000000;stroke-width:3.162179;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 174.528 
-L 401.543611 170.420432 
-" style="fill:none;stroke:#000000;stroke-width:3.162179;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 401.543611 170.420432 
-L 388.556229 165.991949 
-" style="fill:none;stroke:#000000;stroke-width:2.764818;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 388.556229 165.991949 
-L 375.789818 161.220639 
-" style="fill:none;stroke:#000000;stroke-width:2.396801;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 375.789818 161.220639 
-L 363.277321 156.09002 
-" style="fill:none;stroke:#000000;stroke-width:2.057055;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 363.277321 156.09002 
-L 351.048059 150.593655 
-" style="fill:none;stroke:#000000;stroke-width:1.743426;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 351.048059 150.593655 
-L 339.120649 144.740353 
-" style="fill:none;stroke:#000000;stroke-width:1.453069;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 339.120649 144.740353 
-L 327.489522 138.564274 
-" style="fill:none;stroke:#000000;stroke-width:1.182401;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 327.489522 138.564274 
-L 316.097923 132.144293 
-" style="fill:none;stroke:#000000;stroke-width:0.928239;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 316.097923 132.144293 
-L 304.770509 125.662477 
-" style="fill:none;stroke:#000000;stroke-width:0.68621;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 163.44 
-L 414.72 163.44 
-" style="fill:none;stroke:#000000;stroke-width:3.087232;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 163.44 
-L 401.552826 159.315405 
-" style="fill:none;stroke:#000000;stroke-width:3.087232;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 401.552826 159.315405 
-L 388.552208 154.907672 
-" style="fill:none;stroke:#000000;stroke-width:2.684836;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 388.552208 154.907672 
-L 375.738237 150.206508 
-" style="fill:none;stroke:#000000;stroke-width:2.310457;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 152.352 
-L 414.72 152.352 
-" style="fill:none;stroke:#000000;stroke-width:2.998671;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 152.352 
-L 401.496594 148.327699 
-" style="fill:none;stroke:#000000;stroke-width:2.998671;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 401.496594 148.327699 
-L 388.404111 144.072587 
-" style="fill:none;stroke:#000000;stroke-width:2.589651;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 388.404111 144.072587 
-L 375.44864 139.590629 
-" style="fill:none;stroke:#000000;stroke-width:2.207723;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 375.44864 139.590629 
-L 362.626778 134.900117 
-" style="fill:none;stroke:#000000;stroke-width:1.851367;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 362.626778 134.900117 
-L 349.91743 130.041851 
-" style="fill:none;stroke:#000000;stroke-width:1.519272;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 349.91743 130.041851 
-L 337.263886 125.10309 
-" style="fill:none;stroke:#000000;stroke-width:1.208867;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 337.263886 125.10309 
-L 324.542908 120.265485 
-" style="fill:none;stroke:#000000;stroke-width:0.919437;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 324.542908 120.265485 
-L 311.50192 115.965985 
-" style="fill:none;stroke:#000000;stroke-width:0.650177;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 311.50192 115.965985 
-L 311.50192 115.965985 
-" style="fill:none;stroke:#000000;stroke-width:0.406954;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 311.50192 115.965985 
-L 303.47473 113.95463 
-" style="fill:none;stroke:#000000;stroke-width:0.406954;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 303.47473 113.95463 
-L 303.47473 113.95463 
-" style="fill:none;stroke:#000000;stroke-width:0.279539;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 303.47473 113.95463 
-L 296.884204 112.989717 
-" style="fill:none;stroke:#000000;stroke-width:0.279539;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 296.884204 112.989717 
-L 296.884204 112.989717 
-" style="fill:none;stroke:#000000;stroke-width:0.195529;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 296.884204 112.989717 
-L 291.137147 112.876555 
-" style="fill:none;stroke:#000000;stroke-width:0.195529;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 141.264 
-L 414.72 141.264 
-" style="fill:none;stroke:#000000;stroke-width:2.897332;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 141.264 
-L 401.373855 137.470443 
-" style="fill:none;stroke:#000000;stroke-width:2.897332;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 401.373855 137.470443 
-L 388.112443 133.515454 
-" style="fill:none;stroke:#000000;stroke-width:2.481109;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 388.112443 133.515454 
-L 374.927069 129.421563 
-" style="fill:none;stroke:#000000;stroke-width:2.091752;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 130.176 
-L 414.72 130.176 
-" style="fill:none;stroke:#000000;stroke-width:2.78543;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 130.176 
-L 401.189231 126.76405 
-" style="fill:none;stroke:#000000;stroke-width:2.78543;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 401.189231 126.76405 
-L 387.691543 123.280556 
-" style="fill:none;stroke:#000000;stroke-width:2.362791;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 387.691543 123.280556 
-L 374.205135 119.772905 
-" style="fill:none;stroke:#000000;stroke-width:1.967807;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 374.205135 119.772905 
-L 360.691729 116.324493 
-" style="fill:none;stroke:#000000;stroke-width:1.600023;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 360.691729 116.324493 
-L 347.08896 113.08431 
-" style="fill:none;stroke:#000000;stroke-width:1.259631;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 347.08896 113.08431 
-L 333.306952 110.325839 
-" style="fill:none;stroke:#000000;stroke-width:0.948501;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 333.306952 110.325839 
-L 319.269601 108.579794 
-" style="fill:none;stroke:#000000;stroke-width:0.670157;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 319.269601 108.579794 
-L 319.269601 108.579794 
-" style="fill:none;stroke:#000000;stroke-width:0.433337;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 319.269601 108.579794 
-L 310.304276 108.230498 
-" style="fill:none;stroke:#000000;stroke-width:0.433337;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 310.304276 108.230498 
-L 310.304276 108.230498 
-" style="fill:none;stroke:#000000;stroke-width:0.311094;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 310.304276 108.230498 
-L 302.424552 108.698654 
-" style="fill:none;stroke:#000000;stroke-width:0.311094;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 119.088 
-L 414.72 119.088 
-" style="fill:none;stroke:#000000;stroke-width:2.666909;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 119.088 
-L 400.957516 116.236687 
-" style="fill:none;stroke:#000000;stroke-width:2.666909;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 400.957516 116.236687 
-L 387.180419 113.425905 
-" style="fill:none;stroke:#000000;stroke-width:2.240416;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 387.180419 113.425905 
-L 373.361231 110.734932 
-" style="fill:none;stroke:#000000;stroke-width:1.84359;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 96.912 
-L 414.72 96.912 
-" style="fill:none;stroke:#000000;stroke-width:2.438019;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 96.912 
-L 400.509293 95.844911 
-" style="fill:none;stroke:#000000;stroke-width:2.438019;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 400.509293 95.844911 
-L 386.264352 95.085736 
-" style="fill:none;stroke:#000000;stroke-width:2.019617;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 386.264352 95.085736 
-L 371.993126 94.756792 
-" style="fill:none;stroke:#000000;stroke-width:1.637841;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 371.993126 94.756792 
-L 357.725927 95.019584 
-" style="fill:none;stroke:#000000;stroke-width:1.295162;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 357.725927 95.019584 
-L 343.533337 96.072653 
-" style="fill:none;stroke:#000000;stroke-width:0.993719;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 343.533337 96.072653 
-L 329.563792 98.123067 
-" style="fill:none;stroke:#000000;stroke-width:0.736896;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 329.563792 98.123067 
-L 317.045489 100.968749 
-" style="fill:none;stroke:#000000;stroke-width:0.524818;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 85.824 
-L 414.72 85.824 
-" style="fill:none;stroke:#000000;stroke-width:2.349151;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 85.824 
-L 400.441974 86.018089 
-" style="fill:none;stroke:#000000;stroke-width:2.349151;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 400.441974 86.018089 
-L 386.186974 86.623315 
-" style="fill:none;stroke:#000000;stroke-width:1.94594;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 386.186974 86.623315 
-L 371.990034 87.742 
-" style="fill:none;stroke:#000000;stroke-width:1.582052;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 371.990034 87.742 
-L 357.915592 89.489109 
-" style="fill:none;stroke:#000000;stroke-width:1.259007;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 63.648 
-L 414.72 63.648 
-" style="fill:none;stroke:#000000;stroke-width:2.299422;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 63.648 
-L 401.125637 66.903186 
-" style="fill:none;stroke:#000000;stroke-width:2.299422;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 401.125637 66.903186 
-L 387.701414 70.524307 
-" style="fill:none;stroke:#000000;stroke-width:1.939757;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 387.701414 70.524307 
-L 374.473515 74.524928 
-" style="fill:none;stroke:#000000;stroke-width:1.614543;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 374.473515 74.524928 
-L 361.467983 78.908162 
-" style="fill:none;stroke:#000000;stroke-width:1.323144;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 52.56 
-L 414.72 52.56 
-" style="fill:none;stroke:#000000;stroke-width:2.372041;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 414.72 52.56 
-L 401.987619 57.380054 
-" style="fill:none;stroke:#000000;stroke-width:2.372041;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 401.987619 57.380054 
-L 389.414141 62.424739 
-" style="fill:none;stroke:#000000;stroke-width:2.027322;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 389.414141 62.424739 
-L 377.00399 67.685851 
-" style="fill:none;stroke:#000000;stroke-width:1.711247;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 382.254545 41.472 
-L 382.254545 41.472 
-" style="fill:none;stroke:#000000;stroke-width:2.011841;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 382.254545 41.472 
-L 373.674733 49.978181 
-" style="fill:none;stroke:#000000;stroke-width:2.011841;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 373.674733 49.978181 
-L 364.754026 58.283845 
-" style="fill:none;stroke:#000000;stroke-width:1.697644;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 364.754026 58.283845 
-L 355.482066 66.3703 
-" style="fill:none;stroke:#000000;stroke-width:1.410129;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 317.323636 41.472 
-L 317.323636 41.472 
-" style="fill:none;stroke:#000000;stroke-width:1.94894;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 317.323636 41.472 
-L 317.32027 52.113808 
-" style="fill:none;stroke:#000000;stroke-width:1.94894;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 317.32027 52.113808 
-L 316.602005 62.739136 
-" style="fill:none;stroke:#000000;stroke-width:1.543054;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 316.602005 62.739136 
-L 314.83862 73.286627 
-" style="fill:none;stroke:#000000;stroke-width:1.178553;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 314.83862 73.286627 
-L 311.547735 83.606515 
-" style="fill:none;stroke:#000000;stroke-width:0.85963;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 311.547735 83.606515 
-L 311.547735 83.606515 
-" style="fill:none;stroke:#000000;stroke-width:0.592261;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 311.547735 83.606515 
-L 308.08775 90.657896 
-" style="fill:none;stroke:#000000;stroke-width:0.592261;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 284.858182 41.472 
-L 284.858182 41.472 
-" style="fill:none;stroke:#000000;stroke-width:2.144539;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 284.858182 41.472 
-L 287.401372 51.946201 
-" style="fill:none;stroke:#000000;stroke-width:2.144539;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 287.401372 51.946201 
-L 289.764318 62.443172 
-" style="fill:none;stroke:#000000;stroke-width:1.722919;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 289.764318 62.443172 
-L 291.766385 72.980581 
-" style="fill:none;stroke:#000000;stroke-width:1.334;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 291.766385 72.980581 
-L 293.042153 83.573553 
-" style="fill:none;stroke:#000000;stroke-width:0.979163;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 293.042153 83.573553 
-L 293.042153 83.573553 
-" style="fill:none;stroke:#000000;stroke-width:0.662236;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 293.042153 83.573553 
-L 293.064282 92.315729 
-" style="fill:none;stroke:#000000;stroke-width:0.662236;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 293.064282 92.315729 
-L 293.064282 92.315729 
-" style="fill:none;stroke:#000000;stroke-width:0.43529;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 293.064282 92.315729 
-L 292.113631 98.439867 
-" style="fill:none;stroke:#000000;stroke-width:0.43529;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 292.113631 98.439867 
-L 292.113631 98.439867 
-" style="fill:none;stroke:#000000;stroke-width:0.299033;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 252.392727 41.472 
-L 252.392727 41.472 
-" style="fill:none;stroke:#000000;stroke-width:2.33819;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 252.392727 41.472 
-L 255.929965 51.784769 
-" style="fill:none;stroke:#000000;stroke-width:2.33819;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 255.929965 51.784769 
-L 259.62829 62.066117 
-" style="fill:none;stroke:#000000;stroke-width:1.920411;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 259.62829 62.066117 
-L 263.46799 72.318689 
-" style="fill:none;stroke:#000000;stroke-width:1.533187;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 263.46799 72.318689 
-L 267.392027 82.553523 
-" style="fill:none;stroke:#000000;stroke-width:1.175941;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 219.927273 41.472 
-L 219.927273 41.472 
-" style="fill:none;stroke:#000000;stroke-width:2.49389;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 219.927273 41.472 
-L 223.279282 51.818892 
-" style="fill:none;stroke:#000000;stroke-width:2.49389;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 223.279282 51.818892 
-L 226.877354 62.119657 
-" style="fill:none;stroke:#000000;stroke-width:2.079782;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 226.877354 62.119657 
-L 230.75919 72.362874 
-" style="fill:none;stroke:#000000;stroke-width:1.697337;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 230.75919 72.362874 
-L 234.971101 82.533161 
-" style="fill:none;stroke:#000000;stroke-width:1.346082;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 234.971101 82.533161 
-L 239.572479 92.608866 
-" style="fill:none;stroke:#000000;stroke-width:1.025302;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 239.572479 92.608866 
-L 244.652365 102.555195 
-" style="fill:none;stroke:#000000;stroke-width:0.734194;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 244.652365 102.555195 
-L 250.383167 112.30007 
-" style="fill:none;stroke:#000000;stroke-width:0.472222;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 250.383167 112.30007 
-L 250.383167 112.30007 
-" style="fill:none;stroke:#000000;stroke-width:0.237194;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 187.461818 41.472 
-L 187.461818 41.472 
-" style="fill:none;stroke:#000000;stroke-width:2.618416;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 187.461818 41.472 
-L 189.621783 51.993944 
-" style="fill:none;stroke:#000000;stroke-width:2.618416;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 189.621783 51.993944 
-L 191.833997 62.50976 
-" style="fill:none;stroke:#000000;stroke-width:2.203232;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 191.833997 62.50976 
-L 194.075643 73.022104 
-" style="fill:none;stroke:#000000;stroke-width:1.820608;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 194.075643 73.022104 
-L 196.29628 83.536652 
-" style="fill:none;stroke:#000000;stroke-width:1.470461;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 196.29628 83.536652 
-L 198.391225 94.065257 
-" style="fill:none;stroke:#000000;stroke-width:1.152786;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 198.391225 94.065257 
-L 200.114534 104.628816 
-" style="fill:none;stroke:#000000;stroke-width:0.867785;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 200.114534 104.628816 
-L 200.814494 115.243887 
-" style="fill:none;stroke:#000000;stroke-width:0.616921;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 200.814494 115.243887 
-L 200.814494 115.243887 
-" style="fill:none;stroke:#000000;stroke-width:0.405855;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 200.814494 115.243887 
-L 200.085591 121.591895 
-" style="fill:none;stroke:#000000;stroke-width:0.405855;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 200.085591 121.591895 
-L 200.085591 121.591895 
-" style="fill:none;stroke:#000000;stroke-width:0.307369;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 200.085591 121.591895 
-L 198.232839 126.533091 
-" style="fill:none;stroke:#000000;stroke-width:0.307369;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 198.232839 126.533091 
-L 194.681114 131.096979 
-" style="fill:none;stroke:#000000;stroke-width:0.25631;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 194.681114 131.096979 
-L 190.403994 134.399337 
-" style="fill:none;stroke:#000000;stroke-width:0.244053;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 190.403994 134.399337 
-L 185.086322 137.278031 
-" style="fill:none;stroke:#000000;stroke-width:0.266107;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 185.086322 137.278031 
-L 178.093233 140.149734 
-" style="fill:none;stroke:#000000;stroke-width:0.311676;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 178.093233 140.149734 
-L 168.612836 143.257561 
-" style="fill:none;stroke:#000000;stroke-width:0.385322;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 168.612836 143.257561 
-L 155.518229 146.824601 
-" style="fill:none;stroke:#000000;stroke-width:0.500748;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 155.518229 146.824601 
-L 141.908074 150.048403 
-" style="fill:none;stroke:#000000;stroke-width:0.685306;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 141.908074 150.048403 
-L 128.182646 152.99292 
-" style="fill:none;stroke:#000000;stroke-width:0.90653;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 128.182646 152.99292 
-L 114.38066 155.734009 
-" style="fill:none;stroke:#000000;stroke-width:1.159463;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 114.38066 155.734009 
-L 100.522504 158.314221 
-" style="fill:none;stroke:#000000;stroke-width:1.444167;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 100.522504 158.314221 
-L 86.620351 160.760198 
-" style="fill:none;stroke:#000000;stroke-width:1.760768;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 86.620351 160.760198 
-L 72.682211 163.090112 
-" style="fill:none;stroke:#000000;stroke-width:2.109501;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 72.682211 163.090112 
-L 58.713786 165.317321 
-" style="fill:none;stroke:#000000;stroke-width:2.490602;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 58.713786 165.317321 
-L 57.6 165.490891 
-" style="fill:none;stroke:#000000;stroke-width:2.903992;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 154.996364 41.472 
-L 154.996364 41.472 
-" style="fill:none;stroke:#000000;stroke-width:2.749568;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 154.996364 41.472 
-L 155.023062 52.115476 
-" style="fill:none;stroke:#000000;stroke-width:2.749568;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 155.023062 52.115476 
-L 154.567216 62.752385 
-" style="fill:none;stroke:#000000;stroke-width:2.343503;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 154.567216 62.752385 
-L 153.379392 73.35448 
-" style="fill:none;stroke:#000000;stroke-width:1.976685;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 153.379392 73.35448 
-L 151.074002 83.846952 
-" style="fill:none;stroke:#000000;stroke-width:1.654095;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 151.074002 83.846952 
-L 147.096609 94.042291 
-" style="fill:none;stroke:#000000;stroke-width:1.385249;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 147.096609 94.042291 
-L 141.702982 102.506959 
-" style="fill:none;stroke:#000000;stroke-width:1.189233;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 141.702982 102.506959 
-L 135.511845 109.076771 
-" style="fill:none;stroke:#000000;stroke-width:1.098575;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 135.511845 109.076771 
-L 128.474114 114.531825 
-" style="fill:none;stroke:#000000;stroke-width:1.095666;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 128.474114 114.531825 
-L 120.316208 119.37135 
-" style="fill:none;stroke:#000000;stroke-width:1.156276;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 120.316208 119.37135 
-L 110.68296 123.87652 
-" style="fill:none;stroke:#000000;stroke-width:1.272605;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 110.68296 123.87652 
-L 99.110987 128.232381 
-" style="fill:none;stroke:#000000;stroke-width:1.448713;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 99.110987 128.232381 
-L 85.925947 132.3113 
-" style="fill:none;stroke:#000000;stroke-width:1.696521;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 85.925947 132.3113 
-L 72.454527 135.842039 
-" style="fill:none;stroke:#000000;stroke-width:2.015533;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 72.454527 135.842039 
-L 58.802033 138.967886 
-" style="fill:none;stroke:#000000;stroke-width:2.376097;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 58.802033 138.967886 
-L 57.6 139.226721 
-" style="fill:none;stroke:#000000;stroke-width:2.774576;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 122.530909 41.472 
-L 122.530909 41.472 
-" style="fill:none;stroke:#000000;stroke-width:2.949209;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 122.530909 41.472 
-L 119.71497 51.900884 
-" style="fill:none;stroke:#000000;stroke-width:2.949209;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 119.71497 51.900884 
-L 115.753703 62.11526 
-" style="fill:none;stroke:#000000;stroke-width:2.597221;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 115.753703 62.11526 
-L 110.325528 71.939544 
-" style="fill:none;stroke:#000000;stroke-width:2.312321;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 110.325528 71.939544 
-L 103.546636 80.707054 
-" style="fill:none;stroke:#000000;stroke-width:2.112871;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 103.546636 80.707054 
-L 95.945937 87.99733 
-" style="fill:none;stroke:#000000;stroke-width:2.020742;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 95.945937 87.99733 
-L 87.442469 94.282381 
-" style="fill:none;stroke:#000000;stroke-width:2.0305;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 87.442469 94.282381 
-L 77.804513 99.919435 
-" style="fill:none;stroke:#000000;stroke-width:2.123953;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 77.804513 99.919435 
-L 66.728667 105.138937 
-" style="fill:none;stroke:#000000;stroke-width:2.295146;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 66.728667 105.138937 
-L 57.6 109.013988 
-" style="fill:none;stroke:#000000;stroke-width:2.547933;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 90.065455 41.472 
-L 90.065455 41.472 
-" style="fill:none;stroke:#000000;stroke-width:3.289173;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 90.065455 41.472 
-L 84.274456 51.187056 
-" style="fill:none;stroke:#000000;stroke-width:3.289173;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 84.274456 51.187056 
-L 77.064402 60.353458 
-" style="fill:none;stroke:#000000;stroke-width:3.06049;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 77.064402 60.353458 
-L 68.764934 68.45636 
-" style="fill:none;stroke:#000000;stroke-width:2.935291;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 68.764934 68.45636 
-L 59.569071 75.509805 
-" style="fill:none;stroke:#000000;stroke-width:2.924784;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 59.569071 75.509805 
-L 57.6 76.85713 
-" style="fill:none;stroke:#000000;stroke-width:3.018233;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 94.94555 103.681568 
-L 83.186589 109.691326 
-" style="fill:none;stroke:#000000;stroke-width:1.873971;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 83.186589 109.691326 
-L 70.64157 114.759472 
-" style="fill:none;stroke:#000000;stroke-width:2.107181;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 70.64157 114.759472 
-L 57.6 119.088 
-" style="fill:none;stroke:#000000;stroke-width:2.412479;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 57.6 119.088 
-L 57.6 119.088 
-" style="fill:none;stroke:#000000;stroke-width:2.773952;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 96.873857 117.56306 
-L 84.191541 122.438281 
-" style="fill:none;stroke:#000000;stroke-width:1.759464;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 84.191541 122.438281 
-L 71.040957 126.580502 
-" style="fill:none;stroke:#000000;stroke-width:2.052548;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 71.040957 126.580502 
-L 57.6 130.176 
-" style="fill:none;stroke:#000000;stroke-width:2.39738;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 57.6 130.176 
-L 57.6 130.176 
-" style="fill:none;stroke:#000000;stroke-width:2.78543;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 161.630685 116.267159 
-L 155.522482 122.11317 
-" style="fill:none;stroke:#000000;stroke-width:0.688074;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 155.522482 122.11317 
-L 148.193633 127.024504 
-" style="fill:none;stroke:#000000;stroke-width:0.707378;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 148.193633 127.024504 
-L 148.193633 127.024504 
-" style="fill:none;stroke:#000000;stroke-width:0.783071;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 148.193633 127.024504 
-L 138.462244 131.828617 
-" style="fill:none;stroke:#000000;stroke-width:0.783071;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 138.462244 131.828617 
-L 138.462244 131.828617 
-" style="fill:none;stroke:#000000;stroke-width:0.925368;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 138.462244 131.828617 
-L 125.717177 136.603697 
-" style="fill:none;stroke:#000000;stroke-width:0.925368;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 125.717177 136.603697 
-L 112.469505 140.569317 
-" style="fill:none;stroke:#000000;stroke-width:1.152229;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 112.469505 140.569317 
-L 98.947656 143.99348 
-" style="fill:none;stroke:#000000;stroke-width:1.423578;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 98.947656 143.99348 
-L 85.261926 147.038674 
-" style="fill:none;stroke:#000000;stroke-width:1.732824;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 85.261926 147.038674 
-L 71.468668 149.803664 
-" style="fill:none;stroke:#000000;stroke-width:2.077057;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 71.468668 149.803664 
-L 57.6 152.352 
-" style="fill:none;stroke:#000000;stroke-width:2.45511;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 57.6 152.352 
-L 57.6 152.352 
-" style="fill:none;stroke:#000000;stroke-width:2.866521;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 283.837097 209.382321 
-L 271.170642 204.47707 
-" style="fill:none;stroke:#000000;stroke-width:0.79318;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 271.170642 204.47707 
-L 258.887943 199.055867 
-" style="fill:none;stroke:#000000;stroke-width:0.680411;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 258.887943 199.055867 
-L 246.960377 193.207956 
-" style="fill:none;stroke:#000000;stroke-width:0.590584;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 246.960377 193.207956 
-L 235.235633 187.132412 
-" style="fill:none;stroke:#000000;stroke-width:0.519052;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 235.235633 187.132412 
-L 224.009707 181.479522 
-" style="fill:none;stroke:#000000;stroke-width:0.461282;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 224.009707 181.479522 
-L 214.548359 177.324217 
-" style="fill:none;stroke:#000000;stroke-width:0.418566;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 214.548359 177.324217 
-L 205.303727 174.169069 
-" style="fill:none;stroke:#000000;stroke-width:0.397304;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 205.303727 174.169069 
-L 194.885676 171.845327 
-" style="fill:none;stroke:#000000;stroke-width:0.396234;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 194.885676 171.845327 
-L 184.260627 170.715307 
-" style="fill:none;stroke:#000000;stroke-width:0.426453;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 184.260627 170.715307 
-L 184.260627 170.715307 
-" style="fill:none;stroke:#000000;stroke-width:0.493027;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 184.260627 170.715307 
-L 170.005599 170.634911 
-" style="fill:none;stroke:#000000;stroke-width:0.493027;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 170.005599 170.634911 
-L 155.791378 171.617487 
-" style="fill:none;stroke:#000000;stroke-width:0.631696;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 155.791378 171.617487 
-L 141.665256 173.185496 
-" style="fill:none;stroke:#000000;stroke-width:0.816569;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 141.665256 173.185496 
-L 127.605819 175.065335 
-" style="fill:none;stroke:#000000;stroke-width:1.039471;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 127.605819 175.065335 
-L 113.586372 177.106678 
-" style="fill:none;stroke:#000000;stroke-width:1.296888;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 113.586372 177.106678 
-L 99.586783 179.22299 
-" style="fill:none;stroke:#000000;stroke-width:1.58718;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 99.586783 179.22299 
-L 85.593968 181.364159 
-" style="fill:none;stroke:#000000;stroke-width:1.909742;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 85.593968 181.364159 
-L 71.599961 183.500986 
-" style="fill:none;stroke:#000000;stroke-width:2.264363;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 71.599961 183.500986 
-L 57.6 185.616 
-" style="fill:none;stroke:#000000;stroke-width:2.651076;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 57.6 185.616 
-L 57.6 185.616 
-" style="fill:none;stroke:#000000;stroke-width:3.069876;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 260.275792 207.425618 
-L 247.27044 203.028791 
-" style="fill:none;stroke:#000000;stroke-width:0.613547;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 247.27044 203.028791 
-L 234.243489 198.669595 
-" style="fill:none;stroke:#000000;stroke-width:0.542692;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 234.243489 198.669595 
-L 221.900117 194.979632 
-" style="fill:none;stroke:#000000;stroke-width:0.494807;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 221.900117 194.979632 
-L 210.305446 192.2819 
-" style="fill:none;stroke:#000000;stroke-width:0.474342;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 210.305446 192.2819 
-L 197.80133 190.458153 
-" style="fill:none;stroke:#000000;stroke-width:0.481829;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 197.80133 190.458153 
-L 183.582792 189.746346 
-" style="fill:none;stroke:#000000;stroke-width:0.525432;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 183.582792 189.746346 
-L 169.33065 190.235425 
-" style="fill:none;stroke:#000000;stroke-width:0.623574;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 169.33065 190.235425 
-L 155.16393 191.558658 
-" style="fill:none;stroke:#000000;stroke-width:0.771268;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 155.16393 191.558658 
-L 141.098548 193.405251 
-" style="fill:none;stroke:#000000;stroke-width:0.961799;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 141.098548 193.405251 
-L 127.111959 195.564997 
-" style="fill:none;stroke:#000000;stroke-width:1.189883;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 127.111959 195.564997 
-L 113.176929 197.904777 
-" style="fill:none;stroke:#000000;stroke-width:1.452263;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 113.176929 197.904777 
-L 99.271561 200.341405 
-" style="fill:none;stroke:#000000;stroke-width:1.747353;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 99.271561 200.341405 
-L 85.380133 202.822093 
-" style="fill:none;stroke:#000000;stroke-width:2.074381;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 85.380133 202.822093 
-L 71.491964 205.312963 
-" style="fill:none;stroke:#000000;stroke-width:2.433006;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 71.491964 205.312963 
-L 57.6 207.792 
-" style="fill:none;stroke:#000000;stroke-width:2.82314;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 57.6 207.792 
-L 57.6 207.792 
-" style="fill:none;stroke:#000000;stroke-width:3.244777;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 235.088911 206.457002 
-L 222.36469 204.260108 
-" style="fill:none;stroke:#000000;stroke-width:0.523451;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 222.36469 204.260108 
-L 209.524916 202.956536 
-" style="fill:none;stroke:#000000;stroke-width:0.515223;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 209.524916 202.956536 
-L 195.276408 202.717193 
-" style="fill:none;stroke:#000000;stroke-width:0.54238;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 195.276408 202.717193 
-L 181.069563 203.662025 
-" style="fill:none;stroke:#000000;stroke-width:0.619514;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 181.069563 203.662025 
-L 167.010071 205.502425 
-" style="fill:none;stroke:#000000;stroke-width:0.745729;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 167.010071 205.502425 
-L 153.109933 207.942646 
-" style="fill:none;stroke:#000000;stroke-width:0.915312;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 153.109933 207.942646 
-L 139.336294 210.760112 
-" style="fill:none;stroke:#000000;stroke-width:1.122935;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 139.336294 210.760112 
-L 125.649023 213.804872 
-" style="fill:none;stroke:#000000;stroke-width:1.36466;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 125.649023 213.804872 
-L 112.014648 216.979348 
-" style="fill:none;stroke:#000000;stroke-width:1.63842;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 112.014648 216.979348 
-L 98.407947 220.219185 
-" style="fill:none;stroke:#000000;stroke-width:1.943202;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 98.407947 220.219185 
-L 84.810826 223.481412 
-" style="fill:none;stroke:#000000;stroke-width:2.278533;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 84.810826 223.481412 
-L 71.210879 226.737363 
-" style="fill:none;stroke:#000000;stroke-width:2.643898;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 71.210879 226.737363 
-L 57.6 229.968 
-" style="fill:none;stroke:#000000;stroke-width:3.039263;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 57.6 229.968 
-L 57.6 229.968 
-" style="fill:none;stroke:#000000;stroke-width:3.46483;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 111.108902 226.123791 
-L 97.732928 229.859323 
-" style="fill:none;stroke:#000000;stroke-width:2.061561;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 97.732928 229.859323 
-L 84.364015 233.608901 
-" style="fill:none;stroke:#000000;stroke-width:2.402195;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 84.364015 233.608901 
-L 70.989359 237.347033 
-" style="fill:none;stroke:#000000;stroke-width:2.772422;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 70.989359 237.347033 
-L 57.6 241.056 
-" style="fill:none;stroke:#000000;stroke-width:3.171494;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 57.6 241.056 
-L 57.6 241.056 
-" style="fill:none;stroke:#000000;stroke-width:3.59984;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 96.883266 239.383918 
-L 83.799254 243.654986 
-" style="fill:none;stroke:#000000;stroke-width:2.544861;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 83.799254 243.654986 
-L 70.707875 247.913617 
-" style="fill:none;stroke:#000000;stroke-width:2.920661;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 70.707875 247.913617 
-L 57.6 252.144 
-" style="fill:none;stroke:#000000;stroke-width:3.32464;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 57.6 252.144 
-L 57.6 252.144 
-" style="fill:none;stroke:#000000;stroke-width:3.756684;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 121.396752 239.305063 
-L 108.616164 244.058451 
-" style="fill:none;stroke:#000000;stroke-width:2.024893;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 108.616164 244.058451 
-L 95.86259 248.852334 
-" style="fill:none;stroke:#000000;stroke-width:2.353311;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 95.86259 248.852334 
-L 83.116948 253.658302 
-" style="fill:none;stroke:#000000;stroke-width:2.709147;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 83.116948 253.658302 
-L 70.365989 258.456375 
-" style="fill:none;stroke:#000000;stroke-width:3.091871;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 70.365989 258.456375 
-L 57.6 263.232 
-" style="fill:none;stroke:#000000;stroke-width:3.502306;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 57.6 263.232 
-L 57.6 263.232 
-" style="fill:none;stroke:#000000;stroke-width:3.939412;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 119.457629 247.716663 
-L 107.053688 252.995143 
-" style="fill:none;stroke:#000000;stroke-width:2.192592;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 107.053688 252.995143 
-L 94.682185 258.315816 
-" style="fill:none;stroke:#000000;stroke-width:2.532075;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 94.682185 258.315816 
-L 82.324632 263.654576 
-" style="fill:none;stroke:#000000;stroke-width:2.8978;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 82.324632 263.654576 
-L 69.96729 268.993644 
-" style="fill:none;stroke:#000000;stroke-width:3.289648;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 69.96729 268.993644 
-L 57.6 274.32 
-" style="fill:none;stroke:#000000;stroke-width:3.707874;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 57.6 274.32 
-L 57.6 274.32 
-" style="fill:none;stroke:#000000;stroke-width:4.151895;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 150.451475 158.931985 
-L 136.481608 161.152192 
-" style="fill:none;stroke:#000000;stroke-width:0.816435;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 136.481608 161.152192 
-L 122.530909 163.44 
-" style="fill:none;stroke:#000000;stroke-width:1.053016;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 122.530909 163.44 
-L 108.580657 165.729844 
-" style="fill:none;stroke:#000000;stroke-width:1.321533;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 330.665979 249.153647 
-L 316.663529 249.992428 
-" style="fill:none;stroke:#000000;stroke-width:1.530013;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 316.663529 249.992428 
-L 304.461127 251.471014 
-" style="fill:none;stroke:#000000;stroke-width:1.34034;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 304.461127 251.471014 
-L 293.399739 253.66643 
-" style="fill:none;stroke:#000000;stroke-width:1.216735;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 293.399739 253.66643 
-L 282.988776 256.739829 
-" style="fill:none;stroke:#000000;stroke-width:1.147049;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 282.988776 256.739829 
-L 272.784524 260.981347 
-" style="fill:none;stroke:#000000;stroke-width:1.129192;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 272.784524 260.981347 
-L 262.472812 266.812108 
-" style="fill:none;stroke:#000000;stroke-width:1.169398;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 262.472812 266.812108 
-L 252.392727 274.32 
-" style="fill:none;stroke:#000000;stroke-width:1.282537;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 194.94749 218.563156 
-L 181.335352 221.755895 
-" style="fill:none;stroke:#000000;stroke-width:0.752871;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 181.335352 221.755895 
-L 168.040261 225.635037 
-" style="fill:none;stroke:#000000;stroke-width:0.910005;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 168.040261 225.635037 
-L 154.996364 229.968 
-" style="fill:none;stroke:#000000;stroke-width:1.105066;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 154.996364 229.968 
-L 142.132528 234.593774 
-" style="fill:none;stroke:#000000;stroke-width:1.332646;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 224.683113 163.1878 
-L 218.184713 159.01022 
-" style="fill:none;stroke:#000000;stroke-width:0.316498;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 218.184713 159.01022 
-L 211.915721 155.902616 
-" style="fill:none;stroke:#000000;stroke-width:0.275841;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 211.915721 155.902616 
-L 204.609357 153.576439 
-" style="fill:none;stroke:#000000;stroke-width:0.251047;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 204.609357 153.576439 
-L 196.891788 152.450469 
-" style="fill:none;stroke:#000000;stroke-width:0.24859;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 196.891788 152.450469 
-L 196.891788 152.450469 
-" style="fill:none;stroke:#000000;stroke-width:0.277078;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 196.891788 152.450469 
-L 187.461818 152.352 
-" style="fill:none;stroke:#000000;stroke-width:0.277078;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 187.461818 152.352 
-L 187.461818 152.352 
-" style="fill:none;stroke:#000000;stroke-width:0.344038;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 187.461818 152.352 
-L 173.306349 153.609856 
-" style="fill:none;stroke:#000000;stroke-width:0.344038;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 266.948319 231.047565 
-L 255.380044 231.804454 
-" style="fill:none;stroke:#000000;stroke-width:0.747375;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 255.380044 231.804454 
-L 244.194005 233.472845 
-" style="fill:none;stroke:#000000;stroke-width:0.711057;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 244.194005 233.472845 
-L 232.691159 236.348592 
-" style="fill:none;stroke:#000000;stroke-width:0.714278;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 232.691159 236.348592 
-L 219.927273 241.056 
-" style="fill:none;stroke:#000000;stroke-width:0.763411;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 219.927273 241.056 
-L 208.041259 246.931994 
-" style="fill:none;stroke:#000000;stroke-width:0.878439;"/>
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 5"/>
+    <path d="M 235.289514 229.675048 
+L 223.947247 232.298995 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.679029"/>
+    <path d="M 223.947247 232.298995 
+L 213.085734 235.889029 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.737653"/>
+    <path d="M 213.085734 235.889029 
+L 202.740557 240.257204 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.836718"/>
+    <path d="M 202.740557 240.257204 
+L 192.875852 245.21104 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.970077"/>
+    <path d="M 192.875852 245.21104 
+L 183.42315 250.596191 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.133202"/>
+    <path d="M 183.42315 250.596191 
+L 174.311766 256.301091 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.321341"/>
+    <path d="M 174.311766 256.301091 
+L 165.481862 262.247956 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.531847"/>
+    <path d="M 165.481862 262.247956 
+L 156.885967 268.382743 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.763217"/>
+    <path d="M 156.885967 268.382743 
+L 148.486659 274.667197 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.014249"/>
+    <path d="M 148.486659 274.667197 
+L 140.25459 281.073753 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.283876"/>
+    <path d="M 140.25459 281.073753 
+L 132.167535 287.582209 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.571822"/>
+    <path d="M 132.167535 287.582209 
+L 124.207697 294.177346 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.878147"/>
+    <path d="M 124.207697 294.177346 
+L 116.361252 300.847619 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.201825"/>
+    <path d="M 116.361252 300.847619 
+L 108.617143 307.584 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.54386"/>
+    <path d="M 108.617143 307.584 
+L 108.617143 307.584 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.902945"/>
+    <path d="M 295.023584 234.95753 
+L 283.128241 234.848614 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.98168"/>
+    <path d="M 283.128241 234.848614 
+L 271.261697 235.377277 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.876088"/>
+    <path d="M 271.261697 235.377277 
+L 260.103596 236.690977 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.80335"/>
+    <path d="M 260.103596 236.690977 
+L 249.2515 238.964521 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.770932"/>
+    <path d="M 249.2515 238.964521 
+L 238.341191 242.448457 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.780002"/>
+    <path d="M 238.341191 242.448457 
+L 228.116443 246.951777 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.837338"/>
+    <path d="M 228.116443 246.951777 
+L 218.610496 252.269521 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.941483"/>
+    <path d="M 218.610496 252.269521 
+L 209.76582 258.194365 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.085853"/>
+    <path d="M 209.76582 258.194365 
+L 201.488886 264.563025 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.263785"/>
+    <path d="M 201.488886 264.563025 
+L 193.688842 271.259834 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.470077"/>
+    <path d="M 193.688842 271.259834 
+L 186.288168 278.204995 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.702283"/>
+    <path d="M 186.288168 278.204995 
+L 179.225066 285.343521 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.957258"/>
+    <path d="M 179.225066 285.343521 
+L 172.452317 292.636922 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.234616"/>
+    <path d="M 172.452317 292.636922 
+L 165.931918 300.057261 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.533103"/>
+    <path d="M 165.931918 300.057261 
+L 159.634286 307.584 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.852303"/>
+    <path d="M 159.634286 307.584 
+L 159.634286 307.584 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.191897"/>
+    <path d="M 374.340431 247.191883 
+L 362.469992 246.537949 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.364776"/>
+    <path d="M 362.469992 246.537949 
+L 350.588676 246.004827 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.097633"/>
+    <path d="M 350.588676 246.004827 
+L 338.695477 245.650344 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.854588"/>
+    <path d="M 338.695477 245.650344 
+L 326.794909 245.558715 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.636498"/>
+    <path d="M 326.794909 245.558715 
+L 314.902648 245.848565 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.44479"/>
+    <path d="M 314.902648 245.848565 
+L 303.062864 246.683022 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.282076"/>
+    <path d="M 303.062864 246.683022 
+L 291.487038 248.24463 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.15289"/>
+    <path d="M 291.487038 248.24463 
+L 280.786866 250.593497 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.063992"/>
+    <path d="M 280.786866 250.593497 
+L 270.482628 253.939685 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.024196"/>
+    <path d="M 270.482628 253.939685 
+L 260.34411 258.540682 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.034361"/>
+    <path d="M 260.34411 258.540682 
+L 251.100948 264.100037 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.103559"/>
+    <path d="M 251.100948 264.100037 
+L 242.748149 270.402594 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.228426"/>
+    <path d="M 242.748149 270.402594 
+L 235.191198 277.246491 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.401034"/>
+    <path d="M 235.191198 277.246491 
+L 228.308279 284.477752 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.613313"/>
+    <path d="M 228.308279 284.477752 
+L 221.984233 291.989207 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.859044"/>
+    <path d="M 221.984233 291.989207 
+L 216.123678 299.707876 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.134036"/>
+    <path d="M 216.123678 299.707876 
+L 210.651429 307.584 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.435813"/>
+    <path d="M 210.651429 307.584 
+L 210.651429 307.584 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.762831"/>
+    <path d="M 414.72 253.933091 
+L 405.971498 253.527161 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.469638"/>
+    <path d="M 405.971498 253.527161 
+L 394.087929 253.014966 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.212784"/>
+    <path d="M 394.087929 253.014966 
+L 382.198058 252.598891 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.884575"/>
+    <path d="M 382.198058 252.598891 
+L 370.301593 252.316813 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.58033"/>
+    <path d="M 370.301593 252.316813 
+L 358.400503 252.221622 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.300745"/>
+    <path d="M 358.400503 252.221622 
+L 346.502056 252.387247 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.046685"/>
+    <path d="M 346.502056 252.387247 
+L 334.624905 252.915984 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.819628"/>
+    <path d="M 334.624905 252.915984 
+L 322.810134 253.94525 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.622293"/>
+    <path d="M 322.810134 253.94525 
+L 311.143467 255.649115 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.458487"/>
+    <path d="M 311.143467 255.649115 
+L 300.106309 258.128237 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.335626"/>
+    <path d="M 300.106309 258.128237 
+L 289.70585 261.501037 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.263342"/>
+    <path d="M 289.70585 261.501037 
+L 279.566815 266.050408 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.246004"/>
+    <path d="M 279.566815 266.050408 
+L 270.295935 271.581824 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.291087"/>
+    <path d="M 270.295935 271.581824 
+L 261.965204 277.898231 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.399512"/>
+    <path d="M 261.965204 277.898231 
+L 254.506111 284.799465 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.563921"/>
+    <path d="M 254.506111 284.799465 
+L 247.799301 292.120911 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.776033"/>
+    <path d="M 247.799301 292.120911 
+L 241.71998 299.743158 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.026994"/>
+    <path d="M 241.71998 299.743158 
+L 236.16 307.584 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.311611"/>
+    <path d="M 236.16 307.584 
+L 236.16 307.584 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.626159"/>
+    <path d="M 414.72 259.512249 
+L 403.28842 259.397012 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.500093"/>
+    <path d="M 403.28842 259.397012 
+L 391.385258 259.356923 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.170821"/>
+    <path d="M 391.385258 259.356923 
+L 379.484284 259.509475 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.852225"/>
+    <path d="M 379.484284 259.509475 
+L 367.595536 259.920092 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.560008"/>
+    <path d="M 367.595536 259.920092 
+L 355.739457 260.676481 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.295606"/>
+    <path d="M 355.739457 260.676481 
+L 343.954875 261.893266 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.061589"/>
+    <path d="M 343.954875 261.893266 
+L 332.316695 263.714754 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.861736"/>
+    <path d="M 332.316695 263.714754 
+L 320.950146 266.302178 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.703123"/>
+    <path d="M 320.950146 266.302178 
+L 310.185809 269.743865 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.593652"/>
+    <path d="M 310.185809 269.743865 
+L 299.933291 274.209277 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.543359"/>
+    <path d="M 299.933291 274.209277 
+L 290.531057 279.617277 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.559582"/>
+    <path d="M 290.531057 279.617277 
+L 282.061085 285.828667 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.644848"/>
+    <path d="M 282.061085 285.828667 
+L 274.496249 292.664075 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.794098"/>
+    <path d="M 274.496249 292.664075 
+L 267.738821 299.958468 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.999138"/>
+    <path d="M 267.738821 299.958468 
+L 261.668571 307.584 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.250011"/>
+    <path d="M 261.668571 307.584 
+L 261.668571 307.584 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.53988"/>
+    <path d="M 414.72 266.602219 
+L 411.820406 266.669185 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.546943"/>
+    <path d="M 411.820406 266.669185 
+L 399.928919 267.052206 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.462812"/>
+    <path d="M 399.928919 267.052206 
+L 388.058114 267.691696 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.134041"/>
+    <path d="M 388.058114 267.691696 
+L 376.229646 268.664079 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.834081"/>
+    <path d="M 376.229646 268.664079 
+L 364.481297 270.066923 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.565586"/>
+    <path d="M 364.481297 270.066923 
+L 352.878876 272.020027 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.331933"/>
+    <path d="M 352.878876 272.020027 
+L 341.528857 274.658318 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.140137"/>
+    <path d="M 341.528857 274.658318 
+L 330.583244 278.108515 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.997458"/>
+    <path d="M 330.583244 278.108515 
+L 320.230803 282.451774 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.913551"/>
+    <path d="M 320.230803 282.451774 
+L 310.649653 287.68578 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.898246"/>
+    <path d="M 310.649653 287.68578 
+L 301.94961 293.718121 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.955036"/>
+    <path d="M 301.94961 293.718121 
+L 294.146518 300.402139 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.082161"/>
+    <path d="M 294.146518 300.402139 
+L 287.177143 307.584 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.272523"/>
+    <path d="M 287.177143 307.584 
+L 287.177143 307.584 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.51613"/>
+    <path d="M 395.566377 276.339875 
+L 383.85061 277.890642 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.109241"/>
+    <path d="M 383.85061 277.890642 
+L 372.278612 279.946322 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.844002"/>
+    <path d="M 372.278612 279.946322 
+L 360.940558 282.62031 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.620917"/>
+    <path d="M 360.940558 282.62031 
+L 349.963764 286.022835 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.446783"/>
+    <path d="M 349.963764 286.022835 
+L 339.509607 290.235051 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.330807"/>
+    <path d="M 339.509607 290.235051 
+L 329.74193 295.277924 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.283005"/>
+    <path d="M 329.74193 295.277924 
+L 320.784126 301.098118 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.308581"/>
+    <path d="M 320.784126 301.098118 
+L 312.685714 307.584 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.408425"/>
+    <path d="M 312.685714 307.584 
+L 312.685714 307.584 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.5771"/>
+    <path d="M 414.72 291.599417 
+L 406.956092 293.197673 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.812083"/>
+    <path d="M 406.956092 293.197673 
+L 395.595976 295.828773 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.628194"/>
+    <path d="M 395.595976 295.828773 
+L 384.51998 299.058042 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.39267"/>
+    <path d="M 384.51998 299.058042 
+L 373.845112 302.961183 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.212555"/>
+    <path d="M 373.845112 302.961183 
+L 363.702857 307.584 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.097007"/>
+    <path d="M 363.702857 307.584 
+L 363.702857 307.584 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.053149"/>
+    <path d="M 414.72 224.997517 
+L 414.72 224.997517 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.365285"/>
+    <path d="M 414.72 224.997517 
+L 403.179312 222.82505 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.365285"/>
+    <path d="M 403.179312 222.82505 
+L 391.700476 220.478296 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.024832"/>
+    <path d="M 391.700476 220.478296 
+L 380.299245 217.930788 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.70764"/>
+    <path d="M 380.299245 217.930788 
+L 368.996259 215.151678 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.413846"/>
+    <path d="M 368.996259 215.151678 
+L 357.818588 212.105255 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.143449"/>
+    <path d="M 357.818588 212.105255 
+L 346.801591 208.750798 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.896348"/>
+    <path d="M 346.801591 208.750798 
+L 335.990853 205.043467 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.672463"/>
+    <path d="M 335.990853 205.043467 
+L 325.443296 200.938561 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.471526"/>
+    <path d="M 325.443296 200.938561 
+L 315.227659 196.393207 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.292946"/>
+    <path d="M 315.227659 196.393207 
+L 305.421956 191.372936 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.135666"/>
+    <path d="M 305.421956 191.372936 
+L 296.106352 185.859821 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.997896"/>
+    <path d="M 296.106352 185.859821 
+L 287.353582 179.857128 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.876981"/>
+    <path d="M 287.353582 179.857128 
+L 279.219432 173.389231 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.769196"/>
+    <path d="M 279.219432 173.389231 
+L 271.734712 166.499032 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.670246"/>
+    <path d="M 271.734712 166.499032 
+L 264.906252 159.23957 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.574635"/>
+    <path d="M 264.906252 159.23957 
+L 258.729463 151.662158 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.47791"/>
+    <path d="M 258.729463 151.662158 
+L 253.212429 143.807064 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.375357"/>
+    <path d="M 253.212429 143.807064 
+L 248.500263 135.670331 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.262953"/>
+    <path d="M 248.500263 135.670331 
+L 248.500263 135.670331 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.13808"/>
+    <path d="M 248.500263 135.670331 
+L 247.338963 133.216415 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.13808"/>
+    <path d="M 247.338963 133.216415 
+L 247.338963 133.216415 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.098761"/>
+    <path d="M 247.338963 133.216415 
+L 246.539618 131.104958 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.098761"/>
+    <path d="M 246.539618 131.104958 
+L 246.539618 131.104958 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.065056"/>
+    <path d="M 246.539618 131.104958 
+L 246.178488 129.284174 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.065056"/>
+    <path d="M 246.178488 129.284174 
+L 246.178488 129.284174 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.038797"/>
+    <path d="M 246.178488 129.284174 
+L 246.579506 127.840023 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.038797"/>
+    <path d="M 246.579506 127.840023 
+L 246.579506 127.840023 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021976"/>
+    <path d="M 246.579506 127.840023 
+L 247.452683 127.068361 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021976"/>
+    <path d="M 247.452683 127.068361 
+L 248.420052 126.500355 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.022316"/>
+    <path d="M 248.420052 126.500355 
+L 249.840849 125.921642 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.025672"/>
+    <path d="M 249.840849 125.921642 
+L 252.949096 125.005275 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.025573"/>
+    <path d="M 252.949096 125.005275 
+L 252.949096 125.005275 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.017079"/>
+    <path d="M 252.949096 125.005275 
+L 254.659365 124.371206 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.017079"/>
+    <path d="M 254.659365 124.371206 
+L 255.938305 123.8435 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.020558"/>
+    <path d="M 255.938305 123.8435 
+L 257.298535 123.345259 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.024584"/>
+    <path d="M 257.298535 123.345259 
+L 259.661721 122.906965 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.02433"/>
+    <path d="M 259.661721 122.906965 
+L 259.661721 122.906965 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.018432"/>
+    <path d="M 259.661721 122.906965 
+L 259.661721 122.906965 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.018432"/>
+    <path d="M 259.661721 122.906965 
+L 260.514839 122.493567 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.018432"/>
+    <path d="M 260.514839 122.493567 
+L 261.036604 122.201106 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.011859"/>
+    <path d="M 261.036604 122.201106 
+L 261.411897 121.921704 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.009394"/>
+    <path d="M 261.411897 121.921704 
+L 261.683481 121.731927 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.011517"/>
+    <path d="M 261.683481 121.731927 
+L 261.992786 121.598965 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.014258"/>
+    <path d="M 261.992786 121.598965 
+L 262.37652 121.540489 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.01616"/>
+    <path d="M 262.37652 121.540489 
+L 262.37652 121.540489 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.017677"/>
+    <path d="M 262.37652 121.540489 
+L 262.683993 121.559472 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.017677"/>
+    <path d="M 262.683993 121.559472 
+L 262.683993 121.559472 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.01866"/>
+    <path d="M 262.683993 121.559472 
+L 262.810926 121.499792 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.01866"/>
+    <path d="M 262.810926 121.499792 
+L 262.890944 121.436216 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.019449"/>
+    <path d="M 262.890944 121.436216 
+L 262.960917 121.395945 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.020042"/>
+    <path d="M 262.960917 121.395945 
+L 263.035621 121.390594 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.020449"/>
+    <path d="M 263.035621 121.390594 
+L 263.108974 121.410042 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.02069"/>
+    <path d="M 263.108974 121.410042 
+L 263.157985 121.418192 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.020821"/>
+    <path d="M 263.157985 121.418192 
+L 263.170554 121.390794 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.020935"/>
+    <path d="M 263.170554 121.390794 
+L 263.1666 121.35052 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021076"/>
+    <path d="M 263.1666 121.35052 
+L 263.170558 121.329169 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021218"/>
+    <path d="M 263.170558 121.329169 
+L 263.192051 121.339299 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021309"/>
+    <path d="M 263.192051 121.339299 
+L 263.224451 121.370781 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021328"/>
+    <path d="M 263.224451 121.370781 
+L 263.244777 121.38884 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021302"/>
+    <path d="M 263.244777 121.38884 
+L 263.237976 121.369774 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021296"/>
+    <path d="M 263.237976 121.369774 
+L 263.219421 121.335339 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021343"/>
+    <path d="M 263.219421 121.335339 
+L 263.210972 121.317446 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021414"/>
+    <path d="M 263.210972 121.317446 
+L 263.22163 121.329242 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021456"/>
+    <path d="M 263.22163 121.329242 
+L 263.245332 121.36157 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021441"/>
+    <path d="M 263.245332 121.36157 
+L 263.260291 121.381652 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021392"/>
+    <path d="M 263.260291 121.381652 
+L 263.250913 121.365866 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021365"/>
+    <path d="M 263.250913 121.365866 
+L 263.230348 121.333718 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021392"/>
+    <path d="M 263.230348 121.333718 
+L 263.219421 121.316311 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021448"/>
+    <path d="M 263.219421 121.316311 
+L 263.22721 121.327208 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021482"/>
+    <path d="M 263.22721 121.327208 
+L 263.248328 121.358305 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021463"/>
+    <path d="M 263.248328 121.358305 
+L 263.262281 121.378806 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021411"/>
+    <path d="M 263.262281 121.378806 
+L 263.25343 121.365184 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.02138"/>
+    <path d="M 263.25343 121.365184 
+L 263.233234 121.334606 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021402"/>
+    <path d="M 263.233234 121.334606 
+L 263.221752 121.31717 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021453"/>
+    <path d="M 263.221752 121.31717 
+L 263.228244 121.326769 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021484"/>
+    <path d="M 263.228244 121.326769 
+L 263.247987 121.356305 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021467"/>
+    <path d="M 263.247987 121.356305 
+L 263.261726 121.376854 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021417"/>
+    <path d="M 263.261726 121.376854 
+L 263.253917 121.365062 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021385"/>
+    <path d="M 263.253917 121.365062 
+L 263.234529 121.335894 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021403"/>
+    <path d="M 263.234529 121.335894 
+L 263.222892 121.318377 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021452"/>
+    <path d="M 263.222892 121.318377 
+L 263.228441 121.326683 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021483"/>
+    <path d="M 263.228441 121.326683 
+L 263.247081 121.354659 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021468"/>
+    <path d="M 263.247081 121.354659 
+L 263.260722 121.375132 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.02142"/>
+    <path d="M 263.260722 121.375132 
+L 263.253983 121.364998 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021388"/>
+    <path d="M 263.253983 121.364998 
+L 263.235471 121.337183 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021404"/>
+    <path d="M 263.235471 121.337183 
+L 263.223784 121.319621 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.02145"/>
+    <path d="M 263.223784 121.319621 
+L 263.228507 121.326709 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021481"/>
+    <path d="M 263.228507 121.326709 
+L 263.246135 121.353184 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021468"/>
+    <path d="M 263.246135 121.353184 
+L 263.259669 121.37351 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021423"/>
+    <path d="M 263.259669 121.37351 
+L 263.253939 121.364901 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021391"/>
+    <path d="M 263.253939 121.364901 
+L 263.236298 121.338401 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021404"/>
+    <path d="M 263.236298 121.338401 
+L 263.224608 121.32084 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021447"/>
+    <path d="M 263.224608 121.32084 
+L 263.228573 121.326795 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021479"/>
+    <path d="M 263.228573 121.326795 
+L 263.245243 121.351834 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021468"/>
+    <path d="M 263.245243 121.351834 
+L 263.258642 121.371959 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021425"/>
+    <path d="M 263.258642 121.371959 
+L 263.253847 121.364757 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021393"/>
+    <path d="M 263.253847 121.364757 
+L 263.23706 121.33954 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021404"/>
+    <path d="M 263.23706 121.33954 
+L 263.2254 121.322026 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021446"/>
+    <path d="M 263.2254 121.322026 
+L 263.228663 121.326927 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021477"/>
+    <path d="M 263.228663 121.326927 
+L 263.244419 121.350594 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021468"/>
+    <path d="M 263.244419 121.350594 
+L 263.257653 121.370473 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021427"/>
+    <path d="M 263.257653 121.370473 
+L 263.253722 121.364568 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021395"/>
+    <path d="M 263.253722 121.364568 
+L 263.237766 121.340601 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021405"/>
+    <path d="M 263.237766 121.340601 
+L 263.226166 121.323176 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021444"/>
+    <path d="M 263.226166 121.323176 
+L 263.228777 121.327097 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021474"/>
+    <path d="M 263.228777 121.327097 
+L 263.243661 121.349454 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021467"/>
+    <path d="M 263.243661 121.349454 
+L 263.256705 121.369049 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021429"/>
+    <path d="M 263.256705 121.369049 
+L 263.25357 121.36434 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021398"/>
+    <path d="M 263.25357 121.36434 
+L 263.238423 121.341588 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021405"/>
+    <path d="M 263.238423 121.341588 
+L 263.226908 121.32429 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021442"/>
+    <path d="M 263.226908 121.32429 
+L 263.228913 121.327303 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021472"/>
+    <path d="M 263.228913 121.327303 
+L 263.242963 121.348406 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021467"/>
+    <path d="M 263.242963 121.348406 
+L 263.255796 121.367683 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021431"/>
+    <path d="M 263.255796 121.367683 
+L 263.253395 121.364076 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.0214"/>
+    <path d="M 263.253395 121.364076 
+L 263.239034 121.342505 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021405"/>
+    <path d="M 263.239034 121.342505 
+L 263.227626 121.325369 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.02144"/>
+    <path d="M 263.227626 121.325369 
+L 263.22907 121.327538 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.02147"/>
+    <path d="M 263.22907 121.327538 
+L 263.242322 121.347443 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021467"/>
+    <path d="M 263.242322 121.347443 
+L 263.254925 121.366374 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021432"/>
+    <path d="M 263.254925 121.366374 
+L 263.253198 121.363781 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021402"/>
+    <path d="M 263.253198 121.363781 
+L 263.2396 121.343356 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021406"/>
+    <path d="M 263.2396 121.343356 
+L 263.228321 121.326413 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021439"/>
+    <path d="M 263.228321 121.326413 
+L 263.229245 121.327801 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021469"/>
+    <path d="M 263.229245 121.327801 
+L 263.241733 121.346559 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021466"/>
+    <path d="M 263.241733 121.346559 
+L 263.25409 121.36512 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021434"/>
+    <path d="M 263.25409 121.36512 
+L 263.252983 121.363457 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021404"/>
+    <path d="M 263.252983 121.363457 
+L 263.240125 121.344144 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021406"/>
+    <path d="M 263.240125 121.344144 
+L 263.228994 121.327424 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021438"/>
+    <path d="M 263.228994 121.327424 
+L 263.229436 121.328087 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021467"/>
+    <path d="M 263.229436 121.328087 
+L 263.241193 121.345748 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021466"/>
+    <path d="M 263.241193 121.345748 
+L 263.25329 121.363919 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021435"/>
+    <path d="M 263.25329 121.363919 
+L 263.252752 121.36311 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021406"/>
+    <path d="M 263.252752 121.36311 
+L 263.240611 121.344873 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021407"/>
+    <path d="M 263.240611 121.344873 
+L 263.229644 121.3284 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021436"/>
+    <path d="M 263.229644 121.3284 
+L 263.22964 121.328394 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021465"/>
+    <path d="M 263.22964 121.328394 
+L 263.240698 121.345004 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021465"/>
+    <path d="M 263.240698 121.345004 
+L 263.252524 121.362768 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021436"/>
+    <path d="M 263.252524 121.362768 
+L 263.252507 121.362742 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021407"/>
+    <path d="M 263.252507 121.362742 
+L 263.241059 121.345546 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021407"/>
+    <path d="M 263.241059 121.345546 
+L 263.230273 121.329344 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021435"/>
+    <path d="M 263.230273 121.329344 
+L 263.229857 121.32872 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021463"/>
+    <path d="M 263.229857 121.32872 
+L 263.240245 121.344324 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021464"/>
+    <path d="M 263.240245 121.344324 
+L 263.25179 121.361666 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021437"/>
+    <path d="M 263.25179 121.361666 
+L 263.252249 121.362355 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021409"/>
+    <path d="M 263.252249 121.362355 
+L 263.241471 121.346166 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021408"/>
+    <path d="M 263.241471 121.346166 
+L 263.230879 121.330256 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021434"/>
+    <path d="M 263.230879 121.330256 
+L 263.230084 121.329061 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021462"/>
+    <path d="M 263.230084 121.329061 
+L 263.239832 121.343703 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021464"/>
+    <path d="M 263.239832 121.343703 
+L 263.251089 121.360612 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021438"/>
+    <path d="M 263.251089 121.360612 
+L 263.251981 121.361953 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021411"/>
+    <path d="M 263.251981 121.361953 
+L 263.241851 121.346735 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021409"/>
+    <path d="M 263.241851 121.346735 
+L 263.231465 121.331135 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021433"/>
+    <path d="M 263.231465 121.331135 
+L 263.23032 121.329416 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.02146"/>
+    <path d="M 263.23032 121.329416 
+L 263.239455 121.343137 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021463"/>
+    <path d="M 263.239455 121.343137 
+L 263.250417 121.359604 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021439"/>
+    <path d="M 263.250417 121.359604 
+L 263.251705 121.361538 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021412"/>
+    <path d="M 263.251705 121.361538 
+L 263.242198 121.347257 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021409"/>
+    <path d="M 263.242198 121.347257 
+L 263.232029 121.331983 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021432"/>
+    <path d="M 263.232029 121.331983 
+L 263.230564 121.329782 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021459"/>
+    <path d="M 263.230564 121.329782 
+L 263.239113 121.342623 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021463"/>
+    <path d="M 263.239113 121.342623 
+L 263.249776 121.35864 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.02144"/>
+    <path d="M 263.249776 121.35864 
+L 263.251421 121.361112 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021414"/>
+    <path d="M 263.251421 121.361112 
+L 263.242515 121.347734 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.02141"/>
+    <path d="M 263.242515 121.347734 
+L 263.232573 121.3328 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021432"/>
+    <path d="M 263.232573 121.3328 
+L 263.230814 121.330158 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021457"/>
+    <path d="M 263.230814 121.330158 
+L 263.238802 121.342156 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021462"/>
+    <path d="M 263.238802 121.342156 
+L 263.249162 121.357718 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021441"/>
+    <path d="M 263.249162 121.357718 
+L 263.251132 121.360677 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021415"/>
+    <path d="M 263.251132 121.360677 
+L 263.242804 121.348167 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021411"/>
+    <path d="M 263.242804 121.348167 
+L 263.233096 121.333586 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021431"/>
+    <path d="M 263.233096 121.333586 
+L 263.23107 121.330543 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021456"/>
+    <path d="M 263.23107 121.330543 
+L 263.238522 121.341735 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021461"/>
+    <path d="M 263.238522 121.341735 
+L 263.248577 121.356839 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021442"/>
+    <path d="M 263.248577 121.356839 
+L 263.250838 121.360235 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021417"/>
+    <path d="M 263.250838 121.360235 
+L 263.243065 121.34856 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021411"/>
+    <path d="M 263.243065 121.34856 
+L 263.2336 121.334342 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.02143"/>
+    <path d="M 263.2336 121.334342 
+L 263.231331 121.330934 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021455"/>
+    <path d="M 263.231331 121.330934 
+L 263.238269 121.341356 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021461"/>
+    <path d="M 263.238269 121.341356 
+L 263.248018 121.355999 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021442"/>
+    <path d="M 263.248018 121.355999 
+L 263.25054 121.359788 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021418"/>
+    <path d="M 263.25054 121.359788 
+L 263.243302 121.348915 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021412"/>
+    <path d="M 263.243302 121.348915 
+L 263.234084 121.335069 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.02143"/>
+    <path d="M 263.234084 121.335069 
+L 263.231594 121.33133 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021453"/>
+    <path d="M 263.231594 121.33133 
+L 263.238043 121.341016 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.02146"/>
+    <path d="M 263.238043 121.341016 
+L 263.247484 121.355198 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021443"/>
+    <path d="M 263.247484 121.355198 
+L 263.25024 121.359337 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021419"/>
+    <path d="M 263.25024 121.359337 
+L 263.243514 121.349234 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021413"/>
+    <path d="M 263.243514 121.349234 
+L 263.234549 121.335767 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021429"/>
+    <path d="M 263.234549 121.335767 
+L 263.23186 121.331729 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021452"/>
+    <path d="M 263.23186 121.331729 
+L 263.237841 121.340712 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021459"/>
+    <path d="M 263.237841 121.340712 
+L 263.246976 121.354434 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021444"/>
+    <path d="M 263.246976 121.354434 
+L 263.249938 121.358884 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.021421"/>
+    <path d="M 414.72 215.821241 
+L 414.72 215.821241 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.338688"/>
+    <path d="M 414.72 215.821241 
+L 403.315751 213.28022 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.338688"/>
+    <path d="M 403.315751 213.28022 
+L 392.00022 210.52835 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.002143"/>
+    <path d="M 392.00022 210.52835 
+L 380.795162 207.536818 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.689053"/>
+    <path d="M 380.795162 207.536818 
+L 369.728232 204.273305 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.399407"/>
+    <path d="M 369.728232 204.273305 
+L 358.834402 200.702137 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.13317"/>
+    <path d="M 414.72 197.46869 
+L 414.72 197.46869 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.276654"/>
+    <path d="M 414.72 197.46869 
+L 403.557543 194.389251 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.276654"/>
+    <path d="M 403.557543 194.389251 
+L 392.519515 191.070722 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.945103"/>
+    <path d="M 392.519515 191.070722 
+L 381.631378 187.488459 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.636383"/>
+    <path d="M 381.631378 187.488459 
+L 370.923494 183.616894 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.350173"/>
+    <path d="M 370.923494 183.616894 
+L 360.430266 179.432378 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.085869"/>
+    <path d="M 360.430266 179.432378 
+L 350.190354 174.913511 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.842408"/>
+    <path d="M 350.190354 174.913511 
+L 340.245019 170.043634 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.618625"/>
+    <path d="M 340.245019 170.043634 
+L 330.635016 164.813719 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.412889"/>
+    <path d="M 330.635016 164.813719 
+L 321.396155 159.224998 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.222631"/>
+    <path d="M 321.396155 159.224998 
+L 312.554537 153.290114 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.045042"/>
+    <path d="M 312.554537 153.290114 
+L 304.120569 147.034208 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.876863"/>
+    <path d="M 304.120569 147.034208 
+L 296.080466 140.496078 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.71454"/>
+    <path d="M 296.080466 140.496078 
+L 288.372546 133.738412 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.554178"/>
+    <path d="M 288.372546 133.738412 
+L 280.81237 126.88855 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.392275"/>
+    <path d="M 280.81237 126.88855 
+L 280.81237 126.88855 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.22636"/>
+    <path d="M 280.81237 126.88855 
+L 275.282717 122.267831 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.22636"/>
+    <path d="M 275.282717 122.267831 
+L 275.282717 122.267831 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.108599"/>
+    <path d="M 414.72 188.292414 
+L 414.72 188.292414 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.236856"/>
+    <path d="M 414.72 188.292414 
+L 403.646866 185.038932 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.236856"/>
+    <path d="M 403.646866 185.038932 
+L 392.70515 181.547761 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.905673"/>
+    <path d="M 392.70515 181.547761 
+L 381.918632 177.798484 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.596691"/>
+    <path d="M 381.918632 177.798484 
+L 371.314103 173.771775 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.309136"/>
+    <path d="M 371.314103 173.771775 
+L 360.921325 169.449842 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.042297"/>
+    <path d="M 414.72 179.116138 
+L 414.72 179.116138 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.189281"/>
+    <path d="M 414.72 179.116138 
+L 403.708195 175.748897 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.189281"/>
+    <path d="M 403.708195 175.748897 
+L 392.82693 172.154093 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.856965"/>
+    <path d="M 392.82693 172.154093 
+L 382.096622 168.315984 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.545801"/>
+    <path d="M 382.096622 168.315984 
+L 371.539522 164.220173 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.255246"/>
+    <path d="M 371.539522 164.220173 
+L 361.17838 159.855651 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.984054"/>
+    <path d="M 361.17838 159.855651 
+L 351.034618 155.216486 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.731148"/>
+    <path d="M 351.034618 155.216486 
+L 341.12547 150.303918 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.494478"/>
+    <path d="M 341.12547 150.303918 
+L 331.460275 145.128416 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.272187"/>
+    <path d="M 331.460275 145.128416 
+L 322.032411 139.715037 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.062108"/>
+    <path d="M 322.032411 139.715037 
+L 312.806386 134.111375 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.861493"/>
+    <path d="M 312.806386 134.111375 
+L 303.688049 128.410481 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.667881"/>
+    <path d="M 414.72 160.763586 
+L 414.72 160.763586 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.067087"/>
+    <path d="M 414.72 160.763586 
+L 403.729972 157.356478 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.067087"/>
+    <path d="M 403.729972 157.356478 
+L 392.848374 153.761474 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.728369"/>
+    <path d="M 392.848374 153.761474 
+L 382.085225 149.973781 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.409219"/>
+    <path d="M 382.085225 149.973781 
+L 371.449313 145.991568 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.108783"/>
+    <path d="M 371.449313 145.991568 
+L 360.945058 141.819781 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.826019"/>
+    <path d="M 360.945058 141.819781 
+L 350.569837 137.472336 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.559431"/>
+    <path d="M 350.569837 137.472336 
+L 340.308603 132.976871 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.307826"/>
+    <path d="M 340.308603 132.976871 
+L 330.122956 128.3869 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.069626"/>
+    <path d="M 414.72 151.58731 
+L 414.72 151.58731 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.992132"/>
+    <path d="M 414.72 151.58731 
+L 403.686176 148.259328 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.992132"/>
+    <path d="M 403.686176 148.259328 
+L 392.740216 144.774072 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.648702"/>
+    <path d="M 392.740216 144.774072 
+L 381.886357 141.132396 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.324419"/>
+    <path d="M 381.886357 141.132396 
+L 371.124851 137.34156 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.018451"/>
+    <path d="M 371.124851 137.34156 
+L 360.449512 133.417743 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.729604"/>
+    <path d="M 414.72 133.234759 
+L 414.72 133.234759 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.817143"/>
+    <path d="M 414.72 133.234759 
+L 403.487814 130.297413 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.817143"/>
+    <path d="M 403.487814 130.297413 
+L 392.290415 127.287145 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.46427"/>
+    <path d="M 392.290415 127.287145 
+L 381.118798 124.224343 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.130477"/>
+    <path d="M 381.118798 124.224343 
+L 369.957498 121.141303 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.815373"/>
+    <path d="M 369.957498 121.141303 
+L 358.781336 118.089536 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.51871"/>
+    <path d="M 358.781336 118.089536 
+L 347.551076 115.153051 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.240604"/>
+    <path d="M 347.551076 115.153051 
+L 336.209461 112.473768 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.981644"/>
+    <path d="M 336.209461 112.473768 
+L 324.686606 110.302916 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.743674"/>
+    <path d="M 324.686606 110.302916 
+L 312.945053 109.091201 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.530973"/>
+    <path d="M 312.945053 109.091201 
+L 312.945053 109.091201 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.35115"/>
+    <path d="M 312.945053 109.091201 
+L 304.83268 109.024954 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.35115"/>
+    <path d="M 304.83268 109.024954 
+L 304.83268 109.024954 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.251639"/>
+    <path d="M 304.83268 109.024954 
+L 297.642984 109.733974 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.251639"/>
+    <path d="M 297.642984 109.733974 
+L 290.52778 111.289963 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.182502"/>
+    <path d="M 290.52778 111.289963 
+L 284.203084 113.273147 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.125444"/>
+    <path d="M 284.203084 113.273147 
+L 278.473145 115.416381 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.088223"/>
+    <path d="M 278.473145 115.416381 
+L 273.140021 117.713861 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.06001"/>
+    <path d="M 273.140021 117.713861 
+L 273.140021 117.713861 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.038722"/>
+    <path d="M 273.140021 117.713861 
+L 270.76883 118.469555 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.038722"/>
+    <path d="M 270.76883 118.469555 
+L 268.507711 119.403544 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.032356"/>
+    <path d="M 268.507711 119.403544 
+L 268.507711 119.403544 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.016529"/>
+    <path d="M 414.72 114.882207 
+L 414.72 114.882207 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.621451"/>
+    <path d="M 414.72 114.882207 
+L 403.174655 112.72263 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.621451"/>
+    <path d="M 403.174655 112.72263 
+L 391.61227 110.61515 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.263557"/>
+    <path d="M 391.61227 110.61515 
+L 380.018563 108.605703 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.926869"/>
+    <path d="M 380.018563 108.605703 
+L 368.376236 106.762338 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.611973"/>
+    <path d="M 368.376236 106.762338 
+L 356.666958 105.184711 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.319949"/>
+    <path d="M 356.666958 105.184711 
+L 344.875475 104.017164 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.052307"/>
+    <path d="M 344.875475 104.017164 
+L 333.01194 103.471161 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.811492"/>
+    <path d="M 414.72 96.529655 
+L 414.72 96.529655 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.434527"/>
+    <path d="M 414.72 96.529655 
+L 402.875958 95.650593 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.434527"/>
+    <path d="M 402.875958 95.650593 
+L 391.008499 94.974714 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.083612"/>
+    <path d="M 391.008499 94.974714 
+L 379.120635 94.567203 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.758014"/>
+    <path d="M 379.120635 94.567203 
+L 367.223471 94.510535 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.459108"/>
+    <path d="M 367.223471 94.510535 
+L 355.341514 94.905588 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.188093"/>
+    <path d="M 355.341514 94.905588 
+L 343.521595 95.868851 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.946244"/>
+    <path d="M 343.521595 95.868851 
+L 331.854185 97.517822 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.735685"/>
+    <path d="M 331.854185 97.517822 
+L 320.446595 99.931703 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.556345"/>
+    <path d="M 414.72 87.353379 
+L 414.72 87.353379 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.35941"/>
+    <path d="M 414.72 87.353379 
+L 402.817449 87.3275 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.35941"/>
+    <path d="M 402.817449 87.3275 
+L 390.920264 87.567345 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.018511"/>
+    <path d="M 390.920264 87.567345 
+L 379.045404 88.132462 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.704699"/>
+    <path d="M 379.045404 88.132462 
+L 367.219614 89.090223 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.418927"/>
+    <path d="M 367.219614 89.090223 
+L 355.480182 90.512426 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.161804"/>
+    <path d="M 414.72 69.000828 
+L 414.72 69.000828 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.290388"/>
+    <path d="M 414.72 69.000828 
+L 403.136386 71.035781 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.290388"/>
+    <path d="M 403.136386 71.035781 
+L 391.649158 73.352854 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.978796"/>
+    <path d="M 391.649158 73.352854 
+L 380.281372 75.972111 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.693665"/>
+    <path d="M 380.281372 75.972111 
+L 369.055155 78.908998 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.433977"/>
+    <path d="M 369.055155 78.908998 
+L 357.992308 82.172663 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.198982"/>
+    <path d="M 357.992308 82.172663 
+L 347.119497 85.761911 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.988312"/>
+    <path d="M 347.119497 85.761911 
+L 336.444607 89.662531 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.801005"/>
+    <path d="M 414.72 50.648276 
+L 414.72 50.648276 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.392931"/>
+    <path d="M 414.72 50.648276 
+L 404.247865 54.862913 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.392931"/>
+    <path d="M 404.247865 54.862913 
+L 393.87855 59.215494 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.103975"/>
+    <path d="M 393.87855 59.215494 
+L 383.613851 63.701324 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.835914"/>
+    <path d="M 383.613851 63.701324 
+L 373.449638 68.314413 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.58647"/>
+    <path d="M 373.449638 68.314413 
+L 363.384488 73.045305 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.355366"/>
+    <path d="M 363.702857 41.472 
+L 363.702857 41.472 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.880688"/>
+    <path d="M 363.702857 41.472 
+L 358.634873 49.495253 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.880688"/>
+    <path d="M 358.634873 49.495253 
+L 353.093095 57.341675 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.601341"/>
+    <path d="M 353.093095 57.341675 
+L 347.051865 64.978152 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.347416"/>
+    <path d="M 347.051865 64.978152 
+L 340.49002 72.368661 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.118195"/>
+    <path d="M 340.49002 72.368661 
+L 333.390426 79.474777 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.912786"/>
+    <path d="M 312.685714 41.472 
+L 312.685714 41.472 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.974026"/>
+    <path d="M 312.685714 41.472 
+L 313.121867 50.335264 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.974026"/>
+    <path d="M 313.121867 50.335264 
+L 313.147273 59.203267 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.62962"/>
+    <path d="M 313.147273 59.203267 
+L 312.597724 68.059618 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.312264"/>
+    <path d="M 312.597724 68.059618 
+L 311.233089 76.861801 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.024031"/>
+    <path d="M 311.233089 76.861801 
+L 308.708206 85.506661 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.768652"/>
+    <path d="M 308.708206 85.506661 
+L 308.708206 85.506661 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.550193"/>
+    <path d="M 287.177143 41.472 
+L 287.177143 41.472 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.129865"/>
+    <path d="M 287.177143 41.472 
+L 289.206204 50.2125 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.129865"/>
+    <path d="M 289.206204 50.2125 
+L 291.105911 58.96894 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.776498"/>
+    <path d="M 291.105911 58.96894 
+L 292.781045 67.750299 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.445843"/>
+    <path d="M 292.781045 67.750299 
+L 294.071323 76.566297 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.138664"/>
+    <path d="M 294.071323 76.566297 
+L 294.68521 85.417387 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.856638"/>
+    <path d="M 294.68521 85.417387 
+L 294.047062 94.246655 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.603369"/>
+    <path d="M 294.047062 94.246655 
+L 294.047062 94.246655 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.385406"/>
+    <path d="M 294.047062 94.246655 
+L 292.619907 99.884563 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.385406"/>
+    <path d="M 292.619907 99.884563 
+L 292.619907 99.884563 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.267767"/>
+    <path d="M 261.668571 41.472 
+L 261.668571 41.472 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.286108"/>
+    <path d="M 261.668571 41.472 
+L 264.483804 50.090709 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.286108"/>
+    <path d="M 264.483804 50.090709 
+L 267.366942 58.696956 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.934472"/>
+    <path d="M 267.366942 58.696956 
+L 270.29293 67.295178 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.604062"/>
+    <path d="M 270.29293 67.295178 
+L 273.214106 75.89429 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.294684"/>
+    <path d="M 210.651429 41.472 
+L 210.651429 41.472 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.531515"/>
+    <path d="M 210.651429 41.472 
+L 213.229351 50.131718 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.531515"/>
+    <path d="M 213.229351 50.131718 
+L 215.958469 58.765624 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.184231"/>
+    <path d="M 215.958469 58.765624 
+L 218.857801 67.368605 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.859083"/>
+    <path d="M 218.857801 67.368605 
+L 221.950433 75.934035 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.555888"/>
+    <path d="M 221.950433 75.934035 
+L 225.265188 84.453076 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.274401"/>
+    <path d="M 225.265188 84.453076 
+L 228.839164 92.913517 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.014345"/>
+    <path d="M 228.839164 92.913517 
+L 232.724448 101.297021 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.775623"/>
+    <path d="M 232.724448 101.297021 
+L 237.008992 109.570886 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.557428"/>
+    <path d="M 237.008992 109.570886 
+L 241.908533 117.648606 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.359126"/>
+    <path d="M 241.908533 117.648606 
+L 241.908533 117.648606 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.180011"/>
+    <path d="M 185.142857 41.472 
+L 185.142857 41.472 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.62695"/>
+    <path d="M 185.142857 41.472 
+L 186.839619 50.251815 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.62695"/>
+    <path d="M 186.839619 50.251815 
+L 188.557711 59.029329 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.278815"/>
+    <path d="M 188.557711 59.029329 
+L 190.28065 67.806305 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.953244"/>
+    <path d="M 190.28065 67.806305 
+L 191.979754 76.585826 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.650209"/>
+    <path d="M 191.979754 76.585826 
+L 193.603865 85.373082 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.369867"/>
+    <path d="M 193.603865 85.373082 
+L 195.058628 94.176319 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.11267"/>
+    <path d="M 195.058628 94.176319 
+L 196.158898 103.006607 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.878631"/>
+    <path d="M 196.158898 103.006607 
+L 196.506929 111.864636 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.66903"/>
+    <path d="M 196.506929 111.864636 
+L 196.506929 111.864636 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.488439"/>
+    <path d="M 196.506929 111.864636 
+L 195.59319 119.254605 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.488439"/>
+    <path d="M 195.59319 119.254605 
+L 195.59319 119.254605 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.368267"/>
+    <path d="M 195.59319 119.254605 
+L 193.586447 124.61097 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.368267"/>
+    <path d="M 193.586447 124.61097 
+L 189.857162 129.598114 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.310009"/>
+    <path d="M 189.857162 129.598114 
+L 185.359658 133.255113 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.293771"/>
+    <path d="M 185.359658 133.255113 
+L 179.855191 136.399629 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.315827"/>
+    <path d="M 179.855191 136.399629 
+L 172.763038 139.46557 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.364984"/>
+    <path d="M 172.763038 139.46557 
+L 163.36489 142.688908 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.444046"/>
+    <path d="M 163.36489 142.688908 
+L 152.253091 145.855724 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.565548"/>
+    <path d="M 152.253091 145.855724 
+L 140.964235 148.664057 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.729169"/>
+    <path d="M 140.964235 148.664057 
+L 129.571059 151.231305 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.916117"/>
+    <path d="M 129.571059 151.231305 
+L 118.108203 153.621435 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.125551"/>
+    <path d="M 118.108203 153.621435 
+L 106.594446 155.872373 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.357347"/>
+    <path d="M 106.594446 155.872373 
+L 95.041158 158.008471 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.611367"/>
+    <path d="M 95.041158 158.008471 
+L 83.455791 160.04629 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.887639"/>
+    <path d="M 83.455791 160.04629 
+L 71.84376 161.998306 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.186301"/>
+    <path d="M 71.84376 161.998306 
+L 60.209207 163.874469 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.507364"/>
+    <path d="M 60.209207 163.874469 
+L 57.6 164.286862 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.851031"/>
+    <path d="M 159.634286 41.472 
+L 159.634286 41.472 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.728293"/>
+    <path d="M 159.634286 41.472 
+L 159.978194 50.338322 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.728293"/>
+    <path d="M 159.978194 50.338322 
+L 160.073034 59.207698 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.384962"/>
+    <path d="M 160.073034 59.207698 
+L 159.811238 68.074532 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.067018"/>
+    <path d="M 159.811238 68.074532 
+L 159.031643 76.922871 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.776063"/>
+    <path d="M 159.031643 76.922871 
+L 157.493457 85.712293 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.515599"/>
+    <path d="M 157.493457 85.712293 
+L 154.851786 94.347185 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.290888"/>
+    <path d="M 154.851786 94.347185 
+L 150.684882 102.62811 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.111783"/>
+    <path d="M 150.684882 102.62811 
+L 145.156787 109.729544 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.994566"/>
+    <path d="M 145.156787 109.729544 
+L 138.801014 115.431869 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.95716"/>
+    <path d="M 138.801014 115.431869 
+L 131.471489 120.329651 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.987675"/>
+    <path d="M 131.471489 120.329651 
+L 122.829531 124.804201 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.071921"/>
+    <path d="M 122.829531 124.804201 
+L 112.454269 129.076834 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.208885"/>
+    <path d="M 112.454269 129.076834 
+L 101.621916 132.741284 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.407728"/>
+    <path d="M 101.621916 132.741284 
+L 90.524213 135.942343 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.643109"/>
+    <path d="M 90.524213 135.942343 
+L 79.25467 138.794317 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.90916"/>
+    <path d="M 79.25467 138.794317 
+L 67.867792 141.376846 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.202298"/>
+    <path d="M 67.867792 141.376846 
+L 57.6 143.590986 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.52091"/>
+    <path d="M 134.125714 41.472 
+L 134.125714 41.472 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.865541"/>
+    <path d="M 134.125714 41.472 
+L 132.725785 50.278649 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.865541"/>
+    <path d="M 132.725785 50.278649 
+L 130.717653 59.017974 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.546434"/>
+    <path d="M 130.717653 59.017974 
+L 127.91145 67.63136 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.263696"/>
+    <path d="M 127.91145 67.63136 
+L 124.082883 76.018702 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.02446"/>
+    <path d="M 124.082883 76.018702 
+L 119.013336 84.025992 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.83926"/>
+    <path d="M 119.013336 84.025992 
+L 112.573587 91.460421 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.721473"/>
+    <path d="M 112.573587 91.460421 
+L 105.030883 97.980996 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.683008"/>
+    <path d="M 105.030883 97.980996 
+L 96.487831 103.685548 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.725345"/>
+    <path d="M 96.487831 103.685548 
+L 86.8004 108.818112 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.840808"/>
+    <path d="M 86.8004 108.818112 
+L 76.510094 113.261394 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.024611"/>
+    <path d="M 76.510094 113.261394 
+L 65.80974 117.136413 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.261529"/>
+    <path d="M 65.80974 117.136413 
+L 57.6 119.876181 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.540822"/>
+    <path d="M 108.617143 41.472 
+L 108.617143 41.472 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.073801"/>
+    <path d="M 108.617143 41.472 
+L 105.273795 49.979564 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.073801"/>
+    <path d="M 105.273795 49.979564 
+L 101.036304 58.259804 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.811909"/>
+    <path d="M 101.036304 58.259804 
+L 95.760303 66.198108 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.606315"/>
+    <path d="M 95.760303 66.198108 
+L 89.356788 73.658531 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.468045"/>
+    <path d="M 89.356788 73.658531 
+L 81.835302 80.513707 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.407035"/>
+    <path d="M 81.835302 80.513707 
+L 73.310814 86.684629 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.429377"/>
+    <path d="M 73.310814 86.684629 
+L 63.965087 92.160655 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.531836"/>
+    <path d="M 63.965087 92.160655 
+L 57.6 95.533424 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.706832"/>
+    <path d="M 83.108571 41.472 
+L 83.108571 41.472 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.386486"/>
+    <path d="M 83.108571 41.472 
+L 77.884546 49.433164 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.386486"/>
+    <path d="M 77.884546 49.433164 
+L 71.687022 56.994099 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.216579"/>
+    <path d="M 71.687022 56.994099 
+L 64.500222 64.050248 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.121783"/>
+    <path d="M 64.500222 64.050248 
+L 57.6 70.142985 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.108208"/>
+    <path d="M 111.474287 114.848335 
+L 101.466592 119.629473 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.462068"/>
+    <path d="M 101.466592 119.629473 
+L 90.916563 123.723321 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.65221"/>
+    <path d="M 90.916563 123.723321 
+L 80.016969 127.27984 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.887734"/>
+    <path d="M 80.016969 127.27984 
+L 68.886785 130.419842 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.159234"/>
+    <path d="M 68.886785 130.419842 
+L 57.6 133.234759 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.461969"/>
+    <path d="M 57.6 133.234759 
+L 57.6 133.234759 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.79268"/>
+    <path d="M 368.732858 229.120167 
+L 357.179569 226.985389 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.170778"/>
+    <path d="M 357.179569 226.985389 
+L 345.689273 224.670562 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.915795"/>
+    <path d="M 345.689273 224.670562 
+L 334.279312 222.146566 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.683604"/>
+    <path d="M 334.279312 222.146566 
+L 322.9724 219.378539 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.473801"/>
+    <path d="M 322.9724 219.378539 
+L 311.798154 216.32688 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.286263"/>
+    <path d="M 311.798154 216.32688 
+L 300.794702 212.950164 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.120666"/>
+    <path d="M 300.794702 212.950164 
+L 290.008001 209.207647 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.976486"/>
+    <path d="M 290.008001 209.207647 
+L 279.488593 205.065785 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.85282"/>
+    <path d="M 279.488593 205.065785 
+L 269.283743 200.507355 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.748267"/>
+    <path d="M 269.283743 200.507355 
+L 259.421915 195.548322 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.660804"/>
+    <path d="M 259.421915 195.548322 
+L 249.891794 190.239923 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.5877"/>
+    <path d="M 249.891794 190.239923 
+L 240.618237 184.682084 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.525406"/>
+    <path d="M 240.618237 184.682084 
+L 231.434991 179.039636 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.470591"/>
+    <path d="M 231.434991 179.039636 
+L 222.061105 173.579419 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.421"/>
+    <path d="M 222.061105 173.579419 
+L 213.890841 169.503763 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.377428"/>
+    <path d="M 213.890841 169.503763 
+L 205.721976 166.395993 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.35101"/>
+    <path d="M 205.721976 166.395993 
+L 196.225629 164.107379 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.343601"/>
+    <path d="M 196.225629 164.107379 
+L 186.463099 163.053014 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.365777"/>
+    <path d="M 186.463099 163.053014 
+L 186.463099 163.053014 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.423377"/>
+    <path d="M 186.463099 163.053014 
+L 174.581398 163.019388 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.423377"/>
+    <path d="M 174.581398 163.019388 
+L 162.736499 163.844668 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.53261"/>
+    <path d="M 162.736499 163.844668 
+L 150.964046 165.147857 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.675266"/>
+    <path d="M 150.964046 165.147857 
+L 139.247283 166.711823 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.844736"/>
+    <path d="M 139.247283 166.711823 
+L 127.565335 168.41611 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.038601"/>
+    <path d="M 127.565335 168.41611 
+L 115.901837 170.189915 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.255246"/>
+    <path d="M 115.901837 170.189915 
+L 104.246353 171.992898 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.494503"/>
+    <path d="M 104.246353 171.992898 
+L 92.592021 173.800052 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.755981"/>
+    <path d="M 92.592021 173.800052 
+L 80.934368 175.59528 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.03978"/>
+    <path d="M 80.934368 175.59528 
+L 69.27088 177.369319 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.345706"/>
+    <path d="M 69.27088 177.369319 
+L 57.6 179.116138 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.674109"/>
+    <path d="M 57.6 179.116138 
+L 57.6 179.116138 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.024683"/>
+    <path d="M 220.281476 188.693437 
+L 209.590339 185.501614 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.448437"/>
+    <path d="M 209.590339 185.501614 
+L 198.243024 183.175325 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.448742"/>
+    <path d="M 198.243024 183.175325 
+L 186.481379 181.945274 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.479663"/>
+    <path d="M 186.481379 181.945274 
+L 174.59699 181.731229 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.548788"/>
+    <path d="M 174.59699 181.731229 
+L 162.72382 182.282965 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.655709"/>
+    <path d="M 162.72382 182.282965 
+L 150.91021 183.353735 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.7958"/>
+    <path d="M 150.91021 183.353735 
+L 139.158057 184.759648 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.964396"/>
+    <path d="M 139.158057 184.759648 
+L 127.454127 186.376889 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.158777"/>
+    <path d="M 127.454127 186.376889 
+L 115.783827 188.125111 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.376932"/>
+    <path d="M 115.783827 188.125111 
+L 104.13487 189.951121 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.618248"/>
+    <path d="M 104.13487 189.951121 
+L 92.49771 191.818641 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.881938"/>
+    <path d="M 92.49771 191.818641 
+L 80.865771 193.704173 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.167983"/>
+    <path d="M 80.865771 193.704173 
+L 69.234367 195.591504 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.476167"/>
+    <path d="M 69.234367 195.591504 
+L 57.6 197.46869 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.806559"/>
+    <path d="M 57.6 197.46869 
+L 57.6 197.46869 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.158933"/>
+    <path d="M 298.639767 219.814801 
+L 287.354727 217.000107 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.963619"/>
+    <path d="M 287.354727 217.000107 
+L 276.162871 213.985613 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.839122"/>
+    <path d="M 276.162871 213.985613 
+L 265.058548 210.793414 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.734582"/>
+    <path d="M 265.058548 210.793414 
+L 254.016046 207.483939 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.648931"/>
+    <path d="M 254.016046 207.483939 
+L 242.977308 204.17206 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.581417"/>
+    <path d="M 242.977308 204.17206 
+L 231.848676 201.037037 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.531372"/>
+    <path d="M 231.848676 201.037037 
+L 220.526266 198.327728 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.499647"/>
+    <path d="M 220.526266 198.327728 
+L 208.951231 196.320606 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.489658"/>
+    <path d="M 208.951231 196.320606 
+L 197.162506 195.215776 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.50715"/>
+    <path d="M 197.162506 195.215776 
+L 185.277611 195.03404 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.557956"/>
+    <path d="M 185.277611 195.03404 
+L 173.41133 195.639425 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.644319"/>
+    <path d="M 173.41133 195.639425 
+L 161.620769 196.832949 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.764291"/>
+    <path d="M 161.620769 196.832949 
+L 149.914893 198.434367 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.91393"/>
+    <path d="M 149.914893 198.434367 
+L 138.280522 200.307634 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.09033"/>
+    <path d="M 138.280522 200.307634 
+L 126.699243 202.357564 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.290958"/>
+    <path d="M 126.699243 202.357564 
+L 115.154524 204.519577 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.514861"/>
+    <path d="M 115.154524 204.519577 
+L 103.632575 206.748238 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.761027"/>
+    <path d="M 103.632575 206.748238 
+L 92.122832 209.011801 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.029181"/>
+    <path d="M 92.122832 209.011801 
+L 80.617572 211.28812 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.318974"/>
+    <path d="M 80.617572 211.28812 
+L 69.111216 213.561519 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.630373"/>
+    <path d="M 69.111216 213.561519 
+L 57.6 215.821241 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.963396"/>
+    <path d="M 57.6 215.821241 
+L 57.6 215.821241 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.31805"/>
+    <path d="M 218.244433 205.201502 
+L 206.396945 204.519527 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.527396"/>
+    <path d="M 206.396945 204.519527 
+L 194.514604 204.72512 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.565848"/>
+    <path d="M 194.514604 204.72512 
+L 182.698597 205.725931 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.639214"/>
+    <path d="M 182.698597 205.725931 
+L 171.001819 207.348337 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.746105"/>
+    <path d="M 171.001819 207.348337 
+L 159.430768 209.420064 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.883267"/>
+    <path d="M 159.430768 209.420064 
+L 147.964963 211.799332 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.047228"/>
+    <path d="M 147.964963 211.799332 
+L 136.578464 214.38371 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.23546"/>
+    <path d="M 136.578464 214.38371 
+L 125.247359 217.100939 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.44633"/>
+    <path d="M 125.247359 217.100939 
+L 113.952082 219.900217 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.679052"/>
+    <path d="M 113.952082 219.900217 
+L 102.677546 222.745747 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.932915"/>
+    <path d="M 102.677546 222.745747 
+L 91.412386 225.611931 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.207618"/>
+    <path d="M 91.412386 225.611931 
+L 80.148194 228.480296 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.503101"/>
+    <path d="M 80.148194 228.480296 
+L 68.87886 231.337484 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.8193"/>
+    <path d="M 68.87886 231.337484 
+L 57.6 234.173793 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.156171"/>
+    <path d="M 57.6 234.173793 
+L 57.6 234.173793 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.513767"/>
+    <path d="M 102.009502 230.551712 
+L 90.913971 233.764269 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.312842"/>
+    <path d="M 90.913971 233.764269 
+L 79.81791 236.975911 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.612022"/>
+    <path d="M 79.81791 236.975911 
+L 68.714769 240.174177 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.931274"/>
+    <path d="M 68.714769 240.174177 
+L 57.6 243.350069 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.27063"/>
+    <path d="M 57.6 243.350069 
+L 57.6 243.350069 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.630293"/>
+    <path d="M 269.58673 219.001245 
+L 257.98457 217.02805 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.700009"/>
+    <path d="M 257.98457 217.02805 
+L 246.303024 215.354021 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.628643"/>
+    <path d="M 246.303024 215.354021 
+L 234.516537 214.193123 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.580442"/>
+    <path d="M 234.516537 214.193123 
+L 222.645014 213.76751 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.558975"/>
+    <path d="M 222.645014 213.76751 
+L 210.779032 214.230797 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.568611"/>
+    <path d="M 210.779032 214.230797 
+L 199.032217 215.584799 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.613729"/>
+    <path d="M 199.032217 215.584799 
+L 187.484765 217.7021 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.694337"/>
+    <path d="M 187.484765 217.7021 
+L 176.153447 220.403051 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.807938"/>
+    <path d="M 176.153447 220.403051 
+L 165.014642 223.523859 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.950222"/>
+    <path d="M 165.014642 223.523859 
+L 154.029207 226.937198 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.117826"/>
+    <path d="M 154.029207 226.937198 
+L 143.159564 230.551913 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.308125"/>
+    <path d="M 143.159564 230.551913 
+L 132.373369 234.303186 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.519954"/>
+    <path d="M 132.373369 234.303186 
+L 121.643741 238.144035 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.751776"/>
+    <path d="M 121.643741 238.144035 
+L 110.950615 242.041164 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.00319"/>
+    <path d="M 110.950615 242.041164 
+L 100.278333 245.970087 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.273982"/>
+    <path d="M 100.278333 245.970087 
+L 89.615109 249.912722 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.563619"/>
+    <path d="M 89.615109 249.912722 
+L 78.951911 253.855491 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.872511"/>
+    <path d="M 78.951911 253.855491 
+L 68.281898 257.788058 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.199998"/>
+    <path d="M 68.281898 257.788058 
+L 57.6 261.702621 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.546856"/>
+    <path d="M 57.6 261.702621 
+L 57.6 261.702621 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.912363"/>
+    <path d="M 109.642536 249.358934 
+L 99.226352 253.652595 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.416003"/>
+    <path d="M 99.226352 253.652595 
+L 88.821974 257.962146 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.712409"/>
+    <path d="M 88.821974 257.962146 
+L 78.42057 262.275618 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.027536"/>
+    <path d="M 78.42057 262.275618 
+L 68.014961 266.583569 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.360724"/>
+    <path d="M 68.014961 266.583569 
+L 57.6 270.878897 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.712447"/>
+    <path d="M 57.6 270.878897 
+L 57.6 270.878897 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 4.082533"/>
+    <path d="M 414.72 204.457142 
+L 411.523264 203.647297 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.302456"/>
+    <path d="M 411.523264 203.647297 
+L 400.306834 200.679029 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.205785"/>
+    <path d="M 400.306834 200.679029 
+L 389.211429 197.46869 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.879489"/>
+    <path d="M 389.211429 197.46869 
+L 378.263725 193.988744 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.576524"/>
+    <path d="M 378.263725 193.988744 
+L 367.495981 190.210795 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.296388"/>
+    <path d="M 367.495981 190.210795 
+L 356.946919 186.105398 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.038753"/>
+    <path d="M 414.72 169.110845 
+L 410.970183 167.956688 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.127268"/>
+    <path d="M 410.970183 167.956688 
+L 400.027435 164.466457 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.010847"/>
+    <path d="M 400.027435 164.466457 
+L 389.211429 160.763586 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.682513"/>
+    <path d="M 389.211429 160.763586 
+L 378.538106 156.837831 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.374263"/>
+    <path d="M 414.72 140.608378 
+L 411.39154 139.679667 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.89098"/>
+    <path d="M 411.39154 139.679667 
+L 400.273047 136.511587 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.784687"/>
+    <path d="M 400.273047 136.511587 
+L 389.211429 133.234759 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.441104"/>
+    <path d="M 389.211429 133.234759 
+L 378.201457 129.862656 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.116317"/>
+    <path d="M 233.010608 41.472 
+L 233.205574 42.055645 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.436036"/>
+    <path d="M 233.205574 42.055645 
+L 236.16 50.648276 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.41193"/>
+    <path d="M 236.16 50.648276 
+L 239.2805 59.208198 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.065441"/>
+    <path d="M 239.2805 59.208198 
+L 242.582176 67.730244 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.740586"/>
+    <path d="M 242.582176 67.730244 
+L 246.080347 76.208596 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.437048"/>
+    <path d="M 246.080347 76.208596 
+L 249.788941 84.637093 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.154437"/>
+    <path d="M 249.788941 84.637093 
+L 253.715983 93.010419 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.892388"/>
+    <path d="M 253.715983 93.010419 
+L 257.852262 101.327626 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.6503"/>
+    <path d="M 257.852262 101.327626 
+L 262.11705 109.60901 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.427298"/>
+    <path d="M 262.11705 109.60901 
+L 262.11705 109.60901 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.222634"/>
+    <path d="M 170.933294 117.85781 
+L 165.909072 123.454396 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.575915"/>
+    <path d="M 165.909072 123.454396 
+L 159.606022 128.215592 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.573758"/>
+    <path d="M 159.606022 128.215592 
+L 159.606022 128.215592 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.622378"/>
+    <path d="M 159.606022 128.215592 
+L 149.955408 133.35787 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.622378"/>
+    <path d="M 149.955408 133.35787 
+L 139.460594 137.518072 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.744362"/>
+    <path d="M 139.460594 137.518072 
+L 128.528072 141.015358 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.910626"/>
+    <path d="M 128.528072 141.015358 
+L 117.351902 144.062635 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.108591"/>
+    <path d="M 117.351902 144.062635 
+L 106.026774 146.79078 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.333521"/>
+    <path d="M 106.026774 146.79078 
+L 94.602659 149.281277 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.582884"/>
+    <path d="M 94.602659 149.281277 
+L 83.108571 151.58731 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.855927"/>
+    <path d="M 83.108571 151.58731 
+L 71.562751 153.745633 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.152058"/>
+    <path d="M 71.562751 153.745633 
+L 59.976958 155.781822 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.471229"/>
+    <path d="M 59.976958 155.781822 
+L 57.6 156.187598 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.813232"/>
+    <path d="M 94.025911 239.814494 
+L 83.108571 243.350069 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.617436"/>
+    <path d="M 83.108571 243.350069 
+L 72.185733 246.876149 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.933469"/>
+    <path d="M 72.185733 246.876149 
+L 61.25202 250.383376 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.269286"/>
+    <path d="M 61.25202 250.383376 
+L 57.6 251.550139 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.624626"/>
+    <path d="M 242.837646 254.139541 
+L 233.72322 259.822979 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.031335"/>
+    <path d="M 233.72322 259.822979 
+L 225.393056 266.146625 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.176862"/>
+    <path d="M 225.393056 266.146625 
+L 217.739331 272.932957 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.361439"/>
+    <path d="M 217.739331 272.932957 
+L 210.651429 280.055172 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.578499"/>
+    <path d="M 349.398255 218.813258 
+L 338.194286 215.821241 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.741892"/>
+    <path d="M 338.194286 215.821241 
+L 327.154109 212.509923 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.529324"/>
+    <path d="M 327.154109 212.509923 
+L 316.327459 208.830129 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.339431"/>
+    <path d="M 316.327459 208.830129 
+L 305.776583 204.731091 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.171849"/>
+    <path d="M 305.776583 204.731091 
+L 295.57548 200.168513 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.025844"/>
+    <path d="M 295.57548 200.168513 
+L 285.804643 195.111135 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.900124"/>
+    <path d="M 187.438044 223.746171 
+L 176.419841 227.092669 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.872663"/>
+    <path d="M 176.419841 227.092669 
+L 165.623614 230.823887 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.024615"/>
+    <path d="M 165.623614 230.823887 
+L 155.003072 234.827256 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.200934"/>
+    <path d="M 155.003072 234.827256 
+L 144.515367 239.021699 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.398706"/>
+    <path d="M 144.515367 239.021699 
+L 134.125714 243.350069 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.617139"/>
+    <path d="M 134.125714 243.350069 
+L 123.806413 247.771413 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.85462"/>
+    <path d="M 195.130928 170.453065 
+L 183.377036 169.238948 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.415824"/>
+    <path d="M 183.377036 169.238948 
+L 171.49047 169.202607 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.490379"/>
+    <path d="M 171.49047 169.202607 
+L 159.634286 169.939862 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.605792"/>
+    <path d="M 159.634286 169.939862 
+L 147.842665 171.142314 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.753695"/>
+    <path d="M 195.216342 187.828169 
+L 183.363513 187.190164 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.52475"/>
+    <path d="M 183.363513 187.190164 
+L 171.475066 187.421011 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.608565"/>
+    <path d="M 171.475066 187.421011 
+L 159.634286 188.292414 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.727584"/>
+    <path d="M 159.634286 188.292414 
+L 147.862418 189.598669 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.877363"/>
+    <path d="M 210.651429 87.353379 
+L 213.458665 95.973396 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.993465"/>
+    <path d="M 213.458665 95.973396 
+L 216.36792 104.574576 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.762122"/>
+    <path d="M 216.36792 104.574576 
+L 219.305946 113.170235 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.551972"/>
+    <path d="M 219.305946 113.170235 
+L 221.973472 121.811881 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.362802"/>
+    <path d="M 221.973472 121.811881 
+L 221.973472 121.811881 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.195171"/>
+    <path d="M 221.973472 121.811881 
+L 222.901688 126.564065 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.195171"/>
+    <path d="M 222.901688 126.564065 
+L 222.901688 126.564065 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.115992"/>
+    <path d="M 222.901688 126.564065 
+L 222.852961 129.29177 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.115992"/>
+    <path d="M 222.852961 129.29177 
+L 222.852961 129.29177 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.078815"/>
+    <path d="M 222.852961 129.29177 
+L 221.892979 131.569141 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.078815"/>
+    <path d="M 221.892979 131.569141 
+L 219.636222 133.486563 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.060763"/>
+    <path d="M 219.636222 133.486563 
+L 216.910728 134.870428 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.061608"/>
+    <path d="M 216.910728 134.870428 
+L 212.845326 136.373669 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.073467"/>
+    <path d="M 212.845326 136.373669 
+L 206.198037 138.38184 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.095892"/>
+    <path d="M 239.984385 173.842041 
+L 231.865112 167.356154 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.426391"/>
+    <path d="M 231.865112 167.356154 
+L 224.313734 161.649451 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.362456"/>
+    <path d="M 224.313734 161.649451 
+L 218.06013 157.615829 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.304298"/>
+    <path d="M 218.06013 157.615829 
+L 211.94124 154.610784 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.264044"/>
+    <path d="M 211.94124 154.610784 
+L 204.647614 152.382735 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.239681"/>
+    <path d="M 204.647614 152.382735 
+L 197.001162 151.391384 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.23836"/>
+    <path d="M 197.001162 151.391384 
+L 197.001162 151.391384 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.26847"/>
+    <path d="M 197.001162 151.391384 
+L 185.142857 151.58731 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.26847"/>
+    <path d="M 185.142857 151.58731 
+L 173.37356 152.857295 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.359374"/>
+    <path d="M 173.37356 152.857295 
+L 161.700796 154.5854 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.484824"/>
    </g>
    <g id="patch_3">
-    <path clip-path="url(#pbb66bc9b10)" d="M 219.644075 224.787428 
-Q 218.177606 225.107761 217.430396 225.270981 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:0.658494;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 221.765063 226.371283 
-L 217.430396 225.270981 
-L 220.911438 222.463429 
-L 221.765063 226.371283 
+    <path d="M 221.931544 224.303185 
+Q 221.020114 224.480047 220.818468 224.519176 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.646693; stroke-linecap: round"/>
+    <path d="M 225.126211 225.720572 
+L 220.818468 224.519176 
+L 224.36423 221.793819 
+L 225.126211 225.720572 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:0.658494;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 0.646693; stroke-linecap: round"/>
    </g>
    <g id="patch_4">
-    <path clip-path="url(#pbb66bc9b10)" d="M 157.565762 276.169479 
-Q 156.725937 276.872861 157.73077 276.031279 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:2.152148;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 162.081476 274.996215 
-L 157.73077 276.031279 
-L 159.513143 271.929676 
-L 162.081476 274.996215 
+    <path d="M 163.855441 263.408713 
+Q 163.332354 263.782034 164.413863 263.010174 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.763217; stroke-linecap: round"/>
+    <path d="M 168.831549 262.314437 
+L 164.413863 263.010174 
+L 166.507885 259.058583 
+L 168.831549 262.314437 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:2.152148;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.763217; stroke-linecap: round"/>
    </g>
    <g id="patch_5">
-    <path clip-path="url(#pbb66bc9b10)" d="M 247.272599 251.48713 
-Q 246.262993 252.028697 246.194795 252.06528 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:0.955513;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 250.665088 251.936924 
-L 246.194795 252.06528 
-L 248.774286 248.412032 
-L 250.665088 251.936924 
+    <path d="M 216.94996 253.381876 
+Q 216.401106 253.749541 216.860881 253.441548 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.085853; stroke-linecap: round"/>
+    <path d="M 221.297241 252.877001 
+L 216.860881 253.441548 
+L 219.07106 249.553732 
+L 221.297241 252.877001 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:0.955513;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.085853; stroke-linecap: round"/>
    </g>
    <g id="patch_6">
-    <path clip-path="url(#pbb66bc9b10)" d="M 328.103717 260.200631 
-Q 327.102809 260.391218 327.88501 260.242276 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.623516;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 332.188516 261.458761 
-L 327.88501 260.242276 
-L 331.440301 257.529362 
-L 332.188516 261.458761 
+    <path d="M 278.882494 251.211921 
+Q 278.208523 251.430785 278.623651 251.295977 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.024196; stroke-linecap: round"/>
+    <path d="M 283.045802 251.962745 
+L 278.623651 251.295977 
+L 281.810356 248.158317 
+L 283.045802 251.962745 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.623516;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.024196; stroke-linecap: round"/>
    </g>
    <g id="patch_7">
-    <path clip-path="url(#pbb66bc9b10)" d="M 344.048078 272.885493 
-Q 343.056409 273.151855 344.256409 272.829535 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:2.029769;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 348.638294 273.723448 
-L 344.256409 272.829535 
-L 347.600671 269.860375 
-L 348.638294 273.723448 
+    <path d="M 309.189869 256.087924 
+Q 308.383918 256.268954 309.034942 256.122723 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.335626; stroke-linecap: round"/>
+    <path d="M 313.376013 257.197481 
+L 309.034942 256.122723 
+L 312.499391 253.294721 
+L 313.376013 257.197481 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:2.029769;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.335626; stroke-linecap: round"/>
    </g>
    <g id="patch_8">
-    <path clip-path="url(#pbb66bc9b10)" d="M 383.842237 293.491577 
-Q 382.601264 293.875242 384.690798 293.229232 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:3.118013;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 389.10307 293.958515 
-L 384.690798 293.229232 
-L 387.921587 290.136984 
-L 389.10307 293.958515 
+    <path d="M 330.365844 264.158836 
+Q 329.474655 264.361702 330.440119 264.141929 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.703123; stroke-linecap: round"/>
+    <path d="M 334.784258 265.204214 
+L 330.440119 264.141929 
+L 333.89643 261.303988 
+L 334.784258 265.204214 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:3.118013;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.703123; stroke-linecap: round"/>
    </g>
    <g id="patch_9">
-    <path clip-path="url(#pbb66bc9b10)" d="M 399.212003 300.33326 
-Q 397.831936 300.762183 400.291351 299.997801 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:3.596175;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 404.704705 300.720507 
-L 400.291351 299.997801 
-L 403.517528 296.900741 
-L 404.704705 300.720507 
+    <path d="M 350.930862 272.472839 
+Q 350.040969 272.679693 351.481687 272.344801 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.140137; stroke-linecap: round"/>
+    <path d="M 355.830637 273.387216 
+L 351.481687 272.344801 
+L 354.924989 269.49109 
+L 355.830637 273.387216 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:3.596175;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 2.140137; stroke-linecap: round"/>
    </g>
    <g id="patch_10">
-    <path clip-path="url(#pbb66bc9b10)" d="M 384.441208 277.447443 
-Q 382.93404 277.701264 384.617973 277.417674 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:2.894399;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 388.894569 278.725621 
-L 384.617973 277.417674 
-L 388.230288 274.781165 
-L 388.894569 278.725621 
+    <path d="M 359.029803 283.212595 
+Q 358.196534 283.470887 359.976199 282.919236 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.446783; stroke-linecap: round"/>
+    <path d="M 364.389009 283.645259 
+L 359.976199 282.919236 
+L 363.204703 279.824602 
+L 364.389009 283.645259 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:2.894399;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 2.446783; stroke-linecap: round"/>
    </g>
    <g id="patch_11">
-    <path clip-path="url(#pbb66bc9b10)" d="M 305.480836 201.189837 
-Q 304.283025 200.612745 304.133755 200.540828 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.041015;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 306.869247 204.078777 
-L 304.133755 200.540828 
-L 308.605409 200.475204 
-L 306.869247 204.078777 
+    <path d="M 393.673361 296.389322 
+Q 392.82424 296.636888 395.616624 295.822753 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.39267; stroke-linecap: round"/>
+    <path d="M 400.016542 296.623203 
+L 395.616624 295.822753 
+L 398.896935 292.783088 
+L 400.016542 296.623203 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.041015;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 3.39267; stroke-linecap: round"/>
    </g>
    <g id="patch_12">
-    <path clip-path="url(#pbb66bc9b10)" d="M 321.236342 189.11749 
-Q 320.110959 188.506685 320.194755 188.552166 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.230553;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 322.756282 192.218033 
-L 320.194755 188.552166 
-L 324.664365 188.702464 
-L 322.756282 192.218033 
+    <path d="M 303.700298 190.354033 
+Q 303.093858 189.995132 303.447557 190.204457 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.997896; stroke-linecap: round"/>
+    <path d="M 305.871282 193.962855 
+L 303.447557 190.204457 
+L 307.90851 190.520515 
+L 305.871282 193.962855 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.230553;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 0.997896; stroke-linecap: round"/>
    </g>
    <g id="patch_13">
-    <path clip-path="url(#pbb66bc9b10)" d="M 399.260764 203.85825 
-Q 397.84418 203.462652 399.567828 203.944002 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:2.916174;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 402.882479 206.946182 
-L 399.567828 203.944002 
-L 403.958363 203.093589 
-L 402.882479 206.946182 
+    <path d="M 390.066144 210.011989 
+Q 389.197394 209.78005 391.233356 210.323612 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.689053; stroke-linecap: round"/>
+    <path d="M 394.582103 213.287714 
+L 391.233356 210.323612 
+L 395.613885 209.423076 
+L 394.582103 213.287714 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:2.916174;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 2.689053; stroke-linecap: round"/>
    </g>
    <g id="patch_14">
-    <path clip-path="url(#pbb66bc9b10)" d="M 336.630278 167.16874 
-Q 335.524524 166.54623 335.752973 166.674841 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.36946;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 338.257421 170.379937 
-L 335.752973 166.674841 
-L 340.219719 166.89434 
-L 338.257421 170.379937 
+    <path d="M 338.487721 169.087285 
+Q 337.843358 168.736612 338.586491 169.141037 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.412889; stroke-linecap: round"/>
+    <path d="M 341.143875 172.809796 
+L 338.586491 169.141037 
+L 343.055928 169.296386 
+L 341.143875 172.809796 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.36946;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.412889; stroke-linecap: round"/>
    </g>
    <g id="patch_15">
-    <path clip-path="url(#pbb66bc9b10)" d="M 399.577694 181.008024 
-Q 398.210142 180.554865 399.845071 181.096623 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:2.829099;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 403.012949 184.253291 
-L 399.845071 181.096623 
-L 404.271132 180.456321 
-L 403.012949 184.253291 
+    <path d="M 390.816983 180.891455 
+Q 390.007457 180.610072 391.940185 181.281868 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.596691; stroke-linecap: round"/>
+    <path d="M 395.061808 184.484284 
+L 391.940185 181.281868 
+L 396.375092 180.706019 
+L 395.061808 184.484284 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:2.829099;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 2.596691; stroke-linecap: round"/>
    </g>
    <g id="patch_16">
-    <path clip-path="url(#pbb66bc9b10)" d="M 361.453083 155.270128 
-Q 360.219176 154.715556 360.763165 154.960049 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.743426;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 363.591725 158.424042 
-L 360.763165 154.960049 
-L 365.231496 154.775597 
-L 363.591725 158.424042 
+    <path d="M 359.35815 159.023183 
+Q 358.642088 158.695698 359.686166 159.173199 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.731148; stroke-linecap: round"/>
+    <path d="M 362.491971 162.655648 
+L 359.686166 159.173199 
+L 364.155609 159.018024 
+L 362.491971 162.655648 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.743426;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.731148; stroke-linecap: round"/>
    </g>
    <g id="patch_17">
-    <path clip-path="url(#pbb66bc9b10)" d="M 399.65796 158.672969 
-Q 398.301963 158.213231 399.78876 158.717315 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:2.684836;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 402.934782 161.895766 
-L 399.78876 158.717315 
-L 404.219133 158.107568 
-L 402.934782 161.895766 
+    <path d="M 369.590039 145.253153 
+Q 368.823003 144.948523 369.953356 145.397445 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.826019; stroke-linecap: round"/>
+    <path d="M 372.932687 148.73265 
+L 369.953356 145.397445 
+L 374.409118 145.015103 
+L 372.932687 148.73265 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:2.684836;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.826019; stroke-linecap: round"/>
    </g>
    <g id="patch_18">
-    <path clip-path="url(#pbb66bc9b10)" d="M 360.755749 134.184899 
-Q 359.448749 133.685286 359.728377 133.792177 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.519272;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 362.750579 137.088583 
-L 359.728377 133.792177 
-L 364.178823 133.352259 
-L 362.750579 137.088583 
+    <path d="M 390.84556 144.138379 
+Q 390.026307 143.863504 391.670853 144.41528 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.324419; stroke-linecap: round"/>
+    <path d="M 394.826908 147.583768 
+L 391.670853 144.41528 
+L 396.099276 143.791529 
+L 394.826908 147.583768 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.519272;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 2.324419; stroke-linecap: round"/>
    </g>
    <g id="patch_19">
-    <path clip-path="url(#pbb66bc9b10)" d="M 399.460404 136.899789 
-Q 398.062272 136.48282 399.322406 136.858634 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:2.481109;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 402.583983 139.918392 
-L 399.322406 136.858634 
-L 403.727159 136.085227 
-L 402.583983 139.918392 
+    <path d="M 345.604505 114.693203 
+Q 344.715271 114.483135 344.894149 114.525393 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.981644; stroke-linecap: round"/>
+    <path d="M 348.327186 117.391444 
+L 344.894149 114.525393 
+L 349.246813 113.498593 
+L 348.327186 117.391444 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:2.481109;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 0.981644; stroke-linecap: round"/>
    </g>
    <g id="patch_20">
-    <path clip-path="url(#pbb66bc9b10)" d="M 358.748951 115.861723 
-Q 357.29469 115.515318 357.21041 115.495242 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.259631;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 360.638109 118.367677 
-L 357.21041 115.495242 
-L 361.564977 114.476545 
-L 360.638109 118.367677 
+    <path d="M 378.043119 108.292925 
+Q 377.106101 108.144564 377.949148 108.278046 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.611973; stroke-linecap: round"/>
+    <path d="M 381.587162 110.878978 
+L 377.949148 108.278046 
+L 382.212702 106.928194 
+L 381.587162 110.878978 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.259631;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.611973; stroke-linecap: round"/>
    </g>
    <g id="patch_21">
-    <path clip-path="url(#pbb66bc9b10)" d="M 398.996567 115.836617 
-Q 397.512032 115.533745 398.4818 115.731595 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:2.240416;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 402.001263 118.49083 
-L 398.4818 115.731595 
-L 402.800865 114.571565 
-L 402.001263 118.49083 
+    <path d="M 377.119379 94.55767 
+Q 376.146039 94.553034 376.804014 94.556168 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.459108; stroke-linecap: round"/>
+    <path d="M 380.794442 96.575198 
+L 376.804014 94.556168 
+L 380.813495 92.575243 
+L 380.794442 96.575198 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:2.240416;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.459108; stroke-linecap: round"/>
    </g>
    <g id="patch_22">
-    <path clip-path="url(#pbb66bc9b10)" d="M 369.990284 94.793683 
-Q 368.425754 94.8225 368.309013 94.82465 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.295162;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 372.345167 96.750646 
-L 368.309013 94.82465 
-L 372.271502 92.751325 
-L 372.345167 96.750646 
+    <path d="M 388.922759 87.662405 
+Q 387.951244 87.708639 388.883486 87.664274 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.704699; stroke-linecap: round"/>
+    <path d="M 392.974036 89.471871 
+L 388.883486 87.664274 
+L 392.783893 85.476392 
+L 392.974036 89.471871 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.295162;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.704699; stroke-linecap: round"/>
    </g>
    <g id="patch_23">
-    <path clip-path="url(#pbb66bc9b10)" d="M 398.440845 86.103051 
-Q 396.877652 86.16942 397.488129 86.143501 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.94594;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 401.569366 87.972025 
-L 397.488129 86.143501 
-L 401.399691 83.975625 
-L 401.569366 87.972025 
+    <path d="M 378.349125 76.477605 
+Q 377.477437 76.705647 378.156786 76.527923 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.433977; stroke-linecap: round"/>
+    <path d="M 382.532739 77.450438 
+L 378.156786 76.527923 
+L 381.52037 73.58067 
+L 382.532739 77.450438 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.94594;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.433977; stroke-linecap: round"/>
    </g>
    <g id="patch_24">
-    <path clip-path="url(#pbb66bc9b10)" d="M 399.195249 67.423899 
-Q 397.76867 67.808712 398.435965 67.628713 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.939757;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 402.818802 68.517948 
-L 398.435965 67.628713 
-L 401.777056 64.655984 
-L 402.818802 68.517948 
+    <path d="M 392.046642 60.016066 
+Q 391.31339 60.336508 392.460989 59.834989 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.835914; stroke-linecap: round"/>
+    <path d="M 396.927163 60.065846 
+L 392.460989 59.834989 
+L 395.325379 56.400565 
+L 396.927163 60.065846 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.939757;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.835914; stroke-linecap: round"/>
    </g>
    <g id="patch_25">
-    <path clip-path="url(#pbb66bc9b10)" d="M 400.130452 58.125179 
-Q 398.84354 58.641509 399.660244 58.313835 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:2.027322;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 404.117319 58.680554 
-L 399.660244 58.313835 
-L 402.627864 54.968206 
-L 404.117319 58.680554 
+    <path d="M 351.851221 58.911478 
+Q 351.582847 59.25072 352.249124 58.408505 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.347416; stroke-linecap: round"/>
+    <path d="M 356.299369 56.51232 
+L 352.249124 58.408505 
+L 353.162323 54.030598 
+L 356.299369 56.51232 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:2.027322;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.347416; stroke-linecap: round"/>
    </g>
    <g id="patch_26">
-    <path clip-path="url(#pbb66bc9b10)" d="M 372.209001 51.342857 
-Q 371.444261 52.054871 372.06866 51.473523 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.697644;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 376.359059 50.211591 
-L 372.06866 51.473523 
-L 373.633354 47.284044 
-L 376.359059 50.211591 
+    <path d="M 313.02357 61.196811 
+Q 313.00985 61.417925 313.086994 60.174699 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.312264; stroke-linecap: round"/>
+    <path d="M 315.330884 56.306242 
+L 313.086994 60.174699 
+L 311.338562 56.058513 
+L 315.330884 56.306242 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.697644;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.312264; stroke-linecap: round"/>
    </g>
    <g id="patch_27">
-    <path clip-path="url(#pbb66bc9b10)" d="M 316.271801 64.714216 
-Q 316.161126 65.376204 316.26773 64.738567 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.178553;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 318.899938 61.123117 
-L 316.26773 64.738567 
-L 314.954695 60.46353 
-L 318.899938 61.123117 
+    <path d="M 293.070223 69.72615 
+Q 293.103247 69.951789 292.951914 68.917782 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.138664; stroke-linecap: round"/>
+    <path d="M 294.351577 64.670319 
+L 292.951914 68.917782 
+L 290.393741 65.249574 
+L 294.351577 64.670319 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.178553;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.138664; stroke-linecap: round"/>
    </g>
    <g id="patch_28">
-    <path clip-path="url(#pbb66bc9b10)" d="M 290.137261 64.406073 
-Q 290.264535 65.07595 290.113418 64.280582 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.334;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 291.331641 59.977567 
-L 290.113418 64.280582 
-L 287.40194 60.724195 
-L 291.331641 59.977567 
+    <path d="M 268.011288 60.590412 
+Q 268.098429 60.846483 267.607813 59.404771 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.604062; stroke-linecap: round"/>
+    <path d="M 268.21255 54.973711 
+L 267.607813 59.404771 
+L 264.425807 56.262345 
+L 268.21255 54.973711 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.334;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.604062; stroke-linecap: round"/>
    </g>
    <g id="patch_29">
-    <path clip-path="url(#pbb66bc9b10)" d="M 260.330423 63.940916 
-Q 260.589069 64.631539 260.246523 63.716892 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.533187;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 260.716595 59.269529 
-L 260.246523 63.716892 
-L 256.970677 60.672417 
-L 260.716595 59.269529 
+    <path d="M 222.677154 77.801735 
+Q 222.780308 78.066844 222.366797 77.004105 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.274401; stroke-linecap: round"/>
+    <path d="M 222.780206 72.551118 
+L 222.366797 77.004105 
+L 219.052453 74.001585 
+L 222.780206 72.551118 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.533187;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.274401; stroke-linecap: round"/>
    </g>
    <g id="patch_30">
-    <path clip-path="url(#pbb66bc9b10)" d="M 231.525272 74.212694 
-Q 231.812481 74.906203 231.523854 74.209269 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.346082;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 231.841164 69.748404 
-L 231.523854 74.209269 
-L 228.145548 71.278903 
-L 231.841164 69.748404 
+    <path d="M 183.620698 134.248522 
+Q 183.114061 134.537947 182.914028 134.652219 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.315827; stroke-linecap: round"/>
+    <path d="M 187.379308 134.404697 
+L 182.914028 134.652219 
+L 185.395178 130.931481 
+L 187.379308 134.404697 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.346082;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 0.315827; stroke-linecap: round"/>
    </g>
    <g id="patch_31">
-    <path clip-path="url(#pbb66bc9b10)" d="M 188.64615 135.350936 
-Q 188.195654 135.59481 188.006798 135.697046 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:0.266107;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 192.476568 135.55161 
-L 188.006798 135.697046 
-L 190.572311 132.033968 
-L 192.476568 135.55161 
+    <path d="M 143.670256 111.063242 
+Q 143.569502 111.153638 144.265287 110.529388 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.95716; stroke-linecap: round"/>
+    <path d="M 148.578237 109.346825 
+L 144.265287 110.529388 
+L 145.907007 106.369489 
+L 148.578237 109.346825 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:0.266107;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 0.95716; stroke-linecap: round"/>
    </g>
    <g id="patch_32">
-    <path clip-path="url(#pbb66bc9b10)" d="M 140.333556 103.960145 
-Q 140.156559 104.147968 140.821919 103.441912 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.098575;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 145.020745 101.902478 
-L 140.821919 103.441912 
-L 142.109667 99.159191 
-L 145.020745 101.902478 
+    <path d="M 117.702118 85.53974 
+Q 117.402958 85.885108 118.363938 84.775695 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.721473; stroke-linecap: round"/>
+    <path d="M 122.494588 83.061714 
+L 118.363938 84.775695 
+L 119.471143 80.442787 
+L 122.494588 83.061714 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.098575;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.721473; stroke-linecap: round"/>
    </g>
    <g id="patch_33">
-    <path clip-path="url(#pbb66bc9b10)" d="M 102.104804 82.089999 
-Q 101.647611 82.52852 102.820904 81.403146 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:2.020742;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 107.092098 80.077664 
-L 102.820904 81.403146 
-L 104.323235 77.190902 
-L 107.092098 80.077664 
+    <path d="M 94.456462 67.717149 
+Q 94.158986 68.063724 95.65871 66.316468 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.468045; stroke-linecap: round"/>
+    <path d="M 99.781576 64.583847 
+L 95.65871 66.316468 
+L 96.746333 61.978603 
+L 99.781576 64.583847 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:2.020742;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 2.468045; stroke-linecap: round"/>
    </g>
    <g id="patch_34">
-    <path clip-path="url(#pbb66bc9b10)" d="M 75.631852 61.752079 
-Q 74.988378 62.380312 76.693097 60.715969 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:2.935291;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 80.952379 59.352697 
-L 76.693097 60.715969 
-L 78.158049 56.49058 
-L 80.952379 59.352697 
+    <path d="M 76.616595 50.980054 
+Q 76.335001 51.323598 78.333174 48.88584 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.216579; stroke-linecap: round"/>
+    <path d="M 82.415675 47.060139 
+L 78.333174 48.88584 
+L 79.322114 44.524419 
+L 82.415675 47.060139 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:2.935291;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 3.216579; stroke-linecap: round"/>
    </g>
    <g id="patch_35">
-    <path clip-path="url(#pbb66bc9b10)" d="M 81.333626 110.439917 
-Q 80.049627 110.958648 80.950003 110.594899 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:2.107181;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 85.407942 110.950954 
-L 80.950003 110.594899 
-L 83.90961 107.24218 
-L 85.407942 110.950954 
+    <path d="M 89.013924 124.344149 
+Q 88.191219 124.612596 89.374952 124.226346 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.887734; stroke-linecap: round"/>
+    <path d="M 93.798039 124.886879 
+L 89.374952 124.226346 
+L 92.557231 121.084196 
+L 93.798039 124.886879 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:2.107181;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.887734; stroke-linecap: round"/>
    </g>
    <g id="patch_36">
-    <path clip-path="url(#pbb66bc9b10)" d="M 82.281239 123.039995 
-Q 80.903153 123.474069 81.713873 123.218706 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:2.052548;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 86.12995 123.924582 
-L 81.713873 123.218706 
-L 84.92822 120.10937 
-L 86.12995 123.924582 
+    <path d="M 220.269871 172.685879 
+Q 220.017855 172.560164 220.143444 172.622812 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.377428; stroke-linecap: round"/>
+    <path d="M 222.830045 176.198029 
+L 220.143444 172.622812 
+L 224.615578 172.618661 
+L 222.830045 176.198029 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:2.052548;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 0.377428; stroke-linecap: round"/>
    </g>
    <g id="patch_37">
-    <path clip-path="url(#pbb66bc9b10)" d="M 123.799241 137.177821 
-Q 122.404474 137.595337 122.243832 137.643425 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.152229;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 126.649372 138.412335 
-L 122.243832 137.643425 
-L 125.502284 134.580339 
-L 126.649372 138.412335 
+    <path d="M 137.177876 185.033268 
+Q 136.230725 185.164144 136.566933 185.117688 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.158777; stroke-linecap: round"/>
+    <path d="M 140.803042 186.551348 
+L 136.566933 185.117688 
+L 140.255527 182.588997 
+L 140.803042 186.551348 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.152229;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.158777; stroke-linecap: round"/>
    </g>
    <g id="patch_38">
-    <path clip-path="url(#pbb66bc9b10)" d="M 182.259494 170.704021 
-Q 180.696298 170.695205 179.684315 170.689497 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:0.493027;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 183.672971 172.712025 
-L 179.684315 170.689497 
-L 183.69553 168.712088 
-L 183.672971 172.712025 
+    <path d="M 183.281549 195.135874 
+Q 182.310736 195.185402 182.059358 195.198227 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.644319; stroke-linecap: round"/>
+    <path d="M 186.156065 196.991825 
+L 182.059358 195.198227 
+L 185.952261 192.99702 
+L 186.156065 196.991825 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:0.493027;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 0.644319; stroke-linecap: round"/>
    </g>
    <g id="patch_39">
-    <path clip-path="url(#pbb66bc9b10)" d="M 167.341913 190.421181 
-Q 165.792133 190.565937 165.100919 190.6305 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:0.771268;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 169.269583 192.249834 
-L 165.100919 190.6305 
-L 168.897585 188.267169 
-L 169.269583 192.249834 
+    <path d="M 134.633697 214.850071 
+Q 133.745287 215.063114 134.429342 214.899075 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.44633; stroke-linecap: round"/>
+    <path d="M 138.785449 215.911171 
+L 134.429342 214.899075 
+L 137.852683 212.021448 
+L 138.785449 215.911171 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:0.771268;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.44633; stroke-linecap: round"/>
    </g>
    <g id="patch_40">
-    <path clip-path="url(#pbb66bc9b10)" d="M 151.149476 208.343667 
-Q 149.665313 208.64726 149.411161 208.699249 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.122935;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 153.730823 209.857054 
-L 149.411161 208.699249 
-L 152.929203 205.938202 
-L 153.730823 209.857054 
+    <path d="M 77.896004 237.529517 
+Q 77.043529 237.775073 79.340271 237.113495 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.931274; stroke-linecap: round"/>
+    <path d="M 83.737578 237.928168 
+L 79.340271 237.113495 
+L 82.630394 234.084453 
+L 83.737578 237.928168 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.122935;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 2.931274; stroke-linecap: round"/>
    </g>
    <g id="patch_41">
-    <path clip-path="url(#pbb66bc9b10)" d="M 82.440755 234.14644 
-Q 81.024096 234.542387 82.592692 234.103975 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:2.772422;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 86.98341 234.953445 
-L 82.592692 234.103975 
-L 85.906699 231.101083 
-L 86.98341 234.953445 
+    <path d="M 163.102383 224.118027 
+Q 162.268458 224.37714 162.628016 224.26542 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.117826; stroke-linecap: round"/>
+    <path d="M 167.041315 224.988461 
+L 162.628016 224.26542 
+L 165.854429 221.168605 
+L 167.041315 224.988461 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:2.772422;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.117826; stroke-linecap: round"/>
    </g>
    <g id="patch_42">
-    <path clip-path="url(#pbb66bc9b10)" d="M 81.897553 244.27361 
-Q 80.525671 244.719884 82.259021 244.156024 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:2.920661;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 86.68151 244.820547 
-L 82.259021 244.156024 
-L 85.444133 241.016747 
-L 86.68151 244.820547 
+    <path d="M 86.975826 258.727745 
+Q 86.220724 259.040887 88.592312 258.057388 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 3.027536; stroke-linecap: round"/>
+    <path d="M 93.053328 258.372558 
+L 88.592312 258.057388 
+L 91.521058 254.677677 
+L 93.053328 258.372558 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:2.920661;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 3.027536; stroke-linecap: round"/>
    </g>
    <g id="patch_43">
-    <path clip-path="url(#pbb66bc9b10)" d="M 93.992441 249.557507 
-Q 92.675497 250.054083 94.192687 249.482001 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:2.709147;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 98.641091 249.942108 
-L 94.192687 249.482001 
-L 97.229816 246.199342 
-L 98.641091 249.942108 
+    <path d="M 387.305737 196.862928 
+Q 386.474676 196.598758 388.3889 197.207233 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.576524; stroke-linecap: round"/>
+    <path d="M 391.595079 200.324991 
+L 388.3889 197.207233 
+L 392.806814 196.512944 
+L 391.595079 200.324991 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:2.709147;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 2.576524; stroke-linecap: round"/>
    </g>
    <g id="patch_44">
-    <path clip-path="url(#pbb66bc9b10)" d="M 92.844844 259.109592 
-Q 91.592018 259.650843 93.313342 258.907189 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:2.8978;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 97.778507 259.156795 
-L 93.313342 258.907189 
-L 96.192126 255.484821 
-L 97.778507 259.156795 
+    <path d="M 398.134106 163.818274 
+Q 397.322367 163.540374 399.348094 164.233884 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.682513; stroke-linecap: round"/>
+    <path d="M 402.484674 167.421653 
+L 399.348094 164.233884 
+L 403.780257 163.637281 
+L 402.484674 167.421653 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:2.8978;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 2.682513; stroke-linecap: round"/>
    </g>
    <g id="patch_45">
-    <path clip-path="url(#pbb66bc9b10)" d="M 134.509573 161.47559 
-Q 132.992455 161.724386 132.637126 161.782657 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.053016;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 136.908062 163.108972 
-L 132.637126 161.782657 
-L 136.260739 159.161698 
-L 136.908062 163.108972 
+    <path d="M 398.352927 135.942782 
+Q 397.504909 135.69157 399.273722 136.215553 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.441104; stroke-linecap: round"/>
+    <path d="M 402.540912 139.269316 
+L 399.273722 136.215553 
+L 403.677046 135.434059 
+L 402.540912 139.269316 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.053016;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 2.441104; stroke-linecap: round"/>
    </g>
    <g id="patch_46">
-    <path clip-path="url(#pbb66bc9b10)" d="M 291.480726 254.232938 
-Q 290.79551 254.435219 291.340259 254.274405 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.147049;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 295.742844 255.060054 
-L 291.340259 254.274405 
-L 294.61033 251.223726 
-L 295.742844 255.060054 
+    <path d="M 243.345693 69.580744 
+Q 243.456858 69.850169 242.955224 68.634381 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.437048; stroke-linecap: round"/>
+    <path d="M 243.278395 64.173937 
+L 242.955224 68.634381 
+L 239.580771 65.699578 
+L 243.278395 64.173937 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.147049;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.437048; stroke-linecap: round"/>
    </g>
    <g id="patch_47">
-    <path clip-path="url(#pbb66bc9b10)" d="M 166.139087 226.266574 
-Q 164.778576 226.718513 164.590568 226.780966 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:1.105066;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 169.0171 227.418006 
-L 164.590568 226.780966 
-L 167.756119 223.621965 
-L 169.0171 227.418006 
+    <path d="M 126.598982 141.541341 
+Q 125.736045 141.776628 126.068899 141.685873 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.108591; stroke-linecap: round"/>
+    <path d="M 130.454132 142.563212 
+L 126.068899 141.685873 
+L 129.40191 138.704089 
+L 130.454132 142.563212 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:1.105066;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.108591; stroke-linecap: round"/>
    </g>
    <g id="patch_48">
-    <path clip-path="url(#pbb66bc9b10)" d="M 202.630976 153.287799 
-Q 201.690774 153.150627 201.025593 153.053579 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:0.24859;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 204.694951 155.610101 
-L 201.025593 153.053579 
-L 205.272426 151.652005 
-L 204.694951 155.610101 
+    <path d="M 81.207208 243.963862 
+Q 80.378035 244.231533 82.669982 243.491653 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 2.933469; stroke-linecap: round"/>
+    <path d="M 87.090966 244.166112 
+L 82.669982 243.491653 
+L 85.86214 240.359541 
+L 87.090966 244.166112 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:0.24859;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 2.933469; stroke-linecap: round"/>
    </g>
    <g id="patch_49">
-    <path clip-path="url(#pbb66bc9b10)" d="M 242.253461 233.957987 
-Q 241.317488 234.191983 241.156259 234.232291 
-" style="fill:none;stroke:#000000;stroke-linecap:round;stroke-width:0.714278;"/>
-    <path clip-path="url(#pbb66bc9b10)" d="M 245.521903 235.202421 
-L 241.156259 234.232291 
-L 244.551749 231.321854 
-L 245.521903 235.202421 
+    <path d="M 223.894451 267.475394 
+Q 223.479503 267.843317 224.203466 267.201399 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.361439; stroke-linecap: round"/>
+    <path d="M 228.52327 266.044121 
+L 224.203466 267.201399 
+L 225.869526 263.051189 
+L 228.52327 266.044121 
 z
-" style="stroke:#000000;stroke-linecap:round;stroke-width:0.714278;"/>
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.361439; stroke-linecap: round"/>
    </g>
    <g id="patch_50">
+    <path d="M 325.258916 211.86578 
+Q 324.446379 211.589612 325.051712 211.795354 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.339431; stroke-linecap: round"/>
+    <path d="M 328.195331 214.976181 
+L 325.051712 211.795354 
+L 329.482545 211.188955 
+L 328.195331 214.976181 
+z
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.339431; stroke-linecap: round"/>
+   </g>
+   <g id="patch_51">
+    <path d="M 153.146728 235.569681 
+Q 152.380899 235.875965 153.067054 235.601545 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 1.398706; stroke-linecap: round"/>
+    <path d="M 157.523722 235.97317 
+L 153.067054 235.601545 
+L 156.038355 232.259185 
+L 157.523722 235.97317 
+z
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 1.398706; stroke-linecap: round"/>
+   </g>
+   <g id="patch_52">
+    <path d="M 169.496107 169.326623 
+Q 168.52612 169.38694 168.232124 169.405221 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.605792; stroke-linecap: round"/>
+    <path d="M 172.348539 171.153113 
+L 168.232124 169.405221 
+L 172.100286 167.160824 
+L 172.348539 171.153113 
+z
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 0.605792; stroke-linecap: round"/>
+   </g>
+   <g id="patch_53">
+    <path d="M 169.483294 187.567592 
+Q 168.514567 187.638884 168.357111 187.650472 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.727584; stroke-linecap: round"/>
+    <path d="M 172.493112 189.351498 
+L 168.357111 187.650472 
+L 172.199533 185.362286 
+L 172.493112 189.351498 
+z
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 0.727584; stroke-linecap: round"/>
+   </g>
+   <g id="patch_54">
+    <path d="M 219.89598 115.081693 
+Q 219.972242 115.328747 219.928864 115.188221 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.362802; stroke-linecap: round"/>
+    <path d="M 220.660088 110.77627 
+L 219.928864 115.188221 
+L 216.838038 111.956071 
+L 220.660088 110.77627 
+z
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 0.362802; stroke-linecap: round"/>
+   </g>
+   <g id="patch_55">
+    <path d="M 210.0288 154.026574 
+Q 209.161613 153.761667 208.550707 153.575048 
+" clip-path="url(#p122428e17d)" style="fill: none; stroke: #000000; stroke-width: 0.239681; stroke-linecap: round"/>
+    <path d="M 211.791893 156.656398 
+L 208.550707 153.575048 
+L 212.960499 152.830909 
+L 211.791893 156.656398 
+z
+" clip-path="url(#p122428e17d)" style="stroke: #000000; stroke-width: 0.239681; stroke-linecap: round"/>
+   </g>
+   <g id="patch_56">
     <path d="M 57.6 307.584 
 L 57.6 41.472 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
-   <g id="patch_51">
+   <g id="patch_57">
     <path d="M 414.72 307.584 
 L 414.72 41.472 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
-   <g id="patch_52">
+   <g id="patch_58">
     <path d="M 57.6 307.584 
 L 414.72 307.584 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
-   <g id="patch_53">
+   <g id="patch_59">
     <path d="M 57.6 41.472 
 L 414.72 41.472 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
   </g>
  </g>
  <defs>
-  <clipPath id="pbb66bc9b10">
-   <rect height="266.112" width="357.12" x="57.6" y="41.472"/>
+  <clipPath id="p122428e17d">
+   <rect x="57.6" y="41.472" width="357.12" height="266.112"/>
   </clipPath>
  </defs>
 </svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_masks_and_nans.pdf b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_masks_and_nans.pdf
index f8f94f0b2a3f..7d6beca0b3ac 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_masks_and_nans.pdf and b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_masks_and_nans.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_masks_and_nans.png b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_masks_and_nans.png
index 02800cbde2c4..c3ce699983c4 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_masks_and_nans.png and b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_masks_and_nans.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_masks_and_nans.svg b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_masks_and_nans.svg
index 8b40bc4c66f9..17e4c78c2490 100644
--- a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_masks_and_nans.svg
+++ b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_masks_and_nans.svg
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (https://matplotlib.org/) -->
-<svg height="345.6pt" version="1.1" viewBox="0 0 460.8 345.6" width="460.8pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" width="460.8pt" height="345.6pt" viewBox="0 0 460.8 345.6" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <metadata>
+  <rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+   <cc:Work>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:date>2021-08-18T03:08:55.311923</dc:date>
+    <dc:format>image/svg+xml</dc:format>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Matplotlib v3.4.2.post1692+gb0554f4824, https://matplotlib.org/</dc:title>
+     </cc:Agent>
+    </dc:creator>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linejoin: round; stroke-linecap: butt}</style>
  </defs>
  <g id="figure_1">
   <g id="patch_1">
@@ -15,7 +26,7 @@ L 460.8 345.6
 L 460.8 0 
 L 0 0 
 z
-" style="fill:#ffffff;"/>
+" style="fill: #ffffff"/>
   </g>
   <g id="axes_1">
    <g id="patch_2">
@@ -24,60 +35,60 @@ L 414.72 307.584
 L 414.72 41.472 
 L 57.6 41.472 
 z
-" style="fill:#ffffff;"/>
+" style="fill: #ffffff"/>
    </g>
    <g id="matplotlib.axis_1">
     <g id="xtick_1">
      <g id="line2d_1">
       <defs>
-       <path d="M 0 0 
+       <path id="m7bf70463dd" d="M 0 0 
 L 0 3.5 
-" id="m94c26df6b7" style="stroke:#000000;stroke-width:0.8;"/>
+" style="stroke: #000000; stroke-width: 0.8"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m94c26df6b7" y="307.584"/>
+       <use xlink:href="#m7bf70463dd" x="57.6" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_2">
      <g id="line2d_2">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="117.12" xlink:href="#m94c26df6b7" y="307.584"/>
+       <use xlink:href="#m7bf70463dd" x="117.12" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_3">
      <g id="line2d_3">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="176.64" xlink:href="#m94c26df6b7" y="307.584"/>
+       <use xlink:href="#m7bf70463dd" x="176.64" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_4">
      <g id="line2d_4">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="236.16" xlink:href="#m94c26df6b7" y="307.584"/>
+       <use xlink:href="#m7bf70463dd" x="236.16" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_5">
      <g id="line2d_5">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="295.68" xlink:href="#m94c26df6b7" y="307.584"/>
+       <use xlink:href="#m7bf70463dd" x="295.68" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_6">
      <g id="line2d_6">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="355.2" xlink:href="#m94c26df6b7" y="307.584"/>
+       <use xlink:href="#m7bf70463dd" x="355.2" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="xtick_7">
      <g id="line2d_7">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="414.72" xlink:href="#m94c26df6b7" y="307.584"/>
+       <use xlink:href="#m7bf70463dd" x="414.72" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
@@ -86,3624 +97,3749 @@ L 0 3.5
     <g id="ytick_1">
      <g id="line2d_8">
       <defs>
-       <path d="M 0 0 
+       <path id="m748404fab6" d="M 0 0 
 L -3.5 0 
-" id="m12d95443ee" style="stroke:#000000;stroke-width:0.8;"/>
+" style="stroke: #000000; stroke-width: 0.8"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m12d95443ee" y="307.584"/>
+       <use xlink:href="#m748404fab6" x="57.6" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_2">
      <g id="line2d_9">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m12d95443ee" y="263.232"/>
+       <use xlink:href="#m748404fab6" x="57.6" y="263.232" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_3">
      <g id="line2d_10">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m12d95443ee" y="218.88"/>
+       <use xlink:href="#m748404fab6" x="57.6" y="218.88" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_4">
      <g id="line2d_11">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m12d95443ee" y="174.528"/>
+       <use xlink:href="#m748404fab6" x="57.6" y="174.528" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_5">
      <g id="line2d_12">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m12d95443ee" y="130.176"/>
+       <use xlink:href="#m748404fab6" x="57.6" y="130.176" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_6">
      <g id="line2d_13">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m12d95443ee" y="85.824"/>
+       <use xlink:href="#m748404fab6" x="57.6" y="85.824" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
     <g id="ytick_7">
      <g id="line2d_14">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m12d95443ee" y="41.472"/>
+       <use xlink:href="#m748404fab6" x="57.6" y="41.472" style="stroke: #000000; stroke-width: 0.8"/>
       </g>
      </g>
     </g>
    </g>
    <g id="LineCollection_1">
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 244.095813 
-L 409.5685 243.578341 
-" style="fill:none;stroke:#e4eff9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 409.5685 243.578341 
-L 397.774614 242.376703 
-" style="fill:none;stroke:#ddeaf7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 397.774614 242.376703 
-L 385.98713 241.141332 
-" style="fill:none;stroke:#cfe1f2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 385.98713 241.141332 
-L 374.205776 239.874129 
-" style="fill:none;stroke:#bdd7ec;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 374.205776 239.874129 
-L 362.42997 238.579453 
-" style="fill:none;stroke:#a9cfe5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 362.42997 238.579453 
-L 350.658244 237.264767 
-" style="fill:none;stroke:#92c4de;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 350.658244 237.264767 
-L 338.888197 235.943023 
-" style="fill:none;stroke:#7cb7da;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 338.888197 235.943023 
-L 327.115432 234.635589 
-" style="fill:none;stroke:#68acd5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 327.115432 234.635589 
-L 315.333702 233.377292 
-" style="fill:none;stroke:#5aa2cf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 315.333702 233.377292 
-L 303.532965 232.222274 
-" style="fill:none;stroke:#4d99ca;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 303.532965 232.222274 
-L 291.703519 231.256756 
-" style="fill:none;stroke:#4191c6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 291.703519 231.256756 
-L 279.839271 230.611014 
-" style="fill:none;stroke:#3989c1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 279.839271 230.611014 
-L 267.950379 230.467343 
-" style="fill:none;stroke:#3383be;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 267.950379 230.467343 
-L 256.214095 231.046368 
-" style="fill:none;stroke:#2f7fbc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 256.214095 231.046368 
-L 244.955563 232.509163 
-" style="fill:none;stroke:#2c7cba;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 244.955563 232.509163 
-L 233.598279 235.087369 
-" style="fill:none;stroke:#2b7bba;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 233.598279 235.087369 
-L 222.763537 238.712147 
-" style="fill:none;stroke:#2c7cba;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 222.763537 238.712147 
-L 212.527211 243.213915 
-" style="fill:none;stroke:#2e7ebc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 212.527211 243.213915 
-L 202.86958 248.386682 
-" style="fill:none;stroke:#3282be;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 202.86958 248.386682 
-L 193.721726 254.055178 
-" style="fill:none;stroke:#3686c0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 193.721726 254.055178 
-L 185.002824 260.089915 
-" style="fill:none;stroke:#3c8cc3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 185.002824 260.089915 
-L 176.642388 266.401223 
-" style="fill:none;stroke:#4292c6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 176.642388 266.401223 
-L 168.581131 272.926094 
-" style="fill:none;stroke:#4b98ca;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 168.581131 272.926094 
-L 160.773469 279.620506 
-" style="fill:none;stroke:#56a0ce;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 160.773469 279.620506 
-L 153.184791 286.453552 
-" style="fill:none;stroke:#60a7d2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 153.184791 286.453552 
-L 145.787562 293.40246 
-" style="fill:none;stroke:#6aaed6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 145.787562 293.40246 
-L 138.560737 300.450288 
-" style="fill:none;stroke:#79b5d9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 138.560737 300.450288 
+    <path d="M 414.72 244.095765 
+L 409.564028 243.577798 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #e4eff9; stroke-width: 1.5"/>
+    <path d="M 409.564028 243.577798 
+L 397.770158 242.376063 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #ddeaf7; stroke-width: 1.5"/>
+    <path d="M 397.770158 242.376063 
+L 385.982685 241.140623 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #cfe1f2; stroke-width: 1.5"/>
+    <path d="M 385.982685 241.140623 
+L 374.201343 239.873349 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #bdd7ec; stroke-width: 1.5"/>
+    <path d="M 374.201343 239.873349 
+L 362.425557 238.578525 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #a9cfe5; stroke-width: 1.5"/>
+    <path d="M 362.425557 238.578525 
+L 350.653856 237.263661 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #92c4de; stroke-width: 1.5"/>
+    <path d="M 350.653856 237.263661 
+L 338.883827 235.941807 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #7cb7da; stroke-width: 1.5"/>
+    <path d="M 338.883827 235.941807 
+L 327.111068 234.634228 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #68acd5; stroke-width: 1.5"/>
+    <path d="M 327.111068 234.634228 
+L 315.329323 233.375639 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5aa2cf; stroke-width: 1.5"/>
+    <path d="M 315.329323 233.375639 
+L 303.528544 232.220292 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4d99ca; stroke-width: 1.5"/>
+    <path d="M 303.528544 232.220292 
+L 291.699065 231.254492 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4191c6; stroke-width: 1.5"/>
+    <path d="M 291.699065 231.254492 
+L 279.834575 230.608449 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3989c1; stroke-width: 1.5"/>
+    <path d="M 279.834575 230.608449 
+L 267.945144 230.464469 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3383be; stroke-width: 1.5"/>
+    <path d="M 267.945144 230.464469 
+L 256.208339 231.043286 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2f7fbc; stroke-width: 1.5"/>
+    <path d="M 256.208339 231.043286 
+L 244.952514 232.505337 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2c7cba; stroke-width: 1.5"/>
+    <path d="M 244.952514 232.505337 
+L 233.594905 235.083515 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2b7bba; stroke-width: 1.5"/>
+    <path d="M 233.594905 235.083515 
+L 222.760087 238.70878 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2c7cba; stroke-width: 1.5"/>
+    <path d="M 222.760087 238.70878 
+L 212.523721 243.210716 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2e7ebc; stroke-width: 1.5"/>
+    <path d="M 212.523721 243.210716 
+L 202.866405 248.383793 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3282be; stroke-width: 1.5"/>
+    <path d="M 202.866405 248.383793 
+L 193.718941 254.05264 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3686c0; stroke-width: 1.5"/>
+    <path d="M 193.718941 254.05264 
+L 185.000628 260.087876 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3c8cc3; stroke-width: 1.5"/>
+    <path d="M 185.000628 260.087876 
+L 176.640283 266.399271 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4292c6; stroke-width: 1.5"/>
+    <path d="M 176.640283 266.399271 
+L 168.57906 272.924197 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4b98ca; stroke-width: 1.5"/>
+    <path d="M 168.57906 272.924197 
+L 160.771746 279.618929 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #56a0ce; stroke-width: 1.5"/>
+    <path d="M 160.771746 279.618929 
+L 153.183475 286.452348 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #60a7d2; stroke-width: 1.5"/>
+    <path d="M 153.183475 286.452348 
+L 145.786685 293.401659 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #6aaed6; stroke-width: 1.5"/>
+    <path d="M 145.786685 293.401659 
+L 138.560306 300.449895 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #79b5d9; stroke-width: 1.5"/>
+    <path d="M 138.560306 300.449895 
 L 131.486897 307.584 
-" style="fill:none;stroke:#87bddc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 131.486897 307.584 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #87bddc; stroke-width: 1.5"/>
+    <path d="M 131.486897 307.584 
 L 131.486897 307.584 
-" style="fill:none;stroke:#97c6df;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 245.801614 238.780377 
-L 234.978454 242.415045 
-" style="fill:none;stroke:#2e7ebc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 234.978454 242.415045 
-L 224.841841 247.030697 
-" style="fill:none;stroke:#2f7fbc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 224.841841 247.030697 
-L 215.403034 252.416356 
-" style="fill:none;stroke:#3181bd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 215.403034 252.416356 
-L 206.59503 258.372656 
-" style="fill:none;stroke:#3585bf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 206.59503 258.372656 
-L 198.325613 264.747307 
-" style="fill:none;stroke:#3989c1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 198.325613 264.747307 
-L 190.507107 271.432585 
-" style="fill:none;stroke:#3e8ec4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 190.507107 271.432585 
-L 183.067032 278.354467 
-" style="fill:none;stroke:#4594c7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 183.067032 278.354467 
-L 175.9476 285.461913 
-" style="fill:none;stroke:#4d99ca;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 175.9476 285.461913 
-L 169.104868 292.719001 
-" style="fill:none;stroke:#56a0ce;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 169.104868 292.719001 
-L 162.503593 300.099547 
-" style="fill:none;stroke:#5fa6d1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 162.503593 300.099547 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #97c6df; stroke-width: 1.5"/>
+    <path d="M 245.798213 238.777405 
+L 234.974937 242.412107 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2e7ebc; stroke-width: 1.5"/>
+    <path d="M 234.974937 242.412107 
+L 224.838476 247.027996 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2f7fbc; stroke-width: 1.5"/>
+    <path d="M 224.838476 247.027996 
+L 215.400266 252.414349 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3181bd; stroke-width: 1.5"/>
+    <path d="M 215.400266 252.414349 
+L 206.593048 258.371305 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3585bf; stroke-width: 1.5"/>
+    <path d="M 206.593048 258.371305 
+L 198.323795 264.746095 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3989c1; stroke-width: 1.5"/>
+    <path d="M 198.323795 264.746095 
+L 190.505407 271.431453 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3e8ec4; stroke-width: 1.5"/>
+    <path d="M 190.505407 271.431453 
+L 183.06586 278.353691 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4594c7; stroke-width: 1.5"/>
+    <path d="M 183.06586 278.353691 
+L 175.946923 285.461464 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4d99ca; stroke-width: 1.5"/>
+    <path d="M 175.946923 285.461464 
+L 169.104504 292.718761 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #56a0ce; stroke-width: 1.5"/>
+    <path d="M 169.104504 292.718761 
+L 162.503374 300.099403 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5fa6d1; stroke-width: 1.5"/>
+    <path d="M 162.503374 300.099403 
 L 156.115862 307.584 
-" style="fill:none;stroke:#68acd5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 156.115862 307.584 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #68acd5; stroke-width: 1.5"/>
+    <path d="M 156.115862 307.584 
 L 156.115862 307.584 
-" style="fill:none;stroke:#74b3d8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 364.115852 242.388216 
-L 352.28448 241.417331 
-" style="fill:none;stroke:#99c7e0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 352.28448 241.417331 
-L 340.443122 240.515763 
-" style="fill:none;stroke:#81badb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 340.443122 240.515763 
-L 328.587285 239.729811 
-" style="fill:none;stroke:#6caed6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 328.587285 239.729811 
-L 316.713929 239.1298 
-" style="fill:none;stroke:#5da5d1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 316.713929 239.1298 
-L 304.823187 238.817677 
-" style="fill:none;stroke:#519ccc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 304.823187 238.817677 
-L 292.930373 238.940858 
-" style="fill:none;stroke:#4594c7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 292.930373 238.940858 
-L 281.086624 239.698286 
-" style="fill:none;stroke:#3d8dc4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 281.086624 239.698286 
-L 270.006718 241.21681 
-" style="fill:none;stroke:#3787c0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 270.006718 241.21681 
-L 259.406505 243.645056 
-" style="fill:none;stroke:#3484bf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 259.406505 243.645056 
-L 248.768475 247.281541 
-" style="fill:none;stroke:#3282be;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 248.768475 247.281541 
-L 238.734663 252.013489 
-" style="fill:none;stroke:#3181bd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 238.734663 252.013489 
-L 229.51055 257.597522 
-" style="fill:none;stroke:#3383be;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 229.51055 257.597522 
-L 221.039953 263.816873 
-" style="fill:none;stroke:#3585bf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 221.039953 263.816873 
-L 213.220056 270.497365 
-" style="fill:none;stroke:#3888c1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 213.220056 270.497365 
-L 205.945042 277.514116 
-" style="fill:none;stroke:#3c8cc3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 205.945042 277.514116 
-L 199.124947 284.781459 
-" style="fill:none;stroke:#4191c6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 199.124947 284.781459 
-L 192.68711 292.240728 
-" style="fill:none;stroke:#4896c8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 192.68711 292.240728 
-L 186.575027 299.851238 
-" style="fill:none;stroke:#4e9acb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 186.575027 299.851238 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #74b3d8; stroke-width: 1.5"/>
+    <path d="M 364.114342 242.387269 
+L 352.282972 241.416267 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #99c7e0; stroke-width: 1.5"/>
+    <path d="M 352.282972 241.416267 
+L 340.441596 240.5145 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #81badb; stroke-width: 1.5"/>
+    <path d="M 340.441596 240.5145 
+L 328.585731 239.728335 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #6caed6; stroke-width: 1.5"/>
+    <path d="M 328.585731 239.728335 
+L 316.712331 239.128112 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5da5d1; stroke-width: 1.5"/>
+    <path d="M 316.712331 239.128112 
+L 304.821419 238.815747 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #519ccc; stroke-width: 1.5"/>
+    <path d="M 304.821419 238.815747 
+L 292.928287 238.938697 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4594c7; stroke-width: 1.5"/>
+    <path d="M 292.928287 238.938697 
+L 281.084369 239.695867 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3d8dc4; stroke-width: 1.5"/>
+    <path d="M 281.084369 239.695867 
+L 270.003127 241.21437 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3888c1; stroke-width: 1.5"/>
+    <path d="M 270.003127 241.21437 
+L 259.399907 243.64334 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3484bf; stroke-width: 1.5"/>
+    <path d="M 259.399907 243.64334 
+L 248.764805 247.278834 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3282be; stroke-width: 1.5"/>
+    <path d="M 248.764805 247.278834 
+L 238.731116 252.011145 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3181bd; stroke-width: 1.5"/>
+    <path d="M 238.731116 252.011145 
+L 229.507348 257.595549 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3383be; stroke-width: 1.5"/>
+    <path d="M 229.507348 257.595549 
+L 221.037587 263.815592 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3585bf; stroke-width: 1.5"/>
+    <path d="M 221.037587 263.815592 
+L 213.218181 270.496423 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3888c1; stroke-width: 1.5"/>
+    <path d="M 213.218181 270.496423 
+L 205.94323 277.513208 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3c8cc3; stroke-width: 1.5"/>
+    <path d="M 205.94323 277.513208 
+L 199.123377 284.780674 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4191c6; stroke-width: 1.5"/>
+    <path d="M 199.123377 284.780674 
+L 192.686091 292.240223 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4896c8; stroke-width: 1.5"/>
+    <path d="M 192.686091 292.240223 
+L 186.57465 299.851054 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4e9acb; stroke-width: 1.5"/>
+    <path d="M 186.57465 299.851054 
 L 180.744828 307.584 
-" style="fill:none;stroke:#56a0ce;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 180.744828 307.584 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #56a0ce; stroke-width: 1.5"/>
+    <path d="M 180.744828 307.584 
 L 180.744828 307.584 
-" style="fill:none;stroke:#5da5d1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 274.888821 249.772539 
-L 264.577711 253.378285 
-" style="fill:none;stroke:#3989c1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 264.577711 253.378285 
-L 254.617257 258.190992 
-" style="fill:none;stroke:#3787c0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 254.617257 258.190992 
-L 245.549612 263.911033 
-" style="fill:none;stroke:#3787c0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 245.549612 263.911033 
-L 237.339451 270.318983 
-" style="fill:none;stroke:#3888c1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 237.339451 270.318983 
-L 229.879727 277.223117 
-" style="fill:none;stroke:#3a8ac2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 229.879727 277.223117 
-L 223.051546 284.483863 
-" style="fill:none;stroke:#3c8cc3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 223.051546 284.483863 
-L 216.746622 292.004648 
-" style="fill:none;stroke:#4090c5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 216.746622 292.004648 
-L 210.876988 299.719727 
-" style="fill:none;stroke:#4594c7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 210.876988 299.719727 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5da5d1; stroke-width: 1.5"/>
+    <path d="M 274.884204 249.769895 
+L 264.5746 253.375518 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3989c1; stroke-width: 1.5"/>
+    <path d="M 264.5746 253.375518 
+L 254.614275 258.18902 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3787c0; stroke-width: 1.5"/>
+    <path d="M 254.614275 258.18902 
+L 245.546897 263.909595 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3787c0; stroke-width: 1.5"/>
+    <path d="M 245.546897 263.909595 
+L 237.33683 270.317577 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3888c1; stroke-width: 1.5"/>
+    <path d="M 237.33683 270.317577 
+L 229.877969 277.222278 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3a8ac2; stroke-width: 1.5"/>
+    <path d="M 229.877969 277.222278 
+L 223.050402 284.483363 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3c8cc3; stroke-width: 1.5"/>
+    <path d="M 223.050402 284.483363 
+L 216.745916 292.004359 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4090c5; stroke-width: 1.5"/>
+    <path d="M 216.745916 292.004359 
+L 210.876641 299.719584 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4594c7; stroke-width: 1.5"/>
+    <path d="M 210.876641 299.719584 
 L 205.373793 307.584 
-" style="fill:none;stroke:#4a98c9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 205.373793 307.584 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4a98c9; stroke-width: 1.5"/>
+    <path d="M 205.373793 307.584 
 L 205.373793 307.584 
-" style="fill:none;stroke:#4f9bcb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 252.826875 
-L 410.050646 252.573004 
-" style="fill:none;stroke:#e7f0fa;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 410.050646 252.573004 
-L 398.176141 251.955806 
-" style="fill:none;stroke:#e0ecf8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 398.176141 251.955806 
-L 386.295373 251.40895 
-" style="fill:none;stroke:#d2e3f3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 386.295373 251.40895 
-L 374.407027 250.962292 
-" style="fill:none;stroke:#c3daee;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 374.407027 250.962292 
-L 362.511204 250.658176 
-" style="fill:none;stroke:#aed1e7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 362.511204 250.658176 
-L 350.610222 250.555445 
-" style="fill:none;stroke:#9ac8e0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 350.610222 250.555445 
-L 338.712262 250.736426 
-" style="fill:none;stroke:#84bcdb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 338.712262 250.736426 
-L 326.839598 251.315507 
-" style="fill:none;stroke:#71b1d7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 326.839598 251.315507 
-L 315.044077 252.446238 
-" style="fill:none;stroke:#61a7d2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 315.044077 252.446238 
-L 303.42705 254.316706 
-" style="fill:none;stroke:#56a0ce;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 303.42705 254.316706 
-L 292.685786 256.962927 
-" style="fill:none;stroke:#4b98ca;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 292.685786 256.962927 
-L 282.410901 260.591867 
-" style="fill:none;stroke:#4594c7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 282.410901 260.591867 
-L 272.461225 265.417107 
-" style="fill:none;stroke:#4090c5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 272.461225 265.417107 
-L 263.435445 271.171802 
-" style="fill:none;stroke:#3e8ec4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.435445 271.171802 
-L 255.332526 277.652882 
-" style="fill:none;stroke:#3d8dc4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 255.332526 277.652882 
-L 248.058766 284.664539 
-" style="fill:none;stroke:#3e8ec4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 248.058766 284.664539 
-L 241.4895 292.05588 
-" style="fill:none;stroke:#4090c5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 241.4895 292.05588 
-L 235.504344 299.719984 
-" style="fill:none;stroke:#4292c6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 235.504344 299.719984 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4f9bcb; stroke-width: 1.5"/>
+    <path d="M 414.72 252.825564 
+L 410.044182 252.571307 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #e7f0fa; stroke-width: 1.5"/>
+    <path d="M 410.044182 252.571307 
+L 398.169673 251.954009 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #e0ecf8; stroke-width: 1.5"/>
+    <path d="M 398.169673 251.954009 
+L 386.288898 251.407054 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #d2e3f3; stroke-width: 1.5"/>
+    <path d="M 386.288898 251.407054 
+L 374.400545 250.960308 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c3daee; stroke-width: 1.5"/>
+    <path d="M 374.400545 250.960308 
+L 362.504681 250.656097 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #aed1e7; stroke-width: 1.5"/>
+    <path d="M 362.504681 250.656097 
+L 350.603632 250.553276 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #9ac8e0; stroke-width: 1.5"/>
+    <path d="M 350.603632 250.553276 
+L 338.705636 250.734187 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #84bcdb; stroke-width: 1.5"/>
+    <path d="M 338.705636 250.734187 
+L 326.832812 251.313285 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #71b1d7; stroke-width: 1.5"/>
+    <path d="M 326.832812 251.313285 
+L 315.036988 252.444209 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #61a7d2; stroke-width: 1.5"/>
+    <path d="M 315.036988 252.444209 
+L 303.419709 254.315021 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #56a0ce; stroke-width: 1.5"/>
+    <path d="M 303.419709 254.315021 
+L 292.681462 256.960804 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4b98ca; stroke-width: 1.5"/>
+    <path d="M 292.681462 256.960804 
+L 282.408439 260.589339 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4594c7; stroke-width: 1.5"/>
+    <path d="M 282.408439 260.589339 
+L 272.45875 265.415285 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4090c5; stroke-width: 1.5"/>
+    <path d="M 272.45875 265.415285 
+L 263.433069 271.170412 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3e8ec4; stroke-width: 1.5"/>
+    <path d="M 263.433069 271.170412 
+L 255.330347 277.651657 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3d8dc4; stroke-width: 1.5"/>
+    <path d="M 255.330347 277.651657 
+L 248.057287 284.663842 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3e8ec4; stroke-width: 1.5"/>
+    <path d="M 248.057287 284.663842 
+L 241.488365 292.055409 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4090c5; stroke-width: 1.5"/>
+    <path d="M 241.488365 292.055409 
+L 235.503665 299.719711 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4292c6; stroke-width: 1.5"/>
+    <path d="M 235.503665 299.719711 
 L 230.002759 307.584 
-" style="fill:none;stroke:#4695c8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 230.002759 307.584 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4695c8; stroke-width: 1.5"/>
+    <path d="M 230.002759 307.584 
 L 230.002759 307.584 
-" style="fill:none;stroke:#4a98c9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 307.599375 259.405475 
-L 297.009747 262.56503 
-" style="fill:none;stroke:#529dcc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 297.009747 262.56503 
-L 286.809344 266.793648 
-" style="fill:none;stroke:#4a98c9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 286.809344 266.793648 
-L 277.288734 272.082238 
-" style="fill:none;stroke:#4695c8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 277.288734 272.082238 
-L 268.710773 278.209404 
-" style="fill:none;stroke:#4292c6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 268.710773 278.209404 
-L 261.038002 284.977433 
-" style="fill:none;stroke:#4292c6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 261.038002 284.977433 
-L 254.163666 292.210778 
-" style="fill:none;stroke:#4292c6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 254.163666 292.210778 
-L 247.961621 299.777148 
-" style="fill:none;stroke:#4594c7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 247.961621 299.777148 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4a98c9; stroke-width: 1.5"/>
+    <path d="M 307.597096 259.40188 
+L 297.009234 262.560867 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #529dcc; stroke-width: 1.5"/>
+    <path d="M 297.009234 262.560867 
+L 286.806288 266.790796 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4a98c9; stroke-width: 1.5"/>
+    <path d="M 286.806288 266.790796 
+L 277.285613 272.079761 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4695c8; stroke-width: 1.5"/>
+    <path d="M 277.285613 272.079761 
+L 268.708029 278.207578 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4292c6; stroke-width: 1.5"/>
+    <path d="M 268.708029 278.207578 
+L 261.035883 284.976237 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4292c6; stroke-width: 1.5"/>
+    <path d="M 261.035883 284.976237 
+L 254.162274 292.21009 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4292c6; stroke-width: 1.5"/>
+    <path d="M 254.162274 292.21009 
+L 247.960936 299.776842 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4594c7; stroke-width: 1.5"/>
+    <path d="M 247.960936 299.776842 
 L 242.317241 307.584 
-" style="fill:none;stroke:#4896c8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 242.317241 307.584 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4896c8; stroke-width: 1.5"/>
+    <path d="M 242.317241 307.584 
 L 242.317241 307.584 
-" style="fill:none;stroke:#4a98c9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 260.913651 
-L 410.135436 260.874436 
-" style="fill:none;stroke:#eaf2fb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 410.135436 260.874436 
-L 398.232698 260.848937 
-" style="fill:none;stroke:#e3eef9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 398.232698 260.848937 
-L 386.332294 261.006072 
-" style="fill:none;stroke:#d4e4f4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 386.332294 261.006072 
-L 374.442803 261.405528 
-" style="fill:none;stroke:#c7dcef;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 374.442803 261.405528 
-L 362.581948 262.127227 
-" style="fill:none;stroke:#b3d3e8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 362.581948 262.127227 
-L 350.784605 263.27665 
-" style="fill:none;stroke:#a0cbe2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 350.784605 263.27665 
-L 339.114586 264.987123 
-" style="fill:none;stroke:#8cc0dd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 339.114586 264.987123 
-L 327.679188 267.411299 
-" style="fill:none;stroke:#7ab6d9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 327.679188 267.411299 
-L 316.666657 270.6907 
-" style="fill:none;stroke:#6aaed6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 316.666657 270.6907 
-L 306.241168 274.93098 
-" style="fill:none;stroke:#60a7d2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 306.241168 274.93098 
-L 296.619738 280.119981 
-" style="fill:none;stroke:#58a1cf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 296.619738 280.119981 
-L 287.913491 286.145801 
-" style="fill:none;stroke:#539ecd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 287.913491 286.145801 
-L 280.124925 292.838647 
-" style="fill:none;stroke:#519ccc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 280.124925 292.838647 
-L 273.17425 300.030227 
-" style="fill:none;stroke:#4f9bcb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 273.17425 300.030227 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4a98c9; stroke-width: 1.5"/>
+    <path d="M 414.72 260.912259 
+L 410.13708 260.873011 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #eaf2fb; stroke-width: 1.5"/>
+    <path d="M 410.13708 260.873011 
+L 398.234311 260.847384 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #e3eef9; stroke-width: 1.5"/>
+    <path d="M 398.234311 260.847384 
+L 386.333869 261.004371 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #d4e4f4; stroke-width: 1.5"/>
+    <path d="M 386.333869 261.004371 
+L 374.444336 261.403654 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c7dcef; stroke-width: 1.5"/>
+    <path d="M 374.444336 261.403654 
+L 362.583348 262.125195 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b3d3e8; stroke-width: 1.5"/>
+    <path d="M 362.583348 262.125195 
+L 350.785805 263.274477 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #a0cbe2; stroke-width: 1.5"/>
+    <path d="M 350.785805 263.274477 
+L 339.115628 264.984717 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #8cc0dd; stroke-width: 1.5"/>
+    <path d="M 339.115628 264.984717 
+L 327.68008 267.408569 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #7ab6d9; stroke-width: 1.5"/>
+    <path d="M 327.68008 267.408569 
+L 316.665505 270.688466 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #6aaed6; stroke-width: 1.5"/>
+    <path d="M 316.665505 270.688466 
+L 306.239788 274.928878 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #60a7d2; stroke-width: 1.5"/>
+    <path d="M 306.239788 274.928878 
+L 296.618298 280.118294 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #58a1cf; stroke-width: 1.5"/>
+    <path d="M 296.618298 280.118294 
+L 287.912106 286.144394 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #539ecd; stroke-width: 1.5"/>
+    <path d="M 287.912106 286.144394 
+L 280.124034 292.837896 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #519ccc; stroke-width: 1.5"/>
+    <path d="M 280.124034 292.837896 
+L 273.173929 300.029986 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4f9bcb; stroke-width: 1.5"/>
+    <path d="M 273.173929 300.029986 
 L 266.946207 307.584 
-" style="fill:none;stroke:#4f9bcb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 266.946207 307.584 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4f9bcb; stroke-width: 1.5"/>
+    <path d="M 266.946207 307.584 
 L 266.946207 307.584 
-" style="fill:none;stroke:#4f9bcb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 267.867851 
-L 405.392317 268.254775 
-" style="fill:none;stroke:#ebf3fb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 405.392317 268.254775 
-L 393.520479 268.881518 
-" style="fill:none;stroke:#dfecf7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 393.520479 268.881518 
-L 381.687232 269.824478 
-" style="fill:none;stroke:#d1e2f3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 381.687232 269.824478 
-L 369.927733 271.17531 
-" style="fill:none;stroke:#c3daee;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 369.927733 271.17531 
-L 358.300563 273.046686 
-" style="fill:none;stroke:#b0d2e7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 358.300563 273.046686 
-L 346.900171 275.567413 
-" style="fill:none;stroke:#9fcae1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 346.900171 275.567413 
-L 335.86904 278.865551 
-" style="fill:none;stroke:#8dc1dd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 335.86904 278.865551 
-L 325.385261 283.032437 
-" style="fill:none;stroke:#7db8da;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 325.385261 283.032437 
-L 315.630777 288.085689 
-" style="fill:none;stroke:#71b1d7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 315.630777 288.085689 
-L 306.73261 293.954523 
-" style="fill:none;stroke:#68acd5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 306.73261 293.954523 
-L 298.729321 300.504765 
-" style="fill:none;stroke:#63a8d3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 298.729321 300.504765 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4f9bcb; stroke-width: 1.5"/>
+    <path d="M 414.72 267.866663 
+L 405.393128 268.253493 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #ebf3fb; stroke-width: 1.5"/>
+    <path d="M 405.393128 268.253493 
+L 393.521236 268.880146 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #dfecf7; stroke-width: 1.5"/>
+    <path d="M 393.521236 268.880146 
+L 381.687934 269.822996 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #d1e2f3; stroke-width: 1.5"/>
+    <path d="M 381.687934 269.822996 
+L 369.928282 271.173784 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c3daee; stroke-width: 1.5"/>
+    <path d="M 369.928282 271.173784 
+L 358.300874 273.045201 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b0d2e7; stroke-width: 1.5"/>
+    <path d="M 358.300874 273.045201 
+L 346.90026 275.565975 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #9fcae1; stroke-width: 1.5"/>
+    <path d="M 346.90026 275.565975 
+L 335.868928 278.864198 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #8dc1dd; stroke-width: 1.5"/>
+    <path d="M 335.868928 278.864198 
+L 325.385 283.031204 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #7db8da; stroke-width: 1.5"/>
+    <path d="M 325.385 283.031204 
+L 315.630435 288.084917 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #71b1d7; stroke-width: 1.5"/>
+    <path d="M 315.630435 288.084917 
+L 306.732283 293.954102 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #68acd5; stroke-width: 1.5"/>
+    <path d="M 306.732283 293.954102 
+L 298.729055 300.504434 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #63a8d3; stroke-width: 1.5"/>
+    <path d="M 298.729055 300.504434 
 L 291.575172 307.584 
-" style="fill:none;stroke:#5fa6d1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 291.575172 307.584 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5fa6d1; stroke-width: 1.5"/>
+    <path d="M 291.575172 307.584 
 L 291.575172 307.584 
-" style="fill:none;stroke:#5da5d1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 373.308014 275.898667 
-L 361.796427 278.130435 
-" style="fill:none;stroke:#b8d5ea;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 361.796427 278.130435 
-L 350.567349 281.043909 
-" style="fill:none;stroke:#a8cee4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 350.567349 281.043909 
-L 339.770641 284.747022 
-" style="fill:none;stroke:#97c6df;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 339.770641 284.747022 
-L 329.580701 289.301104 
-" style="fill:none;stroke:#87bddc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 329.580701 289.301104 
-L 320.154478 294.692425 
-" style="fill:none;stroke:#7ab6d9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 320.154478 294.692425 
-L 311.587529 300.831472 
-" style="fill:none;stroke:#71b1d7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 311.587529 300.831472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5da5d1; stroke-width: 1.5"/>
+    <path d="M 373.308586 275.896791 
+L 361.796752 278.128581 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b8d5ea; stroke-width: 1.5"/>
+    <path d="M 361.796752 278.128581 
+L 350.567443 281.042089 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #a8cee4; stroke-width: 1.5"/>
+    <path d="M 350.567443 281.042089 
+L 339.770513 284.745301 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #97c6df; stroke-width: 1.5"/>
+    <path d="M 339.770513 284.745301 
+L 329.580379 289.299666 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #87bddc; stroke-width: 1.5"/>
+    <path d="M 329.580379 289.299666 
+L 320.154076 294.691343 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #7ab6d9; stroke-width: 1.5"/>
+    <path d="M 320.154076 294.691343 
+L 311.587266 300.831006 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #71b1d7; stroke-width: 1.5"/>
+    <path d="M 311.587266 300.831006 
 L 303.889655 307.584 
-" style="fill:none;stroke:#6aaed6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 303.889655 307.584 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #6aaed6; stroke-width: 1.5"/>
+    <path d="M 303.889655 307.584 
 L 303.889655 307.584 
-" style="fill:none;stroke:#66abd4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 279.913054 
-L 414.19051 279.966236 
-" style="fill:none;stroke:#eff6fc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.19051 279.966236 
-L 402.432441 281.333069 
-" style="fill:none;stroke:#eef5fc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 402.432441 281.333069 
-L 390.777909 283.120292 
-" style="fill:none;stroke:#dfecf7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 390.777909 283.120292 
-L 379.291116 285.425009 
-" style="fill:none;stroke:#d3e3f3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 379.291116 285.425009 
-L 368.065708 288.35145 
-" style="fill:none;stroke:#c7dbef;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 368.065708 288.35145 
-L 357.22945 291.995964 
-" style="fill:none;stroke:#b5d4e9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 357.22945 291.995964 
-L 346.933791 296.422212 
-" style="fill:none;stroke:#a8cee4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 346.933791 296.422212 
-L 337.328355 301.6375 
-" style="fill:none;stroke:#9ac8e0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 337.328355 301.6375 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #66abd4; stroke-width: 1.5"/>
+    <path d="M 414.72 279.912201 
+L 414.191139 279.965317 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #eff6fc; stroke-width: 1.5"/>
+    <path d="M 414.191139 279.965317 
+L 402.432981 281.33214 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #eef5fc; stroke-width: 1.5"/>
+    <path d="M 402.432981 281.33214 
+L 390.778308 283.119415 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #dfecf7; stroke-width: 1.5"/>
+    <path d="M 390.778308 283.119415 
+L 379.291388 285.424177 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #d3e3f3; stroke-width: 1.5"/>
+    <path d="M 379.291388 285.424177 
+L 368.06588 288.350638 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c7dbef; stroke-width: 1.5"/>
+    <path d="M 368.06588 288.350638 
+L 357.229563 291.9951 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b5d4e9; stroke-width: 1.5"/>
+    <path d="M 357.229563 291.9951 
+L 346.933816 296.421413 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #a8cee4; stroke-width: 1.5"/>
+    <path d="M 346.933816 296.421413 
+L 337.32832 301.637098 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #9ac8e0; stroke-width: 1.5"/>
+    <path d="M 337.32832 301.637098 
 L 328.518621 307.584 
-" style="fill:none;stroke:#8dc1dd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 328.518621 307.584 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #8dc1dd; stroke-width: 1.5"/>
+    <path d="M 328.518621 307.584 
 L 328.518621 307.584 
-" style="fill:none;stroke:#84bcdb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 288.098756 
-L 406.957883 289.492589 
-" style="fill:none;stroke:#f2f7fd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 406.957883 289.492589 
-L 395.479177 291.823702 
-" style="fill:none;stroke:#e7f1fa;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 395.479177 291.823702 
-L 384.239453 294.72423 
-" style="fill:none;stroke:#dae8f6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 384.239453 294.72423 
-L 373.34864 298.281595 
-" style="fill:none;stroke:#cfe1f2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 373.34864 298.281595 
-L 362.939229 302.560739 
-" style="fill:none;stroke:#c3daee;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 362.939229 302.560739 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #84bcdb; stroke-width: 1.5"/>
+    <path d="M 414.72 288.097815 
+L 406.958715 289.491452 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #f2f7fd; stroke-width: 1.5"/>
+    <path d="M 406.958715 289.491452 
+L 395.479877 291.822574 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #e7f1fa; stroke-width: 1.5"/>
+    <path d="M 395.479877 291.822574 
+L 384.239933 294.723268 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #dae8f6; stroke-width: 1.5"/>
+    <path d="M 384.239933 294.723268 
+L 373.348886 298.280933 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #cfe1f2; stroke-width: 1.5"/>
+    <path d="M 373.348886 298.280933 
+L 362.939302 302.560453 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c3daee; stroke-width: 1.5"/>
+    <path d="M 362.939302 302.560453 
 L 353.147586 307.584 
-" style="fill:none;stroke:#b4d3e9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 353.147586 307.584 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b4d3e9; stroke-width: 1.5"/>
+    <path d="M 353.147586 307.584 
 L 353.147586 307.584 
-" style="fill:none;stroke:#a9cfe5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 296.275064 
-L 410.550843 297.211241 
-" style="fill:none;stroke:#f4f9fe;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 410.550843 297.211241 
-L 399.278374 300.044148 
-" style="fill:none;stroke:#eef5fc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 399.278374 300.044148 
-L 388.3151 303.479874 
-" style="fill:none;stroke:#e1edf8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 388.3151 303.479874 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #a9cfe5; stroke-width: 1.5"/>
+    <path d="M 414.72 296.274595 
+L 410.551207 297.210692 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #f4f9fe; stroke-width: 1.5"/>
+    <path d="M 410.551207 297.210692 
+L 399.278635 300.043677 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #eef5fc; stroke-width: 1.5"/>
+    <path d="M 399.278635 300.043677 
+L 388.31522 303.479601 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #e1edf8; stroke-width: 1.5"/>
+    <path d="M 388.31522 303.479601 
 L 377.776552 307.584 
-" style="fill:none;stroke:#d6e5f4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 377.776552 307.584 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #d6e5f4; stroke-width: 1.5"/>
+    <path d="M 377.776552 307.584 
 L 377.776552 307.584 
-" style="fill:none;stroke:#ccdff1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 234.173793 
-L 414.72 234.173793 
-" style="fill:none;stroke:#e1edf8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 234.173793 
-L 403.046636 232.437738 
-" style="fill:none;stroke:#e1edf8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 403.046636 232.437738 
-L 391.406318 230.583037 
-" style="fill:none;stroke:#d2e3f3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 391.406318 230.583037 
-L 379.806831 228.592384 
-" style="fill:none;stroke:#c2d9ee;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 379.806831 228.592384 
-L 368.258226 226.44405 
-" style="fill:none;stroke:#add0e6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 368.258226 226.44405 
-L 356.773889 224.11224 
-" style="fill:none;stroke:#97c6df;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 356.773889 224.11224 
-L 345.371758 221.566802 
-" style="fill:none;stroke:#7fb9da;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 345.371758 221.566802 
-L 334.075713 218.77166 
-" style="fill:none;stroke:#69add5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 334.075713 218.77166 
-L 322.917757 215.685752 
-" style="fill:none;stroke:#5aa2cf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 322.917757 215.685752 
-L 311.939658 212.263089 
-" style="fill:none;stroke:#4b98ca;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 311.939658 212.263089 
-L 301.194207 208.454379 
-" style="fill:none;stroke:#3f8fc5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 301.194207 208.454379 
-L 290.744883 204.21417 
-" style="fill:none;stroke:#3686c0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 290.744883 204.21417 
-L 280.661223 199.509357 
-" style="fill:none;stroke:#2e7ebc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 224.997517 
-L 414.72 224.997517 
-" style="fill:none;stroke:#dfebf7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 224.997517 
-L 403.1793 222.82509 
-" style="fill:none;stroke:#dfebf7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 403.1793 222.82509 
-L 391.70042 220.478476 
-" style="fill:none;stroke:#d0e1f2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 391.70042 220.478476 
-L 380.299112 217.931195 
-" style="fill:none;stroke:#bed8ec;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 380.299112 217.931195 
-L 368.996031 215.15234 
-" style="fill:none;stroke:#a9cfe5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 368.996031 215.15234 
-L 357.818255 212.10617 
-" style="fill:none;stroke:#91c3de;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 357.818255 212.10617 
-L 346.80113 208.751985 
-" style="fill:none;stroke:#79b5d9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 346.80113 208.751985 
-L 335.990216 205.044986 
-" style="fill:none;stroke:#65aad4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 335.990216 205.044986 
-L 325.442381 200.940542 
-" style="fill:none;stroke:#549fcd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 325.442381 200.940542 
-L 315.226265 196.395882 
-" style="fill:none;stroke:#4695c8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 315.226265 196.395882 
-L 305.419714 191.376666 
-" style="fill:none;stroke:#3b8bc2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 305.419714 191.376666 
-L 296.103546 185.864176 
-" style="fill:none;stroke:#3282be;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 296.103546 185.864176 
-L 287.349531 179.86258 
-" style="fill:none;stroke:#2a7ab9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 287.349531 179.86258 
-L 279.213413 173.396208 
-" style="fill:none;stroke:#2272b6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 215.821241 
-L 414.72 215.821241 
-" style="fill:none;stroke:#dce9f6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 215.821241 
-L 403.315739 213.28026 
-" style="fill:none;stroke:#dce9f6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 403.315739 213.28026 
-L 392.000167 210.528519 
-" style="fill:none;stroke:#cddff1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 392.000167 210.528519 
-L 380.795021 207.537239 
-" style="fill:none;stroke:#bad6eb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 380.795021 207.537239 
-L 369.727955 204.274083 
-" style="fill:none;stroke:#a4cce3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 369.727955 204.274083 
-L 358.833937 200.703361 
-" style="fill:none;stroke:#8cc0dd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 358.833937 200.703361 
-L 348.156403 196.787432 
-" style="fill:none;stroke:#74b3d8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 348.156403 196.787432 
-L 337.747421 192.49009 
-" style="fill:none;stroke:#61a7d2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 337.747421 192.49009 
-L 327.667494 187.778564 
-" style="fill:none;stroke:#519ccc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 327.667494 187.778564 
-L 317.982516 182.628717 
-" style="fill:none;stroke:#4292c6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 317.982516 182.628717 
-L 308.758311 177.029814 
-" style="fill:none;stroke:#3888c1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 308.758311 177.029814 
-L 300.055238 170.985843 
-" style="fill:none;stroke:#2f7fbc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 300.055238 170.985843 
-L 291.920001 164.517481 
-" style="fill:none;stroke:#2676b8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 291.920001 164.517481 
-L 284.380074 157.659942 
-" style="fill:none;stroke:#206fb4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 284.380074 157.659942 
-L 277.447357 150.455024 
-" style="fill:none;stroke:#1a68ae;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 277.447357 150.455024 
-L 271.127646 142.943269 
-" style="fill:none;stroke:#1663aa;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 271.127646 142.943269 
-L 265.447508 135.154241 
-" style="fill:none;stroke:#125da6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 265.447508 135.154241 
-L 260.742554 127.027371 
-" style="fill:none;stroke:#0e59a2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 260.742554 127.027371 
-L 260.742554 127.027371 
-" style="fill:none;stroke:#0a549e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 260.742554 127.027371 
-L 259.822008 124.872208 
-" style="fill:none;stroke:#0a549e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 259.822008 124.872208 
-L 259.822008 124.872208 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 259.822008 124.872208 
-L 259.618407 123.498448 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 259.618407 123.498448 
-L 259.618407 123.498448 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 259.618407 123.498448 
-L 259.939688 122.773908 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 259.939688 122.773908 
-L 260.59031 122.434798 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 260.59031 122.434798 
-L 261.013327 122.143029 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 261.013327 122.143029 
-L 261.405578 121.911681 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 261.405578 121.911681 
-L 261.703577 121.738128 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 261.703577 121.738128 
-L 262.033272 121.62411 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 262.033272 121.62411 
-L 262.405785 121.607005 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 262.405785 121.607005 
-L 262.405785 121.607005 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 262.405785 121.607005 
-L 262.618416 121.569513 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 262.618416 121.569513 
-L 262.769089 121.531453 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 262.769089 121.531453 
-L 262.863809 121.478214 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 262.863809 121.478214 
-L 262.929497 121.425847 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 262.929497 121.425847 
-L 262.990616 121.395122 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 262.990616 121.395122 
-L 263.055772 121.392968 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.055772 121.392968 
-L 263.117037 121.406656 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.117037 121.406656 
-L 263.156031 121.406497 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.156031 121.406497 
-L 263.167208 121.379261 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.167208 121.379261 
-L 263.167726 121.345763 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.167726 121.345763 
-L 263.176098 121.330651 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.176098 121.330651 
-L 263.198736 121.342362 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.198736 121.342362 
-L 263.227629 121.368522 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.227629 121.368522 
-L 263.242491 121.378429 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.242491 121.378429 
-L 263.234834 121.357887 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.234834 121.357887 
-L 263.22061 121.328883 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.22061 121.328883 
-L 263.217152 121.317006 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.217152 121.317006 
-L 263.229911 121.331004 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.229911 121.331004 
-L 263.25059 121.359019 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.25059 121.359019 
-L 263.259863 121.371549 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.259863 121.371549 
-L 263.249068 121.354184 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.249068 121.354184 
-L 263.23218 121.327108 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.23218 121.327108 
-L 263.225782 121.315493 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.225782 121.315493 
-L 263.235487 121.328583 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.235487 121.328583 
-L 263.253766 121.355736 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.253766 121.355736 
-L 263.262313 121.36914 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.262313 121.36914 
-L 263.251942 121.353864 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.251942 121.353864 
-L 263.235118 121.328013 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.235118 121.328013 
-L 263.22793 121.316106 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.22793 121.316106 
-L 263.236275 121.327827 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.236275 121.327827 
-L 263.253407 121.353711 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.253407 121.353711 
-L 263.262052 121.367576 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.262052 121.367576 
-L 263.252691 121.354087 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.252691 121.354087 
-L 263.236432 121.329335 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.236432 121.329335 
-L 263.228888 121.317096 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.228888 121.317096 
-L 263.236236 121.327445 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.236236 121.327445 
-L 263.252469 121.352022 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.252469 121.352022 
-L 263.26131 121.366193 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.26131 121.366193 
-L 263.253005 121.354341 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.253005 121.354341 
-L 263.237403 121.330662 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.237403 121.330662 
-L 263.229621 121.318143 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.229621 121.318143 
-L 263.236087 121.327196 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.236087 121.327196 
-L 263.251488 121.350493 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.251488 121.350493 
-L 263.260493 121.36487 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.260493 121.36487 
-L 263.253196 121.35454 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.253196 121.35454 
-L 263.238267 121.331923 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.238267 121.331923 
-L 263.230304 121.319185 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.230304 121.319185 
-L 263.235956 121.327026 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.235956 121.327026 
-L 263.250559 121.349084 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.250559 121.349084 
-L 263.25968 121.363585 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.25968 121.363585 
-L 263.253327 121.354673 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.253327 121.354673 
-L 263.239069 121.333108 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.239069 121.333108 
-L 263.23097 121.32021 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.23097 121.32021 
-L 263.235863 121.326923 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.235863 121.326923 
-L 263.249695 121.347783 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.249695 121.347783 
-L 263.258884 121.362338 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.258884 121.362338 
-L 263.253411 121.354742 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.253411 121.354742 
-L 263.239819 121.334217 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.239819 121.334217 
-L 263.231622 121.321216 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.231622 121.321216 
-L 263.235807 121.326877 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.235807 121.326877 
-L 263.248893 121.346581 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.248893 121.346581 
-L 263.258108 121.361126 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.258108 121.361126 
-L 263.253454 121.354753 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.253454 121.354753 
-L 263.240521 121.335254 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.240521 121.335254 
-L 263.232261 121.322201 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.232261 121.322201 
-L 263.235787 121.326883 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.235787 121.326883 
-L 263.248152 121.345471 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.248152 121.345471 
-L 263.257355 121.359951 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.257355 121.359951 
-L 263.25346 121.354712 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.25346 121.354712 
-L 263.241177 121.336222 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.241177 121.336222 
-L 263.232886 121.323163 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.232886 121.323163 
-L 263.235798 121.326935 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.235798 121.326935 
-L 263.247467 121.344448 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.247467 121.344448 
-L 263.256623 121.358814 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.256623 121.358814 
-L 263.253434 121.354624 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.253434 121.354624 
-L 263.241788 121.337123 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.241788 121.337123 
-L 263.233497 121.324101 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.233497 121.324101 
-L 263.235838 121.327029 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.235838 121.327029 
-L 263.246835 121.343506 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.246835 121.343506 
-L 263.255915 121.357715 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.255915 121.357715 
-L 263.253378 121.354493 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.253378 121.354493 
-L 263.242358 121.33796 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.242358 121.33796 
-L 263.234093 121.325015 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.234093 121.325015 
-L 263.235903 121.32716 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.235903 121.32716 
-L 263.246252 121.342639 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.246252 121.342639 
-L 263.255229 121.356653 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.255229 121.356653 
-L 263.253295 121.354323 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.253295 121.354323 
-L 263.242887 121.338736 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.242887 121.338736 
-L 263.234673 121.325905 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.234673 121.325905 
-L 263.235991 121.327325 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.235991 121.327325 
-L 263.245716 121.341844 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.245716 121.341844 
-L 263.254567 121.35563 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.254567 121.35563 
-L 263.253187 121.354119 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.253187 121.354119 
-L 263.243378 121.339454 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.243378 121.339454 
-L 263.235238 121.326768 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.235238 121.326768 
-L 263.2361 121.327519 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.2361 121.327519 
-L 263.245223 121.341115 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.245223 121.341115 
-L 263.253928 121.354644 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.253928 121.354644 
-L 263.253058 121.353885 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.253058 121.353885 
-L 263.243831 121.340115 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.243831 121.340115 
-L 263.235786 121.327606 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.235786 121.327606 
-L 263.236227 121.32774 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.236227 121.32774 
-L 263.244772 121.340449 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.244772 121.340449 
-L 263.253313 121.353696 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.253313 121.353696 
-L 263.25291 121.353624 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.25291 121.353624 
-L 263.24425 121.340724 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.24425 121.340724 
-L 263.236318 121.328417 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.236318 121.328417 
-L 263.236371 121.327984 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.236371 121.327984 
-L 263.244359 121.339842 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.244359 121.339842 
-L 263.252721 121.352786 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.252721 121.352786 
-L 263.252745 121.353339 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.252745 121.353339 
-L 263.244634 121.341282 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.244634 121.341282 
-L 263.236832 121.329201 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.236832 121.329201 
-L 263.236528 121.328249 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.236528 121.328249 
-L 263.243983 121.339291 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.243983 121.339291 
-L 263.252152 121.351913 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.252152 121.351913 
-L 263.252566 121.353034 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.252566 121.353034 
-L 263.244986 121.341791 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.244986 121.341791 
-L 263.23733 121.329958 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.23733 121.329958 
-L 263.236699 121.328531 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.236699 121.328531 
-L 263.243641 121.338791 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.243641 121.338791 
-L 263.251606 121.351076 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.251606 121.351076 
-L 263.252373 121.352712 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.252373 121.352712 
-L 263.245308 121.342254 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.245308 121.342254 
-L 263.23781 121.330688 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.23781 121.330688 
-L 263.23688 121.328829 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.23688 121.328829 
-L 263.243331 121.33834 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.243331 121.33834 
-L 263.251082 121.350275 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.251082 121.350275 
-L 263.252169 121.352374 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.252169 121.352374 
-L 263.2456 121.342674 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.2456 121.342674 
-L 263.238273 121.331391 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.238273 121.331391 
-L 263.237071 121.32914 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.237071 121.32914 
-L 263.243051 121.337935 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.243051 121.337935 
-L 263.250581 121.34951 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.250581 121.34951 
-L 263.251956 121.352024 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.251956 121.352024 
-L 263.245865 121.343051 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.245865 121.343051 
-L 263.238719 121.332066 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.238719 121.332066 
-L 263.237271 121.329462 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.237271 121.329462 
-L 263.2428 121.337573 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.2428 121.337573 
-L 263.250103 121.34878 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.250103 121.34878 
-L 263.251735 121.351663 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.251735 121.351663 
-L 263.246103 121.34339 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.246103 121.34339 
-L 263.239148 121.332715 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.239148 121.332715 
-L 263.237477 121.329793 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.237477 121.329793 
-L 263.242575 121.33725 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.242575 121.33725 
-L 263.249645 121.348084 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.249645 121.348084 
-L 263.251507 121.351295 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.251507 121.351295 
-L 263.246316 121.343691 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.246316 121.343691 
-L 263.239559 121.333336 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.239559 121.333336 
-L 263.237688 121.330132 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.237688 121.330132 
-L 263.242375 121.336966 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.242375 121.336966 
-L 263.249209 121.347421 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.249209 121.347421 
-L 263.251275 121.35092 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.251275 121.35092 
-L 263.246506 121.343957 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.246506 121.343957 
-L 263.239952 121.33393 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.239952 121.33393 
-L 263.237904 121.330475 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 206.644966 
-L 414.72 206.644966 
-" style="fill:none;stroke:#d9e8f5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 206.644966 
-L 403.444639 203.80309 
-" style="fill:none;stroke:#d9e8f5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 403.444639 203.80309 
-L 392.279407 200.729888 
-" style="fill:none;stroke:#cadef0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 392.279407 200.729888 
-L 381.249371 197.397262 
-" style="fill:none;stroke:#b5d4e9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 381.249371 197.397262 
-L 370.385048 193.775783 
-" style="fill:none;stroke:#a0cbe2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 370.385048 193.775783 
-L 359.723212 189.835356 
-" style="fill:none;stroke:#87bddc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 359.723212 189.835356 
-L 349.307466 185.545936 
-" style="fill:none;stroke:#6fb0d7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 349.307466 185.545936 
-L 339.187175 180.881154 
-" style="fill:none;stroke:#5da5d1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 339.187175 180.881154 
-L 329.414846 175.822053 
-" style="fill:none;stroke:#4d99ca;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 329.414846 175.822053 
-L 320.043039 170.359142 
-" style="fill:none;stroke:#3f8fc5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 320.043039 170.359142 
-L 311.118676 164.495296 
-" style="fill:none;stroke:#3585bf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 311.118676 164.495296 
-L 302.677604 158.246805 
-" style="fill:none;stroke:#2c7cba;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 302.677604 158.246805 
-L 294.74143 151.640893 
-" style="fill:none;stroke:#2373b6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 294.74143 151.640893 
-L 287.308999 144.716966 
-" style="fill:none;stroke:#1c6bb0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 287.308999 144.716966 
-L 280.355619 137.521538 
-" style="fill:none;stroke:#1865ac;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 280.355619 137.521538 
-L 273.816512 130.112382 
-" style="fill:none;stroke:#135fa7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 197.46869 
-L 414.72 197.46869 
-" style="fill:none;stroke:#d6e6f4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 197.46869 
-L 403.557534 194.389281 
-" style="fill:none;stroke:#d6e6f4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 403.557534 194.389281 
-L 392.519481 191.070836 
-" style="fill:none;stroke:#c7dcef;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 392.519481 191.070836 
-L 381.631301 187.488707 
-" style="fill:none;stroke:#b2d2e8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 381.631301 187.488707 
-L 370.923361 183.617296 
-" style="fill:none;stroke:#9cc9e1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 370.923361 183.617296 
-L 360.430095 179.432876 
-" style="fill:none;stroke:#82bbdb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 360.430095 179.432876 
-L 350.190138 174.914105 
-" style="fill:none;stroke:#6aaed6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 350.190138 174.914105 
-L 340.244595 170.044653 
-" style="fill:none;stroke:#58a1cf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 340.244595 170.044653 
-L 330.634153 164.815541 
-" style="fill:none;stroke:#4997c9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 188.292414 
-L 414.72 188.292414 
-" style="fill:none;stroke:#d4e4f4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 188.292414 
-L 403.646859 185.038956 
-" style="fill:none;stroke:#d4e4f4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 403.646859 185.038956 
-L 392.705127 181.547846 
-" style="fill:none;stroke:#c4daee;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 392.705127 181.547846 
-L 381.918584 177.798646 
-" style="fill:none;stroke:#add0e6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 381.918584 177.798646 
-L 371.31404 173.771982 
-" style="fill:none;stroke:#95c5df;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 371.31404 173.771982 
-L 360.921242 169.450098 
-" style="fill:none;stroke:#7cb7da;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 360.921242 169.450098 
-L 350.771317 164.81939 
-" style="fill:none;stroke:#66abd4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 350.771317 164.81939 
-L 340.894456 159.872189 
-" style="fill:none;stroke:#549fcd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 340.894456 159.872189 
-L 331.316953 154.608465 
-" style="fill:none;stroke:#4594c7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 331.316953 154.608465 
-L 322.056076 149.03894 
-" style="fill:none;stroke:#3989c1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 322.056076 149.03894 
-L 313.112662 143.188226 
-" style="fill:none;stroke:#2e7ebc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 313.112662 143.188226 
-L 304.457865 137.100779 
-" style="fill:none;stroke:#2474b7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 304.457865 137.100779 
-L 296.007871 130.854748 
-" style="fill:none;stroke:#1d6cb1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 296.007871 130.854748 
-L 287.518441 124.640329 
-" style="fill:none;stroke:#1764ab;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 287.518441 124.640329 
-L 287.518441 124.640329 
-" style="fill:none;stroke:#125da6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 287.518441 124.640329 
-L 281.766284 120.924967 
-" style="fill:none;stroke:#125da6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 281.766284 120.924967 
-L 281.766284 120.924967 
-" style="fill:none;stroke:#0e59a2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 281.766284 120.924967 
-L 278.998228 119.460073 
-" style="fill:none;stroke:#0e59a2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 278.998228 119.460073 
-L 278.998228 119.460073 
-" style="fill:none;stroke:#0d57a1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 278.998228 119.460073 
-L 276.377003 118.50474 
-" style="fill:none;stroke:#0d57a1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 276.377003 118.50474 
-L 276.377003 118.50474 
-" style="fill:none;stroke:#0c56a0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 276.377003 118.50474 
-L 273.880428 118.177871 
-" style="fill:none;stroke:#0c56a0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 273.880428 118.177871 
-L 271.546225 118.498169 
-" style="fill:none;stroke:#0b559f;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 271.546225 118.498169 
-L 269.716525 118.924418 
-" style="fill:none;stroke:#0a549e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 179.116138 
-L 414.72 179.116138 
-" style="fill:none;stroke:#d1e2f3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 179.116138 
-L 403.70819 175.748917 
-" style="fill:none;stroke:#d1e2f3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 403.70819 175.748917 
-L 392.826913 172.154154 
-" style="fill:none;stroke:#bfd8ed;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 392.826913 172.154154 
-L 382.096594 168.316084 
-" style="fill:none;stroke:#a9cfe5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 382.096594 168.316084 
-L 371.539501 164.220253 
-" style="fill:none;stroke:#91c3de;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 371.539501 164.220253 
-L 361.178309 159.85587 
-" style="fill:none;stroke:#77b5d9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 361.178309 159.85587 
-L 351.034392 155.217102 
-" style="fill:none;stroke:#61a7d2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 351.034392 155.217102 
-L 341.124927 150.305276 
-" style="fill:none;stroke:#519ccc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 341.124927 150.305276 
-L 331.459506 145.130322 
-" style="fill:none;stroke:#4090c5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 169.939862 
-L 414.72 169.939862 
-" style="fill:none;stroke:#cfe1f2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 169.939862 
-L 403.736642 166.521168 
-" style="fill:none;stroke:#cfe1f2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 403.736642 166.521168 
-L 392.876059 162.891497 
-" style="fill:none;stroke:#bcd7eb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 392.876059 162.891497 
-L 382.154199 159.039852 
-" style="fill:none;stroke:#a5cde3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 382.154199 159.039852 
-L 371.586716 154.958352 
-" style="fill:none;stroke:#8abfdd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 371.586716 154.958352 
-L 361.1879 150.643217 
-" style="fill:none;stroke:#72b2d8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 361.1879 150.643217 
-L 350.968317 146.096724 
-" style="fill:none;stroke:#5da5d1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 350.968317 146.096724 
-L 340.930192 141.331066 
-" style="fill:none;stroke:#4b98ca;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 340.930192 141.331066 
-L 331.061278 136.372822 
-" style="fill:none;stroke:#3d8dc4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 331.061278 136.372822 
-L 321.32311 131.272691 
-" style="fill:none;stroke:#3181bd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 321.32311 131.272691 
-L 311.624405 126.132011 
-" style="fill:none;stroke:#2676b8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 311.624405 126.132011 
-L 301.757351 121.182341 
-" style="fill:none;stroke:#1e6db2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 301.757351 121.182341 
-L 301.757351 121.182341 
-" style="fill:none;stroke:#1764ab;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 301.757351 121.182341 
-L 293.57372 117.78755 
-" style="fill:none;stroke:#1764ab;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 293.57372 117.78755 
-L 293.57372 117.78755 
-" style="fill:none;stroke:#125ea6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 293.57372 117.78755 
-L 288.705291 116.324396 
-" style="fill:none;stroke:#125ea6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 288.705291 116.324396 
-L 288.705291 116.324396 
-" style="fill:none;stroke:#105ba4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 160.763586 
-L 414.72 160.763586 
-" style="fill:none;stroke:#ccdff1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 160.763586 
-L 403.729968 157.356495 
-" style="fill:none;stroke:#ccdff1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 403.729968 157.356495 
-L 392.84836 153.761529 
-" style="fill:none;stroke:#b7d4ea;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 392.84836 153.761529 
-L 382.085203 149.973871 
-" style="fill:none;stroke:#a0cbe2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 382.085203 149.973871 
-L 371.449297 145.991641 
-" style="fill:none;stroke:#85bcdc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 371.449297 145.991641 
-L 360.945015 141.819928 
-" style="fill:none;stroke:#6caed6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 360.945015 141.819928 
-L 350.569684 137.472795 
-" style="fill:none;stroke:#58a1cf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 350.569684 137.472795 
-L 340.308234 132.977893 
-" style="fill:none;stroke:#4896c8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 340.308234 132.977893 
-L 330.122215 128.388816 
-" style="fill:none;stroke:#3989c1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 151.58731 
-L 414.72 151.58731 
-" style="fill:none;stroke:#c9ddf0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 151.58731 
-L 403.686171 148.259349 
-" style="fill:none;stroke:#c9ddf0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 403.686171 148.259349 
-L 392.740198 144.774147 
-" style="fill:none;stroke:#b3d3e8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 392.740198 144.774147 
-L 381.886318 141.132548 
-" style="fill:none;stroke:#9ac8e0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 381.886318 141.132548 
-L 371.124792 137.341787 
-" style="fill:none;stroke:#7fb9da;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 371.124792 137.341787 
-L 360.449448 133.417998 
-" style="fill:none;stroke:#66abd4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 133.234759 
-L 414.72 133.234759 
-" style="fill:none;stroke:#c2d9ee;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 133.234759 
-L 403.487805 130.29745 
-" style="fill:none;stroke:#c2d9ee;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 403.487805 130.29745 
-L 392.290375 127.287297 
-" style="fill:none;stroke:#aacfe5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 392.290375 127.287297 
-L 381.118696 124.224717 
-" style="fill:none;stroke:#8fc2de;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 381.118696 124.224717 
-L 369.957285 121.142035 
-" style="fill:none;stroke:#74b3d8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 369.957285 121.142035 
-L 358.780978 118.090703 
-" style="fill:none;stroke:#5ca4d0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 358.780978 118.090703 
-L 347.550582 115.154599 
-" style="fill:none;stroke:#4997c9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 347.550582 115.154599 
-L 336.208879 112.475554 
-" style="fill:none;stroke:#3a8ac2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 336.208879 112.475554 
-L 324.686068 110.304592 
-" style="fill:none;stroke:#2d7dbb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 324.686068 110.304592 
-L 312.945172 109.092465 
-" style="fill:none;stroke:#2171b5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 312.945172 109.092465 
-L 312.945172 109.092465 
-" style="fill:none;stroke:#1967ad;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 312.945172 109.092465 
-L 304.831934 109.025776 
-" style="fill:none;stroke:#1967ad;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 304.831934 109.025776 
-L 304.831934 109.025776 
-" style="fill:none;stroke:#1561a9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 304.831934 109.025776 
-L 297.644718 109.733419 
-" style="fill:none;stroke:#1561a9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 124.058483 
-L 414.72 124.058483 
-" style="fill:none;stroke:#bed8ec;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 124.058483 
-L 403.340637 121.454743 
-" style="fill:none;stroke:#bed8ec;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 403.340637 121.454743 
-L 391.967767 118.835522 
-" style="fill:none;stroke:#a5cde3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 391.967767 118.835522 
-L 380.588016 116.233369 
-" style="fill:none;stroke:#89bedc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 380.588016 116.233369 
-L 369.181681 113.697514 
-" style="fill:none;stroke:#6dafd7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 105.705931 
-L 414.72 105.705931 
-" style="fill:none;stroke:#b5d4e9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 105.705931 
-L 403.009314 104.116679 
-" style="fill:none;stroke:#b5d4e9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 403.009314 104.116679 
-L 391.269353 102.655357 
-" style="fill:none;stroke:#9cc9e1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 391.269353 102.655357 
-L 379.491207 101.380456 
-" style="fill:none;stroke:#7db8da;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 379.491207 101.380456 
-L 367.668064 100.372697 
-" style="fill:none;stroke:#64a9d3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 367.668064 100.372697 
-L 355.801742 99.743021 
-" style="fill:none;stroke:#4e9acb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 355.801742 99.743021 
-L 343.914786 99.638836 
-" style="fill:none;stroke:#3d8dc4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 343.914786 99.638836 
-L 332.067291 100.240829 
-" style="fill:none;stroke:#3080bd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 87.353379 
-L 414.72 87.353379 
-" style="fill:none;stroke:#add0e6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 87.353379 
-L 402.81749 87.327496 
-" style="fill:none;stroke:#add0e6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 402.81749 87.327496 
-L 390.920436 87.567308 
-" style="fill:none;stroke:#91c3de;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 390.920436 87.567308 
-L 379.045726 88.132375 
-" style="fill:none;stroke:#74b3d8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 379.045726 88.132375 
-L 367.220143 89.090052 
-" style="fill:none;stroke:#5ca4d0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 367.220143 89.090052 
-L 355.481559 90.511861 
-" style="fill:none;stroke:#4997c9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 69.000828 
-L 414.72 69.000828 
-" style="fill:none;stroke:#a4cce3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 69.000828 
-L 403.136513 71.035689 
-" style="fill:none;stroke:#a4cce3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 403.136513 71.035689 
-L 391.649749 73.352435 
-" style="fill:none;stroke:#87bddc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 391.649749 73.352435 
-L 380.282752 75.971168 
-" style="fill:none;stroke:#6caed6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 380.282752 75.971168 
-L 369.057526 78.907439 
-" style="fill:none;stroke:#58a1cf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 369.057526 78.907439 
-L 357.995839 82.170406 
-" style="fill:none;stroke:#4695c8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 50.648276 
-L 414.72 50.648276 
-" style="fill:none;stroke:#9ac8e0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 50.648276 
-L 404.247942 54.862823 
-" style="fill:none;stroke:#9ac8e0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 404.247942 54.862823 
-L 393.878946 59.215059 
-" style="fill:none;stroke:#81badb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 393.878946 59.215059 
-L 383.614975 63.700155 
-" style="fill:none;stroke:#69add5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 383.614975 63.700155 
-L 373.452161 68.311932 
-" style="fill:none;stroke:#58a1cf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 373.452161 68.311932 
-L 363.388666 73.041547 
-" style="fill:none;stroke:#4997c9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 390.091034 41.472 
-L 390.091034 41.472 
-" style="fill:none;stroke:#5aa2cf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 390.091034 41.472 
-L 382.22231 48.125547 
-" style="fill:none;stroke:#5aa2cf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 382.22231 48.125547 
-L 374.211166 54.68317 
-" style="fill:none;stroke:#4e9acb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 374.211166 54.68317 
-L 366.05341 61.136867 
-" style="fill:none;stroke:#4292c6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 366.05341 61.136867 
-L 357.743178 67.479015 
-" style="fill:none;stroke:#3a8ac2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 353.147586 41.472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #ccdff1; stroke-width: 1.5"/>
+    <path d="M 402.405517 41.472 
+L 402.405517 41.472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #74b3d8; stroke-width: 1.5"/>
+    <path d="M 402.405517 41.472 
+L 393.535291 47.386322 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #74b3d8; stroke-width: 1.5"/>
+    <path d="M 393.535291 47.386322 
+L 384.641534 53.279013 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #63a8d3; stroke-width: 1.5"/>
+    <path d="M 384.641534 53.279013 
+L 375.71763 59.144897 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #549fcd; stroke-width: 1.5"/>
+    <path d="M 375.71763 59.144897 
+L 366.755364 64.97764 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4896c8; stroke-width: 1.5"/>
+    <path d="M 366.755364 64.97764 
+L 357.744424 70.769414 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3d8dc4; stroke-width: 1.5"/>
+    <path d="M 357.744424 70.769414 
+L 348.673377 76.50989 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3484bf; stroke-width: 1.5"/>
+    <path d="M 348.673377 76.50989 
+L 339.530872 82.18458 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2c7cba; stroke-width: 1.5"/>
+    <path d="M 339.530872 82.18458 
+L 330.301897 87.774146 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2474b7; stroke-width: 1.5"/>
+    <path d="M 330.301897 87.774146 
+L 320.965996 93.252334 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1e6db2; stroke-width: 1.5"/>
+    <path d="M 320.965996 93.252334 
+L 311.499001 98.583647 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1967ad; stroke-width: 1.5"/>
+    <path d="M 311.499001 98.583647 
+L 301.868565 103.720956 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1562a9; stroke-width: 1.5"/>
+    <path d="M 301.868565 103.720956 
+L 292.012424 108.599908 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #125da6; stroke-width: 1.5"/>
+    <path d="M 292.012424 108.599908 
+L 281.967821 113.023594 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0e59a2; stroke-width: 1.5"/>
+    <path d="M 281.967821 113.023594 
+L 281.967821 113.023594 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0c56a0; stroke-width: 1.5"/>
+    <path d="M 281.967821 113.023594 
+L 277.410332 115.141218 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0c56a0; stroke-width: 1.5"/>
+    <path d="M 277.410332 115.141218 
+L 277.410332 115.141218 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0b559f; stroke-width: 1.5"/>
+    <path d="M 277.410332 115.141218 
+L 272.968211 116.939837 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0b559f; stroke-width: 1.5"/>
+    <path d="M 272.968211 116.939837 
+L 272.968211 116.939837 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a549e; stroke-width: 1.5"/>
+    <path d="M 272.968211 116.939837 
+L 270.565991 117.987309 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a549e; stroke-width: 1.5"/>
+    <path d="M 270.565991 117.987309 
+L 268.152806 118.861103 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a549e; stroke-width: 1.5"/>
+    <path d="M 268.152806 118.861103 
+L 268.152806 118.861103 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a539e; stroke-width: 1.5"/>
+    <path d="M 268.152806 118.861103 
+L 266.673422 119.386587 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a539e; stroke-width: 1.5"/>
+    <path d="M 266.673422 119.386587 
+L 266.673422 119.386587 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a539e; stroke-width: 1.5"/>
+    <path d="M 266.673422 119.386587 
+L 265.848 119.815315 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a539e; stroke-width: 1.5"/>
+    <path d="M 265.848 119.815315 
+L 265.353132 120.105689 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a539e; stroke-width: 1.5"/>
+    <path d="M 265.353132 120.105689 
+L 264.823605 120.331633 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a539e; stroke-width: 1.5"/>
+    <path d="M 264.823605 120.331633 
+L 264.215813 120.469978 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a539e; stroke-width: 1.5"/>
+    <path d="M 264.215813 120.469978 
+L 264.215813 120.469978 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a539e; stroke-width: 1.5"/>
+    <path d="M 264.215813 120.469978 
+L 263.782324 120.503522 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a539e; stroke-width: 1.5"/>
+    <path d="M 263.782324 120.503522 
+L 263.782324 120.503522 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a539e; stroke-width: 1.5"/>
+    <path d="M 263.782324 120.503522 
+L 263.575788 120.587587 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a539e; stroke-width: 1.5"/>
+    <path d="M 263.575788 120.587587 
+L 263.416671 120.650421 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a539e; stroke-width: 1.5"/>
+    <path d="M 263.416671 120.650421 
+L 263.287689 120.689945 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a539e; stroke-width: 1.5"/>
+    <path d="M 263.287689 120.689945 
+L 263.184896 120.713422 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a539e; stroke-width: 1.5"/>
+    <path d="M 263.184896 120.713422 
+L 263.110172 120.734194 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a539e; stroke-width: 1.5"/>
+    <path d="M 263.110172 120.734194 
+L 263.061164 120.7596 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 263.061164 120.7596 
+L 263.027964 120.784577 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 263.027964 120.784577 
+L 263.000072 120.800302 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 263.000072 120.800302 
+L 262.972993 120.804122 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.972993 120.804122 
+L 262.949044 120.802033 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.949044 120.802033 
+L 262.933249 120.803706 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.933249 120.803706 
+L 262.926586 120.812696 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.926586 120.812696 
+L 262.924075 120.823319 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.924075 120.823319 
+L 262.919926 120.828143 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.919926 120.828143 
+L 262.9124 120.825338 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.9124 120.825338 
+L 262.904479 120.8199 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.904479 120.8199 
+L 262.90056 120.818863 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.90056 120.818863 
+L 262.901531 120.823965 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.901531 120.823965 
+L 262.903894 120.830279 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.903894 120.830279 
+L 262.903737 120.832162 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.903737 120.832162 
+L 262.900308 120.828634 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.900308 120.828634 
+L 262.896319 120.823873 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896319 120.823873 
+L 262.895126 120.823009 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.895126 120.823009 
+L 262.897166 120.826771 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.897166 120.826771 
+L 262.899709 120.83112 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.899709 120.83112 
+L 262.899958 120.8319 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.899958 120.8319 
+L 262.897656 120.828752 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.897656 120.828752 
+L 262.895086 120.825127 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.895086 120.825127 
+L 262.894708 120.824736 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.894708 120.824736 
+L 262.896606 120.827721 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896606 120.827721 
+L 262.898611 120.830835 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.898611 120.830835 
+L 262.898713 120.831065 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.898713 120.831065 
+L 262.896933 120.828451 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896933 120.828451 
+L 262.895138 120.8258 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.895138 120.8258 
+L 262.895093 120.825766 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.895093 120.825766 
+L 262.896668 120.828157 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896668 120.828157 
+L 262.898142 120.830391 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.898142 120.830391 
+L 262.898081 120.830313 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.898081 120.830313 
+L 262.896667 120.8282 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896667 120.8282 
+L 262.895395 120.826299 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.895395 120.826299 
+L 262.895514 120.826484 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.895514 120.826484 
+L 262.896777 120.828386 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896777 120.828386 
+L 262.897831 120.829974 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.897831 120.829974 
+L 262.897666 120.829728 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.897666 120.829728 
+L 262.896545 120.828047 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896545 120.828047 
+L 262.895651 120.826705 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.895651 120.826705 
+L 262.89585 120.827006 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.89585 120.827006 
+L 262.896847 120.828504 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896847 120.828504 
+L 262.897587 120.829617 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.897587 120.829617 
+L 262.89737 120.829291 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.89737 120.829291 
+L 262.89649 120.827969 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.89649 120.827969 
+L 262.89587 120.827038 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.89587 120.827038 
+L 262.896101 120.827386 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896101 120.827386 
+L 262.896879 120.828555 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896879 120.828555 
+L 262.897389 120.829321 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.897389 120.829321 
+L 262.897156 120.82897 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.897156 120.82897 
+L 262.896471 120.827942 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896471 120.827942 
+L 262.896049 120.827308 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896049 120.827308 
+L 262.896284 120.827661 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896284 120.827661 
+L 262.896885 120.828564 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896885 120.828564 
+L 262.897229 120.82908 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.897229 120.82908 
+L 262.897001 120.828738 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.897001 120.828738 
+L 262.896475 120.827947 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896475 120.827947 
+L 262.896194 120.827526 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896194 120.827526 
+L 262.896415 120.827858 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896415 120.827858 
+L 262.896875 120.828549 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896875 120.828549 
+L 262.897101 120.828888 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.897101 120.828888 
+L 262.896891 120.828573 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896891 120.828573 
+L 262.89649 120.82797 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.89649 120.82797 
+L 262.896309 120.827699 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896309 120.827699 
+L 262.896508 120.827998 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896508 120.827998 
+L 262.896857 120.828522 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896857 120.828522 
+L 262.896999 120.828735 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896999 120.828735 
+L 262.896813 120.828456 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896813 120.828456 
+L 262.896511 120.828002 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896511 120.828002 
+L 262.8964 120.827835 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.8964 120.827835 
+L 262.896573 120.828095 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896573 120.828095 
+L 262.896835 120.828488 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896835 120.828488 
+L 262.89692 120.828616 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.89692 120.828616 
+L 262.89676 120.828376 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.89676 120.828376 
+L 262.896534 120.828036 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896534 120.828036 
+L 262.89647 120.82794 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.89647 120.82794 
+L 262.896617 120.828161 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896617 120.828161 
+L 262.896812 120.828454 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896812 120.828454 
+L 262.896858 120.828523 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896858 120.828523 
+L 262.896724 120.828322 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896724 120.828322 
+L 262.896557 120.828071 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896557 120.828071 
+L 262.896524 120.828022 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896524 120.828022 
+L 262.896646 120.828205 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896646 120.828205 
+L 262.89679 120.828421 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.89679 120.828421 
+L 262.896811 120.828453 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896811 120.828453 
+L 262.8967 120.828286 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.8967 120.828286 
+L 262.896578 120.828102 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896578 120.828102 
+L 262.896565 120.828084 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896565 120.828084 
+L 262.896665 120.828234 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896665 120.828234 
+L 262.89677 120.828391 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.89677 120.828391 
+L 262.896775 120.828399 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896775 120.828399 
+L 262.896685 120.828263 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896685 120.828263 
+L 262.896596 120.82813 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896596 120.82813 
+L 262.896596 120.82813 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896596 120.82813 
+L 262.896677 120.828252 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896677 120.828252 
+L 262.896752 120.828364 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896752 120.828364 
+L 262.896748 120.828358 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896748 120.828358 
+L 262.896676 120.82825 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896676 120.82825 
+L 262.896613 120.828155 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896613 120.828155 
+L 262.89662 120.828166 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.89662 120.828166 
+L 262.896684 120.828262 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896684 120.828262 
+L 262.896737 120.828342 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896737 120.828342 
+L 262.896728 120.828328 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896728 120.828328 
+L 262.896671 120.828242 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896671 120.828242 
+L 262.896626 120.828175 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896626 120.828175 
+L 262.896637 120.828191 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896637 120.828191 
+L 262.896688 120.828268 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896688 120.828268 
+L 262.896725 120.828324 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896725 120.828324 
+L 262.896713 120.828306 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896713 120.828306 
+L 262.896668 120.828238 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896668 120.828238 
+L 262.896637 120.828192 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896637 120.828192 
+L 262.89665 120.828211 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.89665 120.828211 
+L 262.896689 120.82827 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896689 120.82827 
+L 262.896715 120.828308 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896715 120.828308 
+L 262.896702 120.828289 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896702 120.828289 
+L 262.896667 120.828237 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896667 120.828237 
+L 262.896647 120.828206 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896647 120.828206 
+L 262.896659 120.828224 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896659 120.828224 
+L 262.896689 120.82827 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896689 120.82827 
+L 262.896707 120.828296 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896707 120.828296 
+L 262.896695 120.828278 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896695 120.828278 
+L 262.896668 120.828238 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896668 120.828238 
+L 262.896654 120.828217 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896654 120.828217 
+L 262.896665 120.828234 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896665 120.828234 
+L 262.896689 120.828269 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896689 120.828269 
+L 262.8967 120.828286 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.8967 120.828286 
+L 262.896689 120.828269 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896689 120.828269 
+L 262.896669 120.828239 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896669 120.828239 
+L 262.89666 120.828226 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.89666 120.828226 
+L 262.89667 120.828241 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.89667 120.828241 
+L 262.896688 120.828268 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896688 120.828268 
+L 262.896695 120.828278 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896695 120.828278 
+L 262.896685 120.828264 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896685 120.828264 
+L 262.89667 120.828241 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.89667 120.828241 
+L 262.896664 120.828233 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896664 120.828233 
+L 262.896673 120.828246 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896673 120.828246 
+L 262.896687 120.828266 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896687 120.828266 
+L 262.896691 120.828272 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896691 120.828272 
+L 262.896682 120.82826 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896682 120.82826 
+L 262.896671 120.828243 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896671 120.828243 
+L 262.896668 120.828238 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896668 120.828238 
+L 262.896676 120.828249 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896676 120.828249 
+L 262.896685 120.828264 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896685 120.828264 
+L 262.896688 120.828267 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896688 120.828267 
+L 262.896681 120.828257 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896681 120.828257 
+L 262.896672 120.828244 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896672 120.828244 
+L 262.896671 120.828242 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896671 120.828242 
+L 262.896677 120.828251 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896677 120.828251 
+L 262.896684 120.828262 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896684 120.828262 
+L 262.896685 120.828264 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896685 120.828264 
+L 262.896679 120.828255 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896679 120.828255 
+L 262.896673 120.828246 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896673 120.828246 
+L 262.896673 120.828245 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896673 120.828245 
+L 262.896678 120.828253 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896678 120.828253 
+L 262.896683 120.828261 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896683 120.828261 
+L 262.896683 120.828261 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896683 120.828261 
+L 262.896679 120.828254 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896679 120.828254 
+L 262.896674 120.828247 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896674 120.828247 
+L 262.896674 120.828248 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896674 120.828248 
+L 262.896679 120.828254 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896679 120.828254 
+L 262.896682 120.828259 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 262.896682 120.828259 
+L 262.896682 120.828259 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 353.147586 41.472 
 L 353.147586 41.472 
-" style="fill:none;stroke:#2272b6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 353.147586 41.472 
-L 349.344128 49.873568 
-" style="fill:none;stroke:#2272b6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 349.344128 49.873568 
-L 344.970009 58.116496 
-" style="fill:none;stroke:#2171b5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 344.970009 58.116496 
-L 339.965488 66.153804 
-" style="fill:none;stroke:#2070b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 339.965488 66.153804 
-L 334.275512 73.931382 
-" style="fill:none;stroke:#1f6eb3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 334.275512 73.931382 
-L 327.855648 81.385301 
-" style="fill:none;stroke:#1c6bb0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 327.855648 81.385301 
-L 320.689104 88.43974 
-" style="fill:none;stroke:#1a68ae;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 320.689104 88.43974 
-L 312.772414 95.025594 
-" style="fill:none;stroke:#1865ac;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 312.772414 95.025594 
-L 304.169698 101.063008 
-" style="fill:none;stroke:#1561a9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 328.518621 41.472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2272b6; stroke-width: 1.5"/>
+    <path d="M 353.147586 41.472 
+L 349.344131 49.873563 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2272b6; stroke-width: 1.5"/>
+    <path d="M 349.344131 49.873563 
+L 344.970185 58.11759 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2171b5; stroke-width: 1.5"/>
+    <path d="M 344.970185 58.11759 
+L 339.965364 66.157587 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2070b4; stroke-width: 1.5"/>
+    <path d="M 339.965364 66.157587 
+L 334.274178 73.937103 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1f6eb3; stroke-width: 1.5"/>
+    <path d="M 334.274178 73.937103 
+L 327.852232 81.392401 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1c6bb0; stroke-width: 1.5"/>
+    <path d="M 327.852232 81.392401 
+L 320.683833 88.446921 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1a68ae; stroke-width: 1.5"/>
+    <path d="M 328.518621 41.472 
 L 328.518621 41.472 
-" style="fill:none;stroke:#0f5aa3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 328.518621 41.472 
-L 327.50809 50.307662 
-" style="fill:none;stroke:#0f5aa3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 327.50809 50.307662 
-L 325.935774 59.094731 
-" style="fill:none;stroke:#115ca5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 325.935774 59.094731 
-L 323.647314 67.790855 
-" style="fill:none;stroke:#125ea6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 323.647314 67.790855 
-L 320.449764 76.322142 
-" style="fill:none;stroke:#135fa7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 303.889655 41.472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0f5aa3; stroke-width: 1.5"/>
+    <path d="M 328.518621 41.472 
+L 327.508434 50.307937 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0f5aa3; stroke-width: 1.5"/>
+    <path d="M 327.508434 50.307937 
+L 325.937089 59.096226 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #115ca5; stroke-width: 1.5"/>
+    <path d="M 325.937089 59.096226 
+L 323.648897 67.793459 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #125ea6; stroke-width: 1.5"/>
+    <path d="M 323.648897 67.793459 
+L 320.45078 76.325282 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1460a8; stroke-width: 1.5"/>
+    <path d="M 303.889655 41.472 
 L 303.889655 41.472 
-" style="fill:none;stroke:#08478d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 303.889655 41.472 
-L 304.97547 50.304416 
-" style="fill:none;stroke:#08478d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 304.97547 50.304416 
-L 305.75139 59.154194 
-" style="fill:none;stroke:#084b93;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 305.75139 59.154194 
-L 306.070933 68.018301 
-" style="fill:none;stroke:#084f99;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 306.070933 68.018301 
-L 305.703527 76.877182 
-" style="fill:none;stroke:#09529d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 305.703527 76.877182 
-L 304.280835 85.662082 
-" style="fill:none;stroke:#0b559f;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 304.280835 85.662082 
-L 304.280835 85.662082 
-" style="fill:none;stroke:#0e58a2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 291.575172 41.472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08478d; stroke-width: 1.5"/>
+    <path d="M 303.889655 41.472 
+L 304.976793 50.304726 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08478d; stroke-width: 1.5"/>
+    <path d="M 304.976793 50.304726 
+L 305.753686 59.154845 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084b93; stroke-width: 1.5"/>
+    <path d="M 305.753686 59.154845 
+L 306.073295 68.019077 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084f99; stroke-width: 1.5"/>
+    <path d="M 306.073295 68.019077 
+L 305.705892 76.878239 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 305.705892 76.878239 
+L 304.284773 85.667022 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0b559f; stroke-width: 1.5"/>
+    <path d="M 304.284773 85.667022 
+L 304.284773 85.667022 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0e58a2; stroke-width: 1.5"/>
+    <path d="M 304.284773 85.667022 
+L 302.02149 92.683873 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0e58a2; stroke-width: 1.5"/>
+    <path d="M 302.02149 92.683873 
+L 302.02149 92.683873 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0e59a2; stroke-width: 1.5"/>
+    <path d="M 302.02149 92.683873 
+L 299.062802 98.352639 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0e59a2; stroke-width: 1.5"/>
+    <path d="M 291.575172 41.472 
 L 291.575172 41.472 
-" style="fill:none;stroke:#083e81;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 291.575172 41.472 
-L 293.391072 50.238212 
-" style="fill:none;stroke:#083e81;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 293.391072 50.238212 
-L 295.033101 59.023104 
-" style="fill:none;stroke:#084488;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 295.033101 59.023104 
-L 296.391461 67.833909 
-" style="fill:none;stroke:#08488e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 296.391461 67.833909 
-L 297.283557 76.67503 
-" style="fill:none;stroke:#084c95;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 297.283557 76.67503 
-L 297.387557 85.532566 
-" style="fill:none;stroke:#08509b;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 297.387557 85.532566 
-L 296.09712 94.308305 
-" style="fill:none;stroke:#0a549e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 296.09712 94.308305 
-L 296.09712 94.308305 
-" style="fill:none;stroke:#0c56a0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 296.09712 94.308305 
-L 294.219626 99.838466 
-" style="fill:none;stroke:#0c56a0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 294.219626 99.838466 
-L 294.219626 99.838466 
-" style="fill:none;stroke:#0d57a1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 266.946207 41.472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083e81; stroke-width: 1.5"/>
+    <path d="M 291.575172 41.472 
+L 293.391904 50.238272 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083e81; stroke-width: 1.5"/>
+    <path d="M 293.391904 50.238272 
+L 295.034794 59.023271 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084488; stroke-width: 1.5"/>
+    <path d="M 295.034794 59.023271 
+L 296.39431 67.834418 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08488e; stroke-width: 1.5"/>
+    <path d="M 296.39431 67.834418 
+L 297.288369 76.676573 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084c95; stroke-width: 1.5"/>
+    <path d="M 297.288369 76.676573 
+L 297.394769 85.536813 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08509b; stroke-width: 1.5"/>
+    <path d="M 297.394769 85.536813 
+L 296.104176 94.318665 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a549e; stroke-width: 1.5"/>
+    <path d="M 296.104176 94.318665 
+L 296.104176 94.318665 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0c56a0; stroke-width: 1.5"/>
+    <path d="M 296.104176 94.318665 
+L 294.223494 99.851496 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0c56a0; stroke-width: 1.5"/>
+    <path d="M 294.223494 99.851496 
+L 294.223494 99.851496 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0d57a1; stroke-width: 1.5"/>
+    <path d="M 266.946207 41.472 
 L 266.946207 41.472 
-" style="fill:none;stroke:#083471;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 266.946207 41.472 
-L 269.655581 50.109539 
-" style="fill:none;stroke:#083471;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 269.655581 50.109539 
-L 272.400054 58.740874 
-" style="fill:none;stroke:#083877;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 272.400054 58.740874 
-L 275.143279 67.372341 
-" style="fill:none;stroke:#083c7d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 275.143279 67.372341 
-L 277.819543 76.015377 
-" style="fill:none;stroke:#084285;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 277.819543 76.015377 
-L 280.298216 84.690213 
-" style="fill:none;stroke:#08468b;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 280.298216 84.690213 
-L 282.293955 93.428836 
-" style="fill:none;stroke:#084b93;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 282.293955 93.428836 
-L 283.034948 102.243298 
-" style="fill:none;stroke:#084f99;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 283.034948 102.243298 
-L 283.034948 102.243298 
-" style="fill:none;stroke:#09529d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 283.034948 102.243298 
-L 282.613846 106.492839 
-" style="fill:none;stroke:#09529d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 282.613846 106.492839 
-L 282.613846 106.492839 
-" style="fill:none;stroke:#0a549e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 282.613846 106.492839 
-L 281.424696 109.88282 
-" style="fill:none;stroke:#0a549e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 281.424696 109.88282 
-L 281.424696 109.88282 
-" style="fill:none;stroke:#0b559f;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 254.631724 41.472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083471; stroke-width: 1.5"/>
+    <path d="M 266.946207 41.472 
+L 269.655976 50.109487 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083471; stroke-width: 1.5"/>
+    <path d="M 269.655976 50.109487 
+L 272.401625 58.740683 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083877; stroke-width: 1.5"/>
+    <path d="M 272.401625 58.740683 
+L 275.146365 67.372023 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083c7d; stroke-width: 1.5"/>
+    <path d="M 275.146365 67.372023 
+L 277.823331 76.015045 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084285; stroke-width: 1.5"/>
+    <path d="M 277.823331 76.015045 
+L 280.302948 84.69003 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08468b; stroke-width: 1.5"/>
+    <path d="M 280.302948 84.69003 
+L 282.302008 93.429815 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084b93; stroke-width: 1.5"/>
+    <path d="M 282.302008 93.429815 
+L 283.045723 102.249201 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084f99; stroke-width: 1.5"/>
+    <path d="M 283.045723 102.249201 
+L 283.045723 102.249201 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 283.045723 102.249201 
+L 282.628368 106.492181 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 282.628368 106.492181 
+L 282.628368 106.492181 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a549e; stroke-width: 1.5"/>
+    <path d="M 282.628368 106.492181 
+L 281.441963 109.880959 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a549e; stroke-width: 1.5"/>
+    <path d="M 281.441963 109.880959 
+L 281.441963 109.880959 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0b559f; stroke-width: 1.5"/>
+    <path d="M 254.631724 41.472 
 L 254.631724 41.472 
-" style="fill:none;stroke:#08316d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 254.631724 41.472 
-L 257.544743 50.072591 
-" style="fill:none;stroke:#08316d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 257.544743 50.072591 
-L 260.561185 58.653353 
-" style="fill:none;stroke:#083573;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 260.561185 58.653353 
-L 263.669979 67.215803 
-" style="fill:none;stroke:#083979;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 263.669979 67.215803 
-L 266.845457 75.764713 
-" style="fill:none;stroke:#083d7f;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 266.845457 75.764713 
-L 270.030289 84.311665 
-" style="fill:none;stroke:#084285;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 270.030289 84.311665 
-L 273.093689 92.882462 
-" style="fill:none;stroke:#08478d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 242.317241 41.472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08316d; stroke-width: 1.5"/>
+    <path d="M 254.631724 41.472 
+L 257.545806 50.072402 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08316d; stroke-width: 1.5"/>
+    <path d="M 257.545806 50.072402 
+L 260.56341 58.652958 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083573; stroke-width: 1.5"/>
+    <path d="M 260.56341 58.652958 
+L 263.673048 67.215267 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083979; stroke-width: 1.5"/>
+    <path d="M 263.673048 67.215267 
+L 266.848401 75.764199 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083d7f; stroke-width: 1.5"/>
+    <path d="M 266.848401 75.764199 
+L 270.033081 84.311184 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084285; stroke-width: 1.5"/>
+    <path d="M 270.033081 84.311184 
+L 273.098303 92.881954 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08478d; stroke-width: 1.5"/>
+    <path d="M 242.317241 41.472 
 L 242.317241 41.472 
-" style="fill:none;stroke:#08306b;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 242.317241 41.472 
-L 245.296614 50.059893 
-" style="fill:none;stroke:#08306b;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 245.296614 50.059893 
-L 248.423212 58.618645 
-" style="fill:none;stroke:#083370;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 248.423212 58.618645 
-L 251.702693 67.145542 
-" style="fill:none;stroke:#083776;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 251.702693 67.145542 
-L 255.136705 75.638582 
-" style="fill:none;stroke:#083b7c;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 255.136705 75.638582 
-L 258.716891 84.098054 
-" style="fill:none;stroke:#083e81;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 230.002759 41.472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08306b; stroke-width: 1.5"/>
+    <path d="M 242.317241 41.472 
+L 245.296844 50.059851 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08306b; stroke-width: 1.5"/>
+    <path d="M 245.296844 50.059851 
+L 248.423552 58.618579 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083370; stroke-width: 1.5"/>
+    <path d="M 248.423552 58.618579 
+L 251.703746 67.145323 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083776; stroke-width: 1.5"/>
+    <path d="M 251.703746 67.145323 
+L 255.139207 75.638044 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083b7c; stroke-width: 1.5"/>
+    <path d="M 255.139207 75.638044 
+L 258.721444 84.097067 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083e81; stroke-width: 1.5"/>
+    <path d="M 230.002759 41.472 
 L 230.002759 41.472 
-" style="fill:none;stroke:#08306b;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 230.002759 41.472 
-L 232.919317 50.071811 
-" style="fill:none;stroke:#08306b;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 232.919317 50.071811 
-L 236.003324 58.639065 
-" style="fill:none;stroke:#083370;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 236.003324 58.639065 
-L 239.271849 67.168182 
-" style="fill:none;stroke:#083674;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 239.271849 67.168182 
-L 242.743352 75.652574 
-" style="fill:none;stroke:#083979;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 242.743352 75.652574 
-L 246.437159 84.084598 
-" style="fill:none;stroke:#083d7f;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 246.437159 84.084598 
-L 250.371957 92.455786 
-" style="fill:none;stroke:#084184;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 250.371957 92.455786 
-L 254.560601 100.758205 
-" style="fill:none;stroke:#08458a;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 254.560601 100.758205 
-L 258.991305 108.990493 
-" style="fill:none;stroke:#084990;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 217.688276 41.472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08306b; stroke-width: 1.5"/>
+    <path d="M 230.002759 41.472 
+L 232.920224 50.071648 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08306b; stroke-width: 1.5"/>
+    <path d="M 232.920224 50.071648 
+L 236.005409 58.638672 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083370; stroke-width: 1.5"/>
+    <path d="M 236.005409 58.638672 
+L 239.275325 67.167498 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083674; stroke-width: 1.5"/>
+    <path d="M 239.275325 67.167498 
+L 242.748483 75.651515 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083979; stroke-width: 1.5"/>
+    <path d="M 242.748483 75.651515 
+L 246.444303 84.083047 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083d7f; stroke-width: 1.5"/>
+    <path d="M 246.444303 84.083047 
+L 250.381673 92.453564 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084184; stroke-width: 1.5"/>
+    <path d="M 250.381673 92.453564 
+L 254.573912 100.755001 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08458a; stroke-width: 1.5"/>
+    <path d="M 254.573912 100.755001 
+L 259.008827 108.986163 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084990; stroke-width: 1.5"/>
+    <path d="M 217.688276 41.472 
 L 217.688276 41.472 
-" style="fill:none;stroke:#08316d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 217.688276 41.472 
-L 220.42243 50.105021 
-" style="fill:none;stroke:#08316d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 220.42243 50.105021 
-L 223.321458 58.708072 
-" style="fill:none;stroke:#083471;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 223.321458 58.708072 
-L 226.405335 67.275275 
-" style="fill:none;stroke:#083776;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 226.405335 67.275275 
-L 229.698329 75.799029 
-" style="fill:none;stroke:#083a7a;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 229.698329 75.799029 
-L 233.231225 84.269122 
-" style="fill:none;stroke:#083d7f;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 233.231225 84.269122 
-L 237.043363 92.671481 
-" style="fill:none;stroke:#084184;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 237.043363 92.671481 
-L 241.19001 100.984965 
-" style="fill:none;stroke:#084488;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 241.19001 100.984965 
-L 245.764419 109.171806 
-" style="fill:none;stroke:#08488e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 245.764419 109.171806 
-L 251.018822 117.121874 
-" style="fill:none;stroke:#084b93;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 251.018822 117.121874 
-L 251.018822 117.121874 
-" style="fill:none;stroke:#084f99;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 251.018822 117.121874 
-L 252.55987 119.12012 
-" style="fill:none;stroke:#084f99;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 252.55987 119.12012 
-L 252.55987 119.12012 
-" style="fill:none;stroke:#08509b;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 205.373793 41.472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08316d; stroke-width: 1.5"/>
+    <path d="M 217.688276 41.472 
+L 220.423058 50.10493 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08316d; stroke-width: 1.5"/>
+    <path d="M 220.423058 50.10493 
+L 223.322379 58.707935 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083471; stroke-width: 1.5"/>
+    <path d="M 223.322379 58.707935 
+L 226.406963 67.275014 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083776; stroke-width: 1.5"/>
+    <path d="M 226.406963 67.275014 
+L 229.701464 75.798484 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083a7a; stroke-width: 1.5"/>
+    <path d="M 229.701464 75.798484 
+L 233.236431 84.268143 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083d7f; stroke-width: 1.5"/>
+    <path d="M 233.236431 84.268143 
+L 237.051256 92.669874 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084184; stroke-width: 1.5"/>
+    <path d="M 237.051256 92.669874 
+L 241.200486 100.982695 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084488; stroke-width: 1.5"/>
+    <path d="M 241.200486 100.982695 
+L 245.776055 109.169181 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08488e; stroke-width: 1.5"/>
+    <path d="M 245.776055 109.169181 
+L 251.038658 117.116072 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084b93; stroke-width: 1.5"/>
+    <path d="M 251.038658 117.116072 
+L 251.038658 117.116072 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084f99; stroke-width: 1.5"/>
+    <path d="M 251.038658 117.116072 
+L 252.576292 119.108545 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084f99; stroke-width: 1.5"/>
+    <path d="M 252.576292 119.108545 
+L 252.576292 119.108545 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08509b; stroke-width: 1.5"/>
+    <path d="M 252.576292 119.108545 
+L 254.13323 120.849736 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08509b; stroke-width: 1.5"/>
+    <path d="M 254.13323 120.849736 
+L 254.13323 120.849736 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08519c; stroke-width: 1.5"/>
+    <path d="M 254.13323 120.849736 
+L 255.66992 122.10926 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08519c; stroke-width: 1.5"/>
+    <path d="M 255.66992 122.10926 
+L 255.66992 122.10926 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08519c; stroke-width: 1.5"/>
+    <path d="M 255.66992 122.10926 
+L 256.796609 122.552495 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08519c; stroke-width: 1.5"/>
+    <path d="M 256.796609 122.552495 
+L 257.747777 122.613412 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 257.747777 122.613412 
+L 258.6852 122.4273 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 258.6852 122.4273 
+L 259.752609 121.835992 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 259.752609 121.835992 
+L 259.752609 121.835992 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 259.752609 121.835992 
+L 260.45772 121.597114 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 205.373793 41.472 
 L 205.373793 41.472 
-" style="fill:none;stroke:#083471;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 205.373793 41.472 
-L 207.808932 50.154634 
-" style="fill:none;stroke:#083471;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 207.808932 50.154634 
-L 210.378577 58.815637 
-" style="fill:none;stroke:#083776;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 210.378577 58.815637 
-L 213.099594 67.450907 
-" style="fill:none;stroke:#083979;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 213.099594 67.450907 
-L 215.990825 76.05536 
-" style="fill:none;stroke:#083c7d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 215.990825 76.05536 
-L 219.074174 84.622559 
-" style="fill:none;stroke:#084082;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 219.074174 84.622559 
-L 222.376893 93.144013 
-" style="fill:none;stroke:#084387;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 222.376893 93.144013 
-L 225.935461 101.607767 
-" style="fill:none;stroke:#08458a;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 225.935461 101.607767 
-L 229.803709 109.995184 
-" style="fill:none;stroke:#08488e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 229.803709 109.995184 
-L 234.089858 118.267618 
-" style="fill:none;stroke:#084b93;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 234.089858 118.267618 
-L 239.44748 126.130945 
-" style="fill:none;stroke:#084e98;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 239.44748 126.130945 
-L 239.44748 126.130945 
-" style="fill:none;stroke:#08519c;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 239.44748 126.130945 
-L 241.102628 127.371282 
-" style="fill:none;stroke:#08519c;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 241.102628 127.371282 
-L 241.102628 127.371282 
-" style="fill:none;stroke:#09529d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 241.102628 127.371282 
-L 242.18392 127.655913 
-" style="fill:none;stroke:#09529d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 242.18392 127.655913 
-L 243.27383 127.61114 
-" style="fill:none;stroke:#09529d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 243.27383 127.61114 
-L 244.778675 127.220274 
-" style="fill:none;stroke:#09529d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 244.778675 127.220274 
-L 246.443617 126.734418 
-" style="fill:none;stroke:#09529d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 246.443617 126.734418 
-L 248.18611 126.202211 
-" style="fill:none;stroke:#09529d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 193.05931 41.472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083471; stroke-width: 1.5"/>
+    <path d="M 205.373793 41.472 
+L 207.809385 50.154594 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083471; stroke-width: 1.5"/>
+    <path d="M 207.809385 50.154594 
+L 210.380233 58.815478 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083776; stroke-width: 1.5"/>
+    <path d="M 210.380233 58.815478 
+L 213.102065 67.450657 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083979; stroke-width: 1.5"/>
+    <path d="M 213.102065 67.450657 
+L 215.993841 76.055042 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083c7d; stroke-width: 1.5"/>
+    <path d="M 215.993841 76.055042 
+L 219.078543 84.622067 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084082; stroke-width: 1.5"/>
+    <path d="M 219.078543 84.622067 
+L 222.383969 93.14314 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084387; stroke-width: 1.5"/>
+    <path d="M 222.383969 93.14314 
+L 225.946336 101.606292 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08458a; stroke-width: 1.5"/>
+    <path d="M 225.946336 101.606292 
+L 229.820312 109.992702 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08488e; stroke-width: 1.5"/>
+    <path d="M 229.820312 109.992702 
+L 234.113597 118.263732 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084b93; stroke-width: 1.5"/>
+    <path d="M 234.113597 118.263732 
+L 239.503337 126.132019 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084e98; stroke-width: 1.5"/>
+    <path d="M 239.503337 126.132019 
+L 239.503337 126.132019 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08519c; stroke-width: 1.5"/>
+    <path d="M 239.503337 126.132019 
+L 241.17557 127.358127 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08519c; stroke-width: 1.5"/>
+    <path d="M 241.17557 127.358127 
+L 241.17557 127.358127 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 241.17557 127.358127 
+L 242.293681 127.627685 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 242.293681 127.627685 
+L 243.487969 127.534782 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 243.487969 127.534782 
+L 245.063692 127.108432 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 245.063692 127.108432 
+L 246.529865 126.728233 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 246.529865 126.728233 
+L 248.315725 126.170484 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5"/>
+    <path d="M 193.05931 41.472 
 L 193.05931 41.472 
-" style="fill:none;stroke:#083877;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 193.05931 41.472 
-L 195.08073 50.213432 
-" style="fill:none;stroke:#083877;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 195.08073 50.213432 
-L 197.178288 58.94487 
-" style="fill:none;stroke:#083b7c;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 197.178288 58.94487 
-L 199.35204 67.665881 
-" style="fill:none;stroke:#083e81;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 199.35204 67.665881 
-L 201.599484 76.376546 
-" style="fill:none;stroke:#084184;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 201.599484 76.376546 
-L 203.908408 85.078165 
-" style="fill:none;stroke:#084488;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 203.908408 85.078165 
-L 206.250805 93.774654 
-" style="fill:none;stroke:#08468b;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 206.250805 93.774654 
-L 208.564088 102.475344 
-" style="fill:none;stroke:#084990;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 208.564088 102.475344 
-L 210.686601 111.201527 
-" style="fill:none;stroke:#084c95;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 210.686601 111.201527 
-L 212.146255 119.995023 
-" style="fill:none;stroke:#084e98;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 212.146255 119.995023 
-L 212.146255 119.995023 
-" style="fill:none;stroke:#08519c;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 212.146255 119.995023 
-L 212.109894 125.518574 
-" style="fill:none;stroke:#08519c;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 212.109894 125.518574 
-L 212.109894 125.518574 
-" style="fill:none;stroke:#0a549e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 212.109894 125.518574 
-L 210.968874 129.399469 
-" style="fill:none;stroke:#0a549e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 210.968874 129.399469 
-L 210.968874 129.399469 
-" style="fill:none;stroke:#0b559f;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 210.968874 129.399469 
-L 208.693495 132.500807 
-" style="fill:none;stroke:#0b559f;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 208.693495 132.500807 
-L 205.337342 135.041194 
-" style="fill:none;stroke:#0d57a1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 205.337342 135.041194 
-L 201.105374 137.194187 
-" style="fill:none;stroke:#0e59a2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 201.105374 137.194187 
-L 195.172045 139.462815 
-" style="fill:none;stroke:#105ba4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 195.172045 139.462815 
-L 186.503891 142.137996 
-" style="fill:none;stroke:#125ea6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 186.503891 142.137996 
-L 175.299814 145.10401 
-" style="fill:none;stroke:#1663aa;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 175.299814 145.10401 
-L 163.969911 147.811354 
-" style="fill:none;stroke:#1c6ab0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 163.969911 147.811354 
-L 152.565467 150.346784 
-" style="fill:none;stroke:#2373b6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 152.565467 150.346784 
-L 141.10815 152.749878 
-" style="fill:none;stroke:#2d7dbb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 141.10815 152.749878 
-L 129.609365 155.042374 
-" style="fill:none;stroke:#3888c1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 129.609365 155.042374 
-L 118.076115 157.237832 
-" style="fill:none;stroke:#4594c7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 118.076115 157.237832 
-L 106.513628 159.346688 
-" style="fill:none;stroke:#56a0ce;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 106.513628 159.346688 
-L 94.926068 161.377723 
-" style="fill:none;stroke:#69add5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 94.926068 161.377723 
-L 83.316282 163.337128 
-" style="fill:none;stroke:#82bbdb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 83.316282 163.337128 
-L 71.686478 165.229644 
-" style="fill:none;stroke:#9dcae1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 71.686478 165.229644 
-L 60.038774 167.060116 
-" style="fill:none;stroke:#b4d3e9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 60.038774 167.060116 
-L 57.6 167.436927 
-" style="fill:none;stroke:#cadef0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 180.744828 41.472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083877; stroke-width: 1.5"/>
+    <path d="M 193.05931 41.472 
+L 195.081294 50.21342 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083877; stroke-width: 1.5"/>
+    <path d="M 195.081294 50.21342 
+L 197.179566 58.944846 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083b7c; stroke-width: 1.5"/>
+    <path d="M 197.179566 58.944846 
+L 199.354751 67.665832 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083e81; stroke-width: 1.5"/>
+    <path d="M 199.354751 67.665832 
+L 201.603394 76.376465 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084184; stroke-width: 1.5"/>
+    <path d="M 201.603394 76.376465 
+L 203.913823 85.078068 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084488; stroke-width: 1.5"/>
+    <path d="M 203.913823 85.078068 
+L 206.25882 93.77452 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08468b; stroke-width: 1.5"/>
+    <path d="M 206.25882 93.77452 
+L 208.574904 102.475182 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084990; stroke-width: 1.5"/>
+    <path d="M 208.574904 102.475182 
+L 210.702827 111.201612 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084c95; stroke-width: 1.5"/>
+    <path d="M 210.702827 111.201612 
+L 212.167749 119.994984 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084e98; stroke-width: 1.5"/>
+    <path d="M 212.167749 119.994984 
+L 212.167749 119.994984 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08519c; stroke-width: 1.5"/>
+    <path d="M 212.167749 119.994984 
+L 212.135246 125.516856 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08519c; stroke-width: 1.5"/>
+    <path d="M 212.135246 125.516856 
+L 212.135246 125.516856 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a549e; stroke-width: 1.5"/>
+    <path d="M 212.135246 125.516856 
+L 211.000461 129.402878 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a549e; stroke-width: 1.5"/>
+    <path d="M 211.000461 129.402878 
+L 211.000461 129.402878 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0b559f; stroke-width: 1.5"/>
+    <path d="M 211.000461 129.402878 
+L 208.737251 132.496273 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0b559f; stroke-width: 1.5"/>
+    <path d="M 208.737251 132.496273 
+L 205.394895 135.031126 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0d57a1; stroke-width: 1.5"/>
+    <path d="M 205.394895 135.031126 
+L 201.173179 137.181992 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0e59a2; stroke-width: 1.5"/>
+    <path d="M 201.173179 137.181992 
+L 195.246336 139.451282 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #105ba4; stroke-width: 1.5"/>
+    <path d="M 195.246336 139.451282 
+L 186.611093 142.118509 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #125ea6; stroke-width: 1.5"/>
+    <path d="M 186.611093 142.118509 
+L 175.407859 145.086675 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1663aa; stroke-width: 1.5"/>
+    <path d="M 175.407859 145.086675 
+L 164.078499 147.795439 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1c6ab0; stroke-width: 1.5"/>
+    <path d="M 164.078499 147.795439 
+L 152.674503 150.332064 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2272b6; stroke-width: 1.5"/>
+    <path d="M 152.674503 150.332064 
+L 141.217496 152.736005 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2d7dbb; stroke-width: 1.5"/>
+    <path d="M 141.217496 152.736005 
+L 129.718894 155.029014 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3888c1; stroke-width: 1.5"/>
+    <path d="M 129.718894 155.029014 
+L 118.185837 157.225047 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4594c7; stroke-width: 1.5"/>
+    <path d="M 118.185837 157.225047 
+L 106.62359 159.334638 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #56a0ce; stroke-width: 1.5"/>
+    <path d="M 106.62359 159.334638 
+L 95.036268 161.366422 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #69add5; stroke-width: 1.5"/>
+    <path d="M 95.036268 161.366422 
+L 83.426673 163.326455 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #82bbdb; stroke-width: 1.5"/>
+    <path d="M 83.426673 163.326455 
+L 71.797022 165.219498 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #9dcae1; stroke-width: 1.5"/>
+    <path d="M 71.797022 165.219498 
+L 60.149472 167.05052 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b4d3e9; stroke-width: 1.5"/>
+    <path d="M 60.149472 167.05052 
+L 57.6 167.444567 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #cadef0; stroke-width: 1.5"/>
+    <path d="M 180.744828 41.472 
 L 180.744828 41.472 
-" style="fill:none;stroke:#083e81;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 180.744828 41.472 
-L 182.239935 50.271987 
-" style="fill:none;stroke:#083e81;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 182.239935 50.271987 
-L 183.719863 59.073412 
-" style="fill:none;stroke:#084285;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 183.719863 59.073412 
-L 185.155851 67.878776 
-" style="fill:none;stroke:#08458a;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 185.155851 67.878776 
-L 186.500507 76.691866 
-" style="fill:none;stroke:#08478d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 186.500507 76.691866 
-L 187.675353 85.518181 
-" style="fill:none;stroke:#084a91;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 187.675353 85.518181 
-L 188.537953 94.363265 
-" style="fill:none;stroke:#084d96;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 188.537953 94.363265 
-L 188.820273 103.225517 
-" style="fill:none;stroke:#08509b;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 188.820273 103.225517 
-L 187.996023 112.056357 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 187.996023 112.056357 
-L 187.996023 112.056357 
-" style="fill:none;stroke:#0d57a1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 187.996023 112.056357 
-L 186.043485 118.654934 
-" style="fill:none;stroke:#0d57a1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 186.043485 118.654934 
-L 186.043485 118.654934 
-" style="fill:none;stroke:#0f5aa3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 186.043485 118.654934 
-L 183.013996 123.949932 
-" style="fill:none;stroke:#0f5aa3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 183.013996 123.949932 
-L 178.532429 128.693732 
-" style="fill:none;stroke:#125ea6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 178.532429 128.693732 
-L 173.187833 132.511994 
-" style="fill:none;stroke:#1562a9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 173.187833 132.511994 
-L 166.629679 135.965031 
-" style="fill:none;stroke:#1967ad;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 166.629679 135.965031 
-L 158.300019 139.365145 
-" style="fill:none;stroke:#1d6cb1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 158.300019 139.365145 
-L 147.46801 142.917056 
-" style="fill:none;stroke:#2373b6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 147.46801 142.917056 
-L 136.307392 145.992697 
-" style="fill:none;stroke:#2e7ebc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 136.307392 145.992697 
-L 124.99072 148.739848 
-" style="fill:none;stroke:#3a8ac2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 124.99072 148.739848 
-L 113.57568 151.253206 
-" style="fill:none;stroke:#4896c8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 113.57568 151.253206 
-L 102.092772 153.589617 
-" style="fill:none;stroke:#5aa2cf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 102.092772 153.589617 
-L 90.559719 155.785252 
-" style="fill:none;stroke:#6dafd7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 168.430345 41.472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083e81; stroke-width: 1.5"/>
+    <path d="M 180.744828 41.472 
+L 182.240618 50.272038 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083e81; stroke-width: 1.5"/>
+    <path d="M 182.240618 50.272038 
+L 183.721079 59.073495 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084285; stroke-width: 1.5"/>
+    <path d="M 183.721079 59.073495 
+L 185.157921 67.878952 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08458a; stroke-width: 1.5"/>
+    <path d="M 185.157921 67.878952 
+L 186.504363 76.692253 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08478d; stroke-width: 1.5"/>
+    <path d="M 186.504363 76.692253 
+L 187.680457 85.518686 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084a91; stroke-width: 1.5"/>
+    <path d="M 187.680457 85.518686 
+L 188.545046 94.364157 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084d96; stroke-width: 1.5"/>
+    <path d="M 188.545046 94.364157 
+L 188.83158 103.227507 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08509b; stroke-width: 1.5"/>
+    <path d="M 188.83158 103.227507 
+L 188.013163 112.06054 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a539e; stroke-width: 1.5"/>
+    <path d="M 188.013163 112.06054 
+L 188.013163 112.06054 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0d57a1; stroke-width: 1.5"/>
+    <path d="M 188.013163 112.06054 
+L 186.062564 118.663936 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0d57a1; stroke-width: 1.5"/>
+    <path d="M 186.062564 118.663936 
+L 186.062564 118.663936 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0f5aa3; stroke-width: 1.5"/>
+    <path d="M 186.062564 118.663936 
+L 183.036468 123.956755 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0f5aa3; stroke-width: 1.5"/>
+    <path d="M 183.036468 123.956755 
+L 178.564209 128.695885 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #125ea6; stroke-width: 1.5"/>
+    <path d="M 178.564209 128.695885 
+L 173.224423 132.514159 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1562a9; stroke-width: 1.5"/>
+    <path d="M 173.224423 132.514159 
+L 166.675665 135.964288 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1967ad; stroke-width: 1.5"/>
+    <path d="M 166.675665 135.964288 
+L 158.342984 139.366959 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1d6cb1; stroke-width: 1.5"/>
+    <path d="M 158.342984 139.366959 
+L 147.52605 142.914777 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2373b6; stroke-width: 1.5"/>
+    <path d="M 147.52605 142.914777 
+L 136.365887 145.991327 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2e7ebc; stroke-width: 1.5"/>
+    <path d="M 136.365887 145.991327 
+L 125.049547 148.739239 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3a8ac2; stroke-width: 1.5"/>
+    <path d="M 125.049547 148.739239 
+L 113.634764 151.253254 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4896c8; stroke-width: 1.5"/>
+    <path d="M 113.634764 151.253254 
+L 102.152061 153.590235 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5aa2cf; stroke-width: 1.5"/>
+    <path d="M 102.152061 153.590235 
+L 90.619143 155.786269 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #6dafd7; stroke-width: 1.5"/>
+    <path d="M 168.430345 41.472 
 L 168.430345 41.472 
-" style="fill:none;stroke:#08478d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 168.430345 41.472 
-L 169.290568 50.31898 
-" style="fill:none;stroke:#08478d;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 169.290568 50.31898 
-L 170.010083 59.172759 
-" style="fill:none;stroke:#084990;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 170.010083 59.172759 
-L 170.516993 68.034212 
-" style="fill:none;stroke:#084c95;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 170.516993 68.034212 
-L 170.700839 76.901736 
-" style="fill:none;stroke:#084f99;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 170.700839 76.901736 
-L 170.385808 85.765253 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 170.385808 85.765253 
-L 169.288449 94.590071 
-" style="fill:none;stroke:#0c56a0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 169.288449 94.590071 
-L 166.9626 103.270907 
-" style="fill:none;stroke:#0f5aa3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 166.9626 103.270907 
-L 166.9626 103.270907 
-" style="fill:none;stroke:#135fa7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 166.9626 103.270907 
-L 163.609592 110.312474 
-" style="fill:none;stroke:#135fa7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 163.609592 110.312474 
-L 158.624886 116.863563 
-" style="fill:none;stroke:#1764ab;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 158.624886 116.863563 
-L 152.777034 122.068688 
-" style="fill:none;stroke:#1c6ab0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 152.777034 122.068688 
-L 145.953976 126.5175 
-" style="fill:none;stroke:#2171b5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 145.953976 126.5175 
-L 137.75999 130.623381 
-" style="fill:none;stroke:#2979b9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 137.75999 130.623381 
-L 127.72604 134.60587 
-" style="fill:none;stroke:#3282be;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 127.72604 134.60587 
-L 116.823438 138.152453 
-" style="fill:none;stroke:#3e8ec4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 116.823438 138.152453 
-L 105.671126 141.246955 
-" style="fill:none;stroke:#4e9acb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 105.671126 141.246955 
-L 94.362232 144.011723 
-" style="fill:none;stroke:#61a7d2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 94.362232 144.011723 
-L 82.94803 146.526976 
-" style="fill:none;stroke:#79b5d9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 82.94803 146.526976 
-L 71.459021 148.846787 
-" style="fill:none;stroke:#94c4df;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 71.459021 148.846787 
-L 59.914716 151.009422 
-" style="fill:none;stroke:#aed1e7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 59.914716 151.009422 
-L 57.6 151.428178 
-" style="fill:none;stroke:#c6dbef;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 156.115862 41.472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08478d; stroke-width: 1.5"/>
+    <path d="M 168.430345 41.472 
+L 169.290889 50.319028 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #08478d; stroke-width: 1.5"/>
+    <path d="M 169.290889 50.319028 
+L 170.01071 59.172872 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084990; stroke-width: 1.5"/>
+    <path d="M 170.01071 59.172872 
+L 170.518769 68.034617 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084c95; stroke-width: 1.5"/>
+    <path d="M 170.518769 68.034617 
+L 170.704471 76.902686 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084f99; stroke-width: 1.5"/>
+    <path d="M 170.704471 76.902686 
+L 170.391948 85.767101 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a539e; stroke-width: 1.5"/>
+    <path d="M 170.391948 85.767101 
+L 169.296148 94.59242 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0c56a0; stroke-width: 1.5"/>
+    <path d="M 169.296148 94.59242 
+L 166.972088 103.274355 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0f5aa3; stroke-width: 1.5"/>
+    <path d="M 166.972088 103.274355 
+L 166.972088 103.274355 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #135fa7; stroke-width: 1.5"/>
+    <path d="M 166.972088 103.274355 
+L 163.621688 110.317344 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #135fa7; stroke-width: 1.5"/>
+    <path d="M 163.621688 110.317344 
+L 158.63959 116.869266 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1764ab; stroke-width: 1.5"/>
+    <path d="M 158.63959 116.869266 
+L 152.795573 122.072381 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1c6ab0; stroke-width: 1.5"/>
+    <path d="M 152.795573 122.072381 
+L 145.968843 126.525327 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2171b5; stroke-width: 1.5"/>
+    <path d="M 145.968843 126.525327 
+L 137.779684 130.629706 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2979b9; stroke-width: 1.5"/>
+    <path d="M 137.779684 130.629706 
+L 127.749483 134.61141 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3282be; stroke-width: 1.5"/>
+    <path d="M 127.749483 134.61141 
+L 116.847153 138.158648 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3e8ec4; stroke-width: 1.5"/>
+    <path d="M 116.847153 138.158648 
+L 105.694984 141.253556 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4e9acb; stroke-width: 1.5"/>
+    <path d="M 105.694984 141.253556 
+L 94.386145 144.01849 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #61a7d2; stroke-width: 1.5"/>
+    <path d="M 94.386145 144.01849 
+L 82.971943 146.533748 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #79b5d9; stroke-width: 1.5"/>
+    <path d="M 82.971943 146.533748 
+L 71.482926 148.853545 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #94c4df; stroke-width: 1.5"/>
+    <path d="M 71.482926 148.853545 
+L 59.938638 151.016254 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #add0e6; stroke-width: 1.5"/>
+    <path d="M 59.938638 151.016254 
+L 57.6 151.439363 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c6dbef; stroke-width: 1.5"/>
+    <path d="M 156.115862 41.472 
 L 156.115862 41.472 
-" style="fill:none;stroke:#084f99;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 156.115862 41.472 
-L 156.238414 50.341103 
-" style="fill:none;stroke:#084f99;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 156.238414 50.341103 
-L 156.064736 59.209148 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 156.064736 59.209148 
-L 155.472612 68.066235 
-" style="fill:none;stroke:#0c56a0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 155.472612 68.066235 
-L 154.282535 76.888008 
-" style="fill:none;stroke:#0f5aa3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 154.282535 76.888008 
-L 152.233579 85.616888 
-" style="fill:none;stroke:#125ea6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 152.233579 85.616888 
-L 148.978534 94.131076 
-" style="fill:none;stroke:#1663aa;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 148.978534 94.131076 
-L 144.145207 102.205064 
-" style="fill:none;stroke:#1b69af;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 144.145207 102.205064 
-L 138.170367 108.939205 
-" style="fill:none;stroke:#2171b5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 138.170367 108.939205 
-L 131.353885 114.484146 
-" style="fill:none;stroke:#2a7ab9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 131.353885 114.484146 
-L 123.463567 119.359337 
-" style="fill:none;stroke:#3383be;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 123.463567 119.359337 
-L 114.157055 123.869884 
-" style="fill:none;stroke:#3d8dc4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 114.157055 123.869884 
-L 103.625664 127.985609 
-" style="fill:none;stroke:#4b98ca;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 103.625664 127.985609 
-L 92.723497 131.535577 
-" style="fill:none;stroke:#5da5d1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 92.723497 131.535577 
-L 81.585192 134.657767 
-" style="fill:none;stroke:#74b3d8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 81.585192 134.657767 
-L 70.289514 137.452038 
-" style="fill:none;stroke:#8fc2de;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 70.289514 137.452038 
-L 58.884526 139.989928 
-" style="fill:none;stroke:#aacfe5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 58.884526 139.989928 
-L 57.6 140.262106 
-" style="fill:none;stroke:#c3daee;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 143.801379 41.472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084f99; stroke-width: 1.5"/>
+    <path d="M 156.115862 41.472 
+L 156.239497 50.341422 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084f99; stroke-width: 1.5"/>
+    <path d="M 156.239497 50.341422 
+L 156.067158 59.209914 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a539e; stroke-width: 1.5"/>
+    <path d="M 156.067158 59.209914 
+L 155.476132 68.067393 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0c56a0; stroke-width: 1.5"/>
+    <path d="M 155.476132 68.067393 
+L 154.286789 76.889458 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0f5aa3; stroke-width: 1.5"/>
+    <path d="M 154.286789 76.889458 
+L 152.239566 85.619445 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #125ea6; stroke-width: 1.5"/>
+    <path d="M 152.239566 85.619445 
+L 148.986115 94.134955 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1663aa; stroke-width: 1.5"/>
+    <path d="M 148.986115 94.134955 
+L 144.154067 102.210419 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1b69af; stroke-width: 1.5"/>
+    <path d="M 144.154067 102.210419 
+L 138.181716 108.943054 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2171b5; stroke-width: 1.5"/>
+    <path d="M 138.181716 108.943054 
+L 131.362129 114.491972 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2a7ab9; stroke-width: 1.5"/>
+    <path d="M 131.362129 114.491972 
+L 123.474088 119.366578 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3383be; stroke-width: 1.5"/>
+    <path d="M 123.474088 119.366578 
+L 114.16966 123.876387 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3d8dc4; stroke-width: 1.5"/>
+    <path d="M 114.16966 123.876387 
+L 103.638259 127.992321 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4b98ca; stroke-width: 1.5"/>
+    <path d="M 103.638259 127.992321 
+L 92.736063 131.542363 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5da5d1; stroke-width: 1.5"/>
+    <path d="M 92.736063 131.542363 
+L 81.597735 134.664612 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #74b3d8; stroke-width: 1.5"/>
+    <path d="M 81.597735 134.664612 
+L 70.302053 137.458972 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #8fc2de; stroke-width: 1.5"/>
+    <path d="M 70.302053 137.458972 
+L 58.897067 139.996941 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #aacfe5; stroke-width: 1.5"/>
+    <path d="M 58.897067 139.996941 
+L 57.6 140.271781 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c3daee; stroke-width: 1.5"/>
+    <path d="M 143.801379 41.472 
 L 143.801379 41.472 
-" style="fill:none;stroke:#0f5aa3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 143.801379 41.472 
-L 143.098793 50.325421 
-" style="fill:none;stroke:#0f5aa3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 143.098793 50.325421 
-L 141.925475 59.14973 
-" style="fill:none;stroke:#125ea6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 141.925475 59.14973 
-L 140.113726 67.912143 
-" style="fill:none;stroke:#1562a9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 140.113726 67.912143 
-L 137.438157 76.54703 
-" style="fill:none;stroke:#1967ad;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 137.438157 76.54703 
-L 133.627252 84.935382 
-" style="fill:none;stroke:#1e6db2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 133.627252 84.935382 
-L 128.421553 92.888091 
-" style="fill:none;stroke:#2474b7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 128.421553 92.888091 
-L 121.887796 99.995142 
-" style="fill:none;stroke:#2d7dbb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 121.887796 99.995142 
-L 114.470094 105.97943 
-" style="fill:none;stroke:#3787c0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 114.470094 105.97943 
-L 105.989093 111.256069 
-" style="fill:none;stroke:#4292c6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 105.989093 111.256069 
-L 96.125867 116.115821 
-" style="fill:none;stroke:#529dcc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 96.125867 116.115821 
-L 85.653863 120.317063 
-" style="fill:none;stroke:#65aad4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 85.653863 120.317063 
-L 74.813794 123.971374 
-" style="fill:none;stroke:#7db8da;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 74.813794 123.971374 
-L 63.728081 127.195953 
-" style="fill:none;stroke:#9ac8e0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 63.728081 127.195953 
-L 57.6 128.861126 
-" style="fill:none;stroke:#b3d3e8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 131.486897 41.472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0f5aa3; stroke-width: 1.5"/>
+    <path d="M 143.801379 41.472 
+L 143.099334 50.325669 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0f5aa3; stroke-width: 1.5"/>
+    <path d="M 143.099334 50.325669 
+L 141.927029 59.150518 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #125ea6; stroke-width: 1.5"/>
+    <path d="M 141.927029 59.150518 
+L 140.115987 67.913297 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1562a9; stroke-width: 1.5"/>
+    <path d="M 140.115987 67.913297 
+L 137.441259 76.548843 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1967ad; stroke-width: 1.5"/>
+    <path d="M 137.441259 76.548843 
+L 133.630957 84.937815 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1e6db2; stroke-width: 1.5"/>
+    <path d="M 133.630957 84.937815 
+L 128.42555 92.890976 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2474b7; stroke-width: 1.5"/>
+    <path d="M 128.42555 92.890976 
+L 121.89053 99.999838 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2d7dbb; stroke-width: 1.5"/>
+    <path d="M 121.89053 99.999838 
+L 114.47659 105.981571 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3787c0; stroke-width: 1.5"/>
+    <path d="M 114.47659 105.981571 
+L 105.997294 111.258152 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4292c6; stroke-width: 1.5"/>
+    <path d="M 105.997294 111.258152 
+L 96.13428 116.118626 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #529dcc; stroke-width: 1.5"/>
+    <path d="M 96.13428 116.118626 
+L 85.662367 120.320211 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #65aad4; stroke-width: 1.5"/>
+    <path d="M 85.662367 120.320211 
+L 74.82234 123.974713 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #7db8da; stroke-width: 1.5"/>
+    <path d="M 74.82234 123.974713 
+L 63.736652 127.199444 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #9ac8e0; stroke-width: 1.5"/>
+    <path d="M 63.736652 127.199444 
+L 57.6 128.867035 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b3d3e8; stroke-width: 1.5"/>
+    <path d="M 131.486897 41.472 
 L 131.486897 41.472 
-" style="fill:none;stroke:#1865ac;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 131.486897 41.472 
-L 129.890279 50.259449 
-" style="fill:none;stroke:#1865ac;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 129.890279 50.259449 
-L 127.649282 58.966433 
-" style="fill:none;stroke:#1c6ab0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 127.649282 58.966433 
-L 124.571467 67.526865 
-" style="fill:none;stroke:#2070b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 124.571467 67.526865 
-L 120.439106 75.832087 
-" style="fill:none;stroke:#2777b8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 120.439106 75.832087 
-L 115.055727 83.723544 
-" style="fill:none;stroke:#2f7fbc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 115.055727 83.723544 
-L 108.327946 91.014812 
-" style="fill:none;stroke:#3888c1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 108.327946 91.014812 
-L 100.517169 97.420598 
-" style="fill:none;stroke:#4493c7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 100.517169 97.420598 
-L 91.664356 103.073188 
-" style="fill:none;stroke:#549fcd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 91.664356 103.073188 
-L 81.857086 108.080152 
-" style="fill:none;stroke:#66abd4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 81.857086 108.080152 
-L 71.493117 112.428246 
-" style="fill:none;stroke:#7fb9da;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 71.493117 112.428246 
-L 60.746591 116.232782 
-" style="fill:none;stroke:#9ac8e0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 60.746591 116.232782 
-L 57.6 117.26215 
-" style="fill:none;stroke:#b4d3e9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 119.172414 41.472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1865ac; stroke-width: 1.5"/>
+    <path d="M 131.486897 41.472 
+L 129.89083 50.259756 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1865ac; stroke-width: 1.5"/>
+    <path d="M 129.89083 50.259756 
+L 127.650292 58.967116 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1c6ab0; stroke-width: 1.5"/>
+    <path d="M 127.650292 58.967116 
+L 124.573368 67.528364 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2070b4; stroke-width: 1.5"/>
+    <path d="M 124.573368 67.528364 
+L 120.441777 75.834568 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2777b8; stroke-width: 1.5"/>
+    <path d="M 120.441777 75.834568 
+L 115.058809 83.726761 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2f7fbc; stroke-width: 1.5"/>
+    <path d="M 115.058809 83.726761 
+L 108.331084 91.018487 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3888c1; stroke-width: 1.5"/>
+    <path d="M 108.331084 91.018487 
+L 100.519619 97.424567 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4493c7; stroke-width: 1.5"/>
+    <path d="M 100.519619 97.424567 
+L 91.66687 103.077331 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #549fcd; stroke-width: 1.5"/>
+    <path d="M 91.66687 103.077331 
+L 81.859466 108.084588 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #66abd4; stroke-width: 1.5"/>
+    <path d="M 81.859466 108.084588 
+L 71.495354 112.432668 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #7fb9da; stroke-width: 1.5"/>
+    <path d="M 71.495354 112.432668 
+L 60.748709 116.2371 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #9ac8e0; stroke-width: 1.5"/>
+    <path d="M 60.748709 116.2371 
+L 57.6 117.267121 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b4d3e9; stroke-width: 1.5"/>
+    <path d="M 119.172414 41.472 
 L 119.172414 41.472 
-" style="fill:none;stroke:#2272b6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 119.172414 41.472 
-L 116.640425 50.13495 
-" style="fill:none;stroke:#2272b6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 116.640425 50.13495 
-L 113.311685 58.643939 
-" style="fill:none;stroke:#2a7ab9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 113.311685 58.643939 
-L 109.00608 66.902015 
-" style="fill:none;stroke:#3181bd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 109.00608 66.902015 
-L 103.564101 74.774548 
-" style="fill:none;stroke:#3989c1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 103.564101 74.774548 
-L 96.904064 82.105179 
-" style="fill:none;stroke:#4493c7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 96.904064 82.105179 
-L 89.071225 88.760951 
-" style="fill:none;stroke:#539ecd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 89.071225 88.760951 
-L 80.230015 94.677505 
-" style="fill:none;stroke:#64a9d3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 80.230015 94.677505 
-L 70.600877 99.873435 
-" style="fill:none;stroke:#7ab6d9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 70.600877 99.873435 
-L 60.394576 104.423542 
-" style="fill:none;stroke:#95c5df;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 60.394576 104.423542 
-L 57.6 105.562495 
-" style="fill:none;stroke:#afd1e7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 106.857931 41.472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2272b6; stroke-width: 1.5"/>
+    <path d="M 119.172414 41.472 
+L 116.640865 50.135346 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2272b6; stroke-width: 1.5"/>
+    <path d="M 116.640865 50.135346 
+L 113.312855 58.645086 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2a7ab9; stroke-width: 1.5"/>
+    <path d="M 113.312855 58.645086 
+L 109.007972 66.904158 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3181bd; stroke-width: 1.5"/>
+    <path d="M 109.007972 66.904158 
+L 103.566194 74.777144 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3989c1; stroke-width: 1.5"/>
+    <path d="M 103.566194 74.777144 
+L 96.906182 82.108064 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4493c7; stroke-width: 1.5"/>
+    <path d="M 96.906182 82.108064 
+L 89.073267 88.764044 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #539ecd; stroke-width: 1.5"/>
+    <path d="M 89.073267 88.764044 
+L 80.231979 94.68105 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #64a9d3; stroke-width: 1.5"/>
+    <path d="M 80.231979 94.68105 
+L 70.602711 99.877191 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #7ab6d9; stroke-width: 1.5"/>
+    <path d="M 70.602711 99.877191 
+L 60.396291 104.427405 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #95c5df; stroke-width: 1.5"/>
+    <path d="M 60.396291 104.427405 
+L 57.6 105.567049 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #afd1e7; stroke-width: 1.5"/>
+    <path d="M 106.857931 41.472 
 L 106.857931 41.472 
-" style="fill:none;stroke:#3282be;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 106.857931 41.472 
-L 103.379478 49.948819 
-" style="fill:none;stroke:#3282be;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 103.379478 49.948819 
-L 98.994167 58.18544 
-" style="fill:none;stroke:#3a8ac2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 98.994167 58.18544 
-L 93.56557 66.065855 
-" style="fill:none;stroke:#4493c7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 93.56557 66.065855 
-L 87.016847 73.455848 
-" style="fill:none;stroke:#519ccc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 87.016847 73.455848 
-L 79.370731 80.234033 
-" style="fill:none;stroke:#60a7d2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 79.370731 80.234033 
-L 70.749217 86.330047 
-" style="fill:none;stroke:#74b3d8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 70.749217 86.330047 
-L 61.334081 91.739778 
-" style="fill:none;stroke:#8dc1dd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 61.334081 91.739778 
-L 57.6 93.683786 
-" style="fill:none;stroke:#a6cee4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 82.228966 41.472 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3282be; stroke-width: 1.5"/>
+    <path d="M 106.857931 41.472 
+L 103.379892 49.949262 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3282be; stroke-width: 1.5"/>
+    <path d="M 103.379892 49.949262 
+L 98.995016 58.186519 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3a8ac2; stroke-width: 1.5"/>
+    <path d="M 98.995016 58.186519 
+L 93.566702 66.067486 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4493c7; stroke-width: 1.5"/>
+    <path d="M 93.566702 66.067486 
+L 87.018022 73.457813 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #519ccc; stroke-width: 1.5"/>
+    <path d="M 87.018022 73.457813 
+L 79.371864 80.23623 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #60a7d2; stroke-width: 1.5"/>
+    <path d="M 79.371864 80.23623 
+L 70.750255 86.332331 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #74b3d8; stroke-width: 1.5"/>
+    <path d="M 70.750255 86.332331 
+L 61.33503 91.742269 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #8dc1dd; stroke-width: 1.5"/>
+    <path d="M 61.33503 91.742269 
+L 57.6 93.686713 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #a6cee4; stroke-width: 1.5"/>
+    <path d="M 82.228966 41.472 
 L 82.228966 41.472 
-" style="fill:none;stroke:#5aa2cf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 82.228966 41.472 
-L 76.943832 49.41028 
-" style="fill:none;stroke:#5aa2cf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 76.943832 49.41028 
-L 70.686324 56.943235 
-" style="fill:none;stroke:#68acd5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 70.686324 56.943235 
-L 63.44485 63.967854 
-" style="fill:none;stroke:#7ab6d9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 63.44485 63.967854 
-L 57.6 69.070082 
-" style="fill:none;stroke:#92c4de;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 186.461215 163.054987 
-L 174.581055 163.021365 
-" style="fill:none;stroke:#1c6bb0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 174.581055 163.021365 
-L 162.736734 163.846336 
-" style="fill:none;stroke:#2272b6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 162.736734 163.846336 
-L 150.96433 165.149294 
-" style="fill:none;stroke:#2b7bba;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 150.96433 165.149294 
-L 139.247547 166.712956 
-" style="fill:none;stroke:#3484bf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 139.247547 166.712956 
-L 127.565538 168.416892 
-" style="fill:none;stroke:#3f8fc5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 127.565538 168.416892 
-L 115.901987 170.190463 
-" style="fill:none;stroke:#4e9acb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 115.901987 170.190463 
-L 104.246479 171.993357 
-" style="fill:none;stroke:#60a7d2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 104.246479 171.993357 
-L 92.592117 173.800405 
-" style="fill:none;stroke:#75b4d8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 92.592117 173.800405 
-L 80.934418 175.595462 
-" style="fill:none;stroke:#8fc2de;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 80.934418 175.595462 
-L 69.270891 177.36936 
-" style="fill:none;stroke:#a8cee4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 69.270891 177.36936 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5aa2cf; stroke-width: 1.5"/>
+    <path d="M 82.228966 41.472 
+L 76.944099 49.410826 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5aa2cf; stroke-width: 1.5"/>
+    <path d="M 76.944099 49.410826 
+L 70.686752 56.944272 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #68acd5; stroke-width: 1.5"/>
+    <path d="M 70.686752 56.944272 
+L 63.445335 63.969338 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #7ab6d9; stroke-width: 1.5"/>
+    <path d="M 63.445335 63.969338 
+L 57.6 69.072399 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #92c4de; stroke-width: 1.5"/>
+    <path d="M 196.225629 164.107379 
+L 186.463099 163.053014 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1967ad; stroke-width: 1.5"/>
+    <path d="M 186.463099 163.053014 
+L 186.463099 163.053014 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1c6bb0; stroke-width: 1.5"/>
+    <path d="M 186.463099 163.053014 
+L 174.581398 163.019388 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1c6bb0; stroke-width: 1.5"/>
+    <path d="M 174.581398 163.019388 
+L 162.736499 163.844668 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2272b6; stroke-width: 1.5"/>
+    <path d="M 162.736499 163.844668 
+L 150.964046 165.147857 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2b7bba; stroke-width: 1.5"/>
+    <path d="M 150.964046 165.147857 
+L 139.247283 166.711823 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3484bf; stroke-width: 1.5"/>
+    <path d="M 139.247283 166.711823 
+L 127.565335 168.41611 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3f8fc5; stroke-width: 1.5"/>
+    <path d="M 127.565335 168.41611 
+L 115.901837 170.189915 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4e9acb; stroke-width: 1.5"/>
+    <path d="M 115.901837 170.189915 
+L 104.246353 171.992898 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #60a7d2; stroke-width: 1.5"/>
+    <path d="M 104.246353 171.992898 
+L 92.592021 173.800052 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #75b4d8; stroke-width: 1.5"/>
+    <path d="M 92.592021 173.800052 
+L 80.934368 175.59528 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #8fc2de; stroke-width: 1.5"/>
+    <path d="M 80.934368 175.59528 
+L 69.27088 177.369319 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #a8cee4; stroke-width: 1.5"/>
+    <path d="M 69.27088 177.369319 
 L 57.6 179.116138 
-" style="fill:none;stroke:#bfd8ed;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 57.6 179.116138 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #bfd8ed; stroke-width: 1.5"/>
+    <path d="M 57.6 179.116138 
 L 57.6 179.116138 
-" style="fill:none;stroke:#d1e2f3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 186.639071 173.624305 
-L 174.767345 173.249984 
-" style="fill:none;stroke:#206fb4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 174.767345 173.249984 
-L 162.890436 173.733251 
-" style="fill:none;stroke:#2575b7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 162.890436 173.733251 
-L 151.070752 174.764779 
-" style="fill:none;stroke:#2e7ebc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 151.070752 174.764779 
-L 139.310264 176.131808 
-" style="fill:none;stroke:#3888c1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 139.310264 176.131808 
-L 127.59435 177.700327 
-" style="fill:none;stroke:#4493c7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 127.59435 177.700327 
-L 115.908011 179.388216 
-" style="fill:none;stroke:#539ecd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 115.908011 179.388216 
-L 104.23899 181.141828 
-" style="fill:none;stroke:#64a9d3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 104.23899 181.141828 
-L 92.57876 182.927735 
-" style="fill:none;stroke:#7ab6d9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 92.57876 182.927735 
-L 80.92141 184.724071 
-" style="fill:none;stroke:#94c4df;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 80.92141 184.724071 
-L 69.262686 186.51544 
-" style="fill:none;stroke:#add0e6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 69.262686 186.51544 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #d1e2f3; stroke-width: 1.5"/>
+    <path d="M 198.321052 175.185948 
+L 186.640818 173.623133 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1c6bb0; stroke-width: 1.5"/>
+    <path d="M 186.640818 173.623133 
+L 174.767842 173.248544 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #206fb4; stroke-width: 1.5"/>
+    <path d="M 174.767842 173.248544 
+L 162.890338 173.731923 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2575b7; stroke-width: 1.5"/>
+    <path d="M 162.890338 173.731923 
+L 151.07055 174.763576 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2e7ebc; stroke-width: 1.5"/>
+    <path d="M 151.07055 174.763576 
+L 139.310052 176.130795 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3888c1; stroke-width: 1.5"/>
+    <path d="M 139.310052 176.130795 
+L 127.594171 177.699604 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4493c7; stroke-width: 1.5"/>
+    <path d="M 127.594171 177.699604 
+L 115.907871 179.387699 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #539ecd; stroke-width: 1.5"/>
+    <path d="M 115.907871 179.387699 
+L 104.238869 181.141387 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #64a9d3; stroke-width: 1.5"/>
+    <path d="M 104.238869 181.141387 
+L 92.578667 182.927393 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #7ab6d9; stroke-width: 1.5"/>
+    <path d="M 92.578667 182.927393 
+L 80.921362 184.723893 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #94c4df; stroke-width: 1.5"/>
+    <path d="M 80.921362 184.723893 
+L 69.262675 186.515399 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #add0e6; stroke-width: 1.5"/>
+    <path d="M 69.262675 186.515399 
 L 57.6 188.292414 
-" style="fill:none;stroke:#c4daee;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 57.6 188.292414 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c4daee; stroke-width: 1.5"/>
+    <path d="M 57.6 188.292414 
 L 57.6 188.292414 
-" style="fill:none;stroke:#d4e4f4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 139.158269 184.76058 
-L 127.454305 186.37756 
-" style="fill:none;stroke:#4896c8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 127.454305 186.37756 
-L 115.783971 188.125618 
-" style="fill:none;stroke:#57a0ce;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 115.783971 188.125618 
-L 104.134997 189.951566 
-" style="fill:none;stroke:#69add5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 104.134997 189.951566 
-L 92.497807 191.818981 
-" style="fill:none;stroke:#81badb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 92.497807 191.818981 
-L 80.86582 193.704348 
-" style="fill:none;stroke:#9ac8e0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 80.86582 193.704348 
-L 69.234378 195.591544 
-" style="fill:none;stroke:#b0d2e7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 69.234378 195.591544 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #d4e4f4; stroke-width: 1.5"/>
+    <path d="M 139.158057 184.759648 
+L 127.454127 186.376889 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4896c8; stroke-width: 1.5"/>
+    <path d="M 127.454127 186.376889 
+L 115.783827 188.125111 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #57a0ce; stroke-width: 1.5"/>
+    <path d="M 115.783827 188.125111 
+L 104.13487 189.951121 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #69add5; stroke-width: 1.5"/>
+    <path d="M 104.13487 189.951121 
+L 92.49771 191.818641 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #81badb; stroke-width: 1.5"/>
+    <path d="M 92.49771 191.818641 
+L 80.865771 193.704173 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #9ac8e0; stroke-width: 1.5"/>
+    <path d="M 80.865771 193.704173 
+L 69.234367 195.591504 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b0d2e7; stroke-width: 1.5"/>
+    <path d="M 69.234367 195.591504 
 L 57.6 197.46869 
-" style="fill:none;stroke:#c7dcef;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 57.6 197.46869 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c7dcef; stroke-width: 1.5"/>
+    <path d="M 57.6 197.46869 
 L 57.6 197.46869 
-" style="fill:none;stroke:#d6e6f4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 127.157932 194.564183 
-L 115.535172 196.48012 
-" style="fill:none;stroke:#5ca4d0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 115.535172 196.48012 
-L 103.935243 198.471734 
-" style="fill:none;stroke:#6dafd7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 103.935243 198.471734 
-L 92.347977 200.504071 
-" style="fill:none;stroke:#85bcdc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 92.347977 200.504071 
-L 80.766095 202.553518 
-" style="fill:none;stroke:#9fcae1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 80.766095 202.553518 
-L 69.184625 204.604241 
-" style="fill:none;stroke:#b5d4e9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 69.184625 204.604241 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #d6e6f4; stroke-width: 1.5"/>
+    <path d="M 127.157752 194.563573 
+L 115.535017 196.479608 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5ca4d0; stroke-width: 1.5"/>
+    <path d="M 115.535017 196.479608 
+L 103.935101 198.471265 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #6dafd7; stroke-width: 1.5"/>
+    <path d="M 103.935101 198.471265 
+L 92.347874 200.503726 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #85bcdc; stroke-width: 1.5"/>
+    <path d="M 92.347874 200.503726 
+L 80.766044 202.553346 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #9fcae1; stroke-width: 1.5"/>
+    <path d="M 80.766044 202.553346 
+L 69.184614 204.604202 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b5d4e9; stroke-width: 1.5"/>
+    <path d="M 69.184614 204.604202 
 L 57.6 206.644966 
-" style="fill:none;stroke:#cadef0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 57.6 206.644966 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #cadef0; stroke-width: 1.5"/>
+    <path d="M 57.6 206.644966 
 L 57.6 206.644966 
-" style="fill:none;stroke:#d9e8f5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 197.161254 195.216904 
-L 185.277376 195.035438 
-" style="fill:none;stroke:#2373b6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 185.277376 195.035438 
-L 173.41157 195.640833 
-" style="fill:none;stroke:#2979b9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 173.41157 195.640833 
-L 161.621067 196.834301 
-" style="fill:none;stroke:#3080bd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 161.621067 196.834301 
-L 149.915207 198.4355 
-" style="fill:none;stroke:#3888c1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 149.915207 198.4355 
-L 138.28078 200.308467 
-" style="fill:none;stroke:#4292c6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 138.28078 200.308467 
-L 126.699446 202.358195 
-" style="fill:none;stroke:#519ccc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 126.699446 202.358195 
-L 115.154712 204.520162 
-" style="fill:none;stroke:#60a7d2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 115.154712 204.520162 
-L 103.632738 206.74875 
-" style="fill:none;stroke:#74b3d8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 103.632738 206.74875 
-L 92.122942 209.012152 
-" style="fill:none;stroke:#8cc0dd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 92.122942 209.012152 
-L 80.617623 211.288285 
-" style="fill:none;stroke:#a4cce3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 80.617623 211.288285 
-L 69.111228 213.561557 
-" style="fill:none;stroke:#b9d6ea;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 69.111228 213.561557 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #d9e8f5; stroke-width: 1.5"/>
+    <path d="M 197.162506 195.215776 
+L 185.277611 195.03404 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2373b6; stroke-width: 1.5"/>
+    <path d="M 185.277611 195.03404 
+L 173.41133 195.639425 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2979b9; stroke-width: 1.5"/>
+    <path d="M 173.41133 195.639425 
+L 161.620769 196.832949 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3080bd; stroke-width: 1.5"/>
+    <path d="M 161.620769 196.832949 
+L 149.914893 198.434367 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3888c1; stroke-width: 1.5"/>
+    <path d="M 149.914893 198.434367 
+L 138.280522 200.307634 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4292c6; stroke-width: 1.5"/>
+    <path d="M 138.280522 200.307634 
+L 126.699243 202.357564 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #519ccc; stroke-width: 1.5"/>
+    <path d="M 126.699243 202.357564 
+L 115.154524 204.519577 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #60a7d2; stroke-width: 1.5"/>
+    <path d="M 115.154524 204.519577 
+L 103.632575 206.748238 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #74b3d8; stroke-width: 1.5"/>
+    <path d="M 103.632575 206.748238 
+L 92.122832 209.011801 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #8cc0dd; stroke-width: 1.5"/>
+    <path d="M 92.122832 209.011801 
+L 80.617572 211.28812 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #a4cce3; stroke-width: 1.5"/>
+    <path d="M 80.617572 211.28812 
+L 69.111216 213.561519 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b9d6ea; stroke-width: 1.5"/>
+    <path d="M 69.111216 213.561519 
 L 57.6 215.821241 
-" style="fill:none;stroke:#cddff1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 57.6 215.821241 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #cddff1; stroke-width: 1.5"/>
+    <path d="M 57.6 215.821241 
 L 57.6 215.821241 
-" style="fill:none;stroke:#dce9f6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 332.942171 228.533064 
-L 321.375664 226.441029 
-" style="fill:none;stroke:#5da5d1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 321.375664 226.441029 
-L 309.854896 224.211396 
-" style="fill:none;stroke:#4f9bcb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 309.854896 224.211396 
-L 298.385253 221.840085 
-" style="fill:none;stroke:#4292c6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 298.385253 221.840085 
-L 286.969076 219.332289 
-" style="fill:none;stroke:#3a8ac2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 286.969076 219.332289 
-L 275.60086 216.707875 
-" style="fill:none;stroke:#3282be;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 275.60086 216.707875 
-L 264.262178 214.014195 
-" style="fill:none;stroke:#2c7cba;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 264.262178 214.014195 
-L 252.915276 211.340851 
-" style="fill:none;stroke:#2777b8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 252.915276 211.340851 
-L 241.501598 208.835168 
-" style="fill:none;stroke:#2373b6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 241.501598 208.835168 
-L 229.956256 206.707788 
-" style="fill:none;stroke:#2171b5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 229.956256 206.707788 
-L 218.242926 205.202423 
-" style="fill:none;stroke:#2070b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 218.242926 205.202423 
-L 206.396609 204.52106 
-" style="fill:none;stroke:#2171b5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 206.396609 204.52106 
-L 194.514776 204.726913 
-" style="fill:none;stroke:#2474b7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 194.514776 204.726913 
-L 182.69891 205.727736 
-" style="fill:none;stroke:#2979b9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 182.69891 205.727736 
-L 171.002271 207.349857 
-" style="fill:none;stroke:#2e7ebc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 171.002271 207.349857 
-L 159.431206 209.421277 
-" style="fill:none;stroke:#3686c0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 159.431206 209.421277 
-L 147.965394 211.800487 
-" style="fill:none;stroke:#3e8ec4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 147.965394 211.800487 
-L 136.578894 214.384864 
-" style="fill:none;stroke:#4b98ca;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 136.578894 214.384864 
-L 125.247727 217.101945 
-" style="fill:none;stroke:#5aa2cf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 125.247727 217.101945 
-L 113.95237 219.901023 
-" style="fill:none;stroke:#69add5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 113.95237 219.901023 
-L 102.677738 222.746303 
-" style="fill:none;stroke:#7fb9da;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 102.677738 222.746303 
-L 91.412486 225.612235 
-" style="fill:none;stroke:#97c6df;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 91.412486 225.612235 
-L 80.148233 228.48042 
-" style="fill:none;stroke:#add0e6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 80.148233 228.48042 
-L 68.878869 231.337513 
-" style="fill:none;stroke:#c3daee;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 68.878869 231.337513 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #dce9f6; stroke-width: 1.5"/>
+    <path d="M 332.945108 228.535365 
+L 321.378587 226.44334 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5da5d1; stroke-width: 1.5"/>
+    <path d="M 321.378587 226.44334 
+L 309.857755 224.213854 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4f9bcb; stroke-width: 1.5"/>
+    <path d="M 309.857755 224.213854 
+L 298.388063 221.842632 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4292c6; stroke-width: 1.5"/>
+    <path d="M 298.388063 221.842632 
+L 286.971904 219.334593 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3a8ac2; stroke-width: 1.5"/>
+    <path d="M 286.971904 219.334593 
+L 275.60372 216.709734 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3282be; stroke-width: 1.5"/>
+    <path d="M 275.60372 216.709734 
+L 264.265034 214.01545 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2c7cba; stroke-width: 1.5"/>
+    <path d="M 264.265034 214.01545 
+L 252.918086 211.341478 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2777b8; stroke-width: 1.5"/>
+    <path d="M 252.918086 211.341478 
+L 241.504475 208.835502 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2373b6; stroke-width: 1.5"/>
+    <path d="M 241.504475 208.835502 
+L 229.958783 206.707747 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2171b5; stroke-width: 1.5"/>
+    <path d="M 229.958783 206.707747 
+L 218.244433 205.201502 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2070b4; stroke-width: 1.5"/>
+    <path d="M 218.244433 205.201502 
+L 206.396945 204.519527 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2171b5; stroke-width: 1.5"/>
+    <path d="M 206.396945 204.519527 
+L 194.514604 204.72512 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2474b7; stroke-width: 1.5"/>
+    <path d="M 194.514604 204.72512 
+L 182.698597 205.725931 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2979b9; stroke-width: 1.5"/>
+    <path d="M 182.698597 205.725931 
+L 171.001819 207.348337 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2e7ebc; stroke-width: 1.5"/>
+    <path d="M 171.001819 207.348337 
+L 159.430768 209.420064 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3686c0; stroke-width: 1.5"/>
+    <path d="M 159.430768 209.420064 
+L 147.964963 211.799332 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3e8ec4; stroke-width: 1.5"/>
+    <path d="M 147.964963 211.799332 
+L 136.578464 214.38371 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4b98ca; stroke-width: 1.5"/>
+    <path d="M 136.578464 214.38371 
+L 125.247359 217.100939 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5aa2cf; stroke-width: 1.5"/>
+    <path d="M 125.247359 217.100939 
+L 113.952082 219.900217 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #69add5; stroke-width: 1.5"/>
+    <path d="M 113.952082 219.900217 
+L 102.677546 222.745747 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #7fb9da; stroke-width: 1.5"/>
+    <path d="M 102.677546 222.745747 
+L 91.412386 225.611931 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #97c6df; stroke-width: 1.5"/>
+    <path d="M 91.412386 225.611931 
+L 80.148194 228.480296 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #add0e6; stroke-width: 1.5"/>
+    <path d="M 80.148194 228.480296 
+L 68.87886 231.337484 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c3daee; stroke-width: 1.5"/>
+    <path d="M 68.87886 231.337484 
 L 57.6 234.173793 
-" style="fill:none;stroke:#d2e3f3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 57.6 234.173793 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #d2e3f3; stroke-width: 1.5"/>
+    <path d="M 57.6 234.173793 
 L 57.6 234.173793 
-" style="fill:none;stroke:#e1edf8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 135.397613 221.112115 
-L 124.237927 224.19873 
-" style="fill:none;stroke:#5fa6d1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 124.237927 224.19873 
-L 113.11365 227.355823 
-" style="fill:none;stroke:#6fb0d7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 113.11365 227.355823 
-L 102.009636 230.55209 
-" style="fill:none;stroke:#85bcdc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 102.009636 230.55209 
-L 90.914035 233.764464 
-" style="fill:none;stroke:#9dcae1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 90.914035 233.764464 
-L 79.817935 236.975991 
-" style="fill:none;stroke:#b2d2e8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 79.817935 236.975991 
-L 68.714775 240.174196 
-" style="fill:none;stroke:#c7dbef;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 68.714775 240.174196 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #e1edf8; stroke-width: 1.5"/>
+    <path d="M 135.397079 221.110806 
+L 124.23754 224.197744 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5fa6d1; stroke-width: 1.5"/>
+    <path d="M 124.23754 224.197744 
+L 113.113408 227.355172 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #6fb0d7; stroke-width: 1.5"/>
+    <path d="M 113.113408 227.355172 
+L 102.009502 230.551712 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #85bcdc; stroke-width: 1.5"/>
+    <path d="M 102.009502 230.551712 
+L 90.913971 233.764269 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #9dcae1; stroke-width: 1.5"/>
+    <path d="M 90.913971 233.764269 
+L 79.81791 236.975911 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b2d2e8; stroke-width: 1.5"/>
+    <path d="M 79.81791 236.975911 
+L 68.714769 240.174177 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c7dbef; stroke-width: 1.5"/>
+    <path d="M 68.714769 240.174177 
 L 57.6 243.350069 
-" style="fill:none;stroke:#d5e5f4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 57.6 243.350069 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #d5e5f4; stroke-width: 1.5"/>
+    <path d="M 57.6 243.350069 
 L 57.6 243.350069 
-" style="fill:none;stroke:#e4eff9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 317.804046 280.580557 
-L 308.169029 285.758913 
-" style="fill:none;stroke:#66abd4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 308.169029 285.758913 
-L 299.420195 291.751211 
-" style="fill:none;stroke:#5fa6d1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 299.420195 291.751211 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #e4eff9; stroke-width: 1.5"/>
+    <path d="M 317.803919 280.579902 
+L 308.168909 285.7585 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #66abd4; stroke-width: 1.5"/>
+    <path d="M 308.168909 285.7585 
+L 299.420104 291.751092 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5fa6d1; stroke-width: 1.5"/>
+    <path d="M 299.420104 291.751092 
 L 291.575172 298.407724 
-" style="fill:none;stroke:#5ba3d0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 291.575172 298.407724 
-L 284.571324 305.570384 
-" style="fill:none;stroke:#58a1cf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 284.571324 305.570384 
-L 282.767828 307.584 
-" style="fill:none;stroke:#57a0ce;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 97.529401 
-L 414.238573 97.486862 
-" style="fill:none;stroke:#b2d2e8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.238573 97.486862 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5ba3d0; stroke-width: 1.5"/>
+    <path d="M 291.575172 298.407724 
+L 284.571569 305.57061 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #58a1cf; stroke-width: 1.5"/>
+    <path d="M 284.571569 305.57061 
+L 282.768293 307.584 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #57a0ce; stroke-width: 1.5"/>
+    <path d="M 414.72 235.90928 
+L 414.101021 235.82458 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #e2edf8; stroke-width: 1.5"/>
+    <path d="M 414.101021 235.82458 
+L 402.405517 234.173793 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #e1edf8; stroke-width: 1.5"/>
+    <path d="M 402.405517 234.173793 
+L 390.738008 232.416213 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #d2e3f3; stroke-width: 1.5"/>
+    <path d="M 390.738008 232.416213 
+L 379.104875 230.536888 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c2d9ee; stroke-width: 1.5"/>
+    <path d="M 379.104875 230.536888 
+L 367.514328 228.518019 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #add0e6; stroke-width: 1.5"/>
+    <path d="M 367.514328 228.518019 
+L 355.97689 226.337218 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #97c6df; stroke-width: 1.5"/>
+    <path d="M 355.97689 226.337218 
+L 344.506618 223.967927 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #7fb9da; stroke-width: 1.5"/>
+    <path d="M 414.72 227.210058 
+L 413.975781 227.081113 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #dfecf7; stroke-width: 1.5"/>
+    <path d="M 413.975781 227.081113 
+L 402.405517 224.997517 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #deebf7; stroke-width: 1.5"/>
+    <path d="M 402.405517 224.997517 
+L 390.890923 222.74993 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #cfe1f2; stroke-width: 1.5"/>
+    <path d="M 390.890923 222.74993 
+L 379.446211 220.312974 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #bed8ec; stroke-width: 1.5"/>
+    <path d="M 379.446211 220.312974 
+L 368.090066 217.656764 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #a8cee4; stroke-width: 1.5"/>
+    <path d="M 368.090066 217.656764 
+L 356.847142 214.746463 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #91c3de; stroke-width: 1.5"/>
+    <path d="M 356.847142 214.746463 
+L 345.749924 211.541895 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #79b5d9; stroke-width: 1.5"/>
+    <path d="M 345.749924 211.541895 
+L 334.840896 207.99754 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #65aad4; stroke-width: 1.5"/>
+    <path d="M 334.840896 207.99754 
+L 324.174134 204.066835 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #549fcd; stroke-width: 1.5"/>
+    <path d="M 324.174134 204.066835 
+L 313.816415 199.703101 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4695c8; stroke-width: 1.5"/>
+    <path d="M 313.816415 199.703101 
+L 303.845287 194.866695 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3b8bc2; stroke-width: 1.5"/>
+    <path d="M 303.845287 194.866695 
+L 294.34324 189.532907 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3383be; stroke-width: 1.5"/>
+    <path d="M 294.34324 189.532907 
+L 285.38839 183.697596 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2b7bba; stroke-width: 1.5"/>
+    <path d="M 285.38839 183.697596 
+L 277.040559 177.382672 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2373b6; stroke-width: 1.5"/>
+    <path d="M 414.72 218.458375 
+L 413.843001 218.27779 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #dceaf6; stroke-width: 1.5"/>
+    <path d="M 413.843001 218.27779 
+L 402.405517 215.821241 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #dce9f6; stroke-width: 1.5"/>
+    <path d="M 402.405517 215.821241 
+L 391.050804 213.160405 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #cddff1; stroke-width: 1.5"/>
+    <path d="M 391.050804 213.160405 
+L 379.799618 210.266464 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b9d6ea; stroke-width: 1.5"/>
+    <path d="M 379.799618 210.266464 
+L 368.678529 207.106686 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #a4cce3; stroke-width: 1.5"/>
+    <path d="M 368.678529 207.106686 
+L 357.72149 203.644482 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #8cc0dd; stroke-width: 1.5"/>
+    <path d="M 357.72149 203.644482 
+L 346.971403 199.840043 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #74b3d8; stroke-width: 1.5"/>
+    <path d="M 346.971403 199.840043 
+L 336.480324 195.654762 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #61a7d2; stroke-width: 1.5"/>
+    <path d="M 336.480324 195.654762 
+L 326.309962 191.052402 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #519ccc; stroke-width: 1.5"/>
+    <path d="M 326.309962 191.052402 
+L 316.529439 186.00382 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4292c6; stroke-width: 1.5"/>
+    <path d="M 316.529439 186.00382 
+L 307.209616 180.493507 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3888c1; stroke-width: 1.5"/>
+    <path d="M 307.209616 180.493507 
+L 298.415854 174.523002 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2f7fbc; stroke-width: 1.5"/>
+    <path d="M 298.415854 174.523002 
+L 290.200875 168.111231 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2676b8; stroke-width: 1.5"/>
+    <path d="M 290.200875 168.111231 
+L 282.599147 161.292036 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #206fb4; stroke-width: 1.5"/>
+    <path d="M 282.599147 161.292036 
+L 275.626817 154.108704 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1b69af; stroke-width: 1.5"/>
+    <path d="M 414.72 209.650458 
+L 413.71329 209.414333 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #dae8f6; stroke-width: 1.5"/>
+    <path d="M 413.71329 209.414333 
+L 402.405517 206.644966 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #d9e7f5; stroke-width: 1.5"/>
+    <path d="M 402.405517 206.644966 
+L 391.203479 203.646993 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #caddf0; stroke-width: 1.5"/>
+    <path d="M 391.203479 203.646993 
+L 380.13199 200.391545 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b5d4e9; stroke-width: 1.5"/>
+    <path d="M 380.13199 200.391545 
+L 369.221742 196.847465 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #a0cbe2; stroke-width: 1.5"/>
+    <path d="M 369.221742 196.847465 
+L 358.509975 192.982872 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #87bddc; stroke-width: 1.5"/>
+    <path d="M 358.509975 192.982872 
+L 348.041605 188.765191 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #6fb0d7; stroke-width: 1.5"/>
+    <path d="M 348.041605 188.765191 
+L 337.868075 184.165295 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5ca4d0; stroke-width: 1.5"/>
+    <path d="M 337.868075 184.165295 
+L 328.04547 179.160731 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4d99ca; stroke-width: 1.5"/>
+    <path d="M 328.04547 179.160731 
+L 318.63097 173.738935 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3f8fc5; stroke-width: 1.5"/>
+    <path d="M 414.72 200.783424 
+L 413.595352 200.492311 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #d7e6f5; stroke-width: 1.5"/>
+    <path d="M 413.595352 200.492311 
+L 402.405517 197.46869 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #d6e5f4; stroke-width: 1.5"/>
+    <path d="M 402.405517 197.46869 
+L 391.338263 194.204617 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c7dcef; stroke-width: 1.5"/>
+    <path d="M 391.338263 194.204617 
+L 380.419449 190.674599 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b0d2e7; stroke-width: 1.5"/>
+    <path d="M 380.419449 190.674599 
+L 369.680404 186.851373 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #9ac8e0; stroke-width: 1.5"/>
+    <path d="M 369.680404 186.851373 
+L 359.157536 182.708519 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #81badb; stroke-width: 1.5"/>
+    <path d="M 359.157536 182.708519 
+L 348.892065 178.222217 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #6aaed6; stroke-width: 1.5"/>
+    <path d="M 348.892065 178.222217 
+L 338.928555 173.373337 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #58a1cf; stroke-width: 1.5"/>
+    <path d="M 338.928555 173.373337 
+L 329.312135 168.150387 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4997c9; stroke-width: 1.5"/>
+    <path d="M 329.312135 168.150387 
+L 320.08463 162.55179 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3c8cc3; stroke-width: 1.5"/>
+    <path d="M 320.08463 162.55179 
+L 311.279384 156.587617 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3282be; stroke-width: 1.5"/>
+    <path d="M 311.279384 156.587617 
+L 302.913964 150.281498 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2979b9; stroke-width: 1.5"/>
+    <path d="M 302.913964 150.281498 
+L 294.987599 143.667411 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2070b4; stroke-width: 1.5"/>
+    <path d="M 294.987599 143.667411 
+L 287.464391 136.795834 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1a68ae; stroke-width: 1.5"/>
+    <path d="M 287.464391 136.795834 
+L 280.236654 129.749 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1562a9; stroke-width: 1.5"/>
+    <path d="M 414.72 191.851133 
+L 413.497072 191.510763 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #d5e5f4; stroke-width: 1.5"/>
+    <path d="M 413.497072 191.510763 
+L 402.405517 188.292414 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #d3e4f3; stroke-width: 1.5"/>
+    <path d="M 402.405517 188.292414 
+L 391.446045 184.832403 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c3daee; stroke-width: 1.5"/>
+    <path d="M 391.446045 184.832403 
+L 380.644015 181.108131 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #add0e6; stroke-width: 1.5"/>
+    <path d="M 380.644015 181.108131 
+L 370.027923 177.098508 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #95c5df; stroke-width: 1.5"/>
+    <path d="M 370.027923 177.098508 
+L 359.630035 172.783697 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #7cb7da; stroke-width: 1.5"/>
+    <path d="M 359.630035 172.783697 
+L 349.484798 168.14748 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #65aad4; stroke-width: 1.5"/>
+    <path d="M 349.484798 168.14748 
+L 339.626676 163.17962 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #549fcd; stroke-width: 1.5"/>
+    <path d="M 339.626676 163.17962 
+L 330.087024 157.878028 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4594c7; stroke-width: 1.5"/>
+    <path d="M 330.087024 157.878028 
+L 320.889958 152.250369 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3989c1; stroke-width: 1.5"/>
+    <path d="M 320.889958 152.250369 
+L 312.045986 146.316528 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2f7fbc; stroke-width: 1.5"/>
+    <path d="M 312.045986 146.316528 
+L 303.540804 140.113056 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2575b7; stroke-width: 1.5"/>
+    <path d="M 414.72 182.849484 
+L 413.424345 182.470443 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #d3e3f3; stroke-width: 1.5"/>
+    <path d="M 413.424345 182.470443 
+L 402.405517 179.116138 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #d0e2f2; stroke-width: 1.5"/>
+    <path d="M 402.405517 179.116138 
+L 391.521142 175.526725 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #bfd8ed; stroke-width: 1.5"/>
+    <path d="M 391.521142 175.526725 
+L 380.793156 171.685173 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #a8cee4; stroke-width: 1.5"/>
+    <path d="M 414.72 173.773188 
+L 413.382195 173.37031 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #d0e1f2; stroke-width: 1.5"/>
+    <path d="M 413.382195 173.37031 
+L 402.405517 169.939862 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #cee0f2; stroke-width: 1.5"/>
+    <path d="M 402.405517 169.939862 
+L 391.557812 166.28902 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #bad6eb; stroke-width: 1.5"/>
+    <path d="M 391.557812 166.28902 
+L 380.857305 162.404763 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #a4cce3; stroke-width: 1.5"/>
+    <path d="M 380.857305 162.404763 
+L 370.32239 158.277055 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #8abfdd; stroke-width: 1.5"/>
+    <path d="M 370.32239 158.277055 
+L 359.970765 153.899667 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #71b1d7; stroke-width: 1.5"/>
+    <path d="M 359.970765 153.899667 
+L 349.817364 149.271736 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5da5d1; stroke-width: 1.5"/>
+    <path d="M 349.817364 149.271736 
+L 339.869964 144.401637 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4b98ca; stroke-width: 1.5"/>
+    <path d="M 339.869964 144.401637 
+L 330.123737 139.310501 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3d8dc4; stroke-width: 1.5"/>
+    <path d="M 330.123737 139.310501 
+L 320.551142 134.039282 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3282be; stroke-width: 1.5"/>
+    <path d="M 320.551142 134.039282 
+L 311.079859 128.6674 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2676b8; stroke-width: 1.5"/>
+    <path d="M 311.079859 128.6674 
+L 301.538094 123.369241 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1e6db2; stroke-width: 1.5"/>
+    <path d="M 301.538094 123.369241 
+L 291.48118 118.696386 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1865ac; stroke-width: 1.5"/>
+    <path d="M 291.48118 118.696386 
+L 291.48118 118.696386 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #125da6; stroke-width: 1.5"/>
+    <path d="M 291.48118 118.696386 
+L 287.162872 117.160048 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #125da6; stroke-width: 1.5"/>
+    <path d="M 287.162872 117.160048 
+L 287.162872 117.160048 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0f5aa3; stroke-width: 1.5"/>
+    <path d="M 414.72 164.614994 
+L 413.375121 164.206906 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #cddff1; stroke-width: 1.5"/>
+    <path d="M 413.375121 164.206906 
+L 402.405517 160.763586 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #cbdef1; stroke-width: 1.5"/>
+    <path d="M 402.405517 160.763586 
+L 391.55292 157.120433 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b7d4ea; stroke-width: 1.5"/>
+    <path d="M 391.55292 157.120433 
+L 380.829722 153.270539 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #9fcae1; stroke-width: 1.5"/>
+    <path d="M 414.72 155.369461 
+L 413.405679 154.976461 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #cadef0; stroke-width: 1.5"/>
+    <path d="M 413.405679 154.976461 
+L 402.405517 151.58731 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c9ddf0; stroke-width: 1.5"/>
+    <path d="M 402.405517 151.58731 
+L 391.503414 148.02669 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b2d2e8; stroke-width: 1.5"/>
+    <path d="M 391.503414 148.02669 
+L 380.70548 144.294043 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #9ac8e0; stroke-width: 1.5"/>
+    <path d="M 380.70548 144.294043 
+L 370.015254 140.393019 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #7fb9da; stroke-width: 1.5"/>
+    <path d="M 370.015254 140.393019 
+L 359.430117 136.335963 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #66abd4; stroke-width: 1.5"/>
+    <path d="M 359.430117 136.335963 
+L 348.937798 132.147101 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #539ecd; stroke-width: 1.5"/>
+    <path d="M 348.937798 132.147101 
+L 338.508917 127.87102 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4292c6; stroke-width: 1.5"/>
+    <path d="M 338.508917 127.87102 
+L 328.08381 123.590991 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3585bf; stroke-width: 1.5"/>
+    <path d="M 328.08381 123.590991 
+L 317.547349 119.468148 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2a7ab9; stroke-width: 1.5"/>
+    <path d="M 317.547349 119.468148 
+L 306.689495 115.878553 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1f6eb3; stroke-width: 1.5"/>
+    <path d="M 306.689495 115.878553 
+L 306.689495 115.878553 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1865ac; stroke-width: 1.5"/>
+    <path d="M 306.689495 115.878553 
+L 299.277943 114.114265 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1865ac; stroke-width: 1.5"/>
+    <path d="M 299.277943 114.114265 
+L 299.277943 114.114265 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1460a8; stroke-width: 1.5"/>
+    <path d="M 414.72 146.02732 
+L 413.476404 145.670185 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c7dcef; stroke-width: 1.5"/>
+    <path d="M 413.476404 145.670185 
+L 402.405517 142.411034 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c6dbef; stroke-width: 1.5"/>
+    <path d="M 402.405517 142.411034 
+L 391.40821 139.016444 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #add0e6; stroke-width: 1.5"/>
+    <path d="M 391.40821 139.016444 
+L 380.484111 135.492893 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #94c4df; stroke-width: 1.5"/>
+    <path d="M 414.72 136.581177 
+L 413.586599 136.278268 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c4daee; stroke-width: 1.5"/>
+    <path d="M 413.586599 136.278268 
+L 402.405517 133.234759 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c2d9ee; stroke-width: 1.5"/>
+    <path d="M 402.405517 133.234759 
+L 391.269427 130.100846 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #a9cfe5; stroke-width: 1.5"/>
+    <path d="M 391.269427 130.100846 
+L 380.170775 126.894119 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #8fc2de; stroke-width: 1.5"/>
+    <path d="M 380.170775 126.894119 
+L 369.09566 123.643007 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #72b2d8; stroke-width: 1.5"/>
+    <path d="M 369.09566 123.643007 
+L 358.020361 120.392967 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5ca4d0; stroke-width: 1.5"/>
+    <path d="M 358.020361 120.392967 
+L 346.905887 117.219139 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4997c9; stroke-width: 1.5"/>
+    <path d="M 346.905887 117.219139 
+L 335.691077 114.250579 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3a8ac2; stroke-width: 1.5"/>
+    <path d="M 335.691077 114.250579 
+L 324.29012 111.722813 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2d7dbb; stroke-width: 1.5"/>
+    <path d="M 324.29012 111.722813 
+L 312.638485 110.087337 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2171b5; stroke-width: 1.5"/>
+    <path d="M 312.638485 110.087337 
+L 312.638485 110.087337 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1967ad; stroke-width: 1.5"/>
+    <path d="M 414.72 127.020286 
+L 413.733009 126.784929 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #bfd8ed; stroke-width: 1.5"/>
+    <path d="M 413.733009 126.784929 
+L 402.405517 124.058483 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #bdd7ec; stroke-width: 1.5"/>
+    <path d="M 402.405517 124.058483 
+L 391.092633 121.298762 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #a4cce3; stroke-width: 1.5"/>
+    <path d="M 391.092633 121.298762 
+L 379.781578 118.535348 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #89bedc; stroke-width: 1.5"/>
+    <path d="M 379.781578 118.535348 
+L 368.452858 115.813488 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #6dafd7; stroke-width: 1.5"/>
+    <path d="M 368.452858 115.813488 
+L 357.077834 113.203657 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #57a0ce; stroke-width: 1.5"/>
+    <path d="M 414.72 107.508639 
+L 414.086293 107.413415 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b7d4ea; stroke-width: 1.5"/>
+    <path d="M 414.086293 107.413415 
+L 402.405517 105.705931 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b4d3e9; stroke-width: 1.5"/>
+    <path d="M 402.405517 105.705931 
+L 390.695883 104.113873 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #9ac8e0; stroke-width: 1.5"/>
+    <path d="M 390.695883 104.113873 
+L 378.947347 102.695002 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #7db8da; stroke-width: 1.5"/>
+    <path d="M 378.947347 102.695002 
+L 367.150433 101.529375 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #63a8d3; stroke-width: 1.5"/>
+    <path d="M 367.150433 101.529375 
+L 355.300936 100.727916 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4e9acb; stroke-width: 1.5"/>
+    <path d="M 355.300936 100.727916 
+L 343.414822 100.443239 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3d8dc4; stroke-width: 1.5"/>
+    <path d="M 343.414822 100.443239 
+L 331.545075 100.868648 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3080bd; stroke-width: 1.5"/>
+    <path d="M 414.72 97.52947 
+L 414.238574 97.48693 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b2d2e8; stroke-width: 1.5"/>
+    <path d="M 414.238574 97.48693 
 L 402.405517 96.529655 
-" style="fill:none;stroke:#b0d2e7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 402.405517 96.529655 
-L 390.547325 95.771147 
-" style="fill:none;stroke:#95c5df;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 390.547325 95.771147 
-L 378.664685 95.275173 
-" style="fill:none;stroke:#77b5d9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 316.046098 41.472 
-L 316.057997 41.780347 
-" style="fill:none;stroke:#084f99;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 316.057997 41.780347 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b0d2e7; stroke-width: 1.5"/>
+    <path d="M 402.405517 96.529655 
+L 390.547307 95.771073 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #95c5df; stroke-width: 1.5"/>
+    <path d="M 390.547307 95.771073 
+L 378.664656 95.275085 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #77b5d9; stroke-width: 1.5"/>
+    <path d="M 378.664656 95.275085 
+L 366.766788 95.125883 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5fa6d1; stroke-width: 1.5"/>
+    <path d="M 414.72 87.380245 
+L 414.308188 87.375197 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #add0e6; stroke-width: 1.5"/>
+    <path d="M 414.308188 87.375197 
+L 402.405517 87.353379 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #abd0e6; stroke-width: 1.5"/>
+    <path d="M 402.405517 87.353379 
+L 390.508723 87.600818 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #8fc2de; stroke-width: 1.5"/>
+    <path d="M 390.508723 87.600818 
+L 378.634869 88.175627 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #72b2d8; stroke-width: 1.5"/>
+    <path d="M 378.634869 88.175627 
+L 366.810918 89.145458 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5ba3d0; stroke-width: 1.5"/>
+    <path d="M 366.810918 89.145458 
+L 355.075151 90.582283 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4896c8; stroke-width: 1.5"/>
+    <path d="M 414.72 77.038659 
+L 414.214955 77.079279 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #a8cee4; stroke-width: 1.5"/>
+    <path d="M 414.214955 77.079279 
+L 402.405517 78.177103 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #a6cee4; stroke-width: 1.5"/>
+    <path d="M 402.405517 78.177103 
+L 390.654641 79.576097 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #8abfdd; stroke-width: 1.5"/>
+    <path d="M 390.654641 79.576097 
+L 378.986972 81.313152 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #6dafd7; stroke-width: 1.5"/>
+    <path d="M 414.72 55.683974 
+L 413.246183 56.165206 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #9dcae1; stroke-width: 1.5"/>
+    <path d="M 413.246183 56.165206 
+L 402.405517 59.824552 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #99c7e0; stroke-width: 1.5"/>
+    <path d="M 402.405517 59.824552 
+L 391.68385 63.672963 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #7fb9da; stroke-width: 1.5"/>
+    <path d="M 391.68385 63.672963 
+L 381.086678 67.70617 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #68acd5; stroke-width: 1.5"/>
+    <path d="M 388.315327 41.472 
+L 385.538062 43.92536 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #56a0ce; stroke-width: 1.5"/>
+    <path d="M 385.538062 43.92536 
+L 377.776552 50.648276 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #529dcc; stroke-width: 1.5"/>
+    <path d="M 377.776552 50.648276 
+L 369.847751 57.261364 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4896c8; stroke-width: 1.5"/>
+    <path d="M 369.847751 57.261364 
+L 361.749095 63.758095 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3e8ec4; stroke-width: 1.5"/>
+    <path d="M 316.044612 41.472 
+L 316.056544 41.779754 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084f99; stroke-width: 1.5"/>
+    <path d="M 316.056544 41.779754 
 L 316.204138 50.648276 
-" style="fill:none;stroke:#084f99;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 316.204138 50.648276 
-L 315.895214 59.51205 
-" style="fill:none;stroke:#0a539e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 315.895214 59.51205 
-L 314.964292 68.348449 
-" style="fill:none;stroke:#0c56a0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 237.813295 213.419445 
-L 225.984997 212.55251 
-" style="fill:none;stroke:#2373b6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 225.984997 212.55251 
-L 214.105269 212.521116 
-" style="fill:none;stroke:#2373b6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 214.105269 212.521116 
-L 202.278586 213.389156 
-" style="fill:none;stroke:#2575b7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 202.278586 213.389156 
-L 190.605695 215.074917 
-" style="fill:none;stroke:#2979b9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 190.605695 215.074917 
-L 179.130522 217.410104 
-" style="fill:none;stroke:#2e7ebc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 179.130522 217.410104 
-L 167.844707 220.220231 
-" style="fill:none;stroke:#3585bf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 167.844707 220.220231 
-L 156.716131 223.363809 
-" style="fill:none;stroke:#3d8dc4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 156.716131 223.363809 
-L 145.70723 226.735874 
-" style="fill:none;stroke:#4896c8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 145.70723 226.735874 
-L 134.785022 230.262065 
-" style="fill:none;stroke:#549fcd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 134.785022 230.262065 
-L 123.922808 233.889832 
-" style="fill:none;stroke:#64a9d3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 123.922808 233.889832 
-L 113.098709 237.580782 
-" style="fill:none;stroke:#75b4d8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 113.098709 237.580782 
-L 102.296632 241.307545 
-" style="fill:none;stroke:#8cc0dd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 102.296632 241.307545 
-L 91.504597 245.050259 
-" style="fill:none;stroke:#a3cce3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 91.504597 245.050259 
-L 80.71281 248.793562 
-" style="fill:none;stroke:#b7d4ea;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 80.71281 248.793562 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084f99; stroke-width: 1.5"/>
+    <path d="M 316.204138 50.648276 
+L 315.896801 59.513066 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a539e; stroke-width: 1.5"/>
+    <path d="M 315.896801 59.513066 
+L 314.967438 68.35126 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0c56a0; stroke-width: 1.5"/>
+    <path d="M 237.814152 213.417566 
+L 225.985445 212.550128 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2373b6; stroke-width: 1.5"/>
+    <path d="M 225.985445 212.550128 
+L 214.10466 212.518239 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2373b6; stroke-width: 1.5"/>
+    <path d="M 214.10466 212.518239 
+L 202.277373 213.386037 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2575b7; stroke-width: 1.5"/>
+    <path d="M 202.277373 213.386037 
+L 190.604366 215.071587 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2979b9; stroke-width: 1.5"/>
+    <path d="M 190.604366 215.071587 
+L 179.129138 217.406893 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2e7ebc; stroke-width: 1.5"/>
+    <path d="M 179.129138 217.406893 
+L 167.843408 220.217286 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3585bf; stroke-width: 1.5"/>
+    <path d="M 167.843408 220.217286 
+L 156.714998 223.361198 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3d8dc4; stroke-width: 1.5"/>
+    <path d="M 156.714998 223.361198 
+L 145.706297 226.733638 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4896c8; stroke-width: 1.5"/>
+    <path d="M 145.706297 226.733638 
+L 134.784292 230.260222 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #549fcd; stroke-width: 1.5"/>
+    <path d="M 134.784292 230.260222 
+L 123.922256 233.888364 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #64a9d3; stroke-width: 1.5"/>
+    <path d="M 123.922256 233.888364 
+L 113.098305 237.57965 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #75b4d8; stroke-width: 1.5"/>
+    <path d="M 113.098305 237.57965 
+L 102.296351 241.306722 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #8cc0dd; stroke-width: 1.5"/>
+    <path d="M 102.296351 241.306722 
+L 91.504423 245.049727 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #a3cce3; stroke-width: 1.5"/>
+    <path d="M 91.504423 245.049727 
+L 80.712728 248.793304 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b7d4ea; stroke-width: 1.5"/>
+    <path d="M 80.712728 248.793304 
 L 69.914483 252.526345 
-" style="fill:none;stroke:#caddf0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 201.416385 241.361151 
-L 191.652092 246.424595 
-" style="fill:none;stroke:#3484bf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 191.652092 246.424595 
-L 182.290917 251.898279 
-" style="fill:none;stroke:#3a8ac2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 182.290917 251.898279 
-L 173.264311 257.677375 
-" style="fill:none;stroke:#4090c5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 173.264311 257.677375 
-L 164.514009 263.688865 
-" style="fill:none;stroke:#4a98c9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 164.514009 263.688865 
-L 155.992642 269.881156 
-" style="fill:none;stroke:#549fcd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 155.992642 269.881156 
-L 147.665303 276.218767 
-" style="fill:none;stroke:#5fa6d1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 147.665303 276.218767 
-L 139.504177 282.675384 
-" style="fill:none;stroke:#6caed6;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 139.504177 282.675384 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #caddf0; stroke-width: 1.5"/>
+    <path d="M 201.414445 241.359081 
+L 191.650455 246.422869 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3484bf; stroke-width: 1.5"/>
+    <path d="M 191.650455 246.422869 
+L 182.289545 251.89681 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3a8ac2; stroke-width: 1.5"/>
+    <path d="M 182.289545 251.89681 
+L 173.263189 257.676152 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4090c5; stroke-width: 1.5"/>
+    <path d="M 173.263189 257.676152 
+L 164.512976 263.687747 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4a98c9; stroke-width: 1.5"/>
+    <path d="M 164.512976 263.687747 
+L 155.992019 269.880453 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #549fcd; stroke-width: 1.5"/>
+    <path d="M 155.992019 269.880453 
+L 147.664822 276.218216 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5fa6d1; stroke-width: 1.5"/>
+    <path d="M 147.664822 276.218216 
+L 139.503832 282.674998 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #6caed6; stroke-width: 1.5"/>
+    <path d="M 139.503832 282.674998 
 L 131.486897 289.231448 
-" style="fill:none;stroke:#7ab6d9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 82.228966 59.824552 
-L 75.462694 67.106618 
-" style="fill:none;stroke:#63a8d3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 75.462694 67.106618 
-L 67.683811 73.803295 
-" style="fill:none;stroke:#75b4d8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 67.683811 73.803295 
-L 59.00449 79.856284 
-" style="fill:none;stroke:#8dc1dd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 59.00449 79.856284 
-L 57.6 80.741393 
-" style="fill:none;stroke:#a5cde3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 166.468174 256.001539 
-L 157.465004 261.802839 
-" style="fill:none;stroke:#4e9acb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 157.465004 261.802839 
-L 148.653382 267.765678 
-" style="fill:none;stroke:#5aa2cf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 148.653382 267.765678 
-L 140.002365 273.857802 
-" style="fill:none;stroke:#65aad4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 140.002365 273.857802 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #7ab6d9; stroke-width: 1.5"/>
+    <path d="M 82.228966 59.824552 
+L 75.462769 67.106858 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #63a8d3; stroke-width: 1.5"/>
+    <path d="M 75.462769 67.106858 
+L 67.683893 73.803647 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #75b4d8; stroke-width: 1.5"/>
+    <path d="M 67.683893 73.803647 
+L 59.004598 79.857088 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #8dc1dd; stroke-width: 1.5"/>
+    <path d="M 59.004598 79.857088 
+L 57.6 80.742337 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #a5cde3; stroke-width: 1.5"/>
+    <path d="M 166.467136 256.000305 
+L 157.464185 261.801855 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4e9acb; stroke-width: 1.5"/>
+    <path d="M 157.464185 261.801855 
+L 148.652874 267.765052 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5aa2cf; stroke-width: 1.5"/>
+    <path d="M 148.652874 267.765052 
+L 140.002072 273.857437 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #65aad4; stroke-width: 1.5"/>
+    <path d="M 140.002072 273.857437 
 L 131.486897 280.055172 
-" style="fill:none;stroke:#74b3d8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 414.72 144.528057 
-L 410.779525 143.393588 
-" style="fill:none;stroke:#c7dcef;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 410.779525 143.393588 
-L 399.710469 140.130954 
-" style="fill:none;stroke:#bfd8ed;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 399.710469 140.130954 
-L 388.7103 136.741529 
-" style="fill:none;stroke:#a6cee4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 388.7103 136.741529 
-L 377.776552 133.234759 
-" style="fill:none;stroke:#8cc0dd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 158.162304 93.752715 
-L 155.214639 100.837513 
-" style="fill:none;stroke:#1562a9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 155.214639 100.837513 
-L 151.17735 107.314593 
-" style="fill:none;stroke:#1967ad;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 151.17735 107.314593 
-L 145.516893 113.567908 
-" style="fill:none;stroke:#1e6db2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 145.516893 113.567908 
-L 137.457602 119.775469 
-" style="fill:none;stroke:#2474b7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 137.457602 119.775469 
-L 127.945637 125.071644 
-" style="fill:none;stroke:#2f7fbc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 127.945637 125.071644 
-L 117.637879 129.485487 
-" style="fill:none;stroke:#3a8ac2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 117.637879 129.485487 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #74b3d8; stroke-width: 1.5"/>
+    <path d="M 158.156797 93.751165 
+L 155.210101 100.833035 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1562a9; stroke-width: 1.5"/>
+    <path d="M 155.210101 100.833035 
+L 151.171823 107.313032 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1967ad; stroke-width: 1.5"/>
+    <path d="M 151.171823 107.313032 
+L 145.51439 113.56485 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1e6db2; stroke-width: 1.5"/>
+    <path d="M 145.51439 113.56485 
+L 137.456545 119.773034 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2474b7; stroke-width: 1.5"/>
+    <path d="M 137.456545 119.773034 
+L 127.945146 125.070397 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2f7fbc; stroke-width: 1.5"/>
+    <path d="M 127.945146 125.070397 
+L 117.637707 129.485022 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3a8ac2; stroke-width: 1.5"/>
+    <path d="M 117.637707 129.485022 
 L 106.857931 133.234759 
-" style="fill:none;stroke:#4997c9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 192.127854 221.212025 
-L 180.931208 224.208166 
-" style="fill:none;stroke:#3080bd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 180.931208 224.208166 
-L 169.967928 227.656344 
-" style="fill:none;stroke:#3787c0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 169.967928 227.656344 
-L 159.194427 231.424799 
-" style="fill:none;stroke:#3e8ec4;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 159.194427 231.424799 
-L 148.566079 235.417281 
-" style="fill:none;stroke:#4997c9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 148.566079 235.417281 
-L 138.045102 239.56561 
-" style="fill:none;stroke:#56a0ce;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 138.045102 239.56561 
-L 127.601782 243.821693 
-" style="fill:none;stroke:#64a9d3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 127.601782 243.821693 
-L 117.211993 248.150354 
-" style="fill:none;stroke:#75b4d8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 117.211993 248.150354 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4997c9; stroke-width: 1.5"/>
+    <path d="M 192.126881 221.209991 
+L 180.930308 224.206443 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3080bd; stroke-width: 1.5"/>
+    <path d="M 180.930308 224.206443 
+L 169.967078 227.654723 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3787c0; stroke-width: 1.5"/>
+    <path d="M 169.967078 227.654723 
+L 159.193614 231.423239 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3e8ec4; stroke-width: 1.5"/>
+    <path d="M 159.193614 231.423239 
+L 148.565343 235.415852 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4997c9; stroke-width: 1.5"/>
+    <path d="M 148.565343 235.415852 
+L 138.044509 239.564436 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #56a0ce; stroke-width: 1.5"/>
+    <path d="M 138.044509 239.564436 
+L 127.6014 243.820914 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #64a9d3; stroke-width: 1.5"/>
+    <path d="M 127.6014 243.820914 
+L 117.211829 248.150007 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #75b4d8; stroke-width: 1.5"/>
+    <path d="M 117.211829 248.150007 
 L 106.857931 252.526345 
-" style="fill:none;stroke:#8abfdd;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 295.284747 226.874557 
-L 283.577635 225.279378 
-" style="fill:none;stroke:#3a8ac2;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 283.577635 225.279378 
-L 271.831585 223.861451 
-" style="fill:none;stroke:#3383be;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 271.831585 223.861451 
-L 260.027107 222.771485 
-" style="fill:none;stroke:#2e7ebc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 260.027107 222.771485 
-L 248.162085 222.213734 
-" style="fill:none;stroke:#2a7ab9;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 248.162085 222.213734 
-L 236.283766 222.417971 
-" style="fill:none;stroke:#2777b8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 236.283766 222.417971 
-L 224.507319 223.565413 
-" style="fill:none;stroke:#2676b8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 224.507319 223.565413 
-L 212.979278 225.699371 
-" style="fill:none;stroke:#2777b8;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 212.979278 225.699371 
-L 201.800664 228.710177 
-" style="fill:none;stroke:#2b7bba;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 201.800664 228.710177 
-L 190.995346 232.414091 
-" style="fill:none;stroke:#2f7fbc;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 190.995346 232.414091 
-L 180.530648 236.633036 
-" style="fill:none;stroke:#3585bf;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 180.530648 236.633036 
-L 170.351815 241.226688 
-" style="fill:none;stroke:#3c8cc3;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 170.351815 241.226688 
-L 160.40097 246.092132 
-" style="fill:none;stroke:#4493c7;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 160.40097 246.092132 
-L 150.630375 251.157802 
-" style="fill:none;stroke:#4f9bcb;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 150.630375 251.157802 
-L 141.002372 256.373432 
-" style="fill:none;stroke:#5ba3d0;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 141.002372 256.373432 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #8abfdd; stroke-width: 1.5"/>
+    <path d="M 295.286649 226.874997 
+L 283.579429 225.279564 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3a8ac2; stroke-width: 1.5"/>
+    <path d="M 283.579429 225.279564 
+L 271.833132 223.861133 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3383be; stroke-width: 1.5"/>
+    <path d="M 271.833132 223.861133 
+L 260.028418 222.770728 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2e7ebc; stroke-width: 1.5"/>
+    <path d="M 260.028418 222.770728 
+L 248.163045 222.212621 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2a7ab9; stroke-width: 1.5"/>
+    <path d="M 248.163045 222.212621 
+L 236.283995 222.416647 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2777b8; stroke-width: 1.5"/>
+    <path d="M 236.283995 222.416647 
+L 224.506748 223.564292 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2676b8; stroke-width: 1.5"/>
+    <path d="M 224.506748 223.564292 
+L 212.978421 225.698406 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2777b8; stroke-width: 1.5"/>
+    <path d="M 212.978421 225.698406 
+L 201.799727 228.708926 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2b7bba; stroke-width: 1.5"/>
+    <path d="M 201.799727 228.708926 
+L 190.994305 232.412695 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2f7fbc; stroke-width: 1.5"/>
+    <path d="M 190.994305 232.412695 
+L 180.529552 236.631562 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3585bf; stroke-width: 1.5"/>
+    <path d="M 180.529552 236.631562 
+L 170.350791 241.2253 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3c8cc3; stroke-width: 1.5"/>
+    <path d="M 170.350791 241.2253 
+L 160.400282 246.091175 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4493c7; stroke-width: 1.5"/>
+    <path d="M 160.400282 246.091175 
+L 150.630028 251.157295 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4f9bcb; stroke-width: 1.5"/>
+    <path d="M 150.630028 251.157295 
+L 141.002188 256.373152 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5ba3d0; stroke-width: 1.5"/>
+    <path d="M 141.002188 256.373152 
 L 131.486897 261.702621 
-" style="fill:none;stroke:#69add5;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 237.478349 140.56672 
-L 234.437387 136.610747 
-" style="fill:none;stroke:#0d57a1;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 234.437387 136.610747 
-L 232.608198 134.657764 
-" style="fill:none;stroke:#0b559f;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 232.608198 134.657764 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #69add5; stroke-width: 1.5"/>
+    <path d="M 328.518621 215.821241 
+L 317.51703 212.440062 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #529dcc; stroke-width: 1.5"/>
+    <path d="M 317.51703 212.440062 
+L 306.7419 208.677973 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4493c7; stroke-width: 1.5"/>
+    <path d="M 306.7419 208.677973 
+L 296.257324 204.486239 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3a8ac2; stroke-width: 1.5"/>
+    <path d="M 296.257324 204.486239 
+L 286.136303 199.825658 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3282be; stroke-width: 1.5"/>
+    <path d="M 286.136303 199.825658 
+L 276.451919 194.676279 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2a7ab9; stroke-width: 1.5"/>
+    <path d="M 309.762708 190.527513 
+L 300.394894 185.064105 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3585bf; stroke-width: 1.5"/>
+    <path d="M 300.394894 185.064105 
+L 291.575172 179.116138 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2d7dbb; stroke-width: 1.5"/>
+    <path d="M 291.575172 179.116138 
+L 283.362018 172.703657 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2474b7; stroke-width: 1.5"/>
+    <path d="M 283.362018 172.703657 
+L 275.789945 165.866742 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1f6eb3; stroke-width: 1.5"/>
+    <path d="M 237.493177 140.594845 
+L 234.414411 136.593972 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0d57a1; stroke-width: 1.5"/>
+    <path d="M 234.414411 136.593972 
+L 232.626323 134.676837 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0b559f; stroke-width: 1.5"/>
+    <path d="M 232.626323 134.676837 
 L 230.002759 133.234759 
-" style="fill:none;stroke:#0a549e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 230.002759 133.234759 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a549e; stroke-width: 1.5"/>
+    <path d="M 230.002759 133.234759 
 L 230.002759 133.234759 
-" style="fill:none;stroke:#0a549e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 230.002759 133.234759 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a549e; stroke-width: 1.5"/>
+    <path d="M 230.002759 133.234759 
 L 230.002759 133.234759 
-" style="fill:none;stroke:#0a549e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 230.002759 133.234759 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a549e; stroke-width: 1.5"/>
+    <path d="M 230.002759 133.234759 
 L 230.002759 133.234759 
-" style="fill:none;stroke:#0a549e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 230.002759 133.234759 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a549e; stroke-width: 1.5"/>
+    <path d="M 230.002759 133.234759 
 L 230.002759 133.234759 
-" style="fill:none;stroke:#0a549e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 230.002759 133.234759 
-L 227.884095 133.264485 
-" style="fill:none;stroke:#0a549e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 227.884095 133.264485 
-L 225.772093 133.590105 
-" style="fill:none;stroke:#0a549e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 225.772093 133.590105 
-L 222.55003 134.364741 
-" style="fill:none;stroke:#0a549e;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 222.55003 134.364741 
-L 216.321341 136.025848 
-" style="fill:none;stroke:#0b559f;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 216.321341 136.025848 
-L 205.199644 138.948293 
-" style="fill:none;stroke:#0d57a1;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a549e; stroke-width: 1.5"/>
+    <path d="M 230.002759 133.234759 
+L 227.87925 133.268174 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a549e; stroke-width: 1.5"/>
+    <path d="M 227.87925 133.268174 
+L 225.802949 133.585423 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a549e; stroke-width: 1.5"/>
+    <path d="M 225.802949 133.585423 
+L 222.64444 134.342783 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a549e; stroke-width: 1.5"/>
+    <path d="M 222.64444 134.342783 
+L 216.48857 135.981927 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0b559f; stroke-width: 1.5"/>
+    <path d="M 216.48857 135.981927 
+L 205.366452 138.90466 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0d57a1; stroke-width: 1.5"/>
+    <path d="M 301.512133 163.171121 
+L 293.54695 156.584764 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2474b7; stroke-width: 1.5"/>
+    <path d="M 293.54695 156.584764 
+L 286.131699 149.650502 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1e6db2; stroke-width: 1.5"/>
+    <path d="M 286.131699 149.650502 
+L 279.26069 142.411034 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1966ad; stroke-width: 1.5"/>
+    <path d="M 279.26069 142.411034 
+L 272.922084 134.906772 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1460a8; stroke-width: 1.5"/>
    </g>
    <g id="patch_3">
-    <path clip-path="url(#p04f829ae89)" d="M 254.232308 231.303857 
-Q 253.400583 231.411921 254.23193 231.303906 
-" style="fill:none;stroke:#2c7cba;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 258.456279 232.771857 
-L 254.23193 231.303906 
-L 257.9409 228.805198 
-L 258.456279 232.771857 
+    <path d="M 254.227028 231.300644 
+Q 253.395503 231.408653 254.227058 231.30064 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2c7cba; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 258.451356 232.768735 
+L 254.227058 231.30064 
+L 257.936113 228.802058 
+L 258.451356 232.768735 
 z
-" style="fill:#2c7cba;stroke:#2c7cba;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #2c7cba; stroke: #2c7cba; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_4">
-    <path clip-path="url(#p04f829ae89)" d="M 196.804287 266.048129 
-Q 196.369377 266.420003 197.20909 265.701999 
-" style="fill:none;stroke:#3e8ec4;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 201.549001 264.622567 
-L 197.20909 265.701999 
-L 198.949491 261.582411 
-L 201.549001 264.622567 
+    <path d="M 196.802492 266.046933 
+Q 196.367588 266.418811 197.207294 265.700795 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3e8ec4; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 201.54719 264.621305 
+L 197.207294 265.700795 
+L 198.94764 261.581183 
+L 201.54719 264.621305 
 z
-" style="fill:#3e8ec4;stroke:#3e8ec4;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #3e8ec4; stroke: #3e8ec4; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_5">
-    <path clip-path="url(#p04f829ae89)" d="M 257.513164 244.292272 
-Q 256.745399 244.554724 257.564528 244.274714 
-" style="fill:none;stroke:#3282be;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 261.996416 244.873351 
-L 257.564528 244.274714 
-L 260.70257 241.088386 
-L 261.996416 244.873351 
+    <path d="M 257.507088 244.29038 
+Q 256.739533 244.55276 257.558873 244.272677 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3282be; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 261.990762 244.871311 
+L 257.558873 244.272677 
+L 260.696913 241.086346 
+L 261.990762 244.871311 
 z
-" style="fill:#3282be;stroke:#3282be;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #3282be; stroke: #3282be; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_6">
-    <path clip-path="url(#p04f829ae89)" d="M 235.871546 271.67756 
-Q 235.475041 272.044534 236.309338 271.272375 
-" style="fill:none;stroke:#3a8ac2;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 240.603469 270.023199 
-L 236.309338 271.272375 
-L 237.886476 267.087565 
-L 240.603469 270.023199 
+    <path d="M 235.869095 271.676265 
+Q 235.472636 272.04327 236.306867 271.271019 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3a8ac2; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 240.600874 270.02142 
+L 236.306867 271.271019 
+L 237.883592 267.086053 
+L 240.600874 270.02142 
 z
-" style="fill:#3a8ac2;stroke:#3a8ac2;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #3a8ac2; stroke: #3a8ac2; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_7">
-    <path clip-path="url(#p04f829ae89)" d="M 313.067254 252.764528 
-Q 312.137395 252.914246 312.863263 252.797373 
-" style="fill:none;stroke:#56a0ce;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 317.130328 254.136088 
-L 312.863263 252.797373 
-L 316.494474 250.18695 
-L 317.130328 254.136088 
+    <path d="M 313.060122 252.762558 
+Q 312.130243 252.912303 312.856084 252.795415 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #56a0ce; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 317.123183 254.134021 
+L 312.856084 252.795415 
+L 316.487228 250.1849 
+L 317.123183 254.134021 
 z
-" style="fill:#56a0ce;stroke:#56a0ce;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #56a0ce; stroke: #56a0ce; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_8">
-    <path clip-path="url(#p04f829ae89)" d="M 267.208438 279.53459 
-Q 266.792458 279.901519 267.634161 279.159066 
-" style="fill:none;stroke:#4292c6;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 271.956929 278.012909 
-L 267.634161 279.159066 
-L 269.310896 275.013158 
-L 271.956929 278.012909 
+    <path d="M 267.205816 279.532887 
+Q 266.78987 279.899851 267.631511 279.157323 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4292c6; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 271.95418 278.010791 
+L 267.631511 279.157323 
+L 269.307887 275.011269 
+L 271.95418 278.010791 
 z
-" style="fill:#4292c6;stroke:#4292c6;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #4292c6; stroke: #4292c6; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_9">
-    <path clip-path="url(#p04f829ae89)" d="M 337.157502 265.402003 
-Q 336.255909 265.593131 336.994909 265.436471 
-" style="fill:none;stroke:#7ab6d9;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 341.322711 266.563471 
-L 336.994909 265.436471 
-L 340.493191 262.650429 
-L 341.322711 266.563471 
+    <path d="M 337.158519 265.399541 
+Q 336.256914 265.590643 336.995912 265.434007 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #7ab6d9; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 341.323681 266.561136 
+L 336.995912 265.434007 
+L 340.494276 262.64807 
+L 341.323681 266.561136 
 z
-" style="fill:#7ab6d9;stroke:#7ab6d9;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #7ab6d9; stroke: #7ab6d9; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_10">
-    <path clip-path="url(#p04f829ae89)" d="M 344.985343 276.139917 
-Q 344.143179 276.391711 344.907786 276.163105 
-" style="fill:none;stroke:#8dc1dd;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 349.313071 276.933472 
-L 344.907786 276.163105 
-L 348.16725 273.101097 
-L 349.313071 276.933472 
+    <path d="M 344.985397 276.138494 
+Q 344.143217 276.390295 344.907808 276.161692 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #8dc1dd; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 349.313095 276.932049 
+L 344.907808 276.161692 
+L 348.167266 273.099677 
+L 349.313095 276.932049 
 z
-" style="fill:#8dc1dd;stroke:#8dc1dd;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #8dc1dd; stroke: #8dc1dd; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_11">
-    <path clip-path="url(#p04f829ae89)" d="M 337.947099 285.561998 
-Q 337.223488 285.885394 338.030975 285.524512 
-" style="fill:none;stroke:#87bddc;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 342.498908 285.718356 
-L 338.030975 285.524512 
-L 340.866809 282.066472 
-L 342.498908 285.718356 
+    <path d="M 337.946937 285.560328 
+Q 337.223311 285.883744 338.030773 285.522858 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #87bddc; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 342.498709 285.71663 
+L 338.030773 285.522858 
+L 340.866553 282.064773 
+L 342.498709 285.71663 
 z
-" style="fill:#87bddc;stroke:#87bddc;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #87bddc; stroke: #87bddc; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_12">
-    <path clip-path="url(#p04f829ae89)" d="M 377.353527 285.930135 
-Q 376.483199 286.157027 377.235683 285.960856 
-" style="fill:none;stroke:#c7dbef;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 381.610847 286.887106 
-L 377.235683 285.960856 
-L 380.601782 283.016475 
-L 381.610847 286.887106 
+    <path d="M 377.353782 285.929306 
+Q 376.483447 286.1562 377.235923 285.960032 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c7dbef; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 381.611087 286.886284 
+L 377.235923 285.960032 
+L 380.602024 283.015652 
+L 381.611087 286.886284 
 z
-" style="fill:#c7dbef;stroke:#c7dbef;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #c7dbef; stroke: #c7dbef; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_13">
-    <path clip-path="url(#p04f829ae89)" d="M 382.338347 295.345206 
-Q 381.516304 295.613717 382.288425 295.361512 
-" style="fill:none;stroke:#cfe1f2;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 386.711715 296.020683 
-L 382.288425 295.361512 
-L 385.469735 292.218382 
-L 386.711715 296.020683 
+    <path d="M 382.338786 295.344296 
+Q 381.516726 295.61283 382.288819 295.360618 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #cfe1f2; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 386.712122 296.019707 
+L 382.288819 295.360618 
+L 385.470071 292.21743 
+L 386.712122 296.019707 
 z
-" style="fill:#cfe1f2;stroke:#cfe1f2;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #cfe1f2; stroke: #cfe1f2; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_14">
-    <path clip-path="url(#p04f829ae89)" d="M 397.369972 300.642213 
-Q 396.537729 300.903025 397.305794 300.662325 
-" style="fill:none;stroke:#e1edf8;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 401.72084 301.374626 
-L 397.305794 300.662325 
-L 400.524663 297.55767 
-L 401.72084 301.374626 
+    <path d="M 397.370208 300.641776 
+Q 396.537955 300.902604 397.306003 300.661898 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #e1edf8; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 401.721058 301.374143 
+L 397.306003 300.661898 
+L 400.524832 297.557201 
+L 401.721058 301.374143 
 z
-" style="fill:#e1edf8;stroke:#e1edf8;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #e1edf8; stroke: #e1edf8; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_15">
-    <path clip-path="url(#p04f829ae89)" d="M 354.822499 223.676607 
-Q 353.923529 223.475919 354.66132 223.640625 
-" style="fill:none;stroke:#7fb9da;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 358.129465 226.464093 
-L 354.66132 223.640625 
-L 359.000981 222.56019 
-L 358.129465 226.464093 
+    <path d="M 337.820718 83.220341 
+Q 337.223684 83.581937 338.06112 83.074741 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2474b7; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 342.518622 82.713255 
+L 338.06112 83.074741 
+L 340.446433 79.291848 
+L 342.518622 82.713255 
 z
-" style="fill:#7fb9da;stroke:#7fb9da;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #2474b7; stroke: #2474b7; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_16">
-    <path clip-path="url(#p04f829ae89)" d="M 344.908693 208.103079 
-Q 344.097336 207.82487 344.872361 208.090621 
-" style="fill:none;stroke:#65aad4;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 348.007391 211.279914 
-L 344.872361 208.090621 
-L 349.304813 207.496173 
-L 348.007391 211.279914 
+    <path d="M 343.912036 59.817453 
+Q 343.718105 60.128995 344.410438 59.016796 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2070b4; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 348.222211 56.677911 
+L 344.410438 59.016796 
+L 344.826393 54.564046 
+L 348.222211 56.677911 
 z
-" style="fill:#65aad4;stroke:#65aad4;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #2070b4; stroke: #2070b4; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_17">
-    <path clip-path="url(#p04f829ae89)" d="M 316.273245 181.591225 
-Q 315.676521 181.229025 316.513422 181.737007 
-" style="fill:none;stroke:#3888c1;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 318.895067 185.522211 
-L 316.513422 181.737007 
-L 320.970572 182.102813 
-L 318.895067 185.522211 
+    <path d="M 327.156263 52.277578 
+Q 327.115199 52.507243 327.36931 51.086038 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #115ca5; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 330.042122 47.500501 
+L 327.36931 51.086038 
+L 326.104567 46.796466 
+L 330.042122 47.500501 
 z
-" style="fill:#3888c1;stroke:#3888c1;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #115ca5; stroke: #115ca5; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_18">
-    <path clip-path="url(#p04f829ae89)" d="M 337.409738 179.960981 
-Q 336.743365 179.616002 337.566302 180.042034 
-" style="fill:none;stroke:#4d99ca;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 340.199029 183.657106 
-L 337.566302 180.042034 
-L 342.037996 180.104896 
-L 340.199029 183.657106 
+    <path d="M 305.990593 70.013254 
+Q 305.981617 70.229681 306.042132 68.770498 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #09529d; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 308.206158 64.856805 
+L 306.042132 68.770498 
+L 304.209593 64.691062 
+L 308.206158 64.856805 
 z
-" style="fill:#4d99ca;stroke:#4d99ca;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #09529d; stroke: #09529d; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_19">
-    <path clip-path="url(#p04f829ae89)" d="M 379.75166 186.809131 
-Q 378.956025 186.521472 379.737528 186.804021 
-" style="fill:none;stroke:#9cc9e1;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 382.819209 190.044892 
-L 379.737528 186.804021 
-L 384.179233 186.283199 
-L 382.819209 190.044892 
+    <path d="M 296.595561 69.824767 
+Q 296.617882 70.045526 296.471492 68.597743 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084c95; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 298.058945 64.416835 
+L 296.471492 68.597743 
+L 294.079238 64.819235 
+L 298.058945 64.416835 
 z
-" style="fill:#9cc9e1;stroke:#9cc9e1;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #084c95; stroke: #084c95; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_20">
-    <path clip-path="url(#p04f829ae89)" d="M 339.143101 158.909657 
-Q 338.500917 158.556718 339.328445 159.011521 
-" style="fill:none;stroke:#4594c7;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 341.870622 162.690833 
-L 339.328445 159.011521 
-L 343.797201 159.185366 
-L 341.870622 162.690833 
+    <path d="M 275.738486 69.283785 
+Q 275.816475 69.535585 275.398292 68.185414 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084285; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 276.125316 63.772769 
+L 275.398292 68.185414 
+L 272.304391 64.956208 
+L 276.125316 63.772769 
 z
-" style="fill:#4594c7;stroke:#4594c7;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #084285; stroke: #084285; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_21">
-    <path clip-path="url(#p04f829ae89)" d="M 380.233123 167.593114 
-Q 379.457727 167.292284 380.245836 167.598046 
-" style="fill:none;stroke:#91c3de;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 383.251609 170.90944 
-L 380.245836 167.598046 
-L 384.698415 167.180265 
-L 383.251609 170.90944 
+    <path d="M 261.245162 60.530144 
+Q 261.339801 60.79073 260.861958 59.475003 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083979; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 261.376374 55.032551 
+L 260.861958 59.475003 
+L 257.616646 56.398 
+L 261.376374 55.032551 
 z
-" style="fill:#91c3de;stroke:#91c3de;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #083979; stroke: #083979; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_22">
-    <path clip-path="url(#p04f829ae89)" d="M 349.162141 145.239232 
-Q 348.457753 144.904819 349.268351 145.289656 
-" style="fill:none;stroke:#4b98ca;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 352.024049 148.811889 
-L 349.268351 145.289656 
-L 353.739557 145.198437 
-L 352.024049 148.811889 
+    <path d="M 249.142696 60.487968 
+Q 249.243875 60.750979 248.742919 59.448763 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083776; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 249.173386 54.997393 
+L 248.742919 59.448763 
+L 245.440103 56.433567 
+L 249.173386 54.997393 
 z
-" style="fill:#4b98ca;stroke:#4b98ca;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #083776; stroke: #083776; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_23">
-    <path clip-path="url(#p04f829ae89)" d="M 380.213013 149.272897 
-Q 379.427285 148.978709 380.212131 149.272567 
-" style="fill:none;stroke:#85bcdc;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 383.256885 152.548154 
-L 380.212131 149.272567 
-L 384.659453 148.802116 
-L 383.256885 152.548154 
+    <path d="M 240.033382 69.019234 
+Q 240.143752 69.28884 239.618756 68.006412 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #083979; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 239.954228 63.546876 
+L 239.618756 68.006412 
+L 236.252411 65.062313 
+L 239.954228 63.546876 
 z
-" style="fill:#85bcdc;stroke:#85bcdc;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #083979; stroke: #083979; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_24">
-    <path clip-path="url(#p04f829ae89)" d="M 390.845538 144.138468 
-Q 390.026284 143.863598 390.796978 144.122175 
-" style="fill:none;stroke:#9ac8e0;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 393.953055 147.290641 
-L 390.796978 144.122175 
-L 395.225397 143.498393 
-L 393.953055 147.290641 
+    <path d="M 234.061611 86.08551 
+Q 234.188963 86.36599 233.622972 85.119455 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084184; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 233.79032 80.650451 
+L 233.622972 85.119455 
+L 230.148177 82.304174 
+L 233.79032 80.650451 
 z
-" style="fill:#9ac8e0;stroke:#9ac8e0;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #084184; stroke: #084184; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_25">
-    <path clip-path="url(#p04f829ae89)" d="M 356.848012 117.585344 
-Q 355.975999 117.357362 356.726502 117.553576 
-" style="fill:none;stroke:#4997c9;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 360.090547 120.500303 
-L 356.726502 117.553576 
-L 361.102311 116.630376 
-L 360.090547 120.500303 
+    <path d="M 219.803219 86.490212 
+Q 219.905176 86.753048 219.40062 85.452349 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #084387; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 219.818624 80.999791 
+L 219.40062 85.452349 
+L 216.089376 82.446411 
+L 219.818624 80.999791 
 z
-" style="fill:#4997c9;stroke:#4997c9;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #084387; stroke: #084387; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_26">
-    <path clip-path="url(#p04f829ae89)" d="M 401.394255 121.006483 
-Q 400.497592 120.799977 401.235199 120.969851 
-" style="fill:none;stroke:#a5cde3;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 404.684301 123.81655 
-L 401.235199 120.969851 
-L 405.582019 119.918588 
-L 404.684301 123.81655 
+    <path d="M 193.336295 140.041249 
+Q 193.089424 140.117502 194.444908 139.698824 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #125ea6; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 198.856989 140.429266 
+L 194.444908 139.698824 
+L 197.67651 136.607425 
+L 198.856989 140.429266 
 z
-" style="fill:#a5cde3;stroke:#a5cde3;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #125ea6; stroke: #125ea6; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_27">
-    <path clip-path="url(#p04f829ae89)" d="M 377.496629 101.210446 
-Q 376.534594 101.128446 377.243551 101.188874 
-" style="fill:none;stroke:#64a9d3;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 381.059243 103.521361 
-L 377.243551 101.188874 
-L 381.398956 99.535813 
-L 381.059243 103.521361 
+    <path d="M 185.071104 120.398058 
+Q 184.81031 120.854202 185.381904 119.854451 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0f5aa3; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 189.103521 117.374619 
+L 185.381904 119.854451 
+L 185.631009 115.389258 
+L 189.103521 117.374619 
 z
-" style="fill:#64a9d3;stroke:#64a9d3;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #0f5aa3; stroke: #0f5aa3; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_28">
-    <path clip-path="url(#p04f829ae89)" d="M 388.922957 87.66236 
-Q 387.951454 87.70859 388.655107 87.675106 
-" style="fill:none;stroke:#74b3d8;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 392.74565 89.482717 
-L 388.655107 87.675106 
-L 392.555522 85.487238 
-L 392.74565 89.482717 
+    <path d="M 157.147197 118.197991 
+Q 156.432389 118.834407 156.970127 118.355642 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1c6ab0; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 161.287554 117.189527 
+L 156.970127 118.355642 
+L 158.627691 114.202032 
+L 161.287554 117.189527 
 z
-" style="fill:#74b3d8;stroke:#74b3d8;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #1c6ab0; stroke: #1c6ab0; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_29">
-    <path clip-path="url(#p04f829ae89)" d="M 389.698821 73.80189 
-Q 388.807597 74.007211 389.550616 73.836034 
-" style="fill:none;stroke:#6caed6;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 393.897512 74.886984 
-L 389.550616 73.836034 
-L 392.999513 70.989087 
-L 393.897512 74.886984 
+    <path d="M 142.827202 103.706195 
+Q 142.660299 103.894345 143.606296 102.827922 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2171b5; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 147.756883 101.162802 
+L 143.606296 102.827922 
+L 144.764552 98.50838 
+L 147.756883 101.162802 
 z
-" style="fill:#6caed6;stroke:#6caed6;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #2171b5; stroke: #2171b5; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_30">
-    <path clip-path="url(#p04f829ae89)" d="M 392.047168 60.0155 
-Q 391.313968 60.33589 392.117506 59.984764 
-" style="fill:none;stroke:#69add5;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 396.583672 60.215773 
-L 392.117506 59.984764 
-L 394.982013 56.550437 
-L 396.583672 60.215773 
+    <path d="M 127.069406 94.366204 
+Q 126.790354 94.669759 127.646278 93.738677 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2d7dbb; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 131.825743 92.147431 
+L 127.646278 93.738677 
+L 128.88096 89.440357 
+L 131.825743 92.147431 
 z
-" style="fill:#69add5;stroke:#69add5;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #2d7dbb; stroke: #2d7dbb; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_31">
-    <path clip-path="url(#p04f829ae89)" d="M 380.675236 49.391924 
-Q 380.22027 49.764342 381.063027 49.074493 
-" style="fill:none;stroke:#4e9acb;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 385.425108 48.088462 
-L 381.063027 49.074493 
-L 382.891451 44.99321 
-L 385.425108 48.088462 
+    <path d="M 113.702095 85.197211 
+Q 113.375737 85.550928 114.186607 84.672082 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3888c1; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 118.368971 83.088468 
+L 114.186607 84.672082 
+L 115.429135 80.376022 
+L 118.368971 83.088468 
 z
-" style="fill:#4e9acb;stroke:#4e9acb;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #3888c1; stroke: #3888c1; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_32">
-    <path clip-path="url(#p04f829ae89)" d="M 338.784707 67.767803 
-Q 338.543364 68.097692 339.292231 67.074073 
-" style="fill:none;stroke:#1f6eb3;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 343.268172 65.02666 
-L 339.292231 67.074073 
-L 340.039865 62.664873 
-L 343.268172 65.02666 
+    <path d="M 102.223135 76.255498 
+Q 101.902002 76.608981 102.708563 75.72117 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4493c7; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 106.878596 74.105365 
+L 102.708563 75.72117 
+L 103.917939 71.415661 
+L 106.878596 74.105365 
 z
-" style="fill:#1f6eb3;stroke:#1f6eb3;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #4493c7; stroke: #4493c7; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_33">
-    <path clip-path="url(#p04f829ae89)" d="M 327.155701 52.277029 
-Q 327.114612 52.506662 327.368914 51.085464 
-" style="fill:none;stroke:#115ca5;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 330.042196 47.500277 
-L 327.368914 51.085464 
-L 326.104734 46.795727 
-L 330.042196 47.500277 
+    <path d="M 92.239699 67.565037 
+Q 91.928771 67.915925 92.73007 67.011643 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #519ccc; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 96.879762 65.344292 
+L 92.73007 67.011643 
+L 93.886004 62.691479 
+L 96.879762 65.344292 
 z
-" style="fill:#115ca5;stroke:#115ca5;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #519ccc; stroke: #519ccc; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_34">
-    <path clip-path="url(#p04f829ae89)" d="M 305.823318 61.149484 
-Q 305.831296 61.370792 305.778857 59.916137 
-" style="fill:none;stroke:#084f99;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 307.633456 55.846682 
-L 305.778857 59.916137 
-L 303.636053 55.990785 
-L 307.633456 55.846682 
+    <path d="M 75.663909 50.952092 
+Q 75.377792 51.29656 76.16322 50.350954 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #68acd5; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 80.257509 48.551844 
+L 76.16322 50.350954 
+L 77.180505 45.996057 
+L 80.257509 48.551844 
 z
-" style="fill:#084f99;stroke:#084f99;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #68acd5; stroke: #68acd5; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_35">
-    <path clip-path="url(#p04f829ae89)" d="M 296.59227 69.824025 
-Q 296.614543 70.044758 296.468451 68.596914 
-" style="fill:none;stroke:#084c95;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 298.056773 64.416336 
-L 296.468451 68.596914 
-L 294.076982 64.817909 
-L 298.056773 64.416336 
+    <path d="M 125.586299 168.717085 
+Q 124.647577 168.859848 125.366841 168.750461 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4e9acb; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 129.622077 170.126314 
+L 125.366841 168.750461 
+L 129.020665 166.171785 
+L 129.622077 170.126314 
 z
-" style="fill:#084c95;stroke:#084c95;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #4e9acb; stroke: #4e9acb; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_36">
-    <path clip-path="url(#p04f829ae89)" d="M 275.735246 69.284107 
-Q 275.813214 69.535907 275.39513 68.185699 
-" style="fill:none;stroke:#084285;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 276.122484 63.773108 
-L 275.39513 68.185699 
-L 272.30147 64.956261 
-L 276.122484 63.773108 
+    <path d="M 125.616972 177.985212 
+Q 124.675024 178.121277 125.392899 178.017579 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #539ecd; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 129.637743 179.425166 
+L 125.392899 178.017579 
+L 129.065875 175.466256 
+L 129.637743 179.425166 
 z
-" style="fill:#084285;stroke:#084285;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #539ecd; stroke: #539ecd; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_37">
-    <path clip-path="url(#p04f829ae89)" d="M 261.242752 60.53057 
-Q 261.337365 60.791161 260.859643 59.475385 
-" style="fill:none;stroke:#083979;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 261.374468 55.032981 
-L 260.859643 59.475385 
-L 257.614614 56.398082 
-L 261.374468 55.032981 
+    <path d="M 102.160303 190.267997 
+Q 101.227454 190.4177 101.95047 190.301671 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #81badb; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 106.21684 191.642598 
+L 101.95047 190.301671 
+L 105.583033 187.693131 
+L 106.21684 191.642598 
 z
-" style="fill:#083979;stroke:#083979;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #81badb; stroke: #81badb; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_38">
-    <path clip-path="url(#p04f829ae89)" d="M 249.1422 60.488067 
-Q 249.243357 60.751083 248.742503 59.448824 
-" style="fill:none;stroke:#083776;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 249.173321 54.997488 
-L 248.742503 59.448824 
-L 245.439925 56.433368 
-L 249.173321 54.997488 
+    <path d="M 90.37704 200.852502 
+Q 89.449999 201.016559 90.174349 200.888372 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #9fcae1; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 94.461669 202.160727 
+L 90.174349 200.888372 
+L 93.764626 198.221929 
+L 94.461669 202.160727 
 z
-" style="fill:#083776;stroke:#083776;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #9fcae1; stroke: #9fcae1; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_39">
-    <path clip-path="url(#p04f829ae89)" d="M 240.029545 69.02 
-Q 240.139863 69.289618 239.615098 68.007086 
-" style="fill:none;stroke:#083979;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 239.951383 63.547611 
-L 239.615098 68.007086 
-L 236.249289 65.062373 
-L 239.951383 63.547611 
+    <path d="M 124.734724 202.725465 
+Q 123.814372 202.897822 124.542414 202.761479 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #60a7d2; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 128.842211 203.991013 
+L 124.542414 202.761479 
+L 128.105919 200.059362 
+L 128.842211 203.991013 
 z
-" style="fill:#083979;stroke:#083979;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #60a7d2; stroke: #60a7d2; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_40">
-    <path clip-path="url(#p04f829ae89)" d="M 230.469425 77.647726 
-Q 230.581694 77.91689 230.048368 76.638246 
-" style="fill:none;stroke:#083d7f;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 230.354404 72.176593 
-L 230.048368 76.638246 
-L 226.662668 73.716426 
-L 230.354404 72.176593 
+    <path d="M 192.52123 204.893958 
+Q 191.559775 204.975393 192.269388 204.915289 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2979b9; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 196.423912 206.570564 
+L 192.269388 204.915289 
+L 196.086322 202.584835 
+L 196.423912 206.570564 
 z
-" style="fill:#083d7f;stroke:#083d7f;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #2979b9; stroke: #2979b9; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_41">
-    <path clip-path="url(#p04f829ae89)" d="M 219.798256 86.490788 
-Q 219.90013 86.753636 219.395945 85.452772 
-" style="fill:none;stroke:#084387;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 219.815246 81.000336 
-L 219.395945 85.452772 
-L 216.085577 82.44587 
-L 219.815246 81.000336 
+    <path d="M 100.088914 231.107792 
+Q 99.237023 231.354445 99.996021 231.134688 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #9dcae1; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 104.39444 231.94333 
+L 99.996021 231.134688 
+L 103.281987 228.101137 
+L 104.39444 231.94333 
 z
-" style="fill:#084387;stroke:#084387;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #9dcae1; stroke: #9dcae1; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_42">
-    <path clip-path="url(#p04f829ae89)" d="M 193.263189 140.05193 
-Q 193.005035 140.131602 194.349353 139.716716 
-" style="fill:none;stroke:#125ea6;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 198.761263 140.448186 
-L 194.349353 139.716716 
-L 197.581675 136.62607 
-L 198.761263 140.448186 
+    <path d="M 297.893637 293.04634 
+Q 297.457256 293.41662 298.299616 292.701856 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5ba3d0; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 302.643582 291.638859 
+L 298.299616 292.701856 
+L 300.055598 288.588885 
+L 302.643582 291.638859 
 z
-" style="fill:#125ea6;stroke:#125ea6;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #5ba3d0; stroke: #5ba3d0; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_43">
-    <path clip-path="url(#p04f829ae89)" d="M 185.050913 120.38977 
-Q 184.789827 120.846102 185.361573 119.846793 
-" style="fill:none;stroke:#0f5aa3;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 189.083948 117.368098 
-L 185.361573 119.846793 
-L 185.612042 115.381676 
-L 189.083948 117.368098 
+    <path d="M 388.764125 232.097333 
+Q 387.831598 231.946684 388.554659 232.063494 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #c2d9ee; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 392.184499 234.675823 
+L 388.554659 232.063494 
+L 392.822426 230.727019 
+L 392.184499 234.675823 
 z
-" style="fill:#0f5aa3;stroke:#0f5aa3;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #c2d9ee; stroke: #c2d9ee; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_44">
-    <path clip-path="url(#p04f829ae89)" d="M 157.131514 118.192802 
-Q 156.416237 118.829464 156.953655 118.351112 
-" style="fill:none;stroke:#1c6ab0;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 161.271238 117.185576 
-L 156.953655 118.351112 
-L 158.611776 114.197724 
-L 161.271238 117.185576 
+    <path d="M 343.845638 210.92319 
+Q 343.022221 210.655661 343.793783 210.906342 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #65aad4; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 346.980027 214.04447 
+L 343.793783 210.906342 
+L 348.216031 210.240223 
+L 346.980027 214.04447 
 z
-" style="fill:#1c6ab0;stroke:#1c6ab0;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #65aad4; stroke: #65aad4; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_45">
-    <path clip-path="url(#p04f829ae89)" d="M 142.817789 103.701175 
-Q 142.650816 103.889367 143.596863 102.823093 
-" style="fill:none;stroke:#2171b5;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 147.74761 101.15837 
-L 143.596863 102.823093 
-L 144.755533 98.503662 
-L 147.74761 101.15837 
+    <path d="M 345.114462 199.09924 
+Q 344.348387 198.793625 345.139986 199.109423 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #61a7d2; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 348.114174 202.449214 
+L 345.139986 199.109423 
+L 349.596332 198.733947 
+L 348.114174 202.449214 
 z
-" style="fill:#2171b5;stroke:#2171b5;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #61a7d2; stroke: #61a7d2; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_46">
-    <path clip-path="url(#p04f829ae89)" d="M 127.065671 94.362943 
-Q 126.786673 94.666421 127.642689 93.735296 
-" style="fill:none;stroke:#2d7dbb;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 131.822203 92.144178 
-L 127.642689 93.735296 
-L 128.877503 89.437014 
-L 131.822203 92.144178 
+    <path d="M 367.341429 196.169085 
+Q 366.54551 195.881933 367.327114 196.163921 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #87bddc; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 370.41099 199.402703 
+L 367.327114 196.163921 
+L 371.768466 195.64009 
+L 370.41099 199.402703 
 z
-" style="fill:#2d7dbb;stroke:#2d7dbb;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #87bddc; stroke: #87bddc; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_47">
-    <path clip-path="url(#p04f829ae89)" d="M 113.699002 85.193902 
-Q 113.372641 85.547597 114.183552 84.668768 
-" style="fill:none;stroke:#3888c1;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 118.365972 83.085303 
-L 114.183552 84.668768 
-L 115.426232 80.372753 
-L 118.365972 83.085303 
+    <path d="M 347.094449 177.347383 
+Q 346.402583 177.010676 347.218675 177.407839 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #58a1cf; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 349.940175 180.956562 
+L 347.218675 177.407839 
+L 351.690554 177.359872 
+L 349.940175 180.956562 
 z
-" style="fill:#3888c1;stroke:#3888c1;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #58a1cf; stroke: #58a1cf; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_48">
-    <path clip-path="url(#p04f829ae89)" d="M 102.221037 76.252844 
-Q 101.899903 76.606313 102.706489 75.718512 
-" style="fill:none;stroke:#4493c7;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 106.876557 74.102798 
-L 102.706489 75.718512 
-L 103.915958 71.413029 
-L 106.876557 74.102798 
+    <path d="M 357.809539 171.951758 
+Q 357.093373 171.624482 357.902534 171.994256 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #65aad4; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 360.709368 175.475876 
+L 357.902534 171.994256 
+L 362.371931 171.837761 
+L 360.709368 175.475876 
 z
-" style="fill:#4493c7;stroke:#4493c7;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #65aad4; stroke: #65aad4; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_49">
-    <path clip-path="url(#p04f829ae89)" d="M 92.238558 67.563339 
-Q 91.927629 67.914211 92.728957 67.009941 
-" style="fill:none;stroke:#519ccc;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 96.878692 65.342697 
-L 92.728957 67.009941 
-L 93.885003 62.689807 
-L 96.878692 65.342697 
+    <path d="M 400.505535 178.489568 
+Q 399.683978 178.218638 400.455103 178.472937 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #bfd8ed; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 403.627498 181.625065 
+L 400.455103 178.472937 
+L 404.880243 177.826298 
+L 403.627498 181.625065 
 z
-" style="fill:#519ccc;stroke:#519ccc;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #bfd8ed; stroke: #bfd8ed; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_50">
-    <path clip-path="url(#p04f829ae89)" d="M 75.66361 50.951446 
-Q 75.377484 51.295891 76.162963 50.350311 
-" style="fill:none;stroke:#68acd5;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 80.257332 48.551383 
-L 76.162963 50.350311 
-L 77.180443 45.995459 
-L 80.257332 48.551383 
+    <path d="M 348.022655 148.393073 
+Q 347.331908 148.054894 348.147383 148.454138 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4b98ca; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 350.860503 152.009272 
+L 348.147383 148.454138 
+L 352.619362 148.416722 
+L 350.860503 152.009272 
 z
-" style="fill:#68acd5;stroke:#68acd5;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #4b98ca; stroke: #4b98ca; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_51">
-    <path clip-path="url(#p04f829ae89)" d="M 125.586493 168.717828 
-Q 124.647766 168.860571 125.367031 168.751199 
-" style="fill:none;stroke:#4e9acb;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 129.622238 170.127139 
-L 125.367031 168.751199 
-L 129.020907 166.172597 
-L 129.622238 170.127139 
+    <path d="M 400.511082 160.127635 
+Q 399.691924 159.852649 400.462627 160.111369 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #b7d4ea; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 403.618184 163.280354 
+L 400.462627 160.111369 
+L 404.891149 159.488315 
+L 403.618184 163.280354 
 z
-" style="fill:#4e9acb;stroke:#4e9acb;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #b7d4ea; stroke: #b7d4ea; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_52">
-    <path clip-path="url(#p04f829ae89)" d="M 125.617145 177.9859 
-Q 124.675193 178.121949 125.39307 178.018264 
-" style="fill:none;stroke:#539ecd;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 129.637889 179.425927 
-L 125.39307 178.018264 
-L 129.066091 175.467007 
-L 129.637889 179.425927 
+    <path d="M 357.572956 135.594527 
+Q 356.806791 135.28865 357.598141 135.604581 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #539ecd; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 360.571481 138.945127 
+L 357.598141 135.604581 
+L 362.054582 135.230236 
+L 360.571481 138.945127 
 z
-" style="fill:#539ecd;stroke:#539ecd;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #539ecd; stroke: #539ecd; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_53">
-    <path clip-path="url(#p04f829ae89)" d="M 102.160425 190.268425 
-Q 101.227574 190.418119 101.950589 190.302097 
-" style="fill:none;stroke:#81badb;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 106.216947 191.643063 
-L 101.950589 190.302097 
-L 105.583177 187.69359 
-L 106.216947 191.643063 
+    <path d="M 400.496561 141.821788 
+Q 399.656978 141.56263 400.419843 141.798107 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #add0e6; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 403.652016 144.888909 
+L 400.419843 141.798107 
+L 404.831788 141.06685 
+L 403.652016 144.888909 
 z
-" style="fill:#81badb;stroke:#81badb;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #add0e6; stroke: #add0e6; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_54">
-    <path clip-path="url(#p04f829ae89)" d="M 90.377134 200.852817 
-Q 89.450089 201.01686 90.174439 200.888684 
-" style="fill:none;stroke:#9fcae1;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 94.46174 202.161105 
-L 90.174439 200.888684 
-L 93.764756 198.222296 
-L 94.46174 202.161105 
+    <path d="M 367.178574 123.080439 
+Q 366.328236 122.830908 367.087095 123.053594 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #5ca4d0; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 370.362098 126.098977 
+L 367.087095 123.053594 
+L 371.488403 122.260821 
+L 370.362098 126.098977 
 z
-" style="fill:#9fcae1;stroke:#9fcae1;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #5ca4d0; stroke: #5ca4d0; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_55">
-    <path clip-path="url(#p04f829ae89)" d="M 124.734924 202.726088 
-Q 123.814571 202.898441 124.542614 202.762102 
-" style="fill:none;stroke:#60a7d2;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 128.842405 203.991653 
-L 124.542614 202.762102 
-L 128.106129 200.059999 
-L 128.842405 203.991653 
+    <path d="M 389.151307 120.824475 
+Q 388.264469 120.60781 389.006766 120.789162 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #89bedc; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 392.417821 123.681342 
+L 389.006766 120.789162 
+L 393.367143 119.795627 
+L 392.417821 123.681342 
 z
-" style="fill:#60a7d2;stroke:#60a7d2;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #89bedc; stroke: #89bedc; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_56">
-    <path clip-path="url(#p04f829ae89)" d="M 192.521426 204.895753 
-Q 191.559983 204.977189 192.269607 204.917083 
-" style="fill:none;stroke:#2979b9;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 196.424134 206.572349 
-L 192.269607 204.917083 
-L 196.086536 202.586621 
-L 196.424134 206.572349 
+    <path d="M 376.957194 102.498359 
+Q 375.997293 102.403514 376.706316 102.473571 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #63a8d3; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 380.490274 104.857194 
+L 376.706316 102.473571 
+L 380.88359 100.876578 
+L 380.490274 104.857194 
 z
-" style="fill:#2979b9;stroke:#2979b9;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #63a8d3; stroke: #63a8d3; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_57">
-    <path clip-path="url(#p04f829ae89)" d="M 100.089035 231.108138 
-Q 99.237139 231.354777 99.996139 231.135033 
-" style="fill:none;stroke:#9dcae1;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 104.394545 231.943751 
-L 99.996139 231.135033 
-L 103.282157 228.101539 
-L 104.394545 231.943751 
+    <path d="M 400.410813 96.402052 
+Q 399.440661 96.33999 400.144138 96.384992 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #95c5df; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 404.008297 98.636275 
+L 400.144138 96.384992 
+L 404.263659 94.644434 
+L 404.008297 98.636275 
 z
-" style="fill:#9dcae1;stroke:#9dcae1;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #95c5df; stroke: #95c5df; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_58">
-    <path clip-path="url(#p04f829ae89)" d="M 297.89371 293.046436 
-Q 297.457324 293.416709 298.299695 292.701957 
-" style="fill:none;stroke:#5ba3d0;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 302.643676 291.639023 
-L 298.299695 292.701957 
-L 300.055737 288.589012 
-L 302.643676 291.639023 
+    <path d="M 388.511388 87.697508 
+Q 387.539955 87.744535 388.243612 87.710471 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #72b2d8; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 392.335639 89.51472 
+L 388.243612 87.710471 
+L 392.142227 85.519398 
+L 392.335639 89.51472 
 z
-" style="fill:#5ba3d0;stroke:#5ba3d0;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #72b2d8; stroke: #72b2d8; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_59">
-    <path clip-path="url(#p04f829ae89)" d="M 400.410816 96.402064 
-Q 399.440665 96.340009 400.144145 96.385007 
-" style="fill:none;stroke:#95c5df;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 404.008318 98.636265 
-L 400.144145 96.385007 
-L 404.263656 94.644423 
-L 404.008318 98.636265 
+    <path d="M 400.417393 78.413798 
+Q 399.466444 78.527013 400.180785 78.441968 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #8abfdd; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 404.389174 79.955065 
+L 400.180785 78.441968 
+L 403.916296 75.983115 
+L 404.389174 79.955065 
 z
-" style="fill:#95c5df;stroke:#95c5df;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #8abfdd; stroke: #8abfdd; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_60">
-    <path clip-path="url(#p04f829ae89)" d="M 316.1346 52.643491 
-Q 316.126887 52.86479 316.177588 51.410056 
-" style="fill:none;stroke:#0a539e;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 318.315699 47.482146 
-L 316.177588 51.410056 
-L 314.318127 47.342821 
-L 318.315699 47.482146 
+    <path d="M 400.523467 60.500091 
+Q 399.726812 60.78604 400.508607 60.505425 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #7fb9da; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 404.949098 61.036499 
+L 400.508607 60.505425 
+L 403.597761 57.271676 
+L 404.949098 61.036499 
 z
-" style="fill:#0a539e;stroke:#0a539e;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #7fb9da; stroke: #7fb9da; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_61">
-    <path clip-path="url(#p04f829ae89)" d="M 154.805162 223.949146 
-Q 153.964695 224.206584 154.727742 223.97286 
-" style="fill:none;stroke:#4896c8;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 159.138093 224.713673 
-L 154.727742 223.97286 
-L 157.966603 220.889067 
-L 159.138093 224.713673 
+    <path d="M 376.241508 51.928593 
+Q 375.794307 52.301585 376.634993 51.600404 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4896c8; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 380.987808 50.574245 
+L 376.634993 51.600404 
+L 378.425755 47.502456 
+L 380.987808 50.574245 
 z
-" style="fill:#4896c8;stroke:#4896c8;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #4896c8; stroke: #4896c8; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_62">
-    <path clip-path="url(#p04f829ae89)" d="M 162.897529 264.863526 
-Q 162.384956 265.236001 163.229059 264.62261 
-" style="fill:none;stroke:#549fcd;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 167.640632 263.889112 
-L 163.229059 264.62261 
-L 165.289204 260.653252 
-L 167.640632 263.889112 
+    <path d="M 316.134957 52.643719 
+Q 316.127284 52.865044 316.177718 51.410325 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a539e; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 318.315111 47.482024 
+L 316.177718 51.410325 
+L 314.317513 47.343429 
+L 318.315111 47.482024 
 z
-" style="fill:#549fcd;stroke:#549fcd;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #0a539e; stroke: #0a539e; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_63">
-    <path clip-path="url(#p04f829ae89)" d="M 73.94528 68.412928 
-Q 73.517898 68.780852 74.361479 68.054631 
-" style="fill:none;stroke:#75b4d8;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 78.697747 66.960654 
-L 74.361479 68.054631 
-L 76.088058 63.929231 
-L 78.697747 66.960654 
+    <path d="M 154.804064 223.946599 
+Q 153.963611 224.204066 154.726656 223.970313 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #4896c8; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 159.137034 224.710966 
+L 154.726656 223.970313 
+L 157.965405 220.886402 
+L 159.137034 224.710966 
 z
-" style="fill:#75b4d8;stroke:#75b4d8;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #4896c8; stroke: #4896c8; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_64">
-    <path clip-path="url(#p04f829ae89)" d="M 147.016532 268.918363 
-Q 146.49009 269.289087 147.334826 268.694217 
-" style="fill:none;stroke:#65aad4;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 151.756813 268.026362 
-L 147.334826 268.694217 
-L 149.453734 264.755914 
-L 151.756813 268.026362 
+    <path d="M 162.896574 264.862487 
+Q 162.384026 265.234987 163.228099 264.621547 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #549fcd; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 167.639633 263.887807 
+L 163.228099 264.621547 
+L 165.288027 260.652076 
+L 167.639633 263.887807 
 z
-" style="fill:#65aad4;stroke:#65aad4;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #549fcd; stroke: #549fcd; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_65">
-    <path clip-path="url(#p04f829ae89)" d="M 397.801016 139.542604 
-Q 396.961215 139.283841 397.724109 139.518907 
-" style="fill:none;stroke:#a6cee4;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 400.957834 142.608086 
-L 397.724109 139.518907 
-L 402.135687 138.785435 
-L 400.957834 142.608086 
+    <path d="M 73.945357 68.413189 
+Q 73.517975 68.78112 74.361547 68.054894 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #75b4d8; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 78.697805 66.960879 
+L 74.361547 68.054894 
+L 76.08809 63.929479 
+L 78.697805 66.960879 
 z
-" style="fill:#a6cee4;stroke:#a6cee4;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #75b4d8; stroke: #75b4d8; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_66">
-    <path clip-path="url(#p04f829ae89)" d="M 143.931007 114.789415 
-Q 143.500247 115.121202 144.398111 114.429634 
-" style="fill:none;stroke:#2474b7;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 148.787489 113.573267 
-L 144.398111 114.429634 
-L 146.346643 110.404312 
-L 148.787489 113.573267 
+    <path d="M 147.016064 268.917786 
+Q 146.489636 269.288527 147.334354 268.693628 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #65aad4; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 151.75632 268.025633 
+L 147.334354 268.693628 
+L 149.453137 264.755258 
+L 151.75632 268.025633 
 z
-" style="fill:#2474b7;stroke:#2474b7;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #65aad4; stroke: #65aad4; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_67">
-    <path clip-path="url(#p04f829ae89)" d="M 146.703846 236.151543 
-Q 145.935588 236.454461 146.727485 236.142222 
-" style="fill:none;stroke:#56a0ce;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 151.182288 236.535585 
-L 146.727485 236.142222 
-L 149.715056 232.814398 
-L 151.182288 236.535585 
+    <path d="M 143.928789 114.78648 
+Q 143.498106 115.1183 144.395909 114.426586 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2474b7; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 148.78517 113.569624 
+L 144.395909 114.426586 
+L 146.343896 110.401 
+L 148.78517 113.569624 
 z
-" style="fill:#56a0ce;stroke:#56a0ce;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #2474b7; stroke: #2474b7; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_68">
-    <path clip-path="url(#p04f829ae89)" d="M 211.049766 226.219058 
-Q 210.18664 226.451529 210.942859 226.247852 
-" style="fill:none;stroke:#2b7bba;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 215.325356 227.138759 
-L 210.942859 226.247852 
-L 214.285083 223.276398 
-L 215.325356 227.138759 
+    <path d="M 146.703135 236.15016 
+Q 145.934887 236.453096 146.726779 236.140836 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #56a0ce; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 151.181592 236.534084 
+L 146.726779 236.140836 
+L 149.714265 232.812935 
+L 151.181592 236.534084 
 z
-" style="fill:#2b7bba;stroke:#2b7bba;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #56a0ce; stroke: #56a0ce; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_69">
-    <path clip-path="url(#p04f829ae89)" d="M 225.772093 133.590105 
-Q 224.966578 133.783764 225.791651 133.585403 
-" style="fill:none;stroke:#0a549e;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p04f829ae89)" d="M 230.148344 134.594971 
-L 225.791651 133.585403 
-L 229.213321 130.70579 
-L 230.148344 134.594971 
+    <path d="M 211.048895 226.218044 
+Q 210.185764 226.450493 210.941987 226.246835 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2b7bba; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 215.324462 227.137854 
+L 210.941987 226.246835 
+L 214.284287 223.275467 
+L 215.324462 227.137854 
 z
-" style="fill:#0a549e;stroke:#0a549e;stroke-linecap:round;stroke-width:1.5;"/>
+" clip-path="url(#p0ebb051c42)" style="fill: #2b7bba; stroke: #2b7bba; stroke-width: 1.5; stroke-linecap: round"/>
    </g>
    <g id="patch_70">
+    <path d="M 304.88611 207.936028 
+Q 304.12051 207.629941 304.91212 207.946427 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #3a8ac2; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 307.883822 211.288431 
+L 304.91212 207.946427 
+L 309.368744 207.574268 
+L 307.883822 211.288431 
+z
+" clip-path="url(#p0ebb051c42)" style="fill: #3a8ac2; stroke: #3a8ac2; stroke-width: 1.5; stroke-linecap: round"/>
+   </g>
+   <g id="patch_71">
+    <path d="M 289.997108 177.884052 
+Q 289.521777 177.512934 290.368319 178.173878 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #2474b7; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 292.290364 182.211915 
+L 290.368319 178.173878 
+L 294.751976 179.059064 
+L 292.290364 182.211915 
+z
+" clip-path="url(#p0ebb051c42)" style="fill: #2474b7; stroke: #2474b7; stroke-width: 1.5; stroke-linecap: round"/>
+   </g>
+   <g id="patch_72">
+    <path d="M 225.802949 133.585423 
+Q 225.013322 133.774763 225.854518 133.573058 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #0a549e; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 230.210606 134.58523 
+L 225.854518 133.573058 
+L 229.277908 130.69549 
+L 230.210606 134.58523 
+z
+" clip-path="url(#p0ebb051c42)" style="fill: #0a549e; stroke: #0a549e; stroke-width: 1.5; stroke-linecap: round"/>
+   </g>
+   <g id="patch_73">
+    <path d="M 284.7528 148.197659 
+Q 284.412376 147.83898 285.226446 148.696705 
+" clip-path="url(#p0ebb051c42)" style="fill: none; stroke: #1966ad; stroke-width: 1.5; stroke-linecap: round"/>
+    <path d="M 286.52943 152.974816 
+L 285.226446 148.696705 
+L 289.430725 150.221184 
+L 286.52943 152.974816 
+z
+" clip-path="url(#p0ebb051c42)" style="fill: #1966ad; stroke: #1966ad; stroke-width: 1.5; stroke-linecap: round"/>
+   </g>
+   <g id="patch_74">
     <path d="M 57.6 307.584 
 L 57.6 41.472 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
-   <g id="patch_71">
+   <g id="patch_75">
     <path d="M 414.72 307.584 
 L 414.72 41.472 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
-   <g id="patch_72">
+   <g id="patch_76">
     <path d="M 57.6 307.584 
 L 414.72 307.584 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
-   <g id="patch_73">
+   <g id="patch_77">
     <path d="M 57.6 41.472 
 L 414.72 41.472 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
+" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/>
    </g>
   </g>
  </g>
  <defs>
-  <clipPath id="p04f829ae89">
-   <rect height="266.112" width="357.12" x="57.6" y="41.472"/>
+  <clipPath id="p0ebb051c42">
+   <rect x="57.6" y="41.472" width="357.12" height="266.112"/>
   </clipPath>
  </defs>
 </svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_maxlength_no_broken.png b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_maxlength_no_broken.png
new file mode 100644
index 000000000000..69b7ca96a9c1
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_maxlength_no_broken.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_startpoints.pdf b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_startpoints.pdf
deleted file mode 100644
index f9bf53975faf..000000000000
Binary files a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_startpoints.pdf and /dev/null differ
diff --git a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_startpoints.png b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_startpoints.png
index c2c3e28d3eab..b572274772c0 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_startpoints.png and b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_startpoints.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_startpoints.svg b/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_startpoints.svg
deleted file mode 100644
index fca2e620fa7c..000000000000
--- a/lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_startpoints.svg
+++ /dev/null
@@ -1,1494 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (https://matplotlib.org/) -->
-<svg height="345.6pt" version="1.1" viewBox="0 0 460.8 345.6" width="460.8pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
- </defs>
- <g id="figure_1">
-  <g id="patch_1">
-   <path d="M 0 345.6 
-L 460.8 345.6 
-L 460.8 0 
-L 0 0 
-z
-" style="fill:#ffffff;"/>
-  </g>
-  <g id="axes_1">
-   <g id="patch_2">
-    <path d="M 57.6 307.584 
-L 414.72 307.584 
-L 414.72 41.472 
-L 57.6 41.472 
-z
-" style="fill:#ffffff;"/>
-   </g>
-   <g id="matplotlib.axis_1">
-    <g id="xtick_1">
-     <g id="line2d_1">
-      <defs>
-       <path d="M 0 0 
-L 0 3.5 
-" id="m32c7fdb7bc" style="stroke:#000000;stroke-width:0.8;"/>
-      </defs>
-      <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m32c7fdb7bc" y="307.584"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_2">
-     <g id="line2d_2">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="117.12" xlink:href="#m32c7fdb7bc" y="307.584"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_3">
-     <g id="line2d_3">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="176.64" xlink:href="#m32c7fdb7bc" y="307.584"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_4">
-     <g id="line2d_4">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="236.16" xlink:href="#m32c7fdb7bc" y="307.584"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_5">
-     <g id="line2d_5">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="295.68" xlink:href="#m32c7fdb7bc" y="307.584"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_6">
-     <g id="line2d_6">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="355.2" xlink:href="#m32c7fdb7bc" y="307.584"/>
-      </g>
-     </g>
-    </g>
-    <g id="xtick_7">
-     <g id="line2d_7">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="414.72" xlink:href="#m32c7fdb7bc" y="307.584"/>
-      </g>
-     </g>
-    </g>
-   </g>
-   <g id="matplotlib.axis_2">
-    <g id="ytick_1">
-     <g id="line2d_8">
-      <defs>
-       <path d="M 0 0 
-L -3.5 0 
-" id="m3972710557" style="stroke:#000000;stroke-width:0.8;"/>
-      </defs>
-      <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m3972710557" y="307.584"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_2">
-     <g id="line2d_9">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m3972710557" y="263.232"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_3">
-     <g id="line2d_10">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m3972710557" y="218.88"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_4">
-     <g id="line2d_11">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m3972710557" y="174.528"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_5">
-     <g id="line2d_12">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m3972710557" y="130.176"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_6">
-     <g id="line2d_13">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m3972710557" y="85.824"/>
-      </g>
-     </g>
-    </g>
-    <g id="ytick_7">
-     <g id="line2d_14">
-      <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m3972710557" y="41.472"/>
-      </g>
-     </g>
-    </g>
-   </g>
-   <g id="LineCollection_1">
-    <path clip-path="url(#p30828d0ccd)" d="M 414.72 242.392617 
-L 411.9258 242.090479 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 411.9258 242.090479 
-L 400.150364 240.792247 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 400.150364 240.792247 
-L 388.385386 239.442856 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 388.385386 239.442856 
-L 376.631781 238.039681 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 376.631781 238.039681 
-L 364.890584 236.580784 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 364.890584 236.580784 
-L 353.162259 235.064911 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 353.162259 235.064911 
-L 341.447318 233.493753 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 341.447318 233.493753 
-L 329.745056 231.872631 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 329.745056 231.872631 
-L 318.052804 230.211992 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 318.052804 230.211992 
-L 306.365854 228.533943 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 306.365854 228.533943 
-L 294.673371 226.875575 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 294.673371 226.875575 
-L 282.961115 225.302206 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 282.961115 225.302206 
-L 271.208004 223.917169 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 271.208004 223.917169 
-L 259.395831 222.875825 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 259.395831 222.875825 
-L 247.526606 222.386622 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 247.526606 222.386622 
-L 235.653251 222.678808 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 235.653251 222.678808 
-L 223.894701 223.925086 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 223.894701 223.925086 
-L 212.398602 226.156246 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 212.398602 226.156246 
-L 201.26147 229.253036 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 201.26147 229.253036 
-L 190.502181 233.030538 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 190.502181 233.030538 
-L 180.083398 237.312357 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 180.083398 237.312357 
-L 169.949349 241.96106 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 169.949349 241.96106 
-L 160.043576 246.876902 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 160.043576 246.876902 
-L 150.318056 251.989737 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 150.318056 251.989737 
-L 140.73508 257.250598 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 140.73508 257.250598 
-L 131.264849 262.623971 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 131.264849 262.623971 
-L 121.884143 268.083976 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 121.884143 268.083976 
-L 112.575097 273.611778 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 112.575097 273.611778 
-L 103.323427 279.192837 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 103.323427 279.192837 
-L 94.11791 284.816199 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 94.11791 284.816199 
-L 84.949481 290.473169 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 84.949481 290.473169 
-L 75.810823 296.156945 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 75.810823 296.156945 
-L 66.695974 301.862036 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 66.695974 301.862036 
-L 57.6 307.584 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 57.6 307.584 
-L 57.6 307.584 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 147.070375 243.76659 
-L 136.96 248.448 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 136.96 248.448 
-L 126.935597 253.231338 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 126.935597 253.231338 
-L 116.974926 258.087711 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 116.974926 258.087711 
-L 107.060172 262.995979 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 107.060172 262.995979 
-L 97.177536 267.940328 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 97.177536 267.940328 
-L 87.316068 272.908334 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 87.316068 272.908334 
-L 77.467217 277.890305 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 77.467217 277.890305 
-L 67.6246 282.879079 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 67.6246 282.879079 
-L 57.782988 287.868899 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 57.782988 287.868899 
-L 57.6 287.961653 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 270.147082 218.736871 
-L 258.570745 216.681218 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 258.570745 216.681218 
-L 246.919121 214.893857 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 246.919121 214.893857 
-L 235.158846 213.582907 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 235.158846 213.582907 
-L 223.302018 212.977121 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 223.302018 212.977121 
-L 211.425909 213.24279 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 211.425909 213.24279 
-L 199.643855 214.402901 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 199.643855 214.402901 
-L 188.03945 216.340473 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 188.03945 216.340473 
-L 176.64 218.88 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 176.64 218.88 
-L 165.428793 221.85621 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 165.428793 221.85621 
-L 154.370514 225.136353 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 154.370514 225.136353 
-L 143.427037 228.624658 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 143.427037 228.624658 
-L 132.564803 232.252403 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 132.564803 232.252403 
-L 121.758098 235.971527 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 121.758098 235.971527 
-L 110.987219 239.747774 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 110.987219 239.747774 
-L 100.2361 243.555422 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 100.2361 243.555422 
-L 89.493259 247.376012 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 89.493259 247.376012 
-L 78.74954 251.195424 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 78.74954 251.195424 
-L 67.998347 255.00319 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 67.998347 255.00319 
-L 57.6 258.676413 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 348.604395 228.521956 
-L 337.065011 226.347992 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 337.065011 226.347992 
-L 325.588594 223.996016 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 325.588594 223.996016 
-L 314.190615 221.440869 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 314.190615 221.440869 
-L 302.890124 218.656433 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 302.890124 218.656433 
-L 291.708816 215.618708 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 291.708816 215.618708 
-L 280.668398 212.310115 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 280.668398 212.310115 
-L 269.784414 208.72624 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 269.784414 208.72624 
-L 259.056214 204.889457 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 259.056214 204.889457 
-L 248.451653 200.865058 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 248.451653 200.865058 
-L 237.889802 196.778038 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 237.889802 196.778038 
-L 227.234523 192.831484 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 227.234523 192.831484 
-L 216.32 189.312 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 216.32 189.312 
-L 205.016805 186.570831 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 205.016805 186.570831 
-L 193.360635 184.85988 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 193.360635 184.85988 
-L 181.508707 184.20755 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 181.508707 184.20755 
-L 169.619483 184.430111 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 169.619483 184.430111 
-L 157.776119 185.2855 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 157.776119 185.2855 
-L 145.998525 186.563065 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 145.998525 186.563065 
-L 134.278769 188.113526 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 134.278769 188.113526 
-L 122.602187 189.837623 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 122.602187 189.837623 
-L 110.954419 191.667626 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 110.954419 191.667626 
-L 99.32435 193.559378 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 99.32435 193.559378 
-L 87.703653 195.482916 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 87.703653 195.482916 
-L 76.086096 197.417047 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 76.086096 197.417047 
-L 64.467554 199.347897 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 64.467554 199.347897 
-L 57.6 200.486521 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 414.72 228.174432 
-L 404.793492 226.385981 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 404.793492 226.385981 
-L 393.250532 224.220005 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 393.250532 224.220005 
-L 381.770712 221.875675 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 381.770712 221.875675 
-L 370.370685 219.325433 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 370.370685 219.325433 
-L 359.072487 216.535982 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 359.072487 216.535982 
-L 347.905323 213.468512 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 347.905323 213.468512 
-L 336.907567 210.079958 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 336.907567 210.079958 
-L 326.128805 206.323143 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 326.128805 206.323143 
-L 315.631204 202.149735 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 315.631204 202.149735 
-L 305.489293 197.514964 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 305.489293 197.514964 
-L 295.785162 192.387927 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 295.785162 192.387927 
-L 286.599377 186.756488 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 286.599377 186.756488 
-L 277.999781 180.632904 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 277.999781 180.632904 
-L 270.030636 174.05214 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 270.030636 174.05214 
-L 262.702021 167.069393 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 262.702021 167.069393 
-L 256 159.744 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 256 159.744 
-L 249.877795 152.140424 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 249.877795 152.140424 
-L 244.270383 144.318917 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 244.270383 144.318917 
-L 239.076059 136.340973 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 239.076059 136.340973 
-L 239.076059 136.340973 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 239.076059 136.340973 
-L 237.801001 134.28327 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 237.801001 134.28327 
-L 237.801001 134.28327 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 237.801001 134.28327 
-L 236.533252 132.29573 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 236.533252 132.29573 
-L 236.533252 132.29573 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 236.533252 132.29573 
-L 235.662633 131.309326 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 235.662633 131.309326 
-L 235.662633 131.309326 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 235.662633 131.309326 
-L 235.138932 130.980152 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 235.138932 130.980152 
-L 234.592954 131.004913 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 234.592954 131.004913 
-L 233.920311 131.097595 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 233.920311 131.097595 
-L 232.985323 131.311744 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 232.985323 131.311744 
-L 231.43524 131.763663 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 231.43524 131.763663 
-L 228.500992 132.654392 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 228.500992 132.654392 
-L 224.156943 133.874335 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 224.156943 133.874335 
-L 217.926575 135.563951 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 217.926575 135.563951 
-L 207.551783 138.315213 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 207.551783 138.315213 
-L 196.308855 141.188253 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 196.308855 141.188253 
-L 185.002801 143.940439 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 185.002801 143.940439 
-L 173.639668 146.573347 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 173.639668 146.573347 
-L 162.228173 149.094553 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 162.228173 149.094553 
-L 150.775311 151.512011 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 150.775311 151.512011 
-L 139.287043 153.834151 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 139.287043 153.834151 
-L 127.76737 156.06825 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 127.76737 156.06825 
-L 116.219427 158.220248 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 116.219427 158.220248 
-L 104.646016 160.295396 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 104.646016 160.295396 
-L 93.049609 162.298366 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 93.049609 162.298366 
-L 81.432703 164.23436 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 81.432703 164.23436 
-L 69.797364 166.107903 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 69.797364 166.107903 
-L 58.145101 167.922197 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 58.145101 167.922197 
-L 57.6 168.005667 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 414.72 187.792543 
-L 414.358804 187.690112 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 414.358804 187.690112 
-L 403.293705 184.421582 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 403.293705 184.421582 
-L 392.36085 180.915125 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 392.36085 180.915125 
-L 381.583842 177.150788 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 381.583842 177.150788 
-L 370.989657 173.109061 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 370.989657 173.109061 
-L 360.607567 168.772835 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 360.607567 168.772835 
-L 350.467695 164.1297 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 350.467695 164.1297 
-L 340.599929 159.17215 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 340.599929 159.17215 
-L 331.029532 153.900972 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 331.029532 153.900972 
-L 321.771876 148.328162 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 321.771876 148.328162 
-L 312.825259 142.479726 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 312.825259 142.479726 
-L 304.158011 136.401832 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 304.158011 136.401832 
-L 295.68 130.176 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 295.68 130.176 
-L 287.116662 124.021391 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 287.116662 124.021391 
-L 287.116662 124.021391 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 287.116662 124.021391 
-L 281.961489 120.763608 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 281.961489 120.763608 
-L 281.961489 120.763608 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 281.961489 120.763608 
-L 279.144734 119.316246 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 279.144734 119.316246 
-L 279.144734 119.316246 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 279.144734 119.316246 
-L 276.493986 118.395894 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 276.493986 118.395894 
-L 276.493986 118.395894 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 276.493986 118.395894 
-L 273.960751 118.109301 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 273.960751 118.109301 
-L 271.615754 118.451998 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 271.615754 118.451998 
-L 269.769147 118.894251 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 269.769147 118.894251 
-L 267.825526 119.724938 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 267.825526 119.724938 
-L 267.825526 119.724938 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 267.825526 119.724938 
-L 266.662496 120.111259 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 266.662496 120.111259 
-L 265.872386 120.283641 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 265.872386 120.283641 
-L 265.255719 120.437443 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 265.255719 120.437443 
-L 264.699914 120.666713 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 264.699914 120.666713 
-L 264.297007 120.981782 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 264.297007 120.981782 
-L 264.297007 120.981782 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 264.297007 120.981782 
-L 264.030056 121.065799 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 264.030056 121.065799 
-L 263.832261 121.131105 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.832261 121.131105 
-L 263.690115 121.190042 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.690115 121.190042 
-L 263.588629 121.239806 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.588629 121.239806 
-L 263.508152 121.269779 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.508152 121.269779 
-L 263.440781 121.280725 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.440781 121.280725 
-L 263.387073 121.2848 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.387073 121.2848 
-L 263.349552 121.293741 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.349552 121.293741 
-L 263.327041 121.310471 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.327041 121.310471 
-L 263.313044 121.328047 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.313044 121.328047 
-L 263.299122 121.336 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.299122 121.336 
-L 263.282306 121.331998 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.282306 121.331998 
-L 263.266951 121.324614 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.266951 121.324614 
-L 263.25853 121.323784 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.25853 121.323784 
-L 263.258069 121.332276 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.258069 121.332276 
-L 263.260834 121.343705 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.260834 121.343705 
-L 263.259842 121.34785 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.259842 121.34785 
-L 263.252968 121.341596 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.252968 121.341596 
-L 263.245 121.332365 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.245 121.332365 
-L 263.241881 121.329549 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241881 121.329549 
-L 263.245211 121.336071 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.245211 121.336071 
-L 263.250898 121.34608 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.250898 121.34608 
-L 263.252439 121.349727 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.252439 121.349727 
-L 263.247716 121.343539 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247716 121.343539 
-L 263.241271 121.334229 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241271 121.334229 
-L 263.239 121.330875 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.239 121.330875 
-L 263.242732 121.336592 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242732 121.336592 
-L 263.248768 121.346046 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.248768 121.346046 
-L 263.250897 121.349774 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.250897 121.349774 
-L 263.246872 121.344056 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246872 121.344056 
-L 263.240872 121.334998 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.240872 121.334998 
-L 263.238645 121.331391 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.238645 121.331391 
-L 263.24217 121.336538 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.24217 121.336538 
-L 263.248083 121.345593 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.248083 121.345593 
-L 263.250428 121.349485 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.250428 121.349485 
-L 263.246819 121.344289 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246819 121.344289 
-L 263.24107 121.335545 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.24107 121.335545 
-L 263.238754 121.33176 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.238754 121.33176 
-L 263.241975 121.336402 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241975 121.336402 
-L 263.247678 121.345088 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247678 121.345088 
-L 263.250154 121.349134 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.250154 121.349134 
-L 263.246896 121.344448 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246896 121.344448 
-L 263.241363 121.336032 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241363 121.336032 
-L 263.238949 121.332103 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.238949 121.332103 
-L 263.241862 121.336271 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241862 121.336271 
-L 263.247339 121.344596 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247339 121.344596 
-L 263.249916 121.348773 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.249916 121.348773 
-L 263.246983 121.344573 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246983 121.344573 
-L 263.241662 121.336489 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241662 121.336489 
-L 263.23916 121.33244 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.23916 121.33244 
-L 263.241776 121.336162 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241776 121.336162 
-L 263.247026 121.344128 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247026 121.344128 
-L 263.249685 121.348412 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.249685 121.348412 
-L 263.247059 121.344673 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247059 121.344673 
-L 263.24195 121.33692 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.24195 121.33692 
-L 263.239373 121.332775 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.239373 121.332775 
-L 263.241708 121.336074 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241708 121.336074 
-L 263.246732 121.343687 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246732 121.343687 
-L 263.249457 121.348054 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.249457 121.348054 
-L 263.247121 121.344751 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247121 121.344751 
-L 263.242222 121.337329 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242222 121.337329 
-L 263.239586 121.333107 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.239586 121.333107 
-L 263.241654 121.336008 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241654 121.336008 
-L 263.246455 121.343271 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246455 121.343271 
-L 263.249231 121.3477 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.249231 121.3477 
-L 263.247169 121.344808 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247169 121.344808 
-L 263.242481 121.337715 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242481 121.337715 
-L 263.239797 121.333436 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.239797 121.333436 
-L 263.241614 121.335961 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241614 121.335961 
-L 263.246194 121.34288 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246194 121.34288 
-L 263.249007 121.34735 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.249007 121.34735 
-L 263.247205 121.344845 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247205 121.344845 
-L 263.242725 121.338079 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242725 121.338079 
-L 263.240006 121.333761 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.240006 121.333761 
-L 263.241586 121.335932 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241586 121.335932 
-L 263.245949 121.342513 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.245949 121.342513 
-L 263.248786 121.347006 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.248786 121.347006 
-L 263.247228 121.344865 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247228 121.344865 
-L 263.242955 121.338421 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242955 121.338421 
-L 263.240212 121.334081 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.240212 121.334081 
-L 263.241569 121.33592 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241569 121.33592 
-L 263.245719 121.34217 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.245719 121.34217 
-L 263.248569 121.346668 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.248569 121.346668 
-L 263.24724 121.344869 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.24724 121.344869 
-L 263.243171 121.338742 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.243171 121.338742 
-L 263.240415 121.334395 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.240415 121.334395 
-L 263.241563 121.335923 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241563 121.335923 
-L 263.245503 121.341848 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.245503 121.341848 
-L 263.248356 121.346337 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.248356 121.346337 
-L 263.247241 121.344857 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247241 121.344857 
-L 263.243375 121.339044 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.243375 121.339044 
-L 263.240615 121.334704 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.240615 121.334704 
-L 263.241566 121.33594 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241566 121.33594 
-L 263.245302 121.341549 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.245302 121.341549 
-L 263.248147 121.346013 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.248147 121.346013 
-L 263.247233 121.344832 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247233 121.344832 
-L 263.243565 121.339325 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.243565 121.339325 
-L 263.240811 121.335007 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.240811 121.335007 
-L 263.241579 121.33597 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241579 121.33597 
-L 263.245114 121.34127 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.245114 121.34127 
-L 263.247943 121.345698 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247943 121.345698 
-L 263.247217 121.344794 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247217 121.344794 
-L 263.243743 121.339588 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.243743 121.339588 
-L 263.241003 121.335302 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241003 121.335302 
-L 263.241599 121.336012 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241599 121.336012 
-L 263.244939 121.34101 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.244939 121.34101 
-L 263.247744 121.34539 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247744 121.34539 
-L 263.247192 121.344745 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247192 121.344745 
-L 263.243909 121.339832 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.243909 121.339832 
-L 263.24119 121.33559 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.24119 121.33559 
-L 263.241626 121.336064 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241626 121.336064 
-L 263.244776 121.34077 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.244776 121.34077 
-L 263.24755 121.345091 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.24755 121.345091 
-L 263.24716 121.344685 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.24716 121.344685 
-L 263.244063 121.340059 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.244063 121.340059 
-L 263.241373 121.335871 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241373 121.335871 
-L 263.24166 121.336127 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.24166 121.336127 
-L 263.244626 121.340548 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.244626 121.340548 
-L 263.247361 121.344801 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247361 121.344801 
-L 263.247122 121.344616 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247122 121.344616 
-L 263.244206 121.340268 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.244206 121.340268 
-L 263.241551 121.336144 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241551 121.336144 
-L 263.241701 121.336197 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241701 121.336197 
-L 263.244487 121.340344 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.244487 121.340344 
-L 263.247179 121.34452 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247179 121.34452 
-L 263.247078 121.344539 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247078 121.344539 
-L 263.244338 121.340462 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.244338 121.340462 
-L 263.241724 121.336409 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241724 121.336409 
-L 263.241746 121.336276 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241746 121.336276 
-L 263.244359 121.340156 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.244359 121.340156 
-L 263.247001 121.344248 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247001 121.344248 
-L 263.247028 121.344454 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.247028 121.344454 
-L 263.24446 121.340639 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.24446 121.340639 
-L 263.241892 121.336665 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241892 121.336665 
-L 263.241797 121.336361 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241797 121.336361 
-L 263.244241 121.339984 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.244241 121.339984 
-L 263.24683 121.343986 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.24683 121.343986 
-L 263.246974 121.344363 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246974 121.344363 
-L 263.244572 121.340802 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.244572 121.340802 
-L 263.242054 121.336913 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242054 121.336913 
-L 263.241851 121.336452 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241851 121.336452 
-L 263.244133 121.339828 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.244133 121.339828 
-L 263.246664 121.343733 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246664 121.343733 
-L 263.246916 121.344266 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246916 121.344266 
-L 263.244674 121.34095 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.244674 121.34095 
-L 263.242211 121.337152 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242211 121.337152 
-L 263.24191 121.336548 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.24191 121.336548 
-L 263.244035 121.339685 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.244035 121.339685 
-L 263.246505 121.34349 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246505 121.34349 
-L 263.246854 121.344164 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246854 121.344164 
-L 263.244767 121.341085 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.244767 121.341085 
-L 263.242363 121.337382 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242363 121.337382 
-L 263.241971 121.336649 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.241971 121.336649 
-L 263.243946 121.339557 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.243946 121.339557 
-L 263.246351 121.343256 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246351 121.343256 
-L 263.246789 121.344057 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246789 121.344057 
-L 263.244852 121.341206 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.244852 121.341206 
-L 263.242509 121.337604 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242509 121.337604 
-L 263.242036 121.336754 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242036 121.336754 
-L 263.243866 121.339441 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.243866 121.339441 
-L 263.246204 121.343031 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246204 121.343031 
-L 263.246722 121.343948 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246722 121.343948 
-L 263.244929 121.341315 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.244929 121.341315 
-L 263.242649 121.337817 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242649 121.337817 
-L 263.242102 121.336862 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242102 121.336862 
-L 263.243793 121.339338 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.243793 121.339338 
-L 263.246063 121.342816 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246063 121.342816 
-L 263.246652 121.343835 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246652 121.343835 
-L 263.244997 121.341412 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.244997 121.341412 
-L 263.242784 121.338021 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242784 121.338021 
-L 263.242171 121.336972 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242171 121.336972 
-L 263.243729 121.339246 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.243729 121.339246 
-L 263.245927 121.342611 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.245927 121.342611 
-L 263.246581 121.34372 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246581 121.34372 
-L 263.245058 121.341499 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.245058 121.341499 
-L 263.242913 121.338217 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242913 121.338217 
-L 263.242242 121.337085 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242242 121.337085 
-L 263.243671 121.339165 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.243671 121.339165 
-L 263.245797 121.342414 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.245797 121.342414 
-L 263.246508 121.343603 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246508 121.343603 
-L 263.245112 121.341574 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.245112 121.341574 
-L 263.243037 121.338404 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.243037 121.338404 
-L 263.242313 121.337199 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242313 121.337199 
-L 263.243621 121.339095 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.243621 121.339095 
-L 263.245674 121.342227 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.245674 121.342227 
-L 263.246434 121.343485 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246434 121.343485 
-L 263.24516 121.34164 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.24516 121.34164 
-L 263.243155 121.338582 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.243155 121.338582 
-L 263.242386 121.337314 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242386 121.337314 
-L 263.243577 121.339034 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.243577 121.339034 
-L 263.245556 121.342049 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.245556 121.342049 
-L 263.246359 121.343367 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246359 121.343367 
-L 263.245201 121.341696 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.245201 121.341696 
-L 263.243268 121.338752 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.243268 121.338752 
-L 263.242459 121.337429 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242459 121.337429 
-L 263.243539 121.338982 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.243539 121.338982 
-L 263.245444 121.34188 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.245444 121.34188 
-L 263.246284 121.343248 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246284 121.343248 
-L 263.245236 121.341743 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.245236 121.341743 
-L 263.243375 121.338914 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.243375 121.338914 
-L 263.242532 121.337545 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242532 121.337545 
-L 263.243507 121.338939 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.243507 121.338939 
-L 263.245337 121.341719 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.245337 121.341719 
-L 263.246208 121.343129 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246208 121.343129 
-L 263.245265 121.341782 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.245265 121.341782 
-L 263.243477 121.339067 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.243477 121.339067 
-L 263.242606 121.337661 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.242606 121.337661 
-L 263.243481 121.338904 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.243481 121.338904 
-L 263.245236 121.341567 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.245236 121.341567 
-L 263.246133 121.343011 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 263.246133 121.343011 
-L 263.24529 121.341814 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 414.72 107.508791 
-L 406.178344 106.266618 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 406.178344 106.266618 
-L 394.479616 104.63009 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 394.479616 104.63009 
-L 382.745012 103.14467 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 382.745012 103.14467 
-L 370.964977 101.882492 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 370.964977 101.882492 
-L 359.132622 100.942349 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 359.132622 100.942349 
-L 347.252175 100.458482 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 347.252175 100.458482 
-L 335.36 100.608 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 335.36 100.608 
-L 323.573149 101.645367 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 323.573149 101.645367 
-L 312.068838 103.699496 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 312.068838 103.699496 
-L 302.19021 106.325992 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 302.19021 106.325992 
-L 293.163075 109.41487 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 414.72 57.453928 
-L 407.368273 59.763962 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 407.368273 59.763962 
-L 396.465339 63.319303 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 396.465339 63.319303 
-L 385.687486 67.078569 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 385.687486 67.078569 
-L 375.04 71.04 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 375.04 71.04 
-L 364.533269 75.20176 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 364.533269 75.20176 
-L 354.165752 79.54799 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 354.165752 79.54799 
-L 343.932163 84.062388 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 343.932163 84.062388 
-L 333.825066 88.720182 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 333.825066 88.720182 
-L 323.822867 93.488148 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 323.822867 93.488148 
-L 313.879598 98.325427 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.5;"/>
-   </g>
-   <g id="patch_3">
-    <path clip-path="url(#p30828d0ccd)" d="M 221.932843 224.305843 
-Q 221.021421 224.482731 221.75633 224.3401 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 226.064109 225.541366 
-L 221.75633 224.3401 
-L 225.30201 221.614637 
-L 226.064109 225.541366 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.5;"/>
-   </g>
-   <g id="patch_4">
-    <path clip-path="url(#p30828d0ccd)" d="M 105.272322 263.890452 
-Q 104.5902 264.231723 105.407894 263.822625 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 109.88003 263.821528 
-L 105.407894 263.822625 
-L 108.090298 260.244258 
-L 109.88003 263.821528 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.5;"/>
-   </g>
-   <g id="patch_5">
-    <path clip-path="url(#p30828d0ccd)" d="M 163.509253 222.42559 
-Q 162.661491 222.677056 163.421538 222.451608 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 167.825142 223.231528 
-L 163.421538 222.451608 
-L 166.687636 219.396677 
-L 167.825142 223.231528 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.5;"/>
-   </g>
-   <g id="patch_6">
-    <path clip-path="url(#p30828d0ccd)" d="M 214.374504 188.840192 
-Q 213.493219 188.626469 214.241743 188.807996 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 217.657702 191.694382 
-L 214.241743 188.807996 
-L 218.600427 187.807061 
-L 217.657702 191.694382 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.5;"/>
-   </g>
-   <g id="patch_7">
-    <path clip-path="url(#p30828d0ccd)" d="M 248.714148 150.517309 
-Q 248.476307 150.185556 249.215611 151.216775 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 249.920798 155.632962 
-L 249.215611 151.216775 
-L 253.171673 153.302338 
-L 249.920798 155.632962 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.5;"/>
-   </g>
-   <g id="patch_8">
-    <path clip-path="url(#p30828d0ccd)" d="M 338.849874 158.208255 
-Q 338.208166 157.854816 339.035434 158.310458 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 341.574258 161.992084 
-L 339.035434 158.310458 
-L 343.504029 158.488374 
-L 341.574258 161.992084 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.5;"/>
-   </g>
-   <g id="patch_9">
-    <path clip-path="url(#p30828d0ccd)" d="M 357.134178 100.860956 
-Q 356.162206 100.82137 356.865896 100.85003 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 360.781194 103.01115 
-L 356.865896 100.85003 
-L 360.943971 99.014463 
-L 360.781194 103.01115 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.5;"/>
-   </g>
-   <g id="patch_10">
-    <path clip-path="url(#p30828d0ccd)" d="M 362.688074 75.975295 
-Q 361.939831 76.288971 362.738232 75.954268 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.5;"/>
-    <path clip-path="url(#p30828d0ccd)" d="M 367.200428 76.252277 
-L 362.738232 75.954268 
-L 365.653956 72.563317 
-L 367.200428 76.252277 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.5;"/>
-   </g>
-   <g id="line2d_15">
-    <defs>
-     <path d="M 0 3 
-C 0.795609 3 1.55874 2.683901 2.12132 2.12132 
-C 2.683901 1.55874 3 0.795609 3 0 
-C 3 -0.795609 2.683901 -1.55874 2.12132 -2.12132 
-C 1.55874 -2.683901 0.795609 -3 0 -3 
-C -0.795609 -3 -1.55874 -2.683901 -2.12132 -2.12132 
-C -2.683901 -1.55874 -3 -0.795609 -3 0 
-C -3 0.795609 -2.683901 1.55874 -2.12132 2.12132 
-C -1.55874 2.683901 -0.795609 3 0 3 
-z
-" id="m1037087b4d" style="stroke:#000000;"/>
-    </defs>
-    <g clip-path="url(#p30828d0ccd)">
-     <use style="stroke:#000000;" x="57.6" xlink:href="#m1037087b4d" y="307.584"/>
-     <use style="stroke:#000000;" x="97.28" xlink:href="#m1037087b4d" y="278.016"/>
-     <use style="stroke:#000000;" x="136.96" xlink:href="#m1037087b4d" y="248.448"/>
-     <use style="stroke:#000000;" x="176.64" xlink:href="#m1037087b4d" y="218.88"/>
-     <use style="stroke:#000000;" x="216.32" xlink:href="#m1037087b4d" y="189.312"/>
-     <use style="stroke:#000000;" x="256" xlink:href="#m1037087b4d" y="159.744"/>
-     <use style="stroke:#000000;" x="295.68" xlink:href="#m1037087b4d" y="130.176"/>
-     <use style="stroke:#000000;" x="335.36" xlink:href="#m1037087b4d" y="100.608"/>
-     <use style="stroke:#000000;" x="375.04" xlink:href="#m1037087b4d" y="71.04"/>
-     <use style="stroke:#000000;" x="414.72" xlink:href="#m1037087b4d" y="41.472"/>
-    </g>
-   </g>
-   <g id="patch_11">
-    <path d="M 57.6 307.584 
-L 57.6 41.472 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
-   </g>
-   <g id="patch_12">
-    <path d="M 414.72 307.584 
-L 414.72 41.472 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
-   </g>
-   <g id="patch_13">
-    <path d="M 57.6 307.584 
-L 414.72 307.584 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
-   </g>
-   <g id="patch_14">
-    <path d="M 57.6 41.472 
-L 414.72 41.472 
-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
-   </g>
-  </g>
- </g>
- <defs>
-  <clipPath id="p30828d0ccd">
-   <rect height="266.112" width="357.12" x="57.6" y="41.472"/>
-  </clipPath>
- </defs>
-</svg>
diff --git a/lib/matplotlib/tests/baseline_images/test_text/text_as_text_opacity.svg b/lib/matplotlib/tests/baseline_images/test_text/text_as_text_opacity.svg
index 69d287e3536c..63cdeb8fbd47 100644
--- a/lib/matplotlib/tests/baseline_images/test_text/text_as_text_opacity.svg
+++ b/lib/matplotlib/tests/baseline_images/test_text/text_as_text_opacity.svg
@@ -10,22 +10,22 @@
  </defs>
  <g id="figure_1">
   <g id="patch_1">
-   <path d="M 0 432 
-L 576 432 
-L 576 0 
-L 0 0 
+   <path d="M 0 432
+L 576 432
+L 576 0
+L 0 0
 z
 " style="fill:#ffffff;"/>
   </g>
   <g id="axes_1">
    <g id="text_1">
-    <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:normal;opacity:0.5;text-anchor:start;" transform="rotate(-0, 183.6, 302.4)" x="183.6" y="302.4">50% using `color`</text>
+    <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:normal;opacity:0.5;text-anchor:start;" transform="rotate(-0, 183.6, 302.4)" x="183.6" y="302.4">50% using `color`</text>
    </g>
    <g id="text_2">
-    <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:normal;opacity:0.5;text-anchor:start;" transform="rotate(-0, 183.6, 216)" x="183.6" y="216">50% using `alpha`</text>
+    <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:normal;opacity:0.5;text-anchor:start;" transform="rotate(-0, 183.6, 216)" x="183.6" y="216">50% using `alpha`</text>
    </g>
    <g id="text_3">
-    <text style="font-family:DejaVu Sans;font-size:12px;font-style:normal;font-weight:normal;opacity:0.5;text-anchor:start;" transform="rotate(-0, 183.6, 129.6)" x="183.6" y="129.6">50% using `alpha` and 100% `color`</text>
+    <text style="font-family:'DejaVu Sans';font-size:12px;font-style:normal;font-weight:normal;opacity:0.5;text-anchor:start;" transform="rotate(-0, 183.6, 129.6)" x="183.6" y="129.6">50% using `alpha` and 100% `color`</text>
    </g>
   </g>
  </g>
diff --git a/lib/matplotlib/tests/baseline_images/test_text/text_pdf_chars_beyond_bmp.pdf b/lib/matplotlib/tests/baseline_images/test_text/text_pdf_chars_beyond_bmp.pdf
new file mode 100644
index 000000000000..8890790d2ea2
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_text/text_pdf_chars_beyond_bmp.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_text/text_pdf_font42_kerning.pdf b/lib/matplotlib/tests/baseline_images/test_text/text_pdf_font42_kerning.pdf
new file mode 100644
index 000000000000..a8ce9fca346c
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_text/text_pdf_font42_kerning.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_transforms/pre_transform_data.pdf b/lib/matplotlib/tests/baseline_images/test_transforms/pre_transform_data.pdf
index 640df51ac227..43daec43d648 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_transforms/pre_transform_data.pdf and b/lib/matplotlib/tests/baseline_images/test_transforms/pre_transform_data.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_transforms/pre_transform_data.png b/lib/matplotlib/tests/baseline_images/test_transforms/pre_transform_data.png
index 22b08c23bd49..e889450de817 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_transforms/pre_transform_data.png and b/lib/matplotlib/tests/baseline_images/test_transforms/pre_transform_data.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_transforms/pre_transform_data.svg b/lib/matplotlib/tests/baseline_images/test_transforms/pre_transform_data.svg
index 8d52765e3ae0..091a693b0e53 100644
--- a/lib/matplotlib/tests/baseline_images/test_transforms/pre_transform_data.svg
+++ b/lib/matplotlib/tests/baseline_images/test_transforms/pre_transform_data.svg
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (https://matplotlib.org/) -->
 <svg height="345.6pt" version="1.1" viewBox="0 0 460.8 345.6" width="460.8pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <metadata>
+  <rdf:RDF xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+   <cc:Work>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:date>2020-08-08T03:00:34.113585</dc:date>
+    <dc:format>image/svg+xml</dc:format>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Matplotlib v3.3.0rc1.post628+gb07dd36f3, https://matplotlib.org/</dc:title>
+     </cc:Agent>
+    </dc:creator>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="patch_1">
@@ -27,37 +38,37 @@ z
 " style="fill:#ffffff;"/>
    </g>
    <g id="PathCollection_1">
-    <path clip-path="url(#p90d2bc968c)" d="M 91.611429 307.584 
-L 125.622857 307.584 
-L 159.634286 307.584 
-L 193.645714 307.584 
-L 227.657143 307.584 
-L 261.668571 307.584 
-L 227.657143 304.416 
-L 193.645714 301.248 
-L 159.634286 298.08 
-L 125.622857 294.912 
-L 91.611429 291.744 
+    <path clip-path="url(#p1d48955717)" d="M 91.508114 307.584 
+L 125.416228 307.584 
+L 159.324342 307.584 
+L 193.232456 307.584 
+L 227.14057 307.584 
+L 261.048684 307.584 
+L 227.14057 304.416 
+L 193.232456 301.248 
+L 159.324342 298.08 
+L 125.416228 294.912 
+L 91.508114 291.744 
 L 57.6 288.576 
 L 57.6 307.584 
 z
 " style="fill:#48186a;"/>
    </g>
    <g id="PathCollection_2">
-    <path clip-path="url(#p90d2bc968c)" d="M 91.611429 291.744 
-L 125.622857 294.912 
-L 159.634286 298.08 
-L 193.645714 301.248 
-L 227.657143 304.416 
-L 261.668571 307.584 
-L 295.68 307.584 
-L 295.68 291.744 
-L 261.668571 288.576 
-L 227.657143 285.408 
-L 193.645714 282.24 
-L 159.634286 279.072 
-L 125.622857 275.904 
-L 91.611429 272.736 
+    <path clip-path="url(#p1d48955717)" d="M 91.508114 291.744 
+L 125.416228 294.912 
+L 159.324342 298.08 
+L 193.232456 301.248 
+L 227.14057 304.416 
+L 261.048684 307.584 
+L 294.956798 307.584 
+L 294.956798 291.744 
+L 261.048684 288.576 
+L 227.14057 285.408 
+L 193.232456 282.24 
+L 159.324342 279.072 
+L 125.416228 275.904 
+L 91.508114 272.736 
 L 57.6 269.568 
 L 57.6 282.24 
 L 57.6 288.576 
@@ -65,414 +76,414 @@ z
 " style="fill:#424086;"/>
    </g>
    <g id="PathCollection_3">
-    <path clip-path="url(#p90d2bc968c)" d="M 227.657143 285.408 
-L 261.668571 288.576 
-L 295.68 291.744 
-L 295.68 282.24 
-L 295.68 272.736 
-L 261.668571 269.568 
-L 227.657143 266.4 
-L 193.645714 263.232 
-L 159.634286 260.064 
-L 125.622857 256.896 
-L 91.611429 253.728 
+    <path clip-path="url(#p1d48955717)" d="M 227.14057 285.408 
+L 261.048684 288.576 
+L 294.956798 291.744 
+L 294.956798 282.24 
+L 294.956798 272.736 
+L 261.048684 269.568 
+L 227.14057 266.4 
+L 193.232456 263.232 
+L 159.324342 260.064 
+L 125.416228 256.896 
+L 91.508114 253.728 
 L 57.6 250.56 
 L 57.6 256.896 
 L 57.6 269.568 
-L 91.611429 272.736 
-L 125.622857 275.904 
-L 159.634286 279.072 
-L 193.645714 282.24 
+L 91.508114 272.736 
+L 125.416228 275.904 
+L 159.324342 279.072 
+L 193.232456 282.24 
 z
 " style="fill:#33638d;"/>
    </g>
    <g id="PathCollection_4">
-    <path clip-path="url(#p90d2bc968c)" d="M 159.634286 260.064 
-L 193.645714 263.232 
-L 227.657143 266.4 
-L 261.668571 269.568 
-L 295.68 272.736 
-L 295.68 256.896 
-L 295.68 253.728 
-L 261.668571 250.56 
-L 227.657143 247.392 
-L 193.645714 244.224 
-L 159.634286 241.056 
-L 125.622857 237.888 
-L 91.611429 234.72 
+    <path clip-path="url(#p1d48955717)" d="M 159.324342 260.064 
+L 193.232456 263.232 
+L 227.14057 266.4 
+L 261.048684 269.568 
+L 294.956798 272.736 
+L 294.956798 256.896 
+L 294.956798 253.728 
+L 261.048684 250.56 
+L 227.14057 247.392 
+L 193.232456 244.224 
+L 159.324342 241.056 
+L 125.416228 237.888 
+L 91.508114 234.72 
 L 57.6 231.552 
 L 57.6 250.56 
-L 91.611429 253.728 
-L 125.622857 256.896 
+L 91.508114 253.728 
+L 125.416228 256.896 
 z
 " style="fill:#26828e;"/>
    </g>
    <g id="PathCollection_5">
-    <path clip-path="url(#p90d2bc968c)" d="M 91.611429 234.72 
-L 125.622857 237.888 
-L 159.634286 241.056 
-L 193.645714 244.224 
-L 227.657143 247.392 
-L 261.668571 250.56 
-L 295.68 253.728 
-L 295.68 234.72 
-L 261.668571 231.552 
-L 227.657143 228.384 
-L 193.645714 225.216 
-L 159.634286 222.048 
-L 125.622857 218.88 
-L 91.611429 215.712 
+    <path clip-path="url(#p1d48955717)" d="M 91.508114 234.72 
+L 125.416228 237.888 
+L 159.324342 241.056 
+L 193.232456 244.224 
+L 227.14057 247.392 
+L 261.048684 250.56 
+L 294.956798 253.728 
+L 294.956798 234.72 
+L 261.048684 231.552 
+L 227.14057 228.384 
+L 193.232456 225.216 
+L 159.324342 222.048 
+L 125.416228 218.88 
+L 91.508114 215.712 
 L 57.6 212.544 
 L 57.6 231.552 
 z
 " style="fill:#1fa088;"/>
    </g>
    <g id="PathCollection_6">
-    <path clip-path="url(#p90d2bc968c)" d="M 295.68 234.72 
-L 295.68 231.552 
-L 295.68 215.712 
-L 261.668571 212.544 
-L 227.657143 209.376 
-L 193.645714 206.208 
-L 159.634286 203.04 
-L 125.622857 199.872 
-L 91.611429 196.704 
+    <path clip-path="url(#p1d48955717)" d="M 294.956798 234.72 
+L 294.956798 231.552 
+L 294.956798 215.712 
+L 261.048684 212.544 
+L 227.14057 209.376 
+L 193.232456 206.208 
+L 159.324342 203.04 
+L 125.416228 199.872 
+L 91.508114 196.704 
 L 57.6 193.536 
 L 57.6 206.208 
 L 57.6 212.544 
-L 91.611429 215.712 
-L 125.622857 218.88 
-L 159.634286 222.048 
-L 193.645714 225.216 
-L 227.657143 228.384 
-L 261.668571 231.552 
+L 91.508114 215.712 
+L 125.416228 218.88 
+L 159.324342 222.048 
+L 193.232456 225.216 
+L 227.14057 228.384 
+L 261.048684 231.552 
 z
 " style="fill:#3fbc73;"/>
    </g>
    <g id="PathCollection_7">
-    <path clip-path="url(#p90d2bc968c)" d="M 227.657143 209.376 
-L 261.668571 212.544 
-L 295.68 215.712 
-L 295.68 206.208 
-L 295.68 196.704 
-L 261.668571 193.536 
-L 227.657143 190.368 
-L 193.645714 187.2 
-L 159.634286 184.032 
-L 125.622857 180.864 
-L 91.611429 180.864 
+    <path clip-path="url(#p1d48955717)" d="M 227.14057 209.376 
+L 261.048684 212.544 
+L 294.956798 215.712 
+L 294.956798 206.208 
+L 294.956798 196.704 
+L 261.048684 193.536 
+L 227.14057 190.368 
+L 193.232456 187.2 
+L 159.324342 184.032 
+L 125.416228 180.864 
+L 91.508114 180.864 
 L 57.6 180.864 
 L 57.6 193.536 
-L 91.611429 196.704 
-L 125.622857 199.872 
-L 159.634286 203.04 
-L 193.645714 206.208 
+L 91.508114 196.704 
+L 125.416228 199.872 
+L 159.324342 203.04 
+L 193.232456 206.208 
 z
 " style="fill:#84d44b;"/>
    </g>
    <g id="PathCollection_8">
-    <path clip-path="url(#p90d2bc968c)" d="M 159.634286 184.032 
-L 193.645714 187.2 
-L 227.657143 190.368 
-L 261.668571 193.536 
-L 295.68 196.704 
-L 295.68 180.864 
-L 261.668571 180.864 
-L 227.657143 180.864 
-L 193.645714 180.864 
-L 159.634286 180.864 
-L 125.622857 180.864 
+    <path clip-path="url(#p1d48955717)" d="M 159.324342 184.032 
+L 193.232456 187.2 
+L 227.14057 190.368 
+L 261.048684 193.536 
+L 294.956798 196.704 
+L 294.956798 180.864 
+L 261.048684 180.864 
+L 227.14057 180.864 
+L 193.232456 180.864 
+L 159.324342 180.864 
+L 125.416228 180.864 
 z
 " style="fill:#d8e219;"/>
    </g>
    <g id="QuadMesh_1">
-    <path clip-path="url(#p90d2bc968c)" d="M 57.6 168.192 
-L 80.274286 168.192 
-L 80.274286 160.272 
+    <path clip-path="url(#p1d48955717)" d="M 57.6 168.192 
+L 80.205409 168.192 
+L 80.205409 160.272 
 L 57.6 160.272 
 L 57.6 168.192 
 " style="fill:#440154;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 80.274286 168.192 
-L 102.948571 168.192 
-L 102.948571 160.272 
-L 80.274286 160.272 
-L 80.274286 168.192 
+    <path clip-path="url(#p1d48955717)" d="M 80.205409 168.192 
+L 102.810819 168.192 
+L 102.810819 160.272 
+L 80.205409 160.272 
+L 80.205409 168.192 
 " style="fill:#46085c;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 102.948571 168.192 
-L 125.622857 168.192 
-L 125.622857 160.272 
-L 102.948571 160.272 
-L 102.948571 168.192 
+    <path clip-path="url(#p1d48955717)" d="M 102.810819 168.192 
+L 125.416228 168.192 
+L 125.416228 160.272 
+L 102.810819 160.272 
+L 102.810819 168.192 
 " style="fill:#471063;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 125.622857 168.192 
-L 148.297143 168.192 
-L 148.297143 160.272 
-L 125.622857 160.272 
-L 125.622857 168.192 
+    <path clip-path="url(#p1d48955717)" d="M 125.416228 168.192 
+L 148.021637 168.192 
+L 148.021637 160.272 
+L 125.416228 160.272 
+L 125.416228 168.192 
 " style="fill:#48186a;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 148.297143 168.192 
-L 170.971429 168.192 
-L 170.971429 160.272 
-L 148.297143 160.272 
-L 148.297143 168.192 
+    <path clip-path="url(#p1d48955717)" d="M 148.021637 168.192 
+L 170.627047 168.192 
+L 170.627047 160.272 
+L 148.021637 160.272 
+L 148.021637 168.192 
 " style="fill:#481f70;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 170.971429 168.192 
-L 193.645714 168.192 
-L 193.645714 160.272 
-L 170.971429 160.272 
-L 170.971429 168.192 
+    <path clip-path="url(#p1d48955717)" d="M 170.627047 168.192 
+L 193.232456 168.192 
+L 193.232456 160.272 
+L 170.627047 160.272 
+L 170.627047 168.192 
 " style="fill:#482677;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 57.6 160.272 
-L 80.274286 160.272 
-L 80.274286 152.352 
+    <path clip-path="url(#p1d48955717)" d="M 57.6 160.272 
+L 80.205409 160.272 
+L 80.205409 152.352 
 L 57.6 152.352 
 L 57.6 160.272 
 " style="fill:#472d7b;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 80.274286 160.272 
-L 102.948571 160.272 
-L 102.948571 152.352 
-L 80.274286 152.352 
-L 80.274286 160.272 
+    <path clip-path="url(#p1d48955717)" d="M 80.205409 160.272 
+L 102.810819 160.272 
+L 102.810819 152.352 
+L 80.205409 152.352 
+L 80.205409 160.272 
 " style="fill:#463480;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 102.948571 160.272 
-L 125.622857 160.272 
-L 125.622857 152.352 
-L 102.948571 152.352 
-L 102.948571 160.272 
+    <path clip-path="url(#p1d48955717)" d="M 102.810819 160.272 
+L 125.416228 160.272 
+L 125.416228 152.352 
+L 102.810819 152.352 
+L 102.810819 160.272 
 " style="fill:#443a83;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 125.622857 160.272 
-L 148.297143 160.272 
-L 148.297143 152.352 
-L 125.622857 152.352 
-L 125.622857 160.272 
+    <path clip-path="url(#p1d48955717)" d="M 125.416228 160.272 
+L 148.021637 160.272 
+L 148.021637 152.352 
+L 125.416228 152.352 
+L 125.416228 160.272 
 " style="fill:#424186;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 148.297143 160.272 
-L 170.971429 160.272 
-L 170.971429 152.352 
-L 148.297143 152.352 
-L 148.297143 160.272 
+    <path clip-path="url(#p1d48955717)" d="M 148.021637 160.272 
+L 170.627047 160.272 
+L 170.627047 152.352 
+L 148.021637 152.352 
+L 148.021637 160.272 
 " style="fill:#3f4788;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 170.971429 160.272 
-L 193.645714 160.272 
-L 193.645714 152.352 
-L 170.971429 152.352 
-L 170.971429 160.272 
+    <path clip-path="url(#p1d48955717)" d="M 170.627047 160.272 
+L 193.232456 160.272 
+L 193.232456 152.352 
+L 170.627047 152.352 
+L 170.627047 160.272 
 " style="fill:#3d4d8a;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 57.6 152.352 
-L 80.274286 152.352 
-L 80.274286 144.432 
+    <path clip-path="url(#p1d48955717)" d="M 57.6 152.352 
+L 80.205409 152.352 
+L 80.205409 144.432 
 L 57.6 144.432 
 L 57.6 152.352 
 " style="fill:#3a538b;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 80.274286 152.352 
-L 102.948571 152.352 
-L 102.948571 144.432 
-L 80.274286 144.432 
-L 80.274286 152.352 
+    <path clip-path="url(#p1d48955717)" d="M 80.205409 152.352 
+L 102.810819 152.352 
+L 102.810819 144.432 
+L 80.205409 144.432 
+L 80.205409 152.352 
 " style="fill:#38598c;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 102.948571 152.352 
-L 125.622857 152.352 
-L 125.622857 144.432 
-L 102.948571 144.432 
-L 102.948571 152.352 
+    <path clip-path="url(#p1d48955717)" d="M 102.810819 152.352 
+L 125.416228 152.352 
+L 125.416228 144.432 
+L 102.810819 144.432 
+L 102.810819 152.352 
 " style="fill:#355f8d;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 125.622857 152.352 
-L 148.297143 152.352 
-L 148.297143 144.432 
-L 125.622857 144.432 
-L 125.622857 152.352 
+    <path clip-path="url(#p1d48955717)" d="M 125.416228 152.352 
+L 148.021637 152.352 
+L 148.021637 144.432 
+L 125.416228 144.432 
+L 125.416228 152.352 
 " style="fill:#32648e;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 148.297143 152.352 
-L 170.971429 152.352 
-L 170.971429 144.432 
-L 148.297143 144.432 
-L 148.297143 152.352 
+    <path clip-path="url(#p1d48955717)" d="M 148.021637 152.352 
+L 170.627047 152.352 
+L 170.627047 144.432 
+L 148.021637 144.432 
+L 148.021637 152.352 
 " style="fill:#306a8e;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 170.971429 152.352 
-L 193.645714 152.352 
-L 193.645714 144.432 
-L 170.971429 144.432 
-L 170.971429 152.352 
+    <path clip-path="url(#p1d48955717)" d="M 170.627047 152.352 
+L 193.232456 152.352 
+L 193.232456 144.432 
+L 170.627047 144.432 
+L 170.627047 152.352 
 " style="fill:#2e6f8e;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 57.6 144.432 
-L 80.274286 144.432 
-L 80.274286 136.512 
+    <path clip-path="url(#p1d48955717)" d="M 57.6 144.432 
+L 80.205409 144.432 
+L 80.205409 136.512 
 L 57.6 136.512 
 L 57.6 144.432 
 " style="fill:#2b748e;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 80.274286 144.432 
-L 102.948571 144.432 
-L 102.948571 136.512 
-L 80.274286 136.512 
-L 80.274286 144.432 
+    <path clip-path="url(#p1d48955717)" d="M 80.205409 144.432 
+L 102.810819 144.432 
+L 102.810819 136.512 
+L 80.205409 136.512 
+L 80.205409 144.432 
 " style="fill:#29798e;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 102.948571 144.432 
-L 125.622857 144.432 
-L 125.622857 136.512 
-L 102.948571 136.512 
-L 102.948571 144.432 
+    <path clip-path="url(#p1d48955717)" d="M 102.810819 144.432 
+L 125.416228 144.432 
+L 125.416228 136.512 
+L 102.810819 136.512 
+L 102.810819 144.432 
 " style="fill:#277e8e;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 125.622857 144.432 
-L 148.297143 144.432 
-L 148.297143 136.512 
-L 125.622857 136.512 
-L 125.622857 144.432 
+    <path clip-path="url(#p1d48955717)" d="M 125.416228 144.432 
+L 148.021637 144.432 
+L 148.021637 136.512 
+L 125.416228 136.512 
+L 125.416228 144.432 
 " style="fill:#25838e;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 148.297143 144.432 
-L 170.971429 144.432 
-L 170.971429 136.512 
-L 148.297143 136.512 
-L 148.297143 144.432 
+    <path clip-path="url(#p1d48955717)" d="M 148.021637 144.432 
+L 170.627047 144.432 
+L 170.627047 136.512 
+L 148.021637 136.512 
+L 148.021637 144.432 
 " style="fill:#23888e;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 170.971429 144.432 
-L 193.645714 144.432 
-L 193.645714 136.512 
-L 170.971429 136.512 
-L 170.971429 144.432 
+    <path clip-path="url(#p1d48955717)" d="M 170.627047 144.432 
+L 193.232456 144.432 
+L 193.232456 136.512 
+L 170.627047 136.512 
+L 170.627047 144.432 
 " style="fill:#218e8d;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 57.6 136.512 
-L 80.274286 136.512 
-L 80.274286 128.592 
+    <path clip-path="url(#p1d48955717)" d="M 57.6 136.512 
+L 80.205409 136.512 
+L 80.205409 128.592 
 L 57.6 128.592 
 L 57.6 136.512 
 " style="fill:#20928c;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 80.274286 136.512 
-L 102.948571 136.512 
-L 102.948571 128.592 
-L 80.274286 128.592 
-L 80.274286 136.512 
+    <path clip-path="url(#p1d48955717)" d="M 80.205409 136.512 
+L 102.810819 136.512 
+L 102.810819 128.592 
+L 80.205409 128.592 
+L 80.205409 136.512 
 " style="fill:#1f988b;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 102.948571 136.512 
-L 125.622857 136.512 
-L 125.622857 128.592 
-L 102.948571 128.592 
-L 102.948571 136.512 
+    <path clip-path="url(#p1d48955717)" d="M 102.810819 136.512 
+L 125.416228 136.512 
+L 125.416228 128.592 
+L 102.810819 128.592 
+L 102.810819 136.512 
 " style="fill:#1e9d89;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 125.622857 136.512 
-L 148.297143 136.512 
-L 148.297143 128.592 
-L 125.622857 128.592 
-L 125.622857 136.512 
+    <path clip-path="url(#p1d48955717)" d="M 125.416228 136.512 
+L 148.021637 136.512 
+L 148.021637 128.592 
+L 125.416228 128.592 
+L 125.416228 136.512 
 " style="fill:#1fa287;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 148.297143 136.512 
-L 170.971429 136.512 
-L 170.971429 128.592 
-L 148.297143 128.592 
-L 148.297143 136.512 
+    <path clip-path="url(#p1d48955717)" d="M 148.021637 136.512 
+L 170.627047 136.512 
+L 170.627047 128.592 
+L 148.021637 128.592 
+L 148.021637 136.512 
 " style="fill:#22a785;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 170.971429 136.512 
-L 193.645714 136.512 
-L 193.645714 128.592 
-L 170.971429 128.592 
-L 170.971429 136.512 
+    <path clip-path="url(#p1d48955717)" d="M 170.627047 136.512 
+L 193.232456 136.512 
+L 193.232456 128.592 
+L 170.627047 128.592 
+L 170.627047 136.512 
 " style="fill:#25ac82;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 57.6 128.592 
-L 80.274286 128.592 
-L 80.274286 120.672 
+    <path clip-path="url(#p1d48955717)" d="M 57.6 128.592 
+L 80.205409 128.592 
+L 80.205409 120.672 
 L 57.6 120.672 
 L 57.6 128.592 
 " style="fill:#2cb17e;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 80.274286 128.592 
-L 102.948571 128.592 
-L 102.948571 120.672 
-L 80.274286 120.672 
-L 80.274286 128.592 
+    <path clip-path="url(#p1d48955717)" d="M 80.205409 128.592 
+L 102.810819 128.592 
+L 102.810819 120.672 
+L 80.205409 120.672 
+L 80.205409 128.592 
 " style="fill:#32b67a;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 102.948571 128.592 
-L 125.622857 128.592 
-L 125.622857 120.672 
-L 102.948571 120.672 
-L 102.948571 128.592 
+    <path clip-path="url(#p1d48955717)" d="M 102.810819 128.592 
+L 125.416228 128.592 
+L 125.416228 120.672 
+L 102.810819 120.672 
+L 102.810819 128.592 
 " style="fill:#3bbb75;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 125.622857 128.592 
-L 148.297143 128.592 
-L 148.297143 120.672 
-L 125.622857 120.672 
-L 125.622857 128.592 
+    <path clip-path="url(#p1d48955717)" d="M 125.416228 128.592 
+L 148.021637 128.592 
+L 148.021637 120.672 
+L 125.416228 120.672 
+L 125.416228 128.592 
 " style="fill:#44bf70;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 148.297143 128.592 
-L 170.971429 128.592 
-L 170.971429 120.672 
-L 148.297143 120.672 
-L 148.297143 128.592 
+    <path clip-path="url(#p1d48955717)" d="M 148.021637 128.592 
+L 170.627047 128.592 
+L 170.627047 120.672 
+L 148.021637 120.672 
+L 148.021637 128.592 
 " style="fill:#50c46a;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 170.971429 128.592 
-L 193.645714 128.592 
-L 193.645714 120.672 
-L 170.971429 120.672 
-L 170.971429 128.592 
+    <path clip-path="url(#p1d48955717)" d="M 170.627047 128.592 
+L 193.232456 128.592 
+L 193.232456 120.672 
+L 170.627047 120.672 
+L 170.627047 128.592 
 " style="fill:#5ac864;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 57.6 120.672 
-L 80.274286 120.672 
-L 80.274286 112.752 
+    <path clip-path="url(#p1d48955717)" d="M 57.6 120.672 
+L 80.205409 120.672 
+L 80.205409 112.752 
 L 57.6 112.752 
 L 57.6 120.672 
 " style="fill:#67cc5c;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 80.274286 120.672 
-L 102.948571 120.672 
-L 102.948571 112.752 
-L 80.274286 112.752 
-L 80.274286 120.672 
+    <path clip-path="url(#p1d48955717)" d="M 80.205409 120.672 
+L 102.810819 120.672 
+L 102.810819 112.752 
+L 80.205409 112.752 
+L 80.205409 120.672 
 " style="fill:#73d056;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 102.948571 120.672 
-L 125.622857 120.672 
-L 125.622857 112.752 
-L 102.948571 112.752 
-L 102.948571 120.672 
+    <path clip-path="url(#p1d48955717)" d="M 102.810819 120.672 
+L 125.416228 120.672 
+L 125.416228 112.752 
+L 102.810819 112.752 
+L 102.810819 120.672 
 " style="fill:#7fd34e;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 125.622857 120.672 
-L 148.297143 120.672 
-L 148.297143 112.752 
-L 125.622857 112.752 
-L 125.622857 120.672 
+    <path clip-path="url(#p1d48955717)" d="M 125.416228 120.672 
+L 148.021637 120.672 
+L 148.021637 112.752 
+L 125.416228 112.752 
+L 125.416228 120.672 
 " style="fill:#8ed645;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 148.297143 120.672 
-L 170.971429 120.672 
-L 170.971429 112.752 
-L 148.297143 112.752 
-L 148.297143 120.672 
+    <path clip-path="url(#p1d48955717)" d="M 148.021637 120.672 
+L 170.627047 120.672 
+L 170.627047 112.752 
+L 148.021637 112.752 
+L 148.021637 120.672 
 " style="fill:#9bd93c;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 170.971429 120.672 
-L 193.645714 120.672 
-L 193.645714 112.752 
-L 170.971429 112.752 
-L 170.971429 120.672 
+    <path clip-path="url(#p1d48955717)" d="M 170.627047 120.672 
+L 193.232456 120.672 
+L 193.232456 112.752 
+L 170.627047 112.752 
+L 170.627047 120.672 
 " style="fill:#aadc32;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 57.6 112.752 
-L 80.274286 112.752 
-L 80.274286 104.832 
+    <path clip-path="url(#p1d48955717)" d="M 57.6 112.752 
+L 80.205409 112.752 
+L 80.205409 104.832 
 L 57.6 104.832 
 L 57.6 112.752 
 " style="fill:#b8de29;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 80.274286 112.752 
-L 102.948571 112.752 
-L 102.948571 104.832 
-L 80.274286 104.832 
-L 80.274286 112.752 
+    <path clip-path="url(#p1d48955717)" d="M 80.205409 112.752 
+L 102.810819 112.752 
+L 102.810819 104.832 
+L 80.205409 104.832 
+L 80.205409 112.752 
 " style="fill:#c8e020;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 102.948571 112.752 
-L 125.622857 112.752 
-L 125.622857 104.832 
-L 102.948571 104.832 
-L 102.948571 112.752 
+    <path clip-path="url(#p1d48955717)" d="M 102.810819 112.752 
+L 125.416228 112.752 
+L 125.416228 104.832 
+L 102.810819 104.832 
+L 102.810819 112.752 
 " style="fill:#d5e21a;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 125.622857 112.752 
-L 148.297143 112.752 
-L 148.297143 104.832 
-L 125.622857 104.832 
-L 125.622857 112.752 
+    <path clip-path="url(#p1d48955717)" d="M 125.416228 112.752 
+L 148.021637 112.752 
+L 148.021637 104.832 
+L 125.416228 104.832 
+L 125.416228 112.752 
 " style="fill:#e5e419;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 148.297143 112.752 
-L 170.971429 112.752 
-L 170.971429 104.832 
-L 148.297143 104.832 
-L 148.297143 112.752 
+    <path clip-path="url(#p1d48955717)" d="M 148.021637 112.752 
+L 170.627047 112.752 
+L 170.627047 104.832 
+L 148.021637 104.832 
+L 148.021637 112.752 
 " style="fill:#f1e51d;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 170.971429 112.752 
-L 193.645714 112.752 
-L 193.645714 104.832 
-L 170.971429 104.832 
-L 170.971429 112.752 
+    <path clip-path="url(#p1d48955717)" d="M 170.627047 112.752 
+L 193.232456 112.752 
+L 193.232456 104.832 
+L 170.627047 104.832 
+L 170.627047 112.752 
 " style="fill:#fde725;"/>
    </g>
    <g id="PathCollection_9">
@@ -487,1956 +498,1956 @@ C -2.683901 -1.55874 -3 -0.795609 -3 0
 C -3 0.795609 -2.683901 1.55874 -2.12132 2.12132 
 C -1.55874 2.683901 -0.795609 3 0 3 
 z
-" id="mefe0d42b30" style="stroke:#1f77b4;"/>
+" id="mfb1b36b408" style="stroke:#1f77b4;"/>
     </defs>
-    <g clip-path="url(#p90d2bc968c)">
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="57.6" xlink:href="#mefe0d42b30" y="54.144"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="64.541108" xlink:href="#mefe0d42b30" y="59.316245"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="71.482216" xlink:href="#mefe0d42b30" y="64.48849"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="78.423324" xlink:href="#mefe0d42b30" y="69.660735"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="85.364431" xlink:href="#mefe0d42b30" y="74.83298"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="92.305539" xlink:href="#mefe0d42b30" y="80.005224"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="99.246647" xlink:href="#mefe0d42b30" y="85.177469"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="106.187755" xlink:href="#mefe0d42b30" y="90.349714"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="113.128863" xlink:href="#mefe0d42b30" y="95.521959"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="120.069971" xlink:href="#mefe0d42b30" y="100.694204"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="127.011079" xlink:href="#mefe0d42b30" y="105.866449"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="133.952187" xlink:href="#mefe0d42b30" y="111.038694"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="140.893294" xlink:href="#mefe0d42b30" y="116.210939"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="147.834402" xlink:href="#mefe0d42b30" y="121.383184"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="154.77551" xlink:href="#mefe0d42b30" y="126.555429"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="161.716618" xlink:href="#mefe0d42b30" y="131.727673"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="168.657726" xlink:href="#mefe0d42b30" y="136.899918"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="175.598834" xlink:href="#mefe0d42b30" y="142.072163"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="182.539942" xlink:href="#mefe0d42b30" y="147.244408"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="189.48105" xlink:href="#mefe0d42b30" y="152.416653"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="196.422157" xlink:href="#mefe0d42b30" y="157.588898"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="203.363265" xlink:href="#mefe0d42b30" y="162.761143"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="210.304373" xlink:href="#mefe0d42b30" y="167.933388"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="217.245481" xlink:href="#mefe0d42b30" y="173.105633"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="224.186589" xlink:href="#mefe0d42b30" y="178.277878"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="231.127697" xlink:href="#mefe0d42b30" y="183.450122"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="238.068805" xlink:href="#mefe0d42b30" y="188.622367"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="245.009913" xlink:href="#mefe0d42b30" y="193.794612"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="251.95102" xlink:href="#mefe0d42b30" y="198.966857"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="258.892128" xlink:href="#mefe0d42b30" y="204.139102"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="265.833236" xlink:href="#mefe0d42b30" y="209.311347"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="272.774344" xlink:href="#mefe0d42b30" y="214.483592"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="279.715452" xlink:href="#mefe0d42b30" y="219.655837"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="286.65656" xlink:href="#mefe0d42b30" y="224.828082"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="293.597668" xlink:href="#mefe0d42b30" y="230.000327"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="300.538776" xlink:href="#mefe0d42b30" y="235.172571"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="307.479883" xlink:href="#mefe0d42b30" y="240.344816"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="314.420991" xlink:href="#mefe0d42b30" y="245.517061"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="321.362099" xlink:href="#mefe0d42b30" y="250.689306"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="328.303207" xlink:href="#mefe0d42b30" y="255.861551"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="335.244315" xlink:href="#mefe0d42b30" y="261.033796"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="342.185423" xlink:href="#mefe0d42b30" y="266.206041"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="349.126531" xlink:href="#mefe0d42b30" y="271.378286"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="356.067638" xlink:href="#mefe0d42b30" y="276.550531"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="363.008746" xlink:href="#mefe0d42b30" y="281.722776"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="369.949854" xlink:href="#mefe0d42b30" y="286.89502"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="376.890962" xlink:href="#mefe0d42b30" y="292.067265"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="383.83207" xlink:href="#mefe0d42b30" y="297.23951"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="390.773178" xlink:href="#mefe0d42b30" y="302.411755"/>
-     <use style="fill:#1f77b4;stroke:#1f77b4;" x="397.714286" xlink:href="#mefe0d42b30" y="307.584"/>
+    <g clip-path="url(#p1d48955717)">
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="57.6" xlink:href="#mfb1b36b408" y="54.144"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="64.520023" xlink:href="#mfb1b36b408" y="59.316245"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="71.440047" xlink:href="#mfb1b36b408" y="64.48849"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="78.36007" xlink:href="#mfb1b36b408" y="69.660735"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="85.280093" xlink:href="#mfb1b36b408" y="74.83298"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="92.200116" xlink:href="#mfb1b36b408" y="80.005224"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="99.12014" xlink:href="#mfb1b36b408" y="85.177469"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="106.040163" xlink:href="#mfb1b36b408" y="90.349714"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="112.960186" xlink:href="#mfb1b36b408" y="95.521959"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="119.880209" xlink:href="#mfb1b36b408" y="100.694204"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="126.800233" xlink:href="#mfb1b36b408" y="105.866449"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="133.720256" xlink:href="#mfb1b36b408" y="111.038694"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="140.640279" xlink:href="#mfb1b36b408" y="116.210939"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="147.560303" xlink:href="#mfb1b36b408" y="121.383184"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="154.480326" xlink:href="#mfb1b36b408" y="126.555429"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="161.400349" xlink:href="#mfb1b36b408" y="131.727673"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="168.320372" xlink:href="#mfb1b36b408" y="136.899918"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="175.240396" xlink:href="#mfb1b36b408" y="142.072163"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="182.160419" xlink:href="#mfb1b36b408" y="147.244408"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="189.080442" xlink:href="#mfb1b36b408" y="152.416653"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="196.000465" xlink:href="#mfb1b36b408" y="157.588898"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="202.920489" xlink:href="#mfb1b36b408" y="162.761143"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="209.840512" xlink:href="#mfb1b36b408" y="167.933388"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="216.760535" xlink:href="#mfb1b36b408" y="173.105633"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="223.680559" xlink:href="#mfb1b36b408" y="178.277878"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="230.600582" xlink:href="#mfb1b36b408" y="183.450122"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="237.520605" xlink:href="#mfb1b36b408" y="188.622367"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="244.440628" xlink:href="#mfb1b36b408" y="193.794612"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="251.360652" xlink:href="#mfb1b36b408" y="198.966857"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="258.280675" xlink:href="#mfb1b36b408" y="204.139102"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="265.200698" xlink:href="#mfb1b36b408" y="209.311347"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="272.120722" xlink:href="#mfb1b36b408" y="214.483592"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="279.040745" xlink:href="#mfb1b36b408" y="219.655837"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="285.960768" xlink:href="#mfb1b36b408" y="224.828082"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="292.880791" xlink:href="#mfb1b36b408" y="230.000327"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="299.800815" xlink:href="#mfb1b36b408" y="235.172571"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="306.720838" xlink:href="#mfb1b36b408" y="240.344816"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="313.640861" xlink:href="#mfb1b36b408" y="245.517061"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="320.560884" xlink:href="#mfb1b36b408" y="250.689306"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="327.480908" xlink:href="#mfb1b36b408" y="255.861551"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="334.400931" xlink:href="#mfb1b36b408" y="261.033796"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="341.320954" xlink:href="#mfb1b36b408" y="266.206041"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="348.240978" xlink:href="#mfb1b36b408" y="271.378286"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="355.161001" xlink:href="#mfb1b36b408" y="276.550531"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="362.081024" xlink:href="#mfb1b36b408" y="281.722776"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="369.001047" xlink:href="#mfb1b36b408" y="286.89502"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="375.921071" xlink:href="#mfb1b36b408" y="292.067265"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="382.841094" xlink:href="#mfb1b36b408" y="297.23951"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="389.761117" xlink:href="#mfb1b36b408" y="302.411755"/>
+     <use style="fill:#1f77b4;stroke:#1f77b4;" x="396.68114" xlink:href="#mfb1b36b408" y="307.584"/>
     </g>
    </g>
    <g id="Quiver_1">
-    <path clip-path="url(#p90d2bc968c)" d="M 329.4564 154.201585 
-L 351.499982 150.271959 
-L 349.711509 147.870158 
-L 363.600745 149.475115 
-L 351.121682 155.780648 
-L 351.970039 152.908789 
-L 329.926457 156.838415 
-L 329.4564 154.201585 
+    <path clip-path="url(#p1d48955717)" d="M 328.629884 154.201585 
+L 350.673465 150.271959 
+L 348.884993 147.870158 
+L 362.774229 149.475115 
+L 350.295166 155.780648 
+L 351.143523 152.908789 
+L 329.099941 156.838415 
+L 328.629884 154.201585 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 340.230264 154.196064 
-L 359.690468 151.232563 
-L 357.9633 148.786306 
-L 371.807512 150.741957 
-L 359.172996 156.729925 
-L 360.0937 153.880436 
-L 340.633496 156.843936 
-L 340.230264 154.196064 
+    <path clip-path="url(#p1d48955717)" d="M 339.371122 154.196064 
+L 358.831327 151.232563 
+L 357.104158 148.786306 
+L 370.94837 150.741957 
+L 358.313854 156.729925 
+L 359.234558 153.880436 
+L 339.774354 156.843936 
+L 339.371122 154.196064 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 351.055383 154.185916 
-L 365.506916 152.919074 
-L 363.938937 150.367854 
-L 377.630619 153.200629 
-L 364.640623 158.372358 
-L 365.740811 155.587242 
-L 351.289279 156.854084 
-L 351.055383 154.185916 
+    <path clip-path="url(#p1d48955717)" d="M 350.163616 154.185916 
+L 364.615148 152.919074 
+L 363.047169 150.367854 
+L 376.738851 153.200629 
+L 363.748855 158.372358 
+L 364.849044 155.587242 
+L 350.397511 156.854084 
+L 350.163616 154.185916 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 361.986841 154.182849 
-L 369.596079 154.604293 
-L 368.407046 151.855933 
-L 381.556375 156.607976 
-L 367.962691 159.878837 
-L 369.44796 157.278594 
-L 361.838723 156.857151 
-L 361.986841 154.182849 
+    <path clip-path="url(#p1d48955717)" d="M 361.062448 154.182849 
+L 368.671686 154.604293 
+L 367.482653 151.855933 
+L 380.631982 156.607976 
+L 367.038298 159.878837 
+L 368.523567 157.278594 
+L 360.91433 156.857151 
+L 361.062448 154.182849 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 373.163935 154.35945 
-L 374.324485 154.870152 
-L 374.18534 152.038349 
-L 384.258735 160.627022 
-L 371.121127 159.001651 
-L 373.303081 157.191252 
-L 372.142531 156.68055 
-L 373.163935 154.35945 
+    <path clip-path="url(#p1d48955717)" d="M 372.206917 154.35945 
+L 373.367467 154.870152 
+L 373.228321 152.038349 
+L 383.301716 160.627022 
+L 370.164108 159.001651 
+L 372.346062 157.191252 
+L 371.185512 156.68055 
+L 372.206917 154.35945 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 384.327714 155.206104 
-L 384.641609 156.140134 
-L 386.195772 154.578313 
-L 386.532642 164.860294 
-L 380.591596 156.461687 
-L 382.773551 156.767925 
-L 382.459655 155.833896 
-L 384.327714 155.206104 
+    <path clip-path="url(#p1d48955717)" d="M 383.338069 155.206104 
+L 383.651965 156.140134 
+L 385.206128 154.578313 
+L 385.542997 164.860294 
+L 379.601952 156.461687 
+L 381.783906 156.767925 
+L 381.47001 155.833896 
+L 383.338069 155.206104 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 395.39097 155.98241 
-L 394.633937 158.040033 
-L 397.610016 157.708019 
-L 389.21541 168.889135 
-L 390.069008 154.933558 
-L 392.120267 157.115213 
-L 392.877301 155.05759 
-L 395.39097 155.98241 
+    <path clip-path="url(#p1d48955717)" d="M 394.3687 155.98241 
+L 393.611667 158.040033 
+L 396.587746 157.708019 
+L 388.19314 168.889135 
+L 389.046738 154.933558 
+L 391.097997 157.115213 
+L 391.855031 155.05759 
+L 394.3687 155.98241 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.048292 138.338601 
-L 344.294753 129.991051 
-L 341.833818 128.284862 
-L 355.509853 125.377485 
-L 345.692636 135.332837 
-L 345.581026 132.340376 
-L 330.334565 140.687926 
-L 329.048292 138.338601 
+    <path clip-path="url(#p1d48955717)" d="M 328.221776 138.338601 
+L 343.468237 129.991051 
+L 341.007302 128.284862 
+L 354.683337 125.377485 
+L 344.86612 135.332837 
+L 344.75451 132.340376 
+L 329.508049 140.687926 
+L 328.221776 138.338601 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 339.784087 138.341162 
-L 352.519918 131.302364 
-L 350.05223 129.605955 
-L 363.71662 126.644327 
-L 353.938989 136.638561 
-L 353.815504 133.646566 
-L 341.079673 140.685364 
-L 339.784087 138.341162 
+    <path clip-path="url(#p1d48955717)" d="M 338.924945 138.341162 
+L 351.660776 131.302364 
+L 349.193089 129.605955 
+L 362.857478 126.644327 
+L 353.079847 136.638561 
+L 352.956362 133.646566 
+L 340.220531 140.685364 
+L 338.924945 138.341162 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 350.511989 138.348186 
-L 358.393688 133.881 
-L 355.907927 132.211187 
-L 369.539726 129.103 
-L 359.869979 139.201651 
-L 359.714372 136.211155 
-L 351.832673 140.67834 
-L 350.511989 138.348186 
+    <path clip-path="url(#p1d48955717)" d="M 349.620221 138.348186 
+L 357.501921 133.881 
+L 355.01616 132.211187 
+L 368.647959 129.103 
+L 358.978212 139.201651 
+L 358.822605 136.211155 
+L 350.940905 140.67834 
+L 349.620221 138.348186 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 361.21858 138.368038 
-L 362.464258 137.612944 
-L 359.930628 136.016697 
-L 373.465483 132.510347 
-L 364.095843 142.888045 
-L 363.852663 139.903393 
-L 362.606984 140.658488 
-L 361.21858 138.368038 
+    <path clip-path="url(#p1d48955717)" d="M 360.294186 138.368038 
+L 361.539865 137.612944 
+L 359.006235 136.016697 
+L 372.54109 132.510347 
+L 363.17145 142.888045 
+L 362.92827 139.903393 
+L 361.682591 140.658488 
+L 360.294186 138.368038 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 372.354846 139.161802 
-L 372.706307 138.863415 
-L 371.758072 138.45888 
-L 376.167843 136.529392 
-L 373.548394 140.567646 
-L 373.303081 139.566337 
-L 372.95162 139.864724 
-L 372.354846 139.161802 
+    <path clip-path="url(#p1d48955717)" d="M 371.397827 139.161802 
+L 371.749288 138.863415 
+L 370.801053 138.45888 
+L 375.210824 136.529392 
+L 372.591376 140.567646 
+L 372.346062 139.566337 
+L 371.994601 139.864724 
+L 371.397827 139.161802 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 383.518624 140.008457 
-L 383.023431 140.133397 
-L 383.768505 140.998844 
-L 378.441749 140.762665 
-L 383.018864 138.027683 
-L 382.773551 139.14301 
-L 383.268744 139.01807 
-L 383.518624 140.008457 
+    <path clip-path="url(#p1d48955717)" d="M 382.52898 140.008457 
+L 382.033786 140.133397 
+L 382.77886 140.998844 
+L 377.452105 140.762665 
+L 382.029219 138.027683 
+L 381.783906 139.14301 
+L 382.2791 139.01807 
+L 382.52898 140.008457 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 394.637613 140.754217 
-L 392.796581 141.501158 
-L 395.044491 143.479588 
-L 381.124518 144.791506 
-L 392.023623 136.033864 
-L 391.789625 139.01925 
-L 393.630657 138.272309 
-L 394.637613 140.754217 
+    <path clip-path="url(#p1d48955717)" d="M 393.615343 140.754217 
+L 391.774311 141.501158 
+L 394.022221 143.479588 
+L 380.102248 144.791506 
+L 391.001353 136.033864 
+L 390.767355 139.01925 
+L 392.608387 138.272309 
+L 393.615343 140.754217 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 328.657625 122.655229 
-L 339.038963 110.048271 
-L 336.120058 109.379481 
-L 347.734439 101.595335 
-L 342.32288 114.487263 
-L 341.10657 111.750865 
-L 330.725232 124.357823 
-L 328.657625 122.655229 
+    <path clip-path="url(#p1d48955717)" d="M 327.831109 122.655229 
+L 338.212446 110.048271 
+L 335.293542 109.379481 
+L 346.907923 101.595335 
+L 341.496364 114.487263 
+L 340.280054 111.750865 
+L 329.898716 124.357823 
+L 327.831109 122.655229 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 339.361169 122.702141 
-L 347.631031 111.694189 
-L 344.685225 111.15613 
-L 355.941206 102.862177 
-L 351.109489 115.982439 
-L 349.772453 113.302959 
-L 341.50259 124.310911 
-L 339.361169 122.702141 
+    <path clip-path="url(#p1d48955717)" d="M 338.502027 122.702141 
+L 346.771889 111.694189 
+L 343.826083 111.15613 
+L 355.082064 102.862177 
+L 350.250348 115.982439 
+L 348.913311 113.302959 
+L 340.643449 124.310911 
+L 338.502027 122.702141 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 350.015106 122.832518 
-L 354.54101 115.061863 
-L 351.552552 114.87107 
-L 361.764313 105.320849 
-L 358.495901 118.915122 
-L 356.85546 116.40988 
-L 352.329556 124.180535 
-L 350.015106 122.832518 
+    <path clip-path="url(#p1d48955717)" d="M 349.123339 122.832518 
+L 353.649243 115.061863 
+L 350.660785 114.87107 
+L 360.872545 105.320849 
+L 357.604133 118.915122 
+L 355.963692 116.40988 
+L 351.437788 124.180535 
+L 349.123339 122.832518 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 360.615294 123.174893 
-L 361.407881 120.073958 
-L 358.481271 120.70818 
-L 365.690069 108.728196 
-L 366.266201 122.69798 
-L 364.002858 120.737225 
-L 363.21027 123.83816 
-L 360.615294 123.174893 
+    <path clip-path="url(#p1d48955717)" d="M 359.690901 123.174893 
+L 360.483488 120.073958 
+L 357.556878 120.70818 
+L 364.765676 108.728196 
+L 365.341808 122.69798 
+L 363.078465 120.737225 
+L 362.285877 123.83816 
+L 359.690901 123.174893 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 371.577305 123.932607 
-L 371.151224 122.856678 
-L 369.425448 124.784767 
-L 368.392429 112.747242 
-L 375.881018 122.228285 
-L 373.303081 122.004517 
-L 373.729162 123.080446 
-L 371.577305 123.932607 
+    <path clip-path="url(#p1d48955717)" d="M 370.620286 123.932607 
+L 370.194206 122.856678 
+L 368.468429 124.784767 
+L 367.43541 112.747242 
+L 374.924 122.228285 
+L 372.346062 122.004517 
+L 372.772143 123.080446 
+L 370.620286 123.932607 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 382.782647 124.698202 
-L 380.780375 123.671527 
-L 380.749975 126.665915 
-L 370.666335 116.980514 
-L 384.4162 119.515863 
-L 382.00245 121.288176 
-L 384.004722 122.314851 
-L 382.782647 124.698202 
+    <path clip-path="url(#p1d48955717)" d="M 381.793002 124.698202 
+L 379.790731 123.671527 
+L 379.760331 126.665915 
+L 369.676691 116.980514 
+L 383.426556 119.515863 
+L 381.012806 121.288176 
+L 383.015077 122.314851 
+L 381.793002 124.698202 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 393.974389 124.836165 
-L 385.156102 123.776711 
-L 386.166247 126.595734 
-L 373.349104 121.009356 
-L 387.124725 118.617905 
-L 385.475594 121.117435 
-L 394.293882 122.176888 
-L 393.974389 124.836165 
+    <path clip-path="url(#p1d48955717)" d="M 392.952119 124.836165 
+L 384.133832 123.776711 
+L 385.143977 126.595734 
+L 372.326834 121.009356 
+L 386.102455 118.617905 
+L 384.453324 121.117435 
+L 393.271612 122.176888 
+L 392.952119 124.836165 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 328.500871 106.886577 
-L 336.56485 91.230282 
-L 333.570522 91.194415 
-L 343.274317 81.128476 
-L 340.713868 94.873688 
-L 338.945965 92.456706 
-L 330.881986 108.113002 
-L 328.500871 106.886577 
+    <path clip-path="url(#p1d48955717)" d="M 327.674355 106.886577 
+L 335.738333 91.230282 
+L 332.744006 91.194415 
+L 342.447801 81.128476 
+L 339.887352 94.873688 
+L 338.119449 92.456706 
+L 330.05547 108.113002 
+L 327.674355 106.886577 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 339.206148 106.96031 
-L 345.400033 92.887422 
-L 342.40909 93.034194 
-L 351.481084 82.395318 
-L 349.763479 96.271074 
-L 347.851496 93.966382 
-L 341.657611 108.039269 
-L 339.206148 106.96031 
+    <path clip-path="url(#p1d48955717)" d="M 338.347006 106.96031 
+L 344.540891 92.887422 
+L 341.549948 93.034194 
+L 350.621942 82.395318 
+L 348.904337 96.271074 
+L 346.992354 93.966382 
+L 340.798469 108.039269 
+L 338.347006 106.96031 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 349.87968 107.149775 
-L 352.86141 96.137835 
-L 349.926094 96.730457 
-L 357.30419 84.85399 
-L 357.682 98.830543 
-L 355.446712 96.837863 
-L 352.464982 107.849804 
-L 349.87968 107.149775 
+    <path clip-path="url(#p1d48955717)" d="M 348.987912 107.149775 
+L 351.969643 96.137835 
+L 349.034327 96.730457 
+L 356.412423 84.85399 
+L 356.790233 98.830543 
+L 354.554945 96.837863 
+L 351.573214 107.849804 
+L 348.987912 107.149775 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 360.574425 107.547292 
-L 360.319113 100.354055 
-L 357.689902 101.787418 
-L 361.229947 88.261337 
-L 365.720045 101.502402 
-L 362.995828 100.25905 
-L 363.251139 107.452287 
-L 360.574425 107.547292 
+    <path clip-path="url(#p1d48955717)" d="M 359.650032 107.547292 
+L 359.39472 100.354055 
+L 356.765508 101.787418 
+L 360.305554 88.261337 
+L 364.795652 101.502402 
+L 362.071435 100.25905 
+L 362.326746 107.452287 
+L 359.650032 107.547292 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 371.491276 108.165607 
-L 368.762704 103.403813 
-L 367.104607 105.897405 
-L 363.932307 92.280383 
-L 374.076349 101.902502 
-L 371.086618 102.072179 
-L 373.81519 106.833972 
-L 371.491276 108.165607 
+    <path clip-path="url(#p1d48955717)" d="M 370.534257 108.165607 
+L 367.805685 103.403813 
+L 366.147588 105.897405 
+L 362.975288 92.280383 
+L 373.119331 101.902502 
+L 370.129599 102.072179 
+L 372.858171 106.833972 
+L 370.534257 108.165607 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 382.672429 108.628172 
-L 375.640399 104.133339 
-L 375.326271 107.111359 
-L 366.206213 96.513655 
-L 379.653804 100.341065 
-L 377.082911 101.876574 
-L 384.11494 106.371407 
-L 382.672429 108.628172 
+    <path clip-path="url(#p1d48955717)" d="M 381.682784 108.628172 
+L 374.650755 104.133339 
+L 374.336626 107.111359 
+L 365.216569 96.513655 
+L 378.66416 100.341065 
+L 376.093266 101.876574 
+L 383.125295 106.371407 
+L 381.682784 108.628172 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 393.778331 108.790859 
-L 380.1528 105.035809 
-L 380.732259 107.973752 
-L 368.888982 100.542496 
-L 382.867088 100.227337 
-L 380.864409 102.45367 
-L 394.48994 106.20872 
-L 393.778331 108.790859 
+    <path clip-path="url(#p1d48955717)" d="M 392.756061 108.790859 
+L 379.13053 105.035809 
+L 379.709989 107.973752 
+L 367.866712 100.542496 
+L 381.844818 100.227337 
+L 379.842139 102.45367 
+L 393.46767 106.20872 
+L 392.756061 108.790859 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 328.51745 90.848669 
-L 336.876801 75.619081 
-L 333.88446 75.504292 
-L 343.850234 65.697656 
-L 340.928332 79.370595 
-L 339.224758 76.907849 
-L 330.865407 92.137436 
-L 328.51745 90.848669 
+    <path clip-path="url(#p1d48955717)" d="M 327.690934 90.848669 
+L 336.050285 75.619081 
+L 333.057943 75.504292 
+L 343.023718 65.697656 
+L 340.101816 79.370595 
+L 338.398242 76.907849 
+L 330.038891 92.137436 
+L 327.690934 90.848669 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 339.221715 90.919504 
-L 345.684901 77.282433 
-L 342.691023 77.345501 
-L 352.057001 66.964498 
-L 349.952012 80.786792 
-L 348.105231 78.42953 
-L 341.642045 92.066601 
-L 339.221715 90.919504 
+    <path clip-path="url(#p1d48955717)" d="M 338.362573 90.919504 
+L 344.825759 77.282433 
+L 341.831881 77.345501 
+L 351.19786 66.964498 
+L 349.09287 80.786792 
+L 347.246089 78.42953 
+L 340.782903 92.066601 
+L 338.362573 90.919504 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 349.891005 91.103615 
-L 353.093843 80.565662 
-L 350.141754 81.068112 
-L 357.880108 69.423171 
-L 357.829707 83.404738 
-L 355.656493 81.344537 
-L 352.453656 91.88249 
-L 349.891005 91.103615 
+    <path clip-path="url(#p1d48955717)" d="M 348.999238 91.103615 
+L 352.202075 80.565662 
+L 349.249986 81.068112 
+L 356.98834 69.423171 
+L 356.937939 83.404738 
+L 354.764726 81.344537 
+L 351.561889 91.88249 
+L 348.999238 91.103615 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 360.573604 91.500725 
-L 360.535736 84.890792 
-L 357.865052 86.245315 
-L 361.805864 72.830518 
-L 365.90012 86.199282 
-L 363.214092 84.875448 
-L 363.25196 91.48538 
-L 360.573604 91.500725 
+    <path clip-path="url(#p1d48955717)" d="M 359.649211 91.500725 
+L 359.611343 84.890792 
+L 356.940659 86.245315 
+L 360.881471 72.830518 
+L 364.975727 86.199282 
+L 362.289699 84.875448 
+L 362.327567 91.48538 
+L 359.649211 91.500725 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 371.482892 92.14402 
-L 369.196592 88.033599 
-L 367.506878 90.505875 
-L 364.508224 76.849564 
-L 374.528923 86.60007 
-L 371.537274 86.731664 
-L 373.823574 90.842085 
-L 371.482892 92.14402 
+    <path clip-path="url(#p1d48955717)" d="M 370.525873 92.14402 
+L 368.239573 88.033599 
+L 366.549859 90.505875 
+L 363.551206 76.849564 
+L 373.571904 86.60007 
+L 370.580255 86.731664 
+L 372.866555 90.842085 
+L 370.525873 92.14402 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 382.682535 92.627832 
-L 376.283992 88.617959 
-L 375.996472 91.598666 
-L 366.782131 81.082836 
-L 380.263368 84.789992 
-L 377.706291 86.348401 
-L 384.104834 90.358274 
-L 382.682535 92.627832 
+    <path clip-path="url(#p1d48955717)" d="M 381.692891 92.627832 
+L 375.294348 88.617959 
+L 375.006828 91.598666 
+L 365.792486 81.082836 
+L 379.273724 84.789992 
+L 376.716646 86.348401 
+L 383.115189 90.358274 
+L 381.692891 92.627832 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 393.798754 92.789577 
-L 380.798238 89.426637 
-L 381.423999 92.355067 
-L 369.464899 85.111677 
-L 383.436289 84.57592 
-L 381.469002 86.833588 
-L 394.469517 90.196528 
-L 393.798754 92.789577 
+    <path clip-path="url(#p1d48955717)" d="M 392.776484 92.789577 
+L 379.775968 89.426637 
+L 380.401729 92.355067 
+L 368.442629 85.111677 
+L 382.414019 84.57592 
+L 380.446732 86.833588 
+L 393.447247 90.196528 
+L 392.776484 92.789577 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 328.72438 74.559885 
-L 339.935071 62.857687 
-L 337.074544 61.971873 
-L 349.239998 55.080683 
-L 342.876833 67.530459 
-L 341.869168 64.710549 
-L 330.658477 76.412747 
-L 328.72438 74.559885 
+    <path clip-path="url(#p1d48955717)" d="M 327.897864 74.559885 
+L 339.108555 62.857687 
+L 336.248028 61.971873 
+L 348.413482 55.080683 
+L 342.050317 67.530459 
+L 341.042652 64.710549 
+L 329.831961 76.412747 
+L 327.897864 74.559885 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 339.431017 74.596523 
-L 348.437768 64.465494 
-L 345.54625 63.68677 
-L 357.446765 56.347526 
-L 351.551424 69.025527 
-L 350.439492 66.245079 
-L 341.432742 76.376109 
-L 339.431017 74.596523 
+    <path clip-path="url(#p1d48955717)" d="M 338.571876 74.596523 
+L 347.578626 64.465494 
+L 344.687108 63.68677 
+L 356.587624 56.347526 
+L 350.692282 69.025527 
+L 349.580351 66.245079 
+L 340.5736 76.376109 
+L 338.571876 74.596523 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 350.088238 74.700059 
-L 355.109468 67.776775 
-L 352.155026 67.288354 
-L 363.269872 58.806198 
-L 358.659582 72.005895 
-L 357.277654 69.349289 
-L 352.256424 76.272573 
-L 350.088238 74.700059 
+    <path clip-path="url(#p1d48955717)" d="M 349.196471 74.700059 
+L 354.217701 67.776775 
+L 351.263259 67.288354 
+L 362.378104 58.806198 
+L 357.767815 72.005895 
+L 356.385886 69.349289 
+L 351.364656 76.272573 
+L 349.196471 74.700059 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 360.668519 74.991072 
-L 361.494175 72.91667 
-L 358.510406 73.170446 
-L 367.195629 62.213545 
-L 365.975985 76.141906 
-L 363.982702 73.907156 
-L 363.157045 75.981559 
-L 360.668519 74.991072 
+    <path clip-path="url(#p1d48955717)" d="M 359.744126 74.991072 
+L 360.569782 72.91667 
+L 357.586013 73.170446 
+L 366.271235 62.213545 
+L 365.051591 76.141906 
+L 363.058309 73.907156 
+L 362.232652 75.981559 
+L 359.744126 74.991072 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 371.727861 75.76184 
-L 371.452336 74.836468 
-L 369.877116 76.312889 
-L 369.897988 66.232591 
-L 375.429351 74.659742 
-L 373.303081 74.285419 
-L 373.578606 75.210791 
-L 371.727861 75.76184 
+    <path clip-path="url(#p1d48955717)" d="M 370.770842 75.76184 
+L 370.495317 74.836468 
+L 368.920097 76.312889 
+L 368.94097 66.232591 
+L 374.472332 74.659742 
+L 372.346062 74.285419 
+L 372.621587 75.210791 
+L 370.770842 75.76184 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 382.891639 76.608495 
-L 381.76946 76.106449 
-L 381.887548 78.852853 
-L 372.171895 70.465863 
-L 384.89982 72.119779 
-L 382.773551 73.862092 
-L 383.895729 74.364137 
-L 382.891639 76.608495 
+    <path clip-path="url(#p1d48955717)" d="M 381.901995 76.608495 
+L 380.779816 76.106449 
+L 380.897904 78.852853 
+L 371.18225 70.465863 
+L 383.910176 72.119779 
+L 381.783906 73.862092 
+L 382.906085 74.364137 
+L 381.901995 76.608495 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 394.065346 76.823748 
-L 386.822764 76.451236 
-L 388.022618 79.194889 
-L 374.854664 74.494704 
-L 388.435352 71.170297 
-L 386.960342 73.776372 
-L 394.202924 74.148884 
-L 394.065346 76.823748 
+    <path clip-path="url(#p1d48955717)" d="M 393.043076 76.823748 
+L 385.800494 76.451236 
+L 387.000348 79.194889 
+L 373.832393 74.494704 
+L 387.413082 71.170297 
+L 385.938072 73.776372 
+L 393.180654 74.148884 
+L 393.043076 76.823748 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.148177 58.255514 
-L 345.804363 50.863344 
-L 343.493796 48.958465 
-L 357.364198 47.198146 
-L 346.753304 56.302854 
-L 346.890866 53.311473 
-L 330.23468 60.703644 
-L 329.148177 58.255514 
+    <path clip-path="url(#p1d48955717)" d="M 328.321661 58.255514 
+L 344.977847 50.863344 
+L 342.66728 48.958465 
+L 356.537682 47.198146 
+L 345.926788 56.302854 
+L 346.06435 53.311473 
+L 329.408164 60.703644 
+L 328.321661 58.255514 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 339.894438 58.252952 
-L 353.993883 52.075336 
-L 351.692373 50.159524 
-L 365.570965 48.464988 
-L 354.917023 57.519285 
-L 355.068766 54.52859 
-L 340.969321 60.706206 
-L 339.894438 58.252952 
+    <path clip-path="url(#p1d48955717)" d="M 339.035296 58.252952 
+L 353.134741 52.075336 
+L 350.833231 50.159524 
+L 364.711823 48.464988 
+L 354.057881 57.519285 
+L 354.209624 54.52859 
+L 340.11018 60.706206 
+L 339.035296 58.252952 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 350.650496 58.246232 
-L 359.772114 54.38683 
-L 357.495096 52.441972 
-L 371.394071 50.92366 
-L 360.626107 59.842053 
-L 360.815784 56.853524 
-L 351.694166 60.712926 
-L 350.650496 58.246232 
+    <path clip-path="url(#p1d48955717)" d="M 349.758728 58.246232 
+L 358.880346 54.38683 
+L 356.603329 52.441972 
+L 370.502304 50.92366 
+L 359.73434 59.842053 
+L 359.924017 56.853524 
+L 350.802399 60.712926 
+L 349.758728 58.246232 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 361.432686 58.229393 
-L 363.58806 57.401687 
-L 361.377682 55.381411 
-L 375.319828 54.331008 
-L 364.258259 62.882526 
-L 364.548252 59.902058 
-L 362.392878 60.729765 
-L 361.432686 58.229393 
+    <path clip-path="url(#p1d48955717)" d="M 360.508293 58.229393 
+L 362.663667 57.401687 
+L 360.453289 55.381411 
+L 374.395435 54.331008 
+L 363.333866 62.882526 
+L 363.623859 59.902058 
+L 361.468485 60.729765 
+L 360.508293 58.229393 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 372.540281 58.942683 
-L 373.077176 58.829731 
-L 372.314375 57.868893 
-L 378.022188 58.350053 
-L 372.992091 61.090265 
-L 373.303081 59.903522 
-L 372.766186 60.016474 
-L 372.540281 58.942683 
+    <path clip-path="url(#p1d48955717)" d="M 371.583262 58.942683 
+L 372.120157 58.829731 
+L 371.357357 57.868893 
+L 377.065169 58.350053 
+L 372.035072 61.090265 
+L 372.346062 59.903522 
+L 371.809167 60.016474 
+L 371.583262 58.942683 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 383.704059 59.789338 
-L 383.3943 60.099713 
-L 384.324808 60.408856 
-L 380.296094 62.583326 
-L 382.46256 58.550302 
-L 382.773551 59.480195 
-L 383.08331 59.16982 
-L 383.704059 59.789338 
+    <path clip-path="url(#p1d48955717)" d="M 382.714414 59.789338 
+L 382.404655 60.099713 
+L 383.335164 60.408856 
+L 379.30645 62.583326 
+L 381.472916 58.550302 
+L 381.783906 59.480195 
+L 382.093665 59.16982 
+L 382.714414 59.789338 
 "/>
-    <path clip-path="url(#p90d2bc968c)" d="M 394.847394 60.595106 
-L 393.731867 61.308365 
-L 396.273912 62.826161 
-L 382.978863 66.612167 
-L 391.994359 56.132997 
-L 392.305349 59.07731 
-L 393.420877 58.364052 
-L 394.847394 60.595106 
+    <path clip-path="url(#p1d48955717)" d="M 393.825124 60.595106 
+L 392.709597 61.308365 
+L 395.251642 62.826161 
+L 381.956593 66.612167 
+L 390.972089 56.132997 
+L 391.283079 59.07731 
+L 392.398607 58.364052 
+L 393.825124 60.595106 
 "/>
    </g>
    <g id="Barbs_1">
-    <path clip-path="url(#p90d2bc968c)" d="M 227.657143 155.52 
-L 203.169505 156.298189 
-L 207.760937 156.152278 
-L 206.074822 151.303388 
-L 207.760937 156.152278 
+    <path clip-path="url(#p1d48955717)" d="M 227.14057 155.52 
+L 202.652932 156.298189 
+L 207.244364 156.152278 
+L 205.558249 151.303388 
+L 207.244364 156.152278 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 238.397594 155.52 
-L 213.90418 156.088021 
-L 218.496695 155.981517 
-L 216.852252 151.118336 
-L 218.496695 155.981517 
+    <path clip-path="url(#p1d48955717)" d="M 237.848396 155.52 
+L 213.354981 156.088021 
+L 217.947496 155.981517 
+L 216.303054 151.118336 
+L 217.947496 155.981517 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 249.138045 155.52 
-L 224.638768 155.708265 
-L 229.232383 155.672966 
-L 227.663525 150.784877 
-L 229.232383 155.672966 
+    <path clip-path="url(#p1d48955717)" d="M 248.556221 155.52 
+L 224.056945 155.708265 
+L 228.650559 155.672966 
+L 227.081701 150.784877 
+L 228.650559 155.672966 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 259.878496 151.845 
-L 258.742859 152.024867 
-L 257.718385 152.546863 
-L 256.905359 153.359889 
-L 256.383364 154.384363 
-L 256.203496 155.52 
-L 256.383364 156.655637 
-L 256.905359 157.680111 
-L 257.718385 158.493137 
-L 258.742859 159.015133 
-L 259.878496 159.195 
-L 261.014134 159.015133 
-L 262.038607 158.493137 
-L 262.851634 157.680111 
-L 263.373629 156.655637 
-L 263.553496 155.52 
-L 263.373629 154.384363 
-L 262.851634 153.359889 
-L 262.038607 152.546863 
-L 261.014134 152.024867 
-L 259.878496 151.845 
-L 259.878496 151.845 
-L 261.014134 152.024867 
-L 262.038607 152.546863 
-L 262.851634 153.359889 
-L 263.373629 154.384363 
-L 263.553496 155.52 
-L 263.373629 156.655637 
-L 262.851634 157.680111 
-L 262.038607 158.493137 
-L 261.014134 159.015133 
-L 259.878496 159.195 
-L 258.742859 159.015133 
-L 257.718385 158.493137 
-L 256.905359 157.680111 
-L 256.383364 156.655637 
-L 256.203496 155.52 
-L 256.383364 154.384363 
-L 256.905359 153.359889 
-L 257.718385 152.546863 
-L 258.742859 152.024867 
-L 259.878496 151.845 
+    <path clip-path="url(#p1d48955717)" d="M 259.264047 151.845 
+L 258.128409 152.024867 
+L 257.103936 152.546863 
+L 256.290909 153.359889 
+L 255.768914 154.384363 
+L 255.589047 155.52 
+L 255.768914 156.655637 
+L 256.290909 157.680111 
+L 257.103936 158.493137 
+L 258.128409 159.015133 
+L 259.264047 159.195 
+L 260.399684 159.015133 
+L 261.424158 158.493137 
+L 262.237184 157.680111 
+L 262.759179 156.655637 
+L 262.939047 155.52 
+L 262.759179 154.384363 
+L 262.237184 153.359889 
+L 261.424158 152.546863 
+L 260.399684 152.024867 
+L 259.264047 151.845 
+L 259.264047 151.845 
+L 260.399684 152.024867 
+L 261.424158 152.546863 
+L 262.237184 153.359889 
+L 262.759179 154.384363 
+L 262.939047 155.52 
+L 262.759179 156.655637 
+L 262.237184 157.680111 
+L 261.424158 158.493137 
+L 260.399684 159.015133 
+L 259.264047 159.195 
+L 258.128409 159.015133 
+L 257.103936 158.493137 
+L 256.290909 157.680111 
+L 255.768914 156.655637 
+L 255.589047 155.52 
+L 255.768914 154.384363 
+L 256.290909 153.359889 
+L 257.103936 152.546863 
+L 258.128409 152.024867 
+L 259.264047 151.845 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 270.618947 151.845 
-L 269.48331 152.024867 
-L 268.458837 152.546863 
-L 267.64581 153.359889 
-L 267.123815 154.384363 
-L 266.943947 155.52 
-L 267.123815 156.655637 
-L 267.64581 157.680111 
-L 268.458837 158.493137 
-L 269.48331 159.015133 
-L 270.618947 159.195 
-L 271.754585 159.015133 
-L 272.779058 158.493137 
-L 273.592085 157.680111 
-L 274.11408 156.655637 
-L 274.293947 155.52 
-L 274.11408 154.384363 
-L 273.592085 153.359889 
-L 272.779058 152.546863 
-L 271.754585 152.024867 
-L 270.618947 151.845 
-L 270.618947 151.845 
-L 271.754585 152.024867 
-L 272.779058 152.546863 
-L 273.592085 153.359889 
-L 274.11408 154.384363 
-L 274.293947 155.52 
-L 274.11408 156.655637 
-L 273.592085 157.680111 
-L 272.779058 158.493137 
-L 271.754585 159.015133 
-L 270.618947 159.195 
-L 269.48331 159.015133 
-L 268.458837 158.493137 
-L 267.64581 157.680111 
-L 267.123815 156.655637 
-L 266.943947 155.52 
-L 267.123815 154.384363 
-L 267.64581 153.359889 
-L 268.458837 152.546863 
-L 269.48331 152.024867 
-L 270.618947 151.845 
+    <path clip-path="url(#p1d48955717)" d="M 269.971872 151.845 
+L 268.836235 152.024867 
+L 267.811761 152.546863 
+L 266.998735 153.359889 
+L 266.476739 154.384363 
+L 266.296872 155.52 
+L 266.476739 156.655637 
+L 266.998735 157.680111 
+L 267.811761 158.493137 
+L 268.836235 159.015133 
+L 269.971872 159.195 
+L 271.10751 159.015133 
+L 272.131983 158.493137 
+L 272.94501 157.680111 
+L 273.467005 156.655637 
+L 273.646872 155.52 
+L 273.467005 154.384363 
+L 272.94501 153.359889 
+L 272.131983 152.546863 
+L 271.10751 152.024867 
+L 269.971872 151.845 
+L 269.971872 151.845 
+L 271.10751 152.024867 
+L 272.131983 152.546863 
+L 272.94501 153.359889 
+L 273.467005 154.384363 
+L 273.646872 155.52 
+L 273.467005 156.655637 
+L 272.94501 157.680111 
+L 272.131983 158.493137 
+L 271.10751 159.015133 
+L 269.971872 159.195 
+L 268.836235 159.015133 
+L 267.811761 158.493137 
+L 266.998735 157.680111 
+L 266.476739 156.655637 
+L 266.296872 155.52 
+L 266.476739 154.384363 
+L 266.998735 153.359889 
+L 267.811761 152.546863 
+L 268.836235 152.024867 
+L 269.971872 151.845 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 281.359398 151.845 
-L 280.223761 152.024867 
-L 279.199288 152.546863 
-L 278.386261 153.359889 
-L 277.864266 154.384363 
-L 277.684398 155.52 
-L 277.864266 156.655637 
-L 278.386261 157.680111 
-L 279.199288 158.493137 
-L 280.223761 159.015133 
-L 281.359398 159.195 
-L 282.495036 159.015133 
-L 283.519509 158.493137 
-L 284.332536 157.680111 
-L 284.854531 156.655637 
-L 285.034398 155.52 
-L 284.854531 154.384363 
-L 284.332536 153.359889 
-L 283.519509 152.546863 
-L 282.495036 152.024867 
-L 281.359398 151.845 
-L 281.359398 151.845 
-L 282.495036 152.024867 
-L 283.519509 152.546863 
-L 284.332536 153.359889 
-L 284.854531 154.384363 
-L 285.034398 155.52 
-L 284.854531 156.655637 
-L 284.332536 157.680111 
-L 283.519509 158.493137 
-L 282.495036 159.015133 
-L 281.359398 159.195 
-L 280.223761 159.015133 
-L 279.199288 158.493137 
-L 278.386261 157.680111 
-L 277.864266 156.655637 
-L 277.684398 155.52 
-L 277.864266 154.384363 
-L 278.386261 153.359889 
-L 279.199288 152.546863 
-L 280.223761 152.024867 
-L 281.359398 151.845 
+    <path clip-path="url(#p1d48955717)" d="M 280.679698 151.845 
+L 279.54406 152.024867 
+L 278.519587 152.546863 
+L 277.70656 153.359889 
+L 277.184565 154.384363 
+L 277.004698 155.52 
+L 277.184565 156.655637 
+L 277.70656 157.680111 
+L 278.519587 158.493137 
+L 279.54406 159.015133 
+L 280.679698 159.195 
+L 281.815335 159.015133 
+L 282.839808 158.493137 
+L 283.652835 157.680111 
+L 284.17483 156.655637 
+L 284.354698 155.52 
+L 284.17483 154.384363 
+L 283.652835 153.359889 
+L 282.839808 152.546863 
+L 281.815335 152.024867 
+L 280.679698 151.845 
+L 280.679698 151.845 
+L 281.815335 152.024867 
+L 282.839808 152.546863 
+L 283.652835 153.359889 
+L 284.17483 154.384363 
+L 284.354698 155.52 
+L 284.17483 156.655637 
+L 283.652835 157.680111 
+L 282.839808 158.493137 
+L 281.815335 159.015133 
+L 280.679698 159.195 
+L 279.54406 159.015133 
+L 278.519587 158.493137 
+L 277.70656 157.680111 
+L 277.184565 156.655637 
+L 277.004698 155.52 
+L 277.184565 154.384363 
+L 277.70656 153.359889 
+L 278.519587 152.546863 
+L 279.54406 152.024867 
+L 280.679698 151.845 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 292.09985 151.845 
-L 290.964212 152.024867 
-L 289.939739 152.546863 
-L 289.126712 153.359889 
-L 288.604717 154.384363 
-L 288.42485 155.52 
-L 288.604717 156.655637 
-L 289.126712 157.680111 
-L 289.939739 158.493137 
-L 290.964212 159.015133 
-L 292.09985 159.195 
-L 293.235487 159.015133 
-L 294.25996 158.493137 
-L 295.072987 157.680111 
-L 295.594982 156.655637 
-L 295.77485 155.52 
-L 295.594982 154.384363 
-L 295.072987 153.359889 
-L 294.25996 152.546863 
-L 293.235487 152.024867 
-L 292.09985 151.845 
-L 292.09985 151.845 
-L 293.235487 152.024867 
-L 294.25996 152.546863 
-L 295.072987 153.359889 
-L 295.594982 154.384363 
-L 295.77485 155.52 
-L 295.594982 156.655637 
-L 295.072987 157.680111 
-L 294.25996 158.493137 
-L 293.235487 159.015133 
-L 292.09985 159.195 
-L 290.964212 159.015133 
-L 289.939739 158.493137 
-L 289.126712 157.680111 
-L 288.604717 156.655637 
-L 288.42485 155.52 
-L 288.604717 154.384363 
-L 289.126712 153.359889 
-L 289.939739 152.546863 
-L 290.964212 152.024867 
-L 292.09985 151.845 
+    <path clip-path="url(#p1d48955717)" d="M 291.387523 151.845 
+L 290.251886 152.024867 
+L 289.227412 152.546863 
+L 288.414386 153.359889 
+L 287.89239 154.384363 
+L 287.712523 155.52 
+L 287.89239 156.655637 
+L 288.414386 157.680111 
+L 289.227412 158.493137 
+L 290.251886 159.015133 
+L 291.387523 159.195 
+L 292.523161 159.015133 
+L 293.547634 158.493137 
+L 294.360661 157.680111 
+L 294.882656 156.655637 
+L 295.062523 155.52 
+L 294.882656 154.384363 
+L 294.360661 153.359889 
+L 293.547634 152.546863 
+L 292.523161 152.024867 
+L 291.387523 151.845 
+L 291.387523 151.845 
+L 292.523161 152.024867 
+L 293.547634 152.546863 
+L 294.360661 153.359889 
+L 294.882656 154.384363 
+L 295.062523 155.52 
+L 294.882656 156.655637 
+L 294.360661 157.680111 
+L 293.547634 158.493137 
+L 292.523161 159.015133 
+L 291.387523 159.195 
+L 290.251886 159.015133 
+L 289.227412 158.493137 
+L 288.414386 157.680111 
+L 287.89239 156.655637 
+L 287.712523 155.52 
+L 287.89239 154.384363 
+L 288.414386 153.359889 
+L 289.227412 152.546863 
+L 290.251886 152.024867 
+L 291.387523 151.845 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 227.657143 139.513263 
-L 204.188877 146.548212 
-L 208.589177 145.229159 
-L 205.715421 140.97519 
-L 208.589177 145.229159 
+    <path clip-path="url(#p1d48955717)" d="M 227.14057 139.513263 
+L 203.672305 146.548212 
+L 208.072604 145.229159 
+L 205.198848 140.97519 
+L 208.072604 145.229159 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 238.397594 139.513263 
-L 214.9663 146.670391 
-L 219.359668 145.328429 
-L 216.463786 141.089491 
-L 219.359668 145.328429 
+    <path clip-path="url(#p1d48955717)" d="M 237.848396 139.513263 
+L 214.417102 146.670391 
+L 218.81047 145.328429 
+L 215.914588 141.089491 
+L 218.81047 145.328429 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 249.138045 135.838263 
-L 248.002408 136.01813 
-L 246.977934 136.540126 
-L 246.164908 137.353152 
-L 245.642912 138.377626 
-L 245.463045 139.513263 
-L 245.642912 140.648901 
-L 246.164908 141.673374 
-L 246.977934 142.486401 
-L 248.002408 143.008396 
-L 249.138045 143.188263 
-L 250.273683 143.008396 
-L 251.298156 142.486401 
-L 252.111183 141.673374 
-L 252.633178 140.648901 
-L 252.813045 139.513263 
-L 252.633178 138.377626 
-L 252.111183 137.353152 
-L 251.298156 136.540126 
-L 250.273683 136.01813 
-L 249.138045 135.838263 
-L 249.138045 135.838263 
-L 250.273683 136.01813 
-L 251.298156 136.540126 
-L 252.111183 137.353152 
-L 252.633178 138.377626 
-L 252.813045 139.513263 
-L 252.633178 140.648901 
-L 252.111183 141.673374 
-L 251.298156 142.486401 
-L 250.273683 143.008396 
-L 249.138045 143.188263 
-L 248.002408 143.008396 
-L 246.977934 142.486401 
-L 246.164908 141.673374 
-L 245.642912 140.648901 
-L 245.463045 139.513263 
-L 245.642912 138.377626 
-L 246.164908 137.353152 
-L 246.977934 136.540126 
-L 248.002408 136.01813 
-L 249.138045 135.838263 
+    <path clip-path="url(#p1d48955717)" d="M 248.556221 135.838263 
+L 247.420584 136.01813 
+L 246.39611 136.540126 
+L 245.583084 137.353152 
+L 245.061089 138.377626 
+L 244.881221 139.513263 
+L 245.061089 140.648901 
+L 245.583084 141.673374 
+L 246.39611 142.486401 
+L 247.420584 143.008396 
+L 248.556221 143.188263 
+L 249.691859 143.008396 
+L 250.716332 142.486401 
+L 251.529359 141.673374 
+L 252.051354 140.648901 
+L 252.231221 139.513263 
+L 252.051354 138.377626 
+L 251.529359 137.353152 
+L 250.716332 136.540126 
+L 249.691859 136.01813 
+L 248.556221 135.838263 
+L 248.556221 135.838263 
+L 249.691859 136.01813 
+L 250.716332 136.540126 
+L 251.529359 137.353152 
+L 252.051354 138.377626 
+L 252.231221 139.513263 
+L 252.051354 140.648901 
+L 251.529359 141.673374 
+L 250.716332 142.486401 
+L 249.691859 143.008396 
+L 248.556221 143.188263 
+L 247.420584 143.008396 
+L 246.39611 142.486401 
+L 245.583084 141.673374 
+L 245.061089 140.648901 
+L 244.881221 139.513263 
+L 245.061089 138.377626 
+L 245.583084 137.353152 
+L 246.39611 136.540126 
+L 247.420584 136.01813 
+L 248.556221 135.838263 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 259.878496 135.838263 
-L 258.742859 136.01813 
-L 257.718385 136.540126 
-L 256.905359 137.353152 
-L 256.383364 138.377626 
-L 256.203496 139.513263 
-L 256.383364 140.648901 
-L 256.905359 141.673374 
-L 257.718385 142.486401 
-L 258.742859 143.008396 
-L 259.878496 143.188263 
-L 261.014134 143.008396 
-L 262.038607 142.486401 
-L 262.851634 141.673374 
-L 263.373629 140.648901 
-L 263.553496 139.513263 
-L 263.373629 138.377626 
-L 262.851634 137.353152 
-L 262.038607 136.540126 
-L 261.014134 136.01813 
-L 259.878496 135.838263 
-L 259.878496 135.838263 
-L 261.014134 136.01813 
-L 262.038607 136.540126 
-L 262.851634 137.353152 
-L 263.373629 138.377626 
-L 263.553496 139.513263 
-L 263.373629 140.648901 
-L 262.851634 141.673374 
-L 262.038607 142.486401 
-L 261.014134 143.008396 
-L 259.878496 143.188263 
-L 258.742859 143.008396 
-L 257.718385 142.486401 
-L 256.905359 141.673374 
-L 256.383364 140.648901 
-L 256.203496 139.513263 
-L 256.383364 138.377626 
-L 256.905359 137.353152 
-L 257.718385 136.540126 
-L 258.742859 136.01813 
-L 259.878496 135.838263 
+    <path clip-path="url(#p1d48955717)" d="M 259.264047 135.838263 
+L 258.128409 136.01813 
+L 257.103936 136.540126 
+L 256.290909 137.353152 
+L 255.768914 138.377626 
+L 255.589047 139.513263 
+L 255.768914 140.648901 
+L 256.290909 141.673374 
+L 257.103936 142.486401 
+L 258.128409 143.008396 
+L 259.264047 143.188263 
+L 260.399684 143.008396 
+L 261.424158 142.486401 
+L 262.237184 141.673374 
+L 262.759179 140.648901 
+L 262.939047 139.513263 
+L 262.759179 138.377626 
+L 262.237184 137.353152 
+L 261.424158 136.540126 
+L 260.399684 136.01813 
+L 259.264047 135.838263 
+L 259.264047 135.838263 
+L 260.399684 136.01813 
+L 261.424158 136.540126 
+L 262.237184 137.353152 
+L 262.759179 138.377626 
+L 262.939047 139.513263 
+L 262.759179 140.648901 
+L 262.237184 141.673374 
+L 261.424158 142.486401 
+L 260.399684 143.008396 
+L 259.264047 143.188263 
+L 258.128409 143.008396 
+L 257.103936 142.486401 
+L 256.290909 141.673374 
+L 255.768914 140.648901 
+L 255.589047 139.513263 
+L 255.768914 138.377626 
+L 256.290909 137.353152 
+L 257.103936 136.540126 
+L 258.128409 136.01813 
+L 259.264047 135.838263 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 270.618947 135.838263 
-L 269.48331 136.01813 
-L 268.458837 136.540126 
-L 267.64581 137.353152 
-L 267.123815 138.377626 
-L 266.943947 139.513263 
-L 267.123815 140.648901 
-L 267.64581 141.673374 
-L 268.458837 142.486401 
-L 269.48331 143.008396 
-L 270.618947 143.188263 
-L 271.754585 143.008396 
-L 272.779058 142.486401 
-L 273.592085 141.673374 
-L 274.11408 140.648901 
-L 274.293947 139.513263 
-L 274.11408 138.377626 
-L 273.592085 137.353152 
-L 272.779058 136.540126 
-L 271.754585 136.01813 
-L 270.618947 135.838263 
-L 270.618947 135.838263 
-L 271.754585 136.01813 
-L 272.779058 136.540126 
-L 273.592085 137.353152 
-L 274.11408 138.377626 
-L 274.293947 139.513263 
-L 274.11408 140.648901 
-L 273.592085 141.673374 
-L 272.779058 142.486401 
-L 271.754585 143.008396 
-L 270.618947 143.188263 
-L 269.48331 143.008396 
-L 268.458837 142.486401 
-L 267.64581 141.673374 
-L 267.123815 140.648901 
-L 266.943947 139.513263 
-L 267.123815 138.377626 
-L 267.64581 137.353152 
-L 268.458837 136.540126 
-L 269.48331 136.01813 
-L 270.618947 135.838263 
+    <path clip-path="url(#p1d48955717)" d="M 269.971872 135.838263 
+L 268.836235 136.01813 
+L 267.811761 136.540126 
+L 266.998735 137.353152 
+L 266.476739 138.377626 
+L 266.296872 139.513263 
+L 266.476739 140.648901 
+L 266.998735 141.673374 
+L 267.811761 142.486401 
+L 268.836235 143.008396 
+L 269.971872 143.188263 
+L 271.10751 143.008396 
+L 272.131983 142.486401 
+L 272.94501 141.673374 
+L 273.467005 140.648901 
+L 273.646872 139.513263 
+L 273.467005 138.377626 
+L 272.94501 137.353152 
+L 272.131983 136.540126 
+L 271.10751 136.01813 
+L 269.971872 135.838263 
+L 269.971872 135.838263 
+L 271.10751 136.01813 
+L 272.131983 136.540126 
+L 272.94501 137.353152 
+L 273.467005 138.377626 
+L 273.646872 139.513263 
+L 273.467005 140.648901 
+L 272.94501 141.673374 
+L 272.131983 142.486401 
+L 271.10751 143.008396 
+L 269.971872 143.188263 
+L 268.836235 143.008396 
+L 267.811761 142.486401 
+L 266.998735 141.673374 
+L 266.476739 140.648901 
+L 266.296872 139.513263 
+L 266.476739 138.377626 
+L 266.998735 137.353152 
+L 267.811761 136.540126 
+L 268.836235 136.01813 
+L 269.971872 135.838263 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 281.359398 135.838263 
-L 280.223761 136.01813 
-L 279.199288 136.540126 
-L 278.386261 137.353152 
-L 277.864266 138.377626 
-L 277.684398 139.513263 
-L 277.864266 140.648901 
-L 278.386261 141.673374 
-L 279.199288 142.486401 
-L 280.223761 143.008396 
-L 281.359398 143.188263 
-L 282.495036 143.008396 
-L 283.519509 142.486401 
-L 284.332536 141.673374 
-L 284.854531 140.648901 
-L 285.034398 139.513263 
-L 284.854531 138.377626 
-L 284.332536 137.353152 
-L 283.519509 136.540126 
-L 282.495036 136.01813 
-L 281.359398 135.838263 
-L 281.359398 135.838263 
-L 282.495036 136.01813 
-L 283.519509 136.540126 
-L 284.332536 137.353152 
-L 284.854531 138.377626 
-L 285.034398 139.513263 
-L 284.854531 140.648901 
-L 284.332536 141.673374 
-L 283.519509 142.486401 
-L 282.495036 143.008396 
-L 281.359398 143.188263 
-L 280.223761 143.008396 
-L 279.199288 142.486401 
-L 278.386261 141.673374 
-L 277.864266 140.648901 
-L 277.684398 139.513263 
-L 277.864266 138.377626 
-L 278.386261 137.353152 
-L 279.199288 136.540126 
-L 280.223761 136.01813 
-L 281.359398 135.838263 
+    <path clip-path="url(#p1d48955717)" d="M 280.679698 135.838263 
+L 279.54406 136.01813 
+L 278.519587 136.540126 
+L 277.70656 137.353152 
+L 277.184565 138.377626 
+L 277.004698 139.513263 
+L 277.184565 140.648901 
+L 277.70656 141.673374 
+L 278.519587 142.486401 
+L 279.54406 143.008396 
+L 280.679698 143.188263 
+L 281.815335 143.008396 
+L 282.839808 142.486401 
+L 283.652835 141.673374 
+L 284.17483 140.648901 
+L 284.354698 139.513263 
+L 284.17483 138.377626 
+L 283.652835 137.353152 
+L 282.839808 136.540126 
+L 281.815335 136.01813 
+L 280.679698 135.838263 
+L 280.679698 135.838263 
+L 281.815335 136.01813 
+L 282.839808 136.540126 
+L 283.652835 137.353152 
+L 284.17483 138.377626 
+L 284.354698 139.513263 
+L 284.17483 140.648901 
+L 283.652835 141.673374 
+L 282.839808 142.486401 
+L 281.815335 143.008396 
+L 280.679698 143.188263 
+L 279.54406 143.008396 
+L 278.519587 142.486401 
+L 277.70656 141.673374 
+L 277.184565 140.648901 
+L 277.004698 139.513263 
+L 277.184565 138.377626 
+L 277.70656 137.353152 
+L 278.519587 136.540126 
+L 279.54406 136.01813 
+L 280.679698 135.838263 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 292.09985 135.838263 
-L 290.964212 136.01813 
-L 289.939739 136.540126 
-L 289.126712 137.353152 
-L 288.604717 138.377626 
-L 288.42485 139.513263 
-L 288.604717 140.648901 
-L 289.126712 141.673374 
-L 289.939739 142.486401 
-L 290.964212 143.008396 
-L 292.09985 143.188263 
-L 293.235487 143.008396 
-L 294.25996 142.486401 
-L 295.072987 141.673374 
-L 295.594982 140.648901 
-L 295.77485 139.513263 
-L 295.594982 138.377626 
-L 295.072987 137.353152 
-L 294.25996 136.540126 
-L 293.235487 136.01813 
-L 292.09985 135.838263 
-L 292.09985 135.838263 
-L 293.235487 136.01813 
-L 294.25996 136.540126 
-L 295.072987 137.353152 
-L 295.594982 138.377626 
-L 295.77485 139.513263 
-L 295.594982 140.648901 
-L 295.072987 141.673374 
-L 294.25996 142.486401 
-L 293.235487 143.008396 
-L 292.09985 143.188263 
-L 290.964212 143.008396 
-L 289.939739 142.486401 
-L 289.126712 141.673374 
-L 288.604717 140.648901 
-L 288.42485 139.513263 
-L 288.604717 138.377626 
-L 289.126712 137.353152 
-L 289.939739 136.540126 
-L 290.964212 136.01813 
-L 292.09985 135.838263 
+    <path clip-path="url(#p1d48955717)" d="M 291.387523 135.838263 
+L 290.251886 136.01813 
+L 289.227412 136.540126 
+L 288.414386 137.353152 
+L 287.89239 138.377626 
+L 287.712523 139.513263 
+L 287.89239 140.648901 
+L 288.414386 141.673374 
+L 289.227412 142.486401 
+L 290.251886 143.008396 
+L 291.387523 143.188263 
+L 292.523161 143.008396 
+L 293.547634 142.486401 
+L 294.360661 141.673374 
+L 294.882656 140.648901 
+L 295.062523 139.513263 
+L 294.882656 138.377626 
+L 294.360661 137.353152 
+L 293.547634 136.540126 
+L 292.523161 136.01813 
+L 291.387523 135.838263 
+L 291.387523 135.838263 
+L 292.523161 136.01813 
+L 293.547634 136.540126 
+L 294.360661 137.353152 
+L 294.882656 138.377626 
+L 295.062523 139.513263 
+L 294.882656 140.648901 
+L 294.360661 141.673374 
+L 293.547634 142.486401 
+L 292.523161 143.008396 
+L 291.387523 143.188263 
+L 290.251886 143.008396 
+L 289.227412 142.486401 
+L 288.414386 141.673374 
+L 287.89239 140.648901 
+L 287.712523 139.513263 
+L 287.89239 138.377626 
+L 288.414386 137.353152 
+L 289.227412 136.540126 
+L 290.251886 136.01813 
+L 291.387523 135.838263 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 227.657143 123.506526 
-L 213.907072 143.784237 
-L 216.48521 139.982166 
-L 211.570289 138.499509 
-L 216.48521 139.982166 
+    <path clip-path="url(#p1d48955717)" d="M 227.14057 123.506526 
+L 213.390499 143.784237 
+L 215.968638 139.982166 
+L 211.053716 138.499509 
+L 215.968638 139.982166 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 238.397594 123.506526 
-L 226.355485 144.842825 
-L 228.613381 140.842269 
-L 223.593489 139.767366 
-L 228.613381 140.842269 
+    <path clip-path="url(#p1d48955717)" d="M 237.848396 123.506526 
+L 225.806287 144.842825 
+L 228.064182 140.842269 
+L 223.044291 139.767366 
+L 228.064182 140.842269 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 249.138045 119.831526 
-L 248.002408 120.011394 
-L 246.977934 120.533389 
-L 246.164908 121.346416 
-L 245.642912 122.370889 
-L 245.463045 123.506526 
-L 245.642912 124.642164 
-L 246.164908 125.666637 
-L 246.977934 126.479664 
-L 248.002408 127.001659 
-L 249.138045 127.181526 
-L 250.273683 127.001659 
-L 251.298156 126.479664 
-L 252.111183 125.666637 
-L 252.633178 124.642164 
-L 252.813045 123.506526 
-L 252.633178 122.370889 
-L 252.111183 121.346416 
-L 251.298156 120.533389 
-L 250.273683 120.011394 
-L 249.138045 119.831526 
-L 249.138045 119.831526 
-L 250.273683 120.011394 
-L 251.298156 120.533389 
-L 252.111183 121.346416 
-L 252.633178 122.370889 
-L 252.813045 123.506526 
-L 252.633178 124.642164 
-L 252.111183 125.666637 
-L 251.298156 126.479664 
-L 250.273683 127.001659 
-L 249.138045 127.181526 
-L 248.002408 127.001659 
-L 246.977934 126.479664 
-L 246.164908 125.666637 
-L 245.642912 124.642164 
-L 245.463045 123.506526 
-L 245.642912 122.370889 
-L 246.164908 121.346416 
-L 246.977934 120.533389 
-L 248.002408 120.011394 
-L 249.138045 119.831526 
+    <path clip-path="url(#p1d48955717)" d="M 248.556221 119.831526 
+L 247.420584 120.011394 
+L 246.39611 120.533389 
+L 245.583084 121.346416 
+L 245.061089 122.370889 
+L 244.881221 123.506526 
+L 245.061089 124.642164 
+L 245.583084 125.666637 
+L 246.39611 126.479664 
+L 247.420584 127.001659 
+L 248.556221 127.181526 
+L 249.691859 127.001659 
+L 250.716332 126.479664 
+L 251.529359 125.666637 
+L 252.051354 124.642164 
+L 252.231221 123.506526 
+L 252.051354 122.370889 
+L 251.529359 121.346416 
+L 250.716332 120.533389 
+L 249.691859 120.011394 
+L 248.556221 119.831526 
+L 248.556221 119.831526 
+L 249.691859 120.011394 
+L 250.716332 120.533389 
+L 251.529359 121.346416 
+L 252.051354 122.370889 
+L 252.231221 123.506526 
+L 252.051354 124.642164 
+L 251.529359 125.666637 
+L 250.716332 126.479664 
+L 249.691859 127.001659 
+L 248.556221 127.181526 
+L 247.420584 127.001659 
+L 246.39611 126.479664 
+L 245.583084 125.666637 
+L 245.061089 124.642164 
+L 244.881221 123.506526 
+L 245.061089 122.370889 
+L 245.583084 121.346416 
+L 246.39611 120.533389 
+L 247.420584 120.011394 
+L 248.556221 119.831526 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 259.878496 119.831526 
-L 258.742859 120.011394 
-L 257.718385 120.533389 
-L 256.905359 121.346416 
-L 256.383364 122.370889 
-L 256.203496 123.506526 
-L 256.383364 124.642164 
-L 256.905359 125.666637 
-L 257.718385 126.479664 
-L 258.742859 127.001659 
-L 259.878496 127.181526 
-L 261.014134 127.001659 
-L 262.038607 126.479664 
-L 262.851634 125.666637 
-L 263.373629 124.642164 
-L 263.553496 123.506526 
-L 263.373629 122.370889 
-L 262.851634 121.346416 
-L 262.038607 120.533389 
-L 261.014134 120.011394 
-L 259.878496 119.831526 
-L 259.878496 119.831526 
-L 261.014134 120.011394 
-L 262.038607 120.533389 
-L 262.851634 121.346416 
-L 263.373629 122.370889 
-L 263.553496 123.506526 
-L 263.373629 124.642164 
-L 262.851634 125.666637 
-L 262.038607 126.479664 
-L 261.014134 127.001659 
-L 259.878496 127.181526 
-L 258.742859 127.001659 
-L 257.718385 126.479664 
-L 256.905359 125.666637 
-L 256.383364 124.642164 
-L 256.203496 123.506526 
-L 256.383364 122.370889 
-L 256.905359 121.346416 
-L 257.718385 120.533389 
-L 258.742859 120.011394 
-L 259.878496 119.831526 
+    <path clip-path="url(#p1d48955717)" d="M 259.264047 119.831526 
+L 258.128409 120.011394 
+L 257.103936 120.533389 
+L 256.290909 121.346416 
+L 255.768914 122.370889 
+L 255.589047 123.506526 
+L 255.768914 124.642164 
+L 256.290909 125.666637 
+L 257.103936 126.479664 
+L 258.128409 127.001659 
+L 259.264047 127.181526 
+L 260.399684 127.001659 
+L 261.424158 126.479664 
+L 262.237184 125.666637 
+L 262.759179 124.642164 
+L 262.939047 123.506526 
+L 262.759179 122.370889 
+L 262.237184 121.346416 
+L 261.424158 120.533389 
+L 260.399684 120.011394 
+L 259.264047 119.831526 
+L 259.264047 119.831526 
+L 260.399684 120.011394 
+L 261.424158 120.533389 
+L 262.237184 121.346416 
+L 262.759179 122.370889 
+L 262.939047 123.506526 
+L 262.759179 124.642164 
+L 262.237184 125.666637 
+L 261.424158 126.479664 
+L 260.399684 127.001659 
+L 259.264047 127.181526 
+L 258.128409 127.001659 
+L 257.103936 126.479664 
+L 256.290909 125.666637 
+L 255.768914 124.642164 
+L 255.589047 123.506526 
+L 255.768914 122.370889 
+L 256.290909 121.346416 
+L 257.103936 120.533389 
+L 258.128409 120.011394 
+L 259.264047 119.831526 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 270.618947 119.831526 
-L 269.48331 120.011394 
-L 268.458837 120.533389 
-L 267.64581 121.346416 
-L 267.123815 122.370889 
-L 266.943947 123.506526 
-L 267.123815 124.642164 
-L 267.64581 125.666637 
-L 268.458837 126.479664 
-L 269.48331 127.001659 
-L 270.618947 127.181526 
-L 271.754585 127.001659 
-L 272.779058 126.479664 
-L 273.592085 125.666637 
-L 274.11408 124.642164 
-L 274.293947 123.506526 
-L 274.11408 122.370889 
-L 273.592085 121.346416 
-L 272.779058 120.533389 
-L 271.754585 120.011394 
-L 270.618947 119.831526 
-L 270.618947 119.831526 
-L 271.754585 120.011394 
-L 272.779058 120.533389 
-L 273.592085 121.346416 
-L 274.11408 122.370889 
-L 274.293947 123.506526 
-L 274.11408 124.642164 
-L 273.592085 125.666637 
-L 272.779058 126.479664 
-L 271.754585 127.001659 
-L 270.618947 127.181526 
-L 269.48331 127.001659 
-L 268.458837 126.479664 
-L 267.64581 125.666637 
-L 267.123815 124.642164 
-L 266.943947 123.506526 
-L 267.123815 122.370889 
-L 267.64581 121.346416 
-L 268.458837 120.533389 
-L 269.48331 120.011394 
-L 270.618947 119.831526 
+    <path clip-path="url(#p1d48955717)" d="M 269.971872 119.831526 
+L 268.836235 120.011394 
+L 267.811761 120.533389 
+L 266.998735 121.346416 
+L 266.476739 122.370889 
+L 266.296872 123.506526 
+L 266.476739 124.642164 
+L 266.998735 125.666637 
+L 267.811761 126.479664 
+L 268.836235 127.001659 
+L 269.971872 127.181526 
+L 271.10751 127.001659 
+L 272.131983 126.479664 
+L 272.94501 125.666637 
+L 273.467005 124.642164 
+L 273.646872 123.506526 
+L 273.467005 122.370889 
+L 272.94501 121.346416 
+L 272.131983 120.533389 
+L 271.10751 120.011394 
+L 269.971872 119.831526 
+L 269.971872 119.831526 
+L 271.10751 120.011394 
+L 272.131983 120.533389 
+L 272.94501 121.346416 
+L 273.467005 122.370889 
+L 273.646872 123.506526 
+L 273.467005 124.642164 
+L 272.94501 125.666637 
+L 272.131983 126.479664 
+L 271.10751 127.001659 
+L 269.971872 127.181526 
+L 268.836235 127.001659 
+L 267.811761 126.479664 
+L 266.998735 125.666637 
+L 266.476739 124.642164 
+L 266.296872 123.506526 
+L 266.476739 122.370889 
+L 266.998735 121.346416 
+L 267.811761 120.533389 
+L 268.836235 120.011394 
+L 269.971872 119.831526 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 281.359398 119.831526 
-L 280.223761 120.011394 
-L 279.199288 120.533389 
-L 278.386261 121.346416 
-L 277.864266 122.370889 
-L 277.684398 123.506526 
-L 277.864266 124.642164 
-L 278.386261 125.666637 
-L 279.199288 126.479664 
-L 280.223761 127.001659 
-L 281.359398 127.181526 
-L 282.495036 127.001659 
-L 283.519509 126.479664 
-L 284.332536 125.666637 
-L 284.854531 124.642164 
-L 285.034398 123.506526 
-L 284.854531 122.370889 
-L 284.332536 121.346416 
-L 283.519509 120.533389 
-L 282.495036 120.011394 
-L 281.359398 119.831526 
-L 281.359398 119.831526 
-L 282.495036 120.011394 
-L 283.519509 120.533389 
-L 284.332536 121.346416 
-L 284.854531 122.370889 
-L 285.034398 123.506526 
-L 284.854531 124.642164 
-L 284.332536 125.666637 
-L 283.519509 126.479664 
-L 282.495036 127.001659 
-L 281.359398 127.181526 
-L 280.223761 127.001659 
-L 279.199288 126.479664 
-L 278.386261 125.666637 
-L 277.864266 124.642164 
-L 277.684398 123.506526 
-L 277.864266 122.370889 
-L 278.386261 121.346416 
-L 279.199288 120.533389 
-L 280.223761 120.011394 
-L 281.359398 119.831526 
+    <path clip-path="url(#p1d48955717)" d="M 280.679698 119.831526 
+L 279.54406 120.011394 
+L 278.519587 120.533389 
+L 277.70656 121.346416 
+L 277.184565 122.370889 
+L 277.004698 123.506526 
+L 277.184565 124.642164 
+L 277.70656 125.666637 
+L 278.519587 126.479664 
+L 279.54406 127.001659 
+L 280.679698 127.181526 
+L 281.815335 127.001659 
+L 282.839808 126.479664 
+L 283.652835 125.666637 
+L 284.17483 124.642164 
+L 284.354698 123.506526 
+L 284.17483 122.370889 
+L 283.652835 121.346416 
+L 282.839808 120.533389 
+L 281.815335 120.011394 
+L 280.679698 119.831526 
+L 280.679698 119.831526 
+L 281.815335 120.011394 
+L 282.839808 120.533389 
+L 283.652835 121.346416 
+L 284.17483 122.370889 
+L 284.354698 123.506526 
+L 284.17483 124.642164 
+L 283.652835 125.666637 
+L 282.839808 126.479664 
+L 281.815335 127.001659 
+L 280.679698 127.181526 
+L 279.54406 127.001659 
+L 278.519587 126.479664 
+L 277.70656 125.666637 
+L 277.184565 124.642164 
+L 277.004698 123.506526 
+L 277.184565 122.370889 
+L 277.70656 121.346416 
+L 278.519587 120.533389 
+L 279.54406 120.011394 
+L 280.679698 119.831526 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 292.09985 119.831526 
-L 290.964212 120.011394 
-L 289.939739 120.533389 
-L 289.126712 121.346416 
-L 288.604717 122.370889 
-L 288.42485 123.506526 
-L 288.604717 124.642164 
-L 289.126712 125.666637 
-L 289.939739 126.479664 
-L 290.964212 127.001659 
-L 292.09985 127.181526 
-L 293.235487 127.001659 
-L 294.25996 126.479664 
-L 295.072987 125.666637 
-L 295.594982 124.642164 
-L 295.77485 123.506526 
-L 295.594982 122.370889 
-L 295.072987 121.346416 
-L 294.25996 120.533389 
-L 293.235487 120.011394 
-L 292.09985 119.831526 
-L 292.09985 119.831526 
-L 293.235487 120.011394 
-L 294.25996 120.533389 
-L 295.072987 121.346416 
-L 295.594982 122.370889 
-L 295.77485 123.506526 
-L 295.594982 124.642164 
-L 295.072987 125.666637 
-L 294.25996 126.479664 
-L 293.235487 127.001659 
-L 292.09985 127.181526 
-L 290.964212 127.001659 
-L 289.939739 126.479664 
-L 289.126712 125.666637 
-L 288.604717 124.642164 
-L 288.42485 123.506526 
-L 288.604717 122.370889 
-L 289.126712 121.346416 
-L 289.939739 120.533389 
-L 290.964212 120.011394 
-L 292.09985 119.831526 
+    <path clip-path="url(#p1d48955717)" d="M 291.387523 119.831526 
+L 290.251886 120.011394 
+L 289.227412 120.533389 
+L 288.414386 121.346416 
+L 287.89239 122.370889 
+L 287.712523 123.506526 
+L 287.89239 124.642164 
+L 288.414386 125.666637 
+L 289.227412 126.479664 
+L 290.251886 127.001659 
+L 291.387523 127.181526 
+L 292.523161 127.001659 
+L 293.547634 126.479664 
+L 294.360661 125.666637 
+L 294.882656 124.642164 
+L 295.062523 123.506526 
+L 294.882656 122.370889 
+L 294.360661 121.346416 
+L 293.547634 120.533389 
+L 292.523161 120.011394 
+L 291.387523 119.831526 
+L 291.387523 119.831526 
+L 292.523161 120.011394 
+L 293.547634 120.533389 
+L 294.360661 121.346416 
+L 294.882656 122.370889 
+L 295.062523 123.506526 
+L 294.882656 124.642164 
+L 294.360661 125.666637 
+L 293.547634 126.479664 
+L 292.523161 127.001659 
+L 291.387523 127.181526 
+L 290.251886 127.001659 
+L 289.227412 126.479664 
+L 288.414386 125.666637 
+L 287.89239 124.642164 
+L 287.712523 123.506526 
+L 287.89239 122.370889 
+L 288.414386 121.346416 
+L 289.227412 120.533389 
+L 290.251886 120.011394 
+L 291.387523 119.831526 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 227.657143 107.499789 
-L 221.374852 131.180643 
-L 222.552781 126.740483 
-L 217.423967 126.964078 
-L 222.552781 126.740483 
+    <path clip-path="url(#p1d48955717)" d="M 227.14057 107.499789 
+L 220.858279 131.180643 
+L 222.036209 126.740483 
+L 216.907395 126.964078 
+L 222.036209 126.740483 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 238.397594 107.499789 
-L 233.73823 131.552655 
-L 234.611861 127.042742 
-L 229.510077 127.614174 
-L 234.611861 127.042742 
+    <path clip-path="url(#p1d48955717)" d="M 237.848396 107.499789 
+L 233.189032 131.552655 
+L 234.062662 127.042742 
+L 228.960879 127.614174 
+L 234.062662 127.042742 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 249.138045 107.499789 
-L 247.346569 131.934204 
-L 247.682471 127.352751 
-L 242.683621 128.521607 
-L 247.682471 127.352751 
+    <path clip-path="url(#p1d48955717)" d="M 248.556221 107.499789 
+L 246.764745 131.934204 
+L 247.100647 127.352751 
+L 242.101797 128.521607 
+L 247.100647 127.352751 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 259.878496 103.824789 
-L 258.742859 104.004657 
-L 257.718385 104.526652 
-L 256.905359 105.339679 
-L 256.383364 106.364152 
-L 256.203496 107.499789 
-L 256.383364 108.635427 
-L 256.905359 109.6599 
-L 257.718385 110.472927 
-L 258.742859 110.994922 
-L 259.878496 111.174789 
-L 261.014134 110.994922 
-L 262.038607 110.472927 
-L 262.851634 109.6599 
-L 263.373629 108.635427 
-L 263.553496 107.499789 
-L 263.373629 106.364152 
-L 262.851634 105.339679 
-L 262.038607 104.526652 
-L 261.014134 104.004657 
-L 259.878496 103.824789 
-L 259.878496 103.824789 
-L 261.014134 104.004657 
-L 262.038607 104.526652 
-L 262.851634 105.339679 
-L 263.373629 106.364152 
-L 263.553496 107.499789 
-L 263.373629 108.635427 
-L 262.851634 109.6599 
-L 262.038607 110.472927 
-L 261.014134 110.994922 
-L 259.878496 111.174789 
-L 258.742859 110.994922 
-L 257.718385 110.472927 
-L 256.905359 109.6599 
-L 256.383364 108.635427 
-L 256.203496 107.499789 
-L 256.383364 106.364152 
-L 256.905359 105.339679 
-L 257.718385 104.526652 
-L 258.742859 104.004657 
-L 259.878496 103.824789 
+    <path clip-path="url(#p1d48955717)" d="M 259.264047 103.824789 
+L 258.128409 104.004657 
+L 257.103936 104.526652 
+L 256.290909 105.339679 
+L 255.768914 106.364152 
+L 255.589047 107.499789 
+L 255.768914 108.635427 
+L 256.290909 109.6599 
+L 257.103936 110.472927 
+L 258.128409 110.994922 
+L 259.264047 111.174789 
+L 260.399684 110.994922 
+L 261.424158 110.472927 
+L 262.237184 109.6599 
+L 262.759179 108.635427 
+L 262.939047 107.499789 
+L 262.759179 106.364152 
+L 262.237184 105.339679 
+L 261.424158 104.526652 
+L 260.399684 104.004657 
+L 259.264047 103.824789 
+L 259.264047 103.824789 
+L 260.399684 104.004657 
+L 261.424158 104.526652 
+L 262.237184 105.339679 
+L 262.759179 106.364152 
+L 262.939047 107.499789 
+L 262.759179 108.635427 
+L 262.237184 109.6599 
+L 261.424158 110.472927 
+L 260.399684 110.994922 
+L 259.264047 111.174789 
+L 258.128409 110.994922 
+L 257.103936 110.472927 
+L 256.290909 109.6599 
+L 255.768914 108.635427 
+L 255.589047 107.499789 
+L 255.768914 106.364152 
+L 256.290909 105.339679 
+L 257.103936 104.526652 
+L 258.128409 104.004657 
+L 259.264047 103.824789 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 270.618947 103.824789 
-L 269.48331 104.004657 
-L 268.458837 104.526652 
-L 267.64581 105.339679 
-L 267.123815 106.364152 
-L 266.943947 107.499789 
-L 267.123815 108.635427 
-L 267.64581 109.6599 
-L 268.458837 110.472927 
-L 269.48331 110.994922 
-L 270.618947 111.174789 
-L 271.754585 110.994922 
-L 272.779058 110.472927 
-L 273.592085 109.6599 
-L 274.11408 108.635427 
-L 274.293947 107.499789 
-L 274.11408 106.364152 
-L 273.592085 105.339679 
-L 272.779058 104.526652 
-L 271.754585 104.004657 
-L 270.618947 103.824789 
-L 270.618947 103.824789 
-L 271.754585 104.004657 
-L 272.779058 104.526652 
-L 273.592085 105.339679 
-L 274.11408 106.364152 
-L 274.293947 107.499789 
-L 274.11408 108.635427 
-L 273.592085 109.6599 
-L 272.779058 110.472927 
-L 271.754585 110.994922 
-L 270.618947 111.174789 
-L 269.48331 110.994922 
-L 268.458837 110.472927 
-L 267.64581 109.6599 
-L 267.123815 108.635427 
-L 266.943947 107.499789 
-L 267.123815 106.364152 
-L 267.64581 105.339679 
-L 268.458837 104.526652 
-L 269.48331 104.004657 
-L 270.618947 103.824789 
+    <path clip-path="url(#p1d48955717)" d="M 269.971872 103.824789 
+L 268.836235 104.004657 
+L 267.811761 104.526652 
+L 266.998735 105.339679 
+L 266.476739 106.364152 
+L 266.296872 107.499789 
+L 266.476739 108.635427 
+L 266.998735 109.6599 
+L 267.811761 110.472927 
+L 268.836235 110.994922 
+L 269.971872 111.174789 
+L 271.10751 110.994922 
+L 272.131983 110.472927 
+L 272.94501 109.6599 
+L 273.467005 108.635427 
+L 273.646872 107.499789 
+L 273.467005 106.364152 
+L 272.94501 105.339679 
+L 272.131983 104.526652 
+L 271.10751 104.004657 
+L 269.971872 103.824789 
+L 269.971872 103.824789 
+L 271.10751 104.004657 
+L 272.131983 104.526652 
+L 272.94501 105.339679 
+L 273.467005 106.364152 
+L 273.646872 107.499789 
+L 273.467005 108.635427 
+L 272.94501 109.6599 
+L 272.131983 110.472927 
+L 271.10751 110.994922 
+L 269.971872 111.174789 
+L 268.836235 110.994922 
+L 267.811761 110.472927 
+L 266.998735 109.6599 
+L 266.476739 108.635427 
+L 266.296872 107.499789 
+L 266.476739 106.364152 
+L 266.998735 105.339679 
+L 267.811761 104.526652 
+L 268.836235 104.004657 
+L 269.971872 103.824789 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 281.359398 103.824789 
-L 280.223761 104.004657 
-L 279.199288 104.526652 
-L 278.386261 105.339679 
-L 277.864266 106.364152 
-L 277.684398 107.499789 
-L 277.864266 108.635427 
-L 278.386261 109.6599 
-L 279.199288 110.472927 
-L 280.223761 110.994922 
-L 281.359398 111.174789 
-L 282.495036 110.994922 
-L 283.519509 110.472927 
-L 284.332536 109.6599 
-L 284.854531 108.635427 
-L 285.034398 107.499789 
-L 284.854531 106.364152 
-L 284.332536 105.339679 
-L 283.519509 104.526652 
-L 282.495036 104.004657 
-L 281.359398 103.824789 
-L 281.359398 103.824789 
-L 282.495036 104.004657 
-L 283.519509 104.526652 
-L 284.332536 105.339679 
-L 284.854531 106.364152 
-L 285.034398 107.499789 
-L 284.854531 108.635427 
-L 284.332536 109.6599 
-L 283.519509 110.472927 
-L 282.495036 110.994922 
-L 281.359398 111.174789 
-L 280.223761 110.994922 
-L 279.199288 110.472927 
-L 278.386261 109.6599 
-L 277.864266 108.635427 
-L 277.684398 107.499789 
-L 277.864266 106.364152 
-L 278.386261 105.339679 
-L 279.199288 104.526652 
-L 280.223761 104.004657 
-L 281.359398 103.824789 
+    <path clip-path="url(#p1d48955717)" d="M 280.679698 103.824789 
+L 279.54406 104.004657 
+L 278.519587 104.526652 
+L 277.70656 105.339679 
+L 277.184565 106.364152 
+L 277.004698 107.499789 
+L 277.184565 108.635427 
+L 277.70656 109.6599 
+L 278.519587 110.472927 
+L 279.54406 110.994922 
+L 280.679698 111.174789 
+L 281.815335 110.994922 
+L 282.839808 110.472927 
+L 283.652835 109.6599 
+L 284.17483 108.635427 
+L 284.354698 107.499789 
+L 284.17483 106.364152 
+L 283.652835 105.339679 
+L 282.839808 104.526652 
+L 281.815335 104.004657 
+L 280.679698 103.824789 
+L 280.679698 103.824789 
+L 281.815335 104.004657 
+L 282.839808 104.526652 
+L 283.652835 105.339679 
+L 284.17483 106.364152 
+L 284.354698 107.499789 
+L 284.17483 108.635427 
+L 283.652835 109.6599 
+L 282.839808 110.472927 
+L 281.815335 110.994922 
+L 280.679698 111.174789 
+L 279.54406 110.994922 
+L 278.519587 110.472927 
+L 277.70656 109.6599 
+L 277.184565 108.635427 
+L 277.004698 107.499789 
+L 277.184565 106.364152 
+L 277.70656 105.339679 
+L 278.519587 104.526652 
+L 279.54406 104.004657 
+L 280.679698 103.824789 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 292.09985 107.499789 
-L 267.670207 109.355207 
-L 272.250765 109.007316 
-L 270.352829 104.237351 
-L 272.250765 109.007316 
+    <path clip-path="url(#p1d48955717)" d="M 291.387523 107.499789 
+L 266.957881 109.355207 
+L 271.538439 109.007316 
+L 269.640503 104.237351 
+L 271.538439 109.007316 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 227.657143 91.493053 
-L 220.589599 114.951523 
-L 221.914763 110.55306 
-L 216.781348 110.605705 
-L 221.914763 110.55306 
+    <path clip-path="url(#p1d48955717)" d="M 227.14057 91.493053 
+L 220.073026 114.951523 
+L 221.398191 110.55306 
+L 216.264775 110.605705 
+L 221.398191 110.55306 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 238.397594 91.493053 
-L 233.02816 115.397428 
-L 234.034929 110.915358 
-L 228.918464 111.335495 
-L 234.034929 110.915358 
+    <path clip-path="url(#p1d48955717)" d="M 237.848396 91.493053 
+L 232.478962 115.397428 
+L 233.485731 110.915358 
+L 228.369266 111.335495 
+L 233.485731 110.915358 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 249.138045 91.493053 
-L 246.884438 115.889185 
-L 247.306989 111.31491 
-L 242.286913 112.388947 
-L 247.306989 111.31491 
+    <path clip-path="url(#p1d48955717)" d="M 248.556221 91.493053 
+L 246.302614 115.889185 
+L 246.725166 111.31491 
+L 241.705089 112.388947 
+L 246.725166 111.31491 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 259.878496 87.818053 
-L 258.742859 87.99792 
-L 257.718385 88.519915 
-L 256.905359 89.332942 
-L 256.383364 90.357415 
-L 256.203496 91.493053 
-L 256.383364 92.62869 
-L 256.905359 93.653163 
-L 257.718385 94.46619 
-L 258.742859 94.988185 
-L 259.878496 95.168053 
-L 261.014134 94.988185 
-L 262.038607 94.46619 
-L 262.851634 93.653163 
-L 263.373629 92.62869 
-L 263.553496 91.493053 
-L 263.373629 90.357415 
-L 262.851634 89.332942 
-L 262.038607 88.519915 
-L 261.014134 87.99792 
-L 259.878496 87.818053 
-L 259.878496 87.818053 
-L 261.014134 87.99792 
-L 262.038607 88.519915 
-L 262.851634 89.332942 
-L 263.373629 90.357415 
-L 263.553496 91.493053 
-L 263.373629 92.62869 
-L 262.851634 93.653163 
-L 262.038607 94.46619 
-L 261.014134 94.988185 
-L 259.878496 95.168053 
-L 258.742859 94.988185 
-L 257.718385 94.46619 
-L 256.905359 93.653163 
-L 256.383364 92.62869 
-L 256.203496 91.493053 
-L 256.383364 90.357415 
-L 256.905359 89.332942 
-L 257.718385 88.519915 
-L 258.742859 87.99792 
-L 259.878496 87.818053 
+    <path clip-path="url(#p1d48955717)" d="M 259.264047 87.818053 
+L 258.128409 87.99792 
+L 257.103936 88.519915 
+L 256.290909 89.332942 
+L 255.768914 90.357415 
+L 255.589047 91.493053 
+L 255.768914 92.62869 
+L 256.290909 93.653163 
+L 257.103936 94.46619 
+L 258.128409 94.988185 
+L 259.264047 95.168053 
+L 260.399684 94.988185 
+L 261.424158 94.46619 
+L 262.237184 93.653163 
+L 262.759179 92.62869 
+L 262.939047 91.493053 
+L 262.759179 90.357415 
+L 262.237184 89.332942 
+L 261.424158 88.519915 
+L 260.399684 87.99792 
+L 259.264047 87.818053 
+L 259.264047 87.818053 
+L 260.399684 87.99792 
+L 261.424158 88.519915 
+L 262.237184 89.332942 
+L 262.759179 90.357415 
+L 262.939047 91.493053 
+L 262.759179 92.62869 
+L 262.237184 93.653163 
+L 261.424158 94.46619 
+L 260.399684 94.988185 
+L 259.264047 95.168053 
+L 258.128409 94.988185 
+L 257.103936 94.46619 
+L 256.290909 93.653163 
+L 255.768914 92.62869 
+L 255.589047 91.493053 
+L 255.768914 90.357415 
+L 256.290909 89.332942 
+L 257.103936 88.519915 
+L 258.128409 87.99792 
+L 259.264047 87.818053 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 270.618947 87.818053 
-L 269.48331 87.99792 
-L 268.458837 88.519915 
-L 267.64581 89.332942 
-L 267.123815 90.357415 
-L 266.943947 91.493053 
-L 267.123815 92.62869 
-L 267.64581 93.653163 
-L 268.458837 94.46619 
-L 269.48331 94.988185 
-L 270.618947 95.168053 
-L 271.754585 94.988185 
-L 272.779058 94.46619 
-L 273.592085 93.653163 
-L 274.11408 92.62869 
-L 274.293947 91.493053 
-L 274.11408 90.357415 
-L 273.592085 89.332942 
-L 272.779058 88.519915 
-L 271.754585 87.99792 
-L 270.618947 87.818053 
-L 270.618947 87.818053 
-L 271.754585 87.99792 
-L 272.779058 88.519915 
-L 273.592085 89.332942 
-L 274.11408 90.357415 
-L 274.293947 91.493053 
-L 274.11408 92.62869 
-L 273.592085 93.653163 
-L 272.779058 94.46619 
-L 271.754585 94.988185 
-L 270.618947 95.168053 
-L 269.48331 94.988185 
-L 268.458837 94.46619 
-L 267.64581 93.653163 
-L 267.123815 92.62869 
-L 266.943947 91.493053 
-L 267.123815 90.357415 
-L 267.64581 89.332942 
-L 268.458837 88.519915 
-L 269.48331 87.99792 
-L 270.618947 87.818053 
+    <path clip-path="url(#p1d48955717)" d="M 269.971872 87.818053 
+L 268.836235 87.99792 
+L 267.811761 88.519915 
+L 266.998735 89.332942 
+L 266.476739 90.357415 
+L 266.296872 91.493053 
+L 266.476739 92.62869 
+L 266.998735 93.653163 
+L 267.811761 94.46619 
+L 268.836235 94.988185 
+L 269.971872 95.168053 
+L 271.10751 94.988185 
+L 272.131983 94.46619 
+L 272.94501 93.653163 
+L 273.467005 92.62869 
+L 273.646872 91.493053 
+L 273.467005 90.357415 
+L 272.94501 89.332942 
+L 272.131983 88.519915 
+L 271.10751 87.99792 
+L 269.971872 87.818053 
+L 269.971872 87.818053 
+L 271.10751 87.99792 
+L 272.131983 88.519915 
+L 272.94501 89.332942 
+L 273.467005 90.357415 
+L 273.646872 91.493053 
+L 273.467005 92.62869 
+L 272.94501 93.653163 
+L 272.131983 94.46619 
+L 271.10751 94.988185 
+L 269.971872 95.168053 
+L 268.836235 94.988185 
+L 267.811761 94.46619 
+L 266.998735 93.653163 
+L 266.476739 92.62869 
+L 266.296872 91.493053 
+L 266.476739 90.357415 
+L 266.998735 89.332942 
+L 267.811761 88.519915 
+L 268.836235 87.99792 
+L 269.971872 87.818053 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 281.359398 87.818053 
-L 280.223761 87.99792 
-L 279.199288 88.519915 
-L 278.386261 89.332942 
-L 277.864266 90.357415 
-L 277.684398 91.493053 
-L 277.864266 92.62869 
-L 278.386261 93.653163 
-L 279.199288 94.46619 
-L 280.223761 94.988185 
-L 281.359398 95.168053 
-L 282.495036 94.988185 
-L 283.519509 94.46619 
-L 284.332536 93.653163 
-L 284.854531 92.62869 
-L 285.034398 91.493053 
-L 284.854531 90.357415 
-L 284.332536 89.332942 
-L 283.519509 88.519915 
-L 282.495036 87.99792 
-L 281.359398 87.818053 
-L 281.359398 87.818053 
-L 282.495036 87.99792 
-L 283.519509 88.519915 
-L 284.332536 89.332942 
-L 284.854531 90.357415 
-L 285.034398 91.493053 
-L 284.854531 92.62869 
-L 284.332536 93.653163 
-L 283.519509 94.46619 
-L 282.495036 94.988185 
-L 281.359398 95.168053 
-L 280.223761 94.988185 
-L 279.199288 94.46619 
-L 278.386261 93.653163 
-L 277.864266 92.62869 
-L 277.684398 91.493053 
-L 277.864266 90.357415 
-L 278.386261 89.332942 
-L 279.199288 88.519915 
-L 280.223761 87.99792 
-L 281.359398 87.818053 
+    <path clip-path="url(#p1d48955717)" d="M 280.679698 87.818053 
+L 279.54406 87.99792 
+L 278.519587 88.519915 
+L 277.70656 89.332942 
+L 277.184565 90.357415 
+L 277.004698 91.493053 
+L 277.184565 92.62869 
+L 277.70656 93.653163 
+L 278.519587 94.46619 
+L 279.54406 94.988185 
+L 280.679698 95.168053 
+L 281.815335 94.988185 
+L 282.839808 94.46619 
+L 283.652835 93.653163 
+L 284.17483 92.62869 
+L 284.354698 91.493053 
+L 284.17483 90.357415 
+L 283.652835 89.332942 
+L 282.839808 88.519915 
+L 281.815335 87.99792 
+L 280.679698 87.818053 
+L 280.679698 87.818053 
+L 281.815335 87.99792 
+L 282.839808 88.519915 
+L 283.652835 89.332942 
+L 284.17483 90.357415 
+L 284.354698 91.493053 
+L 284.17483 92.62869 
+L 283.652835 93.653163 
+L 282.839808 94.46619 
+L 281.815335 94.988185 
+L 280.679698 95.168053 
+L 279.54406 94.988185 
+L 278.519587 94.46619 
+L 277.70656 93.653163 
+L 277.184565 92.62869 
+L 277.004698 91.493053 
+L 277.184565 90.357415 
+L 277.70656 89.332942 
+L 278.519587 88.519915 
+L 279.54406 87.99792 
+L 280.679698 87.818053 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 292.09985 91.493053 
-L 267.654515 93.128789 
-L 272.238016 92.822088 
-L 270.383035 88.035255 
-L 272.238016 92.822088 
+    <path clip-path="url(#p1d48955717)" d="M 291.387523 91.493053 
+L 266.942189 93.128789 
+L 271.525689 92.822088 
+L 269.670708 88.035255 
+L 271.525689 92.822088 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 227.657143 75.486316 
-L 211.091153 93.536745 
-L 214.197276 90.152289 
-L 209.551816 87.967243 
-L 214.197276 90.152289 
+    <path clip-path="url(#p1d48955717)" d="M 227.14057 75.486316 
+L 210.57458 93.536745 
+L 213.680703 90.152289 
+L 209.035243 87.967243 
+L 213.680703 90.152289 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 238.397594 75.486316 
-L 223.205727 94.707584 
-L 226.054202 91.103597 
-L 221.260456 89.266552 
-L 226.054202 91.103597 
+    <path clip-path="url(#p1d48955717)" d="M 237.848396 75.486316 
+L 222.656529 94.707584 
+L 225.505004 91.103597 
+L 220.711258 89.266552 
+L 225.505004 91.103597 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 249.138045 71.811316 
-L 248.002408 71.991183 
-L 246.977934 72.513178 
-L 246.164908 73.326205 
-L 245.642912 74.350678 
-L 245.463045 75.486316 
-L 245.642912 76.621953 
-L 246.164908 77.646427 
-L 246.977934 78.459453 
-L 248.002408 78.981448 
-L 249.138045 79.161316 
-L 250.273683 78.981448 
-L 251.298156 78.459453 
-L 252.111183 77.646427 
-L 252.633178 76.621953 
-L 252.813045 75.486316 
-L 252.633178 74.350678 
-L 252.111183 73.326205 
-L 251.298156 72.513178 
-L 250.273683 71.991183 
-L 249.138045 71.811316 
-L 249.138045 71.811316 
-L 250.273683 71.991183 
-L 251.298156 72.513178 
-L 252.111183 73.326205 
-L 252.633178 74.350678 
-L 252.813045 75.486316 
-L 252.633178 76.621953 
-L 252.111183 77.646427 
-L 251.298156 78.459453 
-L 250.273683 78.981448 
-L 249.138045 79.161316 
-L 248.002408 78.981448 
-L 246.977934 78.459453 
-L 246.164908 77.646427 
-L 245.642912 76.621953 
-L 245.463045 75.486316 
-L 245.642912 74.350678 
-L 246.164908 73.326205 
-L 246.977934 72.513178 
-L 248.002408 71.991183 
-L 249.138045 71.811316 
+    <path clip-path="url(#p1d48955717)" d="M 248.556221 71.811316 
+L 247.420584 71.991183 
+L 246.39611 72.513178 
+L 245.583084 73.326205 
+L 245.061089 74.350678 
+L 244.881221 75.486316 
+L 245.061089 76.621953 
+L 245.583084 77.646427 
+L 246.39611 78.459453 
+L 247.420584 78.981448 
+L 248.556221 79.161316 
+L 249.691859 78.981448 
+L 250.716332 78.459453 
+L 251.529359 77.646427 
+L 252.051354 76.621953 
+L 252.231221 75.486316 
+L 252.051354 74.350678 
+L 251.529359 73.326205 
+L 250.716332 72.513178 
+L 249.691859 71.991183 
+L 248.556221 71.811316 
+L 248.556221 71.811316 
+L 249.691859 71.991183 
+L 250.716332 72.513178 
+L 251.529359 73.326205 
+L 252.051354 74.350678 
+L 252.231221 75.486316 
+L 252.051354 76.621953 
+L 251.529359 77.646427 
+L 250.716332 78.459453 
+L 249.691859 78.981448 
+L 248.556221 79.161316 
+L 247.420584 78.981448 
+L 246.39611 78.459453 
+L 245.583084 77.646427 
+L 245.061089 76.621953 
+L 244.881221 75.486316 
+L 245.061089 74.350678 
+L 245.583084 73.326205 
+L 246.39611 72.513178 
+L 247.420584 71.991183 
+L 248.556221 71.811316 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 259.878496 71.811316 
-L 258.742859 71.991183 
-L 257.718385 72.513178 
-L 256.905359 73.326205 
-L 256.383364 74.350678 
-L 256.203496 75.486316 
-L 256.383364 76.621953 
-L 256.905359 77.646427 
-L 257.718385 78.459453 
-L 258.742859 78.981448 
-L 259.878496 79.161316 
-L 261.014134 78.981448 
-L 262.038607 78.459453 
-L 262.851634 77.646427 
-L 263.373629 76.621953 
-L 263.553496 75.486316 
-L 263.373629 74.350678 
-L 262.851634 73.326205 
-L 262.038607 72.513178 
-L 261.014134 71.991183 
-L 259.878496 71.811316 
-L 259.878496 71.811316 
-L 261.014134 71.991183 
-L 262.038607 72.513178 
-L 262.851634 73.326205 
-L 263.373629 74.350678 
-L 263.553496 75.486316 
-L 263.373629 76.621953 
-L 262.851634 77.646427 
-L 262.038607 78.459453 
-L 261.014134 78.981448 
-L 259.878496 79.161316 
-L 258.742859 78.981448 
-L 257.718385 78.459453 
-L 256.905359 77.646427 
-L 256.383364 76.621953 
-L 256.203496 75.486316 
-L 256.383364 74.350678 
-L 256.905359 73.326205 
-L 257.718385 72.513178 
-L 258.742859 71.991183 
-L 259.878496 71.811316 
+    <path clip-path="url(#p1d48955717)" d="M 259.264047 71.811316 
+L 258.128409 71.991183 
+L 257.103936 72.513178 
+L 256.290909 73.326205 
+L 255.768914 74.350678 
+L 255.589047 75.486316 
+L 255.768914 76.621953 
+L 256.290909 77.646427 
+L 257.103936 78.459453 
+L 258.128409 78.981448 
+L 259.264047 79.161316 
+L 260.399684 78.981448 
+L 261.424158 78.459453 
+L 262.237184 77.646427 
+L 262.759179 76.621953 
+L 262.939047 75.486316 
+L 262.759179 74.350678 
+L 262.237184 73.326205 
+L 261.424158 72.513178 
+L 260.399684 71.991183 
+L 259.264047 71.811316 
+L 259.264047 71.811316 
+L 260.399684 71.991183 
+L 261.424158 72.513178 
+L 262.237184 73.326205 
+L 262.759179 74.350678 
+L 262.939047 75.486316 
+L 262.759179 76.621953 
+L 262.237184 77.646427 
+L 261.424158 78.459453 
+L 260.399684 78.981448 
+L 259.264047 79.161316 
+L 258.128409 78.981448 
+L 257.103936 78.459453 
+L 256.290909 77.646427 
+L 255.768914 76.621953 
+L 255.589047 75.486316 
+L 255.768914 74.350678 
+L 256.290909 73.326205 
+L 257.103936 72.513178 
+L 258.128409 71.991183 
+L 259.264047 71.811316 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 270.618947 71.811316 
-L 269.48331 71.991183 
-L 268.458837 72.513178 
-L 267.64581 73.326205 
-L 267.123815 74.350678 
-L 266.943947 75.486316 
-L 267.123815 76.621953 
-L 267.64581 77.646427 
-L 268.458837 78.459453 
-L 269.48331 78.981448 
-L 270.618947 79.161316 
-L 271.754585 78.981448 
-L 272.779058 78.459453 
-L 273.592085 77.646427 
-L 274.11408 76.621953 
-L 274.293947 75.486316 
-L 274.11408 74.350678 
-L 273.592085 73.326205 
-L 272.779058 72.513178 
-L 271.754585 71.991183 
-L 270.618947 71.811316 
-L 270.618947 71.811316 
-L 271.754585 71.991183 
-L 272.779058 72.513178 
-L 273.592085 73.326205 
-L 274.11408 74.350678 
-L 274.293947 75.486316 
-L 274.11408 76.621953 
-L 273.592085 77.646427 
-L 272.779058 78.459453 
-L 271.754585 78.981448 
-L 270.618947 79.161316 
-L 269.48331 78.981448 
-L 268.458837 78.459453 
-L 267.64581 77.646427 
-L 267.123815 76.621953 
-L 266.943947 75.486316 
-L 267.123815 74.350678 
-L 267.64581 73.326205 
-L 268.458837 72.513178 
-L 269.48331 71.991183 
-L 270.618947 71.811316 
+    <path clip-path="url(#p1d48955717)" d="M 269.971872 71.811316 
+L 268.836235 71.991183 
+L 267.811761 72.513178 
+L 266.998735 73.326205 
+L 266.476739 74.350678 
+L 266.296872 75.486316 
+L 266.476739 76.621953 
+L 266.998735 77.646427 
+L 267.811761 78.459453 
+L 268.836235 78.981448 
+L 269.971872 79.161316 
+L 271.10751 78.981448 
+L 272.131983 78.459453 
+L 272.94501 77.646427 
+L 273.467005 76.621953 
+L 273.646872 75.486316 
+L 273.467005 74.350678 
+L 272.94501 73.326205 
+L 272.131983 72.513178 
+L 271.10751 71.991183 
+L 269.971872 71.811316 
+L 269.971872 71.811316 
+L 271.10751 71.991183 
+L 272.131983 72.513178 
+L 272.94501 73.326205 
+L 273.467005 74.350678 
+L 273.646872 75.486316 
+L 273.467005 76.621953 
+L 272.94501 77.646427 
+L 272.131983 78.459453 
+L 271.10751 78.981448 
+L 269.971872 79.161316 
+L 268.836235 78.981448 
+L 267.811761 78.459453 
+L 266.998735 77.646427 
+L 266.476739 76.621953 
+L 266.296872 75.486316 
+L 266.476739 74.350678 
+L 266.998735 73.326205 
+L 267.811761 72.513178 
+L 268.836235 71.991183 
+L 269.971872 71.811316 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 281.359398 71.811316 
-L 280.223761 71.991183 
-L 279.199288 72.513178 
-L 278.386261 73.326205 
-L 277.864266 74.350678 
-L 277.684398 75.486316 
-L 277.864266 76.621953 
-L 278.386261 77.646427 
-L 279.199288 78.459453 
-L 280.223761 78.981448 
-L 281.359398 79.161316 
-L 282.495036 78.981448 
-L 283.519509 78.459453 
-L 284.332536 77.646427 
-L 284.854531 76.621953 
-L 285.034398 75.486316 
-L 284.854531 74.350678 
-L 284.332536 73.326205 
-L 283.519509 72.513178 
-L 282.495036 71.991183 
-L 281.359398 71.811316 
-L 281.359398 71.811316 
-L 282.495036 71.991183 
-L 283.519509 72.513178 
-L 284.332536 73.326205 
-L 284.854531 74.350678 
-L 285.034398 75.486316 
-L 284.854531 76.621953 
-L 284.332536 77.646427 
-L 283.519509 78.459453 
-L 282.495036 78.981448 
-L 281.359398 79.161316 
-L 280.223761 78.981448 
-L 279.199288 78.459453 
-L 278.386261 77.646427 
-L 277.864266 76.621953 
-L 277.684398 75.486316 
-L 277.864266 74.350678 
-L 278.386261 73.326205 
-L 279.199288 72.513178 
-L 280.223761 71.991183 
-L 281.359398 71.811316 
+    <path clip-path="url(#p1d48955717)" d="M 280.679698 71.811316 
+L 279.54406 71.991183 
+L 278.519587 72.513178 
+L 277.70656 73.326205 
+L 277.184565 74.350678 
+L 277.004698 75.486316 
+L 277.184565 76.621953 
+L 277.70656 77.646427 
+L 278.519587 78.459453 
+L 279.54406 78.981448 
+L 280.679698 79.161316 
+L 281.815335 78.981448 
+L 282.839808 78.459453 
+L 283.652835 77.646427 
+L 284.17483 76.621953 
+L 284.354698 75.486316 
+L 284.17483 74.350678 
+L 283.652835 73.326205 
+L 282.839808 72.513178 
+L 281.815335 71.991183 
+L 280.679698 71.811316 
+L 280.679698 71.811316 
+L 281.815335 71.991183 
+L 282.839808 72.513178 
+L 283.652835 73.326205 
+L 284.17483 74.350678 
+L 284.354698 75.486316 
+L 284.17483 76.621953 
+L 283.652835 77.646427 
+L 282.839808 78.459453 
+L 281.815335 78.981448 
+L 280.679698 79.161316 
+L 279.54406 78.981448 
+L 278.519587 78.459453 
+L 277.70656 77.646427 
+L 277.184565 76.621953 
+L 277.004698 75.486316 
+L 277.184565 74.350678 
+L 277.70656 73.326205 
+L 278.519587 72.513178 
+L 279.54406 71.991183 
+L 280.679698 71.811316 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 292.09985 71.811316 
-L 290.964212 71.991183 
-L 289.939739 72.513178 
-L 289.126712 73.326205 
-L 288.604717 74.350678 
-L 288.42485 75.486316 
-L 288.604717 76.621953 
-L 289.126712 77.646427 
-L 289.939739 78.459453 
-L 290.964212 78.981448 
-L 292.09985 79.161316 
-L 293.235487 78.981448 
-L 294.25996 78.459453 
-L 295.072987 77.646427 
-L 295.594982 76.621953 
-L 295.77485 75.486316 
-L 295.594982 74.350678 
-L 295.072987 73.326205 
-L 294.25996 72.513178 
-L 293.235487 71.991183 
-L 292.09985 71.811316 
-L 292.09985 71.811316 
-L 293.235487 71.991183 
-L 294.25996 72.513178 
-L 295.072987 73.326205 
-L 295.594982 74.350678 
-L 295.77485 75.486316 
-L 295.594982 76.621953 
-L 295.072987 77.646427 
-L 294.25996 78.459453 
-L 293.235487 78.981448 
-L 292.09985 79.161316 
-L 290.964212 78.981448 
-L 289.939739 78.459453 
-L 289.126712 77.646427 
-L 288.604717 76.621953 
-L 288.42485 75.486316 
-L 288.604717 74.350678 
-L 289.126712 73.326205 
-L 289.939739 72.513178 
-L 290.964212 71.991183 
-L 292.09985 71.811316 
+    <path clip-path="url(#p1d48955717)" d="M 291.387523 71.811316 
+L 290.251886 71.991183 
+L 289.227412 72.513178 
+L 288.414386 73.326205 
+L 287.89239 74.350678 
+L 287.712523 75.486316 
+L 287.89239 76.621953 
+L 288.414386 77.646427 
+L 289.227412 78.459453 
+L 290.251886 78.981448 
+L 291.387523 79.161316 
+L 292.523161 78.981448 
+L 293.547634 78.459453 
+L 294.360661 77.646427 
+L 294.882656 76.621953 
+L 295.062523 75.486316 
+L 294.882656 74.350678 
+L 294.360661 73.326205 
+L 293.547634 72.513178 
+L 292.523161 71.991183 
+L 291.387523 71.811316 
+L 291.387523 71.811316 
+L 292.523161 71.991183 
+L 293.547634 72.513178 
+L 294.360661 73.326205 
+L 294.882656 74.350678 
+L 295.062523 75.486316 
+L 294.882656 76.621953 
+L 294.360661 77.646427 
+L 293.547634 78.459453 
+L 292.523161 78.981448 
+L 291.387523 79.161316 
+L 290.251886 78.981448 
+L 289.227412 78.459453 
+L 288.414386 77.646427 
+L 287.89239 76.621953 
+L 287.712523 75.486316 
+L 287.89239 74.350678 
+L 288.414386 73.326205 
+L 289.227412 72.513178 
+L 290.251886 71.991183 
+L 291.387523 71.811316 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 227.657143 59.479579 
-L 203.618997 64.214294 
-L 208.126149 63.326535 
-L 205.676822 58.814825 
-L 208.126149 63.326535 
+    <path clip-path="url(#p1d48955717)" d="M 227.14057 59.479579 
+L 203.102424 64.214294 
+L 207.609576 63.326535 
+L 205.160249 58.814825 
+L 207.609576 63.326535 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 238.397594 59.479579 
-L 214.336939 64.09855 
-L 218.848312 63.232493 
-L 216.420727 58.709048 
-L 218.848312 63.232493 
+    <path clip-path="url(#p1d48955717)" d="M 237.848396 59.479579 
+L 213.787741 64.09855 
+L 218.299114 63.232493 
+L 215.871529 58.709048 
+L 218.299114 63.232493 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 249.138045 55.804579 
-L 248.002408 55.984446 
-L 246.977934 56.506441 
-L 246.164908 57.319468 
-L 245.642912 58.343941 
-L 245.463045 59.479579 
-L 245.642912 60.615216 
-L 246.164908 61.63969 
-L 246.977934 62.452716 
-L 248.002408 62.974712 
-L 249.138045 63.154579 
-L 250.273683 62.974712 
-L 251.298156 62.452716 
-L 252.111183 61.63969 
-L 252.633178 60.615216 
-L 252.813045 59.479579 
-L 252.633178 58.343941 
-L 252.111183 57.319468 
-L 251.298156 56.506441 
-L 250.273683 55.984446 
-L 249.138045 55.804579 
-L 249.138045 55.804579 
-L 250.273683 55.984446 
-L 251.298156 56.506441 
-L 252.111183 57.319468 
-L 252.633178 58.343941 
-L 252.813045 59.479579 
-L 252.633178 60.615216 
-L 252.111183 61.63969 
-L 251.298156 62.452716 
-L 250.273683 62.974712 
-L 249.138045 63.154579 
-L 248.002408 62.974712 
-L 246.977934 62.452716 
-L 246.164908 61.63969 
-L 245.642912 60.615216 
-L 245.463045 59.479579 
-L 245.642912 58.343941 
-L 246.164908 57.319468 
-L 246.977934 56.506441 
-L 248.002408 55.984446 
-L 249.138045 55.804579 
+    <path clip-path="url(#p1d48955717)" d="M 248.556221 55.804579 
+L 247.420584 55.984446 
+L 246.39611 56.506441 
+L 245.583084 57.319468 
+L 245.061089 58.343941 
+L 244.881221 59.479579 
+L 245.061089 60.615216 
+L 245.583084 61.63969 
+L 246.39611 62.452716 
+L 247.420584 62.974712 
+L 248.556221 63.154579 
+L 249.691859 62.974712 
+L 250.716332 62.452716 
+L 251.529359 61.63969 
+L 252.051354 60.615216 
+L 252.231221 59.479579 
+L 252.051354 58.343941 
+L 251.529359 57.319468 
+L 250.716332 56.506441 
+L 249.691859 55.984446 
+L 248.556221 55.804579 
+L 248.556221 55.804579 
+L 249.691859 55.984446 
+L 250.716332 56.506441 
+L 251.529359 57.319468 
+L 252.051354 58.343941 
+L 252.231221 59.479579 
+L 252.051354 60.615216 
+L 251.529359 61.63969 
+L 250.716332 62.452716 
+L 249.691859 62.974712 
+L 248.556221 63.154579 
+L 247.420584 62.974712 
+L 246.39611 62.452716 
+L 245.583084 61.63969 
+L 245.061089 60.615216 
+L 244.881221 59.479579 
+L 245.061089 58.343941 
+L 245.583084 57.319468 
+L 246.39611 56.506441 
+L 247.420584 55.984446 
+L 248.556221 55.804579 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 259.878496 55.804579 
-L 258.742859 55.984446 
-L 257.718385 56.506441 
-L 256.905359 57.319468 
-L 256.383364 58.343941 
-L 256.203496 59.479579 
-L 256.383364 60.615216 
-L 256.905359 61.63969 
-L 257.718385 62.452716 
-L 258.742859 62.974712 
-L 259.878496 63.154579 
-L 261.014134 62.974712 
-L 262.038607 62.452716 
-L 262.851634 61.63969 
-L 263.373629 60.615216 
-L 263.553496 59.479579 
-L 263.373629 58.343941 
-L 262.851634 57.319468 
-L 262.038607 56.506441 
-L 261.014134 55.984446 
-L 259.878496 55.804579 
-L 259.878496 55.804579 
-L 261.014134 55.984446 
-L 262.038607 56.506441 
-L 262.851634 57.319468 
-L 263.373629 58.343941 
-L 263.553496 59.479579 
-L 263.373629 60.615216 
-L 262.851634 61.63969 
-L 262.038607 62.452716 
-L 261.014134 62.974712 
-L 259.878496 63.154579 
-L 258.742859 62.974712 
-L 257.718385 62.452716 
-L 256.905359 61.63969 
-L 256.383364 60.615216 
-L 256.203496 59.479579 
-L 256.383364 58.343941 
-L 256.905359 57.319468 
-L 257.718385 56.506441 
-L 258.742859 55.984446 
-L 259.878496 55.804579 
+    <path clip-path="url(#p1d48955717)" d="M 259.264047 55.804579 
+L 258.128409 55.984446 
+L 257.103936 56.506441 
+L 256.290909 57.319468 
+L 255.768914 58.343941 
+L 255.589047 59.479579 
+L 255.768914 60.615216 
+L 256.290909 61.63969 
+L 257.103936 62.452716 
+L 258.128409 62.974712 
+L 259.264047 63.154579 
+L 260.399684 62.974712 
+L 261.424158 62.452716 
+L 262.237184 61.63969 
+L 262.759179 60.615216 
+L 262.939047 59.479579 
+L 262.759179 58.343941 
+L 262.237184 57.319468 
+L 261.424158 56.506441 
+L 260.399684 55.984446 
+L 259.264047 55.804579 
+L 259.264047 55.804579 
+L 260.399684 55.984446 
+L 261.424158 56.506441 
+L 262.237184 57.319468 
+L 262.759179 58.343941 
+L 262.939047 59.479579 
+L 262.759179 60.615216 
+L 262.237184 61.63969 
+L 261.424158 62.452716 
+L 260.399684 62.974712 
+L 259.264047 63.154579 
+L 258.128409 62.974712 
+L 257.103936 62.452716 
+L 256.290909 61.63969 
+L 255.768914 60.615216 
+L 255.589047 59.479579 
+L 255.768914 58.343941 
+L 256.290909 57.319468 
+L 257.103936 56.506441 
+L 258.128409 55.984446 
+L 259.264047 55.804579 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 270.618947 55.804579 
-L 269.48331 55.984446 
-L 268.458837 56.506441 
-L 267.64581 57.319468 
-L 267.123815 58.343941 
-L 266.943947 59.479579 
-L 267.123815 60.615216 
-L 267.64581 61.63969 
-L 268.458837 62.452716 
-L 269.48331 62.974712 
-L 270.618947 63.154579 
-L 271.754585 62.974712 
-L 272.779058 62.452716 
-L 273.592085 61.63969 
-L 274.11408 60.615216 
-L 274.293947 59.479579 
-L 274.11408 58.343941 
-L 273.592085 57.319468 
-L 272.779058 56.506441 
-L 271.754585 55.984446 
-L 270.618947 55.804579 
-L 270.618947 55.804579 
-L 271.754585 55.984446 
-L 272.779058 56.506441 
-L 273.592085 57.319468 
-L 274.11408 58.343941 
-L 274.293947 59.479579 
-L 274.11408 60.615216 
-L 273.592085 61.63969 
-L 272.779058 62.452716 
-L 271.754585 62.974712 
-L 270.618947 63.154579 
-L 269.48331 62.974712 
-L 268.458837 62.452716 
-L 267.64581 61.63969 
-L 267.123815 60.615216 
-L 266.943947 59.479579 
-L 267.123815 58.343941 
-L 267.64581 57.319468 
-L 268.458837 56.506441 
-L 269.48331 55.984446 
-L 270.618947 55.804579 
+    <path clip-path="url(#p1d48955717)" d="M 269.971872 55.804579 
+L 268.836235 55.984446 
+L 267.811761 56.506441 
+L 266.998735 57.319468 
+L 266.476739 58.343941 
+L 266.296872 59.479579 
+L 266.476739 60.615216 
+L 266.998735 61.63969 
+L 267.811761 62.452716 
+L 268.836235 62.974712 
+L 269.971872 63.154579 
+L 271.10751 62.974712 
+L 272.131983 62.452716 
+L 272.94501 61.63969 
+L 273.467005 60.615216 
+L 273.646872 59.479579 
+L 273.467005 58.343941 
+L 272.94501 57.319468 
+L 272.131983 56.506441 
+L 271.10751 55.984446 
+L 269.971872 55.804579 
+L 269.971872 55.804579 
+L 271.10751 55.984446 
+L 272.131983 56.506441 
+L 272.94501 57.319468 
+L 273.467005 58.343941 
+L 273.646872 59.479579 
+L 273.467005 60.615216 
+L 272.94501 61.63969 
+L 272.131983 62.452716 
+L 271.10751 62.974712 
+L 269.971872 63.154579 
+L 268.836235 62.974712 
+L 267.811761 62.452716 
+L 266.998735 61.63969 
+L 266.476739 60.615216 
+L 266.296872 59.479579 
+L 266.476739 58.343941 
+L 266.998735 57.319468 
+L 267.811761 56.506441 
+L 268.836235 55.984446 
+L 269.971872 55.804579 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 281.359398 55.804579 
-L 280.223761 55.984446 
-L 279.199288 56.506441 
-L 278.386261 57.319468 
-L 277.864266 58.343941 
-L 277.684398 59.479579 
-L 277.864266 60.615216 
-L 278.386261 61.63969 
-L 279.199288 62.452716 
-L 280.223761 62.974712 
-L 281.359398 63.154579 
-L 282.495036 62.974712 
-L 283.519509 62.452716 
-L 284.332536 61.63969 
-L 284.854531 60.615216 
-L 285.034398 59.479579 
-L 284.854531 58.343941 
-L 284.332536 57.319468 
-L 283.519509 56.506441 
-L 282.495036 55.984446 
-L 281.359398 55.804579 
-L 281.359398 55.804579 
-L 282.495036 55.984446 
-L 283.519509 56.506441 
-L 284.332536 57.319468 
-L 284.854531 58.343941 
-L 285.034398 59.479579 
-L 284.854531 60.615216 
-L 284.332536 61.63969 
-L 283.519509 62.452716 
-L 282.495036 62.974712 
-L 281.359398 63.154579 
-L 280.223761 62.974712 
-L 279.199288 62.452716 
-L 278.386261 61.63969 
-L 277.864266 60.615216 
-L 277.684398 59.479579 
-L 277.864266 58.343941 
-L 278.386261 57.319468 
-L 279.199288 56.506441 
-L 280.223761 55.984446 
-L 281.359398 55.804579 
+    <path clip-path="url(#p1d48955717)" d="M 280.679698 55.804579 
+L 279.54406 55.984446 
+L 278.519587 56.506441 
+L 277.70656 57.319468 
+L 277.184565 58.343941 
+L 277.004698 59.479579 
+L 277.184565 60.615216 
+L 277.70656 61.63969 
+L 278.519587 62.452716 
+L 279.54406 62.974712 
+L 280.679698 63.154579 
+L 281.815335 62.974712 
+L 282.839808 62.452716 
+L 283.652835 61.63969 
+L 284.17483 60.615216 
+L 284.354698 59.479579 
+L 284.17483 58.343941 
+L 283.652835 57.319468 
+L 282.839808 56.506441 
+L 281.815335 55.984446 
+L 280.679698 55.804579 
+L 280.679698 55.804579 
+L 281.815335 55.984446 
+L 282.839808 56.506441 
+L 283.652835 57.319468 
+L 284.17483 58.343941 
+L 284.354698 59.479579 
+L 284.17483 60.615216 
+L 283.652835 61.63969 
+L 282.839808 62.452716 
+L 281.815335 62.974712 
+L 280.679698 63.154579 
+L 279.54406 62.974712 
+L 278.519587 62.452716 
+L 277.70656 61.63969 
+L 277.184565 60.615216 
+L 277.004698 59.479579 
+L 277.184565 58.343941 
+L 277.70656 57.319468 
+L 278.519587 56.506441 
+L 279.54406 55.984446 
+L 280.679698 55.804579 
 z
 " style="stroke:#000000;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 292.09985 55.804579 
-L 290.964212 55.984446 
-L 289.939739 56.506441 
-L 289.126712 57.319468 
-L 288.604717 58.343941 
-L 288.42485 59.479579 
-L 288.604717 60.615216 
-L 289.126712 61.63969 
-L 289.939739 62.452716 
-L 290.964212 62.974712 
-L 292.09985 63.154579 
-L 293.235487 62.974712 
-L 294.25996 62.452716 
-L 295.072987 61.63969 
-L 295.594982 60.615216 
-L 295.77485 59.479579 
-L 295.594982 58.343941 
-L 295.072987 57.319468 
-L 294.25996 56.506441 
-L 293.235487 55.984446 
-L 292.09985 55.804579 
-L 292.09985 55.804579 
-L 293.235487 55.984446 
-L 294.25996 56.506441 
-L 295.072987 57.319468 
-L 295.594982 58.343941 
-L 295.77485 59.479579 
-L 295.594982 60.615216 
-L 295.072987 61.63969 
-L 294.25996 62.452716 
-L 293.235487 62.974712 
-L 292.09985 63.154579 
-L 290.964212 62.974712 
-L 289.939739 62.452716 
-L 289.126712 61.63969 
-L 288.604717 60.615216 
-L 288.42485 59.479579 
-L 288.604717 58.343941 
-L 289.126712 57.319468 
-L 289.939739 56.506441 
-L 290.964212 55.984446 
-L 292.09985 55.804579 
+    <path clip-path="url(#p1d48955717)" d="M 291.387523 55.804579 
+L 290.251886 55.984446 
+L 289.227412 56.506441 
+L 288.414386 57.319468 
+L 287.89239 58.343941 
+L 287.712523 59.479579 
+L 287.89239 60.615216 
+L 288.414386 61.63969 
+L 289.227412 62.452716 
+L 290.251886 62.974712 
+L 291.387523 63.154579 
+L 292.523161 62.974712 
+L 293.547634 62.452716 
+L 294.360661 61.63969 
+L 294.882656 60.615216 
+L 295.062523 59.479579 
+L 294.882656 58.343941 
+L 294.360661 57.319468 
+L 293.547634 56.506441 
+L 292.523161 55.984446 
+L 291.387523 55.804579 
+L 291.387523 55.804579 
+L 292.523161 55.984446 
+L 293.547634 56.506441 
+L 294.360661 57.319468 
+L 294.882656 58.343941 
+L 295.062523 59.479579 
+L 294.882656 60.615216 
+L 294.360661 61.63969 
+L 293.547634 62.452716 
+L 292.523161 62.974712 
+L 291.387523 63.154579 
+L 290.251886 62.974712 
+L 289.227412 62.452716 
+L 288.414386 61.63969 
+L 287.89239 60.615216 
+L 287.712523 59.479579 
+L 287.89239 58.343941 
+L 288.414386 57.319468 
+L 289.227412 56.506441 
+L 290.251886 55.984446 
+L 291.387523 55.804579 
 z
 " style="stroke:#000000;"/>
    </g>
@@ -2446,45 +2457,45 @@ z
       <defs>
        <path d="M 0 0 
 L 0 3.5 
-" id="m6c17ba3a37" style="stroke:#000000;stroke-width:0.8;"/>
+" id="m03b3b1dbf4" style="stroke:#000000;stroke-width:0.8;"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m6c17ba3a37" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m03b3b1dbf4" y="307.584"/>
       </g>
      </g>
     </g>
     <g id="xtick_2">
      <g id="line2d_2">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="125.622857" xlink:href="#m6c17ba3a37" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="125.416228" xlink:href="#m03b3b1dbf4" y="307.584"/>
       </g>
      </g>
     </g>
     <g id="xtick_3">
      <g id="line2d_3">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="193.645714" xlink:href="#m6c17ba3a37" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="193.232456" xlink:href="#m03b3b1dbf4" y="307.584"/>
       </g>
      </g>
     </g>
     <g id="xtick_4">
      <g id="line2d_4">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="261.668571" xlink:href="#m6c17ba3a37" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="261.048684" xlink:href="#m03b3b1dbf4" y="307.584"/>
       </g>
      </g>
     </g>
     <g id="xtick_5">
      <g id="line2d_5">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="329.691429" xlink:href="#m6c17ba3a37" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="328.864912" xlink:href="#m03b3b1dbf4" y="307.584"/>
       </g>
      </g>
     </g>
     <g id="xtick_6">
      <g id="line2d_6">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="397.714286" xlink:href="#m6c17ba3a37" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="396.68114" xlink:href="#m03b3b1dbf4" y="307.584"/>
       </g>
      </g>
     </g>
@@ -2495,2971 +2506,3790 @@ L 0 3.5
       <defs>
        <path d="M 0 0 
 L -3.5 0 
-" id="m4378636fdc" style="stroke:#000000;stroke-width:0.8;"/>
+" id="m01a773088f" style="stroke:#000000;stroke-width:0.8;"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m4378636fdc" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m01a773088f" y="307.584"/>
       </g>
      </g>
     </g>
     <g id="ytick_2">
      <g id="line2d_8">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m4378636fdc" y="256.896"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m01a773088f" y="256.896"/>
       </g>
      </g>
     </g>
     <g id="ytick_3">
      <g id="line2d_9">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m4378636fdc" y="206.208"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m01a773088f" y="206.208"/>
       </g>
      </g>
     </g>
     <g id="ytick_4">
      <g id="line2d_10">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m4378636fdc" y="155.52"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m01a773088f" y="155.52"/>
       </g>
      </g>
     </g>
     <g id="ytick_5">
      <g id="line2d_11">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m4378636fdc" y="104.832"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m01a773088f" y="104.832"/>
       </g>
      </g>
     </g>
     <g id="ytick_6">
      <g id="line2d_12">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m4378636fdc" y="54.144"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#m01a773088f" y="54.144"/>
       </g>
      </g>
     </g>
    </g>
    <g id="LineCollection_1">
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 282.24 
-L 329.691429 282.24 
-" style="fill:none;stroke:#1f77b4;stroke-width:6.547107;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 282.24 
-L 332.401391 281.878053 
-" style="fill:none;stroke:#1f77b4;stroke-width:6.547107;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 332.401391 281.878053 
-L 335.111016 281.513476 
-" style="fill:none;stroke:#1f77b4;stroke-width:6.328708;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 335.111016 281.513476 
-L 337.820483 281.149035 
-" style="fill:none;stroke:#1f77b4;stroke-width:6.055412;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 337.820483 281.149035 
-L 340.529991 280.787766 
-" style="fill:none;stroke:#1f77b4;stroke-width:5.731695;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 340.529991 280.787766 
-L 343.239785 280.433709 
-" style="fill:none;stroke:#1f77b4;stroke-width:5.362117;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 343.239785 280.433709 
-L 345.950124 280.091601 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.939573;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 345.950124 280.091601 
-L 348.661265 279.766387 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.490371;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 348.661265 279.766387 
-L 351.373494 279.464085 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.023518;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 351.373494 279.464085 
-L 354.087089 279.192935 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.545955;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 354.087089 279.192935 
-L 356.802248 278.963787 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.067829;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 356.802248 278.963787 
-L 359.519048 278.790444 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.604899;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 359.519048 278.790444 
-L 362.237345 278.691797 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.164918;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 362.237345 278.691797 
-L 364.956124 278.695372 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.75526;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 364.956124 278.695372 
-L 367.672194 278.841567 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.395488;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 367.672194 278.841567 
-L 370.37822 279.1892 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.095432;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 370.37822 279.1892 
-L 373.0588 279.823757 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.856215;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 373.0588 279.823757 
-L 375.679811 280.859779 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.684345;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 346.697143 282.24 
-L 346.697143 282.24 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.630499;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 346.697143 282.24 
-L 349.41355 282.010532 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.630499;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 349.41355 282.010532 
-L 352.130946 281.814592 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.159647;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 352.130946 281.814592 
-L 354.849448 281.661816 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.682878;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 354.849448 281.661816 
-L 357.568925 281.56543 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.207593;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 357.568925 281.56543 
-L 360.288824 281.542843 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.74958;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 360.288824 281.542843 
-L 363.008003 281.616458 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.319984;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 363.008003 281.616458 
-L 365.724221 281.816792 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.925532;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 365.724221 281.816792 
-L 368.43219 282.186568 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.57341;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 368.43219 282.186568 
-L 368.739781 282.24 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.28759;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 349.035131 275.446968 
-L 351.73299 274.939156 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.491138;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 351.73299 274.939156 
-L 354.430799 274.435949 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.019385;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 354.430799 274.435949 
-L 357.128927 273.941806 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.548747;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 357.128927 273.941806 
-L 359.827851 273.46257 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.095255;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 359.827851 273.46257 
-L 362.528284 273.006402 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.66626;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 362.528284 273.006402 
-L 365.231282 272.586568 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.267985;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 365.231282 272.586568 
-L 367.938034 272.226644 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.912679;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 367.938034 272.226644 
-L 370.64943 271.971827 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.619709;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 370.64943 271.971827 
-L 373.079078 271.910476 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.383461;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 373.079078 271.910476 
-L 374.931228 272.066372 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.221703;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 374.931228 272.066372 
-L 376.464087 272.445931 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.152458;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.464087 272.445931 
-L 377.878329 273.155322 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.11176;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 377.878329 273.155322 
-L 379.1453 274.260532 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.122594;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.1453 274.260532 
-L 379.1453 274.260532 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.145398;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.1453 274.260532 
-L 380.45257 276.010554 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.145398;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 380.45257 276.010554 
-L 380.45257 276.010554 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.202193;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 380.45257 276.010554 
-L 382.061935 278.975945 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.202193;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 382.061935 278.975945 
-L 383.542857 282.24 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.359692;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 383.542857 282.24 
-L 383.542857 282.24 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.53998;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 268.399443 
-L 396.424377 268.948075 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.475611;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 396.424377 268.948075 
-L 393.834769 270.143695 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.29524;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 393.834769 270.143695 
-L 391.631635 271.375295 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.94457;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 391.631635 271.375295 
-L 389.961866 272.548038 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.687218;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.961866 272.548038 
-L 388.692185 273.706443 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.540371;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 388.692185 273.706443 
-L 387.749522 274.872555 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.462144;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 387.749522 274.872555 
-L 386.999123 276.243695 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.413335;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.999123 276.243695 
-L 386.457526 278.047938 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.386083;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.457526 278.047938 
-L 386.267155 279.959668 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.429155;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.267155 279.959668 
-L 386.267155 279.959668 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.510584;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.267155 279.959668 
-L 386.377143 282.24 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.510584;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.377143 282.24 
-L 386.377143 282.24 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.619042;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.377143 282.24 
-L 386.377143 282.24 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.619042;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 271.703955 
-L 395.98747 272.820452 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.361552;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 395.98747 272.820452 
-L 394.0499 274.212494 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.156081;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 394.0499 274.212494 
-L 392.550138 275.566826 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.936577;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.550138 275.566826 
-L 391.337642 276.995237 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.803067;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 391.337642 276.995237 
-L 390.378674 278.546916 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.706798;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 390.378674 278.546916 
-L 389.66114 280.288727 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.684108;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.66114 280.288727 
-L 389.211429 282.24 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.707842;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.211429 282.24 
-L 389.211429 282.24 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.759938;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.211429 282.24 
-L 389.211429 282.24 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.759938;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 274.971601 
-L 397.051735 275.512265 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.351014;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.051735 275.512265 
-L 395.347107 277.071837 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.275278;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 395.347107 277.071837 
-L 393.990023 278.655991 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.091636;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 393.990023 278.655991 
-L 392.926552 280.29543 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.99641;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.926552 280.29543 
-L 392.045714 282.24 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.958947;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.045714 282.24 
-L 392.045714 282.24 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.953396;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.045714 282.24 
-L 392.045714 282.24 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.953396;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 265.344 
-L 397.714286 265.344 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.613561;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 265.344 
-L 395.045383 266.121594 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.613561;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 395.045383 266.121594 
-L 392.386097 266.958187 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.213227;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.386097 266.958187 
-L 389.749386 267.88883 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.873861;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.749386 267.88883 
-L 387.160369 268.993378 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.583019;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 387.160369 268.993378 
-L 387.160369 268.993378 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.346577;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 387.160369 268.993378 
-L 385.078236 270.211414 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.346577;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 385.078236 270.211414 
-L 385.078236 270.211414 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.213619;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 385.078236 270.211414 
-L 383.954519 271.207429 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.213619;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 383.954519 271.207429 
-L 383.954519 271.207429 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.147171;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 383.954519 271.207429 
-L 383.259679 272.212332 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.147171;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 383.259679 272.212332 
-L 382.84359 273.437374 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.131069;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 382.84359 273.437374 
-L 382.732119 274.552326 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.156991;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 382.732119 274.552326 
-L 382.813967 275.890532 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.18636;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 382.813967 275.890532 
-L 383.105217 277.533547 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.224764;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 383.105217 277.533547 
-L 383.623826 279.578141 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.288704;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 383.623826 279.578141 
-L 384.367142 282.24 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.404971;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 261.12 
-L 397.714286 261.12 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.899949;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 261.12 
-L 395.0085 261.529283 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.899949;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 395.0085 261.529283 
-L 392.301484 261.89582 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.495201;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.301484 261.89582 
-L 389.592794 262.196738 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.129261;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.592794 262.196738 
-L 386.882071 262.39151 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.807568;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.882071 262.39151 
-L 384.172376 262.400323 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.535742;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 384.172376 262.400323 
-L 381.483393 262.054587 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.342862;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 381.483393 262.054587 
-L 381.483393 262.054587 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.219052;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 381.483393 262.054587 
-L 379.65847 261.446201 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.219052;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.65847 261.446201 
-L 379.65847 261.446201 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.163622;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.65847 261.446201 
-L 378.170936 260.559426 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.163622;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.170936 260.559426 
-L 376.800445 259.28465 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.175852;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.800445 259.28465 
-L 375.622148 257.763853 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.219357;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 375.622148 257.763853 
-L 374.475161 255.899434 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.290003;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 374.475161 255.899434 
-L 373.179396 253.380393 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.385927;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 373.179396 253.380393 
-L 371.730053 250.161889 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.544182;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 371.730053 250.161889 
-L 370.345155 246.75467 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.765862;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 370.345155 246.75467 
-L 369.038683 243.245931 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.023616;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 369.038683 243.245931 
-L 367.804053 239.662024 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.265957;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 367.804053 239.662024 
-L 366.664748 236.025629 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.525826;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 366.664748 236.025629 
-L 365.63134 232.299056 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.721978;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 365.63134 232.299056 
-L 364.719553 228.497655 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.866211;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 364.719553 228.497655 
-L 363.967773 224.636147 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.972172;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 363.967773 224.636147 
-L 363.420563 220.708189 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.981729;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 363.420563 220.708189 
-L 363.120721 216.72739 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.911729;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 363.120721 216.72739 
-L 363.11358 212.743596 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.775842;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 363.11358 212.743596 
-L 363.415091 209.122606 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.579388;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 363.415091 209.122606 
-L 363.954556 205.993 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.356995;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 363.954556 205.993 
-L 364.741951 203.028991 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.150669;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 364.741951 203.028991 
-L 365.754561 200.294683 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.936971;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 365.754561 200.294683 
-L 366.943859 197.82758 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.748582;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 366.943859 197.82758 
-L 368.375014 195.481084 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.580308;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 368.375014 195.481084 
-L 369.970927 193.382205 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.42539;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 369.970927 193.382205 
-L 371.766179 191.48084 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.297946;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 371.766179 191.48084 
-L 373.655454 189.906142 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.16992;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 373.655454 189.906142 
-L 375.224298 188.886877 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.10774;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 375.224298 188.886877 
-L 375.224298 188.886877 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.066662;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 375.224298 188.886877 
-L 376.338916 188.332811 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.066662;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.338916 188.332811 
-L 376.338916 188.332811 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.036279;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.338916 188.332811 
-L 377.012487 188.083668 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.036279;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 377.012487 188.083668 
-L 377.479615 187.97015 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.035375;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 377.479615 187.97015 
-L 377.823685 187.941814 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.034462;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 377.823685 187.941814 
-L 378.035007 187.972683 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.033834;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.035007 187.972683 
-L 378.138829 188.032823 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.033627;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.138829 188.032823 
-L 378.164637 188.095908 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.033733;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.164637 188.095908 
-L 378.161771 188.130817 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.033978;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.161771 188.130817 
-L 378.156925 188.145657 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.034136;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.156925 188.145657 
-L 378.153574 188.151766 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.034208;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.153574 188.151766 
-L 378.151717 188.154199 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.034238;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.151717 188.154199 
-L 378.150795 188.155135 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.034251;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.150795 188.155135 
-L 378.150367 188.155483 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.034256;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.150367 188.155483 
-L 378.150179 188.155606 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.034258;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.150179 188.155606 
-L 378.150099 188.155648 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.034259;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.150099 188.155648 
-L 378.150066 188.155661 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.034259;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.150066 188.155661 
-L 378.150054 188.155664 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.03426;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.150054 188.155664 
-L 378.150049 188.155665 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.03426;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.150049 188.155665 
-L 378.150047 188.155665 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.03426;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.150047 188.155665 
-L 378.150046 188.155665 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.03426;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.150046 188.155665 
-L 378.150046 188.155665 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.03426;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.150046 188.155665 
-L 378.150046 188.155665 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.03426;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.150046 188.155665 
-L 378.150046 188.155665 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.03426;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 256.896 
-L 397.714286 256.896 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.288874;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 256.896 
-L 394.996664 257.032948 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.288874;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 394.996664 257.032948 
-L 392.278321 257.079098 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.874445;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.278321 257.079098 
-L 389.561083 256.999774 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.500494;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.561083 256.999774 
-L 386.849172 256.743253 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.173563;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.849172 256.743253 
-L 384.154827 256.231693 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.900453;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 384.154827 256.231693 
-L 381.507753 255.3573 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.710414;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 381.507753 255.3573 
-L 378.962972 254.002268 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.598917;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.962972 254.002268 
-L 376.877299 252.365742 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.579658;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.877299 252.365742 
-L 375.106231 250.496156 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.633089;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 252.672 
-L 397.714286 252.672 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.725416;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 252.672 
-L 394.995027 252.606887 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.725416;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 394.995027 252.606887 
-L 392.278492 252.430554 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.309686;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.278492 252.430554 
-L 389.568472 252.109868 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.935592;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.568472 252.109868 
-L 386.8716 251.600453 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.609984;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.8716 251.600453 
-L 384.201859 250.84415 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.339659;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 384.201859 250.84415 
-L 381.584469 249.773437 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.154506;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 381.584469 249.773437 
-L 379.054835 248.323715 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.045867;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.054835 248.323715 
-L 376.666479 246.458542 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.013516;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.666479 246.458542 
-L 374.595763 244.346473 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.060755;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 374.595763 244.346473 
-L 372.71429 241.931763 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.173188;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 372.71429 241.931763 
-L 370.977413 239.206191 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.299869;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 370.977413 239.206191 
-L 369.31472 236.045351 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.482244;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 248.448 
-L 397.714286 248.448 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.181855;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 248.448 
-L 394.998023 248.232593 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.181855;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 394.998023 248.232593 
-L 392.287627 247.899127 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.764493;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.287627 247.899127 
-L 389.587721 247.418474 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.388278;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.587721 247.418474 
-L 386.905463 246.753929 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.059863;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.905463 246.753929 
-L 384.254125 245.8605 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.785585;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 384.254125 245.8605 
-L 381.654722 244.68896 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.59602;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 381.654722 244.68896 
-L 379.13357 243.193962 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.475702;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.13357 243.193962 
-L 376.723003 241.339039 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.412917;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.723003 241.339039 
-L 374.46241 239.117151 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.427112;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 374.46241 239.117151 
-L 372.421793 236.598063 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.509065;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 244.224 
-L 397.714286 244.224 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.62925;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 244.224 
-L 395.0027 243.897493 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.62925;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 395.0027 243.897493 
-L 392.299191 243.452575 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.204298;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.299191 243.452575 
-L 389.608578 242.863747 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.818386;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.608578 242.863747 
-L 386.937838 242.09983 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.477754;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.937838 242.09983 
-L 384.29919 241.123609 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.188193;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 384.29919 241.123609 
-L 381.710828 239.894934 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.980879;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 240 
-L 397.714286 240 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.024383;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 240 
-L 395.007414 239.594874 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.024383;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 395.007414 239.594874 
-L 392.310011 239.072363 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.595116;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.310011 239.072363 
-L 389.626772 238.41111 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.191442;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.626772 238.41111 
-L 386.964302 237.583664 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.828303;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.964302 237.583664 
-L 384.333932 236.55722 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.512019;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 384.333932 236.55722 
-L 381.752108 235.296 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.274175;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 381.752108 235.296 
-L 379.238533 233.763816 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.096962;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.238533 233.763816 
-L 376.819343 231.926935 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.965338;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.819343 231.926935 
-L 374.530703 229.762486 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.869148;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 374.530703 229.762486 
-L 372.408415 227.253717 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.83707;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 372.408415 227.253717 
-L 370.545672 224.486794 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.79002;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 370.545672 224.486794 
-L 368.985525 221.541567 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.770692;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 368.985525 221.541567 
-L 367.746383 218.502922 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.6993;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 367.746383 218.502922 
-L 366.818229 215.368216 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.634791;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 366.818229 215.368216 
-L 366.233036 212.325741 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.507247;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 366.233036 212.325741 
-L 365.958882 209.277262 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.36656;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 365.958882 209.277262 
-L 365.988957 206.464369 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.197008;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 235.776 
-L 397.714286 235.776 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.313509;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 235.776 
-L 395.010864 235.322676 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.313509;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 395.010864 235.322676 
-L 392.317684 234.753966 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.868599;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.317684 234.753966 
-L 389.639454 234.048554 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.459064;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.639454 234.048554 
-L 386.982292 233.18307 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.084685;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.982292 233.18307 
-L 384.356744 232.128623 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.733969;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 384.356744 232.128623 
-L 381.778247 230.851111 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.456791;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 381.778247 230.851111 
-L 379.265667 229.313891 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.234599;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.265667 229.313891 
-L 376.845125 227.480221 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.065878;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.845125 227.480221 
-L 374.554952 225.319711 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.921086;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 374.554952 225.319711 
-L 372.436302 222.805054 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.819569;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 372.436302 222.805054 
-L 370.629753 220.066513 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.7252;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 370.629753 220.066513 
-L 369.191296 217.233382 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.633281;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 369.191296 217.233382 
-L 368.100195 214.327062 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.521965;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 231.552 
-L 397.714286 231.552 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.489957;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 231.552 
-L 395.012864 231.072256 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.489957;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 395.012864 231.072256 
-L 392.321856 230.480667 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.024641;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.321856 230.480667 
-L 389.64581 229.756738 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.591328;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.64581 229.756738 
-L 386.990925 228.875737 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.195315;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.990925 228.875737 
-L 384.367318 227.810217 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.841449;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 384.367318 227.810217 
-L 381.789615 226.528705 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.522951;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 381.789615 226.528705 
-L 379.276734 224.992352 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.254253;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.276734 224.992352 
-L 376.856105 223.159366 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.03348;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.856105 223.159366 
-L 374.570693 220.990164 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.864356;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 374.570693 220.990164 
-L 372.471288 218.444316 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.70148;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 227.328 
-L 397.714286 227.328 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.543134;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 227.328 
-L 395.013377 226.84164 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.543134;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 395.013377 226.84164 
-L 392.322667 226.246801 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.056926;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.322667 226.246801 
-L 389.646508 225.523566 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.599398;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.646508 225.523566 
-L 386.99086 224.64749 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.175505;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.99086 224.64749 
-L 384.366072 223.588562 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.790025;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 384.366072 223.588562 
-L 381.786914 222.313768 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.473201;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 381.786914 222.313768 
-L 379.272625 220.783366 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.166059;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.272625 220.783366 
-L 376.853516 218.947648 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.900601;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.853516 218.947648 
-L 374.57988 216.75622 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.692752;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 374.57988 216.75622 
-L 372.590119 214.255024 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.50354;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 372.590119 214.255024 
-L 371.064753 211.689175 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.316338;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 371.064753 211.689175 
-L 369.974572 209.123878 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.176215;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 369.974572 209.123878 
-L 369.275149 206.59515 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.025652;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 369.275149 206.59515 
-L 368.934098 204.16305 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.880809;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 368.934098 204.16305 
-L 368.90036 201.877649 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.748432;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 368.90036 201.877649 
-L 369.141597 199.687323 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.620641;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 369.141597 199.687323 
-L 369.601125 197.709229 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.514782;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 369.601125 197.709229 
-L 370.302274 195.760043 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.41196;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 223.104 
-L 397.714286 223.104 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.467569;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 223.104 
-L 395.012371 222.630286 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.467569;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 395.012371 222.630286 
-L 392.320143 222.051036 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.965179;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.320143 222.051036 
-L 389.641763 221.34652 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.488671;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.641763 221.34652 
-L 386.982975 220.49202 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.042712;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.982975 220.49202 
-L 384.354078 219.456246 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.631535;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 384.354078 219.456246 
-L 381.770783 218.201309 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.285248;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 381.770783 218.201309 
-L 379.253998 216.681974 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.984068;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.253998 216.681974 
-L 376.83813 214.840035 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.689557;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 218.88 
-L 397.714286 218.88 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.242186;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 218.88 
-L 395.009667 218.441854 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.242186;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 395.009667 218.441854 
-L 392.314078 217.898318 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.747485;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.314078 217.898318 
-L 389.63143 217.231067 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.269403;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.63143 217.231067 
-L 386.967241 216.415369 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.812663;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.967241 216.415369 
-L 384.331812 215.417945 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.388131;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 384.331812 215.417945 
-L 381.741727 214.196499 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.025676;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 214.656 
-L 397.714286 214.656 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.903467;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 214.656 
-L 395.005595 214.279495 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.903467;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 395.005595 214.279495 
-L 392.304724 213.798846 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.409749;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.304724 213.798846 
-L 389.61556 213.193153 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.939888;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.61556 213.193153 
-L 386.943598 212.436234 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.498355;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.943598 212.436234 
-L 384.299158 211.494258 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.082044;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 384.299158 211.494258 
-L 381.699889 210.320101 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.720518;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 381.699889 210.320101 
-L 379.1736 208.846751 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.400306;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.1736 208.846751 
-L 376.772304 206.97718 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.116306;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.772304 206.97718 
-L 376.772304 206.97718 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.877026;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.772304 206.97718 
-L 375.115095 205.246848 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.877026;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 375.115095 205.246848 
-L 375.115095 205.246848 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.725918;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 375.115095 205.246848 
-L 373.862449 203.482149 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.725918;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 373.862449 203.482149 
-L 373.862449 203.482149 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.60011;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 373.862449 203.482149 
-L 372.973538 201.714968 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.60011;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 372.973538 201.714968 
-L 372.36322 199.707161 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.489315;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 372.36322 199.707161 
-L 372.137014 197.890183 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.400217;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 372.137014 197.890183 
-L 372.199053 196.182935 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.319624;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 210.432 
-L 397.714286 210.432 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.495543;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 210.432 
-L 395.001004 210.142562 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.495543;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 395.001004 210.142562 
-L 392.293952 209.750518 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.015974;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.293952 209.750518 
-L 389.596696 209.234405 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.55904;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 206.208 
-L 397.714286 206.208 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.046206;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 206.208 
-L 394.996705 206.036403 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.046206;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 394.996705 206.036403 
-L 392.283374 205.76314 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.59306;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.283374 205.76314 
-L 389.577481 205.366229 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.162149;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.577481 205.366229 
-L 386.883865 204.815205 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.758086;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.883865 204.815205 
-L 384.212928 204.065545 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.384757;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 384.212928 204.065545 
-L 381.585794 203.051034 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.068725;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 381.585794 203.051034 
-L 379.044396 201.666086 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.794259;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.044396 201.666086 
-L 379.044396 201.666086 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.560785;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.044396 201.666086 
-L 377.269737 200.310678 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.560785;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 377.269737 200.310678 
-L 377.269737 200.310678 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.429226;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 377.269737 200.310678 
-L 375.963018 198.915286 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.429226;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 375.963018 198.915286 
-L 375.963018 198.915286 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.324551;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 375.963018 198.915286 
-L 375.075816 197.545012 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.324551;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 375.075816 197.545012 
-L 375.075816 197.545012 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.256251;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 375.075816 197.545012 
-L 374.52337 196.2012 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.256251;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 374.52337 196.2012 
-L 374.251434 194.785036 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.207234;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 374.251434 194.785036 
-L 374.254813 193.530611 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.172322;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 374.254813 193.530611 
-L 374.490685 192.283465 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.138074;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 201.984 
-L 397.714286 201.984 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.58489;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 201.984 
-L 394.993913 201.968964 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.58489;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 394.993913 201.968964 
-L 392.275126 201.852391 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.166306;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.275126 201.852391 
-L 389.560707 201.61195 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.770105;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.560707 201.61195 
-L 386.855026 201.215698 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.401335;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 197.76 
-L 397.714286 197.76 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.162976;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 197.76 
-L 394.997915 197.956054 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.162976;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 394.997915 197.956054 
-L 392.279698 198.050497 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.785786;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.279698 198.050497 
-L 389.561477 198.020606 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.42901;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.561477 198.020606 
-L 386.846366 197.832722 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.097516;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.846366 197.832722 
-L 384.142751 197.43252 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.795728;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 384.142751 197.43252 
-L 381.473748 196.725991 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.549028;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 381.473748 196.725991 
-L 381.473748 196.725991 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.347945;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 381.473748 196.725991 
-L 379.403978 195.835034 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.347945;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.403978 195.835034 
-L 379.403978 195.835034 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.224495;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.403978 195.835034 
-L 377.977833 194.895478 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.224495;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 377.977833 194.895478 
-L 377.977833 194.895478 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.167656;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 377.977833 194.895478 
-L 376.998808 193.910619 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.167656;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.998808 193.910619 
-L 376.998808 193.910619 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.120774;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 193.536 
-L 397.714286 193.536 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.81528;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 193.536 
-L 395.015157 194.004672 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.81528;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 395.015157 194.004672 
-L 392.309781 194.370087 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.477779;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.309781 194.370087 
-L 389.599246 194.610873 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.159496;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.599246 194.610873 
-L 386.885647 194.694229 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.865756;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.885647 194.694229 
-L 384.175656 194.564484 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.601944;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 384.175656 194.564484 
-L 381.49016 194.116775 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.396117;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 381.49016 194.116775 
-L 381.49016 194.116775 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.235286;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 381.49016 194.116775 
-L 379.584138 193.483083 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.235286;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.584138 193.483083 
-L 379.584138 193.483083 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.135211;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 189.312 
-L 397.714286 189.312 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.554919;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 189.312 
-L 395.054816 190.128265 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.554919;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 395.054816 190.128265 
-L 392.380725 190.836399 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.245398;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.380725 190.836399 
-L 389.690796 191.417669 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.952655;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 180.864 
-L 397.714286 180.864 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.332087;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 397.714286 180.864 
-L 395.275639 182.63581 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.332087;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 395.275639 182.63581 
-L 392.800154 184.255293 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.074421;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.800154 184.255293 
-L 390.279206 185.722171 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.819452;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 390.279206 185.722171 
-L 387.714847 187.017275 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.571031;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 387.714847 187.017275 
-L 385.122477 188.099231 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.383204;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 385.122477 188.099231 
-L 382.529962 188.892842 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.239198;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 382.529962 188.892842 
-L 382.529962 188.892842 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.123532;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 382.529962 188.892842 
-L 380.559986 189.229578 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.123532;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 380.559986 189.229578 
-L 380.559986 189.229578 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.065249;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 380.559986 189.229578 
-L 379.570914 189.270525 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.065249;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.570914 189.270525 
-L 379.570914 189.270525 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.041291;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.377143 180.864 
-L 386.377143 180.864 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.318982;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.377143 180.864 
-L 386.377143 180.864 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.318982;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.377143 180.864 
-L 385.279428 182.726387 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.318982;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 385.279428 182.726387 
-L 384.079883 184.32537 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.250101;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 384.079883 184.32537 
-L 382.530716 185.93046 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.170745;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 382.530716 185.93046 
-L 380.948646 187.16262 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.089303;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 380.948646 187.16262 
-L 380.948646 187.16262 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.055235;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 372.205714 180.864 
-L 372.205714 180.864 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.416269;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 372.205714 180.864 
-L 374.890235 181.417407 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.416269;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 374.890235 181.417407 
-L 374.890235 181.417407 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.254073;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 374.890235 181.417407 
-L 376.811769 182.134716 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.254073;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.811769 182.134716 
-L 376.811769 182.134716 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.159099;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.811769 182.134716 
-L 378.10719 182.914128 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.159099;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.10719 182.914128 
-L 378.10719 182.914128 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.117981;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.10719 182.914128 
-L 378.97788 183.748079 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.117981;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 378.97788 183.748079 
-L 378.97788 183.748079 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.084848;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 190.228955 
-L 331.727508 189.411317 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.76228;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 331.727508 189.411317 
-L 334.358025 188.387027 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.70793;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 334.358025 188.387027 
-L 336.998484 187.419588 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.603875;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 336.998484 187.419588 
-L 339.648524 186.506972 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.446596;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 339.648524 186.506972 
-L 342.307109 185.648385 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.221885;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 342.307109 185.648385 
-L 344.972777 184.844065 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.969641;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 344.972777 184.844065 
-L 347.645052 184.095254 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.687928;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 347.645052 184.095254 
-L 350.323975 183.404698 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.371168;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 350.323975 183.404698 
-L 353.009624 182.776559 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.022681;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 353.009624 182.776559 
-L 355.702067 182.21633 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.659977;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 355.702067 182.21633 
-L 358.401372 181.731572 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.289121;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 358.401372 181.731572 
-L 361.107442 181.333368 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.91613;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 361.107442 181.333368 
-L 363.819767 181.037078 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.561329;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 363.819767 181.037078 
-L 366.537143 180.864 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.227785;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 366.537143 180.864 
-L 366.537143 180.864 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.920384;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 186.067708 
-L 330.779034 185.718872 
-" style="fill:none;stroke:#1f77b4;stroke-width:5.072178;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 330.779034 185.718872 
-L 333.441454 184.888728 
-" style="fill:none;stroke:#1f77b4;stroke-width:5.0457;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 333.441454 184.888728 
-L 336.109451 184.103 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.972276;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 336.109451 184.103 
-L 338.782928 183.361605 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.822088;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 338.782928 183.361605 
-L 341.461831 182.665095 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.617037;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 341.461831 182.665095 
-L 344.146159 182.014767 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.365101;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 344.146159 182.014767 
-L 346.835989 181.413185 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.069684;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 346.835989 181.413185 
-L 349.531429 180.864 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.728372;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 349.531429 180.864 
-L 349.531429 180.864 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.361375;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 182.956152 
-L 330.142051 182.836133 
-" style="fill:none;stroke:#1f77b4;stroke-width:5.397574;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 330.142051 182.836133 
-L 332.821601 182.14168 
-" style="fill:none;stroke:#1f77b4;stroke-width:5.383456;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 332.821601 182.14168 
-L 335.505677 181.484003 
-" style="fill:none;stroke:#1f77b4;stroke-width:5.296523;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 335.505677 181.484003 
-L 338.194286 180.864 
-" style="fill:none;stroke:#1f77b4;stroke-width:5.140052;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 338.194286 180.864 
-L 338.194286 180.864 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.930711;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 197.76 
-L 329.691429 197.76 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.446391;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 197.76 
-L 332.210018 196.232367 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.446391;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 332.210018 196.232367 
-L 334.751715 194.794426 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.345818;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 334.751715 194.794426 
-L 337.313391 193.440643 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.226914;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 337.313391 193.440643 
-L 339.893691 192.164011 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.061594;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 339.893691 192.164011 
-L 342.490597 190.960571 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.839754;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 342.490597 190.960571 
-L 345.101385 189.829239 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.590266;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 345.101385 189.829239 
-L 347.724546 188.76935 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.325301;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 347.724546 188.76935 
-L 350.360011 187.780565 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.026753;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 350.360011 187.780565 
-L 353.008029 186.86432 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.697681;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 353.008029 186.86432 
-L 355.668558 186.024037 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.353918;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 355.668558 186.024037 
-L 358.339859 185.265479 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.006915;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 358.339859 185.265479 
-L 361.020252 184.597707 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.675473;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 361.020252 184.597707 
-L 363.709651 184.033887 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.360555;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 363.709651 184.033887 
-L 366.407582 183.593281 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.062332;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 366.407582 183.593281 
-L 369.112904 183.305988 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.786042;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 369.112904 183.305988 
-L 371.820867 183.224068 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.537332;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 371.820867 183.224068 
-L 374.515132 183.448041 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.346279;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 374.515132 183.448041 
-L 374.515132 183.448041 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.198234;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 374.515132 183.448041 
-L 376.436066 183.908598 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.198234;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.436066 183.908598 
-L 376.436066 183.908598 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.108206;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 201.984 
-L 329.691429 201.984 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.408742;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 201.984 
-L 332.126628 200.1826 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.408742;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 332.126628 200.1826 
-L 334.594921 198.487919 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.299378;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 334.594921 198.487919 
-L 337.093399 196.888532 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.151307;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 206.208 
-L 329.691429 206.208 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.463971;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 206.208 
-L 332.027956 204.1394 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.463971;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 332.027956 204.1394 
-L 334.408402 202.181488 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.317635;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 334.408402 202.181488 
-L 336.827739 200.332973 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.140784;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 214.656 
-L 329.691429 214.656 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.677423;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 214.656 
-L 331.811983 212.119509 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.677423;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 331.811983 212.119509 
-L 333.985159 209.685841 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.506001;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 333.985159 209.685841 
-L 336.210797 207.358722 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.318193;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 336.210797 207.358722 
-L 338.485786 205.141974 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.094877;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 338.485786 205.141974 
-L 340.807763 203.038272 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.858577;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 340.807763 203.038272 
-L 343.172715 201.043059 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.594579;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 343.172715 201.043059 
-L 345.576143 199.157385 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.315565;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 345.576143 199.157385 
-L 348.016184 197.376396 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.02443;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 348.016184 197.376396 
-L 350.489394 195.69868 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.707311;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 350.489394 195.69868 
-L 352.990992 194.126437 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.399267;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 352.990992 194.126437 
-L 355.52028 192.657935 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.089254;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 355.52028 192.657935 
-L 358.078215 191.292491 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.766833;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 358.078215 191.292491 
-L 360.660343 190.037091 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.44652;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 360.660343 190.037091 
-L 363.261992 188.902069 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.17196;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 363.261992 188.902069 
-L 365.884785 187.899112 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.905832;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 223.104 
-L 329.691429 223.104 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.876389;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 223.104 
-L 331.642847 220.27926 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.876389;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 331.642847 220.27926 
-L 333.624821 217.503072 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.73047;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 333.624821 217.503072 
-L 335.646295 214.792429 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.568969;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 335.646295 214.792429 
-L 337.714254 212.161977 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.35095;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 337.714254 212.161977 
-L 339.833031 209.625047 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.112933;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 339.833031 209.625047 
-L 342.004365 207.188647 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.846444;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 342.004365 207.188647 
-L 344.227989 204.861959 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.552787;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 344.227989 204.861959 
-L 346.502946 202.648347 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.260107;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 346.502946 202.648347 
-L 348.825444 200.54923 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.934151;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 348.825444 200.54923 
-L 351.192534 198.570521 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.624359;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 351.192534 198.570521 
-L 353.603297 196.705033 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.301454;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 227.328 
-L 329.691429 227.328 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.9057;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 227.328 
-L 331.60442 224.444532 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.9057;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 331.60442 224.444532 
-L 333.52381 221.571275 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.803429;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 333.52381 221.571275 
-L 335.46247 218.727259 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.665544;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 335.46247 218.727259 
-L 337.433113 215.934441 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.476464;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 337.433113 215.934441 
-L 339.445838 213.209367 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.252612;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 231.552 
-L 329.691429 231.552 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.885048;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 231.552 
-L 331.603388 228.667409 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.885048;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 331.603388 228.667409 
-L 333.49362 225.750846 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.826523;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 333.49362 225.750846 
-L 335.378148 222.826569 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.720325;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 335.378148 222.826569 
-L 337.270756 219.914741 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.567802;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 337.270756 219.914741 
-L 339.187596 217.039817 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.372354;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 339.187596 217.039817 
-L 341.140141 214.220363 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.135594;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 341.140141 214.220363 
-L 343.139744 211.477516 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.867225;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 343.139744 211.477516 
-L 345.192861 208.826112 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.573195;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 345.192861 208.826112 
-L 347.304272 206.280487 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.257763;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 235.776 
-L 329.691429 235.776 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.818897;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 235.776 
-L 331.645059 232.955261 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.818897;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 331.645059 232.955261 
-L 333.549597 230.060003 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.780978;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 333.549597 230.060003 
-L 335.417963 227.11274 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.720809;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 335.417963 227.11274 
-L 337.263189 224.133194 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.600247;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 337.263189 224.133194 
-L 339.104061 221.148608 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.453667;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 339.104061 221.148608 
-L 340.956183 218.179799 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.243332;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 340.956183 218.179799 
-L 342.837672 215.254608 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.013103;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 240 
-L 329.691429 240 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.715852;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 240 
-L 331.719981 237.300399 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.715852;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 331.719981 237.300399 
-L 333.678572 234.488128 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.689212;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 333.678572 234.488128 
-L 335.573471 231.579366 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.659254;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 335.573471 231.579366 
-L 337.413664 228.593584 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.569313;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 337.413664 228.593584 
-L 339.214422 225.554554 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.466518;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 339.214422 225.554554 
-L 340.995656 222.490763 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.297946;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 340.995656 222.490763 
-L 342.774899 219.425317 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.105504;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 244.224 
-L 329.691429 244.224 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.592864;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 244.224 
-L 331.822069 241.707148 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.592864;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 331.822069 241.707148 
-L 333.873073 239.047117 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.56623;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 333.873073 239.047117 
-L 335.842412 236.252107 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.534349;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 335.842412 236.252107 
-L 337.730249 233.334898 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.470562;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 337.730249 233.334898 
-L 339.543018 230.312669 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.390104;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 339.543018 230.312669 
-L 341.295006 227.211852 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.272955;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 341.295006 227.211852 
-L 343.001744 224.055505 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.12184;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 248.448 
-L 329.691429 248.448 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.488495;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 248.448 
-L 331.936726 246.166056 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.488495;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 331.936726 246.166056 
-L 334.10584 243.724742 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.435044;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 334.10584 243.724742 
-L 336.188927 241.12242 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.37972;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 336.188927 241.12242 
-L 338.175479 238.357211 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.315668;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 338.175479 238.357211 
-L 340.060765 235.437586 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.236008;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 340.060765 235.437586 
-L 341.845939 232.38106 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.151048;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 341.845939 232.38106 
-L 343.537708 229.207884 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.035964;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 343.537708 229.207884 
-L 345.15751 225.952169 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.910689;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 345.15751 225.952169 
-L 346.73215 222.648728 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.730474;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 346.73215 222.648728 
-L 348.290814 219.329298 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.528;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 348.290814 219.329298 
-L 349.869046 216.034704 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.279641;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 349.869046 216.034704 
-L 351.493848 212.790246 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.996922;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 351.493848 212.790246 
-L 353.192398 209.636658 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.69107;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 353.192398 209.636658 
-L 354.984493 206.60779 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.36729;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 354.984493 206.60779 
-L 356.877705 203.7234 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.036362;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 356.877705 203.7234 
-L 358.874597 201.008443 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.716519;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 358.874597 201.008443 
-L 360.973049 198.476608 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.406194;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 360.973049 198.476608 
-L 363.167993 196.137058 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.120729;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 363.167993 196.137058 
-L 365.449532 194.006055 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.855007;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 365.449532 194.006055 
-L 367.81358 192.090725 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.624152;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 367.81358 192.090725 
-L 370.250441 190.413421 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.42115;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 370.250441 190.413421 
-L 372.727583 189.032668 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.265554;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 372.727583 189.032668 
-L 372.727583 189.032668 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.140512;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 256.896 
-L 329.691429 256.896 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.431894;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 256.896 
-L 332.152444 255.173374 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.431894;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 332.152444 255.173374 
-L 334.567717 253.314857 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.283418;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 334.567717 253.314857 
-L 336.925237 251.301904 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.145916;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 336.925237 251.301904 
-L 339.209281 249.107951 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.990992;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 339.209281 249.107951 
-L 341.398945 246.71293 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.823714;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 341.398945 246.71293 
-L 343.469633 244.093454 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.680458;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 343.469633 244.093454 
-L 345.394582 241.239055 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.549354;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 345.394582 241.239055 
-L 347.151429 238.153669 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.443193;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 347.151429 238.153669 
-L 348.725267 234.855904 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.355257;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 348.725267 234.855904 
-L 350.12679 231.389014 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.282435;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 350.12679 231.389014 
-L 351.387336 227.801582 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.189265;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 351.387336 227.801582 
-L 352.547095 224.140339 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.082504;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 352.547095 224.140339 
-L 353.669546 220.457459 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.937287;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 353.669546 220.457459 
-L 354.817728 216.791424 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.732845;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 354.817728 216.791424 
-L 356.034299 213.1773 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.491615;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 356.034299 213.1773 
-L 357.368995 209.670758 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.218803;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 357.368995 209.670758 
-L 358.855585 206.312526 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.916935;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 358.855585 206.312526 
-L 360.504515 203.130326 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.610243;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 261.12 
-L 329.691429 261.12 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.518917;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 261.12 
-L 332.235577 259.688429 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.518917;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 332.235577 259.688429 
-L 334.749897 258.150449 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.349424;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 334.749897 258.150449 
-L 337.227402 256.485862 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.153335;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 337.227402 256.485862 
-L 339.657253 254.670403 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.929278;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 339.657253 254.670403 
-L 342.022268 252.679191 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.693244;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 342.022268 252.679191 
-L 344.300342 250.474914 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.471884;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 344.300342 250.474914 
-L 346.460202 248.022591 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.257385;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 346.460202 248.022591 
-L 348.459516 245.290371 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.084438;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 348.459516 245.290371 
-L 350.254062 242.260065 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.95057;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 350.254062 242.260065 
-L 351.803288 238.945718 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.863753;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 351.803288 238.945718 
-L 353.036406 235.576095 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.821961;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 353.036406 235.576095 
-L 354.111673 231.865351 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.799548;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 354.111673 231.865351 
-L 355.010283 228.04668 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.766204;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 355.010283 228.04668 
-L 355.803343 224.178205 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.713972;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 265.344 
-L 329.691429 265.344 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.735694;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 265.344 
-L 332.297384 264.187749 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.735694;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 332.297384 264.187749 
-L 334.886611 262.954265 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.532633;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 334.886611 262.954265 
-L 337.455917 261.629831 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.287596;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 337.455917 261.629831 
-L 339.999546 260.197626 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.00549;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 339.999546 260.197626 
-L 342.507343 258.637509 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.706091;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 342.507343 258.637509 
-L 344.96639 256.919094 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.404163;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 344.96639 256.919094 
-L 347.358308 254.999472 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.097217;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 347.358308 254.999472 
-L 349.649391 252.832714 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.805283;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 349.649391 252.832714 
-L 351.790509 250.353985 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.566726;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 351.790509 250.353985 
-L 353.710903 247.509051 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.367622;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 353.710903 247.509051 
-L 355.198045 244.571025 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.258011;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 355.198045 244.571025 
-L 356.271881 241.692248 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.219892;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 356.271881 241.692248 
-L 357.097196 238.621285 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.24063;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 357.097196 238.621285 
-L 357.708802 235.359094 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.289908;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 357.708802 235.359094 
-L 358.197612 231.572703 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.345877;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 358.197612 231.572703 
-L 358.56903 227.562622 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.381729;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 358.56903 227.562622 
-L 358.885983 223.54612 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.382883;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 358.885983 223.54612 
-L 359.251136 219.547719 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.326704;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 359.251136 219.547719 
-L 359.749198 215.594919 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.177893;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 359.749198 215.594919 
-L 360.434594 211.71741 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.976987;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 360.434594 211.71741 
-L 361.357966 207.944561 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.732766;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 269.568 
-L 329.691429 269.568 
-" style="fill:none;stroke:#1f77b4;stroke-width:5.064159;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 269.568 
-L 332.341165 268.658273 
-" style="fill:none;stroke:#1f77b4;stroke-width:5.064159;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 332.341165 268.658273 
-L 334.982904 267.698255 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.835492;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 334.982904 267.698255 
-L 337.615551 266.681015 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.559123;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 337.615551 266.681015 
-L 340.236532 265.597741 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.239474;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 340.236532 265.597741 
-L 342.841252 264.436771 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.898532;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 342.841252 264.436771 
-L 345.424573 263.180804 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.533106;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 345.424573 263.180804 
-L 347.980016 261.804348 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.15277;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 347.980016 261.804348 
-L 350.495558 260.271575 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.763791;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 350.495558 260.271575 
-L 352.946599 258.53528 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.392471;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 352.946599 258.53528 
-L 355.294668 256.520456 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.071933;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 355.294668 256.520456 
-L 357.468145 254.122071 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.784999;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 357.468145 254.122071 
-L 357.468145 254.122071 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.585801;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 357.468145 254.122071 
-L 358.930858 251.972866 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.585801;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 358.930858 251.972866 
-L 360.153316 249.472447 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.504282;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 360.153316 249.472447 
-L 360.965455 247.011484 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.490401;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 360.965455 247.011484 
-L 361.495282 244.442407 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.540839;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 361.495282 244.442407 
-L 361.797398 241.742667 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.626609;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 361.797398 241.742667 
-L 361.918806 238.607586 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.73849;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 361.918806 238.607586 
-L 361.862761 235.017323 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.876952;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 361.862761 235.017323 
-L 361.68135 230.97744 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.018565;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 361.68135 230.97744 
-L 361.477996 226.944613 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.117527;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 361.477996 226.944613 
-L 361.32968 222.912419 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.152312;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 361.32968 222.912419 
-L 361.313106 218.879371 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.116131;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 273.792 
-L 329.691429 273.792 
-" style="fill:none;stroke:#1f77b4;stroke-width:5.48652;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 273.792 
-L 332.37088 273.096444 
-" style="fill:none;stroke:#1f77b4;stroke-width:5.48652;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 332.37088 273.096444 
-L 335.047192 272.372561 
-" style="fill:none;stroke:#1f77b4;stroke-width:5.248891;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 335.047192 272.372561 
-L 337.720231 271.618405 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.960048;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 337.720231 271.618405 
-L 340.388794 270.830776 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.62431;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 340.388794 270.830776 
-L 343.051271 270.005313 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.266581;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 343.051271 270.005313 
-L 345.706647 269.136121 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.862013;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 345.706647 269.136121 
-L 348.353537 268.214435 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.436828;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 348.353537 268.214435 
-L 350.989939 267.227453 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.997187;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 350.989939 267.227453 
-L 353.612711 266.155697 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.548891;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 353.612711 266.155697 
-L 356.211702 264.971316 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.107587;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 356.211702 264.971316 
-L 358.769928 263.628785 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.71902;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 358.769928 263.628785 
-L 361.259946 262.043629 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.357237;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 361.259946 262.043629 
-L 363.610525 260.062401 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.040787;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 363.610525 260.062401 
-L 363.610525 260.062401 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.80967;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 363.610525 260.062401 
-L 365.019978 258.40278 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.80967;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 365.019978 258.40278 
-L 365.019978 258.40278 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.720058;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 365.019978 258.40278 
-L 366.010529 256.732344 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.720058;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 366.010529 256.732344 
-L 366.740469 254.761413 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.688891;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 366.740469 254.761413 
-L 367.116703 252.843455 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.717235;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 367.116703 252.843455 
-L 367.252199 250.820813 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.793129;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 367.252199 250.820813 
-L 367.184137 248.587921 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.889869;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 367.184137 248.587921 
-L 366.902516 245.904827 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.023875;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 366.902516 245.904827 
-L 366.386697 242.655039 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.200026;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 278.016 
-L 329.691429 278.016 
-" style="fill:none;stroke:#1f77b4;stroke-width:5.987512;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 278.016 
-L 332.390023 277.502615 
-" style="fill:none;stroke:#1f77b4;stroke-width:5.987512;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 332.390023 277.502615 
-L 335.087801 276.977117 
-" style="fill:none;stroke:#1f77b4;stroke-width:5.754586;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 335.087801 276.977117 
-L 337.784514 276.439978 
-" style="fill:none;stroke:#1f77b4;stroke-width:5.468321;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 337.784514 276.439978 
-L 340.479799 275.891336 
-" style="fill:none;stroke:#1f77b4;stroke-width:5.141964;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 340.479799 275.891336 
-L 343.173718 275.332336 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.772767;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 343.173718 275.332336 
-L 345.866405 274.764181 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.351816;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 381.317448 268.099341 
-L 380.505474 268.547102 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.07447;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 380.505474 268.547102 
-L 379.968712 269.052286 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.051722;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.968712 269.052286 
-L 379.706088 269.676145 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.03818;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.706088 269.676145 
-L 379.688385 270.317481 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.036574;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.688385 270.317481 
-L 379.858985 271.226893 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.038853;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.858985 271.226893 
-L 379.858985 271.226893 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.041795;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 379.858985 271.226893 
-L 380.708571 273.792 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.041795;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 380.708571 273.792 
-L 380.708571 273.792 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.132854;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 339.830085 197.379605 
-L 342.337973 195.814681 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.689318;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 342.337973 195.814681 
-L 344.869272 194.341916 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.442079;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 344.869272 194.341916 
-L 347.422398 192.957282 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.176155;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 347.422398 192.957282 
-L 349.99726 191.6563 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.876237;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 349.99726 191.6563 
-L 352.590963 190.439991 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.547405;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 352.590963 190.439991 
-L 355.2 189.312 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.239607;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.691429 253.485854 
-L 330.714479 252.650797 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.421995;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 330.714479 252.650797 
-L 333.06984 250.629365 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.376696;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 333.06984 250.629365 
-L 335.36 248.448 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.275731;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 335.36 248.448 
-L 337.569501 246.091623 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.164001;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 337.569501 246.091623 
-L 339.68139 243.543527 
-" style="fill:none;stroke:#1f77b4;stroke-width:4.05581;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 339.68139 243.543527 
-L 341.677236 240.796421 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.945098;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 341.677236 240.796421 
-L 343.542408 237.851758 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.844646;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 343.542408 237.851758 
-L 345.26585 234.720973 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.747599;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 345.26585 234.720973 
-L 346.853765 231.433429 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.655344;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 346.853765 231.433429 
-L 348.324526 228.02692 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.538167;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 348.324526 228.02692 
-L 349.706849 224.539726 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.410358;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 352.365714 269.568 
-L 355.018842 268.694527 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.491952;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 355.018842 268.694527 
-L 357.660624 267.752233 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.04832;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 357.660624 267.752233 
-L 360.286514 266.712189 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.624957;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 360.286514 266.712189 
-L 362.882576 265.524482 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.232545;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 362.882576 265.524482 
-L 365.409176 264.096079 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.897682;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 365.409176 264.096079 
-L 365.409176 264.096079 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.62708;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 365.409176 264.096079 
-L 367.350744 262.620233 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.62708;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 367.350744 262.620233 
-L 367.350744 262.620233 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.472753;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 367.350744 262.620233 
-L 368.61061 261.250401 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.472753;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 368.61061 261.250401 
-L 368.61061 261.250401 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.382175;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 368.61061 261.250401 
-L 369.451107 259.864994 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.382175;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 369.451107 259.864994 
-L 370.015524 258.242732 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.369012;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 370.015524 258.242732 
-L 370.252271 256.659719 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.403301;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 370.252271 256.659719 
-L 370.265385 254.938949 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.451988;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 370.265385 254.938949 
-L 370.078853 252.983082 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.527507;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 370.078853 252.983082 
-L 369.658115 250.565878 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.64489;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 360.868571 269.568 
-L 363.52496 268.745724 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.288352;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 363.52496 268.745724 
-L 366.165223 267.836077 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.934544;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 366.165223 267.836077 
-L 368.776881 266.765498 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.622378;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 368.776881 266.765498 
-L 371.278365 265.342317 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.363112;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 371.278365 265.342317 
-L 371.278365 265.342317 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.205215;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 371.278365 265.342317 
-L 372.358171 264.391363 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.205215;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 372.358171 264.391363 
-L 372.358171 264.391363 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.157064;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 372.358171 264.391363 
-L 373.056601 263.404182 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.157064;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 373.056601 263.404182 
-L 373.483912 262.174272 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.145407;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 373.483912 262.174272 
-L 373.594518 260.923755 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.15446;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 373.594518 260.923755 
-L 373.494891 259.576279 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.171336;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 373.494891 259.576279 
-L 373.200839 257.962186 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.230931;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 373.200839 257.962186 
-L 372.633002 255.782882 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.304167;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 369.371429 269.568 
-L 372.02729 268.926638 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.396112;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 372.02729 268.926638 
-L 374.617878 268.251115 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.209942;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 374.617878 268.251115 
-L 374.617878 268.251115 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.092412;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 374.617878 268.251115 
-L 375.710621 267.921058 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.092412;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 375.710621 267.921058 
-L 375.710621 267.921058 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.052389;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 375.710621 267.921058 
-L 376.406647 267.662058 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.052389;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.406647 267.662058 
-L 376.406647 267.662058 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.032534;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.406647 267.662058 
-L 376.884029 267.413746 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.032534;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.884029 267.413746 
-L 377.173722 267.160726 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.029684;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 377.173722 267.160726 
-L 377.327107 266.828718 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.027278;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 377.327107 266.828718 
-L 377.315909 266.318734 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.024387;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 377.315909 266.318734 
-L 377.117111 265.54847 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.019842;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 377.117111 265.54847 
-L 376.730475 264.440386 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.034463;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.730475 264.440386 
-L 376.10005 262.794441 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.057608;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 376.10005 262.794441 
-L 375.316047 260.810435 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.091891;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.211429 265.344 
-L 386.526203 265.95734 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.611827;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 386.526203 265.95734 
-L 383.847914 266.577395 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.351896;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 383.847914 266.577395 
-L 381.295226 267.189446 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.170197;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 381.295226 267.189446 
-L 381.295226 267.189446 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.074098;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 381.295226 267.189446 
-L 380.330736 267.436786 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.074098;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 380.330736 267.436786 
-L 380.330736 267.436786 
-" style="fill:none;stroke:#1f77b4;stroke-width:0.044726;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 346.504091 212.956548 
-L 348.4094 210.070999 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.25911;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 348.4094 210.070999 
-L 350.381979 207.289046 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.935963;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 350.381979 207.289046 
-L 352.425543 204.629297 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.5973;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 352.425543 204.629297 
-L 354.544788 202.102147 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.268992;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 354.544788 202.102147 
-L 356.735734 199.721955 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.925541;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 356.735734 199.721955 
-L 358.995377 197.497539 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.624384;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 358.995377 197.497539 
-L 361.32169 195.430238 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.31142;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 361.32169 195.430238 
-L 363.702857 193.536 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.039176;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 346.697143 265.344 
-L 349.29092 264.13614 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.062785;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 349.29092 264.13614 
-L 351.855013 262.803306 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.660904;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 351.855013 262.803306 
-L 354.376633 261.299275 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.263497;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 354.376633 261.299275 
-L 356.825399 259.557453 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.879455;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 356.825399 259.557453 
-L 359.139405 257.478813 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.569079;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 359.139405 257.478813 
-L 359.139405 257.478813 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.3208;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 359.139405 257.478813 
-L 360.769631 255.537077 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.3208;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 360.769631 255.537077 
-L 362.172563 253.194637 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.179729;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 362.172563 253.194637 
-L 363.081081 250.881002 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.137866;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 363.081081 250.881002 
-L 363.616086 248.63273 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.166269;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 363.616086 248.63273 
-L 363.907629 246.254282 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.243032;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 363.907629 246.254282 
-L 363.991535 243.655332 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.354678;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 363.991535 243.655332 
-L 363.881331 240.643507 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.491643;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 363.881331 240.643507 
-L 363.570717 236.980118 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.66042;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 363.570717 236.980118 
-L 363.133303 233.019483 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.839613;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 341.966267 256.641475 
-L 344.373481 254.764086 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.445983;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 344.373481 254.764086 
-L 346.697143 252.672 
-" style="fill:none;stroke:#1f77b4;stroke-width:3.174425;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 346.697143 252.672 
-L 348.901197 250.312095 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.932565;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 348.901197 250.312095 
-L 350.935873 247.638891 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.716603;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 350.935873 247.638891 
-L 352.732606 244.618733 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.573314;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 350.130504 254.957069 
-L 352.365714 252.672 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.455625;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 352.365714 252.672 
-L 354.406075 250.01581 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.236289;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 354.406075 250.01581 
-L 356.008207 247.241416 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.070213;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 356.008207 247.241416 
-L 357.185079 244.435026 
-" style="fill:none;stroke:#1f77b4;stroke-width:2.016395;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 375.04 235.776 
-L 372.885488 233.323967 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.68239;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 372.885488 233.323967 
-L 370.95266 230.585303 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.721835;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 370.95266 230.585303 
-L 369.265267 227.616083 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.778027;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 369.265267 227.616083 
-L 367.818385 224.426262 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.805452;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 367.818385 224.426262 
-L 366.642541 221.075874 
-" style="fill:none;stroke:#1f77b4;stroke-width:1.817088;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 282.24 
+L 328.864912 282.24 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.558732;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 282.24 
+L 331.116383 281.93865 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.558732;"/>
+    <path clip-path="url(#p1d48955717)" d="M 331.116383 281.93865 
+L 333.367597 281.635112 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.522606;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.367597 281.635112 
+L 335.618646 281.330757 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.480361;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.618646 281.330757 
+L 337.86966 281.027675 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.429537;"/>
+    <path clip-path="url(#p1d48955717)" d="M 337.86966 281.027675 
+L 340.120765 280.727879 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.367099;"/>
+    <path clip-path="url(#p1d48955717)" d="M 340.120765 280.727879 
+L 342.372093 280.43349 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.299009;"/>
+    <path clip-path="url(#p1d48955717)" d="M 342.372093 280.43349 
+L 344.623796 280.147293 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.220916;"/>
+    <path clip-path="url(#p1d48955717)" d="M 344.623796 280.147293 
+L 346.876022 279.871953 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.134787;"/>
+    <path clip-path="url(#p1d48955717)" d="M 346.876022 279.871953 
+L 349.128933 279.611071 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.043704;"/>
+    <path clip-path="url(#p1d48955717)" d="M 349.128933 279.611071 
+L 351.382687 279.369082 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.942481;"/>
+    <path clip-path="url(#p1d48955717)" d="M 351.382687 279.369082 
+L 353.637458 279.150712 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.836749;"/>
+    <path clip-path="url(#p1d48955717)" d="M 353.637458 279.150712 
+L 355.893343 278.96266 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.726407;"/>
+    <path clip-path="url(#p1d48955717)" d="M 355.893343 278.96266 
+L 358.150379 278.813279 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.60941;"/>
+    <path clip-path="url(#p1d48955717)" d="M 358.150379 278.813279 
+L 360.408519 278.713056 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.490626;"/>
+    <path clip-path="url(#p1d48955717)" d="M 360.408519 278.713056 
+L 362.667229 278.676647 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.369195;"/>
+    <path clip-path="url(#p1d48955717)" d="M 362.667229 278.676647 
+L 364.925563 278.723348 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.24759;"/>
+    <path clip-path="url(#p1d48955717)" d="M 364.925563 278.723348 
+L 367.181182 278.880094 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.128503;"/>
+    <path clip-path="url(#p1d48955717)" d="M 367.181182 278.880094 
+L 369.428775 279.184452 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.015317;"/>
+    <path clip-path="url(#p1d48955717)" d="M 369.428775 279.184452 
+L 371.660194 279.687071 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.914427;"/>
+    <path clip-path="url(#p1d48955717)" d="M 371.660194 279.687071 
+L 373.855057 280.453061 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.828406;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.855057 280.453061 
+L 375.980031 281.551116 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.778996;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.980031 281.551116 
+L 377.1045 282.24 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.763831;"/>
+    <path clip-path="url(#p1d48955717)" d="M 342.895856 282.24 
+L 342.895856 282.24 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.255375;"/>
+    <path clip-path="url(#p1d48955717)" d="M 342.895856 282.24 
+L 345.151329 282.015732 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.255375;"/>
+    <path clip-path="url(#p1d48955717)" d="M 345.151329 282.015732 
+L 347.407358 281.807519 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.168842;"/>
+    <path clip-path="url(#p1d48955717)" d="M 347.407358 281.807519 
+L 349.664055 281.619324 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.077899;"/>
+    <path clip-path="url(#p1d48955717)" d="M 349.664055 281.619324 
+L 351.92149 281.456478 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.979821;"/>
+    <path clip-path="url(#p1d48955717)" d="M 351.92149 281.456478 
+L 354.179716 281.32495 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.875481;"/>
+    <path clip-path="url(#p1d48955717)" d="M 354.179716 281.32495 
+L 356.438672 281.232436 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.768204;"/>
+    <path clip-path="url(#p1d48955717)" d="M 356.438672 281.232436 
+L 358.698083 281.188898 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.655551;"/>
+    <path clip-path="url(#p1d48955717)" d="M 358.698083 281.188898 
+L 360.957599 281.206195 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.541439;"/>
+    <path clip-path="url(#p1d48955717)" d="M 360.957599 281.206195 
+L 363.216038 281.300677 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.427118;"/>
+    <path clip-path="url(#p1d48955717)" d="M 363.216038 281.300677 
+L 365.471269 281.493568 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.313842;"/>
+    <path clip-path="url(#p1d48955717)" d="M 365.471269 281.493568 
+L 367.720118 281.811844 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.205895;"/>
+    <path clip-path="url(#p1d48955717)" d="M 356.873196 276.737059 
+L 359.127873 276.506706 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.489227;"/>
+    <path clip-path="url(#p1d48955717)" d="M 359.127873 276.506706 
+L 361.38385 276.31884 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.363432;"/>
+    <path clip-path="url(#p1d48955717)" d="M 361.38385 276.31884 
+L 363.641105 276.188103 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.236111;"/>
+    <path clip-path="url(#p1d48955717)" d="M 363.641105 276.188103 
+L 365.898989 276.135931 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.10683;"/>
+    <path clip-path="url(#p1d48955717)" d="M 365.898989 276.135931 
+L 368.15644 276.193259 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.979707;"/>
+    <path clip-path="url(#p1d48955717)" d="M 368.15644 276.193259 
+L 370.408433 276.408045 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.856483;"/>
+    <path clip-path="url(#p1d48955717)" d="M 370.408433 276.408045 
+L 372.642548 276.852083 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.7469;"/>
+    <path clip-path="url(#p1d48955717)" d="M 372.642548 276.852083 
+L 374.701931 277.564374 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.659028;"/>
+    <path clip-path="url(#p1d48955717)" d="M 374.701931 277.564374 
+L 376.608263 278.60514 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.607014;"/>
+    <path clip-path="url(#p1d48955717)" d="M 376.608263 278.60514 
+L 378.547008 280.196274 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.606171;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.547008 280.196274 
+L 380.311706 282.24 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.642851;"/>
+    <path clip-path="url(#p1d48955717)" d="M 380.311706 282.24 
+L 380.311706 282.24 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.734853;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 278.868876 
+L 330.87232 278.507966 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.468969;"/>
+    <path clip-path="url(#p1d48955717)" d="M 330.87232 278.507966 
+L 333.1159 278.101062 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.433934;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.1159 278.101062 
+L 335.359049 277.687675 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.39014;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.359049 277.687675 
+L 337.601903 277.26905 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.335848;"/>
+    <path clip-path="url(#p1d48955717)" d="M 337.601903 277.26905 
+L 339.844539 276.846031 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.271172;"/>
+    <path clip-path="url(#p1d48955717)" d="M 339.844539 276.846031 
+L 342.086755 276.419195 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.200627;"/>
+    <path clip-path="url(#p1d48955717)" d="M 342.086755 276.419195 
+L 344.328374 275.989327 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.118941;"/>
+    <path clip-path="url(#p1d48955717)" d="M 344.328374 275.989327 
+L 346.569486 275.55726 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.030299;"/>
+    <path clip-path="url(#p1d48955717)" d="M 346.569486 275.55726 
+L 348.810213 275.124419 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.935399;"/>
+    <path clip-path="url(#p1d48955717)" d="M 348.810213 275.124419 
+L 351.050696 274.692359 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.829328;"/>
+    <path clip-path="url(#p1d48955717)" d="M 351.050696 274.692359 
+L 353.2911 274.262568 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.718591;"/>
+    <path clip-path="url(#p1d48955717)" d="M 353.2911 274.262568 
+L 355.531628 273.837346 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.600626;"/>
+    <path clip-path="url(#p1d48955717)" d="M 355.531628 273.837346 
+L 357.772558 273.419313 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.475467;"/>
+    <path clip-path="url(#p1d48955717)" d="M 357.772558 273.419313 
+L 360.014251 273.01216 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.346387;"/>
+    <path clip-path="url(#p1d48955717)" d="M 360.014251 273.01216 
+L 362.257173 272.621354 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.210493;"/>
+    <path clip-path="url(#p1d48955717)" d="M 362.257173 272.621354 
+L 364.502115 272.254492 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.0709;"/>
+    <path clip-path="url(#p1d48955717)" d="M 364.502115 272.254492 
+L 366.749915 271.924636 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.928324;"/>
+    <path clip-path="url(#p1d48955717)" d="M 366.749915 271.924636 
+L 369.001551 271.654592 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.782282;"/>
+    <path clip-path="url(#p1d48955717)" d="M 369.001551 271.654592 
+L 371.257242 271.488008 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.636866;"/>
+    <path clip-path="url(#p1d48955717)" d="M 371.257242 271.488008 
+L 373.298875 271.504338 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.49569;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.298875 271.504338 
+L 374.885091 271.727443 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.382679;"/>
+    <path clip-path="url(#p1d48955717)" d="M 374.885091 271.727443 
+L 376.27861 272.212691 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.306419;"/>
+    <path clip-path="url(#p1d48955717)" d="M 376.27861 272.212691 
+L 377.610769 273.128026 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.289969;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.610769 273.128026 
+L 378.774124 274.46588 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.309151;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.774124 274.46588 
+L 378.774124 274.46588 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.352936;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.774124 274.46588 
+L 380.211775 276.87571 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.352936;"/>
+    <path clip-path="url(#p1d48955717)" d="M 380.211775 276.87571 
+L 381.457701 279.474372 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.4868;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.457701 279.474372 
+L 382.650197 282.24 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.612082;"/>
+    <path clip-path="url(#p1d48955717)" d="M 382.650197 282.24 
+L 382.650197 282.24 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.7365;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 267.888634 
+L 395.703048 268.275264 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.221711;"/>
+    <path clip-path="url(#p1d48955717)" d="M 395.703048 268.275264 
+L 393.533645 269.18386 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.160574;"/>
+    <path clip-path="url(#p1d48955717)" d="M 393.533645 269.18386 
+L 391.391591 270.216015 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.024683;"/>
+    <path clip-path="url(#p1d48955717)" d="M 391.391591 270.216015 
+L 389.39904 271.381025 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.884721;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.39904 271.381025 
+L 387.891116 272.503087 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.751652;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.891116 272.503087 
+L 386.754701 273.620778 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.669742;"/>
+    <path clip-path="url(#p1d48955717)" d="M 386.754701 273.620778 
+L 385.900693 274.792951 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.620253;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.900693 274.792951 
+L 385.24476 276.206403 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.593139;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.24476 276.206403 
+L 384.866889 277.811879 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.591724;"/>
+    <path clip-path="url(#p1d48955717)" d="M 384.866889 277.811879 
+L 384.866889 277.811879 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.623576;"/>
+    <path clip-path="url(#p1d48955717)" d="M 384.866889 277.811879 
+L 384.764023 279.773768 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.623576;"/>
+    <path clip-path="url(#p1d48955717)" d="M 384.764023 279.773768 
+L 384.764023 279.773768 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.688942;"/>
+    <path clip-path="url(#p1d48955717)" d="M 384.764023 279.773768 
+L 384.988687 282.24 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.688942;"/>
+    <path clip-path="url(#p1d48955717)" d="M 384.988687 282.24 
+L 384.988687 282.24 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.779285;"/>
+    <path clip-path="url(#p1d48955717)" d="M 384.988687 282.24 
+L 384.988687 282.24 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.779285;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 270.735244 
+L 395.259392 271.538529 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.179425;"/>
+    <path clip-path="url(#p1d48955717)" d="M 395.259392 271.538529 
+L 393.178722 272.829764 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.087735;"/>
+    <path clip-path="url(#p1d48955717)" d="M 393.178722 272.829764 
+L 391.449096 274.155702 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.972918;"/>
+    <path clip-path="url(#p1d48955717)" d="M 391.449096 274.155702 
+L 390.127321 275.450113 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.88064;"/>
+    <path clip-path="url(#p1d48955717)" d="M 390.127321 275.450113 
+L 389.058988 276.8471 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.816295;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.058988 276.8471 
+L 388.219744 278.422872 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.772751;"/>
+    <path clip-path="url(#p1d48955717)" d="M 388.219744 278.422872 
+L 387.625943 280.249253 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.772996;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.625943 280.249253 
+L 387.327178 282.24 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.797205;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.327178 282.24 
+L 387.327178 282.24 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.841377;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.327178 282.24 
+L 387.327178 282.24 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.841377;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 273.396344 
+L 395.612948 274.174659 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.164509;"/>
+    <path clip-path="url(#p1d48955717)" d="M 395.612948 274.174659 
+L 393.823505 275.626829 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.106087;"/>
+    <path clip-path="url(#p1d48955717)" d="M 393.823505 275.626829 
+L 392.373683 277.117778 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.011851;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.373683 277.117778 
+L 391.221859 278.67404 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.943094;"/>
+    <path clip-path="url(#p1d48955717)" d="M 391.221859 278.67404 
+L 390.337897 280.322485 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.914378;"/>
+    <path clip-path="url(#p1d48955717)" d="M 390.337897 280.322485 
+L 389.665669 282.24 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.906348;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.665669 282.24 
+L 389.665669 282.24 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.918495;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.665669 282.24 
+L 389.665669 282.24 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.918495;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 264.761379 
+L 396.68114 264.761379 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.284244;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 264.761379 
+L 394.458838 265.359297 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.284244;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.458838 265.359297 
+L 392.238945 265.983622 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.143006;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.238945 265.983622 
+L 390.024322 266.645302 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.997485;"/>
+    <path clip-path="url(#p1d48955717)" d="M 390.024322 266.645302 
+L 387.823386 267.363374 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.852091;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.823386 267.363374 
+L 385.651465 268.177291 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.707531;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.651465 268.177291 
+L 383.551677 269.182919 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.564264;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.551677 269.182919 
+L 383.551677 269.182919 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.427225;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.551677 269.182919 
+L 382.210203 270.124655 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.427225;"/>
+    <path clip-path="url(#p1d48955717)" d="M 382.210203 270.124655 
+L 382.210203 270.124655 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.34307;"/>
+    <path clip-path="url(#p1d48955717)" d="M 382.210203 270.124655 
+L 381.461007 270.978504 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.34307;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.461007 270.978504 
+L 381.461007 270.978504 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.307065;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.461007 270.978504 
+L 381.025147 271.915481 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.307065;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.025147 271.915481 
+L 380.851581 272.967888 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.302044;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 261.265655 
+L 396.68114 261.265655 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.374358;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 261.265655 
+L 394.434172 261.618396 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.374358;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.434172 261.618396 
+L 392.186477 261.945252 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.241425;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.186477 261.945252 
+L 389.937665 262.23549 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.106482;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.937665 262.23549 
+L 387.687675 262.471449 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.968822;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.687675 262.471449 
+L 385.436707 262.624112 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.830222;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.436707 262.624112 
+L 383.186511 262.641402 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.693722;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.186511 262.641402 
+L 380.948101 262.423036 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.563736;"/>
+    <path clip-path="url(#p1d48955717)" d="M 380.948101 262.423036 
+L 378.755061 261.777352 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.454893;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.755061 261.777352 
+L 378.755061 261.777352 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.380925;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.755061 261.777352 
+L 377.295526 260.939127 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.380925;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.295526 260.939127 
+L 375.945067 259.707688 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.39562;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.945067 259.707688 
+L 374.789145 258.226954 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.432121;"/>
+    <path clip-path="url(#p1d48955717)" d="M 374.789145 258.226954 
+L 373.67294 256.414175 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.49918;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.67294 256.414175 
+L 372.424533 253.989657 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.594423;"/>
+    <path clip-path="url(#p1d48955717)" d="M 372.424533 253.989657 
+L 371.182327 251.250963 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.703659;"/>
+    <path clip-path="url(#p1d48955717)" d="M 371.182327 251.250963 
+L 370.013861 248.435225 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.825729;"/>
+    <path clip-path="url(#p1d48955717)" d="M 370.013861 248.435225 
+L 368.900498 245.559044 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.944326;"/>
+    <path clip-path="url(#p1d48955717)" d="M 368.900498 245.559044 
+L 367.834891 242.613258 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.052212;"/>
+    <path clip-path="url(#p1d48955717)" d="M 367.834891 242.613258 
+L 366.82146 239.624183 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.14427;"/>
+    <path clip-path="url(#p1d48955717)" d="M 366.82146 239.624183 
+L 365.872158 236.597146 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.236382;"/>
+    <path clip-path="url(#p1d48955717)" d="M 365.872158 236.597146 
+L 364.991464 233.51174 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.300219;"/>
+    <path clip-path="url(#p1d48955717)" d="M 364.991464 233.51174 
+L 364.190743 230.367338 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.35437;"/>
+    <path clip-path="url(#p1d48955717)" d="M 364.190743 230.367338 
+L 363.490828 227.175877 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.387635;"/>
+    <path clip-path="url(#p1d48955717)" d="M 363.490828 227.175877 
+L 362.905672 223.9433 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.405863;"/>
+    <path clip-path="url(#p1d48955717)" d="M 362.905672 223.9433 
+L 362.464756 220.665246 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.407843;"/>
+    <path clip-path="url(#p1d48955717)" d="M 362.464756 220.665246 
+L 362.195424 217.348436 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.381851;"/>
+    <path clip-path="url(#p1d48955717)" d="M 362.195424 217.348436 
+L 362.127307 214.01259 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.342879;"/>
+    <path clip-path="url(#p1d48955717)" d="M 362.127307 214.01259 
+L 362.296805 210.697742 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.281773;"/>
+    <path clip-path="url(#p1d48955717)" d="M 362.296805 210.697742 
+L 362.720684 207.437556 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.204921;"/>
+    <path clip-path="url(#p1d48955717)" d="M 362.720684 207.437556 
+L 363.419164 204.297077 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.114619;"/>
+    <path clip-path="url(#p1d48955717)" d="M 363.419164 204.297077 
+L 364.299415 201.555631 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.012526;"/>
+    <path clip-path="url(#p1d48955717)" d="M 364.299415 201.555631 
+L 365.431607 198.917116 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.910089;"/>
+    <path clip-path="url(#p1d48955717)" d="M 365.431607 198.917116 
+L 366.722668 196.556598 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.807005;"/>
+    <path clip-path="url(#p1d48955717)" d="M 366.722668 196.556598 
+L 368.276869 194.295749 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.694725;"/>
+    <path clip-path="url(#p1d48955717)" d="M 368.276869 194.295749 
+L 369.921545 192.363009 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.589002;"/>
+    <path clip-path="url(#p1d48955717)" d="M 369.921545 192.363009 
+L 371.760974 190.630126 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.470915;"/>
+    <path clip-path="url(#p1d48955717)" d="M 371.760974 190.630126 
+L 371.760974 190.630126 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.356177;"/>
+    <path clip-path="url(#p1d48955717)" d="M 371.760974 190.630126 
+L 373.317883 189.452667 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.356177;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.317883 189.452667 
+L 374.774587 188.603886 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.289625;"/>
+    <path clip-path="url(#p1d48955717)" d="M 374.774587 188.603886 
+L 374.774587 188.603886 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.216871;"/>
+    <path clip-path="url(#p1d48955717)" d="M 374.774587 188.603886 
+L 375.643227 188.215175 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.216871;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.643227 188.215175 
+L 376.314404 188.011522 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.188713;"/>
+    <path clip-path="url(#p1d48955717)" d="M 376.314404 188.011522 
+L 376.707286 187.946711 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.183925;"/>
+    <path clip-path="url(#p1d48955717)" d="M 376.707286 187.946711 
+L 376.978251 187.953733 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.180819;"/>
+    <path clip-path="url(#p1d48955717)" d="M 376.978251 187.953733 
+L 377.128186 188.003376 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.179039;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.128186 188.003376 
+L 377.186286 188.067998 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.178592;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.186286 188.067998 
+L 377.196172 188.110662 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.178983;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.196172 188.110662 
+L 377.192282 188.134016 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.179432;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.192282 188.134016 
+L 377.186512 188.145894 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.179733;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.186512 188.145894 
+L 377.182092 188.151558 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.179907;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.182092 188.151558 
+L 377.179331 188.154091 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.179999;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.179331 188.154091 
+L 377.177789 188.155143 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.180044;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.177789 188.155143 
+L 377.176995 188.15554 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.180065;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.176995 188.15554 
+L 377.176612 188.155667 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.180074;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.176612 188.155667 
+L 377.17644 188.155695 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.180078;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.17644 188.155695 
+L 377.176367 188.155692 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.180079;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.176367 188.155692 
+L 377.176339 188.155683 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.18008;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.176339 188.155683 
+L 377.17633 188.155676 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.18008;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.17633 188.155676 
+L 377.176328 188.155671 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.18008;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.176328 188.155671 
+L 377.176328 188.155668 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.18008;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.176328 188.155668 
+L 377.176329 188.155666 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.18008;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.176329 188.155666 
+L 377.176329 188.155666 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.18008;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.176329 188.155666 
+L 377.17633 188.155665 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.18008;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.17633 188.155665 
+L 377.17633 188.155665 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.18008;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.17633 188.155665 
+L 377.17633 188.155665 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.18008;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.17633 188.155665 
+L 377.17633 188.155665 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.18008;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 257.769931 
+L 396.68114 257.769931 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.483322;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 257.769931 
+L 394.424979 257.931682 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.483322;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.424979 257.931682 
+L 392.167771 258.038693 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.358451;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.167771 258.038693 
+L 389.909848 258.07371 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.23365;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.909848 258.07371 
+L 387.652885 258.011375 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.109229;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.652885 258.011375 
+L 385.400247 257.815753 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.989326;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.400247 257.815753 
+L 383.159192 257.435202 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.87773;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.159192 257.435202 
+L 380.947724 256.798486 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.782279;"/>
+    <path clip-path="url(#p1d48955717)" d="M 380.947724 256.798486 
+L 378.793584 255.818757 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.717163;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.793584 255.818757 
+L 376.751525 254.428363 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.683811;"/>
+    <path clip-path="url(#p1d48955717)" d="M 376.751525 254.428363 
+L 374.972929 252.735716 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.708424;"/>
+    <path clip-path="url(#p1d48955717)" d="M 374.972929 252.735716 
+L 373.381259 250.763272 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.756362;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 254.274207 
+L 396.68114 254.274207 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.595887;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 254.274207 
+L 394.421465 254.284254 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.595887;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.421465 254.284254 
+L 392.162419 254.224529 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.480422;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.162419 254.224529 
+L 389.905309 254.077232 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.366758;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.905309 254.077232 
+L 387.653285 253.818122 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.255683;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.653285 253.818122 
+L 385.411413 253.416129 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.152304;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.411413 253.416129 
+L 383.188298 252.831803 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.05928;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.188298 252.831803 
+L 381.000087 252.018181 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.98414;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.000087 252.018181 
+L 378.866547 250.925347 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.935854;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.866547 250.925347 
+L 376.821427 249.517931 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.912;"/>
+    <path clip-path="url(#p1d48955717)" d="M 376.821427 249.517931 
+L 374.896087 247.786229 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.929898;"/>
+    <path clip-path="url(#p1d48955717)" d="M 374.896087 247.786229 
+L 373.110902 245.752792 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.963608;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.110902 245.752792 
+L 371.471829 243.460176 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.030726;"/>
+    <path clip-path="url(#p1d48955717)" d="M 371.471829 243.460176 
+L 369.976161 240.959727 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.095354;"/>
+    <path clip-path="url(#p1d48955717)" d="M 369.976161 240.959727 
+L 368.613992 238.29543 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.173021;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 250.778483 
+L 396.68114 250.778483 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.710826;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 250.778483 
+L 394.422318 250.668633 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.710826;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.422318 250.668633 
+L 392.16596 250.481573 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.603884;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.16596 250.481573 
+L 389.913911 250.200414 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.499875;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.913911 250.200414 
+L 387.67004 249.804309 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.399739;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.67004 249.804309 
+L 385.439876 249.268396 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.307291;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.439876 249.268396 
+L 383.231686 248.562227 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.224728;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.231686 248.562227 
+L 381.059114 247.651777 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.158793;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.059114 247.651777 
+L 378.937633 246.502314 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.114955;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.937633 246.502314 
+L 376.891724 245.088371 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.090506;"/>
+    <path clip-path="url(#p1d48955717)" d="M 376.891724 245.088371 
+L 374.944727 243.398007 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.102517;"/>
+    <path clip-path="url(#p1d48955717)" d="M 374.944727 243.398007 
+L 373.117307 241.437549 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.11896;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 247.282759 
+L 396.68114 247.282759 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.817051;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 247.282759 
+L 394.425213 247.082999 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.817051;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.425213 247.082999 
+L 392.173319 246.803657 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.716282;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.173319 246.803657 
+L 389.927606 246.42952 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.618714;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.927606 246.42952 
+L 387.69206 245.941469 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.525303;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.69206 245.941469 
+L 385.472051 245.317432 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.441084;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.472051 245.317432 
+L 383.275293 244.532885 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.366819;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.275293 244.532885 
+L 381.113455 243.562664 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.306068;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 243.787034 
+L 396.68114 243.787034 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.915057;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 243.787034 
+L 394.428311 243.515677 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.915057;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.428311 243.515677 
+L 392.180664 243.164882 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.818085;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.180664 243.164882 
+L 389.940444 242.720977 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.724012;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.940444 242.720977 
+L 387.711611 242.167023 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.633627;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.711611 242.167023 
+L 385.499254 241.483826 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.55152;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.499254 241.483826 
+L 383.310525 240.649783 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.477692;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.310525 240.649783 
+L 381.156009 239.641867 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.418145;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.156009 239.641867 
+L 379.046901 238.437845 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.375185;"/>
+    <path clip-path="url(#p1d48955717)" d="M 379.046901 238.437845 
+L 377.000479 237.018752 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.335324;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.000479 237.018752 
+L 375.034554 235.368242 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.318713;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.034554 235.368242 
+L 373.169069 233.479851 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.312759;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.169069 233.479851 
+L 371.424299 231.352903 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.322702;"/>
+    <path clip-path="url(#p1d48955717)" d="M 371.424299 231.352903 
+L 369.817772 228.999689 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.325284;"/>
+    <path clip-path="url(#p1d48955717)" d="M 369.817772 228.999689 
+L 368.367827 226.429222 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.345236;"/>
+    <path clip-path="url(#p1d48955717)" d="M 368.367827 226.429222 
+L 367.092763 223.663163 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.339423;"/>
+    <path clip-path="url(#p1d48955717)" d="M 367.092763 223.663163 
+L 366.018529 220.7287 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.342627;"/>
+    <path clip-path="url(#p1d48955717)" d="M 366.018529 220.7287 
+L 365.166363 217.634206 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.318318;"/>
+    <path clip-path="url(#p1d48955717)" d="M 365.166363 217.634206 
+L 364.571136 214.401931 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.285159;"/>
+    <path clip-path="url(#p1d48955717)" d="M 364.571136 214.401931 
+L 364.279931 211.213443 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.22708;"/>
+    <path clip-path="url(#p1d48955717)" d="M 364.279931 211.213443 
+L 364.283352 208.143715 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.160408;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 240.29131 
+L 396.68114 240.29131 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.998797;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 240.29131 
+L 394.431462 239.965879 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.998797;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.431462 239.965879 
+L 392.18779 239.560713 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.905737;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.18779 239.560713 
+L 389.952359 239.06411 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.815815;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.952359 239.06411 
+L 387.728946 238.461941 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.725438;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.728946 238.461941 
+L 385.522332 237.736999 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.642033;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.522332 237.736999 
+L 383.339167 236.869821 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.565099;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.339167 236.869821 
+L 381.189157 235.839314 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.500242;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.189157 235.839314 
+L 379.082852 234.623553 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.448836;"/>
+    <path clip-path="url(#p1d48955717)" d="M 379.082852 234.623553 
+L 377.036275 233.203558 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.40935;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.036275 233.203558 
+L 375.066413 231.561714 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.380976;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.066413 231.561714 
+L 373.194217 229.6869 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.355755;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.194217 229.6869 
+L 371.441848 227.573064 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.35212;"/>
+    <path clip-path="url(#p1d48955717)" d="M 371.441848 227.573064 
+L 369.834802 225.221577 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.339079;"/>
+    <path clip-path="url(#p1d48955717)" d="M 369.834802 225.221577 
+L 368.396146 222.638733 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.332905;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 236.795586 
+L 396.68114 236.795586 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.060323;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 236.795586 
+L 394.433875 236.434658 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.060323;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.433875 236.434658 
+L 392.193039 235.996009 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.966915;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.193039 235.996009 
+L 389.960888 235.467737 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.87585;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.960888 235.467737 
+L 387.741221 234.835293 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.787752;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.741221 234.835293 
+L 385.538675 234.082645 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.70669;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.538675 234.082645 
+L 383.359343 233.193416 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.630532;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.359343 233.193416 
+L 381.21217 232.148867 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.557956;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.21217 232.148867 
+L 379.107272 230.927106 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.496099;"/>
+    <path clip-path="url(#p1d48955717)" d="M 379.107272 230.927106 
+L 377.060393 229.507531 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.443567;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.060393 229.507531 
+L 375.088559 227.870139 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.410425;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.088559 227.870139 
+L 373.21478 225.998873 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.373031;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.21478 225.998873 
+L 371.463829 223.882701 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.347657;"/>
+    <path clip-path="url(#p1d48955717)" d="M 371.463829 223.882701 
+L 369.867977 221.516726 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.325415;"/>
+    <path clip-path="url(#p1d48955717)" d="M 369.867977 221.516726 
+L 368.461207 218.899322 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.297747;"/>
+    <path clip-path="url(#p1d48955717)" d="M 368.461207 218.899322 
+L 367.288601 216.046535 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.264378;"/>
+    <path clip-path="url(#p1d48955717)" d="M 367.288601 216.046535 
+L 366.429306 213.130425 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.21874;"/>
+    <path clip-path="url(#p1d48955717)" d="M 366.429306 213.130425 
+L 365.893136 210.19172 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.168117;"/>
+    <path clip-path="url(#p1d48955717)" d="M 365.893136 210.19172 
+L 365.681008 207.431163 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.097779;"/>
+    <path clip-path="url(#p1d48955717)" d="M 365.681008 207.431163 
+L 365.763153 204.706302 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.026344;"/>
+    <path clip-path="url(#p1d48955717)" d="M 365.763153 204.706302 
+L 366.095417 202.242769 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.944471;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 233.299862 
+L 396.68114 233.299862 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.107357;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 233.299862 
+L 394.435693 232.913727 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.107357;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.435693 232.913727 
+L 392.196855 232.452201 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.011982;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.196855 232.452201 
+L 389.966795 231.904057 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.918036;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.966795 231.904057 
+L 387.749161 231.255472 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.825956;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.749161 231.255472 
+L 385.548402 230.490917 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.739496;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.548402 230.490917 
+L 383.370689 229.592698 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.657675;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.370689 229.592698 
+L 381.224864 228.541618 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.58578;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.224864 228.541618 
+L 379.120525 227.317416 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.520427;"/>
+    <path clip-path="url(#p1d48955717)" d="M 379.120525 227.317416 
+L 377.073447 225.898518 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.453961;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.073447 225.898518 
+L 375.101588 224.261281 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.404157;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.101588 224.261281 
+L 373.230216 222.385555 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.359385;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.230216 222.385555 
+L 371.490263 220.251279 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.321131;"/>
+    <path clip-path="url(#p1d48955717)" d="M 371.490263 220.251279 
+L 369.920009 217.850789 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.275485;"/>
+    <path clip-path="url(#p1d48955717)" d="M 369.920009 217.850789 
+L 368.570544 215.176437 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.241547;"/>
+    <path clip-path="url(#p1d48955717)" d="M 368.570544 215.176437 
+L 367.547691 212.406997 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.183456;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 229.804138 
+L 396.68114 229.804138 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.130401;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 229.804138 
+L 394.436647 229.405774 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.130401;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.436647 229.405774 
+L 392.198931 228.932167 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.035728;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.198931 228.932167 
+L 389.970029 228.373403 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.942513;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.970029 228.373403 
+L 387.753337 227.717452 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.845781;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.753337 227.717452 
+L 385.553112 226.949244 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.752788;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.553112 226.949244 
+L 383.375359 226.051085 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.662779;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.375359 226.051085 
+L 381.228932 225.002764 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.580811;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.228932 225.002764 
+L 379.123904 223.781372 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.507186;"/>
+    <path clip-path="url(#p1d48955717)" d="M 379.123904 223.781372 
+L 377.076616 222.363608 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.440551;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.076616 222.363608 
+L 375.106558 220.722423 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.377092;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.106558 220.722423 
+L 373.242671 218.832288 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.313534;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.242671 218.832288 
+L 371.522289 216.666237 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.26787;"/>
+    <path clip-path="url(#p1d48955717)" d="M 371.522289 216.666237 
+L 369.999651 214.206892 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.206659;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 226.308414 
+L 396.68114 226.308414 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.128162;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 226.308414 
+L 394.436472 225.912151 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.128162;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.436472 225.912151 
+L 392.198345 225.442812 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.029427;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.198345 225.442812 
+L 389.968826 224.889595 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.931166;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.968826 224.889595 
+L 387.751428 224.23904 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.833632;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.751428 224.23904 
+L 385.550434 223.475826 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.740331;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.550434 223.475826 
+L 383.371557 222.583787 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.649236;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.371557 222.583787 
+L 381.223488 221.543287 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.557039;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.223488 221.543287 
+L 379.11669 220.329104 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.47125;"/>
+    <path clip-path="url(#p1d48955717)" d="M 379.11669 220.329104 
+L 377.069002 218.913785 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.390207;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.069002 218.913785 
+L 375.102345 217.26522 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.324118;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.102345 217.26522 
+L 373.252042 215.350005 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.250479;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.252042 215.350005 
+L 371.563983 213.13277 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.18559;"/>
+    <path clip-path="url(#p1d48955717)" d="M 371.563983 213.13277 
+L 370.114467 210.591535 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.118118;"/>
+    <path clip-path="url(#p1d48955717)" d="M 370.114467 210.591535 
+L 369.108202 208.090564 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.046638;"/>
+    <path clip-path="url(#p1d48955717)" d="M 369.108202 208.090564 
+L 368.479248 205.601072 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.976625;"/>
+    <path clip-path="url(#p1d48955717)" d="M 368.479248 205.601072 
+L 368.206839 203.255343 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.899755;"/>
+    <path clip-path="url(#p1d48955717)" d="M 368.206839 203.255343 
+L 368.233115 201.01414 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.824178;"/>
+    <path clip-path="url(#p1d48955717)" d="M 368.233115 201.01414 
+L 368.513485 198.952862 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.751949;"/>
+    <path clip-path="url(#p1d48955717)" d="M 368.513485 198.952862 
+L 369.023887 196.979247 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.68094;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 222.81269 
+L 396.68114 222.81269 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.109851;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 222.81269 
+L 394.435654 222.427075 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.109851;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.435654 222.427075 
+L 392.196374 221.970396 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.006862;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.196374 221.970396 
+L 389.965252 221.432004 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.903412;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.965252 221.432004 
+L 387.745683 220.798425 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.799556;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.745683 220.798425 
+L 385.541857 220.053979 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.698619;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.541857 220.053979 
+L 383.359809 219.179836 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.59917;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.359809 219.179836 
+L 381.208806 218.15359 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.506041;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.208806 218.15359 
+L 379.099573 216.949419 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.418987;"/>
+    <path clip-path="url(#p1d48955717)" d="M 379.099573 216.949419 
+L 377.051688 215.536644 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.324377;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.051688 215.536644 
+L 375.091024 213.875347 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.243171;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.091024 213.875347 
+L 373.261003 211.923652 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.162128;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.261003 211.923652 
+L 371.626023 209.630373 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.089532;"/>
+    <path clip-path="url(#p1d48955717)" d="M 371.626023 209.630373 
+L 370.384795 207.213865 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.001775;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 219.316966 
+L 396.68114 219.316966 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.065124;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 219.316966 
+L 394.433831 218.955891 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.065124;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.433831 218.955891 
+L 392.192391 218.523439 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.96122;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.192391 218.523439 
+L 389.958715 218.009082 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.856815;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.958715 218.009082 
+L 387.73603 217.400458 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.750019;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.73603 217.400458 
+L 385.528383 216.682219 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.642087;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.528383 216.682219 
+L 383.341804 215.834426 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.534241;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.341804 215.834426 
+L 381.185957 214.832428 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.431033;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.185957 214.832428 
+L 379.07277 213.64503 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.332951;"/>
+    <path clip-path="url(#p1d48955717)" d="M 379.07277 213.64503 
+L 377.024716 212.235508 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.237381;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.024716 212.235508 
+L 375.073331 210.55515 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.150286;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.073331 210.55515 
+L 373.275977 208.548613 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.053425;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.275977 208.548613 
+L 371.76323 206.228589 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.972742;"/>
+    <path clip-path="url(#p1d48955717)" d="M 371.76323 206.228589 
+L 370.757431 203.942354 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.87824;"/>
+    <path clip-path="url(#p1d48955717)" d="M 370.757431 203.942354 
+L 370.193212 201.810312 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.803007;"/>
+    <path clip-path="url(#p1d48955717)" d="M 370.193212 201.810312 
+L 369.976915 199.794445 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.733587;"/>
+    <path clip-path="url(#p1d48955717)" d="M 369.976915 199.794445 
+L 370.043234 197.950716 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.666314;"/>
+    <path clip-path="url(#p1d48955717)" d="M 370.043234 197.950716 
+L 370.361022 196.141067 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.598267;"/>
+    <path clip-path="url(#p1d48955717)" d="M 370.361022 196.141067 
+L 370.893416 194.475824 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.531362;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 215.821241 
+L 396.68114 215.821241 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.999888;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 215.821241 
+L 394.431269 215.499265 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.999888;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.431269 215.499265 
+L 392.186593 215.107465 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.891739;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.186593 215.107465 
+L 389.948899 214.63485 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.782213;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.948899 214.63485 
+L 387.721461 214.067149 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.671114;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.721461 214.067149 
+L 385.508457 213.387204 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.561683;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.508457 213.387204 
+L 383.316066 212.573994 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.45241;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.316066 212.573994 
+L 381.154331 211.602152 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.345108;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.154331 211.602152 
+L 379.036109 210.436471 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.237086;"/>
+    <path clip-path="url(#p1d48955717)" d="M 379.036109 210.436471 
+L 376.988162 209.031158 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.129127;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 208.829793 
+L 396.68114 208.829793 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.823034;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 208.829793 
+L 394.425075 208.628758 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.823034;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.425075 208.628758 
+L 392.172446 208.358714 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.710475;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.172446 208.358714 
+L 389.92476 208.008097 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.595696;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.92476 208.008097 
+L 387.685036 207.561381 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.478178;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.685036 207.561381 
+L 385.457355 207.000289 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.361031;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.457355 207.000289 
+L 383.248016 206.300684 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.239563;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.248016 206.300684 
+L 381.068752 205.427613 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.119362;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.068752 205.427613 
+L 378.935648 204.329596 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.002406;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.935648 204.329596 
+L 376.8902 202.933984 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.88233;"/>
+    <path clip-path="url(#p1d48955717)" d="M 376.8902 202.933984 
+L 375.01149 201.128606 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.778986;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.01149 201.128606 
+L 375.01149 201.128606 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.662756;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.01149 201.128606 
+L 373.932579 199.645321 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.662756;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.932579 199.645321 
+L 373.098776 197.858778 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.597796;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.098776 197.858778 
+L 372.704646 196.172675 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.524242;"/>
+    <path clip-path="url(#p1d48955717)" d="M 372.704646 196.172675 
+L 372.649526 194.723841 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.461896;"/>
+    <path clip-path="url(#p1d48955717)" d="M 372.649526 194.723841 
+L 372.820032 193.438632 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.414119;"/>
+    <path clip-path="url(#p1d48955717)" d="M 372.820032 193.438632 
+L 373.220377 192.131265 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.36526;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.220377 192.131265 
+L 373.828248 190.911704 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.303582;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.828248 190.911704 
+L 374.561206 189.885294 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.257212;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 205.334069 
+L 396.68114 205.334069 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.715553;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 205.334069 
+L 394.422678 205.223197 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.715553;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.422678 205.223197 
+L 392.16645 205.044105 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.601276;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.16645 205.044105 
+L 389.913756 204.785176 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.484219;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.913756 204.785176 
+L 387.66734 204.430466 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.363596;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 201.838345 
+L 396.68114 201.838345 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.602619;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 201.838345 
+L 394.421123 201.838385 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.602619;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.421123 201.838385 
+L 392.161836 201.770369 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.487806;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.161836 201.770369 
+L 389.904405 201.622709 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.369976;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.904405 201.622709 
+L 387.65133 201.379163 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.248155;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.65133 201.379163 
+L 385.406205 201.018164 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.124751;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.406205 201.018164 
+L 383.174976 200.508852 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.998709;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.174976 200.508852 
+L 380.971013 199.804632 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.872203;"/>
+    <path clip-path="url(#p1d48955717)" d="M 380.971013 199.804632 
+L 378.815046 198.827384 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.74891;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.815046 198.827384 
+L 376.783241 197.445014 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.61837;"/>
+    <path clip-path="url(#p1d48955717)" d="M 376.783241 197.445014 
+L 376.783241 197.445014 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.510639;"/>
+    <path clip-path="url(#p1d48955717)" d="M 376.783241 197.445014 
+L 375.610058 196.25279 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.510639;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.610058 196.25279 
+L 375.610058 196.25279 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.429186;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.610058 196.25279 
+L 374.868346 195.115163 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.429186;"/>
+    <path clip-path="url(#p1d48955717)" d="M 374.868346 195.115163 
+L 374.868346 195.115163 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.375894;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 198.342621 
+L 396.68114 198.342621 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.488318;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 198.342621 
+L 394.424024 198.486758 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.488318;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.424024 198.486758 
+L 392.165777 198.562806 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.373853;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.165777 198.562806 
+L 389.907152 198.559079 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.256104;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.907152 198.559079 
+L 387.65006 198.458872 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.133937;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.65006 198.458872 
+L 385.397425 198.239344 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.009254;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.397425 198.239344 
+L 383.154473 197.866552 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.881789;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 194.846897 
+L 396.68114 194.846897 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.382613;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 194.846897 
+L 394.433319 195.167778 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.382613;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.433319 195.167778 
+L 392.181811 195.419624 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.268953;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.181811 195.419624 
+L 389.927115 195.591266 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.151925;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.927115 195.591266 
+L 387.670687 195.666446 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.030336;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.670687 195.666446 
+L 385.414964 195.622302 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.90556;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.414964 195.622302 
+L 383.164673 195.423569 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.778168;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.164673 195.423569 
+L 380.933153 195.010784 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.648942;"/>
+    <path clip-path="url(#p1d48955717)" d="M 380.933153 195.010784 
+L 378.746903 194.26629 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.522283;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.746903 194.26629 
+L 378.746903 194.26629 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.385533;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.746903 194.26629 
+L 377.391285 193.504489 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.385533;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.391285 193.504489 
+L 377.391285 193.504489 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.323275;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 191.351172 
+L 396.68114 191.351172 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.284881;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 191.351172 
+L 394.450448 191.890302 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.284881;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.450448 191.890302 
+L 392.213442 192.358734 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.172946;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.213442 192.358734 
+L 389.970762 192.746212 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.059096;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.970762 192.746212 
+L 387.72307 193.037456 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.940198;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 184.359724 
+L 396.68114 184.359724 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.175372;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 184.359724 
+L 394.555607 185.482011 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.175372;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.555607 185.482011 
+L 392.408755 186.521658 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.062361;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.408755 186.521658 
+L 390.244575 187.469087 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.947795;"/>
+    <path clip-path="url(#p1d48955717)" d="M 390.244575 187.469087 
+L 388.067347 188.311933 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.837023;"/>
+    <path clip-path="url(#p1d48955717)" d="M 388.067347 188.311933 
+L 385.87693 189.034334 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.720963;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.87693 189.034334 
+L 383.675041 189.608465 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.600863;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.675041 189.608465 
+L 381.473487 189.981829 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.477267;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.473487 189.981829 
+L 379.313459 190.039392 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.356123;"/>
+    <path clip-path="url(#p1d48955717)" d="M 379.313459 190.039392 
+L 379.313459 190.039392 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.238846;"/>
+    <path clip-path="url(#p1d48955717)" d="M 379.313459 190.039392 
+L 378.340598 189.918021 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.238846;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.340598 189.918021 
+L 378.340598 189.918021 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.207217;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.340598 189.918021 
+L 377.657855 189.710593 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.207217;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.665669 180.864 
+L 389.665669 180.864 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.777777;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.665669 180.864 
+L 387.818174 182.742902 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.777777;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.818174 182.742902 
+L 385.91486 184.414689 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.675472;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.91486 184.414689 
+L 383.930383 185.899072 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.55842;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.930383 185.899072 
+L 381.889952 187.146376 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.425742;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.889952 187.146376 
+L 379.889863 188.04884 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.317678;"/>
+    <path clip-path="url(#p1d48955717)" d="M 379.889863 188.04884 
+L 379.889863 188.04884 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.226772;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.296234 180.864 
+L 373.296234 180.864 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.545675;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.296234 180.864 
+L 375.483666 181.616207 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.545675;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.483666 181.616207 
+L 375.483666 181.616207 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.414844;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.483666 181.616207 
+L 376.925272 182.421184 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.414844;"/>
+    <path clip-path="url(#p1d48955717)" d="M 376.925272 182.421184 
+L 376.925272 182.421184 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.345653;"/>
+    <path clip-path="url(#p1d48955717)" d="M 376.925272 182.421184 
+L 377.907432 183.282874 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.345653;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.907432 183.282874 
+L 377.907432 183.282874 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.284332;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.907432 183.282874 
+L 378.505878 184.152776 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.284332;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.505878 184.152776 
+L 378.505878 184.152776 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.231069;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.505878 184.152776 
+L 378.795777 185.012134 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.231069;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.795777 185.012134 
+L 378.795777 185.012134 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.184708;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.795777 185.012134 
+L 378.828934 185.836196 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.184708;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 190.299216 
+L 330.685277 189.559617 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.180759;"/>
+    <path clip-path="url(#p1d48955717)" d="M 330.685277 189.559617 
+L 332.868783 188.69498 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.169468;"/>
+    <path clip-path="url(#p1d48955717)" d="M 332.868783 188.69498 
+L 335.059285 187.870463 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.152617;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.059285 187.870463 
+L 337.256522 187.084615 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.123214;"/>
+    <path clip-path="url(#p1d48955717)" d="M 337.256522 187.084615 
+L 339.460342 186.336552 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.084875;"/>
+    <path clip-path="url(#p1d48955717)" d="M 339.460342 186.336552 
+L 341.669928 185.626047 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.03957;"/>
+    <path clip-path="url(#p1d48955717)" d="M 341.669928 185.626047 
+L 343.884285 184.953359 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.984361;"/>
+    <path clip-path="url(#p1d48955717)" d="M 343.884285 184.953359 
+L 346.103233 184.319206 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.924298;"/>
+    <path clip-path="url(#p1d48955717)" d="M 346.103233 184.319206 
+L 348.32679 183.725045 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.854945;"/>
+    <path clip-path="url(#p1d48955717)" d="M 348.32679 183.725045 
+L 350.554982 183.17276 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.776225;"/>
+    <path clip-path="url(#p1d48955717)" d="M 350.554982 183.17276 
+L 352.787859 182.665152 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.692165;"/>
+    <path clip-path="url(#p1d48955717)" d="M 352.787859 182.665152 
+L 355.025469 182.205976 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.597967;"/>
+    <path clip-path="url(#p1d48955717)" d="M 355.025469 182.205976 
+L 357.267844 181.799684 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.498049;"/>
+    <path clip-path="url(#p1d48955717)" d="M 357.267844 181.799684 
+L 359.51492 181.452698 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.392773;"/>
+    <path clip-path="url(#p1d48955717)" d="M 359.51492 181.452698 
+L 361.766486 181.173218 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.279556;"/>
+    <path clip-path="url(#p1d48955717)" d="M 361.766486 181.173218 
+L 364.022166 180.971889 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.162755;"/>
+    <path clip-path="url(#p1d48955717)" d="M 364.022166 180.971889 
+L 366.280762 180.864 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.041055;"/>
+    <path clip-path="url(#p1d48955717)" d="M 366.280762 180.864 
+L 366.280762 180.864 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.9162;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 185.76367 
+L 329.765847 185.47811 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.258955;"/>
+    <path clip-path="url(#p1d48955717)" d="M 329.765847 185.47811 
+L 331.978624 184.792938 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.253733;"/>
+    <path clip-path="url(#p1d48955717)" d="M 331.978624 184.792938 
+L 334.195208 184.138151 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.240604;"/>
+    <path clip-path="url(#p1d48955717)" d="M 334.195208 184.138151 
+L 336.415525 183.5135 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.215071;"/>
+    <path clip-path="url(#p1d48955717)" d="M 336.415525 183.5135 
+L 338.639539 182.919192 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.183216;"/>
+    <path clip-path="url(#p1d48955717)" d="M 338.639539 182.919192 
+L 340.867255 182.355925 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.139092;"/>
+    <path clip-path="url(#p1d48955717)" d="M 340.867255 182.355925 
+L 343.098673 181.824496 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.086428;"/>
+    <path clip-path="url(#p1d48955717)" d="M 343.098673 181.824496 
+L 345.333846 181.326513 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.027422;"/>
+    <path clip-path="url(#p1d48955717)" d="M 345.333846 181.326513 
+L 347.572837 180.864 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.955261;"/>
+    <path clip-path="url(#p1d48955717)" d="M 347.572837 180.864 
+L 347.572837 180.864 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.877658;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 182.579553 
+L 329.188869 182.494962 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.331046;"/>
+    <path clip-path="url(#p1d48955717)" d="M 329.188869 182.494962 
+L 331.416326 181.926355 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.328787;"/>
+    <path clip-path="url(#p1d48955717)" d="M 331.416326 181.926355 
+L 333.646837 181.382612 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.313005;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.646837 181.382612 
+L 335.880384 180.864 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.288659;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.880384 180.864 
+L 335.880384 180.864 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.257041;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 194.846897 
+L 328.864912 194.846897 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.129352;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 194.846897 
+L 330.994311 193.722724 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.129352;"/>
+    <path clip-path="url(#p1d48955717)" d="M 330.994311 193.722724 
+L 333.136472 192.652493 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.112438;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.136472 192.652493 
+L 335.290647 191.632477 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.089957;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.290647 191.632477 
+L 337.454977 190.660881 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.056891;"/>
+    <path clip-path="url(#p1d48955717)" d="M 337.454977 190.660881 
+L 339.627707 189.736756 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.020342;"/>
+    <path clip-path="url(#p1d48955717)" d="M 339.627707 189.736756 
+L 341.808393 188.858524 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.978532;"/>
+    <path clip-path="url(#p1d48955717)" d="M 341.808393 188.858524 
+L 343.996851 188.025169 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.922556;"/>
+    <path clip-path="url(#p1d48955717)" d="M 343.996851 188.025169 
+L 346.193045 187.236457 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.860541;"/>
+    <path clip-path="url(#p1d48955717)" d="M 346.193045 187.236457 
+L 348.39706 186.492845 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.789647;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 198.342621 
+L 328.864912 198.342621 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.107409;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 198.342621 
+L 330.946952 197.031387 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.107409;"/>
+    <path clip-path="url(#p1d48955717)" d="M 330.946952 197.031387 
+L 333.046675 195.784086 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.083775;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.046675 195.784086 
+L 335.161332 194.598964 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.063286;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.161332 194.598964 
+L 337.289651 193.471395 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.033;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 205.334069 
+L 328.864912 205.334069 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.109833;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 205.334069 
+L 330.820833 203.647695 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.109833;"/>
+    <path clip-path="url(#p1d48955717)" d="M 330.820833 203.647695 
+L 332.806464 202.037324 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.080492;"/>
+    <path clip-path="url(#p1d48955717)" d="M 332.806464 202.037324 
+L 334.818584 200.502989 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.048982;"/>
+    <path clip-path="url(#p1d48955717)" d="M 334.818584 200.502989 
+L 336.854061 199.0435 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.014003;"/>
+    <path clip-path="url(#p1d48955717)" d="M 336.854061 199.0435 
+L 338.91143 197.652187 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.972401;"/>
+    <path clip-path="url(#p1d48955717)" d="M 338.91143 197.652187 
+L 340.988717 196.325388 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.921822;"/>
+    <path clip-path="url(#p1d48955717)" d="M 340.988717 196.325388 
+L 343.083245 195.063346 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.865466;"/>
+    <path clip-path="url(#p1d48955717)" d="M 343.083245 195.063346 
+L 345.193126 193.864582 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.809367;"/>
+    <path clip-path="url(#p1d48955717)" d="M 345.193126 193.864582 
+L 347.318035 192.725845 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.739842;"/>
+    <path clip-path="url(#p1d48955717)" d="M 347.318035 192.725845 
+L 349.458219 191.645288 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.664723;"/>
+    <path clip-path="url(#p1d48955717)" d="M 349.458219 191.645288 
+L 351.611571 190.624062 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.579306;"/>
+    <path clip-path="url(#p1d48955717)" d="M 351.611571 190.624062 
+L 353.775736 189.664517 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.494784;"/>
+    <path clip-path="url(#p1d48955717)" d="M 353.775736 189.664517 
+L 355.950567 188.767951 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.405655;"/>
+    <path clip-path="url(#p1d48955717)" d="M 355.950567 188.767951 
+L 358.136439 187.936781 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.305756;"/>
+    <path clip-path="url(#p1d48955717)" d="M 358.136439 187.936781 
+L 360.334083 187.175241 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.20101;"/>
+    <path clip-path="url(#p1d48955717)" d="M 360.334083 187.175241 
+L 362.544581 186.48981 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.088769;"/>
+    <path clip-path="url(#p1d48955717)" d="M 362.544581 186.48981 
+L 364.767278 185.890305 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.969554;"/>
+    <path clip-path="url(#p1d48955717)" d="M 364.767278 185.890305 
+L 366.999676 185.391798 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.850149;"/>
+    <path clip-path="url(#p1d48955717)" d="M 366.999676 185.391798 
+L 369.239418 185.017132 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.728659;"/>
+    <path clip-path="url(#p1d48955717)" d="M 369.239418 185.017132 
+L 371.484893 184.803743 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.604277;"/>
+    <path clip-path="url(#p1d48955717)" d="M 371.484893 184.803743 
+L 373.726663 184.824858 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.475412;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.726663 184.824858 
+L 373.726663 184.824858 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.346607;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.726663 184.824858 
+L 375.581624 185.134959 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.346607;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.581624 185.134959 
+L 375.581624 185.134959 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.238061;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.581624 185.134959 
+L 376.603776 185.513516 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.238061;"/>
+    <path clip-path="url(#p1d48955717)" d="M 376.603776 185.513516 
+L 376.603776 185.513516 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.200697;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 212.325517 
+L 328.864912 212.325517 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.147547;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 212.325517 
+L 330.671415 210.298804 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.147547;"/>
+    <path clip-path="url(#p1d48955717)" d="M 330.671415 210.298804 
+L 332.515434 208.349351 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.114198;"/>
+    <path clip-path="url(#p1d48955717)" d="M 332.515434 208.349351 
+L 334.394646 206.476268 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.079688;"/>
+    <path clip-path="url(#p1d48955717)" d="M 334.394646 206.476268 
+L 336.307222 204.683013 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.036877;"/>
+    <path clip-path="url(#p1d48955717)" d="M 336.307222 204.683013 
+L 338.251275 202.966238 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.993217;"/>
+    <path clip-path="url(#p1d48955717)" d="M 338.251275 202.966238 
+L 340.224229 201.323421 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.938422;"/>
+    <path clip-path="url(#p1d48955717)" d="M 340.224229 201.323421 
+L 342.223473 199.756851 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.883217;"/>
+    <path clip-path="url(#p1d48955717)" d="M 342.223473 199.756851 
+L 344.247097 198.263647 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.822582;"/>
+    <path clip-path="url(#p1d48955717)" d="M 344.247097 198.263647 
+L 346.294647 196.838567 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.753581;"/>
+    <path clip-path="url(#p1d48955717)" d="M 346.294647 196.838567 
+L 348.363106 195.483198 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.677035;"/>
+    <path clip-path="url(#p1d48955717)" d="M 348.363106 195.483198 
+L 350.449387 194.199837 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.601412;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 219.316966 
+L 328.864912 219.316966 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.19098;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 219.316966 
+L 330.536079 217.043196 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.19098;"/>
+    <path clip-path="url(#p1d48955717)" d="M 330.536079 217.043196 
+L 332.238197 214.822627 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.160327;"/>
+    <path clip-path="url(#p1d48955717)" d="M 332.238197 214.822627 
+L 333.973179 212.659001 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.126868;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.973179 212.659001 
+L 335.743297 210.561691 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.084223;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.743297 210.561691 
+L 337.550239 208.537163 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.039437;"/>
+    <path clip-path="url(#p1d48955717)" d="M 337.550239 208.537163 
+L 339.392494 206.584811 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.984833;"/>
+    <path clip-path="url(#p1d48955717)" d="M 339.392494 206.584811 
+L 341.269361 204.71058 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.929617;"/>
+    <path clip-path="url(#p1d48955717)" d="M 341.269361 204.71058 
+L 343.179793 202.913082 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.86612;"/>
+    <path clip-path="url(#p1d48955717)" d="M 343.179793 202.913082 
+L 345.121777 201.191743 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.79866;"/>
+    <path clip-path="url(#p1d48955717)" d="M 345.121777 201.191743 
+L 347.092596 199.550417 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.725057;"/>
+    <path clip-path="url(#p1d48955717)" d="M 347.092596 199.550417 
+L 349.091207 197.986958 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.650594;"/>
+    <path clip-path="url(#p1d48955717)" d="M 349.091207 197.986958 
+L 351.116889 196.497634 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.564985;"/>
+    <path clip-path="url(#p1d48955717)" d="M 351.116889 196.497634 
+L 353.166391 195.08653 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.475447;"/>
+    <path clip-path="url(#p1d48955717)" d="M 353.166391 195.08653 
+L 355.236753 193.756003 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.387503;"/>
+    <path clip-path="url(#p1d48955717)" d="M 355.236753 193.756003 
+L 357.329328 192.503829 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.290546;"/>
+    <path clip-path="url(#p1d48955717)" d="M 357.329328 192.503829 
+L 359.445296 191.330215 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.18659;"/>
+    <path clip-path="url(#p1d48955717)" d="M 359.445296 191.330215 
+L 361.580545 190.242028 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.074005;"/>
+    <path clip-path="url(#p1d48955717)" d="M 361.580545 190.242028 
+L 363.730664 189.248172 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.969334;"/>
+    <path clip-path="url(#p1d48955717)" d="M 363.730664 189.248172 
+L 365.89634 188.356798 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.85738;"/>
+    <path clip-path="url(#p1d48955717)" d="M 365.89634 188.356798 
+L 368.079277 187.581822 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.739692;"/>
+    <path clip-path="url(#p1d48955717)" d="M 368.079277 187.581822 
+L 370.281212 186.947869 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.616613;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 222.81269 
+L 328.864912 222.81269 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.206917;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 222.81269 
+L 330.487857 220.461431 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.206917;"/>
+    <path clip-path="url(#p1d48955717)" d="M 330.487857 220.461431 
+L 332.130288 218.140467 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.179097;"/>
+    <path clip-path="url(#p1d48955717)" d="M 332.130288 218.140467 
+L 333.799008 215.863179 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.150669;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.799008 215.863179 
+L 335.499647 213.64006 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.109621;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.499647 213.64006 
+L 337.233654 211.476363 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.065808;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 226.308414 
+L 328.864912 226.308414 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.213636;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 226.308414 
+L 330.457953 223.911033 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.213636;"/>
+    <path clip-path="url(#p1d48955717)" d="M 330.457953 223.911033 
+L 332.057613 221.524137 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.194188;"/>
+    <path clip-path="url(#p1d48955717)" d="M 332.057613 221.524137 
+L 333.6733 219.161905 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.167576;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.6733 219.161905 
+L 335.309898 216.833074 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.132731;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.309898 216.833074 
+L 336.974739 214.550774 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.092025;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 229.804138 
+L 328.864912 229.804138 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.214511;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 229.804138 
+L 330.450924 227.396473 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.214511;"/>
+    <path clip-path="url(#p1d48955717)" d="M 330.450924 227.396473 
+L 332.028826 224.976869 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.198583;"/>
+    <path clip-path="url(#p1d48955717)" d="M 332.028826 224.976869 
+L 333.605975 222.556602 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.179237;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.605975 222.556602 
+L 335.191781 220.149712 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.150222;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.191781 220.149712 
+L 336.7935 217.76677 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.1135;"/>
+    <path clip-path="url(#p1d48955717)" d="M 336.7935 217.76677 
+L 338.418908 215.42161 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.071101;"/>
+    <path clip-path="url(#p1d48955717)" d="M 338.418908 215.42161 
+L 340.074396 213.123658 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.018826;"/>
+    <path clip-path="url(#p1d48955717)" d="M 340.074396 213.123658 
+L 341.763932 210.883848 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.962535;"/>
+    <path clip-path="url(#p1d48955717)" d="M 341.763932 210.883848 
+L 343.49208 208.713254 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.898175;"/>
+    <path clip-path="url(#p1d48955717)" d="M 343.49208 208.713254 
+L 345.259086 206.613803 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.829437;"/>
+    <path clip-path="url(#p1d48955717)" d="M 345.259086 206.613803 
+L 347.065754 204.595012 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.753973;"/>
+    <path clip-path="url(#p1d48955717)" d="M 347.065754 204.595012 
+L 348.912404 202.657051 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.676436;"/>
+    <path clip-path="url(#p1d48955717)" d="M 348.912404 202.657051 
+L 350.797261 200.804031 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.588548;"/>
+    <path clip-path="url(#p1d48955717)" d="M 350.797261 200.804031 
+L 352.717786 199.043044 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.503302;"/>
+    <path clip-path="url(#p1d48955717)" d="M 352.717786 199.043044 
+L 354.674339 197.369082 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.410703;"/>
+    <path clip-path="url(#p1d48955717)" d="M 354.674339 197.369082 
+L 356.664759 195.784993 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.309759;"/>
+    <path clip-path="url(#p1d48955717)" d="M 356.664759 195.784993 
+L 358.683733 194.297958 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.211193;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 233.299862 
+L 328.864912 233.299862 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.205899;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 233.299862 
+L 330.467091 230.916488 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.205899;"/>
+    <path clip-path="url(#p1d48955717)" d="M 330.467091 230.916488 
+L 332.043223 228.494537 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.195168;"/>
+    <path clip-path="url(#p1d48955717)" d="M 332.043223 228.494537 
+L 333.603 226.048915 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.183522;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.603 226.048915 
+L 335.153654 223.590477 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.158292;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.153654 223.590477 
+L 336.705975 221.135084 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.131026;"/>
+    <path clip-path="url(#p1d48955717)" d="M 336.705975 221.135084 
+L 338.269979 218.696716 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.091196;"/>
+    <path clip-path="url(#p1d48955717)" d="M 338.269979 218.696716 
+L 339.853481 216.287956 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.046182;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 236.795586 
+L 328.864912 236.795586 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.189607;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 236.795586 
+L 330.503376 234.469184 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.189607;"/>
+    <path clip-path="url(#p1d48955717)" d="M 330.503376 234.469184 
+L 332.103041 232.082176 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.185126;"/>
+    <path clip-path="url(#p1d48955717)" d="M 332.103041 232.082176 
+L 333.670471 229.647943 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.175243;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.670471 229.647943 
+L 335.211498 227.176144 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.158914;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.211498 227.176144 
+L 336.736608 224.682387 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.134871;"/>
+    <path clip-path="url(#p1d48955717)" d="M 336.736608 224.682387 
+L 338.254156 222.179027 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.104454;"/>
+    <path clip-path="url(#p1d48955717)" d="M 338.254156 222.179027 
+L 339.776419 219.682517 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.064924;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 240.29131 
+L 328.864912 240.29131 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.169612;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 240.29131 
+L 330.560187 238.058374 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.169612;"/>
+    <path clip-path="url(#p1d48955717)" d="M 330.560187 238.058374 
+L 332.207519 235.746453 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.164601;"/>
+    <path clip-path="url(#p1d48955717)" d="M 332.207519 235.746453 
+L 333.806988 233.360112 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.160063;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.806988 233.360112 
+L 335.364152 230.911339 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.147092;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.364152 230.911339 
+L 336.884194 228.411063 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.129339;"/>
+    <path clip-path="url(#p1d48955717)" d="M 336.884194 228.411063 
+L 338.376978 225.874274 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.106556;"/>
+    <path clip-path="url(#p1d48955717)" d="M 338.376978 225.874274 
+L 339.852791 223.315405 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.07295;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 243.787034 
+L 328.864912 243.787034 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.146013;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 243.787034 
+L 330.63111 241.682295 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.146013;"/>
+    <path clip-path="url(#p1d48955717)" d="M 330.63111 241.682295 
+L 332.342217 239.477109 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.140816;"/>
+    <path clip-path="url(#p1d48955717)" d="M 332.342217 239.477109 
+L 333.997909 237.178321 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.137504;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.997909 237.178321 
+L 335.597957 234.793648 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.124609;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.597957 234.793648 
+L 337.144266 232.330199 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.11337;"/>
+    <path clip-path="url(#p1d48955717)" d="M 337.144266 232.330199 
+L 338.642497 229.80118 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.092408;"/>
+    <path clip-path="url(#p1d48955717)" d="M 338.642497 229.80118 
+L 340.100811 227.220257 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.069222;"/>
+    <path clip-path="url(#p1d48955717)" d="M 340.100811 227.220257 
+L 341.530074 224.603583 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.037955;"/>
+    <path clip-path="url(#p1d48955717)" d="M 341.530074 224.603583 
+L 342.943658 221.968238 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.999374;"/>
+    <path clip-path="url(#p1d48955717)" d="M 342.943658 221.968238 
+L 344.355656 219.331888 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.95395;"/>
+    <path clip-path="url(#p1d48955717)" d="M 344.355656 219.331888 
+L 345.77926 216.71182 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.89882;"/>
+    <path clip-path="url(#p1d48955717)" d="M 345.77926 216.71182 
+L 347.22975 214.126158 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.836497;"/>
+    <path clip-path="url(#p1d48955717)" d="M 347.22975 214.126158 
+L 348.717308 211.590806 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.766459;"/>
+    <path clip-path="url(#p1d48955717)" d="M 348.717308 211.590806 
+L 350.252852 209.122476 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.689022;"/>
+    <path clip-path="url(#p1d48955717)" d="M 350.252852 209.122476 
+L 351.841939 206.732254 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.605695;"/>
+    <path clip-path="url(#p1d48955717)" d="M 351.841939 206.732254 
+L 353.487879 204.435475 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.515557;"/>
+    <path clip-path="url(#p1d48955717)" d="M 353.487879 204.435475 
+L 355.194581 202.234832 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.422417;"/>
+    <path clip-path="url(#p1d48955717)" d="M 355.194581 202.234832 
+L 356.959641 200.145047 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.319569;"/>
+    <path clip-path="url(#p1d48955717)" d="M 356.959641 200.145047 
+L 358.779577 198.177678 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.222361;"/>
+    <path clip-path="url(#p1d48955717)" d="M 358.779577 198.177678 
+L 360.656189 196.32518 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.114908;"/>
+    <path clip-path="url(#p1d48955717)" d="M 360.656189 196.32518 
+L 362.581508 194.600802 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.003544;"/>
+    <path clip-path="url(#p1d48955717)" d="M 362.581508 194.600802 
+L 364.549886 193.01248 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.898391;"/>
+    <path clip-path="url(#p1d48955717)" d="M 364.549886 193.01248 
+L 366.57351 191.551923 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.782513;"/>
+    <path clip-path="url(#p1d48955717)" d="M 366.57351 191.551923 
+L 368.639191 190.242877 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.653174;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 247.282759 
+L 328.864912 247.282759 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.125112;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 247.282759 
+L 330.708282 245.332345 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.125112;"/>
+    <path clip-path="url(#p1d48955717)" d="M 330.708282 245.332345 
+L 332.499142 243.274123 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.115188;"/>
+    <path clip-path="url(#p1d48955717)" d="M 332.499142 243.274123 
+L 334.232458 241.109984 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.108643;"/>
+    <path clip-path="url(#p1d48955717)" d="M 334.232458 241.109984 
+L 335.902048 238.835394 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.095534;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.902048 238.835394 
+L 337.506364 236.457632 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.084261;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 254.274207 
+L 328.864912 254.274207 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.101468;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 254.274207 
+L 330.861997 252.699571 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.101468;"/>
+    <path clip-path="url(#p1d48955717)" d="M 330.861997 252.699571 
+L 332.821312 251.022113 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.080028;"/>
+    <path clip-path="url(#p1d48955717)" d="M 332.821312 251.022113 
+L 334.735633 249.230714 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.057556;"/>
+    <path clip-path="url(#p1d48955717)" d="M 334.735633 249.230714 
+L 336.596024 247.318832 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.03142;"/>
+    <path clip-path="url(#p1d48955717)" d="M 336.596024 247.318832 
+L 338.391369 245.272656 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.008061;"/>
+    <path clip-path="url(#p1d48955717)" d="M 338.391369 245.272656 
+L 340.111072 243.085109 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.981739;"/>
+    <path clip-path="url(#p1d48955717)" d="M 340.111072 243.085109 
+L 341.74413 240.755957 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.958954;"/>
+    <path clip-path="url(#p1d48955717)" d="M 341.74413 240.755957 
+L 343.2805 238.282833 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.936454;"/>
+    <path clip-path="url(#p1d48955717)" d="M 343.2805 238.282833 
+L 344.714832 235.676524 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.91663;"/>
+    <path clip-path="url(#p1d48955717)" d="M 344.714832 235.676524 
+L 346.046464 232.950799 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.894984;"/>
+    <path clip-path="url(#p1d48955717)" d="M 346.046464 232.950799 
+L 347.284693 230.127426 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.873305;"/>
+    <path clip-path="url(#p1d48955717)" d="M 347.284693 230.127426 
+L 348.44464 227.231824 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.847881;"/>
+    <path clip-path="url(#p1d48955717)" d="M 348.44464 227.231824 
+L 349.547643 224.286849 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.815143;"/>
+    <path clip-path="url(#p1d48955717)" d="M 349.547643 224.286849 
+L 350.624017 221.319634 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.776892;"/>
+    <path clip-path="url(#p1d48955717)" d="M 350.624017 221.319634 
+L 351.696564 218.351576 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.726194;"/>
+    <path clip-path="url(#p1d48955717)" d="M 351.696564 218.351576 
+L 352.795876 215.410336 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.669233;"/>
+    <path clip-path="url(#p1d48955717)" d="M 352.795876 215.410336 
+L 353.950688 212.515401 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.59715;"/>
+    <path clip-path="url(#p1d48955717)" d="M 353.950688 212.515401 
+L 355.177291 209.693671 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.519244;"/>
+    <path clip-path="url(#p1d48955717)" d="M 355.177291 209.693671 
+L 356.490087 206.966966 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.43066;"/>
+    <path clip-path="url(#p1d48955717)" d="M 356.490087 206.966966 
+L 357.89989 204.354883 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.335452;"/>
+    <path clip-path="url(#p1d48955717)" d="M 357.89989 204.354883 
+L 359.408819 201.871839 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.235525;"/>
+    <path clip-path="url(#p1d48955717)" d="M 359.408819 201.871839 
+L 361.015586 199.536034 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.127594;"/>
+    <path clip-path="url(#p1d48955717)" d="M 361.015586 199.536034 
+L 362.715338 197.356189 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.022551;"/>
+    <path clip-path="url(#p1d48955717)" d="M 362.715338 197.356189 
+L 364.499987 195.34091 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.90562;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 261.265655 
+L 328.864912 261.265655 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.127471;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 261.265655 
+L 330.982526 260.087522 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.127471;"/>
+    <path clip-path="url(#p1d48955717)" d="M 330.982526 260.087522 
+L 333.080682 258.83817 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.092454;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.080682 258.83817 
+L 335.155465 257.507488 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.056295;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.155465 257.507488 
+L 337.20208 256.080708 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.011373;"/>
+    <path clip-path="url(#p1d48955717)" d="M 337.20208 256.080708 
+L 339.213194 254.544297 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.959987;"/>
+    <path clip-path="url(#p1d48955717)" d="M 339.213194 254.544297 
+L 341.178003 252.884474 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.911698;"/>
+    <path clip-path="url(#p1d48955717)" d="M 341.178003 252.884474 
+L 343.083827 251.078913 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.86111;"/>
+    <path clip-path="url(#p1d48955717)" d="M 343.083827 251.078913 
+L 344.913184 249.104008 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.81301;"/>
+    <path clip-path="url(#p1d48955717)" d="M 344.913184 249.104008 
+L 346.644208 246.943955 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.766752;"/>
+    <path clip-path="url(#p1d48955717)" d="M 346.644208 246.943955 
+L 348.248537 244.575722 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.731804;"/>
+    <path clip-path="url(#p1d48955717)" d="M 348.248537 244.575722 
+L 349.70093 241.998503 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.701736;"/>
+    <path clip-path="url(#p1d48955717)" d="M 349.70093 241.998503 
+L 350.978041 239.223711 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.683259;"/>
+    <path clip-path="url(#p1d48955717)" d="M 350.978041 239.223711 
+L 352.073838 236.280903 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.674365;"/>
+    <path clip-path="url(#p1d48955717)" d="M 352.073838 236.280903 
+L 353.001574 233.2118 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.667245;"/>
+    <path clip-path="url(#p1d48955717)" d="M 353.001574 233.2118 
+L 353.791214 230.050782 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.663125;"/>
+    <path clip-path="url(#p1d48955717)" d="M 353.791214 230.050782 
+L 354.484553 226.840249 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.653044;"/>
+    <path clip-path="url(#p1d48955717)" d="M 354.484553 226.840249 
+L 355.118143 223.608133 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.633458;"/>
+    <path clip-path="url(#p1d48955717)" d="M 355.118143 223.608133 
+L 355.746478 220.378032 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.607444;"/>
+    <path clip-path="url(#p1d48955717)" d="M 355.746478 220.378032 
+L 356.416829 217.169014 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.559609;"/>
+    <path clip-path="url(#p1d48955717)" d="M 356.416829 217.169014 
+L 357.164066 213.995142 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.503219;"/>
+    <path clip-path="url(#p1d48955717)" d="M 357.164066 213.995142 
+L 358.022377 210.890869 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.430841;"/>
+    <path clip-path="url(#p1d48955717)" d="M 358.022377 210.890869 
+L 359.007509 207.879431 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.348319;"/>
+    <path clip-path="url(#p1d48955717)" d="M 359.007509 207.879431 
+L 360.138698 204.996605 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.255114;"/>
+    <path clip-path="url(#p1d48955717)" d="M 360.138698 204.996605 
+L 361.424771 202.253399 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.154973;"/>
+    <path clip-path="url(#p1d48955717)" d="M 361.424771 202.253399 
+L 362.854456 199.691953 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.044068;"/>
+    <path clip-path="url(#p1d48955717)" d="M 362.854456 199.691953 
+L 364.420737 197.321468 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.939445;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 264.761379 
+L 328.864912 264.761379 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.169098;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 264.761379 
+L 331.024633 263.773034 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.169098;"/>
+    <path clip-path="url(#p1d48955717)" d="M 331.024633 263.773034 
+L 333.172417 262.729404 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.129437;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.172417 262.729404 
+L 335.306423 261.62251 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.084525;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.306423 261.62251 
+L 337.423509 260.4428 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.030003;"/>
+    <path clip-path="url(#p1d48955717)" d="M 337.423509 260.4428 
+L 339.518335 259.180947 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.969829;"/>
+    <path clip-path="url(#p1d48955717)" d="M 339.518335 259.180947 
+L 341.584399 257.822793 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.91201;"/>
+    <path clip-path="url(#p1d48955717)" d="M 341.584399 257.822793 
+L 343.614157 256.347106 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.843832;"/>
+    <path clip-path="url(#p1d48955717)" d="M 343.614157 256.347106 
+L 345.595688 254.730369 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.775069;"/>
+    <path clip-path="url(#p1d48955717)" d="M 345.595688 254.730369 
+L 347.510186 252.949106 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.707422;"/>
+    <path clip-path="url(#p1d48955717)" d="M 347.510186 252.949106 
+L 349.332999 250.968478 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.648151;"/>
+    <path clip-path="url(#p1d48955717)" d="M 349.332999 250.968478 
+L 351.03007 248.754153 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.592879;"/>
+    <path clip-path="url(#p1d48955717)" d="M 351.03007 248.754153 
+L 352.557505 246.287426 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.552402;"/>
+    <path clip-path="url(#p1d48955717)" d="M 352.557505 246.287426 
+L 353.87215 243.560175 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.527537;"/>
+    <path clip-path="url(#p1d48955717)" d="M 353.87215 243.560175 
+L 354.941453 240.605416 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.518775;"/>
+    <path clip-path="url(#p1d48955717)" d="M 354.941453 240.605416 
+L 355.760169 237.504746 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.525797;"/>
+    <path clip-path="url(#p1d48955717)" d="M 355.760169 237.504746 
+L 356.369917 234.270798 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.538278;"/>
+    <path clip-path="url(#p1d48955717)" d="M 356.369917 234.270798 
+L 356.825235 230.973277 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.556401;"/>
+    <path clip-path="url(#p1d48955717)" d="M 356.825235 230.973277 
+L 357.190295 227.64554 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.559651;"/>
+    <path clip-path="url(#p1d48955717)" d="M 357.190295 227.64554 
+L 357.514272 224.304643 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.556448;"/>
+    <path clip-path="url(#p1d48955717)" d="M 357.514272 224.304643 
+L 357.855132 220.971707 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.538886;"/>
+    <path clip-path="url(#p1d48955717)" d="M 357.855132 220.971707 
+L 358.254365 217.662562 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.502421;"/>
+    <path clip-path="url(#p1d48955717)" d="M 358.254365 217.662562 
+L 358.754794 214.394024 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.454889;"/>
+    <path clip-path="url(#p1d48955717)" d="M 358.754794 214.394024 
+L 359.395423 211.192087 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.387026;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 268.257103 
+L 328.864912 268.257103 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.224988;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 268.257103 
+L 331.05728 267.441521 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.224988;"/>
+    <path clip-path="url(#p1d48955717)" d="M 331.05728 267.441521 
+L 333.243358 266.586168 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.181051;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.243358 266.586168 
+L 335.42169 265.686724 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.130983;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.42169 265.686724 
+L 337.589853 264.737933 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.074993;"/>
+    <path clip-path="url(#p1d48955717)" d="M 337.589853 264.737933 
+L 339.745605 263.73252 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.011167;"/>
+    <path clip-path="url(#p1d48955717)" d="M 339.745605 263.73252 
+L 341.88646 262.660247 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.942522;"/>
+    <path clip-path="url(#p1d48955717)" d="M 341.88646 262.660247 
+L 344.009003 261.507311 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.861884;"/>
+    <path clip-path="url(#p1d48955717)" d="M 344.009003 261.507311 
+L 346.107209 260.257268 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.776556;"/>
+    <path clip-path="url(#p1d48955717)" d="M 346.107209 260.257268 
+L 348.170386 258.890466 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.690556;"/>
+    <path clip-path="url(#p1d48955717)" d="M 348.170386 258.890466 
+L 350.184907 257.377891 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.605694;"/>
+    <path clip-path="url(#p1d48955717)" d="M 350.184907 257.377891 
+L 352.130976 255.674112 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.522326;"/>
+    <path clip-path="url(#p1d48955717)" d="M 352.130976 255.674112 
+L 353.972453 253.733943 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.437871;"/>
+    <path clip-path="url(#p1d48955717)" d="M 353.972453 253.733943 
+L 355.652972 251.509908 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.377289;"/>
+    <path clip-path="url(#p1d48955717)" d="M 355.652972 251.509908 
+L 357.10111 248.950846 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.331083;"/>
+    <path clip-path="url(#p1d48955717)" d="M 357.10111 248.950846 
+L 358.155613 246.325877 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.311083;"/>
+    <path clip-path="url(#p1d48955717)" d="M 358.155613 246.325877 
+L 358.873179 243.682137 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.320036;"/>
+    <path clip-path="url(#p1d48955717)" d="M 358.873179 243.682137 
+L 359.349492 240.899175 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.344815;"/>
+    <path clip-path="url(#p1d48955717)" d="M 359.349492 240.899175 
+L 359.639495 237.812668 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.38032;"/>
+    <path clip-path="url(#p1d48955717)" d="M 359.639495 237.812668 
+L 359.761177 234.46628 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.419235;"/>
+    <path clip-path="url(#p1d48955717)" d="M 359.761177 234.46628 
+L 359.772284 231.110608 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.459666;"/>
+    <path clip-path="url(#p1d48955717)" d="M 359.772284 231.110608 
+L 359.741042 227.754518 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.479927;"/>
+    <path clip-path="url(#p1d48955717)" d="M 359.741042 227.754518 
+L 359.716113 224.398397 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.490052;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 271.752828 
+L 328.864912 271.752828 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.292207;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 271.752828 
+L 331.081679 271.09341 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.292207;"/>
+    <path clip-path="url(#p1d48955717)" d="M 331.081679 271.09341 
+L 333.294447 270.407853 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.250019;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.294447 270.407853 
+L 335.502684 269.693887 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.202564;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.502684 269.693887 
+L 337.705945 268.948754 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.145573;"/>
+    <path clip-path="url(#p1d48955717)" d="M 337.705945 268.948754 
+L 339.903641 268.168718 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.077019;"/>
+    <path clip-path="url(#p1d48955717)" d="M 339.903641 268.168718 
+L 342.094985 267.348769 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.002595;"/>
+    <path clip-path="url(#p1d48955717)" d="M 342.094985 267.348769 
+L 344.278934 266.48221 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.915986;"/>
+    <path clip-path="url(#p1d48955717)" d="M 344.278934 266.48221 
+L 346.4528 265.560771 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.821998;"/>
+    <path clip-path="url(#p1d48955717)" d="M 346.4528 265.560771 
+L 348.612153 264.573484 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.727069;"/>
+    <path clip-path="url(#p1d48955717)" d="M 348.612153 264.573484 
+L 350.752184 263.50418 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.62461;"/>
+    <path clip-path="url(#p1d48955717)" d="M 350.752184 263.50418 
+L 352.866288 262.328926 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.519449;"/>
+    <path clip-path="url(#p1d48955717)" d="M 352.866288 262.328926 
+L 354.943987 261.011333 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.40785;"/>
+    <path clip-path="url(#p1d48955717)" d="M 354.943987 261.011333 
+L 356.960717 259.505257 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.294058;"/>
+    <path clip-path="url(#p1d48955717)" d="M 356.960717 259.505257 
+L 358.870771 257.74541 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.197892;"/>
+    <path clip-path="url(#p1d48955717)" d="M 358.870771 257.74541 
+L 360.603883 255.620206 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.112817;"/>
+    <path clip-path="url(#p1d48955717)" d="M 360.603883 255.620206 
+L 360.603883 255.620206 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.046752;"/>
+    <path clip-path="url(#p1d48955717)" d="M 360.603883 255.620206 
+L 361.739432 253.669025 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.046752;"/>
+    <path clip-path="url(#p1d48955717)" d="M 361.739432 253.669025 
+L 362.612379 251.441258 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.034702;"/>
+    <path clip-path="url(#p1d48955717)" d="M 362.612379 251.441258 
+L 363.133664 249.22057 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.048072;"/>
+    <path clip-path="url(#p1d48955717)" d="M 363.133664 249.22057 
+L 363.406141 246.902224 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.081938;"/>
+    <path clip-path="url(#p1d48955717)" d="M 363.406141 246.902224 
+L 363.471264 244.331483 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.131694;"/>
+    <path clip-path="url(#p1d48955717)" d="M 363.471264 244.331483 
+L 363.343577 241.42544 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.193367;"/>
+    <path clip-path="url(#p1d48955717)" d="M 363.343577 241.42544 
+L 363.040768 238.120546 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.260268;"/>
+    <path clip-path="url(#p1d48955717)" d="M 363.040768 238.120546 
+L 362.647422 234.830044 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.329391;"/>
+    <path clip-path="url(#p1d48955717)" d="M 362.647422 234.830044 
+L 362.231032 231.541012 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.386362;"/>
+    <path clip-path="url(#p1d48955717)" d="M 362.231032 231.541012 
+L 361.834312 228.24042 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.420187;"/>
+    <path clip-path="url(#p1d48955717)" d="M 361.834312 228.24042 
+L 361.495949 224.918488 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.44228;"/>
+    <path clip-path="url(#p1d48955717)" d="M 361.495949 224.918488 
+L 361.257089 221.572022 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.439435;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 275.248552 
+L 328.864912 275.248552 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.376658;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 275.248552 
+L 331.097341 274.725859 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.376658;"/>
+    <path clip-path="url(#p1d48955717)" d="M 331.097341 274.725859 
+L 333.327989 274.187481 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.335376;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.327989 274.187481 
+L 335.556827 273.632949 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.287722;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.556827 273.632949 
+L 337.783844 273.061874 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.230718;"/>
+    <path clip-path="url(#p1d48955717)" d="M 337.783844 273.061874 
+L 340.009 272.473392 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.161752;"/>
+    <path clip-path="url(#p1d48955717)" d="M 340.009 272.473392 
+L 342.232235 271.866208 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.086638;"/>
+    <path clip-path="url(#p1d48955717)" d="M 342.232235 271.866208 
+L 344.453054 271.238519 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.99986;"/>
+    <path clip-path="url(#p1d48955717)" d="M 344.453054 271.238519 
+L 346.670334 270.587393 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.906764;"/>
+    <path clip-path="url(#p1d48955717)" d="M 346.670334 270.587393 
+L 348.883125 269.909217 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.809769;"/>
+    <path clip-path="url(#p1d48955717)" d="M 348.883125 269.909217 
+L 351.090627 269.199082 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.700661;"/>
+    <path clip-path="url(#p1d48955717)" d="M 351.090627 269.199082 
+L 353.291696 268.449771 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.58686;"/>
+    <path clip-path="url(#p1d48955717)" d="M 353.291696 268.449771 
+L 355.484684 267.65087 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.465618;"/>
+    <path clip-path="url(#p1d48955717)" d="M 355.484684 267.65087 
+L 357.66713 266.786489 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.336496;"/>
+    <path clip-path="url(#p1d48955717)" d="M 357.66713 266.786489 
+L 359.833094 265.83216 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.202995;"/>
+    <path clip-path="url(#p1d48955717)" d="M 359.833094 265.83216 
+L 361.966603 264.750066 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.066765;"/>
+    <path clip-path="url(#p1d48955717)" d="M 361.966603 264.750066 
+L 364.039043 263.472021 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.93885;"/>
+    <path clip-path="url(#p1d48955717)" d="M 364.039043 263.472021 
+L 365.988313 261.862204 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.815005;"/>
+    <path clip-path="url(#p1d48955717)" d="M 365.988313 261.862204 
+L 365.988313 261.862204 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.704365;"/>
+    <path clip-path="url(#p1d48955717)" d="M 365.988313 261.862204 
+L 367.188664 260.424116 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.704365;"/>
+    <path clip-path="url(#p1d48955717)" d="M 367.188664 260.424116 
+L 367.188664 260.424116 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.652482;"/>
+    <path clip-path="url(#p1d48955717)" d="M 367.188664 260.424116 
+L 367.991263 258.962169 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.652482;"/>
+    <path clip-path="url(#p1d48955717)" d="M 367.991263 258.962169 
+L 368.51879 257.269189 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.648305;"/>
+    <path clip-path="url(#p1d48955717)" d="M 368.51879 257.269189 
+L 368.733106 255.572936 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.673399;"/>
+    <path clip-path="url(#p1d48955717)" d="M 368.733106 255.572936 
+L 368.728141 253.779719 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.714397;"/>
+    <path clip-path="url(#p1d48955717)" d="M 368.728141 253.779719 
+L 368.523278 251.691207 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.776881;"/>
+    <path clip-path="url(#p1d48955717)" d="M 368.523278 251.691207 
+L 368.088566 249.151273 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.853056;"/>
+    <path clip-path="url(#p1d48955717)" d="M 368.088566 249.151273 
+L 367.384012 245.976389 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.944352;"/>
+    <path clip-path="url(#p1d48955717)" d="M 367.384012 245.976389 
+L 366.610716 242.856636 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.060954;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.68114 212.614365 
+L 396.595108 212.604937 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.929575;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.595108 212.604937 
+L 394.34265 212.325517 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.925368;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.34265 212.325517 
+L 392.094789 211.977143 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.814045;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.094789 211.977143 
+L 389.85318 211.548718 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.700634;"/>
+    <path clip-path="url(#p1d48955717)" d="M 350.517349 187.545224 
+L 352.719075 186.792169 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.597754;"/>
+    <path clip-path="url(#p1d48955717)" d="M 352.719075 186.792169 
+L 354.929797 186.092771 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.503194;"/>
+    <path clip-path="url(#p1d48955717)" d="M 354.929797 186.092771 
+L 357.148108 185.450529 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.403486;"/>
+    <path clip-path="url(#p1d48955717)" d="M 357.148108 185.450529 
+L 359.372767 184.870578 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.303073;"/>
+    <path clip-path="url(#p1d48955717)" d="M 359.372767 184.870578 
+L 361.603781 184.359724 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.194496;"/>
+    <path clip-path="url(#p1d48955717)" d="M 328.864912 251.705877 
+L 329.742392 250.930658 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.105967;"/>
+    <path clip-path="url(#p1d48955717)" d="M 329.742392 250.930658 
+L 331.665981 249.161215 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.096853;"/>
+    <path clip-path="url(#p1d48955717)" d="M 331.665981 249.161215 
+L 333.541894 247.282759 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.081644;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.541894 247.282759 
+L 335.361402 245.283734 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.06465;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.541894 254.274207 
+L 335.52704 252.667286 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.037085;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.52704 252.667286 
+L 337.466985 250.941491 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.004469;"/>
+    <path clip-path="url(#p1d48955717)" d="M 337.466985 250.941491 
+L 339.351531 249.082233 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.965657;"/>
+    <path clip-path="url(#p1d48955717)" d="M 339.351531 249.082233 
+L 341.167306 247.079255 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.931903;"/>
+    <path clip-path="url(#p1d48955717)" d="M 341.167306 247.079255 
+L 342.897914 244.913023 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.897477;"/>
+    <path clip-path="url(#p1d48955717)" d="M 342.897914 244.913023 
+L 344.527367 242.577904 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.868035;"/>
+    <path clip-path="url(#p1d48955717)" d="M 344.527367 242.577904 
+L 346.039218 240.074969 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.841318;"/>
+    <path clip-path="url(#p1d48955717)" d="M 346.039218 240.074969 
+L 347.422319 237.409735 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.821575;"/>
+    <path clip-path="url(#p1d48955717)" d="M 347.422319 237.409735 
+L 348.671037 234.601575 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.802563;"/>
+    <path clip-path="url(#p1d48955717)" d="M 348.671037 234.601575 
+L 349.795889 231.676259 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.788035;"/>
+    <path clip-path="url(#p1d48955717)" d="M 349.795889 231.676259 
+L 350.813968 228.664509 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.76744;"/>
+    <path clip-path="url(#p1d48955717)" d="M 350.813968 228.664509 
+L 351.753994 225.598353 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.747597;"/>
+    <path clip-path="url(#p1d48955717)" d="M 351.753994 225.598353 
+L 352.652566 222.506926 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.71291;"/>
+    <path clip-path="url(#p1d48955717)" d="M 384.988687 271.752828 
+L 384.988687 271.752828 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.49255;"/>
+    <path clip-path="url(#p1d48955717)" d="M 384.988687 271.752828 
+L 384.988687 271.752828 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.49255;"/>
+    <path clip-path="url(#p1d48955717)" d="M 384.988687 271.752828 
+L 384.05393 272.852146 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.49255;"/>
+    <path clip-path="url(#p1d48955717)" d="M 384.05393 272.852146 
+L 384.05393 272.852146 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.466534;"/>
+    <path clip-path="url(#p1d48955717)" d="M 384.05393 272.852146 
+L 383.435686 274.039537 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.466534;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.435686 274.039537 
+L 383.087999 275.432599 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.466515;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.087999 275.432599 
+L 383.017097 276.895137 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.489799;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.017097 276.895137 
+L 383.148233 278.453143 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.528764;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.148233 278.453143 
+L 383.47927 280.32876 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.59507;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.47927 280.32876 
+L 383.883199 282.24 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.677565;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.665669 264.761379 
+L 387.433286 265.240722 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.879193;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.433286 265.240722 
+L 385.200001 265.712132 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.728408;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.200001 265.712132 
+L 382.963086 266.167269 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.57489;"/>
+    <path clip-path="url(#p1d48955717)" d="M 382.963086 266.167269 
+L 380.752236 266.575295 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.417429;"/>
+    <path clip-path="url(#p1d48955717)" d="M 380.752236 266.575295 
+L 380.752236 266.575295 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.277429;"/>
+    <path clip-path="url(#p1d48955717)" d="M 380.752236 266.575295 
+L 379.115891 266.794767 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.277429;"/>
+    <path clip-path="url(#p1d48955717)" d="M 379.115891 266.794767 
+L 379.115891 266.794767 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.180437;"/>
+    <path clip-path="url(#p1d48955717)" d="M 379.115891 266.794767 
+L 378.357308 266.824248 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.180437;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.357308 266.824248 
+L 377.700658 266.731389 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.16143;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.700658 266.731389 
+L 377.235184 266.50854 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.156496;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.235184 266.50854 
+L 376.769095 266.006137 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.149878;"/>
+    <path clip-path="url(#p1d48955717)" d="M 376.769095 266.006137 
+L 376.274028 265.139255 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.15158;"/>
+    <path clip-path="url(#p1d48955717)" d="M 376.274028 265.139255 
+L 375.649584 263.776999 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.186347;"/>
+    <path clip-path="url(#p1d48955717)" d="M 359.26529 268.257103 
+L 361.454101 267.445664 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.142129;"/>
+    <path clip-path="url(#p1d48955717)" d="M 361.454101 267.445664 
+L 363.627149 266.538108 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.000532;"/>
+    <path clip-path="url(#p1d48955717)" d="M 363.627149 266.538108 
+L 365.764931 265.478621 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.852123;"/>
+    <path clip-path="url(#p1d48955717)" d="M 365.764931 265.478621 
+L 367.808734 264.158979 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.71538;"/>
+    <path clip-path="url(#p1d48955717)" d="M 367.808734 264.158979 
+L 367.808734 264.158979 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.596088;"/>
+    <path clip-path="url(#p1d48955717)" d="M 367.808734 264.158979 
+L 369.14514 262.921131 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.596088;"/>
+    <path clip-path="url(#p1d48955717)" d="M 369.14514 262.921131 
+L 369.14514 262.921131 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.530173;"/>
+    <path clip-path="url(#p1d48955717)" d="M 369.14514 262.921131 
+L 370.000666 261.700471 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.530173;"/>
+    <path clip-path="url(#p1d48955717)" d="M 370.000666 261.700471 
+L 370.000666 261.700471 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.499231;"/>
+    <path clip-path="url(#p1d48955717)" d="M 370.000666 261.700471 
+L 370.525145 260.401401 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.499231;"/>
+    <path clip-path="url(#p1d48955717)" d="M 370.525145 260.401401 
+L 370.780979 258.957031 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.501778;"/>
+    <path clip-path="url(#p1d48955717)" d="M 370.780979 258.957031 
+L 370.803237 257.493822 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.542267;"/>
+    <path clip-path="url(#p1d48955717)" d="M 370.803237 257.493822 
+L 370.624491 255.767209 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.59367;"/>
+    <path clip-path="url(#p1d48955717)" d="M 370.624491 255.767209 
+L 370.238072 253.711566 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.659941;"/>
+    <path clip-path="url(#p1d48955717)" d="M 366.280762 268.257103 
+L 368.460869 267.452315 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.726672;"/>
+    <path clip-path="url(#p1d48955717)" d="M 368.460869 267.452315 
+L 370.603986 266.453612 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.574437;"/>
+    <path clip-path="url(#p1d48955717)" d="M 370.603986 266.453612 
+L 370.603986 266.453612 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.416805;"/>
+    <path clip-path="url(#p1d48955717)" d="M 370.603986 266.453612 
+L 372.019389 265.499509 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.416805;"/>
+    <path clip-path="url(#p1d48955717)" d="M 372.019389 265.499509 
+L 372.019389 265.499509 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.337191;"/>
+    <path clip-path="url(#p1d48955717)" d="M 372.019389 265.499509 
+L 372.795296 264.669402 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.337191;"/>
+    <path clip-path="url(#p1d48955717)" d="M 372.795296 264.669402 
+L 372.795296 264.669402 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.315574;"/>
+    <path clip-path="url(#p1d48955717)" d="M 372.795296 264.669402 
+L 373.264244 263.769701 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.315574;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.264244 263.769701 
+L 373.477066 262.740626 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.318501;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.477066 262.740626 
+L 373.464166 261.59646 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.340575;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.464166 261.59646 
+L 373.253314 260.231804 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.375325;"/>
+    <path clip-path="url(#p1d48955717)" d="M 370.350125 269.377316 
+L 372.543176 268.895889 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.501112;"/>
+    <path clip-path="url(#p1d48955717)" d="M 372.543176 268.895889 
+L 374.12312 268.557333 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.358319;"/>
+    <path clip-path="url(#p1d48955717)" d="M 374.12312 268.557333 
+L 375.634725 268.257103 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.258984;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.634725 268.257103 
+L 375.634725 268.257103 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.183979;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.634725 268.257103 
+L 375.634725 268.257103 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.183979;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.634725 268.257103 
+L 376.189851 268.16748 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.183979;"/>
+    <path clip-path="url(#p1d48955717)" d="M 376.189851 268.16748 
+L 376.574319 268.128407 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.180582;"/>
+    <path clip-path="url(#p1d48955717)" d="M 338.218875 240.29131 
+L 339.816391 237.904413 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.025443;"/>
+    <path clip-path="url(#p1d48955717)" d="M 339.816391 237.904413 
+L 341.333601 235.403548 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.007348;"/>
+    <path clip-path="url(#p1d48955717)" d="M 341.333601 235.403548 
+L 342.770458 232.797826 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.986189;"/>
+    <path clip-path="url(#p1d48955717)" d="M 342.770458 232.797826 
+L 344.133407 230.104568 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.963512;"/>
+    <path clip-path="url(#p1d48955717)" d="M 344.133407 230.104568 
+L 345.432711 227.342485 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.935783;"/>
+    <path clip-path="url(#p1d48955717)" d="M 345.432711 227.342485 
+L 346.686484 224.532322 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.901651;"/>
+    <path clip-path="url(#p1d48955717)" d="M 346.686484 224.532322 
+L 347.91364 221.697566 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.862344;"/>
+    <path clip-path="url(#p1d48955717)" d="M 347.91364 221.697566 
+L 349.133312 218.858016 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.811274;"/>
+    <path clip-path="url(#p1d48955717)" d="M 349.133312 218.858016 
+L 350.372134 216.037633 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.753855;"/>
+    <path clip-path="url(#p1d48955717)" d="M 350.372134 216.037633 
+L 351.647262 213.255244 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.685546;"/>
+    <path clip-path="url(#p1d48955717)" d="M 351.647262 213.255244 
+L 352.975783 210.535757 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.609394;"/>
+    <path clip-path="url(#p1d48955717)" d="M 352.249819 264.761379 
+L 354.384593 263.674147 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.4593;"/>
+    <path clip-path="url(#p1d48955717)" d="M 354.384593 263.674147 
+L 356.486302 262.458859 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.345036;"/>
+    <path clip-path="url(#p1d48955717)" d="M 356.486302 262.458859 
+L 358.538052 261.061763 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.226628;"/>
+    <path clip-path="url(#p1d48955717)" d="M 358.538052 261.061763 
+L 360.496802 259.409435 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.108485;"/>
+    <path clip-path="url(#p1d48955717)" d="M 360.496802 259.409435 
+L 362.273035 257.400132 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.016421;"/>
+    <path clip-path="url(#p1d48955717)" d="M 362.273035 257.400132 
+L 362.273035 257.400132 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.948717;"/>
+    <path clip-path="url(#p1d48955717)" d="M 362.273035 257.400132 
+L 363.379724 255.614957 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.948717;"/>
+    <path clip-path="url(#p1d48955717)" d="M 363.379724 255.614957 
+L 364.235002 253.517811 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.920503;"/>
+    <path clip-path="url(#p1d48955717)" d="M 361.603781 261.265655 
+L 363.481649 259.446345 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.944205;"/>
+    <path clip-path="url(#p1d48955717)" d="M 363.481649 259.446345 
+L 363.481649 259.446345 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.860697;"/>
+    <path clip-path="url(#p1d48955717)" d="M 363.481649 259.446345 
+L 364.689411 257.796328 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.860697;"/>
+    <path clip-path="url(#p1d48955717)" d="M 364.689411 257.796328 
+L 364.689411 257.796328 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.825694;"/>
+    <path clip-path="url(#p1d48955717)" d="M 364.689411 257.796328 
+L 365.520198 256.118281 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.825694;"/>
+    <path clip-path="url(#p1d48955717)" d="M 365.520198 256.118281 
+L 366.089552 254.204301 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.820309;"/>
+    <path clip-path="url(#p1d48955717)" d="M 366.089552 254.204301 
+L 366.366092 252.278957 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.84836;"/>
+    <path clip-path="url(#p1d48955717)" d="M 366.366092 252.278957 
+L 366.418666 250.191766 
+" style="fill:none;stroke:#1f77b4;stroke-width:0.895717;"/>
+    <path clip-path="url(#p1d48955717)" d="M 342.895856 215.821241 
+L 344.455503 213.379535 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.911744;"/>
+    <path clip-path="url(#p1d48955717)" d="M 344.455503 213.379535 
+L 346.050676 210.992412 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.84406;"/>
+    <path clip-path="url(#p1d48955717)" d="M 346.050676 210.992412 
+L 347.688865 208.673854 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.771201;"/>
+    <path clip-path="url(#p1d48955717)" d="M 347.688865 208.673854 
+L 349.372483 206.43054 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.690996;"/>
+    <path clip-path="url(#p1d48955717)" d="M 352.249819 257.769931 
+L 354.178793 256.030572 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.42921;"/>
+    <path clip-path="url(#p1d48955717)" d="M 354.178793 256.030572 
+L 355.982867 254.022083 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.346046;"/>
+    <path clip-path="url(#p1d48955717)" d="M 355.982867 254.022083 
+L 357.589491 251.688989 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.284081;"/>
+    <path clip-path="url(#p1d48955717)" d="M 357.589491 251.688989 
+L 358.843623 249.142698 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.246785;"/>
+    <path clip-path="url(#p1d48955717)" d="M 339.698378 233.485551 
+L 341.153257 230.901029 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.036637;"/>
+    <path clip-path="url(#p1d48955717)" d="M 341.153257 230.901029 
+L 342.551839 228.248145 
+" style="fill:none;stroke:#1f77b4;stroke-width:2.008833;"/>
+    <path clip-path="url(#p1d48955717)" d="M 342.551839 228.248145 
+L 343.907501 225.545658 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.980192;"/>
+    <path clip-path="url(#p1d48955717)" d="M 343.907501 225.545658 
+L 345.234347 222.81269 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.940594;"/>
+    <path clip-path="url(#p1d48955717)" d="M 345.234347 222.81269 
+L 346.551343 220.069109 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.896036;"/>
+    <path clip-path="url(#p1d48955717)" d="M 350.497539 252.890666 
+L 352.249819 250.778483 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.532264;"/>
+    <path clip-path="url(#p1d48955717)" d="M 352.249819 250.778483 
+L 353.834026 248.390366 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.479608;"/>
+    <path clip-path="url(#p1d48955717)" d="M 353.834026 248.390366 
+L 355.189964 245.717293 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.44918;"/>
+    <path clip-path="url(#p1d48955717)" d="M 355.189964 245.717293 
+L 356.225855 242.927517 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.439022;"/>
+    <path clip-path="url(#p1d48955717)" d="M 356.225855 242.927517 
+L 356.998186 239.973631 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.446372;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.625404 241.873303 
+L 375.634725 240.29131 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.214318;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.634725 240.29131 
+L 373.74686 238.456676 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.220586;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.74686 238.456676 
+L 371.978121 236.373954 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.242607;"/>
+    <path clip-path="url(#p1d48955717)" d="M 371.978121 236.373954 
+L 370.342492 234.065563 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.265809;"/>
+    <path clip-path="url(#p1d48955717)" d="M 370.342492 234.065563 
+L 368.853144 231.551577 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.30695;"/>
+    <path clip-path="url(#p1d48955717)" d="M 368.853144 231.551577 
+L 367.514189 228.853214 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.3281;"/>
+    <path clip-path="url(#p1d48955717)" d="M 367.514189 228.853214 
+L 366.34036 225.996526 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.355358;"/>
+    <path clip-path="url(#p1d48955717)" d="M 361.603781 247.282759 
+L 361.603781 247.282759 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.179093;"/>
+    <path clip-path="url(#p1d48955717)" d="M 361.603781 247.282759 
+L 361.603781 247.282759 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.179093;"/>
+    <path clip-path="url(#p1d48955717)" d="M 361.603781 247.282759 
+L 361.958183 244.609927 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.179093;"/>
+    <path clip-path="url(#p1d48955717)" d="M 361.958183 244.609927 
+L 362.079914 241.931223 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.229952;"/>
+    <path clip-path="url(#p1d48955717)" d="M 362.079914 241.931223 
+L 362.018663 238.673513 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.281881;"/>
+    <path clip-path="url(#p1d48955717)" d="M 362.018663 238.673513 
+L 361.81017 235.339324 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.344999;"/>
+    <path clip-path="url(#p1d48955717)" d="M 350.279768 245.033351 
+L 351.659467 242.372157 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.627047;"/>
+    <path clip-path="url(#p1d48955717)" d="M 351.659467 242.372157 
+L 352.832644 239.501258 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.612091;"/>
+    <path clip-path="url(#p1d48955717)" d="M 352.832644 239.501258 
+L 353.802219 236.457848 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.610818;"/>
+    <path clip-path="url(#p1d48955717)" d="M 353.802219 236.457848 
+L 354.588309 233.299862 
+" style="fill:none;stroke:#1f77b4;stroke-width:1.610642;"/>
    </g>
    <g id="patch_3">
-    <path clip-path="url(#p90d2bc968c)" d="M 351.373494 279.464085 
-Q 352.051893 279.396298 348.785438 279.722691 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:3.545955;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 344.606403 278.130312 
-L 348.785438 279.722691 
-L 345.004114 282.110492 
-L 344.606403 278.130312 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:3.545955;"/>
+    <path clip-path="url(#p1d48955717)" d="M 351.382687 279.369082 
+Q 351.94638 279.314489 350.466088 279.457853 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.836749;"/>
+    <path clip-path="url(#p1d48955717)" d="M 346.291922 277.852756 
+L 350.466088 279.457853 
+L 346.677511 281.834128 
+L 346.291922 277.852756 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.836749;"/>
    </g>
    <g id="patch_4">
-    <path clip-path="url(#p90d2bc968c)" d="M 357.568925 281.56543 
-Q 358.2489 281.559783 355.854857 281.579664 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.74958;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 351.838387 279.612948 
-L 355.854857 281.579664 
-L 351.871603 283.61281 
-L 351.838387 279.612948 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.74958;"/>
+    <path clip-path="url(#p1d48955717)" d="M 354.179716 281.32495 
+Q 354.744455 281.301821 353.333938 281.359588 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.768204;"/>
+    <path clip-path="url(#p1d48955717)" d="M 349.255448 279.524944 
+L 353.333938 281.359588 
+L 349.419128 283.521594 
+L 349.255448 279.524944 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.768204;"/>
    </g>
    <g id="patch_5">
-    <path clip-path="url(#p90d2bc968c)" d="M 367.938034 272.226644 
-Q 368.615883 272.16294 368.603917 272.164064 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.619709;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 364.434329 270.547109 
-L 368.603917 272.164064 
-L 364.8086 274.529561 
-L 364.434329 270.547109 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.619709;"/>
+    <path clip-path="url(#p1d48955717)" d="M 368.15644 276.193259 
+Q 368.719438 276.246956 368.329186 276.209735 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.856483;"/>
+    <path clip-path="url(#p1d48955717)" d="M 364.537146 273.838988 
+L 368.329186 276.209735 
+L 364.157365 277.820918 
+L 364.537146 273.838988 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.856483;"/>
    </g>
    <g id="patch_6">
-    <path clip-path="url(#p90d2bc968c)" d="M 388.692185 273.706443 
-Q 388.456519 273.997971 388.545678 273.887678 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.462144;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 392.615683 272.034285 
-L 388.545678 273.887678 
-L 389.504967 269.519639 
-L 392.615683 272.034285 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.462144;"/>
+    <path clip-path="url(#p1d48955717)" d="M 357.772558 273.419313 
+Q 358.332981 273.317525 357.41233 273.48474 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.346387;"/>
+    <path clip-path="url(#p1d48955717)" d="M 353.11931 272.23175 
+L 357.41233 273.48474 
+L 353.834126 276.167361 
+L 353.11931 272.23175 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.346387;"/>
    </g>
    <g id="patch_7">
-    <path clip-path="url(#p90d2bc968c)" d="M 392.550138 275.566826 
-Q 392.247014 275.923929 392.524925 275.596529 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.803067;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 396.638219 273.841304 
-L 392.524925 275.596529 
-L 393.588721 271.252759 
-L 396.638219 273.841304 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.803067;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.891116 272.503087 
+Q 387.607012 272.78251 387.856766 272.536871 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.669742;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.111007 271.157947 
+L 387.856766 272.536871 
+L 389.306171 268.306124 
+L 392.111007 271.157947 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.669742;"/>
    </g>
    <g id="patch_8">
-    <path clip-path="url(#p90d2bc968c)" d="M 395.347107 277.071837 
-Q 395.007836 277.467875 395.46259 276.937031 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.091636;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 399.583787 275.200443 
-L 395.46259 276.937031 
-L 396.546038 272.598121 
-L 399.583787 275.200443 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.091636;"/>
+    <path clip-path="url(#p1d48955717)" d="M 390.127321 275.450113 
+Q 389.860238 275.79936 390.147557 275.423652 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.816295;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.166117 273.461209 
+L 390.147557 275.423652 
+L 390.988739 271.031339 
+L 394.166117 273.461209 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.816295;"/>
    </g>
    <g id="patch_9">
-    <path clip-path="url(#p90d2bc968c)" d="M 385.078236 270.211414 
-Q 384.797307 270.460417 384.695109 270.551002 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.213619;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.015116 269.394481 
-L 384.695109 270.551002 
-L 386.361896 266.401083 
-L 389.015116 269.394481 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.213619;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.373683 277.117778 
+Q 392.085727 277.506844 392.425047 277.048379 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.943094;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.412263 275.023012 
+L 392.425047 277.048379 
+L 393.197083 272.643386 
+L 396.412263 275.023012 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.943094;"/>
    </g>
    <g id="patch_10">
-    <path clip-path="url(#p90d2bc968c)" d="M 365.63134 232.299056 
-Q 365.403393 231.348706 365.662099 232.427296 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.866211;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 364.650222 236.783453 
-L 365.662099 232.427296 
-L 368.539899 235.850492 
-L 364.650222 236.783453 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.866211;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.823386 267.363374 
+Q 387.280406 267.566853 387.478165 267.492743 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.707531;"/>
+    <path clip-path="url(#p1d48955717)" d="M 391.925624 267.9619 
+L 387.478165 267.492743 
+L 390.521966 264.21627 
+L 391.925624 267.9619 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.707531;"/>
    </g>
    <g id="patch_11">
-    <path clip-path="url(#p90d2bc968c)" d="M 386.849172 256.743253 
-Q 386.175586 256.615363 386.491067 256.675261 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.900453;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 390.047799 259.386286 
-L 386.491067 256.675261 
-L 390.793926 255.456491 
-L 390.047799 259.386286 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.900453;"/>
+    <path clip-path="url(#p1d48955717)" d="M 364.991464 233.51174 
+Q 364.791283 232.72564 364.964776 233.40694 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.35437;"/>
+    <path clip-path="url(#p1d48955717)" d="M 364.013727 237.776781 
+L 364.964776 233.40694 
+L 367.890019 236.789684 
+L 364.013727 237.776781 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.35437;"/>
    </g>
    <g id="patch_12">
-    <path clip-path="url(#p90d2bc968c)" d="M 381.584469 249.773437 
-Q 380.95206 249.411006 381.334172 249.629993 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.045867;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 383.810192 253.354147 
-L 381.334172 249.629993 
-L 385.799107 249.883669 
-L 383.810192 253.354147 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.045867;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.159192 257.435202 
+Q 382.606325 257.276023 382.89393 257.358829 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.782279;"/>
+    <path clip-path="url(#p1d48955717)" d="M 386.184431 260.387461 
+L 382.89393 257.358829 
+L 387.291136 256.543608 
+L 386.184431 260.387461 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.782279;"/>
    </g>
    <g id="patch_13">
-    <path clip-path="url(#p90d2bc968c)" d="M 384.254125 245.8605 
-Q 383.604274 245.567615 384.581237 246.007928 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.59602;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 387.406188 249.474864 
-L 384.581237 246.007928 
-L 389.049757 245.828128 
-L 387.406188 249.474864 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.59602;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.866547 250.925347 
+Q 378.355267 250.573493 378.683952 250.799688 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.912;"/>
+    <path clip-path="url(#p1d48955717)" d="M 380.845248 254.714888 
+L 378.683952 250.799688 
+L 383.11289 251.419771 
+L 380.845248 254.714888 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.912;"/>
    </g>
    <g id="patch_14">
-    <path clip-path="url(#p90d2bc968c)" d="M 389.608578 242.863747 
-Q 388.940893 242.672768 390.936611 243.243607 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.477754;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 394.232377 246.266508 
-L 390.936611 243.243607 
-L 395.332391 242.420735 
-L 394.232377 246.266508 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.477754;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.231686 248.562227 
+Q 382.688543 248.334614 383.34029 248.607739 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.158793;"/>
+    <path clip-path="url(#p1d48955717)" d="M 386.256448 251.998318 
+L 383.34029 248.607739 
+L 387.802448 248.30916 
+L 386.256448 251.998318 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.158793;"/>
    </g>
    <g id="patch_15">
-    <path clip-path="url(#p90d2bc968c)" d="M 374.530703 229.762486 
-Q 374.000131 229.135294 374.796076 230.076185 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.83707;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 375.852551 234.421742 
-L 374.796076 230.076185 
-L 378.906406 231.838339 
-L 375.852551 234.421742 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.83707;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.927606 246.42952 
+Q 389.36872 246.307507 390.475932 246.549227 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.525303;"/>
+    <path clip-path="url(#p1d48955717)" d="M 393.957307 249.356365 
+L 390.475932 246.549227 
+L 394.810468 245.448409 
+L 393.957307 249.356365 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.525303;"/>
    </g>
    <g id="patch_16">
-    <path clip-path="url(#p90d2bc968c)" d="M 379.265667 229.313891 
-Q 378.660532 228.855473 379.896484 229.791763 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.065878;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 381.877216 233.80134 
-L 379.896484 229.791763 
-L 384.292584 230.612924 
-L 381.877216 233.80134 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.065878;"/>
+    <path clip-path="url(#p1d48955717)" d="M 371.424299 231.352903 
+Q 371.022667 230.764599 371.456471 231.400028 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.325284;"/>
+    <path clip-path="url(#p1d48955717)" d="M 372.060013 235.83125 
+L 371.456471 231.400028 
+L 375.363574 233.575927 
+L 372.060013 235.83125 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.325284;"/>
    </g>
    <g id="patch_17">
-    <path clip-path="url(#p90d2bc968c)" d="M 384.367318 227.810217 
-Q 383.722892 227.489839 385.604288 228.42518 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.522951;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 388.295722 231.99676 
-L 385.604288 228.42518 
-L 390.076413 228.414981 
-L 388.295722 231.99676 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.522951;"/>
+    <path clip-path="url(#p1d48955717)" d="M 379.082852 234.623553 
+Q 378.571208 234.268554 379.354164 234.8118 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.40935;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.500456 238.735247 
+L 379.354164 234.8118 
+L 383.780697 235.448835 
+L 381.500456 238.735247 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.40935;"/>
    </g>
    <g id="patch_18">
-    <path clip-path="url(#p90d2bc968c)" d="M 374.57988 216.75622 
-Q 374.08244 216.130921 374.631523 216.821137 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.50354;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 375.5566 221.19655 
-L 374.631523 216.821137 
-L 378.686899 218.706323 
-L 375.5566 221.19655 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.50354;"/>
+    <path clip-path="url(#p1d48955717)" d="M 373.21478 225.998873 
+Q 372.777042 225.46983 373.299826 226.101659 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.347657;"/>
+    <path clip-path="url(#p1d48955717)" d="M 374.308865 230.458474 
+L 373.299826 226.101659 
+L 377.390702 227.908517 
+L 374.308865 230.458474 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.347657;"/>
    </g>
    <g id="patch_19">
-    <path clip-path="url(#p90d2bc968c)" d="M 386.982975 220.49202 
-Q 386.325751 220.233076 388.405872 221.052634 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.631535;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 391.394295 224.379694 
-L 388.405872 221.052634 
-L 392.860573 220.658132 
-L 391.394295 224.379694 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.631535;"/>
+    <path clip-path="url(#p1d48955717)" d="M 379.120525 227.317416 
+Q 378.608755 226.962691 379.433006 227.534008 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.453961;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.581167 231.456431 
+L 379.433006 227.534008 
+L 383.859842 228.168934 
+L 381.581167 231.456431 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.453961;"/>
    </g>
    <g id="patch_20">
-    <path clip-path="url(#p90d2bc968c)" d="M 389.63143 217.231067 
-Q 388.965383 217.027143 391.306211 217.743837 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.812663;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 394.545445 220.827238 
-L 391.306211 217.743837 
-L 395.716473 217.002491 
-L 394.545445 220.827238 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.812663;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.228932 225.002764 
+Q 380.702675 224.697416 381.633926 225.237752 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.507186;"/>
+    <path clip-path="url(#p1d48955717)" d="M 384.089983 228.975102 
+L 381.633926 225.237752 
+L 386.09744 225.515316 
+L 384.089983 228.975102 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.507186;"/>
    </g>
    <g id="patch_21">
-    <path clip-path="url(#p90d2bc968c)" d="M 381.699889 210.320101 
-Q 381.068317 209.951764 381.789142 210.372154 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.400306;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 384.236868 214.114966 
-L 381.789142 210.372154 
-L 386.252027 210.659661 
-L 384.236868 214.114966 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.400306;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.102345 217.26522 
+Q 374.639769 216.786416 375.148597 217.313095 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.250479;"/>
+    <path clip-path="url(#p1d48955717)" d="M 376.489475 221.579481 
+L 375.148597 217.313095 
+L 379.366232 218.800224 
+L 376.489475 221.579481 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.250479;"/>
    </g>
    <g id="patch_22">
-    <path clip-path="url(#p90d2bc968c)" d="M 395.001004 210.142562 
-Q 394.324241 210.044551 396.984624 210.429836 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:3.015974;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 400.65667 212.982498 
-L 396.984624 210.429836 
-L 401.229981 209.023796 
-L 400.65667 212.982498 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:3.015974;"/>
+    <path clip-path="url(#p1d48955717)" d="M 381.208806 218.15359 
+Q 380.681498 217.852548 381.531947 218.338073 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.418987;"/>
+    <path clip-path="url(#p1d48955717)" d="M 384.014112 222.058135 
+L 381.531947 218.338073 
+L 385.997295 218.584378 
+L 384.014112 222.058135 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.418987;"/>
    </g>
    <g id="patch_23">
-    <path clip-path="url(#p90d2bc968c)" d="M 381.585794 203.051034 
-Q 380.950444 202.704797 381.094837 202.783484 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.794259;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 383.650128 206.453701 
-L 381.094837 202.783484 
-L 385.564185 202.941381 
-L 383.650128 206.453701 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.794259;"/>
+    <path clip-path="url(#p1d48955717)" d="M 377.024716 212.235508 
+Q 376.53687 211.815419 377.023559 212.234511 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.150286;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.749589 216.360141 
+L 377.023559 212.234511 
+L 381.359681 213.329065 
+L 378.749589 216.360141 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.150286;"/>
    </g>
    <g id="patch_24">
-    <path clip-path="url(#p90d2bc968c)" d="M 392.275126 201.852391 
-Q 391.596521 201.792281 392.889235 201.906789 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.770105;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 396.697167 204.251924 
-L 392.889235 201.906789 
-L 397.050102 200.267524 
-L 396.697167 204.251924 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.770105;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.721461 214.067149 
+Q 387.16821 213.897162 388.28397 214.23998 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.561683;"/>
+    <path clip-path="url(#p1d48955717)" d="M 391.520163 217.326573 
+L 388.28397 214.23998 
+L 392.694961 213.502981 
+L 391.520163 217.326573 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.561683;"/>
    </g>
    <g id="patch_25">
-    <path clip-path="url(#p90d2bc968c)" d="M 386.846366 197.832722 
-Q 386.170462 197.732672 386.37462 197.762892 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.795728;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 390.038646 200.327052 
-L 386.37462 197.762892 
-L 390.624364 196.370167 
-L 390.038646 200.327052 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.795728;"/>
+    <path clip-path="url(#p1d48955717)" d="M 378.935648 204.329596 
+Q 378.424286 203.980693 378.727793 204.187776 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.88233;"/>
+    <path clip-path="url(#p1d48955717)" d="M 380.904742 208.094296 
+L 378.727793 204.187776 
+L 383.159178 204.79013 
+L 380.904742 208.094296 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.88233;"/>
    </g>
    <g id="patch_26">
-    <path clip-path="url(#p90d2bc968c)" d="M 389.599246 194.610873 
-Q 388.920846 194.631712 389.209935 194.622832 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.865756;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 393.269456 196.499076 
-L 389.209935 194.622832 
-L 393.146643 192.500961 
-L 393.269456 196.499076 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.865756;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.16645 205.044105 
+Q 391.603276 204.979373 392.688655 205.104128 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.484219;"/>
+    <path clip-path="url(#p1d48955717)" d="M 396.434111 207.547806 
+L 392.688655 205.104128 
+L 396.890871 203.57397 
+L 396.434111 207.547806 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.484219;"/>
    </g>
    <g id="patch_27">
-    <path clip-path="url(#p90d2bc968c)" d="M 395.054816 190.128265 
-Q 394.386293 190.305298 395.063773 190.125893 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.245398;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 399.44247 191.035294 
-L 395.063773 190.125893 
-L 398.418512 187.168576 
-L 399.44247 191.035294 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.245398;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.406205 201.018164 
+Q 384.848398 200.890836 385.37918 201.011995 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.998709;"/>
+    <path clip-path="url(#p1d48955717)" d="M 388.833792 203.852006 
+L 385.37918 201.011995 
+L 389.723956 199.952312 
+L 388.833792 203.852006 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.998709;"/>
    </g>
    <g id="patch_28">
-    <path clip-path="url(#p90d2bc968c)" d="M 390.279206 185.722171 
-Q 389.638116 186.045947 389.566904 186.081912 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.571031;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 394.039004 186.063917 
-L 389.566904 186.081912 
-L 392.235767 182.493435 
-L 394.039004 186.063917 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.571031;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.907152 198.559079 
+Q 389.342879 198.534028 390.045138 198.565205 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.133937;"/>
+    <path clip-path="url(#p1d48955717)" d="M 393.952497 200.740649 
+L 390.045138 198.565205 
+L 394.129908 196.744585 
+L 393.952497 200.740649 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.133937;"/>
    </g>
    <g id="patch_29">
-    <path clip-path="url(#p90d2bc968c)" d="M 385.279428 182.726387 
-Q 384.979542 183.126133 384.847456 183.302203 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.250101;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 388.847702 181.302696 
-L 384.847456 183.302203 
-L 385.647998 178.902301 
-L 388.847702 181.302696 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.250101;"/>
+    <path clip-path="url(#p1d48955717)" d="M 387.670687 195.666446 
+Q 387.106756 195.65541 387.555079 195.664184 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.90556;"/>
+    <path clip-path="url(#p1d48955717)" d="M 391.515181 197.742065 
+L 387.555079 195.664184 
+L 391.593445 193.74283 
+L 391.515181 197.742065 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.90556;"/>
    </g>
    <g id="patch_30">
-    <path clip-path="url(#p90d2bc968c)" d="M 374.890235 181.417407 
-Q 375.370618 181.596734 375.584878 181.676718 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.254073;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 372.536925 178.404107 
-L 375.584878 181.676718 
-L 371.138017 182.151514 
-L 372.536925 178.404107 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.254073;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.450448 191.890302 
+Q 393.891196 192.00741 394.615499 191.85574 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.172946;"/>
+    <path clip-path="url(#p1d48955717)" d="M 398.940496 192.993457 
+L 394.615499 191.85574 
+L 398.120671 189.078373 
+L 398.940496 192.993457 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.172946;"/>
    </g>
    <g id="patch_31">
-    <path clip-path="url(#p90d2bc968c)" d="M 344.972777 184.844065 
-Q 345.640846 184.656862 342.338615 185.582197 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:3.687928;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 337.947331 184.735664 
-L 342.338615 185.582197 
-L 339.026618 188.587305 
-L 337.947331 184.735664 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:3.687928;"/>
+    <path clip-path="url(#p1d48955717)" d="M 388.067347 188.311933 
+Q 387.519743 188.492533 387.737642 188.42067 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.720963;"/>
+    <path clip-path="url(#p1d48955717)" d="M 392.162796 189.067211 
+L 387.737642 188.42067 
+L 390.909968 185.268472 
+L 392.162796 189.067211 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.720963;"/>
    </g>
    <g id="patch_32">
-    <path clip-path="url(#p90d2bc968c)" d="M 338.782928 183.361605 
-Q 339.452654 183.187477 335.126474 184.312276 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:4.617037;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 330.751918 183.383159 
-L 335.126474 184.312276 
-L 331.758446 187.254451 
-L 330.751918 183.383159 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:4.617037;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.91486 184.414689 
+Q 385.41874 184.785784 385.422567 184.782922 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.55842;"/>
+    <path clip-path="url(#p1d48955717)" d="M 389.82359 183.988567 
+L 385.422567 184.782922 
+L 387.427698 180.785491 
+L 389.82359 183.988567 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.55842;"/>
    </g>
    <g id="patch_33">
-    <path clip-path="url(#p90d2bc968c)" d="M 332.821601 182.14168 
-Q 333.49262 181.977261 328.412089 183.222139 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:5.296523;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 324.051039 182.231558 
-L 328.412089 183.222139 
-L 325.002995 186.11663 
-L 324.051039 182.231558 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:5.296523;"/>
+    <path clip-path="url(#p1d48955717)" d="M 376.925272 182.421184 
+Q 377.170812 182.636606 377.125854 182.597163 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.345653;"/>
+    <path clip-path="url(#p1d48955717)" d="M 375.43804 178.455753 
+L 377.125854 182.597163 
+L 372.800037 181.462568 
+L 375.43804 178.455753 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.345653;"/>
    </g>
    <g id="patch_34">
-    <path clip-path="url(#p90d2bc968c)" d="M 350.360011 187.780565 
-Q 351.022016 187.551504 348.833723 188.308679 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.697681;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 344.399631 187.726586 
-L 348.833723 188.308679 
-L 345.707594 191.506696 
-L 344.399631 187.726586 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.697681;"/>
+    <path clip-path="url(#p1d48955717)" d="M 346.103233 184.319206 
+Q 346.659123 184.170666 345.211418 184.55751 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.854945;"/>
+    <path clip-path="url(#p1d48955717)" d="M 340.830694 183.657922 
+L 345.211418 184.55751 
+L 341.863313 187.522336 
+L 340.830694 183.657922 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.854945;"/>
    </g>
    <g id="patch_35">
-    <path clip-path="url(#p90d2bc968c)" d="M 332.126628 200.1826 
-Q 332.743701 199.75893 329.398026 202.056004 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:4.299378;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 324.968416 202.671267 
-L 329.398026 202.056004 
-L 327.232471 205.96885 
-L 324.968416 202.671267 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:4.299378;"/>
+    <path clip-path="url(#p1d48955717)" d="M 336.415525 183.5135 
+Q 336.971528 183.364923 335.169367 183.846503 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.183216;"/>
+    <path clip-path="url(#p1d48955717)" d="M 330.788634 182.946961 
+L 335.169367 183.846503 
+L 331.821294 186.811364 
+L 330.788634 182.946961 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.183216;"/>
    </g>
    <g id="patch_36">
-    <path clip-path="url(#p90d2bc968c)" d="M 332.027956 204.1394 
-Q 332.623068 203.649922 329.489983 206.226878 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:4.317635;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 325.130234 207.223166 
-L 329.489983 206.226878 
-L 327.671164 210.31245 
-L 325.130234 207.223166 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:4.317635;"/>
+    <path clip-path="url(#p1d48955717)" d="M 331.416326 181.926355 
+Q 331.973954 181.790419 330.019139 182.266955 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.313005;"/>
+    <path clip-path="url(#p1d48955717)" d="M 325.659265 181.271216 
+L 330.019139 182.266955 
+L 326.606623 185.157411 
+L 325.659265 181.271216 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.313005;"/>
    </g>
    <g id="patch_37">
-    <path clip-path="url(#p90d2bc968c)" d="M 343.172715 201.043059 
-Q 343.773572 200.57164 341.458003 202.388382 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:3.315565;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 337.076455 203.283948 
-L 341.458003 202.388382 
-L 339.545527 206.43096 
-L 337.076455 203.283948 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:3.315565;"/>
+    <path clip-path="url(#p1d48955717)" d="M 337.454977 190.660881 
+Q 337.99816 190.429849 336.462735 191.08291 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.020342;"/>
+    <path clip-path="url(#p1d48955717)" d="M 331.999054 190.808055 
+L 336.462735 191.08291 
+L 333.564642 194.488942 
+L 331.999054 190.808055 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.020342;"/>
    </g>
    <g id="patch_38">
-    <path clip-path="url(#p90d2bc968c)" d="M 339.833031 209.625047 
-Q 340.375864 209.015947 338.057477 211.617351 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:3.846444;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 333.903059 213.27289 
-L 338.057477 211.617351 
-L 336.889258 215.934209 
-L 333.903059 213.27289 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:3.846444;"/>
+    <path clip-path="url(#p1d48955717)" d="M 330.946952 197.031387 
+Q 331.471883 196.719561 329.99383 197.59757 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.083775;"/>
+    <path clip-path="url(#p1d48955717)" d="M 325.533401 197.920942 
+L 329.99383 197.59757 
+L 327.57627 201.359937 
+L 325.533401 197.920942 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.083775;"/>
    </g>
    <g id="patch_39">
-    <path clip-path="url(#p90d2bc968c)" d="M 333.52381 221.571275 
-Q 334.008475 220.860271 331.5551 224.459376 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:4.665544;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 327.649529 226.638027 
-L 331.5551 224.459376 
-L 330.954678 228.891023 
-L 327.649529 226.638027 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:4.665544;"/>
+    <path clip-path="url(#p1d48955717)" d="M 349.458219 191.645288 
+Q 349.996557 191.389982 348.939498 191.891291 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.579306;"/>
+    <path clip-path="url(#p1d48955717)" d="M 344.468331 191.798225 
+L 348.939498 191.891291 
+L 346.182345 195.412385 
+L 344.468331 191.798225 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.579306;"/>
    </g>
    <g id="patch_40">
-    <path clip-path="url(#p90d2bc968c)" d="M 337.270756 219.914741 
-Q 337.749966 219.19601 335.517338 222.544561 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:4.372354;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 331.634318 224.763153 
-L 335.517338 222.544561 
-L 334.9624 226.982133 
-L 331.634318 224.763153 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:4.372354;"/>
+    <path clip-path="url(#p1d48955717)" d="M 338.251275 202.966238 
+Q 338.744513 202.555533 337.572301 203.531598 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.938422;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.218646 204.554185 
+L 337.572301 203.531598 
+L 335.778178 207.628074 
+L 333.218646 204.554185 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.938422;"/>
    </g>
    <g id="patch_41">
-    <path clip-path="url(#p90d2bc968c)" d="M 335.417963 227.11274 
-Q 335.879269 226.367854 333.632621 229.995589 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:4.600247;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.826248 232.343252 
-L 333.632621 229.995589 
-L 333.226928 234.449285 
-L 329.826248 232.343252 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:4.600247;"/>
+    <path clip-path="url(#p1d48955717)" d="M 345.121777 201.191743 
+Q 345.614481 200.781412 344.62516 201.605332 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.725057;"/>
+    <path clip-path="url(#p1d48955717)" d="M 340.271592 202.628292 
+L 344.62516 201.605332 
+L 342.831387 205.701962 
+L 340.271592 202.628292 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.725057;"/>
    </g>
    <g id="patch_42">
-    <path clip-path="url(#p90d2bc968c)" d="M 335.573471 231.579366 
-Q 336.03352 230.83292 333.813194 234.435483 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:4.569313;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 330.011892 236.791349 
-L 333.813194 234.435483 
-L 333.417105 238.890044 
-L 330.011892 236.791349 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:4.569313;"/>
+    <path clip-path="url(#p1d48955717)" d="M 332.130288 218.140467 
+Q 332.547468 217.571145 331.543417 218.941365 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.150669;"/>
+    <path clip-path="url(#p1d48955717)" d="M 327.565906 220.985725 
+L 331.543417 218.941365 
+L 330.792398 223.349989 
+L 327.565906 220.985725 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.150669;"/>
    </g>
    <g id="patch_43">
-    <path clip-path="url(#p90d2bc968c)" d="M 335.842412 236.252107 
-Q 336.314371 235.522805 334.070795 238.989724 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:4.470562;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 330.218523 241.261286 
-L 334.070795 238.989724 
-L 333.576682 243.43448 
-L 330.218523 241.261286 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:4.470562;"/>
+    <path clip-path="url(#p1d48955717)" d="M 332.057613 221.524137 
+Q 332.461534 220.933579 331.49732 222.343318 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.167576;"/>
+    <path clip-path="url(#p1d48955717)" d="M 327.588332 224.515829 
+L 331.49732 222.343318 
+L 330.889936 226.774016 
+L 327.588332 224.515829 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.167576;"/>
    </g>
    <g id="patch_44">
-    <path clip-path="url(#p90d2bc968c)" d="M 348.290814 219.329298 
-Q 348.685372 218.50565 347.495802 220.988903 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:3.279641;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 343.963979 223.732299 
-L 347.495802 220.988903 
-L 347.571425 225.460399 
-L 343.963979 223.732299 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:3.279641;"/>
+    <path clip-path="url(#p1d48955717)" d="M 340.074396 213.123658 
+Q 340.49678 212.563706 339.597816 213.755458 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.962535;"/>
+    <path clip-path="url(#p1d48955717)" d="M 335.592312 215.744412 
+L 339.597816 213.755458 
+L 338.785677 218.153234 
+L 335.592312 215.744412 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.962535;"/>
    </g>
    <g id="patch_45">
-    <path clip-path="url(#p90d2bc968c)" d="M 348.725267 234.855904 
-Q 349.075648 233.989181 348.050587 236.524831 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:3.282435;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 344.6972 239.483681 
-L 348.050587 236.524831 
-L 348.405635 240.982851 
-L 344.6972 239.483681 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:3.282435;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.603 226.048915 
+Q 333.990663 225.434306 333.090991 226.860663 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.158292;"/>
+    <path clip-path="url(#p1d48955717)" d="M 329.265418 229.176908 
+L 333.090991 226.860663 
+L 332.648643 231.310869 
+L 329.265418 229.176908 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.158292;"/>
    </g>
    <g id="patch_46">
-    <path clip-path="url(#p90d2bc968c)" d="M 348.459516 245.290371 
-Q 348.908153 244.532794 347.67586 246.613669 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.95057;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 343.916772 249.036325 
-L 347.67586 246.613669 
-L 347.358531 251.074533 
-L 343.916772 249.036325 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.95057;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.670471 229.647943 
+Q 334.055727 229.029993 333.163998 230.460322 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.158914;"/>
+    <path clip-path="url(#p1d48955717)" d="M 329.350621 232.796591 
+L 333.163998 230.460322 
+L 332.744987 234.912785 
+L 329.350621 232.796591 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.158914;"/>
    </g>
    <g id="patch_47">
-    <path clip-path="url(#p90d2bc968c)" d="M 356.271881 241.692248 
-Q 356.47821 240.924507 356.034368 242.576024 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.24063;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 353.064749 245.919878 
-L 356.034368 242.576024 
-L 356.92768 246.958032 
-L 353.064749 245.919878 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.24063;"/>
+    <path clip-path="url(#p1d48955717)" d="M 333.806988 233.360112 
+Q 334.196279 232.747919 333.297464 234.161382 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.147092;"/>
+    <path clip-path="url(#p1d48955717)" d="M 329.463406 236.463555 
+L 333.297464 234.161382 
+L 332.838768 238.609932 
+L 329.463406 236.463555 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.147092;"/>
    </g>
    <g id="patch_48">
-    <path clip-path="url(#p90d2bc968c)" d="M 358.930858 251.972866 
-Q 359.236472 251.347761 358.803391 252.233586 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.504282;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 355.249755 254.948668 
-L 358.803391 252.233586 
-L 358.843275 256.705544 
-L 355.249755 254.948668 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.504282;"/>
+    <path clip-path="url(#p1d48955717)" d="M 345.77926 216.71182 
+Q 346.141883 216.065404 345.499945 217.209731 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.836497;"/>
+    <path clip-path="url(#p1d48955717)" d="M 341.798657 219.719805 
+L 345.499945 217.209731 
+L 345.287231 221.676806 
+L 341.798657 219.719805 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.836497;"/>
    </g>
    <g id="patch_49">
-    <path clip-path="url(#p90d2bc968c)" d="M 356.211702 264.971316 
-Q 356.851258 264.635683 355.789002 265.193145 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.71902;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 351.317728 265.280948 
-L 355.789002 265.193145 
-L 353.17648 268.822846 
-L 351.317728 265.280948 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.71902;"/>
+    <path clip-path="url(#p1d48955717)" d="M 332.499142 243.274123 
+Q 332.932471 242.733088 331.89202 244.032147 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.108643;"/>
+    <path clip-path="url(#p1d48955717)" d="M 327.830445 245.903939 
+L 331.89202 244.032147 
+L 330.952509 248.404483 
+L 327.830445 245.903939 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.108643;"/>
    </g>
    <g id="patch_50">
-    <path clip-path="url(#p90d2bc968c)" d="M 337.784514 276.439978 
-Q 338.458335 276.302818 333.498792 277.312365 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:5.141964;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 329.180241 276.15042 
-L 333.498792 277.312365 
-L 329.978105 280.070039 
-L 329.180241 276.15042 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:5.141964;"/>
+    <path clip-path="url(#p1d48955717)" d="M 348.44464 227.231824 
+Q 348.720391 226.49558 348.284345 227.659804 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.815143;"/>
+    <path clip-path="url(#p1d48955717)" d="M 345.008428 230.704204 
+L 348.284345 227.659804 
+L 348.754314 232.107178 
+L 345.008428 230.704204 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.815143;"/>
    </g>
    <g id="patch_51">
-    <path clip-path="url(#p90d2bc968c)" d="M 379.688385 270.317481 
-Q 379.731035 270.544834 379.765676 270.729493 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.038853;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 380.993879 266.429317 
-L 379.765676 270.729493 
-L 377.062457 267.166825 
-L 380.993879 266.429317 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.038853;"/>
+    <path clip-path="url(#p1d48955717)" d="M 353.001574 233.2118 
+Q 353.198984 232.421545 352.945746 233.435286 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.663125;"/>
+    <path clip-path="url(#p1d48955717)" d="M 350.03594 236.831318 
+L 352.945746 233.435286 
+L 353.916688 237.800749 
+L 350.03594 236.831318 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.663125;"/>
    </g>
    <g id="patch_52">
-    <path clip-path="url(#p90d2bc968c)" d="M 344.869272 194.341916 
-Q 345.507553 193.995758 343.024292 195.342502 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:3.176155;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 338.554633 195.491339 
-L 343.024292 195.342502 
-L 340.461566 199.007531 
-L 338.554633 195.491339 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:3.176155;"/>
+    <path clip-path="url(#p1d48955717)" d="M 353.87215 243.560175 
+Q 354.139475 242.821485 353.828968 243.679497 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.518775;"/>
+    <path clip-path="url(#p1d48955717)" d="M 350.587154 246.760186 
+L 353.828968 243.679497 
+L 354.348431 248.121361 
+L 350.587154 246.760186 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.518775;"/>
    </g>
    <g id="patch_53">
-    <path clip-path="url(#p90d2bc968c)" d="M 341.677236 240.796421 
-Q 342.143529 240.060255 340.309737 242.955376 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:3.844646;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 336.479768 245.264344 
-L 340.309737 242.955376 
-L 339.85893 247.404732 
-L 336.479768 245.264344 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:3.844646;"/>
+    <path clip-path="url(#p1d48955717)" d="M 355.652972 251.509908 
+Q 356.015007 250.870143 355.644107 251.525574 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.331083;"/>
+    <path clip-path="url(#p1d48955717)" d="M 351.933487 254.021832 
+L 355.644107 251.525574 
+L 355.414741 255.991824 
+L 351.933487 254.021832 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.331083;"/>
    </g>
    <g id="patch_54">
-    <path clip-path="url(#p90d2bc968c)" d="M 365.409176 264.096079 
-Q 365.894568 263.727117 365.821808 263.782424 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.62708;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 361.427061 264.610796 
-L 365.821808 263.782424 
-L 363.847657 267.795245 
-L 361.427061 264.610796 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.62708;"/>
+    <path clip-path="url(#p1d48955717)" d="M 361.739432 253.669025 
+Q 361.957669 253.112083 361.753849 253.632234 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.034702;"/>
+    <path clip-path="url(#p1d48955717)" d="M 358.432353 256.62684 
+L 361.753849 253.632234 
+L 362.156636 258.086194 
+L 358.432353 256.62684 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.034702;"/>
    </g>
    <g id="patch_55">
-    <path clip-path="url(#p90d2bc968c)" d="M 371.278365 265.342317 
-Q 371.548317 265.104578 371.646084 265.018478 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.205215;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 367.322405 266.161196 
-L 371.646084 265.018478 
-L 369.966051 269.163052 
-L 367.322405 266.161196 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.205215;"/>
+    <path clip-path="url(#p1d48955717)" d="M 359.833094 265.83216 
+Q 360.366471 265.561636 359.83616 265.830605 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.066765;"/>
+    <path clip-path="url(#p1d48955717)" d="M 355.364097 265.856254 
+L 359.83616 265.830605 
+L 357.173442 269.423644 
+L 355.364097 265.856254 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.066765;"/>
    </g>
    <g id="patch_56">
-    <path clip-path="url(#p90d2bc968c)" d="M 377.173722 267.160726 
-Q 377.212068 267.077724 377.237624 267.022408 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.027278;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 373.744427 269.814822 
-L 377.237624 267.022408 
-L 377.375637 271.492414 
-L 373.744427 269.814822 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.027278;"/>
+    <path clip-path="url(#p1d48955717)" d="M 394.34265 212.325517 
+Q 393.780685 212.238424 395.222956 212.461947 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.814045;"/>
+    <path clip-path="url(#p1d48955717)" d="M 398.869464 215.05096 
+L 395.222956 212.461947 
+L 399.482071 211.098149 
+L 398.869464 215.05096 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.814045;"/>
    </g>
    <g id="patch_57">
-    <path clip-path="url(#p90d2bc968c)" d="M 386.526203 265.95734 
-Q 385.85663 266.112354 385.570352 266.178631 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.351896;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 389.918374 267.224911 
-L 385.570352 266.178631 
-L 389.01619 263.327981 
-L 389.918374 267.224911 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.351896;"/>
+    <path clip-path="url(#p1d48955717)" d="M 354.929797 186.092771 
+Q 355.484375 185.93221 354.531706 186.208026 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.403486;"/>
+    <path clip-path="url(#p1d48955717)" d="M 350.133299 185.39931 
+L 354.531706 186.208026 
+L 351.24569 189.241522 
+L 350.133299 185.39931 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.403486;"/>
    </g>
    <g id="patch_58">
-    <path clip-path="url(#p90d2bc968c)" d="M 352.425543 204.629297 
-Q 352.955354 203.99751 351.855116 205.309519 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.268992;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 347.752407 207.089346 
-L 351.855116 205.309519 
-L 350.817353 209.659582 
-L 347.752407 207.089346 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.268992;"/>
+    <path clip-path="url(#p1d48955717)" d="M 331.665981 249.161215 
+Q 332.134959 248.691601 330.959369 249.868785 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.081644;"/>
+    <path clip-path="url(#p1d48955717)" d="M 326.717687 251.285873 
+L 330.959369 249.868785 
+L 329.54803 254.112383 
+L 326.717687 251.285873 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.081644;"/>
    </g>
    <g id="patch_59">
-    <path clip-path="url(#p90d2bc968c)" d="M 362.172563 253.194637 
-Q 362.399692 252.616228 362.161831 253.221967 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.137866;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 358.838177 256.214178 
-L 362.161831 253.221967 
-L 362.561407 257.676217 
-L 358.838177 256.214178 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.137866;"/>
+    <path clip-path="url(#p1d48955717)" d="M 346.039218 240.074969 
+Q 346.384993 239.408661 345.792693 240.550025 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.821575;"/>
+    <path clip-path="url(#p1d48955717)" d="M 342.175039 243.179204 
+L 345.792693 240.550025 
+L 345.725444 245.021655 
+L 342.175039 243.179204 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.821575;"/>
    </g>
    <g id="patch_60">
-    <path clip-path="url(#p90d2bc968c)" d="M 346.697143 252.672 
-Q 347.248156 252.082024 345.561247 253.888216 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.932565;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 341.369343 255.4464 
-L 345.561247 253.888216 
-L 344.292651 258.17665 
-L 341.369343 255.4464 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.932565;"/>
+    <path clip-path="url(#p1d48955717)" d="M 383.087999 275.432599 
+Q 383.070274 275.798233 383.079065 275.616898 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.489799;"/>
+    <path clip-path="url(#p1d48955717)" d="M 385.270407 271.718435 
+L 383.079065 275.616898 
+L 381.2751 271.524746 
+L 385.270407 271.718435 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.489799;"/>
    </g>
    <g id="patch_61">
-    <path clip-path="url(#p90d2bc968c)" d="M 354.406075 250.01581 
-Q 354.806608 249.322212 354.049675 250.632984 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.070213;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 350.317401 253.096747 
-L 354.049675 250.632984 
-L 353.781322 255.097061 
-L 350.317401 253.096747 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:2.070213;"/>
+    <path clip-path="url(#p1d48955717)" d="M 382.963086 266.167269 
+Q 382.410374 266.269276 382.31661 266.28658 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.417429;"/>
+    <path clip-path="url(#p1d48955717)" d="M 386.613162 267.527402 
+L 382.31661 266.28658 
+L 385.887199 263.593831 
+L 386.613162 267.527402 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.417429;"/>
    </g>
    <g id="patch_62">
-    <path clip-path="url(#p90d2bc968c)" d="M 370.95266 230.585303 
-Q 370.530812 229.842998 371.09115 230.828997 
-" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.778027;"/>
-    <path clip-path="url(#p90d2bc968c)" d="M 371.328657 235.294822 
-L 371.09115 230.828997 
-L 374.806314 233.318486 
-L 371.328657 235.294822 
-z
-" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.778027;"/>
+    <path clip-path="url(#p1d48955717)" d="M 369.14514 262.921131 
+Q 369.359022 262.615966 369.232699 262.796203 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.530173;"/>
+    <path clip-path="url(#p1d48955717)" d="M 365.299141 264.923907 
+L 369.232699 262.796203 
+L 368.574727 267.219671 
+L 365.299141 264.923907 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.530173;"/>
    </g>
    <g id="patch_63">
+    <path clip-path="url(#p1d48955717)" d="M 372.019389 265.499509 
+Q 372.213366 265.291982 372.149912 265.359867 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.337191;"/>
+    <path clip-path="url(#p1d48955717)" d="M 367.957384 266.916372 
+L 372.149912 265.359867 
+L 370.879599 269.647793 
+L 367.957384 266.916372 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.337191;"/>
+   </g>
+   <g id="patch_64">
+    <path clip-path="url(#p1d48955717)" d="M 372.543176 268.895889 
+Q 372.938162 268.81125 372.941428 268.81055 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.358319;"/>
+    <path clip-path="url(#p1d48955717)" d="M 368.611162 267.693052 
+L 372.941428 268.81055 
+L 369.44927 271.604263 
+L 368.611162 267.693052 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.358319;"/>
+   </g>
+   <g id="patch_65">
+    <path clip-path="url(#p1d48955717)" d="M 345.432711 227.342485 
+Q 345.746154 226.639944 345.193327 227.879031 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.901651;"/>
+    <path clip-path="url(#p1d48955717)" d="M 341.737092 230.717065 
+L 345.193327 227.879031 
+L 345.390013 232.34684 
+L 341.737092 230.717065 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.901651;"/>
+   </g>
+   <g id="patch_66">
+    <path clip-path="url(#p1d48955717)" d="M 358.538052 261.061763 
+Q 359.02774 260.648681 358.570135 261.034699 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.108485;"/>
+    <path clip-path="url(#p1d48955717)" d="M 354.223113 262.085125 
+L 358.570135 261.034699 
+L 356.802262 265.142573 
+L 354.223113 262.085125 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.108485;"/>
+   </g>
+   <g id="patch_67">
+    <path clip-path="url(#p1d48955717)" d="M 365.520198 256.118281 
+Q 365.662536 255.639786 365.543379 256.040354 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.820309;"/>
+    <path clip-path="url(#p1d48955717)" d="M 362.485903 259.304071 
+L 365.543379 256.040354 
+L 366.319867 260.444564 
+L 362.485903 259.304071 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:0.820309;"/>
+   </g>
+   <g id="patch_68">
+    <path clip-path="url(#p1d48955717)" d="M 344.455503 213.379535 
+Q 344.854296 212.782754 344.107584 213.900184 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.84406;"/>
+    <path clip-path="url(#p1d48955717)" d="M 340.222269 216.114755 
+L 344.107584 213.900184 
+L 343.548052 218.337179 
+L 340.222269 216.114755 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.84406;"/>
+   </g>
+   <g id="patch_69">
+    <path clip-path="url(#p1d48955717)" d="M 355.982867 254.022083 
+Q 356.384523 253.43881 355.971942 254.037948 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.284081;"/>
+    <path clip-path="url(#p1d48955717)" d="M 352.056094 256.198073 
+L 355.971942 254.037948 
+L 355.350532 258.466701 
+L 352.056094 256.198073 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.284081;"/>
+   </g>
+   <g id="patch_70">
+    <path clip-path="url(#p1d48955717)" d="M 342.551839 228.248145 
+Q 342.890754 227.572523 342.236986 228.875798 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.980192;"/>
+    <path clip-path="url(#p1d48955717)" d="M 338.655773 231.554401 
+L 342.236986 228.875798 
+L 342.231141 233.34793 
+L 338.655773 231.554401 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.980192;"/>
+   </g>
+   <g id="patch_71">
+    <path clip-path="url(#p1d48955717)" d="M 353.834026 248.390366 
+Q 354.173011 247.722098 353.779027 248.498791 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.44918;"/>
+    <path clip-path="url(#p1d48955717)" d="M 350.185844 251.161314 
+L 353.779027 248.498791 
+L 353.753136 252.970852 
+L 350.185844 251.161314 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.44918;"/>
+   </g>
+   <g id="patch_72">
+    <path clip-path="url(#p1d48955717)" d="M 371.978121 236.373954 
+Q 371.569214 235.796856 371.9785 236.374488 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.265809;"/>
+    <path clip-path="url(#p1d48955717)" d="M 372.659182 240.794519 
+L 371.9785 236.374488 
+L 375.922934 238.481961 
+L 372.659182 240.794519 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.265809;"/>
+   </g>
+   <g id="patch_73">
+    <path clip-path="url(#p1d48955717)" d="M 362.079914 241.931223 
+Q 362.064601 241.116795 362.076231 241.735301 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.281881;"/>
+    <path clip-path="url(#p1d48955717)" d="M 360.151779 245.772191 
+L 362.076231 241.735301 
+L 364.151072 245.696996 
+L 360.151779 245.772191 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.281881;"/>
+   </g>
+   <g id="patch_74">
+    <path clip-path="url(#p1d48955717)" d="M 352.832644 239.501258 
+Q 353.075038 238.740406 352.770754 239.695526 
+" style="fill:none;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.610818;"/>
+    <path clip-path="url(#p1d48955717)" d="M 349.650924 242.89969 
+L 352.770754 239.695526 
+L 353.462187 244.113888 
+L 349.650924 242.89969 
+z
+" style="fill:#1f77b4;stroke:#1f77b4;stroke-linecap:round;stroke-width:1.610818;"/>
+   </g>
+   <g id="patch_75">
     <path d="M 57.6 307.584 
 L 57.6 41.472 
 " style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
    </g>
-   <g id="patch_64">
+   <g id="patch_76">
     <path d="M 414.72 307.584 
 L 414.72 41.472 
 " style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
    </g>
-   <g id="patch_65">
+   <g id="patch_77">
     <path d="M 57.6 307.584 
 L 414.72 307.584 
 " style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
    </g>
-   <g id="patch_66">
+   <g id="patch_78">
     <path d="M 57.6 41.472 
 L 414.72 41.472 
 " style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>
@@ -5467,7 +6297,7 @@ L 414.72 41.472
   </g>
  </g>
  <defs>
-  <clipPath id="p90d2bc968c">
+  <clipPath id="p1d48955717">
    <rect height="266.112" width="357.12" x="57.6" y="41.472"/>
   </clipPath>
  </defs>
diff --git a/lib/matplotlib/tests/baseline_images/test_triangulation/tri_smooth_contouring.png b/lib/matplotlib/tests/baseline_images/test_triangulation/tri_smooth_contouring.png
index 80ea47079014..fee5b15e5182 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_triangulation/tri_smooth_contouring.png and b/lib/matplotlib/tests/baseline_images/test_triangulation/tri_smooth_contouring.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_usetex/eqnarray.png b/lib/matplotlib/tests/baseline_images/test_usetex/eqnarray.png
new file mode 100644
index 000000000000..249f15d238dd
Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_usetex/eqnarray.png differ
diff --git a/lib/matplotlib/tests/conftest.py b/lib/matplotlib/tests/conftest.py
index 722a7ff91484..54a1bc6cae94 100644
--- a/lib/matplotlib/tests/conftest.py
+++ b/lib/matplotlib/tests/conftest.py
@@ -1,4 +1,2 @@
-from matplotlib.testing.conftest import (mpl_test_settings,
-                                         mpl_image_comparison_parameters,
-                                         pytest_configure, pytest_unconfigure,
-                                         pd)
+from matplotlib.testing.conftest import (  # noqa
+    mpl_test_settings, pytest_configure, pytest_unconfigure, pd, xr)
diff --git a/lib/matplotlib/tests/test_afm.py b/lib/matplotlib/tests/test_afm.py
index 2d54c16cb402..e5c6a83937cd 100644
--- a/lib/matplotlib/tests/test_afm.py
+++ b/lib/matplotlib/tests/test_afm.py
@@ -2,7 +2,7 @@
 import pytest
 import logging
 
-from matplotlib import afm
+from matplotlib import _afm
 from matplotlib import font_manager as fm
 
 
@@ -39,13 +39,13 @@ def test_nonascii_str():
     inp_str = "привет"
     byte_str = inp_str.encode("utf8")
 
-    ret = afm._to_str(byte_str)
+    ret = _afm._to_str(byte_str)
     assert ret == inp_str
 
 
 def test_parse_header():
     fh = BytesIO(AFM_TEST_DATA)
-    header = afm._parse_header(fh)
+    header = _afm._parse_header(fh)
     assert header == {
         b'StartFontMetrics': 2.0,
         b'FontName': 'MyFont-Bold',
@@ -66,8 +66,8 @@ def test_parse_header():
 
 def test_parse_char_metrics():
     fh = BytesIO(AFM_TEST_DATA)
-    afm._parse_header(fh)  # position
-    metrics = afm._parse_char_metrics(fh)
+    _afm._parse_header(fh)  # position
+    metrics = _afm._parse_char_metrics(fh)
     assert metrics == (
         {0: (250.0, 'space', [0, 0, 0, 0]),
          42: (1141.0, 'foo', [40, 60, 800, 360]),
@@ -81,13 +81,13 @@ def test_parse_char_metrics():
 
 def test_get_familyname_guessed():
     fh = BytesIO(AFM_TEST_DATA)
-    font = afm.AFM(fh)
+    font = _afm.AFM(fh)
     del font._header[b'FamilyName']  # remove FamilyName, so we have to guess
     assert font.get_familyname() == 'My Font'
 
 
 def test_font_manager_weight_normalization():
-    font = afm.AFM(BytesIO(
+    font = _afm.AFM(BytesIO(
         AFM_TEST_DATA.replace(b"Weight Bold\n", b"Weight Custom\n")))
     assert fm.afmFontProperty("", font).weight == "normal"
 
@@ -107,7 +107,7 @@ def test_font_manager_weight_normalization():
 def test_bad_afm(afm_data):
     fh = BytesIO(afm_data)
     with pytest.raises(RuntimeError):
-        afm._parse_header(fh)
+        _afm._parse_header(fh)
 
 
 @pytest.mark.parametrize(
@@ -132,6 +132,6 @@ def test_bad_afm(afm_data):
 def test_malformed_header(afm_data, caplog):
     fh = BytesIO(afm_data)
     with caplog.at_level(logging.ERROR):
-        afm._parse_header(fh)
+        _afm._parse_header(fh)
 
     assert len(caplog.records) == 1
diff --git a/lib/matplotlib/tests/test_agg.py b/lib/matplotlib/tests/test_agg.py
index 4d34ef3ccd4a..68ec0c4fda3e 100644
--- a/lib/matplotlib/tests/test_agg.py
+++ b/lib/matplotlib/tests/test_agg.py
@@ -7,10 +7,14 @@
 
 
 from matplotlib import (
-    collections, path, pyplot as plt, transforms as mtransforms, rcParams)
-from matplotlib.image import imread
+    collections, patheffects, pyplot as plt, transforms as mtransforms,
+    rcParams, rc_context)
+from matplotlib.backends.backend_agg import RendererAgg
 from matplotlib.figure import Figure
+from matplotlib.image import imread
+from matplotlib.path import Path
 from matplotlib.testing.decorators import image_comparison
+from matplotlib.transforms import IdentityTransform
 
 
 def test_repeated_save_with_alpha():
@@ -52,7 +56,7 @@ def test_large_single_path_collection():
     # applied.
     f, ax = plt.subplots()
     collection = collections.PathCollection(
-        [path.Path([[-10, 5], [10, 5], [10, -5], [-10, -5], [-10, 5]])])
+        [Path([[-10, 5], [10, 5], [10, -5], [-10, -5], [-10, 5]])])
     ax.add_artist(collection)
     ax.set_xlim(10**-3, 1)
     plt.savefig(buff)
@@ -72,10 +76,10 @@ def test_marker_with_nan():
 
 def test_long_path():
     buff = io.BytesIO()
-
-    fig, ax = plt.subplots()
-    np.random.seed(0)
-    points = np.random.rand(70000)
+    fig = Figure()
+    ax = fig.subplots()
+    points = np.ones(100_000)
+    points[::2] *= -1
     ax.plot(points)
     fig.savefig(buff, format='png')
 
@@ -83,7 +87,7 @@ def test_long_path():
 @image_comparison(['agg_filter.png'], remove_text=True)
 def test_agg_filter():
     def smooth1d(x, window_len):
-        # copied from http://www.scipy.org/Cookbook/SignalSmooth
+        # copied from https://scipy-cookbook.readthedocs.io/
         s = np.r_[
             2*x[0] - x[window_len:1:-1], x, 2*x[-1] - x[-1:-window_len:-1]]
         w = np.hanning(window_len)
@@ -177,10 +181,9 @@ def process_image(self, padded_src, dpi):
         shadow.update_from(line)
 
         # offset transform
-        ot = mtransforms.offset_copy(line.get_transform(), ax.figure,
-                                     x=4.0, y=-6.0, units='points')
-
-        shadow.set_transform(ot)
+        transform = mtransforms.offset_copy(line.get_transform(), ax.figure,
+                                            x=4.0, y=-6.0, units='points')
+        shadow.set_transform(transform)
 
         # adjust zorder of the shadow lines so that it is drawn below the
         # original lines
@@ -244,3 +247,90 @@ def test_pil_kwargs_tiff():
     im = Image.open(buf)
     tags = {TiffTags.TAGS_V2[k].name: v for k, v in im.tag_v2.items()}
     assert tags["ImageDescription"] == "test image"
+
+
+def test_pil_kwargs_webp():
+    plt.plot([0, 1, 2], [0, 1, 0])
+    buf_small = io.BytesIO()
+    pil_kwargs_low = {"quality": 1}
+    plt.savefig(buf_small, format="webp", pil_kwargs=pil_kwargs_low)
+    buf_large = io.BytesIO()
+    pil_kwargs_high = {"quality": 100}
+    plt.savefig(buf_large, format="webp", pil_kwargs=pil_kwargs_high)
+    assert buf_large.getbuffer().nbytes > buf_small.getbuffer().nbytes
+
+
+def test_webp_alpha():
+    plt.plot([0, 1, 2], [0, 1, 0])
+    buf = io.BytesIO()
+    plt.savefig(buf, format="webp", transparent=True)
+    im = Image.open(buf)
+    assert im.mode == "RGBA"
+
+
+def test_draw_path_collection_error_handling():
+    fig, ax = plt.subplots()
+    ax.scatter([1], [1]).set_paths(Path([(0, 1), (2, 3)]))
+    with pytest.raises(TypeError):
+        fig.canvas.draw()
+
+
+def test_chunksize_fails():
+    # NOTE: This test covers multiple independent test scenarios in a single
+    #       function, because each scenario uses ~2GB of memory and we don't
+    #       want parallel test executors to accidentally run multiple of these
+    #       at the same time.
+
+    N = 100_000
+    dpi = 500
+    w = 5*dpi
+    h = 6*dpi
+
+    # make a Path that spans the whole w-h rectangle
+    x = np.linspace(0, w, N)
+    y = np.ones(N) * h
+    y[::2] = 0
+    path = Path(np.vstack((x, y)).T)
+    # effectively disable path simplification (but leaving it "on")
+    path.simplify_threshold = 0
+
+    # setup the minimal GraphicsContext to draw a Path
+    ra = RendererAgg(w, h, dpi)
+    gc = ra.new_gc()
+    gc.set_linewidth(1)
+    gc.set_foreground('r')
+
+    gc.set_hatch('/')
+    with pytest.raises(OverflowError, match='can not split hatched path'):
+        ra.draw_path(gc, path, IdentityTransform())
+    gc.set_hatch(None)
+
+    with pytest.raises(OverflowError, match='can not split filled path'):
+        ra.draw_path(gc, path, IdentityTransform(), (1, 0, 0))
+
+    # Set to zero to disable, currently defaults to 0, but let's be sure.
+    with rc_context({'agg.path.chunksize': 0}):
+        with pytest.raises(OverflowError, match='Please set'):
+            ra.draw_path(gc, path, IdentityTransform())
+
+    # Set big enough that we do not try to chunk.
+    with rc_context({'agg.path.chunksize': 1_000_000}):
+        with pytest.raises(OverflowError, match='Please reduce'):
+            ra.draw_path(gc, path, IdentityTransform())
+
+    # Small enough we will try to chunk, but big enough we will fail to render.
+    with rc_context({'agg.path.chunksize': 90_000}):
+        with pytest.raises(OverflowError, match='Please reduce'):
+            ra.draw_path(gc, path, IdentityTransform())
+
+    path.should_simplify = False
+    with pytest.raises(OverflowError, match="should_simplify is False"):
+        ra.draw_path(gc, path, IdentityTransform())
+
+
+def test_non_tuple_rgbaface():
+    # This passes rgbaFace as a ndarray to draw_path.
+    fig = plt.figure()
+    fig.add_subplot(projection="3d").scatter(
+        [0, 1, 2], [0, 1, 2], path_effects=[patheffects.Stroke(linewidth=4)])
+    fig.canvas.draw()
diff --git a/lib/matplotlib/tests/test_agg_filter.py b/lib/matplotlib/tests/test_agg_filter.py
index fd54a6b4aa9e..dc8cff6858ae 100644
--- a/lib/matplotlib/tests/test_agg_filter.py
+++ b/lib/matplotlib/tests/test_agg_filter.py
@@ -23,7 +23,7 @@ def manual_alpha(im, dpi):
     # Note: Doing alpha like this is not the same as setting alpha on
     # the mesh itself. Currently meshes are drawn as independent patches,
     # and we see fine borders around the blocks of color. See the SO
-    # question for an example: https://stackoverflow.com/questions/20678817
+    # question for an example: https://stackoverflow.com/q/20678817/
     mesh.set_agg_filter(manual_alpha)
 
     # Currently we must enable rasterization for this to have an effect in
diff --git a/lib/matplotlib/tests/test_animation.py b/lib/matplotlib/tests/test_animation.py
index 7ae77cb6cf3b..3aab1fd7c190 100644
--- a/lib/matplotlib/tests/test_animation.py
+++ b/lib/matplotlib/tests/test_animation.py
@@ -1,6 +1,6 @@
-import gc
 import os
 from pathlib import Path
+import platform
 import subprocess
 import sys
 import weakref
@@ -11,6 +11,7 @@
 import matplotlib as mpl
 from matplotlib import pyplot as plt
 from matplotlib import animation
+from matplotlib.testing.decorators import check_figures_equal
 
 
 @pytest.fixture()
@@ -87,10 +88,15 @@ def test_null_movie_writer(anim):
 
 @pytest.mark.parametrize('anim', [dict(klass=dict)], indirect=['anim'])
 def test_animation_delete(anim):
+    if platform.python_implementation() == 'PyPy':
+        # Something in the test setup fixture lingers around into the test and
+        # breaks pytest.warns on PyPy. This garbage collection fixes it.
+        # https://foss.heptapod.net/pypy/pypy/-/issues/3536
+        np.testing.break_cycles()
     anim = animation.FuncAnimation(**anim)
     with pytest.warns(Warning, match='Animation was deleted'):
         del anim
-        gc.collect()
+        np.testing.break_cycles()
 
 
 def test_movie_writer_dpi_default():
@@ -133,8 +139,6 @@ def isAvailable(cls):
 WRITER_OUTPUT = [
     ('ffmpeg', 'movie.mp4'),
     ('ffmpeg_file', 'movie.mp4'),
-    ('avconv', 'movie.mp4'),
-    ('avconv_file', 'movie.mp4'),
     ('imagemagick', 'movie.gif'),
     ('imagemagick_file', 'movie.gif'),
     ('pillow', 'movie.gif'),
@@ -180,8 +184,8 @@ def test_save_animation_smoketest(tmpdir, writer, frame_format, output, anim):
     with tmpdir.as_cwd():
         anim.save(output, fps=30, writer=writer, bitrate=500, dpi=dpi,
                   codec=codec)
-    with pytest.warns(None):
-        del anim
+
+    del anim
 
 
 @pytest.mark.parametrize('writer', [
@@ -201,6 +205,11 @@ def test_save_animation_smoketest(tmpdir, writer, frame_format, output, anim):
 ])
 @pytest.mark.parametrize('anim', [dict(klass=dict)], indirect=['anim'])
 def test_animation_repr_html(writer, html, want, anim):
+    if platform.python_implementation() == 'PyPy':
+        # Something in the test setup fixture lingers around into the test and
+        # breaks pytest.warns on PyPy. This garbage collection fixes it.
+        # https://foss.heptapod.net/pypy/pypy/-/issues/3536
+        np.testing.break_cycles()
     if (writer == 'imagemagick' and html == 'html5'
             # ImageMagick delegates to ffmpeg for this format.
             and not animation.FFMpegWriter.isAvailable()):
@@ -214,7 +223,8 @@ def test_animation_repr_html(writer, html, want, anim):
     if want is None:
         assert html is None
         with pytest.warns(UserWarning):
-            del anim  # Animtion was never run, so will warn on cleanup.
+            del anim  # Animation was never run, so will warn on cleanup.
+            np.testing.break_cycles()
     else:
         assert want in html
 
@@ -278,9 +288,8 @@ def test_failing_ffmpeg(tmpdir, monkeypatch, anim):
     with tmpdir.as_cwd():
         monkeypatch.setenv("PATH", ".:" + os.environ["PATH"])
         exe_path = Path(str(tmpdir), "ffmpeg")
-        exe_path.write_text("#!/bin/sh\n"
-                            "[[ $@ -eq 0 ]]\n")
-        os.chmod(str(exe_path), 0o755)
+        exe_path.write_bytes(b"#!/bin/sh\n[[ $@ -eq 0 ]]\n")
+        os.chmod(exe_path, 0o755)
         with pytest.raises(subprocess.CalledProcessError):
             anim.save("test.mpeg")
 
@@ -324,6 +333,7 @@ def frames_generator():
     writer = NullMovieWriter()
     anim.save('unused.null', writer=writer)
     assert len(frames_generated) == 5
+    np.testing.break_cycles()
     for f in frames_generated:
         # If cache_frame_data is True, then the weakref should be alive;
         # if cache_frame_data is False, then the weakref should be dead (None).
@@ -359,3 +369,70 @@ def animate(i):
 
     with pytest.raises(RuntimeError):
         animation.FuncAnimation(fig, animate, blit=True)
+
+
+def test_exhausted_animation(tmpdir):
+    fig, ax = plt.subplots()
+
+    def update(frame):
+        return []
+
+    anim = animation.FuncAnimation(
+        fig, update, frames=iter(range(10)), repeat=False,
+        cache_frame_data=False
+    )
+
+    with tmpdir.as_cwd():
+        anim.save("test.gif", writer='pillow')
+
+    with pytest.warns(UserWarning, match="exhausted"):
+        anim._start()
+
+
+def test_no_frame_warning(tmpdir):
+    fig, ax = plt.subplots()
+
+    def update(frame):
+        return []
+
+    anim = animation.FuncAnimation(
+        fig, update, frames=[], repeat=False,
+        cache_frame_data=False
+    )
+
+    with pytest.warns(UserWarning, match="exhausted"):
+        anim._start()
+
+
+@check_figures_equal(extensions=["png"])
+def test_animation_frame(tmpdir, fig_test, fig_ref):
+    # Test the expected image after iterating through a few frames
+    # we save the animation to get the iteration because we are not
+    # in an interactive framework.
+    ax = fig_test.add_subplot()
+    ax.set_xlim(0, 2 * np.pi)
+    ax.set_ylim(-1, 1)
+    x = np.linspace(0, 2 * np.pi, 100)
+    line, = ax.plot([], [])
+
+    def init():
+        line.set_data([], [])
+        return line,
+
+    def animate(i):
+        line.set_data(x, np.sin(x + i / 100))
+        return line,
+
+    anim = animation.FuncAnimation(
+        fig_test, animate, init_func=init, frames=5,
+        blit=True, repeat=False)
+    with tmpdir.as_cwd():
+        anim.save("test.gif")
+
+    # Reference figure without animation
+    ax = fig_ref.add_subplot()
+    ax.set_xlim(0, 2 * np.pi)
+    ax.set_ylim(-1, 1)
+
+    # 5th frame's data
+    ax.plot(x, np.sin(x + 4 / 100))
diff --git a/lib/matplotlib/tests/test_api.py b/lib/matplotlib/tests/test_api.py
index 29ca4caf5ca0..28933ff63fa1 100644
--- a/lib/matplotlib/tests/test_api.py
+++ b/lib/matplotlib/tests/test_api.py
@@ -34,6 +34,24 @@ def f(cls):
         a.f
 
 
+def test_deprecate_privatize_attribute():
+    class C:
+        def __init__(self): self._attr = 1
+        def _meth(self, arg): return arg
+        attr = _api.deprecate_privatize_attribute("0.0")
+        meth = _api.deprecate_privatize_attribute("0.0")
+
+    c = C()
+    with pytest.warns(_api.MatplotlibDeprecationWarning):
+        assert c.attr == 1
+    with pytest.warns(_api.MatplotlibDeprecationWarning):
+        c.attr = 2
+    with pytest.warns(_api.MatplotlibDeprecationWarning):
+        assert c.attr == 2
+    with pytest.warns(_api.MatplotlibDeprecationWarning):
+        assert c.meth(42) == 42
+
+
 def test_delete_parameter():
     @_api.delete_parameter("3.0", "foo")
     def func1(foo=None):
@@ -67,3 +85,16 @@ def func(pre, arg, post=None):
         func(1, 2)
     with pytest.warns(_api.MatplotlibDeprecationWarning):
         func(1, 2, 3)
+
+
+def test_deprecation_alternative():
+    alternative = "`.f1`, `f2`, `f3(x) <.f3>` or `f4(x)<f4>`"
+    @_api.deprecated("1", alternative=alternative)
+    def f():
+        pass
+    assert alternative in f.__doc__
+
+
+def test_empty_check_in_list():
+    with pytest.raises(TypeError, match="No argument to check!"):
+        _api.check_in_list(["a"])
diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
index 3c95535e0c21..8d573b4adb1b 100644
--- a/lib/matplotlib/tests/test_arrow_patches.py
+++ b/lib/matplotlib/tests/test_arrow_patches.py
@@ -126,7 +126,8 @@ def test_arrow_styles():
     fig.subplots_adjust(left=0, right=1, bottom=0, top=1)
 
     for i, stylename in enumerate(sorted(styles)):
-        patch = mpatches.FancyArrowPatch((0.1, i), (0.45, i),
+        patch = mpatches.FancyArrowPatch((0.1 + (i % 2)*0.05, i),
+                                         (0.45 + (i % 2)*0.05, i),
                                          arrowstyle=stylename,
                                          mutation_scale=25)
         ax.add_patch(patch)
diff --git a/lib/matplotlib/tests/test_artist.py b/lib/matplotlib/tests/test_artist.py
index ed368288622d..7e302784c332 100644
--- a/lib/matplotlib/tests/test_artist.py
+++ b/lib/matplotlib/tests/test_artist.py
@@ -5,6 +5,7 @@
 
 import pytest
 
+import matplotlib.colors as mcolors
 import matplotlib.pyplot as plt
 import matplotlib.patches as mpatches
 import matplotlib.lines as mlines
@@ -12,7 +13,8 @@
 import matplotlib.transforms as mtransforms
 import matplotlib.collections as mcollections
 import matplotlib.artist as martist
-from matplotlib.testing.decorators import image_comparison
+import matplotlib as mpl
+from matplotlib.testing.decorators import check_figures_equal, image_comparison
 
 
 def test_patch_transform_of_none():
@@ -90,7 +92,7 @@ def test_collection_transform_of_none():
                                      transform=mtransforms.IdentityTransform(),
                                      alpha=0.5)
     ax.add_collection(c)
-    assert isinstance(c._transOffset, mtransforms.IdentityTransform)
+    assert isinstance(c.get_offset_transform(), mtransforms.IdentityTransform)
 
 
 @image_comparison(["clip_path_clipping"], remove_text=True)
@@ -121,6 +123,25 @@ def test_clipping():
     ax1.set_ylim([-3, 3])
 
 
+@check_figures_equal(extensions=['png'])
+def test_clipping_zoom(fig_test, fig_ref):
+    # This test places the Axes and sets its limits such that the clip path is
+    # outside the figure entirely. This should not break the clip path.
+    ax_test = fig_test.add_axes([0, 0, 1, 1])
+    l, = ax_test.plot([-3, 3], [-3, 3])
+    # Explicit Path instead of a Rectangle uses clip path processing, instead
+    # of a clip box optimization.
+    p = mpath.Path([[0, 0], [1, 0], [1, 1], [0, 1], [0, 0]])
+    p = mpatches.PathPatch(p, transform=ax_test.transData)
+    l.set_clip_path(p)
+
+    ax_ref = fig_ref.add_axes([0, 0, 1, 1])
+    ax_ref.plot([-3, 3], [-3, 3])
+
+    ax_ref.set(xlim=(0.5, 0.75), ylim=(0.5, 0.75))
+    ax_test.set(xlim=(0.5, 0.75), ylim=(0.5, 0.75))
+
+
 def test_cull_markers():
     x = np.random.random(20000)
     y = np.random.random(20000)
@@ -146,20 +167,18 @@ def test_hatching():
     rect1 = mpatches.Rectangle((0, 0), 3, 4, hatch='/')
     ax.add_patch(rect1)
 
-    rect2 = mcollections.RegularPolyCollection(4, sizes=[16000],
-                                               offsets=[(1.5, 6.5)],
-                                               transOffset=ax.transData,
-                                               hatch='/')
+    rect2 = mcollections.RegularPolyCollection(
+        4, sizes=[16000], offsets=[(1.5, 6.5)], offset_transform=ax.transData,
+        hatch='/')
     ax.add_collection(rect2)
 
     # Ensure edge color is not applied to hatching.
     rect3 = mpatches.Rectangle((4, 0), 3, 4, hatch='/', edgecolor='C1')
     ax.add_patch(rect3)
 
-    rect4 = mcollections.RegularPolyCollection(4, sizes=[16000],
-                                               offsets=[(5.5, 6.5)],
-                                               transOffset=ax.transData,
-                                               hatch='/', edgecolor='C1')
+    rect4 = mcollections.RegularPolyCollection(
+        4, sizes=[16000], offsets=[(5.5, 6.5)], offset_transform=ax.transData,
+        hatch='/', edgecolor='C1')
     ax.add_collection(rect4)
 
     ax.set_xlim(0, 7)
@@ -321,3 +340,198 @@ def func(artist):
     art.remove_callback(oid)
     art.pchanged()  # must not call the callback anymore
     assert func.counter == 2
+
+
+def test_set_signature():
+    """Test autogenerated ``set()`` for Artist subclasses."""
+    class MyArtist1(martist.Artist):
+        def set_myparam1(self, val):
+            pass
+
+    assert hasattr(MyArtist1.set, '_autogenerated_signature')
+    assert 'myparam1' in MyArtist1.set.__doc__
+
+    class MyArtist2(MyArtist1):
+        def set_myparam2(self, val):
+            pass
+
+    assert hasattr(MyArtist2.set, '_autogenerated_signature')
+    assert 'myparam1' in MyArtist2.set.__doc__
+    assert 'myparam2' in MyArtist2.set.__doc__
+
+
+def test_set_is_overwritten():
+    """set() defined in Artist subclasses should not be overwritten."""
+    class MyArtist3(martist.Artist):
+
+        def set(self, **kwargs):
+            """Not overwritten."""
+
+    assert not hasattr(MyArtist3.set, '_autogenerated_signature')
+    assert MyArtist3.set.__doc__ == "Not overwritten."
+
+    class MyArtist4(MyArtist3):
+        pass
+
+    assert MyArtist4.set is MyArtist3.set
+
+
+def test_format_cursor_data_BoundaryNorm():
+    """Test if cursor data is correct when using BoundaryNorm."""
+    X = np.empty((3, 3))
+    X[0, 0] = 0.9
+    X[0, 1] = 0.99
+    X[0, 2] = 0.999
+    X[1, 0] = -1
+    X[1, 1] = 0
+    X[1, 2] = 1
+    X[2, 0] = 0.09
+    X[2, 1] = 0.009
+    X[2, 2] = 0.0009
+
+    # map range -1..1 to 0..256 in 0.1 steps
+    fig, ax = plt.subplots()
+    fig.suptitle("-1..1 to 0..256 in 0.1")
+    norm = mcolors.BoundaryNorm(np.linspace(-1, 1, 20), 256)
+    img = ax.imshow(X, cmap='RdBu_r', norm=norm)
+
+    labels_list = [
+        "[0.9]",
+        "[1.]",
+        "[1.]",
+        "[-1.0]",
+        "[0.0]",
+        "[1.0]",
+        "[0.09]",
+        "[0.009]",
+        "[0.0009]",
+    ]
+    for v, label in zip(X.flat, labels_list):
+        # label = "[{:-#.{}g}]".format(v, cbook._g_sig_digits(v, 0.1))
+        assert img.format_cursor_data(v) == label
+
+    plt.close()
+
+    # map range -1..1 to 0..256 in 0.01 steps
+    fig, ax = plt.subplots()
+    fig.suptitle("-1..1 to 0..256 in 0.01")
+    cmap = mpl.colormaps['RdBu_r'].resampled(200)
+    norm = mcolors.BoundaryNorm(np.linspace(-1, 1, 200), 200)
+    img = ax.imshow(X, cmap=cmap, norm=norm)
+
+    labels_list = [
+        "[0.90]",
+        "[0.99]",
+        "[1.0]",
+        "[-1.00]",
+        "[0.00]",
+        "[1.00]",
+        "[0.09]",
+        "[0.009]",
+        "[0.0009]",
+    ]
+    for v, label in zip(X.flat, labels_list):
+        # label = "[{:-#.{}g}]".format(v, cbook._g_sig_digits(v, 0.01))
+        assert img.format_cursor_data(v) == label
+
+    plt.close()
+
+    # map range -1..1 to 0..256 in 0.01 steps
+    fig, ax = plt.subplots()
+    fig.suptitle("-1..1 to 0..256 in 0.001")
+    cmap = mpl.colormaps['RdBu_r'].resampled(2000)
+    norm = mcolors.BoundaryNorm(np.linspace(-1, 1, 2000), 2000)
+    img = ax.imshow(X, cmap=cmap, norm=norm)
+
+    labels_list = [
+        "[0.900]",
+        "[0.990]",
+        "[0.999]",
+        "[-1.000]",
+        "[0.000]",
+        "[1.000]",
+        "[0.090]",
+        "[0.009]",
+        "[0.0009]",
+    ]
+    for v, label in zip(X.flat, labels_list):
+        # label = "[{:-#.{}g}]".format(v, cbook._g_sig_digits(v, 0.001))
+        assert img.format_cursor_data(v) == label
+
+    plt.close()
+
+    # different testing data set with
+    # out of bounds values for 0..1 range
+    X = np.empty((7, 1))
+    X[0] = -1.0
+    X[1] = 0.0
+    X[2] = 0.1
+    X[3] = 0.5
+    X[4] = 0.9
+    X[5] = 1.0
+    X[6] = 2.0
+
+    labels_list = [
+        "[-1.0]",
+        "[0.0]",
+        "[0.1]",
+        "[0.5]",
+        "[0.9]",
+        "[1.0]",
+        "[2.0]",
+    ]
+
+    fig, ax = plt.subplots()
+    fig.suptitle("noclip, neither")
+    norm = mcolors.BoundaryNorm(
+        np.linspace(0, 1, 4, endpoint=True), 256, clip=False, extend='neither')
+    img = ax.imshow(X, cmap='RdBu_r', norm=norm)
+    for v, label in zip(X.flat, labels_list):
+        # label = "[{:-#.{}g}]".format(v, cbook._g_sig_digits(v, 0.33))
+        assert img.format_cursor_data(v) == label
+
+    plt.close()
+
+    fig, ax = plt.subplots()
+    fig.suptitle("noclip, min")
+    norm = mcolors.BoundaryNorm(
+        np.linspace(0, 1, 4, endpoint=True), 256, clip=False, extend='min')
+    img = ax.imshow(X, cmap='RdBu_r', norm=norm)
+    for v, label in zip(X.flat, labels_list):
+        # label = "[{:-#.{}g}]".format(v, cbook._g_sig_digits(v, 0.33))
+        assert img.format_cursor_data(v) == label
+
+    plt.close()
+
+    fig, ax = plt.subplots()
+    fig.suptitle("noclip, max")
+    norm = mcolors.BoundaryNorm(
+        np.linspace(0, 1, 4, endpoint=True), 256, clip=False, extend='max')
+    img = ax.imshow(X, cmap='RdBu_r', norm=norm)
+    for v, label in zip(X.flat, labels_list):
+        # label = "[{:-#.{}g}]".format(v, cbook._g_sig_digits(v, 0.33))
+        assert img.format_cursor_data(v) == label
+
+    plt.close()
+
+    fig, ax = plt.subplots()
+    fig.suptitle("noclip, both")
+    norm = mcolors.BoundaryNorm(
+        np.linspace(0, 1, 4, endpoint=True), 256, clip=False, extend='both')
+    img = ax.imshow(X, cmap='RdBu_r', norm=norm)
+    for v, label in zip(X.flat, labels_list):
+        # label = "[{:-#.{}g}]".format(v, cbook._g_sig_digits(v, 0.33))
+        assert img.format_cursor_data(v) == label
+
+    plt.close()
+
+    fig, ax = plt.subplots()
+    fig.suptitle("clip, neither")
+    norm = mcolors.BoundaryNorm(
+        np.linspace(0, 1, 4, endpoint=True), 256, clip=True, extend='neither')
+    img = ax.imshow(X, cmap='RdBu_r', norm=norm)
+    for v, label in zip(X.flat, labels_list):
+        # label = "[{:-#.{}g}]".format(v, cbook._g_sig_digits(v, 0.33))
+        assert img.format_cursor_data(v) == label
+
+    plt.close()
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
index ed76af576f64..8d6466c74990 100644
--- a/lib/matplotlib/tests/test_axes.py
+++ b/lib/matplotlib/tests/test_axes.py
@@ -1,14 +1,12 @@
 from collections import namedtuple
 import datetime
 from decimal import Decimal
+from functools import partial
+import inspect
 import io
 from itertools import product
 import platform
 from types import SimpleNamespace
-try:
-    from contextlib import nullcontext
-except ImportError:
-    from contextlib import ExitStack as nullcontext  # Py3.6.
 
 import dateutil.tz
 
@@ -19,21 +17,27 @@
 
 import matplotlib
 import matplotlib as mpl
-from matplotlib.testing.decorators import (
-    image_comparison, check_figures_equal, remove_ticks_and_titles)
+from matplotlib import rc_context
+from matplotlib._api import MatplotlibDeprecationWarning
 import matplotlib.colors as mcolors
 import matplotlib.dates as mdates
 from matplotlib.figure import Figure
+from matplotlib.axes import Axes
 import matplotlib.font_manager as mfont_manager
 import matplotlib.markers as mmarkers
 import matplotlib.patches as mpatches
+import matplotlib.path as mpath
+from matplotlib.projections.geo import HammerAxes
+from matplotlib.projections.polar import PolarAxes
 import matplotlib.pyplot as plt
+import matplotlib.text as mtext
 import matplotlib.ticker as mticker
 import matplotlib.transforms as mtransforms
+import mpl_toolkits.axisartist as AA
 from numpy.testing import (
     assert_allclose, assert_array_equal, assert_array_almost_equal)
-from matplotlib import rc_context
-from matplotlib.cbook import MatplotlibDeprecationWarning
+from matplotlib.testing.decorators import (
+    image_comparison, check_figures_equal, remove_ticks_and_titles)
 
 # Note: Some test cases are run twice: once normally and once with labeled data
 #       These two must be defined in the same test function or need to have
@@ -41,6 +45,12 @@
 #       the tests with multiple threads.
 
 
+@check_figures_equal(extensions=["png"])
+def test_invisible_axes(fig_test, fig_ref):
+    ax = fig_test.subplots()
+    ax.set_visible(False)
+
+
 def test_get_labels():
     fig, ax = plt.subplots()
     ax.set_xlabel('x label')
@@ -49,17 +59,30 @@ def test_get_labels():
     assert ax.get_ylabel() == 'y label'
 
 
+def test_repr():
+    fig, ax = plt.subplots()
+    ax.set_label('label')
+    ax.set_title('title')
+    ax.set_xlabel('x')
+    ax.set_ylabel('y')
+    assert repr(ax) == (
+        "<AxesSubplot: "
+        "label='label', title={'center': 'title'}, xlabel='x', ylabel='y'>")
+
+
 @check_figures_equal()
 def test_label_loc_vertical(fig_test, fig_ref):
     ax = fig_test.subplots()
-    sc = ax.scatter([1, 2], [1, 2], c=[1, 2])
+    sc = ax.scatter([1, 2], [1, 2], c=[1, 2], label='scatter')
+    ax.legend()
     ax.set_ylabel('Y Label', loc='top')
     ax.set_xlabel('X Label', loc='right')
     cbar = fig_test.colorbar(sc)
     cbar.set_label("Z Label", loc='top')
 
     ax = fig_ref.subplots()
-    sc = ax.scatter([1, 2], [1, 2], c=[1, 2])
+    sc = ax.scatter([1, 2], [1, 2], c=[1, 2], label='scatter')
+    ax.legend()
     ax.set_ylabel('Y Label', y=1, ha='right')
     ax.set_xlabel('X Label', x=1, ha='right')
     cbar = fig_ref.colorbar(sc)
@@ -69,14 +92,16 @@ def test_label_loc_vertical(fig_test, fig_ref):
 @check_figures_equal()
 def test_label_loc_horizontal(fig_test, fig_ref):
     ax = fig_test.subplots()
-    sc = ax.scatter([1, 2], [1, 2], c=[1, 2])
+    sc = ax.scatter([1, 2], [1, 2], c=[1, 2], label='scatter')
+    ax.legend()
     ax.set_ylabel('Y Label', loc='bottom')
     ax.set_xlabel('X Label', loc='left')
     cbar = fig_test.colorbar(sc, orientation='horizontal')
     cbar.set_label("Z Label", loc='left')
 
     ax = fig_ref.subplots()
-    sc = ax.scatter([1, 2], [1, 2], c=[1, 2])
+    sc = ax.scatter([1, 2], [1, 2], c=[1, 2], label='scatter')
+    ax.legend()
     ax.set_ylabel('Y Label', y=0, ha='left')
     ax.set_xlabel('X Label', x=0, ha='left')
     cbar = fig_ref.colorbar(sc, orientation='horizontal')
@@ -88,20 +113,44 @@ def test_label_loc_rc(fig_test, fig_ref):
     with matplotlib.rc_context({"xaxis.labellocation": "right",
                                 "yaxis.labellocation": "top"}):
         ax = fig_test.subplots()
-        sc = ax.scatter([1, 2], [1, 2], c=[1, 2])
+        sc = ax.scatter([1, 2], [1, 2], c=[1, 2], label='scatter')
+        ax.legend()
         ax.set_ylabel('Y Label')
         ax.set_xlabel('X Label')
         cbar = fig_test.colorbar(sc, orientation='horizontal')
         cbar.set_label("Z Label")
 
     ax = fig_ref.subplots()
-    sc = ax.scatter([1, 2], [1, 2], c=[1, 2])
+    sc = ax.scatter([1, 2], [1, 2], c=[1, 2], label='scatter')
+    ax.legend()
     ax.set_ylabel('Y Label', y=1, ha='right')
     ax.set_xlabel('X Label', x=1, ha='right')
     cbar = fig_ref.colorbar(sc, orientation='horizontal')
     cbar.set_label("Z Label", x=1, ha='right')
 
 
+def test_label_shift():
+    fig, ax = plt.subplots()
+
+    # Test label re-centering on x-axis
+    ax.set_xlabel("Test label", loc="left")
+    ax.set_xlabel("Test label", loc="center")
+    assert ax.xaxis.get_label().get_horizontalalignment() == "center"
+    ax.set_xlabel("Test label", loc="right")
+    assert ax.xaxis.get_label().get_horizontalalignment() == "right"
+    ax.set_xlabel("Test label", loc="center")
+    assert ax.xaxis.get_label().get_horizontalalignment() == "center"
+
+    # Test label re-centering on y-axis
+    ax.set_ylabel("Test label", loc="top")
+    ax.set_ylabel("Test label", loc="center")
+    assert ax.yaxis.get_label().get_horizontalalignment() == "center"
+    ax.set_ylabel("Test label", loc="bottom")
+    assert ax.yaxis.get_label().get_horizontalalignment() == "left"
+    ax.set_ylabel("Test label", loc="center")
+    assert ax.yaxis.get_label().get_horizontalalignment() == "center"
+
+
 @check_figures_equal(extensions=["png"])
 def test_acorr(fig_test, fig_ref):
     np.random.seed(19680801)
@@ -414,8 +463,10 @@ def test_inverted_cla():
     assert not ax.xaxis_inverted()
     assert ax.yaxis_inverted()
 
-    # 5. two shared axes. Inverting the master axis should invert the shared
-    # axes; clearing the master axis should bring axes in shared
+    for ax in fig.axes:
+        ax.remove()
+    # 5. two shared axes. Inverting the leader axis should invert the shared
+    # axes; clearing the leader axis should bring axes in shared
     # axes back to normal.
     ax0 = plt.subplot(211)
     ax1 = plt.subplot(212, sharey=ax0)
@@ -425,7 +476,7 @@ def test_inverted_cla():
     ax0.cla()
     assert not ax1.yaxis_inverted()
     ax1.cla()
-    # 6. clearing the nonmaster should not touch limits
+    # 6. clearing the follower should not touch limits
     ax0.imshow(img)
     ax1.plot(x, np.cos(x))
     ax1.cla()
@@ -435,6 +486,65 @@ def test_inverted_cla():
     plt.close(fig)
 
 
+def test_subclass_clear_cla():
+    # Ensure that subclasses of Axes call cla/clear correctly.
+    # Note, we cannot use mocking here as we want to be sure that the
+    # superclass fallback does not recurse.
+
+    with pytest.warns(PendingDeprecationWarning,
+                      match='Overriding `Axes.cla`'):
+        class ClaAxes(Axes):
+            def cla(self):
+                nonlocal called
+                called = True
+
+    with pytest.warns(PendingDeprecationWarning,
+                      match='Overriding `Axes.cla`'):
+        class ClaSuperAxes(Axes):
+            def cla(self):
+                nonlocal called
+                called = True
+                super().cla()
+
+    class SubClaAxes(ClaAxes):
+        pass
+
+    class ClearAxes(Axes):
+        def clear(self):
+            nonlocal called
+            called = True
+
+    class ClearSuperAxes(Axes):
+        def clear(self):
+            nonlocal called
+            called = True
+            super().clear()
+
+    class SubClearAxes(ClearAxes):
+        pass
+
+    fig = Figure()
+    for axes_class in [ClaAxes, ClaSuperAxes, SubClaAxes,
+                       ClearAxes, ClearSuperAxes, SubClearAxes]:
+        called = False
+        ax = axes_class(fig, [0, 0, 1, 1])
+        # Axes.__init__ has already called clear (which aliases to cla or is in
+        # the subclass).
+        assert called
+
+        called = False
+        ax.cla()
+        assert called
+
+
+def test_cla_not_redefined_internally():
+    for klass in Axes.__subclasses__():
+        # Check that cla does not get redefined in our Axes subclasses, except
+        # for in the above test function.
+        if 'test_subclass_clear_cla' not in klass.__qualname__:
+            assert 'cla' not in klass.__dict__
+
+
 @check_figures_equal(extensions=["png"])
 def test_minorticks_on_rcParams_both(fig_test, fig_ref):
     with matplotlib.rc_context({"xtick.minor.visible": True,
@@ -455,7 +565,7 @@ def test_autoscale_tiny_range():
         ax.plot([0, 1], [1, 1 + y1])
 
 
-@pytest.mark.style('default')
+@mpl.style.context('default')
 def test_autoscale_tight():
     fig, ax = plt.subplots(1, 1)
     ax.plot([1, 2, 3, 4])
@@ -464,8 +574,22 @@ def test_autoscale_tight():
     assert_allclose(ax.get_xlim(), (-0.15, 3.15))
     assert_allclose(ax.get_ylim(), (1.0, 4.0))
 
+    # Check that autoscale is on
+    assert ax.get_autoscalex_on()
+    assert ax.get_autoscaley_on()
+    assert ax.get_autoscale_on()
+    # Set enable to None
+    ax.autoscale(enable=None)
+    # Same limits
+    assert_allclose(ax.get_xlim(), (-0.15, 3.15))
+    assert_allclose(ax.get_ylim(), (1.0, 4.0))
+    # autoscale still on
+    assert ax.get_autoscalex_on()
+    assert ax.get_autoscaley_on()
+    assert ax.get_autoscale_on()
+
 
-@pytest.mark.style('default')
+@mpl.style.context('default')
 def test_autoscale_log_shared():
     # related to github #7587
     # array starts at zero to trigger _minpos handling
@@ -483,7 +607,7 @@ def test_autoscale_log_shared():
     assert_allclose(ax2.get_ylim(), (x[0], x[-1]))
 
 
-@pytest.mark.style('default')
+@mpl.style.context('default')
 def test_use_sticky_edges():
     fig, ax = plt.subplots()
     ax.imshow([[0, 1], [2, 3]], origin='lower')
@@ -504,8 +628,8 @@ def test_use_sticky_edges():
 
 @check_figures_equal(extensions=["png"])
 def test_sticky_shared_axes(fig_test, fig_ref):
-    # Check that sticky edges work whether they are set in an axes that is a
-    # "master" in a share, or an axes that is a "follower".
+    # Check that sticky edges work whether they are set in an Axes that is a
+    # "leader" in a share, or an Axes that is a "follower".
     Z = np.arange(15).reshape(3, 5)
 
     ax0 = fig_test.add_subplot(211)
@@ -533,14 +657,6 @@ def test_basic_annotate():
                 xytext=(3, 3), textcoords='offset points')
 
 
-def test_annotate_parameter_warn():
-    fig, ax = plt.subplots()
-    with pytest.warns(MatplotlibDeprecationWarning,
-                      match=r"The \'s\' parameter of annotate\(\) "
-                             "has been renamed \'text\'"):
-        ax.annotate(s='now named text', xy=(0, 1))
-
-
 @image_comparison(['arrow_simple.png'], remove_text=True)
 def test_arrow_simple():
     # Simple image test for ax.arrow
@@ -590,6 +706,16 @@ def test_annotate_default_arrow():
     assert ann.arrow_patch is not None
 
 
+def test_annotate_signature():
+    """Check that the signature of Axes.annotate() matches Annotation."""
+    fig, ax = plt.subplots()
+    annotate_params = inspect.signature(ax.annotate).parameters
+    annotation_params = inspect.signature(mtext.Annotation).parameters
+    assert list(annotate_params.keys()) == list(annotation_params.keys())
+    for p1, p2 in zip(annotate_params.values(), annotation_params.values()):
+        assert p1 == p2
+
+
 @image_comparison(['fill_units.png'], savefig_kwarg={'dpi': 60})
 def test_fill_units():
     import matplotlib.testing.jpl_units as units
@@ -635,6 +761,20 @@ def test_plot_format_kwarg_redundant():
     plt.errorbar([0], [0], fmt='none', color='blue')
 
 
+@check_figures_equal(extensions=["png"])
+def test_errorbar_dashes(fig_test, fig_ref):
+    x = [1, 2, 3, 4]
+    y = np.sin(x)
+
+    ax_ref = fig_ref.gca()
+    ax_test = fig_test.gca()
+
+    line, *_ = ax_ref.errorbar(x, y, xerr=np.abs(y), yerr=np.abs(y))
+    line.set_dashes([2, 2])
+
+    ax_test.errorbar(x, y, xerr=np.abs(y), yerr=np.abs(y), dashes=[2, 2])
+
+
 @image_comparison(['single_point', 'single_point'])
 def test_single_point():
     # Issue #1796: don't let lines.marker affect the grid
@@ -756,11 +896,15 @@ def test_hexbin_extent():
     ax.hexbin("x", "y", extent=[.1, .3, .6, .7], data=data)
 
 
-@image_comparison(['hexbin_empty.png'], remove_text=True)
+@image_comparison(['hexbin_empty.png', 'hexbin_empty.png'], remove_text=True)
 def test_hexbin_empty():
     # From #3886: creating hexbin from empty dataset raises ValueError
-    ax = plt.gca()
+    fig, ax = plt.subplots()
     ax.hexbin([], [])
+    fig, ax = plt.subplots()
+    # From #23922: creating hexbin with log scaling from empty
+    # dataset raises ValueError
+    ax.hexbin([], [], bins='log')
 
 
 def test_hexbin_pickable():
@@ -787,10 +931,31 @@ def test_hexbin_log():
     y = np.power(2, y * 0.5)
 
     fig, ax = plt.subplots()
-    h = ax.hexbin(x, y, yscale='log', bins='log')
+    h = ax.hexbin(x, y, yscale='log', bins='log',
+                  marginals=True, reduce_C_function=np.sum)
     plt.colorbar(h)
 
 
+@image_comparison(["hexbin_linear.png"], style="mpl20", remove_text=True)
+def test_hexbin_linear():
+    # Issue #21165
+    np.random.seed(19680801)
+    n = 100000
+    x = np.random.standard_normal(n)
+    y = 2.0 + 3.0 * x + 4.0 * np.random.standard_normal(n)
+
+    fig, ax = plt.subplots()
+    ax.hexbin(x, y, gridsize=(10, 5), marginals=True,
+              reduce_C_function=np.sum)
+
+
+def test_hexbin_log_clim():
+    x, y = np.arange(200).reshape((2, 100))
+    fig, ax = plt.subplots()
+    h = ax.hexbin(x, y, bins='log', vmin=2, vmax=100)
+    assert h.get_clim() == (2, 100)
+
+
 def test_inverted_limits():
     # Test gh:1553
     # Calling invert_xaxis prior to plotting should not disable autoscaling
@@ -828,7 +993,7 @@ def test_nonfinite_limits():
     ax.plot(x, y)
 
 
-@pytest.mark.style('default')
+@mpl.style.context('default')
 @pytest.mark.parametrize('plot_fun',
                          ['scatter', 'plot', 'fill_between'])
 @check_figures_equal(extensions=["png"])
@@ -893,16 +1058,13 @@ def test_imshow_clip():
     ax.imshow(r, clip_path=clip_path)
 
 
-@check_figures_equal(extensions=["png"])
-def test_imshow_norm_vminvmax(fig_test, fig_ref):
-    """Parameters vmin, vmax should be ignored if norm is given."""
+def test_imshow_norm_vminvmax():
+    """Parameters vmin, vmax should error if norm is given."""
     a = [[1, 2], [3, 4]]
-    ax = fig_ref.subplots()
-    ax.imshow(a, vmin=0, vmax=5)
-    ax = fig_test.subplots()
-    with pytest.warns(MatplotlibDeprecationWarning,
-                      match="Passing parameters norm and vmin/vmax "
-                            "simultaneously is deprecated."):
+    ax = plt.axes()
+    with pytest.raises(ValueError,
+                       match="Passing a Normalize instance simultaneously "
+                             "with vmin/vmax is not supported."):
         ax.imshow(a, norm=mcolors.Normalize(-10, 10), vmin=0, vmax=5)
 
 
@@ -996,6 +1158,23 @@ def test_fill_between_interpolate_decreasing():
     ax.set_ylim(800, 600)
 
 
+@image_comparison(['fill_between_interpolate_nan'], remove_text=True)
+def test_fill_between_interpolate_nan():
+    # Tests fix for issue #18986.
+    x = np.arange(10)
+    y1 = np.asarray([8, 18, np.nan, 18, 8, 18, 24, 18, 8, 18])
+    y2 = np.asarray([18, 11, 8, 11, 18, 26, 32, 30, np.nan, np.nan])
+
+    fig, ax = plt.subplots()
+
+    ax.plot(x, y1, c='k')
+    ax.plot(x, y2, c='b')
+    ax.fill_between(x, y1, y2, where=y2 >= y1, facecolor="green",
+                    interpolate=True, alpha=0.5)
+    ax.fill_between(x, y1, y2, where=y1 >= y2, facecolor="red",
+                    interpolate=True, alpha=0.5)
+
+
 # test_symlog and test_symlog2 used to have baseline images in all three
 # formats, but the png and svg baselines got invalidated by the removal of
 # minor tick overstriking.
@@ -1062,6 +1241,27 @@ def test_pcolormesh():
     ax3.pcolormesh(Qx, Qz, Z, shading="gouraud")
 
 
+@image_comparison(['pcolormesh_small'], extensions=["eps"])
+def test_pcolormesh_small():
+    n = 3
+    x = np.linspace(-1.5, 1.5, n)
+    y = np.linspace(-1.5, 1.5, n*2)
+    X, Y = np.meshgrid(x, y)
+    Qx = np.cos(Y) - np.cos(X)
+    Qz = np.sin(Y) + np.sin(X)
+    Qx = (Qx + 1.1)
+    Z = np.hypot(X, Y) / 5
+    Z = (Z - Z.min()) / Z.ptp()
+    Zm = ma.masked_where(np.abs(Qz) < 0.5 * np.max(Qz), Z)
+
+    fig, (ax1, ax2, ax3) = plt.subplots(1, 3)
+    ax1.pcolormesh(Qx, Qz, Zm[:-1, :-1], lw=0.5, edgecolors='k')
+    ax2.pcolormesh(Qx, Qz, Zm[:-1, :-1], lw=2, edgecolors=['b', 'w'])
+    ax3.pcolormesh(Qx, Qz, Zm, shading="gouraud")
+    for ax in fig.axes:
+        ax.set_axis_off()
+
+
 @image_comparison(['pcolormesh_alpha'], extensions=["png", "pdf"],
                   remove_text=True)
 def test_pcolormesh_alpha():
@@ -1077,7 +1277,7 @@ def test_pcolormesh_alpha():
     Qy = Y + np.sin(X)
     Z = np.hypot(X, Y) / 5
     Z = (Z - Z.min()) / Z.ptp()
-    vir = plt.get_cmap("viridis", 16)
+    vir = mpl.colormaps["viridis"].resampled(16)
     # make another colormap with varying alpha
     colors = vir(np.arange(16))
     colors[:, 3] = 0.5 + 0.5*np.sin(np.arange(16))
@@ -1097,8 +1297,7 @@ def test_pcolormesh_alpha():
     ax4.pcolormesh(Qx, Qy, Z, cmap=cmap, shading='gouraud', zorder=1)
 
 
-@image_comparison(['pcolormesh_datetime_axis.png'],
-                  remove_text=False, style='mpl20')
+@image_comparison(['pcolormesh_datetime_axis.png'], style='mpl20')
 def test_pcolormesh_datetime_axis():
     # Remove this line when this test image is regenerated.
     plt.rcParams['pcolormesh.snap'] = False
@@ -1126,8 +1325,7 @@ def test_pcolormesh_datetime_axis():
             label.set_rotation(30)
 
 
-@image_comparison(['pcolor_datetime_axis.png'],
-                  remove_text=False, style='mpl20')
+@image_comparison(['pcolor_datetime_axis.png'], style='mpl20')
 def test_pcolor_datetime_axis():
     fig = plt.figure()
     fig.subplots_adjust(hspace=0.4, top=0.98, bottom=.15)
@@ -1217,38 +1415,33 @@ def test_pcolornearestunits(fig_test, fig_ref):
     ax.pcolormesh(x2, y2, Z, shading='nearest')
 
 
-@check_figures_equal(extensions=["png"])
-def test_pcolordropdata(fig_test, fig_ref):
-    ax = fig_test.subplots()
-    x = np.arange(0, 10)
-    y = np.arange(0, 4)
+def test_pcolorflaterror():
+    fig, ax = plt.subplots()
+    x = np.arange(0, 9)
+    y = np.arange(0, 3)
     np.random.seed(19680801)
     Z = np.random.randn(3, 9)
-    # fake dropping the data
-    ax.pcolormesh(x[:-1], y[:-1], Z[:-1, :-1], shading='flat')
-
-    ax = fig_ref.subplots()
-    # test dropping the data...
-    x2 = x[:-1]
-    y2 = y[:-1]
-    with pytest.warns(MatplotlibDeprecationWarning):
-        ax.pcolormesh(x2, y2, Z, shading='flat')
+    with pytest.raises(TypeError, match='Dimensions of C'):
+        ax.pcolormesh(x, y, Z, shading='flat')
 
 
+@pytest.mark.parametrize('snap', [False, True])
 @check_figures_equal(extensions=["png"])
-def test_pcolorauto(fig_test, fig_ref):
+def test_pcolorauto(fig_test, fig_ref, snap):
     ax = fig_test.subplots()
     x = np.arange(0, 10)
     y = np.arange(0, 4)
     np.random.seed(19680801)
     Z = np.random.randn(3, 9)
-    ax.pcolormesh(x, y, Z, shading='auto')
+    # this is the same as flat; note that auto is default
+    ax.pcolormesh(x, y, Z, snap=snap)
 
     ax = fig_ref.subplots()
     # specify the centers
     x2 = x[:-1] + np.diff(x) / 2
     y2 = y[:-1] + np.diff(y) / 2
-    ax.pcolormesh(x2, y2, Z, shading='auto')
+    # this is same as nearest:
+    ax.pcolormesh(x2, y2, Z, snap=snap)
 
 
 @image_comparison(['canonical'])
@@ -1350,8 +1543,12 @@ def test_markevery():
     ax.legend()
 
 
-@image_comparison(['markevery_line'], remove_text=True)
+@image_comparison(['markevery_line'], remove_text=True, tol=0.005)
 def test_markevery_line():
+    # TODO: a slight change in rendering between Inkscape versions may explain
+    # why one had to introduce a small non-zero tolerance for the SVG test
+    # to pass. One may try to remove this hack once Travis' Inkscape version
+    # is modern enough. FWIW, no failure with 0.92.3 on my computer (#11358).
     x = np.linspace(0, 10, 100)
     y = np.sin(x) * np.sqrt(x/10 + 0.5)
 
@@ -1364,7 +1561,7 @@ def test_markevery_line():
     ax.legend()
 
 
-@image_comparison(['markevery_linear_scales'], remove_text=True)
+@image_comparison(['markevery_linear_scales'], remove_text=True, tol=0.001)
 def test_markevery_linear_scales():
     cases = [None,
              8,
@@ -1467,6 +1664,32 @@ def test_markevery_polar():
         plt.plot(theta, r, 'o', ls='-', ms=4,  markevery=case)
 
 
+@image_comparison(['markevery_linear_scales_nans'], remove_text=True)
+def test_markevery_linear_scales_nans():
+    cases = [None,
+             8,
+             (30, 8),
+             [16, 24, 30], [0, -1],
+             slice(100, 200, 3),
+             0.1, 0.3, 1.5,
+             (0.0, 0.1), (0.45, 0.1)]
+
+    cols = 3
+    gs = matplotlib.gridspec.GridSpec(len(cases) // cols + 1, cols)
+
+    delta = 0.11
+    x = np.linspace(0, 10 - 2 * delta, 200) + delta
+    y = np.sin(x) + 1.0 + delta
+    y[:10] = y[-20:] = y[50:70] = np.nan
+
+    for i, case in enumerate(cases):
+        row = (i // cols)
+        col = i % cols
+        plt.subplot(gs[row, col])
+        plt.title('markevery=%s' % str(case))
+        plt.plot(x, y, 'o', ls='-', ms=4,  markevery=case)
+
+
 @image_comparison(['marker_edges'], remove_text=True)
 def test_marker_edges():
     x = np.linspace(0, 1, 10)
@@ -1631,6 +1854,53 @@ def test_boxplot_dates_pandas(pd):
     plt.boxplot(data, positions=years)
 
 
+def test_boxplot_capwidths():
+    data = np.random.rand(5, 3)
+    fig, axs = plt.subplots(9)
+
+    axs[0].boxplot(data, capwidths=[0.3, 0.2, 0.1], widths=[0.1, 0.2, 0.3])
+    axs[1].boxplot(data, capwidths=[0.3, 0.2, 0.1], widths=0.2)
+    axs[2].boxplot(data, capwidths=[0.3, 0.2, 0.1])
+
+    axs[3].boxplot(data, capwidths=0.5, widths=[0.1, 0.2, 0.3])
+    axs[4].boxplot(data, capwidths=0.5, widths=0.2)
+    axs[5].boxplot(data, capwidths=0.5)
+
+    axs[6].boxplot(data, widths=[0.1, 0.2, 0.3])
+    axs[7].boxplot(data, widths=0.2)
+    axs[8].boxplot(data)
+
+
+def test_pcolor_regression(pd):
+    from pandas.plotting import (
+        register_matplotlib_converters,
+        deregister_matplotlib_converters,
+    )
+
+    fig = plt.figure()
+    ax = fig.add_subplot(111)
+
+    times = [datetime.datetime(2021, 1, 1)]
+    while len(times) < 7:
+        times.append(times[-1] + datetime.timedelta(seconds=120))
+
+    y_vals = np.arange(5)
+
+    time_axis, y_axis = np.meshgrid(times, y_vals)
+    shape = (len(y_vals) - 1, len(times) - 1)
+    z_data = np.arange(shape[0] * shape[1])
+
+    z_data.shape = shape
+    try:
+        register_matplotlib_converters()
+
+        im = ax.pcolormesh(time_axis, y_axis, z_data)
+        # make sure this does not raise!
+        fig.canvas.draw()
+    finally:
+        deregister_matplotlib_converters()
+
+
 def test_bar_pandas(pd):
     # Smoke test for pandas
     df = pd.DataFrame(
@@ -1658,8 +1928,8 @@ def test_bar_pandas_indexed(pd):
     ax.bar(df.x, 1., width=df.width)
 
 
+@mpl.style.context('default')
 @check_figures_equal()
-@pytest.mark.style('default')
 def test_bar_hatches(fig_test, fig_ref):
     ax_test = fig_test.subplots()
     ax_ref = fig_ref.subplots()
@@ -1673,13 +1943,46 @@ def test_bar_hatches(fig_test, fig_ref):
     ax_test.bar(x, y, hatch=hatches)
 
 
+@pytest.mark.parametrize(
+    ("x", "width", "label", "expected_labels", "container_label"),
+    [
+        ("x", 1, "x", ["_nolegend_"], "x"),
+        (["a", "b", "c"], [10, 20, 15], ["A", "B", "C"],
+         ["A", "B", "C"], "_nolegend_"),
+        (["a", "b", "c"], [10, 20, 15], ["R", "Y", "_nolegend_"],
+         ["R", "Y", "_nolegend_"], "_nolegend_"),
+        (["a", "b", "c"], [10, 20, 15], "bars",
+         ["_nolegend_", "_nolegend_", "_nolegend_"], "bars"),
+    ]
+)
+def test_bar_labels(x, width, label, expected_labels, container_label):
+    _, ax = plt.subplots()
+    bar_container = ax.bar(x, width, label=label)
+    bar_labels = [bar.get_label() for bar in bar_container]
+    assert expected_labels == bar_labels
+    assert bar_container.get_label() == container_label
+
+
+def test_bar_labels_length():
+    _, ax = plt.subplots()
+    with pytest.raises(ValueError):
+        ax.bar(["x", "y"], [1, 2], label=["X", "Y", "Z"])
+    _, ax = plt.subplots()
+    with pytest.raises(ValueError):
+        ax.bar(["x", "y"], [1, 2], label=["X"])
+
+
 def test_pandas_minimal_plot(pd):
-    # smoke test that series and index objcets do not warn
-    x = pd.Series([1, 2], dtype="float64")
-    plt.plot(x, x)
-    plt.plot(x.index, x)
-    plt.plot(x)
-    plt.plot(x.index)
+    # smoke test that series and index objects do not warn
+    for x in [pd.Series([1, 2], dtype="float64"),
+              pd.Series([1, 2], dtype="Float64")]:
+        plt.plot(x, x)
+        plt.plot(x.index, x)
+        plt.plot(x)
+        plt.plot(x.index)
+    df = pd.DataFrame({'col': [1, 2, 3]})
+    plt.plot(df)
+    plt.plot(df, df)
 
 
 @image_comparison(['hist_log'], remove_text=True)
@@ -1723,6 +2026,21 @@ def test_hist_bar_empty():
     ax.hist([], histtype='bar')
 
 
+def test_hist_float16():
+    np.random.seed(19680801)
+    values = np.clip(
+        np.random.normal(0.5, 0.3, size=1000), 0, 1).astype(np.float16)
+    h = plt.hist(values, bins=3, alpha=0.5)
+    bc = h[2]
+    # Check that there are no overlapping rectangles
+    for r in range(1, len(bc)):
+        rleft = bc[r-1].get_corners()
+        rright = bc[r].get_corners()
+        # right hand position of left rectangle <=
+        # left hand position of right rectangle
+        assert rleft[1][0] <= rright[0][0]
+
+
 @image_comparison(['hist_step_empty.png'], remove_text=True)
 def test_hist_step_empty():
     # From #3886: creating hist from empty dataset raises ValueError
@@ -1979,7 +2297,7 @@ def test_stairs_options():
     ax.stairs(y[::-1]*3+14, x, baseline=26,
               color='purple', ls='--', lw=2, label="F")
     ax.stairs(yn[::-1]*3+15, x+1, baseline=np.linspace(27, 25, len(y)),
-              color='blue', ls='--', lw=2, label="G", fill=True)
+              color='blue', ls='--', label="G", fill=True)
     ax.stairs(y[:-1][::-1]*2+11, x[:-1]+0.5, color='black', ls='--', lw=2,
               baseline=12, hatch='//', label="H")
     ax.legend(loc=0)
@@ -1994,6 +2312,18 @@ def test_stairs_datetime():
     plt.xticks(rotation=30)
 
 
+@check_figures_equal(extensions=['png'])
+def test_stairs_edge_handling(fig_test, fig_ref):
+    # Test
+    test_ax = fig_test.add_subplot()
+    test_ax.stairs([1, 2, 3], color='red', fill=True)
+
+    # Ref
+    ref_ax = fig_ref.add_subplot()
+    st = ref_ax.stairs([1, 2, 3], fill=True)
+    st.set_color('red')
+
+
 def contour_dat():
     x = np.linspace(-3, 5, 150)
     y = np.linspace(-3, 5, 120)
@@ -2006,20 +2336,17 @@ def test_contour_hatching():
     x, y, z = contour_dat()
     fig, ax = plt.subplots()
     ax.contourf(x, y, z, 7, hatches=['/', '\\', '//', '-'],
-                cmap=plt.get_cmap('gray'),
+                cmap=mpl.colormaps['gray'],
                 extend='both', alpha=0.5)
 
 
 @image_comparison(['contour_colorbar'], style='mpl20')
 def test_contour_colorbar():
-    # Remove this line when this test image is regenerated.
-    plt.rcParams['pcolormesh.snap'] = False
-
     x, y, z = contour_dat()
 
     fig, ax = plt.subplots()
     cs = ax.contourf(x, y, z, levels=np.arange(-1.8, 1.801, 0.2),
-                     cmap=plt.get_cmap('RdBu'),
+                     cmap=mpl.colormaps['RdBu'],
                      vmin=-0.6,
                      vmax=0.6,
                      extend='both')
@@ -2142,6 +2469,25 @@ def test_scatter_color(self):
         with pytest.raises(ValueError):
             plt.scatter([1, 2, 3], [1, 2, 3], color=[1, 2, 3])
 
+    @pytest.mark.parametrize('kwargs',
+                                [
+                                    {'cmap': 'gray'},
+                                    {'norm': mcolors.Normalize()},
+                                    {'vmin': 0},
+                                    {'vmax': 0}
+                                ])
+    def test_scatter_color_warning(self, kwargs):
+        warn_match = "No data for colormapping provided "
+        # Warn for cases where 'cmap', 'norm', 'vmin', 'vmax'
+        # kwargs are being overridden
+        with pytest.warns(Warning, match=warn_match):
+            plt.scatter([], [], **kwargs)
+        with pytest.warns(Warning, match=warn_match):
+            plt.scatter([1, 2], [3, 4], c=[], **kwargs)
+        # Do not warn for cases where 'c' matches 'x' and 'y'
+        plt.scatter([], [], c=[], **kwargs)
+        plt.scatter([1, 2], [3, 4], c=[4, 5], **kwargs)
+
     def test_scatter_unfilled(self):
         coll = plt.scatter([0, 1, 2], [1, 3, 2], c=['0.1', '0.3', '0.5'],
                            marker=mmarkers.MarkerStyle('o', fillstyle='none'),
@@ -2152,7 +2498,7 @@ def test_scatter_unfilled(self):
                                                    [0.5, 0.5, 0.5, 1]])
         assert_array_equal(coll.get_linewidths(), [1.1, 1.2, 1.3])
 
-    @pytest.mark.style('default')
+    @mpl.style.context('default')
     def test_scatter_unfillable(self):
         coll = plt.scatter([0, 1, 2], [1, 3, 2], c=['0.1', '0.3', '0.5'],
                            marker='x',
@@ -2173,7 +2519,7 @@ def test_scatter_size_arg_size(self):
             plt.scatter(x, x, 'foo')
 
     def test_scatter_edgecolor_RGB(self):
-        # Github issue 19066
+        # GitHub issue 19066
         coll = plt.scatter([1, 2, 3], [1, np.nan, np.nan],
                             edgecolor=(1, 0, 0))
         assert mcolors.same_color(coll.get_edgecolor(), (1, 0, 0))
@@ -2184,7 +2530,7 @@ def test_scatter_edgecolor_RGB(self):
     @check_figures_equal(extensions=["png"])
     def test_scatter_invalid_color(self, fig_test, fig_ref):
         ax = fig_test.subplots()
-        cmap = plt.get_cmap("viridis", 16)
+        cmap = mpl.colormaps["viridis"].resampled(16)
         cmap.set_bad("k", 1)
         # Set a nonuniform size to prevent the last call to `scatter` (plotting
         # the invalid points separately in fig_ref) from using the marker
@@ -2193,15 +2539,15 @@ def test_scatter_invalid_color(self, fig_test, fig_ref):
                    c=[1, np.nan, 2, np.nan], s=[1, 2, 3, 4],
                    cmap=cmap, plotnonfinite=True)
         ax = fig_ref.subplots()
-        cmap = plt.get_cmap("viridis", 16)
+        cmap = mpl.colormaps["viridis"].resampled(16)
         ax.scatter([0, 2], [0, 2], c=[1, 2], s=[1, 3], cmap=cmap)
         ax.scatter([1, 3], [1, 3], s=[2, 4], color="k")
 
     @check_figures_equal(extensions=["png"])
     def test_scatter_no_invalid_color(self, fig_test, fig_ref):
-        # With plotninfinite=False we plot only 2 points.
+        # With plotnonfinite=False we plot only 2 points.
         ax = fig_test.subplots()
-        cmap = plt.get_cmap("viridis", 16)
+        cmap = mpl.colormaps["viridis"].resampled(16)
         cmap.set_bad("k", 1)
         ax.scatter(range(4), range(4),
                    c=[1, np.nan, 2, np.nan], s=[1, 2, 3, 4],
@@ -2209,16 +2555,13 @@ def test_scatter_no_invalid_color(self, fig_test, fig_ref):
         ax = fig_ref.subplots()
         ax.scatter([0, 2], [0, 2], c=[1, 2], s=[1, 3], cmap=cmap)
 
-    @check_figures_equal(extensions=["png"])
-    def test_scatter_norm_vminvmax(self, fig_test, fig_ref):
-        """Parameters vmin, vmax should be ignored if norm is given."""
+    def test_scatter_norm_vminvmax(self):
+        """Parameters vmin, vmax should error if norm is given."""
         x = [1, 2, 3]
-        ax = fig_ref.subplots()
-        ax.scatter(x, x, c=x, vmin=0, vmax=5)
-        ax = fig_test.subplots()
-        with pytest.warns(MatplotlibDeprecationWarning,
-                          match="Passing parameters norm and vmin/vmax "
-                                "simultaneously is deprecated."):
+        ax = plt.axes()
+        with pytest.raises(ValueError,
+                           match="Passing a Normalize instance simultaneously "
+                                 "with vmin/vmax is not supported."):
             ax.scatter(x, x, c=x, norm=mcolors.Normalize(-10, 10),
                        vmin=0, vmax=5)
 
@@ -2305,7 +2648,7 @@ def get_next_color():
                     c=c_case, edgecolors="black", kwargs={}, xsize=xsize,
                     get_next_color_func=get_next_color)
 
-    @pytest.mark.style('default')
+    @mpl.style.context('default')
     @check_figures_equal(extensions=["png"])
     def test_scatter_single_color_c(self, fig_test, fig_ref):
         rgb = [[1, 0.5, 0.05]]
@@ -2407,8 +2750,6 @@ def get_next_color():
 
 def test_as_mpl_axes_api():
     # tests the _as_mpl_axes api
-    from matplotlib.projections.polar import PolarAxes
-
     class Polar:
         def __init__(self):
             self.theta_offset = 0
@@ -2420,42 +2761,10 @@ def _as_mpl_axes(self):
     prj = Polar()
     prj2 = Polar()
     prj2.theta_offset = np.pi
-    prj3 = Polar()
 
     # testing axes creation with plt.axes
     ax = plt.axes([0, 0, 1, 1], projection=prj)
     assert type(ax) == PolarAxes
-    with pytest.warns(
-            MatplotlibDeprecationWarning,
-            match=r'Calling gca\(\) with keyword arguments was deprecated'):
-        ax_via_gca = plt.gca(projection=prj)
-    assert ax_via_gca is ax
-    plt.close()
-
-    # testing axes creation with gca
-    with pytest.warns(
-            MatplotlibDeprecationWarning,
-            match=r'Calling gca\(\) with keyword arguments was deprecated'):
-        ax = plt.gca(projection=prj)
-    assert type(ax) == mpl.axes._subplots.subplot_class_factory(PolarAxes)
-    with pytest.warns(
-            MatplotlibDeprecationWarning,
-            match=r'Calling gca\(\) with keyword arguments was deprecated'):
-        ax_via_gca = plt.gca(projection=prj)
-    assert ax_via_gca is ax
-    # try getting the axes given a different polar projection
-    with pytest.warns(
-            MatplotlibDeprecationWarning,
-            match=r'Calling gca\(\) with keyword arguments was deprecated'):
-        ax_via_gca = plt.gca(projection=prj2)
-    assert ax_via_gca is ax
-    assert ax.get_theta_offset() == 0
-    # try getting the axes given an == (not is) polar projection
-    with pytest.warns(
-            MatplotlibDeprecationWarning,
-            match=r'Calling gca\(\) with keyword arguments was deprecated'):
-        ax_via_gca = plt.gca(projection=prj3)
-    assert ax_via_gca is ax
     plt.close()
 
     # testing axes creation with subplot
@@ -2475,13 +2784,48 @@ def test_pyplot_axes():
     plt.close(fig2)
 
 
-@image_comparison(['log_scales'])
 def test_log_scales():
     fig, ax = plt.subplots()
     ax.plot(np.log(np.linspace(0.1, 100)))
     ax.set_yscale('log', base=5.5)
     ax.invert_yaxis()
     ax.set_xscale('log', base=9.0)
+    xticks, yticks = [
+        [(t.get_loc(), t.label1.get_text()) for t in axis._update_ticks()]
+        for axis in [ax.xaxis, ax.yaxis]
+    ]
+    assert xticks == [
+        (1.0, '$\\mathdefault{9^{0}}$'),
+        (9.0, '$\\mathdefault{9^{1}}$'),
+        (81.0, '$\\mathdefault{9^{2}}$'),
+        (2.0, ''),
+        (3.0, ''),
+        (4.0, ''),
+        (5.0, ''),
+        (6.0, ''),
+        (7.0, ''),
+        (8.0, ''),
+        (18.0, ''),
+        (27.0, ''),
+        (36.0, ''),
+        (45.0, ''),
+        (54.0, ''),
+        (63.0, ''),
+        (72.0, ''),
+    ]
+    assert yticks == [
+        (0.18181818181818182, '$\\mathdefault{5.5^{-1}}$'),
+        (1.0, '$\\mathdefault{5.5^{0}}$'),
+        (5.5, '$\\mathdefault{5.5^{1}}$'),
+        (0.36363636363636365, ''),
+        (0.5454545454545454, ''),
+        (0.7272727272727273, ''),
+        (0.9090909090909092, ''),
+        (2.0, ''),
+        (3.0, ''),
+        (4.0, ''),
+        (5.0, ''),
+    ]
 
 
 def test_log_scales_no_data():
@@ -2494,10 +2838,10 @@ def test_log_scales_no_data():
 def test_log_scales_invalid():
     fig, ax = plt.subplots()
     ax.set_xscale('log')
-    with pytest.warns(UserWarning, match='Attempted to set non-positive'):
+    with pytest.warns(UserWarning, match='Attempt to set non-positive'):
         ax.set_xlim(-1, 10)
     ax.set_yscale('log')
-    with pytest.warns(UserWarning, match='Attempted to set non-positive'):
+    with pytest.warns(UserWarning, match='Attempt to set non-positive'):
         ax.set_ylim(-1, 10)
 
 
@@ -2513,10 +2857,11 @@ def test_stackplot():
     ax.set_xlim((0, 10))
     ax.set_ylim((0, 70))
 
-    # Reuse testcase from above for a labeled data test
+    # Reuse testcase from above for a test with labeled data and with colours
+    # from the Axes property cycle.
     data = {"x": x, "y1": y1, "y2": y2, "y3": y3}
     fig, ax = plt.subplots()
-    ax.stackplot("x", "y1", "y2", "y3", data=data)
+    ax.stackplot("x", "y1", "y2", "y3", data=data, colors=["C0", "C1", "C2"])
     ax.set_xlim((0, 10))
     ax.set_ylim((0, 70))
 
@@ -2781,6 +3126,25 @@ def test_bxp_bad_positions():
         _bxp_test_helper(bxp_kwargs=dict(positions=[2, 3]))
 
 
+@image_comparison(['bxp_custom_capwidths.png'],
+                  savefig_kwarg={'dpi': 40},
+                  style='default')
+def test_bxp_custom_capwidths():
+    _bxp_test_helper(bxp_kwargs=dict(capwidths=[0.0, 0.1, 0.5, 1.0]))
+
+
+@image_comparison(['bxp_custom_capwidth.png'],
+                  savefig_kwarg={'dpi': 40},
+                  style='default')
+def test_bxp_custom_capwidth():
+    _bxp_test_helper(bxp_kwargs=dict(capwidths=0.6))
+
+
+def test_bxp_bad_capwidths():
+    with pytest.raises(ValueError):
+        _bxp_test_helper(bxp_kwargs=dict(capwidths=[1]))
+
+
 @image_comparison(['boxplot', 'boxplot'], tol=1.28, style='default')
 def test_boxplot():
     # Randomness used for bootstrapping.
@@ -2800,6 +3164,17 @@ def test_boxplot():
     ax.set_ylim((-30, 30))
 
 
+@image_comparison(['boxplot_custom_capwidths.png'],
+                  savefig_kwarg={'dpi': 40}, style='default')
+def test_boxplot_custom_capwidths():
+
+    x = np.linspace(-7, 7, 140)
+    x = np.hstack([-25, x, 25])
+    fig, ax = plt.subplots()
+
+    ax.boxplot([x, x], notch=1, capwidths=[0.01, 0.2])
+
+
 @image_comparison(['boxplot_sym2.png'], remove_text=True, style='default')
 def test_boxplot_sym2():
     # Randomness used for bootstrapping.
@@ -3259,7 +3634,9 @@ def test_tick_space_size_0():
 
 @image_comparison(['errorbar_basic', 'errorbar_mixed', 'errorbar_basic'])
 def test_errorbar():
-    x = np.arange(0.1, 4, 0.5)
+    # longdouble due to floating point rounding issues with certain
+    # computer chipsets
+    x = np.arange(0.1, 4, 0.5, dtype=np.longdouble)
     y = np.exp(-x)
 
     yerr = 0.1 + 0.2*np.sqrt(x)
@@ -3297,6 +3674,8 @@ def test_errorbar():
     ax.errorbar(x, y, yerr=[yerr_lower, 2*yerr], xerr=xerr,
                 fmt='o', ecolor='g', capthick=2)
     ax.set_title('Mixed sym., log y')
+    # Force limits due to floating point slop potentially expanding the range
+    ax.set_ylim(1e-2, 1e1)
 
     fig.suptitle('Variable errorbars')
 
@@ -3403,7 +3782,7 @@ def test_errorbar_limits():
     ax.set_title('Errorbar upper and lower limits')
 
 
-def test_errobar_nonefmt():
+def test_errorbar_nonefmt():
     # Check that passing 'none' as a format still plots errorbars
     x = np.arange(5)
     y = np.arange(5)
@@ -3414,6 +3793,23 @@ def test_errobar_nonefmt():
         assert np.all(errbar.get_color() == mcolors.to_rgba('C0'))
 
 
+def test_errorbar_line_specific_kwargs():
+    # Check that passing line-specific keyword arguments will not result in
+    # errors.
+    x = np.arange(5)
+    y = np.arange(5)
+
+    plotline, _, _ = plt.errorbar(x, y, xerr=1, yerr=1, ls='None',
+                                  marker='s', fillstyle='full',
+                                  drawstyle='steps-mid',
+                                  dash_capstyle='round',
+                                  dash_joinstyle='miter',
+                                  solid_capstyle='butt',
+                                  solid_joinstyle='bevel')
+    assert plotline.get_fillstyle() == 'full'
+    assert plotline.get_drawstyle() == 'steps-mid'
+
+
 @check_figures_equal(extensions=['png'])
 def test_errorbar_with_prop_cycle(fig_test, fig_ref):
     ax = fig_ref.subplots()
@@ -3452,6 +3848,27 @@ def test_errorbar_every_invalid():
         ax.errorbar(x, y, yerr, errorevery='foobar')
 
 
+def test_xerr_yerr_not_negative():
+    ax = plt.figure().subplots()
+
+    with pytest.raises(ValueError,
+                       match="'xerr' must not contain negative values"):
+        ax.errorbar(x=[0], y=[0], xerr=[[-0.5], [1]], yerr=[[-0.5], [1]])
+    with pytest.raises(ValueError,
+                       match="'xerr' must not contain negative values"):
+        ax.errorbar(x=[0], y=[0], xerr=[[-0.5], [1]])
+    with pytest.raises(ValueError,
+                       match="'yerr' must not contain negative values"):
+        ax.errorbar(x=[0], y=[0], yerr=[[-0.5], [1]])
+    with pytest.raises(ValueError,
+                       match="'yerr' must not contain negative values"):
+        x = np.arange(5)
+        y = [datetime.datetime(2021, 9, i * 2 + 1) for i in x]
+        ax.errorbar(x=x,
+                    y=y,
+                    yerr=datetime.timedelta(days=-10))
+
+
 @check_figures_equal()
 def test_errorbar_every(fig_test, fig_ref):
     x = np.linspace(0, 1, 15)
@@ -3496,6 +3913,25 @@ def test_errorbar_every(fig_test, fig_ref):
                     capsize=4, c='C1', fmt='none')
 
 
+@pytest.mark.parametrize('elinewidth', [[1, 2, 3],
+                                        np.array([1, 2, 3]),
+                                        1])
+def test_errorbar_linewidth_type(elinewidth):
+    plt.errorbar([1, 2, 3], [1, 2, 3], yerr=[1, 2, 3], elinewidth=elinewidth)
+
+
+@check_figures_equal(extensions=["png"])
+def test_errorbar_nan(fig_test, fig_ref):
+    ax = fig_test.add_subplot()
+    xs = range(5)
+    ys = np.array([1, 2, np.nan, np.nan, 3])
+    es = np.array([4, 5, np.nan, np.nan, 6])
+    ax.errorbar(xs, ys, es)
+    ax = fig_ref.add_subplot()
+    ax.errorbar([0, 1], [1, 2], [4, 5])
+    ax.errorbar([4], [3], [6], fmt="C0")
+
+
 @image_comparison(['hist_stacked_stepfilled', 'hist_stacked_stepfilled'])
 def test_hist_stacked_stepfilled():
     # make some data
@@ -3559,23 +3995,102 @@ def test_stem(use_line_collection):
     fig, ax = plt.subplots()
     # Label is a single space to force a legend to be drawn, but to avoid any
     # text being drawn
-    ax.stem(x, np.cos(x),
-            linefmt='C2-.', markerfmt='k+', basefmt='C1-.', label=' ',
-            use_line_collection=use_line_collection)
+    if use_line_collection:
+        ax.stem(x, np.cos(x),
+                linefmt='C2-.', markerfmt='k+', basefmt='C1-.', label=' ')
+    else:
+        with pytest.warns(MatplotlibDeprecationWarning, match='deprecated'):
+            ax.stem(x, np.cos(x),
+                    linefmt='C2-.', markerfmt='k+', basefmt='C1-.', label=' ',
+                    use_line_collection=False)
     ax.legend()
 
 
 def test_stem_args():
+    """Test that stem() correctly identifies x and y values."""
+    def _assert_equal(stem_container, expected):
+        x, y = map(list, stem_container.markerline.get_data())
+        assert x == expected[0]
+        assert y == expected[1]
+
     fig, ax = plt.subplots()
 
-    x = list(range(10))
-    y = list(range(10))
+    x = [1, 3, 5]
+    y = [9, 8, 7]
 
     # Test the call signatures
-    ax.stem(y)
-    ax.stem(x, y)
-    ax.stem(x, y, 'r--')
-    ax.stem(x, y, 'r--', basefmt='b--')
+    _assert_equal(ax.stem(y), expected=([0, 1, 2], y))
+    _assert_equal(ax.stem(x, y), expected=(x, y))
+    _assert_equal(ax.stem(x, y, linefmt='r--'), expected=(x, y))
+    _assert_equal(ax.stem(x, y, 'r--'), expected=(x, y))
+    _assert_equal(ax.stem(x, y, linefmt='r--', basefmt='b--'), expected=(x, y))
+    _assert_equal(ax.stem(y, linefmt='r--'), expected=([0, 1, 2], y))
+    _assert_equal(ax.stem(y, 'r--'), expected=([0, 1, 2], y))
+
+
+def test_stem_markerfmt():
+    """Test that stem(..., markerfmt=...) produces the intended markers."""
+    def _assert_equal(stem_container, linecolor=None, markercolor=None,
+                      marker=None):
+        """
+        Check that the given StemContainer has the properties listed as
+        keyword-arguments.
+        """
+        if linecolor is not None:
+            assert mcolors.same_color(
+                stem_container.stemlines.get_color(),
+                linecolor)
+        if markercolor is not None:
+            assert mcolors.same_color(
+                stem_container.markerline.get_color(),
+                markercolor)
+        if marker is not None:
+            assert stem_container.markerline.get_marker() == marker
+        assert stem_container.markerline.get_linestyle() == 'None'
+
+    fig, ax = plt.subplots()
+
+    x = [1, 3, 5]
+    y = [9, 8, 7]
+
+    # no linefmt
+    _assert_equal(ax.stem(x, y), markercolor='C0', marker='o')
+    _assert_equal(ax.stem(x, y, markerfmt='x'), markercolor='C0', marker='x')
+    _assert_equal(ax.stem(x, y, markerfmt='rx'), markercolor='r', marker='x')
+
+    # positional linefmt
+    _assert_equal(
+        ax.stem(x, y, 'r'),  # marker color follows linefmt if not given
+        linecolor='r', markercolor='r', marker='o')
+    _assert_equal(
+        ax.stem(x, y, 'rx'),  # the marker is currently not taken from linefmt
+        linecolor='r', markercolor='r', marker='o')
+    _assert_equal(
+        ax.stem(x, y, 'r', markerfmt='x'),  # only marker type specified
+        linecolor='r', markercolor='r', marker='x')
+    _assert_equal(
+        ax.stem(x, y, 'r', markerfmt='g'),  # only marker color specified
+        linecolor='r', markercolor='g', marker='o')
+    _assert_equal(
+        ax.stem(x, y, 'r', markerfmt='gx'),  # marker type and color specified
+        linecolor='r', markercolor='g', marker='x')
+    _assert_equal(
+        ax.stem(x, y, 'r', markerfmt=' '),  # markerfmt=' ' for no marker
+        linecolor='r', markercolor='r', marker='None')
+    _assert_equal(
+        ax.stem(x, y, 'r', markerfmt=''),  # markerfmt='' for no marker
+        linecolor='r', markercolor='r', marker='None')
+
+    # with linefmt kwarg
+    _assert_equal(
+        ax.stem(x, y, linefmt='r'),
+        linecolor='r', markercolor='r', marker='o')
+    _assert_equal(
+        ax.stem(x, y, linefmt='r', markerfmt='x'),
+        linecolor='r', markercolor='r', marker='x')
+    _assert_equal(
+        ax.stem(x, y, linefmt='r', markerfmt='gx'),
+        linecolor='r', markercolor='g', marker='x')
 
 
 def test_stem_dates():
@@ -3583,7 +4098,7 @@ def test_stem_dates():
     xs = [dateutil.parser.parse("2013-9-28 11:00:00"),
           dateutil.parser.parse("2013-9-28 12:00:00")]
     ys = [100, 200]
-    ax.stem(xs, ys, "*-")
+    ax.stem(xs, ys)
 
 
 @pytest.mark.parametrize("use_line_collection", [True, False],
@@ -3593,9 +4108,16 @@ def test_stem_orientation(use_line_collection):
     x = np.linspace(0.1, 2*np.pi, 50)
 
     fig, ax = plt.subplots()
-    ax.stem(x, np.cos(x),
-            linefmt='C2-.', markerfmt='kx', basefmt='C1-.',
-            use_line_collection=use_line_collection, orientation='horizontal')
+    if use_line_collection:
+        ax.stem(x, np.cos(x),
+                linefmt='C2-.', markerfmt='kx', basefmt='C1-.',
+                orientation='horizontal')
+    else:
+        with pytest.warns(MatplotlibDeprecationWarning, match='deprecated'):
+            ax.stem(x, np.cos(x),
+                    linefmt='C2-.', markerfmt='kx', basefmt='C1-.',
+                    use_line_collection=False,
+                    orientation='horizontal')
 
 
 @image_comparison(['hist_stacked_stepfilled_alpha'])
@@ -3778,7 +4300,7 @@ def test_hist_stacked_bar():
     fig, ax = plt.subplots()
     ax.hist(d, bins=10, histtype='barstacked', align='mid', color=colors,
             label=labels)
-    ax.legend(loc='upper right', bbox_to_anchor=(1.0, 1.0), ncol=1)
+    ax.legend(loc='upper right', bbox_to_anchor=(1.0, 1.0), ncols=1)
 
 
 def test_hist_barstacked_bottom_unchanged():
@@ -4006,8 +4528,8 @@ def test_eventplot_colors(colors):
 def test_eventplot_problem_kwargs(recwarn):
     """
     test that 'singular' versions of LineCollection props raise an
-    IgnoredKeywordWarning rather than overriding the 'plural' versions (e.g.
-    to prevent 'color' from overriding 'colors', see issue #4297)
+    MatplotlibDeprecationWarning rather than overriding the 'plural' versions
+    (e.g., to prevent 'color' from overriding 'colors', see issue #4297)
     """
     np.random.seed(0)
 
@@ -4026,7 +4548,6 @@ def test_eventplot_problem_kwargs(recwarn):
                     linestyles=['solid', 'dashed'],
                     linestyle=['dashdot', 'dotted'])
 
-    # check that three IgnoredKeywordWarnings were raised
     assert len(recwarn) == 3
     assert all(issubclass(wi.category, MatplotlibDeprecationWarning)
                for wi in recwarn)
@@ -4039,23 +4560,42 @@ def test_empty_eventplot():
 
 
 @pytest.mark.parametrize('data', [[[]], [[], [0, 1]], [[0, 1], []]])
-@pytest.mark.parametrize(
-    'orientation', ['_empty', 'vertical', 'horizontal', None, 'none'])
+@pytest.mark.parametrize('orientation', [None, 'vertical', 'horizontal'])
 def test_eventplot_orientation(data, orientation):
     """Introduced when fixing issue #6412."""
-    opts = {} if orientation == "_empty" else {'orientation': orientation}
+    opts = {} if orientation is None else {'orientation': orientation}
     fig, ax = plt.subplots(1, 1)
-    with (pytest.warns(MatplotlibDeprecationWarning)
-          if orientation in [None, 'none'] else nullcontext()):
-        ax.eventplot(data, **opts)
+    ax.eventplot(data, **opts)
     plt.draw()
 
 
+@check_figures_equal(extensions=['png'])
+def test_eventplot_units_list(fig_test, fig_ref):
+    # test that list of lists converted properly:
+    ts_1 = [datetime.datetime(2021, 1, 1), datetime.datetime(2021, 1, 2),
+            datetime.datetime(2021, 1, 3)]
+    ts_2 = [datetime.datetime(2021, 1, 15), datetime.datetime(2021, 1, 16)]
+
+    ax = fig_ref.subplots()
+    ax.eventplot(ts_1, lineoffsets=0)
+    ax.eventplot(ts_2, lineoffsets=1)
+
+    ax = fig_test.subplots()
+    ax.eventplot([ts_1, ts_2])
+
+
 @image_comparison(['marker_styles.png'], remove_text=True)
 def test_marker_styles():
     fig, ax = plt.subplots()
-    for y, marker in enumerate(sorted(matplotlib.markers.MarkerStyle.markers,
-                                      key=lambda x: str(type(x))+str(x))):
+    # Since generation of the test image, None was removed but 'none' was
+    # added. By moving 'none' to the front (=former sorted place of None)
+    # we can avoid regenerating the test image. This can be removed if the
+    # test image has to be regenerated for other reasons.
+    markers = sorted(matplotlib.markers.MarkerStyle.markers,
+                     key=lambda x: str(type(x))+str(x))
+    markers.remove('none')
+    markers = ['none', *markers]
+    for y, marker in enumerate(markers):
         ax.plot((y % 2)*5 + np.arange(10)*10, np.ones(10)*10*y, linestyle='',
                 marker=marker, markersize=10+y/5, label=marker)
 
@@ -4600,6 +5140,31 @@ def test_spectrum():
             ax.set(xlabel="", ylabel="")
 
 
+def test_psd_csd_edge_cases():
+    # Inverted yaxis or fully zero inputs used to throw exceptions.
+    axs = plt.figure().subplots(2)
+    for ax in axs:
+        ax.yaxis.set(inverted=True)
+    with np.errstate(divide="ignore"):
+        axs[0].psd(np.zeros(5))
+        axs[1].csd(np.zeros(5), np.zeros(5))
+
+
+@check_figures_equal(extensions=['png'])
+def test_twin_remove(fig_test, fig_ref):
+    ax_test = fig_test.add_subplot()
+    ax_twinx = ax_test.twinx()
+    ax_twiny = ax_test.twiny()
+    ax_twinx.remove()
+    ax_twiny.remove()
+
+    ax_ref = fig_ref.add_subplot()
+    # Ideally we also undo tick changes when calling ``remove()``, but for now
+    # manually set the ticks of the reference image to match the test image
+    ax_ref.xaxis.tick_bottom()
+    ax_ref.yaxis.tick_left()
+
+
 @image_comparison(['twin_spines.png'], remove_text=True)
 def test_twin_spines():
 
@@ -4707,6 +5272,39 @@ def test_grid():
     assert not ax.xaxis.majorTicks[0].gridline.get_visible()
 
 
+def test_reset_grid():
+    fig, ax = plt.subplots()
+    ax.tick_params(reset=True, which='major', labelsize=10)
+    assert not ax.xaxis.majorTicks[0].gridline.get_visible()
+    ax.grid(color='red')  # enables grid
+    assert ax.xaxis.majorTicks[0].gridline.get_visible()
+
+    with plt.rc_context({'axes.grid': True}):
+        ax.clear()
+        ax.tick_params(reset=True, which='major', labelsize=10)
+        assert ax.xaxis.majorTicks[0].gridline.get_visible()
+
+
+@check_figures_equal(extensions=['png'])
+def test_reset_ticks(fig_test, fig_ref):
+    for fig in [fig_ref, fig_test]:
+        ax = fig.add_subplot()
+        ax.grid(True)
+        ax.tick_params(
+            direction='in', length=10, width=5, color='C0', pad=12,
+            labelsize=14, labelcolor='C1', labelrotation=45,
+            grid_color='C2', grid_alpha=0.8, grid_linewidth=3,
+            grid_linestyle='--')
+        fig.draw_without_rendering()
+
+    # After we've changed any setting on ticks, reset_ticks will mean
+    # re-creating them from scratch. This *should* appear the same as not
+    # resetting them.
+    for ax in fig_test.axes:
+        ax.xaxis.reset_ticks()
+        ax.yaxis.reset_ticks()
+
+
 def test_vline_limit():
     fig = plt.figure()
     ax = fig.gca()
@@ -4787,6 +5385,57 @@ def test_shared_with_aspect_3():
             assert round(expected, 4) == round(ax.get_aspect(), 4)
 
 
+def test_shared_aspect_error():
+    fig, axes = plt.subplots(1, 2, sharex=True, sharey=True)
+    axes[0].axis("equal")
+    with pytest.raises(RuntimeError, match=r"set_aspect\(..., adjustable="):
+        fig.draw_without_rendering()
+
+
+@pytest.mark.parametrize('err, args, kwargs, match',
+                         ((TypeError, (1, 2), {},
+                           r"axis\(\) takes 0 or 1 positional arguments but 2"
+                           " were given"),
+                          (ValueError, ('foo', ), {},
+                           "Unrecognized string 'foo' to axis; try 'on' or "
+                           "'off'"),
+                          (TypeError, ([1, 2], ), {},
+                           "the first argument to axis*"),
+                          (TypeError, tuple(), {'foo': None},
+                           r"axis\(\) got an unexpected keyword argument "
+                           "'foo'"),
+                          ))
+def test_axis_errors(err, args, kwargs, match):
+    with pytest.raises(err, match=match):
+        plt.axis(*args, **kwargs)
+
+
+def test_axis_method_errors():
+    ax = plt.gca()
+    with pytest.raises(ValueError, match="unknown value for which: 'foo'"):
+        ax.get_xaxis_transform('foo')
+    with pytest.raises(ValueError, match="unknown value for which: 'foo'"):
+        ax.get_yaxis_transform('foo')
+    with pytest.raises(TypeError, match="Cannot supply both positional and"):
+        ax.set_prop_cycle('foo', label='bar')
+    with pytest.raises(ValueError, match="argument must be among"):
+        ax.set_anchor('foo')
+    with pytest.raises(ValueError, match="scilimits must be a sequence"):
+        ax.ticklabel_format(scilimits=1)
+    with pytest.raises(TypeError, match="Specifying 'loc' is disallowed"):
+        ax.set_xlabel('foo', loc='left', x=1)
+    with pytest.raises(TypeError, match="Specifying 'loc' is disallowed"):
+        ax.set_ylabel('foo', loc='top', y=1)
+    with pytest.raises(TypeError, match="Cannot pass both 'left'"):
+        ax.set_xlim(left=0, xmin=1)
+    with pytest.raises(TypeError, match="Cannot pass both 'right'"):
+        ax.set_xlim(right=0, xmax=1)
+    with pytest.raises(TypeError, match="Cannot pass both 'bottom'"):
+        ax.set_ylim(bottom=0, ymin=1)
+    with pytest.raises(TypeError, match="Cannot pass both 'top'"):
+        ax.set_ylim(top=0, ymax=1)
+
+
 @pytest.mark.parametrize('twin', ('x', 'y'))
 def test_twin_with_aspect(twin):
     fig, ax = plt.subplots()
@@ -4846,7 +5495,7 @@ def test_pie_default():
 
 
 @image_comparison(['pie_linewidth_0', 'pie_linewidth_0', 'pie_linewidth_0'],
-                  extensions=['png'])
+                  extensions=['png'], style='mpl20')
 def test_pie_linewidth_0():
     # The slices will be ordered and plotted counter-clockwise.
     labels = 'Frogs', 'Hogs', 'Dogs', 'Logs'
@@ -4878,7 +5527,7 @@ def test_pie_linewidth_0():
     plt.axis('equal')
 
 
-@image_comparison(['pie_center_radius.png'])
+@image_comparison(['pie_center_radius.png'], style='mpl20')
 def test_pie_center_radius():
     # The slices will be ordered and plotted counter-clockwise.
     labels = 'Frogs', 'Hogs', 'Dogs', 'Logs'
@@ -4890,14 +5539,15 @@ def test_pie_center_radius():
             autopct='%1.1f%%', shadow=True, startangle=90,
             wedgeprops={'linewidth': 0}, center=(1, 2), radius=1.5)
 
-    plt.annotate("Center point", xy=(1, 2), xytext=(1, 1.5),
+    plt.annotate("Center point", xy=(1, 2), xytext=(1, 1.3),
                  arrowprops=dict(arrowstyle="->",
-                                 connectionstyle="arc3"))
+                                 connectionstyle="arc3"),
+                 bbox=dict(boxstyle="square", facecolor="lightgrey"))
     # Set aspect ratio to be equal so that pie is drawn as a circle.
     plt.axis('equal')
 
 
-@image_comparison(['pie_linewidth_2.png'])
+@image_comparison(['pie_linewidth_2.png'], style='mpl20')
 def test_pie_linewidth_2():
     # The slices will be ordered and plotted counter-clockwise.
     labels = 'Frogs', 'Hogs', 'Dogs', 'Logs'
@@ -4912,7 +5562,7 @@ def test_pie_linewidth_2():
     plt.axis('equal')
 
 
-@image_comparison(['pie_ccw_true.png'])
+@image_comparison(['pie_ccw_true.png'], style='mpl20')
 def test_pie_ccw_true():
     # The slices will be ordered and plotted counter-clockwise.
     labels = 'Frogs', 'Hogs', 'Dogs', 'Logs'
@@ -4927,7 +5577,7 @@ def test_pie_ccw_true():
     plt.axis('equal')
 
 
-@image_comparison(['pie_frame_grid.png'])
+@image_comparison(['pie_frame_grid.png'], style='mpl20')
 def test_pie_frame_grid():
     # The slices will be ordered and plotted counter-clockwise.
     labels = 'Frogs', 'Hogs', 'Dogs', 'Logs'
@@ -4954,7 +5604,7 @@ def test_pie_frame_grid():
     plt.axis('equal')
 
 
-@image_comparison(['pie_rotatelabels_true.png'])
+@image_comparison(['pie_rotatelabels_true.png'], style='mpl20')
 def test_pie_rotatelabels_true():
     # The slices will be ordered and plotted counter-clockwise.
     labels = 'Hogwarts', 'Frogs', 'Dogs', 'Logs'
@@ -5012,12 +5662,6 @@ def test_pie_get_negative_values():
         ax.pie([5, 5, -3], explode=[0, .1, .2])
 
 
-def test_normalize_kwarg_warn_pie():
-    fig, ax = plt.subplots()
-    with pytest.warns(MatplotlibDeprecationWarning):
-        ax.pie(x=[0], normalize=None)
-
-
 def test_normalize_kwarg_pie():
     fig, ax = plt.subplots()
     x = [0.3, 0.3, 0.1]
@@ -5053,6 +5697,37 @@ def test_set_get_ticklabels():
     ax[1].set_yticklabels(ax[0].get_yticklabels())
 
 
+@check_figures_equal(extensions=["png"])
+def test_set_ticks_with_labels(fig_test, fig_ref):
+    """
+    Test that these two are identical::
+
+        set_xticks(ticks); set_xticklabels(labels, **kwargs)
+        set_xticks(ticks, labels, **kwargs)
+
+    """
+    ax = fig_ref.subplots()
+    ax.set_xticks([1, 2, 4, 6])
+    ax.set_xticklabels(['a', 'b', 'c', 'd'], fontweight='bold')
+    ax.set_yticks([1, 3, 5])
+    ax.set_yticks([2, 4], minor=True)
+    ax.set_yticklabels(['A', 'B'], minor=True)
+
+    ax = fig_test.subplots()
+    ax.set_xticks([1, 2, 4, 6], ['a', 'b', 'c', 'd'], fontweight='bold')
+    ax.set_yticks([1, 3, 5])
+    ax.set_yticks([2, 4], ['A', 'B'], minor=True)
+
+
+def test_set_noniterable_ticklabels():
+    # Ensure a useful TypeError message is raised
+    # when given a non-iterable ticklabels argument
+    # Pull request #22710
+    with pytest.raises(TypeError, match='must be a sequence'):
+        fig, ax = plt.subplots(2)
+        ax[1].set_xticks([2, 9], 3.1)
+
+
 def test_subsampled_ticklabels():
     # test issue 11937
     fig, ax = plt.subplots()
@@ -5163,12 +5838,54 @@ def test_set_margin_updates_limits():
     assert ax.get_xlim() == (1, 2)
 
 
+@pytest.mark.parametrize('err, args, kwargs, match', (
+        (ValueError, (-1,), {}, r'margin must be greater than -0\.5'),
+        (ValueError, (1, -1), {}, r'margin must be greater than -0\.5'),
+        (ValueError, tuple(), {'x': -1}, r'margin must be greater than -0\.5'),
+        (ValueError, tuple(), {'y': -1}, r'margin must be greater than -0\.5'),
+        (TypeError, (1, ), {'x': 1, 'y': 1},
+         'Cannot pass both positional and keyword arguments for x and/or y'),
+        (TypeError, (1, ), {'x': 1},
+         'Cannot pass both positional and keyword arguments for x and/or y'),
+        (TypeError, (1, 1, 1), {}, 'Must pass a single positional argument'),
+))
+def test_margins_errors(err, args, kwargs, match):
+    with pytest.raises(err, match=match):
+        fig = plt.figure()
+        ax = fig.add_subplot()
+        ax.margins(*args, **kwargs)
+
+
 def test_length_one_hist():
     fig, ax = plt.subplots()
     ax.hist(1)
     ax.hist([1])
 
 
+def test_set_xy_bound():
+    fig = plt.figure()
+    ax = fig.add_subplot()
+    ax.set_xbound(2.0, 3.0)
+    assert ax.get_xbound() == (2.0, 3.0)
+    assert ax.get_xlim() == (2.0, 3.0)
+    ax.set_xbound(upper=4.0)
+    assert ax.get_xbound() == (2.0, 4.0)
+    assert ax.get_xlim() == (2.0, 4.0)
+    ax.set_xbound(lower=3.0)
+    assert ax.get_xbound() == (3.0, 4.0)
+    assert ax.get_xlim() == (3.0, 4.0)
+
+    ax.set_ybound(2.0, 3.0)
+    assert ax.get_ybound() == (2.0, 3.0)
+    assert ax.get_ylim() == (2.0, 3.0)
+    ax.set_ybound(upper=4.0)
+    assert ax.get_ybound() == (2.0, 4.0)
+    assert ax.get_ylim() == (2.0, 4.0)
+    ax.set_ybound(lower=3.0)
+    assert ax.get_ybound() == (3.0, 4.0)
+    assert ax.get_ylim() == (3.0, 4.0)
+
+
 def test_pathological_hexbin():
     # issue #2863
     mylist = [10] * 100
@@ -5459,6 +6176,17 @@ def test_title_location_roundtrip():
         ax.set_title('fail', loc='foo')
 
 
+@pytest.mark.parametrize('sharex', [True, False])
+def test_title_location_shared(sharex):
+    fig, axs = plt.subplots(2, 1, sharex=sharex)
+    axs[0].set_title('A', pad=-40)
+    axs[1].set_title('B', pad=-40)
+    fig.draw_without_rendering()
+    x, y1 = axs[0].title.get_position()
+    x, y2 = axs[1].title.get_position()
+    assert y1 == y2 == 1.0
+
+
 @image_comparison(["loglog.png"], remove_text=True, tol=0.02)
 def test_loglog():
     fig, ax = plt.subplots()
@@ -5468,41 +6196,29 @@ def test_loglog():
     ax.tick_params(length=15, width=2, which='minor')
 
 
-@pytest.mark.parametrize("new_api", [False, True])
 @image_comparison(["test_loglog_nonpos.png"], remove_text=True, style='mpl20')
-def test_loglog_nonpos(new_api):
+def test_loglog_nonpos():
     fig, axs = plt.subplots(3, 3)
     x = np.arange(1, 11)
     y = x**3
     y[7] = -3.
     x[4] = -10
-    for (i, j), ax in np.ndenumerate(axs):
-        mcx = ['mask', 'clip', ''][j]
-        mcy = ['mask', 'clip', ''][i]
-        if new_api:
-            if mcx == mcy:
-                if mcx:
-                    ax.loglog(x, y**3, lw=2, nonpositive=mcx)
-                else:
-                    ax.loglog(x, y**3, lw=2)
+    for (mcy, mcx), ax in zip(product(['mask', 'clip', ''], repeat=2),
+                              axs.flat):
+        if mcx == mcy:
+            if mcx:
+                ax.loglog(x, y**3, lw=2, nonpositive=mcx)
             else:
                 ax.loglog(x, y**3, lw=2)
-                if mcx:
-                    ax.set_xscale("log", nonpositive=mcx)
-                if mcy:
-                    ax.set_yscale("log", nonpositive=mcy)
         else:
-            kws = {}
+            ax.loglog(x, y**3, lw=2)
             if mcx:
-                kws['nonposx'] = mcx
+                ax.set_xscale("log", nonpositive=mcx)
             if mcy:
-                kws['nonposy'] = mcy
-            with (pytest.warns(MatplotlibDeprecationWarning) if kws
-                  else nullcontext()):
-                ax.loglog(x, y**3, lw=2, **kws)
+                ax.set_yscale("log", nonpositive=mcy)
 
 
-@pytest.mark.style('default')
+@mpl.style.context('default')
 def test_axes_margins():
     fig, ax = plt.subplots()
     ax.plot([0, 1, 2, 3])
@@ -5616,18 +6332,21 @@ def test_adjust_numtick_aspect():
     assert len(ax.yaxis.get_major_locator()()) > 2
 
 
-@image_comparison(["auto_numticks.png"], style='default')
+@mpl.style.context("default")
 def test_auto_numticks():
-    # Make tiny, empty subplots, verify that there are only 3 ticks.
-    plt.subplots(4, 4)
+    axs = plt.figure().subplots(4, 4)
+    for ax in axs.flat:  # Tiny, empty subplots have only 3 ticks.
+        assert [*ax.get_xticks()] == [*ax.get_yticks()] == [0, 0.5, 1]
 
 
-@image_comparison(["auto_numticks_log.png"], style='default')
+@mpl.style.context("default")
 def test_auto_numticks_log():
     # Verify that there are not too many ticks with a large log range.
     fig, ax = plt.subplots()
-    matplotlib.rcParams['axes.autolimit_mode'] = 'round_numbers'
+    mpl.rcParams['axes.autolimit_mode'] = 'round_numbers'
     ax.loglog([1e-20, 1e5], [1e-16, 10])
+    assert (np.log10(ax.get_xticks()) == np.arange(-26, 18, 4)).all()
+    assert (np.log10(ax.get_yticks()) == np.arange(-20, 10, 3)).all()
 
 
 def test_broken_barh_empty():
@@ -5698,6 +6417,24 @@ def test_pandas_bar_align_center(pd):
     fig.canvas.draw()
 
 
+def test_tick_apply_tickdir_deprecation():
+    # Remove this test when the deprecation expires.
+    import matplotlib.axis as maxis
+    ax = plt.axes()
+
+    tick = maxis.XTick(ax, 0)
+    with pytest.warns(MatplotlibDeprecationWarning,
+                      match="The apply_tickdir function was deprecated in "
+                            "Matplotlib 3.5"):
+        tick.apply_tickdir('out')
+
+    tick = maxis.YTick(ax, 0)
+    with pytest.warns(MatplotlibDeprecationWarning,
+                      match="The apply_tickdir function was deprecated in "
+                            "Matplotlib 3.5"):
+        tick.apply_tickdir('out')
+
+
 def test_axis_set_tick_params_labelsize_labelcolor():
     # Tests fix for issue 4346
     axis_1 = plt.subplot()
@@ -5835,6 +6572,7 @@ def test_axisbelow():
                        left=False, right=False)
         ax.spines[:].set_visible(False)
         ax.set_axisbelow(setting)
+        assert ax.get_axisbelow() == setting
 
 
 def test_titletwiny():
@@ -5888,8 +6626,38 @@ def test_title_xticks_top_both():
     assert ax.title.get_position()[1] > 1.04
 
 
+@pytest.mark.parametrize(
+    'left, center', [
+        ('left', ''),
+        ('', 'center'),
+        ('left', 'center')
+    ], ids=[
+        'left title moved',
+        'center title kept',
+        'both titles aligned'
+    ]
+)
+def test_title_above_offset(left, center):
+    # Test that title moves if overlaps with yaxis offset text.
+    mpl.rcParams['axes.titley'] = None
+    fig, ax = plt.subplots()
+    ax.set_ylim(1e11)
+    ax.set_title(left, loc='left')
+    ax.set_title(center)
+    fig.draw_without_rendering()
+    if left and not center:
+        assert ax._left_title.get_position()[1] > 1.0
+    elif not left and center:
+        assert ax.title.get_position()[1] == 1.0
+    else:
+        yleft = ax._left_title.get_position()[1]
+        ycenter = ax.title.get_position()[1]
+        assert yleft > 1.0
+        assert ycenter == yleft
+
+
 def test_title_no_move_off_page():
-    # If an axes is off the figure (ie. if it is cropped during a save)
+    # If an Axes is off the figure (ie. if it is cropped during a save)
     # make sure that the automatic title repositioning does not get done.
     mpl.rcParams['axes.titley'] = None
     fig = plt.figure()
@@ -5969,7 +6737,7 @@ def test_tick_param_label_rotation():
         assert text.get_rotation() == 35
 
 
-@pytest.mark.style('default')
+@mpl.style.context('default')
 def test_fillbetween_cycle():
     fig, ax = plt.subplots()
 
@@ -6175,13 +6943,38 @@ def test_zoom_inset():
     fig.canvas.draw()
     xx = np.array([[1.5,  2.],
                    [2.15, 2.5]])
-    assert(np.all(rec.get_bbox().get_points() == xx))
+    assert np.all(rec.get_bbox().get_points() == xx)
     xx = np.array([[0.6325, 0.692308],
                    [0.8425, 0.907692]])
     np.testing.assert_allclose(
         axin1.get_position().get_points(), xx, rtol=1e-4)
 
 
+@image_comparison(['inset_polar.png'], remove_text=True, style='mpl20')
+def test_inset_polar():
+    _, ax = plt.subplots()
+    axins = ax.inset_axes([0.5, 0.1, 0.45, 0.45], polar=True)
+    assert isinstance(axins, PolarAxes)
+
+    r = np.arange(0, 2, 0.01)
+    theta = 2 * np.pi * r
+
+    ax.plot(theta, r)
+    axins.plot(theta, r)
+
+
+def test_inset_projection():
+    _, ax = plt.subplots()
+    axins = ax.inset_axes([0.2, 0.2, 0.3, 0.3], projection="hammer")
+    assert isinstance(axins, HammerAxes)
+
+
+def test_inset_subclass():
+    _, ax = plt.subplots()
+    axins = ax.inset_axes([0.2, 0.2, 0.3, 0.3], axes_class=AA.Axes)
+    assert isinstance(axins, AA.Axes)
+
+
 @pytest.mark.parametrize('x_inverted', [False, True])
 @pytest.mark.parametrize('y_inverted', [False, True])
 def test_indicate_inset_inverted(x_inverted, y_inverted):
@@ -6231,21 +7024,6 @@ def test_spines_properbbox_after_zoom():
     np.testing.assert_allclose(bb.get_points(), bb2.get_points(), rtol=1e-6)
 
 
-def test_cartopy_backcompat():
-
-    class Dummy(matplotlib.axes.Axes):
-        ...
-
-    class DummySubplot(matplotlib.axes.SubplotBase, Dummy):
-        _axes_class = Dummy
-
-    matplotlib.axes._subplots._subplot_classes[Dummy] = DummySubplot
-
-    FactoryDummySubplot = matplotlib.axes.subplot_class_factory(Dummy)
-
-    assert DummySubplot is FactoryDummySubplot
-
-
 def test_gettightbbox_ignore_nan():
     fig, ax = plt.subplots()
     remove_ticks_and_titles(fig)
@@ -6366,7 +7144,13 @@ def test_secondary_formatter():
         secax.xaxis.get_major_formatter(), mticker.ScalarFormatter)
 
 
-def color_boxes(fig, axs):
+def test_secondary_repr():
+    fig, ax = plt.subplots()
+    secax = ax.secondary_xaxis("top")
+    assert repr(secax) == '<SecondaryAxis: >'
+
+
+def color_boxes(fig, ax):
     """
     Helper for the tests below that test the extents of various axes elements
     """
@@ -6374,10 +7158,10 @@ def color_boxes(fig, axs):
 
     renderer = fig.canvas.get_renderer()
     bbaxis = []
-    for nn, axx in enumerate([axs.xaxis, axs.yaxis]):
+    for nn, axx in enumerate([ax.xaxis, ax.yaxis]):
         bb = axx.get_tightbbox(renderer)
         if bb:
-            axisr = plt.Rectangle(
+            axisr = mpatches.Rectangle(
                 (bb.x0, bb.y0), width=bb.width, height=bb.height,
                 linewidth=0.7, edgecolor='y', facecolor="none", transform=None,
                 zorder=3)
@@ -6386,24 +7170,24 @@ def color_boxes(fig, axs):
 
     bbspines = []
     for nn, a in enumerate(['bottom', 'top', 'left', 'right']):
-        bb = axs.spines[a].get_window_extent(renderer)
-        spiner = plt.Rectangle(
+        bb = ax.spines[a].get_window_extent(renderer)
+        spiner = mpatches.Rectangle(
             (bb.x0, bb.y0), width=bb.width, height=bb.height,
             linewidth=0.7, edgecolor="green", facecolor="none", transform=None,
             zorder=3)
         fig.add_artist(spiner)
         bbspines += [bb]
 
-    bb = axs.get_window_extent()
-    rect2 = plt.Rectangle(
+    bb = ax.get_window_extent()
+    rect2 = mpatches.Rectangle(
         (bb.x0, bb.y0), width=bb.width, height=bb.height,
         linewidth=1.5, edgecolor="magenta", facecolor="none", transform=None,
         zorder=2)
     fig.add_artist(rect2)
     bbax = bb
 
-    bb2 = axs.get_tightbbox(renderer)
-    rect2 = plt.Rectangle(
+    bb2 = ax.get_tightbbox(renderer)
+    rect2 = mpatches.Rectangle(
         (bb2.x0, bb2.y0), width=bb2.width, height=bb2.height,
         linewidth=3, edgecolor="red", facecolor="none", transform=None,
         zorder=1)
@@ -6589,17 +7373,21 @@ def test_axis_extent_arg():
     assert (ymin, ymax) == ax.get_ylim()
 
 
-def test_datetime_masked():
-    # make sure that all-masked data falls back to the viewlim
-    # set in convert.axisinfo....
-    x = np.array([datetime.datetime(2017, 1, n) for n in range(1, 6)])
-    y = np.array([1, 2, 3, 4, 5])
-    m = np.ma.masked_greater(y, 0)
-
+def test_axis_extent_arg2():
+    # Same as test_axis_extent_arg, but with keyword arguments
     fig, ax = plt.subplots()
-    ax.plot(x, m)
-    dt = mdates.date2num(np.datetime64('0000-12-31'))
-    assert ax.get_xlim() == (730120.0 + dt, 733773.0 + dt)
+    xmin = 5
+    xmax = 10
+    ymin = 15
+    ymax = 20
+    extent = ax.axis(xmin=xmin, xmax=xmax, ymin=ymin, ymax=ymax)
+
+    # test that the docstring is correct
+    assert tuple(extent) == (xmin, xmax, ymin, ymax)
+
+    # test that limits were set per the docstring
+    assert (xmin, xmax) == ax.get_xlim()
+    assert (ymin, ymax) == ax.get_ylim()
 
 
 def test_hist_auto_bins():
@@ -6649,6 +7437,8 @@ def test_set_ticks_inverted():
     ax.invert_xaxis()
     ax.set_xticks([.3, .7])
     assert ax.get_xlim() == (1, 0)
+    ax.set_xticks([-1])
+    assert ax.get_xlim() == (1, -1)
 
 
 def test_aspect_nonlinear_adjustable_box():
@@ -6688,6 +7478,7 @@ def test_box_aspect():
     axtwin.plot([12, 344])
 
     ax1.set_box_aspect(1)
+    assert ax1.get_box_aspect() == 1.0
 
     fig2, ax2 = plt.subplots()
     ax2.margins(0)
@@ -6750,7 +7541,7 @@ def test_redraw_in_frame():
     ax.redraw_in_frame()
 
 
-def test_invisible_axes():
+def test_invisible_axes_events():
     # invisible axes should not respond to events...
     fig, ax = plt.subplots()
     assert fig.canvas.inaxes((200, 200)) is not None
@@ -6802,7 +7593,7 @@ def test_polar_interpolation_steps_variable_r(fig_test, fig_ref):
         np.linspace(0, np.pi/2, 101), np.linspace(1, 2, 101))
 
 
-@pytest.mark.style('default')
+@mpl.style.context('default')
 def test_autoscale_tiny_sticky():
     fig, ax = plt.subplots()
     ax.bar(0, 1e-9)
@@ -6832,7 +7623,7 @@ def test_ytickcolor_is_not_yticklabelcolor():
 
 @pytest.mark.parametrize('size', [size for size in mfont_manager.font_scalings
                                   if size is not None] + [8, 10, 12])
-@pytest.mark.style('default')
+@mpl.style.context('default')
 def test_relative_ticklabel_sizes(size):
     mpl.rcParams['xtick.labelsize'] = size
     mpl.rcParams['ytick.labelsize'] = size
@@ -6881,6 +7672,21 @@ def test_2dcolor_plot(fig_test, fig_ref):
     axs[4].bar(np.arange(10), np.arange(10), color=color.reshape((1, -1)))
 
 
+@check_figures_equal(extensions=['png'])
+def test_shared_axes_clear(fig_test, fig_ref):
+    x = np.arange(0.0, 2*np.pi, 0.01)
+    y = np.sin(x)
+
+    axs = fig_ref.subplots(2, 2, sharex=True, sharey=True)
+    for ax in axs.flat:
+        ax.plot(x, y)
+
+    axs = fig_test.subplots(2, 2, sharex=True, sharey=True)
+    for ax in axs.flat:
+        ax.clear()
+        ax.plot(x, y)
+
+
 def test_shared_axes_retick():
     fig, axs = plt.subplots(2, 2, sharex='all', sharey='all')
 
@@ -6918,6 +7724,20 @@ def test_bar_label_location_vertical():
     assert labels[1].get_va() == 'top'
 
 
+def test_bar_label_location_vertical_yinverted():
+    ax = plt.gca()
+    ax.invert_yaxis()
+    xs, heights = [1, 2], [3, -4]
+    rects = ax.bar(xs, heights)
+    labels = ax.bar_label(rects)
+    assert labels[0].xy == (xs[0], heights[0])
+    assert labels[0].get_ha() == 'center'
+    assert labels[0].get_va() == 'top'
+    assert labels[1].xy == (xs[1], heights[1])
+    assert labels[1].get_ha() == 'center'
+    assert labels[1].get_va() == 'bottom'
+
+
 def test_bar_label_location_horizontal():
     ax = plt.gca()
     ys, widths = [1, 2], [3, -4]
@@ -6931,6 +7751,49 @@ def test_bar_label_location_horizontal():
     assert labels[1].get_va() == 'center'
 
 
+def test_bar_label_location_horizontal_yinverted():
+    ax = plt.gca()
+    ax.invert_yaxis()
+    ys, widths = [1, 2], [3, -4]
+    rects = ax.barh(ys, widths)
+    labels = ax.bar_label(rects)
+    assert labels[0].xy == (widths[0], ys[0])
+    assert labels[0].get_ha() == 'left'
+    assert labels[0].get_va() == 'center'
+    assert labels[1].xy == (widths[1], ys[1])
+    assert labels[1].get_ha() == 'right'
+    assert labels[1].get_va() == 'center'
+
+
+def test_bar_label_location_horizontal_xinverted():
+    ax = plt.gca()
+    ax.invert_xaxis()
+    ys, widths = [1, 2], [3, -4]
+    rects = ax.barh(ys, widths)
+    labels = ax.bar_label(rects)
+    assert labels[0].xy == (widths[0], ys[0])
+    assert labels[0].get_ha() == 'right'
+    assert labels[0].get_va() == 'center'
+    assert labels[1].xy == (widths[1], ys[1])
+    assert labels[1].get_ha() == 'left'
+    assert labels[1].get_va() == 'center'
+
+
+def test_bar_label_location_horizontal_xyinverted():
+    ax = plt.gca()
+    ax.invert_xaxis()
+    ax.invert_yaxis()
+    ys, widths = [1, 2], [3, -4]
+    rects = ax.barh(ys, widths)
+    labels = ax.bar_label(rects)
+    assert labels[0].xy == (widths[0], ys[0])
+    assert labels[0].get_ha() == 'right'
+    assert labels[0].get_va() == 'center'
+    assert labels[1].xy == (widths[1], ys[1])
+    assert labels[1].get_ha() == 'left'
+    assert labels[1].get_va() == 'center'
+
+
 def test_bar_label_location_center():
     ax = plt.gca()
     ys, widths = [1, 2], [3, -4]
@@ -6973,19 +7836,372 @@ def test_bar_label_labels():
     assert labels[1].get_text() == 'B'
 
 
+def test_bar_label_nan_ydata():
+    ax = plt.gca()
+    bars = ax.bar([2, 3], [np.nan, 1])
+    labels = ax.bar_label(bars)
+    assert [l.get_text() for l in labels] == ['', '1']
+    assert labels[0].xy == (2, 0)
+    assert labels[0].get_va() == 'bottom'
+
+
+def test_bar_label_nan_ydata_inverted():
+    ax = plt.gca()
+    ax.yaxis_inverted()
+    bars = ax.bar([2, 3], [np.nan, 1])
+    labels = ax.bar_label(bars)
+    assert [l.get_text() for l in labels] == ['', '1']
+    assert labels[0].xy == (2, 0)
+    assert labels[0].get_va() == 'bottom'
+
+
+def test_nan_barlabels():
+    fig, ax = plt.subplots()
+    bars = ax.bar([1, 2, 3], [np.nan, 1, 2], yerr=[0.2, 0.4, 0.6])
+    labels = ax.bar_label(bars)
+    assert [l.get_text() for l in labels] == ['', '1', '2']
+    assert np.allclose(ax.get_ylim(), (0.0, 3.0))
+
+    fig, ax = plt.subplots()
+    bars = ax.bar([1, 2, 3], [0, 1, 2], yerr=[0.2, np.nan, 0.6])
+    labels = ax.bar_label(bars)
+    assert [l.get_text() for l in labels] == ['0', '1', '2']
+    assert np.allclose(ax.get_ylim(), (-0.5, 3.0))
+
+    fig, ax = plt.subplots()
+    bars = ax.bar([1, 2, 3], [np.nan, 1, 2], yerr=[np.nan, np.nan, 0.6])
+    labels = ax.bar_label(bars)
+    assert [l.get_text() for l in labels] == ['', '1', '2']
+    assert np.allclose(ax.get_ylim(), (0.0, 3.0))
+
+
 def test_patch_bounds():  # PR 19078
     fig, ax = plt.subplots()
-    ax.add_patch(mpatches.Wedge((0, -1), 1.05, 60, 120, 0.1))
+    ax.add_patch(mpatches.Wedge((0, -1), 1.05, 60, 120, width=0.1))
     bot = 1.9*np.sin(15*np.pi/180)**2
     np.testing.assert_array_almost_equal_nulp(
         np.array((-0.525, -(bot+0.05), 1.05, bot+0.1)), ax.dataLim.bounds, 16)
 
 
-@pytest.mark.style('default')
+@mpl.style.context('default')
 def test_warn_ignored_scatter_kwargs():
     with pytest.warns(UserWarning,
                       match=r"You passed a edgecolor/edgecolors"):
+        plt.scatter([0], [0], marker="+", s=500, facecolor="r", edgecolor="b")
+
+
+def test_artist_sublists():
+    fig, ax = plt.subplots()
+    lines = [ax.plot(np.arange(i, i + 5))[0] for i in range(6)]
+    col = ax.scatter(np.arange(5), np.arange(5))
+    im = ax.imshow(np.zeros((5, 5)))
+    patch = ax.add_patch(mpatches.Rectangle((0, 0), 5, 5))
+    text = ax.text(0, 0, 'foo')
+
+    # Get items, which should not be mixed.
+    assert list(ax.collections) == [col]
+    assert list(ax.images) == [im]
+    assert list(ax.lines) == lines
+    assert list(ax.patches) == [patch]
+    assert not ax.tables
+    assert list(ax.texts) == [text]
+
+    # Get items should work like lists/tuple.
+    assert ax.lines[0] is lines[0]
+    assert ax.lines[-1] is lines[-1]
+    with pytest.raises(IndexError, match='out of range'):
+        ax.lines[len(lines) + 1]
+
+    # Deleting items (multiple or single) should warn.
+    with pytest.warns(MatplotlibDeprecationWarning,
+                      match='modification of the Axes.lines property'):
+        del ax.lines[-1]
+    with pytest.warns(MatplotlibDeprecationWarning,
+                      match='modification of the Axes.lines property'):
+        del ax.lines[-1:]
+    with pytest.warns(MatplotlibDeprecationWarning,
+                      match='modification of the Axes.lines property'):
+        del ax.lines[1:]
+    with pytest.warns(MatplotlibDeprecationWarning,
+                      match='modification of the Axes.lines property'):
+        del ax.lines[0]
+
+    # Lists should be empty after removing items.
+    col.remove()
+    assert not ax.collections
+    im.remove()
+    assert not ax.images
+    patch.remove()
+    assert not ax.patches
+    text.remove()
+    assert not ax.texts
+
+    # Everything else should remain empty.
+    assert not ax.lines
+    assert not ax.tables
+
+    with pytest.warns(MatplotlibDeprecationWarning,
+                      match='modification of the Axes.texts property'):
+        ax.texts.append(text)
+    with pytest.warns(MatplotlibDeprecationWarning,
+                      match='modification of the Axes.collections property'):
+        ax.collections.append(col)
+    with pytest.warns(MatplotlibDeprecationWarning,
+                      match='modification of the Axes.images property'):
+        ax.images.append(im)
+    with pytest.warns(MatplotlibDeprecationWarning,
+                      match='modification of the Axes.patches property'):
+        ax.patches.append(patch)
+    # verify things are back
+    assert list(ax.collections) == [col]
+    assert list(ax.images) == [im]
+    assert list(ax.patches) == [patch]
+    assert list(ax.texts) == [text]
+
+    # Adding items should warn.
+    with pytest.warns(MatplotlibDeprecationWarning,
+                      match='modification of the Axes.lines property'):
+        ax.lines.append(lines[-2])
+    assert list(ax.lines) == [lines[-2]]
+    with pytest.warns(MatplotlibDeprecationWarning,
+                      match='modification of the Axes.lines property'):
+        ax.lines.append(lines[-1])
+    assert list(ax.lines) == lines[-2:]
+    with pytest.warns(MatplotlibDeprecationWarning,
+                      match='modification of the Axes.lines property'):
+        ax.lines.insert(-2, lines[0])
+    assert list(ax.lines) == [lines[0], lines[-2], lines[-1]]
+
+    # Modifying items should warn.
+    with pytest.warns(MatplotlibDeprecationWarning,
+                      match='modification of the Axes.lines property'):
+        ax.lines[0] = lines[0]
+    assert list(ax.lines) == [lines[0], lines[-2], lines[-1]]
+    with pytest.warns(MatplotlibDeprecationWarning,
+                      match='modification of the Axes.lines property'):
+        ax.lines[1:1] = lines[1:-2]
+    assert list(ax.lines) == lines
+
+    # Adding to other lists should produce a regular list.
+    assert ax.lines + [1, 2, 3] == [*lines, 1, 2, 3]
+    assert [1, 2, 3] + ax.lines == [1, 2, 3, *lines]
+
+    for ln in ax.lines:
+        ln.remove()
+    assert len(ax.lines) == 0
+
+
+def test_empty_line_plots():
+    # Incompatible nr columns, plot "nothing"
+    x = np.ones(10)
+    y = np.ones((10, 0))
+    _, ax = plt.subplots()
+    line = ax.plot(x, y)
+    assert len(line) == 0
+
+    # Ensure plot([],[]) creates line
+    _, ax = plt.subplots()
+    line = ax.plot([], [])
+    assert len(line) == 1
+
+
+@pytest.mark.parametrize('fmt, match', (
+    ("f", r"'f' is not a valid format string \(unrecognized character 'f'\)"),
+    ("o+", r"'o\+' is not a valid format string \(two marker symbols\)"),
+    (":-", r"':-' is not a valid format string \(two linestyle symbols\)"),
+    ("rk", r"'rk' is not a valid format string \(two color symbols\)"),
+    (":o-r", r"':o-r' is not a valid format string \(two linestyle symbols\)"),
+))
+@pytest.mark.parametrize("data", [None, {"string": range(3)}])
+def test_plot_format_errors(fmt, match, data):
+    fig, ax = plt.subplots()
+    if data is not None:
+        match = match.replace("not", "neither a data key nor")
+    with pytest.raises(ValueError, match=r"\A" + match + r"\Z"):
+        ax.plot("string", fmt, data=data)
+
+
+def test_plot_format():
+    fig, ax = plt.subplots()
+    line = ax.plot([1, 2, 3], '1.0')
+    assert line[0].get_color() == (1.0, 1.0, 1.0, 1.0)
+    assert line[0].get_marker() == 'None'
+    fig, ax = plt.subplots()
+    line = ax.plot([1, 2, 3], '1')
+    assert line[0].get_marker() == '1'
+    fig, ax = plt.subplots()
+    line = ax.plot([1, 2], [1, 2], '1.0', "1")
+    fig.canvas.draw()
+    assert line[0].get_color() == (1.0, 1.0, 1.0, 1.0)
+    assert ax.get_yticklabels()[0].get_text() == '1'
+    fig, ax = plt.subplots()
+    line = ax.plot([1, 2], [1, 2], '1', "1.0")
+    fig.canvas.draw()
+    assert line[0].get_marker() == '1'
+    assert ax.get_yticklabels()[0].get_text() == '1.0'
+    fig, ax = plt.subplots()
+    line = ax.plot([1, 2, 3], 'k3')
+    assert line[0].get_marker() == '3'
+    assert line[0].get_color() == 'k'
+
+
+def test_automatic_legend():
+    fig, ax = plt.subplots()
+    ax.plot("a", "b", data={"d": 2})
+    leg = ax.legend()
+    fig.canvas.draw()
+    assert leg.get_texts()[0].get_text() == 'a'
+    assert ax.get_yticklabels()[0].get_text() == 'a'
+
+    fig, ax = plt.subplots()
+    ax.plot("a", "b", "c", data={"d": 2})
+    leg = ax.legend()
+    fig.canvas.draw()
+    assert leg.get_texts()[0].get_text() == 'b'
+    assert ax.get_xticklabels()[0].get_text() == 'a'
+    assert ax.get_yticklabels()[0].get_text() == 'b'
+
+
+def test_plot_errors():
+    with pytest.raises(TypeError, match="plot got an unexpected keyword"):
+        plt.plot([1, 2, 3], x=1)
+    with pytest.raises(ValueError, match=r"plot\(\) with multiple groups"):
+        plt.plot([1, 2, 3], [1, 2, 3], [2, 3, 4], [2, 3, 4], label=['1', '2'])
+    with pytest.raises(ValueError, match="x and y must have same first"):
+        plt.plot([1, 2, 3], [1])
+    with pytest.raises(ValueError, match="x and y can be no greater than"):
+        plt.plot(np.ones((2, 2, 2)))
+    with pytest.raises(ValueError, match="Using arbitrary long args with"):
+        plt.plot("a", "b", "c", "d", data={"a": 2})
+
+
+def test_clim():
+    ax = plt.figure().add_subplot()
+    for plot_method in [
+            partial(ax.scatter, range(3), range(3), c=range(3)),
+            partial(ax.imshow, [[0, 1], [2, 3]]),
+            partial(ax.pcolor,  [[0, 1], [2, 3]]),
+            partial(ax.pcolormesh, [[0, 1], [2, 3]]),
+            partial(ax.pcolorfast, [[0, 1], [2, 3]]),
+    ]:
+        clim = (7, 8)
+        norm = plot_method(clim=clim).norm
+        assert (norm.vmin, norm.vmax) == clim
+
+
+def test_bezier_autoscale():
+    # Check that bezier curves autoscale to their curves, and not their
+    # control points
+    verts = [[-1, 0],
+             [0, -1],
+             [1, 0],
+             [1, 0]]
+    codes = [mpath.Path.MOVETO,
+             mpath.Path.CURVE3,
+             mpath.Path.CURVE3,
+             mpath.Path.CLOSEPOLY]
+    p = mpath.Path(verts, codes)
+
+    fig, ax = plt.subplots()
+    ax.add_patch(mpatches.PathPatch(p))
+    ax.autoscale()
+    # Bottom ylim should be at the edge of the curve (-0.5), and not include
+    # the control point (at -1)
+    assert ax.get_ylim()[0] == -0.5
+
+
+def test_small_autoscale():
+    # Check that paths with small values autoscale correctly #24097.
+    verts = np.array([
+        [-5.45, 0.00], [-5.45, 0.00], [-5.29, 0.00], [-5.29, 0.00],
+        [-5.13, 0.00], [-5.13, 0.00], [-4.97, 0.00], [-4.97, 0.00],
+        [-4.81, 0.00], [-4.81, 0.00], [-4.65, 0.00], [-4.65, 0.00],
+        [-4.49, 0.00], [-4.49, 0.00], [-4.33, 0.00], [-4.33, 0.00],
+        [-4.17, 0.00], [-4.17, 0.00], [-4.01, 0.00], [-4.01, 0.00],
+        [-3.85, 0.00], [-3.85, 0.00], [-3.69, 0.00], [-3.69, 0.00],
+        [-3.53, 0.00], [-3.53, 0.00], [-3.37, 0.00], [-3.37, 0.00],
+        [-3.21, 0.00], [-3.21, 0.01], [-3.05, 0.01], [-3.05, 0.01],
+        [-2.89, 0.01], [-2.89, 0.01], [-2.73, 0.01], [-2.73, 0.02],
+        [-2.57, 0.02], [-2.57, 0.04], [-2.41, 0.04], [-2.41, 0.04],
+        [-2.25, 0.04], [-2.25, 0.06], [-2.09, 0.06], [-2.09, 0.08],
+        [-1.93, 0.08], [-1.93, 0.10], [-1.77, 0.10], [-1.77, 0.12],
+        [-1.61, 0.12], [-1.61, 0.14], [-1.45, 0.14], [-1.45, 0.17],
+        [-1.30, 0.17], [-1.30, 0.19], [-1.14, 0.19], [-1.14, 0.22],
+        [-0.98, 0.22], [-0.98, 0.25], [-0.82, 0.25], [-0.82, 0.27],
+        [-0.66, 0.27], [-0.66, 0.29], [-0.50, 0.29], [-0.50, 0.30],
+        [-0.34, 0.30], [-0.34, 0.32], [-0.18, 0.32], [-0.18, 0.33],
+        [-0.02, 0.33], [-0.02, 0.32], [0.13, 0.32], [0.13, 0.33], [0.29, 0.33],
+        [0.29, 0.31], [0.45, 0.31], [0.45, 0.30], [0.61, 0.30], [0.61, 0.28],
+        [0.77, 0.28], [0.77, 0.25], [0.93, 0.25], [0.93, 0.22], [1.09, 0.22],
+        [1.09, 0.19], [1.25, 0.19], [1.25, 0.17], [1.41, 0.17], [1.41, 0.15],
+        [1.57, 0.15], [1.57, 0.12], [1.73, 0.12], [1.73, 0.10], [1.89, 0.10],
+        [1.89, 0.08], [2.05, 0.08], [2.05, 0.07], [2.21, 0.07], [2.21, 0.05],
+        [2.37, 0.05], [2.37, 0.04], [2.53, 0.04], [2.53, 0.02], [2.69, 0.02],
+        [2.69, 0.02], [2.85, 0.02], [2.85, 0.01], [3.01, 0.01], [3.01, 0.01],
+        [3.17, 0.01], [3.17, 0.00], [3.33, 0.00], [3.33, 0.00], [3.49, 0.00],
+        [3.49, 0.00], [3.65, 0.00], [3.65, 0.00], [3.81, 0.00], [3.81, 0.00],
+        [3.97, 0.00], [3.97, 0.00], [4.13, 0.00], [4.13, 0.00], [4.29, 0.00],
+        [4.29, 0.00], [4.45, 0.00], [4.45, 0.00], [4.61, 0.00], [4.61, 0.00],
+        [4.77, 0.00], [4.77, 0.00], [4.93, 0.00], [4.93, 0.00],
+    ])
+
+    minx = np.min(verts[:, 0])
+    miny = np.min(verts[:, 1])
+    maxx = np.max(verts[:, 0])
+    maxy = np.max(verts[:, 1])
+
+    p = mpath.Path(verts)
+
+    fig, ax = plt.subplots()
+    ax.add_patch(mpatches.PathPatch(p))
+    ax.autoscale()
+
+    assert ax.get_xlim()[0] <= minx
+    assert ax.get_xlim()[1] >= maxx
+    assert ax.get_ylim()[0] <= miny
+    assert ax.get_ylim()[1] >= maxy
+
+
+def test_get_xticklabel():
+    fig, ax = plt.subplots()
+    ax.plot(np.arange(10))
+    for ind in range(10):
+        assert ax.get_xticklabels()[ind].get_text() == f'{ind}'
+        assert ax.get_yticklabels()[ind].get_text() == f'{ind}'
+
+
+def test_bar_leading_nan():
+
+    barx = np.arange(3, dtype=float)
+    barheights = np.array([0.5, 1.5, 2.0])
+    barstarts = np.array([0.77]*3)
+
+    barx[0] = np.NaN
+
+    fig, ax = plt.subplots()
+
+    bars = ax.bar(barx, barheights, bottom=barstarts)
+
+    hbars = ax.barh(barx, barheights, left=barstarts)
+
+    for bar_set in (bars, hbars):
+        # the first bar should have a nan in the location
+        nanful, *rest = bar_set
+        assert (~np.isfinite(nanful.xy)).any()
+        assert np.isfinite(nanful.get_width())
+        for b in rest:
+            assert np.isfinite(b.xy).all()
+            assert np.isfinite(b.get_width())
+
+
+@check_figures_equal(extensions=["png"])
+def test_bar_all_nan(fig_test, fig_ref):
+    mpl.style.use("mpl20")
+    ax_test = fig_test.subplots()
+    ax_ref = fig_ref.subplots()
+
+    ax_test.bar([np.nan], [np.nan])
+    ax_test.bar([1], [1])
 
-        c = plt.scatter(
-            [0], [0], marker="+", s=500, facecolor="r", edgecolor="b"
-        )
+    ax_ref.bar([1], [1]).remove()
+    ax_ref.bar([1], [1])
diff --git a/lib/matplotlib/tests/test_backend_bases.py b/lib/matplotlib/tests/test_backend_bases.py
index 610897da173e..4cbd1bc98b67 100644
--- a/lib/matplotlib/tests/test_backend_bases.py
+++ b/lib/matplotlib/tests/test_backend_bases.py
@@ -1,21 +1,22 @@
 import re
 
-from matplotlib.testing import _check_for_pgf
+from matplotlib import path, transforms
 from matplotlib.backend_bases import (
-    FigureCanvasBase, LocationEvent, MouseButton, MouseEvent,
+    FigureCanvasBase, KeyEvent, LocationEvent, MouseButton, MouseEvent,
     NavigationToolbar2, RendererBase)
-from matplotlib.backend_tools import (ToolZoom, ToolPan, RubberbandBase,
-                                      ToolViewsPositions, _views_positions)
+from matplotlib.backend_tools import RubberbandBase
 from matplotlib.figure import Figure
+from matplotlib.testing._markers import needs_pgf_xelatex
 import matplotlib.pyplot as plt
-import matplotlib.transforms as transforms
-import matplotlib.path as path
 
 import numpy as np
 import pytest
 
-needs_xelatex = pytest.mark.skipif(not _check_for_pgf('xelatex'),
-                                   reason='xelatex + pgf is required')
+
+_EXPECTED_WARNING_TOOLMANAGER = (
+    r"Treat the new Tool classes introduced in "
+    r"v[0-9]*.[0-9]* as experimental for now; "
+    "the API and rcParam may change in future versions.")
 
 
 def test_uses_per_path():
@@ -34,8 +35,7 @@ def check(master_transform, paths, all_transforms,
         gc = rb.new_gc()
         ids = [path_id for xo, yo, path_id, gc0, rgbFace in
                rb._iter_collection(
-                   gc, master_transform, all_transforms,
-                   range(len(raw_paths)), offsets,
+                   gc, range(len(raw_paths)), offsets,
                    transforms.AffineDeltaTransform(master_transform),
                    facecolors, edgecolors, [], [], [False],
                    [], 'screen')]
@@ -124,12 +124,18 @@ def test_pick():
     fig = plt.figure()
     fig.text(.5, .5, "hello", ha="center", va="center", picker=True)
     fig.canvas.draw()
+
     picks = []
-    fig.canvas.mpl_connect("pick_event", lambda event: picks.append(event))
-    start_event = MouseEvent(
-        "button_press_event", fig.canvas, *fig.transFigure.transform((.5, .5)),
-        MouseButton.LEFT)
-    fig.canvas.callbacks.process(start_event.name, start_event)
+    def handle_pick(event):
+        assert event.mouseevent.key == "a"
+        picks.append(event)
+    fig.canvas.mpl_connect("pick_event", handle_pick)
+
+    KeyEvent("key_press_event", fig.canvas, "a")._process()
+    MouseEvent("button_press_event", fig.canvas,
+               *fig.transFigure.transform((.5, .5)),
+               MouseButton.LEFT)._process()
+    KeyEvent("key_release_event", fig.canvas, "a")._process()
     assert len(picks) == 1
 
 
@@ -178,24 +184,86 @@ def test_interactive_zoom():
     tb.zoom()
     assert ax.get_navigate_mode() is None
 
+    assert not ax.get_autoscalex_on() and not ax.get_autoscaley_on()
+
+
+def test_widgetlock_zoompan():
+    fig, ax = plt.subplots()
+    ax.plot([0, 1], [0, 1])
+    fig.canvas.widgetlock(ax)
+    tb = NavigationToolbar2(fig.canvas)
+    tb.zoom()
+    assert ax.get_navigate_mode() is None
+    tb.pan()
+    assert ax.get_navigate_mode() is None
+
+
+@pytest.mark.parametrize("plot_func", ["imshow", "contourf"])
+@pytest.mark.parametrize("orientation", ["vertical", "horizontal"])
+@pytest.mark.parametrize("tool,button,expected",
+                         [("zoom", MouseButton.LEFT, (4, 6)),  # zoom in
+                          ("zoom", MouseButton.RIGHT, (-20, 30)),  # zoom out
+                          ("pan", MouseButton.LEFT, (-2, 8)),
+                          ("pan", MouseButton.RIGHT, (1.47, 7.78))])  # zoom
+def test_interactive_colorbar(plot_func, orientation, tool, button, expected):
+    fig, ax = plt.subplots()
+    data = np.arange(12).reshape((4, 3))
+    vmin0, vmax0 = 0, 10
+    coll = getattr(ax, plot_func)(data, vmin=vmin0, vmax=vmax0)
+
+    cb = fig.colorbar(coll, ax=ax, orientation=orientation)
+    if plot_func == "contourf":
+        # Just determine we can't navigate and exit out of the test
+        assert not cb.ax.get_navigate()
+        return
+
+    assert cb.ax.get_navigate()
+
+    # Mouse from 4 to 6 (data coordinates, "d").
+    vmin, vmax = 4, 6
+    # The y coordinate doesn't matter, it just needs to be between 0 and 1
+    # However, we will set d0/d1 to the same y coordinate to test that small
+    # pixel changes in that coordinate doesn't cancel the zoom like a normal
+    # axes would.
+    d0 = (vmin, 0.5)
+    d1 = (vmax, 0.5)
+    # Swap them if the orientation is vertical
+    if orientation == "vertical":
+        d0 = d0[::-1]
+        d1 = d1[::-1]
+    # Convert to screen coordinates ("s").  Events are defined only with pixel
+    # precision, so round the pixel values, and below, check against the
+    # corresponding xdata/ydata, which are close but not equal to d0/d1.
+    s0 = cb.ax.transData.transform(d0).astype(int)
+    s1 = cb.ax.transData.transform(d1).astype(int)
+
+    # Set up the mouse movements
+    start_event = MouseEvent(
+        "button_press_event", fig.canvas, *s0, button)
+    stop_event = MouseEvent(
+        "button_release_event", fig.canvas, *s1, button)
+
+    tb = NavigationToolbar2(fig.canvas)
+    if tool == "zoom":
+        tb.zoom()
+        tb.press_zoom(start_event)
+        tb.drag_zoom(stop_event)
+        tb.release_zoom(stop_event)
+    else:
+        tb.pan()
+        tb.press_pan(start_event)
+        tb.drag_pan(stop_event)
+        tb.release_pan(stop_event)
+
+    # Should be close, but won't be exact due to screen integer resolution
+    assert (cb.vmin, cb.vmax) == pytest.approx(expected, abs=0.15)
+
 
 def test_toolbar_zoompan():
-    expected_warning_regex = (
-        r"Treat the new Tool classes introduced in "
-        r"v[0-9]*.[0-9]* as experimental for now; "
-        "the API and rcParam may change in future versions.")
-    with pytest.warns(UserWarning, match=expected_warning_regex):
+    with pytest.warns(UserWarning, match=_EXPECTED_WARNING_TOOLMANAGER):
         plt.rcParams['toolbar'] = 'toolmanager'
     ax = plt.gca()
     assert ax.get_navigate_mode() is None
-    ax.figure.canvas.manager.toolmanager.add_tool(name="zoom",
-                                                  tool=ToolZoom)
-    ax.figure.canvas.manager.toolmanager.add_tool(name="pan",
-                                                  tool=ToolPan)
-    ax.figure.canvas.manager.toolmanager.add_tool(name=_views_positions,
-                                                  tool=ToolViewsPositions)
-    ax.figure.canvas.manager.toolmanager.add_tool(name='rubberband',
-                                                  tool=RubberbandBase)
     ax.figure.canvas.manager.toolmanager.trigger_tool('zoom')
     assert ax.get_navigate_mode() == "ZOOM"
     ax.figure.canvas.manager.toolmanager.trigger_tool('pan')
@@ -203,7 +271,8 @@ def test_toolbar_zoompan():
 
 
 @pytest.mark.parametrize(
-    "backend", ['svg', 'ps', 'pdf', pytest.param('pgf', marks=needs_xelatex)]
+    "backend", ['svg', 'ps', 'pdf',
+                pytest.param('pgf', marks=needs_pgf_xelatex)]
 )
 def test_draw(backend):
     from matplotlib.figure import Figure
@@ -235,3 +304,98 @@ def test_draw(backend):
 
     for ref, test in zip(layed_out_pos_agg, layed_out_pos_test):
         np.testing.assert_allclose(ref, test, atol=0.005)
+
+
+@pytest.mark.parametrize(
+    "key,mouseend,expectedxlim,expectedylim",
+    [(None, (0.2, 0.2), (3.49, 12.49), (2.7, 11.7)),
+     (None, (0.2, 0.5), (3.49, 12.49), (0, 9)),
+     (None, (0.5, 0.2), (0, 9), (2.7, 11.7)),
+     (None, (0.5, 0.5), (0, 9), (0, 9)),  # No move
+     (None, (0.8, 0.25), (-3.47, 5.53), (2.25, 11.25)),
+     (None, (0.2, 0.25), (3.49, 12.49), (2.25, 11.25)),
+     (None, (0.8, 0.85), (-3.47, 5.53), (-3.14, 5.86)),
+     (None, (0.2, 0.85), (3.49, 12.49), (-3.14, 5.86)),
+     ("shift", (0.2, 0.4), (3.49, 12.49), (0, 9)),  # snap to x
+     ("shift", (0.4, 0.2), (0, 9), (2.7, 11.7)),  # snap to y
+     ("shift", (0.2, 0.25), (3.49, 12.49), (3.49, 12.49)),  # snap to diagonal
+     ("shift", (0.8, 0.25), (-3.47, 5.53), (3.47, 12.47)),  # snap to diagonal
+     ("shift", (0.8, 0.9), (-3.58, 5.41), (-3.58, 5.41)),  # snap to diagonal
+     ("shift", (0.2, 0.85), (3.49, 12.49), (-3.49, 5.51)),  # snap to diagonal
+     ("x", (0.2, 0.1), (3.49, 12.49), (0, 9)),  # only x
+     ("y", (0.1, 0.2), (0, 9), (2.7, 11.7)),  # only y
+     ("control", (0.2, 0.2), (3.49, 12.49), (3.49, 12.49)),  # diagonal
+     ("control", (0.4, 0.2), (2.72, 11.72), (2.72, 11.72)),  # diagonal
+     ])
+def test_interactive_pan(key, mouseend, expectedxlim, expectedylim):
+    fig, ax = plt.subplots()
+    ax.plot(np.arange(10))
+    assert ax.get_navigate()
+    # Set equal aspect ratio to easier see diagonal snap
+    ax.set_aspect('equal')
+
+    # Mouse move starts from 0.5, 0.5
+    mousestart = (0.5, 0.5)
+    # Convert to screen coordinates ("s").  Events are defined only with pixel
+    # precision, so round the pixel values, and below, check against the
+    # corresponding xdata/ydata, which are close but not equal to d0/d1.
+    sstart = ax.transData.transform(mousestart).astype(int)
+    send = ax.transData.transform(mouseend).astype(int)
+
+    # Set up the mouse movements
+    start_event = MouseEvent(
+        "button_press_event", fig.canvas, *sstart, button=MouseButton.LEFT,
+        key=key)
+    stop_event = MouseEvent(
+        "button_release_event", fig.canvas, *send, button=MouseButton.LEFT,
+        key=key)
+
+    tb = NavigationToolbar2(fig.canvas)
+    tb.pan()
+    tb.press_pan(start_event)
+    tb.drag_pan(stop_event)
+    tb.release_pan(stop_event)
+    # Should be close, but won't be exact due to screen integer resolution
+    assert tuple(ax.get_xlim()) == pytest.approx(expectedxlim, abs=0.02)
+    assert tuple(ax.get_ylim()) == pytest.approx(expectedylim, abs=0.02)
+
+
+def test_toolmanager_remove():
+    with pytest.warns(UserWarning, match=_EXPECTED_WARNING_TOOLMANAGER):
+        plt.rcParams['toolbar'] = 'toolmanager'
+    fig = plt.gcf()
+    initial_len = len(fig.canvas.manager.toolmanager.tools)
+    assert 'forward' in fig.canvas.manager.toolmanager.tools
+    fig.canvas.manager.toolmanager.remove_tool('forward')
+    assert len(fig.canvas.manager.toolmanager.tools) == initial_len - 1
+    assert 'forward' not in fig.canvas.manager.toolmanager.tools
+
+
+def test_toolmanager_get_tool():
+    with pytest.warns(UserWarning, match=_EXPECTED_WARNING_TOOLMANAGER):
+        plt.rcParams['toolbar'] = 'toolmanager'
+    fig = plt.gcf()
+    rubberband = fig.canvas.manager.toolmanager.get_tool('rubberband')
+    assert isinstance(rubberband, RubberbandBase)
+    assert fig.canvas.manager.toolmanager.get_tool(rubberband) is rubberband
+    with pytest.warns(UserWarning,
+                      match="ToolManager does not control tool 'foo'"):
+        assert fig.canvas.manager.toolmanager.get_tool('foo') is None
+    assert fig.canvas.manager.toolmanager.get_tool('foo', warn=False) is None
+
+    with pytest.warns(UserWarning,
+                      match="ToolManager does not control tool 'foo'"):
+        assert fig.canvas.manager.toolmanager.trigger_tool('foo') is None
+
+
+def test_toolmanager_update_keymap():
+    with pytest.warns(UserWarning, match=_EXPECTED_WARNING_TOOLMANAGER):
+        plt.rcParams['toolbar'] = 'toolmanager'
+    fig = plt.gcf()
+    assert 'v' in fig.canvas.manager.toolmanager.get_tool_keymap('forward')
+    with pytest.warns(UserWarning,
+                      match="Key c changed from back to forward"):
+        fig.canvas.manager.toolmanager.update_keymap('forward', 'c')
+    assert fig.canvas.manager.toolmanager.get_tool_keymap('forward') == ['c']
+    with pytest.raises(KeyError, match="'foo' not in Tools"):
+        fig.canvas.manager.toolmanager.update_keymap('foo', 'c')
diff --git a/lib/matplotlib/tests/test_backend_gtk3.py b/lib/matplotlib/tests/test_backend_gtk3.py
index 5442930d117f..937ddef5a13f 100644
--- a/lib/matplotlib/tests/test_backend_gtk3.py
+++ b/lib/matplotlib/tests/test_backend_gtk3.py
@@ -6,7 +6,7 @@
 pytest.importorskip("matplotlib.backends.backend_gtk3agg")
 
 
-@pytest.mark.backend("gtk3agg")
+@pytest.mark.backend("gtk3agg", skip_on_importerror=True)
 def test_correct_key():
     pytest.xfail("test_widget_send_event is not triggering key_press_event")
 
diff --git a/lib/matplotlib/tests/test_backend_macosx.py b/lib/matplotlib/tests/test_backend_macosx.py
new file mode 100644
index 000000000000..c460da374c8c
--- /dev/null
+++ b/lib/matplotlib/tests/test_backend_macosx.py
@@ -0,0 +1,46 @@
+import os
+
+import pytest
+
+import matplotlib as mpl
+import matplotlib.pyplot as plt
+try:
+    from matplotlib.backends import _macosx
+except ImportError:
+    pytest.skip("These are mac only tests", allow_module_level=True)
+
+
+@pytest.mark.backend('macosx')
+def test_cached_renderer():
+    # Make sure that figures have an associated renderer after
+    # a fig.canvas.draw() call
+    fig = plt.figure(1)
+    fig.canvas.draw()
+    assert fig.canvas.get_renderer()._renderer is not None
+
+    fig = plt.figure(2)
+    fig.draw_without_rendering()
+    assert fig.canvas.get_renderer()._renderer is not None
+
+
+@pytest.mark.backend('macosx')
+def test_savefig_rcparam(monkeypatch, tmp_path):
+
+    def new_choose_save_file(title, directory, filename):
+        # Replacement function instead of opening a GUI window
+        # Make a new directory for testing the update of the rcParams
+        assert directory == str(tmp_path)
+        os.makedirs(f"{directory}/test")
+        return f"{directory}/test/{filename}"
+
+    monkeypatch.setattr(_macosx, "choose_save_file", new_choose_save_file)
+    fig = plt.figure()
+    with mpl.rc_context({"savefig.directory": tmp_path}):
+        fig.canvas.toolbar.save_figure()
+        # Check the saved location got created
+        save_file = f"{tmp_path}/test/{fig.canvas.get_default_filename()}"
+        assert os.path.exists(save_file)
+
+        # Check the savefig.directory rcParam got updated because
+        # we added a subdirectory "test"
+        assert mpl.rcParams["savefig.directory"] == f"{tmp_path}/test"
diff --git a/lib/matplotlib/tests/test_backend_nbagg.py b/lib/matplotlib/tests/test_backend_nbagg.py
index a7060ed2a7fd..4ebf3e1f56d1 100644
--- a/lib/matplotlib/tests/test_backend_nbagg.py
+++ b/lib/matplotlib/tests/test_backend_nbagg.py
@@ -6,6 +6,8 @@
 import pytest
 
 nbformat = pytest.importorskip('nbformat')
+pytest.importorskip('nbconvert')
+pytest.importorskip('ipykernel')
 
 # From https://blog.thedataincubator.com/2016/06/testing-jupyter-notebooks/
 
diff --git a/lib/matplotlib/tests/test_backend_pdf.py b/lib/matplotlib/tests/test_backend_pdf.py
index 31d50ac1302f..8ffca8295ea5 100644
--- a/lib/matplotlib/tests/test_backend_pdf.py
+++ b/lib/matplotlib/tests/test_backend_pdf.py
@@ -9,14 +9,17 @@
 import pytest
 
 import matplotlib as mpl
-from matplotlib import dviread, pyplot as plt, checkdep_usetex, rcParams
+from matplotlib import (
+    pyplot as plt, rcParams, font_manager as fm
+)
+from matplotlib.cbook import _get_data_path
+from matplotlib.ft2font import FT2Font
+from matplotlib.font_manager import findfont, FontProperties
+from matplotlib.backends._backend_pdf_ps import get_glyphs_subset
 from matplotlib.backends.backend_pdf import PdfPages
+from matplotlib.patches import Rectangle
 from matplotlib.testing.decorators import check_figures_equal, image_comparison
-
-
-needs_usetex = pytest.mark.skipif(
-    not checkdep_usetex(True),
-    reason="This test needs a TeX installation")
+from matplotlib.testing._markers import needs_usetex
 
 
 @image_comparison(['pdf_use14corefonts.pdf'])
@@ -39,12 +42,20 @@ def test_use14corefonts():
     ax.axhline(0.5, linewidth=0.5)
 
 
-def test_type42():
-    rcParams['pdf.fonttype'] = 42
+@pytest.mark.parametrize('fontname, fontfile', [
+    ('DejaVu Sans', 'DejaVuSans.ttf'),
+    ('WenQuanYi Zen Hei', 'wqy-zenhei.ttc'),
+])
+@pytest.mark.parametrize('fonttype', [3, 42])
+def test_embed_fonts(fontname, fontfile, fonttype):
+    if Path(findfont(FontProperties(family=[fontname]))).name != fontfile:
+        pytest.skip(f'Font {fontname!r} may be missing')
 
+    rcParams['pdf.fonttype'] = fonttype
     fig, ax = plt.subplots()
     ax.plot([1, 2, 3])
-    fig.savefig(io.BytesIO())
+    ax.set_title('Axes Title', font=fontname)
+    fig.savefig(io.BytesIO(), format='pdf')
 
 
 def test_multipage_pagecount():
@@ -227,13 +238,42 @@ def test_text_urls():
         with pikepdf.Pdf.open(fd) as pdf:
             annots = pdf.pages[0].Annots
 
-    for y, fragment in [('0.1', 'plain'), ('0.4', 'mathtext')]:
-        annot = next(
-            (a for a in annots if a.A.URI == f'{test_url}{fragment}'),
-            None)
-        assert annot is not None
-        # Positions in points (72 per inch.)
-        assert annot.Rect[1] == decimal.Decimal(y) * 72
+            # Iteration over Annots must occur within the context manager,
+            # otherwise it may fail depending on the pdf structure.
+            for y, fragment in [('0.1', 'plain'), ('0.4', 'mathtext')]:
+                annot = next(
+                    (a for a in annots if a.A.URI == f'{test_url}{fragment}'),
+                    None)
+                assert annot is not None
+                assert getattr(annot, 'QuadPoints', None) is None
+                # Positions in points (72 per inch.)
+                assert annot.Rect[1] == decimal.Decimal(y) * 72
+
+
+def test_text_rotated_urls():
+    pikepdf = pytest.importorskip('pikepdf')
+
+    test_url = 'https://test_text_urls.matplotlib.org/'
+
+    fig = plt.figure(figsize=(1, 1))
+    fig.text(0.1, 0.1, 'N', rotation=45, url=f'{test_url}')
+
+    with io.BytesIO() as fd:
+        fig.savefig(fd, format='pdf')
+
+        with pikepdf.Pdf.open(fd) as pdf:
+            annots = pdf.pages[0].Annots
+
+            # Iteration over Annots must occur within the context manager,
+            # otherwise it may fail depending on the pdf structure.
+            annot = next(
+                (a for a in annots if a.A.URI == f'{test_url}'),
+                None)
+            assert annot is not None
+            assert getattr(annot, 'QuadPoints', None) is not None
+            # Positions in points (72 per inch)
+            assert annot.Rect[0] == \
+               annot.QuadPoints[6] - decimal.Decimal('0.00001')
 
 
 @needs_usetex
@@ -251,12 +291,14 @@ def test_text_urls_tex():
         with pikepdf.Pdf.open(fd) as pdf:
             annots = pdf.pages[0].Annots
 
-    annot = next(
-        (a for a in annots if a.A.URI == f'{test_url}tex'),
-        None)
-    assert annot is not None
-    # Positions in points (72 per inch.)
-    assert annot.Rect[1] == decimal.Decimal('0.7') * 72
+            # Iteration over Annots must occur within the context manager,
+            # otherwise it may fail depending on the pdf structure.
+            annot = next(
+                (a for a in annots if a.A.URI == f'{test_url}tex'),
+                None)
+            assert annot is not None
+            # Positions in points (72 per inch.)
+            assert annot.Rect[1] == decimal.Decimal('0.7') * 72
 
 
 def test_pdfpages_fspath():
@@ -269,8 +311,8 @@ def test_hatching_legend():
     """Test for correct hatching on patches in legend"""
     fig = plt.figure(figsize=(1, 2))
 
-    a = plt.Rectangle([0, 0], 0, 0, facecolor="green", hatch="XXXX")
-    b = plt.Rectangle([0, 0], 0, 0, facecolor="blue", hatch="XXXX")
+    a = Rectangle([0, 0], 0, 0, facecolor="green", hatch="XXXX")
+    b = Rectangle([0, 0], 0, 0, facecolor="blue", hatch="XXXX")
 
     fig.legend([a, b, a, b], ["", "", "", ""])
 
@@ -287,24 +329,7 @@ def test_grayscale_alpha():
     ax.set_yticks([])
 
 
-# This tests tends to hit a TeX cache lock on AppVeyor.
-@pytest.mark.flaky(reruns=3)
-@needs_usetex
-def test_missing_psfont(monkeypatch):
-    """An error is raised if a TeX font lacks a Type-1 equivalent"""
-    def psfont(*args, **kwargs):
-        return dviread.PsFont(texname='texfont', psname='Some Font',
-                              effects=None, encoding=None, filename=None)
-
-    monkeypatch.setattr(dviread.PsfontsMap, '__getitem__', psfont)
-    rcParams['text.usetex'] = True
-    fig, ax = plt.subplots()
-    ax.text(0.5, 0.5, 'hello')
-    with NamedTemporaryFile() as tmpfile, pytest.raises(ValueError):
-        fig.savefig(tmpfile, format='pdf')
-
-
-@pytest.mark.style('default')
+@mpl.style.context('default')
 @check_figures_equal(extensions=["pdf", "eps"])
 def test_pdf_eps_savefig_when_color_is_none(fig_test, fig_ref):
     ax_test = fig_test.add_subplot()
@@ -335,3 +360,54 @@ def test_kerning():
     s = "AVAVAVAVAVAVAVAV€AAVV"
     fig.text(0, .25, s, size=5)
     fig.text(0, .75, s, size=20)
+
+
+def test_glyphs_subset():
+    fpath = str(_get_data_path("fonts/ttf/DejaVuSerif.ttf"))
+    chars = "these should be subsetted! 1234567890"
+
+    # non-subsetted FT2Font
+    nosubfont = FT2Font(fpath)
+    nosubfont.set_text(chars)
+
+    # subsetted FT2Font
+    subfont = FT2Font(get_glyphs_subset(fpath, chars))
+    subfont.set_text(chars)
+
+    nosubcmap = nosubfont.get_charmap()
+    subcmap = subfont.get_charmap()
+
+    # all unique chars must be available in subsetted font
+    assert set(chars) == set(chr(key) for key in subcmap.keys())
+
+    # subsetted font's charmap should have less entries
+    assert len(subcmap) < len(nosubcmap)
+
+    # since both objects are assigned same characters
+    assert subfont.get_num_glyphs() == nosubfont.get_num_glyphs()
+
+
+@image_comparison(["multi_font_type3.pdf"], tol=4.6)
+def test_multi_font_type3():
+    fp = fm.FontProperties(family=["WenQuanYi Zen Hei"])
+    if Path(fm.findfont(fp)).name != "wqy-zenhei.ttc":
+        pytest.skip("Font may be missing")
+
+    plt.rc('font', family=['DejaVu Sans', 'WenQuanYi Zen Hei'], size=27)
+    plt.rc('pdf', fonttype=3)
+
+    fig = plt.figure()
+    fig.text(0.15, 0.475, "There are 几个汉字 in between!")
+
+
+@image_comparison(["multi_font_type42.pdf"], tol=2.2)
+def test_multi_font_type42():
+    fp = fm.FontProperties(family=["WenQuanYi Zen Hei"])
+    if Path(fm.findfont(fp)).name != "wqy-zenhei.ttc":
+        pytest.skip("Font may be missing")
+
+    plt.rc('font', family=['DejaVu Sans', 'WenQuanYi Zen Hei'], size=27)
+    plt.rc('pdf', fonttype=42)
+
+    fig = plt.figure()
+    fig.text(0.15, 0.475, "There are 几个汉字 in between!")
diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
index 75f50ecbf0d9..482bc073a766 100644
--- a/lib/matplotlib/tests/test_backend_pgf.py
+++ b/lib/matplotlib/tests/test_backend_pgf.py
@@ -4,28 +4,22 @@
 import shutil
 
 import numpy as np
+from packaging.version import parse as parse_version
 import pytest
 
 import matplotlib as mpl
 import matplotlib.pyplot as plt
 from matplotlib.testing import _has_tex_package, _check_for_pgf
 from matplotlib.testing.compare import compare_images, ImageComparisonFailure
-from matplotlib.backends.backend_pgf import PdfPages, common_texification
-from matplotlib.testing.decorators import (_image_directories,
-                                           check_figures_equal,
-                                           image_comparison)
+from matplotlib.backends.backend_pgf import PdfPages, _tex_escape
+from matplotlib.testing.decorators import (
+    _image_directories, check_figures_equal, image_comparison)
+from matplotlib.testing._markers import (
+    needs_ghostscript, needs_pgf_lualatex, needs_pgf_pdflatex,
+    needs_pgf_xelatex)
 
-baseline_dir, result_dir = _image_directories(lambda: 'dummy func')
 
-needs_xelatex = pytest.mark.skipif(not _check_for_pgf('xelatex'),
-                                   reason='xelatex + pgf is required')
-needs_pdflatex = pytest.mark.skipif(not _check_for_pgf('pdflatex'),
-                                    reason='pdflatex + pgf is required')
-needs_lualatex = pytest.mark.skipif(not _check_for_pgf('lualatex'),
-                                    reason='lualatex + pgf is required')
-needs_ghostscript = pytest.mark.skipif(
-    "eps" not in mpl.testing.compare.converter,
-    reason="This test needs a ghostscript installation")
+baseline_dir, result_dir = _image_directories(lambda: 'dummy func')
 
 
 def compare_figure(fname, savefig_kwargs={}, tol=0):
@@ -39,6 +33,23 @@ def compare_figure(fname, savefig_kwargs={}, tol=0):
         raise ImageComparisonFailure(err)
 
 
+@pytest.mark.parametrize('plain_text, escaped_text', [
+    (r'quad_sum: $\sum x_i^2$', r'quad_sum: \(\displaystyle \sum x_i^2\)'),
+    ('% not a comment', r'\% not a comment'),
+    ('^not', r'\^not'),
+])
+def test_tex_escape(plain_text, escaped_text):
+    assert _tex_escape(plain_text) == escaped_text
+
+
+@needs_pgf_xelatex
+@pytest.mark.backend('pgf')
+def test_tex_special_chars(tmp_path):
+    fig = plt.figure()
+    fig.text(.5, .5, "_^ $a_b^c$")
+    fig.savefig(tmp_path / "test.pdf")  # Should not error.
+
+
 def create_figure():
     plt.figure()
     x = np.linspace(0, 1, 15)
@@ -65,19 +76,8 @@ def create_figure():
     plt.ylim(0, 1)
 
 
-@pytest.mark.parametrize('plain_text, escaped_text', [
-    (r'quad_sum: $\sum x_i^2$', r'quad\_sum: \(\displaystyle \sum x_i^2\)'),
-    (r'no \$splits \$ here', r'no \$splits \$ here'),
-    ('with_underscores', r'with\_underscores'),
-    ('% not a comment', r'\% not a comment'),
-    ('^not', r'\^not'),
-])
-def test_common_texification(plain_text, escaped_text):
-    assert common_texification(plain_text) == escaped_text
-
-
 # test compiling a figure to pdf with xelatex
-@needs_xelatex
+@needs_pgf_xelatex
 @pytest.mark.backend('pgf')
 @image_comparison(['pgf_xelatex.pdf'], style='default')
 def test_xelatex():
@@ -87,11 +87,19 @@ def test_xelatex():
     create_figure()
 
 
+try:
+    _old_gs_version = \
+        mpl._get_executable_info('gs').version < parse_version('9.50')
+except mpl.ExecutableNotFoundError:
+    _old_gs_version = True
+
+
 # test compiling a figure to pdf with pdflatex
-@needs_pdflatex
+@needs_pgf_pdflatex
 @pytest.mark.skipif(not _has_tex_package('ucs'), reason='needs ucs.sty')
 @pytest.mark.backend('pgf')
-@image_comparison(['pgf_pdflatex.pdf'], style='default')
+@image_comparison(['pgf_pdflatex.pdf'], style='default',
+                  tol=11.7 if _old_gs_version else 0)
 def test_pdflatex():
     if os.environ.get('APPVEYOR'):
         pytest.xfail("pdflatex test does not work on appveyor due to missing "
@@ -107,9 +115,9 @@ def test_pdflatex():
 
 
 # test updating the rc parameters for each figure
-@needs_xelatex
-@needs_pdflatex
-@pytest.mark.style('default')
+@needs_pgf_xelatex
+@needs_pgf_pdflatex
+@mpl.style.context('default')
 @pytest.mark.backend('pgf')
 def test_rcupdate():
     rc_sets = [{'font.family': 'sans-serif',
@@ -127,7 +135,7 @@ def test_rcupdate():
                 'pgf.preamble': ('\\usepackage[utf8x]{inputenc}'
                                  '\\usepackage[T1]{fontenc}'
                                  '\\usepackage{sfmath}')}]
-    tol = [6, 0]
+    tol = [0, 13.2] if _old_gs_version else [0, 0]
     for i, rc_set in enumerate(rc_sets):
         with mpl.rc_context(rc_set):
             for substring, pkg in [('sfmath', 'sfmath'), ('utf8x', 'ucs')]:
@@ -135,23 +143,31 @@ def test_rcupdate():
                         and not _has_tex_package(pkg)):
                     pytest.skip(f'needs {pkg}.sty')
             create_figure()
-            compare_figure('pgf_rcupdate%d.pdf' % (i + 1), tol=tol[i])
+            compare_figure(f'pgf_rcupdate{i + 1}.pdf', tol=tol[i])
 
 
 # test backend-side clipping, since large numbers are not supported by TeX
-@needs_xelatex
-@pytest.mark.style('default')
+@needs_pgf_xelatex
+@mpl.style.context('default')
 @pytest.mark.backend('pgf')
 def test_pathclip():
+    np.random.seed(19680801)
     mpl.rcParams.update({'font.family': 'serif', 'pgf.rcfonts': False})
-    plt.plot([0., 1e100], [0., 1e100])
-    plt.xlim(0, 1)
-    plt.ylim(0, 1)
-    plt.savefig(BytesIO(), format="pdf")  # No image comparison.
+    fig, axs = plt.subplots(1, 2)
+
+    axs[0].plot([0., 1e100], [0., 1e100])
+    axs[0].set_xlim(0, 1)
+    axs[0].set_ylim(0, 1)
+
+    axs[1].scatter([0, 1], [1, 1])
+    axs[1].hist(np.random.normal(size=1000), bins=20, range=[-10, 10])
+    axs[1].set_xscale('log')
+
+    fig.savefig(BytesIO(), format="pdf")  # No image comparison.
 
 
 # test mixed mode rendering
-@needs_xelatex
+@needs_pgf_xelatex
 @pytest.mark.backend('pgf')
 @image_comparison(['pgf_mixedmode.pdf'], style='default')
 def test_mixedmode():
@@ -161,8 +177,8 @@ def test_mixedmode():
 
 
 # test bbox_inches clipping
-@needs_xelatex
-@pytest.mark.style('default')
+@needs_pgf_xelatex
+@mpl.style.context('default')
 @pytest.mark.backend('pgf')
 def test_bbox_inches():
     mpl.rcParams.update({'font.family': 'serif', 'pgf.rcfonts': False})
@@ -175,12 +191,12 @@ def test_bbox_inches():
                    tol=0)
 
 
-@pytest.mark.style('default')
+@mpl.style.context('default')
 @pytest.mark.backend('pgf')
 @pytest.mark.parametrize('system', [
-    pytest.param('lualatex', marks=[needs_lualatex]),
-    pytest.param('pdflatex', marks=[needs_pdflatex]),
-    pytest.param('xelatex', marks=[needs_xelatex]),
+    pytest.param('lualatex', marks=[needs_pgf_lualatex]),
+    pytest.param('pdflatex', marks=[needs_pgf_pdflatex]),
+    pytest.param('xelatex', marks=[needs_pgf_xelatex]),
 ])
 def test_pdf_pages(system):
     rc_pdflatex = {
@@ -217,12 +233,12 @@ def test_pdf_pages(system):
         assert pdf.get_pagecount() == 3
 
 
-@pytest.mark.style('default')
+@mpl.style.context('default')
 @pytest.mark.backend('pgf')
 @pytest.mark.parametrize('system', [
-    pytest.param('lualatex', marks=[needs_lualatex]),
-    pytest.param('pdflatex', marks=[needs_pdflatex]),
-    pytest.param('xelatex', marks=[needs_xelatex]),
+    pytest.param('lualatex', marks=[needs_pgf_lualatex]),
+    pytest.param('pdflatex', marks=[needs_pgf_pdflatex]),
+    pytest.param('xelatex', marks=[needs_pgf_xelatex]),
 ])
 def test_pdf_pages_metadata_check(monkeypatch, system):
     # Basically the same as test_pdf_pages, but we keep it separate to leave
@@ -257,20 +273,24 @@ def test_pdf_pages_metadata_check(monkeypatch, system):
     if '/PTEX.Fullbanner' in info:
         del info['/PTEX.Fullbanner']
 
+    # Some LaTeX engines ignore this setting, and state themselves as producer.
+    producer = info.pop('/Producer')
+    assert producer == f'Matplotlib pgf backend v{mpl.__version__}' or (
+            system == 'lualatex' and 'LuaTeX' in producer)
+
     assert info == {
         '/Author': 'me',
         '/CreationDate': 'D:19700101000000Z',
         '/Creator': f'Matplotlib v{mpl.__version__}, https://matplotlib.org',
         '/Keywords': 'test,pdf,multipage',
         '/ModDate': 'D:19680801000000Z',
-        '/Producer': f'Matplotlib pgf backend v{mpl.__version__}',
         '/Subject': 'Test page',
         '/Title': 'Multipage PDF with pgf',
         '/Trapped': '/True',
     }
 
 
-@needs_xelatex
+@needs_pgf_xelatex
 def test_tex_restart_after_error():
     fig = plt.figure()
     fig.suptitle(r"\oops")
@@ -282,22 +302,24 @@ def test_tex_restart_after_error():
     fig.savefig(BytesIO(), format="pgf")
 
 
-@needs_xelatex
+@needs_pgf_xelatex
 def test_bbox_inches_tight():
     fig, ax = plt.subplots()
     ax.imshow([[0, 1], [2, 3]])
     fig.savefig(BytesIO(), format="pdf", backend="pgf", bbox_inches="tight")
 
 
-@needs_xelatex
+@needs_pgf_xelatex
 @needs_ghostscript
-def test_png():
-    # Just a smoketest.
-    fig, ax = plt.subplots()
-    fig.savefig(BytesIO(), format="png", backend="pgf")
+def test_png_transparency():  # Actually, also just testing that png works.
+    buf = BytesIO()
+    plt.figure().savefig(buf, format="png", backend="pgf", transparent=True)
+    buf.seek(0)
+    t = plt.imread(buf)
+    assert (t[..., 3] == 0).all()  # fully transparent.
 
 
-@needs_xelatex
+@needs_pgf_xelatex
 def test_unknown_font(caplog):
     with caplog.at_level("WARNING"):
         mpl.rcParams["font.family"] = "this-font-does-not-exist"
@@ -316,3 +338,30 @@ def test_minus_signs_with_tex(fig_test, fig_ref, texsystem):
     mpl.rcParams["pgf.texsystem"] = texsystem
     fig_test.text(.5, .5, "$-1$")
     fig_ref.text(.5, .5, "$\N{MINUS SIGN}1$")
+
+
+@pytest.mark.backend("pgf")
+def test_sketch_params():
+    fig, ax = plt.subplots(figsize=(3, 3))
+    ax.set_xticks([])
+    ax.set_yticks([])
+    ax.set_frame_on(False)
+    handle, = ax.plot([0, 1])
+    handle.set_sketch_params(scale=5, length=30, randomness=42)
+
+    with BytesIO() as fd:
+        fig.savefig(fd, format='pgf')
+        buf = fd.getvalue().decode()
+
+    baseline = r"""\pgfpathmoveto{\pgfqpoint{0.375000in}{0.300000in}}%
+\pgfpathlineto{\pgfqpoint{2.700000in}{2.700000in}}%
+\usepgfmodule{decorations}%
+\usepgflibrary{decorations.pathmorphing}%
+\pgfkeys{/pgf/decoration/.cd, """ \
+    r"""segment length = 0.150000in, amplitude = 0.100000in}%
+\pgfmathsetseed{42}%
+\pgfdecoratecurrentpath{random steps}%
+\pgfusepath{stroke}%"""
+    # \pgfdecoratecurrentpath must be after the path definition and before the
+    # path is used (\pgfusepath)
+    assert baseline in buf
diff --git a/lib/matplotlib/tests/test_backend_ps.py b/lib/matplotlib/tests/test_backend_ps.py
index 6a2c01d975e9..a151dc4c4c90 100644
--- a/lib/matplotlib/tests/test_backend_ps.py
+++ b/lib/matplotlib/tests/test_backend_ps.py
@@ -1,23 +1,19 @@
-import io
+from collections import Counter
 from pathlib import Path
+import io
 import re
 import tempfile
 
 import pytest
 
+from matplotlib import cbook, patheffects, font_manager as fm
+from matplotlib._api import MatplotlibDeprecationWarning
+from matplotlib.figure import Figure
+from matplotlib.patches import Ellipse
+from matplotlib.testing._markers import needs_ghostscript, needs_usetex
+from matplotlib.testing.decorators import check_figures_equal, image_comparison
 import matplotlib as mpl
 import matplotlib.pyplot as plt
-from matplotlib import cbook, patheffects
-from matplotlib.testing.decorators import check_figures_equal, image_comparison
-from matplotlib.cbook import MatplotlibDeprecationWarning
-
-
-needs_ghostscript = pytest.mark.skipif(
-    "eps" not in mpl.testing.compare.converter,
-    reason="This test needs a ghostscript installation")
-needs_usetex = pytest.mark.skipif(
-    not mpl.checkdep_usetex(True),
-    reason="This test needs a TeX installation")
 
 
 # This tests tends to hit a TeX cache lock on AppVeyor.
@@ -68,6 +64,8 @@ def test_savefig_to_stringio(format, use_log, rcParams, orientation):
         except tuple(allowable_exceptions) as exc:
             pytest.skip(str(exc))
 
+        assert not s_buf.closed
+        assert not b_buf.closed
         s_val = s_buf.getvalue().encode('ascii')
         b_val = b_buf.getvalue()
 
@@ -116,6 +114,16 @@ def test_transparency():
     ax.text(.5, .5, "foo", color="r", alpha=0)
 
 
+@needs_usetex
+@image_comparison(["empty.eps"])
+def test_transparency_tex():
+    mpl.rcParams['text.usetex'] = True
+    fig, ax = plt.subplots()
+    ax.set_axis_off()
+    ax.plot([0, 1], color="r", alpha=0)
+    ax.text(.5, .5, "foo", color="r", alpha=0)
+
+
 def test_bbox():
     fig, ax = plt.subplots()
     with io.BytesIO() as buf:
@@ -147,10 +155,22 @@ def test_failing_latex():
 @needs_usetex
 def test_partial_usetex(caplog):
     caplog.set_level("WARNING")
-    plt.figtext(.5, .5, "foo", usetex=True)
+    plt.figtext(.1, .1, "foo", usetex=True)
+    plt.figtext(.2, .2, "bar", usetex=True)
+    plt.savefig(io.BytesIO(), format="ps")
+    record, = caplog.records  # asserts there's a single record.
+    assert "as if usetex=False" in record.getMessage()
+
+
+@needs_usetex
+def test_usetex_preamble(caplog):
+    mpl.rcParams.update({
+        "text.usetex": True,
+        # Check that these don't conflict with the packages loaded by default.
+        "text.latex.preamble": r"\usepackage{color,graphicx,textcomp}",
+    })
+    plt.figtext(.5, .5, "foo")
     plt.savefig(io.BytesIO(), format="ps")
-    assert caplog.records and all("as if usetex=False" in record.getMessage()
-                                  for record in caplog.records)
 
 
 @image_comparison(["useafm.eps"])
@@ -167,9 +187,123 @@ def test_type3_font():
     plt.figtext(.5, .5, "I/J")
 
 
+@image_comparison(["coloredhatcheszerolw.eps"])
+def test_colored_hatch_zero_linewidth():
+    ax = plt.gca()
+    ax.add_patch(Ellipse((0, 0), 1, 1, hatch='/', facecolor='none',
+                         edgecolor='r', linewidth=0))
+    ax.add_patch(Ellipse((0.5, 0.5), 0.5, 0.5, hatch='+', facecolor='none',
+                         edgecolor='g', linewidth=0.2))
+    ax.add_patch(Ellipse((1, 1), 0.3, 0.8, hatch='\\', facecolor='none',
+                         edgecolor='b', linewidth=0))
+    ax.set_axis_off()
+
+
 @check_figures_equal(extensions=["eps"])
 def test_text_clip(fig_test, fig_ref):
     ax = fig_test.add_subplot()
     # Fully clipped-out text should not appear.
     ax.text(0, 0, "hello", transform=fig_test.transFigure, clip_on=True)
     fig_ref.add_subplot()
+
+
+@needs_ghostscript
+def test_d_glyph(tmp_path):
+    # Ensure that we don't have a procedure defined as /d, which would be
+    # overwritten by the glyph definition for "d".
+    fig = plt.figure()
+    fig.text(.5, .5, "def")
+    out = tmp_path / "test.eps"
+    fig.savefig(out)
+    mpl.testing.compare.convert(out, cache=False)  # Should not raise.
+
+
+@image_comparison(["type42_without_prep.eps"], style='mpl20')
+def test_type42_font_without_prep():
+    # Test whether Type 42 fonts without prep table are properly embedded
+    mpl.rcParams["ps.fonttype"] = 42
+    mpl.rcParams["mathtext.fontset"] = "stix"
+
+    plt.figtext(0.5, 0.5, "Mass $m$")
+
+
+@pytest.mark.parametrize('fonttype', ["3", "42"])
+def test_fonttype(fonttype):
+    mpl.rcParams["ps.fonttype"] = fonttype
+    fig, ax = plt.subplots()
+
+    ax.text(0.25, 0.5, "Forty-two is the answer to everything!")
+
+    buf = io.BytesIO()
+    fig.savefig(buf, format="ps")
+
+    test = b'/FontType ' + bytes(f"{fonttype}", encoding='utf-8') + b' def'
+
+    assert re.search(test, buf.getvalue(), re.MULTILINE)
+
+
+def test_linedash():
+    """Test that dashed lines do not break PS output"""
+    fig, ax = plt.subplots()
+
+    ax.plot([0, 1], linestyle="--")
+
+    buf = io.BytesIO()
+    fig.savefig(buf, format="ps")
+
+    assert buf.tell() > 0
+
+
+def test_empty_line():
+    # Smoke-test for gh#23954
+    figure = Figure()
+    figure.text(0.5, 0.5, "\nfoo\n\n")
+    buf = io.BytesIO()
+    figure.savefig(buf, format='eps')
+    figure.savefig(buf, format='ps')
+
+
+def test_no_duplicate_definition():
+
+    fig = Figure()
+    axs = fig.subplots(4, 4, subplot_kw=dict(projection="polar"))
+    for ax in axs.flat:
+        ax.set(xticks=[], yticks=[])
+        ax.plot([1, 2])
+    fig.suptitle("hello, world")
+
+    buf = io.StringIO()
+    fig.savefig(buf, format='eps')
+    buf.seek(0)
+
+    wds = [ln.partition(' ')[0] for
+           ln in buf.readlines()
+           if ln.startswith('/')]
+
+    assert max(Counter(wds).values()) == 1
+
+
+@image_comparison(["multi_font_type3.eps"], tol=0.51)
+def test_multi_font_type3():
+    fp = fm.FontProperties(family=["WenQuanYi Zen Hei"])
+    if Path(fm.findfont(fp)).name != "wqy-zenhei.ttc":
+        pytest.skip("Font may be missing")
+
+    plt.rc('font', family=['DejaVu Sans', 'WenQuanYi Zen Hei'], size=27)
+    plt.rc('ps', fonttype=3)
+
+    fig = plt.figure()
+    fig.text(0.15, 0.475, "There are 几个汉字 in between!")
+
+
+@image_comparison(["multi_font_type42.eps"], tol=1.6)
+def test_multi_font_type42():
+    fp = fm.FontProperties(family=["WenQuanYi Zen Hei"])
+    if Path(fm.findfont(fp)).name != "wqy-zenhei.ttc":
+        pytest.skip("Font may be missing")
+
+    plt.rc('font', family=['DejaVu Sans', 'WenQuanYi Zen Hei'], size=27)
+    plt.rc('ps', fonttype=42)
+
+    fig = plt.figure()
+    fig.text(0.15, 0.475, "There are 几个汉字 in between!")
diff --git a/lib/matplotlib/tests/test_backend_qt.py b/lib/matplotlib/tests/test_backend_qt.py
index d0d997e1ce2e..14a9283ef480 100644
--- a/lib/matplotlib/tests/test_backend_qt.py
+++ b/lib/matplotlib/tests/test_backend_qt.py
@@ -1,47 +1,43 @@
 import copy
+import importlib
+import inspect
+import os
 import signal
+import subprocess
+import sys
+
+from datetime import date, datetime
 from unittest import mock
 
+import pytest
+
 import matplotlib
 from matplotlib import pyplot as plt
 from matplotlib._pylab_helpers import Gcf
-
-import pytest
+from matplotlib import _c_internal_utils
 
 
 try:
-    from matplotlib.backends.qt_compat import QtGui
+    from matplotlib.backends.qt_compat import QtGui, QtWidgets  # noqa
+    from matplotlib.backends.qt_editor import _formlayout
 except ImportError:
-    pytestmark = pytest.mark.skip('No usable Qt5 bindings')
+    pytestmark = pytest.mark.skip('No usable Qt bindings')
+
+
+_test_timeout = 60  # A reasonably safe value for slower architectures.
 
 
 @pytest.fixture
 def qt_core(request):
-    backend, = request.node.get_closest_marker('backend').args
     qt_compat = pytest.importorskip('matplotlib.backends.qt_compat')
     QtCore = qt_compat.QtCore
 
-    if backend == 'Qt4Agg':
-        try:
-            py_qt_ver = int(QtCore.PYQT_VERSION_STR.split('.')[0])
-        except AttributeError:
-            py_qt_ver = QtCore.__version_info__[0]
-        if py_qt_ver != 4:
-            pytest.skip('Qt4 is not available')
-
     return QtCore
 
 
-@pytest.mark.parametrize('backend', [
-    # Note: the value is irrelevant; the important part is the marker.
-    pytest.param(
-        'Qt4Agg',
-        marks=pytest.mark.backend('Qt4Agg', skip_on_importerror=True)),
-    pytest.param(
-        'Qt5Agg',
-        marks=pytest.mark.backend('Qt5Agg', skip_on_importerror=True)),
-])
-def test_fig_close(backend):
+@pytest.mark.backend('QtAgg', skip_on_importerror=True)
+def test_fig_close():
+
     # save the state of Gcf.figs
     init_figs = copy.copy(Gcf.figs)
 
@@ -57,19 +53,158 @@ def test_fig_close(backend):
     assert init_figs == Gcf.figs
 
 
+class WaitForStringPopen(subprocess.Popen):
+    """
+    A Popen that passes flags that allow triggering KeyboardInterrupt.
+    """
+
+    def __init__(self, *args, **kwargs):
+        if sys.platform == 'win32':
+            kwargs['creationflags'] = subprocess.CREATE_NEW_CONSOLE
+        super().__init__(
+            *args, **kwargs,
+            # Force Agg so that each test can switch to its desired Qt backend.
+            env={**os.environ, "MPLBACKEND": "Agg", "SOURCE_DATE_EPOCH": "0"},
+            stdout=subprocess.PIPE, universal_newlines=True)
+
+    def wait_for(self, terminator):
+        """Read until the terminator is reached."""
+        buf = ''
+        while True:
+            c = self.stdout.read(1)
+            if not c:
+                raise RuntimeError(
+                    f'Subprocess died before emitting expected {terminator!r}')
+            buf += c
+            if buf.endswith(terminator):
+                return
+
+
+def _test_sigint_impl(backend, target_name, kwargs):
+    import sys
+    import matplotlib.pyplot as plt
+    import os
+    import threading
+
+    plt.switch_backend(backend)
+    from matplotlib.backends.qt_compat import QtCore  # noqa
+
+    def interrupter():
+        if sys.platform == 'win32':
+            import win32api
+            win32api.GenerateConsoleCtrlEvent(0, 0)
+        else:
+            import signal
+            os.kill(os.getpid(), signal.SIGINT)
+
+    target = getattr(plt, target_name)
+    timer = threading.Timer(1, interrupter)
+    fig = plt.figure()
+    fig.canvas.mpl_connect(
+        'draw_event',
+        lambda *args: print('DRAW', flush=True)
+    )
+    fig.canvas.mpl_connect(
+        'draw_event',
+        lambda *args: timer.start()
+    )
+    try:
+        target(**kwargs)
+    except KeyboardInterrupt:
+        print('SUCCESS', flush=True)
+
+
+@pytest.mark.backend('QtAgg', skip_on_importerror=True)
+@pytest.mark.parametrize("target, kwargs", [
+    ('show', {'block': True}),
+    ('pause', {'interval': 10})
+])
+def test_sigint(target, kwargs):
+    backend = plt.get_backend()
+    proc = WaitForStringPopen(
+        [sys.executable, "-c",
+         inspect.getsource(_test_sigint_impl) +
+         f"\n_test_sigint_impl({backend!r}, {target!r}, {kwargs!r})"])
+    try:
+        proc.wait_for('DRAW')
+        stdout, _ = proc.communicate(timeout=_test_timeout)
+    except:
+        proc.kill()
+        stdout, _ = proc.communicate()
+        raise
+    print(stdout)
+    assert 'SUCCESS' in stdout
+
+
+def _test_other_signal_before_sigint_impl(backend, target_name, kwargs):
+    import signal
+    import matplotlib.pyplot as plt
+    plt.switch_backend(backend)
+    from matplotlib.backends.qt_compat import QtCore  # noqa
+
+    target = getattr(plt, target_name)
+
+    fig = plt.figure()
+    fig.canvas.mpl_connect('draw_event',
+                           lambda *args: print('DRAW', flush=True))
+
+    timer = fig.canvas.new_timer(interval=1)
+    timer.single_shot = True
+    timer.add_callback(print, 'SIGUSR1', flush=True)
+
+    def custom_signal_handler(signum, frame):
+        timer.start()
+    signal.signal(signal.SIGUSR1, custom_signal_handler)
+
+    try:
+        target(**kwargs)
+    except KeyboardInterrupt:
+        print('SUCCESS', flush=True)
+
+
+@pytest.mark.skipif(sys.platform == 'win32',
+                    reason='No other signal available to send on Windows')
+@pytest.mark.backend('QtAgg', skip_on_importerror=True)
+@pytest.mark.parametrize("target, kwargs", [
+    ('show', {'block': True}),
+    ('pause', {'interval': 10})
+])
+def test_other_signal_before_sigint(target, kwargs):
+    backend = plt.get_backend()
+    proc = WaitForStringPopen(
+        [sys.executable, "-c",
+         inspect.getsource(_test_other_signal_before_sigint_impl) +
+         "\n_test_other_signal_before_sigint_impl("
+            f"{backend!r}, {target!r}, {kwargs!r})"])
+    try:
+        proc.wait_for('DRAW')
+        os.kill(proc.pid, signal.SIGUSR1)
+        proc.wait_for('SIGUSR1')
+        os.kill(proc.pid, signal.SIGINT)
+        stdout, _ = proc.communicate(timeout=_test_timeout)
+    except:
+        proc.kill()
+        stdout, _ = proc.communicate()
+        raise
+    print(stdout)
+    assert 'SUCCESS' in stdout
+    plt.figure()
+
+
 @pytest.mark.backend('Qt5Agg', skip_on_importerror=True)
-def test_fig_signals(qt_core):
+def test_fig_sigint_override(qt_core):
+    from matplotlib.backends.backend_qt5 import _BackendQT5
     # Create a figure
     plt.figure()
 
-    # Access signals
-    event_loop_signal = None
+    # Variable to access the handler from the inside of the event loop
+    event_loop_handler = None
 
     # Callback to fire during event loop: save SIGINT handler, then exit
     def fire_signal_and_quit():
         # Save event loop signal
-        nonlocal event_loop_signal
-        event_loop_signal = signal.getsignal(signal.SIGINT)
+        nonlocal event_loop_handler
+        event_loop_handler = signal.getsignal(signal.SIGINT)
 
         # Request event loop exit
         qt_core.QCoreApplication.exit()
@@ -78,45 +213,69 @@ def fire_signal_and_quit():
     qt_core.QTimer.singleShot(0, fire_signal_and_quit)
 
     # Save original SIGINT handler
-    original_signal = signal.getsignal(signal.SIGINT)
+    original_handler = signal.getsignal(signal.SIGINT)
 
     # Use our own SIGINT handler to be 100% sure this is working
-    def CustomHandler(signum, frame):
+    def custom_handler(signum, frame):
         pass
 
-    signal.signal(signal.SIGINT, CustomHandler)
+    signal.signal(signal.SIGINT, custom_handler)
+
+    try:
+        # mainloop() sets SIGINT, starts Qt event loop (which triggers timer
+        # and exits) and then mainloop() resets SIGINT
+        matplotlib.backends.backend_qt._BackendQT.mainloop()
+
+        # Assert: signal handler during loop execution is changed
+        # (can't test equality with func)
+        assert event_loop_handler != custom_handler
 
-    # mainloop() sets SIGINT, starts Qt event loop (which triggers timer and
-    # exits) and then mainloop() resets SIGINT
-    matplotlib.backends.backend_qt5._BackendQT5.mainloop()
+        # Assert: current signal handler is the same as the one we set before
+        assert signal.getsignal(signal.SIGINT) == custom_handler
 
-    # Assert: signal handler during loop execution is signal.SIG_DFL
-    assert event_loop_signal == signal.SIG_DFL
+        # Repeat again to test that SIG_DFL and SIG_IGN will not be overridden
+        for custom_handler in (signal.SIG_DFL, signal.SIG_IGN):
+            qt_core.QTimer.singleShot(0, fire_signal_and_quit)
+            signal.signal(signal.SIGINT, custom_handler)
 
-    # Assert: current signal handler is the same as the one we set before
-    assert CustomHandler == signal.getsignal(signal.SIGINT)
+            _BackendQT5.mainloop()
 
-    # Reset SIGINT handler to what it was before the test
-    signal.signal(signal.SIGINT, original_signal)
+            assert event_loop_handler == custom_handler
+            assert signal.getsignal(signal.SIGINT) == custom_handler
+
+    finally:
+        # Reset SIGINT handler to what it was before the test
+        signal.signal(signal.SIGINT, original_handler)
 
 
 @pytest.mark.parametrize(
-    'qt_key, qt_mods, answer',
+    "qt_key, qt_mods, answer",
     [
-        ('Key_A', ['ShiftModifier'], 'A'),
-        ('Key_A', [], 'a'),
-        ('Key_A', ['ControlModifier'], 'ctrl+a'),
-        ('Key_Aacute', ['ShiftModifier'],
-         '\N{LATIN CAPITAL LETTER A WITH ACUTE}'),
-        ('Key_Aacute', [],
-         '\N{LATIN SMALL LETTER A WITH ACUTE}'),
-        ('Key_Control', ['AltModifier'], 'alt+control'),
-        ('Key_Alt', ['ControlModifier'], 'ctrl+alt'),
-        ('Key_Aacute', ['ControlModifier', 'AltModifier', 'MetaModifier'],
-         'ctrl+alt+super+\N{LATIN SMALL LETTER A WITH ACUTE}'),
-        ('Key_Play', [], None),
-        ('Key_Backspace', [], 'backspace'),
-        ('Key_Backspace', ['ControlModifier'], 'ctrl+backspace'),
+        ("Key_A", ["ShiftModifier"], "A"),
+        ("Key_A", [], "a"),
+        ("Key_A", ["ControlModifier"], ("ctrl+a")),
+        (
+            "Key_Aacute",
+            ["ShiftModifier"],
+            "\N{LATIN CAPITAL LETTER A WITH ACUTE}",
+        ),
+        ("Key_Aacute", [], "\N{LATIN SMALL LETTER A WITH ACUTE}"),
+        ("Key_Control", ["AltModifier"], ("alt+control")),
+        ("Key_Alt", ["ControlModifier"], "ctrl+alt"),
+        (
+            "Key_Aacute",
+            ["ControlModifier", "AltModifier", "MetaModifier"],
+            ("ctrl+alt+meta+\N{LATIN SMALL LETTER A WITH ACUTE}"),
+        ),
+        # We do not currently map the media keys, this may change in the
+        # future.  This means the callback will never fire
+        ("Key_Play", [], None),
+        ("Key_Backspace", [], "backspace"),
+        (
+            "Key_Backspace",
+            ["ControlModifier"],
+            "ctrl+backspace",
+        ),
     ],
     ids=[
         'shift',
@@ -134,12 +293,12 @@ def CustomHandler(signum, frame):
 )
 @pytest.mark.parametrize('backend', [
     # Note: the value is irrelevant; the important part is the marker.
-    pytest.param(
-        'Qt4Agg',
-        marks=pytest.mark.backend('Qt4Agg', skip_on_importerror=True)),
     pytest.param(
         'Qt5Agg',
         marks=pytest.mark.backend('Qt5Agg', skip_on_importerror=True)),
+    pytest.param(
+        'QtAgg',
+        marks=pytest.mark.backend('QtAgg', skip_on_importerror=True)),
 ])
 def test_correct_key(backend, qt_core, qt_key, qt_mods, answer):
     """
@@ -148,31 +307,40 @@ def test_correct_key(backend, qt_core, qt_key, qt_mods, answer):
     Catch the event.
     Assert sent and caught keys are the same.
     """
-    qt_mod = qt_core.Qt.NoModifier
+    from matplotlib.backends.qt_compat import _enum, _to_int
+
+    if sys.platform == "darwin" and answer is not None:
+        answer = answer.replace("ctrl", "cmd")
+        answer = answer.replace("control", "cmd")
+        answer = answer.replace("meta", "ctrl")
+    result = None
+    qt_mod = _enum("QtCore.Qt.KeyboardModifier").NoModifier
     for mod in qt_mods:
-        qt_mod |= getattr(qt_core.Qt, mod)
+        qt_mod |= getattr(_enum("QtCore.Qt.KeyboardModifier"), mod)
 
     class _Event:
         def isAutoRepeat(self): return False
-        def key(self): return getattr(qt_core.Qt, qt_key)
+        def key(self): return _to_int(getattr(_enum("QtCore.Qt.Key"), qt_key))
         def modifiers(self): return qt_mod
 
     def on_key_press(event):
-        assert event.key == answer
+        nonlocal result
+        result = event.key
 
     qt_canvas = plt.figure().canvas
     qt_canvas.mpl_connect('key_press_event', on_key_press)
     qt_canvas.keyPressEvent(_Event())
+    assert result == answer
 
 
-@pytest.mark.backend('Qt5Agg', skip_on_importerror=True)
-def test_pixel_ratio_change():
+@pytest.mark.backend('QtAgg', skip_on_importerror=True)
+def test_device_pixel_ratio_change():
     """
     Make sure that if the pixel ratio changes, the figure dpi changes but the
-    widget remains the same physical size.
+    widget remains the same logical size.
     """
 
-    prop = 'matplotlib.backends.backend_qt5.FigureCanvasQT.devicePixelRatioF'
+    prop = 'matplotlib.backends.backend_qt.FigureCanvasQT.devicePixelRatioF'
     with mock.patch(prop) as p:
         p.return_value = 3
 
@@ -180,10 +348,8 @@ def test_pixel_ratio_change():
         qt_canvas = fig.canvas
         qt_canvas.show()
 
-        def set_pixel_ratio(ratio):
+        def set_device_pixel_ratio(ratio):
             p.return_value = ratio
-            # Make sure the mocking worked
-            assert qt_canvas._dpi_ratio == ratio
 
             # The value here doesn't matter, as we can't mock the C++ QScreen
             # object, but can override the functional wrapper around it.
@@ -194,71 +360,82 @@ def set_pixel_ratio(ratio):
             qt_canvas.draw()
             qt_canvas.flush_events()
 
+            # Make sure the mocking worked
+            assert qt_canvas.device_pixel_ratio == ratio
+
         qt_canvas.manager.show()
         size = qt_canvas.size()
         screen = qt_canvas.window().windowHandle().screen()
-        set_pixel_ratio(3)
+        set_device_pixel_ratio(3)
 
         # The DPI and the renderer width/height change
         assert fig.dpi == 360
         assert qt_canvas.renderer.width == 1800
         assert qt_canvas.renderer.height == 720
 
-        # The actual widget size and figure physical size don't change
+        # The actual widget size and figure logical size don't change.
         assert size.width() == 600
         assert size.height() == 240
         assert qt_canvas.get_width_height() == (600, 240)
         assert (fig.get_size_inches() == (5, 2)).all()
 
-        set_pixel_ratio(2)
+        set_device_pixel_ratio(2)
 
         # The DPI and the renderer width/height change
         assert fig.dpi == 240
         assert qt_canvas.renderer.width == 1200
         assert qt_canvas.renderer.height == 480
 
-        # The actual widget size and figure physical size don't change
+        # The actual widget size and figure logical size don't change.
         assert size.width() == 600
         assert size.height() == 240
         assert qt_canvas.get_width_height() == (600, 240)
         assert (fig.get_size_inches() == (5, 2)).all()
 
-        set_pixel_ratio(1.5)
+        set_device_pixel_ratio(1.5)
 
         # The DPI and the renderer width/height change
         assert fig.dpi == 180
         assert qt_canvas.renderer.width == 900
         assert qt_canvas.renderer.height == 360
 
-        # The actual widget size and figure physical size don't change
+        # The actual widget size and figure logical size don't change.
         assert size.width() == 600
         assert size.height() == 240
         assert qt_canvas.get_width_height() == (600, 240)
         assert (fig.get_size_inches() == (5, 2)).all()
 
 
-@pytest.mark.backend('Qt5Agg', skip_on_importerror=True)
+@pytest.mark.backend('QtAgg', skip_on_importerror=True)
 def test_subplottool():
     fig, ax = plt.subplots()
-    with mock.patch(
-            "matplotlib.backends.backend_qt5.SubplotToolQt.exec_",
-            lambda self: None):
+    with mock.patch("matplotlib.backends.qt_compat._exec", lambda obj: None):
         fig.canvas.manager.toolbar.configure_subplots()
 
 
-@pytest.mark.backend('Qt5Agg', skip_on_importerror=True)
+@pytest.mark.backend('QtAgg', skip_on_importerror=True)
 def test_figureoptions():
     fig, ax = plt.subplots()
     ax.plot([1, 2])
     ax.imshow([[1]])
     ax.scatter(range(3), range(3), c=range(3))
-    with mock.patch(
-            "matplotlib.backends.qt_editor._formlayout.FormDialog.exec_",
-            lambda self: None):
+    with mock.patch("matplotlib.backends.qt_compat._exec", lambda obj: None):
         fig.canvas.manager.toolbar.edit_parameters()
 
 
-@pytest.mark.backend('Qt5Agg', skip_on_importerror=True)
+@pytest.mark.backend('QtAgg', skip_on_importerror=True)
+def test_figureoptions_with_datetime_axes():
+    fig, ax = plt.subplots()
+    xydata = [
+        datetime(year=2021, month=1, day=1),
+        datetime(year=2021, month=2, day=1)
+    ]
+    ax.plot(xydata, xydata)
+    with mock.patch("matplotlib.backends.qt_compat._exec", lambda obj: None):
+        fig.canvas.manager.toolbar.edit_parameters()
+
+
+@pytest.mark.backend('QtAgg', skip_on_importerror=True)
 def test_double_resize():
     # Check that resizing a figure twice keeps the same window size
     fig, ax = plt.subplots()
@@ -278,9 +455,9 @@ def test_double_resize():
     assert window.height() == old_height
 
 
-@pytest.mark.backend('Qt5Agg', skip_on_importerror=True)
+@pytest.mark.backend('QtAgg', skip_on_importerror=True)
 def test_canvas_reinit():
-    from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg
+    from matplotlib.backends.backend_qtagg import FigureCanvasQTAgg
 
     called = False
 
@@ -295,3 +472,171 @@ def crashing_callback(fig, stale):
     canvas = FigureCanvasQTAgg(fig)
     fig.stale = True
     assert called
+
+
+@pytest.mark.backend('Qt5Agg', skip_on_importerror=True)
+def test_form_widget_get_with_datetime_and_date_fields():
+    from matplotlib.backends.backend_qt import _create_qApp
+    _create_qApp()
+
+    form = [
+        ("Datetime field", datetime(year=2021, month=3, day=11)),
+        ("Date field", date(year=2021, month=3, day=11))
+    ]
+    widget = _formlayout.FormWidget(form)
+    widget.setup()
+    values = widget.get()
+    assert values == [
+        datetime(year=2021, month=3, day=11),
+        date(year=2021, month=3, day=11)
+    ]
+
+
+# The source of this function gets extracted and run in another process, so it
+# must be fully self-contained.
+def _test_enums_impl():
+    import sys
+
+    from matplotlib.backends.qt_compat import _enum, _to_int
+    from matplotlib.backend_bases import cursors, MouseButton
+
+    _enum("QtGui.QDoubleValidator.State").Acceptable
+
+    _enum("QtWidgets.QDialogButtonBox.StandardButton").Ok
+    _enum("QtWidgets.QDialogButtonBox.StandardButton").Cancel
+    _enum("QtWidgets.QDialogButtonBox.StandardButton").Apply
+    for btn_type in ["Ok", "Cancel"]:
+        getattr(_enum("QtWidgets.QDialogButtonBox.StandardButton"), btn_type)
+
+    _enum("QtGui.QImage.Format").Format_ARGB32_Premultiplied
+    _enum("QtGui.QImage.Format").Format_ARGB32_Premultiplied
+    # SPECIAL_KEYS are Qt::Key that do *not* return their Unicode name instead
+    # they have manually specified names.
+    SPECIAL_KEYS = {
+        _to_int(getattr(_enum("QtCore.Qt.Key"), k)): v
+        for k, v in [
+            ("Key_Escape", "escape"),
+            ("Key_Tab", "tab"),
+            ("Key_Backspace", "backspace"),
+            ("Key_Return", "enter"),
+            ("Key_Enter", "enter"),
+            ("Key_Insert", "insert"),
+            ("Key_Delete", "delete"),
+            ("Key_Pause", "pause"),
+            ("Key_SysReq", "sysreq"),
+            ("Key_Clear", "clear"),
+            ("Key_Home", "home"),
+            ("Key_End", "end"),
+            ("Key_Left", "left"),
+            ("Key_Up", "up"),
+            ("Key_Right", "right"),
+            ("Key_Down", "down"),
+            ("Key_PageUp", "pageup"),
+            ("Key_PageDown", "pagedown"),
+            ("Key_Shift", "shift"),
+            # In OSX, the control and super (aka cmd/apple) keys are switched.
+            ("Key_Control", "control" if sys.platform != "darwin" else "cmd"),
+            ("Key_Meta", "meta" if sys.platform != "darwin" else "control"),
+            ("Key_Alt", "alt"),
+            ("Key_CapsLock", "caps_lock"),
+            ("Key_F1", "f1"),
+            ("Key_F2", "f2"),
+            ("Key_F3", "f3"),
+            ("Key_F4", "f4"),
+            ("Key_F5", "f5"),
+            ("Key_F6", "f6"),
+            ("Key_F7", "f7"),
+            ("Key_F8", "f8"),
+            ("Key_F9", "f9"),
+            ("Key_F10", "f10"),
+            ("Key_F10", "f11"),
+            ("Key_F12", "f12"),
+            ("Key_Super_L", "super"),
+            ("Key_Super_R", "super"),
+        ]
+    }
+    # Define which modifier keys are collected on keyboard events.  Elements
+    # are (Qt::KeyboardModifiers, Qt::Key) tuples.  Order determines the
+    # modifier order (ctrl+alt+...) reported by Matplotlib.
+    _MODIFIER_KEYS = [
+        (
+            _to_int(getattr(_enum("QtCore.Qt.KeyboardModifier"), mod)),
+            _to_int(getattr(_enum("QtCore.Qt.Key"), key)),
+        )
+        for mod, key in [
+            ("ControlModifier", "Key_Control"),
+            ("AltModifier", "Key_Alt"),
+            ("ShiftModifier", "Key_Shift"),
+            ("MetaModifier", "Key_Meta"),
+        ]
+    ]
+    cursord = {
+        k: getattr(_enum("QtCore.Qt.CursorShape"), v)
+        for k, v in [
+            (cursors.MOVE, "SizeAllCursor"),
+            (cursors.HAND, "PointingHandCursor"),
+            (cursors.POINTER, "ArrowCursor"),
+            (cursors.SELECT_REGION, "CrossCursor"),
+            (cursors.WAIT, "WaitCursor"),
+        ]
+    }
+
+    buttond = {
+        getattr(_enum("QtCore.Qt.MouseButton"), k): v
+        for k, v in [
+            ("LeftButton", MouseButton.LEFT),
+            ("RightButton", MouseButton.RIGHT),
+            ("MiddleButton", MouseButton.MIDDLE),
+            ("XButton1", MouseButton.BACK),
+            ("XButton2", MouseButton.FORWARD),
+        ]
+    }
+
+    _enum("QtCore.Qt.WidgetAttribute").WA_OpaquePaintEvent
+    _enum("QtCore.Qt.FocusPolicy").StrongFocus
+    _enum("QtCore.Qt.ToolBarArea").TopToolBarArea
+    _enum("QtCore.Qt.ToolBarArea").TopToolBarArea
+    _enum("QtCore.Qt.AlignmentFlag").AlignRight
+    _enum("QtCore.Qt.AlignmentFlag").AlignVCenter
+    _enum("QtWidgets.QSizePolicy.Policy").Expanding
+    _enum("QtWidgets.QSizePolicy.Policy").Ignored
+    _enum("QtCore.Qt.MaskMode").MaskOutColor
+    _enum("QtCore.Qt.ToolBarArea").TopToolBarArea
+    _enum("QtCore.Qt.ToolBarArea").TopToolBarArea
+    _enum("QtCore.Qt.AlignmentFlag").AlignRight
+    _enum("QtCore.Qt.AlignmentFlag").AlignVCenter
+    _enum("QtWidgets.QSizePolicy.Policy").Expanding
+    _enum("QtWidgets.QSizePolicy.Policy").Ignored
+
+
+def _get_testable_qt_backends():
+    envs = []
+    for deps, env in [
+            ([qt_api], {"MPLBACKEND": "qtagg", "QT_API": qt_api})
+            for qt_api in ["PyQt6", "PySide6", "PyQt5", "PySide2"]
+    ]:
+        reason = None
+        missing = [dep for dep in deps if not importlib.util.find_spec(dep)]
+        if (sys.platform == "linux" and
+                not _c_internal_utils.display_is_valid()):
+            reason = "$DISPLAY and $WAYLAND_DISPLAY are unset"
+        elif missing:
+            reason = "{} cannot be imported".format(", ".join(missing))
+        elif env["MPLBACKEND"] == 'macosx' and os.environ.get('TF_BUILD'):
+            reason = "macosx backend fails on Azure"
+        marks = []
+        if reason:
+            marks.append(pytest.mark.skip(
+                reason=f"Skipping {env} because {reason}"))
+        envs.append(pytest.param(env, marks=marks, id=str(env)))
+    return envs
+
+
+@pytest.mark.parametrize("env", _get_testable_qt_backends())
+def test_enums_available(env):
+    proc = subprocess.run(
+        [sys.executable, "-c",
+         inspect.getsource(_test_enums_impl) + "\n_test_enums_impl()"],
+        env={**os.environ, "SOURCE_DATE_EPOCH": "0", **env},
+        timeout=_test_timeout, check=True,
+        stdout=subprocess.PIPE, universal_newlines=True)
diff --git a/lib/matplotlib/tests/test_backend_svg.py b/lib/matplotlib/tests/test_backend_svg.py
index 66ec48a477bf..680efd67379b 100644
--- a/lib/matplotlib/tests/test_backend_svg.py
+++ b/lib/matplotlib/tests/test_backend_svg.py
@@ -1,22 +1,20 @@
 import datetime
 from io import BytesIO
-import tempfile
+from pathlib import Path
 import xml.etree.ElementTree
 import xml.parsers.expat
 
-import numpy as np
 import pytest
 
+import numpy as np
+
 import matplotlib as mpl
-from matplotlib import dviread
 from matplotlib.figure import Figure
+from matplotlib.text import Text
 import matplotlib.pyplot as plt
-from matplotlib.testing.decorators import image_comparison, check_figures_equal
-
-
-needs_usetex = pytest.mark.skipif(
-    not mpl.checkdep_usetex(True),
-    reason="This test needs a TeX installation")
+from matplotlib.testing.decorators import check_figures_equal, image_comparison
+from matplotlib.testing._markers import needs_usetex
+from matplotlib import font_manager as fm
 
 
 def test_visibility():
@@ -181,24 +179,8 @@ def count_tag(fig, tag):
     assert count_tag(fig5, "path") == 1  # axis patch
 
 
-@needs_usetex
-def test_missing_psfont(monkeypatch):
-    """An error is raised if a TeX font lacks a Type-1 equivalent"""
-
-    def psfont(*args, **kwargs):
-        return dviread.PsFont(texname='texfont', psname='Some Font',
-                              effects=None, encoding=None, filename=None)
-
-    monkeypatch.setattr(dviread.PsfontsMap, '__getitem__', psfont)
-    mpl.rc('text', usetex=True)
-    fig, ax = plt.subplots()
-    ax.text(0.5, 0.5, 'hello')
-    with tempfile.TemporaryFile() as tmpfile, pytest.raises(ValueError):
-        fig.savefig(tmpfile, format='svg')
-
-
 # Use Computer Modern Sans Serif, not Helvetica (which has no \textwon).
-@pytest.mark.style('default')
+@mpl.style.context('default')
 @needs_usetex
 def test_unicode_won():
     fig = Figure()
@@ -216,7 +198,7 @@ def test_unicode_won():
 
 
 def test_svgnone_with_data_coordinates():
-    plt.rcParams['svg.fonttype'] = 'none'
+    plt.rcParams.update({'svg.fonttype': 'none', 'font.stretch': 'condensed'})
     expected = 'Unlikely to appear by chance'
 
     fig, ax = plt.subplots()
@@ -229,9 +211,7 @@ def test_svgnone_with_data_coordinates():
         fd.seek(0)
         buf = fd.read().decode()
 
-    assert expected in buf
-    for prop in ["family", "weight", "stretch", "style", "size"]:
-        assert f"font-{prop}:" in buf
+    assert expected in buf and "condensed" in buf
 
 
 def test_gid():
@@ -272,7 +252,7 @@ def include(gid, obj):
         # we need to exclude certain objects which will not appear in the svg
         if isinstance(obj, OffsetBox):
             return False
-        if isinstance(obj, plt.Text):
+        if isinstance(obj, Text):
             if obj.get_text() == "":
                 return False
             elif obj.axes is None:
@@ -310,17 +290,17 @@ def test_url():
 
     # collections
     s = ax.scatter([1, 2, 3], [4, 5, 6])
-    s.set_urls(['http://example.com/foo', 'http://example.com/bar', None])
+    s.set_urls(['https://example.com/foo', 'https://example.com/bar', None])
 
     # Line2D
     p, = plt.plot([1, 3], [6, 5])
-    p.set_url('http://example.com/baz')
+    p.set_url('https://example.com/baz')
 
     b = BytesIO()
     fig.savefig(b, format='svg')
     b = b.getvalue()
     for v in [b'foo', b'bar', b'baz']:
-        assert b'http://example.com/' + v in b
+        assert b'https://example.com/' + v in b
 
 
 def test_url_tick(monkeypatch):
@@ -329,13 +309,13 @@ def test_url_tick(monkeypatch):
     fig1, ax = plt.subplots()
     ax.scatter([1, 2, 3], [4, 5, 6])
     for i, tick in enumerate(ax.yaxis.get_major_ticks()):
-        tick.set_url(f'http://example.com/{i}')
+        tick.set_url(f'https://example.com/{i}')
 
     fig2, ax = plt.subplots()
     ax.scatter([1, 2, 3], [4, 5, 6])
     for i, tick in enumerate(ax.yaxis.get_major_ticks()):
-        tick.label1.set_url(f'http://example.com/{i}')
-        tick.label2.set_url(f'http://example.com/{i}')
+        tick.label1.set_url(f'https://example.com/{i}')
+        tick.label2.set_url(f'https://example.com/{i}')
 
     b1 = BytesIO()
     fig1.savefig(b1, format='svg')
@@ -346,7 +326,7 @@ def test_url_tick(monkeypatch):
     b2 = b2.getvalue()
 
     for i in range(len(ax.yaxis.get_major_ticks())):
-        assert f'http://example.com/{i}'.encode('ascii') in b1
+        assert f'https://example.com/{i}'.encode('ascii') in b1
     assert b1 == b2
 
 
@@ -445,7 +425,7 @@ def test_svg_metadata():
         **{k: [f'{k} bar', f'{k} baz'] for k in multi_value},
     }
 
-    fig, ax = plt.subplots()
+    fig = plt.figure()
     with BytesIO() as fd:
         fig.savefig(fd, format='svg', metadata=metadata)
         buf = fd.getvalue().decode()
@@ -488,3 +468,123 @@ def test_svg_metadata():
     values = [node.text for node in
               rdf.findall(f'./{CCNS}Work/{DCNS}subject/{RDFNS}Bag/{RDFNS}li')]
     assert values == metadata['Keywords']
+
+
+@image_comparison(["multi_font_aspath.svg"], tol=1.8)
+def test_multi_font_type3():
+    fp = fm.FontProperties(family=["WenQuanYi Zen Hei"])
+    if Path(fm.findfont(fp)).name != "wqy-zenhei.ttc":
+        pytest.skip("Font may be missing")
+
+    plt.rc('font', family=['DejaVu Sans', 'WenQuanYi Zen Hei'], size=27)
+    plt.rc('svg', fonttype='path')
+
+    fig = plt.figure()
+    fig.text(0.15, 0.475, "There are 几个汉字 in between!")
+
+
+@image_comparison(["multi_font_astext.svg"])
+def test_multi_font_type42():
+    fp = fm.FontProperties(family=["WenQuanYi Zen Hei"])
+    if Path(fm.findfont(fp)).name != "wqy-zenhei.ttc":
+        pytest.skip("Font may be missing")
+
+    fig = plt.figure()
+    plt.rc('svg', fonttype='none')
+
+    plt.rc('font', family=['DejaVu Sans', 'WenQuanYi Zen Hei'], size=27)
+    fig.text(0.15, 0.475, "There are 几个汉字 in between!")
+
+
+@pytest.mark.parametrize('metadata,error,message', [
+    ({'Date': 1}, TypeError, "Invalid type for Date metadata. Expected str"),
+    ({'Date': [1]}, TypeError,
+     "Invalid type for Date metadata. Expected iterable"),
+    ({'Keywords': 1}, TypeError,
+     "Invalid type for Keywords metadata. Expected str"),
+    ({'Keywords': [1]}, TypeError,
+     "Invalid type for Keywords metadata. Expected iterable"),
+    ({'Creator': 1}, TypeError,
+     "Invalid type for Creator metadata. Expected str"),
+    ({'Creator': [1]}, TypeError,
+     "Invalid type for Creator metadata. Expected iterable"),
+    ({'Title': 1}, TypeError,
+     "Invalid type for Title metadata. Expected str"),
+    ({'Format': 1}, TypeError,
+     "Invalid type for Format metadata. Expected str"),
+    ({'Foo': 'Bar'}, ValueError, "Unknown metadata key"),
+    ])
+def test_svg_incorrect_metadata(metadata, error, message):
+    with pytest.raises(error, match=message), BytesIO() as fd:
+        fig = plt.figure()
+        fig.savefig(fd, format='svg', metadata=metadata)
+
+
+def test_svg_escape():
+    fig = plt.figure()
+    fig.text(0.5, 0.5, "<\'\"&>", gid="<\'\"&>")
+    with BytesIO() as fd:
+        fig.savefig(fd, format='svg')
+        buf = fd.getvalue().decode()
+        assert '&lt;&apos;&quot;&amp;&gt;"' in buf
+
+
+@pytest.mark.parametrize("font_str", [
+    "'DejaVu Sans', 'WenQuanYi Zen Hei', 'Arial', sans-serif",
+    "'DejaVu Serif', 'WenQuanYi Zen Hei', 'Times New Roman', serif",
+    "'Arial', 'WenQuanYi Zen Hei', cursive",
+    "'Impact', 'WenQuanYi Zen Hei', fantasy",
+    "'DejaVu Sans Mono', 'WenQuanYi Zen Hei', 'Courier New', monospace",
+    # These do not work because the logic to get the font metrics will not find
+    # WenQuanYi as the fallback logic stops with the first fallback font:
+    # "'DejaVu Sans Mono', 'Courier New', 'WenQuanYi Zen Hei', monospace",
+    # "'DejaVu Sans', 'Arial', 'WenQuanYi Zen Hei', sans-serif",
+    # "'DejaVu Serif', 'Times New Roman', 'WenQuanYi Zen Hei',  serif",
+])
+@pytest.mark.parametrize("include_generic", [True, False])
+def test_svg_font_string(font_str, include_generic):
+    fp = fm.FontProperties(family=["WenQuanYi Zen Hei"])
+    if Path(fm.findfont(fp)).name != "wqy-zenhei.ttc":
+        pytest.skip("Font may be missing")
+
+    explicit, *rest, generic = map(
+        lambda x: x.strip("'"), font_str.split(", ")
+    )
+    size = len(generic)
+    if include_generic:
+        rest = rest + [generic]
+    plt.rcParams[f"font.{generic}"] = rest
+    plt.rcParams["font.size"] = size
+    plt.rcParams["svg.fonttype"] = "none"
+
+    fig, ax = plt.subplots()
+    if generic == "sans-serif":
+        generic_options = ["sans", "sans-serif", "sans serif"]
+    else:
+        generic_options = [generic]
+
+    for generic_name in generic_options:
+        # test that fallback works
+        ax.text(0.5, 0.5, "There are 几个汉字 in between!",
+                family=[explicit, generic_name], ha="center")
+        # test deduplication works
+        ax.text(0.5, 0.1, "There are 几个汉字 in between!",
+                family=[explicit, *rest, generic_name], ha="center")
+    ax.axis("off")
+
+    with BytesIO() as fd:
+        fig.savefig(fd, format="svg")
+        buf = fd.getvalue()
+
+    tree = xml.etree.ElementTree.fromstring(buf)
+    ns = "http://www.w3.org/2000/svg"
+    text_count = 0
+    for text_element in tree.findall(f".//{{{ns}}}text"):
+        text_count += 1
+        font_info = dict(
+            map(lambda x: x.strip(), _.strip().split(":"))
+            for _ in dict(text_element.items())["style"].split(";")
+        )["font"]
+
+        assert font_info == f"{size}px {font_str}"
+    assert text_count == len(ax.texts)
diff --git a/lib/matplotlib/tests/test_backend_template.py b/lib/matplotlib/tests/test_backend_template.py
new file mode 100644
index 000000000000..7afe8bae69a9
--- /dev/null
+++ b/lib/matplotlib/tests/test_backend_template.py
@@ -0,0 +1,29 @@
+"""
+Backend-loading machinery tests, using variations on the template backend.
+"""
+
+import sys
+from types import SimpleNamespace
+
+import matplotlib as mpl
+from matplotlib import pyplot as plt
+from matplotlib.backends import backend_template
+from matplotlib.backends.backend_template import (
+    FigureCanvasTemplate, FigureManagerTemplate)
+
+
+def test_load_template():
+    mpl.use("template")
+    assert type(plt.figure().canvas) == FigureCanvasTemplate
+
+
+def test_load_old_api(monkeypatch):
+    mpl_test_backend = SimpleNamespace(**vars(backend_template))
+    mpl_test_backend.new_figure_manager = (
+        lambda num, *args, FigureClass=mpl.figure.Figure, **kwargs:
+        FigureManagerTemplate(
+            FigureCanvasTemplate(FigureClass(*args, **kwargs)), num))
+    monkeypatch.setitem(sys.modules, "mpl_test_backend", mpl_test_backend)
+    mpl.use("module://mpl_test_backend")
+    assert type(plt.figure().canvas) == FigureCanvasTemplate
+    plt.draw_if_interactive()
diff --git a/lib/matplotlib/tests/test_backend_tk.py b/lib/matplotlib/tests/test_backend_tk.py
index a129aff0bd95..4d43e27aa4a4 100644
--- a/lib/matplotlib/tests/test_backend_tk.py
+++ b/lib/matplotlib/tests/test_backend_tk.py
@@ -1,236 +1,257 @@
+import functools
+import importlib
 import os
+import platform
 import subprocess
 import sys
 
 import pytest
 
-_test_timeout = 10  # Empirically, 1s is not enough on CI.
+from matplotlib.testing import subprocess_run_helper
+from matplotlib import _c_internal_utils
 
-# NOTE: TkAgg tests seem to have interactions between tests,
-# So isolate each test in a subprocess. See GH#18261
+_test_timeout = 60  # A reasonably safe value for slower architectures.
 
 
-@pytest.mark.backend('TkAgg', skip_on_importerror=True)
+def _isolated_tk_test(success_count, func=None):
+    """
+    A decorator to run *func* in a subprocess and assert that it prints
+    "success" *success_count* times and nothing on stderr.
+
+    TkAgg tests seem to have interactions between tests, so isolate each test
+    in a subprocess. See GH#18261
+    """
+
+    if func is None:
+        return functools.partial(_isolated_tk_test, success_count)
+
+    if "MPL_TEST_ESCAPE_HATCH" in os.environ:
+        # set in subprocess_run_helper() below
+        return func
+
+    @pytest.mark.skipif(
+        not importlib.util.find_spec('tkinter'),
+        reason="missing tkinter"
+    )
+    @pytest.mark.skipif(
+        sys.platform == "linux" and not _c_internal_utils.display_is_valid(),
+        reason="$DISPLAY and $WAYLAND_DISPLAY are unset"
+    )
+    @functools.wraps(func)
+    def test_func():
+        # even if the package exists, may not actually be importable this can
+        # be the case on some CI systems.
+        pytest.importorskip('tkinter')
+        try:
+            proc = subprocess_run_helper(
+                func, timeout=_test_timeout, extra_env=dict(
+                    MPLBACKEND="TkAgg", MPL_TEST_ESCAPE_HATCH="1"))
+        except subprocess.TimeoutExpired:
+            pytest.fail("Subprocess timed out")
+        except subprocess.CalledProcessError as e:
+            pytest.fail("Subprocess failed to test intended behavior\n"
+                        + str(e.stderr))
+        else:
+            # macOS may actually emit irrelevant errors about Accelerated
+            # OpenGL vs. software OpenGL, or some permission error on Azure, so
+            # suppress them.
+            # Asserting stderr first (and printing it on failure) should be
+            # more helpful for debugging that printing a failed success count.
+            ignored_lines = ["OpenGL", "CFMessagePort: bootstrap_register",
+                             "/usr/include/servers/bootstrap_defs.h"]
+            assert not [line for line in proc.stderr.splitlines()
+                        if all(msg not in line for msg in ignored_lines)]
+            assert proc.stdout.count("success") == success_count
+
+    return test_func
+
+
+@_isolated_tk_test(success_count=6)  # len(bad_boxes)
 def test_blit():
-    script = """
-import matplotlib.pyplot as plt
-import numpy as np
-from matplotlib.backends import _tkagg
-def evil_blit(photoimage, aggimage, offsets, bboxptr):
-    data = np.asarray(aggimage)
+    import matplotlib.pyplot as plt
+    import numpy as np
+    import matplotlib.backends.backend_tkagg  # noqa
+    from matplotlib.backends import _tkagg
+
+    fig, ax = plt.subplots()
+    photoimage = fig.canvas._tkphoto
+    data = np.ones((4, 4, 4))
     height, width = data.shape[:2]
     dataptr = (height, width, data.ctypes.data)
-    _tkagg.blit(
-        photoimage.tk.interpaddr(), str(photoimage), dataptr, offsets,
-        bboxptr)
-
-fig, ax = plt.subplots()
-bad_boxes = ((-1, 2, 0, 2),
-             (2, 0, 0, 2),
-             (1, 6, 0, 2),
-             (0, 2, -1, 2),
-             (0, 2, 2, 0),
-             (0, 2, 1, 6))
-for bad_box in bad_boxes:
-    try:
-        evil_blit(fig.canvas._tkphoto,
-                  np.ones((4, 4, 4)),
-                  (0, 1, 2, 3),
-                  bad_box)
-    except ValueError:
-        print("success")
-"""
-    try:
-        proc = subprocess.run(
-            [sys.executable, "-c", script],
-            env={**os.environ,
-                 "MPLBACKEND": "TkAgg",
-                 "SOURCE_DATE_EPOCH": "0"},
-            timeout=_test_timeout,
-            stdout=subprocess.PIPE,
-            check=True,
-            universal_newlines=True,
-        )
-    except subprocess.TimeoutExpired:
-        pytest.fail("Subprocess timed out")
-    except subprocess.CalledProcessError:
-        pytest.fail("Likely regression on out-of-bounds data access"
-                    " in _tkagg.cpp")
-    else:
-        print(proc.stdout)
-        assert proc.stdout.count("success") == 6  # len(bad_boxes)
+    # Test out of bounds blitting.
+    bad_boxes = ((-1, 2, 0, 2),
+                 (2, 0, 0, 2),
+                 (1, 6, 0, 2),
+                 (0, 2, -1, 2),
+                 (0, 2, 2, 0),
+                 (0, 2, 1, 6))
+    for bad_box in bad_boxes:
+        try:
+            _tkagg.blit(
+                photoimage.tk.interpaddr(), str(photoimage), dataptr, 0,
+                (0, 1, 2, 3), bad_box)
+        except ValueError:
+            print("success")
 
 
-@pytest.mark.backend('TkAgg', skip_on_importerror=True)
+@_isolated_tk_test(success_count=1)
 def test_figuremanager_preserves_host_mainloop():
-    script = """
-import tkinter
-import matplotlib.pyplot as plt
-success = False
-
-def do_plot():
-    plt.figure()
-    plt.plot([1, 2], [3, 5])
-    plt.close()
-    root.after(0, legitimate_quit)
-
-def legitimate_quit():
-    root.quit()
-    global success
-    success = True
-
-root = tkinter.Tk()
-root.after(0, do_plot)
-root.mainloop()
-
-if success:
-    print("success")
-"""
-    try:
-        proc = subprocess.run(
-            [sys.executable, "-c", script],
-            env={**os.environ,
-                 "MPLBACKEND": "TkAgg",
-                 "SOURCE_DATE_EPOCH": "0"},
-            timeout=_test_timeout,
-            stdout=subprocess.PIPE,
-            check=True,
-            universal_newlines=True,
-        )
-    except subprocess.TimeoutExpired:
-        pytest.fail("Subprocess timed out")
-    except subprocess.CalledProcessError:
-        pytest.fail("Subprocess failed to test intended behavior")
-    else:
-        assert proc.stdout.count("success") == 1
+    import tkinter
+    import matplotlib.pyplot as plt
+    success = []
 
+    def do_plot():
+        plt.figure()
+        plt.plot([1, 2], [3, 5])
+        plt.close()
+        root.after(0, legitimate_quit)
 
-@pytest.mark.backend('TkAgg', skip_on_importerror=True)
+    def legitimate_quit():
+        root.quit()
+        success.append(True)
+
+    root = tkinter.Tk()
+    root.after(0, do_plot)
+    root.mainloop()
+
+    if success:
+        print("success")
+
+
+@pytest.mark.skipif(platform.python_implementation() != 'CPython',
+                    reason='PyPy does not support Tkinter threading: '
+                           'https://foss.heptapod.net/pypy/pypy/-/issues/1929')
 @pytest.mark.flaky(reruns=3)
+@_isolated_tk_test(success_count=1)
 def test_figuremanager_cleans_own_mainloop():
-    script = '''
-import tkinter
-import time
-import matplotlib.pyplot as plt
-import threading
-from matplotlib.cbook import _get_running_interactive_framework
-
-root = tkinter.Tk()
-plt.plot([1, 2, 3], [1, 2, 5])
-
-def target():
-    while not 'tk' == _get_running_interactive_framework():
-        time.sleep(.01)
-    plt.close()
-    if show_finished_event.wait():
-        print('success')
-
-show_finished_event = threading.Event()
-thread = threading.Thread(target=target, daemon=True)
-thread.start()
-plt.show(block=True)  # testing if this function hangs
-show_finished_event.set()
-thread.join()
-
-'''
-    try:
-        proc = subprocess.run(
-            [sys.executable, "-c", script],
-            env={**os.environ,
-                 "MPLBACKEND": "TkAgg",
-                 "SOURCE_DATE_EPOCH": "0"},
-            timeout=_test_timeout,
-            stdout=subprocess.PIPE,
-            universal_newlines=True,
-            check=True
-        )
-    except subprocess.TimeoutExpired:
-        pytest.fail("Most likely plot.show(block=True) hung")
-    except subprocess.CalledProcessError:
-        pytest.fail("Subprocess failed to test intended behavior")
-    assert proc.stdout.count("success") == 1
+    import tkinter
+    import time
+    import matplotlib.pyplot as plt
+    import threading
+    from matplotlib.cbook import _get_running_interactive_framework
+
+    root = tkinter.Tk()
+    plt.plot([1, 2, 3], [1, 2, 5])
+
+    def target():
+        while not 'tk' == _get_running_interactive_framework():
+            time.sleep(.01)
+        plt.close()
+        if show_finished_event.wait():
+            print('success')
+
+    show_finished_event = threading.Event()
+    thread = threading.Thread(target=target, daemon=True)
+    thread.start()
+    plt.show(block=True)  # Testing if this function hangs.
+    show_finished_event.set()
+    thread.join()
 
 
 @pytest.mark.backend('TkAgg', skip_on_importerror=True)
 @pytest.mark.flaky(reruns=3)
+@_isolated_tk_test(success_count=0)
 def test_never_update():
-    script = """
-import tkinter
-del tkinter.Misc.update
-del tkinter.Misc.update_idletasks
-
-import matplotlib.pyplot as plt
-fig = plt.figure()
-plt.show(block=False)
-
-# regression test on FigureCanvasTkAgg
-plt.draw()
-# regression test on NavigationToolbar2Tk
-fig.canvas.toolbar.configure_subplots()
-
-# check for update() or update_idletasks() in the event queue
-# functionally equivalent to tkinter.Misc.update
-# must pause >= 1 ms to process tcl idle events plus
-# extra time to avoid flaky tests on slow systems
-plt.pause(0.1)
-
-# regression test on FigureCanvasTk filter_destroy callback
-plt.close(fig)
-"""
-    try:
-        proc = subprocess.run(
-            [sys.executable, "-c", script],
-            env={**os.environ,
-                 "MPLBACKEND": "TkAgg",
-                 "SOURCE_DATE_EPOCH": "0"},
-            timeout=_test_timeout,
-            capture_output=True,
-            universal_newlines=True,
-        )
-    except subprocess.TimeoutExpired:
-        pytest.fail("Subprocess timed out")
-    else:
-        # test framework doesn't see tkinter callback exceptions normally
-        # see tkinter.Misc.report_callback_exception
-        assert "Exception in Tkinter callback" not in proc.stderr
-        # make sure we can see other issues
-        print(proc.stderr, file=sys.stderr)
-        # Checking return code late so the Tkinter assertion happens first
-        if proc.returncode:
-            pytest.fail("Subprocess failed to test intended behavior")
+    import tkinter
+    del tkinter.Misc.update
+    del tkinter.Misc.update_idletasks
 
+    import matplotlib.pyplot as plt
+    fig = plt.figure()
+    plt.show(block=False)
 
-@pytest.mark.backend('TkAgg', skip_on_importerror=True)
+    plt.draw()  # Test FigureCanvasTkAgg.
+    fig.canvas.toolbar.configure_subplots()  # Test NavigationToolbar2Tk.
+    # Test FigureCanvasTk filter_destroy callback
+    fig.canvas.get_tk_widget().after(100, plt.close, fig)
+
+    # Check for update() or update_idletasks() in the event queue, functionally
+    # equivalent to tkinter.Misc.update.
+    plt.show(block=True)
+
+    # Note that exceptions would be printed to stderr; _isolated_tk_test
+    # checks them.
+
+
+@_isolated_tk_test(success_count=2)
 def test_missing_back_button():
-    script = """
-import matplotlib.pyplot as plt
-from matplotlib.backends.backend_tkagg import NavigationToolbar2Tk
-class Toolbar(NavigationToolbar2Tk):
-    # only display the buttons we need
-    toolitems = [t for t in NavigationToolbar2Tk.toolitems if
-                 t[0] in ('Home', 'Pan', 'Zoom')]
-
-fig = plt.figure()
-print("setup complete")
-# this should not raise
-Toolbar(fig.canvas, fig.canvas.manager.window)
-print("success")
-"""
-    try:
-        proc = subprocess.run(
-            [sys.executable, "-c", script],
-            env={**os.environ,
-                 "MPLBACKEND": "TkAgg",
-                 "SOURCE_DATE_EPOCH": "0"},
-            timeout=_test_timeout,
-            stdout=subprocess.PIPE,
-            universal_newlines=True,
-        )
-    except subprocess.TimeoutExpired:
-        pytest.fail("Subprocess timed out")
-    else:
-        assert proc.stdout.count("setup complete") == 1
-        assert proc.stdout.count("success") == 1
-        # Checking return code late so the stdout assertions happen first
-        if proc.returncode:
-            pytest.fail("Subprocess failed to test intended behavior")
+    import matplotlib.pyplot as plt
+    from matplotlib.backends.backend_tkagg import NavigationToolbar2Tk
+
+    class Toolbar(NavigationToolbar2Tk):
+        # Only display the buttons we need.
+        toolitems = [t for t in NavigationToolbar2Tk.toolitems if
+                     t[0] in ('Home', 'Pan', 'Zoom')]
+
+    fig = plt.figure()
+    print("success")
+    Toolbar(fig.canvas, fig.canvas.manager.window)  # This should not raise.
+    print("success")
+
+
+@pytest.mark.backend('TkAgg', skip_on_importerror=True)
+@_isolated_tk_test(success_count=1)
+def test_canvas_focus():
+    import tkinter as tk
+    import matplotlib.pyplot as plt
+    success = []
+
+    def check_focus():
+        tkcanvas = fig.canvas.get_tk_widget()
+        # Give the plot window time to appear
+        if not tkcanvas.winfo_viewable():
+            tkcanvas.wait_visibility()
+        # Make sure the canvas has the focus, so that it's able to receive
+        # keyboard events.
+        if tkcanvas.focus_lastfor() == tkcanvas:
+            success.append(True)
+        plt.close()
+        root.destroy()
+
+    root = tk.Tk()
+    fig = plt.figure()
+    plt.plot([1, 2, 3])
+    root.after(0, plt.show)
+    root.after(100, check_focus)
+    root.mainloop()
+
+    if success:
+        print("success")
+
+
+@_isolated_tk_test(success_count=2)
+def test_embedding():
+    import tkinter as tk
+    from matplotlib.backends.backend_tkagg import (
+        FigureCanvasTkAgg, NavigationToolbar2Tk)
+    from matplotlib.backend_bases import key_press_handler
+    from matplotlib.figure import Figure
+
+    root = tk.Tk()
+
+    def test_figure(master):
+        fig = Figure()
+        ax = fig.add_subplot()
+        ax.plot([1, 2, 3])
+
+        canvas = FigureCanvasTkAgg(fig, master=master)
+        canvas.draw()
+        canvas.mpl_connect("key_press_event", key_press_handler)
+        canvas.get_tk_widget().pack(expand=True, fill="both")
+
+        toolbar = NavigationToolbar2Tk(canvas, master, pack_toolbar=False)
+        toolbar.pack(expand=True, fill="x")
+
+        canvas.get_tk_widget().forget()
+        toolbar.forget()
+
+    test_figure(root)
+    print("success")
+
+    # Test with a dark button color. Doesn't actually check whether the icon
+    # color becomes lighter, just that the code doesn't break.
+
+    root.tk_setPalette(background="sky blue", selectColor="midnight blue",
+                       foreground="white")
+    test_figure(root)
+    print("success")
diff --git a/lib/matplotlib/tests/test_backend_webagg.py b/lib/matplotlib/tests/test_backend_webagg.py
index 5c6ddfa258c0..992827863b01 100644
--- a/lib/matplotlib/tests/test_backend_webagg.py
+++ b/lib/matplotlib/tests/test_backend_webagg.py
@@ -2,6 +2,7 @@
 import os
 import sys
 import pytest
+import matplotlib.backends.backend_webagg_core
 
 
 @pytest.mark.parametrize("backend", ["webagg", "nbagg"])
@@ -25,3 +26,8 @@ def test_webagg_fallback(backend):
     ret = subprocess.call([sys.executable, "-c", test_code], env=env)
 
     assert ret == 0
+
+
+def test_webagg_core_no_toolbar():
+    fm = matplotlib.backends.backend_webagg_core.FigureManagerWebAgg
+    assert fm._toolbar2_class is None
diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py
index dc72b68468b8..e5e6b295e798 100644
--- a/lib/matplotlib/tests/test_backends_interactive.py
+++ b/lib/matplotlib/tests/test_backends_interactive.py
@@ -3,6 +3,7 @@
 import inspect
 import json
 import os
+import platform
 import signal
 import subprocess
 import sys
@@ -13,6 +14,7 @@
 
 import matplotlib as mpl
 from matplotlib import _c_internal_utils
+from matplotlib.testing import subprocess_run_helper as _run_helper
 
 
 # Minimal smoke-testing of the backends for which the dependencies are
@@ -20,24 +22,20 @@
 # versions so we don't fail on missing backends.
 
 def _get_testable_interactive_backends():
-    try:
-        from matplotlib.backends.qt_compat import QtGui  # noqa
-        have_qt5 = True
-    except ImportError:
-        have_qt5 = False
-
-    backends = []
-    for deps, backend in [
-            (["cairo", "gi"], "gtk3agg"),
-            (["cairo", "gi"], "gtk3cairo"),
-            (["PyQt5"], "qt5agg"),
-            (["PyQt5", "cairocffi"], "qt5cairo"),
-            (["PySide2"], "qt5agg"),
-            (["PySide2", "cairocffi"], "qt5cairo"),
-            (["tkinter"], "tkagg"),
-            (["wx"], "wx"),
-            (["wx"], "wxagg"),
-            (["matplotlib.backends._macosx"], "macosx"),
+    envs = []
+    for deps, env in [
+            *[([qt_api],
+               {"MPLBACKEND": "qtagg", "QT_API": qt_api})
+              for qt_api in ["PyQt6", "PySide6", "PyQt5", "PySide2"]],
+            *[([qt_api, "cairocffi"],
+               {"MPLBACKEND": "qtcairo", "QT_API": qt_api})
+              for qt_api in ["PyQt6", "PySide6", "PyQt5", "PySide2"]],
+            *[(["cairo", "gi"], {"MPLBACKEND": f"gtk{version}{renderer}"})
+              for version in [3, 4] for renderer in ["agg", "cairo"]],
+            (["tkinter"], {"MPLBACKEND": "tkagg"}),
+            (["wx"], {"MPLBACKEND": "wx"}),
+            (["wx"], {"MPLBACKEND": "wxagg"}),
+            (["matplotlib.backends._macosx"], {"MPLBACKEND": "macosx"}),
     ]:
         reason = None
         missing = [dep for dep in deps if not importlib.util.find_spec(dep)]
@@ -46,32 +44,38 @@ def _get_testable_interactive_backends():
             reason = "$DISPLAY and $WAYLAND_DISPLAY are unset"
         elif missing:
             reason = "{} cannot be imported".format(", ".join(missing))
-        elif backend == 'macosx' and os.environ.get('TF_BUILD'):
+        elif env["MPLBACKEND"] == 'macosx' and os.environ.get('TF_BUILD'):
             reason = "macosx backend fails on Azure"
-        elif 'qt5' in backend and not have_qt5:
-            reason = "no usable Qt5 bindings"
+        elif env["MPLBACKEND"].startswith('gtk'):
+            import gi
+            version = env["MPLBACKEND"][3]
+            repo = gi.Repository.get_default()
+            if f'{version}.0' not in repo.enumerate_versions('Gtk'):
+                reason = "no usable GTK bindings"
         marks = []
         if reason:
             marks.append(pytest.mark.skip(
-                reason=f"Skipping {backend} because {reason}"))
-        elif backend.startswith('wx') and sys.platform == 'darwin':
+                reason=f"Skipping {env} because {reason}"))
+        elif env["MPLBACKEND"].startswith('wx') and sys.platform == 'darwin':
             # ignore on OSX because that's currently broken (github #16849)
             marks.append(pytest.mark.xfail(reason='github #16849'))
-        backend = pytest.param(backend, marks=marks)
-        backends.append(backend)
-    return backends
+        envs.append(
+            pytest.param(
+                {**env, 'BACKEND_DEPS': ','.join(deps)},
+                marks=marks, id=str(env)
+            )
+        )
+    return envs
 
 
-_test_timeout = 10  # Empirically, 1s is not enough on CI.
+_test_timeout = 60  # A reasonably safe value for slower architectures.
 
 
 # The source of this function gets extracted and run in another process, so it
 # must be fully self-contained.
 # Using a timer not only allows testing of timers (on other backends), but is
-# also necessary on gtk3 and wx, where a direct call to key_press_event("q")
-# from draw_event causes breakage due to the canvas widget being deleted too
-# early.  Also, gtk3 redefines key_press_event with a different signature, so
-# we directly invoke it from the superclass instead.
+# also necessary on gtk3 and wx, where directly processing a KeyEvent() for "q"
+# from draw_event causes breakage as the canvas widget gets deleted too early.
 def _test_interactive_impl():
     import importlib.util
     import io
@@ -80,20 +84,19 @@ def _test_interactive_impl():
     from unittest import TestCase
 
     import matplotlib as mpl
-    from matplotlib import pyplot as plt, rcParams
-    from matplotlib.backend_bases import FigureCanvasBase
-
-    rcParams.update({
+    from matplotlib import pyplot as plt
+    from matplotlib.backend_bases import KeyEvent
+    mpl.rcParams.update({
         "webagg.open_in_browser": False,
         "webagg.port_retries": 1,
     })
-    if len(sys.argv) >= 2:  # Second argument is json-encoded rcParams.
-        rcParams.update(json.loads(sys.argv[1]))
+
+    mpl.rcParams.update(json.loads(sys.argv[1]))
     backend = plt.rcParams["backend"].lower()
     assert_equal = TestCase().assertEqual
     assert_raises = TestCase().assertRaises
 
-    if backend.endswith("agg") and not backend.startswith(("gtk3", "web")):
+    if backend.endswith("agg") and not backend.startswith(("gtk", "web")):
         # Force interactive framework setup.
         plt.figure()
 
@@ -128,9 +131,11 @@ def check_alt_backend(alt_backend):
         "matplotlib.backends.backend_{}".format(backend))
 
     ax.plot([0, 1], [2, 3])
+    if fig.canvas.toolbar:  # i.e toolbar2.
+        fig.canvas.toolbar.draw_rubberband(None, 1., 1, 2., 2)
 
-    timer = fig.canvas.new_timer(1.)  # Test floats casting to int as needed.
-    timer.add_callback(FigureCanvasBase.key_press_event, fig.canvas, "q")
+    timer = fig.canvas.new_timer(1.)  # Test that floats are cast to int.
+    timer.add_callback(KeyEvent("key_press_event", fig.canvas, "q")._process)
     # Trigger quitting upon draw.
     fig.canvas.mpl_connect("draw_event", lambda event: timer.start())
     fig.canvas.mpl_connect("close_event", print)
@@ -154,43 +159,31 @@ def check_alt_backend(alt_backend):
         assert_equal(result.getvalue(), result_after.getvalue())
 
 
-@pytest.mark.parametrize("backend", _get_testable_interactive_backends())
+@pytest.mark.parametrize("env", _get_testable_interactive_backends())
 @pytest.mark.parametrize("toolbar", ["toolbar2", "toolmanager"])
 @pytest.mark.flaky(reruns=3)
-def test_interactive_backend(backend, toolbar):
-    if backend == "macosx":
+def test_interactive_backend(env, toolbar):
+    if env["MPLBACKEND"] == "macosx":
         if toolbar == "toolmanager":
             pytest.skip("toolmanager is not implemented for macosx.")
+    proc = _run_helper(_test_interactive_impl,
+                       json.dumps({"toolbar": toolbar}),
+                       timeout=_test_timeout,
+                       extra_env=env)
 
-    proc = subprocess.run(
-        [sys.executable, "-c",
-         inspect.getsource(_test_interactive_impl)
-         + "\n_test_interactive_impl()",
-         json.dumps({"toolbar": toolbar})],
-        env={**os.environ, "MPLBACKEND": backend, "SOURCE_DATE_EPOCH": "0"},
-        timeout=_test_timeout,
-        stdout=subprocess.PIPE, universal_newlines=True)
-    if proc.returncode:
-        pytest.fail("The subprocess returned with non-zero exit status "
-                    f"{proc.returncode}.")
     assert proc.stdout.count("CloseEvent") == 1
 
 
-# The source of this function gets extracted and run in another process, so it
-# must be fully self-contained.
 def _test_thread_impl():
     from concurrent.futures import ThreadPoolExecutor
-    import json
-    import sys
 
-    from matplotlib import pyplot as plt, rcParams
+    import matplotlib as mpl
+    from matplotlib import pyplot as plt
 
-    rcParams.update({
+    mpl.rcParams.update({
         "webagg.open_in_browser": False,
         "webagg.port_retries": 1,
     })
-    if len(sys.argv) >= 2:  # Second argument is json-encoded rcParams.
-        rcParams.update(json.loads(sys.argv[1]))
 
     # Test artist creation and drawing does not crash from thread
     # No other guarantees!
@@ -205,14 +198,16 @@ def _test_thread_impl():
     future = ThreadPoolExecutor().submit(fig.canvas.draw)
     plt.pause(0.5)  # flush_events fails here on at least Tkagg (bpo-41176)
     future.result()  # Joins the thread; rethrows any exception.
-    plt.close()
-    fig.canvas.flush_events()  # pause doesn't process events after close
+    plt.close()  # backend is responsible for flushing any events here
+    if plt.rcParams["backend"].startswith("WX"):
+        # TODO: debug why WX needs this only on py3.8
+        fig.canvas.flush_events()
 
 
 _thread_safe_backends = _get_testable_interactive_backends()
 # Known unsafe backends. Remove the xfails if they start to pass!
 for param in _thread_safe_backends:
-    backend = param.values[0]
+    backend = param.values[0]["MPLBACKEND"]
     if "cairo" in backend:
         # Cairo backends save a cairo_t on the graphics context, and sharing
         # these is not threadsafe.
@@ -222,22 +217,157 @@ def _test_thread_impl():
         param.marks.append(
             pytest.mark.xfail(raises=subprocess.CalledProcessError))
     elif backend == "macosx":
+        from packaging.version import parse
+        mac_ver = platform.mac_ver()[0]
+        # Note, macOS Big Sur is both 11 and 10.16, depending on SDK that
+        # Python was compiled against.
+        if mac_ver and parse(mac_ver) < parse('10.16'):
+            param.marks.append(
+                pytest.mark.xfail(raises=subprocess.TimeoutExpired,
+                                  strict=True))
+    elif param.values[0].get("QT_API") == "PySide2":
+        param.marks.append(
+            pytest.mark.xfail(raises=subprocess.CalledProcessError))
+    elif backend == "tkagg" and platform.python_implementation() != 'CPython':
         param.marks.append(
-            pytest.mark.xfail(raises=subprocess.TimeoutExpired, strict=True))
+            pytest.mark.xfail(
+                reason='PyPy does not support Tkinter threading: '
+                       'https://foss.heptapod.net/pypy/pypy/-/issues/1929',
+                strict=True))
 
 
-@pytest.mark.parametrize("backend", _thread_safe_backends)
+@pytest.mark.parametrize("env", _thread_safe_backends)
 @pytest.mark.flaky(reruns=3)
-def test_interactive_thread_safety(backend):
-    proc = subprocess.run(
-        [sys.executable, "-c",
-         inspect.getsource(_test_thread_impl) + "\n_test_thread_impl()"],
-        env={**os.environ, "MPLBACKEND": backend, "SOURCE_DATE_EPOCH": "0"},
-        timeout=_test_timeout, check=True,
-        stdout=subprocess.PIPE, universal_newlines=True)
+def test_interactive_thread_safety(env):
+    proc = _run_helper(_test_thread_impl, timeout=_test_timeout, extra_env=env)
     assert proc.stdout.count("CloseEvent") == 1
 
 
+def _impl_test_lazy_auto_backend_selection():
+    import matplotlib
+    import matplotlib.pyplot as plt
+    # just importing pyplot should not be enough to trigger resolution
+    bk = dict.__getitem__(matplotlib.rcParams, 'backend')
+    assert not isinstance(bk, str)
+    assert plt._backend_mod is None
+    # but actually plotting should
+    plt.plot(5)
+    assert plt._backend_mod is not None
+    bk = dict.__getitem__(matplotlib.rcParams, 'backend')
+    assert isinstance(bk, str)
+
+
+def test_lazy_auto_backend_selection():
+    _run_helper(_impl_test_lazy_auto_backend_selection,
+                timeout=_test_timeout)
+
+
+def _implqt5agg():
+    import matplotlib.backends.backend_qt5agg  # noqa
+    import sys
+
+    assert 'PyQt6' not in sys.modules
+    assert 'pyside6' not in sys.modules
+    assert 'PyQt5' in sys.modules or 'pyside2' in sys.modules
+
+    import matplotlib.backends.backend_qt5
+    with pytest.warns(DeprecationWarning,
+                      match="QtWidgets.QApplication.instance"):
+        matplotlib.backends.backend_qt5.qApp
+
+
+def _implcairo():
+    import matplotlib.backends.backend_qt5cairo # noqa
+    import sys
+
+    assert 'PyQt6' not in sys.modules
+    assert 'pyside6' not in sys.modules
+    assert 'PyQt5' in sys.modules or 'pyside2' in sys.modules
+
+    import matplotlib.backends.backend_qt5
+    with pytest.warns(DeprecationWarning,
+                      match="QtWidgets.QApplication.instance"):
+        matplotlib.backends.backend_qt5.qApp
+
+
+def _implcore():
+    import matplotlib.backends.backend_qt5
+    import sys
+
+    assert 'PyQt6' not in sys.modules
+    assert 'pyside6' not in sys.modules
+    assert 'PyQt5' in sys.modules or 'pyside2' in sys.modules
+
+    with pytest.warns(DeprecationWarning,
+                      match="QtWidgets.QApplication.instance"):
+        matplotlib.backends.backend_qt5.qApp
+
+
+def test_qt5backends_uses_qt5():
+    qt5_bindings = [
+        dep for dep in ['PyQt5', 'pyside2']
+        if importlib.util.find_spec(dep) is not None
+    ]
+    qt6_bindings = [
+        dep for dep in ['PyQt6', 'pyside6']
+        if importlib.util.find_spec(dep) is not None
+    ]
+    if len(qt5_bindings) == 0 or len(qt6_bindings) == 0:
+        pytest.skip('need both QT6 and QT5 bindings')
+    _run_helper(_implqt5agg, timeout=_test_timeout)
+    if importlib.util.find_spec('pycairo') is not None:
+        _run_helper(_implcairo, timeout=_test_timeout)
+    _run_helper(_implcore, timeout=_test_timeout)
+
+
+def _impl_test_cross_Qt_imports():
+    import sys
+    import importlib
+    import pytest
+
+    _, host_binding, mpl_binding = sys.argv
+    # import the mpl binding.  This will force us to use that binding
+    importlib.import_module(f'{mpl_binding}.QtCore')
+    mpl_binding_qwidgets = importlib.import_module(f'{mpl_binding}.QtWidgets')
+    import matplotlib.backends.backend_qt
+    host_qwidgets = importlib.import_module(f'{host_binding}.QtWidgets')
+
+    host_app = host_qwidgets.QApplication(["mpl testing"])
+    with pytest.warns(UserWarning, match="Mixing Qt major"):
+        matplotlib.backends.backend_qt._create_qApp()
+
+
+def test_cross_Qt_imports():
+    qt5_bindings = [
+        dep for dep in ['PyQt5', 'PySide2']
+        if importlib.util.find_spec(dep) is not None
+    ]
+    qt6_bindings = [
+        dep for dep in ['PyQt6', 'PySide6']
+        if importlib.util.find_spec(dep) is not None
+    ]
+    if len(qt5_bindings) == 0 or len(qt6_bindings) == 0:
+        pytest.skip('need both QT6 and QT5 bindings')
+
+    for qt5 in qt5_bindings:
+        for qt6 in qt6_bindings:
+            for pair in ([qt5, qt6], [qt6, qt5]):
+                try:
+                    _run_helper(_impl_test_cross_Qt_imports,
+                                *pair,
+                                timeout=_test_timeout)
+                except subprocess.CalledProcessError as ex:
+                    # if segfault, carry on.  We do try to warn the user they
+                    # are doing something that we do not expect to work
+                    if ex.returncode == -signal.SIGSEGV:
+                        continue
+                    # We got the abort signal which is likely because the Qt5 /
+                    # Qt6 cross import is unhappy, carry on.
+                    elif ex.returncode == -signal.SIGABRT:
+                        continue
+                    raise
+
+
 @pytest.mark.skipif('TF_BUILD' in os.environ,
                     reason="this test fails an azure for unknown reasons")
 @pytest.mark.skipif(os.name == "nt", reason="Cannot send SIGINT on Windows.")
@@ -246,7 +376,7 @@ def test_webagg():
     proc = subprocess.Popen(
         [sys.executable, "-c",
          inspect.getsource(_test_interactive_impl)
-         + "\n_test_interactive_impl()"],
+         + "\n_test_interactive_impl()", "{}"],
         env={**os.environ, "MPLBACKEND": "webagg", "SOURCE_DATE_EPOCH": "0"})
     url = "http://{}:{}".format(
         mpl.rcParams["webagg.address"], mpl.rcParams["webagg.port"])
@@ -268,36 +398,184 @@ def test_webagg():
     assert proc.wait(timeout=_test_timeout) == 0
 
 
+def _lazy_headless():
+    import os
+    import sys
+
+    backend, deps = sys.argv[1:]
+    deps = deps.split(',')
+
+    # make it look headless
+    os.environ.pop('DISPLAY', None)
+    os.environ.pop('WAYLAND_DISPLAY', None)
+    for dep in deps:
+        assert dep not in sys.modules
+
+    # we should fast-track to Agg
+    import matplotlib.pyplot as plt
+    assert plt.get_backend() == 'agg'
+    for dep in deps:
+        assert dep not in sys.modules
+
+    # make sure we really have dependencies installed
+    for dep in deps:
+        importlib.import_module(dep)
+        assert dep in sys.modules
+
+    # try to switch and make sure we fail with ImportError
+    try:
+        plt.switch_backend(backend)
+    except ImportError:
+        ...
+    else:
+        sys.exit(1)
+
+
 @pytest.mark.skipif(sys.platform != "linux", reason="this a linux-only test")
-@pytest.mark.backend('Qt5Agg', skip_on_importerror=True)
-def test_lazy_linux_headless():
-    test_script = """
-import os
-import sys
+@pytest.mark.parametrize("env", _get_testable_interactive_backends())
+def test_lazy_linux_headless(env):
+    proc = _run_helper(
+        _lazy_headless,
+        env.pop('MPLBACKEND'), env.pop("BACKEND_DEPS"),
+        timeout=_test_timeout,
+        extra_env={**env, 'DISPLAY': '', 'WAYLAND_DISPLAY': ''}
+    )
+
+
+def _qApp_warn_impl():
+    import matplotlib.backends.backend_qt
+    import pytest
+
+    with pytest.warns(
+            DeprecationWarning, match="QtWidgets.QApplication.instance"):
+        matplotlib.backends.backend_qt.qApp
+
+
+@pytest.mark.backend('QtAgg', skip_on_importerror=True)
+def test_qApp_warn():
+    _run_helper(_qApp_warn_impl, timeout=_test_timeout)
+
+
+def _test_number_of_draws_script():
+    import matplotlib.pyplot as plt
+
+    fig, ax = plt.subplots()
+
+    # animated=True tells matplotlib to only draw the artist when we
+    # explicitly request it
+    ln, = ax.plot([0, 1], [1, 2], animated=True)
+
+    # make sure the window is raised, but the script keeps going
+    plt.show(block=False)
+    plt.pause(0.3)
+    # Connect to draw_event to count the occurrences
+    fig.canvas.mpl_connect('draw_event', print)
+
+    # get copy of entire figure (everything inside fig.bbox)
+    # sans animated artist
+    bg = fig.canvas.copy_from_bbox(fig.bbox)
+    # draw the animated artist, this uses a cached renderer
+    ax.draw_artist(ln)
+    # show the result to the screen
+    fig.canvas.blit(fig.bbox)
+
+    for j in range(10):
+        # reset the background back in the canvas state, screen unchanged
+        fig.canvas.restore_region(bg)
+        # Create a **new** artist here, this is poor usage of blitting
+        # but good for testing to make sure that this doesn't create
+        # excessive draws
+        ln, = ax.plot([0, 1], [1, 2])
+        # render the artist, updating the canvas state, but not the screen
+        ax.draw_artist(ln)
+        # copy the image to the GUI state, but screen might not changed yet
+        fig.canvas.blit(fig.bbox)
+        # flush any pending GUI events, re-painting the screen if needed
+        fig.canvas.flush_events()
+
+    # Let the event loop process everything before leaving
+    plt.pause(0.1)
+
+
+_blit_backends = _get_testable_interactive_backends()
+for param in _blit_backends:
+    backend = param.values[0]["MPLBACKEND"]
+    if backend == "gtk3cairo":
+        # copy_from_bbox only works when rendering to an ImageSurface
+        param.marks.append(
+            pytest.mark.skip("gtk3cairo does not support blitting"))
+    elif backend == "gtk4cairo":
+        # copy_from_bbox only works when rendering to an ImageSurface
+        param.marks.append(
+            pytest.mark.skip("gtk4cairo does not support blitting"))
+    elif backend == "wx":
+        param.marks.append(
+            pytest.mark.skip("wx does not support blitting"))
+
+
+@pytest.mark.parametrize("env", _blit_backends)
+# subprocesses can struggle to get the display, so rerun a few times
+@pytest.mark.flaky(reruns=4)
+def test_blitting_events(env):
+    proc = _run_helper(
+        _test_number_of_draws_script, timeout=_test_timeout, extra_env=env)
+    # Count the number of draw_events we got. We could count some initial
+    # canvas draws (which vary in number by backend), but the critical
+    # check here is that it isn't 10 draws, which would be called if
+    # blitting is not properly implemented
+    ndraws = proc.stdout.count("DrawEvent")
+    assert 0 < ndraws < 5
+
+
+# The source of this function gets extracted and run in another process, so it
+# must be fully self-contained.
+def _test_figure_leak():
+    import gc
+    import sys
 
-# make it look headless
-os.environ.pop('DISPLAY', None)
-os.environ.pop('WAYLAND_DISPLAY', None)
-
-# we should fast-track to Agg
-import matplotlib.pyplot as plt
-plt.get_backend() == 'agg'
-assert 'PyQt5' not in sys.modules
-
-# make sure we really have pyqt installed
-import PyQt5
-assert 'PyQt5' in sys.modules
-
-# try to switch and make sure we fail with ImportError
-try:
-    plt.switch_backend('qt5agg')
-except ImportError:
-    ...
-else:
-    sys.exit(1)
-
-"""
-    proc = subprocess.run([sys.executable, "-c", test_script])
-    if proc.returncode:
-        pytest.fail("The subprocess returned with non-zero exit status "
-                    f"{proc.returncode}.")
+    import psutil
+    from matplotlib import pyplot as plt
+    # Second argument is pause length, but if zero we should skip pausing
+    t = float(sys.argv[1])
+    p = psutil.Process()
+
+    # Warmup cycle, this reasonably allocates a lot
+    for _ in range(2):
+        fig = plt.figure()
+        if t:
+            plt.pause(t)
+        plt.close(fig)
+    mem = p.memory_info().rss
+    gc.collect()
+
+    for _ in range(5):
+        fig = plt.figure()
+        if t:
+            plt.pause(t)
+        plt.close(fig)
+        gc.collect()
+    growth = p.memory_info().rss - mem
+
+    print(growth)
+
+
+# TODO: "0.1" memory threshold could be reduced 10x by fixing tkagg
+@pytest.mark.parametrize("env", _get_testable_interactive_backends())
+@pytest.mark.parametrize("time_mem", [(0.0, 2_000_000), (0.1, 30_000_000)])
+def test_figure_leak_20490(env, time_mem):
+    pytest.importorskip("psutil", reason="psutil needed to run this test")
+
+    # We haven't yet directly identified the leaks so test with a memory growth
+    # threshold.
+    pause_time, acceptable_memory_leakage = time_mem
+    if env["MPLBACKEND"] == "macosx" or (
+            env["MPLBACKEND"] == "tkagg" and sys.platform == 'darwin'
+    ):
+        acceptable_memory_leakage += 11_000_000
+
+    result = _run_helper(
+        _test_figure_leak, str(pause_time),
+        timeout=_test_timeout, extra_env=env)
+
+    growth = int(result.stdout)
+    assert growth <= acceptable_memory_leakage
diff --git a/lib/matplotlib/tests/test_bbox_tight.py b/lib/matplotlib/tests/test_bbox_tight.py
index f50b272209ea..91ff7fe20963 100644
--- a/lib/matplotlib/tests/test_bbox_tight.py
+++ b/lib/matplotlib/tests/test_bbox_tight.py
@@ -24,7 +24,7 @@ def test_bbox_inches_tight():
     rows = len(data)
     ind = np.arange(len(col_labels)) + 0.3  # the x locations for the groups
     cell_text = []
-    width = 0.4     # the width of the bars
+    width = 0.4  # the width of the bars
     yoff = np.zeros(len(col_labels))
     # the bottom values for stacked bar chart
     fig, ax = plt.subplots(1, 1)
@@ -43,7 +43,7 @@ def test_bbox_inches_tight():
 
 
 @image_comparison(['bbox_inches_tight_suptile_legend'],
-                  remove_text=False, savefig_kwarg={'bbox_inches': 'tight'})
+                  savefig_kwarg={'bbox_inches': 'tight'})
 def test_bbox_inches_tight_suptile_legend():
     plt.plot(np.arange(10), label='a straight line')
     plt.legend(bbox_to_anchor=(0.9, 1), loc='upper left')
@@ -61,6 +61,14 @@ def y_formatter(y, pos):
     plt.xlabel('X axis')
 
 
+@image_comparison(['bbox_inches_tight_suptile_non_default.png'],
+                  savefig_kwarg={'bbox_inches': 'tight'},
+                  tol=0.1)  # large tolerance because only testing clipping.
+def test_bbox_inches_tight_suptitle_non_default():
+    fig, ax = plt.subplots()
+    fig.suptitle('Booo', x=0.5, y=1.1)
+
+
 @image_comparison(['bbox_inches_tight_clipping'],
                   remove_text=True, savefig_kwarg={'bbox_inches': 'tight'})
 def test_bbox_inches_tight_clipping():
@@ -138,3 +146,13 @@ def test_noop_tight_bbox():
     assert (im[:, :, 3] == 255).all()
     assert not (im[:, :, :3] == 255).all()
     assert im.shape == (7, 10, 4)
+
+
+@image_comparison(['bbox_inches_fixed_aspect'], extensions=['png'],
+                  remove_text=True, savefig_kwarg={'bbox_inches': 'tight'})
+def test_bbox_inches_fixed_aspect():
+    with plt.rc_context({'figure.constrained_layout.use': True}):
+        fig, ax = plt.subplots()
+        ax.plot([0, 1])
+        ax.set_xlim(0, 1)
+        ax.set_aspect('equal')
diff --git a/lib/matplotlib/tests/test_category.py b/lib/matplotlib/tests/test_category.py
index c805643bd17e..6eb590d6e82d 100644
--- a/lib/matplotlib/tests/test_category.py
+++ b/lib/matplotlib/tests/test_category.py
@@ -2,6 +2,8 @@
 import pytest
 import numpy as np
 
+import matplotlib as mpl
+from matplotlib._api import MatplotlibDeprecationWarning
 from matplotlib.axes import Axes
 import matplotlib.pyplot as plt
 import matplotlib.category as cat
@@ -100,12 +102,14 @@ def test_convert_one_string(self, value):
         assert self.cc.convert(value, self.unit, self.ax) == 0
 
     def test_convert_one_number(self):
-        actual = self.cc.convert(0.0, self.unit, self.ax)
+        with pytest.warns(MatplotlibDeprecationWarning):
+            actual = self.cc.convert(0.0, self.unit, self.ax)
         np.testing.assert_allclose(actual, np.array([0.]))
 
     def test_convert_float_array(self):
         data = np.array([1, 2, 3], dtype=float)
-        actual = self.cc.convert(data, self.unit, self.ax)
+        with pytest.warns(MatplotlibDeprecationWarning):
+            actual = self.cc.convert(data, self.unit, self.ax)
         np.testing.assert_allclose(actual, np.array([1., 2., 3.]))
 
     @pytest.mark.parametrize("fvals", fvalues, ids=fids)
@@ -122,11 +126,6 @@ def test_default_units(self):
         assert isinstance(self.cc.default_units(["a"], self.ax), cat.UnitData)
 
 
-@pytest.fixture
-def ax():
-    return plt.figure().subplots()
-
-
 PLOT_LIST = [Axes.scatter, Axes.plot, Axes.bar]
 PLOT_IDS = ["scatter", "plot", "bar"]
 
@@ -139,8 +138,9 @@ def test_StrCategoryLocator(self):
         np.testing.assert_array_equal(ticks.tick_values(None, None), locs)
 
     @pytest.mark.parametrize("plotter", PLOT_LIST, ids=PLOT_IDS)
-    def test_StrCategoryLocatorPlot(self, ax, plotter):
-        ax.plot(["a", "b", "c"])
+    def test_StrCategoryLocatorPlot(self, plotter):
+        ax = plt.figure().subplots()
+        plotter(ax, [1, 2, 3], ["a", "b", "c"])
         np.testing.assert_array_equal(ax.yaxis.major.locator(), range(3))
 
 
@@ -151,7 +151,7 @@ class TestStrCategoryFormatter:
     ids, cases = zip(*test_cases)
 
     @pytest.mark.parametrize("ydata", cases, ids=ids)
-    def test_StrCategoryFormatter(self, ax, ydata):
+    def test_StrCategoryFormatter(self, ydata):
         unit = cat.UnitData(ydata)
         labels = cat.StrCategoryFormatter(unit._mapping)
         for i, d in enumerate(ydata):
@@ -160,7 +160,8 @@ def test_StrCategoryFormatter(self, ax, ydata):
 
     @pytest.mark.parametrize("ydata", cases, ids=ids)
     @pytest.mark.parametrize("plotter", PLOT_LIST, ids=PLOT_IDS)
-    def test_StrCategoryFormatterPlot(self, ax, ydata, plotter):
+    def test_StrCategoryFormatterPlot(self, ydata, plotter):
+        ax = plt.figure().subplots()
         plotter(ax, range(len(ydata)), ydata)
         for i, d in enumerate(ydata):
             assert ax.yaxis.major.formatter(i) == d
@@ -186,7 +187,8 @@ class TestPlotBytes:
 
     @pytest.mark.parametrize("plotter", PLOT_LIST, ids=PLOT_IDS)
     @pytest.mark.parametrize("bdata", bytes_data, ids=bytes_ids)
-    def test_plot_bytes(self, ax, plotter, bdata):
+    def test_plot_bytes(self, plotter, bdata):
+        ax = plt.figure().subplots()
         counts = np.array([4, 6, 5])
         plotter(ax, bdata, counts)
         axis_test(ax.xaxis, bdata)
@@ -201,7 +203,8 @@ class TestPlotNumlike:
 
     @pytest.mark.parametrize("plotter", PLOT_LIST, ids=PLOT_IDS)
     @pytest.mark.parametrize("ndata", numlike_data, ids=numlike_ids)
-    def test_plot_numlike(self, ax, plotter, ndata):
+    def test_plot_numlike(self, plotter, ndata):
+        ax = plt.figure().subplots()
         counts = np.array([4, 6, 5])
         plotter(ax, ndata, counts)
         axis_test(ax.xaxis, ndata)
@@ -209,7 +212,8 @@ def test_plot_numlike(self, ax, plotter, ndata):
 
 class TestPlotTypes:
     @pytest.mark.parametrize("plotter", PLOT_LIST, ids=PLOT_IDS)
-    def test_plot_unicode(self, ax, plotter):
+    def test_plot_unicode(self, plotter):
+        ax = plt.figure().subplots()
         words = ['Здрав�твуйте', 'привет']
         plotter(ax, words, [0, 1])
         axis_test(ax.xaxis, words)
@@ -223,25 +227,29 @@ def test_data(self):
 
     @pytest.mark.usefixtures("test_data")
     @pytest.mark.parametrize("plotter", PLOT_LIST, ids=PLOT_IDS)
-    def test_plot_xaxis(self, ax, test_data, plotter):
+    def test_plot_xaxis(self, test_data, plotter):
+        ax = plt.figure().subplots()
         plotter(ax, self.x, self.xy)
         axis_test(ax.xaxis, self.x)
 
     @pytest.mark.usefixtures("test_data")
     @pytest.mark.parametrize("plotter", PLOT_LIST, ids=PLOT_IDS)
-    def test_plot_yaxis(self, ax, test_data, plotter):
+    def test_plot_yaxis(self, test_data, plotter):
+        ax = plt.figure().subplots()
         plotter(ax, self.yx, self.y)
         axis_test(ax.yaxis, self.y)
 
     @pytest.mark.usefixtures("test_data")
     @pytest.mark.parametrize("plotter", PLOT_LIST, ids=PLOT_IDS)
-    def test_plot_xyaxis(self, ax, test_data, plotter):
+    def test_plot_xyaxis(self, test_data, plotter):
+        ax = plt.figure().subplots()
         plotter(ax, self.x, self.y)
         axis_test(ax.xaxis, self.x)
         axis_test(ax.yaxis, self.y)
 
     @pytest.mark.parametrize("plotter", PLOT_LIST, ids=PLOT_IDS)
-    def test_update_plot(self, ax, plotter):
+    def test_update_plot(self, plotter):
+        ax = plt.figure().subplots()
         plotter(ax, ['a', 'b'], ['e', 'g'])
         plotter(ax, ['a', 'b', 'd'], ['f', 'a', 'b'])
         plotter(ax, ['b', 'c', 'd'], ['g', 'e', 'd'])
@@ -260,19 +268,21 @@ def test_update_plot(self, ax, plotter):
 
     @pytest.mark.parametrize("plotter", plotters)
     @pytest.mark.parametrize("xdata", fvalues, ids=fids)
-    def test_mixed_type_exception(self, ax, plotter, xdata):
+    def test_mixed_type_exception(self, plotter, xdata):
+        ax = plt.figure().subplots()
         with pytest.raises(TypeError):
             plotter(ax, xdata, [1, 2])
 
     @pytest.mark.parametrize("plotter", plotters)
     @pytest.mark.parametrize("xdata", fvalues, ids=fids)
-    def test_mixed_type_update_exception(self, ax, plotter, xdata):
+    def test_mixed_type_update_exception(self, plotter, xdata):
+        ax = plt.figure().subplots()
         with pytest.raises(TypeError):
             plotter(ax, [0, 3], [1, 3])
             plotter(ax, xdata, [1, 2])
 
 
-@pytest.mark.style('default')
+@mpl.style.context('default')
 @check_figures_equal(extensions=["png"])
 def test_overriding_units_in_plot(fig_test, fig_ref):
     from datetime import datetime
@@ -297,6 +307,15 @@ def test_overriding_units_in_plot(fig_test, fig_ref):
         assert y_units is ax.yaxis.units
 
 
+def test_no_deprecation_on_empty_data():
+    """
+    Smoke test to check that no deprecation warning is emitted. See #22640.
+    """
+    f, ax = plt.subplots()
+    ax.xaxis.update_units(["a", "b"])
+    ax.plot([], [])
+
+
 def test_hist():
     fig, ax = plt.subplots()
     n, bins, patches = ax.hist(['a', 'b', 'a', 'c', 'ff'])
diff --git a/lib/matplotlib/tests/test_cbook.py b/lib/matplotlib/tests/test_cbook.py
index f5651f3da3c6..b18f4fdf113a 100644
--- a/lib/matplotlib/tests/test_cbook.py
+++ b/lib/matplotlib/tests/test_cbook.py
@@ -4,15 +4,14 @@
 from weakref import ref
 from unittest.mock import patch, Mock
 
-from datetime import datetime
+from datetime import datetime, date, timedelta
 
 import numpy as np
 from numpy.testing import (assert_array_equal, assert_approx_equal,
                            assert_array_almost_equal)
 import pytest
 
-from matplotlib import _api
-import matplotlib.cbook as cbook
+from matplotlib import _api, cbook
 import matplotlib.colors as mcolors
 from matplotlib.cbook import delete_masked_points
 
@@ -52,7 +51,7 @@ def test_rgba(self):
 
 
 class Test_boxplot_stats:
-    def setup(self):
+    def setup_method(self):
         np.random.seed(937)
         self.nrows = 37
         self.ncols = 4
@@ -143,7 +142,7 @@ def test_results_whiskers_percentiles(self):
             assert_array_almost_equal(res[key], value)
 
     def test_results_withlabels(self):
-        labels = ['Test1', 2, 'ardvark', 4]
+        labels = ['Test1', 2, 'Aardvark', 4]
         results = cbook.boxplot_stats(self.data, labels=labels)
         for lab, res in zip(labels, results):
             assert res['label'] == lab
@@ -178,15 +177,15 @@ def test_boxplot_stats_autorange_false(self):
 
 
 class Test_callback_registry:
-    def setup(self):
+    def setup_method(self):
         self.signal = 'test'
         self.callbacks = cbook.CallbackRegistry()
 
     def connect(self, s, func, pickle):
-        cid = self.callbacks.connect(s, func)
         if pickle:
-            self.callbacks._pickled_cids.add(cid)
-        return cid
+            return self.callbacks.connect(s, func)
+        else:
+            return self.callbacks._connect_picklable(s, func)
 
     def disconnect(self, cid):
         return self.callbacks.disconnect(cid)
@@ -198,11 +197,13 @@ def count(self):
         return count1
 
     def is_empty(self):
+        np.testing.break_cycles()
         assert self.callbacks._func_cid_map == {}
         assert self.callbacks.callbacks == {}
         assert self.callbacks._pickled_cids == set()
 
     def is_not_empty(self):
+        np.testing.break_cycles()
         assert self.callbacks._func_cid_map != {}
         assert self.callbacks.callbacks != {}
 
@@ -361,6 +362,73 @@ def test_callbackregistry_custom_exception_handler(monkeypatch, cb, excp):
         cb.process('foo')
 
 
+def test_callbackregistry_signals():
+    cr = cbook.CallbackRegistry(signals=["foo"])
+    results = []
+    def cb(x): results.append(x)
+    cr.connect("foo", cb)
+    with pytest.raises(ValueError):
+        cr.connect("bar", cb)
+    cr.process("foo", 1)
+    with pytest.raises(ValueError):
+        cr.process("bar", 1)
+    assert results == [1]
+
+
+def test_callbackregistry_blocking():
+    # Needs an exception handler for interactive testing environments
+    # that would only print this out instead of raising the exception
+    def raise_handler(excp):
+        raise excp
+    cb = cbook.CallbackRegistry(exception_handler=raise_handler)
+    def test_func1():
+        raise ValueError("1 should be blocked")
+    def test_func2():
+        raise ValueError("2 should be blocked")
+    cb.connect("test1", test_func1)
+    cb.connect("test2", test_func2)
+
+    # block all of the callbacks to make sure they aren't processed
+    with cb.blocked():
+        cb.process("test1")
+        cb.process("test2")
+
+    # block individual callbacks to make sure the other is still processed
+    with cb.blocked(signal="test1"):
+        # Blocked
+        cb.process("test1")
+        # Should raise
+        with pytest.raises(ValueError, match="2 should be blocked"):
+            cb.process("test2")
+
+    # Make sure the original callback functions are there after blocking
+    with pytest.raises(ValueError, match="1 should be blocked"):
+        cb.process("test1")
+    with pytest.raises(ValueError, match="2 should be blocked"):
+        cb.process("test2")
+
+
+@pytest.mark.parametrize('line, result', [
+    ('a : no_comment', 'a : no_comment'),
+    ('a : "quoted str"', 'a : "quoted str"'),
+    ('a : "quoted str" # comment', 'a : "quoted str"'),
+    ('a : "#000000"', 'a : "#000000"'),
+    ('a : "#000000" # comment', 'a : "#000000"'),
+    ('a : ["#000000", "#FFFFFF"]', 'a : ["#000000", "#FFFFFF"]'),
+    ('a : ["#000000", "#FFFFFF"] # comment', 'a : ["#000000", "#FFFFFF"]'),
+    ('a : val  # a comment "with quotes"', 'a : val'),
+    ('# only comment "with quotes" xx', ''),
+])
+def test_strip_comment(line, result):
+    """Strip everything from the first unquoted #."""
+    assert cbook._strip_comment(line) == result
+
+
+def test_strip_comment_invalid():
+    with pytest.raises(ValueError, match="Missing closing quote"):
+        cbook._strip_comment('grid.color: "aa')
+
+
 def test_sanitize_sequence():
     d = {'a': 1, 'b': 2, 'c': 3}
     k = ['a', 'b', 'c']
@@ -374,32 +442,14 @@ def test_sanitize_sequence():
 
 
 fail_mapping = (
-    ({'a': 1}, {'forbidden': ('a')}),
-    ({'a': 1}, {'required': ('b')}),
-    ({'a': 1, 'b': 2}, {'required': ('a'), 'allowed': ()}),
     ({'a': 1, 'b': 2}, {'alias_mapping': {'a': ['b']}}),
-    ({'a': 1, 'b': 2}, {'alias_mapping': {'a': ['b']}, 'allowed': ('a',)}),
     ({'a': 1, 'b': 2}, {'alias_mapping': {'a': ['a', 'b']}}),
-    ({'a': 1, 'b': 2, 'c': 3},
-     {'alias_mapping': {'a': ['b']}, 'required': ('a', )}),
 )
 
 pass_mapping = (
     (None, {}, {}),
     ({'a': 1, 'b': 2}, {'a': 1, 'b': 2}, {}),
     ({'b': 2}, {'a': 2}, {'alias_mapping': {'a': ['a', 'b']}}),
-    ({'b': 2}, {'a': 2},
-     {'alias_mapping': {'a': ['b']}, 'forbidden': ('b', )}),
-    ({'a': 1, 'c': 3}, {'a': 1, 'c': 3},
-     {'required': ('a', ), 'allowed': ('c', )}),
-    ({'a': 1, 'c': 3}, {'a': 1, 'c': 3},
-     {'required': ('a', 'c'), 'allowed': ('c', )}),
-    ({'a': 1, 'c': 3}, {'a': 1, 'c': 3},
-     {'required': ('a', 'c'), 'allowed': ('a', 'c')}),
-    ({'a': 1, 'c': 3}, {'a': 1, 'c': 3},
-     {'required': ('a', 'c'), 'allowed': ()}),
-    ({'a': 1, 'c': 3}, {'a': 1, 'c': 3}, {'required': ('a', 'c')}),
-    ({'a': 1, 'c': 3}, {'a': 1, 'c': 3}, {'allowed': ('a', 'c')}),
 )
 
 
@@ -552,7 +602,7 @@ def test_flatiter():
     it = x.flat
     assert 0 == next(it)
     assert 1 == next(it)
-    ret = cbook.safe_first_element(it)
+    ret = cbook._safe_first_finite(it)
     assert ret == 0
 
     assert 0 == next(it)
@@ -593,6 +643,13 @@ class Dummy:
     assert isinstance(xnew[1], np.ndarray) and xnew[1].shape == (1,)
     assert isinstance(xnew[2], np.ndarray) and xnew[2].shape == (1,)
 
+    # Test a list of zero-dimensional arrays
+    x = [np.array(0), np.array(1), np.array(2)]
+    xnew = cbook._reshape_2D(x, 'x')
+    assert isinstance(xnew, list)
+    assert len(xnew) == 1
+    assert isinstance(xnew[0], np.ndarray) and xnew[0].shape == (3,)
+
     # Now test with a list of lists with different lengths, which means the
     # array will internally be converted to a 1D object array of lists
     x = [[1, 2, 3], [3, 4], [2]]
@@ -644,14 +701,37 @@ def test_reshape2d_pandas(pd):
     for x, xnew in zip(X.T, Xnew):
         np.testing.assert_array_equal(x, xnew)
 
+
+def test_reshape2d_xarray(xr):
+    # separate to allow the rest of the tests to run if no xarray...
     X = np.arange(30).reshape(10, 3)
-    x = pd.DataFrame(X, columns=["a", "b", "c"])
+    x = xr.DataArray(X, dims=["x", "y"])
     Xnew = cbook._reshape_2D(x, 'x')
     # Need to check each row because _reshape_2D returns a list of arrays:
     for x, xnew in zip(X.T, Xnew):
         np.testing.assert_array_equal(x, xnew)
 
 
+def test_index_of_pandas(pd):
+    # separate to allow the rest of the tests to run if no pandas...
+    X = np.arange(30).reshape(10, 3)
+    x = pd.DataFrame(X, columns=["a", "b", "c"])
+    Idx, Xnew = cbook.index_of(x)
+    np.testing.assert_array_equal(X, Xnew)
+    IdxRef = np.arange(10)
+    np.testing.assert_array_equal(Idx, IdxRef)
+
+
+def test_index_of_xarray(xr):
+    # separate to allow the rest of the tests to run if no xarray...
+    X = np.arange(30).reshape(10, 3)
+    x = xr.DataArray(X, dims=["x", "y"])
+    Idx, Xnew = cbook.index_of(x)
+    np.testing.assert_array_equal(X, Xnew)
+    IdxRef = np.arange(10)
+    np.testing.assert_array_equal(Idx, IdxRef)
+
+
 def test_contiguous_regions():
     a, b, c = 3, 4, 5
     # Starts and ends with True
@@ -678,7 +758,7 @@ def test_contiguous_regions():
 def test_safe_first_element_pandas_series(pd):
     # deliberately create a pandas series with index not starting from 0
     s = pd.Series(range(5), index=range(10, 15))
-    actual = cbook.safe_first_element(s)
+    actual = cbook._safe_first_finite(s)
     assert actual == 0
 
 
@@ -808,3 +888,10 @@ def test_format_approx():
     assert f(0.0012345600001, 5) == '0.00123'
     assert f(-0.0012345600001, 5) == '-0.00123'
     assert f(0.0012345600001, 8) == f(0.0012345600001, 10) == '0.00123456'
+
+
+def test_safe_first_element_with_none():
+    datetime_lst = [date.today() + timedelta(days=i) for i in range(10)]
+    datetime_lst[0] = None
+    actual = cbook._safe_first_finite(datetime_lst)
+    assert actual is not None and actual == datetime_lst[1]
diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
index d11bab7a022b..3647e561d2d6 100644
--- a/lib/matplotlib/tests/test_collections.py
+++ b/lib/matplotlib/tests/test_collections.py
@@ -9,9 +9,11 @@
 import matplotlib.pyplot as plt
 import matplotlib.collections as mcollections
 import matplotlib.colors as mcolors
+import matplotlib.path as mpath
 import matplotlib.transforms as mtransforms
 from matplotlib.collections import (Collection, LineCollection,
-                                    EventCollection, PolyCollection)
+                                    EventCollection, PolyCollection,
+                                    QuadMesh)
 from matplotlib.testing.decorators import check_figures_equal, image_comparison
 from matplotlib._api.deprecation import MatplotlibDeprecationWarning
 
@@ -291,19 +293,29 @@ def test_null_collection_datalim():
                        mtransforms.Bbox.null().get_points())
 
 
+def test_no_offsets_datalim():
+    # A collection with no offsets and a non transData
+    # transform should return a null bbox
+    ax = plt.axes()
+    coll = mcollections.PathCollection([mpath.Path([(0, 0), (1, 0)])])
+    ax.add_collection(coll)
+    coll_data_lim = coll.get_datalim(mtransforms.IdentityTransform())
+    assert_array_equal(coll_data_lim.get_points(),
+                       mtransforms.Bbox.null().get_points())
+
+
 def test_add_collection():
     # Test if data limits are unchanged by adding an empty collection.
     # GitHub issue #1490, pull #1497.
     plt.figure()
     ax = plt.axes()
-    coll = ax.scatter([0, 1], [0, 1])
-    ax.add_collection(coll)
+    ax.scatter([0, 1], [0, 1])
     bounds = ax.dataLim.bounds
-    coll = ax.scatter([], [])
+    ax.scatter([], [])
     assert ax.dataLim.bounds == bounds
 
 
-@pytest.mark.style('mpl20')
+@mpl.style.context('mpl20')
 @check_figures_equal(extensions=['png'])
 def test_collection_log_datalim(fig_test, fig_ref):
     # Data limits should respect the minimum x/y when using log scale.
@@ -373,11 +385,9 @@ def test_EllipseCollection():
     hh = Y / y[-1]
     aa = np.ones_like(ww) * 20  # first axis is 20 degrees CCW from x axis
 
-    ec = mcollections.EllipseCollection(ww, hh, aa,
-                                        units='x',
-                                        offsets=XY,
-                                        transOffset=ax.transData,
-                                        facecolors='none')
+    ec = mcollections.EllipseCollection(
+        ww, hh, aa, units='x', offsets=XY, offset_transform=ax.transData,
+        facecolors='none')
     ax.add_collection(ec)
     ax.autoscale_view()
 
@@ -429,7 +439,7 @@ def test_regularpolycollection_rotate():
     for xy, alpha in zip(xy_points, rotations):
         col = mcollections.RegularPolyCollection(
             4, sizes=(100,), rotation=alpha,
-            offsets=[xy], transOffset=ax.transData)
+            offsets=[xy], offset_transform=ax.transData)
         ax.add_collection(col, autolim=True)
     ax.autoscale_view()
 
@@ -457,8 +467,8 @@ def get_transform(self):
     xy = [(0, 0)]
     # Unit square has a half-diagonal of `1/sqrt(2)`, so `pi * r**2` equals...
     circle_areas = [np.pi / 2]
-    squares = SquareCollection(sizes=circle_areas, offsets=xy,
-                               transOffset=ax.transData)
+    squares = SquareCollection(
+        sizes=circle_areas, offsets=xy, offset_transform=ax.transData)
     ax.add_collection(squares, autolim=True)
     ax.axis([-1, 1, -1, 1])
 
@@ -473,6 +483,81 @@ def test_picking():
     assert_array_equal(indices['ind'], [0])
 
 
+def test_quadmesh_contains():
+    x = np.arange(4)
+    X = x[:, None] * x[None, :]
+
+    fig, ax = plt.subplots()
+    mesh = ax.pcolormesh(X)
+    fig.draw_without_rendering()
+    xdata, ydata = 0.5, 0.5
+    x, y = mesh.get_transform().transform((xdata, ydata))
+    mouse_event = SimpleNamespace(xdata=xdata, ydata=ydata, x=x, y=y)
+    found, indices = mesh.contains(mouse_event)
+    assert found
+    assert_array_equal(indices['ind'], [0])
+
+    xdata, ydata = 1.5, 1.5
+    x, y = mesh.get_transform().transform((xdata, ydata))
+    mouse_event = SimpleNamespace(xdata=xdata, ydata=ydata, x=x, y=y)
+    found, indices = mesh.contains(mouse_event)
+    assert found
+    assert_array_equal(indices['ind'], [5])
+
+
+def test_quadmesh_contains_concave():
+    # Test a concave polygon, V-like shape
+    x = [[0, -1], [1, 0]]
+    y = [[0, 1], [1, -1]]
+    fig, ax = plt.subplots()
+    mesh = ax.pcolormesh(x, y, [[0]])
+    fig.draw_without_rendering()
+    # xdata, ydata, expected
+    points = [(-0.5, 0.25, True),  # left wing
+              (0, 0.25, False),  # between the two wings
+              (0.5, 0.25, True),  # right wing
+              (0, -0.25, True),  # main body
+              ]
+    for point in points:
+        xdata, ydata, expected = point
+        x, y = mesh.get_transform().transform((xdata, ydata))
+        mouse_event = SimpleNamespace(xdata=xdata, ydata=ydata, x=x, y=y)
+        found, indices = mesh.contains(mouse_event)
+        assert found is expected
+
+
+def test_quadmesh_cursor_data():
+    x = np.arange(4)
+    X = x[:, None] * x[None, :]
+
+    fig, ax = plt.subplots()
+    mesh = ax.pcolormesh(X)
+    # Empty array data
+    mesh._A = None
+    fig.draw_without_rendering()
+    xdata, ydata = 0.5, 0.5
+    x, y = mesh.get_transform().transform((xdata, ydata))
+    mouse_event = SimpleNamespace(xdata=xdata, ydata=ydata, x=x, y=y)
+    # Empty collection should return None
+    assert mesh.get_cursor_data(mouse_event) is None
+
+    # Now test adding the array data, to make sure we do get a value
+    mesh.set_array(np.ones((X.shape)))
+    assert_array_equal(mesh.get_cursor_data(mouse_event), [1])
+
+
+def test_quadmesh_cursor_data_multiple_points():
+    x = [1, 2, 1, 2]
+    fig, ax = plt.subplots()
+    mesh = ax.pcolormesh(x, x, np.ones((3, 3)))
+    fig.draw_without_rendering()
+    xdata, ydata = 1.5, 1.5
+    x, y = mesh.get_transform().transform((xdata, ydata))
+    mouse_event = SimpleNamespace(xdata=xdata, ydata=ydata, x=x, y=y)
+    # All quads are covering the same square
+    assert_array_equal(mesh.get_cursor_data(mouse_event), np.ones(9))
+
+
 def test_linestyle_single_dashes():
     plt.scatter([0, 1, 2], [0, 1, 2], linestyle=(0., [2., 2.]))
     plt.draw()
@@ -486,10 +571,8 @@ def test_size_in_xy():
     widths = 10, 10
     coords = [(10, 10), (15, 15)]
     e = mcollections.EllipseCollection(
-        widths, heights, angles,
-        units='xy',
-        offsets=coords,
-        transOffset=ax.transData)
+        widths, heights, angles, units='xy',
+        offsets=coords, offset_transform=ax.transData)
 
     ax.add_collection(e)
 
@@ -514,7 +597,7 @@ def test_pandas_indexing(pd):
     Collection(antialiaseds=aa)
 
 
-@pytest.mark.style('default')
+@mpl.style.context('default')
 def test_lslw_bcast():
     col = mcollections.PathCollection([])
     col.set_linestyles(['-', '-'])
@@ -528,7 +611,7 @@ def test_lslw_bcast():
     assert (col.get_linewidths() == [1, 2, 3]).all()
 
 
-@pytest.mark.style('default')
+@mpl.style.context('default')
 def test_capstyle():
     col = mcollections.PathCollection([], capstyle='round')
     assert col.get_capstyle() == 'round'
@@ -536,7 +619,7 @@ def test_capstyle():
     assert col.get_capstyle() == 'butt'
 
 
-@pytest.mark.style('default')
+@mpl.style.context('default')
 def test_joinstyle():
     col = mcollections.PathCollection([], joinstyle='round')
     assert col.get_joinstyle() == 'round'
@@ -677,6 +760,22 @@ def test_collection_set_verts_array():
         assert np.array_equal(ap._codes, atp._codes)
 
 
+def test_collection_set_array():
+    vals = [*range(10)]
+
+    # Test set_array with list
+    c = Collection()
+    c.set_array(vals)
+
+    # Test set_array with wrong dtype
+    with pytest.raises(TypeError, match="^Image data of dtype"):
+        c.set_array("wrong_input")
+
+    # Test if array kwarg is copied
+    vals[5] = 45
+    assert np.not_equal(vals, c.get_array()).any()
+
+
 def test_blended_collection_autolim():
     a = [1, 2, 4]
     height = .2
@@ -698,6 +797,131 @@ def test_singleton_autolim():
     np.testing.assert_allclose(ax.get_xlim(), [-0.06, 0.06])
 
 
+@pytest.mark.parametrize("transform, expected", [
+    ("transData", (-0.5, 3.5)),
+    ("transAxes", (2.8, 3.2)),
+])
+def test_autolim_with_zeros(transform, expected):
+    # 1) Test that a scatter at (0, 0) data coordinates contributes to
+    # autoscaling even though any(offsets) would be False in that situation.
+    # 2) Test that specifying transAxes for the transform does not contribute
+    # to the autoscaling.
+    fig, ax = plt.subplots()
+    ax.scatter(0, 0, transform=getattr(ax, transform))
+    ax.scatter(3, 3)
+    np.testing.assert_allclose(ax.get_ylim(), expected)
+    np.testing.assert_allclose(ax.get_xlim(), expected)
+
+
+@pytest.mark.parametrize('flat_ref, kwargs', [
+    (True, {}),
+    (False, {}),
+    (True, dict(antialiased=False)),
+    (False, dict(transform='__initialization_delayed__')),
+])
+@check_figures_equal(extensions=['png'])
+def test_quadmesh_deprecated_signature(
+        fig_test, fig_ref, flat_ref, kwargs):
+    # test that the new and old quadmesh signature produce the same results
+    # remove when the old QuadMesh.__init__ signature expires (v3.5+2)
+    x = [0, 1, 2, 3.]
+    y = [1, 2, 3.]
+    X, Y = np.meshgrid(x, y)
+    X += 0.2 * Y
+    coords = np.stack([X, Y], axis=-1)
+    assert coords.shape == (3, 4, 2)
+    C = np.linspace(0, 2, 6).reshape(2, 3)
+
+    ax = fig_test.add_subplot()
+    ax.set(xlim=(0, 5), ylim=(0, 4))
+    if 'transform' in kwargs:
+        kwargs['transform'] = mtransforms.Affine2D().scale(1.2) + ax.transData
+    qmesh = QuadMesh(coords, **kwargs)
+    qmesh.set_array(C)
+    ax.add_collection(qmesh)
+    assert qmesh._shading == 'flat'
+
+    ax = fig_ref.add_subplot()
+    ax.set(xlim=(0, 5), ylim=(0, 4))
+    if 'transform' in kwargs:
+        kwargs['transform'] = mtransforms.Affine2D().scale(1.2) + ax.transData
+    with pytest.warns(MatplotlibDeprecationWarning):
+        qmesh = QuadMesh(4 - 1, 3 - 1,
+                         coords.copy().reshape(-1, 2) if flat_ref else coords,
+                         **kwargs)
+    qmesh.set_array(C.flatten() if flat_ref else C)
+    ax.add_collection(qmesh)
+    assert qmesh._shading == 'flat'
+
+
+@check_figures_equal(extensions=['png'])
+def test_quadmesh_deprecated_positional(fig_test, fig_ref):
+    # test that positional parameters are still accepted with the old signature
+    # and work correctly
+    # remove when the old QuadMesh.__init__ signature expires (v3.5+2)
+    from matplotlib.collections import QuadMesh
+
+    x = [0, 1, 2, 3.]
+    y = [1, 2, 3.]
+    X, Y = np.meshgrid(x, y)
+    X += 0.2 * Y
+    coords = np.stack([X, Y], axis=-1)
+    assert coords.shape == (3, 4, 2)
+    C = np.linspace(0, 2, 12).reshape(3, 4)
+
+    ax = fig_test.add_subplot()
+    ax.set(xlim=(0, 5), ylim=(0, 4))
+    qmesh = QuadMesh(coords, antialiased=False, shading='gouraud')
+    qmesh.set_array(C)
+    ax.add_collection(qmesh)
+
+    ax = fig_ref.add_subplot()
+    ax.set(xlim=(0, 5), ylim=(0, 4))
+    with pytest.warns(MatplotlibDeprecationWarning):
+        qmesh = QuadMesh(4 - 1, 3 - 1, coords.copy().reshape(-1, 2),
+                         False, 'gouraud')
+    qmesh.set_array(C)
+    ax.add_collection(qmesh)
+
+
+def test_quadmesh_set_array_validation():
+    x = np.arange(11)
+    y = np.arange(8)
+    z = np.random.random((7, 10))
+    fig, ax = plt.subplots()
+    coll = ax.pcolormesh(x, y, z)
+
+    # Test deprecated warning when faulty shape is passed.
+    with pytest.warns(MatplotlibDeprecationWarning):
+        coll.set_array(z.reshape(10, 7))
+
+    z = np.arange(54).reshape((6, 9))
+    with pytest.raises(TypeError, match=r"Dimensions of A \(6, 9\) "
+                       r"are incompatible with X \(11\) and/or Y \(8\)"):
+        coll.set_array(z)
+    with pytest.raises(TypeError, match=r"Dimensions of A \(54,\) "
+                       r"are incompatible with X \(11\) and/or Y \(8\)"):
+        coll.set_array(z.ravel())
+
+    x = np.arange(10)
+    y = np.arange(7)
+    z = np.random.random((7, 10))
+    fig, ax = plt.subplots()
+    coll = ax.pcolormesh(x, y, z, shading='gouraud')
+
+
+def test_quadmesh_get_coordinates():
+    x = [0, 1, 2]
+    y = [2, 4, 6]
+    z = np.ones(shape=(2, 2))
+    xx, yy = np.meshgrid(x, y)
+    coll = plt.pcolormesh(xx, yy, z)
+
+    # shape (3, 3, 2)
+    coords = np.stack([xx.T, yy.T]).T
+    assert_array_equal(coll.get_coordinates(), coords)
+
+
 def test_quadmesh_set_array():
     x = np.arange(4)
     y = np.arange(4)
@@ -714,6 +938,35 @@ def test_quadmesh_set_array():
     fig.canvas.draw()
     assert np.array_equal(coll.get_array(), np.ones(9))
 
+    z = np.arange(16).reshape((4, 4))
+    fig, ax = plt.subplots()
+    coll = ax.pcolormesh(x, y, np.ones(z.shape), shading='gouraud')
+    # Test that the collection is able to update with a 2d array
+    coll.set_array(z)
+    fig.canvas.draw()
+    assert np.array_equal(coll.get_array(), z)
+
+    # Check that pre-flattened arrays work too
+    coll.set_array(np.ones(16))
+    fig.canvas.draw()
+    assert np.array_equal(coll.get_array(), np.ones(16))
+
+
+def test_quadmesh_vmin_vmax():
+    # test when vmin/vmax on the norm changes, the quadmesh gets updated
+    fig, ax = plt.subplots()
+    cmap = mpl.colormaps['plasma']
+    norm = mpl.colors.Normalize(vmin=0, vmax=1)
+    coll = ax.pcolormesh([[1]], cmap=cmap, norm=norm)
+    fig.canvas.draw()
+    assert np.array_equal(coll.get_facecolors()[0, :], cmap(norm(1)))
+
+    # Change the vmin/vmax of the norm so that the color is from
+    # the bottom of the colormap now
+    norm.vmin, norm.vmax = 1, 2
+    fig.canvas.draw()
+    assert np.array_equal(coll.get_facecolors()[0, :], cmap(norm(1)))
+
 
 def test_quadmesh_alpha_array():
     x = np.arange(4)
@@ -775,7 +1028,7 @@ def test_legend_inverse_size_label_relationship():
     assert_array_almost_equal(handle_sizes, legend_sizes, decimal=1)
 
 
-@pytest.mark.style('default')
+@mpl.style.context('default')
 @pytest.mark.parametrize('pcfunc', [plt.pcolor, plt.pcolormesh])
 def test_color_logic(pcfunc):
     z = np.arange(12).reshape(3, 4)
@@ -785,7 +1038,7 @@ def test_color_logic(pcfunc):
     # Define 2 reference "colors" here for multiple use.
     face_default = mcolors.to_rgba_array(pc._get_default_facecolor())
     mapped = pc.get_cmap()(pc.norm((z.ravel())))
-    # Github issue #1302:
+    # GitHub issue #1302:
     assert mcolors.same_color(pc.get_edgecolor(), 'red')
     # Check setting attributes after initialization:
     pc = pcfunc(z)
@@ -846,12 +1099,12 @@ def test_color_logic(pcfunc):
 
 
 def test_LineCollection_args():
-    with pytest.warns(MatplotlibDeprecationWarning):
-        lc = LineCollection(None, 2.2, 'r', zorder=3, facecolors=[0, 1, 0, 1])
-        assert lc.get_linewidth()[0] == 2.2
-        assert mcolors.same_color(lc.get_edgecolor(), 'r')
-        assert lc.get_zorder() == 3
-        assert mcolors.same_color(lc.get_facecolor(), [[0, 1, 0, 1]])
+    lc = LineCollection(None, linewidth=2.2, edgecolor='r',
+                        zorder=3, facecolors=[0, 1, 0, 1])
+    assert lc.get_linewidth()[0] == 2.2
+    assert mcolors.same_color(lc.get_edgecolor(), 'r')
+    assert lc.get_zorder() == 3
+    assert mcolors.same_color(lc.get_facecolor(), [[0, 1, 0, 1]])
     # To avoid breaking mplot3d, LineCollection internally sets the facecolor
     # kwarg if it has not been specified.  Hence we need the following test
     # for LineCollection._set_default().
@@ -868,3 +1121,63 @@ def test_array_wrong_dimensions():
     pc = plt.pcolormesh(z)
     pc.set_array(z)  # 2D is OK for Quadmesh
     pc.update_scalarmappable()
+
+
+def test_get_segments():
+    segments = np.tile(np.linspace(0, 1, 256), (2, 1)).T
+    lc = LineCollection([segments])
+
+    readback, = lc.get_segments()
+    # these should comeback un-changed!
+    assert np.all(segments == readback)
+
+
+def test_set_offsets_late():
+    identity = mtransforms.IdentityTransform()
+    sizes = [2]
+
+    null = mcollections.CircleCollection(sizes=sizes)
+
+    init = mcollections.CircleCollection(sizes=sizes, offsets=(10, 10))
+
+    late = mcollections.CircleCollection(sizes=sizes)
+    late.set_offsets((10, 10))
+
+    # Bbox.__eq__ doesn't compare bounds
+    null_bounds = null.get_datalim(identity).bounds
+    init_bounds = init.get_datalim(identity).bounds
+    late_bounds = late.get_datalim(identity).bounds
+
+    # offsets and transform are applied when set after initialization
+    assert null_bounds != init_bounds
+    assert init_bounds == late_bounds
+
+
+def test_set_offset_transform():
+    skew = mtransforms.Affine2D().skew(2, 2)
+    init = mcollections.Collection(offset_transform=skew)
+
+    late = mcollections.Collection()
+    late.set_offset_transform(skew)
+
+    assert skew == init.get_offset_transform() == late.get_offset_transform()
+
+
+def test_set_offset_units():
+    # passing the offsets in initially (i.e. via scatter)
+    # should yield the same results as `set_offsets`
+    x = np.linspace(0, 10, 5)
+    y = np.sin(x)
+    d = x * np.timedelta64(24, 'h') + np.datetime64('2021-11-29')
+
+    sc = plt.scatter(d, y)
+    off0 = sc.get_offsets()
+    sc.set_offsets(list(zip(d, y)))
+    np.testing.assert_allclose(off0, sc.get_offsets())
+
+    # try the other way around
+    fig, ax = plt.subplots()
+    sc = ax.scatter(y, d)
+    off0 = sc.get_offsets()
+    sc.set_offsets(list(zip(y, d)))
+    np.testing.assert_allclose(off0, sc.get_offsets())
diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
index bbd1e9c5f590..4336b761f698 100644
--- a/lib/matplotlib/tests/test_colorbar.py
+++ b/lib/matplotlib/tests/test_colorbar.py
@@ -1,16 +1,21 @@
 import numpy as np
 import pytest
 
+from matplotlib import _api
 from matplotlib import cm
 import matplotlib.colors as mcolors
+import matplotlib as mpl
+
 
 from matplotlib import rc_context
 from matplotlib.testing.decorators import image_comparison
 import matplotlib.pyplot as plt
-from matplotlib.colors import (BoundaryNorm, LogNorm, PowerNorm, Normalize,
-                               TwoSlopeNorm)
-from matplotlib.colorbar import ColorbarBase, _ColorbarLogLocator
-from matplotlib.ticker import FixedLocator
+from matplotlib.colors import (
+    BoundaryNorm, LogNorm, PowerNorm, Normalize, NoNorm
+)
+from matplotlib.colorbar import Colorbar
+from matplotlib.ticker import FixedLocator, LogFormatter
+from matplotlib.testing.decorators import check_figures_equal
 
 
 def _get_cmap_norms():
@@ -22,7 +27,7 @@ def _get_cmap_norms():
     colorbar_extension_length.
     """
     # Create a colormap and specify the levels it represents.
-    cmap = cm.get_cmap("RdBu", lut=5)
+    cmap = mpl.colormaps["RdBu"].resampled(5)
     clevs = [-5., -2.5, -.5, .5, 1.5, 3.5]
     # Define norms for the colormaps.
     norms = dict()
@@ -54,10 +59,10 @@ def _colorbar_extension_shape(spacing):
         # Create a subplot.
         cax = fig.add_subplot(4, 1, i + 1)
         # Generate the colorbar.
-        ColorbarBase(cax, cmap=cmap, norm=norm,
-                     boundaries=boundaries, values=values,
-                     extend=extension_type, extendrect=True,
-                     orientation='horizontal', spacing=spacing)
+        Colorbar(cax, cmap=cmap, norm=norm,
+                 boundaries=boundaries, values=values,
+                 extend=extension_type, extendrect=True,
+                 orientation='horizontal', spacing=spacing)
         # Turn off text and ticks.
         cax.tick_params(left=False, labelleft=False,
                         bottom=False, labelbottom=False)
@@ -86,13 +91,13 @@ def _colorbar_extension_length(spacing):
             # Create a subplot.
             cax = fig.add_subplot(12, 1, i*3 + j + 1)
             # Generate the colorbar.
-            ColorbarBase(cax, cmap=cmap, norm=norm,
-                         boundaries=boundaries, values=values,
-                         extend=extension_type, extendfrac=extendfrac,
-                         orientation='horizontal', spacing=spacing)
+            Colorbar(cax, cmap=cmap, norm=norm,
+                     boundaries=boundaries, values=values,
+                     extend=extension_type, extendfrac=extendfrac,
+                     orientation='horizontal', spacing=spacing)
             # Turn off text and ticks.
             cax.tick_params(left=False, labelleft=False,
-                            bottom=False, labelbottom=False)
+                              bottom=False, labelbottom=False)
     # Return the figure to the caller.
     return fig
 
@@ -122,6 +127,30 @@ def test_colorbar_extension_length():
     _colorbar_extension_length('proportional')
 
 
+@pytest.mark.parametrize("orientation", ["horizontal", "vertical"])
+@pytest.mark.parametrize("extend,expected", [("min", (0, 0, 0, 1)),
+                                             ("max", (1, 1, 1, 1)),
+                                             ("both", (1, 1, 1, 1))])
+def test_colorbar_extension_inverted_axis(orientation, extend, expected):
+    """Test extension color with an inverted axis"""
+    data = np.arange(12).reshape(3, 4)
+    fig, ax = plt.subplots()
+    cmap = mpl.colormaps["viridis"].with_extremes(under=(0, 0, 0, 1),
+                                                  over=(1, 1, 1, 1))
+    im = ax.imshow(data, cmap=cmap)
+    cbar = fig.colorbar(im, orientation=orientation, extend=extend)
+    if orientation == "horizontal":
+        cbar.ax.invert_xaxis()
+    else:
+        cbar.ax.invert_yaxis()
+    assert cbar._extend_patches[0].get_facecolor() == expected
+    if extend == "both":
+        assert len(cbar._extend_patches) == 2
+        assert cbar._extend_patches[1].get_facecolor() == (0, 0, 0, 1)
+    else:
+        assert len(cbar._extend_patches) == 1
+
+
 @pytest.mark.parametrize('use_gridspec', [True, False])
 @image_comparison(['cbar_with_orientation',
                    'cbar_locationing',
@@ -184,6 +213,37 @@ def test_colorbar_positioning(use_gridspec):
                  anchor=(0.8, 0.5), shrink=0.6, use_gridspec=use_gridspec)
 
 
+def test_colorbar_single_ax_panchor_false():
+    # Note that this differs from the tests above with panchor=False because
+    # there use_gridspec is actually ineffective: passing *ax* as lists always
+    # disables use_gridspec.
+    ax = plt.subplot(111, anchor='N')
+    plt.imshow([[0, 1]])
+    plt.colorbar(panchor=False)
+    assert ax.get_anchor() == 'N'
+
+
+@pytest.mark.parametrize('constrained', [False, True],
+                         ids=['standard', 'constrained'])
+def test_colorbar_single_ax_panchor_east(constrained):
+    fig = plt.figure(constrained_layout=constrained)
+    ax = fig.add_subplot(111, anchor='N')
+    plt.imshow([[0, 1]])
+    plt.colorbar(panchor='E')
+    assert ax.get_anchor() == 'E'
+
+
+@image_comparison(['contour_colorbar.png'], remove_text=True)
+def test_contour_colorbar():
+    fig, ax = plt.subplots(figsize=(4, 2))
+    data = np.arange(1200).reshape(30, 40) - 500
+    levels = np.array([0, 200, 400, 600, 800, 1000, 1200]) - 500
+
+    CS = ax.contour(data, levels=levels, extend='both')
+    fig.colorbar(CS, orientation='horizontal', extend='both')
+    fig.colorbar(CS, orientation='vertical')
+
+
 @image_comparison(['cbar_with_subplots_adjust.png'], remove_text=True,
                   savefig_kwarg={'dpi': 40})
 def test_gridspec_make_colorbar():
@@ -211,7 +271,7 @@ def test_colorbar_single_scatter():
     plt.figure()
     x = y = [0]
     z = [50]
-    cmap = plt.get_cmap('jet', 16)
+    cmap = mpl.colormaps['jet'].resampled(16)
     cs = plt.scatter(x, y, z, c=z, cmap=cmap)
     plt.colorbar(cs)
 
@@ -220,10 +280,10 @@ def test_colorbar_single_scatter():
                          ids=['no gridspec', 'with gridspec'])
 def test_remove_from_figure(use_gridspec):
     """
-    Test `remove_from_figure` with the specified ``use_gridspec`` setting
+    Test `remove` with the specified ``use_gridspec`` setting
     """
     fig, ax = plt.subplots()
-    sc = ax.scatter([1, 2], [3, 4], cmap="spring")
+    sc = ax.scatter([1, 2], [3, 4])
     sc.set_array(np.array([5, 6]))
     pre_position = ax.get_position()
     cb = fig.colorbar(sc, use_gridspec=use_gridspec)
@@ -234,13 +294,39 @@ def test_remove_from_figure(use_gridspec):
     assert (pre_position.get_points() == post_position.get_points()).all()
 
 
+def test_remove_from_figure_cl():
+    """
+    Test `remove` with constrained_layout
+    """
+    fig, ax = plt.subplots(constrained_layout=True)
+    sc = ax.scatter([1, 2], [3, 4])
+    sc.set_array(np.array([5, 6]))
+    fig.draw_without_rendering()
+    pre_position = ax.get_position()
+    cb = fig.colorbar(sc)
+    cb.remove()
+    fig.draw_without_rendering()
+    post_position = ax.get_position()
+    np.testing.assert_allclose(pre_position.get_points(),
+                               post_position.get_points())
+
+
 def test_colorbarbase():
     # smoke test from #3805
     ax = plt.gca()
-    ColorbarBase(ax, cmap=plt.cm.bone)
+    Colorbar(ax, cmap=plt.cm.bone)
+
 
+def test_parentless_mappable():
+    pc = mpl.collections.PatchCollection([], cmap=plt.get_cmap('viridis'))
+    pc.set_array([])
 
-@image_comparison(['colorbar_closed_patch'], remove_text=True)
+    with pytest.warns(_api.MatplotlibDeprecationWarning,
+                      match='Unable to determine Axes to steal'):
+        plt.colorbar(pc)
+
+
+@image_comparison(['colorbar_closed_patch.png'], remove_text=True)
 def test_colorbar_closed_patch():
     # Remove this line when this test image is regenerated.
     plt.rcParams['pcolormesh.snap'] = False
@@ -252,7 +338,7 @@ def test_colorbar_closed_patch():
     ax4 = fig.add_axes([0.05, 0.25, 0.9, 0.1])
     ax5 = fig.add_axes([0.05, 0.05, 0.9, 0.1])
 
-    cmap = cm.get_cmap("RdBu", lut=5)
+    cmap = mpl.colormaps["RdBu"].resampled(5)
 
     im = ax1.pcolormesh(np.linspace(0, 10, 16).reshape((4, 4)), cmap=cmap)
 
@@ -310,8 +396,8 @@ def test_colorbar_minorticks_on_off():
         cbar.minorticks_on()
         np.testing.assert_almost_equal(
             cbar.ax.yaxis.get_minorticklocs(),
-            [-1.2, -1.1, -0.9, -0.8, -0.7, -0.6, -0.4, -0.3, -0.2, -0.1,
-             0.1, 0.2, 0.3, 0.4, 0.6, 0.7, 0.8, 0.9, 1.1, 1.2])
+            [-1.1, -0.9, -0.8, -0.7, -0.6, -0.4, -0.3, -0.2, -0.1,
+             0.1, 0.2, 0.3, 0.4, 0.6, 0.7, 0.8, 0.9, 1.1, 1.2, 1.3])
 
     # tests for github issue #13257 and PR #13265
     data = np.random.uniform(low=1, high=10, size=(20, 20))
@@ -319,8 +405,8 @@ def test_colorbar_minorticks_on_off():
     fig, ax = plt.subplots()
     im = ax.pcolormesh(data, norm=LogNorm())
     cbar = fig.colorbar(im)
+    fig.canvas.draw()
     default_minorticklocks = cbar.ax.yaxis.get_minorticklocs()
-
     # test that minorticks turn off for LogNorm
     cbar.minorticks_off()
     np.testing.assert_equal(cbar.ax.yaxis.get_minorticklocs(), [])
@@ -381,10 +467,12 @@ def test_colorbar_autoticks():
         pcm = ax[1].pcolormesh(X, Y, Z)
         cbar2 = fig.colorbar(pcm, ax=ax[1], extend='both',
                              orientation='vertical', shrink=0.4)
+        # note only -10 to 10 are visible,
         np.testing.assert_almost_equal(cbar.ax.yaxis.get_ticklocs(),
-                                       np.arange(-10, 11, 5))
+                                       np.arange(-15, 16, 5))
+        # note only -10 to 10 are visible
         np.testing.assert_almost_equal(cbar2.ax.yaxis.get_ticklocs(),
-                                       np.arange(-10, 11, 10))
+                                       np.arange(-20, 21, 10))
 
 
 def test_colorbar_autotickslog():
@@ -403,10 +491,12 @@ def test_colorbar_autotickslog():
         pcm = ax[1].pcolormesh(X, Y, 10**Z, norm=LogNorm())
         cbar2 = fig.colorbar(pcm, ax=ax[1], extend='both',
                              orientation='vertical', shrink=0.4)
+        # note only -12 to +12 are visible
         np.testing.assert_almost_equal(cbar.ax.yaxis.get_ticklocs(),
-                                       10**np.arange(-12., 12.2, 4.))
+                                       10**np.arange(-16., 16.2, 4.))
+        # note only -24 to +24 are visible
         np.testing.assert_almost_equal(cbar2.ax.yaxis.get_ticklocs(),
-                                       10**np.arange(-12., 13., 12.))
+                                       10**np.arange(-24., 25., 12.))
 
 
 def test_colorbar_get_ticks():
@@ -426,27 +516,44 @@ def test_colorbar_get_ticks():
     assert userTicks.get_ticks().tolist() == [600, 700, 800]
 
     # testing for getter after calling set_ticks with some ticks out of bounds
-    userTicks.set_ticks([600, 1300, 1400, 1500])
-    assert userTicks.get_ticks().tolist() == [600]
+    # removed #20054: other axes don't trim fixed lists, so colorbars
+    # should not either:
+    # userTicks.set_ticks([600, 1300, 1400, 1500])
+    # assert userTicks.get_ticks().tolist() == [600]
 
     # testing getter when no ticks are assigned
     defTicks = plt.colorbar(orientation='horizontal')
-    assert defTicks.get_ticks().tolist() == levels
+    np.testing.assert_allclose(defTicks.get_ticks().tolist(), levels)
+
+    # test normal ticks and minor ticks
+    fig, ax = plt.subplots()
+    x = np.arange(-3.0, 4.001)
+    y = np.arange(-4.0, 3.001)
+    X, Y = np.meshgrid(x, y)
+    Z = X * Y
+    Z = Z[:-1, :-1]
+    pcm = ax.pcolormesh(X, Y, Z)
+    cbar = fig.colorbar(pcm, ax=ax, extend='both',
+                        orientation='vertical')
+    ticks = cbar.get_ticks()
+    np.testing.assert_allclose(ticks, np.arange(-15, 16, 5))
+    assert len(cbar.get_ticks(minor=True)) == 0
 
 
-def test_colorbar_lognorm_extension():
+@pytest.mark.parametrize("extend", ['both', 'min', 'max'])
+def test_colorbar_lognorm_extension(extend):
     # Test that colorbar with lognorm is extended correctly
     f, ax = plt.subplots()
-    cb = ColorbarBase(ax, norm=LogNorm(vmin=0.1, vmax=1000.0),
-                      orientation='vertical', extend='both')
+    cb = Colorbar(ax, norm=LogNorm(vmin=0.1, vmax=1000.0),
+                  orientation='vertical', extend=extend)
     assert cb._values[0] >= 0.0
 
 
 def test_colorbar_powernorm_extension():
     # Test that colorbar with powernorm is extended correctly
     f, ax = plt.subplots()
-    cb = ColorbarBase(ax, norm=PowerNorm(gamma=0.5, vmin=0.0, vmax=1.0),
-                      orientation='vertical', extend='both')
+    cb = Colorbar(ax, norm=PowerNorm(gamma=0.5, vmin=0.0, vmax=1.0),
+                  orientation='vertical', extend='both')
     assert cb._values[0] >= 0.0
 
 
@@ -465,13 +572,13 @@ def test_colorbar_log_minortick_labels():
         pcm = ax.imshow([[10000, 50000]], norm=LogNorm())
         cb = fig.colorbar(pcm)
         fig.canvas.draw()
-        lb = cb.ax.yaxis.get_ticklabels(which='both')
+        lb = [l.get_text() for l in cb.ax.yaxis.get_ticklabels(which='both')]
         expected = [r'$\mathdefault{10^{4}}$',
                     r'$\mathdefault{2\times10^{4}}$',
                     r'$\mathdefault{3\times10^{4}}$',
                     r'$\mathdefault{4\times10^{4}}$']
-        for l, exp in zip(lb, expected):
-            assert l.get_text() == exp
+        for exp in expected:
+            assert exp in lb
 
 
 def test_colorbar_renorm():
@@ -482,16 +589,15 @@ def test_colorbar_renorm():
     im = ax.imshow(z)
     cbar = fig.colorbar(im)
     np.testing.assert_allclose(cbar.ax.yaxis.get_majorticklocs(),
-                               np.arange(0, 120000.1, 15000))
+                               np.arange(0, 120000.1, 20000))
 
     cbar.set_ticks([1, 2, 3])
     assert isinstance(cbar.locator, FixedLocator)
 
     norm = LogNorm(z.min(), z.max())
     im.set_norm(norm)
-    assert isinstance(cbar.locator, _ColorbarLogLocator)
     np.testing.assert_allclose(cbar.ax.yaxis.get_majorticklocs(),
-                               np.logspace(-8, 5, 14))
+                               np.logspace(-10, 7, 18))
     # note that set_norm removes the FixedLocator...
     assert np.isclose(cbar.vmin, z.min())
     cbar.set_ticks([1, 2, 3])
@@ -505,28 +611,29 @@ def test_colorbar_renorm():
     assert np.isclose(cbar.vmax, z.max() * 1000)
 
 
-def test_colorbar_format():
+@pytest.mark.parametrize('fmt', ['%4.2e', '{x:.2e}'])
+def test_colorbar_format(fmt):
     # make sure that format is passed properly
     x, y = np.ogrid[-4:4:31j, -4:4:31j]
     z = 120000*np.exp(-x**2 - y**2)
 
     fig, ax = plt.subplots()
     im = ax.imshow(z)
-    cbar = fig.colorbar(im, format='%4.2e')
+    cbar = fig.colorbar(im, format=fmt)
     fig.canvas.draw()
-    assert cbar.ax.yaxis.get_ticklabels()[4].get_text() == '6.00e+04'
+    assert cbar.ax.yaxis.get_ticklabels()[4].get_text() == '8.00e+04'
 
     # make sure that if we change the clim of the mappable that the
     # formatting is *not* lost:
     im.set_clim([4, 200])
     fig.canvas.draw()
-    assert cbar.ax.yaxis.get_ticklabels()[4].get_text() == '8.00e+01'
+    assert cbar.ax.yaxis.get_ticklabels()[4].get_text() == '2.00e+02'
 
     # but if we change the norm:
     im.set_norm(LogNorm(vmin=0.1, vmax=10))
     fig.canvas.draw()
     assert (cbar.ax.yaxis.get_ticklabels()[0].get_text() ==
-            r'$\mathdefault{10^{-1}}$')
+            '$\\mathdefault{10^{-2}}$')
 
 
 def test_colorbar_scale_reset():
@@ -552,7 +659,7 @@ def test_colorbar_get_ticks_2():
     fig, ax = plt.subplots()
     pc = ax.pcolormesh([[.05, .95]])
     cb = fig.colorbar(pc)
-    np.testing.assert_allclose(cb.get_ticks(), [0.2, 0.4, 0.6, 0.8])
+    np.testing.assert_allclose(cb.get_ticks(), [0., 0.2, 0.4, 0.6, 0.8, 1.0])
 
 
 def test_colorbar_inverted_ticks():
@@ -570,29 +677,32 @@ def test_colorbar_inverted_ticks():
     cbar.minorticks_on()
     ticks = cbar.get_ticks()
     minorticks = cbar.get_ticks(minor=True)
+    assert isinstance(minorticks, np.ndarray)
     cbar.ax.invert_yaxis()
     np.testing.assert_allclose(ticks, cbar.get_ticks())
     np.testing.assert_allclose(minorticks, cbar.get_ticks(minor=True))
 
 
-def test_extend_colorbar_customnorm():
-    # This was a funny error with TwoSlopeNorm, maybe with other norms,
-    # when extend='both'
-    fig, (ax0, ax1) = plt.subplots(2, 1)
-    pcm = ax0.pcolormesh([[0]], norm=TwoSlopeNorm(vcenter=0., vmin=-2, vmax=1))
-    cb = fig.colorbar(pcm, ax=ax0, extend='both')
-    np.testing.assert_allclose(cb.ax.get_position().extents,
-                               [0.78375, 0.536364, 0.796147, 0.9], rtol=1e-3)
-
-
 def test_mappable_no_alpha():
     fig, ax = plt.subplots()
     sm = cm.ScalarMappable(norm=mcolors.Normalize(), cmap='viridis')
-    fig.colorbar(sm)
+    fig.colorbar(sm, ax=ax)
     sm.set_cmap('plasma')
     plt.draw()
 
 
+def test_mappable_2d_alpha():
+    fig, ax = plt.subplots()
+    x = np.arange(1, 5).reshape(2, 2)/4
+    pc = ax.pcolormesh(x, alpha=x)
+    cb = fig.colorbar(pc, ax=ax)
+    # The colorbar's alpha should be None and the mappable should still have
+    # the original alpha array
+    assert cb.alpha is None
+    assert pc.get_alpha() is x
+    fig.draw_without_rendering()
+
+
 def test_colorbar_label():
     """
     Test the label parameter. It should just be mapped to the xlabel/ylabel of
@@ -614,6 +724,17 @@ def test_colorbar_label():
     assert cbar3.ax.get_xlabel() == 'horizontal cbar'
 
 
+@image_comparison(['colorbar_keeping_xlabel.png'], style='mpl20')
+def test_keeping_xlabel():
+    # github issue #23398 - xlabels being ignored in colorbar axis
+    arr = np.arange(25).reshape((5, 5))
+    fig, ax = plt.subplots()
+    im = ax.imshow(arr)
+    cbar = plt.colorbar(im)
+    cbar.ax.set_xlabel('Visible Xlabel')
+    cbar.set_label('YLabel')
+
+
 @pytest.mark.parametrize("clim", [(-20000, 20000), (-32768, 0)])
 def test_colorbar_int(clim):
     # Check that we cast to float early enough to not
@@ -705,3 +826,326 @@ def test_anchored_cbar_position_using_specgrid():
     np.testing.assert_allclose(
             [cx1, cx0],
             [x1 * shrink + (1 - shrink) * p0, p0 * (1 - shrink) + x0 * shrink])
+
+
+@image_comparison(['colorbar_change_lim_scale.png'], remove_text=True,
+                  style='mpl20')
+def test_colorbar_change_lim_scale():
+    fig, ax = plt.subplots(1, 2, constrained_layout=True)
+    pc = ax[0].pcolormesh(np.arange(100).reshape(10, 10)+1)
+    cb = fig.colorbar(pc, ax=ax[0], extend='both')
+    cb.ax.set_yscale('log')
+
+    pc = ax[1].pcolormesh(np.arange(100).reshape(10, 10)+1)
+    cb = fig.colorbar(pc, ax=ax[1], extend='both')
+    cb.ax.set_ylim([20, 90])
+
+
+@check_figures_equal(extensions=["png"])
+def test_axes_handles_same_functions(fig_ref, fig_test):
+    # prove that cax and cb.ax are functionally the same
+    for nn, fig in enumerate([fig_ref, fig_test]):
+        ax = fig.add_subplot()
+        pc = ax.pcolormesh(np.ones(300).reshape(10, 30))
+        cax = fig.add_axes([0.9, 0.1, 0.03, 0.8])
+        cb = fig.colorbar(pc, cax=cax)
+        if nn == 0:
+            caxx = cax
+        else:
+            caxx = cb.ax
+        caxx.set_yticks(np.arange(0, 20))
+        caxx.set_yscale('log')
+        caxx.set_position([0.92, 0.1, 0.02, 0.7])
+
+
+def test_inset_colorbar_layout():
+    fig, ax = plt.subplots(constrained_layout=True, figsize=(3, 6))
+    pc = ax.imshow(np.arange(100).reshape(10, 10))
+    cax = ax.inset_axes([1.02, 0.1, 0.03, 0.8])
+    cb = fig.colorbar(pc, cax=cax)
+
+    fig.draw_without_rendering()
+    # make sure this is in the figure. In the colorbar swapping
+    # it was being dropped from the list of children...
+    np.testing.assert_allclose(cb.ax.get_position().bounds,
+                               [0.87, 0.342, 0.0237, 0.315], atol=0.01)
+    assert cb.ax in ax.child_axes
+
+
+@image_comparison(['colorbar_twoslope.png'], remove_text=True,
+                  style='mpl20')
+def test_twoslope_colorbar():
+    # Note that the second tick = 20, and should be in the middle
+    # of the colorbar (white)
+    # There should be no tick right at the bottom, nor at the top.
+    fig, ax = plt.subplots()
+
+    norm = mcolors.TwoSlopeNorm(20, 5, 95)
+    pc = ax.pcolormesh(np.arange(1, 11), np.arange(1, 11),
+                       np.arange(100).reshape(10, 10),
+                       norm=norm, cmap='RdBu_r')
+    fig.colorbar(pc)
+
+
+@check_figures_equal(extensions=["png"])
+def test_remove_cb_whose_mappable_has_no_figure(fig_ref, fig_test):
+    ax = fig_test.add_subplot()
+    cb = fig_test.colorbar(cm.ScalarMappable(), cax=ax)
+    cb.remove()
+
+
+def test_aspects():
+    fig, ax = plt.subplots(3, 2, figsize=(8, 8))
+    aspects = [20, 20, 10]
+    extends = ['neither', 'both', 'both']
+    cb = [[None, None, None], [None, None, None]]
+    for nn, orient in enumerate(['vertical', 'horizontal']):
+        for mm, (aspect, extend) in enumerate(zip(aspects, extends)):
+            pc = ax[mm, nn].pcolormesh(np.arange(100).reshape(10, 10))
+            cb[nn][mm] = fig.colorbar(pc, ax=ax[mm, nn], orientation=orient,
+                                      aspect=aspect, extend=extend)
+    fig.draw_without_rendering()
+    # check the extends are right ratio:
+    np.testing.assert_almost_equal(cb[0][1].ax.get_position().height,
+                                   cb[0][0].ax.get_position().height * 0.9,
+                                   decimal=2)
+    # horizontal
+    np.testing.assert_almost_equal(cb[1][1].ax.get_position().width,
+                                   cb[1][0].ax.get_position().width * 0.9,
+                                   decimal=2)
+    # check correct aspect:
+    pos = cb[0][0].ax.get_position(original=False)
+    np.testing.assert_almost_equal(pos.height, pos.width * 20, decimal=2)
+    pos = cb[1][0].ax.get_position(original=False)
+    np.testing.assert_almost_equal(pos.height * 20, pos.width, decimal=2)
+    # check twice as wide if aspect is 10 instead of 20
+    np.testing.assert_almost_equal(
+        cb[0][0].ax.get_position(original=False).width * 2,
+        cb[0][2].ax.get_position(original=False).width, decimal=2)
+    np.testing.assert_almost_equal(
+        cb[1][0].ax.get_position(original=False).height * 2,
+        cb[1][2].ax.get_position(original=False).height, decimal=2)
+
+
+@image_comparison(['proportional_colorbars.png'], remove_text=True,
+                  style='mpl20')
+def test_proportional_colorbars():
+
+    x = y = np.arange(-3.0, 3.01, 0.025)
+    X, Y = np.meshgrid(x, y)
+    Z1 = np.exp(-X**2 - Y**2)
+    Z2 = np.exp(-(X - 1)**2 - (Y - 1)**2)
+    Z = (Z1 - Z2) * 2
+
+    levels = [-1.25, -0.5, -0.125, 0.125, 0.5, 1.25]
+    cmap = mcolors.ListedColormap(
+        ['0.3', '0.5', 'white', 'lightblue', 'steelblue'])
+    cmap.set_under('darkred')
+    cmap.set_over('crimson')
+    norm = mcolors.BoundaryNorm(levels, cmap.N)
+
+    extends = ['neither', 'both']
+    spacings = ['uniform', 'proportional']
+    fig, axs = plt.subplots(2, 2)
+    for i in range(2):
+        for j in range(2):
+            CS3 = axs[i, j].contourf(X, Y, Z, levels, cmap=cmap, norm=norm,
+                                     extend=extends[i])
+            fig.colorbar(CS3, spacing=spacings[j], ax=axs[i, j])
+
+
+@image_comparison(['extend_drawedges.png'], remove_text=True, style='mpl20')
+def test_colorbar_extend_drawedges():
+    params = [
+        ('both', 1, [[[1.1, 0], [1.1, 1]],
+                     [[2, 0], [2, 1]],
+                     [[2.9, 0], [2.9, 1]]]),
+        ('min', 0, [[[1.1, 0], [1.1, 1]],
+                    [[2, 0], [2, 1]]]),
+        ('max', 0, [[[2, 0], [2, 1]],
+                    [[2.9, 0], [2.9, 1]]]),
+        ('neither', -1, [[[2, 0], [2, 1]]]),
+    ]
+
+    plt.rcParams['axes.linewidth'] = 2
+
+    fig = plt.figure(figsize=(10, 4))
+    subfigs = fig.subfigures(1, 2)
+
+    for orientation, subfig in zip(['horizontal', 'vertical'], subfigs):
+        if orientation == 'horizontal':
+            axs = subfig.subplots(4, 1)
+        else:
+            axs = subfig.subplots(1, 4)
+        fig.subplots_adjust(left=0.05, bottom=0.05, right=0.95, top=0.95)
+
+        for ax, (extend, coloroffset, res) in zip(axs, params):
+            cmap = mpl.colormaps["viridis"]
+            bounds = np.arange(5)
+            nb_colors = len(bounds) + coloroffset
+            colors = cmap(np.linspace(100, 255, nb_colors).astype(int))
+            cmap, norm = mcolors.from_levels_and_colors(bounds, colors,
+                                                        extend=extend)
+
+            cbar = Colorbar(ax, cmap=cmap, norm=norm, orientation=orientation,
+                            drawedges=True)
+            # Set limits such that only two colours are visible, and the
+            # dividers would be outside the Axes, to ensure that a) they are
+            # not drawn outside, and b) a divider still appears between the
+            # main colour and the extension.
+            if orientation == 'horizontal':
+                ax.set_xlim(1.1, 2.9)
+            else:
+                ax.set_ylim(1.1, 2.9)
+                res = np.array(res)[:, :, [1, 0]]
+            np.testing.assert_array_equal(cbar.dividers.get_segments(), res)
+
+
+@image_comparison(['contourf_extend_patches.png'], remove_text=True,
+                  style='mpl20')
+def test_colorbar_contourf_extend_patches():
+    params = [
+        ('both', 5, ['\\', '//']),
+        ('min', 7, ['+']),
+        ('max', 2, ['|', '-', '/', '\\', '//']),
+        ('neither', 10, ['//', '\\', '||']),
+    ]
+
+    plt.rcParams['axes.linewidth'] = 2
+
+    fig = plt.figure(figsize=(10, 4))
+    subfigs = fig.subfigures(1, 2)
+    fig.subplots_adjust(left=0.05, bottom=0.05, right=0.95, top=0.95)
+
+    x = np.linspace(-2, 3, 50)
+    y = np.linspace(-2, 3, 30)
+    z = np.cos(x[np.newaxis, :]) + np.sin(y[:, np.newaxis])
+
+    cmap = mpl.colormaps["viridis"]
+    for orientation, subfig in zip(['horizontal', 'vertical'], subfigs):
+        axs = subfig.subplots(2, 2).ravel()
+        for ax, (extend, levels, hatches) in zip(axs, params):
+            cs = ax.contourf(x, y, z, levels, hatches=hatches,
+                             cmap=cmap, extend=extend)
+            subfig.colorbar(cs, ax=ax, orientation=orientation, fraction=0.4,
+                            extendfrac=0.2, aspect=5)
+
+
+def test_negative_boundarynorm():
+    fig, ax = plt.subplots(figsize=(1, 3))
+    cmap = mpl.colormaps["viridis"]
+
+    clevs = np.arange(-94, -85)
+    norm = BoundaryNorm(clevs, cmap.N)
+    cb = fig.colorbar(cm.ScalarMappable(cmap=cmap, norm=norm), cax=ax)
+    np.testing.assert_allclose(cb.ax.get_ylim(), [clevs[0], clevs[-1]])
+    np.testing.assert_allclose(cb.ax.get_yticks(), clevs)
+
+    clevs = np.arange(85, 94)
+    norm = BoundaryNorm(clevs, cmap.N)
+    cb = fig.colorbar(cm.ScalarMappable(cmap=cmap, norm=norm), cax=ax)
+    np.testing.assert_allclose(cb.ax.get_ylim(), [clevs[0], clevs[-1]])
+    np.testing.assert_allclose(cb.ax.get_yticks(), clevs)
+
+    clevs = np.arange(-3, 3)
+    norm = BoundaryNorm(clevs, cmap.N)
+    cb = fig.colorbar(cm.ScalarMappable(cmap=cmap, norm=norm), cax=ax)
+    np.testing.assert_allclose(cb.ax.get_ylim(), [clevs[0], clevs[-1]])
+    np.testing.assert_allclose(cb.ax.get_yticks(), clevs)
+
+    clevs = np.arange(-8, 1)
+    norm = BoundaryNorm(clevs, cmap.N)
+    cb = fig.colorbar(cm.ScalarMappable(cmap=cmap, norm=norm), cax=ax)
+    np.testing.assert_allclose(cb.ax.get_ylim(), [clevs[0], clevs[-1]])
+    np.testing.assert_allclose(cb.ax.get_yticks(), clevs)
+
+
+@image_comparison(['nonorm_colorbars.svg'], style='mpl20')
+def test_nonorm():
+    plt.rcParams['svg.fonttype'] = 'none'
+    data = [1, 2, 3, 4, 5]
+
+    fig, ax = plt.subplots(figsize=(6, 1))
+    fig.subplots_adjust(bottom=0.5)
+
+    norm = NoNorm(vmin=min(data), vmax=max(data))
+    cmap = mpl.colormaps["viridis"].resampled(len(data))
+    mappable = cm.ScalarMappable(norm=norm, cmap=cmap)
+    cbar = fig.colorbar(mappable, cax=ax, orientation="horizontal")
+
+
+@image_comparison(['test_boundaries.png'], remove_text=True,
+                  style='mpl20')
+def test_boundaries():
+    np.random.seed(seed=19680808)
+    fig, ax = plt.subplots(figsize=(2, 2))
+    pc = ax.pcolormesh(np.random.randn(10, 10), cmap='RdBu_r')
+    cb = fig.colorbar(pc, ax=ax, boundaries=np.linspace(-3, 3, 7))
+
+
+def test_colorbar_no_warning_rcparams_grid_true():
+    # github issue #21723 - If mpl style has 'axes.grid' = True,
+    # fig.colorbar raises a warning about Auto-removal of grids
+    # by pcolor() and pcolormesh(). This is fixed by PR #22216.
+    plt.rcParams['axes.grid'] = True
+    fig, ax = plt.subplots()
+    ax.grid(False)
+    im = ax.pcolormesh([0, 1], [0, 1], [[1]])
+    # make sure that no warning is raised by fig.colorbar
+    fig.colorbar(im)
+
+
+def test_colorbar_set_formatter_locator():
+    # check that the locator properties echo what is on the axis:
+    fig, ax = plt.subplots()
+    pc = ax.pcolormesh(np.random.randn(10, 10))
+    cb = fig.colorbar(pc)
+    cb.ax.yaxis.set_major_locator(FixedLocator(np.arange(10)))
+    cb.ax.yaxis.set_minor_locator(FixedLocator(np.arange(0, 10, 0.2)))
+    assert cb.locator is cb.ax.yaxis.get_major_locator()
+    assert cb.minorlocator is cb.ax.yaxis.get_minor_locator()
+    cb.ax.yaxis.set_major_formatter(LogFormatter())
+    cb.ax.yaxis.set_minor_formatter(LogFormatter())
+    assert cb.formatter is cb.ax.yaxis.get_major_formatter()
+    assert cb.minorformatter is cb.ax.yaxis.get_minor_formatter()
+
+    # check that the setter works as expected:
+    loc = FixedLocator(np.arange(7))
+    cb.locator = loc
+    assert cb.ax.yaxis.get_major_locator() is loc
+    loc = FixedLocator(np.arange(0, 7, 0.1))
+    cb.minorlocator = loc
+    assert cb.ax.yaxis.get_minor_locator() is loc
+    fmt = LogFormatter()
+    cb.formatter = fmt
+    assert cb.ax.yaxis.get_major_formatter() is fmt
+    fmt = LogFormatter()
+    cb.minorformatter = fmt
+    assert cb.ax.yaxis.get_minor_formatter() is fmt
+
+
+def test_offset_text_loc():
+    plt.style.use('mpl20')
+    fig, ax = plt.subplots()
+    np.random.seed(seed=19680808)
+    pc = ax.pcolormesh(np.random.randn(10, 10)*1e6)
+    cb = fig.colorbar(pc, location='right', extend='max')
+    fig.draw_without_rendering()
+    # check that the offsetText is in the proper place above the
+    # colorbar axes.  In this case the colorbar axes is the same
+    # height as the parent, so use the parents bbox.
+    assert cb.ax.yaxis.offsetText.get_position()[1] > ax.bbox.y1
+
+
+def test_title_text_loc():
+    plt.style.use('mpl20')
+    fig, ax = plt.subplots()
+    np.random.seed(seed=19680808)
+    pc = ax.pcolormesh(np.random.randn(10, 10))
+    cb = fig.colorbar(pc, location='right', extend='max')
+    cb.ax.set_title('Aardvark')
+    fig.draw_without_rendering()
+    # check that the title is in the proper place above the
+    # colorbar axes, including its extend triangles....
+    assert (cb.ax.title.get_window_extent(fig.canvas.get_renderer()).ymax >
+            cb.ax.spines['outline'].get_window_extent().ymax)
diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py
index d9c31a148a9b..3adfce2833a6 100644
--- a/lib/matplotlib/tests/test_colors.py
+++ b/lib/matplotlib/tests/test_colors.py
@@ -1,5 +1,6 @@
 import copy
 import itertools
+import unittest.mock
 
 from io import BytesIO
 import numpy as np
@@ -9,15 +10,14 @@
 
 from numpy.testing import assert_array_equal, assert_array_almost_equal
 
-from matplotlib import cycler
+from matplotlib import cbook, cm, cycler
 import matplotlib
+import matplotlib as mpl
 import matplotlib.colors as mcolors
-import matplotlib.cm as cm
 import matplotlib.colorbar as mcolorbar
-import matplotlib.cbook as cbook
 import matplotlib.pyplot as plt
 import matplotlib.scale as mscale
-from matplotlib.testing.decorators import image_comparison
+from matplotlib.testing.decorators import image_comparison, check_figures_equal
 
 
 @pytest.mark.parametrize('N, result', [
@@ -30,9 +30,9 @@ def test_create_lookup_table(N, result):
     assert_array_almost_equal(mcolors._create_lookup_table(N, data), result)
 
 
-def test_resample():
+def test_resampled():
     """
-    GitHub issue #6025 pointed to incorrect ListedColormap._resample;
+    GitHub issue #6025 pointed to incorrect ListedColormap.resampled;
     here we test the method for LinearSegmentedColormap as well.
     """
     n = 101
@@ -48,8 +48,8 @@ def test_resample():
         cmap.set_under('r')
         cmap.set_over('g')
         cmap.set_bad('b')
-    lsc3 = lsc._resample(3)
-    lc3 = lc._resample(3)
+    lsc3 = lsc.resampled(3)
+    lc3 = lc.resampled(3)
     expected = np.array([[0.0, 0.2, 1.0, 0.7],
                          [0.5, 0.2, 0.5, 0.7],
                          [1.0, 0.2, 0.0, 0.7]], float)
@@ -65,79 +65,91 @@ def test_resample():
 
 
 def test_register_cmap():
-    new_cm = copy.copy(cm.get_cmap("viridis"))
+    new_cm = mpl.colormaps["viridis"]
     target = "viridis2"
-    cm.register_cmap(target, new_cm)
-    assert plt.get_cmap(target) == new_cm
+    with pytest.warns(
+            PendingDeprecationWarning,
+            match=r"matplotlib\.colormaps\.register\(name\)"
+    ):
+        cm.register_cmap(target, new_cm)
+    assert mpl.colormaps[target] == new_cm
 
     with pytest.raises(ValueError,
                        match="Arguments must include a name or a Colormap"):
-        cm.register_cmap()
-
-    with pytest.warns(UserWarning):
-        cm.register_cmap(target, new_cm)
-
-    cm.unregister_cmap(target)
+        with pytest.warns(
+            PendingDeprecationWarning,
+            match=r"matplotlib\.colormaps\.register\(name\)"
+        ):
+            cm.register_cmap()
+
+    with pytest.warns(
+            PendingDeprecationWarning,
+            match=r"matplotlib\.colormaps\.unregister\(name\)"
+    ):
+        cm.unregister_cmap(target)
     with pytest.raises(ValueError,
                        match=f'{target!r} is not a valid value for name;'):
-        cm.get_cmap(target)
-    # test that second time is error free
-    cm.unregister_cmap(target)
-
-    with pytest.raises(ValueError, match="You must pass a Colormap instance."):
-        cm.register_cmap('nome', cmap='not a cmap')
+        with pytest.warns(
+                PendingDeprecationWarning,
+                match=r"matplotlib\.colormaps\[name\]"
+        ):
+            cm.get_cmap(target)
+    with pytest.warns(
+            PendingDeprecationWarning,
+            match=r"matplotlib\.colormaps\.unregister\(name\)"
+    ):
+        # test that second time is error free
+        cm.unregister_cmap(target)
+
+    with pytest.raises(TypeError, match="'cmap' must be"):
+        with pytest.warns(
+            PendingDeprecationWarning,
+            match=r"matplotlib\.colormaps\.register\(name\)"
+        ):
+            cm.register_cmap('nome', cmap='not a cmap')
+
+
+def test_colormaps_get_cmap():
+    cr = mpl.colormaps
+
+    # check str, and Colormap pass
+    assert cr.get_cmap('plasma') == cr["plasma"]
+    assert cr.get_cmap(cr["magma"]) == cr["magma"]
+
+    # check default
+    assert cr.get_cmap(None) == cr[mpl.rcParams['image.cmap']]
+
+    # check ValueError on bad name
+    bad_cmap = 'AardvarksAreAwkward'
+    with pytest.raises(ValueError, match=bad_cmap):
+        cr.get_cmap(bad_cmap)
+
+    # check TypeError on bad type
+    with pytest.raises(TypeError, match='object'):
+        cr.get_cmap(object())
 
 
 def test_double_register_builtin_cmap():
     name = "viridis"
-    match = f"Trying to re-register the builtin cmap {name!r}."
+    match = f"Re-registering the builtin cmap {name!r}."
     with pytest.raises(ValueError, match=match):
-        cm.register_cmap(name, cm.get_cmap(name))
+        matplotlib.colormaps.register(
+            mpl.colormaps[name], name=name, force=True
+        )
+    with pytest.raises(ValueError, match='A colormap named "viridis"'):
+        with pytest.warns(PendingDeprecationWarning):
+            cm.register_cmap(name, mpl.colormaps[name])
     with pytest.warns(UserWarning):
-        cm.register_cmap(name, cm.get_cmap(name), override_builtin=True)
+        # TODO is warning more than once!
+        cm.register_cmap(name, mpl.colormaps[name], override_builtin=True)
 
 
 def test_unregister_builtin_cmap():
     name = "viridis"
     match = f'cannot unregister {name!r} which is a builtin colormap.'
     with pytest.raises(ValueError, match=match):
-        cm.unregister_cmap(name)
-
-
-def test_colormap_global_set_warn():
-    new_cm = plt.get_cmap('viridis')
-    # Store the old value so we don't override the state later on.
-    orig_cmap = copy.copy(new_cm)
-    with pytest.warns(cbook.MatplotlibDeprecationWarning,
-                      match="You are modifying the state of a globally"):
-        # This should warn now because we've modified the global state
-        new_cm.set_under('k')
-
-    # This shouldn't warn because it is a copy
-    copy.copy(new_cm).set_under('b')
-
-    # Test that registering and then modifying warns
-    plt.register_cmap(name='test_cm', cmap=copy.copy(orig_cmap))
-    new_cm = plt.get_cmap('test_cm')
-    with pytest.warns(cbook.MatplotlibDeprecationWarning,
-                      match="You are modifying the state of a globally"):
-        # This should warn now because we've modified the global state
-        new_cm.set_under('k')
-
-    # Re-register the original
-    with pytest.warns(UserWarning):
-        plt.register_cmap(cmap=orig_cmap, override_builtin=True)
-
-
-def test_colormap_dict_deprecate():
-    # Make sure we warn on get and set access into cmap_d
-    with pytest.warns(cbook.MatplotlibDeprecationWarning,
-                      match="The global colormaps dictionary is no longer"):
-        cmap = plt.cm.cmap_d['viridis']
-
-    with pytest.warns(cbook.MatplotlibDeprecationWarning,
-                      match="The global colormaps dictionary is no longer"):
-        plt.cm.cmap_d['test'] = cmap
+        with pytest.warns(PendingDeprecationWarning):
+            cm.unregister_cmap(name)
 
 
 def test_colormap_copy():
@@ -162,13 +174,36 @@ def test_colormap_copy():
     assert_array_equal(ret1, ret2)
 
 
+def test_colormap_equals():
+    cmap = mpl.colormaps["plasma"]
+    cm_copy = cmap.copy()
+    # different object id's
+    assert cm_copy is not cmap
+    # But the same data should be equal
+    assert cm_copy == cmap
+    # Change the copy
+    cm_copy.set_bad('y')
+    assert cm_copy != cmap
+    # Make sure we can compare different sizes without failure
+    cm_copy._lut = cm_copy._lut[:10, :]
+    assert cm_copy != cmap
+    # Test different names are not equal
+    cm_copy = cmap.copy()
+    cm_copy.name = "Test"
+    assert cm_copy != cmap
+    # Test colorbar extends
+    cm_copy = cmap.copy()
+    cm_copy.colorbar_extend = not cmap.colorbar_extend
+    assert cm_copy != cmap
+
+
 def test_colormap_endian():
     """
     GitHub issue #1005: a bug in putmask caused erroneous
     mapping of 1.0 when input from a non-native-byteorder
     array.
     """
-    cmap = cm.get_cmap("jet")
+    cmap = mpl.colormaps["jet"]
     # Test under, over, and invalid along with values 0 and 1.
     a = [-0.5, 0, 0.5, 1, 1.5, np.nan]
     for dt in ["f2", "f4", "f8"]:
@@ -183,7 +218,7 @@ def test_colormap_invalid():
     rather than bad. This tests to make sure all invalid values
     (-inf, nan, inf) are mapped respectively to (under, bad, over).
     """
-    cmap = cm.get_cmap("plasma")
+    cmap = mpl.colormaps["plasma"]
     x = np.array([-np.inf, -1, 0, np.nan, .7, 2, np.inf])
 
     expected = np.array([[0.050383, 0.029803, 0.527975, 1.],
@@ -216,7 +251,7 @@ def test_colormap_return_types():
     Make sure that tuples are returned for scalar input and
     that the proper shapes are returned for ndarrays.
     """
-    cmap = cm.get_cmap("plasma")
+    cmap = mpl.colormaps["plasma"]
     # Test return types and shapes
     # scalar input needs to return a tuple of length 4
     assert isinstance(cmap(0.5), tuple)
@@ -331,7 +366,7 @@ def test_BoundaryNorm():
 
     # Testing extend keyword, with interpolation (large cmap)
     bounds = [1, 2, 3]
-    cmap = cm.get_cmap('viridis')
+    cmap = mpl.colormaps['viridis']
     mynorm = mcolors.BoundaryNorm(bounds, cmap.N, extend='both')
     refnorm = mcolors.BoundaryNorm([0] + bounds + [4], cmap.N)
     x = np.random.randn(100) * 10 + 2
@@ -418,6 +453,12 @@ def test_CenteredNorm():
     norm.autoscale_None([1, 2])
     assert norm.vmax + norm.vmin == 2 * vcenter
 
+    # Check that halfrange can be set without setting vcenter and that it is
+    # not reset through autoscale_None.
+    norm = mcolors.CenteredNorm(halfrange=1.0)
+    norm.autoscale_None([1, 3000])
+    assert norm.halfrange == 1.0
+
     # Check that halfrange input works correctly.
     x = np.random.normal(size=10)
     norm = mcolors.CenteredNorm(vcenter=0.5, halfrange=0.5)
@@ -538,14 +579,15 @@ def test_Normalize():
     # Don't lose precision on longdoubles (float128 on Linux):
     # for array inputs...
     vals = np.array([1.2345678901, 9.8765432109], dtype=np.longdouble)
-    norm = mcolors.Normalize(vals.min(), vals.max())
-    assert_array_equal(np.asarray(norm(vals)), [0, 1])
+    norm = mcolors.Normalize(vals[0], vals[1])
+    assert norm(vals).dtype == np.longdouble
+    assert_array_equal(norm(vals), [0, 1])
     # and for scalar ones.
     eps = np.finfo(np.longdouble).resolution
     norm = plt.Normalize(1, 1 + 100 * eps)
     # This returns exactly 0.5 when longdouble is extended precision (80-bit),
     # but only a value close to it when it is quadruple precision (128-bit).
-    assert 0 < norm(1 + 50 * eps) < 1
+    assert_array_almost_equal(norm(1 + 50 * eps), 0.5, decimal=3)
 
 
 def test_FuncNorm():
@@ -711,10 +753,32 @@ def test_SymLogNorm_single_zero():
     norm = mcolors.SymLogNorm(1e-5, vmin=-1, vmax=1, base=np.e)
     cbar = mcolorbar.ColorbarBase(fig.add_subplot(), norm=norm)
     ticks = cbar.get_ticks()
-    assert sum(ticks == 0) == 1
+    assert np.count_nonzero(ticks == 0) <= 1
     plt.close(fig)
 
 
+class TestAsinhNorm:
+    """
+    Tests for `~.colors.AsinhNorm`
+    """
+
+    def test_init(self):
+        norm0 = mcolors.AsinhNorm()
+        assert norm0.linear_width == 1
+
+        norm5 = mcolors.AsinhNorm(linear_width=5)
+        assert norm5.linear_width == 5
+
+    def test_norm(self):
+        norm = mcolors.AsinhNorm(2, vmin=-4, vmax=4)
+        vals = np.arange(-3.5, 3.5, 10)
+        normed_vals = norm(vals)
+        asinh2 = np.arcsinh(2)
+
+        expected = (2 * np.arcsinh(vals / 2) + 2 * asinh2) / (4 * asinh2)
+        assert_array_almost_equal(normed_vals, expected)
+
+
 def _inverse_tester(norm_instance, vals):
     """
     Checks if the inverse of the given normalization is working.
@@ -773,12 +837,12 @@ def test_boundarynorm_and_colorbarbase():
 
     # Set the colormap and bounds
     bounds = [-1, 2, 5, 7, 12, 15]
-    cmap = cm.get_cmap('viridis')
+    cmap = mpl.colormaps['viridis']
 
     # Default behavior
     norm = mcolors.BoundaryNorm(bounds, cmap.N)
     cb1 = mcolorbar.ColorbarBase(ax1, cmap=cmap, norm=norm, extend='both',
-                                 orientation='horizontal')
+                                 orientation='horizontal', spacing='uniform')
     # New behavior
     norm = mcolors.BoundaryNorm(bounds, cmap.N, extend='both')
     cb2 = mcolorbar.ColorbarBase(ax2, cmap=cmap, norm=norm,
@@ -1118,13 +1182,13 @@ def test_pandas_iterable(pd):
     assert_array_equal(cm1.colors, cm2.colors)
 
 
-@pytest.mark.parametrize('name', sorted(plt.colormaps()))
+@pytest.mark.parametrize('name', sorted(mpl.colormaps()))
 def test_colormap_reversing(name):
     """
     Check the generated _lut data of a colormap and corresponding reversed
     colormap if they are almost the same.
     """
-    cmap = plt.get_cmap(name)
+    cmap = mpl.colormaps[name]
     cmap_r = cmap.reversed()
     if not cmap_r._isinit:
         cmap._init()
@@ -1136,6 +1200,15 @@ def test_colormap_reversing(name):
     assert_array_almost_equal(cmap(np.nan), cmap_r(np.nan))
 
 
+def test_has_alpha_channel():
+    assert mcolors._has_alpha_channel((0, 0, 0, 0))
+    assert mcolors._has_alpha_channel([1, 1, 1, 1])
+    assert not mcolors._has_alpha_channel('blue')  # 4-char string!
+    assert not mcolors._has_alpha_channel('0.25')
+    assert not mcolors._has_alpha_channel('r')
+    assert not mcolors._has_alpha_channel((1, 0, 0))
+
+
 def test_cn():
     matplotlib.rcParams['axes.prop_cycle'] = cycler('color',
                                                     ['blue', 'r'])
@@ -1193,8 +1266,7 @@ def test_to_rgba_array_single_str():
 
     # single char color sequence is invalid
     with pytest.raises(ValueError,
-                       match="Using a string of single character colors as "
-                             "a color sequence is not supported."):
+                       match="'rgb' is not a valid color value."):
         array = mcolors.to_rgba_array("rgb")
 
 
@@ -1283,7 +1355,7 @@ def test_hex_shorthand_notation():
 
 
 def test_repr_png():
-    cmap = plt.get_cmap('viridis')
+    cmap = mpl.colormaps['viridis']
     png = cmap._repr_png_()
     assert len(png) > 0
     img = Image.open(BytesIO(png))
@@ -1296,7 +1368,7 @@ def test_repr_png():
 
 
 def test_repr_html():
-    cmap = plt.get_cmap('viridis')
+    cmap = mpl.colormaps['viridis']
     html = cmap._repr_html_()
     assert len(html) > 0
     png = cmap._repr_png_()
@@ -1307,7 +1379,7 @@ def test_repr_html():
 
 
 def test_get_under_over_bad():
-    cmap = plt.get_cmap('viridis')
+    cmap = mpl.colormaps['viridis']
     assert_array_equal(cmap.get_under(), cmap(-np.inf))
     assert_array_equal(cmap.get_over(), cmap(np.inf))
     assert_array_equal(cmap.get_bad(), cmap(np.nan))
@@ -1315,7 +1387,7 @@ def test_get_under_over_bad():
 
 @pytest.mark.parametrize('kind', ('over', 'under', 'bad'))
 def test_non_mutable_get_values(kind):
-    cmap = copy.copy(plt.get_cmap('viridis'))
+    cmap = copy.copy(mpl.colormaps['viridis'])
     init_value = getattr(cmap, f'get_{kind}')()
     getattr(cmap, f'set_{kind}')('k')
     black_value = getattr(cmap, f'get_{kind}')()
@@ -1324,7 +1396,7 @@ def test_non_mutable_get_values(kind):
 
 
 def test_colormap_alpha_array():
-    cmap = plt.get_cmap('viridis')
+    cmap = mpl.colormaps['viridis']
     vals = [-1, 0.5, 2]  # under, valid, over
     with pytest.raises(ValueError, match="alpha is array-like but"):
         cmap(vals, alpha=[1, 1, 1, 1])
@@ -1336,7 +1408,7 @@ def test_colormap_alpha_array():
 
 
 def test_colormap_bad_data_with_alpha():
-    cmap = plt.get_cmap('viridis')
+    cmap = mpl.colormaps['viridis']
     c = cmap(np.nan, alpha=0.5)
     assert c == (0, 0, 0, 0)
     c = cmap([0.5, np.nan], alpha=0.5)
@@ -1377,6 +1449,125 @@ def test_norm_deepcopy():
     norm = mcolors.Normalize()
     norm.vmin = 0.0002
     norm2 = copy.deepcopy(norm)
-    assert isinstance(norm2._scale, mscale.LinearScale)
+    assert norm2._scale is None
     assert norm2.vmin == norm.vmin
-    assert norm2._scale is not norm._scale
+
+
+def test_norm_callback():
+    increment = unittest.mock.Mock(return_value=None)
+
+    norm = mcolors.Normalize()
+    norm.callbacks.connect('changed', increment)
+    # Haven't updated anything, so call count should be 0
+    assert increment.call_count == 0
+
+    # Now change vmin and vmax to test callbacks
+    norm.vmin = 1
+    assert increment.call_count == 1
+    norm.vmax = 5
+    assert increment.call_count == 2
+    # callback shouldn't be called if setting to the same value
+    norm.vmin = 1
+    assert increment.call_count == 2
+    norm.vmax = 5
+    assert increment.call_count == 2
+
+
+def test_scalarmappable_norm_update():
+    norm = mcolors.Normalize()
+    sm = matplotlib.cm.ScalarMappable(norm=norm, cmap='plasma')
+    # sm doesn't have a stale attribute at first, set it to False
+    sm.stale = False
+    # The mappable should be stale after updating vmin/vmax
+    norm.vmin = 5
+    assert sm.stale
+    sm.stale = False
+    norm.vmax = 5
+    assert sm.stale
+    sm.stale = False
+    norm.clip = True
+    assert sm.stale
+    # change to the CenteredNorm and TwoSlopeNorm to test those
+    # Also make sure that updating the norm directly and with
+    # set_norm both update the Norm callback
+    norm = mcolors.CenteredNorm()
+    sm.norm = norm
+    sm.stale = False
+    norm.vcenter = 1
+    assert sm.stale
+    norm = mcolors.TwoSlopeNorm(vcenter=0, vmin=-1, vmax=1)
+    sm.set_norm(norm)
+    sm.stale = False
+    norm.vcenter = 1
+    assert sm.stale
+
+
+@check_figures_equal()
+def test_norm_update_figs(fig_test, fig_ref):
+    ax_ref = fig_ref.add_subplot()
+    ax_test = fig_test.add_subplot()
+
+    z = np.arange(100).reshape((10, 10))
+    ax_ref.imshow(z, norm=mcolors.Normalize(10, 90))
+
+    # Create the norm beforehand with different limits and then update
+    # after adding to the plot
+    norm = mcolors.Normalize(0, 1)
+    ax_test.imshow(z, norm=norm)
+    # Force initial draw to make sure it isn't already stale
+    fig_test.canvas.draw()
+    norm.vmin, norm.vmax = 10, 90
+
+
+def test_make_norm_from_scale_name():
+    logitnorm = mcolors.make_norm_from_scale(
+        mscale.LogitScale, mcolors.Normalize)
+    assert logitnorm.__name__ == logitnorm.__qualname__ == "LogitScaleNorm"
+
+
+def test_color_sequences():
+    # basic access
+    assert plt.color_sequences is matplotlib.color_sequences  # same registry
+    assert list(plt.color_sequences) == [
+        'tab10', 'tab20', 'tab20b', 'tab20c', 'Pastel1', 'Pastel2', 'Paired',
+        'Accent', 'Dark2', 'Set1', 'Set2', 'Set3']
+    assert len(plt.color_sequences['tab10']) == 10
+    assert len(plt.color_sequences['tab20']) == 20
+
+    tab_colors = [
+        'tab:blue', 'tab:orange', 'tab:green', 'tab:red', 'tab:purple',
+        'tab:brown', 'tab:pink', 'tab:gray', 'tab:olive', 'tab:cyan']
+    for seq_color, tab_color in zip(plt.color_sequences['tab10'], tab_colors):
+        assert mcolors.same_color(seq_color, tab_color)
+
+    # registering
+    with pytest.raises(ValueError, match="reserved name"):
+        plt.color_sequences.register('tab10', ['r', 'g', 'b'])
+    with pytest.raises(ValueError, match="not a valid color specification"):
+        plt.color_sequences.register('invalid', ['not a color'])
+
+    rgb_colors = ['r', 'g', 'b']
+    plt.color_sequences.register('rgb', rgb_colors)
+    assert plt.color_sequences['rgb'] == ['r', 'g', 'b']
+    # should not affect the registered sequence because input is copied
+    rgb_colors.append('c')
+    assert plt.color_sequences['rgb'] == ['r', 'g', 'b']
+    # should not affect the registered sequence because returned list is a copy
+    plt.color_sequences['rgb'].append('c')
+    assert plt.color_sequences['rgb'] == ['r', 'g', 'b']
+
+    # unregister
+    plt.color_sequences.unregister('rgb')
+    with pytest.raises(KeyError):
+        plt.color_sequences['rgb']  # rgb is gone
+    plt.color_sequences.unregister('rgb')  # multiple unregisters are ok
+    with pytest.raises(ValueError, match="Cannot unregister builtin"):
+        plt.color_sequences.unregister('tab10')
+
+
+def test_cm_set_cmap_error():
+    sm = cm.ScalarMappable()
+    # Pick a name we are pretty sure will never be a colormap name
+    bad_cmap = 'AardvarksAreAwkward'
+    with pytest.raises(ValueError, match=bad_cmap):
+        sm.set_cmap(bad_cmap)
diff --git a/lib/matplotlib/tests/test_compare_images.py b/lib/matplotlib/tests/test_compare_images.py
index 95173a8860a1..6023f3d05468 100644
--- a/lib/matplotlib/tests/test_compare_images.py
+++ b/lib/matplotlib/tests/test_compare_images.py
@@ -4,7 +4,7 @@
 import pytest
 from pytest import approx
 
-from matplotlib.testing.compare import compare_images, make_test_filename
+from matplotlib.testing.compare import compare_images
 from matplotlib.testing.decorators import _image_directories
 
 
@@ -42,7 +42,8 @@
         # Now test the reverse comparison.
         ('all128.png', 'all127.png', 0, 1),
     ])
-def test_image_comparison_expect_rms(im1, im2, tol, expect_rms):
+def test_image_comparison_expect_rms(im1, im2, tol, expect_rms, tmp_path,
+                                     monkeypatch):
     """
     Compare two images, expecting a particular RMS error.
 
@@ -54,16 +55,16 @@ def test_image_comparison_expect_rms(im1, im2, tol, expect_rms):
     succeed if compare_images succeeds. Otherwise, the test will succeed if
     compare_images fails and returns an RMS error almost equal to this value.
     """
+    # Change the working directory using monkeypatch to use a temporary
+    # test specific directory
+    monkeypatch.chdir(tmp_path)
     baseline_dir, result_dir = map(Path, _image_directories(lambda: "dummy"))
-    # Copy both "baseline" and "test" image to result_dir, so that 1)
-    # compare_images writes the diff to result_dir, rather than to the source
-    # tree and 2) the baseline image doesn't appear missing to triage_tests.py.
-    result_im1 = make_test_filename(result_dir / im1, "expected")
-    shutil.copyfile(baseline_dir / im1, result_im1)
+    # Copy "test" image to result_dir, so that compare_images writes
+    # the diff to result_dir, rather than to the source tree
     result_im2 = result_dir / im1
     shutil.copyfile(baseline_dir / im2, result_im2)
     results = compare_images(
-        result_im1, result_im2, tol=tol, in_decorator=True)
+        baseline_dir / im1, result_im2, tol=tol, in_decorator=True)
 
     if expect_rms is None:
         assert results is None
diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
index 67474628e7bf..64906b74c3ff 100644
--- a/lib/matplotlib/tests/test_constrainedlayout.py
+++ b/lib/matplotlib/tests/test_constrainedlayout.py
@@ -1,11 +1,11 @@
 import numpy as np
 import pytest
 
+import matplotlib as mpl
 from matplotlib.testing.decorators import image_comparison
 import matplotlib.pyplot as plt
-import matplotlib.gridspec as gridspec
 import matplotlib.transforms as mtransforms
-from matplotlib import ticker, rcParams
+from matplotlib import gridspec, ticker
 
 
 def example_plot(ax, fontsize=12, nodec=False):
@@ -16,8 +16,8 @@ def example_plot(ax, fontsize=12, nodec=False):
         ax.set_ylabel('y-label', fontsize=fontsize)
         ax.set_title('Title', fontsize=fontsize)
     else:
-        ax.set_xticklabels('')
-        ax.set_yticklabels('')
+        ax.set_xticklabels([])
+        ax.set_yticklabels([])
 
 
 def example_pcolor(ax, fontsize=12):
@@ -36,7 +36,7 @@ def example_pcolor(ax, fontsize=12):
 @image_comparison(['constrained_layout1.png'])
 def test_constrained_layout1():
     """Test constrained_layout for a single subplot"""
-    fig = plt.figure(constrained_layout=True)
+    fig = plt.figure(layout="constrained")
     ax = fig.add_subplot()
     example_plot(ax, fontsize=24)
 
@@ -44,7 +44,7 @@ def test_constrained_layout1():
 @image_comparison(['constrained_layout2.png'])
 def test_constrained_layout2():
     """Test constrained_layout for 2x2 subplots"""
-    fig, axs = plt.subplots(2, 2, constrained_layout=True)
+    fig, axs = plt.subplots(2, 2, layout="constrained")
     for ax in axs.flat:
         example_plot(ax, fontsize=24)
 
@@ -52,10 +52,8 @@ def test_constrained_layout2():
 @image_comparison(['constrained_layout3.png'])
 def test_constrained_layout3():
     """Test constrained_layout for colorbars with subplots"""
-    # Remove this line when this test image is regenerated.
-    plt.rcParams['pcolormesh.snap'] = False
 
-    fig, axs = plt.subplots(2, 2, constrained_layout=True)
+    fig, axs = plt.subplots(2, 2, layout="constrained")
     for nn, ax in enumerate(axs.flat):
         pcm = example_pcolor(ax, fontsize=24)
         if nn == 3:
@@ -68,10 +66,8 @@ def test_constrained_layout3():
 @image_comparison(['constrained_layout4.png'])
 def test_constrained_layout4():
     """Test constrained_layout for a single colorbar with subplots"""
-    # Remove this line when this test image is regenerated.
-    plt.rcParams['pcolormesh.snap'] = False
 
-    fig, axs = plt.subplots(2, 2, constrained_layout=True)
+    fig, axs = plt.subplots(2, 2, layout="constrained")
     for ax in axs.flat:
         pcm = example_pcolor(ax, fontsize=24)
     fig.colorbar(pcm, ax=axs, pad=0.01, shrink=0.6)
@@ -83,10 +79,8 @@ def test_constrained_layout5():
     Test constrained_layout for a single colorbar with subplots,
     colorbar bottom
     """
-    # Remove this line when this test image is regenerated.
-    plt.rcParams['pcolormesh.snap'] = False
 
-    fig, axs = plt.subplots(2, 2, constrained_layout=True)
+    fig, axs = plt.subplots(2, 2, layout="constrained")
     for ax in axs.flat:
         pcm = example_pcolor(ax, fontsize=24)
     fig.colorbar(pcm, ax=axs,
@@ -100,7 +94,7 @@ def test_constrained_layout6():
     # Remove this line when this test image is regenerated.
     plt.rcParams['pcolormesh.snap'] = False
 
-    fig = plt.figure(constrained_layout=True)
+    fig = plt.figure(layout="constrained")
     gs = fig.add_gridspec(1, 2, figure=fig)
     gsl = gs[0].subgridspec(2, 2)
     gsr = gs[1].subgridspec(1, 2)
@@ -121,29 +115,47 @@ def test_constrained_layout6():
                  ticks=ticker.MaxNLocator(nbins=5))
 
 
+def test_identical_subgridspec():
+
+    fig = plt.figure(constrained_layout=True)
+
+    GS = fig.add_gridspec(2, 1)
+
+    GSA = GS[0].subgridspec(1, 3)
+    GSB = GS[1].subgridspec(1, 3)
+
+    axa = []
+    axb = []
+    for i in range(3):
+        axa += [fig.add_subplot(GSA[i])]
+        axb += [fig.add_subplot(GSB[i])]
+
+    fig.draw_without_rendering()
+    # check first row above second
+    assert axa[0].get_position().y0 > axb[0].get_position().y1
+
+
 def test_constrained_layout7():
     """Test for proper warning if fig not set in GridSpec"""
     with pytest.warns(
         UserWarning, match=('There are no gridspecs with layoutgrids. '
                             'Possibly did not call parent GridSpec with '
                             'the "figure" keyword')):
-        fig = plt.figure(constrained_layout=True)
+        fig = plt.figure(layout="constrained")
         gs = gridspec.GridSpec(1, 2)
         gsl = gridspec.GridSpecFromSubplotSpec(2, 2, gs[0])
         gsr = gridspec.GridSpecFromSubplotSpec(1, 2, gs[1])
         for gs in gsl:
             fig.add_subplot(gs)
         # need to trigger a draw to get warning
-        fig.draw(fig.canvas.get_renderer())
+        fig.draw_without_rendering()
 
 
 @image_comparison(['constrained_layout8.png'])
 def test_constrained_layout8():
     """Test for gridspecs that are not completely full"""
-    # Remove this line when this test image is regenerated.
-    plt.rcParams['pcolormesh.snap'] = False
 
-    fig = plt.figure(figsize=(10, 5), constrained_layout=True)
+    fig = plt.figure(figsize=(10, 5), layout="constrained")
     gs = gridspec.GridSpec(3, 5, figure=fig)
     axs = []
     for j in [0, 1]:
@@ -154,7 +166,7 @@ def test_constrained_layout8():
         for i in ilist:
             ax = fig.add_subplot(gs[j, i])
             axs += [ax]
-            pcm = example_pcolor(ax, fontsize=9)
+            example_pcolor(ax, fontsize=9)
             if i > 0:
                 ax.set_ylabel('')
             if j < 1:
@@ -170,10 +182,8 @@ def test_constrained_layout8():
 @image_comparison(['constrained_layout9.png'])
 def test_constrained_layout9():
     """Test for handling suptitle and for sharex and sharey"""
-    # Remove this line when this test image is regenerated.
-    plt.rcParams['pcolormesh.snap'] = False
 
-    fig, axs = plt.subplots(2, 2, constrained_layout=True,
+    fig, axs = plt.subplots(2, 2, layout="constrained",
                             sharex=False, sharey=False)
     for ax in axs.flat:
         pcm = example_pcolor(ax, fontsize=24)
@@ -187,7 +197,7 @@ def test_constrained_layout9():
 @image_comparison(['constrained_layout10.png'])
 def test_constrained_layout10():
     """Test for handling legend outside axis"""
-    fig, axs = plt.subplots(2, 2, constrained_layout=True)
+    fig, axs = plt.subplots(2, 2, layout="constrained")
     for ax in axs.flat:
         ax.plot(np.arange(12), label='This is a label')
     ax.legend(loc='center left', bbox_to_anchor=(0.8, 0.5))
@@ -196,10 +206,8 @@ def test_constrained_layout10():
 @image_comparison(['constrained_layout11.png'])
 def test_constrained_layout11():
     """Test for multiple nested gridspecs"""
-    # Remove this line when this test image is regenerated.
-    plt.rcParams['pcolormesh.snap'] = False
 
-    fig = plt.figure(constrained_layout=True, figsize=(13, 3))
+    fig = plt.figure(layout="constrained", figsize=(13, 3))
     gs0 = gridspec.GridSpec(1, 2, figure=fig)
     gsl = gridspec.GridSpecFromSubplotSpec(1, 2, gs0[0])
     gsl0 = gridspec.GridSpecFromSubplotSpec(2, 2, gsl[1])
@@ -218,10 +226,8 @@ def test_constrained_layout11():
 @image_comparison(['constrained_layout11rat.png'])
 def test_constrained_layout11rat():
     """Test for multiple nested gridspecs with width_ratios"""
-    # Remove this line when this test image is regenerated.
-    plt.rcParams['pcolormesh.snap'] = False
 
-    fig = plt.figure(constrained_layout=True, figsize=(10, 3))
+    fig = plt.figure(layout="constrained", figsize=(10, 3))
     gs0 = gridspec.GridSpec(1, 2, figure=fig, width_ratios=[6, 1])
     gsl = gridspec.GridSpecFromSubplotSpec(1, 2, gs0[0])
     gsl0 = gridspec.GridSpecFromSubplotSpec(2, 2, gsl[1], height_ratios=[2, 1])
@@ -240,7 +246,7 @@ def test_constrained_layout11rat():
 @image_comparison(['constrained_layout12.png'])
 def test_constrained_layout12():
     """Test that very unbalanced labeling still works."""
-    fig = plt.figure(constrained_layout=True, figsize=(6, 8))
+    fig = plt.figure(layout="constrained", figsize=(6, 8))
 
     gs0 = gridspec.GridSpec(6, 2, figure=fig)
 
@@ -262,27 +268,23 @@ def test_constrained_layout12():
 @image_comparison(['constrained_layout13.png'], tol=2.e-2)
 def test_constrained_layout13():
     """Test that padding works."""
-    # Remove this line when this test image is regenerated.
-    plt.rcParams['pcolormesh.snap'] = False
-
-    fig, axs = plt.subplots(2, 2, constrained_layout=True)
+    fig, axs = plt.subplots(2, 2, layout="constrained")
     for ax in axs.flat:
         pcm = example_pcolor(ax, fontsize=12)
         fig.colorbar(pcm, ax=ax, shrink=0.6, aspect=20., pad=0.02)
-    fig.set_constrained_layout_pads(w_pad=24./72., h_pad=24./72.)
+    with pytest.raises(TypeError):
+        fig.get_layout_engine().set(wpad=1, hpad=2)
+    fig.get_layout_engine().set(w_pad=24./72., h_pad=24./72.)
 
 
 @image_comparison(['constrained_layout14.png'])
 def test_constrained_layout14():
     """Test that padding works."""
-    # Remove this line when this test image is regenerated.
-    plt.rcParams['pcolormesh.snap'] = False
-
-    fig, axs = plt.subplots(2, 2, constrained_layout=True)
+    fig, axs = plt.subplots(2, 2, layout="constrained")
     for ax in axs.flat:
         pcm = example_pcolor(ax, fontsize=12)
         fig.colorbar(pcm, ax=ax, shrink=0.6, aspect=20., pad=0.02)
-    fig.set_constrained_layout_pads(
+    fig.get_layout_engine().set(
             w_pad=3./72., h_pad=3./72.,
             hspace=0.2, wspace=0.2)
 
@@ -290,7 +292,7 @@ def test_constrained_layout14():
 @image_comparison(['constrained_layout15.png'])
 def test_constrained_layout15():
     """Test that rcparams work."""
-    rcParams['figure.constrained_layout.use'] = True
+    mpl.rcParams['figure.constrained_layout.use'] = True
     fig, axs = plt.subplots(2, 2)
     for ax in axs.flat:
         example_plot(ax, fontsize=12)
@@ -299,7 +301,7 @@ def test_constrained_layout15():
 @image_comparison(['constrained_layout16.png'])
 def test_constrained_layout16():
     """Test ax.set_position."""
-    fig, ax = plt.subplots(constrained_layout=True)
+    fig, ax = plt.subplots(layout="constrained")
     example_plot(ax, fontsize=12)
     ax2 = fig.add_axes([0.2, 0.2, 0.4, 0.4])
 
@@ -307,7 +309,7 @@ def test_constrained_layout16():
 @image_comparison(['constrained_layout17.png'])
 def test_constrained_layout17():
     """Test uneven gridspecs"""
-    fig = plt.figure(constrained_layout=True)
+    fig = plt.figure(layout="constrained")
     gs = gridspec.GridSpec(3, 3, figure=fig)
 
     ax1 = fig.add_subplot(gs[0, 0])
@@ -323,23 +325,23 @@ def test_constrained_layout17():
 
 def test_constrained_layout18():
     """Test twinx"""
-    fig, ax = plt.subplots(constrained_layout=True)
+    fig, ax = plt.subplots(layout="constrained")
     ax2 = ax.twinx()
     example_plot(ax)
     example_plot(ax2, fontsize=24)
-    fig.canvas.draw()
+    fig.draw_without_rendering()
     assert all(ax.get_position().extents == ax2.get_position().extents)
 
 
 def test_constrained_layout19():
     """Test twiny"""
-    fig, ax = plt.subplots(constrained_layout=True)
+    fig, ax = plt.subplots(layout="constrained")
     ax2 = ax.twiny()
     example_plot(ax)
     example_plot(ax2, fontsize=24)
     ax2.set_title('')
     ax.set_title('')
-    fig.canvas.draw()
+    fig.draw_without_rendering()
     assert all(ax.get_position().extents == ax2.get_position().extents)
 
 
@@ -356,14 +358,14 @@ def test_constrained_layout20():
 
 def test_constrained_layout21():
     """#11035: repeated calls to suptitle should not alter the layout"""
-    fig, ax = plt.subplots(constrained_layout=True)
+    fig, ax = plt.subplots(layout="constrained")
 
     fig.suptitle("Suptitle0")
-    fig.canvas.draw()
+    fig.draw_without_rendering()
     extents0 = np.copy(ax.get_position().extents)
 
     fig.suptitle("Suptitle1")
-    fig.canvas.draw()
+    fig.draw_without_rendering()
     extents1 = np.copy(ax.get_position().extents)
 
     np.testing.assert_allclose(extents0, extents1)
@@ -371,13 +373,13 @@ def test_constrained_layout21():
 
 def test_constrained_layout22():
     """#11035: suptitle should not be include in CL if manually positioned"""
-    fig, ax = plt.subplots(constrained_layout=True)
+    fig, ax = plt.subplots(layout="constrained")
 
-    fig.canvas.draw()
+    fig.draw_without_rendering()
     extents0 = np.copy(ax.get_position().extents)
 
     fig.suptitle("Suptitle", y=0.5)
-    fig.canvas.draw()
+    fig.draw_without_rendering()
     extents1 = np.copy(ax.get_position().extents)
 
     np.testing.assert_allclose(extents0, extents1)
@@ -390,7 +392,7 @@ def test_constrained_layout23():
     """
 
     for i in range(2):
-        fig = plt.figure(constrained_layout=True, clear=True, num="123")
+        fig = plt.figure(layout="constrained", clear=True, num="123")
         gs = fig.add_gridspec(1, 2)
         sub = gs[0].subgridspec(2, 2)
         fig.suptitle("Suptitle{}".format(i))
@@ -406,7 +408,7 @@ def test_colorbar_location():
     # Remove this line when this test image is regenerated.
     plt.rcParams['pcolormesh.snap'] = False
 
-    fig, axs = plt.subplots(4, 5, constrained_layout=True)
+    fig, axs = plt.subplots(4, 5, layout="constrained")
     for ax in axs.flat:
         pcm = example_pcolor(ax)
         ax.set_xlabel('')
@@ -420,12 +422,12 @@ def test_colorbar_location():
 
 
 def test_hidden_axes():
-    # test that if we make an axes not visible that constrained_layout
+    # test that if we make an Axes not visible that constrained_layout
     # still works.  Note the axes still takes space in the layout
     # (as does a gridspec slot that is empty)
-    fig, axs = plt.subplots(2, 2, constrained_layout=True)
+    fig, axs = plt.subplots(2, 2, layout="constrained")
     axs[0, 1].set_visible(False)
-    fig.canvas.draw()
+    fig.draw_without_rendering()
     extents1 = np.copy(axs[0, 0].get_position().extents)
 
     np.testing.assert_allclose(
@@ -434,7 +436,7 @@ def test_hidden_axes():
 
 def test_colorbar_align():
     for location in ['right', 'left', 'top', 'bottom']:
-        fig, axs = plt.subplots(2, 2, constrained_layout=True)
+        fig, axs = plt.subplots(2, 2, layout="constrained")
         cbs = []
         for nn, ax in enumerate(axs.flat):
             ax.tick_params(direction='in')
@@ -446,12 +448,12 @@ def test_colorbar_align():
             if nn != 1:
                 cb.ax.xaxis.set_ticks([])
                 cb.ax.yaxis.set_ticks([])
-                ax.set_xticklabels('')
-                ax.set_yticklabels('')
-        fig.set_constrained_layout_pads(w_pad=4 / 72, h_pad=4 / 72, hspace=0.1,
-                                        wspace=0.1)
+                ax.set_xticklabels([])
+                ax.set_yticklabels([])
+        fig.get_layout_engine().set(w_pad=4 / 72, h_pad=4 / 72,
+                                    hspace=0.1, wspace=0.1)
 
-        fig.canvas.draw()
+        fig.draw_without_rendering()
         if location in ['left', 'right']:
             np.testing.assert_allclose(cbs[0].ax.get_position().x0,
                                        cbs[2].ax.get_position().x0)
@@ -464,10 +466,9 @@ def test_colorbar_align():
                                        cbs[3].ax.get_position().y0)
 
 
-@image_comparison(['test_colorbars_no_overlapV.png'],
-                  remove_text=False, style='mpl20')
+@image_comparison(['test_colorbars_no_overlapV.png'], style='mpl20')
 def test_colorbars_no_overlapV():
-    fig = plt.figure(figsize=(2, 4), constrained_layout=True)
+    fig = plt.figure(figsize=(2, 4), layout="constrained")
     axs = fig.subplots(2, 1, sharex=True, sharey=True)
     for ax in axs:
         ax.yaxis.set_major_formatter(ticker.NullFormatter())
@@ -477,10 +478,9 @@ def test_colorbars_no_overlapV():
     fig.suptitle("foo")
 
 
-@image_comparison(['test_colorbars_no_overlapH.png'],
-                  remove_text=False, style='mpl20')
+@image_comparison(['test_colorbars_no_overlapH.png'], style='mpl20')
 def test_colorbars_no_overlapH():
-    fig = plt.figure(figsize=(4, 2), constrained_layout=True)
+    fig = plt.figure(figsize=(4, 2), layout="constrained")
     fig.suptitle("foo")
     axs = fig.subplots(1, 2, sharex=True, sharey=True)
     for ax in axs:
@@ -491,17 +491,17 @@ def test_colorbars_no_overlapH():
 
 
 def test_manually_set_position():
-    fig, axs = plt.subplots(1, 2, constrained_layout=True)
+    fig, axs = plt.subplots(1, 2, layout="constrained")
     axs[0].set_position([0.2, 0.2, 0.3, 0.3])
-    fig.canvas.draw()
+    fig.draw_without_rendering()
     pp = axs[0].get_position()
     np.testing.assert_allclose(pp, [[0.2, 0.2], [0.5, 0.5]])
 
-    fig, axs = plt.subplots(1, 2, constrained_layout=True)
+    fig, axs = plt.subplots(1, 2, layout="constrained")
     axs[0].set_position([0.2, 0.2, 0.3, 0.3])
     pc = axs[0].pcolormesh(np.random.rand(20, 20))
     fig.colorbar(pc, ax=axs[0])
-    fig.canvas.draw()
+    fig.draw_without_rendering()
     pp = axs[0].get_position()
     np.testing.assert_allclose(pp, [[0.2, 0.2], [0.44, 0.5]])
 
@@ -510,7 +510,7 @@ def test_manually_set_position():
                   remove_text=True, style='mpl20',
                   savefig_kwarg={'bbox_inches': 'tight'})
 def test_bboxtight():
-    fig, ax = plt.subplots(constrained_layout=True)
+    fig, ax = plt.subplots(layout="constrained")
     ax.set_aspect(1.)
 
 
@@ -519,7 +519,7 @@ def test_bboxtight():
                   savefig_kwarg={'bbox_inches':
                                  mtransforms.Bbox([[0.5, 0], [2.5, 2]])})
 def test_bbox():
-    fig, ax = plt.subplots(constrained_layout=True)
+    fig, ax = plt.subplots(layout="constrained")
     ax.set_aspect(1.)
 
 
@@ -530,7 +530,7 @@ def test_align_labels():
     negative numbers, drives the non-negative subplots' y labels off
     the edge of the plot
     """
-    fig, (ax3, ax1, ax2) = plt.subplots(3, 1, constrained_layout=True,
+    fig, (ax3, ax1, ax2) = plt.subplots(3, 1, layout="constrained",
                                         figsize=(6.4, 8),
                                         gridspec_kw={"height_ratios": (1, 1,
                                                                        0.7)})
@@ -546,7 +546,7 @@ def test_align_labels():
 
     fig.align_ylabels(axs=(ax3, ax1, ax2))
 
-    fig.canvas.draw()
+    fig.draw_without_rendering()
     after_align = [ax1.yaxis.label.get_window_extent(),
                    ax2.yaxis.label.get_window_extent(),
                    ax3.yaxis.label.get_window_extent()]
@@ -555,3 +555,115 @@ def test_align_labels():
                                after_align[1].x0, rtol=0, atol=1e-05)
     # ensure labels do not go off the edge
     assert after_align[0].x0 >= 1
+
+
+def test_suplabels():
+    fig, ax = plt.subplots(layout="constrained")
+    fig.draw_without_rendering()
+    pos0 = ax.get_tightbbox(fig.canvas.get_renderer())
+    fig.supxlabel('Boo')
+    fig.supylabel('Booy')
+    fig.draw_without_rendering()
+    pos = ax.get_tightbbox(fig.canvas.get_renderer())
+    assert pos.y0 > pos0.y0 + 10.0
+    assert pos.x0 > pos0.x0 + 10.0
+
+    fig, ax = plt.subplots(layout="constrained")
+    fig.draw_without_rendering()
+    pos0 = ax.get_tightbbox(fig.canvas.get_renderer())
+    # check that specifying x (y) doesn't ruin the layout
+    fig.supxlabel('Boo', x=0.5)
+    fig.supylabel('Boo', y=0.5)
+    fig.draw_without_rendering()
+    pos = ax.get_tightbbox(fig.canvas.get_renderer())
+    assert pos.y0 > pos0.y0 + 10.0
+    assert pos.x0 > pos0.x0 + 10.0
+
+
+def test_gridspec_addressing():
+    fig = plt.figure()
+    gs = fig.add_gridspec(3, 3)
+    sp = fig.add_subplot(gs[0:, 1:])
+    fig.draw_without_rendering()
+
+
+def test_discouraged_api():
+    fig, ax = plt.subplots(constrained_layout=True)
+    fig.draw_without_rendering()
+
+    with pytest.warns(PendingDeprecationWarning,
+                      match="will be deprecated"):
+        fig, ax = plt.subplots()
+        fig.set_constrained_layout(True)
+        fig.draw_without_rendering()
+
+    with pytest.warns(PendingDeprecationWarning,
+                      match="will be deprecated"):
+        fig, ax = plt.subplots()
+        fig.set_constrained_layout({'w_pad': 0.02, 'h_pad': 0.02})
+        fig.draw_without_rendering()
+
+
+def test_kwargs():
+    fig, ax = plt.subplots(constrained_layout={'h_pad': 0.02})
+    fig.draw_without_rendering()
+
+
+def test_rect():
+    fig, ax = plt.subplots(layout='constrained')
+    fig.get_layout_engine().set(rect=[0, 0, 0.5, 0.5])
+    fig.draw_without_rendering()
+    ppos = ax.get_position()
+    assert ppos.x1 < 0.5
+    assert ppos.y1 < 0.5
+
+    fig, ax = plt.subplots(layout='constrained')
+    fig.get_layout_engine().set(rect=[0.2, 0.2, 0.3, 0.3])
+    fig.draw_without_rendering()
+    ppos = ax.get_position()
+    assert ppos.x1 < 0.5
+    assert ppos.y1 < 0.5
+    assert ppos.x0 > 0.2
+    assert ppos.y0 > 0.2
+
+
+def test_compressed1():
+    fig, axs = plt.subplots(3, 2, layout='compressed',
+                            sharex=True, sharey=True)
+    for ax in axs.flat:
+        pc = ax.imshow(np.random.randn(20, 20))
+
+    fig.colorbar(pc, ax=axs)
+    fig.draw_without_rendering()
+
+    pos = axs[0, 0].get_position()
+    np.testing.assert_allclose(pos.x0, 0.2344, atol=1e-3)
+    pos = axs[0, 1].get_position()
+    np.testing.assert_allclose(pos.x1, 0.7024, atol=1e-3)
+
+    # wider than tall
+    fig, axs = plt.subplots(2, 3, layout='compressed',
+                            sharex=True, sharey=True, figsize=(5, 4))
+    for ax in axs.flat:
+        pc = ax.imshow(np.random.randn(20, 20))
+
+    fig.colorbar(pc, ax=axs)
+    fig.draw_without_rendering()
+
+    pos = axs[0, 0].get_position()
+    np.testing.assert_allclose(pos.x0, 0.06195, atol=1e-3)
+    np.testing.assert_allclose(pos.y1, 0.8537, atol=1e-3)
+    pos = axs[1, 2].get_position()
+    np.testing.assert_allclose(pos.x1, 0.8618, atol=1e-3)
+    np.testing.assert_allclose(pos.y0, 0.1934, atol=1e-3)
+
+
+@pytest.mark.parametrize('arg, state', [
+    (True, True),
+    (False, False),
+    ({}, True),
+    ({'rect': None}, True)
+])
+def test_set_constrained_layout(arg, state):
+    fig, ax = plt.subplots(constrained_layout=arg)
+    assert fig.get_constrained_layout() is state
diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
index 58c15c9b34fa..8bf77f0d5470 100644
--- a/lib/matplotlib/tests/test_contour.py
+++ b/lib/matplotlib/tests/test_contour.py
@@ -2,12 +2,14 @@
 import platform
 import re
 
+import contourpy
 import numpy as np
-from numpy.testing import assert_array_almost_equal
+from numpy.testing import (
+    assert_array_almost_equal, assert_array_almost_equal_nulp)
 import matplotlib as mpl
 from matplotlib.testing.decorators import image_comparison
 from matplotlib import pyplot as plt, rc_context
-from matplotlib.colors import LogNorm
+from matplotlib.colors import LogNorm, same_color
 import pytest
 
 
@@ -153,8 +155,7 @@ def test_given_colors_levels_and_extends():
         plt.colorbar(c, ax=ax)
 
 
-@image_comparison(['contour_datetime_axis.png'],
-                  remove_text=False, style='mpl20')
+@image_comparison(['contour_datetime_axis.png'], style='mpl20')
 def test_contour_datetime_axis():
     fig = plt.figure()
     fig.subplots_adjust(hspace=0.4, top=0.98, bottom=.15)
@@ -244,33 +245,6 @@ def test_contourf_symmetric_locator():
     assert_array_almost_equal(cs.levels, np.linspace(-12, 12, 5))
 
 
-@pytest.mark.parametrize("args, cls, message", [
-    ((), TypeError,
-     'function takes exactly 6 arguments (0 given)'),
-    ((1, 2, 3, 4, 5, 6), ValueError,
-     'Expected 2-dimensional array, got 0'),
-    (([[0]], [[0]], [[]], None, True, 0), ValueError,
-     'x, y and z must all be 2D arrays with the same dimensions'),
-    (([[0]], [[0]], [[0]], None, True, 0), ValueError,
-     'x, y and z must all be at least 2x2 arrays'),
-    ((*[np.arange(4).reshape((2, 2))] * 3, [[0]], True, 0), ValueError,
-     'If mask is set it must be a 2D array with the same dimensions as x.'),
-])
-def test_internal_cpp_api(args, cls, message):  # Github issue 8197.
-    from matplotlib import _contour  # noqa: ensure lazy-loaded module *is* loaded.
-    with pytest.raises(cls, match=re.escape(message)):
-        mpl._contour.QuadContourGenerator(*args)
-
-
-def test_internal_cpp_api_2():
-    from matplotlib import _contour  # noqa: ensure lazy-loaded module *is* loaded.
-    arr = [[0, 1], [2, 3]]
-    qcg = mpl._contour.QuadContourGenerator(arr, arr, arr, None, True, 0)
-    with pytest.raises(
-            ValueError, match=r'filled contour levels must be increasing'):
-        qcg.create_filled_contour(1, 0)
-
-
 def test_circular_contour_warning():
     # Check that almost circular contours don't throw a warning
     x, y = np.meshgrid(np.linspace(-2, 2, 4), np.linspace(-2, 2, 4))
@@ -305,8 +279,12 @@ def test_clabel_zorder(use_clabeltext, contour_zorder, clabel_zorder):
         assert clabel.get_zorder() == expected_clabel_zorder
 
 
+# tol because ticks happen to fall on pixel boundaries so small
+# floating point changes in tick location flip which pixel gets
+# the tick.
 @image_comparison(['contour_log_extension.png'],
-                  remove_text=True, style='mpl20')
+                  remove_text=True, style='mpl20',
+                  tol=1.444)
 def test_contourf_log_extension():
     # Remove this line when this test image is regenerated.
     plt.rcParams['pcolormesh.snap'] = False
@@ -336,10 +314,8 @@ def test_contourf_log_extension():
     cb = plt.colorbar(c1, ax=ax1)
     assert cb.ax.get_ylim() == (1e-8, 1e10)
     cb = plt.colorbar(c2, ax=ax2)
-    assert cb.ax.get_ylim() == (1e-4, 1e6)
+    assert_array_almost_equal_nulp(cb.ax.get_ylim(), np.array((1e-4, 1e6)))
     cb = plt.colorbar(c3, ax=ax3)
-    assert_array_almost_equal(
-        cb.ax.get_ylim(), [3.162277660168379e-05, 3162277.660168383], 2)
 
 
 @image_comparison(['contour_addlines.png'],
@@ -398,3 +374,312 @@ def test_contour_linewidth(
 def test_label_nonagg():
     # This should not crash even if the canvas doesn't have a get_renderer().
     plt.clabel(plt.contour([[1, 2], [3, 4]]))
+
+
+@image_comparison(baseline_images=['contour_closed_line_loop'],
+                  extensions=['png'], remove_text=True)
+def test_contour_closed_line_loop():
+    # github issue 19568.
+    z = [[0, 0, 0], [0, 2, 0], [0, 0, 0], [2, 1, 2]]
+
+    fig, ax = plt.subplots(figsize=(2, 2))
+    ax.contour(z, [0.5], linewidths=[20], alpha=0.7)
+    ax.set_xlim(-0.1, 2.1)
+    ax.set_ylim(-0.1, 3.1)
+
+
+def test_quadcontourset_reuse():
+    # If QuadContourSet returned from one contour(f) call is passed as first
+    # argument to another the underlying C++ contour generator will be reused.
+    x, y = np.meshgrid([0.0, 1.0], [0.0, 1.0])
+    z = x + y
+    fig, ax = plt.subplots()
+    qcs1 = ax.contourf(x, y, z)
+    qcs2 = ax.contour(x, y, z)
+    assert qcs2._contour_generator != qcs1._contour_generator
+    qcs3 = ax.contour(qcs1, z)
+    assert qcs3._contour_generator == qcs1._contour_generator
+
+
+@image_comparison(baseline_images=['contour_manual'],
+                  extensions=['png'], remove_text=True)
+def test_contour_manual():
+    # Manually specifying contour lines/polygons to plot.
+    from matplotlib.contour import ContourSet
+
+    fig, ax = plt.subplots(figsize=(4, 4))
+    cmap = 'viridis'
+
+    # Segments only (no 'kind' codes).
+    lines0 = [[[2, 0], [1, 2], [1, 3]]]  # Single line.
+    lines1 = [[[3, 0], [3, 2]], [[3, 3], [3, 4]]]  # Two lines.
+    filled01 = [[[0, 0], [0, 4], [1, 3], [1, 2], [2, 0]]]
+    filled12 = [[[2, 0], [3, 0], [3, 2], [1, 3], [1, 2]],  # Two polygons.
+                [[1, 4], [3, 4], [3, 3]]]
+    ContourSet(ax, [0, 1, 2], [filled01, filled12], filled=True, cmap=cmap)
+    ContourSet(ax, [1, 2], [lines0, lines1], linewidths=3, colors=['r', 'k'])
+
+    # Segments and kind codes (1 = MOVETO, 2 = LINETO, 79 = CLOSEPOLY).
+    segs = [[[4, 0], [7, 0], [7, 3], [4, 3], [4, 0],
+             [5, 1], [5, 2], [6, 2], [6, 1], [5, 1]]]
+    kinds = [[1, 2, 2, 2, 79, 1, 2, 2, 2, 79]]  # Polygon containing hole.
+    ContourSet(ax, [2, 3], [segs], [kinds], filled=True, cmap=cmap)
+    ContourSet(ax, [2], [segs], [kinds], colors='k', linewidths=3)
+
+
+@image_comparison(baseline_images=['contour_line_start_on_corner_edge'],
+                  extensions=['png'], remove_text=True)
+def test_contour_line_start_on_corner_edge():
+    fig, ax = plt.subplots(figsize=(6, 5))
+
+    x, y = np.meshgrid([0, 1, 2, 3, 4], [0, 1, 2])
+    z = 1.2 - (x - 2)**2 + (y - 1)**2
+    mask = np.zeros_like(z, dtype=bool)
+    mask[1, 1] = mask[1, 3] = True
+    z = np.ma.array(z, mask=mask)
+
+    filled = ax.contourf(x, y, z, corner_mask=True)
+    cbar = fig.colorbar(filled)
+    lines = ax.contour(x, y, z, corner_mask=True, colors='k')
+    cbar.add_lines(lines)
+
+
+def test_find_nearest_contour():
+    xy = np.indices((15, 15))
+    img = np.exp(-np.pi * (np.sum((xy - 5)**2, 0)/5.**2))
+    cs = plt.contour(img, 10)
+
+    nearest_contour = cs.find_nearest_contour(1, 1, pixel=False)
+    expected_nearest = (1, 0, 33, 1.965966, 1.965966, 1.866183)
+    assert_array_almost_equal(nearest_contour, expected_nearest)
+
+    nearest_contour = cs.find_nearest_contour(8, 1, pixel=False)
+    expected_nearest = (1, 0, 5, 7.550173, 1.587542, 0.547550)
+    assert_array_almost_equal(nearest_contour, expected_nearest)
+
+    nearest_contour = cs.find_nearest_contour(2, 5, pixel=False)
+    expected_nearest = (3, 0, 21, 1.884384, 5.023335, 0.013911)
+    assert_array_almost_equal(nearest_contour, expected_nearest)
+
+    nearest_contour = cs.find_nearest_contour(2, 5,
+                                              indices=(5, 7),
+                                              pixel=False)
+    expected_nearest = (5, 0, 16, 2.628202, 5.0, 0.394638)
+    assert_array_almost_equal(nearest_contour, expected_nearest)
+
+
+def test_find_nearest_contour_no_filled():
+    xy = np.indices((15, 15))
+    img = np.exp(-np.pi * (np.sum((xy - 5)**2, 0)/5.**2))
+    cs = plt.contourf(img, 10)
+
+    with pytest.raises(ValueError,
+                       match="Method does not support filled contours."):
+        cs.find_nearest_contour(1, 1, pixel=False)
+
+    with pytest.raises(ValueError,
+                       match="Method does not support filled contours."):
+        cs.find_nearest_contour(1, 10, indices=(5, 7), pixel=False)
+
+    with pytest.raises(ValueError,
+                       match="Method does not support filled contours."):
+        cs.find_nearest_contour(2, 5, indices=(2, 7), pixel=True)
+
+
+@mpl.style.context("default")
+def test_contour_autolabel_beyond_powerlimits():
+    ax = plt.figure().add_subplot()
+    cs = plt.contour(np.geomspace(1e-6, 1e-4, 100).reshape(10, 10),
+                     levels=[.25e-5, 1e-5, 4e-5])
+    ax.clabel(cs)
+    # Currently, the exponent is missing, but that may be fixed in the future.
+    assert {text.get_text() for text in ax.texts} == {"0.25", "1.00", "4.00"}
+
+
+def test_contourf_legend_elements():
+    from matplotlib.patches import Rectangle
+    x = np.arange(1, 10)
+    y = x.reshape(-1, 1)
+    h = x * y
+
+    cs = plt.contourf(h, levels=[10, 30, 50],
+                      colors=['#FFFF00', '#FF00FF', '#00FFFF'],
+                      extend='both')
+    cs.cmap.set_over('red')
+    cs.cmap.set_under('blue')
+    cs.changed()
+    artists, labels = cs.legend_elements()
+    assert labels == ['$x \\leq -1e+250s$',
+                      '$10.0 < x \\leq 30.0$',
+                      '$30.0 < x \\leq 50.0$',
+                      '$x > 1e+250s$']
+    expected_colors = ('blue', '#FFFF00', '#FF00FF', 'red')
+    assert all(isinstance(a, Rectangle) for a in artists)
+    assert all(same_color(a.get_facecolor(), c)
+               for a, c in zip(artists, expected_colors))
+
+
+def test_contour_legend_elements():
+    from matplotlib.collections import LineCollection
+    x = np.arange(1, 10)
+    y = x.reshape(-1, 1)
+    h = x * y
+
+    colors = ['blue', '#00FF00', 'red']
+    cs = plt.contour(h, levels=[10, 30, 50],
+                     colors=colors,
+                     extend='both')
+    artists, labels = cs.legend_elements()
+    assert labels == ['$x = 10.0$', '$x = 30.0$', '$x = 50.0$']
+    assert all(isinstance(a, LineCollection) for a in artists)
+    assert all(same_color(a.get_color(), c)
+               for a, c in zip(artists, colors))
+
+
+@pytest.mark.parametrize(
+    "algorithm, klass",
+    [('mpl2005', contourpy.Mpl2005ContourGenerator),
+     ('mpl2014', contourpy.Mpl2014ContourGenerator),
+     ('serial', contourpy.SerialContourGenerator),
+     ('threaded', contourpy.ThreadedContourGenerator),
+     ('invalid', None)])
+def test_algorithm_name(algorithm, klass):
+    z = np.array([[1.0, 2.0], [3.0, 4.0]])
+    if klass is not None:
+        cs = plt.contourf(z, algorithm=algorithm)
+        assert isinstance(cs._contour_generator, klass)
+    else:
+        with pytest.raises(ValueError):
+            plt.contourf(z, algorithm=algorithm)
+
+
+@pytest.mark.parametrize(
+    "algorithm", ['mpl2005', 'mpl2014', 'serial', 'threaded'])
+def test_algorithm_supports_corner_mask(algorithm):
+    z = np.array([[1.0, 2.0], [3.0, 4.0]])
+
+    # All algorithms support corner_mask=False
+    plt.contourf(z, algorithm=algorithm, corner_mask=False)
+
+    # Only some algorithms support corner_mask=True
+    if algorithm != 'mpl2005':
+        plt.contourf(z, algorithm=algorithm, corner_mask=True)
+    else:
+        with pytest.raises(ValueError):
+            plt.contourf(z, algorithm=algorithm, corner_mask=True)
+
+
+@image_comparison(baseline_images=['contour_all_algorithms'],
+                  extensions=['png'], remove_text=True)
+def test_all_algorithms():
+    algorithms = ['mpl2005', 'mpl2014', 'serial', 'threaded']
+
+    rng = np.random.default_rng(2981)
+    x, y = np.meshgrid(np.linspace(0.0, 1.0, 10), np.linspace(0.0, 1.0, 6))
+    z = np.sin(15*x)*np.cos(10*y) + rng.normal(scale=0.5, size=(6, 10))
+    mask = np.zeros_like(z, dtype=bool)
+    mask[3, 7] = True
+    z = np.ma.array(z, mask=mask)
+
+    _, axs = plt.subplots(2, 2)
+    for ax, algorithm in zip(axs.ravel(), algorithms):
+        ax.contourf(x, y, z, algorithm=algorithm)
+        ax.contour(x, y, z, algorithm=algorithm, colors='k')
+        ax.set_title(algorithm)
+
+
+def test_subfigure_clabel():
+    # Smoke test for gh#23173
+    delta = 0.025
+    x = np.arange(-3.0, 3.0, delta)
+    y = np.arange(-2.0, 2.0, delta)
+    X, Y = np.meshgrid(x, y)
+    Z1 = np.exp(-(X**2) - Y**2)
+    Z2 = np.exp(-((X - 1) ** 2) - (Y - 1) ** 2)
+    Z = (Z1 - Z2) * 2
+
+    fig = plt.figure()
+    figs = fig.subfigures(nrows=1, ncols=2)
+
+    for f in figs:
+        ax = f.subplots()
+        CS = ax.contour(X, Y, Z)
+        ax.clabel(CS, inline=True, fontsize=10)
+        ax.set_title("Simplest default with labels")
+
+
+@pytest.mark.parametrize(
+    "style", ['solid', 'dashed', 'dashdot', 'dotted'])
+def test_linestyles(style):
+    delta = 0.025
+    x = np.arange(-3.0, 3.0, delta)
+    y = np.arange(-2.0, 2.0, delta)
+    X, Y = np.meshgrid(x, y)
+    Z1 = np.exp(-X**2 - Y**2)
+    Z2 = np.exp(-(X - 1)**2 - (Y - 1)**2)
+    Z = (Z1 - Z2) * 2
+
+    # Positive contour defaults to solid
+    fig1, ax1 = plt.subplots()
+    CS1 = ax1.contour(X, Y, Z, 6, colors='k')
+    ax1.clabel(CS1, fontsize=9, inline=True)
+    ax1.set_title('Single color - positive contours solid (default)')
+    assert CS1.linestyles is None  # default
+
+    # Change linestyles using linestyles kwarg
+    fig2, ax2 = plt.subplots()
+    CS2 = ax2.contour(X, Y, Z, 6, colors='k', linestyles=style)
+    ax2.clabel(CS2, fontsize=9, inline=True)
+    ax2.set_title(f'Single color - positive contours {style}')
+    assert CS2.linestyles == style
+
+    # Ensure linestyles do not change when negative_linestyles is defined
+    fig3, ax3 = plt.subplots()
+    CS3 = ax3.contour(X, Y, Z, 6, colors='k', linestyles=style,
+                      negative_linestyles='dashdot')
+    ax3.clabel(CS3, fontsize=9, inline=True)
+    ax3.set_title(f'Single color - positive contours {style}')
+    assert CS3.linestyles == style
+
+
+@pytest.mark.parametrize(
+    "style", ['solid', 'dashed', 'dashdot', 'dotted'])
+def test_negative_linestyles(style):
+    delta = 0.025
+    x = np.arange(-3.0, 3.0, delta)
+    y = np.arange(-2.0, 2.0, delta)
+    X, Y = np.meshgrid(x, y)
+    Z1 = np.exp(-X**2 - Y**2)
+    Z2 = np.exp(-(X - 1)**2 - (Y - 1)**2)
+    Z = (Z1 - Z2) * 2
+
+    # Negative contour defaults to dashed
+    fig1, ax1 = plt.subplots()
+    CS1 = ax1.contour(X, Y, Z, 6, colors='k')
+    ax1.clabel(CS1, fontsize=9, inline=True)
+    ax1.set_title('Single color - negative contours dashed (default)')
+    assert CS1.negative_linestyles == 'dashed'  # default
+
+    # Change negative_linestyles using rcParams
+    plt.rcParams['contour.negative_linestyle'] = style
+    fig2, ax2 = plt.subplots()
+    CS2 = ax2.contour(X, Y, Z, 6, colors='k')
+    ax2.clabel(CS2, fontsize=9, inline=True)
+    ax2.set_title(f'Single color - negative contours {style}'
+                   '(using rcParams)')
+    assert CS2.negative_linestyles == style
+
+    # Change negative_linestyles using negative_linestyles kwarg
+    fig3, ax3 = plt.subplots()
+    CS3 = ax3.contour(X, Y, Z, 6, colors='k', negative_linestyles=style)
+    ax3.clabel(CS3, fontsize=9, inline=True)
+    ax3.set_title(f'Single color - negative contours {style}')
+    assert CS3.negative_linestyles == style
+
+    # Ensure negative_linestyles do not change when linestyles is defined
+    fig4, ax4 = plt.subplots()
+    CS4 = ax4.contour(X, Y, Z, 6, colors='k', linestyles='dashdot',
+                      negative_linestyles=style)
+    ax4.clabel(CS4, fontsize=9, inline=True)
+    ax4.set_title(f'Single color - negative contours {style}')
+    assert CS4.negative_linestyles == style
diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py
index 8c821c0da510..fc5eed7f2856 100644
--- a/lib/matplotlib/tests/test_dates.py
+++ b/lib/matplotlib/tests/test_dates.py
@@ -6,7 +6,7 @@
 import numpy as np
 import pytest
 
-from matplotlib import rc_context
+from matplotlib import _api, rc_context, style
 import matplotlib.dates as mdates
 import matplotlib.pyplot as plt
 from matplotlib.testing.decorators import image_comparison
@@ -69,13 +69,55 @@ def test_date2num_NaT_scalar(units):
     assert np.isnan(tmpl)
 
 
-@image_comparison(['date_empty.png'])
 def test_date_empty():
     # make sure we do the right thing when told to plot dates even
     # if no date data has been presented, cf
     # http://sourceforge.net/tracker/?func=detail&aid=2850075&group_id=80706&atid=560720
     fig, ax = plt.subplots()
     ax.xaxis_date()
+    fig.draw_without_rendering()
+    np.testing.assert_allclose(ax.get_xlim(),
+                               [mdates.date2num(np.datetime64('1970-01-01')),
+                                mdates.date2num(np.datetime64('1970-01-02'))])
+
+    mdates._reset_epoch_test_example()
+    mdates.set_epoch('0000-12-31')
+    fig, ax = plt.subplots()
+    ax.xaxis_date()
+    fig.draw_without_rendering()
+    np.testing.assert_allclose(ax.get_xlim(),
+                               [mdates.date2num(np.datetime64('1970-01-01')),
+                                mdates.date2num(np.datetime64('1970-01-02'))])
+    mdates._reset_epoch_test_example()
+
+
+def test_date_not_empty():
+    fig = plt.figure()
+    ax = fig.add_subplot()
+
+    ax.plot([50, 70], [1, 2])
+    ax.xaxis.axis_date()
+    np.testing.assert_allclose(ax.get_xlim(), [50, 70])
+
+
+def test_axhline():
+    # make sure that axhline doesn't set the xlimits...
+    fig, ax = plt.subplots()
+    ax.axhline(1.5)
+    ax.plot([np.datetime64('2016-01-01'), np.datetime64('2016-01-02')], [1, 2])
+    np.testing.assert_allclose(ax.get_xlim(),
+                               [mdates.date2num(np.datetime64('2016-01-01')),
+                                mdates.date2num(np.datetime64('2016-01-02'))])
+
+    mdates._reset_epoch_test_example()
+    mdates.set_epoch('0000-12-31')
+    fig, ax = plt.subplots()
+    ax.axhline(1.5)
+    ax.plot([np.datetime64('2016-01-01'), np.datetime64('2016-01-02')], [1, 2])
+    np.testing.assert_allclose(ax.get_xlim(),
+                               [mdates.date2num(np.datetime64('2016-01-01')),
+                                mdates.date2num(np.datetime64('2016-01-02'))])
+    mdates._reset_epoch_test_example()
 
 
 @image_comparison(['date_axhspan.png'])
@@ -139,8 +181,8 @@ def test_too_many_date_ticks(caplog):
     with pytest.warns(UserWarning) as rec:
         ax.set_xlim((t0, tf), auto=True)
         assert len(rec) == 1
-        assert \
-            'Attempting to set identical left == right' in str(rec[0].message)
+        assert ('Attempting to set identical low and high xlims'
+                in str(rec[0].message))
     ax.plot([], [])
     ax.xaxis.set_major_locator(mdates.DayLocator())
     v = ax.xaxis.get_major_locator()()
@@ -196,6 +238,18 @@ def test_RRuleLocator_dayrange():
     # On success, no overflow error shall be thrown
 
 
+def test_RRuleLocator_close_minmax():
+    # if d1 and d2 are very close together, rrule cannot create
+    # reasonable tick intervals; ensure that this is handled properly
+    rrule = mdates.rrulewrapper(dateutil.rrule.SECONDLY, interval=5)
+    loc = mdates.RRuleLocator(rrule)
+    d1 = datetime.datetime(year=2020, month=1, day=1)
+    d2 = datetime.datetime(year=2020, month=1, day=1, microsecond=1)
+    expected = ['2020-01-01 00:00:00+00:00',
+                '2020-01-01 00:00:00.000001+00:00']
+    assert list(map(str, mdates.num2date(loc.tick_values(d1, d2)))) == expected
+
+
 @image_comparison(['DateFormatter_fractionalSeconds.png'])
 def test_DateFormatter():
     import matplotlib.testing.jpl_units as units
@@ -268,19 +322,23 @@ def callable_formatting_function(dates, _):
 
 @pytest.mark.parametrize('delta, expected', [
     (datetime.timedelta(weeks=52 * 200),
-     [r'$\mathdefault{%d}$' % (year,) for year in range(1990, 2171, 20)]),
+     [r'$\mathdefault{%d}$' % year for year in range(1990, 2171, 20)]),
     (datetime.timedelta(days=30),
-     [r'$\mathdefault{Jan %02d 1990}$' % (day,) for day in range(1, 32, 3)]),
+     [r'$\mathdefault{1990{-}01{-}%02d}$' % day for day in range(1, 32, 3)]),
     (datetime.timedelta(hours=20),
-     [r'$\mathdefault{%02d:00:00}$' % (hour,) for hour in range(0, 21, 2)]),
+     [r'$\mathdefault{01{-}01\;%02d}$' % hour for hour in range(0, 21, 2)]),
+    (datetime.timedelta(minutes=10),
+     [r'$\mathdefault{01\;00{:}%02d}$' % minu for minu in range(0, 11)]),
 ])
 def test_date_formatter_usetex(delta, expected):
+    style.use("default")
+
     d1 = datetime.datetime(1990, 1, 1)
     d2 = d1 + delta
 
     locator = mdates.AutoDateLocator(interval_multiples=False)
     locator.create_dummy_axis()
-    locator.set_view_interval(mdates.date2num(d1), mdates.date2num(d2))
+    locator.axis.set_view_interval(mdates.date2num(d1), mdates.date2num(d2))
 
     formatter = mdates.AutoDateFormatter(locator, usetex=True)
     assert [formatter(loc) for loc in locator()] == expected
@@ -298,9 +356,13 @@ def test_drange():
     # dates from an half open interval [start, end)
     assert len(mdates.drange(start, end, delta)) == 24
 
+    # Same if interval ends slightly earlier
+    end = end - datetime.timedelta(microseconds=1)
+    assert len(mdates.drange(start, end, delta)) == 24
+
     # if end is a little bit later, we expect the range to contain one element
     # more
-    end = end + datetime.timedelta(microseconds=1)
+    end = end + datetime.timedelta(microseconds=2)
     assert len(mdates.drange(start, end, delta)) == 25
 
     # reset end
@@ -319,8 +381,7 @@ def test_auto_date_locator():
     def _create_auto_date_locator(date1, date2):
         locator = mdates.AutoDateLocator(interval_multiples=False)
         locator.create_dummy_axis()
-        locator.set_view_interval(mdates.date2num(date1),
-                                  mdates.date2num(date2))
+        locator.axis.set_view_interval(*mdates.date2num([date1, date2]))
         return locator
 
     d1 = datetime.datetime(1990, 1, 1)
@@ -385,14 +446,22 @@ def _create_auto_date_locator(date1, date2):
         locator = _create_auto_date_locator(d1, d2)
         assert list(map(str, mdates.num2date(locator()))) == expected
 
+    locator = mdates.AutoDateLocator(interval_multiples=False)
+    assert locator.maxticks == {0: 11, 1: 12, 3: 11, 4: 12, 5: 11, 6: 11, 7: 8}
+
+    locator = mdates.AutoDateLocator(maxticks={dateutil.rrule.MONTHLY: 5})
+    assert locator.maxticks == {0: 11, 1: 5, 3: 11, 4: 12, 5: 11, 6: 11, 7: 8}
+
+    locator = mdates.AutoDateLocator(maxticks=5)
+    assert locator.maxticks == {0: 5, 1: 5, 3: 5, 4: 5, 5: 5, 6: 5, 7: 5}
+
 
 @_new_epoch_decorator
 def test_auto_date_locator_intmult():
     def _create_auto_date_locator(date1, date2):
         locator = mdates.AutoDateLocator(interval_multiples=True)
         locator.create_dummy_axis()
-        locator.set_view_interval(mdates.date2num(date1),
-                                  mdates.date2num(date2))
+        locator.axis.set_view_interval(*mdates.date2num([date1, date2]))
         return locator
 
     results = ([datetime.timedelta(weeks=52 * 200),
@@ -547,23 +616,49 @@ def test_concise_formatter_show_offset(t_delta, expected):
     assert formatter.get_offset() == expected
 
 
+def test_offset_changes():
+    fig, ax = plt.subplots()
+
+    d1 = datetime.datetime(1997, 1, 1)
+    d2 = d1 + datetime.timedelta(weeks=520)
+
+    locator = mdates.AutoDateLocator()
+    formatter = mdates.ConciseDateFormatter(locator)
+    ax.xaxis.set_major_locator(locator)
+    ax.xaxis.set_major_formatter(formatter)
+
+    ax.plot([d1, d2], [0, 0])
+    fig.draw_without_rendering()
+    assert formatter.get_offset() == ''
+    ax.set_xlim(d1, d1 + datetime.timedelta(weeks=3))
+    fig.draw_without_rendering()
+    assert formatter.get_offset() == '1997-Jan'
+    ax.set_xlim(d1 + datetime.timedelta(weeks=7),
+                d1 + datetime.timedelta(weeks=30))
+    fig.draw_without_rendering()
+    assert formatter.get_offset() == '1997'
+    ax.set_xlim(d1, d1 + datetime.timedelta(weeks=520))
+    fig.draw_without_rendering()
+    assert formatter.get_offset() == ''
+
+
 @pytest.mark.parametrize('t_delta, expected', [
     (datetime.timedelta(weeks=52 * 200),
      ['$\\mathdefault{%d}$' % (t, ) for t in range(1980, 2201, 20)]),
     (datetime.timedelta(days=40),
-     ['$\\mathdefault{Jan}$', '$\\mathdefault{05}$', '$\\mathdefault{09}$',
+     ['Jan', '$\\mathdefault{05}$', '$\\mathdefault{09}$',
       '$\\mathdefault{13}$', '$\\mathdefault{17}$', '$\\mathdefault{21}$',
-      '$\\mathdefault{25}$', '$\\mathdefault{29}$', '$\\mathdefault{Feb}$',
+      '$\\mathdefault{25}$', '$\\mathdefault{29}$', 'Feb',
       '$\\mathdefault{05}$', '$\\mathdefault{09}$']),
     (datetime.timedelta(hours=40),
-     ['$\\mathdefault{Jan{-}01}$', '$\\mathdefault{04:00}$',
-      '$\\mathdefault{08:00}$', '$\\mathdefault{12:00}$',
-      '$\\mathdefault{16:00}$', '$\\mathdefault{20:00}$',
-      '$\\mathdefault{Jan{-}02}$', '$\\mathdefault{04:00}$',
-      '$\\mathdefault{08:00}$', '$\\mathdefault{12:00}$',
-      '$\\mathdefault{16:00}$']),
+     ['Jan$\\mathdefault{{-}01}$', '$\\mathdefault{04{:}00}$',
+      '$\\mathdefault{08{:}00}$', '$\\mathdefault{12{:}00}$',
+      '$\\mathdefault{16{:}00}$', '$\\mathdefault{20{:}00}$',
+      'Jan$\\mathdefault{{-}02}$', '$\\mathdefault{04{:}00}$',
+      '$\\mathdefault{08{:}00}$', '$\\mathdefault{12{:}00}$',
+      '$\\mathdefault{16{:}00}$']),
     (datetime.timedelta(seconds=2),
-     ['$\\mathdefault{59.5}$', '$\\mathdefault{00:00}$',
+     ['$\\mathdefault{59.5}$', '$\\mathdefault{00{:}00}$',
       '$\\mathdefault{00.5}$', '$\\mathdefault{01.0}$',
       '$\\mathdefault{01.5}$', '$\\mathdefault{02.0}$',
       '$\\mathdefault{02.5}$']),
@@ -574,7 +669,7 @@ def test_concise_formatter_usetex(t_delta, expected):
 
     locator = mdates.AutoDateLocator(interval_multiples=True)
     locator.create_dummy_axis()
-    locator.set_view_interval(mdates.date2num(d1), mdates.date2num(d2))
+    locator.axis.set_view_interval(mdates.date2num(d1), mdates.date2num(d2))
 
     formatter = mdates.ConciseDateFormatter(locator, usetex=True)
     assert formatter.format_ticks(locator()) == expected
@@ -732,8 +827,7 @@ def test_auto_date_locator_intmult_tz():
     def _create_auto_date_locator(date1, date2, tz):
         locator = mdates.AutoDateLocator(interval_multiples=True, tz=tz)
         locator.create_dummy_axis()
-        locator.set_view_interval(mdates.date2num(date1),
-                                  mdates.date2num(date2))
+        locator.axis.set_view_interval(*mdates.date2num([date1, date2]))
         return locator
 
     results = ([datetime.timedelta(weeks=52*200),
@@ -822,7 +916,7 @@ def _test_date2num_dst(date_range, tz_convert):
     # Interval is 0b0.0000011 days, to prevent float rounding issues
     dtstart = datetime.datetime(2014, 3, 30, 0, 0, tzinfo=UTC)
     interval = datetime.timedelta(minutes=33, seconds=45)
-    interval_days = 0.0234375   # 2025 / 86400 seconds
+    interval_days = interval.seconds / 86400
     N = 8
 
     dt_utc = date_range(start=dtstart, freq=interval, periods=N)
@@ -892,7 +986,7 @@ def date_range(start, freq, periods):
 
         return [dtstart + (i * freq) for i in range(periods)]
 
-    # Define a tz_convert function that converts a list to a new time zone.
+    # Define a tz_convert function that converts a list to a new timezone.
     def tz_convert(dt_list, tzinfo):
         return [d.astimezone(tzinfo) for d in dt_list]
 
@@ -930,6 +1024,20 @@ def attach_tz(dt, zi):
 
     _test_rrulewrapper(attach_tz, dateutil.tz.gettz)
 
+    SYD = dateutil.tz.gettz('Australia/Sydney')
+    dtstart = datetime.datetime(2017, 4, 1, 0)
+    dtend = datetime.datetime(2017, 4, 4, 0)
+    rule = mdates.rrulewrapper(freq=dateutil.rrule.DAILY, dtstart=dtstart,
+                               tzinfo=SYD, until=dtend)
+    assert rule.after(dtstart) == datetime.datetime(2017, 4, 2, 0, 0,
+                                                    tzinfo=SYD)
+    assert rule.before(dtend) == datetime.datetime(2017, 4, 3, 0, 0,
+                                                   tzinfo=SYD)
+
+    # Test parts of __getattr__
+    assert rule._base_tzinfo == SYD
+    assert rule._interval == 1
+
 
 @pytest.mark.pytz
 def test_rrulewrapper_pytz():
@@ -951,8 +1059,8 @@ def test_yearlocator_pytz():
          + datetime.timedelta(i) for i in range(2000)]
     locator = mdates.AutoDateLocator(interval_multiples=True, tz=tz)
     locator.create_dummy_axis()
-    locator.set_view_interval(mdates.date2num(x[0])-1.0,
-                              mdates.date2num(x[-1])+1.0)
+    locator.axis.set_view_interval(mdates.date2num(x[0])-1.0,
+                                   mdates.date2num(x[-1])+1.0)
     t = np.array([733408.208333, 733773.208333, 734138.208333,
                   734503.208333, 734869.208333, 735234.208333, 735599.208333])
     # convert to new epoch from old...
@@ -964,6 +1072,54 @@ def test_yearlocator_pytz():
                 '2014-01-01 00:00:00-05:00', '2015-01-01 00:00:00-05:00']
     st = list(map(str, mdates.num2date(locator(), tz=tz)))
     assert st == expected
+    assert np.allclose(locator.tick_values(x[0], x[1]), np.array(
+        [14610.20833333, 14610.33333333, 14610.45833333, 14610.58333333,
+         14610.70833333, 14610.83333333, 14610.95833333, 14611.08333333,
+         14611.20833333]))
+    assert np.allclose(locator.get_locator(x[1], x[0]).tick_values(x[0], x[1]),
+                       np.array(
+        [14610.20833333, 14610.33333333, 14610.45833333, 14610.58333333,
+         14610.70833333, 14610.83333333, 14610.95833333, 14611.08333333,
+         14611.20833333]))
+
+
+def test_YearLocator():
+    def _create_year_locator(date1, date2, **kwargs):
+        locator = mdates.YearLocator(**kwargs)
+        locator.create_dummy_axis()
+        locator.axis.set_view_interval(mdates.date2num(date1),
+                                       mdates.date2num(date2))
+        return locator
+
+    d1 = datetime.datetime(1990, 1, 1)
+    results = ([datetime.timedelta(weeks=52 * 200),
+                {'base': 20, 'month': 1, 'day': 1},
+                ['1980-01-01 00:00:00+00:00', '2000-01-01 00:00:00+00:00',
+                 '2020-01-01 00:00:00+00:00', '2040-01-01 00:00:00+00:00',
+                 '2060-01-01 00:00:00+00:00', '2080-01-01 00:00:00+00:00',
+                 '2100-01-01 00:00:00+00:00', '2120-01-01 00:00:00+00:00',
+                 '2140-01-01 00:00:00+00:00', '2160-01-01 00:00:00+00:00',
+                 '2180-01-01 00:00:00+00:00', '2200-01-01 00:00:00+00:00']
+                ],
+               [datetime.timedelta(weeks=52 * 200),
+                {'base': 20, 'month': 5, 'day': 16},
+                ['1980-05-16 00:00:00+00:00', '2000-05-16 00:00:00+00:00',
+                 '2020-05-16 00:00:00+00:00', '2040-05-16 00:00:00+00:00',
+                 '2060-05-16 00:00:00+00:00', '2080-05-16 00:00:00+00:00',
+                 '2100-05-16 00:00:00+00:00', '2120-05-16 00:00:00+00:00',
+                 '2140-05-16 00:00:00+00:00', '2160-05-16 00:00:00+00:00',
+                 '2180-05-16 00:00:00+00:00', '2200-05-16 00:00:00+00:00']
+                ],
+               [datetime.timedelta(weeks=52 * 5),
+                {'base': 20, 'month': 9, 'day': 25},
+                ['1980-09-25 00:00:00+00:00', '2000-09-25 00:00:00+00:00']
+                ],
+               )
+
+    for delta, arguments, expected in results:
+        d2 = d1 + delta
+        locator = _create_year_locator(d1, d2, **arguments)
+        assert list(map(str, mdates.num2date(locator()))) == expected
 
 
 def test_DayLocator():
@@ -980,7 +1136,7 @@ def test_DayLocator():
 
 def test_tz_utc():
     dt = datetime.datetime(1970, 1, 1, tzinfo=mdates.UTC)
-    dt.tzname()
+    assert dt.tzname() == 'UTC'
 
 
 @pytest.mark.parametrize("x, tdelta",
@@ -1004,12 +1160,15 @@ def test_datetime64_in_list():
 def test_change_epoch():
     date = np.datetime64('2000-01-01')
 
+    # use private method to clear the epoch and allow it to be set...
+    mdates._reset_epoch_test_example()
+    mdates.get_epoch()  # Set default.
+
     with pytest.raises(RuntimeError):
         # this should fail here because there is a sentinel on the epoch
         # if the epoch has been used then it cannot be set.
         mdates.set_epoch('0000-01-01')
 
-    # use private method to clear the epoch and allow it to be set...
     mdates._reset_epoch_test_example()
     mdates.set_epoch('1970-01-01')
     dt = (date - np.datetime64('1970-01-01')).astype('datetime64[D]')
@@ -1035,9 +1194,9 @@ def test_warn_notintervals():
     locator = mdates.AutoDateLocator(interval_multiples=False)
     locator.intervald[3] = [2]
     locator.create_dummy_axis()
-    locator.set_view_interval(mdates.date2num(dates[0]),
-                              mdates.date2num(dates[-1]))
-    with pytest.warns(UserWarning, match="AutoDateLocator was unable") as rec:
+    locator.axis.set_view_interval(mdates.date2num(dates[0]),
+                                   mdates.date2num(dates[-1]))
+    with pytest.warns(UserWarning, match="AutoDateLocator was unable"):
         locs = locator()
 
 
@@ -1058,7 +1217,7 @@ def test_change_converter():
     fig.canvas.draw()
     assert ax.get_xticklabels()[0].get_text() == 'Jan 01 2020'
     assert ax.get_xticklabels()[1].get_text() == 'Jan 15 2020'
-    with pytest.warns(UserWarning) as rec:
+    with pytest.raises(ValueError):
         plt.rcParams['date.converter'] = 'boo'
 
 
@@ -1082,15 +1241,16 @@ def test_change_interval_multiples():
 
 
 def test_epoch2num():
-    mdates._reset_epoch_test_example()
-    mdates.set_epoch('0000-12-31')
-    assert mdates.epoch2num(86400) == 719164.0
-    assert mdates.num2epoch(719165.0) == 86400 * 2
-    # set back to the default
-    mdates._reset_epoch_test_example()
-    mdates.set_epoch('1970-01-01T00:00:00')
-    assert mdates.epoch2num(86400) == 1.0
-    assert mdates.num2epoch(2.0) == 86400 * 2
+    with _api.suppress_matplotlib_deprecation_warning():
+        mdates._reset_epoch_test_example()
+        mdates.set_epoch('0000-12-31')
+        assert mdates.epoch2num(86400) == 719164.0
+        assert mdates.num2epoch(719165.0) == 86400 * 2
+        # set back to the default
+        mdates._reset_epoch_test_example()
+        mdates.set_epoch('1970-01-01T00:00:00')
+        assert mdates.epoch2num(86400) == 1.0
+        assert mdates.num2epoch(2.0) == 86400 * 2
 
 
 def test_julian2num():
@@ -1105,3 +1265,129 @@ def test_julian2num():
     mdates.set_epoch('1970-01-01T00:00:00')
     assert mdates.julian2num(2440588.5) == 1.0
     assert mdates.num2julian(2.0) == 2440589.5
+
+
+def test_DateLocator():
+    locator = mdates.DateLocator()
+    # Test nonsingular
+    assert locator.nonsingular(0, np.inf) == (0, 1)
+    assert locator.nonsingular(0, 1) == (0, 1)
+    assert locator.nonsingular(1, 0) == (0, 1)
+    assert locator.nonsingular(0, 0) == (-2, 2)
+    locator.create_dummy_axis()
+    # default values
+    assert locator.datalim_to_dt() == (
+        datetime.datetime(1970, 1, 1, 0, 0, tzinfo=datetime.timezone.utc),
+        datetime.datetime(1970, 1, 2, 0, 0, tzinfo=datetime.timezone.utc))
+
+    # Check default is UTC
+    assert locator.tz == mdates.UTC
+    tz_str = 'Iceland'
+    iceland_tz = dateutil.tz.gettz(tz_str)
+    # Check not Iceland
+    assert locator.tz != iceland_tz
+    # Set it to to Iceland
+    locator.set_tzinfo('Iceland')
+    # Check now it is Iceland
+    assert locator.tz == iceland_tz
+    locator.create_dummy_axis()
+    locator.axis.set_data_interval(*mdates.date2num(["2022-01-10",
+                                                     "2022-01-08"]))
+    assert locator.datalim_to_dt() == (
+        datetime.datetime(2022, 1, 8, 0, 0, tzinfo=iceland_tz),
+        datetime.datetime(2022, 1, 10, 0, 0, tzinfo=iceland_tz))
+
+    # Set rcParam
+    plt.rcParams['timezone'] = tz_str
+
+    # Create a new one in a similar way
+    locator = mdates.DateLocator()
+    # Check now it is Iceland
+    assert locator.tz == iceland_tz
+
+    # Test invalid tz values
+    with pytest.raises(ValueError, match="Aiceland is not a valid timezone"):
+        mdates.DateLocator(tz="Aiceland")
+    with pytest.raises(TypeError,
+                       match="tz must be string or tzinfo subclass."):
+        mdates.DateLocator(tz=1)
+
+
+def test_datestr2num():
+    assert mdates.datestr2num('2022-01-10') == 19002.0
+    dt = datetime.date(year=2022, month=1, day=10)
+    assert mdates.datestr2num('2022-01', default=dt) == 19002.0
+    assert np.all(mdates.datestr2num(
+        ['2022-01', '2022-02'], default=dt
+        ) == np.array([19002., 19033.]))
+    assert mdates.datestr2num([]).size == 0
+    assert mdates.datestr2num([], datetime.date(year=2022,
+                                                month=1, day=10)).size == 0
+
+
+@pytest.mark.parametrize('kwarg',
+                         ('formats', 'zero_formats', 'offset_formats'))
+def test_concise_formatter_exceptions(kwarg):
+    locator = mdates.AutoDateLocator()
+    kwargs = {kwarg: ['', '%Y']}
+    match = f"{kwarg} argument must be a list"
+    with pytest.raises(ValueError, match=match):
+        mdates.ConciseDateFormatter(locator, **kwargs)
+
+
+def test_concise_formatter_call():
+    locator = mdates.AutoDateLocator()
+    formatter = mdates.ConciseDateFormatter(locator)
+    assert formatter(19002.0) == '2022'
+    assert formatter.format_data_short(19002.0) == '2022-01-10 00:00:00'
+
+
+@pytest.mark.parametrize('span, expected_locator',
+                         ((0.02, mdates.MinuteLocator),
+                          (1, mdates.HourLocator),
+                          (19, mdates.DayLocator),
+                          (40, mdates.WeekdayLocator),
+                          (200, mdates.MonthLocator),
+                          (2000, mdates.YearLocator)))
+def test_date_ticker_factory(span, expected_locator):
+    with pytest.warns(_api.MatplotlibDeprecationWarning):
+        locator, _ = mdates.date_ticker_factory(span)
+        assert isinstance(locator, expected_locator)
+
+
+def test_datetime_masked():
+    # make sure that all-masked data falls back to the viewlim
+    # set in convert.axisinfo....
+    x = np.array([datetime.datetime(2017, 1, n) for n in range(1, 6)])
+    y = np.array([1, 2, 3, 4, 5])
+    m = np.ma.masked_greater(y, 0)
+
+    fig, ax = plt.subplots()
+    ax.plot(x, m)
+    assert ax.get_xlim() == (0, 1)
+
+
+@pytest.mark.parametrize('val', (-1000000, 10000000))
+def test_num2date_error(val):
+    with pytest.raises(ValueError, match=f"Date ordinal {val} converts"):
+        mdates.num2date(val)
+
+
+def test_num2date_roundoff():
+    assert mdates.num2date(100000.0000578702) == datetime.datetime(
+        2243, 10, 17, 0, 0, 4, 999980, tzinfo=datetime.timezone.utc)
+    # Slightly larger, steps of 20 microseconds
+    assert mdates.num2date(100000.0000578703) == datetime.datetime(
+        2243, 10, 17, 0, 0, 5, tzinfo=datetime.timezone.utc)
+
+
+def test_DateFormatter_settz():
+    time = mdates.date2num(datetime.datetime(2011, 1, 1, 0, 0,
+                                             tzinfo=mdates.UTC))
+    formatter = mdates.DateFormatter('%Y-%b-%d %H:%M')
+    # Default UTC
+    assert formatter(time) == '2011-Jan-01 00:00'
+
+    # Set tzinfo
+    formatter.set_tzinfo('Pacific/Kiritimati')
+    assert formatter(time) == '2011-Jan-01 14:00'
diff --git a/lib/matplotlib/tests/test_determinism.py b/lib/matplotlib/tests/test_determinism.py
index cce05f12dacd..fe0fb34e128a 100644
--- a/lib/matplotlib/tests/test_determinism.py
+++ b/lib/matplotlib/tests/test_determinism.py
@@ -11,14 +11,7 @@
 import matplotlib as mpl
 import matplotlib.testing.compare
 from matplotlib import pyplot as plt
-
-
-needs_ghostscript = pytest.mark.skipif(
-    "eps" not in mpl.testing.compare.converter,
-    reason="This test needs a ghostscript installation")
-needs_usetex = pytest.mark.skipif(
-    not mpl.checkdep_usetex(True),
-    reason="This test needs a TeX installation")
+from matplotlib.testing._markers import needs_ghostscript, needs_usetex
 
 
 def _save_figure(objects='mhi', fmt="pdf", usetex=False):
diff --git a/lib/matplotlib/tests/test_doc.py b/lib/matplotlib/tests/test_doc.py
new file mode 100644
index 000000000000..8a4df35179bc
--- /dev/null
+++ b/lib/matplotlib/tests/test_doc.py
@@ -0,0 +1,34 @@
+import pytest
+
+
+def test_sphinx_gallery_example_header():
+    """
+    We have copied EXAMPLE_HEADER and modified it to include meta keywords.
+    This test monitors that the version we have copied is still the same as
+    the EXAMPLE_HEADER in sphinx-gallery. If sphinx-gallery changes its
+    EXAMPLE_HEADER, this test will start to fail. In that case, please update
+    the monkey-patching of EXAMPLE_HEADER in conf.py.
+    """
+    gen_rst = pytest.importorskip('sphinx_gallery.gen_rst')
+
+    EXAMPLE_HEADER = """
+.. DO NOT EDIT.
+.. THIS FILE WAS AUTOMATICALLY GENERATED BY SPHINX-GALLERY.
+.. TO MAKE CHANGES, EDIT THE SOURCE PYTHON FILE:
+.. "{0}"
+.. LINE NUMBERS ARE GIVEN BELOW.
+
+.. only:: html
+
+    .. note::
+        :class: sphx-glr-download-link-note
+
+        Click :ref:`here <sphx_glr_download_{1}>`
+        to download the full example code{2}
+
+.. rst-class:: sphx-glr-example-title
+
+.. _sphx_glr_{1}:
+
+"""
+    assert gen_rst.EXAMPLE_HEADER == EXAMPLE_HEADER
diff --git a/lib/matplotlib/tests/test_dviread.py b/lib/matplotlib/tests/test_dviread.py
index d26beb02268e..7e10975f44d5 100644
--- a/lib/matplotlib/tests/test_dviread.py
+++ b/lib/matplotlib/tests/test_dviread.py
@@ -7,7 +7,7 @@
 
 
 def test_PsfontsMap(monkeypatch):
-    monkeypatch.setattr(dr, 'find_tex_file', lambda x: x)
+    monkeypatch.setattr(dr, '_find_tex_file', lambda x: x)
 
     filename = str(Path(__file__).parent / 'baseline_images/dviread/test.map')
     fontmap = dr.PsfontsMap(filename)
@@ -28,7 +28,7 @@ def test_PsfontsMap(monkeypatch):
         else:
             assert entry.filename == b'font%d.pfb' % n
         if n == 4:
-            assert entry.effects == {'slant': -0.1, 'extend': 2.2}
+            assert entry.effects == {'slant': -0.1, 'extend': 1.2}
         else:
             assert entry.effects == {}
     # Some special cases
@@ -42,10 +42,22 @@ def test_PsfontsMap(monkeypatch):
     assert entry.filename == b'font8.pfb'
     assert entry.encoding is None
     entry = fontmap[b'TeXfont9']
+    assert entry.psname == b'TeXfont9'
     assert entry.filename == b'/absolute/font9.pfb'
+    # First of duplicates only.
+    entry = fontmap[b'TeXfontA']
+    assert entry.psname == b'PSfontA1'
+    # Slant/Extend only works for T1 fonts.
+    entry = fontmap[b'TeXfontB']
+    assert entry.psname == b'PSfontB6'
+    # Subsetted TrueType must have encoding.
+    entry = fontmap[b'TeXfontC']
+    assert entry.psname == b'PSfontC3'
     # Missing font
-    with pytest.raises(KeyError, match='no-such-font'):
+    with pytest.raises(LookupError, match='no-such-font'):
         fontmap[b'no-such-font']
+    with pytest.raises(LookupError, match='%'):
+        fontmap[b'%']
 
 
 @pytest.mark.skipif(shutil.which("kpsewhich") is None,
diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
index 15f084fc1516..cc5a3b9ae2ff 100644
--- a/lib/matplotlib/tests/test_figure.py
+++ b/lib/matplotlib/tests/test_figure.py
@@ -1,29 +1,34 @@
-from contextlib import nullcontext
+import copy
 from datetime import datetime
 import io
 from pathlib import Path
+import pickle
 import platform
+from threading import Timer
 from types import SimpleNamespace
 import warnings
 
+import numpy as np
+import pytest
+from PIL import Image
+
 import matplotlib as mpl
-from matplotlib import cbook, rcParams
+from matplotlib import gridspec
 from matplotlib.testing.decorators import image_comparison, check_figures_equal
 from matplotlib.axes import Axes
-from matplotlib.figure import Figure
+from matplotlib.figure import Figure, FigureBase
+from matplotlib.layout_engine import (ConstrainedLayoutEngine,
+                                      TightLayoutEngine,
+                                      PlaceHolderLayoutEngine)
 from matplotlib.ticker import AutoMinorLocator, FixedFormatter, ScalarFormatter
 import matplotlib.pyplot as plt
 import matplotlib.dates as mdates
-import matplotlib.gridspec as gridspec
-from matplotlib.cbook import MatplotlibDeprecationWarning
-import numpy as np
-import pytest
 
 
 @image_comparison(['figure_align_labels'], extensions=['png', 'svg'],
                   tol=0 if platform.machine() == 'x86_64' else 0.01)
 def test_align_labels():
-    fig = plt.figure(tight_layout=True)
+    fig = plt.figure(layout='tight')
     gs = gridspec.GridSpec(3, 3)
 
     ax = fig.add_subplot(gs[0, :2])
@@ -61,6 +66,41 @@ def test_align_labels():
     fig.align_labels()
 
 
+def test_align_labels_stray_axes():
+    fig, axs = plt.subplots(2, 2)
+    for nn, ax in enumerate(axs.flat):
+        ax.set_xlabel('Boo')
+        ax.set_xlabel('Who')
+        ax.plot(np.arange(4)**nn, np.arange(4)**nn)
+    fig.align_ylabels()
+    fig.align_xlabels()
+    fig.draw_without_rendering()
+    xn = np.zeros(4)
+    yn = np.zeros(4)
+    for nn, ax in enumerate(axs.flat):
+        yn[nn] = ax.xaxis.label.get_position()[1]
+        xn[nn] = ax.yaxis.label.get_position()[0]
+    np.testing.assert_allclose(xn[:2], xn[2:])
+    np.testing.assert_allclose(yn[::2], yn[1::2])
+
+    fig, axs = plt.subplots(2, 2, constrained_layout=True)
+    for nn, ax in enumerate(axs.flat):
+        ax.set_xlabel('Boo')
+        ax.set_xlabel('Who')
+        pc = ax.pcolormesh(np.random.randn(10, 10))
+    fig.colorbar(pc, ax=ax)
+    fig.align_ylabels()
+    fig.align_xlabels()
+    fig.draw_without_rendering()
+    xn = np.zeros(4)
+    yn = np.zeros(4)
+    for nn, ax in enumerate(axs.flat):
+        yn[nn] = ax.xaxis.label.get_position()[1]
+        xn[nn] = ax.yaxis.label.get_position()[0]
+    np.testing.assert_allclose(xn[:2], xn[2:])
+    np.testing.assert_allclose(yn[::2], yn[1::2])
+
+
 def test_figure_label():
     # pyplot figure creation, selection, and closing with label/number/instance
     plt.close('all')
@@ -150,66 +190,30 @@ def test_figure_legend():
 def test_gca():
     fig = plt.figure()
 
-    with pytest.warns(UserWarning):
-        # empty call to add_axes() will throw deprecation warning
-        assert fig.add_axes() is None
-
+    # test that gca() picks up Axes created via add_axes()
     ax0 = fig.add_axes([0, 0, 1, 1])
-    with pytest.warns(
-            MatplotlibDeprecationWarning,
-            match=r'Calling gca\(\) with keyword arguments was deprecated'):
-        assert fig.gca(projection='rectilinear') is ax0
     assert fig.gca() is ax0
 
-    ax1 = fig.add_axes(rect=[0.1, 0.1, 0.8, 0.8])
-    with pytest.warns(
-            MatplotlibDeprecationWarning,
-            match=r'Calling gca\(\) with keyword arguments was deprecated'):
-        assert fig.gca(projection='rectilinear') is ax1
+    # test that gca() picks up Axes created via add_subplot()
+    ax1 = fig.add_subplot(111)
     assert fig.gca() is ax1
 
-    ax2 = fig.add_subplot(121, projection='polar')
-    assert fig.gca() is ax2
-    with pytest.warns(
-            MatplotlibDeprecationWarning,
-            match=r'Calling gca\(\) with keyword arguments was deprecated'):
-        assert fig.gca(polar=True) is ax2
-
-    ax3 = fig.add_subplot(122)
-    assert fig.gca() is ax3
-
-    with pytest.warns(
-            MatplotlibDeprecationWarning,
-            match=r'Calling gca\(\) with keyword arguments was deprecated'):
-        assert fig.gca(polar=True) is ax3
-    with pytest.warns(
-            MatplotlibDeprecationWarning,
-            match=r'Calling gca\(\) with keyword arguments was deprecated'):
-        assert fig.gca(polar=True) is not ax2
-    assert fig.gca().get_subplotspec().get_geometry() == (1, 2, 1, 1)
-
     # add_axes on an existing Axes should not change stored order, but will
     # make it current.
     fig.add_axes(ax0)
-    assert fig.axes == [ax0, ax1, ax2, ax3]
+    assert fig.axes == [ax0, ax1]
     assert fig.gca() is ax0
 
+    # sca() should not change stored order of Axes, which is order added.
+    fig.sca(ax0)
+    assert fig.axes == [ax0, ax1]
+
     # add_subplot on an existing Axes should not change stored order, but will
     # make it current.
-    fig.add_subplot(ax2)
-    assert fig.axes == [ax0, ax1, ax2, ax3]
-    assert fig.gca() is ax2
-
-    fig.sca(ax1)
-    with pytest.warns(
-            MatplotlibDeprecationWarning,
-            match=r'Calling gca\(\) with keyword arguments was deprecated'):
-        assert fig.gca(projection='rectilinear') is ax1
+    fig.add_subplot(ax1)
+    assert fig.axes == [ax0, ax1]
     assert fig.gca() is ax1
 
-    # sca() should not change stored order of Axes, which is order added.
-    assert fig.axes == [ax0, ax1, ax2, ax3]
-
 
 def test_add_subplot_subclass():
     fig = plt.figure()
@@ -248,14 +252,14 @@ def test_add_subplot_invalid():
     with pytest.raises(TypeError, match='takes 1 or 3 positional arguments '
                                         'but 4 were given'):
         fig.add_subplot(1, 2, 3, 4)
-    with pytest.warns(cbook.MatplotlibDeprecationWarning,
-                      match='Passing non-integers as three-element position '
-                            'specification is deprecated'):
+    with pytest.raises(ValueError,
+                       match="Number of rows must be a positive integer, "
+                             "not '2'"):
         fig.add_subplot('2', 2, 1)
-    with pytest.warns(cbook.MatplotlibDeprecationWarning,
-                      match='Passing non-integers as three-element position '
-                            'specification is deprecated'):
-        fig.add_subplot(2.0, 2, 1)
+    with pytest.raises(ValueError,
+                       match='Number of columns must be a positive integer, '
+                             'not 2.0'):
+        fig.add_subplot(2, 2.0, 1)
     _, ax = plt.subplots()
     with pytest.raises(ValueError,
                        match='The Subplot must have been created in the '
@@ -267,7 +271,7 @@ def test_add_subplot_invalid():
 def test_suptitle():
     fig, _ = plt.subplots()
     fig.suptitle('hello', color='r')
-    fig.suptitle('title', color='g', rotation='30')
+    fig.suptitle('title', color='g', rotation=30)
 
 
 def test_suptitle_fontproperties():
@@ -295,7 +299,7 @@ def test_alpha():
 
 def test_too_many_figures():
     with pytest.warns(RuntimeWarning):
-        for i in range(rcParams['figure.max_open_warning'] + 1):
+        for i in range(mpl.rcParams['figure.max_open_warning'] + 1):
             plt.figure()
 
 
@@ -312,7 +316,7 @@ def test_iterability_axes_argument():
 
     class MyAxes(Axes):
         def __init__(self, *args, myclass=None, **kwargs):
-            return Axes.__init__(self, *args, **kwargs)
+            Axes.__init__(self, *args, **kwargs)
 
     class MyClass:
 
@@ -370,7 +374,7 @@ def test_figaspect():
     assert h / w == 1
 
 
-@pytest.mark.parametrize('which', [None, 'both', 'major', 'minor'])
+@pytest.mark.parametrize('which', ['both', 'major', 'minor'])
 def test_autofmt_xdate(which):
     date = ['3 Jan 2013', '4 Jan 2013', '5 Jan 2013', '6 Jan 2013',
             '7 Jan 2013', '8 Jan 2013', '9 Jan 2013', '10 Jan 2013',
@@ -399,11 +403,9 @@ def test_autofmt_xdate(which):
             'FixedFormatter should only be used together with FixedLocator')
         ax.xaxis.set_minor_formatter(FixedFormatter(minors))
 
-    with (pytest.warns(mpl.MatplotlibDeprecationWarning) if which is None else
-          nullcontext()):
-        fig.autofmt_xdate(0.2, angle, 'right', which)
+    fig.autofmt_xdate(0.2, angle, 'right', which)
 
-    if which in ('both', 'major', None):
+    if which in ('both', 'major'):
         for label in fig.axes[0].get_xticklabels(False, 'major'):
             assert int(label.get_rotation()) == angle
 
@@ -412,14 +414,14 @@ def test_autofmt_xdate(which):
             assert int(label.get_rotation()) == angle
 
 
-@pytest.mark.style('default')
+@mpl.style.context('default')
 def test_change_dpi():
     fig = plt.figure(figsize=(4, 4))
-    fig.canvas.draw()
+    fig.draw_without_rendering()
     assert fig.canvas.renderer.height == 400
     assert fig.canvas.renderer.width == 400
     fig.dpi = 50
-    fig.canvas.draw()
+    fig.draw_without_rendering()
     assert fig.canvas.renderer.height == 200
     assert fig.canvas.renderer.width == 200
 
@@ -440,6 +442,10 @@ def test_invalid_figure_size(width, height):
 
 def test_invalid_figure_add_axes():
     fig = plt.figure()
+    with pytest.raises(TypeError,
+                       match="missing 1 required positional argument: 'rect'"):
+        fig.add_axes()
+
     with pytest.raises(ValueError):
         fig.add_axes((.1, .1, .5, np.nan))
 
@@ -483,9 +489,8 @@ def test_savefig():
 
 def test_savefig_warns():
     fig = plt.figure()
-    msg = r'savefig\(\) got unexpected keyword argument "non_existent_kwarg"'
     for format in ['png', 'pdf', 'svg', 'tif', 'jpg']:
-        with pytest.warns(cbook.MatplotlibDeprecationWarning, match=msg):
+        with pytest.raises(TypeError):
             fig.savefig(io.BytesIO(), format=format, non_existent_kwarg=True)
 
 
@@ -499,23 +504,104 @@ def test_savefig_backend():
         fig.savefig("test.png", backend="pdf")
 
 
+@pytest.mark.parametrize('backend', [
+    pytest.param('Agg', marks=[pytest.mark.backend('Agg')]),
+    pytest.param('Cairo', marks=[pytest.mark.backend('Cairo')]),
+])
+def test_savefig_pixel_ratio(backend):
+    fig, ax = plt.subplots()
+    ax.plot([1, 2, 3])
+    with io.BytesIO() as buf:
+        fig.savefig(buf, format='png')
+        ratio1 = Image.open(buf)
+        ratio1.load()
+
+    fig, ax = plt.subplots()
+    ax.plot([1, 2, 3])
+    fig.canvas._set_device_pixel_ratio(2)
+    with io.BytesIO() as buf:
+        fig.savefig(buf, format='png')
+        ratio2 = Image.open(buf)
+        ratio2.load()
+
+    assert ratio1 == ratio2
+
+
 def test_figure_repr():
     fig = plt.figure(figsize=(10, 20), dpi=10)
     assert repr(fig) == "<Figure size 100x200 with 0 Axes>"
 
 
-def test_warn_cl_plus_tl():
-    fig, ax = plt.subplots(constrained_layout=True)
+def test_valid_layouts():
+    fig = Figure(layout=None)
+    assert not fig.get_tight_layout()
+    assert not fig.get_constrained_layout()
+
+    fig = Figure(layout='tight')
+    assert fig.get_tight_layout()
+    assert not fig.get_constrained_layout()
+
+    fig = Figure(layout='constrained')
+    assert not fig.get_tight_layout()
+    assert fig.get_constrained_layout()
+
+
+def test_invalid_layouts():
+    fig, ax = plt.subplots(layout="constrained")
     with pytest.warns(UserWarning):
         # this should warn,
         fig.subplots_adjust(top=0.8)
-    assert not(fig.get_constrained_layout())
+    assert isinstance(fig.get_layout_engine(), ConstrainedLayoutEngine)
+
+    # Using layout + (tight|constrained)_layout warns, but the former takes
+    # precedence.
+    wst = "The Figure parameters 'layout' and 'tight_layout'"
+    with pytest.warns(UserWarning, match=wst):
+        fig = Figure(layout='tight', tight_layout=False)
+    assert isinstance(fig.get_layout_engine(), TightLayoutEngine)
+    wst = "The Figure parameters 'layout' and 'constrained_layout'"
+    with pytest.warns(UserWarning, match=wst):
+        fig = Figure(layout='constrained', constrained_layout=False)
+    assert not isinstance(fig.get_layout_engine(), TightLayoutEngine)
+    assert isinstance(fig.get_layout_engine(), ConstrainedLayoutEngine)
+
+    with pytest.raises(ValueError,
+                       match="Invalid value for 'layout'"):
+        Figure(layout='foobar')
+
+    # test that layouts can be swapped if no colorbar:
+    fig, ax = plt.subplots(layout="constrained")
+    fig.set_layout_engine("tight")
+    assert isinstance(fig.get_layout_engine(), TightLayoutEngine)
+    fig.set_layout_engine("constrained")
+    assert isinstance(fig.get_layout_engine(), ConstrainedLayoutEngine)
+
+    # test that layouts cannot be swapped if there is a colorbar:
+    fig, ax = plt.subplots(layout="constrained")
+    pc = ax.pcolormesh(np.random.randn(2, 2))
+    fig.colorbar(pc)
+    with pytest.raises(RuntimeError, match='Colorbar layout of new layout'):
+        fig.set_layout_engine("tight")
+    fig.set_layout_engine("none")
+    with pytest.raises(RuntimeError, match='Colorbar layout of new layout'):
+        fig.set_layout_engine("tight")
+
+    fig, ax = plt.subplots(layout="tight")
+    pc = ax.pcolormesh(np.random.randn(2, 2))
+    fig.colorbar(pc)
+    with pytest.raises(RuntimeError, match='Colorbar layout of new layout'):
+        fig.set_layout_engine("constrained")
+    fig.set_layout_engine("none")
+    assert isinstance(fig.get_layout_engine(), PlaceHolderLayoutEngine)
+
+    with pytest.raises(RuntimeError, match='Colorbar layout of new layout'):
+        fig.set_layout_engine("constrained")
 
 
 @check_figures_equal(extensions=["png", "pdf"])
 def test_add_artist(fig_test, fig_ref):
-    fig_test.set_dpi(100)
-    fig_ref.set_dpi(100)
+    fig_test.dpi = 100
+    fig_ref.dpi = 100
 
     fig_test.subplots()
     l1 = plt.Line2D([.2, .7], [.7, .7], gid='l1')
@@ -601,10 +687,98 @@ def test_removed_axis():
     fig.canvas.draw()
 
 
-@pytest.mark.style('mpl20')
+@pytest.mark.parametrize('clear_meth', ['clear', 'clf'])
+def test_figure_clear(clear_meth):
+    # we test the following figure clearing scenarios:
+    fig = plt.figure()
+
+    # a) an empty figure
+    fig.clear()
+    assert fig.axes == []
+
+    # b) a figure with a single unnested axes
+    ax = fig.add_subplot(111)
+    getattr(fig, clear_meth)()
+    assert fig.axes == []
+
+    # c) a figure multiple unnested axes
+    axes = [fig.add_subplot(2, 1, i+1) for i in range(2)]
+    getattr(fig, clear_meth)()
+    assert fig.axes == []
+
+    # d) a figure with a subfigure
+    gs = fig.add_gridspec(ncols=2, nrows=1)
+    subfig = fig.add_subfigure(gs[0])
+    subaxes = subfig.add_subplot(111)
+    getattr(fig, clear_meth)()
+    assert subfig not in fig.subfigs
+    assert fig.axes == []
+
+    # e) a figure with a subfigure and a subplot
+    subfig = fig.add_subfigure(gs[0])
+    subaxes = subfig.add_subplot(111)
+    mainaxes = fig.add_subplot(gs[1])
+
+    # e.1) removing just the axes leaves the subplot
+    mainaxes.remove()
+    assert fig.axes == [subaxes]
+
+    # e.2) removing just the subaxes leaves the subplot
+    # and subfigure
+    mainaxes = fig.add_subplot(gs[1])
+    subaxes.remove()
+    assert fig.axes == [mainaxes]
+    assert subfig in fig.subfigs
+
+    # e.3) clearing the subfigure leaves the subplot
+    subaxes = subfig.add_subplot(111)
+    assert mainaxes in fig.axes
+    assert subaxes in fig.axes
+    getattr(subfig, clear_meth)()
+    assert subfig in fig.subfigs
+    assert subaxes not in subfig.axes
+    assert subaxes not in fig.axes
+    assert mainaxes in fig.axes
+
+    # e.4) clearing the whole thing
+    subaxes = subfig.add_subplot(111)
+    getattr(fig, clear_meth)()
+    assert fig.axes == []
+    assert fig.subfigs == []
+
+    # f) multiple subfigures
+    subfigs = [fig.add_subfigure(gs[i]) for i in [0, 1]]
+    subaxes = [sfig.add_subplot(111) for sfig in subfigs]
+    assert all(ax in fig.axes for ax in subaxes)
+    assert all(sfig in fig.subfigs for sfig in subfigs)
+
+    # f.1) clearing only one subfigure
+    getattr(subfigs[0], clear_meth)()
+    assert subaxes[0] not in fig.axes
+    assert subaxes[1] in fig.axes
+    assert subfigs[1] in fig.subfigs
+
+    # f.2) clearing the whole thing
+    getattr(subfigs[1], clear_meth)()
+    subfigs = [fig.add_subfigure(gs[i]) for i in [0, 1]]
+    subaxes = [sfig.add_subplot(111) for sfig in subfigs]
+    assert all(ax in fig.axes for ax in subaxes)
+    assert all(sfig in fig.subfigs for sfig in subfigs)
+    getattr(fig, clear_meth)()
+    assert fig.subfigs == []
+    assert fig.axes == []
+
+
+def test_clf_not_redefined():
+    for klass in FigureBase.__subclasses__():
+        # check that subclasses do not get redefined in our Figure subclasses
+        assert 'clf' not in klass.__dict__
+
+
+@mpl.style.context('mpl20')
 def test_picking_does_not_stale():
     fig, ax = plt.subplots()
-    col = ax.scatter([0], [0], [1000], picker=True)
+    ax.scatter([0], [0], [1000], picker=True)
     fig.canvas.draw()
     assert not fig.stale
 
@@ -688,8 +862,8 @@ def test_all_nested(self, fig_test, fig_ref):
         x = [["A", "B"], ["C", "D"]]
         y = [["E", "F"], ["G", "H"]]
 
-        fig_ref.set_constrained_layout(True)
-        fig_test.set_constrained_layout(True)
+        fig_ref.set_layout_engine("constrained")
+        fig_test.set_layout_engine("constrained")
 
         grid_axes = fig_test.subplot_mosaic([[x, y]])
         for ax in grid_axes.values():
@@ -709,8 +883,8 @@ def test_all_nested(self, fig_test, fig_ref):
     @check_figures_equal(extensions=["png"])
     def test_nested(self, fig_test, fig_ref):
 
-        fig_ref.set_constrained_layout(True)
-        fig_test.set_constrained_layout(True)
+        fig_ref.set_layout_engine("constrained")
+        fig_test.set_layout_engine("constrained")
 
         x = [["A", "B"], ["C", "D"]]
 
@@ -861,6 +1035,42 @@ def test_hashable_keys(self, fig_test, fig_ref):
         fig_test.subplot_mosaic([[object(), object()]])
         fig_ref.subplot_mosaic([["A", "B"]])
 
+    @pytest.mark.parametrize('str_pattern',
+                             ['abc', 'cab', 'bca', 'cba', 'acb', 'bac'])
+    def test_user_order(self, str_pattern):
+        fig = plt.figure()
+        ax_dict = fig.subplot_mosaic(str_pattern)
+        assert list(str_pattern) == list(ax_dict)
+        assert list(fig.axes) == list(ax_dict.values())
+
+    def test_nested_user_order(self):
+        layout = [
+            ["A", [["B", "C"],
+                   ["D", "E"]]],
+            ["F", "G"],
+            [".", [["H", [["I"],
+                          ["."]]]]]
+        ]
+
+        fig = plt.figure()
+        ax_dict = fig.subplot_mosaic(layout)
+        assert list(ax_dict) == list("ABCDEFGHI")
+        assert list(fig.axes) == list(ax_dict.values())
+
+    def test_share_all(self):
+        layout = [
+            ["A", [["B", "C"],
+                   ["D", "E"]]],
+            ["F", "G"],
+            [".", [["H", [["I"],
+                          ["."]]]]]
+        ]
+        fig = plt.figure()
+        ax_dict = fig.subplot_mosaic(layout, sharex=True, sharey=True)
+        ax_dict["A"].set(xscale="log", yscale="logit")
+        assert all(ax.get_xscale() == "log" and ax.get_yscale() == "logit"
+                   for ax in ax_dict.values())
+
 
 def test_reused_gridspec():
     """Test that these all use the same gridspec"""
@@ -878,11 +1088,10 @@ def test_reused_gridspec():
 
 
 @image_comparison(['test_subfigure.png'], style='mpl20',
-                  savefig_kwarg={'facecolor': 'teal'},
-                  remove_text=False)
+                  savefig_kwarg={'facecolor': 'teal'})
 def test_subfigure():
     np.random.seed(19680801)
-    fig = plt.figure(constrained_layout=True)
+    fig = plt.figure(layout='constrained')
     sub = fig.subfigures(1, 2)
 
     axs = sub[0].subplots(2, 2)
@@ -900,13 +1109,32 @@ def test_subfigure():
     fig.suptitle('Figure suptitle', fontsize='xx-large')
 
 
+def test_subfigure_tightbbox():
+    # test that we can get the tightbbox with a subfigure...
+    fig = plt.figure(layout='constrained')
+    sub = fig.subfigures(1, 2)
+
+    np.testing.assert_allclose(
+            fig.get_tightbbox(fig.canvas.get_renderer()).width,
+            8.0)
+
+
+def test_subfigure_dpi():
+    fig = plt.figure(dpi=100)
+    sub_fig = fig.subfigures()
+    assert sub_fig.get_dpi() == fig.get_dpi()
+
+    sub_fig.set_dpi(200)
+    assert sub_fig.get_dpi() == 200
+    assert fig.get_dpi() == 200
+
+
 @image_comparison(['test_subfigure_ss.png'], style='mpl20',
-                  savefig_kwarg={'facecolor': 'teal'},
-                  remove_text=False)
+                  savefig_kwarg={'facecolor': 'teal'}, tol=0.02)
 def test_subfigure_ss():
     # test assigning the subfigure via subplotspec
     np.random.seed(19680801)
-    fig = plt.figure(constrained_layout=True)
+    fig = plt.figure(layout='constrained')
     gs = fig.add_gridspec(1, 2)
 
     sub = fig.add_subfigure(gs[0], facecolor='pink')
@@ -925,13 +1153,12 @@ def test_subfigure_ss():
 
 
 @image_comparison(['test_subfigure_double.png'], style='mpl20',
-                  savefig_kwarg={'facecolor': 'teal'},
-                  remove_text=False)
+                  savefig_kwarg={'facecolor': 'teal'})
 def test_subfigure_double():
     # test assigning the subfigure via subplotspec
     np.random.seed(19680801)
 
-    fig = plt.figure(constrained_layout=True, figsize=(10, 8))
+    fig = plt.figure(layout='constrained', figsize=(10, 8))
 
     fig.suptitle('fig')
 
@@ -967,6 +1194,90 @@ def test_subfigure_double():
     axsRight = subfigs[1].subplots(2, 2)
 
 
+def test_subfigure_spanning():
+    # test that subfigures get laid out properly...
+    fig = plt.figure(constrained_layout=True)
+    gs = fig.add_gridspec(3, 3)
+    sub_figs = [
+        fig.add_subfigure(gs[0, 0]),
+        fig.add_subfigure(gs[0:2, 1]),
+        fig.add_subfigure(gs[2, 1:3]),
+        fig.add_subfigure(gs[0:, 1:])
+    ]
+
+    w = 640
+    h = 480
+    np.testing.assert_allclose(sub_figs[0].bbox.min, [0., h * 2/3])
+    np.testing.assert_allclose(sub_figs[0].bbox.max, [w / 3, h])
+
+    np.testing.assert_allclose(sub_figs[1].bbox.min, [w / 3, h / 3])
+    np.testing.assert_allclose(sub_figs[1].bbox.max, [w * 2/3, h])
+
+    np.testing.assert_allclose(sub_figs[2].bbox.min, [w / 3, 0])
+    np.testing.assert_allclose(sub_figs[2].bbox.max, [w, h / 3])
+
+    # check here that slicing actually works.  Last sub_fig
+    # with open slices failed, but only on draw...
+    for i in range(4):
+        sub_figs[i].add_subplot()
+    fig.draw_without_rendering()
+
+
+@mpl.style.context('mpl20')
+def test_subfigure_ticks():
+    # This tests a tick-spacing error that only seems applicable
+    # when the subfigures are saved to file.  It is very hard to replicate
+    fig = plt.figure(constrained_layout=True, figsize=(10, 3))
+    # create left/right subfigs nested in bottom subfig
+    (subfig_bl, subfig_br) = fig.subfigures(1, 2, wspace=0.01,
+                                            width_ratios=[7, 2])
+
+    # put ax1-ax3 in gridspec of bottom-left subfig
+    gs = subfig_bl.add_gridspec(nrows=1, ncols=14)
+
+    ax1 = subfig_bl.add_subplot(gs[0, :1])
+    ax1.scatter(x=[-56.46881504821776, 24.179891162109396], y=[1500, 3600])
+
+    ax2 = subfig_bl.add_subplot(gs[0, 1:3], sharey=ax1)
+    ax2.scatter(x=[-126.5357270050049, 94.68456736755368], y=[1500, 3600])
+    ax3 = subfig_bl.add_subplot(gs[0, 3:14], sharey=ax1)
+
+    fig.dpi = 120
+    fig.draw_without_rendering()
+    ticks120 = ax2.get_xticks()
+    fig.dpi = 300
+    fig.draw_without_rendering()
+    ticks300 = ax2.get_xticks()
+    np.testing.assert_allclose(ticks120, ticks300)
+
+
+@image_comparison(['test_subfigure_scatter_size.png'], style='mpl20',
+                   remove_text=True)
+def test_subfigure_scatter_size():
+    # markers in the left- and right-most subplots should be the same
+    fig = plt.figure()
+    gs = fig.add_gridspec(1, 2)
+    ax0 = fig.add_subplot(gs[1])
+    ax0.scatter([1, 2, 3], [1, 2, 3], s=30, marker='s')
+    ax0.scatter([3, 4, 5], [1, 2, 3], s=[20, 30, 40], marker='s')
+
+    sfig = fig.add_subfigure(gs[0])
+    axs = sfig.subplots(1, 2)
+    for ax in [ax0, axs[0]]:
+        ax.scatter([1, 2, 3], [1, 2, 3], s=30, marker='s', color='r')
+        ax.scatter([3, 4, 5], [1, 2, 3], s=[20, 30, 40], marker='s', color='g')
+
+
+def test_subfigure_pdf():
+    fig = plt.figure(layout='constrained')
+    sub_fig = fig.subfigures()
+    ax = sub_fig.add_subplot(111)
+    b = ax.bar(1, 1)
+    ax.bar_label(b)
+    buffer = io.BytesIO()
+    fig.savefig(buffer, format='pdf')
+
+
 def test_add_subplot_kwargs():
     # fig.add_subplot() always creates new axes, even if axes kwargs differ.
     fig = plt.figure()
@@ -1015,3 +1326,97 @@ def test_add_axes_kwargs():
     assert ax1.name == 'rectilinear'
     assert ax1 is not ax
     plt.close()
+
+
+def test_ginput(recwarn):  # recwarn undoes warn filters at exit.
+    warnings.filterwarnings("ignore", "cannot show the figure")
+    fig, ax = plt.subplots()
+
+    def single_press():
+        fig.canvas.button_press_event(*ax.transData.transform((.1, .2)), 1)
+
+    Timer(.1, single_press).start()
+    assert fig.ginput() == [(.1, .2)]
+
+    def multi_presses():
+        fig.canvas.button_press_event(*ax.transData.transform((.1, .2)), 1)
+        fig.canvas.key_press_event("backspace")
+        fig.canvas.button_press_event(*ax.transData.transform((.3, .4)), 1)
+        fig.canvas.button_press_event(*ax.transData.transform((.5, .6)), 1)
+        fig.canvas.button_press_event(*ax.transData.transform((0, 0)), 2)
+
+    Timer(.1, multi_presses).start()
+    np.testing.assert_allclose(fig.ginput(3), [(.3, .4), (.5, .6)])
+
+
+def test_waitforbuttonpress(recwarn):  # recwarn undoes warn filters at exit.
+    warnings.filterwarnings("ignore", "cannot show the figure")
+    fig = plt.figure()
+    assert fig.waitforbuttonpress(timeout=.1) is None
+    Timer(.1, fig.canvas.key_press_event, ("z",)).start()
+    assert fig.waitforbuttonpress() is True
+    Timer(.1, fig.canvas.button_press_event, (0, 0, 1)).start()
+    assert fig.waitforbuttonpress() is False
+
+
+def test_kwargs_pass():
+    fig = Figure(label='whole Figure')
+    sub_fig = fig.subfigures(1, 1, label='sub figure')
+
+    assert fig.get_label() == 'whole Figure'
+    assert sub_fig.get_label() == 'sub figure'
+
+
+@check_figures_equal(extensions=["png"])
+def test_rcparams(fig_test, fig_ref):
+    fig_ref.supxlabel("xlabel", weight='bold', size=15)
+    fig_ref.supylabel("ylabel", weight='bold', size=15)
+    fig_ref.suptitle("Title", weight='light', size=20)
+    with mpl.rc_context({'figure.labelweight': 'bold',
+                         'figure.labelsize': 15,
+                         'figure.titleweight': 'light',
+                         'figure.titlesize': 20}):
+        fig_test.supxlabel("xlabel")
+        fig_test.supylabel("ylabel")
+        fig_test.suptitle("Title")
+
+
+def test_deepcopy():
+    fig1, ax = plt.subplots()
+    ax.plot([0, 1], [2, 3])
+    ax.set_yscale('log')
+
+    fig2 = copy.deepcopy(fig1)
+
+    # Make sure it is a new object
+    assert fig2.axes[0] is not ax
+    # And that the axis scale got propagated
+    assert fig2.axes[0].get_yscale() == 'log'
+    # Update the deepcopy and check the original isn't modified
+    fig2.axes[0].set_yscale('linear')
+    assert ax.get_yscale() == 'log'
+
+    # And test the limits of the axes don't get propagated
+    ax.set_xlim(1e-1, 1e2)
+    # Draw these to make sure limits are updated
+    fig1.draw_without_rendering()
+    fig2.draw_without_rendering()
+
+    assert ax.get_xlim() == (1e-1, 1e2)
+    assert fig2.axes[0].get_xlim() == (0, 1)
+
+
+def test_unpickle_with_device_pixel_ratio():
+    fig = Figure(dpi=42)
+    fig.canvas._set_device_pixel_ratio(7)
+    assert fig.dpi == 42*7
+    fig2 = pickle.loads(pickle.dumps(fig))
+    assert fig2.dpi == 42
+
+
+def test_gridspec_no_mutate_input():
+    gs = {'left': .1}
+    gs_orig = dict(gs)
+    plt.subplots(1, 2, width_ratios=[1, 2], gridspec_kw=gs)
+    assert gs == gs_orig
+    plt.subplot_mosaic('AB', width_ratios=[1, 2], gridspec_kw=gs)
diff --git a/lib/matplotlib/tests/test_font_manager.py b/lib/matplotlib/tests/test_font_manager.py
index 1e8252abb76c..b1b5b37f039a 100644
--- a/lib/matplotlib/tests/test_font_manager.py
+++ b/lib/matplotlib/tests/test_font_manager.py
@@ -2,6 +2,7 @@
 import multiprocessing
 import os
 from pathlib import Path
+from PIL import Image
 import shutil
 import subprocess
 import sys
@@ -11,9 +12,10 @@
 import pytest
 
 from matplotlib.font_manager import (
-    findfont, findSystemFonts, FontProperties, fontManager, json_dump,
-    json_load, get_font, get_fontconfig_fonts, is_opentype_cff_font,
-    MSUserFontDirectories, _call_fc_list)
+    findfont, findSystemFonts, FontEntry, FontProperties, fontManager,
+    json_dump, json_load, get_font, is_opentype_cff_font,
+    MSUserFontDirectories, _get_fontconfig_fonts, ft2font,
+    ttfFontProperty, cbook)
 from matplotlib import pyplot as plt, rc_context
 
 has_fclist = shutil.which('fc-list') is not None
@@ -73,7 +75,7 @@ def test_otf():
 
 @pytest.mark.skipif(not has_fclist, reason='no fontconfig installed')
 def test_get_fontconfig_fonts():
-    assert len(get_fontconfig_fonts()) > 1
+    assert len(_get_fontconfig_fonts()) > 1
 
 
 @pytest.mark.parametrize('factor', [2, 4, 6, 8])
@@ -101,7 +103,7 @@ def test_utf16m_sfnt():
         entry = next(entry for entry in fontManager.ttflist
                      if Path(entry.fname).name == "seguisbi.ttf")
     except StopIteration:
-        pytest.skip("Couldn't find font to test against.")
+        pytest.skip("Couldn't find seguisbi.ttf font to test against.")
     else:
         # Check that we successfully read "semibold" from the font's sfnt table
         # and set its weight accordingly.
@@ -111,14 +113,25 @@ def test_utf16m_sfnt():
 def test_find_ttc():
     fp = FontProperties(family=["WenQuanYi Zen Hei"])
     if Path(findfont(fp)).name != "wqy-zenhei.ttc":
-        pytest.skip("Font may be missing")
-
+        pytest.skip("Font wqy-zenhei.ttc may be missing")
     fig, ax = plt.subplots()
     ax.text(.5, .5, "\N{KANGXI RADICAL DRAGON}", fontproperties=fp)
     for fmt in ["raw", "svg", "pdf", "ps"]:
         fig.savefig(BytesIO(), format=fmt)
 
 
+def test_find_noto():
+    fp = FontProperties(family=["Noto Sans CJK SC", "Noto Sans CJK JP"])
+    name = Path(findfont(fp)).name
+    if name not in ("NotoSansCJKsc-Regular.otf", "NotoSansCJK-Regular.ttc"):
+        pytest.skip(f"Noto Sans CJK SC font may be missing (found {name})")
+
+    fig, ax = plt.subplots()
+    ax.text(0.5, 0.5, 'Hello, 你好', fontproperties=fp)
+    for fmt in ["raw", "svg", "pdf", "ps"]:
+        fig.savefig(BytesIO(), format=fmt)
+
+
 def test_find_invalid(tmpdir):
     tmp_path = Path(tmpdir)
 
@@ -137,7 +150,8 @@ def test_find_invalid(tmpdir):
         FT2Font(StringIO())
 
 
-@pytest.mark.skipif(sys.platform != 'linux', reason='Linux only')
+@pytest.mark.skipif(sys.platform != 'linux' or not has_fclist,
+                    reason='only Linux with fontconfig installed')
 def test_user_fonts_linux(tmpdir, monkeypatch):
     font_test_file = 'mpltest.ttf'
 
@@ -154,13 +168,29 @@ def test_user_fonts_linux(tmpdir, monkeypatch):
 
     with monkeypatch.context() as m:
         m.setenv('XDG_DATA_HOME', str(tmpdir))
-        _call_fc_list.cache_clear()
+        _get_fontconfig_fonts.cache_clear()
         # Now, the font should be available
         fonts = findSystemFonts()
         assert any(font_test_file in font for font in fonts)
 
     # Make sure the temporary directory is no longer cached.
-    _call_fc_list.cache_clear()
+    _get_fontconfig_fonts.cache_clear()
+
+
+def test_addfont_as_path():
+    """Smoke test that addfont() accepts pathlib.Path."""
+    font_test_file = 'mpltest.ttf'
+    path = Path(__file__).parent / font_test_file
+    try:
+        fontManager.addfont(path)
+        added, = [font for font in fontManager.ttflist
+                  if font.fname.endswith(font_test_file)]
+        fontManager.ttflist.remove(added)
+    finally:
+        to_remove = [font for font in fontManager.ttflist
+                     if font.fname.endswith(font_test_file)]
+        for font in to_remove:
+            fontManager.ttflist.remove(font)
 
 
 @pytest.mark.skipif(sys.platform != 'win32', reason='Windows only')
@@ -255,3 +285,41 @@ def test_fontcache_thread_safe():
     if proc.returncode:
         pytest.fail("The subprocess returned with non-zero exit status "
                     f"{proc.returncode}.")
+
+
+def test_fontentry_dataclass():
+    fontent = FontEntry(name='font-name')
+
+    png = fontent._repr_png_()
+    img = Image.open(BytesIO(png))
+    assert img.width > 0
+    assert img.height > 0
+
+    html = fontent._repr_html_()
+    assert html.startswith("<img src=\"data:image/png;base64")
+
+
+def test_fontentry_dataclass_invalid_path():
+    with pytest.raises(FileNotFoundError):
+        fontent = FontEntry(fname='/random', name='font-name')
+        fontent._repr_html_()
+
+
+@pytest.mark.skipif(sys.platform == 'win32', reason='Linux or OS only')
+def test_get_font_names():
+    paths_mpl = [cbook._get_data_path('fonts', subdir) for subdir in ['ttf']]
+    fonts_mpl = findSystemFonts(paths_mpl, fontext='ttf')
+    fonts_system = findSystemFonts(fontext='ttf')
+    ttf_fonts = []
+    for path in fonts_mpl + fonts_system:
+        try:
+            font = ft2font.FT2Font(path)
+            prop = ttfFontProperty(font)
+            ttf_fonts.append(prop.name)
+        except:
+            pass
+    available_fonts = sorted(list(set(ttf_fonts)))
+    mpl_font_names = sorted(fontManager.get_font_names())
+    assert set(available_fonts) == set(mpl_font_names)
+    assert len(available_fonts) == len(mpl_font_names)
+    assert available_fonts == mpl_font_names
diff --git a/lib/matplotlib/tests/test_ft2font.py b/lib/matplotlib/tests/test_ft2font.py
new file mode 100644
index 000000000000..9ef7127d6685
--- /dev/null
+++ b/lib/matplotlib/tests/test_ft2font.py
@@ -0,0 +1,106 @@
+from pathlib import Path
+import io
+
+import pytest
+
+from matplotlib import ft2font
+from matplotlib.testing.decorators import check_figures_equal
+import matplotlib.font_manager as fm
+import matplotlib.pyplot as plt
+
+
+def test_fallback_errors():
+    file_name = fm.findfont('DejaVu Sans')
+
+    with pytest.raises(TypeError, match="Fallback list must be a list"):
+        # failing to be a list will fail before the 0
+        ft2font.FT2Font(file_name, _fallback_list=(0,))
+
+    with pytest.raises(
+            TypeError, match="Fallback fonts must be FT2Font objects."
+    ):
+        ft2font.FT2Font(file_name, _fallback_list=[0])
+
+
+def test_ft2font_positive_hinting_factor():
+    file_name = fm.findfont('DejaVu Sans')
+    with pytest.raises(
+            ValueError, match="hinting_factor must be greater than 0"
+    ):
+        ft2font.FT2Font(file_name, 0)
+
+
+def test_fallback_smoke():
+    fp = fm.FontProperties(family=["WenQuanYi Zen Hei"])
+    if Path(fm.findfont(fp)).name != "wqy-zenhei.ttc":
+        pytest.skip("Font wqy-zenhei.ttc may be missing")
+
+    fp = fm.FontProperties(family=["Noto Sans CJK JP"])
+    if Path(fm.findfont(fp)).name != "NotoSansCJK-Regular.ttc":
+        pytest.skip("Noto Sans CJK JP font may be missing.")
+
+    plt.rcParams['font.size'] = 20
+    fig = plt.figure(figsize=(4.75, 1.85))
+    fig.text(0.05, 0.45, "There are 几个汉字 in between!",
+             family=['DejaVu Sans', "Noto Sans CJK JP"])
+    fig.text(0.05, 0.25, "There are 几个汉字 in between!",
+             family=['DejaVu Sans', "WenQuanYi Zen Hei"])
+    fig.text(0.05, 0.65, "There are 几个汉字 in between!",
+             family=["Noto Sans CJK JP"])
+    fig.text(0.05, 0.85, "There are 几个汉字 in between!",
+             family=["WenQuanYi Zen Hei"])
+
+    # TODO enable fallback for other backends!
+    for fmt in ['png', 'raw']:  # ["svg", "pdf", "ps"]:
+        fig.savefig(io.BytesIO(), format=fmt)
+
+
+@pytest.mark.parametrize('family_name, file_name',
+                         [("WenQuanYi Zen Hei",  "wqy-zenhei"),
+                          ("Noto Sans CJK JP", "NotoSansCJK")]
+                         )
+@check_figures_equal(extensions=["png", "pdf", "eps", "svg"])
+def test_font_fallback_chinese(fig_test, fig_ref, family_name, file_name):
+    fp = fm.FontProperties(family=[family_name])
+    if file_name not in Path(fm.findfont(fp)).name:
+        pytest.skip(f"Font {family_name} ({file_name}) is missing")
+
+    text = ["There are", "几个汉字", "in between!"]
+
+    plt.rcParams["font.size"] = 20
+    test_fonts = [["DejaVu Sans", family_name]] * 3
+    ref_fonts = [["DejaVu Sans"], [family_name], ["DejaVu Sans"]]
+
+    for j, (txt, test_font, ref_font) in enumerate(
+            zip(text, test_fonts, ref_fonts)
+    ):
+        fig_ref.text(0.05, .85 - 0.15*j, txt, family=ref_font)
+        fig_test.text(0.05, .85 - 0.15*j, txt, family=test_font)
+
+
+@pytest.mark.parametrize(
+    "family_name, file_name",
+    [
+        ("WenQuanYi Zen Hei", "wqy-zenhei"),
+        ("Noto Sans CJK JP", "NotoSansCJK"),
+    ],
+)
+def test__get_fontmap(family_name, file_name):
+    fp = fm.FontProperties(family=[family_name])
+    found_file_name = Path(fm.findfont(fp)).name
+    if file_name not in found_file_name:
+        pytest.skip(f"Font {family_name} ({file_name}) is missing")
+
+    text = "There are 几个汉字 in between!"
+    ft = fm.get_font(
+        fm.fontManager._find_fonts_by_props(
+            fm.FontProperties(family=["DejaVu Sans", family_name])
+        )
+    )
+
+    fontmap = ft._get_fontmap(text)
+    for char, font in fontmap.items():
+        if ord(char) > 127:
+            assert Path(font.fname).name == found_file_name
+        else:
+            assert Path(font.fname).name == "DejaVuSans.ttf"
diff --git a/lib/matplotlib/tests/test_getattr.py b/lib/matplotlib/tests/test_getattr.py
new file mode 100644
index 000000000000..71556b5b4c71
--- /dev/null
+++ b/lib/matplotlib/tests/test_getattr.py
@@ -0,0 +1,28 @@
+from importlib import import_module
+from pkgutil import walk_packages
+
+import matplotlib
+import pytest
+
+# Get the names of all matplotlib submodules, except for the unit tests.
+module_names = [m.name for m in walk_packages(path=matplotlib.__path__,
+                                              prefix=f'{matplotlib.__name__}.')
+                if not m.name.startswith(__package__)]
+
+
+@pytest.mark.parametrize('module_name', module_names)
+@pytest.mark.filterwarnings('ignore::DeprecationWarning')
+def test_getattr(module_name):
+    """
+    Test that __getattr__ methods raise AttributeError for unknown keys.
+    See #20822, #20855.
+    """
+    try:
+        module = import_module(module_name)
+    except (ImportError, RuntimeError) as e:
+        # Skip modules that cannot be imported due to missing dependencies
+        pytest.skip(f'Cannot import {module_name} due to {e}')
+
+    key = 'THIS_SYMBOL_SHOULD_NOT_EXIST'
+    if hasattr(module, key):
+        delattr(module, key)
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
index 9657968de7eb..46dbe4cfe8f8 100644
--- a/lib/matplotlib/tests/test_image.py
+++ b/lib/matplotlib/tests/test_image.py
@@ -11,8 +11,9 @@
 from numpy.testing import assert_array_equal
 from PIL import Image
 
+import matplotlib as mpl
 from matplotlib import (
-    _api, colors, image as mimage, patches, pyplot as plt, style, rcParams)
+    colors, image as mimage, patches, pyplot as plt, style, rcParams)
 from matplotlib.image import (AxesImage, BboxImage, FigureImage,
                               NonUniformImage, PcolorImage)
 from matplotlib.testing.decorators import check_figures_equal, image_comparison
@@ -114,12 +115,12 @@ def test_imshow_antialiased(fig_test, fig_ref,
     A = np.random.rand(int(dpi * img_size), int(dpi * img_size))
     for fig in [fig_test, fig_ref]:
         fig.set_size_inches(fig_size, fig_size)
-    axs = fig_test.subplots()
-    axs.set_position([0, 0, 1, 1])
-    axs.imshow(A, interpolation='antialiased')
-    axs = fig_ref.subplots()
-    axs.set_position([0, 0, 1, 1])
-    axs.imshow(A, interpolation=interpolation)
+    ax = fig_test.subplots()
+    ax.set_position([0, 0, 1, 1])
+    ax.imshow(A, interpolation='antialiased')
+    ax = fig_ref.subplots()
+    ax.set_position([0, 0, 1, 1])
+    ax.imshow(A, interpolation=interpolation)
 
 
 @check_figures_equal(extensions=['png'])
@@ -130,14 +131,14 @@ def test_imshow_zoom(fig_test, fig_ref):
     A = np.random.rand(int(dpi * 3), int(dpi * 3))
     for fig in [fig_test, fig_ref]:
         fig.set_size_inches(2.9, 2.9)
-    axs = fig_test.subplots()
-    axs.imshow(A, interpolation='antialiased')
-    axs.set_xlim([10, 20])
-    axs.set_ylim([10, 20])
-    axs = fig_ref.subplots()
-    axs.imshow(A, interpolation='nearest')
-    axs.set_xlim([10, 20])
-    axs.set_ylim([10, 20])
+    ax = fig_test.subplots()
+    ax.imshow(A, interpolation='antialiased')
+    ax.set_xlim([10, 20])
+    ax.set_ylim([10, 20])
+    ax = fig_ref.subplots()
+    ax.imshow(A, interpolation='nearest')
+    ax.set_xlim([10, 20])
+    ax.set_ylim([10, 20])
 
 
 @check_figures_equal()
@@ -286,11 +287,11 @@ def test_cursor_data():
 
     # Hmm, something is wrong here... I get 0, not None...
     # But, this works further down in the tests with extents flipped
-    #x, y = 0.1, -0.1
-    #xdisp, ydisp = ax.transData.transform([x, y])
-    #event = MouseEvent('motion_notify_event', fig.canvas, xdisp, ydisp)
-    #z = im.get_cursor_data(event)
-    #assert z is None, "Did not get None, got %d" % z
+    # x, y = 0.1, -0.1
+    # xdisp, ydisp = ax.transData.transform([x, y])
+    # event = MouseEvent('motion_notify_event', fig.canvas, xdisp, ydisp)
+    # z = im.get_cursor_data(event)
+    # assert z is None, "Did not get None, got %d" % z
 
     ax.clear()
     # Now try with the extents flipped.
@@ -336,11 +337,14 @@ def test_cursor_data():
 
 
 @pytest.mark.parametrize(
-    "data, text_without_colorbar, text_with_colorbar", [
-        ([[10001, 10000]], "[1e+04]", "[10001]"),
-        ([[.123, .987]], "[0.123]", "[0.123]"),
-])
-def test_format_cursor_data(data, text_without_colorbar, text_with_colorbar):
+    "data, text", [
+        ([[10001, 10000]], "[10001.000]"),
+        ([[.123, .987]], "[0.123]"),
+        ([[np.nan, 1, 2]], "[]"),
+        ([[1, 1+1e-15]], "[1.0000000000000000]"),
+        ([[-1, -1]], "[-1.0000000000000000]"),
+    ])
+def test_format_cursor_data(data, text):
     from matplotlib.backend_bases import MouseEvent
 
     fig, ax = plt.subplots()
@@ -348,16 +352,7 @@ def test_format_cursor_data(data, text_without_colorbar, text_with_colorbar):
 
     xdisp, ydisp = ax.transData.transform([0, 0])
     event = MouseEvent('motion_notify_event', fig.canvas, xdisp, ydisp)
-    assert im.get_cursor_data(event) == data[0][0]
-    assert im.format_cursor_data(im.get_cursor_data(event)) \
-        == text_without_colorbar
-
-    fig.colorbar(im)
-    fig.canvas.draw()  # This is necessary to set up the colorbar formatter.
-
-    assert im.get_cursor_data(event) == data[0][0]
-    assert im.format_cursor_data(im.get_cursor_data(event)) \
-        == text_with_colorbar
+    assert im.format_cursor_data(im.get_cursor_data(event)) == text
 
 
 @image_comparison(['image_clip'], style='mpl20')
@@ -506,6 +501,18 @@ def test_image_composite_alpha():
     ax.set_ylim([5, 0])
 
 
+@check_figures_equal(extensions=["pdf"])
+def test_clip_path_disables_compositing(fig_test, fig_ref):
+    t = np.arange(9).reshape((3, 3))
+    for fig in [fig_test, fig_ref]:
+        ax = fig.add_subplot()
+        ax.imshow(t, clip_path=(mpl.path.Path([(0, 0), (0, 1), (1, 0)]),
+                                ax.transData))
+        ax.imshow(t, clip_path=(mpl.path.Path([(1, 1), (1, 2), (2, 1)]),
+                                ax.transData))
+    fig_ref.suppressComposite = True
+
+
 @image_comparison(['rasterize_10dpi'],
                   extensions=['pdf', 'svg'], remove_text=True, style='mpl20')
 def test_rasterize_dpi():
@@ -636,7 +643,7 @@ def test_jpeg_alpha():
     # If this fails, there will be only one color (all black). If this
     # is working, we should have all 256 shades of grey represented.
     num_colors = len(image.getcolors(256))
-    assert 175 <= num_colors <= 185
+    assert 175 <= num_colors <= 210
     # The fully transparent part should be red.
     corner_pixel = image.getpixel((0, 0))
     assert corner_pixel == (254, 0, 0)
@@ -714,7 +721,7 @@ def test_load_from_url():
     url = ('file:'
            + ('///' if sys.platform == 'win32' else '')
            + path.resolve().as_posix())
-    with _api.suppress_matplotlib_deprecation_warning():
+    with pytest.raises(ValueError, match="Please open the URL"):
         plt.imread(url)
     with urllib.request.urlopen(url) as file:
         plt.imread(file)
@@ -876,7 +883,7 @@ def test_imshow_endianess():
                   remove_text=True, style='mpl20')
 def test_imshow_masked_interpolation():
 
-    cmap = plt.get_cmap('viridis').with_extremes(over='r', under='b', bad='k')
+    cmap = mpl.colormaps['viridis'].with_extremes(over='r', under='b', bad='k')
 
     N = 20
     n = colors.Normalize(vmin=0, vmax=N*N-1)
@@ -971,13 +978,20 @@ def test_imshow_bignumbers_real():
 def test_empty_imshow(make_norm):
     fig, ax = plt.subplots()
     with pytest.warns(UserWarning,
-                      match="Attempting to set identical left == right"):
+                      match="Attempting to set identical low and high xlims"):
         im = ax.imshow([[]], norm=make_norm())
     im.set_extent([-5, 5, -5, 5])
     fig.canvas.draw()
 
     with pytest.raises(RuntimeError):
-        im.make_image(fig._cachedRenderer)
+        im.make_image(fig.canvas.get_renderer())
+
+
+def test_imshow_float16():
+    fig, ax = plt.subplots()
+    ax.imshow(np.zeros((3, 3), dtype=np.float16))
+    # Ensure that drawing doesn't cause crash.
+    fig.canvas.draw()
 
 
 def test_imshow_float128():
@@ -997,8 +1011,8 @@ def test_imshow_bool():
 def test_full_invalid():
     fig, ax = plt.subplots()
     ax.imshow(np.full((10, 10), np.nan))
-    with pytest.warns(UserWarning):
-        fig.canvas.draw()
+
+    fig.canvas.draw()
 
 
 @pytest.mark.parametrize("fmt,counted",
@@ -1082,7 +1096,7 @@ def test_image_array_alpha(fig_test, fig_ref):
     zz = np.exp(- 3 * ((xx - 0.5) ** 2) + (yy - 0.7 ** 2))
     alpha = zz / zz.max()
 
-    cmap = plt.get_cmap('viridis')
+    cmap = mpl.colormaps['viridis']
     ax = fig_test.add_subplot()
     ax.imshow(zz, alpha=alpha, cmap=cmap, interpolation='nearest')
 
@@ -1097,9 +1111,9 @@ def test_image_array_alpha_validation():
         plt.imshow(np.zeros((2, 2)), alpha=[1, 1])
 
 
-@pytest.mark.style('mpl20')
+@mpl.style.context('mpl20')
 def test_exact_vmin():
-    cmap = copy(plt.cm.get_cmap("autumn_r"))
+    cmap = copy(mpl.colormaps["autumn_r"])
     cmap.set_under(color="lightgrey")
 
     # make the image exactly 190 pixels wide
@@ -1126,13 +1140,6 @@ def test_exact_vmin():
     assert np.all(from_image == direct_computation)
 
 
-@pytest.mark.network
-@pytest.mark.flaky
-def test_https_imread_smoketest():
-    with _api.suppress_matplotlib_deprecation_warning():
-        v = mimage.imread('https://matplotlib.org/1.5.0/_static/logo2.png')
-
-
 # A basic ndarray subclass that implements a quantity
 # It does not implement an entire unit system or all quantity math.
 # There is just enough implemented to test handling of ndarray
@@ -1156,7 +1163,7 @@ def __getitem__(self, item):
     def __array_ufunc__(self, ufunc, method, *inputs, **kwargs):
         func = getattr(ufunc, method)
         if "out" in kwargs:
-            raise NotImplementedError
+            return NotImplemented
         if len(inputs) == 1:
             i0 = inputs[0]
             unit = getattr(i0, "units", "dimensionless")
@@ -1176,11 +1183,16 @@ def __array_ufunc__(self, ufunc, method, *inputs, **kwargs):
                 unit = f"{u0}*{u1}"
             elif ufunc == np.divide:
                 unit = f"{u0}/({u1})"
+            elif ufunc in (np.greater, np.greater_equal,
+                           np.equal, np.not_equal,
+                           np.less, np.less_equal):
+                # Comparisons produce unitless booleans for output
+                unit = None
             else:
-                raise NotImplementedError
+                return NotImplemented
             out_arr = func(i0.view(np.ndarray), i1.view(np.ndarray), **kwargs)
         else:
-            raise NotImplementedError
+            return NotImplemented
         if unit is None:
             out_arr = np.array(out_arr)
         else:
@@ -1214,22 +1226,51 @@ def test_imshow_quantitynd():
 
 
 @check_figures_equal(extensions=['png'])
-def test_huge_range_log(fig_test, fig_ref):
-    data = np.full((5, 5), -1, dtype=np.float64)
+def test_norm_change(fig_test, fig_ref):
+    # LogNorm should not mask anything invalid permanently.
+    data = np.full((5, 5), 1, dtype=np.float64)
+    data[0:2, :] = -1
+
+    masked_data = np.ma.array(data, mask=False)
+    masked_data.mask[0:2, 0:2] = True
+
+    cmap = mpl.colormaps['viridis'].with_extremes(under='w')
+
+    ax = fig_test.subplots()
+    im = ax.imshow(data, norm=colors.LogNorm(vmin=0.5, vmax=1),
+                   extent=(0, 5, 0, 5), interpolation='nearest', cmap=cmap)
+    im.set_norm(colors.Normalize(vmin=-2, vmax=2))
+    im = ax.imshow(masked_data, norm=colors.LogNorm(vmin=0.5, vmax=1),
+                   extent=(5, 10, 5, 10), interpolation='nearest', cmap=cmap)
+    im.set_norm(colors.Normalize(vmin=-2, vmax=2))
+    ax.set(xlim=(0, 10), ylim=(0, 10))
+
+    ax = fig_ref.subplots()
+    ax.imshow(data, norm=colors.Normalize(vmin=-2, vmax=2),
+              extent=(0, 5, 0, 5), interpolation='nearest', cmap=cmap)
+    ax.imshow(masked_data, norm=colors.Normalize(vmin=-2, vmax=2),
+              extent=(5, 10, 5, 10), interpolation='nearest', cmap=cmap)
+    ax.set(xlim=(0, 10), ylim=(0, 10))
+
+
+@pytest.mark.parametrize('x', [-1, 1])
+@check_figures_equal(extensions=['png'])
+def test_huge_range_log(fig_test, fig_ref, x):
+    # parametrize over bad lognorm -1 values and large range 1 -> 1e20
+    data = np.full((5, 5), x, dtype=np.float64)
     data[0:2, :] = 1E20
 
     ax = fig_test.subplots()
-    im = ax.imshow(data, norm=colors.LogNorm(vmin=100, vmax=data.max()),
-                   interpolation='nearest', cmap='viridis')
+    ax.imshow(data, norm=colors.LogNorm(vmin=1, vmax=data.max()),
+              interpolation='nearest', cmap='viridis')
 
-    data = np.full((5, 5), -1, dtype=np.float64)
+    data = np.full((5, 5), x, dtype=np.float64)
     data[0:2, :] = 1000
 
-    cmap = copy(plt.get_cmap('viridis'))
-    cmap.set_under('w')
     ax = fig_ref.subplots()
-    im = ax.imshow(data, norm=colors.Normalize(vmin=100, vmax=data.max()),
-                   interpolation='nearest', cmap=cmap)
+    cmap = mpl.colormaps['viridis'].with_extremes(under='w')
+    ax.imshow(data, norm=colors.Normalize(vmin=1, vmax=data.max()),
+              interpolation='nearest', cmap=cmap)
 
 
 @check_figures_equal()
@@ -1263,3 +1304,136 @@ def test_spy_box(fig_test, fig_ref):
         ax_ref[i].yaxis.set_major_locator(
             mticker.MaxNLocator(nbins=9, steps=[1, 2, 5, 10], integer=True)
         )
+
+
+@image_comparison(["nonuniform_and_pcolor.png"], style="mpl20")
+def test_nonuniform_and_pcolor():
+    axs = plt.figure(figsize=(3, 3)).subplots(3, sharex=True, sharey=True)
+    for ax, interpolation in zip(axs, ["nearest", "bilinear"]):
+        im = NonUniformImage(ax, interpolation=interpolation)
+        im.set_data(np.arange(3) ** 2, np.arange(3) ** 2,
+                    np.arange(9).reshape((3, 3)))
+        ax.add_image(im)
+    axs[2].pcolorfast(  # PcolorImage
+        np.arange(4) ** 2, np.arange(4) ** 2, np.arange(9).reshape((3, 3)))
+    for ax in axs:
+        ax.set_axis_off()
+        # NonUniformImage "leaks" out of extents, not PColorImage.
+        ax.set(xlim=(0, 10))
+
+
+@image_comparison(["rgba_antialias.png"], style="mpl20",
+                  remove_text=True)
+def test_rgba_antialias():
+    fig, axs = plt.subplots(2, 2, figsize=(3.5, 3.5), sharex=False,
+                            sharey=False, constrained_layout=True)
+    N = 250
+    aa = np.ones((N, N))
+    aa[::2, :] = -1
+
+    x = np.arange(N) / N - 0.5
+    y = np.arange(N) / N - 0.5
+
+    X, Y = np.meshgrid(x, y)
+    R = np.sqrt(X**2 + Y**2)
+    f0 = 10
+    k = 75
+    # aliased concentric circles
+    a = np.sin(np.pi * 2 * (f0 * R + k * R**2 / 2))
+
+    # stripes on lhs
+    a[:int(N/2), :][R[:int(N/2), :] < 0.4] = -1
+    a[:int(N/2), :][R[:int(N/2), :] < 0.3] = 1
+    aa[:, int(N/2):] = a[:, int(N/2):]
+
+    # set some over/unders and NaNs
+    aa[20:50, 20:50] = np.NaN
+    aa[70:90, 70:90] = 1e6
+    aa[70:90, 20:30] = -1e6
+    aa[70:90, 195:215] = 1e6
+    aa[20:30, 195:215] = -1e6
+
+    cmap = copy(plt.cm.RdBu_r)
+    cmap.set_over('yellow')
+    cmap.set_under('cyan')
+
+    axs = axs.flatten()
+    # zoom in
+    axs[0].imshow(aa, interpolation='nearest', cmap=cmap, vmin=-1.2, vmax=1.2)
+    axs[0].set_xlim([N/2-25, N/2+25])
+    axs[0].set_ylim([N/2+50, N/2-10])
+
+    # no anti-alias
+    axs[1].imshow(aa, interpolation='nearest', cmap=cmap, vmin=-1.2, vmax=1.2)
+
+    # data antialias: Note no purples, and white in circle.  Note
+    # that alternating red and blue stripes become white.
+    axs[2].imshow(aa, interpolation='antialiased', interpolation_stage='data',
+                  cmap=cmap, vmin=-1.2, vmax=1.2)
+
+    # rgba antialias: Note purples at boundary with circle.  Note that
+    # alternating red and blue stripes become purple
+    axs[3].imshow(aa, interpolation='antialiased', interpolation_stage='rgba',
+                  cmap=cmap, vmin=-1.2, vmax=1.2)
+
+
+# We check for the warning with a draw() in the test, but we also need to
+# filter the warning as it is emitted by the figure test decorator
+@pytest.mark.filterwarnings(r'ignore:Data with more than .* '
+                            'cannot be accurately displayed')
+@pytest.mark.parametrize('origin', ['upper', 'lower'])
+@pytest.mark.parametrize(
+    'dim, size, msg', [['row', 2**23, r'2\*\*23 columns'],
+                       ['col', 2**24, r'2\*\*24 rows']])
+@check_figures_equal(extensions=('png', ))
+def test_large_image(fig_test, fig_ref, dim, size, msg, origin):
+    # Check that Matplotlib downsamples images that are too big for AGG
+    # See issue #19276. Currently the fix only works for png output but not
+    # pdf or svg output.
+    ax_test = fig_test.subplots()
+    ax_ref = fig_ref.subplots()
+
+    array = np.zeros((1, size + 2))
+    array[:, array.size // 2:] = 1
+    if dim == 'col':
+        array = array.T
+    im = ax_test.imshow(array, vmin=0, vmax=1,
+                        aspect='auto', extent=(0, 1, 0, 1),
+                        interpolation='none',
+                        origin=origin)
+
+    with pytest.warns(UserWarning,
+                      match=f'Data with more than {msg} cannot be '
+                      'accurately displayed.'):
+        fig_test.canvas.draw()
+
+    array = np.zeros((1, 2))
+    array[:, 1] = 1
+    if dim == 'col':
+        array = array.T
+    im = ax_ref.imshow(array, vmin=0, vmax=1, aspect='auto',
+                       extent=(0, 1, 0, 1),
+                       interpolation='none',
+                       origin=origin)
+
+
+@check_figures_equal(extensions=["png"])
+def test_str_norms(fig_test, fig_ref):
+    t = np.random.rand(10, 10) * .8 + .1  # between 0 and 1
+    axts = fig_test.subplots(1, 5)
+    axts[0].imshow(t, norm="log")
+    axts[1].imshow(t, norm="log", vmin=.2)
+    axts[2].imshow(t, norm="symlog")
+    axts[3].imshow(t, norm="symlog", vmin=.3, vmax=.7)
+    axts[4].imshow(t, norm="logit", vmin=.3, vmax=.7)
+    axrs = fig_ref.subplots(1, 5)
+    axrs[0].imshow(t, norm=colors.LogNorm())
+    axrs[1].imshow(t, norm=colors.LogNorm(vmin=.2))
+    # same linthresh as SymmetricalLogScale's default.
+    axrs[2].imshow(t, norm=colors.SymLogNorm(linthresh=2))
+    axrs[3].imshow(t, norm=colors.SymLogNorm(linthresh=2, vmin=.3, vmax=.7))
+    axrs[4].imshow(t, norm="logit", clim=(.3, .7))
+
+    assert type(axts[0].images[0].norm) == colors.LogNorm  # Exactly that class
+    with pytest.raises(ValueError):
+        axts[0].imshow(t, norm="foobar")
diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
index cebf26ea066e..16847e0be6e2 100644
--- a/lib/matplotlib/tests/test_legend.py
+++ b/lib/matplotlib/tests/test_legend.py
@@ -1,18 +1,22 @@
 import collections
 import platform
 from unittest import mock
+import warnings
 
 import numpy as np
 import pytest
 
-from matplotlib.testing.decorators import image_comparison
+from matplotlib.testing.decorators import check_figures_equal, image_comparison
+from matplotlib.testing._markers import needs_usetex
 import matplotlib.pyplot as plt
 import matplotlib as mpl
 import matplotlib.transforms as mtransforms
 import matplotlib.collections as mcollections
+import matplotlib.lines as mlines
 from matplotlib.legend_handler import HandlerTuple
 import matplotlib.legend as mlegend
 from matplotlib import rc_context
+from matplotlib.font_manager import FontProperties
 
 
 def test_legend_ordereddict():
@@ -76,6 +80,20 @@ def test_various_labels():
     ax.legend(numpoints=1, loc='best')
 
 
+def test_legend_label_with_leading_underscore():
+    """
+    Test that artists with labels starting with an underscore are not added to
+    the legend, and that a warning is issued if one tries to add them
+    explicitly.
+    """
+    fig, ax = plt.subplots()
+    line, = ax.plot([0, 1], label='_foo')
+    with pytest.warns(UserWarning,
+                      match=r"starts with '_'.*excluded from the legend."):
+        legend = ax.legend(handles=[line])
+    assert len(legend.legendHandles) == 0
+
+
 @image_comparison(['legend_labels_first.png'], remove_text=True)
 def test_labels_first():
     # test labels to left of markers
@@ -126,12 +144,12 @@ def test_alpha_rcparam():
 def test_fancy():
     # using subplot triggers some offsetbox functionality untested elsewhere
     plt.subplot(121)
-    plt.scatter(np.arange(10), np.arange(10, 0, -1), label='XX\nXX')
     plt.plot([5] * 10, 'o--', label='XX')
+    plt.scatter(np.arange(10), np.arange(10, 0, -1), label='XX\nXX')
     plt.errorbar(np.arange(10), np.arange(10), xerr=0.5,
                  yerr=0.5, label='XX')
     plt.legend(loc="center left", bbox_to_anchor=[1.0, 0.5],
-               ncol=2, shadow=True, title="My legend", numpoints=1)
+               ncols=2, shadow=True, title="My legend", numpoints=1)
 
 
 @image_comparison(['framealpha'], remove_text=True,
@@ -173,7 +191,7 @@ def test_legend_expand():
         ax.plot(x, x - 50, 'o', label='y=-1')
         l2 = ax.legend(loc='right', mode=mode)
         ax.add_artist(l2)
-        ax.legend(loc='lower left', mode=mode, ncol=2)
+        ax.legend(loc='lower left', mode=mode, ncols=2)
 
 
 @image_comparison(['hatching'], remove_text=True, style='default')
@@ -479,8 +497,7 @@ def test_linecollection_scaled_dashes():
     h1, h2, h3 = leg.legendHandles
 
     for oh, lh in zip((lc1, lc2, lc3), (h1, h2, h3)):
-        assert oh.get_linestyles()[0][1] == lh._dashSeq
-        assert oh.get_linestyles()[0][0] == lh._dashOffset
+        assert oh.get_linestyles()[0] == lh._dash_pattern
 
 
 def test_handler_numpoints():
@@ -491,6 +508,22 @@ def test_handler_numpoints():
     ax.legend(numpoints=0.5)
 
 
+def test_text_nohandler_warning():
+    """Test that Text artists with labels raise a warning"""
+    fig, ax = plt.subplots()
+    ax.text(x=0, y=0, s="text", label="label")
+    with pytest.warns(UserWarning) as record:
+        ax.legend()
+    assert len(record) == 1
+
+    # this should _not_ warn:
+    f, ax = plt.subplots()
+    ax.pcolormesh(np.random.uniform(0, 1, (10, 10)))
+    with warnings.catch_warnings():
+        warnings.simplefilter("error")
+        ax.get_legend_handles_labels()
+
+
 def test_empty_bar_chart_with_legend():
     """Test legend when bar chart is empty with a label."""
     # related to issue #13003. Calling plt.legend() should not
@@ -544,24 +577,74 @@ def test_window_extent_cached_renderer():
     leg2.get_window_extent()
 
 
-def test_legend_title_fontsize():
+def test_legend_title_fontprop_fontsize():
     # test the title_fontsize kwarg
-    fig, ax = plt.subplots()
-    ax.plot(range(10))
-    leg = ax.legend(title='Aardvark', title_fontsize=22)
-    assert leg.get_title().get_fontsize() == 22
+    plt.plot(range(10))
+    with pytest.raises(ValueError):
+        plt.legend(title='Aardvark', title_fontsize=22,
+                   title_fontproperties={'family': 'serif', 'size': 22})
+
+    leg = plt.legend(title='Aardvark', title_fontproperties=FontProperties(
+                                       family='serif', size=22))
+    assert leg.get_title().get_size() == 22
+
+    fig, axes = plt.subplots(2, 3, figsize=(10, 6))
+    axes = axes.flat
+    axes[0].plot(range(10))
+    leg0 = axes[0].legend(title='Aardvark', title_fontsize=22)
+    assert leg0.get_title().get_fontsize() == 22
+    axes[1].plot(range(10))
+    leg1 = axes[1].legend(title='Aardvark',
+                          title_fontproperties={'family': 'serif', 'size': 22})
+    assert leg1.get_title().get_fontsize() == 22
+    axes[2].plot(range(10))
+    mpl.rcParams['legend.title_fontsize'] = None
+    leg2 = axes[2].legend(title='Aardvark',
+                          title_fontproperties={'family': 'serif'})
+    assert leg2.get_title().get_fontsize() == mpl.rcParams['font.size']
+    axes[3].plot(range(10))
+    leg3 = axes[3].legend(title='Aardvark')
+    assert leg3.get_title().get_fontsize() == mpl.rcParams['font.size']
+    axes[4].plot(range(10))
+    mpl.rcParams['legend.title_fontsize'] = 20
+    leg4 = axes[4].legend(title='Aardvark',
+                          title_fontproperties={'family': 'serif'})
+    assert leg4.get_title().get_fontsize() == 20
+    axes[5].plot(range(10))
+    leg5 = axes[5].legend(title='Aardvark')
+    assert leg5.get_title().get_fontsize() == 20
+
+
+@pytest.mark.parametrize('alignment', ('center', 'left', 'right'))
+def test_legend_alignment(alignment):
+    fig, ax = plt.subplots()
+    ax.plot(range(10), label='test')
+    leg = ax.legend(title="Aardvark", alignment=alignment)
+    assert leg.get_children()[0].align == alignment
+    assert leg.get_alignment() == alignment
+
+
+@pytest.mark.parametrize('alignment', ('center', 'left', 'right'))
+def test_legend_set_alignment(alignment):
+    fig, ax = plt.subplots()
+    ax.plot(range(10), label='test')
+    leg = ax.legend()
+    leg.set_alignment(alignment)
+    assert leg.get_children()[0].align == alignment
+    assert leg.get_alignment() == alignment
 
 
-def test_legend_labelcolor_single():
+@pytest.mark.parametrize('color', ('red', 'none', (.5, .5, .5)))
+def test_legend_labelcolor_single(color):
     # test labelcolor for a single color
     fig, ax = plt.subplots()
     ax.plot(np.arange(10), np.arange(10)*1, label='#1')
     ax.plot(np.arange(10), np.arange(10)*2, label='#2')
     ax.plot(np.arange(10), np.arange(10)*3, label='#3')
 
-    leg = ax.legend(labelcolor='red')
+    leg = ax.legend(labelcolor=color)
     for text in leg.get_texts():
-        assert mpl.colors.same_color(text.get_color(), 'red')
+        assert mpl.colors.same_color(text.get_color(), color)
 
 
 def test_legend_labelcolor_list():
@@ -612,6 +695,85 @@ def test_legend_labelcolor_markerfacecolor():
         assert mpl.colors.same_color(text.get_color(), color)
 
 
+@pytest.mark.parametrize('color', ('red', 'none', (.5, .5, .5)))
+def test_legend_labelcolor_rcparam_single(color):
+    # test the rcParams legend.labelcolor for a single color
+    fig, ax = plt.subplots()
+    ax.plot(np.arange(10), np.arange(10)*1, label='#1')
+    ax.plot(np.arange(10), np.arange(10)*2, label='#2')
+    ax.plot(np.arange(10), np.arange(10)*3, label='#3')
+
+    mpl.rcParams['legend.labelcolor'] = color
+    leg = ax.legend()
+    for text in leg.get_texts():
+        assert mpl.colors.same_color(text.get_color(), color)
+
+
+def test_legend_labelcolor_rcparam_linecolor():
+    # test the rcParams legend.labelcolor for a linecolor
+    fig, ax = plt.subplots()
+    ax.plot(np.arange(10), np.arange(10)*1, label='#1', color='r')
+    ax.plot(np.arange(10), np.arange(10)*2, label='#2', color='g')
+    ax.plot(np.arange(10), np.arange(10)*3, label='#3', color='b')
+
+    mpl.rcParams['legend.labelcolor'] = 'linecolor'
+    leg = ax.legend()
+    for text, color in zip(leg.get_texts(), ['r', 'g', 'b']):
+        assert mpl.colors.same_color(text.get_color(), color)
+
+
+def test_legend_labelcolor_rcparam_markeredgecolor():
+    # test the labelcolor for labelcolor='markeredgecolor'
+    fig, ax = plt.subplots()
+    ax.plot(np.arange(10), np.arange(10)*1, label='#1', markeredgecolor='r')
+    ax.plot(np.arange(10), np.arange(10)*2, label='#2', markeredgecolor='g')
+    ax.plot(np.arange(10), np.arange(10)*3, label='#3', markeredgecolor='b')
+
+    mpl.rcParams['legend.labelcolor'] = 'markeredgecolor'
+    leg = ax.legend()
+    for text, color in zip(leg.get_texts(), ['r', 'g', 'b']):
+        assert mpl.colors.same_color(text.get_color(), color)
+
+
+def test_legend_labelcolor_rcparam_markeredgecolor_short():
+    # test the labelcolor for labelcolor='markeredgecolor'
+    fig, ax = plt.subplots()
+    ax.plot(np.arange(10), np.arange(10)*1, label='#1', markeredgecolor='r')
+    ax.plot(np.arange(10), np.arange(10)*2, label='#2', markeredgecolor='g')
+    ax.plot(np.arange(10), np.arange(10)*3, label='#3', markeredgecolor='b')
+
+    mpl.rcParams['legend.labelcolor'] = 'mec'
+    leg = ax.legend()
+    for text, color in zip(leg.get_texts(), ['r', 'g', 'b']):
+        assert mpl.colors.same_color(text.get_color(), color)
+
+
+def test_legend_labelcolor_rcparam_markerfacecolor():
+    # test the labelcolor for labelcolor='markeredgecolor'
+    fig, ax = plt.subplots()
+    ax.plot(np.arange(10), np.arange(10)*1, label='#1', markerfacecolor='r')
+    ax.plot(np.arange(10), np.arange(10)*2, label='#2', markerfacecolor='g')
+    ax.plot(np.arange(10), np.arange(10)*3, label='#3', markerfacecolor='b')
+
+    mpl.rcParams['legend.labelcolor'] = 'markerfacecolor'
+    leg = ax.legend()
+    for text, color in zip(leg.get_texts(), ['r', 'g', 'b']):
+        assert mpl.colors.same_color(text.get_color(), color)
+
+
+def test_legend_labelcolor_rcparam_markerfacecolor_short():
+    # test the labelcolor for labelcolor='markeredgecolor'
+    fig, ax = plt.subplots()
+    ax.plot(np.arange(10), np.arange(10)*1, label='#1', markerfacecolor='r')
+    ax.plot(np.arange(10), np.arange(10)*2, label='#2', markerfacecolor='g')
+    ax.plot(np.arange(10), np.arange(10)*3, label='#3', markerfacecolor='b')
+
+    mpl.rcParams['legend.labelcolor'] = 'mfc'
+    leg = ax.legend()
+    for text, color in zip(leg.get_texts(), ['r', 'g', 'b']):
+        assert mpl.colors.same_color(text.get_color(), color)
+
+
 def test_get_set_draggable():
     legend = plt.legend()
     assert not legend.get_draggable()
@@ -630,9 +792,7 @@ def test_alpha_handles():
     assert lh.get_edgecolor()[:-1] == hh[1].get_edgecolor()[:-1]
 
 
-@pytest.mark.skipif(
-    not mpl.checkdep_usetex(True),
-    reason="This test needs a TeX installation")
+@needs_usetex
 def test_usetex_no_warn(caplog):
     mpl.rcParams['font.family'] = 'serif'
     mpl.rcParams['font.serif'] = 'Computer Modern'
@@ -723,7 +883,7 @@ def test_plot_single_input_multiple_label(label_array):
 
 
 def test_plot_multiple_label_incorrect_length_exception():
-    # check that excepton is raised if multiple labels
+    # check that exception is raised if multiple labels
     # are given, but number of on labels != number of lines
     with pytest.raises(ValueError):
         x = [1, 2, 3]
@@ -733,3 +893,72 @@ def test_plot_multiple_label_incorrect_length_exception():
         label = ['high', 'low', 'medium']
         fig, ax = plt.subplots()
         ax.plot(x, y, label=label)
+
+
+def test_legend_face_edgecolor():
+    # Smoke test for PolyCollection legend handler with 'face' edgecolor.
+    fig, ax = plt.subplots()
+    ax.fill_between([0, 1, 2], [1, 2, 3], [2, 3, 4],
+                    facecolor='r', edgecolor='face', label='Fill')
+    ax.legend()
+
+
+def test_legend_text_axes():
+    fig, ax = plt.subplots()
+    ax.plot([1, 2], [3, 4], label='line')
+    leg = ax.legend()
+
+    assert leg.axes is ax
+    assert leg.get_texts()[0].axes is ax
+
+
+def test_handlerline2d():
+    # Test marker consistency for monolithic Line2D legend handler (#11357).
+    fig, ax = plt.subplots()
+    ax.scatter([0, 1], [0, 1], marker="v")
+    handles = [mlines.Line2D([0], [0], marker="v")]
+    leg = ax.legend(handles, ["Aardvark"], numpoints=1)
+    assert handles[0].get_marker() == leg.legendHandles[0].get_marker()
+
+
+def test_subfigure_legend():
+    # Test that legend can be added to subfigure (#20723)
+    subfig = plt.figure().subfigures()
+    ax = subfig.subplots()
+    ax.plot([0, 1], [0, 1], label="line")
+    leg = subfig.legend()
+    assert leg.figure is subfig
+
+
+def test_setting_alpha_keeps_polycollection_color():
+    pc = plt.fill_between([0, 1], [2, 3], color='#123456', label='label')
+    patch = plt.legend().get_patches()[0]
+    patch.set_alpha(0.5)
+    assert patch.get_facecolor()[:3] == tuple(pc.get_facecolor()[0][:3])
+    assert patch.get_edgecolor()[:3] == tuple(pc.get_edgecolor()[0][:3])
+
+
+def test_legend_markers_from_line2d():
+    # Test that markers can be copied for legend lines (#17960)
+    _markers = ['.', '*', 'v']
+    fig, ax = plt.subplots()
+    lines = [mlines.Line2D([0], [0], ls='None', marker=mark)
+             for mark in _markers]
+    labels = ["foo", "bar", "xyzzy"]
+    markers = [line.get_marker() for line in lines]
+    legend = ax.legend(lines, labels)
+
+    new_markers = [line.get_marker() for line in legend.get_lines()]
+    new_labels = [text.get_text() for text in legend.get_texts()]
+
+    assert markers == new_markers == _markers
+    assert labels == new_labels
+
+
+@check_figures_equal()
+def test_ncol_ncols(fig_test, fig_ref):
+    # Test that both ncol and ncols work
+    strings = ["a", "b", "c", "d", "e", "f"]
+    ncols = 3
+    fig_test.legend(strings, ncol=ncols)
+    fig_ref.legend(strings, ncols=ncols)
diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py
index def26456bb36..e7002df8a558 100644
--- a/lib/matplotlib/tests/test_lines.py
+++ b/lib/matplotlib/tests/test_lines.py
@@ -12,10 +12,12 @@
 import pytest
 
 import matplotlib
+import matplotlib as mpl
 import matplotlib.lines as mlines
 from matplotlib.markers import MarkerStyle
 from matplotlib.path import Path
 import matplotlib.pyplot as plt
+import matplotlib.transforms as mtransforms
 from matplotlib.testing.decorators import image_comparison, check_figures_equal
 
 
@@ -107,7 +109,9 @@ def test_valid_colors():
 def test_linestyle_variants():
     fig, ax = plt.subplots()
     for ls in ["-", "solid", "--", "dashed",
-               "-.", "dashdot", ":", "dotted"]:
+               "-.", "dashdot", ":", "dotted",
+               (0, None), (0, ()), (0, []),  # gh-22930
+               ]:
         ax.plot(range(10), linestyle=ls)
     fig.canvas.draw()
 
@@ -131,6 +135,17 @@ def test_drawstyle_variants():
         ax.set(xlim=(0, 2), ylim=(0, 2))
 
 
+@check_figures_equal(extensions=('png',))
+def test_no_subslice_with_transform(fig_ref, fig_test):
+    ax = fig_ref.add_subplot()
+    x = np.arange(2000)
+    ax.plot(x + 2000, x)
+
+    ax = fig_test.add_subplot()
+    t = mtransforms.Affine2D().translate(2000.0, 0.0)
+    ax.plot(x, x, transform=t+ax.transData)
+
+
 def test_valid_drawstyles():
     line = mlines.Line2D([], [])
     with pytest.raises(ValueError):
@@ -217,28 +232,57 @@ def test_step_markers(fig_test, fig_ref):
     fig_ref.subplots().plot([0, 0, 1], [0, 1, 1], "-o", markevery=[0, 2])
 
 
+@pytest.mark.parametrize("parent", ["figure", "axes"])
 @check_figures_equal(extensions=('png',))
-def test_markevery(fig_test, fig_ref):
+def test_markevery(fig_test, fig_ref, parent):
     np.random.seed(42)
-    t = np.linspace(0, 3, 14)
-    y = np.random.rand(len(t))
+    x = np.linspace(0, 1, 14)
+    y = np.random.rand(len(x))
+
+    cases_test = [None, 4, (2, 5), [1, 5, 11],
+                  [0, -1], slice(5, 10, 2),
+                  np.arange(len(x))[y > 0.5],
+                  0.3, (0.3, 0.4)]
+    cases_ref = ["11111111111111", "10001000100010", "00100001000010",
+                 "01000100000100", "10000000000001", "00000101010000",
+                 "01110001110110", "11011011011110", "01010011011101"]
+
+    if parent == "figure":
+        # float markevery ("relative to axes size") is not supported.
+        cases_test = cases_test[:-2]
+        cases_ref = cases_ref[:-2]
+
+        def add_test(x, y, *, markevery):
+            fig_test.add_artist(
+                mlines.Line2D(x, y, marker="o", markevery=markevery))
 
-    casesA = [None, 4, (2, 5), [1, 5, 11],
-              [0, -1], slice(5, 10, 2), 0.3, (0.3, 0.4),
-              np.arange(len(t))[y > 0.5]]
-    casesB = ["11111111111111", "10001000100010", "00100001000010",
-              "01000100000100", "10000000000001", "00000101010000",
-              "11011011011110", "01010011011101", "01110001110110"]
+        def add_ref(x, y, *, markevery):
+            fig_ref.add_artist(
+                mlines.Line2D(x, y, marker="o", markevery=markevery))
 
-    axsA = fig_ref.subplots(3, 3)
-    axsB = fig_test.subplots(3, 3)
+    elif parent == "axes":
+        axs_test = iter(fig_test.subplots(3, 3).flat)
+        axs_ref = iter(fig_ref.subplots(3, 3).flat)
 
-    for ax, case in zip(axsA.flat, casesA):
-        ax.plot(t, y, "-gD", markevery=case)
+        def add_test(x, y, *, markevery):
+            next(axs_test).plot(x, y, "-gD", markevery=markevery)
 
-    for ax, case in zip(axsB.flat, casesB):
+        def add_ref(x, y, *, markevery):
+            next(axs_ref).plot(x, y, "-gD", markevery=markevery)
+
+    for case in cases_test:
+        add_test(x, y, markevery=case)
+
+    for case in cases_ref:
         me = np.array(list(case)).astype(int).astype(bool)
-        ax.plot(t, y, "-gD", markevery=me)
+        add_ref(x, y, markevery=me)
+
+
+def test_markevery_figure_line_unsupported_relsize():
+    fig = plt.figure()
+    fig.add_artist(mlines.Line2D([0, 1], [0, 1], marker="o", markevery=.5))
+    with pytest.raises(ValueError):
+        fig.canvas.draw()
 
 
 def test_marker_as_markerstyle():
@@ -253,7 +297,7 @@ def test_marker_as_markerstyle():
     line.set_marker(MarkerStyle("o"))
     fig.canvas.draw()
     # test Path roundtrip
-    triangle1 = Path([[-1., -1.], [1., -1.], [0., 2.], [0., 0.]], closed=True)
+    triangle1 = Path._create_closed([[-1, -1], [1, -1], [0, 2]])
     line2, = ax.plot([1, 3, 2], marker=MarkerStyle(triangle1), ms=22)
     line3, = ax.plot([0, 2, 1], marker=triangle1, ms=22)
 
@@ -261,6 +305,17 @@ def test_marker_as_markerstyle():
     assert_array_equal(line3.get_marker().vertices, triangle1.vertices)
 
 
+@image_comparison(['striped_line.png'], remove_text=True, style='mpl20')
+def test_striped_lines():
+    rng = np.random.default_rng(19680801)
+    _, ax = plt.subplots()
+    ax.plot(rng.uniform(size=12), color='orange', gapcolor='blue',
+            linestyle='--', lw=5, label=' ')
+    ax.plot(rng.uniform(size=12), color='red', gapcolor='black',
+            linestyle=(0, (2, 5, 4, 2)), lw=5, label=' ', alpha=0.5)
+    ax.legend(handlelength=5)
+
+
 @check_figures_equal()
 def test_odd_dashes(fig_test, fig_ref):
     fig_test.add_subplot().plot([1, 2], dashes=[1, 2, 3])
@@ -291,3 +346,39 @@ def test_picking():
     found, indices = l2.contains(mouse_event)
     assert found
     assert_array_equal(indices['ind'], [0])
+
+
+@check_figures_equal()
+def test_input_copy(fig_test, fig_ref):
+
+    t = np.arange(0, 6, 2)
+    l, = fig_test.add_subplot().plot(t, t, ".-")
+    t[:] = range(3)
+    # Trigger cache invalidation
+    l.set_drawstyle("steps")
+    fig_ref.add_subplot().plot([0, 2, 4], [0, 2, 4], ".-", drawstyle="steps")
+
+
+@check_figures_equal(extensions=["png"])
+def test_markevery_prop_cycle(fig_test, fig_ref):
+    """Test that we can set markevery prop_cycle."""
+    cases = [None, 8, (30, 8), [16, 24, 30], [0, -1],
+             slice(100, 200, 3), 0.1, 0.3, 1.5,
+             (0.0, 0.1), (0.45, 0.1)]
+
+    cmap = mpl.colormaps['jet']
+    colors = cmap(np.linspace(0.2, 0.8, len(cases)))
+
+    x = np.linspace(-1, 1)
+    y = 5 * x**2
+
+    axs = fig_ref.add_subplot()
+    for i, markevery in enumerate(cases):
+        axs.plot(y - i, 'o-', markevery=markevery, color=colors[i])
+
+    matplotlib.rcParams['axes.prop_cycle'] = cycler(markevery=cases,
+                                                    color=colors)
+
+    ax = fig_test.add_subplot()
+    for i, _ in enumerate(cases):
+        ax.plot(y - i, 'o-')
diff --git a/lib/matplotlib/tests/test_marker.py b/lib/matplotlib/tests/test_marker.py
index f85d4ff467ef..f50f45bbd4ee 100644
--- a/lib/matplotlib/tests/test_marker.py
+++ b/lib/matplotlib/tests/test_marker.py
@@ -1,8 +1,10 @@
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib import markers
+from matplotlib._api.deprecation import MatplotlibDeprecationWarning
 from matplotlib.path import Path
 from matplotlib.testing.decorators import check_figures_equal
+from matplotlib.transforms import Affine2D
 
 import pytest
 
@@ -18,7 +20,6 @@ def test_marker_fillstyle():
     'x',
     '',
     'None',
-    None,
     r'$\frac{1}{2}$',
     "$\u266B$",
     1,
@@ -32,7 +33,6 @@ def test_marker_fillstyle():
     (5, 0, 10),  # a pentagon, rotated by 10 degrees
     (7, 1, 10),  # a 7-pointed star, rotated by 10 degrees
     (5, 2, 10),  # asterisk, rotated by 10 degrees
-    markers.MarkerStyle(),
     markers.MarkerStyle('o'),
 ])
 def test_markers_valid(marker):
@@ -40,6 +40,15 @@ def test_markers_valid(marker):
     markers.MarkerStyle(marker)
 
 
+def test_deprecated_marker():
+    with pytest.warns(MatplotlibDeprecationWarning):
+        ms = markers.MarkerStyle()
+    markers.MarkerStyle(ms)  # No warning on copy.
+    with pytest.warns(MatplotlibDeprecationWarning):
+        ms = markers.MarkerStyle(None)
+    markers.MarkerStyle(ms)  # No warning on copy.
+
+
 @pytest.mark.parametrize('marker', [
     'square',  # arbitrary string
     np.array([[-0.5, 0, 1, 2, 3]]),  # 1D array
@@ -196,3 +205,99 @@ def test_marker_clipping(fig_ref, fig_test):
     ax_test.set(xlim=(-0.5, ncol), ylim=(-0.5, 2 * nrow))
     ax_ref.axis('off')
     ax_test.axis('off')
+
+
+def test_marker_init_transforms():
+    """Test that initializing marker with transform is a simple addition."""
+    marker = markers.MarkerStyle("o")
+    t = Affine2D().translate(1, 1)
+    t_marker = markers.MarkerStyle("o", transform=t)
+    assert marker.get_transform() + t == t_marker.get_transform()
+
+
+def test_marker_init_joinstyle():
+    marker = markers.MarkerStyle("*")
+    jstl = markers.JoinStyle.round
+    styled_marker = markers.MarkerStyle("*", joinstyle=jstl)
+    assert styled_marker.get_joinstyle() == jstl
+    assert marker.get_joinstyle() != jstl
+
+
+def test_marker_init_captyle():
+    marker = markers.MarkerStyle("*")
+    capstl = markers.CapStyle.round
+    styled_marker = markers.MarkerStyle("*", capstyle=capstl)
+    assert styled_marker.get_capstyle() == capstl
+    assert marker.get_capstyle() != capstl
+
+
+@pytest.mark.parametrize("marker,transform,expected", [
+    (markers.MarkerStyle("o"), Affine2D().translate(1, 1),
+        Affine2D().translate(1, 1)),
+    (markers.MarkerStyle("o", transform=Affine2D().translate(1, 1)),
+        Affine2D().translate(1, 1), Affine2D().translate(2, 2)),
+    (markers.MarkerStyle("$|||$", transform=Affine2D().translate(1, 1)),
+     Affine2D().translate(1, 1), Affine2D().translate(2, 2)),
+    (markers.MarkerStyle(
+        markers.TICKLEFT, transform=Affine2D().translate(1, 1)),
+        Affine2D().translate(1, 1), Affine2D().translate(2, 2)),
+])
+def test_marker_transformed(marker, transform, expected):
+    new_marker = marker.transformed(transform)
+    assert new_marker is not marker
+    assert new_marker.get_user_transform() == expected
+    assert marker._user_transform is not new_marker._user_transform
+
+
+def test_marker_rotated_invalid():
+    marker = markers.MarkerStyle("o")
+    with pytest.raises(ValueError):
+        new_marker = marker.rotated()
+    with pytest.raises(ValueError):
+        new_marker = marker.rotated(deg=10, rad=10)
+
+
+@pytest.mark.parametrize("marker,deg,rad,expected", [
+    (markers.MarkerStyle("o"), 10, None, Affine2D().rotate_deg(10)),
+    (markers.MarkerStyle("o"), None, 0.01, Affine2D().rotate(0.01)),
+    (markers.MarkerStyle("o", transform=Affine2D().translate(1, 1)),
+        10, None, Affine2D().translate(1, 1).rotate_deg(10)),
+    (markers.MarkerStyle("o", transform=Affine2D().translate(1, 1)),
+        None, 0.01, Affine2D().translate(1, 1).rotate(0.01)),
+    (markers.MarkerStyle("$|||$", transform=Affine2D().translate(1, 1)),
+      10, None, Affine2D().translate(1, 1).rotate_deg(10)),
+    (markers.MarkerStyle(
+        markers.TICKLEFT, transform=Affine2D().translate(1, 1)),
+        10, None, Affine2D().translate(1, 1).rotate_deg(10)),
+])
+def test_marker_rotated(marker, deg, rad, expected):
+    new_marker = marker.rotated(deg=deg, rad=rad)
+    assert new_marker is not marker
+    assert new_marker.get_user_transform() == expected
+    assert marker._user_transform is not new_marker._user_transform
+
+
+def test_marker_scaled():
+    marker = markers.MarkerStyle("1")
+    new_marker = marker.scaled(2)
+    assert new_marker is not marker
+    assert new_marker.get_user_transform() == Affine2D().scale(2)
+    assert marker._user_transform is not new_marker._user_transform
+
+    new_marker = marker.scaled(2, 3)
+    assert new_marker is not marker
+    assert new_marker.get_user_transform() == Affine2D().scale(2, 3)
+    assert marker._user_transform is not new_marker._user_transform
+
+    marker = markers.MarkerStyle("1", transform=Affine2D().translate(1, 1))
+    new_marker = marker.scaled(2)
+    assert new_marker is not marker
+    expected = Affine2D().translate(1, 1).scale(2)
+    assert new_marker.get_user_transform() == expected
+    assert marker._user_transform is not new_marker._user_transform
+
+
+def test_alt_transform():
+    m1 = markers.MarkerStyle("o", "left")
+    m2 = markers.MarkerStyle("o", "left", Affine2D().rotate_deg(90))
+    assert m1.get_alt_transform().rotate_deg(90) == m2.get_alt_transform()
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
index b5fd906d2f9c..7f8b06fa0e9b 100644
--- a/lib/matplotlib/tests/test_mathtext.py
+++ b/lib/matplotlib/tests/test_mathtext.py
@@ -1,6 +1,8 @@
 import io
-import os
+from pathlib import Path
 import re
+import shlex
+from xml.etree import ElementTree as ET
 
 import numpy as np
 import pytest
@@ -8,13 +10,13 @@
 import matplotlib as mpl
 from matplotlib.testing.decorators import check_figures_equal, image_comparison
 import matplotlib.pyplot as plt
-from matplotlib import _api, mathtext
+from matplotlib import mathtext, _mathtext
 
 
 # If test is removed, use None as placeholder
 math_tests = [
     r'$a+b+\dot s+\dot{s}+\ldots$',
-    r'$x \doteq y$',
+    r'$x\hspace{-0.2}\doteq\hspace{-0.2}y$',
     r'\$100.00 $\alpha \_$',
     r'$\frac{\$100.00}{y}$',
     r'$x   y$',
@@ -45,7 +47,7 @@
     r"$\arccos((x^i))$",
     r"$\gamma = \frac{x=\frac{6}{8}}{y} \delta$",
     r'$\limsup_{x\to\infty}$',
-    r'$\oint^\infty_0$',
+    None,
     r"$f'\quad f'''(x)\quad ''/\mathrm{yr}$",
     r'$\frac{x_2888}{y}$',
     r"$\sqrt[3]{\frac{X_2}{Y}}=5$",
@@ -58,8 +60,8 @@
     '$\\Gamma \\Delta \\Theta \\Lambda \\Xi \\Pi \\Sigma \\Upsilon \\Phi \\Psi \\Omega$',
     '$\\alpha \\beta \\gamma \\delta \\epsilon \\zeta \\eta \\theta \\iota \\lambda \\mu \\nu \\xi \\pi \\kappa \\rho \\sigma \\tau \\upsilon \\phi \\chi \\psi$',
 
-    # The examples prefixed by 'mmltt' are from the MathML torture test here:
-    # https://developer.mozilla.org/en-US/docs/Mozilla/MathML_Project/MathML_Torture_Test
+    # The following examples are from the MathML torture test here:
+    # https://www-archive.mozilla.org/projects/mathml/demo/texvsmml.xhtml
     r'${x}^{2}{y}^{2}$',
     r'${}_{2}F_{3}$',
     r'$\frac{x+{y}^{2}}{k+1}$',
@@ -101,25 +103,32 @@
     r"$\left\Vert a \right\Vert \left\vert b \right\vert \left| a \right| \left\| b\right\| \Vert a \Vert \vert b \vert$",
     r'$\mathring{A}  \AA$',
     r'$M \, M \thinspace M \/ M \> M \: M \; M \ M \enspace M \quad M \qquad M \! M$',
-    r'$\Cup$ $\Cap$ $\leftharpoonup$ $\barwedge$ $\rightharpoonup$',
-    r'$\dotplus$ $\doteq$ $\doteqdot$ $\ddots$',
+    r'$\Cap$ $\Cup$ $\leftharpoonup$ $\barwedge$ $\rightharpoonup$',
+    r'$\hspace{-0.2}\dotplus\hspace{-0.2}$ $\hspace{-0.2}\doteq\hspace{-0.2}$ $\hspace{-0.2}\doteqdot\hspace{-0.2}$ $\ddots$',
     r'$xyz^kx_kx^py^{p-2} d_i^jb_jc_kd x^j_i E^0 E^0_u$',  # github issue #4873
     r'${xyz}^k{x}_{k}{x}^{p}{y}^{p-2} {d}_{i}^{j}{b}_{j}{c}_{k}{d} {x}^{j}_{i}{E}^{0}{E}^0_u$',
     r'${\int}_x^x x\oint_x^x x\int_{X}^{X}x\int_x x \int^x x \int_{x} x\int^{x}{\int}_{x} x{\int}^{x}_{x}x$',
     r'testing$^{123}$',
-    ' '.join('$\\' + p + '$' for p in sorted(mathtext.Parser._accentprefixed)),
+    None,
     r'$6-2$; $-2$; $ -2$; ${-2}$; ${  -2}$; $20^{+3}_{-2}$',
     r'$\overline{\omega}^x \frac{1}{2}_0^x$',  # github issue #5444
     r'$,$ $.$ $1{,}234{, }567{ , }890$ and $1,234,567,890$',  # github issue 5799
     r'$\left(X\right)_{a}^{b}$',  # github issue 7615
     r'$\dfrac{\$100.00}{y}$',  # github issue #1888
 ]
-# 'Lightweight' tests test only a single fontset (dejavusans, which is the
+# 'svgastext' tests switch svg output to embed text as text (rather than as
+# paths).
+svgastext_math_tests = [
+    r'$-$-',
+]
+# 'lightweight' tests test only a single fontset (dejavusans, which is the
 # default) and only png outputs, in order to minimize the size of baseline
 # images.
 lightweight_math_tests = [
     r'$\sqrt[ab]{123}$',  # github issue #8665
     r'$x \overset{f}{\rightarrow} \overset{f}{x} \underset{xx}{ff} \overset{xx}{ff} \underset{f}{x} \underset{f}{\leftarrow} x$',  # github issue #18241
+    r'$\sum x\quad\sum^nx\quad\sum_nx\quad\sum_n^nx\quad\prod x\quad\prod^nx\quad\prod_nx\quad\prod_n^nx$',  # GitHub issue 18085
+    r'$1.$ $2.$ $19680801.$ $a.$ $b.$ $mpl.$',
 ]
 
 digits = "0123456789"
@@ -197,6 +206,23 @@ def test_mathtext_rendering(baseline_images, fontset, index, text):
              horizontalalignment='center', verticalalignment='center')
 
 
+@pytest.mark.parametrize('index, text', enumerate(svgastext_math_tests),
+                         ids=range(len(svgastext_math_tests)))
+@pytest.mark.parametrize('fontset', ['cm', 'dejavusans'])
+@pytest.mark.parametrize('baseline_images', ['mathtext0'], indirect=True)
+@image_comparison(
+    baseline_images=None, extensions=['svg'],
+    savefig_kwarg={'metadata': {  # Minimize image size.
+        'Creator': None, 'Date': None, 'Format': None, 'Type': None}})
+def test_mathtext_rendering_svgastext(baseline_images, fontset, index, text):
+    mpl.rcParams['mathtext.fontset'] = fontset
+    mpl.rcParams['svg.fonttype'] = 'none'  # Minimize image size.
+    fig = plt.figure(figsize=(5.25, 0.75))
+    fig.patch.set(visible=False)  # Minimize image size.
+    fig.text(0.5, 0.5, text,
+             horizontalalignment='center', verticalalignment='center')
+
+
 @pytest.mark.parametrize('index, text', enumerate(lightweight_math_tests),
                          ids=range(len(lightweight_math_tests)))
 @pytest.mark.parametrize('fontset', ['dejavusans'])
@@ -221,6 +247,19 @@ def test_mathfont_rendering(baseline_images, fontset, index, text):
              horizontalalignment='center', verticalalignment='center')
 
 
+@check_figures_equal(extensions=["png"])
+def test_short_long_accents(fig_test, fig_ref):
+    acc_map = _mathtext.Parser._accent_map
+    short_accs = [s for s in acc_map if len(s) == 1]
+    corresponding_long_accs = []
+    for s in short_accs:
+        l, = [l for l in acc_map if len(l) > 1 and acc_map[l] == acc_map[s]]
+        corresponding_long_accs.append(l)
+    fig_test.text(0, .5, "$" + "".join(rf"\{s}a" for s in short_accs) + "$")
+    fig_ref.text(
+        0, .5, "$" + "".join(fr"\{l} a" for l in corresponding_long_accs) + "$")
+
+
 def test_fontinfo():
     fontpath = mpl.font_manager.findfont("DejaVu Sans")
     font = mpl.ft2font.FT2Font(fontpath)
@@ -231,8 +270,10 @@ def test_fontinfo():
 @pytest.mark.parametrize(
     'math, msg',
     [
-        (r'$\hspace{}$', r'Expected \hspace{n}'),
-        (r'$\hspace{foo}$', r'Expected \hspace{n}'),
+        (r'$\hspace{}$', r'Expected \hspace{space}'),
+        (r'$\hspace{foo}$', r'Expected \hspace{space}'),
+        (r'$\sinx$', r'Unknown symbol: \sinx'),
+        (r'$\dotx$', r'Unknown symbol: \dotx'),
         (r'$\frac$', r'Expected \frac{num}{den}'),
         (r'$\frac{}{}$', r'Expected \frac{num}{den}'),
         (r'$\binom$', r'Expected \binom{num}{den}'),
@@ -243,20 +284,28 @@ def test_fontinfo():
          r'Expected \genfrac{ldelim}{rdelim}{rulesize}{style}{num}{den}'),
         (r'$\sqrt$', r'Expected \sqrt{value}'),
         (r'$\sqrt f$', r'Expected \sqrt{value}'),
-        (r'$\overline$', r'Expected \overline{value}'),
-        (r'$\overline{}$', r'Expected \overline{value}'),
+        (r'$\overline$', r'Expected \overline{body}'),
+        (r'$\overline{}$', r'Expected \overline{body}'),
         (r'$\leftF$', r'Expected a delimiter'),
         (r'$\rightF$', r'Unknown symbol: \rightF'),
         (r'$\left(\right$', r'Expected a delimiter'),
-        (r'$\left($', r'Expected "\right"'),
+        # PyParsing 2 uses double quotes, PyParsing 3 uses single quotes and an
+        # extra backslash.
+        (r'$\left($', re.compile(r'Expected ("|\'\\)\\right["\']')),
         (r'$\dfrac$', r'Expected \dfrac{num}{den}'),
         (r'$\dfrac{}{}$', r'Expected \dfrac{num}{den}'),
-        (r'$\overset$', r'Expected \overset{body}{annotation}'),
-        (r'$\underset$', r'Expected \underset{body}{annotation}'),
+        (r'$\overset$', r'Expected \overset{annotation}{body}'),
+        (r'$\underset$', r'Expected \underset{annotation}{body}'),
+        (r'$\foo$', r'Unknown symbol: \foo'),
+        (r'$a^2^2$', r'Double superscript'),
+        (r'$a_2_2$', r'Double subscript'),
+        (r'$a^2_a^2$', r'Double superscript'),
     ],
     ids=[
         'hspace without value',
         'hspace with invalid value',
+        'function without space',
+        'accent without space',
         'frac without parameters',
         'frac with empty parameters',
         'binom without parameters',
@@ -275,34 +324,36 @@ def test_fontinfo():
         'dfrac with empty parameters',
         'overset without parameters',
         'underset without parameters',
+        'unknown symbol',
+        'double superscript',
+        'double subscript',
+        'super on sub without braces'
     ]
 )
 def test_mathtext_exceptions(math, msg):
     parser = mathtext.MathTextParser('agg')
-
-    with pytest.raises(ValueError, match=re.escape(msg)):
+    match = re.escape(msg) if isinstance(msg, str) else msg
+    with pytest.raises(ValueError, match=match):
         parser.parse(math)
 
 
-def test_single_minus_sign():
-    plt.figure(figsize=(0.3, 0.3))
-    plt.text(0.5, 0.5, '$-$')
-    plt.gca().spines[:].set_visible(False)
-    plt.gca().set_xticks([])
-    plt.gca().set_yticks([])
+def test_get_unicode_index_exception():
+    with pytest.raises(ValueError):
+        _mathtext.get_unicode_index(r'\foo')
 
-    buff = io.BytesIO()
-    plt.savefig(buff, format="rgba", dpi=1000)
-    array = np.frombuffer(buff.getvalue(), dtype=np.uint8)
 
-    # If this fails, it would be all white
-    assert not np.all(array == 0xff)
+def test_single_minus_sign():
+    fig = plt.figure()
+    fig.text(0.5, 0.5, '$-$')
+    fig.canvas.draw()
+    t = np.asarray(fig.canvas.renderer.buffer_rgba())
+    assert (t != 0xff).any()  # assert that canvas is not all white.
 
 
 @check_figures_equal(extensions=["png"])
 def test_spaces(fig_test, fig_ref):
-    fig_test.subplots().set_title(r"$1\,2\>3\ 4$")
-    fig_ref.subplots().set_title(r"$1\/2\:3~4$")
+    fig_test.text(.5, .5, r"$1\,2\>3\ 4$")
+    fig_ref.text(.5, .5, r"$1\/2\:3~4$")
 
 
 @check_figures_equal(extensions=["png"])
@@ -315,6 +366,7 @@ def test_operator_space(fig_test, fig_ref):
     fig_test.text(0.1, 0.6, r"$\operatorname{op}[6]$")
     fig_test.text(0.1, 0.7, r"$\cos^2$")
     fig_test.text(0.1, 0.8, r"$\log_2$")
+    fig_test.text(0.1, 0.9, r"$\sin^2 \cos$")  # GitHub issue #17852
 
     fig_ref.text(0.1, 0.1, r"$\mathrm{log\,}6$")
     fig_ref.text(0.1, 0.2, r"$\mathrm{log}(6)$")
@@ -324,6 +376,23 @@ def test_operator_space(fig_test, fig_ref):
     fig_ref.text(0.1, 0.6, r"$\mathrm{op}[6]$")
     fig_ref.text(0.1, 0.7, r"$\mathrm{cos}^2$")
     fig_ref.text(0.1, 0.8, r"$\mathrm{log}_2$")
+    fig_ref.text(0.1, 0.9, r"$\mathrm{sin}^2 \mathrm{\,cos}$")
+
+
+@check_figures_equal(extensions=["png"])
+def test_inverted_delimiters(fig_test, fig_ref):
+    fig_test.text(.5, .5, r"$\left)\right($", math_fontfamily="dejavusans")
+    fig_ref.text(.5, .5, r"$)($", math_fontfamily="dejavusans")
+
+
+@check_figures_equal(extensions=["png"])
+def test_genfrac_displaystyle(fig_test, fig_ref):
+    fig_test.text(0.1, 0.1, r"$\dfrac{2x}{3y}$")
+
+    thickness = _mathtext.TruetypeFonts.get_underline_thickness(
+        None, None, fontsize=mpl.rcParams["font.size"],
+        dpi=mpl.rcParams["savefig.dpi"])
+    fig_ref.text(0.1, 0.1, r"$\genfrac{}{}{%f}{0}{2x}{3y}$" % thickness)
 
 
 def test_mathtext_fallback_valid():
@@ -337,19 +406,13 @@ def test_mathtext_fallback_invalid():
             mpl.rcParams['mathtext.fallback'] = fallback
 
 
-def test_mathtext_fallback_to_cm_invalid():
-    for fallback in [True, False]:
-        with pytest.warns(_api.MatplotlibDeprecationWarning):
-            mpl.rcParams['mathtext.fallback_to_cm'] = fallback
-
-
 @pytest.mark.parametrize(
     "fallback,fontlist",
     [("cm", ['DejaVu Sans', 'mpltest', 'STIXGeneral', 'cmr10', 'STIXGeneral']),
      ("stix", ['DejaVu Sans', 'mpltest', 'STIXGeneral'])])
 def test_mathtext_fallback(fallback, fontlist):
     mpl.font_manager.fontManager.addfont(
-        os.path.join((os.path.dirname(os.path.realpath(__file__))), 'mpltest.ttf'))
+        str(Path(__file__).resolve().parent / 'mpltest.ttf'))
     mpl.rcParams["svg.fonttype"] = 'none'
     mpl.rcParams['mathtext.fontset'] = 'custom'
     mpl.rcParams['mathtext.rm'] = 'mpltest'
@@ -363,24 +426,19 @@ def test_mathtext_fallback(fallback, fontlist):
     fig, ax = plt.subplots()
     fig.text(.5, .5, test_str, fontsize=40, ha='center')
     fig.savefig(buff, format="svg")
-    char_fonts = [
-        line.split("font-family:")[-1].split(";")[0]
-        for line in str(buff.getvalue()).split(r"\n") if "tspan" in line
-    ]
+    tspans = (ET.fromstring(buff.getvalue())
+              .findall(".//{http://www.w3.org/2000/svg}tspan[@style]"))
+    # Getting the last element of the style attrib is a close enough
+    # approximation for parsing the font property.
+    char_fonts = [shlex.split(tspan.attrib["style"])[-1] for tspan in tspans]
     assert char_fonts == fontlist
-    mpl.font_manager.fontManager.ttflist = mpl.font_manager.fontManager.ttflist[:-1]
+    mpl.font_manager.fontManager.ttflist.pop()
 
 
 def test_math_to_image(tmpdir):
     mathtext.math_to_image('$x^2$', str(tmpdir.join('example.png')))
     mathtext.math_to_image('$x^2$', io.BytesIO())
-
-
-def test_mathtext_to_png(tmpdir):
-    with _api.suppress_matplotlib_deprecation_warning():
-        mt = mathtext.MathTextParser('bitmap')
-        mt.to_png(str(tmpdir.join('example.png')), '$x^2$')
-        mt.to_png(io.BytesIO(), '$x^2$')
+    mathtext.math_to_image('$x^2$', io.BytesIO(), color='Maroon')
 
 
 @image_comparison(baseline_images=['math_fontfamily_image.png'],
@@ -391,3 +449,54 @@ def test_math_fontfamily():
              size=24, math_fontfamily='dejavusans')
     fig.text(0.2, 0.3, r"$This\ text\ should\ have\ another$",
              size=24, math_fontfamily='stix')
+
+
+def test_default_math_fontfamily():
+    mpl.rcParams['mathtext.fontset'] = 'cm'
+    test_str = r'abc$abc\alpha$'
+    fig, ax = plt.subplots()
+
+    text1 = fig.text(0.1, 0.1, test_str, font='Arial')
+    prop1 = text1.get_fontproperties()
+    assert prop1.get_math_fontfamily() == 'cm'
+    text2 = fig.text(0.2, 0.2, test_str, fontproperties='Arial')
+    prop2 = text2.get_fontproperties()
+    assert prop2.get_math_fontfamily() == 'cm'
+
+    fig.draw_without_rendering()
+
+
+def test_argument_order():
+    mpl.rcParams['mathtext.fontset'] = 'cm'
+    test_str = r'abc$abc\alpha$'
+    fig, ax = plt.subplots()
+
+    text1 = fig.text(0.1, 0.1, test_str,
+                     math_fontfamily='dejavusans', font='Arial')
+    prop1 = text1.get_fontproperties()
+    assert prop1.get_math_fontfamily() == 'dejavusans'
+    text2 = fig.text(0.2, 0.2, test_str,
+                     math_fontfamily='dejavusans', fontproperties='Arial')
+    prop2 = text2.get_fontproperties()
+    assert prop2.get_math_fontfamily() == 'dejavusans'
+    text3 = fig.text(0.3, 0.3, test_str,
+                     font='Arial', math_fontfamily='dejavusans')
+    prop3 = text3.get_fontproperties()
+    assert prop3.get_math_fontfamily() == 'dejavusans'
+    text4 = fig.text(0.4, 0.4, test_str,
+                     fontproperties='Arial', math_fontfamily='dejavusans')
+    prop4 = text4.get_fontproperties()
+    assert prop4.get_math_fontfamily() == 'dejavusans'
+
+    fig.draw_without_rendering()
+
+
+def test_mathtext_cmr10_minus_sign():
+    # cmr10 does not contain a minus sign and used to issue a warning
+    # RuntimeWarning: Glyph 8722 missing from current font.
+    mpl.rcParams['font.family'] = 'cmr10'
+    mpl.rcParams['axes.formatter.use_mathtext'] = True
+    fig, ax = plt.subplots()
+    ax.plot(range(-1, 1), range(-1, 1))
+    # draw to make sure we have no warnings
+    fig.canvas.draw()
diff --git a/lib/matplotlib/tests/test_matplotlib.py b/lib/matplotlib/tests/test_matplotlib.py
index c55b411ec31b..6f92b4ca0abd 100644
--- a/lib/matplotlib/tests/test_matplotlib.py
+++ b/lib/matplotlib/tests/test_matplotlib.py
@@ -7,6 +7,16 @@
 import matplotlib
 
 
+@pytest.mark.parametrize('version_str, version_tuple', [
+    ('3.5.0', (3, 5, 0, 'final', 0)),
+    ('3.5.0rc2', (3, 5, 0, 'candidate', 2)),
+    ('3.5.0.dev820+g6768ef8c4c', (3, 5, 0, 'alpha', 820)),
+    ('3.5.0.post820+g6768ef8c4c', (3, 5, 1, 'alpha', 820)),
+])
+def test_parse_to_version_info(version_str, version_tuple):
+    assert matplotlib._parse_to_version_info(version_str) == version_tuple
+
+
 @pytest.mark.skipif(
     os.name == "nt", reason="chmod() doesn't work as is on Windows")
 @pytest.mark.skipif(os.name != "nt" and os.geteuid() == 0,
@@ -25,6 +35,14 @@ def test_tmpconfigdir_warning(tmpdir):
         os.chmod(tmpdir, mode)
 
 
+def test_importable_with_no_home(tmpdir):
+    subprocess.run(
+        [sys.executable, "-c",
+         "import pathlib; pathlib.Path.home = lambda *args: 1/0; "
+         "import matplotlib.pyplot"],
+        env={**os.environ, "MPLCONFIGDIR": str(tmpdir)}, check=True)
+
+
 def test_use_doc_standard_backends():
     """
     Test that the standard backends mentioned in the docstring of
diff --git a/lib/matplotlib/tests/test_mlab.py b/lib/matplotlib/tests/test_mlab.py
index 5976fb32fc2e..86beb5c8c803 100644
--- a/lib/matplotlib/tests/test_mlab.py
+++ b/lib/matplotlib/tests/test_mlab.py
@@ -3,7 +3,7 @@
 import numpy as np
 import pytest
 
-import matplotlib.mlab as mlab
+from matplotlib import mlab, _api
 
 
 class TestStride:
@@ -13,6 +13,11 @@ def get_base(self, x):
             y = y.base
         return y
 
+    @pytest.fixture(autouse=True)
+    def stride_is_deprecated(self):
+        with _api.suppress_matplotlib_deprecation_warning():
+            yield
+
     def calc_window_target(self, x, NFFT, noverlap=0, axis=0):
         """
         This is an adaptation of the original window extraction algorithm.
@@ -92,7 +97,7 @@ def test_window():
 
 
 class TestDetrend:
-    def setup(self):
+    def setup_method(self):
         np.random.seed(0)
         n = 1000
         x = np.linspace(0., 100, n)
@@ -262,7 +267,7 @@ def test_detrend_linear_2d(self):
         ([], 255, 33, -1, -1, None),
         ([], 256, 128, -1, 256, 256),
         ([], None, -1, 32, -1, -1),
-   ],
+    ],
     ids=[
         'nosig',
         'Fs4',
@@ -354,7 +359,7 @@ def stim(self, request, fstims, iscomplex, sides, len_x, NFFT_density,
                                              num=pad_to_spectrum_real // 2 + 1)
         else:
             # frequencies for specgram, psd, and csd
-            # need to handle even and odd differentl
+            # need to handle even and odd differently
             if pad_to_density_real % 2:
                 freqs_density = np.linspace(-Fs / 2, Fs / 2,
                                             num=2 * pad_to_density_real,
@@ -858,11 +863,11 @@ def test_cohere():
     assert np.isreal(np.mean(cohsq))
 
 
-#*****************************************************************
-# These Tests where taken from SCIPY with some minor modifications
+# *****************************************************************
+# These Tests were taken from SCIPY with some minor modifications
 # this can be retrieved from:
 # https://github.com/scipy/scipy/blob/master/scipy/stats/tests/test_kdeoth.py
-#*****************************************************************
+# *****************************************************************
 
 class TestGaussianKDE:
 
diff --git a/lib/matplotlib/tests/test_nbagg_01.ipynb b/lib/matplotlib/tests/test_nbagg_01.ipynb
index c8839afe8ddd..8505e057fdc3 100644
--- a/lib/matplotlib/tests/test_nbagg_01.ipynb
+++ b/lib/matplotlib/tests/test_nbagg_01.ipynb
@@ -473,7 +473,7 @@
        "    };\n",
        "}\n",
        "\n",
-       "// from http://stackoverflow.com/questions/1114465/getting-mouse-location-in-canvas\n",
+       "// from https://stackoverflow.com/questions/1114465/getting-mouse-location-in-canvas\n",
        "mpl.findpos = function(e) {\n",
        "    //this section is from http://www.quirksmode.org/js/events_properties.html\n",
        "    var targ;\n",
@@ -498,7 +498,7 @@
        "/*\n",
        " * return a copy of an object with only non-object keys\n",
        " * we need this to avoid circular references\n",
-       " * http://stackoverflow.com/a/24161582/3208463\n",
+       " * https://stackoverflow.com/a/24161582/3208463\n",
        " */\n",
        "function simpleKeys (original) {\n",
        "  return Object.keys(original).reduce(function (obj, key) {\n",
diff --git a/lib/matplotlib/tests/test_offsetbox.py b/lib/matplotlib/tests/test_offsetbox.py
index 72fdbdbf2e3b..dc71e14cdb08 100644
--- a/lib/matplotlib/tests/test_offsetbox.py
+++ b/lib/matplotlib/tests/test_offsetbox.py
@@ -9,11 +9,11 @@
 import matplotlib.pyplot as plt
 import matplotlib.patches as mpatches
 import matplotlib.lines as mlines
-from matplotlib.backend_bases import MouseButton
+from matplotlib.backend_bases import MouseButton, MouseEvent
 
 from matplotlib.offsetbox import (
-        AnchoredOffsetbox, AnnotationBbox, AnchoredText, DrawingArea,
-        OffsetImage, TextArea, _get_packed_offsets)
+    AnchoredOffsetbox, AnnotationBbox, AnchoredText, DrawingArea, OffsetBox,
+    OffsetImage, TextArea, _get_packed_offsets)
 
 
 @image_comparison(['offsetbox_clipping'], remove_text=True)
@@ -117,7 +117,7 @@ def test_expand_with_tight_layout():
     d2 = [2, 1]
     ax.plot(d1, label='series 1')
     ax.plot(d2, label='series 2')
-    ax.legend(ncol=2, mode='expand')
+    ax.legend(ncols=2, mode='expand')
 
     fig.tight_layout()  # where the crash used to happen
 
@@ -228,7 +228,8 @@ def test_picking(child_type, boxcoords):
         x, y = ax.transAxes.transform_point((0.5, 0.5))
     fig.canvas.draw()
     calls.clear()
-    fig.canvas.button_press_event(x, y, MouseButton.LEFT)
+    MouseEvent(
+        "button_press_event", fig.canvas, x, y, MouseButton.LEFT)._process()
     assert len(calls) == 1 and calls[0].artist == ab
 
     # Annotation should *not* be picked by an event at its original center
@@ -237,7 +238,8 @@ def test_picking(child_type, boxcoords):
     ax.set_ylim(-1, 0)
     fig.canvas.draw()
     calls.clear()
-    fig.canvas.button_press_event(x, y, MouseButton.LEFT)
+    MouseEvent(
+        "button_press_event", fig.canvas, x, y, MouseButton.LEFT)._process()
     assert len(calls) == 0
 
 
@@ -321,3 +323,17 @@ def test_annotationbbox_extents():
     fig.canvas.draw()
     fig.tight_layout()
     fig.canvas.draw()
+
+
+def test_zorder():
+    assert OffsetBox(zorder=42).zorder == 42
+
+
+def test_arrowprops_copied():
+    da = DrawingArea(20, 20, 0, 0, clip=True)
+    arrowprops = {"arrowstyle": "->", "relpos": (.3, .7)}
+    ab = AnnotationBbox(da, [.5, .5], xybox=(-0.2, 0.5), xycoords='data',
+                        boxcoords="axes fraction", box_alignment=(0., .5),
+                        arrowprops=arrowprops)
+    assert ab.arrowprops is not ab
+    assert arrowprops["relpos"] == (.3, .7)
diff --git a/lib/matplotlib/tests/test_patches.py b/lib/matplotlib/tests/test_patches.py
index 2a908098364e..45bd6b4b06fc 100644
--- a/lib/matplotlib/tests/test_patches.py
+++ b/lib/matplotlib/tests/test_patches.py
@@ -5,13 +5,15 @@
 from numpy.testing import assert_almost_equal, assert_array_equal
 import pytest
 
-from matplotlib.patches import Patch, Polygon, Rectangle, FancyArrowPatch
+import matplotlib as mpl
+from matplotlib.patches import (Annulus, Ellipse, Patch, Polygon, Rectangle,
+                                FancyArrowPatch, FancyArrow, BoxStyle, Arc)
 from matplotlib.testing.decorators import image_comparison, check_figures_equal
 from matplotlib.transforms import Bbox
 import matplotlib.pyplot as plt
 from matplotlib import (
     collections as mcollections, colors as mcolors, patches as mpatches,
-    path as mpath, style as mstyle, transforms as mtransforms, rcParams)
+    path as mpath, transforms as mtransforms, rcParams)
 
 import sys
 on_win = (sys.platform == 'win32')
@@ -29,6 +31,7 @@ def test_Polygon_close():
 
     # start with open path and close it:
     p = Polygon(xy, closed=True)
+    assert p.get_closed()
     assert_array_equal(p.get_xy(), xyclosed)
     p.set_xy(xy)
     assert_array_equal(p.get_xy(), xyclosed)
@@ -41,6 +44,7 @@ def test_Polygon_close():
 
     # start with open path and leave it open:
     p = Polygon(xy, closed=False)
+    assert not p.get_closed()
     assert_array_equal(p.get_xy(), xy)
     p.set_xy(xy)
     assert_array_equal(p.get_xy(), xy)
@@ -52,6 +56,54 @@ def test_Polygon_close():
     assert_array_equal(p.get_xy(), xyclosed)
 
 
+def test_corner_center():
+    loc = [10, 20]
+    width = 1
+    height = 2
+
+    # Rectangle
+    # No rotation
+    corners = ((10, 20), (11, 20), (11, 22), (10, 22))
+    rect = Rectangle(loc, width, height)
+    assert_array_equal(rect.get_corners(), corners)
+    assert_array_equal(rect.get_center(), (10.5, 21))
+
+    # 90 deg rotation
+    corners_rot = ((10, 20), (10, 21), (8, 21), (8, 20))
+    rect.set_angle(90)
+    assert_array_equal(rect.get_corners(), corners_rot)
+    assert_array_equal(rect.get_center(), (9, 20.5))
+
+    # Rotation not a multiple of 90 deg
+    theta = 33
+    t = mtransforms.Affine2D().rotate_around(*loc, np.deg2rad(theta))
+    corners_rot = t.transform(corners)
+    rect.set_angle(theta)
+    assert_almost_equal(rect.get_corners(), corners_rot)
+
+    # Ellipse
+    loc = [loc[0] + width / 2,
+           loc[1] + height / 2]
+    ellipse = Ellipse(loc, width, height)
+
+    # No rotation
+    assert_array_equal(ellipse.get_corners(), corners)
+
+    # 90 deg rotation
+    corners_rot = ((11.5, 20.5), (11.5, 21.5), (9.5, 21.5), (9.5, 20.5))
+    ellipse.set_angle(90)
+    assert_array_equal(ellipse.get_corners(), corners_rot)
+    # Rotation shouldn't change ellipse center
+    assert_array_equal(ellipse.get_center(), loc)
+
+    # Rotation not a multiple of 90 deg
+    theta = 33
+    t = mtransforms.Affine2D().rotate_around(*loc, np.deg2rad(theta))
+    corners_rot = t.transform(corners)
+    ellipse.set_angle(theta)
+    assert_almost_equal(ellipse.get_corners(), corners_rot)
+
+
 def test_rotate_rect():
     loc = np.asarray([1.0, 2.0])
     width = 2
@@ -76,6 +128,61 @@ def test_rotate_rect():
     assert_almost_equal(rect1.get_verts(), new_verts)
 
 
+@check_figures_equal(extensions=['png'])
+def test_rotate_rect_draw(fig_test, fig_ref):
+    ax_test = fig_test.add_subplot()
+    ax_ref = fig_ref.add_subplot()
+
+    loc = (0, 0)
+    width, height = (1, 1)
+    angle = 30
+    rect_ref = Rectangle(loc, width, height, angle=angle)
+    ax_ref.add_patch(rect_ref)
+    assert rect_ref.get_angle() == angle
+
+    # Check that when the angle is updated after adding to an Axes, that the
+    # patch is marked stale and redrawn in the correct location
+    rect_test = Rectangle(loc, width, height)
+    assert rect_test.get_angle() == 0
+    ax_test.add_patch(rect_test)
+    rect_test.set_angle(angle)
+    assert rect_test.get_angle() == angle
+
+
+@check_figures_equal(extensions=['png'])
+def test_dash_offset_patch_draw(fig_test, fig_ref):
+    ax_test = fig_test.add_subplot()
+    ax_ref = fig_ref.add_subplot()
+
+    loc = (0.1, 0.1)
+    width, height = (0.8, 0.8)
+    rect_ref = Rectangle(loc, width, height, linewidth=3, edgecolor='b',
+                                                linestyle=(0, [6, 6]))
+    # fill the line gaps using a linestyle (0, [0, 6, 6, 0]), which is
+    # equivalent to (6, [6, 6]) but has 0 dash offset
+    rect_ref2 = Rectangle(loc, width, height, linewidth=3, edgecolor='r',
+                                            linestyle=(0, [0, 6, 6, 0]))
+    assert rect_ref.get_linestyle() == (0, [6, 6])
+    assert rect_ref2.get_linestyle() == (0, [0, 6, 6, 0])
+
+    ax_ref.add_patch(rect_ref)
+    ax_ref.add_patch(rect_ref2)
+
+    # Check that the dash offset of the rect is the same if we pass it in the
+    # init method and if we create two rects with appropriate onoff sequence
+    # of linestyle.
+
+    rect_test = Rectangle(loc, width, height, linewidth=3, edgecolor='b',
+                                                    linestyle=(0, [6, 6]))
+    rect_test2 = Rectangle(loc, width, height, linewidth=3, edgecolor='r',
+                                                    linestyle=(6, [6, 6]))
+    assert rect_test.get_linestyle() == (0, [6, 6])
+    assert rect_test2.get_linestyle() == (6, [6, 6])
+
+    ax_test.add_patch(rect_test)
+    ax_test.add_patch(rect_test2)
+
+
 def test_negative_rect():
     # These two rectangles have the same vertices, but starting from a
     # different point.  (We also drop the last vertex, which is a duplicate.)
@@ -127,18 +234,18 @@ def test_patch_alpha_coloring():
     cut_star2 = mpath.Path(verts + 1, codes)
 
     ax = plt.axes()
-    patch = mpatches.PathPatch(cut_star1,
-                               linewidth=5, linestyle='dashdot',
-                               facecolor=(1, 0, 0, 0.5),
-                               edgecolor=(0, 0, 1, 0.75))
-    ax.add_patch(patch)
-
     col = mcollections.PathCollection([cut_star2],
                                       linewidth=5, linestyles='dashdot',
                                       facecolor=(1, 0, 0, 0.5),
                                       edgecolor=(0, 0, 1, 0.75))
     ax.add_collection(col)
 
+    patch = mpatches.PathPatch(cut_star1,
+                               linewidth=5, linestyle='dashdot',
+                               facecolor=(1, 0, 0, 0.5),
+                               edgecolor=(0, 0, 1, 0.75))
+    ax.add_patch(patch)
+
     ax.set_xlim([-1, 2])
     ax.set_ylim([-1, 2])
 
@@ -157,13 +264,6 @@ def test_patch_alpha_override():
     cut_star2 = mpath.Path(verts + 1, codes)
 
     ax = plt.axes()
-    patch = mpatches.PathPatch(cut_star1,
-                               linewidth=5, linestyle='dashdot',
-                               alpha=0.25,
-                               facecolor=(1, 0, 0, 0.5),
-                               edgecolor=(0, 0, 1, 0.75))
-    ax.add_patch(patch)
-
     col = mcollections.PathCollection([cut_star2],
                                       linewidth=5, linestyles='dashdot',
                                       alpha=0.25,
@@ -171,11 +271,18 @@ def test_patch_alpha_override():
                                       edgecolor=(0, 0, 1, 0.75))
     ax.add_collection(col)
 
+    patch = mpatches.PathPatch(cut_star1,
+                               linewidth=5, linestyle='dashdot',
+                               alpha=0.25,
+                               facecolor=(1, 0, 0, 0.5),
+                               edgecolor=(0, 0, 1, 0.75))
+    ax.add_patch(patch)
+
     ax.set_xlim([-1, 2])
     ax.set_ylim([-1, 2])
 
 
-@pytest.mark.style('default')
+@mpl.style.context('default')
 def test_patch_color_none():
     # Make sure the alpha kwarg does not override 'none' facecolor.
     # Addresses issue #7478.
@@ -196,18 +303,18 @@ def test_patch_custom_linestyle():
     cut_star2 = mpath.Path(verts + 1, codes)
 
     ax = plt.axes()
-    patch = mpatches.PathPatch(
-        cut_star1,
-        linewidth=5, linestyle=(0, (5, 7, 10, 7)),
-        facecolor=(1, 0, 0), edgecolor=(0, 0, 1))
-    ax.add_patch(patch)
-
     col = mcollections.PathCollection(
         [cut_star2],
         linewidth=5, linestyles=[(0, (5, 7, 10, 7))],
         facecolor=(1, 0, 0), edgecolor=(0, 0, 1))
     ax.add_collection(col)
 
+    patch = mpatches.PathPatch(
+        cut_star1,
+        linewidth=5, linestyle=(0, (5, 7, 10, 7)),
+        facecolor=(1, 0, 0), edgecolor=(0, 0, 1))
+    ax.add_patch(patch)
+
     ax.set_xlim([-1, 2])
     ax.set_ylim([-1, 2])
 
@@ -333,6 +440,10 @@ def test_patch_str():
     expected = 'Arc(xy=(1, 2), width=3, height=4, angle=5, theta1=6, theta2=7)'
     assert str(p) == expected
 
+    p = mpatches.Annulus(xy=(1, 2), r=(3, 4), width=1, angle=2)
+    expected = "Annulus(xy=(1, 2), r=(3, 4), width=1, angle=2)"
+    assert str(p) == expected
+
     p = mpatches.RegularPolygon((1, 2), 20, radius=5)
     assert str(p) == "RegularPolygon((1, 2), 20, radius=5, orientation=0)"
 
@@ -347,6 +458,9 @@ def test_patch_str():
     p = mpatches.PathPatch(path)
     assert str(p) == "PathPatch3((1, 2) ...)"
 
+    p = mpatches.Polygon(np.empty((0, 2)))
+    assert str(p) == "Polygon0()"
+
     data = [[1, 2], [2, 2], [1, 2]]
     p = mpatches.Polygon(data)
     assert str(p) == "Polygon3((1, 2) ...)"
@@ -381,7 +495,7 @@ def test_multi_color_hatch():
     ax.autoscale(False)
 
     for i in range(5):
-        with mstyle.context({'hatch.color': 'C{}'.format(i)}):
+        with mpl.style.context({'hatch.color': 'C{}'.format(i)}):
             r = Rectangle((i - .8 / 2, 5), .8, 1, hatch='//', fc='none')
         ax.add_patch(r)
 
@@ -457,7 +571,7 @@ def test_datetime_datetime_fails():
     from datetime import datetime
 
     start = datetime(2017, 1, 1, 0, 0, 0)
-    dt_delta = datetime(1970, 1, 5)    # Will be 5 days if units are done wrong
+    dt_delta = datetime(1970, 1, 5)  # Will be 5 days if units are done wrong.
 
     with pytest.raises(TypeError):
         mpatches.Rectangle((start, 0), dt_delta, 1)
@@ -467,7 +581,7 @@ def test_datetime_datetime_fails():
 
 
 def test_contains_point():
-    ell = mpatches.Ellipse((0.5, 0.5), 0.5, 1.0, 0)
+    ell = mpatches.Ellipse((0.5, 0.5), 0.5, 1.0)
     points = [(0.0, 0.5), (0.2, 0.5), (0.25, 0.5), (0.5, 0.5)]
     path = ell.get_path()
     transform = ell.get_transform()
@@ -480,7 +594,7 @@ def test_contains_point():
 
 
 def test_contains_points():
-    ell = mpatches.Ellipse((0.5, 0.5), 0.5, 1.0, 0)
+    ell = mpatches.Ellipse((0.5, 0.5), 0.5, 1.0)
     points = [(0.0, 0.5), (0.2, 0.5), (0.25, 0.5), (0.5, 0.5)]
     path = ell.get_path()
     transform = ell.get_transform()
@@ -522,7 +636,37 @@ def test_fancyarrow_units():
     dtime = datetime(2000, 1, 1)
     fig, ax = plt.subplots()
     arrow = FancyArrowPatch((0, dtime), (0.01, dtime))
-    ax.add_patch(arrow)
+
+
+def test_fancyarrow_setdata():
+    fig, ax = plt.subplots()
+    arrow = ax.arrow(0, 0, 10, 10, head_length=5, head_width=1, width=.5)
+    expected1 = np.array(
+      [[13.54, 13.54],
+       [10.35,  9.65],
+       [10.18,  9.82],
+       [0.18, -0.18],
+       [-0.18,  0.18],
+       [9.82, 10.18],
+       [9.65, 10.35],
+       [13.54, 13.54]]
+    )
+    assert np.allclose(expected1, np.round(arrow.verts, 2))
+
+    expected2 = np.array(
+      [[16.71, 16.71],
+       [16.71, 15.29],
+       [16.71, 15.29],
+       [1.71,  0.29],
+       [0.29,  1.71],
+       [15.29, 16.71],
+       [15.29, 16.71],
+       [16.71, 16.71]]
+    )
+    arrow.set_data(
+        x=1, y=1, dx=15, dy=15, width=2, head_width=2, head_length=1
+    )
+    assert np.allclose(expected2, np.round(arrow.verts, 2))
 
 
 @image_comparison(["large_arc.svg"], style="mpl20")
@@ -532,7 +676,7 @@ def test_large_arc():
     y = -2115
     diameter = 4261
     for ax in [ax1, ax2]:
-        a = mpatches.Arc((x, y), diameter, diameter, lw=2, color='k')
+        a = Arc((x, y), diameter, diameter, lw=2, color='k')
         ax.add_patch(a)
         ax.set_axis_off()
         ax.set_aspect('equal')
@@ -559,7 +703,7 @@ def test_rotated_arcs():
         for prescale, centers in zip((1 - .0001, (1 - .0001) / np.sqrt(2)),
                                       (on_axis_centers, diag_centers)):
             for j, (x_sign, y_sign) in enumerate(centers, start=k):
-                a = mpatches.Arc(
+                a = Arc(
                     (x_sign * scale * prescale,
                      y_sign * scale * prescale),
                     scale * sx,
@@ -582,6 +726,78 @@ def test_rotated_arcs():
         ax.set_aspect("equal")
 
 
+def test_fancyarrow_shape_error():
+    with pytest.raises(ValueError, match="Got unknown shape: 'foo'"):
+        FancyArrow(0, 0, 0.2, 0.2, shape='foo')
+
+
+@pytest.mark.parametrize('fmt, match', (
+    ("foo", "Unknown style: 'foo'"),
+    ("Round,foo", "Incorrect style argument: 'Round,foo'"),
+))
+def test_boxstyle_errors(fmt, match):
+    with pytest.raises(ValueError, match=match):
+        BoxStyle(fmt)
+
+
+@image_comparison(baseline_images=['annulus'], extensions=['png'])
+def test_annulus():
+
+    fig, ax = plt.subplots()
+    cir = Annulus((0.5, 0.5), 0.2, 0.05, fc='g')        # circular annulus
+    ell = Annulus((0.5, 0.5), (0.5, 0.3), 0.1, 45,      # elliptical
+                  fc='m', ec='b', alpha=0.5, hatch='xxx')
+    ax.add_patch(cir)
+    ax.add_patch(ell)
+    ax.set_aspect('equal')
+
+
+@image_comparison(baseline_images=['annulus'], extensions=['png'])
+def test_annulus_setters():
+
+    fig, ax = plt.subplots()
+    cir = Annulus((0., 0.), 0.2, 0.01, fc='g')   # circular annulus
+    ell = Annulus((0., 0.), (1, 2), 0.1, 0,      # elliptical
+                  fc='m', ec='b', alpha=0.5, hatch='xxx')
+    ax.add_patch(cir)
+    ax.add_patch(ell)
+    ax.set_aspect('equal')
+
+    cir.center = (0.5, 0.5)
+    cir.radii = 0.2
+    cir.width = 0.05
+
+    ell.center = (0.5, 0.5)
+    ell.radii = (0.5, 0.3)
+    ell.width = 0.1
+    ell.angle = 45
+
+
+@image_comparison(baseline_images=['annulus'], extensions=['png'])
+def test_annulus_setters2():
+
+    fig, ax = plt.subplots()
+    cir = Annulus((0., 0.), 0.2, 0.01, fc='g')   # circular annulus
+    ell = Annulus((0., 0.), (1, 2), 0.1, 0,      # elliptical
+                  fc='m', ec='b', alpha=0.5, hatch='xxx')
+    ax.add_patch(cir)
+    ax.add_patch(ell)
+    ax.set_aspect('equal')
+
+    cir.center = (0.5, 0.5)
+    cir.set_semimajor(0.2)
+    cir.set_semiminor(0.2)
+    assert cir.radii == (0.2, 0.2)
+    cir.width = 0.05
+
+    ell.center = (0.5, 0.5)
+    ell.set_semimajor(0.5)
+    ell.set_semiminor(0.3)
+    assert ell.radii == (0.5, 0.3)
+    ell.width = 0.1
+    ell.angle = 45
+
+
 def test_degenerate_polygon():
     point = [0, 0]
     correct_extents = Bbox([point, point]).extents
@@ -626,3 +842,41 @@ def test_default_capstyle():
 def test_default_joinstyle():
     patch = Patch()
     assert patch.get_joinstyle() == 'miter'
+
+
+@image_comparison(["autoscale_arc"], extensions=['png', 'svg'],
+                  style="mpl20", remove_text=True)
+def test_autoscale_arc():
+    fig, axs = plt.subplots(1, 3, figsize=(4, 1))
+    arc_lists = (
+        [Arc((0, 0), 1, 1, theta1=0, theta2=90)],
+        [Arc((0.5, 0.5), 1.5, 0.5, theta1=10, theta2=20)],
+        [Arc((0.5, 0.5), 1.5, 0.5, theta1=10, theta2=20),
+         Arc((0.5, 0.5), 2.5, 0.5, theta1=110, theta2=120),
+         Arc((0.5, 0.5), 3.5, 0.5, theta1=210, theta2=220),
+         Arc((0.5, 0.5), 4.5, 0.5, theta1=310, theta2=320)])
+
+    for ax, arcs in zip(axs, arc_lists):
+        for arc in arcs:
+            ax.add_patch(arc)
+        ax.autoscale()
+
+
+@check_figures_equal(extensions=["png", 'svg', 'pdf', 'eps'])
+def test_arc_in_collection(fig_test, fig_ref):
+    arc1 = Arc([.5, .5], .5, 1, theta1=0, theta2=60, angle=20)
+    arc2 = Arc([.5, .5], .5, 1, theta1=0, theta2=60, angle=20)
+    col = mcollections.PatchCollection(patches=[arc2], facecolors='none',
+                                       edgecolors='k')
+    fig_ref.subplots().add_patch(arc1)
+    fig_test.subplots().add_collection(col)
+
+
+@check_figures_equal(extensions=["png", 'svg', 'pdf', 'eps'])
+def test_modifying_arc(fig_test, fig_ref):
+    arc1 = Arc([.5, .5], .5, 1, theta1=0, theta2=60, angle=20)
+    arc2 = Arc([.5, .5], 1.5, 1, theta1=0, theta2=60, angle=10)
+    fig_ref.subplots().add_patch(arc1)
+    fig_test.subplots().add_patch(arc2)
+    arc2.set_width(.5)
+    arc2.set_angle(20)
diff --git a/lib/matplotlib/tests/test_path.py b/lib/matplotlib/tests/test_path.py
index 8bd7777eca0d..8cc4905287e9 100644
--- a/lib/matplotlib/tests/test_path.py
+++ b/lib/matplotlib/tests/test_path.py
@@ -1,4 +1,3 @@
-import copy
 import re
 
 import numpy as np
@@ -54,9 +53,7 @@ def test_path_exceptions():
 
 def test_point_in_path():
     # Test #1787
-    verts2 = [(0, 0), (0, 1), (1, 1), (1, 0), (0, 0)]
-
-    path = Path(verts2, closed=True)
+    path = Path._create_closed([(0, 0), (0, 1), (1, 1), (1, 0)])
     points = [(0.5, 0.5), (1.5, 0.5)]
     ret = path.contains_points(points)
     assert ret.dtype == 'bool'
@@ -333,8 +330,28 @@ def test_path_deepcopy():
     codes = [Path.MOVETO, Path.LINETO]
     path1 = Path(verts)
     path2 = Path(verts, codes)
-    copy.deepcopy(path1)
-    copy.deepcopy(path2)
+    path1_copy = path1.deepcopy()
+    path2_copy = path2.deepcopy()
+    assert path1 is not path1_copy
+    assert path1.vertices is not path1_copy.vertices
+    assert path2 is not path2_copy
+    assert path2.vertices is not path2_copy.vertices
+    assert path2.codes is not path2_copy.codes
+
+
+def test_path_shallowcopy():
+    # Should not raise any error
+    verts = [[0, 0], [1, 1]]
+    codes = [Path.MOVETO, Path.LINETO]
+    path1 = Path(verts)
+    path2 = Path(verts, codes)
+    path1_copy = path1.copy()
+    path2_copy = path2.copy()
+    assert path1 is not path1_copy
+    assert path1.vertices is path1_copy.vertices
+    assert path2 is not path2_copy
+    assert path2.vertices is path2_copy.vertices
+    assert path2.codes is path2_copy.codes
 
 
 @pytest.mark.parametrize('phi', np.concatenate([
@@ -410,6 +427,16 @@ def test_path_intersect_path(phi):
     b = transform.transform_path(Path([(0, 1), (0, 2), (0, 5)]))
     assert a.intersects_path(b) and b.intersects_path(a)
 
+    # a and b are collinear but do not intersect
+    a = transform.transform_path(Path([(1, -1), (0, -1)]))
+    b = transform.transform_path(Path([(0, 1), (0.9, 1)]))
+    assert not a.intersects_path(b) and not b.intersects_path(a)
+
+    # a and b are collinear but do not intersect
+    a = transform.transform_path(Path([(0., -5.), (1., -5.)]))
+    b = transform.transform_path(Path([(1., 5.), (0., 5.)]))
+    assert not a.intersects_path(b) and not b.intersects_path(a)
+
 
 @pytest.mark.parametrize('offset', range(-720, 361, 45))
 def test_full_arc(offset):
diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py
index 34462fa0d179..6e09f4e37d6d 100644
--- a/lib/matplotlib/tests/test_patheffects.py
+++ b/lib/matplotlib/tests/test_patheffects.py
@@ -136,7 +136,8 @@ def test_collection():
                        'edgecolor': 'blue'})
 
 
-@image_comparison(['tickedstroke'], remove_text=True, extensions=['png'])
+@image_comparison(['tickedstroke'], remove_text=True, extensions=['png'],
+                  tol=0.22)  # Increased tolerance due to fixed clipping.
 def test_tickedstroke():
     fig, (ax1, ax2, ax3) = plt.subplots(1, 3, figsize=(12, 4))
     path = Path.unit_circle()
@@ -188,3 +189,16 @@ def test_tickedstroke():
 
     ax3.set_xlim(0, 4)
     ax3.set_ylim(0, 4)
+
+
+@image_comparison(['spaces_and_newlines.png'], remove_text=True)
+def test_patheffects_spaces_and_newlines():
+    ax = plt.subplot()
+    s1 = "         "
+    s2 = "\nNewline also causes problems"
+    text1 = ax.text(0.5, 0.75, s1, ha='center', va='center', size=20,
+                    bbox={'color': 'salmon'})
+    text2 = ax.text(0.5, 0.25, s2, ha='center', va='center', size=20,
+                    bbox={'color': 'thistle'})
+    text1.set_path_effects([path_effects.Normal()])
+    text2.set_path_effects([path_effects.Normal()])
diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py
index 5c169cb23303..ec6bdcc2fe14 100644
--- a/lib/matplotlib/tests/test_pickle.py
+++ b/lib/matplotlib/tests/test_pickle.py
@@ -1,15 +1,20 @@
 from io import BytesIO
+import ast
 import pickle
 
 import numpy as np
 import pytest
 
+import matplotlib as mpl
 from matplotlib import cm
-from matplotlib.testing.decorators import image_comparison
+from matplotlib.testing import subprocess_run_helper
+from matplotlib.testing.decorators import check_figures_equal
 from matplotlib.dates import rrulewrapper
+from matplotlib.lines import VertexSelector
 import matplotlib.pyplot as plt
 import matplotlib.transforms as mtransforms
 import matplotlib.figure as mfigure
+from mpl_toolkits.axes_grid1 import parasite_axes
 
 
 def test_simple():
@@ -39,13 +44,9 @@ def test_simple():
     pickle.dump(fig, BytesIO(), pickle.HIGHEST_PROTOCOL)
 
 
-@image_comparison(
-    ['multi_pickle.png'], remove_text=True, style='mpl20', tol=0.082)
-def test_complete():
-    # Remove this line when this test image is regenerated.
-    plt.rcParams['pcolormesh.snap'] = False
-
-    fig = plt.figure('Figure with a label?', figsize=(10, 6))
+def _generate_complete_test_figure(fig_ref):
+    fig_ref.set_size_inches((10, 6))
+    plt.figure(fig_ref)
 
     plt.suptitle('Can you fit any more in a figure?')
 
@@ -82,31 +83,78 @@ def test_complete():
     plt.quiver(x, y, u, v)
 
     plt.subplot(3, 3, 8)
-    plt.scatter(x, x**2, label='$x^2$')
+    plt.scatter(x, x ** 2, label='$x^2$')
     plt.legend(loc='upper left')
 
     plt.subplot(3, 3, 9)
     plt.errorbar(x, x * -0.5, xerr=0.2, yerr=0.4)
 
-    #
+
+@mpl.style.context("default")
+@check_figures_equal(extensions=["png"])
+def test_complete(fig_test, fig_ref):
+    _generate_complete_test_figure(fig_ref)
     # plotting is done, now test its pickle-ability
-    #
-    result_fh = BytesIO()
-    pickle.dump(fig, result_fh, pickle.HIGHEST_PROTOCOL)
+    pkl = BytesIO()
+    pickle.dump(fig_ref, pkl, pickle.HIGHEST_PROTOCOL)
+    loaded = pickle.loads(pkl.getbuffer())
+    loaded.canvas.draw()
+
+    fig_test.set_size_inches(loaded.get_size_inches())
+    fig_test.figimage(loaded.canvas.renderer.buffer_rgba())
+
+    plt.close(loaded)
+
+
+def _pickle_load_subprocess():
+    import os
+    import pickle
+
+    path = os.environ['PICKLE_FILE_PATH']
+
+    with open(path, 'rb') as blob:
+        fig = pickle.load(blob)
+
+    print(str(pickle.dumps(fig)))
+
+
+@mpl.style.context("default")
+@check_figures_equal(extensions=['png'])
+def test_pickle_load_from_subprocess(fig_test, fig_ref, tmp_path):
+    _generate_complete_test_figure(fig_ref)
+
+    fp = tmp_path / 'sinus.pickle'
+    assert not fp.exists()
 
-    plt.close('all')
+    with fp.open('wb') as file:
+        pickle.dump(fig_ref, file, pickle.HIGHEST_PROTOCOL)
+    assert fp.exists()
 
-    # make doubly sure that there are no figures left
-    assert plt._pylab_helpers.Gcf.figs == {}
+    proc = subprocess_run_helper(
+        _pickle_load_subprocess,
+        timeout=60,
+        extra_env={'PICKLE_FILE_PATH': str(fp)}
+    )
 
-    # wind back the fh and load in the figure
-    result_fh.seek(0)
-    fig = pickle.load(result_fh)
+    loaded_fig = pickle.loads(ast.literal_eval(proc.stdout))
 
-    # make sure there is now a figure manager
-    assert plt._pylab_helpers.Gcf.figs != {}
+    loaded_fig.canvas.draw()
 
-    assert fig.get_label() == 'Figure with a label?'
+    fig_test.set_size_inches(loaded_fig.get_size_inches())
+    fig_test.figimage(loaded_fig.canvas.renderer.buffer_rgba())
+
+    plt.close(loaded_fig)
+
+
+def test_gcf():
+    fig = plt.figure("a label")
+    buf = BytesIO()
+    pickle.dump(fig, buf, pickle.HIGHEST_PROTOCOL)
+    plt.close("all")
+    assert plt._pylab_helpers.Gcf.figs == {}  # No figures must be left.
+    fig = pickle.loads(buf.getbuffer())
+    assert plt._pylab_helpers.Gcf.figs != {}  # A manager is there again.
+    assert fig.get_label() == "a label"
 
 
 def test_no_pyplot():
@@ -199,7 +247,7 @@ def test_inset_and_secondary():
     pickle.loads(pickle.dumps(fig))
 
 
-@pytest.mark.parametrize("cmap", cm._cmap_registry.values())
+@pytest.mark.parametrize("cmap", cm._colormaps.values())
 def test_cmap(cmap):
     pickle.dumps(cmap)
 
@@ -212,3 +260,25 @@ def test_unpickle_canvas():
     out.seek(0)
     fig2 = pickle.load(out)
     assert fig2.canvas is not None
+
+
+def test_mpl_toolkits():
+    ax = parasite_axes.host_axes([0, 0, 1, 1])
+    assert type(pickle.loads(pickle.dumps(ax))) == parasite_axes.HostAxes
+
+
+def test_standard_norm():
+    assert type(pickle.loads(pickle.dumps(mpl.colors.LogNorm()))) \
+        == mpl.colors.LogNorm
+
+
+def test_dynamic_norm():
+    logit_norm_instance = mpl.colors.make_norm_from_scale(
+        mpl.scale.LogitScale, mpl.colors.Normalize)()
+    assert type(pickle.loads(pickle.dumps(logit_norm_instance))) \
+        == type(logit_norm_instance)
+
+
+def test_vertexselector():
+    line, = plt.plot([0, 1], picker=True)
+    pickle.loads(pickle.dumps(VertexSelector(line)))
diff --git a/lib/matplotlib/tests/test_png.py b/lib/matplotlib/tests/test_png.py
index 133d3954452b..1e8ad89c9511 100644
--- a/lib/matplotlib/tests/test_png.py
+++ b/lib/matplotlib/tests/test_png.py
@@ -4,8 +4,7 @@
 import pytest
 
 from matplotlib.testing.decorators import image_comparison
-from matplotlib import pyplot as plt
-import matplotlib.cm as cm
+from matplotlib import cm, pyplot as plt
 
 
 @image_comparison(['pngsuite.png'], tol=0.03)
diff --git a/lib/matplotlib/tests/test_polar.py b/lib/matplotlib/tests/test_polar.py
index 389d08b6eecd..c51508ae227a 100644
--- a/lib/matplotlib/tests/test_polar.py
+++ b/lib/matplotlib/tests/test_polar.py
@@ -249,6 +249,8 @@ def test_polar_theta_limits():
                            direction=DIRECTIONS[i % len(DIRECTIONS)],
                            rotation='auto')
             ax.yaxis.set_tick_params(label2On=True, rotation='auto')
+            ax.xaxis.get_major_locator().base.set_params(  # backcompat
+                steps=[1, 2, 2.5, 5, 10])
 
 
 @check_figures_equal(extensions=["png"])
@@ -320,15 +322,13 @@ def test_polar_interpolation_steps_constant_r(fig_test, fig_ref):
     # Check that an extra half-turn doesn't make any difference -- modulo
     # antialiasing, which we disable here.
     p1 = (fig_test.add_subplot(121, projection="polar")
-          .bar([0], [1], 3*np.pi, edgecolor="none"))
+          .bar([0], [1], 3*np.pi, edgecolor="none", antialiased=False))
     p2 = (fig_test.add_subplot(122, projection="polar")
-          .bar([0], [1], -3*np.pi, edgecolor="none"))
+          .bar([0], [1], -3*np.pi, edgecolor="none", antialiased=False))
     p3 = (fig_ref.add_subplot(121, projection="polar")
-          .bar([0], [1], 2*np.pi, edgecolor="none"))
+          .bar([0], [1], 2*np.pi, edgecolor="none", antialiased=False))
     p4 = (fig_ref.add_subplot(122, projection="polar")
-          .bar([0], [1], -2*np.pi, edgecolor="none"))
-    for p in [p1, p2, p3, p4]:
-        plt.setp(p, antialiased=False)
+          .bar([0], [1], -2*np.pi, edgecolor="none", antialiased=False))
 
 
 @check_figures_equal(extensions=["png"])
@@ -343,8 +343,87 @@ def test_thetalim_valid_invalid():
     ax = plt.subplot(projection='polar')
     ax.set_thetalim(0, 2 * np.pi)  # doesn't raise.
     ax.set_thetalim(thetamin=800, thetamax=440)  # doesn't raise.
-    with pytest.raises(ValueError, match='The angle range must be <= 2 pi'):
+    with pytest.raises(ValueError,
+                       match='angle range must be less than a full circle'):
         ax.set_thetalim(0, 3 * np.pi)
     with pytest.raises(ValueError,
-                       match='The angle range must be <= 360 degrees'):
+                       match='angle range must be less than a full circle'):
         ax.set_thetalim(thetamin=800, thetamax=400)
+
+
+def test_thetalim_args():
+    ax = plt.subplot(projection='polar')
+    ax.set_thetalim(0, 1)
+    assert tuple(np.radians((ax.get_thetamin(), ax.get_thetamax()))) == (0, 1)
+    ax.set_thetalim((2, 3))
+    assert tuple(np.radians((ax.get_thetamin(), ax.get_thetamax()))) == (2, 3)
+
+
+def test_default_thetalocator():
+    # Ideally we would check AAAABBC, but the smallest axes currently puts a
+    # single tick at 150° because MaxNLocator doesn't have a way to accept 15°
+    # while rejecting 150°.
+    fig, axs = plt.subplot_mosaic(
+        "AAAABB.", subplot_kw={"projection": "polar"})
+    for ax in axs.values():
+        ax.set_thetalim(0, np.pi)
+    for ax in axs.values():
+        ticklocs = np.degrees(ax.xaxis.get_majorticklocs()).tolist()
+        assert pytest.approx(90) in ticklocs
+        assert pytest.approx(100) not in ticklocs
+
+
+def test_axvspan():
+    ax = plt.subplot(projection="polar")
+    span = ax.axvspan(0, np.pi/4)
+    assert span.get_path()._interpolation_steps > 1
+
+
+@check_figures_equal(extensions=["png"])
+def test_remove_shared_polar(fig_ref, fig_test):
+    # Removing shared polar axes used to crash.  Test removing them, keeping in
+    # both cases just the lower left axes of a grid to avoid running into a
+    # separate issue (now being fixed) of ticklabel visibility for shared axes.
+    axs = fig_ref.subplots(
+        2, 2, sharex=True, subplot_kw={"projection": "polar"})
+    for i in [0, 1, 3]:
+        axs.flat[i].remove()
+    axs = fig_test.subplots(
+        2, 2, sharey=True, subplot_kw={"projection": "polar"})
+    for i in [0, 1, 3]:
+        axs.flat[i].remove()
+
+
+def test_shared_polar_keeps_ticklabels():
+    fig, axs = plt.subplots(
+        2, 2, subplot_kw={"projection": "polar"}, sharex=True, sharey=True)
+    fig.canvas.draw()
+    assert axs[0, 1].xaxis.majorTicks[0].get_visible()
+    assert axs[0, 1].yaxis.majorTicks[0].get_visible()
+    fig, axs = plt.subplot_mosaic(
+        "ab\ncd", subplot_kw={"projection": "polar"}, sharex=True, sharey=True)
+    fig.canvas.draw()
+    assert axs["b"].xaxis.majorTicks[0].get_visible()
+    assert axs["b"].yaxis.majorTicks[0].get_visible()
+
+
+def test_axvline_axvspan_do_not_modify_rlims():
+    ax = plt.subplot(projection="polar")
+    ax.axvspan(0, 1)
+    ax.axvline(.5)
+    ax.plot([.1, .2])
+    assert ax.get_ylim() == (0, .2)
+
+
+def test_cursor_precision():
+    ax = plt.subplot(projection="polar")
+    # Higher radii correspond to higher theta-precisions.
+    assert ax.format_coord(0, 0) == "θ=0π (0°), r=0.000"
+    assert ax.format_coord(0, .1) == "θ=0.00π (0°), r=0.100"
+    assert ax.format_coord(0, 1) == "θ=0.000π (0.0°), r=1.000"
+    assert ax.format_coord(1, 0) == "θ=0.3π (57°), r=0.000"
+    assert ax.format_coord(1, .1) == "θ=0.32π (57°), r=0.100"
+    assert ax.format_coord(1, 1) == "θ=0.318π (57.3°), r=1.000"
+    assert ax.format_coord(2, 0) == "θ=0.6π (115°), r=0.000"
+    assert ax.format_coord(2, .1) == "θ=0.64π (115°), r=0.100"
+    assert ax.format_coord(2, 1) == "θ=0.637π (114.6°), r=1.000"
diff --git a/lib/matplotlib/tests/test_preprocess_data.py b/lib/matplotlib/tests/test_preprocess_data.py
index 1f4707679508..a95a72e7f78d 100644
--- a/lib/matplotlib/tests/test_preprocess_data.py
+++ b/lib/matplotlib/tests/test_preprocess_data.py
@@ -1,4 +1,6 @@
 import re
+import subprocess
+import sys
 
 import numpy as np
 import pytest
@@ -78,7 +80,7 @@ def test_function_call_without_data(func):
 def test_function_call_with_dict_input(func):
     """Tests with dict input, unpacking via preprocess_pipeline"""
     data = {'a': 1, 'b': 2}
-    assert(func(None, data.keys(), data.values()) ==
+    assert (func(None, data.keys(), data.values()) ==
             "x: ['a', 'b'], y: [1, 2], ls: x, w: xyz, label: None")
 
 
@@ -197,35 +199,70 @@ def func(ax, x, y, z=1):
 def test_docstring_addition():
     @_preprocess_data()
     def funcy(ax, *args, **kwargs):
-        """Funcy does nothing"""
+        """
+        Parameters
+        ----------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+        """
 
-    assert re.search(r"every other argument", funcy.__doc__)
-    assert not re.search(r"the following arguments", funcy.__doc__)
+    assert re.search(r"all parameters also accept a string", funcy.__doc__)
+    assert not re.search(r"the following parameters", funcy.__doc__)
 
     @_preprocess_data(replace_names=[])
     def funcy(ax, x, y, z, bar=None):
-        """Funcy does nothing"""
+        """
+        Parameters
+        ----------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+        """
 
-    assert not re.search(r"every other argument", funcy.__doc__)
-    assert not re.search(r"the following arguments", funcy.__doc__)
+    assert not re.search(r"all parameters also accept a string", funcy.__doc__)
+    assert not re.search(r"the following parameters", funcy.__doc__)
 
     @_preprocess_data(replace_names=["bar"])
     def funcy(ax, x, y, z, bar=None):
-        """Funcy does nothing"""
-
-    assert not re.search(r"every other argument", funcy.__doc__)
-    assert not re.search(r"the following arguments .*: \*bar\*\.",
+        """
+        Parameters
+        ----------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+        """
+
+    assert not re.search(r"all parameters also accept a string", funcy.__doc__)
+    assert not re.search(r"the following parameters .*: \*bar\*\.",
                          funcy.__doc__)
 
     @_preprocess_data(replace_names=["x", "t"])
     def funcy(ax, x, y, z, t=None):
-        """Funcy does nothing"""
-
-    assert not re.search(r"every other argument", funcy.__doc__)
-    assert not re.search(r"the following arguments .*: \*x\*, \*t\*\.",
+        """
+        Parameters
+        ----------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+        """
+
+    assert not re.search(r"all parameters also accept a string", funcy.__doc__)
+    assert not re.search(r"the following parameters .*: \*x\*, \*t\*\.",
                          funcy.__doc__)
 
 
+def test_data_parameter_replacement():
+    """
+    Test that the docstring contains the correct *data* parameter stub
+    for all methods that we run _preprocess_data() on.
+    """
+    program = (
+        "import logging; "
+        "logging.basicConfig(level=logging.DEBUG); "
+        "import matplotlib.pyplot as plt"
+    )
+    cmd = [sys.executable, "-c", program]
+    completed_proc = subprocess.run(cmd, text=True, capture_output=True)
+    assert 'data parameter docstring error' not in completed_proc.stderr
+
+
 class TestPlotTypes:
 
     plotters = [Axes.scatter, Axes.bar, Axes.plot]
diff --git a/lib/matplotlib/tests/test_pyplot.py b/lib/matplotlib/tests/test_pyplot.py
index c2c71d586715..2e51af54ea88 100644
--- a/lib/matplotlib/tests/test_pyplot.py
+++ b/lib/matplotlib/tests/test_pyplot.py
@@ -1,4 +1,7 @@
 import difflib
+import re
+
+import numpy as np
 import subprocess
 import sys
 from pathlib import Path
@@ -7,7 +10,7 @@
 
 import matplotlib as mpl
 from matplotlib import pyplot as plt
-from matplotlib.cbook import MatplotlibDeprecationWarning
+from matplotlib._api import MatplotlibDeprecationWarning
 
 
 def test_pyplot_up_to_date(tmpdir):
@@ -205,8 +208,8 @@ def test_subplot_replace_projection():
     ax = plt.subplot(1, 2, 1)
     ax1 = plt.subplot(1, 2, 1)
     ax2 = plt.subplot(1, 2, 2)
-    # This will delete ax / ax1 as they fully overlap
-    ax3 = plt.subplot(1, 2, 1, projection='polar')
+    with pytest.warns(MatplotlibDeprecationWarning):
+        ax3 = plt.subplot(1, 2, 1, projection='polar')
     ax4 = plt.subplot(1, 2, 1, projection='polar')
     assert ax is not None
     assert ax1 is ax
@@ -227,12 +230,13 @@ def test_subplot_kwarg_collision():
     ax1 = plt.subplot(projection='polar', theta_offset=0)
     ax2 = plt.subplot(projection='polar', theta_offset=0)
     assert ax1 is ax2
+    ax1.remove()
     ax3 = plt.subplot(projection='polar', theta_offset=1)
     assert ax1 is not ax3
     assert ax1 not in plt.gcf().axes
 
 
-def test_gca_kwargs():
+def test_gca():
     # plt.gca() returns an existing axes, unless there were no axes.
     plt.figure()
     ax = plt.gca()
@@ -241,38 +245,16 @@ def test_gca_kwargs():
     assert ax1 is ax
     plt.close()
 
-    # plt.gca() raises a DeprecationWarning if called with kwargs.
-    plt.figure()
-    with pytest.warns(
-            MatplotlibDeprecationWarning,
-            match=r'Calling gca\(\) with keyword arguments was deprecated'):
-        ax = plt.gca(projection='polar')
-    ax1 = plt.gca()
-    assert ax is not None
-    assert ax1 is ax
-    assert ax1.name == 'polar'
-    plt.close()
-
-    # plt.gca() ignores keyword arguments if an axes already exists.
-    plt.figure()
-    ax = plt.gca()
-    with pytest.warns(
-            MatplotlibDeprecationWarning,
-            match=r'Calling gca\(\) with keyword arguments was deprecated'):
-        ax1 = plt.gca(projection='polar')
-    assert ax is not None
-    assert ax1 is ax
-    assert ax1.name == 'rectilinear'
-    plt.close()
-
 
 def test_subplot_projection_reuse():
-    # create an axes
+    # create an Axes
     ax1 = plt.subplot(111)
     # check that it is current
     assert ax1 is plt.gca()
     # make sure we get it back if we ask again
     assert ax1 is plt.subplot(111)
+    # remove it
+    ax1.remove()
     # create a polar plot
     ax2 = plt.subplot(111, projection='polar')
     assert ax2 is plt.gca()
@@ -280,6 +262,7 @@ def test_subplot_projection_reuse():
     assert ax1 not in plt.gcf().axes
     # assert we get it back if no extra parameters passed
     assert ax2 is plt.subplot(111)
+    ax2.remove()
     # now check explicitly setting the projection to rectilinear
     # makes a new axes
     ax3 = plt.subplot(111, projection='rectilinear')
@@ -301,12 +284,117 @@ def test_subplot_polar_normalization():
 
 
 def test_subplot_change_projection():
+    created_axes = set()
     ax = plt.subplot()
+    created_axes.add(ax)
     projections = ('aitoff', 'hammer', 'lambert', 'mollweide',
                    'polar', 'rectilinear', '3d')
     for proj in projections:
-        ax_next = plt.subplot(projection=proj)
-        assert ax_next is plt.subplot()
-        assert ax_next.name == proj
-        assert ax is not ax_next
-        ax = ax_next
+        ax.remove()
+        ax = plt.subplot(projection=proj)
+        assert ax is plt.subplot()
+        assert ax.name == proj
+        created_axes.add(ax)
+    # Check that each call created a new Axes.
+    assert len(created_axes) == 1 + len(projections)
+
+
+def test_polar_second_call():
+    # the first call creates the axes with polar projection
+    ln1, = plt.polar(0., 1., 'ro')
+    assert isinstance(ln1, mpl.lines.Line2D)
+    # the second call should reuse the existing axes
+    ln2, = plt.polar(1.57, .5, 'bo')
+    assert isinstance(ln2, mpl.lines.Line2D)
+    assert ln1.axes is ln2.axes
+
+
+def test_fallback_position():
+    # check that position kwarg works if rect not supplied
+    axref = plt.axes([0.2, 0.2, 0.5, 0.5])
+    axtest = plt.axes(position=[0.2, 0.2, 0.5, 0.5])
+    np.testing.assert_allclose(axtest.bbox.get_points(),
+                               axref.bbox.get_points())
+
+    # check that position kwarg ignored if rect is supplied
+    axref = plt.axes([0.2, 0.2, 0.5, 0.5])
+    axtest = plt.axes([0.2, 0.2, 0.5, 0.5], position=[0.1, 0.1, 0.8, 0.8])
+    np.testing.assert_allclose(axtest.bbox.get_points(),
+                               axref.bbox.get_points())
+
+
+def test_set_current_figure_via_subfigure():
+    fig1 = plt.figure()
+    subfigs = fig1.subfigures(2)
+
+    plt.figure()
+    assert plt.gcf() != fig1
+
+    current = plt.figure(subfigs[1])
+    assert plt.gcf() == fig1
+    assert current == fig1
+
+
+def test_set_current_axes_on_subfigure():
+    fig = plt.figure()
+    subfigs = fig.subfigures(2)
+
+    ax = subfigs[0].subplots(1, squeeze=True)
+    subfigs[1].subplots(1, squeeze=True)
+
+    assert plt.gca() != ax
+    plt.sca(ax)
+    assert plt.gca() == ax
+
+
+def test_pylab_integration():
+    IPython = pytest.importorskip("IPython")
+    mpl.testing.subprocess_run_helper(
+        IPython.start_ipython,
+        "--pylab",
+        "-c",
+        ";".join((
+            "import matplotlib.pyplot as plt",
+            "assert plt._REPL_DISPLAYHOOK == plt._ReplDisplayHook.IPYTHON",
+        )),
+        timeout=60,
+    )
+
+
+def test_doc_pyplot_summary():
+    """Test that pyplot_summary lists all the plot functions."""
+    pyplot_docs = Path(__file__).parent / '../../../doc/api/pyplot_summary.rst'
+    if not pyplot_docs.exists():
+        pytest.skip("Documentation sources not available")
+
+    lines = pyplot_docs.read_text()
+    m = re.search(r':nosignatures:\n\n(.*?)\n\n', lines, re.DOTALL)
+    doc_functions = set(line.strip() for line in m.group(1).split('\n'))
+    plot_commands = set(plt.get_plot_commands())
+    missing = plot_commands.difference(doc_functions)
+    if missing:
+        raise AssertionError(
+            f"The following pyplot functions are not listed in the "
+            f"documentation. Please add them to doc/api/pyplot_summary.rst: "
+            f"{missing!r}")
+    extra = doc_functions.difference(plot_commands)
+    if extra:
+        raise AssertionError(
+            f"The following functions are listed in the pyplot documentation, "
+            f"but they do not exist in pyplot. "
+            f"Please remove them from doc/api/pyplot_summary.rst: {extra!r}")
+
+
+def test_minor_ticks():
+    plt.figure()
+    plt.plot(np.arange(1, 10))
+    tick_pos, tick_labels = plt.xticks(minor=True)
+    assert np.all(tick_labels == np.array([], dtype=np.float64))
+    assert tick_labels == []
+
+    plt.yticks(ticks=[3.5, 6.5], labels=["a", "b"], minor=True)
+    ax = plt.gca()
+    tick_pos = ax.get_yticks(minor=True)
+    tick_labels = ax.get_yticklabels(minor=True)
+    assert np.all(tick_pos == np.array([3.5, 6.5]))
+    assert [l.get_text() for l in tick_labels] == ['a', 'b']
diff --git a/lib/matplotlib/tests/test_quiver.py b/lib/matplotlib/tests/test_quiver.py
index 740ad3603a9c..f13450ed1b83 100644
--- a/lib/matplotlib/tests/test_quiver.py
+++ b/lib/matplotlib/tests/test_quiver.py
@@ -1,20 +1,25 @@
+import platform
+import sys
+
 import numpy as np
 import pytest
-import sys
+
 from matplotlib import pyplot as plt
 from matplotlib.testing.decorators import image_comparison
 
 
-def draw_quiver(ax, **kw):
+def draw_quiver(ax, **kwargs):
     X, Y = np.meshgrid(np.arange(0, 2 * np.pi, 1),
                        np.arange(0, 2 * np.pi, 1))
     U = np.cos(X)
     V = np.sin(Y)
 
-    Q = ax.quiver(U, V, **kw)
+    Q = ax.quiver(U, V, **kwargs)
     return Q
 
 
+@pytest.mark.skipif(platform.python_implementation() != 'CPython',
+                    reason='Requires CPython')
 def test_quiver_memory_leak():
     fig, ax = plt.subplots()
 
@@ -27,6 +32,8 @@ def test_quiver_memory_leak():
     assert sys.getrefcount(ttX) == 2
 
 
+@pytest.mark.skipif(platform.python_implementation() != 'CPython',
+                    reason='Requires CPython')
 def test_quiver_key_memory_leak():
     fig, ax = plt.subplots()
 
@@ -84,7 +91,7 @@ def test_no_warnings():
 
 def test_zero_headlength():
     # Based on report by Doug McNeil:
-    # http://matplotlib.1069221.n5.nabble.com/quiver-warnings-td28107.html
+    # https://discourse.matplotlib.org/t/quiver-warnings/16722
     fig, ax = plt.subplots()
     X, Y = np.meshgrid(np.arange(10), np.arange(10))
     U, V = np.cos(X), np.sin(Y)
@@ -202,6 +209,17 @@ def test_barbs_flip():
              flip_barb=Y < 0)
 
 
+def test_barb_copy():
+    fig, ax = plt.subplots()
+    u = np.array([1.1])
+    v = np.array([2.2])
+    b0 = ax.barbs([1], [1], u, v)
+    u[0] = 0
+    assert b0.u[0] == 1.1
+    v[0] = 0
+    assert b0.v[0] == 2.2
+
+
 def test_bad_masked_sizes():
     """Test error handling when given differing sized masked arrays."""
     x = np.arange(3)
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
index 4705b975d60a..d5f316f54595 100644
--- a/lib/matplotlib/tests/test_rcparams.py
+++ b/lib/matplotlib/tests/test_rcparams.py
@@ -1,4 +1,3 @@
-from collections import OrderedDict
 import copy
 import os
 from pathlib import Path
@@ -16,11 +15,12 @@
 import numpy as np
 from matplotlib.rcsetup import (
     validate_bool,
-    validate_bool_maybe_none,
     validate_color,
     validate_colorlist,
+    _validate_color_or_linecolor,
     validate_cycler,
     validate_float,
+    validate_fontstretch,
     validate_fontweight,
     validate_hatch,
     validate_hist_bins,
@@ -39,7 +39,7 @@ def test_rcparams(tmpdir):
     linewidth = mpl.rcParams['lines.linewidth']
 
     rcpath = Path(tmpdir) / 'test_rcparams.rc'
-    rcpath.write_text('lines.linewidth: 33')
+    rcpath.write_text('lines.linewidth: 33', encoding='utf-8')
 
     # test context given dictionary
     with mpl.rc_context(rc={'text.usetex': not usetex}):
@@ -119,8 +119,6 @@ def test_rcparams_init():
 
 def test_Bug_2543():
     # Test that it possible to add all values to itself / deepcopy
-    # This was not possible because validate_bool_maybe_none did not
-    # accept None as an argument.
     # https://github.com/matplotlib/matplotlib/issues/2543
     # We filter warnings at this stage since a number of them are raised
     # for deprecated rcparams as they should. We don't want these in the
@@ -132,11 +130,6 @@ def test_Bug_2543():
                 mpl.rcParams[key] = _copy[key]
         with mpl.rc_context():
             copy.deepcopy(mpl.rcParams)
-        # real test is that this does not raise
-        assert validate_bool_maybe_none(None) is None
-        assert validate_bool_maybe_none("none") is None
-        with pytest.raises(ValueError):
-            validate_bool_maybe_none("blah")
     with pytest.raises(ValueError):
         validate_bool(None)
     with pytest.raises(ValueError):
@@ -198,7 +191,7 @@ def test_axes_titlecolor_rcparams():
 
 def test_Issue_1713(tmpdir):
     rcpath = Path(tmpdir) / 'test_rcparams.rc'
-    rcpath.write_text('timezone: UTC', encoding='UTF-32-BE')
+    rcpath.write_text('timezone: UTC', encoding='utf-8')
     with mock.patch('locale.getpreferredencoding', return_value='UTF-32-BE'):
         rc = mpl.rc_params_from_file(rcpath, True, False)
     assert rc.get('timezone') == 'UTC'
@@ -233,11 +226,11 @@ def generate_validator_testcases(valid):
                      (('a', 'b'), ['a', 'b']),
                      (iter(['a', 'b']), ['a', 'b']),
                      (np.array(['a', 'b']), ['a', 'b']),
-                     ((1, 2), ['1', '2']),
-                     (np.array([1, 2]), ['1', '2']),
                      ),
          'fail': ((set(), ValueError),
                   (1, ValueError),
+                  ((1, 2), _api.MatplotlibDeprecationWarning),
+                  (np.array([1, 2]), _api.MatplotlibDeprecationWarning),
                   )
          },
         {'validator': _listify_validator(validate_int, n=2),
@@ -286,6 +279,17 @@ def generate_validator_testcases(valid):
                   ('cycler("bleh, [])', ValueError),  # syntax error
                   ('Cycler("linewidth", [1, 2, 3])',
                    ValueError),  # only 'cycler()' function is allowed
+                  # do not allow dunder in string literals
+                  ("cycler('c', [j.__class__(j) for j in ['r', 'b']])",
+                   ValueError),
+                  ("cycler('c', [j. __class__(j) for j in ['r', 'b']])",
+                   ValueError),
+                  ("cycler('c', [j.\t__class__(j) for j in ['r', 'b']])",
+                   ValueError),
+                  ("cycler('c', [j.\u000c__class__(j) for j in ['r', 'b']])",
+                   ValueError),
+                  ("cycler('c', [j.__class__(j).lower() for j in ['r', 'b']])",
+                   ValueError),
                   ('1 + 2', ValueError),  # doesn't produce a Cycler object
                   ('os.system("echo Gotcha")', ValueError),  # os not available
                   ('import os', ValueError),  # should not be able to import
@@ -338,6 +342,17 @@ def generate_validator_testcases(valid):
                   ('(0, 1, "0.5")', ValueError),  # last one not a float
                   ),
          },
+        {'validator': _validate_color_or_linecolor,
+         'success': (('linecolor', 'linecolor'),
+                     ('markerfacecolor', 'markerfacecolor'),
+                     ('mfc', 'markerfacecolor'),
+                     ('markeredgecolor', 'markeredgecolor'),
+                     ('mec', 'markeredgecolor')
+                     ),
+         'fail': (('line', ValueError),
+                  ('marker', ValueError)
+                  )
+         },
         {'validator': validate_hist_bins,
          'success': (('auto', 'auto'),
                      ('fd', 'fd'),
@@ -398,6 +413,7 @@ def generate_validator_testcases(valid):
                   ([1, 2, 3], ValueError),  # sequence with odd length
                   (1.23, ValueError),  # not a sequence
                   (("a", [1, 2]), ValueError),  # wrong explicit offset
+                  ((None, [1, 2]), ValueError),  # wrong explicit offset
                   ((1, [1, 2, 3]), ValueError),  # odd length sequence
                   (([1, 2], 1), ValueError),  # inverted offset/onoff
                   )
@@ -454,12 +470,39 @@ def test_validate_fontweight(weight, parsed_weight):
         assert validate_fontweight(weight) == parsed_weight
 
 
+@pytest.mark.parametrize('stretch, parsed_stretch', [
+    ('expanded', 'expanded'),
+    ('EXPANDED', ValueError),  # stretch is case-sensitive
+    (100, 100),
+    ('100', 100),
+    (np.array(100), 100),
+    # fractional fontweights are not defined. This should actually raise a
+    # ValueError, but historically did not.
+    (20.6, 20),
+    ('20.6', ValueError),
+    ([100], ValueError),
+])
+def test_validate_fontstretch(stretch, parsed_stretch):
+    if parsed_stretch is ValueError:
+        with pytest.raises(ValueError):
+            validate_fontstretch(stretch)
+    else:
+        assert validate_fontstretch(stretch) == parsed_stretch
+
+
 def test_keymaps():
     key_list = [k for k in mpl.rcParams if 'keymap' in k]
     for k in key_list:
         assert isinstance(mpl.rcParams[k], list)
 
 
+def test_no_backend_reset_rccontext():
+    assert mpl.rcParams['backend'] != 'module://aardvark'
+    with mpl.rc_context():
+        mpl.rcParams['backend'] = 'module://aardvark'
+    assert mpl.rcParams['backend'] == 'module://aardvark'
+
+
 def test_rcparams_reset_after_fail():
     # There was previously a bug that meant that if rc_context failed and
     # raised an exception due to issues in the supplied rc parameters, the
@@ -467,8 +510,7 @@ def test_rcparams_reset_after_fail():
     with mpl.rc_context(rc={'text.usetex': False}):
         assert mpl.rcParams['text.usetex'] is False
         with pytest.raises(KeyError):
-            with mpl.rc_context(rc=OrderedDict([('text.usetex', True),
-                                                ('test.blah', True)])):
+            with mpl.rc_context(rc={'text.usetex': True, 'test.blah': True}):
                 pass
         assert mpl.rcParams['text.usetex'] is False
 
@@ -481,11 +523,12 @@ def test_backend_fallback_headless(tmpdir):
     with pytest.raises(subprocess.CalledProcessError):
         subprocess.run(
             [sys.executable, "-c",
-             ("import matplotlib;" +
-              "matplotlib.use('tkagg');" +
-              "import matplotlib.pyplot")
+             "import matplotlib;"
+             "matplotlib.use('tkagg');"
+             "import matplotlib.pyplot;"
+             "matplotlib.pyplot.plot(42);"
              ],
-            env=env, check=True)
+            env=env, check=True, stderr=subprocess.DEVNULL)
 
 
 @pytest.mark.skipif(
@@ -496,8 +539,55 @@ def test_backend_fallback_headful(tmpdir):
     env = {**os.environ, "MPLBACKEND": "", "MPLCONFIGDIR": str(tmpdir)}
     backend = subprocess.check_output(
         [sys.executable, "-c",
-         "import matplotlib.pyplot; print(matplotlib.get_backend())"],
+         "import matplotlib as mpl; "
+         "sentinel = mpl.rcsetup._auto_backend_sentinel; "
+         # Check that access on another instance does not resolve the sentinel.
+         "assert mpl.RcParams({'backend': sentinel})['backend'] == sentinel; "
+         "assert dict.__getitem__(mpl.rcParams, 'backend') == sentinel; "
+         "import matplotlib.pyplot; "
+         "print(matplotlib.get_backend())"],
         env=env, universal_newlines=True)
     # The actual backend will depend on what's installed, but at least tkagg is
     # present.
     assert backend.strip().lower() != "agg"
+
+
+def test_deprecation(monkeypatch):
+    monkeypatch.setitem(
+        mpl._deprecated_map, "patch.linewidth",
+        ("0.0", "axes.linewidth", lambda old: 2 * old, lambda new: new / 2))
+    with pytest.warns(_api.MatplotlibDeprecationWarning):
+        assert mpl.rcParams["patch.linewidth"] \
+            == mpl.rcParams["axes.linewidth"] / 2
+    with pytest.warns(_api.MatplotlibDeprecationWarning):
+        mpl.rcParams["patch.linewidth"] = 1
+    assert mpl.rcParams["axes.linewidth"] == 2
+
+    monkeypatch.setitem(
+        mpl._deprecated_ignore_map, "patch.edgecolor",
+        ("0.0", "axes.edgecolor"))
+    with pytest.warns(_api.MatplotlibDeprecationWarning):
+        assert mpl.rcParams["patch.edgecolor"] \
+            == mpl.rcParams["axes.edgecolor"]
+    with pytest.warns(_api.MatplotlibDeprecationWarning):
+        mpl.rcParams["patch.edgecolor"] = "#abcd"
+    assert mpl.rcParams["axes.edgecolor"] != "#abcd"
+
+    monkeypatch.setitem(
+        mpl._deprecated_ignore_map, "patch.force_edgecolor",
+        ("0.0", None))
+    with pytest.warns(_api.MatplotlibDeprecationWarning):
+        assert mpl.rcParams["patch.force_edgecolor"] is None
+
+    monkeypatch.setitem(
+        mpl._deprecated_remain_as_none, "svg.hashsalt",
+        ("0.0",))
+    with pytest.warns(_api.MatplotlibDeprecationWarning):
+        mpl.rcParams["svg.hashsalt"] = "foobar"
+    assert mpl.rcParams["svg.hashsalt"] == "foobar"  # Doesn't warn.
+    mpl.rcParams["svg.hashsalt"] = None  # Doesn't warn.
+
+    mpl.rcParams.update(mpl.rcParams.copy())  # Doesn't warn.
+    # Note that the warning suppression actually arises from the
+    # iteration over the updater rcParams being protected by
+    # suppress_matplotlib_deprecation_warning, rather than any explicit check.
diff --git a/lib/matplotlib/tests/test_sankey.py b/lib/matplotlib/tests/test_sankey.py
index 1851525bd4e2..6cc036a9f1ce 100644
--- a/lib/matplotlib/tests/test_sankey.py
+++ b/lib/matplotlib/tests/test_sankey.py
@@ -1,4 +1,8 @@
+import pytest
+import numpy as np
+
 from matplotlib.sankey import Sankey
+from matplotlib.testing.decorators import check_figures_equal
 
 
 def test_sankey():
@@ -22,3 +26,80 @@ def show_three_decimal_places(value):
                format=show_three_decimal_places)
 
     assert s.diagrams[0].texts[0].get_text() == 'First\n0.250'
+
+
+@pytest.mark.parametrize('kwargs, msg', (
+    ({'gap': -1}, "'gap' is negative"),
+    ({'gap': 1, 'radius': 2}, "'radius' is greater than 'gap'"),
+    ({'head_angle': -1}, "'head_angle' is negative"),
+    ({'tolerance': -1}, "'tolerance' is negative"),
+    ({'flows': [1, -1], 'orientations': [-1, 0, 1]},
+     r"The shapes of 'flows' \(2,\) and 'orientations'"),
+    ({'flows': [1, -1], 'labels': ['a', 'b', 'c']},
+     r"The shapes of 'flows' \(2,\) and 'labels'"),
+    ))
+def test_sankey_errors(kwargs, msg):
+    with pytest.raises(ValueError, match=msg):
+        Sankey(**kwargs)
+
+
+@pytest.mark.parametrize('kwargs, msg', (
+    ({'trunklength': -1}, "'trunklength' is negative"),
+    ({'flows': [0.2, 0.3], 'prior': 0}, "The scaled sum of the connected"),
+    ({'prior': -1}, "The index of the prior diagram is negative"),
+    ({'prior': 1}, "The index of the prior diagram is 1"),
+    ({'connect': (-1, 1), 'prior': 0}, "At least one of the connection"),
+    ({'connect': (2, 1), 'prior': 0}, "The connection index to the source"),
+    ({'connect': (1, 3), 'prior': 0}, "The connection index to this dia"),
+    ({'connect': (1, 1), 'prior': 0, 'flows': [-0.2, 0.2],
+      'orientations': [2]}, "The value of orientations"),
+    ({'connect': (1, 1), 'prior': 0, 'flows': [-0.2, 0.2],
+      'pathlengths': [2]}, "The lengths of 'flows'"),
+    ))
+def test_sankey_add_errors(kwargs, msg):
+    sankey = Sankey()
+    with pytest.raises(ValueError, match=msg):
+        sankey.add(flows=[0.2, -0.2])
+        sankey.add(**kwargs)
+
+
+def test_sankey2():
+    s = Sankey(flows=[0.25, -0.25, 0.5, -0.5], labels=['Foo'],
+               orientations=[-1], unit='Bar')
+    sf = s.finish()
+    assert np.all(np.equal(np.array((0.25, -0.25, 0.5, -0.5)), sf[0].flows))
+    assert sf[0].angles == [1, 3, 1, 3]
+    assert all([text.get_text()[0:3] == 'Foo' for text in sf[0].texts])
+    assert all([text.get_text()[-3:] == 'Bar' for text in sf[0].texts])
+    assert sf[0].text.get_text() == ''
+    assert np.allclose(np.array(((-1.375, -0.52011255),
+                                 (1.375, -0.75506044),
+                                 (-0.75, -0.41522509),
+                                 (0.75, -0.8599479))),
+                       sf[0].tips)
+
+    s = Sankey(flows=[0.25, -0.25, 0, 0.5, -0.5], labels=['Foo'],
+               orientations=[-1], unit='Bar')
+    sf = s.finish()
+    assert np.all(np.equal(np.array((0.25, -0.25, 0, 0.5, -0.5)), sf[0].flows))
+    assert sf[0].angles == [1, 3, None, 1, 3]
+    assert np.allclose(np.array(((-1.375, -0.52011255),
+                                 (1.375, -0.75506044),
+                                 (0, 0),
+                                 (-0.75, -0.41522509),
+                                 (0.75, -0.8599479))),
+                       sf[0].tips)
+
+
+@check_figures_equal(extensions=['png'])
+def test_sankey3(fig_test, fig_ref):
+    ax_test = fig_test.gca()
+    s_test = Sankey(ax=ax_test, flows=[0.25, -0.25, -0.25, 0.25, 0.5, -0.5],
+                    orientations=[1, -1, 1, -1, 0, 0])
+    s_test.finish()
+
+    ax_ref = fig_ref.gca()
+    s_ref = Sankey(ax=ax_ref)
+    s_ref.add(flows=[0.25, -0.25, -0.25, 0.25, 0.5, -0.5],
+              orientations=[1, -1, 1, -1, 0, 0])
+    s_ref.finish()
diff --git a/lib/matplotlib/tests/test_scale.py b/lib/matplotlib/tests/test_scale.py
index 8fba86d2e82e..7f1130560581 100644
--- a/lib/matplotlib/tests/test_scale.py
+++ b/lib/matplotlib/tests/test_scale.py
@@ -2,9 +2,11 @@
 
 import matplotlib.pyplot as plt
 from matplotlib.scale import (
+    AsinhScale, AsinhTransform,
     LogTransform, InvertedLogTransform,
     SymmetricalLogTransform)
 import matplotlib.scale as mscale
+from matplotlib.ticker import AsinhLocator, LogFormatterSciNotation
 from matplotlib.testing.decorators import check_figures_equal, image_comparison
 
 import numpy as np
@@ -219,3 +221,75 @@ def test_scale_deepcopy():
     sc2 = copy.deepcopy(sc)
     assert str(sc.get_transform()) == str(sc2.get_transform())
     assert sc._transform is not sc2._transform
+
+
+class TestAsinhScale:
+    def test_transforms(self):
+        a0 = 17.0
+        a = np.linspace(-50, 50, 100)
+
+        forward = AsinhTransform(a0)
+        inverse = forward.inverted()
+        invinv = inverse.inverted()
+
+        a_forward = forward.transform_non_affine(a)
+        a_inverted = inverse.transform_non_affine(a_forward)
+        assert_allclose(a_inverted, a)
+
+        a_invinv = invinv.transform_non_affine(a)
+        assert_allclose(a_invinv, a0 * np.arcsinh(a / a0))
+
+    def test_init(self):
+        fig, ax = plt.subplots()
+
+        s = AsinhScale(axis=None, linear_width=23.0)
+        assert s.linear_width == 23
+        assert s._base == 10
+        assert s._subs == (2, 5)
+
+        tx = s.get_transform()
+        assert isinstance(tx, AsinhTransform)
+        assert tx.linear_width == s.linear_width
+
+    def test_base_init(self):
+        fig, ax = plt.subplots()
+
+        s3 = AsinhScale(axis=None, base=3)
+        assert s3._base == 3
+        assert s3._subs == (2,)
+
+        s7 = AsinhScale(axis=None, base=7, subs=(2, 4))
+        assert s7._base == 7
+        assert s7._subs == (2, 4)
+
+    def test_fmtloc(self):
+        class DummyAxis:
+            def __init__(self):
+                self.fields = {}
+            def set(self, **kwargs):
+                self.fields.update(**kwargs)
+            def set_major_formatter(self, f):
+                self.fields['major_formatter'] = f
+
+        ax0 = DummyAxis()
+        s0 = AsinhScale(axis=ax0, base=0)
+        s0.set_default_locators_and_formatters(ax0)
+        assert isinstance(ax0.fields['major_locator'], AsinhLocator)
+        assert isinstance(ax0.fields['major_formatter'], str)
+
+        ax5 = DummyAxis()
+        s7 = AsinhScale(axis=ax5, base=5)
+        s7.set_default_locators_and_formatters(ax5)
+        assert isinstance(ax5.fields['major_locator'], AsinhLocator)
+        assert isinstance(ax5.fields['major_formatter'],
+                          LogFormatterSciNotation)
+
+    def test_bad_scale(self):
+        fig, ax = plt.subplots()
+
+        with pytest.raises(ValueError):
+            AsinhScale(axis=None, linear_width=0)
+        with pytest.raises(ValueError):
+            AsinhScale(axis=None, linear_width=-1)
+        s0 = AsinhScale(axis=None, )
+        s1 = AsinhScale(axis=None, linear_width=3.0)
diff --git a/lib/matplotlib/tests/test_simplification.py b/lib/matplotlib/tests/test_simplification.py
index 07287618f26c..446fc92993e7 100644
--- a/lib/matplotlib/tests/test_simplification.py
+++ b/lib/matplotlib/tests/test_simplification.py
@@ -6,7 +6,8 @@
 
 import pytest
 
-from matplotlib.testing.decorators import image_comparison
+from matplotlib.testing.decorators import (
+    check_figures_equal, image_comparison, remove_ticks_and_titles)
 import matplotlib.pyplot as plt
 
 from matplotlib import patches, transforms
@@ -47,6 +48,29 @@ def test_diamond():
     ax.set_ylim(-0.6, 0.6)
 
 
+def test_clipping_out_of_bounds():
+    # Should work on a Path *without* codes.
+    path = Path([(0, 0), (1, 2), (2, 1)])
+    simplified = path.cleaned(clip=(10, 10, 20, 20))
+    assert_array_equal(simplified.vertices, [(0, 0)])
+    assert simplified.codes == [Path.STOP]
+
+    # Should work on a Path *with* codes, and no curves.
+    path = Path([(0, 0), (1, 2), (2, 1)],
+                [Path.MOVETO, Path.LINETO, Path.LINETO])
+    simplified = path.cleaned(clip=(10, 10, 20, 20))
+    assert_array_equal(simplified.vertices, [(0, 0)])
+    assert simplified.codes == [Path.STOP]
+
+    # A Path with curves does not do any clipping yet.
+    path = Path([(0, 0), (1, 2), (2, 3)],
+                [Path.MOVETO, Path.CURVE3, Path.CURVE3])
+    simplified = path.cleaned()
+    simplified_clipped = path.cleaned(clip=(10, 10, 20, 20))
+    assert_array_equal(simplified.vertices, simplified_clipped.vertices)
+    assert_array_equal(simplified.codes, simplified_clipped.codes)
+
+
 def test_noise():
     np.random.seed(0)
     x = np.random.uniform(size=50000) * 50
@@ -207,7 +231,7 @@ def test_sine_plus_noise():
     assert simplified.vertices.size == 25240
 
 
-@image_comparison(['simplify_curve'], remove_text=True)
+@image_comparison(['simplify_curve'], remove_text=True, tol=0.017)
 def test_simplify_curve():
     pp1 = patches.PathPatch(
         Path([(0, 0), (1, 0), (1, 1), (np.nan, 1), (0, 0), (2, 0), (2, 2),
@@ -222,6 +246,155 @@ def test_simplify_curve():
     ax.set_ylim((0, 2))
 
 
+@check_figures_equal()
+def test_closed_path_nan_removal(fig_test, fig_ref):
+    ax_test = fig_test.subplots(2, 2).flatten()
+    ax_ref = fig_ref.subplots(2, 2).flatten()
+
+    # NaN on the first point also removes the last point, because it's closed.
+    path = Path(
+        [[-3, np.nan], [3, -3], [3, 3], [-3, 3], [-3, -3]],
+        [Path.MOVETO, Path.LINETO, Path.LINETO, Path.LINETO, Path.CLOSEPOLY])
+    ax_test[0].add_patch(patches.PathPatch(path, facecolor='none'))
+    path = Path(
+        [[-3, np.nan], [3, -3], [3, 3], [-3, 3], [-3, np.nan]],
+        [Path.MOVETO, Path.LINETO, Path.LINETO, Path.LINETO, Path.LINETO])
+    ax_ref[0].add_patch(patches.PathPatch(path, facecolor='none'))
+
+    # NaN on second-last point should not re-close.
+    path = Path(
+        [[-2, -2], [2, -2], [2, 2], [-2, np.nan], [-2, -2]],
+        [Path.MOVETO, Path.LINETO, Path.LINETO, Path.LINETO, Path.CLOSEPOLY])
+    ax_test[0].add_patch(patches.PathPatch(path, facecolor='none'))
+    path = Path(
+        [[-2, -2], [2, -2], [2, 2], [-2, np.nan], [-2, -2]],
+        [Path.MOVETO, Path.LINETO, Path.LINETO, Path.LINETO, Path.LINETO])
+    ax_ref[0].add_patch(patches.PathPatch(path, facecolor='none'))
+
+    # Test multiple loops in a single path (with same paths as above).
+    path = Path(
+        [[-3, np.nan], [3, -3], [3, 3], [-3, 3], [-3, -3],
+         [-2, -2], [2, -2], [2, 2], [-2, np.nan], [-2, -2]],
+        [Path.MOVETO, Path.LINETO, Path.LINETO, Path.LINETO, Path.CLOSEPOLY,
+         Path.MOVETO, Path.LINETO, Path.LINETO, Path.LINETO, Path.CLOSEPOLY])
+    ax_test[1].add_patch(patches.PathPatch(path, facecolor='none'))
+    path = Path(
+        [[-3, np.nan], [3, -3], [3, 3], [-3, 3], [-3, np.nan],
+         [-2, -2], [2, -2], [2, 2], [-2, np.nan], [-2, -2]],
+        [Path.MOVETO, Path.LINETO, Path.LINETO, Path.LINETO, Path.LINETO,
+         Path.MOVETO, Path.LINETO, Path.LINETO, Path.LINETO, Path.LINETO])
+    ax_ref[1].add_patch(patches.PathPatch(path, facecolor='none'))
+
+    # NaN in first point of CURVE3 should not re-close, and hide entire curve.
+    path = Path(
+        [[-1, -1], [1, -1], [1, np.nan], [0, 1], [-1, 1], [-1, -1]],
+        [Path.MOVETO, Path.LINETO, Path.CURVE3, Path.CURVE3, Path.LINETO,
+         Path.CLOSEPOLY])
+    ax_test[2].add_patch(patches.PathPatch(path, facecolor='none'))
+    path = Path(
+        [[-1, -1], [1, -1], [1, np.nan], [0, 1], [-1, 1], [-1, -1]],
+        [Path.MOVETO, Path.LINETO, Path.CURVE3, Path.CURVE3, Path.LINETO,
+         Path.CLOSEPOLY])
+    ax_ref[2].add_patch(patches.PathPatch(path, facecolor='none'))
+
+    # NaN in second point of CURVE3 should not re-close, and hide entire curve
+    # plus next line segment.
+    path = Path(
+        [[-3, -3], [3, -3], [3, 0], [0, np.nan], [-3, 3], [-3, -3]],
+        [Path.MOVETO, Path.LINETO, Path.CURVE3, Path.CURVE3, Path.LINETO,
+         Path.LINETO])
+    ax_test[2].add_patch(patches.PathPatch(path, facecolor='none'))
+    path = Path(
+        [[-3, -3], [3, -3], [3, 0], [0, np.nan], [-3, 3], [-3, -3]],
+        [Path.MOVETO, Path.LINETO, Path.CURVE3, Path.CURVE3, Path.LINETO,
+         Path.LINETO])
+    ax_ref[2].add_patch(patches.PathPatch(path, facecolor='none'))
+
+    # NaN in first point of CURVE4 should not re-close, and hide entire curve.
+    path = Path(
+        [[-1, -1], [1, -1], [1, np.nan], [0, 0], [0, 1], [-1, 1], [-1, -1]],
+        [Path.MOVETO, Path.LINETO, Path.CURVE4, Path.CURVE4, Path.CURVE4,
+         Path.LINETO, Path.CLOSEPOLY])
+    ax_test[3].add_patch(patches.PathPatch(path, facecolor='none'))
+    path = Path(
+        [[-1, -1], [1, -1], [1, np.nan], [0, 0], [0, 1], [-1, 1], [-1, -1]],
+        [Path.MOVETO, Path.LINETO, Path.CURVE4, Path.CURVE4, Path.CURVE4,
+         Path.LINETO, Path.CLOSEPOLY])
+    ax_ref[3].add_patch(patches.PathPatch(path, facecolor='none'))
+
+    # NaN in second point of CURVE4 should not re-close, and hide entire curve.
+    path = Path(
+        [[-2, -2], [2, -2], [2, 0], [0, np.nan], [0, 2], [-2, 2], [-2, -2]],
+        [Path.MOVETO, Path.LINETO, Path.CURVE4, Path.CURVE4, Path.CURVE4,
+         Path.LINETO, Path.LINETO])
+    ax_test[3].add_patch(patches.PathPatch(path, facecolor='none'))
+    path = Path(
+        [[-2, -2], [2, -2], [2, 0], [0, np.nan], [0, 2], [-2, 2], [-2, -2]],
+        [Path.MOVETO, Path.LINETO, Path.CURVE4, Path.CURVE4, Path.CURVE4,
+         Path.LINETO, Path.LINETO])
+    ax_ref[3].add_patch(patches.PathPatch(path, facecolor='none'))
+
+    # NaN in third point of CURVE4 should not re-close, and hide entire curve
+    # plus next line segment.
+    path = Path(
+        [[-3, -3], [3, -3], [3, 0], [0, 0], [0, np.nan], [-3, 3], [-3, -3]],
+        [Path.MOVETO, Path.LINETO, Path.CURVE4, Path.CURVE4, Path.CURVE4,
+         Path.LINETO, Path.LINETO])
+    ax_test[3].add_patch(patches.PathPatch(path, facecolor='none'))
+    path = Path(
+        [[-3, -3], [3, -3], [3, 0], [0, 0], [0, np.nan], [-3, 3], [-3, -3]],
+        [Path.MOVETO, Path.LINETO, Path.CURVE4, Path.CURVE4, Path.CURVE4,
+         Path.LINETO, Path.LINETO])
+    ax_ref[3].add_patch(patches.PathPatch(path, facecolor='none'))
+
+    # Keep everything clean.
+    for ax in [*ax_test.flat, *ax_ref.flat]:
+        ax.set(xlim=(-3.5, 3.5), ylim=(-3.5, 3.5))
+    remove_ticks_and_titles(fig_test)
+    remove_ticks_and_titles(fig_ref)
+
+
+@check_figures_equal()
+def test_closed_path_clipping(fig_test, fig_ref):
+    vertices = []
+    for roll in range(8):
+        offset = 0.1 * roll + 0.1
+
+        # A U-like pattern.
+        pattern = [
+            [-0.5, 1.5], [-0.5, -0.5], [1.5, -0.5], [1.5, 1.5],  # Outer square
+            # With a notch in the top.
+            [1 - offset / 2, 1.5], [1 - offset / 2, offset],
+            [offset / 2, offset], [offset / 2, 1.5],
+        ]
+
+        # Place the initial/final point anywhere in/out of the clipping area.
+        pattern = np.roll(pattern, roll, axis=0)
+        pattern = np.concatenate((pattern, pattern[:1, :]))
+
+        vertices.append(pattern)
+
+    # Multiple subpaths are used here to ensure they aren't broken by closed
+    # loop clipping.
+    codes = np.full(len(vertices[0]), Path.LINETO)
+    codes[0] = Path.MOVETO
+    codes[-1] = Path.CLOSEPOLY
+    codes = np.tile(codes, len(vertices))
+    vertices = np.concatenate(vertices)
+
+    fig_test.set_size_inches((5, 5))
+    path = Path(vertices, codes)
+    fig_test.add_artist(patches.PathPatch(path, facecolor='none'))
+
+    # For reference, we draw the same thing, but unclosed by using a line to
+    # the last point only.
+    fig_ref.set_size_inches((5, 5))
+    codes = codes.copy()
+    codes[codes == Path.CLOSEPOLY] = Path.LINETO
+    path = Path(vertices, codes)
+    fig_ref.add_artist(patches.PathPatch(path, facecolor='none'))
+
+
 @image_comparison(['hatch_simplify'], remove_text=True)
 def test_hatch():
     fig, ax = plt.subplots()
@@ -282,8 +455,8 @@ def test_start_with_moveto():
 
 def test_throw_rendering_complexity_exceeded():
     plt.rcParams['path.simplify'] = False
-    xx = np.arange(200000)
-    yy = np.random.rand(200000)
+    xx = np.arange(2_000_000)
+    yy = np.random.rand(2_000_000)
     yy[1000] = np.nan
 
     fig, ax = plt.subplots()
diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py
index 5d48a9817c83..d4fb94ade5d1 100644
--- a/lib/matplotlib/tests/test_sphinxext.py
+++ b/lib/matplotlib/tests/test_sphinxext.py
@@ -3,37 +3,44 @@
 import filecmp
 import os
 from pathlib import Path
+import shutil
 from subprocess import Popen, PIPE
 import sys
 
 import pytest
 
 
-pytest.importorskip('sphinx')
+pytest.importorskip('sphinx',
+                    minversion=None if sys.version_info < (3, 10) else '4.1.3')
 
 
 def test_tinypages(tmpdir):
-    tmp_path = Path(tmpdir)
-    html_dir = tmp_path / 'html'
-    doctree_dir = tmp_path / 'doctrees'
+    source_dir = Path(tmpdir) / 'src'
+    shutil.copytree(Path(__file__).parent / 'tinypages', source_dir)
+    html_dir = source_dir / '_build' / 'html'
+    doctree_dir = source_dir / '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)]
-    proc = Popen(cmd, stdout=PIPE, stderr=PIPE, universal_newlines=True,
-                 env={**os.environ, "MPLBACKEND": ""})
+    # 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 = Popen(
+        cmd, stdout=PIPE, stderr=PIPE, universal_newlines=True,
+        env={**os.environ, "MPLBACKEND": "", "GCOV_ERROR_FILE": os.devnull})
     out, err = proc.communicate()
 
-    assert proc.returncode == 0, \
-        f"sphinx build failed with stdout:\n{out}\nstderr:\n{err}\n"
-    if err:
-        pytest.fail(f"sphinx build emitted the following warnings:\n{err}")
-
-    assert html_dir.is_dir()
+    # Build the pages with warnings turned into errors
+    build_sphinx_html(source_dir, doctree_dir, html_dir)
 
     def plot_file(num):
         return html_dir / f'some_plots-{num}.png'
 
+    def plot_directive_file(num):
+        # This is always next to the doctree dir.
+        return doctree_dir.parent / 'plot_directive' / f'some_plots-{num}.png'
+
     range_10, range_6, range_4 = [plot_file(i) for i in range(1, 4)]
     # Plot 5 is range(6) plot
     assert filecmp.cmp(range_6, plot_file(5))
@@ -48,6 +55,7 @@ def plot_file(num):
     assert filecmp.cmp(range_4, plot_file(13))
     # Plot 14 has included source
     html_contents = (html_dir / 'some_plots.html').read_bytes()
+
     assert b'# Only a comment' in html_contents
     # check plot defined in external file.
     assert filecmp.cmp(range_4, html_dir / 'range4.png')
@@ -62,3 +70,70 @@ def plot_file(num):
     assert b'plot-directive my-class my-other-class' in html_contents
     # check that the multi-image caption is applied twice
     assert html_contents.count(b'This caption applies to both plots.') == 2
+    # Plot 21 is range(6) plot via an include directive. But because some of
+    # the previous plots are repeated, the argument to plot_file() is only 17.
+    assert filecmp.cmp(range_6, plot_file(17))
+
+    # Modify the included plot
+    contents = (source_dir / 'included_plot_21.rst').read_bytes()
+    contents = contents.replace(b'plt.plot(range(6))', b'plt.plot(range(4))')
+    (source_dir / 'included_plot_21.rst').write_bytes(contents)
+    # Build the pages again and check that the modified file was updated
+    modification_times = [plot_directive_file(i).stat().st_mtime
+                          for i in (1, 2, 3, 5)]
+    build_sphinx_html(source_dir, doctree_dir, html_dir)
+    assert filecmp.cmp(range_4, plot_file(17))
+    # Check that the plots in the plot_directive folder weren't changed.
+    # (plot_directive_file(1) won't be modified, but it will be copied to html/
+    # upon compilation, so plot_file(1) will be modified)
+    assert plot_directive_file(1).stat().st_mtime == modification_times[0]
+    assert plot_directive_file(2).stat().st_mtime == modification_times[1]
+    assert plot_directive_file(3).stat().st_mtime == modification_times[2]
+    assert filecmp.cmp(range_10, plot_file(1))
+    assert filecmp.cmp(range_6, plot_file(2))
+    assert filecmp.cmp(range_4, plot_file(3))
+    # Make sure that figures marked with context are re-created (but that the
+    # contents are the same)
+    assert plot_directive_file(5).stat().st_mtime > modification_times[3]
+    assert filecmp.cmp(range_6, plot_file(5))
+
+
+def test_plot_html_show_source_link(tmpdir):
+    source_dir = Path(tmpdir) / 'src'
+    source_dir.mkdir()
+    parent = Path(__file__).parent
+    shutil.copyfile(parent / 'tinypages/conf.py', source_dir / 'conf.py')
+    shutil.copytree(parent / 'tinypages/_static', source_dir / '_static')
+    doctree_dir = source_dir / 'doctrees'
+    (source_dir / 'index.rst').write_text("""
+.. plot::
+
+    plt.plot(range(2))
+""")
+    # Make sure source scripts are created by default
+    html_dir1 = source_dir / '_build' / 'html1'
+    build_sphinx_html(source_dir, doctree_dir, html_dir1)
+    assert "index-1.py" in [p.name for p in html_dir1.iterdir()]
+    # Make sure source scripts are NOT created when
+    # plot_html_show_source_link` is False
+    html_dir2 = source_dir / '_build' / 'html2'
+    build_sphinx_html(source_dir, doctree_dir, html_dir2,
+                      extra_args=['-D', 'plot_html_show_source_link=0'])
+    assert "index-1.py" not in [p.name for p in html_dir2.iterdir()]
+
+
+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
+    cmd = [sys.executable, '-msphinx', '-W', '-b', 'html',
+           '-d', str(doctree_dir), str(source_dir), str(html_dir), *extra_args]
+    proc = Popen(cmd, stdout=PIPE, stderr=PIPE, universal_newlines=True,
+                 env={**os.environ, "MPLBACKEND": ""})
+    out, err = proc.communicate()
+
+    assert proc.returncode == 0, \
+        f"sphinx build failed with stdout:\n{out}\nstderr:\n{err}\n"
+    if err:
+        pytest.fail(f"sphinx build emitted the following warnings:\n{err}")
+
+    assert html_dir.is_dir()
diff --git a/lib/matplotlib/tests/test_spines.py b/lib/matplotlib/tests/test_spines.py
index 589badc310d9..b8891aec411e 100644
--- a/lib/matplotlib/tests/test_spines.py
+++ b/lib/matplotlib/tests/test_spines.py
@@ -35,6 +35,8 @@ def set_val(self, val):
     spines[:].set_val('y')
     assert all(spine.val == 'y' for spine in spines.values())
 
+    with pytest.raises(AttributeError, match='foo'):
+        spines.foo
     with pytest.raises(KeyError, match='foo'):
         spines['foo']
     with pytest.raises(KeyError, match='foo, bar'):
diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
index 3ed111881782..10a64f1d6968 100644
--- a/lib/matplotlib/tests/test_streamplot.py
+++ b/lib/matplotlib/tests/test_streamplot.py
@@ -1,5 +1,3 @@
-import sys
-
 import numpy as np
 from numpy.testing import assert_array_almost_equal
 import pytest
@@ -8,19 +6,15 @@
 import matplotlib.transforms as mtransforms
 
 
-on_win = (sys.platform == 'win32')
-on_mac = (sys.platform == 'darwin')
-
-
 def velocity_field():
-    Y, X = np.mgrid[-3:3:100j, -3:3:100j]
+    Y, X = np.mgrid[-3:3:100j, -3:3:200j]
     U = -1 - X**2 + Y
     V = 1 + X - Y**2
     return X, Y, U, V
 
 
 def swirl_velocity_field():
-    x = np.linspace(-3., 3., 100)
+    x = np.linspace(-3., 3., 200)
     y = np.linspace(-3., 3., 100)
     X, Y = np.meshgrid(x, y)
     a = 0.1
@@ -29,61 +23,51 @@ def swirl_velocity_field():
     return x, y, U, V
 
 
-@image_comparison(['streamplot_startpoints'], remove_text=True, style='mpl20')
+@image_comparison(['streamplot_startpoints'], remove_text=True, style='mpl20',
+                  extensions=['png'])
 def test_startpoints():
     X, Y, U, V = velocity_field()
-    start_x = np.linspace(X.min(), X.max(), 10)
-    start_y = np.linspace(Y.min(), Y.max(), 10)
-    start_points = np.column_stack([start_x, start_y])
+    start_x, start_y = np.meshgrid(np.linspace(X.min(), X.max(), 5),
+                                   np.linspace(Y.min(), Y.max(), 5))
+    start_points = np.column_stack([start_x.ravel(), start_y.ravel()])
     plt.streamplot(X, Y, U, V, start_points=start_points)
     plt.plot(start_x, start_y, 'ok')
 
 
-@image_comparison(['streamplot_colormap'],
-                  tol=.04, remove_text=True, style='mpl20')
+@image_comparison(['streamplot_colormap'], remove_text=True, style='mpl20',
+                  tol=0.022)
 def test_colormap():
-    # Remove this line when this test image is regenerated.
-    plt.rcParams['pcolormesh.snap'] = False
-
     X, Y, U, V = velocity_field()
     plt.streamplot(X, Y, U, V, color=U, density=0.6, linewidth=2,
                    cmap=plt.cm.autumn)
     plt.colorbar()
 
 
-@image_comparison(['streamplot_linewidth'], remove_text=True, style='mpl20')
+@image_comparison(['streamplot_linewidth'], remove_text=True, style='mpl20',
+                  tol=0.002)
 def test_linewidth():
     X, Y, U, V = velocity_field()
     speed = np.hypot(U, V)
     lw = 5 * speed / speed.max()
-    # Compatibility for old test image
-    df = 25 / 30
     ax = plt.figure().subplots()
-    ax.set(xlim=(-3.0, 2.9999999999999947),
-           ylim=(-3.0000000000000004, 2.9999999999999947))
-    ax.streamplot(X, Y, U, V, density=[0.5 * df, 1. * df], color='k',
-                  linewidth=lw)
+    ax.streamplot(X, Y, U, V, density=[0.5, 1], color='k', linewidth=lw)
 
 
 @image_comparison(['streamplot_masks_and_nans'],
-                  remove_text=True, style='mpl20', tol=0.04 if on_win else 0)
+                  remove_text=True, style='mpl20')
 def test_masks_and_nans():
     X, Y, U, V = velocity_field()
     mask = np.zeros(U.shape, dtype=bool)
-    mask[40:60, 40:60] = 1
-    U[:20, :20] = np.nan
+    mask[40:60, 80:120] = 1
+    U[:20, :40] = np.nan
     U = np.ma.array(U, mask=mask)
-    # Compatibility for old test image
     ax = plt.figure().subplots()
-    ax.set(xlim=(-3.0, 2.9999999999999947),
-           ylim=(-3.0000000000000004, 2.9999999999999947))
     with np.errstate(invalid='ignore'):
         ax.streamplot(X, Y, U, V, color=U, cmap=plt.cm.Blues)
 
 
 @image_comparison(['streamplot_maxlength.png'],
-                  remove_text=True, style='mpl20',
-                  tol=0.002 if on_mac else 0)
+                  remove_text=True, style='mpl20', tol=0.302)
 def test_maxlength():
     x, y, U, V = swirl_velocity_field()
     ax = plt.figure().subplots()
@@ -94,8 +78,20 @@ def test_maxlength():
     ax.set(xlim=(None, 3.2555988021882305), ylim=(None, 3.078326760195413))
 
 
+@image_comparison(['streamplot_maxlength_no_broken.png'],
+                  remove_text=True, style='mpl20', tol=0.302)
+def test_maxlength_no_broken():
+    x, y, U, V = swirl_velocity_field()
+    ax = plt.figure().subplots()
+    ax.streamplot(x, y, U, V, maxlength=10., start_points=[[0., 1.5]],
+                  linewidth=2, density=2, broken_streamlines=False)
+    assert ax.get_xlim()[-1] == ax.get_ylim()[-1] == 3
+    # Compatibility for old test image
+    ax.set(xlim=(None, 3.2555988021882305), ylim=(None, 3.078326760195413))
+
+
 @image_comparison(['streamplot_direction.png'],
-                  remove_text=True, style='mpl20')
+                  remove_text=True, style='mpl20', tol=0.073)
 def test_direction():
     x, y, U, V = swirl_velocity_field()
     plt.streamplot(x, y, U, V, integration_direction='backward',
@@ -161,3 +157,13 @@ def test_streamplot_grid():
 
     with pytest.raises(ValueError, match="'y' must be strictly increasing"):
         plt.streamplot(x, y, u, v)
+
+
+def test_streamplot_inputs():  # test no exception occurs.
+    # fully-masked
+    plt.streamplot(np.arange(3), np.arange(3),
+                   np.full((3, 3), np.nan), np.full((3, 3), np.nan),
+                   color=np.random.rand(3, 3))
+    # array-likes
+    plt.streamplot(range(3), range(3),
+                   np.random.rand(3, 3), np.random.rand(3, 3))
diff --git a/lib/matplotlib/tests/test_style.py b/lib/matplotlib/tests/test_style.py
index 538c89e838c5..c788c45920ae 100644
--- a/lib/matplotlib/tests/test_style.py
+++ b/lib/matplotlib/tests/test_style.py
@@ -1,10 +1,9 @@
-from collections import OrderedDict
 from contextlib import contextmanager
-import gc
 from pathlib import Path
 from tempfile import TemporaryDirectory
 import sys
 
+import numpy as np
 import pytest
 
 import matplotlib as mpl
@@ -27,7 +26,8 @@ def temp_style(style_name, settings=None):
         with TemporaryDirectory() as tmpdir:
             # Write style settings to file in the tmpdir.
             Path(tmpdir, temp_file).write_text(
-                "\n".join("{}: {}".format(k, v) for k, v in settings.items()))
+                "\n".join("{}: {}".format(k, v) for k, v in settings.items()),
+                encoding="utf-8")
             # Add tmpdir to style path and reload so we can access this style.
             USER_LIBRARY_PATHS.append(tmpdir)
             style.reload_library()
@@ -60,7 +60,7 @@ def test_use():
 
 def test_use_url(tmpdir):
     path = Path(tmpdir, 'file')
-    path.write_text('axes.facecolor: adeade')
+    path.write_text('axes.facecolor: adeade', encoding='utf-8')
     with temp_style('test', DUMMY_SETTINGS):
         url = ('file:'
                + ('///' if sys.platform == 'win32' else '')
@@ -73,7 +73,7 @@ def test_single_path(tmpdir):
     mpl.rcParams[PARAM] = 'gray'
     temp_file = f'text.{STYLE_EXTENSION}'
     path = Path(tmpdir, temp_file)
-    path.write_text(f'{PARAM} : {VALUE}')
+    path.write_text(f'{PARAM} : {VALUE}', encoding='utf-8')
     with style.context(path):
         assert mpl.rcParams[PARAM] == VALUE
     assert mpl.rcParams[PARAM] == 'gray'
@@ -138,10 +138,9 @@ def test_context_with_union_of_dict_and_namedstyle():
 def test_context_with_badparam():
     original_value = 'gray'
     other_value = 'blue'
-    d = OrderedDict([(PARAM, original_value), ('badparam', None)])
     with style.context({PARAM: other_value}):
         assert mpl.rcParams[PARAM] == other_value
-        x = style.context([d])
+        x = style.context({PARAM: original_value, 'badparam': None})
         with pytest.raises(KeyError):
             with x:
                 pass
@@ -167,7 +166,7 @@ def test_xkcd_no_cm():
     assert mpl.rcParams["path.sketch"] is None
     plt.xkcd()
     assert mpl.rcParams["path.sketch"] == (1, 100, 2)
-    gc.collect()
+    np.testing.break_cycles()
     assert mpl.rcParams["path.sketch"] == (1, 100, 2)
 
 
@@ -176,3 +175,18 @@ def test_xkcd_cm():
     with plt.xkcd():
         assert mpl.rcParams["path.sketch"] == (1, 100, 2)
     assert mpl.rcParams["path.sketch"] is None
+
+
+def test_deprecated_seaborn_styles():
+    with mpl.style.context("seaborn-v0_8-bright"):
+        seaborn_bright = mpl.rcParams.copy()
+    assert mpl.rcParams != seaborn_bright
+    with pytest.warns(mpl._api.MatplotlibDeprecationWarning):
+        mpl.style.use("seaborn-bright")
+    assert mpl.rcParams == seaborn_bright
+    with pytest.warns(mpl._api.MatplotlibDeprecationWarning):
+        mpl.style.library["seaborn-bright"]
+
+
+def test_up_to_date_blacklist():
+    assert mpl.style.core.STYLE_BLACKLIST <= {*mpl.rcsetup._validators}
diff --git a/lib/matplotlib/tests/test_subplots.py b/lib/matplotlib/tests/test_subplots.py
index 39d48f9340df..f299440ef53e 100644
--- a/lib/matplotlib/tests/test_subplots.py
+++ b/lib/matplotlib/tests/test_subplots.py
@@ -4,7 +4,8 @@
 import pytest
 
 import matplotlib.pyplot as plt
-from matplotlib.testing.decorators import image_comparison
+from matplotlib.testing.decorators import check_figures_equal, image_comparison
+import matplotlib.axes as maxes
 
 
 def check_shared(axs, x_shared, y_shared):
@@ -18,9 +19,7 @@ def check_shared(axs, x_shared, y_shared):
             enumerate(zip("xy", [x_shared, y_shared]))):
         if i2 <= i1:
             continue
-        assert \
-            (getattr(axs[0], "_shared_{}_axes".format(name)).joined(ax1, ax2)
-             == shared[i1, i2]), \
+        assert axs[0]._shared_axes[name].joined(ax1, ax2) == shared[i1, i2], \
             "axes %i and %i incorrectly %ssharing %s axis" % (
                 i1, i2, "not " if shared[i1, i2] else "", name)
 
@@ -33,6 +32,12 @@ def check_visible(axs, x_visible, y_visible):
         for l in ax.get_yticklabels() + [ax.yaxis.offsetText]:
             assert l.get_visible() == vy, \
                     f"Visibility of y axis #{i} is incorrectly {vy}"
+        # axis label "visibility" is toggled by label_outer by resetting the
+        # label to empty, but it can also be empty to start with.
+        if not vx:
+            assert ax.get_xlabel() == ""
+        if not vy:
+            assert ax.get_ylabel() == ""
 
 
 def test_shared():
@@ -92,6 +97,7 @@ def test_shared():
     f, ((a1, a2), (a3, a4)) = plt.subplots(2, 2, sharex=True, sharey=True)
     axs = [a1, a2, a3, a4]
     for ax in axs:
+        ax.set(xlabel="foo", ylabel="bar")
         ax.label_outer()
     check_visible(axs, [False, False, True, True], [True, False, True, False])
 
@@ -136,20 +142,9 @@ def test_exceptions():
         plt.subplots(2, 2, sharex='blah')
     with pytest.raises(ValueError):
         plt.subplots(2, 2, sharey='blah')
-    # We filter warnings in this test which are genuine since
-    # the point of this test is to ensure that this raises.
-    with pytest.warns(UserWarning, match='.*sharex argument to subplots'), \
-         pytest.raises(ValueError):
-        plt.subplots(2, 2, -1)
-    with pytest.warns(UserWarning, match='.*sharex argument to subplots'), \
-         pytest.raises(ValueError):
-        plt.subplots(2, 2, 0)
-    with pytest.warns(UserWarning, match='.*sharex argument to subplots'), \
-         pytest.raises(ValueError):
-        plt.subplots(2, 2, 5)
-
-
-@image_comparison(['subplots_offset_text'], remove_text=False)
+
+
+@image_comparison(['subplots_offset_text'])
 def test_subplots_offsettext():
     x = np.arange(0, 1e10, 1e9)
     y = np.arange(0, 100, 10)+1e4
@@ -164,7 +159,7 @@ def test_subplots_offsettext():
 @pytest.mark.parametrize("bottom", [True, False])
 @pytest.mark.parametrize("left", [True, False])
 @pytest.mark.parametrize("right", [True, False])
-def test_subplots_hide_labels(top, bottom, left, right):
+def test_subplots_hide_ticklabels(top, bottom, left, right):
     # Ideally, we would also test offset-text visibility (and remove
     # test_subplots_offsettext), but currently, setting rcParams fails to move
     # the offset texts as well.
@@ -182,6 +177,23 @@ def test_subplots_hide_labels(top, bottom, left, right):
         assert yright == (right and j == 2)
 
 
+@pytest.mark.parametrize("xlabel_position", ["bottom", "top"])
+@pytest.mark.parametrize("ylabel_position", ["left", "right"])
+def test_subplots_hide_axislabels(xlabel_position, ylabel_position):
+    axs = plt.figure().subplots(3, 3, sharex=True, sharey=True)
+    for (i, j), ax in np.ndenumerate(axs):
+        ax.set(xlabel="foo", ylabel="bar")
+        ax.xaxis.set_label_position(xlabel_position)
+        ax.yaxis.set_label_position(ylabel_position)
+        ax.label_outer()
+        assert bool(ax.get_xlabel()) == (
+            xlabel_position == "bottom" and i == 2
+            or xlabel_position == "top" and i == 0)
+        assert bool(ax.get_ylabel()) == (
+            ylabel_position == "left" and j == 0
+            or ylabel_position == "right" and j == 2)
+
+
 def test_get_gridspec():
     # ahem, pretty trivial, but...
     fig, ax = plt.subplots()
@@ -195,3 +207,47 @@ def test_dont_mutate_kwargs():
                            gridspec_kw=gridspec_kw)
     assert subplot_kw == {'sharex': 'all'}
     assert gridspec_kw == {'width_ratios': [1, 2]}
+
+
+def test_subplot_factory_reapplication():
+    assert maxes.subplot_class_factory(maxes.Axes) is maxes.Subplot
+    assert maxes.subplot_class_factory(maxes.Subplot) is maxes.Subplot
+
+
+@pytest.mark.parametrize("width_ratios", [None, [1, 3, 2]])
+@pytest.mark.parametrize("height_ratios", [None, [1, 2]])
+@check_figures_equal(extensions=['png'])
+def test_width_and_height_ratios(fig_test, fig_ref,
+                                 height_ratios, width_ratios):
+    fig_test.subplots(2, 3, height_ratios=height_ratios,
+                      width_ratios=width_ratios)
+    fig_ref.subplots(2, 3, gridspec_kw={
+                     'height_ratios': height_ratios,
+                     'width_ratios': width_ratios})
+
+
+@pytest.mark.parametrize("width_ratios", [None, [1, 3, 2]])
+@pytest.mark.parametrize("height_ratios", [None, [1, 2]])
+@check_figures_equal(extensions=['png'])
+def test_width_and_height_ratios_mosaic(fig_test, fig_ref,
+                                        height_ratios, width_ratios):
+    mosaic_spec = [['A', 'B', 'B'], ['A', 'C', 'D']]
+    fig_test.subplot_mosaic(mosaic_spec, height_ratios=height_ratios,
+                            width_ratios=width_ratios)
+    fig_ref.subplot_mosaic(mosaic_spec, gridspec_kw={
+                           'height_ratios': height_ratios,
+                           'width_ratios': width_ratios})
+
+
+@pytest.mark.parametrize('method,args', [
+    ('subplots', (2, 3)),
+    ('subplot_mosaic', ('abc;def', ))
+    ]
+)
+def test_ratio_overlapping_kws(method, args):
+    with pytest.raises(ValueError, match='height_ratios'):
+        getattr(plt, method)(*args, height_ratios=[1, 2],
+                             gridspec_kw={'height_ratios': [1, 2]})
+    with pytest.raises(ValueError, match='width_ratios'):
+        getattr(plt, method)(*args, width_ratios=[1, 2, 3],
+                             gridspec_kw={'width_ratios': [1, 2, 3]})
diff --git a/lib/matplotlib/tests/test_table.py b/lib/matplotlib/tests/test_table.py
index d0537c3b2ddf..d4f68ea1805d 100644
--- a/lib/matplotlib/tests/test_table.py
+++ b/lib/matplotlib/tests/test_table.py
@@ -149,7 +149,7 @@ def test_auto_column():
     tb2.set_fontsize(12)
     tb2.auto_set_column_width((-1, 0, 1))
 
-    #3 single inputs
+    # 3 single inputs
     ax3 = fig.add_subplot(4, 1, 3)
     ax3.axis('off')
     tb3 = ax3.table(
@@ -164,7 +164,7 @@ def test_auto_column():
     tb3.auto_set_column_width(0)
     tb3.auto_set_column_width(1)
 
-    #4 non integer iterable input
+    # 4 non integer iterable input
     ax4 = fig.add_subplot(4, 1, 4)
     ax4.axis('off')
     tb4 = ax4.table(
diff --git a/lib/matplotlib/tests/test_texmanager.py b/lib/matplotlib/tests/test_texmanager.py
index 170a8362e287..29ed9d86597f 100644
--- a/lib/matplotlib/tests/test_texmanager.py
+++ b/lib/matplotlib/tests/test_texmanager.py
@@ -1,18 +1,59 @@
+from pathlib import Path
+import re
+
 import matplotlib.pyplot as plt
 from matplotlib.texmanager import TexManager
+from matplotlib.testing._markers import needs_usetex
+import pytest
 
 
 def test_fontconfig_preamble():
-    """
-    Test that the preamble is included in _fontconfig
-    """
+    """Test that the preamble is included in the source."""
     plt.rcParams['text.usetex'] = True
 
-    tm1 = TexManager()
-    font_config1 = tm1.get_font_config()
-
+    src1 = TexManager()._get_tex_source("", fontsize=12)
     plt.rcParams['text.latex.preamble'] = '\\usepackage{txfonts}'
-    tm2 = TexManager()
-    font_config2 = tm2.get_font_config()
+    src2 = TexManager()._get_tex_source("", fontsize=12)
+
+    assert src1 != src2
+
+
+@pytest.mark.parametrize(
+    "rc, preamble, family", [
+        ({"font.family": "sans-serif", "font.sans-serif": "helvetica"},
+         r"\usepackage{helvet}", r"\sffamily"),
+        ({"font.family": "serif", "font.serif": "palatino"},
+         r"\usepackage{mathpazo}", r"\rmfamily"),
+        ({"font.family": "cursive", "font.cursive": "zapf chancery"},
+         r"\usepackage{chancery}", r"\rmfamily"),
+        ({"font.family": "monospace", "font.monospace": "courier"},
+         r"\usepackage{courier}", r"\ttfamily"),
+        ({"font.family": "helvetica"}, r"\usepackage{helvet}", r"\sffamily"),
+        ({"font.family": "palatino"}, r"\usepackage{mathpazo}", r"\rmfamily"),
+        ({"font.family": "zapf chancery"},
+         r"\usepackage{chancery}", r"\rmfamily"),
+        ({"font.family": "courier"}, r"\usepackage{courier}", r"\ttfamily")
+    ])
+def test_font_selection(rc, preamble, family):
+    plt.rcParams.update(rc)
+    tm = TexManager()
+    src = Path(tm.make_tex("hello, world", fontsize=12)).read_text()
+    assert preamble in src
+    assert [*re.findall(r"\\\w+family", src)] == [family]
+
+
+@needs_usetex
+def test_unicode_characters():
+    # Smoke test to see that Unicode characters does not cause issues
+    # See #23019
+    plt.rcParams['text.usetex'] = True
+    fig, ax = plt.subplots()
+    ax.set_ylabel('\\textit{Velocity (\N{DEGREE SIGN}/sec)}')
+    ax.set_xlabel('\N{VULGAR FRACTION ONE QUARTER}Öøæ')
+    fig.canvas.draw()
 
-    assert font_config1 != font_config2
+    # But not all characters.
+    # Should raise RuntimeError, not UnicodeDecodeError
+    with pytest.raises(RuntimeError):
+        ax.set_title('\N{SNOWMAN}')
+        fig.canvas.draw()
diff --git a/lib/matplotlib/tests/test_text.py b/lib/matplotlib/tests/test_text.py
index 435da825a2cd..9b3f70526763 100644
--- a/lib/matplotlib/tests/test_text.py
+++ b/lib/matplotlib/tests/test_text.py
@@ -13,14 +13,10 @@
 import matplotlib.pyplot as plt
 import matplotlib.transforms as mtransforms
 from matplotlib.testing.decorators import check_figures_equal, image_comparison
+from matplotlib.testing._markers import needs_usetex
 from matplotlib.text import Text
 
 
-needs_usetex = pytest.mark.skipif(
-    not mpl.checkdep_usetex(True),
-    reason="This test needs a TeX installation")
-
-
 @image_comparison(['font_styles'])
 def test_font_styles():
 
@@ -43,11 +39,16 @@ def find_matplotlib_font(**kw):
         style="normal",
         variant="normal",
         size=14)
-    ax.annotate(
+    a = ax.annotate(
         "Normal Font",
         (0.1, 0.1),
         xycoords='axes fraction',
         fontproperties=normal_font)
+    assert a.get_fontname() == 'DejaVu Sans'
+    assert a.get_fontstyle() == 'normal'
+    assert a.get_fontvariant() == 'normal'
+    assert a.get_weight() == 'normal'
+    assert a.get_stretch() == 'normal'
 
     bold_font = find_matplotlib_font(
         family="Foo",
@@ -199,7 +200,7 @@ def test_antialiasing():
 def test_afm_kerning():
     fn = mpl.font_manager.findfont("Helvetica", fontext="afm")
     with open(fn, 'rb') as fh:
-        afm = mpl.afm.AFM(fh)
+        afm = mpl._afm.AFM(fh)
     assert afm.string_width_height('VAVAVAVAVAVA') == (7174.0, 718)
 
 
@@ -240,12 +241,27 @@ def test_annotation_contains():
     fig, ax = plt.subplots()
     ann = ax.annotate(
         "hello", xy=(.4, .4), xytext=(.6, .6), arrowprops={"arrowstyle": "->"})
-    fig.canvas.draw()   # Needed for the same reason as in test_contains.
+    fig.canvas.draw()  # Needed for the same reason as in test_contains.
     event = MouseEvent(
         "button_press_event", fig.canvas, *ax.transData.transform((.5, .6)))
     assert ann.contains(event) == (False, {})
 
 
+@pytest.mark.parametrize('err, xycoords, match', (
+    (RuntimeError, print, "Unknown return type"),
+    (RuntimeError, [0, 0], r"Unknown coordinate type: \[0, 0\]"),
+    (ValueError, "foo", "'foo' is not a recognized coordinate"),
+    (ValueError, "foo bar", "'foo bar' is not a recognized coordinate"),
+    (ValueError, "offset foo", "xycoords cannot be an offset coordinate"),
+    (ValueError, "axes foo", "'foo' is not a recognized unit"),
+))
+def test_annotate_errors(err, xycoords, match):
+    fig, ax = plt.subplots()
+    with pytest.raises(err, match=match):
+        ax.annotate('xy', (0, 0), xytext=(0.5, 0.5), xycoords=xycoords)
+        fig.canvas.draw()
+
+
 @image_comparison(['titles'])
 def test_titles():
     # left and right side titles
@@ -340,33 +356,32 @@ def test_non_default_dpi(text):
 
 
 def test_get_rotation_string():
-    assert mpl.text.get_rotation('horizontal') == 0.
-    assert mpl.text.get_rotation('vertical') == 90.
-    assert mpl.text.get_rotation('15.') == 15.
+    assert Text(rotation='horizontal').get_rotation() == 0.
+    assert Text(rotation='vertical').get_rotation() == 90.
 
 
 def test_get_rotation_float():
     for i in [15., 16.70, 77.4]:
-        assert mpl.text.get_rotation(i) == i
+        assert Text(rotation=i).get_rotation() == i
 
 
 def test_get_rotation_int():
     for i in [67, 16, 41]:
-        assert mpl.text.get_rotation(i) == float(i)
+        assert Text(rotation=i).get_rotation() == float(i)
 
 
 def test_get_rotation_raises():
     with pytest.raises(ValueError):
-        mpl.text.get_rotation('hozirontal')
+        Text(rotation='hozirontal')
 
 
 def test_get_rotation_none():
-    assert mpl.text.get_rotation(None) == 0.0
+    assert Text(rotation=None).get_rotation() == 0.0
 
 
 def test_get_rotation_mod360():
     for i, j in zip([360., 377., 720+177.2], [0., 17., 177.2]):
-        assert_almost_equal(mpl.text.get_rotation(i), j)
+        assert_almost_equal(Text(rotation=i).get_rotation(), j)
 
 
 @pytest.mark.parametrize("ha", ["center", "right", "left"])
@@ -504,8 +519,8 @@ def test_two_2line_texts(spacing1, spacing2):
     fig = plt.figure()
     renderer = fig.canvas.get_renderer()
 
-    text1 = plt.text(0.25, 0.5, text_string, linespacing=spacing1)
-    text2 = plt.text(0.25, 0.5, text_string, linespacing=spacing2)
+    text1 = fig.text(0.25, 0.5, text_string, linespacing=spacing1)
+    text2 = fig.text(0.25, 0.5, text_string, linespacing=spacing2)
     fig.canvas.draw()
 
     box1 = text1.get_window_extent(renderer=renderer)
@@ -519,6 +534,11 @@ def test_two_2line_texts(spacing1, spacing2):
         assert box1.height != box2.height
 
 
+def test_validate_linespacing():
+    with pytest.raises(TypeError):
+        plt.text(.25, .5, "foo", linespacing="abc")
+
+
 def test_nonfinite_pos():
     fig, ax = plt.subplots()
     ax.text(0, np.nan, 'nan')
@@ -636,12 +656,12 @@ def test_large_subscript_title():
     ax = axs[0]
     ax.set_title(r'$\sum_{i} x_i$')
     ax.set_title('New way', loc='left')
-    ax.set_xticklabels('')
+    ax.set_xticklabels([])
 
     ax = axs[1]
     ax.set_title(r'$\sum_{i} x_i$', y=1.01)
     ax.set_title('Old Way', loc='left')
-    ax.set_xticklabels('')
+    ax.set_xticklabels([])
 
 
 def test_wrap():
@@ -711,6 +731,14 @@ def test_update_mutate_input():
     assert inp['bbox'] == cache['bbox']
 
 
+@pytest.mark.parametrize('rotation', ['invalid string', [90]])
+def test_invalid_rotation_values(rotation):
+    with pytest.raises(
+            ValueError,
+            match=("rotation must be 'vertical', 'horizontal' or a number")):
+        Text(0, 0, 'foo', rotation=rotation)
+
+
 def test_invalid_color():
     with pytest.raises(ValueError):
         plt.figtext(.5, .5, "foo", c="foobar")
@@ -720,3 +748,84 @@ def test_invalid_color():
 def test_pdf_kerning():
     plt.figure()
     plt.figtext(0.1, 0.5, "ATATATATATATATATATA", size=30)
+
+
+def test_unsupported_script(recwarn):
+    fig = plt.figure()
+    fig.text(.5, .5, "\N{BENGALI DIGIT ZERO}")
+    fig.canvas.draw()
+    assert all(isinstance(warn.message, UserWarning) for warn in recwarn)
+    assert (
+        [warn.message.args for warn in recwarn] ==
+        [(r"Glyph 2534 (\N{BENGALI DIGIT ZERO}) missing from current font.",),
+         (r"Matplotlib currently does not support Bengali natively.",)])
+
+
+def test_parse_math():
+    fig, ax = plt.subplots()
+    ax.text(0, 0, r"$ \wrong{math} $", parse_math=False)
+    fig.canvas.draw()
+
+    ax.text(0, 0, r"$ \wrong{math} $", parse_math=True)
+    with pytest.raises(ValueError, match='Unknown symbol'):
+        fig.canvas.draw()
+
+
+def test_parse_math_rcparams():
+    # Default is True
+    fig, ax = plt.subplots()
+    ax.text(0, 0, r"$ \wrong{math} $")
+    with pytest.raises(ValueError, match='Unknown symbol'):
+        fig.canvas.draw()
+
+    # Setting rcParams to False
+    with mpl.rc_context({'text.parse_math': False}):
+        fig, ax = plt.subplots()
+        ax.text(0, 0, r"$ \wrong{math} $")
+        fig.canvas.draw()
+
+
+@image_comparison(['text_pdf_font42_kerning.pdf'], style='mpl20')
+def test_pdf_font42_kerning():
+    plt.rcParams['pdf.fonttype'] = 42
+    plt.figure()
+    plt.figtext(0.1, 0.5, "ATAVATAVATAVATAVATA", size=30)
+
+
+@image_comparison(['text_pdf_chars_beyond_bmp.pdf'], style='mpl20')
+def test_pdf_chars_beyond_bmp():
+    plt.rcParams['pdf.fonttype'] = 42
+    plt.rcParams['mathtext.fontset'] = 'stixsans'
+    plt.figure()
+    plt.figtext(0.1, 0.5, "Mass $m$ \U00010308", size=30)
+
+
+@needs_usetex
+def test_metrics_cache():
+    mpl.text._get_text_metrics_with_cache_impl.cache_clear()
+
+    fig = plt.figure()
+    fig.text(.3, .5, "foo\nbar")
+    fig.text(.3, .5, "foo\nbar", usetex=True)
+    fig.text(.5, .5, "foo\nbar", usetex=True)
+    fig.canvas.draw()
+    renderer = fig._get_renderer()
+    ys = {}  # mapping of strings to where they were drawn in y with draw_tex.
+
+    def call(*args, **kwargs):
+        renderer, x, y, s, *_ = args
+        ys.setdefault(s, set()).add(y)
+
+    renderer.draw_tex = call
+    fig.canvas.draw()
+    assert [*ys] == ["foo", "bar"]
+    # Check that both TeX strings were drawn with the same y-position for both
+    # single-line substrings.  Previously, there used to be an incorrect cache
+    # collision with the non-TeX string (drawn first here) whose metrics would
+    # get incorrectly reused by the first TeX string.
+    assert len(ys["foo"]) == len(ys["bar"]) == 1
+
+    info = mpl.text._get_text_metrics_with_cache_impl.cache_info()
+    # Every string gets a miss for the first layouting (extents), then a hit
+    # when drawing, but "foo\nbar" gets two hits as it's drawn twice.
+    assert info.hits > info.misses
diff --git a/lib/matplotlib/tests/test_textpath.py b/lib/matplotlib/tests/test_textpath.py
new file mode 100644
index 000000000000..e421d2623cad
--- /dev/null
+++ b/lib/matplotlib/tests/test_textpath.py
@@ -0,0 +1,10 @@
+import copy
+
+from matplotlib.textpath import TextPath
+
+
+def test_copy():
+    tp = TextPath((0, 0), ".")
+    assert copy.deepcopy(tp).vertices is not tp.vertices
+    assert (copy.deepcopy(tp).vertices == tp.vertices).all()
+    assert copy.copy(tp).vertices is tp.vertices
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
index 6138757447d7..e91d3236020d 100644
--- a/lib/matplotlib/tests/test_ticker.py
+++ b/lib/matplotlib/tests/test_ticker.py
@@ -8,7 +8,6 @@
 import pytest
 
 import matplotlib as mpl
-from matplotlib import _api
 import matplotlib.pyplot as plt
 import matplotlib.ticker as mticker
 
@@ -444,19 +443,110 @@ def test_set_params(self):
         assert sym.numticks == 8
 
 
-class TestIndexFormatter:
-    @pytest.mark.parametrize('x, label', [(-2, ''),
-                                          (-1, 'label0'),
-                                          (0, 'label0'),
-                                          (0.5, 'label1'),
-                                          (1, 'label1'),
-                                          (1.5, 'label2'),
-                                          (2, 'label2'),
-                                          (2.5, '')])
-    def test_formatting(self, x, label):
-        with _api.suppress_matplotlib_deprecation_warning():
-            formatter = mticker.IndexFormatter(['label0', 'label1', 'label2'])
-        assert formatter(x) == label
+class TestAsinhLocator:
+    def test_init(self):
+        lctr = mticker.AsinhLocator(linear_width=2.718, numticks=19)
+        assert lctr.linear_width == 2.718
+        assert lctr.numticks == 19
+        assert lctr.base == 10
+
+    def test_set_params(self):
+        lctr = mticker.AsinhLocator(linear_width=5,
+                                    numticks=17, symthresh=0.125,
+                                    base=4, subs=(2.5, 3.25))
+        assert lctr.numticks == 17
+        assert lctr.symthresh == 0.125
+        assert lctr.base == 4
+        assert lctr.subs == (2.5, 3.25)
+
+        lctr.set_params(numticks=23)
+        assert lctr.numticks == 23
+        lctr.set_params(None)
+        assert lctr.numticks == 23
+
+        lctr.set_params(symthresh=0.5)
+        assert lctr.symthresh == 0.5
+        lctr.set_params(symthresh=None)
+        assert lctr.symthresh == 0.5
+
+        lctr.set_params(base=7)
+        assert lctr.base == 7
+        lctr.set_params(base=None)
+        assert lctr.base == 7
+
+        lctr.set_params(subs=(2, 4.125))
+        assert lctr.subs == (2, 4.125)
+        lctr.set_params(subs=None)
+        assert lctr.subs == (2, 4.125)
+        lctr.set_params(subs=[])
+        assert lctr.subs is None
+
+    def test_linear_values(self):
+        lctr = mticker.AsinhLocator(linear_width=100, numticks=11, base=0)
+
+        assert_almost_equal(lctr.tick_values(-1, 1),
+                            np.arange(-1, 1.01, 0.2))
+        assert_almost_equal(lctr.tick_values(-0.1, 0.1),
+                            np.arange(-0.1, 0.101, 0.02))
+        assert_almost_equal(lctr.tick_values(-0.01, 0.01),
+                            np.arange(-0.01, 0.0101, 0.002))
+
+    def test_wide_values(self):
+        lctr = mticker.AsinhLocator(linear_width=0.1, numticks=11, base=0)
+
+        assert_almost_equal(lctr.tick_values(-100, 100),
+                            [-100, -20, -5, -1, -0.2,
+                             0, 0.2, 1, 5, 20, 100])
+        assert_almost_equal(lctr.tick_values(-1000, 1000),
+                            [-1000, -100, -20, -3, -0.4,
+                             0, 0.4, 3, 20, 100, 1000])
+
+    def test_near_zero(self):
+        """Check that manually injected zero will supersede nearby tick"""
+        lctr = mticker.AsinhLocator(linear_width=100, numticks=3, base=0)
+
+        assert_almost_equal(lctr.tick_values(-1.1, 0.9), [-1.0, 0.0, 0.9])
+
+    def test_fallback(self):
+        lctr = mticker.AsinhLocator(1.0, numticks=11)
+
+        assert_almost_equal(lctr.tick_values(101, 102),
+                            np.arange(101, 102.01, 0.1))
+
+    def test_symmetrizing(self):
+        class DummyAxis:
+            bounds = (-1, 1)
+            @classmethod
+            def get_view_interval(cls): return cls.bounds
+
+        lctr = mticker.AsinhLocator(linear_width=1, numticks=3,
+                                    symthresh=0.25, base=0)
+        lctr.axis = DummyAxis
+
+        DummyAxis.bounds = (-1, 2)
+        assert_almost_equal(lctr(), [-1, 0, 2])
+
+        DummyAxis.bounds = (-1, 0.9)
+        assert_almost_equal(lctr(), [-1, 0, 1])
+
+        DummyAxis.bounds = (-0.85, 1.05)
+        assert_almost_equal(lctr(), [-1, 0, 1])
+
+        DummyAxis.bounds = (1, 1.1)
+        assert_almost_equal(lctr(), [1, 1.05, 1.1])
+
+    def test_base_rounding(self):
+        lctr10 = mticker.AsinhLocator(linear_width=1, numticks=8,
+                                      base=10, subs=(1, 3, 5))
+        assert_almost_equal(lctr10.tick_values(-110, 110),
+                            [-500, -300, -100, -50, -30, -10, -5, -3, -1,
+                             -0.5, -0.3, -0.1, 0, 0.1, 0.3, 0.5,
+                             1, 3, 5, 10, 30, 50, 100, 300, 500])
+
+        lctr5 = mticker.AsinhLocator(linear_width=1, numticks=20, base=5)
+        assert_almost_equal(lctr5.tick_values(-1050, 1050),
+                            [-625, -125, -25, -5, -1, -0.2, 0,
+                             0.2, 1, 5, 25, 125, 625])
 
 
 class TestScalarFormatter:
@@ -495,6 +585,8 @@ class TestScalarFormatter:
 
     use_offset_data = [True, False]
 
+    useMathText_data = [True, False]
+
     #  (sci_type, scilimits, lim, orderOfMag, fewticks)
     scilimits_data = [
         (False, (0, 0), (10.0, 20.0), 0, False),
@@ -516,6 +608,13 @@ class TestScalarFormatter:
         [12.3, "12.300"],
     ]
 
+    format_data = [
+        (.1, "1e-1"),
+        (.11, "1.1e-1"),
+        (1e8, "1e8"),
+        (1.1e8, "1.1e8"),
+    ]
+
     @pytest.mark.parametrize('unicode_minus, result',
                              [(True, "\N{MINUS SIGN}1"), (False, "-1")])
     def test_unicode_minus(self, unicode_minus, result):
@@ -546,6 +645,19 @@ def test_use_offset(self, use_offset):
         with mpl.rc_context({'axes.formatter.useoffset': use_offset}):
             tmp_form = mticker.ScalarFormatter()
             assert use_offset == tmp_form.get_useOffset()
+            assert tmp_form.offset == 0
+
+    @pytest.mark.parametrize('use_math_text', useMathText_data)
+    def test_useMathText(self, use_math_text):
+        with mpl.rc_context({'axes.formatter.use_mathtext': use_math_text}):
+            tmp_form = mticker.ScalarFormatter()
+            assert use_math_text == tmp_form.get_useMathText()
+
+    def test_set_use_offset_float(self):
+        tmp_form = mticker.ScalarFormatter()
+        tmp_form.set_useOffset(0.5)
+        assert not tmp_form.get_useOffset()
+        assert tmp_form.offset == 0.5
 
     def test_use_locale(self):
         conv = locale.localeconv()
@@ -558,7 +670,7 @@ def test_use_locale(self):
             assert tmp_form.get_useLocale()
 
             tmp_form.create_dummy_axis()
-            tmp_form.set_bounds(0, 10)
+            tmp_form.axis.set_data_interval(0, 10)
             tmp_form.set_locs([1, 2, 3])
             assert sep in tmp_form(1e9)
 
@@ -577,6 +689,12 @@ def test_scilimits(self, sci_type, scilimits, lim, orderOfMag, fewticks):
         tmp_form.set_locs(ax.yaxis.get_majorticklocs())
         assert orderOfMag == tmp_form.orderOfMagnitude
 
+    @pytest.mark.parametrize('value, expected', format_data)
+    def test_format_data(self, value, expected):
+        mpl.rcParams['axes.unicode_minus'] = False
+        sf = mticker.ScalarFormatter()
+        assert sf.format_data(value) == expected
+
     @pytest.mark.parametrize('data, expected', cursor_data)
     def test_cursor_precision(self, data, expected):
         fig, ax = plt.subplots()
@@ -589,9 +707,28 @@ def test_cursor_dummy_axis(self, data, expected):
         # Issue #17624
         sf = mticker.ScalarFormatter()
         sf.create_dummy_axis()
-        sf.set_bounds(0, 10)
+        sf.axis.set_view_interval(0, 10)
         fmt = sf.format_data_short
         assert fmt(data) == expected
+        assert sf.axis.get_tick_space() == 9
+        assert sf.axis.get_minpos() == 0
+
+    def test_mathtext_ticks(self):
+        mpl.rcParams.update({
+            'font.family': 'serif',
+            'font.serif': 'cmr10',
+            'axes.formatter.use_mathtext': False
+        })
+
+        with pytest.warns(UserWarning, match='cmr10 font should ideally'):
+            fig, ax = plt.subplots()
+            ax.set_xticks([-1, 0, 1])
+            fig.canvas.draw()
+
+    def test_empty_locs(self):
+        sf = mticker.ScalarFormatter()
+        sf.set_locs([])
+        assert sf(0.5) == ''
 
 
 class FakeAxis:
@@ -628,6 +765,7 @@ def test_basic(self, labelOnlyBase, base, exponent, locs, positions,
         formatter.axis = FakeAxis(1, base**exponent)
         vals = base**locs
         labels = [formatter(x, pos) for (x, pos) in zip(vals, positions)]
+        expected = [label.replace('-', '\N{Minus Sign}') for label in expected]
         assert labels == expected
 
     def test_blank(self):
@@ -676,7 +814,7 @@ class TestLogFormatterSciNotation:
         (10, 500000, '$\\mathdefault{5\\times10^{5}}$'),
     ]
 
-    @pytest.mark.style('default')
+    @mpl.style.context('default')
     @pytest.mark.parametrize('base, value, expected', test_data)
     def test_basic(self, base, value, expected):
         formatter = mticker.LogFormatterSciNotation(base=base)
@@ -837,7 +975,7 @@ def _sub_labels(self, axis, subs=()):
         label_test = [fmt(x) != '' for x in minor_tlocs]
         assert label_test == label_expected
 
-    @pytest.mark.style('default')
+    @mpl.style.context('default')
     def test_sublabel(self):
         # test label locator
         fig, ax = plt.subplots()
@@ -1171,7 +1309,7 @@ def test_params(self, unicode_minus, input, expected):
             assert _formatter(input) == _exp_output
 
         # Test several non default separators: no separator, a narrow
-        # no-break space (unicode character) and an extravagant string.
+        # no-break space (Unicode character) and an extravagant string.
         for _sep in ("", "\N{NARROW NO-BREAK SPACE}", "@_@"):
             # Case 2: unit=UNIT and sep=_sep.
             # Replace the default space separator from the reference case
@@ -1368,14 +1506,30 @@ def test_remove_overlap(remove_overlapping_locs, expected_num):
 def test_bad_locator_subs(sub):
     ll = mticker.LogLocator()
     with pytest.raises(ValueError):
-        ll.subs(sub)
+        ll.set_params(subs=sub)
 
 
 @pytest.mark.parametrize('numticks', [1, 2, 3, 9])
-@pytest.mark.style('default')
+@mpl.style.context('default')
 def test_small_range_loglocator(numticks):
     ll = mticker.LogLocator()
     ll.set_params(numticks=numticks)
     for top in [5, 7, 9, 11, 15, 50, 100, 1000]:
         ticks = ll.tick_values(.5, top)
         assert (np.diff(np.log10(ll.tick_values(6, 150))) == 1).all()
+
+
+def test_NullFormatter():
+    formatter = mticker.NullFormatter()
+    assert formatter(1.0) == ''
+    assert formatter.format_data(1.0) == ''
+    assert formatter.format_data_short(1.0) == ''
+
+
+@pytest.mark.parametrize('formatter', (
+    mticker.FuncFormatter(lambda a: f'val: {a}'),
+    mticker.FixedFormatter(('foo', 'bar'))))
+def test_set_offset_string(formatter):
+    assert formatter.get_offset() == ''
+    formatter.set_offset_string('mpl')
+    assert formatter.get_offset() == 'mpl'
diff --git a/lib/matplotlib/tests/test_tightlayout.py b/lib/matplotlib/tests/test_tightlayout.py
index 23d363b5083b..1eb7b4b4534f 100644
--- a/lib/matplotlib/tests/test_tightlayout.py
+++ b/lib/matplotlib/tests/test_tightlayout.py
@@ -134,9 +134,10 @@ def test_tight_layout7():
 def test_tight_layout8():
     """Test automatic use of tight_layout."""
     fig = plt.figure()
-    fig.set_tight_layout({'pad': .1})
+    fig.set_layout_engine(layout='tight', pad=0.1)
     ax = fig.add_subplot()
     example_plot(ax, fontsize=24)
+    fig.draw_without_rendering()
 
 
 @image_comparison(['tight_layout9'])
@@ -329,3 +330,53 @@ def __init__(self, *args, **kwargs):
     monkeypatch.setattr(mpl.backend_bases.RendererBase, "__init__", __init__)
     fig, ax = plt.subplots()
     fig.tight_layout()
+
+
+def test_manual_colorbar():
+    # This should warn, but not raise
+    fig, axes = plt.subplots(1, 2)
+    pts = axes[1].scatter([0, 1], [0, 1], c=[1, 5])
+    ax_rect = axes[1].get_position()
+    cax = fig.add_axes(
+        [ax_rect.x1 + 0.005, ax_rect.y0, 0.015, ax_rect.height]
+    )
+    fig.colorbar(pts, cax=cax)
+    with pytest.warns(UserWarning, match="This figure includes Axes"):
+        fig.tight_layout()
+
+
+def test_clipped_to_axes():
+    # Ensure that _fully_clipped_to_axes() returns True under default
+    # conditions for all projection types. Axes.get_tightbbox()
+    # uses this to skip artists in layout calculations.
+    arr = np.arange(100).reshape((10, 10))
+    fig = plt.figure(figsize=(6, 2))
+    ax1 = fig.add_subplot(131, projection='rectilinear')
+    ax2 = fig.add_subplot(132, projection='mollweide')
+    ax3 = fig.add_subplot(133, projection='polar')
+    for ax in (ax1, ax2, ax3):
+        # Default conditions (clipped by ax.bbox or ax.patch)
+        ax.grid(False)
+        h, = ax.plot(arr[:, 0])
+        m = ax.pcolor(arr)
+        assert h._fully_clipped_to_axes()
+        assert m._fully_clipped_to_axes()
+        # Non-default conditions (not clipped by ax.patch)
+        rect = Rectangle((0, 0), 0.5, 0.5, transform=ax.transAxes)
+        h.set_clip_path(rect)
+        m.set_clip_path(rect.get_path(), rect.get_transform())
+        assert not h._fully_clipped_to_axes()
+        assert not m._fully_clipped_to_axes()
+
+
+def test_tight_pads():
+    fig, ax = plt.subplots()
+    with pytest.warns(PendingDeprecationWarning,
+                      match='will be deprecated'):
+        fig.set_tight_layout({'pad': 0.15})
+    fig.draw_without_rendering()
+
+
+def test_tight_kwargs():
+    fig, ax = plt.subplots(tight_layout={'pad': 0.15})
+    fig.draw_without_rendering()
diff --git a/lib/matplotlib/tests/test_transforms.py b/lib/matplotlib/tests/test_transforms.py
index ad572fe5287a..55fcdd937656 100644
--- a/lib/matplotlib/tests/test_transforms.py
+++ b/lib/matplotlib/tests/test_transforms.py
@@ -69,16 +69,13 @@ def _as_mpl_transform(self, axes):
                     mtransforms.Affine2D().scale(10).get_matrix())
 
 
-@image_comparison(['pre_transform_data'],
-                  tol=0.08, remove_text=True, style='mpl20')
+@image_comparison(['pre_transform_data'], remove_text=True, style='mpl20',
+                  tol=0.05)
 def test_pre_transform_plotting():
     # a catch-all for as many as possible plot layouts which handle
     # pre-transforming the data NOTE: The axis range is important in this
     # plot. It should be x10 what the data suggests it should be
 
-    # Remove this line when this test image is regenerated.
-    plt.rcParams['pcolormesh.snap'] = False
-
     ax = plt.axes()
     times10 = mtransforms.Affine2D().scale(10)
 
@@ -97,9 +94,8 @@ def test_pre_transform_plotting():
     u = 2*np.sin(x) + np.cos(y[:, np.newaxis])
     v = np.sin(x) - np.cos(y[:, np.newaxis])
 
-    df = 25. / 30.   # Compatibility factor for old test image
     ax.streamplot(x, y, u, v, transform=times10 + ax.transData,
-                  density=(df, df), linewidth=u**2 + v**2)
+                  linewidth=np.hypot(u, v))
 
     # reduce the vector data down a bit for barb and quiver plotting
     x, y = x[::3], y[::3]
@@ -195,8 +191,7 @@ def test_affine_inverted_invalidated():
 
 def test_clipping_of_log():
     # issue 804
-    path = Path([(0.2, -99), (0.4, -99), (0.4, 20), (0.2, 20), (0.2, -99)],
-                closed=True)
+    path = Path._create_closed([(0.2, -99), (0.4, -99), (0.4, 20), (0.2, 20)])
     # something like this happens in plotting logarithmic histograms
     trans = mtransforms.BlendedGenericTransform(
         mtransforms.Affine2D(), scale.LogTransform(10, 'clip'))
@@ -205,7 +200,7 @@ def test_clipping_of_log():
                                  clip=(0, 0, 100, 100),
                                  simplify=False)
     tpoints, tcodes = zip(*result)
-    assert_allclose(tcodes, path.codes)
+    assert_allclose(tcodes, path.codes[:-1])  # No longer closed.
 
 
 class NonAffineForTest(mtransforms.Transform):
@@ -460,6 +455,12 @@ def assert_bbox_eq(bbox1, bbox2):
     assert_array_equal(bbox1.bounds, bbox2.bounds)
 
 
+def test_bbox_frozen_copies_minpos():
+    bbox = mtransforms.Bbox.from_extents(0.0, 0.0, 1.0, 1.0, minpos=1.0)
+    frozen = bbox.frozen()
+    assert_array_equal(frozen.minpos, bbox.minpos)
+
+
 def test_bbox_intersection():
     bbox_from_ext = mtransforms.Bbox.from_extents
     inter = mtransforms.Bbox.intersection
@@ -506,14 +507,8 @@ def test_str_transform():
                     IdentityTransform(),
                     IdentityTransform())),
             CompositeAffine2D(
-                Affine2D(
-                    [[1. 0. 0.]
-                     [0. 1. 0.]
-                     [0. 0. 1.]]),
-                Affine2D(
-                    [[1. 0. 0.]
-                     [0. 1. 0.]
-                     [0. 0. 1.]]))),
+                Affine2D().scale(1.0),
+                Affine2D().scale(1.0))),
         PolarTransform(
             PolarAxesSubplot(0.125,0.1;0.775x0.8),
             use_rmin=True,
@@ -535,14 +530,8 @@ def test_str_transform():
                     TransformedBbox(
                         Bbox(x0=0.0, y0=0.0, x1=6.283185307179586, y1=1.0),
                         CompositeAffine2D(
-                            Affine2D(
-                                [[1. 0. 0.]
-                                 [0. 1. 0.]
-                                 [0. 0. 1.]]),
-                            Affine2D(
-                                [[1. 0. 0.]
-                                 [0. 1. 0.]
-                                 [0. 0. 1.]]))),
+                            Affine2D().scale(1.0),
+                            Affine2D().scale(1.0))),
                     LockableBbox(
                         Bbox(x0=0.0, y0=0.0, x1=6.283185307179586, y1=1.0),
                         [[-- --]
@@ -553,10 +542,7 @@ def test_str_transform():
                 BboxTransformTo(
                     TransformedBbox(
                         Bbox(x0=0.0, y0=0.0, x1=8.0, y1=6.0),
-                        Affine2D(
-                            [[80.  0.  0.]
-                             [ 0. 80.  0.]
-                             [ 0.  0.  1.]])))))))"""
+                        Affine2D().scale(80.0)))))))"""
 
 
 def test_transform_single_point():
diff --git a/lib/matplotlib/tests/test_triangulation.py b/lib/matplotlib/tests/test_triangulation.py
index dacbfd39c154..4738b53c5358 100644
--- a/lib/matplotlib/tests/test_triangulation.py
+++ b/lib/matplotlib/tests/test_triangulation.py
@@ -5,11 +5,71 @@
 import pytest
 
 import matplotlib as mpl
-import matplotlib.cm as cm
 import matplotlib.pyplot as plt
 import matplotlib.tri as mtri
 from matplotlib.path import Path
-from matplotlib.testing.decorators import image_comparison
+from matplotlib.testing.decorators import image_comparison, check_figures_equal
+
+
+class TestTriangulationParams:
+    x = [-1, 0, 1, 0]
+    y = [0, -1, 0, 1]
+    triangles = [[0, 1, 2], [0, 2, 3]]
+    mask = [False, True]
+
+    @pytest.mark.parametrize('args, kwargs, expected', [
+        ([x, y], {}, [x, y, None, None]),
+        ([x, y, triangles], {}, [x, y, triangles, None]),
+        ([x, y], dict(triangles=triangles), [x, y, triangles, None]),
+        ([x, y], dict(mask=mask), [x, y, None, mask]),
+        ([x, y, triangles], dict(mask=mask), [x, y, triangles, mask]),
+        ([x, y], dict(triangles=triangles, mask=mask), [x, y, triangles, mask])
+    ])
+    def test_extract_triangulation_params(self, args, kwargs, expected):
+        other_args = [1, 2]
+        other_kwargs = {'a': 3, 'b': '4'}
+        x_, y_, triangles_, mask_, args_, kwargs_ = \
+            mtri.Triangulation._extract_triangulation_params(
+                args + other_args, {**kwargs, **other_kwargs})
+        x, y, triangles, mask = expected
+        assert x_ is x
+        assert y_ is y
+        assert_array_equal(triangles_, triangles)
+        assert mask_ is mask
+        assert args_ == other_args
+        assert kwargs_ == other_kwargs
+
+
+def test_extract_triangulation_positional_mask():
+    # mask cannot be passed positionally
+    mask = [True]
+    args = [[0, 2, 1], [0, 0, 1], [[0, 1, 2]], mask]
+    x_, y_, triangles_, mask_, args_, kwargs_ = \
+        mtri.Triangulation._extract_triangulation_params(args, {})
+    assert mask_ is None
+    assert args_ == [mask]
+    # the positional mask must be caught downstream because this must pass
+    # unknown args through
+
+
+def test_triangulation_init():
+    x = [-1, 0, 1, 0]
+    y = [0, -1, 0, 1]
+    with pytest.raises(ValueError, match="x and y must be equal-length"):
+        mtri.Triangulation(x, [1, 2])
+    with pytest.raises(
+            ValueError,
+            match=r"triangles must be a \(N, 3\) int array, but found shape "
+                  r"\(3,\)"):
+        mtri.Triangulation(x, y, [0, 1, 2])
+    with pytest.raises(
+            ValueError,
+            match=r"triangles must be a \(N, 3\) int array, not 'other'"):
+        mtri.Triangulation(x, y, 'other')
+    with pytest.raises(ValueError, match="found value 99"):
+        mtri.Triangulation(x, y, [[0, 1, 99]])
+    with pytest.raises(ValueError, match="found value -1"):
+        mtri.Triangulation(x, y, [[0, 1, -1]])
 
 
 def test_delaunay():
@@ -177,6 +237,59 @@ def test_tripcolor():
     plt.title('facecolors')
 
 
+def test_tripcolor_color():
+    x = [-1, 0, 1, 0]
+    y = [0, -1, 0, 1]
+    fig, ax = plt.subplots()
+    with pytest.raises(TypeError, match=r"tripcolor\(\) missing 1 required "):
+        ax.tripcolor(x, y)
+    with pytest.raises(ValueError, match="The length of c must match either"):
+        ax.tripcolor(x, y, [1, 2, 3])
+    with pytest.raises(ValueError,
+                       match="length of facecolors must match .* triangles"):
+        ax.tripcolor(x, y, facecolors=[1, 2, 3, 4])
+    with pytest.raises(ValueError,
+                       match="'gouraud' .* at the points.* not at the faces"):
+        ax.tripcolor(x, y, facecolors=[1, 2], shading='gouraud')
+    with pytest.raises(ValueError,
+                       match="'gouraud' .* at the points.* not at the faces"):
+        ax.tripcolor(x, y, [1, 2], shading='gouraud')  # faces
+    with pytest.raises(TypeError,
+                       match="positional.*'c'.*keyword-only.*'facecolors'"):
+        ax.tripcolor(x, y, C=[1, 2, 3, 4])
+
+    # smoke test for valid color specifications (via C or facecolors)
+    ax.tripcolor(x, y, [1, 2, 3, 4])  # edges
+    ax.tripcolor(x, y, [1, 2, 3, 4], shading='gouraud')  # edges
+    ax.tripcolor(x, y, [1, 2])  # faces
+    ax.tripcolor(x, y, facecolors=[1, 2])  # faces
+
+
+def test_tripcolor_clim():
+    np.random.seed(19680801)
+    a, b, c = np.random.rand(10), np.random.rand(10), np.random.rand(10)
+
+    ax = plt.figure().add_subplot()
+    clim = (0.25, 0.75)
+    norm = ax.tripcolor(a, b, c, clim=clim).norm
+    assert (norm.vmin, norm.vmax) == clim
+
+
+def test_tripcolor_warnings():
+    x = [-1, 0, 1, 0]
+    y = [0, -1, 0, 1]
+    c = [0.4, 0.5]
+    fig, ax = plt.subplots()
+    # additional parameters
+    with pytest.warns(DeprecationWarning, match="Additional positional param"):
+        ax.tripcolor(x, y, c, 'unused_positional')
+    # facecolors takes precedence over c
+    with pytest.warns(UserWarning, match="Positional parameter c .*no effect"):
+        ax.tripcolor(x, y, c, facecolors=c)
+    with pytest.warns(UserWarning, match="Positional parameter c .*no effect"):
+        ax.tripcolor(x, y, 'interpreted as c', facecolors=c)
+
+
 def test_no_modify():
     # Test that Triangulation does not modify triangles array passed to it.
     triangles = np.array([[3, 2, 0], [3, 1, 0]], dtype=np.int32)
@@ -811,7 +924,7 @@ def dipole_potential(x, y):
     plt.triplot(triang, color='0.8')
 
     levels = np.arange(0., 1., 0.01)
-    cmap = cm.get_cmap(name='hot', lut=None)
+    cmap = mpl.colormaps['hot']
     plt.tricontour(tri_refi, z_test_refi, levels=levels, cmap=cmap,
                    linewidths=[2.0, 1.0, 1.0, 1.0])
     # Plots direction of the electrical vector field
@@ -1163,3 +1276,38 @@ def test_tricontour_non_finite_z():
     with pytest.raises(ValueError, match='z must not contain masked points '
                                          'within the triangulation'):
         plt.tricontourf(triang, np.ma.array([0, 1, 2, 3], mask=[1, 0, 0, 0]))
+
+
+def test_tricontourset_reuse():
+    # If TriContourSet returned from one tricontour(f) call is passed as first
+    # argument to another the underlying C++ contour generator will be reused.
+    x = [0.0, 0.5, 1.0]
+    y = [0.0, 1.0, 0.0]
+    z = [1.0, 2.0, 3.0]
+    fig, ax = plt.subplots()
+    tcs1 = ax.tricontourf(x, y, z)
+    tcs2 = ax.tricontour(x, y, z)
+    assert tcs2._contour_generator != tcs1._contour_generator
+    tcs3 = ax.tricontour(tcs1, z)
+    assert tcs3._contour_generator == tcs1._contour_generator
+
+
+@check_figures_equal()
+def test_triplot_with_ls(fig_test, fig_ref):
+    x = [0, 2, 1]
+    y = [0, 0, 1]
+    data = [[0, 1, 2]]
+    fig_test.subplots().triplot(x, y, data, ls='--')
+    fig_ref.subplots().triplot(x, y, data, linestyle='--')
+
+
+def test_triplot_label():
+    x = [0, 2, 1]
+    y = [0, 0, 1]
+    data = [[0, 1, 2]]
+    fig, ax = plt.subplots()
+    lines, markers = ax.triplot(x, y, data, label='label')
+    handles, labels = ax.get_legend_handles_labels()
+    assert labels == ['label']
+    assert len(handles) == 1
+    assert handles[0] is lines
diff --git a/lib/matplotlib/tests/test_type1font.py b/lib/matplotlib/tests/test_type1font.py
index 8800e184b3b7..1e173d5ea84d 100644
--- a/lib/matplotlib/tests/test_type1font.py
+++ b/lib/matplotlib/tests/test_type1font.py
@@ -1,6 +1,7 @@
-import matplotlib.type1font as t1f
+import matplotlib._type1font as t1f
 import os.path
 import difflib
+import pytest
 
 
 def test_Type1Font():
@@ -13,8 +14,35 @@ def test_Type1Font():
     assert font.parts[0] == rawdata[0x0006:0x10c5]
     assert font.parts[1] == rawdata[0x10cb:0x897f]
     assert font.parts[2] == rawdata[0x8985:0x8ba6]
-    assert font.parts[1:] == slanted.parts[1:]
-    assert font.parts[1:] == condensed.parts[1:]
+    assert font.decrypted.startswith(b'dup\n/Private 18 dict dup begin')
+    assert font.decrypted.endswith(b'mark currentfile closefile\n')
+    assert slanted.decrypted.startswith(b'dup\n/Private 18 dict dup begin')
+    assert slanted.decrypted.endswith(b'mark currentfile closefile\n')
+    assert b'UniqueID 5000793' in font.parts[0]
+    assert b'UniqueID 5000793' in font.decrypted
+    assert font._pos['UniqueID'] == [(797, 818), (4483, 4504)]
+
+    len0 = len(font.parts[0])
+    for key in font._pos.keys():
+        for pos0, pos1 in font._pos[key]:
+            if pos0 < len0:
+                data = font.parts[0][pos0:pos1]
+            else:
+                data = font.decrypted[pos0-len0:pos1-len0]
+            assert data.startswith(f'/{key}'.encode('ascii'))
+    assert {'FontType', 'FontMatrix', 'PaintType', 'ItalicAngle', 'RD'
+            } < set(font._pos.keys())
+
+    assert b'UniqueID 5000793' not in slanted.parts[0]
+    assert b'UniqueID 5000793' not in slanted.decrypted
+    assert 'UniqueID' not in slanted._pos
+    assert font.prop['Weight'] == 'Medium'
+    assert not font.prop['isFixedPitch']
+    assert font.prop['ItalicAngle'] == 0
+    assert slanted.prop['ItalicAngle'] == -45
+    assert font.prop['Encoding'][5] == 'Pi'
+    assert isinstance(font.prop['CharStrings']['Pi'], bytes)
+    assert font._abbr['ND'] == 'ND'
 
     differ = difflib.Differ()
     diff = list(differ.compare(
@@ -22,14 +50,13 @@ def test_Type1Font():
         slanted.parts[0].decode('latin-1').splitlines()))
     for line in (
          # Removes UniqueID
-         '- FontDirectory/CMR10 known{/CMR10 findfont dup/UniqueID known{dup',
-         '+ FontDirectory/CMR10 known{/CMR10 findfont dup',
+         '- /UniqueID 5000793 def',
          # Changes the font name
-        '- /FontName /CMR10 def',
-        '+ /FontName /CMR10_Slant_1000 def',
+         '- /FontName /CMR10 def',
+         '+ /FontName/CMR10_Slant_1000 def',
          # Alters FontMatrix
          '- /FontMatrix [0.001 0 0 0.001 0 0 ]readonly def',
-         '+ /FontMatrix [0.001 0 0.001 0.001 0 0]readonly def',
+         '+ /FontMatrix [0.001 0 0.001 0.001 0 0] readonly def',
          # Alters ItalicAngle
          '-  /ItalicAngle 0 def',
          '+  /ItalicAngle -45.0 def'):
@@ -40,17 +67,73 @@ def test_Type1Font():
         condensed.parts[0].decode('latin-1').splitlines()))
     for line in (
          # Removes UniqueID
-         '- FontDirectory/CMR10 known{/CMR10 findfont dup/UniqueID known{dup',
-         '+ FontDirectory/CMR10 known{/CMR10 findfont dup',
+         '- /UniqueID 5000793 def',
          # Changes the font name
-        '- /FontName /CMR10 def',
-        '+ /FontName /CMR10_Extend_500 def',
+         '- /FontName /CMR10 def',
+         '+ /FontName/CMR10_Extend_500 def',
          # Alters FontMatrix
          '- /FontMatrix [0.001 0 0 0.001 0 0 ]readonly def',
-         '+ /FontMatrix [0.0005 0 0 0.001 0 0]readonly def'):
+         '+ /FontMatrix [0.0005 0 0 0.001 0 0] readonly def'):
         assert line in diff, 'diff to condensed font must contain %s' % line
 
 
+def test_Type1Font_2():
+    filename = os.path.join(os.path.dirname(__file__),
+                            'Courier10PitchBT-Bold.pfb')
+    font = t1f.Type1Font(filename)
+    assert font.prop['Weight'] == 'Bold'
+    assert font.prop['isFixedPitch']
+    assert font.prop['Encoding'][65] == 'A'  # the font uses StandardEncoding
+    (pos0, pos1), = font._pos['Encoding']
+    assert font.parts[0][pos0:pos1] == b'/Encoding StandardEncoding'
+    assert font._abbr['ND'] == '|-'
+
+
+def test_tokenize():
+    data = (b'1234/abc false -9.81  Foo <<[0 1 2]<0 1ef a\t>>>\n'
+            b'(string with(nested\t\\) par)ens\\\\)')
+    #         1           2          x    2     xx1
+    # 1 and 2 are matching parens, x means escaped character
+    n, w, num, kw, d = 'name', 'whitespace', 'number', 'keyword', 'delimiter'
+    b, s = 'boolean', 'string'
+    correct = [
+        (num, 1234), (n, 'abc'), (w, ' '), (b, False), (w, ' '), (num, -9.81),
+        (w, '  '), (kw, 'Foo'), (w, ' '), (d, '<<'), (d, '['), (num, 0),
+        (w, ' '), (num, 1), (w, ' '), (num, 2), (d, ']'), (s, b'\x01\xef\xa0'),
+        (d, '>>'), (w, '\n'), (s, 'string with(nested\t) par)ens\\')
+    ]
+    correct_no_ws = [x for x in correct if x[0] != w]
+
+    def convert(tokens):
+        return [(t.kind, t.value()) for t in tokens]
+
+    assert convert(t1f._tokenize(data, False)) == correct
+    assert convert(t1f._tokenize(data, True)) == correct_no_ws
+
+    def bin_after(n):
+        tokens = t1f._tokenize(data, True)
+        result = []
+        for _ in range(n):
+            result.append(next(tokens))
+        result.append(tokens.send(10))
+        return convert(result)
+
+    for n in range(1, len(correct_no_ws)):
+        result = bin_after(n)
+        assert result[:-1] == correct_no_ws[:n]
+        assert result[-1][0] == 'binary'
+        assert isinstance(result[-1][1], bytes)
+
+
+def test_tokenize_errors():
+    with pytest.raises(ValueError):
+        list(t1f._tokenize(b'1234 (this (string) is unterminated\\)', True))
+    with pytest.raises(ValueError):
+        list(t1f._tokenize(b'/Foo<01234', True))
+    with pytest.raises(ValueError):
+        list(t1f._tokenize(b'/Foo<01234abcg>/Bar', True))
+
+
 def test_overprecision():
     # We used to output too many digits in FontMatrix entries and
     # ItalicAngle, which could make Type-1 parsers unhappy.
@@ -67,3 +150,11 @@ def test_overprecision():
     assert matrix == '0.001 0 0.000167 0.001 0 0'
     # and here we had -9.48090361795083
     assert angle == '-9.4809'
+
+
+def test_encrypt_decrypt_roundtrip():
+    data = b'this is my plaintext \0\1\2\3'
+    encrypted = t1f.Type1Font._encrypt(data, 'eexec')
+    decrypted = t1f.Type1Font._decrypt(encrypted, 'eexec')
+    assert encrypted != decrypted
+    assert data == decrypted
diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
index 3f40a99a2f5a..d3b8c5a71643 100644
--- a/lib/matplotlib/tests/test_units.py
+++ b/lib/matplotlib/tests/test_units.py
@@ -26,6 +26,9 @@ def to(self, new_units):
         else:
             return Quantity(self.magnitude, self.units)
 
+    def __copy__(self):
+        return Quantity(self.magnitude, self.units)
+
     def __getattr__(self, attr):
         return getattr(self.magnitude, attr)
 
@@ -67,14 +70,15 @@ def default_units(value, axis):
             return None
 
     qc.convert = MagicMock(side_effect=convert)
-    qc.axisinfo = MagicMock(side_effect=lambda u, a: munits.AxisInfo(label=u))
+    qc.axisinfo = MagicMock(side_effect=lambda u, a:
+                            munits.AxisInfo(label=u, default_limits=(0, 100)))
     qc.default_units = MagicMock(side_effect=default_units)
     return qc
 
 
 # Tests that the conversion machinery works properly for classes that
 # work as a facade over numpy arrays (like pint)
-@image_comparison(['plot_pint.png'], remove_text=False, style='mpl20',
+@image_comparison(['plot_pint.png'], style='mpl20',
                   tol=0 if platform.machine() == 'x86_64' else 0.01)
 def test_numpy_facade(quantity_converter):
     # use former defaults to match existing baseline image
@@ -166,6 +170,14 @@ def test_scatter_element0_masked():
     fig.canvas.draw()
 
 
+def test_errorbar_mixed_units():
+    x = np.arange(10)
+    y = [datetime(2020, 5, i * 2 + 1) for i in x]
+    fig, ax = plt.subplots()
+    ax.errorbar(x, y, timedelta(days=0.5))
+    fig.canvas.draw()
+
+
 @check_figures_equal(extensions=["png"])
 def test_subclass(fig_test, fig_ref):
     class subdate(datetime):
@@ -211,3 +223,63 @@ def test_shared_axis_categorical():
     ax2.plot(d2.keys(), d2.values())
     ax1.xaxis.set_units(UnitData(["c", "d"]))
     assert "c" in ax2.xaxis.get_units()._mapping.keys()
+
+
+def test_empty_default_limits(quantity_converter):
+    munits.registry[Quantity] = quantity_converter
+    fig, ax1 = plt.subplots()
+    ax1.xaxis.update_units(Quantity([10], "miles"))
+    fig.draw_without_rendering()
+    assert ax1.get_xlim() == (0, 100)
+    ax1.yaxis.update_units(Quantity([10], "miles"))
+    fig.draw_without_rendering()
+    assert ax1.get_ylim() == (0, 100)
+
+    fig, ax = plt.subplots()
+    ax.axhline(30)
+    ax.plot(Quantity(np.arange(0, 3), "miles"),
+            Quantity(np.arange(0, 6, 2), "feet"))
+    fig.draw_without_rendering()
+    assert ax.get_xlim() == (0, 2)
+    assert ax.get_ylim() == (0, 30)
+
+    fig, ax = plt.subplots()
+    ax.axvline(30)
+    ax.plot(Quantity(np.arange(0, 3), "miles"),
+            Quantity(np.arange(0, 6, 2), "feet"))
+    fig.draw_without_rendering()
+    assert ax.get_xlim() == (0, 30)
+    assert ax.get_ylim() == (0, 4)
+
+    fig, ax = plt.subplots()
+    ax.xaxis.update_units(Quantity([10], "miles"))
+    ax.axhline(30)
+    fig.draw_without_rendering()
+    assert ax.get_xlim() == (0, 100)
+    assert ax.get_ylim() == (28.5, 31.5)
+
+    fig, ax = plt.subplots()
+    ax.yaxis.update_units(Quantity([10], "miles"))
+    ax.axvline(30)
+    fig.draw_without_rendering()
+    assert ax.get_ylim() == (0, 100)
+    assert ax.get_xlim() == (28.5, 31.5)
+
+
+# test array-like objects...
+class Kernel:
+    def __init__(self, array):
+        self._array = np.asanyarray(array)
+
+    def __array__(self):
+        return self._array
+
+    @property
+    def shape(self):
+        return self._array.shape
+
+
+def test_plot_kernel():
+    # just a smoketest that fail
+    kernel = Kernel([1, 2, 3, 4, 5])
+    plt.plot(kernel)
diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py
index 2d79e155e72e..0f01ebaffb56 100644
--- a/lib/matplotlib/tests/test_usetex.py
+++ b/lib/matplotlib/tests/test_usetex.py
@@ -1,14 +1,17 @@
+from tempfile import TemporaryFile
+
 import numpy as np
 import pytest
 
 import matplotlib as mpl
+from matplotlib import dviread
 from matplotlib.testing import _has_tex_package
 from matplotlib.testing.decorators import check_figures_equal, image_comparison
+from matplotlib.testing._markers import needs_usetex
 import matplotlib.pyplot as plt
 
 
-if not mpl.checkdep_usetex(True):
-    pytestmark = pytest.mark.skip('Missing TeX of Ghostscript or dvipng')
+pytestmark = needs_usetex
 
 
 @image_comparison(
@@ -61,6 +64,21 @@ def test_mathdefault():
     fig.canvas.draw()
 
 
+@image_comparison(['eqnarray.png'])
+def test_multiline_eqnarray():
+    text = (
+        r'\begin{eqnarray*}'
+        r'foo\\'
+        r'bar\\'
+        r'baz\\'
+        r'\end{eqnarray*}'
+    )
+
+    fig = plt.figure(figsize=(1, 1))
+    fig.text(0.5, 0.5, text, usetex=True,
+             horizontalalignment='center', verticalalignment='center')
+
+
 @pytest.mark.parametrize("fontsize", [8, 10, 12])
 def test_minus_no_descent(fontsize):
     # Test special-casing of minus descent in DviFont._height_depth_of, by
@@ -71,7 +89,7 @@ def test_minus_no_descent(fontsize):
     heights = {}
     fig = plt.figure()
     for vals in [(1,), (-1,), (-1, 1)]:
-        fig.clf()
+        fig.clear()
         for x in vals:
             fig.text(.5, .5, f"${x}$", usetex=True)
         fig.canvas.draw()
@@ -81,16 +99,18 @@ def test_minus_no_descent(fontsize):
     assert len({*heights.values()}) == 1
 
 
-@pytest.mark.skipif(not _has_tex_package('xcolor'),
-                    reason='xcolor is not available')
-def test_usetex_xcolor():
+@pytest.mark.parametrize('pkg', ['xcolor', 'chemformula'])
+def test_usetex_packages(pkg):
+    if not _has_tex_package(pkg):
+        pytest.skip(f'{pkg} is not available')
     mpl.rcParams['text.usetex'] = True
 
     fig = plt.figure()
     text = fig.text(0.5, 0.5, "Some text 0123456789")
     fig.canvas.draw()
 
-    mpl.rcParams['text.latex.preamble'] = r'\usepackage[dvipsnames]{xcolor}'
+    mpl.rcParams['text.latex.preamble'] = (
+        r'\PassOptionsToPackage{dvipsnames}{xcolor}\usepackage{%s}' % pkg)
     fig = plt.figure()
     text2 = fig.text(0.5, 0.5, "Some text 0123456789")
     fig.canvas.draw()
@@ -98,8 +118,38 @@ def test_usetex_xcolor():
                                   text.get_window_extent())
 
 
-def test_textcomp_full():
-    plt.rcParams["text.latex.preamble"] = r"\usepackage[full]{textcomp}"
+@pytest.mark.parametrize(
+    "preamble",
+    [r"\usepackage[full]{textcomp}", r"\usepackage{underscore}"],
+)
+def test_latex_pkg_already_loaded(preamble):
+    plt.rcParams["text.latex.preamble"] = preamble
     fig = plt.figure()
     fig.text(.5, .5, "hello, world", usetex=True)
     fig.canvas.draw()
+
+
+def test_usetex_with_underscore():
+    plt.rcParams["text.usetex"] = True
+    df = {"a_b": range(5)[::-1], "c": range(5)}
+    fig, ax = plt.subplots()
+    ax.plot("c", "a_b", data=df)
+    ax.legend()
+    ax.text(0, 0, "foo_bar", usetex=True)
+    plt.draw()
+
+
+@pytest.mark.flaky(reruns=3)  # Tends to hit a TeX cache lock on AppVeyor.
+@pytest.mark.parametrize("fmt", ["pdf", "svg"])
+def test_missing_psfont(fmt, monkeypatch):
+    """An error is raised if a TeX font lacks a Type-1 equivalent"""
+    monkeypatch.setattr(
+        dviread.PsfontsMap, '__getitem__',
+        lambda self, k: dviread.PsFont(
+            texname=b'texfont', psname=b'Some Font',
+            effects=None, encoding=None, filename=None))
+    mpl.rcParams['text.usetex'] = True
+    fig, ax = plt.subplots()
+    ax.text(0.5, 0.5, 'hello')
+    with TemporaryFile() as tmpfile, pytest.raises(ValueError):
+        fig.savefig(tmpfile, format=fmt)
diff --git a/lib/matplotlib/tests/test_widgets.py b/lib/matplotlib/tests/test_widgets.py
index a90dc55d1e8e..446e272610ab 100644
--- a/lib/matplotlib/tests/test_widgets.py
+++ b/lib/matplotlib/tests/test_widgets.py
@@ -1,25 +1,43 @@
+from contextlib import nullcontext
+import functools
+from unittest import mock
+
+from matplotlib._api.deprecation import MatplotlibDeprecationWarning
+from matplotlib.backend_bases import MouseEvent
 import matplotlib.colors as mcolors
 import matplotlib.widgets as widgets
 import matplotlib.pyplot as plt
-from matplotlib.testing.decorators import image_comparison
-from matplotlib.testing.widgets import do_event, get_ax
+from matplotlib.testing.decorators import check_figures_equal, image_comparison
+from matplotlib.testing.widgets import (click_and_drag, do_event, get_ax,
+                                        mock_event, noop)
 
+import numpy as np
 from numpy.testing import assert_allclose
 
 import pytest
 
 
-def check_rectangle(**kwargs):
-    ax = get_ax()
+@pytest.fixture
+def ax():
+    return get_ax()
 
-    def onselect(epress, erelease):
-        ax._got_onselect = True
-        assert epress.xdata == 100
-        assert epress.ydata == 100
-        assert erelease.xdata == 199
-        assert erelease.ydata == 199
 
-    tool = widgets.RectangleSelector(ax, onselect, **kwargs)
+@pytest.mark.parametrize('kwargs, warning_msg', [
+    (dict(), None),
+    (dict(drawtype='line', useblit=False),
+     "Support for drawtype='line' is deprecated"),
+    (dict(useblit=True, button=1), None),
+    (dict(drawtype='none', minspanx=10, minspany=10),
+     "Support for drawtype='none' is deprecated"),
+    (dict(minspanx=10, minspany=10, spancoords='pixels'), None),
+    (dict(props=dict(fill=True)), None),
+])
+def test_rectangle_selector(ax, kwargs, warning_msg):
+    onselect = mock.Mock(spec=noop, return_value=None)
+
+    with (pytest.warns(MatplotlibDeprecationWarning, match=warning_msg)
+            if warning_msg else nullcontext()):
+        tool = widgets.RectangleSelector(ax, onselect, **kwargs)
     do_event(tool, 'press', xdata=100, ydata=100, button=1)
     do_event(tool, 'onmove', xdata=199, ydata=199, button=1)
 
@@ -32,173 +50,909 @@ def onselect(epress, erelease):
                          [100, 199, 199, 100, 100]],
                         err_msg=tool.geometry)
 
-    assert ax._got_onselect
-
-
-def test_rectangle_selector():
-    check_rectangle()
-    check_rectangle(drawtype='line', useblit=False)
-    check_rectangle(useblit=True, button=1)
-    check_rectangle(drawtype='none', minspanx=10, minspany=10)
-    check_rectangle(minspanx=10, minspany=10, spancoords='pixels')
-    check_rectangle(rectprops=dict(fill=True))
+    onselect.assert_called_once()
+    (epress, erelease), kwargs = onselect.call_args
+    assert epress.xdata == 100
+    assert epress.ydata == 100
+    assert erelease.xdata == 199
+    assert erelease.ydata == 199
+    assert kwargs == {}
+
+
+@pytest.mark.parametrize('spancoords', ['data', 'pixels'])
+@pytest.mark.parametrize('minspanx, x1', [[0, 10], [1, 10.5], [1, 11]])
+@pytest.mark.parametrize('minspany, y1', [[0, 10], [1, 10.5], [1, 11]])
+def test_rectangle_minspan(ax, spancoords, minspanx, x1, minspany, y1):
+
+    onselect = mock.Mock(spec=noop, return_value=None)
+
+    x0, y0 = (10, 10)
+    if spancoords == 'pixels':
+        minspanx, minspany = (ax.transData.transform((x1, y1)) -
+                              ax.transData.transform((x0, y0)))
+
+    tool = widgets.RectangleSelector(ax, onselect, interactive=True,
+                                     spancoords=spancoords,
+                                     minspanx=minspanx, minspany=minspany)
+    # Too small to create a selector
+    click_and_drag(tool, start=(x0, x1), end=(y0, y1))
+    assert not tool._selection_completed
+    onselect.assert_not_called()
+
+    click_and_drag(tool, start=(20, 20), end=(30, 30))
+    assert tool._selection_completed
+    onselect.assert_called_once()
+
+    # Too small to create a selector. Should clear existing selector, and
+    # trigger onselect because there was a preexisting selector
+    onselect.reset_mock()
+    click_and_drag(tool, start=(x0, y0), end=(x1, y1))
+    assert not tool._selection_completed
+    onselect.assert_called_once()
+    (epress, erelease), kwargs = onselect.call_args
+    assert epress.xdata == x0
+    assert epress.ydata == y0
+    assert erelease.xdata == x1
+    assert erelease.ydata == y1
+    assert kwargs == {}
+
+
+def test_deprecation_selector_visible_attribute(ax):
+    tool = widgets.RectangleSelector(ax, lambda *args: None)
+
+    assert tool.get_visible()
+
+    with pytest.warns(
+        MatplotlibDeprecationWarning,
+            match="was deprecated in Matplotlib 3.6"):
+        tool.visible = False
+    assert not tool.get_visible()
+
+
+@pytest.mark.parametrize('drag_from_anywhere, new_center',
+                         [[True, (60, 75)],
+                          [False, (30, 20)]])
+def test_rectangle_drag(ax, drag_from_anywhere, new_center):
+    tool = widgets.RectangleSelector(ax, onselect=noop, interactive=True,
+                                     drag_from_anywhere=drag_from_anywhere)
+    # Create rectangle
+    click_and_drag(tool, start=(0, 10), end=(100, 120))
+    assert tool.center == (50, 65)
+    # Drag inside rectangle, but away from centre handle
+    #
+    # If drag_from_anywhere == True, this will move the rectangle by (10, 10),
+    # giving it a new center of (60, 75)
+    #
+    # If drag_from_anywhere == False, this will create a new rectangle with
+    # center (30, 20)
+    click_and_drag(tool, start=(25, 15), end=(35, 25))
+    assert tool.center == new_center
+    # Check that in both cases, dragging outside the rectangle draws a new
+    # rectangle
+    click_and_drag(tool, start=(175, 185), end=(185, 195))
+    assert tool.center == (180, 190)
+
+
+def test_rectangle_selector_set_props_handle_props(ax):
+    tool = widgets.RectangleSelector(ax, onselect=noop, interactive=True,
+                                     props=dict(facecolor='b', alpha=0.2),
+                                     handle_props=dict(alpha=0.5))
+    # Create rectangle
+    click_and_drag(tool, start=(0, 10), end=(100, 120))
+
+    artist = tool._selection_artist
+    assert artist.get_facecolor() == mcolors.to_rgba('b', alpha=0.2)
+    tool.set_props(facecolor='r', alpha=0.3)
+    assert artist.get_facecolor() == mcolors.to_rgba('r', alpha=0.3)
+
+    for artist in tool._handles_artists:
+        assert artist.get_markeredgecolor() == 'black'
+        assert artist.get_alpha() == 0.5
+    tool.set_handle_props(markeredgecolor='r', alpha=0.3)
+    for artist in tool._handles_artists:
+        assert artist.get_markeredgecolor() == 'r'
+        assert artist.get_alpha() == 0.3
+
+
+def test_rectangle_resize(ax):
+    tool = widgets.RectangleSelector(ax, onselect=noop, interactive=True)
+    # Create rectangle
+    click_and_drag(tool, start=(0, 10), end=(100, 120))
+    assert tool.extents == (0.0, 100.0, 10.0, 120.0)
+
+    # resize NE handle
+    extents = tool.extents
+    xdata, ydata = extents[1], extents[3]
+    xdata_new, ydata_new = xdata + 10, ydata + 5
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new))
+    assert tool.extents == (extents[0], xdata_new, extents[2], ydata_new)
+
+    # resize E handle
+    extents = tool.extents
+    xdata, ydata = extents[1], extents[2] + (extents[3] - extents[2]) / 2
+    xdata_new, ydata_new = xdata + 10, ydata
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new))
+    assert tool.extents == (extents[0], xdata_new, extents[2], extents[3])
+
+    # resize W handle
+    extents = tool.extents
+    xdata, ydata = extents[0], extents[2] + (extents[3] - extents[2]) / 2
+    xdata_new, ydata_new = xdata + 15, ydata
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new))
+    assert tool.extents == (xdata_new, extents[1], extents[2], extents[3])
+
+    # resize SW handle
+    extents = tool.extents
+    xdata, ydata = extents[0], extents[2]
+    xdata_new, ydata_new = xdata + 20, ydata + 25
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new))
+    assert tool.extents == (xdata_new, extents[1], ydata_new, extents[3])
+
+
+def test_rectangle_add_state(ax):
+    tool = widgets.RectangleSelector(ax, onselect=noop, interactive=True)
+    # Create rectangle
+    click_and_drag(tool, start=(70, 65), end=(125, 130))
 
+    with pytest.raises(ValueError):
+        tool.add_state('unsupported_state')
 
-def test_ellipse():
+    with pytest.raises(ValueError):
+        tool.add_state('clear')
+    tool.add_state('move')
+    tool.add_state('square')
+    tool.add_state('center')
+
+
+@pytest.mark.parametrize('add_state', [True, False])
+def test_rectangle_resize_center(ax, add_state):
+    tool = widgets.RectangleSelector(ax, onselect=noop, interactive=True)
+    # Create rectangle
+    click_and_drag(tool, start=(70, 65), end=(125, 130))
+    assert tool.extents == (70.0, 125.0, 65.0, 130.0)
+
+    if add_state:
+        tool.add_state('center')
+        use_key = None
+    else:
+        use_key = 'control'
+
+    # resize NE handle
+    extents = tool.extents
+    xdata, ydata = extents[1], extents[3]
+    xdiff, ydiff = 10, 5
+    xdata_new, ydata_new = xdata + xdiff, ydata + ydiff
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new),
+                   key=use_key)
+    assert tool.extents == (extents[0] - xdiff, xdata_new,
+                            extents[2] - ydiff, ydata_new)
+
+    # resize E handle
+    extents = tool.extents
+    xdata, ydata = extents[1], extents[2] + (extents[3] - extents[2]) / 2
+    xdiff = 10
+    xdata_new, ydata_new = xdata + xdiff, ydata
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new),
+                   key=use_key)
+    assert tool.extents == (extents[0] - xdiff, xdata_new,
+                            extents[2], extents[3])
+
+    # resize E handle negative diff
+    extents = tool.extents
+    xdata, ydata = extents[1], extents[2] + (extents[3] - extents[2]) / 2
+    xdiff = -20
+    xdata_new, ydata_new = xdata + xdiff, ydata
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new),
+                   key=use_key)
+    assert tool.extents == (extents[0] - xdiff, xdata_new,
+                            extents[2], extents[3])
+
+    # resize W handle
+    extents = tool.extents
+    xdata, ydata = extents[0], extents[2] + (extents[3] - extents[2]) / 2
+    xdiff = 15
+    xdata_new, ydata_new = xdata + xdiff, ydata
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new),
+                   key=use_key)
+    assert tool.extents == (xdata_new, extents[1] - xdiff,
+                            extents[2], extents[3])
+
+    # resize W handle negative diff
+    extents = tool.extents
+    xdata, ydata = extents[0], extents[2] + (extents[3] - extents[2]) / 2
+    xdiff = -25
+    xdata_new, ydata_new = xdata + xdiff, ydata
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new),
+                   key=use_key)
+    assert tool.extents == (xdata_new, extents[1] - xdiff,
+                            extents[2], extents[3])
+
+    # resize SW handle
+    extents = tool.extents
+    xdata, ydata = extents[0], extents[2]
+    xdiff, ydiff = 20, 25
+    xdata_new, ydata_new = xdata + xdiff, ydata + ydiff
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new),
+                   key=use_key)
+    assert tool.extents == (xdata_new, extents[1] - xdiff,
+                            ydata_new, extents[3] - ydiff)
+
+
+@pytest.mark.parametrize('add_state', [True, False])
+def test_rectangle_resize_square(ax, add_state):
+    tool = widgets.RectangleSelector(ax, onselect=noop, interactive=True)
+    # Create rectangle
+    click_and_drag(tool, start=(70, 65), end=(120, 115))
+    assert tool.extents == (70.0, 120.0, 65.0, 115.0)
+
+    if add_state:
+        tool.add_state('square')
+        use_key = None
+    else:
+        use_key = 'shift'
+
+    # resize NE handle
+    extents = tool.extents
+    xdata, ydata = extents[1], extents[3]
+    xdiff, ydiff = 10, 5
+    xdata_new, ydata_new = xdata + xdiff, ydata + ydiff
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new),
+                   key=use_key)
+    assert tool.extents == (extents[0], xdata_new,
+                            extents[2], extents[3] + xdiff)
+
+    # resize E handle
+    extents = tool.extents
+    xdata, ydata = extents[1], extents[2] + (extents[3] - extents[2]) / 2
+    xdiff = 10
+    xdata_new, ydata_new = xdata + xdiff, ydata
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new),
+                   key=use_key)
+    assert tool.extents == (extents[0], xdata_new,
+                            extents[2], extents[3] + xdiff)
+
+    # resize E handle negative diff
+    extents = tool.extents
+    xdata, ydata = extents[1], extents[2] + (extents[3] - extents[2]) / 2
+    xdiff = -20
+    xdata_new, ydata_new = xdata + xdiff, ydata
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new),
+                   key=use_key)
+    assert tool.extents == (extents[0], xdata_new,
+                            extents[2], extents[3] + xdiff)
+
+    # resize W handle
+    extents = tool.extents
+    xdata, ydata = extents[0], extents[2] + (extents[3] - extents[2]) / 2
+    xdiff = 15
+    xdata_new, ydata_new = xdata + xdiff, ydata
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new),
+                   key=use_key)
+    assert tool.extents == (xdata_new, extents[1],
+                            extents[2], extents[3] - xdiff)
+
+    # resize W handle negative diff
+    extents = tool.extents
+    xdata, ydata = extents[0], extents[2] + (extents[3] - extents[2]) / 2
+    xdiff = -25
+    xdata_new, ydata_new = xdata + xdiff, ydata
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new),
+                   key=use_key)
+    assert tool.extents == (xdata_new, extents[1],
+                            extents[2], extents[3] - xdiff)
+
+    # resize SW handle
+    extents = tool.extents
+    xdata, ydata = extents[0], extents[2]
+    xdiff, ydiff = 20, 25
+    xdata_new, ydata_new = xdata + xdiff, ydata + ydiff
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new),
+                   key=use_key)
+    assert tool.extents == (extents[0] + ydiff, extents[1],
+                            ydata_new, extents[3])
+
+
+def test_rectangle_resize_square_center(ax):
+    tool = widgets.RectangleSelector(ax, onselect=noop, interactive=True)
+    # Create rectangle
+    click_and_drag(tool, start=(70, 65), end=(120, 115))
+    tool.add_state('square')
+    tool.add_state('center')
+    assert_allclose(tool.extents, (70.0, 120.0, 65.0, 115.0))
+
+    # resize NE handle
+    extents = tool.extents
+    xdata, ydata = extents[1], extents[3]
+    xdiff, ydiff = 10, 5
+    xdata_new, ydata_new = xdata + xdiff, ydata + ydiff
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new))
+    assert_allclose(tool.extents, (extents[0] - xdiff, xdata_new,
+                                   extents[2] - xdiff, extents[3] + xdiff))
+
+    # resize E handle
+    extents = tool.extents
+    xdata, ydata = extents[1], extents[2] + (extents[3] - extents[2]) / 2
+    xdiff = 10
+    xdata_new, ydata_new = xdata + xdiff, ydata
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new))
+    assert_allclose(tool.extents, (extents[0] - xdiff, xdata_new,
+                                   extents[2] - xdiff, extents[3] + xdiff))
+
+    # resize E handle negative diff
+    extents = tool.extents
+    xdata, ydata = extents[1], extents[2] + (extents[3] - extents[2]) / 2
+    xdiff = -20
+    xdata_new, ydata_new = xdata + xdiff, ydata
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new))
+    assert_allclose(tool.extents, (extents[0] - xdiff, xdata_new,
+                                   extents[2] - xdiff, extents[3] + xdiff))
+
+    # resize W handle
+    extents = tool.extents
+    xdata, ydata = extents[0], extents[2] + (extents[3] - extents[2]) / 2
+    xdiff = 5
+    xdata_new, ydata_new = xdata + xdiff, ydata
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new))
+    assert_allclose(tool.extents, (xdata_new, extents[1] - xdiff,
+                                   extents[2] + xdiff, extents[3] - xdiff))
+
+    # resize W handle negative diff
+    extents = tool.extents
+    xdata, ydata = extents[0], extents[2] + (extents[3] - extents[2]) / 2
+    xdiff = -25
+    xdata_new, ydata_new = xdata + xdiff, ydata
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new))
+    assert_allclose(tool.extents, (xdata_new, extents[1] - xdiff,
+                                   extents[2] + xdiff, extents[3] - xdiff))
+
+    # resize SW handle
+    extents = tool.extents
+    xdata, ydata = extents[0], extents[2]
+    xdiff, ydiff = 20, 25
+    xdata_new, ydata_new = xdata + xdiff, ydata + ydiff
+    click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new))
+    assert_allclose(tool.extents, (extents[0] + ydiff, extents[1] - ydiff,
+                                   ydata_new, extents[3] - ydiff))
+
+
+@pytest.mark.parametrize('selector_class',
+                         [widgets.RectangleSelector, widgets.EllipseSelector])
+def test_rectangle_rotate(ax, selector_class):
+    tool = selector_class(ax, onselect=noop, interactive=True)
+    # Draw rectangle
+    click_and_drag(tool, start=(100, 100), end=(130, 140))
+    assert tool.extents == (100, 130, 100, 140)
+    assert len(tool._state) == 0
+
+    # Rotate anticlockwise using top-right corner
+    do_event(tool, 'on_key_press', key='r')
+    assert tool._state == set(['rotate'])
+    assert len(tool._state) == 1
+    click_and_drag(tool, start=(130, 140), end=(120, 145))
+    do_event(tool, 'on_key_press', key='r')
+    assert len(tool._state) == 0
+    # Extents shouldn't change (as shape of rectangle hasn't changed)
+    assert tool.extents == (100, 130, 100, 140)
+    assert_allclose(tool.rotation, 25.56, atol=0.01)
+    tool.rotation = 45
+    assert tool.rotation == 45
+    # Corners should move
+    assert_allclose(tool.corners,
+                    np.array([[118.53, 139.75, 111.46, 90.25],
+                              [95.25, 116.46, 144.75, 123.54]]), atol=0.01)
+
+    # Scale using top-right corner
+    click_and_drag(tool, start=(110, 145), end=(110, 160))
+    assert_allclose(tool.extents, (100, 139.75, 100, 151.82), atol=0.01)
+
+    if selector_class == widgets.RectangleSelector:
+        with pytest.raises(ValueError):
+            tool._selection_artist.rotation_point = 'unvalid_value'
+
+
+def test_rectangle_add_remove_set(ax):
+    tool = widgets.RectangleSelector(ax, onselect=noop, interactive=True)
+    # Draw rectangle
+    click_and_drag(tool, start=(100, 100), end=(130, 140))
+    assert tool.extents == (100, 130, 100, 140)
+    assert len(tool._state) == 0
+    for state in ['rotate', 'square', 'center']:
+        tool.add_state(state)
+        assert len(tool._state) == 1
+        tool.remove_state(state)
+        assert len(tool._state) == 0
+
+
+@pytest.mark.parametrize('use_data_coordinates', [False, True])
+def test_rectangle_resize_square_center_aspect(ax, use_data_coordinates):
+    ax.set_aspect(0.8)
+
+    tool = widgets.RectangleSelector(ax, onselect=noop, interactive=True,
+                                     use_data_coordinates=use_data_coordinates)
+    # Create rectangle
+    click_and_drag(tool, start=(70, 65), end=(120, 115))
+    assert tool.extents == (70.0, 120.0, 65.0, 115.0)
+    tool.add_state('square')
+    tool.add_state('center')
+
+    if use_data_coordinates:
+        # resize E handle
+        extents = tool.extents
+        xdata, ydata, width = extents[1], extents[3], extents[1] - extents[0]
+        xdiff, ycenter = 10,  extents[2] + (extents[3] - extents[2]) / 2
+        xdata_new, ydata_new = xdata + xdiff, ydata
+        ychange = width / 2 + xdiff
+        click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new))
+        assert_allclose(tool.extents, [extents[0] - xdiff, xdata_new,
+                                       ycenter - ychange, ycenter + ychange])
+    else:
+        # resize E handle
+        extents = tool.extents
+        xdata, ydata = extents[1], extents[3]
+        xdiff = 10
+        xdata_new, ydata_new = xdata + xdiff, ydata
+        ychange = xdiff * 1 / tool._aspect_ratio_correction
+        click_and_drag(tool, start=(xdata, ydata), end=(xdata_new, ydata_new))
+        assert_allclose(tool.extents, [extents[0] - xdiff, xdata_new,
+                                       46.25, 133.75])
+
+
+def test_ellipse(ax):
     """For ellipse, test out the key modifiers"""
-    ax = get_ax()
-
-    def onselect(epress, erelease):
-        pass
-
-    tool = widgets.EllipseSelector(ax, onselect=onselect,
-                                   maxdist=10, interactive=True)
+    tool = widgets.EllipseSelector(ax, onselect=noop,
+                                   grab_range=10, interactive=True)
     tool.extents = (100, 150, 100, 150)
 
     # drag the rectangle
-    do_event(tool, 'press', xdata=10, ydata=10, button=1,
-             key=' ')
-
-    do_event(tool, 'onmove', xdata=30, ydata=30, button=1)
-    do_event(tool, 'release', xdata=30, ydata=30, button=1)
+    click_and_drag(tool, start=(125, 125), end=(145, 145))
     assert tool.extents == (120, 170, 120, 170)
 
     # create from center
-    do_event(tool, 'on_key_press', xdata=100, ydata=100, button=1,
-             key='control')
-    do_event(tool, 'press', xdata=100, ydata=100, button=1)
-    do_event(tool, 'onmove', xdata=125, ydata=125, button=1)
-    do_event(tool, 'release', xdata=125, ydata=125, button=1)
-    do_event(tool, 'on_key_release', xdata=100, ydata=100, button=1,
-             key='control')
+    click_and_drag(tool, start=(100, 100), end=(125, 125), key='control')
     assert tool.extents == (75, 125, 75, 125)
 
     # create a square
-    do_event(tool, 'on_key_press', xdata=10, ydata=10, button=1,
-             key='shift')
-    do_event(tool, 'press', xdata=10, ydata=10, button=1)
-    do_event(tool, 'onmove', xdata=35, ydata=30, button=1)
-    do_event(tool, 'release', xdata=35, ydata=30, button=1)
-    do_event(tool, 'on_key_release', xdata=10, ydata=10, button=1,
-             key='shift')
+    click_and_drag(tool, start=(10, 10), end=(35, 30), key='shift')
     extents = [int(e) for e in tool.extents]
-    assert extents == [10, 35, 10, 34]
+    assert extents == [10, 35, 10, 35]
 
     # create a square from center
-    do_event(tool, 'on_key_press', xdata=100, ydata=100, button=1,
-             key='ctrl+shift')
-    do_event(tool, 'press', xdata=100, ydata=100, button=1)
-    do_event(tool, 'onmove', xdata=125, ydata=130, button=1)
-    do_event(tool, 'release', xdata=125, ydata=130, button=1)
-    do_event(tool, 'on_key_release', xdata=100, ydata=100, button=1,
-             key='ctrl+shift')
+    click_and_drag(tool, start=(100, 100), end=(125, 130), key='ctrl+shift')
     extents = [int(e) for e in tool.extents]
-    assert extents == [70, 129, 70, 130]
+    assert extents == [70, 130, 70, 130]
 
     assert tool.geometry.shape == (2, 73)
     assert_allclose(tool.geometry[:, 0], [70., 100])
 
 
-def test_rectangle_handles():
-    ax = get_ax()
-
-    def onselect(epress, erelease):
-        pass
-
-    tool = widgets.RectangleSelector(ax, onselect=onselect,
-                                     maxdist=10, interactive=True,
-                                     marker_props={'markerfacecolor': 'r',
+def test_rectangle_handles(ax):
+    tool = widgets.RectangleSelector(ax, onselect=noop,
+                                     grab_range=10,
+                                     interactive=True,
+                                     handle_props={'markerfacecolor': 'r',
                                                    'markeredgecolor': 'b'})
     tool.extents = (100, 150, 100, 150)
 
-    assert tool.corners == (
-        (100, 150, 150, 100), (100, 100, 150, 150))
+    assert_allclose(tool.corners, ((100, 150, 150, 100), (100, 100, 150, 150)))
     assert tool.extents == (100, 150, 100, 150)
-    assert tool.edge_centers == (
-        (100, 125.0, 150, 125.0), (125.0, 100, 125.0, 150))
+    assert_allclose(tool.edge_centers,
+                    ((100, 125.0, 150, 125.0), (125.0, 100, 125.0, 150)))
     assert tool.extents == (100, 150, 100, 150)
 
     # grab a corner and move it
-    do_event(tool, 'press', xdata=100, ydata=100)
-    do_event(tool, 'onmove', xdata=120, ydata=120)
-    do_event(tool, 'release', xdata=120, ydata=120)
+    click_and_drag(tool, start=(100, 100), end=(120, 120))
     assert tool.extents == (120, 150, 120, 150)
 
     # grab the center and move it
-    do_event(tool, 'press', xdata=132, ydata=132)
-    do_event(tool, 'onmove', xdata=120, ydata=120)
-    do_event(tool, 'release', xdata=120, ydata=120)
+    click_and_drag(tool, start=(132, 132), end=(120, 120))
     assert tool.extents == (108, 138, 108, 138)
 
     # create a new rectangle
-    do_event(tool, 'press', xdata=10, ydata=10)
-    do_event(tool, 'onmove', xdata=100, ydata=100)
-    do_event(tool, 'release', xdata=100, ydata=100)
+    click_and_drag(tool, start=(10, 10), end=(100, 100))
     assert tool.extents == (10, 100, 10, 100)
 
     # Check that marker_props worked.
     assert mcolors.same_color(
-        tool._corner_handles.artist.get_markerfacecolor(), 'r')
+        tool._corner_handles.artists[0].get_markerfacecolor(), 'r')
     assert mcolors.same_color(
-        tool._corner_handles.artist.get_markeredgecolor(), 'b')
+        tool._corner_handles.artists[0].get_markeredgecolor(), 'b')
 
 
-def check_span(*args, **kwargs):
-    ax = get_ax()
+@pytest.mark.parametrize('interactive', [True, False])
+def test_rectangle_selector_onselect(ax, interactive):
+    # check when press and release events take place at the same position
+    onselect = mock.Mock(spec=noop, return_value=None)
 
-    def onselect(vmin, vmax):
-        ax._got_onselect = True
-        assert vmin == 100
-        assert vmax == 150
+    tool = widgets.RectangleSelector(ax, onselect, interactive=interactive)
+    # move outside of axis
+    click_and_drag(tool, start=(100, 110), end=(150, 120))
+
+    onselect.assert_called_once()
+    assert tool.extents == (100.0, 150.0, 110.0, 120.0)
 
-    def onmove(vmin, vmax):
-        assert vmin == 100
-        assert vmax == 125
-        ax._got_on_move = True
+    onselect.reset_mock()
+    click_and_drag(tool, start=(10, 100), end=(10, 100))
+    onselect.assert_called_once()
 
-    if 'onmove_callback' in kwargs:
+
+@pytest.mark.parametrize('ignore_event_outside', [True, False])
+def test_rectangle_selector_ignore_outside(ax, ignore_event_outside):
+    onselect = mock.Mock(spec=noop, return_value=None)
+
+    tool = widgets.RectangleSelector(ax, onselect,
+                                     ignore_event_outside=ignore_event_outside)
+    click_and_drag(tool, start=(100, 110), end=(150, 120))
+    onselect.assert_called_once()
+    assert tool.extents == (100.0, 150.0, 110.0, 120.0)
+
+    onselect.reset_mock()
+    # Trigger event outside of span
+    click_and_drag(tool, start=(150, 150), end=(160, 160))
+    if ignore_event_outside:
+        # event have been ignored and span haven't changed.
+        onselect.assert_not_called()
+        assert tool.extents == (100.0, 150.0, 110.0, 120.0)
+    else:
+        # A new shape is created
+        onselect.assert_called_once()
+        assert tool.extents == (150.0, 160.0, 150.0, 160.0)
+
+
+@pytest.mark.parametrize('orientation, onmove_callback, kwargs', [
+    ('horizontal', False, dict(minspan=10, useblit=True)),
+    ('vertical', True, dict(button=1)),
+    ('horizontal', False, dict(props=dict(fill=True))),
+    ('horizontal', False, dict(interactive=True)),
+])
+def test_span_selector(ax, orientation, onmove_callback, kwargs):
+    onselect = mock.Mock(spec=noop, return_value=None)
+    onmove = mock.Mock(spec=noop, return_value=None)
+    if onmove_callback:
         kwargs['onmove_callback'] = onmove
 
-    tool = widgets.SpanSelector(ax, onselect, *args, **kwargs)
+    tool = widgets.SpanSelector(ax, onselect, orientation, **kwargs)
     do_event(tool, 'press', xdata=100, ydata=100, button=1)
-    do_event(tool, 'onmove', xdata=125, ydata=125, button=1)
-    do_event(tool, 'release', xdata=150, ydata=150, button=1)
+    # move outside of axis
+    do_event(tool, 'onmove', xdata=199, ydata=199, button=1)
+    do_event(tool, 'release', xdata=250, ydata=250, button=1)
 
-    assert ax._got_onselect
+    onselect.assert_called_once_with(100, 199)
+    if onmove_callback:
+        onmove.assert_called_once_with(100, 199)
+
+
+@pytest.mark.parametrize('interactive', [True, False])
+def test_span_selector_onselect(ax, interactive):
+    onselect = mock.Mock(spec=noop, return_value=None)
+
+    tool = widgets.SpanSelector(ax, onselect, 'horizontal',
+                                interactive=interactive)
+    # move outside of axis
+    click_and_drag(tool, start=(100, 100), end=(150, 100))
+    onselect.assert_called_once()
+    assert tool.extents == (100, 150)
+
+    onselect.reset_mock()
+    click_and_drag(tool, start=(10, 100), end=(10, 100))
+    onselect.assert_called_once()
+
+
+@pytest.mark.parametrize('ignore_event_outside', [True, False])
+def test_span_selector_ignore_outside(ax, ignore_event_outside):
+    onselect = mock.Mock(spec=noop, return_value=None)
+    onmove = mock.Mock(spec=noop, return_value=None)
+
+    tool = widgets.SpanSelector(ax, onselect, 'horizontal',
+                                onmove_callback=onmove,
+                                ignore_event_outside=ignore_event_outside)
+    click_and_drag(tool, start=(100, 100), end=(125, 125))
+    onselect.assert_called_once()
+    onmove.assert_called_once()
+    assert tool.extents == (100, 125)
+
+    onselect.reset_mock()
+    onmove.reset_mock()
+    # Trigger event outside of span
+    click_and_drag(tool, start=(150, 150), end=(160, 160))
+    if ignore_event_outside:
+        # event have been ignored and span haven't changed.
+        onselect.assert_not_called()
+        onmove.assert_not_called()
+        assert tool.extents == (100, 125)
+    else:
+        # A new shape is created
+        onselect.assert_called_once()
+        onmove.assert_called_once()
+        assert tool.extents == (150, 160)
+
+
+@pytest.mark.parametrize('drag_from_anywhere', [True, False])
+def test_span_selector_drag(ax, drag_from_anywhere):
+    # Create span
+    tool = widgets.SpanSelector(ax, onselect=noop, direction='horizontal',
+                                interactive=True,
+                                drag_from_anywhere=drag_from_anywhere)
+    click_and_drag(tool, start=(10, 10), end=(100, 120))
+    assert tool.extents == (10, 100)
+    # Drag inside span
+    #
+    # If drag_from_anywhere == True, this will move the span by 10,
+    # giving new value extents = 20, 110
+    #
+    # If drag_from_anywhere == False, this will create a new span with
+    # value extents = 25, 35
+    click_and_drag(tool, start=(25, 15), end=(35, 25))
+    if drag_from_anywhere:
+        assert tool.extents == (20, 110)
+    else:
+        assert tool.extents == (25, 35)
 
-    if 'onmove_callback' in kwargs:
-        assert ax._got_on_move
+    # Check that in both cases, dragging outside the span draws a new span
+    click_and_drag(tool, start=(175, 185), end=(185, 195))
+    assert tool.extents == (175, 185)
 
 
-def test_span_selector():
-    check_span('horizontal', minspan=10, useblit=True)
-    check_span('vertical', onmove_callback=True, button=1)
-    check_span('horizontal', rectprops=dict(fill=True))
+def test_span_selector_direction(ax):
+    tool = widgets.SpanSelector(ax, onselect=noop, direction='horizontal',
+                                interactive=True)
+    assert tool.direction == 'horizontal'
+    assert tool._edge_handles.direction == 'horizontal'
 
+    with pytest.raises(ValueError):
+        tool = widgets.SpanSelector(ax, onselect=noop,
+                                    direction='invalid_direction')
 
-def check_lasso_selector(**kwargs):
-    ax = get_ax()
+    tool.direction = 'vertical'
+    assert tool.direction == 'vertical'
+    assert tool._edge_handles.direction == 'vertical'
+
+    with pytest.raises(ValueError):
+        tool.direction = 'invalid_string'
+
+
+def test_span_selector_set_props_handle_props(ax):
+    tool = widgets.SpanSelector(ax, onselect=noop, direction='horizontal',
+                                interactive=True,
+                                props=dict(facecolor='b', alpha=0.2),
+                                handle_props=dict(alpha=0.5))
+    # Create rectangle
+    click_and_drag(tool, start=(0, 10), end=(100, 120))
+
+    artist = tool._selection_artist
+    assert artist.get_facecolor() == mcolors.to_rgba('b', alpha=0.2)
+    tool.set_props(facecolor='r', alpha=0.3)
+    assert artist.get_facecolor() == mcolors.to_rgba('r', alpha=0.3)
+
+    for artist in tool._handles_artists:
+        assert artist.get_color() == 'b'
+        assert artist.get_alpha() == 0.5
+    tool.set_handle_props(color='r', alpha=0.3)
+    for artist in tool._handles_artists:
+        assert artist.get_color() == 'r'
+        assert artist.get_alpha() == 0.3
+
+
+@pytest.mark.parametrize('selector', ['span', 'rectangle'])
+def test_selector_clear(ax, selector):
+    kwargs = dict(ax=ax, onselect=noop, interactive=True)
+    if selector == 'span':
+        Selector = widgets.SpanSelector
+        kwargs['direction'] = 'horizontal'
+    else:
+        Selector = widgets.RectangleSelector
+
+    tool = Selector(**kwargs)
+    click_and_drag(tool, start=(10, 10), end=(100, 120))
+
+    # press-release event outside the selector to clear the selector
+    click_and_drag(tool, start=(130, 130), end=(130, 130))
+    assert not tool._selection_completed
+
+    kwargs['ignore_event_outside'] = True
+    tool = Selector(**kwargs)
+    assert tool.ignore_event_outside
+    click_and_drag(tool, start=(10, 10), end=(100, 120))
+
+    # press-release event outside the selector ignored
+    click_and_drag(tool, start=(130, 130), end=(130, 130))
+    assert tool._selection_completed
+
+    do_event(tool, 'on_key_press', key='escape')
+    assert not tool._selection_completed
+
+
+@pytest.mark.parametrize('selector', ['span', 'rectangle'])
+def test_selector_clear_method(ax, selector):
+    if selector == 'span':
+        tool = widgets.SpanSelector(ax, onselect=noop, direction='horizontal',
+                                    interactive=True,
+                                    ignore_event_outside=True)
+    else:
+        tool = widgets.RectangleSelector(ax, onselect=noop, interactive=True)
+    click_and_drag(tool, start=(10, 10), end=(100, 120))
+    assert tool._selection_completed
+    assert tool.get_visible()
+    if selector == 'span':
+        assert tool.extents == (10, 100)
+
+    tool.clear()
+    assert not tool._selection_completed
+    assert not tool.get_visible()
+
+    # Do another cycle of events to make sure we can
+    click_and_drag(tool, start=(10, 10), end=(50, 120))
+    assert tool._selection_completed
+    assert tool.get_visible()
+    if selector == 'span':
+        assert tool.extents == (10, 50)
+
+
+def test_span_selector_add_state(ax):
+    tool = widgets.SpanSelector(ax, noop, 'horizontal',
+                                interactive=True)
+
+    with pytest.raises(ValueError):
+        tool.add_state('unsupported_state')
+    with pytest.raises(ValueError):
+        tool.add_state('center')
+    with pytest.raises(ValueError):
+        tool.add_state('square')
+
+    tool.add_state('move')
+
+
+def test_tool_line_handle(ax):
+    positions = [20, 30, 50]
+    tool_line_handle = widgets.ToolLineHandles(ax, positions, 'horizontal',
+                                               useblit=False)
+
+    for artist in tool_line_handle.artists:
+        assert not artist.get_animated()
+        assert not artist.get_visible()
+
+    tool_line_handle.set_visible(True)
+    tool_line_handle.set_animated(True)
+
+    for artist in tool_line_handle.artists:
+        assert artist.get_animated()
+        assert artist.get_visible()
+
+    assert tool_line_handle.positions == positions
+
+
+@pytest.mark.parametrize('direction', ("horizontal", "vertical"))
+def test_span_selector_bound(direction):
+    fig, ax = plt.subplots(1, 1)
+    ax.plot([10, 20], [10, 30])
+    ax.figure.canvas.draw()
+    x_bound = ax.get_xbound()
+    y_bound = ax.get_ybound()
+
+    tool = widgets.SpanSelector(ax, print, direction, interactive=True)
+    assert ax.get_xbound() == x_bound
+    assert ax.get_ybound() == y_bound
+
+    bound = x_bound if direction == 'horizontal' else y_bound
+    assert tool._edge_handles.positions == list(bound)
 
-    def onselect(verts):
+    press_data = [10.5, 11.5]
+    move_data = [11, 13]  # Updating selector is done in onmove
+    release_data = move_data
+    click_and_drag(tool, start=press_data, end=move_data)
+
+    assert ax.get_xbound() == x_bound
+    assert ax.get_ybound() == y_bound
+
+    index = 0 if direction == 'horizontal' else 1
+    handle_positions = [press_data[index], release_data[index]]
+    assert tool._edge_handles.positions == handle_positions
+
+
+@pytest.mark.backend('QtAgg', skip_on_importerror=True)
+def test_span_selector_animated_artists_callback():
+    """Check that the animated artists changed in callbacks are updated."""
+    x = np.linspace(0, 2 * np.pi, 100)
+    values = np.sin(x)
+
+    fig, ax = plt.subplots()
+    ln, = ax.plot(x, values, animated=True)
+    ln2, = ax.plot([], animated=True)
+
+    # spin the event loop to let the backend process any pending operations
+    # before drawing artists
+    # See blitting tutorial
+    plt.pause(0.1)
+    ax.draw_artist(ln)
+    fig.canvas.blit(fig.bbox)
+
+    def mean(vmin, vmax):
+        # Return mean of values in x between *vmin* and *vmax*
+        indmin, indmax = np.searchsorted(x, (vmin, vmax))
+        v = values[indmin:indmax].mean()
+        ln2.set_data(x, v)
+
+    span = widgets.SpanSelector(ax, mean, direction='horizontal',
+                                onmove_callback=mean,
+                                interactive=True,
+                                drag_from_anywhere=True,
+                                useblit=True)
+
+    # Add span selector and check that the line is draw after it was updated
+    # by the callback
+    press_data = [1, 2]
+    move_data = [2, 2]
+    do_event(span, 'press', xdata=press_data[0], ydata=press_data[1], button=1)
+    do_event(span, 'onmove', xdata=move_data[0], ydata=move_data[1], button=1)
+    assert span._get_animated_artists() == (ln, ln2)
+    assert ln.stale is False
+    assert ln2.stale
+    assert ln2.get_ydata() == 0.9547335049088455
+    span.update()
+    assert ln2.stale is False
+
+    # Change span selector and check that the line is drawn/updated after its
+    # value was updated by the callback
+    press_data = [4, 2]
+    move_data = [5, 2]
+    release_data = [5, 2]
+    do_event(span, 'press', xdata=press_data[0], ydata=press_data[1], button=1)
+    do_event(span, 'onmove', xdata=move_data[0], ydata=move_data[1], button=1)
+    assert ln.stale is False
+    assert ln2.stale
+    assert ln2.get_ydata() == -0.9424150707548072
+    do_event(span, 'release', xdata=release_data[0],
+             ydata=release_data[1], button=1)
+    assert ln2.stale is False
+
+
+def test_snapping_values_span_selector(ax):
+    def onselect(*args):
+        pass
+
+    tool = widgets.SpanSelector(ax, onselect, direction='horizontal',)
+    snap_function = tool._snap
+
+    snap_values = np.linspace(0, 5, 11)
+    values = np.array([-0.1, 0.1, 0.2, 0.5, 0.6, 0.7, 0.9, 4.76, 5.0, 5.5])
+    expect = np.array([00.0, 0.0, 0.0, 0.5, 0.5, 0.5, 1.0, 5.00, 5.0, 5.0])
+    values = snap_function(values, snap_values)
+    assert_allclose(values, expect)
+
+
+def test_span_selector_snap(ax):
+    def onselect(vmin, vmax):
         ax._got_onselect = True
-        assert verts == [(100, 100), (125, 125), (150, 150)]
+
+    snap_values = np.arange(50) * 4
+
+    tool = widgets.SpanSelector(ax, onselect, direction='horizontal',
+                                snap_values=snap_values)
+    tool.extents = (17, 35)
+    assert tool.extents == (16, 36)
+
+    tool.snap_values = None
+    assert tool.snap_values is None
+    tool.extents = (17, 35)
+    assert tool.extents == (17, 35)
+
+
+@pytest.mark.parametrize('kwargs', [
+    dict(),
+    dict(useblit=False, props=dict(color='red')),
+    dict(useblit=True, button=1),
+])
+def test_lasso_selector(ax, kwargs):
+    onselect = mock.Mock(spec=noop, return_value=None)
 
     tool = widgets.LassoSelector(ax, onselect, **kwargs)
     do_event(tool, 'press', xdata=100, ydata=100, button=1)
     do_event(tool, 'onmove', xdata=125, ydata=125, button=1)
     do_event(tool, 'release', xdata=150, ydata=150, button=1)
 
-    assert ax._got_onselect
+    onselect.assert_called_once_with([(100, 100), (125, 125), (150, 150)])
 
 
-def test_lasso_selector():
-    check_lasso_selector()
-    check_lasso_selector(useblit=False, lineprops=dict(color='red'))
-    check_lasso_selector(useblit=True, button=1)
-
-
-def test_CheckButtons():
-    ax = get_ax()
+def test_CheckButtons(ax):
     check = widgets.CheckButtons(ax, ('a', 'b', 'c'), (True, False, True))
     assert check.get_status() == [True, False, True]
     check.set_active(0)
@@ -208,12 +962,44 @@ def test_CheckButtons():
     check.disconnect(cid)
 
 
+@pytest.mark.parametrize("toolbar", ["none", "toolbar2", "toolmanager"])
+def test_TextBox(ax, toolbar):
+    # Avoid "toolmanager is provisional" warning.
+    dict.__setitem__(plt.rcParams, "toolbar", toolbar)
+
+    submit_event = mock.Mock(spec=noop, return_value=None)
+    text_change_event = mock.Mock(spec=noop, return_value=None)
+    tool = widgets.TextBox(ax, '')
+    tool.on_submit(submit_event)
+    tool.on_text_change(text_change_event)
+
+    assert tool.text == ''
+
+    do_event(tool, '_click')
+
+    tool.set_val('x**2')
+
+    assert tool.text == 'x**2'
+    assert text_change_event.call_count == 1
+
+    tool.begin_typing(tool.text)
+    tool.stop_typing()
+
+    assert submit_event.call_count == 2
+
+    do_event(tool, '_click')
+    do_event(tool, '_keypress', key='+')
+    do_event(tool, '_keypress', key='5')
+
+    assert text_change_event.call_count == 3
+
+
 @image_comparison(['check_radio_buttons.png'], style='mpl20', remove_text=True)
 def test_check_radio_buttons_image():
+    ax = get_ax()
     # Remove this line when this test image is regenerated.
     plt.rcParams['text.kerning_factor'] = 6
 
-    get_ax()
     plt.subplots_adjust(left=0.3)
     rax1 = plt.axes([0.05, 0.7, 0.15, 0.15])
     rax2 = plt.axes([0.05, 0.2, 0.15, 0.15])
@@ -286,7 +1072,7 @@ def test_slider_horizontal_vertical():
     assert slider.val == 10
     # check the dimension of the slider patch in axes units
     box = slider.poly.get_extents().transformed(ax.transAxes.inverted())
-    assert_allclose(box.bounds, [0, 0, 10/24, 1])
+    assert_allclose(box.bounds, [0, .25, 10/24, .5])
 
     fig, ax = plt.subplots()
     slider = widgets.Slider(ax=ax, label='', valmin=0, valmax=24,
@@ -295,7 +1081,15 @@ def test_slider_horizontal_vertical():
     assert slider.val == 10
     # check the dimension of the slider patch in axes units
     box = slider.poly.get_extents().transformed(ax.transAxes.inverted())
-    assert_allclose(box.bounds, [0, 0, 1, 10/24])
+    assert_allclose(box.bounds, [.25, 0, .5, 10/24])
+
+
+def test_slider_reset():
+    fig, ax = plt.subplots()
+    slider = widgets.Slider(ax=ax, label='', valmin=0, valmax=1, valinit=.5)
+    slider.set_val(0.75)
+    slider.reset()
+    assert slider.val == 0.5
 
 
 @pytest.mark.parametrize("orientation", ["horizontal", "vertical"])
@@ -308,24 +1102,60 @@ def test_range_slider(orientation):
     fig, ax = plt.subplots()
 
     slider = widgets.RangeSlider(
-        ax=ax, label="", valmin=0.0, valmax=1.0, orientation=orientation
+        ax=ax, label="", valmin=0.0, valmax=1.0, orientation=orientation,
+        valinit=[0.1, 0.34]
     )
     box = slider.poly.get_extents().transformed(ax.transAxes.inverted())
-    assert_allclose(box.get_points().flatten()[idx], [0.25, 0, 0.75, 1])
+    assert_allclose(box.get_points().flatten()[idx], [0.1, 0.25, 0.34, 0.75])
+
+    # Check initial value is set correctly
+    assert_allclose(slider.val, (0.1, 0.34))
+
+    def handle_positions(slider):
+        if orientation == "vertical":
+            return [h.get_ydata()[0] for h in slider._handles]
+        else:
+            return [h.get_xdata()[0] for h in slider._handles]
 
     slider.set_val((0.2, 0.6))
     assert_allclose(slider.val, (0.2, 0.6))
+    assert_allclose(handle_positions(slider), (0.2, 0.6))
+
     box = slider.poly.get_extents().transformed(ax.transAxes.inverted())
-    assert_allclose(box.get_points().flatten()[idx], [0.2, 0, 0.6, 1])
+    assert_allclose(box.get_points().flatten()[idx], [0.2, .25, 0.6, .75])
 
     slider.set_val((0.2, 0.1))
     assert_allclose(slider.val, (0.1, 0.2))
+    assert_allclose(handle_positions(slider), (0.1, 0.2))
 
     slider.set_val((-1, 10))
     assert_allclose(slider.val, (0, 1))
+    assert_allclose(handle_positions(slider), (0, 1))
+
+    slider.reset()
+    assert_allclose(slider.val, (0.1, 0.34))
+    assert_allclose(handle_positions(slider), (0.1, 0.34))
+
+
+@pytest.mark.parametrize("orientation", ["horizontal", "vertical"])
+def test_range_slider_same_init_values(orientation):
+    if orientation == "vertical":
+        idx = [1, 0, 3, 2]
+    else:
+        idx = [0, 1, 2, 3]
+
+    fig, ax = plt.subplots()
+
+    slider = widgets.RangeSlider(
+         ax=ax, label="", valmin=0.0, valmax=1.0, orientation=orientation,
+         valinit=[0, 0]
+     )
+    box = slider.poly.get_extents().transformed(ax.transAxes.inverted())
+    assert_allclose(box.get_points().flatten()[idx], [0, 0.25, 0, 0.75])
 
 
-def check_polygon_selector(event_sequence, expected_result, selections_count):
+def check_polygon_selector(event_sequence, expected_result, selections_count,
+                           **kwargs):
     """
     Helper function to test Polygon Selector.
 
@@ -342,22 +1172,20 @@ def check_polygon_selector(event_sequence, expected_result, selections_count):
     selections_count : int
         Wait for the tool to call its `onselect` function `selections_count`
         times, before comparing the result to the `expected_result`
+    **kwargs
+        Keyword arguments are passed to PolygonSelector.
     """
     ax = get_ax()
 
-    ax._selections_count = 0
+    onselect = mock.Mock(spec=noop, return_value=None)
 
-    def onselect(vertices):
-        ax._selections_count += 1
-        ax._current_result = vertices
-
-    tool = widgets.PolygonSelector(ax, onselect)
+    tool = widgets.PolygonSelector(ax, onselect, **kwargs)
 
     for (etype, event_args) in event_sequence:
         do_event(tool, etype, **event_args)
 
-    assert ax._selections_count == selections_count
-    assert ax._current_result == expected_result
+    assert onselect.call_count == selections_count
+    assert onselect.call_args == ((expected_result, ), {})
 
 
 def polygon_place_vertex(xdata, ydata):
@@ -366,97 +1194,339 @@ def polygon_place_vertex(xdata, ydata):
             ('release', dict(xdata=xdata, ydata=ydata))]
 
 
-def test_polygon_selector():
+def polygon_remove_vertex(xdata, ydata):
+    return [('onmove', dict(xdata=xdata, ydata=ydata)),
+            ('press', dict(xdata=xdata, ydata=ydata, button=3)),
+            ('release', dict(xdata=xdata, ydata=ydata, button=3))]
+
+
+@pytest.mark.parametrize('draw_bounding_box', [False, True])
+def test_polygon_selector(draw_bounding_box):
+    check_selector = functools.partial(
+        check_polygon_selector, draw_bounding_box=draw_bounding_box)
+
     # Simple polygon
     expected_result = [(50, 50), (150, 50), (50, 150)]
-    event_sequence = (polygon_place_vertex(50, 50)
-                      + polygon_place_vertex(150, 50)
-                      + polygon_place_vertex(50, 150)
-                      + polygon_place_vertex(50, 50))
-    check_polygon_selector(event_sequence, expected_result, 1)
+    event_sequence = [
+        *polygon_place_vertex(50, 50),
+        *polygon_place_vertex(150, 50),
+        *polygon_place_vertex(50, 150),
+        *polygon_place_vertex(50, 50),
+    ]
+    check_selector(event_sequence, expected_result, 1)
 
     # Move first vertex before completing the polygon.
     expected_result = [(75, 50), (150, 50), (50, 150)]
-    event_sequence = (polygon_place_vertex(50, 50)
-                      + polygon_place_vertex(150, 50)
-                      + [('on_key_press', dict(key='control')),
-                         ('onmove', dict(xdata=50, ydata=50)),
-                         ('press', dict(xdata=50, ydata=50)),
-                         ('onmove', dict(xdata=75, ydata=50)),
-                         ('release', dict(xdata=75, ydata=50)),
-                         ('on_key_release', dict(key='control'))]
-                      + polygon_place_vertex(50, 150)
-                      + polygon_place_vertex(75, 50))
-    check_polygon_selector(event_sequence, expected_result, 1)
+    event_sequence = [
+        *polygon_place_vertex(50, 50),
+        *polygon_place_vertex(150, 50),
+        ('on_key_press', dict(key='control')),
+        ('onmove', dict(xdata=50, ydata=50)),
+        ('press', dict(xdata=50, ydata=50)),
+        ('onmove', dict(xdata=75, ydata=50)),
+        ('release', dict(xdata=75, ydata=50)),
+        ('on_key_release', dict(key='control')),
+        *polygon_place_vertex(50, 150),
+        *polygon_place_vertex(75, 50),
+    ]
+    check_selector(event_sequence, expected_result, 1)
 
     # Move first two vertices at once before completing the polygon.
     expected_result = [(50, 75), (150, 75), (50, 150)]
-    event_sequence = (polygon_place_vertex(50, 50)
-                      + polygon_place_vertex(150, 50)
-                      + [('on_key_press', dict(key='shift')),
-                         ('onmove', dict(xdata=100, ydata=100)),
-                         ('press', dict(xdata=100, ydata=100)),
-                         ('onmove', dict(xdata=100, ydata=125)),
-                         ('release', dict(xdata=100, ydata=125)),
-                         ('on_key_release', dict(key='shift'))]
-                      + polygon_place_vertex(50, 150)
-                      + polygon_place_vertex(50, 75))
-    check_polygon_selector(event_sequence, expected_result, 1)
+    event_sequence = [
+        *polygon_place_vertex(50, 50),
+        *polygon_place_vertex(150, 50),
+        ('on_key_press', dict(key='shift')),
+        ('onmove', dict(xdata=100, ydata=100)),
+        ('press', dict(xdata=100, ydata=100)),
+        ('onmove', dict(xdata=100, ydata=125)),
+        ('release', dict(xdata=100, ydata=125)),
+        ('on_key_release', dict(key='shift')),
+        *polygon_place_vertex(50, 150),
+        *polygon_place_vertex(50, 75),
+    ]
+    check_selector(event_sequence, expected_result, 1)
 
     # Move first vertex after completing the polygon.
     expected_result = [(75, 50), (150, 50), (50, 150)]
-    event_sequence = (polygon_place_vertex(50, 50)
-                      + polygon_place_vertex(150, 50)
-                      + polygon_place_vertex(50, 150)
-                      + polygon_place_vertex(50, 50)
-                      + [('onmove', dict(xdata=50, ydata=50)),
-                         ('press', dict(xdata=50, ydata=50)),
-                         ('onmove', dict(xdata=75, ydata=50)),
-                         ('release', dict(xdata=75, ydata=50))])
-    check_polygon_selector(event_sequence, expected_result, 2)
+    event_sequence = [
+        *polygon_place_vertex(50, 50),
+        *polygon_place_vertex(150, 50),
+        *polygon_place_vertex(50, 150),
+        *polygon_place_vertex(50, 50),
+        ('onmove', dict(xdata=50, ydata=50)),
+        ('press', dict(xdata=50, ydata=50)),
+        ('onmove', dict(xdata=75, ydata=50)),
+        ('release', dict(xdata=75, ydata=50)),
+    ]
+    check_selector(event_sequence, expected_result, 2)
 
     # Move all vertices after completing the polygon.
     expected_result = [(75, 75), (175, 75), (75, 175)]
-    event_sequence = (polygon_place_vertex(50, 50)
-                      + polygon_place_vertex(150, 50)
-                      + polygon_place_vertex(50, 150)
-                      + polygon_place_vertex(50, 50)
-                      + [('on_key_press', dict(key='shift')),
-                         ('onmove', dict(xdata=100, ydata=100)),
-                         ('press', dict(xdata=100, ydata=100)),
-                         ('onmove', dict(xdata=125, ydata=125)),
-                         ('release', dict(xdata=125, ydata=125)),
-                         ('on_key_release', dict(key='shift'))])
-    check_polygon_selector(event_sequence, expected_result, 2)
+    event_sequence = [
+        *polygon_place_vertex(50, 50),
+        *polygon_place_vertex(150, 50),
+        *polygon_place_vertex(50, 150),
+        *polygon_place_vertex(50, 50),
+        ('on_key_press', dict(key='shift')),
+        ('onmove', dict(xdata=100, ydata=100)),
+        ('press', dict(xdata=100, ydata=100)),
+        ('onmove', dict(xdata=125, ydata=125)),
+        ('release', dict(xdata=125, ydata=125)),
+        ('on_key_release', dict(key='shift')),
+    ]
+    check_selector(event_sequence, expected_result, 2)
 
     # Try to move a vertex and move all before placing any vertices.
     expected_result = [(50, 50), (150, 50), (50, 150)]
-    event_sequence = ([('on_key_press', dict(key='control')),
-                       ('onmove', dict(xdata=100, ydata=100)),
-                       ('press', dict(xdata=100, ydata=100)),
-                       ('onmove', dict(xdata=125, ydata=125)),
-                       ('release', dict(xdata=125, ydata=125)),
-                       ('on_key_release', dict(key='control')),
-                       ('on_key_press', dict(key='shift')),
-                       ('onmove', dict(xdata=100, ydata=100)),
-                       ('press', dict(xdata=100, ydata=100)),
-                       ('onmove', dict(xdata=125, ydata=125)),
-                       ('release', dict(xdata=125, ydata=125)),
-                       ('on_key_release', dict(key='shift'))]
-                      + polygon_place_vertex(50, 50)
-                      + polygon_place_vertex(150, 50)
-                      + polygon_place_vertex(50, 150)
-                      + polygon_place_vertex(50, 50))
-    check_polygon_selector(event_sequence, expected_result, 1)
+    event_sequence = [
+        ('on_key_press', dict(key='control')),
+        ('onmove', dict(xdata=100, ydata=100)),
+        ('press', dict(xdata=100, ydata=100)),
+        ('onmove', dict(xdata=125, ydata=125)),
+        ('release', dict(xdata=125, ydata=125)),
+        ('on_key_release', dict(key='control')),
+        ('on_key_press', dict(key='shift')),
+        ('onmove', dict(xdata=100, ydata=100)),
+        ('press', dict(xdata=100, ydata=100)),
+        ('onmove', dict(xdata=125, ydata=125)),
+        ('release', dict(xdata=125, ydata=125)),
+        ('on_key_release', dict(key='shift')),
+        *polygon_place_vertex(50, 50),
+        *polygon_place_vertex(150, 50),
+        *polygon_place_vertex(50, 150),
+        *polygon_place_vertex(50, 50),
+    ]
+    check_selector(event_sequence, expected_result, 1)
 
     # Try to place vertex out-of-bounds, then reset, and start a new polygon.
     expected_result = [(50, 50), (150, 50), (50, 150)]
-    event_sequence = (polygon_place_vertex(50, 50)
-                      + polygon_place_vertex(250, 50)
-                      + [('on_key_press', dict(key='escape')),
-                         ('on_key_release', dict(key='escape'))]
-                      + polygon_place_vertex(50, 50)
-                      + polygon_place_vertex(150, 50)
-                      + polygon_place_vertex(50, 150)
-                      + polygon_place_vertex(50, 50))
-    check_polygon_selector(event_sequence, expected_result, 1)
+    event_sequence = [
+        *polygon_place_vertex(50, 50),
+        *polygon_place_vertex(250, 50),
+        ('on_key_press', dict(key='escape')),
+        ('on_key_release', dict(key='escape')),
+        *polygon_place_vertex(50, 50),
+        *polygon_place_vertex(150, 50),
+        *polygon_place_vertex(50, 150),
+        *polygon_place_vertex(50, 50),
+    ]
+    check_selector(event_sequence, expected_result, 1)
+
+
+@pytest.mark.parametrize('draw_bounding_box', [False, True])
+def test_polygon_selector_set_props_handle_props(ax, draw_bounding_box):
+    tool = widgets.PolygonSelector(ax, onselect=noop,
+                                   props=dict(color='b', alpha=0.2),
+                                   handle_props=dict(alpha=0.5),
+                                   draw_bounding_box=draw_bounding_box)
+
+    event_sequence = [
+        *polygon_place_vertex(50, 50),
+        *polygon_place_vertex(150, 50),
+        *polygon_place_vertex(50, 150),
+        *polygon_place_vertex(50, 50),
+    ]
+
+    for (etype, event_args) in event_sequence:
+        do_event(tool, etype, **event_args)
+
+    artist = tool._selection_artist
+    assert artist.get_color() == 'b'
+    assert artist.get_alpha() == 0.2
+    tool.set_props(color='r', alpha=0.3)
+    assert artist.get_color() == 'r'
+    assert artist.get_alpha() == 0.3
+
+    for artist in tool._handles_artists:
+        assert artist.get_color() == 'b'
+        assert artist.get_alpha() == 0.5
+    tool.set_handle_props(color='r', alpha=0.3)
+    for artist in tool._handles_artists:
+        assert artist.get_color() == 'r'
+        assert artist.get_alpha() == 0.3
+
+
+@check_figures_equal()
+def test_rect_visibility(fig_test, fig_ref):
+    # Check that requesting an invisible selector makes it invisible
+    ax_test = fig_test.subplots()
+    _ = fig_ref.subplots()
+
+    tool = widgets.RectangleSelector(ax_test, onselect=noop,
+                                     props={'visible': False})
+    tool.extents = (0.2, 0.8, 0.3, 0.7)
+
+
+# Change the order that the extra point is inserted in
+@pytest.mark.parametrize('idx', [1, 2, 3])
+@pytest.mark.parametrize('draw_bounding_box', [False, True])
+def test_polygon_selector_remove(idx, draw_bounding_box):
+    verts = [(50, 50), (150, 50), (50, 150)]
+    event_sequence = [polygon_place_vertex(*verts[0]),
+                      polygon_place_vertex(*verts[1]),
+                      polygon_place_vertex(*verts[2]),
+                      # Finish the polygon
+                      polygon_place_vertex(*verts[0])]
+    # Add an extra point
+    event_sequence.insert(idx, polygon_place_vertex(200, 200))
+    # Remove the extra point
+    event_sequence.append(polygon_remove_vertex(200, 200))
+    # Flatten list of lists
+    event_sequence = sum(event_sequence, [])
+    check_polygon_selector(event_sequence, verts, 2,
+                           draw_bounding_box=draw_bounding_box)
+
+
+@pytest.mark.parametrize('draw_bounding_box', [False, True])
+def test_polygon_selector_remove_first_point(draw_bounding_box):
+    verts = [(50, 50), (150, 50), (50, 150)]
+    event_sequence = [
+        *polygon_place_vertex(*verts[0]),
+        *polygon_place_vertex(*verts[1]),
+        *polygon_place_vertex(*verts[2]),
+        *polygon_place_vertex(*verts[0]),
+        *polygon_remove_vertex(*verts[0]),
+    ]
+    check_polygon_selector(event_sequence, verts[1:], 2,
+                           draw_bounding_box=draw_bounding_box)
+
+
+@pytest.mark.parametrize('draw_bounding_box', [False, True])
+def test_polygon_selector_redraw(ax, draw_bounding_box):
+    verts = [(50, 50), (150, 50), (50, 150)]
+    event_sequence = [
+        *polygon_place_vertex(*verts[0]),
+        *polygon_place_vertex(*verts[1]),
+        *polygon_place_vertex(*verts[2]),
+        *polygon_place_vertex(*verts[0]),
+        # Polygon completed, now remove first two verts.
+        *polygon_remove_vertex(*verts[1]),
+        *polygon_remove_vertex(*verts[2]),
+        # At this point the tool should be reset so we can add more vertices.
+        *polygon_place_vertex(*verts[1]),
+    ]
+
+    tool = widgets.PolygonSelector(ax, onselect=noop,
+                                   draw_bounding_box=draw_bounding_box)
+    for (etype, event_args) in event_sequence:
+        do_event(tool, etype, **event_args)
+    # After removing two verts, only one remains, and the
+    # selector should be automatically resete
+    assert tool.verts == verts[0:2]
+
+
+@pytest.mark.parametrize('draw_bounding_box', [False, True])
+@check_figures_equal(extensions=['png'])
+def test_polygon_selector_verts_setter(fig_test, fig_ref, draw_bounding_box):
+    verts = [(0.1, 0.4), (0.5, 0.9), (0.3, 0.2)]
+    ax_test = fig_test.add_subplot()
+
+    tool_test = widgets.PolygonSelector(
+        ax_test, onselect=noop, draw_bounding_box=draw_bounding_box)
+    tool_test.verts = verts
+    assert tool_test.verts == verts
+
+    ax_ref = fig_ref.add_subplot()
+    tool_ref = widgets.PolygonSelector(
+        ax_ref, onselect=noop, draw_bounding_box=draw_bounding_box)
+    event_sequence = [
+        *polygon_place_vertex(*verts[0]),
+        *polygon_place_vertex(*verts[1]),
+        *polygon_place_vertex(*verts[2]),
+        *polygon_place_vertex(*verts[0]),
+    ]
+    for (etype, event_args) in event_sequence:
+        do_event(tool_ref, etype, **event_args)
+
+
+def test_polygon_selector_box(ax):
+    # Create a diamond shape
+    verts = [(20, 0), (0, 20), (20, 40), (40, 20)]
+    event_sequence = [
+        *polygon_place_vertex(*verts[0]),
+        *polygon_place_vertex(*verts[1]),
+        *polygon_place_vertex(*verts[2]),
+        *polygon_place_vertex(*verts[3]),
+        *polygon_place_vertex(*verts[0]),
+    ]
+
+    # Create selector
+    tool = widgets.PolygonSelector(ax, onselect=noop, draw_bounding_box=True)
+    for (etype, event_args) in event_sequence:
+        do_event(tool, etype, **event_args)
+
+    # In order to trigger the correct callbacks, trigger events on the canvas
+    # instead of the individual tools
+    t = ax.transData
+    canvas = ax.figure.canvas
+
+    # Scale to half size using the top right corner of the bounding box
+    MouseEvent(
+        "button_press_event", canvas, *t.transform((40, 40)), 1)._process()
+    MouseEvent(
+        "motion_notify_event", canvas, *t.transform((20, 20)))._process()
+    MouseEvent(
+        "button_release_event", canvas, *t.transform((20, 20)), 1)._process()
+    np.testing.assert_allclose(
+        tool.verts, [(10, 0), (0, 10), (10, 20), (20, 10)])
+
+    # Move using the center of the bounding box
+    MouseEvent(
+        "button_press_event", canvas, *t.transform((10, 10)), 1)._process()
+    MouseEvent(
+        "motion_notify_event", canvas, *t.transform((30, 30)))._process()
+    MouseEvent(
+        "button_release_event", canvas, *t.transform((30, 30)), 1)._process()
+    np.testing.assert_allclose(
+        tool.verts, [(30, 20), (20, 30), (30, 40), (40, 30)])
+
+    # Remove a point from the polygon and check that the box extents update
+    np.testing.assert_allclose(
+        tool._box.extents, (20.0, 40.0, 20.0, 40.0))
+
+    MouseEvent(
+        "button_press_event", canvas, *t.transform((30, 20)), 3)._process()
+    MouseEvent(
+        "button_release_event", canvas, *t.transform((30, 20)), 3)._process()
+    np.testing.assert_allclose(
+        tool.verts, [(20, 30), (30, 40), (40, 30)])
+    np.testing.assert_allclose(
+        tool._box.extents, (20.0, 40.0, 30.0, 40.0))
+
+
+@pytest.mark.parametrize("horizOn", [False, True])
+@pytest.mark.parametrize("vertOn", [False, True])
+def test_MultiCursor(horizOn, vertOn):
+    (ax1, ax3) = plt.figure().subplots(2, sharex=True)
+    ax2 = plt.figure().subplots()
+
+    # useblit=false to avoid having to draw the figure to cache the renderer
+    multi = widgets.MultiCursor(
+        None, (ax1, ax2), useblit=False, horizOn=horizOn, vertOn=vertOn
+    )
+
+    # Only two of the axes should have a line drawn on them.
+    assert len(multi.vlines) == (2 if vertOn else 0)
+    assert len(multi.hlines) == (2 if horizOn else 0)
+
+    # mock a motion_notify_event
+    # Can't use `do_event` as that helper requires the widget
+    # to have a single .ax attribute.
+    event = mock_event(ax1, xdata=.5, ydata=.25)
+    multi.onmove(event)
+
+    # the lines in the first two ax should both move
+    for l in multi.vlines:
+        assert l.get_xdata() == (.5, .5)
+    for l in multi.hlines:
+        assert l.get_ydata() == (.25, .25)
+
+    # test a move event in an Axes not part of the MultiCursor
+    # the lines in ax1 and ax2 should not have moved.
+    event = mock_event(ax3, xdata=.75, ydata=.75)
+    multi.onmove(event)
+    for l in multi.vlines:
+        assert l.get_xdata() == (.5, .5)
+    for l in multi.hlines:
+        assert l.get_ydata() == (.25, .25)
diff --git a/lib/matplotlib/tests/tinypages/conf.py b/lib/matplotlib/tests/tinypages/conf.py
index 970a3c5a4d45..08d59fa87ff9 100644
--- a/lib/matplotlib/tests/tinypages/conf.py
+++ b/lib/matplotlib/tests/tinypages/conf.py
@@ -1,262 +1,24 @@
-# tinypages documentation build configuration file, created by
-# sphinx-quickstart on Tue Mar 18 11:58:34 2014.
-#
-# This file is execfile()d with the current directory set to its
-# containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys
-from os.path import join as pjoin, abspath
 import sphinx
-from distutils.version import LooseVersion
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-sys.path.insert(0, abspath(pjoin('..', '..')))
+from packaging.version import parse as parse_version
 
 # -- General configuration ------------------------------------------------
 
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
 extensions = ['matplotlib.sphinxext.plot_directive']
-
-# Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
-
-# The suffix of source filenames.
 source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
 master_doc = 'index'
-
-# General information about the project.
 project = 'tinypages'
 copyright = '2014, Matplotlib developers'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
 version = '0.1'
-# The full version, including alpha/beta/rc tags.
 release = '0.1'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
 exclude_patterns = ['_build']
-
-# The reST default role (used for this markup: `text`) to use for all
-# documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-# If true, keep warnings as "system message" paragraphs in the built documents.
-#keep_warnings = False
-
-
 # -- Options for HTML output ----------------------------------------------
 
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-if LooseVersion(sphinx.__version__) >= LooseVersion('1.3'):
+if parse_version(sphinx.__version__) >= parse_version('1.3'):
     html_theme = 'classic'
 else:
     html_theme = 'default'
 
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
-
-# Add any extra paths that contain custom files (such as robots.txt or
-# .htaccess) here, relative to this directory. These files are copied
-# directly to the root of the documentation.
-#html_extra_path = []
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'tinypagesdoc'
-
-
-# -- Options for LaTeX output ---------------------------------------------
-
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-#  author, documentclass [howto, manual, or own class]).
-latex_documents = [
-  ('index', 'tinypages.tex', 'tinypages Documentation',
-   'Matplotlib developers', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output ---------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'tinypages', 'tinypages Documentation',
-     ['Matplotlib developers'], 1)
-]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output -------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-  ('index', 'tinypages', 'tinypages Documentation',
-   'Matplotlib developers', 'tinypages', 'One line description of project.',
-   'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
-
-# If true, do not generate a @detailmenu in the "Top" node's menu.
-#texinfo_no_detailmenu = False
diff --git a/lib/matplotlib/tests/tinypages/included_plot_21.rst b/lib/matplotlib/tests/tinypages/included_plot_21.rst
new file mode 100644
index 000000000000..761beae6c02d
--- /dev/null
+++ b/lib/matplotlib/tests/tinypages/included_plot_21.rst
@@ -0,0 +1,6 @@
+Plot 21 has length 6
+
+.. plot::
+
+    plt.plot(range(6))
+
diff --git a/lib/matplotlib/tests/tinypages/some_plots.rst b/lib/matplotlib/tests/tinypages/some_plots.rst
index 514552decfee..6f90c3976044 100644
--- a/lib/matplotlib/tests/tinypages/some_plots.rst
+++ b/lib/matplotlib/tests/tinypages/some_plots.rst
@@ -15,11 +15,16 @@ Plot 2 doesn't use context either; has length 6:
 
     plt.plot(range(6))
 
-Plot 3 has length 4:
+Plot 3 has length 4, and uses doctest syntax:
 
 .. plot::
+    :format: doctest
 
-    plt.plot(range(4))
+    This is a doctest...
+
+    >>> plt.plot(range(4))
+
+    ... isn't it?
 
 Plot 4 shows that a new block with context does not see the variable defined
 in the no-context block:
@@ -115,9 +120,11 @@ Plot 14 uses ``include-source``:
 
     # Only a comment
 
-Plot 15 uses an external file with the plot commands and a caption:
+Plot 15 uses an external file with the plot commands and a caption (the
+encoding is ignored and just verifies the deprecation is not broken):
 
 .. plot:: range4.py
+   :encoding: utf-8
 
    This is the caption for plot 15.
 
@@ -161,3 +168,8 @@ scenario:
 
    plt.figure()
    plt.plot(range(4))
+ 
+Plot 21 is generated via an include directive:
+
+.. include:: included_plot_21.rst
+
diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py
index 495635eadd17..f53377cf5597 100644
--- a/lib/matplotlib/texmanager.py
+++ b/lib/matplotlib/texmanager.py
@@ -1,43 +1,58 @@
 r"""
-Support for embedded TeX expressions in Matplotlib via dvipng and dvips for the
-raster and PostScript backends.  The tex and dvipng/dvips information is cached
-in ~/.matplotlib/tex.cache for reuse between sessions.
+Support for embedded TeX expressions in Matplotlib.
 
 Requirements:
 
-* LaTeX
-* \*Agg backends: dvipng>=1.6
-* PS backend: psfrag, dvips, and Ghostscript>=9.0
-
-For raster output, you can get RGBA numpy arrays from TeX expressions
-as follows::
-
-  texmanager = TexManager()
-  s = "\TeX\ is Number $\displaystyle\sum_{n=1}^\infty\frac{-e^{i\pi}}{2^n}$!"
-  Z = texmanager.get_rgba(s, fontsize=12, dpi=80, rgb=(1, 0, 0))
+* LaTeX.
+* \*Agg backends: dvipng>=1.6.
+* PS backend: PSfrag, dvips, and Ghostscript>=9.0.
+* PDF and SVG backends: if LuaTeX is present, it will be used to speed up some
+  post-processing steps, but note that it is not used to parse the TeX string
+  itself (only LaTeX is supported).
 
 To enable TeX rendering of all text in your Matplotlib figure, set
 :rc:`text.usetex` to True.
+
+TeX and dvipng/dvips processing results are cached
+in ~/.matplotlib/tex.cache for reuse between sessions.
+
+`TexManager.get_rgba` can also be used to directly obtain raster output as RGBA
+NumPy arrays.
 """
 
 import functools
-import glob
 import hashlib
 import logging
 import os
 from pathlib import Path
-import re
 import subprocess
 from tempfile import TemporaryDirectory
 
 import numpy as np
 
 import matplotlib as mpl
-from matplotlib import _api, cbook, dviread, rcParams
+from matplotlib import _api, cbook, dviread
 
 _log = logging.getLogger(__name__)
 
 
+def _usepackage_if_not_loaded(package, *, option=None):
+    """
+    Output LaTeX code that loads a package (possibly with an option) if it
+    hasn't been loaded yet.
+
+    LaTeX cannot load twice a package with different options, so this helper
+    can be used to protect against users loading arbitrary packages/options in
+    their custom preamble.
+    """
+    option = f"[{option}]" if option is not None else ""
+    return (
+        r"\makeatletter"
+        r"\@ifpackageloaded{%(package)s}{}{\usepackage%(option)s{%(package)s}}"
+        r"\makeatother"
+    ) % {"package": package, "option": option}
+
+
 class TexManager:
     """
     Convert strings to dvi files using TeX, caching the results to a directory.
@@ -45,212 +60,198 @@ class TexManager:
     Repeated calls to this constructor always return the same instance.
     """
 
-    # Caches.
     texcache = os.path.join(mpl.get_cachedir(), 'tex.cache')
-    grey_arrayd = {}
-
-    font_family = 'serif'
-    font_families = ('serif', 'sans-serif', 'cursive', 'monospace')
-
-    font_info = {
-        'new century schoolbook': ('pnc', r'\renewcommand{\rmdefault}{pnc}'),
-        'bookman': ('pbk', r'\renewcommand{\rmdefault}{pbk}'),
-        'times': ('ptm', r'\usepackage{mathptmx}'),
-        'palatino': ('ppl', r'\usepackage{mathpazo}'),
-        'zapf chancery': ('pzc', r'\usepackage{chancery}'),
-        'cursive': ('pzc', r'\usepackage{chancery}'),
-        'charter': ('pch', r'\usepackage{charter}'),
-        'serif': ('cmr', ''),
-        'sans-serif': ('cmss', ''),
-        'helvetica': ('phv', r'\usepackage{helvet}'),
-        'avant garde': ('pag', r'\usepackage{avant}'),
-        'courier': ('pcr', r'\usepackage{courier}'),
+    _grey_arrayd = {}
+
+    _font_families = ('serif', 'sans-serif', 'cursive', 'monospace')
+    _font_preambles = {
+        'new century schoolbook': r'\renewcommand{\rmdefault}{pnc}',
+        'bookman': r'\renewcommand{\rmdefault}{pbk}',
+        'times': r'\usepackage{mathptmx}',
+        'palatino': r'\usepackage{mathpazo}',
+        'zapf chancery': r'\usepackage{chancery}',
+        'cursive': r'\usepackage{chancery}',
+        'charter': r'\usepackage{charter}',
+        'serif': '',
+        'sans-serif': '',
+        '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
+        # 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': ('cmtt', r'\usepackage{type1ec}'),
-        'computer modern roman': ('cmr', r'\usepackage{type1ec}'),
-        'computer modern sans serif': ('cmss', r'\usepackage{type1ec}'),
-        'computer modern typewriter': ('cmtt', r'\usepackage{type1ec}')}
-
-    cachedir = _api.deprecated(
-        "3.3", alternative="matplotlib.get_cachedir()")(
-            property(lambda self: mpl.get_cachedir()))
-    rgba_arrayd = _api.deprecated("3.3")(property(lambda self: {}))
-    _fonts = {}  # Only for deprecation period.
-    serif = _api.deprecated("3.3")(property(
-        lambda self: self._fonts.get("serif", ('cmr', ''))))
-    sans_serif = _api.deprecated("3.3")(property(
-        lambda self: self._fonts.get("sans-serif", ('cmss', ''))))
-    cursive = _api.deprecated("3.3")(property(
-        lambda self:
-        self._fonts.get("cursive", ('pzc', r'\usepackage{chancery}'))))
-    monospace = _api.deprecated("3.3")(property(
-        lambda self: self._fonts.get("monospace", ('cmtt', ''))))
+        'monospace': r'\usepackage{type1ec}',
+        'computer modern roman': r'\usepackage{type1ec}',
+        'computer modern sans serif': r'\usepackage{type1ec}',
+        'computer modern typewriter': r'\usepackage{type1ec}',
+    }
+    _font_types = {
+        'new century schoolbook': 'serif',
+        'bookman': 'serif',
+        'times': 'serif',
+        'palatino': 'serif',
+        'zapf chancery': 'cursive',
+        'charter': 'serif',
+        'helvetica': 'sans-serif',
+        'avant garde': 'sans-serif',
+        'courier': 'monospace',
+        'computer modern roman': 'serif',
+        'computer modern sans serif': 'sans-serif',
+        'computer modern typewriter': 'monospace',
+    }
+
+    grey_arrayd = _api.deprecate_privatize_attribute("3.5")
+    font_family = _api.deprecate_privatize_attribute("3.5")
+    font_families = _api.deprecate_privatize_attribute("3.5")
+    font_info = _api.deprecate_privatize_attribute("3.5")
 
     @functools.lru_cache()  # Always return the same instance.
     def __new__(cls):
         Path(cls.texcache).mkdir(parents=True, exist_ok=True)
         return object.__new__(cls)
 
+    @_api.deprecated("3.6")
     def get_font_config(self):
-        ff = rcParams['font.family']
-        if len(ff) == 1 and ff[0].lower() in self.font_families:
-            self.font_family = ff[0].lower()
+        preamble, font_cmd = self._get_font_preamble_and_command()
+        # Add a hash of the latex preamble to fontconfig so that the
+        # correct png is selected for strings rendered with same font and dpi
+        # even if the latex preamble changes within the session
+        preambles = preamble + font_cmd + self.get_custom_preamble()
+        return hashlib.md5(preambles.encode('utf-8')).hexdigest()
+
+    @classmethod
+    def _get_font_family_and_reduced(cls):
+        """Return the font family name and whether the font is reduced."""
+        ff = mpl.rcParams['font.family']
+        ff_val = ff[0].lower() if len(ff) == 1 else None
+        if len(ff) == 1 and ff_val in cls._font_families:
+            return ff_val, False
+        elif len(ff) == 1 and ff_val in cls._font_preambles:
+            return cls._font_types[ff_val], True
         else:
             _log.info('font.family must be one of (%s) when text.usetex is '
                       'True. serif will be used by default.',
-                      ', '.join(self.font_families))
-            self.font_family = 'serif'
-
-        fontconfig = [self.font_family]
-        for font_family in self.font_families:
-            for font in rcParams['font.' + font_family]:
-                if font.lower() in self.font_info:
-                    self._fonts[font_family] = self.font_info[font.lower()]
-                    _log.debug('family: %s, font: %s, info: %s',
-                               font_family, font, self.font_info[font.lower()])
-                    break
-                else:
-                    _log.debug('%s font is not compatible with usetex.', font)
+                      ', '.join(cls._font_families))
+            return 'serif', False
+
+    @classmethod
+    def _get_font_preamble_and_command(cls):
+        requested_family, is_reduced_font = cls._get_font_family_and_reduced()
+
+        preambles = {}
+        for font_family in cls._font_families:
+            if is_reduced_font and font_family == requested_family:
+                preambles[font_family] = cls._font_preambles[
+                    mpl.rcParams['font.family'][0].lower()]
             else:
-                _log.info('No LaTeX-compatible font found for the %s font '
-                          'family in rcParams. Using default.', font_family)
-                self._fonts[font_family] = self.font_info[font_family]
-            fontconfig.append(self._fonts[font_family][0])
-        # Add a hash of the latex preamble to fontconfig so that the
-        # correct png is selected for strings rendered with same font and dpi
-        # even if the latex preamble changes within the session
-        preamble_bytes = self.get_custom_preamble().encode('utf-8')
-        fontconfig.append(hashlib.md5(preamble_bytes).hexdigest())
+                for font in mpl.rcParams['font.' + font_family]:
+                    if font.lower() in cls._font_preambles:
+                        preambles[font_family] = \
+                            cls._font_preambles[font.lower()]
+                        _log.debug(
+                            'family: %s, font: %s, info: %s',
+                            font_family, font,
+                            cls._font_preambles[font.lower()])
+                        break
+                    else:
+                        _log.debug('%s font is not compatible with usetex.',
+                                   font)
+                else:
+                    _log.info('No LaTeX-compatible font found for the %s font'
+                              'family in rcParams. Using default.',
+                              font_family)
+                    preambles[font_family] = cls._font_preambles[font_family]
 
         # The following packages and commands need to be included in the latex
         # file's preamble:
-        cmd = [self._fonts['serif'][1],
-               self._fonts['sans-serif'][1],
-               self._fonts['monospace'][1]]
-        if self.font_family == 'cursive':
-            cmd.append(self._fonts['cursive'][1])
-        self._font_preamble = '\n'.join([r'\usepackage{type1cm}', *cmd])
-
-        return ''.join(fontconfig)
-
-    def get_basefile(self, tex, fontsize, dpi=None):
+        cmd = {preambles[family]
+               for family in ['serif', 'sans-serif', 'monospace']}
+        if requested_family == 'cursive':
+            cmd.add(preambles['cursive'])
+        cmd.add(r'\usepackage{type1cm}')
+        preamble = '\n'.join(sorted(cmd))
+        fontcmd = (r'\sffamily' if requested_family == 'sans-serif' else
+                   r'\ttfamily' if requested_family == 'monospace' else
+                   r'\rmfamily')
+        return preamble, fontcmd
+
+    @classmethod
+    def get_basefile(cls, tex, fontsize, dpi=None):
         """
         Return a filename based on a hash of the string, fontsize, and dpi.
         """
-        s = ''.join([tex, self.get_font_config(), '%f' % fontsize,
-                     self.get_custom_preamble(), str(dpi or '')])
+        src = cls._get_tex_source(tex, fontsize) + str(dpi)
         return os.path.join(
-            self.texcache, hashlib.md5(s.encode('utf-8')).hexdigest())
+            cls.texcache, hashlib.md5(src.encode('utf-8')).hexdigest())
 
-    def get_font_preamble(self):
+    @classmethod
+    def get_font_preamble(cls):
         """
         Return a string containing font configuration for the tex preamble.
         """
-        return self._font_preamble
+        font_preamble, command = cls._get_font_preamble_and_command()
+        return font_preamble
 
-    def get_custom_preamble(self):
+    @classmethod
+    def get_custom_preamble(cls):
         """Return a string containing user additions to the tex preamble."""
-        return rcParams['text.latex.preamble']
+        return mpl.rcParams['text.latex.preamble']
 
-    def _get_preamble(self):
+    @classmethod
+    def _get_tex_source(cls, tex, fontsize):
+        """Return the complete TeX source for processing a TeX string."""
+        font_preamble, fontcmd = cls._get_font_preamble_and_command()
+        baselineskip = 1.25 * fontsize
         return "\n".join([
             r"\documentclass{article}",
-            # Pass-through \mathdefault, which is used in non-usetex mode to
-            # use the default text font but was historically suppressed in
-            # usetex mode.
+            r"% Pass-through \mathdefault, which is used in non-usetex mode",
+            r"% to use the default text font but was historically suppressed",
+            r"% in usetex mode.",
             r"\newcommand{\mathdefault}[1]{#1}",
-            self._font_preamble,
+            font_preamble,
             r"\usepackage[utf8]{inputenc}",
             r"\DeclareUnicodeCharacter{2212}{\ensuremath{-}}",
-            # geometry is loaded before the custom preamble as convert_psfrags
-            # relies on a custom preamble to change the geometry.
+            r"% geometry is loaded before the custom preamble as ",
+            r"% convert_psfrags relies on a custom preamble to change the ",
+            r"% geometry.",
             r"\usepackage[papersize=72in, margin=1in]{geometry}",
-            self.get_custom_preamble(),
-            # textcomp is loaded last (if not already loaded by the custom
-            # preamble) in order not to clash with custom packages (e.g.
-            # newtxtext) which load it with different options.
-            r"\makeatletter"
-            r"\@ifpackageloaded{textcomp}{}{\usepackage{textcomp}}"
-            r"\makeatother",
+            cls.get_custom_preamble(),
+            r"% Use `underscore` package to take care of underscores in text.",
+            r"% The [strings] option allows to use underscores in file names.",
+            _usepackage_if_not_loaded("underscore", option="strings"),
+            r"% Custom packages (e.g. newtxtext) may already have loaded ",
+            r"% textcomp with different options.",
+            _usepackage_if_not_loaded("textcomp"),
+            r"\pagestyle{empty}",
+            r"\begin{document}",
+            r"% The empty hbox ensures that a page is printed even for empty",
+            r"% inputs, except when using psfrag which gets confused by it.",
+            r"% matplotlibbaselinemarker is used by dviread to detect the",
+            r"% last line's baseline.",
+            rf"\fontsize{{{fontsize}}}{{{baselineskip}}}%",
+            r"\ifdefined\psfrag\else\hbox{}\fi%",
+            rf"{{{fontcmd} {tex}}}%",
+            r"\end{document}",
         ])
 
-    def make_tex(self, tex, fontsize):
-        """
-        Generate a tex file to render the tex string at a specific font size.
-
-        Return the file name.
-        """
-        basefile = self.get_basefile(tex, fontsize)
-        texfile = '%s.tex' % basefile
-        fontcmd = {'sans-serif': r'{\sffamily %s}',
-                   'monospace': r'{\ttfamily %s}'}.get(self.font_family,
-                                                       r'{\rmfamily %s}')
-
-        Path(texfile).write_text(
-            r"""
-%s
-\pagestyle{empty}
-\begin{document}
-%% The empty hbox ensures that a page is printed even for empty inputs, except
-%% when using psfrag which gets confused by it.
-\fontsize{%f}{%f}%%
-\ifdefined\psfrag\else\hbox{}\fi%%
-%s
-\end{document}
-""" % (self._get_preamble(), fontsize, fontsize * 1.25, fontcmd % tex),
-            encoding='utf-8')
-
-        return texfile
-
-    _re_vbox = re.compile(
-        r"MatplotlibBox:\(([\d.]+)pt\+([\d.]+)pt\)x([\d.]+)pt")
-
-    @_api.deprecated("3.3")
-    def make_tex_preview(self, tex, fontsize):
+    @classmethod
+    def make_tex(cls, tex, fontsize):
         """
         Generate a tex file to render the tex string at a specific font size.
 
-        It uses the preview.sty to determine the dimension (width, height,
-        descent) of the output.
-
         Return the file name.
         """
-        basefile = self.get_basefile(tex, fontsize)
-        texfile = '%s.tex' % basefile
-        fontcmd = {'sans-serif': r'{\sffamily %s}',
-                   'monospace': r'{\ttfamily %s}'}.get(self.font_family,
-                                                       r'{\rmfamily %s}')
-
-        # newbox, setbox, immediate, etc. are used to find the box
-        # extent of the rendered text.
-
-        Path(texfile).write_text(
-            r"""
-%s
-\usepackage[active,showbox,tightpage]{preview}
-
-%% we override the default showbox as it is treated as an error and makes
-%% the exit status not zero
-\def\showbox#1%%
-{\immediate\write16{MatplotlibBox:(\the\ht#1+\the\dp#1)x\the\wd#1}}
-
-\begin{document}
-\begin{preview}
-{\fontsize{%f}{%f}%s}
-\end{preview}
-\end{document}
-""" % (self._get_preamble(), fontsize, fontsize * 1.25, fontcmd % tex),
-            encoding='utf-8')
-
+        texfile = cls.get_basefile(tex, fontsize) + ".tex"
+        Path(texfile).write_text(cls._get_tex_source(tex, fontsize),
+                                 encoding='utf-8')
         return texfile
 
-    def _run_checked_subprocess(self, command, tex, *, cwd=None):
+    @classmethod
+    def _run_checked_subprocess(cls, command, tex, *, cwd=None):
         _log.debug(cbook._pformat_subprocess(command))
         try:
             report = subprocess.check_output(
-                command, cwd=cwd if cwd is not None else self.texcache,
+                command, cwd=cwd if cwd is not None else cls.texcache,
                 stderr=subprocess.STDOUT)
         except FileNotFoundError as exc:
             raise RuntimeError(
@@ -260,144 +261,107 @@ def _run_checked_subprocess(self, command, tex, *, cwd=None):
             raise RuntimeError(
                 '{prog} was not able to process the following string:\n'
                 '{tex!r}\n\n'
-                'Here is the full report generated by {prog}:\n'
+                'Here is the full command invocation and its output:\n\n'
+                '{format_command}\n\n'
                 '{exc}\n\n'.format(
                     prog=command[0],
+                    format_command=cbook._pformat_subprocess(command),
                     tex=tex.encode('unicode_escape'),
-                    exc=exc.output.decode('utf-8'))) from exc
+                    exc=exc.output.decode('utf-8', 'backslashreplace'))
+                ) from None
         _log.debug(report)
         return report
 
-    def make_dvi(self, tex, fontsize):
+    @classmethod
+    def make_dvi(cls, tex, fontsize):
         """
         Generate a dvi file containing latex's layout of tex string.
 
         Return the file name.
         """
-
-        if dict.__getitem__(rcParams, 'text.latex.preview'):
-            return self.make_dvi_preview(tex, fontsize)
-
-        basefile = self.get_basefile(tex, fontsize)
+        basefile = cls.get_basefile(tex, fontsize)
         dvifile = '%s.dvi' % basefile
         if not os.path.exists(dvifile):
-            texfile = self.make_tex(tex, fontsize)
+            texfile = Path(cls.make_tex(tex, fontsize))
             # Generate the dvi in a temporary directory to avoid race
             # conditions e.g. if multiple processes try to process the same tex
             # string at the same time.  Having tmpdir be a subdirectory of the
             # final output dir ensures that they are on the same filesystem,
-            # and thus replace() works atomically.
+            # and thus replace() works atomically.  It also allows referring to
+            # the texfile with a relative path (for pathological MPLCONFIGDIRs,
+            # the absolute path may contain characters (e.g. ~) that TeX does
+            # not support.)
             with TemporaryDirectory(dir=Path(dvifile).parent) as tmpdir:
-                self._run_checked_subprocess(
+                cls._run_checked_subprocess(
                     ["latex", "-interaction=nonstopmode", "--halt-on-error",
-                     texfile], tex, cwd=tmpdir)
+                     f"../{texfile.name}"], tex, cwd=tmpdir)
                 (Path(tmpdir) / Path(dvifile).name).replace(dvifile)
         return dvifile
 
-    @_api.deprecated("3.3")
-    def make_dvi_preview(self, tex, fontsize):
-        """
-        Generate a dvi file containing latex's layout of tex string.
-
-        It calls make_tex_preview() method and store the size information
-        (width, height, descent) in a separate file.
-
-        Return the file name.
-        """
-        basefile = self.get_basefile(tex, fontsize)
-        dvifile = '%s.dvi' % basefile
-        baselinefile = '%s.baseline' % basefile
-
-        if not os.path.exists(dvifile) or not os.path.exists(baselinefile):
-            texfile = self.make_tex_preview(tex, fontsize)
-            report = self._run_checked_subprocess(
-                ["latex", "-interaction=nonstopmode", "--halt-on-error",
-                 texfile], tex)
-
-            # find the box extent information in the latex output
-            # file and store them in ".baseline" file
-            m = TexManager._re_vbox.search(report.decode("utf-8"))
-            with open(basefile + '.baseline', "w") as fh:
-                fh.write(" ".join(m.groups()))
-
-            for fname in glob.glob(basefile + '*'):
-                if not fname.endswith(('dvi', 'tex', 'baseline')):
-                    try:
-                        os.remove(fname)
-                    except OSError:
-                        pass
-
-        return dvifile
-
-    def make_png(self, tex, fontsize, dpi):
+    @classmethod
+    def make_png(cls, tex, fontsize, dpi):
         """
         Generate a png file containing latex's rendering of tex string.
 
         Return the file name.
         """
-        basefile = self.get_basefile(tex, fontsize, dpi)
+        basefile = cls.get_basefile(tex, fontsize, dpi)
         pngfile = '%s.png' % basefile
         # see get_rgba for a discussion of the background
         if not os.path.exists(pngfile):
-            dvifile = self.make_dvi(tex, fontsize)
+            dvifile = cls.make_dvi(tex, fontsize)
             cmd = ["dvipng", "-bg", "Transparent", "-D", str(dpi),
                    "-T", "tight", "-o", pngfile, dvifile]
             # When testing, disable FreeType rendering for reproducibility; but
             # dvipng 1.16 has a bug (fixed in f3ff241) that breaks --freetype0
             # mode, so for it we keep FreeType enabled; the image will be
             # slightly off.
-            if (getattr(mpl, "_called_from_pytest", False)
-                    and mpl._get_executable_info("dvipng").version != "1.16"):
+            if (getattr(mpl, "_called_from_pytest", False) and
+                    mpl._get_executable_info("dvipng").raw_version != "1.16"):
                 cmd.insert(1, "--freetype0")
-            self._run_checked_subprocess(cmd, tex)
+            cls._run_checked_subprocess(cmd, tex)
         return pngfile
 
-    def get_grey(self, tex, fontsize=None, dpi=None):
+    @classmethod
+    def get_grey(cls, tex, fontsize=None, dpi=None):
         """Return the alpha channel."""
         if not fontsize:
-            fontsize = rcParams['font.size']
+            fontsize = mpl.rcParams['font.size']
         if not dpi:
-            dpi = rcParams['savefig.dpi']
-        key = tex, self.get_font_config(), fontsize, dpi
-        alpha = self.grey_arrayd.get(key)
+            dpi = mpl.rcParams['savefig.dpi']
+        key = cls._get_tex_source(tex, fontsize), dpi
+        alpha = cls._grey_arrayd.get(key)
         if alpha is None:
-            pngfile = self.make_png(tex, fontsize, dpi)
-            rgba = mpl.image.imread(os.path.join(self.texcache, pngfile))
-            self.grey_arrayd[key] = alpha = rgba[:, :, -1]
+            pngfile = cls.make_png(tex, fontsize, dpi)
+            rgba = mpl.image.imread(os.path.join(cls.texcache, pngfile))
+            cls._grey_arrayd[key] = alpha = rgba[:, :, -1]
         return alpha
 
-    def get_rgba(self, tex, fontsize=None, dpi=None, rgb=(0, 0, 0)):
-        """Return latex's rendering of the tex string as an rgba array."""
-        alpha = self.get_grey(tex, fontsize, dpi)
+    @classmethod
+    def get_rgba(cls, tex, fontsize=None, dpi=None, rgb=(0, 0, 0)):
+        r"""
+        Return latex's rendering of the tex string as an rgba array.
+
+        Examples
+        --------
+        >>> texmanager = TexManager()
+        >>> s = r"\TeX\ is $\displaystyle\sum_n\frac{-e^{i\pi}}{2^n}$!"
+        >>> Z = texmanager.get_rgba(s, fontsize=12, dpi=80, rgb=(1, 0, 0))
+        """
+        alpha = cls.get_grey(tex, fontsize, dpi)
         rgba = np.empty((*alpha.shape, 4))
         rgba[..., :3] = mpl.colors.to_rgb(rgb)
         rgba[..., -1] = alpha
         return rgba
 
-    def get_text_width_height_descent(self, tex, fontsize, renderer=None):
+    @classmethod
+    def get_text_width_height_descent(cls, tex, fontsize, renderer=None):
         """Return width, height and descent of the text."""
         if tex.strip() == '':
             return 0, 0, 0
-
+        dvifile = cls.make_dvi(tex, fontsize)
         dpi_fraction = renderer.points_to_pixels(1.) if renderer else 1
-
-        if dict.__getitem__(rcParams, 'text.latex.preview'):
-            # use preview.sty
-            basefile = self.get_basefile(tex, fontsize)
-            baselinefile = '%s.baseline' % basefile
-
-            if not os.path.exists(baselinefile):
-                dvifile = self.make_dvi_preview(tex, fontsize)
-
-            with open(baselinefile) as fh:
-                l = fh.read().split()
-            height, depth, width = [float(l1) * dpi_fraction for l1 in l]
-            return width, height + depth, depth
-
-        else:
-            # use dviread.
-            dvifile = self.make_dvi(tex, fontsize)
-            with dviread.Dvi(dvifile, 72 * dpi_fraction) as dvi:
-                page, = dvi
-            # A total height (including the descent) needs to be returned.
-            return page.width, page.height + page.descent, page.descent
+        with dviread.Dvi(dvifile, 72 * dpi_fraction) as dvi:
+            page, = dvi
+        # A total height (including the descent) needs to be returned.
+        return page.width, page.height + page.descent, page.descent
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
index 1714cc5901c4..ccf6ce879b2a 100644
--- a/lib/matplotlib/text.py
+++ b/lib/matplotlib/text.py
@@ -2,19 +2,20 @@
 Classes for including text in a figure.
 """
 
-import contextlib
+import functools
 import logging
 import math
+from numbers import Real
 import weakref
 
 import numpy as np
 
 import matplotlib as mpl
-from . import _api, artist, cbook, docstring
+from . import _api, artist, cbook, _docstring
 from .artist import Artist
 from .font_manager import FontProperties
 from .patches import FancyArrowPatch, FancyBboxPatch, Rectangle
-from .textpath import TextPath  # Unused, but imported by others.
+from .textpath import TextPath  # noqa # Unused, but imported by others.
 from .transforms import (
     Affine2D, Bbox, BboxBase, BboxTransformTo, IdentityTransform, Transform)
 
@@ -22,21 +23,7 @@
 _log = logging.getLogger(__name__)
 
 
-@contextlib.contextmanager
-def _wrap_text(textobj):
-    """Temporarily inserts newlines if the wrap option is enabled."""
-    if textobj.get_wrap():
-        old_text = textobj.get_text()
-        try:
-            textobj.set_text(textobj._get_wrapped_text())
-            yield textobj
-        finally:
-            textobj.set_text(old_text)
-    else:
-        yield textobj
-
-
-# Extracted from Text's method to serve as a function
+@_api.deprecated("3.6")
 def get_rotation(rotation):
     """
     Return *rotation* normalized to an angle between 0 and 360 degrees.
@@ -103,7 +90,23 @@ def _get_textbox(text, renderer):
     return x_box, y_box, w_box, h_box
 
 
-@cbook._define_aliases({
+def _get_text_metrics_with_cache(renderer, text, fontprop, ismath, dpi):
+    """Call ``renderer.get_text_width_height_descent``, caching the results."""
+    # Cached based on a copy of fontprop so that later in-place mutations of
+    # the passed-in argument do not mess up the cache.
+    return _get_text_metrics_with_cache_impl(
+        weakref.ref(renderer), text, fontprop.copy(), ismath, dpi)
+
+
+@functools.lru_cache(4096)
+def _get_text_metrics_with_cache_impl(
+        renderer_ref, text, fontprop, ismath, dpi):
+    # dpi is unused, but participates in cache invalidation (via the renderer).
+    return renderer_ref().get_text_width_height_descent(text, fontprop, ismath)
+
+
+@_docstring.interpd
+@_api.define_aliases({
     "color": ["c"],
     "fontfamily": ["family"],
     "fontproperties": ["font", "font_properties"],
@@ -121,11 +124,11 @@ class Text(Artist):
     """Handle storing and drawing of text in window or data coordinates."""
 
     zorder = 3
-    _cached = cbook.maxdict(50)
 
     def __repr__(self):
         return "Text(%s, %s, %s)" % (self._x, self._y, repr(self._text))
 
+    @_api.make_keyword_only("3.6", name="color")
     def __init__(self,
                  x=0, y=0, text='',
                  color=None,           # defaults to rc params
@@ -139,14 +142,24 @@ def __init__(self,
                  usetex=None,          # defaults to rcParams['text.usetex']
                  wrap=False,
                  transform_rotates_text=False,
+                 *,
+                 parse_math=None,    # defaults to rcParams['text.parse_math']
                  **kwargs
                  ):
         """
         Create a `.Text` instance at *x*, *y* with string *text*.
 
+        The text is aligned relative to the anchor point (*x*, *y*) according
+        to ``horizontalalignment`` (default: 'left') and ``verticalalignment``
+        (default: 'bottom'). See also
+        :doc:`/gallery/text_labels_and_annotations/text_alignment`.
+
+        While Text accepts the 'label' keyword argument, by default it is not
+        added to the handles of a legend.
+
         Valid keyword arguments are:
 
-        %(Text_kwdoc)s
+        %(Text:kwdoc)s
         """
         super().__init__()
         self._x, self._y = x, y
@@ -156,24 +169,25 @@ def __init__(self,
             color if color is not None else mpl.rcParams["text.color"])
         self.set_fontproperties(fontproperties)
         self.set_usetex(usetex)
+        self.set_parse_math(parse_math if parse_math is not None else
+                            mpl.rcParams['text.parse_math'])
         self.set_wrap(wrap)
         self.set_verticalalignment(verticalalignment)
         self.set_horizontalalignment(horizontalalignment)
         self._multialignment = multialignment
-        self._rotation = rotation
+        self.set_rotation(rotation)
         self._transform_rotates_text = transform_rotates_text
         self._bbox_patch = None  # a FancyBboxPatch instance
         self._renderer = None
         if linespacing is None:
-            linespacing = 1.2   # Maybe use rcParam later.
-        self._linespacing = linespacing
+            linespacing = 1.2  # Maybe use rcParam later.
+        self.set_linespacing(linespacing)
         self.set_rotation_mode(rotation_mode)
         self.update(kwargs)
 
     def update(self, kwargs):
         # docstring inherited
-        # make a copy so we do not mutate user input!
-        kwargs = dict(kwargs)
+        kwargs = cbook.normalize_kwargs(kwargs, Text)
         sentinel = object()  # bbox can be None, so use another sentinel.
         # Update fontproperties first, as it has lowest priority.
         fontproperties = kwargs.pop("fontproperties", sentinel)
@@ -236,13 +250,10 @@ def _get_multialignment(self):
     def get_rotation(self):
         """Return the text angle in degrees between 0 and 360."""
         if self.get_transform_rotates_text():
-            angle = get_rotation(self._rotation)
-            x, y = self.get_unitless_position()
-            angles = [angle, ]
-            pts = [[x, y]]
-            return self.get_transform().transform_angles(angles, pts).item(0)
+            return self.get_transform().transform_angles(
+                [self._rotation], [self.get_unitless_position()]).item(0)
         else:
-            return get_rotation(self._rotation)  # string_or_number -> number
+            return self._rotation
 
     def get_transform_rotates_text(self):
         """
@@ -290,10 +301,6 @@ def _get_layout(self, renderer):
         multiple-alignment information. Note that it returns an extent
         of a rotated text when necessary.
         """
-        key = self.get_prop_tup(renderer=renderer)
-        if key in self._cached:
-            return self._cached[key]
-
         thisx, thisy = 0.0, 0.0
         lines = self.get_text().split("\n")  # Ensures lines is not empty.
 
@@ -303,16 +310,17 @@ def _get_layout(self, renderer):
         ys = []
 
         # Full vertical extent of font, including ascenders and descenders:
-        _, lp_h, lp_d = renderer.get_text_width_height_descent(
-            "lp", self._fontproperties,
-            ismath="TeX" if self.get_usetex() else False)
+        _, lp_h, lp_d = _get_text_metrics_with_cache(
+            renderer, "lp", self._fontproperties,
+            ismath="TeX" if self.get_usetex() else False, dpi=self.figure.dpi)
         min_dy = (lp_h - lp_d) * self._linespacing
 
         for i, line in enumerate(lines):
             clean_line, ismath = self._preprocess_math(line)
             if clean_line:
-                w, h, d = renderer.get_text_width_height_descent(
-                    clean_line, self._fontproperties, ismath=ismath)
+                w, h, d = _get_text_metrics_with_cache(
+                    renderer, clean_line, self._fontproperties,
+                    ismath=ismath, dpi=self.figure.dpi)
             else:
                 w = h = d = 0
 
@@ -349,7 +357,6 @@ def _get_layout(self, renderer):
         xmax = width
         ymax = 0
         ymin = ys[-1] - descent  # baseline of last line minus its descent
-        height = ymax - ymin
 
         # get the rotation matrix
         M = Affine2D().rotate_deg(self.get_rotation())
@@ -437,9 +444,7 @@ def _get_layout(self, renderer):
         # now rotate the positions around the first (x, y) position
         xys = M.transform(offset_layout) - (offsetx, offsety)
 
-        ret = bbox, list(zip(lines, zip(ws, hs), *xys.T)), descent
-        self._cached[key] = ret
-        return ret
+        return bbox, list(zip(lines, zip(ws, hs), *xys.T)), descent
 
     def set_bbox(self, rectprops):
         """
@@ -616,9 +621,12 @@ def _get_rendered_text_width(self, text):
 
     def _get_wrapped_text(self):
         """
-        Return a copy of the text with new lines added, so that
-        the text is wrapped relative to the parent figure.
+        Return a copy of the text string with new lines added so that the text
+        is wrapped relative to the parent figure (if `get_wrap` is True).
         """
+        if not self.get_wrap():
+            return self.get_text()
+
         # Not fit to handle breaking up latex syntax correctly, so
         # ignore latex for now.
         if self.get_usetex():
@@ -675,14 +683,14 @@ def draw(self, renderer):
 
         renderer.open_group('text', self.get_gid())
 
-        with _wrap_text(self) as textobj:
-            bbox, info, descent = textobj._get_layout(renderer)
-            trans = textobj.get_transform()
+        with self._cm_set(text=self._get_wrapped_text()):
+            bbox, info, descent = self._get_layout(renderer)
+            trans = self.get_transform()
 
-            # don't use textobj.get_position here, which refers to text
+            # don't use self.get_position here, which refers to text
             # position in Text:
-            posx = float(textobj.convert_xunits(textobj._x))
-            posy = float(textobj.convert_yunits(textobj._y))
+            posx = float(self.convert_xunits(self._x))
+            posy = float(self.convert_yunits(self._y))
             posx, posy = trans.transform((posx, posy))
             if not np.isfinite(posx) or not np.isfinite(posy):
                 _log.warning("posx and posy should be finite values")
@@ -691,41 +699,41 @@ def draw(self, renderer):
 
             # Update the location and size of the bbox
             # (`.patches.FancyBboxPatch`), and draw it.
-            if textobj._bbox_patch:
+            if self._bbox_patch:
                 self.update_bbox_position_size(renderer)
                 self._bbox_patch.draw(renderer)
 
             gc = renderer.new_gc()
-            gc.set_foreground(textobj.get_color())
-            gc.set_alpha(textobj.get_alpha())
-            gc.set_url(textobj._url)
-            textobj._set_gc_clip(gc)
+            gc.set_foreground(self.get_color())
+            gc.set_alpha(self.get_alpha())
+            gc.set_url(self._url)
+            self._set_gc_clip(gc)
 
-            angle = textobj.get_rotation()
+            angle = self.get_rotation()
 
             for line, wh, x, y in info:
 
-                mtext = textobj if len(info) == 1 else None
+                mtext = self if len(info) == 1 else None
                 x = x + posx
                 y = y + posy
                 if renderer.flipy():
                     y = canvash - y
-                clean_line, ismath = textobj._preprocess_math(line)
+                clean_line, ismath = self._preprocess_math(line)
 
-                if textobj.get_path_effects():
+                if self.get_path_effects():
                     from matplotlib.patheffects import PathEffectRenderer
                     textrenderer = PathEffectRenderer(
-                        textobj.get_path_effects(), renderer)
+                        self.get_path_effects(), renderer)
                 else:
                     textrenderer = renderer
 
-                if textobj.get_usetex():
+                if self.get_usetex():
                     textrenderer.draw_tex(gc, x, y, clean_line,
-                                          textobj._fontproperties, angle,
+                                          self._fontproperties, angle,
                                           mtext=mtext)
                 else:
                     textrenderer.draw_text(gc, x, y, clean_line,
-                                           textobj._fontproperties, angle,
+                                           self._fontproperties, angle,
                                            ismath=ismath, mtext=mtext)
 
         gc.restore()
@@ -831,6 +839,8 @@ def get_position(self):
         # specified with 'set_x' and 'set_y'.
         return self._x, self._y
 
+    # When removing, also remove the hash(color) check in set_color()
+    @_api.deprecated("3.5")
     def get_prop_tup(self, renderer=None):
         """
         Return a hashable tuple of properties.
@@ -874,15 +884,15 @@ def get_window_extent(self, renderer=None, dpi=None):
             A renderer is needed to compute the bounding box.  If the artist
             has already been drawn, the renderer is cached; thus, it is only
             necessary to pass this argument when calling `get_window_extent`
-            before the first `draw`.  In practice, it is usually easier to
-            trigger a draw first (e.g. by saving the figure).
+            before the first draw.  In practice, it is usually easier to
+            trigger a draw first, e.g. by calling
+            `~.Figure.draw_without_rendering` or ``plt.show()``.
 
         dpi : float, optional
             The dpi value for computing the bbox, defaults to
             ``self.figure.dpi`` (*not* the renderer dpi); should be set e.g. if
             to match regions with a figure saved with a custom dpi value.
         """
-        #return _unit_box
         if not self.get_visible():
             return Bbox.unit()
         if dpi is None:
@@ -895,9 +905,11 @@ def get_window_extent(self, renderer=None, dpi=None):
         if renderer is not None:
             self._renderer = renderer
         if self._renderer is None:
-            self._renderer = self.figure._cachedRenderer
+            self._renderer = self.figure._get_renderer()
         if self._renderer is None:
-            raise RuntimeError('Cannot get window extent w/o renderer')
+            raise RuntimeError(
+                "Cannot get window extent of text w/o renderer. You likely "
+                "want to call 'figure.draw_without_rendering()' first.")
 
         with cbook._setattr_cm(self.figure, dpi=dpi):
             bbox, info, descent = self._get_layout(self._renderer)
@@ -938,7 +950,8 @@ def set_color(self, color):
         # out at draw time for simplicity.
         if not cbook._str_equal(color, "auto"):
             mpl.colors._check_color_like(color=color)
-        # Make sure it is hashable, or get_prop_tup will fail.
+        # Make sure it is hashable, or get_prop_tup will fail (remove this once
+        # get_prop_tup is removed).
         try:
             hash(color)
         except TypeError:
@@ -948,11 +961,13 @@ def set_color(self, color):
 
     def set_horizontalalignment(self, align):
         """
-        Set the horizontal alignment to one of
+        Set the horizontal alignment relative to the anchor point.
+
+        See also :doc:`/gallery/text_labels_and_annotations/text_alignment`.
 
         Parameters
         ----------
-        align : {'center', 'right', 'left'}
+        align : {'left', 'center', 'right'}
         """
         _api.check_in_list(['center', 'right', 'left'], align=align)
         self._horizontalalignment = align
@@ -984,6 +999,7 @@ def set_linespacing(self, spacing):
         ----------
         spacing : float (multiple of font size)
         """
+        _api.check_isinstance(Real, spacing=spacing)
         self._linespacing = spacing
         self.stale = True
 
@@ -1170,7 +1186,15 @@ def set_rotation(self, s):
             The rotation angle in degrees in mathematically positive direction
             (counterclockwise). 'horizontal' equals 0, 'vertical' equals 90.
         """
-        self._rotation = s
+        if isinstance(s, Real):
+            self._rotation = float(s) % 360
+        elif cbook._str_equal(s, 'horizontal') or s is None:
+            self._rotation = 0.
+        elif cbook._str_equal(s, 'vertical'):
+            self._rotation = 90.
+        else:
+            raise ValueError("rotation must be 'vertical', 'horizontal' or "
+                             f"a number, not {s}")
         self.stale = True
 
     def set_transform_rotates_text(self, t):
@@ -1186,11 +1210,13 @@ def set_transform_rotates_text(self, t):
 
     def set_verticalalignment(self, align):
         """
-        Set the vertical alignment.
+        Set the vertical alignment relative to the anchor point.
+
+        See also :doc:`/gallery/text_labels_and_annotations/text_alignment`.
 
         Parameters
         ----------
-        align : {'center', 'top', 'bottom', 'baseline', 'center_baseline'}
+        align : {'bottom', 'baseline', 'center', 'center_baseline', 'top'}
         """
         _api.check_in_list(
             ['top', 'bottom', 'center', 'baseline', 'center_baseline'],
@@ -1224,7 +1250,8 @@ def _preprocess_math(self, s):
         - If *self* is configured to use TeX, return *s* unchanged except that
           a single space gets escaped, and the flag "TeX".
         - Otherwise, if *s* is mathtext (has an even number of unescaped dollar
-          signs), return *s* and the flag True.
+          signs) and ``parse_math`` is not set to False, return *s* and the
+          flag True.
         - Otherwise, return *s* with dollar signs unescaped, and the flag
           False.
         """
@@ -1232,6 +1259,8 @@ def _preprocess_math(self, s):
             if s == " ":
                 s = r"\ "
             return s, "TeX"
+        elif not self.get_parse_math():
+            return s, False
         elif cbook.is_math_text(s):
             return s, True
         else:
@@ -1269,6 +1298,22 @@ def get_usetex(self):
         """Return whether this `Text` object uses TeX for rendering."""
         return self._usetex
 
+    def set_parse_math(self, parse_math):
+        """
+        Override switch to disable any mathtext parsing for this `Text`.
+
+        Parameters
+        ----------
+        parse_math : bool
+            If False, this `Text` will never use mathtext.  If True, mathtext
+            will be used if there is an even number of unescaped dollar signs.
+        """
+        self._parse_math = bool(parse_math)
+
+    def get_parse_math(self):
+        """Return whether mathtext parsing is considered for this `Text`."""
+        return self._parse_math
+
     def set_fontname(self, fontname):
         """
         Alias for `set_family`.
@@ -1288,10 +1333,6 @@ def set_fontname(self, fontname):
         return self.set_family(fontname)
 
 
-docstring.interpd.update(Text_kwdoc=artist.kwdoc(Text))
-docstring.dedent_interpd(Text.__init__)
-
-
 class OffsetFrom:
     """Callable helper class for working with `Annotation`."""
 
@@ -1414,7 +1455,7 @@ def _get_xy_transform(self, renderer, s):
             elif isinstance(tr, Transform):
                 return tr
             else:
-                raise RuntimeError("unknown return type ...")
+                raise RuntimeError("Unknown return type")
         elif isinstance(s, Artist):
             bbox = s.get_window_extent(renderer)
             return BboxTransformTo(bbox)
@@ -1423,7 +1464,7 @@ def _get_xy_transform(self, renderer, s):
         elif isinstance(s, Transform):
             return s
         elif not isinstance(s, str):
-            raise RuntimeError("unknown coordinate type : %s" % s)
+            raise RuntimeError(f"Unknown coordinate type: {s!r}")
 
         if s == 'data':
             return self.axes.transData
@@ -1435,7 +1476,7 @@ def _get_xy_transform(self, renderer, s):
 
         s_ = s.split()
         if len(s_) != 2:
-            raise ValueError("%s is not a recognized coordinate" % s)
+            raise ValueError(f"{s!r} is not a recognized coordinate")
 
         bbox0, xy0 = None, None
 
@@ -1463,24 +1504,24 @@ def _get_xy_transform(self, renderer, s):
             ref_x, ref_y = xy0
             if unit == "points":
                 # dots per points
-                dpp = self.figure.get_dpi() / 72.
+                dpp = self.figure.dpi / 72
                 tr = Affine2D().scale(dpp)
             elif unit == "pixels":
                 tr = Affine2D()
             elif unit == "fontsize":
                 fontsize = self.get_size()
-                dpp = fontsize * self.figure.get_dpi() / 72.
+                dpp = fontsize * self.figure.dpi / 72
                 tr = Affine2D().scale(dpp)
             elif unit == "fraction":
                 w, h = bbox0.size
                 tr = Affine2D().scale(w, h)
             else:
-                raise ValueError("%s is not a recognized coordinate" % s)
+                raise ValueError(f"{unit!r} is not a recognized unit")
 
             return tr.translate(ref_x, ref_y)
 
         else:
-            raise ValueError("%s is not a recognized coordinate" % s)
+            raise ValueError(f"{s!r} is not a recognized coordinate")
 
     def _get_ref_xy(self, renderer):
         """
@@ -1506,12 +1547,11 @@ def set_annotation_clip(self, b):
         Parameters
         ----------
         b : bool or None
-            - True: the annotation will only be drawn when ``self.xy`` is
-              inside the axes.
-            - False: the annotation will always be drawn regardless of its
-              position.
-            - None: the ``self.xy`` will be checked only if *xycoords* is
-              "data".
+            - True: The annotation will be clipped when ``self.xy`` is
+              outside the axes.
+            - False: The annotation will always be drawn.
+            - None: The annotation will be clipped when ``self.xy`` is
+              outside the axes and ``self.xycoords == "data"``.
         """
         self._annotation_clip = b
 
@@ -1528,8 +1568,10 @@ def _get_position_xy(self, renderer):
         x, y = self.xy
         return self._get_xy(renderer, x, y, self.xycoords)
 
-    def _check_xy(self, renderer):
+    def _check_xy(self, renderer=None):
         """Check whether the annotation at *xy_pixel* should be drawn."""
+        if renderer is None:
+            renderer = self.figure._get_renderer()
         b = self.get_annotation_clip()
         if b or (b is None and self.xycoords == "data"):
             # check if self.xy is inside the axes.
@@ -1687,9 +1729,13 @@ def transform(renderer) -> Transform
 
         arrowprops : dict, optional
             The properties used to draw a `.FancyArrowPatch` arrow between the
-            positions *xy* and *xytext*. Note that the edge of the arrow
-            pointing to *xytext* will be centered on the text itself and may
-            not point directly to the coordinates given in *xytext*.
+            positions *xy* and *xytext*.  Defaults to None, i.e. no arrow is
+            drawn.
+
+            For historical reasons there are two different ways to specify
+            arrows, "simple" and "fancy":
+
+            **Simple arrow:**
 
             If *arrowprops* does not contain the key 'arrowstyle' the
             allowed keys are:
@@ -1704,35 +1750,22 @@ def transform(renderer) -> Transform
             ?            Any key to :class:`matplotlib.patches.FancyArrowPatch`
             ==========   ======================================================
 
-            If *arrowprops* contains the key 'arrowstyle' the
-            above keys are forbidden.  The allowed values of
-            ``'arrowstyle'`` are:
-
-            ============   =============================================
-            Name           Attrs
-            ============   =============================================
-            ``'-'``        None
-            ``'->'``       head_length=0.4,head_width=0.2
-            ``'-['``       widthB=1.0,lengthB=0.2,angleB=None
-            ``'|-|'``      widthA=1.0,widthB=1.0
-            ``'-|>'``      head_length=0.4,head_width=0.2
-            ``'<-'``       head_length=0.4,head_width=0.2
-            ``'<->'``      head_length=0.4,head_width=0.2
-            ``'<|-'``      head_length=0.4,head_width=0.2
-            ``'<|-|>'``    head_length=0.4,head_width=0.2
-            ``'fancy'``    head_length=0.4,head_width=0.4,tail_width=0.4
-            ``'simple'``   head_length=0.5,head_width=0.5,tail_width=0.2
-            ``'wedge'``    tail_width=0.3,shrink_factor=0.5
-            ============   =============================================
-
-            Valid keys for `~matplotlib.patches.FancyArrowPatch` are:
+            The arrow is attached to the edge of the text box, the exact
+            position (corners or centers) depending on where it's pointing to.
+
+            **Fancy arrow:**
+
+            This is used if 'arrowstyle' is provided in the *arrowprops*.
+
+            Valid keys are the following `~matplotlib.patches.FancyArrowPatch`
+            parameters:
 
             ===============  ==================================================
             Key              Description
             ===============  ==================================================
             arrowstyle       the arrow style
             connectionstyle  the connection style
-            relpos           default is (0.5, 0.5)
+            relpos           see below; default is (0.5, 0.5)
             patchA           default is bounding box of the text
             patchB           default is None
             shrinkA          default is 2 points
@@ -1742,17 +1775,22 @@ def transform(renderer) -> Transform
             ?                any key for :class:`matplotlib.patches.PathPatch`
             ===============  ==================================================
 
-            Defaults to None, i.e. no arrow is drawn.
+            The exact starting point position of the arrow is defined by
+            *relpos*. It's a tuple of relative coordinates of the text box,
+            where (0, 0) is the lower left corner and (1, 1) is the upper
+            right corner. Values <0 and >1 are supported and specify points
+            outside the text box. By default (0.5, 0.5) the starting point is
+            centered in the text box.
 
         annotation_clip : bool or None, default: None
-            Whether to draw the annotation when the annotation point *xy* is
-            outside the axes area.
+            Whether to clip (i.e. not draw) the annotation when the annotation
+            point *xy* is outside the axes area.
 
-            - If *True*, the annotation will only be drawn when *xy* is
-              within the axes.
+            - If *True*, the annotation will be clipped when *xy* is outside
+              the axes.
             - If *False*, the annotation will always be drawn.
-            - If *None*, the annotation will only be drawn when *xy* is
-              within the axes and *xycoords* is 'data'.
+            - If *None*, the annotation will be clipped when *xy* is outside
+              the axes and *xycoords* is 'data'.
 
         **kwargs
             Additional kwargs are passed to `~matplotlib.text.Text`.
@@ -1871,32 +1909,30 @@ def update_positions(self, renderer):
         """
         Update the pixel positions of the annotation text and the arrow patch.
         """
-        x1, y1 = self._get_position_xy(renderer)  # Annotated position.
-        # generate transformation,
+        # generate transformation
         self.set_transform(self._get_xy_transform(renderer, self.anncoords))
 
-        if self.arrowprops is None:
+        arrowprops = self.arrowprops
+        if arrowprops is None:
             return
 
         bbox = Text.get_window_extent(self, renderer)
 
-        d = self.arrowprops.copy()
-        ms = d.pop("mutation_scale", self.get_size())
+        arrow_end = x1, y1 = self._get_position_xy(renderer)  # Annotated pos.
+
+        ms = arrowprops.get("mutation_scale", self.get_size())
         self.arrow_patch.set_mutation_scale(ms)
 
-        if "arrowstyle" not in d:
+        if "arrowstyle" not in arrowprops:
             # Approximately simulate the YAArrow.
-            # Pop its kwargs:
-            shrink = d.pop('shrink', 0.0)
-            width = d.pop('width', 4)
-            headwidth = d.pop('headwidth', 12)
-            # Ignore frac--it is useless.
-            frac = d.pop('frac', None)
-            if frac is not None:
+            shrink = arrowprops.get('shrink', 0.0)
+            width = arrowprops.get('width', 4)
+            headwidth = arrowprops.get('headwidth', 12)
+            if 'frac' in arrowprops:
                 _api.warn_external(
                     "'frac' option in 'arrowprops' is no longer supported;"
                     " use 'headlength' to set the head length in points.")
-            headlength = d.pop('headlength', 12)
+            headlength = arrowprops.get('headlength', 12)
 
             # NB: ms is in pts
             stylekw = dict(head_length=headlength / ms,
@@ -1918,29 +1954,25 @@ def update_positions(self, renderer):
 
         # adjust the starting point of the arrow relative to the textbox.
         # TODO : Rotation needs to be accounted.
-        relposx, relposy = self._arrow_relpos
-        x0 = bbox.x0 + bbox.width * relposx
-        y0 = bbox.y0 + bbox.height * relposy
-
-        # The arrow will be drawn from (x0, y0) to (x1, y1). It will be first
+        arrow_begin = bbox.p0 + bbox.size * self._arrow_relpos
+        # The arrow is drawn from arrow_begin to arrow_end.  It will be first
         # clipped by patchA and patchB.  Then it will be shrunk by shrinkA and
-        # shrinkB (in points).  If patch A is not set, self.bbox_patch is used.
-        self.arrow_patch.set_positions((x0, y0), (x1, y1))
-
-        if "patchA" in d:
-            self.arrow_patch.set_patchA(d.pop("patchA"))
+        # shrinkB (in points).  If patchA is not set, self.bbox_patch is used.
+        self.arrow_patch.set_positions(arrow_begin, arrow_end)
+
+        if "patchA" in arrowprops:
+            patchA = arrowprops["patchA"]
+        elif self._bbox_patch:
+            patchA = self._bbox_patch
+        elif self.get_text() == "":
+            patchA = None
         else:
-            if self._bbox_patch:
-                self.arrow_patch.set_patchA(self._bbox_patch)
-            else:
-                if self.get_text() == "":
-                    self.arrow_patch.set_patchA(None)
-                    return
-                pad = renderer.points_to_pixels(4)
-                r = Rectangle(xy=(bbox.x0 - pad / 2, bbox.y0 - pad / 2),
-                              width=bbox.width + pad, height=bbox.height + pad,
-                              transform=IdentityTransform(), clip_on=False)
-                self.arrow_patch.set_patchA(r)
+            pad = renderer.points_to_pixels(4)
+            patchA = Rectangle(
+                xy=(bbox.x0 - pad / 2, bbox.y0 - pad / 2),
+                width=bbox.width + pad, height=bbox.height + pad,
+                transform=IdentityTransform(), clip_on=False)
+        self.arrow_patch.set_patchA(patchA)
 
     @artist.allow_rasterization
     def draw(self, renderer):
@@ -1949,8 +1981,11 @@ def draw(self, renderer):
             self._renderer = renderer
         if not self.get_visible() or not self._check_xy(renderer):
             return
+        # Update text positions before `Text.draw` would, so that the
+        # FancyArrowPatch is correctly positioned.
         self.update_positions(renderer)
-        if self.arrow_patch is not None:   # FancyArrowPatch
+        self.update_bbox_position_size(renderer)
+        if self.arrow_patch is not None:  # FancyArrowPatch
             if self.arrow_patch.figure is None and self.figure is not None:
                 self.arrow_patch.figure = self.figure
             self.arrow_patch.draw(renderer)
@@ -1959,18 +1994,7 @@ def draw(self, renderer):
         Text.draw(self, renderer)
 
     def get_window_extent(self, renderer=None):
-        """
-        Return the `.Bbox` bounding the text and arrow, in display units.
-
-        Parameters
-        ----------
-        renderer : Renderer, optional
-            A renderer is needed to compute the bounding box.  If the artist
-            has already been drawn, the renderer is cached; thus, it is only
-            necessary to pass this argument when calling `get_window_extent`
-            before the first `draw`.  In practice, it is usually easier to
-            trigger a draw first (e.g. by saving the figure).
-        """
+        # docstring inherited
         # This block is the same as in Text.get_window_extent, but we need to
         # set the renderer before calling update_positions().
         if not self.get_visible() or not self._check_xy(renderer):
@@ -1978,7 +2002,7 @@ def get_window_extent(self, renderer=None):
         if renderer is not None:
             self._renderer = renderer
         if self._renderer is None:
-            self._renderer = self.figure._cachedRenderer
+            self._renderer = self.figure._get_renderer()
         if self._renderer is None:
             raise RuntimeError('Cannot get window extent w/o renderer')
 
@@ -1992,11 +2016,11 @@ def get_window_extent(self, renderer=None):
 
         return Bbox.union(bboxes)
 
-    def get_tightbbox(self, renderer):
+    def get_tightbbox(self, renderer=None):
         # docstring inherited
         if not self._check_xy(renderer):
             return Bbox.null()
         return super().get_tightbbox(renderer)
 
 
-docstring.interpd.update(Annotation=Annotation.__init__.__doc__)
+_docstring.interpd.update(Annotation=Annotation.__init__.__doc__)
diff --git a/lib/matplotlib/textpath.py b/lib/matplotlib/textpath.py
index 424d4df7da94..6eb11b5f09d8 100644
--- a/lib/matplotlib/textpath.py
+++ b/lib/matplotlib/textpath.py
@@ -1,15 +1,17 @@
 from collections import OrderedDict
-import functools
 import logging
 import urllib.parse
 
 import numpy as np
 
-from matplotlib import _text_layout, dviread, font_manager, rcParams
-from matplotlib.font_manager import FontProperties, get_font
+from matplotlib import _api, _text_helpers, dviread
+from matplotlib.font_manager import (
+    FontProperties, get_font, fontManager as _fontManager
+)
 from matplotlib.ft2font import LOAD_NO_HINTING, LOAD_TARGET_LIGHT
 from matplotlib.mathtext import MathTextParser
 from matplotlib.path import Path
+from matplotlib.texmanager import TexManager
 from matplotlib.transforms import Affine2D
 
 _log = logging.getLogger(__name__)
@@ -29,8 +31,8 @@ def _get_font(self, prop):
         """
         Find the `FT2Font` matching font properties *prop*, with its size set.
         """
-        fname = font_manager.findfont(prop)
-        font = get_font(fname)
+        filenames = _fontManager._find_fonts_by_props(prop)
+        font = get_font(filenames)
         font.set_size(self.FONT_SCALE, self.DPI)
         return font
 
@@ -44,14 +46,11 @@ def _get_char_id(self, font, ccode):
         return urllib.parse.quote(f"{font.postscript_name}-{ccode:x}")
 
     def get_text_width_height_descent(self, s, prop, ismath):
+        fontsize = prop.get_size_in_points()
+
         if ismath == "TeX":
-            texmanager = self.get_texmanager()
-            fontsize = prop.get_size_in_points()
-            w, h, d = texmanager.get_text_width_height_descent(s, fontsize,
-                                                               renderer=None)
-            return w, h, d
+            return TexManager().get_text_width_height_descent(s, fontsize)
 
-        fontsize = prop.get_size_in_points()
         scale = fontsize / self.FONT_SCALE
 
         if ismath:
@@ -119,18 +118,19 @@ def get_text_path(self, prop, s, ismath=False):
             glyph_info, glyph_map, rects = self.get_glyphs_mathtext(prop, s)
 
         verts, codes = [], []
-
         for glyph_id, xposition, yposition, scale in glyph_info:
             verts1, codes1 = glyph_map[glyph_id]
-            if len(verts1):
-                verts1 = np.array(verts1) * scale + [xposition, yposition]
-                verts.extend(verts1)
-                codes.extend(codes1)
-
+            verts.extend(verts1 * scale + [xposition, yposition])
+            codes.extend(codes1)
         for verts1, codes1 in rects:
             verts.extend(verts1)
             codes.extend(codes1)
 
+        # Make sure an empty string or one with nothing to print
+        # (e.g. only spaces & newlines) will be valid/empty path
+        if not verts:
+            verts = np.empty((0, 2))
+
         return verts, codes
 
     def get_glyphs_with_font(self, font, s, glyph_map=None,
@@ -149,12 +149,12 @@ def get_glyphs_with_font(self, font, s, glyph_map=None,
 
         xpositions = []
         glyph_ids = []
-        for item in _text_layout.layout(s, font):
-            char_id = self._get_char_id(font, ord(item.char))
+        for item in _text_helpers.layout(s, font):
+            char_id = self._get_char_id(item.ft_object, ord(item.char))
             glyph_ids.append(char_id)
             xpositions.append(item.x)
             if char_id not in glyph_map:
-                glyph_map_new[char_id] = font.get_path()
+                glyph_map_new[char_id] = item.ft_object.get_path()
 
         ypositions = [0] * len(xpositions)
         sizes = [1.] * len(xpositions)
@@ -215,10 +215,10 @@ def get_glyphs_mathtext(self, prop, s, glyph_map=None,
         return (list(zip(glyph_ids, xpositions, ypositions, sizes)),
                 glyph_map_new, myrects)
 
+    @_api.deprecated("3.6", alternative="TexManager()")
     def get_texmanager(self):
         """Return the cached `~.texmanager.TexManager` instance."""
         if self._texmanager is None:
-            from matplotlib.texmanager import TexManager
             self._texmanager = TexManager()
         return self._texmanager
 
@@ -227,7 +227,7 @@ def get_glyphs_tex(self, prop, s, glyph_map=None,
         """Convert the string *s* to vertices and codes using usetex mode."""
         # Mostly borrowed from pdf backend.
 
-        dvifile = self.get_texmanager().make_dvi(s, self.FONT_SCALE)
+        dvifile = TexManager().make_dvi(s, self.FONT_SCALE)
         with dviread.Dvi(dvifile, self.DPI) as dvi:
             page, = dvi
 
@@ -243,25 +243,29 @@ def get_glyphs_tex(self, prop, s, glyph_map=None,
 
         # Gather font information and do some setup for combining
         # characters into strings.
-        for x1, y1, dvifont, glyph, width in page.text:
-            font, enc = self._get_ps_font_and_encoding(dvifont.texname)
-            char_id = self._get_char_id(font, glyph)
-
+        for text in page.text:
+            font = get_font(text.font_path)
+            char_id = self._get_char_id(font, text.glyph)
             if char_id not in glyph_map:
                 font.clear()
                 font.set_size(self.FONT_SCALE, self.DPI)
-                # See comments in _get_ps_font_and_encoding.
-                if enc is not None:
-                    index = font.get_name_index(enc[glyph])
+                glyph_name_or_index = text.glyph_name_or_index
+                if isinstance(glyph_name_or_index, str):
+                    index = font.get_name_index(glyph_name_or_index)
                     font.load_glyph(index, flags=LOAD_TARGET_LIGHT)
-                else:
-                    font.load_char(glyph, flags=LOAD_TARGET_LIGHT)
+                elif isinstance(glyph_name_or_index, int):
+                    self._select_native_charmap(font)
+                    font.load_char(
+                        glyph_name_or_index, flags=LOAD_TARGET_LIGHT)
+                else:  # Should not occur.
+                    raise TypeError(f"Glyph spec of unexpected type: "
+                                    f"{glyph_name_or_index!r}")
                 glyph_map_new[char_id] = font.get_path()
 
             glyph_ids.append(char_id)
-            xpositions.append(x1)
-            ypositions.append(y1)
-            sizes.append(dvifont.size / self.FONT_SCALE)
+            xpositions.append(text.x)
+            ypositions.append(text.y)
+            sizes.append(text.font_size / self.FONT_SCALE)
 
         myrects = []
 
@@ -277,48 +281,21 @@ def get_glyphs_tex(self, prop, s, glyph_map=None,
                 glyph_map_new, myrects)
 
     @staticmethod
-    @functools.lru_cache(50)
-    def _get_ps_font_and_encoding(texname):
-        tex_font_map = dviread.PsfontsMap(dviread.find_tex_file('pdftex.map'))
-        psfont = tex_font_map[texname]
-        if psfont.filename is None:
-            raise ValueError(
-                f"No usable font file found for {psfont.psname} ({texname}). "
-                f"The font may lack a Type-1 version.")
-
-        font = get_font(psfont.filename)
-
-        if psfont.encoding:
-            # If psfonts.map specifies an encoding, use it: it gives us a
-            # mapping of glyph indices to Adobe glyph names; use it to convert
-            # dvi indices to glyph names and use the FreeType-synthesized
-            # unicode charmap to convert glyph names to glyph indices (with
-            # FT_Get_Name_Index/get_name_index), and load the glyph using
-            # FT_Load_Glyph/load_glyph.  (That charmap has a coverage at least
-            # as good as, and possibly better than, the native charmaps.)
-            enc = dviread._parse_enc(psfont.encoding)
-        else:
-            # If psfonts.map specifies no encoding, the indices directly
-            # map to the font's "native" charmap; so don't use the
-            # FreeType-synthesized charmap but the native ones (we can't
-            # directly identify it but it's typically an Adobe charmap), and
-            # directly load the dvi glyph indices using FT_Load_Char/load_char.
-            for charmap_code in [
-                    1094992451,  # ADOBE_CUSTOM.
-                    1094995778,  # ADOBE_STANDARD.
-            ]:
-                try:
-                    font.select_charmap(charmap_code)
-                except (ValueError, RuntimeError):
-                    pass
-                else:
-                    break
+    def _select_native_charmap(font):
+        # Select the native charmap. (we can't directly identify it but it's
+        # typically an Adobe charmap).
+        for charmap_code in [
+                1094992451,  # ADOBE_CUSTOM.
+                1094995778,  # ADOBE_STANDARD.
+        ]:
+            try:
+                font.select_charmap(charmap_code)
+            except (ValueError, RuntimeError):
+                pass
             else:
-                _log.warning("No supported encoding in font (%s).",
-                             psfont.filename)
-            enc = None
-
-        return font, enc
+                break
+        else:
+            _log.warning("No supported encoding in font (%s).", font.fname)
 
 
 text_to_path = TextToPath()
@@ -333,7 +310,7 @@ def __init__(self, xy, s, size=None, prop=None,
                  _interpolation_steps=1, usetex=False):
         r"""
         Create a path from the text. Note that it simply is a path,
-        not an artist. You need to use the `~.PathPatch` (or other artists)
+        not an artist. You need to use the `.PathPatch` (or other artists)
         to draw this path onto the canvas.
 
         Parameters
@@ -351,7 +328,7 @@ def __init__(self, xy, s, size=None, prop=None,
         prop : `matplotlib.font_manager.FontProperties`, optional
             Font property. If not provided, will use a default
             ``FontProperties`` with parameters from the
-            :ref:`rcParams <matplotlib-rcparams>`.
+            :ref:`rcParams<customizing-with-dynamic-rc-settings>`.
 
         _interpolation_steps : int, optional
             (Currently ignored)
@@ -385,11 +362,11 @@ def __init__(self, xy, s, size=None, prop=None,
 
         self._cached_vertices = None
         s, ismath = Text(usetex=usetex)._preprocess_math(s)
-        self._vertices, self._codes = text_to_path.get_text_path(
-            prop, s, ismath=ismath)
+        super().__init__(
+            *text_to_path.get_text_path(prop, s, ismath=ismath),
+            _interpolation_steps=_interpolation_steps,
+            readonly=True)
         self._should_simplify = False
-        self._simplify_threshold = rcParams['path.simplify_threshold']
-        self._interpolation_steps = _interpolation_steps
 
     def set_size(self, size):
         """Set the text size."""
@@ -420,11 +397,12 @@ def _revalidate_path(self):
         Update the path if necessary.
 
         The path for the text is initially create with the font size of
-        `~.FONT_SCALE`, and this path is rescaled to other size when necessary.
+        `.FONT_SCALE`, and this path is rescaled to other size when necessary.
         """
         if self._invalid or self._cached_vertices is None:
             tr = (Affine2D()
                   .scale(self._size / text_to_path.FONT_SCALE)
                   .translate(*self._xy))
             self._cached_vertices = tr.transform(self._vertices)
+            self._cached_vertices.flags.writeable = False
             self._invalid = False
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
index 430d6112780b..dfacdf4aead9 100644
--- a/lib/matplotlib/ticker.py
+++ b/lib/matplotlib/ticker.py
@@ -18,50 +18,33 @@
 `MultipleLocator`. It is initialized with a base, e.g., 10, and it picks
 axis limits and ticks that are multiples of that base.
 
-The Locator subclasses defined here are
-
-:class:`AutoLocator`
-    `MaxNLocator` with simple defaults.  This is the default tick locator for
-    most plotting.
-
-:class:`MaxNLocator`
-    Finds up to a max number of intervals with ticks at nice locations.
-
-:class:`LinearLocator`
-    Space ticks evenly from min to max.
-
-:class:`LogLocator`
-    Space ticks logarithmically from min to max.
-
-:class:`MultipleLocator`
-    Ticks and range are a multiple of base; either integer or float.
-
-:class:`FixedLocator`
-    Tick locations are fixed.
-
-:class:`IndexLocator`
-    Locator for index plots (e.g., where ``x = range(len(y))``).
-
-:class:`NullLocator`
-    No ticks.
-
-:class:`SymmetricalLogLocator`
-    Locator for use with with the symlog norm; works like `LogLocator` for the
-    part outside of the threshold and adds 0 if inside the limits.
-
-:class:`LogitLocator`
-    Locator for logit scaling.
-
-:class:`OldAutoLocator`
-    Choose a `MultipleLocator` and dynamically reassign it for intelligent
-    ticking during navigation.
-
-:class:`AutoMinorLocator`
-    Locator for minor ticks when the axis is linear and the
-    major ticks are uniformly spaced.  Subdivides the major
-    tick interval into a specified number of minor intervals,
-    defaulting to 4 or 5 depending on the major interval.
-
+The Locator subclasses defined here are:
+
+======================= =======================================================
+`AutoLocator`           `MaxNLocator` with simple defaults. This is the default
+                        tick locator for most plotting.
+`MaxNLocator`           Finds up to a max number of intervals with ticks at
+                        nice locations.
+`LinearLocator`         Space ticks evenly from min to max.
+`LogLocator`            Space ticks logarithmically from min to max.
+`MultipleLocator`       Ticks and range are a multiple of base; either integer
+                        or float.
+`FixedLocator`          Tick locations are fixed.
+`IndexLocator`          Locator for index plots (e.g., where
+                        ``x = range(len(y))``).
+`NullLocator`           No ticks.
+`SymmetricalLogLocator` Locator for use with the symlog norm; works like
+                        `LogLocator` for the part outside of the threshold and
+                        adds 0 if inside the limits.
+`AsinhLocator`          Locator for use with the asinh norm, attempting to
+                        space ticks approximately uniformly.
+`LogitLocator`          Locator for logit scaling.
+`AutoMinorLocator`      Locator for minor ticks when the axis is linear and the
+                        major ticks are uniformly spaced. Subdivides the major
+                        tick interval into a specified number of minor
+                        intervals, defaulting to 4 or 5 depending on the major
+                        interval.
+======================= =======================================================
 
 There are a number of locators specialized for date locations - see
 the :mod:`.dates` module.
@@ -100,48 +83,24 @@
 Tick formatting is controlled by classes derived from Formatter. The formatter
 operates on a single tick value and returns a string to the axis.
 
-:class:`NullFormatter`
-    No labels on the ticks.
-
-:class:`IndexFormatter`
-    Set the strings from a list of labels.
-
-:class:`FixedFormatter`
-    Set the strings manually for the labels.
-
-:class:`FuncFormatter`
-    User defined function sets the labels.
-
-:class:`StrMethodFormatter`
-    Use string `format` method.
-
-:class:`FormatStrFormatter`
-    Use an old-style sprintf format string.
-
-:class:`ScalarFormatter`
-    Default formatter for scalars: autopick the format string.
-
-:class:`LogFormatter`
-    Formatter for log axes.
-
-:class:`LogFormatterExponent`
-    Format values for log axis using ``exponent = log_base(value)``.
-
-:class:`LogFormatterMathtext`
-    Format values for log axis using ``exponent = log_base(value)``
-    using Math text.
-
-:class:`LogFormatterSciNotation`
-    Format values for log axis using scientific notation.
-
-:class:`LogitFormatter`
-    Probability formatter.
-
-:class:`EngFormatter`
-    Format labels in engineering notation.
-
-:class:`PercentFormatter`
-    Format labels as a percentage.
+========================= =====================================================
+`NullFormatter`           No labels on the ticks.
+`FixedFormatter`          Set the strings manually for the labels.
+`FuncFormatter`           User defined function sets the labels.
+`StrMethodFormatter`      Use string `format` method.
+`FormatStrFormatter`      Use an old-style sprintf format string.
+`ScalarFormatter`         Default formatter for scalars: autopick the format
+                          string.
+`LogFormatter`            Formatter for log axes.
+`LogFormatterExponent`    Format values for log axis using
+                          ``exponent = log_base(value)``.
+`LogFormatterMathtext`    Format values for log axis using
+                          ``exponent = log_base(value)`` using Math text.
+`LogFormatterSciNotation` Format values for log axis using scientific notation.
+`LogitFormatter`          Probability formatter.
+`EngFormatter`            Format labels in engineering notation.
+`PercentFormatter`        Format labels as a percentage.
+========================= =====================================================
 
 You can derive your own formatter from the Formatter base class by
 simply overriding the ``__call__`` method. The formatter class has
@@ -161,9 +120,9 @@
 the input ``str``. For function input, a `.FuncFormatter` with the input
 function will be generated and used.
 
-See :doc:`/gallery/ticks_and_spines/major_minor_demo` for an
-example of setting major and minor ticks. See the :mod:`matplotlib.dates`
-module for more information and examples of using date locators and formatters.
+See :doc:`/gallery/ticks/major_minor_demo` for an example of setting major
+and minor ticks. See the :mod:`matplotlib.dates` module for more information
+and examples of using date locators and formatters.
 """
 
 import itertools
@@ -184,37 +143,43 @@
            'NullFormatter', 'FuncFormatter', 'FormatStrFormatter',
            'StrMethodFormatter', 'ScalarFormatter', 'LogFormatter',
            'LogFormatterExponent', 'LogFormatterMathtext',
-           'IndexFormatter', 'LogFormatterSciNotation',
+           'LogFormatterSciNotation',
            'LogitFormatter', 'EngFormatter', 'PercentFormatter',
-           'OldScalarFormatter',
            'Locator', 'IndexLocator', 'FixedLocator', 'NullLocator',
            'LinearLocator', 'LogLocator', 'AutoLocator',
            'MultipleLocator', 'MaxNLocator', 'AutoMinorLocator',
-           'SymmetricalLogLocator', 'LogitLocator', 'OldAutoLocator')
+           'SymmetricalLogLocator', 'AsinhLocator', 'LogitLocator')
 
 
 class _DummyAxis:
     __name__ = "dummy"
 
+    # Once the deprecation elapses, replace dataLim and viewLim by plain
+    # _view_interval and _data_interval private tuples.
+    dataLim = _api.deprecate_privatize_attribute(
+        "3.6", alternative="get_data_interval() and set_data_interval()")
+    viewLim = _api.deprecate_privatize_attribute(
+        "3.6", alternative="get_view_interval() and set_view_interval()")
+
     def __init__(self, minpos=0):
-        self.dataLim = mtransforms.Bbox.unit()
-        self.viewLim = mtransforms.Bbox.unit()
+        self._dataLim = mtransforms.Bbox.unit()
+        self._viewLim = mtransforms.Bbox.unit()
         self._minpos = minpos
 
     def get_view_interval(self):
-        return self.viewLim.intervalx
+        return self._viewLim.intervalx
 
     def set_view_interval(self, vmin, vmax):
-        self.viewLim.intervalx = vmin, vmax
+        self._viewLim.intervalx = vmin, vmax
 
     def get_minpos(self):
         return self._minpos
 
     def get_data_interval(self):
-        return self.dataLim.intervalx
+        return self._dataLim.intervalx
 
     def set_data_interval(self, vmin, vmax):
-        self.dataLim.intervalx = vmin, vmax
+        self._dataLim.intervalx = vmin, vmax
 
     def get_tick_space(self):
         # Just use the long-standing default of nbins==9
@@ -231,12 +196,17 @@ def create_dummy_axis(self, **kwargs):
         if self.axis is None:
             self.axis = _DummyAxis(**kwargs)
 
+    @_api.deprecated("3.5", alternative="`.Axis.set_view_interval`")
     def set_view_interval(self, vmin, vmax):
         self.axis.set_view_interval(vmin, vmax)
 
+    @_api.deprecated("3.5", alternative="`.Axis.set_data_interval`")
     def set_data_interval(self, vmin, vmax):
         self.axis.set_data_interval(vmin, vmax)
 
+    @_api.deprecated(
+        "3.5",
+        alternative="`.Axis.set_view_interval` and `.Axis.set_data_interval`")
     def set_bounds(self, vmin, vmax):
         self.set_view_interval(vmin, vmax)
         self.set_data_interval(vmin, vmax)
@@ -293,7 +263,7 @@ def set_locs(self, locs):
     def fix_minus(s):
         """
         Some classes may want to replace a hyphen for minus with the proper
-        unicode symbol (U+2212) for typographical correctness.  This is a
+        Unicode symbol (U+2212) for typographical correctness.  This is a
         helper method to perform such a replacement when it is enabled via
         :rc:`axes.unicode_minus`.
         """
@@ -306,35 +276,6 @@ def _set_locator(self, locator):
         pass
 
 
-@_api.deprecated("3.3")
-class IndexFormatter(Formatter):
-    """
-    Format the position x to the nearest i-th label where ``i = int(x + 0.5)``.
-    Positions where ``i < 0`` or ``i > len(list)`` have no tick labels.
-
-    Parameters
-    ----------
-    labels : list
-        List of labels.
-    """
-    def __init__(self, labels):
-        self.labels = labels
-        self.n = len(labels)
-
-    def __call__(self, x, pos=None):
-        """
-        Return the format for tick value *x* at position pos.
-
-        The position is ignored and the value is rounded to the nearest
-        integer, which is used to look up the label.
-        """
-        i = int(x + 0.5)
-        if i < 0 or i >= self.n:
-            return ''
-        else:
-            return self.labels[i]
-
-
 class NullFormatter(Formatter):
     """Always return the empty string."""
 
@@ -412,9 +353,9 @@ class FormatStrFormatter(Formatter):
     The format string should have a single variable format (%) in it.
     It will be applied to the value (not the position) of the tick.
 
-    Negative numeric values will use a dash not a unicode minus,
-    use mathtext to get a unicode minus by wrappping the format specifier
-    with $ (e.g. "$%g$").
+    Negative numeric values will use a dash, not a Unicode minus; use mathtext
+    to get a Unicode minus by wrapping the format specifier with $ (e.g.
+    "$%g$").
     """
     def __init__(self, fmt):
         self.fmt = fmt
@@ -448,40 +389,6 @@ def __call__(self, x, pos=None):
         return self.fmt.format(x=x, pos=pos)
 
 
-@_api.deprecated("3.3")
-class OldScalarFormatter(Formatter):
-    """
-    Tick location is a plain old number.
-    """
-
-    def __call__(self, x, pos=None):
-        """
-        Return the format for tick val *x* based on the width of the axis.
-
-        The position *pos* is ignored.
-        """
-        xmin, xmax = self.axis.get_view_interval()
-        # If the number is not too big and it's an int, format it as an int.
-        if abs(x) < 1e4 and x == int(x):
-            return '%d' % x
-        d = abs(xmax - xmin)
-        fmt = ('%1.3e' if d < 1e-2 else
-               '%1.3f' if d <= 1 else
-               '%1.2f' if d <= 10 else
-               '%1.1f' if d <= 1e5 else
-               '%1.1e')
-        s = fmt % x
-        tup = s.split('e')
-        if len(tup) == 2:
-            mantissa = tup[0].rstrip('0').rstrip('.')
-            sign = tup[1][0].replace('+', '')
-            exponent = tup[1][1:].lstrip('0')
-            s = '%se%s%s' % (mantissa, sign, exponent)
-        else:
-            s = s.rstrip('0').rstrip('.')
-        return s
-
-
 class ScalarFormatter(Formatter):
     """
     Format tick values as a number.
@@ -539,16 +446,12 @@ def __init__(self, useOffset=None, useMathText=None, useLocale=None):
             mpl.rcParams['axes.formatter.offset_threshold']
         self.set_useOffset(useOffset)
         self._usetex = mpl.rcParams['text.usetex']
-        if useMathText is None:
-            useMathText = mpl.rcParams['axes.formatter.use_mathtext']
         self.set_useMathText(useMathText)
         self.orderOfMagnitude = 0
         self.format = ''
         self._scientific = True
         self._powerlimits = mpl.rcParams['axes.formatter.limits']
-        if useLocale is None:
-            useLocale = mpl.rcParams['axes.formatter.use_locale']
-        self._useLocale = useLocale
+        self.set_useLocale(useLocale)
 
     def get_useOffset(self):
         """
@@ -627,7 +530,7 @@ def set_useLocale(self, val):
 
     def _format_maybe_minus_and_locale(self, fmt, arg):
         """
-        Format *arg* with *fmt*, applying unicode minus and locale if desired.
+        Format *arg* with *fmt*, applying Unicode minus and locale if desired.
         """
         return self.fix_minus(locale.format_string(fmt, (arg,), True)
                               if self._useLocale else fmt % arg)
@@ -655,6 +558,23 @@ def set_useMathText(self, val):
         """
         if val is None:
             self._useMathText = mpl.rcParams['axes.formatter.use_mathtext']
+            if self._useMathText is False:
+                try:
+                    from matplotlib import font_manager
+                    ufont = font_manager.findfont(
+                        font_manager.FontProperties(
+                            mpl.rcParams["font.family"]
+                        ),
+                        fallback_to_default=False,
+                    )
+                except ValueError:
+                    ufont = None
+
+                if ufont == str(cbook._get_data_path("fonts/ttf/cmr10.ttf")):
+                    _api.warn_external(
+                        "cmr10 font should ideally be used with "
+                        "mathtext, set axes.formatter.use_mathtext to True"
+                    )
         else:
             self._useMathText = val
 
@@ -691,7 +611,7 @@ def set_powerlimits(self, lims):
         lims : (int, int)
             A tuple *(min_exp, max_exp)* containing the powers of 10 that
             determine the switchover threshold. For a number representable as
-            :math:`a \times 10^\mathrm{exp}`` with :math:`1 <= |a| < 10`,
+            :math:`a \times 10^\mathrm{exp}` with :math:`1 <= |a| < 10`,
             scientific notation will be used if ``exp <= min_exp`` or
             ``exp >= max_exp``.
 
@@ -739,17 +659,9 @@ def format_data_short(self, value):
                 delta = abs(neighbor_values - value).max()
             else:
                 # Rough approximation: no more than 1e4 divisions.
-                delta = np.diff(self.axis.get_view_interval()) / 1e4
-            # If e.g. value = 45.67 and delta = 0.02, then we want to round to
-            # 2 digits after the decimal point (floor(log10(0.02)) = -2);
-            # 45.67 contributes 2 digits before the decimal point
-            # (floor(log10(45.67)) + 1 = 2): the total is 4 significant digits.
-            # A value of 0 contributes 1 "digit" before the decimal point.
-            sig_digits = max(
-                0,
-                (math.floor(math.log10(abs(value))) + 1 if value else 1)
-                - math.floor(math.log10(delta)))
-            fmt = f"%-#.{sig_digits}g"
+                a, b = self.axis.get_view_interval()
+                delta = (b - a) / 1e4
+            fmt = "%-#.{}g".format(cbook._g_sig_digits(value, delta))
         return self._format_maybe_minus_and_locale(fmt, value)
 
     def format_data(self, value):
@@ -758,7 +670,7 @@ def format_data(self, value):
         s = round(value / 10**e, 10)
         exponent = self._format_maybe_minus_and_locale("%d", e)
         significand = self._format_maybe_minus_and_locale(
-            "%d" if s % 1 == 0 else "%1.10f", s)
+            "%d" if s % 1 == 0 else "%1.10g", s)
         if e == 0:
             return significand
         elif self._useMathText or self._usetex:
@@ -866,10 +778,7 @@ def _set_order_of_magnitude(self):
         if self.offset:
             oom = math.floor(math.log10(vmax - vmin))
         else:
-            if locs[0] > locs[-1]:
-                val = locs[0]
-            else:
-                val = locs[-1]
+            val = locs.max()
             if val == 0:
                 oom = 0
             else:
@@ -977,8 +886,8 @@ def __init__(self, base=10.0, labelOnlyBase=False,
                  minor_thresholds=None,
                  linthresh=None):
 
-        self._base = float(base)
-        self.labelOnlyBase = labelOnlyBase
+        self.set_base(base)
+        self.set_label_minor(labelOnlyBase)
         if minor_thresholds is None:
             if mpl.rcParams['_internal.classic_mode']:
                 minor_thresholds = (0, 0)
@@ -988,6 +897,7 @@ def __init__(self, base=10.0, labelOnlyBase=False,
         self._sublabels = None
         self._linthresh = linthresh
 
+    @_api.deprecated("3.6", alternative='set_base()')
     def base(self, base):
         """
         Change the *base* for labeling.
@@ -995,12 +905,33 @@ def base(self, base):
         .. warning::
            Should always match the base used for :class:`LogLocator`
         """
-        self._base = base
+        self.set_base(base)
+
+    def set_base(self, base):
+        """
+        Change the *base* for labeling.
+
+        .. warning::
+           Should always match the base used for :class:`LogLocator`
+        """
+        self._base = float(base)
 
+    @_api.deprecated("3.6", alternative='set_label_minor()')
     def label_minor(self, labelOnlyBase):
         """
         Switch minor tick labeling on or off.
 
+        Parameters
+        ----------
+        labelOnlyBase : bool
+            If True, label ticks only at integer powers of base.
+        """
+        self.set_label_minor(labelOnlyBase)
+
+    def set_label_minor(self, labelOnlyBase):
+        """
+        Switch minor tick labeling on or off.
+
         Parameters
         ----------
         labelOnlyBase : bool
@@ -1085,7 +1016,7 @@ def __call__(self, x, pos=None):
         b = self._base
         # only label the decades
         fx = math.log(x) / math.log(b)
-        is_x_decade = is_close_to_int(fx)
+        is_x_decade = _is_close_to_int(fx)
         exponent = round(fx) if is_x_decade else np.floor(fx)
         coeff = round(b ** (fx - exponent))
 
@@ -1097,7 +1028,7 @@ def __call__(self, x, pos=None):
         vmin, vmax = self.axis.get_view_interval()
         vmin, vmax = mtransforms.nonsingular(vmin, vmax, expander=0.05)
         s = self._num_to_string(x, vmin, vmax)
-        return s
+        return self.fix_minus(s)
 
     def format_data(self, value):
         with cbook._setattr_cm(self, labelOnlyBase=False):
@@ -1169,7 +1100,7 @@ def __call__(self, x, pos=None):
 
         # only label the decades
         fx = math.log(x) / math.log(b)
-        is_x_decade = is_close_to_int(fx)
+        is_x_decade = _is_close_to_int(fx)
         exponent = round(fx) if is_x_decade else np.floor(fx)
         coeff = round(b ** (fx - exponent))
         if is_x_decade:
@@ -1204,7 +1135,7 @@ def _non_decade_format(self, sign_string, base, fx, usetex):
         b = float(base)
         exponent = math.floor(fx)
         coeff = b ** (fx - exponent)
-        if is_close_to_int(coeff):
+        if _is_close_to_int(coeff):
             coeff = round(coeff)
         return r'$\mathdefault{%s%g\times%s^{%d}}$' \
             % (sign_string, coeff, base, exponent)
@@ -1308,9 +1239,10 @@ def set_locs(self, locs):
         if not self._minor:
             return None
         if all(
-            is_decade(x, rtol=1e-7)
-            or is_decade(1 - x, rtol=1e-7)
-            or (is_close_to_int(2 * x) and int(np.round(2 * x)) == 1)
+            _is_decade(x, rtol=1e-7)
+            or _is_decade(1 - x, rtol=1e-7)
+            or (_is_close_to_int(2 * x) and
+                int(np.round(2 * x)) == 1)
             for x in locs
         ):
             # minor ticks are subsample from ideal, so no label
@@ -1357,7 +1289,7 @@ def _format_value(self, x, locs, sci_notation=True):
             precision = -np.log10(diff) + exponent
             precision = (
                 int(np.round(precision))
-                if is_close_to_int(precision)
+                if _is_close_to_int(precision)
                 else math.ceil(precision)
             )
             if precision < min_precision:
@@ -1379,13 +1311,13 @@ def __call__(self, x, pos=None):
             return ""
         if x <= 0 or x >= 1:
             return ""
-        if is_close_to_int(2 * x) and round(2 * x) == 1:
+        if _is_close_to_int(2 * x) and round(2 * x) == 1:
             s = self._one_half
-        elif x < 0.5 and is_decade(x, rtol=1e-7):
-            exponent = round(np.log10(x))
+        elif x < 0.5 and _is_decade(x, rtol=1e-7):
+            exponent = round(math.log10(x))
             s = "10^{%d}" % exponent
-        elif x > 0.5 and is_decade(1 - x, rtol=1e-7):
-            exponent = round(np.log10(1 - x))
+        elif x > 0.5 and _is_decade(1 - x, rtol=1e-7):
+            exponent = round(math.log10(1 - x))
             s = self._one_minus("10^{%d}" % exponent)
         elif x < 0.1:
             s = self._format_value(x, self.locs)
@@ -1509,13 +1441,13 @@ def format_eng(self, num):
         representing the power of 1000 of the original number.
         Some examples:
 
-        >>> format_eng(0)       # for self.places = 0
+        >>> format_eng(0)        # for self.places = 0
         '0'
 
-        >>> format_eng(1000000) # for self.places = 1
+        >>> format_eng(1000000)  # for self.places = 1
         '1.0 M'
 
-        >>> format_eng("-1e-6") # for self.places = 2
+        >>> format_eng("-1e-6")  # for self.places = 2
         '-1.00 \N{MICRO SIGN}'
         """
         sign = 1
@@ -1669,18 +1601,6 @@ def symbol(self, symbol):
         self._symbol = symbol
 
 
-def _if_refresh_overridden_call_and_emit_deprec(locator):
-    if not locator.refresh.__func__.__module__.startswith("matplotlib."):
-        cbook.warn_external(
-            "3.3", message="Automatic calls to Locator.refresh by the draw "
-            "machinery are deprecated since %(since)s and will be removed in "
-            "%(removal)s.  You are using a third-party locator that overrides "
-            "the refresh() method; this locator should instead perform any "
-            "required processing in __call__().")
-    with _api.suppress_matplotlib_deprecation_warning():
-        locator.refresh()
-
-
 class Locator(TickHelper):
     """
     Determine the tick locations;
@@ -1702,7 +1622,7 @@ def tick_values(self, vmin, vmax):
 
         .. note::
             To get tick locations with the vmin and vmax values defined
-            automatically for the associated :attr:`axis` simply call
+            automatically for the associated ``axis`` simply call
             the Locator instance::
 
                 >>> print(type(loc))
@@ -1770,38 +1690,6 @@ def view_limits(self, vmin, vmax):
         """
         return mtransforms.nonsingular(vmin, vmax)
 
-    @_api.deprecated("3.3")
-    def pan(self, numsteps):
-        """Pan numticks (can be positive or negative)"""
-        ticks = self()
-        numticks = len(ticks)
-
-        vmin, vmax = self.axis.get_view_interval()
-        vmin, vmax = mtransforms.nonsingular(vmin, vmax, expander=0.05)
-        if numticks > 2:
-            step = numsteps * abs(ticks[0] - ticks[1])
-        else:
-            d = abs(vmax - vmin)
-            step = numsteps * d / 6.
-
-        vmin += step
-        vmax += step
-        self.axis.set_view_interval(vmin, vmax, ignore=True)
-
-    @_api.deprecated("3.3")
-    def zoom(self, direction):
-        """Zoom in/out on axis; if direction is >0 zoom in, else zoom out."""
-
-        vmin, vmax = self.axis.get_view_interval()
-        vmin, vmax = mtransforms.nonsingular(vmin, vmax, expander=0.05)
-        interval = abs(vmax - vmin)
-        step = 0.1 * interval * direction
-        self.axis.set_view_interval(vmin + step, vmax - step, ignore=True)
-
-    @_api.deprecated("3.3")
-    def refresh(self):
-        """Refresh internal information based on current limits."""
-
 
 class IndexLocator(Locator):
     """
@@ -2083,7 +1971,7 @@ class MaxNLocator(Locator):
                           prune=None,
                           min_n_ticks=2)
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, nbins=None, **kwargs):
         """
         Parameters
         ----------
@@ -2120,17 +2008,8 @@ def __init__(self, *args, **kwargs):
             Relax *nbins* and *integer* constraints if necessary to obtain
             this minimum number of ticks.
         """
-        if args:
-            if 'nbins' in kwargs:
-                _api.deprecated("3.1",
-                                message='Calling MaxNLocator with positional '
-                                        'and keyword parameter *nbins* is '
-                                        'considered an error and will fail '
-                                        'in future versions of matplotlib.')
-            kwargs['nbins'] = args[0]
-            if len(args) > 1:
-                raise ValueError(
-                    "Keywords are required for all arguments except 'nbins'")
+        if nbins is not None:
+            kwargs['nbins'] = nbins
         self.set_params(**{**self.default_params, **kwargs})
 
     @staticmethod
@@ -2294,6 +2173,7 @@ def view_limits(self, dmin, dmax):
             return dmin, dmax
 
 
+@_api.deprecated("3.6")
 def is_decade(x, base=10, *, rtol=1e-10):
     if not np.isfinite(x):
         return False
@@ -2303,6 +2183,19 @@ def is_decade(x, base=10, *, rtol=1e-10):
     return is_close_to_int(lx, atol=rtol)
 
 
+def _is_decade(x, *, base=10, rtol=None):
+    """Return True if *x* is an integer power of *base*."""
+    if not np.isfinite(x):
+        return False
+    if x == 0.0:
+        return True
+    lx = np.log(abs(x)) / np.log(base)
+    if rtol is None:
+        return np.isclose(lx, np.round(lx))
+    else:
+        return np.isclose(lx, np.round(lx), rtol=rtol)
+
+
 def _decade_less_equal(x, base):
     """
     Return the largest integer power of *base* that's less or equal to *x*.
@@ -2353,10 +2246,15 @@ def _decade_greater(x, base):
     return greater
 
 
+@_api.deprecated("3.6")
 def is_close_to_int(x, *, atol=1e-10):
     return abs(x - np.round(x)) < atol
 
 
+def _is_close_to_int(x):
+    return math.isclose(x, round(x))
+
+
 class LogLocator(Locator):
     """
     Determine the tick locations for log axes
@@ -2369,7 +2267,8 @@ def __init__(self, base=10.0, subs=(1.0,), numdecs=4, numticks=None):
         Parameters
         ----------
         base : float, default: 10.0
-            The base of the log used, so ticks are placed at ``base**n``.
+            The base of the log used, so major ticks are placed at
+            ``base**n``, n integer.
         subs : None or str or sequence of float, default: (1.0,)
             Gives the multiples of integer powers of the base at which
             to place ticks.  The default places ticks only at
@@ -2392,30 +2291,35 @@ def __init__(self, base=10.0, subs=(1.0,), numdecs=4, numticks=None):
                 numticks = 15
             else:
                 numticks = 'auto'
-        self.base(base)
-        self.subs(subs)
+        self._base = float(base)
+        self._set_subs(subs)
         self.numdecs = numdecs
         self.numticks = numticks
 
     def set_params(self, base=None, subs=None, numdecs=None, numticks=None):
         """Set parameters within this locator."""
         if base is not None:
-            self.base(base)
+            self._base = float(base)
         if subs is not None:
-            self.subs(subs)
+            self._set_subs(subs)
         if numdecs is not None:
             self.numdecs = numdecs
         if numticks is not None:
             self.numticks = numticks
 
-    # FIXME: these base and subs functions are contrary to our
-    # usual and desired API.
-
+    @_api.deprecated("3.6", alternative='set_params(base=...)')
     def base(self, base):
         """Set the log base (major tick every ``base**i``, i integer)."""
         self._base = float(base)
 
+    @_api.deprecated("3.6", alternative='set_params(subs=...)')
     def subs(self, subs):
+        """
+        Set the minor ticks for the log scaling every ``base**i*subs[j]``.
+        """
+        self._set_subs(subs)
+
+    def _set_subs(self, subs):
         """
         Set the minor ticks for the log scaling every ``base**i*subs[j]``.
         """
@@ -2733,6 +2637,118 @@ def view_limits(self, vmin, vmax):
         return result
 
 
+class AsinhLocator(Locator):
+    """
+    An axis tick locator specialized for the inverse-sinh scale
+
+    This is very unlikely to have any use beyond
+    the `~.scale.AsinhScale` class.
+
+    .. note::
+
+       This API is provisional and may be revised in the future
+       based on early user feedback.
+    """
+    def __init__(self, linear_width, numticks=11, symthresh=0.2,
+                 base=10, subs=None):
+        """
+        Parameters
+        ----------
+        linear_width : float
+            The scale parameter defining the extent
+            of the quasi-linear region.
+        numticks : int, default: 11
+            The approximate number of major ticks that will fit
+            along the entire axis
+        symthresh : float, default: 0.2
+            The fractional threshold beneath which data which covers
+            a range that is approximately symmetric about zero
+            will have ticks that are exactly symmetric.
+        base : int, default: 10
+            The number base used for rounding tick locations
+            on a logarithmic scale. If this is less than one,
+            then rounding is to the nearest integer multiple
+            of powers of ten.
+        subs : tuple, default: None
+            Multiples of the number base, typically used
+            for the minor ticks, e.g. (2, 5) when base=10.
+        """
+        super().__init__()
+        self.linear_width = linear_width
+        self.numticks = numticks
+        self.symthresh = symthresh
+        self.base = base
+        self.subs = subs
+
+    def set_params(self, numticks=None, symthresh=None,
+                   base=None, subs=None):
+        """Set parameters within this locator."""
+        if numticks is not None:
+            self.numticks = numticks
+        if symthresh is not None:
+            self.symthresh = symthresh
+        if base is not None:
+            self.base = base
+        if subs is not None:
+            self.subs = subs if len(subs) > 0 else None
+
+    def __call__(self):
+        vmin, vmax = self.axis.get_view_interval()
+        if (vmin * vmax) < 0 and abs(1 + vmax / vmin) < self.symthresh:
+            # Data-range appears to be almost symmetric, so round up:
+            bound = max(abs(vmin), abs(vmax))
+            return self.tick_values(-bound, bound)
+        else:
+            return self.tick_values(vmin, vmax)
+
+    def tick_values(self, vmin, vmax):
+        # Construct a set of "on-screen" locations
+        # that are uniformly spaced:
+        ymin, ymax = self.linear_width * np.arcsinh(np.array([vmin, vmax])
+                                                        / self.linear_width)
+        ys = np.linspace(ymin, ymax, self.numticks)
+        zero_dev = np.abs(ys / (ymax - ymin))
+        if (ymin * ymax) < 0:
+            # Ensure that the zero tick-mark is included,
+            # if the axis straddles zero
+            ys = np.hstack([ys[(zero_dev > 0.5 / self.numticks)], 0.0])
+
+        # Transform the "on-screen" grid to the data space:
+        xs = self.linear_width * np.sinh(ys / self.linear_width)
+        zero_xs = (ys == 0)
+
+        # Round the data-space values to be intuitive base-n numbers,
+        # keeping track of positive and negative values separately,
+        # but giving careful treatment to the zero value:
+        if self.base > 1:
+            log_base = math.log(self.base)
+            powers = (
+                np.where(zero_xs, 0, np.sign(xs)) *
+                np.power(self.base,
+                         np.where(zero_xs, 0.0,
+                                  np.floor(np.log(np.abs(xs) + zero_xs*1e-6)
+                                                / log_base)))
+            )
+            if self.subs:
+                qs = np.outer(powers, self.subs).flatten()
+            else:
+                qs = powers
+        else:
+            powers = (
+                np.where(xs >= 0, 1, -1) *
+                np.power(10, np.where(zero_xs, 0.0,
+                                      np.floor(np.log10(np.abs(xs)
+                                                        + zero_xs*1e-6))))
+            )
+            qs = powers * np.round(xs / powers)
+        ticks = np.array(sorted(set(qs)))
+
+        if len(ticks) >= 2:
+            return ticks
+        else:
+            return np.linspace(vmin, vmax, self.numticks)
+
+
 class LogitLocator(MaxNLocator):
     """
     Determine the tick locations for logit axes
@@ -2960,58 +2976,3 @@ def __call__(self):
     def tick_values(self, vmin, vmax):
         raise NotImplementedError('Cannot get tick locations for a '
                                   '%s type.' % type(self))
-
-
-@_api.deprecated("3.3")
-class OldAutoLocator(Locator):
-    """
-    On autoscale this class picks the best MultipleLocator to set the
-    view limits and the tick locs.
-    """
-
-    def __call__(self):
-        # docstring inherited
-        vmin, vmax = self.axis.get_view_interval()
-        vmin, vmax = mtransforms.nonsingular(vmin, vmax, expander=0.05)
-        d = abs(vmax - vmin)
-        locator = self.get_locator(d)
-        return self.raise_if_exceeds(locator())
-
-    def tick_values(self, vmin, vmax):
-        raise NotImplementedError('Cannot get tick locations for a '
-                                  '%s type.' % type(self))
-
-    def view_limits(self, vmin, vmax):
-        # docstring inherited
-        d = abs(vmax - vmin)
-        locator = self.get_locator(d)
-        return locator.view_limits(vmin, vmax)
-
-    def get_locator(self, d):
-        """Pick the best locator based on a distance *d*."""
-        d = abs(d)
-        if d <= 0:
-            locator = MultipleLocator(0.2)
-        else:
-
-            try:
-                ld = math.log10(d)
-            except OverflowError as err:
-                raise RuntimeError('AutoLocator illegal data interval '
-                                   'range') from err
-
-            fld = math.floor(ld)
-            base = 10 ** fld
-
-            #if ld==fld:  base = 10**(fld-1)
-            #else:        base = 10**fld
-
-            if d >= 5 * base:
-                ticksize = base
-            elif d >= 2 * base:
-                ticksize = base / 2.0
-            else:
-                ticksize = base / 5.0
-            locator = MultipleLocator(ticksize)
-
-        return locator
diff --git a/lib/matplotlib/tight_bbox.py b/lib/matplotlib/tight_bbox.py
index 5904ebc1fa1c..88c4c1ec51af 100644
--- a/lib/matplotlib/tight_bbox.py
+++ b/lib/matplotlib/tight_bbox.py
@@ -1,88 +1,3 @@
-"""
-Helper module for the *bbox_inches* parameter in `.Figure.savefig`.
-"""
-
-from matplotlib.transforms import Bbox, TransformedBbox, Affine2D
-
-
-def adjust_bbox(fig, bbox_inches, fixed_dpi=None):
-    """
-    Temporarily adjust the figure so that only the specified area
-    (bbox_inches) is saved.
-
-    It modifies fig.bbox, fig.bbox_inches,
-    fig.transFigure._boxout, and fig.patch.  While the figure size
-    changes, the scale of the original figure is conserved.  A
-    function which restores the original values are returned.
-    """
-    origBbox = fig.bbox
-    origBboxInches = fig.bbox_inches
-    orig_tight_layout = fig.get_tight_layout()
-    _boxout = fig.transFigure._boxout
-
-    fig.set_tight_layout(False)
-
-    old_aspect = []
-    locator_list = []
-    sentinel = object()
-    for ax in fig.axes:
-        locator_list.append(ax.get_axes_locator())
-        current_pos = ax.get_position(original=False).frozen()
-        ax.set_axes_locator(lambda a, r, _pos=current_pos: _pos)
-        # override the method that enforces the aspect ratio on the Axes
-        if 'apply_aspect' in ax.__dict__:
-            old_aspect.append(ax.apply_aspect)
-        else:
-            old_aspect.append(sentinel)
-        ax.apply_aspect = lambda pos=None: None
-
-    def restore_bbox():
-        for ax, loc, aspect in zip(fig.axes, locator_list, old_aspect):
-            ax.set_axes_locator(loc)
-            if aspect is sentinel:
-                # delete our no-op function which un-hides the original method
-                del ax.apply_aspect
-            else:
-                ax.apply_aspect = aspect
-
-        fig.bbox = origBbox
-        fig.bbox_inches = origBboxInches
-        fig.set_tight_layout(orig_tight_layout)
-        fig.transFigure._boxout = _boxout
-        fig.transFigure.invalidate()
-        fig.patch.set_bounds(0, 0, 1, 1)
-
-    if fixed_dpi is None:
-        fixed_dpi = fig.dpi
-    tr = Affine2D().scale(fixed_dpi)
-    dpi_scale = fixed_dpi / fig.dpi
-
-    _bbox = TransformedBbox(bbox_inches, tr)
-
-    fig.bbox_inches = Bbox.from_bounds(0, 0,
-                                       bbox_inches.width, bbox_inches.height)
-    x0, y0 = _bbox.x0, _bbox.y0
-    w1, h1 = fig.bbox.width * dpi_scale, fig.bbox.height * dpi_scale
-    fig.transFigure._boxout = Bbox.from_bounds(-x0, -y0, w1, h1)
-    fig.transFigure.invalidate()
-
-    fig.bbox = TransformedBbox(fig.bbox_inches, tr)
-
-    fig.patch.set_bounds(x0 / w1, y0 / h1,
-                         fig.bbox.width / w1, fig.bbox.height / h1)
-
-    return restore_bbox
-
-
-def process_figure_for_rasterizing(fig, bbox_inches_restore, fixed_dpi=None):
-    """
-    A function that needs to be called when figure dpi changes during the
-    drawing (e.g., rasterizing).  It recovers the bbox and re-adjust it with
-    the new dpi.
-    """
-
-    bbox_inches, restore_bbox = bbox_inches_restore
-    restore_bbox()
-    r = adjust_bbox(fig, bbox_inches, fixed_dpi)
-
-    return bbox_inches, r
+from matplotlib._tight_bbox import *  # noqa: F401, F403
+from matplotlib import _api
+_api.warn_deprecated("3.6", name=__name__, obj_type="module")
diff --git a/lib/matplotlib/tight_layout.py b/lib/matplotlib/tight_layout.py
index 81eb1e6adc87..233e96c0d47a 100644
--- a/lib/matplotlib/tight_layout.py
+++ b/lib/matplotlib/tight_layout.py
@@ -1,347 +1,13 @@
-"""
-Routines to adjust subplot params so that subplots are
-nicely fit in the figure. In doing so, only axis labels, tick labels, axes
-titles and offsetboxes that are anchored to axes are currently considered.
-
-Internally, this module assumes that the margins (left_margin, etc.) which are
-differences between ax.get_tightbbox and ax.bbox are independent of axes
-position. This may fail if Axes.adjustable is datalim. Also, This will fail
-for some cases (for example, left or right margin is affected by xlabel).
-"""
-
-import numpy as np
-
-from matplotlib import _api, rcParams
-from matplotlib.font_manager import FontProperties
-from matplotlib.transforms import TransformedBbox, Bbox
-
-
-def auto_adjust_subplotpars(
-        fig, renderer, nrows_ncols, num1num2_list, subplot_list,
-        ax_bbox_list=None, pad=1.08, h_pad=None, w_pad=None, rect=None):
-    """
-    Return a dict of subplot parameters to adjust spacing between subplots
-    or ``None`` if resulting axes would have zero height or width.
-
-    Note that this function ignores geometry information of subplot
-    itself, but uses what is given by the *nrows_ncols* and *num1num2_list*
-    parameters.  Also, the results could be incorrect if some subplots have
-    ``adjustable=datalim``.
-
-    Parameters
-    ----------
-    nrows_ncols : tuple[int, int]
-        Number of rows and number of columns of the grid.
-    num1num2_list : list[int]
-        List of numbers specifying the area occupied by the subplot
-    subplot_list : list of subplots
-        List of subplots that will be used to calculate optimal subplot_params.
-    pad : float
-        Padding between the figure edge and the edges of subplots, as a
-        fraction of the font size.
-    h_pad, w_pad : float
-        Padding (height/width) between edges of adjacent subplots, as a
-        fraction of the font size.  Defaults to *pad*.
-    rect : tuple[float, float, float, float]
-        [left, bottom, right, top] in normalized (0, 1) figure coordinates.
-    """
-    rows, cols = nrows_ncols
-
-    font_size_inches = (
-        FontProperties(size=rcParams["font.size"]).get_size_in_points() / 72)
-    pad_inches = pad * font_size_inches
-    vpad_inches = h_pad * font_size_inches if h_pad is not None else pad_inches
-    hpad_inches = w_pad * font_size_inches if w_pad is not None else pad_inches
-
-    if len(num1num2_list) != len(subplot_list) or len(subplot_list) == 0:
-        raise ValueError
-
-    if rect is None:
-        margin_left = margin_bottom = margin_right = margin_top = None
-    else:
-        margin_left, margin_bottom, _right, _top = rect
-        margin_right = 1 - _right if _right else None
-        margin_top = 1 - _top if _top else None
-
-    vspaces = np.zeros((rows + 1, cols))
-    hspaces = np.zeros((rows, cols + 1))
-
-    if ax_bbox_list is None:
-        ax_bbox_list = [
-            Bbox.union([ax.get_position(original=True) for ax in subplots])
-            for subplots in subplot_list]
-
-    for subplots, ax_bbox, (num1, num2) in zip(subplot_list,
-                                               ax_bbox_list,
-                                               num1num2_list):
-        if all(not ax.get_visible() for ax in subplots):
-            continue
-
-        bb = []
-        for ax in subplots:
-            if ax.get_visible():
-                try:
-                    bb += [ax.get_tightbbox(renderer, for_layout_only=True)]
-                except TypeError:
-                    bb += [ax.get_tightbbox(renderer)]
-
-        tight_bbox_raw = Bbox.union(bb)
-        tight_bbox = TransformedBbox(tight_bbox_raw,
-                                     fig.transFigure.inverted())
-
-        row1, col1 = divmod(num1, cols)
-        if num2 is None:
-            num2 = num1
-        row2, col2 = divmod(num2, cols)
-
-        for row_i in range(row1, row2 + 1):
-            hspaces[row_i, col1] += ax_bbox.xmin - tight_bbox.xmin  # left
-            hspaces[row_i, col2 + 1] += tight_bbox.xmax - ax_bbox.xmax  # right
-        for col_i in range(col1, col2 + 1):
-            vspaces[row1, col_i] += tight_bbox.ymax - ax_bbox.ymax  # top
-            vspaces[row2 + 1, col_i] += ax_bbox.ymin - tight_bbox.ymin  # bot.
-
-    fig_width_inch, fig_height_inch = fig.get_size_inches()
-
-    # margins can be negative for axes with aspect applied, so use max(, 0) to
-    # make them nonnegative.
-    if not margin_left:
-        margin_left = (max(hspaces[:, 0].max(), 0)
-                       + pad_inches / fig_width_inch)
-        suplabel = fig._supylabel
-        if suplabel and suplabel.get_in_layout():
-            rel_width = fig.transFigure.inverted().transform_bbox(
-                suplabel.get_window_extent(renderer)).width
-            margin_left += rel_width + pad_inches / fig_width_inch
-
-    if not margin_right:
-        margin_right = (max(hspaces[:, -1].max(), 0)
-                        + pad_inches / fig_width_inch)
-    if not margin_top:
-        margin_top = (max(vspaces[0, :].max(), 0)
-                      + pad_inches / fig_height_inch)
-        if fig._suptitle and fig._suptitle.get_in_layout():
-            rel_height = fig.transFigure.inverted().transform_bbox(
-                fig._suptitle.get_window_extent(renderer)).height
-            margin_top += rel_height + pad_inches / fig_height_inch
-    if not margin_bottom:
-        margin_bottom = (max(vspaces[-1, :].max(), 0)
-                         + pad_inches / fig_height_inch)
-        suplabel = fig._supxlabel
-        if suplabel and suplabel.get_in_layout():
-            rel_height = fig.transFigure.inverted().transform_bbox(
-                suplabel.get_window_extent(renderer)).height
-            margin_bottom += rel_height + pad_inches / fig_height_inch
-
-    if margin_left + margin_right >= 1:
-        _api.warn_external('Tight layout not applied. The left and right '
-                           'margins cannot be made large enough to '
-                           'accommodate all axes decorations. ')
-        return None
-    if margin_bottom + margin_top >= 1:
-        _api.warn_external('Tight layout not applied. The bottom and top '
-                           'margins cannot be made large enough to '
-                           'accommodate all axes decorations. ')
-        return None
-
-    kwargs = dict(left=margin_left,
-                  right=1 - margin_right,
-                  bottom=margin_bottom,
-                  top=1 - margin_top)
-
-    if cols > 1:
-        hspace = hspaces[:, 1:-1].max() + hpad_inches / fig_width_inch
-        # axes widths:
-        h_axes = (1 - margin_right - margin_left - hspace * (cols - 1)) / cols
-        if h_axes < 0:
-            _api.warn_external('Tight layout not applied. tight_layout '
-                               'cannot make axes width small enough to '
-                               'accommodate all axes decorations')
-            return None
-        else:
-            kwargs["wspace"] = hspace / h_axes
-    if rows > 1:
-        vspace = vspaces[1:-1, :].max() + vpad_inches / fig_height_inch
-        v_axes = (1 - margin_top - margin_bottom - vspace * (rows - 1)) / rows
-        if v_axes < 0:
-            _api.warn_external('Tight layout not applied. tight_layout '
-                               'cannot make axes height small enough to '
-                               'accommodate all axes decorations')
-            return None
-        else:
-            kwargs["hspace"] = vspace / v_axes
-
-    return kwargs
+from matplotlib._tight_layout import *  # noqa: F401, F403
+from matplotlib import _api
+_api.warn_deprecated("3.6", name=__name__, obj_type="module")
 
 
+@_api.deprecated("3.6", alternative="figure.canvas.get_renderer()")
 def get_renderer(fig):
-    if fig._cachedRenderer:
-        return fig._cachedRenderer
+    canvas = fig.canvas
+    if canvas and hasattr(canvas, "get_renderer"):
+        return canvas.get_renderer()
     else:
-        canvas = fig.canvas
-        if canvas and hasattr(canvas, "get_renderer"):
-            return canvas.get_renderer()
-        else:
-            from . import backend_bases
-            return backend_bases._get_renderer(fig)
-
-
-def get_subplotspec_list(axes_list, grid_spec=None):
-    """
-    Return a list of subplotspec from the given list of axes.
-
-    For an instance of axes that does not support subplotspec, None is inserted
-    in the list.
-
-    If grid_spec is given, None is inserted for those not from the given
-    grid_spec.
-    """
-    subplotspec_list = []
-    for ax in axes_list:
-        axes_or_locator = ax.get_axes_locator()
-        if axes_or_locator is None:
-            axes_or_locator = ax
-
-        if hasattr(axes_or_locator, "get_subplotspec"):
-            subplotspec = axes_or_locator.get_subplotspec()
-            subplotspec = subplotspec.get_topmost_subplotspec()
-            gs = subplotspec.get_gridspec()
-            if grid_spec is not None:
-                if gs != grid_spec:
-                    subplotspec = None
-            elif gs.locally_modified_subplot_params():
-                subplotspec = None
-        else:
-            subplotspec = None
-
-        subplotspec_list.append(subplotspec)
-
-    return subplotspec_list
-
-
-def get_tight_layout_figure(fig, axes_list, subplotspec_list, renderer,
-                            pad=1.08, h_pad=None, w_pad=None, rect=None):
-    """
-    Return subplot parameters for tight-layouted-figure with specified padding.
-
-    Parameters
-    ----------
-    fig : Figure
-    axes_list : list of Axes
-    subplotspec_list : list of `.SubplotSpec`
-        The subplotspecs of each axes.
-    renderer : renderer
-    pad : float
-        Padding between the figure edge and the edges of subplots, as a
-        fraction of the font size.
-    h_pad, w_pad : float
-        Padding (height/width) between edges of adjacent subplots.  Defaults to
-        *pad*.
-    rect : tuple[float, float, float, float], optional
-        (left, bottom, right, top) rectangle in normalized figure coordinates
-        that the whole subplots area (including labels) will fit into.
-        Defaults to using the entire figure.
-
-    Returns
-    -------
-    subplotspec or None
-        subplotspec kwargs to be passed to `.Figure.subplots_adjust` or
-        None if tight_layout could not be accomplished.
-    """
-
-    subplot_list = []
-    nrows_list = []
-    ncols_list = []
-    ax_bbox_list = []
-
-    # Multiple axes can share same subplot_interface (e.g., axes_grid1); thus
-    # we need to join them together.
-    subplot_dict = {}
-
-    subplotspec_list2 = []
-
-    for ax, subplotspec in zip(axes_list, subplotspec_list):
-        if subplotspec is None:
-            continue
-
-        subplots = subplot_dict.setdefault(subplotspec, [])
-
-        if not subplots:
-            myrows, mycols, _, _ = subplotspec.get_geometry()
-            nrows_list.append(myrows)
-            ncols_list.append(mycols)
-            subplotspec_list2.append(subplotspec)
-            subplot_list.append(subplots)
-            ax_bbox_list.append(subplotspec.get_position(fig))
-
-        subplots.append(ax)
-
-    if len(nrows_list) == 0 or len(ncols_list) == 0:
-        return {}
-
-    max_nrows = max(nrows_list)
-    max_ncols = max(ncols_list)
-
-    num1num2_list = []
-    for subplotspec in subplotspec_list2:
-        rows, cols, num1, num2 = subplotspec.get_geometry()
-        div_row, mod_row = divmod(max_nrows, rows)
-        div_col, mod_col = divmod(max_ncols, cols)
-        if mod_row != 0:
-            _api.warn_external('tight_layout not applied: number of rows '
-                               'in subplot specifications must be '
-                               'multiples of one another.')
-            return {}
-        if mod_col != 0:
-            _api.warn_external('tight_layout not applied: number of '
-                               'columns in subplot specifications must be '
-                               'multiples of one another.')
-            return {}
-
-        rowNum1, colNum1 = divmod(num1, cols)
-        if num2 is None:
-            rowNum2, colNum2 = rowNum1, colNum1
-        else:
-            rowNum2, colNum2 = divmod(num2, cols)
-
-        num1num2_list.append((rowNum1 * div_row * max_ncols +
-                              colNum1 * div_col,
-                              ((rowNum2 + 1) * div_row - 1) * max_ncols +
-                              (colNum2 + 1) * div_col - 1))
-
-    kwargs = auto_adjust_subplotpars(fig, renderer,
-                                     nrows_ncols=(max_nrows, max_ncols),
-                                     num1num2_list=num1num2_list,
-                                     subplot_list=subplot_list,
-                                     ax_bbox_list=ax_bbox_list,
-                                     pad=pad, h_pad=h_pad, w_pad=w_pad)
-
-    # kwargs can be none if tight_layout fails...
-    if rect is not None and kwargs is not None:
-        # if rect is given, the whole subplots area (including
-        # labels) will fit into the rect instead of the
-        # figure. Note that the rect argument of
-        # *auto_adjust_subplotpars* specify the area that will be
-        # covered by the total area of axes.bbox. Thus we call
-        # auto_adjust_subplotpars twice, where the second run
-        # with adjusted rect parameters.
-
-        left, bottom, right, top = rect
-        if left is not None:
-            left += kwargs["left"]
-        if bottom is not None:
-            bottom += kwargs["bottom"]
-        if right is not None:
-            right -= (1 - kwargs["right"])
-        if top is not None:
-            top -= (1 - kwargs["top"])
-
-        kwargs = auto_adjust_subplotpars(fig, renderer,
-                                         nrows_ncols=(max_nrows, max_ncols),
-                                         num1num2_list=num1num2_list,
-                                         subplot_list=subplot_list,
-                                         ax_bbox_list=ax_bbox_list,
-                                         pad=pad, h_pad=h_pad, w_pad=w_pad,
-                                         rect=(left, bottom, right, top))
-
-    return kwargs
+        from . import backend_bases
+        return backend_bases._get_renderer(fig)
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
index 9a50e4bf0048..1471d4fe672d 100644
--- a/lib/matplotlib/transforms.py
+++ b/lib/matplotlib/transforms.py
@@ -27,6 +27,9 @@
 
 The backends are not expected to handle non-affine transformations
 themselves.
+
+See the tutorial :doc:`/tutorials/advanced/transforms_tutorial` for examples
+of how to use transforms.
 """
 
 # Note: There are a number of places in the code where we use `np.min` or
@@ -151,22 +154,6 @@ def __copy__(self):
                 other.set_children(val)  # val == getattr(other, key)
         return other
 
-    def __deepcopy__(self, memo):
-        # We could deepcopy the entire transform tree, but nothing except
-        # `self` is accessible publicly, so we may as well just freeze `self`.
-        other = self.frozen()
-        if other is not self:
-            return other
-        # Some classes implement frozen() as returning self, which is not
-        # acceptable for deepcopying, so we need to handle them separately.
-        other = copy.deepcopy(super(), memo)
-        # If `c = a + b; a1 = copy(a)`, then modifications to `a1` do not
-        # propagate back to `c`, i.e. we need to clear the parents of `a1`.
-        other._parents = {}
-        # If `c = a + b; c1 = copy(c)`, this creates a separate tree
-        # (`c1 = a1 + b1`) so nothing needs to be done.
-        return other
-
     def invalidate(self):
         """
         Invalidate this `TransformNode` and triggers an invalidation of its
@@ -493,14 +480,6 @@ def transformed(self, transform):
             [pts[0], [pts[0, 0], pts[1, 1]], [pts[1, 0], pts[0, 1]]]))
         return Bbox([ll, [lr[0], ul[1]]])
 
-    @_api.deprecated("3.3", alternative="transformed(transform.inverted())")
-    def inverse_transformed(self, transform):
-        """
-        Construct a `Bbox` by statically transforming this one by the inverse
-        of *transform*.
-        """
-        return self.transformed(transform.inverted())
-
     coefs = {'C':  (0.5, 0.5),
              'SW': (0, 0),
              'S':  (0.5, 0),
@@ -513,26 +492,21 @@ def inverse_transformed(self, transform):
 
     def anchored(self, c, container=None):
         """
-        Return a copy of the `Bbox` shifted to position *c* within *container*.
+        Return a copy of the `Bbox` anchored to *c* within *container*.
 
         Parameters
         ----------
-        c : (float, float) or str
-            May be either:
-
-            * A sequence (*cx*, *cy*) where *cx* and *cy* range from 0
-              to 1, where 0 is left or bottom and 1 is right or top
-
-            * a string:
-              - 'C' for centered
-              - 'S' for bottom-center
-              - 'SE' for bottom-left
-              - 'E' for left
-              - etc.
-
+        c : (float, float) or {'C', 'SW', 'S', 'SE', 'E', 'NE', ...}
+            Either an (*x*, *y*) pair of relative coordinates (0 is left or
+            bottom, 1 is right or top), 'C' (center), or a cardinal direction
+            ('SW', southwest, is bottom left, etc.).
         container : `Bbox`, optional
             The box within which the `Bbox` is positioned; it defaults
             to the initial `Bbox`.
+
+        See Also
+        --------
+        .Axes.set_anchor
         """
         if container is None:
             container = self
@@ -807,6 +781,12 @@ def invalidate(self):
             self._check(self._points)
             super().invalidate()
 
+    def frozen(self):
+        # docstring inherited
+        frozen_bbox = super().frozen()
+        frozen_bbox._minpos = self.minpos.copy()
+        return frozen_bbox
+
     @staticmethod
     def unit():
         """Create a new unit `Bbox` from (0, 0) to (1, 1)."""
@@ -909,11 +889,51 @@ def update_from_path(self, path, ignore=None, updatex=True, updatey=True):
                 self._points[:, 1] = points[:, 1]
                 self._minpos[1] = minpos[1]
 
+    def update_from_data_x(self, x, ignore=None):
+        """
+        Update the x-bounds of the `Bbox` based on the passed in data. After
+        updating, the bounds will have positive *width*, and *x0* will be the
+        minimal value.
+
+        Parameters
+        ----------
+        x : ndarray
+            Array of x-values.
+
+        ignore : bool, optional
+           - When ``True``, ignore the existing bounds of the `Bbox`.
+           - When ``False``, include the existing bounds of the `Bbox`.
+           - When ``None``, use the last value passed to :meth:`ignore`.
+        """
+        x = np.ravel(x)
+        self.update_from_data_xy(np.column_stack([x, np.ones(x.size)]),
+                                 ignore=ignore, updatey=False)
+
+    def update_from_data_y(self, y, ignore=None):
+        """
+        Update the y-bounds of the `Bbox` based on the passed in data. After
+        updating, the bounds will have positive *height*, and *y0* will be the
+        minimal value.
+
+        Parameters
+        ----------
+        y : ndarray
+            Array of y-values.
+
+        ignore : bool, optional
+           - When ``True``, ignore the existing bounds of the `Bbox`.
+           - When ``False``, include the existing bounds of the `Bbox`.
+           - When ``None``, use the last value passed to :meth:`ignore`.
+        """
+        y = np.array(y).ravel()
+        self.update_from_data_xy(np.column_stack([np.ones(y.size), y]),
+                                 ignore=ignore, updatex=False)
+
     def update_from_data_xy(self, xy, ignore=None, updatex=True, updatey=True):
         """
-        Update the bounds of the `Bbox` based on the passed in
-        data.  After updating, the bounds will have positive *width*
-        and *height*; *x0* and *y0* will be the minimal values.
+        Update the bounds of the `Bbox` based on the passed in data. After
+        updating, the bounds will have positive *width* and *height*;
+        *x0* and *y0* will be the minimal values.
 
         Parameters
         ----------
@@ -1378,7 +1398,7 @@ def contains_branch_seperately(self, other_transform):
         each separate dimension.
 
         A common use for this method is to identify if a transform is a blended
-        transform containing an axes' data transform. e.g.::
+        transform containing an Axes' data transform. e.g.::
 
             x_isdata, y_isdata = trans.contains_branch_seperately(ax.transData)
 
@@ -1457,7 +1477,7 @@ def transform(self, values):
         Returns
         -------
         array
-            The output values as NumPy array of length :attr:`input_dims` or
+            The output values as NumPy array of length :attr:`output_dims` or
             shape (N x :attr:`output_dims`), depending on the input.
         """
         # Ensure that values is a 2d array (but remember whether
@@ -1502,7 +1522,7 @@ def transform_affine(self, values):
         Returns
         -------
         array
-            The output values as NumPy array of length :attr:`input_dims` or
+            The output values as NumPy array of length :attr:`output_dims` or
             shape (N x :attr:`output_dims`), depending on the input.
         """
         return self.get_affine().transform(values)
@@ -1527,7 +1547,7 @@ def transform_non_affine(self, values):
         Returns
         -------
         array
-            The output values as NumPy array of length :attr:`input_dims` or
+            The output values as NumPy array of length :attr:`output_dims` or
             shape (N x :attr:`output_dims`), depending on the input.
         """
         return values
@@ -1623,11 +1643,10 @@ def transform_angles(self, angles, pts, radians=False, pushoff=1e-5):
             raise NotImplementedError('Only defined in 2D')
         angles = np.asarray(angles)
         pts = np.asarray(pts)
-        if angles.ndim != 1 or angles.shape[0] != pts.shape[0]:
-            raise ValueError("'angles' must be a column vector and have same "
-                             "number of rows as 'pts'")
-        if pts.shape[1] != 2:
-            raise ValueError("'pts' must be array with 2 columns for x, y")
+        _api.check_shape((None, 2), pts=pts)
+        _api.check_shape((None,), angles=angles)
+        if len(angles) != len(pts):
+            raise ValueError("There must be as many 'angles' as 'pts'")
         # Convert to radians if desired
         if not radians:
             angles = np.deg2rad(angles)
@@ -1881,7 +1900,14 @@ def __init__(self, matrix=None, **kwargs):
         self._mtx = matrix.copy()
         self._invalid = 0
 
-    __str__ = _make_str_method("_mtx")
+    _base_str = _make_str_method("_mtx")
+
+    def __str__(self):
+        return (self._base_str()
+                if (self._mtx != np.diag(np.diag(self._mtx))).any()
+                else f"Affine2D().scale({self._mtx[0, 0]}, {self._mtx[1, 1]})"
+                if self._mtx[0, 0] != self._mtx[1, 1]
+                else f"Affine2D().scale({self._mtx[0, 0]})")
 
     @staticmethod
     def from_values(a, b, c, d, e, f):
@@ -1935,6 +1961,7 @@ def set(self, other):
         self.invalidate()
 
     @staticmethod
+    @_api.deprecated("3.6", alternative="Affine2D()")
     def identity():
         """
         Return a new `Affine2D` object that is the identity transform.
@@ -1963,9 +1990,16 @@ def rotate(self, theta):
         """
         a = math.cos(theta)
         b = math.sin(theta)
-        rotate_mtx = np.array([[a, -b, 0.0], [b, a, 0.0], [0.0, 0.0, 1.0]],
-                              float)
-        self._mtx = np.dot(rotate_mtx, self._mtx)
+        mtx = self._mtx
+        # Operating and assigning one scalar at a time is much faster.
+        (xx, xy, x0), (yx, yy, y0), _ = mtx.tolist()
+        # mtx = [[a -b 0], [b a 0], [0 0 1]] * mtx
+        mtx[0, 0] = a * xx - b * yx
+        mtx[0, 1] = a * xy - b * yy
+        mtx[0, 2] = a * x0 - b * y0
+        mtx[1, 0] = b * xx + a * yx
+        mtx[1, 1] = b * xy + a * yy
+        mtx[1, 2] = b * x0 + a * y0
         self.invalidate()
         return self
 
@@ -2048,11 +2082,18 @@ def skew(self, xShear, yShear):
         calls to :meth:`rotate`, :meth:`rotate_deg`, :meth:`translate`
         and :meth:`scale`.
         """
-        rotX = math.tan(xShear)
-        rotY = math.tan(yShear)
-        skew_mtx = np.array(
-            [[1.0, rotX, 0.0], [rotY, 1.0, 0.0], [0.0, 0.0, 1.0]], float)
-        self._mtx = np.dot(skew_mtx, self._mtx)
+        rx = math.tan(xShear)
+        ry = math.tan(yShear)
+        mtx = self._mtx
+        # Operating and assigning one scalar at a time is much faster.
+        (xx, xy, x0), (yx, yy, y0), _ = mtx.tolist()
+        # mtx = [[1 rx 0], [ry 1 0], [0 0 1]] * mtx
+        mtx[0, 0] += rx * yx
+        mtx[0, 1] += rx * yy
+        mtx[0, 2] += rx * y0
+        mtx[1, 0] += ry * xx
+        mtx[1, 1] += ry * xy
+        mtx[1, 2] += ry * x0
         self.invalidate()
         return self
 
@@ -2385,8 +2426,7 @@ def transform_non_affine(self, points):
         elif not self._a.is_affine and self._b.is_affine:
             return self._a.transform_non_affine(points)
         else:
-            return self._b.transform_non_affine(
-                                self._a.transform(points))
+            return self._b.transform_non_affine(self._a.transform(points))
 
     def transform_path_non_affine(self, path):
         # docstring inherited
@@ -2763,37 +2803,25 @@ class TransformedPatchPath(TransformedPath):
     `~.patches.Patch`. This cached copy is automatically updated when the
     non-affine part of the transform or the patch changes.
     """
+
     def __init__(self, patch):
         """
         Parameters
         ----------
         patch : `~.patches.Patch`
         """
-        TransformNode.__init__(self)
-
-        transform = patch.get_transform()
+        # Defer to TransformedPath.__init__.
+        super().__init__(patch.get_path(), patch.get_transform())
         self._patch = patch
-        self._transform = transform
-        self.set_children(transform)
-        self._path = patch.get_path()
-        self._transformed_path = None
-        self._transformed_points = None
 
     def _revalidate(self):
         patch_path = self._patch.get_path()
-        # Only recompute if the invalidation includes the non_affine part of
-        # the transform, or the Patch's Path has changed.
-        if (self._transformed_path is None or self._path != patch_path or
-                (self._invalid & self.INVALID_NON_AFFINE ==
-                    self.INVALID_NON_AFFINE)):
+        # Force invalidation if the patch path changed; otherwise, let base
+        # class check invalidation.
+        if patch_path != self._path:
             self._path = patch_path
-            self._transformed_path = \
-                self._transform.transform_path_non_affine(patch_path)
-            self._transformed_points = \
-                Path._fast_from_codes_and_verts(
-                    self._transform.transform_non_affine(patch_path.vertices),
-                    None, patch_path)
-        self._invalid = 0
+            self._transformed_path = None
+        super()._revalidate()
 
 
 def nonsingular(vmin, vmax, expander=0.001, tiny=1e-15, increasing=True):
diff --git a/lib/matplotlib/tri/__init__.py b/lib/matplotlib/tri/__init__.py
index 7ff2b326920b..4185452c0123 100644
--- a/lib/matplotlib/tri/__init__.py
+++ b/lib/matplotlib/tri/__init__.py
@@ -2,11 +2,22 @@
 Unstructured triangular grid functions.
 """
 
-from .triangulation import *
-from .tricontour import *
-from .tritools import *
-from .trifinder import *
-from .triinterpolate import *
-from .trirefine import *
-from .tripcolor import *
-from .triplot import *
+from .triangulation import Triangulation
+from .tricontour import TriContourSet, tricontour, tricontourf
+from .trifinder import TriFinder, TrapezoidMapTriFinder
+from .triinterpolate import (TriInterpolator, LinearTriInterpolator,
+                             CubicTriInterpolator)
+from .tripcolor import tripcolor
+from .triplot import triplot
+from .trirefine import TriRefiner, UniformTriRefiner
+from .tritools import TriAnalyzer
+
+
+__all__ = ["Triangulation",
+           "TriContourSet", "tricontour", "tricontourf",
+           "TriFinder", "TrapezoidMapTriFinder",
+           "TriInterpolator", "LinearTriInterpolator", "CubicTriInterpolator",
+           "tripcolor",
+           "triplot",
+           "TriRefiner", "UniformTriRefiner",
+           "TriAnalyzer"]
diff --git a/lib/matplotlib/tri/triangulation.py b/lib/matplotlib/tri/triangulation.py
index 24e99634a466..00d8da4f4d28 100644
--- a/lib/matplotlib/tri/triangulation.py
+++ b/lib/matplotlib/tri/triangulation.py
@@ -1,5 +1,7 @@
 import numpy as np
 
+from matplotlib import _api
+
 
 class Triangulation:
     """
@@ -41,7 +43,9 @@ def __init__(self, x, y, triangles=None, mask=None):
         self.x = np.asarray(x, dtype=np.float64)
         self.y = np.asarray(y, dtype=np.float64)
         if self.x.shape != self.y.shape or self.x.ndim != 1:
-            raise ValueError("x and y must be equal-length 1D arrays")
+            raise ValueError("x and y must be equal-length 1D arrays, but "
+                             f"found shapes {self.x.shape!r} and "
+                             f"{self.y.shape!r}")
 
         self.mask = None
         self._edges = None
@@ -56,19 +60,25 @@ def __init__(self, x, y, triangles=None, mask=None):
         else:
             # Triangulation specified. Copy, since we may correct triangle
             # orientation.
-            self.triangles = np.array(triangles, dtype=np.int32, order='C')
+            try:
+                self.triangles = np.array(triangles, dtype=np.int32, order='C')
+            except ValueError as e:
+                raise ValueError('triangles must be a (N, 3) int array, not '
+                                 f'{triangles!r}') from e
             if self.triangles.ndim != 2 or self.triangles.shape[1] != 3:
-                raise ValueError('triangles must be a (?, 3) array')
+                raise ValueError(
+                    'triangles must be a (N, 3) int array, but found shape '
+                    f'{self.triangles.shape!r}')
             if self.triangles.max() >= len(self.x):
-                raise ValueError('triangles max element is out of bounds')
+                raise ValueError(
+                    'triangles are indices into the points and must be in the '
+                    f'range 0 <= i < {len(self.x)} but found value '
+                    f'{self.triangles.max()}')
             if self.triangles.min() < 0:
-                raise ValueError('triangles min element is out of bounds')
-
-        if mask is not None:
-            self.mask = np.asarray(mask, dtype=bool)
-            if self.mask.shape != (self.triangles.shape[0],):
-                raise ValueError('mask array must have same length as '
-                                 'triangles array')
+                raise ValueError(
+                    'triangles are indices into the points and must be in the '
+                    f'range 0 <= i < {len(self.x)} but found value '
+                    f'{self.triangles.min()}')
 
         # Underlying C++ object is not created until first needed.
         self._cpp_triangulation = None
@@ -76,6 +86,8 @@ def __init__(self, x, y, triangles=None, mask=None):
         # Default TriFinder not created until needed.
         self._trifinder = None
 
+        self.set_mask(mask)
+
     def calculate_plane_coefficients(self, z):
         """
         Calculate plane equation coefficients for all unmasked triangles from
@@ -92,7 +104,7 @@ def edges(self):
         Return integer array of shape (nedges, 2) containing all edges of
         non-masked triangles.
 
-        Each row defines an edge by it's start point index and end point
+        Each row defines an edge by its start point index and end point
         index.  Each edge appears only once, i.e. for an edge between points
         *i*  and *j*, there will only be either *(i, j)* or *(j, i)*.
         """
@@ -114,7 +126,7 @@ def get_cpp_triangulation(self):
 
     def get_masked_triangles(self):
         """
-        Return an array of triangles that are not masked.
+        Return an array of triangles taking the mask into account.
         """
         if self.mask is not None:
             return self.triangles[~self.mask]
@@ -135,35 +147,43 @@ def get_from_args_and_kwargs(*args, **kwargs):
         """
         if isinstance(args[0], Triangulation):
             triangulation, *args = args
+            if 'triangles' in kwargs:
+                _api.warn_external(
+                    "Passing the keyword 'triangles' has no effect when also "
+                    "passing a Triangulation")
+            if 'mask' in kwargs:
+                _api.warn_external(
+                    "Passing the keyword 'mask' has no effect when also "
+                    "passing a Triangulation")
         else:
-            x, y, *args = args
-
-            # Check triangles in kwargs then args.
-            triangles = kwargs.pop('triangles', None)
-            from_args = False
-            if triangles is None and args:
-                triangles = args[0]
-                from_args = True
-
-            if triangles is not None:
-                try:
-                    triangles = np.asarray(triangles, dtype=np.int32)
-                except ValueError:
-                    triangles = None
-
-            if triangles is not None and (triangles.ndim != 2 or
-                                          triangles.shape[1] != 3):
-                triangles = None
-
-            if triangles is not None and from_args:
-                args = args[1:]  # Consumed first item in args.
-
-            # Check for mask in kwargs.
-            mask = kwargs.pop('mask', None)
-
+            x, y, triangles, mask, args, kwargs = \
+                Triangulation._extract_triangulation_params(args, kwargs)
             triangulation = Triangulation(x, y, triangles, mask)
         return triangulation, args, kwargs
 
+    @staticmethod
+    def _extract_triangulation_params(args, kwargs):
+        x, y, *args = args
+        # Check triangles in kwargs then args.
+        triangles = kwargs.pop('triangles', None)
+        from_args = False
+        if triangles is None and args:
+            triangles = args[0]
+            from_args = True
+        if triangles is not None:
+            try:
+                triangles = np.asarray(triangles, dtype=np.int32)
+            except ValueError:
+                triangles = None
+        if triangles is not None and (triangles.ndim != 2 or
+                                      triangles.shape[1] != 3):
+            triangles = None
+        if triangles is not None and from_args:
+            args = args[1:]  # Consumed first item in args.
+        # Check for mask in kwargs.
+        mask = kwargs.pop('mask', None)
+        return x, y, triangles, mask, args, kwargs
+
     def get_trifinder(self):
         """
         Return the default `matplotlib.tri.TriFinder` of this
diff --git a/lib/matplotlib/tri/tricontour.py b/lib/matplotlib/tri/tricontour.py
index dc7c803e61e7..666626157517 100644
--- a/lib/matplotlib/tri/tricontour.py
+++ b/lib/matplotlib/tri/tricontour.py
@@ -1,11 +1,11 @@
 import numpy as np
 
-from matplotlib import docstring
+from matplotlib import _docstring
 from matplotlib.contour import ContourSet
 from matplotlib.tri.triangulation import Triangulation
 
 
-@docstring.dedent_interpd
+@_docstring.dedent_interpd
 class TriContourSet(ContourSet):
     """
     Create and store a set of contour lines or filled regions for
@@ -19,10 +19,10 @@ class TriContourSet(ContourSet):
     def __init__(self, ax, *args, **kwargs):
         """
         Draw triangular grid contour lines or filled regions,
-        depending on whether keyword arg 'filled' is False
+        depending on whether keyword arg *filled* is False
         (default) or True.
 
-        The first argument of the initializer must be an axes
+        The first argument of the initializer must be an `~.axes.Axes`
         object.  The remaining arguments and keyword arguments
         are described in the docstring of `~.Axes.tricontour`.
         """
@@ -33,9 +33,13 @@ def _process_args(self, *args, **kwargs):
         Process args and kwargs.
         """
         if isinstance(args[0], TriContourSet):
-            C = args[0].cppContourGenerator
+            C = args[0]._contour_generator
             if self.levels is None:
                 self.levels = args[0].levels
+            self.zmin = args[0].zmin
+            self.zmax = args[0].zmax
+            self._mins = args[0]._mins
+            self._maxs = args[0]._maxs
         else:
             from matplotlib import _tri
             tri, z = self._contour_args(args, kwargs)
@@ -43,34 +47,10 @@ def _process_args(self, *args, **kwargs):
             self._mins = [tri.x.min(), tri.y.min()]
             self._maxs = [tri.x.max(), tri.y.max()]
 
-        self.cppContourGenerator = C
+        self._contour_generator = C
         return kwargs
 
-    def _get_allsegs_and_allkinds(self):
-        """
-        Create and return allsegs and allkinds by calling underlying C code.
-        """
-        allsegs = []
-        if self.filled:
-            lowers, uppers = self._get_lowers_and_uppers()
-            allkinds = []
-            for lower, upper in zip(lowers, uppers):
-                segs, kinds = self.cppContourGenerator.create_filled_contour(
-                    lower, upper)
-                allsegs.append([segs])
-                allkinds.append([kinds])
-        else:
-            allkinds = None
-            for level in self.levels:
-                segs = self.cppContourGenerator.create_contour(level)
-                allsegs.append(segs)
-        return allsegs, allkinds
-
     def _contour_args(self, args, kwargs):
-        if self.filled:
-            fn = 'contourf'
-        else:
-            fn = 'contour'
         tri, args, kwargs = Triangulation.get_from_args_and_kwargs(*args,
                                                                    **kwargs)
         z = np.ma.asarray(args[0])
@@ -92,84 +72,49 @@ def _contour_args(self, args, kwargs):
         self.zmax = float(z_check.max())
         self.zmin = float(z_check.min())
         if self.logscale and self.zmin <= 0:
-            raise ValueError('Cannot %s log of negative values.' % fn)
+            func = 'contourf' if self.filled else 'contour'
+            raise ValueError(f'Cannot {func} log of negative values.')
         self._process_contour_level_args(args[1:])
         return (tri, z)
 
 
-docstring.interpd.update(_tricontour_doc="""
-Draw contour %(type)s on an unstructured triangular grid.
-
-The triangulation can be specified in one of two ways; either ::
-
-    %(func)s(triangulation, ...)
-
-where *triangulation* is a `.Triangulation` object, or ::
-
-    %(func)s(x, y, ...)
-    %(func)s(x, y, triangles, ...)
-    %(func)s(x, y, triangles=triangles, ...)
-    %(func)s(x, y, mask=mask, ...)
-    %(func)s(x, y, triangles, mask=mask, ...)
-
-in which case a `.Triangulation` object will be created.  See that class'
-docstring for an explanation of these cases.
-
-The remaining arguments may be::
-
-    %(func)s(..., Z)
-
-where *Z* is the array of values to contour, one per point in the
-triangulation.  The level values are chosen automatically.
+_docstring.interpd.update(_tricontour_doc="""
+Draw contour %%(type)s on an unstructured triangular grid.
 
-::
+Call signatures::
 
-    %(func)s(..., Z, levels)
+    %%(func)s(triangulation, z, [levels], ...)
+    %%(func)s(x, y, z, [levels], *, [triangles=triangles], [mask=mask], ...)
 
-contour up to *levels+1* automatically chosen contour levels (*levels*
-intervals).
+The triangular grid can be specified either by passing a `.Triangulation`
+object as the first parameter, or by passing the points *x*, *y* and
+optionally the *triangles* and a *mask*. See `.Triangulation` for an
+explanation of these parameters. If neither of *triangulation* or
+*triangles* are given, the triangulation is calculated on the fly.
 
-::
-
-    %(func)s(..., Z, levels)
-
-draw contour %(type)s at the values specified in sequence *levels*, which must
-be in increasing order.
-
-::
-
-    %(func)s(Z, **kwargs)
-
-Use keyword arguments to control colors, linewidth, origin, cmap ... see below
-for more details.
+It is possible to pass *triangles* positionally, i.e.
+``%%(func)s(x, y, triangles, z, ...)``. However, this is discouraged. For more
+clarity, pass *triangles* via keyword argument.
 
 Parameters
 ----------
 triangulation : `.Triangulation`, optional
-    The unstructured triangular grid.
-
-    If specified, then *x*, *y*, *triangles*, and *mask* are not accepted.
-
-x, y : array-like, optional
-    The coordinates of the values in *Z*.
+    An already created triangular grid.
 
-triangles : (ntri, 3) array-like of int, optional
-    For each triangle, the indices of the three points that make up the
-    triangle, ordered in an anticlockwise manner.  If not specified, the
-    Delaunay triangulation is calculated.
+x, y, triangles, mask
+    Parameters defining the triangular grid. See `.Triangulation`.
+    This is mutually exclusive with specifying *triangulation*.
 
-mask : (ntri,) array-like of bool, optional
-    Which triangles are masked out.
-
-Z : 2D array-like
-    The height values over which the contour is drawn.
+z : array-like
+    The height values over which the contour is drawn.  Color-mapping is
+    controlled by *cmap*, *norm*, *vmin*, and *vmax*.
 
 levels : int or array-like, optional
     Determines the number and positions of the contour lines / regions.
 
     If an int *n*, use `~matplotlib.ticker.MaxNLocator`, which tries to
     automatically choose no more than *n+1* "nice" contour levels between
-    *vmin* and *vmax*.
+    between minimum and maximum numeric values of *Z*.
 
     If array-like, draw contour lines at the specified levels.  The values must
     be in increasing order.
@@ -181,10 +126,10 @@ def _contour_args(self, args, kwargs):
 Other Parameters
 ----------------
 colors : color string or sequence of colors, optional
-    The colors of the levels, i.e., the contour %(type)s.
+    The colors of the levels, i.e., the contour %%(type)s.
 
     The sequence is cycled for the levels in ascending order. If the sequence
-    is shorter than the number of levels, it's repeated.
+    is shorter than the number of levels, it is repeated.
 
     As a shortcut, single color strings may be used in place of one-element
     lists, i.e. ``'red'`` instead of ``['red']`` to color all levels with the
@@ -196,32 +141,36 @@ def _contour_args(self, args, kwargs):
 alpha : float, default: 1
     The alpha blending value, between 0 (transparent) and 1 (opaque).
 
-cmap : str or `.Colormap`, default: :rc:`image.cmap`
-    A `.Colormap` instance or registered colormap name. The colormap maps the
-    level values to colors.
+%(cmap_doc)s
+
+    This parameter is ignored if *colors* is set.
+
+%(norm_doc)s
 
-    If both *colors* and *cmap* are given, an error is raised.
+    This parameter is ignored if *colors* is set.
 
-norm : `~matplotlib.colors.Normalize`, optional
-    If a colormap is used, the `.Normalize` instance scales the level values to
-    the canonical colormap range [0, 1] for mapping to colors. If not given,
-    the default linear scaling is used.
+%(vmin_vmax_doc)s
+
+    If *vmin* or *vmax* are not given, the default color scaling is based on
+    *levels*.
+
+    This parameter is ignored if *colors* is set.
 
 origin : {*None*, 'upper', 'lower', 'image'}, default: None
-    Determines the orientation and exact position of *Z* by specifying the
-    position of ``Z[0, 0]``.  This is only relevant, if *X*, *Y* are not given.
+    Determines the orientation and exact position of *z* by specifying the
+    position of ``z[0, 0]``.  This is only relevant, if *X*, *Y* are not given.
 
-    - *None*: ``Z[0, 0]`` is at X=0, Y=0 in the lower left corner.
-    - 'lower': ``Z[0, 0]`` is at X=0.5, Y=0.5 in the lower left corner.
-    - 'upper': ``Z[0, 0]`` is at X=N+0.5, Y=0.5 in the upper left corner.
+    - *None*: ``z[0, 0]`` is at X=0, Y=0 in the lower left corner.
+    - 'lower': ``z[0, 0]`` is at X=0.5, Y=0.5 in the lower left corner.
+    - 'upper': ``z[0, 0]`` is at X=N+0.5, Y=0.5 in the upper left corner.
     - 'image': Use the value from :rc:`image.origin`.
 
 extent : (x0, x1, y0, y1), optional
     If *origin* is not *None*, then *extent* is interpreted as in `.imshow`: it
-    gives the outer pixel boundaries. In this case, the position of Z[0, 0] is
+    gives the outer pixel boundaries. In this case, the position of z[0, 0] is
     the center of the pixel, not a corner. If *origin* is *None*, then
-    (*x0*, *y0*) is the position of Z[0, 0], and (*x1*, *y1*) is the position
-    of Z[-1, -1].
+    (*x0*, *y0*) is the position of z[0, 0], and (*x1*, *y1*) is the position
+    of z[-1, -1].
 
     This argument is ignored if *X* and *Y* are specified in the call to
     contour.
@@ -232,7 +181,7 @@ def _contour_args(self, args, kwargs):
     Defaults to `~.ticker.MaxNLocator`.
 
 extend : {'neither', 'both', 'min', 'max'}, default: 'neither'
-    Determines the ``%(func)s``-coloring of values that are outside the
+    Determines the ``%%(func)s``-coloring of values that are outside the
     *levels* range.
 
     If 'neither', values outside the *levels* range are not colored.  If 'min',
@@ -255,11 +204,16 @@ def _contour_args(self, args, kwargs):
 
 xunits, yunits : registered units, optional
     Override axis units by specifying an instance of a
-    :class:`matplotlib.units.ConversionInterface`.""")
+    :class:`matplotlib.units.ConversionInterface`.
+
+antialiased : bool, optional
+    Enable antialiasing, overriding the defaults.  For
+    filled contours, the default is *True*.  For line contours,
+    it is taken from :rc:`lines.antialiased`.""" % _docstring.interpd.params)
 
 
-@docstring.Substitution(func='tricontour', type='lines')
-@docstring.dedent_interpd
+@_docstring.Substitution(func='tricontour', type='lines')
+@_docstring.dedent_interpd
 def tricontour(ax, *args, **kwargs):
     """
     %(_tricontour_doc)s
@@ -287,14 +241,17 @@ def tricontour(ax, *args, **kwargs):
     return TriContourSet(ax, *args, **kwargs)
 
 
-@docstring.Substitution(func='tricontourf', type='regions')
-@docstring.dedent_interpd
+@_docstring.Substitution(func='tricontourf', type='regions')
+@_docstring.dedent_interpd
 def tricontourf(ax, *args, **kwargs):
     """
     %(_tricontour_doc)s
 
-    antialiased : bool, default: True
-        Whether to use antialiasing.
+    hatches : list[str], optional
+        A list of cross hatch patterns to use on the filled areas.
+        If None, no hatching will be added to the contour.
+        Hatching is supported in the PostScript, PDF, SVG and Agg
+        backends only.
 
     Notes
     -----
diff --git a/lib/matplotlib/tri/triinterpolate.py b/lib/matplotlib/tri/triinterpolate.py
index 9c8311892b2a..48643880e713 100644
--- a/lib/matplotlib/tri/triinterpolate.py
+++ b/lib/matplotlib/tri/triinterpolate.py
@@ -272,16 +272,15 @@ def gradient(self, x, y):
     gradient.__doc__ = TriInterpolator._docstringgradient
 
     def _interpolate_single_key(self, return_key, tri_index, x, y):
+        _api.check_in_list(['z', 'dzdx', 'dzdy'], return_key=return_key)
         if return_key == 'z':
             return (self._plane_coefficients[tri_index, 0]*x +
                     self._plane_coefficients[tri_index, 1]*y +
                     self._plane_coefficients[tri_index, 2])
         elif return_key == 'dzdx':
             return self._plane_coefficients[tri_index, 0]
-        elif return_key == 'dzdy':
+        else:  # 'dzdy'
             return self._plane_coefficients[tri_index, 1]
-        else:
-            raise ValueError("Invalid return_key: " + return_key)
 
 
 class CubicTriInterpolator(TriInterpolator):
@@ -413,6 +412,7 @@ def __init__(self, triangulation, z, kind='min_E', trifinder=None,
         # Computing eccentricities
         self._eccs = self._compute_tri_eccentricities(self._tris_pts)
         # Computing dof estimations for HCT triangle shape function
+        _api.check_in_list(['user', 'geom', 'min_E'], kind=kind)
         self._dof = self._compute_dof(kind, dz=dz)
         # Loading HCT element
         self._ReferenceElement = _ReducedHCT_Element()
@@ -428,6 +428,7 @@ def gradient(self, x, y):
     gradient.__doc__ = TriInterpolator._docstringgradient
 
     def _interpolate_single_key(self, return_key, tri_index, x, y):
+        _api.check_in_list(['z', 'dzdx', 'dzdy'], return_key=return_key)
         tris_pts = self._tris_pts[tri_index]
         alpha = self._get_alpha_vec(x, y, tris_pts)
         ecc = self._eccs[tri_index]
@@ -435,7 +436,7 @@ def _interpolate_single_key(self, return_key, tri_index, x, y):
         if return_key == 'z':
             return self._ReferenceElement.get_function_values(
                 alpha, ecc, dof)
-        elif return_key in ['dzdx', 'dzdy']:
+        else:  # 'dzdx', 'dzdy'
             J = self._get_jacobian(tris_pts)
             dzdx = self._ReferenceElement.get_function_derivatives(
                 alpha, J, ecc, dof)
@@ -443,8 +444,6 @@ def _interpolate_single_key(self, return_key, tri_index, x, y):
                 return dzdx[:, 0, 0]
             else:
                 return dzdx[:, 1, 0]
-        else:
-            raise ValueError("Invalid return_key: " + return_key)
 
     def _compute_dof(self, kind, dz=None):
         """
@@ -472,10 +471,8 @@ def _compute_dof(self, kind, dz=None):
             TE = _DOF_estimator_user(self, dz=dz)
         elif kind == 'geom':
             TE = _DOF_estimator_geom(self)
-        elif kind == 'min_E':
+        else:  # 'min_E', checked in __init__
             TE = _DOF_estimator_min_E(self)
-        else:
-            _api.check_in_list(['user', 'geom', 'min_E'], kind=kind)
         return TE.compute_dof_from_df()
 
     @staticmethod
@@ -1286,7 +1283,7 @@ def diag(self):
 def _cg(A, b, x0=None, tol=1.e-10, maxiter=1000):
     """
     Use Preconditioned Conjugate Gradient iteration to solve A x = b
-    A simple Jacobi (diagonal) preconditionner is used.
+    A simple Jacobi (diagonal) preconditioner is used.
 
     Parameters
     ----------
@@ -1347,7 +1344,7 @@ def _cg(A, b, x0=None, tol=1.e-10, maxiter=1000):
         rho = np.dot(r, w)
         x = x + alpha*p
         beta = rho/rhoold
-        #err = np.linalg.norm(A.dot(x) - b) # absolute accuracy - not used
+        # err = np.linalg.norm(A.dot(x) - b)  # absolute accuracy - not used
         k += 1
     err = np.linalg.norm(A.dot(x) - b)
     return x, err
@@ -1406,8 +1403,7 @@ def _safe_inv22_vectorized(M):
 
     *M* : array of (2, 2) matrices to inverse, shape (n, 2, 2)
     """
-    assert M.ndim == 3
-    assert M.shape[-2:] == (2, 2)
+    _api.check_shape((None, 2, 2), M=M)
     M_inv = np.empty_like(M)
     prod1 = M[:, 0, 0]*M[:, 1, 1]
     delta = prod1 - M[:, 0, 1]*M[:, 1, 0]
@@ -1441,8 +1437,7 @@ def _pseudo_inv22sym_vectorized(M):
 
     *M* : array of (2, 2) matrices to inverse, shape (n, 2, 2)
     """
-    assert M.ndim == 3
-    assert M.shape[-2:] == (2, 2)
+    _api.check_shape((None, 2, 2), M=M)
     M_inv = np.empty_like(M)
     prod1 = M[:, 0, 0]*M[:, 1, 1]
     delta = prod1 - M[:, 0, 1]*M[:, 1, 0]
@@ -1468,7 +1463,7 @@ def _pseudo_inv22sym_vectorized(M):
         tr = M[rank01, 0, 0] + M[rank01, 1, 1]
         tr_zeros = (np.abs(tr) < 1.e-8)
         sq_tr_inv = (1.-tr_zeros) / (tr**2+tr_zeros)
-        #sq_tr_inv = 1. / tr**2
+        # sq_tr_inv = 1. / tr**2
         M_inv[rank01, 0, 0] = M[rank01, 0, 0] * sq_tr_inv
         M_inv[rank01, 0, 1] = M[rank01, 0, 1] * sq_tr_inv
         M_inv[rank01, 1, 0] = M[rank01, 1, 0] * sq_tr_inv
@@ -1512,7 +1507,7 @@ def _roll_vectorized(M, roll_indices, axis):
         for ir in range(r):
             for ic in range(c):
                 M_roll[:, ir, ic] = M[vec_indices, (-roll_indices+ir) % r, ic]
-    elif axis == 1:
+    else:  # 1
         for ir in range(r):
             for ic in range(c):
                 M_roll[:, ir, ic] = M[vec_indices, ir, (-roll_indices+ic) % c]
@@ -1564,7 +1559,7 @@ def _extract_submatrices(M, block_indices, block_size, axis):
     r, c = M.shape
     if axis == 0:
         sh = [block_indices.shape[0], block_size, c]
-    elif axis == 1:
+    else:  # 1
         sh = [block_indices.shape[0], r, block_size]
 
     dt = M.dtype
@@ -1572,7 +1567,7 @@ def _extract_submatrices(M, block_indices, block_size, axis):
     if axis == 0:
         for ir in range(block_size):
             M_res[:, ir, :] = M[(block_indices*block_size+ir), :]
-    elif axis == 1:
+    else:  # 1
         for ic in range(block_size):
             M_res[:, :, ic] = M[:, (block_indices*block_size+ic)]
 
diff --git a/lib/matplotlib/tri/tripcolor.py b/lib/matplotlib/tri/tripcolor.py
index f1f7de2285dc..c4865a393f99 100644
--- a/lib/matplotlib/tri/tripcolor.py
+++ b/lib/matplotlib/tri/tripcolor.py
@@ -11,65 +11,92 @@ def tripcolor(ax, *args, alpha=1.0, norm=None, cmap=None, vmin=None,
     """
     Create a pseudocolor plot of an unstructured triangular grid.
 
-    The triangulation can be specified in one of two ways; either::
-
-      tripcolor(triangulation, ...)
-
-    where triangulation is a `.Triangulation` object, or
-
-    ::
-
-      tripcolor(x, y, ...)
-      tripcolor(x, y, triangles, ...)
-      tripcolor(x, y, triangles=triangles, ...)
-      tripcolor(x, y, mask=mask, ...)
-      tripcolor(x, y, triangles, mask=mask, ...)
-
-    in which case a Triangulation object will be created.  See `.Triangulation`
-    for a explanation of these possibilities.
-
-    The next argument must be *C*, the array of color values, either
-    one per point in the triangulation if color values are defined at
-    points, or one per triangle in the triangulation if color values
-    are defined at triangles. If there are the same number of points
-    and triangles in the triangulation it is assumed that color
-    values are defined at points; to force the use of color values at
-    triangles use the kwarg ``facecolors=C`` instead of just ``C``.
-
-    *shading* may be 'flat' (the default) or 'gouraud'. If *shading*
-    is 'flat' and C values are defined at points, the color values
-    used for each triangle are from the mean C of the triangle's
-    three points. If *shading* is 'gouraud' then color values must be
-    defined at points.
-
-    The remaining kwargs are the same as for `~.Axes.pcolor`.
+    Call signatures::
+
+      tripcolor(triangulation, c, *, ...)
+      tripcolor(x, y, c, *, [triangles=triangles], [mask=mask], ...)
+
+    The triangular grid can be specified either by passing a `.Triangulation`
+    object as the first parameter, or by passing the points *x*, *y* and
+    optionally the *triangles* and a *mask*. See `.Triangulation` for an
+    explanation of these parameters.
+
+    It is possible to pass the triangles positionally, i.e.
+    ``tripcolor(x, y, triangles, c, ...)``. However, this is discouraged.
+    For more clarity, pass *triangles* via keyword argument.
+
+    If neither of *triangulation* or *triangles* are given, the triangulation
+    is calculated on the fly. In this case, it does not make sense to provide
+    colors at the triangle faces via *c* or *facecolors* because there are
+    multiple possible triangulations for a group of points and you don't know
+    which triangles will be constructed.
+
+    Parameters
+    ----------
+    triangulation : `.Triangulation`
+        An already created triangular grid.
+    x, y, triangles, mask
+        Parameters defining the triangular grid. See `.Triangulation`.
+        This is mutually exclusive with specifying *triangulation*.
+    c : array-like
+        The color values, either for the points or for the triangles. Which one
+        is automatically inferred from the length of *c*, i.e. does it match
+        the number of points or the number of triangles. If there are the same
+        number of points and triangles in the triangulation it is assumed that
+        color values are defined at points; to force the use of color values at
+        triangles use the keyword argument ``facecolors=c`` instead of just
+        ``c``.
+        This parameter is position-only.
+    facecolors : array-like, optional
+        Can be used alternatively to *c* to specify colors at the triangle
+        faces. This parameter takes precedence over *c*.
+    shading : {'flat', 'gouraud'}, default: 'flat'
+        If  'flat' and the color values *c* are defined at points, the color
+        values used for each triangle are from the mean c of the triangle's
+        three points. If *shading* is 'gouraud' then color values must be
+        defined at points.
+    other_parameters
+        All other parameters are the same as for `~.Axes.pcolor`.
     """
     _api.check_in_list(['flat', 'gouraud'], shading=shading)
 
     tri, args, kwargs = Triangulation.get_from_args_and_kwargs(*args, **kwargs)
 
-    # C is the colors array defined at either points or faces (i.e. triangles).
-    # If facecolors is None, C are defined at points.
-    # If facecolors is not None, C are defined at faces.
+    # Parse the color to be in one of (the other variable will be None):
+    # - facecolors: if specified at the triangle faces
+    # - point_colors: if specified at the points
     if facecolors is not None:
-        C = facecolors
+        if args:
+            _api.warn_external(
+                "Positional parameter c has no effect when the keyword "
+                "facecolors is given")
+        point_colors = None
+        if len(facecolors) != len(tri.triangles):
+            raise ValueError("The length of facecolors must match the number "
+                             "of triangles")
     else:
-        C = np.asarray(args[0])
-
-    # If there are a different number of points and triangles in the
-    # triangulation, can omit facecolors kwarg as it is obvious from
-    # length of C whether it refers to points or faces.
-    # Do not do this for gouraud shading.
-    if (facecolors is None and len(C) == len(tri.triangles) and
-            len(C) != len(tri.x) and shading != 'gouraud'):
-        facecolors = C
-
-    # Check length of C is OK.
-    if ((facecolors is None and len(C) != len(tri.x)) or
-            (facecolors is not None and len(C) != len(tri.triangles))):
-        raise ValueError('Length of color values array must be the same '
-                         'as either the number of triangulation points '
-                         'or triangles')
+        # Color from positional parameter c
+        if not args:
+            raise TypeError(
+                "tripcolor() missing 1 required positional argument: 'c'; or "
+                "1 required keyword-only argument: 'facecolors'")
+        elif len(args) > 1:
+            _api.warn_deprecated(
+                "3.6", message=f"Additional positional parameters "
+                f"{args[1:]!r} are ignored; support for them is deprecated "
+                f"since %(since)s and will be removed %(removal)s")
+        c = np.asarray(args[0])
+        if len(c) == len(tri.x):
+            # having this before the len(tri.triangles) comparison gives
+            # precedence to nodes if there are as many nodes as triangles
+            point_colors = c
+            facecolors = None
+        elif len(c) == len(tri.triangles):
+            point_colors = None
+            facecolors = c
+        else:
+            raise ValueError('The length of c must match either the number '
+                             'of points or the number of triangles')
 
     # Handling of linewidths, shading, edgecolors and antialiased as
     # in Axes.pcolor
@@ -88,16 +115,15 @@ def tripcolor(ax, *args, alpha=1.0, norm=None, cmap=None, vmin=None,
     if 'antialiaseds' not in kwargs and ec.lower() == "none":
         kwargs['antialiaseds'] = False
 
+    _api.check_isinstance((Normalize, None), norm=norm)
     if shading == 'gouraud':
         if facecolors is not None:
-            raise ValueError('Gouraud shading does not support the use '
-                             'of facecolors kwarg')
-        if len(C) != len(tri.x):
-            raise ValueError('For gouraud shading, the length of color '
-                             'values array must be the same as the '
-                             'number of triangulation points')
-        collection = TriMesh(tri, **kwargs)
-    else:
+            raise ValueError(
+                "shading='gouraud' can only be used when the colors "
+                "are specified at the points, not at the faces.")
+        collection = TriMesh(tri, alpha=alpha, array=point_colors,
+                             cmap=cmap, norm=norm, **kwargs)
+    else:  # 'flat'
         # Vertices of triangles.
         maskedTris = tri.get_masked_triangles()
         verts = np.stack((tri.x[maskedTris], tri.y[maskedTris]), axis=-1)
@@ -105,18 +131,15 @@ def tripcolor(ax, *args, alpha=1.0, norm=None, cmap=None, vmin=None,
         # Color values.
         if facecolors is None:
             # One color per triangle, the mean of the 3 vertex color values.
-            C = C[maskedTris].mean(axis=1)
+            colors = point_colors[maskedTris].mean(axis=1)
         elif tri.mask is not None:
             # Remove color values of masked triangles.
-            C = C[~tri.mask]
-
-        collection = PolyCollection(verts, **kwargs)
+            colors = facecolors[~tri.mask]
+        else:
+            colors = facecolors
+        collection = PolyCollection(verts, alpha=alpha, array=colors,
+                                    cmap=cmap, norm=norm, **kwargs)
 
-    collection.set_alpha(alpha)
-    collection.set_array(C)
-    _api.check_isinstance((Normalize, None), norm=norm)
-    collection.set_cmap(cmap)
-    collection.set_norm(norm)
     collection._scale_norm(norm, vmin, vmax)
     ax.grid(False)
 
diff --git a/lib/matplotlib/tri/triplot.py b/lib/matplotlib/tri/triplot.py
index 97e3725464e7..553b4b4482bf 100644
--- a/lib/matplotlib/tri/triplot.py
+++ b/lib/matplotlib/tri/triplot.py
@@ -1,29 +1,32 @@
 import numpy as np
 from matplotlib.tri.triangulation import Triangulation
+import matplotlib.cbook as cbook
+import matplotlib.lines as mlines
 
 
 def triplot(ax, *args, **kwargs):
     """
-    Draw a unstructured triangular grid as lines and/or markers.
+    Draw an unstructured triangular grid as lines and/or markers.
 
-    The triangulation to plot can be specified in one of two ways; either::
+    Call signatures::
 
       triplot(triangulation, ...)
-
-    where triangulation is a `.Triangulation` object, or
-
-    ::
-
-      triplot(x, y, ...)
-      triplot(x, y, triangles, ...)
-      triplot(x, y, triangles=triangles, ...)
-      triplot(x, y, mask=mask, ...)
-      triplot(x, y, triangles, mask=mask, ...)
-
-    in which case a Triangulation object will be created.  See `.Triangulation`
-    for a explanation of these possibilities.
-
-    The remaining args and kwargs are the same as for `~.Axes.plot`.
+      triplot(x, y, [triangles], *, [mask=mask], ...)
+
+    The triangular grid can be specified either by passing a `.Triangulation`
+    object as the first parameter, or by passing the points *x*, *y* and
+    optionally the *triangles* and a *mask*. If neither of *triangulation* or
+    *triangles* are given, the triangulation is calculated on the fly.
+
+    Parameters
+    ----------
+    triangulation : `.Triangulation`
+        An already created triangular grid.
+    x, y, triangles, mask
+        Parameters defining the triangular grid. See `.Triangulation`.
+        This is mutually exclusive with specifying *triangulation*.
+    other_parameters
+        All other args and kwargs are forwarded to `~.Axes.plot`.
 
     Returns
     -------
@@ -42,11 +45,11 @@ def triplot(ax, *args, **kwargs):
     linestyle, marker, color = matplotlib.axes._base._process_plot_format(fmt)
 
     # Insert plot format string into a copy of kwargs (kwargs values prevail).
-    kw = kwargs.copy()
+    kw = cbook.normalize_kwargs(kwargs, mlines.Line2D)
     for key, val in zip(('linestyle', 'marker', 'color'),
                         (linestyle, marker, color)):
         if val is not None:
-            kw[key] = kwargs.get(key, val)
+            kw.setdefault(key, val)
 
     # Draw lines without markers.
     # Note 1: If we drew markers here, most markers would be drawn more than
@@ -74,6 +77,7 @@ def triplot(ax, *args, **kwargs):
         **kw,
         'linestyle': 'None',  # No line to draw.
     }
+    kw_markers.pop('label', None)
     if marker not in [None, 'None', '', ' ']:
         tri_markers = ax.plot(x, y, **kw_markers)
     else:
diff --git a/lib/matplotlib/ttconv.py b/lib/matplotlib/ttconv.py
deleted file mode 100644
index bfb30d5fe58d..000000000000
--- a/lib/matplotlib/ttconv.py
+++ /dev/null
@@ -1,9 +0,0 @@
-"""
-Converting and subsetting TrueType fonts to PS types 3 and 42, and PDF type 3.
-"""
-
-from . import _api
-from ._ttconv import convert_ttf_to_ps, get_pdf_charprocs  # noqa
-
-
-_api.warn_deprecated('3.3', name=__name__, obj_type='module')
diff --git a/lib/matplotlib/type1font.py b/lib/matplotlib/type1font.py
index 3fcee64613ce..85d93c714dad 100644
--- a/lib/matplotlib/type1font.py
+++ b/lib/matplotlib/type1font.py
@@ -1,335 +1,3 @@
-"""
-A class representing a Type 1 font.
-
-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.
-
-Usage::
-
-   >>> font = Type1Font(filename)
-   >>> clear_part, encrypted_part, finale = font.parts
-   >>> slanted_font = font.transform({'slant': 0.167})
-   >>> extended_font = font.transform({'extend': 1.2})
-
-Sources:
-
-* Adobe Technical Note #5040, Supporting Downloadable PostScript
-  Language Fonts.
-
-* Adobe Type 1 Font Format, Adobe Systems Incorporated, third printing,
-  v1.1, 1993. ISBN 0-201-57044-0.
-"""
-
-import binascii
-import enum
-import itertools
-import re
-import struct
-
-import numpy as np
-
-from matplotlib.cbook import _format_approx
-
-
-# token types
-_TokenType = enum.Enum('_TokenType',
-                       'whitespace name string delimiter number')
-
-
-class Type1Font:
-    """
-    A class representing a Type-1 font, for use by backends.
-
-    Attributes
-    ----------
-    parts : tuple
-        A 3-tuple of the cleartext part, the encrypted part, and the finale of
-        zeros.
-    prop : dict[str, Any]
-        A dictionary of font properties.
-    """
-    __slots__ = ('parts', 'prop')
-
-    def __init__(self, input):
-        """
-        Initialize a Type-1 font.
-
-        Parameters
-        ----------
-        input : str or 3-tuple
-            Either a pfb file name, or a 3-tuple of already-decoded Type-1
-            font `~.Type1Font.parts`.
-        """
-        if isinstance(input, tuple) and len(input) == 3:
-            self.parts = input
-        else:
-            with open(input, 'rb') as file:
-                data = self._read(file)
-            self.parts = self._split(data)
-
-        self._parse()
-
-    def _read(self, file):
-        """Read the font from a file, decoding into usable parts."""
-        rawdata = file.read()
-        if not rawdata.startswith(b'\x80'):
-            return rawdata
-
-        data = b''
-        while rawdata:
-            if not rawdata.startswith(b'\x80'):
-                raise RuntimeError('Broken pfb file (expected byte 128, '
-                                   'got %d)' % rawdata[0])
-            type = rawdata[1]
-            if type in (1, 2):
-                length, = struct.unpack('<i', rawdata[2:6])
-                segment = rawdata[6:6 + length]
-                rawdata = rawdata[6 + length:]
-
-            if type == 1:       # ASCII text: include verbatim
-                data += segment
-            elif type == 2:     # binary data: encode in hexadecimal
-                data += binascii.hexlify(segment)
-            elif type == 3:     # end of file
-                break
-            else:
-                raise RuntimeError('Unknown segment type %d in pfb file' %
-                                   type)
-
-        return data
-
-    def _split(self, data):
-        """
-        Split the Type 1 font into its three main parts.
-
-        The three parts are: (1) the cleartext part, which ends in a
-        eexec operator; (2) the encrypted part; (3) the fixed part,
-        which contains 512 ASCII zeros possibly divided on various
-        lines, a cleartomark operator, and possibly something else.
-        """
-
-        # Cleartext part: just find the eexec and skip whitespace
-        idx = data.index(b'eexec')
-        idx += len(b'eexec')
-        while data[idx] in b' \t\r\n':
-            idx += 1
-        len1 = idx
-
-        # Encrypted part: find the cleartomark operator and count
-        # zeros backward
-        idx = data.rindex(b'cleartomark') - 1
-        zeros = 512
-        while zeros and data[idx] in b'0' or data[idx] in b'\r\n':
-            if data[idx] in b'0':
-                zeros -= 1
-            idx -= 1
-        if zeros:
-            raise RuntimeError('Insufficiently many zeros in Type 1 font')
-
-        # Convert encrypted part to binary (if we read a pfb file, we may end
-        # up converting binary to hexadecimal to binary again; but if we read
-        # a pfa file, this part is already in hex, and I am not quite sure if
-        # even the pfb format guarantees that it will be in binary).
-        binary = binascii.unhexlify(data[len1:idx+1])
-
-        return data[:len1], binary, data[idx+1:]
-
-    _whitespace_re = re.compile(br'[\0\t\r\014\n ]+')
-    _token_re = re.compile(br'/{0,2}[^]\0\t\r\v\n ()<>{}/%[]+')
-    _comment_re = re.compile(br'%[^\r\n\v]*')
-    _instring_re = re.compile(br'[()\\]')
-
-    @classmethod
-    def _tokens(cls, text):
-        """
-        A PostScript tokenizer. Yield (token, value) pairs such as
-        (_TokenType.whitespace, '   ') or (_TokenType.name, '/Foobar').
-        """
-        pos = 0
-        while pos < len(text):
-            match = (cls._comment_re.match(text[pos:]) or
-                     cls._whitespace_re.match(text[pos:]))
-            if match:
-                yield (_TokenType.whitespace, match.group())
-                pos += match.end()
-            elif text[pos] == b'(':
-                start = pos
-                pos += 1
-                depth = 1
-                while depth:
-                    match = cls._instring_re.search(text[pos:])
-                    if match is None:
-                        return
-                    pos += match.end()
-                    if match.group() == b'(':
-                        depth += 1
-                    elif match.group() == b')':
-                        depth -= 1
-                    else:  # a backslash - skip the next character
-                        pos += 1
-                yield (_TokenType.string, text[start:pos])
-            elif text[pos:pos + 2] in (b'<<', b'>>'):
-                yield (_TokenType.delimiter, text[pos:pos + 2])
-                pos += 2
-            elif text[pos] == b'<':
-                start = pos
-                pos += text[pos:].index(b'>')
-                yield (_TokenType.string, text[start:pos])
-            else:
-                match = cls._token_re.match(text[pos:])
-                if match:
-                    try:
-                        float(match.group())
-                        yield (_TokenType.number, match.group())
-                    except ValueError:
-                        yield (_TokenType.name, match.group())
-                    pos += match.end()
-                else:
-                    yield (_TokenType.delimiter, text[pos:pos + 1])
-                    pos += 1
-
-    def _parse(self):
-        """
-        Find the values of various font properties. This limited kind
-        of parsing is described in Chapter 10 "Adobe Type Manager
-        Compatibility" of the Type-1 spec.
-        """
-        # Start with reasonable defaults
-        prop = {'weight': 'Regular', 'ItalicAngle': 0.0, 'isFixedPitch': False,
-                'UnderlinePosition': -100, 'UnderlineThickness': 50}
-        filtered = ((token, value)
-                    for token, value in self._tokens(self.parts[0])
-                    if token is not _TokenType.whitespace)
-        # The spec calls this an ASCII format; in Python 2.x we could
-        # just treat the strings and names as opaque bytes but let's
-        # turn them into proper Unicode, and be lenient in case of high bytes.
-        def convert(x): return x.decode('ascii', 'replace')
-        for token, value in filtered:
-            if token is _TokenType.name and value.startswith(b'/'):
-                key = convert(value[1:])
-                token, value = next(filtered)
-                if token is _TokenType.name:
-                    if value in (b'true', b'false'):
-                        value = value == b'true'
-                    else:
-                        value = convert(value.lstrip(b'/'))
-                elif token is _TokenType.string:
-                    value = convert(value.lstrip(b'(').rstrip(b')'))
-                elif token is _TokenType.number:
-                    if b'.' in value:
-                        value = float(value)
-                    else:
-                        value = int(value)
-                else:  # more complicated value such as an array
-                    value = None
-                if key != 'FontInfo' and value is not None:
-                    prop[key] = value
-
-        # Fill in the various *Name properties
-        if 'FontName' not in prop:
-            prop['FontName'] = (prop.get('FullName') or
-                                prop.get('FamilyName') or
-                                'Unknown')
-        if 'FullName' not in prop:
-            prop['FullName'] = prop['FontName']
-        if 'FamilyName' not in prop:
-            extras = ('(?i)([ -](regular|plain|italic|oblique|(semi)?bold|'
-                      '(ultra)?light|extra|condensed))+$')
-            prop['FamilyName'] = re.sub(extras, '', prop['FullName'])
-
-        self.prop = prop
-
-    @classmethod
-    def _transformer(cls, tokens, slant, extend):
-        def fontname(name):
-            result = name
-            if slant:
-                result += b'_Slant_%d' % int(1000 * slant)
-            if extend != 1.0:
-                result += b'_Extend_%d' % int(1000 * extend)
-            return result
-
-        def italicangle(angle):
-            return b'%a' % round(
-                float(angle) - np.arctan(slant) / np.pi * 180,
-                5
-            )
-
-        def fontmatrix(array):
-            array = array.lstrip(b'[').rstrip(b']').split()
-            array = [float(x) for x in array]
-            oldmatrix = np.eye(3, 3)
-            oldmatrix[0:3, 0] = array[::2]
-            oldmatrix[0:3, 1] = array[1::2]
-            modifier = np.array([[extend, 0, 0],
-                                 [slant, 1, 0],
-                                 [0, 0, 1]])
-            newmatrix = np.dot(modifier, oldmatrix)
-            array[::2] = newmatrix[0:3, 0]
-            array[1::2] = newmatrix[0:3, 1]
-            return (
-                '[%s]' % ' '.join(_format_approx(x, 6) for x in array)
-            ).encode('ascii')
-
-        def replace(fun):
-            def replacer(tokens):
-                token, value = next(tokens)      # name, e.g., /FontMatrix
-                yield value
-                token, value = next(tokens)      # possible whitespace
-                while token is _TokenType.whitespace:
-                    yield value
-                    token, value = next(tokens)
-                if value != b'[':                # name/number/etc.
-                    yield fun(value)
-                else:                            # array, e.g., [1 2 3]
-                    result = b''
-                    while value != b']':
-                        result += value
-                        token, value = next(tokens)
-                    result += value
-                    yield fun(result)
-            return replacer
-
-        def suppress(tokens):
-            for _ in itertools.takewhile(lambda x: x[1] != b'def', tokens):
-                pass
-            yield b''
-
-        table = {b'/FontName': replace(fontname),
-                 b'/ItalicAngle': replace(italicangle),
-                 b'/FontMatrix': replace(fontmatrix),
-                 b'/UniqueID': suppress}
-
-        for token, value in tokens:
-            if token is _TokenType.name and value in table:
-                yield from table[value](
-                    itertools.chain([(token, value)], tokens))
-            else:
-                yield value
-
-    def transform(self, effects):
-        """
-        Return a new font that is slanted and/or extended.
-
-        Parameters
-        ----------
-        effects : dict
-            A dict with optional entries:
-
-            - 'slant' : float, default: 0
-                Tangent of the angle that the font is to be slanted to the
-                right. Negative values slant to the left.
-            - 'extend' : float, default: 1
-                Scaling factor for the font width. Values less than 1 condense
-                the glyphs.
-
-        Returns
-        -------
-        `Type1Font`
-        """
-        tokenizer = self._tokens(self.parts[0])
-        transformed = self._transformer(tokenizer,
-                                        slant=effects.get('slant', 0.0),
-                                        extend=effects.get('extend', 1.0))
-        return Type1Font((b"".join(transformed), self.parts[1], self.parts[2]))
+from matplotlib._type1font import *  # noqa: F401, F403
+from matplotlib import _api
+_api.warn_deprecated("3.6", name=__name__, obj_type="module")
diff --git a/lib/matplotlib/units.py b/lib/matplotlib/units.py
index 311764c26be9..2bcfcaf2eb12 100644
--- a/lib/matplotlib/units.py
+++ b/lib/matplotlib/units.py
@@ -5,8 +5,8 @@
 units and units conversion.  Use cases include converters for custom
 objects, e.g., a list of datetime objects, as well as for objects that
 are unit aware.  We don't assume any particular units implementation;
-rather a units implementation must provide the register with the Registry
-converter dictionary and a `ConversionInterface`.  For example,
+rather a units implementation must register with the Registry converter
+dictionary and provide a `ConversionInterface`.  For example,
 here is a complete implementation which supports plotting with native
 datetime objects::
 
@@ -19,27 +19,25 @@ class DateConverter(units.ConversionInterface):
 
         @staticmethod
         def convert(value, unit, axis):
-            'Convert a datetime value to a scalar or array'
+            "Convert a datetime value to a scalar or array."
             return dates.date2num(value)
 
         @staticmethod
         def axisinfo(unit, axis):
-            'Return major and minor tick locators and formatters'
-            if unit!='date': return None
+            "Return major and minor tick locators and formatters."
+            if unit != 'date':
+                return None
             majloc = dates.AutoDateLocator()
             majfmt = dates.AutoDateFormatter(majloc)
-            return AxisInfo(majloc=majloc,
-                            majfmt=majfmt,
-                            label='date')
+            return units.AxisInfo(majloc=majloc, majfmt=majfmt, label='date')
 
         @staticmethod
         def default_units(x, axis):
-            'Return the default unit for x or None'
+            "Return the default unit for x or None."
             return 'date'
 
     # Finally we register our object type with the Matplotlib units registry.
     units.registry[datetime.date] = DateConverter()
-
 """
 
 from decimal import Decimal
@@ -48,7 +46,7 @@ def default_units(x, axis):
 import numpy as np
 from numpy import ma
 
-from matplotlib import cbook
+from matplotlib import _api, cbook
 
 
 class ConversionError(TypeError):
@@ -134,6 +132,7 @@ def convert(obj, unit, axis):
         return obj
 
     @staticmethod
+    @_api.deprecated("3.5")
     def is_numlike(x):
         """
         The Matplotlib datalim, autoscaling, locators etc work with scalars
@@ -165,25 +164,15 @@ def convert(value, unit, axis):
         value : decimal.Decimal or iterable
             Decimal or list of Decimal need to be converted
         """
-        # If value is a Decimal
         if isinstance(value, Decimal):
             return float(value)
+        # value is Iterable[Decimal]
+        elif isinstance(value, ma.MaskedArray):
+            return ma.asarray(value, dtype=float)
         else:
-            # assume x is a list of Decimal
-            converter = np.asarray
-            if isinstance(value, ma.MaskedArray):
-                converter = ma.asarray
-            return converter(value, dtype=float)
-
-    @staticmethod
-    def axisinfo(unit, axis):
-        # Since Decimal is a kind of Number, don't need specific axisinfo.
-        return AxisInfo()
+            return np.asarray(value, dtype=float)
 
-    @staticmethod
-    def default_units(x, axis):
-        # Return None since Decimal is a kind of Number.
-        return None
+    # axisinfo and default_units can be inherited as Decimals are Numbers.
 
 
 class Registry(dict):
@@ -191,8 +180,9 @@ class Registry(dict):
 
     def get_converter(self, x):
         """Get the converter interface instance for *x*, or None."""
-        if hasattr(x, "values"):
-            x = x.values  # Unpack pandas Series and DataFrames.
+        # Unpack in case of e.g. Pandas or xarray object
+        x = cbook._unpack_to_numpy(x)
+
         if isinstance(x, np.ndarray):
             # In case x in a masked array, access the underlying data (only its
             # type matters).  If x is a regular ndarray, getdata() just returns
@@ -207,7 +197,7 @@ def get_converter(self, x):
             except KeyError:
                 pass
         try:  # If cache lookup fails, look up based on first element...
-            first = cbook.safe_first_element(x)
+            first = cbook._safe_first_finite(x)
         except (TypeError, StopIteration):
             pass
         else:
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
index b05f3e81a12d..004ceea2a733 100644
--- a/lib/matplotlib/widgets.py
+++ b/lib/matplotlib/widgets.py
@@ -16,9 +16,11 @@
 import numpy as np
 
 import matplotlib as mpl
-from . import _api, cbook, colors, ticker
+from . import (_api, _docstring, backend_tools, cbook, colors, ticker,
+               transforms)
 from .lines import Line2D
-from .patches import Circle, Rectangle, Ellipse
+from .patches import Circle, Rectangle, Ellipse, Polygon
+from .transforms import TransformedPatchPath, Affine2D
 
 
 class LockDraw:
@@ -102,15 +104,13 @@ class AxesWidget(Widget):
     Attributes
     ----------
     ax : `~matplotlib.axes.Axes`
-        The parent axes for the widget.
+        The parent Axes for the widget.
     canvas : `~matplotlib.backend_bases.FigureCanvasBase`
         The parent figure canvas for the widget.
     active : bool
         If False, the widget does not respond to events.
     """
 
-    cids = _api.deprecated("3.4")(property(lambda self: self._cids))
-
     def __init__(self, ax):
         self.ax = ax
         self.canvas = ax.figure.canvas
@@ -151,11 +151,6 @@ class Button(AxesWidget):
         The color of the button when hovering.
     """
 
-    cnt = _api.deprecated("3.4")(property(  # Not real, but close enough.
-        lambda self: len(self._observers.callbacks['clicked'])))
-    observers = _api.deprecated("3.4")(property(
-        lambda self: self._observers.callbacks['clicked']))
-
     def __init__(self, ax, label, image=None,
                  color='0.85', hovercolor='0.95'):
         """
@@ -182,7 +177,7 @@ def __init__(self, ax, label, image=None,
                              horizontalalignment='center',
                              transform=ax.transAxes)
 
-        self._observers = cbook.CallbackRegistry()
+        self._observers = cbook.CallbackRegistry(signals=["clicked"])
 
         self.connect_event('button_press_event', self._click)
         self.connect_event('button_release_event', self._release)
@@ -267,14 +262,14 @@ def __init__(self, ax, orientation, closedmin, closedmax,
         self._fmt.set_useOffset(False)  # No additive offset.
         self._fmt.set_useMathText(True)  # x sign before multiplicative offset.
 
-        ax.set_xticks([])
-        ax.set_yticks([])
+        ax.set_axis_off()
         ax.set_navigate(False)
+
         self.connect_event("button_press_event", self._update)
         self.connect_event("button_release_event", self._update)
         if dragging:
             self.connect_event("motion_notify_event", self._update)
-        self._observers = cbook.CallbackRegistry()
+        self._observers = cbook.CallbackRegistry(signals=["changed"])
 
     def _stepped_value(self, val):
         """Return *val* coerced to closest number in the ``valstep`` grid."""
@@ -303,7 +298,7 @@ def disconnect(self, cid):
 
     def reset(self):
         """Reset the slider to the initial value."""
-        if self.val != self.valinit:
+        if np.any(self.val != self.valinit):
             self.set_val(self.valinit)
 
 
@@ -311,7 +306,7 @@ class Slider(SliderBase):
     """
     A slider representing a floating point range.
 
-    Create a slider from *valmin* to *valmax* in axes *ax*. For the slider to
+    Create a slider from *valmin* to *valmax* in Axes *ax*. For the slider to
     remain responsive you must maintain a reference to it. Call
     :meth:`on_changed` to connect to the slider event.
 
@@ -321,15 +316,11 @@ class Slider(SliderBase):
         Slider value.
     """
 
-    cnt = _api.deprecated("3.4")(property(  # Not real, but close enough.
-        lambda self: len(self._observers.callbacks['changed'])))
-    observers = _api.deprecated("3.4")(property(
-        lambda self: self._observers.callbacks['changed']))
-
     def __init__(self, ax, label, valmin, valmax, valinit=0.5, valfmt=None,
                  closedmin=True, closedmax=True, slidermin=None,
                  slidermax=None, dragging=True, valstep=None,
-                 orientation='horizontal', *, initcolor='r', **kwargs):
+                 orientation='horizontal', *, initcolor='r',
+                 track_color='lightgrey', handle_style=None, **kwargs):
         """
         Parameters
         ----------
@@ -380,11 +371,30 @@ def __init__(self, ax, label, valmin, valmax, valinit=0.5, valfmt=None,
             The color of the line at the *valinit* position. Set to ``'none'``
             for no line.
 
+        track_color : color, default: 'lightgrey'
+            The color of the background track. The track is accessible for
+            further styling via the *track* attribute.
+
+        handle_style : dict
+            Properties of the slider handle. Default values are
+
+            ========= ===== ======= ========================================
+            Key       Value Default Description
+            ========= ===== ======= ========================================
+            facecolor color 'white' The facecolor of the slider handle.
+            edgecolor color '.75'   The edgecolor of the slider handle.
+            size      int   10      The size of the slider handle in points.
+            ========= ===== ======= ========================================
+
+            Other values will be transformed as marker{foo} and passed to the
+            `~.Line2D` constructor. e.g. ``handle_style = {'style'='x'}`` will
+            result in ``markerstyle = 'x'``.
+
         Notes
         -----
         Additional kwargs are passed on to ``self.poly`` which is the
-        `~matplotlib.patches.Rectangle` that draws the slider knob.  See the
-        `.Rectangle` documentation for valid property names (``facecolor``,
+        `~matplotlib.patches.Polygon` that draws the slider knob.  See the
+        `.Polygon` documentation for valid property names (``facecolor``,
         ``edgecolor``, ``alpha``, etc.).
         """
         super().__init__(ax, orientation, closedmin, closedmax,
@@ -403,12 +413,43 @@ def __init__(self, ax, label, valmin, valmax, valinit=0.5, valfmt=None,
             valinit = valmin
         self.val = valinit
         self.valinit = valinit
+
+        defaults = {'facecolor': 'white', 'edgecolor': '.75', 'size': 10}
+        handle_style = {} if handle_style is None else handle_style
+        marker_props = {
+            f'marker{k}': v for k, v in {**defaults, **handle_style}.items()
+        }
+
         if orientation == 'vertical':
-            self.poly = ax.axhspan(valmin, valinit, 0, 1, **kwargs)
-            self.hline = ax.axhline(valinit, 0, 1, color=initcolor, lw=1)
+            self.track = Rectangle(
+                (.25, 0), .5, 1,
+                transform=ax.transAxes,
+                facecolor=track_color
+            )
+            ax.add_patch(self.track)
+            self.poly = ax.axhspan(valmin, valinit, .25, .75, **kwargs)
+            # Drawing a longer line and clipping it to the track avoids
+            # pixelation-related asymmetries.
+            self.hline = ax.axhline(valinit, 0, 1, color=initcolor, lw=1,
+                                    clip_path=TransformedPatchPath(self.track))
+            handleXY = [[0.5], [valinit]]
         else:
-            self.poly = ax.axvspan(valmin, valinit, 0, 1, **kwargs)
-            self.vline = ax.axvline(valinit, 0, 1, color=initcolor, lw=1)
+            self.track = Rectangle(
+                (0, .25), 1, .5,
+                transform=ax.transAxes,
+                facecolor=track_color
+            )
+            ax.add_patch(self.track)
+            self.poly = ax.axvspan(valmin, valinit, .25, .75, **kwargs)
+            self.vline = ax.axvline(valinit, 0, 1, color=initcolor, lw=1,
+                                    clip_path=TransformedPatchPath(self.track))
+            handleXY = [[valinit], [0.5]]
+        self._handle, = ax.plot(
+            *handleXY,
+            "o",
+            **marker_props,
+            clip_on=False
+        )
 
         if orientation == 'vertical':
             self.label = ax.text(0.5, 1.02, label, transform=ax.transAxes,
@@ -499,11 +540,13 @@ def set_val(self, val):
         """
         xy = self.poly.xy
         if self.orientation == 'vertical':
-            xy[1] = 0, val
-            xy[2] = 1, val
+            xy[1] = .25, val
+            xy[2] = .75, val
+            self._handle.set_ydata([val])
         else:
-            xy[2] = val, 1
-            xy[3] = val, 0
+            xy[2] = val, .75
+            xy[3] = val, .25
+            self._handle.set_xdata([val])
         self.poly.xy = xy
         self.valtext.set_text(self._format(val))
         if self.drawon:
@@ -536,7 +579,7 @@ class RangeSlider(SliderBase):
     max of the range via the *val* attribute as a tuple of (min, max).
 
     Create a slider that defines a range contained within [*valmin*, *valmax*]
-    in axes *ax*. For the slider to remain responsive you must maintain a
+    in Axes *ax*. For the slider to remain responsive you must maintain a
     reference to it. Call :meth:`on_changed` to connect to the slider event.
 
     Attributes
@@ -558,6 +601,8 @@ def __init__(
         dragging=True,
         valstep=None,
         orientation="horizontal",
+        track_color='lightgrey',
+        handle_style=None,
         **kwargs,
     ):
         """
@@ -598,30 +643,93 @@ def __init__(
         orientation : {'horizontal', 'vertical'}, default: 'horizontal'
             The orientation of the slider.
 
+        track_color : color, default: 'lightgrey'
+            The color of the background track. The track is accessible for
+            further styling via the *track* attribute.
+
+        handle_style : dict
+            Properties of the slider handles. Default values are
+
+            ========= ===== ======= =========================================
+            Key       Value Default Description
+            ========= ===== ======= =========================================
+            facecolor color 'white' The facecolor of the slider handles.
+            edgecolor color '.75'   The edgecolor of the slider handles.
+            size      int   10      The size of the slider handles in points.
+            ========= ===== ======= =========================================
+
+            Other values will be transformed as marker{foo} and passed to the
+            `~.Line2D` constructor. e.g. ``handle_style = {'style'='x'}`` will
+            result in ``markerstyle = 'x'``.
+
         Notes
         -----
         Additional kwargs are passed on to ``self.poly`` which is the
-        `~matplotlib.patches.Rectangle` that draws the slider knob.  See the
-        `.Rectangle` documentation for valid property names (``facecolor``,
+        `~matplotlib.patches.Polygon` that draws the slider knob.  See the
+        `.Polygon` documentation for valid property names (``facecolor``,
         ``edgecolor``, ``alpha``, etc.).
         """
         super().__init__(ax, orientation, closedmin, closedmax,
                          valmin, valmax, valfmt, dragging, valstep)
 
+        # Set a value to allow _value_in_bounds() to work.
+        self.val = [valmin, valmax]
         if valinit is None:
             # Place at the 25th and 75th percentiles
             extent = valmax - valmin
-            valinit = np.array(
-                [valmin + extent * 0.25, valmin + extent * 0.75]
-            )
+            valinit = np.array([valmin + extent * 0.25,
+                                valmin + extent * 0.75])
         else:
             valinit = self._value_in_bounds(valinit)
         self.val = valinit
         self.valinit = valinit
+
+        defaults = {'facecolor': 'white', 'edgecolor': '.75', 'size': 10}
+        handle_style = {} if handle_style is None else handle_style
+        marker_props = {
+            f'marker{k}': v for k, v in {**defaults, **handle_style}.items()
+        }
+
         if orientation == "vertical":
-            self.poly = ax.axhspan(valinit[0], valinit[1], 0, 1, **kwargs)
+            self.track = Rectangle(
+                (.25, 0), .5, 2,
+                transform=ax.transAxes,
+                facecolor=track_color
+            )
+            ax.add_patch(self.track)
+            poly_transform = self.ax.get_yaxis_transform(which="grid")
+            handleXY_1 = [.5, valinit[0]]
+            handleXY_2 = [.5, valinit[1]]
         else:
-            self.poly = ax.axvspan(valinit[0], valinit[1], 0, 1, **kwargs)
+            self.track = Rectangle(
+                (0, .25), 1, .5,
+                transform=ax.transAxes,
+                facecolor=track_color
+            )
+            ax.add_patch(self.track)
+            poly_transform = self.ax.get_xaxis_transform(which="grid")
+            handleXY_1 = [valinit[0], .5]
+            handleXY_2 = [valinit[1], .5]
+        self.poly = Polygon(np.zeros([5, 2]), **kwargs)
+        self._update_selection_poly(*valinit)
+        self.poly.set_transform(poly_transform)
+        self.poly.get_path()._interpolation_steps = 100
+        self.ax.add_patch(self.poly)
+        self.ax._request_autoscale_view()
+        self._handles = [
+            ax.plot(
+                *handleXY_1,
+                "o",
+                **marker_props,
+                clip_on=False
+            )[0],
+            ax.plot(
+                *handleXY_2,
+                "o",
+                **marker_props,
+                clip_on=False
+            )[0]
+        ]
 
         if orientation == "vertical":
             self.label = ax.text(
@@ -660,8 +768,30 @@ def __init__(
                 horizontalalignment="left",
             )
 
+        self._active_handle = None
         self.set_val(valinit)
 
+    def _update_selection_poly(self, vmin, vmax):
+        """
+        Update the vertices of the *self.poly* slider in-place
+        to cover the data range *vmin*, *vmax*.
+        """
+        # The vertices are positioned
+        #  1 ------ 2
+        #  |        |
+        # 0, 4 ---- 3
+        verts = self.poly.xy
+        if self.orientation == "vertical":
+            verts[0] = verts[4] = .25, vmin
+            verts[1] = .25, vmax
+            verts[2] = .75, vmax
+            verts[3] = .75, vmin
+        else:
+            verts[0] = verts[4] = vmin, .25
+            verts[1] = vmin, .75
+            verts[2] = vmax, .75
+            verts[3] = vmax, .25
+
     def _min_in_bounds(self, min):
         """Ensure the new min value is between valmin and self.val[1]."""
         if min <= self.valmin:
@@ -684,8 +814,9 @@ def _max_in_bounds(self, max):
             max = self.val[0]
         return self._stepped_value(max)
 
-    def _value_in_bounds(self, val):
-        return (self._min_in_bounds(val[0]), self._max_in_bounds(val[1]))
+    def _value_in_bounds(self, vals):
+        """Clip min, max values to the bounds."""
+        return (self._min_in_bounds(vals[0]), self._max_in_bounds(vals[1]))
 
     def _update_val_from_pos(self, pos):
         """Update the slider value based on a given position."""
@@ -696,6 +827,11 @@ def _update_val_from_pos(self, pos):
         else:
             val = self._max_in_bounds(pos)
             self.set_max(val)
+        if self._active_handle:
+            if self.orientation == "vertical":
+                self._active_handle.set_ydata([val])
+            else:
+                self._active_handle.set_xdata([val])
 
     def _update(self, event):
         """Update the slider position."""
@@ -714,7 +850,25 @@ def _update(self, event):
         ):
             self.drag_active = False
             event.canvas.release_mouse(self.ax)
+            self._active_handle = None
             return
+
+        # determine which handle was grabbed
+        if self.orientation == "vertical":
+            handle_index = np.argmin(
+                np.abs([h.get_ydata()[0] - event.ydata for h in self._handles])
+            )
+        else:
+            handle_index = np.argmin(
+                np.abs([h.get_xdata()[0] - event.xdata for h in self._handles])
+            )
+        handle = self._handles[handle_index]
+
+        # these checks ensure smooth behavior if the handles swap which one
+        # has a higher value. i.e. if one is dragged over and past the other.
+        if handle is not self._active_handle:
+            self._active_handle = handle
+
         if self.orientation == "vertical":
             self._update_val_from_pos(event.ydata)
         else:
@@ -762,33 +916,26 @@ def set_val(self, val):
         ----------
         val : tuple or array-like of float
         """
-        val = np.sort(np.asanyarray(val))
-        if val.shape != (2,):
-            raise ValueError(
-                f"val must have shape (2,) but has shape {val.shape}"
-            )
-        val[0] = self._min_in_bounds(val[0])
-        val[1] = self._max_in_bounds(val[1])
-        xy = self.poly.xy
+        val = np.sort(val)
+        _api.check_shape((2,), val=val)
+        vmin, vmax = val
+        vmin = self._min_in_bounds(vmin)
+        vmax = self._max_in_bounds(vmax)
+        self._update_selection_poly(vmin, vmax)
         if self.orientation == "vertical":
-            xy[0] = 0, val[0]
-            xy[1] = 0, val[1]
-            xy[2] = 1, val[1]
-            xy[3] = 1, val[0]
-            xy[4] = 0, val[0]
+            self._handles[0].set_ydata([vmin])
+            self._handles[1].set_ydata([vmax])
         else:
-            xy[0] = val[0], 0
-            xy[1] = val[0], 1
-            xy[2] = val[1], 1
-            xy[3] = val[1], 0
-            xy[4] = val[0], 0
-        self.poly.xy = xy
-        self.valtext.set_text(self._format(val))
+            self._handles[0].set_xdata([vmin])
+            self._handles[1].set_xdata([vmax])
+
+        self.valtext.set_text(self._format((vmin, vmax)))
+
         if self.drawon:
             self.ax.figure.canvas.draw_idle()
-        self.val = val
+        self.val = (vmin, vmax)
         if self.eventson:
-            self._observers.process("changed", val)
+            self._observers.process("changed", (vmin, vmax))
 
     def on_changed(self, func):
         """
@@ -820,7 +967,7 @@ class CheckButtons(AxesWidget):
     Attributes
     ----------
     ax : `~matplotlib.axes.Axes`
-        The parent axes for the widget.
+        The parent Axes for the widget.
     labels : list of `.Text`
 
     rectangles : list of `.Rectangle`
@@ -830,11 +977,6 @@ class CheckButtons(AxesWidget):
         each box, but have ``set_visible(False)`` when its box is not checked.
     """
 
-    cnt = _api.deprecated("3.4")(property(  # Not real, but close enough.
-        lambda self: len(self._observers.callbacks['clicked'])))
-    observers = _api.deprecated("3.4")(property(
-        lambda self: self._observers.callbacks['clicked']))
-
     def __init__(self, ax, labels, actives=None):
         """
         Add check buttons to `matplotlib.axes.Axes` instance *ax*.
@@ -842,7 +984,7 @@ def __init__(self, ax, labels, actives=None):
         Parameters
         ----------
         ax : `~matplotlib.axes.Axes`
-            The parent axes for the widget.
+            The parent Axes for the widget.
 
         labels : list of str
             The labels of the check buttons.
@@ -900,7 +1042,7 @@ def __init__(self, ax, labels, actives=None):
 
         self.connect_event('button_press_event', self._clicked)
 
-        self._observers = cbook.CallbackRegistry()
+        self._observers = cbook.CallbackRegistry(signals=["clicked"])
 
     def _clicked(self, event):
         if self.ignore(event) or event.button != 1 or event.inaxes != self.ax:
@@ -973,7 +1115,7 @@ class TextBox(AxesWidget):
     Attributes
     ----------
     ax : `~matplotlib.axes.Axes`
-        The parent axes for the widget.
+        The parent Axes for the widget.
     label : `.Text`
 
     color : color
@@ -982,17 +1124,11 @@ class TextBox(AxesWidget):
         The color of the text box when hovering.
     """
 
-    params_to_disable = _api.deprecated("3.3")(property(
-        lambda self: [key for key in mpl.rcParams if 'keymap' in key]))
-    cnt = _api.deprecated("3.4")(property(  # Not real, but close enough.
-        lambda self: sum(len(d) for d in self._observers.callbacks.values())))
-    change_observers = _api.deprecated("3.4")(property(
-        lambda self: self._observers.callbacks['change']))
-    submit_observers = _api.deprecated("3.4")(property(
-        lambda self: self._observers.callbacks['submit']))
+    DIST_FROM_LEFT = _api.deprecate_privatize_attribute("3.5")
 
     def __init__(self, ax, label, initial='',
-                 color='.95', hovercolor='1', label_pad=.01):
+                 color='.95', hovercolor='1', label_pad=.01,
+                 textalignment="left"):
         """
         Parameters
         ----------
@@ -1008,19 +1144,28 @@ def __init__(self, ax, label, initial='',
             The color of the box when the mouse is over it.
         label_pad : float
             The distance between the label and the right side of the textbox.
+        textalignment : {'left', 'center', 'right'}
+            The horizontal location of the text.
         """
         super().__init__(ax)
 
-        self.DIST_FROM_LEFT = .05
+        self._DIST_FROM_LEFT = .05
+
+        self._text_position = _api.check_getitem(
+            {"left": 0.05, "center": 0.5, "right": 0.95},
+            textalignment=textalignment)
 
         self.label = ax.text(
             -label_pad, 0.5, label, transform=ax.transAxes,
             verticalalignment='center', horizontalalignment='right')
+
+        # TextBox's text object should not parse mathtext at all.
         self.text_disp = self.ax.text(
-            self.DIST_FROM_LEFT, 0.5, initial, transform=self.ax.transAxes,
-            verticalalignment='center', horizontalalignment='left')
+            self._text_position, 0.5, initial, transform=self.ax.transAxes,
+            verticalalignment='center', horizontalalignment=textalignment,
+            parse_math=False)
 
-        self._observers = cbook.CallbackRegistry()
+        self._observers = cbook.CallbackRegistry(signals=["change", "submit"])
 
         ax.set(
             xlim=(0, 1), ylim=(0, 1),  # s.t. cursor appears from first click.
@@ -1029,7 +1174,7 @@ def __init__(self, ax, label, initial='',
 
         self.cursor_index = 0
 
-        self.cursor = ax.vlines(0, 0, 0, visible=False,
+        self.cursor = ax.vlines(0, 0, 0, visible=False, color="k", lw=1,
                                 transform=mpl.transforms.IdentityTransform())
 
         self.connect_event('button_press_event', self._click)
@@ -1056,17 +1201,27 @@ def _rendercursor(self):
         # This causes a single extra draw if the figure has never been rendered
         # yet, which should be fine as we're going to repeatedly re-render the
         # figure later anyways.
-        if self.ax.figure._cachedRenderer is None:
+        if self.ax.figure._get_renderer() is None:
             self.ax.figure.canvas.draw()
 
         text = self.text_disp.get_text()  # Save value before overwriting it.
         widthtext = text[:self.cursor_index]
+
+        bb_text = self.text_disp.get_window_extent()
         self.text_disp.set_text(widthtext or ",")
-        bb = self.text_disp.get_window_extent()
-        if not widthtext:  # Use the comma for the height, but keep width to 0.
-            bb.x1 = bb.x0
+        bb_widthtext = self.text_disp.get_window_extent()
+
+        if bb_text.y0 == bb_text.y1:  # Restoring the height if no text.
+            bb_text.y0 -= bb_widthtext.height / 2
+            bb_text.y1 += bb_widthtext.height / 2
+        elif not widthtext:  # Keep width to 0.
+            bb_text.x1 = bb_text.x0
+        else:  # Move the cursor using width of bb_widthtext.
+            bb_text.x1 = bb_text.x0 + bb_widthtext.width
+
         self.cursor.set(
-            segments=[[(bb.x1, bb.y0), (bb.x1, bb.y1)]], visible=True)
+            segments=[[(bb_text.x1, bb_text.y0), (bb_text.x1, bb_text.y1)]],
+            visible=True)
         self.text_disp.set_text(text)
 
         self.ax.figure.canvas.draw()
@@ -1137,7 +1292,7 @@ def begin_typing(self, x):
             # If using toolmanager, lock keypresses, and plan to release the
             # lock when typing stops.
             toolmanager.keypresslock(self)
-            stack.push(toolmanager.keypresslock.release, self)
+            stack.callback(toolmanager.keypresslock.release, self)
         else:
             # If not using toolmanager, disable all keypress-related rcParams.
             # Avoid spurious warnings if keymaps are getting deprecated.
@@ -1231,7 +1386,7 @@ class RadioButtons(AxesWidget):
     Attributes
     ----------
     ax : `~matplotlib.axes.Axes`
-        The parent axes for the widget.
+        The parent Axes for the widget.
     activecolor : color
         The color of the selected button.
     labels : list of `.Text`
@@ -1249,7 +1404,7 @@ def __init__(self, ax, labels, active=0, activecolor='blue'):
         Parameters
         ----------
         ax : `~matplotlib.axes.Axes`
-            The axes to add the buttons to.
+            The Axes to add the buttons to.
         labels : list of str
             The button labels.
         active : int
@@ -1297,12 +1452,7 @@ def __init__(self, ax, labels, active=0, activecolor='blue'):
 
         self.connect_event('button_press_event', self._clicked)
 
-        self._observers = cbook.CallbackRegistry()
-
-    cnt = _api.deprecated("3.4")(property(  # Not real, but close enough.
-        lambda self: len(self._observers.callbacks['clicked'])))
-    observers = _api.deprecated("3.4")(property(
-        lambda self: self._observers.callbacks['clicked']))
+        self._observers = cbook.CallbackRegistry(signals=["clicked"])
 
     def _clicked(self, event):
         if self.ignore(event) or event.button != 1 or event.inaxes != self.ax:
@@ -1400,11 +1550,7 @@ def __init__(self, targetfig, toolfig):
 
         bax = toolfig.add_axes([0.8, 0.05, 0.15, 0.075])
         self.buttonreset = Button(bax, 'Reset')
-
-        # During reset there can be a temporary invalid state depending on the
-        # order of the reset so we turn off validation for the resetting
-        with cbook._setattr_cm(toolfig.subplotpars, validate=False):
-            self.buttonreset.on_clicked(self._on_reset)
+        self.buttonreset.on_clicked(self._on_reset)
 
     def _on_slider_changed(self, _):
         self.targetfig.subplots_adjust(
@@ -1415,71 +1561,24 @@ def _on_slider_changed(self, _):
 
     def _on_reset(self, event):
         with ExitStack() as stack:
-            # Temporarily disable drawing on self and self's sliders.
+            # Temporarily disable drawing on self and self's sliders, and
+            # disconnect slider events (as the subplotparams can be temporarily
+            # invalid, depending on the order in which they are restored).
             stack.enter_context(cbook._setattr_cm(self, drawon=False))
             for slider in self._sliders:
-                stack.enter_context(cbook._setattr_cm(slider, drawon=False))
+                stack.enter_context(
+                    cbook._setattr_cm(slider, drawon=False, eventson=False))
             # Reset the slider to the initial position.
             for slider in self._sliders:
                 slider.reset()
-        # Draw the canvas.
-        if self.drawon:
-            event.canvas.draw()
-            self.targetfig.canvas.draw()
-
-    axleft = _api.deprecated("3.3")(
-        property(lambda self: self.sliderleft.ax))
-    axright = _api.deprecated("3.3")(
-        property(lambda self: self.sliderright.ax))
-    axbottom = _api.deprecated("3.3")(
-        property(lambda self: self.sliderbottom.ax))
-    axtop = _api.deprecated("3.3")(
-        property(lambda self: self.slidertop.ax))
-    axwspace = _api.deprecated("3.3")(
-        property(lambda self: self.sliderwspace.ax))
-    axhspace = _api.deprecated("3.3")(
-        property(lambda self: self.sliderhspace.ax))
-
-    @_api.deprecated("3.3")
-    def funcleft(self, val):
-        self.targetfig.subplots_adjust(left=val)
-        if self.drawon:
-            self.targetfig.canvas.draw()
-
-    @_api.deprecated("3.3")
-    def funcright(self, val):
-        self.targetfig.subplots_adjust(right=val)
-        if self.drawon:
-            self.targetfig.canvas.draw()
-
-    @_api.deprecated("3.3")
-    def funcbottom(self, val):
-        self.targetfig.subplots_adjust(bottom=val)
-        if self.drawon:
-            self.targetfig.canvas.draw()
-
-    @_api.deprecated("3.3")
-    def functop(self, val):
-        self.targetfig.subplots_adjust(top=val)
-        if self.drawon:
-            self.targetfig.canvas.draw()
-
-    @_api.deprecated("3.3")
-    def funcwspace(self, val):
-        self.targetfig.subplots_adjust(wspace=val)
-        if self.drawon:
-            self.targetfig.canvas.draw()
-
-    @_api.deprecated("3.3")
-    def funchspace(self, val):
-        self.targetfig.subplots_adjust(hspace=val)
         if self.drawon:
-            self.targetfig.canvas.draw()
+            event.canvas.draw()  # Redraw the subplottool canvas.
+        self._on_slider_changed(None)  # Apply changes to the target window.
 
 
 class Cursor(AxesWidget):
     """
-    A crosshair cursor that spans the axes and moves with mouse cursor.
+    A crosshair cursor that spans the Axes and moves with mouse cursor.
 
     For the cursor to remain responsive you must keep a reference to it.
 
@@ -1493,6 +1592,7 @@ class Cursor(AxesWidget):
         Whether to draw the vertical line.
     useblit : bool, default: False
         Use blitting for faster drawing if supported by the backend.
+        See the tutorial :doc:`/tutorials/advanced/blitting` for details.
 
     Other Parameters
     ----------------
@@ -1574,42 +1674,63 @@ def _update(self):
 class MultiCursor(Widget):
     """
     Provide a vertical (default) and/or horizontal line cursor shared between
-    multiple axes.
+    multiple Axes.
 
     For the cursor to remain responsive you must keep a reference to it.
 
-    Example usage::
+    Parameters
+    ----------
+    canvas : object
+        This parameter is entirely unused and only kept for back-compatibility.
 
-        from matplotlib.widgets import MultiCursor
-        import matplotlib.pyplot as plt
-        import numpy as np
+    axes : list of `matplotlib.axes.Axes`
+        The `~.axes.Axes` to attach the cursor to.
 
-        fig, (ax1, ax2) = plt.subplots(nrows=2, sharex=True)
-        t = np.arange(0.0, 2.0, 0.01)
-        ax1.plot(t, np.sin(2*np.pi*t))
-        ax2.plot(t, np.sin(4*np.pi*t))
+    useblit : bool, default: True
+        Use blitting for faster drawing if supported by the backend.
+        See the tutorial :doc:`/tutorials/advanced/blitting`
+        for details.
 
-        multi = MultiCursor(fig.canvas, (ax1, ax2), color='r', lw=1,
-                            horizOn=False, vertOn=True)
-        plt.show()
+    horizOn : bool, default: False
+        Whether to draw the horizontal line.
 
+    vertOn : bool, default: True
+        Whether to draw the vertical line.
+
+    Other Parameters
+    ----------------
+    **lineprops
+        `.Line2D` properties that control the appearance of the lines.
+        See also `~.Axes.axhline`.
+
+    Examples
+    --------
+    See :doc:`/gallery/widgets/multicursor`.
     """
+
+    @_api.make_keyword_only("3.6", "useblit")
     def __init__(self, canvas, axes, useblit=True, horizOn=False, vertOn=True,
                  **lineprops):
+        # canvas is stored only to provide the deprecated .canvas attribute;
+        # once it goes away the unused argument won't need to be stored at all.
+        self._canvas = canvas
 
-        self.canvas = canvas
         self.axes = axes
         self.horizOn = horizOn
         self.vertOn = vertOn
 
+        self._canvas_infos = {
+            ax.figure.canvas: {"cids": [], "background": None} for ax in axes}
+
         xmin, xmax = axes[-1].get_xlim()
         ymin, ymax = axes[-1].get_ylim()
         xmid = 0.5 * (xmin + xmax)
         ymid = 0.5 * (ymin + ymax)
 
         self.visible = True
-        self.useblit = useblit and self.canvas.supports_blit
-        self.background = None
+        self.useblit = (
+            useblit
+            and all(canvas.supports_blit for canvas in self._canvas_infos))
         self.needclear = False
 
         if self.useblit:
@@ -1629,33 +1750,39 @@ def __init__(self, canvas, axes, useblit=True, horizOn=False, vertOn=True,
 
         self.connect()
 
+    canvas = _api.deprecate_privatize_attribute("3.6")
+    background = _api.deprecated("3.6")(lambda self: (
+        self._backgrounds[self.axes[0].figure.canvas] if self.axes else None))
+
     def connect(self):
         """Connect events."""
-        self._cidmotion = self.canvas.mpl_connect('motion_notify_event',
-                                                  self.onmove)
-        self._ciddraw = self.canvas.mpl_connect('draw_event', self.clear)
+        for canvas, info in self._canvas_infos.items():
+            info["cids"] = [
+                canvas.mpl_connect('motion_notify_event', self.onmove),
+                canvas.mpl_connect('draw_event', self.clear),
+            ]
 
     def disconnect(self):
         """Disconnect events."""
-        self.canvas.mpl_disconnect(self._cidmotion)
-        self.canvas.mpl_disconnect(self._ciddraw)
+        for canvas, info in self._canvas_infos.items():
+            for cid in info["cids"]:
+                canvas.mpl_disconnect(cid)
+            info["cids"].clear()
 
     def clear(self, event):
         """Clear the cursor."""
         if self.ignore(event):
             return
         if self.useblit:
-            self.background = (
-                self.canvas.copy_from_bbox(self.canvas.figure.bbox))
+            for canvas, info in self._canvas_infos.items():
+                info["background"] = canvas.copy_from_bbox(canvas.figure.bbox)
         for line in self.vlines + self.hlines:
             line.set_visible(False)
 
     def onmove(self, event):
-        if self.ignore(event):
-            return
-        if event.inaxes is None:
-            return
-        if not self.canvas.widgetlock.available(self):
+        if (self.ignore(event)
+                or event.inaxes not in self.axes
+                or not event.canvas.widgetlock.available(self)):
             return
         self.needclear = True
         if not self.visible:
@@ -1672,54 +1799,78 @@ def onmove(self, event):
 
     def _update(self):
         if self.useblit:
-            if self.background is not None:
-                self.canvas.restore_region(self.background)
+            for canvas, info in self._canvas_infos.items():
+                if info["background"]:
+                    canvas.restore_region(info["background"])
             if self.vertOn:
                 for ax, line in zip(self.axes, self.vlines):
                     ax.draw_artist(line)
             if self.horizOn:
                 for ax, line in zip(self.axes, self.hlines):
                     ax.draw_artist(line)
-            self.canvas.blit()
+            for canvas in self._canvas_infos:
+                canvas.blit()
         else:
-            self.canvas.draw_idle()
+            for canvas in self._canvas_infos:
+                canvas.draw_idle()
 
 
 class _SelectorWidget(AxesWidget):
 
     def __init__(self, ax, onselect, useblit=False, button=None,
-                 state_modifier_keys=None):
+                 state_modifier_keys=None, use_data_coordinates=False):
         super().__init__(ax)
 
-        self.visible = True
+        self._visible = True
         self.onselect = onselect
         self.useblit = useblit and self.canvas.supports_blit
         self.connect_default_events()
 
-        self.state_modifier_keys = dict(move=' ', clear='escape',
-                                        square='shift', center='control')
-        self.state_modifier_keys.update(state_modifier_keys or {})
+        self._state_modifier_keys = dict(move=' ', clear='escape',
+                                         square='shift', center='control',
+                                         rotate='r')
+        self._state_modifier_keys.update(state_modifier_keys or {})
+        self._use_data_coordinates = use_data_coordinates
 
         self.background = None
-        self.artists = []
 
         if isinstance(button, Integral):
             self.validButtons = [button]
         else:
             self.validButtons = button
 
+        # Set to True when a selection is completed, otherwise is False
+        self._selection_completed = False
+
         # will save the data (position at mouseclick)
-        self.eventpress = None
+        self._eventpress = None
         # will save the data (pos. at mouserelease)
-        self.eventrelease = None
+        self._eventrelease = None
         self._prev_event = None
-        self.state = set()
+        self._state = set()
+
+    eventpress = _api.deprecate_privatize_attribute("3.5")
+    eventrelease = _api.deprecate_privatize_attribute("3.5")
+    state = _api.deprecate_privatize_attribute("3.5")
+    state_modifier_keys = _api.deprecate_privatize_attribute("3.6")
 
     def set_active(self, active):
         super().set_active(active)
         if active:
             self.update_background(None)
 
+    def _get_animated_artists(self):
+        """
+        Convenience method to get all animated artists of the figure containing
+        this widget, excluding those already present in self.artists.
+        The returned tuple is not sorted by 'z_order': z_order sorting is
+        valid only when considering all artists and not only a subset of all
+        artists.
+        """
+        return tuple(a for ax_ in self.ax.get_figure().get_axes()
+                     for a in ax_.get_children()
+                     if a.get_animated() and a not in self.artists)
+
     def update_background(self, event):
         """Force an update of the background."""
         # If you add a call to `ignore` here, you'll want to check edge case:
@@ -1729,16 +1880,22 @@ def update_background(self, event):
         # Make sure that widget artists don't get accidentally included in the
         # background, by re-rendering the background if needed (and then
         # re-re-rendering the canvas with the visible widget artists).
-        needs_redraw = any(artist.get_visible() for artist in self.artists)
+        # We need to remove all artists which will be drawn when updating
+        # the selector: if we have animated artists in the figure, it is safer
+        # to redrawn by default, in case they have updated by the callback
+        # zorder needs to be respected when redrawing
+        artists = sorted(self.artists + self._get_animated_artists(),
+                         key=lambda a: a.get_zorder())
+        needs_redraw = any(artist.get_visible() for artist in artists)
         with ExitStack() as stack:
             if needs_redraw:
-                for artist in self.artists:
-                    stack.callback(artist.set_visible, artist.get_visible())
-                    artist.set_visible(False)
+                for artist in artists:
+                    stack.enter_context(artist._cm_set(visible=False))
                 self.canvas.draw()
             self.background = self.canvas.copy_from_bbox(self.ax.bbox)
         if needs_redraw:
-            self.update()
+            for artist in artists:
+                self.ax.draw_artist(artist)
 
     def connect_default_events(self):
         """Connect the major canvas events to methods."""
@@ -1765,29 +1922,36 @@ def ignore(self, event):
                 and event.button not in self.validButtons):
             return True
         # If no button was pressed yet ignore the event if it was out
-        # of the axes
-        if self.eventpress is None:
+        # of the Axes
+        if self._eventpress is None:
             return event.inaxes != self.ax
         # If a button was pressed, check if the release-button is the same.
-        if event.button == self.eventpress.button:
+        if event.button == self._eventpress.button:
             return False
         # If a button was pressed, check if the release-button is the same.
         return (event.inaxes != self.ax or
-                event.button != self.eventpress.button)
+                event.button != self._eventpress.button)
 
     def update(self):
         """Draw using blit() or draw_idle(), depending on ``self.useblit``."""
-        if not self.ax.get_visible():
-            return False
+        if (not self.ax.get_visible() or
+                self.ax.figure._get_renderer() is None):
+            return
         if self.useblit:
             if self.background is not None:
                 self.canvas.restore_region(self.background)
-            for artist in self.artists:
+            else:
+                self.update_background(None)
+            # We need to draw all artists, which are not included in the
+            # background, therefore we also draw self._get_animated_artists()
+            # and we make sure that we respect z_order
+            artists = sorted(self.artists + self._get_animated_artists(),
+                             key=lambda a: a.get_zorder())
+            for artist in artists:
                 self.ax.draw_artist(artist)
             self.canvas.blit(self.ax.bbox)
         else:
             self.canvas.draw_idle()
-        return False
 
     def _get_data(self, event):
         """Get the xdata and ydata for event, with limits."""
@@ -1817,13 +1981,13 @@ def press(self, event):
         """Button press handler and validator."""
         if not self.ignore(event):
             event = self._clean_event(event)
-            self.eventpress = event
+            self._eventpress = event
             self._prev_event = event
             key = event.key or ''
             key = key.replace('ctrl', 'control')
             # move state is locked in on a button press
-            if key == self.state_modifier_keys['move']:
-                self.state.add('move')
+            if key == self._state_modifier_keys['move']:
+                self._state.add('move')
             self._press(event)
             return True
         return False
@@ -1833,13 +1997,13 @@ def _press(self, event):
 
     def release(self, event):
         """Button release event handler and validator."""
-        if not self.ignore(event) and self.eventpress:
+        if not self.ignore(event) and self._eventpress:
             event = self._clean_event(event)
-            self.eventrelease = event
+            self._eventrelease = event
             self._release(event)
-            self.eventpress = None
-            self.eventrelease = None
-            self.state.discard('move')
+            self._eventpress = None
+            self._eventrelease = None
+            self._state.discard('move')
             return True
         return False
 
@@ -1848,7 +2012,7 @@ def _release(self, event):
 
     def onmove(self, event):
         """Cursor move event handler and validator."""
-        if not self.ignore(event) and self.eventpress:
+        if not self.ignore(event) and self._eventpress:
             event = self._clean_event(event)
             self._onmove(event)
             return True
@@ -1870,14 +2034,20 @@ def on_key_press(self, event):
         if self.active:
             key = event.key or ''
             key = key.replace('ctrl', 'control')
-            if key == self.state_modifier_keys['clear']:
-                for artist in self.artists:
-                    artist.set_visible(False)
-                self.update()
+            if key == self._state_modifier_keys['clear']:
+                self.clear()
                 return
-            for (state, modifier) in self.state_modifier_keys.items():
-                if modifier in key:
-                    self.state.add(state)
+            for (state, modifier) in self._state_modifier_keys.items():
+                if modifier in key.split('+'):
+                    # 'rotate' is changing _state on press and is not removed
+                    # from _state when releasing
+                    if state == 'rotate':
+                        if state in self._state:
+                            self._state.discard(state)
+                        else:
+                            self._state.add(state)
+                    else:
+                        self._state.add(state)
             self._on_key_press(event)
 
     def _on_key_press(self, event):
@@ -1887,20 +2057,126 @@ def on_key_release(self, event):
         """Key release event handler and validator."""
         if self.active:
             key = event.key or ''
-            for (state, modifier) in self.state_modifier_keys.items():
-                if modifier in key:
-                    self.state.discard(state)
+            for (state, modifier) in self._state_modifier_keys.items():
+                # 'rotate' is changing _state on press and is not removed
+                # from _state when releasing
+                if modifier in key.split('+') and state != 'rotate':
+                    self._state.discard(state)
             self._on_key_release(event)
 
     def _on_key_release(self, event):
         """Key release event handler."""
 
     def set_visible(self, visible):
-        """Set the visibility of our artists."""
-        self.visible = visible
+        """Set the visibility of the selector artists."""
+        self._visible = visible
         for artist in self.artists:
             artist.set_visible(visible)
 
+    def get_visible(self):
+        """Get the visibility of the selector artists."""
+        return self._visible
+
+    @property
+    def visible(self):
+        return self.get_visible()
+
+    @visible.setter
+    def visible(self, visible):
+        _api.warn_deprecated("3.6", alternative="set_visible")
+        self.set_visible(visible)
+
+    def clear(self):
+        """Clear the selection and set the selector ready to make a new one."""
+        self._clear_without_update()
+        self.update()
+
+    def _clear_without_update(self):
+        self._selection_completed = False
+        self.set_visible(False)
+
+    @property
+    def artists(self):
+        """Tuple of the artists of the selector."""
+        handles_artists = getattr(self, '_handles_artists', ())
+        return (self._selection_artist,) + handles_artists
+
+    def set_props(self, **props):
+        """
+        Set the properties of the selector artist. See the `props` argument
+        in the selector docstring to know which properties are supported.
+        """
+        artist = self._selection_artist
+        props = cbook.normalize_kwargs(props, artist)
+        artist.set(**props)
+        if self.useblit:
+            self.update()
+        self._props.update(props)
+
+    def set_handle_props(self, **handle_props):
+        """
+        Set the properties of the handles selector artist. See the
+        `handle_props` argument in the selector docstring to know which
+        properties are supported.
+        """
+        if not hasattr(self, '_handles_artists'):
+            raise NotImplementedError("This selector doesn't have handles.")
+
+        artist = self._handles_artists[0]
+        handle_props = cbook.normalize_kwargs(handle_props, artist)
+        for handle in self._handles_artists:
+            handle.set(**handle_props)
+        if self.useblit:
+            self.update()
+        self._handle_props.update(handle_props)
+
+    def _validate_state(self, state):
+        supported_state = [
+            key for key, value in self._state_modifier_keys.items()
+            if key != 'clear' and value != 'not-applicable'
+            ]
+        _api.check_in_list(supported_state, state=state)
+
+    def add_state(self, state):
+        """
+        Add a state to define the widget's behavior. See the
+        `state_modifier_keys` parameters for details.
+
+        Parameters
+        ----------
+        state : str
+            Must be a supported state of the selector. See the
+            `state_modifier_keys` parameters for details.
+
+        Raises
+        ------
+        ValueError
+            When the state is not supported by the selector.
+
+        """
+        self._validate_state(state)
+        self._state.add(state)
+
+    def remove_state(self, state):
+        """
+        Remove a state to define the widget's behavior. See the
+        `state_modifier_keys` parameters for details.
+
+        Parameters
+        ----------
+        value : str
+            Must be a supported state of the selector. See the
+            `state_modifier_keys` parameters for details.
+
+        Raises
+        ------
+        ValueError
+            When the state is not supported by the selector.
+
+        """
+        self._validate_state(state)
+        self._state.remove(state)
+
 
 class SpanSelector(_SelectorWidget):
     """
@@ -1912,34 +2188,79 @@ class SpanSelector(_SelectorWidget):
     In order to turn off the SpanSelector, set ``span_selector.active`` to
     False.  To turn it back on, set it to True.
 
+    Press and release events triggered at the same coordinates outside the
+    selection will clear the selector, except when
+    ``ignore_event_outside=True``.
+
     Parameters
     ----------
     ax : `matplotlib.axes.Axes`
 
-    onselect : func(min, max), min/max are floats
+    onselect : callable
+        A callback function that is called after a release event and the
+        selection is created, changed or removed.
+        It must have the signature::
+
+            def on_select(min: float, max: float) -> Any
 
     direction : {"horizontal", "vertical"}
         The direction along which to draw the span selector.
 
-    minspan : float, default: None
-        If selection is less than *minspan*, do not call *onselect*.
+    minspan : float, default: 0
+        If selection is less than or equal to *minspan*, the selection is
+        removed (when already existing) or cancelled.
 
     useblit : bool, default: False
         If True, use the backend-dependent blitting features for faster
-        canvas updates.
+        canvas updates. See the tutorial :doc:`/tutorials/advanced/blitting`
+        for details.
 
-    rectprops : dict, default: None
+    props : dict, optional
         Dictionary of `matplotlib.patches.Patch` properties.
+        Default:
+
+            ``dict(facecolor='red', alpha=0.5)``
 
     onmove_callback : func(min, max), min/max are floats, default: None
         Called on mouse move while the span is being selected.
 
     span_stays : bool, default: False
         If True, the span stays visible after the mouse is released.
+        Deprecated, use *interactive* instead.
+
+    interactive : bool, default: False
+        Whether to draw a set of handles that allow interaction with the
+        widget after it is drawn.
 
-    button : `.MouseButton` or list of `.MouseButton`
+    button : `.MouseButton` or list of `.MouseButton`, default: all buttons
         The mouse buttons which activate the span selector.
 
+    handle_props : dict, default: None
+        Properties of the handle lines at the edges of the span. Only used
+        when *interactive* is True. See `matplotlib.lines.Line2D` for valid
+        properties.
+
+    grab_range : float, default: 10
+        Distance in pixels within which the interactive tool handles can be
+        activated.
+
+    state_modifier_keys : dict, optional
+        Keyboard modifiers which affect the widget's behavior.  Values
+        amend the defaults, which are:
+
+        - "clear": Clear the current shape, default: "escape".
+
+    drag_from_anywhere : bool, default: False
+        If `True`, the widget can be moved by clicking anywhere within
+        its bounds.
+
+    ignore_event_outside : bool, default: False
+        If `True`, the event triggered outside the span selector will be
+        ignored.
+
+    snap_values : 1D array-like, optional
+        Snap the selector edges to the given values.
+
     Examples
     --------
     >>> import matplotlib.pyplot as plt
@@ -1948,43 +2269,88 @@ class SpanSelector(_SelectorWidget):
     >>> ax.plot([1, 2, 3], [10, 50, 100])
     >>> def onselect(vmin, vmax):
     ...     print(vmin, vmax)
-    >>> rectprops = dict(facecolor='blue', alpha=0.5)
     >>> span = mwidgets.SpanSelector(ax, onselect, 'horizontal',
-    ...                              rectprops=rectprops)
+    ...                              props=dict(facecolor='blue', alpha=0.5))
     >>> fig.show()
 
     See also: :doc:`/gallery/widgets/span_selector`
     """
 
-    def __init__(self, ax, onselect, direction, minspan=None, useblit=False,
-                 rectprops=None, onmove_callback=None, span_stays=False,
-                 button=None):
-
-        super().__init__(ax, onselect, useblit=useblit, button=button)
+    @_api.rename_parameter("3.5", "rectprops", "props")
+    @_api.rename_parameter("3.5", "span_stays", "interactive")
+    def __init__(self, ax, onselect, direction, minspan=0, useblit=False,
+                 props=None, onmove_callback=None, interactive=False,
+                 button=None, handle_props=None, grab_range=10,
+                 state_modifier_keys=None, drag_from_anywhere=False,
+                 ignore_event_outside=False, snap_values=None):
+
+        if state_modifier_keys is None:
+            state_modifier_keys = dict(clear='escape',
+                                       square='not-applicable',
+                                       center='not-applicable',
+                                       rotate='not-applicable')
+        super().__init__(ax, onselect, useblit=useblit, button=button,
+                         state_modifier_keys=state_modifier_keys)
 
-        if rectprops is None:
-            rectprops = dict(facecolor='red', alpha=0.5)
+        if props is None:
+            props = dict(facecolor='red', alpha=0.5)
 
-        rectprops['animated'] = self.useblit
+        props['animated'] = self.useblit
 
-        _api.check_in_list(['horizontal', 'vertical'], direction=direction)
         self.direction = direction
+        self._extents_on_press = None
+        self.snap_values = snap_values
 
-        self.rect = None
-        self.pressv = None
+        # self._pressv is deprecated and we don't use it internally anymore
+        # but we maintain it until it is removed
+        self._pressv = None
 
-        self.rectprops = rectprops
+        self._props = props
         self.onmove_callback = onmove_callback
         self.minspan = minspan
-        self.span_stays = span_stays
 
-        # Needed when dragging out of axes
-        self.prev = (0, 0)
+        self.grab_range = grab_range
+        self._interactive = interactive
+        self._edge_handles = None
+        self.drag_from_anywhere = drag_from_anywhere
+        self.ignore_event_outside = ignore_event_outside
 
         # Reset canvas so that `new_axes` connects events.
         self.canvas = None
         self.new_axes(ax)
 
+        # Setup handles
+        self._handle_props = {
+            'color': props.get('facecolor', 'r'),
+            **cbook.normalize_kwargs(handle_props, Line2D)}
+
+        if self._interactive:
+            self._edge_order = ['min', 'max']
+            self._setup_edge_handles(self._handle_props)
+
+        self._active_handle = None
+
+        # prev attribute is deprecated but we still need to maintain it
+        self._prev = (0, 0)
+
+    rect = _api.deprecated("3.5")(
+        property(lambda self: self._selection_artist)
+        )
+
+    rectprops = _api.deprecated("3.5")(
+        property(lambda self: self._props)
+        )
+
+    active_handle = _api.deprecate_privatize_attribute("3.5")
+
+    pressv = _api.deprecate_privatize_attribute("3.5")
+
+    span_stays = _api.deprecated("3.5")(
+        property(lambda self: self._interactive)
+        )
+
+    prev = _api.deprecate_privatize_attribute("3.5")
+
     def new_axes(self, ax):
         """Set SpanSelector to operate on a new Axes."""
         self.ax = ax
@@ -1995,123 +2361,383 @@ def new_axes(self, ax):
             self.canvas = ax.figure.canvas
             self.connect_default_events()
 
+        # Reset
+        self._selection_completed = False
+
         if self.direction == 'horizontal':
             trans = ax.get_xaxis_transform()
             w, h = 0, 1
         else:
             trans = ax.get_yaxis_transform()
             w, h = 1, 0
-        self.rect = Rectangle((0, 0), w, h,
-                              transform=trans,
-                              visible=False,
-                              **self.rectprops)
-        if self.span_stays:
-            self.stay_rect = Rectangle((0, 0), w, h,
-                                       transform=trans,
-                                       visible=False,
-                                       **self.rectprops)
-            self.stay_rect.set_animated(False)
-            self.ax.add_patch(self.stay_rect)
-
-        self.ax.add_patch(self.rect)
-        self.artists = [self.rect]
+        rect_artist = Rectangle((0, 0), w, h,
+                                transform=trans,
+                                visible=False,
+                                **self._props)
 
-    def ignore(self, event):
+        self.ax.add_patch(rect_artist)
+        self._selection_artist = rect_artist
+
+    def _setup_edge_handles(self, props):
+        # Define initial position using the axis bounds to keep the same bounds
+        if self.direction == 'horizontal':
+            positions = self.ax.get_xbound()
+        else:
+            positions = self.ax.get_ybound()
+        self._edge_handles = ToolLineHandles(self.ax, positions,
+                                             direction=self.direction,
+                                             line_props=props,
+                                             useblit=self.useblit)
+
+    @property
+    def _handles_artists(self):
+        if self._edge_handles is not None:
+            return self._edge_handles.artists
+        else:
+            return ()
+
+    def _set_cursor(self, enabled):
+        """Update the canvas cursor based on direction of the selector."""
+        if enabled:
+            cursor = (backend_tools.Cursors.RESIZE_HORIZONTAL
+                      if self.direction == 'horizontal' else
+                      backend_tools.Cursors.RESIZE_VERTICAL)
+        else:
+            cursor = backend_tools.Cursors.POINTER
+
+        self.ax.figure.canvas.set_cursor(cursor)
+
+    def connect_default_events(self):
         # docstring inherited
-        return super().ignore(event) or not self.visible
+        super().connect_default_events()
+        if getattr(self, '_interactive', False):
+            self.connect_event('motion_notify_event', self._hover)
 
     def _press(self, event):
         """Button press event handler."""
-        self.rect.set_visible(self.visible)
-        if self.span_stays:
-            self.stay_rect.set_visible(False)
-            # really force a draw so that the stay rect is not in
-            # the blit background
-            if self.useblit:
-                self.canvas.draw()
-        xdata, ydata = self._get_data(event)
-        if self.direction == 'horizontal':
-            self.pressv = xdata
+        self._set_cursor(True)
+        if self._interactive and self._selection_artist.get_visible():
+            self._set_active_handle(event)
         else:
-            self.pressv = ydata
+            self._active_handle = None
+
+        if self._active_handle is None or not self._interactive:
+            # Clear previous rectangle before drawing new rectangle.
+            self.update()
+
+        v = event.xdata if self.direction == 'horizontal' else event.ydata
+        # self._pressv and self._prev are deprecated but we still need to
+        # maintain them
+        self._pressv = v
+        self._prev = self._get_data(event)
+
+        if self._active_handle is None and not self.ignore_event_outside:
+            # when the press event outside the span, we initially set the
+            # visibility to False and extents to (v, v)
+            # update will be called when setting the extents
+            self._visible = False
+            self.extents = v, v
+            # We need to set the visibility back, so the span selector will be
+            # drawn when necessary (span width > 0)
+            self._visible = True
+        else:
+            self.set_visible(True)
 
-        self._set_span_xy(event)
         return False
 
+    @property
+    def direction(self):
+        """Direction of the span selector: 'vertical' or 'horizontal'."""
+        return self._direction
+
+    @direction.setter
+    def direction(self, direction):
+        """Set the direction of the span selector."""
+        _api.check_in_list(['horizontal', 'vertical'], direction=direction)
+        if hasattr(self, '_direction') and direction != self._direction:
+            # remove previous artists
+            self._selection_artist.remove()
+            if self._interactive:
+                self._edge_handles.remove()
+            self._direction = direction
+            self.new_axes(self.ax)
+            if self._interactive:
+                self._setup_edge_handles(self._handle_props)
+        else:
+            self._direction = direction
+
     def _release(self, event):
         """Button release event handler."""
-        if self.pressv is None:
-            return
+        self._set_cursor(False)
+        # self._pressv is deprecated but we still need to maintain it
+        self._pressv = None
 
-        self.rect.set_visible(False)
+        if not self._interactive:
+            self._selection_artist.set_visible(False)
 
-        if self.span_stays:
-            self.stay_rect.set_x(self.rect.get_x())
-            self.stay_rect.set_y(self.rect.get_y())
-            self.stay_rect.set_width(self.rect.get_width())
-            self.stay_rect.set_height(self.rect.get_height())
-            self.stay_rect.set_visible(True)
+        if (self._active_handle is None and self._selection_completed and
+                self.ignore_event_outside):
+            return
 
-        self.canvas.draw_idle()
-        vmin = self.pressv
-        xdata, ydata = self._get_data(event)
-        if self.direction == 'horizontal':
-            vmax = xdata or self.prev[0]
+        vmin, vmax = self.extents
+        span = vmax - vmin
+
+        if span <= self.minspan:
+            # Remove span and set self._selection_completed = False
+            self.set_visible(False)
+            if self._selection_completed:
+                # Call onselect, only when the span is already existing
+                self.onselect(vmin, vmax)
+            self._selection_completed = False
         else:
-            vmax = ydata or self.prev[1]
+            self.onselect(vmin, vmax)
+            self._selection_completed = True
+
+        self.update()
+
+        self._active_handle = None
 
-        if vmin > vmax:
-            vmin, vmax = vmax, vmin
-        span = vmax - vmin
-        if self.minspan is not None and span < self.minspan:
-            return
-        self.onselect(vmin, vmax)
-        self.pressv = None
         return False
 
+    def _hover(self, event):
+        """Update the canvas cursor if it's over a handle."""
+        if self.ignore(event):
+            return
+
+        if self._active_handle is not None or not self._selection_completed:
+            # Do nothing if button is pressed and a handle is active, which may
+            # occur with drag_from_anywhere=True.
+            # Do nothing if selection is not completed, which occurs when
+            # a selector has been cleared
+            return
+
+        _, e_dist = self._edge_handles.closest(event.x, event.y)
+        self._set_cursor(e_dist <= self.grab_range)
+
     def _onmove(self, event):
         """Motion notify event handler."""
-        if self.pressv is None:
-            return
 
-        self._set_span_xy(event)
+        # self._prev are deprecated but we still need to maintain it
+        self._prev = self._get_data(event)
 
-        if self.onmove_callback is not None:
-            vmin = self.pressv
-            xdata, ydata = self._get_data(event)
-            if self.direction == 'horizontal':
-                vmax = xdata or self.prev[0]
-            else:
-                vmax = ydata or self.prev[1]
+        v = event.xdata if self.direction == 'horizontal' else event.ydata
+        if self.direction == 'horizontal':
+            vpress = self._eventpress.xdata
+        else:
+            vpress = self._eventpress.ydata
+
+        # move existing span
+        # When "dragging from anywhere", `self._active_handle` is set to 'C'
+        # (match notation used in the RectangleSelector)
+        if self._active_handle == 'C' and self._extents_on_press is not None:
+            vmin, vmax = self._extents_on_press
+            dv = v - vpress
+            vmin += dv
+            vmax += dv
 
+        # resize an existing shape
+        elif self._active_handle and self._active_handle != 'C':
+            vmin, vmax = self._extents_on_press
+            if self._active_handle == 'min':
+                vmin = v
+            else:
+                vmax = v
+        # new shape
+        else:
+            # Don't create a new span if there is already one when
+            # ignore_event_outside=True
+            if self.ignore_event_outside and self._selection_completed:
+                return
+            vmin, vmax = vpress, v
             if vmin > vmax:
                 vmin, vmax = vmax, vmin
+
+        self.extents = vmin, vmax
+
+        if self.onmove_callback is not None:
             self.onmove_callback(vmin, vmax)
 
-        self.update()
         return False
 
-    def _set_span_xy(self, event):
-        """Set the span coordinates."""
-        x, y = self._get_data(event)
-        if x is None:
-            return
+    def _draw_shape(self, vmin, vmax):
+        if vmin > vmax:
+            vmin, vmax = vmax, vmin
+        if self.direction == 'horizontal':
+            self._selection_artist.set_x(vmin)
+            self._selection_artist.set_width(vmax - vmin)
+        else:
+            self._selection_artist.set_y(vmin)
+            self._selection_artist.set_height(vmax - vmin)
+
+    def _set_active_handle(self, event):
+        """Set active handle based on the location of the mouse event."""
+        # Note: event.xdata/ydata in data coordinates, event.x/y in pixels
+        e_idx, e_dist = self._edge_handles.closest(event.x, event.y)
+
+        # Prioritise center handle over other handles
+        # Use 'C' to match the notation used in the RectangleSelector
+        if 'move' in self._state:
+            self._active_handle = 'C'
+        elif e_dist > self.grab_range:
+            # Not close to any handles
+            self._active_handle = None
+            if self.drag_from_anywhere and self._contains(event):
+                # Check if we've clicked inside the region
+                self._active_handle = 'C'
+                self._extents_on_press = self.extents
+            else:
+                self._active_handle = None
+                return
+        else:
+            # Closest to an edge handle
+            self._active_handle = self._edge_order[e_idx]
+
+        # Save coordinates of rectangle at the start of handle movement.
+        self._extents_on_press = self.extents
+
+    def _contains(self, event):
+        """Return True if event is within the patch."""
+        return self._selection_artist.contains(event, radius=0)[0]
 
-        self.prev = x, y
+    @staticmethod
+    def _snap(values, snap_values):
+        """Snap values to a given array values (snap_values)."""
+        # take into account machine precision
+        eps = np.min(np.abs(np.diff(snap_values))) * 1e-12
+        return tuple(
+            snap_values[np.abs(snap_values - v + np.sign(v) * eps).argmin()]
+            for v in values)
+
+    @property
+    def extents(self):
+        """Return extents of the span selector."""
         if self.direction == 'horizontal':
-            v = x
+            vmin = self._selection_artist.get_x()
+            vmax = vmin + self._selection_artist.get_width()
         else:
-            v = y
+            vmin = self._selection_artist.get_y()
+            vmax = vmin + self._selection_artist.get_height()
+        return vmin, vmax
+
+    @extents.setter
+    def extents(self, extents):
+        # Update displayed shape
+        if self.snap_values is not None:
+            extents = tuple(self._snap(extents, self.snap_values))
+        self._draw_shape(*extents)
+        if self._interactive:
+            # Update displayed handles
+            self._edge_handles.set_data(self.extents)
+        self.set_visible(self._visible)
+        self.update()
+
+
+class ToolLineHandles:
+    """
+    Control handles for canvas tools.
+
+    Parameters
+    ----------
+    ax : `matplotlib.axes.Axes`
+        Matplotlib Axes where tool handles are displayed.
+    positions : 1D array
+        Positions of handles in data coordinates.
+    direction : {"horizontal", "vertical"}
+        Direction of handles, either 'vertical' or 'horizontal'
+    line_props : dict, optional
+        Additional line properties. See `matplotlib.lines.Line2D`.
+    useblit : bool, default: True
+        Whether to use blitting for faster drawing (if supported by the
+        backend). See the tutorial :doc:`/tutorials/advanced/blitting`
+        for details.
+    """
+
+    def __init__(self, ax, positions, direction, line_props=None,
+                 useblit=True):
+        self.ax = ax
+
+        _api.check_in_list(['horizontal', 'vertical'], direction=direction)
+        self._direction = direction
+
+        if line_props is None:
+            line_props = {}
+        line_props.update({'visible': False, 'animated': useblit})
 
-        minv, maxv = v, self.pressv
-        if minv > maxv:
-            minv, maxv = maxv, minv
+        line_fun = ax.axvline if self.direction == 'horizontal' else ax.axhline
+
+        self._artists = [line_fun(p, **line_props) for p in positions]
+
+    @property
+    def artists(self):
+        return tuple(self._artists)
+
+    @property
+    def positions(self):
+        """Positions of the handle in data coordinates."""
+        method = 'get_xdata' if self.direction == 'horizontal' else 'get_ydata'
+        return [getattr(line, method)()[0] for line in self.artists]
+
+    @property
+    def direction(self):
+        """Direction of the handle: 'vertical' or 'horizontal'."""
+        return self._direction
+
+    def set_data(self, positions):
+        """
+        Set x or y positions of handles, depending if the lines are vertical
+        of horizontal.
+
+        Parameters
+        ----------
+        positions : tuple of length 2
+            Set the positions of the handle in data coordinates
+        """
+        method = 'set_xdata' if self.direction == 'horizontal' else 'set_ydata'
+        for line, p in zip(self.artists, positions):
+            getattr(line, method)([p, p])
+
+    def set_visible(self, value):
+        """Set the visibility state of the handles artist."""
+        for artist in self.artists:
+            artist.set_visible(value)
+
+    def set_animated(self, value):
+        """Set the animated state of the handles artist."""
+        for artist in self.artists:
+            artist.set_animated(value)
+
+    def remove(self):
+        """Remove the handles artist from the figure."""
+        for artist in self._artists:
+            artist.remove()
+
+    def closest(self, x, y):
+        """
+        Return index and pixel distance to closest handle.
+
+        Parameters
+        ----------
+        x, y : float
+            x, y position from which the distance will be calculated to
+            determinate the closest handle
+
+        Returns
+        -------
+        index, distance : index of the handle and its distance from
+            position x, y
+        """
         if self.direction == 'horizontal':
-            self.rect.set_x(minv)
-            self.rect.set_width(maxv - minv)
+            p_pts = np.array([
+                self.ax.transData.transform((p, 0))[0] for p in self.positions
+                ])
+            dist = abs(p_pts - x)
         else:
-            self.rect.set_y(minv)
-            self.rect.set_height(maxv - minv)
+            p_pts = np.array([
+                self.ax.transData.transform((0, p))[1] for p in self.positions
+                ])
+            dist = abs(p_pts - y)
+        index = np.argmin(dist)
+        return index, dist[index]
 
 
 class ToolHandles:
@@ -2121,13 +2747,17 @@ class ToolHandles:
     Parameters
     ----------
     ax : `matplotlib.axes.Axes`
-        Matplotlib axes where tool handles are displayed.
+        Matplotlib Axes where tool handles are displayed.
     x, y : 1D arrays
         Coordinates of control handles.
-    marker : str
+    marker : str, default: 'o'
         Shape of marker used to display handle. See `matplotlib.pyplot.plot`.
-    marker_props : dict
+    marker_props : dict, optional
         Additional marker properties. See `matplotlib.lines.Line2D`.
+    useblit : bool, default: True
+        Whether to use blitting for faster drawing (if supported by the
+        backend). See the tutorial :doc:`/tutorials/advanced/blitting`
+        for details.
     """
 
     def __init__(self, ax, x, y, marker='o', marker_props=None, useblit=True):
@@ -2138,7 +2768,6 @@ def __init__(self, ax, x, y, marker='o', marker_props=None, useblit=True):
                  **cbook.normalize_kwargs(marker_props, Line2D._alias_map)}
         self._markers = Line2D(x, y, animated=useblit, **props)
         self.ax.add_line(self._markers)
-        self.artist = self._markers
 
     @property
     def x(self):
@@ -2148,6 +2777,10 @@ def x(self):
     def y(self):
         return self._markers.get_ydata()
 
+    @property
+    def artists(self):
+        return (self._markers, )
+
     def set_data(self, pts, y=None):
         """Set x and y positions of handles."""
         if y is not None:
@@ -2172,272 +2805,459 @@ def closest(self, x, y):
         return min_index, dist[min_index]
 
 
-class RectangleSelector(_SelectorWidget):
-    """
-    Select a rectangular region of an axes.
-
-    For the cursor to remain responsive you must keep a reference to it.
-
-    Examples
-    --------
-    :doc:`/gallery/widgets/rectangle_selector`
-    """
-
-    _shape_klass = Rectangle
-
-    def __init__(self, ax, onselect, drawtype='box',
-                 minspanx=0, minspany=0, useblit=False,
-                 lineprops=None, rectprops=None, spancoords='data',
-                 button=None, maxdist=10, marker_props=None,
-                 interactive=False, state_modifier_keys=None):
-        r"""
-        Parameters
-        ----------
-        ax : `~matplotlib.axes.Axes`
-            The parent axes for the widget.
-
-        onselect : function
-            A callback function that is called after a selection is completed.
-            It must have the signature::
-
-                def onselect(eclick: MouseEvent, erelease: MouseEvent)
-
-            where *eclick* and *erelease* are the mouse click and release
-            `.MouseEvent`\s that start and complete the selection.
-
-        drawtype : {"box", "line", "none"}, default: "box"
-            Whether to draw the full rectangle box, the diagonal line of the
-            rectangle, or nothing at all.
-
-        minspanx : float, default: 0
-            Selections with an x-span less than *minspanx* are ignored.
+_RECTANGLESELECTOR_PARAMETERS_DOCSTRING = \
+    r"""
+    Parameters
+    ----------
+    ax : `~matplotlib.axes.Axes`
+        The parent axes for the widget.
 
-        minspany : float, default: 0
-            Selections with an y-span less than *minspany* are ignored.
+    onselect : function
+        A callback function that is called after a release event and the
+        selection is created, changed or removed.
+        It must have the signature::
 
-        useblit : bool, default: False
-            Whether to use blitting for faster drawing (if supported by the
-            backend).
+            def onselect(eclick: MouseEvent, erelease: MouseEvent)
 
-        lineprops : dict, optional
-            Properties with which the line is drawn, if ``drawtype == "line"``.
-            Default::
+        where *eclick* and *erelease* are the mouse click and release
+        `.MouseEvent`\s that start and complete the selection.
 
-                dict(color="black", linestyle="-", linewidth=2, alpha=0.5)
+    minspanx : float, default: 0
+        Selections with an x-span less than or equal to *minspanx* are removed
+        (when already existing) or cancelled.
 
-        rectprops : dict, optional
-            Properties with which the rectangle is drawn, if ``drawtype ==
-            "box"``.  Default::
+    minspany : float, default: 0
+        Selections with an y-span less than or equal to *minspanx* are removed
+        (when already existing) or cancelled.
 
-                dict(facecolor="red", edgecolor="black", alpha=0.2, fill=True)
+    useblit : bool, default: False
+        Whether to use blitting for faster drawing (if supported by the
+        backend). See the tutorial :doc:`/tutorials/advanced/blitting`
+        for details.
+
+    props : dict, optional
+        Properties with which the __ARTIST_NAME__ is drawn. See
+        `matplotlib.patches.Patch` for valid properties.
+        Default:
+
+        ``dict(facecolor='red', edgecolor='black', alpha=0.2, fill=True)``
+
+    spancoords : {"data", "pixels"}, default: "data"
+        Whether to interpret *minspanx* and *minspany* in data or in pixel
+        coordinates.
+
+    button : `.MouseButton`, list of `.MouseButton`, default: all buttons
+        Button(s) that trigger rectangle selection.
+
+    grab_range : float, default: 10
+        Distance in pixels within which the interactive tool handles can be
+        activated.
+
+    handle_props : dict, optional
+        Properties with which the interactive handles (marker artists) are
+        drawn. See the marker arguments in `matplotlib.lines.Line2D` for valid
+        properties.  Default values are defined in ``mpl.rcParams`` except for
+        the default value of ``markeredgecolor`` which will be the same as the
+        ``edgecolor`` property in *props*.
+
+    interactive : bool, default: False
+        Whether to draw a set of handles that allow interaction with the
+        widget after it is drawn.
+
+    state_modifier_keys : dict, optional
+        Keyboard modifiers which affect the widget's behavior.  Values
+        amend the defaults, which are:
+
+        - "move": Move the existing shape, default: no modifier.
+        - "clear": Clear the current shape, default: "escape".
+        - "square": Make the shape square, default: "shift".
+        - "center": change the shape around its center, default: "ctrl".
+        - "rotate": Rotate the shape around its center between -45° and 45°,
+          default: "r".
+
+        "square" and "center" can be combined. The square shape can be defined
+        in data or display coordinates as determined by the
+        ``use_data_coordinates`` argument specified when creating the selector.
+
+    drag_from_anywhere : bool, default: False
+        If `True`, the widget can be moved by clicking anywhere within
+        its bounds.
+
+    ignore_event_outside : bool, default: False
+        If `True`, the event triggered outside the span selector will be
+        ignored.
+
+    use_data_coordinates : bool, default: False
+        If `True`, the "square" shape of the selector is defined in
+        data coordinates instead of display coordinates.
+    """
 
-        spancoords : {"data", "pixels"}, default: "data"
-            Whether to interpret *minspanx* and *minspany* in data or in pixel
-            coordinates.
 
-        button : `.MouseButton`, list of `.MouseButton`, default: all buttons
-            Button(s) that trigger rectangle selection.
+@_docstring.Substitution(_RECTANGLESELECTOR_PARAMETERS_DOCSTRING.replace(
+    '__ARTIST_NAME__', 'rectangle'))
+class RectangleSelector(_SelectorWidget):
+    """
+    Select a rectangular region of an Axes.
 
-        maxdist : float, default: 10
-            Distance in pixels within which the interactive tool handles can be
-            activated.
+    For the cursor to remain responsive you must keep a reference to it.
 
-        marker_props : dict
-            Properties with which the interactive handles are drawn.  Currently
-            not implemented and ignored.
+    Press and release events triggered at the same coordinates outside the
+    selection will clear the selector, except when
+    ``ignore_event_outside=True``.
 
-        interactive : bool, default: False
-            Whether to draw a set of handles that allow interaction with the
-            widget after it is drawn.
+    %s
 
-        state_modifier_keys : dict, optional
-            Keyboard modifiers which affect the widget's behavior.  Values
-            amend the defaults.
+    Examples
+    --------
+    >>> import matplotlib.pyplot as plt
+    >>> import matplotlib.widgets as mwidgets
+    >>> fig, ax = plt.subplots()
+    >>> ax.plot([1, 2, 3], [10, 50, 100])
+    >>> def onselect(eclick, erelease):
+    ...     print(eclick.xdata, eclick.ydata)
+    ...     print(erelease.xdata, erelease.ydata)
+    >>> props = dict(facecolor='blue', alpha=0.5)
+    >>> rect = mwidgets.RectangleSelector(ax, onselect, interactive=True,
+    ...                                   props=props)
+    >>> fig.show()
+    >>> rect.add_state('square')
 
-            - "move": Move the existing shape, default: no modifier.
-            - "clear": Clear the current shape, default: "escape".
-            - "square": Makes the shape square, default: "shift".
-            - "center": Make the initial point the center of the shape,
-              default: "ctrl".
+    See also: :doc:`/gallery/widgets/rectangle_selector`
+    """
 
-            "square" and "center" can be combined.
-        """
+    @_api.rename_parameter("3.5", "maxdist", "grab_range")
+    @_api.rename_parameter("3.5", "marker_props", "handle_props")
+    @_api.rename_parameter("3.5", "rectprops", "props")
+    @_api.delete_parameter("3.5", "drawtype")
+    @_api.delete_parameter("3.5", "lineprops")
+    def __init__(self, ax, onselect, drawtype='box',
+                 minspanx=0, minspany=0, useblit=False,
+                 lineprops=None, props=None, spancoords='data',
+                 button=None, grab_range=10, handle_props=None,
+                 interactive=False, state_modifier_keys=None,
+                 drag_from_anywhere=False, ignore_event_outside=False,
+                 use_data_coordinates=False):
         super().__init__(ax, onselect, useblit=useblit, button=button,
-                         state_modifier_keys=state_modifier_keys)
+                         state_modifier_keys=state_modifier_keys,
+                         use_data_coordinates=use_data_coordinates)
 
-        self.to_draw = None
-        self.visible = True
-        self.interactive = interactive
+        self._interactive = interactive
+        self.drag_from_anywhere = drag_from_anywhere
+        self.ignore_event_outside = ignore_event_outside
+        self._rotation = 0.0
+        self._aspect_ratio_correction = 1.0
+
+        # State to allow the option of an interactive selector that can't be
+        # interactively drawn. This is used in PolygonSelector as an
+        # interactive bounding box to allow the polygon to be easily resized
+        self._allow_creation = True
 
         if drawtype == 'none':  # draw a line but make it invisible
+            _api.warn_deprecated(
+                "3.5", message="Support for drawtype='none' is deprecated "
+                               "since %(since)s and will be removed "
+                               "%(removal)s."
+                               "Use props=dict(visible=False) instead.")
             drawtype = 'line'
-            self.visible = False
+            self._visible = False
 
         if drawtype == 'box':
-            if rectprops is None:
-                rectprops = dict(facecolor='red', edgecolor='black',
-                                 alpha=0.2, fill=True)
-            rectprops['animated'] = self.useblit
-            self.rectprops = rectprops
-            self.to_draw = self._shape_klass((0, 0), 0, 1, visible=False,
-                                             **self.rectprops)
-            self.ax.add_patch(self.to_draw)
+            if props is None:
+                props = dict(facecolor='red', edgecolor='black',
+                             alpha=0.2, fill=True)
+            props['animated'] = self.useblit
+            self._visible = props.pop('visible', self._visible)
+            self._props = props
+            to_draw = self._init_shape(**self._props)
+            self.ax.add_patch(to_draw)
         if drawtype == 'line':
+            _api.warn_deprecated(
+                "3.5", message="Support for drawtype='line' is deprecated "
+                               "since %(since)s and will be removed "
+                               "%(removal)s.")
             if lineprops is None:
                 lineprops = dict(color='black', linestyle='-',
                                  linewidth=2, alpha=0.5)
             lineprops['animated'] = self.useblit
-            self.lineprops = lineprops
-            self.to_draw = Line2D([0, 0], [0, 0], visible=False,
-                                  **self.lineprops)
-            self.ax.add_line(self.to_draw)
+            self._props = lineprops
+            to_draw = Line2D([0, 0], [0, 0], visible=False, **self._props)
+            self.ax.add_line(to_draw)
+
+        self._selection_artist = to_draw
+        self._set_aspect_ratio_correction()
 
         self.minspanx = minspanx
         self.minspany = minspany
 
         _api.check_in_list(['data', 'pixels'], spancoords=spancoords)
         self.spancoords = spancoords
-        self.drawtype = drawtype
+        self._drawtype = drawtype
 
-        self.maxdist = maxdist
+        self.grab_range = grab_range
 
-        if rectprops is None:
-            props = dict(markeredgecolor='r')
-        else:
-            props = dict(markeredgecolor=rectprops.get('edgecolor', 'r'))
-        props.update(cbook.normalize_kwargs(marker_props, Line2D._alias_map))
-        self._corner_order = ['NW', 'NE', 'SE', 'SW']
-        xc, yc = self.corners
-        self._corner_handles = ToolHandles(self.ax, xc, yc, marker_props=props,
-                                           useblit=self.useblit)
+        if self._interactive:
+            self._handle_props = {
+                'markeredgecolor': (self._props or {}).get(
+                    'edgecolor', 'black'),
+                **cbook.normalize_kwargs(handle_props, Line2D)}
 
-        self._edge_order = ['W', 'N', 'E', 'S']
-        xe, ye = self.edge_centers
-        self._edge_handles = ToolHandles(self.ax, xe, ye, marker='s',
-                                         marker_props=props,
-                                         useblit=self.useblit)
+            self._corner_order = ['SW', 'SE', 'NE', 'NW']
+            xc, yc = self.corners
+            self._corner_handles = ToolHandles(self.ax, xc, yc,
+                                               marker_props=self._handle_props,
+                                               useblit=self.useblit)
 
-        xc, yc = self.center
-        self._center_handle = ToolHandles(self.ax, [xc], [yc], marker='s',
-                                          marker_props=props,
-                                          useblit=self.useblit)
+            self._edge_order = ['W', 'S', 'E', 'N']
+            xe, ye = self.edge_centers
+            self._edge_handles = ToolHandles(self.ax, xe, ye, marker='s',
+                                             marker_props=self._handle_props,
+                                             useblit=self.useblit)
 
-        self.active_handle = None
+            xc, yc = self.center
+            self._center_handle = ToolHandles(self.ax, [xc], [yc], marker='s',
+                                              marker_props=self._handle_props,
+                                              useblit=self.useblit)
 
-        self.artists = [self.to_draw, self._center_handle.artist,
-                        self._corner_handles.artist,
-                        self._edge_handles.artist]
-
-        if not self.interactive:
-            self.artists = [self.to_draw]
+            self._active_handle = None
 
         self._extents_on_press = None
 
+    to_draw = _api.deprecated("3.5")(
+        property(lambda self: self._selection_artist)
+        )
+
+    drawtype = _api.deprecate_privatize_attribute("3.5")
+
+    active_handle = _api.deprecate_privatize_attribute("3.5")
+
+    interactive = _api.deprecate_privatize_attribute("3.5")
+
+    maxdist = _api.deprecated("3.5", name="maxdist", alternative="grab_range")(
+        property(lambda self: self.grab_range,
+                 lambda self, value: setattr(self, "grab_range", value)))
+
+    @property
+    def _handles_artists(self):
+        return (*self._center_handle.artists, *self._corner_handles.artists,
+                *self._edge_handles.artists)
+
+    def _init_shape(self, **props):
+        return Rectangle((0, 0), 0, 1, visible=False,
+                         rotation_point='center', **props)
+
     def _press(self, event):
         """Button press event handler."""
         # make the drawn box/line visible get the click-coordinates,
         # button, ...
-        if self.interactive and self.to_draw.get_visible():
+        if self._interactive and self._selection_artist.get_visible():
             self._set_active_handle(event)
         else:
-            self.active_handle = None
+            self._active_handle = None
 
-        if self.active_handle is None or not self.interactive:
+        if ((self._active_handle is None or not self._interactive) and
+                self._allow_creation):
             # Clear previous rectangle before drawing new rectangle.
             self.update()
 
-        if not self.interactive:
+        if (self._active_handle is None and not self.ignore_event_outside and
+                self._allow_creation):
             x = event.xdata
             y = event.ydata
+            self._visible = False
             self.extents = x, x, y, y
+            self._visible = True
+        else:
+            self.set_visible(True)
 
-        self.set_visible(self.visible)
+        self._extents_on_press = self.extents
+        self._rotation_on_press = self._rotation
+        self._set_aspect_ratio_correction()
+
+        return False
 
     def _release(self, event):
         """Button release event handler."""
-        if not self.interactive:
-            self.to_draw.set_visible(False)
+        if not self._interactive:
+            self._selection_artist.set_visible(False)
+
+        if (self._active_handle is None and self._selection_completed and
+                self.ignore_event_outside):
+            return
 
         # update the eventpress and eventrelease with the resulting extents
-        x1, x2, y1, y2 = self.extents
-        self.eventpress.xdata = x1
-        self.eventpress.ydata = y1
+        x0, x1, y0, y1 = self.extents
+        self._eventpress.xdata = x0
+        self._eventpress.ydata = y0
+        xy0 = self.ax.transData.transform([x0, y0])
+        self._eventpress.x, self._eventpress.y = xy0
+
+        self._eventrelease.xdata = x1
+        self._eventrelease.ydata = y1
         xy1 = self.ax.transData.transform([x1, y1])
-        self.eventpress.x, self.eventpress.y = xy1
-
-        self.eventrelease.xdata = x2
-        self.eventrelease.ydata = y2
-        xy2 = self.ax.transData.transform([x2, y2])
-        self.eventrelease.x, self.eventrelease.y = xy2
+        self._eventrelease.x, self._eventrelease.y = xy1
 
         # calculate dimensions of box or line
         if self.spancoords == 'data':
-            spanx = abs(self.eventpress.xdata - self.eventrelease.xdata)
-            spany = abs(self.eventpress.ydata - self.eventrelease.ydata)
+            spanx = abs(self._eventpress.xdata - self._eventrelease.xdata)
+            spany = abs(self._eventpress.ydata - self._eventrelease.ydata)
         elif self.spancoords == 'pixels':
-            spanx = abs(self.eventpress.x - self.eventrelease.x)
-            spany = abs(self.eventpress.y - self.eventrelease.y)
+            spanx = abs(self._eventpress.x - self._eventrelease.x)
+            spany = abs(self._eventpress.y - self._eventrelease.y)
         else:
             _api.check_in_list(['data', 'pixels'],
                                spancoords=self.spancoords)
         # check if drawn distance (if it exists) is not too small in
         # either x or y-direction
-        if (self.drawtype != 'none'
-                and (self.minspanx is not None and spanx < self.minspanx
-                     or self.minspany is not None and spany < self.minspany)):
-            for artist in self.artists:
-                artist.set_visible(False)
-            self.update()
-            return
+        minspanxy = (spanx <= self.minspanx or spany <= self.minspany)
+        if (self._drawtype != 'none' and minspanxy):
+            if self._selection_completed:
+                # Call onselect, only when the selection is already existing
+                self.onselect(self._eventpress, self._eventrelease)
+            self._clear_without_update()
+        else:
+            self.onselect(self._eventpress, self._eventrelease)
+            self._selection_completed = True
 
-        # call desired function
-        self.onselect(self.eventpress, self.eventrelease)
         self.update()
+        self._active_handle = None
+        self._extents_on_press = None
 
         return False
 
     def _onmove(self, event):
-        """Motion notify event handler."""
-        # resize an existing shape
-        if self.active_handle and self.active_handle != 'C':
-            x1, x2, y1, y2 = self._extents_on_press
-            if self.active_handle in ['E', 'W'] + self._corner_order:
-                x2 = event.xdata
-            if self.active_handle in ['N', 'S'] + self._corner_order:
-                y2 = event.ydata
-
-        # move existing shape
-        elif (('move' in self.state or self.active_handle == 'C')
-              and self._extents_on_press is not None):
-            x1, x2, y1, y2 = self._extents_on_press
-            dx = event.xdata - self.eventpress.xdata
-            dy = event.ydata - self.eventpress.ydata
+        """
+        Motion notify event handler.
+
+        This can do one of four things:
+        - Translate
+        - Rotate
+        - Re-size
+        - Continue the creation of a new shape
+        """
+        eventpress = self._eventpress
+        # The calculations are done for rotation at zero: we apply inverse
+        # transformation to events except when we rotate and move
+        state = self._state
+        rotate = ('rotate' in state and
+                  self._active_handle in self._corner_order)
+        move = self._active_handle == 'C'
+        resize = self._active_handle and not move
+
+        if resize:
+            inv_tr = self._get_rotation_transform().inverted()
+            event.xdata, event.ydata = inv_tr.transform(
+                [event.xdata, event.ydata])
+            eventpress.xdata, eventpress.ydata = inv_tr.transform(
+                [eventpress.xdata, eventpress.ydata]
+                )
+
+        dx = event.xdata - eventpress.xdata
+        dy = event.ydata - eventpress.ydata
+        # refmax is used when moving the corner handle with the square state
+        # and is the maximum between refx and refy
+        refmax = None
+        if self._use_data_coordinates:
+            refx, refy = dx, dy
+        else:
+            # Get dx/dy in display coordinates
+            refx = event.x - eventpress.x
+            refy = event.y - eventpress.y
+
+        x0, x1, y0, y1 = self._extents_on_press
+        # rotate an existing shape
+        if rotate:
+            # calculate angle abc
+            a = np.array([eventpress.xdata, eventpress.ydata])
+            b = np.array(self.center)
+            c = np.array([event.xdata, event.ydata])
+            angle = (np.arctan2(c[1]-b[1], c[0]-b[0]) -
+                     np.arctan2(a[1]-b[1], a[0]-b[0]))
+            self.rotation = np.rad2deg(self._rotation_on_press + angle)
+
+        elif resize:
+            size_on_press = [x1 - x0, y1 - y0]
+            center = [x0 + size_on_press[0] / 2, y0 + size_on_press[1] / 2]
+
+            # Keeping the center fixed
+            if 'center' in state:
+                # hh, hw are half-height and half-width
+                if 'square' in state:
+                    # when using a corner, find which reference to use
+                    if self._active_handle in self._corner_order:
+                        refmax = max(refx, refy, key=abs)
+                    if self._active_handle in ['E', 'W'] or refmax == refx:
+                        hw = event.xdata - center[0]
+                        hh = hw / self._aspect_ratio_correction
+                    else:
+                        hh = event.ydata - center[1]
+                        hw = hh * self._aspect_ratio_correction
+                else:
+                    hw = size_on_press[0] / 2
+                    hh = size_on_press[1] / 2
+                    # cancel changes in perpendicular direction
+                    if self._active_handle in ['E', 'W'] + self._corner_order:
+                        hw = abs(event.xdata - center[0])
+                    if self._active_handle in ['N', 'S'] + self._corner_order:
+                        hh = abs(event.ydata - center[1])
+
+                x0, x1, y0, y1 = (center[0] - hw, center[0] + hw,
+                                  center[1] - hh, center[1] + hh)
+
+            else:
+                # change sign of relative changes to simplify calculation
+                # Switch variables so that x1 and/or y1 are updated on move
+                if 'W' in self._active_handle:
+                    x0 = x1
+                if 'S' in self._active_handle:
+                    y0 = y1
+                if self._active_handle in ['E', 'W'] + self._corner_order:
+                    x1 = event.xdata
+                if self._active_handle in ['N', 'S'] + self._corner_order:
+                    y1 = event.ydata
+                if 'square' in state:
+                    # when using a corner, find which reference to use
+                    if self._active_handle in self._corner_order:
+                        refmax = max(refx, refy, key=abs)
+                    if self._active_handle in ['E', 'W'] or refmax == refx:
+                        sign = np.sign(event.ydata - y0)
+                        y1 = y0 + sign * abs(x1 - x0) / \
+                            self._aspect_ratio_correction
+                    else:
+                        sign = np.sign(event.xdata - x0)
+                        x1 = x0 + sign * abs(y1 - y0) * \
+                            self._aspect_ratio_correction
+
+        elif move:
+            x0, x1, y0, y1 = self._extents_on_press
+            dx = event.xdata - eventpress.xdata
+            dy = event.ydata - eventpress.ydata
+            x0 += dx
             x1 += dx
-            x2 += dx
+            y0 += dy
             y1 += dy
-            y2 += dy
 
-        # new shape
         else:
-            center = [self.eventpress.xdata, self.eventpress.ydata]
-            center_pix = [self.eventpress.x, self.eventpress.y]
+            # Create a new shape
+            self._rotation = 0
+            # Don't create a new rectangle if there is already one when
+            # ignore_event_outside=True
+            if ((self.ignore_event_outside and self._selection_completed) or
+                    not self._allow_creation):
+                return
+            center = [eventpress.xdata, eventpress.ydata]
             dx = (event.xdata - center[0]) / 2.
             dy = (event.ydata - center[1]) / 2.
 
             # square shape
-            if 'square' in self.state:
-                dx_pix = abs(event.x - center_pix[0])
-                dy_pix = abs(event.y - center_pix[1])
-                if not dx_pix:
-                    return
-                maxd = max(abs(dx_pix), abs(dy_pix))
-                if abs(dx_pix) < maxd:
-                    dx *= maxd / (abs(dx_pix) + 1e-6)
-                if abs(dy_pix) < maxd:
-                    dy *= maxd / (abs(dy_pix) + 1e-6)
+            if 'square' in state:
+                refmax = max(refx, refy, key=abs)
+                if refmax == refx:
+                    dy = np.sign(dy) * abs(dx) / self._aspect_ratio_correction
+                else:
+                    dx = np.sign(dx) * abs(dy) * self._aspect_ratio_correction
 
             # from center
-            if 'center' in self.state:
+            if 'center' in state:
                 dx *= 2
                 dy *= 2
 
@@ -2446,52 +3266,83 @@ def _onmove(self, event):
                 center[0] += dx
                 center[1] += dy
 
-            x1, x2, y1, y2 = (center[0] - dx, center[0] + dx,
+            x0, x1, y0, y1 = (center[0] - dx, center[0] + dx,
                               center[1] - dy, center[1] + dy)
 
-        self.extents = x1, x2, y1, y2
+        self.extents = x0, x1, y0, y1
 
     @property
     def _rect_bbox(self):
-        if self.drawtype == 'box':
-            x0 = self.to_draw.get_x()
-            y0 = self.to_draw.get_y()
-            width = self.to_draw.get_width()
-            height = self.to_draw.get_height()
-            return x0, y0, width, height
+        if self._drawtype == 'box':
+            return self._selection_artist.get_bbox().bounds
         else:
-            x, y = self.to_draw.get_data()
+            x, y = self._selection_artist.get_data()
             x0, x1 = min(x), max(x)
             y0, y1 = min(y), max(y)
             return x0, y0, x1 - x0, y1 - y0
 
+    def _set_aspect_ratio_correction(self):
+        aspect_ratio = self.ax._get_aspect_ratio()
+        if not hasattr(self._selection_artist, '_aspect_ratio_correction'):
+            # Aspect ratio correction is not supported with deprecated
+            # drawtype='line'. Remove this block in matplotlib 3.7
+            self._aspect_ratio_correction = 1
+            return
+
+        self._selection_artist._aspect_ratio_correction = aspect_ratio
+        if self._use_data_coordinates:
+            self._aspect_ratio_correction = 1
+        else:
+            self._aspect_ratio_correction = aspect_ratio
+
+    def _get_rotation_transform(self):
+        aspect_ratio = self.ax._get_aspect_ratio()
+        return Affine2D().translate(-self.center[0], -self.center[1]) \
+                .scale(1, aspect_ratio) \
+                .rotate(self._rotation) \
+                .scale(1, 1 / aspect_ratio) \
+                .translate(*self.center)
+
     @property
     def corners(self):
-        """Corners of rectangle from lower left, moving clockwise."""
+        """
+        Corners of rectangle in data coordinates from lower left,
+        moving clockwise.
+        """
         x0, y0, width, height = self._rect_bbox
         xc = x0, x0 + width, x0 + width, x0
         yc = y0, y0, y0 + height, y0 + height
-        return xc, yc
+        transform = self._get_rotation_transform()
+        coords = transform.transform(np.array([xc, yc]).T).T
+        return coords[0], coords[1]
 
     @property
     def edge_centers(self):
-        """Midpoint of rectangle edges from left, moving anti-clockwise."""
+        """
+        Midpoint of rectangle edges in data coordinates from left,
+        moving anti-clockwise.
+        """
         x0, y0, width, height = self._rect_bbox
         w = width / 2.
         h = height / 2.
         xe = x0, x0 + w, x0 + width, x0 + w
         ye = y0 + h, y0, y0 + h, y0 + height
-        return xe, ye
+        transform = self._get_rotation_transform()
+        coords = transform.transform(np.array([xe, ye]).T).T
+        return coords[0], coords[1]
 
     @property
     def center(self):
-        """Center of rectangle."""
+        """Center of rectangle in data coordinates."""
         x0, y0, width, height = self._rect_bbox
         return x0 + width / 2., y0 + height / 2.
 
     @property
     def extents(self):
-        """Return (xmin, xmax, ymin, ymax)."""
+        """
+        Return (xmin, xmax, ymin, ymax) in data coordinates as defined by the
+        bounding box before rotation.
+        """
         x0, y0, width, height = self._rect_bbox
         xmin, xmax = sorted([x0, x0 + width])
         ymin, ymax = sorted([y0, y0 + height])
@@ -2500,15 +3351,35 @@ def extents(self):
     @extents.setter
     def extents(self, extents):
         # Update displayed shape
-        self.draw_shape(extents)
-        # Update displayed handles
-        self._corner_handles.set_data(*self.corners)
-        self._edge_handles.set_data(*self.edge_centers)
-        self._center_handle.set_data(*self.center)
-        self.set_visible(self.visible)
+        self._draw_shape(extents)
+        if self._interactive:
+            # Update displayed handles
+            self._corner_handles.set_data(*self.corners)
+            self._edge_handles.set_data(*self.edge_centers)
+            self._center_handle.set_data(*self.center)
+        self.set_visible(self._visible)
         self.update()
 
-    def draw_shape(self, extents):
+    @property
+    def rotation(self):
+        """
+        Rotation in degree in interval [-45°, 45°]. The rotation is limited in
+        range to keep the implementation simple.
+        """
+        return np.rad2deg(self._rotation)
+
+    @rotation.setter
+    def rotation(self, value):
+        # Restrict to a limited range of rotation [-45°, 45°] to avoid changing
+        # order of handles
+        if -45 <= value and value <= 45:
+            self._rotation = np.deg2rad(value)
+            # call extents setter to draw shape and update handles positions
+            self.extents = self.extents
+
+    draw_shape = _api.deprecate_privatize_attribute('3.5')
+
+    def _draw_shape(self, extents):
         x0, x1, y0, y1 = extents
         xmin, xmax = sorted([x0, x1])
         ymin, ymax = sorted([y0, y1])
@@ -2520,14 +3391,15 @@ def draw_shape(self, extents):
         xmax = min(xmax, xlim[1])
         ymax = min(ymax, ylim[1])
 
-        if self.drawtype == 'box':
-            self.to_draw.set_x(xmin)
-            self.to_draw.set_y(ymin)
-            self.to_draw.set_width(xmax - xmin)
-            self.to_draw.set_height(ymax - ymin)
+        if self._drawtype == 'box':
+            self._selection_artist.set_x(xmin)
+            self._selection_artist.set_y(ymin)
+            self._selection_artist.set_width(xmax - xmin)
+            self._selection_artist.set_height(ymax - ymin)
+            self._selection_artist.set_angle(self.rotation)
 
-        elif self.drawtype == 'line':
-            self.to_draw.set_data([xmin, xmax], [ymin, ymax])
+        elif self._drawtype == 'line':
+            self._selection_artist.set_data([xmin, xmax], [ymin, ymax])
 
     def _set_active_handle(self, event):
         """Set active handle based on the location of the mouse event."""
@@ -2536,112 +3408,99 @@ def _set_active_handle(self, event):
         e_idx, e_dist = self._edge_handles.closest(event.x, event.y)
         m_idx, m_dist = self._center_handle.closest(event.x, event.y)
 
-        if 'move' in self.state:
-            self.active_handle = 'C'
-            self._extents_on_press = self.extents
-
+        if 'move' in self._state:
+            self._active_handle = 'C'
         # Set active handle as closest handle, if mouse click is close enough.
-        elif m_dist < self.maxdist * 2:
-            self.active_handle = 'C'
-        elif c_dist > self.maxdist and e_dist > self.maxdist:
-            self.active_handle = None
-            return
+        elif m_dist < self.grab_range * 2:
+            # Prioritise center handle over other handles
+            self._active_handle = 'C'
+        elif c_dist > self.grab_range and e_dist > self.grab_range:
+            # Not close to any handles
+            if self.drag_from_anywhere and self._contains(event):
+                # Check if we've clicked inside the region
+                self._active_handle = 'C'
+            else:
+                self._active_handle = None
+                return
         elif c_dist < e_dist:
-            self.active_handle = self._corner_order[c_idx]
+            # Closest to a corner handle
+            self._active_handle = self._corner_order[c_idx]
         else:
-            self.active_handle = self._edge_order[e_idx]
+            # Closest to an edge handle
+            self._active_handle = self._edge_order[e_idx]
 
-        # Save coordinates of rectangle at the start of handle movement.
-        x1, x2, y1, y2 = self.extents
-        # Switch variables so that only x2 and/or y2 are updated on move.
-        if self.active_handle in ['W', 'SW', 'NW']:
-            x1, x2 = x2, event.xdata
-        if self.active_handle in ['N', 'NW', 'NE']:
-            y1, y2 = y2, event.ydata
-        self._extents_on_press = x1, x2, y1, y2
+    def _contains(self, event):
+        """Return True if event is within the patch."""
+        return self._selection_artist.contains(event, radius=0)[0]
 
     @property
     def geometry(self):
         """
         Return an array of shape (2, 5) containing the
         x (``RectangleSelector.geometry[1, :]``) and
-        y (``RectangleSelector.geometry[0, :]``) coordinates
-        of the four corners of the rectangle starting and ending
-        in the top left corner.
+        y (``RectangleSelector.geometry[0, :]``) data coordinates of the four
+        corners of the rectangle starting and ending in the top left corner.
         """
-        if hasattr(self.to_draw, 'get_verts'):
+        if hasattr(self._selection_artist, 'get_verts'):
             xfm = self.ax.transData.inverted()
-            y, x = xfm.transform(self.to_draw.get_verts()).T
+            y, x = xfm.transform(self._selection_artist.get_verts()).T
             return np.array([x, y])
         else:
-            return np.array(self.to_draw.get_data())
+            return np.array(self._selection_artist.get_data())
 
 
+@_docstring.Substitution(_RECTANGLESELECTOR_PARAMETERS_DOCSTRING.replace(
+    '__ARTIST_NAME__', 'ellipse'))
 class EllipseSelector(RectangleSelector):
     """
-    Select an elliptical region of an axes.
+    Select an elliptical region of an Axes.
 
     For the cursor to remain responsive you must keep a reference to it.
 
-    Example usage::
+    Press and release events triggered at the same coordinates outside the
+    selection will clear the selector, except when
+    ``ignore_event_outside=True``.
 
-        import numpy as np
-        import matplotlib.pyplot as plt
-        from matplotlib.widgets import EllipseSelector
-
-        def onselect(eclick, erelease):
-            "eclick and erelease are matplotlib events at press and release."
-            print('startposition: (%f, %f)' % (eclick.xdata, eclick.ydata))
-            print('endposition  : (%f, %f)' % (erelease.xdata, erelease.ydata))
-            print('used button  : ', eclick.button)
-
-        def toggle_selector(event):
-            print(' Key pressed.')
-            if event.key in ['Q', 'q'] and toggle_selector.ES.active:
-                print('EllipseSelector deactivated.')
-                toggle_selector.RS.set_active(False)
-            if event.key in ['A', 'a'] and not toggle_selector.ES.active:
-                print('EllipseSelector activated.')
-                toggle_selector.ES.set_active(True)
-
-        x = np.arange(100.) / 99
-        y = np.sin(x)
-        fig, ax = plt.subplots()
-        ax.plot(x, y)
+    %s
 
-        toggle_selector.ES = EllipseSelector(ax, onselect, drawtype='line')
-        fig.canvas.mpl_connect('key_press_event', toggle_selector)
-        plt.show()
+    Examples
+    --------
+    :doc:`/gallery/widgets/rectangle_selector`
     """
-    _shape_klass = Ellipse
 
-    def draw_shape(self, extents):
-        x1, x2, y1, y2 = extents
-        xmin, xmax = sorted([x1, x2])
-        ymin, ymax = sorted([y1, y2])
-        center = [x1 + (x2 - x1) / 2., y1 + (y2 - y1) / 2.]
+    draw_shape = _api.deprecate_privatize_attribute('3.5')
+
+    def _init_shape(self, **props):
+        return Ellipse((0, 0), 0, 1, visible=False, **props)
+
+    def _draw_shape(self, extents):
+        x0, x1, y0, y1 = extents
+        xmin, xmax = sorted([x0, x1])
+        ymin, ymax = sorted([y0, y1])
+        center = [x0 + (x1 - x0) / 2., y0 + (y1 - y0) / 2.]
         a = (xmax - xmin) / 2.
         b = (ymax - ymin) / 2.
 
-        if self.drawtype == 'box':
-            self.to_draw.center = center
-            self.to_draw.width = 2 * a
-            self.to_draw.height = 2 * b
+        if self._drawtype == 'box':
+            self._selection_artist.center = center
+            self._selection_artist.width = 2 * a
+            self._selection_artist.height = 2 * b
+            self._selection_artist.angle = self.rotation
         else:
             rad = np.deg2rad(np.arange(31) * 12)
             x = a * np.cos(rad) + center[0]
             y = b * np.sin(rad) + center[1]
-            self.to_draw.set_data(x, y)
+            self._selection_artist.set_data(x, y)
 
     @property
     def _rect_bbox(self):
-        if self.drawtype == 'box':
-            x, y = self.to_draw.center
-            width = self.to_draw.width
-            height = self.to_draw.height
+        if self._drawtype == 'box':
+            x, y = self._selection_artist.center
+            width = self._selection_artist.width
+            height = self._selection_artist.height
             return x - width / 2., y - height / 2., width, height
         else:
-            x, y = self.to_draw.get_data()
+            x, y = self._selection_artist.get_data()
             x0, x1 = min(x), max(x)
             y0, y1 = min(y), max(y)
             return x0, y0, x1 - x0, y1 - y0
@@ -2658,7 +3517,7 @@ class LassoSelector(_SelectorWidget):
 
     In contrast to `Lasso`, `LassoSelector` is written with an interface
     similar to `RectangleSelector` and `SpanSelector`, and will continue to
-    interact with the axes until disconnected.
+    interact with the Axes until disconnected.
 
     Example usage::
 
@@ -2672,34 +3531,44 @@ def onselect(verts):
     Parameters
     ----------
     ax : `~matplotlib.axes.Axes`
-        The parent axes for the widget.
+        The parent Axes for the widget.
     onselect : function
         Whenever the lasso is released, the *onselect* function is called and
         passed the vertices of the selected path.
+    useblit : bool, default: True
+        Whether to use blitting for faster drawing (if supported by the
+        backend). See the tutorial :doc:`/tutorials/advanced/blitting`
+        for details.
+    props : dict, optional
+        Properties with which the line is drawn, see `matplotlib.lines.Line2D`
+        for valid properties. Default values are defined in ``mpl.rcParams``.
     button : `.MouseButton` or list of `.MouseButton`, optional
         The mouse buttons used for rectangle selection.  Default is ``None``,
         which corresponds to all buttons.
     """
 
-    def __init__(self, ax, onselect=None, useblit=True, lineprops=None,
+    @_api.rename_parameter("3.5", "lineprops", "props")
+    def __init__(self, ax, onselect=None, useblit=True, props=None,
                  button=None):
         super().__init__(ax, onselect, useblit=useblit, button=button)
         self.verts = None
-        if lineprops is None:
-            lineprops = dict()
+        if props is None:
+            props = dict()
         # self.useblit may be != useblit, if the canvas doesn't support blit.
-        lineprops.update(animated=self.useblit, visible=False)
-        self.line = Line2D([], [], **lineprops)
-        self.ax.add_line(self.line)
-        self.artists = [self.line]
+        props.update(animated=self.useblit, visible=False)
+        line = Line2D([], [], **props)
+        self.ax.add_line(line)
+        self._selection_artist = line
 
+    @_api.deprecated("3.5", alternative="press")
     def onpress(self, event):
         self.press(event)
 
     def _press(self, event):
         self.verts = [self._get_data(event)]
-        self.line.set_visible(True)
+        self._selection_artist.set_visible(True)
 
+    @_api.deprecated("3.5", alternative="release")
     def onrelease(self, event):
         self.release(event)
 
@@ -2707,59 +3576,103 @@ def _release(self, event):
         if self.verts is not None:
             self.verts.append(self._get_data(event))
             self.onselect(self.verts)
-        self.line.set_data([[], []])
-        self.line.set_visible(False)
+        self._selection_artist.set_data([[], []])
+        self._selection_artist.set_visible(False)
         self.verts = None
 
     def _onmove(self, event):
         if self.verts is None:
             return
         self.verts.append(self._get_data(event))
-
-        self.line.set_data(list(zip(*self.verts)))
+        self._selection_artist.set_data(list(zip(*self.verts)))
 
         self.update()
 
 
 class PolygonSelector(_SelectorWidget):
     """
-    Select a polygon region of an axes.
+    Select a polygon region of an Axes.
 
     Place vertices with each mouse click, and make the selection by completing
-    the polygon (clicking on the first vertex). Hold the *ctrl* key and click
-    and drag a vertex to reposition it (the *ctrl* key is not necessary if the
-    polygon has already been completed). Hold the *shift* key and click and
-    drag anywhere in the axes to move all vertices. Press the *esc* key to
-    start a new polygon.
+    the polygon (clicking on the first vertex). Once drawn individual vertices
+    can be moved by clicking and dragging with the left mouse button, or
+    removed by clicking the right mouse button.
+
+    In addition, the following modifier keys can be used:
+
+    - Hold *ctrl* and click and drag a vertex to reposition it before the
+      polygon has been completed.
+    - Hold the *shift* key and click and drag anywhere in the Axes to move
+      all vertices.
+    - Press the *esc* key to start a new polygon.
 
     For the selector to remain responsive you must keep a reference to it.
 
     Parameters
     ----------
     ax : `~matplotlib.axes.Axes`
-        The parent axes for the widget.
+        The parent Axes for the widget.
+
     onselect : function
         When a polygon is completed or modified after completion,
         the *onselect* function is called and passed a list of the vertices as
         ``(xdata, ydata)`` tuples.
+
     useblit : bool, default: False
-    lineprops : dict, default: \
-``dict(color='k', linestyle='-', linewidth=2, alpha=0.5)``.
-        Artist properties for the line representing the edges of the polygon.
-    markerprops : dict, default: \
-``dict(marker='o', markersize=7, mec='k', mfc='k', alpha=0.5)``.
+        Whether to use blitting for faster drawing (if supported by the
+        backend). See the tutorial :doc:`/tutorials/advanced/blitting`
+        for details.
+
+    props : dict, optional
+        Properties with which the line is drawn, see `matplotlib.lines.Line2D`
+        for valid properties.
+        Default:
+
+            ``dict(color='k', linestyle='-', linewidth=2, alpha=0.5)``
+
+    handle_props : dict, optional
         Artist properties for the markers drawn at the vertices of the polygon.
-    vertex_select_radius : float, default: 15px
+        See the marker arguments in `matplotlib.lines.Line2D` for valid
+        properties.  Default values are defined in ``mpl.rcParams`` except for
+        the default value of ``markeredgecolor`` which will be the same as the
+        ``color`` property in *props*.
+
+    grab_range : float, default: 10
         A vertex is selected (to complete the polygon or to move a vertex) if
-        the mouse click is within *vertex_select_radius* pixels of the vertex.
+        the mouse click is within *grab_range* pixels of the vertex.
+
+    draw_bounding_box : bool, optional
+        If `True`, a bounding box will be drawn around the polygon selector
+        once it is complete. This box can be used to move and resize the
+        selector.
+
+    box_handle_props : dict, optional
+        Properties to set for the box handles. See the documentation for the
+        *handle_props* argument to `RectangleSelector` for more info.
+
+    box_props : dict, optional
+        Properties to set for the box. See the documentation for the *props*
+        argument to `RectangleSelector` for more info.
 
     Examples
     --------
+    :doc:`/gallery/widgets/polygon_selector_simple`
     :doc:`/gallery/widgets/polygon_selector_demo`
+
+    Notes
+    -----
+    If only one point remains after removing points, the selector reverts to an
+    incomplete state and you can start drawing a new polygon from the existing
+    point.
     """
 
+    @_api.rename_parameter("3.5", "lineprops", "props")
+    @_api.rename_parameter("3.5", "markerprops", "handle_props")
+    @_api.rename_parameter("3.5", "vertex_select_radius", "grab_range")
     def __init__(self, ax, onselect, useblit=False,
-                 lineprops=None, markerprops=None, vertex_select_radius=15):
+                 props=None, handle_props=None, grab_range=10, *,
+                 draw_bounding_box=False, box_handle_props=None,
+                 box_props=None):
         # The state modifiers 'move', 'square', and 'center' are expected by
         # _SelectorWidget but are not supported by PolygonSelector
         # Note: could not use the existing 'move' state modifier in-place of
@@ -2768,64 +3681,169 @@ def __init__(self, ax, onselect, useblit=False,
         state_modifier_keys = dict(clear='escape', move_vertex='control',
                                    move_all='shift', move='not-applicable',
                                    square='not-applicable',
-                                   center='not-applicable')
+                                   center='not-applicable',
+                                   rotate='not-applicable')
         super().__init__(ax, onselect, useblit=useblit,
                          state_modifier_keys=state_modifier_keys)
 
-        self._xs, self._ys = [0], [0]
-        self._polygon_completed = False
+        self._xys = [(0, 0)]
 
-        if lineprops is None:
-            lineprops = dict(color='k', linestyle='-', linewidth=2, alpha=0.5)
-        lineprops['animated'] = self.useblit
-        self.line = Line2D(self._xs, self._ys, **lineprops)
-        self.ax.add_line(self.line)
+        if props is None:
+            props = dict(color='k', linestyle='-', linewidth=2, alpha=0.5)
+        props['animated'] = self.useblit
+        self._props = props
+        self._selection_artist = line = Line2D([], [], **self._props)
+        self.ax.add_line(line)
 
-        if markerprops is None:
-            markerprops = dict(markeredgecolor='k',
-                               markerfacecolor=lineprops.get('color', 'k'))
-        self._polygon_handles = ToolHandles(self.ax, self._xs, self._ys,
+        if handle_props is None:
+            handle_props = dict(markeredgecolor='k',
+                                markerfacecolor=self._props.get('color', 'k'))
+        self._handle_props = handle_props
+        self._polygon_handles = ToolHandles(self.ax, [], [],
                                             useblit=self.useblit,
-                                            marker_props=markerprops)
+                                            marker_props=self._handle_props)
 
         self._active_handle_idx = -1
-        self.vertex_select_radius = vertex_select_radius
+        self.grab_range = grab_range
 
-        self.artists = [self.line, self._polygon_handles.artist]
         self.set_visible(True)
+        self._draw_box = draw_bounding_box
+        self._box = None
+
+        if box_handle_props is None:
+            box_handle_props = {}
+        self._box_handle_props = self._handle_props.update(box_handle_props)
+        self._box_props = box_props
+
+    def _get_bbox(self):
+        return self._selection_artist.get_bbox()
+
+    def _add_box(self):
+        self._box = RectangleSelector(self.ax,
+                                      onselect=lambda *args, **kwargs: None,
+                                      useblit=self.useblit,
+                                      grab_range=self.grab_range,
+                                      handle_props=self._box_handle_props,
+                                      props=self._box_props,
+                                      interactive=True)
+        self._box._state_modifier_keys.pop('rotate')
+        self._box.connect_event('motion_notify_event', self._scale_polygon)
+        self._update_box()
+        # Set state that prevents the RectangleSelector from being created
+        # by the user
+        self._box._allow_creation = False
+        self._box._selection_completed = True
+        self._draw_polygon()
+
+    def _remove_box(self):
+        if self._box is not None:
+            self._box.set_visible(False)
+            self._box = None
+
+    def _update_box(self):
+        # Update selection box extents to the extents of the polygon
+        if self._box is not None:
+            bbox = self._get_bbox()
+            self._box.extents = [bbox.x0, bbox.x1, bbox.y0, bbox.y1]
+            # Save a copy
+            self._old_box_extents = self._box.extents
+
+    def _scale_polygon(self, event):
+        """
+        Scale the polygon selector points when the bounding box is moved or
+        scaled.
+
+        This is set as a callback on the bounding box RectangleSelector.
+        """
+        if not self._selection_completed:
+            return
+
+        if self._old_box_extents == self._box.extents:
+            return
+
+        # Create transform from old box to new box
+        x1, y1, w1, h1 = self._box._rect_bbox
+        old_bbox = self._get_bbox()
+        t = (transforms.Affine2D()
+             .translate(-old_bbox.x0, -old_bbox.y0)
+             .scale(1 / old_bbox.width, 1 / old_bbox.height)
+             .scale(w1, h1)
+             .translate(x1, y1))
+
+        # Update polygon verts.  Must be a list of tuples for consistency.
+        new_verts = [(x, y) for x, y in t.transform(np.array(self.verts))]
+        self._xys = [*new_verts, new_verts[0]]
+        self._draw_polygon()
+        self._old_box_extents = self._box.extents
+
+    line = _api.deprecated("3.5")(
+        property(lambda self: self._selection_artist)
+        )
+
+    vertex_select_radius = _api.deprecated("3.5", name="vertex_select_radius",
+                                           alternative="grab_range")(
+        property(lambda self: self.grab_range,
+                 lambda self, value: setattr(self, "grab_range", value))
+        )
+
+    @property
+    def _handles_artists(self):
+        return self._polygon_handles.artists
+
+    def _remove_vertex(self, i):
+        """Remove vertex with index i."""
+        if (len(self._xys) > 2 and
+                self._selection_completed and
+                i in (0, len(self._xys) - 1)):
+            # If selecting the first or final vertex, remove both first and
+            # last vertex as they are the same for a closed polygon
+            self._xys.pop(0)
+            self._xys.pop(-1)
+            # Close the polygon again by appending the new first vertex to the
+            # end
+            self._xys.append(self._xys[0])
+        else:
+            self._xys.pop(i)
+        if len(self._xys) <= 2:
+            # If only one point left, return to incomplete state to let user
+            # start drawing again
+            self._selection_completed = False
+            self._remove_box()
 
     def _press(self, event):
         """Button press event handler."""
         # Check for selection of a tool handle.
-        if ((self._polygon_completed or 'move_vertex' in self.state)
-                and len(self._xs) > 0):
+        if ((self._selection_completed or 'move_vertex' in self._state)
+                and len(self._xys) > 0):
             h_idx, h_dist = self._polygon_handles.closest(event.x, event.y)
-            if h_dist < self.vertex_select_radius:
+            if h_dist < self.grab_range:
                 self._active_handle_idx = h_idx
         # Save the vertex positions at the time of the press event (needed to
         # support the 'move_all' state modifier).
-        self._xs_at_press, self._ys_at_press = self._xs.copy(), self._ys.copy()
+        self._xys_at_press = self._xys.copy()
 
     def _release(self, event):
         """Button release event handler."""
         # Release active tool handle.
         if self._active_handle_idx >= 0:
+            if event.button == 3:
+                self._remove_vertex(self._active_handle_idx)
+                self._draw_polygon()
             self._active_handle_idx = -1
 
         # Complete the polygon.
-        elif (len(self._xs) > 3
-              and self._xs[-1] == self._xs[0]
-              and self._ys[-1] == self._ys[0]):
-            self._polygon_completed = True
+        elif len(self._xys) > 3 and self._xys[-1] == self._xys[0]:
+            self._selection_completed = True
+            if self._draw_box and self._box is None:
+                self._add_box()
 
         # Place new vertex.
-        elif (not self._polygon_completed
-              and 'move_all' not in self.state
-              and 'move_vertex' not in self.state):
-            self._xs.insert(-1, event.xdata)
-            self._ys.insert(-1, event.ydata)
+        elif (not self._selection_completed
+              and 'move_all' not in self._state
+              and 'move_vertex' not in self._state):
+            self._xys.insert(-1, (event.xdata, event.ydata))
 
-        if self._polygon_completed:
+        if self._selection_completed:
             self.onselect(self.verts)
 
     def onmove(self, event):
@@ -2833,7 +3851,7 @@ def onmove(self, event):
         # Method overrides _SelectorWidget.onmove because the polygon selector
         # needs to process the move callback even if there is no button press.
         # _SelectorWidget.onmove include logic to ignore move event if
-        # eventpress is None.
+        # _eventpress is None.
         if not self.ignore(event):
             event = self._clean_event(event)
             self._onmove(event)
@@ -2845,36 +3863,36 @@ def _onmove(self, event):
         # Move the active vertex (ToolHandle).
         if self._active_handle_idx >= 0:
             idx = self._active_handle_idx
-            self._xs[idx], self._ys[idx] = event.xdata, event.ydata
+            self._xys[idx] = event.xdata, event.ydata
             # Also update the end of the polygon line if the first vertex is
             # the active handle and the polygon is completed.
-            if idx == 0 and self._polygon_completed:
-                self._xs[-1], self._ys[-1] = event.xdata, event.ydata
+            if idx == 0 and self._selection_completed:
+                self._xys[-1] = event.xdata, event.ydata
 
         # Move all vertices.
-        elif 'move_all' in self.state and self.eventpress:
-            dx = event.xdata - self.eventpress.xdata
-            dy = event.ydata - self.eventpress.ydata
-            for k in range(len(self._xs)):
-                self._xs[k] = self._xs_at_press[k] + dx
-                self._ys[k] = self._ys_at_press[k] + dy
+        elif 'move_all' in self._state and self._eventpress:
+            dx = event.xdata - self._eventpress.xdata
+            dy = event.ydata - self._eventpress.ydata
+            for k in range(len(self._xys)):
+                x_at_press, y_at_press = self._xys_at_press[k]
+                self._xys[k] = x_at_press + dx, y_at_press + dy
 
         # Do nothing if completed or waiting for a move.
-        elif (self._polygon_completed
-              or 'move_vertex' in self.state or 'move_all' in self.state):
+        elif (self._selection_completed
+              or 'move_vertex' in self._state or 'move_all' in self._state):
             return
 
         # Position pending vertex.
         else:
             # Calculate distance to the start vertex.
-            x0, y0 = self.line.get_transform().transform((self._xs[0],
-                                                          self._ys[0]))
+            x0, y0 = \
+                self._selection_artist.get_transform().transform(self._xys[0])
             v0_dist = np.hypot(x0 - event.x, y0 - event.y)
             # Lock on to the start vertex if near it and ready to complete.
-            if len(self._xs) > 3 and v0_dist < self.vertex_select_radius:
-                self._xs[-1], self._ys[-1] = self._xs[0], self._ys[0]
+            if len(self._xys) > 3 and v0_dist < self.grab_range:
+                self._xys[-1] = self._xys[0]
             else:
-                self._xs[-1], self._ys[-1] = event.xdata, event.ydata
+                self._xys[-1] = event.xdata, event.ydata
 
         self._draw_polygon()
 
@@ -2882,48 +3900,65 @@ def _on_key_press(self, event):
         """Key press event handler."""
         # Remove the pending vertex if entering the 'move_vertex' or
         # 'move_all' mode
-        if (not self._polygon_completed
-                and ('move_vertex' in self.state or 'move_all' in self.state)):
-            self._xs, self._ys = self._xs[:-1], self._ys[:-1]
+        if (not self._selection_completed
+                and ('move_vertex' in self._state or
+                     'move_all' in self._state)):
+            self._xys.pop()
             self._draw_polygon()
 
     def _on_key_release(self, event):
         """Key release event handler."""
         # Add back the pending vertex if leaving the 'move_vertex' or
         # 'move_all' mode (by checking the released key)
-        if (not self._polygon_completed
+        if (not self._selection_completed
                 and
-                (event.key == self.state_modifier_keys.get('move_vertex')
-                 or event.key == self.state_modifier_keys.get('move_all'))):
-            self._xs.append(event.xdata)
-            self._ys.append(event.ydata)
+                (event.key == self._state_modifier_keys.get('move_vertex')
+                 or event.key == self._state_modifier_keys.get('move_all'))):
+            self._xys.append((event.xdata, event.ydata))
             self._draw_polygon()
         # Reset the polygon if the released key is the 'clear' key.
-        elif event.key == self.state_modifier_keys.get('clear'):
+        elif event.key == self._state_modifier_keys.get('clear'):
             event = self._clean_event(event)
-            self._xs, self._ys = [event.xdata], [event.ydata]
-            self._polygon_completed = False
+            self._xys = [(event.xdata, event.ydata)]
+            self._selection_completed = False
+            self._remove_box()
             self.set_visible(True)
 
     def _draw_polygon(self):
         """Redraw the polygon based on the new vertex positions."""
-        self.line.set_data(self._xs, self._ys)
+        xs, ys = zip(*self._xys) if self._xys else ([], [])
+        self._selection_artist.set_data(xs, ys)
+        self._update_box()
         # Only show one tool handle at the start and end vertex of the polygon
         # if the polygon is completed or the user is locked on to the start
         # vertex.
-        if (self._polygon_completed
-                or (len(self._xs) > 3
-                    and self._xs[-1] == self._xs[0]
-                    and self._ys[-1] == self._ys[0])):
-            self._polygon_handles.set_data(self._xs[:-1], self._ys[:-1])
+        if (self._selection_completed
+                or (len(self._xys) > 3
+                    and self._xys[-1] == self._xys[0])):
+            self._polygon_handles.set_data(xs[:-1], ys[:-1])
         else:
-            self._polygon_handles.set_data(self._xs, self._ys)
+            self._polygon_handles.set_data(xs, ys)
         self.update()
 
     @property
     def verts(self):
         """The polygon vertices, as a list of ``(x, y)`` pairs."""
-        return list(zip(self._xs[:-1], self._ys[:-1]))
+        return self._xys[:-1]
+
+    @verts.setter
+    def verts(self, xys):
+        """
+        Set the polygon vertices.
+
+        This will remove any preexisting vertices, creating a complete polygon
+        with the new vertices.
+        """
+        self._xys = [*xys, xys[0]]
+        self._selection_completed = True
+        self.set_visible(True)
+        if self._draw_box and self._box is None:
+            self._add_box()
+        self._draw_polygon()
 
 
 class Lasso(AxesWidget):
@@ -2939,9 +3974,13 @@ class Lasso(AxesWidget):
     Parameters
     ----------
     ax : `~matplotlib.axes.Axes`
-        The parent axes for the widget.
+        The parent Axes for the widget.
     xy : (float, float)
         Coordinates of the start of the lasso.
+    useblit : bool, default: True
+        Whether to use blitting for faster drawing (if supported by the
+        backend). See the tutorial :doc:`/tutorials/advanced/blitting`
+        for details.
     callback : callable
         Whenever the lasso is released, the *callback* function is called and
         passed the vertices of the selected path.
diff --git a/lib/mpl_toolkits/axes_grid/__init__.py b/lib/mpl_toolkits/axes_grid/__init__.py
deleted file mode 100644
index 9e76d10ecbed..000000000000
--- a/lib/mpl_toolkits/axes_grid/__init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from . import axes_size as Size
-from .axes_divider import Divider, SubplotDivider, make_axes_locatable
-from .axes_grid import Grid, ImageGrid, AxesGrid
-#from axes_divider import make_axes_locatable
-from matplotlib import _api
-_api.warn_deprecated(since='2.1',
-                     name='mpl_toolkits.axes_grid',
-                     alternative='mpl_toolkits.axes_grid1 and'
-                                 ' mpl_toolkits.axisartist, which provide'
-                                 ' the same functionality',
-                     obj_type='module')
diff --git a/lib/mpl_toolkits/axes_grid/anchored_artists.py b/lib/mpl_toolkits/axes_grid/anchored_artists.py
deleted file mode 100644
index f486805d98c6..000000000000
--- a/lib/mpl_toolkits/axes_grid/anchored_artists.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from matplotlib.offsetbox import AnchoredOffsetbox, AuxTransformBox, VPacker,\
-     TextArea, AnchoredText, DrawingArea, AnnotationBbox
-
-from mpl_toolkits.axes_grid1.anchored_artists import \
-         AnchoredDrawingArea, AnchoredAuxTransformBox, \
-         AnchoredEllipse, AnchoredSizeBar
diff --git a/lib/mpl_toolkits/axes_grid/angle_helper.py b/lib/mpl_toolkits/axes_grid/angle_helper.py
deleted file mode 100644
index fa14e7f5897b..000000000000
--- a/lib/mpl_toolkits/axes_grid/angle_helper.py
+++ /dev/null
@@ -1 +0,0 @@
-from mpl_toolkits.axisartist.angle_helper import *
diff --git a/lib/mpl_toolkits/axes_grid/axes_divider.py b/lib/mpl_toolkits/axes_grid/axes_divider.py
deleted file mode 100644
index 33b4e512c9a0..000000000000
--- a/lib/mpl_toolkits/axes_grid/axes_divider.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from mpl_toolkits.axes_grid1.axes_divider import (
-    AxesDivider, AxesLocator, Divider, SubplotDivider, make_axes_locatable)
-from mpl_toolkits.axisartist.axislines import Axes
diff --git a/lib/mpl_toolkits/axes_grid/axes_grid.py b/lib/mpl_toolkits/axes_grid/axes_grid.py
deleted file mode 100644
index 893b7800ccde..000000000000
--- a/lib/mpl_toolkits/axes_grid/axes_grid.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from mpl_toolkits.axisartist.axes_grid import (
-    AxesGrid, CbarAxes, Grid, ImageGrid)
diff --git a/lib/mpl_toolkits/axes_grid/axes_rgb.py b/lib/mpl_toolkits/axes_grid/axes_rgb.py
deleted file mode 100644
index 30f7e42743f9..000000000000
--- a/lib/mpl_toolkits/axes_grid/axes_rgb.py
+++ /dev/null
@@ -1 +0,0 @@
-from mpl_toolkits.axisartist.axes_rgb import *
diff --git a/lib/mpl_toolkits/axes_grid/axes_size.py b/lib/mpl_toolkits/axes_grid/axes_size.py
deleted file mode 100644
index 742f7fe6347c..000000000000
--- a/lib/mpl_toolkits/axes_grid/axes_size.py
+++ /dev/null
@@ -1 +0,0 @@
-from mpl_toolkits.axes_grid1.axes_size import *
diff --git a/lib/mpl_toolkits/axes_grid/axis_artist.py b/lib/mpl_toolkits/axes_grid/axis_artist.py
deleted file mode 100644
index 11180b10bfef..000000000000
--- a/lib/mpl_toolkits/axes_grid/axis_artist.py
+++ /dev/null
@@ -1 +0,0 @@
-from mpl_toolkits.axisartist.axis_artist import *
diff --git a/lib/mpl_toolkits/axes_grid/axisline_style.py b/lib/mpl_toolkits/axes_grid/axisline_style.py
deleted file mode 100644
index 0c846e22afa0..000000000000
--- a/lib/mpl_toolkits/axes_grid/axisline_style.py
+++ /dev/null
@@ -1 +0,0 @@
-from mpl_toolkits.axisartist.axisline_style import *
diff --git a/lib/mpl_toolkits/axes_grid/axislines.py b/lib/mpl_toolkits/axes_grid/axislines.py
deleted file mode 100644
index a8ceb9cc28ad..000000000000
--- a/lib/mpl_toolkits/axes_grid/axislines.py
+++ /dev/null
@@ -1 +0,0 @@
-from mpl_toolkits.axisartist.axislines import *
diff --git a/lib/mpl_toolkits/axes_grid/clip_path.py b/lib/mpl_toolkits/axes_grid/clip_path.py
deleted file mode 100644
index 5b92d9ae57f6..000000000000
--- a/lib/mpl_toolkits/axes_grid/clip_path.py
+++ /dev/null
@@ -1 +0,0 @@
-from mpl_toolkits.axisartist.clip_path import *
diff --git a/lib/mpl_toolkits/axes_grid/floating_axes.py b/lib/mpl_toolkits/axes_grid/floating_axes.py
deleted file mode 100644
index de8ebb7367be..000000000000
--- a/lib/mpl_toolkits/axes_grid/floating_axes.py
+++ /dev/null
@@ -1 +0,0 @@
-from mpl_toolkits.axisartist.floating_axes import *
diff --git a/lib/mpl_toolkits/axes_grid/grid_finder.py b/lib/mpl_toolkits/axes_grid/grid_finder.py
deleted file mode 100644
index 6cdec87a7f40..000000000000
--- a/lib/mpl_toolkits/axes_grid/grid_finder.py
+++ /dev/null
@@ -1 +0,0 @@
-from mpl_toolkits.axisartist.grid_finder import *
diff --git a/lib/mpl_toolkits/axes_grid/grid_helper_curvelinear.py b/lib/mpl_toolkits/axes_grid/grid_helper_curvelinear.py
deleted file mode 100644
index ebb3edf139f5..000000000000
--- a/lib/mpl_toolkits/axes_grid/grid_helper_curvelinear.py
+++ /dev/null
@@ -1 +0,0 @@
-from mpl_toolkits.axisartist.grid_helper_curvelinear import *
diff --git a/lib/mpl_toolkits/axes_grid/inset_locator.py b/lib/mpl_toolkits/axes_grid/inset_locator.py
deleted file mode 100644
index 9d656e6edaf7..000000000000
--- a/lib/mpl_toolkits/axes_grid/inset_locator.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from mpl_toolkits.axes_grid1.inset_locator import InsetPosition, \
-     AnchoredSizeLocator, \
-     AnchoredZoomLocator, BboxPatch, BboxConnector, BboxConnectorPatch, \
-     inset_axes, zoomed_inset_axes, mark_inset
diff --git a/lib/mpl_toolkits/axes_grid/parasite_axes.py b/lib/mpl_toolkits/axes_grid/parasite_axes.py
deleted file mode 100644
index d988d704c344..000000000000
--- a/lib/mpl_toolkits/axes_grid/parasite_axes.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from matplotlib import _api
-from mpl_toolkits.axes_grid1.parasite_axes import (
-    host_axes_class_factory, parasite_axes_class_factory,
-    parasite_axes_auxtrans_class_factory, subplot_class_factory)
-from mpl_toolkits.axisartist.axislines import Axes
-
-
-ParasiteAxes = parasite_axes_class_factory(Axes)
-HostAxes = host_axes_class_factory(Axes)
-SubplotHost = subplot_class_factory(HostAxes)
-with _api.suppress_matplotlib_deprecation_warning():
-    ParasiteAxesAuxTrans = parasite_axes_auxtrans_class_factory(ParasiteAxes)
diff --git a/lib/mpl_toolkits/axes_grid1/__init__.py b/lib/mpl_toolkits/axes_grid1/__init__.py
index 0f359c9e01f3..c55302485e3f 100644
--- a/lib/mpl_toolkits/axes_grid1/__init__.py
+++ b/lib/mpl_toolkits/axes_grid1/__init__.py
@@ -1,5 +1,10 @@
 from . import axes_size as Size
 from .axes_divider import Divider, SubplotDivider, make_axes_locatable
-from .axes_grid import Grid, ImageGrid, AxesGrid
+from .axes_grid import AxesGrid, Grid, ImageGrid
 
 from .parasite_axes import host_subplot, host_axes
+
+__all__ = ["Size",
+           "Divider", "SubplotDivider", "make_axes_locatable",
+           "AxesGrid", "Grid", "ImageGrid",
+           "host_subplot", "host_axes"]
diff --git a/lib/mpl_toolkits/axes_grid1/anchored_artists.py b/lib/mpl_toolkits/axes_grid1/anchored_artists.py
index b3e88c909a8f..7e15879289ee 100644
--- a/lib/mpl_toolkits/axes_grid1/anchored_artists.py
+++ b/lib/mpl_toolkits/axes_grid1/anchored_artists.py
@@ -23,40 +23,26 @@ def __init__(self, width, height, xdescent, ydescent,
         Parameters
         ----------
         width, height : float
-            width and height of the container, in pixels.
-
+            Width and height of the container, in pixels.
         xdescent, ydescent : float
-            descent of the container in the x- and y- direction, in pixels.
-
-        loc : int
-            Location of this artist. Valid location codes are::
-
-                'upper right'  : 1,
-                'upper left'   : 2,
-                'lower left'   : 3,
-                'lower right'  : 4,
-                'right'        : 5,
-                'center left'  : 6,
-                'center right' : 7,
-                'lower center' : 8,
-                'upper center' : 9,
-                'center'       : 10
-
+            Descent of the container in the x- and y- direction, in pixels.
+        loc : str
+            Location of this artist.  Valid locations are
+            'upper left', 'upper center', 'upper right',
+            'center left', 'center', 'center right',
+            'lower left', 'lower center, 'lower right'.
+            For backward compatibility, numeric values are accepted as well.
+            See the parameter *loc* of `.Legend` for details.
         pad : float, default: 0.4
             Padding around the child objects, in fraction of the font size.
-
         borderpad : float, default: 0.5
             Border padding, in fraction of the font size.
-
         prop : `matplotlib.font_manager.FontProperties`, optional
             Font property used as a reference for paddings.
-
         frameon : bool, default: True
             If True, draw a box around this artists.
-
         **kwargs
-            Keyworded arguments to pass to
-            :class:`matplotlib.offsetbox.AnchoredOffsetbox`.
+            Keyword arguments forwarded to `.AnchoredOffsetbox`.
 
         Attributes
         ----------
@@ -66,7 +52,7 @@ def __init__(self, width, height, xdescent, ydescent,
         Examples
         --------
         To display blue and red circles of different sizes in the upper right
-        of an axes *ax*:
+        of an Axes *ax*:
 
         >>> ada = AnchoredDrawingArea(20, 20, 0, 0,
         ...                           loc='upper right', frameon=False)
@@ -98,36 +84,23 @@ def __init__(self, transform, loc,
         transform : `matplotlib.transforms.Transform`
             The transformation object for the coordinate system in use, i.e.,
             :attr:`matplotlib.axes.Axes.transData`.
-
-        loc : int
-            Location of this artist. Valid location codes are::
-
-                'upper right'  : 1,
-                'upper left'   : 2,
-                'lower left'   : 3,
-                'lower right'  : 4,
-                'right'        : 5,
-                'center left'  : 6,
-                'center right' : 7,
-                'lower center' : 8,
-                'upper center' : 9,
-                'center'       : 10
-
+        loc : str
+            Location of this artist.  Valid locations are
+            'upper left', 'upper center', 'upper right',
+            'center left', 'center', 'center right',
+            'lower left', 'lower center, 'lower right'.
+            For backward compatibility, numeric values are accepted as well.
+            See the parameter *loc* of `.Legend` for details.
         pad : float, default: 0.4
             Padding around the child objects, in fraction of the font size.
-
         borderpad : float, default: 0.5
             Border padding, in fraction of the font size.
-
         prop : `matplotlib.font_manager.FontProperties`, optional
             Font property used as a reference for paddings.
-
         frameon : bool, default: True
             If True, draw a box around this artists.
-
         **kwargs
-            Keyworded arguments to pass to
-            :class:`matplotlib.offsetbox.AnchoredOffsetbox`.
+            Keyword arguments forwarded to `.AnchoredOffsetbox`.
 
         Attributes
         ----------
@@ -162,44 +135,28 @@ def __init__(self, transform, width, height, angle, loc,
         transform : `matplotlib.transforms.Transform`
             The transformation object for the coordinate system in use, i.e.,
             :attr:`matplotlib.axes.Axes.transData`.
-
         width, height : float
             Width and height of the ellipse, given in coordinates of
             *transform*.
-
         angle : float
             Rotation of the ellipse, in degrees, anti-clockwise.
-
-        loc : int
-            Location of this size bar. Valid location codes are::
-
-                'upper right'  : 1,
-                'upper left'   : 2,
-                'lower left'   : 3,
-                'lower right'  : 4,
-                'right'        : 5,
-                'center left'  : 6,
-                'center right' : 7,
-                'lower center' : 8,
-                'upper center' : 9,
-                'center'       : 10
-
-        pad : float, optional
-            Padding around the ellipse, in fraction of the font size. Defaults
-            to 0.1.
-
+        loc : str
+            Location of the ellipse.  Valid locations are
+            'upper left', 'upper center', 'upper right',
+            'center left', 'center', 'center right',
+            'lower left', 'lower center, 'lower right'.
+            For backward compatibility, numeric values are accepted as well.
+            See the parameter *loc* of `.Legend` for details.
+        pad : float, default: 0.1
+            Padding around the ellipse, in fraction of the font size.
         borderpad : float, default: 0.1
             Border padding, in fraction of the font size.
-
         frameon : bool, default: True
             If True, draw a box around the ellipse.
-
         prop : `matplotlib.font_manager.FontProperties`, optional
             Font property used as a reference for paddings.
-
         **kwargs
-            Keyworded arguments to pass to
-            :class:`matplotlib.offsetbox.AnchoredOffsetbox`.
+            Keyword arguments forwarded to `.AnchoredOffsetbox`.
 
         Attributes
         ----------
@@ -207,7 +164,7 @@ def __init__(self, transform, width, height, angle, loc,
             Ellipse patch drawn.
         """
         self._box = AuxTransformBox(transform)
-        self.ellipse = Ellipse((0, 0), width, height, angle)
+        self.ellipse = Ellipse((0, 0), width, height, angle=angle)
         self._box.add_artist(self.ellipse)
 
         super().__init__(loc, pad=pad, borderpad=borderpad, child=self._box,
@@ -228,75 +185,54 @@ def __init__(self, transform, size, label, loc,
         transform : `matplotlib.transforms.Transform`
             The transformation object for the coordinate system in use, i.e.,
             :attr:`matplotlib.axes.Axes.transData`.
-
         size : float
             Horizontal length of the size bar, given in coordinates of
             *transform*.
-
         label : str
             Label to display.
-
-        loc : int
-            Location of this size bar. Valid location codes are::
-
-                'upper right'  : 1,
-                'upper left'   : 2,
-                'lower left'   : 3,
-                'lower right'  : 4,
-                'right'        : 5,
-                'center left'  : 6,
-                'center right' : 7,
-                'lower center' : 8,
-                'upper center' : 9,
-                'center'       : 10
-
+        loc : str
+            Location of the size bar.  Valid locations are
+            'upper left', 'upper center', 'upper right',
+            'center left', 'center', 'center right',
+            'lower left', 'lower center, 'lower right'.
+            For backward compatibility, numeric values are accepted as well.
+            See the parameter *loc* of `.Legend` for details.
         pad : float, default: 0.1
             Padding around the label and size bar, in fraction of the font
             size.
-
         borderpad : float, default: 0.1
             Border padding, in fraction of the font size.
-
         sep : float, default: 2
             Separation between the label and the size bar, in points.
-
         frameon : bool, default: True
             If True, draw a box around the horizontal bar and label.
-
         size_vertical : float, default: 0
             Vertical length of the size bar, given in coordinates of
             *transform*.
-
         color : str, default: 'black'
             Color for the size bar and label.
-
         label_top : bool, default: False
             If True, the label will be over the size bar.
-
         fontproperties : `matplotlib.font_manager.FontProperties`, optional
             Font properties for the label text.
-
         fill_bar : bool, optional
-            If True and if size_vertical is nonzero, the size bar will
+            If True and if *size_vertical* is nonzero, the size bar will
             be filled in with the color specified by the size bar.
             Defaults to True if *size_vertical* is greater than
             zero and False otherwise.
-
         **kwargs
-            Keyworded arguments to pass to
-            :class:`matplotlib.offsetbox.AnchoredOffsetbox`.
+            Keyword arguments forwarded to `.AnchoredOffsetbox`.
 
         Attributes
         ----------
         size_bar : `matplotlib.offsetbox.AuxTransformBox`
             Container for the size bar.
-
         txt_label : `matplotlib.offsetbox.TextArea`
             Container for the label of the size bar.
 
         Notes
         -----
-        If *prop* is passed as a keyworded argument, but *fontproperties* is
+        If *prop* is passed as a keyword argument, but *fontproperties* is
         not, then *prop* is be assumed to be the intended *fontproperties*.
         Using both *prop* and *fontproperties* is not supported.
 
@@ -354,8 +290,8 @@ def __init__(self, transform, size, label, loc,
 
 class AnchoredDirectionArrows(AnchoredOffsetbox):
     def __init__(self, transform, label_x, label_y, length=0.15,
-                 fontsize=0.08, loc=2, angle=0, aspect_ratio=1, pad=0.4,
-                 borderpad=0.4, frameon=False, color='w', alpha=1,
+                 fontsize=0.08, loc='upper left', angle=0, aspect_ratio=1,
+                 pad=0.4, borderpad=0.4, frameon=False, color='w', alpha=1,
                  sep_x=0.01, sep_y=0, fontproperties=None, back_length=0.15,
                  head_width=10, head_length=15, tail_width=2,
                  text_props=None, arrow_props=None,
@@ -368,90 +304,61 @@ def __init__(self, transform, label_x, label_y, length=0.15,
         transform : `matplotlib.transforms.Transform`
             The transformation object for the coordinate system in use, i.e.,
             :attr:`matplotlib.axes.Axes.transAxes`.
-
         label_x, label_y : str
             Label text for the x and y arrows
-
         length : float, default: 0.15
             Length of the arrow, given in coordinates of *transform*.
-
         fontsize : float, default: 0.08
             Size of label strings, given in coordinates of *transform*.
-
-        loc : int, default: 2
-            Location of the direction arrows. Valid location codes are::
-
-                'upper right'  : 1,
-                'upper left'   : 2,
-                'lower left'   : 3,
-                'lower right'  : 4,
-                'right'        : 5,
-                'center left'  : 6,
-                'center right' : 7,
-                'lower center' : 8,
-                'upper center' : 9,
-                'center'       : 10
-
+        loc : str, default: 'upper left'
+            Location of the arrow.  Valid locations are
+            'upper left', 'upper center', 'upper right',
+            'center left', 'center', 'center right',
+            'lower left', 'lower center, 'lower right'.
+            For backward compatibility, numeric values are accepted as well.
+            See the parameter *loc* of `.Legend` for details.
         angle : float, default: 0
             The angle of the arrows in degrees.
-
         aspect_ratio : float, default: 1
             The ratio of the length of arrow_x and arrow_y.
             Negative numbers can be used to change the direction.
-
         pad : float, default: 0.4
             Padding around the labels and arrows, in fraction of the font size.
-
         borderpad : float, default: 0.4
             Border padding, in fraction of the font size.
-
         frameon : bool, default: False
             If True, draw a box around the arrows and labels.
-
         color : str, default: 'white'
             Color for the arrows and labels.
-
         alpha : float, default: 1
             Alpha values of the arrows and labels
-
         sep_x, sep_y : float, default: 0.01 and 0 respectively
             Separation between the arrows and labels in coordinates of
             *transform*.
-
         fontproperties : `matplotlib.font_manager.FontProperties`, optional
             Font properties for the label text.
-
         back_length : float, default: 0.15
             Fraction of the arrow behind the arrow crossing.
-
         head_width : float, default: 10
             Width of arrow head, sent to ArrowStyle.
-
         head_length : float, default: 15
             Length of arrow head, sent to ArrowStyle.
-
         tail_width : float, default: 2
             Width of arrow tail, sent to ArrowStyle.
-
         text_props, arrow_props : dict
             Properties of the text and arrows, passed to
             `.textpath.TextPath` and `.patches.FancyArrowPatch`.
-
         **kwargs
-            Keyworded arguments to pass to
-            :class:`matplotlib.offsetbox.AnchoredOffsetbox`.
+            Keyword arguments forwarded to `.AnchoredOffsetbox`.
 
         Attributes
         ----------
         arrow_x, arrow_y : `matplotlib.patches.FancyArrowPatch`
             Arrow x and y
-
         text_path_x, text_path_y : `matplotlib.textpath.TextPath`
             Path for arrow labels
-
         p_x, p_y : `matplotlib.patches.PathPatch`
             Patch for arrow labels
-
         box : `matplotlib.offsetbox.AuxTransformBox`
             Container for the arrows and labels.
 
diff --git a/lib/mpl_toolkits/axes_grid1/axes_divider.py b/lib/mpl_toolkits/axes_grid1/axes_divider.py
index b50bb5ccdeac..251fa44b14bf 100644
--- a/lib/mpl_toolkits/axes_grid1/axes_divider.py
+++ b/lib/mpl_toolkits/axes_grid1/axes_divider.py
@@ -4,9 +4,10 @@
 
 import numpy as np
 
+import matplotlib as mpl
 from matplotlib import _api
 from matplotlib.axes import SubplotBase
-from matplotlib.gridspec import SubplotSpec, GridSpec
+from matplotlib.gridspec import SubplotSpec
 import matplotlib.transforms as mtransforms
 from . import axes_size as Size
 
@@ -38,7 +39,8 @@ def __init__(self, fig, pos, horizontal, vertical,
         aspect : bool
             Whether overall rectangular area is reduced so that the relative
             part of the horizontal and vertical scales have the same scale.
-        anchor : {'C', 'SW', 'S', 'SE', 'E', 'NE', 'N', 'NW', 'W'}
+        anchor : (float, float) or {'C', 'SW', 'S', 'SE', 'E', 'NE', 'N', \
+'NW', 'W'}
             Placement of the reduced rectangle, when *aspect* is True.
         """
 
@@ -47,6 +49,7 @@ def __init__(self, fig, pos, horizontal, vertical,
         self._horizontal = horizontal
         self._vertical = vertical
         self._anchor = anchor
+        self.set_anchor(anchor)
         self._aspect = aspect
         self._xrefindex = 0
         self._yrefindex = 0
@@ -58,6 +61,7 @@ def get_horizontal_sizes(self, renderer):
     def get_vertical_sizes(self, renderer):
         return [s.get_size(renderer) for s in self.get_vertical()]
 
+    @_api.deprecated("3.5")
     def get_vsize_hsize(self):
         vsize = Size.AddList(self.get_vertical())
         hsize = Size.AddList(self.get_horizontal())
@@ -104,26 +108,20 @@ def set_anchor(self, anchor):
         """
         Parameters
         ----------
-        anchor : {'C', 'SW', 'S', 'SE', 'E', 'NE', 'N', 'NW', 'W'}
-            anchor position
-
-          =====  ============
-          value  description
-          =====  ============
-          'C'    Center
-          'SW'   bottom left
-          'S'    bottom
-          'SE'   bottom right
-          'E'    right
-          'NE'   top right
-          'N'    top
-          'NW'   top left
-          'W'    left
-          =====  ============
-
-        """
-        if len(anchor) != 2:
+        anchor : (float, float) or {'C', 'SW', 'S', 'SE', 'E', 'NE', 'N', \
+'NW', 'W'}
+            Either an (*x*, *y*) pair of relative coordinates (0 is left or
+            bottom, 1 is right or top), 'C' (center), or a cardinal direction
+            ('SW', southwest, is bottom left, etc.).
+
+        See Also
+        --------
+        .Axes.set_anchor
+        """
+        if isinstance(anchor, str):
             _api.check_in_list(mtransforms.Bbox.coefs, anchor=anchor)
+        elif not isinstance(anchor, (tuple, list)) or len(anchor) != 2:
+            raise TypeError("anchor must be str or 2-tuple")
         self._anchor = anchor
 
     def get_anchor(self):
@@ -195,25 +193,24 @@ def locate(self, nx, ny, nx1=None, ny1=None, axes=None, renderer=None):
         renderer
         """
 
-        figW, figH = self._fig.get_size_inches()
+        fig_w, fig_h = self._fig.bbox.size / self._fig.dpi
         x, y, w, h = self.get_position_runtime(axes, renderer)
 
         hsizes = self.get_horizontal_sizes(renderer)
         vsizes = self.get_vertical_sizes(renderer)
-        k_h = self._calc_k(hsizes, figW*w)
-        k_v = self._calc_k(vsizes, figH*h)
+        k_h = self._calc_k(hsizes, fig_w * w)
+        k_v = self._calc_k(vsizes, fig_h * h)
 
         if self.get_aspect():
             k = min(k_h, k_v)
             ox = self._calc_offsets(hsizes, k)
             oy = self._calc_offsets(vsizes, k)
 
-            ww = (ox[-1] - ox[0]) / figW
-            hh = (oy[-1] - oy[0]) / figH
+            ww = (ox[-1] - ox[0]) / fig_w
+            hh = (oy[-1] - oy[0]) / fig_h
             pb = mtransforms.Bbox.from_bounds(x, y, w, h)
             pb1 = mtransforms.Bbox.from_bounds(x, y, ww, hh)
-            pb1_anchored = pb1.anchored(self.get_anchor(), pb)
-            x0, y0 = pb1_anchored.x0, pb1_anchored.y0
+            x0, y0 = pb1.anchored(self.get_anchor(), pb).p0
 
         else:
             ox = self._calc_offsets(hsizes, k_h)
@@ -221,12 +218,20 @@ def locate(self, nx, ny, nx1=None, ny1=None, axes=None, renderer=None):
             x0, y0 = x, y
 
         if nx1 is None:
+            _api.warn_deprecated(
+                "3.5", message="Support for passing nx1=None to mean nx+1 is "
+                "deprecated since %(since)s; in a future version, nx1=None "
+                "will mean 'up to the last cell'.")
             nx1 = nx + 1
         if ny1 is None:
+            _api.warn_deprecated(
+                "3.5", message="Support for passing ny1=None to mean ny+1 is "
+                "deprecated since %(since)s; in a future version, ny1=None "
+                "will mean 'up to the last cell'.")
             ny1 = ny + 1
 
-        x1, w1 = x0 + ox[nx] / figW, (ox[nx1] - ox[nx]) / figW
-        y1, h1 = y0 + oy[ny] / figH, (oy[ny1] - oy[ny]) / figH
+        x1, w1 = x0 + ox[nx] / fig_w, (ox[nx1] - ox[nx]) / fig_w
+        y1, h1 = y0 + oy[ny] / fig_h, (oy[ny1] - oy[ny]) / fig_h
 
         return mtransforms.Bbox.from_bounds(x1, y1, w1, h1)
 
@@ -244,9 +249,14 @@ def new_locator(self, nx, ny, nx1=None, ny1=None):
         ny, ny1 : int
             Same as *nx* and *nx1*, but for row positions.
         """
-        return AxesLocator(self, nx, ny, nx1, ny1)
+        return AxesLocator(
+            self, nx, ny,
+            nx1 if nx1 is not None else nx + 1,
+            ny1 if ny1 is not None else ny + 1)
 
     def append_size(self, position, size):
+        _api.check_in_list(["left", "right", "bottom", "top"],
+                           position=position)
         if position == "left":
             self._horizontal.insert(0, size)
             self._xrefindex += 1
@@ -255,28 +265,35 @@ def append_size(self, position, size):
         elif position == "bottom":
             self._vertical.insert(0, size)
             self._yrefindex += 1
-        elif position == "top":
+        else:  # 'top'
             self._vertical.append(size)
-        else:
-            _api.check_in_list(["left", "right", "bottom", "top"],
-                               position=position)
 
     def add_auto_adjustable_area(self, use_axes, pad=0.1, adjust_dirs=None):
+        """
+        Add auto-adjustable padding around *use_axes* to take their decorations
+        (title, labels, ticks, ticklabels) into account during layout.
+
+        Parameters
+        ----------
+        use_axes : `~.axes.Axes` or list of `~.axes.Axes`
+            The Axes whose decorations are taken into account.
+        pad : float, optional
+            Additional padding in inches.
+        adjust_dirs : list of {"left", "right", "bottom", "top"}, optional
+            The sides where padding is added; defaults to all four sides.
+        """
         if adjust_dirs is None:
             adjust_dirs = ["left", "right", "bottom", "top"]
-        from .axes_size import Padded, SizeFromFunc, GetExtentHelper
         for d in adjust_dirs:
-            helper = GetExtentHelper(use_axes, d)
-            size = SizeFromFunc(helper)
-            padded_size = Padded(size, pad)  # pad in inch
-            self.append_size(d, padded_size)
+            self.append_size(d, Size._AxesDecorationsSize(use_axes, d) + pad)
 
 
 class AxesLocator:
     """
-    A simple callable object, initialized with AxesDivider class,
-    returns the position and size of the given cell.
+    A callable object which returns the position and size of a given
+    AxesDivider cell.
     """
+
     def __init__(self, axes_divider, nx, ny, nx1=None, ny1=None):
         """
         Parameters
@@ -298,8 +315,16 @@ def __init__(self, axes_divider, nx, ny, nx1=None, ny1=None):
         self._nx, self._ny = nx - _xrefindex, ny - _yrefindex
 
         if nx1 is None:
+            _api.warn_deprecated(
+                "3.5", message="Support for passing nx1=None to mean nx+1 is "
+                "deprecated since %(since)s; in a future version, nx1=None "
+                "will mean 'up to the last cell'.")
             nx1 = nx + 1
         if ny1 is None:
+            _api.warn_deprecated(
+                "3.5", message="Support for passing ny1=None to mean ny+1 is "
+                "deprecated since %(since)s; in a future version, ny1=None "
+                "will mean 'up to the last cell'.")
             ny1 = ny + 1
 
         self._nx1 = nx1 - _xrefindex
@@ -356,30 +381,6 @@ def get_position(self):
         """Return the bounds of the subplot box."""
         return self.get_subplotspec().get_position(self.figure).bounds
 
-    @_api.deprecated("3.4")
-    @property
-    def figbox(self):
-        return self.get_subplotspec().get_position(self.figure)
-
-    @_api.deprecated("3.4")
-    def update_params(self):
-        pass
-
-    @_api.deprecated(
-        "3.4", alternative="get_subplotspec",
-        addendum="(get_subplotspec returns a SubplotSpec instance.)")
-    def get_geometry(self):
-        """Get the subplot geometry, e.g., (2, 2, 3)."""
-        rows, cols, num1, num2 = self.get_subplotspec().get_geometry()
-        return rows, cols, num1 + 1  # for compatibility
-
-    @_api.deprecated("3.4", alternative="set_subplotspec")
-    def change_geometry(self, numrows, numcols, num):
-        """Change subplot geometry, e.g., from (1, 1, 1) to (2, 2, 3)."""
-        self._subplotspec = GridSpec(numrows, numcols)[num-1]
-        self.update_params()
-        self.set_position(self.figbox)
-
     def get_subplotspec(self):
         """Get the SubplotSpec instance."""
         return self._subplotspec
@@ -392,7 +393,7 @@ def set_subplotspec(self, subplotspec):
 
 class AxesDivider(Divider):
     """
-    Divider based on the pre-existing axes.
+    Divider based on the preexisting axes.
     """
 
     def __init__(self, axes, xref=None, yref=None):
@@ -429,31 +430,14 @@ def _get_new_axes(self, *, axes_class=None, **kwargs):
 
     def new_horizontal(self, size, pad=None, pack_start=False, **kwargs):
         """
-        Add a new axes on the right (or left) side of the main axes.
+        Helper method for ``append_axes("left")`` and ``append_axes("right")``.
 
-        Parameters
-        ----------
-        size : :mod:`~mpl_toolkits.axes_grid1.axes_size` or float or str
-            A width of the axes. If float or string is given, *from_any*
-            function is used to create the size, with *ref_size* set to AxesX
-            instance of the current axes.
-        pad : :mod:`~mpl_toolkits.axes_grid1.axes_size` or float or str
-            Pad between the axes. It takes same argument as *size*.
-        pack_start : bool
-            If False, the new axes is appended at the end
-            of the list, i.e., it became the right-most axes. If True, it is
-            inserted at the start of the list, and becomes the left-most axes.
-        **kwargs
-            All extra keywords arguments are passed to the created axes.
-            If *axes_class* is given, the new axes will be created as an
-            instance of the given class. Otherwise, the same class of the
-            main axes will be used.
+        See the documentation of `append_axes` for more details.
+
+        :meta private:
         """
         if pad is None:
-            _api.warn_deprecated(
-                "3.2", message="In a future version, 'pad' will default to "
-                "rcParams['figure.subplot.wspace'].  Set pad=0 to keep the "
-                "old behavior.")
+            pad = mpl.rcParams["figure.subplot.wspace"] * self._xref
         if pad:
             if not isinstance(pad, Size._Base):
                 pad = Size.from_any(pad, fraction_ref=self._xref)
@@ -478,31 +462,14 @@ def new_horizontal(self, size, pad=None, pack_start=False, **kwargs):
 
     def new_vertical(self, size, pad=None, pack_start=False, **kwargs):
         """
-        Add a new axes on the top (or bottom) side of the main axes.
+        Helper method for ``append_axes("top")`` and ``append_axes("bottom")``.
 
-        Parameters
-        ----------
-        size : :mod:`~mpl_toolkits.axes_grid1.axes_size` or float or str
-            A height of the axes. If float or string is given, *from_any*
-            function is used to create the size, with *ref_size* set to AxesX
-            instance of the current axes.
-        pad : :mod:`~mpl_toolkits.axes_grid1.axes_size` or float or str
-            Pad between the axes. It takes same argument as *size*.
-        pack_start : bool
-            If False, the new axes is appended at the end
-            of the list, i.e., it became the right-most axes. If True, it is
-            inserted at the start of the list, and becomes the left-most axes.
-        **kwargs
-            All extra keywords arguments are passed to the created axes.
-            If *axes_class* is given, the new axes will be created as an
-            instance of the given class. Otherwise, the same class of the
-            main axes will be used.
+        See the documentation of `append_axes` for more details.
+
+        :meta private:
         """
         if pad is None:
-            _api.warn_deprecated(
-                "3.2", message="In a future version, 'pad' will default to "
-                "rcParams['figure.subplot.hspace'].  Set pad=0 to keep the "
-                "old behavior.")
+            pad = mpl.rcParams["figure.subplot.hspace"] * self._yref
         if pad:
             if not isinstance(pad, Size._Base):
                 pad = Size.from_any(pad, fraction_ref=self._yref)
@@ -520,33 +487,43 @@ def new_vertical(self, size, pad=None, pack_start=False, **kwargs):
         else:
             self._vertical.append(size)
             locator = self.new_locator(
-                nx=self._xrefindex, ny=len(self._vertical)-1)
+                nx=self._xrefindex, ny=len(self._vertical) - 1)
         ax = self._get_new_axes(**kwargs)
         ax.set_axes_locator(locator)
         return ax
 
-    def append_axes(self, position, size, pad=None, add_to_figure=True,
-                    **kwargs):
+    @_api.delete_parameter("3.5", "add_to_figure", alternative="ax.remove()")
+    def append_axes(self, position, size, pad=None, add_to_figure=True, *,
+                    axes_class=None, **kwargs):
         """
-        Create an axes at the given *position* with the same height
-        (or width) of the main axes.
+        Add a new axes on a given side of the main axes.
 
-         *position*
-           ["left"|"right"|"bottom"|"top"]
-
-         *size* and *pad* should be axes_grid.axes_size compatible.
+        Parameters
+        ----------
+        position : {"left", "right", "bottom", "top"}
+            Where the new axes is positioned relative to the main axes.
+        size : :mod:`~mpl_toolkits.axes_grid1.axes_size` or float or str
+            The axes width or height.  float or str arguments are interpreted
+            as ``axes_size.from_any(size, AxesX(<main_axes>))`` for left or
+            right axes, and likewise with ``AxesY`` for bottom or top axes.
+        pad : :mod:`~mpl_toolkits.axes_grid1.axes_size` or float or str
+            Padding between the axes.  float or str arguments are interpreted
+            as for *size*.  Defaults to :rc:`figure.subplot.wspace` times the
+            main axes width (left or right axes) or :rc:`figure.subplot.hspace`
+            times the main axes height (bottom or top axes).
+        axes_class : subclass type of `~.axes.Axes`, optional
+            The type of the new axes.  Defaults to the type of the main axes.
+        **kwargs
+            All extra keywords arguments are passed to the created axes.
         """
-        if position == "left":
-            ax = self.new_horizontal(size, pad, pack_start=True, **kwargs)
-        elif position == "right":
-            ax = self.new_horizontal(size, pad, pack_start=False, **kwargs)
-        elif position == "bottom":
-            ax = self.new_vertical(size, pad, pack_start=True, **kwargs)
-        elif position == "top":
-            ax = self.new_vertical(size, pad, pack_start=False, **kwargs)
-        else:
-            _api.check_in_list(["left", "right", "bottom", "top"],
-                               position=position)
+        create_axes, pack_start = _api.check_getitem({
+            "left": (self.new_horizontal, True),
+            "right": (self.new_horizontal, False),
+            "bottom": (self.new_vertical, True),
+            "top": (self.new_vertical, False),
+        }, position=position)
+        ax = create_axes(
+            size, pad, pack_start=pack_start, axes_class=axes_class, **kwargs)
         if add_to_figure:
             self._fig.add_axes(ax)
         return ax
@@ -581,38 +558,66 @@ def get_subplotspec(self):
             return None
 
 
-class HBoxDivider(SubplotDivider):
+# Helper for HBoxDivider/VBoxDivider.
+# The variable names are written for a horizontal layout, but the calculations
+# work identically for vertical layouts (and likewise for the helpers below).
+def _determine_karray(summed_widths, equal_heights, total_width, max_height):
+    n = len(equal_heights)
+    eq_rs, eq_as = np.asarray(equal_heights).T
+    sm_rs, sm_as = np.asarray(summed_widths).T
+    A = np.zeros((n + 1, n + 1))
+    B = np.zeros(n + 1)
+    np.fill_diagonal(A[:n, :n], eq_rs)
+    A[:n, -1] = -1
+    A[-1, :-1] = sm_rs
+    B[:n] = -eq_as
+    B[-1] = total_width - sum(sm_as)
+    # A @ K = B: This solves for {k_0, ..., k_{N-1}, H} so that
+    #   eq_r_i * k_i + eq_a_i = H for all i: all axes have the same height
+    #   sum(sm_r_i * k_i + sm_a_i) = total_summed_width: fixed total width
+    # (foo_r_i * k_i + foo_a_i will end up being the size of foo.)
+    karray_and_height = np.linalg.solve(A, B)
+    karray = karray_and_height[:-1]
+    height = karray_and_height[-1]
+    if height > max_height:  # Additionally, upper-bound the height.
+        karray = (max_height - eq_as) / eq_rs
+    return karray
+
+
+# Helper for HBoxDivider/VBoxDivider (see above re: variable naming).
+def _calc_offsets(summed_sizes, karray):
+    offsets = [0.]
+    for (r, a), k in zip(summed_sizes, karray):
+        offsets.append(offsets[-1] + r*k + a)
+    return offsets
+
+
+# Helper for HBoxDivider/VBoxDivider (see above re: variable naming).
+def _locate(x, y, w, h, summed_widths, equal_heights, fig_w, fig_h, anchor):
+    karray = _determine_karray(
+        summed_widths, equal_heights,
+        total_width=fig_w * w, max_height=fig_h * h)
+    ox = _calc_offsets(summed_widths, karray)
+
+    ww = (ox[-1] - ox[0]) / fig_w
+    h0_r, h0_a = equal_heights[0]
+    hh = (karray[0]*h0_r + h0_a) / fig_h
+    pb = mtransforms.Bbox.from_bounds(x, y, w, h)
+    pb1 = mtransforms.Bbox.from_bounds(x, y, ww, hh)
+    x0, y0 = pb1.anchored(anchor, pb).p0
+
+    return x0, y0, ox, hh
 
-    @staticmethod
-    def _determine_karray(equivalent_sizes, appended_sizes,
-                          max_equivalent_size,
-                          total_appended_size):
-
-        n = len(equivalent_sizes)
-        eq_rs, eq_as = np.asarray(equivalent_sizes).T
-        ap_rs, ap_as = np.asarray(appended_sizes).T
-        A = np.zeros((n + 1, n + 1))
-        B = np.zeros(n + 1)
-        np.fill_diagonal(A[:n, :n], eq_rs)
-        A[:n, -1] = -1
-        A[-1, :-1] = ap_rs
-        B[:n] = -eq_as
-        B[-1] = total_appended_size - sum(ap_as)
-
-        karray_H = np.linalg.solve(A, B)  # A @ K = B
-        karray = karray_H[:-1]
-        H = karray_H[-1]
-
-        if H > max_equivalent_size:
-            karray = (max_equivalent_size - eq_as) / eq_rs
-        return karray
 
-    @staticmethod
-    def _calc_offsets(appended_sizes, karray):
-        offsets = [0.]
-        for (r, a), k in zip(appended_sizes, karray):
-            offsets.append(offsets[-1] + r*k + a)
-        return offsets
+class HBoxDivider(SubplotDivider):
+    """
+    A `SubplotDivider` for laying out axes horizontally, while ensuring that
+    they have equal heights.
+
+    Examples
+    --------
+    .. plot:: gallery/axes_grid1/demo_axes_hbox_divider.py
+    """
 
     def new_locator(self, nx, nx1=None):
         """
@@ -625,71 +630,32 @@ def new_locator(self, nx, nx1=None):
             cell. When *nx1* is None, a single *nx*-th column is
             specified. Otherwise location of columns spanning between *nx*
             to *nx1* (but excluding *nx1*-th column) is specified.
-        ny, ny1 : int
-            Same as *nx* and *nx1*, but for row positions.
         """
-        return AxesLocator(self, nx, 0, nx1, None)
-
-    def _locate(self, x, y, w, h,
-                y_equivalent_sizes, x_appended_sizes,
-                figW, figH):
-        equivalent_sizes = y_equivalent_sizes
-        appended_sizes = x_appended_sizes
-
-        max_equivalent_size = figH * h
-        total_appended_size = figW * w
-        karray = self._determine_karray(equivalent_sizes, appended_sizes,
-                                        max_equivalent_size,
-                                        total_appended_size)
-
-        ox = self._calc_offsets(appended_sizes, karray)
-
-        ww = (ox[-1] - ox[0]) / figW
-        ref_h = equivalent_sizes[0]
-        hh = (karray[0]*ref_h[0] + ref_h[1]) / figH
-        pb = mtransforms.Bbox.from_bounds(x, y, w, h)
-        pb1 = mtransforms.Bbox.from_bounds(x, y, ww, hh)
-        pb1_anchored = pb1.anchored(self.get_anchor(), pb)
-        x0, y0 = pb1_anchored.x0, pb1_anchored.y0
-
-        return x0, y0, ox, hh
+        return AxesLocator(self, nx, 0, nx1 if nx1 is not None else nx + 1, 1)
 
     def locate(self, nx, ny, nx1=None, ny1=None, axes=None, renderer=None):
-        """
-        Parameters
-        ----------
-        axes_divider : AxesDivider
-        nx, nx1 : int
-            Integers specifying the column-position of the
-            cell. When *nx1* is None, a single *nx*-th column is
-            specified. Otherwise location of columns spanning between *nx*
-            to *nx1* (but excluding *nx1*-th column) is specified.
-        ny, ny1 : int
-            Same as *nx* and *nx1*, but for row positions.
-        axes
-        renderer
-        """
-
-        figW, figH = self._fig.get_size_inches()
+        # docstring inherited
+        fig_w, fig_h = self._fig.bbox.size / self._fig.dpi
         x, y, w, h = self.get_position_runtime(axes, renderer)
-
-        y_equivalent_sizes = self.get_vertical_sizes(renderer)
-        x_appended_sizes = self.get_horizontal_sizes(renderer)
-        x0, y0, ox, hh = self._locate(x, y, w, h,
-                                      y_equivalent_sizes, x_appended_sizes,
-                                      figW, figH)
+        summed_ws = self.get_horizontal_sizes(renderer)
+        equal_hs = self.get_vertical_sizes(renderer)
+        x0, y0, ox, hh = _locate(
+            x, y, w, h, summed_ws, equal_hs, fig_w, fig_h, self.get_anchor())
         if nx1 is None:
+            _api.warn_deprecated(
+                "3.5", message="Support for passing nx1=None to mean nx+1 is "
+                "deprecated since %(since)s; in a future version, nx1=None "
+                "will mean 'up to the last cell'.")
             nx1 = nx + 1
-
-        x1, w1 = x0 + ox[nx] / figW, (ox[nx1] - ox[nx]) / figW
+        x1, w1 = x0 + ox[nx] / fig_w, (ox[nx1] - ox[nx]) / fig_w
         y1, h1 = y0, hh
-
         return mtransforms.Bbox.from_bounds(x1, y1, w1, h1)
 
 
-class VBoxDivider(HBoxDivider):
+class VBoxDivider(SubplotDivider):
     """
-    The Divider class whose rectangle area is specified as a subplot geometry.
+    A `SubplotDivider` for laying out axes vertically, while ensuring that they
+    have equal widths.
     """
 
     def new_locator(self, ny, ny1=None):
@@ -704,39 +670,24 @@ def new_locator(self, ny, ny1=None):
             specified. Otherwise location of rows spanning between *ny*
             to *ny1* (but excluding *ny1*-th row) is specified.
         """
-        return AxesLocator(self, 0, ny, None, ny1)
+        return AxesLocator(self, 0, ny, 1, ny1 if ny1 is not None else ny + 1)
 
     def locate(self, nx, ny, nx1=None, ny1=None, axes=None, renderer=None):
-        """
-        Parameters
-        ----------
-        axes_divider : AxesDivider
-        nx, nx1 : int
-            Integers specifying the column-position of the
-            cell. When *nx1* is None, a single *nx*-th column is
-            specified. Otherwise location of columns spanning between *nx*
-            to *nx1* (but excluding *nx1*-th column) is specified.
-        ny, ny1 : int
-            Same as *nx* and *nx1*, but for row positions.
-        axes
-        renderer
-        """
-
-        figW, figH = self._fig.get_size_inches()
+        # docstring inherited
+        fig_w, fig_h = self._fig.bbox.size / self._fig.dpi
         x, y, w, h = self.get_position_runtime(axes, renderer)
-
-        x_equivalent_sizes = self.get_horizontal_sizes(renderer)
-        y_appended_sizes = self.get_vertical_sizes(renderer)
-
-        y0, x0, oy, ww = self._locate(y, x, h, w,
-                                      x_equivalent_sizes, y_appended_sizes,
-                                      figH, figW)
+        summed_hs = self.get_vertical_sizes(renderer)
+        equal_ws = self.get_horizontal_sizes(renderer)
+        y0, x0, oy, ww = _locate(
+            y, x, h, w, summed_hs, equal_ws, fig_h, fig_w, self.get_anchor())
         if ny1 is None:
+            _api.warn_deprecated(
+                "3.5", message="Support for passing ny1=None to mean ny+1 is "
+                "deprecated since %(since)s; in a future version, ny1=None "
+                "will mean 'up to the last cell'.")
             ny1 = ny + 1
-
         x1, w1 = x0, ww
-        y1, h1 = y0 + oy[ny] / figH, (oy[ny1] - oy[ny]) / figH
-
+        y1, h1 = y0 + oy[ny] / fig_h, (oy[ny1] - oy[ny]) / fig_h
         return mtransforms.Bbox.from_bounds(x1, y1, w1, h1)
 
 
@@ -748,15 +699,20 @@ def make_axes_locatable(axes):
     return divider
 
 
-def make_axes_area_auto_adjustable(ax,
-                                   use_axes=None, pad=0.1,
-                                   adjust_dirs=None):
+def make_axes_area_auto_adjustable(
+        ax, use_axes=None, pad=0.1, adjust_dirs=None):
+    """
+    Add auto-adjustable padding around *ax* to take its decorations (title,
+    labels, ticks, ticklabels) into account during layout, using
+    `Divider.add_auto_adjustable_area`.
+
+    By default, padding is determined from the decorations of *ax*.
+    Pass *use_axes* to consider the decorations of other Axes instead.
+    """
     if adjust_dirs is None:
         adjust_dirs = ["left", "right", "bottom", "top"]
     divider = make_axes_locatable(ax)
-
     if use_axes is None:
         use_axes = ax
-
     divider.add_auto_adjustable_area(use_axes=use_axes, pad=pad,
                                      adjust_dirs=adjust_dirs)
diff --git a/lib/mpl_toolkits/axes_grid1/axes_grid.py b/lib/mpl_toolkits/axes_grid1/axes_grid.py
index 295a03ec801f..b2fe5d249609 100644
--- a/lib/mpl_toolkits/axes_grid1/axes_grid.py
+++ b/lib/mpl_toolkits/axes_grid1/axes_grid.py
@@ -3,8 +3,7 @@
 
 import numpy as np
 
-import matplotlib as mpl
-from matplotlib import _api
+from matplotlib import _api, cbook
 from matplotlib.gridspec import SubplotSpec
 
 from .axes_divider import Size, SubplotDivider, Divider
@@ -21,52 +20,35 @@ def _tick_only(ax, bottom_on, left_on):
 class CbarAxesBase:
     def __init__(self, *args, orientation, **kwargs):
         self.orientation = orientation
-        self._default_label_on = True
         self._locator = None  # deprecated.
         super().__init__(*args, **kwargs)
 
     def colorbar(self, mappable, *, ticks=None, **kwargs):
-
-        if self.orientation in ["top", "bottom"]:
-            orientation = "horizontal"
-        else:
-            orientation = "vertical"
-
-        cb = mpl.colorbar.Colorbar(
-            self, mappable, orientation=orientation, ticks=ticks, **kwargs)
-        self._cbid = mappable.colorbar_cid  # deprecated in 3.3.
-        self._locator = cb.locator  # deprecated in 3.3.
-
-        self._config_axes()
+        orientation = (
+            "horizontal" if self.orientation in ["top", "bottom"] else
+            "vertical")
+        cb = self.figure.colorbar(mappable, cax=self, orientation=orientation,
+                                  ticks=ticks, **kwargs)
         return cb
 
-    cbid = _api.deprecate_privatize_attribute(
-        "3.3", alternative="mappable.colorbar_cid")
-    locator = _api.deprecate_privatize_attribute(
-        "3.3", alternative=".colorbar().locator")
-
-    def _config_axes(self):
-        """Make an axes patch and outline."""
-        ax = self
-        ax.set_navigate(False)
-        ax.axis[:].toggle(all=False)
-        b = self._default_label_on
-        ax.axis[self.orientation].toggle(all=b)
-
     def toggle_label(self, b):
-        self._default_label_on = b
         axis = self.axis[self.orientation]
         axis.toggle(ticklabels=b, label=b)
 
     def cla(self):
+        orientation = self.orientation
         super().cla()
-        self._config_axes()
+        self.orientation = orientation
 
 
+@_api.deprecated("3.5")
 class CbarAxes(CbarAxesBase, Axes):
     pass
 
 
+_cbaraxes_class_factory = cbook._make_class_factory(CbarAxesBase, "Cbar{}")
+
+
 class Grid:
     """
     A grid of Axes.
@@ -80,20 +62,18 @@ class Grid:
 
     _defaultAxesClass = Axes
 
-    @_api.delete_parameter("3.3", "add_all")
     def __init__(self, fig,
                  rect,
                  nrows_ncols,
                  ngrids=None,
                  direction="row",
                  axes_pad=0.02,
-                 add_all=True,
+                 *,
                  share_all=False,
                  share_x=True,
                  share_y=True,
                  label_mode="L",
                  axes_class=None,
-                 *,
                  aspect=False,
                  ):
         """
@@ -110,13 +90,11 @@ def __init__(self, fig,
             If not None, only the first *ngrids* axes in the grid are created.
         direction : {"row", "column"}, default: "row"
             Whether axes are created in row-major ("row by row") or
-            column-major order ("column by column").
+            column-major order ("column by column").  This also affects the
+            order in which axes are accessed using indexing (``grid[index]``).
         axes_pad : float or (float, float), default: 0.02
             Padding or (horizontal padding, vertical padding) between axes, in
             inches.
-        add_all : bool, default: True
-            Whether to add the axes to the figure using `.Figure.add_axes`.
-            This parameter is deprecated.
         share_all : bool, default: False
             Whether all axes share their x- and y-axis.  Overrides *share_x*
             and *share_y*.
@@ -143,7 +121,8 @@ def __init__(self, fig,
             ngrids = self._nrows * self._ncols
         else:
             if not 0 < ngrids <= self._nrows * self._ncols:
-                raise Exception("")
+                raise ValueError(
+                    "ngrids must be positive and not larger than nrows*ncols")
 
         self.ngrids = ngrids
 
@@ -167,7 +146,7 @@ def __init__(self, fig,
         elif len(rect) == 4:
             self._divider = Divider(fig, rect, **kw)
         else:
-            raise Exception("")
+            raise TypeError("Incorrect rect format")
 
         rect = self._divider.get_position()
 
@@ -181,16 +160,16 @@ def __init__(self, fig,
                 sharey = axes_array[row, 0] if share_y else None
             axes_array[row, col] = axes_class(
                 fig, rect, sharex=sharex, sharey=sharey)
-        self.axes_all = axes_array.ravel().tolist()
+        self.axes_all = axes_array.ravel(
+            order="C" if self._direction == "row" else "F").tolist()
         self.axes_column = axes_array.T.tolist()
         self.axes_row = axes_array.tolist()
         self.axes_llc = self.axes_column[0][-1]
 
         self._init_locators()
 
-        if add_all:
-            for ax in self.axes_all:
-                fig.add_axes(ax)
+        for ax in self.axes_all:
+            fig.add_axes(ax)
 
         self.set_label_mode(label_mode)
 
@@ -326,6 +305,7 @@ def set_axes_locator(self, locator):
     def get_axes_locator(self):
         return self._divider.get_locator()
 
+    @_api.deprecated("3.5")
     def get_vsize_hsize(self):
         return self._divider.get_vsize_hsize()
 
@@ -333,16 +313,13 @@ def get_vsize_hsize(self):
 class ImageGrid(Grid):
     # docstring inherited
 
-    _defaultCbarAxesClass = CbarAxes
-
-    @_api.delete_parameter("3.3", "add_all")
     def __init__(self, fig,
                  rect,
                  nrows_ncols,
                  ngrids=None,
                  direction="row",
                  axes_pad=0.02,
-                 add_all=True,
+                 *,
                  share_all=False,
                  aspect=True,
                  label_mode="L",
@@ -372,9 +349,6 @@ def __init__(self, fig,
         axes_pad : float or (float, float), default: 0.02in
             Padding or (horizontal padding, vertical padding) between axes, in
             inches.
-        add_all : bool, default: True
-            Whether to add the axes to the figure using `.Figure.add_axes`.
-            This parameter is deprecated.
         share_all : bool, default: False
             Whether all axes share their x- and y-axis.
         aspect : bool, default: True
@@ -403,28 +377,24 @@ def __init__(self, fig,
             to associated *cbar_axes*.
         axes_class : subclass of `matplotlib.axes.Axes`, default: None
         """
+        _api.check_in_list(["each", "single", "edge", None],
+                           cbar_mode=cbar_mode)
+        _api.check_in_list(["left", "right", "bottom", "top"],
+                           cbar_location=cbar_location)
         self._colorbar_mode = cbar_mode
         self._colorbar_location = cbar_location
         self._colorbar_pad = cbar_pad
         self._colorbar_size = cbar_size
         # The colorbar axes are created in _init_locators().
 
-        if add_all:
-            super().__init__(
-                fig, rect, nrows_ncols, ngrids,
-                direction=direction, axes_pad=axes_pad,
-                share_all=share_all, share_x=True, share_y=True, aspect=aspect,
-                label_mode=label_mode, axes_class=axes_class)
-        else:  # Only show deprecation in that case.
-            super().__init__(
-                fig, rect, nrows_ncols, ngrids,
-                direction=direction, axes_pad=axes_pad, add_all=add_all,
-                share_all=share_all, share_x=True, share_y=True, aspect=aspect,
-                label_mode=label_mode, axes_class=axes_class)
-
-        if add_all:
-            for ax in self.cbar_axes:
-                fig.add_axes(ax)
+        super().__init__(
+            fig, rect, nrows_ncols, ngrids,
+            direction=direction, axes_pad=axes_pad,
+            share_all=share_all, share_x=True, share_y=True, aspect=aspect,
+            label_mode=label_mode, axes_class=axes_class)
+
+        for ax in self.cbar_axes:
+            fig.add_axes(ax)
 
         if cbar_set_cax:
             if self._colorbar_mode == "single":
@@ -451,7 +421,7 @@ def _init_locators(self):
             else:
                 self._colorbar_pad = self._vert_pad_size.fixed_size
         self.cbar_axes = [
-            self._defaultCbarAxesClass(
+            _cbaraxes_class_factory(self._defaultAxesClass)(
                 self.axes_all[0].figure, self._divider.get_position(),
                 orientation=self._colorbar_location)
             for _ in range(self.ngrids)]
diff --git a/lib/mpl_toolkits/axes_grid1/axes_rgb.py b/lib/mpl_toolkits/axes_grid1/axes_rgb.py
index b8cdf4dde7f1..c94f443a8f83 100644
--- a/lib/mpl_toolkits/axes_grid1/axes_rgb.py
+++ b/lib/mpl_toolkits/axes_grid1/axes_rgb.py
@@ -1,12 +1,10 @@
 import numpy as np
 
-from matplotlib import _api
 from .axes_divider import make_axes_locatable, Size
 from .mpl_axes import Axes
 
 
-@_api.delete_parameter("3.3", "add_all")
-def make_rgb_axes(ax, pad=0.01, axes_class=None, add_all=True, **kwargs):
+def make_rgb_axes(ax, pad=0.01, axes_class=None, **kwargs):
     """
     Parameters
     ----------
@@ -48,19 +46,13 @@ def make_rgb_axes(ax, pad=0.01, axes_class=None, add_all=True, **kwargs):
 
         ax_rgb.append(ax1)
 
-    if add_all:
-        fig = ax.get_figure()
-        for ax1 in ax_rgb:
-            fig.add_axes(ax1)
+    fig = ax.get_figure()
+    for ax1 in ax_rgb:
+        fig.add_axes(ax1)
 
     return ax_rgb
 
 
-@_api.deprecated("3.3", alternative="ax.imshow(np.dstack([r, g, b]))")
-def imshow_rgb(ax, r, g, b, **kwargs):
-    return ax.imshow(np.dstack([r, g, b]), **kwargs)
-
-
 class RGBAxes:
     """
     4-panel imshow (RGB, R, G, B).
@@ -91,16 +83,12 @@ class RGBAxes:
 
     _defaultAxesClass = Axes
 
-    @_api.delete_parameter("3.3", "add_all")
-    def __init__(self, *args, pad=0, add_all=True, **kwargs):
+    def __init__(self, *args, pad=0, **kwargs):
         """
         Parameters
         ----------
         pad : float, default: 0
             fraction of the axes height to put as padding.
-        add_all : bool, default: True
-            Whether to add the {rgb, r, g, b} axes to the figure.
-            This parameter is deprecated.
         axes_class : matplotlib.axes.Axes
 
         *args
@@ -110,10 +98,7 @@ def __init__(self, *args, pad=0, add_all=True, **kwargs):
         """
         axes_class = kwargs.pop("axes_class", self._defaultAxesClass)
         self.RGB = ax = axes_class(*args, **kwargs)
-        if add_all:
-            ax.get_figure().add_axes(ax)
-        else:
-            kwargs["add_all"] = add_all  # only show deprecation in that case
+        ax.get_figure().add_axes(ax)
         self.R, self.G, self.B = make_rgb_axes(
             ax, pad=pad, axes_class=axes_class, **kwargs)
         # Set the line color and ticks for the axes.
@@ -121,13 +106,6 @@ def __init__(self, *args, pad=0, add_all=True, **kwargs):
             ax1.axis[:].line.set_color("w")
             ax1.axis[:].major_ticks.set_markeredgecolor("w")
 
-    @_api.deprecated("3.3")
-    def add_RGB_to_figure(self):
-        """Add red, green and blue axes to the RGB composite's axes figure."""
-        self.RGB.get_figure().add_axes(self.R)
-        self.RGB.get_figure().add_axes(self.G)
-        self.RGB.get_figure().add_axes(self.B)
-
     def imshow_rgb(self, r, g, b, **kwargs):
         """
         Create the four images {rgb, r, g, b}.
@@ -161,8 +139,3 @@ def imshow_rgb(self, r, g, b, **kwargs):
         im_g = self.G.imshow(G, **kwargs)
         im_b = self.B.imshow(B, **kwargs)
         return im_rgb, im_r, im_g, im_b
-
-
-@_api.deprecated("3.3", alternative="RGBAxes")
-class RGBAxesBase(RGBAxes):
-    pass
diff --git a/lib/mpl_toolkits/axes_grid1/axes_size.py b/lib/mpl_toolkits/axes_grid1/axes_size.py
index 87bc2419e1b4..d06681ef2cfd 100644
--- a/lib/mpl_toolkits/axes_grid1/axes_size.py
+++ b/lib/mpl_toolkits/axes_grid1/axes_size.py
@@ -16,7 +16,6 @@ class (or others) to determine the size of each axes. The unit
 
 
 class _Base:
-
     def __rmul__(self, other):
         return Fraction(other, self)
 
@@ -38,6 +37,8 @@ def get_size(self, renderer):
         return a_rel_size + b_rel_size, a_abs_size + b_abs_size
 
 
+@_api.deprecated(
+    "3.6", alternative="sum(sizes, start=Fixed(0))")
 class AddList(_Base):
     def __init__(self, add_list):
         self._list = add_list
@@ -203,6 +204,7 @@ def get_size(self, renderer):
             return rel_size, abs_size
 
 
+@_api.deprecated("3.6", alternative="size + pad")
 class Padded(_Base):
     """
     Return a instance where the absolute part of *size* is
@@ -237,6 +239,7 @@ def from_any(size, fraction_ref=None):
     raise ValueError("Unknown format")
 
 
+@_api.deprecated("3.6")
 class SizeFromFunc(_Base):
     def __init__(self, func):
         self._func = func
@@ -251,6 +254,7 @@ def get_size(self, renderer):
         return rel_size, abs_size
 
 
+@_api.deprecated("3.6")
 class GetExtentHelper:
     _get_func_map = {
         "left":   lambda self, axes_bbox: axes_bbox.xmin - self.xmin,
@@ -270,3 +274,31 @@ def __call__(self, renderer):
                        ax.bbox)
               for ax in self._ax_list]
         return max(vl)
+
+
+class _AxesDecorationsSize(_Base):
+    """
+    Fixed size, corresponding to the size of decorations on a given Axes side.
+    """
+
+    _get_size_map = {
+        "left":   lambda tight_bb, axes_bb: axes_bb.xmin - tight_bb.xmin,
+        "right":  lambda tight_bb, axes_bb: tight_bb.xmax - axes_bb.xmax,
+        "bottom": lambda tight_bb, axes_bb: axes_bb.ymin - tight_bb.ymin,
+        "top":    lambda tight_bb, axes_bb: tight_bb.ymax - axes_bb.ymax,
+    }
+
+    def __init__(self, ax, direction):
+        self._get_size = _api.check_getitem(
+            self._get_size_map, direction=direction)
+        self._ax_list = [ax] if isinstance(ax, Axes) else ax
+
+    def get_size(self, renderer):
+        sz = max([
+            self._get_size(ax.get_tightbbox(renderer, call_axes_locator=False),
+                           ax.bbox)
+            for ax in self._ax_list])
+        dpi = renderer.points_to_pixels(72)
+        abs_size = sz / dpi
+        rel_size = 0
+        return rel_size, abs_size
diff --git a/lib/mpl_toolkits/axes_grid1/inset_locator.py b/lib/mpl_toolkits/axes_grid1/inset_locator.py
index 4af827e60f47..01c14e9baa4a 100644
--- a/lib/mpl_toolkits/axes_grid1/inset_locator.py
+++ b/lib/mpl_toolkits/axes_grid1/inset_locator.py
@@ -2,7 +2,7 @@
 A collection of functions and objects for creating or placing inset axes.
 """
 
-from matplotlib import _api, docstring
+from matplotlib import _api, _docstring
 from matplotlib.offsetbox import AnchoredOffsetbox
 from matplotlib.patches import Patch, Rectangle
 from matplotlib.path import Path
@@ -14,7 +14,7 @@
 
 
 class InsetPosition:
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def __init__(self, parent, lbwh):
         """
         An object for positioning an inset axes.
@@ -126,7 +126,7 @@ def __init__(self, parent_axes, zoom, loc,
             bbox_transform=bbox_transform)
 
     def get_extent(self, renderer):
-        bb = TransformedBbox(self.axes.viewLim, self.parent_axes.transData)
+        bb = self.parent_axes.transData.transform_bbox(self.axes.viewLim)
         fontsize = renderer.points_to_pixels(self.prop.get_size_in_points())
         pad = self.pad * fontsize
         return (abs(bb.width * self.zoom) + 2 * pad,
@@ -135,7 +135,7 @@ def get_extent(self, renderer):
 
 
 class BboxPatch(Patch):
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def __init__(self, bbox, **kwargs):
         """
         Patch showing the shape bounded by a Bbox.
@@ -148,7 +148,7 @@ def __init__(self, bbox, **kwargs):
         **kwargs
             Patch properties. Valid arguments include:
 
-            %(Patch_kwdoc)s
+            %(Patch:kwdoc)s
         """
         if "transform" in kwargs:
             raise ValueError("transform should not be set")
@@ -160,32 +160,15 @@ def __init__(self, bbox, **kwargs):
     def get_path(self):
         # docstring inherited
         x0, y0, x1, y1 = self.bbox.extents
-        return Path([(x0, y0), (x1, y0), (x1, y1), (x0, y1), (x0, y0)],
-                    closed=True)
+        return Path._create_closed([(x0, y0), (x1, y0), (x1, y1), (x0, y1)])
 
 
 class BboxConnector(Patch):
     @staticmethod
     def get_bbox_edge_pos(bbox, loc):
         """
-        Helper function to obtain the location of a corner of a bbox
-
-        Parameters
-        ----------
-        bbox : `matplotlib.transforms.Bbox`
-
-        loc : {1, 2, 3, 4}
-            Corner of *bbox*. Valid values are::
-
-                'upper right'  : 1,
-                'upper left'   : 2,
-                'lower left'   : 3,
-                'lower right'  : 4
-
-        Returns
-        -------
-        x, y : float
-            Coordinates of the corner specified by *loc*.
+        Return the ``(x, y)`` coordinates of corner *loc* of *bbox*; parameters
+        behave as documented for the `.BboxConnector` constructor.
         """
         x0, y0, x1, y1 = bbox.extents
         if loc == 1:
@@ -200,35 +183,9 @@ def get_bbox_edge_pos(bbox, loc):
     @staticmethod
     def connect_bbox(bbox1, bbox2, loc1, loc2=None):
         """
-        Helper function to obtain a Path from one bbox to another.
-
-        Parameters
-        ----------
-        bbox1, bbox2 : `matplotlib.transforms.Bbox`
-            Bounding boxes to connect.
-
-        loc1 : {1, 2, 3, 4}
-            Corner of *bbox1* to use. Valid values are::
-
-                'upper right'  : 1,
-                'upper left'   : 2,
-                'lower left'   : 3,
-                'lower right'  : 4
-
-        loc2 : {1, 2, 3, 4}, optional
-            Corner of *bbox2* to use. If None, defaults to *loc1*.
-            Valid values are::
-
-                'upper right'  : 1,
-                'upper left'   : 2,
-                'lower left'   : 3,
-                'lower right'  : 4
-
-        Returns
-        -------
-        path : `matplotlib.path.Path`
-            A line segment from the *loc1* corner of *bbox1* to the *loc2*
-            corner of *bbox2*.
+        Construct a `.Path` connecting corner *loc1* of *bbox1* to corner
+        *loc2* of *bbox2*, where parameters behave as documented as for the
+        `.BboxConnector` constructor.
         """
         if isinstance(bbox1, Rectangle):
             bbox1 = TransformedBbox(Bbox.unit(), bbox1.get_transform())
@@ -240,7 +197,7 @@ def connect_bbox(bbox1, bbox2, loc1, loc2=None):
         x2, y2 = BboxConnector.get_bbox_edge_pos(bbox2, loc2)
         return Path([[x1, y1], [x2, y2]])
 
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def __init__(self, bbox1, bbox2, loc1, loc2=None, **kwargs):
         """
         Connect two bboxes with a straight line.
@@ -250,27 +207,20 @@ def __init__(self, bbox1, bbox2, loc1, loc2=None, **kwargs):
         bbox1, bbox2 : `matplotlib.transforms.Bbox`
             Bounding boxes to connect.
 
-        loc1 : {1, 2, 3, 4}
-            Corner of *bbox1* to draw the line. Valid values are::
+        loc1, loc2 : {1, 2, 3, 4}
+            Corner of *bbox1* and *bbox2* to draw the line. Valid values are::
 
                 'upper right'  : 1,
                 'upper left'   : 2,
                 'lower left'   : 3,
                 'lower right'  : 4
 
-        loc2 : {1, 2, 3, 4}, optional
-            Corner of *bbox2* to draw the line. If None, defaults to *loc1*.
-            Valid values are::
-
-                'upper right'  : 1,
-                'upper left'   : 2,
-                'lower left'   : 3,
-                'lower right'  : 4
+            *loc2* is optional and defaults to *loc1*.
 
         **kwargs
             Patch properties for the line drawn. Valid arguments include:
 
-            %(Patch_kwdoc)s
+            %(Patch:kwdoc)s
         """
         if "transform" in kwargs:
             raise ValueError("transform should not be set")
@@ -293,7 +243,7 @@ def get_path(self):
 
 
 class BboxConnectorPatch(BboxConnector):
-    @docstring.dedent_interpd
+    @_docstring.dedent_interpd
     def __init__(self, bbox1, bbox2, loc1a, loc2a, loc1b, loc2b, **kwargs):
         """
         Connect two bboxes with a quadrilateral.
@@ -308,18 +258,10 @@ def __init__(self, bbox1, bbox2, loc1a, loc2a, loc1b, loc2b, **kwargs):
         bbox1, bbox2 : `matplotlib.transforms.Bbox`
             Bounding boxes to connect.
 
-        loc1a, loc2a : {1, 2, 3, 4}
-            Corners of *bbox1* and *bbox2* to draw the first line.
-            Valid values are::
-
-                'upper right'  : 1,
-                'upper left'   : 2,
-                'lower left'   : 3,
-                'lower right'  : 4
-
-        loc1b, loc2b : {1, 2, 3, 4}
-            Corners of *bbox1* and *bbox2* to draw the second line.
-            Valid values are::
+        loc1a, loc2a, loc1b, loc2b : {1, 2, 3, 4}
+            The first line connects corners *loc1a* of *bbox1* and *loc2a* of
+            *bbox2*; the second line connects corners *loc1b* of *bbox1* and
+            *loc2b* of *bbox2*.  Valid values are::
 
                 'upper right'  : 1,
                 'upper left'   : 2,
@@ -329,7 +271,7 @@ def __init__(self, bbox1, bbox2, loc1a, loc2a, loc1b, loc2b, **kwargs):
         **kwargs
             Patch properties for the line drawn:
 
-            %(Patch_kwdoc)s
+            %(Patch:kwdoc)s
         """
         if "transform" in kwargs:
             raise ValueError("transform should not be set")
@@ -347,16 +289,15 @@ def get_path(self):
 
 
 def _add_inset_axes(parent_axes, inset_axes):
-    """Helper function to add an inset axes and disable navigation in it"""
+    """Helper function to add an inset axes and disable navigation in it."""
     parent_axes.figure.add_axes(inset_axes)
     inset_axes.set_navigate(False)
 
 
-@docstring.dedent_interpd
+@_docstring.dedent_interpd
 def inset_axes(parent_axes, width, height, loc='upper right',
                bbox_to_anchor=None, bbox_transform=None,
-               axes_class=None,
-               axes_kwargs=None,
+               axes_class=None, axes_kwargs=None,
                borderpad=0.5):
     """
     Create an inset axes with a given width and height.
@@ -364,7 +305,7 @@ def inset_axes(parent_axes, width, height, loc='upper right',
     Both sizes used can be specified either in inches or percentage.
     For example,::
 
-        inset_axes(parent_axes, width='40%%', height='30%%', loc=3)
+        inset_axes(parent_axes, width='40%%', height='30%%', loc='lower left')
 
     creates in inset axes in the lower left corner of *parent_axes* which spans
     over 30%% in height and 40%% in width of the *parent_axes*. Since the usage
@@ -404,19 +345,13 @@ def inset_axes(parent_axes, width, height, loc='upper right',
         are relative to the parent_axes. Otherwise they are to be understood
         relative to the bounding box provided via *bbox_to_anchor*.
 
-    loc : int or str, default: 1
-        Location to place the inset axes. The valid locations are::
-
-            'upper right'  : 1,
-            'upper left'   : 2,
-            'lower left'   : 3,
-            'lower right'  : 4,
-            'right'        : 5,
-            'center left'  : 6,
-            'center right' : 7,
-            'lower center' : 8,
-            'upper center' : 9,
-            'center'       : 10
+    loc : str, default: 'upper right'
+        Location to place the inset axes.  Valid locations are
+        'upper left', 'upper center', 'upper right',
+        'center left', 'center', 'center right',
+        'lower left', 'lower center, 'lower right'.
+        For backward compatibility, numeric values are accepted as well.
+        See the parameter *loc* of `.Legend` for details.
 
     bbox_to_anchor : tuple or `matplotlib.transforms.BboxBase`, optional
         Bbox that the inset axes will be anchored to. If None,
@@ -441,15 +376,14 @@ def inset_axes(parent_axes, width, height, loc='upper right',
         You may provide *bbox_to_anchor* in some normalized coordinate,
         and give an appropriate transform (e.g., *parent_axes.transAxes*).
 
-    axes_class : `matplotlib.axes.Axes` type, optional
-        If specified, the inset axes created will be created with this class's
-        constructor.
+    axes_class : `matplotlib.axes.Axes` type, default: `.HostAxes`
+        The type of the newly created inset axes.
 
     axes_kwargs : dict, optional
-        Keyworded arguments to pass to the constructor of the inset axes.
+        Keyword arguments to pass to the constructor of the inset axes.
         Valid arguments include:
 
-        %(Axes_kwdoc)s
+        %(Axes:kwdoc)s
 
     borderpad : float, default: 0.5
         Padding between inset axes and the bbox_to_anchor.
@@ -464,12 +398,10 @@ def inset_axes(parent_axes, width, height, loc='upper right',
 
     if axes_class is None:
         axes_class = HostAxes
-
     if axes_kwargs is None:
-        inset_axes = axes_class(parent_axes.figure, parent_axes.get_position())
-    else:
-        inset_axes = axes_class(parent_axes.figure, parent_axes.get_position(),
-                                **axes_kwargs)
+        axes_kwargs = {}
+    inset_axes = axes_class(parent_axes.figure, parent_axes.get_position(),
+                            **axes_kwargs)
 
     if bbox_transform in [parent_axes.transAxes,
                           parent_axes.figure.transFigure]:
@@ -502,11 +434,10 @@ def inset_axes(parent_axes, width, height, loc='upper right',
     return inset_axes
 
 
-@docstring.dedent_interpd
+@_docstring.dedent_interpd
 def zoomed_inset_axes(parent_axes, zoom, loc='upper right',
                       bbox_to_anchor=None, bbox_transform=None,
-                      axes_class=None,
-                      axes_kwargs=None,
+                      axes_class=None, axes_kwargs=None,
                       borderpad=0.5):
     """
     Create an anchored inset axes by scaling a parent axes. For usage, also see
@@ -518,23 +449,17 @@ def zoomed_inset_axes(parent_axes, zoom, loc='upper right',
         Axes to place the inset axes.
 
     zoom : float
-        Scaling factor of the data axes. *zoom* > 1 will enlargen the
+        Scaling factor of the data axes. *zoom* > 1 will enlarge the
         coordinates (i.e., "zoomed in"), while *zoom* < 1 will shrink the
         coordinates (i.e., "zoomed out").
 
-    loc : int or str, default: 'upper right'
-        Location to place the inset axes. The valid locations are::
-
-            'upper right'  : 1,
-            'upper left'   : 2,
-            'lower left'   : 3,
-            'lower right'  : 4,
-            'right'        : 5,
-            'center left'  : 6,
-            'center right' : 7,
-            'lower center' : 8,
-            'upper center' : 9,
-            'center'       : 10
+    loc : str, default: 'upper right'
+        Location to place the inset axes.  Valid locations are
+        'upper left', 'upper center', 'upper right',
+        'center left', 'center', 'center right',
+        'lower left', 'lower center, 'lower right'.
+        For backward compatibility, numeric values are accepted as well.
+        See the parameter *loc* of `.Legend` for details.
 
     bbox_to_anchor : tuple or `matplotlib.transforms.BboxBase`, optional
         Bbox that the inset axes will be anchored to. If None,
@@ -558,15 +483,14 @@ def zoomed_inset_axes(parent_axes, zoom, loc='upper right',
         *bbox_to_anchor* will use *parent_axes.bbox*, the units of which are
         in display (pixel) coordinates.
 
-    axes_class : `matplotlib.axes.Axes` type, optional
-        If specified, the inset axes created will be created with this class's
-        constructor.
+    axes_class : `matplotlib.axes.Axes` type, default: `.HostAxes`
+        The type of the newly created inset axes.
 
     axes_kwargs : dict, optional
-        Keyworded arguments to pass to the constructor of the inset axes.
+        Keyword arguments to pass to the constructor of the inset axes.
         Valid arguments include:
 
-        %(Axes_kwdoc)s
+        %(Axes:kwdoc)s
 
     borderpad : float, default: 0.5
         Padding between inset axes and the bbox_to_anchor.
@@ -581,12 +505,10 @@ def zoomed_inset_axes(parent_axes, zoom, loc='upper right',
 
     if axes_class is None:
         axes_class = HostAxes
-
     if axes_kwargs is None:
-        inset_axes = axes_class(parent_axes.figure, parent_axes.get_position())
-    else:
-        inset_axes = axes_class(parent_axes.figure, parent_axes.get_position(),
-                                **axes_kwargs)
+        axes_kwargs = {}
+    inset_axes = axes_class(parent_axes.figure, parent_axes.get_position(),
+                            **axes_kwargs)
 
     axes_locator = AnchoredZoomLocator(parent_axes, zoom=zoom, loc=loc,
                                        bbox_to_anchor=bbox_to_anchor,
@@ -599,7 +521,23 @@ def zoomed_inset_axes(parent_axes, zoom, loc='upper right',
     return inset_axes
 
 
-@docstring.dedent_interpd
+class _TransformedBboxWithCallback(TransformedBbox):
+    """
+    Variant of `.TransformBbox` which calls *callback* before returning points.
+
+    Used by `.mark_inset` to unstale the parent axes' viewlim as needed.
+    """
+
+    def __init__(self, *args, callback, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._callback = callback
+
+    def get_points(self):
+        self._callback()
+        return super().get_points()
+
+
+@_docstring.dedent_interpd
 def mark_inset(parent_axes, inset_axes, loc1, loc2, **kwargs):
     """
     Draw a box to mark the location of an area represented by an inset axes.
@@ -623,7 +561,7 @@ def mark_inset(parent_axes, inset_axes, loc1, loc2, **kwargs):
     **kwargs
         Patch properties for the lines and box drawn:
 
-        %(Patch_kwdoc)s
+        %(Patch:kwdoc)s
 
     Returns
     -------
@@ -633,7 +571,9 @@ def mark_inset(parent_axes, inset_axes, loc1, loc2, **kwargs):
     p1, p2 : `matplotlib.patches.Patch`
         The patches connecting two corners of the inset axes and its area.
     """
-    rect = TransformedBbox(inset_axes.viewLim, parent_axes.transData)
+    rect = _TransformedBboxWithCallback(
+        inset_axes.viewLim, parent_axes.transData,
+        callback=parent_axes._unstale_viewLim)
 
     if 'fill' in kwargs:
         pp = BboxPatch(rect, **kwargs)
diff --git a/lib/mpl_toolkits/axes_grid1/mpl_axes.py b/lib/mpl_toolkits/axes_grid1/mpl_axes.py
index 3bb73770a07b..51c8748758cb 100644
--- a/lib/mpl_toolkits/axes_grid1/mpl_axes.py
+++ b/lib/mpl_toolkits/axes_grid1/mpl_axes.py
@@ -40,9 +40,14 @@ def __getitem__(self, k):
         def __call__(self, *v, **kwargs):
             return maxes.Axes.axis(self.axes, *v, **kwargs)
 
-    def _init_axis_artists(self, axes=None):
-        if axes is None:
-            axes = self
+    @property
+    def axis(self):
+        return self._axislines
+
+    def clear(self):
+        # docstring inherited
+        super().clear()
+        # Init axis artists.
         self._axislines = self.AxisDict(self)
         self._axislines.update(
             bottom=SimpleAxisArtist(self.xaxis, 1, self.spines["bottom"]),
@@ -50,14 +55,6 @@ def _init_axis_artists(self, axes=None):
             left=SimpleAxisArtist(self.yaxis, 1, self.spines["left"]),
             right=SimpleAxisArtist(self.yaxis, 2, self.spines["right"]))
 
-    @property
-    def axis(self):
-        return self._axislines
-
-    def cla(self):
-        super().cla()
-        self._init_axis_artists()
-
 
 class SimpleAxisArtist(Artist):
     def __init__(self, axis, axisnum, spine):
@@ -115,14 +112,11 @@ def toggle(self, all=None, ticks=None, ticklabels=None, label=None):
         if label is not None:
             _label = label
 
-        tickOn = "tick%dOn" % self._axisnum
-        labelOn = "label%dOn" % self._axisnum
-
         if _ticks is not None:
-            tickparam = {tickOn: _ticks}
+            tickparam = {f"tick{self._axisnum}On": _ticks}
             self._axis.set_tick_params(**tickparam)
         if _ticklabels is not None:
-            tickparam = {labelOn: _ticklabels}
+            tickparam = {f"label{self._axisnum}On": _ticklabels}
             self._axis.set_tick_params(**tickparam)
 
         if _label is not None:
diff --git a/lib/mpl_toolkits/axes_grid1/parasite_axes.py b/lib/mpl_toolkits/axes_grid1/parasite_axes.py
index b7ee444077f7..b959d1f48a49 100644
--- a/lib/mpl_toolkits/axes_grid1/parasite_axes.py
+++ b/lib/mpl_toolkits/axes_grid1/parasite_axes.py
@@ -1,7 +1,6 @@
-import functools
-
-from matplotlib import _api
+from matplotlib import _api, cbook
 import matplotlib.artist as martist
+import matplotlib.image as mimage
 import matplotlib.transforms as mtransforms
 from matplotlib.axes import subplot_class_factory
 from matplotlib.transforms import Bbox
@@ -18,15 +17,25 @@ def __init__(self, parent_axes, aux_transform=None,
         kwargs["frameon"] = False
         super().__init__(parent_axes.figure, parent_axes._position, **kwargs)
 
-    def cla(self):
-        super().cla()
+    def clear(self):
+        super().clear()
         martist.setp(self.get_children(), visible=False)
         self._get_lines = self._parent_axes._get_lines
 
+    @_api.deprecated("3.5")
     def get_images_artists(self):
-        artists = {a for a in self.get_children() if a.get_visible()}
-        images = {a for a in self.images if a.get_visible()}
-        return list(images), list(artists - images)
+        artists = []
+        images = []
+
+        for a in self.get_children():
+            if not a.get_visible():
+                continue
+            if isinstance(a, mimage.AxesImage):
+                images.append(a)
+            else:
+                artists.append(a)
+
+        return images, artists
 
     def pick(self, mouseevent):
         # This most likely goes to Artist.pick (depending on axes_class given
@@ -60,10 +69,6 @@ def set_viewlim_mode(self, mode):
     def get_viewlim_mode(self):
         return self._viewlim_mode
 
-    @_api.deprecated("3.4", alternative="apply_aspect")
-    def update_viewlim(self):
-        return self._update_viewlim
-
     def _update_viewlim(self):  # Inline after deprecation elapses.
         viewlim = self._parent_axes.viewLim.frozen()
         mode = self.get_viewlim_mode()
@@ -84,92 +89,11 @@ def apply_aspect(self, position=None):
     # end of aux_transform support
 
 
-@functools.lru_cache(None)
-def parasite_axes_class_factory(axes_class=None):
-    if axes_class is None:
-        _api.warn_deprecated(
-            "3.3", message="Support for passing None to "
-            "parasite_axes_class_factory is deprecated since %(since)s and "
-            "will be removed %(removal)s; explicitly pass the default Axes "
-            "class instead.")
-        axes_class = Axes
-
-    return type("%sParasite" % axes_class.__name__,
-                (ParasiteAxesBase, axes_class), {})
-
-
+parasite_axes_class_factory = cbook._make_class_factory(
+    ParasiteAxesBase, "{}Parasite")
 ParasiteAxes = parasite_axes_class_factory(Axes)
 
 
-@_api.deprecated("3.4", alternative="ParasiteAxesBase")
-class ParasiteAxesAuxTransBase:
-    def __init__(self, parent_axes, aux_transform, viewlim_mode=None,
-                 **kwargs):
-        # Explicit wrapper for deprecation to work.
-        super().__init__(parent_axes, aux_transform,
-                         viewlim_mode=viewlim_mode, **kwargs)
-
-    def _set_lim_and_transforms(self):
-        self.transAxes = self._parent_axes.transAxes
-        self.transData = self.transAux + self._parent_axes.transData
-        self._xaxis_transform = mtransforms.blended_transform_factory(
-            self.transData, self.transAxes)
-        self._yaxis_transform = mtransforms.blended_transform_factory(
-            self.transAxes, self.transData)
-
-    def set_viewlim_mode(self, mode):
-        _api.check_in_list([None, "equal", "transform"], mode=mode)
-        self._viewlim_mode = mode
-
-    def get_viewlim_mode(self):
-        return self._viewlim_mode
-
-    @_api.deprecated("3.4", alternative="apply_aspect")
-    def update_viewlim(self):
-        return self._update_viewlim()
-
-    def _update_viewlim(self):  # Inline after deprecation elapses.
-        viewlim = self._parent_axes.viewLim.frozen()
-        mode = self.get_viewlim_mode()
-        if mode is None:
-            pass
-        elif mode == "equal":
-            self.axes.viewLim.set(viewlim)
-        elif mode == "transform":
-            self.axes.viewLim.set(
-                viewlim.transformed(self.transAux.inverted()))
-        else:
-            _api.check_in_list([None, "equal", "transform"], mode=mode)
-
-    def apply_aspect(self, position=None):
-        self._update_viewlim()
-        super().apply_aspect()
-
-
-@_api.deprecated("3.4", alternative="parasite_axes_class_factory")
-@functools.lru_cache(None)
-def parasite_axes_auxtrans_class_factory(axes_class=None):
-    if axes_class is None:
-        _api.warn_deprecated(
-            "3.3", message="Support for passing None to "
-            "parasite_axes_auxtrans_class_factory is deprecated since "
-            "%(since)s and will be removed %(removal)s; explicitly pass the "
-            "default ParasiteAxes class instead.")
-        parasite_axes_class = ParasiteAxes
-    elif not issubclass(axes_class, ParasiteAxesBase):
-        parasite_axes_class = parasite_axes_class_factory(axes_class)
-    else:
-        parasite_axes_class = axes_class
-    return type("%sParasiteAuxTrans" % parasite_axes_class.__name__,
-                (ParasiteAxesAuxTransBase, parasite_axes_class),
-                {'name': 'parasite_axes'})
-
-
-# Also deprecated.
-with _api.suppress_matplotlib_deprecation_warning():
-    ParasiteAxesAuxTrans = parasite_axes_auxtrans_class_factory(ParasiteAxes)
-
-
 class HostAxesBase:
     def __init__(self, *args, **kwargs):
         self.parasites = []
@@ -195,44 +119,29 @@ def get_aux_axes(self, tr=None, viewlim_mode="equal", axes_class=Axes):
         ax2._remove_method = self.parasites.remove
         return ax2
 
-    def _get_legend_handles(self, legend_handler_map=None):
-        all_handles = super()._get_legend_handles()
-        for ax in self.parasites:
-            all_handles.extend(ax._get_legend_handles(legend_handler_map))
-        return all_handles
-
     def draw(self, renderer):
+        orig_children_len = len(self._children)
 
-        orig_artists = list(self.artists)
-        orig_images = list(self.images)
-
-        if hasattr(self, "get_axes_locator"):
-            locator = self.get_axes_locator()
-            if locator:
-                pos = locator(self, renderer)
-                self.set_position(pos, which="active")
-                self.apply_aspect(pos)
-            else:
-                self.apply_aspect()
+        locator = self.get_axes_locator()
+        if locator:
+            pos = locator(self, renderer)
+            self.set_position(pos, which="active")
+            self.apply_aspect(pos)
         else:
             self.apply_aspect()
 
         rect = self.get_position()
-
         for ax in self.parasites:
             ax.apply_aspect(rect)
-            images, artists = ax.get_images_artists()
-            self.images.extend(images)
-            self.artists.extend(artists)
+            self._children.extend(ax.get_children())
 
         super().draw(renderer)
-        self.artists = orig_artists
-        self.images = orig_images
+        self._children = self._children[:orig_children_len]
 
-    def cla(self):
+    def clear(self):
         for ax in self.parasites:
-            ax.cla()
-        super().cla()
+            ax.clear()
+        super().clear()
 
     def pick(self, mouseevent):
         super().pick(mouseevent)
@@ -290,7 +199,7 @@ def _add_twin_axes(self, axes_class, **kwargs):
         *kwargs* are forwarded to the parasite axes constructor.
         """
         if axes_class is None:
-            axes_class = self._get_base_axes()
+            axes_class = self._base_axes_class
         ax = parasite_axes_class_factory(axes_class)(self, **kwargs)
         self.parasites.append(ax)
         ax._remove_method = self._remove_any_twin
@@ -306,7 +215,7 @@ def _remove_any_twin(self, ax):
         self.axis[tuple(restore)].set_visible(True)
         self.axis[tuple(restore)].toggle(ticklabels=False, label=False)
 
-    def get_tightbbox(self, renderer, call_axes_locator=True,
+    def get_tightbbox(self, renderer=None, call_axes_locator=True,
                       bbox_extra_artists=None):
         bbs = [
             *[ax.get_tightbbox(renderer, call_axes_locator=call_axes_locator)
@@ -317,21 +226,10 @@ def get_tightbbox(self, renderer, call_axes_locator=True,
         return Bbox.union([b for b in bbs if b.width != 0 or b.height != 0])
 
 
-@functools.lru_cache(None)
-def host_axes_class_factory(axes_class=None):
-    if axes_class is None:
-        _api.warn_deprecated(
-            "3.3", message="Support for passing None to host_axes_class is "
-            "deprecated since %(since)s and will be removed %(removed)s; "
-            "explicitly pass the default Axes class instead.")
-        axes_class = Axes
-
-    def _get_base_axes(self):
-        return axes_class
-
-    return type("%sHostAxes" % axes_class.__name__,
-                (HostAxesBase, axes_class),
-                {'_get_base_axes': _get_base_axes})
+host_axes_class_factory = cbook._make_class_factory(
+    HostAxesBase, "{}HostAxes", "_base_axes_class")
+HostAxes = host_axes_class_factory(Axes)
+SubplotHost = subplot_class_factory(HostAxes)
 
 
 def host_subplot_class_factory(axes_class):
@@ -340,10 +238,6 @@ def host_subplot_class_factory(axes_class):
     return subplot_host_class
 
 
-HostAxes = host_axes_class_factory(Axes)
-SubplotHost = subplot_class_factory(HostAxes)
-
-
 def host_axes(*args, axes_class=Axes, figure=None, **kwargs):
     """
     Create axes that can act as a hosts to parasitic axes.
@@ -363,7 +257,6 @@ def host_axes(*args, axes_class=Axes, figure=None, **kwargs):
         figure = plt.gcf()
     ax = host_axes_class(figure, *args, **kwargs)
     figure.add_axes(ax)
-    plt.draw_if_interactive()
     return ax
 
 
@@ -386,5 +279,4 @@ def host_subplot(*args, axes_class=Axes, figure=None, **kwargs):
         figure = plt.gcf()
     ax = host_subplot_class(figure, *args, **kwargs)
     figure.add_subplot(ax)
-    plt.draw_if_interactive()
     return ax
diff --git a/lib/mpl_toolkits/axisartist/__init__.py b/lib/mpl_toolkits/axisartist/__init__.py
index 0699b0165d84..f6d4fe9252dd 100644
--- a/lib/mpl_toolkits/axisartist/__init__.py
+++ b/lib/mpl_toolkits/axisartist/__init__.py
@@ -1,4 +1,3 @@
-from matplotlib import _api
 from .axislines import (
     Axes, AxesZero, AxisArtistHelper, AxisArtistHelperRectlinear,
     GridHelperBase, GridHelperRectlinear, Subplot, SubplotZero)
@@ -7,11 +6,9 @@
 from .floating_axes import FloatingAxes, FloatingSubplot
 from mpl_toolkits.axes_grid1.parasite_axes import (
     host_axes_class_factory, parasite_axes_class_factory,
-    parasite_axes_auxtrans_class_factory, subplot_class_factory)
+    subplot_class_factory)
 
 
 ParasiteAxes = parasite_axes_class_factory(Axes)
 HostAxes = host_axes_class_factory(Axes)
 SubplotHost = subplot_class_factory(HostAxes)
-with _api.suppress_matplotlib_deprecation_warning():
-    ParasiteAxesAuxTrans = parasite_axes_auxtrans_class_factory(ParasiteAxes)
diff --git a/lib/mpl_toolkits/axisartist/angle_helper.py b/lib/mpl_toolkits/axisartist/angle_helper.py
index 041bf443b766..7f49a657ba52 100644
--- a/lib/mpl_toolkits/axisartist/angle_helper.py
+++ b/lib/mpl_toolkits/axisartist/angle_helper.py
@@ -1,7 +1,6 @@
 import numpy as np
 import math
 
-from matplotlib import _api
 from mpl_toolkits.axisartist.grid_finder import ExtremeFinderSimple
 
 
@@ -141,20 +140,10 @@ def select_step360(v1, v2, nv, include_last=True, threshold_factor=3600):
 
 
 class LocatorBase:
-    @_api.rename_parameter("3.3", "den", "nbins")
     def __init__(self, nbins, include_last=True):
         self.nbins = nbins
         self._include_last = include_last
 
-    @_api.deprecated("3.3", alternative="nbins")
-    @property
-    def den(self):
-        return self.nbins
-
-    @den.setter
-    def den(self, v):
-        self.nbins = v
-
     def set_params(self, nbins=None):
         if nbins is not None:
             self.nbins = int(nbins)
diff --git a/lib/mpl_toolkits/axisartist/axes_divider.py b/lib/mpl_toolkits/axisartist/axes_divider.py
index 3b177838f896..a01d4e27df93 100644
--- a/lib/mpl_toolkits/axisartist/axes_divider.py
+++ b/lib/mpl_toolkits/axisartist/axes_divider.py
@@ -1,2 +1,2 @@
-from mpl_toolkits.axes_grid1.axes_divider import (
+from mpl_toolkits.axes_grid1.axes_divider import (  # noqa
     Divider, AxesLocator, SubplotDivider, AxesDivider, make_axes_locatable)
diff --git a/lib/mpl_toolkits/axisartist/axes_grid.py b/lib/mpl_toolkits/axisartist/axes_grid.py
index 15c715b72896..d90097228329 100644
--- a/lib/mpl_toolkits/axisartist/axes_grid.py
+++ b/lib/mpl_toolkits/axisartist/axes_grid.py
@@ -1,7 +1,9 @@
+from matplotlib import _api
 import mpl_toolkits.axes_grid1.axes_grid as axes_grid_orig
 from .axislines import Axes
 
 
+@_api.deprecated("3.5")
 class CbarAxes(axes_grid_orig.CbarAxesBase, Axes):
     pass
 
@@ -12,7 +14,6 @@ class Grid(axes_grid_orig.Grid):
 
 class ImageGrid(axes_grid_orig.ImageGrid):
     _defaultAxesClass = Axes
-    _defaultCbarAxesClass = CbarAxes
 
 
 AxesGrid = ImageGrid
diff --git a/lib/mpl_toolkits/axisartist/axes_rgb.py b/lib/mpl_toolkits/axisartist/axes_rgb.py
index 429843f6f4b9..22d778654b25 100644
--- a/lib/mpl_toolkits/axisartist/axes_rgb.py
+++ b/lib/mpl_toolkits/axisartist/axes_rgb.py
@@ -1,5 +1,5 @@
-from mpl_toolkits.axes_grid1.axes_rgb import (
-    make_rgb_axes, imshow_rgb, RGBAxes as _RGBAxes)
+from mpl_toolkits.axes_grid1.axes_rgb import (  # noqa
+    make_rgb_axes, RGBAxes as _RGBAxes)
 from .axislines import Axes
 
 
diff --git a/lib/mpl_toolkits/axisartist/axis_artist.py b/lib/mpl_toolkits/axisartist/axis_artist.py
index ead9f3d22b4e..986a1c0cca0e 100644
--- a/lib/mpl_toolkits/axisartist/axis_artist.py
+++ b/lib/mpl_toolkits/axisartist/axis_artist.py
@@ -1,39 +1,24 @@
 """
-axis_artist.py module provides axis-related artists. They are
+The :mod:`.axis_artist` module implements custom artists to draw axis elements
+(axis lines and labels, tick lines and labels, grid lines).
 
-* axis line
-* tick lines
-* tick labels
-* axis label
-* grid lines
+Axis lines and labels and tick lines and labels are managed by the `AxisArtist`
+class; grid lines are managed by the `GridlinesCollection` class.
 
-The main artist classes are `AxisArtist` and `GridlinesCollection`. While
-`GridlinesCollection` is responsible for drawing grid lines, `AxisArtist`
-is responsible for all other artists. `AxisArtist` has attributes that are
-associated with each type of artists:
+There is one `AxisArtist` per Axis; it can be accessed through
+the ``axis`` dictionary of the parent Axes (which should be a
+`mpl_toolkits.axislines.Axes`), e.g. ``ax.axis["bottom"]``.
 
-* line: axis line
-* major_ticks: major tick lines
-* major_ticklabels: major tick labels
-* minor_ticks: minor tick lines
-* minor_ticklabels: minor tick labels
-* label: axis label
+Children of the AxisArtist are accessed as attributes: ``.line`` and ``.label``
+for the axis line and label, ``.major_ticks``, ``.major_ticklabels``,
+``.minor_ticks``, ``.minor_ticklabels`` for the tick lines and labels (e.g.
+``ax.axis["bottom"].line``).
 
-Typically, the `AxisArtist` associated with an axes will be accessed with the
-*axis* dictionary of the axes, i.e., the `AxisArtist` for the bottom axis is ::
+Children properties (colors, fonts, line widths, etc.) can be set using
+setters, e.g. ::
 
-  ax.axis["bottom"]
-
-where *ax* is an instance of `mpl_toolkits.axislines.Axes`.  Thus,
-``ax.axis["bottom"].line`` is an artist associated with the axis line, and
-``ax.axis["bottom"].major_ticks`` is an artist associated with the major tick
-lines.
-
-You can change the colors, fonts, line widths, etc. of these artists
-by calling suitable set method. For example, to change the color of the major
-ticks of the bottom axis to red, use ::
-
-  ax.axis["bottom"].major_ticks.set_color("r")
+  # Make the major ticks of the bottom axis red.
+  ax.axis["bottom"].major_ticks.set_color("red")
 
 However, things like the locations of ticks, and their ticklabels need to be
 changed from the side of the grid_helper.
@@ -90,10 +75,11 @@
 
 import numpy as np
 
-from matplotlib import _api, rcParams
+import matplotlib as mpl
+from matplotlib import _api, cbook
 import matplotlib.artist as martist
+import matplotlib.colors as mcolors
 import matplotlib.text as mtext
-
 from matplotlib.collections import LineCollection
 from matplotlib.lines import Line2D
 from matplotlib.patches import PathPatch
@@ -149,6 +135,14 @@ def get_ref_artist(self):
         # docstring inherited
         return self._axis.majorTicks[0].tick1line
 
+    def set_color(self, color):
+        # docstring inherited
+        # Unlike the base Line2D.set_color, this also supports "auto".
+        if not cbook._str_equal(color, "auto"):
+            mcolors._check_color_like(color=color)
+        self._color = color
+        self.stale = True
+
     def get_color(self):
         return self.get_attribute_from_ref_artist("color")
 
@@ -223,26 +217,16 @@ def __init__(self, *args, **kwargs):
         self.set_rotation_mode("anchor")
         self._text_follow_ref_angle = True
 
-    def _set_ref_angle(self, a):
-        self._ref_angle = a
-
-    def _get_ref_angle(self):
-        return self._ref_angle
-
-    def _get_text_ref_angle(self):
+    @property
+    def _text_ref_angle(self):
         if self._text_follow_ref_angle:
-            return self._get_ref_angle()+90
+            return self._ref_angle + 90
         else:
-            return 0  # self.get_ref_angle()
-
-    def _get_offset_ref_angle(self):
-        return self._get_ref_angle()
+            return 0
 
-    def _set_offset_radius(self, offset_radius):
-        self._offset_radius = offset_radius
-
-    def _get_offset_radius(self):
-        return self._offset_radius
+    @property
+    def _offset_ref_angle(self):
+        return self._ref_angle
 
     _get_opposite_direction = {"left": "right",
                                "right": "left",
@@ -256,31 +240,30 @@ def draw(self, renderer):
         # save original and adjust some properties
         tr = self.get_transform()
         angle_orig = self.get_rotation()
-        text_ref_angle = self._get_text_ref_angle()
-        offset_ref_angle = self._get_offset_ref_angle()
-        theta = np.deg2rad(offset_ref_angle)
-        dd = self._get_offset_radius()
+        theta = np.deg2rad(self._offset_ref_angle)
+        dd = self._offset_radius
         dx, dy = dd * np.cos(theta), dd * np.sin(theta)
 
         self.set_transform(tr + Affine2D().translate(dx, dy))
-        self.set_rotation(text_ref_angle+angle_orig)
+        self.set_rotation(self._text_ref_angle + angle_orig)
         super().draw(renderer)
         # restore original properties
         self.set_transform(tr)
         self.set_rotation(angle_orig)
 
-    def get_window_extent(self, renderer):
+    def get_window_extent(self, renderer=None):
+        if renderer is None:
+            renderer = self.figure._get_renderer()
+
         # save original and adjust some properties
         tr = self.get_transform()
         angle_orig = self.get_rotation()
-        text_ref_angle = self._get_text_ref_angle()
-        offset_ref_angle = self._get_offset_ref_angle()
-        theta = np.deg2rad(offset_ref_angle)
-        dd = self._get_offset_radius()
+        theta = np.deg2rad(self._offset_ref_angle)
+        dd = self._offset_radius
         dx, dy = dd * np.cos(theta), dd * np.sin(theta)
 
         self.set_transform(tr + Affine2D().translate(dx, dy))
-        self.set_rotation(text_ref_angle+angle_orig)
+        self.set_rotation(self._text_ref_angle + angle_orig)
         bbox = super().get_window_extent(renderer).frozen()
         # restore original properties
         self.set_transform(tr)
@@ -301,7 +284,7 @@ class AxisLabel(AttributeCopier, LabelBase):
     def __init__(self, *args, axis_direction="bottom", axis=None, **kwargs):
         self._axis = axis
         self._pad = 5
-        self._extra_pad = 0
+        self._external_pad = 0  # in pixels
         LabelBase.__init__(self, *args, **kwargs)
         self.set_axis_direction(axis_direction)
 
@@ -322,14 +305,6 @@ def get_pad(self):
         """
         return self._pad
 
-    def _set_external_pad(self, p):
-        """Set external pad in pixels."""
-        self._extra_pad = p
-
-    def _get_external_pad(self):
-        """Return external pad in pixels."""
-        return self._extra_pad
-
     def get_ref_artist(self):
         # docstring inherited
         return self._axis.get_label()
@@ -385,19 +360,19 @@ def draw(self, renderer):
         if not self.get_visible():
             return
 
-        pad = renderer.points_to_pixels(self.get_pad())
-        r = self._get_external_pad() + pad
-        self._set_offset_radius(r)
+        self._offset_radius = \
+            self._external_pad + renderer.points_to_pixels(self.get_pad())
 
         super().draw(renderer)
 
-    def get_window_extent(self, renderer):
+    def get_window_extent(self, renderer=None):
+        if renderer is None:
+            renderer = self.figure._get_renderer()
         if not self.get_visible():
             return
 
-        pad = renderer.points_to_pixels(self.get_pad())
-        r = self._get_external_pad() + pad
-        self._set_offset_radius(r)
+        r = self._external_pad + renderer.points_to_pixels(self.get_pad())
+        self._offset_radius = r
 
         bb = super().get_window_extent(renderer)
 
@@ -520,20 +495,19 @@ def _get_ticklabels_offsets(self, renderer, label_direction):
 
     def draw(self, renderer):
         if not self.get_visible():
-            self._axislabel_pad = self._get_external_pad()
+            self._axislabel_pad = self._external_pad
             return
 
         r, total_width = self._get_ticklabels_offsets(renderer,
                                                       self._axis_direction)
 
-        pad = (self._get_external_pad()
-               + renderer.points_to_pixels(self.get_pad()))
-        self._set_offset_radius(r+pad)
+        pad = self._external_pad + renderer.points_to_pixels(self.get_pad())
+        self._offset_radius = r + pad
 
         for (x, y), a, l in self._locs_angles_labels:
             if not l.strip():
                 continue
-            self._set_ref_angle(a)  # + add_angle
+            self._ref_angle = a
             self.set_x(x)
             self.set_y(y)
             self.set_text(l)
@@ -545,10 +519,12 @@ def draw(self, renderer):
     def set_locs_angles_labels(self, locs_angles_labels):
         self._locs_angles_labels = locs_angles_labels
 
-    def get_window_extents(self, renderer):
+    def get_window_extents(self, renderer=None):
+        if renderer is None:
+            renderer = self.figure._get_renderer()
 
         if not self.get_visible():
-            self._axislabel_pad = self._get_external_pad()
+            self._axislabel_pad = self._external_pad
             return []
 
         bboxes = []
@@ -556,12 +532,11 @@ def get_window_extents(self, renderer):
         r, total_width = self._get_ticklabels_offsets(renderer,
                                                       self._axis_direction)
 
-        pad = self._get_external_pad() + \
-            renderer.points_to_pixels(self.get_pad())
-        self._set_offset_radius(r+pad)
+        pad = self._external_pad + renderer.points_to_pixels(self.get_pad())
+        self._offset_radius = r + pad
 
         for (x, y), a, l in self._locs_angles_labels:
-            self._set_ref_angle(a)  # + add_angle
+            self._ref_angle = a
             self.set_x(x)
             self.set_y(y)
             self.set_text(l)
@@ -616,10 +591,7 @@ def draw(self, renderer):
         if self._grid_helper is not None:
             self._grid_helper.update_lim(self.axes)
             gl = self._grid_helper.get_gridlines(self._which, self._axis)
-            if gl:
-                self.set_segments([np.transpose(l) for l in gl])
-            else:
-                self.set_segments([])
+            self.set_segments([np.transpose(l) for l in gl])
         super().draw(renderer)
 
 
@@ -631,11 +603,6 @@ class AxisArtist(martist.Artist):
 
     zorder = 2.5
 
-    @_api.deprecated("3.4")
-    @_api.classproperty
-    def ZORDER(cls):
-        return cls.zorder
-
     @property
     def LABELPAD(self):
         return self.label.get_pad()
@@ -655,7 +622,7 @@ def __init__(self, axes,
         axes : `mpl_toolkits.axisartist.axislines.Axes`
         helper : `~mpl_toolkits.axisartist.axislines.AxisArtistHelper`
         """
-        #axes is also used to follow the axis attribute (tick color, etc).
+        # axes is also used to follow the axis attribute (tick color, etc).
 
         super().__init__(**kwargs)
 
@@ -688,11 +655,6 @@ def __init__(self, axes,
         self._axislabel_add_angle = 0.
         self.set_axis_direction(axis_direction)
 
-    @_api.deprecated("3.3")
-    @property
-    def dpi_transform(self):
-        return Affine2D().scale(1 / 72) + self.axes.figure.dpi_scale_trans
-
     # axis direction
 
     def set_axis_direction(self, axis_direction):
@@ -820,11 +782,11 @@ def _init_line(self):
         if axisline_style is None:
             self.line = PathPatch(
                 self._axis_artist_helper.get_line(self.axes),
-                color=rcParams['axes.edgecolor'],
+                color=mpl.rcParams['axes.edgecolor'],
                 fill=False,
-                linewidth=rcParams['axes.linewidth'],
-                capstyle=rcParams['lines.solid_capstyle'],
-                joinstyle=rcParams['lines.solid_joinstyle'],
+                linewidth=mpl.rcParams['axes.linewidth'],
+                capstyle=mpl.rcParams['lines.solid_capstyle'],
+                joinstyle=mpl.rcParams['lines.solid_joinstyle'],
                 transform=tran)
         else:
             self.line = axisline_style(self, transform=tran)
@@ -843,14 +805,16 @@ def _init_ticks(self, **kwargs):
 
         self.major_ticks = Ticks(
             kwargs.get(
-                "major_tick_size", rcParams[f"{axis_name}tick.major.size"]),
+                "major_tick_size",
+                mpl.rcParams[f"{axis_name}tick.major.size"]),
             axis=self.axis, transform=trans)
         self.minor_ticks = Ticks(
             kwargs.get(
-                "minor_tick_size", rcParams[f"{axis_name}tick.minor.size"]),
+                "minor_tick_size",
+                mpl.rcParams[f"{axis_name}tick.minor.size"]),
             axis=self.axis, transform=trans)
 
-        size = rcParams[f"{axis_name}tick.labelsize"]
+        size = mpl.rcParams[f"{axis_name}tick.labelsize"]
         self.major_ticklabels = TickLabels(
             axis=self.axis,
             axis_direction=self._axis_direction,
@@ -858,7 +822,7 @@ def _init_ticks(self, **kwargs):
             transform=trans,
             fontsize=size,
             pad=kwargs.get(
-                "major_tick_pad", rcParams[f"{axis_name}tick.major.pad"]),
+                "major_tick_pad", mpl.rcParams[f"{axis_name}tick.major.pad"]),
         )
         self.minor_ticklabels = TickLabels(
             axis=self.axis,
@@ -867,7 +831,7 @@ def _init_ticks(self, **kwargs):
             transform=trans,
             fontsize=size,
             pad=kwargs.get(
-                "minor_tick_pad", rcParams[f"{axis_name}tick.minor.pad"]),
+                "minor_tick_pad", mpl.rcParams[f"{axis_name}tick.minor.pad"]),
         )
 
     def _get_tick_info(self, tick_iter):
@@ -892,19 +856,21 @@ def _get_tick_info(self, tick_iter):
 
         return ticks_loc_angle, ticklabels_loc_angle_label
 
-    def _update_ticks(self, renderer):
+    def _update_ticks(self, renderer=None):
         # set extra pad for major and minor ticklabels: use ticksize of
         # majorticks even for minor ticks. not clear what is best.
 
+        if renderer is None:
+            renderer = self.figure._get_renderer()
+
         dpi_cor = renderer.points_to_pixels(1.)
         if self.major_ticks.get_visible() and self.major_ticks.get_tick_out():
-            self.major_ticklabels._set_external_pad(
-                self.major_ticks._ticksize * dpi_cor)
-            self.minor_ticklabels._set_external_pad(
-                self.major_ticks._ticksize * dpi_cor)
+            ticklabel_pad = self.major_ticks._ticksize * dpi_cor
+            self.major_ticklabels._external_pad = ticklabel_pad
+            self.minor_ticklabels._external_pad = ticklabel_pad
         else:
-            self.major_ticklabels._set_external_pad(0)
-            self.minor_ticklabels._set_external_pad(0)
+            self.major_ticklabels._external_pad = 0
+            self.minor_ticklabels._external_pad = 0
 
         majortick_iter, minortick_iter = \
             self._axis_artist_helper.get_tick_iterators(self.axes)
@@ -940,7 +906,7 @@ def _init_offsetText(self, direction):
             "",
             xy=(x, y), xycoords="axes fraction",
             xytext=(0, 0), textcoords="offset points",
-            color=rcParams['xtick.color'],
+            color=mpl.rcParams['xtick.color'],
             horizontalalignment=ha, verticalalignment=va,
         )
         self.offsetText.set_transform(IdentityTransform())
@@ -964,8 +930,8 @@ def _init_label(self, **kwargs):
         self.label = AxisLabel(
             0, 0, "__from_axes__",
             color="auto",
-            fontsize=kwargs.get("labelsize", rcParams['axes.labelsize']),
-            fontweight=rcParams['axes.labelweight'],
+            fontsize=kwargs.get("labelsize", mpl.rcParams['axes.labelsize']),
+            fontweight=mpl.rcParams['axes.labelweight'],
             axis=self.axis,
             transform=tr,
             axis_direction=self._axis_direction,
@@ -990,7 +956,7 @@ def _update_label(self, renderer):
             axislabel_pad = max(self.major_ticklabels._axislabel_pad,
                                 self.minor_ticklabels._axislabel_pad)
 
-        self.label._set_external_pad(axislabel_pad)
+        self.label._external_pad = axislabel_pad
 
         xy, angle_tangent = \
             self._axis_artist_helper.get_axislabel_pos_angle(self.axes)
@@ -1000,7 +966,7 @@ def _update_label(self, renderer):
         angle_label = angle_tangent - 90
 
         x, y = xy
-        self.label._set_ref_angle(angle_label+self._axislabel_add_angle)
+        self.label._ref_angle = angle_label + self._axislabel_add_angle
         self.label.set(x=x, y=y)
 
     def _draw_label(self, renderer):
@@ -1010,7 +976,7 @@ def _draw_label(self, renderer):
     def set_label(self, s):
         self.label.set_text(s)
 
-    def get_tightbbox(self, renderer):
+    def get_tightbbox(self, renderer=None):
         if not self.get_visible():
             return
         self._axis_artist_helper.update_lim(self.axes)
diff --git a/lib/mpl_toolkits/axisartist/axisline_style.py b/lib/mpl_toolkits/axisartist/axisline_style.py
index 80f3ce58eb48..db4b0c144c5e 100644
--- a/lib/mpl_toolkits/axisartist/axisline_style.py
+++ b/lib/mpl_toolkits/axisartist/axisline_style.py
@@ -9,9 +9,7 @@
 
 class _FancyAxislineStyle:
     class SimpleArrow(FancyArrowPatch):
-        """
-        The artist class that will be returned for SimpleArrow style.
-        """
+        """The artist class that will be returned for SimpleArrow style."""
         _ARROW_STYLE = "->"
 
         def __init__(self, axis_artist, line_path, transform,
@@ -69,9 +67,7 @@ def draw(self, renderer):
             FancyArrowPatch.draw(self, renderer)
 
     class FilledArrow(SimpleArrow):
-        """
-        The artist class that will be returned for SimpleArrow style.
-        """
+        """The artist class that will be returned for SimpleArrow style."""
         _ARROW_STYLE = "-|>"
 
 
diff --git a/lib/mpl_toolkits/axisartist/axislines.py b/lib/mpl_toolkits/axisartist/axislines.py
index c49610b93831..fdbf41580f03 100644
--- a/lib/mpl_toolkits/axisartist/axislines.py
+++ b/lib/mpl_toolkits/axisartist/axislines.py
@@ -41,11 +41,12 @@
 
 import numpy as np
 
-from matplotlib import _api, rcParams
+import matplotlib as mpl
+from matplotlib import _api
 import matplotlib.axes as maxes
 from matplotlib.path import Path
 from mpl_toolkits.axes_grid1 import mpl_axes
-from .axisline_style import AxislineStyle
+from .axisline_style import AxislineStyle  # noqa
 from .axis_artist import AxisArtist, GridlinesCollection
 
 
@@ -98,12 +99,15 @@ def get_tick_iterators(self, axes):
 
     class _Base:
         """Base class for axis helper."""
-        def __init__(self):
-            self.delta1, self.delta2 = 0.00001, 0.00001
 
         def update_lim(self, axes):
             pass
 
+        delta1 = _api.deprecated("3.6")(
+            property(lambda self: 0.00001, lambda self, value: None))
+        delta2 = _api.deprecated("3.6")(
+            property(lambda self: 0.00001, lambda self, value: None))
+
     class Fixed(_Base):
         """Helper class for a fixed (in the axes coordinate) axis."""
 
@@ -204,38 +208,32 @@ def __init__(self, axes, loc, nth_coord=None):
 
         def get_tick_iterators(self, axes):
             """tick_loc, tick_angle, tick_label"""
-
-            loc = self._loc
-
-            if loc in ["bottom", "top"]:
+            if self._loc in ["bottom", "top"]:
                 angle_normal, angle_tangent = 90, 0
             else:
                 angle_normal, angle_tangent = 0, 90
 
             major = self.axis.major
-            majorLocs = major.locator()
-            majorLabels = major.formatter.format_ticks(majorLocs)
+            major_locs = major.locator()
+            major_labels = major.formatter.format_ticks(major_locs)
 
             minor = self.axis.minor
-            minorLocs = minor.locator()
-            minorLabels = minor.formatter.format_ticks(minorLocs)
+            minor_locs = minor.locator()
+            minor_labels = minor.formatter.format_ticks(minor_locs)
 
             tick_to_axes = self.get_tick_transform(axes) - axes.transAxes
 
             def _f(locs, labels):
                 for x, l in zip(locs, labels):
-
                     c = list(self.passthru_pt)  # copy
                     c[self.nth_coord] = x
-
                     # check if the tick point is inside axes
                     c2 = tick_to_axes.transform(c)
-                    if (0 - self.delta1
-                            <= c2[self.nth_coord]
-                            <= 1 + self.delta2):
+                    if mpl.transforms._interval_contains_close(
+                            (0, 1), c2[self.nth_coord]):
                         yield c, angle_normal, angle_tangent, l
 
-            return _f(majorLocs, majorLabels), _f(minorLocs, minorLabels)
+            return _f(major_locs, major_labels), _f(minor_locs, minor_labels)
 
     class Floating(AxisArtistHelper.Floating):
         def __init__(self, axes, nth_coord,
@@ -289,12 +287,12 @@ def get_tick_iterators(self, axes):
                 angle_normal, angle_tangent = 0, 90
 
             major = self.axis.major
-            majorLocs = major.locator()
-            majorLabels = major.formatter.format_ticks(majorLocs)
+            major_locs = major.locator()
+            major_labels = major.formatter.format_ticks(major_locs)
 
             minor = self.axis.minor
-            minorLocs = minor.locator()
-            minorLabels = minor.formatter.format_ticks(minorLocs)
+            minor_locs = minor.locator()
+            minor_labels = minor.formatter.format_ticks(minor_locs)
 
             data_to_axes = axes.transData - axes.transAxes
 
@@ -303,41 +301,28 @@ def _f(locs, labels):
                     c = [self._value, self._value]
                     c[self.nth_coord] = x
                     c1, c2 = data_to_axes.transform(c)
-                    if (0 <= c1 <= 1 and 0 <= c2 <= 1
-                            and 0 - self.delta1
-                                <= [c1, c2][self.nth_coord]
-                                <= 1 + self.delta2):
+                    if 0 <= c1 <= 1 and 0 <= c2 <= 1:
                         yield c, angle_normal, angle_tangent, l
 
-            return _f(majorLocs, majorLabels), _f(minorLocs, minorLabels)
+            return _f(major_locs, major_labels), _f(minor_locs, minor_labels)
 
 
 class GridHelperBase:
 
     def __init__(self):
-        self._force_update = True  # Remove together with invalidate()/valid().
         self._old_limits = None
         super().__init__()
 
     def update_lim(self, axes):
         x1, x2 = axes.get_xlim()
         y1, y2 = axes.get_ylim()
-        if self._force_update or self._old_limits != (x1, x2, y1, y2):
+        if self._old_limits != (x1, x2, y1, y2):
             self._update_grid(x1, y1, x2, y2)
-            self._force_update = False
             self._old_limits = (x1, x2, y1, y2)
 
     def _update_grid(self, x1, y1, x2, y2):
         """Cache relevant computations when the axes limits have changed."""
 
-    @_api.deprecated("3.4")
-    def invalidate(self):
-        self._force_update = True
-
-    @_api.deprecated("3.4")
-    def valid(self):
-        return not self._force_update
-
     def get_gridlines(self, which, axis):
         """
         Return list of grid lines as a list of paths (list of points).
@@ -347,6 +332,7 @@ def get_gridlines(self, which, axis):
         """
         return []
 
+    @_api.deprecated("3.6")
     def new_gridlines(self, ax):
         """
         Create and return a new GridlineCollection instance.
@@ -355,10 +341,10 @@ def new_gridlines(self, ax):
         *axis* : "both", "x" or "y"
 
         """
-        gridlines = GridlinesCollection(None, transform=ax.transData,
-                                        colors=rcParams['grid.color'],
-                                        linestyles=rcParams['grid.linestyle'],
-                                        linewidths=rcParams['grid.linewidth'])
+        gridlines = GridlinesCollection(
+            None, transform=ax.transData, colors=mpl.rcParams['grid.color'],
+            linestyles=mpl.rcParams['grid.linestyle'],
+            linewidths=mpl.rcParams['grid.linewidth'])
         ax._set_artist_props(gridlines)
         gridlines.set_grid_helper(self)
 
@@ -477,25 +463,11 @@ def toggle_axisline(self, b=None):
             self.xaxis.set_visible(True)
             self.yaxis.set_visible(True)
 
-    def _init_axis_artists(self, axes=None):
-        if axes is None:
-            axes = self
-
-        self._axislines = mpl_axes.Axes.AxisDict(self)
-        new_fixed_axis = self.get_grid_helper().new_fixed_axis
-        for loc in ["bottom", "top", "left", "right"]:
-            self._axislines[loc] = new_fixed_axis(loc=loc, axes=axes,
-                                                  axis_direction=loc)
-
-        for axisline in [self._axislines["top"], self._axislines["right"]]:
-            axisline.label.set_visible(False)
-            axisline.major_ticklabels.set_visible(False)
-            axisline.minor_ticklabels.set_visible(False)
-
     @property
     def axis(self):
         return self._axislines
 
+    @_api.deprecated("3.6")
     def new_gridlines(self, grid_helper=None):
         """
         Create and return a new GridlineCollection instance.
@@ -510,40 +482,54 @@ def new_gridlines(self, grid_helper=None):
         gridlines = grid_helper.new_gridlines(self)
         return gridlines
 
-    def _init_gridlines(self, grid_helper=None):
-        # It is done inside the cla.
-        self.gridlines = self.new_gridlines(grid_helper)
+    def clear(self):
+        # docstring inherited
 
-    def cla(self):
-        # gridlines need to b created before cla() since cla calls grid()
-        self._init_gridlines()
-        super().cla()
+        # Init gridlines before clear() as clear() calls grid().
+        self.gridlines = gridlines = GridlinesCollection(
+            None, transform=self.transData,
+            colors=mpl.rcParams['grid.color'],
+            linestyles=mpl.rcParams['grid.linestyle'],
+            linewidths=mpl.rcParams['grid.linewidth'])
+        self._set_artist_props(gridlines)
+        gridlines.set_grid_helper(self.get_grid_helper())
 
-        # the clip_path should be set after Axes.cla() since that's
-        # when a patch is created.
-        self.gridlines.set_clip_path(self.axes.patch)
+        super().clear()
 
-        self._init_axis_artists()
+        # clip_path is set after Axes.clear(): that's when a patch is created.
+        gridlines.set_clip_path(self.axes.patch)
+
+        # Init axis artists.
+        self._axislines = mpl_axes.Axes.AxisDict(self)
+        new_fixed_axis = self.get_grid_helper().new_fixed_axis
+        self._axislines.update({
+            loc: new_fixed_axis(loc=loc, axes=self, axis_direction=loc)
+            for loc in ["bottom", "top", "left", "right"]})
+        for axisline in [self._axislines["top"], self._axislines["right"]]:
+            axisline.label.set_visible(False)
+            axisline.major_ticklabels.set_visible(False)
+            axisline.minor_ticklabels.set_visible(False)
 
     def get_grid_helper(self):
         return self._grid_helper
 
-    def grid(self, b=None, which='major', axis="both", **kwargs):
+    @_api.rename_parameter("3.5", "b", "visible")
+    def grid(self, visible=None, which='major', axis="both", **kwargs):
         """
         Toggle the gridlines, and optionally set the properties of the lines.
         """
         # There are some discrepancies in the behavior of grid() between
         # axes_grid and Matplotlib, because axes_grid explicitly sets the
         # visibility of the gridlines.
-        super().grid(b, which=which, axis=axis, **kwargs)
+        super().grid(visible, which=which, axis=axis, **kwargs)
         if not self._axisline_on:
             return
-        if b is None:
-            b = (self.axes.xaxis._minor_tick_kw["gridOn"]
-                 or self.axes.xaxis._major_tick_kw["gridOn"]
-                 or self.axes.yaxis._minor_tick_kw["gridOn"]
-                 or self.axes.yaxis._major_tick_kw["gridOn"])
-        self.gridlines.set(which=which, axis=axis, visible=b)
+        if visible is None:
+            visible = (self.axes.xaxis._minor_tick_kw["gridOn"]
+                       or self.axes.xaxis._major_tick_kw["gridOn"]
+                       or self.axes.yaxis._minor_tick_kw["gridOn"]
+                       or self.axes.yaxis._major_tick_kw["gridOn"])
+        self.gridlines.set(which=which, axis=axis, visible=visible)
         self.gridlines.set(**kwargs)
 
     def get_children(self):
@@ -554,10 +540,6 @@ def get_children(self):
         children.extend(super().get_children())
         return children
 
-    @_api.deprecated("3.4")
-    def invalidate_grid_helper(self):
-        self._grid_helper.invalidate()
-
     def new_fixed_axis(self, loc, offset=None):
         gh = self.get_grid_helper()
         axis = gh.new_fixed_axis(loc,
@@ -581,27 +563,18 @@ def new_floating_axis(self, nth_coord, value, axis_direction="bottom"):
 
 class AxesZero(Axes):
 
-    def _init_axis_artists(self):
-        super()._init_axis_artists()
-
-        new_floating_axis = self._grid_helper.new_floating_axis
-        xaxis_zero = new_floating_axis(nth_coord=0,
-                                       value=0.,
-                                       axis_direction="bottom",
-                                       axes=self)
-
-        xaxis_zero.line.set_clip_path(self.patch)
-        xaxis_zero.set_visible(False)
-        self._axislines["xzero"] = xaxis_zero
-
-        yaxis_zero = new_floating_axis(nth_coord=1,
-                                       value=0.,
-                                       axis_direction="left",
-                                       axes=self)
-
-        yaxis_zero.line.set_clip_path(self.patch)
-        yaxis_zero.set_visible(False)
-        self._axislines["yzero"] = yaxis_zero
+    def clear(self):
+        super().clear()
+        new_floating_axis = self.get_grid_helper().new_floating_axis
+        self._axislines.update(
+            xzero=new_floating_axis(
+                nth_coord=0, value=0., axis_direction="bottom", axes=self),
+            yzero=new_floating_axis(
+                nth_coord=1, value=0., axis_direction="left", axes=self),
+        )
+        for k in ["xzero", "yzero"]:
+            self._axislines[k].line.set_clip_path(self.patch)
+            self._axislines[k].set_visible(False)
 
 
 SubplotZero = maxes.subplot_class_factory(AxesZero)
diff --git a/lib/mpl_toolkits/axisartist/clip_path.py b/lib/mpl_toolkits/axisartist/clip_path.py
index 830dc7fa2aa9..53b75f073a44 100644
--- a/lib/mpl_toolkits/axisartist/clip_path.py
+++ b/lib/mpl_toolkits/axisartist/clip_path.py
@@ -4,6 +4,9 @@
 import math
 
 
+_api.warn_deprecated("3.5", name=__name__, obj_type="module")
+
+
 def atan2(dy, dx):
     if dx == 0 and dy == 0:
         _api.warn_external("dx and dy are 0")
diff --git a/lib/mpl_toolkits/axisartist/floating_axes.py b/lib/mpl_toolkits/axisartist/floating_axes.py
index e1958939c7d5..d86c3db6c85a 100644
--- a/lib/mpl_toolkits/axisartist/floating_axes.py
+++ b/lib/mpl_toolkits/axisartist/floating_axes.py
@@ -9,9 +9,11 @@
 
 import numpy as np
 
+import matplotlib as mpl
+from matplotlib import _api, cbook
+import matplotlib.axes as maxes
 import matplotlib.patches as mpatches
 from matplotlib.path import Path
-import matplotlib.axes as maxes
 
 from mpl_toolkits.axes_grid1.parasite_axes import host_axes_class_factory
 
@@ -44,39 +46,28 @@ def __init__(self, grid_helper, side, nth_coord_ticks=None):
 
     def update_lim(self, axes):
         self.grid_helper.update_lim(axes)
-        self.grid_info = self.grid_helper.grid_info
+        self._grid_info = self.grid_helper._grid_info
 
     def get_tick_iterators(self, axes):
         """tick_loc, tick_angle, tick_label, (optionally) tick_label"""
 
         grid_finder = self.grid_helper.grid_finder
 
-        lat_levs, lat_n, lat_factor = self.grid_info["lat_info"]
-        lon_levs, lon_n, lon_factor = self.grid_info["lon_info"]
-
-        lon_levs, lat_levs = np.asarray(lon_levs), np.asarray(lat_levs)
-        if lat_factor is not None:
-            yy0 = lat_levs / lat_factor
-            dy = 0.001 / lat_factor
-        else:
-            yy0 = lat_levs
-            dy = 0.001
+        lat_levs, lat_n, lat_factor = self._grid_info["lat_info"]
+        yy0 = lat_levs / lat_factor
+        dy = 0.001 / lat_factor
 
-        if lon_factor is not None:
-            xx0 = lon_levs / lon_factor
-            dx = 0.001 / lon_factor
-        else:
-            xx0 = lon_levs
-            dx = 0.001
+        lon_levs, lon_n, lon_factor = self._grid_info["lon_info"]
+        xx0 = lon_levs / lon_factor
+        dx = 0.001 / lon_factor
 
         extremes = self.grid_helper._extremes
         xmin, xmax = sorted(extremes[:2])
         ymin, ymax = sorted(extremes[2:])
 
         def transform_xy(x, y):
-            x1, y1 = grid_finder.transform_xy(x, y)
-            x2, y2 = axes.transData.transform(np.array([x1, y1]).T).T
-            return x2, y2
+            trf = grid_finder.get_transform() + axes.transData
+            return trf.transform(np.column_stack([x, y])).T
 
         if self.nth_coord == 0:
             mask = (ymin <= yy0) & (yy0 <= ymax)
@@ -94,7 +85,7 @@ def transform_xy(x, y):
             xx2a, yy2a = transform_xy(xx0, yy00)
             xx2b, yy2b = transform_xy(xx0, yy00 + dy)
 
-            labels = self.grid_info["lat_labels"]
+            labels = self._grid_info["lat_labels"]
             labels = [l for l, m in zip(labels, mask) if m]
 
         elif self.nth_coord == 1:
@@ -113,7 +104,7 @@ def transform_xy(x, y):
             xx2a, yy2a = transform_xy(xx00, yy0)
             xx2b, yy2b = transform_xy(xx00 + dx, yy0)
 
-            labels = self.grid_info["lon_labels"]
+            labels = self._grid_info["lon_labels"]
             labels = [l for l, m in zip(labels, mask) if m]
 
         def f1():
@@ -123,10 +114,11 @@ def f1():
             dd[mm] = dd2[mm] + np.pi / 2
 
             tick_to_axes = self.get_tick_transform(axes) - axes.transAxes
+            in_01 = functools.partial(
+                mpl.transforms._interval_contains_close, (0, 1))
             for x, y, d, d2, lab in zip(xx1, yy1, dd, dd2, labels):
                 c2 = tick_to_axes.transform((x, y))
-                delta = 0.00001
-                if 0-delta <= c2[0] <= 1+delta and 0-delta <= c2[1] <= 1+delta:
+                if in_01(c2[0]) and in_01(c2[1]):
                     d1, d2 = np.rad2deg([d, d2])
                     yield [x, y], d1, d2, lab
 
@@ -138,7 +130,7 @@ def get_line(self, axes):
                     right=("lon_lines0", 1),
                     bottom=("lat_lines0", 0),
                     top=("lat_lines0", 1))[self._side]
-        xx, yy = self.grid_info[k][v]
+        xx, yy = self._grid_info[k][v]
         return Path(np.column_stack([xx, yy]))
 
 
@@ -229,10 +221,10 @@ def new_fixed_axis(self, loc,
     #     return axis
 
     def _update_grid(self, x1, y1, x2, y2):
-        if self.grid_info is None:
-            self.grid_info = dict()
+        if self._grid_info is None:
+            self._grid_info = dict()
 
-        grid_info = self.grid_info
+        grid_info = self._grid_info
 
         grid_finder = self.grid_finder
         extremes = grid_finder.extreme_finder(grid_finder.inv_transform_xy,
@@ -240,31 +232,25 @@ def _update_grid(self, x1, y1, x2, y2):
 
         lon_min, lon_max = sorted(extremes[:2])
         lat_min, lat_max = sorted(extremes[2:])
+        grid_info["extremes"] = lon_min, lon_max, lat_min, lat_max  # extremes
+
         lon_levs, lon_n, lon_factor = \
             grid_finder.grid_locator1(lon_min, lon_max)
+        lon_levs = np.asarray(lon_levs)
         lat_levs, lat_n, lat_factor = \
             grid_finder.grid_locator2(lat_min, lat_max)
-        grid_info["extremes"] = lon_min, lon_max, lat_min, lat_max  # extremes
+        lat_levs = np.asarray(lat_levs)
 
         grid_info["lon_info"] = lon_levs, lon_n, lon_factor
         grid_info["lat_info"] = lat_levs, lat_n, lat_factor
 
-        grid_info["lon_labels"] = grid_finder.tick_formatter1("bottom",
-                                                              lon_factor,
-                                                              lon_levs)
-
-        grid_info["lat_labels"] = grid_finder.tick_formatter2("bottom",
-                                                              lat_factor,
-                                                              lat_levs)
+        grid_info["lon_labels"] = grid_finder.tick_formatter1(
+            "bottom", lon_factor, lon_levs)
+        grid_info["lat_labels"] = grid_finder.tick_formatter2(
+            "bottom", lat_factor, lat_levs)
 
-        if lon_factor is None:
-            lon_values = np.asarray(lon_levs[:lon_n])
-        else:
-            lon_values = np.asarray(lon_levs[:lon_n]/lon_factor)
-        if lat_factor is None:
-            lat_values = np.asarray(lat_levs[:lat_n])
-        else:
-            lat_values = np.asarray(lat_levs[:lat_n]/lat_factor)
+        lon_values = lon_levs[:lon_n] / lon_factor
+        lat_values = lat_levs[:lat_n] / lat_factor
 
         lon_lines, lat_lines = grid_finder._get_raw_grid_lines(
             lon_values[(lon_min < lon_values) & (lon_values < lon_max)],
@@ -284,17 +270,17 @@ def _update_grid(self, x1, y1, x2, y2):
     def get_gridlines(self, which="major", axis="both"):
         grid_lines = []
         if axis in ["both", "x"]:
-            grid_lines.extend(self.grid_info["lon_lines"])
+            grid_lines.extend(self._grid_info["lon_lines"])
         if axis in ["both", "y"]:
-            grid_lines.extend(self.grid_info["lat_lines"])
+            grid_lines.extend(self._grid_info["lat_lines"])
         return grid_lines
 
+    @_api.deprecated("3.5")
     def get_boundary(self):
         """
         Return (N, 2) array of (x, y) coordinate of the boundary.
         """
         x0, x1, y0, y1 = self._extremes
-        tr = self._aux_trans
 
         xx = np.linspace(x0, x1, 100)
         yy0 = np.full_like(xx, y0)
@@ -305,68 +291,52 @@ def get_boundary(self):
 
         xxx = np.concatenate([xx[:-1], xx1[:-1], xx[-1:0:-1], xx0])
         yyy = np.concatenate([yy0[:-1], yy[:-1], yy1[:-1], yy[::-1]])
-        t = tr.transform(np.array([xxx, yyy]).transpose())
 
-        return t
+        return self._aux_trans.transform(np.column_stack([xxx, yyy]))
 
 
 class FloatingAxesBase:
 
-    def __init__(self, *args, **kwargs):
-        grid_helper = kwargs.get("grid_helper", None)
-        if grid_helper is None:
-            raise ValueError("FloatingAxes requires grid_helper argument")
-        if not hasattr(grid_helper, "get_boundary"):
-            raise ValueError("grid_helper must implement get_boundary method")
-
-        self._axes_class_floating.__init__(self, *args, **kwargs)
-
+    def __init__(self, *args, grid_helper, **kwargs):
+        _api.check_isinstance(GridHelperCurveLinear, grid_helper=grid_helper)
+        super().__init__(*args, grid_helper=grid_helper, **kwargs)
         self.set_aspect(1.)
         self.adjust_axes_lim()
 
     def _gen_axes_patch(self):
         # docstring inherited
-        grid_helper = self.get_grid_helper()
-        t = grid_helper.get_boundary()
-        return mpatches.Polygon(t)
-
-    def cla(self):
-        self._axes_class_floating.cla(self)
-        # HostAxes.cla(self)
-        self.patch.set_transform(self.transData)
-
-        patch = self._axes_class_floating._gen_axes_patch(self)
-        patch.set_figure(self.figure)
-        patch.set_visible(False)
-        patch.set_transform(self.transAxes)
-
-        self.patch.set_clip_path(patch)
-        self.gridlines.set_clip_path(patch)
-
-        self._original_patch = patch
+        # Using a public API to access _extremes.
+        (x0, _), (x1, _), (y0, _), (y1, _) = map(
+            self.get_grid_helper().get_data_boundary,
+            ["left", "right", "bottom", "top"])
+        patch = mpatches.Polygon([(x0, y0), (x1, y0), (x1, y1), (x0, y1)])
+        patch.get_path()._interpolation_steps = 100
+        return patch
+
+    def clear(self):
+        super().clear()
+        self.patch.set_transform(
+            self.get_grid_helper().grid_finder.get_transform()
+            + self.transData)
+        # The original patch is not in the draw tree; it is only used for
+        # clipping purposes.
+        orig_patch = super()._gen_axes_patch()
+        orig_patch.set_figure(self.figure)
+        orig_patch.set_transform(self.transAxes)
+        self.patch.set_clip_path(orig_patch)
+        self.gridlines.set_clip_path(orig_patch)
 
     def adjust_axes_lim(self):
-        grid_helper = self.get_grid_helper()
-        t = grid_helper.get_boundary()
-        x, y = t[:, 0], t[:, 1]
-
-        xmin, xmax = min(x), max(x)
-        ymin, ymax = min(y), max(y)
-
-        dx = (xmax-xmin) / 100
-        dy = (ymax-ymin) / 100
-
-        self.set_xlim(xmin-dx, xmax+dx)
-        self.set_ylim(ymin-dy, ymax+dy)
-
-
-@functools.lru_cache(None)
-def floatingaxes_class_factory(axes_class):
-    return type("Floating %s" % axes_class.__name__,
-                (FloatingAxesBase, axes_class),
-                {'_axes_class_floating': axes_class})
+        bbox = self.patch.get_path().get_extents(
+            # First transform to pixel coords, then to parent data coords.
+            self.patch.get_transform() - self.transData)
+        bbox = bbox.expanded(1.02, 1.02)
+        self.set_xlim(bbox.xmin, bbox.xmax)
+        self.set_ylim(bbox.ymin, bbox.ymax)
 
 
+floatingaxes_class_factory = cbook._make_class_factory(
+    FloatingAxesBase, "Floating{}")
 FloatingAxes = floatingaxes_class_factory(
     host_axes_class_factory(axislines.Axes))
 FloatingSubplot = maxes.subplot_class_factory(FloatingAxes)
diff --git a/lib/mpl_toolkits/axisartist/grid_finder.py b/lib/mpl_toolkits/axisartist/grid_finder.py
index 76d7b7016fc2..a8177b3bb0f0 100644
--- a/lib/mpl_toolkits/axisartist/grid_finder.py
+++ b/lib/mpl_toolkits/axisartist/grid_finder.py
@@ -1,8 +1,49 @@
 import numpy as np
 
-from matplotlib import _api, ticker as mticker
+from matplotlib import ticker as mticker
 from matplotlib.transforms import Bbox, Transform
-from .clip_path import clip_line_to_rect
+
+
+def _find_line_box_crossings(xys, bbox):
+    """
+    Find the points where a polyline crosses a bbox, and the crossing angles.
+
+    Parameters
+    ----------
+    xys : (N, 2) array
+        The polyline coordinates.
+    bbox : `.Bbox`
+        The bounding box.
+
+    Returns
+    -------
+    list of ((float, float), float)
+        Four separate lists of crossings, for the left, right, bottom, and top
+        sides of the bbox, respectively.  For each list, the entries are the
+        ``((x, y), ccw_angle_in_degrees)`` of the crossing, where an angle of 0
+        means that the polyline is moving to the right at the crossing point.
+
+        The entries are computed by linearly interpolating at each crossing
+        between the nearest points on either side of the bbox edges.
+    """
+    crossings = []
+    dxys = xys[1:] - xys[:-1]
+    for sl in [slice(None), slice(None, None, -1)]:
+        us, vs = xys.T[sl]  # "this" coord, "other" coord
+        dus, dvs = dxys.T[sl]
+        umin, vmin = bbox.min[sl]
+        umax, vmax = bbox.max[sl]
+        for u0, inside in [(umin, us > umin), (umax, us < umax)]:
+            crossings.append([])
+            idxs, = (inside[:-1] ^ inside[1:]).nonzero()
+            for idx in idxs:
+                v = vs[idx] + (u0 - us[idx]) * dvs[idx] / dus[idx]
+                if not vmin <= v <= vmax:
+                    continue
+                crossing = (u0, v)[sl]
+                theta = np.degrees(np.arctan2(*dxys[idx][::-1]))
+                crossings[-1].append((crossing, theta))
+    return crossings
 
 
 class ExtremeFinderSimple:
@@ -51,6 +92,34 @@ def _add_pad(self, x_min, x_max, y_min, y_max):
         return x_min - dx, x_max + dx, y_min - dy, y_max + dy
 
 
+class _User2DTransform(Transform):
+    """A transform defined by two user-set functions."""
+
+    input_dims = output_dims = 2
+
+    def __init__(self, forward, backward):
+        """
+        Parameters
+        ----------
+        forward, backward : callable
+            The forward and backward transforms, taking ``x`` and ``y`` as
+            separate arguments and returning ``(tr_x, tr_y)``.
+        """
+        # The normal Matplotlib convention would be to take and return an
+        # (N, 2) array but axisartist uses the transposed version.
+        super().__init__()
+        self._forward = forward
+        self._backward = backward
+
+    def transform_non_affine(self, values):
+        # docstring inherited
+        return np.transpose(self._forward(*np.transpose(values)))
+
+    def inverted(self):
+        # docstring inherited
+        return type(self)(self._backward, self._forward)
+
+
 class GridFinder:
     def __init__(self,
                  transform,
@@ -82,7 +151,7 @@ def __init__(self,
         self.grid_locator2 = grid_locator2
         self.tick_formatter1 = tick_formatter1
         self.tick_formatter2 = tick_formatter2
-        self.update_transform(transform)
+        self.set_transform(transform)
 
     def get_grid_info(self, x1, y1, x2, y2):
         """
@@ -97,7 +166,9 @@ def get_grid_info(self, x1, y1, x2, y2):
 
         lon_min, lon_max, lat_min, lat_max = extremes
         lon_levs, lon_n, lon_factor = self.grid_locator1(lon_min, lon_max)
+        lon_levs = np.asarray(lon_levs)
         lat_levs, lat_n, lat_factor = self.grid_locator2(lat_min, lat_max)
+        lat_levs = np.asarray(lat_levs)
 
         lon_values = lon_levs[:lon_n] / lon_factor
         lat_values = lat_levs[:lat_n] / lat_factor
@@ -161,52 +232,49 @@ def _clip_grid_lines_and_find_ticks(self, lines, values, levs, bb):
         tck_levels = gi["tick_levels"]
         tck_locs = gi["tick_locs"]
         for (lx, ly), v, lev in zip(lines, values, levs):
-            xy, tcks = clip_line_to_rect(lx, ly, bb)
-            if not xy:
-                continue
+            tcks = _find_line_box_crossings(np.column_stack([lx, ly]), bb)
             gi["levels"].append(v)
-            gi["lines"].append(xy)
+            gi["lines"].append([(lx, ly)])
 
             for tck, direction in zip(tcks,
-                                      ["left", "bottom", "right", "top"]):
+                                      ["left", "right", "bottom", "top"]):
                 for t in tck:
                     tck_levels[direction].append(lev)
                     tck_locs[direction].append(t)
 
         return gi
 
-    def update_transform(self, aux_trans):
-        if not isinstance(aux_trans, Transform) and len(aux_trans) != 2:
-            raise TypeError("'aux_trans' must be either a Transform instance "
-                            "or a pair of callables")
-        self._aux_transform = aux_trans
+    def set_transform(self, aux_trans):
+        if isinstance(aux_trans, Transform):
+            self._aux_transform = aux_trans
+        elif len(aux_trans) == 2 and all(map(callable, aux_trans)):
+            self._aux_transform = _User2DTransform(*aux_trans)
+        else:
+            raise TypeError("'aux_trans' must be either a Transform "
+                            "instance or a pair of callables")
+
+    def get_transform(self):
+        return self._aux_transform
+
+    update_transform = set_transform  # backcompat alias.
 
     def transform_xy(self, x, y):
-        aux_trf = self._aux_transform
-        if isinstance(aux_trf, Transform):
-            return aux_trf.transform(np.column_stack([x, y])).T
-        else:
-            transform_xy, inv_transform_xy = aux_trf
-            return transform_xy(x, y)
+        return self._aux_transform.transform(np.column_stack([x, y])).T
 
     def inv_transform_xy(self, x, y):
-        aux_trf = self._aux_transform
-        if isinstance(aux_trf, Transform):
-            return aux_trf.inverted().transform(np.column_stack([x, y])).T
-        else:
-            transform_xy, inv_transform_xy = aux_trf
-            return inv_transform_xy(x, y)
+        return self._aux_transform.inverted().transform(
+            np.column_stack([x, y])).T
 
-    def update(self, **kw):
-        for k in kw:
+    def update(self, **kwargs):
+        for k, v in kwargs.items():
             if k in ["extreme_finder",
                      "grid_locator1",
                      "grid_locator2",
                      "tick_formatter1",
                      "tick_formatter2"]:
-                setattr(self, k, kw[k])
+                setattr(self, k, v)
             else:
-                raise ValueError("Unknown update property '%s'" % k)
+                raise ValueError(f"Unknown update property {k!r}")
 
 
 class MaxNLocator(mticker.MaxNLocator):
@@ -219,31 +287,20 @@ def __init__(self, nbins=10, steps=None,
         super().__init__(nbins, steps=steps, integer=integer,
                          symmetric=symmetric, prune=prune)
         self.create_dummy_axis()
-        self._factor = 1
 
     def __call__(self, v1, v2):
-        self.set_bounds(v1 * self._factor, v2 * self._factor)
-        locs = super().__call__()
-        return np.array(locs), len(locs), self._factor
-
-    @_api.deprecated("3.3")
-    def set_factor(self, f):
-        self._factor = f
+        locs = super().tick_values(v1, v2)
+        return np.array(locs), len(locs), 1  # 1: factor (see angle_helper)
 
 
 class FixedLocator:
     def __init__(self, locs):
         self._locs = locs
-        self._factor = 1
 
     def __call__(self, v1, v2):
-        v1, v2 = sorted([v1 * self._factor, v2 * self._factor])
+        v1, v2 = sorted([v1, v2])
         locs = np.array([l for l in self._locs if v1 <= l <= v2])
-        return locs, len(locs), self._factor
-
-    @_api.deprecated("3.3")
-    def set_factor(self, f):
-        self._factor = f
+        return locs, len(locs), 1  # 1: factor (see angle_helper)
 
 
 # Tick Formatter
diff --git a/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py b/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py
index bb67dd0d78c8..34117aac880b 100644
--- a/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py
+++ b/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py
@@ -1,10 +1,14 @@
 """
 An experimental support for curvilinear grid.
 """
+
+import functools
 from itertools import chain
 
 import numpy as np
 
+import matplotlib as mpl
+from matplotlib import _api
 from matplotlib.path import Path
 from matplotlib.transforms import Affine2D, IdentityTransform
 from .axislines import AxisArtistHelper, GridHelperBase
@@ -31,21 +35,11 @@ def __init__(self, grid_helper, side, nth_coord_ticks=None):
         self.nth_coord_ticks = nth_coord_ticks
 
         self.side = side
-        self._limits_inverted = False
 
     def update_lim(self, axes):
         self.grid_helper.update_lim(axes)
 
-        if self.nth_coord == 0:
-            xy1, xy2 = axes.get_ylim()
-        else:
-            xy1, xy2 = axes.get_xlim()
-
-        if xy1 > xy2:
-            self._limits_inverted = True
-        else:
-            self._limits_inverted = False
-
+    @_api.deprecated("3.5")
     def change_tick_coord(self, coord_number=None):
         if coord_number is None:
             self.nth_coord_ticks = 1 - self.nth_coord_ticks
@@ -59,35 +53,30 @@ def get_tick_transform(self, axes):
 
     def get_tick_iterators(self, axes):
         """tick_loc, tick_angle, tick_label"""
-
-        g = self.grid_helper
-
-        if self._limits_inverted:
+        v1, v2 = axes.get_ylim() if self.nth_coord == 0 else axes.get_xlim()
+        if v1 > v2:  # Inverted limits.
             side = {"left": "right", "right": "left",
                     "top": "bottom", "bottom": "top"}[self.side]
         else:
             side = self.side
-
+        g = self.grid_helper
         ti1 = g.get_tick_iterator(self.nth_coord_ticks, side)
         ti2 = g.get_tick_iterator(1-self.nth_coord_ticks, side, minor=True)
-
         return chain(ti1, ti2), iter([])
 
 
 class FloatingAxisArtistHelper(AxisArtistHelper.Floating):
+    grid_info = _api.deprecate_privatize_attribute("3.5")
 
     def __init__(self, grid_helper, nth_coord, value, axis_direction=None):
         """
         nth_coord = along which coordinate value varies.
          nth_coord = 0 ->  x axis, nth_coord = 1 -> y axis
         """
-
         super().__init__(nth_coord, value)
         self.value = value
         self.grid_helper = grid_helper
         self._extremes = -np.inf, np.inf
-
-        self._get_line_path = None  # a method that returns a Path.
         self._line_num_points = 100  # number of points to create a line
 
     def set_extremes(self, e1, e2):
@@ -129,10 +118,10 @@ def update_lim(self, axes):
             yy0 = np.full(self._line_num_points, self.value)
             xx, yy = grid_finder.transform_xy(xx0, yy0)
 
-        self.grid_info = {
+        self._grid_info = {
             "extremes": (lon_min, lon_max, lat_min, lat_max),
-            "lon_info": (lon_levs, lon_n, lon_factor),
-            "lat_info": (lat_levs, lat_n, lat_factor),
+            "lon_info": (lon_levs, lon_n, np.asarray(lon_factor)),
+            "lat_info": (lat_levs, lat_n, np.asarray(lat_factor)),
             "lon_labels": grid_finder.tick_formatter1(
                 "bottom", lon_factor, lon_levs),
             "lat_labels": grid_finder.tick_formatter2(
@@ -145,7 +134,7 @@ def get_axislabel_transform(self, axes):
 
     def get_axislabel_pos_angle(self, axes):
 
-        extremes = self.grid_info["extremes"]
+        extremes = self._grid_info["extremes"]
 
         if self.nth_coord == 0:
             xx0 = self.value
@@ -180,13 +169,11 @@ def get_tick_iterators(self, axes):
 
         grid_finder = self.grid_helper.grid_finder
 
-        lat_levs, lat_n, lat_factor = self.grid_info["lat_info"]
-        lat_levs = np.asarray(lat_levs)
+        lat_levs, lat_n, lat_factor = self._grid_info["lat_info"]
         yy0 = lat_levs / lat_factor
         dy = 0.01 / lat_factor
 
-        lon_levs, lon_n, lon_factor = self.grid_info["lon_info"]
-        lon_levs = np.asarray(lon_levs)
+        lon_levs, lon_n, lon_factor = self._grid_info["lon_info"]
         xx0 = lon_levs / lon_factor
         dx = 0.01 / lon_factor
 
@@ -194,18 +181,16 @@ def get_tick_iterators(self, axes):
 
         if self.nth_coord == 0:
             mask = (e0 <= yy0) & (yy0 <= e1)
-            #xx0, yy0 = xx0[mask], yy0[mask]
+            # xx0, yy0 = xx0[mask], yy0[mask]
             yy0 = yy0[mask]
         elif self.nth_coord == 1:
             mask = (e0 <= xx0) & (xx0 <= e1)
-            #xx0, yy0 = xx0[mask], yy0[mask]
+            # xx0, yy0 = xx0[mask], yy0[mask]
             xx0 = xx0[mask]
 
         def transform_xy(x, y):
-            x1, y1 = grid_finder.transform_xy(x, y)
-            x2y2 = axes.transData.transform(np.array([x1, y1]).transpose())
-            x2, y2 = x2y2.transpose()
-            return x2, y2
+            trf = grid_finder.get_transform() + axes.transData
+            return trf.transform(np.column_stack([x, y])).T
 
         # find angles
         if self.nth_coord == 0:
@@ -221,7 +206,7 @@ def transform_xy(x, y):
             xx2a, yy2a = transform_xy(xx0, yy0)
             xx2b, yy2b = transform_xy(xx0, yy0+dy)
 
-            labels = self.grid_info["lat_labels"]
+            labels = self._grid_info["lat_labels"]
             labels = [l for l, m in zip(labels, mask) if m]
 
         elif self.nth_coord == 1:
@@ -237,7 +222,7 @@ def transform_xy(x, y):
             xx2a, yy2a = transform_xy(xx00, yy0)
             xx2b, yy2b = transform_xy(xx00+dx, yy0)
 
-            labels = self.grid_info["lon_labels"]
+            labels = self._grid_info["lon_labels"]
             labels = [l for l, m in zip(labels, mask) if m]
 
         def f1():
@@ -247,10 +232,11 @@ def f1():
             dd[mm] = dd2[mm] + np.pi / 2
 
             tick_to_axes = self.get_tick_transform(axes) - axes.transAxes
+            in_01 = functools.partial(
+                mpl.transforms._interval_contains_close, (0, 1))
             for x, y, d, d2, lab in zip(xx1, yy1, dd, dd2, labels):
                 c2 = tick_to_axes.transform((x, y))
-                delta = 0.00001
-                if 0-delta <= c2[0] <= 1+delta and 0-delta <= c2[1] <= 1+delta:
+                if in_01(c2[0]) and in_01(c2[1]):
                     d1, d2 = np.rad2deg([d, d2])
                     yield [x, y], d1, d2, lab
 
@@ -261,15 +247,12 @@ def get_line_transform(self, axes):
 
     def get_line(self, axes):
         self.update_lim(axes)
-        x, y = self.grid_info["line_xy"]
-
-        if self._get_line_path is None:
-            return Path(np.column_stack([x, y]))
-        else:
-            return self._get_line_path(axes, x, y)
+        x, y = self._grid_info["line_xy"]
+        return Path(np.column_stack([x, y]))
 
 
 class GridHelperCurveLinear(GridHelperBase):
+    grid_info = _api.deprecate_privatize_attribute("3.5")
 
     def __init__(self, aux_trans,
                  extreme_finder=None,
@@ -288,7 +271,7 @@ def __init__(self, aux_trans,
         e.g., ``x2, y2 = trans(x1, y1)``
         """
         super().__init__()
-        self.grid_info = None
+        self._grid_info = None
         self._aux_trans = aux_trans
         self.grid_finder = GridFinder(aux_trans,
                                       extreme_finder,
@@ -297,10 +280,10 @@ def __init__(self, aux_trans,
                                       tick_formatter1,
                                       tick_formatter2)
 
-    def update_grid_finder(self, aux_trans=None, **kw):
+    def update_grid_finder(self, aux_trans=None, **kwargs):
         if aux_trans is not None:
             self.grid_finder.update_transform(aux_trans)
-        self.grid_finder.update(**kw)
+        self.grid_finder.update(**kwargs)
         self._old_limits = None  # Force revalidation.
 
     def new_fixed_axis(self, loc,
@@ -347,15 +330,15 @@ def new_floating_axis(self, nth_coord,
         return axisline
 
     def _update_grid(self, x1, y1, x2, y2):
-        self.grid_info = self.grid_finder.get_grid_info(x1, y1, x2, y2)
+        self._grid_info = self.grid_finder.get_grid_info(x1, y1, x2, y2)
 
     def get_gridlines(self, which="major", axis="both"):
         grid_lines = []
         if axis in ["both", "x"]:
-            for gl in self.grid_info["lon"]["lines"]:
+            for gl in self._grid_info["lon"]["lines"]:
                 grid_lines.extend(gl)
         if axis in ["both", "y"]:
-            for gl in self.grid_info["lat"]["lines"]:
+            for gl in self._grid_info["lat"]["lines"]:
                 grid_lines.extend(gl)
         return grid_lines
 
@@ -367,15 +350,15 @@ def get_tick_iterator(self, nth_coord, axis_side, minor=False):
         lon_or_lat = ["lon", "lat"][nth_coord]
         if not minor:  # major ticks
             for (xy, a), l in zip(
-                    self.grid_info[lon_or_lat]["tick_locs"][axis_side],
-                    self.grid_info[lon_or_lat]["tick_labels"][axis_side]):
+                    self._grid_info[lon_or_lat]["tick_locs"][axis_side],
+                    self._grid_info[lon_or_lat]["tick_labels"][axis_side]):
                 angle_normal = a
                 yield xy, angle_normal, angle_tangent, l
         else:
             for (xy, a), l in zip(
-                    self.grid_info[lon_or_lat]["tick_locs"][axis_side],
-                    self.grid_info[lon_or_lat]["tick_labels"][axis_side]):
+                    self._grid_info[lon_or_lat]["tick_locs"][axis_side],
+                    self._grid_info[lon_or_lat]["tick_labels"][axis_side]):
                 angle_normal = a
                 yield xy, angle_normal, angle_tangent, ""
-            # for xy, a, l in self.grid_info[lon_or_lat]["ticks"][axis_side]:
+            # for xy, a, l in self._grid_info[lon_or_lat]["ticks"][axis_side]:
             #     yield xy, a, ""
diff --git a/lib/mpl_toolkits/axisartist/parasite_axes.py b/lib/mpl_toolkits/axisartist/parasite_axes.py
index b4d1955bb1b5..feeecf6d907b 100644
--- a/lib/mpl_toolkits/axisartist/parasite_axes.py
+++ b/lib/mpl_toolkits/axisartist/parasite_axes.py
@@ -1,12 +1,9 @@
-from matplotlib import _api
 from mpl_toolkits.axes_grid1.parasite_axes import (
     host_axes_class_factory, parasite_axes_class_factory,
-    parasite_axes_auxtrans_class_factory, subplot_class_factory)
+    subplot_class_factory)
 from .axislines import Axes
 
 
 ParasiteAxes = parasite_axes_class_factory(Axes)
 HostAxes = host_axes_class_factory(Axes)
 SubplotHost = subplot_class_factory(HostAxes)
-with _api.suppress_matplotlib_deprecation_warning():
-    ParasiteAxesAuxTrans = parasite_axes_auxtrans_class_factory(ParasiteAxes)
diff --git a/lib/mpl_toolkits/mplot3d/__init__.py b/lib/mpl_toolkits/mplot3d/__init__.py
index 30e682aea018..a089fbd6b70e 100644
--- a/lib/mpl_toolkits/mplot3d/__init__.py
+++ b/lib/mpl_toolkits/mplot3d/__init__.py
@@ -1 +1,3 @@
 from .axes3d import Axes3D
+
+__all__ = ['Axes3D']
diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py
index 822ff79fcc24..82c6d8bbf290 100644
--- a/lib/mpl_toolkits/mplot3d/art3d.py
+++ b/lib/mpl_toolkits/mplot3d/art3d.py
@@ -12,8 +12,7 @@
 import numpy as np
 
 from matplotlib import (
-    _api, artist, cbook, colors as mcolors, lines, text as mtext,
-    path as mpath)
+    artist, cbook, colors as mcolors, lines, text as mtext, path as mpath)
 from matplotlib.collections import (
     LineCollection, PolyCollection, PatchCollection, PathCollection)
 from matplotlib.colors import Normalize
@@ -145,7 +144,7 @@ def draw(self, renderer):
             mtext.Text.draw(self, renderer)
         self.stale = False
 
-    def get_tightbbox(self, renderer):
+    def get_tightbbox(self, renderer=None):
         # Overwriting the 2d Text behavior which is not valid for 3d.
         # For now, just return None to exclude from layout calculation.
         return None
@@ -172,7 +171,8 @@ def __init__(self, xs, ys, zs, *args, **kwargs):
     def set_3d_properties(self, zs=0, zdir='z'):
         xs = self.get_xdata()
         ys = self.get_ydata()
-        zs = np.broadcast_to(zs, xs.shape)
+        zs = cbook._to_unmasked_float_array(zs).ravel()
+        zs = np.broadcast_to(zs, len(xs))
         self._verts3d = juggle_axes(xs, ys, zs, zdir)
         self.stale = True
 
@@ -297,13 +297,10 @@ def set_segments(self, segments):
         self._segments3d = segments
         super().set_segments([])
 
-    @_api.delete_parameter('3.4', 'renderer')
-    def do_3d_projection(self, renderer=None):
+    def do_3d_projection(self):
         """
         Project the points according to renderer matrix.
         """
-        # see _update_scalarmappable docstring for why this must be here
-        _update_scalarmappable(self)
         xyslist = [proj3d.proj_trans_points(points, self.axes.M)
                    for points in self._segments3d]
         segments_2d = [np.column_stack([xs, ys]) for xs, ys, zs in xyslist]
@@ -315,14 +312,6 @@ def do_3d_projection(self, renderer=None):
             minz = min(minz, min(zs))
         return minz
 
-    @artist.allow_rasterization
-    @_api.delete_parameter('3.4', 'project',
-                           alternative='Line3DCollection.do_3d_projection')
-    def draw(self, renderer, project=False):
-        if project:
-            self.do_3d_projection()
-        super().draw(renderer)
-
 
 def line_collection_2d_to_3d(col, zs=0, zdir='z'):
     """Convert a LineCollection to a Line3DCollection object."""
@@ -348,8 +337,7 @@ def set_3d_properties(self, verts, zs=0, zdir='z'):
     def get_path(self):
         return self._path2d
 
-    @_api.delete_parameter('3.4', 'renderer')
-    def do_3d_projection(self, renderer=None):
+    def do_3d_projection(self):
         s = self._segment3d
         xs, ys, zs = zip(*s)
         vxs, vys, vzs, vis = proj3d.proj_transform_clip(xs, ys, zs,
@@ -372,8 +360,7 @@ def set_3d_properties(self, path, zs=0, zdir='z'):
         Patch3D.set_3d_properties(self, path.vertices, zs=zs, zdir=zdir)
         self._code3d = path.codes
 
-    @_api.delete_parameter('3.4', 'renderer')
-    def do_3d_projection(self, renderer=None):
+    def do_3d_projection(self):
         s = self._segment3d
         xs, ys, zs = zip(*s)
         vxs, vys, vzs, vis = proj3d.proj_transform_clip(xs, ys, zs,
@@ -448,16 +435,6 @@ def set_depthshade(self, depthshade):
         self._depthshade = depthshade
         self.stale = True
 
-    def set_facecolor(self, c):
-        # docstring inherited
-        super().set_facecolor(c)
-        self._facecolor3d = self.get_facecolor()
-
-    def set_edgecolor(self, c):
-        # docstring inherited
-        super().set_edgecolor(c)
-        self._edgecolor3d = self.get_edgecolor()
-
     def set_sort_zpos(self, val):
         """Set the position to use for z-sorting."""
         self._sort_zpos = val
@@ -474,27 +451,15 @@ def set_3d_properties(self, zs, zdir):
             xs = []
             ys = []
         self._offsets3d = juggle_axes(xs, ys, np.atleast_1d(zs), zdir)
-        self._facecolor3d = self.get_facecolor()
-        self._edgecolor3d = self.get_edgecolor()
+        self._z_markers_idx = slice(-1)
+        self._vzs = None
         self.stale = True
 
-    @_api.delete_parameter('3.4', 'renderer')
-    def do_3d_projection(self, renderer=None):
-        # see _update_scalarmappable docstring for why this must be here
-        _update_scalarmappable(self)
+    def do_3d_projection(self):
         xs, ys, zs = self._offsets3d
         vxs, vys, vzs, vis = proj3d.proj_transform_clip(xs, ys, zs,
                                                         self.axes.M)
-
-        fcs = (_zalpha(self._facecolor3d, vzs) if self._depthshade else
-               self._facecolor3d)
-        fcs = mcolors.to_rgba_array(fcs, self._alpha)
-        super().set_facecolor(fcs)
-
-        ecs = (_zalpha(self._edgecolor3d, vzs) if self._depthshade else
-               self._edgecolor3d)
-        ecs = mcolors.to_rgba_array(ecs, self._alpha)
-        super().set_edgecolor(ecs)
+        self._vzs = vzs
         super().set_offsets(np.column_stack([vxs, vys]))
 
         if vzs.size > 0:
@@ -502,6 +467,27 @@ def do_3d_projection(self, renderer=None):
         else:
             return np.nan
 
+    def _maybe_depth_shade_and_sort_colors(self, color_array):
+        color_array = (
+            _zalpha(color_array, self._vzs)
+            if self._vzs is not None and self._depthshade
+            else color_array
+        )
+        if len(color_array) > 1:
+            color_array = color_array[self._z_markers_idx]
+        return mcolors.to_rgba_array(color_array, self._alpha)
+
+    def get_facecolor(self):
+        return self._maybe_depth_shade_and_sort_colors(super().get_facecolor())
+
+    def get_edgecolor(self):
+        # We need this check here to make sure we do not double-apply the depth
+        # based alpha shading when the edge color is "face" which means the
+        # edge colour should be identical to the face colour.
+        if cbook._str_equal(self._edgecolors, 'face'):
+            return self.get_facecolor()
+        return self._maybe_depth_shade_and_sort_colors(super().get_edgecolor())
+
 
 class Path3DCollection(PathCollection):
     """
@@ -525,9 +511,14 @@ def __init__(self, *args, zs=0, zdir='z', depthshade=True, **kwargs):
         This is typically desired in scatter plots.
         """
         self._depthshade = depthshade
+        self._in_draw = False
         super().__init__(*args, **kwargs)
         self.set_3d_properties(zs, zdir)
 
+    def draw(self, renderer):
+        with cbook._setattr_cm(self, _in_draw=True):
+            super().draw(renderer)
+
     def set_sort_zpos(self, val):
         """Set the position to use for z-sorting."""
         self._sort_zpos = val
@@ -544,12 +535,37 @@ def set_3d_properties(self, zs, zdir):
             xs = []
             ys = []
         self._offsets3d = juggle_axes(xs, ys, np.atleast_1d(zs), zdir)
-        self._facecolor3d = self.get_facecolor()
-        self._edgecolor3d = self.get_edgecolor()
-        self._sizes3d = self.get_sizes()
-        self._linewidth3d = self.get_linewidth()
+        # In the base draw methods we access the attributes directly which
+        # means we can not resolve the shuffling in the getter methods like
+        # we do for the edge and face colors.
+        #
+        # This means we need to carry around a cache of the unsorted sizes and
+        # widths (postfixed with 3d) and in `do_3d_projection` set the
+        # depth-sorted version of that data into the private state used by the
+        # base collection class in its draw method.
+        #
+        # Grab the current sizes and linewidths to preserve them.
+        self._sizes3d = self._sizes
+        self._linewidths3d = np.array(self._linewidths)
+        xs, ys, zs = self._offsets3d
+
+        # Sort the points based on z coordinates
+        # Performance optimization: Create a sorted index array and reorder
+        # points and point properties according to the index array
+        self._z_markers_idx = slice(-1)
+        self._vzs = None
         self.stale = True
 
+    def set_sizes(self, sizes, dpi=72.0):
+        super().set_sizes(sizes, dpi)
+        if not self._in_draw:
+            self._sizes3d = sizes
+
+    def set_linewidth(self, lw):
+        super().set_linewidth(lw)
+        if not self._in_draw:
+            self._linewidths3d = np.array(self._linewidths)
+
     def get_depthshade(self):
         return self._depthshade
 
@@ -566,142 +582,56 @@ def set_depthshade(self, depthshade):
         self._depthshade = depthshade
         self.stale = True
 
-    def set_facecolor(self, c):
-        # docstring inherited
-        super().set_facecolor(c)
-        self._facecolor3d = self.get_facecolor()
-
-    def set_edgecolor(self, c):
-        # docstring inherited
-        super().set_edgecolor(c)
-        self._edgecolor3d = self.get_edgecolor()
-
-    def set_sizes(self, sizes, dpi=72.0):
-        # docstring inherited
-        super().set_sizes(sizes, dpi=dpi)
-        self._sizes3d = self.get_sizes()
-
-    def set_linewidth(self, lw):
-        # docstring inherited
-        super().set_linewidth(lw)
-        self._linewidth3d = self.get_linewidth()
-
-    @_api.delete_parameter('3.4', 'renderer')
-    def do_3d_projection(self, renderer=None):
-        # see _update_scalarmappable docstring for why this must be here
-        _update_scalarmappable(self)
+    def do_3d_projection(self):
         xs, ys, zs = self._offsets3d
         vxs, vys, vzs, vis = proj3d.proj_transform_clip(xs, ys, zs,
                                                         self.axes.M)
-
-        fcs = (_zalpha(self._facecolor3d, vzs) if self._depthshade else
-               self._facecolor3d)
-        ecs = (_zalpha(self._edgecolor3d, vzs) if self._depthshade else
-               self._edgecolor3d)
-        sizes = self._sizes3d
-        lws = self._linewidth3d
-
         # Sort the points based on z coordinates
         # Performance optimization: Create a sorted index array and reorder
         # points and point properties according to the index array
-        z_markers_idx = np.argsort(vzs)[::-1]
+        z_markers_idx = self._z_markers_idx = np.argsort(vzs)[::-1]
+        self._vzs = vzs
+
+        # we have to special case the sizes because of code in collections.py
+        # as the draw method does
+        #      self.set_sizes(self._sizes, self.figure.dpi)
+        # so we can not rely on doing the sorting on the way out via get_*
+
+        if len(self._sizes3d) > 1:
+            self._sizes = self._sizes3d[z_markers_idx]
+
+        if len(self._linewidths3d) > 1:
+            self._linewidths = self._linewidths3d[z_markers_idx]
 
         # Re-order items
         vzs = vzs[z_markers_idx]
         vxs = vxs[z_markers_idx]
         vys = vys[z_markers_idx]
-        if len(fcs) > 1:
-            fcs = fcs[z_markers_idx]
-        if len(ecs) > 1:
-            ecs = ecs[z_markers_idx]
-        if len(sizes) > 1:
-            sizes = sizes[z_markers_idx]
-        if len(lws) > 1:
-            lws = lws[z_markers_idx]
-        vps = np.column_stack((vxs, vys))
-
-        fcs = mcolors.to_rgba_array(fcs, self._alpha)
-        ecs = mcolors.to_rgba_array(ecs, self._alpha)
-
-        super().set_edgecolor(ecs)
-        super().set_facecolor(fcs)
-        super().set_sizes(sizes)
-        super().set_linewidth(lws)
-
-        PathCollection.set_offsets(self, vps)
 
-        return np.min(vzs) if vzs.size else np.nan
+        PathCollection.set_offsets(self, np.column_stack((vxs, vys)))
 
+        return np.min(vzs) if vzs.size else np.nan
 
-def _update_scalarmappable(sm):
-    """
-    Update a 3D ScalarMappable.
-
-    With ScalarMappable objects if the data, colormap, or norm are
-    changed, we need to update the computed colors.  This is handled
-    by the base class method update_scalarmappable.  This method works
-    by detecting if work needs to be done, and if so stashing it on
-    the ``self._facecolors`` attribute.
-
-    With 3D collections we internally sort the components so that
-    things that should be "in front" are rendered later to simulate
-    having a z-buffer (in addition to doing the projections).  This is
-    handled in the ``do_3d_projection`` methods which are called from the
-    draw method of the 3D Axes.  These methods:
-
-    - do the projection from 3D -> 2D
-    - internally sort based on depth
-    - stash the results of the above in the 2D analogs of state
-    - return the z-depth of the whole artist
-
-    the last step is so that we can, at the Axes level, sort the children by
-    depth.
-
-    The base `draw` method of the 2D artists unconditionally calls
-    update_scalarmappable and rely on the method's internal caching logic to
-    lazily evaluate.
-
-    These things together mean you can have the sequence of events:
-
-    - we create the artist, do the color mapping and stash the results
-      in a 3D specific state.
-    - change something about the ScalarMappable that marks it as in
-      need of an update (`ScalarMappable.changed` and friends).
-    - We call do_3d_projection and shuffle the stashed colors into the
-      2D version of face colors
-    - the draw method calls the update_scalarmappable method which
-      overwrites our shuffled colors
-    - we get a render that is wrong
-    - if we re-render (either with a second save or implicitly via
-      tight_layout / constrained_layout / bbox_inches='tight' (ex via
-      inline's defaults)) we again shuffle the 3D colors
-    - because the CM is not marked as changed update_scalarmappable is
-      a no-op and we get a correct looking render.
-
-    This function is an internal helper to:
-
-    - sort out if we need to do the color mapping at all (has data!)
-    - sort out if update_scalarmappable is going to be a no-op
-    - copy the data over from the 2D -> 3D version
-
-    This must be called first thing in do_3d_projection to make sure that
-    the correct colors get shuffled.
+    def _maybe_depth_shade_and_sort_colors(self, color_array):
+        color_array = (
+            _zalpha(color_array, self._vzs)
+            if self._vzs is not None and self._depthshade
+            else color_array
+        )
+        if len(color_array) > 1:
+            color_array = color_array[self._z_markers_idx]
+        return mcolors.to_rgba_array(color_array, self._alpha)
 
-    Parameters
-    ----------
-    sm : ScalarMappable
-        The ScalarMappable to update and stash the 3D data from
+    def get_facecolor(self):
+        return self._maybe_depth_shade_and_sort_colors(super().get_facecolor())
 
-    """
-    if sm._A is None:
-        return
-    copy_state = sm._update_dict['array']
-    ret = sm.update_scalarmappable()
-    if copy_state:
-        if sm._face_is_mapped:
-            sm._facecolor3d = sm._facecolors
-        elif sm._edge_is_mapped:  # Should this be plain "if"?
-            sm._edgecolor3d = sm._edgecolors
+    def get_edgecolor(self):
+        # We need this check here to make sure we do not double-apply the depth
+        # based alpha shading when the edge color is "face" which means the
+        # edge colour should be identical to the face colour.
+        if cbook._str_equal(self._edgecolors, 'face'):
+            return self.get_facecolor()
+        return self._maybe_depth_shade_and_sort_colors(super().get_edgecolor())
 
 
 def patch_collection_2d_to_3d(col, zs=0, zdir='z', depthshade=True):
@@ -727,6 +657,7 @@ def patch_collection_2d_to_3d(col, zs=0, zdir='z', depthshade=True):
     elif isinstance(col, PatchCollection):
         col.__class__ = Patch3DCollection
     col._depthshade = depthshade
+    col._in_draw = False
     col.set_3d_properties(zs, zdir)
 
 
@@ -770,6 +701,12 @@ def __init__(self, verts, *args, zsort='average', **kwargs):
         and _edgecolors properties.
         """
         super().__init__(verts, *args, **kwargs)
+        if isinstance(verts, np.ndarray):
+            if verts.ndim != 3:
+                raise ValueError('verts must be a list of (N, 3) array-like')
+        else:
+            if any(len(np.shape(vert)) != 2 for vert in verts):
+                raise ValueError('verts must be a list of (N, 3) array-like')
         self.set_zsort(zsort)
         self._codes3d = None
 
@@ -836,14 +773,23 @@ def set_sort_zpos(self, val):
         self._sort_zpos = val
         self.stale = True
 
-    @_api.delete_parameter('3.4', 'renderer')
-    def do_3d_projection(self, renderer=None):
+    def do_3d_projection(self):
         """
         Perform the 3D projection for this object.
         """
-        # see _update_scalarmappable docstring for why this must be here
-        _update_scalarmappable(self)
-
+        if self._A is not None:
+            # force update of color mapping because we re-order them
+            # below.  If we do not do this here, the 2D draw will call
+            # this, but we will never port the color mapped values back
+            # to the 3D versions.
+            #
+            # We hold the 3D versions in a fixed order (the order the user
+            # passed in) and sort the 2D version by view depth.
+            self.update_scalarmappable()
+            if self._face_is_mapped:
+                self._facecolor3d = self._facecolors
+            if self._edge_is_mapped:
+                self._edgecolor3d = self._edgecolors
         txs, tys, tzs = proj3d._proj_transform_vec(self._vec, self.axes.M)
         xyzlist = [(txs[sl], tys[sl], tzs[sl]) for sl in self._segslices]
 
@@ -922,9 +868,19 @@ def set_alpha(self, alpha):
         self.stale = True
 
     def get_facecolor(self):
+        # docstring inherited
+        # self._facecolors2d is not initialized until do_3d_projection
+        if not hasattr(self, '_facecolors2d'):
+            self.axes.M = self.axes.get_proj()
+            self.do_3d_projection()
         return self._facecolors2d
 
     def get_edgecolor(self):
+        # docstring inherited
+        # self._edgecolors2d is not initialized until do_3d_projection
+        if not hasattr(self, '_edgecolors2d'):
+            self.axes.M = self.axes.get_proj()
+            self.do_3d_projection()
         return self._edgecolors2d
 
 
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
index 44fffb740539..3d793addc91e 100644
--- a/lib/mpl_toolkits/mplot3d/axes3d.py
+++ b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -14,20 +14,22 @@
 import functools
 import itertools
 import math
-from numbers import Integral
 import textwrap
 
 import numpy as np
 
-from matplotlib import _api, artist, cbook, docstring
+import matplotlib as mpl
+from matplotlib import _api, cbook, _docstring, _preprocess_data
+import matplotlib.artist as martist
 import matplotlib.axes as maxes
 import matplotlib.collections as mcoll
 import matplotlib.colors as mcolors
+import matplotlib.image as mimage
 import matplotlib.lines as mlines
-import matplotlib.scale as mscale
+import matplotlib.patches as mpatches
 import matplotlib.container as mcontainer
 import matplotlib.transforms as mtransforms
-from matplotlib.axes import Axes, rcParams
+from matplotlib.axes import Axes
 from matplotlib.axes._base import _axis_method_wrapper, _process_plot_format
 from matplotlib.transforms import Bbox
 from matplotlib.tri.triangulation import Triangulation
@@ -37,53 +39,82 @@
 from . import axis3d
 
 
-@cbook._define_aliases({
-    "xlim3d": ["xlim"], "ylim3d": ["ylim"], "zlim3d": ["zlim"]})
+@_docstring.interpd
+@_api.define_aliases({
+    "xlim": ["xlim3d"], "ylim": ["ylim3d"], "zlim": ["zlim3d"]})
 class Axes3D(Axes):
     """
-    3D axes object.
+    3D Axes object.
     """
     name = '3d'
-    _shared_z_axes = cbook.Grouper()
+
+    _axis_names = ("x", "y", "z")
+    Axes._shared_axes["z"] = cbook.Grouper()
+
+    dist = _api.deprecate_privatize_attribute("3.6")
 
     def __init__(
             self, fig, rect=None, *args,
-            azim=-60, elev=30, sharez=None, proj_type='persp',
-            box_aspect=None,
+            elev=30, azim=-60, roll=0, sharez=None, proj_type='persp',
+            box_aspect=None, computed_zorder=True, focal_length=None,
             **kwargs):
         """
         Parameters
         ----------
         fig : Figure
             The parent figure.
-        rect : (float, float, float, float)
+        rect : tuple (left, bottom, width, height), default: None.
             The ``(left, bottom, width, height)`` axes position.
-        azim : float, default: -60
-            Azimuthal viewing angle.
         elev : float, default: 30
-            Elevation viewing angle.
+            The elevation angle in degrees rotates the camera above and below
+            the x-y plane, with a positive angle corresponding to a location
+            above the plane.
+        azim : float, default: -60
+            The azimuthal angle in degrees rotates the camera about the z axis,
+            with a positive angle corresponding to a right-handed rotation. In
+            other words, a positive azimuth rotates the camera about the origin
+            from its location along the +x axis towards the +y axis.
+        roll : float, default: 0
+            The roll angle in degrees rotates the camera about the viewing
+            axis. A positive angle spins the camera clockwise, causing the
+            scene to rotate counter-clockwise.
         sharez : Axes3D, optional
-            Other axes to share z-limits with.
+            Other Axes to share z-limits with.
         proj_type : {'persp', 'ortho'}
             The projection type, default 'persp'.
-        auto_add_to_figure : bool, default: True
+        box_aspect : 3-tuple of floats, default: None
+            Changes the physical dimensions of the Axes3D, such that the ratio
+            of the axis lengths in display units is x:y:z.
+            If None, defaults to 4:4:3
+        computed_zorder : bool, default: True
+            If True, the draw order is computed based on the average position
+            of the `.Artist`\\s along the view direction.
+            Set to False if you want to manually control the order in which
+            Artists are drawn on top of each other using their *zorder*
+            attribute. This can be used for fine-tuning if the automatic order
+            does not produce the desired result. Note however, that a manual
+            zorder will only be correct for a limited view angle. If the figure
+            is rotated by the user, it will look wrong from certain angles.
+        auto_add_to_figure : bool, default: False
             Prior to Matplotlib 3.4 Axes3D would add themselves
             to their host Figure on init.  Other Axes class do not
             do this.
 
-            This behavior is deprecated in 3.4, the default will
-            change to False in 3.5.  The keyword will be undocumented
-            and a non-False value will be an error in 3.6.
+            This behavior is deprecated in 3.4, the default is
+            changed to False in 3.6.  The keyword will be undocumented
+            and a non-False value will be an error in 3.7.
+        focal_length : float, default: None
+            For a projection type of 'persp', the focal length of the virtual
+            camera. Must be > 0. If None, defaults to 1.
+            For a projection type of 'ortho', must be set to either None
+            or infinity (numpy.inf). If None, defaults to infinity.
+            The focal length can be computed from a desired Field Of View via
+            the equation: focal_length = 1/tan(FOV/2)
 
         **kwargs
             Other optional keyword arguments:
 
-            %(Axes3D_kwdoc)s
-
-        Notes
-        -----
-        .. versionadded:: 1.2.1
-            The *sharez* parameter.
+            %(Axes3D:kwdoc)s
         """
 
         if rect is None:
@@ -91,24 +122,26 @@ def __init__(
 
         self.initial_azim = azim
         self.initial_elev = elev
-        self.set_proj_type(proj_type)
+        self.initial_roll = roll
+        self.set_proj_type(proj_type, focal_length)
+        self.computed_zorder = computed_zorder
 
         self.xy_viewLim = Bbox.unit()
         self.zz_viewLim = Bbox.unit()
         self.xy_dataLim = Bbox.unit()
+        # z-limits are encoded in the x-component of the Bbox, y is un-used
         self.zz_dataLim = Bbox.unit()
-        self._stale_viewlim_z = False
 
         # inhibit autoscale_view until the axes are defined
         # they can't be defined until Axes.__init__ has been called
-        self.view_init(self.initial_elev, self.initial_azim)
+        self.view_init(self.initial_elev, self.initial_azim, self.initial_roll)
 
         self._sharez = sharez
         if sharez is not None:
-            self._shared_z_axes.join(self, sharez)
+            self._shared_axes["z"].join(self, sharez)
             self._adjustable = 'datalim'
 
-        auto_add_to_figure = kwargs.pop('auto_add_to_figure', True)
+        auto_add_to_figure = kwargs.pop('auto_add_to_figure', False)
 
         super().__init__(
             fig, rect, frameon=True, box_aspect=box_aspect, *args, **kwargs
@@ -123,14 +156,12 @@ def __init__(
         self.fmt_zdata = None
 
         self.mouse_init()
-        self.figure.canvas.callbacks._pickled_cids.update({
-            self.figure.canvas.mpl_connect(
-                'motion_notify_event', self._on_move),
-            self.figure.canvas.mpl_connect(
-                'button_press_event', self._button_press),
-            self.figure.canvas.mpl_connect(
-                'button_release_event', self._button_release),
-        })
+        self.figure.canvas.callbacks._connect_picklable(
+            'motion_notify_event', self._on_move)
+        self.figure.canvas.callbacks._connect_picklable(
+            'button_press_event', self._button_press)
+        self.figure.canvas.callbacks._connect_picklable(
+            'button_release_event', self._button_release)
         self.set_top_view()
 
         self.patch.set_linewidth(0)
@@ -144,12 +175,12 @@ def __init__(
 
         if auto_add_to_figure:
             _api.warn_deprecated(
-                "3.4", removal="3.6", message="Axes3D(fig) adding itself "
+                "3.4", removal="3.7", message="Axes3D(fig) adding itself "
                 "to the figure is deprecated since %(since)s. "
                 "Pass the keyword argument auto_add_to_figure=False "
                 "and use fig.add_axes(ax) to suppress this warning. "
-                "The default value of auto_add_to_figure will change to "
-                "False in mpl3.5 and True values will "
+                "The default value of auto_add_to_figure is changed to "
+                "False in mpl3.6 and True values will "
                 "no longer work %(removal)s.  This is consistent with "
                 "other Axes classes.")
             fig.add_axes(self)
@@ -164,36 +195,28 @@ def set_axis_on(self):
 
     def convert_zunits(self, z):
         """
-        For artists in an axes, if the zaxis has units support,
+        For artists in an Axes, if the zaxis has units support,
         convert *z* using zaxis unit type
-
-        .. versionadded:: 1.2.1
-
         """
         return self.zaxis.convert_units(z)
 
     def set_top_view(self):
         # this happens to be the right view for the viewing coordinates
         # moved up and to the left slightly to fit labels and axes
-        xdwl = 0.95 / self.dist
-        xdw = 0.9 / self.dist
-        ydwl = 0.95 / self.dist
-        ydw = 0.9 / self.dist
-        # This is purposely using the 2D Axes's set_xlim and set_ylim,
-        # because we are trying to place our viewing pane.
-        super().set_xlim(-xdwl, xdw, auto=None)
-        super().set_ylim(-ydwl, ydw, auto=None)
+        xdwl = 0.95 / self._dist
+        xdw = 0.9 / self._dist
+        ydwl = 0.95 / self._dist
+        ydw = 0.9 / self._dist
+        # Set the viewing pane.
+        self.viewLim.intervalx = (-xdwl, xdw)
+        self.viewLim.intervaly = (-ydwl, ydw)
+        self.stale = True
 
     def _init_axis(self):
         """Init 3D axes; overrides creation of regular X/Y axes."""
-        self.xaxis = axis3d.XAxis('x', self.xy_viewLim.intervalx,
-                                  self.xy_dataLim.intervalx, self)
-        self.yaxis = axis3d.YAxis('y', self.xy_viewLim.intervaly,
-                                  self.xy_dataLim.intervaly, self)
-        self.zaxis = axis3d.ZAxis('z', self.zz_viewLim.intervalx,
-                                  self.zz_dataLim.intervalx, self)
-        for ax in self.xaxis, self.yaxis, self.zaxis:
-            ax.init3d()
+        self.xaxis = axis3d.XAxis(self)
+        self.yaxis = axis3d.YAxis(self)
+        self.zaxis = axis3d.ZAxis(self)
 
     def get_zaxis(self):
         """Return the ``ZAxis`` (`~.axis3d.Axis`) instance."""
@@ -202,34 +225,13 @@ def get_zaxis(self):
     get_zgridlines = _axis_method_wrapper("zaxis", "get_gridlines")
     get_zticklines = _axis_method_wrapper("zaxis", "get_ticklines")
 
-    w_xaxis = _api.deprecated("3.1", alternative="xaxis", pending=True)(
+    w_xaxis = _api.deprecated("3.1", alternative="xaxis", removal="3.8")(
         property(lambda self: self.xaxis))
-    w_yaxis = _api.deprecated("3.1", alternative="yaxis", pending=True)(
+    w_yaxis = _api.deprecated("3.1", alternative="yaxis", removal="3.8")(
         property(lambda self: self.yaxis))
-    w_zaxis = _api.deprecated("3.1", alternative="zaxis", pending=True)(
+    w_zaxis = _api.deprecated("3.1", alternative="zaxis", removal="3.8")(
         property(lambda self: self.zaxis))
 
-    def _get_axis_list(self):
-        return super()._get_axis_list() + (self.zaxis, )
-
-    def _unstale_viewLim(self):
-        # We should arrange to store this information once per share-group
-        # instead of on every axis.
-        scalex = any(ax._stale_viewlim_x
-                     for ax in self._shared_x_axes.get_siblings(self))
-        scaley = any(ax._stale_viewlim_y
-                     for ax in self._shared_y_axes.get_siblings(self))
-        scalez = any(ax._stale_viewlim_z
-                     for ax in self._shared_z_axes.get_siblings(self))
-        if scalex or scaley or scalez:
-            for ax in self._shared_x_axes.get_siblings(self):
-                ax._stale_viewlim_x = False
-            for ax in self._shared_y_axes.get_siblings(self):
-                ax._stale_viewlim_y = False
-            for ax in self._shared_z_axes.get_siblings(self):
-                ax._stale_viewlim_z = False
-            self.autoscale_view(scalex=scalex, scaley=scaley, scalez=scalez)
-
     def unit_cube(self, vals=None):
         minx, maxx, miny, maxy, minz, maxz = vals or self.get_w_lims()
         return [(minx, miny, minz),
@@ -270,22 +272,19 @@ def set_aspect(self, aspect, adjustable=None, anchor=None, share=False):
         """
         Set the aspect ratios.
 
-        Axes 3D does not current support any aspect but 'auto' which fills
-        the axes with the data limits.
-
-        To simulate having equal aspect in data space, set the ratio
-        of your data limits to match the value of `~.get_box_aspect`.
-        To control box aspect ratios use `~.Axes3D.set_box_aspect`.
-
         Parameters
         ----------
-        aspect : {'auto'}
+        aspect : {'auto', 'equal', 'equalxy', 'equalxz', 'equalyz'}
             Possible values:
 
             =========   ==================================================
             value       description
             =========   ==================================================
             'auto'      automatic; fill the position rectangle with data.
+            'equal'     adapt all the axes to have equal aspect ratios.
+            'equalxy'   adapt the x and y axes to have equal aspect ratios.
+            'equalxz'   adapt the x and z axes to have equal aspect ratios.
+            'equalyz'   adapt the y and z axes to have equal aspect ratios.
             =========   ==================================================
 
         adjustable : None
@@ -310,7 +309,7 @@ def set_aspect(self, aspect, adjustable=None, anchor=None, share=False):
             etc.
             =====   =====================
 
-            See `.set_anchor` for further details.
+            See `~.Axes.set_anchor` for further details.
 
         share : bool, default: False
             If ``True``, apply the settings to all shared Axes.
@@ -319,46 +318,40 @@ def set_aspect(self, aspect, adjustable=None, anchor=None, share=False):
         --------
         mpl_toolkits.mplot3d.axes3d.Axes3D.set_box_aspect
         """
-        if aspect != 'auto':
-            raise NotImplementedError(
-                "Axes3D currently only supports the aspect argument "
-                f"'auto'. You passed in {aspect!r}."
-            )
-
-        if share:
-            axes = {*self._shared_x_axes.get_siblings(self),
-                    *self._shared_y_axes.get_siblings(self),
-                    *self._shared_z_axes.get_siblings(self),
-                    }
-        else:
-            axes = {self}
-
-        for ax in axes:
-            ax._aspect = aspect
-            ax.stale = True
-
-        if anchor is not None:
-            self.set_anchor(anchor, share=share)
-
-    def set_anchor(self, anchor, share=False):
-        # docstring inherited
-        if not (anchor in mtransforms.Bbox.coefs or len(anchor) == 2):
-            raise ValueError('anchor must be among %s' %
-                             ', '.join(mtransforms.Bbox.coefs))
-        if share:
-            axes = {*self._shared_x_axes.get_siblings(self),
-                    *self._shared_y_axes.get_siblings(self),
-                    *self._shared_z_axes.get_siblings(self),
-                    }
-        else:
-            axes = {self}
-        for ax in axes:
-            ax._anchor = anchor
-            ax.stale = True
+        _api.check_in_list(('auto', 'equal', 'equalxy', 'equalyz', 'equalxz'),
+                           aspect=aspect)
+        super().set_aspect(
+            aspect='auto', adjustable=adjustable, anchor=anchor, share=share)
+        self._aspect = aspect
+
+        if aspect in ('equal', 'equalxy', 'equalxz', 'equalyz'):
+            if aspect == 'equal':
+                ax_indices = [0, 1, 2]
+            elif aspect == 'equalxy':
+                ax_indices = [0, 1]
+            elif aspect == 'equalxz':
+                ax_indices = [0, 2]
+            elif aspect == 'equalyz':
+                ax_indices = [1, 2]
+
+            view_intervals = np.array([self.xaxis.get_view_interval(),
+                                       self.yaxis.get_view_interval(),
+                                       self.zaxis.get_view_interval()])
+            mean = np.mean(view_intervals, axis=1)
+            ptp = np.ptp(view_intervals, axis=1)
+            delta = max(ptp[ax_indices])
+            scale = self._box_aspect[ptp == delta][0]
+            deltas = delta * self._box_aspect / scale
+
+            for i, set_lim in enumerate((self.set_xlim3d,
+                                         self.set_ylim3d,
+                                         self.set_zlim3d)):
+                if i in ax_indices:
+                    set_lim(mean[i] - deltas[i]/2., mean[i] + deltas[i]/2.)
 
     def set_box_aspect(self, aspect, *, zoom=1):
         """
-        Set the axes box aspect.
+        Set the Axes box aspect.
 
         The box aspect is the ratio of height to width in display
         units for each face of the box when viewed perpendicular to
@@ -376,22 +369,19 @@ def set_box_aspect(self, aspect, *, zoom=1):
         aspect : 3-tuple of floats or None
             Changes the physical dimensions of the Axes3D, such that the ratio
             of the axis lengths in display units is x:y:z.
+            If None, defaults to (4,4,3).
 
-            If None, defaults to 4:4:3
-
-        zoom : float
-            Control overall size of the Axes3D in the figure.
+        zoom : float, default: 1
+            Control overall size of the Axes3D in the figure. Must be > 0.
         """
+        if zoom <= 0:
+            raise ValueError(f'Argument zoom = {zoom} must be > 0')
+
         if aspect is None:
             aspect = np.asarray((4, 4, 3), dtype=float)
         else:
-            orig_aspect = aspect
             aspect = np.asarray(aspect, dtype=float)
-            if aspect.shape != (3,):
-                raise ValueError(
-                    "You must pass a 3-tuple that can be cast to floats. "
-                    f"You passed {orig_aspect!r}"
-                )
+            _api.check_shape((3,), aspect=aspect)
         # default scale tuned to match the mpl32 appearance.
         aspect *= 1.8294640721620434 * zoom / np.linalg.norm(aspect)
 
@@ -406,7 +396,7 @@ def apply_aspect(self, position=None):
         # scales and box/datalim. Those are all irrelevant - all we need to do
         # is make sure our coordinate system is square.
         trans = self.get_figure().transSubfigure
-        bb = mtransforms.Bbox.from_bounds(0, 0, 1, 1).transformed(trans)
+        bb = mtransforms.Bbox.unit().transformed(trans)
         # this is the physical aspect of the panel (or figure):
         fig_aspect = bb.height / bb.width
 
@@ -415,8 +405,10 @@ def apply_aspect(self, position=None):
         pb1 = pb.shrunk_to_aspect(box_aspect, pb, fig_aspect)
         self._set_position(pb1.anchored(self.get_anchor(), pb), 'active')
 
-    @artist.allow_rasterization
+    @martist.allow_rasterization
     def draw(self, renderer):
+        if not self.get_visible():
+            return
         self._unstale_viewLim()
 
         # draw the background patch
@@ -427,81 +419,47 @@ def draw(self, renderer):
         # this is duplicated from `axes._base._AxesBase.draw`
         # but must be called before any of the artist are drawn as
         # it adjusts the view limits and the size of the bounding box
-        # of the axes
+        # of the Axes
         locator = self.get_axes_locator()
-        if locator:
-            pos = locator(self, renderer)
-            self.apply_aspect(pos)
-        else:
-            self.apply_aspect()
+        self.apply_aspect(locator(self, renderer) if locator else None)
 
         # add the projection matrix to the renderer
         self.M = self.get_proj()
-        props3d = {
-            # To raise a deprecation, we need to wrap the attribute in a
-            # function, but binding that to an instance does not work, as you
-            # would end up with an instance-specific method. Properties are
-            # class-level attributes which *are* functions, so we do that
-            # instead.
-            # This dictionary comprehension creates deprecated properties for
-            # the attributes listed below, and they are temporarily attached to
-            # the _class_ in the `_setattr_cm` call. These can both be removed
-            # once the deprecation expires
-            name: _api.deprecated('3.4', name=name,
-                                  alternative=f'self.axes.{name}')(
-                property(lambda self, _value=getattr(self, name): _value))
-            for name in ['M', 'vvec', 'eye', 'get_axis_position']
-        }
-
-        with cbook._setattr_cm(type(renderer), **props3d):
-            def do_3d_projection(artist):
-                """
-                Call `do_3d_projection` on an *artist*, and warn if passing
-                *renderer*.
-
-                For our Artists, never pass *renderer*. For external Artists,
-                in lieu of more complicated signature parsing, always pass
-                *renderer* and raise a warning.
-                """
-
-                if artist.__module__ == 'mpl_toolkits.mplot3d.art3d':
-                    # Our 3D Artists have deprecated the renderer parameter, so
-                    # avoid passing it to them; call this directly once the
-                    # deprecation has expired.
-                    return artist.do_3d_projection()
-
-                _api.warn_deprecated(
-                    "3.4",
-                    message="The 'renderer' parameter of "
-                    "do_3d_projection() was deprecated in Matplotlib "
-                    "%(since)s and will be removed %(removal)s.")
-                return artist.do_3d_projection(renderer)
-
-            # Calculate projection of collections and patches and zorder them.
-            # Make sure they are drawn above the grids.
+
+        collections_and_patches = (
+            artist for artist in self._children
+            if isinstance(artist, (mcoll.Collection, mpatches.Patch))
+            and artist.get_visible())
+        if self.computed_zorder:
+            # Calculate projection of collections and patches and zorder
+            # them. Make sure they are drawn above the grids.
             zorder_offset = max(axis.get_zorder()
-                                for axis in self._get_axis_list()) + 1
-            for i, col in enumerate(
-                    sorted(self.collections,
-                           key=do_3d_projection,
-                           reverse=True)):
-                col.zorder = zorder_offset + i
-            for i, patch in enumerate(
-                    sorted(self.patches,
-                           key=do_3d_projection,
-                           reverse=True)):
-                patch.zorder = zorder_offset + i
-
-            if self._axis3don:
-                # Draw panes first
-                for axis in self._get_axis_list():
-                    axis.draw_pane(renderer)
-                # Then axes
-                for axis in self._get_axis_list():
-                    axis.draw(renderer)
-
-            # Then rest
-            super().draw(renderer)
+                                for axis in self._axis_map.values()) + 1
+            collection_zorder = patch_zorder = zorder_offset
+
+            for artist in sorted(collections_and_patches,
+                                 key=lambda artist: artist.do_3d_projection(),
+                                 reverse=True):
+                if isinstance(artist, mcoll.Collection):
+                    artist.zorder = collection_zorder
+                    collection_zorder += 1
+                elif isinstance(artist, mpatches.Patch):
+                    artist.zorder = patch_zorder
+                    patch_zorder += 1
+        else:
+            for artist in collections_and_patches:
+                artist.do_3d_projection()
+
+        if self._axis3don:
+            # Draw panes first
+            for axis in self._axis_map.values():
+                axis.draw_pane(renderer)
+            # Then axes
+            for axis in self._axis_map.values():
+                axis.draw(renderer)
+
+        # Then rest
+        super().draw(renderer)
 
     def get_axis_position(self):
         vals = self.get_w_lims()
@@ -511,140 +469,43 @@ def get_axis_position(self):
         zhigh = tc[0][2] > tc[2][2]
         return xhigh, yhigh, zhigh
 
-    def _unit_change_handler(self, axis_name, event=None):
-        # docstring inherited
-        if event is None:  # Allow connecting `self._unit_change_handler(name)`
-            return functools.partial(
-                self._unit_change_handler, axis_name, event=object())
-        _api.check_in_list(self._get_axis_map(), axis_name=axis_name)
-        self.relim()
-        self._request_autoscale_view(scalex=(axis_name == "x"),
-                                     scaley=(axis_name == "y"),
-                                     scalez=(axis_name == "z"))
-
     def update_datalim(self, xys, **kwargs):
         pass
 
-    def get_autoscale_on(self):
-        """
-        Get whether autoscaling is applied for all axes on plot commands
-
-        .. versionadded:: 1.1.0
-            This function was added, but not tested. Please report any bugs.
-        """
-        return super().get_autoscale_on() and self.get_autoscalez_on()
-
-    def get_autoscalez_on(self):
-        """
-        Get whether autoscaling for the z-axis is applied on plot commands
-
-        .. versionadded:: 1.1.0
-            This function was added, but not tested. Please report any bugs.
-        """
-        return self._autoscaleZon
-
-    def set_autoscale_on(self, b):
-        """
-        Set whether autoscaling is applied on plot commands
-
-        .. versionadded:: 1.1.0
-            This function was added, but not tested. Please report any bugs.
-
-        Parameters
-        ----------
-        b : bool
-        """
-        super().set_autoscale_on(b)
-        self.set_autoscalez_on(b)
-
-    def set_autoscalez_on(self, b):
-        """
-        Set whether autoscaling for the z-axis is applied on plot commands
-
-        .. versionadded:: 1.1.0
-
-        Parameters
-        ----------
-        b : bool
-        """
-        self._autoscaleZon = b
-
-    def set_xmargin(self, m):
-        # docstring inherited
-        scalez = self._stale_viewlim_z
-        super().set_xmargin(m)
-        # Superclass is 2D and will call _request_autoscale_view with defaults
-        # for unknown Axis, which would be scalez=True, but it shouldn't be for
-        # this call, so restore it.
-        self._stale_viewlim_z = scalez
-
-    def set_ymargin(self, m):
-        # docstring inherited
-        scalez = self._stale_viewlim_z
-        super().set_ymargin(m)
-        # Superclass is 2D and will call _request_autoscale_view with defaults
-        # for unknown Axis, which would be scalez=True, but it shouldn't be for
-        # this call, so restore it.
-        self._stale_viewlim_z = scalez
+    get_autoscalez_on = _axis_method_wrapper("zaxis", "_get_autoscale_on")
+    set_autoscalez_on = _axis_method_wrapper("zaxis", "_set_autoscale_on")
 
     def set_zmargin(self, m):
         """
         Set padding of Z data limits prior to autoscaling.
 
-        *m* times the data interval will be added to each
-        end of that interval before it is used in autoscaling.
+        *m* times the data interval will be added to each end of that interval
+        before it is used in autoscaling.  If *m* is negative, this will clip
+        the data range instead of expanding it.
 
-        accepts: float in range 0 to 1
+        For example, if your data is in the range [0, 2], a margin of 0.1 will
+        result in a range [-0.2, 2.2]; a margin of -0.1 will result in a range
+        of [0.2, 1.8].
 
-        .. versionadded:: 1.1.0
+        Parameters
+        ----------
+        m : float greater than -0.5
         """
-        if m < 0 or m > 1:
-            raise ValueError("margin must be in range 0 to 1")
+        if m <= -0.5:
+            raise ValueError("margin must be greater than -0.5")
         self._zmargin = m
-        self._request_autoscale_view(scalex=False, scaley=False, scalez=True)
+        self._request_autoscale_view("z")
         self.stale = True
 
     def margins(self, *margins, x=None, y=None, z=None, tight=True):
         """
-        Convenience method to set or retrieve autoscaling margins.
-
-        Call signatures::
-
-            margins()
-
-        returns xmargin, ymargin, zmargin
-
-        ::
-
-            margins(margin)
-
-            margins(xmargin, ymargin, zmargin)
-
-            margins(x=xmargin, y=ymargin, z=zmargin)
+        Set or retrieve autoscaling margins.
 
-            margins(..., tight=False)
-
-        All forms above set the xmargin, ymargin and zmargin
-        parameters. All keyword parameters are optional.  A single
-        positional argument specifies xmargin, ymargin and zmargin.
-        Passing both positional and keyword arguments for xmargin,
-        ymargin, and/or zmargin is invalid.
-
-        The *tight* parameter
-        is passed to :meth:`autoscale_view`, which is executed after
-        a margin is changed; the default here is *True*, on the
-        assumption that when margins are specified, no additional
-        padding to match tick marks is usually desired.  Setting
-        *tight* to *None* will preserve the previous setting.
-
-        Specifying any margin changes only the autoscaling; for example,
-        if *xmargin* is not None, then *xmargin* times the X data
-        interval will be added to each end of that interval before
-        it is used in autoscaling.
-
-        .. versionadded:: 1.1.0
+        See `.Axes.margins` for full documentation.  Because this function
+        applies to 3D Axes, it also takes a *z* argument, and returns
+        ``(xmargin, ymargin, zmargin)``.
         """
-        if margins and x is not None and y is not None and z is not None:
+        if margins and (x is not None or y is not None or z is not None):
             raise TypeError('Cannot pass both positional and keyword '
                             'arguments for x, y, and/or z.')
         elif len(margins) == 1:
@@ -675,12 +536,10 @@ def margins(self, *margins, x=None, y=None, z=None, tight=True):
     def autoscale(self, enable=True, axis='both', tight=None):
         """
         Convenience method for simple axis view autoscaling.
-        See :meth:`matplotlib.axes.Axes.autoscale` for full explanation.
-        Note that this function behaves the same, but for all
-        three axes.  Therefore, 'z' can be passed for *axis*,
-        and 'both' applies to all three axes.
 
-        .. versionadded:: 1.1.0
+        See `.Axes.autoscale` for full documentation.  Because this function
+        applies to 3D Axes, *axis* can also be set to 'z', and setting *axis*
+        to 'both' autoscales all three axes.
         """
         if enable is None:
             scalex = True
@@ -688,74 +547,66 @@ def autoscale(self, enable=True, axis='both', tight=None):
             scalez = True
         else:
             if axis in ['x', 'both']:
-                self._autoscaleXon = scalex = bool(enable)
+                self.set_autoscalex_on(bool(enable))
+                scalex = self.get_autoscalex_on()
             else:
                 scalex = False
             if axis in ['y', 'both']:
-                self._autoscaleYon = scaley = bool(enable)
+                self.set_autoscaley_on(bool(enable))
+                scaley = self.get_autoscaley_on()
             else:
                 scaley = False
             if axis in ['z', 'both']:
-                self._autoscaleZon = scalez = bool(enable)
+                self.set_autoscalez_on(bool(enable))
+                scalez = self.get_autoscalez_on()
             else:
                 scalez = False
-        self._request_autoscale_view(tight=tight, scalex=scalex, scaley=scaley,
-                                     scalez=scalez)
+        if scalex:
+            self._request_autoscale_view("x", tight=tight)
+        if scaley:
+            self._request_autoscale_view("y", tight=tight)
+        if scalez:
+            self._request_autoscale_view("z", tight=tight)
 
     def auto_scale_xyz(self, X, Y, Z=None, had_data=None):
         # This updates the bounding boxes as to keep a record as to what the
         # minimum sized rectangular volume holds the data.
-        X = np.reshape(X, -1)
-        Y = np.reshape(Y, -1)
-        self.xy_dataLim.update_from_data_xy(
-            np.column_stack([X, Y]), not had_data)
+        if np.shape(X) == np.shape(Y):
+            self.xy_dataLim.update_from_data_xy(
+                np.column_stack([np.ravel(X), np.ravel(Y)]), not had_data)
+        else:
+            self.xy_dataLim.update_from_data_x(X, not had_data)
+            self.xy_dataLim.update_from_data_y(Y, not had_data)
         if Z is not None:
-            Z = np.reshape(Z, -1)
-            self.zz_dataLim.update_from_data_xy(
-                np.column_stack([Z, Z]), not had_data)
+            self.zz_dataLim.update_from_data_x(Z, not had_data)
         # Let autoscale_view figure out how to use this data.
         self.autoscale_view()
 
-    # API could be better, right now this is just to match the old calls to
-    # autoscale_view() after each plotting method.
-    def _request_autoscale_view(self, tight=None, scalex=True, scaley=True,
-                                scalez=True):
-        if tight is not None:
-            self._tight = tight
-        if scalex:
-            self._stale_viewlim_x = True  # Else keep old state.
-        if scaley:
-            self._stale_viewlim_y = True
-        if scalez:
-            self._stale_viewlim_z = True
-
     def autoscale_view(self, tight=None, scalex=True, scaley=True,
                        scalez=True):
         """
         Autoscale the view limits using the data limits.
-        See :meth:`matplotlib.axes.Axes.autoscale_view` for documentation.
-        Note that this function applies to the 3D axes, and as such
-        adds the *scalez* to the function arguments.
 
-        .. versionchanged:: 1.1.0
-            Function signature was changed to better match the 2D version.
-            *tight* is now explicitly a kwarg and placed first.
-
-        .. versionchanged:: 1.2.1
-            This is now fully functional.
+        See `.Axes.autoscale_view` for full documentation.  Because this
+        function applies to 3D Axes, it also takes a *scalez* argument.
         """
         # This method looks at the rectangular volume (see above)
         # of data and decides how to scale the view portal to fit it.
         if tight is None:
-            # if image data only just use the datalim
-            _tight = self._tight or (
-                len(self.images) > 0
-                and len(self.lines) == len(self.patches) == 0)
+            _tight = self._tight
+            if not _tight:
+                # if image data only just use the datalim
+                for artist in self._children:
+                    if isinstance(artist, mimage.AxesImage):
+                        _tight = True
+                    elif isinstance(artist, (mlines.Line2D, mpatches.Patch)):
+                        _tight = False
+                        break
         else:
             _tight = self._tight = bool(tight)
 
-        if scalex and self._autoscaleXon:
-            self._shared_x_axes.clean()
+        if scalex and self.get_autoscalex_on():
+            self._shared_axes["x"].clean()
             x0, x1 = self.xy_dataLim.intervalx
             xlocator = self.xaxis.get_major_locator()
             x0, x1 = xlocator.nonsingular(x0, x1)
@@ -767,8 +618,8 @@ def autoscale_view(self, tight=None, scalex=True, scaley=True,
                 x0, x1 = xlocator.view_limits(x0, x1)
             self.set_xbound(x0, x1)
 
-        if scaley and self._autoscaleYon:
-            self._shared_y_axes.clean()
+        if scaley and self.get_autoscaley_on():
+            self._shared_axes["y"].clean()
             y0, y1 = self.xy_dataLim.intervaly
             ylocator = self.yaxis.get_major_locator()
             y0, y1 = ylocator.nonsingular(y0, y1)
@@ -780,8 +631,8 @@ def autoscale_view(self, tight=None, scalex=True, scaley=True,
                 y0, y1 = ylocator.view_limits(y0, y1)
             self.set_ybound(y0, y1)
 
-        if scalez and self._autoscaleZon:
-            self._shared_z_axes.clean()
+        if scalez and self.get_autoscalez_on():
+            self._shared_axes["z"].clean()
             z0, z1 = self.zz_dataLim.intervalx
             zlocator = self.zaxis.get_major_locator()
             z0, z1 = zlocator.nonsingular(z0, z1)
@@ -800,229 +651,49 @@ def get_w_lims(self):
         minz, maxz = self.get_zlim3d()
         return minx, maxx, miny, maxy, minz, maxz
 
-    def set_xlim3d(self, left=None, right=None, emit=True, auto=False,
-                   *, xmin=None, xmax=None):
-        """
-        Set 3D x limits.
-
-        See :meth:`matplotlib.axes.Axes.set_xlim` for full documentation.
-        """
-        if right is None and np.iterable(left):
-            left, right = left
-        if xmin is not None:
-            if left is not None:
-                raise TypeError('Cannot pass both `xmin` and `left`')
-            left = xmin
-        if xmax is not None:
-            if right is not None:
-                raise TypeError('Cannot pass both `xmax` and `right`')
-            right = xmax
-
-        self._process_unit_info([("x", (left, right))], convert=False)
-        left = self._validate_converted_limits(left, self.convert_xunits)
-        right = self._validate_converted_limits(right, self.convert_xunits)
-
-        old_left, old_right = self.get_xlim()
-        if left is None:
-            left = old_left
-        if right is None:
-            right = old_right
-
-        if left == right:
-            _api.warn_external(
-                f"Attempting to set identical left == right == {left} results "
-                f"in singular transformations; automatically expanding.")
-        reverse = left > right
-        left, right = self.xaxis.get_major_locator().nonsingular(left, right)
-        left, right = self.xaxis.limit_range_for_scale(left, right)
-        # cast to bool to avoid bad interaction between python 3.8 and np.bool_
-        left, right = sorted([left, right], reverse=bool(reverse))
-        self.xy_viewLim.intervalx = (left, right)
-
-        # Mark viewlims as no longer stale without triggering an autoscale.
-        for ax in self._shared_x_axes.get_siblings(self):
-            ax._stale_viewlim_x = False
-        if auto is not None:
-            self._autoscaleXon = bool(auto)
-
-        if emit:
-            self.callbacks.process('xlim_changed', self)
-            # Call all of the other x-axes that are shared with this one
-            for other in self._shared_x_axes.get_siblings(self):
-                if other is not self:
-                    other.set_xlim(self.xy_viewLim.intervalx,
-                                   emit=False, auto=auto)
-                    if other.figure != self.figure:
-                        other.figure.canvas.draw_idle()
-        self.stale = True
-        return left, right
-
-    def set_ylim3d(self, bottom=None, top=None, emit=True, auto=False,
-                   *, ymin=None, ymax=None):
-        """
-        Set 3D y limits.
-
-        See :meth:`matplotlib.axes.Axes.set_ylim` for full documentation.
-        """
-        if top is None and np.iterable(bottom):
-            bottom, top = bottom
-        if ymin is not None:
-            if bottom is not None:
-                raise TypeError('Cannot pass both `ymin` and `bottom`')
-            bottom = ymin
-        if ymax is not None:
-            if top is not None:
-                raise TypeError('Cannot pass both `ymax` and `top`')
-            top = ymax
-
-        self._process_unit_info([("y", (bottom, top))], convert=False)
-        bottom = self._validate_converted_limits(bottom, self.convert_yunits)
-        top = self._validate_converted_limits(top, self.convert_yunits)
-
-        old_bottom, old_top = self.get_ylim()
-        if bottom is None:
-            bottom = old_bottom
-        if top is None:
-            top = old_top
-
-        if bottom == top:
-            _api.warn_external(
-                f"Attempting to set identical bottom == top == {bottom} "
-                f"results in singular transformations; automatically "
-                f"expanding.")
-        swapped = bottom > top
-        bottom, top = self.yaxis.get_major_locator().nonsingular(bottom, top)
-        bottom, top = self.yaxis.limit_range_for_scale(bottom, top)
-        if swapped:
-            bottom, top = top, bottom
-        self.xy_viewLim.intervaly = (bottom, top)
-
-        # Mark viewlims as no longer stale without triggering an autoscale.
-        for ax in self._shared_y_axes.get_siblings(self):
-            ax._stale_viewlim_y = False
-        if auto is not None:
-            self._autoscaleYon = bool(auto)
-
-        if emit:
-            self.callbacks.process('ylim_changed', self)
-            # Call all of the other y-axes that are shared with this one
-            for other in self._shared_y_axes.get_siblings(self):
-                if other is not self:
-                    other.set_ylim(self.xy_viewLim.intervaly,
-                                   emit=False, auto=auto)
-                    if other.figure != self.figure:
-                        other.figure.canvas.draw_idle()
-        self.stale = True
-        return bottom, top
-
-    def set_zlim3d(self, bottom=None, top=None, emit=True, auto=False,
-                   *, zmin=None, zmax=None):
+    # set_xlim, set_ylim are directly inherited from base Axes.
+    @_api.make_keyword_only("3.6", "emit")
+    def set_zlim(self, bottom=None, top=None, emit=True, auto=False,
+                 *, zmin=None, zmax=None):
         """
         Set 3D z limits.
 
-        See :meth:`matplotlib.axes.Axes.set_ylim` for full documentation
+        See `.Axes.set_ylim` for full documentation
         """
         if top is None and np.iterable(bottom):
             bottom, top = bottom
         if zmin is not None:
             if bottom is not None:
-                raise TypeError('Cannot pass both `zmin` and `bottom`')
+                raise TypeError("Cannot pass both 'bottom' and 'zmin'")
             bottom = zmin
         if zmax is not None:
             if top is not None:
-                raise TypeError('Cannot pass both `zmax` and `top`')
+                raise TypeError("Cannot pass both 'top' and 'zmax'")
             top = zmax
+        return self.zaxis._set_lim(bottom, top, emit=emit, auto=auto)
 
-        self._process_unit_info([("z", (bottom, top))], convert=False)
-        bottom = self._validate_converted_limits(bottom, self.convert_zunits)
-        top = self._validate_converted_limits(top, self.convert_zunits)
-
-        old_bottom, old_top = self.get_zlim()
-        if bottom is None:
-            bottom = old_bottom
-        if top is None:
-            top = old_top
-
-        if bottom == top:
-            _api.warn_external(
-                f"Attempting to set identical bottom == top == {bottom} "
-                f"results in singular transformations; automatically "
-                f"expanding.")
-        swapped = bottom > top
-        bottom, top = self.zaxis.get_major_locator().nonsingular(bottom, top)
-        bottom, top = self.zaxis.limit_range_for_scale(bottom, top)
-        if swapped:
-            bottom, top = top, bottom
-        self.zz_viewLim.intervalx = (bottom, top)
-
-        # Mark viewlims as no longer stale without triggering an autoscale.
-        for ax in self._shared_z_axes.get_siblings(self):
-            ax._stale_viewlim_z = False
-        if auto is not None:
-            self._autoscaleZon = bool(auto)
-
-        if emit:
-            self.callbacks.process('zlim_changed', self)
-            # Call all of the other y-axes that are shared with this one
-            for other in self._shared_z_axes.get_siblings(self):
-                if other is not self:
-                    other.set_zlim(self.zz_viewLim.intervalx,
-                                   emit=False, auto=auto)
-                    if other.figure != self.figure:
-                        other.figure.canvas.draw_idle()
-        self.stale = True
-        return bottom, top
+    set_xlim3d = maxes.Axes.set_xlim
+    set_ylim3d = maxes.Axes.set_ylim
+    set_zlim3d = set_zlim
 
-    def get_xlim3d(self):
+    def get_xlim(self):
+        # docstring inherited
         return tuple(self.xy_viewLim.intervalx)
-    get_xlim3d.__doc__ = maxes.Axes.get_xlim.__doc__
-    if get_xlim3d.__doc__ is not None:
-        get_xlim3d.__doc__ += """
-        .. versionchanged:: 1.1.0
-            This function now correctly refers to the 3D x-limits
-        """
 
-    def get_ylim3d(self):
+    def get_ylim(self):
+        # docstring inherited
         return tuple(self.xy_viewLim.intervaly)
-    get_ylim3d.__doc__ = maxes.Axes.get_ylim.__doc__
-    if get_ylim3d.__doc__ is not None:
-        get_ylim3d.__doc__ += """
-        .. versionchanged:: 1.1.0
-            This function now correctly refers to the 3D y-limits.
-        """
 
-    def get_zlim3d(self):
+    def get_zlim(self):
         """Get 3D z limits."""
         return tuple(self.zz_viewLim.intervalx)
 
-    def get_zscale(self):
-        """
-        Return the zaxis scale string %s
-
-        """ % (", ".join(mscale.get_scale_names()))
-        return self.zaxis.get_scale()
-
-    # We need to slightly redefine these to pass scalez=False
-    # to their calls of autoscale_view.
-
-    def set_xscale(self, value, **kwargs):
-        self.xaxis._set_scale(value, **kwargs)
-        self.autoscale_view(scaley=False, scalez=False)
-        self._update_transScale()
-        self.stale = True
-
-    def set_yscale(self, value, **kwargs):
-        self.yaxis._set_scale(value, **kwargs)
-        self.autoscale_view(scalex=False, scalez=False)
-        self._update_transScale()
-        self.stale = True
-
-    def set_zscale(self, value, **kwargs):
-        self.zaxis._set_scale(value, **kwargs)
-        self.autoscale_view(scalex=False, scaley=False)
-        self._update_transScale()
-        self.stale = True
+    get_zscale = _axis_method_wrapper("zaxis", "get_scale")
 
+    # Redefine all three methods to overwrite their docstrings.
+    set_xscale = _axis_method_wrapper("xaxis", "_set_axes_scale")
+    set_yscale = _axis_method_wrapper("yaxis", "_set_axes_scale")
+    set_zscale = _axis_method_wrapper("zaxis", "_set_axes_scale")
     set_xscale.__doc__, set_yscale.__doc__, set_zscale.__doc__ = map(
         """
         Set the {}-axis scale.
@@ -1062,20 +733,56 @@ def clabel(self, *args, **kwargs):
         """Currently not implemented for 3D axes, and returns *None*."""
         return None
 
-    def view_init(self, elev=None, azim=None):
+    def view_init(self, elev=None, azim=None, roll=None, vertical_axis="z"):
         """
         Set the elevation and azimuth of the axes in degrees (not radians).
 
         This can be used to rotate the axes programmatically.
 
-        'elev' stores the elevation angle in the z plane (in degrees).
-        'azim' stores the azimuth angle in the (x, y) plane (in degrees).
-
-        if 'elev' or 'azim' are None (default), then the initial value
-        is used which was specified in the :class:`Axes3D` constructor.
-        """
+        To look normal to the primary planes, the following elevation and
+        azimuth angles can be used. A roll angle of 0, 90, 180, or 270 deg
+        will rotate these views while keeping the axes at right angles.
+
+        ==========   ====  ====
+        view plane   elev  azim
+        ==========   ====  ====
+        XY           90    -90
+        XZ           0     -90
+        YZ           0     0
+        -XY          -90   90
+        -XZ          0     90
+        -YZ          0     180
+        ==========   ====  ====
 
-        self.dist = 10
+        Parameters
+        ----------
+        elev : float, default: None
+            The elevation angle in degrees rotates the camera above the plane
+            pierced by the vertical axis, with a positive angle corresponding
+            to a location above that plane. For example, with the default
+            vertical axis of 'z', the elevation defines the angle of the camera
+            location above the x-y plane.
+            If None, then the initial value as specified in the `Axes3D`
+            constructor is used.
+        azim : float, default: None
+            The azimuthal angle in degrees rotates the camera about the
+            vertical axis, with a positive angle corresponding to a
+            right-handed rotation. For example, with the default vertical axis
+            of 'z', a positive azimuth rotates the camera about the origin from
+            its location along the +x axis towards the +y axis.
+            If None, then the initial value as specified in the `Axes3D`
+            constructor is used.
+        roll : float, default: None
+            The roll angle in degrees rotates the camera about the viewing
+            axis. A positive angle spins the camera clockwise, causing the
+            scene to rotate counter-clockwise.
+            If None, then the initial value as specified in the `Axes3D`
+            constructor is used.
+        vertical_axis : {"z", "x", "y"}, default: "z"
+            The axis to align vertically. *azim* rotates about this axis.
+        """
+
+        self._dist = 10  # The camera distance from origin. Behaves like zoom
 
         if elev is None:
             self.elev = self.initial_elev
@@ -1087,60 +794,112 @@ def view_init(self, elev=None, azim=None):
         else:
             self.azim = azim
 
-    def set_proj_type(self, proj_type):
+        if roll is None:
+            self.roll = self.initial_roll
+        else:
+            self.roll = roll
+
+        self._vertical_axis = _api.check_getitem(
+            dict(x=0, y=1, z=2), vertical_axis=vertical_axis
+        )
+
+    def set_proj_type(self, proj_type, focal_length=None):
         """
         Set the projection type.
 
         Parameters
         ----------
         proj_type : {'persp', 'ortho'}
-        """
-        self._projection = _api.check_getitem({
-            'persp': proj3d.persp_transformation,
-            'ortho': proj3d.ortho_transformation,
-        }, proj_type=proj_type)
+            The projection type.
+        focal_length : float, default: None
+            For a projection type of 'persp', the focal length of the virtual
+            camera. Must be > 0. If None, defaults to 1.
+            The focal length can be computed from a desired Field Of View via
+            the equation: focal_length = 1/tan(FOV/2)
+        """
+        _api.check_in_list(['persp', 'ortho'], proj_type=proj_type)
+        if proj_type == 'persp':
+            if focal_length is None:
+                focal_length = 1
+            elif focal_length <= 0:
+                raise ValueError(f"focal_length = {focal_length} must be "
+                                 "greater than 0")
+            self._focal_length = focal_length
+        else:  # 'ortho':
+            if focal_length not in (None, np.inf):
+                raise ValueError(f"focal_length = {focal_length} must be "
+                                 f"None for proj_type = {proj_type}")
+            self._focal_length = np.inf
+
+    def _roll_to_vertical(self, arr):
+        """Roll arrays to match the different vertical axis."""
+        return np.roll(arr, self._vertical_axis - 2)
 
     def get_proj(self):
         """Create the projection matrix from the current viewing position."""
-        # elev stores the elevation angle in the z plane
-        # azim stores the azimuth angle in the x,y plane
-        #
-        # dist is the distance of the eye viewing point from the object
-        # point.
-
-        relev, razim = np.pi * self.elev/180, np.pi * self.azim/180
-
-        xmin, xmax = self.get_xlim3d()
-        ymin, ymax = self.get_ylim3d()
-        zmin, zmax = self.get_zlim3d()
 
-        # transform to uniform world coordinates 0-1, 0-1, 0-1
-        worldM = proj3d.world_transformation(xmin, xmax,
-                                             ymin, ymax,
-                                             zmin, zmax,
-                                             pb_aspect=self._box_aspect)
-
-        # look into the middle of the new coordinates
-        R = self._box_aspect / 2
+        # Transform to uniform world coordinates 0-1, 0-1, 0-1
+        box_aspect = self._roll_to_vertical(self._box_aspect)
+        worldM = proj3d.world_transformation(
+            *self.get_xlim3d(),
+            *self.get_ylim3d(),
+            *self.get_zlim3d(),
+            pb_aspect=box_aspect,
+        )
 
-        xp = R[0] + np.cos(razim) * np.cos(relev) * self.dist
-        yp = R[1] + np.sin(razim) * np.cos(relev) * self.dist
-        zp = R[2] + np.sin(relev) * self.dist
-        E = np.array((xp, yp, zp))
+        # Look into the middle of the new coordinates:
+        R = 0.5 * box_aspect
 
-        self.eye = E
-        self.vvec = R - E
+        # elev stores the elevation angle in the z plane
+        # azim stores the azimuth angle in the x,y plane
+        # roll stores the roll angle about the view axis
+        elev_rad = np.deg2rad(art3d._norm_angle(self.elev))
+        azim_rad = np.deg2rad(art3d._norm_angle(self.azim))
+        roll_rad = np.deg2rad(art3d._norm_angle(self.roll))
+
+        # Coordinates for a point that rotates around the box of data.
+        # p0, p1 corresponds to rotating the box only around the
+        # vertical axis.
+        # p2 corresponds to rotating the box only around the horizontal
+        # axis.
+        p0 = np.cos(elev_rad) * np.cos(azim_rad)
+        p1 = np.cos(elev_rad) * np.sin(azim_rad)
+        p2 = np.sin(elev_rad)
+
+        # When changing vertical axis the coordinates changes as well.
+        # Roll the values to get the same behaviour as the default:
+        ps = self._roll_to_vertical([p0, p1, p2])
+
+        # The coordinates for the eye viewing point. The eye is looking
+        # towards the middle of the box of data from a distance:
+        eye = R + self._dist * ps
+
+        # TODO: Is this being used somewhere? Can it be removed?
+        self.eye = eye
+        self.vvec = R - eye
         self.vvec = self.vvec / np.linalg.norm(self.vvec)
 
-        if abs(relev) > np.pi/2:
-            # upside down
-            V = np.array((0, 0, -1))
+        # Define which axis should be vertical. A negative value
+        # indicates the plot is upside down and therefore the values
+        # have been reversed:
+        V = np.zeros(3)
+        V[self._vertical_axis] = -1 if abs(elev_rad) > 0.5 * np.pi else 1
+
+        # Generate the view and projection transformation matrices
+        if self._focal_length == np.inf:
+            # Orthographic projection
+            viewM = proj3d.view_transformation(eye, R, V, roll_rad)
+            projM = proj3d.ortho_transformation(-self._dist, self._dist)
         else:
-            V = np.array((0, 0, 1))
-        zfront, zback = -self.dist, self.dist
-
-        viewM = proj3d.view_transformation(E, R, V)
-        projM = self._projection(zfront, zback)
+            # Perspective projection
+            # Scale the eye dist to compensate for the focal length zoom effect
+            eye_focal = R + self._dist * ps * self._focal_length
+            viewM = proj3d.view_transformation(eye_focal, R, V, roll_rad)
+            projM = proj3d.persp_transformation(-self._dist,
+                                                self._dist,
+                                                self._focal_length)
+
+        # Combine all the transformation matrices to get the final projection
         M0 = np.dot(viewM, worldM)
         M = np.dot(projM, M0)
         return M
@@ -1169,46 +928,47 @@ def disable_mouse_rotation(self):
 
     def can_zoom(self):
         """
-        Return whether this axes supports the zoom box button functionality.
+        Return whether this Axes supports the zoom box button functionality.
 
-        3D axes objects do not use the zoom box button.
+        Axes3D objects do not use the zoom box button.
         """
         return False
 
     def can_pan(self):
         """
-        Return whether this axes supports the pan/zoom button functionality.
+        Return whether this Axes supports the pan/zoom button functionality.
 
-        3D axes objects do not use the pan/zoom button.
+        Axes3d objects do not use the pan/zoom button.
         """
         return False
 
-    def cla(self):
-        # docstring inherited.
+    def sharez(self, other):
+        """
+        Share the z-axis with *other*.
 
-        super().cla()
-        self.zaxis.clear()
+        This is equivalent to passing ``sharex=other`` when constructing the
+        Axes, and cannot be used if the z-axis is already being shared with
+        another Axes.
+        """
+        _api.check_isinstance(maxes._base._AxesBase, other=other)
+        if self._sharez is not None and other is not self._sharez:
+            raise ValueError("z-axis is already shared")
+        self._shared_axes["z"].join(self, other)
+        self._sharez = other
+        self.zaxis.major = other.zaxis.major  # Ticker instances holding
+        self.zaxis.minor = other.zaxis.minor  # locator and formatter.
+        z0, z1 = other.get_zlim()
+        self.set_zlim(z0, z1, emit=False, auto=other.get_autoscalez_on())
+        self.zaxis._scale = other.zaxis._scale
 
-        if self._sharez is not None:
-            self.zaxis.major = self._sharez.zaxis.major
-            self.zaxis.minor = self._sharez.zaxis.minor
-            z0, z1 = self._sharez.get_zlim()
-            self.set_zlim(z0, z1, emit=False, auto=None)
-            self.zaxis._set_scale(self._sharez.zaxis.get_scale())
-        else:
-            self.zaxis._set_scale('linear')
-            try:
-                self.set_zlim(0, 1)
-            except TypeError:
-                pass
-
-        self._autoscaleZon = True
-        if self._projection is proj3d.ortho_transformation:
-            self._zmargin = rcParams['axes.zmargin']
+    def clear(self):
+        # docstring inherited.
+        super().clear()
+        if self._focal_length == np.inf:
+            self._zmargin = mpl.rcParams['axes.zmargin']
         else:
             self._zmargin = 0.
-
-        self.grid(rcParams['axes3d.grid'])
+        self.grid(mpl.rcParams['axes3d.grid'])
 
     def _button_press(self, event):
         if event.inaxes == self:
@@ -1227,14 +987,15 @@ def _button_release(self, event):
     def _get_view(self):
         # docstring inherited
         return (self.get_xlim(), self.get_ylim(), self.get_zlim(),
-                self.elev, self.azim)
+                self.elev, self.azim, self.roll)
 
     def _set_view(self, view):
         # docstring inherited
-        xlim, ylim, zlim, elev, azim = view
+        xlim, ylim, zlim, elev, azim, roll = view
         self.set(xlim=xlim, ylim=ylim, zlim=zlim)
         self.elev = elev
         self.azim = azim
+        self.roll = roll
 
     def format_zdata(self, z):
         """
@@ -1260,9 +1021,14 @@ def format_coord(self, xd, yd):
             return ''
 
         if self.button_pressed in self._rotate_btn:
-            return 'azimuth={:.0f} deg, elevation={:.0f} deg '.format(
-                self.azim, self.elev)
             # ignore xd and yd and display angles instead
+            norm_elev = art3d._norm_angle(self.elev)
+            norm_azim = art3d._norm_angle(self.azim)
+            norm_roll = art3d._norm_angle(self.roll)
+            return (f"elevation={norm_elev:.0f}\N{DEGREE SIGN}, "
+                    f"azimuth={norm_azim:.0f}\N{DEGREE SIGN}, "
+                    f"roll={norm_roll:.0f}\N{DEGREE SIGN}"
+                    ).replace("-", "\N{MINUS SIGN}")
 
         # nearest edge
         p0, p1 = min(self.tunit_edges(),
@@ -1314,8 +1080,12 @@ def _on_move(self, event):
             # get the x and y pixel coords
             if dx == 0 and dy == 0:
                 return
-            self.elev = art3d._norm_angle(self.elev - (dy/h)*180)
-            self.azim = art3d._norm_angle(self.azim - (dx/w)*180)
+
+            roll = np.deg2rad(self.roll)
+            delev = -(dy/h)*180*np.cos(roll) + (dx/w)*180*np.sin(roll)
+            dazim = -(dy/h)*180*np.sin(roll) - (dx/w)*180*np.cos(roll)
+            self.elev = self.elev + delev
+            self.azim = self.azim + dazim
             self.get_proj()
             self.stale = True
             self.figure.canvas.draw_idle()
@@ -1328,7 +1098,8 @@ def _on_move(self, event):
             minx, maxx, miny, maxy, minz, maxz = self.get_w_lims()
             dx = 1-((w - dx)/w)
             dy = 1-((h - dy)/h)
-            elev, azim = np.deg2rad(self.elev), np.deg2rad(self.azim)
+            elev = np.deg2rad(self.elev)
+            azim = np.deg2rad(self.azim)
             # project xv, yv, zv -> xw, yw, zw
             dxx = (maxx-minx)*(dy*np.sin(elev)*np.cos(azim) + dx*np.sin(azim))
             dyy = (maxy-miny)*(-dx*np.cos(azim) + dy*np.sin(elev)*np.sin(azim))
@@ -1366,9 +1137,6 @@ def set_zlabel(self, zlabel, fontdict=None, labelpad=None, **kwargs):
     def get_zlabel(self):
         """
         Get the z-label text string.
-
-        .. versionadded:: 1.1.0
-            This function was added, but not tested. Please report any bugs.
         """
         label = self.zaxis.get_label()
         return label.get_text()
@@ -1390,62 +1158,31 @@ def set_frame_on(self, b):
         self._frameon = bool(b)
         self.stale = True
 
-    def grid(self, b=True, **kwargs):
+    @_api.rename_parameter("3.5", "b", "visible")
+    def grid(self, visible=True, **kwargs):
         """
         Set / unset 3D grid.
 
         .. note::
 
             Currently, this function does not behave the same as
-            :meth:`matplotlib.axes.Axes.grid`, but it is intended to
-            eventually support that behavior.
-
-        .. versionadded:: 1.1.0
+            `.axes.Axes.grid`, but it is intended to eventually support that
+            behavior.
         """
         # TODO: Operate on each axes separately
         if len(kwargs):
-            b = True
-        self._draw_grid = b
+            visible = True
+        self._draw_grid = visible
         self.stale = True
 
-    def locator_params(self, axis='both', tight=None, **kwargs):
-        """
-        Convenience method for controlling tick locators.
-
-        See :meth:`matplotlib.axes.Axes.locator_params` for full
-        documentation.  Note that this is for Axes3D objects,
-        therefore, setting *axis* to 'both' will result in the
-        parameters being set for all three axes.  Also, *axis*
-        can also take a value of 'z' to apply parameters to the
-        z axis.
-
-        .. versionadded:: 1.1.0
-            This function was added, but not tested. Please report any bugs.
-        """
-        _x = axis in ['x', 'both']
-        _y = axis in ['y', 'both']
-        _z = axis in ['z', 'both']
-        if _x:
-            self.xaxis.get_major_locator().set_params(**kwargs)
-        if _y:
-            self.yaxis.get_major_locator().set_params(**kwargs)
-        if _z:
-            self.zaxis.get_major_locator().set_params(**kwargs)
-        self._request_autoscale_view(tight=tight, scalex=_x, scaley=_y,
-                                     scalez=_z)
-
     def tick_params(self, axis='both', **kwargs):
         """
         Convenience method for changing the appearance of ticks and
         tick labels.
 
-        See :meth:`matplotlib.axes.Axes.tick_params` for more complete
-        documentation.
-
-        The only difference is that setting *axis* to 'both' will
-        mean that the settings are applied to all three axes. Also,
-        the *axis* parameter also accepts a value of 'z', which
-        would mean to apply to only the z-axis.
+        See `.Axes.tick_params` for full documentation.  Because this function
+        applies to 3D Axes, *axis* can also be set to 'z', and setting *axis*
+        to 'both' autoscales all three axes.
 
         Also, because of how Axes3D objects are drawn very differently
         from regular 2D axes, some of these settings may have
@@ -1454,8 +1191,6 @@ def tick_params(self, axis='both', **kwargs):
 
         .. note::
            Axes3D currently ignores some of these settings.
-
-        .. versionadded:: 1.1.0
         """
         _api.check_in_list(['x', 'y', 'z', 'both'], axis=axis)
         if axis in ['x', 'y', 'both']:
@@ -1473,9 +1208,6 @@ def tick_params(self, axis='both', **kwargs):
     def invert_zaxis(self):
         """
         Invert the z-axis.
-
-        .. versionadded:: 1.1.0
-            This function was added, but not tested. Please report any bugs.
         """
         bottom, top = self.get_zlim()
         self.set_zlim(top, bottom, auto=None)
@@ -1483,8 +1215,6 @@ def invert_zaxis(self):
     def zaxis_inverted(self):
         """
         Returns True if the z-axis is inverted.
-
-        .. versionadded:: 1.1.0
         """
         bottom, top = self.get_zlim()
         return top < bottom
@@ -1492,8 +1222,6 @@ def zaxis_inverted(self):
     def get_zbound(self):
         """
         Return the lower and upper z-axis bounds, in increasing order.
-
-        .. versionadded:: 1.1.0
         """
         bottom, top = self.get_zlim()
         if bottom < top:
@@ -1507,8 +1235,6 @@ def set_zbound(self, lower=None, upper=None):
 
         This method will honor axes inversion regardless of parameter order.
         It will not change the autoscaling setting (`.get_autoscalez_on()`).
-
-        .. versionadded:: 1.1.0
         """
         if upper is None and np.iterable(lower):
             lower, upper = lower
@@ -1579,8 +1305,7 @@ def plot(self, xs, ys, *args, zdir='z', **kwargs):
 
     plot3D = plot
 
-    @_api.delete_parameter("3.4", "args", alternative="kwargs")
-    def plot_surface(self, X, Y, Z, *args, norm=None, vmin=None,
+    def plot_surface(self, X, Y, Z, *, norm=None, vmin=None,
                      vmax=None, lightsource=None, **kwargs):
         """
         Create a surface plot.
@@ -1616,8 +1341,6 @@ def plot_surface(self, X, Y, Z, *args, norm=None, vmin=None,
             data is larger, it will be downsampled (by slicing) to these
             numbers of points.  Defaults to 50.
 
-            .. versionadded:: 2.0
-
         rstride, cstride : int
             Downsampling stride in each direction.  These arguments are
             mutually exclusive with *rcount* and *ccount*.  If only one of
@@ -1656,12 +1379,8 @@ def plot_surface(self, X, Y, Z, *args, norm=None, vmin=None,
 
         if Z.ndim != 2:
             raise ValueError("Argument Z must be 2-dimensional.")
-        if np.any(np.isnan(Z)):
-            _api.warn_external(
-                "Z contains NaN values. This may result in rendering "
-                "artifacts.")
 
-        # TODO: Support masked arrays
+        Z = cbook._to_unmasked_float_array(Z)
         X, Y, Z = np.broadcast_arrays(X, Y, Z)
         rows, cols = Z.shape
 
@@ -1676,7 +1395,7 @@ def plot_surface(self, X, Y, Z, *args, norm=None, vmin=None,
         rcount = kwargs.pop('rcount', 50)
         ccount = kwargs.pop('ccount', 50)
 
-        if rcParams['_internal.classic_mode']:
+        if mpl.rcParams['_internal.classic_mode']:
             # Strides have priority over counts in classic mode.
             # So, only compute strides from counts
             # if counts were explicitly given
@@ -1702,12 +1421,7 @@ def plot_surface(self, X, Y, Z, *args, norm=None, vmin=None,
         cmap = kwargs.get('cmap', None)
         shade = kwargs.pop('shade', cmap is None)
         if shade is None:
-            _api.warn_deprecated(
-                "3.1",
-                message="Passing shade=None to Axes3D.plot_surface() is "
-                        "deprecated since matplotlib 3.1 and will change its "
-                        "semantic or raise an error in matplotlib 3.3. "
-                        "Please use shade=False instead.")
+            raise ValueError("shade cannot be None.")
 
         colset = []  # the sampled facecolor
         if (rows - 1) % rstride == 0 and \
@@ -1737,9 +1451,30 @@ def plot_surface(self, X, Y, Z, *args, norm=None, vmin=None,
                     if fcolors is not None:
                         colset.append(fcolors[rs][cs])
 
+        # In cases where there are NaNs in the data (possibly from masked
+        # arrays), artifacts can be introduced. Here check whether NaNs exist
+        # and remove the entries if so
+        if not isinstance(polys, np.ndarray) or np.isnan(polys).any():
+            new_polys = []
+            new_colset = []
+
+            # Depending on fcolors, colset is either an empty list or has as
+            # many elements as polys. In the former case new_colset results in
+            # a list with None entries, that is discarded later.
+            for p, col in itertools.zip_longest(polys, colset):
+                new_poly = np.array(p)[~np.isnan(p).any(axis=1)]
+                if len(new_poly):
+                    new_polys.append(new_poly)
+                    new_colset.append(col)
+
+            # Replace previous polys and, if fcolors is not None, colset
+            polys = new_polys
+            if fcolors is not None:
+                colset = new_colset
+
         # note that the striding causes some polygons to have more coordinates
         # than others
-        polyc = art3d.Poly3DCollection(polys, *args, **kwargs)
+        polyc = art3d.Poly3DCollection(polys, **kwargs)
 
         if fcolors is not None:
             if shade:
@@ -1850,8 +1585,7 @@ def norm(x):
 
         return colors
 
-    @_api.delete_parameter("3.4", "args", alternative="kwargs")
-    def plot_wireframe(self, X, Y, Z, *args, **kwargs):
+    def plot_wireframe(self, X, Y, Z, **kwargs):
         """
         Plot a 3D wireframe.
 
@@ -1874,8 +1608,6 @@ def plot_wireframe(self, X, Y, Z, *args, **kwargs):
             not sampled in the corresponding direction, producing a 3D line
             plot rather than a wireframe plot.  Defaults to 50.
 
-            .. versionadded:: 2.0
-
         rstride, cstride : int
             Downsampling stride in each direction.  These arguments are
             mutually exclusive with *rcount* and *ccount*.  If only one of
@@ -1909,7 +1641,7 @@ def plot_wireframe(self, X, Y, Z, *args, **kwargs):
         rcount = kwargs.pop('rcount', 50)
         ccount = kwargs.pop('ccount', 50)
 
-        if rcParams['_internal.classic_mode']:
+        if mpl.rcParams['_internal.classic_mode']:
             # Strides have priority over counts in classic mode.
             # So, only compute strides from counts
             # if counts were explicitly given
@@ -1965,7 +1697,7 @@ def plot_wireframe(self, X, Y, Z, *args, **kwargs):
                  + [list(zip(xl, yl, zl))
                  for xl, yl, zl in zip(txlines, tylines, tzlines)])
 
-        linec = art3d.Line3DCollection(lines, *args, **kwargs)
+        linec = art3d.Line3DCollection(lines, **kwargs)
         self.add_collection(linec)
         self.auto_scale_xyz(X, Y, Z, had_data)
 
@@ -2022,8 +1754,6 @@ def plot_trisurf(self, *args, color=None, norm=None, vmin=None, vmax=None,
         --------
         .. plot:: gallery/mplot3d/trisurf3d.py
         .. plot:: gallery/mplot3d/trisurf3d_2.py
-
-        .. versionadded:: 1.2.0
         """
 
         had_data = self.has_data()
@@ -2090,7 +1820,7 @@ def _3d_extend_contour(self, cset, stride=5):
             topverts = art3d._paths_to_3d_segments(paths, z - dz)
             botverts = art3d._paths_to_3d_segments(paths, z + dz)
 
-            color = linec.get_color()[0]
+            color = linec.get_edgecolor()[0]
 
             polyverts = []
             normals = []
@@ -2123,7 +1853,7 @@ def _3d_extend_contour(self, cset, stride=5):
             self.add_collection3d(polycol)
 
         for col in colls:
-            self.collections.remove(col)
+            col.remove()
 
     def add_contour_set(
             self, cset, extend3d=False, stride=5, zdir='z', offset=None):
@@ -2137,13 +1867,34 @@ def add_contour_set(
                 art3d.line_collection_2d_to_3d(linec, z, zdir=zdir)
 
     def add_contourf_set(self, cset, zdir='z', offset=None):
+        self._add_contourf_set(cset, zdir=zdir, offset=offset)
+
+    def _add_contourf_set(self, cset, zdir='z', offset=None):
+        """
+        Returns
+        -------
+        levels : numpy.ndarray
+            Levels at which the filled contours are added.
+        """
         zdir = '-' + zdir
-        for z, linec in zip(cset.levels, cset.collections):
+
+        midpoints = cset.levels[:-1] + np.diff(cset.levels) / 2
+        # Linearly interpolate to get levels for any extensions
+        if cset._extend_min:
+            min_level = cset.levels[0] - np.diff(cset.levels[:2]) / 2
+            midpoints = np.insert(midpoints, 0, min_level)
+        if cset._extend_max:
+            max_level = cset.levels[-1] + np.diff(cset.levels[-2:]) / 2
+            midpoints = np.append(midpoints, max_level)
+
+        for z, linec in zip(midpoints, cset.collections):
             if offset is not None:
                 z = offset
             art3d.poly_collection_2d_to_3d(linec, z, zdir=zdir)
             linec.set_sort_zpos(z)
+        return midpoints
 
+    @_preprocess_data()
     def contour(self, X, Y, Z, *args,
                 extend3d=False, stride=5, zdir='z', offset=None, **kwargs):
         """
@@ -2151,8 +1902,8 @@ def contour(self, X, Y, Z, *args,
 
         Parameters
         ----------
-        X, Y, Z : array-like
-            Input data.
+        X, Y, Z : array-like,
+            Input data. See `.Axes.contour` for supported data shapes.
         extend3d : bool, default: False
             Whether to extend contour in 3D.
         stride : int
@@ -2162,6 +1913,9 @@ def contour(self, X, Y, Z, *args,
         offset : float, optional
             If specified, plot a projection of the contour lines at this
             position in a plane normal to zdir.
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         *args, **kwargs
             Other arguments are forwarded to `matplotlib.axes.Axes.contour`.
 
@@ -2180,14 +1934,12 @@ def contour(self, X, Y, Z, *args,
 
     contour3D = contour
 
+    @_preprocess_data()
     def tricontour(self, *args,
                    extend3d=False, stride=5, zdir='z', offset=None, **kwargs):
         """
         Create a 3D contour plot.
 
-        .. versionchanged:: 1.3.0
-            Added support for custom triangulations
-
         .. note::
             This method currently produces incorrect output due to a
             longstanding bug in 3D PolyCollection rendering.
@@ -2195,7 +1947,7 @@ def tricontour(self, *args,
         Parameters
         ----------
         X, Y, Z : array-like
-            Input data.
+            Input data. See `.Axes.tricontour` for supported data shapes.
         extend3d : bool, default: False
             Whether to extend contour in 3D.
         stride : int
@@ -2205,6 +1957,8 @@ def tricontour(self, *args,
         offset : float, optional
             If specified, plot a projection of the contour lines at this
             position in a plane normal to zdir.
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
         *args, **kwargs
             Other arguments are forwarded to `matplotlib.axes.Axes.tricontour`.
 
@@ -2233,6 +1987,17 @@ def tricontour(self, *args,
         self.auto_scale_xyz(X, Y, Z, had_data)
         return cset
 
+    def _auto_scale_contourf(self, X, Y, Z, zdir, levels, had_data):
+        # Autoscale in the zdir based on the levels added, which are
+        # different from data range if any contour extensions are present
+        dim_vals = {'x': X, 'y': Y, 'z': Z, zdir: levels}
+        # Input data and levels have different sizes, but auto_scale_xyz
+        # expected same-size input, so manually take min/max limits
+        limits = [(np.nanmin(dim_vals[dim]), np.nanmax(dim_vals[dim]))
+                  for dim in ['x', 'y', 'z']]
+        self.auto_scale_xyz(*limits, had_data)
+
+    @_preprocess_data()
     def contourf(self, X, Y, Z, *args, zdir='z', offset=None, **kwargs):
         """
         Create a 3D filled contour plot.
@@ -2240,35 +2005,33 @@ def contourf(self, X, Y, Z, *args, zdir='z', offset=None, **kwargs):
         Parameters
         ----------
         X, Y, Z : array-like
-            Input data.
+            Input data. See `.Axes.contourf` for supported data shapes.
         zdir : {'x', 'y', 'z'}, default: 'z'
             The direction to use.
         offset : float, optional
             If specified, plot a projection of the contour lines at this
             position in a plane normal to zdir.
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
         *args, **kwargs
             Other arguments are forwarded to `matplotlib.axes.Axes.contourf`.
 
         Returns
         -------
         matplotlib.contour.QuadContourSet
-
-        Notes
-        -----
-        .. versionadded:: 1.1.0
-            The *zdir* and *offset* parameters.
         """
         had_data = self.has_data()
 
         jX, jY, jZ = art3d.rotate_axes(X, Y, Z, zdir)
         cset = super().contourf(jX, jY, jZ, *args, **kwargs)
-        self.add_contourf_set(cset, zdir, offset)
+        levels = self._add_contourf_set(cset, zdir, offset)
 
-        self.auto_scale_xyz(X, Y, Z, had_data)
+        self._auto_scale_contourf(X, Y, Z, zdir, levels, had_data)
         return cset
 
     contourf3D = contourf
 
+    @_preprocess_data()
     def tricontourf(self, *args, zdir='z', offset=None, **kwargs):
         """
         Create a 3D filled contour plot.
@@ -2280,12 +2043,14 @@ def tricontourf(self, *args, zdir='z', offset=None, **kwargs):
         Parameters
         ----------
         X, Y, Z : array-like
-            Input data.
+            Input data. See `.Axes.tricontourf` for supported data shapes.
         zdir : {'x', 'y', 'z'}, default: 'z'
             The direction to use.
         offset : float, optional
             If specified, plot a projection of the contour lines at this
             position in a plane normal to zdir.
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
         *args, **kwargs
             Other arguments are forwarded to
             `matplotlib.axes.Axes.tricontourf`.
@@ -2293,13 +2058,6 @@ def tricontourf(self, *args, zdir='z', offset=None, **kwargs):
         Returns
         -------
         matplotlib.tri.tricontour.TriContourSet
-
-        Notes
-        -----
-        .. versionadded:: 1.1.0
-            The *zdir* and *offset* parameters.
-        .. versionchanged:: 1.3.0
-            Added support for custom triangulations
         """
         had_data = self.has_data()
 
@@ -2317,9 +2075,9 @@ def tricontourf(self, *args, zdir='z', offset=None, **kwargs):
         tri = Triangulation(jX, jY, tri.triangles, tri.mask)
 
         cset = super().tricontourf(tri, jZ, *args, **kwargs)
-        self.add_contourf_set(cset, zdir, offset)
+        levels = self._add_contourf_set(cset, zdir, offset)
 
-        self.auto_scale_xyz(X, Y, Z, had_data)
+        self._auto_scale_contourf(X, Y, Z, zdir, levels, had_data)
         return cset
 
     def add_collection3d(self, col, zs=0, zdir='z'):
@@ -2355,6 +2113,9 @@ def add_collection3d(self, col, zs=0, zdir='z'):
         collection = super().add_collection(col)
         return collection
 
+    @_preprocess_data(replace_names=["xs", "ys", "zs", "s",
+                                     "edgecolors", "c", "facecolor",
+                                     "facecolors", "color"])
     def scatter(self, xs, ys, zs=0, zdir='z', s=20, c=None, depthshade=True,
                 *args, **kwargs):
         """
@@ -2363,7 +2124,7 @@ def scatter(self, xs, ys, zs=0, zdir='z', s=20, c=None, depthshade=True,
         Parameters
         ----------
         xs, ys : array-like
-             The data positions.
+            The data positions.
         zs : float or array-like, default: 0
             The z-positions. Either an array of the same length as *xs* and
             *ys* or a single value to place all points in the same plane.
@@ -2392,6 +2153,8 @@ def scatter(self, xs, ys, zs=0, zdir='z', s=20, c=None, depthshade=True,
             Whether to shade the scatter markers to give the appearance of
             depth. Each call to ``scatter()`` will perform its depthshading
             independently.
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
         **kwargs
             All other arguments are passed on to `~.axes.Axes.scatter`.
 
@@ -2426,6 +2189,7 @@ def scatter(self, xs, ys, zs=0, zdir='z', s=20, c=None, depthshade=True,
 
     scatter3D = scatter
 
+    @_preprocess_data()
     def bar(self, left, height, zs=0, zdir='z', *args, **kwargs):
         """
         Add 2D bar(s).
@@ -2441,6 +2205,8 @@ def bar(self, left, height, zs=0, zdir='z', *args, **kwargs):
             used for all bars.
         zdir : {'x', 'y', 'z'}, default: 'z'
             When plotting 2D data, the direction to use as z ('x', 'y' or 'z').
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
         **kwargs
             Other arguments are forwarded to `matplotlib.axes.Axes.bar`.
 
@@ -2477,6 +2243,7 @@ def bar(self, left, height, zs=0, zdir='z', *args, **kwargs):
 
         return patches
 
+    @_preprocess_data()
     def bar3d(self, x, y, z, dx, dy, dz, color=None,
               zsort='average', shade=True, lightsource=None, *args, **kwargs):
         """
@@ -2525,6 +2292,9 @@ def bar3d(self, x, y, z, dx, dy, dz, color=None,
         lightsource : `~matplotlib.colors.LightSource`
             The lightsource to use when *shade* is True.
 
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             Any additional keyword arguments are passed onto
             `~.art3d.Poly3DCollection`.
@@ -2646,6 +2416,7 @@ def set_title(self, label, fontdict=None, loc='center', **kwargs):
         self.title.set_y(0.92 * y)
         return ret
 
+    @_preprocess_data()
     def quiver(self, *args,
                length=1, arrow_length_ratio=.3, pivot='tail', normalize=False,
                **kwargs):
@@ -2683,6 +2454,9 @@ def quiver(self, *args,
             Whether all arrows are normalized to have the same length, or keep
             the lengths defined by *u*, *v*, and *w*.
 
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             Any additional keyword arguments are delegated to
             :class:`~matplotlib.collections.LineCollection`
@@ -2807,8 +2581,6 @@ def voxels(self, *args, facecolors=None, edgecolors=None, shade=True,
         ``filled[0, 0, 0]`` placed with its lower corner at the origin.
         Occluded faces are not plotted.
 
-        .. versionadded:: 2.1
-
         Parameters
         ----------
         filled : 3D np.array of bool
@@ -2840,16 +2612,11 @@ def voxels(self, *args, facecolors=None, edgecolors=None, shade=True,
               last axis.
 
         shade : bool, default: True
-            Whether to shade the facecolors.  Shading is always disabled when
-            *cmap* is specified.
-
-            .. versionadded:: 3.1
+            Whether to shade the facecolors.
 
         lightsource : `~matplotlib.colors.LightSource`
             The lightsource to use when *shade* is True.
 
-            .. versionadded:: 3.1
-
         **kwargs
             Additional keyword arguments to pass onto
             `~mpl_toolkits.mplot3d.art3d.Poly3DCollection`.
@@ -3017,6 +2784,7 @@ def permutation_matrices(n):
 
         return polygons
 
+    @_preprocess_data(replace_names=["x", "y", "z", "xerr", "yerr", "zerr"])
     def errorbar(self, x, y, z, zerr=None, yerr=None, xerr=None, fmt='',
                  barsabove=False, errorevery=1, ecolor=None, elinewidth=None,
                  capsize=None, capthick=None, xlolims=False, xuplims=False,
@@ -3082,7 +2850,7 @@ def errorbar(self, x, y, z, zerr=None, yerr=None, xerr=None, fmt='',
             this. *lims*-arguments may be scalars, or array-likes of the same
             length as the errors. To use limits with inverted axes,
             `~.Axes.set_xlim` or `~.Axes.set_ylim` must be called before
-            :meth:`errorbar`. Note the tricky parameter names: setting e.g.
+            `errorbar`. Note the tricky parameter names: setting e.g.
             *ylolims* to True means that the y-value is a *lower* limit of the
             True value, so, only an *upward*-pointing arrow will be drawn!
 
@@ -3112,6 +2880,9 @@ def errorbar(self, x, y, z, zerr=None, yerr=None, xerr=None, fmt='',
 
         Other Parameters
         ----------------
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         **kwargs
             All other keyword arguments for styling errorbar lines are passed
             `~mpl_toolkits.mplot3d.art3d.Line3DCollection`.
@@ -3123,8 +2894,7 @@ def errorbar(self, x, y, z, zerr=None, yerr=None, xerr=None, fmt='',
         had_data = self.has_data()
 
         kwargs = cbook.normalize_kwargs(kwargs, mlines.Line2D)
-        # anything that comes in as 'None', drop so the default thing
-        # happens down stream
+        # Drop anything that comes in as None to use the default instead.
         kwargs = {k: v for k, v in kwargs.items() if v is not None}
         kwargs.setdefault('zorder', 2)
 
@@ -3140,33 +2910,7 @@ def errorbar(self, x, y, z, zerr=None, yerr=None, xerr=None, fmt='',
         if not len(x) == len(y) == len(z):
             raise ValueError("'x', 'y', and 'z' must have the same size")
 
-        if isinstance(errorevery, Integral):
-            errorevery = (0, errorevery)
-        if isinstance(errorevery, tuple):
-            if (len(errorevery) == 2 and
-                    isinstance(errorevery[0], Integral) and
-                    isinstance(errorevery[1], Integral)):
-                errorevery = slice(errorevery[0], None, errorevery[1])
-            else:
-                raise ValueError(
-                    f'errorevery={errorevery!r} is a not a tuple of two '
-                    f'integers')
-
-        elif isinstance(errorevery, slice):
-            pass
-
-        elif not isinstance(errorevery, str) and np.iterable(errorevery):
-            # fancy indexing
-            try:
-                x[errorevery]
-            except (ValueError, IndexError) as err:
-                raise ValueError(
-                    f"errorevery={errorevery!r} is iterable but not a valid "
-                    f"NumPy fancy index to match "
-                    f"'xerr'/'yerr'/'zerr'") from err
-        else:
-            raise ValueError(
-                f"errorevery={errorevery!r} is not a recognized value")
+        everymask = self._errorevery_to_mask(x, errorevery)
 
         label = kwargs.pop("label", None)
         kwargs['label'] = '_nolegend_'
@@ -3198,14 +2942,13 @@ def errorbar(self, x, y, z, zerr=None, yerr=None, xerr=None, fmt='',
         if ecolor is None:
             ecolor = base_style['color']
 
-        # Eject any marker information from line format string, as it's not
+        # Eject any line-specific information from format string, as it's not
         # needed for bars or caps.
-        base_style.pop('marker', None)
-        base_style.pop('markersize', None)
-        base_style.pop('markerfacecolor', None)
-        base_style.pop('markeredgewidth', None)
-        base_style.pop('markeredgecolor', None)
-        base_style.pop('linestyle', None)
+        for key in ['marker', 'markersize', 'markerfacecolor',
+                    'markeredgewidth', 'markeredgecolor', 'markevery',
+                    'linestyle', 'fillstyle', 'drawstyle', 'dash_capstyle',
+                    'dash_joinstyle', 'solid_capstyle', 'solid_joinstyle']:
+            base_style.pop(key, None)
 
         # Make the style dict for the line collections (the bars).
         eb_lines_style = {**base_style, 'color': ecolor}
@@ -3222,16 +2965,13 @@ def errorbar(self, x, y, z, zerr=None, yerr=None, xerr=None, fmt='',
         # Make the style dict for caps (the "hats").
         eb_cap_style = {**base_style, 'linestyle': 'None'}
         if capsize is None:
-            capsize = rcParams["errorbar.capsize"]
+            capsize = mpl.rcParams["errorbar.capsize"]
         if capsize > 0:
             eb_cap_style['markersize'] = 2. * capsize
         if capthick is not None:
             eb_cap_style['markeredgewidth'] = capthick
         eb_cap_style['color'] = ecolor
 
-        everymask = np.zeros(len(x), bool)
-        everymask[errorevery] = True
-
         def _apply_mask(arrays, mask):
             # Return, for each array in *arrays*, the elements for which *mask*
             # is True, without using fancy indexing.
@@ -3266,18 +3006,18 @@ def _extract_errs(err, data, lomask, himask):
         # scene is rotated, they are given a standard size based on viewing
         # them directly in planar form.
         quiversize = eb_cap_style.get('markersize',
-                                      rcParams['lines.markersize']) ** 2
+                                      mpl.rcParams['lines.markersize']) ** 2
         quiversize *= self.figure.dpi / 72
         quiversize = self.transAxes.inverted().transform([
             (0, 0), (quiversize, quiversize)])
         quiversize = np.mean(np.diff(quiversize, axis=0))
         # quiversize is now in Axes coordinates, and to convert back to data
         # coordinates, we need to run it through the inverse 3D transform. For
-        # consistency, this uses a fixed azimuth and elevation.
-        with cbook._setattr_cm(self, azim=0, elev=0):
+        # consistency, this uses a fixed elevation, azimuth, and roll.
+        with cbook._setattr_cm(self, elev=0, azim=0, roll=0):
             invM = np.linalg.inv(self.get_proj())
-        # azim=elev=0 produces the Y-Z plane, so quiversize in 2D 'x' is 'y' in
-        # 3D, hence the 1 index.
+        # elev=azim=roll=0 produces the Y-Z plane, so quiversize in 2D 'x' is
+        # 'y' in 3D, hence the 1 index.
         quiversize = np.dot(invM, np.array([quiversize, 0, 0, 0]))[1]
         # Quivers use a fixed 15-degree arrow head, so scale up the length so
         # that the size corresponds to the base. In other words, this constant
@@ -3368,7 +3108,7 @@ def _digout_minmax(err_arr, coord_label):
 
         return errlines, caplines, limmarks
 
-    def get_tightbbox(self, renderer, call_axes_locator=True,
+    def get_tightbbox(self, renderer=None, call_axes_locator=True,
                       bbox_extra_artists=None, *, for_layout_only=False):
         ret = super().get_tightbbox(renderer,
                                     call_axes_locator=call_axes_locator,
@@ -3376,20 +3116,15 @@ def get_tightbbox(self, renderer, call_axes_locator=True,
                                     for_layout_only=for_layout_only)
         batch = [ret]
         if self._axis3don:
-            for axis in self._get_axis_list():
+            for axis in self._axis_map.values():
                 if axis.get_visible():
-                    try:
-                        axis_bb = axis.get_tightbbox(
-                            renderer,
-                            for_layout_only=for_layout_only
-                        )
-                    except TypeError:
-                        # in case downstream library has redefined axis:
-                        axis_bb = axis.get_tightbbox(renderer)
-                if axis_bb:
-                    batch.append(axis_bb)
+                    axis_bb = martist._get_tightbbox_for_layout_only(
+                        axis, renderer)
+                    if axis_bb:
+                        batch.append(axis_bb)
         return mtransforms.Bbox.union(batch)
 
+    @_preprocess_data()
     def stem(self, x, y, z, *, linefmt='C0-', markerfmt='C0o', basefmt='C3-',
              bottom=0, label=None, orientation='z'):
         """
@@ -3441,6 +3176,9 @@ def stem(self, x, y, z, *, linefmt='C0-', markerfmt='C0o', basefmt='C3-',
         orientation : {'x', 'y', 'z'}, default: 'z'
             The direction along which stems are drawn.
 
+        data : indexable object, optional
+            DATA_PARAMETER_PLACEHOLDER
+
         Returns
         -------
         `.StemContainer`
@@ -3483,7 +3221,7 @@ def stem(self, x, y, z, *, linefmt='C0-', markerfmt='C0o', basefmt='C3-',
         # Determine style for stem lines.
         linestyle, linemarker, linecolor = _process_plot_format(linefmt)
         if linestyle is None:
-            linestyle = rcParams['lines.linestyle']
+            linestyle = mpl.rcParams['lines.linestyle']
 
         # Plot everything in required order.
         baseline, = self.plot(basex, basey, basefmt, zs=bottom,
@@ -3505,9 +3243,6 @@ def stem(self, x, y, z, *, linefmt='C0-', markerfmt='C0o', basefmt='C3-',
 
     stem3D = stem
 
-docstring.interpd.update(Axes3D_kwdoc=artist.kwdoc(Axes3D))
-docstring.dedent_interpd(Axes3D.__init__)
-
 
 def get_test_data(delta=0.05):
     """Return a tuple X, Y, Z with a test data set."""
diff --git a/lib/mpl_toolkits/mplot3d/axis3d.py b/lib/mpl_toolkits/mplot3d/axis3d.py
index e024104c00f0..efb3ced73048 100644
--- a/lib/mpl_toolkits/mplot3d/axis3d.py
+++ b/lib/mpl_toolkits/mplot3d/axis3d.py
@@ -2,15 +2,27 @@
 # Created: 23 Sep 2005
 # Parts rewritten by Reinier Heeres <reinier@heeres.eu>
 
+import inspect
+
 import numpy as np
 
-import matplotlib.transforms as mtransforms
+import matplotlib as mpl
 from matplotlib import (
-    artist, lines as mlines, axis as maxis, patches as mpatches, rcParams)
+    _api, artist, lines as mlines, axis as maxis, patches as mpatches,
+    transforms as mtransforms, colors as mcolors)
 from . import art3d, proj3d
 
 
+@_api.deprecated("3.6", alternative="a vendored copy of _move_from_center")
 def move_from_center(coord, centers, deltas, axmask=(True, True, True)):
+    """
+    For each coordinate where *axmask* is True, move *coord* away from
+    *centers* by *deltas*.
+    """
+    return _move_from_center(coord, centers, deltas, axmask=axmask)
+
+
+def _move_from_center(coord, centers, deltas, axmask=(True, True, True)):
     """
     For each coordinate where *axmask* is True, move *coord* away from
     *centers* by *deltas*.
@@ -19,8 +31,14 @@ def move_from_center(coord, centers, deltas, axmask=(True, True, True)):
     return coord + axmask * np.copysign(1, coord - centers) * deltas
 
 
+@_api.deprecated("3.6", alternative="a vendored copy of _tick_update_position")
 def tick_update_position(tick, tickxs, tickys, labelpos):
     """Update tick line and label position and style."""
+    _tick_update_position(tick, tickxs, tickys, labelpos)
+
+
+def _tick_update_position(tick, tickxs, tickys, labelpos):
+    """Update tick line and label position and style."""
 
     tick.label1.set_position(labelpos)
     tick.label2.set_position(labelpos)
@@ -36,9 +54,9 @@ class Axis(maxis.XAxis):
     """An Axis class for the 3D plots."""
     # These points from the unit cube make up the x, y and z-planes
     _PLANES = (
-        (0, 3, 7, 4), (1, 2, 6, 5),     # yz planes
-        (0, 1, 5, 4), (3, 2, 6, 7),     # xz planes
-        (0, 1, 2, 3), (4, 5, 6, 7),     # xy planes
+        (0, 3, 7, 4), (1, 2, 6, 5),  # yz planes
+        (0, 1, 5, 4), (3, 2, 6, 7),  # xz planes
+        (0, 1, 2, 3), (4, 5, 6, 7),  # xy planes
     )
 
     # Some properties for the axes
@@ -51,23 +69,43 @@ class Axis(maxis.XAxis):
               'color': (0.925, 0.925, 0.925, 0.5)},
     }
 
-    def __init__(self, adir, v_intervalx, d_intervalx, axes, *args,
-                 rotate_label=None, **kwargs):
-        # adir identifies which axes this is
-        self.adir = adir
+    def _old_init(self, adir, v_intervalx, d_intervalx, axes, *args,
+                  rotate_label=None, **kwargs):
+        return locals()
+
+    def _new_init(self, axes, *, rotate_label=None, **kwargs):
+        return locals()
+
+    def __init__(self, *args, **kwargs):
+        params = _api.select_matching_signature(
+            [self._old_init, self._new_init], *args, **kwargs)
+        if "adir" in params:
+            _api.warn_deprecated(
+                "3.6", message=f"The signature of 3D Axis constructors has "
+                f"changed in %(since)s; the new signature is "
+                f"{inspect.signature(type(self).__init__)}", pending=True)
+            if params["adir"] != self.axis_name:
+                raise ValueError(f"Cannot instantiate {type(self).__name__} "
+                                 f"with adir={params['adir']!r}")
+        axes = params["axes"]
+        rotate_label = params["rotate_label"]
+        args = params.get("args", ())
+        kwargs = params["kwargs"]
+
+        name = self.axis_name
 
         # This is a temporary member variable.
         # Do not depend on this existing in future releases!
-        self._axinfo = self._AXINFO[adir].copy()
-        if rcParams['_internal.classic_mode']:
+        self._axinfo = self._AXINFO[name].copy()
+        if mpl.rcParams['_internal.classic_mode']:
             self._axinfo.update({
                 'label': {'va': 'center', 'ha': 'center'},
                 'tick': {
                     'inward_factor': 0.2,
                     'outward_factor': 0.1,
                     'linewidth': {
-                        True: rcParams['lines.linewidth'],  # major
-                        False: rcParams['lines.linewidth'],  # minor
+                        True: mpl.rcParams['lines.linewidth'],  # major
+                        False: mpl.rcParams['lines.linewidth'],  # minor
                     }
                 },
                 'axisline': {'linewidth': 0.75, 'color': (0, 0, 0, 1)},
@@ -85,32 +123,39 @@ def __init__(self, adir, v_intervalx, d_intervalx, axes, *args,
                     'outward_factor': 0.1,
                     'linewidth': {
                         True: (  # major
-                            rcParams['xtick.major.width'] if adir in 'xz' else
-                            rcParams['ytick.major.width']),
+                            mpl.rcParams['xtick.major.width'] if name in 'xz'
+                            else mpl.rcParams['ytick.major.width']),
                         False: (  # minor
-                            rcParams['xtick.minor.width'] if adir in 'xz' else
-                            rcParams['ytick.minor.width']),
+                            mpl.rcParams['xtick.minor.width'] if name in 'xz'
+                            else mpl.rcParams['ytick.minor.width']),
                     }
                 },
                 'axisline': {
-                    'linewidth': rcParams['axes.linewidth'],
-                    'color': rcParams['axes.edgecolor'],
+                    'linewidth': mpl.rcParams['axes.linewidth'],
+                    'color': mpl.rcParams['axes.edgecolor'],
                 },
                 'grid': {
-                    'color': rcParams['grid.color'],
-                    'linewidth': rcParams['grid.linewidth'],
-                    'linestyle': rcParams['grid.linestyle'],
+                    'color': mpl.rcParams['grid.color'],
+                    'linewidth': mpl.rcParams['grid.linewidth'],
+                    'linestyle': mpl.rcParams['grid.linestyle'],
                 },
             })
 
         super().__init__(axes, *args, **kwargs)
 
         # data and viewing intervals for this direction
-        self.d_interval = d_intervalx
-        self.v_interval = v_intervalx
+        if "d_intervalx" in params:
+            self.set_data_interval(*params["d_intervalx"])
+        if "v_intervalx" in params:
+            self.set_view_interval(*params["v_intervalx"])
         self.set_rotate_label(rotate_label)
+        self._init3d()  # Inline after init3d deprecation elapses.
+
+    __init__.__signature__ = inspect.signature(_new_init)
+    adir = _api.deprecated("3.6", pending=True)(
+        property(lambda self: self.axis_name))
 
-    def init3d(self):
+    def _init3d(self):
         self.line = mlines.Line2D(
             xdata=(0, 0), ydata=(0, 0),
             linewidth=self._axinfo['axisline']['linewidth'],
@@ -119,8 +164,7 @@ def init3d(self):
 
         # Store dummy data in Polygon object
         self.pane = mpatches.Polygon(
-            np.array([[0, 0], [0, 1], [1, 0], [0, 0]]),
-            closed=False, alpha=0.8, facecolor='k', edgecolor='k')
+            np.array([[0, 0], [0, 1]]), closed=False)
         self.set_pane_color(self._axinfo['color'])
 
         self.axes._set_artist_props(self.line)
@@ -133,6 +177,10 @@ def init3d(self):
         self.label._transform = self.axes.transData
         self.offsetText._transform = self.axes.transData
 
+    @_api.deprecated("3.6", pending=True)
+    def init3d(self):  # After deprecation elapses, inline _init3d to __init__.
+        self._init3d()
+
     def get_major_ticks(self, numticks=None):
         ticks = super().get_major_ticks(numticks)
         for t in ticks:
@@ -149,14 +197,28 @@ def get_minor_ticks(self, numticks=None):
                 obj.set_transform(self.axes.transData)
         return ticks
 
+    @_api.deprecated("3.6")
     def set_pane_pos(self, xys):
+        self._set_pane_pos(xys)
+
+    def _set_pane_pos(self, xys):
         xys = np.asarray(xys)
         xys = xys[:, :2]
         self.pane.xy = xys
         self.stale = True
 
-    def set_pane_color(self, color):
-        """Set pane color to a RGBA tuple."""
+    def set_pane_color(self, color, alpha=None):
+        """
+        Set pane color.
+
+        Parameters
+        ----------
+        color : color
+            Color for axis pane.
+        alpha : float, optional
+            Alpha value for axis pane. If None, base it on *color*.
+        """
+        color = mcolors.to_rgba(color, alpha)
         self._axinfo['color'] = color
         self.pane.set_edgecolor(color)
         self.pane.set_facecolor(color)
@@ -183,18 +245,79 @@ def _get_coord_info(self, renderer):
             self.axes.get_ybound(),
             self.axes.get_zbound(),
         ]).T
-        centers = (maxs + mins) / 2.
-        deltas = (maxs - mins) / 12.
-        mins = mins - deltas / 4.
-        maxs = maxs + deltas / 4.
 
-        vals = mins[0], maxs[0], mins[1], maxs[1], mins[2], maxs[2]
-        tc = self.axes.tunit_cube(vals, self.axes.M)
-        avgz = [tc[p1][2] + tc[p2][2] + tc[p3][2] + tc[p4][2]
-                for p1, p2, p3, p4 in self._PLANES]
-        highs = np.array([avgz[2*i] < avgz[2*i+1] for i in range(3)])
+        # Get the mean value for each bound:
+        centers = 0.5 * (maxs + mins)
+
+        # Add a small offset between min/max point and the edge of the
+        # plot:
+        deltas = (maxs - mins) / 12
+        mins -= 0.25 * deltas
+        maxs += 0.25 * deltas
+
+        # Project the bounds along the current position of the cube:
+        bounds = mins[0], maxs[0], mins[1], maxs[1], mins[2], maxs[2]
+        bounds_proj = self.axes.tunit_cube(bounds, self.axes.M)
+
+        # Determine which one of the parallel planes are higher up:
+        means_z0 = np.zeros(3)
+        means_z1 = np.zeros(3)
+        for i in range(3):
+            means_z0[i] = np.mean(bounds_proj[self._PLANES[2 * i], 2])
+            means_z1[i] = np.mean(bounds_proj[self._PLANES[2 * i + 1], 2])
+        highs = means_z0 < means_z1
+
+        # Special handling for edge-on views
+        equals = np.abs(means_z0 - means_z1) <= np.finfo(float).eps
+        if np.sum(equals) == 2:
+            vertical = np.where(~equals)[0][0]
+            if vertical == 2:  # looking at XY plane
+                highs = np.array([True, True, highs[2]])
+            elif vertical == 1:  # looking at XZ plane
+                highs = np.array([True, highs[1], False])
+            elif vertical == 0:  # looking at YZ plane
+                highs = np.array([highs[0], False, False])
+
+        return mins, maxs, centers, deltas, bounds_proj, highs
+
+    def _get_axis_line_edge_points(self, minmax, maxmin):
+        """Get the edge points for the black bolded axis line."""
+        # When changing vertical axis some of the axes has to be
+        # moved to the other plane so it looks the same as if the z-axis
+        # was the vertical axis.
+        mb = [minmax, maxmin]
+        mb_rev = mb[::-1]
+        mm = [[mb, mb_rev, mb_rev], [mb_rev, mb_rev, mb], [mb, mb, mb]]
+        mm = mm[self.axes._vertical_axis][self._axinfo["i"]]
+
+        juggled = self._axinfo["juggled"]
+        edge_point_0 = mm[0].copy()
+        edge_point_0[juggled[0]] = mm[1][juggled[0]]
+
+        edge_point_1 = edge_point_0.copy()
+        edge_point_1[juggled[1]] = mm[1][juggled[1]]
+
+        return edge_point_0, edge_point_1
+
+    def _get_tickdir(self):
+        """
+        Get the direction of the tick.
+
+        Returns
+        -------
+        tickdir : int
+            Index which indicates which coordinate the tick line will
+            align with.
+        """
+        # TODO: Move somewhere else where it's triggered less:
+        tickdirs_base = [v["tickdir"] for v in self._AXINFO.values()]
+        info_i = [v["i"] for v in self._AXINFO.values()]
 
-        return mins, maxs, centers, deltas, tc, highs
+        i = self._axinfo["i"]
+        j = self.axes._vertical_axis - 2
+        # tickdir = [[1, 2, 1], [2, 2, 0], [1, 0, 0]][i]
+        tickdir = np.roll(info_i, -j)[np.roll(tickdirs_base, j)][i]
+        return tickdir
 
     def draw_pane(self, renderer):
         renderer.open_group('pane3d', gid=self.get_gid())
@@ -208,7 +331,7 @@ def draw_pane(self, renderer):
         else:
             plane = self._PLANES[2 * index + 1]
         xys = [tc[p] for p in plane]
-        self.set_pane_pos(xys)
+        self._set_pane_pos(xys)
         self.pane.draw(renderer)
 
         renderer.close_group('pane3d')
@@ -216,36 +339,30 @@ def draw_pane(self, renderer):
     @artist.allow_rasterization
     def draw(self, renderer):
         self.label._transform = self.axes.transData
-        renderer.open_group('axis3d', gid=self.get_gid())
+        renderer.open_group("axis3d", gid=self.get_gid())
 
         ticks = self._update_ticks()
 
+        # Get general axis information:
         info = self._axinfo
-        index = info['i']
+        index = info["i"]
+        juggled = info["juggled"]
 
         mins, maxs, centers, deltas, tc, highs = self._get_coord_info(renderer)
 
-        # Determine grid lines
         minmax = np.where(highs, maxs, mins)
-        maxmin = np.where(highs, mins, maxs)
+        maxmin = np.where(~highs, maxs, mins)
 
-        # Draw main axis line
-        juggled = info['juggled']
-        edgep1 = minmax.copy()
-        edgep1[juggled[0]] = maxmin[juggled[0]]
+        # Create edge points for the black bolded axis line:
+        edgep1, edgep2 = self._get_axis_line_edge_points(minmax, maxmin)
 
-        edgep2 = edgep1.copy()
-        edgep2[juggled[1]] = maxmin[juggled[1]]
-        pep = np.asarray(
-            proj3d.proj_trans_points([edgep1, edgep2], self.axes.M))
-        centpt = proj3d.proj_transform(*centers, self.axes.M)
+        # Project the edge points along the current position and
+        # create the line:
+        pep = proj3d.proj_trans_points([edgep1, edgep2], self.axes.M)
+        pep = np.asarray(pep)
         self.line.set_data(pep[0], pep[1])
         self.line.draw(renderer)
 
-        # Grid points where the planes meet
-        xyz0 = np.tile(minmax, (len(ticks), 1))
-        xyz0[:, index] = [tick.get_loc() for tick in ticks]
-
         # Draw labels
         # The transAxes transform is used because the Text object
         # rotates the text relative to the display coordinate system.
@@ -269,7 +386,7 @@ def draw(self, renderer):
             (self.labelpad + default_offset) * deltas_per_point * deltas)
         axmask = [True, True, True]
         axmask[index] = False
-        lxyz = move_from_center(lxyz, centers, labeldeltas, axmask)
+        lxyz = _move_from_center(lxyz, centers, labeldeltas, axmask)
         tlx, tly, tlz = proj3d.proj_transform(*lxyz, self.axes.M)
         self.label.set_position((tlx, tly))
         if self.get_rotate_label(self.label.get_text()):
@@ -290,7 +407,7 @@ def draw(self, renderer):
             outeredgep = edgep2
             outerindex = 1
 
-        pos = move_from_center(outeredgep, centers, labeldeltas, axmask)
+        pos = _move_from_center(outeredgep, centers, labeldeltas, axmask)
         olx, oly, olz = proj3d.proj_transform(*pos, self.axes.M)
         self.offsetText.set_text(self.major.formatter.get_offset())
         self.offsetText.set_position((olx, oly))
@@ -300,7 +417,7 @@ def draw(self, renderer):
         # the alignment point is used as the "fulcrum" for rotation.
         self.offsetText.set_rotation_mode('anchor')
 
-        #----------------------------------------------------------------------
+        # ----------------------------------------------------------------------
         # Note: the following statement for determining the proper alignment of
         # the offset text. This was determined entirely by trial-and-error
         # and should not be in any way considered as "the way".  There are
@@ -315,6 +432,7 @@ def draw(self, renderer):
         # Three-letters (e.g., TFT, FTT) are short-hand for the array of bools
         # from the variable 'highs'.
         # ---------------------------------------------------------------------
+        centpt = proj3d.proj_transform(*centers, self.axes.M)
         if centpt[info['tickdir']] > pep[info['tickdir'], outerindex]:
             # if FT and if highs has an even number of Trues
             if (centpt[index] <= pep[index, outerindex]
@@ -333,10 +451,7 @@ def draw(self, renderer):
             if (centpt[index] > pep[index, outerindex]
                     and np.count_nonzero(highs) % 2 == 0):
                 # Usually mean align left, except if it is axis 2
-                if index == 2:
-                    align = 'right'
-                else:
-                    align = 'left'
+                align = 'right' if index == 2 else 'left'
             else:
                 # The TT case
                 align = 'right'
@@ -346,6 +461,10 @@ def draw(self, renderer):
         self.offsetText.draw(renderer)
 
         if self.axes._draw_grid and len(ticks):
+            # Grid points where the planes meet
+            xyz0 = np.tile(minmax, (len(ticks), 1))
+            xyz0[:, index] = [tick.get_loc() for tick in ticks]
+
             # Grid lines go from the end of one plane through the plane
             # intersection (at xyz0) to the end of the other plane.  The first
             # point (0) differs along dimension index-2 and the last (2) along
@@ -354,47 +473,45 @@ def draw(self, renderer):
             lines[:, 0, index - 2] = maxmin[index - 2]
             lines[:, 2, index - 1] = maxmin[index - 1]
             self.gridlines.set_segments(lines)
-            self.gridlines.set_color(info['grid']['color'])
-            self.gridlines.set_linewidth(info['grid']['linewidth'])
-            self.gridlines.set_linestyle(info['grid']['linestyle'])
+            gridinfo = info['grid']
+            self.gridlines.set_color(gridinfo['color'])
+            self.gridlines.set_linewidth(gridinfo['linewidth'])
+            self.gridlines.set_linestyle(gridinfo['linestyle'])
             self.gridlines.do_3d_projection()
             self.gridlines.draw(renderer)
 
-        # Draw ticks
-        tickdir = info['tickdir']
-        tickdelta = deltas[tickdir]
-        if highs[tickdir]:
-            ticksign = 1
-        else:
-            ticksign = -1
+        # Draw ticks:
+        tickdir = self._get_tickdir()
+        tickdelta = deltas[tickdir] if highs[tickdir] else -deltas[tickdir]
+
+        tick_info = info['tick']
+        tick_out = tick_info['outward_factor'] * tickdelta
+        tick_in = tick_info['inward_factor'] * tickdelta
+        tick_lw = tick_info['linewidth']
+        edgep1_tickdir = edgep1[tickdir]
+        out_tickdir = edgep1_tickdir + tick_out
+        in_tickdir = edgep1_tickdir - tick_in
 
+        default_label_offset = 8.  # A rough estimate
+        points = deltas_per_point * deltas
         for tick in ticks:
             # Get tick line positions
             pos = edgep1.copy()
             pos[index] = tick.get_loc()
-            pos[tickdir] = (
-                edgep1[tickdir]
-                + info['tick']['outward_factor'] * ticksign * tickdelta)
+            pos[tickdir] = out_tickdir
             x1, y1, z1 = proj3d.proj_transform(*pos, self.axes.M)
-            pos[tickdir] = (
-                edgep1[tickdir]
-                - info['tick']['inward_factor'] * ticksign * tickdelta)
+            pos[tickdir] = in_tickdir
             x2, y2, z2 = proj3d.proj_transform(*pos, self.axes.M)
 
             # Get position of label
-            default_offset = 8.  # A rough estimate
-            labeldeltas = (
-                (tick.get_pad() + default_offset) * deltas_per_point * deltas)
-
-            axmask = [True, True, True]
-            axmask[index] = False
-            pos[tickdir] = edgep1[tickdir]
-            pos = move_from_center(pos, centers, labeldeltas, axmask)
+            labeldeltas = (tick.get_pad() + default_label_offset) * points
+
+            pos[tickdir] = edgep1_tickdir
+            pos = _move_from_center(pos, centers, labeldeltas, axmask)
             lx, ly, lz = proj3d.proj_transform(*pos, self.axes.M)
 
-            tick_update_position(tick, (x1, x2), (y1, y2), (lx, ly))
-            tick.tick1line.set_linewidth(
-                info['tick']['linewidth'][tick._major])
+            _tick_update_position(tick, (x1, x2), (y1, y2), (lx, ly))
+            tick.tick1line.set_linewidth(tick_lw[tick._major])
             tick.draw(renderer)
 
         renderer.close_group('axis3d')
@@ -402,8 +519,8 @@ def draw(self, renderer):
 
     # TODO: Get this to work (more) properly when mplot3d supports the
     #       transforms framework.
-    def get_tightbbox(self, renderer, *, for_layout_only=False):
-        # inherited docstring
+    def get_tightbbox(self, renderer=None, *, for_layout_only=False):
+        # docstring inherited
         if not self.get_visible():
             return
         # We have to directly access the internal data structures
@@ -437,7 +554,7 @@ def get_tightbbox(self, renderer, *, for_layout_only=False):
 
         ticks = ticks_to_draw
 
-        bb_1, bb_2 = self._get_tick_bboxes(ticks, renderer)
+        bb_1, bb_2 = self._get_ticklabel_bboxes(ticks, renderer)
         other = []
 
         if self.line.get_visible():
@@ -448,27 +565,18 @@ def get_tightbbox(self, renderer, *, for_layout_only=False):
 
         return mtransforms.Bbox.union([*bb_1, *bb_2, *other])
 
-    @property
-    def d_interval(self):
-        return self.get_data_interval()
-
-    @d_interval.setter
-    def d_interval(self, minmax):
-        self.set_data_interval(*minmax)
-
-    @property
-    def v_interval(self):
-        return self.get_view_interval()
-
-    @v_interval.setter
-    def v_interval(self, minmax):
-        self.set_view_interval(*minmax)
-
-
-# Use classes to look at different data limits
+    d_interval = _api.deprecated(
+        "3.6", alternative="get_data_interval", pending=True)(
+            property(lambda self: self.get_data_interval(),
+                     lambda self, minmax: self.set_data_interval(*minmax)))
+    v_interval = _api.deprecated(
+        "3.6", alternative="get_view_interval", pending=True)(
+            property(lambda self: self.get_view_interval(),
+                     lambda self, minmax: self.set_view_interval(*minmax)))
 
 
 class XAxis(Axis):
+    axis_name = "x"
     get_view_interval, set_view_interval = maxis._make_getset_interval(
         "view", "xy_viewLim", "intervalx")
     get_data_interval, set_data_interval = maxis._make_getset_interval(
@@ -476,6 +584,7 @@ class XAxis(Axis):
 
 
 class YAxis(Axis):
+    axis_name = "y"
     get_view_interval, set_view_interval = maxis._make_getset_interval(
         "view", "xy_viewLim", "intervaly")
     get_data_interval, set_data_interval = maxis._make_getset_interval(
@@ -483,6 +592,7 @@ class YAxis(Axis):
 
 
 class ZAxis(Axis):
+    axis_name = "z"
     get_view_interval, set_view_interval = maxis._make_getset_interval(
         "view", "zz_viewLim", "intervalx")
     get_data_interval, set_data_interval = maxis._make_getset_interval(
diff --git a/lib/mpl_toolkits/mplot3d/proj3d.py b/lib/mpl_toolkits/mplot3d/proj3d.py
index cce89c5f3554..2f23e3779b06 100644
--- a/lib/mpl_toolkits/mplot3d/proj3d.py
+++ b/lib/mpl_toolkits/mplot3d/proj3d.py
@@ -14,14 +14,18 @@ def _line2d_seg_dist(p1, p2, p0):
     p0[1] = y(s)
 
     intersection point p = p1 + u*(p2-p1)
-    and intersection point lies within segment if u is between 0 and 1
+    and intersection point lies within segment if u is between 0 and 1.
+
+    If p1 and p2 are identical, the distance between them and p0 is returned.
     """
 
-    x21 = p2[0] - p1[0]
-    y21 = p2[1] - p1[1]
     x01 = np.asarray(p0[0]) - p1[0]
     y01 = np.asarray(p0[1]) - p1[1]
+    if np.all(p1[0:2] == p2[0:2]):
+        return np.hypot(x01, y01)
 
+    x21 = p2[0] - p1[0]
+    y21 = p2[1] - p1[1]
     u = (x01*x21 + y01*y21) / (x21**2 + y21**2)
     u = np.clip(u, 0, 1)
     d = np.hypot(x01 - u*x21, y01 - u*y21)
@@ -51,55 +55,66 @@ def world_transformation(xmin, xmax,
                      [0,    0,    0,    1]])
 
 
-def view_transformation(E, R, V):
+def rotation_about_vector(v, angle):
+    """
+    Produce a rotation matrix for an angle in radians about a vector.
+    """
+    vx, vy, vz = v / np.linalg.norm(v)
+    s = np.sin(angle)
+    c = np.cos(angle)
+    t = 2*np.sin(angle/2)**2  # more numerically stable than t = 1-c
+
+    R = np.array([
+        [t*vx*vx + c,    t*vx*vy - vz*s, t*vx*vz + vy*s],
+        [t*vy*vx + vz*s, t*vy*vy + c,    t*vy*vz - vx*s],
+        [t*vz*vx - vy*s, t*vz*vy + vx*s, t*vz*vz + c]])
+
+    return R
+
+
+def view_transformation(E, R, V, roll):
     n = (E - R)
-    ## new
-#    n /= np.linalg.norm(n)
-#    u = np.cross(V, n)
-#    u /= np.linalg.norm(u)
-#    v = np.cross(n, u)
-#    Mr = np.diag([1.] * 4)
-#    Mt = np.diag([1.] * 4)
-#    Mr[:3,:3] = u, v, n
-#    Mt[:3,-1] = -E
-    ## end new
-
-    ## old
-    n = n / np.linalg.norm(n)
+    n = n/np.linalg.norm(n)
     u = np.cross(V, n)
-    u = u / np.linalg.norm(u)
-    v = np.cross(n, u)
-    Mr = [[u[0], u[1], u[2], 0],
-          [v[0], v[1], v[2], 0],
-          [n[0], n[1], n[2], 0],
-          [0,    0,    0,    1]]
-    #
-    Mt = [[1, 0, 0, -E[0]],
-          [0, 1, 0, -E[1]],
-          [0, 0, 1, -E[2]],
-          [0, 0, 0, 1]]
-    ## end old
+    u = u/np.linalg.norm(u)
+    v = np.cross(n, u)  # Will be a unit vector
+
+    # Save some computation for the default roll=0
+    if roll != 0:
+        # A positive rotation of the camera is a negative rotation of the world
+        Rroll = rotation_about_vector(n, -roll)
+        u = np.dot(Rroll, u)
+        v = np.dot(Rroll, v)
+
+    Mr = np.eye(4)
+    Mt = np.eye(4)
+    Mr[:3, :3] = [u, v, n]
+    Mt[:3, -1] = -E
 
     return np.dot(Mr, Mt)
 
 
-def persp_transformation(zfront, zback):
-    a = (zfront+zback)/(zfront-zback)
-    b = -2*(zfront*zback)/(zfront-zback)
-    return np.array([[1, 0, 0, 0],
-                     [0, 1, 0, 0],
-                     [0, 0, a, b],
-                     [0, 0, -1, 0]])
+def persp_transformation(zfront, zback, focal_length):
+    e = focal_length
+    a = 1  # aspect ratio
+    b = (zfront+zback)/(zfront-zback)
+    c = -2*(zfront*zback)/(zfront-zback)
+    proj_matrix = np.array([[e,   0,  0, 0],
+                            [0, e/a,  0, 0],
+                            [0,   0,  b, c],
+                            [0,   0, -1, 0]])
+    return proj_matrix
 
 
 def ortho_transformation(zfront, zback):
     # note: w component in the resulting vector will be (zback-zfront), not 1
     a = -(zfront + zback)
     b = -(zfront - zback)
-    return np.array([[2, 0, 0, 0],
-                     [0, 2, 0, 0],
-                     [0, 0, -2, 0],
-                     [0, 0, a, b]])
+    proj_matrix = np.array([[2, 0,  0, 0],
+                            [0, 2,  0, 0],
+                            [0, 0, -2, 0],
+                            [0, 0,  a, b]])
+    return proj_matrix
 
 
 def _proj_transform_vec(vec, M):
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_axes_grid/imagegrid_cbar_mode.png b/lib/mpl_toolkits/tests/baseline_images/test_axes_grid/imagegrid_cbar_mode.png
index a42548f9f6cd..eb16727ed407 100644
Binary files a/lib/mpl_toolkits/tests/baseline_images/test_axes_grid/imagegrid_cbar_mode.png and b/lib/mpl_toolkits/tests/baseline_images/test_axes_grid/imagegrid_cbar_mode.png differ
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_axes_grid1/rgb_axes.png b/lib/mpl_toolkits/tests/baseline_images/test_axes_grid1/rgb_axes.png
new file mode 100644
index 000000000000..5cf6dc7e35c0
Binary files /dev/null and b/lib/mpl_toolkits/tests/baseline_images/test_axes_grid1/rgb_axes.png differ
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_axisartist_axislines/ParasiteAxesAuxTrans_meshplot.png b/lib/mpl_toolkits/tests/baseline_images/test_axisartist_axislines/ParasiteAxesAuxTrans_meshplot.png
index e8116fe1228f..f3d0f67c5ce5 100644
Binary files a/lib/mpl_toolkits/tests/baseline_images/test_axisartist_axislines/ParasiteAxesAuxTrans_meshplot.png and b/lib/mpl_toolkits/tests/baseline_images/test_axisartist_axislines/ParasiteAxesAuxTrans_meshplot.png differ
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/arc_pathpatch.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/arc_pathpatch.png
new file mode 100644
index 000000000000..66e6a9acb986
Binary files /dev/null and b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/arc_pathpatch.png differ
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/aspects.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/aspects.png
new file mode 100644
index 000000000000..3bb088e2d131
Binary files /dev/null and b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/aspects.png differ
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_focal_length.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_focal_length.png
new file mode 100644
index 000000000000..1d61e0a0c0f6
Binary files /dev/null and b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_focal_length.png differ
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_primary_views.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_primary_views.png
new file mode 100644
index 000000000000..025156f34d39
Binary files /dev/null and b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_primary_views.png differ
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_rotated.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_rotated.png
index 0c79fd32e42c..9e7193d6b326 100644
Binary files a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_rotated.png and b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_rotated.png differ
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/bar3d_shaded.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/bar3d_shaded.png
index c22f2a5671d3..39dc9997cb1d 100644
Binary files a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/bar3d_shaded.png and b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/bar3d_shaded.png differ
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/computed_zorder.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/computed_zorder.png
new file mode 100644
index 000000000000..887d409b72c7
Binary files /dev/null and b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/computed_zorder.png differ
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/contour3d_extend3d.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/contour3d_extend3d.png
new file mode 100644
index 000000000000..061d4add9e47
Binary files /dev/null and b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/contour3d_extend3d.png differ
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/scatter3d_linewidth.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/scatter3d_linewidth.png
new file mode 100644
index 000000000000..c4c07dd9e8d6
Binary files /dev/null and b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/scatter3d_linewidth.png differ
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/scatter_spiral.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/scatter_spiral.png
new file mode 100644
index 000000000000..134e75e170cc
Binary files /dev/null and b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/scatter_spiral.png differ
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/surface3d_masked.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/surface3d_masked.png
new file mode 100644
index 000000000000..df7f1ebdf476
Binary files /dev/null and b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/surface3d_masked.png differ
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/surface3d_masked_strides.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/surface3d_masked_strides.png
new file mode 100644
index 000000000000..5524fea4537b
Binary files /dev/null and b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/surface3d_masked_strides.png differ
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/tricontour.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/tricontour.png
index 7d8eb501601e..4387737e8115 100644
Binary files a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/tricontour.png and b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/tricontour.png differ
diff --git a/lib/mpl_toolkits/tests/conftest.py b/lib/mpl_toolkits/tests/conftest.py
index 81829c903c58..61c2de3e07ba 100644
--- a/lib/mpl_toolkits/tests/conftest.py
+++ b/lib/mpl_toolkits/tests/conftest.py
@@ -1,3 +1,2 @@
-from matplotlib.testing.conftest import (mpl_test_settings,
-                                         mpl_image_comparison_parameters,
+from matplotlib.testing.conftest import (mpl_test_settings,  # noqa
                                          pytest_configure, pytest_unconfigure)
diff --git a/lib/mpl_toolkits/tests/test_axes_grid.py b/lib/mpl_toolkits/tests/test_axes_grid.py
index f789c31b7c67..4d77b90e5e03 100644
--- a/lib/mpl_toolkits/tests/test_axes_grid.py
+++ b/lib/mpl_toolkits/tests/test_axes_grid.py
@@ -1,6 +1,7 @@
 import numpy as np
 
 import matplotlib as mpl
+import matplotlib.ticker as mticker
 from matplotlib.testing.decorators import image_comparison
 import matplotlib.pyplot as plt
 from mpl_toolkits.axes_grid1 import ImageGrid
@@ -43,9 +44,7 @@ def test_imagegrid_cbar_mode_edge():
         # "second" ones.  To achieve this, clear out the axes first.
         for ax in grid:
             ax.cax.cla()
-            cb = ax.cax.colorbar(
-                ax.images[0],
-                ticks=mpl.ticker.MaxNLocator(5))  # old default locator.
+            cb = ax.cax.colorbar(ax.images[0])
 
 
 def test_imagegrid():
@@ -54,4 +53,4 @@ def test_imagegrid():
     ax = grid[0]
     im = ax.imshow([[1, 2]], norm=mpl.colors.LogNorm())
     cb = ax.cax.colorbar(im)
-    assert isinstance(cb.locator, mpl.colorbar._ColorbarLogLocator)
+    assert isinstance(cb.locator, mticker.LogLocator)
diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py
index 0e1602e81212..374b8c721f9c 100644
--- a/lib/mpl_toolkits/tests/test_axes_grid1.py
+++ b/lib/mpl_toolkits/tests/test_axes_grid1.py
@@ -1,20 +1,24 @@
 from itertools import product
 import platform
 
-import matplotlib
+import matplotlib as mpl
 import matplotlib.pyplot as plt
 from matplotlib import cbook
 from matplotlib.backend_bases import MouseEvent
 from matplotlib.colors import LogNorm
 from matplotlib.transforms import Bbox, TransformedBbox
 from matplotlib.testing.decorators import (
-    image_comparison, remove_ticks_and_titles)
+    check_figures_equal, image_comparison, remove_ticks_and_titles)
 
 from mpl_toolkits.axes_grid1 import (
-    axes_size as Size, host_subplot, make_axes_locatable, AxesGrid, ImageGrid)
+    axes_size as Size,
+    host_subplot, make_axes_locatable,
+    Grid, AxesGrid, ImageGrid)
 from mpl_toolkits.axes_grid1.anchored_artists import (
     AnchoredSizeBar, AnchoredDirectionArrows)
-from mpl_toolkits.axes_grid1.axes_divider import HBoxDivider
+from mpl_toolkits.axes_grid1.axes_divider import (
+    Divider, HBoxDivider, make_axes_area_auto_adjustable)
+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)
 import mpl_toolkits.axes_grid1.mpl_axes
@@ -36,7 +40,6 @@ def test_divider_append_axes():
         "right": divider.append_axes("right", 1.2, pad=0.1, sharey=ax),
     }
     fig.canvas.draw()
-    renderer = fig.canvas.get_renderer()
     bboxes = {k: axs[k].get_window_extent() for k in axs}
     dpi = fig.dpi
     assert bboxes["top"].height == pytest.approx(1.2 * dpi)
@@ -56,9 +59,8 @@ def test_divider_append_axes():
 @image_comparison(['twin_axes_empty_and_removed'], extensions=["png"], tol=1)
 def test_twin_axes_empty_and_removed():
     # Purely cosmetic font changes (avoid overlap)
-    matplotlib.rcParams.update({"font.size": 8})
-    matplotlib.rcParams.update({"xtick.labelsize": 8})
-    matplotlib.rcParams.update({"ytick.labelsize": 8})
+    mpl.rcParams.update(
+        {"font.size": 8, "xtick.labelsize": 8, "ytick.labelsize": 8})
     generators = ["twinx", "twiny", "twin"]
     modifiers = ["", "host invisible", "twin removed", "twin invisible",
                  "twin removed\nhost invisible"]
@@ -98,6 +100,18 @@ def test_axesgrid_colorbar_log_smoketest():
     grid.cbar_axes[0].colorbar(im)
 
 
+def test_inset_colorbar_tight_layout_smoketest():
+    fig, ax = plt.subplots(1, 1)
+    pts = ax.scatter([0, 1], [0, 1], c=[1, 5])
+
+    cax = inset_axes(ax, width="3%", height="70%")
+    plt.colorbar(pts, cax=cax)
+
+    with pytest.warns(UserWarning, match="This figure includes Axes"):
+        # Will warn, but not raise an error
+        plt.tight_layout()
+
+
 @image_comparison(['inset_locator.png'], style='default', remove_text=True)
 def test_inset_locator():
     fig, ax = plt.subplots(figsize=[5, 4])
@@ -110,7 +124,6 @@ def test_inset_locator():
     ny, nx = Z.shape
     Z2[30:30+ny, 30:30+nx] = Z
 
-    # extent = [-3, 4, -4, 3]
     ax.imshow(Z2, extent=extent, interpolation="nearest",
               origin="lower")
 
@@ -152,7 +165,6 @@ def test_inset_axes():
     ny, nx = Z.shape
     Z2[30:30+ny, 30:30+nx] = Z
 
-    # extent = [-3, 4, -4, 3]
     ax.imshow(Z2, extent=extent, interpolation="nearest",
               origin="lower")
 
@@ -348,7 +360,8 @@ def test_anchored_direction_arrows_many_args():
 def test_axes_locatable_position():
     fig, ax = plt.subplots()
     divider = make_axes_locatable(ax)
-    cax = divider.append_axes('right', size='5%', pad='2%')
+    with mpl.rc_context({"figure.subplot.wspace": 0.02}):
+        cax = divider.append_axes('right', size='5%')
     fig.canvas.draw()
     assert np.isclose(cax.get_position(original=False).width,
                       0.03621495327102808)
@@ -363,10 +376,9 @@ def test_image_grid():
 
     fig = plt.figure(1, (4, 4))
     grid = ImageGrid(fig, 111, nrows_ncols=(2, 2), axes_pad=0.1)
-
+    assert grid.get_axes_pad() == (0.1, 0.1)
     for i in range(4):
         grid[i].imshow(im, interpolation='nearest')
-        grid[i].set_title('test {0}{0}'.format(i))
 
 
 def test_gettightbbox():
@@ -470,3 +482,89 @@ def test_axes_class_tuple():
     fig = plt.figure()
     axes_class = (mpl_toolkits.axes_grid1.mpl_axes.Axes, {})
     gr = AxesGrid(fig, 111, nrows_ncols=(1, 1), axes_class=axes_class)
+
+
+def test_grid_axes_lists():
+    """Test Grid axes_all, axes_row and axes_column relationship."""
+    fig = plt.figure()
+    grid = Grid(fig, 111, (2, 3), direction="row")
+    assert_array_equal(grid, grid.axes_all)
+    assert_array_equal(grid.axes_row, np.transpose(grid.axes_column))
+    assert_array_equal(grid, np.ravel(grid.axes_row), "row")
+    assert grid.get_geometry() == (2, 3)
+    grid = Grid(fig, 111, (2, 3), direction="column")
+    assert_array_equal(grid, np.ravel(grid.axes_column), "column")
+
+
+@pytest.mark.parametrize('direction', ('row', 'column'))
+def test_grid_axes_position(direction):
+    """Test positioning of the axes in Grid."""
+    fig = plt.figure()
+    grid = Grid(fig, 111, (2, 2), direction=direction)
+    loc = [ax.get_axes_locator() for ax in np.ravel(grid.axes_row)]
+    assert loc[1]._nx > loc[0]._nx and loc[2]._ny < loc[0]._ny
+    assert loc[0]._nx == loc[2]._nx and loc[0]._ny == loc[1]._ny
+    assert loc[3]._nx == loc[1]._nx and loc[3]._ny == loc[2]._ny
+
+
+@pytest.mark.parametrize('rect, ngrids, error, message', (
+    ((1, 1), None, TypeError, "Incorrect rect format"),
+    (111, -1, ValueError, "ngrids must be positive"),
+    (111, 7, ValueError, "ngrids must be positive"),
+))
+def test_grid_errors(rect, ngrids, error, message):
+    fig = plt.figure()
+    with pytest.raises(error, match=message):
+        Grid(fig, rect, (2, 3), ngrids=ngrids)
+
+
+@pytest.mark.parametrize('anchor, error, message', (
+    (None, TypeError, "anchor must be str"),
+    ("CC", ValueError, "'CC' is not a valid value for anchor"),
+    ((1, 1, 1), TypeError, "anchor must be str"),
+))
+def test_divider_errors(anchor, error, message):
+    fig = plt.figure()
+    with pytest.raises(error, match=message):
+        Divider(fig, [0, 0, 1, 1], [Size.Fixed(1)], [Size.Fixed(1)],
+                anchor=anchor)
+
+
+@check_figures_equal(extensions=["png"])
+def test_mark_inset_unstales_viewlim(fig_test, fig_ref):
+    inset, full = fig_test.subplots(1, 2)
+    full.plot([0, 5], [0, 5])
+    inset.set(xlim=(1, 2), ylim=(1, 2))
+    # Check that mark_inset unstales full's viewLim before drawing the marks.
+    mark_inset(full, inset, 1, 4)
+
+    inset, full = fig_ref.subplots(1, 2)
+    full.plot([0, 5], [0, 5])
+    inset.set(xlim=(1, 2), ylim=(1, 2))
+    mark_inset(full, inset, 1, 4)
+    # Manually unstale the full's viewLim.
+    fig_ref.canvas.draw()
+
+
+def test_auto_adjustable():
+    fig = plt.figure()
+    ax = fig.add_axes([0, 0, 1, 1])
+    pad = 0.1
+    make_axes_area_auto_adjustable(ax, pad=pad)
+    fig.canvas.draw()
+    tbb = ax.get_tightbbox()
+    assert tbb.x0 == pytest.approx(pad * fig.dpi)
+    assert tbb.x1 == pytest.approx(fig.bbox.width - pad * fig.dpi)
+    assert tbb.y0 == pytest.approx(pad * fig.dpi)
+    assert tbb.y1 == pytest.approx(fig.bbox.height - pad * fig.dpi)
+
+
+@image_comparison(['rgb_axes.png'], remove_text=True)
+def test_rgb_axes():
+    fig = plt.figure()
+    ax = RGBAxes(fig, (0.1, 0.1, 0.8, 0.8), pad=0.1)
+    rng = np.random.default_rng(19680801)
+    r = rng.random((5, 5))
+    g = rng.random((5, 5))
+    b = rng.random((5, 5))
+    ax.imshow_rgb(r, g, b, interpolation='none')
diff --git a/lib/mpl_toolkits/tests/test_axisartist_axis_artist.py b/lib/mpl_toolkits/tests/test_axisartist_axis_artist.py
index 1bebbfd9b81d..391fd116ea86 100644
--- a/lib/mpl_toolkits/tests/test_axisartist_axis_artist.py
+++ b/lib/mpl_toolkits/tests/test_axisartist_axis_artist.py
@@ -34,8 +34,8 @@ def test_labelbase():
     ax.plot([0.5], [0.5], "o")
 
     label = LabelBase(0.5, 0.5, "Test")
-    label._set_ref_angle(-90)
-    label._set_offset_radius(offset_radius=50)
+    label._ref_angle = -90
+    label._offset_radius = 50
     label.set_rotation(-90)
     label.set(ha="center", va="top")
     ax.add_artist(label)
@@ -67,8 +67,8 @@ def test_ticklabels():
 
     ax.plot([0.5], [0.5], "s")
     axislabel = AxisLabel(0.5, 0.5, "Test")
-    axislabel._set_offset_radius(20)
-    axislabel._set_ref_angle(0)
+    axislabel._offset_radius = 20
+    axislabel._ref_angle = 0
     axislabel.set_axis_direction("bottom")
     ax.add_artist(axislabel)
 
diff --git a/lib/mpl_toolkits/tests/test_axisartist_axislines.py b/lib/mpl_toolkits/tests/test_axisartist_axislines.py
index 0502a0f23879..1b239f214183 100644
--- a/lib/mpl_toolkits/tests/test_axisartist_axislines.py
+++ b/lib/mpl_toolkits/tests/test_axisartist_axislines.py
@@ -1,14 +1,10 @@
 import numpy as np
-from matplotlib import _api
 import matplotlib.pyplot as plt
 from matplotlib.testing.decorators import image_comparison
 from matplotlib.transforms import IdentityTransform
 
 from mpl_toolkits.axisartist.axislines import SubplotZero, Subplot
-from mpl_toolkits.axisartist import (
-    Axes, SubplotHost, ParasiteAxes, ParasiteAxesAuxTrans)
-
-import pytest
+from mpl_toolkits.axisartist import Axes, SubplotHost, ParasiteAxes
 
 
 @image_comparison(['SubplotZero.png'], style='default')
@@ -61,10 +57,9 @@ def test_Axes():
     fig.canvas.draw()
 
 
-@pytest.mark.parametrize('parasite_cls', [ParasiteAxes, ParasiteAxesAuxTrans])
 @image_comparison(['ParasiteAxesAuxTrans_meshplot.png'],
                   remove_text=True, style='default', tol=0.075)
-def test_ParasiteAxesAuxTrans(parasite_cls):
+def test_ParasiteAxesAuxTrans():
     # Remove this line when this test image is regenerated.
     plt.rcParams['pcolormesh.snap'] = False
 
@@ -86,8 +81,7 @@ def test_ParasiteAxesAuxTrans(parasite_cls):
         ax1 = SubplotHost(fig, 1, 3, i+1)
         fig.add_subplot(ax1)
 
-        with _api.suppress_matplotlib_deprecation_warning():
-            ax2 = parasite_cls(ax1, IdentityTransform())
+        ax2 = ParasiteAxes(ax1, IdentityTransform())
         ax1.parasites.append(ax2)
         if name.startswith('pcolor'):
             getattr(ax2, name)(xx, yy, data[:-1, :-1])
diff --git a/lib/mpl_toolkits/tests/test_axisartist_clip_path.py b/lib/mpl_toolkits/tests/test_axisartist_clip_path.py
index a81c12dcf8e5..1108533353a1 100644
--- a/lib/mpl_toolkits/tests/test_axisartist_clip_path.py
+++ b/lib/mpl_toolkits/tests/test_axisartist_clip_path.py
@@ -1,9 +1,12 @@
 import numpy as np
+
+from matplotlib import _api
 import matplotlib.pyplot as plt
 from matplotlib.testing.decorators import image_comparison
 from matplotlib.transforms import Bbox
 
-from mpl_toolkits.axisartist.clip_path import clip_line_to_rect
+with _api.suppress_matplotlib_deprecation_warning():
+    from mpl_toolkits.axisartist.clip_path import clip_line_to_rect
 
 
 @image_comparison(['clip_path.png'], style='default')
diff --git a/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py b/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py
index ea319e08caab..c8b770152d9a 100644
--- a/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py
+++ b/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py
@@ -18,7 +18,9 @@ def test_subplot():
     fig.add_subplot(ax)
 
 
-@image_comparison(['curvelinear3.png'], style='default', tol=0.01)
+# Rather high tolerance to allow ongoing work with floating axes internals;
+# remove when image is regenerated.
+@image_comparison(['curvelinear3.png'], style='default', tol=5)
 def test_curvelinear3():
     fig = plt.figure(figsize=(5, 5))
 
@@ -72,7 +74,9 @@ def test_curvelinear3():
     l.set_clip_path(ax1.patch)
 
 
-@image_comparison(['curvelinear4.png'], style='default', tol=0.015)
+# Rather high tolerance to allow ongoing work with floating axes internals;
+# remove when image is regenerated.
+@image_comparison(['curvelinear4.png'], style='default', tol=0.9)
 def test_curvelinear4():
     # Remove this line when this test image is regenerated.
     plt.rcParams['text.kerning_factor'] = 6
diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_finder.py b/lib/mpl_toolkits/tests/test_axisartist_grid_finder.py
index 3a0913c003f2..6b397675ee10 100644
--- a/lib/mpl_toolkits/tests/test_axisartist_grid_finder.py
+++ b/lib/mpl_toolkits/tests/test_axisartist_grid_finder.py
@@ -1,6 +1,27 @@
+import numpy as np
+import pytest
+
+from matplotlib.transforms import Bbox
 from mpl_toolkits.axisartist.grid_finder import (
-    FormatterPrettyPrint,
-    MaxNLocator)
+    _find_line_box_crossings, FormatterPrettyPrint, MaxNLocator)
+
+
+def test_find_line_box_crossings():
+    x = np.array([-3, -2, -1, 0., 1, 2, 3, 2, 1, 0, -1, -2, -3, 5])
+    y = np.arange(len(x))
+    bbox = Bbox.from_extents(-2, 3, 2, 12.5)
+    left, right, bottom, top = _find_line_box_crossings(
+        np.column_stack([x, y]), bbox)
+    ((lx0, ly0), la0), ((lx1, ly1), la1), = left
+    ((rx0, ry0), ra0), ((rx1, ry1), ra1), = right
+    ((bx0, by0), ba0), = bottom
+    ((tx0, ty0), ta0), = top
+    assert (lx0, ly0, la0) == (-2, 11, 135)
+    assert (lx1, ly1, la1) == pytest.approx((-2., 12.125, 7.125016))
+    assert (rx0, ry0, ra0) == (2, 5, 45)
+    assert (rx1, ry1, ra1) == (2, 7, 135)
+    assert (bx0, by0, ba0) == (0, 3, 45)
+    assert (tx0, ty0, ta0) == pytest.approx((1., 12.5, 7.125016))
 
 
 def test_pretty_print_format():
diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
index 9a78a2676adb..9a501daa2e7b 100644
--- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
+++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
@@ -1,5 +1,4 @@
 import numpy as np
-import platform
 
 import matplotlib.pyplot as plt
 from matplotlib.path import Path
@@ -16,8 +15,7 @@
     GridHelperCurveLinear
 
 
-@image_comparison(['custom_transform.png'], style='default',
-                  tol=0.03 if platform.machine() == 'x86_64' else 0.04)
+@image_comparison(['custom_transform.png'], style='default', tol=0.2)
 def test_custom_transform():
     class MyTransform(Transform):
         input_dims = output_dims = 2
@@ -79,8 +77,7 @@ def inverted(self):
     ax1.grid(True)
 
 
-@image_comparison(['polar_box.png'], style='default',
-                  tol={'aarch64': 0.04}.get(platform.machine(), 0.03))
+@image_comparison(['polar_box.png'], style='default', tol=0.04)
 def test_polar_box():
     # Remove this line when this test image is regenerated.
     plt.rcParams['text.kerning_factor'] = 6
@@ -143,7 +140,7 @@ def test_polar_box():
     ax1.grid(True)
 
 
-@image_comparison(['axis_direction.png'], style='default', tol=0.03)
+@image_comparison(['axis_direction.png'], style='default', tol=0.071)
 def test_axis_direction():
     # Remove this line when this test image is regenerated.
     plt.rcParams['text.kerning_factor'] = 6
diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
index f55edaa4aa1f..bd651d1ad52b 100644
--- a/lib/mpl_toolkits/tests/test_mplot3d.py
+++ b/lib/mpl_toolkits/tests/test_mplot3d.py
@@ -1,19 +1,19 @@
 import functools
 import itertools
-import platform
 
 import pytest
 
 from mpl_toolkits.mplot3d import Axes3D, axes3d, proj3d, art3d
 import matplotlib as mpl
 from matplotlib.backend_bases import MouseButton
-from matplotlib.cbook import MatplotlibDeprecationWarning
 from matplotlib import cm
-from matplotlib import colors as mcolors
+from matplotlib import colors as mcolors, patches as mpatch
 from matplotlib.testing.decorators import image_comparison, check_figures_equal
 from matplotlib.testing.widgets import mock_event
 from matplotlib.collections import LineCollection, PolyCollection
-from matplotlib.patches import Circle
+from matplotlib.patches import Circle, PathPatch
+from matplotlib.path import Path
+from matplotlib.text import Text
 
 import matplotlib.pyplot as plt
 import numpy as np
@@ -23,11 +23,62 @@
     image_comparison, remove_text=True, style='default')
 
 
-def test_aspect_equal_error():
+@check_figures_equal(extensions=["png"])
+def test_invisible_axes(fig_test, fig_ref):
+    ax = fig_test.subplots(subplot_kw=dict(projection='3d'))
+    ax.set_visible(False)
+
+
+@mpl3d_image_comparison(['aspects.png'], remove_text=False)
+def test_aspects():
+    aspects = ('auto', 'equal', 'equalxy', 'equalyz', 'equalxz')
+    fig, axs = plt.subplots(1, len(aspects), subplot_kw={'projection': '3d'})
+
+    # Draw rectangular cuboid with side lengths [1, 1, 5]
+    r = [0, 1]
+    scale = np.array([1, 1, 5])
+    pts = itertools.combinations(np.array(list(itertools.product(r, r, r))), 2)
+    for start, end in pts:
+        if np.sum(np.abs(start - end)) == r[1] - r[0]:
+            for ax in axs:
+                ax.plot3D(*zip(start*scale, end*scale))
+    for i, ax in enumerate(axs):
+        ax.set_box_aspect((3, 4, 5))
+        ax.set_aspect(aspects[i])
+
+
+def test_axes3d_repr():
     fig = plt.figure()
     ax = fig.add_subplot(projection='3d')
-    with pytest.raises(NotImplementedError):
-        ax.set_aspect('equal')
+    ax.set_label('label')
+    ax.set_title('title')
+    ax.set_xlabel('x')
+    ax.set_ylabel('y')
+    ax.set_zlabel('z')
+    assert repr(ax) == (
+        "<Axes3DSubplot: label='label', "
+        "title={'center': 'title'}, xlabel='x', ylabel='y', zlabel='z'>")
+
+
+@mpl3d_image_comparison(['axes3d_primary_views.png'])
+def test_axes3d_primary_views():
+    # (elev, azim, roll)
+    views = [(90, -90, 0),  # XY
+             (0, -90, 0),   # XZ
+             (0, 0, 0),     # YZ
+             (-90, 90, 0),  # -XY
+             (0, 90, 0),    # -XZ
+             (0, 180, 0)]   # -YZ
+    # When viewing primary planes, draw the two visible axes so they intersect
+    # at their low values
+    fig, axs = plt.subplots(2, 3, subplot_kw={'projection': '3d'})
+    for i, ax in enumerate(axs.flat):
+        ax.set_xlabel('x')
+        ax.set_ylabel('y')
+        ax.set_zlabel('z')
+        ax.set_proj_type('ortho')
+        ax.view_init(elev=views[i][0], azim=views[i][1], roll=views[i][2])
+    plt.tight_layout()
 
 
 @mpl3d_image_comparison(['bar3d.png'])
@@ -62,15 +113,15 @@ def test_bar3d_shaded():
     x2d, y2d = x2d.ravel(), y2d.ravel()
     z = x2d + y2d + 1  # Avoid triggering bug with zero-depth boxes.
 
-    views = [(-60, 30), (30, 30), (30, -30), (120, -30)]
+    views = [(30, -60, 0), (30, 30, 30), (-30, 30, -90), (300, -30, 0)]
     fig = plt.figure(figsize=plt.figaspect(1 / len(views)))
     axs = fig.subplots(
         1, len(views),
         subplot_kw=dict(projection='3d')
     )
-    for ax, (azim, elev) in zip(axs, views):
+    for ax, (elev, azim, roll) in zip(axs, views):
         ax.bar3d(x2d, y2d, x2d * 0, 1, 1, z, shade=True)
-        ax.view_init(azim=azim, elev=elev)
+        ax.view_init(elev=elev, azim=azim, roll=roll)
     fig.canvas.draw()
 
 
@@ -127,6 +178,17 @@ def test_contour3d():
     ax.set_zlim(-100, 100)
 
 
+@mpl3d_image_comparison(['contour3d_extend3d.png'])
+def test_contour3d_extend3d():
+    fig = plt.figure()
+    ax = fig.add_subplot(projection='3d')
+    X, Y, Z = axes3d.get_test_data(0.05)
+    ax.contour(X, Y, Z, zdir='z', offset=-100, cmap=cm.coolwarm, extend3d=True)
+    ax.set_xlim(-30, 30)
+    ax.set_ylim(-20, 40)
+    ax.set_zlim(-80, 80)
+
+
 @mpl3d_image_comparison(['contourf3d.png'])
 def test_contourf3d():
     fig = plt.figure()
@@ -155,6 +217,34 @@ def test_contourf3d_fill():
     ax.set_zlim(-1, 1)
 
 
+@pytest.mark.parametrize('extend, levels', [['both', [2, 4, 6]],
+                                            ['min', [2, 4, 6, 8]],
+                                            ['max', [0, 2, 4, 6]]])
+@check_figures_equal(extensions=["png"])
+def test_contourf3d_extend(fig_test, fig_ref, extend, levels):
+    X, Y = np.meshgrid(np.arange(-2, 2, 0.25), np.arange(-2, 2, 0.25))
+    # Z is in the range [0, 8]
+    Z = X**2 + Y**2
+
+    # Manually set the over/under colors to be the end of the colormap
+    cmap = mpl.colormaps['viridis'].copy()
+    cmap.set_under(cmap(0))
+    cmap.set_over(cmap(255))
+    # Set vmin/max to be the min/max values plotted on the reference image
+    kwargs = {'vmin': 1, 'vmax': 7, 'cmap': cmap}
+
+    ax_ref = fig_ref.add_subplot(projection='3d')
+    ax_ref.contourf(X, Y, Z, levels=[0, 2, 4, 6, 8], **kwargs)
+
+    ax_test = fig_test.add_subplot(projection='3d')
+    ax_test.contourf(X, Y, Z, levels, extend=extend, **kwargs)
+
+    for ax in [ax_ref, ax_test]:
+        ax.set_xlim(-2, 2)
+        ax.set_ylim(-2, 2)
+        ax.set_zlim(-10, 10)
+
+
 @mpl3d_image_comparison(['tricontour.png'], tol=0.02)
 def test_tricontour():
     fig = plt.figure()
@@ -170,6 +260,17 @@ def test_tricontour():
     ax.tricontourf(x, y, z)
 
 
+def test_contour3d_1d_input():
+    # Check that 1D sequences of different length for {x, y} doesn't error
+    fig = plt.figure()
+    ax = fig.add_subplot(projection='3d')
+    nx, ny = 30, 20
+    x = np.linspace(-10, 10, nx)
+    y = np.linspace(-10, 10, ny)
+    z = np.random.randint(0, 2, [ny, nx])
+    ax.contour(x, y, z, [0.5])
+
+
 @mpl3d_image_comparison(['lines3d.png'])
 def test_lines3d():
     fig = plt.figure()
@@ -256,6 +357,30 @@ def test_scatter3d_color():
                color='b', marker='s')
 
 
+@mpl3d_image_comparison(['scatter3d_linewidth.png'])
+def test_scatter3d_linewidth():
+    fig = plt.figure()
+    ax = fig.add_subplot(projection='3d')
+
+    # Check that array-like linewidth can be set
+    ax.scatter(np.arange(10), np.arange(10), np.arange(10),
+               marker='o', linewidth=np.arange(10))
+
+
+@check_figures_equal(extensions=['png'])
+def test_scatter3d_linewidth_modification(fig_ref, fig_test):
+    # Changing Path3DCollection linewidths with array-like post-creation
+    # should work correctly.
+    ax_test = fig_test.add_subplot(projection='3d')
+    c = ax_test.scatter(np.arange(10), np.arange(10), np.arange(10),
+                        marker='o')
+    c.set_linewidths(np.arange(10))
+
+    ax_ref = fig_ref.add_subplot(projection='3d')
+    ax_ref.scatter(np.arange(10), np.arange(10), np.arange(10), marker='o',
+                   linewidths=np.arange(10))
+
+
 @check_figures_equal(extensions=['png'])
 def test_scatter3d_modification(fig_ref, fig_test):
     # Changing Path3DCollection properties post-creation should work correctly.
@@ -348,10 +473,10 @@ def test_marker_draw_order_data_reversed(fig_test, fig_ref, azim):
     color = ['b', 'y']
     ax = fig_test.add_subplot(projection='3d')
     ax.scatter(x, y, z, s=3500, c=color)
-    ax.view_init(elev=0, azim=azim)
+    ax.view_init(elev=0, azim=azim, roll=0)
     ax = fig_ref.add_subplot(projection='3d')
     ax.scatter(x[::-1], y[::-1], z[::-1], s=3500, c=color[::-1])
-    ax.view_init(elev=0, azim=azim)
+    ax.view_init(elev=0, azim=azim, roll=0)
 
 
 @check_figures_equal(extensions=['png'])
@@ -371,11 +496,11 @@ def test_marker_draw_order_view_rotated(fig_test, fig_ref):
     # axis are not exactly invariant under 180 degree rotation -> deactivate
     ax.set_axis_off()
     ax.scatter(x, y, z, s=3500, c=color)
-    ax.view_init(elev=0, azim=azim)
+    ax.view_init(elev=0, azim=azim, roll=0)
     ax = fig_ref.add_subplot(projection='3d')
     ax.set_axis_off()
     ax.scatter(x, y, z, s=3500, c=color[::-1])  # color reversed
-    ax.view_init(elev=0, azim=azim - 180)  # view rotated by 180 degrees
+    ax.view_init(elev=0, azim=azim - 180, roll=0)  # view rotated by 180 deg
 
 
 @mpl3d_image_comparison(['plot_3d_from_2d.png'], tol=0.015)
@@ -420,6 +545,45 @@ def test_surface3d_shaded():
     ax.set_zlim(-1.01, 1.01)
 
 
+@mpl3d_image_comparison(['surface3d_masked.png'])
+def test_surface3d_masked():
+    fig = plt.figure()
+    ax = fig.add_subplot(projection='3d')
+    x = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
+    y = [1, 2, 3, 4, 5, 6, 7, 8]
+
+    x, y = np.meshgrid(x, y)
+    matrix = np.array(
+        [
+            [-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+            [-1, 1, 2, 3, 4, 4, 4, 3, 2, 1, 1],
+            [-1, -1., 4, 5, 6, 8, 6, 5, 4, 3, -1.],
+            [-1, -1., 7, 8, 11, 12, 11, 8, 7, -1., -1.],
+            [-1, -1., 8, 9, 10, 16, 10, 9, 10, 7, -1.],
+            [-1, -1., -1., 12, 16, 20, 16, 12, 11, -1., -1.],
+            [-1, -1., -1., -1., 22, 24, 22, 20, 18, -1., -1.],
+            [-1, -1., -1., -1., -1., 28, 26, 25, -1., -1., -1.],
+        ]
+    )
+    z = np.ma.masked_less(matrix, 0)
+    norm = mcolors.Normalize(vmax=z.max(), vmin=z.min())
+    colors = mpl.colormaps["plasma"](norm(z))
+    ax.plot_surface(x, y, z, facecolors=colors)
+    ax.view_init(30, -80, 0)
+
+
+@mpl3d_image_comparison(['surface3d_masked_strides.png'])
+def test_surface3d_masked_strides():
+    fig = plt.figure()
+    ax = fig.add_subplot(projection='3d')
+
+    x, y = np.mgrid[-6:6.1:1, -6:6.1:1]
+    z = np.ma.masked_less(x * y, 2)
+
+    ax.plot_surface(x, y, z, rstride=4, cstride=4)
+    ax.view_init(60, -45, 0)
+
+
 @mpl3d_image_comparison(['text3d.png'], remove_text=False)
 def test_text3d():
     fig = plt.figure()
@@ -469,7 +633,7 @@ def test_text3d_modification(fig_ref, fig_test):
         ax_ref.text(x, y, z, f'({x}, {y}, {z}), dir={zdir}', zdir=zdir)
 
 
-@mpl3d_image_comparison(['trisurf3d.png'], tol=0.03)
+@mpl3d_image_comparison(['trisurf3d.png'], tol=0.061)
 def test_trisurf3d():
     n_angles = 36
     n_radii = 8
@@ -601,27 +765,41 @@ def test_patch_modification():
 @check_figures_equal(extensions=['png'])
 def test_patch_collection_modification(fig_test, fig_ref):
     # Test that modifying Patch3DCollection properties after creation works.
-    patch = Circle((0, 0), 0.05)
-    c = art3d.Patch3DCollection([patch], linewidths=3)
+    patch1 = Circle((0, 0), 0.05)
+    patch2 = Circle((0.1, 0.1), 0.03)
+    facecolors = np.array([[0., 0.5, 0., 1.], [0.5, 0., 0., 0.5]])
+    c = art3d.Patch3DCollection([patch1, patch2], linewidths=3)
 
     ax_test = fig_test.add_subplot(projection='3d')
     ax_test.add_collection3d(c)
     c.set_edgecolor('C2')
-    c.set_facecolor('C3')
+    c.set_facecolor(facecolors)
     c.set_alpha(0.7)
     assert c.get_depthshade()
     c.set_depthshade(False)
     assert not c.get_depthshade()
 
-    patch = Circle((0, 0), 0.05)
-    c = art3d.Patch3DCollection([patch], linewidths=3,
-                                edgecolor='C2', facecolor='C3', alpha=0.7,
-                                depthshade=False)
+    patch1 = Circle((0, 0), 0.05)
+    patch2 = Circle((0.1, 0.1), 0.03)
+    facecolors = np.array([[0., 0.5, 0., 1.], [0.5, 0., 0., 0.5]])
+    c = art3d.Patch3DCollection([patch1, patch2], linewidths=3,
+                                edgecolor='C2', facecolor=facecolors,
+                                alpha=0.7, depthshade=False)
 
     ax_ref = fig_ref.add_subplot(projection='3d')
     ax_ref.add_collection3d(c)
 
 
+def test_poly3dcollection_verts_validation():
+    poly = [[0, 0, 1], [0, 1, 1], [0, 1, 0], [0, 0, 0]]
+    with pytest.raises(ValueError, match=r'list of \(N, 3\) array-like'):
+        art3d.Poly3DCollection(poly)  # should be Poly3DCollection([poly])
+
+    poly = np.array(poly, dtype=float)
+    with pytest.raises(ValueError, match=r'list of \(N, 3\) array-like'):
+        art3d.Poly3DCollection(poly)  # should be Poly3DCollection([poly])
+
+
 @mpl3d_image_comparison(['poly3dcollection_closed.png'])
 def test_poly3dcollection_closed():
     fig = plt.figure()
@@ -758,7 +936,7 @@ def test_axes3d_cla():
 def test_axes3d_rotated():
     fig = plt.figure()
     ax = fig.add_subplot(1, 1, 1, projection='3d')
-    ax.view_init(90, 45)  # look down, rotated. Should be square
+    ax.view_init(90, 45, 0)  # look down, rotated. Should be square
 
 
 def test_plotsurface_1d_raises():
@@ -778,8 +956,9 @@ def _test_proj_make_M():
     E = np.array([1000, -1000, 2000])
     R = np.array([100, 100, 100])
     V = np.array([0, 0, 1])
-    viewM = proj3d.view_transformation(E, R, V)
-    perspM = proj3d.persp_transformation(100, -100)
+    roll = 0
+    viewM = proj3d.view_transformation(E, R, V, roll)
+    perspM = proj3d.persp_transformation(100, -100, 1)
     M = np.dot(perspM, viewM)
     return M
 
@@ -843,7 +1022,8 @@ def test_proj_axes_cube_ortho():
     E = np.array([200, 100, 100])
     R = np.array([0, 0, 0])
     V = np.array([0, 0, 1])
-    viewM = proj3d.view_transformation(E, R, V)
+    roll = 0
+    viewM = proj3d.view_transformation(E, R, V, roll)
     orthoM = proj3d.ortho_transformation(-1, 1)
     M = np.dot(orthoM, viewM)
 
@@ -900,8 +1080,10 @@ def test_lines_dists():
     ys = (100, 150, 30, 200)
     ax.scatter(xs, ys)
 
-    dist = proj3d._line2d_seg_dist(p0, p1, (xs[0], ys[0]))
+    dist0 = proj3d._line2d_seg_dist(p0, p1, (xs[0], ys[0]))
     dist = proj3d._line2d_seg_dist(p0, p1, np.array((xs, ys)))
+    assert dist0 == dist[0]
+
     for x, y, d in zip(xs, ys, dist):
         c = Circle((x, y), d, fill=0)
         ax.add_patch(c)
@@ -910,6 +1092,18 @@ def test_lines_dists():
     ax.set_ylim(0, 300)
 
 
+def test_lines_dists_nowarning():
+    # Smoke test to see that no RuntimeWarning is emitted when two first
+    # arguments are the same, see GH#22624
+    p0 = (10, 30, 50)
+    p1 = (10, 30, 20)
+    p2 = (20, 150)
+    proj3d._line2d_seg_dist(p0, p0, p2)
+    proj3d._line2d_seg_dist(p0, p1, p2)
+    p0 = np.array(p0)
+    proj3d._line2d_seg_dist(p0, p0, p2)
+
+
 def test_autoscale():
     fig, ax = plt.subplots(subplot_kw={"projection": "3d"})
     ax.margins(x=0, y=.1, z=.2)
@@ -919,6 +1113,9 @@ def test_autoscale():
     ax.set_autoscalez_on(True)
     ax.plot([0, 2], [0, 2], [0, 2])
     assert ax.get_w_lims() == (0, 1, -.1, 1.1, -.4, 2.4)
+    ax.autoscale(axis='x')
+    ax.plot([0, 2], [0, 2], [0, 2])
+    assert ax.get_w_lims() == (0, 2, -.1, 1.1, -.4, 2.4)
 
 
 @pytest.mark.parametrize('axis', ('x', 'y', 'z'))
@@ -943,6 +1140,22 @@ def test_unautoscale(axis, auto):
     np.testing.assert_array_equal(get_lim(), (-0.5, 0.5))
 
 
+def test_axes3d_focal_length_checks():
+    fig = plt.figure()
+    ax = fig.add_subplot(projection='3d')
+    with pytest.raises(ValueError):
+        ax.set_proj_type('persp', focal_length=0)
+    with pytest.raises(ValueError):
+        ax.set_proj_type('ortho', focal_length=1)
+
+
+@mpl3d_image_comparison(['axes3d_focal_length.png'], remove_text=False)
+def test_axes3d_focal_length():
+    fig, axs = plt.subplots(1, 2, subplot_kw={'projection': '3d'})
+    axs[0].set_proj_type('persp', focal_length=np.inf)
+    axs[1].set_proj_type('persp', focal_length=0.15)
+
+
 @mpl3d_image_comparison(['axes3d_ortho.png'], remove_text=False)
 def test_axes3d_ortho():
     fig = plt.figure()
@@ -962,7 +1175,7 @@ def test_axes3d_isometric():
     for s, e in combinations(np.array(list(product(r, r, r))), 2):
         if abs(s - e).sum() == r[1] - r[0]:
             ax.plot3D(*zip(s, e), c='k')
-    ax.view_init(elev=np.degrees(np.arctan(1. / np.sqrt(2))), azim=-45)
+    ax.view_init(elev=np.degrees(np.arctan(1. / np.sqrt(2))), azim=-45, roll=0)
     ax.grid(True)
 
 
@@ -1115,6 +1328,12 @@ def test_line3d_set_get_data_3d():
     np.testing.assert_array_equal((x, y, z), line.get_data_3d())
     line.set_data_3d(x2, y2, z2)
     np.testing.assert_array_equal((x2, y2, z2), line.get_data_3d())
+    line.set_xdata(x)
+    line.set_ydata(y)
+    line.set_3d_properties(zs=z, zdir='z')
+    np.testing.assert_array_equal((x, y, z), line.get_data_3d())
+    line.set_3d_properties(zs=0, zdir='z')
+    np.testing.assert_array_equal((x, y, np.zeros_like(z)), line.get_data_3d())
 
 
 @check_figures_equal(extensions=["png"])
@@ -1151,8 +1370,7 @@ def test_inverted_cla():
 
 def test_ax3d_tickcolour():
     fig = plt.figure()
-    with pytest.warns(MatplotlibDeprecationWarning):
-        ax = Axes3D(fig)
+    ax = Axes3D(fig)
 
     ax.tick_params(axis='x', colors='red')
     ax.tick_params(axis='y', colors='red')
@@ -1269,7 +1487,7 @@ def test_errorbar3d():
 
 
 @image_comparison(['stem3d.png'], style='mpl20',
-                  tol=0.0 if platform.machine() == 'x86_64' else 0.003)
+                  tol=0.003)
 def test_stem3d():
     fig, axs = plt.subplots(2, 3, figsize=(8, 6),
                             constrained_layout=True,
@@ -1399,7 +1617,7 @@ def convert_lim(dmin, dmax):
     assert z_center != pytest.approx(z_center0)
 
 
-@pytest.mark.style('default')
+@mpl.style.context('default')
 @check_figures_equal(extensions=["png"])
 def test_scalarmap_update(fig_test, fig_ref):
 
@@ -1427,3 +1645,319 @@ def test_subfigure_simple():
     sf = fig.subfigures(1, 2)
     ax = sf[0].add_subplot(1, 1, 1, projection='3d')
     ax = sf[1].add_subplot(1, 1, 1, projection='3d', label='other')
+
+
+@image_comparison(baseline_images=['computed_zorder'], remove_text=True,
+                  extensions=['png'])
+def test_computed_zorder():
+    fig = plt.figure()
+    ax1 = fig.add_subplot(221, projection='3d')
+    ax2 = fig.add_subplot(222, projection='3d')
+    ax2.computed_zorder = False
+
+    # create a horizontal plane
+    corners = ((0, 0, 0), (0, 5, 0), (5, 5, 0), (5, 0, 0))
+    for ax in (ax1, ax2):
+        tri = art3d.Poly3DCollection([corners],
+                                     facecolors='white',
+                                     edgecolors='black',
+                                     zorder=1)
+        ax.add_collection3d(tri)
+
+        # plot a vector
+        ax.plot((2, 2), (2, 2), (0, 4), c='red', zorder=2)
+
+        # plot some points
+        ax.scatter((3, 3), (1, 3), (1, 3), c='red', zorder=10)
+
+        ax.set_xlim((0, 5.0))
+        ax.set_ylim((0, 5.0))
+        ax.set_zlim((0, 2.5))
+
+    ax3 = fig.add_subplot(223, projection='3d')
+    ax4 = fig.add_subplot(224, projection='3d')
+    ax4.computed_zorder = False
+
+    dim = 10
+    X, Y = np.meshgrid((-dim, dim), (-dim, dim))
+    Z = np.zeros((2, 2))
+
+    angle = 0.5
+    X2, Y2 = np.meshgrid((-dim, dim), (0, dim))
+    Z2 = Y2 * angle
+    X3, Y3 = np.meshgrid((-dim, dim), (-dim, 0))
+    Z3 = Y3 * angle
+
+    r = 7
+    M = 1000
+    th = np.linspace(0, 2 * np.pi, M)
+    x, y, z = r * np.cos(th),  r * np.sin(th), angle * r * np.sin(th)
+    for ax in (ax3, ax4):
+        ax.plot_surface(X2, Y3, Z3,
+                        color='blue',
+                        alpha=0.5,
+                        linewidth=0,
+                        zorder=-1)
+        ax.plot(x[y < 0], y[y < 0], z[y < 0],
+                lw=5,
+                linestyle='--',
+                color='green',
+                zorder=0)
+
+        ax.plot_surface(X, Y, Z,
+                        color='red',
+                        alpha=0.5,
+                        linewidth=0,
+                        zorder=1)
+
+        ax.plot(r * np.sin(th), r * np.cos(th), np.zeros(M),
+                lw=5,
+                linestyle='--',
+                color='black',
+                zorder=2)
+
+        ax.plot_surface(X2, Y2, Z2,
+                        color='blue',
+                        alpha=0.5,
+                        linewidth=0,
+                        zorder=3)
+
+        ax.plot(x[y > 0], y[y > 0], z[y > 0], lw=5,
+                linestyle='--',
+                color='green',
+                zorder=4)
+        ax.view_init(elev=20, azim=-20, roll=0)
+        ax.axis('off')
+
+
+def test_format_coord():
+    fig = plt.figure()
+    ax = fig.add_subplot(projection='3d')
+    x = np.arange(10)
+    ax.plot(x, np.sin(x))
+    fig.canvas.draw()
+    assert ax.format_coord(0, 0) == 'x=1.8066, y=1.0367, z=−0.0553'
+    # Modify parameters
+    ax.view_init(roll=30, vertical_axis="y")
+    fig.canvas.draw()
+    assert ax.format_coord(0, 0) == 'x=9.1651, y=−0.9215, z=−0.0359'
+    # Reset parameters
+    ax.view_init()
+    fig.canvas.draw()
+    assert ax.format_coord(0, 0) == 'x=1.8066, y=1.0367, z=−0.0553'
+
+
+def test_get_axis_position():
+    fig = plt.figure()
+    ax = fig.add_subplot(projection='3d')
+    x = np.arange(10)
+    ax.plot(x, np.sin(x))
+    fig.canvas.draw()
+    assert ax.get_axis_position() == (False, True, False)
+
+
+def test_margins():
+    fig = plt.figure()
+    ax = fig.add_subplot(projection='3d')
+    ax.margins(0.2)
+    assert ax.margins() == (0.2, 0.2, 0.2)
+    ax.margins(0.1, 0.2, 0.3)
+    assert ax.margins() == (0.1, 0.2, 0.3)
+    ax.margins(x=0)
+    assert ax.margins() == (0, 0.2, 0.3)
+    ax.margins(y=0.1)
+    assert ax.margins() == (0, 0.1, 0.3)
+    ax.margins(z=0)
+    assert ax.margins() == (0, 0.1, 0)
+
+
+@pytest.mark.parametrize('err, args, kwargs, match', (
+        (ValueError, (-1,), {}, r'margin must be greater than -0\.5'),
+        (ValueError, (1, -1, 1), {}, r'margin must be greater than -0\.5'),
+        (ValueError, (1, 1, -1), {}, r'margin must be greater than -0\.5'),
+        (ValueError, tuple(), {'x': -1}, r'margin must be greater than -0\.5'),
+        (ValueError, tuple(), {'y': -1}, r'margin must be greater than -0\.5'),
+        (ValueError, tuple(), {'z': -1}, r'margin must be greater than -0\.5'),
+        (TypeError, (1, ), {'x': 1},
+         'Cannot pass both positional and keyword'),
+        (TypeError, (1, ), {'x': 1, 'y': 1, 'z': 1},
+         'Cannot pass both positional and keyword'),
+        (TypeError, (1, ), {'x': 1, 'y': 1},
+         'Cannot pass both positional and keyword'),
+        (TypeError, (1, 1), {}, 'Must pass a single positional argument for'),
+))
+def test_margins_errors(err, args, kwargs, match):
+    with pytest.raises(err, match=match):
+        fig = plt.figure()
+        ax = fig.add_subplot(projection='3d')
+        ax.margins(*args, **kwargs)
+
+
+@check_figures_equal(extensions=["png"])
+def test_text_3d(fig_test, fig_ref):
+    ax = fig_ref.add_subplot(projection="3d")
+    txt = Text(0.5, 0.5, r'Foo bar $\int$')
+    art3d.text_2d_to_3d(txt, z=1)
+    ax.add_artist(txt)
+    assert txt.get_position_3d() == (0.5, 0.5, 1)
+
+    ax = fig_test.add_subplot(projection="3d")
+    t3d = art3d.Text3D(0.5, 0.5, 1, r'Foo bar $\int$')
+    ax.add_artist(t3d)
+    assert t3d.get_position_3d() == (0.5, 0.5, 1)
+
+
+def test_draw_single_lines_from_Nx1():
+    # Smoke test for GH#23459
+    fig = plt.figure()
+    ax = fig.add_subplot(projection='3d')
+    ax.plot([[0], [1]], [[0], [1]], [[0], [1]])
+
+
+@check_figures_equal(extensions=["png"])
+def test_pathpatch_3d(fig_test, fig_ref):
+    ax = fig_ref.add_subplot(projection="3d")
+    path = Path.unit_rectangle()
+    patch = PathPatch(path)
+    art3d.pathpatch_2d_to_3d(patch, z=(0, 0.5, 0.7, 1, 0), zdir='y')
+    ax.add_artist(patch)
+
+    ax = fig_test.add_subplot(projection="3d")
+    pp3d = art3d.PathPatch3D(path, zs=(0, 0.5, 0.7, 1, 0), zdir='y')
+    ax.add_artist(pp3d)
+
+
+@image_comparison(baseline_images=['scatter_spiral.png'],
+                  remove_text=True,
+                  style='default')
+def test_scatter_spiral():
+    fig = plt.figure()
+    ax = fig.add_subplot(projection='3d')
+    th = np.linspace(0, 2 * np.pi * 6, 256)
+    sc = ax.scatter(np.sin(th), np.cos(th), th, s=(1 + th * 5), c=th ** 2)
+
+    # force at least 1 draw!
+    fig.canvas.draw()
+
+
+def test_Poly3DCollection_get_facecolor():
+    # Smoke test to see that get_facecolor does not raise
+    # See GH#4067
+    y, x = np.ogrid[1:10:100j, 1:10:100j]
+    z2 = np.cos(x) ** 3 - np.sin(y) ** 2
+    fig = plt.figure()
+    ax = fig.add_subplot(111, projection='3d')
+    r = ax.plot_surface(x, y, z2, cmap='hot')
+    r.get_facecolor()
+
+
+def test_Poly3DCollection_get_edgecolor():
+    # Smoke test to see that get_edgecolor does not raise
+    # See GH#4067
+    y, x = np.ogrid[1:10:100j, 1:10:100j]
+    z2 = np.cos(x) ** 3 - np.sin(y) ** 2
+    fig = plt.figure()
+    ax = fig.add_subplot(111, projection='3d')
+    r = ax.plot_surface(x, y, z2, cmap='hot')
+    r.get_edgecolor()
+
+
+@pytest.mark.parametrize(
+    "vertical_axis, proj_expected, axis_lines_expected, tickdirs_expected",
+    [
+        (
+            "z",
+            [
+                [0.0, 1.142857, 0.0, -0.571429],
+                [0.0, 0.0, 0.857143, -0.428571],
+                [0.0, 0.0, 0.0, -10.0],
+                [-1.142857, 0.0, 0.0, 10.571429],
+            ],
+            [
+                ([0.05617978, 0.06329114], [-0.04213483, -0.04746835]),
+                ([-0.06329114, 0.06329114], [-0.04746835, -0.04746835]),
+                ([-0.06329114, -0.06329114], [-0.04746835, 0.04746835]),
+            ],
+            [1, 0, 0],
+        ),
+        (
+            "y",
+            [
+                [1.142857, 0.0, 0.0, -0.571429],
+                [0.0, 0.857143, 0.0, -0.428571],
+                [0.0, 0.0, 0.0, -10.0],
+                [0.0, 0.0, -1.142857, 10.571429],
+            ],
+            [
+                ([-0.06329114, 0.06329114], [0.04746835, 0.04746835]),
+                ([0.06329114, 0.06329114], [-0.04746835, 0.04746835]),
+                ([-0.05617978, -0.06329114], [0.04213483, 0.04746835]),
+            ],
+            [2, 2, 0],
+        ),
+        (
+            "x",
+            [
+                [0.0, 0.0, 1.142857, -0.571429],
+                [0.857143, 0.0, 0.0, -0.428571],
+                [0.0, 0.0, 0.0, -10.0],
+                [0.0, -1.142857, 0.0, 10.571429],
+            ],
+            [
+                ([-0.06329114, -0.06329114], [0.04746835, -0.04746835]),
+                ([0.06329114, 0.05617978], [0.04746835, 0.04213483]),
+                ([0.06329114, -0.06329114], [0.04746835, 0.04746835]),
+            ],
+            [1, 2, 1],
+        ),
+    ],
+)
+def test_view_init_vertical_axis(
+    vertical_axis, proj_expected, axis_lines_expected, tickdirs_expected
+):
+    """
+    Test the actual projection, axis lines and ticks matches expected values.
+
+    Parameters
+    ----------
+    vertical_axis : str
+        Axis to align vertically.
+    proj_expected : ndarray
+        Expected values from ax.get_proj().
+    axis_lines_expected : tuple of arrays
+        Edgepoints of the axis line. Expected values retrieved according
+        to ``ax.get_[xyz]axis().line.get_data()``.
+    tickdirs_expected : list of int
+        indexes indicating which axis to create a tick line along.
+    """
+    rtol = 2e-06
+    ax = plt.subplot(1, 1, 1, projection="3d")
+    ax.view_init(elev=0, azim=0, roll=0, vertical_axis=vertical_axis)
+    ax.figure.canvas.draw()
+
+    # Assert the projection matrix:
+    proj_actual = ax.get_proj()
+    np.testing.assert_allclose(proj_expected, proj_actual, rtol=rtol)
+
+    for i, axis in enumerate([ax.get_xaxis(), ax.get_yaxis(), ax.get_zaxis()]):
+        # Assert black lines are correctly aligned:
+        axis_line_expected = axis_lines_expected[i]
+        axis_line_actual = axis.line.get_data()
+        np.testing.assert_allclose(axis_line_expected, axis_line_actual,
+                                   rtol=rtol)
+
+        # Assert ticks are correctly aligned:
+        tickdir_expected = tickdirs_expected[i]
+        tickdir_actual = axis._get_tickdir()
+        np.testing.assert_array_equal(tickdir_expected, tickdir_actual)
+
+
+@image_comparison(baseline_images=['arc_pathpatch.png'],
+                  remove_text=True,
+                  style='default')
+def test_arc_pathpatch():
+    ax = plt.subplot(1, 1, 1, projection="3d")
+    a = mpatch.Arc((0.5, 0.5), width=0.5, height=0.9,
+                   angle=20, theta1=10, theta2=130)
+    ax.add_patch(a)
+    art3d.pathpatch_2d_to_3d(a, z=0, zdir='z')
diff --git a/setup.cfg.template b/mplsetup.cfg.template
similarity index 50%
rename from setup.cfg.template
rename to mplsetup.cfg.template
index 6b40f29fc217..30985b2e313d 100644
--- a/setup.cfg.template
+++ b/mplsetup.cfg.template
@@ -1,40 +1,35 @@
-# Rename this file to setup.cfg to modify Matplotlib's build options.
-
-[metadata]
-license_files = LICENSE/*
-
-[egg_info]
+# Rename this file to mplsetup.cfg to modify Matplotlib's build options.
 
 [libs]
 # By default, Matplotlib builds with LTO, which may be slow if you re-compile
 # often, and don't need the space saving/speedup.
+#
 #enable_lto = True
+#
 # By default, Matplotlib downloads and builds its own copies of FreeType and of
 # Qhull.  You may set the following to True to instead link against a system
 # FreeType/Qhull.  As an exception, Matplotlib defaults to the system version
 # of FreeType on AIX.
+#
 #system_freetype = False
 #system_qhull = False
 
 [packages]
-# There are a number of data subpackages from Matplotlib that are
-# considered optional. All except 'tests' data (meaning the baseline
-# image files) are installed by default, but that can be changed here.
-#tests = False
-
-[gui_support]
-# Matplotlib supports multiple GUI toolkits, known as backends.
-# The MacOSX backend requires the Cocoa headers included with XCode.
-# You can select whether to build it by uncommenting the following line.
-# It is never built on Linux or Windows, regardless of the config value.
+# Some of Matplotlib's components are optional: the MacOSX backend (installed
+# by default on MacOSX; requires the Cocoa headers included with XCode), and
+# the test data (i.e., the baseline image files; not installed by default).
+# You can control whether they are installed by uncommenting the following
+# lines.  Note that the MacOSX backend is never built on Linux or Windows,
+# regardless of the config value.
 #
+#tests = False
 #macosx = True
 
 [rc_options]
 # User-configurable options
 #
-# Default backend, one of: Agg, Cairo, GTK3Agg, GTK3Cairo, MacOSX, Pdf, Ps,
-# Qt4Agg, Qt5Agg, SVG, TkAgg, WX, WXAgg.
+# Default backend, one of: Agg, Cairo, GTK3Agg, GTK3Cairo, GTK4Agg, GTK4Cairo,
+# MacOSX, Pdf, Ps, QtAgg, QtCairo, SVG, TkAgg, WX, WXAgg.
 #
 # The Agg, Ps, Pdf and SVG backends do not require external dependencies.  Do
 # not choose MacOSX if you have disabled the relevant extension modules.  The
diff --git a/plot_types/3D/README.rst b/plot_types/3D/README.rst
new file mode 100644
index 000000000000..e7157d4ba628
--- /dev/null
+++ b/plot_types/3D/README.rst
@@ -0,0 +1,6 @@
+.. _3D_plots:
+
+3D
+--
+
+3D plots using the `mpl_toolkits.mplot3d` library.
diff --git a/plot_types/3D/scatter3d_simple.py b/plot_types/3D/scatter3d_simple.py
new file mode 100644
index 000000000000..023a46448ccf
--- /dev/null
+++ b/plot_types/3D/scatter3d_simple.py
@@ -0,0 +1,29 @@
+"""
+==============
+3D scatterplot
+==============
+
+See `~mpl_toolkits.mplot3d.axes3d.Axes3D.scatter`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery')
+
+# Make data
+np.random.seed(19680801)
+n = 100
+rng = np.random.default_rng()
+xs = rng.uniform(23, 32, n)
+ys = rng.uniform(0, 100, n)
+zs = rng.uniform(-50, -25, n)
+
+# Plot
+fig, ax = plt.subplots(subplot_kw={"projection": "3d"})
+ax.scatter(xs, ys, zs)
+
+ax.set(xticklabels=[],
+       yticklabels=[],
+       zticklabels=[])
+
+plt.show()
diff --git a/plot_types/3D/surface3d_simple.py b/plot_types/3D/surface3d_simple.py
new file mode 100644
index 000000000000..b1aff7d23b12
--- /dev/null
+++ b/plot_types/3D/surface3d_simple.py
@@ -0,0 +1,29 @@
+"""
+=====================
+3D surface
+=====================
+
+See `~mpl_toolkits.mplot3d.axes3d.Axes3D.plot_surface`.
+"""
+import matplotlib.pyplot as plt
+from matplotlib import cm
+import numpy as np
+
+plt.style.use('_mpl-gallery')
+
+# Make data
+X = np.arange(-5, 5, 0.25)
+Y = np.arange(-5, 5, 0.25)
+X, Y = np.meshgrid(X, Y)
+R = np.sqrt(X**2 + Y**2)
+Z = np.sin(R)
+
+# Plot the surface
+fig, ax = plt.subplots(subplot_kw={"projection": "3d"})
+ax.plot_surface(X, Y, Z, vmin=Z.min() * 2, cmap=cm.Blues)
+
+ax.set(xticklabels=[],
+       yticklabels=[],
+       zticklabels=[])
+
+plt.show()
diff --git a/plot_types/3D/trisurf3d_simple.py b/plot_types/3D/trisurf3d_simple.py
new file mode 100644
index 000000000000..92832c1b5b3a
--- /dev/null
+++ b/plot_types/3D/trisurf3d_simple.py
@@ -0,0 +1,34 @@
+"""
+======================
+Triangular 3D surfaces
+======================
+
+See `~mpl_toolkits.mplot3d.axes3d.Axes3D.plot_trisurf`.
+"""
+import matplotlib.pyplot as plt
+from matplotlib import cm
+import numpy as np
+
+plt.style.use('_mpl-gallery')
+
+n_radii = 8
+n_angles = 36
+
+# Make radii and angles spaces
+radii = np.linspace(0.125, 1.0, n_radii)
+angles = np.linspace(0, 2*np.pi, n_angles, endpoint=False)[..., np.newaxis]
+
+# Convert polar (radii, angles) coords to cartesian (x, y) coords.
+x = np.append(0, (radii*np.cos(angles)).flatten())
+y = np.append(0, (radii*np.sin(angles)).flatten())
+z = np.sin(-x*y)
+
+# Plot
+fig, ax = plt.subplots(subplot_kw={'projection': '3d'})
+ax.plot_trisurf(x, y, z, vmin=z.min() * 2, cmap=cm.Blues)
+
+ax.set(xticklabels=[],
+       yticklabels=[],
+       zticklabels=[])
+
+plt.show()
diff --git a/plot_types/3D/voxels_simple.py b/plot_types/3D/voxels_simple.py
new file mode 100644
index 000000000000..c3473e108969
--- /dev/null
+++ b/plot_types/3D/voxels_simple.py
@@ -0,0 +1,31 @@
+"""
+==========================
+3D voxel / volumetric plot
+==========================
+
+See `~mpl_toolkits.mplot3d.axes3d.Axes3D.voxels`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery')
+
+# Prepare some coordinates
+x, y, z = np.indices((8, 8, 8))
+
+# Draw cuboids in the top left and bottom right corners
+cube1 = (x < 3) & (y < 3) & (z < 3)
+cube2 = (x >= 5) & (y >= 5) & (z >= 5)
+
+# Combine the objects into a single boolean array
+voxelarray = cube1 | cube2
+
+# Plot
+fig, ax = plt.subplots(subplot_kw={"projection": "3d"})
+ax.voxels(voxelarray, edgecolor='k')
+
+ax.set(xticklabels=[],
+       yticklabels=[],
+       zticklabels=[])
+
+plt.show()
diff --git a/plot_types/3D/wire3d_simple.py b/plot_types/3D/wire3d_simple.py
new file mode 100644
index 000000000000..c0eaf40210e8
--- /dev/null
+++ b/plot_types/3D/wire3d_simple.py
@@ -0,0 +1,24 @@
+"""
+=================
+3D wireframe plot
+=================
+
+See `~mpl_toolkits.mplot3d.axes3d.Axes3D.plot_wireframe`.
+"""
+from mpl_toolkits.mplot3d import axes3d
+import matplotlib.pyplot as plt
+
+plt.style.use('_mpl-gallery')
+
+# Make data
+X, Y, Z = axes3d.get_test_data(0.05)
+
+# Plot
+fig, ax = plt.subplots(subplot_kw={"projection": "3d"})
+ax.plot_wireframe(X, Y, Z, rstride=10, cstride=10)
+
+ax.set(xticklabels=[],
+       yticklabels=[],
+       zticklabels=[])
+
+plt.show()
diff --git a/plot_types/README.rst b/plot_types/README.rst
new file mode 100644
index 000000000000..ef5b08fbedbe
--- /dev/null
+++ b/plot_types/README.rst
@@ -0,0 +1,12 @@
+.. _plot_types:
+
+.. redirect-from:: /tutorials/basic/sample_plots
+
+Plot types
+==========
+
+Overview of many common plotting commands in Matplotlib.
+
+Note that we have stripped all labels, but they are present by default.
+See the `gallery <../gallery/index.html>`_ for many more examples and
+the `tutorials page <../tutorials/index.html>`_ for longer examples.
diff --git a/plot_types/arrays/README.rst b/plot_types/arrays/README.rst
new file mode 100644
index 000000000000..43844ee9490c
--- /dev/null
+++ b/plot_types/arrays/README.rst
@@ -0,0 +1,6 @@
+.. _array_plots:
+
+Plots of arrays and fields
+--------------------------
+
+Plotting for arrays of data ``Z(x, y)`` and fields ``U(x, y), V(x, y)``.
diff --git a/plot_types/arrays/barbs.py b/plot_types/arrays/barbs.py
new file mode 100644
index 000000000000..63e492869039
--- /dev/null
+++ b/plot_types/arrays/barbs.py
@@ -0,0 +1,33 @@
+"""
+=================
+barbs(X, Y, U, V)
+=================
+
+See `~matplotlib.axes.Axes.barbs`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery-nogrid')
+
+# make data:
+X, Y = np.meshgrid([1, 2, 3, 4], [1, 2, 3, 4])
+angle = np.pi / 180 * np.array([[15., 30, 35, 45],
+                                [25., 40, 55, 60],
+                                [35., 50, 65, 75],
+                                [45., 60, 75, 90]])
+amplitude = np.array([[5, 10, 25, 50],
+                      [10, 15, 30, 60],
+                      [15, 26, 50, 70],
+                      [20, 45, 80, 100]])
+U = amplitude * np.sin(angle)
+V = amplitude * np.cos(angle)
+
+# plot:
+fig, ax = plt.subplots()
+
+ax.barbs(X, Y, U, V, barbcolor='C0', flagcolor='C0', length=7, linewidth=1.5)
+
+ax.set(xlim=(0, 4.5), ylim=(0, 4.5))
+
+plt.show()
diff --git a/plot_types/arrays/contour.py b/plot_types/arrays/contour.py
new file mode 100644
index 000000000000..fe79c18d2b58
--- /dev/null
+++ b/plot_types/arrays/contour.py
@@ -0,0 +1,23 @@
+"""
+================
+contour(X, Y, Z)
+================
+
+See `~matplotlib.axes.Axes.contour`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery-nogrid')
+
+# make data
+X, Y = np.meshgrid(np.linspace(-3, 3, 256), np.linspace(-3, 3, 256))
+Z = (1 - X/2 + X**5 + Y**3) * np.exp(-X**2 - Y**2)
+levels = np.linspace(np.min(Z), np.max(Z), 7)
+
+# plot
+fig, ax = plt.subplots()
+
+ax.contour(X, Y, Z, levels=levels)
+
+plt.show()
diff --git a/plot_types/arrays/contourf.py b/plot_types/arrays/contourf.py
new file mode 100644
index 000000000000..bde2f984fc0f
--- /dev/null
+++ b/plot_types/arrays/contourf.py
@@ -0,0 +1,23 @@
+"""
+=================
+contourf(X, Y, Z)
+=================
+
+See `~matplotlib.axes.Axes.contourf`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery-nogrid')
+
+# make data
+X, Y = np.meshgrid(np.linspace(-3, 3, 256), np.linspace(-3, 3, 256))
+Z = (1 - X/2 + X**5 + Y**3) * np.exp(-X**2 - Y**2)
+levels = np.linspace(Z.min(), Z.max(), 7)
+
+# plot
+fig, ax = plt.subplots()
+
+ax.contourf(X, Y, Z, levels=levels)
+
+plt.show()
diff --git a/plot_types/arrays/imshow.py b/plot_types/arrays/imshow.py
new file mode 100644
index 000000000000..be647d1f2924
--- /dev/null
+++ b/plot_types/arrays/imshow.py
@@ -0,0 +1,23 @@
+"""
+=========
+imshow(Z)
+=========
+
+See `~matplotlib.axes.Axes.imshow`.
+"""
+
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery-nogrid')
+
+# make data
+X, Y = np.meshgrid(np.linspace(-3, 3, 16), np.linspace(-3, 3, 16))
+Z = (1 - X/2 + X**5 + Y**3) * np.exp(-X**2 - Y**2)
+
+# plot
+fig, ax = plt.subplots()
+
+ax.imshow(Z)
+
+plt.show()
diff --git a/plot_types/arrays/pcolormesh.py b/plot_types/arrays/pcolormesh.py
new file mode 100644
index 000000000000..b490dcb99d3f
--- /dev/null
+++ b/plot_types/arrays/pcolormesh.py
@@ -0,0 +1,25 @@
+"""
+===================
+pcolormesh(X, Y, Z)
+===================
+
+`~.axes.Axes.pcolormesh` is more flexible than `~.axes.Axes.imshow` in that
+the x and y vectors need not be equally spaced (indeed they can be skewed).
+
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery-nogrid')
+
+# make data with uneven sampling in x
+x = [-3, -2, -1.6, -1.2, -.8, -.5, -.2, .1, .3, .5, .8, 1.1, 1.5, 1.9, 2.3, 3]
+X, Y = np.meshgrid(x, np.linspace(-3, 3, 128))
+Z = (1 - X/2 + X**5 + Y**3) * np.exp(-X**2 - Y**2)
+
+# plot
+fig, ax = plt.subplots()
+
+ax.pcolormesh(X, Y, Z, vmin=-0.5, vmax=1.0)
+
+plt.show()
diff --git a/plot_types/arrays/quiver.py b/plot_types/arrays/quiver.py
new file mode 100644
index 000000000000..5d6dc808c518
--- /dev/null
+++ b/plot_types/arrays/quiver.py
@@ -0,0 +1,28 @@
+"""
+==================
+quiver(X, Y, U, V)
+==================
+
+See `~matplotlib.axes.Axes.quiver`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery-nogrid')
+
+# make data
+x = np.linspace(-4, 4, 6)
+y = np.linspace(-4, 4, 6)
+X, Y = np.meshgrid(x, y)
+U = X + Y
+V = Y - X
+
+# plot
+fig, ax = plt.subplots()
+
+ax.quiver(X, Y, U, V, color="C0", angles='xy',
+          scale_units='xy', scale=5, width=.015)
+
+ax.set(xlim=(-5, 5), ylim=(-5, 5))
+
+plt.show()
diff --git a/plot_types/arrays/streamplot.py b/plot_types/arrays/streamplot.py
new file mode 100644
index 000000000000..3f1e2ef4e1cc
--- /dev/null
+++ b/plot_types/arrays/streamplot.py
@@ -0,0 +1,25 @@
+"""
+======================
+streamplot(X, Y, U, V)
+======================
+
+See `~matplotlib.axes.Axes.streamplot`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery-nogrid')
+
+# make a stream function:
+X, Y = np.meshgrid(np.linspace(-3, 3, 256), np.linspace(-3, 3, 256))
+Z = (1 - X/2 + X**5 + Y**3) * np.exp(-X**2 - Y**2)
+# make U and V out of the streamfunction:
+V = np.diff(Z[1:, :], axis=1)
+U = -np.diff(Z[:, 1:], axis=0)
+
+# plot:
+fig, ax = plt.subplots()
+
+ax.streamplot(X[1:, 1:], Y[1:, 1:], U, V)
+
+plt.show()
diff --git a/plot_types/basic/README.rst b/plot_types/basic/README.rst
new file mode 100644
index 000000000000..9ce35d083177
--- /dev/null
+++ b/plot_types/basic/README.rst
@@ -0,0 +1,6 @@
+.. _basic_plots:
+
+Basic
+-----
+
+Basic plot types, usually y versus x.
diff --git a/plot_types/basic/bar.py b/plot_types/basic/bar.py
new file mode 100644
index 000000000000..e23d27baa06c
--- /dev/null
+++ b/plot_types/basic/bar.py
@@ -0,0 +1,25 @@
+"""
+==============
+bar(x, height)
+==============
+
+See `~matplotlib.axes.Axes.bar`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+plt.style.use('_mpl-gallery')
+
+# make data:
+np.random.seed(3)
+x = 0.5 + np.arange(8)
+y = np.random.uniform(2, 7, len(x))
+
+# plot
+fig, ax = plt.subplots()
+
+ax.bar(x, y, width=1, edgecolor="white", linewidth=0.7)
+
+ax.set(xlim=(0, 8), xticks=np.arange(1, 8),
+       ylim=(0, 8), yticks=np.arange(1, 8))
+
+plt.show()
diff --git a/plot_types/basic/fill_between.py b/plot_types/basic/fill_between.py
new file mode 100644
index 000000000000..a454c3c30772
--- /dev/null
+++ b/plot_types/basic/fill_between.py
@@ -0,0 +1,29 @@
+"""
+=======================
+fill_between(x, y1, y2)
+=======================
+
+See `~matplotlib.axes.Axes.fill_between`.
+"""
+
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery')
+
+# make data
+np.random.seed(1)
+x = np.linspace(0, 8, 16)
+y1 = 3 + 4*x/8 + np.random.uniform(0.0, 0.5, len(x))
+y2 = 1 + 2*x/8 + np.random.uniform(0.0, 0.5, len(x))
+
+# plot
+fig, ax = plt.subplots()
+
+ax.fill_between(x, y1, y2, alpha=.5, linewidth=0)
+ax.plot(x, (y1 + y2)/2, linewidth=2)
+
+ax.set(xlim=(0, 8), xticks=np.arange(1, 8),
+       ylim=(0, 8), yticks=np.arange(1, 8))
+
+plt.show()
diff --git a/plot_types/basic/plot.py b/plot_types/basic/plot.py
new file mode 100644
index 000000000000..3808137e52fd
--- /dev/null
+++ b/plot_types/basic/plot.py
@@ -0,0 +1,26 @@
+"""
+==========
+plot(x, y)
+==========
+
+See `~matplotlib.axes.Axes.plot`.
+"""
+
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery')
+
+# make data
+x = np.linspace(0, 10, 100)
+y = 4 + 2 * np.sin(2 * x)
+
+# plot
+fig, ax = plt.subplots()
+
+ax.plot(x, y, linewidth=2.0)
+
+ax.set(xlim=(0, 8), xticks=np.arange(1, 8),
+       ylim=(0, 8), yticks=np.arange(1, 8))
+
+plt.show()
diff --git a/plot_types/basic/scatter_plot.py b/plot_types/basic/scatter_plot.py
new file mode 100644
index 000000000000..792016c0e79c
--- /dev/null
+++ b/plot_types/basic/scatter_plot.py
@@ -0,0 +1,29 @@
+"""
+=============
+scatter(x, y)
+=============
+
+See `~matplotlib.axes.Axes.scatter`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery')
+
+# make the data
+np.random.seed(3)
+x = 4 + np.random.normal(0, 2, 24)
+y = 4 + np.random.normal(0, 2, len(x))
+# size and color:
+sizes = np.random.uniform(15, 80, len(x))
+colors = np.random.uniform(15, 80, len(x))
+
+# plot
+fig, ax = plt.subplots()
+
+ax.scatter(x, y, s=sizes, c=colors, vmin=0, vmax=100)
+
+ax.set(xlim=(0, 8), xticks=np.arange(1, 8),
+       ylim=(0, 8), yticks=np.arange(1, 8))
+
+plt.show()
diff --git a/plot_types/basic/stackplot.py b/plot_types/basic/stackplot.py
new file mode 100644
index 000000000000..5b23b52775b3
--- /dev/null
+++ b/plot_types/basic/stackplot.py
@@ -0,0 +1,27 @@
+"""
+===============
+stackplot(x, y)
+===============
+See `~matplotlib.axes.Axes.stackplot`
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery')
+
+# make data
+x = np.arange(0, 10, 2)
+ay = [1, 1.25, 2, 2.75, 3]
+by = [1, 1, 1, 1, 1]
+cy = [2, 1, 2, 1, 2]
+y = np.vstack([ay, by, cy])
+
+# plot
+fig, ax = plt.subplots()
+
+ax.stackplot(x, y)
+
+ax.set(xlim=(0, 8), xticks=np.arange(1, 8),
+       ylim=(0, 8), yticks=np.arange(1, 8))
+
+plt.show()
diff --git a/plot_types/basic/stem.py b/plot_types/basic/stem.py
new file mode 100644
index 000000000000..8e7b29283c01
--- /dev/null
+++ b/plot_types/basic/stem.py
@@ -0,0 +1,26 @@
+"""
+==========
+stem(x, y)
+==========
+
+See `~matplotlib.axes.Axes.stem`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery')
+
+# make data
+np.random.seed(3)
+x = 0.5 + np.arange(8)
+y = np.random.uniform(2, 7, len(x))
+
+# plot
+fig, ax = plt.subplots()
+
+ax.stem(x, y)
+
+ax.set(xlim=(0, 8), xticks=np.arange(1, 8),
+       ylim=(0, 8), yticks=np.arange(1, 8))
+
+plt.show()
diff --git a/plot_types/basic/step.py b/plot_types/basic/step.py
new file mode 100644
index 000000000000..558550a5c498
--- /dev/null
+++ b/plot_types/basic/step.py
@@ -0,0 +1,26 @@
+"""
+==========
+step(x, y)
+==========
+
+See `~matplotlib.axes.Axes.step`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery')
+
+# make data
+np.random.seed(3)
+x = 0.5 + np.arange(8)
+y = np.random.uniform(2, 7, len(x))
+
+# plot
+fig, ax = plt.subplots()
+
+ax.step(x, y, linewidth=2.5)
+
+ax.set(xlim=(0, 8), xticks=np.arange(1, 8),
+       ylim=(0, 8), yticks=np.arange(1, 8))
+
+plt.show()
diff --git a/plot_types/stats/README.rst b/plot_types/stats/README.rst
new file mode 100644
index 000000000000..b2ca855aafbc
--- /dev/null
+++ b/plot_types/stats/README.rst
@@ -0,0 +1,6 @@
+.. _stats_plots:
+
+Statistics plots
+----------------
+
+Plots for statistical analysis.
diff --git a/plot_types/stats/boxplot_plot.py b/plot_types/stats/boxplot_plot.py
new file mode 100644
index 000000000000..cdad3c52320f
--- /dev/null
+++ b/plot_types/stats/boxplot_plot.py
@@ -0,0 +1,30 @@
+"""
+==========
+boxplot(X)
+==========
+
+See `~matplotlib.axes.Axes.boxplot`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery')
+
+# make data:
+np.random.seed(10)
+D = np.random.normal((3, 5, 4), (1.25, 1.00, 1.25), (100, 3))
+
+# plot
+fig, ax = plt.subplots()
+VP = ax.boxplot(D, positions=[2, 4, 6], widths=1.5, patch_artist=True,
+                showmeans=False, showfliers=False,
+                medianprops={"color": "white", "linewidth": 0.5},
+                boxprops={"facecolor": "C0", "edgecolor": "white",
+                          "linewidth": 0.5},
+                whiskerprops={"color": "C0", "linewidth": 1.5},
+                capprops={"color": "C0", "linewidth": 1.5})
+
+ax.set(xlim=(0, 8), xticks=np.arange(1, 8),
+       ylim=(0, 8), yticks=np.arange(1, 8))
+
+plt.show()
diff --git a/plot_types/stats/errorbar_plot.py b/plot_types/stats/errorbar_plot.py
new file mode 100644
index 000000000000..0e226e11b315
--- /dev/null
+++ b/plot_types/stats/errorbar_plot.py
@@ -0,0 +1,27 @@
+"""
+==========================
+errorbar(x, y, yerr, xerr)
+==========================
+
+See `~matplotlib.axes.Axes.errorbar`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery')
+
+# make data:
+np.random.seed(1)
+x = [2, 4, 6]
+y = [3.6, 5, 4.2]
+yerr = [0.9, 1.2, 0.5]
+
+# plot:
+fig, ax = plt.subplots()
+
+ax.errorbar(x, y, yerr, fmt='o', linewidth=2, capsize=6)
+
+ax.set(xlim=(0, 8), xticks=np.arange(1, 8),
+       ylim=(0, 8), yticks=np.arange(1, 8))
+
+plt.show()
diff --git a/plot_types/stats/eventplot.py b/plot_types/stats/eventplot.py
new file mode 100644
index 000000000000..da8c33c28425
--- /dev/null
+++ b/plot_types/stats/eventplot.py
@@ -0,0 +1,26 @@
+"""
+============
+eventplot(D)
+============
+
+See `~matplotlib.axes.Axes.eventplot`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery')
+
+# make data:
+np.random.seed(1)
+x = [2, 4, 6]
+D = np.random.gamma(4, size=(3, 50))
+
+# plot:
+fig, ax = plt.subplots()
+
+ax.eventplot(D, orientation="vertical", lineoffsets=x, linewidth=0.75)
+
+ax.set(xlim=(0, 8), xticks=np.arange(1, 8),
+       ylim=(0, 8), yticks=np.arange(1, 8))
+
+plt.show()
diff --git a/plot_types/stats/hexbin.py b/plot_types/stats/hexbin.py
new file mode 100644
index 000000000000..91e771308afd
--- /dev/null
+++ b/plot_types/stats/hexbin.py
@@ -0,0 +1,25 @@
+"""
+===============
+hexbin(x, y, C)
+===============
+
+See `~matplotlib.axes.Axes.hexbin`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery-nogrid')
+
+# make data: correlated + noise
+np.random.seed(1)
+x = np.random.randn(5000)
+y = 1.2 * x + np.random.randn(5000) / 3
+
+# plot:
+fig, ax = plt.subplots()
+
+ax.hexbin(x, y, gridsize=20)
+
+ax.set(xlim=(-2, 2), ylim=(-3, 3))
+
+plt.show()
diff --git a/plot_types/stats/hist2d.py b/plot_types/stats/hist2d.py
new file mode 100644
index 000000000000..3e43f7ee8ace
--- /dev/null
+++ b/plot_types/stats/hist2d.py
@@ -0,0 +1,25 @@
+"""
+============
+hist2d(x, y)
+============
+
+See `~matplotlib.axes.Axes.hist2d`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery-nogrid')
+
+# make data: correlated + noise
+np.random.seed(1)
+x = np.random.randn(5000)
+y = 1.2 * x + np.random.randn(5000) / 3
+
+# plot:
+fig, ax = plt.subplots()
+
+ax.hist2d(x, y, bins=(np.arange(-3, 3, 0.1), np.arange(-3, 3, 0.1)))
+
+ax.set(xlim=(-2, 2), ylim=(-3, 3))
+
+plt.show()
diff --git a/plot_types/stats/hist_plot.py b/plot_types/stats/hist_plot.py
new file mode 100644
index 000000000000..6c86a0aca216
--- /dev/null
+++ b/plot_types/stats/hist_plot.py
@@ -0,0 +1,25 @@
+"""
+=======
+hist(x)
+=======
+
+See `~matplotlib.axes.Axes.hist`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery')
+
+# make data
+np.random.seed(1)
+x = 4 + np.random.normal(0, 1.5, 200)
+
+# plot:
+fig, ax = plt.subplots()
+
+ax.hist(x, bins=8, linewidth=0.5, edgecolor="white")
+
+ax.set(xlim=(0, 8), xticks=np.arange(1, 8),
+       ylim=(0, 56), yticks=np.linspace(0, 56, 9))
+
+plt.show()
diff --git a/plot_types/stats/pie.py b/plot_types/stats/pie.py
new file mode 100644
index 000000000000..80484a0eb932
--- /dev/null
+++ b/plot_types/stats/pie.py
@@ -0,0 +1,26 @@
+"""
+======
+pie(x)
+======
+
+See `~matplotlib.axes.Axes.pie`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery-nogrid')
+
+
+# make data
+x = [1, 2, 3, 4]
+colors = plt.get_cmap('Blues')(np.linspace(0.2, 0.7, len(x)))
+
+# plot
+fig, ax = plt.subplots()
+ax.pie(x, colors=colors, radius=3, center=(4, 4),
+       wedgeprops={"linewidth": 1, "edgecolor": "white"}, frame=True)
+
+ax.set(xlim=(0, 8), xticks=np.arange(1, 8),
+       ylim=(0, 8), yticks=np.arange(1, 8))
+
+plt.show()
diff --git a/plot_types/stats/violin.py b/plot_types/stats/violin.py
new file mode 100644
index 000000000000..c8a987a690dd
--- /dev/null
+++ b/plot_types/stats/violin.py
@@ -0,0 +1,28 @@
+"""
+=============
+violinplot(D)
+=============
+
+See `~matplotlib.axes.Axes.violinplot`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery')
+
+# make data:
+np.random.seed(10)
+D = np.random.normal((3, 5, 4), (0.75, 1.00, 0.75), (200, 3))
+
+# plot:
+fig, ax = plt.subplots()
+
+vp = ax.violinplot(D, [2, 4, 6], widths=2,
+                   showmeans=False, showmedians=False, showextrema=False)
+# styling:
+for body in vp['bodies']:
+    body.set_alpha(0.9)
+ax.set(xlim=(0, 8), xticks=np.arange(1, 8),
+       ylim=(0, 8), yticks=np.arange(1, 8))
+
+plt.show()
diff --git a/plot_types/unstructured/README.rst b/plot_types/unstructured/README.rst
new file mode 100644
index 000000000000..89b7844775d2
--- /dev/null
+++ b/plot_types/unstructured/README.rst
@@ -0,0 +1,9 @@
+.. _unstructured_plots:
+
+Unstructured coordinates
+-------------------------
+
+Sometimes we collect data ``z`` at coordinates ``(x,y)`` and want to visualize
+as a contour.  Instead of gridding the data and then using
+`~.axes.Axes.contour`, we can use a triangulation algorithm and fill the
+triangles.
diff --git a/plot_types/unstructured/tricontour.py b/plot_types/unstructured/tricontour.py
new file mode 100644
index 000000000000..83b0a212fd83
--- /dev/null
+++ b/plot_types/unstructured/tricontour.py
@@ -0,0 +1,28 @@
+"""
+===================
+tricontour(x, y, z)
+===================
+
+See `~matplotlib.axes.Axes.tricontour`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery-nogrid')
+
+# make data:
+np.random.seed(1)
+x = np.random.uniform(-3, 3, 256)
+y = np.random.uniform(-3, 3, 256)
+z = (1 - x/2 + x**5 + y**3) * np.exp(-x**2 - y**2)
+levels = np.linspace(z.min(), z.max(), 7)
+
+# plot:
+fig, ax = plt.subplots()
+
+ax.plot(x, y, 'o', markersize=2, color='lightgrey')
+ax.tricontour(x, y, z, levels=levels)
+
+ax.set(xlim=(-3, 3), ylim=(-3, 3))
+
+plt.show()
diff --git a/plot_types/unstructured/tricontourf.py b/plot_types/unstructured/tricontourf.py
new file mode 100644
index 000000000000..da909c02f0b2
--- /dev/null
+++ b/plot_types/unstructured/tricontourf.py
@@ -0,0 +1,28 @@
+"""
+====================
+tricontourf(x, y, z)
+====================
+
+See `~matplotlib.axes.Axes.tricontourf`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery-nogrid')
+
+# make data:
+np.random.seed(1)
+x = np.random.uniform(-3, 3, 256)
+y = np.random.uniform(-3, 3, 256)
+z = (1 - x/2 + x**5 + y**3) * np.exp(-x**2 - y**2)
+levels = np.linspace(z.min(), z.max(), 7)
+
+# plot:
+fig, ax = plt.subplots()
+
+ax.plot(x, y, 'o', markersize=2, color='grey')
+ax.tricontourf(x, y, z, levels=levels)
+
+ax.set(xlim=(-3, 3), ylim=(-3, 3))
+
+plt.show()
diff --git a/plot_types/unstructured/tripcolor.py b/plot_types/unstructured/tripcolor.py
new file mode 100644
index 000000000000..e2619a68444e
--- /dev/null
+++ b/plot_types/unstructured/tripcolor.py
@@ -0,0 +1,27 @@
+"""
+==================
+tripcolor(x, y, z)
+==================
+
+See `~matplotlib.axes.Axes.tripcolor`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery-nogrid')
+
+# make data:
+np.random.seed(1)
+x = np.random.uniform(-3, 3, 256)
+y = np.random.uniform(-3, 3, 256)
+z = (1 - x/2 + x**5 + y**3) * np.exp(-x**2 - y**2)
+
+# plot:
+fig, ax = plt.subplots()
+
+ax.plot(x, y, 'o', markersize=2, color='grey')
+ax.tripcolor(x, y, z)
+
+ax.set(xlim=(-3, 3), ylim=(-3, 3))
+
+plt.show()
diff --git a/plot_types/unstructured/triplot.py b/plot_types/unstructured/triplot.py
new file mode 100644
index 000000000000..78cf8e32a318
--- /dev/null
+++ b/plot_types/unstructured/triplot.py
@@ -0,0 +1,26 @@
+"""
+=============
+triplot(x, y)
+=============
+
+See `~matplotlib.axes.Axes.triplot`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('_mpl-gallery-nogrid')
+
+# make data:
+np.random.seed(1)
+x = np.random.uniform(-3, 3, 256)
+y = np.random.uniform(-3, 3, 256)
+z = (1 - x/2 + x**5 + y**3) * np.exp(-x**2 - y**2)
+
+# plot:
+fig, ax = plt.subplots()
+
+ax.triplot(x, y)
+
+ax.set(xlim=(-3, 3), ylim=(-3, 3))
+
+plt.show()
diff --git a/pytest.ini b/pytest.ini
index 905d3a5e5a52..f4a8057e0fcc 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,4 +1,9 @@
-# Additional configuration is in matplotlib/testing/conftest.py.
+# Because tests can be run from an installed copy, most of our Pytest
+# configuration is in the `pytest_configure` function in
+# `lib/matplotlib/testing/conftest.py`. This configuration file exists only to
+# set a minimum pytest version and to prevent pytest from wasting time trying
+# to check examples and documentation files that are not really tests.
+
 [pytest]
 minversion = 3.6
 
diff --git a/requirements/doc/doc-requirements.txt b/requirements/doc/doc-requirements.txt
index 193c888b2f95..ad0e44d16fa4 100644
--- a/requirements/doc/doc-requirements.txt
+++ b/requirements/doc/doc-requirements.txt
@@ -7,12 +7,15 @@
 # Install the documentation requirements with:
 #     pip install -r requirements/doc/doc-requirements.txt
 #
-sphinx>=1.8.1,!=2.0.0
+sphinx>=3.0.0
 colorspacious
 ipython
 ipywidgets
-numpydoc>=0.8
+numpydoc>=1.0
+packaging>=20
+pydata-sphinx-theme>=0.9.0
+mpl-sphinx-theme~=3.6.0
 sphinxcontrib-svg2pdfconverter>=1.1.0
-sphinx-gallery>=0.7
+sphinx-gallery>=0.10
 sphinx-copybutton
-scipy
+sphinx-design
diff --git a/requirements/testing/all.txt b/requirements/testing/all.txt
index fb7beef90f16..299cb0817dcb 100644
--- a/requirements/testing/all.txt
+++ b/requirements/testing/all.txt
@@ -1,11 +1,12 @@
 # pip requirements for all the CI builds
 
 certifi
-coverage
+coverage!=6.3
+psutil
 pytest!=4.6.0,!=5.4.0
 pytest-cov
 pytest-rerunfailures
 pytest-timeout
 pytest-xdist
-python-dateutil
+pytest-xvfb
 tornado
diff --git a/requirements/testing/extra.txt b/requirements/testing/extra.txt
index 611dce4cdfd8..8d314a141218 100644
--- a/requirements/testing/extra.txt
+++ b/requirements/testing/extra.txt
@@ -1,8 +1,11 @@
-# Extra pip requirements for the Python 3.7+ builds
+# Extra pip requirements for the Python 3.8+ builds
 
+--prefer-binary
 ipykernel
 nbconvert[execute]!=6.0.0,!=6.0.1
 nbformat!=5.0.0,!=5.0.1
 pandas!=0.25.0
 pikepdf
 pytz
+pywin32; sys.platform == 'win32'
+xarray
diff --git a/requirements/testing/minver.txt b/requirements/testing/minver.txt
index 6ef24615bde2..d8dd2f66c22c 100644
--- a/requirements/testing/minver.txt
+++ b/requirements/testing/minver.txt
@@ -1,8 +1,11 @@
 # Extra pip requirements for the minimum-version CI run
 
+contourpy==1.0.1
 cycler==0.10
 kiwisolver==1.0.1
-numpy==1.16.0
-pillow==6.2.0
+numpy==1.19.0
+packaging==20.0
+pillow==6.2.1
 pyparsing==2.2.1
 python-dateutil==2.7
+fonttools==4.22.0
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 000000000000..9d4cf0e7b72c
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+# NOTE: Matplotlib-specific configuration options have been moved to
+# mplsetup.cfg.template.
+
+[metadata]
+license_files = LICENSE/*
diff --git a/setup.py b/setup.py
index b51ae806c2fb..d1f1de7078ff 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 """
-The matplotlib build options can be modified with a setup.cfg file. See
-setup.cfg.template for more information.
+The Matplotlib build options can be modified with a mplsetup.cfg file. See
+mplsetup.cfg.template for more information.
 """
 
 # NOTE: This file must remain Python 2 compatible for the foreseeable future,
@@ -8,8 +8,8 @@
 # and/or pip.
 import sys
 
-py_min_version = (3, 7)  # minimal supported python version
-since_mpl_version = (3, 4)  # py_min_version is required since this mpl version
+py_min_version = (3, 8)  # minimal supported python version
+since_mpl_version = (3, 6)  # py_min_version is required since this mpl version
 
 if sys.version_info < py_min_version:
     error = """
@@ -29,30 +29,14 @@
 import shutil
 import subprocess
 
-from setuptools import setup, find_packages, Extension
-from setuptools.command.build_ext import build_ext as BuildExtCommand
-from setuptools.command.test import test as TestCommand
-
-# The setuptools version of sdist adds a setup.cfg file to the tree.
-# We don't want that, so we simply remove it, and it will fall back to
-# vanilla distutils.
-try:
-    from setuptools.command import sdist
-except ImportError:
-    pass
-else:
-    del sdist.sdist.make_release_tree
-
-from distutils.errors import CompileError
-from distutils.dist import Distribution
+from setuptools import setup, find_packages, Distribution, Extension
+import setuptools.command.build_ext
+import setuptools.command.build_py
+import setuptools.command.sdist
 
 import setupext
 from setupext import print_raw, print_status
 
-# Get the version from versioneer
-import versioneer
-__version__ = versioneer.get_version()
-
 
 # These are the packages in the order we want to display them.
 mpl_packages = [
@@ -74,18 +58,15 @@ def has_flag(self, flagname):
         f.write('int main (int argc, char **argv) { return 0; }')
         try:
             self.compile([f.name], extra_postargs=[flagname])
-        except CompileError:
+        except Exception as exc:
+            # https://github.com/pypa/setuptools/issues/2698
+            if type(exc).__name__ != "CompileError":
+                raise
             return False
     return True
 
 
-class NoopTestCommand(TestCommand):
-    def __init__(self, dist):
-        print("Matplotlib does not support running tests with "
-              "'python setup.py test'. Please run 'pytest'.")
-
-
-class BuildExtraLibraries(BuildExtCommand):
+class BuildExtraLibraries(setuptools.command.build_ext.build_ext):
     def finalize_options(self):
         self.distribution.ext_modules[:] = [
             ext
@@ -152,7 +133,7 @@ def prepare_flags(name, enable_lto):
                                         stdout=subprocess.PIPE,
                                         stderr=subprocess.STDOUT,
                                         universal_newlines=True)
-            except Exception as e:
+            except Exception:
                 pass
             else:
                 version = result.stdout.lower()
@@ -179,12 +160,6 @@ def prepare_flags(name, enable_lto):
         return env
 
     def build_extensions(self):
-        # Remove the -Wstrict-prototypes option, it's not valid for C++.  Fixed
-        # in Py3.7 as bpo-5755.
-        try:
-            self.compiler.compiler_so.remove('-Wstrict-prototypes')
-        except (ValueError, AttributeError):
-            pass
         if (self.compiler.compiler_type == 'msvc' and
                 os.environ.get('MPL_DISABLE_FH4')):
             # Disable FH4 Exception Handling implementation so that we don't
@@ -199,10 +174,49 @@ def build_extensions(self):
             package.do_custom_build(env)
         return super().build_extensions()
 
+    def build_extension(self, ext):
+        # When C coverage is enabled, the path to the object file is saved.
+        # Since we re-use source files in multiple extensions, libgcov will
+        # complain at runtime that it is trying to save coverage for the same
+        # object file at different timestamps (since each source is compiled
+        # again for each extension). Thus, we need to use unique temporary
+        # build directories to store object files for each extension.
+        orig_build_temp = self.build_temp
+        self.build_temp = os.path.join(self.build_temp, ext.name)
+        try:
+            super().build_extension(ext)
+        finally:
+            self.build_temp = orig_build_temp
+
+
+def update_matplotlibrc(path):
+    # If packagers want to change the default backend, insert a `#backend: ...`
+    # line.  Otherwise, use the default `##backend: Agg` which has no effect
+    # even after decommenting, which allows _auto_backend_sentinel to be filled
+    # in at import time.
+    template_lines = path.read_text(encoding="utf-8").splitlines(True)
+    backend_line_idx, = [  # Also asserts that there is a single such line.
+        idx for idx, line in enumerate(template_lines)
+        if "#backend:" in line]
+    template_lines[backend_line_idx] = (
+        "#backend: {}\n".format(setupext.options["backend"])
+        if setupext.options["backend"]
+        else "##backend: Agg\n")
+    path.write_text("".join(template_lines), encoding="utf-8")
+
+
+class BuildPy(setuptools.command.build_py.build_py):
+    def run(self):
+        super().run()
+        update_matplotlibrc(
+            Path(self.build_lib, "matplotlib/mpl-data/matplotlibrc"))
 
-cmdclass = versioneer.get_cmdclass()
-cmdclass['test'] = NoopTestCommand
-cmdclass['build_ext'] = BuildExtraLibraries
+
+class Sdist(setuptools.command.sdist.sdist):
+    def make_release_tree(self, base_dir, files):
+        super().make_release_tree(base_dir, files)
+        update_matplotlibrc(
+            Path(base_dir, "lib/matplotlib/mpl-data/matplotlibrc"))
 
 
 package_data = {}  # Will be filled below by the various components.
@@ -215,7 +229,7 @@ def build_extensions(self):
     # Go through all of the packages and figure out which ones we are
     # going to build/install.
     print_raw()
-    print_raw("Edit setup.cfg to change the build options; "
+    print_raw("Edit mplsetup.cfg to change the build options; "
               "suppress output with --quiet.")
     print_raw()
     print_raw("BUILDING MATPLOTLIB")
@@ -243,26 +257,13 @@ def build_extensions(self):
             package_data.setdefault(key, [])
             package_data[key] = list(set(val + package_data[key]))
 
-    # Write the default matplotlibrc file
-    with open('matplotlibrc.template') as fd:
-        template_lines = fd.read().splitlines(True)
-    backend_line_idx, = [  # Also asserts that there is a single such line.
-        idx for idx, line in enumerate(template_lines)
-        if line.startswith('#backend:')]
-    if setupext.options['backend']:
-        template_lines[backend_line_idx] = (
-            'backend: {}'.format(setupext.options['backend']))
-    with open('lib/matplotlib/mpl-data/matplotlibrc', 'w') as fd:
-        fd.write(''.join(template_lines))
-
-setup(  # Finally, pass this all along to distutils to do the heavy lifting.
+setup(  # Finally, pass this all along to setuptools to do the heavy lifting.
     name="matplotlib",
-    version=__version__,
     description="Python plotting package",
     author="John D. Hunter, Michael Droettboom",
     author_email="matplotlib-users@python.org",
     url="https://matplotlib.org",
-    download_url="https://matplotlib.org/users/installing.html",
+    download_url="https://matplotlib.org/stable/users/installing/index.html",
     project_urls={
         'Documentation': 'https://matplotlib.org',
         'Source Code': 'https://github.com/matplotlib/matplotlib',
@@ -282,9 +283,10 @@ def build_extensions(self):
         'License :: OSI Approved :: Python Software Foundation License',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Topic :: Scientific/Engineering :: Visualization',
     ],
 
@@ -300,16 +302,36 @@ def build_extensions(self):
     python_requires='>={}'.format('.'.join(str(n) for n in py_min_version)),
     setup_requires=[
         "certifi>=2020.06.20",
-        "numpy>=1.16",
+        "numpy>=1.19",
+        "setuptools_scm>=7",
     ],
     install_requires=[
+        "contourpy>=1.0.1",
         "cycler>=0.10",
+        "fonttools>=4.22.0",
         "kiwisolver>=1.0.1",
-        "numpy>=1.16",
+        "numpy>=1.19",
+        "packaging>=20.0",
         "pillow>=6.2.0",
         "pyparsing>=2.2.1",
         "python-dateutil>=2.7",
-    ],
-
-    cmdclass=cmdclass,
+    ] + (
+        # Installing from a git checkout that is not producing a wheel.
+        ["setuptools_scm>=7"] if (
+            Path(__file__).with_name(".git").exists() and
+            os.environ.get("CIBUILDWHEEL", "0") != "1"
+        ) else []
+    ),
+    use_scm_version={
+        "version_scheme": "release-branch-semver",
+        "local_scheme": "node-and-date",
+        "write_to": "lib/matplotlib/_version.py",
+        "parentdir_prefix_version": "matplotlib-",
+        "fallback_version": "0.0+UNKNOWN",
+    },
+    cmdclass={
+        "build_ext": BuildExtraLibraries,
+        "build_py": BuildPy,
+        "sdist": Sdist,
+    },
 )
diff --git a/setupext.py b/setupext.py
index d8d0b6b39369..0387223b9487 100644
--- a/setupext.py
+++ b/setupext.py
@@ -1,6 +1,4 @@
 import configparser
-from distutils import ccompiler, sysconfig
-from distutils.core import Extension
 import functools
 import hashlib
 from io import BytesIO
@@ -12,19 +10,22 @@
 import shutil
 import subprocess
 import sys
+import sysconfig
 import tarfile
+from tempfile import TemporaryDirectory
 import textwrap
 import urllib.request
-import versioneer
+
+from setuptools import Distribution, Extension
 
 _log = logging.getLogger(__name__)
 
 
 def _get_xdg_cache_dir():
     """
-    Return the XDG cache directory.
+    Return the `XDG cache directory`__.
 
-    See https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+    __ https://specifications.freedesktop.org/basedir-spec/latest/
     """
     cache_dir = os.environ.get('XDG_CACHE_HOME')
     if not cache_dir:
@@ -167,28 +168,42 @@ def get_and_extract_tarball(urls, sha, dirname):
         '955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a',
     '2.10.1':
         '3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110',
+    '2.11.1':
+        'f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b'
 }
-# This is the version of FreeType to use when building a local
-# version.  It must match the value in
-# lib/matplotlib.__init__.py and also needs to be changed below in the
-# embedded windows build script (grep for "REMINDER" in this file)
-LOCAL_FREETYPE_VERSION = '2.6.1'
+# This is the version of FreeType to use when building a local version.  It
+# must match the value in lib/matplotlib.__init__.py, and the cache path in
+# `.circleci/config.yml`.
+TESTING_VERSION_OF_FREETYPE = '2.6.1'
+if sys.platform.startswith('win') and platform.machine() == 'ARM64':
+    # older versions of freetype are not supported for win/arm64
+    # Matplotlib tests will not pass
+    LOCAL_FREETYPE_VERSION = '2.11.1'
+else:
+    LOCAL_FREETYPE_VERSION = TESTING_VERSION_OF_FREETYPE
+
 LOCAL_FREETYPE_HASH = _freetype_hashes.get(LOCAL_FREETYPE_VERSION, 'unknown')
 
+# Also update the cache path in `.circleci/config.yml`.
 LOCAL_QHULL_VERSION = '2020.2'
+LOCAL_QHULL_HASH = (
+    'b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e')
 
 
-# matplotlib build options, which can be altered using setup.cfg
-setup_cfg = os.environ.get('MPLSETUPCFG') or 'setup.cfg'
+# Matplotlib build options, which can be altered using mplsetup.cfg
+mplsetup_cfg = os.environ.get('MPLSETUPCFG') or 'mplsetup.cfg'
 config = configparser.ConfigParser()
-if os.path.exists(setup_cfg):
-    config.read(setup_cfg)
+if os.path.exists(mplsetup_cfg):
+    config.read(mplsetup_cfg)
 options = {
     'backend': config.get('rc_options', 'backend', fallback=None),
     'system_freetype': config.getboolean(
-        'libs', 'system_freetype', fallback=sys.platform.startswith('aix')),
-    'system_qhull': config.getboolean('libs', 'system_qhull',
-                                      fallback=False),
+        'libs', 'system_freetype',
+        fallback=sys.platform.startswith(('aix', 'os400'))
+    ),
+    'system_qhull': config.getboolean(
+        'libs', 'system_qhull', fallback=sys.platform.startswith('os400')
+    ),
 }
 
 
@@ -319,16 +334,15 @@ def do_custom_build(self, env):
 
 
 class OptionalPackage(SetupPackage):
-    config_category = "packages"
     default_config = True
 
     def check(self):
         """
-        Check whether ``setup.cfg`` requests this package to be installed.
+        Check whether ``mplsetup.cfg`` requests this package to be installed.
 
         May be overridden by subclasses for additional checks.
         """
-        if config.getboolean(self.config_category, self.name,
+        if config.getboolean("packages", self.name,
                              fallback=self.default_config):
             return "installing"
         else:  # Configuration opt-out by user
@@ -358,9 +372,6 @@ def _pkg_data_helper(pkg, subdir):
 class Matplotlib(SetupPackage):
     name = "matplotlib"
 
-    def check(self):
-        return versioneer.get_version()
-
     def get_package_data(self):
         return {
             'matplotlib': [
@@ -375,7 +386,6 @@ def get_extensions(self):
         # agg
         ext = Extension(
             "matplotlib.backends._backend_agg", [
-                "src/mplutils.cpp",
                 "src/py_converters.cpp",
                 "src/_backend_agg.cpp",
                 "src/_backend_agg_wrapper.cpp",
@@ -392,22 +402,11 @@ def get_extensions(self):
                 "win32": ["ole32", "shell32", "user32"],
             }.get(sys.platform, [])))
         yield ext
-        # contour
-        ext = Extension(
-            "matplotlib._contour", [
-                "src/_contour.cpp",
-                "src/_contour_wrapper.cpp",
-                "src/py_converters.cpp",
-            ])
-        add_numpy_flags(ext)
-        add_libagg_flags(ext)
-        yield ext
         # ft2font
         ext = Extension(
             "matplotlib.ft2font", [
                 "src/ft2font.cpp",
                 "src/ft2font_wrapper.cpp",
-                "src/mplutils.cpp",
                 "src/py_converters.cpp",
             ])
         FreeType.add_flags(ext)
@@ -417,8 +416,6 @@ def get_extensions(self):
         # image
         ext = Extension(
             "matplotlib._image", [
-                "src/_image.cpp",
-                "src/mplutils.cpp",
                 "src/_image_wrapper.cpp",
                 "src/py_converters.cpp",
             ])
@@ -436,7 +433,7 @@ def get_extensions(self):
         yield ext
         # qhull
         ext = Extension(
-            "matplotlib._qhull", ["src/qhull_wrap.c"],
+            "matplotlib._qhull", ["src/_qhull_wrapper.cpp"],
             define_macros=[("MPL_DEVNULL", os.devnull)])
         add_numpy_flags(ext)
         Qhull.add_flags(ext)
@@ -448,8 +445,8 @@ def get_extensions(self):
             ],
             include_dirs=["src"],
             # psapi library needed for finding Tcl/Tk at run time.
-            libraries=({"linux": ["dl"], "win32": ["psapi"],
-                        "cygwin": ["psapi"]}.get(sys.platform, [])),
+            libraries={"linux": ["dl"], "win32": ["comctl32", "psapi"],
+                       "cygwin": ["comctl32", "psapi"]}.get(sys.platform, []),
             extra_link_args={"win32": ["-mwindows"]}.get(sys.platform, []))
         add_numpy_flags(ext)
         add_libagg_flags(ext)
@@ -459,7 +456,6 @@ def get_extensions(self):
             "matplotlib._tri", [
                 "src/tri/_tri.cpp",
                 "src/tri/_tri_wrapper.cpp",
-                "src/mplutils.cpp",
             ])
         add_numpy_flags(ext)
         yield ext
@@ -486,7 +482,9 @@ def get_package_data(self):
                 *_pkg_data_helper('matplotlib', 'tests/baseline_images'),
                 *_pkg_data_helper('matplotlib', 'tests/tinypages'),
                 'tests/cmr10.pfb',
+                'tests/Courier10PitchBT-Bold.pfb',
                 'tests/mpltest.ttf',
+                'tests/test_*.ipynb',
             ],
             'mpl_toolkits': [
                 *_pkg_data_helper('mpl_toolkits', 'tests/baseline_images'),
@@ -532,9 +530,27 @@ def add_libagg_flags_and_sources(ext):
         os.path.join("extern", "agg24-svn", "src", x) for x in agg_sources)
 
 
-# First compile checkdep_freetype2.c, which aborts the compilation either
-# with "foo.h: No such file or directory" if the header is not found, or an
-# appropriate error message if the header indicates a too-old version.
+def get_ccompiler():
+    """
+    Return a new CCompiler instance.
+
+    CCompiler used to be constructible via `distutils.ccompiler.new_compiler`,
+    but this API was removed as part of the distutils deprecation.  Instead,
+    we trick setuptools into instantiating it by creating a dummy Distribution
+    with a list of extension modules that claims to be truthy, but is actually
+    empty, and then running the Distribution's build_ext command.  (If using
+    a plain empty ext_modules, build_ext would early-return without doing
+    anything.)
+    """
+
+    class L(list):
+        def __bool__(self):
+            return True
+
+    build_ext = Distribution({"ext_modules": L()}).get_command_obj("build_ext")
+    build_ext.finalize_options()
+    build_ext.run()
+    return build_ext.compiler
 
 
 class FreeType(SetupPackage):
@@ -542,6 +558,9 @@ class FreeType(SetupPackage):
 
     @classmethod
     def add_flags(cls, ext):
+        # checkdep_freetype2.c immediately aborts the compilation either with
+        # "foo.h: No such file or directory" if the header is not found, or an
+        # appropriate error message if the header indicates a too-old version.
         ext.sources.insert(0, 'src/checkdep_freetype2.c')
         if options.get('system_freetype'):
             pkg_config_setup_extension(
@@ -577,7 +596,9 @@ def do_custom_build(self, env):
                 (f'https://downloads.sourceforge.net/project/freetype'
                  f'/freetype2/{LOCAL_FREETYPE_VERSION}/{tarball}'),
                 (f'https://download.savannah.gnu.org/releases/freetype'
-                 f'/{tarball}')
+                 f'/{tarball}'),
+                (f'https://download.savannah.gnu.org/releases/freetype'
+                 f'/freetype-old/{tarball}')
             ],
             sha=LOCAL_FREETYPE_HASH,
             dirname=f'freetype-{LOCAL_FREETYPE_VERSION}',
@@ -592,12 +613,32 @@ def do_custom_build(self, env):
 
         print(f"Building freetype in {src_path}")
         if sys.platform != 'win32':  # compilation on non-windows
-            env = {**env, "CFLAGS": "{} -fPIC".format(env.get("CFLAGS", ""))}
-            subprocess.check_call(
-                ["./configure", "--with-zlib=no", "--with-bzip2=no",
-                 "--with-png=no", "--with-harfbuzz=no", "--enable-static",
-                 "--disable-shared"],
-                env=env, cwd=src_path)
+            env = {
+                **{
+                    var: value
+                    for var, value in sysconfig.get_config_vars().items()
+                    if var in {"CC", "CFLAGS", "CXX", "CXXFLAGS", "LD",
+                               "LDFLAGS"}
+                },
+                **env,
+            }
+            configure_ac = Path(src_path, "builds/unix/configure.ac")
+            if ((src_path / "autogen.sh").exists()
+                    and not configure_ac.exists()):
+                print(f"{configure_ac} does not exist. "
+                      f"Using sh autogen.sh to generate.")
+                subprocess.check_call(
+                    ["sh", "./autogen.sh"], env=env, cwd=src_path)
+            env["CFLAGS"] = env.get("CFLAGS", "") + " -fPIC"
+            configure = [
+                "./configure", "--with-zlib=no", "--with-bzip2=no",
+                "--with-png=no", "--with-harfbuzz=no", "--enable-static",
+                "--disable-shared"
+            ]
+            host = sysconfig.get_config_var('HOST_GNU_TYPE')
+            if host is not None:  # May be unset on PyPy.
+                configure.append(f"--host={host}")
+            subprocess.check_call(configure, env=env, cwd=src_path)
             if 'GNUMAKE' in env:
                 make = env['GNUMAKE']
             elif 'MAKE' in env:
@@ -615,22 +656,31 @@ def do_custom_build(self, env):
             subprocess.check_call([make], env=env, cwd=src_path)
         else:  # compilation on windows
             shutil.rmtree(src_path / "objs", ignore_errors=True)
-            msbuild_platform = (
-                'x64' if platform.architecture()[0] == '64bit' else 'Win32')
-            base_path = Path("build/freetype-2.6.1/builds/windows")
-            vc = 'vc2010'
-            sln_path = (
-                base_path / vc / "freetype.sln"
+            is_x64 = platform.architecture()[0] == '64bit'
+            if platform.machine() == 'ARM64':
+                msbuild_platform = 'ARM64'
+            elif is_x64:
+                msbuild_platform = 'x64'
+            else:
+                msbuild_platform = 'Win32'
+            base_path = Path(
+                f"build/freetype-{LOCAL_FREETYPE_VERSION}/builds/windows"
             )
+            vc = 'vc2010'
+            sln_path = base_path / vc / "freetype.sln"
             # https://developercommunity.visualstudio.com/comments/190992/view.html
-            (sln_path.parent / "Directory.Build.props").write_text("""
-<Project>
- <PropertyGroup>
-  <!-- The following line *cannot* be split over multiple lines. -->
-  <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
- </PropertyGroup>
-</Project>
-""")
+            (sln_path.parent / "Directory.Build.props").write_text(
+                "<?xml version='1.0' encoding='utf-8'?>"
+                "<Project>"
+                "<PropertyGroup>"
+                # WindowsTargetPlatformVersion must be given on a single line.
+                "<WindowsTargetPlatformVersion>$("
+                "[Microsoft.Build.Utilities.ToolLocationHelper]"
+                "::GetLatestSDKTargetPlatformVersion('Windows', '10.0')"
+                ")</WindowsTargetPlatformVersion>"
+                "</PropertyGroup>"
+                "</Project>",
+                encoding="utf-8")
             # It is not a trivial task to determine PlatformToolset to plug it
             # into msbuild command, and Directory.Build.props will not override
             # the value in the project file.
@@ -645,16 +695,47 @@ def do_custom_build(self, env):
                 f.truncate()
                 f.write(vcxproj)
 
-            cc = ccompiler.new_compiler()
-            cc.initialize()  # Get msbuild in the %PATH% of cc.spawn.
-            cc.spawn(["msbuild", str(sln_path),
+            cc = get_ccompiler()
+            cc.initialize()
+            # On setuptools versions that use "local" distutils,
+            # ``cc.spawn(["msbuild", ...])`` no longer manages to locate the
+            # right executable, even though they are correctly on the PATH,
+            # because only the env kwarg to Popen() is updated, and not
+            # os.environ["PATH"]. Instead, use shutil.which to walk the PATH
+            # and get absolute executable paths.
+            with TemporaryDirectory() as tmpdir:
+                dest = Path(tmpdir, "path")
+                cc.spawn([
+                    sys.executable, "-c",
+                    "import pathlib, shutil, sys\n"
+                    "dest = pathlib.Path(sys.argv[1])\n"
+                    "dest.write_text(shutil.which('msbuild'))\n",
+                    str(dest),
+                ])
+                msbuild_path = dest.read_text()
+            # Freetype 2.10.0+ support static builds.
+            msbuild_config = (
+                "Release Static"
+                if [*map(int, LOCAL_FREETYPE_VERSION.split("."))] >= [2, 10]
+                else "Release"
+            )
+
+            cc.spawn([msbuild_path, str(sln_path),
                       "/t:Clean;Build",
-                      f"/p:Configuration=Release;Platform={msbuild_platform}"])
+                      f"/p:Configuration={msbuild_config};"
+                      f"Platform={msbuild_platform}"])
             # Move to the corresponding Unix build path.
             (src_path / "objs" / ".libs").mkdir()
             # Be robust against change of FreeType version.
-            lib_path, = (src_path / "objs" / vc / msbuild_platform).glob(
-                "freetype*.lib")
+            lib_paths = Path(src_path / "objs").rglob('freetype*.lib')
+            # Select FreeType library for required platform
+            lib_path, = [
+                p for p in lib_paths
+                if msbuild_platform in p.resolve().as_uri()
+            ]
+            print(
+                f"Copying {lib_path} to {src_path}/objs/.libs/libfreetype.lib"
+            )
             shutil.copy2(lib_path, src_path / "objs/.libs/libfreetype.lib")
 
 
@@ -675,7 +756,7 @@ def do_custom_build(self, env):
 
         toplevel = get_and_extract_tarball(
             urls=["http://www.qhull.org/download/qhull-2020-src-8.0.2.tgz"],
-            sha="b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e",
+            sha=LOCAL_QHULL_HASH,
             dirname=f"qhull-{LOCAL_QHULL_VERSION}",
         )
         shutil.copyfile(toplevel / "COPYING.txt", "LICENSE/LICENSE_QHULL")
@@ -683,13 +764,13 @@ def do_custom_build(self, env):
         for ext in self._extensions_to_update:
             qhull_path = Path(f'build/qhull-{LOCAL_QHULL_VERSION}/src')
             ext.include_dirs.insert(0, str(qhull_path))
-            ext.sources.extend(map(str, sorted(qhull_path.glob('libqhull_r/*.c'))))
+            ext.sources.extend(
+                map(str, sorted(qhull_path.glob('libqhull_r/*.c'))))
             if sysconfig.get_config_var("LIBM") == "-lm":
                 ext.libraries.extend("m")
 
 
 class BackendMacOSX(OptionalPackage):
-    config_category = 'gui_support'
     name = 'macosx'
 
     def check(self):
@@ -698,11 +779,11 @@ def check(self):
         return super().check()
 
     def get_extensions(self):
-        sources = [
-            'src/_macosx.m'
-            ]
-        ext = Extension('matplotlib.backends._macosx', sources)
-        ext.extra_compile_args.extend(['-Werror=unguarded-availability'])
+        ext = Extension(
+            'matplotlib.backends._macosx', [
+                'src/_macosx.m'
+            ])
+        ext.extra_compile_args.extend(['-Werror'])
         ext.extra_link_args.extend(['-framework', 'Cocoa'])
         if platform.python_implementation().lower() == 'pypy':
             ext.extra_compile_args.append('-DPYPY=1')
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
index 6ae11167e884..9c46148ba4af 100644
--- a/src/_backend_agg.cpp
+++ b/src/_backend_agg.cpp
@@ -45,7 +45,7 @@ RendererAgg::RendererAgg(unsigned int width, unsigned int height, double dpi)
       rendererBase(),
       rendererAA(),
       rendererBin(),
-      theRasterizer(8192),
+      theRasterizer(32768),
       lastclippath(NULL),
       _fill_color(agg::rgba(1, 1, 1, 0))
 {
@@ -134,8 +134,10 @@ bool RendererAgg::render_clippath(py::PathIterator &clippath,
 {
     typedef agg::conv_transform<py::PathIterator> transformed_path_t;
     typedef PathNanRemover<transformed_path_t> nan_removed_t;
-    typedef PathClipper<nan_removed_t> clipped_t;
-    typedef PathSnapper<clipped_t> snapped_t;
+    /* Unlike normal Paths, the clip path cannot be clipped to the Figure bbox,
+     * because it needs to remain a complete closed path, so there is no
+     * PathClipper<nan_removed_t> step. */
+    typedef PathSnapper<nan_removed_t> snapped_t;
     typedef PathSimplifier<snapped_t> simplify_t;
     typedef agg::conv_curve<simplify_t> curve_t;
 
@@ -150,11 +152,10 @@ bool RendererAgg::render_clippath(py::PathIterator &clippath,
 
         rendererBaseAlphaMask.clear(agg::gray8(0, 0));
         transformed_path_t transformed_clippath(clippath, trans);
-        nan_removed_t nan_removed_clippath(transformed_clippath, true, clippath.has_curves());
-        clipped_t clipped_clippath(nan_removed_clippath, !clippath.has_curves(), width, height);
-        snapped_t snapped_clippath(clipped_clippath, snap_mode, clippath.total_vertices(), 0.0);
+        nan_removed_t nan_removed_clippath(transformed_clippath, true, clippath.has_codes());
+        snapped_t snapped_clippath(nan_removed_clippath, snap_mode, clippath.total_vertices(), 0.0);
         simplify_t simplified_clippath(snapped_clippath,
-                                       clippath.should_simplify() && !clippath.has_curves(),
+                                       clippath.should_simplify() && !clippath.has_codes(),
                                        clippath.simplify_threshold());
         curve_t curved_clippath(simplified_clippath);
         theRasterizer.add_path(curved_clippath);
diff --git a/src/_backend_agg.h b/src/_backend_agg.h
index 8436f6840f24..8f175b18f0bf 100644
--- a/src/_backend_agg.h
+++ b/src/_backend_agg.h
@@ -43,7 +43,7 @@
 
 /**********************************************************************/
 
-// a helper class to pass agg::buffer objects around.  
+// a helper class to pass agg::buffer objects around.
 
 class BufferRegion
 {
@@ -176,8 +176,7 @@ class RendererAgg
                               ColorArray &edgecolors,
                               LineWidthArray &linewidths,
                               DashesVector &linestyles,
-                              AntialiasedArray &antialiaseds,
-                              e_offset_position offset_position);
+                              AntialiasedArray &antialiaseds);
 
     template <class CoordinateArray, class OffsetArray, class ColorArray>
     void draw_quad_mesh(GCAgg &gc,
@@ -277,9 +276,8 @@ class RendererAgg
                                        LineWidthArray &linewidths,
                                        DashesVector &linestyles,
                                        AntialiasedArray &antialiaseds,
-                                       e_offset_position offset_position,
                                        bool check_snap,
-                                       bool has_curves);
+                                       bool has_codes);
 
     template <class PointArray, class ColorArray>
     void _draw_gouraud_triangle(PointArray &points,
@@ -472,7 +470,7 @@ RendererAgg::draw_path(GCAgg &gc, PathIterator &path, agg::trans_affine &trans,
 
     trans *= agg::trans_affine_scaling(1.0, -1.0);
     trans *= agg::trans_affine_translation(0.0, (double)height);
-    bool clip = !face.first && !gc.has_hatchpath() && !path.has_curves();
+    bool clip = !face.first && !gc.has_hatchpath();
     bool simplify = path.should_simplify() && clip;
     double snapping_linewidth = points_to_pixels(gc.linewidth);
     if (gc.color.a == 0.0) {
@@ -480,7 +478,7 @@ RendererAgg::draw_path(GCAgg &gc, PathIterator &path, agg::trans_affine &trans,
     }
 
     transformed_path_t tpath(path, trans);
-    nan_removed_t nan_removed(tpath, true, path.has_curves());
+    nan_removed_t nan_removed(tpath, true, path.has_codes());
     clipped_t clipped(nan_removed, clip, width, height);
     snapped_t snapped(clipped, gc.snap_mode, path.total_vertices(), snapping_linewidth);
     simplify_t simplified(snapped, simplify, path.simplify_threshold());
@@ -514,7 +512,7 @@ inline void RendererAgg::draw_markers(GCAgg &gc,
     trans *= agg::trans_affine_translation(0.5, (double)height + 0.5);
 
     transformed_path_t marker_path_transformed(marker_path, marker_trans);
-    nan_removed_t marker_path_nan_removed(marker_path_transformed, true, marker_path.has_curves());
+    nan_removed_t marker_path_nan_removed(marker_path_transformed, true, marker_path.has_codes());
     snap_t marker_path_snapped(marker_path_nan_removed,
                                gc.snap_mode,
                                marker_path.total_vertices(),
@@ -911,9 +909,8 @@ inline void RendererAgg::_draw_path_collection_generic(GCAgg &gc,
                                                        LineWidthArray &linewidths,
                                                        DashesVector &linestyles,
                                                        AntialiasedArray &antialiaseds,
-                                                       e_offset_position offset_position,
                                                        bool check_snap,
-                                                       bool has_curves)
+                                                       bool has_codes)
 {
     typedef agg::conv_transform<typename PathGenerator::path_iterator> transformed_path_t;
     typedef PathNanRemover<transformed_path_t> nan_removed_t;
@@ -969,11 +966,7 @@ inline void RendererAgg::_draw_path_collection_generic(GCAgg &gc,
             double xo = offsets(i % Noffsets, 0);
             double yo = offsets(i % Noffsets, 1);
             offset_trans.transform(&xo, &yo);
-            if (offset_position == OFFSET_POSITION_DATA) {
-                trans = agg::trans_affine_translation(xo, yo) * trans;
-            } else {
-                trans *= agg::trans_affine_translation(xo, yo);
-            }
+            trans *= agg::trans_affine_translation(xo, yo);
         }
 
         // These transformations must be done post-offsets
@@ -999,17 +992,17 @@ inline void RendererAgg::_draw_path_collection_generic(GCAgg &gc,
             }
         }
 
-        bool do_clip = !face.first && !gc.has_hatchpath() && !has_curves;
+        bool do_clip = !face.first && !gc.has_hatchpath();
 
         if (check_snap) {
             gc.isaa = antialiaseds(i % Naa);
 
             transformed_path_t tpath(path, trans);
-            nan_removed_t nan_removed(tpath, true, has_curves);
+            nan_removed_t nan_removed(tpath, true, has_codes);
             clipped_t clipped(nan_removed, do_clip, width, height);
             snapped_t snapped(
                 clipped, gc.snap_mode, path.total_vertices(), points_to_pixels(gc.linewidth));
-            if (has_curves) {
+            if (has_codes) {
                 snapped_curve_t curve(snapped);
                 _draw_path(curve, has_clippath, face, gc);
             } else {
@@ -1019,9 +1012,9 @@ inline void RendererAgg::_draw_path_collection_generic(GCAgg &gc,
             gc.isaa = antialiaseds(i % Naa);
 
             transformed_path_t tpath(path, trans);
-            nan_removed_t nan_removed(tpath, true, has_curves);
+            nan_removed_t nan_removed(tpath, true, has_codes);
             clipped_t clipped(nan_removed, do_clip, width, height);
-            if (has_curves) {
+            if (has_codes) {
                 curve_t curve(clipped);
                 _draw_path(curve, has_clippath, face, gc);
             } else {
@@ -1047,8 +1040,7 @@ inline void RendererAgg::draw_path_collection(GCAgg &gc,
                                               ColorArray &edgecolors,
                                               LineWidthArray &linewidths,
                                               DashesVector &linestyles,
-                                              AntialiasedArray &antialiaseds,
-                                              e_offset_position offset_position)
+                                              AntialiasedArray &antialiaseds)
 {
     _draw_path_collection_generic(gc,
                                   master_transform,
@@ -1064,7 +1056,6 @@ inline void RendererAgg::draw_path_collection(GCAgg &gc,
                                   linewidths,
                                   linestyles,
                                   antialiaseds,
-                                  offset_position,
                                   true,
                                   true);
 }
@@ -1175,7 +1166,6 @@ inline void RendererAgg::draw_quad_mesh(GCAgg &gc,
                                   linewidths,
                                   linestyles,
                                   antialiaseds,
-                                  OFFSET_POSITION_FIGURE,
                                   true, // check_snap
                                   false);
 }
diff --git a/src/_backend_agg_basic_types.h b/src/_backend_agg_basic_types.h
index 9f65253d9f50..3ee86312ef2b 100644
--- a/src/_backend_agg_basic_types.h
+++ b/src/_backend_agg_basic_types.h
@@ -69,11 +69,6 @@ class Dashes
 
 typedef std::vector<Dashes> DashesVector;
 
-enum e_offset_position {
-    OFFSET_POSITION_FIGURE,
-    OFFSET_POSITION_DATA
-};
-
 class GCAgg
 {
   public:
diff --git a/src/_backend_agg_wrapper.cpp b/src/_backend_agg_wrapper.cpp
index 49a271b96b6a..9d0c3dbc759a 100644
--- a/src/_backend_agg_wrapper.cpp
+++ b/src/_backend_agg_wrapper.cpp
@@ -12,6 +12,8 @@ typedef struct
     Py_ssize_t suboffsets[3];
 } PyRendererAgg;
 
+static PyTypeObject PyRendererAggType;
+
 typedef struct
 {
     PyObject_HEAD
@@ -21,6 +23,8 @@ typedef struct
     Py_ssize_t suboffsets[3];
 } PyBufferRegion;
 
+static PyTypeObject PyBufferRegionType;
+
 
 /**********************************************************************
  * BufferRegion
@@ -40,7 +44,7 @@ static void PyBufferRegion_dealloc(PyBufferRegion *self)
     Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject *PyBufferRegion_to_string(PyBufferRegion *self, PyObject *args, PyObject *kwds)
+static PyObject *PyBufferRegion_to_string(PyBufferRegion *self, PyObject *args)
 {
     return PyBytes_FromStringAndSize((const char *)self->x->get_data(),
                                      self->x->get_height() * self->x->get_stride());
@@ -48,7 +52,7 @@ static PyObject *PyBufferRegion_to_string(PyBufferRegion *self, PyObject *args,
 
 /* TODO: This doesn't seem to be used internally.  Remove? */
 
-static PyObject *PyBufferRegion_set_x(PyBufferRegion *self, PyObject *args, PyObject *kwds)
+static PyObject *PyBufferRegion_set_x(PyBufferRegion *self, PyObject *args)
 {
     int x;
     if (!PyArg_ParseTuple(args, "i:set_x", &x)) {
@@ -59,7 +63,7 @@ static PyObject *PyBufferRegion_set_x(PyBufferRegion *self, PyObject *args, PyOb
     Py_RETURN_NONE;
 }
 
-static PyObject *PyBufferRegion_set_y(PyBufferRegion *self, PyObject *args, PyObject *kwds)
+static PyObject *PyBufferRegion_set_y(PyBufferRegion *self, PyObject *args)
 {
     int y;
     if (!PyArg_ParseTuple(args, "i:set_y", &y)) {
@@ -70,14 +74,14 @@ static PyObject *PyBufferRegion_set_y(PyBufferRegion *self, PyObject *args, PyOb
     Py_RETURN_NONE;
 }
 
-static PyObject *PyBufferRegion_get_extents(PyBufferRegion *self, PyObject *args, PyObject *kwds)
+static PyObject *PyBufferRegion_get_extents(PyBufferRegion *self, PyObject *args)
 {
     agg::rect_i rect = self->x->get_rect();
 
     return Py_BuildValue("IIII", rect.x1, rect.y1, rect.x2, rect.y2);
 }
 
-static PyObject *PyBufferRegion_to_string_argb(PyBufferRegion *self, PyObject *args, PyObject *kwds)
+static PyObject *PyBufferRegion_to_string_argb(PyBufferRegion *self, PyObject *args)
 {
     PyObject *bufobj;
     uint8_t *buf;
@@ -114,9 +118,7 @@ int PyBufferRegion_get_buffer(PyBufferRegion *self, Py_buffer *buf, int flags)
     return 1;
 }
 
-static PyTypeObject PyBufferRegionType;
-
-static PyTypeObject *PyBufferRegion_init_type(PyObject *m, PyTypeObject *type)
+static PyTypeObject *PyBufferRegion_init_type()
 {
     static PyMethodDef methods[] = {
         { "to_string", (PyCFunction)PyBufferRegion_to_string, METH_NOARGS, NULL },
@@ -128,26 +130,17 @@ static PyTypeObject *PyBufferRegion_init_type(PyObject *m, PyTypeObject *type)
     };
 
     static PyBufferProcs buffer_procs;
-    memset(&buffer_procs, 0, sizeof(PyBufferProcs));
     buffer_procs.bf_getbuffer = (getbufferproc)PyBufferRegion_get_buffer;
 
-    memset(type, 0, sizeof(PyTypeObject));
-    type->tp_name = "matplotlib.backends._backend_agg.BufferRegion";
-    type->tp_basicsize = sizeof(PyBufferRegion);
-    type->tp_dealloc = (destructor)PyBufferRegion_dealloc;
-    type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
-    type->tp_methods = methods;
-    type->tp_new = PyBufferRegion_new;
-    type->tp_as_buffer = &buffer_procs;
-
-    if (PyType_Ready(type) < 0) {
-        return NULL;
-    }
+    PyBufferRegionType.tp_name = "matplotlib.backends._backend_agg.BufferRegion";
+    PyBufferRegionType.tp_basicsize = sizeof(PyBufferRegion);
+    PyBufferRegionType.tp_dealloc = (destructor)PyBufferRegion_dealloc;
+    PyBufferRegionType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
+    PyBufferRegionType.tp_methods = methods;
+    PyBufferRegionType.tp_new = PyBufferRegion_new;
+    PyBufferRegionType.tp_as_buffer = &buffer_procs;
 
-    /* Don't need to add to module, since you can't create buffer
-       regions directly from Python */
-
-    return type;
+    return &PyBufferRegionType;
 }
 
 /**********************************************************************
@@ -198,7 +191,7 @@ static void PyRendererAgg_dealloc(PyRendererAgg *self)
     Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject *PyRendererAgg_draw_path(PyRendererAgg *self, PyObject *args, PyObject *kwds)
+static PyObject *PyRendererAgg_draw_path(PyRendererAgg *self, PyObject *args)
 {
     GCAgg gc;
     py::PathIterator path;
@@ -227,7 +220,7 @@ static PyObject *PyRendererAgg_draw_path(PyRendererAgg *self, PyObject *args, Py
     Py_RETURN_NONE;
 }
 
-static PyObject *PyRendererAgg_draw_text_image(PyRendererAgg *self, PyObject *args, PyObject *kwds)
+static PyObject *PyRendererAgg_draw_text_image(PyRendererAgg *self, PyObject *args)
 {
     numpy::array_view<agg::int8u, 2> image;
     double x;
@@ -252,7 +245,7 @@ static PyObject *PyRendererAgg_draw_text_image(PyRendererAgg *self, PyObject *ar
     Py_RETURN_NONE;
 }
 
-PyObject *PyRendererAgg_draw_markers(PyRendererAgg *self, PyObject *args, PyObject *kwds)
+PyObject *PyRendererAgg_draw_markers(PyRendererAgg *self, PyObject *args)
 {
     GCAgg gc;
     py::PathIterator marker_path;
@@ -288,7 +281,7 @@ PyObject *PyRendererAgg_draw_markers(PyRendererAgg *self, PyObject *args, PyObje
     Py_RETURN_NONE;
 }
 
-static PyObject *PyRendererAgg_draw_image(PyRendererAgg *self, PyObject *args, PyObject *kwds)
+static PyObject *PyRendererAgg_draw_image(PyRendererAgg *self, PyObject *args)
 {
     GCAgg gc;
     double x;
@@ -316,11 +309,11 @@ static PyObject *PyRendererAgg_draw_image(PyRendererAgg *self, PyObject *args, P
 }
 
 static PyObject *
-PyRendererAgg_draw_path_collection(PyRendererAgg *self, PyObject *args, PyObject *kwds)
+PyRendererAgg_draw_path_collection(PyRendererAgg *self, PyObject *args)
 {
     GCAgg gc;
     agg::trans_affine master_transform;
-    PyObject *pathobj;
+    py::PathGenerator paths;
     numpy::array_view<const double, 3> transforms;
     numpy::array_view<const double, 2> offsets;
     agg::trans_affine offset_trans;
@@ -330,15 +323,16 @@ PyRendererAgg_draw_path_collection(PyRendererAgg *self, PyObject *args, PyObject
     DashesVector dashes;
     numpy::array_view<const uint8_t, 1> antialiaseds;
     PyObject *ignored;
-    e_offset_position offset_position;
+    PyObject *offset_position; // offset position is no longer used
 
     if (!PyArg_ParseTuple(args,
-                          "O&O&OO&O&O&O&O&O&O&O&OO&:draw_path_collection",
+                          "O&O&O&O&O&O&O&O&O&O&O&OO:draw_path_collection",
                           &convert_gcagg,
                           &gc,
                           &convert_trans_affine,
                           &master_transform,
-                          &pathobj,
+                          &convert_pathgen,
+                          &paths,
                           &convert_transforms,
                           &transforms,
                           &convert_points,
@@ -356,38 +350,27 @@ PyRendererAgg_draw_path_collection(PyRendererAgg *self, PyObject *args, PyObject
                           &antialiaseds.converter,
                           &antialiaseds,
                           &ignored,
-                          &convert_offset_position,
                           &offset_position)) {
         return NULL;
     }
 
-    try
-    {
-        py::PathGenerator path(pathobj);
-
-        CALL_CPP("draw_path_collection",
-                 (self->x->draw_path_collection(gc,
-                                                master_transform,
-                                                path,
-                                                transforms,
-                                                offsets,
-                                                offset_trans,
-                                                facecolors,
-                                                edgecolors,
-                                                linewidths,
-                                                dashes,
-                                                antialiaseds,
-                                                offset_position)));
-    }
-    catch (const py::exception &)
-    {
-        return NULL;
-    }
+    CALL_CPP("draw_path_collection",
+             (self->x->draw_path_collection(gc,
+                                            master_transform,
+                                            paths,
+                                            transforms,
+                                            offsets,
+                                            offset_trans,
+                                            facecolors,
+                                            edgecolors,
+                                            linewidths,
+                                            dashes,
+                                            antialiaseds)));
 
     Py_RETURN_NONE;
 }
 
-static PyObject *PyRendererAgg_draw_quad_mesh(PyRendererAgg *self, PyObject *args, PyObject *kwds)
+static PyObject *PyRendererAgg_draw_quad_mesh(PyRendererAgg *self, PyObject *args)
 {
     GCAgg gc;
     agg::trans_affine master_transform;
@@ -439,7 +422,7 @@ static PyObject *PyRendererAgg_draw_quad_mesh(PyRendererAgg *self, PyObject *arg
 }
 
 static PyObject *
-PyRendererAgg_draw_gouraud_triangle(PyRendererAgg *self, PyObject *args, PyObject *kwds)
+PyRendererAgg_draw_gouraud_triangle(PyRendererAgg *self, PyObject *args)
 {
     GCAgg gc;
     numpy::array_view<const double, 2> points;
@@ -480,7 +463,7 @@ PyRendererAgg_draw_gouraud_triangle(PyRendererAgg *self, PyObject *args, PyObjec
 }
 
 static PyObject *
-PyRendererAgg_draw_gouraud_triangles(PyRendererAgg *self, PyObject *args, PyObject *kwds)
+PyRendererAgg_draw_gouraud_triangles(PyRendererAgg *self, PyObject *args)
 {
     GCAgg gc;
     numpy::array_view<const double, 3> points;
@@ -550,14 +533,14 @@ int PyRendererAgg_get_buffer(PyRendererAgg *self, Py_buffer *buf, int flags)
     return 1;
 }
 
-static PyObject *PyRendererAgg_clear(PyRendererAgg *self, PyObject *args, PyObject *kwds)
+static PyObject *PyRendererAgg_clear(PyRendererAgg *self, PyObject *args)
 {
     CALL_CPP("clear", self->x->clear());
 
     Py_RETURN_NONE;
 }
 
-static PyObject *PyRendererAgg_copy_from_bbox(PyRendererAgg *self, PyObject *args, PyObject *kwds)
+static PyObject *PyRendererAgg_copy_from_bbox(PyRendererAgg *self, PyObject *args)
 {
     agg::rect_d bbox;
     BufferRegion *reg;
@@ -575,7 +558,7 @@ static PyObject *PyRendererAgg_copy_from_bbox(PyRendererAgg *self, PyObject *arg
     return regobj;
 }
 
-static PyObject *PyRendererAgg_restore_region(PyRendererAgg *self, PyObject *args, PyObject *kwds)
+static PyObject *PyRendererAgg_restore_region(PyRendererAgg *self, PyObject *args)
 {
     PyBufferRegion *regobj;
     int xx1 = 0, yy1 = 0, xx2 = 0, yy2 = 0, x = 0, y = 0;
@@ -602,9 +585,7 @@ static PyObject *PyRendererAgg_restore_region(PyRendererAgg *self, PyObject *arg
     Py_RETURN_NONE;
 }
 
-PyTypeObject PyRendererAggType;
-
-static PyTypeObject *PyRendererAgg_init_type(PyObject *m, PyTypeObject *type)
+static PyTypeObject *PyRendererAgg_init_type()
 {
     static PyMethodDef methods[] = {
         {"draw_path", (PyCFunction)PyRendererAgg_draw_path, METH_VARARGS, NULL},
@@ -624,64 +605,36 @@ static PyTypeObject *PyRendererAgg_init_type(PyObject *m, PyTypeObject *type)
     };
 
     static PyBufferProcs buffer_procs;
-    memset(&buffer_procs, 0, sizeof(PyBufferProcs));
     buffer_procs.bf_getbuffer = (getbufferproc)PyRendererAgg_get_buffer;
 
-    memset(type, 0, sizeof(PyTypeObject));
-    type->tp_name = "matplotlib.backends._backend_agg.RendererAgg";
-    type->tp_basicsize = sizeof(PyRendererAgg);
-    type->tp_dealloc = (destructor)PyRendererAgg_dealloc;
-    type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
-    type->tp_methods = methods;
-    type->tp_init = (initproc)PyRendererAgg_init;
-    type->tp_new = PyRendererAgg_new;
-    type->tp_as_buffer = &buffer_procs;
-
-    if (PyType_Ready(type) < 0) {
-        return NULL;
-    }
-
-    if (PyModule_AddObject(m, "RendererAgg", (PyObject *)type)) {
-        return NULL;
-    }
+    PyRendererAggType.tp_name = "matplotlib.backends._backend_agg.RendererAgg";
+    PyRendererAggType.tp_basicsize = sizeof(PyRendererAgg);
+    PyRendererAggType.tp_dealloc = (destructor)PyRendererAgg_dealloc;
+    PyRendererAggType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
+    PyRendererAggType.tp_methods = methods;
+    PyRendererAggType.tp_init = (initproc)PyRendererAgg_init;
+    PyRendererAggType.tp_new = PyRendererAgg_new;
+    PyRendererAggType.tp_as_buffer = &buffer_procs;
 
-    return type;
+    return &PyRendererAggType;
 }
 
-static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT,
-    "_backend_agg",
-    NULL,
-    0,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL
-};
+static struct PyModuleDef moduledef = { PyModuleDef_HEAD_INIT, "_backend_agg" };
 
 #pragma GCC visibility push(default)
 
 PyMODINIT_FUNC PyInit__backend_agg(void)
 {
-    PyObject *m;
-
-    m = PyModule_Create(&moduledef);
-
-    if (m == NULL) {
-        return NULL;
-    }
-
     import_array();
-
-    if (!PyRendererAgg_init_type(m, &PyRendererAggType)) {
-        return NULL;
-    }
-
-    if (!PyBufferRegion_init_type(m, &PyBufferRegionType)) {
+    PyObject *m;
+    if (!(m = PyModule_Create(&moduledef))
+        || prepare_and_add_type(PyRendererAgg_init_type(), m)
+        // BufferRegion is not constructible from Python, thus not added to the module.
+        || PyType_Ready(PyBufferRegion_init_type())
+       ) {
+        Py_XDECREF(m);
         return NULL;
     }
-
     return m;
 }
 
diff --git a/src/_c_internal_utils.c b/src/_c_internal_utils.c
index 4a61fe5b6ee7..f340f0397203 100644
--- a/src/_c_internal_utils.c
+++ b/src/_c_internal_utils.c
@@ -68,7 +68,13 @@ mpl_GetCurrentProcessExplicitAppUserModelID(PyObject* module)
     wchar_t* appid = NULL;
     HRESULT hr = GetCurrentProcessExplicitAppUserModelID(&appid);
     if (FAILED(hr)) {
+#if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x07030600
+        /* Remove when we require PyPy 7.3.6 */
+        PyErr_SetFromWindowsErr(hr);
+        return NULL;
+#else
         return PyErr_SetFromWindowsErr(hr);
+#endif
     }
     PyObject* py_appid = PyUnicode_FromWideChar(appid, -1);
     CoTaskMemFree(appid);
@@ -89,7 +95,13 @@ mpl_SetCurrentProcessExplicitAppUserModelID(PyObject* module, PyObject* arg)
     HRESULT hr = SetCurrentProcessExplicitAppUserModelID(appid);
     PyMem_Free(appid);
     if (FAILED(hr)) {
+#if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x07030600
+        /* Remove when we require PyPy 7.3.6 */
+        PyErr_SetFromWindowsErr(hr);
+        return NULL;
+#else
         return PyErr_SetFromWindowsErr(hr);
+#endif
     }
     Py_RETURN_NONE;
 #else
@@ -124,36 +136,85 @@ mpl_SetForegroundWindow(PyObject* module, PyObject *arg)
 #endif
 }
 
+static PyObject*
+mpl_SetProcessDpiAwareness_max(PyObject* module)
+{
+#ifdef _WIN32
+#ifdef _DPI_AWARENESS_CONTEXTS_
+    // These functions and options were added in later Windows 10 updates, so
+    // must be loaded dynamically.
+    typedef BOOL (WINAPI *IsValidDpiAwarenessContext_t)(DPI_AWARENESS_CONTEXT);
+    typedef BOOL (WINAPI *SetProcessDpiAwarenessContext_t)(DPI_AWARENESS_CONTEXT);
+
+    HMODULE user32 = LoadLibrary("user32.dll");
+    IsValidDpiAwarenessContext_t IsValidDpiAwarenessContextPtr =
+        (IsValidDpiAwarenessContext_t)GetProcAddress(
+            user32, "IsValidDpiAwarenessContext");
+    SetProcessDpiAwarenessContext_t SetProcessDpiAwarenessContextPtr =
+        (SetProcessDpiAwarenessContext_t)GetProcAddress(
+            user32, "SetProcessDpiAwarenessContext");
+    DPI_AWARENESS_CONTEXT ctxs[3] = {
+        DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2,  // Win10 Creators Update
+        DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE,     // Win10
+        DPI_AWARENESS_CONTEXT_SYSTEM_AWARE};         // Win10
+    if (IsValidDpiAwarenessContextPtr != NULL
+            && SetProcessDpiAwarenessContextPtr != NULL) {
+        for (int i = 0; i < sizeof(ctxs) / sizeof(DPI_AWARENESS_CONTEXT); ++i) {
+            if (IsValidDpiAwarenessContextPtr(ctxs[i])) {
+                SetProcessDpiAwarenessContextPtr(ctxs[i]);
+                break;
+            }
+        }
+    } else {
+        // Added in Windows Vista.
+        SetProcessDPIAware();
+    }
+    FreeLibrary(user32);
+#else
+    // Added in Windows Vista.
+    SetProcessDPIAware();
+#endif
+#endif
+    Py_RETURN_NONE;
+}
+
 static PyMethodDef functions[] = {
     {"display_is_valid", (PyCFunction)mpl_display_is_valid, METH_NOARGS,
      "display_is_valid()\n--\n\n"
      "Check whether the current X11 or Wayland display is valid.\n\n"
      "On Linux, returns True if either $DISPLAY is set and XOpenDisplay(NULL)\n"
      "succeeds, or $WAYLAND_DISPLAY is set and wl_display_connect(NULL)\n"
-     "succeeds.  On other platforms, always returns True."},
+     "succeeds.\n\n"
+     "On other platforms, always returns True."},
     {"Win32_GetCurrentProcessExplicitAppUserModelID",
      (PyCFunction)mpl_GetCurrentProcessExplicitAppUserModelID, METH_NOARGS,
      "Win32_GetCurrentProcessExplicitAppUserModelID()\n--\n\n"
-     "Wrapper for Windows's GetCurrentProcessExplicitAppUserModelID.  On \n"
-     "non-Windows platforms, always returns None."},
+     "Wrapper for Windows's GetCurrentProcessExplicitAppUserModelID.\n\n"
+     "On non-Windows platforms, always returns None."},
     {"Win32_SetCurrentProcessExplicitAppUserModelID",
      (PyCFunction)mpl_SetCurrentProcessExplicitAppUserModelID, METH_O,
      "Win32_SetCurrentProcessExplicitAppUserModelID(appid, /)\n--\n\n"
-     "Wrapper for Windows's SetCurrentProcessExplicitAppUserModelID.  On \n"
-     "non-Windows platforms, a no-op."},
+     "Wrapper for Windows's SetCurrentProcessExplicitAppUserModelID.\n\n"
+     "On non-Windows platforms, does nothing."},
     {"Win32_GetForegroundWindow",
      (PyCFunction)mpl_GetForegroundWindow, METH_NOARGS,
      "Win32_GetForegroundWindow()\n--\n\n"
-     "Wrapper for Windows' GetForegroundWindow.  On non-Windows platforms, \n"
-     "always returns None."},
+     "Wrapper for Windows' GetForegroundWindow.\n\n"
+     "On non-Windows platforms, always returns None."},
     {"Win32_SetForegroundWindow",
      (PyCFunction)mpl_SetForegroundWindow, METH_O,
      "Win32_SetForegroundWindow(hwnd, /)\n--\n\n"
-     "Wrapper for Windows' SetForegroundWindow.  On non-Windows platforms, \n"
-     "a no-op."},
+     "Wrapper for Windows' SetForegroundWindow.\n\n"
+     "On non-Windows platforms, does nothing."},
+    {"Win32_SetProcessDpiAwareness_max",
+     (PyCFunction)mpl_SetProcessDpiAwareness_max, METH_NOARGS,
+     "Win32_SetProcessDpiAwareness_max()\n--\n\n"
+     "Set Windows' process DPI awareness to best option available.\n\n"
+     "On non-Windows platforms, does nothing."},
     {NULL, NULL}};  // sentinel.
 static PyModuleDef util_module = {
-    PyModuleDef_HEAD_INIT, "_c_internal_utils", "", 0, functions, NULL, NULL, NULL, NULL};
+    PyModuleDef_HEAD_INIT, "_c_internal_utils", NULL, 0, functions
+};
 
 #pragma GCC visibility push(default)
 PyMODINIT_FUNC PyInit__c_internal_utils(void)
diff --git a/src/_contour.cpp b/src/_contour.cpp
deleted file mode 100644
index ac655d73de27..000000000000
--- a/src/_contour.cpp
+++ /dev/null
@@ -1,1784 +0,0 @@
-// This file contains liberal use of asserts to assist code development and
-// debugging.  Standard matplotlib builds disable asserts so they cause no
-// performance reduction.  To enable the asserts, you need to undefine the
-// NDEBUG macro, which is achieved by adding the following
-//     undef_macros=['NDEBUG']
-// to the appropriate make_extension call in setupext.py, and then rebuilding.
-#define NO_IMPORT_ARRAY
-
-#include "mplutils.h"
-#include "_contour.h"
-#include <algorithm>
-
-
-// 'kind' codes.
-#define MOVETO 1
-#define LINETO 2
-#define CLOSEPOLY 79
-
-// Point indices from current quad index.
-#define POINT_SW (quad)
-#define POINT_SE (quad+1)
-#define POINT_NW (quad+_nx)
-#define POINT_NE (quad+_nx+1)
-
-// CacheItem masks, only accessed directly to set.  To read, use accessors
-// detailed below.  1 and 2 refer to level indices (lower and upper).
-#define MASK_Z_LEVEL           0x0003 // Combines the following two.
-#define MASK_Z_LEVEL_1         0x0001 // z > lower_level.
-#define MASK_Z_LEVEL_2         0x0002 // z > upper_level.
-#define MASK_VISITED_1         0x0004 // Algorithm has visited this quad.
-#define MASK_VISITED_2         0x0008
-#define MASK_SADDLE_1          0x0010 // quad is a saddle quad.
-#define MASK_SADDLE_2          0x0020
-#define MASK_SADDLE_LEFT_1     0x0040 // Contours turn left at saddle quad.
-#define MASK_SADDLE_LEFT_2     0x0080
-#define MASK_SADDLE_START_SW_1 0x0100 // Next visit starts on S or W edge.
-#define MASK_SADDLE_START_SW_2 0x0200
-#define MASK_BOUNDARY_S        0x0400 // S edge of quad is a boundary.
-#define MASK_BOUNDARY_W        0x0800 // W edge of quad is a boundary.
-// EXISTS_QUAD bit is always used, but the 4 EXISTS_CORNER are only used if
-// _corner_mask is true.  Only one of EXISTS_QUAD or EXISTS_??_CORNER is ever
-// set per quad, hence not using unique bits for each; care is needed when
-// testing for these flags as they overlap.
-#define MASK_EXISTS_QUAD       0x1000 // All of quad exists (is not masked).
-#define MASK_EXISTS_SW_CORNER  0x2000 // SW corner exists, NE corner is masked.
-#define MASK_EXISTS_SE_CORNER  0x3000
-#define MASK_EXISTS_NW_CORNER  0x4000
-#define MASK_EXISTS_NE_CORNER  0x5000
-#define MASK_EXISTS            0x7000 // Combines all 5 EXISTS masks.
-
-// The following are only needed for filled contours.
-#define MASK_VISITED_S        0x10000 // Algorithm has visited S boundary.
-#define MASK_VISITED_W        0x20000 // Algorithm has visited W boundary.
-#define MASK_VISITED_CORNER   0x40000 // Algorithm has visited corner edge.
-
-
-// Accessors for various CacheItem masks.  li is shorthand for level_index.
-#define Z_LEVEL(quad)            (_cache[quad] & MASK_Z_LEVEL)
-#define Z_NE                     Z_LEVEL(POINT_NE)
-#define Z_NW                     Z_LEVEL(POINT_NW)
-#define Z_SE                     Z_LEVEL(POINT_SE)
-#define Z_SW                     Z_LEVEL(POINT_SW)
-#define VISITED(quad,li)         ((_cache[quad] & (li==1 ? MASK_VISITED_1 : MASK_VISITED_2)) != 0)
-#define VISITED_S(quad)          ((_cache[quad] & MASK_VISITED_S) != 0)
-#define VISITED_W(quad)          ((_cache[quad] & MASK_VISITED_W) != 0)
-#define VISITED_CORNER(quad)     ((_cache[quad] & MASK_VISITED_CORNER) != 0)
-#define SADDLE(quad,li)          ((_cache[quad] & (li==1 ? MASK_SADDLE_1 : MASK_SADDLE_2)) != 0)
-#define SADDLE_LEFT(quad,li)     ((_cache[quad] & (li==1 ? MASK_SADDLE_LEFT_1 : MASK_SADDLE_LEFT_2)) != 0)
-#define SADDLE_START_SW(quad,li) ((_cache[quad] & (li==1 ? MASK_SADDLE_START_SW_1 : MASK_SADDLE_START_SW_2)) != 0)
-#define BOUNDARY_S(quad)         ((_cache[quad] & MASK_BOUNDARY_S) != 0)
-#define BOUNDARY_W(quad)         ((_cache[quad] & MASK_BOUNDARY_W) != 0)
-#define BOUNDARY_N(quad)         BOUNDARY_S(quad+_nx)
-#define BOUNDARY_E(quad)         BOUNDARY_W(quad+1)
-#define EXISTS_QUAD(quad)        ((_cache[quad] & MASK_EXISTS) == MASK_EXISTS_QUAD)
-#define EXISTS_NONE(quad)        ((_cache[quad] & MASK_EXISTS) == 0)
-// The following are only used if _corner_mask is true.
-#define EXISTS_SW_CORNER(quad)   ((_cache[quad] & MASK_EXISTS) == MASK_EXISTS_SW_CORNER)
-#define EXISTS_SE_CORNER(quad)   ((_cache[quad] & MASK_EXISTS) == MASK_EXISTS_SE_CORNER)
-#define EXISTS_NW_CORNER(quad)   ((_cache[quad] & MASK_EXISTS) == MASK_EXISTS_NW_CORNER)
-#define EXISTS_NE_CORNER(quad)   ((_cache[quad] & MASK_EXISTS) == MASK_EXISTS_NE_CORNER)
-#define EXISTS_ANY_CORNER(quad)  (!EXISTS_NONE(quad) && !EXISTS_QUAD(quad))
-#define EXISTS_W_EDGE(quad)      (EXISTS_QUAD(quad) || EXISTS_SW_CORNER(quad) || EXISTS_NW_CORNER(quad))
-#define EXISTS_E_EDGE(quad)      (EXISTS_QUAD(quad) || EXISTS_SE_CORNER(quad) || EXISTS_NE_CORNER(quad))
-#define EXISTS_S_EDGE(quad)      (EXISTS_QUAD(quad) || EXISTS_SW_CORNER(quad) || EXISTS_SE_CORNER(quad))
-#define EXISTS_N_EDGE(quad)      (EXISTS_QUAD(quad) || EXISTS_NW_CORNER(quad) || EXISTS_NE_CORNER(quad))
-// Note that EXISTS_NE_CORNER(quad) is equivalent to BOUNDARY_SW(quad), etc.
-
-
-
-QuadEdge::QuadEdge()
-    : quad(-1), edge(Edge_None)
-{}
-
-QuadEdge::QuadEdge(long quad_, Edge edge_)
-    : quad(quad_), edge(edge_)
-{}
-
-bool QuadEdge::operator<(const QuadEdge& other) const
-{
-    if (quad != other.quad)
-        return quad < other.quad;
-    else
-        return edge < other.edge;
-}
-
-bool QuadEdge::operator==(const QuadEdge& other) const
-{
-    return quad == other.quad && edge == other.edge;
-}
-
-bool QuadEdge::operator!=(const QuadEdge& other) const
-{
-    return !operator==(other);
-}
-
-std::ostream& operator<<(std::ostream& os, const QuadEdge& quad_edge)
-{
-    return os << quad_edge.quad << ' ' << quad_edge.edge;
-}
-
-
-
-XY::XY()
-{}
-
-XY::XY(const double& x_, const double& y_)
-    : x(x_), y(y_)
-{}
-
-bool XY::operator==(const XY& other) const
-{
-    return x == other.x && y == other.y;
-}
-
-bool XY::operator!=(const XY& other) const
-{
-    return x != other.x || y != other.y;
-}
-
-XY XY::operator*(const double& multiplier) const
-{
-    return XY(x*multiplier, y*multiplier);
-}
-
-const XY& XY::operator+=(const XY& other)
-{
-    x += other.x;
-    y += other.y;
-    return *this;
-}
-
-const XY& XY::operator-=(const XY& other)
-{
-    x -= other.x;
-    y -= other.y;
-    return *this;
-}
-
-XY XY::operator+(const XY& other) const
-{
-    return XY(x + other.x, y + other.y);
-}
-
-XY XY::operator-(const XY& other) const
-{
-    return XY(x - other.x, y - other.y);
-}
-
-std::ostream& operator<<(std::ostream& os, const XY& xy)
-{
-    return os << '(' << xy.x << ' ' << xy.y << ')';
-}
-
-
-
-ContourLine::ContourLine(bool is_hole)
-    : std::vector<XY>(),
-      _is_hole(is_hole),
-      _parent(0)
-{}
-
-void ContourLine::add_child(ContourLine* child)
-{
-    assert(!_is_hole && "Cannot add_child to a hole");
-    assert(child != 0 && "Null child ContourLine");
-    _children.push_back(child);
-}
-
-void ContourLine::clear_parent()
-{
-    assert(is_hole() && "Cannot clear parent of non-hole");
-    assert(_parent != 0 && "Null parent ContourLine");
-    _parent = 0;
-}
-
-const ContourLine::Children& ContourLine::get_children() const
-{
-    assert(!_is_hole && "Cannot get_children of a hole");
-    return _children;
-}
-
-const ContourLine* ContourLine::get_parent() const
-{
-    assert(_is_hole && "Cannot get_parent of a non-hole");
-    return _parent;
-}
-
-ContourLine* ContourLine::get_parent()
-{
-    assert(_is_hole && "Cannot get_parent of a non-hole");
-    return _parent;
-}
-
-bool ContourLine::is_hole() const
-{
-    return _is_hole;
-}
-
-void ContourLine::push_back(const XY& point)
-{
-    if (empty() || point != back())
-        std::vector<XY>::push_back(point);
-}
-
-void ContourLine::set_parent(ContourLine* parent)
-{
-    assert(_is_hole && "Cannot set parent of a non-hole");
-    assert(parent != 0 && "Null parent ContourLine");
-    _parent = parent;
-}
-
-void ContourLine::write() const
-{
-    std::cout << "ContourLine " << this << " of " << size() << " points:";
-    for (const_iterator it = begin(); it != end(); ++it)
-        std::cout << ' ' << *it;
-    if (is_hole())
-        std::cout << " hole, parent=" << get_parent();
-    else {
-        std::cout << " not hole";
-        if (!_children.empty()) {
-            std::cout << ", children=";
-            for (Children::const_iterator it = _children.begin();
-                 it != _children.end(); ++it)
-                std::cout << *it << ' ';
-        }
-    }
-    std::cout << std::endl;
-}
-
-
-
-Contour::Contour()
-{}
-
-Contour::~Contour()
-{
-    delete_contour_lines();
-}
-
-void Contour::delete_contour_lines()
-{
-    for (iterator line_it = begin(); line_it != end(); ++line_it) {
-        delete *line_it;
-        *line_it = 0;
-    }
-    std::vector<ContourLine*>::clear();
-}
-
-void Contour::write() const
-{
-    std::cout << "Contour of " << size() << " lines." << std::endl;
-    for (const_iterator it = begin(); it != end(); ++it)
-        (*it)->write();
-}
-
-
-
-ParentCache::ParentCache(long nx, long x_chunk_points, long y_chunk_points)
-    : _nx(nx),
-      _x_chunk_points(x_chunk_points),
-      _y_chunk_points(y_chunk_points),
-      _lines(0),  // Initialised when first needed.
-      _istart(0),
-      _jstart(0)
-{
-    assert(_x_chunk_points > 0 && _y_chunk_points > 0 &&
-           "Chunk sizes must be positive");
-}
-
-ContourLine* ParentCache::get_parent(long quad)
-{
-    long index = quad_to_index(quad);
-    ContourLine* parent = _lines[index];
-    while (parent == 0) {
-        index -= _x_chunk_points;
-        assert(index >= 0 && "Failed to find parent in chunk ParentCache");
-        parent = _lines[index];
-    }
-    assert(parent != 0 && "Failed to find parent in chunk ParentCache");
-    return parent;
-}
-
-long ParentCache::quad_to_index(long quad) const
-{
-    long i = quad % _nx;
-    long j = quad / _nx;
-    long index = (i-_istart) + (j-_jstart)*_x_chunk_points;
-
-    assert(i >= _istart && i < _istart + _x_chunk_points &&
-           "i-index outside chunk");
-    assert(j >= _jstart && j < _jstart + _y_chunk_points &&
-           "j-index outside chunk");
-    assert(index >= 0 && index < static_cast<long>(_lines.size()) &&
-           "ParentCache index outside chunk");
-
-    return index;
-}
-
-void ParentCache::set_chunk_starts(long istart, long jstart)
-{
-    assert(istart >= 0 && jstart >= 0 &&
-           "Chunk start indices cannot be negative");
-    _istart = istart;
-    _jstart = jstart;
-    if (_lines.empty())
-        _lines.resize(_x_chunk_points*_y_chunk_points, 0);
-    else
-        std::fill(_lines.begin(), _lines.end(), (ContourLine*)0);
-}
-
-void ParentCache::set_parent(long quad, ContourLine& contour_line)
-{
-    assert(!_lines.empty() &&
-           "Accessing ParentCache before it has been initialised");
-    long index = quad_to_index(quad);
-    if (_lines[index] == 0)
-        _lines[index] = (contour_line.is_hole() ? contour_line.get_parent()
-                                                : &contour_line);
-}
-
-
-
-QuadContourGenerator::QuadContourGenerator(const CoordinateArray& x,
-                                           const CoordinateArray& y,
-                                           const CoordinateArray& z,
-                                           const MaskArray& mask,
-                                           bool corner_mask,
-                                           long chunk_size)
-    : _x(x),
-      _y(y),
-      _z(z),
-      _nx(static_cast<long>(_x.dim(1))),
-      _ny(static_cast<long>(_x.dim(0))),
-      _n(_nx*_ny),
-      _corner_mask(corner_mask),
-      _chunk_size(chunk_size > 0 ? std::min(chunk_size, std::max(_nx, _ny)-1)
-                                 : std::max(_nx, _ny)-1),
-      _nxchunk(calc_chunk_count(_nx)),
-      _nychunk(calc_chunk_count(_ny)),
-      _chunk_count(_nxchunk*_nychunk),
-      _cache(new CacheItem[_n]),
-      _parent_cache(_nx,
-                    chunk_size > 0 ? chunk_size+1 : _nx,
-                    chunk_size > 0 ? chunk_size+1 : _ny)
-{
-    assert(!_x.empty() && !_y.empty() && !_z.empty() && "Empty array");
-    assert(_y.dim(0) == _x.dim(0) && _y.dim(1) == _x.dim(1) &&
-           "Different-sized y and x arrays");
-    assert(_z.dim(0) == _x.dim(0) && _z.dim(1) == _x.dim(1) &&
-           "Different-sized z and x arrays");
-    assert((mask.empty() ||
-           (mask.dim(0) == _x.dim(0) && mask.dim(1) == _x.dim(1))) &&
-           "Different-sized mask and x arrays");
-
-    init_cache_grid(mask);
-}
-
-QuadContourGenerator::~QuadContourGenerator()
-{
-    delete [] _cache;
-}
-
-void QuadContourGenerator::append_contour_line_to_vertices(
-    ContourLine& contour_line,
-    PyObject* vertices_list) const
-{
-    assert(vertices_list != 0 && "Null python vertices_list");
-
-    // Convert ContourLine to python equivalent, and clear it.
-    npy_intp dims[2] = {static_cast<npy_intp>(contour_line.size()), 2};
-    numpy::array_view<double, 2> line(dims);
-    npy_intp i = 0;
-    for (ContourLine::const_iterator point = contour_line.begin();
-         point != contour_line.end(); ++point, ++i) {
-        line(i, 0) = point->x;
-        line(i, 1) = point->y;
-    }
-    if (PyList_Append(vertices_list, line.pyobj_steal())) {
-        Py_XDECREF(vertices_list);
-        throw std::runtime_error("Unable to add contour line to vertices_list");
-    }
-
-    contour_line.clear();
-}
-
-void QuadContourGenerator::append_contour_to_vertices_and_codes(
-    Contour& contour,
-    PyObject* vertices_list,
-    PyObject* codes_list) const
-{
-    assert(vertices_list != 0 && "Null python vertices_list");
-    assert(codes_list != 0 && "Null python codes_list");
-
-    // Convert Contour to python equivalent, and clear it.
-    for (Contour::iterator line_it = contour.begin(); line_it != contour.end();
-         ++line_it) {
-        ContourLine& line = **line_it;
-        if (line.is_hole()) {
-            // If hole has already been converted to python its parent will be
-            // set to 0 and it can be deleted.
-            if (line.get_parent() != 0) {
-                delete *line_it;
-                *line_it = 0;
-            }
-        }
-        else {
-            // Non-holes are converted to python together with their child
-            // holes so that they are rendered correctly.
-            ContourLine::const_iterator point;
-            ContourLine::Children::const_iterator children_it;
-
-            const ContourLine::Children& children = line.get_children();
-            npy_intp npoints = static_cast<npy_intp>(line.size() + 1);
-            for (children_it = children.begin(); children_it != children.end();
-                 ++children_it)
-                 npoints += static_cast<npy_intp>((*children_it)->size() + 1);
-
-            npy_intp vertices_dims[2] = {npoints, 2};
-            numpy::array_view<double, 2> vertices(vertices_dims);
-            double* vertices_ptr = vertices.data();
-
-            npy_intp codes_dims[1] = {npoints};
-            numpy::array_view<unsigned char, 1> codes(codes_dims);
-            unsigned char* codes_ptr = codes.data();
-
-            for (point = line.begin(); point != line.end(); ++point) {
-                *vertices_ptr++ = point->x;
-                *vertices_ptr++ = point->y;
-                *codes_ptr++ = (point == line.begin() ? MOVETO : LINETO);
-            }
-            point = line.begin();
-            *vertices_ptr++ = point->x;
-            *vertices_ptr++ = point->y;
-            *codes_ptr++ = CLOSEPOLY;
-
-            for (children_it = children.begin(); children_it != children.end();
-                 ++children_it) {
-                ContourLine& child = **children_it;
-                for (point = child.begin(); point != child.end(); ++point) {
-                    *vertices_ptr++ = point->x;
-                    *vertices_ptr++ = point->y;
-                    *codes_ptr++ = (point == child.begin() ? MOVETO : LINETO);
-                }
-                point = child.begin();
-                *vertices_ptr++ = point->x;
-                *vertices_ptr++ = point->y;
-                *codes_ptr++ = CLOSEPOLY;
-
-                child.clear_parent();  // To indicate it can be deleted.
-            }
-
-            if (PyList_Append(vertices_list, vertices.pyobj_steal()) ||
-                PyList_Append(codes_list, codes.pyobj_steal())) {
-                Py_XDECREF(vertices_list);
-                Py_XDECREF(codes_list);
-                contour.delete_contour_lines();
-                throw std::runtime_error("Unable to add contour line to vertices and codes lists");
-            }
-
-            delete *line_it;
-            *line_it = 0;
-        }
-    }
-
-    // Delete remaining contour lines.
-    contour.delete_contour_lines();
-}
-
-long QuadContourGenerator::calc_chunk_count(long point_count) const
-{
-    assert(point_count > 0 && "point count must be positive");
-    assert(_chunk_size > 0 && "Chunk size must be positive");
-
-    if (_chunk_size > 0) {
-        long count = (point_count-1) / _chunk_size;
-        if (count*_chunk_size < point_count-1)
-            ++count;
-
-        assert(count >= 1 && "Invalid chunk count");
-        return count;
-    }
-    else
-        return 1;
-}
-
-PyObject* QuadContourGenerator::create_contour(const double& level)
-{
-    init_cache_levels(level, level);
-
-    PyObject* vertices_list = PyList_New(0);
-    if (vertices_list == 0)
-        throw std::runtime_error("Failed to create Python list");
-
-    // Lines that start and end on boundaries.
-    long ichunk, jchunk, istart, iend, jstart, jend;
-    for (long ijchunk = 0; ijchunk < _chunk_count; ++ijchunk) {
-        get_chunk_limits(ijchunk, ichunk, jchunk, istart, iend, jstart, jend);
-
-        for (long j = jstart; j < jend; ++j) {
-            long quad_end = iend + j*_nx;
-            for (long quad = istart + j*_nx; quad < quad_end; ++quad) {
-                if (EXISTS_NONE(quad) || VISITED(quad,1)) continue;
-
-                if (BOUNDARY_S(quad) && Z_SW >= 1 && Z_SE < 1 &&
-                    start_line(vertices_list, quad, Edge_S, level)) continue;
-
-                if (BOUNDARY_W(quad) && Z_NW >= 1 && Z_SW < 1 &&
-                    start_line(vertices_list, quad, Edge_W, level)) continue;
-
-                if (BOUNDARY_N(quad) && Z_NE >= 1 && Z_NW < 1 &&
-                    start_line(vertices_list, quad, Edge_N, level)) continue;
-
-                if (BOUNDARY_E(quad) && Z_SE >= 1 && Z_NE < 1 &&
-                    start_line(vertices_list, quad, Edge_E, level)) continue;
-
-                if (_corner_mask) {
-                    // Equates to NE boundary.
-                    if (EXISTS_SW_CORNER(quad) && Z_SE >= 1 && Z_NW < 1 &&
-                        start_line(vertices_list, quad, Edge_NE, level)) continue;
-
-                    // Equates to NW boundary.
-                    if (EXISTS_SE_CORNER(quad) && Z_NE >= 1 && Z_SW < 1 &&
-                        start_line(vertices_list, quad, Edge_NW, level)) continue;
-
-                    // Equates to SE boundary.
-                    if (EXISTS_NW_CORNER(quad) && Z_SW >= 1 && Z_NE < 1 &&
-                        start_line(vertices_list, quad, Edge_SE, level)) continue;
-
-                    // Equates to SW boundary.
-                    if (EXISTS_NE_CORNER(quad) && Z_NW >= 1 && Z_SE < 1 &&
-                        start_line(vertices_list, quad, Edge_SW, level)) continue;
-                }
-            }
-        }
-    }
-
-    // Internal loops.
-    ContourLine contour_line(false);  // Reused for each contour line.
-    for (long ijchunk = 0; ijchunk < _chunk_count; ++ijchunk) {
-        get_chunk_limits(ijchunk, ichunk, jchunk, istart, iend, jstart, jend);
-
-        for (long j = jstart; j < jend; ++j) {
-            long quad_end = iend + j*_nx;
-            for (long quad = istart + j*_nx; quad < quad_end; ++quad) {
-                if (EXISTS_NONE(quad) || VISITED(quad,1))
-                    continue;
-
-                Edge start_edge = get_start_edge(quad, 1);
-                if (start_edge == Edge_None)
-                    continue;
-
-                QuadEdge quad_edge(quad, start_edge);
-                QuadEdge start_quad_edge(quad_edge);
-
-                // To obtain output identical to that produced by legacy code,
-                // sometimes need to ignore the first point and add it on the
-                // end instead.
-                bool ignore_first = (start_edge == Edge_N);
-                follow_interior(contour_line, quad_edge, 1, level,
-                                !ignore_first, &start_quad_edge, 1, false);
-                if (ignore_first && !contour_line.empty())
-                    contour_line.push_back(contour_line.front());
-                append_contour_line_to_vertices(contour_line, vertices_list);
-
-                // Repeat if saddle point but not visited.
-                if (SADDLE(quad,1) && !VISITED(quad,1))
-                    --quad;
-            }
-        }
-    }
-
-    return vertices_list;
-}
-
-PyObject* QuadContourGenerator::create_filled_contour(const double& lower_level,
-                                                      const double& upper_level)
-{
-    init_cache_levels(lower_level, upper_level);
-
-    Contour contour;
-
-    PyObject* vertices = PyList_New(0);
-    if (vertices == 0)
-        throw std::runtime_error("Failed to create Python list");
-
-    PyObject* codes = PyList_New(0);
-    if (codes == 0) {
-        Py_XDECREF(vertices);
-        throw std::runtime_error("Failed to create Python list");
-    }
-
-    long ichunk, jchunk, istart, iend, jstart, jend;
-    for (long ijchunk = 0; ijchunk < _chunk_count; ++ijchunk) {
-        get_chunk_limits(ijchunk, ichunk, jchunk, istart, iend, jstart, jend);
-        _parent_cache.set_chunk_starts(istart, jstart);
-
-        for (long j = jstart; j < jend; ++j) {
-            long quad_end = iend + j*_nx;
-            for (long quad = istart + j*_nx; quad < quad_end; ++quad) {
-                if (!EXISTS_NONE(quad))
-                    single_quad_filled(contour, quad, lower_level, upper_level);
-            }
-        }
-
-        // Clear VISITED_W and VISITED_S flags that are reused by later chunks.
-        if (jchunk < _nychunk-1) {
-            long quad_end = iend + jend*_nx;
-            for (long quad = istart + jend*_nx; quad < quad_end; ++quad)
-                _cache[quad] &= ~MASK_VISITED_S;
-        }
-
-        if (ichunk < _nxchunk-1) {
-            long quad_end = iend + jend*_nx;
-            for (long quad = iend + jstart*_nx; quad < quad_end; quad += _nx)
-                _cache[quad] &= ~MASK_VISITED_W;
-        }
-
-        // Create python objects to return for this chunk.
-        append_contour_to_vertices_and_codes(contour, vertices, codes);
-    }
-
-    PyObject* tuple = PyTuple_New(2);
-    if (tuple == 0) {
-        Py_XDECREF(vertices);
-        Py_XDECREF(codes);
-        throw std::runtime_error("Failed to create Python tuple");
-    }
-
-    // No error checking here as filling in a brand new pre-allocated tuple.
-    PyTuple_SET_ITEM(tuple, 0, vertices);
-    PyTuple_SET_ITEM(tuple, 1, codes);
-
-    return tuple;
-}
-
-XY QuadContourGenerator::edge_interp(const QuadEdge& quad_edge,
-                                     const double& level)
-{
-    assert(quad_edge.quad >= 0 && quad_edge.quad < _n &&
-           "Quad index out of bounds");
-    assert(quad_edge.edge != Edge_None && "Invalid edge");
-    return interp(get_edge_point_index(quad_edge, true),
-                  get_edge_point_index(quad_edge, false),
-                  level);
-}
-
-unsigned int QuadContourGenerator::follow_boundary(
-    ContourLine& contour_line,
-    QuadEdge& quad_edge,
-    const double& lower_level,
-    const double& upper_level,
-    unsigned int level_index,
-    const QuadEdge& start_quad_edge)
-{
-    assert(quad_edge.quad >= 0 && quad_edge.quad < _n &&
-           "Quad index out of bounds");
-    assert(quad_edge.edge != Edge_None && "Invalid edge");
-    assert(is_edge_a_boundary(quad_edge) && "Not a boundary edge");
-    assert((level_index == 1 || level_index == 2) &&
-           "level index must be 1 or 2");
-    assert(start_quad_edge.quad >= 0 && start_quad_edge.quad < _n &&
-           "Start quad index out of bounds");
-    assert(start_quad_edge.edge != Edge_None && "Invalid start edge");
-
-    // Only called for filled contours, so always updates _parent_cache.
-    unsigned int end_level = 0;
-    bool first_edge = true;
-    bool stop = false;
-    long& quad = quad_edge.quad;
-
-    while (true) {
-        // Levels of start and end points of quad_edge.
-        unsigned int start_level =
-            (first_edge ? Z_LEVEL(get_edge_point_index(quad_edge, true))
-                        : end_level);
-        long end_point = get_edge_point_index(quad_edge, false);
-        end_level = Z_LEVEL(end_point);
-
-        if (level_index == 1) {
-            if (start_level <= level_index && end_level == 2) {
-                // Increasing z, switching levels from 1 to 2.
-                level_index = 2;
-                stop = true;
-            }
-            else if (start_level >= 1 && end_level == 0) {
-                // Decreasing z, keeping same level.
-                stop = true;
-            }
-        }
-        else { // level_index == 2
-            if (start_level <= level_index && end_level == 2) {
-                // Increasing z, keeping same level.
-                stop = true;
-            }
-            else if (start_level >= 1 && end_level == 0) {
-                // Decreasing z, switching levels from 2 to 1.
-                level_index = 1;
-                stop = true;
-            }
-        }
-
-        if (!first_edge && !stop && quad_edge == start_quad_edge)
-            // Return if reached start point of contour line.  Do this before
-            // checking/setting VISITED flags as will already have been
-            // visited.
-            break;
-
-        switch (quad_edge.edge) {
-            case Edge_E:
-                assert(!VISITED_W(quad+1) && "Already visited");
-                _cache[quad+1] |= MASK_VISITED_W;
-                break;
-            case Edge_N:
-                assert(!VISITED_S(quad+_nx) && "Already visited");
-                _cache[quad+_nx] |= MASK_VISITED_S;
-                break;
-            case Edge_W:
-                assert(!VISITED_W(quad) && "Already visited");
-                _cache[quad] |= MASK_VISITED_W;
-                break;
-            case Edge_S:
-               assert(!VISITED_S(quad) && "Already visited");
-                _cache[quad] |= MASK_VISITED_S;
-                break;
-            case Edge_NE:
-            case Edge_NW:
-            case Edge_SW:
-            case Edge_SE:
-                assert(!VISITED_CORNER(quad) && "Already visited");
-                _cache[quad] |= MASK_VISITED_CORNER;
-                break;
-            default:
-                assert(0 && "Invalid Edge");
-                break;
-        }
-
-        if (stop) {
-            // Exiting boundary to enter interior.
-            contour_line.push_back(edge_interp(quad_edge,
-                                               level_index == 1 ? lower_level
-                                                                : upper_level));
-            break;
-        }
-
-        move_to_next_boundary_edge(quad_edge);
-
-        // Just moved to new quad edge, so label parent of start of quad edge.
-        switch (quad_edge.edge) {
-            case Edge_W:
-            case Edge_SW:
-            case Edge_S:
-            case Edge_SE:
-                if (!EXISTS_SE_CORNER(quad))
-                    _parent_cache.set_parent(quad, contour_line);
-                break;
-            case Edge_E:
-            case Edge_NE:
-            case Edge_N:
-            case Edge_NW:
-                if (!EXISTS_SW_CORNER(quad))
-                    _parent_cache.set_parent(quad + 1, contour_line);
-                break;
-            default:
-                assert(0 && "Invalid edge");
-                break;
-        }
-
-        // Add point to contour.
-        contour_line.push_back(get_point_xy(end_point));
-
-        if (first_edge)
-            first_edge = false;
-    }
-
-    return level_index;
-}
-
-void QuadContourGenerator::follow_interior(ContourLine& contour_line,
-                                           QuadEdge& quad_edge,
-                                           unsigned int level_index,
-                                           const double& level,
-                                           bool want_initial_point,
-                                           const QuadEdge* start_quad_edge,
-                                           unsigned int start_level_index,
-                                           bool set_parents)
-{
-    assert(quad_edge.quad >= 0 && quad_edge.quad < _n &&
-           "Quad index out of bounds.");
-    assert(quad_edge.edge != Edge_None && "Invalid edge");
-    assert((level_index == 1 || level_index == 2) &&
-           "level index must be 1 or 2");
-    assert((start_quad_edge == 0 ||
-            (start_quad_edge->quad >= 0 && start_quad_edge->quad < _n)) &&
-           "Start quad index out of bounds.");
-    assert((start_quad_edge == 0 || start_quad_edge->edge != Edge_None) &&
-           "Invalid start edge");
-    assert((start_level_index == 1 || start_level_index == 2) &&
-           "start level index must be 1 or 2");
-
-    long& quad = quad_edge.quad;
-    Edge& edge = quad_edge.edge;
-
-    if (want_initial_point)
-        contour_line.push_back(edge_interp(quad_edge, level));
-
-    CacheItem visited_mask = (level_index == 1 ? MASK_VISITED_1 : MASK_VISITED_2);
-    CacheItem saddle_mask = (level_index == 1 ? MASK_SADDLE_1 : MASK_SADDLE_2);
-    Dir dir = Dir_Straight;
-
-    while (true) {
-        assert(!EXISTS_NONE(quad) && "Quad does not exist");
-        assert(!(_cache[quad] & visited_mask) && "Quad already visited");
-
-        // Determine direction to move to next quad.  If the quad is already
-        // labelled as a saddle quad then the direction is easily read from
-        // the cache.  Otherwise the direction is determined differently
-        // depending on whether the quad is a corner quad or not.
-
-        if (_cache[quad] & saddle_mask) {
-            // Already identified as a saddle quad, so direction is easy.
-            dir = (SADDLE_LEFT(quad,level_index) ? Dir_Left : Dir_Right);
-            _cache[quad] |= visited_mask;
-        }
-        else if (EXISTS_ANY_CORNER(quad)) {
-            // Need z-level of point opposite the entry edge, as that
-            // determines whether contour turns left or right.
-            long point_opposite = -1;
-            switch (edge) {
-                case Edge_E:
-                    point_opposite = (EXISTS_SE_CORNER(quad) ? POINT_SW
-                                                             : POINT_NW);
-                    break;
-                case Edge_N:
-                    point_opposite = (EXISTS_NW_CORNER(quad) ? POINT_SW
-                                                             : POINT_SE);
-                    break;
-                case Edge_W:
-                    point_opposite = (EXISTS_SW_CORNER(quad) ? POINT_SE
-                                                             : POINT_NE);
-                    break;
-                case Edge_S:
-                    point_opposite = (EXISTS_SW_CORNER(quad) ? POINT_NW
-                                                             : POINT_NE);
-                    break;
-                case Edge_NE: point_opposite = POINT_SW; break;
-                case Edge_NW: point_opposite = POINT_SE; break;
-                case Edge_SW: point_opposite = POINT_NE; break;
-                case Edge_SE: point_opposite = POINT_NW; break;
-                default: assert(0 && "Invalid edge"); break;
-            }
-            assert(point_opposite != -1 && "Failed to find opposite point");
-
-            // Lower-level polygons (level_index == 1) always have higher
-            // values to the left of the contour.  Upper-level contours
-            // (level_index == 2) are reversed, which is what the fancy XOR
-            // does below.
-            if ((Z_LEVEL(point_opposite) >= level_index) ^ (level_index == 2))
-                dir = Dir_Right;
-            else
-                dir = Dir_Left;
-            _cache[quad] |= visited_mask;
-        }
-        else {
-            // Calculate configuration of this quad.
-            long point_left = -1, point_right = -1;
-            switch (edge) {
-                case Edge_E: point_left = POINT_SW; point_right = POINT_NW; break;
-                case Edge_N: point_left = POINT_SE; point_right = POINT_SW; break;
-                case Edge_W: point_left = POINT_NE; point_right = POINT_SE; break;
-                case Edge_S: point_left = POINT_NW; point_right = POINT_NE; break;
-                default: assert(0 && "Invalid edge"); break;
-            }
-
-            unsigned int config = (Z_LEVEL(point_left) >= level_index) << 1 |
-                                  (Z_LEVEL(point_right) >= level_index);
-
-            // Upper level (level_index == 2) polygons are reversed compared to
-            // lower level ones, i.e. higher values on the right rather than
-            // the left.
-            if (level_index == 2)
-                config = 3 - config;
-
-            // Calculate turn direction to move to next quad along contour line.
-            if (config == 1) {
-                // New saddle quad, set up cache bits for it.
-                double zmid = 0.25*(get_point_z(POINT_SW) +
-                                    get_point_z(POINT_SE) +
-                                    get_point_z(POINT_NW) +
-                                    get_point_z(POINT_NE));
-                _cache[quad] |= (level_index == 1 ? MASK_SADDLE_1 : MASK_SADDLE_2);
-                if ((zmid > level) ^ (level_index == 2)) {
-                    dir = Dir_Right;
-                }
-                else {
-                    dir = Dir_Left;
-                    _cache[quad] |= (level_index == 1 ? MASK_SADDLE_LEFT_1
-                                                      : MASK_SADDLE_LEFT_2);
-                }
-                if (edge == Edge_N || edge == Edge_E) {
-                    // Next visit to this quad must start on S or W.
-                    _cache[quad] |= (level_index == 1 ? MASK_SADDLE_START_SW_1
-                                                      : MASK_SADDLE_START_SW_2);
-                }
-            }
-            else {
-                // Normal (non-saddle) quad.
-                dir = (config == 0 ? Dir_Left
-                                   : (config == 3 ? Dir_Right : Dir_Straight));
-                _cache[quad] |= visited_mask;
-            }
-        }
-
-        // Use dir to determine exit edge.
-        edge = get_exit_edge(quad_edge, dir);
-
-        if (set_parents) {
-            if (edge == Edge_E)
-                _parent_cache.set_parent(quad+1, contour_line);
-            else if (edge == Edge_W)
-                _parent_cache.set_parent(quad, contour_line);
-        }
-
-        // Add new point to contour line.
-        contour_line.push_back(edge_interp(quad_edge, level));
-
-        // Stop if reached boundary.
-        if (is_edge_a_boundary(quad_edge))
-            break;
-
-        move_to_next_quad(quad_edge);
-        assert(quad_edge.quad >= 0 && quad_edge.quad < _n &&
-               "Quad index out of bounds");
-
-        // Return if reached start point of contour line.
-        if (start_quad_edge != 0 &&
-            quad_edge == *start_quad_edge &&
-            level_index == start_level_index)
-            break;
-    }
-}
-
-void QuadContourGenerator::get_chunk_limits(long ijchunk,
-                                            long& ichunk,
-                                            long& jchunk,
-                                            long& istart,
-                                            long& iend,
-                                            long& jstart,
-                                            long& jend)
-{
-    assert(ijchunk >= 0 && ijchunk < _chunk_count && "ijchunk out of bounds");
-    ichunk = ijchunk % _nxchunk;
-    jchunk = ijchunk / _nxchunk;
-    istart = ichunk*_chunk_size;
-    iend = (ichunk == _nxchunk-1 ? _nx : (ichunk+1)*_chunk_size);
-    jstart = jchunk*_chunk_size;
-    jend = (jchunk == _nychunk-1 ? _ny : (jchunk+1)*_chunk_size);
-}
-
-Edge QuadContourGenerator::get_corner_start_edge(long quad,
-                                                 unsigned int level_index) const
-{
-    assert(quad >= 0 && quad < _n && "Quad index out of bounds");
-    assert((level_index == 1 || level_index == 2) &&
-           "level index must be 1 or 2");
-    assert(EXISTS_ANY_CORNER(quad) && "Quad is not a corner");
-
-    // Diagram for NE corner.  Rotate for other corners.
-    //
-    //           edge12
-    // point1 +---------+ point2
-    //          \       |
-    //            \     | edge23
-    //       edge31 \   |
-    //                \ |
-    //                  + point3
-    //
-    long point1, point2, point3;
-    Edge edge12, edge23, edge31;
-    switch (_cache[quad] & MASK_EXISTS) {
-        case MASK_EXISTS_SW_CORNER:
-            point1 = POINT_SE; point2 = POINT_SW; point3 = POINT_NW;
-            edge12 = Edge_S;   edge23 = Edge_W;   edge31 = Edge_NE;
-            break;
-        case MASK_EXISTS_SE_CORNER:
-            point1 = POINT_NE; point2 = POINT_SE; point3 = POINT_SW;
-            edge12 = Edge_E;   edge23 = Edge_S;   edge31 = Edge_NW;
-            break;
-        case MASK_EXISTS_NW_CORNER:
-            point1 = POINT_SW; point2 = POINT_NW; point3 = POINT_NE;
-            edge12 = Edge_W;   edge23 = Edge_N;   edge31 = Edge_SE;
-            break;
-        case MASK_EXISTS_NE_CORNER:
-            point1 = POINT_NW; point2 = POINT_NE; point3 = POINT_SE;
-            edge12 = Edge_N;   edge23 = Edge_E;   edge31 = Edge_SW;
-            break;
-        default:
-            assert(0 && "Invalid EXISTS for quad");
-            return Edge_None;
-    }
-
-    unsigned int config = (Z_LEVEL(point1) >= level_index) << 2 |
-                          (Z_LEVEL(point2) >= level_index) << 1 |
-                          (Z_LEVEL(point3) >= level_index);
-
-    // Upper level (level_index == 2) polygons are reversed compared to lower
-    // level ones, i.e. higher values on the right rather than the left.
-    if (level_index == 2)
-        config = 7 - config;
-
-    switch (config) {
-        case 0: return Edge_None;
-        case 1: return edge23;
-        case 2: return edge12;
-        case 3: return edge12;
-        case 4: return edge31;
-        case 5: return edge23;
-        case 6: return edge31;
-        case 7: return Edge_None;
-        default: assert(0 && "Invalid config"); return Edge_None;
-    }
-}
-
-long QuadContourGenerator::get_edge_point_index(const QuadEdge& quad_edge,
-                                                bool start) const
-{
-    assert(quad_edge.quad >= 0 && quad_edge.quad < _n &&
-           "Quad index out of bounds");
-    assert(quad_edge.edge != Edge_None && "Invalid edge");
-
-    // Edges are ordered anticlockwise around their quad, as indicated by
-    // directions of arrows in diagrams below.
-    //           Full quad                    NW corner (others similar)
-    //
-    //  POINT_NW   Edge_N   POINT_NE         POINT_NW   Edge_N   POINT_NE
-    //          +----<-----+                         +----<-----+
-    //          |          |                         |         /
-    //          |          |                         | quad  /
-    //  Edge_W  V   quad   ^  Edge_E         Edge_W  V     ^
-    //          |          |                         |   /  Edge_SE
-    //          |          |                         | /
-    //          +---->-----+                         +
-    //  POINT_SW   Edge_S   POINT_SE         POINT_SW
-    //
-    const long& quad = quad_edge.quad;
-    switch (quad_edge.edge) {
-        case Edge_E:  return (start ? POINT_SE : POINT_NE);
-        case Edge_N:  return (start ? POINT_NE : POINT_NW);
-        case Edge_W:  return (start ? POINT_NW : POINT_SW);
-        case Edge_S:  return (start ? POINT_SW : POINT_SE);
-        case Edge_NE: return (start ? POINT_SE : POINT_NW);
-        case Edge_NW: return (start ? POINT_NE : POINT_SW);
-        case Edge_SW: return (start ? POINT_NW : POINT_SE);
-        case Edge_SE: return (start ? POINT_SW : POINT_NE);
-        default: assert(0 && "Invalid edge"); return 0;
-    }
-}
-
-Edge QuadContourGenerator::get_exit_edge(const QuadEdge& quad_edge,
-                                         Dir dir) const
-{
-    assert(quad_edge.quad >= 0 && quad_edge.quad < _n &&
-           "Quad index out of bounds");
-    assert(quad_edge.edge != Edge_None && "Invalid edge");
-
-    const long& quad = quad_edge.quad;
-    const Edge& edge = quad_edge.edge;
-    if (EXISTS_ANY_CORNER(quad)) {
-        // Corner directions are always left or right.  A corner is a triangle,
-        // entered via one edge so the other two edges are the left and right
-        // ones.
-        switch (edge) {
-            case Edge_E:
-                return (EXISTS_SE_CORNER(quad)
-                           ? (dir == Dir_Left ? Edge_S : Edge_NW)
-                           : (dir == Dir_Right ? Edge_N : Edge_SW));
-            case Edge_N:
-                return (EXISTS_NW_CORNER(quad)
-                           ? (dir == Dir_Right ? Edge_W : Edge_SE)
-                           : (dir == Dir_Left ? Edge_E : Edge_SW));
-            case Edge_W:
-                return (EXISTS_SW_CORNER(quad)
-                           ? (dir == Dir_Right ? Edge_S : Edge_NE)
-                           : (dir == Dir_Left ? Edge_N : Edge_SE));
-            case Edge_S:
-                return (EXISTS_SW_CORNER(quad)
-                           ? (dir == Dir_Left ? Edge_W : Edge_NE)
-                           : (dir == Dir_Right ? Edge_E : Edge_NW));
-            case Edge_NE: return (dir == Dir_Left ? Edge_S : Edge_W);
-            case Edge_NW: return (dir == Dir_Left ? Edge_E : Edge_S);
-            case Edge_SW: return (dir == Dir_Left ? Edge_N : Edge_E);
-            case Edge_SE: return (dir == Dir_Left ? Edge_W : Edge_N);
-            default: assert(0 && "Invalid edge"); return Edge_None;
-        }
-    }
-    else {
-        // A full quad has four edges, entered via one edge so that other three
-        // edges correspond to left, straight and right directions.
-        switch (edge) {
-            case Edge_E:
-                return (dir == Dir_Left ? Edge_S :
-                            (dir == Dir_Right ? Edge_N : Edge_W));
-            case Edge_N:
-                return (dir == Dir_Left ? Edge_E :
-                            (dir == Dir_Right ? Edge_W : Edge_S));
-            case Edge_W:
-                return (dir == Dir_Left ? Edge_N :
-                            (dir == Dir_Right ? Edge_S : Edge_E));
-            case Edge_S:
-                return (dir == Dir_Left ? Edge_W :
-                            (dir == Dir_Right ? Edge_E : Edge_N));
-            default: assert(0 && "Invalid edge"); return Edge_None;
-        }
-    }
-}
-
-XY QuadContourGenerator::get_point_xy(long point) const
-{
-    assert(point >= 0 && point < _n && "Point index out of bounds.");
-    return XY(_x.data()[static_cast<npy_intp>(point)],
-              _y.data()[static_cast<npy_intp>(point)]);
-}
-
-const double& QuadContourGenerator::get_point_z(long point) const
-{
-    assert(point >= 0 && point < _n && "Point index out of bounds.");
-    return _z.data()[static_cast<npy_intp>(point)];
-}
-
-Edge QuadContourGenerator::get_quad_start_edge(long quad,
-                                               unsigned int level_index) const
-{
-    assert(quad >= 0 && quad < _n && "Quad index out of bounds");
-    assert((level_index == 1 || level_index == 2) &&
-           "level index must be 1 or 2");
-    assert(EXISTS_QUAD(quad) && "Quad does not exist");
-
-    unsigned int config = (Z_NW >= level_index) << 3 |
-                          (Z_NE >= level_index) << 2 |
-                          (Z_SW >= level_index) << 1 |
-                          (Z_SE >= level_index);
-
-    // Upper level (level_index == 2) polygons are reversed compared to lower
-    // level ones, i.e. higher values on the right rather than the left.
-    if (level_index == 2)
-        config = 15 - config;
-
-    switch (config) {
-        case  0: return Edge_None;
-        case  1: return Edge_E;
-        case  2: return Edge_S;
-        case  3: return Edge_E;
-        case  4: return Edge_N;
-        case  5: return Edge_N;
-        case  6:
-            // If already identified as a saddle quad then the start edge is
-            // read from the cache.  Otherwise return either valid start edge
-            // and the subsequent call to follow_interior() will correctly set
-            // up saddle bits in cache.
-            if (!SADDLE(quad,level_index) || SADDLE_START_SW(quad,level_index))
-                return Edge_S;
-            else
-                return Edge_N;
-        case  7: return Edge_N;
-        case  8: return Edge_W;
-        case  9:
-            // See comment for 6 above.
-            if (!SADDLE(quad,level_index) || SADDLE_START_SW(quad,level_index))
-                return Edge_W;
-            else
-                return Edge_E;
-        case 10: return Edge_S;
-        case 11: return Edge_E;
-        case 12: return Edge_W;
-        case 13: return Edge_W;
-        case 14: return Edge_S;
-        case 15: return Edge_None;
-        default: assert(0 && "Invalid config"); return Edge_None;
-    }
-}
-
-Edge QuadContourGenerator::get_start_edge(long quad,
-                                          unsigned int level_index) const
-{
-    if (EXISTS_ANY_CORNER(quad))
-        return get_corner_start_edge(quad, level_index);
-    else
-        return get_quad_start_edge(quad, level_index);
-}
-
-void QuadContourGenerator::init_cache_grid(const MaskArray& mask)
-{
-    long i, j, quad;
-
-    if (mask.empty()) {
-        // No mask, easy to calculate quad existence and boundaries together.
-        quad = 0;
-        for (j = 0; j < _ny; ++j) {
-            for (i = 0; i < _nx; ++i, ++quad) {
-                _cache[quad] = 0;
-
-                if (i < _nx-1 && j < _ny-1)
-                    _cache[quad] |= MASK_EXISTS_QUAD;
-
-                if ((i % _chunk_size == 0 || i == _nx-1) && j < _ny-1)
-                    _cache[quad] |= MASK_BOUNDARY_W;
-
-                if ((j % _chunk_size == 0 || j == _ny-1) && i < _nx-1)
-                    _cache[quad] |= MASK_BOUNDARY_S;
-            }
-        }
-    }
-    else {
-        // Casting avoids problem when sizeof(bool) != sizeof(npy_bool).
-        const npy_bool* mask_ptr =
-            reinterpret_cast<const npy_bool*>(mask.data());
-
-        // Have mask so use two stages.
-        // Stage 1, determine if quads/corners exist.
-        quad = 0;
-        for (j = 0; j < _ny; ++j) {
-            for (i = 0; i < _nx; ++i, ++quad) {
-                _cache[quad] = 0;
-
-                if (i < _nx-1 && j < _ny-1) {
-                    unsigned int config = mask_ptr[POINT_NW] << 3 |
-                                          mask_ptr[POINT_NE] << 2 |
-                                          mask_ptr[POINT_SW] << 1 |
-                                          mask_ptr[POINT_SE];
-
-                    if (_corner_mask) {
-                         switch (config) {
-                            case 0: _cache[quad] = MASK_EXISTS_QUAD; break;
-                            case 1: _cache[quad] = MASK_EXISTS_NW_CORNER; break;
-                            case 2: _cache[quad] = MASK_EXISTS_NE_CORNER; break;
-                            case 4: _cache[quad] = MASK_EXISTS_SW_CORNER; break;
-                            case 8: _cache[quad] = MASK_EXISTS_SE_CORNER; break;
-                            default:
-                                // Do nothing, quad is masked out.
-                                break;
-                        }
-                    }
-                    else if (config == 0)
-                        _cache[quad] = MASK_EXISTS_QUAD;
-                }
-            }
-        }
-
-        // Stage 2, calculate W and S boundaries.  For each quad use boundary
-        // data already calculated for quads to W and S, so must iterate
-        // through quads in correct order (increasing i and j indices).
-        // Cannot use boundary data for quads to E and N as have not yet
-        // calculated it.
-        quad = 0;
-        for (j = 0; j < _ny; ++j) {
-            for (i = 0; i < _nx; ++i, ++quad) {
-                if (_corner_mask) {
-                    bool W_exists_none = (i == 0 || EXISTS_NONE(quad-1));
-                    bool S_exists_none = (j == 0 || EXISTS_NONE(quad-_nx));
-                    bool W_exists_E_edge = (i > 0 && EXISTS_E_EDGE(quad-1));
-                    bool S_exists_N_edge = (j > 0 && EXISTS_N_EDGE(quad-_nx));
-
-                    if ((EXISTS_W_EDGE(quad) && W_exists_none) ||
-                        (EXISTS_NONE(quad) && W_exists_E_edge) ||
-                        (i % _chunk_size == 0 && EXISTS_W_EDGE(quad) &&
-                                                 W_exists_E_edge))
-                         _cache[quad] |= MASK_BOUNDARY_W;
-
-                    if ((EXISTS_S_EDGE(quad) && S_exists_none) ||
-                        (EXISTS_NONE(quad) && S_exists_N_edge) ||
-                        (j % _chunk_size == 0 && EXISTS_S_EDGE(quad) &&
-                                                 S_exists_N_edge))
-                         _cache[quad] |= MASK_BOUNDARY_S;
-                }
-                else {
-                    bool W_exists_quad = (i > 0 && EXISTS_QUAD(quad-1));
-                    bool S_exists_quad = (j > 0 && EXISTS_QUAD(quad-_nx));
-
-                    if ((EXISTS_QUAD(quad) != W_exists_quad) ||
-                        (i % _chunk_size == 0 && EXISTS_QUAD(quad) &&
-                                                 W_exists_quad))
-                        _cache[quad] |= MASK_BOUNDARY_W;
-
-                    if ((EXISTS_QUAD(quad) != S_exists_quad) ||
-                        (j % _chunk_size == 0 && EXISTS_QUAD(quad) &&
-                                                 S_exists_quad))
-                        _cache[quad] |= MASK_BOUNDARY_S;
-                }
-            }
-        }
-    }
-}
-
-void QuadContourGenerator::init_cache_levels(const double& lower_level,
-                                             const double& upper_level)
-{
-    assert(upper_level >= lower_level &&
-           "upper and lower levels are wrong way round");
-
-    bool two_levels = (lower_level != upper_level);
-    CacheItem keep_mask =
-        (_corner_mask ? MASK_EXISTS | MASK_BOUNDARY_S | MASK_BOUNDARY_W
-                      : MASK_EXISTS_QUAD | MASK_BOUNDARY_S | MASK_BOUNDARY_W);
-
-    if (two_levels) {
-        const double* z_ptr = _z.data();
-        for (long quad = 0; quad < _n; ++quad, ++z_ptr) {
-            _cache[quad] &= keep_mask;
-            if (*z_ptr > upper_level)
-                _cache[quad] |= MASK_Z_LEVEL_2;
-            else if (*z_ptr > lower_level)
-                _cache[quad] |= MASK_Z_LEVEL_1;
-        }
-    }
-    else {
-        const double* z_ptr = _z.data();
-        for (long quad = 0; quad < _n; ++quad, ++z_ptr) {
-            _cache[quad] &= keep_mask;
-            if (*z_ptr > lower_level)
-                _cache[quad] |= MASK_Z_LEVEL_1;
-        }
-   }
-}
-
-XY QuadContourGenerator::interp(
-    long point1, long point2, const double& level) const
-{
-    assert(point1 >= 0 && point1 < _n && "Point index 1 out of bounds.");
-    assert(point2 >= 0 && point2 < _n && "Point index 2 out of bounds.");
-    assert(point1 != point2 && "Identical points");
-    double fraction = (get_point_z(point2) - level) /
-                          (get_point_z(point2) - get_point_z(point1));
-    return get_point_xy(point1)*fraction + get_point_xy(point2)*(1.0 - fraction);
-}
-
-bool QuadContourGenerator::is_edge_a_boundary(const QuadEdge& quad_edge) const
-{
-    assert(quad_edge.quad >= 0 && quad_edge.quad < _n &&
-           "Quad index out of bounds");
-    assert(quad_edge.edge != Edge_None && "Invalid edge");
-
-    switch (quad_edge.edge) {
-        case Edge_E:  return BOUNDARY_E(quad_edge.quad);
-        case Edge_N:  return BOUNDARY_N(quad_edge.quad);
-        case Edge_W:  return BOUNDARY_W(quad_edge.quad);
-        case Edge_S:  return BOUNDARY_S(quad_edge.quad);
-        case Edge_NE: return EXISTS_SW_CORNER(quad_edge.quad);
-        case Edge_NW: return EXISTS_SE_CORNER(quad_edge.quad);
-        case Edge_SW: return EXISTS_NE_CORNER(quad_edge.quad);
-        case Edge_SE: return EXISTS_NW_CORNER(quad_edge.quad);
-        default: assert(0 && "Invalid edge"); return true;
-    }
-}
-
-void QuadContourGenerator::move_to_next_boundary_edge(QuadEdge& quad_edge) const
-{
-    assert(is_edge_a_boundary(quad_edge) && "QuadEdge is not a boundary");
-
-    long& quad = quad_edge.quad;
-    Edge& edge = quad_edge.edge;
-
-    quad = get_edge_point_index(quad_edge, false);
-
-    // quad is now such that POINT_SW is the end point of the quad_edge passed
-    // to this function.
-
-    // To find the next boundary edge, first attempt to turn left 135 degrees
-    // and if that edge is a boundary then move to it.  If not, attempt to turn
-    // left 90 degrees, then left 45 degrees, then straight on, etc, until can
-    // move.
-    // First determine which edge to attempt first.
-    int index = 0;
-    switch (edge) {
-        case Edge_E:  index = 0; break;
-        case Edge_SE: index = 1; break;
-        case Edge_S:  index = 2; break;
-        case Edge_SW: index = 3; break;
-        case Edge_W:  index = 4; break;
-        case Edge_NW: index = 5; break;
-        case Edge_N:  index = 6; break;
-        case Edge_NE: index = 7; break;
-        default: assert(0 && "Invalid edge"); break;
-    }
-
-    // If _corner_mask not set, only need to consider odd index in loop below.
-    if (!_corner_mask)
-        ++index;
-
-    // Try each edge in turn until a boundary is found.
-    int start_index = index;
-    do
-    {
-        switch (index) {
-            case 0:
-                if (EXISTS_SE_CORNER(quad-_nx-1)) { // Equivalent to BOUNDARY_NW
-                    quad -= _nx+1;
-                    edge = Edge_NW;
-                    return;
-                }
-                break;
-            case 1:
-                if (BOUNDARY_N(quad-_nx-1)) {
-                    quad -= _nx+1;
-                    edge = Edge_N;
-                    return;
-                }
-                break;
-            case 2:
-                if (EXISTS_SW_CORNER(quad-1)) {  // Equivalent to BOUNDARY_NE
-                    quad -= 1;
-                    edge = Edge_NE;
-                    return;
-                }
-                break;
-            case 3:
-                if (BOUNDARY_E(quad-1)) {
-                    quad -= 1;
-                    edge = Edge_E;
-                    return;
-                }
-                break;
-            case 4:
-                if (EXISTS_NW_CORNER(quad)) {  // Equivalent to BOUNDARY_SE
-                    edge = Edge_SE;
-                    return;
-                }
-                break;
-            case 5:
-                if (BOUNDARY_S(quad)) {
-                    edge = Edge_S;
-                    return;
-                }
-                break;
-            case 6:
-                if (EXISTS_NE_CORNER(quad-_nx)) {  // Equivalent to BOUNDARY_SW
-                    quad -= _nx;
-                    edge = Edge_SW;
-                    return;
-                }
-                break;
-            case 7:
-                if (BOUNDARY_W(quad-_nx)) {
-                    quad -= _nx;
-                    edge = Edge_W;
-                    return;
-                }
-                break;
-            default: assert(0 && "Invalid index"); break;
-        }
-
-        if (_corner_mask)
-            index = (index + 1) % 8;
-        else
-            index = (index + 2) % 8;
-    } while (index != start_index);
-
-    assert(0 && "Failed to find next boundary edge");
-}
-
-void QuadContourGenerator::move_to_next_quad(QuadEdge& quad_edge) const
-{
-    assert(quad_edge.quad >= 0 && quad_edge.quad < _n &&
-           "Quad index out of bounds");
-    assert(quad_edge.edge != Edge_None && "Invalid edge");
-
-    // Move from quad_edge.quad to the neighbouring quad in the direction
-    // specified by quad_edge.edge.
-    switch (quad_edge.edge) {
-        case Edge_E: quad_edge.quad += 1;   quad_edge.edge = Edge_W; break;
-        case Edge_N: quad_edge.quad += _nx; quad_edge.edge = Edge_S; break;
-        case Edge_W: quad_edge.quad -= 1;   quad_edge.edge = Edge_E; break;
-        case Edge_S: quad_edge.quad -= _nx; quad_edge.edge = Edge_N; break;
-        default: assert(0 && "Invalid edge"); break;
-    }
-}
-
-void QuadContourGenerator::single_quad_filled(Contour& contour,
-                                              long quad,
-                                              const double& lower_level,
-                                              const double& upper_level)
-{
-    assert(quad >= 0 && quad < _n && "Quad index out of bounds");
-
-    // Order of checking is important here as can have different ContourLines
-    // from both lower and upper levels in the same quad.  First check the S
-    // edge, then move up the quad to the N edge checking as required.
-
-    // Possible starts from S boundary.
-    if (BOUNDARY_S(quad) && EXISTS_S_EDGE(quad)) {
-
-        // Lower-level start from S boundary into interior.
-        if (!VISITED_S(quad) && Z_SW >= 1 && Z_SE == 0)
-            contour.push_back(start_filled(quad, Edge_S, 1, NotHole, Interior,
-                                           lower_level, upper_level));
-
-        // Upper-level start from S boundary into interior.
-        if (!VISITED_S(quad) && Z_SW < 2 && Z_SE == 2)
-            contour.push_back(start_filled(quad, Edge_S, 2, NotHole, Interior,
-                                           lower_level, upper_level));
-
-        // Lower-level start following S boundary from W to E.
-        if (!VISITED_S(quad) && Z_SW <= 1 && Z_SE == 1)
-            contour.push_back(start_filled(quad, Edge_S, 1, NotHole, Boundary,
-                                           lower_level, upper_level));
-
-        // Upper-level start following S boundary from W to E.
-        if (!VISITED_S(quad) && Z_SW == 2 && Z_SE == 1)
-            contour.push_back(start_filled(quad, Edge_S, 2, NotHole, Boundary,
-                                           lower_level, upper_level));
-    }
-
-    // Possible starts from W boundary.
-    if (BOUNDARY_W(quad) && EXISTS_W_EDGE(quad)) {
-
-        // Lower-level start from W boundary into interior.
-        if (!VISITED_W(quad) && Z_NW >= 1 && Z_SW == 0)
-            contour.push_back(start_filled(quad, Edge_W, 1, NotHole, Interior,
-                                           lower_level, upper_level));
-
-        // Upper-level start from W boundary into interior.
-        if (!VISITED_W(quad) && Z_NW < 2 && Z_SW == 2)
-            contour.push_back(start_filled(quad, Edge_W, 2, NotHole, Interior,
-                                           lower_level, upper_level));
-
-        // Lower-level start following W boundary from N to S.
-        if (!VISITED_W(quad) && Z_NW <= 1 && Z_SW == 1)
-            contour.push_back(start_filled(quad, Edge_W, 1, NotHole, Boundary,
-                                           lower_level, upper_level));
-
-        // Upper-level start following W boundary from N to S.
-        if (!VISITED_W(quad) && Z_NW == 2 && Z_SW == 1)
-            contour.push_back(start_filled(quad, Edge_W, 2, NotHole, Boundary,
-                                           lower_level, upper_level));
-    }
-
-    // Possible starts from NE boundary.
-    if (EXISTS_SW_CORNER(quad)) {  // i.e. BOUNDARY_NE
-
-        // Lower-level start following NE boundary from SE to NW, hole.
-        if (!VISITED_CORNER(quad) && Z_NW == 1 && Z_SE == 1)
-            contour.push_back(start_filled(quad, Edge_NE, 1, Hole, Boundary,
-                                           lower_level, upper_level));
-    }
-    // Possible starts from SE boundary.
-    else if (EXISTS_NW_CORNER(quad)) {  // i.e. BOUNDARY_SE
-
-        // Lower-level start from N to SE.
-        if (!VISITED(quad,1) && Z_NW == 0 && Z_SW == 0 && Z_NE >= 1)
-            contour.push_back(start_filled(quad, Edge_N, 1, NotHole, Interior,
-                                           lower_level, upper_level));
-
-        // Upper-level start from SE to N, hole.
-        if (!VISITED(quad,2) && Z_NW <  2 && Z_SW < 2 && Z_NE == 2)
-            contour.push_back(start_filled(quad, Edge_SE, 2, Hole, Interior,
-                                           lower_level, upper_level));
-
-        // Upper-level start from N to SE.
-        if (!VISITED(quad,2) && Z_NW == 2 && Z_SW == 2 && Z_NE < 2)
-            contour.push_back(start_filled(quad, Edge_N, 2, NotHole, Interior,
-                                           lower_level, upper_level));
-
-        // Lower-level start from SE to N, hole.
-        if (!VISITED(quad,1) && Z_NW >= 1 && Z_SW >= 1 && Z_NE == 0)
-            contour.push_back(start_filled(quad, Edge_SE, 1, Hole, Interior,
-                                           lower_level, upper_level));
-    }
-    // Possible starts from NW boundary.
-    else if (EXISTS_SE_CORNER(quad)) {  // i.e. BOUNDARY_NW
-
-        // Lower-level start from NW to E.
-        if (!VISITED(quad,1) && Z_SW == 0 && Z_SE == 0 && Z_NE >= 1)
-            contour.push_back(start_filled(quad, Edge_NW, 1, NotHole, Interior,
-                                           lower_level, upper_level));
-
-        // Upper-level start from E to NW, hole.
-        if (!VISITED(quad,2) && Z_SW < 2 && Z_SE < 2 && Z_NE == 2)
-            contour.push_back(start_filled(quad, Edge_E, 2, Hole, Interior,
-                                           lower_level, upper_level));
-
-        // Upper-level start from NW to E.
-        if (!VISITED(quad,2) && Z_SW == 2 && Z_SE == 2 && Z_NE < 2)
-            contour.push_back(start_filled(quad, Edge_NW, 2, NotHole, Interior,
-                                           lower_level, upper_level));
-
-        // Lower-level start from E to NW, hole.
-        if (!VISITED(quad,1) && Z_SW >= 1 && Z_SE >= 1 && Z_NE == 0)
-            contour.push_back(start_filled(quad, Edge_E, 1, Hole, Interior,
-                                           lower_level, upper_level));
-    }
-    // Possible starts from SW boundary.
-    else if (EXISTS_NE_CORNER(quad)) {  // i.e. BOUNDARY_SW
-
-        // Lower-level start from SW boundary into interior.
-        if (!VISITED_CORNER(quad) && Z_NW >= 1 && Z_SE == 0)
-            contour.push_back(start_filled(quad, Edge_SW, 1, NotHole, Interior,
-                                           lower_level, upper_level));
-
-        // Upper-level start from SW boundary into interior.
-        if (!VISITED_CORNER(quad) && Z_NW < 2 && Z_SE == 2)
-            contour.push_back(start_filled(quad, Edge_SW, 2, NotHole, Interior,
-                                           lower_level, upper_level));
-
-        // Lower-level start following SW boundary from NW to SE.
-        if (!VISITED_CORNER(quad) && Z_NW <= 1 && Z_SE == 1)
-            contour.push_back(start_filled(quad, Edge_SW, 1, NotHole, Boundary,
-                                           lower_level, upper_level));
-
-        // Upper-level start following SW boundary from NW to SE.
-        if (!VISITED_CORNER(quad) && Z_NW == 2 && Z_SE == 1)
-            contour.push_back(start_filled(quad, Edge_SW, 2, NotHole, Boundary,
-                                           lower_level, upper_level));
-    }
-
-    // A full (unmasked) quad can only have a start on the NE corner, i.e. from
-    // N to E (lower level) or E to N (upper level).  Any other start will have
-    // already been created in a call to this function for a prior quad so we
-    // don't need to test for it again here.
-    //
-    // The situation is complicated by the possibility that the quad is a
-    // saddle quad, in which case a contour line starting on the N could leave
-    // by either the W or the E.  We only need to consider those leaving E.
-    //
-    // A NE corner can also have a N to E or E to N start.
-    if (EXISTS_QUAD(quad) || EXISTS_NE_CORNER(quad)) {
-
-        // Lower-level start from N to E.
-        if (!VISITED(quad,1) && Z_NW == 0 && Z_SE == 0 && Z_NE >= 1 &&
-            (!SADDLE(quad,1) || SADDLE_LEFT(quad,1)))
-            contour.push_back(start_filled(quad, Edge_N, 1, NotHole, Interior,
-                                           lower_level, upper_level));
-
-        // Upper-level start from E to N, hole.
-        if (!VISITED(quad,2) && Z_NW < 2 && Z_SE <  2 && Z_NE == 2 &&
-            (!SADDLE(quad,2) || !SADDLE_LEFT(quad,2)))
-            contour.push_back(start_filled(quad, Edge_E, 2, Hole, Interior,
-                                           lower_level, upper_level));
-
-        // Upper-level start from N to E.
-        if (!VISITED(quad,2) && Z_NW == 2 && Z_SE == 2 && Z_NE < 2 &&
-            (!SADDLE(quad,2) || SADDLE_LEFT(quad,2)))
-            contour.push_back(start_filled(quad, Edge_N, 2, NotHole, Interior,
-                                           lower_level, upper_level));
-
-        // Lower-level start from E to N, hole.
-        if (!VISITED(quad,1) && Z_NW >= 1 && Z_SE >= 1 && Z_NE == 0 &&
-            (!SADDLE(quad,1) || !SADDLE_LEFT(quad,1)))
-            contour.push_back(start_filled(quad, Edge_E, 1, Hole, Interior,
-                                           lower_level, upper_level));
-
-        // All possible contours passing through the interior of this quad
-        // should have already been created, so assert this.
-        assert((VISITED(quad,1) || get_start_edge(quad, 1) == Edge_None) &&
-               "Found start of contour that should have already been created");
-        assert((VISITED(quad,2) || get_start_edge(quad, 2) == Edge_None) &&
-               "Found start of contour that should have already been created");
-    }
-
-    // Lower-level start following N boundary from E to W, hole.
-    // This is required for an internal masked region which is a hole in a
-    // surrounding contour line.
-    if (BOUNDARY_N(quad) && EXISTS_N_EDGE(quad) &&
-        !VISITED_S(quad+_nx) && Z_NW == 1 && Z_NE == 1)
-        contour.push_back(start_filled(quad, Edge_N, 1, Hole, Boundary,
-                                       lower_level, upper_level));
-}
-
-ContourLine* QuadContourGenerator::start_filled(
-    long quad,
-    Edge edge,
-    unsigned int start_level_index,
-    HoleOrNot hole_or_not,
-    BoundaryOrInterior boundary_or_interior,
-    const double& lower_level,
-    const double& upper_level)
-{
-    assert(quad >= 0 && quad < _n && "Quad index out of bounds");
-    assert(edge != Edge_None && "Invalid edge");
-    assert((start_level_index == 1 || start_level_index == 2) &&
-           "start level index must be 1 or 2");
-
-    ContourLine* contour_line = new ContourLine(hole_or_not == Hole);
-    if (hole_or_not == Hole) {
-        // Find and set parent ContourLine.
-        ContourLine* parent = _parent_cache.get_parent(quad + 1);
-        assert(parent != 0 && "Failed to find parent ContourLine");
-        contour_line->set_parent(parent);
-        parent->add_child(contour_line);
-    }
-
-    QuadEdge quad_edge(quad, edge);
-    const QuadEdge start_quad_edge(quad_edge);
-    unsigned int level_index = start_level_index;
-
-    // If starts on interior, can only finish on interior.
-    // If starts on boundary, can only finish on boundary.
-
-    while (true) {
-        if (boundary_or_interior == Interior) {
-            double level = (level_index == 1 ? lower_level : upper_level);
-            follow_interior(*contour_line, quad_edge, level_index, level,
-                            false, &start_quad_edge, start_level_index, true);
-        }
-        else {
-            level_index = follow_boundary(
-                                *contour_line, quad_edge, lower_level,
-                                upper_level, level_index, start_quad_edge);
-        }
-
-        if (quad_edge == start_quad_edge && (boundary_or_interior == Boundary ||
-                                             level_index == start_level_index))
-            break;
-
-        if (boundary_or_interior == Boundary)
-            boundary_or_interior = Interior;
-        else
-            boundary_or_interior = Boundary;
-    }
-
-    return contour_line;
-}
-
-bool QuadContourGenerator::start_line(
-    PyObject* vertices_list, long quad, Edge edge, const double& level)
-{
-    assert(vertices_list != 0 && "Null python vertices list");
-    assert(is_edge_a_boundary(QuadEdge(quad, edge)) &&
-           "QuadEdge is not a boundary");
-
-    QuadEdge quad_edge(quad, edge);
-    ContourLine contour_line(false);
-    follow_interior(contour_line, quad_edge, 1, level, true, 0, 1, false);
-    append_contour_line_to_vertices(contour_line, vertices_list);
-    return VISITED(quad,1);
-}
-
-void QuadContourGenerator::write_cache(bool grid_only) const
-{
-    std::cout << "-----------------------------------------------" << std::endl;
-    for (long quad = 0; quad < _n; ++quad)
-        write_cache_quad(quad, grid_only);
-    std::cout << "-----------------------------------------------" << std::endl;
-}
-
-void QuadContourGenerator::write_cache_quad(long quad, bool grid_only) const
-{
-    long j = quad / _nx;
-    long i = quad - j*_nx;
-    std::cout << quad << ": i=" << i << " j=" << j
-        << " EXISTS=" << EXISTS_QUAD(quad);
-    if (_corner_mask)
-        std::cout << " CORNER=" << EXISTS_SW_CORNER(quad) << EXISTS_SE_CORNER(quad)
-            << EXISTS_NW_CORNER(quad) << EXISTS_NE_CORNER(quad);
-    std::cout << " BNDY=" << (BOUNDARY_S(quad)>0) << (BOUNDARY_W(quad)>0);
-    if (!grid_only) {
-        std::cout << " Z=" << Z_LEVEL(quad)
-            << " SAD=" << SADDLE(quad,1) << SADDLE(quad,2)
-            << " LEFT=" << SADDLE_LEFT(quad,1) << SADDLE_LEFT(quad,2)
-            << " NW=" << SADDLE_START_SW(quad,1) << SADDLE_START_SW(quad,2)
-            << " VIS=" << VISITED(quad,1) << VISITED(quad,2)
-            << VISITED_S(quad) << VISITED_W(quad)
-            << VISITED_CORNER(quad);
-    }
-    std::cout << std::endl;
-}
diff --git a/src/_contour.h b/src/_contour.h
deleted file mode 100644
index 6232b3abd2a7..000000000000
--- a/src/_contour.h
+++ /dev/null
@@ -1,530 +0,0 @@
-/*
- * QuadContourGenerator
- * --------------------
- * A QuadContourGenerator generates contours for scalar fields defined on
- * quadrilateral grids.  A single QuadContourGenerator object can create both
- * line contours (at single levels) and filled contours (between pairs of
- * levels) for the same field.
- *
- * A field to be contoured has nx, ny points in the x- and y-directions
- * respectively.  The quad grid is defined by x and y arrays of shape(ny, nx),
- * and the field itself is the z array also of shape(ny, nx).  There is an
- * optional boolean mask; if it exists then it also has shape(ny, nx).  The
- * mask applies to grid points rather than quads.
- *
- * How quads are masked based on the point mask is determined by the boolean
- * 'corner_mask' flag.  If false then any quad that has one or more of its four
- * corner points masked is itself masked.  If true the behaviour is the same
- * except that any quad which has exactly one of its four corner points masked
- * has only the triangular corner (half of the quad) adjacent to that point
- * masked; the opposite triangular corner has three unmasked points and is not
- * masked.
- *
- * By default the entire domain of nx*ny points is contoured together which can
- * result in some very long polygons.  The alternative is to break up the
- * domain into subdomains or 'chunks' of smaller size, each of which is
- * independently contoured.  The size of these chunks is controlled by the
- * 'nchunk' (or 'chunk_size') parameter.  Chunking not only results in shorter
- * polygons but also requires slightly less RAM.  It can result in rendering
- * artifacts though, depending on backend, antialiased flag and alpha value.
- *
- * Notation
- * --------
- * i and j are array indices in the x- and y-directions respectively.  Although
- * a single element of an array z can be accessed using z[j][i] or z(j,i), it
- * is often convenient to use the single quad index z[quad], where
- *     quad = i + j*nx
- * and hence
- *     i = quad % nx
- *     j = quad / nx
- *
- * Rather than referring to x- and y-directions, compass directions are used
- * instead such that W, E, S, N refer to the -x, +x, -y, +y directions
- * respectively.  To move one quad to the E you would therefore add 1 to the
- * quad index, to move one quad to the N you would add nx to the quad index.
- *
- * Cache
- * -----
- * Lots of information that is reused during contouring is stored as single
- * bits in a mesh-sized cache, indexed by quad.  Each quad's cache entry stores
- * information about the quad itself such as if it is masked, and about the
- * point at the SW corner of the quad, and about the W and S edges.  Hence
- * information about each point and each edge is only stored once in the cache.
- *
- * Cache information is divided into two types: that which is constant over the
- * lifetime of the QuadContourGenerator, and that which changes for each
- * contouring operation.  The former is all grid-specific information such
- * as quad and corner masks, and which edges are boundaries, either between
- * masked and non-masked regions or between adjacent chunks.  The latter
- * includes whether points lie above or below the current contour levels, plus
- * some flags to indicate how the contouring is progressing.
- *
- * Line Contours
- * -------------
- * A line contour connects points with the same z-value.  Each point of such a
- * contour occurs on an edge of the grid, at a point linearly interpolated to
- * the contour z-level from the z-values at the end points of the edge.  The
- * direction of a line contour is such that higher values are to the left of
- * the contour, so any edge that the contour passes through will have a left-
- * hand end point with z > contour level and a right-hand end point with
- * z <= contour level.
- *
- * Line contours are of two types.  Firstly there are open line strips that
- * start on a boundary, traverse the interior of the domain and end on a
- * boundary.  Secondly there are closed line loops that occur completely within
- * the interior of the domain and do not touch a boundary.
- *
- * The QuadContourGenerator makes two sweeps through the grid to generate line
- * contours for a particular level.  In the first sweep it looks only for start
- * points that occur on boundaries, and when it finds one it follows the
- * contour through the interior until it finishes on another boundary edge.
- * Each quad that is visited by the algorithm has a 'visited' flag set in the
- * cache to indicate that the quad does not need to be visited again.  In the
- * second sweep all non-visited quads are checked to see if they contain part
- * of an interior closed loop, and again each time one is found it is followed
- * through the domain interior until it returns back to its start quad and is
- * therefore completed.
- *
- * The situation is complicated by saddle quads that have two opposite corners
- * with z >= contour level and the other two corners with z < contour level.
- * These therefore contain two segments of a line contour, and the visited
- * flags take account of this by only being set on the second visit.  On the
- * first visit a number of saddle flags are set in the cache to indicate which
- * one of the two segments has been completed so far.
- *
- * Filled Contours
- * ---------------
- * Filled contours are produced between two contour levels and are always
- * closed polygons.  They can occur completely within the interior of the
- * domain without touching a boundary, following either the lower or upper
- * contour levels.  Those on the lower level are exactly like interior line
- * contours with higher values on the left.  Those on the upper level are
- * reversed such that higher values are on the right.
- *
- * Filled contours can also involve a boundary in which case they consist of
- * one or more sections along a boundary and one or more sections through the
- * interior.  Interior sections can be on either level, and again those on the
- * upper level have higher values on the right.  Boundary sections can remain
- * on either contour level or switch between the two.
- *
- * Once the start of a filled contour is found, the algorithm is similar to
- * that for line contours in that it follows the contour to its end, which
- * because filled contours are always closed polygons will be by returning
- * back to the start.  However, because two levels must be considered, each
- * level has its own set of saddle and visited flags and indeed some extra
- * visited flags for boundary edges.
- *
- * The major complication for filled contours is that some polygons can be
- * holes (with points ordered clockwise) within other polygons (with points
- * ordered anticlockwise).  When it comes to rendering filled contours each
- * non-hole polygon must be rendered along with its zero or more contained
- * holes or the rendering will not be correct.  The filled contour finding
- * algorithm could progress pretty much as the line contour algorithm does,
- * taking each polygon as it is found, but then at the end there would have to
- * be an extra step to identify the parent non-hole polygon for each hole.
- * This is not a particularly onerous task but it does not scale well and can
- * easily dominate the execution time of the contour finding for even modest
- * problems.  It is much better to identity each hole's parent non-hole during
- * the sweep algorithm.
- *
- * This requirement dictates the order that filled contours are identified.  As
- * the algorithm sweeps up through the grid, every time a polygon passes
- * through a quad a ParentCache object is updated with the new possible parent.
- * When a new hole polygon is started, the ParentCache is used to find the
- * first possible parent in the same quad or to the S of it.  Great care is
- * needed each time a new quad is checked to see if a new polygon should be
- * started, as a single quad can have multiple polygon starts, e.g. a quad
- * could be a saddle quad for both lower and upper contour levels, meaning it
- * has four contour line segments passing through it which could all be from
- * different polygons.  The S-most polygon must be started first, then the next
- * S-most and so on until the N-most polygon is started in that quad.
- */
-#ifndef MPL_CONTOUR_H
-#define MPL_CONTOUR_H
-
-#include "numpy_cpp.h"
-#include <stdint.h>
-#include <list>
-#include <iostream>
-#include <vector>
-
-
-// Edge of a quad including diagonal edges of masked quads if _corner_mask true.
-typedef enum
-{
-    // Listing values here so easier to check for debug purposes.
-    Edge_None = -1,
-    Edge_E = 0,
-    Edge_N = 1,
-    Edge_W = 2,
-    Edge_S = 3,
-    // The following are only used if _corner_mask is true.
-    Edge_NE = 4,
-    Edge_NW = 5,
-    Edge_SW = 6,
-    Edge_SE = 7
-} Edge;
-
-// Combination of a quad and an edge of that quad.
-// An invalid quad edge has quad of -1.
-struct QuadEdge
-{
-    QuadEdge();
-    QuadEdge(long quad_, Edge edge_);
-    bool operator<(const QuadEdge& other) const;
-    bool operator==(const QuadEdge& other) const;
-    bool operator!=(const QuadEdge& other) const;
-    friend std::ostream& operator<<(std::ostream& os,
-                                    const QuadEdge& quad_edge);
-
-    long quad;
-    Edge edge;
-};
-
-// 2D point with x,y coordinates.
-struct XY
-{
-    XY();
-    XY(const double& x_, const double& y_);
-    bool operator==(const XY& other) const;
-    bool operator!=(const XY& other) const;
-    XY operator*(const double& multiplier) const;
-    const XY& operator+=(const XY& other);
-    const XY& operator-=(const XY& other);
-    XY operator+(const XY& other) const;
-    XY operator-(const XY& other) const;
-    friend std::ostream& operator<<(std::ostream& os, const XY& xy);
-
-    double x, y;
-};
-
-// A single line of a contour, which may be a closed line loop or an open line
-// strip.  Identical adjacent points are avoided using push_back().
-// A ContourLine is either a hole (points ordered clockwise) or it is not
-// (points ordered anticlockwise).  Each hole has a parent ContourLine that is
-// not a hole; each non-hole contains zero or more child holes.  A non-hole and
-// its child holes must be rendered together to obtain the correct results.
-class ContourLine : public std::vector<XY>
-{
-public:
-    typedef std::list<ContourLine*> Children;
-
-    ContourLine(bool is_hole);
-    void add_child(ContourLine* child);
-    void clear_parent();
-    const Children& get_children() const;
-    const ContourLine* get_parent() const;
-    ContourLine* get_parent();
-    bool is_hole() const;
-    void push_back(const XY& point);
-    void set_parent(ContourLine* parent);
-    void write() const;
-
-private:
-    bool _is_hole;
-    ContourLine* _parent;  // Only set if is_hole, not owned.
-    Children _children;    // Only set if !is_hole, not owned.
-};
-
-
-// A Contour is a collection of zero or more ContourLines.
-class Contour : public std::vector<ContourLine*>
-{
-public:
-    Contour();
-    virtual ~Contour();
-    void delete_contour_lines();
-    void write() const;
-};
-
-
-// Single chunk of ContourLine parents, indexed by quad.  As a chunk's filled
-// contours are created, the ParentCache is updated each time a ContourLine
-// passes through each quad.  When a new ContourLine is created, if it is a
-// hole its parent ContourLine is read from the ParentCache by looking at the
-// start quad, then each quad to the S in turn until a non-zero ContourLine is
-// found.
-class ParentCache
-{
-public:
-    ParentCache(long nx, long x_chunk_points, long y_chunk_points);
-    ContourLine* get_parent(long quad);
-    void set_chunk_starts(long istart, long jstart);
-    void set_parent(long quad, ContourLine& contour_line);
-
-private:
-    long quad_to_index(long quad) const;
-
-    long _nx;
-    long _x_chunk_points, _y_chunk_points;  // Number of points not quads.
-    std::vector<ContourLine*> _lines;       // Not owned.
-    long _istart, _jstart;
-};
-
-
-// See overview of algorithm at top of file.
-class QuadContourGenerator
-{
-public:
-    typedef numpy::array_view<const double, 2> CoordinateArray;
-    typedef numpy::array_view<const bool, 2> MaskArray;
-
-    // Constructor with optional mask.
-    //   x, y, z: double arrays of shape (ny,nx).
-    //   mask: boolean array, ether empty (if no mask), or of shape (ny,nx).
-    //   corner_mask: flag for different masking behaviour.
-    //   chunk_size: 0 for no chunking, or +ve integer for size of chunks that
-    //     the domain is subdivided into.
-    QuadContourGenerator(const CoordinateArray& x,
-                         const CoordinateArray& y,
-                         const CoordinateArray& z,
-                         const MaskArray& mask,
-                         bool corner_mask,
-                         long chunk_size);
-
-    // Destructor.
-    ~QuadContourGenerator();
-
-    // Create and return polygons for a line (i.e. non-filled) contour at the
-    // specified level.
-    PyObject* create_contour(const double& level);
-
-    // Create and return polygons for a filled contour between the two
-    // specified levels.
-    PyObject* create_filled_contour(const double& lower_level,
-                                    const double& upper_level);
-
-private:
-    // Typedef for following either a boundary of the domain or the interior;
-    // clearer than using a boolean.
-    typedef enum
-    {
-        Boundary,
-        Interior
-    } BoundaryOrInterior;
-
-    // Typedef for direction of movement from one quad to the next.
-    typedef enum
-    {
-        Dir_Right    = -1,
-        Dir_Straight =  0,
-        Dir_Left     = +1
-    } Dir;
-
-    // Typedef for a polygon being a hole or not; clearer than using a boolean.
-    typedef enum
-    {
-        NotHole,
-        Hole
-    } HoleOrNot;
-
-    // Append a C++ ContourLine to the end of a python list.  Used for line
-    // contours where each ContourLine is converted to a separate numpy array
-    // of (x,y) points.
-    // Clears the ContourLine too.
-    void append_contour_line_to_vertices(ContourLine& contour_line,
-                                         PyObject* vertices_list) const;
-
-    // Append a C++ Contour to the end of two python lists.  Used for filled
-    // contours where each non-hole ContourLine and its child holes are
-    // represented by a numpy array of (x,y) points and a second numpy array of
-    // 'kinds' or 'codes' that indicates where the points array is split into
-    // individual polygons.
-    // Clears the Contour too, freeing each ContourLine as soon as possible
-    // for minimum RAM usage.
-    void append_contour_to_vertices_and_codes(Contour& contour,
-                                              PyObject* vertices_list,
-                                              PyObject* codes_list) const;
-
-    // Return number of chunks that fit in the specified point_count.
-    long calc_chunk_count(long point_count) const;
-
-    // Return the point on the specified QuadEdge that intersects the specified
-    // level.
-    XY edge_interp(const QuadEdge& quad_edge, const double& level);
-
-    // Follow a contour along a boundary, appending points to the ContourLine
-    // as it progresses.  Only called for filled contours.  Stops when the
-    // contour leaves the boundary to move into the interior of the domain, or
-    // when the start_quad_edge is reached in which case the ContourLine is a
-    // completed closed loop.  Always adds the end point of each boundary edge
-    // to the ContourLine, regardless of whether moving to another boundary
-    // edge or leaving the boundary into the interior.  Never adds the start
-    // point of the first boundary edge to the ContourLine.
-    //   contour_line: ContourLine to append points to.
-    //   quad_edge: on entry the QuadEdge to start from, on exit the QuadEdge
-    //     that is stopped on.
-    //   lower_level: lower contour z-value.
-    //   upper_level: upper contour z-value.
-    //   level_index: level index started on (1 = lower, 2 = upper level).
-    //   start_quad_edge: QuadEdge that the ContourLine started from, which is
-    //     used to check if the ContourLine is finished.
-    // Returns the end level_index.
-    unsigned int follow_boundary(ContourLine& contour_line,
-                                 QuadEdge& quad_edge,
-                                 const double& lower_level,
-                                 const double& upper_level,
-                                 unsigned int level_index,
-                                 const QuadEdge& start_quad_edge);
-
-    // Follow a contour across the interior of the domain, appending points to
-    // the ContourLine as it progresses.  Called for both line and filled
-    // contours.  Stops when the contour reaches a boundary or, if the
-    // start_quad_edge is specified, when quad_edge == start_quad_edge and
-    // level_index == start_level_index.  Always adds the end point of each
-    // quad traversed to the ContourLine; only adds the start point of the
-    // first quad if want_initial_point flag is true.
-    //   contour_line: ContourLine to append points to.
-    //   quad_edge: on entry the QuadEdge to start from, on exit the QuadEdge
-    //     that is stopped on.
-    //   level_index: level index started on (1 = lower, 2 = upper level).
-    //   level: contour z-value.
-    //   want_initial_point: whether want to append the initial point to the
-    //     ContourLine or not.
-    //   start_quad_edge: the QuadEdge that the ContourLine started from to
-    //     check if the ContourLine is finished, or 0 if no check should occur.
-    //   start_level_index: the level_index that the ContourLine started from.
-    //   set_parents: whether should set ParentCache as it progresses or not.
-    //     This is true for filled contours, false for line contours.
-    void follow_interior(ContourLine& contour_line,
-                         QuadEdge& quad_edge,
-                         unsigned int level_index,
-                         const double& level,
-                         bool want_initial_point,
-                         const QuadEdge* start_quad_edge,
-                         unsigned int start_level_index,
-                         bool set_parents);
-
-    // Return the index limits of a particular chunk.
-    void get_chunk_limits(long ijchunk,
-                          long& ichunk,
-                          long& jchunk,
-                          long& istart,
-                          long& iend,
-                          long& jstart,
-                          long& jend);
-
-    // Check if a contour starts within the specified corner quad on the
-    // specified level_index, and if so return the start edge.  Otherwise
-    // return Edge_None.
-    Edge get_corner_start_edge(long quad, unsigned int level_index) const;
-
-    // Return index of point at start or end of specified QuadEdge, assuming
-    // anticlockwise ordering around non-masked quads.
-    long get_edge_point_index(const QuadEdge& quad_edge, bool start) const;
-
-    // Return the edge to exit a quad from, given the specified entry quad_edge
-    // and direction to move in.
-    Edge get_exit_edge(const QuadEdge& quad_edge, Dir dir) const;
-
-    // Return the (x,y) coordinates of the specified point index.
-    XY get_point_xy(long point) const;
-
-    // Return the z-value of the specified point index.
-    const double& get_point_z(long point) const;
-
-    // Check if a contour starts within the specified non-corner quad on the
-    // specified level_index, and if so return the start edge.  Otherwise
-    // return Edge_None.
-    Edge get_quad_start_edge(long quad, unsigned int level_index) const;
-
-    // Check if a contour starts within the specified quad, whether it is a
-    // corner or a full quad, and if so return the start edge.  Otherwise
-    // return Edge_None.
-    Edge get_start_edge(long quad, unsigned int level_index) const;
-
-    // Initialise the cache to contain grid information that is constant
-    // across the lifetime of this object, i.e. does not vary between calls to
-    // create_contour() and create_filled_contour().
-    void init_cache_grid(const MaskArray& mask);
-
-    // Initialise the cache with information that is specific to contouring the
-    // specified two levels.  The levels are the same for contour lines,
-    // different for filled contours.
-    void init_cache_levels(const double& lower_level,
-                           const double& upper_level);
-
-    // Return the (x,y) point at which the level intersects the line connecting
-    // the two specified point indices.
-    XY interp(long point1, long point2, const double& level) const;
-
-    // Return true if the specified QuadEdge is a boundary, i.e. is either an
-    // edge between a masked and non-masked quad/corner or is a chunk boundary.
-    bool is_edge_a_boundary(const QuadEdge& quad_edge) const;
-
-    // Follow a boundary from one QuadEdge to the next in an anticlockwise
-    // manner around the non-masked region.
-    void move_to_next_boundary_edge(QuadEdge& quad_edge) const;
-
-    // Move from the quad specified by quad_edge.quad to the neighbouring quad
-    // by crossing the edge specified by quad_edge.edge.
-    void move_to_next_quad(QuadEdge& quad_edge) const;
-
-    // Check for filled contours starting within the specified quad and
-    // complete any that are found, appending them to the specified Contour.
-    void single_quad_filled(Contour& contour,
-                            long quad,
-                            const double& lower_level,
-                            const double& upper_level);
-
-    // Start and complete a filled contour line.
-    //   quad: index of quad to start ContourLine in.
-    //   edge: edge of quad to start ContourLine from.
-    //   start_level_index: the level_index that the ContourLine starts from.
-    //   hole_or_not: whether the ContourLine is a hole or not.
-    //   boundary_or_interior: whether the ContourLine starts on a boundary or
-    //     the interior.
-    //   lower_level: lower contour z-value.
-    //   upper_level: upper contour z-value.
-    // Returns newly created ContourLine.
-    ContourLine* start_filled(long quad,
-                              Edge edge,
-                              unsigned int start_level_index,
-                              HoleOrNot hole_or_not,
-                              BoundaryOrInterior boundary_or_interior,
-                              const double& lower_level,
-                              const double& upper_level);
-
-    // Start and complete a line contour that both starts and end on a
-    // boundary, traversing the interior of the domain.
-    //   vertices_list: Python list that the ContourLine should be appended to.
-    //   quad: index of quad to start ContourLine in.
-    //   edge: boundary edge to start ContourLine from.
-    //   level: contour z-value.
-    // Returns true if the start quad does not need to be visited again, i.e.
-    // VISITED(quad,1).
-    bool start_line(PyObject* vertices_list,
-                    long quad,
-                    Edge edge,
-                    const double& level);
-
-    // Debug function that writes the cache status to stdout.
-    void write_cache(bool grid_only = false) const;
-
-    // Debug function that writes that cache status for a single quad to
-    // stdout.
-    void write_cache_quad(long quad, bool grid_only) const;
-
-
-
-    // Note that mask is not stored as once it has been used to initialise the
-    // cache it is no longer needed.
-    CoordinateArray _x, _y, _z;
-    long _nx, _ny;             // Number of points in each direction.
-    long _n;                   // Total number of points (and hence quads).
-
-    bool _corner_mask;
-    long _chunk_size;          // Number of quads per chunk (not points).
-                               // Always > 0, unlike python nchunk which is 0
-                               //     for no chunking.
-
-    long _nxchunk, _nychunk;   // Number of chunks in each direction.
-    long _chunk_count;         // Total number of chunks.
-
-    typedef uint32_t CacheItem;
-    CacheItem* _cache;
-
-    ParentCache _parent_cache; // On W quad sides.
-};
-
-#endif // _CONTOUR_H
diff --git a/src/_contour_wrapper.cpp b/src/_contour_wrapper.cpp
deleted file mode 100644
index da891eb70048..000000000000
--- a/src/_contour_wrapper.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-#include "_contour.h"
-#include "mplutils.h"
-#include "py_converters.h"
-#include "py_exceptions.h"
-
-/* QuadContourGenerator */
-
-typedef struct
-{
-    PyObject_HEAD
-    QuadContourGenerator* ptr;
-} PyQuadContourGenerator;
-
-static PyTypeObject PyQuadContourGeneratorType;
-
-static PyObject* PyQuadContourGenerator_new(PyTypeObject* type, PyObject* args, PyObject* kwds)
-{
-    PyQuadContourGenerator* self;
-    self = (PyQuadContourGenerator*)type->tp_alloc(type, 0);
-    self->ptr = NULL;
-    return (PyObject*)self;
-}
-
-const char* PyQuadContourGenerator_init__doc__ =
-    "QuadContourGenerator(x, y, z, mask, corner_mask, chunk_size)\n"
-    "--\n\n"
-    "Create a new C++ QuadContourGenerator object\n";
-
-static int PyQuadContourGenerator_init(PyQuadContourGenerator* self, PyObject* args, PyObject* kwds)
-{
-    QuadContourGenerator::CoordinateArray x, y, z;
-    QuadContourGenerator::MaskArray mask;
-    bool corner_mask;
-    long chunk_size;
-
-    if (!PyArg_ParseTuple(args, "O&O&O&O&O&l",
-                          &x.converter_contiguous, &x,
-                          &y.converter_contiguous, &y,
-                          &z.converter_contiguous, &z,
-                          &mask.converter_contiguous, &mask,
-                          &convert_bool, &corner_mask,
-                          &chunk_size)) {
-        return -1;
-    }
-
-    if (x.empty() || y.empty() || z.empty() ||
-        y.dim(0) != x.dim(0) || z.dim(0) != x.dim(0) ||
-        y.dim(1) != x.dim(1) || z.dim(1) != x.dim(1)) {
-        PyErr_SetString(PyExc_ValueError,
-            "x, y and z must all be 2D arrays with the same dimensions");
-        return -1;
-    }
-
-    if (z.dim(0) < 2 || z.dim(1) < 2) {
-        PyErr_SetString(PyExc_ValueError,
-            "x, y and z must all be at least 2x2 arrays");
-        return -1;
-    }
-
-    // Mask array is optional, if set must be same size as other arrays.
-    if (!mask.empty() && (mask.dim(0) != x.dim(0) || mask.dim(1) != x.dim(1))) {
-        PyErr_SetString(PyExc_ValueError,
-            "If mask is set it must be a 2D array with the same dimensions as x.");
-        return -1;
-    }
-
-    CALL_CPP_INIT("QuadContourGenerator",
-                  (self->ptr = new QuadContourGenerator(
-                       x, y, z, mask, corner_mask, chunk_size)));
-    return 0;
-}
-
-static void PyQuadContourGenerator_dealloc(PyQuadContourGenerator* self)
-{
-    delete self->ptr;
-    Py_TYPE(self)->tp_free((PyObject *)self);
-}
-
-const char* PyQuadContourGenerator_create_contour__doc__ =
-    "create_contour(level)\n"
-    "--\n\n"
-    "Create and return a non-filled contour.";
-
-static PyObject* PyQuadContourGenerator_create_contour(PyQuadContourGenerator* self, PyObject* args, PyObject* kwds)
-{
-    double level;
-    if (!PyArg_ParseTuple(args, "d:create_contour", &level)) {
-        return NULL;
-    }
-
-    PyObject* result;
-    CALL_CPP("create_contour", (result = self->ptr->create_contour(level)));
-    return result;
-}
-
-const char* PyQuadContourGenerator_create_filled_contour__doc__ =
-    "create_filled_contour(lower_level, upper_level)\n"
-    "--\n\n"
-    "Create and return a filled contour";
-
-static PyObject* PyQuadContourGenerator_create_filled_contour(PyQuadContourGenerator* self, PyObject* args, PyObject* kwds)
-{
-    double lower_level, upper_level;
-    if (!PyArg_ParseTuple(args, "dd:create_filled_contour",
-                          &lower_level, &upper_level)) {
-        return NULL;
-    }
-
-    if (lower_level >= upper_level)
-    {
-        PyErr_SetString(PyExc_ValueError,
-            "filled contour levels must be increasing");
-        return NULL;
-    }
-
-    PyObject* result;
-    CALL_CPP("create_filled_contour",
-             (result = self->ptr->create_filled_contour(lower_level,
-                                                        upper_level)));
-    return result;
-}
-
-static PyTypeObject* PyQuadContourGenerator_init_type(PyObject* m, PyTypeObject* type)
-{
-    static PyMethodDef methods[] = {
-        {"create_contour", (PyCFunction)PyQuadContourGenerator_create_contour, METH_VARARGS, PyQuadContourGenerator_create_contour__doc__},
-        {"create_filled_contour", (PyCFunction)PyQuadContourGenerator_create_filled_contour, METH_VARARGS, PyQuadContourGenerator_create_filled_contour__doc__},
-        {NULL}
-    };
-
-    memset(type, 0, sizeof(PyTypeObject));
-    type->tp_name = "matplotlib.QuadContourGenerator";
-    type->tp_doc = PyQuadContourGenerator_init__doc__;
-    type->tp_basicsize = sizeof(PyQuadContourGenerator);
-    type->tp_dealloc = (destructor)PyQuadContourGenerator_dealloc;
-    type->tp_flags = Py_TPFLAGS_DEFAULT;
-    type->tp_methods = methods;
-    type->tp_new = PyQuadContourGenerator_new;
-    type->tp_init = (initproc)PyQuadContourGenerator_init;
-
-    if (PyType_Ready(type) < 0) {
-        return NULL;
-    }
-
-    if (PyModule_AddObject(m, "QuadContourGenerator", (PyObject*)type)) {
-        return NULL;
-    }
-
-    return type;
-}
-
-
-/* Module */
-
-static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT,
-    "_contour",
-    NULL,
-    0,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL
-};
-
-#pragma GCC visibility push(default)
-
-PyMODINIT_FUNC PyInit__contour(void)
-{
-    PyObject *m;
-
-    m = PyModule_Create(&moduledef);
-
-    if (m == NULL) {
-        return NULL;
-    }
-
-    if (!PyQuadContourGenerator_init_type(m, &PyQuadContourGeneratorType)) {
-        return NULL;
-    }
-
-    import_array();
-
-    return m;
-}
-
-#pragma GCC visibility pop
diff --git a/src/_image.cpp b/src/_image.cpp
deleted file mode 100644
index 28e509a4a445..000000000000
--- a/src/_image.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- mode: c++; c-basic-offset: 4 -*- */
-
-#define NO_IMPORT_ARRAY
-
-#include <math.h>
-
-// utilities for irregular grids
-void _bin_indices_middle(
-    unsigned int *irows, int nrows, const float *ys1, unsigned long ny, float dy, float y_min)
-{
-    int i, j, j_last;
-    unsigned int *rowstart = irows;
-    const float *ys2 = ys1 + 1;
-    const float *yl = ys1 + ny;
-    float yo = y_min + dy / 2.0f;
-    float ym = 0.5f * (*ys1 + *ys2);
-    // y/rows
-    j = 0;
-    j_last = j;
-    for (i = 0; i < nrows; i++, yo += dy, rowstart++) {
-        while (ys2 != yl && yo > ym) {
-            ys1 = ys2;
-            ys2 = ys1 + 1;
-            ym = 0.5f * (*ys1 + *ys2);
-            j++;
-        }
-        *rowstart = j - j_last;
-        j_last = j;
-    }
-}
-
-void _bin_indices_middle_linear(float *arows,
-                                unsigned int *irows,
-                                int nrows,
-                                const float *y,
-                                unsigned long ny,
-                                float dy,
-                                float y_min)
-{
-    int i;
-    int ii = 0;
-    int iilast = (int)ny - 1;
-    float sc = 1 / dy;
-    int iy0 = (int)floor(sc * (y[ii] - y_min));
-    int iy1 = (int)floor(sc * (y[ii + 1] - y_min));
-    float invgap = 1.0f / (iy1 - iy0);
-    for (i = 0; i < nrows && i <= iy0; i++) {
-        irows[i] = 0;
-        arows[i] = 1.0;
-    }
-    for (; i < nrows; i++) {
-        while (i > iy1 && ii < iilast) {
-            ii++;
-            iy0 = iy1;
-            iy1 = (int)floor(sc * (y[ii + 1] - y_min));
-            invgap = 1.0f / (iy1 - iy0);
-        }
-        if (i >= iy0 && i <= iy1) {
-            irows[i] = ii;
-            arows[i] = (iy1 - i) * invgap;
-        } else
-            break;
-    }
-    for (; i < nrows; i++) {
-        irows[i] = iilast - 1;
-        arows[i] = 0.0;
-    }
-}
-
-void _bin_indices(int *irows, int nrows, const double *y, unsigned long ny, double sc, double offs)
-{
-    int i;
-    if (sc * (y[ny - 1] - y[0]) > 0) {
-        int ii = 0;
-        int iilast = (int)ny - 1;
-        int iy0 = (int)floor(sc * (y[ii] - offs));
-        int iy1 = (int)floor(sc * (y[ii + 1] - offs));
-        for (i = 0; i < nrows && i < iy0; i++) {
-            irows[i] = -1;
-        }
-        for (; i < nrows; i++) {
-            while (i > iy1 && ii < iilast) {
-                ii++;
-                iy0 = iy1;
-                iy1 = (int)floor(sc * (y[ii + 1] - offs));
-            }
-            if (i >= iy0 && i <= iy1)
-                irows[i] = ii;
-            else
-                break;
-        }
-        for (; i < nrows; i++) {
-            irows[i] = -1;
-        }
-    } else {
-        int iilast = (int)ny - 1;
-        int ii = iilast;
-        int iy0 = (int)floor(sc * (y[ii] - offs));
-        int iy1 = (int)floor(sc * (y[ii - 1] - offs));
-        for (i = 0; i < nrows && i < iy0; i++) {
-            irows[i] = -1;
-        }
-        for (; i < nrows; i++) {
-            while (i > iy1 && ii > 1) {
-                ii--;
-                iy0 = iy1;
-                iy1 = (int)floor(sc * (y[ii - 1] - offs));
-            }
-            if (i >= iy0 && i <= iy1)
-                irows[i] = ii - 1;
-            else
-                break;
-        }
-        for (; i < nrows; i++) {
-            irows[i] = -1;
-        }
-    }
-}
diff --git a/src/_image.h b/src/_image.h
deleted file mode 100644
index 37a080fff1d4..000000000000
--- a/src/_image.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/* -*- mode: c++; c-basic-offset: 4 -*- */
-
-/* image.h
- *
- */
-
-#ifndef MPL_IMAGE_H
-#define MPL_IMAGE_H
-
-#include <vector>
-
-
-// utilities for irregular grids
-void _bin_indices_middle(
-    unsigned int *irows, int nrows, const float *ys1, unsigned long ny, float dy, float y_min);
-void _bin_indices_middle_linear(float *arows,
-                                unsigned int *irows,
-                                int nrows,
-                                const float *y,
-                                unsigned long ny,
-                                float dy,
-                                float y_min);
-void _bin_indices(int *irows, int nrows, const double *y, unsigned long ny, double sc, double offs);
-
-template <class CoordinateArray, class ColorArray, class OutputArray>
-void pcolor(CoordinateArray &x,
-            CoordinateArray &y,
-            ColorArray &d,
-            unsigned int rows,
-            unsigned int cols,
-            float bounds[4],
-            int interpolation,
-            OutputArray &out)
-{
-    if (rows >= 32768 || cols >= 32768) {
-        throw std::runtime_error("rows and cols must both be less than 32768");
-    }
-
-    float x_min = bounds[0];
-    float x_max = bounds[1];
-    float y_min = bounds[2];
-    float y_max = bounds[3];
-    float width = x_max - x_min;
-    float height = y_max - y_min;
-    float dx = width / ((float)cols);
-    float dy = height / ((float)rows);
-
-    // Check we have something to output to
-    if (rows == 0 || cols == 0) {
-        throw std::runtime_error("Cannot scale to zero size");
-    }
-
-    if (d.dim(2) != 4) {
-        throw std::runtime_error("data must be in RGBA format");
-    }
-
-    // Check dimensions match
-    unsigned long nx = x.dim(0);
-    unsigned long ny = y.dim(0);
-    if (nx != (unsigned long)d.dim(1) || ny != (unsigned long)d.dim(0)) {
-        throw std::runtime_error("data and axis dimensions do not match");
-    }
-
-    // Allocate memory for pointer arrays
-    std::vector<unsigned int> rowstarts(rows);
-    std::vector<unsigned int> colstarts(cols);
-
-    // Calculate the pointer arrays to map input x to output x
-    unsigned int i, j;
-    unsigned int *colstart = &colstarts[0];
-    unsigned int *rowstart = &rowstarts[0];
-    const float *xs1 = x.data();
-    const float *ys1 = y.data();
-
-    // Copy data to output buffer
-    const unsigned char *start;
-    const unsigned char *inposition;
-    size_t inrowsize = nx * 4;
-    size_t rowsize = cols * 4;
-    unsigned char *position = (unsigned char *)out.data();
-    unsigned char *oldposition = NULL;
-    start = d.data();
-
-    if (interpolation == NEAREST) {
-        _bin_indices_middle(colstart, cols, xs1, nx, dx, x_min);
-        _bin_indices_middle(rowstart, rows, ys1, ny, dy, y_min);
-        for (i = 0; i < rows; i++, rowstart++) {
-            if (i > 0 && *rowstart == 0) {
-                memcpy(position, oldposition, rowsize * sizeof(unsigned char));
-                oldposition = position;
-                position += rowsize;
-            } else {
-                oldposition = position;
-                start += *rowstart * inrowsize;
-                inposition = start;
-                for (j = 0, colstart = &colstarts[0]; j < cols; j++, position += 4, colstart++) {
-                    inposition += *colstart * 4;
-                    memcpy(position, inposition, 4 * sizeof(unsigned char));
-                }
-            }
-        }
-    } else if (interpolation == BILINEAR) {
-        std::vector<float> acols(cols);
-        std::vector<float> arows(rows);
-
-        _bin_indices_middle_linear(&acols[0], colstart, cols, xs1, nx, dx, x_min);
-        _bin_indices_middle_linear(&arows[0], rowstart, rows, ys1, ny, dy, y_min);
-        double a00, a01, a10, a11, alpha, beta;
-
-        // Copy data to output buffer
-        for (i = 0; i < rows; i++) {
-            for (j = 0; j < cols; j++) {
-                alpha = arows[i];
-                beta = acols[j];
-
-                a00 = alpha * beta;
-                a01 = alpha * (1.0 - beta);
-                a10 = (1.0 - alpha) * beta;
-                a11 = 1.0 - a00 - a01 - a10;
-
-                for (size_t k = 0; k < 4; ++k) {
-                    position[k] =
-                        d(rowstart[i], colstart[j], k) * a00 +
-                        d(rowstart[i], colstart[j] + 1, k) * a01 +
-                        d(rowstart[i] + 1, colstart[j], k) * a10 +
-                        d(rowstart[i] + 1, colstart[j] + 1, k) * a11;
-                }
-                position += 4;
-            }
-        }
-    }
-}
-
-template <class CoordinateArray, class ColorArray, class Color, class OutputArray>
-void pcolor2(CoordinateArray &x,
-             CoordinateArray &y,
-             ColorArray &d,
-             unsigned int rows,
-             unsigned int cols,
-             float bounds[4],
-             Color &bg,
-             OutputArray &out)
-{
-    double x_left = bounds[0];
-    double x_right = bounds[1];
-    double y_bot = bounds[2];
-    double y_top = bounds[3];
-
-    // Check we have something to output to
-    if (rows == 0 || cols == 0) {
-        throw std::runtime_error("rows or cols is zero; there are no pixels");
-    }
-
-    if (d.dim(2) != 4) {
-        throw std::runtime_error("data must be in RGBA format");
-    }
-
-    // Check dimensions match
-    unsigned long nx = x.dim(0);
-    unsigned long ny = y.dim(0);
-    if (nx != (unsigned long)d.dim(1) + 1 || ny != (unsigned long)d.dim(0) + 1) {
-        throw std::runtime_error("data and axis bin boundary dimensions are incompatible");
-    }
-
-    if (bg.dim(0) != 4) {
-        throw std::runtime_error("bg must be in RGBA format");
-    }
-
-    std::vector<int> irows(rows);
-    std::vector<int> jcols(cols);
-
-    // Calculate the pointer arrays to map input x to output x
-    size_t i, j;
-    const double *x0 = x.data();
-    const double *y0 = y.data();
-    double sx = cols / (x_right - x_left);
-    double sy = rows / (y_top - y_bot);
-    _bin_indices(&jcols[0], cols, x0, nx, sx, x_left);
-    _bin_indices(&irows[0], rows, y0, ny, sy, y_bot);
-
-    // Copy data to output buffer
-    unsigned char *position = (unsigned char *)out.data();
-
-    for (i = 0; i < rows; i++) {
-        for (j = 0; j < cols; j++) {
-            if (irows[i] == -1 || jcols[j] == -1) {
-                memcpy(position, (const unsigned char *)bg.data(), 4 * sizeof(unsigned char));
-            } else {
-                for (size_t k = 0; k < 4; ++k) {
-                    position[k] = d(irows[i], jcols[j], k);
-                }
-            }
-            position += 4;
-        }
-    }
-}
-
-#endif
diff --git a/src/_image_resample.h b/src/_image_resample.h
index a508afa33ee4..99cedd9b2c93 100644
--- a/src/_image_resample.h
+++ b/src/_image_resample.h
@@ -25,7 +25,7 @@
 
 //----------------------------------------------------------------------------
 // Anti-Grain Geometry - Version 2.4
-// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://antigrain.com/)
 //
 // Permission to copy, use, modify, sell and distribute this software
 // is granted provided this copyright notice appears in all copies.
@@ -35,7 +35,7 @@
 //----------------------------------------------------------------------------
 // Contact: mcseem@antigrain.com
 //          mcseemagg@yahoo.com
-//          http://www.antigrain.com
+//          http://antigrain.com/
 //----------------------------------------------------------------------------
 //
 // Adaptation for high precision colors has been sponsored by
diff --git a/src/_image_wrapper.cpp b/src/_image_wrapper.cpp
index 73d093aa3b18..9eba0249d3e9 100644
--- a/src/_image_wrapper.cpp
+++ b/src/_image_wrapper.cpp
@@ -1,6 +1,5 @@
 #include "mplutils.h"
 #include "_image_resample.h"
-#include "_image.h"
 #include "numpy_cpp.h"
 #include "py_converters.h"
 
@@ -10,7 +9,8 @@
  * */
 
 const char* image_resample__doc__ =
-"resample(input_array, output_array, matrix, interpolation=NEAREST, alpha=1.0, norm=False, radius=1)\n\n"
+"resample(input_array, output_array, matrix, interpolation=NEAREST, alpha=1.0, norm=False, radius=1)\n"
+"--\n\n"
 
 "Resample input_array, blending it in-place into output_array, using an\n"
 "affine transformation.\n\n"
@@ -290,111 +290,13 @@ image_resample(PyObject *self, PyObject* args, PyObject *kwargs)
     return NULL;
 }
 
-
-const char *image_pcolor__doc__ =
-    "pcolor(x, y, data, rows, cols, bounds)\n"
-    "\n"
-    "Generate a pseudo-color image from data on a non-uniform grid using\n"
-    "nearest neighbour or linear interpolation.\n"
-    "bounds = (x_min, x_max, y_min, y_max)\n"
-    "interpolation = NEAREST or BILINEAR \n";
-
-static PyObject *image_pcolor(PyObject *self, PyObject *args, PyObject *kwds)
-{
-    numpy::array_view<const float, 1> x;
-    numpy::array_view<const float, 1> y;
-    numpy::array_view<const agg::int8u, 3> d;
-    npy_intp rows, cols;
-    float bounds[4];
-    int interpolation;
-
-    if (!PyArg_ParseTuple(args,
-                          "O&O&O&nn(ffff)i:pcolor",
-                          &x.converter,
-                          &x,
-                          &y.converter,
-                          &y,
-                          &d.converter_contiguous,
-                          &d,
-                          &rows,
-                          &cols,
-                          &bounds[0],
-                          &bounds[1],
-                          &bounds[2],
-                          &bounds[3],
-                          &interpolation)) {
-        return NULL;
-    }
-
-    npy_intp dim[3] = {rows, cols, 4};
-    numpy::array_view<const agg::int8u, 3> output(dim);
-
-    CALL_CPP("pcolor", (pcolor(x, y, d, rows, cols, bounds, interpolation, output)));
-
-    return output.pyobj();
-}
-
-const char *image_pcolor2__doc__ =
-    "pcolor2(x, y, data, rows, cols, bounds, bg)\n"
-    "\n"
-    "Generate a pseudo-color image from data on a non-uniform grid\n"
-    "specified by its cell boundaries.\n"
-    "bounds = (x_left, x_right, y_bot, y_top)\n"
-    "bg = ndarray of 4 uint8 representing background rgba\n";
-
-static PyObject *image_pcolor2(PyObject *self, PyObject *args, PyObject *kwds)
-{
-    numpy::array_view<const double, 1> x;
-    numpy::array_view<const double, 1> y;
-    numpy::array_view<const agg::int8u, 3> d;
-    npy_intp rows, cols;
-    float bounds[4];
-    numpy::array_view<const agg::int8u, 1> bg;
-
-    if (!PyArg_ParseTuple(args,
-                          "O&O&O&nn(ffff)O&:pcolor2",
-                          &x.converter_contiguous,
-                          &x,
-                          &y.converter_contiguous,
-                          &y,
-                          &d.converter_contiguous,
-                          &d,
-                          &rows,
-                          &cols,
-                          &bounds[0],
-                          &bounds[1],
-                          &bounds[2],
-                          &bounds[3],
-                          &bg.converter,
-                          &bg)) {
-        return NULL;
-    }
-
-    npy_intp dim[3] = {rows, cols, 4};
-    numpy::array_view<const agg::int8u, 3> output(dim);
-
-    CALL_CPP("pcolor2", (pcolor2(x, y, d, rows, cols, bounds, bg, output)));
-
-    return output.pyobj();
-}
-
 static PyMethodDef module_functions[] = {
     {"resample", (PyCFunction)image_resample, METH_VARARGS|METH_KEYWORDS, image_resample__doc__},
-    {"pcolor", (PyCFunction)image_pcolor, METH_VARARGS, image_pcolor__doc__},
-    {"pcolor2", (PyCFunction)image_pcolor2, METH_VARARGS, image_pcolor2__doc__},
     {NULL}
 };
 
 static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT,
-    "_image",
-    NULL,
-    0,
-    module_functions,
-    NULL,
-    NULL,
-    NULL,
-    NULL
+    PyModuleDef_HEAD_INIT, "_image", NULL, 0, module_functions,
 };
 
 #pragma GCC visibility push(default)
@@ -403,6 +305,8 @@ PyMODINIT_FUNC PyInit__image(void)
 {
     PyObject *m;
 
+    import_array();
+
     m = PyModule_Create(&moduledef);
 
     if (m == NULL) {
@@ -427,11 +331,10 @@ PyMODINIT_FUNC PyInit__image(void)
         PyModule_AddIntConstant(m, "LANCZOS", LANCZOS) ||
         PyModule_AddIntConstant(m, "BLACKMAN", BLACKMAN) ||
         PyModule_AddIntConstant(m, "_n_interpolation", _n_interpolation)) {
+        Py_DECREF(m);
         return NULL;
     }
 
-    import_array();
-
     return m;
 }
 
diff --git a/src/_macosx.m b/src/_macosx.m
index 190157811edc..668b73200b20 100755
--- a/src/_macosx.m
+++ b/src/_macosx.m
@@ -3,6 +3,7 @@
 #include <ApplicationServices/ApplicationServices.h>
 #include <sys/socket.h>
 #include <Python.h>
+#include "mplutils.h"
 
 #ifndef PYPY
 /* Remove this once Python is fixed: https://bugs.python.org/issue23237 */
@@ -11,43 +12,10 @@
 
 /* Proper way to check for the OS X version we are compiling for, from
  * https://developer.apple.com/library/archive/documentation/DeveloperTools/Conceptual/cross_development/Using/using.html
- */
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
-#define COMPILING_FOR_10_7
-#endif
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-#define COMPILING_FOR_10_10
-#endif
-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
-/* A lot of symbols were renamed in Sierra and cause deprecation warnings
-   so define macros for the new names if we are compiling on an older SDK */
-#define NSEventMaskAny                       NSAnyEventMask
-#define NSEventTypeApplicationDefined        NSApplicationDefined
-#define NSEventModifierFlagCommand           NSCommandKeyMask
-#define NSEventModifierFlagControl           NSControlKeyMask
-#define NSEventModifierFlagOption            NSAlternateKeyMask
-#define NSEventModifierFlagShift             NSShiftKeyMask
-#define NSEventTypeKeyUp                     NSKeyUp
-#define NSEventTypeKeyDown                   NSKeyDown
-#define NSEventTypeMouseMoved                NSMouseMoved
-#define NSEventTypeLeftMouseDown             NSLeftMouseDown
-#define NSEventTypeRightMouseDown            NSRightMouseDown
-#define NSEventTypeOtherMouseDown            NSOtherMouseDown
-#define NSEventTypeLeftMouseDragged          NSLeftMouseDragged
-#define NSEventTypeRightMouseDragged         NSRightMouseDragged
-#define NSEventTypeOtherMouseDragged         NSOtherMouseDragged
-#define NSEventTypeLeftMouseUp               NSLeftMouseUp
-#define NSEventTypeRightMouseUp              NSRightMouseUp
-#define NSEventTypeOtherMouseUp              NSOtherMouseUp
-#define NSWindowStyleMaskClosable            NSClosableWindowMask
-#define NSWindowStyleMaskMiniaturizable      NSMiniaturizableWindowMask
-#define NSWindowStyleMaskResizable           NSResizableWindowMask
-#define NSWindowStyleMaskTitled              NSTitledWindowMask
-#endif
 
+ * Renamed symbols cause deprecation warnings, so define macros for the new
+ * names if we are compiling on an older SDK */
 #if __MAC_OS_X_VERSION_MIN_REQUIRED < 101400
-/* A few more deprecations in Mojave */
 #define NSButtonTypeMomentaryLight           NSMomentaryLightButton
 #define NSButtonTypePushOnPushOff            NSPushOnPushOffButton
 #define NSBezelStyleShadowlessSquare         NSShadowlessSquareBezelStyle
@@ -64,6 +32,20 @@
    Needed to know when to stop the NSApp */
 static long FigureWindowCount = 0;
 
+/* Keep track of modifier key states for flagsChanged
+   to keep track of press vs release */
+static bool lastCommand = false;
+static bool lastControl = false;
+static bool lastShift = false;
+static bool lastOption = false;
+static bool lastCapsLock = false;
+/* Keep track of whether this specific key modifier was pressed or not */
+static bool keyChangeCommand = false;
+static bool keyChangeControl = false;
+static bool keyChangeShift = false;
+static bool keyChangeOption = false;
+static bool keyChangeCapsLock = false;
+
 /* -------------------------- Helper function ---------------------------- */
 
 static void
@@ -96,7 +78,8 @@ static void _sigint_callback(CFSocketRef s,
     CFRunLoopStop(runloop);
 }
 
-static CGEventRef _eventtap_callback(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon)
+static CGEventRef _eventtap_callback(
+    CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon)
 {
     CFRunLoopRef runloop = refcon;
     CFRunLoopStop(runloop);
@@ -121,8 +104,8 @@ static int wait_for_stdin(void)
 #ifdef PYOSINPUTHOOK_REPETITIVE
     if (!CFReadStreamHasBytesAvailable(stream))
     /* This is possible because of how PyOS_InputHook is called from Python */
-    {
 #endif
+    {
         int error;
         int channel[2];
         CFSocketRef sigint_socket = NULL;
@@ -135,8 +118,7 @@ static int wait_for_stdin(void)
                               &clientContext);
         CFReadStreamScheduleWithRunLoop(stream, runloop, kCFRunLoopDefaultMode);
         error = socketpair(AF_UNIX, SOCK_STREAM, 0, channel);
-        if (error==0)
-        {
+        if (!error) {
             CFSocketContext context;
             context.version = 0;
             context.info = &interrupted;
@@ -150,15 +132,11 @@ static int wait_for_stdin(void)
                 kCFSocketReadCallBack,
                 _sigint_callback,
                 &context);
-            if (sigint_socket)
-            {
-                CFRunLoopSourceRef source;
-                source = CFSocketCreateRunLoopSource(kCFAllocatorDefault,
-                                                     sigint_socket,
-                                                     0);
+            if (sigint_socket) {
+                CFRunLoopSourceRef source = CFSocketCreateRunLoopSource(
+                    kCFAllocatorDefault, sigint_socket, 0);
                 CFRelease(sigint_socket);
-                if (source)
-                {
+                if (source) {
                     CFRunLoopAddSource(runloop, source, kCFRunLoopDefaultMode);
                     CFRelease(source);
                     sigint_fd = channel[0];
@@ -174,25 +152,22 @@ static int wait_for_stdin(void)
                                            untilDate: [NSDate distantPast]
                                               inMode: NSDefaultRunLoopMode
                                              dequeue: YES];
-                if (!event) break;
+                if (!event) { break; }
                 [NSApp sendEvent: event];
             }
             CFRunLoopRun();
-            if (interrupted || CFReadStreamHasBytesAvailable(stream)) break;
+            if (interrupted || CFReadStreamHasBytesAvailable(stream)) { break; }
         }
 
-        if (py_sigint_handler) PyOS_setsig(SIGINT, py_sigint_handler);
-        CFReadStreamUnscheduleFromRunLoop(stream,
-                                          runloop,
-                                          kCFRunLoopCommonModes);
-        if (sigint_socket) CFSocketInvalidate(sigint_socket);
-        if (error==0) {
+        if (py_sigint_handler) { PyOS_setsig(SIGINT, py_sigint_handler); }
+        CFReadStreamUnscheduleFromRunLoop(
+            stream, runloop, kCFRunLoopCommonModes);
+        if (sigint_socket) { CFSocketInvalidate(sigint_socket); }
+        if (!error) {
             close(channel[0]);
             close(channel[1]);
         }
-#ifdef PYOSINPUTHOOK_REPETITIVE
     }
-#endif
     CFReadStreamClose(stream);
     CFRelease(stream);
     if (interrupted) {
@@ -221,14 +196,6 @@ - (BOOL)closeButtonPressed;
 - (void)dealloc;
 @end
 
-@interface ToolWindow : NSWindow
-{
-}
-- (ToolWindow*)initWithContentRect:(NSRect)rect master:(NSWindow*)window;
-- (void)masterCloses:(NSNotification*)notification;
-- (void)close;
-@end
-
 @interface View : NSView <NSWindowDelegate>
 {   PyObject* canvas;
     NSRect rubberband;
@@ -237,6 +204,8 @@ @interface View : NSView <NSWindowDelegate>
 }
 - (void)dealloc;
 - (void)drawRect:(NSRect)rect;
+- (void)updateDevicePixelRatio:(double)scale;
+- (void)windowDidChangeBackingProperties:(NSNotification*)notification;
 - (void)windowDidResize:(NSNotification*)notification;
 - (View*)initWithFrame:(NSRect)rect;
 - (void)setCanvas: (PyObject*)newCanvas;
@@ -262,17 +231,44 @@ - (void)keyDown:(NSEvent*)event;
 - (void)keyUp:(NSEvent*)event;
 - (void)scrollWheel:(NSEvent *)event;
 - (BOOL)acceptsFirstResponder;
-//- (void)flagsChanged:(NSEvent*)event;
+- (void)flagsChanged:(NSEvent*)event;
 @end
 
 /* ---------------------------- Python classes ---------------------------- */
 
+// Acquire the GIL, call a method with no args, discarding the result and
+// printing any exception.
+static void gil_call_method(PyObject* obj, const char* name)
+{
+    PyGILState_STATE gstate = PyGILState_Ensure();
+    PyObject* result = PyObject_CallMethod(obj, name, NULL);
+    if (result) {
+        Py_DECREF(result);
+    } else {
+        PyErr_Print();
+    }
+    PyGILState_Release(gstate);
+}
+
+#define PROCESS_EVENT(cls_name, fmt, ...) \
+{ \
+    PyGILState_STATE gstate = PyGILState_Ensure(); \
+    PyObject* module = NULL, * event = NULL, * result = NULL; \
+    if (!(module = PyImport_ImportModule("matplotlib.backend_bases")) \
+        || !(event = PyObject_CallMethod(module, cls_name, fmt, __VA_ARGS__)) \
+        || !(result = PyObject_CallMethod(event, "_process", ""))) { \
+        PyErr_Print(); \
+    } \
+    Py_XDECREF(module); \
+    Py_XDECREF(event); \
+    Py_XDECREF(result); \
+    PyGILState_Release(gstate); \
+}
+
 static bool backend_inited = false;
 
 static void lazy_init(void) {
-    if (backend_inited) {
-        return;
-    }
+    if (backend_inited) { return; }
     backend_inited = true;
 
     NSApp = [NSApplication sharedApplication];
@@ -314,12 +310,14 @@ static CGFloat _get_device_scale(CGContextRef cr)
     View* view;
 } FigureCanvas;
 
+static PyTypeObject FigureCanvasType;
+
 static PyObject*
 FigureCanvas_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
     lazy_init();
     FigureCanvas *self = (FigureCanvas*)type->tp_alloc(type, 0);
-    if (!self) return NULL;
+    if (!self) { return NULL; }
     self->view = [View alloc];
     return (PyObject*)self;
 }
@@ -327,16 +325,27 @@ static CGFloat _get_device_scale(CGContextRef cr)
 static int
 FigureCanvas_init(FigureCanvas *self, PyObject *args, PyObject *kwds)
 {
-    int width;
-    int height;
-    if(!self->view)
-    {
+    if (!self->view) {
         PyErr_SetString(PyExc_RuntimeError, "NSView* is NULL");
         return -1;
     }
-
-    if(!PyArg_ParseTuple(args, "ii", &width, &height)) return -1;
-
+    PyObject *builtins = NULL,
+             *super_obj = NULL,
+             *super_init = NULL,
+             *init_res = NULL,
+             *wh = NULL;
+    // super(FigureCanvasMac, self).__init__(*args, **kwargs)
+    if (!(builtins = PyImport_AddModule("builtins"))  // borrowed.
+            || !(super_obj = PyObject_CallMethod(builtins, "super", "OO", &FigureCanvasType, self))
+            || !(super_init = PyObject_GetAttrString(super_obj, "__init__"))
+            || !(init_res = PyObject_Call(super_init, args, kwds))) {
+        goto exit;
+    }
+    int width, height;
+    if (!(wh = PyObject_CallMethod((PyObject*)self, "get_width_height", ""))
+            || !PyArg_ParseTuple(wh, "ii", &width, &height)) {
+        goto exit;
+    }
     NSRect rect = NSMakeRect(0.0, 0.0, width, height);
     self->view = [self->view initWithFrame: rect];
     self->view.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
@@ -348,17 +357,20 @@ static CGFloat _get_device_scale(CGContextRef cr)
                                       owner: self->view
                                    userInfo: nil]];
     [self->view setCanvas: (PyObject*)self];
-    return 0;
+
+exit:
+    Py_XDECREF(super_obj);
+    Py_XDECREF(super_init);
+    Py_XDECREF(init_res);
+    Py_XDECREF(wh);
+    return PyErr_Occurred() ? -1 : 0;
 }
 
 static void
 FigureCanvas_dealloc(FigureCanvas* self)
 {
-    if (self->view)
-    {
-        [self->view setCanvas: NULL];
-        [self->view release];
-    }
+    [self->view setCanvas: NULL];
+    [self->view release];
     Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
@@ -370,41 +382,49 @@ static CGFloat _get_device_scale(CGContextRef cr)
 }
 
 static PyObject*
-FigureCanvas_draw(FigureCanvas* self)
+FigureCanvas_update(FigureCanvas* self)
 {
-    View* view = self->view;
-
-    if(view) /* The figure may have been closed already */
-    {
-        [view display];
-    }
-
+    [self->view setNeedsDisplay: YES];
     Py_RETURN_NONE;
 }
 
 static PyObject*
-FigureCanvas_draw_idle(FigureCanvas* self)
+FigureCanvas_flush_events(FigureCanvas* self)
 {
-    View* view = self->view;
-    if(!view)
-    {
-        PyErr_SetString(PyExc_RuntimeError, "NSView* is NULL");
-        return NULL;
+    // We run the app, matching any events that are waiting in the queue
+    // to process, breaking out of the loop when no events remain and
+    // displaying the canvas if needed.
+    NSEvent *event;
+    while (true) {
+        event = [NSApp nextEventMatchingMask: NSEventMaskAny
+                                   untilDate: [NSDate distantPast]
+                                      inMode: NSDefaultRunLoopMode
+                                     dequeue: YES];
+        if (!event) {
+            break;
+        }
+        [NSApp sendEvent:event];
     }
-    [view setNeedsDisplay: YES];
+    [self->view displayIfNeeded];
     Py_RETURN_NONE;
 }
 
 static PyObject*
-FigureCanvas_flush_events(FigureCanvas* self)
+FigureCanvas_set_cursor(PyObject* unused, PyObject* args)
 {
-    View* view = self->view;
-    if(!view)
-    {
-        PyErr_SetString(PyExc_RuntimeError, "NSView* is NULL");
-        return NULL;
+    int i;
+    if (!PyArg_ParseTuple(args, "i", &i)) { return NULL; }
+    switch (i) {
+      case 1: [[NSCursor arrowCursor] set]; break;
+      case 2: [[NSCursor pointingHandCursor] set]; break;
+      case 3: [[NSCursor crosshairCursor] set]; break;
+      case 4: [[NSCursor openHandCursor] set]; break;
+      /* OSX handles busy state itself so no need to set a cursor here */
+      case 5: break;
+      case 6: [[NSCursor resizeLeftRightCursor] set]; break;
+      case 7: [[NSCursor resizeUpDownCursor] set]; break;
+      default: return NULL;
     }
-    [view displayIfNeeded];
     Py_RETURN_NONE;
 }
 
@@ -412,41 +432,20 @@ static CGFloat _get_device_scale(CGContextRef cr)
 FigureCanvas_set_rubberband(FigureCanvas* self, PyObject *args)
 {
     View* view = self->view;
-    int x0, y0, x1, y1;
-    NSRect rubberband;
-    if(!view)
-    {
+    if (!view) {
         PyErr_SetString(PyExc_RuntimeError, "NSView* is NULL");
         return NULL;
     }
-    if(!PyArg_ParseTuple(args, "iiii", &x0, &y0, &x1, &y1)) return NULL;
-
+    int x0, y0, x1, y1;
+    if (!PyArg_ParseTuple(args, "iiii", &x0, &y0, &x1, &y1)) {
+        return NULL;
+    }
     x0 /= view->device_scale;
     x1 /= view->device_scale;
     y0 /= view->device_scale;
     y1 /= view->device_scale;
-
-    if (x1 > x0)
-    {
-        rubberband.origin.x = x0;
-        rubberband.size.width = x1 - x0;
-    }
-    else
-    {
-        rubberband.origin.x = x1;
-        rubberband.size.width = x0 - x1;
-    }
-    if (y1 > y0)
-    {
-        rubberband.origin.y = y0;
-        rubberband.size.height = y1 - y0;
-    }
-    else
-    {
-        rubberband.origin.y = y1;
-        rubberband.size.height = y0 - y1;
-    }
-
+    NSRect rubberband = NSMakeRect(x0 < x1 ? x0 : x1, y0 < y1 ? y0 : y1,
+                                   abs(x1 - x0), abs(y1 - y0));
     [view setRubberband: rubberband];
     Py_RETURN_NONE;
 }
@@ -454,13 +453,7 @@ static CGFloat _get_device_scale(CGContextRef cr)
 static PyObject*
 FigureCanvas_remove_rubberband(FigureCanvas* self)
 {
-    View* view = self->view;
-    if(!view)
-    {
-        PyErr_SetString(PyExc_RuntimeError, "NSView* is NULL");
-        return NULL;
-    }
-    [view removeRubberband];
+    [self->view removeRubberband];
     Py_RETURN_NONE;
 }
 
@@ -470,8 +463,9 @@ static CGFloat _get_device_scale(CGContextRef cr)
     float timeout = 0.0;
 
     static char* kwlist[] = {"timeout", NULL};
-    if(!PyArg_ParseTupleAndKeywords(args, keywords, "f", kwlist, &timeout))
+    if (!PyArg_ParseTupleAndKeywords(args, keywords, "f", kwlist, &timeout)) {
         return NULL;
+    }
 
     int error;
     int interrupted = 0;
@@ -482,8 +476,7 @@ static CGFloat _get_device_scale(CGContextRef cr)
     CFRunLoopRef runloop = CFRunLoopGetCurrent();
 
     error = pipe(channel);
-    if (error==0)
-    {
+    if (!error) {
         CFSocketContext context = {0, NULL, NULL, NULL, NULL};
         fcntl(channel[1], F_SETFL, O_WRONLY | O_NONBLOCK);
 
@@ -493,15 +486,11 @@ static CGFloat _get_device_scale(CGContextRef cr)
                                                  kCFSocketReadCallBack,
                                                  _sigint_callback,
                                                  &context);
-        if (sigint_socket)
-        {
-            CFRunLoopSourceRef source;
-            source = CFSocketCreateRunLoopSource(kCFAllocatorDefault,
-                                                 sigint_socket,
-                                                 0);
+        if (sigint_socket) {
+            CFRunLoopSourceRef source = CFSocketCreateRunLoopSource(
+                kCFAllocatorDefault, sigint_socket, 0);
             CFRelease(sigint_socket);
-            if (source)
-            {
+            if (source) {
                 CFRunLoopAddSource(runloop, source, kCFRunLoopDefaultMode);
                 CFRelease(source);
                 sigint_fd = channel[1];
@@ -520,15 +509,14 @@ static CGFloat _get_device_scale(CGContextRef cr)
                                             untilDate: date
                                                inMode: NSDefaultRunLoopMode
                                               dequeue: YES];
-       if (!event || [event type]==NSEventTypeApplicationDefined) break;
+       if (!event || [event type]==NSEventTypeApplicationDefined) { break; }
        [NSApp sendEvent: event];
     }
 
-    if (py_sigint_handler) PyOS_setsig(SIGINT, py_sigint_handler);
-
-    if (sigint_socket) CFSocketInvalidate(sigint_socket);
-    if (error==0) close(channel[1]);
-    if (interrupted) raise(SIGINT);
+    if (py_sigint_handler) { PyOS_setsig(SIGINT, py_sigint_handler); }
+    if (sigint_socket) { CFSocketInvalidate(sigint_socket); }
+    if (!error) { close(channel[1]); }
+    if (interrupted) { raise(SIGINT); }
 
     Py_RETURN_NONE;
 }
@@ -549,87 +537,47 @@ static CGFloat _get_device_scale(CGContextRef cr)
     Py_RETURN_NONE;
 }
 
-static PyMethodDef FigureCanvas_methods[] = {
-    {"draw",
-     (PyCFunction)FigureCanvas_draw,
-     METH_NOARGS,
-     NULL,  // docstring inherited.
-    },
-    {"draw_idle",
-     (PyCFunction)FigureCanvas_draw_idle,
-     METH_NOARGS,
-     NULL,  // docstring inherited.
-    },
-    {"flush_events",
-     (PyCFunction)FigureCanvas_flush_events,
-     METH_NOARGS,
-     "Flush the GUI events for the figure."
-    },
-    {"set_rubberband",
-     (PyCFunction)FigureCanvas_set_rubberband,
-     METH_VARARGS,
-     "Specifies a new rubberband rectangle and invalidates it."
-    },
-    {"remove_rubberband",
-     (PyCFunction)FigureCanvas_remove_rubberband,
-     METH_NOARGS,
-     "Removes the current rubberband rectangle."
-    },
-    {"start_event_loop",
-     (PyCFunction)FigureCanvas_start_event_loop,
-     METH_KEYWORDS | METH_VARARGS,
-     "Runs the event loop until the timeout or until stop_event_loop is called.\n",
-    },
-    {"stop_event_loop",
-     (PyCFunction)FigureCanvas_stop_event_loop,
-     METH_NOARGS,
-     "Stops the event loop that was started by start_event_loop.\n",
-    },
-    {NULL}  /* Sentinel */
-};
-
-static char FigureCanvas_doc[] =
-"A FigureCanvas object wraps a Cocoa NSView object.\n";
-
 static PyTypeObject FigureCanvasType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "_macosx.FigureCanvas",    /*tp_name*/
-    sizeof(FigureCanvas),      /*tp_basicsize*/
-    0,                         /*tp_itemsize*/
-    (destructor)FigureCanvas_dealloc,     /*tp_dealloc*/
-    0,                         /*tp_print*/
-    0,                         /*tp_getattr*/
-    0,                         /*tp_setattr*/
-    0,                         /*tp_compare*/
-    (reprfunc)FigureCanvas_repr,     /*tp_repr*/
-    0,                         /*tp_as_number*/
-    0,                         /*tp_as_sequence*/
-    0,                         /*tp_as_mapping*/
-    0,                         /*tp_hash */
-    0,                         /*tp_call*/
-    0,                         /*tp_str*/
-    0,                         /*tp_getattro*/
-    0,                         /*tp_setattro*/
-    0,                         /*tp_as_buffer*/
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,        /*tp_flags*/
-    FigureCanvas_doc,          /* tp_doc */
-    0,                         /* tp_traverse */
-    0,                         /* tp_clear */
-    0,                         /* tp_richcompare */
-    0,                         /* tp_weaklistoffset */
-    0,                         /* tp_iter */
-    0,                         /* tp_iternext */
-    FigureCanvas_methods,      /* tp_methods */
-    0,                         /* tp_members */
-    0,                         /* tp_getset */
-    0,                         /* tp_base */
-    0,                         /* tp_dict */
-    0,                         /* tp_descr_get */
-    0,                         /* tp_descr_set */
-    0,                         /* tp_dictoffset */
-    (initproc)FigureCanvas_init,      /* tp_init */
-    0,                         /* tp_alloc */
-    FigureCanvas_new,          /* tp_new */
+    .tp_name = "_macosx.FigureCanvas",
+    .tp_basicsize = sizeof(FigureCanvas),
+    .tp_dealloc = (destructor)FigureCanvas_dealloc,
+    .tp_repr = (reprfunc)FigureCanvas_repr,
+    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+    .tp_init = (initproc)FigureCanvas_init,
+    .tp_new = (newfunc)FigureCanvas_new,
+    .tp_doc = "A FigureCanvas object wraps a Cocoa NSView object.",
+    .tp_methods = (PyMethodDef[]){
+        {"update",
+         (PyCFunction)FigureCanvas_update,
+         METH_NOARGS,
+         NULL},  // docstring inherited
+        {"flush_events",
+         (PyCFunction)FigureCanvas_flush_events,
+         METH_NOARGS,
+         NULL},  // docstring inherited
+        {"set_cursor",
+         (PyCFunction)FigureCanvas_set_cursor,
+         METH_VARARGS,
+         "Set the active cursor."},
+        {"set_rubberband",
+         (PyCFunction)FigureCanvas_set_rubberband,
+         METH_VARARGS,
+         "Specify a new rubberband rectangle and invalidate it."},
+        {"remove_rubberband",
+         (PyCFunction)FigureCanvas_remove_rubberband,
+         METH_NOARGS,
+         "Remove the current rubberband rectangle."},
+        {"start_event_loop",
+         (PyCFunction)FigureCanvas_start_event_loop,
+         METH_KEYWORDS | METH_VARARGS,
+         NULL},  // docstring inherited
+        {"stop_event_loop",
+         (PyCFunction)FigureCanvas_stop_event_loop,
+         METH_NOARGS,
+         NULL},  // docstring inherited
+        {}  // sentinel
+    },
 };
 
 typedef struct {
@@ -642,10 +590,9 @@ static CGFloat _get_device_scale(CGContextRef cr)
 {
     lazy_init();
     Window* window = [Window alloc];
-    if (!window) return NULL;
+    if (!window) { return NULL; }
     FigureManager *self = (FigureManager*)type->tp_alloc(type, 0);
-    if (!self)
-    {
+    if (!self) {
         [window release];
         return NULL;
     }
@@ -657,42 +604,26 @@ static CGFloat _get_device_scale(CGContextRef cr)
 static int
 FigureManager_init(FigureManager *self, PyObject *args, PyObject *kwds)
 {
-    NSRect rect;
-    Window* window;
-    View* view;
-    PyObject* size;
-    int width, height;
-    PyObject* obj;
-    FigureCanvas* canvas;
-
-    if(!self->window)
-    {
-        PyErr_SetString(PyExc_RuntimeError, "NSWindow* is NULL");
+    PyObject* canvas;
+    if (!PyArg_ParseTuple(args, "O", &canvas)) {
         return -1;
     }
 
-    if(!PyArg_ParseTuple(args, "O", &obj)) return -1;
-
-    canvas = (FigureCanvas*)obj;
-    view = canvas->view;
-    if (!view) /* Something really weird going on */
-    {
+    View* view = ((FigureCanvas*)canvas)->view;
+    if (!view) {  /* Something really weird going on */
         PyErr_SetString(PyExc_RuntimeError, "NSView* is NULL");
         return -1;
     }
 
-    size = PyObject_CallMethod(obj, "get_width_height", "");
-    if(!size) return -1;
-    if(!PyArg_ParseTuple(size, "ii", &width, &height))
-    {    Py_DECREF(size);
-         return -1;
+    PyObject* size = PyObject_CallMethod(canvas, "get_width_height", "");
+    int width, height;
+    if (!size || !PyArg_ParseTuple(size, "ii", &width, &height)) {
+        Py_XDECREF(size);
+        return -1;
     }
     Py_DECREF(size);
 
-    rect.origin.x = 100;
-    rect.origin.y = 350;
-    rect.size.height = height;
-    rect.size.width = width;
+    NSRect rect = NSMakeRect( /* x */ 100, /* y */ 350, width, height);
 
     self->window = [self->window initWithContentRect: rect
                                          styleMask: NSWindowStyleMaskTitled
@@ -702,10 +633,11 @@ static CGFloat _get_device_scale(CGContextRef cr)
                                            backing: NSBackingStoreBuffered
                                              defer: YES
                                        withManager: (PyObject*)self];
-    window = self->window;
+    Window* window = self->window;
     [window setDelegate: view];
     [window makeFirstResponder: view];
     [[window contentView] addSubview: view];
+    [view updateDevicePixelRatio: [window backingScaleFactor]];
 
     return 0;
 }
@@ -720,34 +652,67 @@ static CGFloat _get_device_scale(CGContextRef cr)
 static void
 FigureManager_dealloc(FigureManager* self)
 {
-    Window* window = self->window;
-    if(window)
-    {
-        [window close];
-    }
+    [self->window close];
     Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
 static PyObject*
-FigureManager_show(FigureManager* self)
+FigureManager__show(FigureManager* self)
 {
-    Window* window = self->window;
-    if(window)
-    {
-        [window makeKeyAndOrderFront: nil];
-        [window orderFrontRegardless];
-    }
+    [self->window makeKeyAndOrderFront: nil];
+    Py_RETURN_NONE;
+}
+
+static PyObject*
+FigureManager__raise(FigureManager* self)
+{
+    [self->window orderFrontRegardless];
     Py_RETURN_NONE;
 }
 
 static PyObject*
 FigureManager_destroy(FigureManager* self)
 {
-    Window* window = self->window;
-    if(window)
-    {
-        [window close];
-        self->window = NULL;
+    [self->window close];
+    self->window = NULL;
+    Py_RETURN_NONE;
+}
+
+static PyObject*
+FigureManager_set_icon(PyObject* null, PyObject* args) {
+    PyObject* icon_path;
+    if (!PyArg_ParseTuple(args, "O&", &PyUnicode_FSDecoder, &icon_path)) {
+        return NULL;
+    }
+    const char* icon_path_ptr = PyUnicode_AsUTF8(icon_path);
+    if (!icon_path_ptr) {
+        Py_DECREF(icon_path);
+        return NULL;
+    }
+    @autoreleasepool {
+        NSString* ns_icon_path = [NSString stringWithUTF8String: icon_path_ptr];
+        Py_DECREF(icon_path);
+        if (!ns_icon_path) {
+            PyErr_SetString(PyExc_RuntimeError, "Could not convert to NSString*");
+            return NULL;
+        }
+        NSImage* image = [[[NSImage alloc] initByReferencingFile: ns_icon_path] autorelease];
+        if (!image) {
+            PyErr_SetString(PyExc_RuntimeError, "Could not create NSImage*");
+            return NULL;
+        }
+        if (!image.valid) {
+            PyErr_SetString(PyExc_RuntimeError, "Image is not valid");
+            return NULL;
+        }
+        @try {
+          NSApplication* app = [NSApplication sharedApplication];
+          app.applicationIconImage = image;
+        }
+        @catch (NSException* exception) {
+            PyErr_SetString(PyExc_RuntimeError, exception.reason.UTF8String);
+            return NULL;
+        }
     }
     Py_RETURN_NONE;
 }
@@ -760,32 +725,16 @@ static CGFloat _get_device_scale(CGContextRef cr)
     if (!PyArg_ParseTuple(args, "s", &title)) {
         return NULL;
     }
-    Window* window = self->window;
-    if(window)
-    {
-        NSString* ns_title = [[[NSString alloc]
-                               initWithCString: title
-                               encoding: NSUTF8StringEncoding] autorelease];
-        [window setTitle: ns_title];
-    }
+    [self->window setTitle: [NSString stringWithUTF8String: title]];
     Py_RETURN_NONE;
 }
 
 static PyObject*
 FigureManager_get_window_title(FigureManager* self)
 {
-    Window* window = self->window;
-    PyObject* result = NULL;
-    if(window)
-    {
-        NSString* title = [window title];
-        if (title) {
-            const char* cTitle = [title UTF8String];
-            result = PyUnicode_FromString(cTitle);
-        }
-    }
-    if (result) {
-        return result;
+    NSString* title = [self->window title];
+    if (title) {
+        return PyUnicode_FromString([title UTF8String]);
     } else {
         Py_RETURN_NONE;
     }
@@ -799,85 +748,61 @@ static CGFloat _get_device_scale(CGContextRef cr)
         return NULL;
     }
     Window* window = self->window;
-    if(window)
-    {
+    if (window) {
+        CGFloat device_pixel_ratio = [window backingScaleFactor];
+        width /= device_pixel_ratio;
+        height /= device_pixel_ratio;
         // 36 comes from hard-coded size of toolbar later in code
         [window setContentSize: NSMakeSize(width, height + 36.)];
     }
     Py_RETURN_NONE;
 }
 
-static PyMethodDef FigureManager_methods[] = {
-    {"show",
-     (PyCFunction)FigureManager_show,
-     METH_NOARGS,
-     "Shows the window associated with the figure manager."
-    },
-    {"destroy",
-     (PyCFunction)FigureManager_destroy,
-     METH_NOARGS,
-     "Closes the window associated with the figure manager."
-    },
-    {"set_window_title",
-     (PyCFunction)FigureManager_set_window_title,
-     METH_VARARGS,
-     "Sets the title of the window associated with the figure manager."
-    },
-    {"get_window_title",
-     (PyCFunction)FigureManager_get_window_title,
-     METH_NOARGS,
-     "Returns the title of the window associated with the figure manager."
-    },
-    {"resize",
-     (PyCFunction)FigureManager_resize,
-     METH_VARARGS,
-     "Resize the window (in pixels)."
-    },
-    {NULL}  /* Sentinel */
-};
-
-static char FigureManager_doc[] =
-"A FigureManager object wraps a Cocoa NSWindow object.\n";
+static PyObject*
+FigureManager_full_screen_toggle(FigureManager* self)
+{
+    [self->window toggleFullScreen: nil];
+    Py_RETURN_NONE;
+}
 
 static PyTypeObject FigureManagerType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "_macosx.FigureManager",   /*tp_name*/
-    sizeof(FigureManager),     /*tp_basicsize*/
-    0,                         /*tp_itemsize*/
-    (destructor)FigureManager_dealloc,     /*tp_dealloc*/
-    0,                         /*tp_print*/
-    0,                         /*tp_getattr*/
-    0,                         /*tp_setattr*/
-    0,                         /*tp_compare*/
-    (reprfunc)FigureManager_repr,     /*tp_repr*/
-    0,                         /*tp_as_number*/
-    0,                         /*tp_as_sequence*/
-    0,                         /*tp_as_mapping*/
-    0,                         /*tp_hash */
-    0,                         /*tp_call*/
-    0,                         /*tp_str*/
-    0,                         /*tp_getattro*/
-    0,                         /*tp_setattro*/
-    0,                         /*tp_as_buffer*/
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,        /*tp_flags*/
-    FigureManager_doc,         /* tp_doc */
-    0,                         /* tp_traverse */
-    0,                         /* tp_clear */
-    0,                         /* tp_richcompare */
-    0,                         /* tp_weaklistoffset */
-    0,                         /* tp_iter */
-    0,                         /* tp_iternext */
-    FigureManager_methods,     /* tp_methods */
-    0,                         /* tp_members */
-    0,                         /* tp_getset */
-    0,                         /* tp_base */
-    0,                         /* tp_dict */
-    0,                         /* tp_descr_get */
-    0,                         /* tp_descr_set */
-    0,                         /* tp_dictoffset */
-    (initproc)FigureManager_init,      /* tp_init */
-    0,                         /* tp_alloc */
-    FigureManager_new,          /* tp_new */
+    .tp_name = "_macosx.FigureManager",
+    .tp_basicsize = sizeof(FigureManager),
+    .tp_dealloc = (destructor)FigureManager_dealloc,
+    .tp_repr = (reprfunc)FigureManager_repr,
+    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+    .tp_init = (initproc)FigureManager_init,
+    .tp_new = (newfunc)FigureManager_new,
+    .tp_doc = "A FigureManager object wraps a Cocoa NSWindow object.",
+    .tp_methods = (PyMethodDef[]){  // All docstrings are inherited.
+        {"_show",
+         (PyCFunction)FigureManager__show,
+         METH_NOARGS},
+        {"_raise",
+         (PyCFunction)FigureManager__raise,
+         METH_NOARGS},
+        {"destroy",
+         (PyCFunction)FigureManager_destroy,
+         METH_NOARGS},
+        {"set_icon",
+         (PyCFunction)FigureManager_set_icon,
+         METH_STATIC | METH_VARARGS,
+         "Set application icon"},
+        {"set_window_title",
+         (PyCFunction)FigureManager_set_window_title,
+         METH_VARARGS},
+        {"get_window_title",
+         (PyCFunction)FigureManager_get_window_title,
+         METH_NOARGS},
+        {"resize",
+         (PyCFunction)FigureManager_resize,
+         METH_VARARGS},
+        {"full_screen_toggle",
+         (PyCFunction)FigureManager_full_screen_toggle,
+         METH_NOARGS},
+        {}  // sentinel
+    },
 };
 
 @interface NavigationToolbar2Handler : NSObject
@@ -886,7 +811,7 @@ @interface NavigationToolbar2Handler : NSObject
     NSButton* zoombutton;
 }
 - (NavigationToolbar2Handler*)initWithToolbar:(PyObject*)toolbar;
-- (void)installCallbacks:(SEL[7])actions forButtons: (NSButton*[7])buttons;
+- (void)installCallbacks:(SEL[7])actions forButtons:(NSButton*[7])buttons;
 - (void)home:(id)sender;
 - (void)back:(id)sender;
 - (void)forward:(id)sender;
@@ -906,175 +831,43 @@ - (void)save_figure:(id)sender;
 
 @implementation NavigationToolbar2Handler
 - (NavigationToolbar2Handler*)initWithToolbar:(PyObject*)theToolbar
-{   [self init];
+{
+    [self init];
     toolbar = theToolbar;
     return self;
 }
 
-- (void)installCallbacks:(SEL[7])actions forButtons: (NSButton*[7])buttons
+- (void)installCallbacks:(SEL[7])actions forButtons:(NSButton*[7])buttons
 {
     int i;
-    for (i = 0; i < 7; i++)
-    {
+    for (i = 0; i < 7; i++) {
         SEL action = actions[i];
         NSButton* button = buttons[i];
         [button setTarget: self];
         [button setAction: action];
-        if (action==@selector(pan:)) panbutton = button;
-        if (action==@selector(zoom:)) zoombutton = button;
+        if (action == @selector(pan:)) { panbutton = button; }
+        if (action == @selector(zoom:)) { zoombutton = button; }
     }
 }
 
--(void)home:(id)sender
-{   PyObject* result;
-    PyGILState_STATE gstate;
-    gstate = PyGILState_Ensure();
-    result = PyObject_CallMethod(toolbar, "home", "");
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-    PyGILState_Release(gstate);
-}
-
--(void)back:(id)sender
-{   PyObject* result;
-    PyGILState_STATE gstate;
-    gstate = PyGILState_Ensure();
-    result = PyObject_CallMethod(toolbar, "back", "");
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-    PyGILState_Release(gstate);
-}
-
--(void)forward:(id)sender
-{   PyObject* result;
-    PyGILState_STATE gstate;
-    gstate = PyGILState_Ensure();
-    result = PyObject_CallMethod(toolbar, "forward", "");
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-    PyGILState_Release(gstate);
-}
+-(void)home:(id)sender { gil_call_method(toolbar, "home"); }
+-(void)back:(id)sender { gil_call_method(toolbar, "back"); }
+-(void)forward:(id)sender { gil_call_method(toolbar, "forward"); }
 
 -(void)pan:(id)sender
-{   PyObject* result;
-    PyGILState_STATE gstate;
-    if ([sender state])
-    {
-        if (zoombutton) [zoombutton setState: NO];
-    }
-    gstate = PyGILState_Ensure();
-    result = PyObject_CallMethod(toolbar, "pan", "");
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-    PyGILState_Release(gstate);
+{
+    if ([sender state]) { [zoombutton setState:NO]; }
+    gil_call_method(toolbar, "pan");
 }
 
 -(void)zoom:(id)sender
-{   PyObject* result;
-    PyGILState_STATE gstate;
-    if ([sender state])
-    {
-        if (panbutton) [panbutton setState: NO];
-    }
-    gstate = PyGILState_Ensure();
-    result = PyObject_CallMethod(toolbar, "zoom", "");
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-    PyGILState_Release(gstate);
-}
-
--(void)configure_subplots:(id)sender
-{   PyObject* canvas;
-    View* view;
-    PyObject* size;
-    NSRect rect;
-    int width, height;
-
-    rect.origin.x = 100;
-    rect.origin.y = 350;
-    PyGILState_STATE gstate = PyGILState_Ensure();
-    PyObject* master = PyObject_GetAttrString(toolbar, "canvas");
-    if (master==nil)
-    {
-        PyErr_Print();
-        PyGILState_Release(gstate);
-        return;
-    }
-    canvas = PyObject_CallMethod(toolbar, "prepare_configure_subplots", "");
-    if(!canvas)
-    {
-        PyErr_Print();
-        Py_DECREF(master);
-        PyGILState_Release(gstate);
-        return;
-    }
-
-    view = ((FigureCanvas*)canvas)->view;
-    if (!view) /* Something really weird going on */
-    {
-        PyErr_SetString(PyExc_RuntimeError, "NSView* is NULL");
-        PyErr_Print();
-        Py_DECREF(canvas);
-        Py_DECREF(master);
-        PyGILState_Release(gstate);
-        return;
-    }
-
-    size = PyObject_CallMethod(canvas, "get_width_height", "");
-    Py_DECREF(canvas);
-    if(!size)
-    {
-        PyErr_Print();
-        Py_DECREF(master);
-        PyGILState_Release(gstate);
-        return;
-    }
-
-    int ok = PyArg_ParseTuple(size, "ii", &width, &height);
-    Py_DECREF(size);
-    if (!ok)
-    {
-        PyErr_Print();
-        Py_DECREF(master);
-        PyGILState_Release(gstate);
-        return;
-    }
-
-    NSWindow* mw = [((FigureCanvas*)master)->view window];
-    Py_DECREF(master);
-    PyGILState_Release(gstate);
-
-    rect.size.width = width;
-    rect.size.height = height;
-
-    ToolWindow* window = [ [ToolWindow alloc] initWithContentRect: rect
-                                                           master: mw];
-    [window setContentView: view];
-    [view release];
-    [window makeKeyAndOrderFront: nil];
+{
+    if ([sender state]) { [panbutton setState:NO]; }
+    gil_call_method(toolbar, "zoom");
 }
 
--(void)save_figure:(id)sender
-{   PyObject* result;
-    PyGILState_STATE gstate;
-    gstate = PyGILState_Ensure();
-    result = PyObject_CallMethod(toolbar, "save_figure", "");
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-    PyGILState_Release(gstate);
-}
+-(void)configure_subplots:(id)sender { gil_call_method(toolbar, "configure_subplots"); }
+-(void)save_figure:(id)sender { gil_call_method(toolbar, "save_figure"); }
 @end
 
 static PyObject*
@@ -1082,10 +875,9 @@ -(void)save_figure:(id)sender
 {
     lazy_init();
     NavigationToolbar2Handler* handler = [NavigationToolbar2Handler alloc];
-    if (!handler) return NULL;
+    if (!handler) { return NULL; }
     NavigationToolbar2 *self = (NavigationToolbar2*)type->tp_alloc(type, 0);
-    if (!self)
-    {
+    if (!self) {
         [handler release];
         return NULL;
     }
@@ -1096,41 +888,31 @@ -(void)save_figure:(id)sender
 static int
 NavigationToolbar2_init(NavigationToolbar2 *self, PyObject *args, PyObject *kwds)
 {
-    PyObject* obj;
     FigureCanvas* canvas;
-    View* view;
-
-    int i;
-    NSRect rect;
-    NSSize size;
-    NSSize scale;
+    const char* images[7];
+    const char* tooltips[7];
 
     const float gap = 2;
     const int height = 36;
     const int imagesize = 24;
 
-    self->height = height;
-
-    obj = PyObject_GetAttrString((PyObject*)self, "canvas");
-    if (obj==NULL)
-    {
-        PyErr_SetString(PyExc_AttributeError, "Attempt to install toolbar for NULL canvas");
-        return -1;
-    }
-    Py_DECREF(obj); /* Don't increase the reference count */
-    if (!PyObject_IsInstance(obj, (PyObject*) &FigureCanvasType))
-    {
-        PyErr_SetString(PyExc_TypeError, "Attempt to install toolbar for object that is not a FigureCanvas");
+    if (!PyArg_ParseTuple(args, "O!(sssssss)(sssssss)",
+                &FigureCanvasType, &canvas,
+                &images[0], &images[1], &images[2], &images[3],
+                &images[4], &images[5], &images[6],
+                &tooltips[0], &tooltips[1], &tooltips[2], &tooltips[3],
+                &tooltips[4], &tooltips[5], &tooltips[6])) {
         return -1;
     }
-    canvas = (FigureCanvas*)obj;
-    view = canvas->view;
-    if(!view)
-    {
+
+    View* view = canvas->view;
+    if (!view) {
         PyErr_SetString(PyExc_RuntimeError, "NSView* is NULL");
         return -1;
     }
 
+    self->height = height;
+
     NSRect bounds = [view bounds];
     NSWindow* window = [view window];
 
@@ -1140,16 +922,6 @@ -(void)save_figure:(id)sender
     bounds.size.height += height;
     [window setContentSize: bounds.size];
 
-    const char* images[7];
-    const char* tooltips[7];
-    if (!PyArg_ParseTuple(args, "(sssssss)(sssssss)",
-                &images[0], &images[1], &images[2], &images[3],
-                &images[4], &images[5], &images[6],
-                &tooltips[0], &tooltips[1], &tooltips[2], &tooltips[3],
-                &tooltips[4], &tooltips[5], &tooltips[6])) {
-        return -1;
-    }
-
     NSButton* buttons[7];
     SEL actions[7] = {@selector(home:),
                       @selector(back:),
@@ -1166,30 +938,29 @@ -(void)save_figure:(id)sender
                                    NSButtonTypeMomentaryLight,
                                    NSButtonTypeMomentaryLight};
 
-    rect.origin.x = 0;
-    rect.origin.y = 0;
-    rect.size.width = imagesize;
-    rect.size.height = imagesize;
-#ifdef COMPILING_FOR_10_7
+    NSRect rect;
+    NSSize size;
+    NSSize scale;
+
+    rect = NSMakeRect(0, 0, imagesize, imagesize);
     rect = [window convertRectToBacking: rect];
-#endif
     size = rect.size;
-    scale.width = imagesize / size.width;
-    scale.height = imagesize / size.height;
+    scale = NSMakeSize(imagesize / size.width, imagesize / size.height);
 
     rect.size.width = 32;
     rect.size.height = 32;
     rect.origin.x = gap;
     rect.origin.y = 0.5*(height - rect.size.height);
 
-    for (i = 0; i < 7; i++) {
-        NSString* filename = [NSString stringWithCString: images[i]
-                                                encoding: NSUTF8StringEncoding];
-        NSString* tooltip = [NSString stringWithCString: tooltips[i]
-                                               encoding: NSUTF8StringEncoding];
+    for (int i = 0; i < 7; i++) {
+        NSString* filename = [NSString stringWithUTF8String: images[i]];
+        NSString* tooltip = [NSString stringWithUTF8String: tooltips[i]];
         NSImage* image = [[NSImage alloc] initWithContentsOfFile: filename];
         buttons[i] = [[NSButton alloc] initWithFrame: rect];
         [image setSize: size];
+        // Specify that it is a template image so the content tint
+        // color gets updated with the system theme (dark/light)
+        [image setTemplate: YES];
         [buttons[i] setBezelStyle: NSBezelStyleShadowlessSquare];
         [buttons[i] setButtonType: buttontypes[i]];
         [buttons[i] setImage: image];
@@ -1206,22 +977,20 @@ -(void)save_figure:(id)sender
     [self->handler installCallbacks: actions forButtons: buttons];
 
     NSFont* font = [NSFont systemFontOfSize: 0.0];
-    rect.size.width = 300;
-    rect.size.height = 0;
-    rect.origin.x += height;
-    NSTextView* messagebox = [[NSTextView alloc] initWithFrame: rect];
-    if (@available(macOS 10.11, *)) {
-        messagebox.textContainer.maximumNumberOfLines = 2;
-        messagebox.textContainer.lineBreakMode = NSLineBreakByTruncatingTail;
-    }
+    // rect.origin.x is now at the far right edge of the buttons
+    // we want the messagebox to take up the rest of the toolbar area
+    // Make it a zero-width box if we don't have enough room
+    rect.size.width = fmax(bounds.size.width - rect.origin.x, 0);
+    rect.origin.x = bounds.size.width - rect.size.width;
+    NSTextView* messagebox = [[[NSTextView alloc] initWithFrame: rect] autorelease];
+    messagebox.textContainer.maximumNumberOfLines = 2;
+    messagebox.textContainer.lineBreakMode = NSLineBreakByTruncatingTail;
+    messagebox.alignment = NSTextAlignmentRight;
     [messagebox setFont: font];
     [messagebox setDrawsBackground: NO];
     [messagebox setSelectable: NO];
     /* if selectable, the messagebox can become first responder,
      * which is not supposed to happen */
-    rect = [messagebox frame];
-    rect.origin.y = 0.5 * (height - rect.size.height);
-    [messagebox setFrameOrigin: rect.origin];
     [[window contentView] addSubview: messagebox];
     [messagebox release];
     [[window contentView] display];
@@ -1243,88 +1012,57 @@ -(void)save_figure:(id)sender
     return PyUnicode_FromFormat("NavigationToolbar2 object %p", (void*)self);
 }
 
-static char NavigationToolbar2_doc[] =
-"NavigationToolbar2\n";
-
 static PyObject*
 NavigationToolbar2_set_message(NavigationToolbar2 *self, PyObject* args)
 {
     const char* message;
 
-    if(!PyArg_ParseTuple(args, "y", &message)) return NULL;
+    if (!PyArg_ParseTuple(args, "s", &message)) { return NULL; }
 
     NSTextView* messagebox = self->messagebox;
 
-    if (messagebox)
-    {
+    if (messagebox) {
         NSString* text = [NSString stringWithUTF8String: message];
         [messagebox setString: text];
 
-        // Adjust width with the window size
+        // Adjust width and height with the window size and content
         NSRect rectWindow = [messagebox.superview frame];
         NSRect rect = [messagebox frame];
+        // Entire region to the right of the buttons
         rect.size.width = rectWindow.size.width - rect.origin.x;
         [messagebox setFrame: rect];
-
-        // Adjust height with the content size
+        // We want to control the vertical position of
+        // the rect by the content size to center it vertically
         [messagebox.layoutManager ensureLayoutForTextContainer: messagebox.textContainer];
-        NSRect contentSize = [messagebox.layoutManager usedRectForTextContainer: messagebox.textContainer];
-        rect = [messagebox frame];
-        rect.origin.y = 0.5 * (self->height - contentSize.size.height);
+        NSRect contentRect = [messagebox.layoutManager usedRectForTextContainer: messagebox.textContainer];
+        rect.origin.y = 0.5 * (self->height - contentRect.size.height);
+        rect.size.height = contentRect.size.height;
         [messagebox setFrame: rect];
+        // Disable cursorRects so that the cursor doesn't get updated by events
+        // in NSApp (like resizing TextViews), we want to handle the cursor
+        // changes from within MPL with set_cursor() ourselves
+        [[messagebox.superview window] disableCursorRects];
     }
 
     Py_RETURN_NONE;
 }
 
-static PyMethodDef NavigationToolbar2_methods[] = {
-    {"set_message",
-     (PyCFunction)NavigationToolbar2_set_message,
-     METH_VARARGS,
-     "Set the message to be displayed on the toolbar."
-    },
-    {NULL}  /* Sentinel */
-};
-
 static PyTypeObject NavigationToolbar2Type = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "_macosx.NavigationToolbar2", /*tp_name*/
-    sizeof(NavigationToolbar2), /*tp_basicsize*/
-    0,                         /*tp_itemsize*/
-    (destructor)NavigationToolbar2_dealloc,     /*tp_dealloc*/
-    0,                         /*tp_print*/
-    0,                         /*tp_getattr*/
-    0,                         /*tp_setattr*/
-    0,                         /*tp_compare*/
-    (reprfunc)NavigationToolbar2_repr,     /*tp_repr*/
-    0,                         /*tp_as_number*/
-    0,                         /*tp_as_sequence*/
-    0,                         /*tp_as_mapping*/
-    0,                         /*tp_hash */
-    0,                         /*tp_call*/
-    0,                         /*tp_str*/
-    0,                         /*tp_getattro*/
-    0,                         /*tp_setattro*/
-    0,                         /*tp_as_buffer*/
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,        /*tp_flags*/
-    NavigationToolbar2_doc,    /* tp_doc */
-    0,                         /* tp_traverse */
-    0,                         /* tp_clear */
-    0,                         /* tp_richcompare */
-    0,                         /* tp_weaklistoffset */
-    0,                         /* tp_iter */
-    0,                         /* tp_iternext */
-    NavigationToolbar2_methods, /* tp_methods */
-    0,                         /* tp_members */
-    0,                         /* tp_getset */
-    0,                         /* tp_base */
-    0,                         /* tp_dict */
-    0,                         /* tp_descr_get */
-    0,                         /* tp_descr_set */
-    0,                         /* tp_dictoffset */
-    (initproc)NavigationToolbar2_init,      /* tp_init */
-    0,                         /* tp_alloc */
-    NavigationToolbar2_new,    /* tp_new */
+    .tp_name = "_macosx.NavigationToolbar2",
+    .tp_basicsize = sizeof(NavigationToolbar2),
+    .tp_dealloc = (destructor)NavigationToolbar2_dealloc,
+    .tp_repr = (reprfunc)NavigationToolbar2_repr,
+    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+    .tp_init = (initproc)NavigationToolbar2_init,
+    .tp_new = (newfunc)NavigationToolbar2_new,
+    .tp_doc = "NavigationToolbar2",
+    .tp_methods = (PyMethodDef[]){  // All docstrings are inherited.
+        {"set_message",
+         (PyCFunction)NavigationToolbar2_set_message,
+         METH_VARARGS},
+        {}  // sentinel
+    },
 };
 
 static PyObject*
@@ -1332,55 +1070,24 @@ -(void)save_figure:(id)sender
 {
     int result;
     const char* title;
+    const char* directory;
     const char* default_filename;
-    if (!PyArg_ParseTuple(args, "ss", &title, &default_filename)) {
+    if (!PyArg_ParseTuple(args, "sss", &title, &directory, &default_filename)) {
         return NULL;
     }
     NSSavePanel* panel = [NSSavePanel savePanel];
-    [panel setTitle: [NSString stringWithCString: title
-                                        encoding: NSASCIIStringEncoding]];
-    NSString* ns_default_filename =
-        [[NSString alloc]
-         initWithCString: default_filename
-         encoding: NSUTF8StringEncoding];
-    [panel setNameFieldStringValue: ns_default_filename];
+    [panel setTitle: [NSString stringWithUTF8String: title]];
+    [panel setDirectoryURL: [NSURL fileURLWithPath: [NSString stringWithUTF8String: directory]
+                                       isDirectory: YES]];
+    [panel setNameFieldStringValue: [NSString stringWithUTF8String: default_filename]];
     result = [panel runModal];
-    [ns_default_filename release];
-#ifdef COMPILING_FOR_10_10
-    if (result == NSModalResponseOK)
-#else
-    if (result == NSOKButton)
-#endif
-    {
-        NSURL* url = [panel URL];
-        NSString* filename = [url path];
+    if (result == NSModalResponseOK) {
+        NSString *filename = [[panel URL] path];
         if (!filename) {
             PyErr_SetString(PyExc_RuntimeError, "Failed to obtain filename");
             return 0;
         }
-        unsigned int n = [filename length];
-        unichar* buffer = malloc(n*sizeof(unichar));
-        [filename getCharacters: buffer];
-        PyObject* string = PyUnicode_FromKindAndData(PyUnicode_2BYTE_KIND, buffer, n);
-        free(buffer);
-        return string;
-    }
-    Py_RETURN_NONE;
-}
-
-static PyObject*
-set_cursor(PyObject* unused, PyObject* args)
-{
-    int i;
-    if(!PyArg_ParseTuple(args, "i", &i)) return NULL;
-    switch (i)
-    { case 0: [[NSCursor pointingHandCursor] set]; break;
-      case 1: [[NSCursor arrowCursor] set]; break;
-      case 2: [[NSCursor crosshairCursor] set]; break;
-      case 3: [[NSCursor openHandCursor] set]; break;
-      /* OSX handles busy state itself so no need to set a cursor here */
-      case 4: break;
-      default: return NULL;
+        return PyUnicode_FromString([filename UTF8String]);
     }
     Py_RETURN_NONE;
 }
@@ -1390,8 +1097,7 @@ @implementation WindowServerConnectionManager
 
 + (WindowServerConnectionManager *)sharedManager
 {
-    if (sharedWindowServerConnectionManager == nil)
-    {
+    if (sharedWindowServerConnectionManager == nil) {
         sharedWindowServerConnectionManager = [[super allocWithZone:NULL] init];
     }
     return sharedWindowServerConnectionManager;
@@ -1433,8 +1139,8 @@ - (void)launch:(NSNotification*)notification
     CFMachPortRef port;
     CFRunLoopSourceRef source;
     NSDictionary* dictionary = [notification userInfo];
-    if (! [[dictionary valueForKey:@"NSApplicationName"]
-           isEqualToString:@"Python"])
+    if (![[dictionary valueForKey:@"NSApplicationName"]
+            localizedCaseInsensitiveContainsString:@"python"])
         return;
     NSNumber* psnLow = [dictionary valueForKey: @"NSApplicationProcessSerialNumberLow"];
     NSNumber* psnHigh = [dictionary valueForKey: @"NSApplicationProcessSerialNumberHigh"];
@@ -1480,15 +1186,7 @@ - (NSRect)constrainFrameRect:(NSRect)rect toScreen:(NSScreen*)screen
 
 - (BOOL)closeButtonPressed
 {
-    PyObject* result;
-    PyGILState_STATE gstate;
-    gstate = PyGILState_Ensure();
-    result = PyObject_CallMethod(manager, "close", "");
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-    PyGILState_Release(gstate);
+    gil_call_method(manager, "_close_button_pressed");
     return YES;
 }
 
@@ -1516,36 +1214,6 @@ - (void)dealloc
 }
 @end
 
-@implementation ToolWindow
-- (ToolWindow*)initWithContentRect:(NSRect)rect master:(NSWindow*)window
-{
-    [self initWithContentRect: rect
-                    styleMask: NSWindowStyleMaskTitled
-                             | NSWindowStyleMaskClosable
-                             | NSWindowStyleMaskResizable
-                             | NSWindowStyleMaskMiniaturizable
-                      backing: NSBackingStoreBuffered
-                        defer: YES];
-    [self setTitle: @"Subplot Configuration Tool"];
-    [[NSNotificationCenter defaultCenter] addObserver: self
-                                             selector: @selector(masterCloses:)
-                                                 name: NSWindowWillCloseNotification
-                                               object: window];
-    return self;
-}
-
-- (void)masterCloses:(NSNotification*)notification
-{
-    [self close];
-}
-
-- (void)close
-{
-    [[NSNotificationCenter defaultCenter] removeObserver: self];
-    [super close];
-}
-@end
-
 @implementation View
 - (BOOL)isFlipped
 {
@@ -1563,7 +1231,7 @@ - (View*)initWithFrame:(NSRect)rect
 - (void)dealloc
 {
     FigureCanvas* fc = (FigureCanvas*)canvas;
-    if (fc) fc->view = NULL;
+    if (fc) { fc->view = NULL; }
     [super dealloc];
 }
 
@@ -1599,7 +1267,7 @@ static int _copy_agg_buffer(CGContextRef cr, PyObject *renderer)
     const size_t bitsPerPixel = bitsPerComponent * nComponents;
     const size_t bytesPerRow = nComponents * bytesPerComponent * ncols;
 
-    CGColorSpaceRef colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
+    CGColorSpaceRef colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
     if (!colorspace) {
         _buffer_release(buffer, NULL, 0);
         return 1;
@@ -1652,16 +1320,7 @@ -(void)drawRect:(NSRect)rect
 
     CGContextRef cr = [[NSGraphicsContext currentContext] CGContext];
 
-    double new_device_scale = _get_device_scale(cr);
-
-    if (device_scale != new_device_scale) {
-        device_scale = new_device_scale;
-        if (!PyObject_CallMethod(canvas, "_set_device_scale", "d", device_scale, NULL)) {
-            PyErr_Print();
-            goto exit;
-        }
-    }
-    if (!(renderer = PyObject_CallMethod(canvas, "_draw", "", NULL))
+    if (!(renderer = PyObject_CallMethod(canvas, "get_renderer", ""))
         || !(renderer_buffer = PyObject_GetAttrString(renderer, "_renderer"))) {
         PyErr_Print();
         goto exit;
@@ -1681,6 +1340,36 @@ -(void)drawRect:(NSRect)rect
     PyGILState_Release(gstate);
 }
 
+- (void)updateDevicePixelRatio:(double)scale
+{
+    PyObject* change = NULL;
+    PyGILState_STATE gstate = PyGILState_Ensure();
+
+    device_scale = scale;
+    if (!(change = PyObject_CallMethod(canvas, "_set_device_pixel_ratio", "d", device_scale))) {
+        PyErr_Print();
+        goto exit;
+    }
+    if (PyObject_IsTrue(change)) {
+        // Notify that there was a resize_event that took place
+        PROCESS_EVENT("ResizeEvent", "sO", "resize_event", canvas);
+        gil_call_method(canvas, "draw_idle");
+        [self setNeedsDisplay: YES];
+    }
+
+  exit:
+    Py_XDECREF(change);
+
+    PyGILState_Release(gstate);
+}
+
+- (void)windowDidChangeBackingProperties:(NSNotification *)notification
+{
+    Window* window = [notification object];
+
+    [self updateDevicePixelRatio: [window backingScaleFactor]];
+}
+
 - (void)windowDidResize: (NSNotification*)notification
 {
     int width, height;
@@ -1695,7 +1384,7 @@ - (void)windowDidResize: (NSNotification*)notification
     PyGILState_STATE gstate = PyGILState_Ensure();
     PyObject* result = PyObject_CallMethod(
             canvas, "resize", "ii", width, height);
-    if(result)
+    if (result)
         Py_DECREF(result);
     else
         PyErr_Print();
@@ -1705,16 +1394,7 @@ - (void)windowDidResize: (NSNotification*)notification
 
 - (void)windowWillClose:(NSNotification*)notification
 {
-    PyGILState_STATE gstate;
-    PyObject* result;
-
-    gstate = PyGILState_Ensure();
-    result = PyObject_CallMethod(canvas, "close_event", "");
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-    PyGILState_Release(gstate);
+    PROCESS_EVENT("CloseEvent", "sO", "close_event", canvas);
 }
 
 - (BOOL)windowShouldClose:(NSNotification*)notification
@@ -1730,48 +1410,32 @@ - (BOOL)windowShouldClose:(NSNotification*)notification
                                            data1: 0
                                            data2: 0];
     [NSApp postEvent: event atStart: true];
-    if ([window respondsToSelector: @selector(closeButtonPressed)])
-    { BOOL closed = [((Window*) window) closeButtonPressed];
-      /* If closed, the window has already been closed via the manager. */
-      if (closed) return NO;
+    if ([window respondsToSelector: @selector(closeButtonPressed)]) {
+        BOOL closed = [((Window*) window) closeButtonPressed];
+        /* If closed, the window has already been closed via the manager. */
+        if (closed) { return NO; }
     }
     return YES;
 }
 
 - (void)mouseEntered:(NSEvent *)event
 {
-    PyGILState_STATE gstate;
-    PyObject* result;
-
     int x, y;
     NSPoint location = [event locationInWindow];
     location = [self convertPoint: location fromView: nil];
     x = location.x * device_scale;
     y = location.y * device_scale;
-
-    gstate = PyGILState_Ensure();
-    result = PyObject_CallMethod(canvas, "enter_notify_event", "O(ii)",
-            Py_None, x, y);
-
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-    PyGILState_Release(gstate);
+    PROCESS_EVENT("LocationEvent", "sOii", "figure_enter_event", canvas, x, y);
 }
 
 - (void)mouseExited:(NSEvent *)event
 {
-    PyGILState_STATE gstate;
-    PyObject* result;
-
-    gstate = PyGILState_Ensure();
-    result = PyObject_CallMethod(canvas, "leave_notify_event", "");
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-    PyGILState_Release(gstate);
+    int x, y;
+    NSPoint location = [event locationInWindow];
+    location = [self convertPoint: location fromView: nil];
+    x = location.x * device_scale;
+    y = location.y * device_scale;
+    PROCESS_EVENT("LocationEvent", "sOii", "figure_leave_event", canvas, x, y);
 }
 
 - (void)mouseDown:(NSEvent *)event
@@ -1779,8 +1443,6 @@ - (void)mouseDown:(NSEvent *)event
     int x, y;
     int num;
     int dblclick = 0;
-    PyObject* result;
-    PyGILState_STATE gstate;
     NSPoint location = [event locationInWindow];
     location = [self convertPoint: location fromView: nil];
     x = location.x * device_scale;
@@ -1809,22 +1471,14 @@ - (void)mouseDown:(NSEvent *)event
     if ([event clickCount] == 2) {
       dblclick = 1;
     }
-    gstate = PyGILState_Ensure();
-    result = PyObject_CallMethod(canvas, "button_press_event", "iiii", x, y, num, dblclick);
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-
-    PyGILState_Release(gstate);
+    PROCESS_EVENT("MouseEvent", "sOiiiOii", "button_press_event", canvas,
+                  x, y, num, Py_None /* key */, 0 /* step */, dblclick);
 }
 
 - (void)mouseUp:(NSEvent *)event
 {
     int num;
     int x, y;
-    PyObject* result;
-    PyGILState_STATE gstate;
     NSPoint location = [event locationInWindow];
     location = [self convertPoint: location fromView: nil];
     x = location.x * device_scale;
@@ -1839,14 +1493,8 @@ - (void)mouseUp:(NSEvent *)event
          case NSEventTypeRightMouseUp: num = 3; break;
          default: return; /* Unknown mouse event */
     }
-    gstate = PyGILState_Ensure();
-    result = PyObject_CallMethod(canvas, "button_release_event", "iii", x, y, num);
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-
-    PyGILState_Release(gstate);
+    PROCESS_EVENT("MouseEvent", "sOiii", "button_release_event", canvas,
+                  x, y, num);
 }
 
 - (void)mouseMoved:(NSEvent *)event
@@ -1856,14 +1504,7 @@ - (void)mouseMoved:(NSEvent *)event
     location = [self convertPoint: location fromView: nil];
     x = location.x * device_scale;
     y = location.y * device_scale;
-    PyGILState_STATE gstate = PyGILState_Ensure();
-    PyObject* result = PyObject_CallMethod(canvas, "motion_notify_event", "ii", x, y);
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-
-    PyGILState_Release(gstate);
+    PROCESS_EVENT("MouseEvent", "sOii", "motion_notify_event", canvas, x, y);
 }
 
 - (void)mouseDragged:(NSEvent *)event
@@ -1873,281 +1514,156 @@ - (void)mouseDragged:(NSEvent *)event
     location = [self convertPoint: location fromView: nil];
     x = location.x * device_scale;
     y = location.y * device_scale;
-    PyGILState_STATE gstate = PyGILState_Ensure();
-    PyObject* result = PyObject_CallMethod(canvas, "motion_notify_event", "ii", x, y);
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-
-    PyGILState_Release(gstate);
+    PROCESS_EVENT("MouseEvent", "sOii", "motion_notify_event", canvas, x, y);
 }
 
-- (void)rightMouseDown:(NSEvent *)event
-{
-    int x, y;
-    int num = 3;
-    int dblclick = 0;
-    PyObject* result;
-    PyGILState_STATE gstate;
-    NSPoint location = [event locationInWindow];
-    location = [self convertPoint: location fromView: nil];
-    x = location.x * device_scale;
-    y = location.y * device_scale;
-    gstate = PyGILState_Ensure();
-    if ([event clickCount] == 2) {
-      dblclick = 1;
-    }
-    result = PyObject_CallMethod(canvas, "button_press_event", "iiii", x, y, num, dblclick);
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-
-    PyGILState_Release(gstate);
-}
-
-- (void)rightMouseUp:(NSEvent *)event
-{
-    int x, y;
-    int num = 3;
-    PyObject* result;
-    PyGILState_STATE gstate;
-    NSPoint location = [event locationInWindow];
-    location = [self convertPoint: location fromView: nil];
-    x = location.x * device_scale;
-    y = location.y * device_scale;
-    gstate = PyGILState_Ensure();
-    result = PyObject_CallMethod(canvas, "button_release_event", "iii", x, y, num);
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-
-    PyGILState_Release(gstate);
-}
-
-- (void)rightMouseDragged:(NSEvent *)event
-{
-    int x, y;
-    NSPoint location = [event locationInWindow];
-    location = [self convertPoint: location fromView: nil];
-    x = location.x * device_scale;
-    y = location.y * device_scale;
-    PyGILState_STATE gstate = PyGILState_Ensure();
-    PyObject* result = PyObject_CallMethod(canvas, "motion_notify_event", "ii", x, y);
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-
-    PyGILState_Release(gstate);
-}
-
-- (void)otherMouseDown:(NSEvent *)event
-{
-    int x, y;
-    int num = 2;
-    int dblclick = 0;
-    PyObject* result;
-    PyGILState_STATE gstate;
-    NSPoint location = [event locationInWindow];
-    location = [self convertPoint: location fromView: nil];
-    x = location.x * device_scale;
-    y = location.y * device_scale;
-    gstate = PyGILState_Ensure();
-    if ([event clickCount] == 2) {
-      dblclick = 1;
-    }
-    result = PyObject_CallMethod(canvas, "button_press_event", "iiii", x, y, num, dblclick);
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-
-    PyGILState_Release(gstate);
-}
-
-- (void)otherMouseUp:(NSEvent *)event
-{
-    int x, y;
-    int num = 2;
-    PyObject* result;
-    PyGILState_STATE gstate;
-    NSPoint location = [event locationInWindow];
-    location = [self convertPoint: location fromView: nil];
-    x = location.x * device_scale;
-    y = location.y * device_scale;
-    gstate = PyGILState_Ensure();
-    result = PyObject_CallMethod(canvas, "button_release_event", "iii", x, y, num);
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-
-    PyGILState_Release(gstate);
-}
-
-- (void)otherMouseDragged:(NSEvent *)event
-{
-    int x, y;
-    NSPoint location = [event locationInWindow];
-    location = [self convertPoint: location fromView: nil];
-    x = location.x * device_scale;
-    y = location.y * device_scale;
-    PyGILState_STATE gstate = PyGILState_Ensure();
-    PyObject* result = PyObject_CallMethod(canvas, "motion_notify_event", "ii", x, y);
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-
-    PyGILState_Release(gstate);
-}
+- (void)rightMouseDown:(NSEvent *)event { [self mouseDown: event]; }
+- (void)rightMouseUp:(NSEvent *)event { [self mouseUp: event]; }
+- (void)rightMouseDragged:(NSEvent *)event { [self mouseDragged: event]; }
+- (void)otherMouseDown:(NSEvent *)event { [self mouseDown: event]; }
+- (void)otherMouseUp:(NSEvent *)event { [self mouseUp: event]; }
+- (void)otherMouseDragged:(NSEvent *)event { [self mouseDragged: event]; }
 
 - (void)setRubberband:(NSRect)rect
 {
-    if (!NSIsEmptyRect(rubberband)) [self setNeedsDisplayInRect: rubberband];
+    if (!NSIsEmptyRect(rubberband)) { [self setNeedsDisplayInRect: rubberband]; }
     rubberband = rect;
     [self setNeedsDisplayInRect: rubberband];
 }
 
 - (void)removeRubberband
 {
-    if (NSIsEmptyRect(rubberband)) return;
+    if (NSIsEmptyRect(rubberband)) { return; }
     [self setNeedsDisplayInRect: rubberband];
     rubberband = NSZeroRect;
 }
 
-
-
 - (const char*)convertKeyEvent:(NSEvent*)event
 {
-    NSDictionary* specialkeymappings = [NSDictionary dictionaryWithObjectsAndKeys:
-                                        @"left", [NSNumber numberWithUnsignedLong:NSLeftArrowFunctionKey],
-                                        @"right", [NSNumber numberWithUnsignedLong:NSRightArrowFunctionKey],
-                                        @"up", [NSNumber numberWithUnsignedLong:NSUpArrowFunctionKey],
-                                        @"down", [NSNumber numberWithUnsignedLong:NSDownArrowFunctionKey],
-                                        @"f1", [NSNumber numberWithUnsignedLong:NSF1FunctionKey],
-                                        @"f2", [NSNumber numberWithUnsignedLong:NSF2FunctionKey],
-                                        @"f3", [NSNumber numberWithUnsignedLong:NSF3FunctionKey],
-                                        @"f4", [NSNumber numberWithUnsignedLong:NSF4FunctionKey],
-                                        @"f5", [NSNumber numberWithUnsignedLong:NSF5FunctionKey],
-                                        @"f6", [NSNumber numberWithUnsignedLong:NSF6FunctionKey],
-                                        @"f7", [NSNumber numberWithUnsignedLong:NSF7FunctionKey],
-                                        @"f8", [NSNumber numberWithUnsignedLong:NSF8FunctionKey],
-                                        @"f9", [NSNumber numberWithUnsignedLong:NSF9FunctionKey],
-                                        @"f10", [NSNumber numberWithUnsignedLong:NSF10FunctionKey],
-                                        @"f11", [NSNumber numberWithUnsignedLong:NSF11FunctionKey],
-                                        @"f12", [NSNumber numberWithUnsignedLong:NSF12FunctionKey],
-                                        @"f13", [NSNumber numberWithUnsignedLong:NSF13FunctionKey],
-                                        @"f14", [NSNumber numberWithUnsignedLong:NSF14FunctionKey],
-                                        @"f15", [NSNumber numberWithUnsignedLong:NSF15FunctionKey],
-                                        @"f16", [NSNumber numberWithUnsignedLong:NSF16FunctionKey],
-                                        @"f17", [NSNumber numberWithUnsignedLong:NSF17FunctionKey],
-                                        @"f18", [NSNumber numberWithUnsignedLong:NSF18FunctionKey],
-                                        @"f19", [NSNumber numberWithUnsignedLong:NSF19FunctionKey],
-                                        @"scroll_lock", [NSNumber numberWithUnsignedLong:NSScrollLockFunctionKey],
-                                        @"break", [NSNumber numberWithUnsignedLong:NSBreakFunctionKey],
-                                        @"insert", [NSNumber numberWithUnsignedLong:NSInsertFunctionKey],
-                                        @"delete", [NSNumber numberWithUnsignedLong:NSDeleteFunctionKey],
-                                        @"home", [NSNumber numberWithUnsignedLong:NSHomeFunctionKey],
-                                        @"end", [NSNumber numberWithUnsignedLong:NSEndFunctionKey],
-                                        @"pagedown", [NSNumber numberWithUnsignedLong:NSPageDownFunctionKey],
-                                        @"pageup", [NSNumber numberWithUnsignedLong:NSPageUpFunctionKey],
-                                        @"backspace", [NSNumber numberWithUnsignedLong:NSDeleteCharacter],
-                                        @"enter", [NSNumber numberWithUnsignedLong:NSEnterCharacter],
-                                        @"tab", [NSNumber numberWithUnsignedLong:NSTabCharacter],
-                                        @"enter", [NSNumber numberWithUnsignedLong:NSCarriageReturnCharacter],
-                                        @"backtab", [NSNumber numberWithUnsignedLong:NSBackTabCharacter],
-                                        @"escape", [NSNumber numberWithUnsignedLong:27],
-                                        nil
-                                        ];
-
     NSMutableString* returnkey = [NSMutableString string];
-    if ([event modifierFlags] & NSEventModifierFlagControl)
-        [returnkey appendString:@"ctrl+" ];
-    if ([event modifierFlags] & NSEventModifierFlagOption)
+    if (keyChangeControl) {
+        // When control is the key that was pressed, return the full word
+        [returnkey appendString:@"control+"];
+    } else if (([event modifierFlags] & NSEventModifierFlagControl)) {
+        // If control is already pressed, return the shortened version
+        [returnkey appendString:@"ctrl+"];
+    }
+    if (([event modifierFlags] & NSEventModifierFlagOption) || keyChangeOption) {
         [returnkey appendString:@"alt+" ];
-    if ([event modifierFlags] & NSEventModifierFlagCommand)
+    }
+    if (([event modifierFlags] & NSEventModifierFlagCommand) || keyChangeCommand) {
         [returnkey appendString:@"cmd+" ];
-
-    unichar uc = [[event charactersIgnoringModifiers] characterAtIndex:0];
-    NSString* specialchar = [specialkeymappings objectForKey:[NSNumber numberWithUnsignedLong:uc]];
-    if (specialchar){
-        if ([event modifierFlags] & NSEventModifierFlagShift)
-            [returnkey appendString:@"shift+" ];
-        [returnkey appendString:specialchar];
     }
-    else
-        [returnkey appendString:[event charactersIgnoringModifiers]];
+    // Don't print caps_lock unless it was the key that got pressed
+    if (keyChangeCapsLock) {
+        [returnkey appendString:@"caps_lock+" ];
+    }
+
+    // flagsChanged event can't handle charactersIgnoringModifiers
+    // because it was a modifier key that was pressed/released
+    if (event.type != NSEventTypeFlagsChanged) {
+        NSString* specialchar;
+        switch ([[event charactersIgnoringModifiers] characterAtIndex:0]) {
+            case NSLeftArrowFunctionKey: specialchar = @"left"; break;
+            case NSRightArrowFunctionKey: specialchar = @"right"; break;
+            case NSUpArrowFunctionKey: specialchar = @"up"; break;
+            case NSDownArrowFunctionKey: specialchar = @"down"; break;
+            case NSF1FunctionKey: specialchar = @"f1"; break;
+            case NSF2FunctionKey: specialchar = @"f2"; break;
+            case NSF3FunctionKey: specialchar = @"f3"; break;
+            case NSF4FunctionKey: specialchar = @"f4"; break;
+            case NSF5FunctionKey: specialchar = @"f5"; break;
+            case NSF6FunctionKey: specialchar = @"f6"; break;
+            case NSF7FunctionKey: specialchar = @"f7"; break;
+            case NSF8FunctionKey: specialchar = @"f8"; break;
+            case NSF9FunctionKey: specialchar = @"f9"; break;
+            case NSF10FunctionKey: specialchar = @"f10"; break;
+            case NSF11FunctionKey: specialchar = @"f11"; break;
+            case NSF12FunctionKey: specialchar = @"f12"; break;
+            case NSF13FunctionKey: specialchar = @"f13"; break;
+            case NSF14FunctionKey: specialchar = @"f14"; break;
+            case NSF15FunctionKey: specialchar = @"f15"; break;
+            case NSF16FunctionKey: specialchar = @"f16"; break;
+            case NSF17FunctionKey: specialchar = @"f17"; break;
+            case NSF18FunctionKey: specialchar = @"f18"; break;
+            case NSF19FunctionKey: specialchar = @"f19"; break;
+            case NSScrollLockFunctionKey: specialchar = @"scroll_lock"; break;
+            case NSBreakFunctionKey: specialchar = @"break"; break;
+            case NSInsertFunctionKey: specialchar = @"insert"; break;
+            case NSDeleteFunctionKey: specialchar = @"delete"; break;
+            case NSHomeFunctionKey: specialchar = @"home"; break;
+            case NSEndFunctionKey: specialchar = @"end"; break;
+            case NSPageDownFunctionKey: specialchar = @"pagedown"; break;
+            case NSPageUpFunctionKey: specialchar = @"pageup"; break;
+            case NSDeleteCharacter: specialchar = @"backspace"; break;
+            case NSEnterCharacter: specialchar = @"enter"; break;
+            case NSTabCharacter: specialchar = @"tab"; break;
+            case NSCarriageReturnCharacter: specialchar = @"enter"; break;
+            case NSBackTabCharacter: specialchar = @"backtab"; break;
+            case 27: specialchar = @"escape"; break;
+            default: specialchar = nil;
+        }
+        if (specialchar) {
+            if (([event modifierFlags] & NSEventModifierFlagShift) || keyChangeShift) {
+                [returnkey appendString:@"shift+"];
+            }
+            [returnkey appendString:specialchar];
+        } else {
+            [returnkey appendString:[event charactersIgnoringModifiers]];
+        }
+    } else {
+        if (([event modifierFlags] & NSEventModifierFlagShift) || keyChangeShift) {
+            [returnkey appendString:@"shift+"];
+        }
+        // Since it was a modifier event trim the final character of the string
+        // because we added in "+" earlier
+        [returnkey setString: [returnkey substringToIndex:[returnkey length] - 1]];
+    }
 
     return [returnkey UTF8String];
 }
 
 - (void)keyDown:(NSEvent*)event
 {
-    PyObject* result;
     const char* s = [self convertKeyEvent: event];
-    PyGILState_STATE gstate = PyGILState_Ensure();
-    if (s==NULL)
-    {
-        result = PyObject_CallMethod(canvas, "key_press_event", "O", Py_None);
-    }
-    else
-    {
-        result = PyObject_CallMethod(canvas, "key_press_event", "s", s);
+    NSPoint location = [[self window] mouseLocationOutsideOfEventStream];
+    location = [self convertPoint: location fromView: nil];
+    int x = location.x * device_scale,
+        y = location.y * device_scale;
+    if (s) {
+        PROCESS_EVENT("KeyEvent", "sOsii", "key_press_event", canvas, s, x, y);
+    } else {
+        PROCESS_EVENT("KeyEvent", "sOOii", "key_press_event", canvas, Py_None, x, y);
     }
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-
-    PyGILState_Release(gstate);
 }
 
 - (void)keyUp:(NSEvent*)event
 {
-    PyObject* result;
     const char* s = [self convertKeyEvent: event];
-    PyGILState_STATE gstate = PyGILState_Ensure();
-    if (s==NULL)
-    {
-        result = PyObject_CallMethod(canvas, "key_release_event", "O", Py_None);
-    }
-    else
-    {
-        result = PyObject_CallMethod(canvas, "key_release_event", "s", s);
+    NSPoint location = [[self window] mouseLocationOutsideOfEventStream];
+    location = [self convertPoint: location fromView: nil];
+    int x = location.x * device_scale,
+        y = location.y * device_scale;
+    if (s) {
+        PROCESS_EVENT("KeyEvent", "sOsii", "key_release_event", canvas, s, x, y);
+    } else {
+        PROCESS_EVENT("KeyEvent", "sOOii", "key_release_event", canvas, Py_None, x, y);
     }
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-
-    PyGILState_Release(gstate);
 }
 
 - (void)scrollWheel:(NSEvent*)event
 {
     int step;
     float d = [event deltaY];
-    if (d > 0) step = 1;
-    else if (d < 0) step = -1;
+    if (d > 0) { step = 1; }
+    else if (d < 0) { step = -1; }
     else return;
     NSPoint location = [event locationInWindow];
     NSPoint point = [self convertPoint: location fromView: nil];
     int x = (int)round(point.x * device_scale);
     int y = (int)round(point.y * device_scale - 1);
-
-    PyObject* result;
-    PyGILState_STATE gstate = PyGILState_Ensure();
-    result = PyObject_CallMethod(canvas, "scroll_event", "iii", x, y, step);
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
-
-    PyGILState_Release(gstate);
+    PROCESS_EVENT("MouseEvent", "sOiiOOi", "scroll_event", canvas,
+                  x, y, Py_None /* button */, Py_None /* key */, step);
 }
 
 - (BOOL)acceptsFirstResponder
@@ -2155,29 +1671,60 @@ - (BOOL)acceptsFirstResponder
     return YES;
 }
 
-/* This is all wrong. Address of pointer is being passed instead of pointer, keynames don't
-   match up with what the front-end and does the front-end even handle modifier keys by themselves?
+// flagsChanged gets called whenever a  modifier key is pressed OR released
+// so we need to handle both cases here
+- (void)flagsChanged:(NSEvent *)event
+{
+    bool isPress = false; // true if key is pressed, false if key was released
+
+    // Each if clause tests the two cases for each of the keys we can handle
+    // 1. If the modifier flag "command key" is pressed and it was not previously
+    // 2. If the modifier flag "command key" is not pressed and it was previously
+    // !! converts the result of the bitwise & operator to a logical boolean,
+    // which allows us to then bitwise xor (^) the result with a boolean (lastCommand).
+    if (!!([event modifierFlags] & NSEventModifierFlagCommand) ^ lastCommand) {
+        // Command pressed/released
+        lastCommand = !lastCommand;
+        keyChangeCommand = true;
+        isPress = lastCommand;
+    } else if (!!([event modifierFlags] & NSEventModifierFlagControl) ^ lastControl) {
+        // Control pressed/released
+        lastControl = !lastControl;
+        keyChangeControl = true;
+        isPress = lastControl;
+    } else if (!!([event modifierFlags] & NSEventModifierFlagShift) ^ lastShift) {
+        // Shift pressed/released
+        lastShift = !lastShift;
+        keyChangeShift = true;
+        isPress = lastShift;
+    } else if (!!([event modifierFlags] & NSEventModifierFlagOption) ^ lastOption) {
+        // Option pressed/released
+        lastOption = !lastOption;
+        keyChangeOption = true;
+        isPress = lastOption;
+    } else if (!!([event modifierFlags] & NSEventModifierFlagCapsLock) ^ lastCapsLock) {
+        // Capslock pressed/released
+        lastCapsLock = !lastCapsLock;
+        keyChangeCapsLock = true;
+        isPress = lastCapsLock;
+    } else {
+        // flag we don't handle
+        return;
+    }
 
-- (void)flagsChanged:(NSEvent*)event
-{
-    const char *s = NULL;
-    if (([event modifierFlags] & NSControlKeyMask) == NSControlKeyMask)
-        s = "control";
-    else if (([event modifierFlags] & NSShiftKeyMask) == NSShiftKeyMask)
-        s = "shift";
-    else if (([event modifierFlags] & NSAlternateKeyMask) == NSAlternateKeyMask)
-        s = "alt";
-    else return;
-    PyGILState_STATE gstate = PyGILState_Ensure();
-    PyObject* result = PyObject_CallMethod(canvas, "key_press_event", "s", &s);
-    if(result)
-        Py_DECREF(result);
-    else
-        PyErr_Print();
+    if (isPress) {
+        [self keyDown:event];
+    } else {
+        [self keyUp:event];
+    }
 
-    PyGILState_Release(gstate);
+    // Reset the state for the key changes after handling the event
+    keyChangeCommand = false;
+    keyChangeControl = false;
+    keyChangeShift = false;
+    keyChangeOption = false;
+    keyChangeCapsLock = false;
 }
- */
 @end
 
 static PyObject*
@@ -2206,7 +1753,7 @@ - (void)flagsChanged:(NSEvent*)event
 {
     lazy_init();
     Timer* self = (Timer*)type->tp_alloc(type, 0);
-    if (!self) return NULL;
+    if (!self) { return NULL; }
     self->timer = NULL;
     return (PyObject*) self;
 }
@@ -2218,20 +1765,9 @@ - (void)flagsChanged:(NSEvent*)event
                                (void*) self, (void*)(self->timer));
 }
 
-static char Timer_doc[] =
-"A Timer object wraps a CFRunLoopTimerRef and can add it to the event loop.\n";
-
 static void timer_callback(CFRunLoopTimerRef timer, void* info)
 {
-    PyObject* method = info;
-    PyGILState_STATE gstate = PyGILState_Ensure();
-    PyObject* result = PyObject_CallFunction(method, NULL);
-    if (result) {
-        Py_DECREF(result);
-    } else {
-        PyErr_Print();
-    }
-    PyGILState_Release(gstate);
+    gil_call_method(info, "_on_timer");
 }
 
 static void context_cleanup(const void* info)
@@ -2270,12 +1806,12 @@ static void context_cleanup(const void* info)
         PyErr_SetString(PyExc_RuntimeError, "_on_timer should be a Python method");
         goto exit;
     }
-    Py_INCREF(py_on_timer);
+    Py_INCREF(self);
     context.version = 0;
     context.retain = NULL;
     context.release = context_cleanup;
     context.copyDescription = NULL;
-    context.info = py_on_timer;
+    context.info = self;
     timer = CFRunLoopTimerCreate(kCFAllocatorDefault,
                                  firstFire,
                                  interval,
@@ -2325,126 +1861,62 @@ static void context_cleanup(const void* info)
     Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
-static PyMethodDef Timer_methods[] = {
-    {"_timer_start",
-     (PyCFunction)Timer__timer_start,
-     METH_VARARGS,
-     "Initialize and start the timer."
-    },
-    {"_timer_stop",
-     (PyCFunction)Timer__timer_stop,
-     METH_NOARGS,
-     "Stop the timer."
-    },
-    {NULL}  /* Sentinel */
-};
-
 static PyTypeObject TimerType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "_macosx.Timer",           /*tp_name*/
-    sizeof(Timer),             /*tp_basicsize*/
-    0,                         /*tp_itemsize*/
-    (destructor)Timer_dealloc,     /*tp_dealloc*/
-    0,                         /*tp_print*/
-    0,                         /*tp_getattr*/
-    0,                         /*tp_setattr*/
-    0,                         /*tp_compare*/
-    (reprfunc)Timer_repr,      /*tp_repr*/
-    0,                         /*tp_as_number*/
-    0,                         /*tp_as_sequence*/
-    0,                         /*tp_as_mapping*/
-    0,                         /*tp_hash */
-    0,                         /*tp_call*/
-    0,                         /*tp_str*/
-    0,                         /*tp_getattro*/
-    0,                         /*tp_setattro*/
-    0,                         /*tp_as_buffer*/
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,        /*tp_flags*/
-    Timer_doc,                 /* tp_doc */
-    0,                         /* tp_traverse */
-    0,                         /* tp_clear */
-    0,                         /* tp_richcompare */
-    0,                         /* tp_weaklistoffset */
-    0,                         /* tp_iter */
-    0,                         /* tp_iternext */
-    Timer_methods,             /* tp_methods */
-    0,                         /* tp_members */
-    0,                         /* tp_getset */
-    0,                         /* tp_base */
-    0,                         /* tp_dict */
-    0,                         /* tp_descr_get */
-    0,                         /* tp_descr_set */
-    0,                         /* tp_dictoffset */
-    0,                         /* tp_init */
-    0,                         /* tp_alloc */
-    Timer_new,                 /* tp_new */
-};
-
-static struct PyMethodDef methods[] = {
-   {"event_loop_is_running",
-    (PyCFunction)event_loop_is_running,
-    METH_NOARGS,
-    "Return whether the OSX backend has set up the NSApp main event loop."
-   },
-   {"show",
-    (PyCFunction)show,
-    METH_NOARGS,
-    "Show all the figures and enter the main loop.\n"
-    "\n"
-    "This function does not return until all Matplotlib windows are closed,\n"
-    "and is normally not needed in interactive sessions."
-   },
-   {"choose_save_file",
-    (PyCFunction)choose_save_file,
-    METH_VARARGS,
-    "Closes the window."
-   },
-   {"set_cursor",
-    (PyCFunction)set_cursor,
-    METH_VARARGS,
-    "Sets the active cursor."
-   },
-   {NULL, NULL, 0, NULL} /* sentinel */
+    .tp_name = "_macosx.Timer",
+    .tp_basicsize = sizeof(Timer),
+    .tp_dealloc = (destructor)Timer_dealloc,
+    .tp_repr = (reprfunc)Timer_repr,
+    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+    .tp_new = (newfunc)Timer_new,
+    .tp_doc = "A Timer object wraps a CFRunLoopTimerRef and can add it to the event loop.",
+    .tp_methods = (PyMethodDef[]){  // All docstrings are inherited.
+        {"_timer_start",
+         (PyCFunction)Timer__timer_start,
+         METH_VARARGS},
+        {"_timer_stop",
+         (PyCFunction)Timer__timer_stop,
+         METH_NOARGS},
+        {}  // sentinel
+    },
 };
 
 static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT,
-    "_macosx",
-    "Mac OS X native backend",
-    -1,
-    methods,
-    NULL,
-    NULL,
-    NULL,
-    NULL
+    PyModuleDef_HEAD_INIT, "_macosx", "Mac OS X native backend", -1,
+    (PyMethodDef[]){
+        {"event_loop_is_running",
+         (PyCFunction)event_loop_is_running,
+         METH_NOARGS,
+         "Return whether the OSX backend has set up the NSApp main event loop."},
+        {"show",
+         (PyCFunction)show,
+         METH_NOARGS,
+         "Show all the figures and enter the main loop.\n"
+         "\n"
+         "This function does not return until all Matplotlib windows are closed,\n"
+         "and is normally not needed in interactive sessions."},
+        {"choose_save_file",
+         (PyCFunction)choose_save_file,
+         METH_VARARGS,
+         "Query the user for a location where to save a file."},
+        {}  /* Sentinel */
+    },
 };
 
 #pragma GCC visibility push(default)
 
 PyObject* PyInit__macosx(void)
 {
-    PyObject *module;
-
-    if (PyType_Ready(&FigureCanvasType) < 0
-     || PyType_Ready(&FigureManagerType) < 0
-     || PyType_Ready(&NavigationToolbar2Type) < 0
-     || PyType_Ready(&TimerType) < 0)
+    PyObject *m;
+    if (!(m = PyModule_Create(&moduledef))
+        || prepare_and_add_type(&FigureCanvasType, m)
+        || prepare_and_add_type(&FigureManagerType, m)
+        || prepare_and_add_type(&NavigationToolbar2Type, m)
+        || prepare_and_add_type(&TimerType, m)) {
+        Py_XDECREF(m);
         return NULL;
-
-    module = PyModule_Create(&moduledef);
-    if (!module)
-        return NULL;
-
-    Py_INCREF(&FigureCanvasType);
-    Py_INCREF(&FigureManagerType);
-    Py_INCREF(&NavigationToolbar2Type);
-    Py_INCREF(&TimerType);
-    PyModule_AddObject(module, "FigureCanvas", (PyObject*) &FigureCanvasType);
-    PyModule_AddObject(module, "FigureManager", (PyObject*) &FigureManagerType);
-    PyModule_AddObject(module, "NavigationToolbar2", (PyObject*) &NavigationToolbar2Type);
-    PyModule_AddObject(module, "Timer", (PyObject*) &TimerType);
-
-    return module;
+    }
+    return m;
 }
 
 #pragma GCC visibility pop
diff --git a/src/_path.h b/src/_path.h
index 784a6457807c..e0e65287349d 100644
--- a/src/_path.h
+++ b/src/_path.h
@@ -21,6 +21,11 @@
 #include "_backend_agg_basic_types.h"
 #include "numpy_cpp.h"
 
+/* Compatibility for PyPy3.7 before 7.3.4. */
+#ifndef Py_DTSF_ADD_DOT_0
+#define Py_DTSF_ADD_DOT_0 0x2
+#endif
+
 struct XY
 {
     double x;
@@ -254,7 +259,7 @@ inline void points_in_path(PointArray &points,
     }
 
     transformed_path_t trans_path(path, trans);
-    no_nans_t no_nans_path(trans_path, true, path.has_curves());
+    no_nans_t no_nans_path(trans_path, true, path.has_codes());
     curve_t curved_path(no_nans_path);
     if (r != 0.0) {
         contour_t contoured_path(curved_path);
@@ -300,7 +305,7 @@ void points_on_path(PointArray &points,
     }
 
     transformed_path_t trans_path(path, trans);
-    no_nans_t nan_removed_path(trans_path, true, path.has_curves());
+    no_nans_t nan_removed_path(trans_path, true, path.has_codes());
     curve_t curved_path(nan_removed_path);
     stroke_t stroked_path(curved_path);
     stroked_path.width(r * 2.0);
@@ -373,7 +378,7 @@ void update_path_extents(PathIterator &path, agg::trans_affine &trans, extent_li
     unsigned code;
 
     transformed_path_t tpath(path, trans);
-    nan_removed_t nan_removed(tpath, true, path.has_curves());
+    nan_removed_t nan_removed(tpath, true, path.has_codes());
 
     nan_removed.rewind(0);
 
@@ -442,7 +447,6 @@ void point_in_path_collection(double x,
                               OffsetArray &offsets,
                               agg::trans_affine &offset_trans,
                               bool filled,
-                              e_offset_position offset_position,
                               std::vector<int> &result)
 {
     size_t Npaths = paths.size();
@@ -478,11 +482,7 @@ void point_in_path_collection(double x,
             double xo = offsets(i % Noffsets, 0);
             double yo = offsets(i % Noffsets, 1);
             offset_trans.transform(&xo, &yo);
-            if (offset_position == OFFSET_POSITION_DATA) {
-                trans = agg::trans_affine_translation(xo, yo) * trans;
-            } else {
-                trans *= agg::trans_affine_translation(xo, yo);
-            }
+            trans *= agg::trans_affine_translation(xo, yo);
         }
 
         if (filled) {
@@ -512,7 +512,7 @@ bool path_in_path(PathIterator1 &a,
     }
 
     transformed_path_t b_path_trans(b, btrans);
-    no_nans_t b_no_nans(b_path_trans, true, b.has_curves());
+    no_nans_t b_no_nans(b_path_trans, true, b.has_codes());
     curve_t b_curved(b_no_nans);
 
     double x, y;
@@ -529,7 +529,7 @@ bool path_in_path(PathIterator1 &a,
 /** The clip_path_to_rect code here is a clean-room implementation of
     the Sutherland-Hodgman clipping algorithm described here:
 
-  http://en.wikipedia.org/wiki/Sutherland-Hodgman_clipping_algorithm
+  https://en.wikipedia.org/wiki/Sutherland-Hodgman_clipping_algorithm
 */
 
 namespace clip_to_rect_filters
@@ -838,21 +838,26 @@ inline bool segments_intersect(const double &x1,
     // determinant
     double den = ((y4 - y3) * (x2 - x1)) - ((x4 - x3) * (y2 - y1));
 
-    if (isclose(den, 0.0)) {  // collinear segments
-        if (x1 == x2 && x2 == x3) { // segments have infinite slope (vertical lines)
-                                    // and lie on the same line
-            return (fmin(y1, y2) <= fmin(y3, y4) && fmin(y3, y4) <= fmax(y1, y2)) ||
-                   (fmin(y3, y4) <= fmin(y1, y2) && fmin(y1, y2) <= fmax(y3, y4));
-        }
-        else {
-            double intercept = (y1*x2 - y2*x1)*(x4 - x3) - (y3*x4 - y4*x3)*(x1 - x2);
-            if (isclose(intercept, 0.0)) { // segments lie on the same line
+    // If den == 0 we have two possibilities:
+    if (isclose(den, 0.0)) {
+        double t_area = (x2*y3 - x3*y2) - x1*(y3 - y2) + y1*(x3 - x2);
+        // 1 - If the area of the triangle made by the 3 first points (2 from the first segment
+        // plus one from the second) is zero, they are collinear
+        if (isclose(t_area, 0.0)) {
+            if (x1 == x2 && x2 == x3) { // segments have infinite slope (vertical lines)
+                                        // and lie on the same line
+                return (fmin(y1, y2) <= fmin(y3, y4) && fmin(y3, y4) <= fmax(y1, y2)) ||
+                    (fmin(y3, y4) <= fmin(y1, y2) && fmin(y1, y2) <= fmax(y3, y4));
+            }
+            else {
                 return (fmin(x1, x2) <= fmin(x3, x4) && fmin(x3, x4) <= fmax(x1, x2)) ||
-                       (fmin(x3, x4) <= fmin(x1, x2) && fmin(x1, x2) <= fmax(x3, x4));
+                        (fmin(x3, x4) <= fmin(x1, x2) && fmin(x1, x2) <= fmax(x3, x4));
             }
         }
-
-        return false;
+        // 2 - If t_area is not zero, the segments are parallel, but not collinear
+        else {
+            return false;
+        }
     }
 
     const double n1 = ((x4 - x3) * (y1 - y3)) - ((y4 - y3) * (x1 - x3));
@@ -877,8 +882,8 @@ bool path_intersects_path(PathIterator1 &p1, PathIterator2 &p2)
         return false;
     }
 
-    no_nans_t n1(p1, true, p1.has_curves());
-    no_nans_t n2(p2, true, p2.has_curves());
+    no_nans_t n1(p1, true, p1.has_codes());
+    no_nans_t n2(p2, true, p2.has_codes());
 
     curve_t c1(n1);
     curve_t c2(n2);
@@ -900,6 +905,7 @@ bool path_intersects_path(PathIterator1 &p1, PathIterator2 &p2)
             if ((isclose((x21 - x22) * (x21 - x22) + (y21 - y22) * (y21 - y22), 0))){
                 continue;
             }
+
             if (segments_intersect(x11, y11, x12, y12, x21, y21, x22, y22)) {
                 return true;
             }
@@ -940,7 +946,7 @@ bool path_intersects_rectangle(PathIterator &path,
         return false;
     }
 
-    no_nans_t no_nans(path, true, path.has_curves());
+    no_nans_t no_nans(path, true, path.has_codes());
     curve_t curve(no_nans);
 
     double cx = (rect_x1 + rect_x2) * 0.5, cy = (rect_y1 + rect_y2) * 0.5;
@@ -989,8 +995,8 @@ void convert_path_to_polygons(PathIterator &path,
     bool simplify = path.should_simplify();
 
     transformed_path_t tpath(path, trans);
-    nan_removal_t nan_removed(tpath, true, path.has_curves());
-    clipped_t clipped(nan_removed, do_clip && !path.has_curves(), width, height);
+    nan_removal_t nan_removed(tpath, true, path.has_codes());
+    clipped_t clipped(nan_removed, do_clip, width, height);
     simplify_t simplified(clipped, simplify, path.simplify_threshold());
     curve_t curve(simplified);
 
@@ -1054,8 +1060,8 @@ void cleanup_path(PathIterator &path,
     typedef Sketch<curve_t> sketch_t;
 
     transformed_path_t tpath(path, trans);
-    nan_removal_t nan_removed(tpath, remove_nans, path.has_curves());
-    clipped_t clipped(nan_removed, do_clip && !path.has_curves(), rect);
+    nan_removal_t nan_removed(tpath, remove_nans, path.has_codes());
+    clipped_t clipped(nan_removed, do_clip, rect);
     snapped_t snapped(clipped, snap_mode, path.total_vertices(), stroke_width);
     simplify_t simplified(snapped, do_simplify, path.simplify_threshold());
 
@@ -1138,17 +1144,15 @@ bool __convert_to_string(PathIterator &path,
     double last_x = 0.0;
     double last_y = 0.0;
 
-    const int sizes[] = { 1, 1, 2, 3 };
-    int size = 0;
     unsigned code;
 
     while ((code = path.vertex(&x[0], &y[0])) != agg::path_cmd_stop) {
-        if (code == 0x4f) {
+        if (code == CLOSEPOLY) {
             buffer += codes[4];
         } else if (code < 5) {
-            size = sizes[code - 1];
+            size_t size = NUM_VERTICES[code];
 
-            for (int i = 1; i < size; ++i) {
+            for (size_t i = 1; i < size; ++i) {
                 unsigned subcode = path.vertex(&x[i], &y[i]);
                 if (subcode != code) {
                     return false;
@@ -1168,7 +1172,7 @@ bool __convert_to_string(PathIterator &path,
                 buffer += ' ';
             }
 
-            for (int i = 0; i < size; ++i) {
+            for (size_t i = 0; i < size; ++i) {
                 __add_number(x[i], format_code, precision, buffer);
                 buffer += ' ';
                 __add_number(y[i], format_code, precision, buffer);
@@ -1214,8 +1218,8 @@ bool convert_to_string(PathIterator &path,
     bool do_clip = (clip_rect.x1 < clip_rect.x2 && clip_rect.y1 < clip_rect.y2);
 
     transformed_path_t tpath(path, trans);
-    nan_removal_t nan_removed(tpath, true, path.has_curves());
-    clipped_t clipped(nan_removed, do_clip && !path.has_curves(), clip_rect);
+    nan_removal_t nan_removed(tpath, true, path.has_codes());
+    clipped_t clipped(nan_removed, do_clip, clip_rect);
     simplify_t simplified(clipped, simplify, path.simplify_threshold());
 
     buffersize = path.total_vertices() * (precision + 5) * 4;
diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
index 40b5abb2fd37..b4081560411d 100644
--- a/src/_path_wrapper.cpp
+++ b/src/_path_wrapper.cpp
@@ -32,7 +32,7 @@ const char *Py_point_in_path__doc__ =
     "point_in_path(x, y, radius, path, trans)\n"
     "--\n\n";
 
-static PyObject *Py_point_in_path(PyObject *self, PyObject *args, PyObject *kwds)
+static PyObject *Py_point_in_path(PyObject *self, PyObject *args)
 {
     double x, y, r;
     py::PathIterator path;
@@ -64,7 +64,7 @@ const char *Py_points_in_path__doc__ =
     "points_in_path(points, radius, path, trans)\n"
     "--\n\n";
 
-static PyObject *Py_points_in_path(PyObject *self, PyObject *args, PyObject *kwds)
+static PyObject *Py_points_in_path(PyObject *self, PyObject *args)
 {
     numpy::array_view<const double, 2> points;
     double r;
@@ -95,7 +95,7 @@ const char *Py_point_on_path__doc__ =
     "point_on_path(x, y, radius, path, trans)\n"
     "--\n\n";
 
-static PyObject *Py_point_on_path(PyObject *self, PyObject *args, PyObject *kwds)
+static PyObject *Py_point_on_path(PyObject *self, PyObject *args)
 {
     double x, y, r;
     py::PathIterator path;
@@ -127,7 +127,7 @@ const char *Py_points_on_path__doc__ =
     "points_on_path(points, radius, path, trans)\n"
     "--\n\n";
 
-static PyObject *Py_points_on_path(PyObject *self, PyObject *args, PyObject *kwds)
+static PyObject *Py_points_on_path(PyObject *self, PyObject *args)
 {
     numpy::array_view<const double, 2> points;
     double r;
@@ -158,7 +158,7 @@ const char *Py_get_path_extents__doc__ =
     "get_path_extents(path, trans)\n"
     "--\n\n";
 
-static PyObject *Py_get_path_extents(PyObject *self, PyObject *args, PyObject *kwds)
+static PyObject *Py_get_path_extents(PyObject *self, PyObject *args)
 {
     py::PathIterator path;
     agg::trans_affine trans;
@@ -187,7 +187,7 @@ const char *Py_update_path_extents__doc__ =
     "update_path_extents(path, trans, rect, minpos, ignore)\n"
     "--\n\n";
 
-static PyObject *Py_update_path_extents(PyObject *self, PyObject *args, PyObject *kwds)
+static PyObject *Py_update_path_extents(PyObject *self, PyObject *args)
 {
     py::PathIterator path;
     agg::trans_affine trans;
@@ -266,20 +266,21 @@ const char *Py_get_path_collection_extents__doc__ =
     "master_transform, paths, transforms, offsets, offset_transform)\n"
     "--\n\n";
 
-static PyObject *Py_get_path_collection_extents(PyObject *self, PyObject *args, PyObject *kwds)
+static PyObject *Py_get_path_collection_extents(PyObject *self, PyObject *args)
 {
     agg::trans_affine master_transform;
-    PyObject *pathsobj;
+    py::PathGenerator paths;
     numpy::array_view<const double, 3> transforms;
     numpy::array_view<const double, 2> offsets;
     agg::trans_affine offset_trans;
     extent_limits e;
 
     if (!PyArg_ParseTuple(args,
-                          "O&OO&O&O&:get_path_collection_extents",
+                          "O&O&O&O&O&:get_path_collection_extents",
                           &convert_trans_affine,
                           &master_transform,
-                          &pathsobj,
+                          &convert_pathgen,
+                          &paths,
                           &convert_transforms,
                           &transforms,
                           &convert_points,
@@ -289,18 +290,9 @@ static PyObject *Py_get_path_collection_extents(PyObject *self, PyObject *args,
         return NULL;
     }
 
-    try
-    {
-        py::PathGenerator paths(pathsobj);
-
-        CALL_CPP("get_path_collection_extents",
-                 (get_path_collection_extents(
-                     master_transform, paths, transforms, offsets, offset_trans, e)));
-    }
-    catch (const py::exception &)
-    {
-        return NULL;
-    }
+    CALL_CPP("get_path_collection_extents",
+             (get_path_collection_extents(
+                 master_transform, paths, transforms, offsets, offset_trans, e)));
 
     npy_intp dims[] = { 2, 2 };
     numpy::array_view<double, 2> extents(dims);
@@ -320,29 +312,29 @@ static PyObject *Py_get_path_collection_extents(PyObject *self, PyObject *args,
 const char *Py_point_in_path_collection__doc__ =
     "point_in_path_collection("
     "x, y, radius, master_transform, paths, transforms, offsets, "
-    "offset_trans, filled, offset_position)\n"
+    "offset_trans, filled)\n"
     "--\n\n";
 
-static PyObject *Py_point_in_path_collection(PyObject *self, PyObject *args, PyObject *kwds)
+static PyObject *Py_point_in_path_collection(PyObject *self, PyObject *args)
 {
     double x, y, radius;
     agg::trans_affine master_transform;
-    PyObject *pathsobj;
+    py::PathGenerator paths;
     numpy::array_view<const double, 3> transforms;
     numpy::array_view<const double, 2> offsets;
     agg::trans_affine offset_trans;
     bool filled;
-    e_offset_position offset_position;
     std::vector<int> result;
 
     if (!PyArg_ParseTuple(args,
-                          "dddO&OO&O&O&O&O&:point_in_path_collection",
+                          "dddO&O&O&O&O&O&:point_in_path_collection",
                           &x,
                           &y,
                           &radius,
                           &convert_trans_affine,
                           &master_transform,
-                          &pathsobj,
+                          &convert_pathgen,
+                          &paths,
                           &convert_transforms,
                           &transforms,
                           &convert_points,
@@ -350,33 +342,21 @@ static PyObject *Py_point_in_path_collection(PyObject *self, PyObject *args, PyO
                           &convert_trans_affine,
                           &offset_trans,
                           &convert_bool,
-                          &filled,
-                          &convert_offset_position,
-                          &offset_position)) {
+                          &filled)) {
         return NULL;
     }
 
-    try
-    {
-        py::PathGenerator paths(pathsobj);
-
-        CALL_CPP("point_in_path_collection",
-                 (point_in_path_collection(x,
-                                           y,
-                                           radius,
-                                           master_transform,
-                                           paths,
-                                           transforms,
-                                           offsets,
-                                           offset_trans,
-                                           filled,
-                                           offset_position,
-                                           result)));
-    }
-    catch (const py::exception &)
-    {
-        return NULL;
-    }
+    CALL_CPP("point_in_path_collection",
+             (point_in_path_collection(x,
+                                       y,
+                                       radius,
+                                       master_transform,
+                                       paths,
+                                       transforms,
+                                       offsets,
+                                       offset_trans,
+                                       filled,
+                                       result)));
 
     npy_intp dims[] = {(npy_intp)result.size() };
     numpy::array_view<int, 1> pyresult(dims);
@@ -390,7 +370,7 @@ const char *Py_path_in_path__doc__ =
     "path_in_path(path_a, trans_a, path_b, trans_b)\n"
     "--\n\n";
 
-static PyObject *Py_path_in_path(PyObject *self, PyObject *args, PyObject *kwds)
+static PyObject *Py_path_in_path(PyObject *self, PyObject *args)
 {
     py::PathIterator a;
     agg::trans_affine atrans;
@@ -424,7 +404,7 @@ const char *Py_clip_path_to_rect__doc__ =
     "clip_path_to_rect(path, rect, inside)\n"
     "--\n\n";
 
-static PyObject *Py_clip_path_to_rect(PyObject *self, PyObject *args, PyObject *kwds)
+static PyObject *Py_clip_path_to_rect(PyObject *self, PyObject *args)
 {
     py::PathIterator path;
     agg::rect_d rect;
@@ -451,7 +431,7 @@ const char *Py_affine_transform__doc__ =
     "affine_transform(points, trans)\n"
     "--\n\n";
 
-static PyObject *Py_affine_transform(PyObject *self, PyObject *args, PyObject *kwds)
+static PyObject *Py_affine_transform(PyObject *self, PyObject *args)
 {
     PyObject *vertices_obj;
     agg::trans_affine trans;
@@ -471,17 +451,19 @@ static PyObject *Py_affine_transform(PyObject *self, PyObject *args, PyObject *k
 
     if (PyArray_NDIM(vertices_arr) == 2) {
         numpy::array_view<double, 2> vertices(vertices_arr);
+        Py_DECREF(vertices_arr);
+
         npy_intp dims[] = { (npy_intp)vertices.size(), 2 };
         numpy::array_view<double, 2> result(dims);
         CALL_CPP("affine_transform", (affine_transform_2d(vertices, trans, result)));
-        Py_DECREF(vertices_arr);
         return result.pyobj();
     } else { // PyArray_NDIM(vertices_arr) == 1
         numpy::array_view<double, 1> vertices(vertices_arr);
+        Py_DECREF(vertices_arr);
+
         npy_intp dims[] = { (npy_intp)vertices.size() };
         numpy::array_view<double, 1> result(dims);
         CALL_CPP("affine_transform", (affine_transform_1d(vertices, trans, result)));
-        Py_DECREF(vertices_arr);
         return result.pyobj();
     }
 }
@@ -490,7 +472,7 @@ const char *Py_count_bboxes_overlapping_bbox__doc__ =
     "count_bboxes_overlapping_bbox(bbox, bboxes)\n"
     "--\n\n";
 
-static PyObject *Py_count_bboxes_overlapping_bbox(PyObject *self, PyObject *args, PyObject *kwds)
+static PyObject *Py_count_bboxes_overlapping_bbox(PyObject *self, PyObject *args)
 {
     agg::rect_d bbox;
     numpy::array_view<const double, 3> bboxes;
@@ -632,7 +614,7 @@ const char *Py_cleanup_path__doc__ =
     "return_curves, sketch)\n"
     "--\n\n";
 
-static PyObject *Py_cleanup_path(PyObject *self, PyObject *args, PyObject *kwds)
+static PyObject *Py_cleanup_path(PyObject *self, PyObject *args)
 {
     py::PathIterator path;
     agg::trans_affine trans;
@@ -715,7 +697,7 @@ const char *Py_convert_to_string__doc__ =
     "--\n\n"
     "Convert *path* to a bytestring.\n"
     "\n"
-    "The first five parameters (up to *sketch*) are interpreted as in \n"
+    "The first five parameters (up to *sketch*) are interpreted as in\n"
     "`.cleanup_path`.  The following ones are detailed below.\n"
     "\n"
     "Parameters\n"
@@ -727,7 +709,7 @@ const char *Py_convert_to_string__doc__ =
     "sketch : tuple of 3 floats, or None\n"
     "precision : int\n"
     "    The precision used to \"%.*f\"-format the values.  Trailing zeros\n"
-    "    and decimal points are always removed.  (precision=-1 is a special \n"
+    "    and decimal points are always removed.  (precision=-1 is a special\n"
     "    case used to implement ttconv-back-compatible conversion.)\n"
     "codes : sequence of 5 bytestrings\n"
     "    The bytes representation of each opcode (MOVETO, LINETO, CURVE3,\n"
@@ -739,7 +721,7 @@ const char *Py_convert_to_string__doc__ =
     "    Whether the opcode comes after the values (True) or before (False).\n"
     ;
 
-static PyObject *Py_convert_to_string(PyObject *self, PyObject *args, PyObject *kwds)
+static PyObject *Py_convert_to_string(PyObject *self, PyObject *args)
 {
     py::PathIterator path;
     agg::trans_affine trans;
@@ -908,31 +890,15 @@ static PyMethodDef module_functions[] = {
 };
 
 static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT,
-    "_path",
-    NULL,
-    0,
-    module_functions,
-    NULL,
-    NULL,
-    NULL,
-    NULL
+    PyModuleDef_HEAD_INIT, "_path", NULL, 0, module_functions
 };
 
 #pragma GCC visibility push(default)
 
 PyMODINIT_FUNC PyInit__path(void)
 {
-    PyObject *m;
-    m = PyModule_Create(&moduledef);
-
-    if (m == NULL) {
-        return NULL;
-    }
-
     import_array();
-
-    return m;
+    return PyModule_Create(&moduledef);
 }
 
 #pragma GCC visibility pop
diff --git a/src/qhull_wrap.c b/src/_qhull_wrapper.cpp
similarity index 53%
rename from src/qhull_wrap.c
rename to src/_qhull_wrapper.cpp
index 0f7b3938299c..e27c4215b96e 100644
--- a/src/qhull_wrap.c
+++ b/src/_qhull_wrapper.cpp
@@ -7,9 +7,18 @@
  */
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
-#include "numpy/ndarrayobject.h"
+#include "numpy_cpp.h"
+#ifdef _MSC_VER
+/* The Qhull header does not declare this as extern "C", but only MSVC seems to
+ * do name mangling on global variables. We thus need to declare this before
+ * the header so that it treats it correctly, and doesn't mangle the name. */
+extern "C" {
+extern const char qh_version[];
+}
+#endif
 #include "libqhull_r/qhull_ra.h"
-#include <stdio.h>
+#include <cstdio>
+#include <vector>
 
 
 #ifndef MPL_DEVNULL
@@ -35,88 +44,104 @@ static void
 get_facet_vertices(qhT* qh, const facetT* facet, int indices[3])
 {
     vertexT *vertex, **vertexp;
-    FOREACHvertex_(facet->vertices)
+    FOREACHvertex_(facet->vertices) {
         *indices++ = qh_pointid(qh, vertex->point);
+    }
 }
 
 /* Return the indices of the 3 triangles that are neighbors of the specified
  * facet (triangle). */
 static void
-get_facet_neighbours(const facetT* facet, const int* tri_indices,
+get_facet_neighbours(const facetT* facet, std::vector<int>& tri_indices,
                      int indices[3])
 {
     facetT *neighbor, **neighborp;
-    FOREACHneighbor_(facet)
+    FOREACHneighbor_(facet) {
         *indices++ = (neighbor->upperdelaunay ? -1 : tri_indices[neighbor->id]);
+    }
 }
 
-/* Return 1 if the specified points arrays contain at least 3 unique points,
- * or 0 otherwise. */
-static int
-at_least_3_unique_points(int npoints, const double* x, const double* y)
+/* Return true if the specified points arrays contain at least 3 unique points,
+ * or false otherwise. */
+static bool
+at_least_3_unique_points(npy_intp npoints, const double* x, const double* y)
 {
     int i;
     const int unique1 = 0;  /* First unique point has index 0. */
     int unique2 = 0;        /* Second unique point index is 0 until set. */
 
-    if (npoints < 3)
-        return 0;
+    if (npoints < 3) {
+        return false;
+    }
 
     for (i = 1; i < npoints; ++i) {
         if (unique2 == 0) {
             /* Looking for second unique point. */
-            if (x[i] != x[unique1] || y[i] != y[unique1])
+            if (x[i] != x[unique1] || y[i] != y[unique1]) {
                 unique2 = i;
+            }
         }
         else {
             /* Looking for third unique point. */
             if ( (x[i] != x[unique1] || y[i] != y[unique1]) &&
                  (x[i] != x[unique2] || y[i] != y[unique2]) ) {
                 /* 3 unique points found, with indices 0, unique2 and i. */
-                return 1;
+                return true;
             }
         }
     }
 
     /* Run out of points before 3 unique points found. */
-    return 0;
+    return false;
 }
 
-/* Delaunay implementation methyod.  If hide_qhull_errors is 1 then qhull error
- * messages are discarded; if it is 0 then they are written to stderr. */
+/* Holds on to info from Qhull so that it can be destructed automatically. */
+class QhullInfo {
+public:
+    QhullInfo(FILE *error_file, qhT* qh) {
+        this->error_file = error_file;
+        this->qh = qh;
+    }
+
+    ~QhullInfo() {
+        qh_freeqhull(this->qh, !qh_ALL);
+        int curlong, totlong;  /* Memory remaining. */
+        qh_memfreeshort(this->qh, &curlong, &totlong);
+        if (curlong || totlong) {
+            PyErr_WarnEx(PyExc_RuntimeWarning,
+                         "Qhull could not free all allocated memory", 1);
+        }
+
+        if (this->error_file != stderr) {
+            fclose(error_file);
+        }
+    }
+
+private:
+    FILE* error_file;
+    qhT* qh;
+};
+
+/* Delaunay implementation method.
+ * If hide_qhull_errors is true then qhull error messages are discarded;
+ * if it is false then they are written to stderr. */
 static PyObject*
-delaunay_impl(int npoints, const double* x, const double* y,
-              int hide_qhull_errors)
+delaunay_impl(npy_intp npoints, const double* x, const double* y,
+              bool hide_qhull_errors)
 {
-	qhT qh_qh;                  /* qh variable type and name must be like */
-	qhT* qh = &qh_qh;           /* this for Qhull macros to work correctly. */
-    coordT* points = NULL;
+    qhT qh_qh;                  /* qh variable type and name must be like */
+    qhT* qh = &qh_qh;           /* this for Qhull macros to work correctly. */
     facetT* facet;
     int i, ntri, max_facet_id;
-    FILE* error_file = NULL;    /* qhull expects a FILE* to write errors to. */
     int exitcode;               /* Value returned from qh_new_qhull(). */
-    int* tri_indices = NULL;    /* Maps qhull facet id to triangle index. */
-    int indices[3];
-    int curlong, totlong;       /* Memory remaining after qh_memfreeshort. */
-    PyObject* tuple;            /* Return tuple (triangles, neighbors). */
     const int ndim = 2;
-    npy_intp dims[2];
-    PyArrayObject* triangles = NULL;
-    PyArrayObject* neighbors = NULL;
-    int* triangles_ptr;
-    int* neighbors_ptr;
     double x_mean = 0.0;
     double y_mean = 0.0;
 
     QHULL_LIB_CHECK
 
     /* Allocate points. */
-    points = (coordT*)malloc(npoints*ndim*sizeof(coordT));
-    if (points == NULL) {
-        PyErr_SetString(PyExc_MemoryError,
-                        "Could not allocate points array in qhull.delaunay");
-        goto error_before_qhull;
-    }
+    std::vector<coordT> points(npoints * ndim);
 
     /* Determine mean x, y coordinates. */
     for (i = 0; i < npoints; ++i) {
@@ -133,15 +158,14 @@ delaunay_impl(int npoints, const double* x, const double* y,
     }
 
     /* qhull expects a FILE* to write errors to. */
+    FILE* error_file = NULL;
     if (hide_qhull_errors) {
         /* qhull errors are ignored by writing to OS-equivalent of /dev/null.
          * Rather than have OS-specific code here, instead it is determined by
          * setupext.py and passed in via the macro MPL_DEVNULL. */
         error_file = fopen(STRINGIFY(MPL_DEVNULL), "w");
         if (error_file == NULL) {
-            PyErr_SetString(PyExc_RuntimeError,
-                            "Could not open devnull in qhull.delaunay");
-            goto error_before_qhull;
+            throw std::runtime_error("Could not open devnull");
         }
     }
     else {
@@ -150,15 +174,16 @@ delaunay_impl(int npoints, const double* x, const double* y,
     }
 
     /* Perform Delaunay triangulation. */
+    QhullInfo info(error_file, qh);
     qh_zero(qh, error_file);
-    exitcode = qh_new_qhull(qh, ndim, npoints, points, False,
-                            "qhull d Qt Qbb Qc Qz", NULL, error_file);
+    exitcode = qh_new_qhull(qh, ndim, (int)npoints, points.data(), False,
+                            (char*)"qhull d Qt Qbb Qc Qz", NULL, error_file);
     if (exitcode != qh_ERRnone) {
         PyErr_Format(PyExc_RuntimeError,
                      "Error in qhull Delaunay triangulation calculation: %s (exitcode=%d)%s",
                      qhull_error_msg[exitcode], exitcode,
                      hide_qhull_errors ? "; use python verbose option (-v) to see original qhull error." : "");
-        goto error;
+        return NULL;
     }
 
     /* Split facets so that they only have 3 points each. */
@@ -168,57 +193,44 @@ delaunay_impl(int npoints, const double* x, const double* y,
        Note that libqhull uses macros to iterate through collections. */
     ntri = 0;
     FORALLfacets {
-        if (!facet->upperdelaunay)
+        if (!facet->upperdelaunay) {
             ++ntri;
+        }
     }
 
     max_facet_id = qh->facet_id - 1;
 
     /* Create array to map facet id to triangle index. */
-    tri_indices = (int*)malloc((max_facet_id+1)*sizeof(int));
-    if (tri_indices == NULL) {
-        PyErr_SetString(PyExc_MemoryError,
-                        "Could not allocate triangle map in qhull.delaunay");
-        goto error;
-    }
+    std::vector<int> tri_indices(max_facet_id+1);
 
-    /* Allocate python arrays to return. */
-    dims[0] = ntri;
-    dims[1] = 3;
-    triangles = (PyArrayObject*)PyArray_SimpleNew(ndim, dims, NPY_INT);
-    if (triangles == NULL) {
-        PyErr_SetString(PyExc_MemoryError,
-                        "Could not allocate triangles array in qhull.delaunay");
-        goto error;
-    }
+    /* Allocate Python arrays to return. */
+    npy_intp dims[2] = {ntri, 3};
+    numpy::array_view<int, ndim> triangles(dims);
+    int* triangles_ptr = triangles.data();
 
-    neighbors = (PyArrayObject*)PyArray_SimpleNew(ndim, dims, NPY_INT);
-    if (neighbors == NULL) {
-        PyErr_SetString(PyExc_MemoryError,
-                        "Could not allocate neighbors array in qhull.delaunay");
-        goto error;
-    }
-
-    triangles_ptr = (int*)PyArray_DATA(triangles);
-    neighbors_ptr = (int*)PyArray_DATA(neighbors);
+    numpy::array_view<int, ndim> neighbors(dims);
+    int* neighbors_ptr = neighbors.data();
 
     /* Determine triangles array and set tri_indices array. */
     i = 0;
     FORALLfacets {
         if (!facet->upperdelaunay) {
+            int indices[3];
             tri_indices[facet->id] = i++;
             get_facet_vertices(qh, facet, indices);
             *triangles_ptr++ = (facet->toporient ? indices[0] : indices[2]);
             *triangles_ptr++ = indices[1];
             *triangles_ptr++ = (facet->toporient ? indices[2] : indices[0]);
         }
-        else
+        else {
             tri_indices[facet->id] = -1;
+        }
     }
 
     /* Determine neighbors array. */
     FORALLfacets {
         if (!facet->upperdelaunay) {
+            int indices[3];
             get_facet_neighbours(facet, tri_indices, indices);
             *neighbors_ptr++ = (facet->toporient ? indices[2] : indices[0]);
             *neighbors_ptr++ = (facet->toporient ? indices[0] : indices[2]);
@@ -226,118 +238,94 @@ delaunay_impl(int npoints, const double* x, const double* y,
         }
     }
 
-    /* Clean up. */
-    qh_freeqhull(qh, !qh_ALL);
-    qh_memfreeshort(qh, &curlong, &totlong);
-    if (curlong || totlong)
-        PyErr_WarnEx(PyExc_RuntimeWarning,
-                     "Qhull could not free all allocated memory", 1);
-    if (hide_qhull_errors)
-        fclose(error_file);
-    free(tri_indices);
-    free(points);
-
-    tuple = PyTuple_New(2);
-    PyTuple_SetItem(tuple, 0, (PyObject*)triangles);
-    PyTuple_SetItem(tuple, 1, (PyObject*)neighbors);
-    return tuple;
+    PyObject* tuple = PyTuple_New(2);
+    if (tuple == 0) {
+        throw std::runtime_error("Failed to create Python tuple");
+    }
 
-error:
-    /* Clean up. */
-    Py_XDECREF(triangles);
-    Py_XDECREF(neighbors);
-    qh_freeqhull(qh, !qh_ALL);
-    qh_memfreeshort(qh, &curlong, &totlong);
-    /* Don't bother checking curlong and totlong as raising error anyway. */
-    if (hide_qhull_errors)
-        fclose(error_file);
-    free(tri_indices);
-
-error_before_qhull:
-    free(points);
-
-    return NULL;
+    PyTuple_SET_ITEM(tuple, 0, triangles.pyobj());
+    PyTuple_SET_ITEM(tuple, 1, neighbors.pyobj());
+    return tuple;
 }
 
-/* Process python arguments and call Delaunay implementation method. */
+/* Process Python arguments and call Delaunay implementation method. */
 static PyObject*
 delaunay(PyObject *self, PyObject *args)
 {
-    PyObject* xarg;
-    PyObject* yarg;
-    PyArrayObject* xarray;
-    PyArrayObject* yarray;
+    numpy::array_view<double, 1> xarray;
+    numpy::array_view<double, 1> yarray;
     PyObject* ret;
-    int npoints;
+    npy_intp npoints;
     const double* x;
     const double* y;
 
-    if (!PyArg_ParseTuple(args, "OO", &xarg, &yarg)) {
-        PyErr_SetString(PyExc_ValueError, "expecting x and y arrays");
+    if (!PyArg_ParseTuple(args, "O&O&",
+                          &xarray.converter_contiguous, &xarray,
+                          &yarray.converter_contiguous, &yarray)) {
         return NULL;
     }
 
-    xarray = (PyArrayObject*)PyArray_ContiguousFromObject(xarg, NPY_DOUBLE,
-                                                          1, 1);
-    yarray = (PyArrayObject*)PyArray_ContiguousFromObject(yarg, NPY_DOUBLE,
-                                                          1, 1);
-    if (xarray == 0 || yarray == 0 ||
-        PyArray_DIM(xarray,0) != PyArray_DIM(yarray, 0)) {
-        Py_XDECREF(xarray);
-        Py_XDECREF(yarray);
+    npoints = xarray.dim(0);
+    if (npoints != yarray.dim(0)) {
         PyErr_SetString(PyExc_ValueError,
                         "x and y must be 1D arrays of the same length");
         return NULL;
     }
 
-    npoints = PyArray_DIM(xarray, 0);
-
     if (npoints < 3) {
-        Py_XDECREF(xarray);
-        Py_XDECREF(yarray);
         PyErr_SetString(PyExc_ValueError,
                         "x and y arrays must have a length of at least 3");
         return NULL;
     }
 
-    x = (const double*)PyArray_DATA(xarray);
-    y = (const double*)PyArray_DATA(yarray);
+    x = xarray.data();
+    y = yarray.data();
 
     if (!at_least_3_unique_points(npoints, x, y)) {
-        Py_XDECREF(xarray);
-        Py_XDECREF(yarray);
         PyErr_SetString(PyExc_ValueError,
                         "x and y arrays must consist of at least 3 unique points");
         return NULL;
     }
 
-    ret = delaunay_impl(npoints, x, y, Py_VerboseFlag == 0);
+    CALL_CPP("qhull.delaunay",
+             (ret = delaunay_impl(npoints, x, y, Py_VerboseFlag == 0)));
 
-    Py_XDECREF(xarray);
-    Py_XDECREF(yarray);
     return ret;
 }
 
 /* Return qhull version string for assistance in debugging. */
 static PyObject*
-version(void)
+version(PyObject *self, PyObject *arg)
 {
     return PyBytes_FromString(qh_version);
 }
 
 static PyMethodDef qhull_methods[] = {
-    {"delaunay", (PyCFunction)delaunay, METH_VARARGS, ""},
-    {"version", (PyCFunction)version, METH_NOARGS, ""},
+    {"delaunay", delaunay, METH_VARARGS,
+     "delaunay(x, y, /)\n"
+     "--\n\n"
+     "Compute a Delaunay triangulation.\n"
+     "\n"
+     "Parameters\n"
+     "----------\n"
+     "x, y : 1d arrays\n"
+     "    The coordinates of the point set, which must consist of at least\n"
+     "    three unique points.\n"
+     "\n"
+     "Returns\n"
+     "-------\n"
+     "triangles, neighbors : int arrays, shape (ntri, 3)\n"
+     "    Indices of triangle vertices and indices of triangle neighbors.\n"
+    },
+    {"version", version, METH_NOARGS,
+     "version()\n--\n\n"
+     "Return the qhull version string."},
     {NULL, NULL, 0, NULL}
 };
 
 static struct PyModuleDef qhull_module = {
     PyModuleDef_HEAD_INIT,
-    "qhull",
-    "Computing Delaunay triangulations.\n",
-    -1,
-    qhull_methods,
-    NULL, NULL, NULL, NULL
+    "qhull", "Computing Delaunay triangulations.\n", -1, qhull_methods
 };
 
 #pragma GCC visibility push(default)
@@ -345,17 +333,8 @@ static struct PyModuleDef qhull_module = {
 PyMODINIT_FUNC
 PyInit__qhull(void)
 {
-    PyObject* m;
-
-    m = PyModule_Create(&qhull_module);
-
-    if (m == NULL) {
-        return NULL;
-    }
-
     import_array();
-
-    return m;
+    return PyModule_Create(&qhull_module);
 }
 
 #pragma GCC visibility pop
diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp
index 5f058d14e0f0..663c06fd0474 100644
--- a/src/_tkagg.cpp
+++ b/src/_tkagg.cpp
@@ -19,15 +19,21 @@
 /*
  * Unfortunately cygwin's libdl inherits restrictions from the underlying
  * Windows OS, at least currently. Therefore, a symbol may be loaded from a
- * module by dlsym() only if it is really located in the given modile,
+ * module by dlsym() only if it is really located in the given module,
  * dependencies are not included. So we have to use native WinAPI on Cygwin
  * also.
  */
 #define WIN32_DLL
+static inline PyObject *PyErr_SetFromWindowsErr(int ierr) {
+    PyErr_SetString(PyExc_OSError, "Call to EnumProcessModules failed");
+    return NULL;
+}
 #endif
 
 #ifdef WIN32_DLL
+#include <string>
 #include <windows.h>
+#include <commctrl.h>
 #define PSAPI_VERSION 1
 #include <psapi.h>  // Must be linked with 'psapi' library
 #define dlsym GetProcAddress
@@ -48,7 +54,10 @@ static int convert_voidptr(PyObject *obj, void *p)
 // Global vars for Tk functions.  We load these symbols from the tkinter
 // extension module or loaded Tk libraries at run-time.
 static Tk_FindPhoto_t TK_FIND_PHOTO;
-static Tk_PhotoPutBlock_NoComposite_t TK_PHOTO_PUT_BLOCK_NO_COMPOSITE;
+static Tk_PhotoPutBlock_t TK_PHOTO_PUT_BLOCK;
+// Global vars for Tcl functions.  We load these symbols from the tkinter
+// extension module or loaded Tcl libraries at run-time.
+static Tcl_SetVar_t TCL_SETVAR;
 
 static PyObject *mpl_tk_blit(PyObject *self, PyObject *args)
 {
@@ -56,13 +65,16 @@ static PyObject *mpl_tk_blit(PyObject *self, PyObject *args)
     char const *photo_name;
     int height, width;
     unsigned char *data_ptr;
+    int comp_rule;
+    int put_retval;
     int o0, o1, o2, o3;
     int x1, x2, y1, y2;
     Tk_PhotoHandle photo;
     Tk_PhotoImageBlock block;
-    if (!PyArg_ParseTuple(args, "O&s(iiO&)(iiii)(iiii):blit",
+    if (!PyArg_ParseTuple(args, "O&s(iiO&)i(iiii)(iiii):blit",
                           convert_voidptr, &interp, &photo_name,
                           &height, &width, convert_voidptr, &data_ptr,
+                          &comp_rule,
                           &o0, &o1, &o2, &o3,
                           &x1, &x2, &y1, &y2)) {
         goto exit;
@@ -75,7 +87,12 @@ static PyObject *mpl_tk_blit(PyObject *self, PyObject *args)
         PyErr_SetString(PyExc_ValueError, "Attempting to draw out of bounds");
         goto exit;
     }
+    if (comp_rule != TK_PHOTO_COMPOSITE_OVERLAY && comp_rule != TK_PHOTO_COMPOSITE_SET) {
+        PyErr_SetString(PyExc_ValueError, "Invalid comp_rule argument");
+        goto exit;
+    }
 
+    Py_BEGIN_ALLOW_THREADS
     block.pixelPtr = data_ptr + 4 * ((height - y2) * width + x1);
     block.width = x2 - x1;
     block.height = y2 - y1;
@@ -85,8 +102,13 @@ static PyObject *mpl_tk_blit(PyObject *self, PyObject *args)
     block.offset[1] = o1;
     block.offset[2] = o2;
     block.offset[3] = o3;
-    TK_PHOTO_PUT_BLOCK_NO_COMPOSITE(
-        photo, &block, x1, height - y2, x2 - x1, y2 - y1);
+    put_retval = TK_PHOTO_PUT_BLOCK(
+        interp, photo, &block, x1, height - y2, x2 - x1, y2 - y1, comp_rule);
+    Py_END_ALLOW_THREADS
+    if (put_retval == TCL_ERROR) {
+        return PyErr_NoMemory();
+    }
+
 exit:
     if (PyErr_Occurred()) {
         return NULL;
@@ -95,51 +117,165 @@ static PyObject *mpl_tk_blit(PyObject *self, PyObject *args)
     }
 }
 
+#ifdef WIN32_DLL
+LRESULT CALLBACK
+DpiSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
+                UINT_PTR uIdSubclass, DWORD_PTR dwRefData)
+{
+    switch (uMsg) {
+    case WM_DPICHANGED:
+        // This function is a subclassed window procedure, and so is run during
+        // the Tcl/Tk event loop. Unfortunately, Tkinter has a *second* lock on
+        // Tcl threading that is not exposed publicly, but is currently taken
+        // while we're in the window procedure. So while we can take the GIL to
+        // call Python code, we must not also call *any* Tk code from Python.
+        // So stay with Tcl calls in C only.
+        {
+            // This variable naming must match the name used in
+            // lib/matplotlib/backends/_backend_tk.py:FigureManagerTk.
+            std::string var_name("window_dpi");
+            var_name += std::to_string((unsigned long long)hwnd);
+
+            // X is high word, Y is low word, but they are always equal.
+            std::string dpi = std::to_string(LOWORD(wParam));
+
+            Tcl_Interp* interp = (Tcl_Interp*)dwRefData;
+            TCL_SETVAR(interp, var_name.c_str(), dpi.c_str(), 0);
+        }
+        return 0;
+    case WM_NCDESTROY:
+        RemoveWindowSubclass(hwnd, DpiSubclassProc, uIdSubclass);
+        break;
+    }
+
+    return DefSubclassProc(hwnd, uMsg, wParam, lParam);
+}
+#endif
+
+static PyObject*
+mpl_tk_enable_dpi_awareness(PyObject* self, PyObject*const* args,
+                            Py_ssize_t nargs)
+{
+    if (nargs != 2) {
+        return PyErr_Format(PyExc_TypeError,
+                            "enable_dpi_awareness() takes 2 positional "
+                            "arguments but %zd were given",
+                            nargs);
+    }
+
+#ifdef WIN32_DLL
+    HWND frame_handle = NULL;
+    Tcl_Interp *interp = NULL;
+
+    if (!convert_voidptr(args[0], &frame_handle)) {
+        return NULL;
+    }
+    if (!convert_voidptr(args[1], &interp)) {
+        return NULL;
+    }
+
+#ifdef _DPI_AWARENESS_CONTEXTS_
+    HMODULE user32 = LoadLibrary("user32.dll");
+
+    typedef DPI_AWARENESS_CONTEXT (WINAPI *GetWindowDpiAwarenessContext_t)(HWND);
+    GetWindowDpiAwarenessContext_t GetWindowDpiAwarenessContextPtr =
+        (GetWindowDpiAwarenessContext_t)GetProcAddress(
+            user32, "GetWindowDpiAwarenessContext");
+    if (GetWindowDpiAwarenessContextPtr == NULL) {
+        FreeLibrary(user32);
+        Py_RETURN_FALSE;
+    }
+
+    typedef BOOL (WINAPI *AreDpiAwarenessContextsEqual_t)(DPI_AWARENESS_CONTEXT,
+                                                          DPI_AWARENESS_CONTEXT);
+    AreDpiAwarenessContextsEqual_t AreDpiAwarenessContextsEqualPtr =
+        (AreDpiAwarenessContextsEqual_t)GetProcAddress(
+            user32, "AreDpiAwarenessContextsEqual");
+    if (AreDpiAwarenessContextsEqualPtr == NULL) {
+        FreeLibrary(user32);
+        Py_RETURN_FALSE;
+    }
+
+    DPI_AWARENESS_CONTEXT ctx = GetWindowDpiAwarenessContextPtr(frame_handle);
+    bool per_monitor = (
+        AreDpiAwarenessContextsEqualPtr(
+            ctx, DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2) ||
+        AreDpiAwarenessContextsEqualPtr(
+            ctx, DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE));
+
+    if (per_monitor) {
+        // Per monitor aware means we need to handle WM_DPICHANGED by wrapping
+        // the Window Procedure, and the Python side needs to trace the Tk
+        // window_dpi variable stored on interp.
+        SetWindowSubclass(frame_handle, DpiSubclassProc, 0, (DWORD_PTR)interp);
+    }
+    FreeLibrary(user32);
+    return PyBool_FromLong(per_monitor);
+#endif
+#endif
+
+    Py_RETURN_NONE;
+}
+
 static PyMethodDef functions[] = {
     { "blit", (PyCFunction)mpl_tk_blit, METH_VARARGS },
+    { "enable_dpi_awareness", (PyCFunction)mpl_tk_enable_dpi_awareness,
+      METH_FASTCALL },
     { NULL, NULL } /* sentinel */
 };
 
-// Functions to fill global Tk function pointers by dynamic loading
+// Functions to fill global Tcl/Tk function pointers by dynamic loading.
 
 template <class T>
-int load_tk(T lib)
+bool load_tcl_tk(T lib)
 {
-    // Try to fill Tk global vars with function pointers.  Return the number of
-    // functions found.
-    return
-        !!(TK_FIND_PHOTO =
-            (Tk_FindPhoto_t)dlsym(lib, "Tk_FindPhoto")) +
-        !!(TK_PHOTO_PUT_BLOCK_NO_COMPOSITE =
-            (Tk_PhotoPutBlock_NoComposite_t)dlsym(lib, "Tk_PhotoPutBlock_NoComposite"));
+    // Try to fill Tcl/Tk global vars with function pointers.  Return whether
+    // all of them have been filled.
+    if (auto ptr = dlsym(lib, "Tcl_SetVar")) {
+        TCL_SETVAR = (Tcl_SetVar_t)ptr;
+    }
+    if (auto ptr = dlsym(lib, "Tk_FindPhoto")) {
+        TK_FIND_PHOTO = (Tk_FindPhoto_t)ptr;
+    }
+    if (auto ptr = dlsym(lib, "Tk_PhotoPutBlock")) {
+        TK_PHOTO_PUT_BLOCK = (Tk_PhotoPutBlock_t)ptr;
+    }
+    return TCL_SETVAR && TK_FIND_PHOTO && TK_PHOTO_PUT_BLOCK;
 }
 
 #ifdef WIN32_DLL
 
-/*
- * On Windows, we can't load the tkinter module to get the Tk symbols, because
- * Windows does not load symbols into the library name-space of importing
- * modules. So, knowing that tkinter has already been imported by Python, we
- * scan all modules in the running process for the Tk function names.
+/* On Windows, we can't load the tkinter module to get the Tcl/Tk symbols,
+ * because Windows does not load symbols into the library name-space of
+ * importing modules. So, knowing that tkinter has already been imported by
+ * Python, we scan all modules in the running process for the Tcl/Tk function
+ * names.
  */
 
 void load_tkinter_funcs(void)
 {
-    // Load Tk functions by searching all modules in current process.
-    HMODULE hMods[1024];
-    HANDLE hProcess;
-    DWORD cbNeeded;
-    unsigned int i;
-    // Returns pseudo-handle that does not need to be closed
-    hProcess = GetCurrentProcess();
-    // Iterate through modules in this process looking for Tk names.
-    if (EnumProcessModules(hProcess, hMods, sizeof(hMods), &cbNeeded)) {
-        for (i = 0; i < (cbNeeded / sizeof(HMODULE)); i++) {
-            if (load_tk(hMods[i])) {
-                return;
-            }
+    HANDLE process = GetCurrentProcess();  // Pseudo-handle, doesn't need closing.
+    HMODULE* modules = NULL;
+    DWORD size;
+    if (!EnumProcessModules(process, NULL, 0, &size)) {
+        PyErr_SetFromWindowsErr(0);
+        goto exit;
+    }
+    if (!(modules = static_cast<HMODULE*>(malloc(size)))) {
+        PyErr_NoMemory();
+        goto exit;
+    }
+    if (!EnumProcessModules(process, modules, size, &size)) {
+        PyErr_SetFromWindowsErr(0);
+        goto exit;
+    }
+    for (unsigned i = 0; i < size / sizeof(HMODULE); ++i) {
+        if (load_tcl_tk(modules[i])) {
+            return;
         }
     }
+exit:
+    free(modules);
 }
 
 #else  // not Windows
@@ -159,7 +295,7 @@ void load_tkinter_funcs(void)
 
     // Try loading from the main program namespace first.
     main_program = dlopen(NULL, RTLD_LAZY);
-    if (load_tk(main_program)) {
+    if (load_tcl_tk(main_program)) {
         goto exit;
     }
     // Clear exception triggered when we didn't find symbols above.
@@ -182,7 +318,7 @@ void load_tkinter_funcs(void)
         PyErr_SetString(PyExc_RuntimeError, dlerror());
         goto exit;
     }
-    if (load_tk(tkinter_lib)) {
+    if (load_tcl_tk(tkinter_lib)) {
         goto exit;
     }
 
@@ -201,7 +337,7 @@ void load_tkinter_funcs(void)
 #endif // end not Windows
 
 static PyModuleDef _tkagg_module = {
-    PyModuleDef_HEAD_INIT, "_tkagg", "", -1, functions, NULL, NULL, NULL, NULL
+    PyModuleDef_HEAD_INIT, "_tkagg", NULL, -1, functions
 };
 
 #pragma GCC visibility push(default)
@@ -209,13 +345,22 @@ static PyModuleDef _tkagg_module = {
 PyMODINIT_FUNC PyInit__tkagg(void)
 {
     load_tkinter_funcs();
-    if (PyErr_Occurred()) {
+    PyObject *type, *value, *traceback;
+    PyErr_Fetch(&type, &value, &traceback);
+    // Always raise ImportError (normalizing a previously set exception if
+    // needed) to interact properly with backend auto-fallback.
+    if (value) {
+        PyErr_NormalizeException(&type, &value, &traceback);
+        PyErr_SetObject(PyExc_ImportError, value);
+        return NULL;
+    } else if (!TCL_SETVAR) {
+        PyErr_SetString(PyExc_ImportError, "Failed to load Tcl_SetVar");
         return NULL;
     } else if (!TK_FIND_PHOTO) {
-        PyErr_SetString(PyExc_RuntimeError, "Failed to load Tk_FindPhoto");
+        PyErr_SetString(PyExc_ImportError, "Failed to load Tk_FindPhoto");
         return NULL;
-    } else if (!TK_PHOTO_PUT_BLOCK_NO_COMPOSITE) {
-        PyErr_SetString(PyExc_RuntimeError, "Failed to load Tk_PhotoPutBlock_NoComposite");
+    } else if (!TK_PHOTO_PUT_BLOCK) {
+        PyErr_SetString(PyExc_ImportError, "Failed to load Tk_PhotoPutBlock");
         return NULL;
     }
     return PyModule_Create(&_tkagg_module);
diff --git a/src/_tkmini.h b/src/_tkmini.h
index d99b73291987..85f245815e4c 100644
--- a/src/_tkmini.h
+++ b/src/_tkmini.h
@@ -86,14 +86,24 @@ typedef struct Tk_PhotoImageBlock
     int offset[4];
 } Tk_PhotoImageBlock;
 
+#define TK_PHOTO_COMPOSITE_OVERLAY  0  // apply transparency rules pixel-wise
+#define TK_PHOTO_COMPOSITE_SET      1  // set image buffer directly
+#define TCL_OK     0
+#define TCL_ERROR  1
+
 /* Typedefs derived from function signatures in Tk header */
 /* Tk_FindPhoto typedef */
 typedef Tk_PhotoHandle (*Tk_FindPhoto_t) (Tcl_Interp *interp, const char
         *imageName);
-/* Tk_PhotoPutBLock_NoComposite typedef */
-typedef void (*Tk_PhotoPutBlock_NoComposite_t) (Tk_PhotoHandle handle,
+/* Tk_PhotoPutBLock typedef */
+typedef int (*Tk_PhotoPutBlock_t) (Tcl_Interp *interp, Tk_PhotoHandle handle,
         Tk_PhotoImageBlock *blockPtr, int x, int y,
-        int width, int height);
+        int width, int height, int compRule);
+
+/* Typedefs derived from function signatures in Tcl header */
+/* Tcl_SetVar typedef */
+typedef const char *(*Tcl_SetVar_t)(Tcl_Interp *interp, const char *varName,
+                                    const char *newValue, int flags);
 
 #ifdef __cplusplus
 }
diff --git a/src/_ttconv.cpp b/src/_ttconv.cpp
index 2fadb9bfa5fa..b88edbd2883d 100644
--- a/src/_ttconv.cpp
+++ b/src/_ttconv.cpp
@@ -150,81 +150,6 @@ static PyObject *convert_ttf_to_ps(PyObject *self, PyObject *args, PyObject *kwd
     return Py_None;
 }
 
-class PythonDictionaryCallback : public TTDictionaryCallback
-{
-    PyObject *_dict;
-
-  public:
-    PythonDictionaryCallback(PyObject *dict)
-    {
-        _dict = dict;
-    }
-
-    virtual void add_pair(const char *a, const char *b)
-    {
-        assert(a != NULL);
-        assert(b != NULL);
-        PyObject *value = PyBytes_FromString(b);
-        if (!value) {
-            throw py::exception();
-        }
-        if (PyDict_SetItemString(_dict, a, value)) {
-            Py_DECREF(value);
-            throw py::exception();
-        }
-        Py_DECREF(value);
-    }
-};
-
-static PyObject *py_get_pdf_charprocs(PyObject *self, PyObject *args, PyObject *kwds)
-{
-    const char *filename;
-    std::vector<int> glyph_ids;
-    PyObject *result;
-
-    static const char *kwlist[] = { "filename", "glyph_ids", NULL };
-    if (!PyArg_ParseTupleAndKeywords(args,
-                                     kwds,
-                                     "y|O&:get_pdf_charprocs",
-                                     (char **)kwlist,
-                                     &filename,
-                                     pyiterable_to_vector_int,
-                                     &glyph_ids)) {
-        return NULL;
-    }
-
-    result = PyDict_New();
-    if (!result) {
-        return NULL;
-    }
-
-    PythonDictionaryCallback dict(result);
-
-    try
-    {
-        ::get_pdf_charprocs(filename, glyph_ids, dict);
-    }
-    catch (TTException &e)
-    {
-        Py_DECREF(result);
-        PyErr_SetString(PyExc_RuntimeError, e.getMessage());
-        return NULL;
-    }
-    catch (const py::exception &)
-    {
-        Py_DECREF(result);
-        return NULL;
-    }
-    catch (...)
-    {
-        Py_DECREF(result);
-        PyErr_SetString(PyExc_RuntimeError, "Unknown C++ exception");
-        return NULL;
-    }
-
-    return result;
-}
-
 static PyMethodDef ttconv_methods[] =
 {
     {
@@ -239,26 +164,12 @@ static PyMethodDef ttconv_methods[] =
         "font data will be written to.\n"
         "fonttype may be either 3 or 42.  Type 3 is a \"raw Postscript\" font. "
         "Type 42 is an embedded Truetype font.  Glyph subsetting is not supported "
-        "for Type 42 fonts.\n"
+        "for Type 42 fonts within this module (needs to be done externally).\n"
         "glyph_ids (optional) is a list of glyph ids (integers) to keep when "
         "subsetting to a Type 3 font.  If glyph_ids is not provided or is None, "
         "then all glyphs will be included.  If any of the glyphs specified are "
         "composite glyphs, then the component glyphs will also be included."
     },
-    {
-        "get_pdf_charprocs", (PyCFunction)py_get_pdf_charprocs, METH_VARARGS | METH_KEYWORDS,
-        "get_pdf_charprocs(filename, glyph_ids)\n"
-        "\n"
-        "Given a Truetype font file, returns a dictionary containing the PDF Type 3\n"
-        "representation of its paths.  Useful for subsetting a Truetype font inside\n"
-        "of a PDF file.\n"
-        "\n"
-        "filename is the path to a TTF font file.\n"
-        "glyph_ids is a list of the numeric glyph ids to include.\n"
-        "The return value is a dictionary where the keys are glyph names and\n"
-        "the values are the stream content needed to render that glyph.  This\n"
-        "is useful to generate the CharProcs dictionary in a PDF Type 3 font.\n"
-    },
     {0, 0, 0, 0}  /* Sentinel */
 };
 
@@ -273,7 +184,6 @@ static PyModuleDef ttconv_module = {
     module_docstring,
     -1,
     ttconv_methods,
-    NULL, NULL, NULL, NULL
 };
 
 #pragma GCC visibility push(default)
@@ -281,11 +191,7 @@ static PyModuleDef ttconv_module = {
 PyMODINIT_FUNC
 PyInit__ttconv(void)
 {
-    PyObject* m;
-
-    m = PyModule_Create(&ttconv_module);
-
-    return m;
+    return PyModule_Create(&ttconv_module);
 }
 
 #pragma GCC visibility pop
diff --git a/src/checkdep_freetype2.c b/src/checkdep_freetype2.c
index d0e8fd34fbe9..8d9d8ca24a07 100644
--- a/src/checkdep_freetype2.c
+++ b/src/checkdep_freetype2.c
@@ -1,7 +1,7 @@
 #ifdef __has_include
   #if !__has_include(<ft2build.h>)
     #error "FreeType version 2.3 or higher is required. \
-You may unset the system_freetype entry in setup.cfg to let Matplotlib download it."
+You may unset the system_freetype entry in mplsetup.cfg to let Matplotlib download it."
   #endif
 #endif
 
@@ -15,5 +15,5 @@ You may unset the system_freetype entry in setup.cfg to let Matplotlib download
   XSTR(FREETYPE_MAJOR) "." XSTR(FREETYPE_MINOR) "." XSTR(FREETYPE_PATCH) ".")
 #if FREETYPE_MAJOR << 16 + FREETYPE_MINOR << 8 + FREETYPE_PATCH < 0x020300
   #error "FreeType version 2.3 or higher is required. \
-You may unset the system_freetype entry in setup.cfg to let Matplotlib download it."
+You may unset the system_freetype entry in mplsetup.cfg to let Matplotlib download it."
 #endif
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
index 720d8a622df5..1dc831545554 100644
--- a/src/ft2font.cpp
+++ b/src/ft2font.cpp
@@ -3,6 +3,7 @@
 #define NO_IMPORT_ARRAY
 
 #include <algorithm>
+#include <iterator>
 #include <sstream>
 #include <stdexcept>
 #include <string>
@@ -20,7 +21,7 @@
  To improve the hinting of the fonts, this code uses a hack
  presented here:
 
- http://antigrain.com/research/font_rasterization/index.html
+ http://agg.sourceforge.net/antigrain.com/research/font_rasterization/index.html
 
  The idea is to limit the effect of hinting in the x-direction, while
  preserving hinting in the y-direction.  Since freetype does not
@@ -43,9 +44,23 @@
 
 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("");
-    os << message << " (error code 0x" << std::hex << error << ")";
+    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());
 }
 
@@ -99,13 +114,13 @@ void FT2Image::draw_bitmap(FT_Bitmap *bitmap, FT_Int x, FT_Int y)
     FT_Int char_width = bitmap->width;
     FT_Int char_height = bitmap->rows;
 
-    FT_Int x1 = CLAMP(x, 0, image_width);
-    FT_Int y1 = CLAMP(y, 0, image_height);
-    FT_Int x2 = CLAMP(x + char_width, 0, image_width);
-    FT_Int y2 = CLAMP(y + char_height, 0, image_height);
+    FT_Int x1 = std::min(std::max(x, 0), image_width);
+    FT_Int y1 = std::min(std::max(y, 0), image_height);
+    FT_Int x2 = std::min(std::max(x + char_width, 0), image_width);
+    FT_Int y2 = std::min(std::max(y + char_height, 0), image_height);
 
-    FT_Int x_start = MAX(0, -x);
-    FT_Int y_offset = y1 - MAX(0, -y);
+    FT_Int x_start = std::max(0, -x);
+    FT_Int y_offset = y1 - std::max(0, -y);
 
     if (bitmap->pixel_mode == FT_PIXEL_MODE_GRAY) {
         for (FT_Int i = y1; i < y2; ++i) {
@@ -169,20 +184,33 @@ FT2Image::draw_rect_filled(unsigned long x0, unsigned long y0, unsigned long x1,
     m_dirty = true;
 }
 
-static FT_UInt ft_get_char_index_or_warn(FT_Face face, FT_ULong charcode)
+static void ft_glyph_warn(FT_ULong charcode)
 {
-    FT_UInt glyph_index = FT_Get_Char_Index(face, charcode);
-    if (!glyph_index) {
-        PyErr_WarnFormat(NULL, 1, "Glyph %lu missing from current font.", charcode);
-        // Apparently PyErr_WarnFormat returns 0 even if the exception propagates
-        // due to running with -Werror, so check the error flag directly instead.
-        if (PyErr_Occurred()) {
-            throw py::exception();
-        }
+    PyObject *text_helpers = NULL, *tmp = NULL;
+    if (!(text_helpers = PyImport_ImportModule("matplotlib._text_helpers")) ||
+        !(tmp = PyObject_CallMethod(text_helpers, "warn_on_missing_glyph", "k", charcode))) {
+        goto exit;
+    }
+exit:
+    Py_XDECREF(text_helpers);
+    Py_XDECREF(tmp);
+    if (PyErr_Occurred()) {
+        throw py::exception();
     }
-    return glyph_index;
 }
 
+static FT_UInt
+ft_get_char_index_or_warn(FT_Face face, FT_ULong charcode, bool warn = true)
+{
+    FT_UInt glyph_index = FT_Get_Char_Index(face, charcode);
+    if (glyph_index) {
+        return glyph_index;
+    }
+    if (warn) {
+        ft_glyph_warn(charcode);
+    }
+    return 0;
+}
 
 // ft_outline_decomposer should be passed to FT_Outline_Decompose.  On the
 // first pass, vertices and codes are set to NULL, and index is simply
@@ -203,10 +231,10 @@ ft_outline_move_to(FT_Vector const* to, void* user)
     ft_outline_decomposer* d = reinterpret_cast<ft_outline_decomposer*>(user);
     if (d->codes) {
         if (d->index) {
-            // Appending ENDPOLY is important to make patheffects work.
+            // Appending CLOSEPOLY is important to make patheffects work.
             *(d->vertices++) = 0;
             *(d->vertices++) = 0;
-            *(d->codes++) = ENDPOLY;
+            *(d->codes++) = CLOSEPOLY;
         }
         *(d->vertices++) = to->x / 64.;
         *(d->vertices++) = to->y / 64.;
@@ -286,7 +314,7 @@ FT2Font::get_path()
                      "FT_Outline_Decompose failed with error 0x%x", error);
         return NULL;
     }
-    if (!decomposer.index) {  // Don't append ENDPOLY to null glyphs.
+    if (!decomposer.index) {  // Don't append CLOSEPOLY to null glyphs.
       npy_intp vertices_dims[2] = { 0, 2 };
       numpy::array_view<double, 2> vertices(vertices_dims);
       npy_intp codes_dims[1] = { 0 };
@@ -309,23 +337,19 @@ FT2Font::get_path()
     }
     *(decomposer.vertices++) = 0;
     *(decomposer.vertices++) = 0;
-    *(decomposer.codes++) = ENDPOLY;
+    *(decomposer.codes++) = CLOSEPOLY;
     return Py_BuildValue("NN", vertices.pyobj(), codes.pyobj());
 }
 
-FT2Font::FT2Font(FT_Open_Args &open_args, long hinting_factor_) : image(), face(NULL)
+FT2Font::FT2Font(FT_Open_Args &open_args,
+                 long hinting_factor_,
+                 std::vector<FT2Font *> &fallback_list)
+    : image(), face(NULL)
 {
     clear();
 
     FT_Error error = FT_Open_Face(_ft2Library, &open_args, 0, &face);
-
-    if (error == FT_Err_Unknown_File_Format) {
-        throw std::runtime_error("Can not load face.  Unknown file format.");
-    } else if (error == FT_Err_Cannot_Open_Resource) {
-        throw std::runtime_error("Can not load face.  Can not open resource.");
-    } else if (error == FT_Err_Invalid_File_Format) {
-        throw std::runtime_error("Can not load face.  Invalid file format.");
-    } else if (error) {
+    if (error) {
         throw_ft_error("Can not load face", error);
     }
 
@@ -347,6 +371,9 @@ FT2Font::FT2Font(FT_Open_Args &open_args, long hinting_factor_) : image(), face(
 
     FT_Matrix transform = { 65536 / hinting_factor, 0, 0, 65536 };
     FT_Set_Transform(face, &transform, 0);
+
+    // Set fallbacks
+    std::copy(fallback_list.begin(), fallback_list.end(), std::back_inserter(fallbacks));
 }
 
 FT2Font::~FT2Font()
@@ -370,6 +397,12 @@ void FT2Font::clear()
     }
 
     glyphs.clear();
+    glyph_to_font.clear();
+    char_to_font.clear();
+
+    for (size_t i = 0; i < fallbacks.size(); i++) {
+        fallbacks[i]->clear();
+    }
 }
 
 void FT2Font::set_size(double ptsize, double dpi)
@@ -381,6 +414,10 @@ void FT2Font::set_size(double ptsize, double dpi)
     }
     FT_Matrix transform = { 65536 / hinting_factor, 0, 0, 65536 };
     FT_Set_Transform(face, &transform, 0);
+
+    for (size_t i = 0; i < fallbacks.size(); i++) {
+        fallbacks[i]->set_size(ptsize, dpi);
+    }
 }
 
 void FT2Font::set_charmap(int i)
@@ -401,12 +438,32 @@ void FT2Font::select_charmap(unsigned long i)
     }
 }
 
-int FT2Font::get_kerning(FT_UInt left, FT_UInt right, FT_UInt mode)
+int FT2Font::get_kerning(FT_UInt left, FT_UInt right, FT_UInt mode, bool fallback = false)
+{
+    if (fallback && glyph_to_font.find(left) != glyph_to_font.end() &&
+        glyph_to_font.find(right) != glyph_to_font.end()) {
+        FT2Font *left_ft_object = glyph_to_font[left];
+        FT2Font *right_ft_object = glyph_to_font[right];
+        if (left_ft_object != right_ft_object) {
+            // we do not know how to do kerning between different fonts
+            return 0;
+        }
+        // if left_ft_object is the same as right_ft_object,
+        // do the exact same thing which set_text does.
+        return right_ft_object->get_kerning(left, right, mode, false);
+    }
+    else
+    {
+        FT_Vector delta;
+        return get_kerning(left, right, mode, delta);
+    }
+}
+
+int FT2Font::get_kerning(FT_UInt left, FT_UInt right, FT_UInt mode, FT_Vector &delta)
 {
     if (!FT_HAS_KERNING(face)) {
         return 0;
     }
-    FT_Vector delta;
 
     if (!FT_Get_Kerning(face, left, right, mode, &delta)) {
         return (int)(delta.x) / (hinting_factor << kerning_factor);
@@ -418,6 +475,9 @@ int FT2Font::get_kerning(FT_UInt left, FT_UInt right, FT_UInt mode)
 void FT2Font::set_kerning_factor(int factor)
 {
     kerning_factor = factor;
+    for (size_t i = 0; i < fallbacks.size(); i++) {
+        fallbacks[i]->set_kerning_factor(factor);
+    }
 }
 
 void FT2Font::set_text(
@@ -427,47 +487,54 @@ void FT2Font::set_text(
 
     angle = angle / 360.0 * 2 * M_PI;
 
-    // this computes width and height in subpixels so we have to divide by 64
+    // this computes width and height in subpixels so we have to multiply by 64
     matrix.xx = (FT_Fixed)(cos(angle) * 0x10000L);
     matrix.xy = (FT_Fixed)(-sin(angle) * 0x10000L);
     matrix.yx = (FT_Fixed)(sin(angle) * 0x10000L);
     matrix.yy = (FT_Fixed)(cos(angle) * 0x10000L);
 
-    FT_Bool use_kerning = FT_HAS_KERNING(face);
-    FT_UInt previous = 0;
-
     clear();
 
     bbox.xMin = bbox.yMin = 32000;
     bbox.xMax = bbox.yMax = -32000;
 
-    for (unsigned int n = 0; n < N; n++) {
-        FT_UInt glyph_index;
+    FT_UInt previous = 0;
+    FT2Font *previous_ft_object = NULL;
+
+    for (size_t n = 0; n < N; n++) {
+        FT_UInt glyph_index = 0;
         FT_BBox glyph_bbox;
         FT_Pos last_advance;
 
-        glyph_index = ft_get_char_index_or_warn(face, codepoints[n]);
+        FT_Error charcode_error, glyph_error;
+        FT2Font *ft_object_with_glyph = this;
+        bool was_found = load_char_with_fallback(ft_object_with_glyph, glyph_index, glyphs,
+                                                 char_to_font, glyph_to_font, codepoints[n], flags,
+                                                 charcode_error, glyph_error, false);
+        if (!was_found) {
+            ft_glyph_warn((FT_ULong)codepoints[n]);
+
+            // render missing glyph tofu
+            // come back to top-most font
+            ft_object_with_glyph = this;
+            char_to_font[codepoints[n]] = ft_object_with_glyph;
+            glyph_to_font[glyph_index] = ft_object_with_glyph;
+            ft_object_with_glyph->load_glyph(glyph_index, flags, ft_object_with_glyph, false);
+        }
 
         // retrieve kerning distance and move pen position
-        if (use_kerning && previous && glyph_index) {
+        if ((ft_object_with_glyph == previous_ft_object) &&  // if both fonts are the same
+            ft_object_with_glyph->has_kerning() &&           // if the font knows how to kern
+            previous && glyph_index                          // and we really have 2 glyphs
+            ) {
             FT_Vector delta;
-            FT_Get_Kerning(face, previous, glyph_index, FT_KERNING_DEFAULT, &delta);
-            pen.x += delta.x / (hinting_factor << kerning_factor);
-        }
-        if (FT_Error error = FT_Load_Glyph(face, glyph_index, flags)) {
-            throw_ft_error("Could not load glyph", error);
+            pen.x += ft_object_with_glyph->get_kerning(previous, glyph_index, FT_KERNING_DEFAULT, delta);
         }
-        // ignore errors, jump to next glyph
 
         // extract glyph image and store it in our table
+        FT_Glyph &thisGlyph = glyphs[glyphs.size() - 1];
 
-        FT_Glyph thisGlyph;
-        if (FT_Error error = FT_Get_Glyph(face->glyph, &thisGlyph)) {
-            throw_ft_error("Could not get glyph", error);
-        }
-        // ignore errors, jump to next glyph
-
-        last_advance = face->glyph->advance.x;
+        last_advance = ft_object_with_glyph->get_face()->glyph->advance.x;
         FT_Glyph_Transform(thisGlyph, 0, &pen);
         FT_Glyph_Transform(thisGlyph, &matrix, 0);
         xys.push_back(pen.x);
@@ -483,7 +550,8 @@ void FT2Font::set_text(
         pen.x += last_advance;
 
         previous = glyph_index;
-        glyphs.push_back(thisGlyph);
+        previous_ft_object = ft_object_with_glyph;
+
     }
 
     FT_Vector_Transform(&pen, &matrix);
@@ -494,17 +562,135 @@ void FT2Font::set_text(
     }
 }
 
-void FT2Font::load_char(long charcode, FT_Int32 flags)
+void FT2Font::load_char(long charcode, FT_Int32 flags, FT2Font *&ft_object, bool fallback = false)
+{
+    // if this is parent FT2Font, cache will be filled in 2 ways:
+    // 1. set_text was previously called
+    // 2. set_text was not called and fallback was enabled
+    if (fallback && char_to_font.find(charcode) != char_to_font.end()) {
+        ft_object = char_to_font[charcode];
+        // since it will be assigned to ft_object anyway
+        FT2Font *throwaway = NULL;
+        ft_object->load_char(charcode, flags, throwaway, false);
+    } else if (fallback) {
+        FT_UInt final_glyph_index;
+        FT_Error charcode_error, glyph_error;
+        FT2Font *ft_object_with_glyph = this;
+        bool was_found = load_char_with_fallback(ft_object_with_glyph, final_glyph_index, glyphs, char_to_font,
+                                glyph_to_font, charcode, flags, charcode_error, glyph_error, true);
+        if (!was_found) {
+            ft_glyph_warn(charcode);
+            if (charcode_error) {
+                throw_ft_error("Could not load charcode", charcode_error);
+            }
+            else if (glyph_error) {
+                throw_ft_error("Could not load charcode", glyph_error);
+            }
+        }
+        ft_object = ft_object_with_glyph;
+    } else {
+        ft_object = this;
+        FT_UInt glyph_index = ft_get_char_index_or_warn(face, (FT_ULong)charcode);
+
+        if (FT_Error error = FT_Load_Glyph(face, glyph_index, flags)) {
+            throw_ft_error("Could not load charcode", error);
+        }
+        FT_Glyph thisGlyph;
+        if (FT_Error error = FT_Get_Glyph(face->glyph, &thisGlyph)) {
+            throw_ft_error("Could not get glyph", error);
+        }
+        glyphs.push_back(thisGlyph);
+    }
+}
+
+
+bool FT2Font::get_char_fallback_index(FT_ULong charcode, int& index) const
 {
-    FT_UInt glyph_index = ft_get_char_index_or_warn(face, (FT_ULong)charcode);
-    if (FT_Error error = FT_Load_Glyph(face, glyph_index, flags)) {
-        throw_ft_error("Could not load charcode", error);
+    FT_UInt glyph_index = FT_Get_Char_Index(face, charcode);
+    if (glyph_index) {
+        // -1 means the host has the char and we do not need to fallback
+        index = -1;
+        return true;
+    } else {
+        int inner_index = 0;
+        bool was_found;
+
+        for (size_t i = 0; i < fallbacks.size(); ++i) {
+            // TODO handle recursion somehow!
+            was_found = fallbacks[i]->get_char_fallback_index(charcode, inner_index);
+            if (was_found) {
+                index = i;
+                return true;
+            }
+        }
     }
-    FT_Glyph thisGlyph;
-    if (FT_Error error = FT_Get_Glyph(face->glyph, &thisGlyph)) {
-        throw_ft_error("Could not get glyph", error);
+    return false;
+}
+
+
+bool FT2Font::load_char_with_fallback(FT2Font *&ft_object_with_glyph,
+                                      FT_UInt &final_glyph_index,
+                                      std::vector<FT_Glyph> &parent_glyphs,
+                                      std::unordered_map<long, FT2Font *> &parent_char_to_font,
+                                      std::unordered_map<FT_UInt, FT2Font *> &parent_glyph_to_font,
+                                      long charcode,
+                                      FT_Int32 flags,
+                                      FT_Error &charcode_error,
+                                      FT_Error &glyph_error,
+                                      bool override = false)
+{
+    FT_UInt glyph_index = FT_Get_Char_Index(face, charcode);
+
+    if (glyph_index || override) {
+        charcode_error = FT_Load_Glyph(face, glyph_index, flags);
+        if (charcode_error) {
+            return false;
+        }
+
+        FT_Glyph thisGlyph;
+        glyph_error = FT_Get_Glyph(face->glyph, &thisGlyph);
+        if (glyph_error) {
+            return false;
+        }
+
+        final_glyph_index = glyph_index;
+
+        // cache the result for future
+        // need to store this for anytime a character is loaded from a parent
+        // FT2Font object or to generate a mapping of individual characters to fonts
+        ft_object_with_glyph = this;
+        parent_glyph_to_font[final_glyph_index] = this;
+        parent_char_to_font[charcode] = this;
+        parent_glyphs.push_back(thisGlyph);
+        return true;
+    }
+
+    else {
+        for (size_t i = 0; i < fallbacks.size(); ++i) {
+            bool was_found = fallbacks[i]->load_char_with_fallback(
+                ft_object_with_glyph, final_glyph_index, parent_glyphs, parent_char_to_font,
+                parent_glyph_to_font, charcode, flags, charcode_error, glyph_error, override);
+            if (was_found) {
+                return true;
+            }
+        }
+        return false;
     }
-    glyphs.push_back(thisGlyph);
+}
+
+void FT2Font::load_glyph(FT_UInt glyph_index,
+                         FT_Int32 flags,
+                         FT2Font *&ft_object,
+                         bool fallback = false)
+{
+    // cache is only for parent FT2Font
+    if (fallback && glyph_to_font.find(glyph_index) != glyph_to_font.end()) {
+        ft_object = glyph_to_font[glyph_index];
+    } else {
+        ft_object = this;
+    }
+
+    ft_object->load_glyph(glyph_index, flags);
 }
 
 void FT2Font::load_glyph(FT_UInt glyph_index, FT_Int32 flags)
@@ -519,6 +705,28 @@ void FT2Font::load_glyph(FT_UInt glyph_index, FT_Int32 flags)
     glyphs.push_back(thisGlyph);
 }
 
+FT_UInt FT2Font::get_char_index(FT_ULong charcode, bool fallback = false)
+{
+    FT2Font *ft_object = NULL;
+    if (fallback && char_to_font.find(charcode) != char_to_font.end()) {
+        // fallback denotes whether we want to search fallback list.
+        // should call set_text/load_char_with_fallback to parent FT2Font before
+        // wanting to use fallback list here. (since that populates the cache)
+        ft_object = char_to_font[charcode];
+    } else {
+        // set as self
+        ft_object = this;
+    }
+
+    // historically, get_char_index never raises a warning
+    return ft_get_char_index_or_warn(ft_object->get_face(), charcode, false);
+}
+
+void FT2Font::get_cbox(FT_BBox &bbox)
+{
+    FT_Glyph_Get_CBox(glyphs.back(), ft_glyph_bbox_subpixels, &bbox);
+}
+
 void FT2Font::get_width_height(long *width, long *height)
 {
     *width = advance;
@@ -538,8 +746,8 @@ void FT2Font::get_bitmap_offset(long *x, long *y)
 
 void FT2Font::draw_glyphs_to_bitmap(bool antialiased)
 {
-    size_t width = (bbox.xMax - bbox.xMin) / 64 + 2;
-    size_t height = (bbox.yMax - bbox.yMin) / 64 + 2;
+    long width = (bbox.xMax - bbox.xMin) / 64 + 2;
+    long height = (bbox.yMax - bbox.yMin) / 64 + 2;
 
     image.resize(width, height);
 
@@ -609,8 +817,14 @@ void FT2Font::draw_glyph_to_bitmap(FT2Image &im, int x, int y, size_t glyphInd,
     im.draw_bitmap(&bitmap->bitmap, x + bitmap->left, y);
 }
 
-void FT2Font::get_glyph_name(unsigned int glyph_number, char *buffer)
+void FT2Font::get_glyph_name(unsigned int glyph_number, char *buffer, bool fallback = false)
 {
+    if (fallback && glyph_to_font.find(glyph_number) != glyph_to_font.end()) {
+        // cache is only for parent FT2Font
+        FT2Font *ft_object = glyph_to_font[glyph_number];
+        ft_object->get_glyph_name(glyph_number, buffer, false);
+        return;
+    }
     if (!FT_HAS_GLYPH_NAMES(face)) {
         /* Note that this generated name must match the name that
            is generated by ttconv in ttfont_CharStrings_getname. */
diff --git a/src/ft2font.h b/src/ft2font.h
index 0863f3450b36..dc157f0e2887 100644
--- a/src/ft2font.h
+++ b/src/ft2font.h
@@ -1,10 +1,12 @@
 /* -*- mode: c++; c-basic-offset: 4 -*- */
 
 /* A python interface to FreeType */
+#pragma once
 #ifndef MPL_FT2FONT_H
 #define MPL_FT2FONT_H
 #include <vector>
 #include <stdint.h>
+#include <unordered_map>
 
 extern "C" {
 #include <ft2build.h>
@@ -69,7 +71,7 @@ class FT2Font
 {
 
   public:
-    FT2Font(FT_Open_Args &open_args, long hinting_factor);
+    FT2Font(FT_Open_Args &open_args, long hinting_factor, std::vector<FT2Font *> &fallback_list);
     virtual ~FT2Font();
     void clear();
     void set_size(double ptsize, double dpi);
@@ -77,9 +79,21 @@ class FT2Font
     void select_charmap(unsigned long i);
     void set_text(
         size_t N, uint32_t *codepoints, double angle, FT_Int32 flags, std::vector<double> &xys);
-    int get_kerning(FT_UInt left, FT_UInt right, FT_UInt mode);
+    int get_kerning(FT_UInt left, FT_UInt right, FT_UInt mode, bool fallback);
+    int get_kerning(FT_UInt left, FT_UInt right, FT_UInt mode, FT_Vector &delta);
     void set_kerning_factor(int factor);
-    void load_char(long charcode, FT_Int32 flags);
+    void load_char(long charcode, FT_Int32 flags, FT2Font *&ft_object, bool fallback);
+    bool load_char_with_fallback(FT2Font *&ft_object_with_glyph,
+                                 FT_UInt &final_glyph_index,
+                                 std::vector<FT_Glyph> &parent_glyphs,
+                                 std::unordered_map<long, FT2Font *> &parent_char_to_font,
+                                 std::unordered_map<FT_UInt, FT2Font *> &parent_glyph_to_font,
+                                 long charcode,
+                                 FT_Int32 flags,
+                                 FT_Error &charcode_error,
+                                 FT_Error &glyph_error,
+                                 bool override);
+    void load_glyph(FT_UInt glyph_index, FT_Int32 flags, FT2Font *&ft_object, bool fallback);
     void load_glyph(FT_UInt glyph_index, FT_Int32 flags);
     void get_width_height(long *width, long *height);
     void get_bitmap_offset(long *x, long *y);
@@ -89,40 +103,51 @@ class FT2Font
     void get_xys(bool antialiased, std::vector<double> &xys);
     void draw_glyphs_to_bitmap(bool antialiased);
     void draw_glyph_to_bitmap(FT2Image &im, int x, int y, size_t glyphInd, bool antialiased);
-    void get_glyph_name(unsigned int glyph_number, char *buffer);
+    void get_glyph_name(unsigned int glyph_number, char *buffer, bool fallback);
     long get_name_index(char *name);
+    FT_UInt get_char_index(FT_ULong charcode, bool fallback);
+    void get_cbox(FT_BBox &bbox);
     PyObject* get_path();
+    bool get_char_fallback_index(FT_ULong charcode, int& index) const;
 
-    FT_Face &get_face()
+    FT_Face const &get_face() const
     {
         return face;
     }
+
     FT2Image &get_image()
     {
         return image;
     }
-    FT_Glyph &get_last_glyph()
+    FT_Glyph const &get_last_glyph() const
     {
         return glyphs.back();
     }
-    size_t get_last_glyph_index()
+    size_t get_last_glyph_index() const
     {
         return glyphs.size() - 1;
     }
-    size_t get_num_glyphs()
+    size_t get_num_glyphs() const
     {
         return glyphs.size();
     }
-    long get_hinting_factor()
+    long get_hinting_factor() const
     {
         return hinting_factor;
     }
+    FT_Bool has_kerning() const
+    {
+        return FT_HAS_KERNING(face);
+    }
 
   private:
     FT2Image image;
     FT_Face face;
     FT_Vector pen;    /* untransformed origin  */
     std::vector<FT_Glyph> glyphs;
+    std::vector<FT2Font *> fallbacks;
+    std::unordered_map<FT_UInt, FT2Font *> glyph_to_font;
+    std::unordered_map<long, FT2Font *> char_to_font;
     FT_BBox bbox;
     FT_Pos advance;
     long hinting_factor;
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
index 24330a810545..f25af11da6f5 100644
--- a/src/ft2font_wrapper.cpp
+++ b/src/ft2font_wrapper.cpp
@@ -7,6 +7,9 @@
 // From Python
 #include <structmember.h>
 
+#include <set>
+#include <algorithm>
+
 #define STRINGIFY(s) XSTRINGIFY(s)
 #define XSTRINGIFY(s) #s
 
@@ -33,6 +36,8 @@ typedef struct
     Py_ssize_t suboffsets[2];
 } PyFT2Image;
 
+static PyTypeObject PyFT2ImageType;
+
 static PyObject *PyFT2Image_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
     PyFT2Image *self;
@@ -62,11 +67,11 @@ static void PyFT2Image_dealloc(PyFT2Image *self)
 }
 
 const char *PyFT2Image_draw_rect__doc__ =
-    "draw_rect(x0, y0, x1, y1)\n"
+    "draw_rect(self, x0, y0, x1, y1)\n"
     "--\n\n"
     "Draw an empty rectangle to the image.\n";
 
-static PyObject *PyFT2Image_draw_rect(PyFT2Image *self, PyObject *args, PyObject *kwds)
+static PyObject *PyFT2Image_draw_rect(PyFT2Image *self, PyObject *args)
 {
     double x0, y0, x1, y1;
 
@@ -80,11 +85,11 @@ static PyObject *PyFT2Image_draw_rect(PyFT2Image *self, PyObject *args, PyObject
 }
 
 const char *PyFT2Image_draw_rect_filled__doc__ =
-    "draw_rect_filled(x0, y0, x1, y1)\n"
+    "draw_rect_filled(self, x0, y0, x1, y1)\n"
     "--\n\n"
     "Draw a filled rectangle to the image.\n";
 
-static PyObject *PyFT2Image_draw_rect_filled(PyFT2Image *self, PyObject *args, PyObject *kwds)
+static PyObject *PyFT2Image_draw_rect_filled(PyFT2Image *self, PyObject *args)
 {
     double x0, y0, x1, y1;
 
@@ -121,9 +126,7 @@ static int PyFT2Image_get_buffer(PyFT2Image *self, Py_buffer *buf, int flags)
     return 1;
 }
 
-static PyTypeObject PyFT2ImageType;
-
-static PyTypeObject *PyFT2Image_init_type(PyObject *m, PyTypeObject *type)
+static PyTypeObject* PyFT2Image_init_type()
 {
     static PyMethodDef methods[] = {
         {"draw_rect", (PyCFunction)PyFT2Image_draw_rect, METH_VARARGS, PyFT2Image_draw_rect__doc__},
@@ -132,28 +135,18 @@ static PyTypeObject *PyFT2Image_init_type(PyObject *m, PyTypeObject *type)
     };
 
     static PyBufferProcs buffer_procs;
-    memset(&buffer_procs, 0, sizeof(PyBufferProcs));
     buffer_procs.bf_getbuffer = (getbufferproc)PyFT2Image_get_buffer;
 
-    memset(type, 0, sizeof(PyTypeObject));
-    type->tp_name = "matplotlib.ft2font.FT2Image";
-    type->tp_basicsize = sizeof(PyFT2Image);
-    type->tp_dealloc = (destructor)PyFT2Image_dealloc;
-    type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
-    type->tp_methods = methods;
-    type->tp_new = PyFT2Image_new;
-    type->tp_init = (initproc)PyFT2Image_init;
-    type->tp_as_buffer = &buffer_procs;
-
-    if (PyType_Ready(type) < 0) {
-        return NULL;
-    }
+    PyFT2ImageType.tp_name = "matplotlib.ft2font.FT2Image";
+    PyFT2ImageType.tp_basicsize = sizeof(PyFT2Image);
+    PyFT2ImageType.tp_dealloc = (destructor)PyFT2Image_dealloc;
+    PyFT2ImageType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
+    PyFT2ImageType.tp_methods = methods;
+    PyFT2ImageType.tp_new = PyFT2Image_new;
+    PyFT2ImageType.tp_init = (initproc)PyFT2Image_init;
+    PyFT2ImageType.tp_as_buffer = &buffer_procs;
 
-    if (PyModule_AddObject(m, "FT2Image", (PyObject *)type)) {
-        return NULL;
-    }
-
-    return type;
+    return &PyFT2ImageType;
 }
 
 /**********************************************************************
@@ -178,14 +171,16 @@ typedef struct
 
 static PyTypeObject PyGlyphType;
 
-static PyObject *
-PyGlyph_new(const FT_Face &face, const FT_Glyph &glyph, size_t ind, long hinting_factor)
+static PyObject *PyGlyph_from_FT2Font(const FT2Font *font)
 {
+    const FT_Face &face = font->get_face();
+    const long hinting_factor = font->get_hinting_factor();
+    const FT_Glyph &glyph = font->get_last_glyph();
+
     PyGlyph *self;
     self = (PyGlyph *)PyGlyphType.tp_alloc(&PyGlyphType, 0);
 
-    self->glyphInd = ind;
-
+    self->glyphInd = font->get_last_glyph_index();
     FT_Glyph_Get_CBox(glyph, ft_glyph_bbox_subpixels, &self->bbox);
 
     self->width = face->glyph->metrics.width / hinting_factor;
@@ -212,7 +207,7 @@ static PyObject *PyGlyph_get_bbox(PyGlyph *self, void *closure)
         "llll", self->bbox.xMin, self->bbox.yMin, self->bbox.xMax, self->bbox.yMax);
 }
 
-static PyTypeObject *PyGlyph_init_type(PyObject *m, PyTypeObject *type)
+static PyTypeObject *PyGlyph_init_type()
 {
     static PyMemberDef members[] = {
         {(char *)"width", T_LONG, offsetof(PyGlyph, width), READONLY, (char *)""},
@@ -232,39 +227,33 @@ static PyTypeObject *PyGlyph_init_type(PyObject *m, PyTypeObject *type)
         {NULL}
     };
 
-    memset(type, 0, sizeof(PyTypeObject));
-    type->tp_name = "matplotlib.ft2font.Glyph";
-    type->tp_basicsize = sizeof(PyGlyph);
-    type->tp_dealloc = (destructor)PyGlyph_dealloc;
-    type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
-    type->tp_members = members;
-    type->tp_getset = getset;
-
-    if (PyType_Ready(type) < 0) {
-        return NULL;
-    }
+    PyGlyphType.tp_name = "matplotlib.ft2font.Glyph";
+    PyGlyphType.tp_basicsize = sizeof(PyGlyph);
+    PyGlyphType.tp_dealloc = (destructor)PyGlyph_dealloc;
+    PyGlyphType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
+    PyGlyphType.tp_members = members;
+    PyGlyphType.tp_getset = getset;
 
-    /* Don't need to add to module, since you can't create glyphs
-       directly from Python */
-
-    return type;
+    return &PyGlyphType;
 }
 
 /**********************************************************************
  * FT2Font
  * */
 
-typedef struct
+struct PyFT2Font
 {
     PyObject_HEAD
     FT2Font *x;
-    PyObject *fname;
     PyObject *py_file;
     FT_StreamRec stream;
     Py_ssize_t shape[2];
     Py_ssize_t strides[2];
     Py_ssize_t suboffsets[2];
-} PyFT2Font;
+    std::vector<PyObject *> fallbacks;
+};
+
+static PyTypeObject PyFT2FontType;
 
 static unsigned long read_from_file_callback(FT_Stream stream,
                                              unsigned long offset,
@@ -292,11 +281,13 @@ static unsigned long read_from_file_callback(FT_Stream stream,
             return 1;  // Non-zero signals error, when count == 0.
         }
     }
-    return n_read;
+    return (unsigned long)n_read;
 }
 
 static void close_file_callback(FT_Stream stream)
 {
+    PyObject *type, *value, *traceback;
+    PyErr_Fetch(&type, &value, &traceback);
     PyFT2Font *self = (PyFT2Font *)stream->descriptor.pointer;
     PyObject *close_result = NULL;
     if (!(close_result = PyObject_CallMethod(self->py_file, "close", ""))) {
@@ -308,26 +299,38 @@ static void close_file_callback(FT_Stream stream)
     if (PyErr_Occurred()) {
         PyErr_WriteUnraisable((PyObject*)self);
     }
+    PyErr_Restore(type, value, traceback);
 }
 
-static PyTypeObject PyFT2FontType;
-
 static PyObject *PyFT2Font_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
     PyFT2Font *self;
     self = (PyFT2Font *)type->tp_alloc(type, 0);
     self->x = NULL;
-    self->fname = NULL;
     self->py_file = NULL;
     memset(&self->stream, 0, sizeof(FT_StreamRec));
     return (PyObject *)self;
 }
 
 const char *PyFT2Font_init__doc__ =
-    "FT2Font(ttffile)\n"
+    "FT2Font(filename, hinting_factor=8, *, _fallback_list=None, _kerning_factor=0)\n"
     "--\n\n"
     "Create a new FT2Font object.\n"
     "\n"
+    "Parameters\n"
+    "----------\n"
+    "filename : str or file-like\n"
+    "    The source of the font data in a format (ttf or ttc) that FreeType can read\n\n"
+    "hinting_factor : int, optional\n"
+    "    Must be positive. Used to scale the hinting in the x-direction\n"
+    "_fallback_list : list of FT2Font, optional\n"
+    "    A list of FT2Font objects used to find missing glyphs.\n\n"
+    "    .. warning ::\n"
+    "        This API is both private and provisional: do not use it directly\n\n"
+    "_kerning_factor : int, optional\n"
+    "    Used to adjust the degree of kerning.\n\n"
+    "    .. warning ::\n"
+    "        This API is private: do not use it directly\n\n"
     "Attributes\n"
     "----------\n"
     "num_faces\n"
@@ -361,17 +364,24 @@ const char *PyFT2Font_init__doc__ =
 
 static int PyFT2Font_init(PyFT2Font *self, PyObject *args, PyObject *kwds)
 {
-    PyObject *filename = NULL, *open = NULL, *data = NULL;
+    PyObject *filename = NULL, *open = NULL, *data = NULL, *fallback_list = NULL;
     FT_Open_Args open_args;
     long hinting_factor = 8;
     int kerning_factor = 0;
-    const char *names[] = { "filename", "hinting_factor", "_kerning_factor", NULL };
-
+    const char *names[] = {
+        "filename", "hinting_factor", "_fallback_list", "_kerning_factor", NULL
+    };
+    std::vector<FT2Font *> fallback_fonts;
     if (!PyArg_ParseTupleAndKeywords(
-             args, kwds, "O|l$i:FT2Font", (char **)names, &filename,
-             &hinting_factor, &kerning_factor)) {
+             args, kwds, "O|l$Oi:FT2Font", (char **)names, &filename,
+             &hinting_factor, &fallback_list, &kerning_factor)) {
         return -1;
     }
+    if (hinting_factor <= 0) {
+      PyErr_SetString(PyExc_ValueError,
+                      "hinting_factor must be greater than 0");
+      goto exit;
+    }
 
     self->stream.base = NULL;
     self->stream.size = 0x7fffffff;  // Unknown size.
@@ -382,6 +392,37 @@ static int PyFT2Font_init(PyFT2Font *self, PyObject *args, PyObject *kwds)
     open_args.flags = FT_OPEN_STREAM;
     open_args.stream = &self->stream;
 
+    if (fallback_list) {
+        if (!PyList_Check(fallback_list)) {
+            PyErr_SetString(PyExc_TypeError, "Fallback list must be a list");
+            goto exit;
+        }
+        Py_ssize_t size = PyList_Size(fallback_list);
+
+        // go through fallbacks once to make sure the types are right
+        for (Py_ssize_t i = 0; i < size; ++i) {
+            // this returns a borrowed reference
+            PyObject* item = PyList_GetItem(fallback_list, i);
+            if (!PyObject_IsInstance(item, PyObject_Type(reinterpret_cast<PyObject *>(self)))) {
+                PyErr_SetString(PyExc_TypeError, "Fallback fonts must be FT2Font objects.");
+                goto exit;
+            }
+        }
+        // go through a second time to add them to our lists
+        for (Py_ssize_t i = 0; i < size; ++i) {
+            // this returns a borrowed reference
+            PyObject* item = PyList_GetItem(fallback_list, i);
+            // Increase the ref count, we will undo this in dealloc this makes
+            // sure things do not get gc'd under us!
+            Py_INCREF(item);
+            self->fallbacks.push_back(item);
+            // Also (locally) cache the underlying FT2Font objects. As long as
+            // the Python objects are kept alive, these pointer are good.
+            FT2Font *fback = reinterpret_cast<PyFT2Font *>(item)->x;
+            fallback_fonts.push_back(fback);
+        }
+    }
+
     if (PyBytes_Check(filename) || PyUnicode_Check(filename)) {
         if (!(open = PyDict_GetItemString(PyEval_GetBuiltins(), "open"))  // Borrowed reference.
             || !(self->py_file = PyObject_CallFunction(open, "Os", filename, "rb"))) {
@@ -403,14 +444,11 @@ static int PyFT2Font_init(PyFT2Font *self, PyObject *args, PyObject *kwds)
     Py_CLEAR(data);
 
     CALL_CPP_FULL(
-        "FT2Font", (self->x = new FT2Font(open_args, hinting_factor)),
+        "FT2Font", (self->x = new FT2Font(open_args, hinting_factor, fallback_fonts)),
         Py_CLEAR(self->py_file), -1);
 
     CALL_CPP_INIT("FT2Font->set_kerning_factor", (self->x->set_kerning_factor(kerning_factor)));
 
-    Py_INCREF(filename);
-    self->fname = filename;
-
 exit:
     return PyErr_Occurred() ? -1 : 0;
 }
@@ -418,17 +456,20 @@ static int PyFT2Font_init(PyFT2Font *self, PyObject *args, PyObject *kwds)
 static void PyFT2Font_dealloc(PyFT2Font *self)
 {
     delete self->x;
+    for (size_t i = 0; i < self->fallbacks.size(); i++) {
+        Py_DECREF(self->fallbacks[i]);
+    }
+
     Py_XDECREF(self->py_file);
-    Py_XDECREF(self->fname);
     Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
 const char *PyFT2Font_clear__doc__ =
-    "clear()\n"
+    "clear(self)\n"
     "--\n\n"
     "Clear all the glyphs, reset for a new call to `.set_text`.\n";
 
-static PyObject *PyFT2Font_clear(PyFT2Font *self, PyObject *args, PyObject *kwds)
+static PyObject *PyFT2Font_clear(PyFT2Font *self, PyObject *args)
 {
     CALL_CPP("clear", (self->x->clear()));
 
@@ -436,11 +477,11 @@ static PyObject *PyFT2Font_clear(PyFT2Font *self, PyObject *args, PyObject *kwds
 }
 
 const char *PyFT2Font_set_size__doc__ =
-    "set_size(ptsize, dpi)\n"
+    "set_size(self, ptsize, dpi)\n"
     "--\n\n"
     "Set the point size and dpi of the text.\n";
 
-static PyObject *PyFT2Font_set_size(PyFT2Font *self, PyObject *args, PyObject *kwds)
+static PyObject *PyFT2Font_set_size(PyFT2Font *self, PyObject *args)
 {
     double ptsize;
     double dpi;
@@ -455,11 +496,11 @@ static PyObject *PyFT2Font_set_size(PyFT2Font *self, PyObject *args, PyObject *k
 }
 
 const char *PyFT2Font_set_charmap__doc__ =
-    "set_charmap(i)\n"
+    "set_charmap(self, i)\n"
     "--\n\n"
     "Make the i-th charmap current.\n";
 
-static PyObject *PyFT2Font_set_charmap(PyFT2Font *self, PyObject *args, PyObject *kwds)
+static PyObject *PyFT2Font_set_charmap(PyFT2Font *self, PyObject *args)
 {
     int i;
 
@@ -473,11 +514,11 @@ static PyObject *PyFT2Font_set_charmap(PyFT2Font *self, PyObject *args, PyObject
 }
 
 const char *PyFT2Font_select_charmap__doc__ =
-    "select_charmap(i)\n"
+    "select_charmap(self, i)\n"
     "--\n\n"
     "Select a charmap by its FT_Encoding number.\n";
 
-static PyObject *PyFT2Font_select_charmap(PyFT2Font *self, PyObject *args, PyObject *kwds)
+static PyObject *PyFT2Font_select_charmap(PyFT2Font *self, PyObject *args)
 {
     unsigned long i;
 
@@ -491,30 +532,101 @@ static PyObject *PyFT2Font_select_charmap(PyFT2Font *self, PyObject *args, PyObj
 }
 
 const char *PyFT2Font_get_kerning__doc__ =
-    "get_kerning(left, right, mode)\n"
+    "get_kerning(self, left, right, mode)\n"
     "--\n\n"
     "Get the kerning between *left* and *right* glyph indices.\n"
-    "*mode* is a kerning mode constant:\n"
-    "  KERNING_DEFAULT  - Return scaled and grid-fitted kerning distances\n"
-    "  KERNING_UNFITTED - Return scaled but un-grid-fitted kerning distances\n"
-    "  KERNING_UNSCALED - Return the kerning vector in original font units\n";
+    "*mode* is a kerning mode constant:\n\n"
+    "    - KERNING_DEFAULT  - Return scaled and grid-fitted kerning distances\n"
+    "    - KERNING_UNFITTED - Return scaled but un-grid-fitted kerning distances\n"
+    "    - KERNING_UNSCALED - Return the kerning vector in original font units\n";
 
-static PyObject *PyFT2Font_get_kerning(PyFT2Font *self, PyObject *args, PyObject *kwds)
+static PyObject *PyFT2Font_get_kerning(PyFT2Font *self, PyObject *args)
 {
     FT_UInt left, right, mode;
     int result;
+    int fallback = 1;
 
     if (!PyArg_ParseTuple(args, "III:get_kerning", &left, &right, &mode)) {
         return NULL;
     }
 
-    CALL_CPP("get_kerning", (result = self->x->get_kerning(left, right, mode)));
+    CALL_CPP("get_kerning", (result = self->x->get_kerning(left, right, mode, (bool)fallback)));
 
     return PyLong_FromLong(result);
 }
 
+const char *PyFT2Font_get_fontmap__doc__ =
+    "_get_fontmap(self, string)\n"
+    "--\n\n"
+    "Get a mapping between characters and the font that includes them.\n"
+    "A dictionary mapping unicode characters to PyFT2Font objects.";
+static PyObject *PyFT2Font_get_fontmap(PyFT2Font *self, PyObject *args, PyObject *kwds)
+{
+    PyObject *textobj;
+    const char *names[] = { "string", NULL };
+
+    if (!PyArg_ParseTupleAndKeywords(
+            args, kwds, "O:_get_fontmap", (char **)names, &textobj)) {
+        return NULL;
+    }
+
+    std::set<FT_ULong> codepoints;
+    size_t size;
+
+    if (PyUnicode_Check(textobj)) {
+        size = PyUnicode_GET_LENGTH(textobj);
+#if defined(PYPY_VERSION) && (PYPY_VERSION_NUM < 0x07040000)
+        // PyUnicode_ReadChar is available from PyPy 7.3.2, but wheels do not
+        // specify the micro-release version, so put the version bound at 7.4
+        // to prevent generating wheels unusable on PyPy 7.3.{0,1}.
+        Py_UNICODE *unistr = PyUnicode_AsUnicode(textobj);
+        for (size_t i = 0; i < size; ++i) {
+            codepoints.insert(unistr[i]);
+        }
+#else
+        for (size_t i = 0; i < size; ++i) {
+            codepoints.insert(PyUnicode_ReadChar(textobj, i));
+        }
+#endif
+    } else {
+        PyErr_SetString(PyExc_TypeError, "string must be str");
+        return NULL;
+    }
+    PyObject *char_to_font;
+    if (!(char_to_font = PyDict_New())) {
+        return NULL;
+    }
+    for (auto it = codepoints.begin(); it != codepoints.end(); ++it) {
+        auto x = *it;
+        PyObject* target_font;
+        int index;
+        if (self->x->get_char_fallback_index(x, index)) {
+            if (index >= 0) {
+                target_font = self->fallbacks[index];
+            } else {
+                target_font = (PyObject *)self;
+            }
+        } else {
+            // TODO Handle recursion!
+            target_font = (PyObject *)self;
+        }
+
+        PyObject *key = NULL;
+        bool error = (!(key = PyUnicode_FromFormat("%c", x))
+                      || (PyDict_SetItem(char_to_font, key, target_font) == -1));
+        Py_XDECREF(key);
+        if (error) {
+            Py_DECREF(char_to_font);
+            PyErr_SetString(PyExc_ValueError, "Something went very wrong");
+            return NULL;
+        }
+    }
+    return char_to_font;
+}
+
+
 const char *PyFT2Font_set_text__doc__ =
-    "set_text(string, angle, flags=32)\n"
+    "set_text(self, string, angle, flags=32)\n"
     "--\n\n"
     "Set the text *string* and *angle*.\n"
     "*flags* can be a bitwise-or of the LOAD_XXX constants;\n"
@@ -544,7 +656,10 @@ static PyObject *PyFT2Font_set_text(PyFT2Font *self, PyObject *args, PyObject *k
     if (PyUnicode_Check(textobj)) {
         size = PyUnicode_GET_LENGTH(textobj);
         codepoints.resize(size);
-#if defined(PYPY_VERSION) && (PYPY_VERSION_NUM  < 0x07030200)
+#if defined(PYPY_VERSION) && (PYPY_VERSION_NUM < 0x07040000)
+        // PyUnicode_ReadChar is available from PyPy 7.3.2, but wheels do not
+        // specify the micro-release version, so put the version bound at 7.4
+        // to prevent generating wheels unusable on PyPy 7.3.{0,1}.
         Py_UNICODE *unistr = PyUnicode_AsUnicode(textobj);
         for (size_t i = 0; i < size; ++i) {
             codepoints[i] = unistr[i];
@@ -554,22 +669,8 @@ static PyObject *PyFT2Font_set_text(PyFT2Font *self, PyObject *args, PyObject *k
             codepoints[i] = PyUnicode_ReadChar(textobj, i);
         }
 #endif
-    } else if (PyBytes_Check(textobj)) {
-        if (PyErr_WarnEx(
-            PyExc_FutureWarning,
-            "Passing bytes to FTFont.set_text is deprecated since Matplotlib "
-            "3.4 and support will be removed in Matplotlib 3.6; pass str instead",
-            1)) {
-            return NULL;
-        }
-        size = PyBytes_Size(textobj);
-        codepoints.resize(size);
-        char *bytestr = PyBytes_AsString(textobj);
-        for (size_t i = 0; i < size; ++i) {
-            codepoints[i] = bytestr[i];
-        }
     } else {
-        PyErr_SetString(PyExc_TypeError, "String must be str or bytes");
+        PyErr_SetString(PyExc_TypeError, "set_text requires str-input.");
         return NULL;
     }
 
@@ -583,101 +684,99 @@ static PyObject *PyFT2Font_set_text(PyFT2Font *self, PyObject *args, PyObject *k
 }
 
 const char *PyFT2Font_get_num_glyphs__doc__ =
-    "get_num_glyphs()\n"
+    "get_num_glyphs(self)\n"
     "--\n\n"
     "Return the number of loaded glyphs.\n";
 
-static PyObject *PyFT2Font_get_num_glyphs(PyFT2Font *self, PyObject *args, PyObject *kwds)
+static PyObject *PyFT2Font_get_num_glyphs(PyFT2Font *self, PyObject *args)
 {
-    return PyLong_FromLong(self->x->get_num_glyphs());
+    return PyLong_FromSize_t(self->x->get_num_glyphs());
 }
 
 const char *PyFT2Font_load_char__doc__ =
-    "load_char(charcode, flags=32)\n"
+    "load_char(self, charcode, flags=32)\n"
     "--\n\n"
     "Load character with *charcode* in current fontfile and set glyph.\n"
     "*flags* can be a bitwise-or of the LOAD_XXX constants;\n"
     "the default value is LOAD_FORCE_AUTOHINT.\n"
-    "Return value is a Glyph object, with attributes\n"
-    "  width          # glyph width\n"
-    "  height         # glyph height\n"
-    "  bbox           # the glyph bbox (xmin, ymin, xmax, ymax)\n"
-    "  horiBearingX   # left side bearing in horizontal layouts\n"
-    "  horiBearingY   # top side bearing in horizontal layouts\n"
-    "  horiAdvance    # advance width for horizontal layout\n"
-    "  vertBearingX   # left side bearing in vertical layouts\n"
-    "  vertBearingY   # top side bearing in vertical layouts\n"
-    "  vertAdvance    # advance height for vertical layout\n";
+    "Return value is a Glyph object, with attributes\n\n"
+    "- width: glyph width\n"
+    "- height: glyph height\n"
+    "- bbox: the glyph bbox (xmin, ymin, xmax, ymax)\n"
+    "- horiBearingX: left side bearing in horizontal layouts\n"
+    "- horiBearingY: top side bearing in horizontal layouts\n"
+    "- horiAdvance: advance width for horizontal layout\n"
+    "- vertBearingX: left side bearing in vertical layouts\n"
+    "- vertBearingY: top side bearing in vertical layouts\n"
+    "- vertAdvance: advance height for vertical layout\n";
 
 static PyObject *PyFT2Font_load_char(PyFT2Font *self, PyObject *args, PyObject *kwds)
 {
     long charcode;
+    int fallback = 1;
     FT_Int32 flags = FT_LOAD_FORCE_AUTOHINT;
     const char *names[] = { "charcode", "flags", NULL };
 
     /* This makes a technically incorrect assumption that FT_Int32 is
        int. In theory it can also be long, if the size of int is less
        than 32 bits. This is very unlikely on modern platforms. */
-    if (!PyArg_ParseTupleAndKeywords(
-             args, kwds, "l|i:load_char", (char **)names, &charcode, &flags)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwds, "l|i:load_char", (char **)names, &charcode,
+                                     &flags)) {
         return NULL;
     }
 
-    CALL_CPP("load_char", (self->x->load_char(charcode, flags)));
+    FT2Font *ft_object = NULL;
+    CALL_CPP("load_char", (self->x->load_char(charcode, flags, ft_object, (bool)fallback)));
 
-    return PyGlyph_new(self->x->get_face(),
-                       self->x->get_last_glyph(),
-                       self->x->get_last_glyph_index(),
-                       self->x->get_hinting_factor());
+    return PyGlyph_from_FT2Font(ft_object);
 }
 
 const char *PyFT2Font_load_glyph__doc__ =
-    "load_glyph(glyphindex, flags=32)\n"
+    "load_glyph(self, glyphindex, flags=32)\n"
     "--\n\n"
     "Load character with *glyphindex* in current fontfile and set glyph.\n"
     "*flags* can be a bitwise-or of the LOAD_XXX constants;\n"
     "the default value is LOAD_FORCE_AUTOHINT.\n"
-    "Return value is a Glyph object, with attributes\n"
-    "  width          # glyph width\n"
-    "  height         # glyph height\n"
-    "  bbox           # the glyph bbox (xmin, ymin, xmax, ymax)\n"
-    "  horiBearingX   # left side bearing in horizontal layouts\n"
-    "  horiBearingY   # top side bearing in horizontal layouts\n"
-    "  horiAdvance    # advance width for horizontal layout\n"
-    "  vertBearingX   # left side bearing in vertical layouts\n"
-    "  vertBearingY   # top side bearing in vertical layouts\n"
-    "  vertAdvance    # advance height for vertical layout\n";
+    "Return value is a Glyph object, with attributes\n\n"
+    "- width: glyph width\n"
+    "- height: glyph height\n"
+    "- bbox: the glyph bbox (xmin, ymin, xmax, ymax)\n"
+    "- horiBearingX: left side bearing in horizontal layouts\n"
+    "- horiBearingY: top side bearing in horizontal layouts\n"
+    "- horiAdvance: advance width for horizontal layout\n"
+    "- vertBearingX: left side bearing in vertical layouts\n"
+    "- vertBearingY: top side bearing in vertical layouts\n"
+    "- vertAdvance: advance height for vertical layout\n";
 
 static PyObject *PyFT2Font_load_glyph(PyFT2Font *self, PyObject *args, PyObject *kwds)
 {
     FT_UInt glyph_index;
     FT_Int32 flags = FT_LOAD_FORCE_AUTOHINT;
+    int fallback = 1;
     const char *names[] = { "glyph_index", "flags", NULL };
 
     /* This makes a technically incorrect assumption that FT_Int32 is
        int. In theory it can also be long, if the size of int is less
        than 32 bits. This is very unlikely on modern platforms. */
-    if (!PyArg_ParseTupleAndKeywords(
-             args, kwds, "I|i:load_glyph", (char **)names, &glyph_index, &flags)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwds, "I|i:load_glyph", (char **)names, &glyph_index,
+                                     &flags)) {
         return NULL;
     }
 
-    CALL_CPP("load_glyph", (self->x->load_glyph(glyph_index, flags)));
+    FT2Font *ft_object = NULL;
+    CALL_CPP("load_glyph", (self->x->load_glyph(glyph_index, flags, ft_object, (bool)fallback)));
 
-    return PyGlyph_new(self->x->get_face(),
-                       self->x->get_last_glyph(),
-                       self->x->get_last_glyph_index(),
-                       self->x->get_hinting_factor());
+    return PyGlyph_from_FT2Font(ft_object);
 }
 
 const char *PyFT2Font_get_width_height__doc__ =
-    "get_width_height()\n"
+    "get_width_height(self)\n"
     "--\n\n"
     "Get the width and height in 26.6 subpixels of the current string set by `.set_text`.\n"
     "The rotation of the string is accounted for.  To get width and height\n"
     "in pixels, divide these values by 64.\n";
 
-static PyObject *PyFT2Font_get_width_height(PyFT2Font *self, PyObject *args, PyObject *kwds)
+static PyObject *PyFT2Font_get_width_height(PyFT2Font *self, PyObject *args)
 {
     long width, height;
 
@@ -687,12 +786,12 @@ static PyObject *PyFT2Font_get_width_height(PyFT2Font *self, PyObject *args, PyO
 }
 
 const char *PyFT2Font_get_bitmap_offset__doc__ =
-    "get_bitmap_offset()\n"
+    "get_bitmap_offset(self)\n"
     "--\n\n"
     "Get the (x, y) offset in 26.6 subpixels for the bitmap if ink hangs left or below (0, 0).\n"
     "Since Matplotlib only supports left-to-right text, y is always 0.\n";
 
-static PyObject *PyFT2Font_get_bitmap_offset(PyFT2Font *self, PyObject *args, PyObject *kwds)
+static PyObject *PyFT2Font_get_bitmap_offset(PyFT2Font *self, PyObject *args)
 {
     long x, y;
 
@@ -702,13 +801,13 @@ static PyObject *PyFT2Font_get_bitmap_offset(PyFT2Font *self, PyObject *args, Py
 }
 
 const char *PyFT2Font_get_descent__doc__ =
-    "get_descent()\n"
+    "get_descent(self)\n"
     "--\n\n"
     "Get the descent in 26.6 subpixels of the current string set by `.set_text`.\n"
     "The rotation of the string is accounted for.  To get the descent\n"
     "in pixels, divide this value by 64.\n";
 
-static PyObject *PyFT2Font_get_descent(PyFT2Font *self, PyObject *args, PyObject *kwds)
+static PyObject *PyFT2Font_get_descent(PyFT2Font *self, PyObject *args)
 {
     long descent;
 
@@ -718,7 +817,7 @@ static PyObject *PyFT2Font_get_descent(PyFT2Font *self, PyObject *args, PyObject
 }
 
 const char *PyFT2Font_draw_glyphs_to_bitmap__doc__ =
-    "draw_glyphs_to_bitmap()\n"
+    "draw_glyphs_to_bitmap(self, antialiased=True)\n"
     "--\n\n"
     "Draw the glyphs that were loaded by `.set_text` to the bitmap.\n"
     "The bitmap size will be automatically set to include the glyphs.\n";
@@ -739,7 +838,7 @@ static PyObject *PyFT2Font_draw_glyphs_to_bitmap(PyFT2Font *self, PyObject *args
 }
 
 const char *PyFT2Font_get_xys__doc__ =
-    "get_xys()\n"
+    "get_xys(self, antialiased=True)\n"
     "--\n\n"
     "Get the xy locations of the current glyphs.\n";
 
@@ -760,7 +859,7 @@ static PyObject *PyFT2Font_get_xys(PyFT2Font *self, PyObject *args, PyObject *kw
 }
 
 const char *PyFT2Font_draw_glyph_to_bitmap__doc__ =
-    "draw_glyph_to_bitmap(bitmap, x, y, glyph)\n"
+    "draw_glyph_to_bitmap(self, image, x, y, glyph, antialiased=True)\n"
     "--\n\n"
     "Draw a single glyph to the bitmap at pixel locations x, y\n"
     "Note it is your responsibility to set up the bitmap manually\n"
@@ -801,7 +900,7 @@ static PyObject *PyFT2Font_draw_glyph_to_bitmap(PyFT2Font *self, PyObject *args,
 }
 
 const char *PyFT2Font_get_glyph_name__doc__ =
-    "get_glyph_name(index)\n"
+    "get_glyph_name(self, index)\n"
     "--\n\n"
     "Retrieve the ASCII name of a given glyph *index* in a face.\n"
     "\n"
@@ -809,24 +908,26 @@ const char *PyFT2Font_get_glyph_name__doc__ =
     "names (per FT_FACE_FLAG_GLYPH_NAMES), this returns a made-up name which\n"
     "does *not* roundtrip through `.get_name_index`.\n";
 
-static PyObject *PyFT2Font_get_glyph_name(PyFT2Font *self, PyObject *args, PyObject *kwds)
+static PyObject *PyFT2Font_get_glyph_name(PyFT2Font *self, PyObject *args)
 {
     unsigned int glyph_number;
     char buffer[128];
+    int fallback = 1;
+
     if (!PyArg_ParseTuple(args, "I:get_glyph_name", &glyph_number)) {
         return NULL;
     }
-    CALL_CPP("get_glyph_name", (self->x->get_glyph_name(glyph_number, buffer)));
+    CALL_CPP("get_glyph_name", (self->x->get_glyph_name(glyph_number, buffer, (bool)fallback)));
     return PyUnicode_FromString(buffer);
 }
 
 const char *PyFT2Font_get_charmap__doc__ =
-    "get_charmap()\n"
+    "get_charmap(self)\n"
     "--\n\n"
     "Return a dict that maps the character codes of the selected charmap\n"
     "(Unicode by default) to their corresponding glyph indices.\n";
 
-static PyObject *PyFT2Font_get_charmap(PyFT2Font *self, PyObject *args, PyObject *kwds)
+static PyObject *PyFT2Font_get_charmap(PyFT2Font *self, PyObject *args)
 {
     PyObject *charmap;
     if (!(charmap = PyDict_New())) {
@@ -852,33 +953,34 @@ static PyObject *PyFT2Font_get_charmap(PyFT2Font *self, PyObject *args, PyObject
 
 
 const char *PyFT2Font_get_char_index__doc__ =
-    "get_char_index(codepoint)\n"
+    "get_char_index(self, codepoint)\n"
     "--\n\n"
     "Return the glyph index corresponding to a character *codepoint*.\n";
 
-static PyObject *PyFT2Font_get_char_index(PyFT2Font *self, PyObject *args, PyObject *kwds)
+static PyObject *PyFT2Font_get_char_index(PyFT2Font *self, PyObject *args)
 {
     FT_UInt index;
     FT_ULong ccode;
+    int fallback = 1;
 
     if (!PyArg_ParseTuple(args, "k:get_char_index", &ccode)) {
         return NULL;
     }
 
-    index = FT_Get_Char_Index(self->x->get_face(), ccode);
+    CALL_CPP("get_char_index", index = self->x->get_char_index(ccode, (bool)fallback));
 
     return PyLong_FromLong(index);
 }
 
 
 const char *PyFT2Font_get_sfnt__doc__ =
-    "get_sfnt()\n"
+    "get_sfnt(self)\n"
     "--\n\n"
     "Load the entire SFNT names table, as a dict whose keys are\n"
     "(platform-ID, ISO-encoding-scheme, language-code, and description)\n"
     "tuples.\n";
 
-static PyObject *PyFT2Font_get_sfnt(PyFT2Font *self, PyObject *args, PyObject *kwds)
+static PyObject *PyFT2Font_get_sfnt(PyFT2Font *self, PyObject *args)
 {
     PyObject *names;
 
@@ -933,12 +1035,12 @@ static PyObject *PyFT2Font_get_sfnt(PyFT2Font *self, PyObject *args, PyObject *k
 }
 
 const char *PyFT2Font_get_name_index__doc__ =
-    "get_name_index(name)\n"
+    "get_name_index(self, name)\n"
     "--\n\n"
     "Return the glyph index of a given glyph *name*.\n"
     "The glyph index 0 means 'undefined character code'.\n";
 
-static PyObject *PyFT2Font_get_name_index(PyFT2Font *self, PyObject *args, PyObject *kwds)
+static PyObject *PyFT2Font_get_name_index(PyFT2Font *self, PyObject *args)
 {
     char *glyphname;
     long name_index;
@@ -950,11 +1052,11 @@ static PyObject *PyFT2Font_get_name_index(PyFT2Font *self, PyObject *args, PyObj
 }
 
 const char *PyFT2Font_get_ps_font_info__doc__ =
-    "get_ps_font_info()\n"
+    "get_ps_font_info(self)\n"
     "--\n\n"
     "Return the information in the PS Font Info structure.\n";
 
-static PyObject *PyFT2Font_get_ps_font_info(PyFT2Font *self, PyObject *args, PyObject *kwds)
+static PyObject *PyFT2Font_get_ps_font_info(PyFT2Font *self, PyObject *args)
 {
     PS_FontInfoRec fontinfo;
 
@@ -977,12 +1079,12 @@ static PyObject *PyFT2Font_get_ps_font_info(PyFT2Font *self, PyObject *args, PyO
 }
 
 const char *PyFT2Font_get_sfnt_table__doc__ =
-    "get_sfnt_table(name)\n"
+    "get_sfnt_table(self, name)\n"
     "--\n\n"
     "Return one of the following SFNT tables: head, maxp, OS/2, hhea, "
     "vhea, post, or pclt.\n";
 
-static PyObject *PyFT2Font_get_sfnt_table(PyFT2Font *self, PyObject *args, PyObject *kwds)
+static PyObject *PyFT2Font_get_sfnt_table(PyFT2Font *self, PyObject *args)
 {
     char *tagname;
     if (!PyArg_ParseTuple(args, "s:get_sfnt_table", &tagname)) {
@@ -1279,22 +1381,22 @@ static PyObject *PyFT2Font_get_sfnt_table(PyFT2Font *self, PyObject *args, PyObj
 }
 
 const char *PyFT2Font_get_path__doc__ =
-    "get_path()\n"
+    "get_path(self)\n"
     "--\n\n"
     "Get the path data from the currently loaded glyph as a tuple of vertices, "
     "codes.\n";
 
-static PyObject *PyFT2Font_get_path(PyFT2Font *self, PyObject *args, PyObject *kwds)
+static PyObject *PyFT2Font_get_path(PyFT2Font *self, PyObject *args)
 {
     CALL_CPP("get_path", return self->x->get_path());
 }
 
 const char *PyFT2Font_get_image__doc__ =
-    "get_image()\n"
+    "get_image(self)\n"
     "--\n\n"
     "Return the underlying image buffer for this font object.\n";
 
-static PyObject *PyFT2Font_get_image(PyFT2Font *self, PyObject *args, PyObject *kwds)
+static PyObject *PyFT2Font_get_image(PyFT2Font *self, PyObject *args)
 {
     FT2Image &im = self->x->get_image();
     npy_intp dims[] = {(npy_intp)im.get_height(), (npy_intp)im.get_width() };
@@ -1417,12 +1519,12 @@ static PyObject *PyFT2Font_underline_thickness(PyFT2Font *self, void *closure)
 
 static PyObject *PyFT2Font_fname(PyFT2Font *self, void *closure)
 {
-    if (self->fname) {
-        Py_INCREF(self->fname);
-        return self->fname;
+    if (self->stream.close) {  // Called passed a filename to the constructor.
+        return PyObject_GetAttrString(self->py_file, "name");
+    } else {
+        Py_INCREF(self->py_file);
+        return self->py_file;
     }
-
-    Py_RETURN_NONE;
 }
 
 static int PyFT2Font_get_buffer(PyFT2Font *self, Py_buffer *buf, int flags)
@@ -1449,7 +1551,7 @@ static int PyFT2Font_get_buffer(PyFT2Font *self, Py_buffer *buf, int flags)
     return 1;
 }
 
-static PyTypeObject *PyFT2Font_init_type(PyObject *m, PyTypeObject *type)
+static PyTypeObject *PyFT2Font_init_type()
 {
     static PyGetSetDef getset[] = {
         {(char *)"postscript_name", (getter)PyFT2Font_postscript_name, NULL, NULL, NULL},
@@ -1482,6 +1584,7 @@ static PyTypeObject *PyFT2Font_init_type(PyObject *m, PyTypeObject *type)
         {"select_charmap", (PyCFunction)PyFT2Font_select_charmap, METH_VARARGS, PyFT2Font_select_charmap__doc__},
         {"get_kerning", (PyCFunction)PyFT2Font_get_kerning, METH_VARARGS, PyFT2Font_get_kerning__doc__},
         {"set_text", (PyCFunction)PyFT2Font_set_text, METH_VARARGS|METH_KEYWORDS, PyFT2Font_set_text__doc__},
+        {"_get_fontmap", (PyCFunction)PyFT2Font_get_fontmap, METH_VARARGS|METH_KEYWORDS, PyFT2Font_get_fontmap__doc__},
         {"get_num_glyphs", (PyCFunction)PyFT2Font_get_num_glyphs, METH_NOARGS, PyFT2Font_get_num_glyphs__doc__},
         {"load_char", (PyCFunction)PyFT2Font_load_char, METH_VARARGS|METH_KEYWORDS, PyFT2Font_load_char__doc__},
         {"load_glyph", (PyCFunction)PyFT2Font_load_glyph, METH_VARARGS|METH_KEYWORDS, PyFT2Font_load_glyph__doc__},
@@ -1504,134 +1607,88 @@ static PyTypeObject *PyFT2Font_init_type(PyObject *m, PyTypeObject *type)
     };
 
     static PyBufferProcs buffer_procs;
-    memset(&buffer_procs, 0, sizeof(PyBufferProcs));
     buffer_procs.bf_getbuffer = (getbufferproc)PyFT2Font_get_buffer;
 
-    memset(type, 0, sizeof(PyTypeObject));
-    type->tp_name = "matplotlib.ft2font.FT2Font";
-    type->tp_doc = PyFT2Font_init__doc__;
-    type->tp_basicsize = sizeof(PyFT2Font);
-    type->tp_dealloc = (destructor)PyFT2Font_dealloc;
-    type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
-    type->tp_methods = methods;
-    type->tp_getset = getset;
-    type->tp_new = PyFT2Font_new;
-    type->tp_init = (initproc)PyFT2Font_init;
-    type->tp_as_buffer = &buffer_procs;
-
-    if (PyType_Ready(type) < 0) {
-        return NULL;
-    }
+    PyFT2FontType.tp_name = "matplotlib.ft2font.FT2Font";
+    PyFT2FontType.tp_doc = PyFT2Font_init__doc__;
+    PyFT2FontType.tp_basicsize = sizeof(PyFT2Font);
+    PyFT2FontType.tp_dealloc = (destructor)PyFT2Font_dealloc;
+    PyFT2FontType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
+    PyFT2FontType.tp_methods = methods;
+    PyFT2FontType.tp_getset = getset;
+    PyFT2FontType.tp_new = PyFT2Font_new;
+    PyFT2FontType.tp_init = (initproc)PyFT2Font_init;
+    PyFT2FontType.tp_as_buffer = &buffer_procs;
 
-    if (PyModule_AddObject(m, "FT2Font", (PyObject *)type)) {
-        return NULL;
-    }
-
-    return type;
+    return &PyFT2FontType;
 }
 
-static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT,
-    "ft2font",
-    NULL,
-    0,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL
-};
+static struct PyModuleDef moduledef = { PyModuleDef_HEAD_INIT, "ft2font" };
 
 #pragma GCC visibility push(default)
 
 PyMODINIT_FUNC PyInit_ft2font(void)
 {
-    PyObject *m;
-
-    m = PyModule_Create(&moduledef);
-
-    if (m == NULL) {
-        return NULL;
-    }
-
-    if (!PyFT2Image_init_type(m, &PyFT2ImageType)) {
-        return NULL;
-    }
-
-    if (!PyGlyph_init_type(m, &PyGlyphType)) {
-        return NULL;
-    }
-
-    if (!PyFT2Font_init_type(m, &PyFT2FontType)) {
-        return NULL;
-    }
-
-    PyObject *d = PyModule_GetDict(m);
-
-    if (add_dict_int(d, "SCALABLE", FT_FACE_FLAG_SCALABLE) ||
-        add_dict_int(d, "FIXED_SIZES", FT_FACE_FLAG_FIXED_SIZES) ||
-        add_dict_int(d, "FIXED_WIDTH", FT_FACE_FLAG_FIXED_WIDTH) ||
-        add_dict_int(d, "SFNT", FT_FACE_FLAG_SFNT) ||
-        add_dict_int(d, "HORIZONTAL", FT_FACE_FLAG_HORIZONTAL) ||
-        add_dict_int(d, "VERTICAL", FT_FACE_FLAG_VERTICAL) ||
-        add_dict_int(d, "KERNING", FT_FACE_FLAG_KERNING) ||
-        add_dict_int(d, "FAST_GLYPHS", FT_FACE_FLAG_FAST_GLYPHS) ||
-        add_dict_int(d, "MULTIPLE_MASTERS", FT_FACE_FLAG_MULTIPLE_MASTERS) ||
-        add_dict_int(d, "GLYPH_NAMES", FT_FACE_FLAG_GLYPH_NAMES) ||
-        add_dict_int(d, "EXTERNAL_STREAM", FT_FACE_FLAG_EXTERNAL_STREAM) ||
-        add_dict_int(d, "ITALIC", FT_STYLE_FLAG_ITALIC) ||
-        add_dict_int(d, "BOLD", FT_STYLE_FLAG_BOLD) ||
-        add_dict_int(d, "KERNING_DEFAULT", FT_KERNING_DEFAULT) ||
-        add_dict_int(d, "KERNING_UNFITTED", FT_KERNING_UNFITTED) ||
-        add_dict_int(d, "KERNING_UNSCALED", FT_KERNING_UNSCALED) ||
-        add_dict_int(d, "LOAD_DEFAULT", FT_LOAD_DEFAULT) ||
-        add_dict_int(d, "LOAD_NO_SCALE", FT_LOAD_NO_SCALE) ||
-        add_dict_int(d, "LOAD_NO_HINTING", FT_LOAD_NO_HINTING) ||
-        add_dict_int(d, "LOAD_RENDER", FT_LOAD_RENDER) ||
-        add_dict_int(d, "LOAD_NO_BITMAP", FT_LOAD_NO_BITMAP) ||
-        add_dict_int(d, "LOAD_VERTICAL_LAYOUT", FT_LOAD_VERTICAL_LAYOUT) ||
-        add_dict_int(d, "LOAD_FORCE_AUTOHINT", FT_LOAD_FORCE_AUTOHINT) ||
-        add_dict_int(d, "LOAD_CROP_BITMAP", FT_LOAD_CROP_BITMAP) ||
-        add_dict_int(d, "LOAD_PEDANTIC", FT_LOAD_PEDANTIC) ||
-        add_dict_int(d, "LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH", FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH) ||
-        add_dict_int(d, "LOAD_NO_RECURSE", FT_LOAD_NO_RECURSE) ||
-        add_dict_int(d, "LOAD_IGNORE_TRANSFORM", FT_LOAD_IGNORE_TRANSFORM) ||
-        add_dict_int(d, "LOAD_MONOCHROME", FT_LOAD_MONOCHROME) ||
-        add_dict_int(d, "LOAD_LINEAR_DESIGN", FT_LOAD_LINEAR_DESIGN) ||
-        add_dict_int(d, "LOAD_NO_AUTOHINT", (unsigned long)FT_LOAD_NO_AUTOHINT) ||
-        add_dict_int(d, "LOAD_TARGET_NORMAL", (unsigned long)FT_LOAD_TARGET_NORMAL) ||
-        add_dict_int(d, "LOAD_TARGET_LIGHT", (unsigned long)FT_LOAD_TARGET_LIGHT) ||
-        add_dict_int(d, "LOAD_TARGET_MONO", (unsigned long)FT_LOAD_TARGET_MONO) ||
-        add_dict_int(d, "LOAD_TARGET_LCD", (unsigned long)FT_LOAD_TARGET_LCD) ||
-        add_dict_int(d, "LOAD_TARGET_LCD_V", (unsigned long)FT_LOAD_TARGET_LCD_V)) {
-        return NULL;
-    }
-
-    // initialize library
-    int error = FT_Init_FreeType(&_ft2Library);
-
-    if (error) {
-        PyErr_SetString(PyExc_RuntimeError, "Could not initialize the freetype2 library");
-        return NULL;
-    }
-
-    {
-        FT_Int major, minor, patch;
-        char version_string[64];
+    import_array();
 
-        FT_Library_Version(_ft2Library, &major, &minor, &patch);
-        sprintf(version_string, "%d.%d.%d", major, minor, patch);
-        if (PyModule_AddStringConstant(m, "__freetype_version__", version_string)) {
-            return NULL;
-        }
+    if (FT_Init_FreeType(&_ft2Library)) {  // initialize library
+        return PyErr_Format(
+            PyExc_RuntimeError, "Could not initialize the freetype2 library");
     }
+    FT_Int major, minor, patch;
+    char version_string[64];
+    FT_Library_Version(_ft2Library, &major, &minor, &patch);
+    snprintf(version_string, sizeof(version_string), "%d.%d.%d", major, minor, patch);
 
-    if (PyModule_AddStringConstant(m, "__freetype_build_type__", STRINGIFY(FREETYPE_BUILD_TYPE))) {
+    PyObject *m;
+    if (!(m = PyModule_Create(&moduledef)) ||
+        prepare_and_add_type(PyFT2Image_init_type(), m) ||
+        prepare_and_add_type(PyFT2Font_init_type(), m) ||
+        // Glyph is not constructible from Python, thus not added to the module.
+        PyType_Ready(PyGlyph_init_type()) ||
+        PyModule_AddStringConstant(m, "__freetype_version__", version_string) ||
+        PyModule_AddStringConstant(m, "__freetype_build_type__", STRINGIFY(FREETYPE_BUILD_TYPE)) ||
+        PyModule_AddIntConstant(m, "SCALABLE", FT_FACE_FLAG_SCALABLE) ||
+        PyModule_AddIntConstant(m, "FIXED_SIZES", FT_FACE_FLAG_FIXED_SIZES) ||
+        PyModule_AddIntConstant(m, "FIXED_WIDTH", FT_FACE_FLAG_FIXED_WIDTH) ||
+        PyModule_AddIntConstant(m, "SFNT", FT_FACE_FLAG_SFNT) ||
+        PyModule_AddIntConstant(m, "HORIZONTAL", FT_FACE_FLAG_HORIZONTAL) ||
+        PyModule_AddIntConstant(m, "VERTICAL", FT_FACE_FLAG_VERTICAL) ||
+        PyModule_AddIntConstant(m, "KERNING", FT_FACE_FLAG_KERNING) ||
+        PyModule_AddIntConstant(m, "FAST_GLYPHS", FT_FACE_FLAG_FAST_GLYPHS) ||
+        PyModule_AddIntConstant(m, "MULTIPLE_MASTERS", FT_FACE_FLAG_MULTIPLE_MASTERS) ||
+        PyModule_AddIntConstant(m, "GLYPH_NAMES", FT_FACE_FLAG_GLYPH_NAMES) ||
+        PyModule_AddIntConstant(m, "EXTERNAL_STREAM", FT_FACE_FLAG_EXTERNAL_STREAM) ||
+        PyModule_AddIntConstant(m, "ITALIC", FT_STYLE_FLAG_ITALIC) ||
+        PyModule_AddIntConstant(m, "BOLD", FT_STYLE_FLAG_BOLD) ||
+        PyModule_AddIntConstant(m, "KERNING_DEFAULT", FT_KERNING_DEFAULT) ||
+        PyModule_AddIntConstant(m, "KERNING_UNFITTED", FT_KERNING_UNFITTED) ||
+        PyModule_AddIntConstant(m, "KERNING_UNSCALED", FT_KERNING_UNSCALED) ||
+        PyModule_AddIntConstant(m, "LOAD_DEFAULT", FT_LOAD_DEFAULT) ||
+        PyModule_AddIntConstant(m, "LOAD_NO_SCALE", FT_LOAD_NO_SCALE) ||
+        PyModule_AddIntConstant(m, "LOAD_NO_HINTING", FT_LOAD_NO_HINTING) ||
+        PyModule_AddIntConstant(m, "LOAD_RENDER", FT_LOAD_RENDER) ||
+        PyModule_AddIntConstant(m, "LOAD_NO_BITMAP", FT_LOAD_NO_BITMAP) ||
+        PyModule_AddIntConstant(m, "LOAD_VERTICAL_LAYOUT", FT_LOAD_VERTICAL_LAYOUT) ||
+        PyModule_AddIntConstant(m, "LOAD_FORCE_AUTOHINT", FT_LOAD_FORCE_AUTOHINT) ||
+        PyModule_AddIntConstant(m, "LOAD_CROP_BITMAP", FT_LOAD_CROP_BITMAP) ||
+        PyModule_AddIntConstant(m, "LOAD_PEDANTIC", FT_LOAD_PEDANTIC) ||
+        PyModule_AddIntConstant(m, "LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH", FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH) ||
+        PyModule_AddIntConstant(m, "LOAD_NO_RECURSE", FT_LOAD_NO_RECURSE) ||
+        PyModule_AddIntConstant(m, "LOAD_IGNORE_TRANSFORM", FT_LOAD_IGNORE_TRANSFORM) ||
+        PyModule_AddIntConstant(m, "LOAD_MONOCHROME", FT_LOAD_MONOCHROME) ||
+        PyModule_AddIntConstant(m, "LOAD_LINEAR_DESIGN", FT_LOAD_LINEAR_DESIGN) ||
+        PyModule_AddIntConstant(m, "LOAD_NO_AUTOHINT", (unsigned long)FT_LOAD_NO_AUTOHINT) ||
+        PyModule_AddIntConstant(m, "LOAD_TARGET_NORMAL", (unsigned long)FT_LOAD_TARGET_NORMAL) ||
+        PyModule_AddIntConstant(m, "LOAD_TARGET_LIGHT", (unsigned long)FT_LOAD_TARGET_LIGHT) ||
+        PyModule_AddIntConstant(m, "LOAD_TARGET_MONO", (unsigned long)FT_LOAD_TARGET_MONO) ||
+        PyModule_AddIntConstant(m, "LOAD_TARGET_LCD", (unsigned long)FT_LOAD_TARGET_LCD) ||
+        PyModule_AddIntConstant(m, "LOAD_TARGET_LCD_V", (unsigned long)FT_LOAD_TARGET_LCD_V)) {
+        FT_Done_FreeType(_ft2Library);
+        Py_XDECREF(m);
         return NULL;
     }
 
-    import_array();
-
     return m;
 }
 
diff --git a/src/mplutils.cpp b/src/mplutils.cpp
deleted file mode 100644
index 237def047d8c..000000000000
--- a/src/mplutils.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- mode: c++; c-basic-offset: 4 -*- */
-
-#include "mplutils.h"
-
-int add_dict_int(PyObject *dict, const char *key, long val)
-{
-    PyObject *valobj;
-    valobj = PyLong_FromLong(val);
-    if (valobj == NULL) {
-        return 1;
-    }
-
-    if (PyDict_SetItemString(dict, key, valobj)) {
-        Py_DECREF(valobj);
-        return 1;
-    }
-
-    Py_DECREF(valobj);
-
-    return 0;
-}
diff --git a/src/mplutils.h b/src/mplutils.h
index 925ec32c082f..39d98ed02e8f 100644
--- a/src/mplutils.h
+++ b/src/mplutils.h
@@ -29,28 +29,37 @@
 
 #include <Python.h>
 
-#undef CLAMP
-#define CLAMP(x, low, high) (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
-
-#undef MAX
-#define MAX(a, b) (((a) > (b)) ? (a) : (b))
-
 inline double mpl_round(double v)
 {
     return (double)(int)(v + ((v >= 0.0) ? 0.5 : -0.5));
 }
 
+// 'kind' codes for paths.
 enum {
     STOP = 0,
     MOVETO = 1,
     LINETO = 2,
     CURVE3 = 3,
     CURVE4 = 4,
-    ENDPOLY = 0x4f
+    CLOSEPOLY = 0x4f
 };
 
 const size_t NUM_VERTICES[] = { 1, 1, 1, 2, 3, 1 };
 
-extern "C" int add_dict_int(PyObject *dict, const char *key, long val);
+inline int prepare_and_add_type(PyTypeObject *type, PyObject *module)
+{
+    if (PyType_Ready(type)) {
+        return -1;
+    }
+    char const* ptr = strrchr(type->tp_name, '.');
+    if (!ptr) {
+        PyErr_SetString(PyExc_ValueError, "tp_name should be a qualified name");
+        return -1;
+    }
+    if (PyModule_AddObject(module, ptr + 1, (PyObject *)type)) {
+        return -1;
+    }
+    return 0;
+}
 
 #endif
diff --git a/src/path_converters.h b/src/path_converters.h
index 7c16ae42b9c5..6cbbf9c14115 100644
--- a/src/path_converters.h
+++ b/src/path_converters.h
@@ -162,16 +162,22 @@ class PathNanRemover : protected EmbeddedQueue<4>
 {
     VertexSource *m_source;
     bool m_remove_nans;
-    bool m_has_curves;
+    bool m_has_codes;
     bool valid_segment_exists;
+    bool m_last_segment_valid;
+    bool m_was_broken;
+    double m_initX;
+    double m_initY;
 
   public:
-    /* has_curves should be true if the path contains bezier curve
-       segments, as this requires a slower algorithm to remove the
-       NaNs.  When in doubt, set to true.
+    /* has_codes should be true if the path contains bezier curve segments, or
+     * closed loops, as this requires a slower algorithm to remove the NaNs.
+     * When in doubt, set to true.
      */
-    PathNanRemover(VertexSource &source, bool remove_nans, bool has_curves)
-        : m_source(&source), m_remove_nans(remove_nans), m_has_curves(has_curves)
+    PathNanRemover(VertexSource &source, bool remove_nans, bool has_codes)
+        : m_source(&source), m_remove_nans(remove_nans), m_has_codes(has_codes),
+          m_last_segment_valid(false), m_was_broken(false),
+          m_initX(nan("")), m_initY(nan(""))
     {
         // ignore all close/end_poly commands until after the first valid
         // (nan-free) command is encountered
@@ -192,8 +198,9 @@ class PathNanRemover : protected EmbeddedQueue<4>
             return m_source->vertex(x, y);
         }
 
-        if (m_has_curves) {
-            /* This is the slow method for when there might be curves. */
+        if (m_has_codes) {
+            /* This is the slow method for when there might be curves or closed
+             * loops. */
             if (queue_pop(&code, x, y)) {
                 return code;
             }
@@ -205,14 +212,41 @@ class PathNanRemover : protected EmbeddedQueue<4>
                    are found along the way, the queue is emptied, and
                    the next curve segment is handled. */
                 code = m_source->vertex(x, y);
-                /* The vertices attached to STOP and CLOSEPOLY left are never
-                   used, so we leave them as-is even if NaN. However, CLOSEPOLY
-                   only makes sense if a valid MOVETO command has already been
-                   emitted. */
-                if (code == agg::path_cmd_stop ||
-                    (code == (agg::path_cmd_end_poly | agg::path_flags_close) &&
-                     valid_segment_exists)) {
+                /* The vertices attached to STOP and CLOSEPOLY are never used,
+                 * so we leave them as-is even if NaN. */
+                if (code == agg::path_cmd_stop) {
                     return code;
+                } else if (code == (agg::path_cmd_end_poly |
+                                    agg::path_flags_close) &&
+                           valid_segment_exists) {
+                    /* However, CLOSEPOLY only makes sense if a valid MOVETO
+                     * command has already been emitted. But if a NaN was
+                     * removed in the path, then we cannot close it as it is no
+                     * longer a loop. We must emulate that by inserting a
+                     * LINETO instead. */
+                    if (m_was_broken) {
+                        if (m_last_segment_valid && (
+                                std::isfinite(m_initX) &&
+                                std::isfinite(m_initY))) {
+                            /* Join to start if both ends are valid. */
+                            queue_push(agg::path_cmd_line_to, m_initX, m_initY);
+                            break;
+                        } else {
+                            /* Skip the close, in case there are additional
+                             * subpaths. */
+                            continue;
+                        }
+                        m_was_broken = false;
+                        break;
+                    } else {
+                        return code;
+                    }
+                } else if (code == agg::path_cmd_move_to) {
+                    /* Save the initial point in order to produce the last
+                     * segment closing a loop, *if* we broke the loop. */
+                    m_initX = *x;
+                    m_initY = *y;
+                    m_was_broken = false;
                 }
 
                 if (needs_move_to) {
@@ -220,22 +254,24 @@ class PathNanRemover : protected EmbeddedQueue<4>
                 }
 
                 size_t num_extra_points = num_extra_points_map[code & 0xF];
-                bool has_nan = (!(std::isfinite(*x) && std::isfinite(*y)));
+                m_last_segment_valid = (std::isfinite(*x) && std::isfinite(*y));
                 queue_push(code, *x, *y);
 
                 /* Note: this test can not be short-circuited, since we need to
                    advance through the entire curve no matter what */
                 for (size_t i = 0; i < num_extra_points; ++i) {
                     m_source->vertex(x, y);
-                    has_nan = has_nan || !(std::isfinite(*x) && std::isfinite(*y));
+                    m_last_segment_valid = m_last_segment_valid &&
+                        (std::isfinite(*x) && std::isfinite(*y));
                     queue_push(code, *x, *y);
                 }
 
-                if (!has_nan) {
+                if (m_last_segment_valid) {
                     valid_segment_exists = true;
                     break;
                 }
 
+                m_was_broken = true;
                 queue_clear();
 
                 /* If the last point is finite, we use that for the
@@ -254,9 +290,9 @@ class PathNanRemover : protected EmbeddedQueue<4>
             } else {
                 return agg::path_cmd_stop;
             }
-        } else // !m_has_curves
+        } else // !m_has_codes
         {
-            /* This is the fast path for when we know we have no curves */
+            /* This is the fast path for when we know we have no codes. */
             code = m_source->vertex(x, y);
 
             if (code == agg::path_cmd_stop ||
@@ -300,14 +336,20 @@ class PathClipper : public EmbeddedQueue<3>
     double m_initX;
     double m_initY;
     bool m_has_init;
+    bool m_was_clipped;
 
   public:
     PathClipper(VertexSource &source, bool do_clipping, double width, double height)
         : m_source(&source),
           m_do_clipping(do_clipping),
           m_cliprect(-1.0, -1.0, width + 1.0, height + 1.0),
+          m_lastX(nan("")),
+          m_lastY(nan("")),
           m_moveto(true),
-          m_has_init(false)
+          m_initX(nan("")),
+          m_initY(nan("")),
+          m_has_init(false),
+          m_was_clipped(false)
     {
         // empty
     }
@@ -316,8 +358,13 @@ class PathClipper : public EmbeddedQueue<3>
         : m_source(&source),
           m_do_clipping(do_clipping),
           m_cliprect(rect),
+          m_lastX(nan("")),
+          m_lastY(nan("")),
           m_moveto(true),
-          m_has_init(false)
+          m_initX(nan("")),
+          m_initY(nan("")),
+          m_has_init(false),
+          m_was_clipped(false)
     {
         m_cliprect.x1 -= 1.0;
         m_cliprect.y1 -= 1.0;
@@ -328,21 +375,29 @@ class PathClipper : public EmbeddedQueue<3>
     inline void rewind(unsigned path_id)
     {
         m_has_init = false;
+        m_was_clipped = false;
         m_moveto = true;
         m_source->rewind(path_id);
     }
 
-    int draw_clipped_line(double x0, double y0, double x1, double y1)
+    int draw_clipped_line(double x0, double y0, double x1, double y1,
+                          bool closed=false)
     {
         unsigned moved = agg::clip_line_segment(&x0, &y0, &x1, &y1, m_cliprect);
         // moved >= 4 - Fully clipped
         // moved & 1 != 0 - First point has been moved
         // moved & 2 != 0 - Second point has been moved
+        m_was_clipped = m_was_clipped || (moved != 0);
         if (moved < 4) {
             if (moved & 1 || m_moveto) {
                 queue_push(agg::path_cmd_move_to, x0, y0);
             }
             queue_push(agg::path_cmd_line_to, x1, y1);
+            if (closed && !m_was_clipped) {
+                // Close the path only if the end point hasn't moved.
+                queue_push(agg::path_cmd_end_poly | agg::path_flags_close,
+                           x1, y1);
+            }
 
             m_moveto = false;
             return 1;
@@ -356,75 +411,91 @@ class PathClipper : public EmbeddedQueue<3>
         unsigned code;
         bool emit_moveto = false;
 
-        if (m_do_clipping) {
-            /* This is the slow path where we actually do clipping */
+        if (!m_do_clipping) {
+            // If not doing any clipping, just pass along the vertices verbatim
+            return m_source->vertex(x, y);
+        }
 
-            if (queue_pop(&code, x, y)) {
-                return code;
-            }
+        /* This is the slow path where we actually do clipping */
 
-            while ((code = m_source->vertex(x, y)) != agg::path_cmd_stop) {
-                emit_moveto = false;
+        if (queue_pop(&code, x, y)) {
+            return code;
+        }
 
-                switch (code) {
-                case (agg::path_cmd_end_poly | agg::path_flags_close):
-                    if (m_has_init) {
-                        draw_clipped_line(m_lastX, m_lastY, m_initX, m_initY);
-                    }
+        while ((code = m_source->vertex(x, y)) != agg::path_cmd_stop) {
+            emit_moveto = false;
+
+            switch (code) {
+            case (agg::path_cmd_end_poly | agg::path_flags_close):
+                if (m_has_init) {
+                    // Queue the line from last point to the initial point, and
+                    // if never clipped, add a close code.
+                    draw_clipped_line(m_lastX, m_lastY, m_initX, m_initY,
+                                      true);
+                } else {
+                    // An empty path that is immediately closed.
                     queue_push(
                         agg::path_cmd_end_poly | agg::path_flags_close,
                         m_lastX, m_lastY);
+                }
+                // If paths were not clipped, then the above code queued
+                // something, and we should exit the loop. Otherwise, continue
+                // to the next point, as there may be a new subpath.
+                if (queue_nonempty()) {
                     goto exit_loop;
+                }
+                break;
+
+            case agg::path_cmd_move_to:
+
+                // was the last command a moveto (and we have
+                // seen at least one command ?
+                // if so, shove it in the queue if in clip box
+                if (m_moveto && m_has_init &&
+                    m_lastX >= m_cliprect.x1 &&
+                    m_lastX <= m_cliprect.x2 &&
+                    m_lastY >= m_cliprect.y1 &&
+                    m_lastY <= m_cliprect.y2) {
+                    // push the last moveto onto the queue
+                    queue_push(agg::path_cmd_move_to, m_lastX, m_lastY);
+                    // flag that we need to emit it
+                    emit_moveto = true;
+                }
+                // update the internal state for this moveto
+                m_initX = m_lastX = *x;
+                m_initY = m_lastY = *y;
+                m_has_init = true;
+                m_moveto = true;
+                m_was_clipped = false;
+                // if the last command was moveto exit the loop to emit the code
+                if (emit_moveto) {
+                    goto exit_loop;
+                }
+                // else, break and get the next point
+                break;
 
-                case agg::path_cmd_move_to:
-
-                    // was the last command a moveto (and we have
-                    // seen at least one command ?
-                    // if so, shove it in the queue if in clip box
-                    if (m_moveto && m_has_init &&
-                        m_lastX >= m_cliprect.x1 &&
-                        m_lastX <= m_cliprect.x2 &&
-                        m_lastY >= m_cliprect.y1 &&
-                        m_lastY <= m_cliprect.y2) {
-                        // push the last moveto onto the queue
-                        queue_push(agg::path_cmd_move_to, m_lastX, m_lastY);
-                        // flag that we need to emit it
-                        emit_moveto = true;
-                    }
-                    // update the internal state for this moveto
-                    m_initX = m_lastX = *x;
-                    m_initY = m_lastY = *y;
-                    m_has_init = true;
-                    m_moveto = true;
-                    // if the last command was moveto exit the loop to emit the code
-                    if (emit_moveto) {
-                        goto exit_loop;
-                    }
-                    // else, break and get the next point
-                    break;
-
-                case agg::path_cmd_line_to:
-                    if (draw_clipped_line(m_lastX, m_lastY, *x, *y)) {
-                        m_lastX = *x;
-                        m_lastY = *y;
-                        goto exit_loop;
-                    }
-                    m_lastX = *x;
-                    m_lastY = *y;
-                    break;
-
-                default:
-                    if (m_moveto) {
-                        queue_push(agg::path_cmd_move_to, m_lastX, m_lastY);
-                        m_moveto = false;
-                    }
-
-                    queue_push(code, *x, *y);
+            case agg::path_cmd_line_to:
+                if (draw_clipped_line(m_lastX, m_lastY, *x, *y)) {
                     m_lastX = *x;
                     m_lastY = *y;
                     goto exit_loop;
                 }
+                m_lastX = *x;
+                m_lastY = *y;
+                break;
+
+            default:
+                if (m_moveto) {
+                    queue_push(agg::path_cmd_move_to, m_lastX, m_lastY);
+                    m_moveto = false;
+                }
+
+                queue_push(code, *x, *y);
+                m_lastX = *x;
+                m_lastY = *y;
+                goto exit_loop;
             }
+        }
 
         exit_loop:
 
@@ -432,7 +503,7 @@ class PathClipper : public EmbeddedQueue<3>
                 return code;
             }
 
-            if (m_moveto &&
+            if (m_moveto && m_has_init &&
                 m_lastX >= m_cliprect.x1 &&
                 m_lastX <= m_cliprect.x2 &&
                 m_lastY >= m_cliprect.y1 &&
@@ -444,11 +515,6 @@ class PathClipper : public EmbeddedQueue<3>
             }
 
             return agg::path_cmd_stop;
-        } else {
-            // If not doing any clipping, just pass along the vertices
-            // verbatim
-            return m_source->vertex(x, y);
-        }
     }
 };
 
diff --git a/src/py_adaptors.h b/src/py_adaptors.h
index 912c93c8bf12..7722137dc6e1 100644
--- a/src/py_adaptors.h
+++ b/src/py_adaptors.h
@@ -175,7 +175,7 @@ class PathIterator
         return m_simplify_threshold;
     }
 
-    inline bool has_curves() const
+    inline bool has_codes() const
     {
         return m_codes != NULL;
     }
@@ -194,12 +194,7 @@ class PathGenerator
   public:
     typedef PathIterator path_iterator;
 
-    PathGenerator(PyObject *obj) : m_paths(NULL), m_npaths(0)
-    {
-        if (!set(obj)) {
-            throw py::exception();
-        }
-    }
+    PathGenerator() : m_paths(NULL), m_npaths(0) {}
 
     ~PathGenerator()
     {
@@ -212,6 +207,7 @@ class PathGenerator
             return 0;
         }
 
+        Py_XDECREF(m_paths);
         m_paths = obj;
         Py_INCREF(m_paths);
 
diff --git a/src/py_converters.cpp b/src/py_converters.cpp
index a4c0b1909940..515291aa302d 100644
--- a/src/py_converters.cpp
+++ b/src/py_converters.cpp
@@ -191,54 +191,41 @@ int convert_rect(PyObject *rectobj, void *rectp)
 int convert_rgba(PyObject *rgbaobj, void *rgbap)
 {
     agg::rgba *rgba = (agg::rgba *)rgbap;
-
+    PyObject *rgbatuple = NULL;
+    int success = 1;
     if (rgbaobj == NULL || rgbaobj == Py_None) {
         rgba->r = 0.0;
         rgba->g = 0.0;
         rgba->b = 0.0;
         rgba->a = 0.0;
     } else {
+        if (!(rgbatuple = PySequence_Tuple(rgbaobj))) {
+            success = 0;
+            goto exit;
+        }
         rgba->a = 1.0;
         if (!PyArg_ParseTuple(
-                 rgbaobj, "ddd|d:rgba", &(rgba->r), &(rgba->g), &(rgba->b), &(rgba->a))) {
-            return 0;
+                 rgbatuple, "ddd|d:rgba", &(rgba->r), &(rgba->g), &(rgba->b), &(rgba->a))) {
+            success = 0;
+            goto exit;
         }
     }
-
-    return 1;
+exit:
+    Py_XDECREF(rgbatuple);
+    return success;
 }
 
 int convert_dashes(PyObject *dashobj, void *dashesp)
 {
     Dashes *dashes = (Dashes *)dashesp;
 
-    if (dashobj == NULL && dashobj == Py_None) {
-        return 1;
-    }
-
-    PyObject *dash_offset_obj = NULL;
     double dash_offset = 0.0;
     PyObject *dashes_seq = NULL;
 
-    if (!PyArg_ParseTuple(dashobj, "OO:dashes", &dash_offset_obj, &dashes_seq)) {
+    if (!PyArg_ParseTuple(dashobj, "dO:dashes", &dash_offset, &dashes_seq)) {
         return 0;
     }
 
-    if (dash_offset_obj != Py_None) {
-        dash_offset = PyFloat_AsDouble(dash_offset_obj);
-        if (PyErr_Occurred()) {
-            return 0;
-        }
-    } else {
-        if (PyErr_WarnEx(PyExc_FutureWarning,
-                         "Passing the dash offset as None is deprecated since "
-                         "Matplotlib 3.3 and will be removed in Matplotlib 3.5; "
-                         "pass it as zero instead.",
-                         1)) {
-            return 0;
-        }
-    }
-
     if (dashes_seq == Py_None) {
         return 1;
     }
@@ -415,6 +402,16 @@ int convert_path(PyObject *obj, void *pathp)
     return status;
 }
 
+int convert_pathgen(PyObject *obj, void *pathgenp)
+{
+    py::PathGenerator *paths = (py::PathGenerator *)pathgenp;
+    if (!paths->set(obj)) {
+        PyErr_SetString(PyExc_TypeError, "Not an iterable of paths");
+        return 0;
+    }
+    return 1;
+}
+
 int convert_clippath(PyObject *clippath_tuple, void *clippathp)
 {
     ClipPath *clippath = (ClipPath *)clippathp;
@@ -492,22 +489,6 @@ int convert_gcagg(PyObject *pygc, void *gcp)
     return 1;
 }
 
-int convert_offset_position(PyObject *obj, void *offsetp)
-{
-    e_offset_position *offset = (e_offset_position *)offsetp;
-    const char *names[] = {"data", NULL};
-    int values[] = {OFFSET_POSITION_DATA};
-    int result = (int)OFFSET_POSITION_FIGURE;
-
-    if (!convert_string_enum(obj, "offset_position", names, values, &result)) {
-        PyErr_Clear();
-    }
-
-    *offset = (e_offset_position)result;
-
-    return 1;
-}
-
 int convert_face(PyObject *color, GCAgg &gc, agg::rgba *rgba)
 {
     if (!convert_rgba(color, rgba)) {
diff --git a/src/py_converters.h b/src/py_converters.h
index 2c19acdaaf80..2c9dc6d1b860 100644
--- a/src/py_converters.h
+++ b/src/py_converters.h
@@ -32,9 +32,9 @@ int convert_dashes(PyObject *dashobj, void *gcp);
 int convert_dashes_vector(PyObject *obj, void *dashesp);
 int convert_trans_affine(PyObject *obj, void *transp);
 int convert_path(PyObject *obj, void *pathp);
+int convert_pathgen(PyObject *obj, void *pathgenp);
 int convert_clippath(PyObject *clippath_tuple, void *clippathp);
 int convert_snap(PyObject *obj, void *snapp);
-int convert_offset_position(PyObject *obj, void *offsetp);
 int convert_sketch_params(PyObject *obj, void *sketchp);
 int convert_gcagg(PyObject *pygc, void *gcp);
 int convert_points(PyObject *pygc, void *pointsp);
diff --git a/src/tri/_tri.cpp b/src/tri/_tri.cpp
index 075ab7658327..b7a87783de29 100644
--- a/src/tri/_tri.cpp
+++ b/src/tri/_tri.cpp
@@ -7,15 +7,12 @@
  */
 #define NO_IMPORT_ARRAY
 
+#include "../mplutils.h"
 #include "_tri.h"
 
 #include <algorithm>
 #include <set>
 
-#define MOVETO 1
-#define LINETO 2
-
-
 
 TriEdge::TriEdge()
     : tri(-1), edge(-1)
@@ -600,31 +597,88 @@ void TriContourGenerator::clear_visited_flags(bool include_boundaries)
     }
 }
 
-PyObject* TriContourGenerator::contour_to_segs(const Contour& contour)
-{
-    PyObject* segs = PyList_New(contour.size());
+PyObject* TriContourGenerator::contour_line_to_segs_and_kinds(const Contour& contour)
+{
+    // Convert all of the lines generated by a call to create_contour() into
+    // their Python equivalents for return to the calling function.
+    // A line is either a closed line loop (in which case the last point is
+    // identical to the first) or an open line strip.  Two NumPy arrays are
+    // created for each line:
+    //   vertices is a double array of shape (npoints, 2) containing the (x, y)
+    //     coordinates of the points in the line
+    //   codes is a uint8 array of shape (npoints,) containing the 'kind codes'
+    //     which are defined in the Path class
+    // and they are appended to the Python lists vertices_list and codes_list
+    // respectively for return to the Python calling function.
+
+    PyObject* vertices_list = PyList_New(contour.size());
+    if (vertices_list == 0)
+        throw std::runtime_error("Failed to create Python list");
+
+    PyObject* codes_list = PyList_New(contour.size());
+    if (codes_list == 0) {
+        Py_XDECREF(vertices_list);
+        throw std::runtime_error("Failed to create Python list");
+    }
+
     for (Contour::size_type i = 0; i < contour.size(); ++i) {
-        const ContourLine& line = contour[i];
-        npy_intp dims[2] = {static_cast<npy_intp>(line.size()),2};
-        PyArrayObject* py_line = (PyArrayObject*)PyArray_SimpleNew(
-                                                     2, dims, NPY_DOUBLE);
-        double* p = (double*)PyArray_DATA(py_line);
-        for (ContourLine::const_iterator it = line.begin(); it != line.end(); ++it) {
-            *p++ = it->x;
-            *p++ = it->y;
-        }
-        if (PyList_SetItem(segs, i, (PyObject*)py_line)) {
-            Py_XDECREF(segs);
-            PyErr_SetString(PyExc_RuntimeError,
-                            "Unable to set contour segments");
-            return NULL;
+        const ContourLine& contour_line = contour[i];
+        npy_intp npoints = static_cast<npy_intp>(contour_line.size());
+
+        npy_intp segs_dims[2] = {npoints, 2};
+        numpy::array_view<double, 2> segs(segs_dims);
+        double* segs_ptr = segs.data();
+
+        npy_intp codes_dims[1] = {npoints};
+        numpy::array_view<unsigned char, 1> codes(codes_dims);
+        unsigned char* codes_ptr = codes.data();
+
+        for (ContourLine::const_iterator it = contour_line.begin();
+             it != contour_line.end(); ++it) {
+            *segs_ptr++ = it->x;
+            *segs_ptr++ = it->y;
+            *codes_ptr++ = (it == contour_line.begin() ? MOVETO : LINETO);
         }
+
+        // Closed line loop has identical first and last (x, y) points.
+        if (contour_line.size() > 1 &&
+            contour_line.front() == contour_line.back())
+            *(codes_ptr-1) = CLOSEPOLY;
+
+        PyList_SET_ITEM(vertices_list, i, segs.pyobj());
+        PyList_SET_ITEM(codes_list, i, codes.pyobj());
+    }
+
+    PyObject* result = PyTuple_New(2);
+    if (result == 0) {
+        Py_XDECREF(vertices_list);
+        Py_XDECREF(codes_list);
+        throw std::runtime_error("Failed to create Python tuple");
     }
-    return segs;
+
+    // No error checking here as filling in a brand new pre-allocated result.
+    PyTuple_SET_ITEM(result, 0, vertices_list);
+    PyTuple_SET_ITEM(result, 1, codes_list);
+
+    return result;
 }
 
 PyObject* TriContourGenerator::contour_to_segs_and_kinds(const Contour& contour)
 {
+    // Convert all of the polygons generated by a call to
+    // create_filled_contour() into their Python equivalents for return to the
+    // calling function.  All of the polygons' points and kinds codes are
+    // combined into single NumPy arrays for each; this avoids having
+    // to determine which polygons are holes as this will be determined by the
+    // renderer.  If there are ntotal points in all of the polygons, the two
+    // NumPy arrays created are:
+    //   vertices is a double array of shape (ntotal, 2) containing the (x, y)
+    //     coordinates of the points in the polygons
+    //   codes is a uint8 array of shape (ntotal,) containing the 'kind codes'
+    //     which are defined in the Path class
+    // and they are returned in the Python lists vertices_list and codes_list
+    // respectively.
+
     Contour::const_iterator line;
     ContourLine::const_iterator point;
 
@@ -635,32 +689,50 @@ PyObject* TriContourGenerator::contour_to_segs_and_kinds(const Contour& contour)
 
     // Create segs array for point coordinates.
     npy_intp segs_dims[2] = {n_points, 2};
-    PyArrayObject* segs = (PyArrayObject*)PyArray_SimpleNew(
-                                                2, segs_dims, NPY_DOUBLE);
-    double* segs_ptr = (double*)PyArray_DATA(segs);
+    numpy::array_view<double, 2> segs(segs_dims);
+    double* segs_ptr = segs.data();
 
     // Create kinds array for code types.
-    npy_intp kinds_dims[1] = {n_points};
-    PyArrayObject* kinds = (PyArrayObject*)PyArray_SimpleNew(
-                                                1, kinds_dims, NPY_UBYTE);
-    unsigned char* kinds_ptr = (unsigned char*)PyArray_DATA(kinds);
+    npy_intp codes_dims[1] = {n_points};
+    numpy::array_view<unsigned char, 1> codes(codes_dims);
+    unsigned char* codes_ptr = codes.data();
 
     for (line = contour.begin(); line != contour.end(); ++line) {
         for (point = line->begin(); point != line->end(); point++) {
             *segs_ptr++ = point->x;
             *segs_ptr++ = point->y;
-            *kinds_ptr++ = (point == line->begin() ? MOVETO : LINETO);
+            *codes_ptr++ = (point == line->begin() ? MOVETO : LINETO);
         }
     }
 
+    PyObject* vertices_list = PyList_New(0);
+    if (vertices_list == 0)
+        throw std::runtime_error("Failed to create Python list");
+
+    PyObject* codes_list = PyList_New(0);
+    if (codes_list == 0) {
+        Py_XDECREF(vertices_list);
+        throw std::runtime_error("Failed to create Python list");
+    }
+
+    if (PyList_Append(vertices_list, segs.pyobj_steal()) ||
+        PyList_Append(codes_list, codes.pyobj_steal())) {
+        Py_XDECREF(vertices_list);
+        Py_XDECREF(codes_list);
+        throw std::runtime_error("Unable to add contour to vertices and codes lists");
+    }
+
     PyObject* result = PyTuple_New(2);
-    if (PyTuple_SetItem(result, 0, (PyObject*)segs) ||
-        PyTuple_SetItem(result, 1, (PyObject*)kinds)) {
-        Py_XDECREF(result);
-        PyErr_SetString(PyExc_RuntimeError,
-                        "Unable to set contour segments and kinds");
-        return NULL;
+    if (result == 0) {
+        Py_XDECREF(vertices_list);
+        Py_XDECREF(codes_list);
+        throw std::runtime_error("Failed to create Python tuple");
     }
+
+    // No error checking here as filling in a brand new pre-allocated tuple.
+    PyTuple_SET_ITEM(result, 0, vertices_list);
+    PyTuple_SET_ITEM(result, 1, codes_list);
+
     return result;
 }
 
@@ -672,7 +744,7 @@ PyObject* TriContourGenerator::create_contour(const double& level)
     find_boundary_lines(contour, level);
     find_interior_lines(contour, level, false, false);
 
-    return contour_to_segs(contour);
+    return contour_line_to_segs_and_kinds(contour);
 }
 
 PyObject* TriContourGenerator::create_filled_contour(const double& lower_level,
diff --git a/src/tri/_tri.h b/src/tri/_tri.h
index 13aad01fb668..28c8e07933cc 100644
--- a/src/tri/_tri.h
+++ b/src/tri/_tri.h
@@ -363,13 +363,16 @@ class TriContourGenerator
     void clear_visited_flags(bool include_boundaries);
 
     /* Convert a non-filled Contour from C++ to Python.
-     * Returns new python list [segs0, segs1, ...] where
-     *   segs0: double array of shape (?,2) of point coordinates of first
-     *   contour line, etc. */
-    PyObject* contour_to_segs(const Contour& contour);
+     * Returns new python tuple ([segs0, segs1, ...], [kinds0, kinds1...])
+     * where
+     *   segs0: double array of shape (n_points,2) of point coordinates of first
+     *   contour line, etc.
+     *   kinds0: ubyte array of shape (n_points) of kinds codes of first contour
+     *   line, etc. */
+    PyObject* contour_line_to_segs_and_kinds(const Contour& contour);
 
     /* Convert a filled Contour from C++ to Python.
-     * Returns new python tuple (segs, kinds) where
+     * Returns new python tuple ([segs], [kinds]) where
      *   segs: double array of shape (n_points,2) of all point coordinates,
      *   kinds: ubyte array of shape (n_points) of all point code types. */
     PyObject* contour_to_segs_and_kinds(const Contour& contour);
diff --git a/src/tri/_tri_wrapper.cpp b/src/tri/_tri_wrapper.cpp
index fcf155721ecc..bf58ca02879f 100644
--- a/src/tri/_tri_wrapper.cpp
+++ b/src/tri/_tri_wrapper.cpp
@@ -24,7 +24,7 @@ static PyObject* PyTriangulation_new(PyTypeObject* type, PyObject* args, PyObjec
 const char* PyTriangulation_init__doc__ =
     "Triangulation(x, y, triangles, mask, edges, neighbors)\n"
     "--\n\n"
-    "Create a new C++ Triangulation object\n"
+    "Create a new C++ Triangulation object.\n"
     "This should not be called directly, instead use the python class\n"
     "matplotlib.tri.Triangulation instead.\n";
 
@@ -99,11 +99,11 @@ static void PyTriangulation_dealloc(PyTriangulation* self)
 }
 
 const char* PyTriangulation_calculate_plane_coefficients__doc__ =
-    "calculate_plane_coefficients(z, plane_coefficients)\n"
+    "calculate_plane_coefficients(self, z, plane_coefficients)\n"
     "--\n\n"
-    "Calculate plane equation coefficients for all unmasked triangles";
+    "Calculate plane equation coefficients for all unmasked triangles.";
 
-static PyObject* PyTriangulation_calculate_plane_coefficients(PyTriangulation* self, PyObject* args, PyObject* kwds)
+static PyObject* PyTriangulation_calculate_plane_coefficients(PyTriangulation* self, PyObject* args)
 {
     Triangulation::CoordinateArray z;
     if (!PyArg_ParseTuple(args, "O&:calculate_plane_coefficients",
@@ -124,11 +124,11 @@ static PyObject* PyTriangulation_calculate_plane_coefficients(PyTriangulation* s
 }
 
 const char* PyTriangulation_get_edges__doc__ =
-    "get_edges()\n"
+    "get_edges(self)\n"
     "--\n\n"
-    "Return edges array";
+    "Return edges array.";
 
-static PyObject* PyTriangulation_get_edges(PyTriangulation* self, PyObject* args, PyObject* kwds)
+static PyObject* PyTriangulation_get_edges(PyTriangulation* self, PyObject* args)
 {
     Triangulation::EdgeArray* result;
     CALL_CPP("get_edges", (result = &self->ptr->get_edges()));
@@ -141,11 +141,11 @@ static PyObject* PyTriangulation_get_edges(PyTriangulation* self, PyObject* args
 }
 
 const char* PyTriangulation_get_neighbors__doc__ =
-    "get_neighbors()\n"
+    "get_neighbors(self)\n"
     "--\n\n"
-    "Return neighbors array";
+    "Return neighbors array.";
 
-static PyObject* PyTriangulation_get_neighbors(PyTriangulation* self, PyObject* args, PyObject* kwds)
+static PyObject* PyTriangulation_get_neighbors(PyTriangulation* self, PyObject* args)
 {
     Triangulation::NeighborArray* result;
     CALL_CPP("get_neighbors", (result = &self->ptr->get_neighbors()));
@@ -158,11 +158,11 @@ static PyObject* PyTriangulation_get_neighbors(PyTriangulation* self, PyObject*
 }
 
 const char* PyTriangulation_set_mask__doc__ =
-    "set_mask(mask)\n"
+    "set_mask(self, mask)\n"
     "--\n\n"
     "Set or clear the mask array.";
 
-static PyObject* PyTriangulation_set_mask(PyTriangulation* self, PyObject* args, PyObject* kwds)
+static PyObject* PyTriangulation_set_mask(PyTriangulation* self, PyObject* args)
 {
     Triangulation::MaskArray mask;
 
@@ -180,35 +180,37 @@ static PyObject* PyTriangulation_set_mask(PyTriangulation* self, PyObject* args,
     Py_RETURN_NONE;
 }
 
-static PyTypeObject* PyTriangulation_init_type(PyObject* m, PyTypeObject* type)
+static PyTypeObject *PyTriangulation_init_type()
 {
     static PyMethodDef methods[] = {
-        {"calculate_plane_coefficients", (PyCFunction)PyTriangulation_calculate_plane_coefficients, METH_VARARGS, PyTriangulation_calculate_plane_coefficients__doc__},
-        {"get_edges", (PyCFunction)PyTriangulation_get_edges, METH_NOARGS, PyTriangulation_get_edges__doc__},
-        {"get_neighbors", (PyCFunction)PyTriangulation_get_neighbors, METH_NOARGS, PyTriangulation_get_neighbors__doc__},
-        {"set_mask", (PyCFunction)PyTriangulation_set_mask, METH_VARARGS, PyTriangulation_set_mask__doc__},
+        {"calculate_plane_coefficients",
+         (PyCFunction)PyTriangulation_calculate_plane_coefficients,
+         METH_VARARGS,
+         PyTriangulation_calculate_plane_coefficients__doc__},
+        {"get_edges",
+         (PyCFunction)PyTriangulation_get_edges,
+         METH_NOARGS,
+         PyTriangulation_get_edges__doc__},
+        {"get_neighbors",
+         (PyCFunction)PyTriangulation_get_neighbors,
+         METH_NOARGS,
+         PyTriangulation_get_neighbors__doc__},
+        {"set_mask",
+         (PyCFunction)PyTriangulation_set_mask,
+         METH_VARARGS,
+         PyTriangulation_set_mask__doc__},
         {NULL}
     };
-
-    memset(type, 0, sizeof(PyTypeObject));
-    type->tp_name = "matplotlib._tri.Triangulation";
-    type->tp_doc = PyTriangulation_init__doc__;
-    type->tp_basicsize = sizeof(PyTriangulation);
-    type->tp_dealloc = (destructor)PyTriangulation_dealloc;
-    type->tp_flags = Py_TPFLAGS_DEFAULT;
-    type->tp_methods = methods;
-    type->tp_new = PyTriangulation_new;
-    type->tp_init = (initproc)PyTriangulation_init;
-
-    if (PyType_Ready(type) < 0) {
-        return NULL;
-    }
-
-    if (PyModule_AddObject(m, "Triangulation", (PyObject*)type)) {
-        return NULL;
-    }
-
-    return type;
+    PyTriangulationType.tp_name = "matplotlib._tri.Triangulation";
+    PyTriangulationType.tp_doc = PyTriangulation_init__doc__;
+    PyTriangulationType.tp_basicsize = sizeof(PyTriangulation);
+    PyTriangulationType.tp_dealloc = (destructor)PyTriangulation_dealloc;
+    PyTriangulationType.tp_flags = Py_TPFLAGS_DEFAULT;
+    PyTriangulationType.tp_methods = methods;
+    PyTriangulationType.tp_new = PyTriangulation_new;
+    PyTriangulationType.tp_init = (initproc)PyTriangulation_init;
+
+    return &PyTriangulationType;
 }
 
 
@@ -235,7 +237,7 @@ static PyObject* PyTriContourGenerator_new(PyTypeObject* type, PyObject* args, P
 const char* PyTriContourGenerator_init__doc__ =
     "TriContourGenerator(triangulation, z)\n"
     "--\n\n"
-    "Create a new C++ TriContourGenerator object\n"
+    "Create a new C++ TriContourGenerator object.\n"
     "This should not be called directly, instead use the functions\n"
     "matplotlib.axes.tricontour and tricontourf instead.\n";
 
@@ -274,11 +276,11 @@ static void PyTriContourGenerator_dealloc(PyTriContourGenerator* self)
 }
 
 const char* PyTriContourGenerator_create_contour__doc__ =
-    "create_contour(level)\n"
-    "\n"
+    "create_contour(self, level)\n"
+    "--\n\n"
     "Create and return a non-filled contour.";
 
-static PyObject* PyTriContourGenerator_create_contour(PyTriContourGenerator* self, PyObject* args, PyObject* kwds)
+static PyObject* PyTriContourGenerator_create_contour(PyTriContourGenerator* self, PyObject* args)
 {
     double level;
     if (!PyArg_ParseTuple(args, "d:create_contour", &level)) {
@@ -291,11 +293,11 @@ static PyObject* PyTriContourGenerator_create_contour(PyTriContourGenerator* sel
 }
 
 const char* PyTriContourGenerator_create_filled_contour__doc__ =
-    "create_filled_contour(lower_level, upper_level)\n"
-    "\n"
-    "Create and return a filled contour";
+    "create_filled_contour(self, lower_level, upper_level)\n"
+    "--\n\n"
+    "Create and return a filled contour.";
 
-static PyObject* PyTriContourGenerator_create_filled_contour(PyTriContourGenerator* self, PyObject* args, PyObject* kwds)
+static PyObject* PyTriContourGenerator_create_filled_contour(PyTriContourGenerator* self, PyObject* args)
 {
     double lower_level, upper_level;
     if (!PyArg_ParseTuple(args, "dd:create_filled_contour",
@@ -317,33 +319,29 @@ static PyObject* PyTriContourGenerator_create_filled_contour(PyTriContourGenerat
     return result;
 }
 
-static PyTypeObject* PyTriContourGenerator_init_type(PyObject* m, PyTypeObject* type)
+static PyTypeObject *PyTriContourGenerator_init_type()
 {
     static PyMethodDef methods[] = {
-        {"create_contour", (PyCFunction)PyTriContourGenerator_create_contour, METH_VARARGS, PyTriContourGenerator_create_contour__doc__},
-        {"create_filled_contour", (PyCFunction)PyTriContourGenerator_create_filled_contour, METH_VARARGS, PyTriContourGenerator_create_filled_contour__doc__},
+        {"create_contour",
+         (PyCFunction)PyTriContourGenerator_create_contour,
+         METH_VARARGS,
+         PyTriContourGenerator_create_contour__doc__},
+        {"create_filled_contour",
+         (PyCFunction)PyTriContourGenerator_create_filled_contour,
+         METH_VARARGS,
+         PyTriContourGenerator_create_filled_contour__doc__},
         {NULL}
     };
-
-    memset(type, 0, sizeof(PyTypeObject));
-    type->tp_name = "matplotlib._tri.TriContourGenerator";
-    type->tp_doc = PyTriContourGenerator_init__doc__;
-    type->tp_basicsize = sizeof(PyTriContourGenerator);
-    type->tp_dealloc = (destructor)PyTriContourGenerator_dealloc;
-    type->tp_flags = Py_TPFLAGS_DEFAULT;
-    type->tp_methods = methods;
-    type->tp_new = PyTriContourGenerator_new;
-    type->tp_init = (initproc)PyTriContourGenerator_init;
-
-    if (PyType_Ready(type) < 0) {
-        return NULL;
-    }
-
-    if (PyModule_AddObject(m, "TriContourGenerator", (PyObject*)type)) {
-        return NULL;
-    }
-
-    return type;
+    PyTriContourGeneratorType.tp_name = "matplotlib._tri.TriContourGenerator";
+    PyTriContourGeneratorType.tp_doc = PyTriContourGenerator_init__doc__;
+    PyTriContourGeneratorType.tp_basicsize = sizeof(PyTriContourGenerator);
+    PyTriContourGeneratorType.tp_dealloc = (destructor)PyTriContourGenerator_dealloc;
+    PyTriContourGeneratorType.tp_flags = Py_TPFLAGS_DEFAULT;
+    PyTriContourGeneratorType.tp_methods = methods;
+    PyTriContourGeneratorType.tp_new = PyTriContourGenerator_new;
+    PyTriContourGeneratorType.tp_init = (initproc)PyTriContourGenerator_init;
+
+    return &PyTriContourGeneratorType;
 }
 
 
@@ -370,7 +368,7 @@ static PyObject* PyTrapezoidMapTriFinder_new(PyTypeObject* type, PyObject* args,
 const char* PyTrapezoidMapTriFinder_init__doc__ =
     "TrapezoidMapTriFinder(triangulation)\n"
     "--\n\n"
-    "Create a new C++ TrapezoidMapTriFinder object\n"
+    "Create a new C++ TrapezoidMapTriFinder object.\n"
     "This should not be called directly, instead use the python class\n"
     "matplotlib.tri.TrapezoidMapTriFinder instead.\n";
 
@@ -400,11 +398,11 @@ static void PyTrapezoidMapTriFinder_dealloc(PyTrapezoidMapTriFinder* self)
 }
 
 const char* PyTrapezoidMapTriFinder_find_many__doc__ =
-    "find_many(x, y)\n"
-    "\n"
-    "Find indices of triangles containing the point coordinates (x, y)";
+    "find_many(self, x, y)\n"
+    "--\n\n"
+    "Find indices of triangles containing the point coordinates (x, y).";
 
-static PyObject* PyTrapezoidMapTriFinder_find_many(PyTrapezoidMapTriFinder* self, PyObject* args, PyObject* kwds)
+static PyObject* PyTrapezoidMapTriFinder_find_many(PyTrapezoidMapTriFinder* self, PyObject* args)
 {
     TrapezoidMapTriFinder::CoordinateArray x, y;
     if (!PyArg_ParseTuple(args, "O&O&:find_many",
@@ -425,11 +423,11 @@ static PyObject* PyTrapezoidMapTriFinder_find_many(PyTrapezoidMapTriFinder* self
 }
 
 const char* PyTrapezoidMapTriFinder_get_tree_stats__doc__ =
-    "get_tree_stats()\n"
-    "\n"
-    "Return statistics about the tree used by the trapezoid map";
+    "get_tree_stats(self)\n"
+    "--\n\n"
+    "Return statistics about the tree used by the trapezoid map.";
 
-static PyObject* PyTrapezoidMapTriFinder_get_tree_stats(PyTrapezoidMapTriFinder* self, PyObject* args, PyObject* kwds)
+static PyObject* PyTrapezoidMapTriFinder_get_tree_stats(PyTrapezoidMapTriFinder* self, PyObject* args)
 {
     PyObject* result;
     CALL_CPP("get_tree_stats", (result = self->ptr->get_tree_stats()));
@@ -437,97 +435,75 @@ static PyObject* PyTrapezoidMapTriFinder_get_tree_stats(PyTrapezoidMapTriFinder*
 }
 
 const char* PyTrapezoidMapTriFinder_initialize__doc__ =
-    "initialize()\n"
-    "\n"
-    "Initialize this object, creating the trapezoid map from the triangulation";
+    "initialize(self)\n"
+    "--\n\n"
+    "Initialize this object, creating the trapezoid map from the triangulation.";
 
-static PyObject* PyTrapezoidMapTriFinder_initialize(PyTrapezoidMapTriFinder* self, PyObject* args, PyObject* kwds)
+static PyObject* PyTrapezoidMapTriFinder_initialize(PyTrapezoidMapTriFinder* self, PyObject* args)
 {
     CALL_CPP("initialize", (self->ptr->initialize()));
     Py_RETURN_NONE;
 }
 
 const char* PyTrapezoidMapTriFinder_print_tree__doc__ =
-    "print_tree()\n"
-    "\n"
-    "Print the search tree as text to stdout; useful for debug purposes";
+    "print_tree(self)\n"
+    "--\n\n"
+    "Print the search tree as text to stdout; useful for debug purposes.";
 
-static PyObject* PyTrapezoidMapTriFinder_print_tree(PyTrapezoidMapTriFinder* self, PyObject* args, PyObject* kwds)
+static PyObject* PyTrapezoidMapTriFinder_print_tree(PyTrapezoidMapTriFinder* self, PyObject* args)
 {
     CALL_CPP("print_tree", (self->ptr->print_tree()));
     Py_RETURN_NONE;
 }
 
-static PyTypeObject* PyTrapezoidMapTriFinder_init_type(PyObject* m, PyTypeObject* type)
+static PyTypeObject *PyTrapezoidMapTriFinder_init_type()
 {
     static PyMethodDef methods[] = {
-        {"find_many", (PyCFunction)PyTrapezoidMapTriFinder_find_many, METH_VARARGS, PyTrapezoidMapTriFinder_find_many__doc__},
-        {"get_tree_stats", (PyCFunction)PyTrapezoidMapTriFinder_get_tree_stats, METH_NOARGS, PyTrapezoidMapTriFinder_get_tree_stats__doc__},
-        {"initialize", (PyCFunction)PyTrapezoidMapTriFinder_initialize, METH_NOARGS, PyTrapezoidMapTriFinder_initialize__doc__},
-        {"print_tree", (PyCFunction)PyTrapezoidMapTriFinder_print_tree, METH_NOARGS, PyTrapezoidMapTriFinder_print_tree__doc__},
+        {"find_many",
+         (PyCFunction)PyTrapezoidMapTriFinder_find_many,
+         METH_VARARGS,
+         PyTrapezoidMapTriFinder_find_many__doc__},
+        {"get_tree_stats",
+         (PyCFunction)PyTrapezoidMapTriFinder_get_tree_stats,
+         METH_NOARGS,
+         PyTrapezoidMapTriFinder_get_tree_stats__doc__},
+        {"initialize",
+         (PyCFunction)PyTrapezoidMapTriFinder_initialize,
+         METH_NOARGS,
+         PyTrapezoidMapTriFinder_initialize__doc__},
+        {"print_tree",
+         (PyCFunction)PyTrapezoidMapTriFinder_print_tree,
+         METH_NOARGS,
+         PyTrapezoidMapTriFinder_print_tree__doc__},
         {NULL}
     };
-
-    memset(type, 0, sizeof(PyTypeObject));
-    type->tp_name = "matplotlib._tri.TrapezoidMapTriFinder";
-    type->tp_doc = PyTrapezoidMapTriFinder_init__doc__;
-    type->tp_basicsize = sizeof(PyTrapezoidMapTriFinder);
-    type->tp_dealloc = (destructor)PyTrapezoidMapTriFinder_dealloc;
-    type->tp_flags = Py_TPFLAGS_DEFAULT;
-    type->tp_methods = methods;
-    type->tp_new = PyTrapezoidMapTriFinder_new;
-    type->tp_init = (initproc)PyTrapezoidMapTriFinder_init;
-
-    if (PyType_Ready(type) < 0) {
-        return NULL;
-    }
-
-    if (PyModule_AddObject(m, "TrapezoidMapTriFinder", (PyObject*)type)) {
-        return NULL;
-    }
-
-    return type;
+    PyTrapezoidMapTriFinderType.tp_name = "matplotlib._tri.TrapezoidMapTriFinder";
+    PyTrapezoidMapTriFinderType.tp_doc = PyTrapezoidMapTriFinder_init__doc__;
+    PyTrapezoidMapTriFinderType.tp_basicsize = sizeof(PyTrapezoidMapTriFinder);
+    PyTrapezoidMapTriFinderType.tp_dealloc = (destructor)PyTrapezoidMapTriFinder_dealloc;
+    PyTrapezoidMapTriFinderType.tp_flags = Py_TPFLAGS_DEFAULT;
+    PyTrapezoidMapTriFinderType.tp_methods = methods;
+    PyTrapezoidMapTriFinderType.tp_new = PyTrapezoidMapTriFinder_new;
+    PyTrapezoidMapTriFinderType.tp_init = (initproc)PyTrapezoidMapTriFinder_init;
+
+    return &PyTrapezoidMapTriFinderType;
 }
 
-
-/* Module */
-
-static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT,
-    "_tri",
-    NULL,
-    0,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL
-};
+static struct PyModuleDef moduledef = { PyModuleDef_HEAD_INIT, "_tri" };
 
 #pragma GCC visibility push(default)
 
 PyMODINIT_FUNC PyInit__tri(void)
 {
+    import_array();
     PyObject *m;
-
-    m = PyModule_Create(&moduledef);
-
-    if (m == NULL) {
+    if (!(m = PyModule_Create(&moduledef))
+        || prepare_and_add_type(PyTriangulation_init_type(), m)
+        || prepare_and_add_type(PyTriContourGenerator_init_type(), m)
+        || prepare_and_add_type(PyTrapezoidMapTriFinder_init_type(), m)) {
+        Py_XDECREF(m);
         return NULL;
     }
-
-    if (!PyTriangulation_init_type(m, &PyTriangulationType)) {
-        return NULL;
-    }
-    if (!PyTriContourGenerator_init_type(m, &PyTriContourGeneratorType)) {
-        return NULL;
-    }
-    if (!PyTrapezoidMapTriFinder_init_type(m, &PyTrapezoidMapTriFinderType)) {
-        return NULL;
-    }
-
-    import_array();
-
     return m;
 }
 
diff --git a/tools/boilerplate.py b/tools/boilerplate.py
index 90f5d709ac17..86dc08620679 100644
--- a/tools/boilerplate.py
+++ b/tools/boilerplate.py
@@ -24,9 +24,31 @@
 import numpy as np
 from matplotlib import _api, mlab
 from matplotlib.axes import Axes
+from matplotlib.backend_bases import MouseButton
 from matplotlib.figure import Figure
 
 
+# we need to define a custom str because py310 change
+# In Python 3.10 the repr and str representation of Enums changed from
+#
+#  str: 'ClassName.NAME' -> 'NAME'
+#  repr: '<ClassName.NAME: value>' -> 'ClassName.NAME'
+#
+# which is more consistent with what str/repr should do, however this breaks
+# boilerplate which needs to get the ClassName.NAME version in all versions of
+# Python. Thus, we locally monkey patch our preferred str representation in
+# here.
+#
+# bpo-40066
+# https://github.com/python/cpython/pull/22392/
+def enum_str_back_compat_patch(self):
+    return f'{type(self).__name__}.{self.name}'
+
+# only monkey patch if we have to.
+if str(MouseButton.LEFT) != 'MouseButton.Left':
+    MouseButton.__str__ = enum_str_back_compat_patch
+
+
 # This is the magic line that must exist in pyplot, after which the boilerplate
 # content will be appended.
 PYPLOT_MAGIC_HEADER = (
@@ -57,7 +79,16 @@ def {name}{signature}:
     return gcf().{called_name}{call}
 """
 
-CMAP_TEMPLATE = "def {name}(): set_cmap({name!r})\n"  # Colormap functions.
+CMAP_TEMPLATE = '''
+def {name}():
+    """
+    Set the colormap to {name!r}.
+
+    This changes the default colormap as well as the colormap of the current
+    image if there is one. See ``help(colormaps)`` for more information.
+    """
+    set_cmap({name!r})
+'''  # Colormap functions.
 
 
 class value_formatter:
@@ -116,7 +147,13 @@ def generate_function(name, called_fullname, template, **kwargs):
     class_name, called_name = called_fullname.split('.')
     class_ = {'Axes': Axes, 'Figure': Figure}[class_name]
 
-    signature = inspect.signature(getattr(class_, called_name))
+    meth = getattr(class_, called_name)
+    decorator = _api.deprecation.DECORATORS.get(meth)
+    # Generate the wrapper with the non-kwonly signature, as it will get
+    # redecorated with make_keyword_only by _copy_docstring_and_deprecators.
+    if decorator and decorator.func is _api.make_keyword_only:
+        meth = meth.__wrapped__
+    signature = inspect.signature(meth)
     # Replace self argument.
     params = list(signature.parameters.values())[1:]
     signature = str(signature.replace(parameters=[
@@ -180,6 +217,7 @@ def boilerplate_gen():
         'ginput',
         'subplots_adjust',
         'suptitle',
+        'tight_layout',
         'waitforbuttonpress',
     )
 
@@ -301,8 +339,6 @@ def boilerplate_gen():
         yield generate_function(name, f'Axes.{called_name}', template,
                                 sci_command=cmappable.get(name))
 
-    yield AUTOGEN_MSG
-    yield '\n'
     cmaps = (
         'autumn',
         'bone',
@@ -326,11 +362,9 @@ def boilerplate_gen():
     )
     # add all the colormaps (autumn, hsv, ....)
     for name in cmaps:
+        yield AUTOGEN_MSG
         yield CMAP_TEMPLATE.format(name=name)
 
-    yield '\n\n'
-    yield '_setup_pyplot_info_docstrings()'
-
 
 def build_pyplot(pyplot_path):
     pyplot_orig = pyplot_path.read_text().splitlines(keepends=True)
@@ -343,7 +377,6 @@ def build_pyplot(pyplot_path):
     with pyplot_path.open('w') as pyplot:
         pyplot.writelines(pyplot_orig)
         pyplot.writelines(boilerplate_gen())
-        pyplot.write('\n')
 
 
 if __name__ == '__main__':
diff --git a/tools/cache_zenodo_svg.py b/tools/cache_zenodo_svg.py
index 6a334a3bbd1b..f70c14e06c95 100644
--- a/tools/cache_zenodo_svg.py
+++ b/tools/cache_zenodo_svg.py
@@ -50,7 +50,8 @@ def _get_xdg_cache_dir():
     """
     Return the XDG cache directory.
 
-    See https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+    See
+    https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
     """
     cache_dir = os.environ.get("XDG_CACHE_HOME")
     if not cache_dir:
@@ -62,6 +63,16 @@ def _get_xdg_cache_dir():
 
 if __name__ == "__main__":
     data = {
+        "v3.6.1": "7162185",
+        "v3.6.0": "7084615",
+        "v3.5.3": "6982547",
+        "v3.5.2": "6513224",
+        "v3.5.1": "5773480",
+        "v3.5.0": "5706396",
+        "v3.4.3": "5194481",
+        "v3.4.2": "4743323",
+        "v3.4.1": "4649959",
+        "v3.4.0": "4638398",
         "v3.3.4": "4475376",
         "v3.3.3": "4268928",
         "v3.3.2": "4030140",
@@ -101,7 +112,7 @@ def _get_xdg_cache_dir():
     }
     doc_dir = Path(__file__).parent.parent.absolute() / "doc"
     target_dir = doc_dir / "_static/zenodo_cache"
-    citing = doc_dir / "citing.rst"
+    citing = doc_dir / "users/project/citing.rst"
     target_dir.mkdir(exist_ok=True, parents=True)
     header = []
     footer = []
@@ -129,7 +140,7 @@ def _get_xdg_cache_dir():
             fout.write(
                 f"""
 {version}
-   .. image:: _static/zenodo_cache/{doi}.svg
+   .. image:: ../../_static/zenodo_cache/{doi}.svg
       :target:  https://doi.org/10.5281/zenodo.{doi}"""
             )
         fout.write("\n\n")
diff --git a/tools/create_DejaVuDisplay.sh b/tools/create_DejaVuDisplay.sh
index 1b9d49935fd0..8ee3b1659e62 100755
--- a/tools/create_DejaVuDisplay.sh
+++ b/tools/create_DejaVuDisplay.sh
@@ -2,10 +2,10 @@
 
 # Subsetting DejaVu fonts to create a display-math-only font
 
-# The DejaVu fonts include math display variants outside of the unicode range,
-# and it is currently hard to access them from matploltib. The subset.py script
+# The DejaVu fonts include math display variants outside of the Unicode range,
+# and it is currently hard to access them from matplotlib. The subset.py script
 # in `tools` has been modified to move the math display variants found in DejaVu
-# fonts into a new TTF font with these variants in the unicode range.
+# fonts into a new TTF font with these variants in the Unicode range.
 
 # This bash script calls the subset.py scripts with the appropriate options to
 # generate the new font files `DejaVuSansDisplay.ttf` and
diff --git a/tools/gh_api.py b/tools/gh_api.py
index 71879264a4ac..dad57df9f119 100644
--- a/tools/gh_api.py
+++ b/tools/gh_api.py
@@ -216,7 +216,7 @@ def encode_multipart_formdata(fields, boundary=None):
         bytes. If the value is a tuple of two elements, then the first element
         is treated as the filename of the form-data section.
 
-        Field names and filenames must be unicode.
+        Field names and filenames must be str.
 
     :param boundary:
         If not specified, then a random boundary will be generated using
diff --git a/tools/github_stats.py b/tools/github_stats.py
index 3b9a4cbb5377..f6e190324194 100755
--- a/tools/github_stats.py
+++ b/tools/github_stats.py
@@ -78,8 +78,8 @@ def issues_closed_since(period=timedelta(days=365), project="matplotlib/matplotl
     filtered = [ i for i in allclosed if _parse_datetime(i['closed_at']) > since ]
     if pulls:
         filtered = [ i for i in filtered if _parse_datetime(i['merged_at']) > since ]
-        # filter out PRs not against master (backports)
-        filtered = [ i for i in filtered if i['base']['ref'] == 'master' ]
+        # filter out PRs not against main (backports)
+        filtered = [ i for i in filtered if i['base']['ref'] == 'main' ]
     else:
         filtered = [ i for i in filtered if not is_pull_request(i) ]
 
@@ -172,17 +172,18 @@ def report(issues, show_urls=False):
 
     n_issues, n_pulls = map(len, (issues, pulls))
     n_total = n_issues + n_pulls
+    since_day = since.strftime("%Y/%m/%d")
+    today = datetime.today()
 
     # Print summary report we can directly include into release notes.
     print('.. _github-stats:')
     print()
-    print('GitHub Stats')
-    print('============')
+    title = 'GitHub statistics ' + today.strftime('(%b %d, %Y)')
+    print(title)
+    print('=' * len(title))
 
     print()
-    since_day = since.strftime("%Y/%m/%d")
-    today = datetime.today().strftime("%Y/%m/%d")
-    print("GitHub stats for %s - %s (tag: %s)" % (since_day, today, tag))
+    print("GitHub statistics for %s (tag: %s) - %s" % (since_day, tag, today.strftime("%Y/%m/%d"), ))
     print()
     print("These lists are automatically generated, and may be incomplete or contain duplicates.")
     print()
@@ -229,8 +230,9 @@ def report(issues, show_urls=False):
         report(issues, show_urls)
     print()
     print()
-    print("""Previous GitHub Stats
----------------------
+    print("""\
+Previous GitHub statistics
+--------------------------
 
 
 .. toctree::
diff --git a/tools/make_icons.py b/tools/make_icons.py
index 773b4c717e28..0424c0d03dad 100755
--- a/tools/make_icons.py
+++ b/tools/make_icons.py
@@ -46,8 +46,8 @@ def save_icon(fig, dest_dir, name):
 def make_icon(font_path, ccode):
     fig = plt.figure(figsize=(1, 1))
     fig.patch.set_alpha(0.0)
-    text = fig.text(0.5, 0.48, chr(ccode), ha='center', va='center',
-                    font=font_path, fontsize=68)
+    fig.text(0.5, 0.48, chr(ccode), ha='center', va='center',
+             font=font_path, fontsize=68)
     return fig
 
 
diff --git a/tools/run_examples.py b/tools/run_examples.py
index 97dfe5be7ec5..e6542e9ddf23 100644
--- a/tools/run_examples.py
+++ b/tools/run_examples.py
@@ -10,6 +10,7 @@
 import sys
 from tempfile import TemporaryDirectory
 import time
+import tokenize
 
 
 _preamble = """\
@@ -73,8 +74,9 @@ def main():
                 cwd.mkdir(parents=True)
             else:
                 cwd = stack.enter_context(TemporaryDirectory())
-            Path(cwd, relpath.name).write_text(
-                _preamble + (root / relpath).read_text())
+            with tokenize.open(root / relpath) as src:
+                Path(cwd, relpath.name).write_text(
+                    _preamble + src.read(), encoding="utf-8")
             for backend in args.backend or [None]:
                 env = {**os.environ}
                 if backend is not None:
diff --git a/tools/subset.py b/tools/subset.py
index 5b1494f1b515..d65c69bfad2c 100644
--- a/tools/subset.py
+++ b/tools/subset.py
@@ -9,7 +9,7 @@
 #   you may not use this file except in compliance with the License.
 #   You may obtain a copy of the License at
 #
-#       http://www.apache.org/licenses/LICENSE-2.0
+#       https://www.apache.org/licenses/LICENSE-2.0.txt
 #
 #   Unless required by applicable law or agreed to in writing, software
 #   distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,8 +21,10 @@
 #
 # A script for subsetting a font, using FontForge. See README for details.
 
-# TODO 2013-04-08 ensure the menu files are as compact as possible by default, similar to subset.pl
-# TODO 2013-05-22 in Arimo, the latin subset doesn't include ; but the greek does. why on earth is this happening?
+# TODO 2013-04-08 ensure the menu files are as compact as possible by default,
+# similar to subset.pl
+# TODO 2013-05-22 in Arimo, the latin subset doesn't include ; but the greek
+# does. why on earth is this happening?
 
 import getopt
 import os
@@ -35,21 +37,23 @@
 
 def log_namelist(nam, unicode):
     if nam and isinstance(unicode, int):
-        print("0x%0.4X" % unicode, fontforge.nameFromUnicode(unicode), file=nam)
+        print(f"0x{unicode:04X}", fontforge.nameFromUnicode(unicode), file=nam)
 
-def select_with_refs(font, unicode, newfont, pe = None, nam = None):
+
+def select_with_refs(font, unicode, newfont, pe=None, nam=None):
     newfont.selection.select(('more', 'unicode'), unicode)
     log_namelist(nam, unicode)
     if pe:
-        print("SelectMore(%d)" % unicode, file=pe)
+        print(f"SelectMore({unicode})", file=pe)
     try:
         for ref in font[unicode].references:
             newfont.selection.select(('more',), ref[0])
             log_namelist(nam, ref[0])
             if pe:
-                print('SelectMore("%s")' % ref[0], file=pe)
+                print(f'SelectMore("{ref[0]}")', file=pe)
     except Exception:
-        print('Resolving references on u+%04x failed' % unicode)
+        print(f'Resolving references on u+{unicode:04x} failed')
+
 
 def subset_font_raw(font_in, font_out, unicodes, opts):
     if '--namelist' in opts:
@@ -57,7 +61,7 @@ def subset_font_raw(font_in, font_out, unicodes, opts):
         # change getopt.gnu_getopt from namelist to namelist=
         # and invert comments on following 2 lines
         # nam_fn = opts['--namelist']
-        nam_fn = font_out + '.nam'
+        nam_fn = f'{font_out}.nam'
         nam = open(nam_fn, 'w')
     else:
         nam = None
@@ -68,7 +72,7 @@ def subset_font_raw(font_in, font_out, unicodes, opts):
         pe = None
     font = fontforge.open(font_in)
     if pe:
-        print('Open("' + font_in + '")', file=pe)
+        print(f'Open("{font_in}")', file=pe)
         extract_vert_to_script(font_in, pe)
     for i in unicodes:
         select_with_refs(font, i, font, pe, nam)
@@ -83,9 +87,10 @@ def subset_font_raw(font_in, font_out, unicodes, opts):
     for glyph in addl_glyphs:
         font.selection.select(('more',), glyph)
         if nam:
-            print("0x%0.4X" % fontforge.unicodeFromName(glyph), glyph, file=nam)
+            print(f"0x{fontforge.unicodeFromName(glyph):0.4X}", glyph,
+                  file=nam)
         if pe:
-            print('SelectMore("%s")' % glyph, file=pe)
+            print(f'SelectMore("{glyph}")', file=pe)
 
     flags = ()
 
@@ -123,7 +128,7 @@ def subset_font_raw(font_in, font_out, unicodes, opts):
         print("Clear()", file=pe)
 
     if '--move-display' in opts:
-        print("Moving display glyphs into unicode ranges...")
+        print("Moving display glyphs into Unicode ranges...")
         font.familyname += " Display"
         font.fullname += " Display"
         font.fontname += "Display"
@@ -149,11 +154,11 @@ def subset_font_raw(font_in, font_out, unicodes, opts):
         nam.close()
 
     if pe:
-        print('Generate("' + font_out + '")', file=pe)
+        print(f'Generate("{font_out}")', file=pe)
         pe.close()
         subprocess.call(["fontforge", "-script", pe_fn])
     else:
-        font.generate(font_out, flags = flags)
+        font.generate(font_out, flags=flags)
     font.close()
 
     if '--roundtrip' in opts:
@@ -161,7 +166,8 @@ def subset_font_raw(font_in, font_out, unicodes, opts):
         # the advanceWidthMax in the hhea table, and a workaround is to open
         # and re-generate
         font2 = fontforge.open(font_out)
-        font2.generate(font_out, flags = flags)
+        font2.generate(font_out, flags=flags)
+
 
 def subset_font(font_in, font_out, unicodes, opts):
     font_out_raw = font_out
@@ -173,59 +179,69 @@ def subset_font(font_in, font_out, unicodes, opts):
 # 2011-02-14 DC this needs to only happen with --namelist is used
 #        os.rename(font_out_raw + '.nam', font_out + '.nam')
 
+
 def getsubset(subset, font_in):
     subsets = subset.split('+')
-
-    quotes  = [0x2013] # endash
-    quotes += [0x2014] # emdash
-    quotes += [0x2018] # quoteleft
-    quotes += [0x2019] # quoteright
-    quotes += [0x201A] # quotesinglbase
-    quotes += [0x201C] # quotedblleft
-    quotes += [0x201D] # quotedblright
-    quotes += [0x201E] # quotedblbase
-    quotes += [0x2022] # bullet
-    quotes += [0x2039] # guilsinglleft
-    quotes += [0x203A] # guilsinglright
-
-    latin  = range(0x20, 0x7f) # Basic Latin (A-Z, a-z, numbers)
-    latin += range(0xa0, 0x100) # Western European symbols and diacritics
-    latin += [0x20ac] # Euro
-    latin += [0x0152] # OE
-    latin += [0x0153] # oe
-    latin += [0x003b] # semicolon
-    latin += [0x00b7] # periodcentered
-    latin += [0x0131] # dotlessi
-    latin += [0x02c6] # circumflex
-    latin += [0x02da] # ring
-    latin += [0x02dc] # tilde
-    latin += [0x2074] # foursuperior
-    latin += [0x2215] # division slash
-    latin += [0x2044] # fraction slash
-    latin += [0xe0ff] # PUA: Font logo
-    latin += [0xeffd] # PUA: Font version number
-    latin += [0xf000] # PUA: font ppem size indicator: run `ftview -f 1255 10 Ubuntu-Regular.ttf` to see it in action!
+    quotes = [
+        0x2013,  # endash
+        0x2014,  # emdash
+        0x2018,  # quoteleft
+        0x2019,  # quoteright
+        0x201A,  # quotesinglbase
+        0x201C,  # quotedblleft
+        0x201D,  # quotedblright
+        0x201E,  # quotedblbase
+        0x2022,  # bullet
+        0x2039,  # guilsinglleft
+        0x203A,  # guilsinglright
+    ]
+
+    latin = [
+        *range(0x20, 0x7f),  # Basic Latin (A-Z, a-z, numbers)
+        *range(0xa0, 0x100),  # Western European symbols and diacritics
+        0x20ac,  # Euro
+        0x0152,  # OE
+        0x0153,  # oe
+        0x003b,  # semicolon
+        0x00b7,  # periodcentered
+        0x0131,  # dotlessi
+        0x02c6,  # circumflex
+        0x02da,  # ring
+        0x02dc,  # tilde
+        0x2074,  # foursuperior
+        0x2215,  # division slash
+        0x2044,  # fraction slash
+        0xe0ff,  # PUA: Font logo
+        0xeffd,  # PUA: Font version number
+        0xf000,  # PUA: font ppem size indicator: run
+                 # `ftview -f 1255 10 Ubuntu-Regular.ttf` to see it in action!
+    ]
 
     result = quotes
 
-    if 'menu' in subset:
+    if 'menu' in subsets:
         font = fontforge.open(font_in)
-        result = map(ord, font.familyname)
-        result += [0x0020]
+        result = [
+            *map(ord, font.familyname),
+            0x0020,
+        ]
 
-    if 'latin' in subset:
+    if 'latin' in subsets:
         result += latin
-    if 'latin-ext' in subset:
+    if 'latin-ext' in subsets:
         # These ranges include Extended A, B, C, D, and Additional with the
         # exception of Vietnamese, which is a separate range
-        result += (range(0x100, 0x370) +
-                   range(0x1d00, 0x1ea0) +
-                   range(0x1ef2, 0x1f00) +
-                   range(0x2070, 0x20d0) +
-                   range(0x2c60, 0x2c80) +
-                   range(0xa700, 0xa800))
-    if 'vietnamese' in subset:
-        # 2011-07-16 DC: Charset from http://vietunicode.sourceforge.net/charset/ + U+1ef9 from Fontaine
+        result += [
+            *range(0x100, 0x370),
+            *range(0x1d00, 0x1ea0),
+            *range(0x1ef2, 0x1f00),
+            *range(0x2070, 0x20d0),
+            *range(0x2c60, 0x2c80),
+            *range(0xa700, 0xa800),
+        ]
+    if 'vietnamese' in subsets:
+        # 2011-07-16 DC: Charset from
+        # http://vietunicode.sourceforge.net/charset/ + U+1ef9 from Fontaine
         result += [0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00C8, 0x00C9,
                    0x00CA, 0x00CC, 0x00CD, 0x00D2, 0x00D3, 0x00D4,
                    0x00D5, 0x00D9, 0x00DA, 0x00DD, 0x00E0, 0x00E1,
@@ -233,22 +249,27 @@ def getsubset(subset, font_in):
                    0x00ED, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F9,
                    0x00FA, 0x00FD, 0x0102, 0x0103, 0x0110, 0x0111,
                    0x0128, 0x0129, 0x0168, 0x0169, 0x01A0, 0x01A1,
-                   0x01AF, 0x01B0, 0x20AB] + range(0x1EA0, 0x1EFA)
-    if 'greek' in subset:
-        # Could probably be more aggressive here and exclude archaic characters,
-        # but lack data
-        result += range(0x370, 0x400)
-    if 'greek-ext' in subset:
-        result += range(0x370, 0x400) + range(0x1f00, 0x2000)
-    if 'cyrillic' in subset:
+                   0x01AF, 0x01B0, 0x20AB, *range(0x1EA0, 0x1EFA)]
+    if 'greek' in subsets:
+        # Could probably be more aggressive here and exclude archaic
+        # characters, but lack data
+        result += [*range(0x370, 0x400)]
+    if 'greek-ext' in subsets:
+        result += [*range(0x370, 0x400), *range(0x1f00, 0x2000)]
+    if 'cyrillic' in subsets:
         # Based on character frequency analysis
-        result += range(0x400, 0x460) + [0x490, 0x491, 0x4b0, 0x4b1, 0x2116]
-    if 'cyrillic-ext' in subset:
-        result += (range(0x400, 0x530) +
-                   [0x20b4, 0x2116] + # 0x2116 is the russian No, a number abbreviation similar to the latin #, suggested by Alexei Vanyashin
-                   range(0x2de0, 0x2e00) +
-                   range(0xa640, 0xa6a0))
-    if 'arabic' in subset:
+        result += [*range(0x400, 0x460), 0x490, 0x491, 0x4b0, 0x4b1, 0x2116]
+    if 'cyrillic-ext' in subsets:
+        result += [
+            *range(0x400, 0x530),
+            0x20b4,
+            # 0x2116 is the russian No, a number abbreviation similar to the
+            # latin #, suggested by Alexei Vanyashin
+            0x2116,
+            *range(0x2de0, 0x2e00),
+            *range(0xa640, 0xa6a0),
+        ]
+    if 'arabic' in subsets:
         # Based on Droid Arabic Kufi 1.0
         result += [0x000D, 0x0020, 0x0621, 0x0627, 0x062D,
                    0x062F, 0x0631, 0x0633, 0x0635, 0x0637, 0x0639,
@@ -295,11 +316,12 @@ def getsubset(subset, font_in):
                    0x06C8, 0x06C9, 0x06CA, 0x06CB, 0x06CF, 0x06CE,
                    0x06D0, 0x06D1, 0x06D4, 0x06FA, 0x06DD, 0x06DE,
                    0x06E0, 0x06E9, 0x060D, 0xFD3E, 0xFD3F, 0x25CC,
-                   # Added from https://groups.google.com/d/topic/googlefontdirectory-discuss/MwlMWMPNCXs/discussion
+                   # Added from
+                   # https://groups.google.com/d/topic/googlefontdirectory-discuss/MwlMWMPNCXs/discussion
                    0x063b, 0x063c, 0x063d, 0x063e, 0x063f, 0x0620,
                    0x0674, 0x0674, 0x06EC]
 
-    if 'dejavu-ext' in subset:
+    if 'dejavu-ext' in subsets:
         # add all glyphnames ending in .display
         font = fontforge.open(font_in)
         for glyph in font.glyphs():
@@ -308,42 +330,48 @@ def getsubset(subset, font_in):
 
     return result
 
-# code for extracting vertical metrics from a TrueType font
 
+# code for extracting vertical metrics from a TrueType font
 class Sfnt:
     def __init__(self, data):
-        version, numTables, _, _, _ = struct.unpack('>IHHHH', data[:12])
+        _, numTables, _, _, _ = struct.unpack('>IHHHH', data[:12])
         self.tables = {}
         for i in range(numTables):
-            tag, checkSum, offset, length = struct.unpack('>4sIII', data[12 + 16 * i: 28 + 16 * i])
+            tag, _, offset, length = struct.unpack(
+                '>4sIII', data[12 + 16 * i: 28 + 16 * i])
             self.tables[tag] = data[offset: offset + length]
 
     def hhea(self):
         r = {}
         d = self.tables['hhea']
-        r['Ascender'], r['Descender'], r['LineGap'] = struct.unpack('>hhh', d[4:10])
+        r['Ascender'], r['Descender'], r['LineGap'] = struct.unpack(
+            '>hhh', d[4:10])
         return r
 
     def os2(self):
         r = {}
         d = self.tables['OS/2']
         r['fsSelection'], = struct.unpack('>H', d[62:64])
-        r['sTypoAscender'], r['sTypoDescender'], r['sTypoLineGap'] = struct.unpack('>hhh', d[68:74])
-        r['usWinAscender'], r['usWinDescender'] = struct.unpack('>HH', d[74:78])
+        r['sTypoAscender'], r['sTypoDescender'], r['sTypoLineGap'] = \
+            struct.unpack('>hhh', d[68:74])
+        r['usWinAscender'], r['usWinDescender'] = struct.unpack(
+            '>HH', d[74:78])
         return r
 
+
 def set_os2(pe, name, val):
-    print('SetOS2Value("' + name + '", %d)' % val, file=pe)
+    print(f'SetOS2Value("{name}", {val:d})', file=pe)
+
 
 def set_os2_vert(pe, name, val):
     set_os2(pe, name + 'IsOffset', 0)
     set_os2(pe, name, val)
 
+
 # Extract vertical metrics data directly out of font file, and emit
 # script code to set the values in the generated font. This is a (rather
 # ugly) workaround for the issue described in:
-# http://sourceforge.net/mailarchive/forum.php?thread_name=20100906085718.GB1907%40khaled-laptop&forum_name=fontforge-users
-
+# https://sourceforge.net/p/fontforge/mailman/fontforge-users/thread/20100906085718.GB1907@khaled-laptop/
 def extract_vert_to_script(font_in, pe):
     with open(font_in, 'rb') as in_file:
         data = in_file.read()
@@ -357,11 +385,12 @@ def extract_vert_to_script(font_in, pe):
     set_os2_vert(pe, "HHeadAscent", hhea['Ascender'])
     set_os2_vert(pe, "HHeadDescent", hhea['Descender'])
 
+
 def main(argv):
-    optlist, args = getopt.gnu_getopt(argv, '', ['string=', 'strip_names', 'opentype-features',
-                                                 'simplify', 'new', 'script',
-                                                 'nmr', 'roundtrip', 'subset=',
-                                                 'namelist', 'null', 'nd', 'move-display'])
+    optlist, args = getopt.gnu_getopt(argv, '', [
+        'string=', 'strip_names', 'opentype-features', 'simplify', 'new',
+        'script', 'nmr', 'roundtrip', 'subset=', 'namelist', 'null', 'nd',
+        'move-display'])
 
     font_in, font_out = args
     opts = dict(optlist)
@@ -371,5 +400,6 @@ def main(argv):
         subset = getsubset(opts.get('--subset', 'latin'), font_in)
     subset_font(font_in, font_out, subset, opts)
 
+
 if __name__ == '__main__':
     main(sys.argv[1:])
diff --git a/tools/triage_tests.py b/tools/triage_tests.py
index 02b8f600761d..c06a2b8491ff 100644
--- a/tools/triage_tests.py
+++ b/tools/triage_tests.py
@@ -30,6 +30,7 @@
 import sys
 
 from matplotlib.backends.qt_compat import QtCore, QtGui, QtWidgets
+from matplotlib.backends.qt_compat import _enum, _exec
 
 
 # matplotlib stores the baseline images under two separate subtrees,
@@ -45,7 +46,7 @@
 
 # Non-png image extensions
 
-exts = ['pdf', 'svg']
+exts = ['pdf', 'svg', 'eps']
 
 
 class Thumbnail(QtWidgets.QFrame):
@@ -61,13 +62,13 @@ def __init__(self, parent, index, name):
         layout = QtWidgets.QVBoxLayout()
 
         label = QtWidgets.QLabel(name)
-        label.setAlignment(QtCore.Qt.AlignHCenter |
-                           QtCore.Qt.AlignVCenter)
+        label.setAlignment(_enum('QtCore.Qt.AlignmentFlag').AlignHCenter |
+                           _enum('QtCore.Qt.AlignmentFlag').AlignVCenter)
         layout.addWidget(label, 0)
 
         self.image = QtWidgets.QLabel()
-        self.image.setAlignment(QtCore.Qt.AlignHCenter |
-                                QtCore.Qt.AlignVCenter)
+        self.image.setAlignment(_enum('QtCore.Qt.AlignmentFlag').AlignHCenter |
+                                _enum('QtCore.Qt.AlignmentFlag').AlignVCenter)
         self.image.setMinimumSize(800 // 3, 600 // 3)
         layout.addWidget(self.image)
         self.setLayout(layout)
@@ -85,7 +86,7 @@ def __init__(self, window):
         self.window = window
 
     def eventFilter(self, receiver, event):
-        if event.type() == QtCore.QEvent.KeyPress:
+        if event.type() == _enum('QtCore.QEvent.Type').KeyPress:
             self.window.keyPressEvent(event)
             return True
         else:
@@ -125,8 +126,9 @@ def __init__(self, entries):
         images_layout = QtWidgets.QVBoxLayout()
         images_box = QtWidgets.QWidget()
         self.image_display = QtWidgets.QLabel()
-        self.image_display.setAlignment(QtCore.Qt.AlignHCenter |
-                                        QtCore.Qt.AlignVCenter)
+        self.image_display.setAlignment(
+            _enum('QtCore.Qt.AlignmentFlag').AlignHCenter |
+            _enum('QtCore.Qt.AlignmentFlag').AlignVCenter)
         self.image_display.setMinimumSize(800, 600)
         images_layout.addWidget(self.image_display, 6)
         images_box.setLayout(images_layout)
@@ -164,8 +166,9 @@ def set_entry(self, index):
         for fname, thumbnail in zip(entry.thumbnails, self.thumbnails):
             pixmap = QtGui.QPixmap(os.fspath(fname))
             scaled_pixmap = pixmap.scaled(
-                thumbnail.size(), QtCore.Qt.KeepAspectRatio,
-                QtCore.Qt.SmoothTransformation)
+                thumbnail.size(),
+                _enum('QtCore.Qt.AspectRatioMode').KeepAspectRatio,
+                _enum('QtCore.Qt.TransformationMode').SmoothTransformation)
             thumbnail.image.setPixmap(scaled_pixmap)
             self.pixmaps.append(scaled_pixmap)
 
@@ -173,13 +176,15 @@ def set_entry(self, index):
         self.filelist.setCurrentRow(self.current_entry)
 
     def set_large_image(self, index):
-        self.thumbnails[self.current_thumbnail].setFrameShape(0)
+        self.thumbnails[self.current_thumbnail].setFrameShape(
+            _enum('QtWidgets.QFrame.Shape').NoFrame)
         self.current_thumbnail = index
         pixmap = QtGui.QPixmap(os.fspath(
             self.entries[self.current_entry]
             .thumbnails[self.current_thumbnail]))
         self.image_display.setPixmap(pixmap)
-        self.thumbnails[self.current_thumbnail].setFrameShape(1)
+        self.thumbnails[self.current_thumbnail].setFrameShape(
+            _enum('QtWidgets.QFrame.Shape').Box)
 
     def accept_test(self):
         entry = self.entries[self.current_entry]
@@ -204,17 +209,17 @@ def reject_test(self):
         self.set_entry(min((self.current_entry + 1), len(self.entries) - 1))
 
     def keyPressEvent(self, e):
-        if e.key() == QtCore.Qt.Key_Left:
+        if e.key() == _enum('QtCore.Qt.Key').Key_Left:
             self.set_large_image((self.current_thumbnail - 1) % 3)
-        elif e.key() == QtCore.Qt.Key_Right:
+        elif e.key() == _enum('QtCore.Qt.Key').Key_Right:
             self.set_large_image((self.current_thumbnail + 1) % 3)
-        elif e.key() == QtCore.Qt.Key_Up:
+        elif e.key() == _enum('QtCore.Qt.Key').Key_Up:
             self.set_entry(max(self.current_entry - 1, 0))
-        elif e.key() == QtCore.Qt.Key_Down:
+        elif e.key() == _enum('QtCore.Qt.Key').Key_Down:
             self.set_entry(min(self.current_entry + 1, len(self.entries) - 1))
-        elif e.key() == QtCore.Qt.Key_A:
+        elif e.key() == _enum('QtCore.Qt.Key').Key_A:
             self.accept_test()
-        elif e.key() == QtCore.Qt.Key_R:
+        elif e.key() == _enum('QtCore.Qt.Key').Key_R:
             self.reject_test()
         else:
             super().keyPressEvent(e)
@@ -233,8 +238,8 @@ def __init__(self, path, root, source):
 
         basename = self.diff[:-len('-failed-diff.png')]
         for ext in exts:
-            if basename.endswith('_' + ext):
-                display_extension = '_' + ext
+            if basename.endswith(f'_{ext}'):
+                display_extension = f'_{ext}'
                 extension = ext
                 basename = basename[:-4]
                 break
@@ -244,11 +249,10 @@ def __init__(self, path, root, source):
 
         self.basename = basename
         self.extension = extension
-        self.generated = basename + '.' + extension
-        self.expected = basename + '-expected.' + extension
-        self.expected_display = (basename + '-expected' + display_extension +
-                                 '.png')
-        self.generated_display = basename + display_extension + '.png'
+        self.generated = f'{basename}.{extension}'
+        self.expected = f'{basename}-expected.{extension}'
+        self.expected_display = f'{basename}-expected{display_extension}.png'
+        self.generated_display = f'{basename}{display_extension}.png'
         self.name = self.reldir / self.basename
         self.destdir = self.get_dest_dir(self.reldir)
 
@@ -277,7 +281,7 @@ def get_dest_dir(self, reldir):
             path = self.source / baseline_dir / reldir
             if path.is_dir():
                 return path
-        raise ValueError("Can't find baseline dir for {}".format(reldir))
+        raise ValueError(f"Can't find baseline dir for {reldir}")
 
     @property
     def display(self):
@@ -292,7 +296,7 @@ def display(self):
             'autogen': '\N{WHITE SQUARE CONTAINING BLACK SMALL SQUARE}',
         }
         box = status_map[self.status]
-        return '{} {} [{}]'.format(box, self.name, self.extension)
+        return f'{box} {self.name} [{self.extension}]'
 
     def accept(self):
         """
@@ -305,7 +309,9 @@ def reject(self):
         """
         Reject this test by copying the expected result to the source tree.
         """
-        copy_file(self.dir / self.expected, self.destdir / self.generated)
+        expected = self.dir / self.expected
+        if not expected.is_symlink():
+            copy_file(expected, self.destdir / self.generated)
         self.status = 'reject'
 
 
@@ -339,7 +345,7 @@ def launch(result_images, source):
     dialog.show()
     filter = EventFilter(dialog)
     app.installEventFilter(filter)
-    sys.exit(app.exec_())
+    sys.exit(_exec(app))
 
 
 if __name__ == '__main__':
diff --git a/tox.ini b/tox.ini
index b6b94c41b5fc..fc8479269160 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py37, py38
+envlist = py38, py39, py310
 
 [testenv]
 changedir = /tmp
diff --git a/tutorials/advanced/blitting.py b/tutorials/advanced/blitting.py
index 868b48a497bd..5481e533ca57 100644
--- a/tutorials/advanced/blitting.py
+++ b/tutorials/advanced/blitting.py
@@ -7,7 +7,7 @@
 <https://en.wikipedia.org/wiki/Bit_blit>`__ in raster graphics that,
 in the context of Matplotlib, can be used to (drastically) improve
 performance of interactive figures. For example, the
-:mod:`~.animation` and :mod:`~.widgets` modules use blitting
+:mod:`.animation` and :mod:`.widgets` modules use blitting
 internally. Here, we demonstrate how to implement your own blitting, outside
 of these classes.
 
diff --git a/tutorials/advanced/path_tutorial.py b/tutorials/advanced/path_tutorial.py
index 19632ce42964..70bb5998cecb 100644
--- a/tutorials/advanced/path_tutorial.py
+++ b/tutorials/advanced/path_tutorial.py
@@ -76,11 +76,11 @@
 # ==============
 #
 # Some of the path components require multiple vertices to specify them:
-# for example CURVE 3 is a `bézier
+# for example CURVE 3 is a `Bézier
 # <https://en.wikipedia.org/wiki/B%C3%A9zier_curve>`_ curve with one
 # control point and one end point, and CURVE4 has three vertices for the
 # two control points and the end point.  The example below shows a
-# CURVE4 Bézier spline -- the bézier curve will be contained in the
+# CURVE4 Bézier spline -- the Bézier curve will be contained in the
 # convex hull of the start point, the two control points, and the end
 # point
 
@@ -139,8 +139,8 @@
 # for each histogram bar: the rectangle width is the bin width and the
 # rectangle height is the number of datapoints in that bin.  First we'll
 # create some random normally distributed data and compute the
-# histogram.  Because numpy returns the bin edges and not centers, the
-# length of ``bins`` is 1 greater than the length of ``n`` in the
+# histogram.  Because NumPy returns the bin edges and not centers, the
+# length of ``bins`` is one greater than the length of ``n`` in the
 # example below::
 #
 #     # histogram our data with numpy
@@ -159,10 +159,10 @@
 #
 # Now we have to construct our compound path, which will consist of a
 # series of ``MOVETO``, ``LINETO`` and ``CLOSEPOLY`` for each rectangle.
-# For each rectangle, we need 5 vertices: 1 for the ``MOVETO``, 3 for
-# the ``LINETO``, and 1 for the ``CLOSEPOLY``.  As indicated in the
-# table above, the vertex for the closepoly is ignored but we still need
-# it to keep the codes aligned with the vertices::
+# For each rectangle, we need five vertices: one for the ``MOVETO``,
+# three for the ``LINETO``, and one for the ``CLOSEPOLY``.  As indicated
+# in the table above, the vertex for the closepoly is ignored but we still
+# need it to keep the codes aligned with the vertices::
 #
 #     nverts = nrects*(1+3+1)
 #     verts = np.zeros((nverts, 2))
diff --git a/tutorials/advanced/transforms_tutorial.py b/tutorials/advanced/transforms_tutorial.py
index 3fe230f3fd6a..7c90e4a98ad3 100644
--- a/tutorials/advanced/transforms_tutorial.py
+++ b/tutorials/advanced/transforms_tutorial.py
@@ -3,80 +3,100 @@
 Transformations Tutorial
 ========================
 
-Like any graphics packages, Matplotlib is built on top of a
-transformation framework to easily move between coordinate systems,
-the userland *data* coordinate system, the *axes* coordinate system,
-the *figure* coordinate system, and the *display* coordinate system.
-In 95% of your plotting, you won't need to think about this, as it
-happens under the hood, but as you push the limits of custom figure
-generation, it helps to have an understanding of these objects so you
-can reuse the existing transformations Matplotlib makes available to
-you, or create your own (see :mod:`matplotlib.transforms`).  The table
-below summarizes the some useful coordinate systems, the transformation
-object you should use to work in that coordinate system, and the
-description of that system. In the ``Transformation Object`` column,
-``ax`` is a :class:`~matplotlib.axes.Axes` instance, and ``fig`` is a
-:class:`~matplotlib.figure.Figure` instance.
-
-+----------------+-----------------------------+-----------------------------------+
-|Coordinates     |Transformation object        |Description                        |
-+================+=============================+===================================+
-|"data"          |``ax.transData``             |The coordinate system for the data,|
-|                |                             |controlled by xlim and ylim.       |
-+----------------+-----------------------------+-----------------------------------+
-|"axes"          |``ax.transAxes``             |The coordinate system of the       |
-|                |                             |`~matplotlib.axes.Axes`; (0, 0)    |
-|                |                             |is bottom left of the axes, and    |
-|                |                             |(1, 1) is top right of the axes.   |
-+----------------+-----------------------------+-----------------------------------+
-|"subfigure"     |``subfigure.transSubfigure`` |The coordinate system of the       |
-|                |                             |`.SubFigure`; (0, 0) is bottom left|
-|                |                             |of the subfigure, and (1, 1) is top|
-|                |                             |right of the subfigure.  If a      |
-|                |                             |figure has no subfigures, this is  |
-|                |                             |the same as ``transFigure``.       |
-+----------------+-----------------------------+-----------------------------------+
-|"figure"        |``fig.transFigure``          |The coordinate system of the       |
-|                |                             |`.Figure`; (0, 0) is bottom left   |
-|                |                             |of the figure, and (1, 1) is top   |
-|                |                             |right of the figure.               |
-+----------------+-----------------------------+-----------------------------------+
-|"figure-inches" |``fig.dpi_scale_trans``      |The coordinate system of the       |
-|                |                             |`.Figure` in inches; (0, 0) is     |
-|                |                             |bottom left of the figure, and     |
-|                |                             |(width, height) is the top right   |
-|                |                             |of the figure in inches.           |
-+----------------+-----------------------------+-----------------------------------+
-|"display"       |``None``, or                 |The pixel coordinate system of the |
-|                |``IdentityTransform()``      |display window; (0, 0) is bottom   |
-|                |                             |left of the window, and (width,    |
-|                |                             |height) is top right of the        |
-|                |                             |display window in pixels.          |
-+----------------+-----------------------------+-----------------------------------+
-|"xaxis",        |``ax.get_xaxis_transform()``,|Blended coordinate systems; use    |
-|"yaxis"         |``ax.get_yaxis_transform()`` |data coordinates on one of the axis|
-|                |                             |and axes coordinates on the other. |
-+----------------+-----------------------------+-----------------------------------+
-
-All of the transformation objects in the table above take inputs in
-their coordinate system, and transform the input to the *display*
-coordinate system.  That is why the *display* coordinate system has
-``None`` for the ``Transformation Object`` column -- it already is in
-*display* coordinates.  The transformations also know how to invert
-themselves, to go from *display* back to the native coordinate system.
-This is particularly useful when processing events from the user
-interface, which typically occur in display space, and you want to
-know where the mouse click or key-press occurred in your *data*
-coordinate system.
-
-Note that specifying objects in *display* coordinates will change their
-location if the ``dpi`` of the figure changes.  This can cause confusion when
-printing or changing screen resolution, because the object can change location
-and size.  Therefore it is most common
-for artists placed in an axes or figure to have their transform set to
-something *other* than the `~.transforms.IdentityTransform()`; the default when
-an artist is placed on an axes using `~.axes.Axes.add_artist` is for the
-transform to be ``ax.transData``.
+Like any graphics packages, Matplotlib is built on top of a transformation
+framework to easily move between coordinate systems, the userland *data*
+coordinate system, the *axes* coordinate system, the *figure* coordinate
+system, and the *display* coordinate system.  In 95% of your plotting, you
+won't need to think about this, as it happens under the hood, but as you push
+the limits of custom figure generation, it helps to have an understanding of
+these objects so you can reuse the existing transformations Matplotlib makes
+available to you, or create your own (see :mod:`matplotlib.transforms`).  The
+table below summarizes some useful coordinate systems, a description of each
+system, and the transformation object for going from each coordinate system to
+the *display* coordinates.  In the "Transformation Object" column, ``ax`` is a
+:class:`~matplotlib.axes.Axes` instance, ``fig`` is a
+:class:`~matplotlib.figure.Figure` instance, and ``subfigure`` is a
+:class:`~matplotlib.figure.SubFigure` instance.
+
+
++----------------+-----------------------------------+---------------------------------------------------+
+|Coordinate      |Description                        |Transformation object                              |
+|system          |                                   |from system to display                             |
++================+===================================+===================================================+
+|"data"          |The coordinate system of the data  |``ax.transData``                                   |
+|                |in the Axes.                       |                                                   |
++----------------+-----------------------------------+---------------------------------------------------+
+|"axes"          |The coordinate system of the       |``ax.transAxes``                                   |
+|                |`~matplotlib.axes.Axes`; (0, 0)    |                                                   |
+|                |is bottom left of the axes, and    |                                                   |
+|                |(1, 1) is top right of the axes.   |                                                   |
++----------------+-----------------------------------+---------------------------------------------------+
+|"subfigure"     |The coordinate system of the       |``subfigure.transSubfigure``                       |
+|                |`.SubFigure`; (0, 0) is bottom left|                                                   |
+|                |of the subfigure, and (1, 1) is top|                                                   |
+|                |right of the subfigure.  If a      |                                                   |
+|                |figure has no subfigures, this is  |                                                   |
+|                |the same as ``transFigure``.       |                                                   |
++----------------+-----------------------------------+---------------------------------------------------+
+|"figure"        |The coordinate system of the       |``fig.transFigure``                                |
+|                |`.Figure`; (0, 0) is bottom left   |                                                   |
+|                |of the figure, and (1, 1) is top   |                                                   |
+|                |right of the figure.               |                                                   |
++----------------+-----------------------------------+---------------------------------------------------+
+|"figure-inches" |The coordinate system of the       |``fig.dpi_scale_trans``                            |
+|                |`.Figure` in inches; (0, 0) is     |                                                   |
+|                |bottom left of the figure, and     |                                                   |
+|                |(width, height) is the top right   |                                                   |
+|                |of the figure in inches.           |                                                   |
++----------------+-----------------------------------+---------------------------------------------------+
+|"xaxis",        |Blended coordinate systems, using  |``ax.get_xaxis_transform()``,                      |
+|"yaxis"         |data coordinates on one direction  |``ax.get_yaxis_transform()``                       |
+|                |and axes coordinates on the other. |                                                   |
++----------------+-----------------------------------+---------------------------------------------------+
+|"display"       |The native coordinate system of the|`None`, or                                         |
+|                |output ; (0, 0) is the bottom left |:class:`~matplotlib.transforms.IdentityTransform()`|
+|                |of the window, and (width, height) |                                                   |
+|                |is top right of the output in      |                                                   |
+|                |"display units".                   |                                                   |
+|                |                                   |                                                   |
+|                |The exact interpretation of the    |                                                   |
+|                |units depends on the back end. For |                                                   |
+|                |example it is pixels for Agg and   |                                                   |
+|                |points for svg/pdf.                |                                                   |
++----------------+-----------------------------------+---------------------------------------------------+
+
+
+
+
+
+The `~matplotlib.transforms.Transform` objects are naive to the source and
+destination coordinate systems, however the objects referred to in the table
+above are constructed to take inputs in their coordinate system, and transform
+the input to the *display* coordinate system.  That is why the *display*
+coordinate system has `None` for the "Transformation Object" column -- it
+already is in *display* coordinates.  The naming and destination conventions
+are an aid to keeping track of the available "standard" coordinate systems and
+transforms.
+
+The transformations also know how to invert themselves (via
+`.Transform.inverted`) to generate a transform from output coordinate system
+back to the input coordinate system.  For example, ``ax.transData`` converts
+values in data coordinates to display coordinates and
+``ax.transData.inversed()`` is a :class:`matplotlib.transforms.Transform` that
+goes from display coordinates to data coordinates. This is particularly useful
+when processing events from the user interface, which typically occur in
+display space, and you want to know where the mouse click or key-press occurred
+in your *data* coordinate system.
+
+Note that specifying the position of Artists in *display* coordinates may
+change their relative location if the ``dpi`` or size of the figure changes.
+This can cause confusion when printing or changing screen resolution, because
+the object can change location and size.  Therefore it is most common for
+artists placed in an Axes or figure to have their transform set to something
+*other* than the `~.transforms.IdentityTransform()`; the default when an artist
+is added to an Axes using `~.axes.Axes.add_artist` is for the transform to be
+``ax.transData`` so that you can work and think in *data* coordinates and let
+Matplotlib take care of the transformation to *display*.
 
 .. _data-coords:
 
@@ -89,6 +109,7 @@
 :meth:`~matplotlib.axes.Axes.set_ylim` methods.  For example, in the figure
 below, the data limits stretch from 0 to 10 on the x-axis, and -1 to 1 on the
 y-axis.
+
 """
 
 import numpy as np
diff --git a/tutorials/colors/colorbar_only.py b/tutorials/colors/colorbar_only.py
index daa44b752085..ce48ec50c26b 100644
--- a/tutorials/colors/colorbar_only.py
+++ b/tutorials/colors/colorbar_only.py
@@ -77,8 +77,7 @@
 # `~.Figure.colorbar`. For the out-of-range values to display on the colorbar
 # without using the *extend* keyword with
 # `.colors.BoundaryNorm`, we have to use the *extend* keyword argument directly
-# in the colorbar call, and supply an additional boundary on each end of the
-# range.  Here we also
+# in the colorbar call.  Here we also
 # use the spacing argument to make
 # the length of each colorbar segment proportional to its corresponding
 # interval.
@@ -94,7 +93,6 @@
 fig.colorbar(
     mpl.cm.ScalarMappable(cmap=cmap, norm=norm),
     cax=ax,
-    boundaries=[0] + bounds + [13],  # Adding values for extensions.
     extend='both',
     ticks=bounds,
     spacing='proportional',
@@ -121,7 +119,6 @@
 fig.colorbar(
     mpl.cm.ScalarMappable(cmap=cmap, norm=norm),
     cax=ax,
-    boundaries=[-10] + bounds + [10],
     extend='both',
     extendfrac='auto',
     ticks=bounds,
diff --git a/tutorials/colors/colormap-manipulation.py b/tutorials/colors/colormap-manipulation.py
index 19e66551e07a..8b2cbc784bc0 100644
--- a/tutorials/colors/colormap-manipulation.py
+++ b/tutorials/colors/colormap-manipulation.py
@@ -4,7 +4,7 @@
 ********************************
 
 Matplotlib has a number of built-in colormaps accessible via
-`.matplotlib.cm.get_cmap`.  There are also external libraries like
+`.matplotlib.colormaps`.  There are also external libraries like
 palettable_ that have many extra colormaps.
 
 .. _palettable: https://jiffyclub.github.io/palettable/
@@ -24,19 +24,19 @@
 ============================================
 
 First, getting a named colormap, most of which are listed in
-:doc:`/tutorials/colors/colormaps`, may be done using
-`.matplotlib.cm.get_cmap`, which returns a colormap object.
-The second argument gives the size of the list of colors used to define the
-colormap, and below we use a modest value of 8 so there are not a lot of
-values to look at.
+:doc:`/tutorials/colors/colormaps`, may be done using `.matplotlib.colormaps`,
+which returns a colormap object.  The length of the list of colors used
+internally to define the colormap can be adjusted via `.Colormap.resampled`.
+Below we use a modest value of 8 so there are not a lot of values to look at.
+
 """
 
 import numpy as np
 import matplotlib.pyplot as plt
-from matplotlib import cm
+import matplotlib as mpl
 from matplotlib.colors import ListedColormap, LinearSegmentedColormap
 
-viridis = cm.get_cmap('viridis', 8)
+viridis = mpl.colormaps['viridis'].resampled(8)
 
 ##############################################################################
 # The object ``viridis`` is a callable, that when passed a float between
@@ -48,7 +48,7 @@
 # ListedColormap
 # --------------
 #
-# `.ListedColormap` s store their color values in a ``.colors`` attribute.
+# `.ListedColormap`\s store their color values in a ``.colors`` attribute.
 # The list of colors that comprise the colormap can be directly accessed using
 # the ``colors`` property,
 # or it can be accessed indirectly by calling  ``viridis`` with an array
@@ -68,11 +68,11 @@
 ##############################################################################
 # LinearSegmentedColormap
 # -----------------------
-# `.LinearSegmentedColormap` s do not have a ``.colors`` attribute.
+# `.LinearSegmentedColormap`\s do not have a ``.colors`` attribute.
 # However, one may still call the colormap with an integer array, or with a
 # float array between 0 and 1.
 
-copper = cm.get_cmap('copper', 8)
+copper = mpl.colormaps['copper'].resampled(8)
 
 print('copper(range(8))', copper(range(8)))
 print('copper(np.linspace(0, 1, 8))', copper(np.linspace(0, 1, 8)))
@@ -114,7 +114,7 @@ def plot_examples(colormaps):
 
 ##############################################################################
 # In fact, that list may contain any valid
-# :doc:`matplotlib color specification </tutorials/colors/colors>`.
+# :doc:`Matplotlib color specification </tutorials/colors/colors>`.
 # Particularly useful for creating custom colormaps are Nx4 numpy arrays.
 # Because with the variety of numpy operations that we can do on a such an
 # array, carpentry of new colormaps from existing colormaps become quite
@@ -123,7 +123,7 @@ def plot_examples(colormaps):
 # For example, suppose we want to make the first 25 entries of a 256-length
 # "viridis" colormap pink for some reason:
 
-viridis = cm.get_cmap('viridis', 256)
+viridis = mpl.colormaps['viridis'].resampled(256)
 newcolors = viridis(np.linspace(0, 1, 256))
 pink = np.array([248/256, 24/256, 148/256, 1])
 newcolors[:25, :] = pink
@@ -132,19 +132,21 @@ def plot_examples(colormaps):
 plot_examples([viridis, newcmp])
 
 ##############################################################################
-# We can easily reduce the dynamic range of a colormap; here we choose the
-# middle 0.5 of the colormap.  However, we need to interpolate from a larger
-# colormap, otherwise the new colormap will have repeated values.
-
-viridis_big = cm.get_cmap('viridis', 512)
-newcmp = ListedColormap(viridis_big(np.linspace(0.25, 0.75, 256)))
+# We can reduce the dynamic range of a colormap; here we choose the
+# middle half of the colormap.  Note, however, that because viridis is a
+# listed colormap, we will end up with 128 discrete values instead of the 256
+# values that were in the original colormap. This method does not interpolate
+# in color-space to add new colors.
+
+viridis_big = mpl.colormaps['viridis']
+newcmp = ListedColormap(viridis_big(np.linspace(0.25, 0.75, 128)))
 plot_examples([viridis, newcmp])
 
 ##############################################################################
 # and we can easily concatenate two colormaps:
 
-top = cm.get_cmap('Oranges_r', 128)
-bottom = cm.get_cmap('Blues', 128)
+top = mpl.colormaps['Oranges_r'].resampled(128)
+bottom = mpl.colormaps['Blues'].resampled(128)
 
 newcolors = np.vstack((top(np.linspace(0, 1, 128)),
                        bottom(np.linspace(0, 1, 128))))
@@ -168,7 +170,7 @@ def plot_examples(colormaps):
 # Creating linear segmented colormaps
 # ===================================
 #
-# `.LinearSegmentedColormap` class specifies colormaps using anchor points
+# The `.LinearSegmentedColormap` class specifies colormaps using anchor points
 # between which RGB(A) values are interpolated.
 #
 # The format to specify these colormaps allows discontinuities at the anchor
@@ -177,7 +179,7 @@ def plot_examples(colormaps):
 # ``yleft[i]`` and ``yright[i]`` are the values of the color on either
 # side of the anchor point.
 #
-# If there are no discontinuities, then ``yleft[i]=yright[i]``:
+# If there are no discontinuities, then ``yleft[i] == yright[i]``:
 
 cdict = {'red':   [[0.0,  0.0, 0.0],
                    [0.5,  1.0, 1.0],
@@ -221,9 +223,10 @@ def plot_linearmap(cdict):
 #
 # In the example below there is a discontinuity in red at 0.5.  The
 # interpolation between 0 and 0.5 goes from 0.3 to 1, and between 0.5 and 1
-# it goes from 0.9 to 1.  Note that red[0, 1], and red[2, 2] are both
-# superfluous to the interpolation because red[0, 1] is the value to the
-# left of 0, and red[2, 2] is the value to the right of 1.0.
+# it goes from 0.9 to 1.  Note that ``red[0, 1]``, and ``red[2, 2]`` are both
+# superfluous to the interpolation because ``red[0, 1]`` (i.e., ``yleft[0]``)
+# is the value to the left of 0, and ``red[2, 2]`` (i.e., ``yright[2]``) is the
+# value to the right of 1, which are outside the color mapping domain.
 
 cdict['red'] = [[0.0,  0.0, 0.3],
                 [0.5,  1.0, 0.9],
@@ -234,7 +237,7 @@ def plot_linearmap(cdict):
 # Directly creating a segmented colormap from a list
 # --------------------------------------------------
 #
-# The above described is a very versatile approach, but admittedly a bit
+# The approach described above is very versatile, but admittedly a bit
 # cumbersome to implement. For some basic cases, the use of
 # `.LinearSegmentedColormap.from_list` may be easier. This creates a segmented
 # colormap with equal spacings from a supplied list of colors.
@@ -243,8 +246,8 @@ def plot_linearmap(cdict):
 cmap1 = LinearSegmentedColormap.from_list("mycmap", colors)
 
 #############################################################################
-# If desired, the nodes of the colormap can be given as numbers
-# between 0 and 1. E.g. one could have the reddish part take more space in the
+# If desired, the nodes of the colormap can be given as numbers between 0 and
+# 1. For example, one could have the reddish part take more space in the
 # colormap.
 
 nodes = [0.0, 0.4, 0.8, 1.0]
@@ -252,21 +255,59 @@ def plot_linearmap(cdict):
 
 plot_examples([cmap1, cmap2])
 
+#############################################################################
+# .. _reversing-colormap:
+#
+# Reversing a colormap
+# ====================
+#
+# `.Colormap.reversed` creates a new colormap that is a reversed version of
+# the original colormap.
+
+colors = ["#ffffcc", "#a1dab4", "#41b6c4", "#2c7fb8", "#253494"]
+my_cmap = ListedColormap(colors, name="my_cmap")
+
+my_cmap_r = my_cmap.reversed()
+
+plot_examples([my_cmap, my_cmap_r])
+# %%
+# If no name is passed in, ``.reversed`` also names the copy by
+# :ref:`appending '_r' <registering-colormap>` to the original colormap's
+# name.
+
+##############################################################################
+# .. _registering-colormap:
+#
+# Registering a colormap
+# ======================
+#
+# Colormaps can be added to the `matplotlib.colormaps` list of named colormaps.
+# This allows the colormaps to be accessed by name in plotting functions:
+
+# my_cmap, my_cmap_r from reversing a colormap
+mpl.colormaps.register(cmap=my_cmap)
+mpl.colormaps.register(cmap=my_cmap_r)
+
+data = [[1, 2, 3, 4, 5]]
+
+fig, (ax1, ax2) = plt.subplots(nrows=2)
+
+ax1.imshow(data, cmap='my_cmap')
+ax2.imshow(data, cmap='my_cmap_r')
+
+plt.show()
+
 #############################################################################
 #
-# ------------
+# .. admonition:: References
 #
-# References
-# """"""""""
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
 #
-# The use of the following functions, methods, classes and modules is shown
-# in this example:
-
-import matplotlib
-matplotlib.axes.Axes.pcolormesh
-matplotlib.figure.Figure.colorbar
-matplotlib.colors
-matplotlib.colors.LinearSegmentedColormap
-matplotlib.colors.ListedColormap
-matplotlib.cm
-matplotlib.cm.get_cmap
+#    - `matplotlib.axes.Axes.pcolormesh`
+#    - `matplotlib.figure.Figure.colorbar`
+#    - `matplotlib.colors`
+#    - `matplotlib.colors.LinearSegmentedColormap`
+#    - `matplotlib.colors.ListedColormap`
+#    - `matplotlib.cm`
+#    - `matplotlib.colormaps`
diff --git a/tutorials/colors/colormapnorms.py b/tutorials/colors/colormapnorms.py
index 41aa6310949a..0da22908b326 100644
--- a/tutorials/colors/colormapnorms.py
+++ b/tutorials/colors/colormapnorms.py
@@ -273,11 +273,12 @@
 
 pcm = ax.pcolormesh(longitude, latitude, topo, rasterized=True, norm=divnorm,
                     cmap=terrain_map, shading='auto')
-# Simple geographic plot, set aspect ratio beecause distance between lines of
+# Simple geographic plot, set aspect ratio because distance between lines of
 # longitude depends on latitude.
 ax.set_aspect(1 / np.cos(np.deg2rad(49)))
 ax.set_title('TwoSlopeNorm(x)')
-fig.colorbar(pcm, shrink=0.6)
+cb = fig.colorbar(pcm, shrink=0.6)
+cb.set_ticks([-500, 0, 1000, 2000, 3000, 4000])
 plt.show()
 
 
@@ -312,7 +313,8 @@ def _inverse(x):
 # ----------------------------------------------------------
 #
 # The `.TwoSlopeNorm` described above makes a useful example for
-# defining your own norm.
+# defining your own norm.  Note for the colorbar to work, you must
+# define an inverse for your norm:
 
 
 class MidpointNormalize(colors.Normalize):
@@ -323,8 +325,14 @@ def __init__(self, vmin=None, vmax=None, vcenter=None, clip=False):
     def __call__(self, value, clip=None):
         # I'm ignoring masked values and all kinds of edge cases to make a
         # simple example...
-        x, y = [self.vmin, self.vcenter, self.vmax], [0, 0.5, 1]
-        return np.ma.masked_array(np.interp(value, x, y))
+        # Note also that we must extrapolate beyond vmin/vmax
+        x, y = [self.vmin, self.vcenter, self.vmax], [0, 0.5, 1.]
+        return np.ma.masked_array(np.interp(value, x, y,
+                                            left=-np.inf, right=np.inf))
+
+    def inverse(self, value):
+        y, x = [self.vmin, self.vcenter, self.vmax], [0, 0.5, 1]
+        return np.interp(value, x, y, left=-np.inf, right=np.inf)
 
 
 fig, ax = plt.subplots()
@@ -334,5 +342,7 @@ def __call__(self, value, clip=None):
                     cmap=terrain_map, shading='auto')
 ax.set_aspect(1 / np.cos(np.deg2rad(49)))
 ax.set_title('Custom norm')
-fig.colorbar(pcm, shrink=0.6, extend='both')
+cb = fig.colorbar(pcm, shrink=0.6, extend='both')
+cb.set_ticks([-500, 0, 1000, 2000, 3000, 4000])
+
 plt.show()
diff --git a/tutorials/colors/colormaps.py b/tutorials/colors/colormaps.py
index f8764a6a7367..2868a15079c7 100644
--- a/tutorials/colors/colormaps.py
+++ b/tutorials/colors/colormaps.py
@@ -4,8 +4,9 @@
 ********************************
 
 Matplotlib has a number of built-in colormaps accessible via
-`.matplotlib.cm.get_cmap`.  There are also external libraries like
-[palettable]_ and [colorcet]_ that have many extra colormaps.
+`.matplotlib.colormaps`.  There are also external libraries that
+have many extra colormaps, which can be viewed in the
+`Third-party colormaps`_ section of the Matplotlib documentation.
 Here we briefly discuss how to choose between the many options.  For
 help on creating your own colormaps, see
 :doc:`/tutorials/colors/colormap-manipulation`.
@@ -32,8 +33,9 @@
 perceives changes in the lightness parameter as changes in the data
 much better than, for example, changes in hue. Therefore, colormaps
 which have monotonically increasing lightness through the colormap
-will be better interpreted by the viewer. A wonderful example of
-perceptually uniform colormaps is [colorcet]_.
+will be better interpreted by the viewer. Wonderful examples of
+perceptually uniform colormaps can be found in the
+`Third-party colormaps`_ section as well.
 
 Color can be represented in 3D space in various ways. One way to represent color
 is using CIELAB. In CIELAB, color space is represented by lightness,
@@ -45,6 +47,8 @@
 is from [IBM]_.
 
 
+.. _color-colormaps_reference:
+
 Classes of colormaps
 ====================
 
@@ -76,11 +80,41 @@
 import numpy as np
 import matplotlib as mpl
 import matplotlib.pyplot as plt
-from matplotlib import cm
 from colorspacious import cspace_converter
-from collections import OrderedDict
 
-cmaps = OrderedDict()
+
+###############################################################################
+#
+# First, we'll show the range of each colormap. Note that some seem
+# to change more "quickly" than others.
+
+cmaps = {}
+
+gradient = np.linspace(0, 1, 256)
+gradient = np.vstack((gradient, gradient))
+
+
+def plot_color_gradients(category, cmap_list):
+    # Create figure and adjust figure height to number of colormaps
+    nrows = len(cmap_list)
+    figh = 0.35 + 0.15 + (nrows + (nrows - 1) * 0.1) * 0.22
+    fig, axs = plt.subplots(nrows=nrows + 1, figsize=(6.4, figh))
+    fig.subplots_adjust(top=1 - 0.35 / figh, bottom=0.15 / figh,
+                        left=0.2, right=0.99)
+    axs[0].set_title(f'{category} colormaps', fontsize=14)
+
+    for ax, name in zip(axs, cmap_list):
+        ax.imshow(gradient, aspect='auto', cmap=mpl.colormaps[name])
+        ax.text(-0.01, 0.5, name, va='center', ha='right', fontsize=10,
+                transform=ax.transAxes)
+
+    # Turn off *all* ticks & spines, not just the ones with colormaps.
+    for ax in axs:
+        ax.set_axis_off()
+
+    # Save colormap list for later.
+    cmaps[category] = cmap_list
+
 
 ###############################################################################
 # Sequential
@@ -94,13 +128,15 @@
 # amongst the colormaps: some are approximately linear in :math:`L^*` and others
 # are more curved.
 
-cmaps['Perceptually Uniform Sequential'] = [
-            'viridis', 'plasma', 'inferno', 'magma', 'cividis']
+plot_color_gradients('Perceptually Uniform Sequential',
+                     ['viridis', 'plasma', 'inferno', 'magma', 'cividis'])
+
+###############################################################################
 
-cmaps['Sequential'] = [
-            'Greys', 'Purples', 'Blues', 'Greens', 'Oranges', 'Reds',
-            'YlOrBr', 'YlOrRd', 'OrRd', 'PuRd', 'RdPu', 'BuPu',
-            'GnBu', 'PuBu', 'YlGnBu', 'PuBuGn', 'BuGn', 'YlGn']
+plot_color_gradients('Sequential',
+                     ['Greys', 'Purples', 'Blues', 'Greens', 'Oranges', 'Reds',
+                      'YlOrBr', 'YlOrRd', 'OrRd', 'PuRd', 'RdPu', 'BuPu',
+                      'GnBu', 'PuBu', 'YlGnBu', 'PuBuGn', 'BuGn', 'YlGn'])
 
 ###############################################################################
 # Sequential2
@@ -114,10 +150,10 @@
 # banding of the data in those values in the colormap (see [mycarta-banding]_ for
 # an excellent example of this).
 
-cmaps['Sequential (2)'] = [
-            'binary', 'gist_yarg', 'gist_gray', 'gray', 'bone', 'pink',
-            'spring', 'summer', 'autumn', 'winter', 'cool', 'Wistia',
-            'hot', 'afmhot', 'gist_heat', 'copper']
+plot_color_gradients('Sequential (2)',
+                     ['binary', 'gist_yarg', 'gist_gray', 'gray', 'bone',
+                      'pink', 'spring', 'summer', 'autumn', 'winter', 'cool',
+                      'Wistia', 'hot', 'afmhot', 'gist_heat', 'copper'])
 
 ###############################################################################
 # Diverging
@@ -130,9 +166,9 @@
 # measures, BrBG and RdBu are good options. coolwarm is a good option, but it
 # doesn't span a wide range of :math:`L^*` values (see grayscale section below).
 
-cmaps['Diverging'] = [
-            'PiYG', 'PRGn', 'BrBG', 'PuOr', 'RdGy', 'RdBu',
-            'RdYlBu', 'RdYlGn', 'Spectral', 'coolwarm', 'bwr', 'seismic']
+plot_color_gradients('Diverging',
+                     ['PiYG', 'PRGn', 'BrBG', 'PuOr', 'RdGy', 'RdBu', 'RdYlBu',
+                      'RdYlGn', 'Spectral', 'coolwarm', 'bwr', 'seismic'])
 
 ###############################################################################
 # Cyclic
@@ -152,7 +188,7 @@
 # for viewers to see perceptually. See an extension on this idea at
 # [mycarta-jet]_.
 
-cmaps['Cyclic'] = ['twilight', 'twilight_shifted', 'hsv']
+plot_color_gradients('Cyclic', ['twilight', 'twilight_shifted', 'hsv'])
 
 ###############################################################################
 # Qualitative
@@ -163,9 +199,10 @@
 # the place throughout the colormap, and are clearly not monotonically increasing.
 # These would not be good options for use as perceptual colormaps.
 
-cmaps['Qualitative'] = ['Pastel1', 'Pastel2', 'Paired', 'Accent',
-                        'Dark2', 'Set1', 'Set2', 'Set3',
-                        'tab10', 'tab20', 'tab20b', 'tab20c']
+plot_color_gradients('Qualitative',
+                     ['Pastel1', 'Pastel2', 'Paired', 'Accent', 'Dark2',
+                      'Set1', 'Set2', 'Set3', 'tab10', 'tab20', 'tab20b',
+                      'tab20c'])
 
 ###############################################################################
 # Miscellaneous
@@ -187,43 +224,12 @@
 # poor choice for representing data for viewers to see perceptually. See an
 # extension on this idea at [mycarta-jet]_ and [turbo]_.
 
-cmaps['Miscellaneous'] = [
-            'flag', 'prism', 'ocean', 'gist_earth', 'terrain', 'gist_stern',
-            'gnuplot', 'gnuplot2', 'CMRmap', 'cubehelix', 'brg',
-            'gist_rainbow', 'rainbow', 'jet', 'turbo', 'nipy_spectral',
-            'gist_ncar']
-
-###############################################################################
-# .. _color-colormaps_reference:
-#
-# First, we'll show the range of each colormap. Note that some seem
-# to change more "quickly" than others.
 
-gradient = np.linspace(0, 1, 256)
-gradient = np.vstack((gradient, gradient))
-
-
-def plot_color_gradients(cmap_category, cmap_list):
-    # Create figure and adjust figure height to number of colormaps
-    nrows = len(cmap_list)
-    figh = 0.35 + 0.15 + (nrows + (nrows - 1) * 0.1) * 0.22
-    fig, axs = plt.subplots(nrows=nrows + 1, figsize=(6.4, figh))
-    fig.subplots_adjust(top=1 - 0.35 / figh, bottom=0.15 / figh,
-                        left=0.2, right=0.99)
-    axs[0].set_title(cmap_category + ' colormaps', fontsize=14)
-
-    for ax, name in zip(axs, cmap_list):
-        ax.imshow(gradient, aspect='auto', cmap=plt.get_cmap(name))
-        ax.text(-0.01, 0.5, name, va='center', ha='right', fontsize=10,
-                transform=ax.transAxes)
-
-    # Turn off *all* ticks & spines, not just the ones with colormaps.
-    for ax in axs:
-        ax.set_axis_off()
-
-
-for cmap_category, cmap_list in cmaps.items():
-    plot_color_gradients(cmap_category, cmap_list)
+plot_color_gradients('Miscellaneous',
+                     ['flag', 'prism', 'ocean', 'gist_earth', 'terrain',
+                      'gist_stern', 'gnuplot', 'gnuplot2', 'CMRmap',
+                      'cubehelix', 'brg', 'gist_rainbow', 'rainbow', 'jet',
+                      'turbo', 'nipy_spectral', 'gist_ncar'])
 
 plt.show()
 
@@ -270,13 +276,13 @@ def plot_color_gradients(cmap_category, cmap_list):
 
             # Get RGB values for colormap and convert the colormap in
             # CAM02-UCS colorspace.  lab[0, :, 0] is the lightness.
-            rgb = cm.get_cmap(cmap)(x)[np.newaxis, :, :3]
+            rgb = mpl.colormaps[cmap](x)[np.newaxis, :, :3]
             lab = cspace_converter("sRGB1", "CAM02-UCS")(rgb)
 
             # Plot colormap L values.  Do separately for each category
             # so each plot can be pretty.  To make scatter markers change
             # color along plot:
-            # http://stackoverflow.com/questions/8202605/
+            # https://stackoverflow.com/q/8202605/
 
             if cmap_category == 'Sequential':
                 # These colormaps all start at high lightness but we want them
@@ -373,14 +379,14 @@ def plot_color_gradients(cmap_category, cmap_list):
     for ax, name in zip(axs, cmap_list):
 
         # Get RGB values for colormap.
-        rgb = cm.get_cmap(plt.get_cmap(name))(x)[np.newaxis, :, :3]
+        rgb = mpl.colormaps[name](x)[np.newaxis, :, :3]
 
         # Get colormap in CAM02-UCS colorspace. We want the lightness.
         lab = cspace_converter("sRGB1", "CAM02-UCS")(rgb)
         L = lab[0, :, 0]
         L = np.float32(np.vstack((L, L, L)))
 
-        ax[0].imshow(gradient, aspect='auto', cmap=plt.get_cmap(name))
+        ax[0].imshow(gradient, aspect='auto', cmap=mpl.colormaps[name])
         ax[1].imshow(L, aspect='auto', cmap='binary_r', vmin=0., vmax=100.)
         pos = list(ax[0].get_position().bounds)
         x_text = pos[0] - 0.01
@@ -414,15 +420,14 @@ def plot_color_gradients(cmap_category, cmap_list):
 # References
 # ==========
 #
-# .. [colorcet] https://colorcet.pyviz.org
+# .. _Third-party colormaps: https://matplotlib.org/mpl-third-party/#colormaps-and-styles
 # .. [Ware] http://ccom.unh.edu/sites/default/files/publications/Ware_1988_CGA_Color_sequences_univariate_maps.pdf
 # .. [Moreland] http://www.kennethmoreland.com/color-maps/ColorMapsExpanded.pdf
 # .. [list-colormaps] https://gist.github.com/endolith/2719900#id7
 # .. [mycarta-banding] https://mycarta.wordpress.com/2012/10/14/the-rainbow-is-deadlong-live-the-rainbow-part-4-cie-lab-heated-body/
 # .. [mycarta-jet] https://mycarta.wordpress.com/2012/10/06/the-rainbow-is-deadlong-live-the-rainbow-part-3/
 # .. [kovesi-colormaps] https://arxiv.org/abs/1509.03700
-# .. [bw] http://www.tannerhelland.com/3643/grayscale-image-algorithm-vb6/
+# .. [bw] https://tannerhelland.com/3643/grayscale-image-algorithm-vb6/
 # .. [colorblindness] http://www.color-blindness.com/
 # .. [IBM] https://doi.org/10.1109/VISUAL.1995.480803
-# .. [palettable] https://jiffyclub.github.io/palettable/
 # .. [turbo] https://ai.googleblog.com/2019/08/turbo-improved-rainbow-colormap-for.html
diff --git a/tutorials/colors/colors.py b/tutorials/colors/colors.py
index dac7b800e47a..d4b0df04963d 100644
--- a/tutorials/colors/colors.py
+++ b/tutorials/colors/colors.py
@@ -3,8 +3,7 @@
 Specifying Colors
 *****************
 
-Matplotlib recognizes the following formats in the table below to specify a
-color.
+Matplotlib recognizes the following formats to specify a color.
 
 +--------------------------------------+--------------------------------------+
 | Format                               | Example                              |
@@ -20,18 +19,20 @@
 | equivalent hex shorthand of          | - ``'#fb1'`` as ``'#ffbb11'``        |
 | duplicated characters.               |                                      |
 +--------------------------------------+--------------------------------------+
-| String representation of float value | - ``'0.8'`` as light gray            |
-| in closed interval ``[0, 1]`` for    | - ``'0'`` as black                   |
-| black and white, respectively.       | - ``'1'`` as white                   |
+| String representation of float value | - ``'0'`` as black                   |
+| in closed interval ``[0, 1]`` for    | - ``'1'`` as white                   |
+| grayscale values.                    | - ``'0.8'`` as light gray            |
 +--------------------------------------+--------------------------------------+
 | Single character shorthand notation  | - ``'b'`` as blue                    |
-| for shades of colors.                | - ``'g'`` as green                   |
+| for some basic colors.               | - ``'g'`` as green                   |
 |                                      | - ``'r'`` as red                     |
-| .. note:: The colors green, cyan,    | - ``'c'`` as cyan                    |
-|           magenta, and yellow do not | - ``'m'`` as magenta                 |
-|           coincide with X11/CSS4     | - ``'y'`` as yellow                  |
-|           colors.                    | - ``'k'`` as black                   |
-|                                      | - ``'w'`` as white                   |
+| .. note::                            | - ``'c'`` as cyan                    |
+|    The colors green, cyan, magenta,  | - ``'m'`` as magenta                 |
+|    and yellow do not coincide with   | - ``'y'`` as yellow                  |
+|    X11/CSS4 colors. Their particular | - ``'k'`` as black                   |
+|    shades were chosen for better     | - ``'w'`` as white                   |
+|    visibility of colored lines       |                                      |
+|    against typical backgrounds.      |                                      |
 +--------------------------------------+--------------------------------------+
 | Case-insensitive X11/CSS4 color name | - ``'aquamarine'``                   |
 | with no spaces.                      | - ``'mediumseagreen'``               |
@@ -133,7 +134,7 @@ def demo(sty):
 
 
 demo('default')
-demo('seaborn')
+demo('seaborn-v0_8')
 
 ###############################################################################
 # The first color ``'C0'`` is the title. Each plot uses the second and third
@@ -159,11 +160,11 @@ def demo(sty):
 # The visual below shows name collisions. Color names where color values agree
 # are in bold.
 
-import matplotlib._color_data as mcd
+import matplotlib.colors as mcolors
 import matplotlib.patches as mpatch
 
-overlap = {name for name in mcd.CSS4_COLORS
-           if "xkcd:" + name in mcd.XKCD_COLORS}
+overlap = {name for name in mcolors.CSS4_COLORS
+           if f'xkcd:{name}' in mcolors.XKCD_COLORS}
 
 fig = plt.figure(figsize=[9, 5])
 ax = fig.add_axes([0, 0, 1, 1])
@@ -172,23 +173,30 @@ def demo(sty):
 n_rows = len(overlap) // n_groups + 1
 
 for j, color_name in enumerate(sorted(overlap)):
-    css4 = mcd.CSS4_COLORS[color_name]
-    xkcd = mcd.XKCD_COLORS["xkcd:" + color_name].upper()
+    css4 = mcolors.CSS4_COLORS[color_name]
+    xkcd = mcolors.XKCD_COLORS[f'xkcd:{color_name}'].upper()
+
+    # Pick text colour based on perceived luminance.
+    rgba = mcolors.to_rgba_array([css4, xkcd])
+    luma = 0.299 * rgba[:, 0] + 0.587 * rgba[:, 1] + 0.114 * rgba[:, 2]
+    css4_text_color = 'k' if luma[0] > 0.5 else 'w'
+    xkcd_text_color = 'k' if luma[1] > 0.5 else 'w'
 
     col_shift = (j // n_rows) * 3
     y_pos = j % n_rows
-    text_args = dict(va='center', fontsize=10,
-                     weight='bold' if css4 == xkcd else None)
+    text_args = dict(fontsize=10, weight='bold' if css4 == xkcd else None)
     ax.add_patch(mpatch.Rectangle((0 + col_shift, y_pos), 1, 1, color=css4))
     ax.add_patch(mpatch.Rectangle((1 + col_shift, y_pos), 1, 1, color=xkcd))
-    ax.text(0 + col_shift, y_pos + .5, '  ' + css4, alpha=0.5, **text_args)
-    ax.text(1 + col_shift, y_pos + .5, '  ' + xkcd, alpha=0.5, **text_args)
-    ax.text(2 + col_shift, y_pos + .5, '  ' + color_name, **text_args)
+    ax.text(0.5 + col_shift, y_pos + .7, css4,
+            color=css4_text_color, ha='center', **text_args)
+    ax.text(1.5 + col_shift, y_pos + .7, xkcd,
+            color=xkcd_text_color, ha='center', **text_args)
+    ax.text(2 + col_shift, y_pos + .7, f'  {color_name}', **text_args)
 
 for g in range(n_groups):
     ax.hlines(range(n_rows), 3*g, 3*g + 2.8, color='0.7', linewidth=1)
-    ax.text(0.5 + 3*g, -0.5, 'X11', ha='center', va='center')
-    ax.text(1.5 + 3*g, -0.5, 'xkcd', ha='center', va='center')
+    ax.text(0.5 + 3*g, -0.3, 'X11/CSS4', ha='center')
+    ax.text(1.5 + 3*g, -0.3, 'xkcd', ha='center')
 
 ax.set_xlim(0, 3 * n_groups)
 ax.set_ylim(n_rows, -1)
diff --git a/tutorials/intermediate/arranging_axes.py b/tutorials/intermediate/arranging_axes.py
new file mode 100644
index 000000000000..1ddc793c1055
--- /dev/null
+++ b/tutorials/intermediate/arranging_axes.py
@@ -0,0 +1,412 @@
+"""
+===================================
+Arranging multiple Axes in a Figure
+===================================
+
+Often more than one Axes is wanted on a figure at a time, usually
+organized into a regular grid.  Matplotlib has a variety of tools for
+working with grids of Axes that have evolved over the history of the library.
+Here we will discuss the tools we think users should use most often, the tools
+that underpin how Axes are organized, and mention some of the older tools.
+
+.. note::
+
+    Matplotlib uses *Axes* to refer to the drawing area that contains
+    data, x- and y-axis, ticks, labels, title, etc. See :ref:`figure_parts`
+    for more details.  Another term that is often used is "subplot", which
+    refers to an Axes that is in a grid with other Axes objects.
+
+Overview
+========
+
+Create grid-shaped combinations of Axes
+---------------------------------------
+
+`~matplotlib.pyplot.subplots`
+    The primary function used to create figures and a grid of Axes.  It
+    creates and places all Axes on the figure at once, and returns an
+    object array with handles for the Axes in the grid.  See
+    `.Figure.subplots`.
+
+or
+
+`~matplotlib.pyplot.subplot_mosaic`
+    A simple way to create figures and a grid of Axes, with the added
+    flexibility that Axes can also span rows or columns. The Axes
+    are returned in a labelled dictionary instead of an array.  See also
+    `.Figure.subplot_mosaic` and :doc:`/tutorials/provisional/mosaic`.
+
+Sometimes it is natural to have more than one distinct group of Axes grids,
+in which case Matplotlib has the concept of `.SubFigure`:
+
+`~matplotlib.figure.SubFigure`
+    A virtual figure within a figure.
+
+Underlying tools
+----------------
+
+Underlying these are the concept of a `~.gridspec.GridSpec` and
+a `~.SubplotSpec`:
+
+`~matplotlib.gridspec.GridSpec`
+    Specifies the geometry of the grid that a subplot will be
+    placed. The number of rows and number of columns of the grid
+    need to be set. Optionally, the subplot layout parameters
+    (e.g., left, right, etc.) can be tuned.
+
+`~matplotlib.gridspec.SubplotSpec`
+    Specifies the location of the subplot in the given `.GridSpec`.
+
+Adding single Axes at a time
+----------------------------
+
+The above functions create all Axes in a single function call.  It is also
+possible to add Axes one at a time, and this was originally how Matplotlib
+used to work.  Doing so is generally less elegant and flexible, though
+sometimes useful for interactive work or to place an Axes in a custom
+location:
+
+`~matplotlib.figure.Figure.add_axes`
+    Adds a single axes at a location specified by
+    ``[left, bottom, width, height]`` in fractions of figure width or height.
+
+`~matplotlib.pyplot.subplot` or `.Figure.add_subplot`
+    Adds a single subplot on a figure, with 1-based indexing (inherited from
+    Matlab).  Columns and rows can be spanned by specifying a range of grid
+    cells.
+
+`~matplotlib.pyplot.subplot2grid`
+    Similar to `.pyplot.subplot`, but uses 0-based indexing and two-d python
+    slicing to choose cells.
+
+.. redirect-from:: /tutorials/intermediate/gridspec
+
+"""
+############################################################################
+# High-level methods for making grids
+# ===================================
+#
+# Basic 2x2 grid
+# --------------
+#
+# We can create a basic 2-by-2 grid of Axes using
+# `~matplotlib.pyplot.subplots`.  It returns a `~matplotlib.figure.Figure`
+# instance and an array of `~matplotlib.axes.Axes` objects.  The Axes
+# objects can be used to access methods to place artists on the Axes; here
+# we use `~.Axes.annotate`, but other examples could be `~.Axes.plot`,
+# `~.Axes.pcolormesh`, etc.
+
+import matplotlib.pyplot as plt
+import numpy as np
+
+fig, axs = plt.subplots(ncols=2, nrows=2, figsize=(5.5, 3.5),
+                        layout="constrained")
+# add an artist, in this case a nice label in the middle...
+for row in range(2):
+    for col in range(2):
+        axs[row, col].annotate(f'axs[{row}, {col}]', (0.5, 0.5),
+                               transform=axs[row, col].transAxes,
+                               ha='center', va='center', fontsize=18,
+                               color='darkgrey')
+fig.suptitle('plt.subplots()')
+
+##############################################################################
+# We will annotate a lot of Axes, so lets encapsulate the annotation, rather
+# than having that large piece of annotation code every time we need it:
+
+
+def annotate_axes(ax, text, fontsize=18):
+    ax.text(0.5, 0.5, text, transform=ax.transAxes,
+            ha="center", va="center", fontsize=fontsize, color="darkgrey")
+
+
+##############################################################################
+# The same effect can be achieved with `~.pyplot.subplot_mosaic`,
+# but the return type is a dictionary instead of an array, where the user
+# can give the keys useful meanings.  Here we provide two lists, each list
+# representing a row, and each element in the list a key representing the
+# column.
+
+fig, axd = plt.subplot_mosaic([['upper left', 'upper right'],
+                               ['lower left', 'lower right']],
+                              figsize=(5.5, 3.5), layout="constrained")
+for k in axd:
+    annotate_axes(axd[k], f'axd["{k}"]', fontsize=14)
+fig.suptitle('plt.subplot_mosaic()')
+
+#############################################################################
+#
+# Grids of fixed-aspect ratio Axes
+# --------------------------------
+#
+# Fixed-aspect ratio axes are common for images or maps.  However, they
+# present a challenge to layout because two sets of constraints are being
+# imposed on the size of the Axes - that they fit in the figure and that they
+# have a set aspect ratio.  This leads to large gaps between Axes by default:
+#
+
+fig, axs = plt.subplots(2, 2, layout="constrained", figsize=(5.5, 3.5))
+for ax in axs.flat:
+    ax.set_aspect(1)
+fig.suptitle('Fixed aspect Axes')
+
+############################################################################
+# One way to address this is to change the aspect of the figure to be close
+# to the aspect ratio of the Axes, however that requires trial and error.
+# Matplotlib also supplies ``layout="compressed"``, which will work with
+# simple grids to reduce the gaps between Axes.  (The ``mpl_toolkits`` also
+# provides `~.mpl_toolkits.axes_grid1.axes_grid.ImageGrid` to accomplish
+# a similar effect, but with a non-standard Axes class).
+
+fig, axs = plt.subplots(2, 2, layout="compressed", figsize=(5.5, 3.5))
+for ax in axs.flat:
+    ax.set_aspect(1)
+fig.suptitle('Fixed aspect Axes: compressed')
+
+
+############################################################################
+# Axes spanning rows or columns in a grid
+# ---------------------------------------
+#
+# Sometimes we want Axes to span rows or columns of the grid.
+# There are actually multiple ways to accomplish this, but the most
+# convenient is probably to use `~.pyplot.subplot_mosaic` by repeating one
+# of the keys:
+
+fig, axd = plt.subplot_mosaic([['upper left', 'right'],
+                               ['lower left', 'right']],
+                              figsize=(5.5, 3.5), layout="constrained")
+for k in axd:
+    annotate_axes(axd[k], f'axd["{k}"]', fontsize=14)
+fig.suptitle('plt.subplot_mosaic()')
+
+############################################################################
+# See below for the description of how to do the same thing using
+# `~matplotlib.gridspec.GridSpec` or `~matplotlib.pyplot.subplot2grid`.
+#
+# Variable widths or heights in a grid
+# ------------------------------------
+#
+# Both `~.pyplot.subplots` and `~.pyplot.subplot_mosaic` allow the rows
+# in the grid to be different heights, and the columns to be different
+# widths using the *gridspec_kw* keyword argument.
+# Spacing parameters accepted by `~matplotlib.gridspec.GridSpec`
+# can be passed to `~matplotlib.pyplot.subplots` and
+# `~matplotlib.pyplot.subplot_mosaic`:
+
+gs_kw = dict(width_ratios=[1.4, 1], height_ratios=[1, 2])
+fig, axd = plt.subplot_mosaic([['upper left', 'right'],
+                               ['lower left', 'right']],
+                              gridspec_kw=gs_kw, figsize=(5.5, 3.5),
+                              layout="constrained")
+for k in axd:
+    annotate_axes(axd[k], f'axd["{k}"]', fontsize=14)
+fig.suptitle('plt.subplot_mosaic()')
+
+############################################################################
+# Nested Axes layouts
+# -------------------
+#
+# Sometimes it is helpful to have two or more grids of Axes that
+# may not need to be related to one another.  The most simple way to
+# accomplish this is to use `.Figure.subfigures`.  Note that the subfigure
+# layouts are independent, so the Axes spines in each subfigure are not
+# necessarily aligned.  See below for a more verbose way to achieve the same
+# effect with `~.gridspec.GridSpecFromSubplotSpec`.
+
+fig = plt.figure(layout="constrained")
+subfigs = fig.subfigures(1, 2, wspace=0.07, width_ratios=[1.5, 1.])
+axs0 = subfigs[0].subplots(2, 2)
+subfigs[0].set_facecolor('0.9')
+subfigs[0].suptitle('subfigs[0]\nLeft side')
+subfigs[0].supxlabel('xlabel for subfigs[0]')
+
+axs1 = subfigs[1].subplots(3, 1)
+subfigs[1].suptitle('subfigs[1]')
+subfigs[1].supylabel('ylabel for subfigs[1]')
+
+############################################################################
+# It is also possible to nest Axes using `~.pyplot.subplot_mosaic` using
+# nested lists.  This method does not use subfigures, like above, so lacks
+# the ability to add per-subfigure ``suptitle`` and ``supxlabel``, etc.
+# Rather it is a convenience wrapper around the `~.SubplotSpec.subgridspec`
+# method described below.
+
+inner = [['innerA'],
+         ['innerB']]
+outer = [['upper left',  inner],
+          ['lower left', 'lower right']]
+
+fig, axd = plt.subplot_mosaic(outer, layout="constrained")
+for k in axd:
+    annotate_axes(axd[k], f'axd["{k}"]')
+
+############################################################################
+# Low-level and advanced grid methods
+# ===================================
+#
+# Internally, the arrangement of a grid of Axes is controlled by creating
+# instances of `~.GridSpec` and `~.SubplotSpec`. *GridSpec* defines a
+# (possibly non-uniform) grid of cells. Indexing into the *GridSpec* returns
+# a SubplotSpec that covers one or more grid cells, and can be used to
+# specify the location of an Axes.
+#
+# The following examples show how to use low-level methods to arrange Axes
+# using *GridSpec* objects.
+#
+# Basic 2x2 grid
+# --------------
+#
+# We can accomplish a 2x2 grid in the same manner as
+# ``plt.subplots(2, 2)``:
+
+fig = plt.figure(figsize=(5.5, 3.5), layout="constrained")
+spec = fig.add_gridspec(ncols=2, nrows=2)
+
+ax0 = fig.add_subplot(spec[0, 0])
+annotate_axes(ax0, 'ax0')
+
+ax1 = fig.add_subplot(spec[0, 1])
+annotate_axes(ax1, 'ax1')
+
+ax2 = fig.add_subplot(spec[1, 0])
+annotate_axes(ax2, 'ax2')
+
+ax3 = fig.add_subplot(spec[1, 1])
+annotate_axes(ax3, 'ax3')
+
+fig.suptitle('Manually added subplots using add_gridspec')
+
+##############################################################################
+# Axes spanning rows or grids in a grid
+# -------------------------------------
+#
+# We can index the *spec* array using `NumPy slice syntax
+# <https://numpy.org/doc/stable/reference/arrays.indexing.html>`_
+# and the new Axes will span the slice.  This would be the same
+# as ``fig, axd = plt.subplot_mosaic([['ax0', 'ax0'], ['ax1', 'ax2']], ...)``:
+
+fig = plt.figure(figsize=(5.5, 3.5), layout="constrained")
+spec = fig.add_gridspec(2, 2)
+
+ax0 = fig.add_subplot(spec[0, :])
+annotate_axes(ax0, 'ax0')
+
+ax10 = fig.add_subplot(spec[1, 0])
+annotate_axes(ax10, 'ax10')
+
+ax11 = fig.add_subplot(spec[1, 1])
+annotate_axes(ax11, 'ax11')
+
+fig.suptitle('Manually added subplots, spanning a column')
+
+###############################################################################
+# Manual adjustments to a *GridSpec* layout
+# -----------------------------------------
+#
+# When a  *GridSpec* is explicitly used, you can adjust the layout
+# parameters of subplots that are created from the  *GridSpec*.  Note this
+# option is not compatible with ``constrained_layout`` or
+# `.Figure.tight_layout` which both ignore *left* and *right* and adjust
+# subplot sizes to fill the figure.  Usually such manual placement
+# requires iterations to make the Axes tick labels not overlap the Axes.
+#
+# These spacing parameters can also be passed to `~.pyplot.subplots` and
+# `~.pyplot.subplot_mosaic` as the *gridspec_kw* argument.
+
+fig = plt.figure(layout=None, facecolor='0.9')
+gs = fig.add_gridspec(nrows=3, ncols=3, left=0.05, right=0.75,
+                      hspace=0.1, wspace=0.05)
+ax0 = fig.add_subplot(gs[:-1, :])
+annotate_axes(ax0, 'ax0')
+ax1 = fig.add_subplot(gs[-1, :-1])
+annotate_axes(ax1, 'ax1')
+ax2 = fig.add_subplot(gs[-1, -1])
+annotate_axes(ax2, 'ax2')
+fig.suptitle('Manual gridspec with right=0.75')
+
+###############################################################################
+# Nested layouts with SubplotSpec
+# -------------------------------
+#
+# You can create nested layout similar to `~.Figure.subfigures` using
+# `~.gridspec.SubplotSpec.subgridspec`.  Here the Axes spines *are*
+# aligned.
+#
+# Note this is also available from the more verbose
+# `.gridspec.GridSpecFromSubplotSpec`.
+
+fig = plt.figure(layout="constrained")
+gs0 = fig.add_gridspec(1, 2)
+
+gs00 = gs0[0].subgridspec(2, 2)
+gs01 = gs0[1].subgridspec(3, 1)
+
+for a in range(2):
+    for b in range(2):
+        ax = fig.add_subplot(gs00[a, b])
+        annotate_axes(ax, f'axLeft[{a}, {b}]', fontsize=10)
+        if a == 1 and b == 1:
+            ax.set_xlabel('xlabel')
+for a in range(3):
+    ax = fig.add_subplot(gs01[a])
+    annotate_axes(ax, f'axRight[{a}, {b}]')
+    if a == 2:
+        ax.set_ylabel('ylabel')
+
+fig.suptitle('nested gridspecs')
+
+###############################################################################
+# Here's a more sophisticated example of nested *GridSpec*: We create an outer
+# 4x4 grid with each cell containing an inner 3x3 grid of Axes. We outline
+# the outer 4x4 grid by hiding appropriate spines in each of the inner 3x3
+# grids.
+
+
+def squiggle_xy(a, b, c, d, i=np.arange(0.0, 2*np.pi, 0.05)):
+    return np.sin(i*a)*np.cos(i*b), np.sin(i*c)*np.cos(i*d)
+
+fig = plt.figure(figsize=(8, 8), constrained_layout=False)
+outer_grid = fig.add_gridspec(4, 4, wspace=0, hspace=0)
+
+for a in range(4):
+    for b in range(4):
+        # gridspec inside gridspec
+        inner_grid = outer_grid[a, b].subgridspec(3, 3, wspace=0, hspace=0)
+        axs = inner_grid.subplots()  # Create all subplots for the inner grid.
+        for (c, d), ax in np.ndenumerate(axs):
+            ax.plot(*squiggle_xy(a + 1, b + 1, c + 1, d + 1))
+            ax.set(xticks=[], yticks=[])
+
+# show only the outside spines
+for ax in fig.get_axes():
+    ss = ax.get_subplotspec()
+    ax.spines.top.set_visible(ss.is_first_row())
+    ax.spines.bottom.set_visible(ss.is_last_row())
+    ax.spines.left.set_visible(ss.is_first_col())
+    ax.spines.right.set_visible(ss.is_last_col())
+
+plt.show()
+
+#############################################################################
+#
+# More reading
+# ============
+#
+#  - More details about :doc:`subplot mosaic </tutorials/provisional/mosaic>`.
+#  - More details about :doc:`constrained layout
+#    </tutorials/intermediate/constrainedlayout_guide>`, used to align
+#    spacing in most of these examples.
+#
+# .. admonition:: References
+#
+#    The use of the following functions, methods, classes and modules is shown
+#    in this example:
+#
+#    - `matplotlib.pyplot.subplots`
+#    - `matplotlib.pyplot.subplot_mosaic`
+#    - `matplotlib.figure.Figure.add_gridspec`
+#    - `matplotlib.figure.Figure.add_subplot`
+#    - `matplotlib.gridspec.GridSpec`
+#    - `matplotlib.gridspec.SubplotSpec.subgridspec`
+#    - `matplotlib.gridspec.GridSpecFromSubplotSpec`
diff --git a/tutorials/intermediate/artists.py b/tutorials/intermediate/artists.py
index 71f8463c07f9..0078813f9edd 100644
--- a/tutorials/intermediate/artists.py
+++ b/tutorials/intermediate/artists.py
@@ -79,13 +79,11 @@ class in the Matplotlib API, and the one you will be working with most
     line, = ax.plot(t, s, color='blue', lw=2)
 
 In this example, ``ax`` is the ``Axes`` instance created by the
-``fig.add_subplot`` call above (remember ``Subplot`` is just a
-subclass of ``Axes``) and when you call ``ax.plot``, it creates a
-``Line2D`` instance and adds it to the :attr:`Axes.lines
-<matplotlib.axes.Axes.lines>` list.  In the interactive `IPython
-<https://ipython.org/>`_ session below, you can see that the
-``Axes.lines`` list is length one and contains the same line that was
-returned by the ``line, = ax.plot...`` call:
+``fig.add_subplot`` call above (remember ``Subplot`` is just a subclass of
+``Axes``) and when you call ``ax.plot``, it creates a ``Line2D`` instance and
+adds it to the ``Axes``.  In the interactive `IPython <https://ipython.org/>`_
+session below, you can see that the ``Axes.lines`` list is length one and
+contains the same line that was returned by the ``line, = ax.plot...`` call:
 
 .. sourcecode:: ipython
 
@@ -97,11 +95,10 @@ class in the Matplotlib API, and the one you will be working with most
 
 If you make subsequent calls to ``ax.plot`` (and the hold state is "on"
 which is the default) then additional lines will be added to the list.
-You can remove lines later simply by calling the list methods; either
-of these will work::
+You can remove a line later by calling its ``remove`` method::
 
-    del ax.lines[0]
-    ax.lines.remove(line)  # one or the other, not both!
+    line = ax.lines[0]
+    line.remove()
 
 The Axes also has helper methods to configure and decorate the x-axis
 and y-axis tick, tick labels and axis labels::
@@ -118,6 +115,7 @@ class in the Matplotlib API, and the one you will be working with most
 
 Try creating the figure below.
 """
+# sphinx_gallery_capture_repr = ('__repr__',)
 
 import numpy as np
 import matplotlib.pyplot as plt
@@ -125,8 +123,8 @@ class in the Matplotlib API, and the one you will be working with most
 fig = plt.figure()
 fig.subplots_adjust(top=0.8)
 ax1 = fig.add_subplot(211)
-ax1.set_ylabel('volts')
-ax1.set_title('a sine wave')
+ax1.set_ylabel('Voltage [V]')
+ax1.set_title('A sine wave')
 
 t = np.arange(0.0, 1.0, 0.01)
 s = np.sin(2*np.pi*t)
@@ -138,7 +136,7 @@ class in the Matplotlib API, and the one you will be working with most
 ax2 = fig.add_axes([0.15, 0.1, 0.7, 0.3])
 n, bins, patches = ax2.hist(np.random.randn(1000), 50,
                             facecolor='yellow', edgecolor='yellow')
-ax2.set_xlabel('time (s)')
+ax2.set_xlabel('Time [s]')
 
 plt.show()
 
@@ -313,7 +311,7 @@ class in the Matplotlib API, and the one you will be working with most
 # directly from the Axes list, but rather use the
 # :meth:`~matplotlib.figure.Figure.add_subplot` and
 # :meth:`~matplotlib.figure.Figure.add_axes` methods to insert, and the
-# :meth:`~matplotlib.figure.Figure.delaxes` method to delete.  You are
+# `Axes.remove <matplotlib.artist.Artist.remove>` method to delete.  You are
 # free however, to iterate over the list of Axes or index into it to get
 # access to ``Axes`` instances you want to customize.  Here is an
 # example which turns all the Axes grids on::
@@ -356,7 +354,7 @@ class in the Matplotlib API, and the one you will be working with most
 # images           A list of `.FigureImage` patches -
 #                  useful for raw pixel display
 # legends          A list of Figure `.Legend` instances
-#                  (different from ``Axes.legends``)
+#                  (different from ``Axes.get_legend()``)
 # lines            A list of Figure `.Line2D` instances
 #                  (rarely used, see ``Axes.lines``)
 # patches          A list of Figure `.Patch`\s
@@ -386,11 +384,10 @@ class in the Matplotlib API, and the one you will be working with most
 #     rect.set_facecolor('green')
 #
 # When you call a plotting method, e.g., the canonical
-# :meth:`~matplotlib.axes.Axes.plot` and pass in arrays or lists of
-# values, the method will create a :meth:`matplotlib.lines.Line2D`
-# instance, update the line with all the ``Line2D`` properties passed as
-# keyword arguments, add the line to the :attr:`Axes.lines
-# <matplotlib.axes.Axes.lines>` container, and returns it to you:
+# `~matplotlib.axes.Axes.plot` and pass in arrays or lists of values, the
+# method will create a `matplotlib.lines.Line2D` instance, update the line with
+# all the ``Line2D`` properties passed as keyword arguments, add the line to
+# the ``Axes``, and return it to you:
 #
 # .. sourcecode:: ipython
 #
@@ -423,19 +420,20 @@ class in the Matplotlib API, and the one you will be working with most
 #     In [235]: print(len(ax.patches))
 #     Out[235]: 50
 #
-# You should not add objects directly to the ``Axes.lines`` or
-# ``Axes.patches`` lists unless you know exactly what you are doing,
-# because the ``Axes`` needs to do a few things when it creates and adds
-# an object.  It sets the figure and axes property of the ``Artist``, as
-# well as the default ``Axes`` transformation (unless a transformation
-# is set).  It also inspects the data contained in the ``Artist`` to
-# update the data structures controlling auto-scaling, so that the view
-# limits can be adjusted to contain the plotted data.  You can,
-# nonetheless, create objects yourself and add them directly to the
-# ``Axes`` using helper methods like
-# :meth:`~matplotlib.axes.Axes.add_line` and
-# :meth:`~matplotlib.axes.Axes.add_patch`.  Here is an annotated
-# interactive session illustrating what is going on:
+# You should not add objects directly to the ``Axes.lines`` or ``Axes.patches``
+# lists, because the ``Axes`` needs to do a few things when it creates and adds
+# an object:
+#
+# - It sets the ``figure`` and ``axes`` property of the ``Artist``;
+# - It sets the default ``Axes`` transformation (unless one is already set);
+# - It inspects the data contained in the ``Artist`` to update the data
+#   structures controlling auto-scaling, so that the view limits can be
+#   adjusted to contain the plotted data.
+#
+# You can, nonetheless, create objects yourself and add them directly to the
+# ``Axes`` using helper methods like `~matplotlib.axes.Axes.add_line` and
+# `~matplotlib.axes.Axes.add_patch`.  Here is an annotated interactive session
+# illustrating what is going on:
 #
 # .. sourcecode:: ipython
 #
@@ -546,7 +544,7 @@ class in the Matplotlib API, and the one you will be working with most
 # `~.axes.Axes.fill` - shared area           `.Polygon`         ax.patches
 # `~.axes.Axes.hist` - histograms            `.Rectangle`       ax.patches
 # `~.axes.Axes.imshow` - image data          `.AxesImage`       ax.images
-# `~.axes.Axes.legend` - Axes legends        `.Legend`          ax.legends
+# `~.axes.Axes.legend` - Axes legend         `.Legend`          ax.get_legend()
 # `~.axes.Axes.plot` - xy plots              `.Line2D`          ax.lines
 # `~.axes.Axes.scatter` - scatter charts     `.PolyCollection`  ax.collections
 # `~.axes.Axes.text` - text                  `.Text`            ax.texts
@@ -566,26 +564,26 @@ class in the Matplotlib API, and the one you will be working with most
 # the font color of the ``XAxis`` ticklabels using the ``Axes`` helper
 # method::
 #
-#     for label in ax.get_xticklabels():
-#         label.set_color('orange')
+#     ax.tick_params(axis='x', labelcolor='orange')
 #
-# Below is a summary of the Artists that the Axes contains
+# Below is a summary of the Artists that the `~.axes.Axes` contains
 #
 # ==============    =========================================
 # Axes attribute    Description
 # ==============    =========================================
-# artists           A list of `.Artist` instances
+# artists           An `.ArtistList` of `.Artist` instances
 # patch             `.Rectangle` instance for Axes background
-# collections       A list of `.Collection` instances
-# images            A list of `.AxesImage`
-# legends           A list of `.Legend` instances
-# lines             A list of `.Line2D` instances
-# patches           A list of `.Patch` instances
-# texts             A list of `.Text` instances
+# collections       An `.ArtistList` of `.Collection` instances
+# images            An `.ArtistList` of `.AxesImage`
+# lines             An `.ArtistList` of `.Line2D` instances
+# patches           An `.ArtistList` of `.Patch` instances
+# texts             An `.ArtistList` of `.Text` instances
 # xaxis             A `matplotlib.axis.XAxis` instance
 # yaxis             A `matplotlib.axis.YAxis` instance
 # ==============    =========================================
 #
+# The legend can be accessed by `~.axes.Axes.get_legend`,
+#
 # .. _axis-container:
 #
 # Axis containers
@@ -721,6 +719,6 @@ class in the Matplotlib API, and the one you will be working with most
 # dollar signs and colors them green on the right side of the yaxis.
 #
 #
-# .. include:: ../../gallery/pyplots/dollar_ticks.rst
+# .. include:: ../../gallery/ticks/dollar_ticks.rst
 #    :start-after: y axis labels.
-#    :end-before: -------
+#    :end-before: .. admonition:: References
diff --git a/tutorials/intermediate/autoscale.py b/tutorials/intermediate/autoscale.py
index 64cc2e22f014..3b563510aa1f 100644
--- a/tutorials/intermediate/autoscale.py
+++ b/tutorials/intermediate/autoscale.py
@@ -26,7 +26,7 @@
 # -------
 # The default margin around the data limits is 5%:
 
-ax.margins()
+print(ax.margins())
 
 ###############################################################################
 # The margins can be made larger using `~matplotlib.axes.Axes.margins`:
@@ -71,7 +71,7 @@
 # `~matplotlib.axes.Axes.use_sticky_edges`.
 # Artists have a property `.Artist.sticky_edges`, and the values of
 # sticky edges can be changed by writing to ``Artist.sticky_edges.x`` or
-# ``.Artist.sticky_edges.y``.
+# ``Artist.sticky_edges.y``.
 #
 # The following example shows how overriding works and when it is needed.
 
@@ -164,9 +164,9 @@
 
 fig, ax = plt.subplots()
 collection = mpl.collections.StarPolygonCollection(
-    5, 0, [250, ],  # five point star, zero angle, size 250px
+    5, rotation=0, sizes=(250,),  # five point star, zero angle, size 250px
     offsets=np.column_stack([x, y]),  # Set the positions
-    transOffset=ax.transData,  # Propagate transformations of the Axes
+    offset_transform=ax.transData,  # Propagate transformations of the Axes
 )
 ax.add_collection(collection)
 ax.autoscale_view()
diff --git a/tutorials/intermediate/constrainedlayout_guide.py b/tutorials/intermediate/constrainedlayout_guide.py
index 3458667aef4e..3734df1bd5d6 100644
--- a/tutorials/intermediate/constrainedlayout_guide.py
+++ b/tutorials/intermediate/constrainedlayout_guide.py
@@ -14,29 +14,21 @@
 but uses a constraint solver to determine the size of axes that allows
 them to fit.
 
-*constrained_layout* needs to be activated before any axes are added to
-a figure. Two ways of doing so are
+*constrained_layout* typically needs to be activated before any axes are
+added to a figure. Two ways of doing so are
 
 * using the respective argument to :func:`~.pyplot.subplots` or
   :func:`~.pyplot.figure`, e.g.::
 
-      plt.subplots(constrained_layout=True)
+      plt.subplots(layout="constrained")
 
-* activate it via :ref:`rcParams<matplotlib-rcparams>`, like::
+* activate it via :ref:`rcParams<customizing-with-dynamic-rc-settings>`,
+  like::
 
       plt.rcParams['figure.constrained_layout.use'] = True
 
 Those are described in detail throughout the following sections.
 
-.. warning::
-
-    Currently Constrained Layout is **experimental**.  The
-    behaviour and API are subject to change, or the whole functionality
-    may be removed without a deprecation period.  If you *require* your
-    plots to be absolutely reproducible, get the Axes positions after
-    running Constrained Layout and use ``ax.set_position()`` in your code
-    with ``constrained_layout=False``.
-
 Simple Example
 ==============
 
@@ -71,32 +63,32 @@ def example_plot(ax, fontsize=12, hide_labels=False):
         ax.set_ylabel('y-label', fontsize=fontsize)
         ax.set_title('Title', fontsize=fontsize)
 
-
-fig, ax = plt.subplots(constrained_layout=False)
+fig, ax = plt.subplots(layout=None)
 example_plot(ax, fontsize=24)
 
 ###############################################################################
 # To prevent this, the location of axes needs to be adjusted. For
-# subplots, this can be done by adjusting the subplot params
-# (:ref:`howto-subplots-adjust`). However, specifying your figure with the
-# ``constrained_layout=True`` kwarg will do the adjusting automatically.
+# subplots, this can be done manually by adjusting the subplot parameters
+# using `.Figure.subplots_adjust`. However, specifying your figure with the
+# # ``layout="constrained"`` keyword argument will do the adjusting
+# # automatically.
 
-fig, ax = plt.subplots(constrained_layout=True)
+fig, ax = plt.subplots(layout="constrained")
 example_plot(ax, fontsize=24)
 
 ###############################################################################
 # When you have multiple subplots, often you see labels of different
 # axes overlapping each other.
 
-fig, axs = plt.subplots(2, 2, constrained_layout=False)
+fig, axs = plt.subplots(2, 2, layout=None)
 for ax in axs.flat:
     example_plot(ax)
 
 ###############################################################################
-# Specifying ``constrained_layout=True`` in the call to ``plt.subplots``
+# Specifying ``layout="constrained"`` in the call to ``plt.subplots``
 # causes the layout to be properly constrained.
 
-fig, axs = plt.subplots(2, 2, constrained_layout=True)
+fig, axs = plt.subplots(2, 2, layout="constrained")
 for ax in axs.flat:
     example_plot(ax)
 
@@ -112,7 +104,7 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 #
 # .. note::
 #
-#   For the `~.axes.Axes.pcolormesh` kwargs (``pc_kwargs``) we use a
+#   For the `~.axes.Axes.pcolormesh` keyword arguments (``pc_kwargs``) we use a
 #   dictionary. Below we will assign one colorbar to a number of axes each
 #   containing a `~.cm.ScalarMappable`; specifying the norm and colormap
 #   ensures the colorbar is accurate for all the axes.
@@ -121,7 +113,7 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 norm = mcolors.Normalize(vmin=0., vmax=100.)
 # see note above: this makes all pcolormesh calls consistent:
 pc_kwargs = {'rasterized': True, 'cmap': 'viridis', 'norm': norm}
-fig, ax = plt.subplots(figsize=(4, 4), constrained_layout=True)
+fig, ax = plt.subplots(figsize=(4, 4), layout="constrained")
 im = ax.pcolormesh(arr, **pc_kwargs)
 fig.colorbar(im, ax=ax, shrink=0.6)
 
@@ -130,7 +122,7 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 # ``ax`` argument of ``colorbar``, constrained_layout will take space from
 # the specified axes.
 
-fig, axs = plt.subplots(2, 2, figsize=(4, 4), constrained_layout=True)
+fig, axs = plt.subplots(2, 2, figsize=(4, 4), layout="constrained")
 for ax in axs.flat:
     im = ax.pcolormesh(arr, **pc_kwargs)
 fig.colorbar(im, ax=axs, shrink=0.6)
@@ -140,7 +132,7 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 # will steal space appropriately, and leave a gap, but all subplots will
 # still be the same size.
 
-fig, axs = plt.subplots(3, 3, figsize=(4, 4), constrained_layout=True)
+fig, axs = plt.subplots(3, 3, figsize=(4, 4), layout="constrained")
 for ax in axs.flat:
     im = ax.pcolormesh(arr, **pc_kwargs)
 fig.colorbar(im, ax=axs[1:, ][:, 1], shrink=0.8)
@@ -150,9 +142,9 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 # Suptitle
 # =========
 #
-# ``constrained_layout`` can also make room for `~.figure.Figure.suptitle`.
+# ``constrained_layout`` can also make room for `~.Figure.suptitle`.
 
-fig, axs = plt.subplots(2, 2, figsize=(4, 4), constrained_layout=True)
+fig, axs = plt.subplots(2, 2, figsize=(4, 4), layout="constrained")
 for ax in axs.flat:
     im = ax.pcolormesh(arr, **pc_kwargs)
 fig.colorbar(im, ax=axs, shrink=0.6)
@@ -167,14 +159,14 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 # However, constrained-layout does *not* handle legends being created via
 # :meth:`.Figure.legend` (yet).
 
-fig, ax = plt.subplots(constrained_layout=True)
+fig, ax = plt.subplots(layout="constrained")
 ax.plot(np.arange(10), label='This is a plot')
 ax.legend(loc='center left', bbox_to_anchor=(0.8, 0.5))
 
 #############################################
 # However, this will steal space from a subplot layout:
 
-fig, axs = plt.subplots(1, 2, figsize=(4, 2), constrained_layout=True)
+fig, axs = plt.subplots(1, 2, figsize=(4, 2), layout="constrained")
 axs[0].plot(np.arange(10))
 axs[1].plot(np.arange(10), label='This is a plot')
 axs[1].legend(loc='center left', bbox_to_anchor=(0.8, 0.5))
@@ -190,7 +182,7 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 # trigger a draw if we want constrained_layout to adjust the size
 # of the axes before printing.
 
-fig, axs = plt.subplots(1, 2, figsize=(4, 2), constrained_layout=True)
+fig, axs = plt.subplots(1, 2, figsize=(4, 2), layout="constrained")
 
 axs[0].plot(np.arange(10))
 axs[1].plot(np.arange(10), label='This is a plot')
@@ -202,9 +194,14 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 # we want the legend included in the bbox_inches='tight' calcs.
 leg.set_in_layout(True)
 # we don't want the layout to change at this point.
-fig.set_constrained_layout(False)
-fig.savefig('../../doc/_static/constrained_layout_1b.png',
-            bbox_inches='tight', dpi=100)
+fig.set_layout_engine(None)
+try:
+    fig.savefig('../../doc/_static/constrained_layout_1b.png',
+                bbox_inches='tight', dpi=100)
+except FileNotFoundError:
+    # this allows the script to keep going if run interactively and
+    # the directory above doesn't exist
+    pass
 
 #############################################
 # The saved file looks like:
@@ -214,14 +211,20 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 #
 # A better way to get around this awkwardness is to simply
 # use the legend method provided by `.Figure.legend`:
-fig, axs = plt.subplots(1, 2, figsize=(4, 2), constrained_layout=True)
+fig, axs = plt.subplots(1, 2, figsize=(4, 2), layout="constrained")
 axs[0].plot(np.arange(10))
 lines = axs[1].plot(np.arange(10), label='This is a plot')
 labels = [l.get_label() for l in lines]
 leg = fig.legend(lines, labels, loc='center left',
                  bbox_to_anchor=(0.8, 0.5), bbox_transform=axs[1].transAxes)
-fig.savefig('../../doc/_static/constrained_layout_2b.png',
-            bbox_inches='tight', dpi=100)
+try:
+    fig.savefig('../../doc/_static/constrained_layout_2b.png',
+                bbox_inches='tight', dpi=100)
+except FileNotFoundError:
+    # this allows the script to keep going if run interactively and
+    # the directory above doesn't exist
+    pass
+
 
 #############################################
 # The saved file looks like:
@@ -236,13 +239,14 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 #
 # Padding between axes is controlled in the horizontal by *w_pad* and
 # *wspace*, and vertical by *h_pad* and *hspace*.  These can be edited
-# via `~.figure.Figure.set_constrained_layout_pads`.  *w/h_pad* are
+# via `~.layout_engine.ConstrainedLayoutEngine.set`.  *w/h_pad* are
 # the minimum space around the axes in units of inches:
 
-fig, axs = plt.subplots(2, 2, constrained_layout=True)
+fig, axs = plt.subplots(2, 2, layout="constrained")
 for ax in axs.flat:
     example_plot(ax, hide_labels=True)
-fig.set_constrained_layout_pads(w_pad=4 / 72, h_pad=4 / 72, hspace=0, wspace=0)
+fig.get_layout_engine().set(w_pad=4 / 72, h_pad=4 / 72, hspace=0,
+                            wspace=0)
 
 ##########################################
 # Spacing between subplots is further set by *wspace* and *hspace*. These
@@ -251,36 +255,35 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 # used instead. Note in the below how the space at the edges doesn't change
 # from the above, but the space between subplots does.
 
-fig, axs = plt.subplots(2, 2, constrained_layout=True)
+fig, axs = plt.subplots(2, 2, layout="constrained")
 for ax in axs.flat:
     example_plot(ax, hide_labels=True)
-fig.set_constrained_layout_pads(w_pad=4 / 72, h_pad=4 / 72, hspace=0.2,
-                                wspace=0.2)
+fig.get_layout_engine().set(w_pad=4 / 72, h_pad=4 / 72, hspace=0.2,
+                            wspace=0.2)
 
 ##########################################
 # If there are more than two columns, the *wspace* is shared between them,
-# so here the wspace is divided in 2, with a *wspace* of 0.1 between each
+# so here the wspace is divided in two, with a *wspace* of 0.1 between each
 # column:
 
-fig, axs = plt.subplots(2, 3, constrained_layout=True)
+fig, axs = plt.subplots(2, 3, layout="constrained")
 for ax in axs.flat:
     example_plot(ax, hide_labels=True)
-fig.set_constrained_layout_pads(w_pad=4 / 72, h_pad=4 / 72, hspace=0.2,
-                                wspace=0.2)
+fig.get_layout_engine().set(w_pad=4 / 72, h_pad=4 / 72, hspace=0.2,
+                            wspace=0.2)
 
 ##########################################
 # GridSpecs also have optional *hspace* and *wspace* keyword arguments,
 # that will be used instead of the pads set by ``constrained_layout``:
 
-fig, axs = plt.subplots(2, 2, constrained_layout=True,
+fig, axs = plt.subplots(2, 2, layout="constrained",
                         gridspec_kw={'wspace': 0.3, 'hspace': 0.2})
 for ax in axs.flat:
     example_plot(ax, hide_labels=True)
 # this has no effect because the space set in the gridspec trumps the
 # space set in constrained_layout.
-fig.set_constrained_layout_pads(w_pad=4 / 72, h_pad=4 / 72, hspace=0.0,
-                                wspace=0.0)
-plt.show()
+fig.get_layout_engine().set(w_pad=4 / 72, h_pad=4 / 72, hspace=0.0,
+                            wspace=0.0)
 
 ##########################################
 # Spacing with colorbars
@@ -290,24 +293,24 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 # is a fraction of the width of the parent(s).  The spacing to the
 # next subplot is then given by *w/hspace*.
 
-fig, axs = plt.subplots(2, 2, constrained_layout=True)
+fig, axs = plt.subplots(2, 2, layout="constrained")
 pads = [0, 0.05, 0.1, 0.2]
 for pad, ax in zip(pads, axs.flat):
     pc = ax.pcolormesh(arr, **pc_kwargs)
     fig.colorbar(pc, ax=ax, shrink=0.6, pad=pad)
-    ax.set_xticklabels('')
-    ax.set_yticklabels('')
+    ax.set_xticklabels([])
+    ax.set_yticklabels([])
     ax.set_title(f'pad: {pad}')
-fig.set_constrained_layout_pads(w_pad=2 / 72, h_pad=2 / 72, hspace=0.2,
-                                wspace=0.2)
+fig.get_layout_engine().set(w_pad=2 / 72, h_pad=2 / 72, hspace=0.2,
+                            wspace=0.2)
 
 ##########################################
 # rcParams
 # ========
 #
-# There are five :ref:`rcParams<matplotlib-rcparams>` that can be set,
-# either in a script or in the :file:`matplotlibrc` file.
-# They all have the prefix ``figure.constrained_layout``:
+# There are five :ref:`rcParams<customizing-with-dynamic-rc-settings>`
+# that can be set, either in a script or in the :file:`matplotlibrc`
+# file. They all have the prefix ``figure.constrained_layout``:
 #
 # - *use*: Whether to use constrained_layout. Default is False
 # - *w_pad*, *h_pad*:    Padding around axes objects.
@@ -326,13 +329,15 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 # =================
 #
 # constrained_layout is meant to be used
-# with :func:`~matplotlib.figure.Figure.subplots` or
-# :func:`~matplotlib.gridspec.GridSpec` and
+# with :func:`~matplotlib.figure.Figure.subplots`,
+# :func:`~matplotlib.figure.Figure.subplot_mosaic`, or
+# :func:`~matplotlib.gridspec.GridSpec` with
 # :func:`~matplotlib.figure.Figure.add_subplot`.
 #
-# Note that in what follows ``constrained_layout=True``
+# Note that in what follows ``layout="constrained"``
 
-fig = plt.figure()
+plt.rcParams['figure.constrained_layout.use'] = False
+fig = plt.figure(layout="constrained")
 
 gs1 = gridspec.GridSpec(2, 1, figure=fig)
 ax1 = fig.add_subplot(gs1[0])
@@ -346,7 +351,7 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 # convenience functions `~.Figure.add_gridspec` and
 # `~.SubplotSpec.subgridspec`.
 
-fig = plt.figure()
+fig = plt.figure(layout="constrained")
 
 gs0 = fig.add_gridspec(1, 2)
 
@@ -373,7 +378,7 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 # then they need to be in the same gridspec.  We need to make this figure
 # larger as well in order for the axes not to collapse to zero height:
 
-fig = plt.figure(figsize=(4, 6))
+fig = plt.figure(figsize=(4, 6), layout="constrained")
 
 gs0 = fig.add_gridspec(6, 2)
 
@@ -391,52 +396,94 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 example_plot(ax, hide_labels=True)
 fig.suptitle('Overlapping Gridspecs')
 
-
 ############################################################################
 # This example uses two gridspecs to have the colorbar only pertain to
 # one set of pcolors.  Note how the left column is wider than the
 # two right-hand columns because of this.  Of course, if you wanted the
-# subplots to be the same size you only needed one gridspec.
+# subplots to be the same size you only needed one gridspec.  Note that
+# the same effect can be achieved using `~.Figure.subfigures`.
 
+fig = plt.figure(layout="constrained")
+gs0 = fig.add_gridspec(1, 2, figure=fig, width_ratios=[1, 2])
+gs_left = gs0[0].subgridspec(2, 1)
+gs_right = gs0[1].subgridspec(2, 2)
 
-def docomplicated(suptitle=None):
-    fig = plt.figure()
-    gs0 = fig.add_gridspec(1, 2, figure=fig, width_ratios=[1., 2.])
-    gsl = gs0[0].subgridspec(2, 1)
-    gsr = gs0[1].subgridspec(2, 2)
+for gs in gs_left:
+    ax = fig.add_subplot(gs)
+    example_plot(ax)
+axs = []
+for gs in gs_right:
+    ax = fig.add_subplot(gs)
+    pcm = ax.pcolormesh(arr, **pc_kwargs)
+    ax.set_xlabel('x-label')
+    ax.set_ylabel('y-label')
+    ax.set_title('title')
+    axs += [ax]
+fig.suptitle('Nested plots using subgridspec')
+fig.colorbar(pcm, ax=axs)
 
-    for gs in gsl:
-        ax = fig.add_subplot(gs)
-        example_plot(ax)
-    axs = []
-    for gs in gsr:
-        ax = fig.add_subplot(gs)
-        pcm = ax.pcolormesh(arr, **pc_kwargs)
-        ax.set_xlabel('x-label')
-        ax.set_ylabel('y-label')
-        ax.set_title('title')
+###############################################################################
+# Rather than using subgridspecs, Matplotlib now provides `~.Figure.subfigures`
+# which also work with ``constrained_layout``:
 
-        axs += [ax]
-    fig.colorbar(pcm, ax=axs)
-    if suptitle is not None:
-        fig.suptitle(suptitle)
+fig = plt.figure(layout="constrained")
+sfigs = fig.subfigures(1, 2, width_ratios=[1, 2])
 
+axs_left = sfigs[0].subplots(2, 1)
+for ax in axs_left.flat:
+    example_plot(ax)
 
-docomplicated()
+axs_right = sfigs[1].subplots(2, 2)
+for ax in axs_right.flat:
+    pcm = ax.pcolormesh(arr, **pc_kwargs)
+    ax.set_xlabel('x-label')
+    ax.set_ylabel('y-label')
+    ax.set_title('title')
+fig.colorbar(pcm, ax=axs_right)
+fig.suptitle('Nested plots using subfigures')
 
 ###############################################################################
 # Manually setting axes positions
 # ================================
 #
-# There can be good reasons to manually set an axes position.  A manual call
+# There can be good reasons to manually set an Axes position.  A manual call
 # to `~.axes.Axes.set_position` will set the axes so constrained_layout has
 # no effect on it anymore. (Note that ``constrained_layout`` still leaves the
 # space for the axes that is moved).
 
-fig, axs = plt.subplots(1, 2)
+fig, axs = plt.subplots(1, 2, layout="constrained")
 example_plot(axs[0], fontsize=12)
 axs[1].set_position([0.2, 0.2, 0.4, 0.4])
 
+###############################################################################
+# .. _compressed_layout:
+#
+# Grids of fixed aspect-ratio Axes: "compressed" layout
+# =====================================================
+#
+# ``constrained_layout`` operates on the grid of "original" positions for
+# axes. However, when Axes have fixed aspect ratios, one side is usually made
+# shorter, and leaves large gaps in the shortened direction. In the following,
+# the Axes are square, but the figure quite wide so there is a horizontal gap:
+
+fig, axs = plt.subplots(2, 2, figsize=(5, 3),
+                        sharex=True, sharey=True, layout="constrained")
+for ax in axs.flat:
+    ax.imshow(arr)
+fig.suptitle("fixed-aspect plots, layout='constrained'")
+
+###############################################################################
+# One obvious way of fixing this is to make the figure size more square,
+# however, closing the gaps exactly requires trial and error.  For simple grids
+# of Axes we can use ``layout="compressed"`` to do the job for us:
+
+fig, axs = plt.subplots(2, 2, figsize=(5, 3),
+                        sharex=True, sharey=True, layout='compressed')
+for ax in axs.flat:
+    ax.imshow(arr)
+fig.suptitle("fixed-aspect plots, layout='compressed'")
+
+
 ###############################################################################
 # Manually turning off ``constrained_layout``
 # ===========================================
@@ -444,7 +491,7 @@ def docomplicated(suptitle=None):
 # ``constrained_layout`` usually adjusts the axes positions on each draw
 # of the figure.  If you want to get the spacing provided by
 # ``constrained_layout`` but not have it update, then do the initial
-# draw and then call ``fig.set_constrained_layout(False)``.
+# draw and then call ``fig.set_layout_engine(None)``.
 # This is potentially useful for animations where the tick labels may
 # change length.
 #
@@ -465,7 +512,7 @@ def docomplicated(suptitle=None):
 # `.GridSpec` instance if the geometry is not the same, and
 # ``constrained_layout``.  So the following works fine:
 
-fig = plt.figure()
+fig = plt.figure(layout="constrained")
 
 ax1 = plt.subplot(2, 2, 1)
 ax2 = plt.subplot(2, 2, 3)
@@ -480,7 +527,7 @@ def docomplicated(suptitle=None):
 ###############################################################################
 # but the following leads to a poor layout:
 
-fig = plt.figure()
+fig = plt.figure(layout="constrained")
 
 ax1 = plt.subplot(2, 2, 1)
 ax2 = plt.subplot(2, 2, 3)
@@ -496,7 +543,7 @@ def docomplicated(suptitle=None):
 # `~matplotlib.pyplot.subplot2grid` works with the same limitation
 # that nrows and ncols cannot change for the layout to look good.
 
-fig = plt.figure()
+fig = plt.figure(layout="constrained")
 
 ax1 = plt.subplot2grid((3, 3), (0, 0))
 ax2 = plt.subplot2grid((3, 3), (0, 1), colspan=2)
@@ -555,7 +602,7 @@ def docomplicated(suptitle=None):
 # has some complexity due to the complex ways we can layout a figure.
 #
 # Layout in Matplotlib is carried out with gridspecs
-# via the `~.GridSpec` class. A gridspec is a logical division of the figure
+# via the `.GridSpec` class. A gridspec is a logical division of the figure
 # into rows and columns, with the relative width of the Axes in those
 # rows and columns set by *width_ratios* and *height_ratios*.
 #
@@ -586,9 +633,9 @@ def docomplicated(suptitle=None):
 
 from matplotlib._layoutgrid import plot_children
 
-fig, ax = plt.subplots(constrained_layout=True)
+fig, ax = plt.subplots(layout="constrained")
 example_plot(ax, fontsize=24)
-plot_children(fig, fig._layoutgrid)
+plot_children(fig)
 
 #######################################################################
 # Simple case: two Axes
@@ -600,10 +647,10 @@ def docomplicated(suptitle=None):
 # margin.  The left and right margins are not shared, and hence are
 # allowed to be different.
 
-fig, ax = plt.subplots(1, 2, constrained_layout=True)
+fig, ax = plt.subplots(1, 2, layout="constrained")
 example_plot(ax[0], fontsize=32)
 example_plot(ax[1], fontsize=8)
-plot_children(fig, fig._layoutgrid, printit=False)
+plot_children(fig)
 
 #######################################################################
 # Two Axes and colorbar
@@ -612,11 +659,11 @@ def docomplicated(suptitle=None):
 # A colorbar is simply another item that expands the margin of the parent
 # layoutgrid cell:
 
-fig, ax = plt.subplots(1, 2, constrained_layout=True)
+fig, ax = plt.subplots(1, 2, layout="constrained")
 im = ax[0].pcolormesh(arr, **pc_kwargs)
 fig.colorbar(im, ax=ax[0], shrink=0.6)
 im = ax[1].pcolormesh(arr, **pc_kwargs)
-plot_children(fig, fig._layoutgrid)
+plot_children(fig)
 
 #######################################################################
 # Colorbar associated with a Gridspec
@@ -625,11 +672,11 @@ def docomplicated(suptitle=None):
 # If a colorbar belongs to more than one cell of the grid, then
 # it makes a larger margin for each:
 
-fig, axs = plt.subplots(2, 2, constrained_layout=True)
+fig, axs = plt.subplots(2, 2, layout="constrained")
 for ax in axs.flat:
     im = ax.pcolormesh(arr, **pc_kwargs)
 fig.colorbar(im, ax=axs, shrink=0.6)
-plot_children(fig, fig._layoutgrid, printit=False)
+plot_children(fig)
 
 #######################################################################
 # Uneven sized Axes
@@ -643,10 +690,10 @@ def docomplicated(suptitle=None):
 # ``bottom`` margins are not affected by the left-hand column.  This
 # is a conscious decision of the algorithm, and leads to the case where
 # the two right-hand axes have the same height, but it is not 1/2 the height
-# of the left-hand axes.  This is consietent with how ``gridspec`` works
+# of the left-hand axes.  This is consistent with how ``gridspec`` works
 # without constrained layout.
 
-fig = plt.figure(constrained_layout=True)
+fig = plt.figure(layout="constrained")
 gs = gridspec.GridSpec(2, 2, figure=fig)
 ax = fig.add_subplot(gs[:, 0])
 im = ax.pcolormesh(arr, **pc_kwargs)
@@ -654,7 +701,7 @@ def docomplicated(suptitle=None):
 im = ax.pcolormesh(arr, **pc_kwargs)
 ax = fig.add_subplot(gs[1, 1])
 im = ax.pcolormesh(arr, **pc_kwargs)
-plot_children(fig, fig._layoutgrid, printit=False)
+plot_children(fig)
 
 #######################################################################
 # One case that requires finessing is if margins do not have any artists
@@ -663,10 +710,11 @@ def docomplicated(suptitle=None):
 # so we take the maximum width of the margin widths that do have artists.
 # This makes all the axes have the same size:
 
-fig = plt.figure(constrained_layout=True)
+fig = plt.figure(layout="constrained")
 gs = fig.add_gridspec(2, 4)
 ax00 = fig.add_subplot(gs[0, 0:2])
 ax01 = fig.add_subplot(gs[0, 2:])
 ax10 = fig.add_subplot(gs[1, 1:3])
 example_plot(ax10, fontsize=14)
-plot_children(fig, fig._layoutgrid)
+plot_children(fig)
+plt.show()
diff --git a/tutorials/intermediate/gridspec.py b/tutorials/intermediate/gridspec.py
deleted file mode 100644
index 4debe8a9d43a..000000000000
--- a/tutorials/intermediate/gridspec.py
+++ /dev/null
@@ -1,271 +0,0 @@
-"""
-=============================================================
-Customizing Figure Layouts Using GridSpec and Other Functions
-=============================================================
-
-How to create grid-shaped combinations of axes.
-
-    :func:`~matplotlib.pyplot.subplots`
-        Perhaps the primary function used to create figures and axes.
-        It's also similar to :func:`.matplotlib.pyplot.subplot`,
-        but creates and places all axes on the figure at once.  See also
-        `matplotlib.figure.Figure.subplots`.
-
-    :class:`~matplotlib.gridspec.GridSpec`
-        Specifies the geometry of the grid that a subplot will be
-        placed. The number of rows and number of columns of the grid
-        need to be set. Optionally, the subplot layout parameters
-        (e.g., left, right, etc.) can be tuned.
-
-    :class:`~matplotlib.gridspec.SubplotSpec`
-        Specifies the location of the subplot in the given *GridSpec*.
-
-    :func:`~matplotlib.pyplot.subplot2grid`
-        A helper function that is similar to
-        :func:`~matplotlib.pyplot.subplot`,
-        but uses 0-based indexing and let subplot to occupy multiple cells.
-        This function is not covered in this tutorial.
-
-"""
-
-import matplotlib
-import matplotlib.pyplot as plt
-import matplotlib.gridspec as gridspec
-
-############################################################################
-# Basic Quickstart Guide
-# ======================
-#
-# These first two examples show how to create a basic 2-by-2 grid using
-# both :func:`~matplotlib.pyplot.subplots` and :mod:`~matplotlib.gridspec`.
-#
-# Using :func:`~matplotlib.pyplot.subplots` is quite simple.
-# It returns a :class:`~matplotlib.figure.Figure` instance and an array of
-# :class:`~matplotlib.axes.Axes` objects.
-
-fig1, f1_axes = plt.subplots(ncols=2, nrows=2, constrained_layout=True)
-
-############################################################################
-# For a simple use case such as this, :mod:`~matplotlib.gridspec` is
-# perhaps overly verbose.
-# You have to create the figure and :class:`~matplotlib.gridspec.GridSpec`
-# instance separately, then pass elements of gridspec instance to the
-# :func:`~matplotlib.figure.Figure.add_subplot` method to create the axes
-# objects.
-# The elements of the gridspec are accessed in generally the same manner as
-# numpy arrays.
-
-fig2 = plt.figure(constrained_layout=True)
-spec2 = gridspec.GridSpec(ncols=2, nrows=2, figure=fig2)
-f2_ax1 = fig2.add_subplot(spec2[0, 0])
-f2_ax2 = fig2.add_subplot(spec2[0, 1])
-f2_ax3 = fig2.add_subplot(spec2[1, 0])
-f2_ax4 = fig2.add_subplot(spec2[1, 1])
-
-#############################################################################
-# The power of gridspec comes in being able to create subplots that span
-# rows and columns.  Note the `NumPy slice syntax
-# <https://docs.scipy.org/doc/numpy/reference/arrays.indexing.html>`_
-# for selecting the part of the gridspec each subplot will occupy.
-#
-# Note that we have also used the convenience method `.Figure.add_gridspec`
-# instead of `.gridspec.GridSpec`, potentially saving the user an import,
-# and keeping the namespace cleaner.
-
-fig3 = plt.figure(constrained_layout=True)
-gs = fig3.add_gridspec(3, 3)
-f3_ax1 = fig3.add_subplot(gs[0, :])
-f3_ax1.set_title('gs[0, :]')
-f3_ax2 = fig3.add_subplot(gs[1, :-1])
-f3_ax2.set_title('gs[1, :-1]')
-f3_ax3 = fig3.add_subplot(gs[1:, -1])
-f3_ax3.set_title('gs[1:, -1]')
-f3_ax4 = fig3.add_subplot(gs[-1, 0])
-f3_ax4.set_title('gs[-1, 0]')
-f3_ax5 = fig3.add_subplot(gs[-1, -2])
-f3_ax5.set_title('gs[-1, -2]')
-
-#############################################################################
-# :mod:`~matplotlib.gridspec` is also indispensable for creating subplots
-# of different widths via a couple of methods.
-#
-# The method shown here is similar to the one above and initializes a
-# uniform grid specification,
-# and then uses numpy indexing and slices to allocate multiple
-# "cells" for a given subplot.
-
-fig4 = plt.figure(constrained_layout=True)
-spec4 = fig4.add_gridspec(ncols=2, nrows=2)
-anno_opts = dict(xy=(0.5, 0.5), xycoords='axes fraction',
-                 va='center', ha='center')
-
-f4_ax1 = fig4.add_subplot(spec4[0, 0])
-f4_ax1.annotate('GridSpec[0, 0]', **anno_opts)
-fig4.add_subplot(spec4[0, 1]).annotate('GridSpec[0, 1:]', **anno_opts)
-fig4.add_subplot(spec4[1, 0]).annotate('GridSpec[1:, 0]', **anno_opts)
-fig4.add_subplot(spec4[1, 1]).annotate('GridSpec[1:, 1:]', **anno_opts)
-
-############################################################################
-# Another option is to use the ``width_ratios`` and ``height_ratios``
-# parameters. These keyword arguments are lists of numbers.
-# Note that absolute values are meaningless, only their relative ratios
-# matter. That means that ``width_ratios=[2, 4, 8]`` is equivalent to
-# ``width_ratios=[1, 2, 4]`` within equally wide figures.
-# For the sake of demonstration, we'll blindly create the axes within
-# ``for`` loops since we won't need them later.
-
-fig5 = plt.figure(constrained_layout=True)
-widths = [2, 3, 1.5]
-heights = [1, 3, 2]
-spec5 = fig5.add_gridspec(ncols=3, nrows=3, width_ratios=widths,
-                          height_ratios=heights)
-for row in range(3):
-    for col in range(3):
-        ax = fig5.add_subplot(spec5[row, col])
-        label = 'Width: {}\nHeight: {}'.format(widths[col], heights[row])
-        ax.annotate(label, (0.1, 0.5), xycoords='axes fraction', va='center')
-
-############################################################################
-# Learning to use ``width_ratios`` and ``height_ratios`` is particularly
-# useful since the top-level function :func:`~matplotlib.pyplot.subplots`
-# accepts them within the ``gridspec_kw`` parameter.
-# For that matter, any parameter accepted by
-# :class:`~matplotlib.gridspec.GridSpec` can be passed to
-# :func:`~matplotlib.pyplot.subplots` via the ``gridspec_kw`` parameter.
-# This example recreates the previous figure without directly using a
-# gridspec instance.
-
-gs_kw = dict(width_ratios=widths, height_ratios=heights)
-fig6, f6_axes = plt.subplots(ncols=3, nrows=3, constrained_layout=True,
-                             gridspec_kw=gs_kw)
-for r, row in enumerate(f6_axes):
-    for c, ax in enumerate(row):
-        label = 'Width: {}\nHeight: {}'.format(widths[c], heights[r])
-        ax.annotate(label, (0.1, 0.5), xycoords='axes fraction', va='center')
-
-############################################################################
-# The ``subplots`` and ``get_gridspec`` methods can be combined since it is
-# sometimes more convenient to make most of the subplots using ``subplots``
-# and then remove some and combine them.  Here we create a layout with
-# the bottom two axes in the last column combined.
-
-fig7, f7_axs = plt.subplots(ncols=3, nrows=3)
-gs = f7_axs[1, 2].get_gridspec()
-# remove the underlying axes
-for ax in f7_axs[1:, -1]:
-    ax.remove()
-axbig = fig7.add_subplot(gs[1:, -1])
-axbig.annotate('Big Axes \nGridSpec[1:, -1]', (0.1, 0.5),
-               xycoords='axes fraction', va='center')
-
-fig7.tight_layout()
-
-###############################################################################
-# Fine Adjustments to a Gridspec Layout
-# =====================================
-#
-# When a GridSpec is explicitly used, you can adjust the layout
-# parameters of subplots that are created from the GridSpec.  Note this
-# option is not compatible with ``constrained_layout`` or
-# `.Figure.tight_layout` which both adjust subplot sizes to fill the
-# figure.
-
-fig8 = plt.figure(constrained_layout=False)
-gs1 = fig8.add_gridspec(nrows=3, ncols=3, left=0.05, right=0.48, wspace=0.05)
-f8_ax1 = fig8.add_subplot(gs1[:-1, :])
-f8_ax2 = fig8.add_subplot(gs1[-1, :-1])
-f8_ax3 = fig8.add_subplot(gs1[-1, -1])
-
-###############################################################################
-# This is similar to :func:`~matplotlib.pyplot.subplots_adjust`, but it only
-# affects the subplots that are created from the given GridSpec.
-#
-# For example, compare the left and right sides of this figure:
-
-fig9 = plt.figure(constrained_layout=False)
-gs1 = fig9.add_gridspec(nrows=3, ncols=3, left=0.05, right=0.48,
-                        wspace=0.05)
-f9_ax1 = fig9.add_subplot(gs1[:-1, :])
-f9_ax2 = fig9.add_subplot(gs1[-1, :-1])
-f9_ax3 = fig9.add_subplot(gs1[-1, -1])
-
-gs2 = fig9.add_gridspec(nrows=3, ncols=3, left=0.55, right=0.98,
-                        hspace=0.05)
-f9_ax4 = fig9.add_subplot(gs2[:, :-1])
-f9_ax5 = fig9.add_subplot(gs2[:-1, -1])
-f9_ax6 = fig9.add_subplot(gs2[-1, -1])
-
-###############################################################################
-# GridSpec using SubplotSpec
-# ==========================
-#
-# You can create GridSpec from the :class:`~matplotlib.gridspec.SubplotSpec`,
-# in which case its layout parameters are set to that of the location of
-# the given SubplotSpec.
-#
-# Note this is also available from the more verbose
-# `.gridspec.GridSpecFromSubplotSpec`.
-
-fig10 = plt.figure(constrained_layout=True)
-gs0 = fig10.add_gridspec(1, 2)
-
-gs00 = gs0[0].subgridspec(2, 3)
-gs01 = gs0[1].subgridspec(3, 2)
-
-for a in range(2):
-    for b in range(3):
-        fig10.add_subplot(gs00[a, b])
-        fig10.add_subplot(gs01[b, a])
-
-###############################################################################
-# A Complex Nested GridSpec using SubplotSpec
-# ===========================================
-#
-# Here's a more sophisticated example of nested GridSpec where we put
-# a box around each cell of the outer 4x4 grid, by hiding appropriate
-# spines in each of the inner 3x3 grids.
-
-import numpy as np
-
-
-def squiggle_xy(a, b, c, d, i=np.arange(0.0, 2*np.pi, 0.05)):
-    return np.sin(i*a)*np.cos(i*b), np.sin(i*c)*np.cos(i*d)
-
-
-fig11 = plt.figure(figsize=(8, 8), constrained_layout=False)
-outer_grid = fig11.add_gridspec(4, 4, wspace=0, hspace=0)
-
-for a in range(4):
-    for b in range(4):
-        # gridspec inside gridspec
-        inner_grid = outer_grid[a, b].subgridspec(3, 3, wspace=0, hspace=0)
-        axs = inner_grid.subplots()  # Create all subplots for the inner grid.
-        for (c, d), ax in np.ndenumerate(axs):
-            ax.plot(*squiggle_xy(a + 1, b + 1, c + 1, d + 1))
-            ax.set(xticks=[], yticks=[])
-
-# show only the outside spines
-for ax in fig11.get_axes():
-    ss = ax.get_subplotspec()
-    ax.spines.top.set_visible(ss.is_first_row())
-    ax.spines.bottom.set_visible(ss.is_last_row())
-    ax.spines.left.set_visible(ss.is_first_col())
-    ax.spines.right.set_visible(ss.is_last_col())
-
-plt.show()
-
-#############################################################################
-#
-# ------------
-#
-# References
-# """"""""""
-#
-# The usage of the following functions and methods is shown in this example:
-
-matplotlib.pyplot.subplots
-matplotlib.figure.Figure.add_gridspec
-matplotlib.figure.Figure.add_subplot
-matplotlib.gridspec.GridSpec
-matplotlib.gridspec.SubplotSpec.subgridspec
-matplotlib.gridspec.GridSpecFromSubplotSpec
diff --git a/tutorials/intermediate/imshow_extent.py b/tutorials/intermediate/imshow_extent.py
index 2ba71b8791ec..8065a06714b3 100644
--- a/tutorials/intermediate/imshow_extent.py
+++ b/tutorials/intermediate/imshow_extent.py
@@ -2,18 +2,18 @@
 *origin* and *extent* in `~.Axes.imshow`
 ========================================
 
-:meth:`~.Axes.imshow` allows you to render an image (either a 2D array
-which will be color-mapped (based on *norm* and *cmap*) or a 3D RGB(A)
-array which will be used as-is) to a rectangular region in dataspace.
-The orientation of the image in the final rendering is controlled by
-the *origin* and *extent* kwargs (and attributes on the resulting
-`~.AxesImage` instance) and the data limits of the axes.
-
-The *extent* kwarg controls the bounding box in data coordinates that
-the image will fill specified as ``(left, right, bottom, top)`` in
-**data coordinates**, the *origin* kwarg controls how the image fills
-that bounding box, and the orientation in the final rendered image is
-also affected by the axes limits.
+:meth:`~.Axes.imshow` allows you to render an image (either a 2D array which
+will be color-mapped (based on *norm* and *cmap*) or a 3D RGB(A) array which
+will be used as-is) to a rectangular region in data space.  The orientation of
+the image in the final rendering is controlled by the *origin* and *extent*
+keyword arguments (and attributes on the resulting `.AxesImage` instance) and
+the data limits of the axes.
+
+The *extent* keyword arguments controls the bounding box in data coordinates
+that the image will fill specified as ``(left, right, bottom, top)`` in **data
+coordinates**, the *origin* keyword argument controls how the image fills that
+bounding box, and the orientation in the final rendered image is also affected
+by the axes limits.
 
 .. hint:: Most of the code below is used for adding labels and informative
    text to the plots. The described effects of *origin* and *extent* can be
@@ -176,7 +176,7 @@ def generate_imshow_demo_grid(extents, xlim=None, ylim=None):
 # vertical, the second index runs along the horizontal.
 # The pixel centers are at integer positions ranging from 0 to ``N' = N - 1``
 # horizontally and from 0 to ``M' = M - 1`` vertically.
-# *origin* determines how to the data is filled in the bounding box.
+# *origin* determines how the data is filled in the bounding box.
 #
 # For ``origin='lower'``:
 #
@@ -244,7 +244,7 @@ def generate_imshow_demo_grid(extents, xlim=None, ylim=None):
 #
 # While we keep the extents as in the examples before, the coordinate (0, 0)
 # is now explicitly put at the bottom left and values increase to up and to
-# the right (from the viewer point of view).
+# the right (from the viewer's point of view).
 # We can see that:
 #
 # - The coordinate ``(left, bottom)`` anchors the image which then fills the
diff --git a/tutorials/intermediate/legend_guide.py b/tutorials/intermediate/legend_guide.py
index c62a59d9c440..596d6df93b55 100644
--- a/tutorials/intermediate/legend_guide.py
+++ b/tutorials/intermediate/legend_guide.py
@@ -47,22 +47,25 @@
 not all artists can be added to a legend, at which point a "proxy" will have
 to be created (see :ref:`proxy_legend_handles` for further details).
 
-Those artists with an empty string as label or with a label starting with
-"_" will be ignored.
+.. note::
+    Artists with an empty string as label or with a label starting with an
+    underscore, "_", will be ignored.
 
 For full control of what is being added to the legend, it is common to pass
 the appropriate handles directly to :func:`legend`::
 
-    line_up, = plt.plot([1, 2, 3], label='Line 2')
-    line_down, = plt.plot([3, 2, 1], label='Line 1')
-    plt.legend(handles=[line_up, line_down])
+    fig, ax = plt.subplots()
+    line_up, = ax.plot([1, 2, 3], label='Line 2')
+    line_down, = ax.plot([3, 2, 1], label='Line 1')
+    ax.legend(handles=[line_up, line_down])
 
 In some cases, it is not possible to set the label of the handle, so it is
 possible to pass through the list of labels to :func:`legend`::
 
-    line_up, = plt.plot([1, 2, 3], label='Line 2')
-    line_down, = plt.plot([3, 2, 1], label='Line 1')
-    plt.legend([line_up, line_down], ['Line Up', 'Line Down'])
+    fig, ax = plt.subplots()
+    line_up, = ax.plot([1, 2, 3], label='Line 2')
+    line_down, = ax.plot([3, 2, 1], label='Line 1')
+    ax.legend([line_up, line_down], ['Line Up', 'Line Down'])
 
 
 .. _proxy_legend_handles:
@@ -81,8 +84,9 @@
 import matplotlib.patches as mpatches
 import matplotlib.pyplot as plt
 
+fig, ax = plt.subplots()
 red_patch = mpatches.Patch(color='red', label='The red data')
-plt.legend(handles=[red_patch])
+ax.legend(handles=[red_patch])
 
 plt.show()
 
@@ -92,9 +96,10 @@
 
 import matplotlib.lines as mlines
 
+fig, ax = plt.subplots()
 blue_line = mlines.Line2D([], [], color='blue', marker='*',
                           markersize=15, label='Blue stars')
-plt.legend(handles=[blue_line])
+ax.legend(handles=[blue_line])
 
 plt.show()
 
@@ -110,25 +115,25 @@
 # figure's top right-hand corner instead of the axes' corner, simply specify
 # the corner's location and the coordinate system of that location::
 #
-#     plt.legend(bbox_to_anchor=(1, 1),
-#                bbox_transform=plt.gcf().transFigure)
+#     ax.legend(bbox_to_anchor=(1, 1),
+#               bbox_transform=fig.transFigure)
 #
 # More examples of custom legend placement:
 
-plt.subplot(211)
-plt.plot([1, 2, 3], label="test1")
-plt.plot([3, 2, 1], label="test2")
-
+fig, ax_dict = plt.subplot_mosaic([['top', 'top'], ['bottom', 'BLANK']],
+                                  empty_sentinel="BLANK")
+ax_dict['top'].plot([1, 2, 3], label="test1")
+ax_dict['top'].plot([3, 2, 1], label="test2")
 # Place a legend above this subplot, expanding itself to
 # fully use the given bounding box.
-plt.legend(bbox_to_anchor=(0., 1.02, 1., .102), loc='lower left',
-           ncol=2, mode="expand", borderaxespad=0.)
+ax_dict['top'].legend(bbox_to_anchor=(0., 1.02, 1., .102), loc='lower left',
+                      ncol=2, mode="expand", borderaxespad=0.)
 
-plt.subplot(223)
-plt.plot([1, 2, 3], label="test1")
-plt.plot([3, 2, 1], label="test2")
+ax_dict['bottom'].plot([1, 2, 3], label="test1")
+ax_dict['bottom'].plot([3, 2, 1], label="test2")
 # Place a legend to the right of this smaller subplot.
-plt.legend(bbox_to_anchor=(1.05, 1), loc='upper left', borderaxespad=0.)
+ax_dict['bottom'].legend(bbox_to_anchor=(1.05, 1),
+                         loc='upper left', borderaxespad=0.)
 
 plt.show()
 
@@ -144,17 +149,18 @@
 # handles on the Axes. To keep old legend instances, we must add them
 # manually to the Axes:
 
-line1, = plt.plot([1, 2, 3], label="Line 1", linestyle='--')
-line2, = plt.plot([3, 2, 1], label="Line 2", linewidth=4)
+fig, ax = plt.subplots()
+line1, = ax.plot([1, 2, 3], label="Line 1", linestyle='--')
+line2, = ax.plot([3, 2, 1], label="Line 2", linewidth=4)
 
 # Create a legend for the first line.
-first_legend = plt.legend(handles=[line1], loc='upper right')
+first_legend = ax.legend(handles=[line1], loc='upper right')
 
-# Add the legend manually to the current Axes.
-plt.gca().add_artist(first_legend)
+# Add the legend manually to the Axes.
+ax.add_artist(first_legend)
 
 # Create another legend for the second line.
-plt.legend(handles=[line2], loc='lower right')
+ax.legend(handles=[line2], loc='lower right')
 
 plt.show()
 
@@ -188,15 +194,16 @@
 
 from matplotlib.legend_handler import HandlerLine2D
 
-line1, = plt.plot([3, 2, 1], marker='o', label='Line 1')
-line2, = plt.plot([1, 2, 3], marker='o', label='Line 2')
+fig, ax = plt.subplots()
+line1, = ax.plot([3, 2, 1], marker='o', label='Line 1')
+line2, = ax.plot([1, 2, 3], marker='o', label='Line 2')
 
-plt.legend(handler_map={line1: HandlerLine2D(numpoints=4)})
+ax.legend(handler_map={line1: HandlerLine2D(numpoints=4)})
 
 ###############################################################################
 # As you can see, "Line 1" now has 4 marker points, where "Line 2" has 2 (the
 # default). Try the above code, only change the map's key from ``line1`` to
-# ``type(line1)``. Notice how now both `~.Line2D` instances get 4 markers.
+# ``type(line1)``. Notice how now both `.Line2D` instances get 4 markers.
 #
 # Along with handlers for complex plot types such as errorbars, stem plots
 # and histograms, the default ``handler_map`` has a special ``tuple`` handler
@@ -208,11 +215,12 @@
 
 z = randn(10)
 
-red_dot, = plt.plot(z, "ro", markersize=15)
+fig, ax = plt.subplots()
+red_dot, = ax.plot(z, "ro", markersize=15)
 # Put a white cross over some of the data.
-white_cross, = plt.plot(z[:5], "w+", markeredgewidth=3, markersize=15)
+white_cross, = ax.plot(z[:5], "w+", markeredgewidth=3, markersize=15)
 
-plt.legend([red_dot, (red_dot, white_cross)], ["Attr A", "Attr A+B"])
+ax.legend([red_dot, (red_dot, white_cross)], ["Attr A", "Attr A+B"])
 
 ###############################################################################
 # The `.legend_handler.HandlerTuple` class can also be used to
@@ -220,11 +228,12 @@
 
 from matplotlib.legend_handler import HandlerLine2D, HandlerTuple
 
-p1, = plt.plot([1, 2.5, 3], 'r-d')
-p2, = plt.plot([3, 2, 1], 'k-o')
+fig, ax = plt.subplots()
+p1, = ax.plot([1, 2.5, 3], 'r-d')
+p2, = ax.plot([3, 2, 1], 'k-o')
 
-l = plt.legend([(p1, p2)], ['Two keys'], numpoints=1,
-               handler_map={tuple: HandlerTuple(ndivide=None)})
+l = ax.legend([(p1, p2)], ['Two keys'], numpoints=1,
+              handler_map={tuple: HandlerTuple(ndivide=None)})
 
 ###############################################################################
 # Implementing a custom legend handler
@@ -253,9 +262,10 @@ def legend_artist(self, legend, orig_handle, fontsize, handlebox):
         handlebox.add_artist(patch)
         return patch
 
+fig, ax = plt.subplots()
 
-plt.legend([AnyObject()], ['My first handler'],
-           handler_map={AnyObject: AnyObjectHandler()})
+ax.legend([AnyObject()], ['My first handler'],
+          handler_map={AnyObject: AnyObjectHandler()})
 
 ###############################################################################
 # Alternatively, had we wanted to globally accept ``AnyObject`` instances
@@ -286,7 +296,9 @@ def create_artists(self, legend, orig_handle,
 
 c = mpatches.Circle((0.5, 0.5), 0.25, facecolor="green",
                     edgecolor="red", linewidth=3)
-plt.gca().add_patch(c)
 
-plt.legend([c], ["An ellipse, not a rectangle"],
-           handler_map={mpatches.Circle: HandlerEllipse()})
+fig, ax = plt.subplots()
+
+ax.add_patch(c)
+ax.legend([c], ["An ellipse, not a rectangle"],
+          handler_map={mpatches.Circle: HandlerEllipse()})
diff --git a/tutorials/intermediate/tight_layout_guide.py b/tutorials/intermediate/tight_layout_guide.py
index bafd50e4ec28..e36fd05822c2 100644
--- a/tutorials/intermediate/tight_layout_guide.py
+++ b/tutorials/intermediate/tight_layout_guide.py
@@ -46,9 +46,9 @@ def example_plot(ax, fontsize=12):
 
 ###############################################################################
 # To prevent this, the location of axes needs to be adjusted. For
-# subplots, this can be done by adjusting the subplot params
-# (:ref:`howto-subplots-adjust`). Matplotlib v1.1 introduced
-# `.Figure.tight_layout` that does this automatically for you.
+# subplots, this can be done manually by adjusting the subplot parameters
+# using `.Figure.subplots_adjust`. `.Figure.tight_layout` does this
+# automatically.
 
 fig, ax = plt.subplots()
 example_plot(ax, fontsize=24)
@@ -117,7 +117,7 @@ def example_plot(ax, fontsize=12):
 ###############################################################################
 # It works with subplots created with
 # :func:`~matplotlib.pyplot.subplot2grid`. In general, subplots created
-# from the gridspec (:doc:`/tutorials/intermediate/gridspec`) will work.
+# from the gridspec (:doc:`/tutorials/intermediate/arranging_axes`) will work.
 
 plt.close('all')
 fig = plt.figure()
@@ -276,7 +276,7 @@ def example_plot(ax, fontsize=12):
 
 ###############################################################################
 # Another option is to use the AxesGrid1 toolkit to
-# explicitly create an axes for the colorbar.
+# explicitly create an Axes for the colorbar.
 
 from mpl_toolkits.axes_grid1 import make_axes_locatable
 
diff --git a/tutorials/introductory/customizing.py b/tutorials/introductory/customizing.py
index 993692bc8dd0..ea6b501e99ea 100644
--- a/tutorials/introductory/customizing.py
+++ b/tutorials/introductory/customizing.py
@@ -1,32 +1,113 @@
 """
 .. redirect-from:: /users/customizing
 
+=====================================================
 Customizing Matplotlib with style sheets and rcParams
 =====================================================
 
 Tips for customizing the properties and default styles of Matplotlib.
 
-Using style sheets
-------------------
+There are three ways to customize Matplotlib:
+
+    1. :ref:`Setting rcParams at runtime<customizing-with-dynamic-rc-settings>`.
+    2. :ref:`Using style sheets<customizing-with-style-sheets>`.
+    3. :ref:`Changing your matplotlibrc file<customizing-with-matplotlibrc-files>`.
+
+Setting rcParams at runtime takes precedence over style sheets, style
+sheets take precedence over :file:`matplotlibrc` files.
 
-The :mod:`.style` package adds support for easy-to-switch plotting
-"styles" with the same parameters as a :ref:`matplotlib rc
-<customizing-with-matplotlibrc-files>` file (which is read at startup to
-configure Matplotlib).
+.. _customizing-with-dynamic-rc-settings:
 
-There are a number of pre-defined styles :doc:`provided by Matplotlib
-</gallery/style_sheets/style_sheets_reference>`. For
-example, there's a pre-defined style called "ggplot", which emulates the
-aesthetics of ggplot_ (a popular plotting package for R_). To use this style,
-just add:
+Runtime rc settings
+===================
+
+You can dynamically change the default rc (runtime configuration)
+settings in a python script or interactively from the python shell. All
+rc settings are stored in a dictionary-like variable called
+:data:`matplotlib.rcParams`, which is global to the matplotlib package.
+See `matplotlib.rcParams` for a full list of configurable rcParams.
+rcParams can be modified directly, for example:
 """
 
 import numpy as np
 import matplotlib.pyplot as plt
 import matplotlib as mpl
 from cycler import cycler
-plt.style.use('ggplot')
+mpl.rcParams['lines.linewidth'] = 2
+mpl.rcParams['lines.linestyle'] = '--'
 data = np.random.randn(50)
+plt.plot(data)
+
+###############################################################################
+# Note, that in order to change the usual `~.Axes.plot` color you have to
+# change the *prop_cycle* property of *axes*:
+
+mpl.rcParams['axes.prop_cycle'] = cycler(color=['r', 'g', 'b', 'y'])
+plt.plot(data)  # first color is red
+
+###############################################################################
+# Matplotlib also provides a couple of convenience functions for modifying rc
+# settings. `matplotlib.rc` can be used to modify multiple
+# settings in a single group at once, using keyword arguments:
+
+mpl.rc('lines', linewidth=4, linestyle='-.')
+plt.plot(data)
+
+###############################################################################
+# Temporary rc settings
+# ---------------------
+#
+# The :data:`matplotlib.rcParams` object can also be changed temporarily using
+# the `matplotlib.rc_context` context manager:
+
+with mpl.rc_context({'lines.linewidth': 2, 'lines.linestyle': ':'}):
+    plt.plot(data)
+
+###############################################################################
+# `matplotlib.rc_context` can also be used as a decorator to modify the
+# defaults within a function:
+
+
+@mpl.rc_context({'lines.linewidth': 3, 'lines.linestyle': '-'})
+def plotting_function():
+    plt.plot(data)
+
+plotting_function()
+
+###############################################################################
+# `matplotlib.rcdefaults` will restore the standard Matplotlib
+# default settings.
+#
+# There is some degree of validation when setting the values of rcParams, see
+# :mod:`matplotlib.rcsetup` for details.
+
+###############################################################################
+# .. _customizing-with-style-sheets:
+#
+# Using style sheets
+# ==================
+#
+# Another way to change the visual appearance of plots is to set the
+# rcParams in a so-called style sheet and import that style sheet with
+# `matplotlib.style.use`. In this way you can switch easily between
+# different styles by simply changing the imported style sheet. A style
+# sheets looks the same as a :ref:`matplotlibrc<matplotlibrc-sample>`
+# file, but in a style sheet you can only set rcParams that are related
+# to the actual style of a plot. Other rcParams, like *backend*, will be
+# ignored. :file:`matplotlibrc` files support all rcParams. The
+# rationale behind this is to make style sheets portable between
+# different machines without having to worry about dependencies which
+# might or might not be installed on another machine. For a full list of
+# rcParams see `matplotlib.rcParams`. For a list of rcParams that are
+# ignored in style sheets see `matplotlib.style.use`.
+#
+# There are a number of pre-defined styles :doc:`provided by Matplotlib
+# </gallery/style_sheets/style_sheets_reference>`. For
+# example, there's a pre-defined style called "ggplot", which emulates the
+# aesthetics of ggplot_ (a popular plotting package for R_). To use this
+# style, add:
+
+plt.style.use('ggplot')
 
 ###############################################################################
 # To list all available styles, use:
@@ -104,59 +185,18 @@
 plt.show()
 
 ###############################################################################
-# .. _matplotlib-rcparams:
-#
-# Matplotlib rcParams
-# ===================
-#
-# .. _customizing-with-dynamic-rc-settings:
-#
-# Dynamic rc settings
-# -------------------
-#
-# You can also dynamically change the default rc settings in a python script or
-# interactively from the python shell. All of the rc settings are stored in a
-# dictionary-like variable called :data:`matplotlib.rcParams`, which is global to
-# the matplotlib package. rcParams can be modified directly, for example:
-
-mpl.rcParams['lines.linewidth'] = 2
-mpl.rcParams['lines.linestyle'] = '--'
-plt.plot(data)
-
-###############################################################################
-# Note, that in order to change the usual `~.Axes.plot` color you have to
-# change the *prop_cycle* property of *axes*:
-
-mpl.rcParams['axes.prop_cycle'] = cycler(color=['r', 'g', 'b', 'y'])
-plt.plot(data)  # first color is red
-
-###############################################################################
-# Matplotlib also provides a couple of convenience functions for modifying rc
-# settings. `matplotlib.rc` can be used to modify multiple
-# settings in a single group at once, using keyword arguments:
-
-mpl.rc('lines', linewidth=4, linestyle='-.')
-plt.plot(data)
-
-###############################################################################
-# `matplotlib.rcdefaults` will restore the standard Matplotlib
-# default settings.
-#
-# There is some degree of validation when setting the values of rcParams, see
-# :mod:`matplotlib.rcsetup` for details.
-#
 # .. _customizing-with-matplotlibrc-files:
 #
 # The :file:`matplotlibrc` file
-# -----------------------------
+# =============================
 #
 # Matplotlib uses :file:`matplotlibrc` configuration files to customize all
 # kinds of properties, which we call 'rc settings' or 'rc parameters'. You can
 # control the defaults of almost every property in Matplotlib: figure size and
 # DPI, line width, color and style, axes, axis and grid properties, text and
-# font properties and so on. When a URL or path is not specified with a call to
-# ``style.use('<path>/<style-name>.mplstyle')``, Matplotlib looks for
-# :file:`matplotlibrc` in four locations, in the following order:
+# font properties and so on. The :file:`matplotlibrc` is read at startup to
+# configure Matplotlib. Matplotlib looks for :file:`matplotlibrc` in four
+# locations, in the following order:
 #
 # 1. :file:`matplotlibrc` in the current working directory, usually used for
 #    specific customizations that you do not want to apply elsewhere.
@@ -177,14 +217,18 @@
 #
 # 4. :file:`{INSTALL}/matplotlib/mpl-data/matplotlibrc`, where
 #    :file:`{INSTALL}` is something like
-#    :file:`/usr/lib/python3.7/site-packages` on Linux, and maybe
-#    :file:`C:\\Python37\\Lib\\site-packages` on Windows. Every time you
+#    :file:`/usr/lib/python3.9/site-packages` on Linux, and maybe
+#    :file:`C:\\Python39\\Lib\\site-packages` on Windows. Every time you
 #    install matplotlib, this file will be overwritten, so if you want
 #    your customizations to be saved, please move this file to your
 #    user-specific matplotlib directory.
 #
-# Once a :file:`matplotlibrc` file has been found, it will *not* search any of
-# the other paths.
+# Once a :file:`matplotlibrc` file has been found, it will *not* search
+# any of the other paths. When a
+# :ref:`style sheet<customizing-with-style-sheets>` is given with
+# ``style.use('<path>/<style-name>.mplstyle')``, settings specified in
+# the style sheet take precedence over settings in the
+# :file:`matplotlibrc` file.
 #
 # To display where the currently active :file:`matplotlibrc` file was
 # loaded from, one can do the following::
@@ -193,14 +237,15 @@
 #   >>> matplotlib.matplotlib_fname()
 #   '/home/foo/.config/matplotlib/matplotlibrc'
 #
-# See below for a sample :ref:`matplotlibrc file<matplotlibrc-sample>`.
+# See below for a sample :ref:`matplotlibrc file<matplotlibrc-sample>`
+# and see `matplotlib.rcParams` for a full list of configurable rcParams.
 #
 # .. _matplotlibrc-sample:
 #
-# A sample matplotlibrc file
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~
+# The default :file:`matplotlibrc` file
+# -------------------------------------
 #
-# .. literalinclude:: ../../../matplotlibrc.template
+# .. literalinclude:: ../../../lib/matplotlib/mpl-data/matplotlibrc
 #
 #
 # .. _ggplot: https://ggplot2.tidyverse.org/
diff --git a/tutorials/introductory/images.py b/tutorials/introductory/images.py
index 858c3ccd262f..3f816b5b6afd 100644
--- a/tutorials/introductory/images.py
+++ b/tutorials/introductory/images.py
@@ -33,19 +33,19 @@
 notebook.  This has important implications for interactivity.  For inline plotting, commands in
 cells below the cell that outputs a plot will not affect the plot.  For example,
 changing the colormap is not possible from cells below the cell that creates a plot.
-However, for other backends, such as Qt5, that open a separate window,
+However, for other backends, such as Qt, that open a separate window,
 cells below those that create the plot will change the plot - it is a
 live object in memory.
 
-This tutorial will use Matplotlib's imperative-style plotting
-interface, pyplot.  This interface maintains global state, and is very
-useful for quickly and easily experimenting with various plot
-settings.  The alternative is the object-oriented interface, which is also
-very powerful, and generally more suitable for large application
-development.  If you'd like to learn about the object-oriented
-interface, a great place to start is our :doc:`Usage guide
-</tutorials/introductory/usage>`.  For now, let's get on
-with the imperative-style approach:
+This tutorial will use Matplotlib's implicit plotting interface, pyplot.  This
+interface maintains global state, and is very useful for quickly and easily
+experimenting with various plot settings.  The alternative is the explicit,
+which is more suitable for large application development.  For an explanation
+of the tradeoffs between the implicit and explicit interfaces see
+:ref:`api_interfaces` and the :doc:`Quick start guide
+</tutorials/introductory/quick_start>` to start using the explicit interface.
+For now, let's get on with the implicit approach:
+
 """
 
 import matplotlib.pyplot as plt
@@ -69,7 +69,7 @@
 # on where you get your data, the other kinds of image that you'll most
 # likely encounter are RGBA images, which allow for transparency, or
 # single-channel grayscale (luminosity) images.  Download `stinkbug.png
-# <https://raw.githubusercontent.com/matplotlib/matplotlib/master/doc/_static/stinkbug.png>`_
+# <https://raw.githubusercontent.com/matplotlib/matplotlib/main/doc/_static/stinkbug.png>`_
 # to your computer for the rest of this tutorial.
 #
 # And here we go...
@@ -91,7 +91,7 @@
 #
 # Each inner list represents a pixel.  Here, with an RGB image, there
 # are 3 values.  Since it's a black and white image, R, G, and B are all
-# similar.  An RGBA (where A is alpha, or transparency), has 4 values
+# similar.  An RGBA (where A is alpha, or transparency) has 4 values
 # per inner list, and a simple luminance image just has one value (and
 # is thus only a 2-D array, not a 3-D array).  For RGB and RGBA images,
 # Matplotlib supports float32 and uint8 data types.  For grayscale,
@@ -127,13 +127,11 @@
 # Pseudocolor is only relevant to single-channel, grayscale, luminosity
 # images.  We currently have an RGB image.  Since R, G, and B are all
 # similar (see for yourself above or in your data), we can just pick one
-# channel of our data:
+# channel of our data using array slicing (you can read more in the
+# `Numpy tutorial <https://numpy.org/doc/stable/user/quickstart.html
+# #indexing-slicing-and-iterating>`_):
 
 lum_img = img[:, :, 0]
-
-# This is array slicing.  You can read more in the `Numpy tutorial
-# <https://docs.scipy.org/doc/numpy/user/quickstart.html>`_.
-
 plt.imshow(lum_img)
 
 ###############################################################################
@@ -245,7 +243,7 @@
 from PIL import Image
 
 img = Image.open('../../doc/_static/stinkbug.png')
-img.thumbnail((64, 64), Image.ANTIALIAS)  # resizes image in-place
+img.thumbnail((64, 64))  # resizes image in-place
 imgplot = plt.imshow(img)
 
 ###############################################################################
diff --git a/tutorials/introductory/lifecycle.py b/tutorials/introductory/lifecycle.py
index 00732d4acaed..b0181b4df7b7 100644
--- a/tutorials/introductory/lifecycle.py
+++ b/tutorials/introductory/lifecycle.py
@@ -13,20 +13,23 @@
 .. note::
 
     This tutorial is based on
-    `this excellent blog post <http://pbpython.com/effective-matplotlib.html>`_
+    `this excellent blog post
+    <https://pbpython.com/effective-matplotlib.html>`_
     by Chris Moffitt. It was transformed into this tutorial by Chris Holdgraf.
 
-A note on the Object-Oriented API vs. Pyplot
-============================================
+A note on the explicit vs. implicit interfaces
+==============================================
 
-Matplotlib has two interfaces. The first is an object-oriented (OO)
-interface. In this case, we utilize an instance of :class:`axes.Axes`
-in order to render visualizations on an instance of :class:`figure.Figure`.
+Matplotlib has two interfaces. For an explanation of the trade-offs between the
+explicit and implicit interfaces see :ref:`api_interfaces`.
 
-The second is based on MATLAB and uses a state-based interface. This is
-encapsulated in the :mod:`.pyplot` module. See the :doc:`pyplot tutorials
-</tutorials/introductory/pyplot>` for a more in-depth look at the pyplot
-interface.
+In the explicit object-oriented (OO) interface we directly utilize instances of
+:class:`axes.Axes` to build up the visualization in an instance of
+:class:`figure.Figure`.  In the implicit interface, inspired by and modeled on
+MATLAB, uses an global state-based interface which is is encapsulated in the
+:mod:`.pyplot` module to plot to the "current Axes".  See the :doc:`pyplot
+tutorials </tutorials/introductory/pyplot>` for a more in-depth look at the
+pyplot interface.
 
 Most of the terms are straightforward but the main thing to remember
 is that:
@@ -40,14 +43,15 @@
 
 .. note::
 
-   In general, try to use the object-oriented interface over the pyplot
-   interface.
+   In general prefer the explicit interface over the implicit pyplot interface
+   for plotting.
 
 Our data
 ========
 
 We'll use the data from the post from which this tutorial was derived.
 It contains sales information for a number of companies.
+
 """
 
 # sphinx_gallery_thumbnail_number = 10
@@ -169,14 +173,14 @@
 
 ###############################################################################
 # We can also adjust the size of this plot using the :func:`pyplot.subplots`
-# function. We can do this with the ``figsize`` kwarg.
+# function. We can do this with the *figsize* keyword argument.
 #
 # .. note::
 #
-#    While indexing in NumPy follows the form (row, column), the figsize
-#    kwarg follows the form (width, height). This follows conventions in
-#    visualization, which unfortunately are different from those of linear
-#    algebra.
+#    While indexing in NumPy follows the form (row, column), the *figsize*
+#    keyword argument follows the form (width, height). This follows
+#    conventions in visualization, which unfortunately are different from those
+#    of linear algebra.
 
 fig, ax = plt.subplots(figsize=(8, 4))
 ax.barh(group_names, group_data)
@@ -198,7 +202,7 @@
 
 
 def currency(x, pos):
-    """The two args are the value and tick position"""
+    """The two arguments are the value and tick position"""
     if x >= 1e6:
         s = '${:1.1f}M'.format(x*1e-6)
     else:
diff --git a/tutorials/introductory/pyplot.py b/tutorials/introductory/pyplot.py
index 1a8167c0616c..9b15a956efb8 100644
--- a/tutorials/introductory/pyplot.py
+++ b/tutorials/introductory/pyplot.py
@@ -3,19 +3,21 @@
 Pyplot tutorial
 ===============
 
-An introduction to the pyplot interface.
+An introduction to the pyplot interface.  Please also see
+:doc:`/tutorials/introductory/quick_start` for an overview of how Matplotlib
+works and :ref:`api_interfaces` for an explanation of the trade-offs between the
+supported user APIs.
+
 """
 
 ###############################################################################
 # Intro to pyplot
 # ===============
 #
-# :mod:`matplotlib.pyplot` is a collection of functions
-# that make matplotlib work like MATLAB.
-# Each ``pyplot`` function makes
-# some change to a figure: e.g., creates a figure, creates a plotting area
-# in a figure, plots some lines in a plotting area, decorates the plot
-# with labels, etc.
+# :mod:`matplotlib.pyplot` is a collection of functions that make matplotlib
+# work like MATLAB.  Each ``pyplot`` function makes some change to a figure:
+# e.g., creates a figure, creates a plotting area in a figure, plots some lines
+# in a plotting area, decorates the plot with labels, etc.
 #
 # In :mod:`matplotlib.pyplot` various states are preserved
 # across function calls, so that it keeps track of things like
@@ -27,10 +29,11 @@
 #
 # .. note::
 #
-#    the pyplot API is generally less-flexible than the object-oriented API.
-#    Most of the function calls you see here can also be called as methods
-#    from an ``Axes`` object. We recommend browsing the tutorials and
-#    examples to see how this works.
+#    the implicit pyplot API is generally less verbose but also not as flexible as the
+#    explicit API.  Most of the function calls you see here can also be called
+#    as methods from an ``Axes`` object. We recommend browsing the tutorials
+#    and examples to see how this works. See :ref:`api_interfaces` for an
+#    explanation of the trade off of the supported user APIs.
 #
 # Generating visualizations with pyplot is very quick:
 
@@ -77,7 +80,7 @@
 #
 # If matplotlib were limited to working with lists, it would be fairly
 # useless for numeric processing.  Generally, you will use `numpy
-# <http://www.numpy.org>`_ arrays.  In fact, all sequences are
+# <https://numpy.org/>`_ arrays.  In fact, all sequences are
 # converted to numpy arrays internally.  The example below illustrates
 # plotting several lines with different format styles in one function call
 # using arrays.
@@ -150,7 +153,7 @@
 # antialiased, etc; see `matplotlib.lines.Line2D`.  There are
 # several ways to set line properties
 #
-# * Use keyword args::
+# * Use keyword arguments::
 #
 #       plt.plot(x, y, linewidth=2.0)
 #
@@ -171,7 +174,7 @@
 #   MATLAB-style string/value pairs::
 #
 #       lines = plt.plot(x1, y1, x2, y2)
-#       # use keyword args
+#       # use keyword arguments
 #       plt.setp(lines, color='r', linewidth=2.0)
 #       # or MATLAB style string value pairs
 #       plt.setp(lines, 'color', 'r', 'linewidth', 2.0)
@@ -259,7 +262,7 @@ def f(t):
 
 ###############################################################################
 # The `~.pyplot.figure` call here is optional because a figure will be created
-# if none exists, just as an axes will be created (equivalent to an explicit
+# if none exists, just as an Axes will be created (equivalent to an explicit
 # ``subplot()`` call) if none exists.
 # The `~.pyplot.subplot` call specifies ``numrows,
 # numcols, plot_number`` where ``plot_number`` ranges from 1 to
@@ -268,15 +271,14 @@ def f(t):
 # to ``subplot(2, 1, 1)``.
 #
 # You can create an arbitrary number of subplots
-# and axes.  If you want to place an axes manually, i.e., not on a
+# and axes.  If you want to place an Axes manually, i.e., not on a
 # rectangular grid, use `~.pyplot.axes`,
 # which allows you to specify the location as ``axes([left, bottom,
 # width, height])`` where all values are in fractional (0 to 1)
 # coordinates.  See :doc:`/gallery/subplots_axes_and_figures/axes_demo` for an example of
-# placing axes manually and :doc:`/gallery/subplots_axes_and_figures/subplot_demo` for an
+# placing axes manually and :doc:`/gallery/subplots_axes_and_figures/subplot` for an
 # example with lots of subplots.
 #
-#
 # You can create multiple figures by using multiple
 # `~.pyplot.figure` calls with an increasing figure
 # number.  Of course, each figure can contain as many axes and subplots
@@ -293,15 +295,17 @@ def f(t):
 #     plt.figure(2)                # a second figure
 #     plt.plot([4, 5, 6])          # creates a subplot() by default
 #
-#     plt.figure(1)                # figure 1 current; subplot(212) still current
-#     plt.subplot(211)             # make subplot(211) in figure1 current
+#     plt.figure(1)                # first figure current;
+#                                  # subplot(212) still current
+#     plt.subplot(211)             # make subplot(211) in the first figure
+#                                  # current
 #     plt.title('Easy as 1, 2, 3') # subplot 211 title
 #
 # You can clear the current figure with `~.pyplot.clf`
 # and the current axes with `~.pyplot.cla`.  If you find
 # it annoying that states (specifically the current image, figure and axes)
 # are being maintained for you behind the scenes, don't despair: this is just a thin
-# stateful wrapper around an object oriented API, which you can use
+# stateful wrapper around an object-oriented API, which you can use
 # instead (see :doc:`/tutorials/intermediate/artists`)
 #
 # If you are making lots of figures, you need to be aware of one
@@ -327,7 +331,7 @@ def f(t):
 x = mu + sigma * np.random.randn(10000)
 
 # the histogram of the data
-n, bins, patches = plt.hist(x, 50, density=1, facecolor='g', alpha=0.75)
+n, bins, patches = plt.hist(x, 50, density=True, facecolor='g', alpha=0.75)
 
 
 plt.xlabel('Smarts')
@@ -461,5 +465,5 @@ def f(t):
 plt.show()
 
 ###############################################################################
-# It is also possible to add your own scale, see :ref:`adding-new-scales` for
+# It is also possible to add your own scale, see `matplotlib.scale` for
 # details.
diff --git a/tutorials/introductory/quick_start.py b/tutorials/introductory/quick_start.py
new file mode 100644
index 000000000000..42edbc03b10f
--- /dev/null
+++ b/tutorials/introductory/quick_start.py
@@ -0,0 +1,577 @@
+"""
+*****************
+Quick start guide
+*****************
+
+This tutorial covers some basic usage patterns and best practices to
+help you get started with Matplotlib.
+
+.. redirect-from:: /tutorials/introductory/usage
+
+"""
+
+# sphinx_gallery_thumbnail_number = 3
+import matplotlib as mpl
+import matplotlib.pyplot as plt
+import numpy as np
+
+##############################################################################
+#
+# A simple example
+# ================
+#
+# Matplotlib graphs your data on `.Figure`\s (e.g., windows, Jupyter
+# widgets, etc.), each of which can contain one or more `~.axes.Axes`, an
+# area where points can be specified in terms of x-y coordinates (or theta-r
+# in a polar plot, x-y-z in a 3D plot, etc).  The simplest way of
+# creating a Figure with an Axes is using `.pyplot.subplots`. We can then use
+# `.Axes.plot` to draw some data on the Axes:
+
+fig, ax = plt.subplots()  # Create a figure containing a single axes.
+ax.plot([1, 2, 3, 4], [1, 4, 2, 3]);  # Plot some data on the axes.
+
+###############################################################################
+# .. _figure_parts:
+#
+# Parts of a Figure
+# =================
+#
+# Here are the components of a Matplotlib Figure.
+#
+# .. image:: ../../_static/anatomy.png
+#
+# :class:`~matplotlib.figure.Figure`
+# ----------------------------------
+#
+# The **whole** figure.  The Figure keeps
+# track of all the child :class:`~matplotlib.axes.Axes`, a group of
+# 'special' Artists (titles, figure legends, colorbars, etc), and
+# even nested subfigures.
+#
+# The easiest way to create a new Figure is with pyplot::
+#
+#    fig = plt.figure()  # an empty figure with no Axes
+#    fig, ax = plt.subplots()  # a figure with a single Axes
+#    fig, axs = plt.subplots(2, 2)  # a figure with a 2x2 grid of Axes
+#
+# It is often convenient to create the Axes together with the Figure, but you
+# can also manually add Axes later on.  Note that many
+# :doc:`Matplotlib backends </users/explain/backends>` support zooming and
+# panning on figure windows.
+#
+# :class:`~matplotlib.axes.Axes`
+# ------------------------------
+#
+# An Axes is an Artist attached to a Figure that contains a region for
+# plotting data, and usually includes two (or three in the case of 3D)
+# :class:`~matplotlib.axis.Axis` objects (be aware of the difference
+# between **Axes** and **Axis**) that provide ticks and tick labels to
+# provide scales for the data in the Axes. Each :class:`~.axes.Axes` also
+# has a title
+# (set via :meth:`~matplotlib.axes.Axes.set_title`), an x-label (set via
+# :meth:`~matplotlib.axes.Axes.set_xlabel`), and a y-label set via
+# :meth:`~matplotlib.axes.Axes.set_ylabel`).
+#
+# The :class:`~.axes.Axes` class and its member functions are the primary
+# entry point to working with the OOP interface, and have most of the
+# plotting methods defined on them (e.g. ``ax.plot()``, shown above, uses
+# the `~.Axes.plot` method)
+#
+# :class:`~matplotlib.axis.Axis`
+# ------------------------------
+#
+# These objects set the scale and limits and generate ticks (the marks
+# on the Axis) and ticklabels (strings labeling the ticks).  The location
+# of the ticks is determined by a `~matplotlib.ticker.Locator` object and the
+# ticklabel strings are formatted by a `~matplotlib.ticker.Formatter`.  The
+# combination of the correct `.Locator` and `.Formatter` gives very fine
+# control over the tick locations and labels.
+#
+# :class:`~matplotlib.artist.Artist`
+# ----------------------------------
+#
+# Basically, everything visible on the Figure is an Artist (even
+# `.Figure`, `Axes <.axes.Axes>`, and `~.axis.Axis` objects).  This includes
+# `.Text` objects, `.Line2D` objects, :mod:`.collections` objects, `.Patch`
+# objects, etc. When the Figure is rendered, all of the
+# Artists are drawn to the **canvas**.  Most Artists are tied to an Axes; such
+# an Artist cannot be shared by multiple Axes, or moved from one to another.
+#
+# .. _input_types:
+#
+# Types of inputs to plotting functions
+# =====================================
+#
+# Plotting functions expect `numpy.array` or `numpy.ma.masked_array` as
+# input, or objects that can be passed to `numpy.asarray`.
+# Classes that are similar to arrays ('array-like') such as `pandas`
+# data objects and `numpy.matrix` may not work as intended.  Common convention
+# is to convert these to `numpy.array` objects prior to plotting.
+# For example, to convert a `numpy.matrix` ::
+#
+#   b = np.matrix([[1, 2], [3, 4]])
+#   b_asarray = np.asarray(b)
+#
+# Most methods will also parse an addressable object like a *dict*, a
+# `numpy.recarray`, or a `pandas.DataFrame`.  Matplotlib allows you provide
+# the ``data`` keyword argument and generate plots passing the strings
+# corresponding to the *x* and *y* variables.
+np.random.seed(19680801)  # seed the random number generator.
+data = {'a': np.arange(50),
+        'c': np.random.randint(0, 50, 50),
+        'd': np.random.randn(50)}
+data['b'] = data['a'] + 10 * np.random.randn(50)
+data['d'] = np.abs(data['d']) * 100
+
+fig, ax = plt.subplots(figsize=(5, 2.7), layout='constrained')
+ax.scatter('a', 'b', c='c', s='d', data=data)
+ax.set_xlabel('entry a')
+ax.set_ylabel('entry b');
+
+##############################################################################
+# .. _coding_styles:
+#
+# Coding styles
+# =============
+#
+# The explicit and the implicit interfaces
+# ----------------------------------------
+#
+# As noted above, there are essentially two ways to use Matplotlib:
+#
+# - Explicitly create Figures and Axes, and call methods on them (the
+#   "object-oriented (OO) style").
+# - Rely on pyplot to implicitly create and manage the Figures and Axes, and
+#   use pyplot functions for plotting.
+#
+# See :ref:`api_interfaces` for an explanation of the tradeoffs between the
+# implicit and explicit interfaces.
+#
+# So one can use the OO-style
+
+x = np.linspace(0, 2, 100)  # Sample data.
+
+# Note that even in the OO-style, we use `.pyplot.figure` to create the Figure.
+fig, ax = plt.subplots(figsize=(5, 2.7), layout='constrained')
+ax.plot(x, x, label='linear')  # Plot some data on the axes.
+ax.plot(x, x**2, label='quadratic')  # Plot more data on the axes...
+ax.plot(x, x**3, label='cubic')  # ... and some more.
+ax.set_xlabel('x label')  # Add an x-label to the axes.
+ax.set_ylabel('y label')  # Add a y-label to the axes.
+ax.set_title("Simple Plot")  # Add a title to the axes.
+ax.legend();  # Add a legend.
+
+###############################################################################
+# or the pyplot-style:
+
+x = np.linspace(0, 2, 100)  # Sample data.
+
+plt.figure(figsize=(5, 2.7), layout='constrained')
+plt.plot(x, x, label='linear')  # Plot some data on the (implicit) axes.
+plt.plot(x, x**2, label='quadratic')  # etc.
+plt.plot(x, x**3, label='cubic')
+plt.xlabel('x label')
+plt.ylabel('y label')
+plt.title("Simple Plot")
+plt.legend();
+
+###############################################################################
+# (In addition, there is a third approach, for the case when embedding
+# Matplotlib in a GUI application, which completely drops pyplot, even for
+# figure creation. See the corresponding section in the gallery for more info:
+# :ref:`user_interfaces`.)
+#
+# Matplotlib's documentation and examples use both the OO and the pyplot
+# styles. In general, we suggest using the OO style, particularly for
+# complicated plots, and functions and scripts that are intended to be reused
+# as part of a larger project. However, the pyplot style can be very convenient
+# for quick interactive work.
+#
+# .. note::
+#
+#    You may find older examples that use the ``pylab`` interface,
+#    via ``from pylab import *``. This approach is strongly deprecated.
+#
+# Making a helper functions
+# -------------------------
+#
+# If you need to make the same plots over and over again with different data
+# sets, or want to easily wrap Matplotlib methods, use the recommended
+# signature function below.
+
+
+def my_plotter(ax, data1, data2, param_dict):
+    """
+    A helper function to make a graph.
+    """
+    out = ax.plot(data1, data2, **param_dict)
+    return out
+
+###############################################################################
+# which you would then use twice to populate two subplots:
+
+data1, data2, data3, data4 = np.random.randn(4, 100)  # make 4 random data sets
+fig, (ax1, ax2) = plt.subplots(1, 2, figsize=(5, 2.7))
+my_plotter(ax1, data1, data2, {'marker': 'x'})
+my_plotter(ax2, data3, data4, {'marker': 'o'});
+
+###############################################################################
+# Note that if you want to install these as a python package, or any other
+# customizations you could use one of the many templates on the web;
+# Matplotlib has one at `mpl-cookiecutter
+# <https://github.com/matplotlib/matplotlib-extension-cookiecutter>`_
+#
+#
+# Styling Artists
+# ===============
+#
+# Most plotting methods have styling options for the Artists, accessible either
+# when a plotting method is called, or from a "setter" on the Artist.  In the
+# plot below we manually set the *color*, *linewidth*, and *linestyle* of the
+# Artists created by `~.Axes.plot`, and we set the linestyle of the second line
+# after the fact with `~.Line2D.set_linestyle`.
+
+fig, ax = plt.subplots(figsize=(5, 2.7))
+x = np.arange(len(data1))
+ax.plot(x, np.cumsum(data1), color='blue', linewidth=3, linestyle='--')
+l, = ax.plot(x, np.cumsum(data2), color='orange', linewidth=2)
+l.set_linestyle(':');
+
+###############################################################################
+# Colors
+# ------
+#
+# Matplotlib has a very flexible array of colors that are accepted for most
+# Artists; see the :doc:`colors tutorial </tutorials/colors/colors>` for a
+# list of specifications. Some Artists will take multiple colors.  i.e. for
+# a `~.Axes.scatter` plot, the edge of the markers can be different colors
+# from the interior:
+
+fig, ax = plt.subplots(figsize=(5, 2.7))
+ax.scatter(data1, data2, s=50, facecolor='C0', edgecolor='k');
+
+###############################################################################
+# Linewidths, linestyles, and markersizes
+# ---------------------------------------
+#
+# Line widths are typically in typographic points (1 pt = 1/72 inch) and
+# available for Artists that have stroked lines.  Similarly, stroked lines
+# can have a linestyle.  See the :doc:`linestyles example
+# </gallery/lines_bars_and_markers/linestyles>`.
+#
+# Marker size depends on the method being used.  `~.Axes.plot` specifies
+# markersize in points, and is generally the "diameter" or width of the
+# marker.  `~.Axes.scatter` specifies markersize as approximately
+# proportional to the visual area of the marker.  There is an array of
+# markerstyles available as string codes (see :mod:`~.matplotlib.markers`), or
+# users can define their own `~.MarkerStyle` (see
+# :doc:`/gallery/lines_bars_and_markers/marker_reference`):
+
+fig, ax = plt.subplots(figsize=(5, 2.7))
+ax.plot(data1, 'o', label='data1')
+ax.plot(data2, 'd', label='data2')
+ax.plot(data3, 'v', label='data3')
+ax.plot(data4, 's', label='data4')
+ax.legend();
+
+###############################################################################
+#
+# Labelling plots
+# ===============
+#
+# Axes labels and text
+# --------------------
+#
+# `~.Axes.set_xlabel`, `~.Axes.set_ylabel`, and `~.Axes.set_title` are used to
+# add text in the indicated locations (see :doc:`/tutorials/text/text_intro`
+# for more discussion).  Text can also be directly added to plots using
+# `~.Axes.text`:
+
+mu, sigma = 115, 15
+x = mu + sigma * np.random.randn(10000)
+fig, ax = plt.subplots(figsize=(5, 2.7), layout='constrained')
+# the histogram of the data
+n, bins, patches = ax.hist(x, 50, density=True, facecolor='C0', alpha=0.75)
+
+ax.set_xlabel('Length [cm]')
+ax.set_ylabel('Probability')
+ax.set_title('Aardvark lengths\n (not really)')
+ax.text(75, .025, r'$\mu=115,\ \sigma=15$')
+ax.axis([55, 175, 0, 0.03])
+ax.grid(True);
+
+###############################################################################
+# All of the `~.Axes.text` functions return a `matplotlib.text.Text`
+# instance.  Just as with lines above, you can customize the properties by
+# passing keyword arguments into the text functions::
+#
+#   t = ax.set_xlabel('my data', fontsize=14, color='red')
+#
+# These properties are covered in more detail in
+# :doc:`/tutorials/text/text_props`.
+#
+# Using mathematical expressions in text
+# --------------------------------------
+#
+# Matplotlib accepts TeX equation expressions in any text expression.
+# For example to write the expression :math:`\sigma_i=15` in the title,
+# you can write a TeX expression surrounded by dollar signs::
+#
+#     ax.set_title(r'$\sigma_i=15$')
+#
+# where the ``r`` preceding the title string signifies that the string is a
+# *raw* string and not to treat backslashes as python escapes.
+# Matplotlib has a built-in TeX expression parser and
+# layout engine, and ships its own math fonts – for details see
+# :doc:`/tutorials/text/mathtext`.  You can also use LaTeX directly to format
+# your text and incorporate the output directly into your display figures or
+# saved postscript – see :doc:`/tutorials/text/usetex`.
+#
+# Annotations
+# -----------
+#
+# We can also annotate points on a plot, often by connecting an arrow pointing
+# to *xy*, to a piece of text at *xytext*:
+
+fig, ax = plt.subplots(figsize=(5, 2.7))
+
+t = np.arange(0.0, 5.0, 0.01)
+s = np.cos(2 * np.pi * t)
+line, = ax.plot(t, s, lw=2)
+
+ax.annotate('local max', xy=(2, 1), xytext=(3, 1.5),
+            arrowprops=dict(facecolor='black', shrink=0.05))
+
+ax.set_ylim(-2, 2);
+
+###############################################################################
+# In this basic example, both *xy* and *xytext* are in data coordinates.
+# There are a variety of other coordinate systems one can choose -- see
+# :ref:`annotations-tutorial` and :ref:`plotting-guide-annotation` for
+# details.  More examples also can be found in
+# :doc:`/gallery/text_labels_and_annotations/annotation_demo`.
+#
+# Legends
+# -------
+#
+# Often we want to identify lines or markers with a `.Axes.legend`:
+
+fig, ax = plt.subplots(figsize=(5, 2.7))
+ax.plot(np.arange(len(data1)), data1, label='data1')
+ax.plot(np.arange(len(data2)), data2, label='data2')
+ax.plot(np.arange(len(data3)), data3, 'd', label='data3')
+ax.legend();
+
+##############################################################################
+# Legends in Matplotlib are quite flexible in layout, placement, and what
+# Artists they can represent. They are discussed in detail in
+# :doc:`/tutorials/intermediate/legend_guide`.
+#
+# Axis scales and ticks
+# =====================
+#
+# Each Axes has two (or three) `~.axis.Axis` objects representing the x- and
+# y-axis. These control the *scale* of the Axis, the tick *locators* and the
+# tick *formatters*. Additional Axes can be attached to display further Axis
+# objects.
+#
+# Scales
+# ------
+#
+# In addition to the linear scale, Matplotlib supplies non-linear scales,
+# such as a log-scale.  Since log-scales are used so much there are also
+# direct methods like `~.Axes.loglog`, `~.Axes.semilogx`, and
+# `~.Axes.semilogy`.  There are a number of scales (see
+# :doc:`/gallery/scales/scales` for other examples).  Here we set the scale
+# manually:
+
+fig, axs = plt.subplots(1, 2, figsize=(5, 2.7), layout='constrained')
+xdata = np.arange(len(data1))  # make an ordinal for this
+data = 10**data1
+axs[0].plot(xdata, data)
+
+axs[1].set_yscale('log')
+axs[1].plot(xdata, data);
+
+##############################################################################
+# The scale sets the mapping from data values to spacing along the Axis. This
+# happens in both directions, and gets combined into a *transform*, which
+# is the way that Matplotlib maps from data coordinates to Axes, Figure, or
+# screen coordinates.  See :doc:`/tutorials/advanced/transforms_tutorial`.
+#
+# Tick locators and formatters
+# ----------------------------
+#
+# Each Axis has a tick *locator* and *formatter* that choose where along the
+# Axis objects to put tick marks.  A simple interface to this is
+# `~.Axes.set_xticks`:
+
+fig, axs = plt.subplots(2, 1, layout='constrained')
+axs[0].plot(xdata, data1)
+axs[0].set_title('Automatic ticks')
+
+axs[1].plot(xdata, data1)
+axs[1].set_xticks(np.arange(0, 100, 30), ['zero', '30', 'sixty', '90'])
+axs[1].set_yticks([-1.5, 0, 1.5])  # note that we don't need to specify labels
+axs[1].set_title('Manual ticks');
+
+##############################################################################
+# Different scales can have different locators and formatters; for instance
+# the log-scale above uses `~.LogLocator` and `~.LogFormatter`. See
+# :doc:`/gallery/ticks/tick-locators` and
+# :doc:`/gallery/ticks/tick-formatters` for other formatters and
+# locators and information for writing your own.
+#
+# Plotting dates and strings
+# --------------------------
+#
+# Matplotlib can handle plotting arrays of dates and arrays of strings, as
+# well as floating point numbers.  These get special locators and formatters
+# as appropriate.  For dates:
+
+fig, ax = plt.subplots(figsize=(5, 2.7), layout='constrained')
+dates = np.arange(np.datetime64('2021-11-15'), np.datetime64('2021-12-25'),
+                  np.timedelta64(1, 'h'))
+data = np.cumsum(np.random.randn(len(dates)))
+ax.plot(dates, data)
+cdf = mpl.dates.ConciseDateFormatter(ax.xaxis.get_major_locator())
+ax.xaxis.set_major_formatter(cdf);
+
+##############################################################################
+# For more information see the date examples
+# (e.g. :doc:`/gallery/text_labels_and_annotations/date`)
+#
+# For strings, we get categorical plotting (see:
+# :doc:`/gallery/lines_bars_and_markers/categorical_variables`).
+
+fig, ax = plt.subplots(figsize=(5, 2.7), layout='constrained')
+categories = ['turnips', 'rutabaga', 'cucumber', 'pumpkins']
+
+ax.bar(categories, np.random.rand(len(categories)));
+
+##############################################################################
+# One caveat about categorical plotting is that some methods of parsing
+# text files return a list of strings, even if the strings all represent
+# numbers or dates.  If you pass 1000 strings, Matplotlib will think you
+# meant 1000 categories and will add 1000 ticks to your plot!
+#
+#
+# Additional Axis objects
+# ------------------------
+#
+# Plotting data of different magnitude in one chart may require
+# an additional y-axis. Such an Axis can be created by using
+# `~.Axes.twinx` to add a new Axes with an invisible x-axis and a y-axis
+# positioned at the right (analogously for `~.Axes.twiny`). See
+# :doc:`/gallery/subplots_axes_and_figures/two_scales` for another example.
+#
+# Similarly, you can add a `~.Axes.secondary_xaxis` or
+# `~.Axes.secondary_yaxis` having a different scale than the main Axis to
+# represent the data in different scales or units. See
+# :doc:`/gallery/subplots_axes_and_figures/secondary_axis` for further
+# examples.
+
+fig, (ax1, ax3) = plt.subplots(1, 2, figsize=(7, 2.7), layout='constrained')
+l1, = ax1.plot(t, s)
+ax2 = ax1.twinx()
+l2, = ax2.plot(t, range(len(t)), 'C1')
+ax2.legend([l1, l2], ['Sine (left)', 'Straight (right)'])
+
+ax3.plot(t, s)
+ax3.set_xlabel('Angle [rad]')
+ax4 = ax3.secondary_xaxis('top', functions=(np.rad2deg, np.deg2rad))
+ax4.set_xlabel('Angle [°]')
+
+##############################################################################
+# Color mapped data
+# =================
+#
+# Often we want to have a third dimension in a plot represented by a colors in
+# a colormap. Matplotlib has a number of plot types that do this:
+
+X, Y = np.meshgrid(np.linspace(-3, 3, 128), np.linspace(-3, 3, 128))
+Z = (1 - X/2 + X**5 + Y**3) * np.exp(-X**2 - Y**2)
+
+fig, axs = plt.subplots(2, 2, layout='constrained')
+pc = axs[0, 0].pcolormesh(X, Y, Z, vmin=-1, vmax=1, cmap='RdBu_r')
+fig.colorbar(pc, ax=axs[0, 0])
+axs[0, 0].set_title('pcolormesh()')
+
+co = axs[0, 1].contourf(X, Y, Z, levels=np.linspace(-1.25, 1.25, 11))
+fig.colorbar(co, ax=axs[0, 1])
+axs[0, 1].set_title('contourf()')
+
+pc = axs[1, 0].imshow(Z**2 * 100, cmap='plasma',
+                          norm=mpl.colors.LogNorm(vmin=0.01, vmax=100))
+fig.colorbar(pc, ax=axs[1, 0], extend='both')
+axs[1, 0].set_title('imshow() with LogNorm()')
+
+pc = axs[1, 1].scatter(data1, data2, c=data3, cmap='RdBu_r')
+fig.colorbar(pc, ax=axs[1, 1], extend='both')
+axs[1, 1].set_title('scatter()')
+
+##############################################################################
+# Colormaps
+# ---------
+#
+# These are all examples of Artists that derive from  `~.ScalarMappable`
+# objects.  They all can set a linear mapping between *vmin* and *vmax* into
+# the colormap specified by *cmap*.  Matplotlib has many colormaps to choose
+# from (:doc:`/tutorials/colors/colormaps`) you can make your
+# own (:doc:`/tutorials/colors/colormap-manipulation`) or download as
+# `third-party packages
+# <https://matplotlib.org/mpl-third-party/#colormaps-and-styles>`_.
+#
+# Normalizations
+# --------------
+#
+# Sometimes we want a non-linear mapping of the data to the colormap, as
+# in the ``LogNorm`` example above.  We do this by supplying the
+# ScalarMappable with the *norm* argument instead of *vmin* and *vmax*.
+# More normalizations are shown at :doc:`/tutorials/colors/colormapnorms`.
+#
+# Colorbars
+# ---------
+#
+# Adding a `~.Figure.colorbar` gives a key to relate the color back to the
+# underlying data. Colorbars are figure-level Artists, and are attached to
+# a ScalarMappable (where they get their information about the norm and
+# colormap) and usually steal space from a parent Axes.  Placement of
+# colorbars can be complex: see
+# :doc:`/gallery/subplots_axes_and_figures/colorbar_placement` for
+# details.  You can also change the appearance of colorbars with the
+# *extend* keyword to add arrows to the ends, and *shrink* and *aspect* to
+# control the size.  Finally, the colorbar will have default locators
+# and formatters appropriate to the norm.  These can be changed as for
+# other Axis objects.
+#
+#
+# Working with multiple Figures and Axes
+# ======================================
+#
+# You can open multiple Figures with multiple calls to
+# ``fig = plt.figure()`` or ``fig2, ax = plt.subplots()``.  By keeping the
+# object references you can add Artists to either Figure.
+#
+# Multiple Axes can be added a number of ways, but the most basic is
+# ``plt.subplots()`` as used above.  One can achieve more complex layouts,
+# with Axes objects spanning columns or rows, using `~.pyplot.subplot_mosaic`.
+
+fig, axd = plt.subplot_mosaic([['upleft', 'right'],
+                               ['lowleft', 'right']], layout='constrained')
+axd['upleft'].set_title('upleft')
+axd['lowleft'].set_title('lowleft')
+axd['right'].set_title('right');
+
+###############################################################################
+# Matplotlib has quite sophisticated tools for arranging Axes: See
+# :doc:`/tutorials/intermediate/arranging_axes` and
+# :doc:`/tutorials/provisional/mosaic`.
+#
+#
+# More reading
+# ============
+#
+# For more plot types see :doc:`Plot types </plot_types/index>` and the
+# :doc:`API reference </api/index>`, in particular the
+# :doc:`Axes API </api/axes_api>`.
diff --git a/tutorials/introductory/sample_plots.py b/tutorials/introductory/sample_plots.py
deleted file mode 100644
index 67091ad1b414..000000000000
--- a/tutorials/introductory/sample_plots.py
+++ /dev/null
@@ -1,437 +0,0 @@
-"""
-==========================
-Sample plots in Matplotlib
-==========================
-
-Here you'll find a host of example plots with the code that
-generated them.
-
-.. _matplotlibscreenshots:
-
-Line Plot
-=========
-
-Here's how to create a line plot with text labels using
-:func:`~matplotlib.pyplot.plot`.
-
-.. figure:: ../../gallery/lines_bars_and_markers/images/sphx_glr_simple_plot_001.png
-   :target: ../../gallery/lines_bars_and_markers/simple_plot.html
-   :align: center
-   :scale: 50
-
-   Simple Plot
-
-.. _screenshots_subplot_demo:
-
-Multiple subplots in one figure
-===============================
-
-Multiple axes (i.e. subplots) are created with the
-:func:`~matplotlib.pyplot.subplot` function:
-
-.. figure:: ../../gallery/subplots_axes_and_figures/images/sphx_glr_subplot_001.png
-   :target: ../../gallery/subplots_axes_and_figures/subplot.html
-   :align: center
-   :scale: 50
-
-   Subplot
-
-.. _screenshots_images_demo:
-
-Images
-======
-
-Matplotlib can display images (assuming equally spaced
-horizontal dimensions) using the :func:`~matplotlib.pyplot.imshow` function.
-
-.. figure:: ../../gallery/images_contours_and_fields/images/sphx_glr_image_demo_003.png
-   :target: ../../gallery/images_contours_and_fields/image_demo.html
-   :align: center
-   :scale: 50
-
-   Example of using :func:`~matplotlib.pyplot.imshow` to display a CT scan
-
-.. _screenshots_pcolormesh_demo:
-
-
-Contouring and pseudocolor
-==========================
-
-The :func:`~matplotlib.pyplot.pcolormesh` function can make a colored
-representation of a two-dimensional array, even if the horizontal dimensions
-are unevenly spaced.  The
-:func:`~matplotlib.pyplot.contour` function is another way to represent
-the same data:
-
-.. figure:: ../../gallery/images_contours_and_fields/images/sphx_glr_pcolormesh_levels_001.png
-   :target: ../../gallery/images_contours_and_fields/pcolormesh_levels.html
-   :align: center
-   :scale: 50
-
-   Example comparing :func:`~matplotlib.pyplot.pcolormesh` and :func:`~matplotlib.pyplot.contour` for plotting two-dimensional data
-
-.. _screenshots_histogram_demo:
-
-Histograms
-==========
-
-The :func:`~matplotlib.pyplot.hist` function automatically generates
-histograms and returns the bin counts or probabilities:
-
-.. figure:: ../../gallery/statistics/images/sphx_glr_histogram_features_001.png
-   :target: ../../gallery/statistics/histogram_features.html
-   :align: center
-   :scale: 50
-
-   Histogram Features
-
-
-.. _screenshots_path_demo:
-
-Paths
-=====
-
-You can add arbitrary paths in Matplotlib using the
-:mod:`matplotlib.path` module:
-
-.. figure:: ../../gallery/shapes_and_collections/images/sphx_glr_path_patch_001.png
-   :target: ../../gallery/shapes_and_collections/path_patch.html
-   :align: center
-   :scale: 50
-
-   Path Patch
-
-.. _screenshots_mplot3d_surface:
-
-Three-dimensional plotting
-==========================
-
-The mplot3d toolkit (see :ref:`toolkit_mplot3d-tutorial` and
-:ref:`mplot3d-examples-index`) has support for simple 3D graphs
-including surface, wireframe, scatter, and bar charts.
-
-.. figure:: ../../gallery/mplot3d/images/sphx_glr_surface3d_001.png
-   :target: ../../gallery/mplot3d/surface3d.html
-   :align: center
-   :scale: 50
-
-   Surface3d
-
-Thanks to John Porter, Jonathon Taylor, Reinier Heeres, and Ben Root for
-the `.mplot3d` toolkit. This toolkit is included with all standard Matplotlib
-installs.
-
-.. _screenshots_ellipse_demo:
-
-
-Streamplot
-==========
-
-The :meth:`~matplotlib.pyplot.streamplot` function plots the streamlines of
-a vector field. In addition to simply plotting the streamlines, it allows you
-to map the colors and/or line widths of streamlines to a separate parameter,
-such as the speed or local intensity of the vector field.
-
-.. figure:: ../../gallery/images_contours_and_fields/images/sphx_glr_plot_streamplot_001.png
-   :target: ../../gallery/images_contours_and_fields/plot_streamplot.html
-   :align: center
-   :scale: 50
-
-   Streamplot with various plotting options.
-
-This feature complements the :meth:`~matplotlib.pyplot.quiver` function for
-plotting vector fields. Thanks to Tom Flannaghan and Tony Yu for adding the
-streamplot function.
-
-
-Ellipses
-========
-
-In support of the `Phoenix <http://www.jpl.nasa.gov/news/phoenix/main.php>`_
-mission to Mars (which used Matplotlib to display ground tracking of
-spacecraft), Michael Droettboom built on work by Charlie Moad to provide
-an extremely accurate 8-spline approximation to elliptical arcs (see
-:class:`~matplotlib.patches.Arc`), which are insensitive to zoom level.
-
-.. figure:: ../../gallery/shapes_and_collections/images/sphx_glr_ellipse_demo_001.png
-   :target: ../../gallery/shapes_and_collections/ellipse_demo.html
-   :align: center
-   :scale: 50
-
-   Ellipse Demo
-
-.. _screenshots_barchart_demo:
-
-Bar charts
-==========
-
-Use the :func:`~matplotlib.pyplot.bar` function to make bar charts, which
-includes customizations such as error bars:
-
-.. figure:: ../../gallery/statistics/images/sphx_glr_barchart_demo_001.png
-   :target: ../../gallery/statistics/barchart_demo.html
-   :align: center
-   :scale: 50
-
-   Barchart Demo
-
-You can also create stacked bars
-(`bar_stacked.py <../../gallery/lines_bars_and_markers/bar_stacked.html>`_),
-or horizontal bar charts
-(`barh.py <../../gallery/lines_bars_and_markers/barh.html>`_).
-
-.. _screenshots_pie_demo:
-
-
-Pie charts
-==========
-
-The :func:`~matplotlib.pyplot.pie` function allows you to create pie
-charts.  Optional features include auto-labeling the percentage of area,
-exploding one or more wedges from the center of the pie, and a shadow effect.
-Take a close look at the attached code, which generates this figure in just
-a few lines of code.
-
-.. figure:: ../../gallery/pie_and_polar_charts/images/sphx_glr_pie_features_001.png
-   :target: ../../gallery/pie_and_polar_charts/pie_features.html
-   :align: center
-   :scale: 50
-
-   Pie Features
-
-.. _screenshots_table_demo:
-
-Tables
-======
-
-The :func:`~matplotlib.pyplot.table` function adds a text table
-to an axes.
-
-.. figure:: ../../gallery/misc/images/sphx_glr_table_demo_001.png
-   :target: ../../gallery/misc/table_demo.html
-   :align: center
-   :scale: 50
-
-   Table Demo
-
-
-.. _screenshots_scatter_demo:
-
-
-Scatter plots
-=============
-
-The :func:`~matplotlib.pyplot.scatter` function makes a scatter plot
-with (optional) size and color arguments. This example plots changes
-in Google's stock price, with marker sizes reflecting the
-trading volume and colors varying with time. Here, the
-alpha attribute is used to make semitransparent circle markers.
-
-.. figure:: ../../gallery/lines_bars_and_markers/images/sphx_glr_scatter_demo2_001.png
-   :target: ../../gallery/lines_bars_and_markers/scatter_demo2.html
-   :align: center
-   :scale: 50
-
-   Scatter Demo2
-
-
-.. _screenshots_slider_demo:
-
-GUI widgets
-===========
-
-Matplotlib has basic GUI widgets that are independent of the graphical
-user interface you are using, allowing you to write cross GUI figures
-and widgets.  See :mod:`matplotlib.widgets` and the
-`widget examples <../../gallery/index.html#widgets>`_.
-
-.. figure:: ../../gallery/widgets/images/sphx_glr_slider_demo_001.png
-   :target: ../../gallery/widgets/slider_demo.html
-   :align: center
-   :scale: 50
-
-   Slider and radio-button GUI.
-
-
-.. _screenshots_fill_demo:
-
-Filled curves
-=============
-
-The :func:`~matplotlib.pyplot.fill` function lets you
-plot filled curves and polygons:
-
-.. figure:: ../../gallery/lines_bars_and_markers/images/sphx_glr_fill_001.png
-   :target: ../../gallery/lines_bars_and_markers/fill.html
-   :align: center
-   :scale: 50
-
-   Fill
-
-Thanks to Andrew Straw for adding this function.
-
-.. _screenshots_date_demo:
-
-Date handling
-=============
-
-You can plot timeseries data with major and minor ticks and custom
-tick formatters for both.
-
-.. figure:: ../../gallery/text_labels_and_annotations/images/sphx_glr_date_001.png
-   :target: ../../gallery/text_labels_and_annotations/date.html
-   :align: center
-   :scale: 50
-
-   Date
-
-See :mod:`matplotlib.ticker` and :mod:`matplotlib.dates` for details and usage.
-
-
-.. _screenshots_log_demo:
-
-Log plots
-=========
-
-The :func:`~matplotlib.pyplot.semilogx`,
-:func:`~matplotlib.pyplot.semilogy` and
-:func:`~matplotlib.pyplot.loglog` functions simplify the creation of
-logarithmic plots.
-
-.. figure:: ../../gallery/scales/images/sphx_glr_log_demo_001.png
-   :target: ../../gallery/scales/log_demo.html
-   :align: center
-   :scale: 50
-
-   Log Demo
-
-Thanks to Andrew Straw, Darren Dale and Gregory Lielens for contributions
-log-scaling infrastructure.
-
-.. _screenshots_polar_demo:
-
-Polar plots
-===========
-
-The :func:`~matplotlib.pyplot.polar` function generates polar plots.
-
-.. figure:: ../../gallery/pie_and_polar_charts/images/sphx_glr_polar_demo_001.png
-   :target: ../../gallery/pie_and_polar_charts/polar_demo.html
-   :align: center
-   :scale: 50
-
-   Polar Demo
-
-.. _screenshots_legend_demo:
-
-
-Legends
-=======
-
-The :func:`~matplotlib.pyplot.legend` function automatically
-generates figure legends, with MATLAB-compatible legend-placement
-functions.
-
-.. figure:: ../../gallery/text_labels_and_annotations/images/sphx_glr_legend_001.png
-   :target: ../../gallery/text_labels_and_annotations/legend.html
-   :align: center
-   :scale: 50
-
-   Legend
-
-Thanks to Charles Twardy for input on the legend function.
-
-.. _screenshots_mathtext_examples_demo:
-
-TeX-notation for text objects
-=============================
-
-Below is a sampling of the many TeX expressions now supported by Matplotlib's
-internal mathtext engine.  The mathtext module provides TeX style mathematical
-expressions using `FreeType <https://www.freetype.org/>`_
-and the DejaVu, BaKoMa computer modern, or `STIX <http://www.stixfonts.org>`_
-fonts.  See the :mod:`matplotlib.mathtext` module for additional details.
-
-.. figure:: ../../gallery/text_labels_and_annotations/images/sphx_glr_mathtext_examples_001.png
-   :target: ../../gallery/text_labels_and_annotations/mathtext_examples.html
-   :align: center
-   :scale: 50
-
-   Mathtext Examples
-
-Matplotlib's mathtext infrastructure is an independent implementation and
-does not require TeX or any external packages installed on your computer. See
-the tutorial at :doc:`/tutorials/text/mathtext`.
-
-
-.. _screenshots_tex_demo:
-
-Native TeX rendering
-====================
-
-Although Matplotlib's internal math rendering engine is quite
-powerful, sometimes you need TeX. Matplotlib supports external TeX
-rendering of strings with the *usetex* option.
-
-.. figure:: ../../gallery/text_labels_and_annotations/images/sphx_glr_tex_demo_001.png
-   :target: ../../gallery/text_labels_and_annotations/tex_demo.html
-   :align: center
-   :scale: 50
-
-   Tex Demo
-
-.. _screenshots_eeg_demo:
-
-EEG GUI
-=======
-
-You can embed Matplotlib into Qt, GTK, Tk, or wxWidgets applications.
-Here is a screenshot of an EEG viewer called `pbrain
-<https://github.com/nipy/pbrain>`__.
-
-.. image:: ../../_static/eeg_small.png
-
-The lower axes uses :func:`~matplotlib.pyplot.specgram`
-to plot the spectrogram of one of the EEG channels.
-
-For examples of how to embed Matplotlib in different toolkits, see:
-
-   * :doc:`/gallery/user_interfaces/embedding_in_gtk3_sgskip`
-   * :doc:`/gallery/user_interfaces/embedding_in_wx2_sgskip`
-   * :doc:`/gallery/user_interfaces/mpl_with_glade3_sgskip`
-   * :doc:`/gallery/user_interfaces/embedding_in_qt_sgskip`
-   * :doc:`/gallery/user_interfaces/embedding_in_tk_sgskip`
-
-XKCD-style sketch plots
-=======================
-
-Just for fun, Matplotlib supports plotting in the style of `xkcd
-<https://www.xkcd.com/>`_.
-
-.. figure:: ../../gallery/showcase/images/sphx_glr_xkcd_001.png
-   :target: ../../gallery/showcase/xkcd.html
-   :align: center
-   :scale: 50
-
-   xkcd
-
-Subplot example
-===============
-
-Many plot types can be combined in one figure to create
-powerful and flexible representations of data.
-"""
-
-import matplotlib.pyplot as plt
-import numpy as np
-
-np.random.seed(19680801)
-data = np.random.randn(2, 100)
-
-fig, axs = plt.subplots(2, 2, figsize=(5, 5))
-axs[0, 0].hist(data[0])
-axs[1, 0].scatter(data[0], data[1])
-axs[0, 1].plot(data[0], data[1])
-axs[1, 1].hist2d(data[0], data[1])
-
-plt.show()
diff --git a/tutorials/introductory/usage.py b/tutorials/introductory/usage.py
deleted file mode 100644
index 2403d3f0ba5b..000000000000
--- a/tutorials/introductory/usage.py
+++ /dev/null
@@ -1,789 +0,0 @@
-"""
-***********
-Usage Guide
-***********
-
-This tutorial covers some basic usage patterns and best-practices to
-help you get started with Matplotlib.
-"""
-
-# sphinx_gallery_thumbnail_number = 3
-import matplotlib.pyplot as plt
-import numpy as np
-
-##############################################################################
-#
-# A simple example
-# ================
-#
-# Matplotlib graphs your data on `~.figure.Figure`\s (i.e., windows, Jupyter
-# widgets, etc.), each of which can contain one or more `~.axes.Axes` (i.e., an
-# area where points can be specified in terms of x-y coordinates, or theta-r
-# in a polar plot, or x-y-z in a 3D plot, etc.).  The simplest way of
-# creating a figure with an axes is using `.pyplot.subplots`. We can then use
-# `.Axes.plot` to draw some data on the axes:
-
-fig, ax = plt.subplots()  # Create a figure containing a single axes.
-ax.plot([1, 2, 3, 4], [1, 4, 2, 3])  # Plot some data on the axes.
-
-###############################################################################
-# Many other plotting libraries or languages do not require you to explicitly
-# create an axes.  For example, in MATLAB, one can just do
-#
-# .. code-block:: matlab
-#
-#    plot([1, 2, 3, 4], [1, 4, 2, 3])  % MATLAB plot.
-#
-# and get the desired graph.
-#
-# In fact, you can do the same in Matplotlib: for each `~.axes.Axes` graphing
-# method, there is a corresponding function in the :mod:`matplotlib.pyplot`
-# module that performs that plot on the "current" axes, creating that axes (and
-# its parent figure) if they don't exist yet.  So, the previous example can be
-# written more shortly as
-
-plt.plot([1, 2, 3, 4], [1, 4, 2, 3])  # Matplotlib plot.
-
-###############################################################################
-# .. _figure_parts:
-#
-# Parts of a Figure
-# =================
-#
-# Now, let's have a deeper look at the components of a Matplotlib figure.
-#
-# .. image:: ../../_static/anatomy.png
-#
-# :class:`~matplotlib.figure.Figure`
-# ----------------------------------
-#
-# The **whole** figure.  The figure keeps
-# track of all the child :class:`~matplotlib.axes.Axes`, a smattering of
-# 'special' artists (titles, figure legends, etc), and the **canvas**.
-# (Don't worry too much about the canvas, it is crucial as it is the
-# object that actually does the drawing to get you your plot, but as the
-# user it is more-or-less invisible to you).  A figure can contain any
-# number of :class:`~matplotlib.axes.Axes`, but will typically have
-# at least one.
-#
-# The easiest way to create a new figure is with pyplot::
-#
-#    fig = plt.figure()  # an empty figure with no Axes
-#    fig, ax = plt.subplots()  # a figure with a single Axes
-#    fig, axs = plt.subplots(2, 2)  # a figure with a 2x2 grid of Axes
-#
-# It's convenient to create the axes together with the figure, but you can
-# also add axes later on, allowing for more complex axes layouts.
-#
-# :class:`~matplotlib.axes.Axes`
-# ------------------------------
-#
-# This is what you think of as 'a plot', it is the region of the image
-# with the data space. A given figure
-# can contain many Axes, but a given :class:`~matplotlib.axes.Axes`
-# object can only be in one :class:`~matplotlib.figure.Figure`.  The
-# Axes contains two (or three in the case of 3D)
-# :class:`~matplotlib.axis.Axis` objects (be aware of the difference
-# between **Axes** and **Axis**) which take care of the data limits (the
-# data limits can also be controlled via the :meth:`.axes.Axes.set_xlim` and
-# :meth:`.axes.Axes.set_ylim` methods).  Each :class:`~.axes.Axes` has a title
-# (set via :meth:`~matplotlib.axes.Axes.set_title`), an x-label (set via
-# :meth:`~matplotlib.axes.Axes.set_xlabel`), and a y-label set via
-# :meth:`~matplotlib.axes.Axes.set_ylabel`).
-#
-# The :class:`~.axes.Axes` class and its member functions are the primary entry
-# point to working with the OO interface.
-#
-# :class:`~matplotlib.axis.Axis`
-# ------------------------------
-#
-# These are the number-line-like objects. They take
-# care of setting the graph limits and generating the ticks (the marks
-# on the axis) and ticklabels (strings labeling the ticks).  The location of
-# the ticks is determined by a `~matplotlib.ticker.Locator` object and the
-# ticklabel strings are formatted by a `~matplotlib.ticker.Formatter`.  The
-# combination of the correct `.Locator` and `.Formatter` gives very fine
-# control over the tick locations and labels.
-#
-# :class:`~matplotlib.artist.Artist`
-# ----------------------------------
-#
-# Basically, everything you can see on the figure is an artist (even the
-# `.Figure`, `Axes <.axes.Axes>`, and `~.axis.Axis` objects).  This includes
-# `.Text` objects, `.Line2D` objects, :mod:`.collections` objects, `.Patch`
-# objects ... (you get the idea).  When the figure is rendered, all of the
-# artists are drawn to the **canvas**.  Most Artists are tied to an Axes; such
-# an Artist cannot be shared by multiple Axes, or moved from one to another.
-#
-# .. _input_types:
-#
-# Types of inputs to plotting functions
-# =====================================
-#
-# All of plotting functions expect `numpy.array` or `numpy.ma.masked_array` as
-# input.  Classes that are 'array-like' such as `pandas` data objects
-# and `numpy.matrix` may or may not work as intended.  It is best to
-# convert these to `numpy.array` objects prior to plotting.
-#
-# For example, to convert a `pandas.DataFrame` ::
-#
-#   a = pandas.DataFrame(np.random.rand(4, 5), columns = list('abcde'))
-#   a_asarray = a.values
-#
-# and to convert a `numpy.matrix` ::
-#
-#   b = np.matrix([[1, 2], [3, 4]])
-#   b_asarray = np.asarray(b)
-#
-# .. _coding_styles:
-#
-# The object-oriented interface and the pyplot interface
-# ======================================================
-#
-# As noted above, there are essentially two ways to use Matplotlib:
-#
-# - Explicitly create figures and axes, and call methods on them (the
-#   "object-oriented (OO) style").
-# - Rely on pyplot to automatically create and manage the figures and axes, and
-#   use pyplot functions for plotting.
-#
-# So one can do (OO-style)
-
-x = np.linspace(0, 2, 100)
-
-# Note that even in the OO-style, we use `.pyplot.figure` to create the figure.
-fig, ax = plt.subplots()  # Create a figure and an axes.
-ax.plot(x, x, label='linear')  # Plot some data on the axes.
-ax.plot(x, x**2, label='quadratic')  # Plot more data on the axes...
-ax.plot(x, x**3, label='cubic')  # ... and some more.
-ax.set_xlabel('x label')  # Add an x-label to the axes.
-ax.set_ylabel('y label')  # Add a y-label to the axes.
-ax.set_title("Simple Plot")  # Add a title to the axes.
-ax.legend()  # Add a legend.
-
-###############################################################################
-# or (pyplot-style)
-
-x = np.linspace(0, 2, 100)
-
-plt.plot(x, x, label='linear')  # Plot some data on the (implicit) axes.
-plt.plot(x, x**2, label='quadratic')  # etc.
-plt.plot(x, x**3, label='cubic')
-plt.xlabel('x label')
-plt.ylabel('y label')
-plt.title("Simple Plot")
-plt.legend()
-
-###############################################################################
-# In addition, there is a third approach, for the case when embedding
-# Matplotlib in a GUI application, which completely drops pyplot, even for
-# figure creation.  We won't discuss it here; see the corresponding section in
-# the gallery for more info (:ref:`user_interfaces`).
-#
-# Matplotlib's documentation and examples use both the OO and the pyplot
-# approaches (which are equally powerful), and you should feel free to use
-# either (however, it is preferable pick one of them and stick to it, instead
-# of mixing them).  In general, we suggest to restrict pyplot to interactive
-# plotting (e.g., in a Jupyter notebook), and to prefer the OO-style for
-# non-interactive plotting (in functions and scripts that are intended to be
-# reused as part of a larger project).
-#
-# .. note::
-#
-#    In older examples, you may find examples that instead used the so-called
-#    ``pylab`` interface, via ``from pylab import *``. This star-import
-#    imports everything both from pyplot and from :mod:`numpy`, so that one
-#    could do ::
-#
-#       x = linspace(0, 2, 100)
-#       plot(x, x, label='linear')
-#       ...
-#
-#    for an even more MATLAB-like style.  This approach is strongly discouraged
-#    nowadays and deprecated. It is only mentioned here because you may still
-#    encounter it in the wild.
-#
-# Typically one finds oneself making the same plots over and over
-# again, but with different data sets, which leads to needing to write
-# specialized functions to do the plotting.  The recommended function
-# signature is something like:
-
-
-def my_plotter(ax, data1, data2, param_dict):
-    """
-    A helper function to make a graph
-
-    Parameters
-    ----------
-    ax : Axes
-        The axes to draw to
-
-    data1 : array
-       The x data
-
-    data2 : array
-       The y data
-
-    param_dict : dict
-       Dictionary of kwargs to pass to ax.plot
-
-    Returns
-    -------
-    out : list
-        list of artists added
-    """
-    out = ax.plot(data1, data2, **param_dict)
-    return out
-
-###############################################################################
-# which you would then use as:
-
-data1, data2, data3, data4 = np.random.randn(4, 100)
-fig, ax = plt.subplots(1, 1)
-my_plotter(ax, data1, data2, {'marker': 'x'})
-
-###############################################################################
-# or if you wanted to have 2 sub-plots:
-
-fig, (ax1, ax2) = plt.subplots(1, 2)
-my_plotter(ax1, data1, data2, {'marker': 'x'})
-my_plotter(ax2, data3, data4, {'marker': 'o'})
-
-###############################################################################
-# For these simple examples this style seems like overkill, however
-# once the graphs get slightly more complex it pays off.
-#
-#
-# .. _backends:
-#
-# Backends
-# ========
-#
-# .. _what-is-a-backend:
-#
-# What is a backend?
-# ------------------
-#
-# A lot of documentation on the website and in the mailing lists refers
-# to the "backend" and many new users are confused by this term.
-# Matplotlib targets many different use cases and output formats.  Some
-# people use Matplotlib interactively from the python shell and have
-# plotting windows pop up when they type commands.  Some people run
-# `Jupyter <https://jupyter.org>`_ notebooks and draw inline plots for
-# quick data analysis. Others embed Matplotlib into graphical user
-# interfaces like PyQt or PyGObject to build rich applications.  Some
-# people use Matplotlib in batch scripts to generate postscript images
-# from numerical simulations, and still others run web application
-# servers to dynamically serve up graphs.
-#
-# To support all of these use cases, Matplotlib can target different
-# outputs, and each of these capabilities is called a backend; the
-# "frontend" is the user facing code, i.e., the plotting code, whereas the
-# "backend" does all the hard work behind-the-scenes to make the figure.
-# There are two types of backends: user interface backends (for use in
-# PyQt/PySide, PyGObject, Tkinter, wxPython, or macOS/Cocoa); also referred to
-# as "interactive backends") and hardcopy backends to make image files
-# (PNG, SVG, PDF, PS; also referred to as "non-interactive backends").
-#
-# Selecting a backend
-# -------------------
-#
-# There are three ways to configure your backend:
-#
-# 1. The :rc:`backend` parameter in your :file:`matplotlibrc` file
-# 2. The :envvar:`MPLBACKEND` environment variable
-# 3. The function :func:`matplotlib.use`
-#
-# A more detailed description is given below.
-#
-# If multiple of these are configurations are present, the last one from the
-# list takes precedence; e.g. calling :func:`matplotlib.use()` will override
-# the setting in your :file:`matplotlibrc`.
-#
-# If no backend is explicitly set, Matplotlib automatically detects a usable
-# backend based on what is available on your system and on whether a GUI event
-# loop is already running. On Linux, if the environment variable
-# :envvar:`DISPLAY` is unset, the "event loop" is identified as "headless",
-# which causes a fallback to a noninteractive backend (agg).
-#
-# Here is a detailed description of the configuration methods:
-#
-# #. Setting :rc:`backend` in your :file:`matplotlibrc` file::
-#
-#        backend : qt5agg   # use pyqt5 with antigrain (agg) rendering
-#
-#    See also :doc:`/tutorials/introductory/customizing`.
-#
-# #. Setting the :envvar:`MPLBACKEND` environment variable:
-#
-#    You can set the environment variable either for your current shell or for
-#    a single script.
-#
-#    On Unix::
-#
-#         > export MPLBACKEND=qt5agg
-#         > python simple_plot.py
-#
-#         > MPLBACKEND=qt5agg python simple_plot.py
-#
-#    On Windows, only the former is possible::
-#
-#         > set MPLBACKEND=qt5agg
-#         > python simple_plot.py
-#
-#    Setting this environment variable will override the ``backend`` parameter
-#    in *any* :file:`matplotlibrc`, even if there is a :file:`matplotlibrc` in
-#    your current working directory. Therefore, setting :envvar:`MPLBACKEND`
-#    globally, e.g. in your :file:`.bashrc` or :file:`.profile`, is discouraged
-#    as it might lead to counter-intuitive behavior.
-#
-# #. If your script depends on a specific backend you can use the function
-#    :func:`matplotlib.use`::
-#
-#       import matplotlib
-#       matplotlib.use('qt5agg')
-#
-#    This should be done before any figure is created, otherwise Matplotlib may
-#    fail to switch the backend and raise an ImportError.
-#
-#    Using `~matplotlib.use` will require changes in your code if users want to
-#    use a different backend.  Therefore, you should avoid explicitly calling
-#    `~matplotlib.use` unless absolutely necessary.
-#
-# .. _the-builtin-backends:
-#
-# The builtin backends
-# --------------------
-#
-# By default, Matplotlib should automatically select a default backend which
-# allows both interactive work and plotting from scripts, with output to the
-# screen and/or to a file, so at least initially, you will not need to worry
-# about the backend.  The most common exception is if your Python distribution
-# comes without :mod:`tkinter` and you have no other GUI toolkit installed.
-# This happens on certain Linux distributions, where you need to install a
-# Linux package named ``python-tk`` (or similar).
-#
-# If, however, you want to write graphical user interfaces, or a web
-# application server
-# (:doc:`/gallery/user_interfaces/web_application_server_sgskip`), or need a
-# better understanding of what is going on, read on. To make things a little
-# more customizable for graphical user interfaces, Matplotlib separates
-# the concept of the renderer (the thing that actually does the drawing)
-# from the canvas (the place where the drawing goes).  The canonical
-# renderer for user interfaces is ``Agg`` which uses the `Anti-Grain
-# Geometry`_ C++ library to make a raster (pixel) image of the figure; it
-# is used by the ``Qt5Agg``, ``Qt4Agg``, ``GTK3Agg``, ``wxAgg``, ``TkAgg``, and
-# ``macosx`` backends.  An alternative renderer is based on the Cairo library,
-# used by ``Qt5Cairo``, ``Qt4Cairo``, etc.
-#
-# For the rendering engines, one can also distinguish between `vector
-# <https://en.wikipedia.org/wiki/Vector_graphics>`_ or `raster
-# <https://en.wikipedia.org/wiki/Raster_graphics>`_ renderers.  Vector
-# graphics languages issue drawing commands like "draw a line from this
-# point to this point" and hence are scale free, and raster backends
-# generate a pixel representation of the line whose accuracy depends on a
-# DPI setting.
-#
-# Here is a summary of the Matplotlib renderers (there is an eponymous
-# backend for each; these are *non-interactive backends*, capable of
-# writing to a file):
-#
-# ========  =========  =======================================================
-# Renderer  Filetypes  Description
-# ========  =========  =======================================================
-# AGG       png        raster_ graphics -- high quality images using the
-#                      `Anti-Grain Geometry`_ engine
-# PDF       pdf        vector_ graphics -- `Portable Document Format`_
-# PS        ps, eps    vector_ graphics -- Postscript_ output
-# SVG       svg        vector_ graphics -- `Scalable Vector Graphics`_
-# PGF       pgf, pdf   vector_ graphics -- using the pgf_ package
-# Cairo     png, ps,   raster_ or vector_ graphics -- using the Cairo_ library
-#           pdf, svg
-# ========  =========  =======================================================
-#
-# To save plots using the non-interactive backends, use the
-# ``matplotlib.pyplot.savefig('filename')`` method.
-#
-# And here are the user interfaces and renderer combinations supported;
-# these are *interactive backends*, capable of displaying to the screen
-# and of using appropriate renderers from the table above to write to
-# a file:
-#
-# ========= ================================================================
-# Backend   Description
-# ========= ================================================================
-# Qt5Agg    Agg rendering in a Qt5_ canvas (requires PyQt5_).  This
-#           backend can be activated in IPython with ``%matplotlib qt5``.
-# ipympl    Agg rendering embedded in a Jupyter widget.  (requires ipympl).
-#           This backend can be enabled in a Jupyter notebook with
-#           ``%matplotlib ipympl``.
-# GTK3Agg   Agg rendering to a GTK_ 3.x canvas (requires PyGObject_,
-#           and pycairo_ or cairocffi_).  This backend can be activated in
-#           IPython with ``%matplotlib gtk3``.
-# macosx    Agg rendering into a Cocoa canvas in OSX.  This backend can be
-#           activated in IPython with ``%matplotlib osx``.
-# TkAgg     Agg rendering to a Tk_ canvas (requires TkInter_). This
-#           backend can be activated in IPython with ``%matplotlib tk``.
-# nbAgg     Embed an interactive figure in a Jupyter classic notebook.  This
-#           backend can be enabled in Jupyter notebooks via
-#           ``%matplotlib notebook``.
-# WebAgg    On ``show()`` will start a tornado server with an interactive
-#           figure.
-# GTK3Cairo Cairo rendering to a GTK_ 3.x canvas (requires PyGObject_,
-#           and pycairo_ or cairocffi_).
-# Qt4Agg    Agg rendering to a Qt4_ canvas (requires PyQt4_ or
-#           ``pyside``).  This backend can be activated in IPython with
-#           ``%matplotlib qt4``.
-# wxAgg     Agg rendering to a wxWidgets_ canvas (requires wxPython_ 4).
-#           This backend can be activated in IPython with ``%matplotlib wx``.
-# ========= ================================================================
-#
-# .. note::
-#    The names of builtin backends case-insensitive; e.g., 'Qt5Agg' and
-#    'qt5agg' are equivalent.
-#
-# .. _`Anti-Grain Geometry`: http://antigrain.com/
-# .. _`Portable Document Format`: https://en.wikipedia.org/wiki/Portable_Document_Format
-# .. _Postscript: https://en.wikipedia.org/wiki/PostScript
-# .. _`Scalable Vector Graphics`: https://en.wikipedia.org/wiki/Scalable_Vector_Graphics
-# .. _pgf: https://ctan.org/pkg/pgf
-# .. _Cairo: https://www.cairographics.org
-# .. _PyGObject: https://wiki.gnome.org/action/show/Projects/PyGObject
-# .. _pycairo: https://www.cairographics.org/pycairo/
-# .. _cairocffi: https://pythonhosted.org/cairocffi/
-# .. _wxPython: https://www.wxpython.org/
-# .. _TkInter: https://docs.python.org/3/library/tk.html
-# .. _PyQt4: https://riverbankcomputing.com/software/pyqt/intro
-# .. _PyQt5: https://riverbankcomputing.com/software/pyqt/intro
-# .. _Qt5: https://doc.qt.io/qt-5/index.html
-# .. _GTK: https://www.gtk.org/
-# .. _Tk: https://www.tcl.tk/
-# .. _Qt4: https://doc.qt.io/archives/qt-4.8/index.html
-# .. _wxWidgets: https://www.wxwidgets.org/
-#
-# ipympl
-# ^^^^^^
-#
-# The Jupyter widget ecosystem is moving too fast to support directly in
-# Matplotlib.  To install ipympl
-#
-# .. code-block:: bash
-#
-#    pip install ipympl
-#    jupyter nbextension enable --py --sys-prefix ipympl
-#
-# or
-#
-# .. code-block:: bash
-#
-#    conda install ipympl -c conda-forge
-#
-# See `jupyter-matplotlib <https://github.com/matplotlib/jupyter-matplotlib>`__
-# for more details.
-#
-# .. _QT_API-usage:
-#
-# How do I select PyQt4 or PySide?
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-#
-# The :envvar:`QT_API` environment variable can be set to either ``pyqt`` or
-# ``pyside`` to use ``PyQt4`` or ``PySide``, respectively.
-#
-# Since the default value for the bindings to be used is ``PyQt4``, Matplotlib
-# first tries to import it. If the import fails, it tries to import ``PySide``.
-#
-# Using non-builtin backends
-# --------------------------
-# More generally, any importable backend can be selected by using any of the
-# methods above. If ``name.of.the.backend`` is the module containing the
-# backend, use ``module://name.of.the.backend`` as the backend name, e.g.
-# ``matplotlib.use('module://name.of.the.backend')``.
-#
-#
-# .. _interactive-mode:
-#
-# What is interactive mode?
-# =========================
-#
-# Use of an interactive backend (see :ref:`what-is-a-backend`)
-# permits--but does not by itself require or ensure--plotting
-# to the screen.  Whether and when plotting to the screen occurs,
-# and whether a script or shell session continues after a plot
-# is drawn on the screen, depends on the functions and methods
-# that are called, and on a state variable that determines whether
-# Matplotlib is in "interactive mode".  The default Boolean value is set
-# by the :file:`matplotlibrc` file, and may be customized like any other
-# configuration parameter (see :doc:`/tutorials/introductory/customizing`).  It
-# may also be set via :func:`matplotlib.interactive`, and its
-# value may be queried via :func:`matplotlib.is_interactive`.  Turning
-# interactive mode on and off in the middle of a stream of plotting
-# commands, whether in a script or in a shell, is rarely needed
-# and potentially confusing. In the following, we will assume all
-# plotting is done with interactive mode either on or off.
-#
-# .. note::
-#    Major changes related to interactivity, and in particular the
-#    role and behavior of :func:`~matplotlib.pyplot.show`, were made in the
-#    transition to Matplotlib version 1.0, and bugs were fixed in
-#    1.0.1.  Here we describe the version 1.0.1 behavior for the
-#    primary interactive backends, with the partial exception of
-#    *macosx*.
-#
-# Interactive mode may also be turned on via :func:`matplotlib.pyplot.ion`,
-# and turned off via :func:`matplotlib.pyplot.ioff`.
-#
-# .. note::
-#    Interactive mode works with suitable backends in ipython and in
-#    the ordinary python shell, but it does *not* work in the IDLE IDE.
-#    If the default backend does not support interactivity, an interactive
-#    backend can be explicitly activated using any of the methods discussed
-#    in `What is a backend?`_.
-#
-#
-# Interactive example
-# --------------------
-#
-# From an ordinary python prompt, or after invoking ipython with no options,
-# try this::
-#
-#     import matplotlib.pyplot as plt
-#     plt.ion()
-#     plt.plot([1.6, 2.7])
-#
-# This will pop up a plot window. Your terminal prompt will remain active, so
-# that you can type additional commands such as::
-#
-#     plt.title("interactive test")
-#     plt.xlabel("index")
-#
-# On most interactive backends, the figure window will also be updated if you
-# change it via the object-oriented interface. E.g. get a reference to the
-# `~matplotlib.axes.Axes` instance, and call a method of that instance::
-#
-#     ax = plt.gca()
-#     ax.plot([3.1, 2.2])
-#
-# If you are using certain backends (like ``macosx``), or an older version
-# of Matplotlib, you may not see the new line added to the plot immediately.
-# In this case, you need to explicitly call :func:`~matplotlib.pyplot.draw`
-# in order to update the plot::
-#
-#     plt.draw()
-#
-#
-# Non-interactive example
-# -----------------------
-#
-# Start a fresh session as in the previous example, but now
-# turn interactive mode off::
-#
-#     import matplotlib.pyplot as plt
-#     plt.ioff()
-#     plt.plot([1.6, 2.7])
-#
-# Nothing happened--or at least nothing has shown up on the
-# screen (unless you are using *macosx* backend, which is
-# anomalous).  To make the plot appear, you need to do this::
-#
-#     plt.show()
-#
-# Now you see the plot, but your terminal command line is
-# unresponsive; `.pyplot.show()` *blocks* the input
-# of additional commands until you manually kill the plot
-# window.
-#
-# What good is this--being forced to use a blocking function?
-# Suppose you need a script that plots the contents of a file
-# to the screen.  You want to look at that plot, and then end
-# the script.  Without some blocking command such as ``show()``, the
-# script would flash up the plot and then end immediately,
-# leaving nothing on the screen.
-#
-# In addition, non-interactive mode delays all drawing until
-# ``show()`` is called; this is more efficient than redrawing
-# the plot each time a line in the script adds a new feature.
-#
-# Prior to version 1.0, ``show()`` generally could not be called
-# more than once in a single script (although sometimes one
-# could get away with it); for version 1.0.1 and above, this
-# restriction is lifted, so one can write a script like this::
-#
-#     import numpy as np
-#     import matplotlib.pyplot as plt
-#
-#     plt.ioff()
-#     for i in range(3):
-#         plt.plot(np.random.rand(10))
-#         plt.show()
-#
-# This makes three plots, one at a time. I.e., the second plot will show up
-# once the first plot is closed.
-#
-# Summary
-# -------
-#
-# In interactive mode, pyplot functions automatically draw
-# to the screen.
-#
-# When plotting interactively, if using
-# object method calls in addition to pyplot functions, then
-# call :func:`~matplotlib.pyplot.draw` whenever you want to
-# refresh the plot.
-#
-# Use non-interactive mode in scripts in which you want to
-# generate one or more figures and display them before ending
-# or generating a new set of figures.  In that case, use
-# :func:`~matplotlib.pyplot.show` to display the figure(s) and
-# to block execution until you have manually destroyed them.
-#
-# .. _performance:
-#
-# Performance
-# ===========
-#
-# Whether exploring data in interactive mode or programmatically
-# saving lots of plots, rendering performance can be a painful
-# bottleneck in your pipeline. Matplotlib provides a couple
-# ways to greatly reduce rendering time at the cost of a slight
-# change (to a settable tolerance) in your plot's appearance.
-# The methods available to reduce rendering time depend on the
-# type of plot that is being created.
-#
-# Line segment simplification
-# ---------------------------
-#
-# For plots that have line segments (e.g. typical line plots, outlines
-# of polygons, etc.), rendering performance can be controlled by
-# :rc:`path.simplify` and :rc:`path.simplify_threshold`, which
-# can be defined e.g. in the :file:`matplotlibrc` file (see
-# :doc:`/tutorials/introductory/customizing` for more information about
-# the :file:`matplotlibrc` file). :rc:`path.simplify` is a boolean
-# indicating whether or not line segments are simplified at all.
-# :rc:`path.simplify_threshold` controls how much line segments are simplified;
-# higher thresholds result in quicker rendering.
-#
-# The following script will first display the data without any
-# simplification, and then display the same data with simplification.
-# Try interacting with both of them::
-#
-#   import numpy as np
-#   import matplotlib.pyplot as plt
-#   import matplotlib as mpl
-#
-#   # Setup, and create the data to plot
-#   y = np.random.rand(100000)
-#   y[50000:] *= 2
-#   y[np.geomspace(10, 50000, 400).astype(int)] = -1
-#   mpl.rcParams['path.simplify'] = True
-#
-#   mpl.rcParams['path.simplify_threshold'] = 0.0
-#   plt.plot(y)
-#   plt.show()
-#
-#   mpl.rcParams['path.simplify_threshold'] = 1.0
-#   plt.plot(y)
-#   plt.show()
-#
-# Matplotlib currently defaults to a conservative simplification
-# threshold of ``1/9``. If you want to change your default settings
-# to use a different value, you can change your :file:`matplotlibrc`
-# file.  Alternatively, you could create a new style for
-# interactive plotting (with maximal simplification) and another
-# style for publication quality plotting (with minimal
-# simplification) and activate them as necessary. See
-# :doc:`/tutorials/introductory/customizing` for
-# instructions on how to perform these actions.
-#
-# The simplification works by iteratively merging line segments
-# into a single vector until the next line segment's perpendicular
-# distance to the vector (measured in display-coordinate space)
-# is greater than the ``path.simplify_threshold`` parameter.
-#
-# .. note::
-#   Changes related to how line segments are simplified were made
-#   in version 2.1. Rendering time will still be improved by these
-#   parameters prior to 2.1, but rendering time for some kinds of
-#   data will be vastly improved in versions 2.1 and greater.
-#
-# Marker simplification
-# ---------------------
-#
-# Markers can also be simplified, albeit less robustly than
-# line segments. Marker simplification is only available
-# to :class:`~matplotlib.lines.Line2D` objects (through the
-# ``markevery`` property). Wherever
-# :class:`~matplotlib.lines.Line2D` construction parameters
-# are passed through, such as
-# :func:`matplotlib.pyplot.plot` and
-# :meth:`matplotlib.axes.Axes.plot`, the ``markevery``
-# parameter can be used::
-#
-#   plt.plot(x, y, markevery=10)
-#
-# The ``markevery`` argument allows for naive subsampling, or an
-# attempt at evenly spaced (along the *x* axis) sampling. See the
-# :doc:`/gallery/lines_bars_and_markers/markevery_demo`
-# for more information.
-#
-# Splitting lines into smaller chunks
-# -----------------------------------
-#
-# If you are using the Agg backend (see :ref:`what-is-a-backend`),
-# then you can make use of :rc:`agg.path.chunksize`
-# This allows you to specify a chunk size, and any lines with
-# greater than that many vertices will be split into multiple
-# lines, each of which has no more than ``agg.path.chunksize``
-# many vertices. (Unless ``agg.path.chunksize`` is zero, in
-# which case there is no chunking.) For some kind of data,
-# chunking the line up into reasonable sizes can greatly
-# decrease rendering time.
-#
-# The following script will first display the data without any
-# chunk size restriction, and then display the same data with
-# a chunk size of 10,000. The difference can best be seen when
-# the figures are large, try maximizing the GUI and then
-# interacting with them::
-#
-#   import numpy as np
-#   import matplotlib.pyplot as plt
-#   import matplotlib as mpl
-#   mpl.rcParams['path.simplify_threshold'] = 1.0
-#
-#   # Setup, and create the data to plot
-#   y = np.random.rand(100000)
-#   y[50000:] *= 2
-#   y[np.geomspace(10, 50000, 400).astype(int)] = -1
-#   mpl.rcParams['path.simplify'] = True
-#
-#   mpl.rcParams['agg.path.chunksize'] = 0
-#   plt.plot(y)
-#   plt.show()
-#
-#   mpl.rcParams['agg.path.chunksize'] = 10000
-#   plt.plot(y)
-#   plt.show()
-#
-# Legends
-# -------
-#
-# The default legend behavior for axes attempts to find the location
-# that covers the fewest data points (``loc='best'``). This can be a
-# very expensive computation if there are lots of data points. In
-# this case, you may want to provide a specific location.
-#
-# Using the *fast* style
-# ----------------------
-#
-# The *fast* style can be used to automatically set
-# simplification and chunking parameters to reasonable
-# settings to speed up plotting large amounts of data.
-# It can be used simply by running::
-#
-#   import matplotlib.style as mplstyle
-#   mplstyle.use('fast')
-#
-# It is very lightweight, so it plays nicely with other
-# styles, just make sure the fast style is applied last
-# so that other styles do not overwrite the settings::
-#
-#   mplstyle.use(['dark_background', 'ggplot', 'fast'])
diff --git a/tutorials/provisional/mosaic.py b/tutorials/provisional/mosaic.py
index 64039107a927..202ada6eb332 100644
--- a/tutorials/provisional/mosaic.py
+++ b/tutorials/provisional/mosaic.py
@@ -14,7 +14,7 @@
 and verbose.  For dense, even grids we have `.Figure.subplots` but for
 more complex layouts, such as Axes that span multiple columns / rows
 of the layout or leave some areas of the Figure blank, you can use
-`.gridspec.GridSpec` (see :doc:`/tutorials/intermediate/gridspec`) or
+`.gridspec.GridSpec` (see :doc:`/tutorials/intermediate/arranging_axes`) or
 manually place your axes.  `.Figure.subplot_mosaic` aims to provide an
 interface to visually lay out your axes (as either ASCII art or nested
 lists) to streamline this process.
@@ -66,27 +66,30 @@ def identify_axes(ax_dict, fontsize=48):
 fig = plt.figure(constrained_layout=True)
 ax_array = fig.subplots(2, 2, squeeze=False)
 
-ax_array[0, 0].bar(['a', 'b', 'c'], [5, 7, 9])
+ax_array[0, 0].bar(["a", "b", "c"], [5, 7, 9])
 ax_array[0, 1].plot([1, 2, 3])
-ax_array[1, 0].hist(hist_data, bins='auto')
+ax_array[1, 0].hist(hist_data, bins="auto")
 ax_array[1, 1].imshow([[1, 2], [2, 1]])
 
 identify_axes(
-    {(j, k): a for j, r in enumerate(ax_array) for k, a in enumerate(r)}
+    {(j, k): a for j, r in enumerate(ax_array) for k, a in enumerate(r)},
 )
 
 ###############################################################################
-# Using `.Figure.subplot_mosaic` we can produce the same layout but give the
+# Using `.Figure.subplot_mosaic` we can produce the same mosaic but give the
 # axes semantic names
 
 fig = plt.figure(constrained_layout=True)
 ax_dict = fig.subplot_mosaic(
-    [['bar',  'plot'],
-     ['hist', 'image']])
-ax_dict['bar'].bar(['a', 'b', 'c'], [5, 7, 9])
-ax_dict['plot'].plot([1, 2, 3])
-ax_dict['hist'].hist(hist_data)
-ax_dict['image'].imshow([[1, 2], [2, 1]])
+    [
+        ["bar", "plot"],
+        ["hist", "image"],
+    ],
+)
+ax_dict["bar"].bar(["a", "b", "c"], [5, 7, 9])
+ax_dict["plot"].plot([1, 2, 3])
+ax_dict["hist"].hist(hist_data)
+ax_dict["image"].imshow([[1, 2], [2, 1]])
 identify_axes(ax_dict)
 
 ###############################################################################
@@ -102,32 +105,48 @@ def identify_axes(ax_dict, fontsize=48):
 # String short-hand
 # =================
 #
-# By restricting our axes labels to single characters we can use Using we can
+# By restricting our axes labels to single characters we can
 # "draw" the Axes we want as "ASCII art".  The following
 
 
-layout = """
+mosaic = """
     AB
     CD
     """
 
 ###############################################################################
 # will give us 4 Axes laid out in a 2x2 grid and generates the same
-# figure layout as above (but now labeled with ``{"A", "B", "C",
+# figure mosaic as above (but now labeled with ``{"A", "B", "C",
 # "D"}`` rather than ``{"bar", "plot", "hist", "image"}``).
 
 fig = plt.figure(constrained_layout=True)
-ax_dict = fig.subplot_mosaic(layout)
+ax_dict = fig.subplot_mosaic(mosaic)
 identify_axes(ax_dict)
 
+###############################################################################
+# Alternatively, you can use the more compact string notation
+mosaic = "AB;CD"
 
 ###############################################################################
+# will give you the same composition, where the ``";"`` is used
+# as the row separator instead of newline.
+
+fig = plt.figure(constrained_layout=True)
+ax_dict = fig.subplot_mosaic(mosaic)
+identify_axes(ax_dict)
+
+###############################################################################
+# Axes spanning multiple rows/columns
+# ===================================
+#
 # Something we can do with `.Figure.subplot_mosaic` that you can not
 # do with `.Figure.subplots` is specify that an Axes should span
 # several rows or columns.
-#
-# If we want to re-arrange our four Axes to have C be a horizontal
-# span on the bottom and D be a vertical span on the right we would do
+
+
+###############################################################################
+# If we want to re-arrange our four Axes to have ``"C"`` be a horizontal
+# span on the bottom and ``"D"`` be a vertical span on the right we would do
 
 axd = plt.figure(constrained_layout=True).subplot_mosaic(
     """
@@ -183,7 +202,7 @@ def identify_axes(ax_dict, fontsize=48):
 # empty sentinel with the string shorthand because it may be stripped
 # while processing the input.
 #
-# Controlling layout and subplot creation
+# Controlling mosaic and subplot creation
 # =======================================
 #
 # This feature is built on top of `.gridspec` and you can pass the
@@ -200,25 +219,23 @@ def identify_axes(ax_dict, fontsize=48):
     bAc
     .d.
     """,
-    gridspec_kw={
-        # set the height ratios between the rows
-        "height_ratios": [1, 3.5, 1],
-        # set the width ratios between the columns
-        "width_ratios": [1, 3.5, 1],
-    },
+    # set the height ratios between the rows
+    height_ratios=[1, 3.5, 1],
+    # set the width ratios between the columns
+    width_ratios=[1, 3.5, 1],
 )
 identify_axes(axd)
 
 ###############################################################################
 # Or use the {*left*, *right*, *bottom*, *top*} keyword arguments to
-# position the overall layout to put multiple versions of the same
-# layout in a figure
+# position the overall mosaic to put multiple versions of the same
+# mosaic in a figure
 
-layout = """AA
+mosaic = """AA
             BC"""
 fig = plt.figure()
 axd = fig.subplot_mosaic(
-    layout,
+    mosaic,
     gridspec_kw={
         "bottom": 0.25,
         "top": 0.95,
@@ -231,7 +248,7 @@ def identify_axes(ax_dict, fontsize=48):
 identify_axes(axd)
 
 axd = fig.subplot_mosaic(
-    layout,
+    mosaic,
     gridspec_kw={
         "bottom": 0.05,
         "top": 0.75,
@@ -243,6 +260,19 @@ def identify_axes(ax_dict, fontsize=48):
 )
 identify_axes(axd)
 
+###############################################################################
+# Alternatively, you can use the sub-Figure functionality:
+
+mosaic = """AA
+            BC"""
+fig = plt.figure(constrained_layout=True)
+left, right = fig.subfigures(nrows=1, ncols=2)
+axd = left.subplot_mosaic(mosaic)
+identify_axes(axd)
+
+axd = right.subplot_mosaic(mosaic)
+identify_axes(axd)
+
 
 ###############################################################################
 # We can also pass through arguments used to create the subplots
@@ -264,17 +294,18 @@ def identify_axes(ax_dict, fontsize=48):
 # list), for example using spans, blanks, and *gridspec_kw*:
 
 axd = plt.figure(constrained_layout=True).subplot_mosaic(
-    [["main", "zoom"],
-     ["main", "BLANK"]
-     ],
+    [
+        ["main", "zoom"],
+        ["main", "BLANK"],
+    ],
     empty_sentinel="BLANK",
-    gridspec_kw={"width_ratios": [2, 1]}
+    width_ratios=[2, 1],
 )
 identify_axes(axd)
 
 
 ###############################################################################
-# In addition, using the list input we can specify nested layouts.  Any element
+# In addition, using the list input we can specify nested mosaics.  Any element
 # of the inner list can be another set of nested lists:
 
 inner = [
@@ -282,22 +313,23 @@ def identify_axes(ax_dict, fontsize=48):
     ["inner B"],
 ]
 
-outer_nested_layout = [
+outer_nested_mosaic = [
     ["main", inner],
     ["bottom", "bottom"],
 ]
 axd = plt.figure(constrained_layout=True).subplot_mosaic(
-    outer_nested_layout, empty_sentinel=None
+    outer_nested_mosaic, empty_sentinel=None
 )
 identify_axes(axd, fontsize=36)
 
 
 ###############################################################################
 # We can also pass in a 2D NumPy array to do things like
-layout = np.zeros((4, 4), dtype=int)
+mosaic = np.zeros((4, 4), dtype=int)
 for j in range(4):
-    layout[j, j] = j + 1
+    mosaic[j, j] = j + 1
 axd = plt.figure(constrained_layout=True).subplot_mosaic(
-    layout, empty_sentinel=0
+    mosaic,
+    empty_sentinel=0,
 )
 identify_axes(axd)
diff --git a/tutorials/text/README.txt b/tutorials/text/README.txt
index 7ad6e9b14b18..4eaaa4de9c23 100644
--- a/tutorials/text/README.txt
+++ b/tutorials/text/README.txt
@@ -6,5 +6,5 @@ Text
 matplotlib has extensive text support, including support for
 mathematical expressions, truetype support for raster and
 vector outputs, newline separated text with arbitrary
-rotations, and unicode support. These tutorials cover
+rotations, and Unicode support. These tutorials cover
 the basics of working with text in Matplotlib.
diff --git a/tutorials/text/annotations.py b/tutorials/text/annotations.py
index 878835b2f7b7..7ab582d9f20f 100644
--- a/tutorials/text/annotations.py
+++ b/tutorials/text/annotations.py
@@ -6,570 +6,503 @@
 
 .. contents:: Table of Contents
    :depth: 3
-
-.. _annotations-tutorial:
-
-Basic annotation
-----------------
-
-The uses of the basic :func:`~matplotlib.pyplot.text` will place text
-at an arbitrary position on the Axes.  A common use case of text is to
-annotate some feature of the plot, and the
-:func:`~matplotlib.axes.Axes.annotate` method provides helper functionality
-to make annotations easy.  In an annotation, there are two points to
-consider: the location being annotated represented by the argument
-*xy* and the location of the text *xytext*.  Both of these
-arguments are ``(x, y)`` tuples.
-
-.. figure:: ../../gallery/pyplots/images/sphx_glr_annotation_basic_001.png
-   :target: ../../gallery/pyplots/annotation_basic.html
-   :align: center
-   :scale: 50
-
-   Annotation Basic
-
-In this example, both the *xy* (arrow tip) and *xytext* locations
-(text location) are in data coordinates.  There are a variety of other
-coordinate systems one can choose -- you can specify the coordinate
-system of *xy* and *xytext* with one of the following strings for
-*xycoords* and *textcoords* (default is 'data')
-
-==================  ========================================================
-argument            coordinate system
-==================  ========================================================
-'figure points'     points from the lower left corner of the figure
-'figure pixels'     pixels from the lower left corner of the figure
-'figure fraction'   (0, 0) is lower left of figure and (1, 1) is upper right
-'axes points'       points from lower left corner of axes
-'axes pixels'       pixels from lower left corner of axes
-'axes fraction'     (0, 0) is lower left of axes and (1, 1) is upper right
-'data'              use the axes data coordinate system
-==================  ========================================================
-
-For example to place the text coordinates in fractional axes
-coordinates, one could do::
-
-    ax.annotate('local max', xy=(3, 1),  xycoords='data',
-                xytext=(0.8, 0.95), textcoords='axes fraction',
-                arrowprops=dict(facecolor='black', shrink=0.05),
-                horizontalalignment='right', verticalalignment='top',
-                )
-
-For physical coordinate systems (points or pixels) the origin is the
-bottom-left of the figure or axes.
-
-Optionally, you can enable drawing of an arrow from the text to the annotated
-point by giving a dictionary of arrow properties in the optional keyword
-argument *arrowprops*.
-
-
-==================== =====================================================
-*arrowprops* key     description
-==================== =====================================================
-width                the width of the arrow in points
-frac                 the fraction of the arrow length occupied by the head
-headwidth            the width of the base of the arrow head in points
-shrink               move the tip and base some percent away from
-                     the annotated point and text
-
-\*\*kwargs           any key for :class:`matplotlib.patches.Polygon`,
-                     e.g., ``facecolor``
-==================== =====================================================
-
-
-In the example below, the *xy* point is in native coordinates
-(*xycoords* defaults to 'data').  For a polar axes, this is in
-(theta, radius) space.  The text in this example is placed in the
-fractional figure coordinate system. :class:`matplotlib.text.Text`
-keyword arguments like *horizontalalignment*, *verticalalignment* and
-*fontsize* are passed from `~matplotlib.axes.Axes.annotate` to the
-``Text`` instance.
-
-.. figure:: ../../gallery/pyplots/images/sphx_glr_annotation_polar_001.png
-   :target: ../../gallery/pyplots/annotation_polar.html
-   :align: center
-   :scale: 50
-
-   Annotation Polar
-
-For more on all the wild and wonderful things you can do with
-annotations, including fancy arrows, see :ref:`plotting-guide-annotation`
-and :doc:`/gallery/text_labels_and_annotations/annotation_demo`.
-
-
-Do not proceed unless you have already read :ref:`annotations-tutorial`,
-:func:`~matplotlib.pyplot.text` and :func:`~matplotlib.pyplot.annotate`!
-
-
-.. _plotting-guide-annotation:
-
-Advanced Annotations
---------------------
-
-Annotating with Text with Box
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Let's start with a simple example.
-
-.. figure:: ../../gallery/userdemo/images/sphx_glr_annotate_text_arrow_001.png
-   :target: ../../gallery/userdemo/annotate_text_arrow.html
-   :align: center
-   :scale: 50
-
-   Annotate Text Arrow
-
-`~.Axes.text` takes a *bbox* keyword argument, which draws a box around the
-text::
-
-    t = ax.text(
-        0, 0, "Direction", ha="center", va="center", rotation=45, size=15,
-        bbox=dict(boxstyle="rarrow,pad=0.3", fc="cyan", ec="b", lw=2))
-
-The patch object associated with the text can be accessed by::
-
-    bb = t.get_bbox_patch()
-
-The return value is a `.FancyBboxPatch`; patch properties
-(facecolor, edgewidth, etc.) can be accessed and modified as usual.
-`.FancyBboxPatch.set_boxstyle` sets the box shape::
-
-  bb.set_boxstyle("rarrow", pad=0.6)
-
-The arguments are the name of the box style with its attributes as
-keyword arguments. Currently, following box styles are implemented.
-
-  ==========   ==============   ==========================
-  Class        Name             Attrs
-  ==========   ==============   ==========================
-  Circle       ``circle``       pad=0.3
-  DArrow       ``darrow``       pad=0.3
-  LArrow       ``larrow``       pad=0.3
-  RArrow       ``rarrow``       pad=0.3
-  Round        ``round``        pad=0.3,rounding_size=None
-  Round4       ``round4``       pad=0.3,rounding_size=None
-  Roundtooth   ``roundtooth``   pad=0.3,tooth_size=None
-  Sawtooth     ``sawtooth``     pad=0.3,tooth_size=None
-  Square       ``square``       pad=0.3
-  ==========   ==============   ==========================
-
-.. figure:: ../../gallery/shapes_and_collections/images/sphx_glr_fancybox_demo_001.png
-   :target: ../../gallery/shapes_and_collections/fancybox_demo.html
-   :align: center
-   :scale: 50
-
-   Fancybox Demo
-
-Note that the attribute arguments can be specified within the style
-name with separating comma (this form can be used as "boxstyle" value
-of bbox argument when initializing the text instance) ::
-
-   bb.set_boxstyle("rarrow,pad=0.6")
-
-Annotating with Arrow
-~~~~~~~~~~~~~~~~~~~~~
-
-`~.Axes.annotate` draws an arrow connecting two points in an axes::
-
-    ax.annotate("Annotation",
-                xy=(x1, y1), xycoords='data',
-                xytext=(x2, y2), textcoords='offset points',
-                )
-
-This annotates a point at *xy* in the given coordinate (*xycoords*)
-with the text at *xytext* given in *textcoords*. Often, the
-annotated point is specified in the *data* coordinate and the annotating
-text in *offset points*.
-See `~.Axes.annotate` for available coordinate systems.
-
-An arrow connecting *xy* to *xytext* can be optionally drawn by
-specifying the *arrowprops* argument. To draw only an arrow, use
-empty string as the first argument. ::
-
-    ax.annotate("",
-                xy=(0.2, 0.2), xycoords='data',
-                xytext=(0.8, 0.8), textcoords='data',
-                arrowprops=dict(arrowstyle="->",
-                                connectionstyle="arc3"),
-                )
-
-.. figure:: ../../gallery/userdemo/images/sphx_glr_annotate_simple01_001.png
-   :target: ../../gallery/userdemo/annotate_simple01.html
-   :align: center
-   :scale: 50
-
-   Annotate Simple01
-
-The arrow is drawn as follows:
-
-1. A path connecting the two points is created, as specified by the
-   *connectionstyle* parameter.
-2. The path is clipped to avoid patches *patchA* and *patchB*, if these are
-   set.
-3. The path is further shrunk by *shrinkA* and *shrinkB* (in pixels).
-4. The path is transmuted to an arrow patch, as specified by the *arrowstyle*
-   parameter.
-
-.. figure:: ../../gallery/userdemo/images/sphx_glr_annotate_explain_001.png
-   :target: ../../gallery/userdemo/annotate_explain.html
-   :align: center
-   :scale: 50
-
-   Annotate Explain
-
-
-The creation of the connecting path between two points is controlled by
-``connectionstyle`` key and the following styles are available.
-
-   ==========   =============================================
-   Name         Attrs
-   ==========   =============================================
-   ``angle``    angleA=90,angleB=0,rad=0.0
-   ``angle3``   angleA=90,angleB=0
-   ``arc``      angleA=0,angleB=0,armA=None,armB=None,rad=0.0
-   ``arc3``     rad=0.0
-   ``bar``      armA=0.0,armB=0.0,fraction=0.3,angle=None
-   ==========   =============================================
-
-Note that "3" in ``angle3`` and ``arc3`` is meant to indicate that the
-resulting path is a quadratic spline segment (three control
-points). As will be discussed below, some arrow style options can only
-be used when the connecting path is a quadratic spline.
-
-The behavior of each connection style is (limitedly) demonstrated in the
-example below. (Warning: The behavior of the ``bar`` style is currently not
-well defined, it may be changed in the future).
-
-.. figure:: ../../gallery/userdemo/images/sphx_glr_connectionstyle_demo_001.png
-   :target: ../../gallery/userdemo/connectionstyle_demo.html
-   :align: center
-   :scale: 50
-
-   Connectionstyle Demo
-
-
-The connecting path (after clipping and shrinking) is then mutated to
-an arrow patch, according to the given ``arrowstyle``.
-
-    ==========   =============================================
-    Name         Attrs
-    ==========   =============================================
-    ``-``        None
-    ``->``       head_length=0.4,head_width=0.2
-    ``-[``       widthB=1.0,lengthB=0.2,angleB=None
-    ``|-|``      widthA=1.0,widthB=1.0
-    ``-|>``      head_length=0.4,head_width=0.2
-    ``<-``       head_length=0.4,head_width=0.2
-    ``<->``      head_length=0.4,head_width=0.2
-    ``<|-``      head_length=0.4,head_width=0.2
-    ``<|-|>``    head_length=0.4,head_width=0.2
-    ``fancy``    head_length=0.4,head_width=0.4,tail_width=0.4
-    ``simple``   head_length=0.5,head_width=0.5,tail_width=0.2
-    ``wedge``    tail_width=0.3,shrink_factor=0.5
-    ==========   =============================================
-
-.. figure:: ../../gallery/text_labels_and_annotations/images/sphx_glr_fancyarrow_demo_001.png
-   :target: ../../gallery/text_labels_and_annotations/fancyarrow_demo.html
-   :align: center
-   :scale: 50
-
-   Fancyarrow Demo
-
-Some arrowstyles only work with connection styles that generate a
-quadratic-spline segment. They are ``fancy``, ``simple``, and ``wedge``.
-For these arrow styles, you must use the "angle3" or "arc3" connection
-style.
-
-If the annotation string is given, the patchA is set to the bbox patch
-of the text by default.
-
-.. figure:: ../../gallery/userdemo/images/sphx_glr_annotate_simple02_001.png
-   :target: ../../gallery/userdemo/annotate_simple02.html
-   :align: center
-   :scale: 50
-
-   Annotate Simple02
-
-As with `~.Axes.text`, a box around the text can be drawn using the *bbox*
-argument.
-
-.. figure:: ../../gallery/userdemo/images/sphx_glr_annotate_simple03_001.png
-   :target: ../../gallery/userdemo/annotate_simple03.html
-   :align: center
-   :scale: 50
-
-   Annotate Simple03
-
-By default, the starting point is set to the center of the text
-extent.  This can be adjusted with ``relpos`` key value. The values
-are normalized to the extent of the text. For example, (0, 0) means
-lower-left corner and (1, 1) means top-right.
-
-.. figure:: ../../gallery/userdemo/images/sphx_glr_annotate_simple04_001.png
-   :target: ../../gallery/userdemo/annotate_simple04.html
-   :align: center
-   :scale: 50
-
-   Annotate Simple04
-
-
-Placing Artist at the anchored location of the Axes
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-There are classes of artists that can be placed at an anchored
-location in the Axes.  A common example is the legend.  This type
-of artist can be created by using the `.OffsetBox` class. A few
-predefined classes are available in :mod:`matplotlib.offsetbox` and in
-:mod:`mpl_toolkits.axes_grid1.anchored_artists`. ::
-
-    from matplotlib.offsetbox import AnchoredText
-    at = AnchoredText("Figure 1a",
-                      prop=dict(size=15), frameon=True,
-                      loc='upper left',
-                      )
-    at.patch.set_boxstyle("round,pad=0.,rounding_size=0.2")
-    ax.add_artist(at)
-
-
-.. figure:: ../../gallery/userdemo/images/sphx_glr_anchored_box01_001.png
-   :target: ../../gallery/userdemo/anchored_box01.html
-   :align: center
-   :scale: 50
-
-   Anchored Box01
-
-
-The *loc* keyword has same meaning as in the legend command.
-
-A simple application is when the size of the artist (or collection of
-artists) is known in pixel size during the time of creation. For
-example, If you want to draw a circle with fixed size of 20 pixel x 20
-pixel (radius = 10 pixel), you can utilize
-``AnchoredDrawingArea``. The instance is created with a size of the
-drawing area (in pixels), and arbitrary artists can added to the
-drawing area. Note that the extents of the artists that are added to
-the drawing area are not related to the placement of the drawing
-area itself. Only the initial size matters. ::
-
-    from mpl_toolkits.axes_grid1.anchored_artists import AnchoredDrawingArea
-
-    ada = AnchoredDrawingArea(20, 20, 0, 0,
-                              loc='upper right', pad=0., frameon=False)
-    p1 = Circle((10, 10), 10)
-    ada.drawing_area.add_artist(p1)
-    p2 = Circle((30, 10), 5, fc="r")
-    ada.drawing_area.add_artist(p2)
-
-The artists that are added to the drawing area should not have a
-transform set (it will be overridden) and the dimensions of those
-artists are interpreted as a pixel coordinate, i.e., the radius of the
-circles in above example are 10 pixels and 5 pixels, respectively.
-
-.. figure:: ../../gallery/userdemo/images/sphx_glr_anchored_box02_001.png
-   :target: ../../gallery/userdemo/anchored_box02.html
-   :align: center
-   :scale: 50
-
-   Anchored Box02
-
-Sometimes, you want your artists to scale with the data coordinate (or
-coordinates other than canvas pixels). You can use
-``AnchoredAuxTransformBox`` class. This is similar to
-``AnchoredDrawingArea`` except that the extent of the artist is
-determined during the drawing time respecting the specified transform. ::
-
-  from mpl_toolkits.axes_grid1.anchored_artists import AnchoredAuxTransformBox
-
-  box = AnchoredAuxTransformBox(ax.transData, loc='upper left')
-  el = Ellipse((0, 0), width=0.1, height=0.4, angle=30)  # in data coordinates!
-  box.drawing_area.add_artist(el)
-
-The ellipse in the above example will have width and height
-corresponding to 0.1 and 0.4 in data coordinates and will be
-automatically scaled when the view limits of the axes change.
-
-.. figure:: ../../gallery/userdemo/images/sphx_glr_anchored_box03_001.png
-   :target: ../../gallery/userdemo/anchored_box03.html
-   :align: center
-   :scale: 50
-
-   Anchored Box03
-
-As in the legend, the bbox_to_anchor argument can be set.  Using the
-HPacker and VPacker, you can have an arrangement(?) of artist as in the
-legend (as a matter of fact, this is how the legend is created).
-
-.. figure:: ../../gallery/userdemo/images/sphx_glr_anchored_box04_001.png
-   :target: ../../gallery/userdemo/anchored_box04.html
-   :align: center
-   :scale: 50
-
-   Anchored Box04
-
-Note that unlike the legend, the ``bbox_transform`` is set
-to IdentityTransform by default.
-
-Using Complex Coordinates with Annotations
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The Annotation in matplotlib supports several types of coordinates as
-described in :ref:`annotations-tutorial`. For an advanced user who wants
-more control, it supports a few other options.
-
-1. A `.Transform` instance.  For example, ::
-
-     ax.annotate("Test", xy=(0.5, 0.5), xycoords=ax.transAxes)
-
-   is identical to ::
-
-     ax.annotate("Test", xy=(0.5, 0.5), xycoords="axes fraction")
-
-   This allows annotating a point in another axes::
-
-     fig, (ax1, ax2) = plt.subplots(1, 2)
-     ax2.annotate("Test", xy=(0.5, 0.5), xycoords=ax1.transData,
-                  xytext=(0.5, 0.5), textcoords=ax2.transData,
-                  arrowprops=dict(arrowstyle="->"))
-
-2. An `.Artist` instance. The *xy* value (or *xytext*) is interpreted as a
-   fractional coordinate of the bbox (return value of *get_window_extent*) of
-   the artist::
-
-     an1 = ax.annotate("Test 1", xy=(0.5, 0.5), xycoords="data",
-                       va="center", ha="center",
-                       bbox=dict(boxstyle="round", fc="w"))
-     an2 = ax.annotate("Test 2", xy=(1, 0.5), xycoords=an1,  # (1, 0.5) of the an1's bbox
-                       xytext=(30, 0), textcoords="offset points",
-                       va="center", ha="left",
-                       bbox=dict(boxstyle="round", fc="w"),
-                       arrowprops=dict(arrowstyle="->"))
-
-   .. figure:: ../../gallery/userdemo/images/sphx_glr_annotate_simple_coord01_001.png
-      :target: ../../gallery/userdemo/annotate_simple_coord01.html
-      :align: center
-      :scale: 50
-
-      Annotation with Simple Coordinates
-
-   Note that you must ensure that the extent of the coordinate artist (*an1* in
-   above example) is determined before *an2* gets drawn. Usually, this means
-   that *an2* needs to be drawn after *an1*.
-
-3. A callable object that takes the renderer instance as single argument, and
-   returns either a `.Transform` or a `.BboxBase`.  The return value is then
-   handled as in (1), for transforms, or in (2), for bboxes.  For example, ::
-
-     an2 = ax.annotate("Test 2", xy=(1, 0.5), xycoords=an1,
-                       xytext=(30, 0), textcoords="offset points")
-
-   is identical to::
-
-     an2 = ax.annotate("Test 2", xy=(1, 0.5), xycoords=an1.get_window_extent,
-                       xytext=(30, 0), textcoords="offset points")
-
-4. A pair of coordinate specifications -- the first for the x-coordinate, and
-   the second is for the y-coordinate; e.g. ::
-
-     annotate("Test", xy=(0.5, 1), xycoords=("data", "axes fraction"))
-
-   Here, 0.5 is in data coordinates, and 1 is in normalized axes coordinates.
-   Each of the coordinate specifications can also be an artist or a transform.
-   For example,
-
-   .. figure:: ../../gallery/userdemo/images/sphx_glr_annotate_simple_coord02_001.png
-      :target: ../../gallery/userdemo/annotate_simple_coord02.html
-      :align: center
-      :scale: 50
-
-      Annotation with Simple Coordinates 2
-
-5. Sometimes, you want your annotation with some "offset points", not from the
-   annotated point but from some other point.  `.text.OffsetFrom` is a helper
-   for such cases.
-
-   .. figure:: ../../gallery/userdemo/images/sphx_glr_annotate_simple_coord03_001.png
-      :target: ../../gallery/userdemo/annotate_simple_coord03.html
-      :align: center
-      :scale: 50
-
-      Annotation with Simple Coordinates 3
-
-   You may take a look at this example
-   :doc:`/gallery/text_labels_and_annotations/annotation_demo`.
-
-Using ConnectionPatch
-~~~~~~~~~~~~~~~~~~~~~
-
-ConnectionPatch is like an annotation without text. While `~.Axes.annotate`
-is sufficient in most situations, ConnectionPatch is useful when you want to
-connect points in different axes. ::
-
-  from matplotlib.patches import ConnectionPatch
-  xy = (0.2, 0.2)
-  con = ConnectionPatch(xyA=xy, coordsA=ax1.transData,
-                        xyB=xy, coordsB=ax2.transData)
-  fig.add_artist(con)
-
-The above code connects point *xy* in the data coordinates of ``ax1`` to
-point *xy* in the data coordinates of ``ax2``. Here is a simple example.
-
-.. figure:: ../../gallery/userdemo/images/sphx_glr_connect_simple01_001.png
-   :target: ../../gallery/userdemo/connect_simple01.html
-   :align: center
-   :scale: 50
-
-   Connect Simple01
-
-Here, we added the ConnectionPatch to the *figure* (with `~.Figure.add_artist`)
-rather than to either axes: this ensures that it is drawn on top of both axes,
-and is also necessary if using :doc:`constrained_layout
-</tutorials/intermediate/constrainedlayout_guide>` for positioning the axes.
-
-Advanced Topics
----------------
-
-Zoom effect between Axes
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-``mpl_toolkits.axes_grid1.inset_locator`` defines some patch classes useful for
-interconnecting two axes. Understanding the code requires some knowledge of
-Matplotlib's transform system.
-
-.. figure:: ../../gallery/subplots_axes_and_figures/images/sphx_glr_axes_zoom_effect_001.png
-   :target: ../../gallery/subplots_axes_and_figures/axes_zoom_effect.html
-   :align: center
-   :scale: 50
-
-   Axes Zoom Effect
-
-Define Custom BoxStyle
-~~~~~~~~~~~~~~~~~~~~~~
-
-You can use a custom box style. The value for the ``boxstyle`` can be a
-callable object in the following forms.::
-
-        def __call__(self, x0, y0, width, height, mutation_size,
-                     aspect_ratio=1.):
-            '''
-            Given the location and size of the box, return the path of
-            the box around it.
-
-              - *x0*, *y0*, *width*, *height* : location and size of the box
-              - *mutation_size* : a reference scale for the mutation.
-              - *aspect_ratio* : aspect-ratio for the mutation.
-            '''
-            path = ...
-            return path
-
-Here is a complete example.
-
-.. figure:: ../../gallery/userdemo/images/sphx_glr_custom_boxstyle01_001.png
-   :target: ../../gallery/userdemo/custom_boxstyle01.html
-   :align: center
-   :scale: 50
-
-   Custom Boxstyle01
-
-Similarly, you can define a custom ConnectionStyle and a custom ArrowStyle.
-See the source code of ``lib/matplotlib/patches.py`` and check
-how each style class is defined.
 """
+
+from matplotlib import pyplot as plt
+
+###############################################################################
+# .. _annotations-tutorial:
+#
+# Basic annotation
+# ----------------
+#
+# The uses of the basic :func:`~matplotlib.pyplot.text` will place text
+# at an arbitrary position on the Axes.  A common use case of text is to
+# annotate some feature of the plot, and the
+# :func:`~matplotlib.axes.Axes.annotate` method provides helper functionality
+# to make annotations easy.  In an annotation, there are two points to
+# consider: the location being annotated represented by the argument
+# *xy* and the location of the text *xytext*.  Both of these
+# arguments are ``(x, y)`` tuples.
+#
+# .. figure:: ../../gallery/text_labels_and_annotations/images/sphx_glr_annotation_basic_001.png
+#    :target: ../../gallery/text_labels_and_annotations/annotation_basic.html
+#    :align: center
+#
+# In this example, both the *xy* (arrow tip) and *xytext* locations
+# (text location) are in data coordinates.  There are a variety of other
+# coordinate systems one can choose -- you can specify the coordinate
+# system of *xy* and *xytext* with one of the following strings for
+# *xycoords* and *textcoords* (default is 'data')
+#
+# ==================  ========================================================
+# argument            coordinate system
+# ==================  ========================================================
+# 'figure points'     points from the lower left corner of the figure
+# 'figure pixels'     pixels from the lower left corner of the figure
+# 'figure fraction'   (0, 0) is lower left of figure and (1, 1) is upper right
+# 'axes points'       points from lower left corner of axes
+# 'axes pixels'       pixels from lower left corner of axes
+# 'axes fraction'     (0, 0) is lower left of axes and (1, 1) is upper right
+# 'data'              use the axes data coordinate system
+# ==================  ========================================================
+#
+# For example to place the text coordinates in fractional axes
+# coordinates, one could do::
+#
+#     ax.annotate('local max', xy=(3, 1),  xycoords='data',
+#                 xytext=(0.8, 0.95), textcoords='axes fraction',
+#                 arrowprops=dict(facecolor='black', shrink=0.05),
+#                 horizontalalignment='right', verticalalignment='top',
+#                 )
+#
+# For physical coordinate systems (points or pixels) the origin is the
+# bottom-left of the figure or axes.
+#
+# Optionally, you can enable drawing of an arrow from the text to the annotated
+# point by giving a dictionary of arrow properties in the optional keyword
+# argument *arrowprops*.
+#
+#
+# ==================== =====================================================
+# *arrowprops* key     description
+# ==================== =====================================================
+# width                the width of the arrow in points
+# frac                 the fraction of the arrow length occupied by the head
+# headwidth            the width of the base of the arrow head in points
+# shrink               move the tip and base some percent away from
+#                      the annotated point and text
+#
+# \*\*kwargs           any key for :class:`matplotlib.patches.Polygon`,
+#                      e.g., ``facecolor``
+# ==================== =====================================================
+#
+#
+# In the example below, the *xy* point is in native coordinates
+# (*xycoords* defaults to 'data').  For a polar axes, this is in
+# (theta, radius) space.  The text in this example is placed in the
+# fractional figure coordinate system. :class:`matplotlib.text.Text`
+# keyword arguments like *horizontalalignment*, *verticalalignment* and
+# *fontsize* are passed from `~matplotlib.axes.Axes.annotate` to the
+# ``Text`` instance.
+#
+# .. figure:: ../../gallery/text_labels_and_annotations/images/sphx_glr_annotation_polar_001.png
+#    :target: ../../gallery/text_labels_and_annotations/annotation_polar.html
+#    :align: center
+#
+# For more on all the wild and wonderful things you can do with
+# annotations, including fancy arrows, see :ref:`plotting-guide-annotation`
+# and :doc:`/gallery/text_labels_and_annotations/annotation_demo`.
+#
+#
+# Do not proceed unless you have already read :ref:`annotations-tutorial`,
+# :func:`~matplotlib.pyplot.text` and :func:`~matplotlib.pyplot.annotate`!
+#
+#
+# .. _plotting-guide-annotation:
+#
+# Advanced Annotations
+# --------------------
+#
+# Annotating with Text with Box
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+# Let's start with a simple example.
+#
+# .. figure:: ../../gallery/userdemo/images/sphx_glr_annotate_text_arrow_001.png
+#    :target: ../../gallery/userdemo/annotate_text_arrow.html
+#    :align: center
+#
+# `~.Axes.text` takes a *bbox* keyword argument, which draws a box around the
+# text::
+#
+#     t = ax.text(
+#         0, 0, "Direction", ha="center", va="center", rotation=45, size=15,
+#         bbox=dict(boxstyle="rarrow,pad=0.3", fc="cyan", ec="b", lw=2))
+#
+# The patch object associated with the text can be accessed by::
+#
+#     bb = t.get_bbox_patch()
+#
+# The return value is a `.FancyBboxPatch`; patch properties
+# (facecolor, edgewidth, etc.) can be accessed and modified as usual.
+# `.FancyBboxPatch.set_boxstyle` sets the box shape::
+#
+#   bb.set_boxstyle("rarrow", pad=0.6)
+#
+# The arguments are the name of the box style with its attributes as
+# keyword arguments. Currently, following box styles are implemented.
+#
+#   ==========   ==============   ==========================
+#   Class        Name             Attrs
+#   ==========   ==============   ==========================
+#   Circle       ``circle``       pad=0.3
+#   DArrow       ``darrow``       pad=0.3
+#   LArrow       ``larrow``       pad=0.3
+#   RArrow       ``rarrow``       pad=0.3
+#   Round        ``round``        pad=0.3,rounding_size=None
+#   Round4       ``round4``       pad=0.3,rounding_size=None
+#   Roundtooth   ``roundtooth``   pad=0.3,tooth_size=None
+#   Sawtooth     ``sawtooth``     pad=0.3,tooth_size=None
+#   Square       ``square``       pad=0.3
+#   ==========   ==============   ==========================
+#
+# .. figure:: ../../gallery/shapes_and_collections/images/sphx_glr_fancybox_demo_001.png
+#    :target: ../../gallery/shapes_and_collections/fancybox_demo.html
+#    :align: center
+#
+# Note that the attribute arguments can be specified within the style
+# name with separating comma (this form can be used as "boxstyle" value
+# of bbox argument when initializing the text instance) ::
+#
+#    bb.set_boxstyle("rarrow,pad=0.6")
+#
+# Annotating with Arrow
+# ~~~~~~~~~~~~~~~~~~~~~
+#
+# `~.Axes.annotate` draws an arrow connecting two points in an Axes::
+#
+#     ax.annotate("Annotation",
+#                 xy=(x1, y1), xycoords='data',
+#                 xytext=(x2, y2), textcoords='offset points',
+#                 )
+#
+# This annotates a point at *xy* in the given coordinate (*xycoords*)
+# with the text at *xytext* given in *textcoords*. Often, the
+# annotated point is specified in the *data* coordinate and the annotating
+# text in *offset points*.
+# See `~.Axes.annotate` for available coordinate systems.
+#
+# An arrow connecting *xy* to *xytext* can be optionally drawn by
+# specifying the *arrowprops* argument. To draw only an arrow, use
+# empty string as the first argument. ::
+#
+#     ax.annotate("",
+#                 xy=(0.2, 0.2), xycoords='data',
+#                 xytext=(0.8, 0.8), textcoords='data',
+#                 arrowprops=dict(arrowstyle="->",
+#                                 connectionstyle="arc3"),
+#                 )
+#
+# .. figure:: ../../gallery/userdemo/images/sphx_glr_annotate_simple01_001.png
+#    :target: ../../gallery/userdemo/annotate_simple01.html
+#    :align: center
+#
+# The arrow is drawn as follows:
+#
+# 1. A path connecting the two points is created, as specified by the
+#    *connectionstyle* parameter.
+# 2. The path is clipped to avoid patches *patchA* and *patchB*, if these are
+#    set.
+# 3. The path is further shrunk by *shrinkA* and *shrinkB* (in pixels).
+# 4. The path is transmuted to an arrow patch, as specified by the *arrowstyle*
+#    parameter.
+#
+# .. figure:: ../../gallery/userdemo/images/sphx_glr_annotate_explain_001.png
+#    :target: ../../gallery/userdemo/annotate_explain.html
+#    :align: center
+#
+# The creation of the connecting path between two points is controlled by
+# ``connectionstyle`` key and the following styles are available.
+#
+#    ==========   =============================================
+#    Name         Attrs
+#    ==========   =============================================
+#    ``angle``    angleA=90,angleB=0,rad=0.0
+#    ``angle3``   angleA=90,angleB=0
+#    ``arc``      angleA=0,angleB=0,armA=None,armB=None,rad=0.0
+#    ``arc3``     rad=0.0
+#    ``bar``      armA=0.0,armB=0.0,fraction=0.3,angle=None
+#    ==========   =============================================
+#
+# Note that "3" in ``angle3`` and ``arc3`` is meant to indicate that the
+# resulting path is a quadratic spline segment (three control
+# points). As will be discussed below, some arrow style options can only
+# be used when the connecting path is a quadratic spline.
+#
+# The behavior of each connection style is (limitedly) demonstrated in the
+# example below. (Warning: The behavior of the ``bar`` style is currently not
+# well defined, it may be changed in the future).
+#
+# .. figure:: ../../gallery/userdemo/images/sphx_glr_connectionstyle_demo_001.png
+#    :target: ../../gallery/userdemo/connectionstyle_demo.html
+#    :align: center
+#
+# The connecting path (after clipping and shrinking) is then mutated to
+# an arrow patch, according to the given ``arrowstyle``.
+#
+#     ==========   =============================================
+#     Name         Attrs
+#     ==========   =============================================
+#     ``-``        None
+#     ``->``       head_length=0.4,head_width=0.2
+#     ``-[``       widthB=1.0,lengthB=0.2,angleB=None
+#     ``|-|``      widthA=1.0,widthB=1.0
+#     ``-|>``      head_length=0.4,head_width=0.2
+#     ``<-``       head_length=0.4,head_width=0.2
+#     ``<->``      head_length=0.4,head_width=0.2
+#     ``<|-``      head_length=0.4,head_width=0.2
+#     ``<|-|>``    head_length=0.4,head_width=0.2
+#     ``fancy``    head_length=0.4,head_width=0.4,tail_width=0.4
+#     ``simple``   head_length=0.5,head_width=0.5,tail_width=0.2
+#     ``wedge``    tail_width=0.3,shrink_factor=0.5
+#     ==========   =============================================
+#
+# .. figure:: ../../gallery/text_labels_and_annotations/images/sphx_glr_fancyarrow_demo_001.png
+#    :target: ../../gallery/text_labels_and_annotations/fancyarrow_demo.html
+#    :align: center
+#
+# Some arrowstyles only work with connection styles that generate a
+# quadratic-spline segment. They are ``fancy``, ``simple``, and ``wedge``.
+# For these arrow styles, you must use the "angle3" or "arc3" connection
+# style.
+#
+# If the annotation string is given, the patchA is set to the bbox patch
+# of the text by default.
+#
+# .. figure:: ../../gallery/userdemo/images/sphx_glr_annotate_simple02_001.png
+#    :target: ../../gallery/userdemo/annotate_simple02.html
+#    :align: center
+#
+# As with `~.Axes.text`, a box around the text can be drawn using the *bbox*
+# argument.
+#
+# .. figure:: ../../gallery/userdemo/images/sphx_glr_annotate_simple03_001.png
+#    :target: ../../gallery/userdemo/annotate_simple03.html
+#    :align: center
+#
+# By default, the starting point is set to the center of the text
+# extent.  This can be adjusted with ``relpos`` key value. The values
+# are normalized to the extent of the text. For example, (0, 0) means
+# lower-left corner and (1, 1) means top-right.
+#
+# .. figure:: ../../gallery/userdemo/images/sphx_glr_annotate_simple04_001.png
+#    :target: ../../gallery/userdemo/annotate_simple04.html
+#    :align: center
+#
+# Placing Artist at anchored Axes locations
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+# There are classes of artists that can be placed at an anchored
+# location in the Axes.  A common example is the legend.  This type
+# of artist can be created by using the `.OffsetBox` class. A few
+# predefined classes are available in :mod:`matplotlib.offsetbox` and in
+# :mod:`mpl_toolkits.axes_grid1.anchored_artists`.
+
+from matplotlib.offsetbox import AnchoredText
+
+fig, ax = plt.subplots()
+at = AnchoredText(
+    "Figure 1a", prop=dict(size=15), frameon=True, loc='upper left')
+at.patch.set_boxstyle("round,pad=0.,rounding_size=0.2")
+ax.add_artist(at)
+
+###############################################################################
+# The *loc* keyword has same meaning as in the legend command.
+#
+# A simple application is when the size of the artist (or collection of
+# artists) is known in pixel size during the time of creation. For
+# example, If you want to draw a circle with fixed size of 20 pixel x 20
+# pixel (radius = 10 pixel), you can utilize
+# `~mpl_toolkits.axes_grid1.anchored_artists.AnchoredDrawingArea`. The instance
+# is created with a size of the drawing area (in pixels), and arbitrary artists
+# can added to the drawing area. Note that the extents of the artists that are
+# added to the drawing area are not related to the placement of the drawing
+# area itself. Only the initial size matters.
+#
+# The artists that are added to the drawing area should not have a
+# transform set (it will be overridden) and the dimensions of those
+# artists are interpreted as a pixel coordinate, i.e., the radius of the
+# circles in above example are 10 pixels and 5 pixels, respectively.
+
+from matplotlib.patches import Circle
+from mpl_toolkits.axes_grid1.anchored_artists import AnchoredDrawingArea
+
+fig, ax = plt.subplots()
+ada = AnchoredDrawingArea(40, 20, 0, 0,
+                          loc='upper right', pad=0., frameon=False)
+p1 = Circle((10, 10), 10)
+ada.drawing_area.add_artist(p1)
+p2 = Circle((30, 10), 5, fc="r")
+ada.drawing_area.add_artist(p2)
+ax.add_artist(ada)
+
+###############################################################################
+# Sometimes, you want your artists to scale with the data coordinate (or
+# coordinates other than canvas pixels). You can use
+# `~mpl_toolkits.axes_grid1.anchored_artists.AnchoredAuxTransformBox` class.
+# This is similar to
+# `~mpl_toolkits.axes_grid1.anchored_artists.AnchoredDrawingArea` except that
+# the extent of the artist is determined during the drawing time respecting the
+# specified transform.
+#
+# The ellipse in the example below will have width and height
+# corresponding to 0.1 and 0.4 in data coordinates and will be
+# automatically scaled when the view limits of the axes change.
+
+from matplotlib.patches import Ellipse
+from mpl_toolkits.axes_grid1.anchored_artists import AnchoredAuxTransformBox
+
+fig, ax = plt.subplots()
+box = AnchoredAuxTransformBox(ax.transData, loc='upper left')
+el = Ellipse((0, 0), width=0.1, height=0.4, angle=30)  # in data coordinates!
+box.drawing_area.add_artist(el)
+ax.add_artist(box)
+
+###############################################################################
+# As in the legend, the bbox_to_anchor argument can be set.  Using the
+# HPacker and VPacker, you can have an arrangement(?) of artist as in the
+# legend (as a matter of fact, this is how the legend is created).
+#
+# .. figure:: ../../gallery/userdemo/images/sphx_glr_anchored_box04_001.png
+#    :target: ../../gallery/userdemo/anchored_box04.html
+#    :align: center
+#
+# Note that unlike the legend, the ``bbox_transform`` is set
+# to IdentityTransform by default.
+#
+# Coordinate systems for Annotations
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+# Matplotlib Annotations support several types of coordinates.  Some are
+# described in :ref:`annotations-tutorial`; more advanced options are
+#
+# 1. A `.Transform` instance.  For example, ::
+#
+#      ax.annotate("Test", xy=(0.5, 0.5), xycoords=ax.transAxes)
+#
+#    is identical to ::
+#
+#      ax.annotate("Test", xy=(0.5, 0.5), xycoords="axes fraction")
+#
+#    This allows annotating a point in another axes::
+#
+#      fig, (ax1, ax2) = plt.subplots(1, 2)
+#      ax2.annotate("Test", xy=(0.5, 0.5), xycoords=ax1.transData,
+#                   xytext=(0.5, 0.5), textcoords=ax2.transData,
+#                   arrowprops=dict(arrowstyle="->"))
+#
+# 2. An `.Artist` instance. The *xy* value (or *xytext*) is interpreted as a
+#    fractional coordinate of the bbox (return value of *get_window_extent*) of
+#    the artist::
+#
+#      an1 = ax.annotate("Test 1", xy=(0.5, 0.5), xycoords="data",
+#                        va="center", ha="center",
+#                        bbox=dict(boxstyle="round", fc="w"))
+#      an2 = ax.annotate("Test 2", xy=(1, 0.5), xycoords=an1,  # (1, 0.5) of the an1's bbox
+#                        xytext=(30, 0), textcoords="offset points",
+#                        va="center", ha="left",
+#                        bbox=dict(boxstyle="round", fc="w"),
+#                        arrowprops=dict(arrowstyle="->"))
+#
+#    .. figure:: ../../gallery/userdemo/images/sphx_glr_annotate_simple_coord01_001.png
+#       :target: ../../gallery/userdemo/annotate_simple_coord01.html
+#       :align: center
+#
+#    Note that you must ensure that the extent of the coordinate artist (*an1* in
+#    above example) is determined before *an2* gets drawn. Usually, this means
+#    that *an2* needs to be drawn after *an1*.
+#
+# 3. A callable object that takes the renderer instance as single argument, and
+#    returns either a `.Transform` or a `.BboxBase`.  The return value is then
+#    handled as in (1), for transforms, or in (2), for bboxes.  For example, ::
+#
+#      an2 = ax.annotate("Test 2", xy=(1, 0.5), xycoords=an1,
+#                        xytext=(30, 0), textcoords="offset points")
+#
+#    is identical to::
+#
+#      an2 = ax.annotate("Test 2", xy=(1, 0.5), xycoords=an1.get_window_extent,
+#                        xytext=(30, 0), textcoords="offset points")
+#
+# 4. A pair of coordinate specifications -- the first for the x-coordinate, and
+#    the second is for the y-coordinate; e.g. ::
+#
+#      annotate("Test", xy=(0.5, 1), xycoords=("data", "axes fraction"))
+#
+#    Here, 0.5 is in data coordinates, and 1 is in normalized axes coordinates.
+#    Each of the coordinate specifications can also be an artist or a transform.
+#    For example,
+#
+#    .. figure:: ../../gallery/userdemo/images/sphx_glr_annotate_simple_coord02_001.png
+#       :target: ../../gallery/userdemo/annotate_simple_coord02.html
+#       :align: center
+#
+# 5. Sometimes, you want your annotation with some "offset points", not from the
+#    annotated point but from some other point.  `.text.OffsetFrom` is a helper
+#    for such cases.
+#
+#    .. figure:: ../../gallery/userdemo/images/sphx_glr_annotate_simple_coord03_001.png
+#       :target: ../../gallery/userdemo/annotate_simple_coord03.html
+#       :align: center
+#
+#    You may take a look at this example
+#    :doc:`/gallery/text_labels_and_annotations/annotation_demo`.
+#
+# Using ConnectionPatch
+# ~~~~~~~~~~~~~~~~~~~~~
+#
+# `.ConnectionPatch` is like an annotation without text. While `~.Axes.annotate`
+# is sufficient in most situations, `.ConnectionPatch` is useful when you want to
+# connect points in different axes. ::
+#
+#   from matplotlib.patches import ConnectionPatch
+#   xy = (0.2, 0.2)
+#   con = ConnectionPatch(xyA=xy, coordsA=ax1.transData,
+#                         xyB=xy, coordsB=ax2.transData)
+#   fig.add_artist(con)
+#
+# The above code connects point *xy* in the data coordinates of ``ax1`` to
+# point *xy* in the data coordinates of ``ax2``. Here is a simple example.
+#
+# .. figure:: ../../gallery/userdemo/images/sphx_glr_connect_simple01_001.png
+#    :target: ../../gallery/userdemo/connect_simple01.html
+#    :align: center
+#
+# Here, we added the `.ConnectionPatch` to the *figure* (with `~.Figure.add_artist`)
+# rather than to either axes: this ensures that it is drawn on top of both axes,
+# and is also necessary if using :doc:`constrained_layout
+# </tutorials/intermediate/constrainedlayout_guide>` for positioning the axes.
+#
+# Advanced Topics
+# ---------------
+#
+# Zoom effect between Axes
+# ~~~~~~~~~~~~~~~~~~~~~~~~
+#
+# `mpl_toolkits.axes_grid1.inset_locator` defines some patch classes useful for
+# interconnecting two axes. Understanding the code requires some knowledge of
+# Matplotlib's transform system.
+#
+# .. figure:: ../../gallery/subplots_axes_and_figures/images/sphx_glr_axes_zoom_effect_001.png
+#    :target: ../../gallery/subplots_axes_and_figures/axes_zoom_effect.html
+#    :align: center
+#
+# Define Custom BoxStyle
+# ~~~~~~~~~~~~~~~~~~~~~~
+#
+# You can use a custom box style. The value for the ``boxstyle`` can be a
+# callable object in the following forms.::
+#
+#         def __call__(self, x0, y0, width, height, mutation_size,
+#                      aspect_ratio=1.):
+#             '''
+#             Given the location and size of the box, return the path of
+#             the box around it.
+#
+#               - *x0*, *y0*, *width*, *height* : location and size of the box
+#               - *mutation_size* : a reference scale for the mutation.
+#               - *aspect_ratio* : aspect-ratio for the mutation.
+#             '''
+#             path = ...
+#             return path
+#
+# Here is a complete example.
+#
+# .. figure:: ../../gallery/userdemo/images/sphx_glr_custom_boxstyle01_001.png
+#    :target: ../../gallery/userdemo/custom_boxstyle01.html
+#    :align: center
+#
+# Similarly, you can define a custom ConnectionStyle and a custom ArrowStyle.
+# See the source code of ``lib/matplotlib/patches.py`` and check
+# how each style class is defined.
diff --git a/tutorials/text/mathtext.py b/tutorials/text/mathtext.py
index 3663d27f5f8b..72a2cebb2b2c 100644
--- a/tutorials/text/mathtext.py
+++ b/tutorials/text/mathtext.py
@@ -1,25 +1,24 @@
 r"""
 Writing mathematical expressions
 ================================
-An introduction to writing mathematical expressions in Matplotlib.
 
-You can use a subset TeX markup in any matplotlib text string by placing it
+You can use a subset of TeX markup in any Matplotlib text string by placing it
 inside a pair of dollar signs ($).
 
 Note that you do not need to have TeX installed, since Matplotlib ships
 its own TeX expression parser, layout engine, and fonts.  The layout engine
 is a fairly direct adaptation of the layout algorithms in Donald Knuth's
-TeX, so the quality is quite good (matplotlib also provides a ``usetex``
-option for those who do want to call out to TeX to generate their text (see
+TeX, so the quality is quite good (Matplotlib also provides a ``usetex``
+option for those who do want to call out to TeX to generate their text; see
 :doc:`/tutorials/text/usetex`).
 
 Any text element can use math text.  You should use raw strings (precede the
 quotes with an ``'r'``), and surround the math text with dollar signs ($), as
 in TeX. Regular text and mathtext can be interleaved within the same string.
 Mathtext can use DejaVu Sans (default), DejaVu Serif, the Computer Modern fonts
-(from (La)TeX), `STIX <http://www.stixfonts.org/>`_ fonts (with are designed
+(from (La)TeX), `STIX <http://www.stixfonts.org/>`_ fonts (which are designed
 to blend well with Times), or a Unicode font that you provide.  The mathtext
-font can be selected with the customization variable ``mathtext.fontset`` (see
+font can be selected via :rc:`mathtext.fontset` (see
 :doc:`/tutorials/introductory/customizing`)
 
 Here is a simple example::
@@ -112,7 +111,7 @@
 
     r'$(\frac{5 - \frac{1}{x}}{4})$'
 
-.. math ::
+.. math::
 
     (\frac{5 - \frac{1}{x}}{4})
 
@@ -121,7 +120,7 @@
 
     r'$\left(\frac{5 - \frac{1}{x}}{4}\right)$'
 
-.. math ::
+.. math::
 
     \left(\frac{5 - \frac{1}{x}}{4}\right)
 
@@ -131,7 +130,7 @@
 
     r'$\sqrt{2}$'
 
-.. math ::
+.. math::
 
     \sqrt{2}
 
@@ -141,7 +140,7 @@
 
     r'$\sqrt[3]{x}$'
 
-.. math ::
+.. math::
 
     \sqrt[3]{x}
 
@@ -309,8 +308,10 @@
     ``\acute a`` or ``\'a``        :mathmpl:`\acute a`
     ``\bar a``                     :mathmpl:`\bar a`
     ``\breve a``                   :mathmpl:`\breve a`
-    ``\ddot a`` or ``\''a``        :mathmpl:`\ddot a`
     ``\dot a`` or ``\.a``          :mathmpl:`\dot a`
+    ``\ddot a`` or ``\''a``        :mathmpl:`\ddot a`
+    ``\dddot a``                   :mathmpl:`\dddot a`
+    ``\ddddot a``                  :mathmpl:`\ddddot a`
     ``\grave a`` or ``\`a``        :mathmpl:`\grave a`
     ``\hat a`` or ``\^a``          :mathmpl:`\hat a`
     ``\tilde a`` or ``\~a``        :mathmpl:`\tilde a`
@@ -356,7 +357,4 @@
 .. figure:: ../../gallery/pyplots/images/sphx_glr_pyplot_mathtext_001.png
    :target: ../../gallery/pyplots/pyplot_mathtext.html
    :align: center
-   :scale: 50
-
-   Pyplot Mathtext
 """
diff --git a/tutorials/text/pgf.py b/tutorials/text/pgf.py
index 43e7a9628973..5cbf4cfa8b98 100644
--- a/tutorials/text/pgf.py
+++ b/tutorials/text/pgf.py
@@ -1,9 +1,7 @@
 r"""
-*********************************
-Typesetting With XeLaTeX/LuaLaTeX
-*********************************
-
-How to typeset text with the ``pgf`` backend in Matplotlib.
+************************************************************
+Text rendering with XeLaTeX/LuaLaTeX via the ``pgf`` backend
+************************************************************
 
 Using the ``pgf`` backend, Matplotlib can export figures as pgf drawing
 commands that can be processed with pdflatex, xelatex or lualatex. XeLaTeX and
@@ -53,7 +51,13 @@
 
    Generally, these characters must be escaped correctly. For convenience,
    some characters (_, ^, %) are automatically escaped outside of math
-   environments.
+   environments. Other characters are not escaped as they are commonly needed
+   in actual TeX expressions. However, one can configure TeX to treat them as
+   "normal" characters (known as "catcode 12" to TeX) via a custom preamble,
+   such as::
+
+     plt.rcParams["pgf.preamble"] = (
+         r"\AtBeginDocument{\catcode`\&=12\catcode`\#=12}")
 
 .. _pgf-rcfonts:
 
@@ -150,11 +154,6 @@
   executables. See :ref:`environment-variables` and
   :ref:`setting-windows-environment-variables` for details.
 
-* A limitation on Windows causes the backend to keep file handles that have
-  been opened by your application open. As a result, it may not be possible
-  to delete the corresponding files until the application closes (see
-  `#1324 <https://github.com/matplotlib/matplotlib/issues/1324>`_).
-
 * Sometimes the font rendering in figures that are saved to png images is
   very bad. This happens when the pdftocairo tool is not available and
   ghostscript is used for the pdf to png conversion.
@@ -175,7 +174,7 @@
   alternatively make the fonts available to your OS. See this
   `tex.stackexchange.com question`__ for more details.
 
-  __ http://tex.stackexchange.com/questions/43642
+  __ https://tex.stackexchange.com/q/43642/
 
 * If the font configuration used by Matplotlib differs from the font setting
   in yout LaTeX document, the alignment of text elements in imported figures
@@ -187,11 +186,17 @@
   big scatter graphs.  In an extreme case this can cause TeX to run out of
   memory: "TeX capacity exceeded, sorry"  You can configure latex to increase
   the amount of memory available to generate the ``.pdf`` image as discussed on
-  `tex.stackexchange.com <http://tex.stackexchange.com/questions/7953>`_.
+  `tex.stackexchange.com <https://tex.stackexchange.com/q/7953/>`_.
   Another way would be to "rasterize" parts of the graph causing problems
   using either the ``rasterized=True`` keyword, or ``.set_rasterized(True)`` as
   per :doc:`this example </gallery/misc/rasterization_demo>`.
 
+* Various math fonts are compiled and rendered only if corresponding font
+  packages are loaded. Specifically, when using ``\mathbf{}`` on Greek letters,
+  the default computer modern font may not contain them, in which case the
+  letter is not rendered. In such scenarios, the ``lmodern`` package should be
+  loaded.
+
 * If you still need help, please see :ref:`reporting-problems`
 
 .. _LaTeX: http://www.tug.org
diff --git a/tutorials/text/text_intro.py b/tutorials/text/text_intro.py
index 10432971e151..1b0e60a37ab1 100644
--- a/tutorials/text/text_intro.py
+++ b/tutorials/text/text_intro.py
@@ -8,7 +8,7 @@
 Matplotlib has extensive text support, including support for
 mathematical expressions, truetype support for raster and
 vector outputs, newline separated text with arbitrary
-rotations, and unicode support.
+rotations, and Unicode support.
 
 Because it embeds fonts directly in output documents, e.g., for postscript
 or PDF, what you see on the screen is what you get in the hardcopy.
@@ -31,11 +31,11 @@
 Basic text commands
 ===================
 
-The following commands are used to create text in the pyplot
-interface and the object-oriented API:
+The following commands are used to create text in the implicit and explicit
+interfaces (see :ref:`api_interfaces` for an explanation of the tradeoffs):
 
 =================== =================== ======================================
-`.pyplot` API       OO API              description
+implicit API        explicit API        description
 =================== =================== ======================================
 `~.pyplot.text`     `~.Axes.text`       Add text at an arbitrary location of
                                         the `~matplotlib.axes.Axes`.
@@ -63,6 +63,7 @@
 configured with a variety of font and other properties.  The example below
 shows all of these commands in action, and more detail is provided in the
 sections that follow.
+
 """
 
 import matplotlib
@@ -87,7 +88,7 @@
 
 ax.text(2, 6, r'an equation: $E=mc^2$', fontsize=15)
 
-ax.text(3, 2, 'unicode: Institut für Festkörperphysik')
+ax.text(3, 2, 'Unicode: Institut für Festkörperphysik')
 
 ax.text(0.95, 0.01, 'colored text in axes coords',
         verticalalignment='bottom', horizontalalignment='right',
@@ -117,7 +118,7 @@
 fig, ax = plt.subplots(figsize=(5, 3))
 fig.subplots_adjust(bottom=0.15, left=0.2)
 ax.plot(x1, y1)
-ax.set_xlabel('time [s]')
+ax.set_xlabel('Time [s]')
 ax.set_ylabel('Damped oscillation [V]')
 
 plt.show()
@@ -130,7 +131,7 @@
 fig, ax = plt.subplots(figsize=(5, 3))
 fig.subplots_adjust(bottom=0.15, left=0.2)
 ax.plot(x1, y1*10000)
-ax.set_xlabel('time [s]')
+ax.set_xlabel('Time [s]')
 ax.set_ylabel('Damped oscillation [V]')
 
 plt.show()
@@ -143,7 +144,7 @@
 fig, ax = plt.subplots(figsize=(5, 3))
 fig.subplots_adjust(bottom=0.15, left=0.2)
 ax.plot(x1, y1*10000)
-ax.set_xlabel('time [s]')
+ax.set_xlabel('Time [s]')
 ax.set_ylabel('Damped oscillation [V]', labelpad=18)
 
 plt.show()
@@ -153,20 +154,20 @@
 # *position*, via which we can manually specify the label positions.  Here we
 # put the xlabel to the far left of the axis.  Note, that the y-coordinate of
 # this position has no effect - to adjust the y-position we need to use the
-# *labelpad* kwarg.
+# *labelpad* keyword argument.
 
 fig, ax = plt.subplots(figsize=(5, 3))
 fig.subplots_adjust(bottom=0.15, left=0.2)
 ax.plot(x1, y1)
-ax.set_xlabel('time [s]', position=(0., 1e6), horizontalalignment='left')
+ax.set_xlabel('Time [s]', position=(0., 1e6), horizontalalignment='left')
 ax.set_ylabel('Damped oscillation [V]')
 
 plt.show()
 
 ##############################################################################
 # All the labelling in this tutorial can be changed by manipulating the
-# `matplotlib.font_manager.FontProperties` method, or by named kwargs to
-# `~matplotlib.axes.Axes.set_xlabel`
+# `matplotlib.font_manager.FontProperties` method, or by named keyword
+# arguments to `~matplotlib.axes.Axes.set_xlabel`
 
 from matplotlib.font_manager import FontProperties
 
@@ -178,7 +179,7 @@
 fig, ax = plt.subplots(figsize=(5, 3))
 fig.subplots_adjust(bottom=0.15, left=0.2)
 ax.plot(x1, y1)
-ax.set_xlabel('time [s]', fontsize='large', fontweight='bold')
+ax.set_xlabel('Time [s]', fontsize='large', fontweight='bold')
 ax.set_ylabel('Damped oscillation [V]', fontproperties=font)
 
 plt.show()
@@ -190,7 +191,7 @@
 fig, ax = plt.subplots(figsize=(5, 3))
 fig.subplots_adjust(bottom=0.2, left=0.2)
 ax.plot(x1, np.cumsum(y1**2))
-ax.set_xlabel('time [s] \n This was a long experiment')
+ax.set_xlabel('Time [s] \n This was a long experiment')
 ax.set_ylabel(r'$\int\ Y^2\ dt\ \ [V^2 s]$')
 plt.show()
 
@@ -211,8 +212,8 @@
 plt.show()
 
 ##############################################################################
-# Vertical spacing for titles is controlled via :rc:`axes.titlepad`, which
-# defaults to 5 points.  Setting to a different value moves the title.
+# Vertical spacing for titles is controlled via :rc:`axes.titlepad`.
+# Setting to a different value moves the title.
 
 fig, ax = plt.subplots(figsize=(5, 3))
 fig.subplots_adjust(top=0.8)
@@ -282,7 +283,7 @@
 # Tick Locators and Formatters
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
-# Instead of making a list of all the tickalbels, we could have
+# Instead of making a list of all the ticklabels, we could have
 # used `matplotlib.ticker.StrMethodFormatter` (new-style ``str.format()``
 # format string) or `matplotlib.ticker.FormatStrFormatter` (old-style '%'
 # format string) and passed it to the ``ax.xaxis``.  A
diff --git a/tutorials/text/text_props.py b/tutorials/text/text_props.py
index 95dd8b54fc46..a2acbd0bd27f 100644
--- a/tutorials/text/text_props.py
+++ b/tutorials/text/text_props.py
@@ -149,9 +149,9 @@
 # +---------------------+----------------------------------------------------+
 # | rcParam             | usage                                              |
 # +=====================+====================================================+
-# | ``'font.family'``   | List of either names of font or ``{'cursive',      |
-# |                     | 'fantasy', 'monospace', 'sans', 'sans serif',      |
-# |                     | 'sans-serif', 'serif'}``.                          |
+# | ``'font.family'``   | List of font families (installed on user's machine)|
+# |                     | and/or ``{'cursive', 'fantasy', 'monospace',       |
+# |                     | 'sans', 'sans serif', 'sans-serif', 'serif'}``.    |
 # |                     |                                                    |
 # +---------------------+----------------------------------------------------+
 # |  ``'font.style'``   | The default style, ex ``'normal'``,                |
@@ -174,13 +174,23 @@
 # |                     | this size.                                         |
 # +---------------------+----------------------------------------------------+
 #
-# The mapping between the family aliases (``{'cursive', 'fantasy',
-# 'monospace', 'sans', 'sans serif', 'sans-serif', 'serif'}``) and actual font names
+# Matplotlib can use font families installed on the user's computer, i.e.
+# Helvetica, Times, etc. Font families can also be specified with
+# generic-family aliases like (``{'cursive', 'fantasy', 'monospace',
+# 'sans', 'sans serif', 'sans-serif', 'serif'}``).
+#
+# .. note::
+#    To access the full list of available fonts: ::
+#
+#       matplotlib.font_manager.get_font_names()
+#
+# The mapping between the generic family aliases and actual font families
+# (mentioned at :doc:`default rcParams </tutorials/introductory/customizing>`)
 # is controlled by the following rcParams:
 #
 #
 # +------------------------------------------+--------------------------------+
-# | family alias                             | rcParam with mappings          |
+# | CSS-based generic-family alias           | rcParam with mappings          |
 # +==========================================+================================+
 # | ``'serif'``                              | ``'font.serif'``               |
 # +------------------------------------------+--------------------------------+
@@ -194,7 +204,18 @@
 # +------------------------------------------+--------------------------------+
 #
 #
-# which are lists of font names.
+# If any of generic family names appear in ``'font.family'``, we replace that entry
+# by all the entries in the corresponding rcParam mapping.
+# For example: ::
+#
+#    matplotlib.rcParams['font.family'] = ['Family1', 'serif', 'Family2']
+#    matplotlib.rcParams['font.serif'] = ['SerifFamily1', 'SerifFamily2']
+#
+#    # This is effectively translated to:
+#    matplotlib.rcParams['font.family'] = ['Family1', 'SerifFamily1', 'SerifFamily2', 'Family2']
+#
+#
+# .. _font-nonlatin:
 #
 # Text with non-latin glyphs
 # ==========================
@@ -204,17 +225,29 @@
 # Korean, or Japanese.
 #
 # To set the default font to be one that supports the code points you
-# need, prepend the font name to ``'font.family'`` or the desired alias
-# lists ::
+# need, prepend the font name to ``'font.family'`` (recommended), or to the
+# desired alias lists. ::
+#
+#    # first method
+#    matplotlib.rcParams['font.family'] = ['Source Han Sans TW', 'sans-serif']
+#
+#    # second method
+#    matplotlib.rcParams['font.family'] = ['sans-serif']
+#    matplotlib.rcParams['sans-serif'] = ['Source Han Sans TW', ...]
+#
+# The generic family alias lists contain fonts that are either shipped
+# alongside Matplotlib (so they have 100% chance of being found), or fonts
+# which have a very high probability of being present in most systems.
 #
-#    matplotlib.rcParams['font.sans-serif'] = ['Source Han Sans TW', 'sans-serif']
+# A good practice when setting custom font families is to append
+# a generic-family to the font-family list as a last resort.
 #
-# or set it in your :file:`.matplotlibrc` file::
+# You can also set it in your :file:`.matplotlibrc` file::
 #
-#    font.sans-serif: Source Han Sans TW, Arial, sans-serif
+#    font.family: Source Han Sans TW, Arial, sans-serif
 #
-# To control the font used on per-artist basis use the ``'name'``,
-# ``'fontname'`` or ``'fontproperties'`` kwargs documented :doc:`above
+# To control the font used on per-artist basis use the *name*, *fontname* or
+# *fontproperties* keyword arguments documented :doc:`above
 # </tutorials/text/text_props>`.
 #
 #
diff --git a/tutorials/text/usetex.py b/tutorials/text/usetex.py
index 3dc4e377a766..2b55864b18f6 100644
--- a/tutorials/text/usetex.py
+++ b/tutorials/text/usetex.py
@@ -1,6 +1,6 @@
 r"""
 *************************
-Text rendering With LaTeX
+Text rendering with LaTeX
 *************************
 
 Matplotlib can use LaTeX to render text.  This is activated by setting
@@ -11,51 +11,69 @@
 etc.) can be used. The results can be striking, especially when you take care
 to use the same fonts in your figures as in the main document.
 
-Matplotlib's LaTeX support requires a working LaTeX_ installation.  For the
-\*Agg backends, dvipng_ is additionally required; for the PS backend, psfrag_,
-dvips_ and Ghostscript_ are additionally required.  The executables for these
-external dependencies must all be located on your :envvar:`PATH`.
-
-There are a couple of options to mention, which can be changed using
-:doc:`rc settings </tutorials/introductory/customizing>`. Here is an example
-matplotlibrc file::
-
-  font.family        : serif
-  font.serif         : Times, Palatino, New Century Schoolbook, Bookman, Computer Modern Roman
-  font.sans-serif    : Helvetica, Avant Garde, Computer Modern Sans Serif
-  font.cursive       : Zapf Chancery
-  font.monospace     : Courier, Computer Modern Typewriter
-
-  text.usetex        : true
-
-The first valid font in each family is the one that will be loaded. If the
-fonts are not specified, the Computer Modern fonts are used by default. All of
-the other fonts are Adobe fonts. Times and Palatino each have their own
-accompanying math fonts, while the other Adobe serif fonts make use of the
-Computer Modern math fonts. See the PSNFSS_ documentation for more details.
-
-To use LaTeX and select Helvetica as the default font, without editing
-matplotlibrc use::
-
-  import matplotlib.pyplot as plt
-  plt.rcParams.update({
-      "text.usetex": True,
-      "font.family": "sans-serif",
-      "font.sans-serif": ["Helvetica"]})
-  # for Palatino and other serif fonts use:
-  plt.rcParams.update({
-      "text.usetex": True,
-      "font.family": "serif",
-      "font.serif": ["Palatino"],
-  })
+Matplotlib's LaTeX support requires a working LaTeX_ installation.  For
+the \*Agg backends, dvipng_ is additionally required; for the PS backend,
+PSfrag_, dvips_ and Ghostscript_ are additionally required.  For the PDF
+and SVG backends, if LuaTeX is present, it will be used to speed up some
+post-processing steps, but note that it is not used to parse the TeX string
+itself (only LaTeX is supported).  The executables for these external
+dependencies must all be located on your :envvar:`PATH`.
+
+Only a small number of font families (defined by the PSNFSS_ scheme) are
+supported.  They are listed here, with the corresponding LaTeX font selection
+commands and LaTeX packages, which are automatically used.
+
+=========================== =================================================
+generic family              fonts
+=========================== =================================================
+serif (``\rmfamily``)       Computer Modern Roman, Palatino (``mathpazo``),
+                            Times (``mathptmx``),  Bookman (``bookman``),
+                            New Century Schoolbook (``newcent``),
+                            Charter (``charter``)
+
+sans-serif (``\sffamily``)  Computer Modern Serif, Helvetica (``helvet``),
+                            Avant Garde (``avant``)
+
+cursive (``\rmfamily``)     Zapf Chancery (``chancery``)
+
+monospace (``\ttfamily``)   Computer Modern Typewriter, Courier (``courier``)
+=========================== =================================================
+
+The default font family (which does not require loading any LaTeX package) is
+Computer Modern.  All other families are Adobe fonts.  Times and Palatino each
+have their own accompanying math fonts, while the other Adobe serif fonts make
+use of the Computer Modern math fonts.
+
+To enable LaTeX and select a font, use e.g.::
+
+    plt.rcParams.update({
+        "text.usetex": True,
+        "font.family": "Helvetica"
+    })
+
+or equivalently, set your :doc:`matplotlibrc
+</tutorials/introductory/customizing>` to::
+
+    text.usetex : true
+    font.family : Helvetica
+
+It is also possible to instead set ``font.family`` to one of the generic family
+names and then configure the corresponding generic family; e.g.::
+
+    plt.rcParams.update({
+        "text.usetex": True,
+        "font.family": "sans-serif",
+        "font.sans-serif": "Helvetica",
+    })
+
+(this was the required approach until Matplotlib 3.5).
 
 Here is the standard example,
-:file:`/gallery/text_labels_and_annotations/tex_demo`:
+:doc:`/gallery/text_labels_and_annotations/tex_demo`:
 
 .. figure:: ../../gallery/text_labels_and_annotations/images/sphx_glr_tex_demo_001.png
    :target: ../../gallery/text_labels_and_annotations/tex_demo.html
    :align: center
-   :scale: 50
 
 Note that display math mode (``$$ e=mc^2 $$``) is not supported, but adding the
 command ``\displaystyle``, as in the above demo, will produce the same results.
@@ -63,13 +81,23 @@
 Non-ASCII characters (e.g. the degree sign in the y-label above) are supported
 to the extent that they are supported by inputenc_.
 
+.. note::
+   For consistency with the non-usetex case, Matplotlib special-cases newlines,
+   so that single-newlines yield linebreaks (rather than being interpreted as
+   whitespace in standard LaTeX).
+
+   Matplotlib uses the underscore_ package so that underscores (``_``) are
+   printed "as-is" in text mode (rather than causing an error as in standard
+   LaTeX).  Underscores still introduce subscripts in math mode.
+
 .. note::
    Certain characters require special escaping in TeX, such as::
 
-     # $ % & ~ _ ^ \ { } \( \) \[ \]
+     # $ % & ~ ^ \ { } \( \) \[ \]
 
    Therefore, these characters will behave differently depending on
-   :rc:`text.usetex`.
+   :rc:`text.usetex`.  As noted above, underscores (``_``) do not require
+   escaping outside of math mode.
 
 PostScript options
 ==================
@@ -102,13 +130,13 @@
 
 * On Ubuntu and Gentoo, the base texlive install does not ship with
   the type1cm package. You may need to install some of the extra
-  packages to get all the goodies that come bundled with other latex
+  packages to get all the goodies that come bundled with other LaTeX
   distributions.
 
-* Some progress has been made so matplotlib uses the dvi files
-  directly for text layout. This allows latex to be used for text
+* Some progress has been made so Matplotlib uses the dvi files
+  directly for text layout. This allows LaTeX to be used for text
   layout with the pdf and svg backends, as well as the \*Agg and PS
-  backends. In the future, a latex installation may be the only
+  backends. In the future, a LaTeX installation may be the only
   external dependency.
 
 .. _usetex-troubleshooting:
@@ -131,7 +159,7 @@
   problems. Please disable this option before reporting problems to
   the mailing list.
 
-* If you still need help, please see :ref:`reporting-problems`
+* If you still need help, please see :ref:`reporting-problems`.
 
 .. _dvipng: http://www.nongnu.org/dvipng/
 .. _dvips: https://tug.org/texinfohtml/dvips.html
@@ -140,6 +168,7 @@
 .. _LaTeX: http://www.tug.org
 .. _Poppler: https://poppler.freedesktop.org/
 .. _PSNFSS: http://www.ctan.org/tex-archive/macros/latex/required/psnfss/psnfss2e.pdf
-.. _psfrag: https://ctan.org/pkg/psfrag
+.. _PSfrag: https://ctan.org/pkg/psfrag
+.. _underscore: https://ctan.org/pkg/underscore
 .. _Xpdf: http://www.xpdfreader.com/
 """
diff --git a/tutorials/toolkits/axes_grid.py b/tutorials/toolkits/axes_grid.py
index e55555a4aab3..4950010c8836 100644
--- a/tutorials/toolkits/axes_grid.py
+++ b/tutorials/toolkits/axes_grid.py
@@ -1,38 +1,24 @@
 r"""
-==============================
-Overview of axes_grid1 toolkit
-==============================
-
-Controlling the layout of plots with the
-:mod:`mpl_toolkits.axes_grid1` toolkit.
-
 .. _axes_grid1_users-guide-index:
 
+==========================================
+Overview of :mod:`mpl_toolkits.axes_grid1`
+==========================================
 
-What is axes_grid1 toolkit?
-===========================
+:mod:`.axes_grid1` provides the following features:
 
-:mod:`mpl_toolkits.axes_grid1` is a collection of helper classes to ease
-displaying (multiple) images with matplotlib. In matplotlib, the axes location
-(and size) is specified in the normalized figure coordinates, which
-may not be ideal for displaying images that needs to have a given
-aspect ratio.  For example, it helps if you have a colorbar whose
-height always matches that of the image.  `ImageGrid`_, `RGB Axes`_ and
-`AxesDivider`_ are helper classes that deal with adjusting the
-location of (multiple) Axes.  They provides a framework to adjust the
-position of multiple axes at the drawing time. `ParasiteAxes`_
-provides twinx(or twiny)-like features so that you can plot different
-data (e.g., different y-scale) in a same Axes. `AnchoredArtists`_
-includes custom artists which are placed at some anchored position,
-like the legend.
+- Helper classes (ImageGrid_, RGBAxes_, AxesDivider_) to ease the layout of
+  axes displaying images with a fixed aspect ratio while satisfying additional
+  constraints (matching the heights of a colorbar and an image, or fixing the
+  padding between images);
+- ParasiteAxes_ (twinx/twiny-like features so that you can plot different data
+  (e.g., different y-scale) in a same Axes);
+- AnchoredArtists_ (custom artists which are placed at an anchored position,
+  similarly to legends).
 
 .. figure:: ../../gallery/axes_grid1/images/sphx_glr_demo_axes_grid_001.png
    :target: ../../gallery/axes_grid1/demo_axes_grid.html
    :align: center
-   :scale: 50
-
-   Demo Axes Grid
-
 
 axes_grid1
 ==========
@@ -40,87 +26,62 @@
 ImageGrid
 ---------
 
-A grid of Axes.
-
-In Matplotlib, the axes location (and size) is specified in normalized
-figure coordinates. This may not be ideal for images that needs to be
-displayed with a given aspect ratio; for example, it is difficult to
-display multiple images of a same size with some fixed padding between
-them.  `~.axes_grid1.axes_grid.ImageGrid` can be used in such a case; see its
-docs for a detailed list of the parameters it accepts.
+In Matplotlib, axes location and size are usually specified in normalized
+figure coordinates (0 = bottom left, 1 = top right), which makes
+it difficult to achieve a fixed (absolute) padding between images.
+`~.axes_grid1.axes_grid.ImageGrid` can be used to achieve such a padding; see
+its docs for detailed API information.
 
 .. figure:: ../../gallery/axes_grid1/images/sphx_glr_simple_axesgrid_001.png
    :target: ../../gallery/axes_grid1/simple_axesgrid.html
    :align: center
-   :scale: 50
-
-   Simple Axesgrid
 
 * The position of each axes is determined at the drawing time (see
-  `AxesDivider`_), so that the size of the entire grid fits in the
+  AxesDivider_), so that the size of the entire grid fits in the
   given rectangle (like the aspect of axes). Note that in this example,
-  the paddings between axes are fixed even if you changes the figure
+  the paddings between axes are fixed even if you change the figure
   size.
 
-* axes in the same column has a same axes width (in figure
-  coordinate), and similarly, axes in the same row has a same
-  height. The widths (height) of the axes in the same row (column) are
-  scaled according to their view limits (xlim or ylim).
+* Axes in the same column share their x-axis, and axes in the same row share
+  their y-axis (in the sense of `~.Axes.sharex`, `~.Axes.sharey`).
+  Additionally, Axes in the same column all have the same width, and axes in
+  the same row all have the same height.  These widths and heights are scaled
+  in proportion to the axes' view limits (xlim or ylim).
 
   .. figure:: ../../gallery/axes_grid1/images/sphx_glr_simple_axesgrid2_001.png
      :target: ../../gallery/axes_grid1/simple_axesgrid2.html
      :align: center
-     :scale: 50
-
-     Simple Axes Grid
-
-* xaxis are shared among axes in a same column. Similarly, yaxis are
-  shared among axes in a same row. Therefore, changing axis properties
-  (view limits, tick location, etc. either by plot commands or using
-  your mouse in interactive backends) of one axes will affect all
-  other shared axes.
 
 The examples below show what you can do with ImageGrid.
 
 .. figure:: ../../gallery/axes_grid1/images/sphx_glr_demo_axes_grid_001.png
    :target: ../../gallery/axes_grid1/demo_axes_grid.html
    :align: center
-   :scale: 50
-
-   Demo Axes Grid
-
 
 AxesDivider Class
 -----------------
 
-Behind the scene, the ImageGrid class and the RGBAxes class utilize the
-`~.axes_grid1.axes_divider.AxesDivider` class, whose role is to calculate the
-location of the axes at drawing time. Direct use of the
-AxesDivider class will not be necessary for most users. The
-axes_divider module provides a helper function
-`~.axes_grid1.axes_divider.make_axes_locatable`, which can be useful.
-It takes a existing axes instance and create a divider for it. ::
+Behind the scenes, ImageGrid (and RGBAxes, described below) rely on
+`~.axes_grid1.axes_divider.AxesDivider`, whose role is to calculate the
+location of the axes at drawing time.
+
+Users typically do not need to directly instantiate dividers
+by calling `~.axes_grid1.axes_divider.AxesDivider`; instead,
+`~.axes_grid1.axes_divider.make_axes_locatable` can be used to create a divider
+for an Axes::
 
   ax = subplot(1, 1, 1)
   divider = make_axes_locatable(ax)
 
-*make_axes_locatable* returns an instance of the
-`~.axes_grid1.axes_divider.AxesDivider` class. It provides an
-`~.AxesDivider.append_axes` method that
-creates a new axes on the given side of ("top", "right", "bottom" and
-"left") of the original axes.
-
+`.AxesDivider.append_axes` can then be used to create a new axes on a given
+side ("left", "right", "top", "bottom") of the original axes.
 
-colorbar whose height (or width) in sync with the master axes
--------------------------------------------------------------
+colorbar whose height (or width) is in sync with the main axes
+--------------------------------------------------------------
 
 .. figure:: ../../gallery/axes_grid1/images/sphx_glr_simple_colorbar_001.png
    :target: ../../gallery/axes_grid1/simple_colorbar.html
    :align: center
-   :scale: 50
-
-   Simple Colorbar
-
 
 scatter_hist.py with AxesDivider
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -148,39 +109,34 @@
 .. figure:: ../../gallery/axes_grid1/images/sphx_glr_scatter_hist_locatable_axes_001.png
    :target: ../../gallery/axes_grid1/scatter_hist_locatable_axes.html
    :align: center
-   :scale: 50
-
-   Scatter Hist
 
 The :doc:`/gallery/axes_grid1/scatter_hist_locatable_axes` using the
-AxesDivider has some advantage over the
+AxesDivider has some advantages over the
 original :doc:`/gallery/lines_bars_and_markers/scatter_hist` in Matplotlib.
 For example, you can set the aspect ratio of the scatter plot, even with the
 x-axis or y-axis is shared accordingly.
 
-
 ParasiteAxes
 ------------
 
-The ParasiteAxes is an axes whose location is identical to its host
+The ParasiteAxes is an Axes whose location is identical to its host
 axes. The location is adjusted in the drawing time, thus it works even
 if the host change its location (e.g., images).
 
 In most cases, you first create a host axes, which provides a few
-method that can be used to create parasite axes. They are *twinx*,
-*twiny* (which are similar to twinx and twiny in the matplotlib) and
-*twin*. *twin* takes an arbitrary transformation that maps between the
-data coordinates of the host axes and the parasite axes.  *draw*
+methods that can be used to create parasite axes. They are ``twinx``,
+``twiny`` (which are similar to ``twinx`` and ``twiny`` in the matplotlib) and
+``twin``. ``twin`` takes an arbitrary transformation that maps between the
+data coordinates of the host axes and the parasite axes. The ``draw``
 method of the parasite axes are never called. Instead, host axes
-collects artists in parasite axes and draw them as if they belong to
+collects artists in parasite axes and draws them as if they belong to
 the host axes, i.e., artists in parasite axes are merged to those of
 the host axes and then drawn according to their zorder.  The host and
 parasite axes modifies some of the axes behavior. For example, color
 cycle for plot lines are shared between host and parasites. Also, the
 legend command in host, creates a legend that includes lines in the
-parasite axes.  To create a host axes, you may use *host_subplot* or
-*host_axes* command.
-
+parasite axes.  To create a host axes, you may use ``host_subplot`` or
+``host_axes`` command.
 
 Example 1. twinx
 ~~~~~~~~~~~~~~~~
@@ -188,116 +144,89 @@
 .. figure:: ../../gallery/axes_grid1/images/sphx_glr_parasite_simple_001.png
    :target: ../../gallery/axes_grid1/parasite_simple.html
    :align: center
-   :scale: 50
-
-   Parasite Simple
-
 
 Example 2. twin
 ~~~~~~~~~~~~~~~
 
-*twin* without a transform argument assumes that the parasite axes has the
+``twin`` without a transform argument assumes that the parasite axes has the
 same data transform as the host. This can be useful when you want the
 top(or right)-axis to have different tick-locations, tick-labels, or
 tick-formatter for bottom(or left)-axis. ::
 
   ax2 = ax.twin() # now, ax2 is responsible for "top" axis and "right" axis
-  ax2.set_xticks([0., .5*np.pi, np.pi, 1.5*np.pi, 2*np.pi])
-  ax2.set_xticklabels(["0", r"$\frac{1}{2}\pi$",
-                       r"$\pi$", r"$\frac{3}{2}\pi$", r"$2\pi$"])
-
+  ax2.set_xticks([0., .5*np.pi, np.pi, 1.5*np.pi, 2*np.pi],
+                 labels=["0", r"$\frac{1}{2}\pi$",
+                         r"$\pi$", r"$\frac{3}{2}\pi$", r"$2\pi$"])
 
 .. figure:: ../../gallery/axes_grid1/images/sphx_glr_simple_axisline4_001.png
    :target: ../../gallery/axes_grid1/simple_axisline4.html
    :align: center
-   :scale: 50
-
-   Simple Axisline4
 
 A more sophisticated example using twin. Note that if you change the
 x-limit in the host axes, the x-limit of the parasite axes will change
 accordingly.
 
-
 .. figure:: ../../gallery/axes_grid1/images/sphx_glr_parasite_simple2_001.png
    :target: ../../gallery/axes_grid1/parasite_simple2.html
    :align: center
-   :scale: 50
-
-   Parasite Simple2
-
 
 AnchoredArtists
 ---------------
 
-It's a collection of artists whose location is anchored to the (axes)
-bbox, like the legend. It is derived from *OffsetBox* in Matplotlib, and
-artist need to be drawn in the canvas coordinate. But, there is a
-limited support for an arbitrary transform. For example, the ellipse
-in the example below will have width and height in the data
-coordinate.
+:mod:`.axes_grid1.anchored_artists` is a collection of artists whose location
+is anchored to the (axes) bbox, similarly to legends.  These artists derive
+from `.offsetbox.OffsetBox`, and the artist need to be drawn in canvas
+coordinates.  There is limited support for arbitrary transforms.  For example,
+the ellipse in the example below will have width and height in data coordinates.
 
 .. figure:: ../../gallery/axes_grid1/images/sphx_glr_simple_anchored_artists_001.png
    :target: ../../gallery/axes_grid1/simple_anchored_artists.html
    :align: center
-   :scale: 50
-
-   Simple Anchored Artists
-
 
 InsetLocator
 ------------
 
-:mod:`mpl_toolkits.axes_grid1.inset_locator` provides helper classes
-and functions to place your (inset) axes at the anchored position of
-the parent axes, similarly to AnchoredArtist.
+.. seealso::
+   `.Axes.inset_axes` and `.Axes.indicate_inset_zoom` in the main library.
 
-Using :func:`mpl_toolkits.axes_grid1.inset_locator.inset_axes`, you
-can have inset axes whose size is either fixed, or a fixed proportion
-of the parent axes::
+:mod:`.axes_grid1.inset_locator` provides helper classes and functions to
+place inset axes at an anchored position of the parent axes, similarly to
+AnchoredArtist.
+
+`.inset_locator.inset_axes` creates an inset axes whose size is either fixed,
+or a fixed proportion of the parent axes::
 
     inset_axes = inset_axes(parent_axes,
-                            width="30%", # width = 30% of parent_bbox
-                            height=1., # height : 1 inch
+                            width="30%",  # width = 30% of parent_bbox
+                            height=1.,  # height = 1 inch
                             loc='lower left')
 
 creates an inset axes whose width is 30% of the parent axes and whose
 height is fixed at 1 inch.
 
-You may creates your inset whose size is determined so that the data
-scale of the inset axes to be that of the parent axes multiplied by
-some factor. For example, ::
+`.inset_locator.zoomed_inset_axes` creates an inset axes whose data scale is
+that of the parent axes multiplied by some factor, e.g. ::
 
     inset_axes = zoomed_inset_axes(ax,
-                                   0.5, # zoom = 0.5
+                                   0.5,  # zoom = 0.5
                                    loc='upper right')
 
-creates an inset axes whose data scale is half of the parent axes.
-Here is complete examples.
+creates an inset axes whose data scale is half of the parent axes.  This can be
+useful to mark the zoomed area on the parent axes:
 
 .. figure:: ../../gallery/axes_grid1/images/sphx_glr_inset_locator_demo_001.png
    :target: ../../gallery/axes_grid1/inset_locator_demo.html
    :align: center
-   :scale: 50
-
-   Inset Locator Demo
 
-For example, :func:`.zoomed_inset_axes` can be used when you want the
-inset represents the zoom-up of the small portion in the parent axes.
-And :mod:`~mpl_toolkits.axes_grid1.inset_locator` provides a helper
-function :func:`.mark_inset` to mark the location of the area
-represented by the inset axes.
+`.inset_locator.mark_inset` allows marking the location of the area represented
+by the inset axes:
 
 .. figure:: ../../gallery/axes_grid1/images/sphx_glr_inset_locator_demo2_001.png
    :target: ../../gallery/axes_grid1/inset_locator_demo2.html
    :align: center
-   :scale: 50
 
-   Inset Locator Demo2
-
-
-RGB Axes
-~~~~~~~~
+RGBAxes
+-------
 
 RGBAxes is a helper class to conveniently show RGB composite
 images. Like ImageGrid, the location of axes are adjusted so that the
@@ -311,12 +240,9 @@
     r, g, b = get_rgb()  # r, g, b are 2D images.
     ax.imshow_rgb(r, g, b)
 
-
 .. figure:: ../../gallery/axes_grid1/images/sphx_glr_demo_axes_rgb_001.png
    :target: ../../gallery/axes_grid1/demo_axes_rgb.html
    :align: center
-   :scale: 50
-
 
 AxesDivider
 ===========
@@ -392,10 +318,9 @@
 
 See the example,
 
-.. figure:: ../../gallery/axes_grid1/images/sphx_glr_simple_axes_divider1_002.png
+.. figure:: ../../gallery/axes_grid1/images/sphx_glr_simple_axes_divider1_001.png
    :target: ../../gallery/axes_grid1/simple_axes_divider1.html
    :align: center
-   :scale: 50
 
 You can also adjust the size of each axes according to its x or y
 data limits (AxesX and AxesY).
@@ -403,5 +328,4 @@
 .. figure:: ../../gallery/axes_grid1/images/sphx_glr_simple_axes_divider3_001.png
    :target: ../../gallery/axes_grid1/simple_axes_divider3.html
    :align: center
-   :scale: 50
 """
diff --git a/tutorials/toolkits/axisartist.py b/tutorials/toolkits/axisartist.py
index 6a9e6edc9f48..2e539cc3f20c 100644
--- a/tutorials/toolkits/axisartist.py
+++ b/tutorials/toolkits/axisartist.py
@@ -20,9 +20,6 @@
 .. figure:: ../../gallery/axisartist/images/sphx_glr_demo_floating_axis_001.png
    :target: ../../gallery/axisartist/demo_floating_axis.html
    :align: center
-   :scale: 50
-
-   Demo Floating Axis
 
 Since it uses special artists, some Matplotlib commands that work on
 Axes.xaxis and Axes.yaxis may not work.
@@ -48,7 +45,7 @@
 callable method and it behaves as an original Axes.axis method in
 Matplotlib).
 
-To create an axes, ::
+To create an Axes, ::
 
   import mpl_toolkits.axisartist as AA
   fig = plt.figure()
@@ -68,9 +65,6 @@
 .. figure:: ../../gallery/axisartist/images/sphx_glr_simple_axisline3_001.png
    :target: ../../gallery/axisartist/simple_axisline3.html
    :align: center
-   :scale: 50
-
-   Simple Axisline3
 
 It is also possible to add a horizontal axis. For example, you may have an
 horizontal axis at y=0 (in data coordinate). ::
@@ -80,9 +74,6 @@
 .. figure:: ../../gallery/axisartist/images/sphx_glr_simple_axisartist1_001.png
    :target: ../../gallery/axisartist/simple_axisartist1.html
    :align: center
-   :scale: 50
-
-   Simple Axisartist1
 
 Or a fixed axis with some offset ::
 
@@ -93,7 +84,7 @@
 ----------------------------
 
 Most commands in the axes_grid1 toolkit can take an axes_class keyword
-argument, and the commands create an axes of the given class. For example,
+argument, and the commands create an Axes of the given class. For example,
 to create a host subplot with axisartist.Axes, ::
 
   import mpl_toolkits.axisartist as AA
@@ -106,9 +97,6 @@
 .. figure:: ../../gallery/axisartist/images/sphx_glr_demo_parasite_axes2_001.png
    :target: ../../gallery/axisartist/demo_parasite_axes2.html
    :align: center
-   :scale: 50
-
-   Demo Parasite Axes2
 
 Curvilinear Grid
 ----------------
@@ -119,9 +107,6 @@
 .. figure:: ../../gallery/axisartist/images/sphx_glr_demo_curvelinear_grid_001.png
    :target: ../../gallery/axisartist/demo_curvelinear_grid.html
    :align: center
-   :scale: 50
-
-   Demo CurveLinear Grid
 
 Floating Axes
 -------------
@@ -132,9 +117,6 @@
 .. figure:: ../../gallery/axisartist/images/sphx_glr_demo_floating_axes_001.png
    :target: ../../gallery/axisartist/demo_floating_axes.html
    :align: center
-   :scale: 50
-
-   Demo Floating Axes
 
 axisartist namespace
 ====================
@@ -167,9 +149,6 @@
 .. figure:: ../../gallery/axisartist/images/sphx_glr_demo_floating_axis_001.png
    :target: ../../gallery/axisartist/demo_floating_axis.html
    :align: center
-   :scale: 50
-
-   Demo Floating Axis
 
 *mpl_toolkits.axisartist.Axes* class defines a *axis* attribute, which
 is a dictionary of AxisArtist instances. By default, the dictionary
@@ -331,9 +310,6 @@
 .. figure:: ../../gallery/axisartist/images/sphx_glr_simple_axis_direction01_001.png
    :target: ../../gallery/axisartist/simple_axis_direction01.html
    :align: center
-   :scale: 50
-
-   Simple Axis Direction01
 
 The parameter for set_axis_direction is one of ["left", "right",
 "bottom", "top"].
@@ -359,7 +335,6 @@
 .. figure:: ../../gallery/axisartist/images/sphx_glr_axis_direction_001.png
    :target: ../../gallery/axisartist/axis_direction.html
    :align: center
-   :scale: 50
 
 On the other hand, there is a concept of "axis_direction". This is a
 default setting of above properties for each, "bottom", "left", "top",
@@ -385,9 +360,6 @@
 .. figure:: ../../gallery/axisartist/images/sphx_glr_demo_axis_direction_001.png
    :target: ../../gallery/axisartist/demo_axis_direction.html
    :align: center
-   :scale: 50
-
-   Demo Axis Direction
 
 The axis_direction can be adjusted in the AxisArtist level, or in the
 level of its child artists, i.e., ticks, ticklabels, and axis-label. ::
@@ -419,9 +391,6 @@
 .. figure:: ../../gallery/axisartist/images/sphx_glr_simple_axis_direction03_001.png
    :target: ../../gallery/axisartist/simple_axis_direction03.html
    :align: center
-   :scale: 50
-
-   Simple Axis Direction03
 
 So, in summary,
 
@@ -457,9 +426,6 @@
 .. figure:: ../../gallery/axisartist/images/sphx_glr_demo_ticklabel_alignment_001.png
    :target: ../../gallery/axisartist/demo_ticklabel_alignment.html
    :align: center
-   :scale: 50
-
-   Demo Ticklabel Alignment
 
 Adjusting pad
 -------------
@@ -475,9 +441,6 @@
 .. figure:: ../../gallery/axisartist/images/sphx_glr_simple_axis_pad_001.png
    :target: ../../gallery/axisartist/simple_axis_pad.html
    :align: center
-   :scale: 50
-
-   Simple Axis Pad
 
 GridHelper
 ==========
@@ -564,9 +527,6 @@ def inv_tr(x, y):
 .. figure:: ../../gallery/axisartist/images/sphx_glr_demo_curvelinear_grid_001.png
    :target: ../../gallery/axisartist/demo_curvelinear_grid.html
    :align: center
-   :scale: 50
-
-   Demo CurveLinear Grid
 
 FloatingAxis
 ============
diff --git a/tutorials/toolkits/mplot3d.py b/tutorials/toolkits/mplot3d.py
index d5ab4f2b10b6..49188e9f392f 100644
--- a/tutorials/toolkits/mplot3d.py
+++ b/tutorials/toolkits/mplot3d.py
@@ -5,15 +5,12 @@
 
 Generating 3D plots using the mplot3d toolkit.
 
-.. currentmodule:: mpl_toolkits.mplot3d
+This tutorial showcases various 3D plots. Click on the figures to see each full
+gallery example with the code that generates the figures.
 
 .. contents::
-      :backlinks: none
+   :backlinks: none
 
-.. _toolkit_mplot3d-tutorial:
-
-Getting started
----------------
 3D Axes (of class `.Axes3D`) are created by passing the ``projection="3d"``
 keyword argument to `.Figure.add_subplot`::
 
@@ -21,9 +18,15 @@
    fig = plt.figure()
    ax = fig.add_subplot(projection='3d')
 
+Multiple 3D subplots can be added on the same figure, as for 2D subplots.
+
+.. figure:: ../../gallery/mplot3d/images/sphx_glr_subplot3d_001.png
+   :target: ../../gallery/mplot3d/subplot3d.html
+   :align: center
+
 .. versionchanged:: 1.0.0
-   Prior to Matplotlib 1.0.0, `.Axes3D` needed to be directly instantiated with
-   ``from mpl_toolkits.mplot3d import Axes3D; ax = Axes3D(fig)``.
+   Prior to Matplotlib 1.0.0, only a single `.Axes3D` could be created per
+   figure; it needed to be directly instantiated as ``ax = Axes3D(fig)``.
 
 .. versionchanged:: 3.2.0
    Prior to Matplotlib 3.2.0, it was necessary to explicitly import the
@@ -36,104 +39,72 @@
 .. _plot3d:
 
 Line plots
-====================
-.. automethod:: Axes3D.plot
+==========
+See `.Axes3D.plot` for API documentation.
 
 .. figure:: ../../gallery/mplot3d/images/sphx_glr_lines3d_001.png
    :target: ../../gallery/mplot3d/lines3d.html
    :align: center
-   :scale: 50
-
-   Lines3d
 
 .. _scatter3d:
 
 Scatter plots
 =============
-.. automethod:: Axes3D.scatter
+See `.Axes3D.scatter` for API documentation.
 
 .. figure:: ../../gallery/mplot3d/images/sphx_glr_scatter3d_001.png
    :target: ../../gallery/mplot3d/scatter3d.html
    :align: center
-   :scale: 50
-
-   Scatter3d
 
 .. _wireframe:
 
 Wireframe plots
 ===============
-.. automethod:: Axes3D.plot_wireframe
+See `.Axes3D.plot_wireframe` for API documentation.
 
 .. figure:: ../../gallery/mplot3d/images/sphx_glr_wire3d_001.png
    :target: ../../gallery/mplot3d/wire3d.html
    :align: center
-   :scale: 50
-
-   Wire3d
 
 .. _surface:
 
 Surface plots
 =============
-.. automethod:: Axes3D.plot_surface
+See `.Axes3D.plot_surface` for API documentation.
 
 .. figure:: ../../gallery/mplot3d/images/sphx_glr_surface3d_001.png
    :target: ../../gallery/mplot3d/surface3d.html
    :align: center
-   :scale: 50
-
-   Surface3d
-
-   Surface3d 2
-
-   Surface3d 3
 
 .. _trisurface:
 
 Tri-Surface plots
 =================
-.. automethod:: Axes3D.plot_trisurf
+See `.Axes3D.plot_trisurf` for API documentation.
 
 .. figure:: ../../gallery/mplot3d/images/sphx_glr_trisurf3d_001.png
    :target: ../../gallery/mplot3d/trisurf3d.html
    :align: center
-   :scale: 50
-
-   Trisurf3d
-
 
 .. _contour3d:
 
 Contour plots
 =============
-.. automethod:: Axes3D.contour
+See `.Axes3D.contour` for API documentation.
 
 .. figure:: ../../gallery/mplot3d/images/sphx_glr_contour3d_001.png
    :target: ../../gallery/mplot3d/contour3d.html
    :align: center
-   :scale: 50
-
-   Contour3d
-
-   Contour3d 2
-
-   Contour3d 3
 
 .. _contourf3d:
 
 Filled contour plots
 ====================
-.. automethod:: Axes3D.contourf
+See `.Axes3D.contourf` for API documentation.
 
 .. figure:: ../../gallery/mplot3d/images/sphx_glr_contourf3d_001.png
    :target: ../../gallery/mplot3d/contourf3d.html
    :align: center
-   :scale: 50
-
-   Contourf3d
-
-   Contourf3d 2
 
 .. versionadded:: 1.1.0
    The feature demoed in the second contourf3d example was enabled as a
@@ -142,84 +113,48 @@
 .. _polygon3d:
 
 Polygon plots
-====================
-.. automethod:: Axes3D.add_collection3d
+=============
+See `.Axes3D.add_collection3d` for API documentation.
 
 .. figure:: ../../gallery/mplot3d/images/sphx_glr_polys3d_001.png
    :target: ../../gallery/mplot3d/polys3d.html
    :align: center
-   :scale: 50
-
-   Polys3d
 
 .. _bar3d:
 
 Bar plots
-====================
-.. automethod:: Axes3D.bar
+=========
+See `.Axes3D.bar` for API documentation.
 
 .. figure:: ../../gallery/mplot3d/images/sphx_glr_bars3d_001.png
    :target: ../../gallery/mplot3d/bars3d.html
    :align: center
-   :scale: 50
-
-   Bars3d
 
 .. _quiver3d:
 
 Quiver
-====================
-.. automethod:: Axes3D.quiver
+======
+See `.Axes3D.quiver` for API documentation.
 
 .. figure:: ../../gallery/mplot3d/images/sphx_glr_quiver3d_001.png
    :target: ../../gallery/mplot3d/quiver3d.html
    :align: center
-   :scale: 50
-
-   Quiver3d
 
 .. _2dcollections3d:
 
 2D plots in 3D
-====================
+==============
 .. figure:: ../../gallery/mplot3d/images/sphx_glr_2dcollections3d_001.png
    :target: ../../gallery/mplot3d/2dcollections3d.html
    :align: center
-   :scale: 50
-
-   2dcollections3d
 
 .. _text3d:
 
 Text
-====================
-.. automethod:: Axes3D.text
+====
+See `.Axes3D.text` for API documentation.
 
 .. figure:: ../../gallery/mplot3d/images/sphx_glr_text3d_001.png
    :target: ../../gallery/mplot3d/text3d.html
    :align: center
-   :scale: 50
-
-   Text3d
-
-.. _3dsubplots:
-
-Subplotting
-====================
-Having multiple 3D plots in a single figure is the same
-as it is for 2D plots. Also, you can have both 2D and 3D plots
-in the same figure.
-
-.. versionadded:: 1.0.0
-   Subplotting 3D plots was added in v1.0.0.  Earlier version can not
-   do this.
-
-.. figure:: ../../gallery/mplot3d/images/sphx_glr_subplot3d_001.png
-   :target: ../../gallery/mplot3d/subplot3d.html
-   :align: center
-   :scale: 50
-
-   Subplot3d
-
-   Mixed Subplots
 """
diff --git a/versioneer.py b/versioneer.py
deleted file mode 100644
index 304372b5bf7e..000000000000
--- a/versioneer.py
+++ /dev/null
@@ -1,1704 +0,0 @@
-
-# Version: 0.15 +matplotlib modifications to avoid the need for setup.cfg to exist.
-
-"""
-The Versioneer
-==============
-
-* like a rocketeer, but for versions!
-* https://github.com/warner/python-versioneer
-* Brian Warner
-* License: Public Domain
-* Compatible With: python2.6, 2.7, 3.2, 3.3, 3.4, and pypy
-* [![Latest Version]
-(https://pypip.in/version/versioneer/badge.svg?style=flat)
-](https://pypi.python.org/pypi/versioneer/)
-* [![Build Status]
-(https://travis-ci.org/warner/python-versioneer.png?branch=master)
-](https://travis-ci.org/warner/python-versioneer)
-
-This is a tool for managing a recorded version number in distutils-based
-python projects. The goal is to remove the tedious and error-prone "update
-the embedded version string" step from your release process. Making a new
-release should be as easy as recording a new tag in your version-control
-system, and maybe making new tarballs.
-
-
-## Quick Install
-
-* `pip install versioneer` to somewhere to your $PATH
-* add a `[versioneer]` section to your setup.cfg (see below)
-* run `versioneer install` in your source tree, commit the results
-
-## Version Identifiers
-
-Source trees come from a variety of places:
-
-* a version-control system checkout (mostly used by developers)
-* a nightly tarball, produced by build automation
-* a snapshot tarball, produced by a web-based VCS browser, like github's
-  "tarball from tag" feature
-* a release tarball, produced by "setup.py sdist", distributed through PyPI
-
-Within each source tree, the version identifier (either a string or a number,
-this tool is format-agnostic) can come from a variety of places:
-
-* ask the VCS tool itself, e.g. "git describe" (for checkouts), which knows
-  about recent "tags" and an absolute revision-id
-* the name of the directory into which the tarball was unpacked
-* an expanded VCS keyword ($Id$, etc)
-* a `_version.py` created by some earlier build step
-
-For released software, the version identifier is closely related to a VCS
-tag. Some projects use tag names that include more than just the version
-string (e.g. "myproject-1.2" instead of just "1.2"), in which case the tool
-needs to strip the tag prefix to extract the version identifier. For
-unreleased software (between tags), the version identifier should provide
-enough information to help developers recreate the same tree, while also
-giving them an idea of roughly how old the tree is (after version 1.2, before
-version 1.3). Many VCS systems can report a description that captures this,
-for example `git describe --tags --dirty --always` reports things like
-"0.7-1-g574ab98-dirty" to indicate that the checkout is one revision past the
-0.7 tag, has a unique revision id of "574ab98", and is "dirty" (it has
-uncommitted changes.
-
-The version identifier is used for multiple purposes:
-
-* to allow the module to self-identify its version: `myproject.__version__`
-* to choose a name and prefix for a 'setup.py sdist' tarball
-
-## Theory of Operation
-
-Versioneer works by adding a special `_version.py` file into your source
-tree, where your `__init__.py` can import it. This `_version.py` knows how to
-dynamically ask the VCS tool for version information at import time.
-
-`_version.py` also contains `$Revision$` markers, and the installation
-process marks `_version.py` to have this marker rewritten with a tag name
-during the `git archive` command. As a result, generated tarballs will
-contain enough information to get the proper version.
-
-To allow `setup.py` to compute a version too, a `versioneer.py` is added to
-the top level of your source tree, next to `setup.py` and the `setup.cfg`
-that configures it. This overrides several distutils/setuptools commands to
-compute the version when invoked, and changes `setup.py build` and `setup.py
-sdist` to replace `_version.py` with a small static file that contains just
-the generated version data.
-
-## Installation
-
-First, decide on values for the following configuration variables:
-
-* `VCS`: the version control system you use. Currently accepts "git".
-
-* `style`: the style of version string to be produced. See "Styles" below for
-  details. Defaults to "pep440", which looks like
-  `TAG[+DISTANCE.gSHORTHASH[.dirty]]`.
-
-* `versionfile_source`:
-
-  A project-relative pathname into which the generated version strings should
-  be written. This is usually a `_version.py` next to your project's main
-  `__init__.py` file, so it can be imported at runtime. If your project uses
-  `src/myproject/__init__.py`, this should be `src/myproject/_version.py`.
-  This file should be checked in to your VCS as usual: the copy created below
-  by `setup.py setup_versioneer` will include code that parses expanded VCS
-  keywords in generated tarballs. The 'build' and 'sdist' commands will
-  replace it with a copy that has just the calculated version string.
-
-  This must be set even if your project does not have any modules (and will
-  therefore never import `_version.py`), since "setup.py sdist" -based trees
-  still need somewhere to record the pre-calculated version strings. Anywhere
-  in the source tree should do. If there is a `__init__.py` next to your
-  `_version.py`, the `setup.py setup_versioneer` command (described below)
-  will append some `__version__`-setting assignments, if they aren't already
-  present.
-
-* `versionfile_build`:
-
-  Like `versionfile_source`, but relative to the build directory instead of
-  the source directory. These will differ when your setup.py uses
-  'package_dir='. If you have `package_dir={'myproject': 'src/myproject'}`,
-  then you will probably have `versionfile_build='myproject/_version.py'` and
-  `versionfile_source='src/myproject/_version.py'`.
-
-  If this is set to None, then `setup.py build` will not attempt to rewrite
-  any `_version.py` in the built tree. If your project does not have any
-  libraries (e.g. if it only builds a script), then you should use
-  `versionfile_build = None` and override `distutils.command.build_scripts`
-  to explicitly insert a copy of `versioneer.get_version()` into your
-  generated script.
-
-* `tag_prefix`:
-
-  a string, like 'PROJECTNAME-', which appears at the start of all VCS tags.
-  If your tags look like 'myproject-1.2.0', then you should use
-  tag_prefix='myproject-'. If you use unprefixed tags like '1.2.0', this
-  should be an empty string.
-
-* `parentdir_prefix`:
-
-  a optional string, frequently the same as tag_prefix, which appears at the
-  start of all unpacked tarball filenames. If your tarball unpacks into
-  'myproject-1.2.0', this should be 'myproject-'. To disable this feature,
-  just omit the field from your `setup.cfg`.
-
-This tool provides one script, named `versioneer`. That script has one mode,
-"install", which writes a copy of `versioneer.py` into the current directory
-and runs `versioneer.py setup` to finish the installation.
-
-To versioneer-enable your project:
-
-* 1: Modify your `setup.cfg`, adding a section named `[versioneer]` and
-  populating it with the configuration values you decided earlier (note that
-  the option names are not case-sensitive):
-
-  ````
-  [versioneer]
-  VCS = git
-  style = pep440
-  versionfile_source = src/myproject/_version.py
-  versionfile_build = myproject/_version.py
-  tag_prefix = ""
-  parentdir_prefix = myproject-
-  ````
-
-* 2: Run `versioneer install`. This will do the following:
-
-  * copy `versioneer.py` into the top of your source tree
-  * create `_version.py` in the right place (`versionfile_source`)
-  * modify your `__init__.py` (if one exists next to `_version.py`) to define
-    `__version__` (by calling a function from `_version.py`)
-  * modify your `MANIFEST.in` to include both `versioneer.py` and the
-    generated `_version.py` in sdist tarballs
-
-  `versioneer install` will complain about any problems it finds with your
-  `setup.py` or `setup.cfg`. Run it multiple times until you have fixed all
-  the problems.
-
-* 3: add a `import versioneer` to your setup.py, and add the following
-  arguments to the setup() call:
-
-        version=versioneer.get_version(),
-        cmdclass=versioneer.get_cmdclass(),
-
-* 4: commit these changes to your VCS. To make sure you won't forget,
-  `versioneer install` will mark everything it touched for addition using
-  `git add`. Don't forget to add `setup.py` and `setup.cfg` too.
-
-## Post-Installation Usage
-
-Once established, all uses of your tree from a VCS checkout should get the
-current version string. All generated tarballs should include an embedded
-version string (so users who unpack them will not need a VCS tool installed).
-
-If you distribute your project through PyPI, then the release process should
-boil down to two steps:
-
-* 1: git tag 1.0
-* 2: python setup.py register sdist upload
-
-If you distribute it through github (i.e. users use github to generate
-tarballs with `git archive`), the process is:
-
-* 1: git tag 1.0
-* 2: git push; git push --tags
-
-Versioneer will report "0+untagged.NUMCOMMITS.gHASH" until your tree has at
-least one tag in its history.
-
-## Version-String Flavors
-
-Code which uses Versioneer can learn about its version string at runtime by
-importing `_version` from your main `__init__.py` file and running the
-`get_versions()` function. From the "outside" (e.g. in `setup.py`), you can
-import the top-level `versioneer.py` and run `get_versions()`.
-
-Both functions return a dictionary with different flavors of version
-information:
-
-* `['version']`: A condensed version string, rendered using the selected
-  style. This is the most commonly used value for the project's version
-  string. The default "pep440" style yields strings like `0.11`,
-  `0.11+2.g1076c97`, or `0.11+2.g1076c97.dirty`. See the "Styles" section
-  below for alternative styles.
-
-* `['full-revisionid']`: detailed revision identifier. For Git, this is the
-  full SHA1 commit id, e.g. "1076c978a8d3cfc70f408fe5974aa6c092c949ac".
-
-* `['dirty']`: a boolean, True if the tree has uncommitted changes. Note that
-  this is only accurate if run in a VCS checkout, otherwise it is likely to
-  be False or None
-
-* `['error']`: if the version string could not be computed, this will be set
-  to a string describing the problem, otherwise it will be None. It may be
-  useful to throw an exception in setup.py if this is set, to avoid e.g.
-  creating tarballs with a version string of "unknown".
-
-Some variants are more useful than others. Including `full-revisionid` in a
-bug report should allow developers to reconstruct the exact code being tested
-(or indicate the presence of local changes that should be shared with the
-developers). `version` is suitable for display in an "about" box or a CLI
-`--version` output: it can be easily compared against release notes and lists
-of bugs fixed in various releases.
-
-The installer adds the following text to your `__init__.py` to place a basic
-version in `YOURPROJECT.__version__`:
-
-    from ._version import get_versions
-    __version__ = get_versions()['version']
-    del get_versions
-
-## Styles
-
-The setup.cfg `style=` configuration controls how the VCS information is
-rendered into a version string.
-
-The default style, "pep440", produces a PEP440-compliant string, equal to the
-un-prefixed tag name for actual releases, and containing an additional "local
-version" section with more detail for in-between builds. For Git, this is
-TAG[+DISTANCE.gHEX[.dirty]] , using information from `git describe --tags
---dirty --always`. For example "0.11+2.g1076c97.dirty" indicates that the
-tree is like the "1076c97" commit but has uncommitted changes (".dirty"), and
-that this commit is two revisions ("+2") beyond the "0.11" tag. For released
-software (exactly equal to a known tag), the identifier will only contain the
-stripped tag, e.g. "0.11".
-
-Other styles are available. See details.md in the Versioneer source tree for
-descriptions.
-
-## Debugging
-
-Versioneer tries to avoid fatal errors: if something goes wrong, it will tend
-to return a version of "0+unknown". To investigate the problem, run `setup.py
-version`, which will run the version-lookup code in a verbose mode, and will
-display the full contents of `get_versions()` (including the `error` string,
-which may help identify what went wrong).
-
-## Updating Versioneer
-
-To upgrade your project to a new release of Versioneer, do the following:
-
-* install the new Versioneer (`pip install -U versioneer` or equivalent)
-* edit `setup.cfg`, if necessary, to include any new configuration settings
-  indicated by the release notes
-* re-run `versioneer install` in your source tree, to replace
-  `SRC/_version.py`
-* commit any changed files
-
-### Upgrading to 0.15
-
-Starting with this version, Versioneer is configured with a `[versioneer]`
-section in your `setup.cfg` file. Earlier versions required the `setup.py` to
-set attributes on the `versioneer` module immediately after import. The new
-version will refuse to run (raising an exception during import) until you
-have provided the necessary `setup.cfg` section.
-
-In addition, the Versioneer package provides an executable named
-`versioneer`, and the installation process is driven by running `versioneer
-install`. In 0.14 and earlier, the executable was named
-`versioneer-installer` and was run without an argument.
-
-### Upgrading to 0.14
-
-0.14 changes the format of the version string. 0.13 and earlier used
-hyphen-separated strings like "0.11-2-g1076c97-dirty". 0.14 and beyond use a
-plus-separated "local version" section strings, with dot-separated
-components, like "0.11+2.g1076c97". PEP440-strict tools did not like the old
-format, but should be ok with the new one.
-
-### Upgrading from 0.11 to 0.12
-
-Nothing special.
-
-### Upgrading from 0.10 to 0.11
-
-You must add a `versioneer.VCS = "git"` to your `setup.py` before re-running
-`setup.py setup_versioneer`. This will enable the use of additional
-version-control systems (SVN, etc) in the future.
-
-## Future Directions
-
-This tool is designed to make it easily extended to other version-control
-systems: all VCS-specific components are in separate directories like
-src/git/ . The top-level `versioneer.py` script is assembled from these
-components by running make-versioneer.py . In the future, make-versioneer.py
-will take a VCS name as an argument, and will construct a version of
-`versioneer.py` that is specific to the given VCS. It might also take the
-configuration arguments that are currently provided manually during
-installation by editing setup.py . Alternatively, it might go the other
-direction and include code from all supported VCS systems, reducing the
-number of intermediate scripts.
-
-
-## License
-
-To make Versioneer easier to embed, all its code is hereby released into the
-public domain. The `_version.py` that it creates is also in the public
-domain.
-
-"""
-
-from __future__ import print_function
-try:
-    import configparser
-except ImportError:
-    import ConfigParser as configparser
-import errno
-import json
-import os
-import re
-import subprocess
-import sys
-
-
-class VersioneerConfig:
-    pass
-
-
-def get_root():
-    # we require that all commands are run from the project root, i.e. the
-    # directory that contains setup.py, setup.cfg, and versioneer.py .
-    root = os.path.realpath(os.path.abspath(os.getcwd()))
-    setup_py = os.path.join(root, "setup.py")
-    versioneer_py = os.path.join(root, "versioneer.py")
-    if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)):
-        # allow 'python path/to/setup.py COMMAND'
-        root = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0])))
-        setup_py = os.path.join(root, "setup.py")
-        versioneer_py = os.path.join(root, "versioneer.py")
-    if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)):
-        err = ("Versioneer was unable to run the project root directory. "
-               "Versioneer requires setup.py to be executed from "
-               "its immediate directory (like 'python setup.py COMMAND'), "
-               "or in a way that lets it use sys.argv[0] to find the root "
-               "(like 'python path/to/setup.py COMMAND').")
-        raise VersioneerBadRootError(err)
-    try:
-        # Certain runtime workflows (setup.py install/develop in a setuptools
-        # tree) execute all dependencies in a single python process, so
-        # "versioneer" may be imported multiple times, and python's shared
-        # module-import table will cache the first one. So we can't use
-        # os.path.dirname(__file__), as that will find whichever
-        # versioneer.py was first imported, even in later projects.
-        me = os.path.realpath(os.path.abspath(__file__))
-        if os.path.splitext(me)[0] != os.path.splitext(versioneer_py)[0]:
-            print("Warning: build in %s is using versioneer.py from %s"
-                  % (os.path.dirname(me), versioneer_py))
-    except NameError:
-        pass
-    return root
-
-
-def get_config_from_root(root):
-    # This might raise EnvironmentError (if setup.cfg is missing), or
-    # configparser.NoSectionError (if it lacks a [versioneer] section), or
-    # configparser.NoOptionError (if it lacks "VCS="). See the docstring at
-    # the top of versioneer.py for instructions on writing your setup.cfg .
-    setup_cfg = os.path.join(root, "setup.cfg")
-
-
-    parser = configparser.SafeConfigParser()
-    if os.path.exists(setup_cfg):
-        with open(setup_cfg, "r") as f:
-            parser.readfp(f)
-
-    def get(parser, name):
-        if parser.has_option("versioneer", name):
-            return parser.get("versioneer", name)
-        return None
-    cfg = VersioneerConfig()
-
-    VCS = get(parser, "VCS") or 'git'
-    cfg.VCS = VCS
-    cfg.style = get(parser, "style") or "pep440"
-    version_file =  os.path.join('lib', 'matplotlib', '_version.py')
-    cfg.versionfile_source = get(parser, "versionfile_source") or version_file
-    cfg.versionfile_build = get(parser, "versionfile_build") or os.path.join('matplotlib', '_version.py')
-    cfg.tag_prefix = get(parser, "tag_prefix") or 'v'
-    cfg.parentdir_prefix = get(parser, "parentdir_prefix") or 'matplotlib-'
-    cfg.verbose = get(parser, "verbose")
-    return cfg
-
-
-class NotThisMethod(Exception):
-    pass
-
-# these dictionaries contain VCS-specific tools
-LONG_VERSION_PY = {}
-HANDLERS = {}
-
-
-def register_vcs_handler(vcs, method):  # decorator
-    def decorate(f):
-        if vcs not in HANDLERS:
-            HANDLERS[vcs] = {}
-        HANDLERS[vcs][method] = f
-        return f
-    return decorate
-
-
-def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False):
-    assert isinstance(commands, list)
-    p = None
-    for c in commands:
-        try:
-            dispcmd = str([c] + args)
-            # remember shell=False, so use git.cmd on windows, not just git
-            p = subprocess.Popen([c] + args, cwd=cwd, stdout=subprocess.PIPE,
-                                 stderr=(subprocess.PIPE if hide_stderr
-                                         else None))
-            break
-        except EnvironmentError:
-            e = sys.exc_info()[1]
-            if e.errno == errno.ENOENT:
-                continue
-            if verbose:
-                print("unable to run %s" % dispcmd)
-                print(e)
-            return None
-    else:
-        if verbose:
-            print("unable to find command, tried %s" % (commands,))
-        return None
-    stdout = p.communicate()[0].strip()
-    if sys.version_info[0] >= 3:
-        stdout = stdout.decode()
-    if p.returncode != 0:
-        if verbose:
-            print("unable to run %s (error)" % dispcmd)
-        return None
-    return stdout
-LONG_VERSION_PY['git'] = r'''
-# This file helps to compute a version number in source trees obtained from
-# git-archive tarball (such as those provided by githubs download-from-tag
-# feature). Distribution tarballs (built by setup.py sdist) and build
-# directories (produced by setup.py build) will contain a much shorter file
-# that just contains the computed version number.
-
-# This file is released into the public domain. Generated by
-# versioneer-0.15 (https://github.com/warner/python-versioneer)
-
-import errno
-import os
-import re
-import subprocess
-import sys
-
-
-def get_keywords():
-    # these strings will be replaced by git during git-archive.
-    # setup.py/versioneer.py will grep for the variable names, so they must
-    # each be defined on a line of their own. _version.py will just call
-    # get_keywords().
-    git_refnames = "%(DOLLAR)sFormat:%%d%(DOLLAR)s"
-    git_full = "%(DOLLAR)sFormat:%%H%(DOLLAR)s"
-    keywords = {"refnames": git_refnames, "full": git_full}
-    return keywords
-
-
-class VersioneerConfig:
-    pass
-
-
-def get_config():
-    # these strings are filled in when 'setup.py versioneer' creates
-    # _version.py
-    cfg = VersioneerConfig()
-    cfg.VCS = "git"
-    cfg.style = "%(STYLE)s"
-    cfg.tag_prefix = "%(TAG_PREFIX)s"
-    cfg.parentdir_prefix = "%(PARENTDIR_PREFIX)s"
-    cfg.versionfile_source = "%(VERSIONFILE_SOURCE)s"
-    cfg.verbose = False
-    return cfg
-
-
-class NotThisMethod(Exception):
-    pass
-
-
-LONG_VERSION_PY = {}
-HANDLERS = {}
-
-
-def register_vcs_handler(vcs, method):  # decorator
-    def decorate(f):
-        if vcs not in HANDLERS:
-            HANDLERS[vcs] = {}
-        HANDLERS[vcs][method] = f
-        return f
-    return decorate
-
-
-def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False):
-    assert isinstance(commands, list)
-    p = None
-    for c in commands:
-        try:
-            dispcmd = str([c] + args)
-            # remember shell=False, so use git.cmd on windows, not just git
-            p = subprocess.Popen([c] + args, cwd=cwd, stdout=subprocess.PIPE,
-                                 stderr=(subprocess.PIPE if hide_stderr
-                                         else None))
-            break
-        except EnvironmentError:
-            e = sys.exc_info()[1]
-            if e.errno == errno.ENOENT:
-                continue
-            if verbose:
-                print("unable to run %%s" %% dispcmd)
-                print(e)
-            return None
-    else:
-        if verbose:
-            print("unable to find command, tried %%s" %% (commands,))
-        return None
-    stdout = p.communicate()[0].strip()
-    if sys.version_info[0] >= 3:
-        stdout = stdout.decode()
-    if p.returncode != 0:
-        if verbose:
-            print("unable to run %%s (error)" %% dispcmd)
-        return None
-    return stdout
-
-
-def versions_from_parentdir(parentdir_prefix, root, verbose):
-    # Source tarballs conventionally unpack into a directory that includes
-    # both the project name and a version string.
-    dirname = os.path.basename(root)
-    if not dirname.startswith(parentdir_prefix):
-        if verbose:
-            print("guessing rootdir is '%%s', but '%%s' doesn't start with "
-                  "prefix '%%s'" %% (root, dirname, parentdir_prefix))
-        raise NotThisMethod("rootdir doesn't start with parentdir_prefix")
-    return {"version": dirname[len(parentdir_prefix):],
-            "full-revisionid": None,
-            "dirty": False, "error": None}
-
-
-@register_vcs_handler("git", "get_keywords")
-def git_get_keywords(versionfile_abs):
-    # the code embedded in _version.py can just fetch the value of these
-    # keywords. When used from setup.py, we don't want to import _version.py,
-    # so we do it with a regexp instead. This function is not used from
-    # _version.py.
-    keywords = {}
-    try:
-        f = open(versionfile_abs, "r")
-        for line in f.readlines():
-            if line.strip().startswith("git_refnames ="):
-                mo = re.search(r'=\s*"(.*)"', line)
-                if mo:
-                    keywords["refnames"] = mo.group(1)
-            if line.strip().startswith("git_full ="):
-                mo = re.search(r'=\s*"(.*)"', line)
-                if mo:
-                    keywords["full"] = mo.group(1)
-        f.close()
-    except EnvironmentError:
-        pass
-    return keywords
-
-
-@register_vcs_handler("git", "keywords")
-def git_versions_from_keywords(keywords, tag_prefix, verbose):
-    if not keywords:
-        raise NotThisMethod("no keywords at all, weird")
-    refnames = keywords["refnames"].strip()
-    if refnames.startswith("$Format"):
-        if verbose:
-            print("keywords are unexpanded, not using")
-        raise NotThisMethod("unexpanded keywords, not a git-archive tarball")
-    refs = set([r.strip() for r in refnames.strip("()").split(",")])
-    # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of
-    # just "foo-1.0". If we see a "tag: " prefix, prefer those.
-    TAG = "tag: "
-    tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)])
-    if not tags:
-        # Either we're using git < 1.8.3, or there really are no tags. We use
-        # a heuristic: assume all version tags have a digit. The old git %%d
-        # expansion behaves like git log --decorate=short and strips out the
-        # refs/heads/ and refs/tags/ prefixes that would let us distinguish
-        # between branches and tags. By ignoring refnames without digits, we
-        # filter out many common branch names like "release" and
-        # "stabilization", as well as "HEAD" and "master".
-        tags = set([r for r in refs if re.search(r'\d', r)])
-        if verbose:
-            print("discarding '%%s', no digits" %% ",".join(refs-tags))
-    if verbose:
-        print("likely tags: %%s" %% ",".join(sorted(tags)))
-    for ref in sorted(tags):
-        # sorting will prefer e.g. "2.0" over "2.0rc1"
-        if ref.startswith(tag_prefix):
-            r = ref[len(tag_prefix):]
-            if verbose:
-                print("picking %%s" %% r)
-            return {"version": r,
-                    "full-revisionid": keywords["full"].strip(),
-                    "dirty": False, "error": None
-                    }
-    # no suitable tags, so version is "0+unknown", but full hex is still there
-    if verbose:
-        print("no suitable tags, using unknown + full revision id")
-    return {"version": "0+unknown",
-            "full-revisionid": keywords["full"].strip(),
-            "dirty": False, "error": "no suitable tags"}
-
-
-@register_vcs_handler("git", "pieces_from_vcs")
-def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
-    # this runs 'git' from the root of the source tree. This only gets called
-    # if the git-archive 'subst' keywords were *not* expanded, and
-    # _version.py hasn't already been rewritten with a short version string,
-    # meaning we're inside a checked out source tree.
-
-    if not os.path.exists(os.path.join(root, ".git")):
-        if verbose:
-            print("no .git in %%s" %% root)
-        raise NotThisMethod("no .git directory")
-
-    GITS = ["git"]
-    if sys.platform == "win32":
-        GITS = ["git.cmd", "git.exe"]
-    # if there is a tag, this yields TAG-NUM-gHEX[-dirty]
-    # if there are no tags, this yields HEX[-dirty] (no NUM)
-    describe_out = run_command(GITS, ["describe", "--tags", "--dirty",
-                                      "--always", "--long"],
-                               cwd=root)
-    # --long was added in git-1.5.5
-    if describe_out is None:
-        raise NotThisMethod("'git describe' failed")
-    describe_out = describe_out.strip()
-    full_out = run_command(GITS, ["rev-parse", "HEAD"], cwd=root)
-    if full_out is None:
-        raise NotThisMethod("'git rev-parse' failed")
-    full_out = full_out.strip()
-
-    pieces = {}
-    pieces["long"] = full_out
-    pieces["short"] = full_out[:7]  # maybe improved later
-    pieces["error"] = None
-
-    # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty]
-    # TAG might have hyphens.
-    git_describe = describe_out
-
-    # look for -dirty suffix
-    dirty = git_describe.endswith("-dirty")
-    pieces["dirty"] = dirty
-    if dirty:
-        git_describe = git_describe[:git_describe.rindex("-dirty")]
-
-    # now we have TAG-NUM-gHEX or HEX
-
-    if "-" in git_describe:
-        # TAG-NUM-gHEX
-        mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe)
-        if not mo:
-            # unparsable. Maybe git-describe is misbehaving?
-            pieces["error"] = ("unable to parse git-describe output: '%%s'"
-                               %% describe_out)
-            return pieces
-
-        # tag
-        full_tag = mo.group(1)
-        if not full_tag.startswith(tag_prefix):
-            if verbose:
-                fmt = "tag '%%s' doesn't start with prefix '%%s'"
-                print(fmt %% (full_tag, tag_prefix))
-            pieces["error"] = ("tag '%%s' doesn't start with prefix '%%s'"
-                               %% (full_tag, tag_prefix))
-            return pieces
-        pieces["closest-tag"] = full_tag[len(tag_prefix):]
-
-        # distance: number of commits since tag
-        pieces["distance"] = int(mo.group(2))
-
-        # commit: short hex revision ID
-        pieces["short"] = mo.group(3)
-
-    else:
-        # HEX: no tags
-        pieces["closest-tag"] = None
-        count_out = run_command(GITS, ["rev-list", "HEAD", "--count"],
-                                cwd=root)
-        pieces["distance"] = int(count_out)  # total number of commits
-
-    return pieces
-
-
-def plus_or_dot(pieces):
-    if "+" in pieces.get("closest-tag", ""):
-        return "."
-    return "+"
-
-
-def render_pep440(pieces):
-    # now build up version string, with post-release "local version
-    # identifier". Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you
-    # get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty
-
-    # exceptions:
-    # 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty]
-
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"] or pieces["dirty"]:
-            rendered += plus_or_dot(pieces)
-            rendered += "%%d.g%%s" %% (pieces["distance"], pieces["short"])
-            if pieces["dirty"]:
-                rendered += ".dirty"
-    else:
-        # exception #1
-        rendered = "0+untagged.%%d.g%%s" %% (pieces["distance"],
-                                          pieces["short"])
-        if pieces["dirty"]:
-            rendered += ".dirty"
-    return rendered
-
-
-def render_pep440_pre(pieces):
-    # TAG[.post.devDISTANCE] . No -dirty
-
-    # exceptions:
-    # 1: no tags. 0.post.devDISTANCE
-
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"]:
-            rendered += ".post.dev%%d" %% pieces["distance"]
-    else:
-        # exception #1
-        rendered = "0.post.dev%%d" %% pieces["distance"]
-    return rendered
-
-
-def render_pep440_post(pieces):
-    # TAG[.postDISTANCE[.dev0]+gHEX] . The ".dev0" means dirty. Note that
-    # .dev0 sorts backwards (a dirty tree will appear "older" than the
-    # corresponding clean one), but you shouldn't be releasing software with
-    # -dirty anyways.
-
-    # exceptions:
-    # 1: no tags. 0.postDISTANCE[.dev0]
-
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"] or pieces["dirty"]:
-            rendered += ".post%%d" %% pieces["distance"]
-            if pieces["dirty"]:
-                rendered += ".dev0"
-            rendered += plus_or_dot(pieces)
-            rendered += "g%%s" %% pieces["short"]
-    else:
-        # exception #1
-        rendered = "0.post%%d" %% pieces["distance"]
-        if pieces["dirty"]:
-            rendered += ".dev0"
-        rendered += "+g%%s" %% pieces["short"]
-    return rendered
-
-
-def render_pep440_old(pieces):
-    # TAG[.postDISTANCE[.dev0]] . The ".dev0" means dirty.
-
-    # exceptions:
-    # 1: no tags. 0.postDISTANCE[.dev0]
-
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"] or pieces["dirty"]:
-            rendered += ".post%%d" %% pieces["distance"]
-            if pieces["dirty"]:
-                rendered += ".dev0"
-    else:
-        # exception #1
-        rendered = "0.post%%d" %% pieces["distance"]
-        if pieces["dirty"]:
-            rendered += ".dev0"
-    return rendered
-
-
-def render_git_describe(pieces):
-    # TAG[-DISTANCE-gHEX][-dirty], like 'git describe --tags --dirty
-    # --always'
-
-    # exceptions:
-    # 1: no tags. HEX[-dirty]  (note: no 'g' prefix)
-
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"]:
-            rendered += "-%%d-g%%s" %% (pieces["distance"], pieces["short"])
-    else:
-        # exception #1
-        rendered = pieces["short"]
-    if pieces["dirty"]:
-        rendered += "-dirty"
-    return rendered
-
-
-def render_git_describe_long(pieces):
-    # TAG-DISTANCE-gHEX[-dirty], like 'git describe --tags --dirty
-    # --always -long'. The distance/hash is unconditional.
-
-    # exceptions:
-    # 1: no tags. HEX[-dirty]  (note: no 'g' prefix)
-
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        rendered += "-%%d-g%%s" %% (pieces["distance"], pieces["short"])
-    else:
-        # exception #1
-        rendered = pieces["short"]
-    if pieces["dirty"]:
-        rendered += "-dirty"
-    return rendered
-
-
-def render(pieces, style):
-    if pieces["error"]:
-        return {"version": "unknown",
-                "full-revisionid": pieces.get("long"),
-                "dirty": None,
-                "error": pieces["error"]}
-
-    if not style or style == "default":
-        style = "pep440"  # the default
-
-    if style == "pep440":
-        rendered = render_pep440(pieces)
-    elif style == "pep440-pre":
-        rendered = render_pep440_pre(pieces)
-    elif style == "pep440-post":
-        rendered = render_pep440_post(pieces)
-    elif style == "pep440-old":
-        rendered = render_pep440_old(pieces)
-    elif style == "git-describe":
-        rendered = render_git_describe(pieces)
-    elif style == "git-describe-long":
-        rendered = render_git_describe_long(pieces)
-    else:
-        raise ValueError("unknown style '%%s'" %% style)
-
-    return {"version": rendered, "full-revisionid": pieces["long"],
-            "dirty": pieces["dirty"], "error": None}
-
-
-def get_versions():
-    # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have
-    # __file__, we can work backwards from there to the root. Some
-    # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which
-    # case we can only use expanded keywords.
-
-    cfg = get_config()
-    verbose = cfg.verbose
-
-    try:
-        return git_versions_from_keywords(get_keywords(), cfg.tag_prefix,
-                                          verbose)
-    except NotThisMethod:
-        pass
-
-    try:
-        root = os.path.realpath(__file__)
-        # versionfile_source is the relative path from the top of the source
-        # tree (where the .git directory might live) to this file. Invert
-        # this to find the root from __file__.
-        for i in cfg.versionfile_source.split('/'):
-            root = os.path.dirname(root)
-    except NameError:
-        return {"version": "0+unknown", "full-revisionid": None,
-                "dirty": None,
-                "error": "unable to find root of source tree"}
-
-    try:
-        pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose)
-        return render(pieces, cfg.style)
-    except NotThisMethod:
-        pass
-
-    try:
-        if cfg.parentdir_prefix:
-            return versions_from_parentdir(cfg.parentdir_prefix, root, verbose)
-    except NotThisMethod:
-        pass
-
-    return {"version": "0+unknown", "full-revisionid": None,
-            "dirty": None,
-            "error": "unable to compute version"}
-'''
-
-
-@register_vcs_handler("git", "get_keywords")
-def git_get_keywords(versionfile_abs):
-    # the code embedded in _version.py can just fetch the value of these
-    # keywords. When used from setup.py, we don't want to import _version.py,
-    # so we do it with a regexp instead. This function is not used from
-    # _version.py.
-    keywords = {}
-    try:
-        f = open(versionfile_abs, "r")
-        for line in f.readlines():
-            if line.strip().startswith("git_refnames ="):
-                mo = re.search(r'=\s*"(.*)"', line)
-                if mo:
-                    keywords["refnames"] = mo.group(1)
-            if line.strip().startswith("git_full ="):
-                mo = re.search(r'=\s*"(.*)"', line)
-                if mo:
-                    keywords["full"] = mo.group(1)
-        f.close()
-    except EnvironmentError:
-        pass
-    return keywords
-
-
-@register_vcs_handler("git", "keywords")
-def git_versions_from_keywords(keywords, tag_prefix, verbose):
-    if not keywords:
-        raise NotThisMethod("no keywords at all, weird")
-    refnames = keywords["refnames"].strip()
-    if refnames.startswith("$Format"):
-        if verbose:
-            print("keywords are unexpanded, not using")
-        raise NotThisMethod("unexpanded keywords, not a git-archive tarball")
-    refs = set([r.strip() for r in refnames.strip("()").split(",")])
-    # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of
-    # just "foo-1.0". If we see a "tag: " prefix, prefer those.
-    TAG = "tag: "
-    tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)])
-    if not tags:
-        # Either we're using git < 1.8.3, or there really are no tags. We use
-        # a heuristic: assume all version tags have a digit. The old git %d
-        # expansion behaves like git log --decorate=short and strips out the
-        # refs/heads/ and refs/tags/ prefixes that would let us distinguish
-        # between branches and tags. By ignoring refnames without digits, we
-        # filter out many common branch names like "release" and
-        # "stabilization", as well as "HEAD" and "master".
-        tags = set([r for r in refs if re.search(r'\d', r)])
-        if verbose:
-            print("discarding '%s', no digits" % ",".join(refs-tags))
-    if verbose:
-        print("likely tags: %s" % ",".join(sorted(tags)))
-    for ref in sorted(tags):
-        # sorting will prefer e.g. "2.0" over "2.0rc1"
-        if ref.startswith(tag_prefix):
-            r = ref[len(tag_prefix):]
-            if verbose:
-                print("picking %s" % r)
-            return {"version": r,
-                    "full-revisionid": keywords["full"].strip(),
-                    "dirty": False, "error": None
-                    }
-    # no suitable tags, so version is "0+unknown", but full hex is still there
-    if verbose:
-        print("no suitable tags, using unknown + full revision id")
-    return {"version": "0+unknown",
-            "full-revisionid": keywords["full"].strip(),
-            "dirty": False, "error": "no suitable tags"}
-
-
-@register_vcs_handler("git", "pieces_from_vcs")
-def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
-    # this runs 'git' from the root of the source tree. This only gets called
-    # if the git-archive 'subst' keywords were *not* expanded, and
-    # _version.py hasn't already been rewritten with a short version string,
-    # meaning we're inside a checked out source tree.
-
-    if not os.path.exists(os.path.join(root, ".git")):
-        if verbose:
-            print("no .git in %s" % root)
-        raise NotThisMethod("no .git directory")
-
-    GITS = ["git"]
-    if sys.platform == "win32":
-        GITS = ["git.cmd", "git.exe"]
-    # if there is a tag, this yields TAG-NUM-gHEX[-dirty]
-    # if there are no tags, this yields HEX[-dirty] (no NUM)
-    describe_out = run_command(GITS, ["describe", "--tags", "--dirty",
-                                      "--always", "--long"],
-                               cwd=root)
-    # --long was added in git-1.5.5
-    if describe_out is None:
-        raise NotThisMethod("'git describe' failed")
-    describe_out = describe_out.strip()
-    full_out = run_command(GITS, ["rev-parse", "HEAD"], cwd=root)
-    if full_out is None:
-        raise NotThisMethod("'git rev-parse' failed")
-    full_out = full_out.strip()
-
-    pieces = {}
-    pieces["long"] = full_out
-    pieces["short"] = full_out[:7]  # maybe improved later
-    pieces["error"] = None
-
-    # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty]
-    # TAG might have hyphens.
-    git_describe = describe_out
-
-    # look for -dirty suffix
-    dirty = git_describe.endswith("-dirty")
-    pieces["dirty"] = dirty
-    if dirty:
-        git_describe = git_describe[:git_describe.rindex("-dirty")]
-
-    # now we have TAG-NUM-gHEX or HEX
-
-    if "-" in git_describe:
-        # TAG-NUM-gHEX
-        mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe)
-        if not mo:
-            # unparsable. Maybe git-describe is misbehaving?
-            pieces["error"] = ("unable to parse git-describe output: '%s'"
-                               % describe_out)
-            return pieces
-
-        # tag
-        full_tag = mo.group(1)
-        if not full_tag.startswith(tag_prefix):
-            if verbose:
-                fmt = "tag '%s' doesn't start with prefix '%s'"
-                print(fmt % (full_tag, tag_prefix))
-            pieces["error"] = ("tag '%s' doesn't start with prefix '%s'"
-                               % (full_tag, tag_prefix))
-            return pieces
-        pieces["closest-tag"] = full_tag[len(tag_prefix):]
-
-        # distance: number of commits since tag
-        pieces["distance"] = int(mo.group(2))
-
-        # commit: short hex revision ID
-        pieces["short"] = mo.group(3)
-
-    else:
-        # HEX: no tags
-        pieces["closest-tag"] = None
-        count_out = run_command(GITS, ["rev-list", "HEAD", "--count"],
-                                cwd=root)
-        pieces["distance"] = int(count_out)  # total number of commits
-
-    return pieces
-
-
-def do_vcs_install(manifest_in, versionfile_source, ipy):
-    GITS = ["git"]
-    if sys.platform == "win32":
-        GITS = ["git.cmd", "git.exe"]
-    files = [manifest_in, versionfile_source]
-    if ipy:
-        files.append(ipy)
-    try:
-        me = __file__
-        if me.endswith(".pyc") or me.endswith(".pyo"):
-            me = os.path.splitext(me)[0] + ".py"
-        versioneer_file = os.path.relpath(me)
-    except NameError:
-        versioneer_file = "versioneer.py"
-    files.append(versioneer_file)
-    present = False
-    try:
-        f = open(".gitattributes", "r")
-        for line in f.readlines():
-            if line.strip().startswith(versionfile_source):
-                if "export-subst" in line.strip().split()[1:]:
-                    present = True
-        f.close()
-    except EnvironmentError:
-        pass
-    if not present:
-        f = open(".gitattributes", "a+")
-        f.write("%s export-subst\n" % versionfile_source)
-        f.close()
-        files.append(".gitattributes")
-    run_command(GITS, ["add", "--"] + files)
-
-
-def versions_from_parentdir(parentdir_prefix, root, verbose):
-    # Source tarballs conventionally unpack into a directory that includes
-    # both the project name and a version string.
-    dirname = os.path.basename(root)
-    if not dirname.startswith(parentdir_prefix):
-        if verbose:
-            print("guessing rootdir is '%s', but '%s' doesn't start with "
-                  "prefix '%s'" % (root, dirname, parentdir_prefix))
-        raise NotThisMethod("rootdir doesn't start with parentdir_prefix")
-    return {"version": dirname[len(parentdir_prefix):],
-            "full-revisionid": None,
-            "dirty": False, "error": None}
-
-SHORT_VERSION_PY = """
-# This file was generated by 'versioneer.py' (0.15) from
-# revision-control system data, or from the parent directory name of an
-# unpacked source archive. Distribution tarballs contain a pre-generated copy
-# of this file.
-
-import json
-import sys
-
-version_json = '''
-%s
-'''  # END VERSION_JSON
-
-
-def get_versions():
-    return json.loads(version_json)
-"""
-
-
-def versions_from_file(filename):
-    try:
-        with open(filename) as f:
-            contents = f.read()
-    except EnvironmentError:
-        raise NotThisMethod("unable to read _version.py")
-    mo = re.search(r"version_json = '''\n(.*)'''  # END VERSION_JSON",
-                   contents, re.M | re.S)
-    if not mo:
-        raise NotThisMethod("no version_json in _version.py")
-    return json.loads(mo.group(1))
-
-
-def write_to_version_file(filename, versions):
-    os.unlink(filename)
-    contents = json.dumps(versions, sort_keys=True,
-                          indent=1, separators=(",", ": "))
-    with open(filename, "w") as f:
-        f.write(SHORT_VERSION_PY % contents)
-
-    print("set %s to '%s'" % (filename, versions["version"]))
-
-
-def plus_or_dot(pieces):
-    if "+" in pieces.get("closest-tag", ""):
-        return "."
-    return "+"
-
-
-def render_pep440(pieces):
-    # now build up version string, with post-release "local version
-    # identifier". Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you
-    # get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty
-
-    # exceptions:
-    # 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty]
-
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"] or pieces["dirty"]:
-            rendered += plus_or_dot(pieces)
-            rendered += "%d.g%s" % (pieces["distance"], pieces["short"])
-            if pieces["dirty"]:
-                rendered += ".dirty"
-    else:
-        # exception #1
-        rendered = "0+untagged.%d.g%s" % (pieces["distance"],
-                                          pieces["short"])
-        if pieces["dirty"]:
-            rendered += ".dirty"
-    return rendered
-
-
-def render_pep440_pre(pieces):
-    # TAG[.post.devDISTANCE] . No -dirty
-
-    # exceptions:
-    # 1: no tags. 0.post.devDISTANCE
-
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"]:
-            rendered += ".post.dev%d" % pieces["distance"]
-    else:
-        # exception #1
-        rendered = "0.post.dev%d" % pieces["distance"]
-    return rendered
-
-
-def render_pep440_post(pieces):
-    # TAG[.postDISTANCE[.dev0]+gHEX] . The ".dev0" means dirty. Note that
-    # .dev0 sorts backwards (a dirty tree will appear "older" than the
-    # corresponding clean one), but you shouldn't be releasing software with
-    # -dirty anyways.
-
-    # exceptions:
-    # 1: no tags. 0.postDISTANCE[.dev0]
-
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"] or pieces["dirty"]:
-            rendered += ".post%d" % pieces["distance"]
-            if pieces["dirty"]:
-                rendered += ".dev0"
-            rendered += plus_or_dot(pieces)
-            rendered += "g%s" % pieces["short"]
-    else:
-        # exception #1
-        rendered = "0.post%d" % pieces["distance"]
-        if pieces["dirty"]:
-            rendered += ".dev0"
-        rendered += "+g%s" % pieces["short"]
-    return rendered
-
-
-def render_pep440_old(pieces):
-    # TAG[.postDISTANCE[.dev0]] . The ".dev0" means dirty.
-
-    # exceptions:
-    # 1: no tags. 0.postDISTANCE[.dev0]
-
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"] or pieces["dirty"]:
-            rendered += ".post%d" % pieces["distance"]
-            if pieces["dirty"]:
-                rendered += ".dev0"
-    else:
-        # exception #1
-        rendered = "0.post%d" % pieces["distance"]
-        if pieces["dirty"]:
-            rendered += ".dev0"
-    return rendered
-
-
-def render_git_describe(pieces):
-    # TAG[-DISTANCE-gHEX][-dirty], like 'git describe --tags --dirty
-    # --always'
-
-    # exceptions:
-    # 1: no tags. HEX[-dirty]  (note: no 'g' prefix)
-
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"]:
-            rendered += "-%d-g%s" % (pieces["distance"], pieces["short"])
-    else:
-        # exception #1
-        rendered = pieces["short"]
-    if pieces["dirty"]:
-        rendered += "-dirty"
-    return rendered
-
-
-def render_git_describe_long(pieces):
-    # TAG-DISTANCE-gHEX[-dirty], like 'git describe --tags --dirty
-    # --always -long'. The distance/hash is unconditional.
-
-    # exceptions:
-    # 1: no tags. HEX[-dirty]  (note: no 'g' prefix)
-
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        rendered += "-%d-g%s" % (pieces["distance"], pieces["short"])
-    else:
-        # exception #1
-        rendered = pieces["short"]
-    if pieces["dirty"]:
-        rendered += "-dirty"
-    return rendered
-
-
-def render(pieces, style):
-    if pieces["error"]:
-        return {"version": "unknown",
-                "full-revisionid": pieces.get("long"),
-                "dirty": None,
-                "error": pieces["error"]}
-
-    if not style or style == "default":
-        style = "pep440"  # the default
-
-    if style == "pep440":
-        rendered = render_pep440(pieces)
-    elif style == "pep440-pre":
-        rendered = render_pep440_pre(pieces)
-    elif style == "pep440-post":
-        rendered = render_pep440_post(pieces)
-    elif style == "pep440-old":
-        rendered = render_pep440_old(pieces)
-    elif style == "git-describe":
-        rendered = render_git_describe(pieces)
-    elif style == "git-describe-long":
-        rendered = render_git_describe_long(pieces)
-    else:
-        raise ValueError("unknown style '%s'" % style)
-
-    return {"version": rendered, "full-revisionid": pieces["long"],
-            "dirty": pieces["dirty"], "error": None}
-
-
-class VersioneerBadRootError(Exception):
-    pass
-
-
-def get_versions(verbose=False):
-    # returns dict with two keys: 'version' and 'full'
-
-    if "versioneer" in sys.modules:
-        # see the discussion in cmdclass.py:get_cmdclass()
-        del sys.modules["versioneer"]
-
-    root = get_root()
-    cfg = get_config_from_root(root)
-
-    assert cfg.VCS is not None, "please set [versioneer]VCS= in setup.cfg"
-    handlers = HANDLERS.get(cfg.VCS)
-    assert handlers, "unrecognized VCS '%s'" % cfg.VCS
-    verbose = verbose or cfg.verbose
-    assert cfg.versionfile_source is not None, \
-        "please set versioneer.versionfile_source"
-    assert cfg.tag_prefix is not None, "please set versioneer.tag_prefix"
-
-    versionfile_abs = os.path.join(root, cfg.versionfile_source)
-
-    # extract version from first of: _version.py, VCS command (e.g. 'git
-    # describe'), parentdir. This is meant to work for developers using a
-    # source checkout, for users of a tarball created by 'setup.py sdist',
-    # and for users of a tarball/zipball created by 'git archive' or github's
-    # download-from-tag feature or the equivalent in other VCSes.
-
-    get_keywords_f = handlers.get("get_keywords")
-    from_keywords_f = handlers.get("keywords")
-    if get_keywords_f and from_keywords_f:
-        try:
-            keywords = get_keywords_f(versionfile_abs)
-            ver = from_keywords_f(keywords, cfg.tag_prefix, verbose)
-            if verbose:
-                print("got version from expanded keyword %s" % ver)
-            return ver
-        except NotThisMethod:
-            pass
-
-    try:
-        ver = versions_from_file(versionfile_abs)
-        if verbose:
-            print("got version from file %s %s" % (versionfile_abs, ver))
-        return ver
-    except NotThisMethod:
-        pass
-
-    from_vcs_f = handlers.get("pieces_from_vcs")
-    if from_vcs_f:
-        try:
-            pieces = from_vcs_f(cfg.tag_prefix, root, verbose)
-            ver = render(pieces, cfg.style)
-            if verbose:
-                print("got version from VCS %s" % ver)
-            return ver
-        except NotThisMethod:
-            pass
-
-    try:
-        if cfg.parentdir_prefix:
-            ver = versions_from_parentdir(cfg.parentdir_prefix, root, verbose)
-            if verbose:
-                print("got version from parentdir %s" % ver)
-            return ver
-    except NotThisMethod:
-        pass
-
-    if verbose:
-        print("unable to compute version")
-
-    return {"version": "0+unknown", "full-revisionid": None,
-            "dirty": None, "error": "unable to compute version"}
-
-
-def get_version():
-    return get_versions()["version"]
-
-
-def get_cmdclass():
-    if "versioneer" in sys.modules:
-        del sys.modules["versioneer"]
-        # this fixes the "python setup.py develop" case (also 'install' and
-        # 'easy_install .'), in which subdependencies of the main project are
-        # built (using setup.py bdist_egg) in the same python process. Assume
-        # a main project A and a dependency B, which use different versions
-        # of Versioneer. A's setup.py imports A's Versioneer, leaving it in
-        # sys.modules by the time B's setup.py is executed, causing B to run
-        # with the wrong versioneer. Setuptools wraps the sub-dep builds in a
-        # sandbox that restores sys.modules to it's pre-build state, so the
-        # parent is protected against the child's "import versioneer". By
-        # removing ourselves from sys.modules here, before the child build
-        # happens, we protect the child from the parent's versioneer too.
-        # Also see https://github.com/warner/python-versioneer/issues/52
-
-    cmds = {}
-
-    # we add "version" to both distutils and setuptools
-    from distutils.core import Command
-
-    class cmd_version(Command):
-        description = "report generated version string"
-        user_options = []
-        boolean_options = []
-
-        def initialize_options(self):
-            pass
-
-        def finalize_options(self):
-            pass
-
-        def run(self):
-            vers = get_versions(verbose=True)
-            print("Version: %s" % vers["version"])
-            print(" full-revisionid: %s" % vers.get("full-revisionid"))
-            print(" dirty: %s" % vers.get("dirty"))
-            if vers["error"]:
-                print(" error: %s" % vers["error"])
-    cmds["version"] = cmd_version
-
-    # we override "build_py" in both distutils and setuptools
-    #
-    # most invocation pathways end up running build_py:
-    #  distutils/build -> build_py
-    #  distutils/install -> distutils/build ->..
-    #  setuptools/bdist_wheel -> distutils/install ->..
-    #  setuptools/bdist_egg -> distutils/install_lib -> build_py
-    #  setuptools/install -> bdist_egg ->..
-    #  setuptools/develop -> ?
-
-    from distutils.command.build_py import build_py as _build_py
-
-    class cmd_build_py(_build_py):
-        def run(self):
-            root = get_root()
-            cfg = get_config_from_root(root)
-            versions = get_versions()
-            _build_py.run(self)
-            # now locate _version.py in the new build/ directory and replace
-            # it with an updated value
-            if cfg.versionfile_build:
-                target_versionfile = os.path.join(self.build_lib,
-                                                  cfg.versionfile_build)
-                print("UPDATING %s" % target_versionfile)
-                write_to_version_file(target_versionfile, versions)
-    cmds["build_py"] = cmd_build_py
-
-    if "cx_Freeze" in sys.modules:  # cx_freeze enabled?
-        from cx_Freeze.dist import build_exe as _build_exe
-
-        class cmd_build_exe(_build_exe):
-            def run(self):
-                root = get_root()
-                cfg = get_config_from_root(root)
-                versions = get_versions()
-                target_versionfile = cfg.versionfile_source
-                print("UPDATING %s" % target_versionfile)
-                write_to_version_file(target_versionfile, versions)
-
-                _build_exe.run(self)
-                os.unlink(target_versionfile)
-                with open(cfg.versionfile_source, "w") as f:
-                    LONG = LONG_VERSION_PY[cfg.VCS]
-                    f.write(LONG %
-                            {"DOLLAR": "$",
-                             "STYLE": cfg.style,
-                             "TAG_PREFIX": cfg.tag_prefix,
-                             "PARENTDIR_PREFIX": cfg.parentdir_prefix,
-                             "VERSIONFILE_SOURCE": cfg.versionfile_source,
-                             })
-        cmds["build_exe"] = cmd_build_exe
-        del cmds["build_py"]
-
-    # we override different "sdist" commands for both environments
-    if "setuptools" in sys.modules:
-        from setuptools.command.sdist import sdist as _sdist
-    else:
-        from distutils.command.sdist import sdist as _sdist
-
-    class cmd_sdist(_sdist):
-        def run(self):
-            versions = get_versions()
-            self._versioneer_generated_versions = versions
-            # unless we update this, the command will keep using the old
-            # version
-            self.distribution.metadata.version = versions["version"]
-            return _sdist.run(self)
-
-        def make_release_tree(self, base_dir, files):
-            root = get_root()
-            cfg = get_config_from_root(root)
-            _sdist.make_release_tree(self, base_dir, files)
-            # now locate _version.py in the new base_dir directory
-            # (remembering that it may be a hardlink) and replace it with an
-            # updated value
-            target_versionfile = os.path.join(base_dir, cfg.versionfile_source)
-            print("UPDATING %s" % target_versionfile)
-            write_to_version_file(target_versionfile,
-                                  self._versioneer_generated_versions)
-    cmds["sdist"] = cmd_sdist
-
-    return cmds
-
-
-CONFIG_ERROR = """
-setup.cfg is missing the necessary Versioneer configuration. You need
-a section like:
-
- [versioneer]
- VCS = git
- style = pep440
- versionfile_source = src/myproject/_version.py
- versionfile_build = myproject/_version.py
- tag_prefix = ""
- parentdir_prefix = myproject-
-
-You will also need to edit your setup.py to use the results:
-
- import versioneer
- setup(version=versioneer.get_version(),
-       cmdclass=versioneer.get_cmdclass(), ...)
-
-Please read the docstring in ./versioneer.py for configuration instructions,
-edit setup.cfg, and re-run the installer or 'python versioneer.py setup'.
-"""
-
-SAMPLE_CONFIG = """
-# See the docstring in versioneer.py for instructions. Note that you must
-# re-run 'versioneer.py setup' after changing this section, and commit the
-# resulting files.
-
-[versioneer]
-#VCS = git
-#style = pep440
-#versionfile_source =
-#versionfile_build =
-#tag_prefix =
-#parentdir_prefix =
-
-"""
-
-INIT_PY_SNIPPET = """
-from ._version import get_versions
-__version__ = get_versions()['version']
-del get_versions
-"""
-
-
-def do_setup():
-    root = get_root()
-    try:
-        cfg = get_config_from_root(root)
-    except (EnvironmentError, configparser.NoSectionError,
-            configparser.NoOptionError) as e:
-        if isinstance(e, (EnvironmentError, configparser.NoSectionError)):
-            print("Adding sample versioneer config to setup.cfg",
-                  file=sys.stderr)
-            with open(os.path.join(root, "setup.cfg"), "a") as f:
-                f.write(SAMPLE_CONFIG)
-        print(CONFIG_ERROR, file=sys.stderr)
-        return 1
-
-    print(" creating %s" % cfg.versionfile_source)
-    with open(cfg.versionfile_source, "w") as f:
-        LONG = LONG_VERSION_PY[cfg.VCS]
-        f.write(LONG % {"DOLLAR": "$",
-                        "STYLE": cfg.style,
-                        "TAG_PREFIX": cfg.tag_prefix,
-                        "PARENTDIR_PREFIX": cfg.parentdir_prefix,
-                        "VERSIONFILE_SOURCE": cfg.versionfile_source,
-                        })
-
-    ipy = os.path.join(os.path.dirname(cfg.versionfile_source),
-                       "__init__.py")
-    if os.path.exists(ipy):
-        try:
-            with open(ipy, "r") as f:
-                old = f.read()
-        except EnvironmentError:
-            old = ""
-        if INIT_PY_SNIPPET not in old:
-            print(" appending to %s" % ipy)
-            with open(ipy, "a") as f:
-                f.write(INIT_PY_SNIPPET)
-        else:
-            print(" %s unmodified" % ipy)
-    else:
-        print(" %s doesn't exist, ok" % ipy)
-        ipy = None
-
-    # Make sure both the top-level "versioneer.py" and versionfile_source
-    # (PKG/_version.py, used by runtime code) are in MANIFEST.in, so
-    # they'll be copied into source distributions. Pip won't be able to
-    # install the package without this.
-    manifest_in = os.path.join(root, "MANIFEST.in")
-    simple_includes = set()
-    try:
-        with open(manifest_in, "r") as f:
-            for line in f:
-                if line.startswith("include "):
-                    for include in line.split()[1:]:
-                        simple_includes.add(include)
-    except EnvironmentError:
-        pass
-    # That doesn't cover everything MANIFEST.in can do
-    # (http://docs.python.org/2/distutils/sourcedist.html#commands), so
-    # it might give some false negatives. Appending redundant 'include'
-    # lines is safe, though.
-    if "versioneer.py" not in simple_includes:
-        print(" appending 'versioneer.py' to MANIFEST.in")
-        with open(manifest_in, "a") as f:
-            f.write("include versioneer.py\n")
-    else:
-        print(" 'versioneer.py' already in MANIFEST.in")
-    if cfg.versionfile_source not in simple_includes:
-        print(" appending versionfile_source ('%s') to MANIFEST.in" %
-              cfg.versionfile_source)
-        with open(manifest_in, "a") as f:
-            f.write("include %s\n" % cfg.versionfile_source)
-    else:
-        print(" versionfile_source already in MANIFEST.in")
-
-    # Make VCS-specific changes. For git, this means creating/changing
-    # .gitattributes to mark _version.py for export-time keyword
-    # substitution.
-    do_vcs_install(manifest_in, cfg.versionfile_source, ipy)
-    return 0
-
-
-def scan_setup_py():
-    found = set()
-    setters = False
-    errors = 0
-    with open("setup.py", "r") as f:
-        for line in f.readlines():
-            if "import versioneer" in line:
-                found.add("import")
-            if "versioneer.get_cmdclass()" in line:
-                found.add("cmdclass")
-            if "versioneer.get_version()" in line:
-                found.add("get_version")
-            if "versioneer.VCS" in line:
-                setters = True
-            if "versioneer.versionfile_source" in line:
-                setters = True
-    if len(found) != 3:
-        print("")
-        print("Your setup.py appears to be missing some important items")
-        print("(but I might be wrong). Please make sure it has something")
-        print("roughly like the following:")
-        print("")
-        print(" import versioneer")
-        print(" setup( version=versioneer.get_version(),")
-        print("        cmdclass=versioneer.get_cmdclass(),  ...)")
-        print("")
-        errors += 1
-    if setters:
-        print("You should remove lines like 'versioneer.VCS = ' and")
-        print("'versioneer.versionfile_source = ' . This configuration")
-        print("now lives in setup.cfg, and should be removed from setup.py")
-        print("")
-        errors += 1
-    return errors
-
-if __name__ == "__main__":
-    cmd = sys.argv[1]
-    if cmd == "setup":
-        errors = do_setup()
-        errors += scan_setup_py()
-        if errors:
-            sys.exit(1)